x2go-commits July 2011

x2go-commits@lists.x2go.org

1 participants
232 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-121-g226086a
by git-admin＠x2go.org 26 Jul '11

26 Jul '11

The branch, master has been updated via 226086a5935aa13fb2e6222c111b5d1182a0fb8a (commit) from b053c030b22066f5a712e2c4dd25c0be0f7dc256 (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 226086a5935aa13fb2e6222c111b5d1182a0fb8a Author: Reinhard Tartler <siretart(a)tauware.de> Date: Mon Jul 25 20:56:25 2011 +0200 fix $realuser variable after 6ec99657c4be82fe659cf3d13614be7a9734a380 Obviously, the code assumes that $realuser contains the user name instead of the userid. This should unbreak for instance the cleanup daemon after switching from sudo to perlsuid. ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2gosqlitewrapper.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index d598691..de8b5b9 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -31,8 +31,8 @@ my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expi my $dbfile="$homedir/x2go_sessions"; # retrieve account data of real user -my $realuser=$<; -my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($realuser); +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($<); +my $realuser=$uname; my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; @@ -310,7 +310,7 @@ sub check_user my $sid=shift or die "argument \"session_id\" missed"; # session id looks like someuser-51-1304005895_stDgnome-session_dp24 my ( $user, $rest ) = split('-', $sid, 2); - $user eq $uname or die "$uname is not authorized (should be $user)"; + $user eq $realuser or die "$realuser is not authorized (should be $user)"; } sub fetchrow_printall_array hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-120-gb053c03
by git-admin＠x2go.org 25 Jul '11

25 Jul '11

The branch, master has been updated via b053c030b22066f5a712e2c4dd25c0be0f7dc256 (commit) via c7f36ada87546eed646b8a8c0805eb774a7262cd (commit) from 08d995e53db7f7d8acc142aa1258b44078c281f5 (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 b053c030b22066f5a712e2c4dd25c0be0f7dc256 Author: Reinhard Tartler <siretart(a)tauware.de> Date: Mon Jul 25 00:07:53 2011 +0200 Allow users to edit their *own* sessions only previously, users could create sessions under wrong uids or delete sessions from other users. This patch implements prevents this by checking the userid of the caller with the session id. commit c7f36ada87546eed646b8a8c0805eb774a7262cd Author: Reinhard Tartler <siretart(a)tauware.de> Date: Mon Jul 25 19:38:17 2011 +0200 Remove files that get cleaned by the Makefile ----------------------------------------------------------------------- Summary of changes: .../html/man8/x2gosetkeyboard.8.html | 61 ----------------- .../.build_man2html/html/man8/x2goversion.8.html | 69 -------------------- .../html/man8/x2gocleansessions.8.html | 49 -------------- .../html/man8/x2gocmdexitmessage.8.html | 49 -------------- .../html/man8/x2golistdesktops.8.html | 49 -------------- .../html/man8/x2golistsessions.8.html | 49 -------------- .../.build_man2html/html/man8/x2gomountdirs.8.html | 49 -------------- .../.build_man2html/html/man8/x2goprint.8.html | 49 -------------- .../html/man8/x2goresume-session.8.html | 49 -------------- .../html/man8/x2goruncommand.8.html | 49 -------------- .../html/man8/x2goshowblocks.8.html | 49 -------------- .../html/man8/x2gostartagent.8.html | 65 ------------------ .../html/man8/x2gosuspend-session.8.html | 49 -------------- .../html/man8/x2goterminate-session.8.html | 49 -------------- .../html/man8/x2goumount-session.8.html | 49 -------------- x2goserver/lib/x2gosqlitewrapper.pl | 23 ++++++- 16 files changed, 20 insertions(+), 786 deletions(-) delete mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html delete mode 100644 x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2golistsessions.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goprint.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goresume-session.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goruncommand.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2gostartagent.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html delete mode 100644 x2goserver/.build_man2html/html/man8/x2goumount-session.8.html The diff of changes is: diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html deleted file mode 100644 index ced3e23..0000000 --- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ /dev/null @@ -1,61 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gosetkeyboard</TITLE> -</HEAD><BODY> -<H1>x2gosetkeyboard</H1> -Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2gosetkeyboard - Allow server-side Keyboard Setting Updates issued by X2go Client -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2gosetkeyboard -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2gosetkeyboard</B> looks for a 'keyboard' file in the X2go session directory and introspects -the X2go session keyboard settings requested from the client side. -<P> - -If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error -will be raised). -<P> - -<A NAME="lbAE"> </A> -<H2>FILES</H2> - -${HOME}/.x2go/C-${X2GO_SESSION}/keyboard -<P> - -<A NAME="lbAF"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">FILES</A><DD> -<DT><A HREF="#lbAF">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html deleted file mode 100644 index 0a994e2..0000000 --- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html +++ /dev/null @@ -1,69 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goversion</TITLE> -</HEAD><BODY> -<H1>x2goversion</H1> -Section: X2go Server Tool (Extension) (8)<BR>Updated: 31 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goversion - Retrieve Code Versions of X2go Server Components -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goversion [<x2go-component>] -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goversion</B> allows to retrieve code versions of X2go server components. -<P> - -If the -<B>[<x2go-component>]</B> parameter is omitted then a list of all available X2go server -component names and versions is listed. -<P> - -If an X2go component is specified with the <B>[<x2go-component>]</B> parameter, then only the -component's version is printed to stdout. -<P> - -The <B>x2goversion</B> tool can be used by X2go client implementations to query server-side versions -of X2go components. -<P> - -<A NAME="lbAE"> </A> -<H2>FILES</H2> - -/usr/share/x2go/versions/VERSION.* -<P> - -<A NAME="lbAF"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">FILES</A><DD> -<DT><A HREF="#lbAF">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html deleted file mode 100644 index bbc70af..0000000 --- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gocleansessions</TITLE> -</HEAD><BODY> -<H1>x2gocleansessions</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2gocleansessions - X2go Server Cleanup Daemon -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2gocleansessions -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2gocleansessions</B> is run as a service on X2go servers to handle the cleanup of stale sessions. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html deleted file mode 100644 index 4daa752..0000000 --- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gocmdexitmessage</TITLE> -</HEAD><BODY> -<H1>x2gocmdexitmessage</H1> -Section: X2go Server Tool (8)<BR>Updated: July 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goexitmessage - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goexitmessage -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goexitmessage</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html deleted file mode 100644 index c2b2183..0000000 --- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2golistdesktops</TITLE> -</HEAD><BODY> -<H1>x2golistdesktops</H1> -Section: X2go Server Tool (8)<BR>Updated: July 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2golistdesktops - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2golistdesktops -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2golistdesktops</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html deleted file mode 100644 index 2c30dce..0000000 --- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2golistsessions</TITLE> -</HEAD><BODY> -<H1>x2golistsessions</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2golistsessions - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2golistsessions -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2golistsessions</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html deleted file mode 100644 index e190c1b..0000000 --- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gomountdirs</TITLE> -</HEAD><BODY> -<H1>x2gomountdirs</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2gomountdirs - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2gomountdirs -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2gomountdirs</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html deleted file mode 100644 index f169cc5..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goprint</TITLE> -</HEAD><BODY> -<H1>x2goprint</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goprint - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goprint -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goprint</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html deleted file mode 100644 index b14a690..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goresume-session</TITLE> -</HEAD><BODY> -<H1>x2goresume-session</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goresume-session - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goresume-session -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goresume-session</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html deleted file mode 100644 index 6eed104..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goruncommand</TITLE> -</HEAD><BODY> -<H1>x2goruncommand</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goruncommand - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goruncommand -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goruncommand</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html deleted file mode 100644 index 6eed104..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goruncommand</TITLE> -</HEAD><BODY> -<H1>x2goruncommand</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goruncommand - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goruncommand -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goruncommand</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html deleted file mode 100644 index 392f103..0000000 --- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html +++ /dev/null @@ -1,65 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gostartagent</TITLE> -</HEAD><BODY> -<H1>x2gostartagent</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2gostartagent - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2gostartagent <geometry> <link-quality> <nx-pack-meth> <cache-type+dpi> <kblayout> <kbtype> <setkbd> <session-type> <command> -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2gostartagent</B> is a script that coordinates the startup process of new X2go sessions. -It expects quite a list of parameters, all of which are obligatory. -<A NAME="lbAE"> </A> -<H2>RETURN VALUES</H2> - -A list of parameters will be returned after a successful session startup. Each value will be presented on -a new line: -<P> -<BR>    <B><X-display-number></B> -<BR>    <B><session-cookie-hash></B> -<BR>    <B><x2goagent-pid></B> -<BR>    <B><session-name></B> -<BR>    <B><graphics-port></B> -<BR>    <B><sound-port></B> -<BR>    <B><sshfs-port></B> -<P> -<P> - -<A NAME="lbAF"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">RETURN VALUES</A><DD> -<DT><A HREF="#lbAF">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html deleted file mode 100644 index a605b8f..0000000 --- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2gosuspend-session</TITLE> -</HEAD><BODY> -<H1>x2gosuspend-session</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2gosuspend-session - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2gosuspend-session -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2gosuspend-session</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html deleted file mode 100644 index b431107..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goterminate-session</TITLE> -</HEAD><BODY> -<H1>x2goterminate-session</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goterminate-session - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goterminate-session -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goterminate-session</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html deleted file mode 100644 index 4f37c92..0000000 --- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html +++ /dev/null @@ -1,49 +0,0 @@ -Content-type: text/html - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<HTML><HEAD><TITLE>Man page of x2goumount-session</TITLE> -</HEAD><BODY> -<H1>x2goumount-session</H1> -Section: X2go Server Tool (8)<BR>Updated: 18 May 2011<BR><A HREF="#index">Index</A> -<A HREF="../index.html">Return to Main Contents</A><HR> - -<A NAME="lbAB"> </A> -<H2>NAME</H2> - -x2goumount-session - X2go Server Script -<A NAME="lbAC"> </A> -<H2>SYNOPSIS</H2> - - - - -x2goumount-session -<P> -<A NAME="lbAD"> </A> -<H2>DESCRIPTION</H2> - -<B>x2goumount-session</B> is one of many scripts belonging to X2go Server. -<P> - -<A NAME="lbAE"> </A> -<H2>AUTHOR</H2> - -This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@das-netzwerkteam.de">mike.gabriel(a)das-netzwerkteam.de</A>> for the X2go project -(<A HREF="http://www.x2go.org)">http://www.x2go.org)</A> -<P> - -<HR> -<A NAME="index"> </A><H2>Index</H2> -<DL> -<DT><A HREF="#lbAB">NAME</A><DD> -<DT><A HREF="#lbAC">SYNOPSIS</A><DD> -<DT><A HREF="#lbAD">DESCRIPTION</A><DD> -<DT><A HREF="#lbAE">AUTHOR</A><DD> -</DL> -<HR> -This document was created by -<A HREF="/cgi-bin/man/man2html">man2html</A>, -using the manual pages.<BR> -Time: 21:20:41 GMT, July 18, 2011 -</BODY> -</HTML> diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 70ee4e5..d598691 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,14 +25,14 @@ use strict; use DBI; use POSIX; -# retrieve home dir of x2gouser +# retrieve home dir of x2gouser my $x2gouser='x2gouser'; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($x2gouser); my $dbfile="$homedir/x2go_sessions"; # retrieve account data of real user my $realuser=$<; -my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($realuser); +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($realuser); my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; @@ -81,6 +81,7 @@ elsif($cmd eq "listsessionsroot_all") elsif($cmd eq "getmounts") { my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); my @strings; my $sth=$dbh->prepare("select client, path from mounts where session_id=?"); $sth->execute($sid)or die; @@ -91,6 +92,7 @@ elsif($cmd eq "deletemount") { my $sid=shift or die "argument \"session_id\" missed"; my $path=shift or die "argument \"path\" missed"; + check_user($sid); my $sth=$dbh->prepare("delete from mounts where session_id=? and path=?"); $sth->execute($sid, $path); $sth->finish(); @@ -101,6 +103,7 @@ elsif($cmd eq "insertmount") my $sid=shift or die "argument \"session_id\" missed"; my $path=shift or die "argument \"path\" missed"; my $client=shift or die "argument \"client\" missed"; + check_user($sid); my $sth=$dbh->prepare("insert into mounts (session_id,path,client) values (?, ?, ?)"); $sth->execute($sid, $path, $client); if(!$sth->err()) @@ -115,6 +118,7 @@ elsif($cmd eq "insertsession") my $display=shift or die "argument \"display\" missed"; my $server=shift or die "argument \"server\" missed"; my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); my $sth=$dbh->prepare("insert into sessions (display,server,uname,session_id, init_time, last_time) values (?, ?, ?, ?, datetime('now','localtime'), datetime('now','localtime'))"); $sth->execute($display, $server, $realuser, $sid) or die $_; @@ -131,6 +135,7 @@ elsif($cmd eq "createsession") my $snd_port=shift or die"argument \"snd_port\" missed"; my $fs_port=shift or die"argument \"fs_port\" missed"; my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); my $sth=$dbh->prepare("update sessions set status='R',last_time=datetime('now','localtime'),cookie=?,agent_pid=?, client=?,gr_port=?,sound_port=?,fs_port=? where session_id=? and uname=?"); $sth->execute($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid, $realuser)or die; @@ -144,6 +149,7 @@ elsif($cmd eq "insertport") my $sid=shift or die "argument \"session_id\" missed"; my $sshport=shift or die "argument \"port\" missed"; my $sth=$dbh->prepare("insert into used_ports (server,session_id,port) values (?, ?, ?)"); + check_user($sid); $sth->execute($server, $sid, $sshport) or die; $sth->finish(); } @@ -152,6 +158,7 @@ elsif($cmd eq "resume") { my $client=shift or die "argument \"client\" missed"; my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R', client=? where session_id = ? and uname=?"); $sth->execute($client, $sid, $realuser) or die; @@ -162,6 +169,7 @@ elsif($cmd eq "changestatus") { my $status=shift or die "argument \"status\" missed"; my $sid=shift or die "argument \"session_id\" missed"; + check_user($sid); my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'), status=? where session_id = ? and uname=?"); $sth->execute($status, $sid, $realuser)or die; @@ -170,7 +178,6 @@ elsif($cmd eq "changestatus") elsif($cmd eq "getdisplays") { - #ignore $server my @strings; my $sth=$dbh->prepare("select display from sessions"); @@ -222,6 +229,7 @@ elsif($cmd eq "getagent") { my $sid=shift or die "argument \"session_id\" missed"; my $agent; + check_user($sid); my $sth=$dbh->prepare("select agent_pid from sessions where session_id=?"); $sth->execute($sid)or die; @@ -239,6 +247,7 @@ elsif($cmd eq "getdisplay") { my $sid=shift or die "argument \"session_id\" missed"; my $display; + check_user($sid); my $sth=$dbh->prepare("select display from sessions where session_id =?"); $sth->execute($sid)or die; @@ -296,6 +305,14 @@ sub checkroot } } +sub check_user +{ + my $sid=shift or die "argument \"session_id\" missed"; + # session id looks like someuser-51-1304005895_stDgnome-session_dp24 + my ( $user, $rest ) = split('-', $sid, 2); + $user eq $uname or die "$uname is not authorized (should be $user)"; +} + sub fetchrow_printall_array { # print all arrays separated by the pipe symbol hooks/post-receive -- x2goserver.git (X2go Server) 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 "x2goserver.git" (X2go Server).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-12-g47c2a3e
by git-admin＠x2go.org 25 Jul '11

25 Jul '11

The branch, master has been updated via 47c2a3e5f824fd97e9751e397237cb79db7a5912 (commit) from 7db65397b994a99066a77b4166c5d0487cb0f974 (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 47c2a3e5f824fd97e9751e397237cb79db7a5912 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 25 08:23:27 2011 +0200 catching a socket.error exception during command execution ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 7153617..475ab43 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -211,6 +211,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sshproxy_session.stop_thread() self.locked = False raise x2go_exceptions.X2goControlSessionException('the X2go control session command timed out') + except socket.error: + self.session_died = True + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + self.locked = False + raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly') finally: self.locked = False timeout.cancel() hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-10-ge68649f
by git-admin＠x2go.org 25 Jul '11

25 Jul '11

The branch, release/0.1.1.x has been updated via e68649f2131e414916354a043b2e2280b3288790 (commit) from 7ad69fbf897ef2698ac99a40071cc04da8aaf585 (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 e68649f2131e414916354a043b2e2280b3288790 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 25 08:23:27 2011 +0200 catching a socket.error exception during command execution ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index b4cb173..ca4f419 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -211,6 +211,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sshproxy_session.stop_thread() self.locked = False raise x2go_exceptions.X2goControlSessionException('the X2go control session command timed out') + except socket.error: + self.session_died = True + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + self.locked = False + raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly') finally: self.locked = False timeout.cancel() hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-13-g289a156
by git-admin＠x2go.org 24 Jul '11

24 Jul '11

The branch, master has been updated via 289a15614c4c08542fe493d3bf6e9160d8c72dc6 (commit) from 74e02a685f1c65f7fa97c851aada2139ce45ca4a (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 289a15614c4c08542fe493d3bf6e9160d8c72dc6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 24 11:28:33 2011 +0200 minor fix for error notification during interactive logon ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/logon.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index ac82ea9..ee8406a 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -351,11 +351,11 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): connect_failed = True except x2go.X2goSSHProxyException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % self.current_profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) connect_failed = True except x2go.X2goSessionException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - auth error') % profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.prepare(_(u'%s - auth error') % self.current_profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) connect_failed = True except: hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-12-g74e02a6
by git-admin＠x2go.org 22 Jul '11

22 Jul '11

The branch, master has been updated via 74e02a685f1c65f7fa97c851aada2139ce45ca4a (commit) via ec56da2f0098bea2426386b7448ec586ae3c27d8 (commit) from 7e7da3c329ae1e67aee844ee39e6676dbe09b5dd (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 74e02a685f1c65f7fa97c851aada2139ce45ca4a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 22 11:49:27 2011 +0200 i18n update (.pot, en.po, de.po) commit ec56da2f0098bea2426386b7448ec586ae3c27d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jul 22 11:45:24 2011 +0200 slight cosmetic change for print-system-availability-check ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 17120 -> 17124 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 16038 -> 16038 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15225 -> 15225 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16282 -> 16282 bytes po/de.po | 425 +++++++++++++++++---------------- po/en.po | 414 +++++++++++++++++--------------- po/es.po | 307 +++++++++++++----------- po/nl.po | 307 +++++++++++++----------- po/pyhoca-gui.pot | 303 ++++++++++++----------- pyhoca/wxgui/printingprefs.py | 4 +- 10 files changed, 916 insertions(+), 844 deletions(-) The diff of changes is: diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index 279c216..8647d78 100644 Binary files a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo index 8423cf4..d82aed9 100644 Binary files a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo index 02bd7c9..27bd7df 100644 Binary files a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 02e9b25..6d414cd 100644 Binary files a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/po/de.po b/po/de.po index df1b802..9184cfe 100644 --- a/po/de.po +++ b/po/de.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-14 08:07+0200\n" -"PO-Revision-Date: 2011-07-14 08:06+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-07-22 11:46+0200\n" +"PO-Revision-Date: 2011-07-22 11:48+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <m.gabriel(a)das-netzwerkteam.de>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Benutzername" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Kennwort" @@ -49,22 +51,27 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/messages.py:111 +#: ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -90,33 +97,36 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:363 +#: ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 +#: ../pyhoca/wxgui/frontend.py:406 #: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:347 +#: ../pyhoca/wxgui/frontend.py:385 #: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer " -"nicht akzeptiert" +#: ../pyhoca/wxgui/logon.py:348 +#: ../pyhoca/wxgui/frontend.py:385 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" #: ../pyhoca/wxgui/logon.py:354 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 +#: ../pyhoca/wxgui/frontend.py:427 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" @@ -157,428 +167,427 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbindungen zu entferntem X2go server aufbauen" -#: ../pyhoca/wxgui/profilemanager.py:62 +#: ../pyhoca/wxgui/profilemanager.py:63 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:64 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:65 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:66 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (ähnlich KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:67 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Umgebung (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:68 msgid "XDMCP Query" msgstr "XDMCP-Serveranfrage (Query)" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:70 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:71 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:73 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "Custom command" msgstr "Benutzerdef. Kommando" -#: ../pyhoca/wxgui/profilemanager.py:75 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "Email Client" msgstr "E-Mail Programm" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:78 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Terminal" msgstr "Terminalkonsole" -#: ../pyhoca/wxgui/profilemanager.py:92 +#: ../pyhoca/wxgui/profilemanager.py:93 msgid "Open file with system's default application" msgstr "Mit Standardanwendung des Systems öffnen" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:94 msgid "Open application chooser dialog" msgstr "Auswahldialog öffnen, um Anwendung auszuwählen" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:95 msgid "Save incoming file as ..." msgstr "Eingehende Datei speichern unter ..." -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:114 msgid "new session profile" msgstr "neues Sitzungsprofil" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:125 +#: ../pyhoca/wxgui/profilemanager.py:126 msgid "Profile " msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:127 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:128 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:129 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:130 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:131 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:132 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:133 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:134 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "File Import" msgstr "Dateiimport" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:140 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Icon" msgstr "Symbol" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:158 +#: ../pyhoca/wxgui/profilemanager.py:159 msgid "RDP settings" msgstr "RDP Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "RSA/DSA private key" msgstr "Privater RSA/DSA Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host[:Port]" msgstr "Hostname[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:186 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:199 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:201 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:217 msgid "Keep current keyboard settings" msgstr "Aktuelle Tastatureinstellungen beibehalten" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Keyboard layout" msgstr "Tastaturlayout" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:251 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:303 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:305 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:644 +#: ../pyhoca/wxgui/profilemanager.py:646 msgid "Session Profile" msgstr "Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:645 +#: ../pyhoca/wxgui/profilemanager.py:647 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:648 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:649 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1025 +#: ../pyhoca/wxgui/profilemanager.py:1036 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1028 +#: ../pyhoca/wxgui/profilemanager.py:1039 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:1156 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1139 -#: ../pyhoca/wxgui/profilemanager.py:1154 +#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1173 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1306 +#: ../pyhoca/wxgui/profilemanager.py:1325 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1371 -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1382 -#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1390 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 +#: ../pyhoca/wxgui/profilemanager.py:1401 +#: ../pyhoca/wxgui/profilemanager.py:1411 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1371 +#: ../pyhoca/wxgui/profilemanager.py:1390 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1401 msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" -"Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." +msgstr "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1411 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." -msgstr "" -"Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um " -"einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " -"Einstellungen entsprechend ändern." +msgstr "Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:1431 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1432 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1417 +#: ../pyhoca/wxgui/profilemanager.py:1436 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1437 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -603,7 +612,8 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:407 msgid "E&xit" msgstr "&Beenden" @@ -675,7 +685,8 @@ msgstr "Sitzung starten/fortsetzen" msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Über %s ..." @@ -685,17 +696,12 @@ msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." #: ../pyhoca/wxgui/frontend.py:392 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " -"Benutzer nicht akzeptiert" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" #: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "" -"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " -"versuchen..." +msgstr "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal versuchen..." #: ../pyhoca/wxgui/frontend.py:420 #, python-format @@ -767,19 +773,27 @@ msgstr "%s - Verbindungsfehler" #: ../pyhoca/wxgui/frontend.py:698 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " -"Sie, sich neu am Server anzumelden..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" #: ../pyhoca/wxgui/frontend.py:708 +msgid "The session startup failed." +msgstr "Der Start der Sitzung ist fehlgeschlagen." + +#: ../pyhoca/wxgui/frontend.py:715 +#, python-format +msgid "The command ,,%s'' is not available on X2go server." +msgstr "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar." + +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -788,60 +802,50 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " -"wurde vom X2go Server abgelehnt." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s wurde vom X2go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " -"verweigert. Die Sitzung konnte nicht gestartet werden." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:732 -msgid "" -"The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" -"Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " -"verfügbar." +#: ../pyhoca/wxgui/frontend.py:741 +msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." +msgstr "Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:747 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:735 +#: ../pyhoca/wxgui/frontend.py:744 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:747 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -850,12 +854,13 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:755 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "%s\n" @@ -866,7 +871,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "" "%s\n" @@ -877,12 +882,13 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:770 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "New X2go session starting up...\n" @@ -891,7 +897,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "" "Another client started X2go session\n" @@ -900,12 +906,13 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "" "Resuming X2go session...\n" @@ -914,7 +921,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "" "Another client resumed X2go session\n" @@ -923,12 +930,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "" "Found already running session\n" @@ -937,12 +944,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "" "X2go Session has been suspended\n" @@ -951,12 +958,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "" "X2go Session has terminated\n" @@ -998,7 +1005,8 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" @@ -1036,47 +1044,51 @@ msgstr "Benutzerdefiniertes Druckkommando ausführen" msgid "<Select a print action here>" msgstr "<Bearbeitungsmodus für Druckauftrag hier wählen>" -#: ../pyhoca/wxgui/printingprefs.py:98 +#: ../pyhoca/wxgui/printingprefs.py:105 msgid "Print action" msgstr "Aktion für aktuellen Druckauftrag" -#: ../pyhoca/wxgui/printingprefs.py:100 +#: ../pyhoca/wxgui/printingprefs.py:107 msgid "Default action for incoming print jobs" msgstr "Aktion für eingehende Druckaufträge" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:104 +#: ../pyhoca/wxgui/printingprefs.py:111 msgid "PDF viewer command" msgstr "Anwendung für PDF-Anzeige" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:111 +#: ../pyhoca/wxgui/printingprefs.py:118 msgid "Save PDFs to folder" msgstr "PDF in Ordner speichern" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:118 +#: ../pyhoca/wxgui/printingprefs.py:125 msgid "Use this printer" msgstr "Hier drucken" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:122 +#: ../pyhoca/wxgui/printingprefs.py:129 msgid "Custom print command" msgstr "Benutzerdef. Druckkommando" -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:134 msgid "Apply" msgstr "Anwenden" -#: ../pyhoca/wxgui/printingprefs.py:129 +#: ../pyhoca/wxgui/printingprefs.py:136 msgid "Print" msgstr "Drucken" -#: ../pyhoca/wxgui/printingprefs.py:312 +#: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- print system is not available -" +msgstr "- das Drucksystem ist nicht bereit -" + +#: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" msgstr "Applikation für PDF-Anzeige auswählen" -#: ../pyhoca/wxgui/printingprefs.py:328 +#: ../pyhoca/wxgui/printingprefs.py:350 msgid "Choose PDF saving location" msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" @@ -1086,10 +1098,8 @@ msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" #, fuzzy #~ msgid "New Profile" #~ msgstr "Profil" - #~ msgid "%s - print job" #~ msgstr "%s - Druckauftrag" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" @@ -1097,9 +1107,8 @@ msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" #~ "Druckdialog für eingehende Druckaufträge ist bislang nicht " #~ "implementiert!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profilsymbol" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/en.po b/po/en.po index 530d83c..4449c30 100644 --- a/po/en.po +++ b/po/en.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-14 08:07+0200\n" -"PO-Revision-Date: 2011-07-14 08:06+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-07-22 11:46+0200\n" +"PO-Revision-Date: 2011-07-22 11:47+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <m.gabriel(a)das-netzwerkteam.de>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: English\n" "X-Poedit-Country: UNITED STATES\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Username" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Password" @@ -49,22 +51,27 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/messages.py:111 +#: ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -90,32 +97,36 @@ msgstr "%s - ssh proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 -#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:363 +#: ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 +#: ../pyhoca/wxgui/frontend.py:406 #: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/logon.py:347 +#: ../pyhoca/wxgui/frontend.py:385 #: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:348 +#: ../pyhoca/wxgui/frontend.py:385 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "The remote server's host key is invalid or has not been accepted by the user" #: ../pyhoca/wxgui/logon.py:354 #, python-format msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#: ../pyhoca/wxgui/logon.py:358 +#: ../pyhoca/wxgui/frontend.py:427 #, python-format msgid "%s - auth error" msgstr "%s - auth error" @@ -158,427 +169,429 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Client for connecting you to a remote X2go server" -#: ../pyhoca/wxgui/profilemanager.py:62 +#: ../pyhoca/wxgui/profilemanager.py:63 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:64 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:65 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:66 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:67 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:68 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:70 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminal Server (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:71 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:73 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "Custom command" msgstr "Custom command" -#: ../pyhoca/wxgui/profilemanager.py:75 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Internet Browser" msgstr "Internet Browser" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "Email Client" msgstr "Email Client" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:78 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:92 +#: ../pyhoca/wxgui/profilemanager.py:93 msgid "Open file with system's default application" msgstr "Open file with system's default application" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:94 msgid "Open application chooser dialog" msgstr "Open application chooser dialog" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:95 msgid "Save incoming file as ..." msgstr "Save incoming file as ..." -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:114 msgid "new session profile" msgstr "new session profile" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:125 +#: ../pyhoca/wxgui/profilemanager.py:126 msgid "Profile " msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:127 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:128 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:129 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:130 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:131 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:132 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:133 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:134 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "File Import" msgstr "File Import" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:140 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Icon" msgstr "Icon" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:158 +#: ../pyhoca/wxgui/profilemanager.py:159 msgid "RDP settings" msgstr "RDP settings" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "XDMCP server" msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "RSA/DSA private key" msgstr "RSA/DSA private key" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:186 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:199 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:201 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:217 msgid "Keep current keyboard settings" msgstr "Keep current keyboard settings" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Keyboard layout" msgstr "Keyboard layout" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:251 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:303 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:305 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:644 +#: ../pyhoca/wxgui/profilemanager.py:646 msgid "Session Profile" msgstr "Session Profile" -#: ../pyhoca/wxgui/profilemanager.py:645 +#: ../pyhoca/wxgui/profilemanager.py:647 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:648 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:649 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1025 +#: ../pyhoca/wxgui/profilemanager.py:1036 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1028 +#: ../pyhoca/wxgui/profilemanager.py:1039 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:1156 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1139 -#: ../pyhoca/wxgui/profilemanager.py:1154 +#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1173 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1306 +#: ../pyhoca/wxgui/profilemanager.py:1325 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1371 -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1382 -#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1390 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 +#: ../pyhoca/wxgui/profilemanager.py:1401 +#: ../pyhoca/wxgui/profilemanager.py:1411 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1371 +#: ../pyhoca/wxgui/profilemanager.py:1390 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1401 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1411 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:1431 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1432 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1417 +#: ../pyhoca/wxgui/profilemanager.py:1436 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1437 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -603,7 +616,8 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:407 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:407 msgid "E&xit" msgstr "E&xit" @@ -675,7 +689,8 @@ msgstr "Start/Resume Session" msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -685,10 +700,8 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." #: ../pyhoca/wxgui/frontend.py:392 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"The SSH proxy's host key is invalid or has not been accepted by the user" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "The SSH proxy's host key is invalid or has not been accepted by the user" #: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." @@ -764,19 +777,27 @@ msgstr "%s - channel error" #: ../pyhoca/wxgui/frontend.py:698 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "%s - session failure" msgstr "%s - session failure" #: ../pyhoca/wxgui/frontend.py:708 +msgid "The session startup failed." +msgstr "The session startup failed." + +#: ../pyhoca/wxgui/frontend.py:715 +#, python-format +msgid "The command ,,%s'' is not available on X2go server." +msgstr "The command ,,%s'' is not available on X2go server." + +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -785,59 +806,50 @@ msgstr "" "The command ,,%s'' is not available on X2go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:732 -msgid "" -"The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" -"The X2go PulseAudio system is not available within Remote Desktop sessions." +#: ../pyhoca/wxgui/frontend.py:741 +msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." +msgstr "The X2go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:747 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:735 +#: ../pyhoca/wxgui/frontend.py:744 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:747 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -846,12 +858,13 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:755 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "%s\n" @@ -862,7 +875,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "" "%s\n" @@ -873,12 +886,13 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:770 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "New X2go session starting up...\n" @@ -887,7 +901,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "" "Another client started X2go session\n" @@ -896,12 +910,13 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "" "Resuming X2go session...\n" @@ -910,7 +925,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "" "Another client resumed X2go session\n" @@ -919,12 +934,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "" "Found already running session\n" @@ -933,12 +948,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "" "X2go Session has been suspended\n" @@ -947,12 +962,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "" "X2go Session has terminated\n" @@ -993,7 +1008,8 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1031,68 +1047,68 @@ msgstr "Run custom print command" msgid "<Select a print action here>" msgstr "<Select a print action here>" -#: ../pyhoca/wxgui/printingprefs.py:98 +#: ../pyhoca/wxgui/printingprefs.py:105 msgid "Print action" msgstr "Print action" -#: ../pyhoca/wxgui/printingprefs.py:100 +#: ../pyhoca/wxgui/printingprefs.py:107 msgid "Default action for incoming print jobs" msgstr "Default action for incoming print jobs" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:104 +#: ../pyhoca/wxgui/printingprefs.py:111 msgid "PDF viewer command" msgstr "PDF viewer command" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:111 +#: ../pyhoca/wxgui/printingprefs.py:118 msgid "Save PDFs to folder" msgstr "Save PDFs to folder" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:118 +#: ../pyhoca/wxgui/printingprefs.py:125 msgid "Use this printer" msgstr "Use this printer" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:122 +#: ../pyhoca/wxgui/printingprefs.py:129 msgid "Custom print command" msgstr "Custom print command" -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:134 msgid "Apply" msgstr "Apply" -#: ../pyhoca/wxgui/printingprefs.py:129 +#: ../pyhoca/wxgui/printingprefs.py:136 msgid "Print" msgstr "Print" -#: ../pyhoca/wxgui/printingprefs.py:312 +#: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- print system is not available -" +msgstr "- print system is not available -" + +#: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" msgstr "Choose PDF viewer application" -#: ../pyhoca/wxgui/printingprefs.py:328 +#: ../pyhoca/wxgui/printingprefs.py:350 msgid "Choose PDF saving location" msgstr "Choose PDF saving location" #~ msgid "All session profiles are connected" #~ msgstr "All session profiles are connected" - #~ msgid "New Profile" #~ msgstr "New Profile" - #~ msgid "%s - print job" #~ msgstr "%s - print job" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/es.po b/po/es.po index 7480d8a..f2adc7f 100644 --- a/po/es.po +++ b/po/es.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"POT-Creation-Date: 2011-07-22 11:46+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: es <oceanosoftlapalma(a)gmail.com>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,8 +49,8 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Cancelar" @@ -160,407 +160,407 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Cliente para conexiones remotas a servidores X2go" -#: ../pyhoca/wxgui/profilemanager.py:62 +#: ../pyhoca/wxgui/profilemanager.py:63 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:64 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:65 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:66 #, fuzzy msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3-like)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:67 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:68 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:70 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminal Server (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:71 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 msgid "Custom command" msgstr "Comando personalizado" -#: ../pyhoca/wxgui/profilemanager.py:75 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Internet Browser" msgstr "Navegador web" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "Email Client" msgstr "Cliente de Correo" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:78 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:92 +#: ../pyhoca/wxgui/profilemanager.py:93 msgid "Open file with system's default application" msgstr "Abrir archivo con la aplicación por defecto" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:94 msgid "Open application chooser dialog" msgstr "Abrir selector de aplicaciones" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:95 msgid "Save incoming file as ..." msgstr "Guardar archivo recibido como ..." -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:114 msgid "new session profile" msgstr "Nuevo Perfil de Sesión" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:125 +#: ../pyhoca/wxgui/profilemanager.py:126 msgid "Profile " msgstr "Perfil " -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:127 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:128 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:129 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:130 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:131 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:132 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:133 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:134 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "File Import" msgstr "Importar Archivo" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:140 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Name" msgstr "Nombre" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Icon" msgstr "Icono" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:158 +#: ../pyhoca/wxgui/profilemanager.py:159 msgid "RDP settings" msgstr "Parámetros RDP" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "XDMCP server" msgstr "Servidor XDMCP" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "RSA/DSA private key" msgstr "Clave privada RSA/DSA" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host[:Port]" msgstr "Host[:Puerto]" -#: ../pyhoca/wxgui/profilemanager.py:186 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:199 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:201 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:217 msgid "Keep current keyboard settings" msgstr "Mantener configuración actual del teclado" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Keyboard layout" msgstr "Máscara de teclado" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 #, fuzzy msgid "Use file MIME box for local file import" msgstr "Usar arrastrar archivos para la importar archivos locales" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:251 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:303 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:305 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:644 +#: ../pyhoca/wxgui/profilemanager.py:646 msgid "Session Profile" msgstr "Perfil de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:645 +#: ../pyhoca/wxgui/profilemanager.py:647 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:648 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:649 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1025 +#: ../pyhoca/wxgui/profilemanager.py:1036 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1028 +#: ../pyhoca/wxgui/profilemanager.py:1039 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:1156 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1139 -#: ../pyhoca/wxgui/profilemanager.py:1154 +#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1173 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1306 +#: ../pyhoca/wxgui/profilemanager.py:1325 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1371 -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1382 -#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1390 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 +#: ../pyhoca/wxgui/profilemanager.py:1401 +#: ../pyhoca/wxgui/profilemanager.py:1411 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1371 +#: ../pyhoca/wxgui/profilemanager.py:1390 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1401 #, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1411 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -568,21 +568,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:1431 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1432 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1417 +#: ../pyhoca/wxgui/profilemanager.py:1436 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1437 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -781,12 +781,25 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:717 ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" #: ../pyhoca/wxgui/frontend.py:708 +#, fuzzy +msgid "The session startup failed." +msgstr "Nuevo Perfil de Sesión" + +#: ../pyhoca/wxgui/frontend.py:715 +#, fuzzy, python-format +msgid "The command ,,%s'' is not available on X2go server." +msgstr "" +"El comando ,,%s'' no está presente en el servidor X2go\n" +"%s." + +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -795,12 +808,12 @@ msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "%s - session warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -809,7 +822,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2go." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -818,37 +831,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:744 ../pyhoca/wxgui/frontend.py:747 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:735 +#: ../pyhoca/wxgui/frontend.py:744 msgid "The X2go PulseAudio system could not be started." msgstr "El sistema X2go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:747 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -857,12 +870,12 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:755 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "%s\n" @@ -873,7 +886,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "" "%s\n" @@ -884,12 +897,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:770 ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "New X2go session starting up...\n" @@ -898,7 +911,7 @@ msgstr "" "Iniciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "" "Another client started X2go session\n" @@ -907,12 +920,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "" "Resuming X2go session...\n" @@ -921,7 +934,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "" "Another client resumed X2go session\n" @@ -930,12 +943,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "" "Found already running session\n" @@ -944,12 +957,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "" "X2go Session has been suspended\n" @@ -958,12 +971,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "" "X2go Session has terminated\n" @@ -997,7 +1010,7 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1035,47 +1048,51 @@ msgstr "Ejecutar comando de impresión personalizado" msgid "<Select a print action here>" msgstr "<Elegir la opción de impresión aquí>" -#: ../pyhoca/wxgui/printingprefs.py:98 +#: ../pyhoca/wxgui/printingprefs.py:105 msgid "Print action" msgstr "Imprimir" -#: ../pyhoca/wxgui/printingprefs.py:100 +#: ../pyhoca/wxgui/printingprefs.py:107 msgid "Default action for incoming print jobs" msgstr "Acción por defecto para los trabajos de impresión recibidos" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:104 +#: ../pyhoca/wxgui/printingprefs.py:111 msgid "PDF viewer command" msgstr "Comando para abrir el visor PDF" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:111 +#: ../pyhoca/wxgui/printingprefs.py:118 msgid "Save PDFs to folder" msgstr "Guardar PDFs en una carpeta" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:118 +#: ../pyhoca/wxgui/printingprefs.py:125 msgid "Use this printer" msgstr "Usar esta impresora" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:122 +#: ../pyhoca/wxgui/printingprefs.py:129 msgid "Custom print command" msgstr "Comando de impresión personalizado" -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:134 msgid "Apply" msgstr "Aplicar" -#: ../pyhoca/wxgui/printingprefs.py:129 +#: ../pyhoca/wxgui/printingprefs.py:136 msgid "Print" msgstr "Imprimir" -#: ../pyhoca/wxgui/printingprefs.py:312 +#: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- print system is not available -" +msgstr "" + +#: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" msgstr "Elegir visor PDF" -#: ../pyhoca/wxgui/printingprefs.py:328 +#: ../pyhoca/wxgui/printingprefs.py:350 msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" diff --git a/po/nl.po b/po/nl.po index d092cce..4203ddf 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"POT-Creation-Date: 2011-07-22 11:46+0200\n" "PO-Revision-Date: 2011-07-14 08:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: \n" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" "X-Poedit-SourceCharset: utf-8\n" @@ -49,8 +49,8 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Afbreken" @@ -157,402 +157,402 @@ msgstr "" "PyHoca-GUI (Python X2goClient)\n" "Verbinding met remote X2go server aan het opbouwen" -#: ../pyhoca/wxgui/profilemanager.py:62 +#: ../pyhoca/wxgui/profilemanager.py:63 msgid "GNOME Desktop (GNOME)" msgstr "GNOME Desktop (GNOME)" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:64 msgid "K Desktop Environment (KDE)" msgstr "K Desktop Environment (KDE)" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:65 msgid "Lightweight X Desktop (LXDE)" msgstr "Lightweight X Desktop (LXDE)" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:66 msgid "Trinity X Desktop (KDE3-like)" msgstr "Trinity X Desktop (KDE3)" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:67 msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:68 msgid "XDMCP Query" msgstr "XDMCP Query" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:70 msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:71 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:75 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:78 msgid "Openoffice.org" msgstr "Openoffice.org" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Terminal" msgstr "Terminal" -#: ../pyhoca/wxgui/profilemanager.py:92 +#: ../pyhoca/wxgui/profilemanager.py:93 msgid "Open file with system's default application" msgstr "Open bestand met het geassocieerde programma" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:94 msgid "Open application chooser dialog" msgstr "Open dialoog, om Applicatie te kiezen" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:95 msgid "Save incoming file as ..." msgstr "Opslaan bestand als ..." -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:114 msgid "new session profile" msgstr "Nieuw Profiel" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:125 +#: ../pyhoca/wxgui/profilemanager.py:126 msgid "Profile " msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:127 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:128 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:129 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:130 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:131 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:132 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:133 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:134 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "File Import" msgstr "Bestands import" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:140 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Name" msgstr "Naam" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Icon" msgstr "Icon" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:158 +#: ../pyhoca/wxgui/profilemanager.py:159 msgid "RDP settings" msgstr "RDP instellingen" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "RSA/DSA private key" msgstr "Private RSA/DSA Key" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:186 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:199 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:201 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:217 msgid "Keep current keyboard settings" msgstr "Huidige toetsenbord-instellingen behouden" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Keyboard layout" msgstr "Toetsenbord layout" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:251 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:303 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:305 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:644 +#: ../pyhoca/wxgui/profilemanager.py:646 msgid "Session Profile" msgstr "Sessie Profiel" -#: ../pyhoca/wxgui/profilemanager.py:645 +#: ../pyhoca/wxgui/profilemanager.py:647 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:648 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:649 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1025 +#: ../pyhoca/wxgui/profilemanager.py:1036 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1028 +#: ../pyhoca/wxgui/profilemanager.py:1039 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:1156 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1139 -#: ../pyhoca/wxgui/profilemanager.py:1154 +#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1173 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1306 +#: ../pyhoca/wxgui/profilemanager.py:1325 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1371 -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1382 -#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1390 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 +#: ../pyhoca/wxgui/profilemanager.py:1401 +#: ../pyhoca/wxgui/profilemanager.py:1411 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1371 +#: ../pyhoca/wxgui/profilemanager.py:1390 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1401 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1411 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -563,21 +563,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:1431 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1432 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1417 +#: ../pyhoca/wxgui/profilemanager.py:1436 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1437 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -771,12 +771,25 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:717 ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" #: ../pyhoca/wxgui/frontend.py:708 +#, fuzzy +msgid "The session startup failed." +msgstr "Nieuw Profiel" + +#: ../pyhoca/wxgui/frontend.py:715 +#, fuzzy, python-format +msgid "The command ,,%s'' is not available on X2go server." +msgstr "" +"Het commando ,,%s'' is niet beschikbaar op de X2go server\n" +"%s" + +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -785,12 +798,12 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -799,7 +812,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -808,36 +821,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:744 ../pyhoca/wxgui/frontend.py:747 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:735 +#: ../pyhoca/wxgui/frontend.py:744 msgid "The X2go PulseAudio system could not be started." msgstr "Het X2go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:747 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Het X2go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -846,12 +859,12 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:755 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "%s\n" @@ -862,7 +875,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "" "%s\n" @@ -873,12 +886,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:770 ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "New X2go session starting up...\n" @@ -887,7 +900,7 @@ msgstr "" "Nieuwe X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "" "Another client started X2go session\n" @@ -896,12 +909,12 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "" "Resuming X2go session...\n" @@ -910,7 +923,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "" "Another client resumed X2go session\n" @@ -919,12 +932,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "" "Found already running session\n" @@ -933,12 +946,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "" "X2go Session has been suspended\n" @@ -947,12 +960,12 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "" "X2go Session has terminated\n" @@ -993,7 +1006,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1031,47 +1044,51 @@ msgstr "Afdrukken met speciaal commando" msgid "<Select a print action here>" msgstr "<Selecteer hier een print activiteit>" -#: ../pyhoca/wxgui/printingprefs.py:98 +#: ../pyhoca/wxgui/printingprefs.py:105 msgid "Print action" msgstr "Afdrukken" -#: ../pyhoca/wxgui/printingprefs.py:100 +#: ../pyhoca/wxgui/printingprefs.py:107 msgid "Default action for incoming print jobs" msgstr "Standaard actie voor inkomende afdruk taak" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:104 +#: ../pyhoca/wxgui/printingprefs.py:111 msgid "PDF viewer command" msgstr "PDF viewer command" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:111 +#: ../pyhoca/wxgui/printingprefs.py:118 msgid "Save PDFs to folder" msgstr "Opslaan PDFs in map" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:118 +#: ../pyhoca/wxgui/printingprefs.py:125 msgid "Use this printer" msgstr "Gebruik deze printer" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:122 +#: ../pyhoca/wxgui/printingprefs.py:129 msgid "Custom print command" msgstr "Afdruk commando" -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:134 msgid "Apply" msgstr "Toepassen" -#: ../pyhoca/wxgui/printingprefs.py:129 +#: ../pyhoca/wxgui/printingprefs.py:136 msgid "Print" msgstr "Afdrukken" -#: ../pyhoca/wxgui/printingprefs.py:312 +#: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- print system is not available -" +msgstr "" + +#: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" msgstr "Kies PDF viewer toepassing" -#: ../pyhoca/wxgui/printingprefs.py:328 +#: ../pyhoca/wxgui/printingprefs.py:350 msgid "Choose PDF saving location" msgstr "Kies locatie om PDF op te slaan" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 3ca1f83..c69b162 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"POT-Creation-Date: 2011-07-22 11:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -46,8 +45,8 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "" @@ -146,402 +145,402 @@ msgid "" "Client for connecting you to a remote X2go server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:62 +#: ../pyhoca/wxgui/profilemanager.py:63 msgid "GNOME Desktop (GNOME)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:63 +#: ../pyhoca/wxgui/profilemanager.py:64 msgid "K Desktop Environment (KDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:64 +#: ../pyhoca/wxgui/profilemanager.py:65 msgid "Lightweight X Desktop (LXDE)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:65 +#: ../pyhoca/wxgui/profilemanager.py:66 msgid "Trinity X Desktop (KDE3-like)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:66 +#: ../pyhoca/wxgui/profilemanager.py:67 msgid "Unity X Desktop Shell (UNITY)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:67 +#: ../pyhoca/wxgui/profilemanager.py:68 msgid "XDMCP Query" msgstr "" #. 'EMBEDDED_MENU': _(u'Embedded Application Menu'), -#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:70 msgid "Windows Terminal Server (RDP-proxy)" msgstr "" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:71 +#: ../pyhoca/wxgui/profilemanager.py:72 msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:73 ../pyhoca/wxgui/profilemanager.py:157 msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:75 +#: ../pyhoca/wxgui/profilemanager.py:76 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:76 +#: ../pyhoca/wxgui/profilemanager.py:77 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:77 +#: ../pyhoca/wxgui/profilemanager.py:78 msgid "Openoffice.org" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:78 +#: ../pyhoca/wxgui/profilemanager.py:79 msgid "Terminal" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:92 +#: ../pyhoca/wxgui/profilemanager.py:93 msgid "Open file with system's default application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:93 +#: ../pyhoca/wxgui/profilemanager.py:94 msgid "Open application chooser dialog" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 +#: ../pyhoca/wxgui/profilemanager.py:95 msgid "Save incoming file as ..." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:113 +#: ../pyhoca/wxgui/profilemanager.py:114 msgid "new session profile" msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:125 +#: ../pyhoca/wxgui/profilemanager.py:126 msgid "Profile " msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:126 +#: ../pyhoca/wxgui/profilemanager.py:127 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:127 +#: ../pyhoca/wxgui/profilemanager.py:128 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:128 +#: ../pyhoca/wxgui/profilemanager.py:129 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:129 +#: ../pyhoca/wxgui/profilemanager.py:130 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:130 +#: ../pyhoca/wxgui/profilemanager.py:131 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:131 +#: ../pyhoca/wxgui/profilemanager.py:132 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:132 +#: ../pyhoca/wxgui/profilemanager.py:133 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:133 +#: ../pyhoca/wxgui/profilemanager.py:134 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:134 +#: ../pyhoca/wxgui/profilemanager.py:135 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:135 +#: ../pyhoca/wxgui/profilemanager.py:136 msgid "File Import" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:140 +#: ../pyhoca/wxgui/profilemanager.py:141 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Icon" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:158 +#: ../pyhoca/wxgui/profilemanager.py:159 msgid "RDP settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:159 +#: ../pyhoca/wxgui/profilemanager.py:160 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:161 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:163 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "XDMCP server" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:170 ../pyhoca/wxgui/profilemanager.py:180 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:184 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:186 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:199 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:201 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:203 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:216 +#: ../pyhoca/wxgui/profilemanager.py:217 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:217 +#: ../pyhoca/wxgui/profilemanager.py:218 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:220 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:230 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:240 ../pyhoca/wxgui/profilemanager.py:257 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:242 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:244 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:250 +#: ../pyhoca/wxgui/profilemanager.py:251 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:261 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:299 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:301 +#: ../pyhoca/wxgui/profilemanager.py:303 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:303 +#: ../pyhoca/wxgui/profilemanager.py:305 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:644 +#: ../pyhoca/wxgui/profilemanager.py:646 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:645 +#: ../pyhoca/wxgui/profilemanager.py:647 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:646 +#: ../pyhoca/wxgui/profilemanager.py:648 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:647 +#: ../pyhoca/wxgui/profilemanager.py:649 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1025 +#: ../pyhoca/wxgui/profilemanager.py:1036 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1028 +#: ../pyhoca/wxgui/profilemanager.py:1039 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1137 +#: ../pyhoca/wxgui/profilemanager.py:1156 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1139 -#: ../pyhoca/wxgui/profilemanager.py:1154 +#: ../pyhoca/wxgui/profilemanager.py:1158 +#: ../pyhoca/wxgui/profilemanager.py:1173 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1306 +#: ../pyhoca/wxgui/profilemanager.py:1325 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1371 -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1382 -#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1390 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 +#: ../pyhoca/wxgui/profilemanager.py:1401 +#: ../pyhoca/wxgui/profilemanager.py:1411 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1371 +#: ../pyhoca/wxgui/profilemanager.py:1390 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1374 -#: ../pyhoca/wxgui/profilemanager.py:1377 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1396 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1401 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1411 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -549,21 +548,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:1431 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1432 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1417 +#: ../pyhoca/wxgui/profilemanager.py:1436 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1437 msgid "Changes to profile have been saved." msgstr "" @@ -749,78 +748,88 @@ msgid "" "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:715 +#: ../pyhoca/wxgui/frontend.py:717 ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "%s - session failure" msgstr "" #: ../pyhoca/wxgui/frontend.py:708 +msgid "The session startup failed." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:715 +#, python-format +msgid "The command ,,%s'' is not available on X2go server." +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:723 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:729 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:741 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:744 ../pyhoca/wxgui/frontend.py:747 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:735 +#: ../pyhoca/wxgui/frontend.py:744 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:747 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:741 +#: ../pyhoca/wxgui/frontend.py:750 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:755 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "%s\n" @@ -828,7 +837,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "" "%s\n" @@ -836,74 +845,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:770 ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:774 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:778 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/frontend.py:786 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:790 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:797 +#: ../pyhoca/wxgui/frontend.py:806 #, python-format msgid "" "X2go Session has terminated\n" @@ -935,7 +944,7 @@ msgstr "" msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "" @@ -973,46 +982,50 @@ msgstr "" msgid "<Select a print action here>" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:98 +#: ../pyhoca/wxgui/printingprefs.py:105 msgid "Print action" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:100 +#: ../pyhoca/wxgui/printingprefs.py:107 msgid "Default action for incoming print jobs" msgstr "" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:104 +#: ../pyhoca/wxgui/printingprefs.py:111 msgid "PDF viewer command" msgstr "" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:111 +#: ../pyhoca/wxgui/printingprefs.py:118 msgid "Save PDFs to folder" msgstr "" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:118 +#: ../pyhoca/wxgui/printingprefs.py:125 msgid "Use this printer" msgstr "" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:122 +#: ../pyhoca/wxgui/printingprefs.py:129 msgid "Custom print command" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:134 msgid "Apply" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:129 +#: ../pyhoca/wxgui/printingprefs.py:136 msgid "Print" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:312 +#: ../pyhoca/wxgui/printingprefs.py:227 +msgid "- print system is not available -" +msgstr "" + +#: ../pyhoca/wxgui/printingprefs.py:334 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:328 +#: ../pyhoca/wxgui/printingprefs.py:350 msgid "Choose PDF saving location" msgstr "" diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index ff1bb64..25693a9 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -224,9 +224,9 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): except KeyError: _printer_name = self._availablePrinters[self._defaultPrinter] else: - _printer_name = _(u'Print system is not available') + _printer_name = _(u'- print system is not available -') self.PrintPrinter.Clear() - self.PrintPrinter.Append(_(u'Print system is not available')) + self.PrintPrinter.Append(_(_printer_name)) self.PrintPrinter.Enable(False) self.PrintPrinter.SetValue(_printer_name) self.PrintCmd.SetValue(self.client_printing.get_property('print_cmd')) hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-10-g7e7da3c
by git-admin＠x2go.org 21 Jul '11

21 Jul '11

The branch, master has been updated via 7e7da3c329ae1e67aee844ee39e6676dbe09b5dd (commit) from 31ac7716441e4b3171556141e5f9b5fe9eb9c305 (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 7e7da3c329ae1e67aee844ee39e6676dbe09b5dd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 23:33:23 2011 +0200 remove debug code ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index b37b9e6..d3f0254 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1144,7 +1144,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def OnCompressionSelected(self, event): _pack = self.Compression.GetValue() - print _pack if _pack.endswith('-%'): self.ImageQuality.Enable(True) else: hooks/post-receive -- pyhoca-gui.git (Python X2go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2go Client (wxPython GUI)).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-9-g7ad69fb
by git-admin＠x2go.org 21 Jul '11

21 Jul '11

The branch, release/0.1.1.x has been updated via 7ad69fbf897ef2698ac99a40071cc04da8aaf585 (commit) from a22d5eac8b65ec2e8ca6d5f618b8c2e68bdcf873 (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 7ad69fbf897ef2698ac99a40071cc04da8aaf585 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 23:28:25 2011 +0200 fix for link quality patch ----------------------------------------------------------------------- Summary of changes: x2go/utils.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/utils.py b/x2go/utils.py index 8aaf6df..9bf38b1 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -199,7 +199,8 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): # append value for quality to value for pack method if _params['quality']: _params['pack'] = '%s-%s' % (_params['pack'], _params['quality']) - del _params['quality'] + # delete quality in any case... + del _params['quality'] del _params['fstunnel'] hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-11-g7db6539
by git-admin＠x2go.org 21 Jul '11

21 Jul '11

The branch, master has been updated via 7db65397b994a99066a77b4166c5d0487cb0f974 (commit) from afd1e9684b2722ce4a3239f7a8c55f7114157460 (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 7db65397b994a99066a77b4166c5d0487cb0f974 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 23:28:25 2011 +0200 fix for link quality patch ----------------------------------------------------------------------- Summary of changes: x2go/utils.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/utils.py b/x2go/utils.py index 866abaa..fb6dac4 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -199,7 +199,8 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): # append value for quality to value for pack method if _params['quality']: _params['pack'] = '%s-%s' % (_params['pack'], _params['quality']) - del _params['quality'] + # delete quality in any case... + del _params['quality'] del _params['fstunnel'] hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.4-8-ga22d5ea
by git-admin＠x2go.org 20 Jul '11

20 Jul '11

The branch, release/0.1.1.x has been updated via a22d5eac8b65ec2e8ca6d5f618b8c2e68bdcf873 (commit) from aecf8d324f31c87b2a3da85ba337ff36b2e3ce02 (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 a22d5eac8b65ec2e8ca6d5f618b8c2e68bdcf873 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 21 00:29:06 2011 +0200 Renamed/restructured NX compression pack method names. ----------------------------------------------------------------------- Summary of changes: x2go/defaults.py | 64 +++++++++++++++++++++++++++--------------------------- x2go/utils.py | 4 +- 2 files changed, 34 insertions(+), 34 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index bc682ad..c3627af 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -289,19 +289,19 @@ X2GO_SESSIONPROFILE_DEFAULTS = { # here is a list of NX 3.x compression methods, this is the "%"-hashed list that # can also be used for printing in help texts, docs etc. # The "%"-sign can be replaced by digits 0-9. -pack_methods_nx3 = ['nopack','8','64','256','512','4k','32k','64k','256k','2m','16m', - '256-rdp','256-rdp-compressed','32k-rdp','32k-rdp-compressed','64k-rdp', - '64k-rdp-compressed','16m-rdp','16m-rdp-compressed', - 'rfb-hextile','rfb-tight','rfb-tight-compressed', - '8-tight','64-tight','256-tight','512-tight','4k-tight','32k-tight', - '64k-tight','256k-tight','2m-tight','16m-tight', - '8-jpeg-%','64-jpeg','256-jpeg','512-jpeg','4k-jpeg','32k-jpeg', - '64k-jpeg','256k-jpeg','2m-jpeg','16m-jpeg-%', - '8-png-jpeg-%','64-png-jpeg','256-png-jpeg','512-png-jpeg','4k-png-jpeg', - '32k-png-jpeg','64k-png-jpeg','256k-png-jpeg','2m-png-jpeg','16m-png-jpeg-%', - '8-png-%','64-png','256-png','512-png','4k-Apng', - '32k-png','64k-png','256k-png','2m-png','16m-png-%', - '16m-rgb-%','16m-rle-%',] +pack_methods_nx3_noqual = ['nopack','8','64','256','512','4k','32k','64k','256k','2m','16m', + '256-rdp','256-rdp-compressed','32k-rdp','32k-rdp-compressed','64k-rdp', + '64k-rdp-compressed','16m-rdp','16m-rdp-compressed', + 'rfb-hextile','rfb-tight','rfb-tight-compressed', + '8-tight','64-tight','256-tight','512-tight','4k-tight','32k-tight', + '64k-tight','256k-tight','2m-tight','16m-tight', + '8-jpeg-%','64-jpeg','256-jpeg','512-jpeg','4k-jpeg','32k-jpeg', + '64k-jpeg','256k-jpeg','2m-jpeg','16m-jpeg-%', + '8-png-jpeg-%','64-png-jpeg','256-png-jpeg','512-png-jpeg','4k-png-jpeg', + '32k-png-jpeg','64k-png-jpeg','256k-png-jpeg','2m-png-jpeg','16m-png-jpeg-%', + '8-png-%','64-png','256-png','512-png','4k-png', + '32k-png','64k-png','256k-png','2m-png','16m-png-%', + '16m-rgb-%','16m-rle-%',] """Available NX3 compression methods.""" # use for printing on screen... @@ -319,26 +319,26 @@ pack_methods_nx3_formatted=""" \'%s\' \'%s\' \'%s\' -""" % ('\', \''.join(pack_methods_nx3[0:11]), \ - '\', \''.join(pack_methods_nx3[11:16]), \ - '\', \''.join(pack_methods_nx3[16:19]), \ - '\', \''.join(pack_methods_nx3[19:22]), \ - '\', \''.join(pack_methods_nx3[22:28]), \ - '\', \''.join(pack_methods_nx3[28:32]), \ - '\', \''.join(pack_methods_nx3[32:38]), \ - '\', \''.join(pack_methods_nx3[38:42]), \ - '\', \''.join(pack_methods_nx3[42:47]), \ - '\', \''.join(pack_methods_nx3[47:52]), \ - '\', \''.join(pack_methods_nx3[52:57]), \ - '\', \''.join(pack_methods_nx3[57:62]), \ - '\', \''.join(pack_methods_nx3[62:])) - -# _pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options +""" % ('\', \''.join(pack_methods_nx3_noqual[0:11]), \ + '\', \''.join(pack_methods_nx3_noqual[11:16]), \ + '\', \''.join(pack_methods_nx3_noqual[16:19]), \ + '\', \''.join(pack_methods_nx3_noqual[19:22]), \ + '\', \''.join(pack_methods_nx3_noqual[22:28]), \ + '\', \''.join(pack_methods_nx3_noqual[28:32]), \ + '\', \''.join(pack_methods_nx3_noqual[32:38]), \ + '\', \''.join(pack_methods_nx3_noqual[38:42]), \ + '\', \''.join(pack_methods_nx3_noqual[42:47]), \ + '\', \''.join(pack_methods_nx3_noqual[47:52]), \ + '\', \''.join(pack_methods_nx3_noqual[52:57]), \ + '\', \''.join(pack_methods_nx3_noqual[57:62]), \ + '\', \''.join(pack_methods_nx3_noqual[62:])) + +# pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options # against -_pack_methods_nx3 = [ m for m in pack_methods_nx3 if "%" not in m ] -for meth in [ m for m in pack_methods_nx3 if "%" in m ]: - _pack_methods_nx3 += [ meth.replace('%','%s' % str(i)) for i in range(0,10) ] - +pack_methods_nx3 = [ m for m in pack_methods_nx3_noqual if "%" not in m ] +for meth in [ m for m in pack_methods_nx3_noqual if "%" in m ]: + pack_methods_nx3 += [ meth.replace('%','%s' % str(i)) for i in range(0,10) ] +pack_methods_nx3.sort() ## ## X2go session defaults ## diff --git a/x2go/utils.py b/x2go/utils.py index a9b173c..8aaf6df 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -40,7 +40,7 @@ import subprocess from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS from defaults import X2GO_SESSIONPROFILE_DEFAULTS as _X2GO_SESSIONPROFILE_DEFAULTS from defaults import X2GO_MIMEBOX_ACTIONS as _X2GO_MIMEBOX_ACTIONS -from defaults import _pack_methods_nx3 +from defaults import pack_methods_nx3 if _X2GOCLIENT_OS == 'Windows': import win32api @@ -51,7 +51,7 @@ def is_in_nx3packmethods(method): Test if a given compression method is valid for NX3 Proxy. """ - return method in _pack_methods_nx3 + return method in pack_methods_nx3 def find_session_line_in_x2golistsessions(session_name, x2go_stdout): hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits July 2011