x2go-commits August 2012

x2go-commits@lists.x2go.org

1 participants
46 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.8-1-gb965416
by git-admin＠x2go.org 10 Aug '12

10 Aug '12

The branch, master has been updated via b9654161728ea578208df1a2f917b6c5fcb7073b (commit) from 111c8e9da59660fb68473111fb0a32c7106a1170 (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 ----------------------------------------------------------------- commit b9654161728ea578208df1a2f917b6c5fcb7073b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 10 14:14:44 2012 +0200 When X2Go TCE has plymouth installed, make sure pressing the halt button does not change to the wrong tty. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2gothinclient/sbin/x2gothinclientd | 2 ++ 2 files changed, 10 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a8f76d0..906da89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +x2gothinclient (1.0.1.8-0~x2go2) UNRELEASED; urgency=low + + * New upstream version (1.0.1.8): + - When X2Go TCE has plymouth installed, make sure pressing the + halt button does not change to the wrong tty. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 + x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.8): diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index d3be9a7..61bd512 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -95,6 +95,8 @@ elsif ($pid == 0 ) # test if shutdown button on X2Go Client was clicked if ( -e "/home/x2goclient/.halt") { + # when used with plymouth, make sure we stay on the correct terminal + system("killall Xorg"); system("shutdown -h now"); } # test if XServer is running, if not launch it... hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.8
by git-admin＠x2go.org 10 Aug '12

10 Aug '12

The branch, build-main has been updated via 111c8e9da59660fb68473111fb0a32c7106a1170 (commit) via 88d814adc6cc578c0e43806a29f5643451f58894 (commit) via bf757b40e4a378e416aefa140bd27222ef7b816d (commit) via ff471f1564e8de9c229abe408d5324fe48a51b40 (commit) via aa9d755a0ffbe67b1cd7e02ec4fc0fae08f96a6b (commit) via b4eade6e6f9c503243bba2e26961dce069473fcd (commit) via aed2aa67af3352fd03f7d5986a81804824c38b58 (commit) via e61158f8989d9d1e4a978dd61ba756714201a1bf (commit) from 9b226f75d415bbd2f1f2b41b53768a255055314e (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: VERSION | 2 +- debian/changelog | 11 +++++++++++ debian/x2gothinclient.init | 19 +++++++++---------- x2gothinclient/sbin/x2gothinclientd | 3 +++ 4 files changed, 24 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index ff27689..ef86402 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.7 +1.0.1.8 diff --git a/debian/changelog b/debian/changelog index 1555460..a8f76d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low + + * New upstream version (1.0.1.8): + - Remove .halt file before shutting down. + - Make x2gothinclient init script more robust. + - Stop x2gothinclient init script if either x2gothinclient_init or + x2gothinclient_start is missing/non-executable. + - Fix spelling of X2Go. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 10:44:07 +0200 + x2gothinclient (1.0.1.7-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.7): diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 7035ca8..42866d3 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -33,10 +33,14 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin export HOSTNAME DAEMON=/usr/sbin/x2gothinclientd NAME=x2gothinclient -DESC=x2gothinclient +DESC="X2Go Thinclient Service" test -x $DAEMON || exit 0 -test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } +if [ ! -x /etc/x2go/x2gothinclient_init ] || [ ! -x /etc/x2go/x2gothinclient_start ]; then + echo "X2Go Thin Client system will not start as it is not configured, yet." + echo "See http://wiki.x2go.org/installing_x2go_thin_client_environment_debian" + exit 0 +fi # pre-init X2Go Thin Client through init script... test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init @@ -52,9 +56,7 @@ case "$1" in ;; stop) echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid - - echo "$NAME." + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid && echo "$NAME." || echo "not running" ;; #reload) # @@ -82,12 +84,9 @@ case "$1" in ;; restart) echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." + $0 start ;; *) N=/etc/init.d/$NAME diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index 49e04a9..d3be9a7 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -63,6 +63,9 @@ sub check_client return 0; } +# make sure the .halt file is not present when we start this script +system("rm -f /home/x2goclient/.halt"); + # pre-load the thinclient initialization script system("su x2goclient -c \". /etc/x2go/x2gothinclient_init\""); hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.7-8-g111c8e9
by git-admin＠x2go.org 10 Aug '12

