This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 15bd59818bf862210f2afbdc884d415c296ab4db Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Sep 13 01:57:59 2016 +0200 {nsis/x2goclient.nsi,res/i18n/x2goclient_{da,es,et,fi,nl,zh_tw}.ts}: replace left-overs of "X2go" with the correct "X2Go" spelling. This mostly touches obsolete strings and file names, that need to be cleaned, but it's still worthwhile to not have it show up when searching for the old string. Given that NTFS is normally case-insensitive, removing the files will still work. --- debian/changelog | 6 ++++++ nsis/x2goclient.nsi | 8 ++++---- res/i18n/x2goclient_da.ts | 6 +++--- res/i18n/x2goclient_es.ts | 8 ++++---- res/i18n/x2goclient_et.ts | 2 +- res/i18n/x2goclient_fi.ts | 2 +- res/i18n/x2goclient_nl.ts | 10 +++++----- res/i18n/x2goclient_zh_tw.ts | 2 +- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2639d30..e3401a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,12 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium 10.11+. Fixes: #1079. Also check /etc/ssh/ for keys. - src/onmainwindow.cpp: fix last commit by using QFileInfo instead of QDir. This lets us use the exists () member function correctly. + - {nsis/x2goclient.nsi,res/i18n/x2goclient_{da,es,et,fi,nl,zh_tw}.ts}: + replace left-overs of "X2go" with the correct "X2Go" spelling. + This mostly touches obsolete strings and file names, that need to be + cleaned, but it's still worthwhile to not have it show up when searching + for the old string. Given that NTFS is normally case-insensitive, + removing the files will still work. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index f2f8d77..77d141d 100644 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -141,9 +141,9 @@ Section "X2Go Client (required)" base CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" ;Cleanup previous icon names (prior to X2Go Client 4.0.1.2) - Delete "$INSTDIR\X2goClient.lnk" - Delete "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" - Delete "$DESKTOP\X2goClient.lnk" + Delete "$INSTDIR\X2GoClient.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\X2GoClient.lnk" + Delete "$DESKTOP\X2GoClient.lnk" !insertmacro MUI_STARTMENU_WRITE_END @@ -262,7 +262,7 @@ SectionEnd LangString ADM_RIGHT ${LANG_ENGLISH} "You have to be Administrator on this computer to install X2Go Client" -LangString ADM_RIGHT ${LANG_GERMAN} "Sie brauchen Administratorenrechte um X2go Client zu installieren" +LangString ADM_RIGHT ${LANG_GERMAN} "Sie brauchen Administratorenrechte um X2Go Client zu installieren" LangString ADM_RIGHT ${LANG_RUSSIAN} "��� ����, ����� ���������� X2Go Client, ���������� ���� ��������������� ����� ����������" LangString DESC_base ${LANG_ENGLISH} "The regular build of X2Go Client and all its required dependencies" diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts index 80e2f58..65fe81c 100644 --- a/res/i18n/x2goclient_da.ts +++ b/res/i18n/x2goclient_da.ts @@ -1454,7 +1454,7 @@ Slå skjult tilstand til?</translation> </message> <message> <source>X2Go Link to session </source> - <translation type="obsolete">X2go Link til session</translation> + <translation type="obsolete">X2Go Link til session</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="2206"/> @@ -1520,7 +1520,7 @@ autoriseret_nøgler filen.</translation> </message> <message> <source>X2Go sessions not found</source> - <translation type="obsolete">X2go sessioner blev ikke fundet</translation> + <translation type="obsolete">X2Go sessioner blev ikke fundet</translation> </message> <message> <source>Are you sure you want to delete this session?</source> @@ -2035,7 +2035,7 @@ Ugemte dokumenter vil gå tabt</translation> </message> <message> <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete"><br>Klient til brug med X2go's netværksbaserede computer miljø. Denne klient vil kunne forbinde til X2go servere og starte, stoppe, fortsætte og afslutte (igangværende) skrivebord's sessioner. X2Go-Klienten lagrer forskellige server forbindelser og kan automatisk lave forespørgsler til LDAP tjenester om autentificeringsdata. Den kan desuden bruges som fuldskærmslogin (erstatning for loginmanagers som xdm) Besøg venligst x2go.org for yd [...] + <translation type="obsolete"><br>Klient til brug med X2Go's netværksbaserede computer miljø. Denne klient vil kunne forbinde til X2Go servere og starte, stoppe, fortsætte og afslutte (igangværende) skrivebord's sessioner. X2Go-Klienten lagrer forskellige server forbindelser og kan automatisk lave forespørgsler til LDAP tjenester om autentificeringsdata. Den kan desuden bruges som fuldskærmslogin (erstatning for loginmanagers som xdm) Besøg venligst x2go.org for yd [...] </message> <message> <source><b>X2Go Client V. </source> diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts index 62d7397..392a7cf 100644 --- a/res/i18n/x2goclient_es.ts +++ b/res/i18n/x2goclient_es.ts @@ -1467,7 +1467,7 @@ Use x2goclient hidden mode?</source> </message> <message> <source>X2Go Link to session </source> - <translation type="obsolete">Enlace a la sesión X2go </translation> + <translation type="obsolete">Enlace a la sesión X2Go </translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="2206"/> @@ -2054,7 +2054,7 @@ Los documentos no guardados se perderán</translation> </message> <message> <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> - <translation type="obsolete"><br>Cliente para usar con el sistema de acceso remoto X2Go. Este cliente es capaz de conectar con él/los servidor/es X2go y iniciar, parar, guardar y terminar (si están en ejecucion) sesiones de escritorio. El Cliente X2Go almacena diferentes conexiones a servidores y puede recuperar de manera automática datos de autenticación desde directorios LDAP. Además puede usarse como un sistema de inicio de sesión a pantalla completa (reemplazando a gest [...] + <translation type="obsolete"><br>Cliente para usar con el sistema de acceso remoto X2Go. Este cliente es capaz de conectar con él/los servidor/es X2Go y iniciar, parar, guardar y terminar (si están en ejecucion) sesiones de escritorio. El Cliente X2Go almacena diferentes conexiones a servidores y puede recuperar de manera automática datos de autenticación desde directorios LDAP. Además puede usarse como un sistema de inicio de sesión a pantalla completa (reemplazando a gest [...] </message> <message> <source><b>X2Go Client V. </source> @@ -2589,7 +2589,7 @@ Los documentos no guardados se perderán.</translation> <message> <location filename="../../src/onmainwindow.cpp" line="8350"/> <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...] - <translation><br>Cliente para usar con el sistema de acceso remoto X2Go. Este cliente es capaz de conectar con él/los servidor/es X2go y iniciar, parar, guardar y terminar (si están en ejecucion) sesiones de escritorio. El Cliente X2Go almacena diferentes conexiones a servidores y puede recuperar de manera automática datos de autenticación desde directorios LDAP. Además puede usarse como un sistema de inicio de sesión a pantalla completa (reemplazando a gestores de inicio d [...] + <translation><br>Cliente para usar con el sistema de acceso remoto X2Go. Este cliente es capaz de conectar con él/los servidor/es X2Go y iniciar, parar, guardar y terminar (si están en ejecucion) sesiones de escritorio. El Cliente X2Go almacena diferentes conexiones a servidores y puede recuperar de manera automática datos de autenticación desde directorios LDAP. Además puede usarse como un sistema de inicio de sesión a pantalla completa (reemplazando a gestores de inicio d [...] </message> <message> <location filename="../../src/onmainwindow.cpp" line="8364"/> @@ -3428,7 +3428,7 @@ Use X2Go Client's hidden mode?</source> <message> <location filename="../../src/sessionexplorer.cpp" line="227"/> <source>X2Go Link to session </source> - <translation>Enlace a la sesión X2go </translation> + <translation>Enlace a la sesión X2Go </translation> </message> <message> <location filename="../../src/sessionexplorer.cpp" line="363"/> diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts index 7555fdf..6a5117f 100644 --- a/res/i18n/x2goclient_et.ts +++ b/res/i18n/x2goclient_et.ts @@ -1769,7 +1769,7 @@ authorized_keys file.</source> </message> <message> <source>Closed x2goclient.</source> - <translation type="obsolete">X2goclient on suletud.</translation> + <translation type="obsolete">X2Goclient on suletud.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="1826"/> diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts index 82a1dc7..7ef601c 100644 --- a/res/i18n/x2goclient_fi.ts +++ b/res/i18n/x2goclient_fi.ts @@ -1807,7 +1807,7 @@ authorized_keys-tiedostoa.</translation> </message> <message> <source>Closed x2goclient.</source> - <translation type="obsolete">X2go-asiakasohjelman sulkeutui.</translation> + <translation type="obsolete">X2Go-asiakasohjelman sulkeutui.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="1826"/> diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts index 927cff7..f1f378d 100644 --- a/res/i18n/x2goclient_nl.ts +++ b/res/i18n/x2goclient_nl.ts @@ -1060,7 +1060,7 @@ van geluidssysteemverbindingen door firewalls</translation> <name>ONMainWindow</name> <message> <source>Starting x2goclient...</source> - <translation type="obsolete">X2goclient wordt gestart...</translation> + <translation type="obsolete">X2Goclient wordt gestart...</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="105"/> @@ -1815,11 +1815,11 @@ deze applicatie niet openen.</translation> </message> <message> <source>Closing x2goclient...</source> - <translation type="obsolete">X2goclient sluiten...</translation> + <translation type="obsolete">X2Goclient sluiten...</translation> </message> <message> <source>Closed x2goclient.</source> - <translation type="obsolete">x2g0client afgesloten.</translation> + <translation type="obsolete">x2goclient afgesloten.</translation> </message> <message> <location filename="../../src/onmainwindow.cpp" line="1826"/> @@ -1842,7 +1842,7 @@ deze applicatie niet openen.</translation> Use x2goclient hidden mode?</source> <translation type="obsolete">Bureaublad iconen kunnen worden ingesteld zodat de x2goclient niet getoond zal worden (verborgen modus) Als u van deze mogelijkheid gebruik wilt maken moet u wel inloggen met een gpg sleutel of een gpg smartcard configureren. -X2goclient in verborgen modus gebruiken?</translation> +X2Goclient in verborgen modus gebruiken?</translation> </message> <message> <source>Show session tray icon when running</source> @@ -3363,7 +3363,7 @@ or Use x2goclient hidden mode?</source> <translation type="obsolete">Bureaublad iconen kunnen worden ingesteld zodat de x2goclient niet getoond zal worden (verborgen modus) Als u van deze mogelijkheid gebruik wilt maken moet u wel inloggen met een gpg sleutel of een gpg smartcard configureren. -X2goclient in verborgen modus gebruiken?</translation> +X2Goclient in verborgen modus gebruiken?</translation> </message> <message> <location filename="../../src/sessionexplorer.cpp" line="139"/> diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts index f8ab989..db5f114 100644 --- a/res/i18n/x2goclient_zh_tw.ts +++ b/res/i18n/x2goclient_zh_tw.ts @@ -3931,7 +3931,7 @@ sound system connections through firewalls</source> <location filename="../../src/ui/xsettingsui.ui" line="28"/> <source>You must restart the X2Go Client for the changes to take effect</source> <oldsource>You must restart the X2go Client for the changes to take effect</oldsource> - <translation type="unfinished">您必需重新啟動X2go用戶端以讓設定變更生效</translation> + <translation type="unfinished">您必需重新啟動X2Go用戶端以讓設定變更生效</translation> </message> <message> <location filename="../../src/ui/xsettingsui.ui" line="51"/> -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git