x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - master (branch) updated: 0.2.0.10-35-gc005bbc
by git-admin＠x2go.org 11 Oct '12

11 Oct '12

The branch, master has been updated via c005bbc4e71fb40b5766e4a26d63cf30dec25bd1 (commit) from 6e31c25958c932247293307f015082d13df2b31e (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 c005bbc4e71fb40b5766e4a26d63cf30dec25bd1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 11:53:30 2012 +0200 fix __doc__ string ----------------------------------------------------------------------- Summary of changes: x2go/registry.py | 2 -- 1 file changed, 2 deletions(-) The diff of changes is: diff --git a/x2go/registry.py b/x2go/registry.py index 84a0058..07571c4 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -498,8 +498,6 @@ class X2goSessionRegistry(object): @type add_to_known_hosts: C{bool} @param known_hosts: the underlying Paramiko/SSH systems C{known_hosts} file @type known_hosts: C{str} - @param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side - @type forward_sshagent: C{bool} @param kwargs: all other options will be passed on to the constructor of the to-be-instantiated L{X2goSession} instance @type C{dict} hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-34-g6e31c25
by git-admin＠x2go.org 11 Oct '12

11 Oct '12

The branch, master has been updated via 6e31c25958c932247293307f015082d13df2b31e (commit) from b75628bac35ba95c3c70d3a9dccba9c116b263a7 (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 6e31c25958c932247293307f015082d13df2b31e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 11:51:44 2012 +0200 Enable autologin and sshproxyautologin for new session profiles. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e9934e5..8fab706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low Paramiko terms). - Make X2goClient instance available in initial X2goSession instances. - Allow post-initialization updating of forward_sshagent class property. + - Enable autologin and sshproxyautologin for new session profiles. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/defaults.py b/x2go/defaults.py index b387739..790ec53 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -292,11 +292,11 @@ X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL', """X2go's generic applications.""" X2GO_SESSIONPROFILE_DEFAULTS = { - 'autologin': False, 'autoconnect': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", + 'autologin': True, 'autoconnect': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': 'localhost:44444:server.mydomain.private:22', 'sshproxykeyfile': '', - 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': False, + 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': True, 'useexports': True, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-39-g84758c7
by git-admin＠x2go.org 11 Oct '12

11 Oct '12

The branch, master has been updated via 84758c73bfd5cff19e6c12369e92a2aff008ceb9 (commit) via 5bb0021dc90086ae1d4182f463d2e5941fb22a3a (commit) via eba734c45a3b62effec934404e1b8f78804b25a7 (commit) from 4e7c22e6c1994cc74348e8c8ee808e5e31886de1 (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 84758c73bfd5cff19e6c12369e92a2aff008ceb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:59:14 2012 +0200 update i18n files commit 5bb0021dc90086ae1d4182f463d2e5941fb22a3a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:56:48 2012 +0200 rename profile manager tab ,,Shared Resources'' back to ,,Sharing'' commit eba734c45a3b62effec934404e1b8f78804b25a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:45:07 2012 +0200 Implement SSH agent, automatic key discovery, and SSH agent authentication request forwarding in session profile manager. ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 24622 -> 25077 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 23032 -> 23476 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 23585 -> 23585 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 22553 -> 22553 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 22413 -> 22413 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 21992 -> 21992 bytes debian/changelog | 2 + po/PyHoca-GUI.pot | 250 +++++++++++++++-------------- po/bg.po | 250 +++++++++++++++-------------- po/de.po | 258 ++++++++++++++++-------------- po/en.po | 256 +++++++++++++++-------------- po/es.po | 254 +++++++++++++++-------------- po/fr.po | 250 +++++++++++++++-------------- po/nb_NO.po | 254 +++++++++++++++-------------- po/nl.po | 254 +++++++++++++++-------------- po/ru.po | 254 +++++++++++++++-------------- po/sv.po | 254 +++++++++++++++-------------- pyhoca/wxgui/profilemanager.py | 151 +++++++++++++++-- 19 files changed, 1503 insertions(+), 1184 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index ce612f7..6800d3e 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 1eea8e3..e841774 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index 0f4d85f..551a513 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index f0dbae7..c6321c8 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index ace1150..afa372b 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index 1f32405..e5b3819 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 4d4e446..a08b7bd 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/debian/changelog b/debian/changelog index 6c2b1b0..c4c9400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Introduce profile manager tab ,,Link Quality''. Move printing into renamed tab ,,Resource Sharing''. Shrink profile manager window, closes upstream issue: #13. + - Implement SSH agent, automatic key discovery, and SSH agent authentication + request forwarding in session profile manager. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 2ce9712..738907f 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 20:58+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -46,7 +46,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -207,7 +207,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "" @@ -244,424 +244,440 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 -msgid "Server behind SSH proxy" +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Server behind SSH proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -669,21 +685,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/bg.po b/po/bg.po index 393840d..d9ff05b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -50,7 +50,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -211,7 +211,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "" @@ -248,424 +248,440 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 -msgid "Server behind SSH proxy" +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Server behind SSH proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -673,21 +689,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/de.po b/po/de.po index 40b5ee5..0e1364f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" -"PO-Revision-Date: 2012-09-29 01:43+0100\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" +"PO-Revision-Date: 2012-10-11 10:58+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,7 +49,7 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -219,7 +219,7 @@ msgstr "Windows Terminalserver (RDP via X2Go-Proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direktes RDP)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -256,216 +256,228 @@ msgid "settings derived from " msgstr "Einstellungen übernommen von" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Sitzungstitel" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Sitzungsstart" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Dateiimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Sitzungsfenstertitel setzen" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Standardtitel für Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Sitzungstitel anpassen" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Fenstersymbol" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Sitzung nach Anmeldung automatisch starten" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Automatisch anmelden nach %s Programmstart" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Serverseitige Anwendung(en) in lokalen Desktop integrieren (sog. rootless " "Modus)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Menü mit Server-publizierten Anwendungen" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "Finde SSH Schlüssel oder verwende SSH Agent für X2Go-Anmeldung" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "Weiterleitung von SSH Agent Authentifizierungsanfragen" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "Verwende gleichen Anmeldenamen für X2Go Server und Proxy" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "Verwende die gleichen Anmeldeinformation für X2Go Server und Proxy" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "Find SSH Schlüssel oder verwende SSH Agent für Proxy-Anmeldung" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "Maximiert" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server seitige " "Tools verwendet werden)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -473,214 +485,218 @@ msgstr "" "Tastaturkonfiguration dieses Computers automatisch erkennen und in der " "Sitzung verwenden" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Tastatureinstellungen der Sitzung wie folgt anpassen" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Layoutvariante" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Unterstützung für lokale Druckeranbindung" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Unterstützung für lokale Druckeranbindung" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Sitzung" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "Verbindungsqualität" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" -msgstr "Ordnerfreigabe" +msgstr "Freigaben" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "pc105/de" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "de" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "nodeadkeys" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -691,21 +707,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -1489,6 +1505,10 @@ msgstr "Sitzungsfenster umbenennen in" msgid "OK" msgstr "Ok" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Freigegebene Ordner" + #~ msgid "RSA/DSA private key" #~ msgstr "Privater RSA/DSA Schlüssel" diff --git a/po/en.po b/po/en.po index 15d2d55..6bc8b39 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" -"PO-Revision-Date: 2012-09-29 01:43+0100\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" +"PO-Revision-Date: 2012-10-11 10:55+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -49,7 +49,7 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -219,7 +219,7 @@ msgstr "Windows Terminal Server (X2Go-proxied RDP)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (Direct RDP)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Custom command" @@ -256,212 +256,224 @@ msgid "settings derived from " msgstr "settings derived from " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Session Title" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Session Window" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Session Startup" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "Proxy" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "File Import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Name" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Set session window title" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Use a default session window title" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Custom session window title" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Window Icon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Start session automatically after login" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatically after %s has started" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "ntegrate remote application(s) into local desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Menu of published applications" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "Key" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "Discover SSH keys or use SSH agent for X2Go authentication" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "Enable forwarding of SSH authentication agent connections" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "Use same username for X2Go and proxy host" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "Use same authentication for X2Go and proxy host" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "Discover SSH keys or use SSH agent for proxy authentication" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "Maximized" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Do not set (use server-side tools to configure the keyboard)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -469,213 +481,217 @@ msgstr "" "Automatically detect and use client-side keyboard configuration inside the " "session" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Use custom keyboard settings as provided below" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Client Side printing" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Client Side printing" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "Link Quality" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "basic" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -686,21 +702,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -1476,6 +1492,10 @@ msgstr "Change session title to" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Shared &folders" + #~ msgid "RSA/DSA private key" #~ msgstr "RSA/DSA private key" diff --git a/po/es.po b/po/es.po index 4a9f3cc..f47191a 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2012-06-01 09:28+0200\n" "Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma(a)gmail.com>\n" "Language-Team: Español; Castellano <>\n" @@ -54,7 +54,7 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -228,7 +228,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Comando personalizado" @@ -265,214 +265,226 @@ msgid "settings derived from " msgstr "configuraciones recuperadas de " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Título de la Sesión" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Ventana de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Inicio de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Importar Archivo" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Nombre" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Establecer título de la sesión" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Usar título de sesión por defecto" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Título de sesión personalizado" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Icono de la ventana" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Iniciar sesión automáticamente tras el login" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "El inicio de sesión automático ha comenzado tras %s" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "Servidor XDMCP" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrar aplicaciones en el escritorio local (modo rootless)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Menú de aplicaciones publicadas" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "No establecido (usar las herramientas del lado del servidor para configurar " "el teclado)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -480,215 +492,219 @@ msgstr "" "Detectar automáticamente y usar la configuración de teclado del lado del " "cliente en la sesión remota" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Ussar configuración de teclado personalizada" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Capa" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Variante de la capa" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Impresión local" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Impresión local" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Perfil" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " "otra vez." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -699,21 +715,21 @@ msgstr "" "al proxy SSH local.\n" "Por favor, cambia los parámetros del proxy SSH en base a esta información." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -1487,6 +1503,10 @@ msgstr "Cambiar título de la sesión a" msgid "OK" msgstr "Ok" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Compartir &carpetas" + #~ msgid "RSA/DSA private key" #~ msgstr "Clave privada RSA/DSA" diff --git a/po/fr.po b/po/fr.po index cdd0939..6074d4e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Renaud Gaudin <rgaudin(a)gmail.com>\n" @@ -50,7 +50,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -211,7 +211,7 @@ msgstr "" msgid "Windows Terminal Server (Direct RDP)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "" @@ -248,424 +248,440 @@ msgid "settings derived from " msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 -msgid "Server behind SSH proxy" +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:255 +msgid "Server behind SSH proxy" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -673,21 +689,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 43b8e9f..60916cf 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2012-06-03 14:30+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" @@ -49,7 +49,7 @@ msgstr "Sesjons innlogging" msgid "SSH proxy server login" msgstr "logg inn via en SSH mellomtjener" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -222,7 +222,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Selvvalgt kommando" @@ -259,214 +259,226 @@ msgid "settings derived from " msgstr "innstillinger arvet fra" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Sesjonstittel" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Sesjonsvindu" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Sesjon oppstart" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Tilkoblingens forbindelseshastighet" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Kompresjon" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Skjerm" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Lyd" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Utskrift" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Mappe eksporter" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Fil import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Navn" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Angi sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Benytt standard sesjons vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Tilpasset sesjon vindustittel" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Vindusikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Start sesjonen automatisk etter innlogging" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Logg inn automatisk etter at %s har startet" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Applikasjon" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "RDP alternativer" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "" "Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs " "modus)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Meny med publiserte applikasjoner" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Bruker" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Vert" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Server bak SSH mellomtjeneren" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Nøkkelfil" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH mellomtjener tunnel" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Metode" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Bildekvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Fullskjerm" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Egentilpasset størrelse" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "Sett skjermens DPI" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Ikke angi (benytt server-side verktøy for å konfigurere tastaturet)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -474,213 +486,217 @@ msgstr "" "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i " "sesjonen" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Benytt tilpasset innstillinger for tastaturoppsett som gitt nedenfor" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Utforming" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Utformingsvariant" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Aktiver lydstøtte" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (ikke supportert)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Benytt standard lydport" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Selvvalgt lydport" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Klientside utskrift" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Benytt lokal mappedeling" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Sti" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Legg til" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Lokal sti" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Tilkoblingsmetode" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Slett" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Konverter tegnkodingen mellom klient og server" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Klientens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Serverens tegnkode" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Benytt filens MIME boks for lokal fil import" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Utvidelser" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Handling" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Klientside utskrift" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Lagre" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Resett" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "manuelt" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profil håndterer - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profil håndterer - %s (tilkoblet)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profil håndterer - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Sesjon" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Tilkobling" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Innstillinger" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Velg et ikon for denne sesjonsprofilen" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Velg en offentlig SSH nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Velg en mappe som skal deles i en sesjon" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profil håndterer" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrukelig!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer allerede!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -691,21 +707,21 @@ msgstr "" "lokal SSH mellomtjener.\n" "Vennligst endre SSH mellomtjener innstillingene tilsvarende." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - profil lagt til" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "En ny sesjonsprofil har blitt lagt til." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - endret" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Endringer til profilen har blitt lagret." @@ -1478,6 +1494,10 @@ msgstr "Endre sesjonstittelen til" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Delte &mapper" + #~ msgid "RSA/DSA private key" #~ msgstr "RSA/DSA privat nøkkel" diff --git a/po/nl.po b/po/nl.po index 31cdcd1..759a53e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2012-06-10 21:16+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -49,7 +49,7 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -220,7 +220,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminalserver (RDP-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Speciaal Commando" @@ -257,424 +257,440 @@ msgid "settings derived from " msgstr "configuratie afgeleid van" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Sessie naam" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Sessie Window" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Sessie start" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Bestands import" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Naam" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Stel sessiescherm titel in" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Gebruik een standaard sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Aangepaste sessienaam" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Scherm icoon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Start sessie automatisch na login" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Login automatisch nadat %s is gestart" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Gebruik de onderstaande speciale toetsenbord instellingen" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Layout" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Layout variant" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Afdrukken via deze computer" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Verbindingsmethode" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Afdrukken via deze computer" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Sessie" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "intl" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -685,21 +701,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -1466,6 +1482,10 @@ msgstr "Wijzig sessie naam naar" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Delen &mappen" + #~ msgid "RSA/DSA private key" #~ msgstr "Private RSA/DSA Key" diff --git a/po/ru.po b/po/ru.po index a707128..467f6e4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2012-09-05 10:51+0200\n" "Last-Translator: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de>\n" "Language-Team: Russian <x2go-i18n(a)lists.berlios.de>\n" @@ -55,7 +55,7 @@ msgstr "Логин сессии" msgid "SSH proxy server login" msgstr "Логин SSH прокси сервера" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -224,7 +224,7 @@ msgstr "Сервер терминалов Windows (RDP-прокси)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Сервер терминалов Windows (RDP-прокси)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Команда пользователя" @@ -261,424 +261,440 @@ msgid "settings derived from " msgstr "настройки импортированы из " #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Заголовок сессии" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Окно сессии" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Запуск сессии" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Сервер" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Скорость соединения" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Компрессия" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Дисплей" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Клавиатура" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Звук" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Печать" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Экспорт каталогов" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Импорт файлов" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Имя" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Установить заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Использовать заголовок окна сессии по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Произвольный заголовок окна сессии" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Пиктограмма" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Запускать сессию автоматически после входа" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Автоматический вход после запуска %s" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Тип" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Приложение" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP сервер" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP сервер" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "Опции RDP" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Интегрировать удаленное приложение в локальный десктоп" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Меню удаленных приложений" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Пользователь" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Хост" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Порт" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Сервер за SSH прокси" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Файл ключа" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH прокси туннель" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Модем" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Метод" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Качество изображения" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Полноэкранный режим" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Другой размер" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "Установить DPI" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "Не устанавливать (конфигурация на стороне сервера)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" msgstr "автоматически определять и использовать установки на стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Использовать следующие установки" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Модель" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Раскладка" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Вариант раскладки" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Активировать звук" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (не поддерживается)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Звуковой порт по умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Другой звуковой порт" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Печать на стороне клиента" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Доступ к локальным каталогам" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Путь" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Добавить" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Локальный путь" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Метод подключения" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Удалить" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Кодировка имен файлов" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "На стороне клиента" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "На стороне сервера" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Использовать MIME box для импорта локальных файлов" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Расширения" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Действие" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Печать на стороне клиента" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "По умолчанию" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Сохранить" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Восстановить" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "автоматически" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "в ручную" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - новый профиль" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (соединение)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Профиль" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Сессия" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Соединение" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Установки" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Доступ" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Графические файлы (*.png)|*.png|Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Выбрать пиктограмму" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Выбрать публичный ключ SSH" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Выбрать экспортируемый каталог" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Имя профиля не установлено!!!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Профиль с именем %s существует!!!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Конфигурация SSH прокси не завершена. Попробуйте еще раз." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -689,21 +705,21 @@ msgstr "" "прокси.\n" "Измените настройки SSH прокси." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - профиль добавлен" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "Новый профиль сессии добавлен." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - модифицирован" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Изменения в профиле сохранены." @@ -1467,6 +1483,10 @@ msgstr "Изменить заголовок сессии на" msgid "OK" msgstr "ОК" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Экспорт &каталогов" + #~ msgid "RSA/DSA private key" #~ msgstr "личный ключ RSA/DSA" diff --git a/po/sv.po b/po/sv.po index 78a1f63..d2c29ed 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"POT-Creation-Date: 2012-10-11 10:58+0200\n" "PO-Revision-Date: 2012-06-01 17:59+0100\n" "Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" @@ -50,7 +50,7 @@ msgstr "Sessionsinloggning" msgid "SSH proxy server login" msgstr "SSH proxyserverinloggning" -#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:347 +#: ../pyhoca/wxgui/logon.py:133 ../pyhoca/wxgui/profilemanager.py:352 #: ../pyhoca/wxgui/messages.py:132 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" @@ -221,7 +221,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Windows Terminal Server (Direct RDP)" msgstr "Windows Terminal Server (RDP-proxy)" -#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 +#: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:228 msgid "Custom command" msgstr "Anpassat kommando" @@ -258,213 +258,225 @@ msgid "settings derived from " msgstr "inställningar hämtade från" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:170 +#: ../pyhoca/wxgui/profilemanager.py:171 msgid "Session Title" msgstr "Sessionsnamn" -#: ../pyhoca/wxgui/profilemanager.py:171 +#: ../pyhoca/wxgui/profilemanager.py:172 msgid "Session Window" msgstr "Sessionsfönster" -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:173 msgid "Session Startup" msgstr "Sessionsstart" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:174 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "Proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:176 msgid "Connection Link Speed" msgstr "Anslutningshastighet" -#: ../pyhoca/wxgui/profilemanager.py:176 +#: ../pyhoca/wxgui/profilemanager.py:177 msgid "Compression" msgstr "Komprimering" -#: ../pyhoca/wxgui/profilemanager.py:177 +#: ../pyhoca/wxgui/profilemanager.py:178 msgid "Display" msgstr "Skärm" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "Keyboard" msgstr "Tangentbord" -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:180 msgid "Sound" msgstr "Ljud" -#: ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:181 msgid "Printing" msgstr "Utskrifter" -#: ../pyhoca/wxgui/profilemanager.py:181 +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Folder Exports" msgstr "Delade mappar" -#: ../pyhoca/wxgui/profilemanager.py:182 +#: ../pyhoca/wxgui/profilemanager.py:183 msgid "File Import" msgstr "Filimport" #. ## #. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:187 +#: ../pyhoca/wxgui/profilemanager.py:188 msgid "Name" msgstr "Namn" -#: ../pyhoca/wxgui/profilemanager.py:194 +#: ../pyhoca/wxgui/profilemanager.py:195 msgid "Set session window title" msgstr "Ange fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:196 msgid "Use a default session window title" msgstr "Använd standard fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:196 +#: ../pyhoca/wxgui/profilemanager.py:197 msgid "Custom session window title" msgstr "Anpassad fönstertitel för session" -#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:216 msgid "Window Icon" msgstr "Fönsterikon" #. ## #. ## widgets for the SESSION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:222 msgid "Start session automatically after login" msgstr "Starta session automatiskt efter inloggning" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:223 #, python-format msgid "Login automatically after %s has started" msgstr "Logga in automatiskt när %s har startat" -#: ../pyhoca/wxgui/profilemanager.py:223 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "Application" msgstr "Applikation" -#: ../pyhoca/wxgui/profilemanager.py:229 +#: ../pyhoca/wxgui/profilemanager.py:230 msgid "XDMCP server" msgstr "XDMCP-server" -#: ../pyhoca/wxgui/profilemanager.py:231 +#: ../pyhoca/wxgui/profilemanager.py:232 msgid "RDP server" msgstr "RDP-server" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:234 msgid "RDP options" msgstr "RDP-alternativ" -#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:236 msgid "Integrate remote application(s) into local desktop (rootless mode)" msgstr "Integrera fjärrapplikation i lokalt Skrivbord (rootless)" -#: ../pyhoca/wxgui/profilemanager.py:236 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Menu of published applications" msgstr "Meny med publicerade applikationer" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:243 ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:244 ../pyhoca/wxgui/profilemanager.py:256 msgid "User" msgstr "Användare" -#: ../pyhoca/wxgui/profilemanager.py:245 ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:246 ../pyhoca/wxgui/profilemanager.py:263 msgid "Host" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:247 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/profilemanager.py:248 ../pyhoca/wxgui/profilemanager.py:265 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:249 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:253 +msgid "Discover SSH keys or use SSH agent for X2Go authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:254 +msgid "Enable forwarding of SSH authentication agent connections" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Server behind SSH proxy" msgstr "Server bakom SSH-proxy" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Use same username for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use same authentication for X2Go and proxy host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Key file" msgstr "Nyckelfil" -#: ../pyhoca/wxgui/profilemanager.py:264 +#: ../pyhoca/wxgui/profilemanager.py:267 msgid "SSH Proxy Tunnel" msgstr "SSH proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:273 +msgid "Discover SSH keys or use SSH agent for proxy authentication" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:276 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:273 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:274 +#: ../pyhoca/wxgui/profilemanager.py:278 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:279 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:282 msgid "Method" msgstr "Metod" -#: ../pyhoca/wxgui/profilemanager.py:280 +#: ../pyhoca/wxgui/profilemanager.py:284 msgid "Image quality" msgstr "Bildkvalitet" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Fullscreen" msgstr "Fullskärm" -#: ../pyhoca/wxgui/profilemanager.py:287 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Maximized" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/profilemanager.py:292 msgid "Custom Size" msgstr "Anpassad storlek" -#: ../pyhoca/wxgui/profilemanager.py:293 +#: ../pyhoca/wxgui/profilemanager.py:297 msgid "Set display DPI" msgstr "Ange skärmupplösning (DPI)" -#: ../pyhoca/wxgui/profilemanager.py:295 +#: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" msgstr "" "Konfigurera inte (använd verktyg på server för att konfigurera tangentbord)" -#: ../pyhoca/wxgui/profilemanager.py:296 +#: ../pyhoca/wxgui/profilemanager.py:300 msgid "" "Automatically detect and use client-side keyboard configuration inside the " "session" @@ -472,213 +484,217 @@ msgstr "" "Detektera automatiskt och använd klientinställningar för tangentbord i " "session" -#: ../pyhoca/wxgui/profilemanager.py:297 +#: ../pyhoca/wxgui/profilemanager.py:301 msgid "Use custom keyboard settings as provided below" msgstr "Använd nedan angivna tangentbordsinställningar" -#: ../pyhoca/wxgui/profilemanager.py:298 +#: ../pyhoca/wxgui/profilemanager.py:302 msgid "Keyboard model" msgstr "Tangentbordsmodell" -#: ../pyhoca/wxgui/profilemanager.py:300 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Layout" msgstr "Tangentbordslayout" -#: ../pyhoca/wxgui/profilemanager.py:302 +#: ../pyhoca/wxgui/profilemanager.py:306 msgid "Layout variant" msgstr "Variant" -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:308 msgid "Enable sound support" msgstr "Aktivera ljudstöd" -#: ../pyhoca/wxgui/profilemanager.py:305 +#: ../pyhoca/wxgui/profilemanager.py:309 msgid "Pulse Audio" msgstr "Pulse Audio" #. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. #. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:309 +#: ../pyhoca/wxgui/profilemanager.py:313 msgid "Arts (not supported)" msgstr "Arts (ej supportad)" -#: ../pyhoca/wxgui/profilemanager.py:312 +#: ../pyhoca/wxgui/profilemanager.py:316 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:313 +#: ../pyhoca/wxgui/profilemanager.py:317 msgid "Use default sound port" msgstr "Använd standardport för ljud" -#: ../pyhoca/wxgui/profilemanager.py:314 +#: ../pyhoca/wxgui/profilemanager.py:318 msgid "Custom sound port" msgstr "Anpassad ljudport" -#: ../pyhoca/wxgui/profilemanager.py:316 -msgid "Client Side printing" -msgstr "Stöd för utskrifter via klienten" - -#: ../pyhoca/wxgui/profilemanager.py:318 +#: ../pyhoca/wxgui/profilemanager.py:321 msgid "Use local folder sharing" msgstr "Använd lokal mappdelning" -#: ../pyhoca/wxgui/profilemanager.py:319 +#: ../pyhoca/wxgui/profilemanager.py:322 msgid "Path" msgstr "Sökväg" -#: ../pyhoca/wxgui/profilemanager.py:322 ../pyhoca/wxgui/profilemanager.py:341 +#: ../pyhoca/wxgui/profilemanager.py:325 ../pyhoca/wxgui/profilemanager.py:346 msgid "Add" msgstr "Lägg till" -#: ../pyhoca/wxgui/profilemanager.py:324 +#: ../pyhoca/wxgui/profilemanager.py:327 msgid "Local Path" msgstr "Lokal sökväg" -#: ../pyhoca/wxgui/profilemanager.py:325 +#: ../pyhoca/wxgui/profilemanager.py:328 msgid "Connect Method" msgstr "Anslutningsmetod" -#: ../pyhoca/wxgui/profilemanager.py:326 +#: ../pyhoca/wxgui/profilemanager.py:329 msgid "Delete" msgstr "Radera" -#: ../pyhoca/wxgui/profilemanager.py:328 +#: ../pyhoca/wxgui/profilemanager.py:331 msgid "Convert between client and server encodings" msgstr "Konvertera kodtabell mellan klient och server" -#: ../pyhoca/wxgui/profilemanager.py:329 +#: ../pyhoca/wxgui/profilemanager.py:332 msgid "Client encoding" msgstr "Kodtabell klient" -#: ../pyhoca/wxgui/profilemanager.py:331 +#: ../pyhoca/wxgui/profilemanager.py:334 msgid "Server encoding" msgstr "Kodtabell server" -#: ../pyhoca/wxgui/profilemanager.py:334 +#: ../pyhoca/wxgui/profilemanager.py:337 msgid "Use file MIME box for local file import" msgstr "Använd MIME för lokal filimport" -#: ../pyhoca/wxgui/profilemanager.py:335 +#: ../pyhoca/wxgui/profilemanager.py:338 msgid "Extensions" msgstr "Filändelser" -#: ../pyhoca/wxgui/profilemanager.py:337 +#: ../pyhoca/wxgui/profilemanager.py:340 msgid "Action" msgstr "Hantering" -#: ../pyhoca/wxgui/profilemanager.py:342 +#: ../pyhoca/wxgui/profilemanager.py:343 +msgid "Client Side printing" +msgstr "Stöd för utskrifter via klienten" + +#: ../pyhoca/wxgui/profilemanager.py:347 msgid "Defaults" msgstr "Standard" -#: ../pyhoca/wxgui/profilemanager.py:344 +#: ../pyhoca/wxgui/profilemanager.py:349 msgid "Save" msgstr "Spara" -#: ../pyhoca/wxgui/profilemanager.py:345 +#: ../pyhoca/wxgui/profilemanager.py:350 msgid "Reset" msgstr "Återställ" -#: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1080 -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:403 +#: ../pyhoca/wxgui/profilemanager.py:1114 +#: ../pyhoca/wxgui/profilemanager.py:2249 msgid "automatically" msgstr "automatisk" -#: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1082 +#: ../pyhoca/wxgui/profilemanager.py:405 +#: ../pyhoca/wxgui/profilemanager.py:1116 msgid "manually" msgstr "manuellt" -#: ../pyhoca/wxgui/profilemanager.py:407 +#: ../pyhoca/wxgui/profilemanager.py:414 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilhanterare - ny profil" -#: ../pyhoca/wxgui/profilemanager.py:409 +#: ../pyhoca/wxgui/profilemanager.py:416 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr " PyHoca-GUI Profilhanterare - %s (ansluten)" -#: ../pyhoca/wxgui/profilemanager.py:411 +#: ../pyhoca/wxgui/profilemanager.py:418 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilhanterare - %s" -#: ../pyhoca/wxgui/profilemanager.py:774 +#: ../pyhoca/wxgui/profilemanager.py:793 msgid "Profile" msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:775 +#: ../pyhoca/wxgui/profilemanager.py:794 msgid "Session" msgstr "Session" -#: ../pyhoca/wxgui/profilemanager.py:776 +#: ../pyhoca/wxgui/profilemanager.py:795 msgid "Connection" msgstr "Anslutning" -#: ../pyhoca/wxgui/profilemanager.py:777 +#: ../pyhoca/wxgui/profilemanager.py:796 +msgid "Link Quality" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:797 msgid "Settings" msgstr "Inställningar" -#: ../pyhoca/wxgui/profilemanager.py:778 +#: ../pyhoca/wxgui/profilemanager.py:798 msgid "Sharing" msgstr "Delning" -#: ../pyhoca/wxgui/profilemanager.py:950 +#: ../pyhoca/wxgui/profilemanager.py:980 msgid "<xkbtype>" msgstr "pc105" -#: ../pyhoca/wxgui/profilemanager.py:951 +#: ../pyhoca/wxgui/profilemanager.py:981 msgid "<xkblayout>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:952 +#: ../pyhoca/wxgui/profilemanager.py:982 msgid "<xkbvariant>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:1373 +#: ../pyhoca/wxgui/profilemanager.py:1430 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1376 +#: ../pyhoca/wxgui/profilemanager.py:1433 msgid "Choose an icon for this session profile" msgstr "Välj en ikon för denna sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1697 +#: ../pyhoca/wxgui/profilemanager.py:1797 msgid "All files (*.*)|*" msgstr "Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1699 -#: ../pyhoca/wxgui/profilemanager.py:1723 +#: ../pyhoca/wxgui/profilemanager.py:1799 +#: ../pyhoca/wxgui/profilemanager.py:1823 msgid "Choose a public SSH key" msgstr "Välj en public SSH-nyckel" -#: ../pyhoca/wxgui/profilemanager.py:2059 +#: ../pyhoca/wxgui/profilemanager.py:2201 msgid "Choose a folder to share within a session" msgstr "Välj en mapp att dela i en session" -#: ../pyhoca/wxgui/profilemanager.py:2187 -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 -#: ../pyhoca/wxgui/profilemanager.py:2198 -#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2329 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 +#: ../pyhoca/wxgui/profilemanager.py:2340 +#: ../pyhoca/wxgui/profilemanager.py:2350 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilhanterare" -#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2329 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnamn saknas, profil oanvändbar!" -#: ../pyhoca/wxgui/profilemanager.py:2190 -#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2332 +#: ../pyhoca/wxgui/profilemanager.py:2335 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilen %s finns redan!" -#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2340 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." -#: ../pyhoca/wxgui/profilemanager.py:2208 +#: ../pyhoca/wxgui/profilemanager.py:2350 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -689,21 +705,21 @@ msgstr "" "proxy.\n" "Ändra konfiguration för SSH-proxy ." -#: ../pyhoca/wxgui/profilemanager.py:2235 +#: ../pyhoca/wxgui/profilemanager.py:2377 #, python-format msgid "%s - profile added" msgstr "%s - profil tillagd" -#: ../pyhoca/wxgui/profilemanager.py:2236 +#: ../pyhoca/wxgui/profilemanager.py:2378 msgid "A new session profile has been added." msgstr "En ny sessionsprofil har lagts till." -#: ../pyhoca/wxgui/profilemanager.py:2240 +#: ../pyhoca/wxgui/profilemanager.py:2382 #, python-format msgid "%s - modified" msgstr "%s - ändrad" -#: ../pyhoca/wxgui/profilemanager.py:2241 +#: ../pyhoca/wxgui/profilemanager.py:2383 msgid "Changes to profile have been saved." msgstr "Ändringar av profil har sparats." @@ -1469,6 +1485,10 @@ msgstr "Ändra sessionstitel till" msgid "OK" msgstr "OK" +#, fuzzy +#~ msgid "Shared Resources" +#~ msgstr "Delade &mappar" + #~ msgid "RSA/DSA private key" #~ msgstr "RSA/DSA privat nyckel" diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 6b80fcf..27ffbfd 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -250,6 +250,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"Key")+": ") self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) + self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication")) + self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections")) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ") self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20)) @@ -268,6 +270,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ") self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) + self.SSHProxyAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for proxy authentication")) self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4) self.ModemLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) @@ -361,9 +364,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Bind(wx.EVT_TEXT, self.OnSSHKeyFileKeyPressed, self.SSHKeyFile) self.Bind(wx.EVT_BUTTON, self.OnSSHKeyFileBrowse, self.SSHKeyFileBrowseButton) self.Bind(wx.EVT_BUTTON, self.OnSSHProxyKeyFileBrowse, self.SSHProxyKeyFileBrowseButton) + self.Bind(wx.EVT_CHECKBOX, self.OnSSHAutoLogin, self.SSHAutoLogin) self.Bind(wx.EVT_CHECKBOX, self.OnUseSSHProxy, self.UseSSHProxy) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser) self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword) + self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxyAutoLogin, self.SSHProxyAutoLogin) self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost) self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort) self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression) @@ -563,7 +568,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ## CONNECTION TAB sizer_3 = wx.BoxSizer(wx.VERTICAL) sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL) - sizer_3_1_1 = wx.GridBagSizer(hgap=3,vgap=6) + sizer_3_1_1 = wx.GridBagSizer(hgap=5,vgap=6) sizer_3_1_1.Add(self.UserNameLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1_1.Add(self.UserName, pos=(0,1)) sizer_3_1_1.Add((16,0), pos=(0,2)) @@ -574,11 +579,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_1_1.Add(self.Host, pos=(1,1)) sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2)) - sizer_3_1_1.Add(self.UseSSHProxy, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL) - sizer_3_2_1 = wx.GridBagSizer(hgap=5,vgap=6) + sizer_3_2_1 = wx.GridBagSizer(hgap=6,vgap=6) sizer_3_2_1.Add(self.SSHProxySameUser, pos=(0,0), span=(1,6)) sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(1,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL) @@ -591,6 +598,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1.Add(self.SSHProxyHost, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) @@ -603,7 +611,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1_1.Add((4, 0)) sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_2_1_1.Add((0,32)) - sizer_3_2_1.Add(sizer_3_2_1_1, pos=(4,0), span=(1,6)) + sizer_3_2_1.Add(sizer_3_2_1_1, pos=(5,0), span=(1,6)) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) @@ -787,7 +795,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection")) self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings")) - self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Shared Resources")) + self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing")) # the bottom area with OK, Defaults and Cancel buttons sizer_B = wx.BoxSizer(wx.HORIZONTAL) @@ -834,8 +842,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Host.SetValue(self.profile_config['host']) self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) - self.SSHKeyFile.SetValue(self.profile_config['key']) + self.SSHAutoLogin.SetValue(self.profile_config['autologin']) + self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent']) + if not self.profile_config['autologin']: + self.SSHKeyFile.SetValue(self.profile_config['key']) + else: + self.SSHKeyFile.SetValue("") + self.SSHKeyFileLabel.Enable(False) + self.SSHKeyFile.Enable(False) + self.SSHKeyFileBrowseButton.Enable(False) self.UseSSHProxy.SetValue(self.profile_config['usesshproxy']) + self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin']) _ssh_proxy = self.profile_config['usesshproxy'] _ssh_proxy_host = self.profile_config['sshproxyhost'] @@ -1014,6 +1031,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.PulseAudio.SetValue(True) self._toggle_DefaultSoundPort() self.SSHPort.SetValue(self.profile_config['rdpport']) + self.SSHAutoLogin.SetValue(False) + self.SSHForwardAuthAgent.SetValue(False) self.RDPOptions.SetValue(self.profile_config['directrdpsettings']) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(False) @@ -1026,6 +1045,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.disable_DirectRDP() self._toggle_SetKeyboard() + self._toggle_SSHProxy() self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) self.RDPOptionsLabel.Enable(True) @@ -1037,6 +1057,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.disable_DirectRDP() self._toggle_SetKeyboard() + self._toggle_SSHProxy() self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) self.RDPOptionsLabel.Enable(False) @@ -1199,8 +1220,29 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort.Enable(False) self.SSHKeyFileLabel.Enable(False) self.SSHKeyFile.Enable(False) + self.SSHAutoLogin.Enable(False) + self.SSHForwardAuthAgent.Enable(False) self.UseSSHProxy.Enable(False) self.staticbox_Proxy.Enable(False) + self.SSHProxyUserLabel.Enable(False) + self.SSHProxyUser.Enable(False) + self.SSHProxySameUser.Enable(False) + self.SSHProxySamePassword.Enable(False) + self.SSHProxyKeyFileLabel.Enable(False) + self.SSHProxyKeyFile.Enable(False) + self.SSHProxyKeyFileBrowseButton.Enable(False) + self.SSHProxyHostLabel.Enable(False) + self.SSHProxyHost.Enable(False) + self.SSHProxyPortLabel.Enable(False) + self.SSHProxyPort.Enable(False) + self.SSHProxyTunnelLabel.Enable(False) + self.SSHProxyTunnelFromHost.Enable(False) + self.SSHProxyTunnelFromPort.Enable(False) + self.SSHProxyTunnelBetweenLabel.Enable(False) + self.SSHProxyTunnelToHost.Enable(False) + self.SSHProxyTunnelToPort.Enable(False) + self.SSHProxyAutoLogin.Enable(False) + def __update_from_screen(self): """\ @@ -1216,6 +1258,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sessiontitle'] = self.CustomSessionWindowTitle.GetValue() self.profile_config['autostart'] = self.AutoStartSession.GetValue() self.profile_config['autoconnect'] = self.AutoConnectSessionProfile.GetValue() + self.profile_config['autologin'] = self.SSHAutoLogin.GetValue() + self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue() self.profile_config['published'] = self.UsePublishedApplications.GetValue() if not self.default_icon: self.profile_config['icon'] = self.IconPath @@ -1225,12 +1269,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['key'] = self.SSHKeyFile.GetValue() if self.UseSSHProxy.GetValue(): self.profile_config['usesshproxy'] = True - self.profile_config['sshproxyautologin'] = self.profile_config['autologin'] self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue() self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue() else: self.profile_config['usesshproxy'] = False - self.profile_config['sshproxyautologin'] = False self.profile_config['host'] = self.Host.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() @@ -1244,6 +1286,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelToHost.GetValue(), self.SSHProxyTunnelToPort.GetValue(), ) + self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue() if self.profile_config['sshproxysameuser']: self.profile_config['sshproxyuser'] = '' else: @@ -1269,6 +1312,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif _session_type == 'DirectRDP': _command = 'RDP' self.profile_config['usesshproxy'] = False + self.profile_config['autologin'] = False self.profile_config['rootless'] = False self.profile_config['directrdp'] = True self.profile_config['directrdpsettings'] = self.RDPOptions.GetValue() @@ -1445,8 +1489,30 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort.SetValue(self.profile_config_bak['rdpport']) self.SSHKeyFileLabel.Enable(False) self.SSHKeyFile.Enable(False) + self.SSHKeyFileBrowseButton.Enable(False) + self.SSHAutoLogin.Enable(False) + self.SSHForwardAuthAgent.Enable(False) self.UseSSHProxy.Enable(False) self.staticbox_LinkSpeed.Enable(False) + self.staticbox_Proxy.Enable(False) + self.SSHProxyUserLabel.Enable(False) + self.SSHProxyUser.Enable(False) + self.SSHProxySameUser.Enable(False) + self.SSHProxySamePassword.Enable(False) + self.SSHProxyKeyFileLabel.Enable(False) + self.SSHProxyKeyFile.Enable(False) + self.SSHProxyKeyFileBrowseButton.Enable(False) + self.SSHProxyHostLabel.Enable(False) + self.SSHProxyHost.Enable(False) + self.SSHProxyPortLabel.Enable(False) + self.SSHProxyPort.Enable(False) + self.SSHProxyTunnelLabel.Enable(False) + self.SSHProxyTunnelFromHost.Enable(False) + self.SSHProxyTunnelFromPort.Enable(False) + self.SSHProxyTunnelBetweenLabel.Enable(False) + self.SSHProxyTunnelToHost.Enable(False) + self.SSHProxyTunnelToPort.Enable(False) + self.SSHProxyAutoLogin.Enable(False) self.LinkSpeed.Enable(False) self.ModemLabel.Enable(False) self.ISDNLabel.Enable(False) @@ -1493,9 +1559,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPort.SetValue(self.profile_config_bak['sshport']) else: self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) - self.SSHKeyFileLabel.Enable(True) - self.SSHKeyFile.Enable(True) + self.SSHAutoLogin.Enable(True) + self.SSHForwardAuthAgent.Enable(True) + self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) + self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) + if not self.SSHAutoLogin.GetValue(): + self.SSHKeyFileLabel.Enable(True) + self.SSHKeyFile.Enable(True) + self.SSHKeyFileBrowseButton.Enable(True) self.UseSSHProxy.Enable(True) + self.staticbox_Proxy.Enable(True) self.staticbox_LinkSpeed.Enable(True) self.LinkSpeed.Enable(True) self.ModemLabel.Enable(True) @@ -1583,6 +1656,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.profile_config_bak['soundsystem'] = self._get_SoundSystem() + self.profile_config_bak['usesshproxy'] = self.UseSSHProxy.GetValue() + self.profile_config_bak['autologin'] = self.SSHAutoLogin.GetValue() + self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue() + self.UseSSHProxy.SetValue(False) + self.SSHAutoLogin.SetValue(False) + self.SSHForwardAuthAgent.SetValue(False) self.PulseAudio.SetValue(True) self.Arts.SetValue(False) self.Esd.SetValue(False) @@ -1603,8 +1682,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue() self.disable_DirectRDP() self._toggle_SetKeyboard() + self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy']) + self._toggle_SSHProxy() self._set_SoundSystem(self.profile_config_bak['soundsystem']) self._toggle_DefaultSoundPort() + self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) + self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) self.RDPOptionsLabel.Enable(True) @@ -1621,6 +1704,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.disable_DirectRDP() self._toggle_SetKeyboard() + self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) + self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) + self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy']) + self._toggle_SSHProxy() self._set_SoundSystem(self.profile_config_bak['soundsystem']) self._toggle_DefaultSoundPort() self.RDPServerLabel.Enable(False) @@ -1742,6 +1829,42 @@ class PyHocaGUI_ProfileManager(wx.Dialog): path = dlg.GetPath() self.SSHProxyKeyFile.SetValue(path) + def OnSSHAutoLogin(self, event): + """\ + Gets called if the ssh-proxy-auto-login checkbox gets marked. + + @param event: event + @type event: C{obj} + + """ + if self.SSHAutoLogin.GetValue(): + self.SSHKeyFileLabel.Enable(False) + self.SSHKeyFile.Enable(False) + self.SSHKeyFile.SetValue("") + self.SSHKeyFileBrowseButton.Enable(False) + else: + self.SSHKeyFileLabel.Enable(True) + self.SSHKeyFile.Enable(True) + self.SSHKeyFile.SetValue(self.profile_config_bak['key']) + self.SSHKeyFileBrowseButton.Enable(True) + + def OnSSHProxyAutoLogin(self, event): + """\ + Gets called if the ssh-proxy-auto-login checkbox gets marked. + + @param event: event + @type event: C{obj} + + """ + if self.SSHProxyAutoLogin.GetValue(): + self.SSHProxyKeyFileLabel.Enable(False) + self.SSHProxyKeyFile.Enable(False) + self.SSHProxyKeyFileBrowseButton.Enable(False) + else: + self.SSHProxyKeyFileLabel.Enable(True) + self.SSHProxyKeyFile.Enable(True) + self.SSHProxyKeyFileBrowseButton.Enable(True) + def OnUseSSHProxy(self, event): """\ Gets called if the use-ssh-proxy checkbox gets marked. @@ -1804,13 +1927,18 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyUser.Enable(True) if self.SSHProxySamePassword.GetValue(): self.SSHProxyKeyFile.SetValue(self.SSHKeyFile.GetValue()) + else: + self.SSHProxyKeyFile.SetValue(self.profile_config_bak['sshproxykeyfile']) + if self.SSHProxySamePassword.GetValue() or self.SSHProxyAutoLogin.GetValue(): self.SSHProxyKeyFile.Enable(False) self.SSHProxyKeyFileBrowseButton.Enable(False) else: - self.SSHProxyKeyFile.SetValue(self.profile_config_bak['sshproxykeyfile']) self.SSHProxyKeyFileLabel.Enable(True) self.SSHProxyKeyFile.Enable(True) self.SSHProxyKeyFileBrowseButton.Enable(True) + if self.SSHProxyAutoLogin.GetValue(): + self.SSHProxyKeyFileLabel.Enable(False) + self.SSHProxyAutoLogin.Enable(True) self.SSHProxyTunnelLabel.Enable(True) self.SSHProxyTunnelFromHost.Enable(True) self.SSHProxyTunnelFromPort.Enable(True) @@ -1842,6 +1970,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelBetweenLabel.Enable(False) self.SSHProxyTunnelToHost.Enable(False) self.SSHProxyTunnelToPort.Enable(False) + self.SSHProxyAutoLogin.Enable(False) self.Host.Enable(True) self.HostLabel.Enable(True) self.Host.SetValue(self.profile_config_bak['host']) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-33-gb75628b
by git-admin＠x2go.org 11 Oct '12