10 Aug '12

The branch, master has been updated via 111c8e9da59660fb68473111fb0a32c7106a1170 (commit) from 88d814adc6cc578c0e43806a29f5643451f58894 (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 ----------------------------------------------------------------- commit 111c8e9da59660fb68473111fb0a32c7106a1170 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 10 10:44:30 2012 +0200 release 1.0.1.8 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 16fca8b..a8f76d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.0.1.8-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.8): - Remove .halt file before shutting down. @@ -7,7 +7,7 @@ x2gothinclient (1.0.1.8-0~x2go1) UNRELEASED; urgency=low x2gothinclient_start is missing/non-executable. - Fix spelling of X2Go. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jun 2012 22:27:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 10:44:07 +0200 x2gothinclient (1.0.1.7-0~x2go1) unstable; urgency=low hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goclient.git - build-main (branch) updated: 3.99.2.2
by git-admin＠x2go.org 10 Aug '12

10 Aug '12

The branch, build-main has been updated via a0461e289073d223db2f486fa171f7fbd3be7707 (commit) via aa415c595f148c275dd8847263b75238f5cc5707 (commit) via a2d95c0c106923162bb510c88806b7384786b97d (commit) via 3335fca16afaa0792207228115e31630894dee71 (commit) via 5e5eb0cfffc514ee419a116a78f25ff98728c746 (commit) via d4d0fe38610d3e514dc2e4e259ce8f103e4ac535 (commit) via 647ab75f420637994b0cc400590adedd106e0c28 (commit) via c688541a6ef4477d3eb9eb28ca71e13a781cc69f (commit) via 67c1fa932ae66dcf288d99c12dcd57ea57779906 (commit) via 9667c4ffcf9c906a230991682a0f1a5d35a9c794 (commit) via 0c50ba72235f2d23142cb2ed081d6887873284af (commit) from 26aac92d6769fdb9194211108caf5ac96226a612 (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: Makefile | 4 +- VERSION | 2 +- config_linux_plugin.sh | 2 + debian/changelog | 26 ++++++++++++ desktop/x2goclient.desktop | 3 +- onmainwindow.cpp | 95 +++++++++++++++++++++++++++----------------- onmainwindow.h | 1 + sshmasterconnection.cpp | 1 + sshprocess.cpp | 6 ++- version.h | 2 +- x2goclient_de.ts | 10 ++-- x2goclient_en.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 10 ++-- x2goclient_ru.ts | 8 ++-- x2goclient_sv.ts | 2 +- x2goclient_zh_tw.ts | 2 +- x2goplugin.rc | 10 ++-- 18 files changed, 121 insertions(+), 67 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 19d83db..bc98046 100755 --- a/Makefile +++ b/Makefile @@ -29,12 +29,12 @@ build: build_client build_plugin build_man build_client: lrelease x2goclient.pro - mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro + mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: lrelease x2goclient.pro - mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro + mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) build_man: diff --git a/VERSION b/VERSION index 399ee7b..04a87a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.2.1 +3.99.2.2 diff --git a/config_linux_plugin.sh b/config_linux_plugin.sh index 6081d51..d33a481 100755 --- a/config_linux_plugin.sh +++ b/config_linux_plugin.sh @@ -2,4 +2,6 @@ make distclean +lrelease x2goclient.pro + X2GO_CLIENT_TARGET=plugin qmake-qt4 diff --git a/debian/changelog b/debian/changelog index baad6e2..deb8d65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (3.99.2.2): + - Drop Encoding key from .desktop file (as it is deprecated + according to latest FreeDesktop.org specs). + - Correct spelling for mis-spelled work ,,authentication''. + - Allow QMAKE_* parameters that are needed for hardening x2goclient + (see http://wiki.debian.org/Hardening) + - Provide CPPFLAGS for QMAKE_CFLAGS _and_ QMAKE_CXXFLAGS. Provide them as + first build parameters. + - Allow x2goclient to connect to user accounts that have other shells than + /bin/sh and alike configured as default shell. Also: removal bashisms in + shell execution commands. + - X2Go resume session slot: double click on a selected session is supposed + to resume that session. To make this feature functional for running + sessions the session has to be suspended first. + + [ Oleksandr Shneyder ] + * New upstream version (3.99.2.2): + - Fixing X2Go Plugin + - Cleaning code: double click on running session. Instead of using function + "sleep" starting resume-session after suspend-session is returned. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 10:08:52 +0200 + x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 16f2040..9b38db6 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,5 @@ [Desktop Entry] -Encoding=UTF-8 -Version=3.99.2.1 +Version=3.99.2.2 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 6cbd6b4..1bded10 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -101,6 +101,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) noSessionEdit=false; lastSession=0l; changeBrokerPass=false; + resumeAfterSuspending=false; appSeparator=0; @@ -382,6 +383,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #if defined(CFGPLUGIN) && defined(Q_OS_LINUX) x2goDebug<<"create embedContainer"<<endl; embedContainer=new QX11EmbedContainer ( fr ); + #endif if ( !embedMode ) { @@ -3956,7 +3958,16 @@ void ONMainWindow::slotResumeSess() x2goSession s=getSelectedSession(); QDesktopWidget wd; if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) + { + if ( s.status=="R" && ! resumeAfterSuspending) + { + resumeAfterSuspending=true; + slotSuspendSess(); + return; + } + resumeAfterSuspending=false; resumeSession ( s ); + } else { QString depth=QString::number ( s.colorDepth ); @@ -4125,6 +4136,10 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, } if ( selectSessionDlg->isVisible() ) selectSessionDlg->setEnabled ( true ); + if (resumeAfterSuspending) + { + slotResumeSess(); + } } @@ -5505,7 +5520,7 @@ void ONMainWindow::runCommand() resumingSession.agentPid + " " + resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" nosnd "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; if ( startSessSndSystem ==PULSE ) { cmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ @@ -5524,7 +5539,7 @@ void ONMainWindow::runCommand() resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" esd "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; break; case ARTS: cmd="setsid x2goruncommand "+ @@ -5533,7 +5548,7 @@ void ONMainWindow::runCommand() resumingSession.sessionId+" "+ resumingSession.sndPort+ " "+ command+" arts "+ - sessionType +">& /dev/null & exit"; + sessionType +" 1> /dev/null 2>/dev/null & exit"; break; } @@ -5563,7 +5578,7 @@ void ONMainWindow::runApplication(QString exec) proc->startNormal ("PULSE_CLIENTCONFIG=~/.x2go/C-"+ resumingSession.sessionId+"/.pulse-client.conf DISPLAY=:"+ resumingSession.display+ - " setsid "+exec+">& /dev/null & exit"); + " setsid "+exec+" 1> /dev/null 2>/dev/null & exit"); } void ONMainWindow::slotRetRunCommand ( bool result, QString output, @@ -7103,7 +7118,7 @@ void ONMainWindow::slotAbout() "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 authentification " + "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 " @@ -7723,7 +7738,7 @@ QString ONMainWindow::getXDisplay() } else { - return (xsocket); + return (xsocket); } } } @@ -8944,6 +8959,8 @@ void ONMainWindow::startSshd() void ONMainWindow::setProxyWinTitle() { + if (embedMode) + return; QString title; @@ -9161,45 +9178,49 @@ void ONMainWindow::slotFindProxyWin() x2goDebug<<"proxy win found:"<<proxyWinId; setProxyWinTitle(); proxyWinTimer->stop(); - if (!useLdap) + if (!embedMode) { - X2goSettings *st; - QString sid; - if ( !embedMode ) - sid=lastSession->id(); - else - sid="embedded"; - - if (brokerMode) - st=new X2goSettings(config.iniFile,QSettings::IniFormat); - else - st= new X2goSettings( "sessions" ); - uint displays=QApplication::desktop()->numScreens(); - xinerama=st->setting()->value ( sid+"/xinerama", - ( QVariant ) defaultXinerama ).toBool(); - if (st->setting()->value ( sid+"/multidisp", - ( QVariant ) false ).toBool()) + if (!useLdap) { - uint disp=st->setting()->value ( sid+"/display", - ( QVariant ) 1 ).toUInt(); - if (disp>displays) + X2goSettings *st; + QString sid; + if ( !embedMode ) + sid=lastSession->id(); + else + sid="embedded"; + + if (brokerMode) + st=new X2goSettings(config.iniFile,QSettings::IniFormat); + else + st= new X2goSettings( "sessions" ); + uint displays=QApplication::desktop()->numScreens(); + xinerama=st->setting()->value ( sid+"/xinerama", + ( QVariant ) defaultXinerama ).toBool(); + if (st->setting()->value ( sid+"/multidisp", + ( QVariant ) false ).toBool()) { - disp=1; + uint disp=st->setting()->value ( sid+"/display", + ( QVariant ) 1 ).toUInt(); + if (disp>displays) + { + disp=1; + } + resizeProxyWinOnDisplay(disp); + return; } - resizeProxyWinOnDisplay(disp); - return; } - } - if (xinerama) - { - x2goDebug<<"Starting xinerama timer\n"; - lastDisplayGeometry=QRect(); - xineramaScreens.clear(); - xineramaTimer->start(500); + if (xinerama) + { + x2goDebug<<"Starting xinerama timer\n"; + lastDisplayGeometry=QRect(); + xineramaScreens.clear(); + xineramaTimer->start(500); + } } if ( embedMode ) { + x2goDebug<<"checking rootless config"; if ( config.rootless ) { x2goDebug<<"win is rootless"; @@ -10265,7 +10286,7 @@ void ONMainWindow::slotStartParec () QString scmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf "+ - "parec > /dev/null &sleep 1 && kill %1"; + "parec 1> /dev/null & sleep 1 && kill %1"; paProc=new SshProcess ( sshConnection, this ); paProc->startNormal ( scmd ); diff --git a/onmainwindow.h b/onmainwindow.h index 66b21e8..2d75273 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -520,6 +520,7 @@ private: bool noSessionEdit; bool cleanAllFiles; bool PGPInited; + bool resumeAfterSuspending; struct SshProxy sshProxy; QString sshPort; QString clientSshPort; diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 9eba130..bac6bf8 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -498,6 +498,7 @@ void SshMasterConnection::addChannelConnection ( SshProcess* creator, int sock, void SshMasterConnection::addChannelConnection ( SshProcess* creator, QString cmd ) { + ChannelConnection con; con.channel=NULL; con.sock=-1; diff --git a/sshprocess.cpp b/sshprocess.cpp index e8f0ea6..a0734ba 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -130,7 +130,11 @@ void SshProcess::tunnelLoop() void SshProcess::startNormal(const QString& cmd) { - masterCon->addChannelConnection(this, cmd); + QString shcmd = "sh -c \""+cmd+"\""; +// #ifdef DEBUG + x2goDebug<<"executing remote command: "<<shcmd<<endl; +// #endif + masterCon->addChannelConnection(this, shcmd); connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); connect(masterCon,SIGNAL(channelClosed(SshProcess*)), this,SLOT(slotChannelClosed(SshProcess*))); } diff --git a/version.h b/version.h index 2ca866f..98195c3 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define VERSION "3.99.2.1" +#define VERSION "3.99.2.2" diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 8dccd18..857f720 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1600,7 +1600,7 @@ sound system connections through firewalls</source> </translation> </message> <message> - <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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">X2GoClient V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf x2go.org.</translation> </message> <message> @@ -1730,11 +1730,11 @@ Please check your settings</source> <translation type="obsolete">X2GoClient V. </translation> </message> <message> - <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> @@ -2137,7 +2137,7 @@ Unsaved documents will be lost</source> <translation>Die Sitzung wird beendet. Sind Sie sicher? Ungespeicherte Dokumente gehen verloren</translation> </message> <message> - <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> @@ -2252,7 +2252,7 @@ Sie können SSHD über folgenden Befehl installieren: </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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> Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> diff --git a/x2goclient_en.ts b/x2goclient_en.ts index f7265b3..7c6d945 100644 --- a/x2goclient_en.ts +++ b/x2goclient_en.ts @@ -1510,7 +1510,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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="unfinished"></translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 58fd675..d64753f 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1504,7 +1504,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index c41b517..9cff146 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1242,7 +1242,7 @@ </translation> </message> <message> - <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source>X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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">X2Go Client V. 2.0.1 (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> @@ -1375,11 +1375,11 @@ Vennligst sjekk instillingene dine</translation> <translation type="obsolete">X2Go Client V. </translation> </message> <message> - <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> - <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation> </message> <message> @@ -1791,7 +1791,7 @@ Unsaved documents will be lost</source> Ulagrede data vil gå tapt</translation> </message> <message> - <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> @@ -1906,7 +1906,7 @@ Du kan installere sshd med: </message> <message> <location filename="onmainwindow_part3.cpp" line="1722"/> - <source> 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 authentification 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> + <source> 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> Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 892ba70..897e501 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1716,7 +1716,7 @@ Public key hash: </translation> <translation type="obsolete">X2Go Client V. </translation> </message> <message> - <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации.</transl ation> </message> <message> @@ -1757,7 +1757,7 @@ Please check your settings</source> Проверьте настройки</translation> </message> <message> - <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2008 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более деталь� �ой информации.</translation> </message> <message> @@ -2123,7 +2123,7 @@ Unsaved documents will be lost</source> Все несохраненные документы будут утеряны</translation> </message> <message> - <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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 authentification 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> + <source> (C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) 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"> (C. 2006-2009 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более деталь� �ой информации. </translation> </message> <message> @@ -2238,7 +2238,7 @@ you can install sshd with </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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> Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации.</translation> </message> <message> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 434baed..bc730bc 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -1527,7 +1527,7 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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> Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis xdm). Besök <a href="http://www.x2go.org">www.x2go.org</a> för vidare information.</translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 5cc86b0..89b1fd0 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -1518,7 +1518,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1703"/> - <source> 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 authentification 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> + <source> 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="unfinished"></translation> </message> <message> diff --git a/x2goplugin.rc b/x2goplugin.rc index ea22b6a..c9604a6 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,2,1 - PRODUCTVERSION 3,99,2,1 + FILEVERSION 3,99,2,2 + PRODUCTVERSION 3,99,2,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 2 ,1\0" + VALUE "FileVersion", "3, 99, 2 ,2\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.2.1\0" - VALUE "ProductVersion", "3, 99, 2, 1\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.2.2\0" + VALUE "ProductVersion", "3, 99, 2, 2\0" END END BLOCK "VarFileInfo" 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).

1 0

x2goclient.git - master (branch) updated: 3.99.2.1-11-ga0461e2
by git-admin＠x2go.org 10 Aug '12

10 Aug '12

The branch, master has been updated via a0461e289073d223db2f486fa171f7fbd3be7707 (commit) via aa415c595f148c275dd8847263b75238f5cc5707 (commit) from a2d95c0c106923162bb510c88806b7384786b97d (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 ----------------------------------------------------------------- commit a0461e289073d223db2f486fa171f7fbd3be7707 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 10 10:09:01 2012 +0200 release 3.99.2.2 commit aa415c595f148c275dd8847263b75238f5cc5707 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 10 10:08:46 2012 +0200 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 31fa55d..deb8d65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.2-0~x2go2) UNRELEASED; urgency=low +x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (3.99.2.2): @@ -17,11 +17,12 @@ x2goclient (3.99.2.2-0~x2go2) UNRELEASED; urgency=low sessions the session has to be suspended first. [ Oleksandr Shneyder ] - * Fixing X2Go Plugin - * Cleaning code: double click on running session. Instead of using function "sleep" - starting resume-session after suspend-session is returned + * New upstream version (3.99.2.2): + - Fixing X2Go Plugin + - Cleaning code: double click on running session. Instead of using function + "sleep" starting resume-session after suspend-session is returned. - -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 08 Aug 2012 11:32:08 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 10 Aug 2012 10:08:52 +0200 x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low 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).

1 0

x2goclient.git - master (branch) updated: 3.99.2.1-9-ga2d95c0
by git-admin＠x2go.org 08 Aug '12

08 Aug '12

The branch, master has been updated via a2d95c0c106923162bb510c88806b7384786b97d (commit) from 3335fca16afaa0792207228115e31630894dee71 (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 ----------------------------------------------------------------- commit a2d95c0c106923162bb510c88806b7384786b97d Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Wed Aug 8 11:34:37 2012 +0200 Cleaning code: double click on running session. Instead of using function "sleep" starting resume-session after suspend-session is returned ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- onmainwindow.cpp | 27 ++++++++++++++++++--------- onmainwindow.h | 1 + 3 files changed, 23 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 443d9d2..31fa55d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.2.2-0~x2go2) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.2.2): @@ -18,8 +18,10 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Fixing X2Go Plugin + * Cleaning code: double click on running session. Instead of using function "sleep" + starting resume-session after suspend-session is returned - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:17:02 +0200 + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Wed, 08 Aug 2012 11:32:08 +0200 x2goclient (3.99.2.1-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 965cbf8..1bded10 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -101,6 +101,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) noSessionEdit=false; lastSession=0l; changeBrokerPass=false; + resumeAfterSuspending=false; appSeparator=0; @@ -3956,15 +3957,19 @@ void ONMainWindow::slotResumeSess() { x2goSession s=getSelectedSession(); QDesktopWidget wd; - if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) { - if ( s.status=="R" ) { - suspendSession ( s.sessionId ); - x2goDebug << "sleeping for two seconds between suspending and resuming"; - int sleeptime = 2; - while ((sleeptime = sleep (sleeptime))) {}; + if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) + { + if ( s.status=="R" && ! resumeAfterSuspending) + { + resumeAfterSuspending=true; + slotSuspendSess(); + return; } + resumeAfterSuspending=false; resumeSession ( s ); - } else { + } + else + { QString depth=QString::number ( s.colorDepth ); int res; if ( s.colorDepth==24 || s.colorDepth==32 ) @@ -4131,6 +4136,10 @@ void ONMainWindow::slotRetSuspSess ( bool result, QString output, } if ( selectSessionDlg->isVisible() ) selectSessionDlg->setEnabled ( true ); + if (resumeAfterSuspending) + { + slotResumeSess(); + } } @@ -8950,8 +8959,8 @@ void ONMainWindow::startSshd() void ONMainWindow::setProxyWinTitle() { - if(embedMode) - return; + if (embedMode) + return; QString title; diff --git a/onmainwindow.h b/onmainwindow.h index 66b21e8..2d75273 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -520,6 +520,7 @@ private: bool noSessionEdit; bool cleanAllFiles; bool PGPInited; + bool resumeAfterSuspending; struct SshProxy sshProxy; QString sshPort; QString clientSshPort; 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).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2012