The branch, build-main has been updated via cfa1e28665a8fa2f34f7546af7bd8d25ea1ba8bd (commit) from 2419bf34d1ecd28696e6c129001057c4de77a328 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: onmainwindow.cpp | 6 +++--- portable/stopu3client.cpp | 4 ++-- printdialog.ui | 2 +- x2goclient_da.ts | 10 +++++----- x2goclient_de.ts | 8 ++++---- x2goclient_es.ts | 8 ++++---- x2goclient_fr.ts | 8 ++++---- x2goclient_nb_no.ts | 8 ++++---- x2goclient_ru.ts | 10 +++++----- x2goclient_sv.ts | 8 ++++---- x2goclient_zh_tw.ts | 8 ++++---- xsettingsui.ui | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-) The diff of changes is: diff --git a/onmainwindow.cpp b/onmainwindow.cpp index dbcb092..31dbc17 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -139,7 +139,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cleanAskPass(); - setWindowTitle ( tr ( "X2Go client" ) ); + setWindowTitle ( tr ( "X2Go Client" ) ); ld=0; tunnel=0l; sndTunnel=0l; @@ -205,7 +205,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) { portableDataPath=u3Path; ONMainWindow::portable=true; - setWindowTitle ( "X2Go client - U3" ); + setWindowTitle ( "X2Go Client - U3" ); } #endif @@ -7481,7 +7481,7 @@ void ONMainWindow::slotAbout() "further information." ); QMessageBox::about ( this,tr ( "About X2GO client" ), - tr ( "<b>X2Go client V. " ) +VERSION+ + tr ( "<b>X2Go Client V. " ) +VERSION+ " </b >(Qt - "+qVersion() +")"+ aboutStr ); } diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp index 3cc7c67..c6e7a4f 100644 --- a/portable/stopu3client.cpp +++ b/portable/stopu3client.cpp @@ -27,11 +27,11 @@ int main() { - HWND wid=FindWindowEx(0,0,0,"X2Go client - U3"); + HWND wid=FindWindowEx(0,0,0,"X2Go Client - U3"); while(wid) { HWND prevWid=wid; - wid=FindWindowEx(0,wid,0,"X2Go client - U3"); + wid=FindWindowEx(0,wid,0,"X2Go Client - U3"); PostMessage(prevWid,WM_CLOSE,0,0); } return 0; diff --git a/printdialog.ui b/printdialog.ui index 4f52e41..9420099 100644 --- a/printdialog.ui +++ b/printdialog.ui @@ -15,7 +15,7 @@ </rect> </property> <property name="windowTitle"> - <string>Print - X2Go client</string> + <string>Print - X2Go Client</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff --git a/x2goclient_da.ts b/x2goclient_da.ts index 0ef73a7..eba13a4 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -792,7 +792,7 @@ Public key hash: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2go klient</translation> </message> <message> @@ -1587,8 +1587,8 @@ Ugemte dokumenter vil gå tabt</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> - <translation><b>X2Go client V. </translation> + <source><b>X2Go Client V. </source> + <translation><b>X2Go Client V. </translation> </message> <message> <location filename="onmainwindow.cpp" line="7508"/> @@ -1803,7 +1803,7 @@ du kan installere sshd med <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Udskrift - X2Go klient</translation> </message> <message> @@ -2807,7 +2807,7 @@ lydsystemets forbindelse igennem firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Server sammen med X2Go klient</translation> </message> <message> diff --git a/x2goclient_de.ts b/x2goclient_de.ts index d8fe44c..ba726ae 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1841,7 +1841,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2019,7 +2019,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>X2GoClient V. </translation> </message> <message> @@ -2357,7 +2357,7 @@ Sie können SSHD über folgenden Befehl installieren: </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Drucken - X2GoClient</translation> </message> </context> @@ -3385,7 +3385,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>X-Server auf X2GoClient starten</translation> </message> <message> diff --git a/x2goclient_es.ts b/x2goclient_es.ts index 8fb5b01..dc31106 100644 --- a/x2goclient_es.ts +++ b/x2goclient_es.ts @@ -791,7 +791,7 @@ Hash de su clave pública: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>Cliente X2Go</translation> </message> <message> @@ -1590,7 +1590,7 @@ Los documentos no guardados se perderán</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>cliente X2Go v. </translation> </message> <message> @@ -1806,7 +1806,7 @@ puedes instalar sshd con <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Imprimir - Cliente X2Go</translation> </message> <message> @@ -2809,7 +2809,7 @@ el sonido en conexiones a través de firewalls</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>iniciar ServidorX en el inicio del cliente X2Go</translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 6a8c203..8d77c9e 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -618,7 +618,7 @@ Public key hash: </source> <translation>pc105/us</translation> </message> <message> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go Client</translation> </message> <message> @@ -1158,7 +1158,7 @@ Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation type="unfinished"></translation> </message> <message> @@ -1341,7 +1341,7 @@ you can install sshd with <translation type="unfinished"></translation> </message> <message> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation type="unfinished"></translation> </message> </context> @@ -2101,7 +2101,7 @@ sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index 3f9ec66..219c205 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1489,7 +1489,7 @@ Vennligst sjekk instillingene dine</translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go klient</translation> </message> <message> @@ -1670,7 +1670,7 @@ Offentlig nøkkel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>X2Go klient v. </translation> </message> <message> @@ -1998,7 +1998,7 @@ Du kan installere sshd med: <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go klient</translation> </message> <message> @@ -3011,7 +3011,7 @@ lydsystem forbindelser gjennom brannmurer</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>start X-Serveren når X2Go klienten startes</translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 6984c5c..61bd030 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1881,7 +1881,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation></translation> </message> <message> @@ -2003,7 +2003,7 @@ Please check your settings</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>X2Go Client V. </translation> </message> <message> @@ -2342,7 +2342,7 @@ you can install sshd with </message> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Печать - X2Go Client</translation> </message> </context> @@ -3366,8 +3366,8 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> - <translation>запускать X-Server при запуске X2Go client</translation> + <source>start X-Server on X2Go Client start</source> + <translation>запускать X-Server при запуске X2Go Client</translation> </message> <message> <location filename="xsettingsui.ui" line="114"/> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 9d3a253..73fab61 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -796,7 +796,7 @@ Publik nyckel: </translation> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go-klient</translation> </message> <message> @@ -1596,7 +1596,7 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>X2Go-klient V. </translation> </message> <message> @@ -1831,7 +1831,7 @@ du kan installera sshd med (Debian/Ubuntu) <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>Utskrift - X2Go-klient</translation> </message> <message> @@ -2835,7 +2835,7 @@ ljudström genom brandväggar</translation> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>Starta X-server när X2Go-klienten startas</translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 4d93162..1d03c34 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -790,7 +790,7 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow.cpp" line="142"/> - <source>X2Go client</source> + <source>X2Go Client</source> <translation>X2Go用戶端</translation> </message> <message> @@ -1587,7 +1587,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow.cpp" line="7463"/> - <source><b>X2Go client V. </source> + <source><b>X2Go Client V. </source> <translation><b>X2Go 客戶端 V. </translation> </message> <message> @@ -1819,7 +1819,7 @@ you can install sshd with <name>PrintDialog</name> <message> <location filename="printdialog.ui" line="18"/> - <source>Print - X2Go client</source> + <source>Print - X2Go Client</source> <translation>列印 - X2Go用戶端</translation> </message> <message> @@ -2822,7 +2822,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="xsettingsui.ui" line="102"/> - <source>start X-Server on X2Go client start</source> + <source>start X-Server on X2Go Client start</source> <translation>當X2Go用戶端啟動時啟動X伺服器</translation> </message> <message> diff --git a/xsettingsui.ui b/xsettingsui.ui index e58ba50..9aa8ffa 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -106,7 +106,7 @@ <item> <widget class="QCheckBox" name="cbOnstart"> <property name="text"> - <string>start X-Server on X2Go client start</string> + <string>start X-Server on X2Go Client start</string> </property> <property name="checked"> <bool>false</bool> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).