11 Oct '12

The branch, master has been updated via b75628bac35ba95c3c70d3a9dccba9c116b263a7 (commit) from b1b4c6bc2a503e903dcf2c1e19fd7e386a8213ca (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 b75628bac35ba95c3c70d3a9dccba9c116b263a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:45:55 2012 +0200 Allow post-initialization updating of forward_sshagent class property. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 8 ++++++++ x2go/client.py | 3 ++- x2go/session.py | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a8310b3..e9934e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low ,,sshproxyautologin'' (meaning: look_for_keys and allow_agent in Python Paramiko terms). - Make X2goClient instance available in initial X2goSession instances. + - Allow post-initialization updating of forward_sshagent class property. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 616415c..e02fb21 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -614,6 +614,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): use_sshproxy=False, sshproxy_host='', sshproxy_port=22, sshproxy_user='', sshproxy_password='', sshproxy_key_filename='', sshproxy_pkey=None, sshproxy_look_for_keys=False, sshproxy_allow_agent=False, sshproxy_tunnel='', + forward_sshagent=None, session_instance=None, add_to_known_hosts=False, force_password_auth=False): """\ @@ -654,6 +655,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @type key_filename: C{str} or list(str) @param pkey: an optional private key to use for authentication @type pkey: C{PKey} + @param forward_sshagent: forward SSH agent authentication requests to the X2Go client-side + (will update the class property of the same name) + @type forward_sshagent: C{bool} @param timeout: an optional timeout (in seconds) for the TCP connect @type timeout: float @param look_for_keys: set to C{True} to enable searching for discoverable @@ -763,6 +767,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if _hostname in ('localhost', 'localhost.localdomain'): _hostname = '127.0.0.1' + # update self.forward_sshagent via connect method parameter + if forward_sshagent is not None: + self.forward_sshagent = forward_sshagent + if (key_filename and os.path.exists(os.path.normpath(key_filename))) or pkey or look_for_keys or allow_agent: try: self.logger('trying SSH pub/priv key authentication with server', loglevel=log.loglevel_DEBUG) diff --git a/x2go/client.py b/x2go/client.py index beb4469..5f463fb 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -2959,9 +2959,10 @@ class X2goClient(object): ) try: self.session_registry.register_available_server_sessions(profile_name, session_list=session_list, re_register=re_register) - except x2go_exceptions.X2goControlSessionException: + except x2go_exceptions.X2goControlSessionException, e: self.HOOK_on_control_session_death(profile_name) self.disconnect_profile(profile_name) + raise e __register_available_server_sessions_by_profile_name = register_available_server_sessions_by_profile_name def register_available_server_sessions_by_session_uuid(self, session_uuid): diff --git a/x2go/session.py b/x2go/session.py index 7722822..6161075 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1222,6 +1222,7 @@ class X2goSession(object): self.connected = self.control_session.connect(self.server, use_sshproxy=self.use_sshproxy, session_instance=self, + forward_sshagent=self.forward_sshagent, **_params) except x2go_exceptions.X2goControlSessionException, e: raise x2go_exceptions.X2goSessionException(str(e)) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-32-gb1b4c6b
by git-admin＠x2go.org 11 Oct '12

11 Oct '12

The branch, master has been updated via b1b4c6bc2a503e903dcf2c1e19fd7e386a8213ca (commit) via c8d8cf7147febea9ade38e28f9b828eda7360402 (commit) via 5da7378d77a8bd36de9c78305a785f046163c920 (commit) from b72afbf25c794c48d142d0cd665e210c559b57fb (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 b1b4c6bc2a503e903dcf2c1e19fd7e386a8213ca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:11:05 2012 +0200 fix-up after some tests for look_for_keys and allow_agent feature commit c8d8cf7147febea9ade38e28f9b828eda7360402 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:08:38 2012 +0200 Make X2goClient instance available in initial X2goSession instances. commit 5da7378d77a8bd36de9c78305a785f046163c920 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Oct 11 10:07:03 2012 +0200 /debian/pyversions: Drop file as it is deprecated. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ debian/pyversions | 1 - x2go/registry.py | 37 ++++++++++++++++----------------- x2go/session.py | 60 +++++++++++++++++++++++++++++++++-------------------- 4 files changed, 58 insertions(+), 43 deletions(-) delete mode 100644 debian/pyversions The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 71772ad..a8310b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,10 +20,13 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Implement X2Go session profile features ,,autologin'' and ,,sshproxyautologin'' (meaning: look_for_keys and allow_agent in Python Paramiko terms). + - Make X2goClient instance available in initial X2goSession instances. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: + Versioned depend on python-paramiko (>= 1.8-0~). + * /debian/pyversions: + + Drop file as it is deprecated. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index 44dd54d..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.5- \ No newline at end of file diff --git a/x2go/registry.py b/x2go/registry.py index 61ceba3..84a0058 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -460,7 +460,6 @@ class X2goSessionRegistry(object): keep_controlsession_alive=True, add_to_known_hosts=False, known_hosts=None, - forward_sshagent=False, **kwargs): """\ Register a new L{X2goSession} instance with this L{X2goSessionRegistry}. @@ -512,36 +511,36 @@ class X2goSessionRegistry(object): if profile_id in self.control_sessions.keys(): control_session = self.control_sessions[profile_id] + _params = self.client_instance.session_profiles.to_session_params(profile_id) + for _k in _params.keys(): + if _k in kwargs.keys(): + _params[_k] = kwargs[_k] + # when starting a new session, we will try to use unused registered virgin sessions # depending on your application layout, there should either be one or no such virgin session at all _virgin_sessions = [ s for s in self.virgin_sessions_of_profile_name(profile_name, return_objects=True) if not s.activated ] if _virgin_sessions and not session_name: - - _virgin_sessions[0].activated = True session_uuid = _virgin_sessions[0].get_uuid() - _params = self.client_instance.session_profiles.to_session_params(profile_id) - for _k in _params.keys(): - if _k in kwargs.keys(): - _params[_k] = kwargs[_k] - self(session_uuid).update_params(_params) - self(session_uuid).set_server(server) - self(session_uuid).set_profile_name(profile_name) self.logger('using already initially-registered yet-unused session %s' % session_uuid, loglevel=log.loglevel_NOTICE) - return session_uuid - session_uuid = self.get_session_of_session_name(session_name) + else: + session_uuid = self.get_session_of_session_name(session_name) + if session_uuid is not None: self.logger('using already registered-by-session-name session %s' % session_uuid, loglevel=log.loglevel_NOTICE) + if session_uuid is not None: self(session_uuid).activated = True - _params = self.client_instance.session_profiles.to_session_params(profile_id) - for _k in _params.keys(): - if _k in kwargs.keys(): - _params[_k] = kwargs[_k] self(session_uuid).update_params(_params) self(session_uuid).set_server(server) self(session_uuid).set_profile_name(profile_name) - self.logger('using already registered-by-session-name session %s' % session_uuid, loglevel=log.loglevel_NOTICE) return session_uuid + try: del _params['server'] + except: pass + try: del _params['profile_name'] + except: pass + try: del _params['profile_id'] + except: pass + s = session.X2goSession(server=server, control_session=control_session, profile_id=profile_id, profile_name=profile_name, session_name=session_name, @@ -558,8 +557,8 @@ class X2goSessionRegistry(object): keep_controlsession_alive=keep_controlsession_alive, add_to_known_hosts=add_to_known_hosts, known_hosts=known_hosts, - forward_sshagent=forward_sshagent, - logger=self.logger, **kwargs) + client_instance=self.client_instance, + logger=self.logger, **_params) session_uuid = s._X2goSession__get_uuid() self.logger('registering X2Go session %s...' % profile_name, log.loglevel_NOTICE) diff --git a/x2go/session.py b/x2go/session.py index 0330015..7722822 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -98,19 +98,19 @@ _X2GO_SESSION_PARAMS = ('use_sshproxy', 'sshproxy_reuse_authinfo', """A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2goControlSession, X2goSSHProxy nor an X2goControlSession object.""" # options of the paramiko.SSHClient().connect() method, any option that is allowed for a terminal session instance _X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi', - 'cache_type', 'kbtype', 'kblayout', 'kbvariant', - 'session_type', 'snd_system', 'snd_port', - 'cmd', 'set_session_title', 'session_title', - 'rdp_server', 'rdp_options', 'applications', - 'xdmcp_server', - 'rootdir', 'loglevel', 'profile_name', 'profile_id', - 'print_action', 'print_action_args', - 'convert_encoding', 'client_encoding', 'server_encoding', - 'proxy_options', 'published_applications', 'published_applications_no_submenus', - 'logger', - 'control_backend', 'terminal_backend', 'proxy_backend', - 'profiles_backend', 'settings_backend', 'printing_backend', - ) + 'cache_type', 'kbtype', 'kblayout', 'kbvariant', + 'session_type', 'snd_system', 'snd_port', + 'cmd', 'set_session_title', 'session_title', + 'rdp_server', 'rdp_options', 'applications', + 'xdmcp_server', + 'rootdir', 'loglevel', 'profile_name', 'profile_id', + 'print_action', 'print_action_args', + 'convert_encoding', 'client_encoding', 'server_encoding', + 'proxy_options', 'published_applications', 'published_applications_no_submenus', + 'logger', + 'control_backend', 'terminal_backend', 'proxy_backend', + 'profiles_backend', 'settings_backend', 'printing_backend', + ) """A list of allowed X2Go terminal session parameters.""" _X2GO_SSHPROXY_PARAMS = ('sshproxy_host', 'sshproxy_port', 'sshproxy_user', 'sshproxy_password', 'sshproxy_key_filename', 'sshproxy_pkey', @@ -158,8 +158,6 @@ class X2goSession(object): add_to_known_hosts=False, known_hosts=None, forward_sshagent=False, - look_for_keys=False, - allow_agent=False, logger=None, loglevel=log.loglevel_DEFAULT, connected=False, activated=False, virgin=True, running=None, suspended=None, terminated=None, faulty=None, client_instance=None, @@ -223,10 +221,6 @@ class X2goSession(object): @type known_hosts: C{str} @param forward_sshagent: forward SSH agent authentication requests to the SSH agent on the X2Go client-side @type forward_sshagent: C{bool} - @param look_for_keys: set to C{True} to enable searching for discoverable private key files in C{~/.ssh/} - @type look_for_keys: C{bool} - @param allow_agent: set to C{True} to enable connecting to a local SSH agent for acquiring authentication information - @type allow_agent: C{bool} @param connected: manipulate session state »connected« by giving a pre-set value @type connected: C{bool} @param activated: normal leave this untouched, an activated session is a session that is about to be used @@ -342,8 +336,6 @@ class X2goSession(object): self.add_to_known_hosts = add_to_known_hosts self.known_hosts = known_hosts self.forward_sshagent = forward_sshagent - self.look_for_keys = look_for_keys - self.allow_agent = allow_agent self._current_status = { 'timestamp': time.time(), @@ -518,8 +510,6 @@ class X2goSession(object): self.control_session = self.control_backend(profile_name=self.profile_name, add_to_known_hosts=self.add_to_known_hosts, known_hosts=self.known_hosts, - look_for_keys=self.look_for_keys, - allow_agent=self.allow_agent, forward_sshagent=self.forward_sshagent, terminal_backend=self.terminal_backend, info_backend=self.info_backend, @@ -1058,6 +1048,12 @@ class X2goSession(object): return True elif self.sshproxy_params.has_key('sshproxy_pkey') and self.sshproxy_params['sshproxy_pkey']: return True + ### FIXME -- we do not know by 100% if this will work just by checking the presence of ,,sshproxy_look_for_keys''... + elif self.sshproxy_params.has_key('sshproxy_look_for_keys') and self.sshproxy_params['sshproxy_look_for_keys']: + return True + ### FIXME -- we do not know by 100% if this will work just by checking the presence of ,,sshproxy_allow_agent''... + elif self.sshproxy_params.has_key('sshproxy_allow_agent') and self.sshproxy_params['sshproxy_allow_agent']: + return True else: return False else: @@ -1093,6 +1089,24 @@ class X2goSession(object): else: return True + # or a key auto discovery? + ### FIXME -- we do not know by 100% if this will work just by checking the presence of ,,look_for_keys''... + elif self.control_params.has_key('look_for_keys') and self.control_params['look_for_keys']: + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True + + # or a SSH agent usage? + ### FIXME -- we do not know by 100% if this will work just by checking the presence of ,,allow_agent''... + elif self.control_params.has_key('allow_agent') and self.control_params['allow_agent']: + _can_sshproxy_auto_connect = self.can_sshproxy_auto_connect() + if _can_sshproxy_auto_connect is not None: + return _can_sshproxy_auto_connect + else: + return True + else: return False __can_auto_connect = can_auto_connect hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-36-g4e7c22e
by git-admin＠x2go.org 10 Oct '12

