x2go-commits November 2011

x2go-commits@lists.x2go.org

1 participants
130 discussions

x2goserver.git - master (branch) updated: 3.0.99.8-26-gcdc1a1f
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via cdc1a1f3713ccd23d7ca35d3263a53ed8372844c (commit) from 123bd195c9288a5606bd1b4f807bbdc5651e907f (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 cdc1a1f3713ccd23d7ca35d3263a53ed8372844c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 13:07:19 2011 +0100 shell-script-fails-syntax-check ./usr/bin/x2gosessiontitle ----------------------------------------------------------------------- Summary of changes: x2goserver-pyhoca/bin/x2gosessiontitle | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle index 6eccba1..c6d4111 100755 --- a/x2goserver-pyhoca/bin/x2gosessiontitle +++ b/x2goserver-pyhoca/bin/x2gosessiontitle @@ -31,7 +31,7 @@ test -z $SESSION_NAME && exit 0 if [ "x$X2GO_FEATURE_SESSIONTITLE" == "xenabled" ]; then - if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ];; then + if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ]; then if [ "$X2GO_STYPE" == "S" ]; then 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.8-25-g123bd19
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 123bd195c9288a5606bd1b4f807bbdc5651e907f (commit) via 0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772 (commit) from 202213dfd8d860923fd3560cbb59ae99a21a61e3 (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 123bd195c9288a5606bd1b4f807bbdc5651e907f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 13:05:10 2011 +0100 complete build env of x2goserver-pyhoca commit 0ddcb23f0faddfecec4c16bcc67ee7fddf2d1772 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 13:01:57 2011 +0100 Add new binary package to x2goserver source: x2goserver-pyhoca. ----------------------------------------------------------------------- Summary of changes: Makefile | 6 ++ debian/changelog | 1 + debian/control | 22 +++++++ ...rver-extensions.dirs => x2goserver-pyhoca.dirs} | 0 debian/x2goserver-pyhoca.docs | 1 + debian/x2goserver-pyhoca.install | 3 + debian/x2goserver-pyhoca.manpages | 1 + .../Makefile | 9 +-- .../VERSION.x2goserver-pyhoca | 0 x2goserver-pyhoca/bin/x2gosessiontitle | 66 ++++++++++++++++++++ x2goserver-pyhoca/bin/x2gosetkeyboard | 64 +++++++++++++++++++ x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 | 34 ++++++++++ .../share/x2gofeature.d/x2goserver-pyhoca.features | 3 +- 13 files changed, 204 insertions(+), 6 deletions(-) copy debian/{x2goserver-extensions.dirs => x2goserver-pyhoca.dirs} (100%) create mode 100644 debian/x2goserver-pyhoca.docs create mode 100644 debian/x2goserver-pyhoca.install create mode 100644 debian/x2goserver-pyhoca.manpages copy {x2goserver-printing => x2goserver-pyhoca}/Makefile (90%) copy x2goserver-compat/VERSION.x2goserver-compat => x2goserver-pyhoca/VERSION.x2goserver-pyhoca (100%) create mode 100755 x2goserver-pyhoca/bin/x2gosessiontitle create mode 100755 x2goserver-pyhoca/bin/x2gosetkeyboard create mode 100644 x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 copy x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features => x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features (92%) The diff of changes is: diff --git a/Makefile b/Makefile index 657dcfc..e7efc9f 100755 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ build_man2html: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ clean: cd x2goserver && make $@ @@ -18,6 +19,7 @@ clean: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ build-arch: cd x2goserver && make $@ @@ -25,6 +27,7 @@ build-arch: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ build-indep: cd x2goserver && make $@ @@ -32,6 +35,7 @@ build-indep: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ install: cd x2goserver && make $@ @@ -39,6 +43,7 @@ install: cd x2goserver-compat && make $@ cd x2goserver-extensions && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ uninstall: cd x2goserver-extensions && make $@ @@ -46,5 +51,6 @@ uninstall: cd x2goserver-printing && make $@ cd x2goserver && make $@ cd x2goserver-xsession && make $@ + cd x2goserver-pyhoca && make $@ diff --git a/debian/changelog b/debian/changelog index e41088b..1b2d499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Fix x2godbadmin for Perl versions < 5.10.x. - Remove x2gosetkeyboard from x2goserver-extensions package. * Add psmisc package as dependency. + * Add new binary package to x2goserver source: x2goserver-pyhoca. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100 diff --git a/debian/control b/debian/control index 53e444b..404934b 100644 --- a/debian/control +++ b/debian/control @@ -165,3 +165,25 @@ Description: X2go server daemon scripts (Xsession runner) startups and many more Xsession related features on X2go session login automagically. +Package: x2goserver-pyhoca +Architecture: all +Depends: + ${misc:Depends}, + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), +Description: X2go server daemon scripts (add-ons for pyhoca client) + X2go is a server based computing environment with + - session resuming + - low bandwith support + - LDAP support + - client side mass storage mounting support + - audio support + - authentication by smartcard and USB stick + . + This X2go server add-on adds extra functionality when using + the pyhoca client (GUI or cmdline tool). The installation + of this package is completely optional, the pyhoca client + will work without. + . + Functionalities this package adds: + - renaming of session window titles + - setting detailled X keyboard parameters diff --git a/debian/x2goserver-extensions.dirs b/debian/x2goserver-pyhoca.dirs similarity index 100% copy from debian/x2goserver-extensions.dirs copy to debian/x2goserver-pyhoca.dirs diff --git a/debian/x2goserver-pyhoca.docs b/debian/x2goserver-pyhoca.docs new file mode 100644 index 0000000..6652b35 --- /dev/null +++ b/debian/x2goserver-pyhoca.docs @@ -0,0 +1 @@ +x2goserver-pyhoca/.build_man2html/html diff --git a/debian/x2goserver-pyhoca.install b/debian/x2goserver-pyhoca.install new file mode 100644 index 0000000..7ba0b60 --- /dev/null +++ b/debian/x2goserver-pyhoca.install @@ -0,0 +1,3 @@ +x2goserver-pyhoca/bin/x2go* /usr/bin/ +x2goserver-pyhoca/VERSION.x2goserver-pyhoca /usr/share/x2go/versions/ +x2goserver-pyhoca/share/x2gofeature.d/* /usr/share/x2go/x2gofeature.d/ diff --git a/debian/x2goserver-pyhoca.manpages b/debian/x2goserver-pyhoca.manpages new file mode 100644 index 0000000..845a36c --- /dev/null +++ b/debian/x2goserver-pyhoca.manpages @@ -0,0 +1 @@ +x2goserver-pyhoca/man/man8/* \ No newline at end of file diff --git a/x2goserver-printing/Makefile b/x2goserver-pyhoca/Makefile similarity index 90% copy from x2goserver-printing/Makefile copy to x2goserver-pyhoca/Makefile index 04f93bf..aa6a562 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -15,7 +15,7 @@ PREFIX=/usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin -#LIBDIR=$(PREFIX)/lib/x2go +LIBDIR=$(PREFIX)/lib/x2go MANDIR=$(PREFIX)/share/man SHAREDIR=$(PREFIX)/share/x2go @@ -53,11 +53,10 @@ install: install_scripts install_config install_man install_version install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) # $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) -# $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ -# $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: @@ -76,7 +75,7 @@ install_man: install_version: $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions - $(INSTALL_FILE) VERSION.x2goserver-printing $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing + $(INSTALL_FILE) VERSION.x2goserver-pyhoca $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version @@ -99,5 +98,5 @@ uninstall_man: $(RM_DIR) $(DESTDIR)$(MANDIR) || true uninstall_version: - $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-printing + $(RM_FILE) $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-pyhoca $(RM_DIR) $(DESTDIR)$(SHAREDIR)/versions || true diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca similarity index 100% copy from x2goserver-compat/VERSION.x2goserver-compat copy to x2goserver-pyhoca/VERSION.x2goserver-pyhoca diff --git a/x2goserver-pyhoca/bin/x2gosessiontitle b/x2goserver-pyhoca/bin/x2gosessiontitle new file mode 100755 index 0000000..6eccba1 --- /dev/null +++ b/x2goserver-pyhoca/bin/x2gosessiontitle @@ -0,0 +1,66 @@ +#!/bin/bash + +# Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2007-2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +# do nothing if called from an established X2Go session... +test -n $X2GO_SESSION && exit 0 + +# do nothing if called from some non-x2gostartagent context... +test -z $SESSION_NAME && exit 0 + +if [ "x$X2GO_FEATURE_SESSIONTITLE" == "xenabled" ]; then + + if [ -z "${X2GO_SESSION_WINDOW_TITLE}" ] && [ -n "$X2GO_CMD" ];; then + + if [ "$X2GO_STYPE" == "S" ]; then + + if [ "x${SHADOW_MODE}" == "x1" ]; then + SHADOW_ACCESS="full" + else + SHADOW_ACCESS="view-only" + fi + + SESSION_WINDOW_TITLE="Shadow Desktop on ${HOSTNAME} shared" + if [ "x${SHADOW_USER}" == "x${SHADREQ_USER}" ]; then + SESSION_WINDOW_TITLE+=" in ${SHADOW_ACCESS} mode by/with yourself" + else + SESSION_WINDOW_TITLE+=" by ${SHADOW_USER}, granting ${SHADOW_ACCESS} access to ${SHADREQ_USER}" + fi + + X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" + + else + SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME}" + fi + + fi + + X2GO_SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})" + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''" + +else + X2GO_SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" +fi + +echo -n "$X2GO_SESSION_WINDOW_TITLE" diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard new file mode 100755 index 0000000..4073fa9 --- /dev/null +++ b/x2goserver-pyhoca/bin/x2gosetkeyboard @@ -0,0 +1,64 @@ +#!/bin/bash + +# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +set -e + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +# set up paths +X2GO_SESSION_ROOT=${HOME}/.x2go +X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION} + +# client keyboard configuration +X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard + +test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 + +read_keyboard_file() { + + # retrieve keyboard settings from keyboard file in X2go session dir + XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) + +} + +update_keymap() { + + # prepare for setxkbmap call + [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES" + [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL" + [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT" + [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT" + [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS" + + # update keyboard map + setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS +} + +### main ### +read_keyboard_file +update_keymap diff --git a/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 new file mode 100644 index 0000000..e77ee77 --- /dev/null +++ b/x2goserver-pyhoca/man/man8/x2gosetkeyboard.8 @@ -0,0 +1,34 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" +.SH NAME +x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client +.SH SYNOPSIS +'nh +.fi +.ad l +x2gosetkeyboard + +.SH DESCRIPTION +\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects +the X2go session keyboard settings requested from the client side. +.PP +If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error +will be raised). +.SH RETURN VALUES +If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is +returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the +expected location, a zero-exitcode is returned. +.PP +If the command fails on its way, then the exitcode of the failing command is returned. +.SH FILES +${HOME}/.x2go/C-${X2GO_SESSION}/keyboard +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features similarity index 92% copy from x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features copy to x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features index 9fb329e..183aa7d 100755 --- a/x2goserver-xsession/share/x2gofeature.d/x2goserver-xsession.features +++ b/x2goserver-pyhoca/share/x2gofeature.d/x2goserver-pyhoca.features @@ -29,7 +29,8 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_XSESSION") echo "ok"; exit 0;; + "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; + "X2GO_SET_SESSIONTITLE") echo "ok"; exit 0;; *) exit -1;; esac 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.8-23-g202213d
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 202213dfd8d860923fd3560cbb59ae99a21a61e3 (commit) from 52e277550101af3b80dc306ede67a5a9b94937ff (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 202213dfd8d860923fd3560cbb59ae99a21a61e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 13:00:32 2011 +0100 Remove x2gosetkeyboard from x2goserver-extensions package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-extensions/bin/x2gosetkeyboard | 64 -------------------- x2goserver-extensions/man/man8/x2gosetkeyboard.8 | 34 ---------- .../x2gofeature.d/x2goserver-extensions.features | 1 - 4 files changed, 1 insertions(+), 99 deletions(-) delete mode 100755 x2goserver-extensions/bin/x2gosetkeyboard delete mode 100644 x2goserver-extensions/man/man8/x2gosetkeyboard.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0261825..e41088b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2goserver (3.0.99.9-0~x2go1) UNRELEASED; urgency=low - Allow client-side setting of session window title. - Fix x2gobasepath for Perl versions < 5.10.x. - Fix x2godbadmin for Perl versions < 5.10.x. + - Remove x2gosetkeyboard from x2goserver-extensions package. * Add psmisc package as dependency. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 25 Nov 2011 11:38:46 +0100 diff --git a/x2goserver-extensions/bin/x2gosetkeyboard b/x2goserver-extensions/bin/x2gosetkeyboard deleted file mode 100755 index 4073fa9..0000000 --- a/x2goserver-extensions/bin/x2gosetkeyboard +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - -set -e - -X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` - -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" - -# set up paths -X2GO_SESSION_ROOT=${HOME}/.x2go -X2GO_SESSION_DIR=${X2GO_SESSION_ROOT}/C-${X2GO_SESSION} - -# client keyboard configuration -X2GO_CLIENT_KBD_FILE=${X2GO_SESSION_DIR}/keyboard - -test -f ${X2GO_CLIENT_KBD_FILE} || exit 0 - -read_keyboard_file() { - - # retrieve keyboard settings from keyboard file in X2go session dir - XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1) - -} - -update_keymap() { - - # prepare for setxkbmap call - [ -n "$XKB_RULES" ] && XKB_RULES="-rules $XKB_RULES" - [ -n "$XKB_MODEL" ] && XKB_MODEL="-model $XKB_MODEL" - [ -n "$XKB_LAYOUT" ] && XKB_LAYOUT="-layout $XKB_LAYOUT" - [ -n "$XKB_VARIANT" ] && XKB_VARIANT="-variant $XKB_VARIANT" - [ -n "$XKB_OPTIONS" ] && XKB_OPTIONS="-options $XKB_OPTIONS" - - # update keyboard map - setxkbmap $XKB_RULES $XKB_MODEL $XKB_LAYOUT $XKB_VARIANT $XKB_OPTIONS -} - -### main ### -read_keyboard_file -update_keymap diff --git a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 b/x2goserver-extensions/man/man8/x2gosetkeyboard.8 deleted file mode 100644 index e77ee77..0000000 --- a/x2goserver-extensions/man/man8/x2gosetkeyboard.8 +++ /dev/null @@ -1,34 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "31 May 2011" "Version 3.0.99.x" "X2go Server Tool (Extension)" -.SH NAME -x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2go Client -.SH SYNOPSIS -'nh -.fi -.ad l -x2gosetkeyboard - -.SH DESCRIPTION -\fBx2gosetkeyboard\fR looks for a 'keyboard' file in the X2go session directory and introspects -the X2go session keyboard settings requested from the client side. -.PP -If no 'keyboard' file is present in the X2go session directory, nothing happens (i.e. no error -will be raised). -.SH RETURN VALUES -If \fBx2gosetkeyboard\fR successfully sets the session's keyboard parameters an exit code of 0 is -returned. Also, if the file ${HOME}/.x2go/C-${X2GO_SESSION}/keyboard is not presented at the -expected location, a zero-exitcode is returned. -.PP -If the command fails on its way, then the exitcode of the failing command is returned. -.SH FILES -${HOME}/.x2go/C-${X2GO_SESSION}/keyboard -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 7e50dd7..509e5a4 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -29,7 +29,6 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; "X2GO_RUN_EXTENSIONS") echo "ok"; exit 0;; *) exit -1;; 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.8-22-g52e2775
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 52e277550101af3b80dc306ede67a5a9b94937ff (commit) via 8084d7edbc6a7efaf38debe468a1a7a25fd6d1eb (commit) from f21aa45a5759d2d167050e069a829e615ceb865d (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 52e277550101af3b80dc306ede67a5a9b94937ff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 12:58:22 2011 +0100 revert latest session renaming changes and provide functionality via an x2gofeature commit 8084d7edbc6a7efaf38debe468a1a7a25fd6d1eb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 12:21:48 2011 +0100 add syslog debug line that shows the value of ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 42 ++++++++-------------------------------- 1 files changed, 9 insertions(+), 33 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 5ad46fd..60b9c96 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -29,7 +29,10 @@ SSH_PORT=30000 #First ssh port 30001 X2GO_ROOT=${HOME}/.x2go REMOTE=localhost + X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'` +$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''" + X2GO_GEOMETRY=$1; shift X2GO_LINK=$1; shift X2GO_PACK=$1; shift @@ -235,43 +238,16 @@ fi # run x2goserver-extensions for pre-start x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true -if [ "$X2GO_STYPE" == "S" ]; then - if [ "x${SHADOW_MODE}" == "x1" ]; then - SHADOW_ACCESS="full" - else - SHADOW_ACCESS="view-only" - fi - - SESSION_WINDOW_TITLE="Shadow Desktop on ${HOSTNAME} shared" - if [ "x${SHADOW_USER}" == "x${SHADREQ_USER}" ]; then - SESSION_WINDOW_TITLE+=" in ${SHADOW_ACCESS} mode by/with yourself" - else - SESSION_WINDOW_TITLE+=" by ${SHADOW_USER}, granting ${SHADOW_ACCESS} access to ${SHADREQ_USER}" - fi - SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})" +# rename session window title if supported by server+client +x2gofeature X2GO_SET_SESSIONTITLE && SESSION_WINDOW_TITLE=$(x2gosessiontitle) || SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" - test -z "${X2GO_SESSION_WINDOW_TITLE}" && { - X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" - } || { - X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})" - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''" - } - LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & +if [ "$X2GO_STYPE" == "S" ]; then + LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & else - if [ -n "$X2GO_CMD" ]; then - SESSION_WINDOW_TITLE="${X2GO_CMD} for ${USER}@${HOSTNAME} (X2GO-${SESSION_NAME})" - else - SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" - fi - test -z "${X2GO_SESSION_WINDOW_TITLE}" && { - X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" - } || { - X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})" - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''" - } - LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & + LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & fi + X2GO_AGENT_PID=$! X2GO_AGENT_RETVAL=$? test $X2GO_AGENT_RETVAL && { 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-7-g1445656
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 1445656e56e4d00aded6ff7b98b33cb728822b71 (commit) from 020f8ed7b3049b7eecb5ea66600a2ccf9d64b0ee (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 1445656e56e4d00aded6ff7b98b33cb728822b71 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:41:03 2011 +0100 remove debug line of 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 9f8b06b..a8b32d8 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -928,7 +928,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if not re.match('^.*:(1|0)$', _shared_folder): _shared_folder = "%s:1" % _shared_folder - print _shared_folder _shared_folder_path = ":".join(_shared_folder.split(':')[:-1]) if int(_shared_folder.split(':')[-1]): _shared_folder_autoconnect = _("automatically") 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.10-6-g020f8ed
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 020f8ed7b3049b7eecb5ea66600a2ccf9d64b0ee (commit) from 51c9f51ab03af63dd9d5400ece25ad8b3c48a838 (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 020f8ed7b3049b7eecb5ea66600a2ccf9d64b0ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:37:44 2011 +0100 Update of i18n files: en, de, es. ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 18072 -> 18206 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 16917 -> 17051 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 18023 -> 18179 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16724 -> 16781 bytes debian/changelog | 1 + po/bg.po | 166 +++++++++--------- po/de.po | 317 +++++++++++++++++---------------- po/en.po | 303 ++++++++++++++++---------------- po/es.po | 318 +++++++++++++++++---------------- po/nl.po | 302 ++++++++++++++++---------------- po/pyhoca-gui.pot | 165 +++++++++-------- 11 files changed, 794 insertions(+), 778 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 6f0c238..a9bd13a 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 436e2df..446776b 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 0025dd3..cb6fe2c 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 928a67a..731c285 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/debian/changelog b/debian/changelog index 66ce84a..031429c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.0.11): - Add XFCE4 support. - Add support for renaming session window titles from the client-side. + - Update of i18n files: en, de, es. * Depend on Python X2Go 0.1.1.9. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 diff --git a/po/bg.po b/po/bg.po index 0e0e63f..c4ea9e6 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-09 03:24+0100\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: Bulgarian\n" "X-Poedit-Country: Bulgaria\n" @@ -50,7 +50,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "" @@ -197,7 +197,7 @@ msgstr "" msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "" @@ -290,292 +290,296 @@ msgid "Icon" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:164 -msgid "Type" +msgid "Session Window Title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:166 +msgid "Type" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -583,21 +587,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/de.po b/po/de.po index 58773f5..a07817b 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-11-09 03:24+0100\n" -"PO-Revision-Date: 2011-11-09 03:25+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\n" +"PO-Revision-Date: 2011-11-30 09:34+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.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,13 +25,11 @@ 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" @@ -51,27 +49,22 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:276 -#: ../pyhoca/wxgui/messages.py:111 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 +#: ../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:363 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:363 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:363 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:370 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:370 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -97,48 +90,43 @@ 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:379 -#: ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:389 -#: ../pyhoca/wxgui/frontend.py:410 -#: ../pyhoca/wxgui/frontend.py:417 -#: ../pyhoca/wxgui/frontend.py:424 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:389 ../pyhoca/wxgui/frontend.py:410 +#: ../pyhoca/wxgui/frontend.py:417 ../pyhoca/wxgui/frontend.py:424 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:347 -#: ../pyhoca/wxgui/frontend.py:396 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:396 #: ../pyhoca/wxgui/frontend.py:403 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:348 -#: ../pyhoca/wxgui/frontend.py:396 -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:396 +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:355 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:438 #, python-format msgid "%s - missing home directory" msgstr "%s - Benutzerverzeichnis nicht vorhanden" -#: ../pyhoca/wxgui/logon.py:356 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:438 msgid "The remote user's home directory does not exist." -msgstr "Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." +msgstr "" +"Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." #: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:371 -#: ../pyhoca/wxgui/frontend.py:445 +#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:445 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" @@ -217,8 +205,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -311,318 +298,322 @@ msgid "Icon" msgstr "Symbol" #: ../pyhoca/wxgui/profilemanager.py:164 +msgid "Session Window Title" +msgstr "Sitzungsfenstertitel" + +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "RDP Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "Privater RSA/DSA Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "Hostname[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "Aktuelle Tastatureinstellungen beibehalten" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "Tastaturlayout" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:251 -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:315 -#: ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:317 -#: ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 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:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, 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:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -647,8 +638,7 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:486 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "&Beenden" @@ -736,8 +726,7 @@ 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 ..." @@ -747,12 +736,17 @@ msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." #: ../pyhoca/wxgui/frontend.py:403 -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:424 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:431 #, python-format @@ -824,13 +818,15 @@ msgstr "%s - Verbindungsfehler" #: ../pyhoca/wxgui/frontend.py:742 #, 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:752 -#: ../pyhoca/wxgui/frontend.py:759 -#: ../pyhoca/wxgui/frontend.py:761 -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:752 ../pyhoca/wxgui/frontend.py:759 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" @@ -860,13 +856,21 @@ msgstr "%s - Sitzungsfunktion eingeschränkt" #: ../pyhoca/wxgui/frontend.py:767 #, 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:773 #, 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:785 #, python-format @@ -874,11 +878,13 @@ msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" #: ../pyhoca/wxgui/frontend.py:785 -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." +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:788 -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" @@ -905,8 +911,7 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 -#: ../pyhoca/wxgui/frontend.py:810 +#: ../pyhoca/wxgui/frontend.py:808 ../pyhoca/wxgui/frontend.py:810 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" @@ -933,8 +938,7 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:814 -#: ../pyhoca/wxgui/frontend.py:818 +#: ../pyhoca/wxgui/frontend.py:814 ../pyhoca/wxgui/frontend.py:818 #, python-format msgid "%s - start" msgstr "%s - starten" @@ -957,8 +961,7 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:822 -#: ../pyhoca/wxgui/frontend.py:826 +#: ../pyhoca/wxgui/frontend.py:822 ../pyhoca/wxgui/frontend.py:826 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" @@ -1056,8 +1059,7 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "OK" @@ -1149,8 +1151,10 @@ 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" @@ -1158,8 +1162,9 @@ 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 516cb9b..443cbeb 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-11-09 03:24+0100\n" -"PO-Revision-Date: 2011-11-09 03:25+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\n" +"PO-Revision-Date: 2011-11-30 09:34+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.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,13 +25,11 @@ 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" @@ -51,27 +49,22 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:276 -#: ../pyhoca/wxgui/messages.py:111 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 +#: ../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:363 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:363 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:363 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:370 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:370 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -97,38 +90,32 @@ 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:379 -#: ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:389 -#: ../pyhoca/wxgui/frontend.py:410 -#: ../pyhoca/wxgui/frontend.py:417 -#: ../pyhoca/wxgui/frontend.py:424 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:389 ../pyhoca/wxgui/frontend.py:410 +#: ../pyhoca/wxgui/frontend.py:417 ../pyhoca/wxgui/frontend.py:424 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:347 -#: ../pyhoca/wxgui/frontend.py:396 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:396 #: ../pyhoca/wxgui/frontend.py:403 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:348 -#: ../pyhoca/wxgui/frontend.py:396 -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:396 +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:355 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:438 #, python-format msgid "%s - missing home directory" msgstr "%s - missing home directory" -#: ../pyhoca/wxgui/logon.py:356 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:438 msgid "The remote user's home directory does not exist." msgstr "The remote user's home directory does not exist." @@ -137,8 +124,7 @@ msgstr "The remote user's home directory does not exist." msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:371 -#: ../pyhoca/wxgui/frontend.py:445 +#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:445 #, python-format msgid "%s - auth error" msgstr "%s - auth error" @@ -219,8 +205,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "Custom command" @@ -313,320 +298,321 @@ msgid "Icon" msgstr "Icon" #: ../pyhoca/wxgui/profilemanager.py:164 +msgid "Session Window Title" +msgstr "Session Window Title" + +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "RDP settings" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "RSA/DSA private key" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "Keep current keyboard settings" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "Keyboard layout" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:251 -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:315 -#: ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:317 -#: ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "Session Profile" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, 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:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -651,8 +637,7 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:486 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "E&xit" @@ -740,8 +725,7 @@ 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 ..." @@ -751,8 +735,10 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." #: ../pyhoca/wxgui/frontend.py:403 -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:424 msgid "Authentication protocol communication incomplete! Try again..." @@ -828,13 +814,15 @@ msgstr "%s - channel error" #: ../pyhoca/wxgui/frontend.py:742 #, 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:752 -#: ../pyhoca/wxgui/frontend.py:759 -#: ../pyhoca/wxgui/frontend.py:761 -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:752 ../pyhoca/wxgui/frontend.py:759 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - session failure" msgstr "%s - session failure" @@ -864,13 +852,21 @@ msgstr "%s - session warning" #: ../pyhoca/wxgui/frontend.py:767 #, 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:773 #, 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:785 #, python-format @@ -878,11 +874,12 @@ msgid "%s - audio warning" msgstr "%s - audio warning" #: ../pyhoca/wxgui/frontend.py:785 -msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "The X2go PulseAudio system is not available within Remote Desktop sessions." +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:788 -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio error" msgstr "%s - audio error" @@ -909,8 +906,7 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 -#: ../pyhoca/wxgui/frontend.py:810 +#: ../pyhoca/wxgui/frontend.py:808 ../pyhoca/wxgui/frontend.py:810 #, python-format msgid "%s - print error" msgstr "%s - print error" @@ -937,8 +933,7 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:814 -#: ../pyhoca/wxgui/frontend.py:818 +#: ../pyhoca/wxgui/frontend.py:814 ../pyhoca/wxgui/frontend.py:818 #, python-format msgid "%s - start" msgstr "%s - start" @@ -961,8 +956,7 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:822 -#: ../pyhoca/wxgui/frontend.py:826 +#: ../pyhoca/wxgui/frontend.py:822 ../pyhoca/wxgui/frontend.py:826 #, python-format msgid "%s - resume" msgstr "%s - resume" @@ -1059,8 +1053,7 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1148,18 +1141,22 @@ 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 88078cb..64bbb75 100644 --- a/po/es.po +++ b/po/es.po @@ -9,14 +9,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-09 03:24+0100\n" -"PO-Revision-Date: 2011-11-09 03:25+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\n" +"PO-Revision-Date: 2011-11-30 09:37+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" @@ -28,13 +28,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (vía %s)" -#: ../pyhoca/wxgui/logon.py:84 -#: ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Nombre de usuario" -#: ../pyhoca/wxgui/logon.py:86 -#: ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Contraseña" @@ -54,27 +52,22 @@ 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:276 -#: ../pyhoca/wxgui/messages.py:111 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Cancelar" -#: ../pyhoca/wxgui/logon.py:277 -#: ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:363 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:363 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:363 msgid "User is not allowed to start X2go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:283 -#: ../pyhoca/wxgui/frontend.py:370 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:370 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -100,38 +93,33 @@ msgstr "%s - proxy ssh" msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:379 -#: ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:389 -#: ../pyhoca/wxgui/frontend.py:410 -#: ../pyhoca/wxgui/frontend.py:417 -#: ../pyhoca/wxgui/frontend.py:424 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:389 ../pyhoca/wxgui/frontend.py:410 +#: ../pyhoca/wxgui/frontend.py:417 ../pyhoca/wxgui/frontend.py:424 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:347 -#: ../pyhoca/wxgui/frontend.py:396 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:396 #: ../pyhoca/wxgui/frontend.py:403 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:348 -#: ../pyhoca/wxgui/frontend.py:396 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "La clave del servidor remoto no es válida o no ha sido aceptada por el usuario" +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:396 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"La clave del servidor remoto no es válida o no ha sido aceptada por el " +"usuario" -#: ../pyhoca/wxgui/logon.py:355 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:438 #, python-format msgid "%s - missing home directory" msgstr "%s - carpeta home desconocida" -#: ../pyhoca/wxgui/logon.py:356 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:438 msgid "The remote user's home directory does not exist." msgstr "La carpeta home del usuario no existe en el servidor" @@ -140,15 +128,15 @@ msgstr "La carpeta home del usuario no existe en el servidor" msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:371 -#: ../pyhoca/wxgui/frontend.py:445 +#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:445 #, python-format msgid "%s - auth error" msgstr "%s - error en la autenticación" #: ../pyhoca/wxgui/logon.py:388 msgid "An unknown error occured during authentication!" -msgstr "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +msgstr "" +"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/taskbar.py:79 #, python-format @@ -222,8 +210,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "Comando personalizado" @@ -316,320 +303,323 @@ msgid "Icon" msgstr "Icono" #: ../pyhoca/wxgui/profilemanager.py:164 +msgid "Session Window Title" +msgstr "Título de Sesión" + +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "Parámetros RDP" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "Servidor XDMCP" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "Clave privada RSA/DSA" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "Host[:Puerto]" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "Mantener configuración actual del teclado" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "Máscara de teclado" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:251 -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:315 -#: ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:317 -#: ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "Perfil de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "El protocolo de autenticación de comunicaciones está incompleto. Inténtalo otra vez." +msgstr "" +"El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " +"otra vez." -#: ../pyhoca/wxgui/profilemanager.py:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, 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 "" -"Existe otro perfil de sesión (%s) que ya está usando [%s]:%s para el enlace al proxy SSH local.\n" +"Existe otro perfil de sesión (%s) que ya está usando [%s]:%s para el enlace " +"al proxy SSH local.\n" "Por favor, cambia los parámetros del proxy SSH en base a esta información." -#: ../pyhoca/wxgui/profilemanager.py:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -654,8 +644,7 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:486 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "S&alir" @@ -743,8 +732,7 @@ msgstr "Iniciar/Retomar Sesión" msgid "Connect Server" msgstr "Conectar con el Servidor" -#: ../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 "Acerca de %s ..." @@ -754,12 +742,16 @@ msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." #: ../pyhoca/wxgui/frontend.py:403 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:424 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo otra vez..." +msgstr "" +"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " +"otra vez..." #: ../pyhoca/wxgui/frontend.py:431 #, python-format @@ -768,7 +760,8 @@ msgstr "%s - error en la clave de identificación" #: ../pyhoca/wxgui/frontend.py:452 msgid "An unknown error occurred during authentication!" -msgstr "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +msgstr "" +"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:554 msgid "Cleaning X2go sessions..." @@ -831,13 +824,15 @@ msgstr "%s - error en el canal" #: ../pyhoca/wxgui/frontend.py:742 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta iniciar sesión nuevamente..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " +"iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:752 -#: ../pyhoca/wxgui/frontend.py:759 -#: ../pyhoca/wxgui/frontend.py:761 -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:752 ../pyhoca/wxgui/frontend.py:759 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" @@ -867,13 +862,21 @@ msgstr "%s - advertencia durante la sesión" #: ../pyhoca/wxgui/frontend.py:767 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al puerto %s del servidor X2go." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +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:773 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -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." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +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:785 #, python-format @@ -881,11 +884,13 @@ msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" #: ../pyhoca/wxgui/frontend.py:785 -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" +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:788 -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" @@ -912,8 +917,7 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 -#: ../pyhoca/wxgui/frontend.py:810 +#: ../pyhoca/wxgui/frontend.py:808 ../pyhoca/wxgui/frontend.py:810 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" @@ -940,8 +944,7 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:814 -#: ../pyhoca/wxgui/frontend.py:818 +#: ../pyhoca/wxgui/frontend.py:814 ../pyhoca/wxgui/frontend.py:818 #, python-format msgid "%s - start" msgstr "%s - inicio" @@ -964,8 +967,7 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:822 -#: ../pyhoca/wxgui/frontend.py:826 +#: ../pyhoca/wxgui/frontend.py:822 ../pyhoca/wxgui/frontend.py:826 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" @@ -1059,8 +1061,7 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1153,16 +1154,19 @@ msgstr "Elegir localización para los PDFs" #, fuzzy #~ msgid "New Profile" #~ msgstr "Perfil " + #~ msgid "%s - print job" #~ msgstr "%s - imprimir" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "¡¡¡El cuadro de diálogo de imprimir no ha sido desarrollado todavía!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Icono del perfil" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/nl.po b/po/nl.po index 2935261..123bf86 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-11-09 03:24+0100\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\n" "PO-Revision-Date: 2011-11-09 03:25+0100\n" "Last-Translator: Mike Gabriel <m.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" @@ -25,13 +25,11 @@ 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 "Gebruiker" -#: ../pyhoca/wxgui/logon.py:86 -#: ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Wachtwoord" @@ -51,27 +49,22 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:276 -#: ../pyhoca/wxgui/messages.py:111 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:277 -#: ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 #: ../pyhoca/wxgui/frontend.py:363 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:363 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:363 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 -#: ../pyhoca/wxgui/frontend.py:370 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:370 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -97,38 +90,33 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:379 -#: ../pyhoca/wxgui/logon.py:387 -#: ../pyhoca/wxgui/frontend.py:389 -#: ../pyhoca/wxgui/frontend.py:410 -#: ../pyhoca/wxgui/frontend.py:417 -#: ../pyhoca/wxgui/frontend.py:424 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 +#: ../pyhoca/wxgui/logon.py:379 ../pyhoca/wxgui/logon.py:387 +#: ../pyhoca/wxgui/frontend.py:389 ../pyhoca/wxgui/frontend.py:410 +#: ../pyhoca/wxgui/frontend.py:417 ../pyhoca/wxgui/frontend.py:424 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:347 -#: ../pyhoca/wxgui/frontend.py:396 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:396 #: ../pyhoca/wxgui/frontend.py:403 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:348 -#: ../pyhoca/wxgui/frontend.py:396 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:396 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de server is ongeldig of is niet geaccepteerd door de " +"gebruiker" -#: ../pyhoca/wxgui/logon.py:355 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:438 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:356 -#: ../pyhoca/wxgui/frontend.py:438 +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:438 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -137,8 +125,7 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:371 -#: ../pyhoca/wxgui/frontend.py:445 +#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/frontend.py:445 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" @@ -217,8 +204,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "Speciaal Commando" @@ -311,321 +297,323 @@ msgid "Icon" msgstr "Icon" #: ../pyhoca/wxgui/profilemanager.py:164 +#, fuzzy +msgid "Session Window Title" +msgstr "Sessie Profiel" + +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:166 +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "RDP instellingen" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 -#: ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "Private RSA/DSA Key" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "Huidige toetsenbord-instellingen behouden" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "Toetsenbord layout" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:251 -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 #, fuzzy msgid "Connect Method" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:315 -#: ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:317 -#: ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "Sessie Profiel" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, 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 "" -"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale SSH proxy.\n" +"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " +"SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -650,8 +638,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:486 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "&Beeindigen" @@ -743,8 +730,7 @@ msgstr "Sessie starten/hervatten" msgid "Connect Server" msgstr "Verbinden met 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 ..." @@ -754,8 +740,11 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:403 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " +"gebruiker" #: ../pyhoca/wxgui/frontend.py:424 msgid "Authentication protocol communication incomplete! Try again..." @@ -831,13 +820,15 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:742 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " +"opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:752 -#: ../pyhoca/wxgui/frontend.py:759 -#: ../pyhoca/wxgui/frontend.py:761 -#: ../pyhoca/wxgui/frontend.py:773 +#: ../pyhoca/wxgui/frontend.py:752 ../pyhoca/wxgui/frontend.py:759 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -870,13 +861,21 @@ msgstr "%s - sessie waarschuwing" #: ../pyhoca/wxgui/frontend.py:767 #, 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:773 #, 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:785 #, python-format @@ -884,11 +883,12 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:785 -msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +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:788 -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:788 ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -915,8 +915,7 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 -#: ../pyhoca/wxgui/frontend.py:810 +#: ../pyhoca/wxgui/frontend.py:808 ../pyhoca/wxgui/frontend.py:810 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -943,8 +942,7 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:814 -#: ../pyhoca/wxgui/frontend.py:818 +#: ../pyhoca/wxgui/frontend.py:814 ../pyhoca/wxgui/frontend.py:818 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -967,8 +965,7 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:822 -#: ../pyhoca/wxgui/frontend.py:826 +#: ../pyhoca/wxgui/frontend.py:822 ../pyhoca/wxgui/frontend.py:826 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -1065,8 +1062,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1154,18 +1150,22 @@ msgstr "Kies locatie om PDF op te slaan" #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" + #~ msgid "New Profile" #~ msgstr "Profiel" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index dd882a7..c364d06 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-09 03:24+0100\n" +"POT-Creation-Date: 2011-11-30 09:37+0100\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" @@ -45,7 +46,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:278 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 msgid "Cancel" msgstr "" @@ -192,7 +193,7 @@ msgstr "" msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:168 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:170 msgid "Custom command" msgstr "" @@ -285,292 +286,296 @@ msgid "Icon" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:164 -msgid "Type" +msgid "Session Window Title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:166 +msgid "Type" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:168 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "RDP settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "XDMCP server" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:181 ../pyhoca/wxgui/profilemanager.py:191 +#: ../pyhoca/wxgui/profilemanager.py:183 ../pyhoca/wxgui/profilemanager.py:193 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:185 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:187 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:189 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:190 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:193 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:198 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:198 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:206 +#: ../pyhoca/wxgui/profilemanager.py:208 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:207 +#: ../pyhoca/wxgui/profilemanager.py:209 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:209 +#: ../pyhoca/wxgui/profilemanager.py:211 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:212 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:212 +#: ../pyhoca/wxgui/profilemanager.py:214 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:214 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:228 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:228 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:233 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:235 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:234 +#: ../pyhoca/wxgui/profilemanager.py:236 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:238 +#: ../pyhoca/wxgui/profilemanager.py:240 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:242 +#: ../pyhoca/wxgui/profilemanager.py:244 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:247 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 +#: ../pyhoca/wxgui/profilemanager.py:249 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:248 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:251 ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:253 ../pyhoca/wxgui/profilemanager.py:272 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:257 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:258 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:266 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:268 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:271 +#: ../pyhoca/wxgui/profilemanager.py:273 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:315 ../pyhoca/wxgui/profilemanager.py:927 -#: ../pyhoca/wxgui/profilemanager.py:1412 +#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:934 +#: ../pyhoca/wxgui/profilemanager.py:1420 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:317 ../pyhoca/wxgui/profilemanager.py:929 +#: ../pyhoca/wxgui/profilemanager.py:319 ../pyhoca/wxgui/profilemanager.py:936 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:322 +#: ../pyhoca/wxgui/profilemanager.py:324 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:326 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:328 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:667 +#: ../pyhoca/wxgui/profilemanager.py:673 msgid "Session Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:668 +#: ../pyhoca/wxgui/profilemanager.py:674 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:669 +#: ../pyhoca/wxgui/profilemanager.py:675 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:670 +#: ../pyhoca/wxgui/profilemanager.py:676 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1103 +#: ../pyhoca/wxgui/profilemanager.py:1111 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1106 +#: ../pyhoca/wxgui/profilemanager.py:1114 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1223 +#: ../pyhoca/wxgui/profilemanager.py:1231 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1225 -#: ../pyhoca/wxgui/profilemanager.py:1240 +#: ../pyhoca/wxgui/profilemanager.py:1233 +#: ../pyhoca/wxgui/profilemanager.py:1248 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1392 +#: ../pyhoca/wxgui/profilemanager.py:1400 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1464 #: ../pyhoca/wxgui/profilemanager.py:1467 -#: ../pyhoca/wxgui/profilemanager.py:1477 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1470 +#: ../pyhoca/wxgui/profilemanager.py:1475 +#: ../pyhoca/wxgui/profilemanager.py:1485 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1464 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1459 -#: ../pyhoca/wxgui/profilemanager.py:1462 +#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1470 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1467 +#: ../pyhoca/wxgui/profilemanager.py:1475 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1477 +#: ../pyhoca/wxgui/profilemanager.py:1485 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -578,21 +583,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1497 +#: ../pyhoca/wxgui/profilemanager.py:1505 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1498 +#: ../pyhoca/wxgui/profilemanager.py:1506 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1502 +#: ../pyhoca/wxgui/profilemanager.py:1510 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1503 +#: ../pyhoca/wxgui/profilemanager.py:1511 msgid "Changes to profile have been saved." msgstr "" 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.10-5-g51c9f51
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 51c9f51ab03af63dd9d5400ece25ad8b3c48a838 (commit) from d1a153d8856f052d843624f8ecacd50ebfadbf77 (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 51c9f51ab03af63dd9d5400ece25ad8b3c48a838 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:29:40 2011 +0100 Add support for renaming session window titles from the client-side. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4abf097..66ce84a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.0.11): - Add XFCE4 support. + - Add support for renaming session window titles from the client-side. * Depend on Python X2Go 0.1.1.9. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index e0425f3..9f8b06b 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -150,7 +150,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### widgets for the SESSION tab ### self.ProfileNameLabel = wx.StaticText(self.tab_Session, -1, _(u"Name")+":") - self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(200,20)) + self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "") _share_location = os.path.split(_icons_location)[0] if 'icon' in self.profile_config: path_to_icon = self.profile_config['icon'] @@ -161,6 +161,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.IconPath = path_to_icon self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY)) + self.SessionWindowTitleLabel = wx.StaticText(self.tab_Session, -1, _(u"Session Window Title")+":") + self.SessionWindowTitle = wx.TextCtrl(self.tab_Session, -1, "") self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':') self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':') @@ -327,8 +329,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) _textfield_height = self.SSHKeyFileBrowseButton.GetBestSize().GetHeight()-2 - self.ProfileNameLabel.SetMinSize((120, 16)) - self.ProfileName.SetMinSize((180, _textfield_height)) + self.ProfileNameLabel.SetMinSize((160, 16)) + self.ProfileName.SetMinSize((320, _textfield_height)) + self.SessionWindowTitleLabel.SetMinSize((160, 16)) + self.SessionWindowTitle.SetMinSize((320, _textfield_height)) self.IconButton.SetSize(self.IconButton.GetBestSize()) self.SessionTypeLabel.SetMinSize((120, 16)) self.SessionType.SetMinSize((-1, _textfield_height)) @@ -413,11 +417,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # SESSION TAB sizer_1 = wx.BoxSizer(wx.VERTICAL) sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL) - sizer_1_1_1 = wx.FlexGridSizer(2, 2, 7, 9) + sizer_1_1_1 = wx.FlexGridSizer(3, 2, 7, 9) sizer_1_1_1.Add(self.ProfileNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_1_1_1.Add(self.ProfileName) sizer_1_1_1.Add(self.IconButtonLabel, flag=wx.TOP) sizer_1_1_1.Add(self.IconButton) + sizer_1_1_1.Add(self.SessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_1_1_1.Add(self.SessionWindowTitle) sizer_1_1.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL) @@ -703,6 +709,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def __update_fields(self): self.ProfileName.SetValue(self.profile_config['name']) + self.SessionWindowTitle.SetValue(self.profile_config['sessiontitle']) self.Host.SetValue(self.profile_config['host']) self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) @@ -989,6 +996,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def __update_from_screen(self): self.profile_config['name'] = self.ProfileName.GetValue() + self.profile_config['sessiontitle'] = self.SessionWindowTitle.GetValue() self.profile_config['icon'] = self.IconPath self.profile_config['user'] = self.UserName.GetValue() self.profile_config['key'] = self.SSHKeyFile.GetValue() 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.8-9-gdcee824
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, release/0.1.1.x has been updated via dcee824ce2866e545658c4edaf01d24e19e1a2db (commit) via 5645572c71bf2c41e25996344cf39da917040404 (commit) via b6f5654f0fd3ec9f827ab66d8e8dc186e4374f11 (commit) from d089fd5ee17e09d8a28a1c997a43cfdd933d1d3a (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 dcee824ce2866e545658c4edaf01d24e19e1a2db Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:27:15 2011 +0100 Add support for session window title renaming from client-side. commit 5645572c71bf2c41e25996344cf39da917040404 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 08:59:07 2011 +0100 Add ,,autostart'' parameter to default session profile parameters. commit b6f5654f0fd3ec9f827ab66d8e8dc186e4374f11 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 16 08:06:52 2011 +0100 use public control session method to detect availability of local folder sharing ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 17 ++++++++++++----- x2go/defaults.py | 1 + x2go/session.py | 2 +- x2go/utils.py | 2 ++ 5 files changed, 18 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 00c7936..fa0ebcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low - Print access to an X2Go server is not controlled by x2goprint group membership, but by fuse membership. - Add XFCE4 support. + - Add ,,autostart'' parameter to default session profile parameters. + - Add support for session window title renaming from client-side. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 10:54:23 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index acaef8a..e64bb1a 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -185,7 +185,7 @@ class X2goTerminalSessionSTDOUT(object): geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", cache_type="unix-kde", keyboard='', kblayout='null', kbtype='null/null', - session_type="application", snd_system='pulse', snd_port=4713, cmd=None, + session_type="application", snd_system='pulse', snd_port=4713, cmd=None, session_title="", rdp_server=None, rdp_options=None, xdmcp_server=None, convert_encoding=False, server_encoding='UTF-8', client_encoding='UTF-8', @@ -303,6 +303,7 @@ class X2goTerminalSessionSTDOUT(object): self.params.update() self.profile_name = profile_name + self.session_title = session_title self.proxy_backend = proxy_backend self.snd_port = snd_port @@ -458,7 +459,7 @@ class X2goTerminalSessionSTDOUT(object): """ if not self.control_session.is_folder_sharing_available(): - raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) ssh_transport = self.control_session.get_transport() @@ -506,8 +507,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize X2go print spooling. """ - if self.session_info.username not in self.control_session._x2go_remote_group('fuse'): - raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) + if not self.control_session.is_folder_sharing_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) spool_dir = os.path.join(self.session_info.local_container, 'spool') if not os.path.exists(spool_dir): @@ -552,6 +553,9 @@ class X2goTerminalSessionSTDOUT(object): Initialize X2go mimebox handling. """ + if not self.control_session.is_folder_sharing_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) + mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox') if not os.path.exists(mimebox_dir): os.mkdir(mimebox_dir) @@ -605,7 +609,7 @@ class X2goTerminalSessionSTDOUT(object): """ if not self.control_session.is_folder_sharing_available(): - raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username) if local_path is None: self.logger('no folder name given...', log.loglevel_WARN) @@ -923,6 +927,9 @@ class X2goTerminalSessionSTDOUT(object): if self.params.cmd == 'XDMCP' and self.params.xdmcp_server: cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line + if self.session_title: + cmd_line = ['X2GO_SESSION_WINDOW_TITLE="%s" ' % self.session_title] + cmd_line + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) _stdout = stdout.read() diff --git a/x2go/defaults.py b/x2go/defaults.py index 8a7aa40..8c19dd0 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -265,6 +265,7 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL', """X2go's generic applications.""" X2GO_SESSIONPROFILE_DEFAULTS = { + 'autostart': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', diff --git a/x2go/session.py b/x2go/session.py index 88d2a73..13fc0e1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -62,7 +62,7 @@ from defaults import SUPPORTED_SOUND, SUPPORTED_PRINTING, SUPPORTED_FOLDERSHARIN _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack', 'cache_type', 'kblayout', 'kbtype', 'session_type', 'snd_system', 'snd_port', - 'cmd', + 'cmd', 'session_title', 'rdp_server', 'rdp_options', 'xdmcp_server', 'rootdir', 'loglevel', 'profile_name', 'profile_id', diff --git a/x2go/utils.py b/x2go/utils.py index 9af2ef1..b0ec8cd 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -162,6 +162,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'sshproxyuser': 'sshproxy_user', 'sshproxykeyfile': 'sshproxy_key_filename', 'sshproxytunnel': 'sshproxy_tunnel', + 'sessiontitle': 'session_title', } _speed_dict = { '0': 'modem', @@ -255,6 +256,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'defsndport', 'icon', 'applications', + 'autostart', ] for i in _ignored_options: del _params[i] 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-74-g533f7b6
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via 533f7b62f7daeb0fe272f00eb3806feab3842a8d (commit) via 8471f9acebab3c9078a9c4f5b310c793ec651163 (commit) from 4a4167b67489560ffeebf8d3e490f67d937f58d9 (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 533f7b62f7daeb0fe272f00eb3806feab3842a8d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:27:15 2011 +0100 Add support for session window title renaming from client-side. commit 8471f9acebab3c9078a9c4f5b310c793ec651163 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 08:59:07 2011 +0100 Add ,,autostart'' parameter to default session profile parameters. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 6 +++++- x2go/defaults.py | 1 + x2go/session.py | 2 +- x2go/utils.py | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 838bfef..09993b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low - Print access to an X2Go server is not controlled by x2goprint group membership, but by fuse membership. - Add XFCE4 support. + - Add ,,autostart'' parameter to default session profile parameters. + - Add support for session window title renaming from client-side. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 12 Oct 2011 10:54:23 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 27b4079..392f6d7 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -185,7 +185,7 @@ class X2goTerminalSessionSTDOUT(object): geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", cache_type="unix-kde", keyboard='', kblayout='null', kbtype='null/null', - session_type="application", snd_system='pulse', snd_port=4713, cmd=None, + session_type="application", snd_system='pulse', snd_port=4713, cmd=None, session_title="", rdp_server=None, rdp_options=None, xdmcp_server=None, convert_encoding=False, server_encoding='UTF-8', client_encoding='UTF-8', @@ -303,6 +303,7 @@ class X2goTerminalSessionSTDOUT(object): self.params.update() self.profile_name = profile_name + self.session_title = session_title self.proxy_backend = proxy_backend self.snd_port = snd_port @@ -926,6 +927,9 @@ class X2goTerminalSessionSTDOUT(object): if self.params.cmd == 'XDMCP' and self.params.xdmcp_server: cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line + if self.session_title: + cmd_line = ['X2GO_SESSION_WINDOW_TITLE="%s" ' % self.session_title] + cmd_line + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) _stdout = stdout.read() diff --git a/x2go/defaults.py b/x2go/defaults.py index 816c648..40aeaf4 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -265,6 +265,7 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL', """X2go's generic applications.""" X2GO_SESSIONPROFILE_DEFAULTS = { + 'autostart': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, 'usesshproxy': False, 'sshproxyhost': '', 'sshproxyuser': '', 'sshproxytunnel': '', 'sshproxykeyfile': '', diff --git a/x2go/session.py b/x2go/session.py index faf2598..6b1824e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -62,7 +62,7 @@ from defaults import SUPPORTED_SOUND, SUPPORTED_PRINTING, SUPPORTED_FOLDERSHARIN _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack', 'cache_type', 'kblayout', 'kbtype', 'session_type', 'snd_system', 'snd_port', - 'cmd', + 'cmd', 'session_title', 'rdp_server', 'rdp_options', 'xdmcp_server', 'rootdir', 'loglevel', 'profile_name', 'profile_id', diff --git a/x2go/utils.py b/x2go/utils.py index cbc607b..e807bfa 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -162,6 +162,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'sshproxyuser': 'sshproxy_user', 'sshproxykeyfile': 'sshproxy_key_filename', 'sshproxytunnel': 'sshproxy_tunnel', + 'sessiontitle': 'session_title', } _speed_dict = { '0': 'modem', @@ -255,6 +256,7 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'defsndport', 'icon', 'applications', + 'autostart', ] for i in _ignored_options: del _params[i] 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

x2goserver.git - master (branch) updated: 3.0.99.8-20-gf21aa45
by git-admin＠x2go.org 30 Nov '11

30 Nov '11

The branch, master has been updated via f21aa45a5759d2d167050e069a829e615ceb865d (commit) from 42323861f27f8ffd215009765e61b1312707a58c (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 f21aa45a5759d2d167050e069a829e615ceb865d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 30 09:26:17 2011 +0100 improve session window renaming from client side ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2gostartagent | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index a416903..5ad46fd 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -250,7 +250,12 @@ if [ "$X2GO_STYPE" == "S" ]; then fi SESSION_WINDOW_TITLE+=" (X2GO-${SESSION_NAME})" - test -z "${X2GO_SESSION_WINDOW_TITLE}" && X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" + test -z "${X2GO_SESSION_WINDOW_TITLE}" && { + X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" + } || { + X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})" + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''" + } LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth ~/.Xauthority -S -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & else if [ -n "$X2GO_CMD" ]; then @@ -258,7 +263,12 @@ else else SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" fi - test -z ${X2GO_SESSION_WINDOW_TITLE} && X2GO_SESSION_WINDOW_TITLE=${SESSION_WINDOW_TITLE} + test -z "${X2GO_SESSION_WINDOW_TITLE}" && { + X2GO_SESSION_WINDOW_TITLE="${SESSION_WINDOW_TITLE}" + } || { + X2GO_SESSION_WINDOW_TITLE="${X2GO_SESSION_WINDOW_TITLE} (X2GO-${SESSION_NAME})" + $X2GO_LIB_PATH/x2gosyslog "$0" "info" "renaming session window title as requested by X2Go client to ,,$X2GO_SESSION_WINDOW_TITLE''" + } LD_LIBRARY_PATH=$X2GO_LIB x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth ~/.Xauthority -geometry ${X2GO_GEOMETRY} -name "${X2GO_SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log & fi 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2011