x2go-commits February 2013

x2go-commits@lists.x2go.org

1 participants
165 discussions

python-wsgilog.git - master (branch) created: fc26a22de119c4567bb94ff8e99a10bc163bc54d
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, master has been created at fc26a22de119c4567bb94ff8e99a10bc163bc54d (commit) - Log ----------------------------------------------------------------- commit fc26a22de119c4567bb94ff8e99a10bc163bc54d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:01:42 2013 +0100 Imported Debian patch 0.3-1 commit 086aa63bbd142d238800fa8fd4ca8b8d27df4d6e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:37:35 2013 +0100 Imported Upstream version 0.3 ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) 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-wsgilog.git" (Debian package python-wsgilog).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-13-g5ef433d
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, master has been updated via 5ef433db9f943afd56b15351cceb2021184ed43e (commit) from b03b7cbfea28b5d962eef483c7fd98661bf203e8 (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 5ef433db9f943afd56b15351cceb2021184ed43e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 06:29:06 2013 +0100 divert logging to stdout if called by other user than user x2gobroker ----------------------------------------------------------------------- Summary of changes: logrotate/x2gobroker | 13 +++++++++++++ sbin/x2gobroker | 2 ++ x2gobroker/loggers.py | 23 ++++++++++++++++++----- 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 logrotate/x2gobroker The diff of changes is: diff --git a/logrotate/x2gobroker b/logrotate/x2gobroker new file mode 100644 index 0000000..4e8c689 --- /dev/null +++ b/logrotate/x2gobroker @@ -0,0 +1,13 @@ +/var/log/x2gobroker/*.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 x2gobroker adm + sharedscripts + postrotate + /etc/init.d/x2gobroker restart > /dev/null + endscript +} diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 7ca11ce..2e8b5b4 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -33,6 +33,8 @@ except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults +from x2gobroker.loggers import logger_broker, logger_access, logger_error + # parse-in potential command line options cmdline_args = None if __name__ == "__main__": diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 01a659f..7151fd5 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -19,15 +19,28 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import sys +import getpass import logging import logging.config from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG -logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) +if getpass.getuser() == "x2gobroker": -# create loggers -logger_broker = logging.getLogger('broker') -logger_access = logging.getLogger('access') -logger_error = logging.getLogger('error') + # we run in standalone daemon mode, so let's use the system configuration for logging + logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) + + # create loggers + logger_broker = logging.getLogger('broker') + logger_access = logging.getLogger('access') + logger_error = logging.getLogger('error') + +else: + logger_root = logging.getLogger() + logger_root.addHandler(logging.StreamHandler(sys.stdout)) + + logger_broker = logger_root + logger_access = logger_root + logger_error = logger_root hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-12-gb03b7cb
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via b03b7cbfea28b5d962eef483c7fd98661bf203e8 (commit) from abebae8791274f6634adb39d930ae055feed5fbb (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 b03b7cbfea28b5d962eef483c7fd98661bf203e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:10:03 2013 +0100 Add logrotate configuration for x2gobroker log files. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/python-x2gobroker.install | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f1e7e25..9ed8b0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Add load balancing support. - Add foundation for logging support. - Add man page for x2gobroker executable. + - Add logrotate configuration for x2gobroker log files. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/python-x2gobroker.install b/debian/python-x2gobroker.install index c8bd09a..91aabf6 100644 --- a/debian/python-x2gobroker.install +++ b/debian/python-x2gobroker.install @@ -1,4 +1,5 @@ etc/x2gobroker.conf etc/x2go/ etc/broker etc/x2go/ +logrotate/x2gobroker etc/logrotate.d/ pam/x2gobroker etc/pam.d/ usr/ hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-11-gabebae8
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via abebae8791274f6634adb39d930ae055feed5fbb (commit) from 2ce613977c17b31475dc3207652daa00a78f2537 (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 abebae8791274f6634adb39d930ae055feed5fbb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:04:35 2013 +0100 create log folder with setgid bit set ----------------------------------------------------------------------- Summary of changes: debian/python-x2gobroker.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/python-x2gobroker.postinst b/debian/python-x2gobroker.postinst index 861b3e0..6299aea 100755 --- a/debian/python-x2gobroker.postinst +++ b/debian/python-x2gobroker.postinst @@ -23,7 +23,7 @@ case "$1" in # the python-x2gobroker needs special permissions on its log directory if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then - dpkg-statoverride --add --update x2gobroker adm 0750 /var/log/x2gobroker + dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi ;; hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-10-g2ce6139
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via 2ce613977c17b31475dc3207652daa00a78f2537 (commit) via d04c71a2781be037ebbb3bdc9441019409c9c2a8 (commit) from bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (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 2ce613977c17b31475dc3207652daa00a78f2537 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 12:01:36 2013 +0100 remove debug stdout code commit d04c71a2781be037ebbb3bdc9441019409c9c2a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 11:59:34 2013 +0100 Add man page for x2gobroker executable. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gobroker.manpages | 1 + man/man8/x2gobroker.8 | 56 ++++++++++++++++++++++++++++++++++++++++++++ x2gobroker/loggers.py | 2 -- 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 debian/x2gobroker.manpages create mode 100644 man/man8/x2gobroker.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c8ec285..f1e7e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make host session option a list, not string. - Add load balancing support. - Add foundation for logging support. + - Add man page for x2gobroker executable. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/x2gobroker.manpages b/debian/x2gobroker.manpages new file mode 100644 index 0000000..b010d6d --- /dev/null +++ b/debian/x2gobroker.manpages @@ -0,0 +1 @@ +man/man8/x2gobroker.8 \ No newline at end of file diff --git a/man/man8/x2gobroker.8 b/man/man8/x2gobroker.8 new file mode 100644 index 0000000..6782fda --- /dev/null +++ b/man/man8/x2gobroker.8 @@ -0,0 +1,56 @@ +'\" -*- 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 x2gobroker 8 "Feb 2013" "Version 0.0.1.y" "X2Go Session Broker" +.SH NAME +x2gobroker \- Session Broker for X2Go +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gobroker\fR \kx +.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) +'in \n(.iu+\nxu +[ +\fIoptions\fR +] +'in \n(.iu-\nxu +.ad b +'hy +.SH DESCRIPTION +\fBx2gobroker\fR is a Web.py based implementation of the X2Go Session Broker API. +.PP +See the included README and TODO for further information on \fBx2gobroker\fR. +.SH COMMON OPTIONS +\fBx2gobroker\fR accepts the following common options: +.TP +\*(T<\fB\-h, \-\-help\fR\*(T> +Display a help with all available command line options and exit. +.TP +\*(T<\fB\-d, \-\-debug\fR\*(T> +Enable debugging code. This also makes http\'s POST method available as GET method, which then allows it to test the +broker API through a normal web browser. +.TP +\*(T<\fB\-d, \-\-config FILENAME\fR\*(T> +Specify an alternative configuration file name, default is: \fI/etc/x2go/x2gobroker.conf\fR. +.SH DAEMON OPTIONS +\fBx2gobroker\fR accepts the following daemon options: +.TP +\*(T<\fB\-b, \-\-bind ADDRESS:PORT\fR\*(T> +The [address:]port that the Web.py http-engine will bind to (default: 127.0.0.1:8080). +.SH "FILES" +/etc/x2go/x2gobroker.conf, /etc/x2go/broker/* (configuration files) +.PP +/etc/default/x2gobroker-daemon (environment for X2Go Session Broker when run +as standalone daemon) +.PP +/var/log/x2gobroker/* (log files of X2Go Session Broker) +.SH "SEE ALSO" +\fB/usr/share/doc/x2gobroker\fR +.SH AUTHOR +This manual has been written for the X2Go project by +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>. diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 4493091..01a659f 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -26,8 +26,6 @@ from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -print dir(logging.config) - # create loggers logger_broker = logging.getLogger('broker') logger_access = logging.getLogger('access') hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-8-gbbe2c8a
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 (commit) from fe7f06c112518bbac361c7e9f80ed721379a0e3b (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 bbe2c8ab570f8f3e4b0e54a79117b9d93488de40 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 11:45:35 2013 +0100 Add foundation for logging support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/python-x2gobroker.dirs | 3 +- ...r-agent.postinst => python-x2gobroker.postinst} | 27 +------ ...roker-agent.postrm => python-x2gobroker.postrm} | 11 +-- etc/broker/x2gobroker-loggers.conf | 81 ++++++++++++++++++++ x2gobroker/defaults.py | 5 ++ x2gobroker/{brokers/ldap_broker.py => loggers.py} | 20 ++--- 7 files changed, 107 insertions(+), 41 deletions(-) copy debian/{x2gobroker-agent.postinst => python-x2gobroker.postinst} (51%) copy debian/{x2gobroker-agent.postrm => python-x2gobroker.postrm} (70%) create mode 100644 etc/broker/x2gobroker-loggers.conf copy x2gobroker/{brokers/ldap_broker.py => loggers.py} (68%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0984633..c8ec285 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Make CC, CFLAGS and LDFLAGS configurable through build system. - Make host session option a list, not string. - Add load balancing support. + - Add foundation for logging support. * /debian/control: + Add bin:package x2gobroker-agent. diff --git a/debian/python-x2gobroker.dirs b/debian/python-x2gobroker.dirs index 2fd303e..2396e1d 100644 --- a/debian/python-x2gobroker.dirs +++ b/debian/python-x2gobroker.dirs @@ -1,2 +1,3 @@ /etc/x2go -/etc/pam.d \ No newline at end of file +/etc/pam.d +/var/log/x2gobroker \ No newline at end of file diff --git a/debian/x2gobroker-agent.postinst b/debian/python-x2gobroker.postinst similarity index 51% copy from debian/x2gobroker-agent.postinst copy to debian/python-x2gobroker.postinst index 95faece..861b3e0 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/python-x2gobroker.postinst @@ -1,13 +1,10 @@ #!/bin/sh -# postinst script for x2gobroker-agent +# postinst script for python-x2gobroker # # see: dh_installdeb(1) set -e -# Source debconf library. -. /usr/share/debconf/confmodule - # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> # * <old-postinst> `abort-upgrade' <new version> @@ -24,25 +21,9 @@ set -e case "$1" in configure) - # setup user/group x2gobroker - if ! getent group x2gobroker >/dev/null; then - echo "Creating x2gobroker group." >&2 - addgroup --system x2gobroker - else - echo "Group x2gobroker already exists." >&2 - fi - if ! getent passwd x2gobroker >/dev/null; then - echo "Creating x2gobroker user." >&2 - adduser --system --no-create-home \ - --disabled-password --disabled-login \ - --shell /bin/false --group --home /dev/null x2gobroker - else - echo "User x2gobroker already exists." >&2 - fi - - # the x2gobroker-agent has to be installed setuid root - if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent + # the python-x2gobroker needs special permissions on its log directory + if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --add --update x2gobroker adm 0750 /var/log/x2gobroker fi ;; diff --git a/debian/x2gobroker-agent.postrm b/debian/python-x2gobroker.postrm similarity index 70% copy from debian/x2gobroker-agent.postrm copy to debian/python-x2gobroker.postrm index d703d32..22abe93 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/python-x2gobroker.postrm @@ -18,15 +18,10 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then - dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent + if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker fi - # remove user/group x2gobroker from system - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; @@ -41,4 +36,4 @@ esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0 diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf new file mode 100644 index 0000000..36d5e3e --- /dev/null +++ b/etc/broker/x2gobroker-loggers.conf @@ -0,0 +1,81 @@ +# This file is part of the X2Go Project - http://www.x2go.org +# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# X2Go Session Broker is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# X2Go Session Broker 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero 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. + +[loggers] +keys=root,broker,access,error + +[logger_root] +level=NOTSET +handlers=stdoutHandler + +[handlers] +keys=stdoutHandler,brokerFileHandler,accessFileHandler,errorFileHandler + +[formatters] +keys=brokerFormatter,accessFormatter,errorFormatter + +[handler_stdoutHandler] +class=StreamHandler +args=(sys.stdout,) + +[logger_broker] +level=DEBUG +handlers=brokerFileHandler +qualname=broker +propagate=0 + +[handler_brokerFileHandler] +class=FileHandler +formatter=brokerFormatter +args=('/var/log/x2gobroker/broker.log',) + +[formatter_brokerFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_access] +level=DEBUG +handlers=accessFileHandler +qualname=access +propagate=0 + +[handler_accessFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/access.log',) + +[formatter_accessFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= + +[logger_error] +level=DEBUG +handlers=errorFileHandler +qualname=error +propagate=0 + +[handler_errorFileHandler] +class=FileHandler +formatter=accessFormatter +args=('/var/log/x2gobroker/error.log',) + +[formatter_errorFormatter] +format=%(asctime)s - %(name)s - %(levelname)s - %(message)s +datefmt= diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 48b61d8..b85a296 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -31,6 +31,11 @@ if os.environ.has_key('X2GOBROKER_CONFIG'): else: X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +if os.environ.has_key('X2GOBROKER_LOGCONFIG'): + X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] +else: + X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" + if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] else: diff --git a/x2gobroker/brokers/ldap_broker.py b/x2gobroker/loggers.py similarity index 68% copy from x2gobroker/brokers/ldap_broker.py copy to x2gobroker/loggers.py index 61857d8..4493091 100644 --- a/x2gobroker/brokers/ldap_broker.py +++ b/x2gobroker/loggers.py @@ -2,6 +2,7 @@ # Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,16 +19,17 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -"""\ -L{ldap.X2GoBroker} class - a production X2GoBroker implementations that uses LDAP as configuration backend +import logging +import logging.config -""" -__NAME__ = 'x2gobroker-pylib' +from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG -# modules -import x2gobroker.base_broker as base +logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) -class X2GoBroker(x2gobroker.base.X2GoBroker): - """\ +print dir(logging.config) + +# create loggers +logger_broker = logging.getLogger('broker') +logger_access = logging.getLogger('access') +logger_error = logging.getLogger('error') - """ hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-7-gfe7f06c
by git-admin＠x2go.org 17 Feb '13

17 Feb '13

The branch, master has been updated via fe7f06c112518bbac361c7e9f80ed721379a0e3b (commit) from 5231ba48183cc603a5193400884dd01b360491ba (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 fe7f06c112518bbac361c7e9f80ed721379a0e3b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Feb 17 10:40:51 2013 +0100 some minor fixes found during first load balancing tests ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.default | 9 ++++++++- debian/x2gobroker-daemon.init | 6 +++--- etc/x2gobroker.conf | 2 +- sbin/x2gobroker | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 47ccb43..452a75b 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -24,7 +24,14 @@ START_DAEMON=true # path to the X2Go Session Broker's agent command #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent -### enable SSL, you will have to create your own SSL certificates ### +########################################################## +### ### +### Enable SSL Support ### +### o You have to create your own SSL certificates ### +### o You have to actively uncomment the below SSL ### +### relevant line to enable https:// in x2gobroker ### +### ### +########################################################## # SSL certificate file #X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 0ee9aed..d14bb8f 100644 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -36,10 +36,10 @@ X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG -export X2GOBROKER_DEBUG=0 -export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +export X2GOBROKER_DEBUG +export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND -export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" +export X2GOBROKER_SESSIONPROFILES export X2GOBROKER_AGENT_CMD export X2GOBROKER_SSL_CERTFILE export X2GOBROKER_SSL_KEYFILE diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 0999376..83f6bd8 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -88,7 +88,7 @@ # on large deployments it is recommended to ignore primary group memberships # traversing into all user accounts for primary group detection can be quite # CPU intensive on the X2Go Broker server. -#ignore-primary-group-memberships = True +#ignore-primary-group-memberships = true ### ### BACKEND section diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 5c1fdd8..7ca11ce 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -61,6 +61,9 @@ if __name__ == "__main__": x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug + # some people just give the port but prepend a colon, webpy does not like this, so we strip if off + cmdline_args.bind = cmdline_args.bind.lstrip(':') + # import classes serving the different web.py URLs from x2gobroker.web.plain import * hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-18-gf43fbaa
by git-admin＠x2go.org 16 Feb '13

16 Feb '13

The branch, master has been updated via f43fbaae0f087fb73a7afcd49037ac21a9c9f8c1 (commit) from 6c22593e134895ebb363e9851f457c3205257d71 (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 f43fbaae0f087fb73a7afcd49037ac21a9c9f8c1 Author: Terje Andersen <teranders(a)gmail.com> Date: Sat Feb 16 12:31:38 2013 +0100 rebuild i18n files ----------------------------------------------------------------------- Summary of changes: x2goclient_fr.ts | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index abbba81..6a8c203 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1373,7 +1373,7 @@ you can install sshd with </message> <message> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> <source>Print</source> @@ -1486,6 +1486,13 @@ lpr -P hp_laserjet</source> </message> </context> <context> + <name>QObject</name> + <message> + <source>No response received from the remote server. Do you want to terminate the current session?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>SessionButton</name> <message> <source>Session preferences...</source> @@ -1517,15 +1524,15 @@ lpr -P hp_laserjet</source> </message> <message> <source>New Session</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nouvelle session</translation> </message> <message> <source>running</source> - <translation type="unfinished"></translation> + <translation type="unfinished">en cours</translation> </message> <message> <source>suspended</source> - <translation type="unfinished"></translation> + <translation type="unfinished">suspendue</translation> </message> <message> <source>KDE</source> @@ -1533,7 +1540,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>RDP connection</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Connection RDP</translation> </message> <message> <source>XDMCP</source> @@ -1541,7 +1548,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Connection to local desktop</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Connection au bureau local</translation> </message> <message> <source>Published applications</source> @@ -1592,12 +1599,12 @@ lpr -P hp_laserjet</source> </message> <message> <source>&Create session icon on desktop...</source> - <translation type="unfinished"></translation> + <translation type="unfinished">&Créer une icone de session sur le bureau...</translation> </message> <message> <source>Delete</source> <comment>Delete</comment> - <translation type="unfinished"></translation> + <translation type="unfinished">Effacer</translation> </message> <message> <source>Session management</source> @@ -1624,7 +1631,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Login:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Identifiant:</translation> </message> <message> <source>SSH port:</source> @@ -1676,7 +1683,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Type:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Type:</translation> </message> <message> <source>Port:</source> @@ -1768,7 +1775,7 @@ lpr -P hp_laserjet</source> </message> <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Erreur</translation> </message> <message> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> @@ -1888,11 +1895,11 @@ sound system connections through firewalls</source> </message> <message> <source>us</source> - <translation type="unfinished"></translation> + <translation type="unfinished">us</translation> </message> <message> <source>pc105/us</source> - <translation type="unfinished"></translation> + <translation type="unfinished">pc105/us</translation> </message> <message> <source>password</source> @@ -1919,7 +1926,7 @@ sound system connections through firewalls</source> </message> <message> <source>Delete</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Effacer</translation> </message> <message> <source>Path:</source> @@ -1931,7 +1938,7 @@ sound system connections through firewalls</source> </message> <message> <source>Select folder</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Choisir un dossier</translation> </message> <message> <source>Filename encoding</source> @@ -1955,7 +1962,7 @@ sound system connections through firewalls</source> </message> <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Erreur</translation> </message> <message> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> @@ -2071,7 +2078,7 @@ sound system connections through firewalls</source> <name>XSettingsWidgetUI</name> <message> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> <source>You must restart the X2Go Client for the changes to take effect</source> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.0.0-17-g6c22593
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, master has been updated via 6c22593e134895ebb363e9851f457c3205257d71 (commit) from b3121c46cd4494b6d15cf644292f290bf0dadc91 (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 6c22593e134895ebb363e9851f457c3205257d71 Author: Frédéric Motte <frederic.motte(a)liazo.fr> Date: Fri Feb 15 23:45:50 2013 +0100 Add French translation file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 + x2goclient_fr.ts | 1187 ++++++++++++------------------------------------------ 2 files changed, 255 insertions(+), 936 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 034b01c..b4acd4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low + [ Frédéric Motte ] + * New upstream version (4.0.1.0): + - Add French translation file. + [ Mike Gabriel ] * Continue new feature development... diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 1debdbc..abbba81 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -4,1772 +4,1324 @@ <context> <name>AppDialog</name> <message> - <location filename="appdialog.ui" line="15"/> <source>Published Applications</source> - <translation type="unfinished"></translation> + <translation>Applications publiées</translation> </message> <message> - <location filename="appdialog.ui" line="58"/> <source>Search:</source> - <translation type="unfinished"></translation> + <translation>Rechercher:</translation> </message> <message> - <location filename="appdialog.ui" line="74"/> <source>&Start</source> - <translation type="unfinished"></translation> + <translation>&Démarrer</translation> </message> <message> - <location filename="appdialog.ui" line="94"/> <source>&Close</source> - <translation type="unfinished"></translation> + <translation>&Fermer</translation> </message> <message> - <location filename="appdialog.cpp" line="102"/> <source>Multimedia</source> - <translation type="unfinished"></translation> + <translation>Multimedia</translation> </message> <message> - <location filename="appdialog.cpp" line="107"/> <source>Development</source> - <translation type="unfinished"></translation> + <translation>Développement</translation> </message> <message> - <location filename="appdialog.cpp" line="112"/> <source>Education</source> - <translation type="unfinished"></translation> + <translation>Éducation</translation> </message> <message> - <location filename="appdialog.cpp" line="117"/> <source>Game</source> - <translation type="unfinished"></translation> + <translation>Jeux</translation> </message> <message> - <location filename="appdialog.cpp" line="122"/> <source>Graphics</source> - <translation type="unfinished"></translation> + <translation>Graphismes</translation> </message> <message> - <location filename="appdialog.cpp" line="127"/> <source>Network</source> - <translation type="unfinished"></translation> + <translation>Internet</translation> </message> <message> - <location filename="appdialog.cpp" line="132"/> <source>Office</source> - <translation type="unfinished"></translation> + <translation>Bureautique</translation> </message> <message> - <location filename="appdialog.cpp" line="137"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Préférences</translation> </message> <message> - <location filename="appdialog.cpp" line="142"/> <source>System</source> - <translation type="unfinished"></translation> + <translation>Système</translation> </message> <message> - <location filename="appdialog.cpp" line="147"/> <source>Utility</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Accessoires</translation> </message> <message> - <location filename="appdialog.cpp" line="152"/> <source>Other</source> - <translation type="unfinished"></translation> + <translation>Autres</translation> </message> </context> <context> <name>BrokerPassDialogUi</name> <message> - <location filename="brokerpassdialog.ui" line="15"/> <source>Dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="brokerpassdialog.ui" line="23"/> <source>Old password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Ancien mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="37"/> <source>New password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nouveau mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="51"/> <source>Confirm password:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Confirmez le mot de passe:</translation> </message> <message> - <location filename="brokerpassdialog.ui" line="80"/> <source>TextLabel</source> - <translation type="unfinished"></translation> + <translation type="unfinished">TextLabel</translation> </message> </context> <context> <name>BrokerPassDlg</name> <message> - <location filename="brokerpassdlg.cpp" line="39"/> <source>Passwords do not match</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Les mots de passe ne correspondent pas</translation> </message> </context> <context> <name>CUPSPrintWidget</name> <message> - <location filename="cupsprintwidget.cpp" line="71"/> <source>Idle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="74"/> <source>Printing</source> - <translation type="unfinished"></translation> + <translation type="unfinished">En cours d'impression</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="77"/> <source>Stopped</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Arrêté</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="87"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Oui</translation> </message> <message> - <location filename="cupsprintwidget.cpp" line="87"/> <source>No</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Non</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="21"/> <source>Form</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Formulaire</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="27"/> <source>Name:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Nom:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="44"/> <source>Properties</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Propriétés</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="51"/> <source>State:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">État:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="65"/> <source>Accepting jobs:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">En attentes de travaux:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="79"/> <source>Type:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Type:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="93"/> <source>Location:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Emplacement:</translation> </message> <message> - <location filename="cupsprintwidget.ui" line="107"/> <source>Comment:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Commentaire:</translation> </message> </context> <context> <name>CUPSPrinterSettingsDialog</name> <message> - <location filename="cupsprintersettingsdialog.cpp" line="110"/> <source>No option selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Pas d'options séléctionnées</translation> </message> <message> - <location filename="cupsprintersettingsdialog.cpp" line="271"/> <source>This value is in conflict with other option</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Cette valeur est en conflit avec une autre option</translation> </message> <message> - <location filename="cupsprintersettingsdialog.cpp" line="281"/> <source>Options conflict</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Conflits d'options</translation> </message> </context> <context> <name>ConTest</name> <message> - <location filename="contest.ui" line="15"/> <source>Connectivity test</source> - <translation type="unfinished"></translation> + <translation>Test de connectivité</translation> </message> <message> - <location filename="contest.ui" line="25"/> <source>HTTPS connection:</source> - <translation type="unfinished"></translation> + <translation>Connection HTTPS:</translation> </message> <message> - <location filename="contest.ui" line="32"/> <source>SSH connection:</source> - <translation type="unfinished"></translation> + <translation>Connection SSH:</translation> </message> <message> - <location filename="contest.ui" line="39"/> <source>Connection speed:</source> - <translation type="unfinished"></translation> + <translation>Vitesse de connection:</translation> </message> <message> - <location filename="contest.ui" line="124"/> - <location filename="contest.ui" line="168"/> <source>Failed</source> - <translation type="unfinished"></translation> + <translation>Échec</translation> </message> <message> - <location filename="contest.ui" line="212"/> <source>0 Kb/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="contest.cpp" line="106"/> - <location filename="contest.cpp" line="113"/> <source>OK</source> - <translation type="unfinished"></translation> + <translation>Ok</translation> </message> <message> - <location filename="contest.cpp" line="148"/> <source>Socket operation timed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="contest.cpp" line="160"/> - <location filename="contest.cpp" line="166"/> <source>Failed: </source> - <translation type="unfinished"></translation> + <translation>Échec:</translation> </message> </context> <context> <name>ConfigDialog</name> <message> - <location filename="configdialog.cpp" line="56"/> <source>General</source> - <translation type="unfinished"></translation> + <translation>Général</translation> </message> <message> - <location filename="configdialog.cpp" line="65"/> <source>Display icon in system tray</source> - <translation type="unfinished"></translation> + <translation>Afficher l'icone dans la barre des tâches</translation> </message> <message> - <location filename="configdialog.cpp" line="72"/> <source>Hide to system tray when minimized</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches à la réduction de la fenêtre</translation> </message> <message> - <location filename="configdialog.cpp" line="73"/> <source>Hide to system tray when closed</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches à la fermeture de la fenêtre</translation> </message> <message> - <location filename="configdialog.cpp" line="74"/> <source>Hide to system tray after connection is established</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches quand la session est établie</translation> </message> <message> - <location filename="configdialog.cpp" line="75"/> <source>Restore from system tray after session is disconnected</source> - <translation type="unfinished"></translation> + <translation>Cacher dans la barre des tâches quand la session est déconnectée</translation> </message> <message> - <location filename="configdialog.cpp" line="93"/> <source>Use LDAP</source> - <translation type="unfinished"></translation> + <translation>Utiliser LDAP</translation> </message> <message> - <location filename="configdialog.cpp" line="117"/> <source>Server URL:</source> - <translation type="unfinished"></translation> + <translation>URL du serveur:</translation> </message> <message> - <location filename="configdialog.cpp" line="118"/> <source>BaseDN:</source> - <translation type="unfinished"></translation> + <translation>BaseDN:</translation> </message> <message> - <location filename="configdialog.cpp" line="120"/> <source>Failover server 1 URL:</source> - <translation type="unfinished"></translation> + <translatorcomment>Failover en backup ?</translatorcomment> + <translation type="unfinished">URL du premier serveur de backup:</translation> </message> <message> - <location filename="configdialog.cpp" line="122"/> <source>Failover server 2 URL:</source> - <translation type="unfinished"></translation> + <translation type="unfinished">URL du second serveur de backup:</translation> </message> <message> - <location filename="configdialog.cpp" line="204"/> - <location filename="configdialog.cpp" line="346"/> <source>X-Server settings</source> - <translation type="unfinished"></translation> + <translation>Préférences du serveur X</translation> </message> <message> - <location filename="configdialog.cpp" line="213"/> <source>X11 application:</source> - <translation type="unfinished"></translation> + <translation>Applications X11:</translation> </message> <message> - <location filename="configdialog.cpp" line="224"/> <source>X11 version:</source> - <translation type="unfinished"></translation> + <translation>Version X11:</translation> </message> <message> - <location filename="configdialog.cpp" line="239"/> <source>Find X11 application</source> - <translation type="unfinished"></translation> + <translation>Trouver une application X11</translation> </message> <message> - <location filename="configdialog.cpp" line="256"/> <source>Clientside SSH port for file system export usage:</source> - <translation type="unfinished"></translation> + <translation>Port SSH coté client pour l'export du système de fichiers:</translation> </message> <message> - <location filename="configdialog.cpp" line="266"/> <source>Start session embedded inside website</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Démarrer une session embarquée dans le site web</translation> </message> <message> - <location filename="configdialog.cpp" line="270"/> - <location filename="configdialog.cpp" line="573"/> - <location filename="configdialog.cpp" line="585"/> <source>Advanced options</source> - <translation type="unfinished"></translation> + <translation>Options avancées</translation> </message> <message> - <location filename="configdialog.cpp" line="297"/> <source>Defaults</source> - <translation type="unfinished"></translation> + <translation>Défauts</translation> </message> <message> - <location filename="configdialog.cpp" line="298"/> <source>&OK</source> - <translation type="unfinished"></translation> + <translation>&Ok</translation> </message> <message> - <location filename="configdialog.cpp" line="299"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Annuler</translation> </message> <message> - <location filename="configdialog.cpp" line="322"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation>Préférences</translation> </message> <message> - <location filename="configdialog.cpp" line="342"/> <source>Printing</source> - <translation type="unfinished"></translation> + <translation>Impression</translation> </message> <message> - <location filename="configdialog.cpp" line="509"/> - <location filename="configdialog.cpp" line="527"/> - <location filename="configdialog.cpp" line="546"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Attention</translation> </message> <message> - <location filename="configdialog.cpp" line="510"/> <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source> - <translation type="unfinished"></translation> + <translation>x2goclient ne peut pas trouve d'application X11 adaptée. Merci d'installer Apple X11 ou de séléctionner le chemin de l'application</translation> </message> <message> - <location filename="configdialog.cpp" line="528"/> <source>Your are using X11 (Apple X-Window Server) version </source> - <translation type="unfinished"></translation> + <translation>Vous utilisez X11 (Server X-Window Apple) version </translation> </message> <message> - <location filename="configdialog.cpp" line="530"/> <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz)</source> - <translation type="unfinished"></translation> + <translation>Cette version pose des problèmes avec les applications X en mode de couleurs 24bits. Vous devriez mettre à jour votre environement X11 (http://trac.macosforge.org/projects/xquartz)</translation> </message> <message> - <location filename="configdialog.cpp" line="547"/> <source>No suitable X11 application found in selected path</source> - <translation type="unfinished"></translation> + <translation>Pas d'application X11 trouvée dans le chemin sélectionné.</translation> </message> <message> - <location filename="configdialog.cpp" line="583"/> <source>&Connection</source> - <translation type="unfinished"></translation> + <translation>&Connection</translation> </message> <message> - <location filename="configdialog.cpp" line="584"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>&Préférences</translation> </message> </context> <context> <name>ConnectionWidget</name> <message> - <location filename="connectionwidget.cpp" line="39"/> <source>&Connection speed</source> - <translation type="unfinished"></translation> + <translation>Vitesse de &connection</translation> </message> <message> - <location filename="connectionwidget.cpp" line="44"/> <source>Connection speed:</source> - <translation type="unfinished"></translation> + <translation>Vitesse de connection:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="74"/> <source>C&ompression</source> - <translation type="unfinished"></translation> + <translatorcomment>C&ompression</translatorcomment> + <translation type="unfinished">C&ompression</translation> </message> <message> - <location filename="connectionwidget.cpp" line="91"/> <source>Method:</source> - <translation type="unfinished"></translation> + <translation>Méthode:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="93"/> <source>Compression method:</source> - <translation type="unfinished"></translation> + <translation>Méthode de compression:</translation> </message> <message> - <location filename="connectionwidget.cpp" line="95"/> <source>Image quality:</source> - <translation type="unfinished"></translation> + <translation>Qualité d'image:</translation> </message> </context> <context> <name>CupsPrinterSettingsDialog</name> <message> - <location filename="cupsprintsettingsdialog.ui" line="21"/> <source>Dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="37"/> <source>General</source> - <translation type="unfinished"></translation> + <translation>Général</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="47"/> <source>Page size:</source> - <translation type="unfinished"></translation> + <translation>Taille de page:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="64"/> <source>Paper type:</source> - <translation type="unfinished"></translation> + <translation>Type de papier:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="74"/> <source>Paper source:</source> - <translation type="unfinished"></translation> + <translation>Source de papier:</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="101"/> <source>Duplex Printing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="107"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="114"/> <source>Long side</source> - <translation type="unfinished"></translation> + <translation>Bord long</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="121"/> <source>Short side</source> - <translation type="unfinished"></translation> + <translation>Bord court</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="145"/> <source>Driver settings</source> - <translation type="unfinished"></translation> + <translation>Préférences de pilote</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="177"/> <source>Option</source> - <translation type="unfinished"></translation> + <translation>Option</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="182"/> <source>Value</source> - <translation type="unfinished"></translation> + <translation>Valeur</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="188"/> <source>No option selected</source> - <translation type="unfinished"></translation> + <translation>Pas d'option sélectionnée</translation> </message> <message> - <location filename="cupsprintsettingsdialog.ui" line="207"/> <source>text</source> - <translation type="unfinished"></translation> + <translation>texte</translation> </message> </context> <context> <name>EditConnectionDialog</name> <message> - <location filename="editconnectiondialog.cpp" line="58"/> <source>&Session</source> - <translation type="unfinished"></translation> + <translation>&Session</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="59"/> <source>&Connection</source> - <translation type="unfinished"></translation> + <translation>&Connection</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="60"/> <source>&Settings</source> - <translation type="unfinished"></translation> + <translation>&Préférences</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="61"/> <source>&Shared folders</source> - <translation type="unfinished"></translation> + <translation>&Dossiers partagés</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="63"/> <source>&OK</source> - <translation type="unfinished"></translation> + <translation>&Ok</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="64"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Cancel</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="65"/> <source>Defaults</source> - <translation type="unfinished"></translation> + <translation>Défauts</translation> </message> <message> - <location filename="editconnectiondialog.cpp" line="123"/> <source>Session preferences - </source> - <translation type="unfinished"></translation> + <translation type="unfinished">Préférences de session - </translation> </message> </context> <context> <name>ExportDialog</name> <message> - <location filename="exportdialog.cpp" line="44"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Annuler</translation> </message> <message> - <location filename="exportdialog.cpp" line="50"/> <source>&share</source> - <translation type="unfinished"></translation> + <translation>&Partager</translation> </message> <message> - <location filename="exportdialog.cpp" line="51"/> <source>&Preferences ...</source> - <translation type="unfinished"></translation> + <translation>&Préférences ...</translation> </message> <message> - <location filename="exportdialog.cpp" line="52"/> <source>&Custom folder ...</source> - <translation type="unfinished"></translation> + <translation>&Dossier personnalisé ...</translation> </message> <message> - <location filename="exportdialog.cpp" line="62"/> <source>Delete</source> <comment>Delete</comment> - <translation type="unfinished"></translation> + <translation>Effacer</translation> </message> <message> - <location filename="exportdialog.cpp" line="79"/> <source>share folders</source> - <translation type="unfinished"></translation> + <translation>partager des dossiers</translation> </message> <message> - <location filename="exportdialog.cpp" line="145"/> <source>Select folder</source> - <translation type="unfinished"></translation> + <translation>Choisir un dossier</translation> </message> </context> <context> <name>HttpBrokerClient</name> <message> - <location filename="httpbrokerclient.cpp" line="350"/> - <location filename="httpbrokerclient.cpp" line="366"/> - <location filename="httpbrokerclient.cpp" line="386"/> - <location filename="httpbrokerclient.cpp" line="401"/> - <location filename="httpbrokerclient.cpp" line="415"/> - <location filename="httpbrokerclient.cpp" line="433"/> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="351"/> <source>Login failed! Please try again</source> - <translation type="unfinished"></translation> + <translation>Identification échouée ! Merci de réessayer</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="118"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>La clef du serveur a changée. +C'est maintenant: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="119"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Pour des raisons de sécurité, la connection va être stoppée.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="132"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation type="unfinished"></translation> + <translation type="unfinished">La clef de ce serveur n'a pas été trouvée mais un autre type de clef existe. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="158"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation type="unfinished"></translation> + <translation>Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="163"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Le serveur n'est pas connu. Avez-vous confiance en cette clef ? Hash de la clef publique: </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> - <location filename="httpbrokerclient.cpp" line="177"/> <source>Host key verification failed</source> - <translation type="unfinished"></translation> + <translation>La vérification de la clef d'hôte a échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation>Oui</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="167"/> <source>No</source> - <translation type="unfinished"></translation> + <translation>Non</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="190"/> <source>Enter passphrase to decrypt a key</source> - <translation type="unfinished"></translation> + <translation>Entrez la phrase de passe pour déchiffrer la clef</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="213"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>Identification échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="525"/> <source> Server uses an invalid security certificate. </source> - <translation type="unfinished"></translation> + <translation> Le serveur utilise un certificat de sécurité invalide. </translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="528"/> <source>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</source> - <translation type="unfinished"></translation> + <translation>Vous ne devriez pas ajouter d'exeption si vous n'avez pas une entière confiance en la connection Internet que vous utilisez ou si vous n'avez pas l'habitude de voir cet avertissement pour ce serveur.</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="533"/> <source>Secure connection failed</source> - <translation type="unfinished"></translation> + <translation>Connection sécurisée échouée</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="538"/> <source>Issued to: </source> - <translation type="unfinished"></translation> + <translation>Accordé à:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="539"/> - <location filename="httpbrokerclient.cpp" line="551"/> <source>Common Name(CN) </source> - <translation type="unfinished"></translation> + <translation>Common Name(CN)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="542"/> - <location filename="httpbrokerclient.cpp" line="554"/> <source>Organization(O) </source> - <translation type="unfinished"></translation> + <translation>Organization(O)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="545"/> - <location filename="httpbrokerclient.cpp" line="557"/> <source>Organizational Unit(OU) </source> - <translation type="unfinished"></translation> + <translation>Organizational Unit(OU)</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="548"/> <source>Serial Number </source> - <translation type="unfinished"></translation> + <translation>Numéro de série</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="550"/> <source>Issued by: </source> - <translation type="unfinished"></translation> + <translation>Accordé par:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="561"/> <source>Validity: </source> - <translation type="unfinished"></translation> + <translation>Validité:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="562"/> <source>Issued on </source> - <translation type="unfinished"></translation> + <translation>Accordé sur</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="563"/> <source>expires on </source> - <translation type="unfinished"></translation> + <translation>expire le</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="564"/> <source>Fingerprints: </source> - <translation type="unfinished"></translation> + <translation>Fingerprints:</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="565"/> <source>SHA1 </source> - <translation type="unfinished"></translation> + <translation>SHA1</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="567"/> <source>MD5 </source> - <translation type="unfinished"></translation> + <translation>MD5</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="573"/> <source>Exit X2Go Client</source> - <translation type="unfinished"></translation> + <translation>Quitter X2Go Client</translation> </message> <message> - <location filename="httpbrokerclient.cpp" line="575"/> <source>Add exception</source> - <translation type="unfinished"></translation> + <translation>Ajouter une exception</translation> </message> </context> <context> <name>ONMainWindow</name> <message> - <location filename="onmainwindow.cpp" line="89"/> - <location filename="onmainwindow.cpp" line="6191"/> <source>us</source> - <translation type="unfinished"></translation> + <translation>us</translation> </message> <message> - <location filename="onmainwindow.cpp" line="90"/> <source>pc105/us</source> - <translation type="unfinished"></translation> + <translation>pc105/us</translation> </message> <message> - <location filename="onmainwindow.cpp" line="142"/> <source>X2Go client</source> - <translation type="unfinished"></translation> + <translation>X2Go Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="159"/> - <location filename="onmainwindow.cpp" line="3022"/> - <location filename="onmainwindow.cpp" line="5320"/> <source>connecting</source> - <translation type="unfinished"></translation> + <translation>Connection en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="166"/> <source>Internet browser</source> - <translation type="unfinished"></translation> + <translation>Navigateur Internet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="167"/> <source>Email client</source> - <translation type="unfinished"></translation> + <translation>Client e-mail</translation> </message> <message> - <location filename="onmainwindow.cpp" line="168"/> <source>OpenOffice.org</source> - <translation type="unfinished"></translation> + <translation>OpenOffice.org</translation> </message> <message> - <location filename="onmainwindow.cpp" line="169"/> <source>Terminal</source> - <translation type="unfinished"></translation> + <translation>Terminal</translation> </message> <message> - <location filename="onmainwindow.cpp" line="344"/> <source>&Settings ...</source> - <translation type="unfinished"></translation> + <translation>&Préférences ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="348"/> <source>Support ...</source> - <translation type="unfinished"></translation> + <translation>Support ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="355"/> - <location filename="onmainwindow.cpp" line="7462"/> <source>About X2GO client</source> - <translation type="unfinished"></translation> + <translation>Apropos de X2Go Client</translation> </message> <message> - <location filename="onmainwindow.cpp" line="553"/> - <location filename="onmainwindow.cpp" line="1044"/> - <location filename="onmainwindow.cpp" line="10187"/> <source>Share folder...</source> - <translation type="unfinished"></translation> + <translation>Partager le dossier...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="556"/> - <location filename="onmainwindow.cpp" line="1045"/> - <location filename="onmainwindow.cpp" line="5376"/> - <location filename="onmainwindow.cpp" line="10360"/> <source>Suspend</source> - <translation type="unfinished"></translation> + <translation>Suspendre</translation> </message> <message> - <location filename="onmainwindow.cpp" line="559"/> - <location filename="onmainwindow.cpp" line="1046"/> - <location filename="onmainwindow.cpp" line="10200"/> - <location filename="onmainwindow.cpp" line="10362"/> <source>Terminate</source> - <translation type="unfinished"></translation> + <translation>Terminer</translation> </message> <message> - <location filename="onmainwindow.cpp" line="561"/> <source>Reconnect</source> - <translation type="unfinished"></translation> + <translation>Reconnecter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="565"/> - <location filename="onmainwindow.cpp" line="9624"/> <source>Detach X2Go window</source> - <translation type="unfinished"></translation> + <translation>Détacher la fenêtre X2Go</translation> </message> <message> - <location filename="onmainwindow.cpp" line="568"/> - <location filename="onmainwindow.cpp" line="10660"/> <source>Minimize toolbar</source> - <translation type="unfinished"></translation> + <translation>Réduire la barre d'outils</translation> </message> <message> - <location filename="onmainwindow.cpp" line="678"/> - <location filename="onmainwindow.cpp" line="1996"/> - <location filename="onmainwindow.cpp" line="7562"/> <source>Session:</source> - <translation type="unfinished"></translation> + <translation>Session:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="730"/> <source>&Quit</source> - <translation type="unfinished"></translation> + <translation>&Quiter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="731"/> <source>Ctrl+Q</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="732"/> - <location filename="onmainwindow.cpp" line="1063"/> <source>Quit</source> - <translation type="unfinished"></translation> + <translation>Quitter</translation> </message> <message> - <location filename="onmainwindow.cpp" line="735"/> <source>&New session ...</source> - <translation type="unfinished"></translation> + <translation>&Nouvelle session ...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="736"/> <source>Ctrl+N</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="741"/> <source>Session management...</source> - <translation type="unfinished"></translation> + <translation>Gestion de sessions...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="742"/> <source>Ctrl+E</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="752"/> <source>&Create session icon on desktop...</source> - <translation type="unfinished"></translation> + <translation>&Créer une icone de session sur le bureau...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="761"/> <source>&Set broker password...</source> - <translation type="unfinished"></translation> + <translation>Configurer le mot de passe du broker...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="772"/> <source>&Connectivity test...</source> - <translation type="unfinished"></translation> + <translation>Test de &Connectivité...</translation> </message> <message> - <location filename="onmainwindow.cpp" line="779"/> - <location filename="onmainwindow.cpp" line="800"/> <source>Show toolbar</source> - <translation type="unfinished"></translation> + <translation>Afficher la barre d'outils</translation> </message> <message> - <location filename="onmainwindow.cpp" line="785"/> <source>About Qt</source> - <translation type="unfinished"></translation> + <translation>À propos de Qt</translation> </message> <message> - <location filename="onmainwindow.cpp" line="802"/> <source>Ctrl+Q</source> <comment>exit</comment> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="808"/> <source>&Session</source> - <translation type="unfinished"></translation> + <translation>&Session</translation> </message> <message> - <location filename="onmainwindow.cpp" line="809"/> <source>&Options</source> - <translation type="unfinished"></translation> + <translation>&Options</translation> </message> <message> - <location filename="onmainwindow.cpp" line="828"/> <source>&Help</source> - <translation type="unfinished"></translation> + <translation>&Aide</translation> </message> <message> - <location filename="onmainwindow.cpp" line="867"/> - <location filename="onmainwindow.cpp" line="1989"/> - <location filename="onmainwindow.cpp" line="7555"/> - <location filename="onmainwindow.cpp" line="9988"/> <source>Login:</source> - <translation type="unfinished"></translation> + <translation>Identifiant:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="888"/> <source>Operation failed</source> - <translation type="unfinished"></translation> + <translation>Opération échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="892"/> <source>Password changed</source> - <translation type="unfinished"></translation> + <translation>Mot de passe modifié</translation> </message> <message> - <location filename="onmainwindow.cpp" line="916"/> <source>Wrong password!</source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe !</translation> </message> <message> - <location filename="onmainwindow.cpp" line="965"/> <source>Authentication</source> - <translation type="unfinished"></translation> + <translation>Identification</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1015"/> <source>Restore</source> - <translation type="unfinished"></translation> + <translation>Réstauration</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1017"/> - <location filename="onmainwindow.cpp" line="5211"/> <source>Not connected</source> - <translation type="unfinished"></translation> + <translation>Non connecté</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1019"/> <source>Multimedia</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="1021"/> <source>Development</source> - <translation type="unfinished"></translation> + <translation>Développement</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1023"/> <source>Education</source> - <translation type="unfinished"></translation> + <translation>Éducation</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1025"/> <source>Game</source> - <translation type="unfinished"></translation> + <translation>Jeux</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1027"/> <source>Graphics</source> - <translation type="unfinished"></translation> + <translation>Graphismes</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1029"/> <source>Network</source> - <translation type="unfinished"></translation> + <translation>Internet</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1031"/> <source>Office</source> - <translation type="unfinished"></translation> + <translation>Bureautique</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1033"/> <source>Settings</source> - <translation type="unfinished"></translation> + <translation>Préférences</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1035"/> <source>System</source> - <translation type="unfinished"></translation> + <translation>Système</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1037"/> <source>Utility</source> - <translation type="unfinished"></translation> + <translation>Accessoires</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1039"/> <source>Other</source> - <translation type="unfinished"></translation> + <translation>Autres</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1074"/> <source>Left mouse button to hide/restore - Right mouse button to display context menu</source> - <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="onmainwindow.cpp" line="888"/> - <location filename="onmainwindow.cpp" line="916"/> - <location filename="onmainwindow.cpp" line="1671"/> - <location filename="onmainwindow.cpp" line="1700"/> - <location filename="onmainwindow.cpp" line="1708"/> - <location filename="onmainwindow.cpp" line="1854"/> - <location filename="onmainwindow.cpp" line="1881"/> - <location filename="onmainwindow.cpp" line="1884"/> - <location filename="onmainwindow.cpp" line="2136"/> - <location filename="onmainwindow.cpp" line="2369"/> - <location filename="onmainwindow.cpp" line="2383"/> - <location filename="onmainwindow.cpp" line="2396"/> - <location filename="onmainwindow.cpp" line="2430"/> - <location filename="onmainwindow.cpp" line="2475"/> - <location filename="onmainwindow.cpp" line="3386"/> - <location filename="onmainwindow.cpp" line="3564"/> - <location filename="onmainwindow.cpp" line="3573"/> - <location filename="onmainwindow.cpp" line="3881"/> - <location filename="onmainwindow.cpp" line="4356"/> - <location filename="onmainwindow.cpp" line="4432"/> - <location filename="onmainwindow.cpp" line="4496"/> - <location filename="onmainwindow.cpp" line="4526"/> - <location filename="onmainwindow.cpp" line="4568"/> - <location filename="onmainwindow.cpp" line="4940"/> - <location filename="onmainwindow.cpp" line="4966"/> - <location filename="onmainwindow.cpp" line="5116"/> - <location filename="onmainwindow.cpp" line="5896"/> - <location filename="onmainwindow.cpp" line="5926"/> - <location filename="onmainwindow.cpp" line="6703"/> - <location filename="onmainwindow.cpp" line="6783"/> - <location filename="onmainwindow.cpp" line="7025"/> - <location filename="onmainwindow.cpp" line="7150"/> - <location filename="onmainwindow.cpp" line="7201"/> - <location filename="onmainwindow.cpp" line="7505"/> - <location filename="onmainwindow.cpp" line="7507"/> - <location filename="onmainwindow.cpp" line="7738"/> - <location filename="onmainwindow.cpp" line="7786"/> - <location filename="onmainwindow.cpp" line="7814"/> - <location filename="onmainwindow.cpp" line="8252"/> - <location filename="onmainwindow.cpp" line="8267"/> - <location filename="onmainwindow.cpp" line="8313"/> - <location filename="onmainwindow.cpp" line="8339"/> - <location filename="onmainwindow.cpp" line="8364"/> - <location filename="onmainwindow.cpp" line="10578"/> + <translation>Bouton de gauche de la souris pour cacher/afficher - Bouton de droite de la souris pour afficher le menu contextuel</translation> + </message> + <message> <source>Error</source> - <translation type="unfinished"></translation> + <translation>Erreur</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1672"/> - <location filename="onmainwindow.cpp" line="1855"/> - <location filename="onmainwindow.cpp" line="1885"/> <source>Please check LDAP settings</source> - <translation type="unfinished"></translation> + <translation>Merci de vérifier les réglages LDAP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="1707"/> <source>no X2Go server found in LDAP </source> - <translation type="unfinished"></translation> + <translation>Pas de serveur X2Go trouvé dans LDAP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2019"/> <source>Create session icon on desktop</source> - <translation type="unfinished"></translation> + <translation>Créer une icone de session sur le bureau</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2020"/> <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card. Use x2goclient hidden mode?</source> - <translation type="unfinished"></translation> + <translation>Les icones de bureau peuvent être configurées pour ne pas afficher X2Go Client (mode caché). Si vous voulez utiliser cette fonctionnalité, vous aurez besoin de configurer l'identification par clef GPG ou par Smart Card GPG. + +Utiliser le mode caché de X2Go Client ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2031"/> <source>New Session</source> - <translation type="unfinished"></translation> + <translation>Nouvelle session</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2086"/> <source>X2Go Link to session </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2136"/> <source>X2Go sessions not found</source> - <translation type="unfinished"></translation> + <translation>Sessions X2Go non trouvées</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2294"/> <source>Are you sure you want to delete this session?</source> - <translation type="unfinished"></translation> + <translation>Êtes vous sûr de vouloir effacer cette session ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2602"/> - <location filename="onmainwindow.cpp" line="5736"/> <source>KDE</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2680"/> <source>RDP connection</source> - <translation type="unfinished"></translation> + <translation>Connection RDP</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2684"/> <source>XDMCP</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="2688"/> <source>Connection to local desktop</source> - <translation type="unfinished"></translation> + <translation>Connection au bureau local</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2692"/> <source> on </source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location filename="onmainwindow.cpp" line="3379"/> - <location filename="onmainwindow.cpp" line="4425"/> - <location filename="onmainwindow.cpp" line="4519"/> - <location filename="onmainwindow.cpp" line="4550"/> - <location filename="onmainwindow.cpp" line="6696"/> - <location filename="onmainwindow.cpp" line="6776"/> - <location filename="onmainwindow.cpp" line="7143"/> - <location filename="onmainwindow.cpp" line="7194"/> - <location filename="onmainwindow.cpp" line="8245"/> <source>Connection failed </source> - <translation type="unfinished"></translation> + <translation>Connection échouée +</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3382"/> - <location filename="onmainwindow.cpp" line="4428"/> - <location filename="onmainwindow.cpp" line="4522"/> - <location filename="onmainwindow.cpp" line="5893"/> - <location filename="onmainwindow.cpp" line="5923"/> - <location filename="onmainwindow.cpp" line="6699"/> - <location filename="onmainwindow.cpp" line="6779"/> - <location filename="onmainwindow.cpp" line="7146"/> - <location filename="onmainwindow.cpp" line="7197"/> - <location filename="onmainwindow.cpp" line="8248"/> <source>Wrong password! </source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe ! </translation> </message> <message> - <location filename="onmainwindow.cpp" line="3498"/> <source>unknown</source> - <translation type="unfinished"></translation> + <translation>inconnu</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3565"/> <source>No server availabel</source> - <translation type="unfinished"></translation> + <translation>Pas de serveur disponible</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4106"/> - <location filename="onmainwindow.cpp" line="10351"/> <source>Select session:</source> - <translation type="unfinished"></translation> + <translation>Sélectionnez la session:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4122"/> - <location filename="onmainwindow.cpp" line="4219"/> - <location filename="onmainwindow.cpp" line="5340"/> <source>running</source> - <translation type="unfinished"></translation> + <translation>en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4124"/> - <location filename="onmainwindow.cpp" line="4444"/> <source>suspended</source> - <translation type="unfinished"></translation> + <translation>suspendue</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4130"/> <source>Desktop</source> - <translation type="unfinished"></translation> + <translation>Bureau</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4132"/> <source>single application</source> - <translation type="unfinished"></translation> + <translation>application simple</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4134"/> <source>shadow session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="4167"/> <source>Information</source> - <translation type="unfinished"></translation> + <translation>Information</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4168"/> <source>No accessible desktop found</source> - <translation type="unfinished"></translation> + <translation>Aucun bureau distant trouvé</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4181"/> - <location filename="onmainwindow.cpp" line="10761"/> <source>Filter</source> - <translation type="unfinished"></translation> + <translation>Filtre</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4188"/> <source>Select desktop:</source> - <translation type="unfinished"></translation> + <translation>Selectionnez un bureau:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4269"/> - <location filename="onmainwindow.cpp" line="4289"/> - <location filename="onmainwindow.cpp" line="5146"/> - <location filename="onmainwindow.cpp" line="5547"/> <source>Warning</source> - <translation type="unfinished"></translation> + <translation>Attention</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4270"/> - <location filename="onmainwindow.cpp" line="4290"/> <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases you will loose the session and have to start a new one! It's highly recommended to change the color depth of your Display to </source> - <translation type="unfinished"></translation> + <translation>La profondeur de couleur de votre serveur X est différente de celle de votre session X2Go. Cela peut pauser problème pour se reconnecter et la plupart du temps, vous allez perdre la session. Vous êtes fortement encouragé à changer la profondeur de couleur de couleur de votre serveur X à </translation> </message> <message> - <location filename="onmainwindow.cpp" line="4278"/> <source>24 or 32</source> - <translation type="unfinished"></translation> + <translation>24 ou 32</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4279"/> - <location filename="onmainwindow.cpp" line="4299"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation type="unfinished"></translation> + <translation>bits et redémarrer votre serveur X avant de vous reconnecter à votre session. Souhaitez-vous tout de même rétablir cette session ?</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="4282"/> - <location filename="onmainwindow.cpp" line="4302"/> <source>Yes</source> - <translation type="unfinished"></translation> + <translation>Oui</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2873"/> <source>Enter passphrase to decrypt a key</source> - <translation type="unfinished"></translation> + <translation>Entrez une phrase de passe pour déchiffrer une clef</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2901"/> <source>Host key for server changed. It is now: </source> - <translation type="unfinished"></translation> + <translation>La clef d'hôte du serveur a changée. +La nouvelle clef est:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2902"/> <source>For security reasons, connection will be stopped</source> - <translation type="unfinished"></translation> + <translation>Pour des raisons de sécurité, la connection va être stoppée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2915"/> <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source> - <translation type="unfinished"></translation> + <translation>La clef d'hôte pour ce serveur n'a pas été trouvée mais un autre type de clef a été trouvé. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2941"/> <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source> - <translation type="unfinished"></translation> + <translation>Impossible de trouver le fichier des hôtes connus. Si vouss acceptez la clef d'hôte ici, le fichier sera automatiquement créé</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2946"/> <source>The server is unknown. Do you trust the host key? Public key hash: </source> - <translation type="unfinished"></translation> + <translation>Le serveur est inconnu. Avez vous confiance en la clef d'hôte ? +Hash de la clef publique: </translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="4283"/> - <location filename="onmainwindow.cpp" line="4303"/> <source>No</source> - <translation type="unfinished"></translation> + <translation>Non</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2950"/> - <location filename="onmainwindow.cpp" line="2960"/> <source>Host key verification failed</source> - <translation type="unfinished"></translation> + <translation>La vérification de la clef d'hôte a échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="2977"/> <source>Authentication failed</source> - <translation type="unfinished"></translation> + <translation>L'autentification a échouée</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3354"/> <source>Enter password for SSH proxy</source> - <translation type="unfinished"></translation> + <translation>Entrez un mot de passe pour le proxy SSH</translation> </message> <message> - <location filename="onmainwindow.cpp" line="3574"/> - <location filename="onmainwindow.cpp" line="3882"/> - <location filename="onmainwindow.cpp" line="4357"/> - <location filename="onmainwindow.cpp" line="4497"/> <source>Server not availabel</source> - <translation type="unfinished"></translation> + <translation>Le serveur n'est pas disponible</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4383"/> <source>suspending</source> - <translation type="unfinished"></translation> + <translation type="unfinished">suspension</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4413"/> <source>terminating</source> - <translation type="unfinished"></translation> + <translation type="unfinished">en train de se terminer</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4553"/> <source>Wrong Password! </source> - <translation type="unfinished"></translation> + <translation>Mauvais mot de passe ! </translation> </message> <message> - <location filename="onmainwindow.cpp" line="4938"/> - <location filename="onmainwindow.cpp" line="7023"/> <source>Unable to create folder:</source> - <translation type="unfinished"></translation> + <translation>Impossible de créer le dossier:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="4964"/> <source>Unable to write file:</source> - <translation type="unfinished"></translation> + <translation>Impossible de créer le fichier:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5088"/> - <location filename="onmainwindow.cpp" line="9599"/> <source>Attach X2Go window</source> - <translation type="unfinished"></translation> + <translation>Atacher la fenêtre X2Go</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5114"/> - <location filename="onmainwindow.cpp" line="8311"/> <source>Unable to create SSL tunnel: </source> - <translation type="unfinished"></translation> + <translation>Impossible de créer un tunnel SSL:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5144"/> <source>Unable to create SSL Tunnel: </source> - <translation type="unfinished"></translation> + <translation>Impossible de créer un tunnel SSL:</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5305"/> <source>Finished</source> - <translation type="unfinished"></translation> + <translation>Fini</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5329"/> <source>starting</source> - <translation type="unfinished"></translation> + <translation>démarrage</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5333"/> <source>resuming</source> - <translation type="unfinished"></translation> + <translation>rétablissement</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5396"/> - <location filename="onmainwindow.cpp" line="5658"/> - <location filename="onmainwindow.cpp" line="5677"/> <source>Connection timeout, aborting</source> - <translation type="unfinished"></translation> + <translation>Connection expirée, abandon en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5397"/> <source>aborting</source> - <translation type="unfinished"></translation> + <translation>abandon en cours</translation> </message> <message> - <location filename="onmainwindow.cpp" line="5548"/> <source>Are you sure you want to terminate this session? Unsaved documents will be lost</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5626"/> <source>Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5628"/> - <location filename="onmainwindow.cpp" line="10432"/> - <location filename="onmainwindow.cpp" line="10454"/> <source>Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5630"/> - <location filename="onmainwindow.cpp" line="10443"/> <source>Creation time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="5890"/> - <location filename="onmainwindow.cpp" line="5920"/> <source>Connection failed : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6336"/> <source> (can't open file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6347"/> - <location filename="onmainwindow.cpp" line="6357"/> - <location filename="onmainwindow.cpp" line="6367"/> <source> (file not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6391"/> <source> (directory not exists)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6419"/> <source>wrong value for argument"--link"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6437"/> <source>wrong value for argument"--sound"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6454"/> - <location filename="onmainwindow.cpp" line="6465"/> <source>wrong value for argument"--geometry"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6483"/> <source>wrong value for argument"--set-kbd"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6500"/> <source>wrong value for argument"--ldap"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6522"/> <source>wrong value for argument"--ldap1"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6541"/> <source>wrong value for argument"--ldap2"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6595"/> <source>wrong value for argument"--pack"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6603"/> - <location filename="onmainwindow.cpp" line="6606"/> <source>wrong parameter: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6657"/> - <location filename="onmainwindow.cpp" line="6683"/> <source>Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="6662"/> <source>Available pack methodes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7437"/> <source>Support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7442"/> <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7446"/> <source> x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7450"/> <source> Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7463"/> <source>X2Go client V. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7508"/> <source>Please check LDAP Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7739"/> <source>No valid card found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7787"/> <source>This card is unknown by X2Go system</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="7815"/> <source>Unable to create file: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8089"/> <source>Can't start X server Please check your settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8088"/> <source>Can't connect to X server Please check your settings</source> - <oldsource>Can't connect to X-Server -Please check your settings</oldsource> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8103"/> - <location filename="onmainwindow.cpp" line="8726"/> - <location filename="onmainwindow.cpp" line="8754"/> <source>Can't start X Server Please check your installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8268"/> <source>Unable to execute: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8285"/> <source>Remote server does not support file system export through SSH Tunnel Please update to a newer x2goserver package</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8338"/> <source>Unable to read : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8363"/> <source>Unable to write : </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9688"/> <source>X2Go Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9989"/> <source>Password:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9990"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10031"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10033"/> - <location filename="onmainwindow.cpp" line="10355"/> - <location filename="onmainwindow.cpp" line="10357"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10170"/> <source>Session ID: Server: Username: Display: Creation time: Status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10180"/> <source>Applications...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10193"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10205"/> <source>Show details</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10353"/> <source>Resume</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10365"/> <source>New</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10368"/> <source>Full access</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10371"/> <source>View only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10434"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10436"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10438"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10440"/> <source>Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10445"/> <source>Client IP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10447"/> <source>Session ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10451"/> <source>User</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10482"/> <source>Only my desktops</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10579"/> <source>sshd not started, you'll need sshd for printing and file sharing you can install sshd with sudo apt-get install openssh-server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10648"/> <source>Restore toolbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="10693"/> <source> &nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp; </source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="920"/> - <location filename="onmainwindow.cpp" line="3028"/> - <location filename="onmainwindow.cpp" line="10829"/> <source>Connecting to broker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8450"/> <source>WINDOWS-1252</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="8462"/> <source>ISO8859-1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="onmainwindow.cpp" line="9875"/> <source>wrong value for argument"speed"</source> <translation type="unfinished"></translation> </message> @@ -1777,22 +1329,18 @@ you can install sshd with <context> <name>PrintDialog</name> <message> - <location filename="printdialog.cpp" line="31"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.cpp" line="60"/> <source>You've deactivated the x2go client printing dialog.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.cpp" line="62"/> <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printdialog.ui" line="18"/> <source>Print - X2Go client</source> <translation type="unfinished"></translation> </message> @@ -1800,25 +1348,19 @@ you can install sshd with <context> <name>PrintProcess</name> <message> - <location filename="printprocess.cpp" line="161"/> <source>Save File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="163"/> <source>PDF Document (*.pdf)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="257"/> - <location filename="printprocess.cpp" line="280"/> <source>Failed to execute command: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="printprocess.cpp" line="272"/> - <location filename="printprocess.cpp" line="279"/> <source>Printing error</source> <translation type="unfinished"></translation> </message> @@ -1826,73 +1368,59 @@ you can install sshd with <context> <name>PrintWidget</name> <message> - <location filename="printwidget.cpp" line="59"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="15"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="25"/> <source>Print</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="35"/> <source>View as PDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="65"/> <source>Print settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="71"/> <source>Printer:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="81"/> <source>Print using default Windows PDF Viewer (Viewer application needs to be installed)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="96"/> <source>Printer command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="118"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="149"/> <source>Viewer settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="155"/> <source>Open in viewer application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="167"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="179"/> <source>Save to disk</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printwidget.ui" line="209"/> <source>Show this dialog before start printing</source> <translation type="unfinished"></translation> </message> @@ -1900,29 +1428,24 @@ you can install sshd with <context> <name>PrinterCmdDialog</name> <message> - <location filename="printercmddialog.cpp" line="43"/> <source>Please enter your customized or individual printing command. Example: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.cpp" line="51"/> <source><Path to gsprint.exe> -query -color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="15"/> <source>Printer command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="21"/> <source>Command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="27"/> <source>Please enter your customized or individual printing command. Examples: kprinter @@ -1930,178 +1453,121 @@ lpr -P hp_laserjet</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="46"/> <source>Output format</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="52"/> <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="68"/> <source>PDF</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="75"/> <source>PS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="88"/> <source>Data structure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="94"/> <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="110"/> <source>standard input (STDIN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="printercmddialog.ui" line="117"/> <source>Specify path as program parameter</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>QObject</name> - <message> - <location filename="ongetpass.cpp" line="76"/> - <source>No response received from the remote server. Do you want to terminate the current session?</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>SessionButton</name> <message> - <location filename="sessionbutton.cpp" line="135"/> <source>Session preferences...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="139"/> <source>Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="144"/> <source>Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="157"/> <source>Session actions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="158"/> <source>Select type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="160"/> <source>Select resolution</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="161"/> <source>Toggle sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="291"/> <source>New Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="296"/> <source>running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="300"/> <source>suspended</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="333"/> <source>KDE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="348"/> - <location filename="sessionbutton.cpp" line="395"/> - <location filename="sessionbutton.cpp" line="684"/> <source>RDP connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="349"/> - <location filename="sessionbutton.cpp" line="401"/> - <location filename="sessionbutton.cpp" line="690"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="350"/> - <location filename="sessionbutton.cpp" line="386"/> - <location filename="sessionbutton.cpp" line="678"/> <source>Connection to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="351"/> - <location filename="sessionbutton.cpp" line="406"/> - <location filename="sessionbutton.cpp" line="726"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="430"/> - <location filename="sessionbutton.cpp" line="448"/> - <location filename="sessionbutton.cpp" line="747"/> <source>fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="435"/> - <location filename="sessionbutton.cpp" line="458"/> - <location filename="sessionbutton.cpp" line="462"/> - <location filename="sessionbutton.cpp" line="760"/> - <location filename="sessionbutton.cpp" line="763"/> <source>Display </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="443"/> - <location filename="sessionbutton.cpp" line="483"/> <source>window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="490"/> - <location filename="sessionbutton.cpp" line="494"/> - <location filename="sessionbutton.cpp" line="495"/> - <location filename="sessionbutton.cpp" line="753"/> <source>Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="502"/> - <location filename="sessionbutton.cpp" line="632"/> <source>Enabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionbutton.cpp" line="504"/> - <location filename="sessionbutton.cpp" line="634"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -2109,38 +1575,31 @@ lpr -P hp_laserjet</source> <context> <name>SessionManageDialog</name> <message> - <location filename="sessionmanagedialog.cpp" line="41"/> <source>E&xit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="47"/> <source>&New session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="48"/> <source>&Session preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="49"/> <source>&Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="53"/> <source>&Create session icon on desktop...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="87"/> <source>Delete</source> <comment>Delete</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionmanagedialog.cpp" line="115"/> <source>Session management</source> <translation type="unfinished"></translation> </message> @@ -2148,226 +1607,170 @@ lpr -P hp_laserjet</source> <context> <name>SessionWidget</name> <message> - <location filename="sessionwidget.cpp" line="61"/> <source>Session name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="66"/> <source><< change icon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="69"/> <source>&Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="102"/> - <location filename="sessionwidget.cpp" line="160"/> <source>Host:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="103"/> - <location filename="sessionwidget.cpp" line="166"/> <source>Login:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="104"/> - <location filename="sessionwidget.cpp" line="367"/> <source>SSH port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="119"/> <source>Use RSA/DSA key for ssh connection:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="126"/> <source>Try auto login (ssh-agent or default ssh key)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="127"/> <source>Kerberos 5 (GSSAPI) authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="130"/> <source>Use Proxy server for SSH connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="131"/> <source>Proxy server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="137"/> <source>SSH</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="138"/> <source>HTTP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="146"/> <source>Same login as on X2Go Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="148"/> <source>Same password as on X2Go Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="150"/> <source>RSA/DSA key:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="155"/> <source>ssh-agent or default ssh key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="157"/> <source>Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="161"/> <source>Port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="176"/> <source>&Session type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="181"/> <source>Session type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="192"/> - <location filename="sessionwidget.cpp" line="491"/> <source>Connect to Windows terminal server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="193"/> <source>XDMCP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="194"/> <source>Connect to local desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="195"/> <source>Custom desktop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="196"/> <source>Single application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="197"/> <source>Published applications</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="199"/> - <location filename="sessionwidget.cpp" line="435"/> <source>Command:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="200"/> <source>Advanced options...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="212"/> - <location filename="sessionwidget.cpp" line="725"/> - <location filename="sessionwidget.cpp" line="820"/> <source>Path to executable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="222"/> <source>Direct RDP Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="363"/> <source>RDP port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="379"/> <source>Open picture</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="381"/> <source>Pictures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="290"/> - <location filename="sessionwidget.cpp" line="402"/> <source>Open key file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="292"/> - <location filename="sessionwidget.cpp" line="404"/> <source>All files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="462"/> - <location filename="sessionwidget.cpp" line="680"/> <source>Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="471"/> - <location filename="sessionwidget.cpp" line="692"/> <source>XDMCP server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="492"/> <source>rdesktop command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="505"/> - <location filename="sessionwidget.cpp" line="704"/> <source>New session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="302"/> - <location filename="sessionwidget.cpp" line="414"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sessionwidget.cpp" line="303"/> - <location filename="sessionwidget.cpp" line="415"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> @@ -2375,156 +1778,123 @@ lpr -P hp_laserjet</source> <context> <name>SettingsWidget</name> <message> - <location filename="settingswidget.cpp" line="47"/> - <location filename="settingswidget.cpp" line="51"/> <source>&Display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="48"/> - <location filename="settingswidget.cpp" line="52"/> <source>&Keyboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="49"/> - <location filename="settingswidget.cpp" line="53"/> <source>Sound</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="244"/> <source>RDP Client</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="64"/> <source>Fullscreen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="66"/> <source>Custom</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="68"/> <source>Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="70"/> <source>Use whole display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="72"/> <source>Maximum available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="83"/> <source>Set display DPI</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="88"/> <source>Xinerama extension (support for two or more physical displays)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="104"/> <source>Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="107"/> <source>Height:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="117"/> <source>&Display:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="119"/> <source>&Identify all displays</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="159"/> <source>Keep current keyboard Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="169"/> <source>Keyboard layout:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="171"/> <source>Keyboard model:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="182"/> <source>Enable sound support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="191"/> <source>Start sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="193"/> <source>Use running sound daemon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="195"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="197"/> <source>Use default sound port</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="204"/> <source>Sound port:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="231"/> <source>Client side printing support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="256"/> <source>Additional parameters:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="257"/> <source>Command line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="650"/> <source>us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="651"/> <source>pc105/us</source> <translation type="unfinished"></translation> </message> <message> - <location filename="settingswidget.cpp" line="768"/> <source>password</source> <translation type="unfinished"></translation> </message> @@ -2532,80 +1902,62 @@ sound system connections through firewalls</source> <context> <name>ShareWidget</name> <message> - <location filename="sharewidget.cpp" line="43"/> <source>&Folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="53"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="55"/> - <location filename="sharewidget.cpp" line="137"/> <source>Automount</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="64"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="65"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="75"/> <source>Path:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="101"/> <source>Use ssh port forwarding to tunnel file system connections through firewalls</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="164"/> <source>Select folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="82"/> <source>Filename encoding</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="235"/> - <location filename="sharewidget.cpp" line="286"/> <source>WINDOWS-1252</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="245"/> - <location filename="sharewidget.cpp" line="292"/> <source>ISO8859-1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="88"/> <source>local:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="89"/> <source>remote:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="175"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharewidget.cpp" line="176"/> <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source> <translation type="unfinished"></translation> </message> @@ -2613,103 +1965,82 @@ sound system connections through firewalls</source> <context> <name>SshMasterConnection</name> <message> - <location filename="sshmasterconnection.cpp" line="221"/> <source>SSH proxy connection error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="226"/> - <location filename="sshmasterconnection.cpp" line="232"/> <source>SSH proxy connection error: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="248"/> <source>Failed to create SSH proxy tunnel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="319"/> <source>Can not initialize libssh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="345"/> <source>Can not create ssh session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="373"/> <source>Can not connect to proxy server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="394"/> <source>Can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="448"/> <source>Authentication failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="474"/> <source>channel_forward_listen failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="893"/> <source>Can not open file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="905"/> <source>Can not create remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="918"/> <source>Can not write to remote file </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="975"/> <source>can not connect to </source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1093"/> <source>channel_open_forward failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1112"/> <source>channel_open_session failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1119"/> <source>channel_request_exec failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1184"/> <source>error writing to socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1202"/> <source>error reading channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1232"/> <source>channel_write failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshmasterconnection.cpp" line="1244"/> <source>error reading tcp socket</source> <translation type="unfinished"></translation> </message> @@ -2717,12 +2048,10 @@ sound system connections through firewalls</source> <context> <name>SshProcess</name> <message> - <location filename="sshprocess.cpp" line="95"/> <source>Error creating socket</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sshprocess.cpp" line="113"/> <source>Error binding </source> <translation type="unfinished"></translation> </message> @@ -2730,12 +2059,10 @@ sound system connections through firewalls</source> <context> <name>XSettingsWidget</name> <message> - <location filename="xsettingswidget.cpp" line="48"/> <source>Open File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingswidget.cpp" line="50"/> <source>Executable (*.exe)</source> <translation type="unfinished"></translation> </message> @@ -2743,62 +2070,50 @@ sound system connections through firewalls</source> <context> <name>XSettingsWidgetUI</name> <message> - <location filename="xsettingsui.ui" line="15"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="28"/> <source>You must restart the X2Go Client for the changes to take effect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="51"/> <source>use integrated X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="61"/> <source>use custom X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="71"/> <source>custom X-Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="79"/> <source>executable:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="102"/> <source>start X-Server on X2Go client start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="114"/> <source>command line options:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="126"/> <source>X-Server command line options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="132"/> <source>window mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="142"/> <source>fullscreen mode:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="xsettingsui.ui" line="152"/> <source>single application:</source> <translation type="unfinished"></translation> </message> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.0-6-gc12aa8e
by git-admin＠x2go.org 15 Feb '13

15 Feb '13

The branch, release/4.0.0.x has been updated via c12aa8e82a53f041c64a8f8de68abba2e1108d35 (commit) from df45ea1b2327e0ec7672234a7370002fc8347529 (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 c12aa8e82a53f041c64a8f8de68abba2e1108d35 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 15 11:08:07 2013 +0100 Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gogetapps | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2625e86..ed4ee9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index dbcd8c1..8414daa 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -180,7 +180,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; 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

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2013