10 Oct '12

The branch, master has been updated via 4e7c22e6c1994cc74348e8c8ee808e5e31886de1 (commit) from ce4e09cc437f0ff15e4ed53b7a96e100576462bc (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 4e7c22e6c1994cc74348e8c8ee808e5e31886de1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 22:25:25 2012 +0200 Introduce profile manager tab ,,Link Quality''. Move printing into renamed tab ,,Resource Sharing''. Shrink profile manager window, closes upstream issue: #13. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 + pyhoca/wxgui/profilemanager.py | 385 +++++++++++++++++++++------------------- 2 files changed, 201 insertions(+), 187 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a62501b..6c2b1b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Disable ,,usesshproxy'' for DirectRDP sessions. - Make ,,maxdim'' option configurable through session profile manager. - Fix naming mismatch ,,autologin'' vs. ,,autoconnect''. + - Introduce profile manager tab ,,Link Quality''. Move printing into renamed + tab ,,Resource Sharing''. Shrink profile manager window, closes upstream + issue: #13. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 1888bee..6b80fcf 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -163,8 +163,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_Profile = wx.Panel(self.X2goTabs, -1) self.tab_Session = wx.Panel(self.X2goTabs, -1) self.tab_Connection = wx.Panel(self.X2goTabs, -1) + self.tab_LinkQuality = wx.Panel(self.X2goTabs, -1) self.tab_Settings = wx.Panel(self.X2goTabs, -1) - self.tab_SharedFilesAndFolders = wx.Panel(self.X2goTabs, -1) + self.tab_SharedResources = wx.Panel(self.X2goTabs, -1) # boxes for all tabs self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title')) @@ -172,14 +173,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Session Startup')) self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Server")) self.staticbox_Proxy = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Proxy")) - self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Connection Link Speed")) - self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Compression")) + self.staticbox_LinkSpeed = wx.StaticBox(self.tab_LinkQuality, -1, ' %s ' % _(u"Connection Link Speed")) + self.staticbox_Compression = wx.StaticBox(self.tab_LinkQuality, -1, ' %s ' % _(u"Compression")) self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Display")) self.staticbox_Keyboard = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Keyboard")) self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Sound")) - self.staticbox_Printing = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Printing")) - self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"Folder Exports")) - self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import")) + self.staticbox_Printing = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"Printing")) + self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"Folder Exports")) + self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedResources, -1, ' %s ' % _(u"File Import")) ### ### widgets for the PROFILE tab @@ -268,17 +269,17 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20)) self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534) - self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4) - self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) - self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE) - self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"ADSL"), style=wx.ALIGN_CENTRE) - self.WANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE) - self.LANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE) + self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4) + self.ModemLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE) + self.ISDNLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE) + self.ADSLLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"ADSL"), style=wx.ALIGN_CENTRE) + self.WANLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE) + self.LANLabel = wx.StaticText(self.tab_LinkQuality, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE) - self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, _(u"Method")+": ") - self.Compression = wx.ComboBox(self.tab_Connection, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN) - self.ImageQualityLabel = wx.StaticText(self.tab_Connection, -1, _(u"Image quality")+": ") - self.ImageQuality = wx.SpinCtrl(self.tab_Connection, -1, "9", min=0, max=9) + self.CompressionLabel = wx.StaticText(self.tab_LinkQuality, -1, _(u"Method")+": ") + self.Compression = wx.ComboBox(self.tab_LinkQuality, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN) + self.ImageQualityLabel = wx.StaticText(self.tab_LinkQuality, -1, _(u"Image quality")+": ") + self.ImageQuality = wx.SpinCtrl(self.tab_LinkQuality, -1, "9", min=0, max=9) ### ### wigdets for the SETTINGS tab @@ -313,29 +314,30 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.DefaultSoundPort = wx.CheckBox(self.tab_Settings, -1, _(u"Use default sound port")) self.SoundPortLabel = wx.StaticText(self.tab_Settings, -1, _(u"Custom sound port")+": ") self.SoundPort = wx.SpinCtrl(self.tab_Settings, -1, "4713", min=23, max=64889) - self.ClientSidePrinting = wx.CheckBox(self.tab_Settings, -1, _(u"Client Side printing")) - - self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use local folder sharing")) - self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Path")+": ") - self.SharedFolderPath = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedFilesAndFolders, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) - self.AddSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Add")) - self.SharedFoldersList = CheckListCtrl(self.tab_SharedFilesAndFolders) + + self.UseLocalFolderSharing = wx.CheckBox(self.tab_SharedResources, -1, _(u"Use local folder sharing")) + self.SharedFolderPathLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Path")+": ") + self.SharedFolderPath = wx.TextCtrl(self.tab_SharedResources, -1, "", style=wx.TE_PROCESS_ENTER) + self.SharedFolderPathBrowseButton = wx.BitmapButton(self.tab_SharedResources, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) + self.AddSharedFolderPathButton = wx.Button(self.tab_SharedResources, -1, _(u"Add")) + self.SharedFoldersList = CheckListCtrl(self.tab_SharedResources) self.SharedFoldersList.InsertColumn(0, _("Local Path"), wx.LIST_FORMAT_LEFT) self.SharedFoldersList.InsertColumn(1, _("Connect Method"), wx.LIST_FORMAT_CENTER) - self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedFilesAndFolders, -1, _(u"Delete")) + self.DeleteSharedFolderPathButton = wx.Button(self.tab_SharedResources, -1, _(u"Delete")) + + self.UseEncodingConverter = wx.CheckBox(self.tab_SharedResources, -1, _(u"Convert between client and server encodings")) + self.ClientEncodingLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Client encoding")+": ") + self.ClientEncoding = wx.ComboBox(self.tab_SharedResources, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) + self.ServerEncodingLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Server encoding")+": ") + self.ServerEncoding = wx.ComboBox(self.tab_SharedResources, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.UseEncodingConverter = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Convert between client and server encodings")) - self.ClientEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Client encoding")+": ") - self.ClientEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.ServerEncodingLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Server encoding")+": ") - self.ServerEncoding = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=_known_encodings, style=wx.CB_DROPDOWN|wx.CB_READONLY) + self.UseFileMIMEbox = wx.CheckBox(self.tab_SharedResources, -1, _(u"Use file MIME box for local file import")) + self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Extensions")+": ") + self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedResources, -1, "", style=wx.TE_PROCESS_ENTER) + self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedResources, -1, _(u"Action")+": ") + self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedResources, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) - self.UseFileMIMEbox = wx.CheckBox(self.tab_SharedFilesAndFolders, -1, _(u"Use file MIME box for local file import")) - self.FileMIMEboxExtensionsLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Extensions")+": ") - self.FileMIMEboxExtensions = wx.TextCtrl(self.tab_SharedFilesAndFolders, -1, "", style=wx.TE_PROCESS_ENTER) - self.FileMIMEboxActionLabel = wx.StaticText(self.tab_SharedFilesAndFolders, -1, _(u"Action")+": ") - self.FileMIMEboxAction = wx.ComboBox(self.tab_SharedFilesAndFolders, -1, choices=self.mimeboxactionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) + self.ClientSidePrinting = wx.CheckBox(self.tab_SharedResources, -1, _(u"Client Side printing")) if self.action == 'ADD': self.OKButton = wx.Button(self, -1, _(u"Add")) @@ -491,7 +493,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPort.SetMinSize((-1, self._textfield_height)) self.ClientSidePrinting.SetMinSize((-1, self._textfield_height)) self.SharedFolderPath.SetMinSize((220, self._textfield_height)) - self.SharedFoldersList.SetMinSize((-1, 180)) + self.SharedFoldersList.SetMinSize((-1, 90)) self.ClientEncoding.SetMinSize((140, self._textfield_height)) self.ServerEncoding.SetMinSize((140, self._textfield_height)) @@ -604,178 +606,188 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_2_1.Add(sizer_3_2_1_1, pos=(4,0), span=(1,6)) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3_3 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) - sizer_3_3_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_3_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_3_1_1.Add(self.LinkSpeed) - sizer_3_3_1_2 = wx.GridSizer(1,5,0,0) - sizer_3_3_1_2.SetMinSize((454/5*6 - 30, 36)) - sizer_3_3_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1.Add(sizer_3_3_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3_1.Add(sizer_3_3_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_3_3.Add(sizer_3_3_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_3_4 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) - sizer_3_4_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_4_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_4_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_4_1_1.Add(self.Compression) - sizer_3_4_1_1.Add((0,32)) - sizer_3_4_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_4_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_4_1_2.Add(self.ImageQuality) - sizer_3_4_1.Add(sizer_3_4_1_1, flag=wx.EXPAND) - sizer_3_4_1.Add(sizer_3_4_1_2, flag=wx.EXPAND) - sizer_3_4.Add(sizer_3_4_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5) sizer_3.Add(sizer_3_2, flag=wx.EXPAND|wx.ALL, border=5) - sizer_3.Add(sizer_3_3, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_3.Add(sizer_3_4, flag=wx.EXPAND|wx.ALL, border=5) self.tab_Connection.SetSizerAndFit(sizer_3) self.tab_Connection.Layout() - ## SETTINGS TAB + ## LINK QUALITY TAB sizer_4 = wx.BoxSizer(wx.VERTICAL) - sizer_4_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL) + sizer_4_1 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) sizer_4_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_4_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_1.Add((16, 0)) - sizer_4_1_1_1.Add(self.DisplayTypeMaximize, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_1.Add((16, 0)) - sizer_4_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_1.Add((8,0)) - sizer_4_1_1_1.Add(self.ScreenWidth) - sizer_4_1_1_1.Add((8,0)) - sizer_4_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_1.Add((8,0)) - sizer_4_1_1_1.Add(self.ScreenHeight) - sizer_4_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_2.Add((-1,48)) - sizer_4_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_2.Add((8,0)) - sizer_4_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1.Add(sizer_4_1_1_1) - sizer_4_1_1.Add(sizer_4_1_1_2) + sizer_4_1_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_4_1_1_1.Add(self.LinkSpeed) + sizer_4_1_1_2 = wx.GridSizer(1,5,0,0) + sizer_4_1_1_2.SetMinSize((454/5*6 - 30, 36)) + sizer_4_1_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1.Add(sizer_4_1_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_4_1_1.Add(sizer_4_1_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) sizer_4_1.Add(sizer_4_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_4_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL) + sizer_4_2 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) sizer_4_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_4_2_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_4_2_1_1.Add(self.DontSetKeyboard, ) - sizer_4_2_1_1.Add(self.AutoSetKeyboard, ) - sizer_4_2_1_1.Add(self.CustomSetKeyboard, ) - sizer_4_2_1_1.Add((0,8)) + sizer_4_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_4_2_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_4_2_1_1.Add(self.Compression) + sizer_4_2_1_1.Add((0,32)) sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_2_1_2.Add((32,0)) - sizer_4_2_1_2_1 = wx.GridBagSizer(hgap=2, vgap=2) - sizer_4_2_1_2_1.Add(self.KeyboardModelLabel, pos=(0,0),) - sizer_4_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,0),) - sizer_4_2_1_2_1.Add((32,0), pos=(0,1), span=(2,1)) - sizer_4_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,2), ) - sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,2), ) - sizer_4_2_1_2_1.Add((32,0), pos=(0,3), span=(2,1)) - sizer_4_2_1_2_1.Add(self.KeyboardVariantLabel, pos=(0,4),) - sizer_4_2_1_2_1.Add(self.KeyboardVariant, flag=wx.EXPAND, pos=(1,4),) - sizer_4_2_1_2.Add(sizer_4_2_1_2_1) - sizer_4_2_1.Add(sizer_4_2_1_1) - sizer_4_2_1.Add(sizer_4_2_1_2) - sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_4_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL) - sizer_4_3_1 = wx.GridBagSizer(vgap=4, hgap=2) - sizer_4_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, ) - sizer_4_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, ) - sizer_4_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, ) - sizer_4_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, ) - sizer_4_3_1.Add(self.DefaultSoundPort, pos=(1,1), ) - sizer_4_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_3_1_1.Add((8, -1)) - sizer_4_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_3_1.Add(sizer_4_3_1_1, pos=(2,1), ) - sizer_4_3.Add(sizer_4_3_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_4_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) - sizer_4_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) + sizer_4_2_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_4_2_1_2.Add(self.ImageQuality) + sizer_4_2_1.Add(sizer_4_2_1_1, flag=wx.EXPAND) + sizer_4_2_1.Add(sizer_4_2_1_2, flag=wx.EXPAND) + sizer_4_2.Add(sizer_4_2_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) sizer_4.Add(sizer_4_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_4.Add(sizer_4_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_4.Add(sizer_4_3, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_4.Add(sizer_4_4, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_Settings.SetSizerAndFit(sizer_4) - self.tab_Settings.Layout() + sizer_4.Add(sizer_4_2, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_LinkQuality.SetSizerAndFit(sizer_4) + self.tab_LinkQuality.Layout() - # FOLDERSHARING TAB + ## SETTINGS TAB sizer_5 = wx.BoxSizer(wx.VERTICAL) - sizer_5_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL) + sizer_5_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL) sizer_5_1_1 = wx.BoxSizer(wx.VERTICAL) sizer_5_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_1.Add(self.UseLocalFolderSharing) + sizer_5_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_1.Add((16, 0)) + sizer_5_1_1_1.Add(self.DisplayTypeMaximize, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_1.Add((16, 0)) + sizer_5_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_1.Add((8,0)) + sizer_5_1_1_1.Add(self.ScreenWidth) + sizer_5_1_1_1.Add((8,0)) + sizer_5_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_1.Add((8,0)) + sizer_5_1_1_1.Add(self.ScreenHeight) sizer_5_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5) - sizer_5_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_5_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) - sizer_5_1_1_2.Add(sizer_5_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_5_1_1_2.Add(sizer_5_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_5_1_1_2.Add(sizer_5_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) - sizer_5_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND) - sizer_5_1_1.Add(sizer_5_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12) - sizer_5_1_1.Add(sizer_5_1_1_2, flag=wx.EXPAND) - sizer_5_1_1.Add(sizer_5_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5) - sizer_5_1_2 = wx.BoxSizer(wx.VERTICAL) - sizer_5_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5) - sizer_5_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_2_2.Add((8,0)) - sizer_5_1_2_2.Add(self.ClientEncoding) - sizer_5_1_2_2.Add((16,0)) - sizer_5_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_2_2.Add((8,0)) - sizer_5_1_2_2.Add(self.ServerEncoding) - sizer_5_1_2.Add(sizer_5_1_2_1, flag=wx.EXPAND) - sizer_5_1_2.Add(sizer_5_1_2_2, flag=wx.EXPAND) + sizer_5_1_1_2.Add((-1,48)) + sizer_5_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_2.Add((8,0)) + sizer_5_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1.Add(sizer_5_1_1_1) + sizer_5_1_1.Add(sizer_5_1_1_2) sizer_5_1.Add(sizer_5_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_5_1.Add(sizer_5_1_2, flag=wx.EXPAND|wx.ALL, border=7) - sizer_5_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL) + sizer_5_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL) sizer_5_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_5_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) - sizer_5_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3) - sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2)) - sizer_5_2_1_2.Add((8,0), pos=(0,1)) - sizer_5_2_1_2.Add((8,0), pos=(1,1)) - sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2)) - sizer_5_2_1.Add(sizer_5_2_1_1, flag=wx.EXPAND) - sizer_5_2_1.Add(sizer_5_2_1_2, flag=wx.EXPAND) + sizer_5_2_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_5_2_1_1.Add(self.DontSetKeyboard, ) + sizer_5_2_1_1.Add(self.AutoSetKeyboard, ) + sizer_5_2_1_1.Add(self.CustomSetKeyboard, ) + sizer_5_2_1_1.Add((0,8)) + sizer_5_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_5_2_1_2.Add((32,0)) + sizer_5_2_1_2_1 = wx.GridBagSizer(hgap=2, vgap=2) + sizer_5_2_1_2_1.Add(self.KeyboardModelLabel, pos=(0,0),) + sizer_5_2_1_2_1.Add(self.KeyboardModel, flag=wx.EXPAND, pos=(1,0),) + sizer_5_2_1_2_1.Add((32,0), pos=(0,1), span=(2,1)) + sizer_5_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL, pos=(0,2), ) + sizer_5_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND, pos=(1,2), ) + sizer_5_2_1_2_1.Add((32,0), pos=(0,3), span=(2,1)) + sizer_5_2_1_2_1.Add(self.KeyboardVariantLabel, pos=(0,4),) + sizer_5_2_1_2_1.Add(self.KeyboardVariant, flag=wx.EXPAND, pos=(1,4),) + sizer_5_2_1_2.Add(sizer_5_2_1_2_1) + sizer_5_2_1.Add(sizer_5_2_1_1) + sizer_5_2_1.Add(sizer_5_2_1_2) sizer_5_2.Add(sizer_5_2_1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_5_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL) + sizer_5_3_1 = wx.GridBagSizer(vgap=4, hgap=2) + sizer_5_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, ) + sizer_5_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, ) + sizer_5_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, ) + sizer_5_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, ) + sizer_5_3_1.Add(self.DefaultSoundPort, pos=(1,1), ) + sizer_5_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_5_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_3_1_1.Add((8, -1)) + sizer_5_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_3_1.Add(sizer_5_3_1_1, pos=(2,1), ) + sizer_5_3.Add(sizer_5_3_1, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_5_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) + sizer_5_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) + sizer_5.Add(sizer_5_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_5.Add(sizer_5_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_SharedFilesAndFolders.SetSizerAndFit(sizer_5) - self.tab_SharedFilesAndFolders.Layout() + sizer_5.Add(sizer_5_2, flag=wx.EXPAND|wx.ALL, border=5) + sizer_5.Add(sizer_5_3, flag=wx.EXPAND|wx.ALL, border=5) + sizer_5.Add(sizer_5_4, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_Settings.SetSizerAndFit(sizer_5) + self.tab_Settings.Layout() + + # RESOURCE SHARING TAB + sizer_6 = wx.BoxSizer(wx.VERTICAL) + sizer_6_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL) + sizer_6_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_6_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_1.Add(self.UseLocalFolderSharing) + sizer_6_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=5) + sizer_6_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_6_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) + sizer_6_1_1_2.Add(sizer_6_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) + sizer_6_1_1_2.Add(sizer_6_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) + sizer_6_1_1_2.Add(sizer_6_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) + sizer_6_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND) + sizer_6_1_1.Add(sizer_6_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12) + sizer_6_1_1.Add(sizer_6_1_1_2, flag=wx.EXPAND) + sizer_6_1_1.Add(sizer_6_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5) + sizer_6_1_2 = wx.BoxSizer(wx.VERTICAL) + sizer_6_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5) + sizer_6_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_2_2.Add((8,0)) + sizer_6_1_2_2.Add(self.ClientEncoding) + sizer_6_1_2_2.Add((16,0)) + sizer_6_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_1_2_2.Add((8,0)) + sizer_6_1_2_2.Add(self.ServerEncoding) + sizer_6_1_2.Add(sizer_6_1_2_1, flag=wx.EXPAND) + sizer_6_1_2.Add(sizer_6_1_2_2, flag=wx.EXPAND) + sizer_6_1.Add(sizer_6_1_1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_6_1.Add(sizer_6_1_2, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_6_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL) + sizer_6_2_1 = wx.BoxSizer(wx.VERTICAL) + sizer_6_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_6_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) + sizer_6_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3) + sizer_6_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2)) + sizer_6_2_1_2.Add((8,0), pos=(0,1)) + sizer_6_2_1_2.Add((8,0), pos=(1,1)) + sizer_6_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_6_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2)) + sizer_6_2_1.Add(sizer_6_2_1_1, flag=wx.EXPAND) + sizer_6_2_1.Add(sizer_6_2_1_2, flag=wx.EXPAND) + sizer_6_2.Add(sizer_6_2_1, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_6_3 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) + sizer_6_3.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) + + sizer_6.Add(sizer_6_1, flag=wx.EXPAND|wx.ALL, border=5) + sizer_6.Add(sizer_6_2, flag=wx.EXPAND|wx.ALL, border=5) + sizer_6.Add(sizer_6_3, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_SharedResources.SetSizerAndFit(sizer_6) + self.tab_SharedResources.Layout() self.X2goTabs.AddPage(self.tab_Profile, _(u"Profile")) self.X2goTabs.AddPage(self.tab_Session, _(u"Session")) self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection")) + self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality")) self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings")) - self.X2goTabs.AddPage(self.tab_SharedFilesAndFolders, _(u"Sharing")) + self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Shared Resources")) # the bottom area with OK, Defaults and Cancel buttons sizer_B = wx.BoxSizer(wx.HORIZONTAL) @@ -794,19 +806,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog): max1_x, max1_y = self.tab_Profile.GetBestSize() max2_x, max2_y = self.tab_Session.GetBestSize() max3_x, max3_y = self.tab_Connection.GetBestSize() - max4_x, max4_y = self.tab_Settings.GetBestSize() - max5_x, max5_y = self.tab_SharedFilesAndFolders.GetBestSize() + max4_x, max4_y = self.tab_LinkQuality.GetBestSize() + max5_x, max5_y = self.tab_Settings.GetBestSize() + max6_x, max6_y = self.tab_SharedResources.GetBestSize() #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize()) - self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) + 80)) + self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y, max5_y) + 50)) self.SetAutoLayout(True) self.Layout() self.CentreOnScreen() self.Show(True) # derive ListCtrl widths from sizer information - _sizer_width = sizer_5_1_1_3.GetSize().GetWidth() + _sizer_width = sizer_6_1_1_3.GetSize().GetWidth() self.SharedFoldersList.SetColumnWidth(0, abs(_sizer_width*.7)) self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3)) @@ -1454,7 +1467,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPortLabel.Enable(False) self.SoundPort.Enable(False) self.Esd.Enable(False) - self.tab_SharedFilesAndFolders.Enable(True) + self.tab_SharedResources.Enable(True) self.RDPServer.Enable(False) self.RDPServer.SetValue(self.Host.GetValue()) self.RDPOptions.SetValue(self.profile_config_bak['directrdpsettings']) @@ -1504,7 +1517,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.DefaultSoundPort.Enable(True) self.DefaultSoundPort.SetValue(True) self.Esd.Enable(True) - self.tab_SharedFilesAndFolders.Enable(True) + self.tab_SharedResources.Enable(True) self.RDPServer.SetValue(self.profile_config_bak['rdpserver']) self.RDPOptions.SetValue(self.profile_config_bak['rdpoptions']) if self.Application.GetValue() in self.rdpclientChoices.keys(): @@ -2246,7 +2259,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): try: wx.EndBusyCursor() except: pass self.Close() - self.Destroy() else: try: wx.EndBusyCursor() except: pass @@ -2260,7 +2272,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ self.Close() - self.Destroy() def OnDefault(self, event): """\ hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-paramiko.git - x2go (branch) updated: 6bc01beb208adaf901ac7ae6e493f09037bb410a
by git-admin＠x2go.org 10 Oct '12

10 Oct '12

The branch, x2go has been updated via 6bc01beb208adaf901ac7ae6e493f09037bb410a (commit) via 38bf235ec8e6a5ec194ac2b2455e56f5406c7c5b (commit) via 7169501b27e2ceefde40eae8679a5c8af1aa8e5f (commit) via 3a6e6b68dcba9721acbb291a9c2f3c4d967b3a5f (commit) via c9a778ef578984871f98732cc14646f8d2f47a7a (commit) from d0835c69a890584b075a08407bd6bc6a871a5a3f (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 6bc01beb208adaf901ac7ae6e493f09037bb410a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 21:38:17 2012 +0200 no upstream Makefile for .deb package building commit 38bf235ec8e6a5ec194ac2b2455e56f5406c7c5b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 21:29:33 2012 +0200 drop all patches again commit 7169501b27e2ceefde40eae8679a5c8af1aa8e5f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 21:28:52 2012 +0200 allow non-dh_python2 builds, move epydoc build logic into /debian/rules commit 3a6e6b68dcba9721acbb291a9c2f3c4d967b3a5f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 21:28:12 2012 +0200 build-depend on debhelper (>= 8.0.0~) commit c9a778ef578984871f98732cc14646f8d2f47a7a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Oct 10 21:27:46 2012 +0200 fix upstream version in /debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 3 ++- debian/patches/001_no-register+upload.patch | 9 --------- debian/patches/001_no-upstream-Makefile | 18 ++++++++++++++++++ .../002_no-testing-fails-in-build-chroot.patch | 10 ---------- debian/patches/series | 3 +-- debian/rules | 10 ++++++++-- 7 files changed, 30 insertions(+), 25 deletions(-) delete mode 100644 debian/patches/001_no-register+upload.patch create mode 100644 debian/patches/001_no-upstream-Makefile delete mode 100644 debian/patches/002_no-testing-fails-in-build-chroot.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b189f58..9638db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -paramiko (1.8-0~git20121009) unstable; urgency=low +paramiko (1.8.0-0~git20121009) unstable; urgency=low * Re-use packaging folder from Debian. * Package latest Git version on http://github.com/paramiko diff --git a/debian/control b/debian/control index 7b1910d..897436f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Jeremy T. Bouse <jbouse(a)debian.org> Uploaders: Guido Guenther <agx(a)debian.org>, Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -Build-Depends: debhelper (> 7.0.50~), +Build-Depends: debhelper (>= 8.0.0~), python-all (>= 2.6.5-0~), python-crypto (>= 2.1.0-2), python-epydoc, @@ -14,6 +14,7 @@ Standards-Version: 3.9.3 Homepage: http://github.com/paramiko Vcs-Git: git://code.x2go.org/python-paramiko.git Vcs-Browser: http://code.x2go.org/gitweb?p=python-paramiko.git;a=shortlog;h=refs/heads/x… +X-Python-Version: >=2.3 Package: python-paramiko Architecture: all diff --git a/debian/patches/001_no-register+upload.patch b/debian/patches/001_no-register+upload.patch deleted file mode 100644 index bce5664..0000000 --- a/debian/patches/001_no-register+upload.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - release: docs -- python setup.py sdist register upload -+ python setup.py sdist - - docs: - epydoc --no-private -o docs/ paramiko diff --git a/debian/patches/001_no-upstream-Makefile b/debian/patches/001_no-upstream-Makefile new file mode 100644 index 0000000..438897f --- /dev/null +++ b/debian/patches/001_no-upstream-Makefile @@ -0,0 +1,18 @@ +--- a/Makefile ++++ /dev/null +@@ -1,15 +0,0 @@ +-release: docs +- python setup.py sdist register upload +- +-docs: +- epydoc --no-private -o docs/ paramiko +- +-clean: +- rm -rf build dist docs +- rm -f MANIFEST *.log demos/*.log +- rm -f paramiko/*.pyc +- rm -f test.log +- rm -rf paramiko.egg-info +- +-test: +- python ./test.py diff --git a/debian/patches/002_no-testing-fails-in-build-chroot.patch b/debian/patches/002_no-testing-fails-in-build-chroot.patch deleted file mode 100644 index 4ef61bb..0000000 --- a/debian/patches/002_no-testing-fails-in-build-chroot.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,5 +11,5 @@ - rm -f test.log - rm -rf paramiko.egg-info - --test: -- python ./test.py -+#test: -+# python ./test.py diff --git a/debian/patches/series b/debian/patches/series index 3a3a510..340df87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -001_no-register+upload.patch -002_no-testing-fails-in-build-chroot.patch +001_no-upstream-Makefile diff --git a/debian/rules b/debian/rules index bfba3cc..21c415c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,19 @@ #!/usr/bin/make -f +WITH_PYTHON2 = $(shell test -f /usr/bin/dh_python2 && echo "--with python2") + %: - dh $@ --with python2 --with quilt + dh ${@} ${WITH_PYTHON2} --with quilt + +override_dh_auto_build: + epydoc --no-private -o docs/ paramiko + dh_auto_build # Commands not to run +override_dh_auto_test: override_dh_installcatalogs override_dh_installcron: override_dh_installdebconf override_dh_installemacsen override_dh_installifupdown: override_dh_installinfo override_dh_installinit override_dh_installmenu override_dh_installmime: override_dh_installmodules override_dh_installlogcheck override_dh_installlogrotate: override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: -override_dh_auto_test: \ No newline at end of file hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-29-gb72afbf
by git-admin＠x2go.org 09 Oct '12

09 Oct '12

The branch, master has been updated via b72afbf25c794c48d142d0cd665e210c559b57fb (commit) from 092b64a698c248ce93ce1881014c6a41e21a61c3 (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 b72afbf25c794c48d142d0cd665e210c559b57fb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 9 22:48:06 2012 +0200 /debian/control: Versioned depend on python-paramiko (>= 1.8-0~). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3a79b4b..71772ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low Paramiko terms). * /debian/rules: + Allow package build on systems with missing dh_python2. + * /debian/control: + + Versioned depend on python-paramiko (>= 1.8-0~). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 26 Sep 2012 20:49:44 +0200 diff --git a/debian/control b/debian/control index 36f017e..2b15378 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Depends: ${python:Depends}, ${misc:Depends}, python-gevent (>= 0.13.6-0~), - python-paramiko, + python-paramiko (>= 1.8-0~), python-cups, python-xlib, nxproxy hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).

1 0

python-paramiko.git - x2go (branch) updated: d0835c69a890584b075a08407bd6bc6a871a5a3f
by git-admin＠x2go.org 09 Oct '12

09 Oct '12

The branch, x2go has been updated via d0835c69a890584b075a08407bd6bc6a871a5a3f (commit) from 50c437be0969e372ae1b1a834c4e87e2c7fa9be0 (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 d0835c69a890584b075a08407bd6bc6a871a5a3f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 9 21:59:11 2012 +0200 fix for last commit ----------------------------------------------------------------------- Summary of changes: debian/rules | 3 --- 1 file changed, 3 deletions(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index 709a7ac..bfba3cc 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,6 @@ %: dh $@ --with python2 --with quilt -override_dh_auto_test: - ./test.py - # Commands not to run override_dh_installcatalogs override_dh_installcron: override_dh_installdebconf override_dh_installemacsen override_dh_installifupdown: hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

python-paramiko.git - x2go (branch) updated: 50c437be0969e372ae1b1a834c4e87e2c7fa9be0
by git-admin＠x2go.org 09 Oct '12

09 Oct '12

The branch, x2go has been updated via 50c437be0969e372ae1b1a834c4e87e2c7fa9be0 (commit) from e6f0a35c2a5ac55e0fa5b69c598d2f30c776161e (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 50c437be0969e372ae1b1a834c4e87e2c7fa9be0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Oct 9 21:57:05 2012 +0200 do not run tests when building .deb package ----------------------------------------------------------------------- Summary of changes: .../002_no-testing-fails-in-build-chroot.patch | 10 ++++++++++ debian/patches/series | 1 + debian/rules | 1 + 3 files changed, 12 insertions(+) create mode 100644 debian/patches/002_no-testing-fails-in-build-chroot.patch The diff of changes is: diff --git a/debian/patches/002_no-testing-fails-in-build-chroot.patch b/debian/patches/002_no-testing-fails-in-build-chroot.patch new file mode 100644 index 0000000..4ef61bb --- /dev/null +++ b/debian/patches/002_no-testing-fails-in-build-chroot.patch @@ -0,0 +1,10 @@ +--- a/Makefile ++++ b/Makefile +@@ -11,5 +11,5 @@ + rm -f test.log + rm -rf paramiko.egg-info + +-test: +- python ./test.py ++#test: ++# python ./test.py diff --git a/debian/patches/series b/debian/patches/series index 91f0b84..3a3a510 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 001_no-register+upload.patch +002_no-testing-fails-in-build-chroot.patch diff --git a/debian/rules b/debian/rules index e7fcc4e..709a7ac 100755 --- a/debian/rules +++ b/debian/rules @@ -13,3 +13,4 @@ override_dh_installinfo override_dh_installinit override_dh_installmenu override override_dh_installmodules override_dh_installlogcheck override_dh_installlogrotate: override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm: override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal: +override_dh_auto_test: \ No newline at end of file hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits