[X2Go-Commits] [x2goclient] 13/31: {src/{configdialog, x2goutils}.cpp, res/i18n/x2goclient_*.ts}: change XQuartz project homepage references, adapt translations.
git-admin at x2go.org
git-admin at x2go.org
Sun Mar 5 23:22:23 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit b116007cae66b9397a3af1482d3cc8ad3034c45c
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Feb 24 15:05:17 2017 +0100
{src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change XQuartz project homepage references, adapt translations.
---
debian/changelog | 2 ++
res/i18n/x2goclient_da.ts | 10 ++++------
res/i18n/x2goclient_de.ts | 20 ++++++++------------
res/i18n/x2goclient_es.ts | 20 ++++++++------------
res/i18n/x2goclient_et.ts | 18 +++++++-----------
res/i18n/x2goclient_fi.ts | 20 ++++++++------------
res/i18n/x2goclient_fr.ts | 20 ++++++++------------
res/i18n/x2goclient_nb_no.ts | 20 ++++++++------------
res/i18n/x2goclient_nl.ts | 20 ++++++++------------
res/i18n/x2goclient_pt.ts | 10 ++++------
res/i18n/x2goclient_ru.ts | 10 ++++------
res/i18n/x2goclient_sv.ts | 16 +++++++---------
res/i18n/x2goclient_tr.ts | 10 ++++------
res/i18n/x2goclient_zh_tw.ts | 10 ++++------
src/configdialog.cpp | 11 +++++------
src/x2goutils.cpp | 4 ++--
16 files changed, 91 insertions(+), 130 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42246d1..3a77edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,8 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
- src/onmainwindow.cpp: make the "not loading translator" message
non-translatable, as it doesn't make a lot of sense to actually
translate it.
+ - {src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change
+ XQuartz project homepage references, adapt translations.
[ Oleksandr Shneyder ]
* New upstream version (4.1.0.1):
diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index 046d73a..8f81727 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -341,14 +341,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -356,7 +354,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3505,7 +3503,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index fa86157..5c2223c 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -504,14 +504,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Sie verwenden XQuartz (X-Window-System-Server für OS X) in der Version </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Sie verwenden XQuartz (X-Window-System-Server für OS X) in der Version %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -519,10 +517,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Diese Version verursacht Probleme mit X-Anwendungen, wenn 24-Bit-Farbtiefe gesetzt sind.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Diese Version verursacht Probleme mit X-Anwendungen, wenn 24-Bit-Farbtiefe gesetzt sind.
Sie sollten Ihre X11-Umgebung aktualisieren.
MacPorts-Benutzer gehen bitte gemäß der folgenden Anleitung vor:
@@ -530,7 +526,7 @@ MacPorts-Benutzer gehen bitte gemäß der folgenden Anleitung vor:
Benutzer, die XQuartz über das Installationspaket installiert haben,
können aktualisierte Versionen hier herunterladen:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -4267,7 +4263,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -4281,7 +4277,7 @@ Nach erfolgreicher Installation befolgen Sie bitte die vom Port-Utility
angezeigte Anleitung, um den Server automatisch zu laden und zu starten.
Alle anderen Benutzer beziehen und installieren XQuartz bitte von:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Starten Sie anschließend X2GoClient neu, und wählen Sie den passenden Pfad
zur X11-Anwendung in den allgemeinen X2GoClient-Einstellungen.
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 33e8c2c..7a3a1db 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -360,14 +360,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Estás usando la versión de XQuartz (Servidor X Window de OS X) </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Estás usando la versión de XQuartz (Servidor X Window de OS X) %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -375,10 +373,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Esta versión causa problemas con aplicaciones X en modo de color de 24bits.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Esta versión causa problemas con aplicaciones X en modo de color de 24bits.
Deberías actualizar tu sistema X11.
Los usuarios de MacPorts deben seguir las siguientes indicaciones:
@@ -386,7 +382,7 @@ Los usuarios de MacPorts deben seguir las siguientes indicaciones:
Los usuarios que han instalado XQuartz vía el paquete instalador
pueden encontrar versiones acutlizadas:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -3762,7 +3758,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -3776,7 +3772,7 @@ Cuando se haya realizado la instalación con éxito debes seguir las instruccion
mostradas por la utilidad del port para auto iniciar/cargar el servidor.
Para el resto de usuarios, hay que descargar e instalar XQuartz desde:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Una vez hecho esto se debe reiniciar el cliente X2Go y elegir la ruta correcta
hacia la aplicación X11 in los ajustes generales del cliente X2Go.
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index 7e72101..5c1e125 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -344,14 +344,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Sa kasutad XQuartz (X Window System Server for OS X) versiooni </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Sa kasutad XQuartz (X Window System Server for OS X) versiooni %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -359,10 +357,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-See versioon põhjustab probleeme X aplikatsioonides 24 biti värviesitus reziimis.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>See versioon põhjustab probleeme X aplikatsioonides 24 biti värviesitus reziimis.
Sa peaksid värskendama oma X11 taristut.
MacPorts kasutajad palun järgige alljärgnevaid juhiseid:
@@ -370,7 +366,7 @@ MacPorts kasutajad palun järgige alljärgnevaid juhiseid:
Kasutajad kes installeerisid XQuartz'i kasutades 'installer package'
leiavad uuendatud versiooni:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -3569,7 +3565,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts
index 3834656..04ac924 100644
--- a/res/i18n/x2goclient_fi.ts
+++ b/res/i18n/x2goclient_fi.ts
@@ -360,14 +360,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Käytät XQuartz (X Window System Server for OS X) versiota </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Käytät XQuartz (X Window System Server for OS X) versiota %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -375,10 +373,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Tämä version aiheuttaa ongelmia X sovellusten kanssa 24 bitin moodissa.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Tämä version aiheuttaa ongelmia X sovellusten kanssa 24 bitin moodissa.
Sinun pitää päivitttää X11 ohjelmasi.
MacPorts käyttäjät seuratkaa täältä löytyviä ohjeita:
@@ -386,7 +382,7 @@ MacPorts käyttäjät seuratkaa täältä löytyviä ohjeita:
Ne käyttäjät jotka ovat asentaneet XQuartz-ohjelman asennuspaketista
voivat hakea tuoreen version täältä:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -3743,7 +3739,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -3757,7 +3753,7 @@ Kun asennus valmis, seuraa ohjeita jotka tulostuvat
portilla joka käynnistää/lataa palvelimen.
Kaikki muut käyttäjät, nouda ja asenna XQuartz täältä:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Seuraavaksi, käynnistä X2Go-asiakasohjelma ja valitse oikea polku
jolla pääset X11-sovellukseen X2Go-ohjelman asetuksilla.
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index 5b64f4c..2894c49 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -369,13 +369,11 @@
<translation>La version de votre XQuartz est trop ancienne.</translation>
</message>
<message>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Vous utilisez XQuartz (Serveur de Système X Window pour OS X) version </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Vous utilisez XQuartz (Serveur de Système X Window pour OS X) version %1.</translation>
</message>
<message>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -383,10 +381,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Cette version provoque des problèmes avec les applications X en mode couleur 24bit.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Cette version provoque des problèmes avec les applications X en mode couleur 24bit.
Vous devriez mettre à jour votre environnement X11.
Utilisateurs de MacPorts, veuillez suivre les instructions sur :
@@ -394,7 +390,7 @@ Utilisateurs de MacPorts, veuillez suivre les instructions sur :
Les utilisateurs qui ont installé XQuartz par le paquet d'installation
peuvent trouver des versions mises à jour sur :
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<source>No valid XQuartz application selected.</source>
@@ -2734,7 +2730,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -2751,7 +2747,7 @@ pour le démarrage et le chargement automatiques du serveur.
Pour tous les autres utilisateurs :
téléchargez et installez XQuartz à partir de :
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Puis redémarrez X2Go Client et spécifiez le chemin correct
de l'application X11 dans les réglages dans les préférences générales de X2Go Client.
diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts
index 14d632b..707ad82 100644
--- a/res/i18n/x2goclient_nb_no.ts
+++ b/res/i18n/x2goclient_nb_no.ts
@@ -370,13 +370,11 @@
<translation>Din XQuartz versjon er for gammel.</translation>
</message>
<message>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Du benytter XQuartz (OS X X Window System Server) versjon </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Du benytter XQuartz (OS X X Window System Server) versjon %1.</translation>
</message>
<message>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -384,10 +382,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Denne versjonen lager problemer med X-program som kjører med 24bit fargemodus.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Denne versjonen lager problemer med X-program som kjører med 24bit fargemodus.
Du burde oppgradere ditt X11 oppsett.
MacPorts brukere, vennligst følg denne beskrivelsen:
@@ -395,7 +391,7 @@ MacPorts brukere, vennligst følg denne beskrivelsen:
Brukere som har installert XQuartz via installasjonspakke
kan finne oppdaterte versjoner på:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<source>No valid XQuartz application selected.</source>
@@ -3192,7 +3188,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -3206,7 +3202,7 @@ Etter installasjon, vennligst følg beskrivelsen som kommer fra
port-verktøyet for å autostarte/starte serveren.
Alle andre brukere henter XQuartz fra:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Etterpå, restart X2Go klienten og velg korrekt plassering
for X11-programmet i X2Go sin generelle innstillinger.
diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts
index f6023ea..31daae0 100644
--- a/res/i18n/x2goclient_nl.ts
+++ b/res/i18n/x2goclient_nl.ts
@@ -360,14 +360,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>U gebruikt de XQuartz (X-Window Server voor OS X) versie </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>U gebruikt de XQuartz (X-Window Server voor OS X) versie %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -375,10 +373,8 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
- <translation>.
-
-Deze versie veroorzaakt problemen met X applicaties in 24bit kleuren modus.
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
+ <translation>Deze versie veroorzaakt problemen met X applicaties in 24bit kleuren modus.
U moet uw X11 omgeving updaten.
MacPorts gebruikers kunnen de stappen doorlopen die beschreven zijn op:
@@ -386,7 +382,7 @@ MacPorts gebruikers kunnen de stappen doorlopen die beschreven zijn op:
Gebruikers die XQuartz geinstalleerd hebben via een installatie bestand
kunnen de nieuwste versie downloaden via:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -3696,7 +3692,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -3710,7 +3706,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts
index 262f3d1..fe4c1e4 100644
--- a/res/i18n/x2goclient_pt.ts
+++ b/res/i18n/x2goclient_pt.ts
@@ -322,14 +322,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -337,7 +335,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -2972,7 +2970,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts
index 0434ebf..2b0b5ca 100644
--- a/res/i18n/x2goclient_ru.ts
+++ b/res/i18n/x2goclient_ru.ts
@@ -492,14 +492,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -507,7 +505,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3927,7 +3925,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts
index 9330a72..281c7cd 100644
--- a/res/i18n/x2goclient_sv.ts
+++ b/res/i18n/x2goclient_sv.ts
@@ -361,14 +361,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
- <translation>Du använder XQuartz (X Window System Server for OS X) version </translation>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
+ <translation>Du använder XQuartz (X Window System Server for OS X) version %1.</translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -376,7 +374,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation>.
Denna version orsakar problem med X-applikationer i 24-bitars färg.
@@ -387,7 +385,7 @@ MacPorts-användare, följ denna instruktion:
Användare som har installera XQuartz via installationspaketet
kan hitta uppdaterade versioner här:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></translation>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="578"/>
@@ -3812,7 +3810,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
@@ -3826,7 +3824,7 @@ Var vänlig följ instruktionerna från port-verktyget för att
autostarta servern.
Alla andra användare, var vänlig hämta och installera XQuartz från:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Starta sedan om X2Go-klient och välj korrekt sökväg
till X11-applikationen i inställningara för X2Go-klient.
diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts
index 3625e3d..6267008 100644
--- a/res/i18n/x2goclient_tr.ts
+++ b/res/i18n/x2goclient_tr.ts
@@ -344,14 +344,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -359,7 +357,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3474,7 +3472,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts
index 2bea357..cdb1d1a 100644
--- a/res/i18n/x2goclient_zh_tw.ts
+++ b/res/i18n/x2goclient_zh_tw.ts
@@ -344,14 +344,12 @@
</message>
<message>
<location filename="../../src/configdialog.cpp" line="549"/>
- <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+ <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/configdialog.cpp" line="551"/>
- <source>.
-
-This version causes problems with X applications in 24bit color mode.
+ <source>This version causes problems with X applications in 24bit color mode.
You should update your X11 environment.
MacPorts users please follow the steps outlined on:
@@ -359,7 +357,7 @@ MacPorts users please follow the steps outlined on:
Users who have installed XQuartz via the installer package
can find updated versions on:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -3345,7 +3343,7 @@ Upon successful installation, please follow the instructions printed
by the port utility to autostart/load the server.
All other users, please obtain and install XQuartz from:
-<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>
+<center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center>
Afterwards, restart X2Go Client and select the correct path
to the X11 application in the general X2Go Client settings.
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index d44dd2d..991e030 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -546,10 +546,9 @@ void ConfigDialog::slot_findXDarwin ()
void ConfigDialog::printXDarwinVersionWarning (QString version)
{
show_RichText_WarningMsgBox (tr ("Your XQuartz version is too old."),
- tr ("Your are using XQuartz (X Window System Server for OS X) version ")
- + version +
- tr (".\n\n"
- "This version causes problems with X applications in 24bit "
+ tr ("Your are using XQuartz (X Window System Server for OS X) version %1.").arg (version)
+ + "\n\n" +
+ tr ("This version causes problems with X applications in 24bit "
"color mode.\n"
"You should update your X11 environment.\n\n"
@@ -562,8 +561,8 @@ void ConfigDialog::printXDarwinVersionWarning (QString version)
"Users who have installed XQuartz via the installer package\n"
"can find updated versions on:\n"
- "<center><a href=\"https://xquartz.macosforge.org/\">"
- "https://xquartz.macosforge.org/"
+ "<center><a href=\"https://www.xquartz.org/\">"
+ "https://www.xquartz.org/"
"</a></center>"));
}
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 79c0700..35a5992 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -196,8 +196,8 @@ void show_XQuartz_generic_error (const QString &main_error, const QString &addit
"All other users, please obtain and install XQuartz from:\n"
- "<center><a href=\"https://xquartz.macosforge.org/\">"
- "https://xquartz.macosforge.org/"
+ "<center><a href=\"https://www.xquartz.org/\">"
+ "https://www.xquartz.org/"
"</a></center>\n\n"
"Afterwards, restart X2Go Client and select the correct path\n"
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list