x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

pyhoca-gui.git - master (branch) updated: 0.1.0.10-48-g5a1a18d
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 5a1a18d7567d9e14f971160cd2247a5f6d8d167a (commit) via c68c5a5f64749dad34276a4e43185db3fcdc3518 (commit) from bea3b4a98da6ae150b4189b284a2cdde7fcfe41c (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 5a1a18d7567d9e14f971160cd2247a5f6d8d167a … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 7 23:31:19 2012 +0100 rebuild i18n files commit c68c5a5f64749dad34276a4e43185db3fcdc3518 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 7 23:25:12 2012 +0100 Rearrange profile manager. Add one more tab to the profile manager window. Reintroduce window icon in 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 18816 -> 19118 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 17632 -> 17920 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 17841 -> 17906 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 17138 -> 17240 bytes debian/changelog | 2 + po/bg.po | 233 +++++++------- po/de.po | 255 ++++++++------- po/en.po | 255 ++++++++------- po/es.po | 256 ++++++++------- po/nl.po | 257 ++++++++------- po/pyhoca-gui.pot | 233 +++++++------- pyhoca/wxgui/profilemanager.py | 591 +++++++++++++++++---------------- 13 files changed, 1080 insertions(+), 1002 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 5d97655..7d8d246 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 e965543..4604e87 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 61694e3..9ad7ee6 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 3210220..c4bdb14 100644 Binary files a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 7215105..079c79b 100644 Binary files a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/debian/changelog b/debian/changelog index cd6f6be..b75262c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low PyHoca-GUI on Debian or other Distros that also ship the gnome-colors-common icon theme. - Replace non-code string ,,X2go'' by ,,X2Go''. + - Rearrange profile manager. Add one more tab to the profile manager window. + Reintroduce window icon in profile manager. * Depend on Python X2Go 0.1.1.9. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/po/bg.po b/po/bg.po index 0e8f2d2..954165f 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-02-04 12:48+0100\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" @@ -50,7 +50,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -198,7 +198,7 @@ msgstr "" msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "" @@ -239,358 +239,367 @@ msgid "new session profile" msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "" - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" +msgid "Session Title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:147 -msgid "Server" +msgid "Session Window" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:148 -msgid "Connection Link Speed" +msgid "Session Startup" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:149 -msgid "Compression" +msgid "Server" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:150 -msgid "Display" +msgid "Connection Link Speed" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:151 -msgid "Keyboard" +msgid "Compression" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:152 -msgid "Sound" +msgid "Display" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:153 -msgid "Printing" +msgid "Keyboard" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:154 -msgid "Folder Exports" +msgid "Sound" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:155 +msgid "Printing" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:156 +msgid "Folder Exports" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom session window title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:176 +msgid "Window Icon" +msgstr "" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" +#: ../pyhoca/wxgui/profilemanager.py:709 +msgid "Profile" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -598,21 +607,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/de.po b/po/de.po index 703901e..44a8448 100644 --- a/po/de.po +++ b/po/de.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-04 12:48+0100\n" -"PO-Revision-Date: 2011-12-19 10:54+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" +"PO-Revision-Date: 2012-02-07 23:29+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -206,7 +206,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -247,359 +247,368 @@ msgid "new session profile" msgstr "neues Sitzungsprofil" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "Profil" - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" -msgstr "Sitzung" +msgid "Session Title" +msgstr "Sitzungstitel" #: ../pyhoca/wxgui/profilemanager.py:147 +msgid "Session Window" +msgstr "Sitzungsfenster" + +#: ../pyhoca/wxgui/profilemanager.py:148 +msgid "Session Startup" +msgstr "Sitzungsstart" + +#: ../pyhoca/wxgui/profilemanager.py:149 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:148 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Connection Link Speed" msgstr "Verbindungsgeschwindigkeit" -#: ../pyhoca/wxgui/profilemanager.py:149 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Compression" msgstr "Komprimierung" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Display" msgstr "Anzeige" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Keyboard" msgstr "Tastatur" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:154 msgid "Sound" msgstr "Audio" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Printing" msgstr "Drucken" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Folder Exports" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "Dateiimport" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "Name" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Set session window title" msgstr "Sitzungsfenstertitel setzen" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 msgid "Use a default session window title" msgstr "Standardtitel für Sitzungsfenster" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom session window title" msgstr "Sitzungstitel anpassen" #: ../pyhoca/wxgui/profilemanager.py:176 +msgid "Window Icon" +msgstr "Fenstersymbol" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "Typ" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" -msgstr "RDP Einstellungen" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" +msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "RDP Optionen" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "XDMCP Server" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "Benutzer" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "Hostname" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "Privater RSA/DSA Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "Server hinter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "Schlüssel" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "Hostname[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "SSH-Proxytunnel" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "Bildqualität" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "Vollbild" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "Benutzerdefinierte Größe" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "DPI-Wert für Anzeige setzen" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "Aktuelle Tastatureinstellungen beibehalten" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "Tastaturlayout" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "Tastaturmodell" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "Audiounterstützung aktivieren" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "Arts (nicht unterstützt)" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "Standard Audio-Port verwenden" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "Benutzerdefinierter Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "Unterstützung für lokale Druckeranbindung" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "Lokale Ordnerfreigabe verwenden" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "Hinzufügen" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "Lokaler Pfad" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "Verbindungsart" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "Entfernen" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "Zeichenkodierung zwischen Server und Client übersetzen" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "Zeichenkodierung Client" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "MIME-Box für lokalen Dateiimport verwenden" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "Erweiterungen" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "Aktion" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "Speichern" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "Zurücksetzen" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "manuell" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profilmanager - neues Sitzungsprofil" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profilmanager - %s (verbunden)" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profilmanager - %s" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" -msgstr "Sitzungsprofil" +#: ../pyhoca/wxgui/profilemanager.py:709 +msgid "Profile" +msgstr "Profil" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" +msgstr "Sitzung" + +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "Verbindung" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "Einstellungen" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -610,21 +619,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -1193,6 +1202,12 @@ msgstr "Sitzungsfenster umbenennen in" msgid "OK" msgstr "Ok" +#~ msgid "RDP settings" +#~ msgstr "RDP Einstellungen" + +#~ msgid "Session Profile" +#~ msgstr "Sitzungsprofil" + #~ msgid "" #~ "Set session window title (leave field below empty for default title from " #~ "server)" @@ -1206,12 +1221,6 @@ msgstr "Ok" #~ msgid "Icon" #~ msgstr "Symbol" -#~ msgid "Icon Files (*.png)|*.png|All files (*.*)|*" -#~ msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" - -#~ msgid "Choose an icon for this session profile" -#~ msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" - #~ msgid "All session profiles are connected" #~ msgstr "Alle Sitzungsprofile sind bereits verbunden" diff --git a/po/en.po b/po/en.po index 76e889b..4e0a2b0 100644 --- a/po/en.po +++ b/po/en.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-04 12:48+0100\n" -"PO-Revision-Date: 2011-12-19 10:53+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" +"PO-Revision-Date: 2012-02-07 23:28+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -206,7 +206,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "Custom command" @@ -247,358 +247,367 @@ msgid "new session profile" msgstr "new session profile" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "Profile" - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" -msgstr "Session" +msgid "Session Title" +msgstr "Session Title" #: ../pyhoca/wxgui/profilemanager.py:147 +msgid "Session Window" +msgstr "Session Window" + +#: ../pyhoca/wxgui/profilemanager.py:148 +msgid "Session Startup" +msgstr "Session Startup" + +#: ../pyhoca/wxgui/profilemanager.py:149 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:148 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Connection Link Speed" msgstr "Connection Link Speed" -#: ../pyhoca/wxgui/profilemanager.py:149 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Compression" msgstr "Compression" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Keyboard" msgstr "Keyboard" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:154 msgid "Sound" msgstr "Sound" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Printing" msgstr "Printing" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Folder Exports" msgstr "Folder Exports" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "File Import" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "Name" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Set session window title" msgstr "Set session window title" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 msgid "Use a default session window title" msgstr "Use a default session window title" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom session window title" msgstr "Custom session window title" #: ../pyhoca/wxgui/profilemanager.py:176 +msgid "Window Icon" +msgstr "Window Icon" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "Application" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" -msgstr "RDP settings" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" +msgstr "XDMCP server" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "RDP server" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "RDP options" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "XDMCP server" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "User" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "RSA/DSA private key" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "Server behind SSH proxy" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "Key file" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "Method" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "Image quality" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "Custom Size" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "Set display DPI" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "Keep current keyboard settings" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "Keyboard layout" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "Keyboard model" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "Enable sound support" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "Arts (not supported)" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "Use default sound port" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "Custom sound port" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "Client Side printing" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "Use local folder sharing" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "Add" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "Local Path" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "Connect Method" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "Delete" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "Convert between client and server encodings" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "Use file MIME box for local file import" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "Extensions" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "Action" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "Save" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "automatically" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "manually" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profile Manager - new profile" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profile Manager - %s (connected)" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profile Manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" -msgstr "Session Profile" +#: ../pyhoca/wxgui/profilemanager.py:709 +msgid "Profile" +msgstr "Profile" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" +msgstr "Session" + +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "Connection" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "Settings" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "Choose an icon for this session profile" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -609,21 +618,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -1187,6 +1196,12 @@ msgstr "Change session title to" msgid "OK" msgstr "OK" +#~ msgid "RDP settings" +#~ msgstr "RDP settings" + +#~ msgid "Session Profile" +#~ msgstr "Session Profile" + #~ msgid "" #~ "Set session window title (leave field below empty for default title from " #~ "server)" @@ -1200,12 +1215,6 @@ msgstr "OK" #~ msgid "Icon" #~ msgstr "Icon" -#~ msgid "Icon Files (*.png)|*.png|All files (*.*)|*" -#~ msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" - -#~ msgid "Choose an icon for this session profile" -#~ msgstr "Choose an icon for this session profile" - #~ msgid "All session profiles are connected" #~ msgstr "All session profiles are connected" diff --git a/po/es.po b/po/es.po index 3cbb734..accf6b3 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-04 12:48+0100\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" @@ -52,7 +52,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:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -211,7 +211,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "Comando personalizado" @@ -253,363 +253,377 @@ msgid "new session profile" msgstr "Nuevo Perfil de Sesión" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "Perfil " - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" -msgstr "Sesión" +#, fuzzy +msgid "Session Title" +msgstr "Perfil de Sesión" #: ../pyhoca/wxgui/profilemanager.py:147 +#, fuzzy +msgid "Session Window" +msgstr "Retomar Sesión" + +#: ../pyhoca/wxgui/profilemanager.py:148 +#, fuzzy +msgid "Session Startup" +msgstr "Sesión" + +#: ../pyhoca/wxgui/profilemanager.py:149 msgid "Server" msgstr "Servidor" -#: ../pyhoca/wxgui/profilemanager.py:148 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Connection Link Speed" msgstr "Velocidad de conexión" -#: ../pyhoca/wxgui/profilemanager.py:149 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Compression" msgstr "Compresión" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Display" msgstr "Pantalla" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Keyboard" msgstr "Teclado" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:154 msgid "Sound" msgstr "Sonido" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Printing" msgstr "Impresora" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Folder Exports" msgstr "Carpeta de Exportaciones" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "Importar Archivo" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "Nombre" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 #, fuzzy msgid "Set session window title" msgstr "Título de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 #, fuzzy msgid "Use a default session window title" msgstr "Título de Sesión" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 #, fuzzy msgid "Custom session window title" msgstr "Título de Sesión" #: ../pyhoca/wxgui/profilemanager.py:176 +#, fuzzy +msgid "Window Icon" +msgstr "Título de Sesión" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "Tipo" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" -msgstr "Parámetros RDP" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" +msgstr "Servidor XDMCP" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "Servidor RDP" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "Opciones RDP" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "Servidor XDMCP" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "Usuario" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "Puerto" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "Clave privada RSA/DSA" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "Servidor detrás del proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "Clave" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "Host[:Puerto]" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "Tunel Proxy SSH" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "Módem" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "Método" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "Calidad de imagen" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "Pantalla Completa" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "Tamaño Personalizado" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "Establecer DPI" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "Mantener configuración actual del teclado" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "Máscara de teclado" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "Modelo de teclado" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "Activar soporte de sonido" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "Arts (sin soporte)" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "Usar puerto de sonido por defecto" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "Puerto de sonido personalizado" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "Impresión local" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "Compartir carpetas locales" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "Añadir" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "Ruta Local" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "Método de Conexión" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "Eliminar" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "Convertir codificaciones entre cliente y servidor" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "Codificación del cliente" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "Codificación del Servidor" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "Usar tipo de archivo MIME para la importación local" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "Extensiones" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "Acción" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "Guardar" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "Reiniciar" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "automáticamente" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "manualmente" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Gestor de Perfiles - nuevo perfil" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Gestor de Perfiles - %s" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" -msgstr "Perfil de Sesión" +#: ../pyhoca/wxgui/profilemanager.py:709 +#, fuzzy +msgid "Profile" +msgstr "Perfil " + +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" +msgstr "Sesión" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "Conexión" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "Opciones" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "Elige un icono para este perfil de sesión" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 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:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -620,21 +634,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:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -1205,14 +1219,14 @@ msgstr "Nuevo Perfil de Sesión" msgid "OK" msgstr "" -#~ msgid "Icon" -#~ msgstr "Icono" +#~ msgid "RDP settings" +#~ msgstr "Parámetros RDP" -#~ msgid "Icon Files (*.png)|*.png|All files (*.*)|*" -#~ msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" +#~ msgid "Session Profile" +#~ msgstr "Perfil de Sesión" -#~ msgid "Choose an icon for this session profile" -#~ msgstr "Elige un icono para este perfil de sesión" +#~ msgid "Icon" +#~ msgstr "Icono" #, fuzzy #~ msgid "All session profiles are connected" diff --git a/po/nl.po b/po/nl.po index 2a65156..4981e7d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-04 12:48+0100\n" -"PO-Revision-Date: 2011-12-07 14:38+0100\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" +"PO-Revision-Date: 2012-02-07 23:31+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" "Language: \n" @@ -49,7 +49,7 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -205,7 +205,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "Speciaal Commando" @@ -247,361 +247,374 @@ msgid "new session profile" msgstr "Nieuw Profiel" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "Profiel" - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" -msgstr "Sessie" +#, fuzzy +msgid "Session Title" +msgstr "Sessie Profiel" #: ../pyhoca/wxgui/profilemanager.py:147 +#, fuzzy +msgid "Session Window" +msgstr "Sessie hervatten" + +#: ../pyhoca/wxgui/profilemanager.py:148 +#, fuzzy +msgid "Session Startup" +msgstr "Sessie" + +#: ../pyhoca/wxgui/profilemanager.py:149 msgid "Server" msgstr "Server" -#: ../pyhoca/wxgui/profilemanager.py:148 +#: ../pyhoca/wxgui/profilemanager.py:150 msgid "Connection Link Speed" msgstr "Verbindings snelheid" -#: ../pyhoca/wxgui/profilemanager.py:149 +#: ../pyhoca/wxgui/profilemanager.py:151 msgid "Compression" msgstr "Compressie" -#: ../pyhoca/wxgui/profilemanager.py:150 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Display" msgstr "Display" -#: ../pyhoca/wxgui/profilemanager.py:151 +#: ../pyhoca/wxgui/profilemanager.py:153 msgid "Keyboard" msgstr "Toetsenbord" -#: ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:154 msgid "Sound" msgstr "Geluid" -#: ../pyhoca/wxgui/profilemanager.py:153 +#: ../pyhoca/wxgui/profilemanager.py:155 msgid "Printing" msgstr "Afdrukken" -#: ../pyhoca/wxgui/profilemanager.py:154 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Folder Exports" msgstr "Map export" -#: ../pyhoca/wxgui/profilemanager.py:155 +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "Bestands import" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "Naam" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 #, fuzzy msgid "Set session window title" msgstr "Sessiescherm Titel" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 #, fuzzy msgid "Use a default session window title" msgstr "Sessiescherm Titel" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 #, fuzzy msgid "Custom session window title" msgstr "Sessiescherm Titel" #: ../pyhoca/wxgui/profilemanager.py:176 +#, fuzzy +msgid "Window Icon" +msgstr "Sessiescherm Titel" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "Type" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" -msgstr "RDP instellingen" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" +msgstr "XDMCP Server" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "RDP Server" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "RDP Opties" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "XDMCP Server" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "Gebruiker" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "Host" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "Port" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "Private RSA/DSA Key" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "Server achter SSH-Proxy" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "Sleutel" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "Host[:Port]" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "SSH Proxy Tunnel" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "Modem" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "ISDN" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "ADSL" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "WAN" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "LAN" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "Methode" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "Beeldkwaliteit" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "Fullscreen" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "Grootte instellen" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "DPI-waarde instellen" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "Huidige toetsenbord-instellingen behouden" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "Toetsenbord layout" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "Toetsenbord model" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "Geluid gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "Arts (niet ondersteund)" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "esd" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "Standaard Audio-Port gebruiken" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "Speciale Audio-Port" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "Afdrukken via deze computer" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "Delen van lokale mappen" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "Toevoegen" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "Lokaal Pad" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "Verbindingsmethode" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "Verwijderen" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "Encoding tussen client en server vertalen" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "Client encoding" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "Server encoding" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "Importeren lokale bestanden via MIME box" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "Uitbreidingen" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "Actie" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "Opslaan" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "Reset" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "automatisch" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "handmatig" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "PyHoca-GUI Profiel manager - nieuw profiel" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "PyHoca-GUI Profiel manager - %s (verbonden)" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "PyHoca-GUI Profiel manager - %s" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" -msgstr "Sessie Profiel" +#: ../pyhoca/wxgui/profilemanager.py:709 +msgid "Profile" +msgstr "Profiel" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" +msgstr "Sessie" + +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "Verbinding" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "Instellingen" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "Icon voor dit Profiel kiezen" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -612,21 +625,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -1195,14 +1208,14 @@ msgstr "Nieuw Profiel" msgid "OK" msgstr "" -#~ msgid "Icon" -#~ msgstr "Icon" +#~ msgid "RDP settings" +#~ msgstr "RDP instellingen" -#~ msgid "Icon Files (*.png)|*.png|All files (*.*)|*" -#~ msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" +#~ msgid "Session Profile" +#~ msgstr "Sessie Profiel" -#~ msgid "Choose an icon for this session profile" -#~ msgstr "Icon voor dit Profiel kiezen" +#~ msgid "Icon" +#~ msgstr "Icon" #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index a794c8f..fe7bb63 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-02-04 12:48+0100\n" +"POT-Creation-Date: 2012-02-07 23:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -46,7 +46,7 @@ msgstr "" msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:288 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:293 #: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" @@ -194,7 +194,7 @@ msgstr "" msgid "Single Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:180 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:186 msgid "Custom command" msgstr "" @@ -235,358 +235,367 @@ msgid "new session profile" msgstr "" #. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:145 -msgid "Profile " -msgstr "" - #: ../pyhoca/wxgui/profilemanager.py:146 -msgid "Session" +msgid "Session Title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:147 -msgid "Server" +msgid "Session Window" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:148 -msgid "Connection Link Speed" +msgid "Session Startup" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:149 -msgid "Compression" +msgid "Server" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:150 -msgid "Display" +msgid "Connection Link Speed" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:151 -msgid "Keyboard" +msgid "Compression" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:152 -msgid "Sound" +msgid "Display" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:153 -msgid "Printing" +msgid "Keyboard" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:154 -msgid "Folder Exports" +msgid "Sound" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:155 +msgid "Printing" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:156 +msgid "Folder Exports" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:157 msgid "File Import" msgstr "" #. ## -#. ## widgets for the SESSION tab +#. ## widgets for the PROFILE tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:160 +#: ../pyhoca/wxgui/profilemanager.py:162 msgid "Name" msgstr "" -#. _share_location = os.path.split(_icons_location)[0] -#. if 'icon' in self.profile_config: -#. path_to_icon = self.profile_config['icon'] -#. path_to_icon = path_to_icon.lstrip(':') -#. path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) -#. if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: -#. path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) -#. self.IconPath = path_to_icon -#. self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') -#. self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) -#: ../pyhoca/wxgui/profilemanager.py:172 +#: ../pyhoca/wxgui/profilemanager.py:164 msgid "Set session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:173 +#: ../pyhoca/wxgui/profilemanager.py:165 msgid "Use a default session window title" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:174 +#: ../pyhoca/wxgui/profilemanager.py:166 msgid "Custom session window title" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:176 +msgid "Window Icon" +msgstr "" + +#. ## +#. ## widgets for the SESSION tab +#. ## +#: ../pyhoca/wxgui/profilemanager.py:182 msgid "Type" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:178 +#: ../pyhoca/wxgui/profilemanager.py:184 msgid "Application" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:182 -msgid "RDP settings" +#: ../pyhoca/wxgui/profilemanager.py:188 +msgid "XDMCP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:183 +#: ../pyhoca/wxgui/profilemanager.py:190 msgid "RDP server" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:185 +#: ../pyhoca/wxgui/profilemanager.py:192 msgid "RDP options" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:187 -msgid "XDMCP server" -msgstr "" - #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:193 ../pyhoca/wxgui/profilemanager.py:203 +#: ../pyhoca/wxgui/profilemanager.py:198 ../pyhoca/wxgui/profilemanager.py:208 msgid "User" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:195 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Host" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:197 +#: ../pyhoca/wxgui/profilemanager.py:202 msgid "Port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:199 +#: ../pyhoca/wxgui/profilemanager.py:204 msgid "RSA/DSA private key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:202 +#: ../pyhoca/wxgui/profilemanager.py:207 msgid "Server behind SSH proxy" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:205 +#: ../pyhoca/wxgui/profilemanager.py:210 msgid "Key file" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:208 +#: ../pyhoca/wxgui/profilemanager.py:213 msgid "Host[:Port]" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:210 +#: ../pyhoca/wxgui/profilemanager.py:215 msgid "SSH Proxy Tunnel" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:218 +#: ../pyhoca/wxgui/profilemanager.py:223 msgid "Modem" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:219 +#: ../pyhoca/wxgui/profilemanager.py:224 msgid "ISDN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:220 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "ADSL" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:221 +#: ../pyhoca/wxgui/profilemanager.py:226 msgid "WAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:222 +#: ../pyhoca/wxgui/profilemanager.py:227 msgid "LAN" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:224 +#: ../pyhoca/wxgui/profilemanager.py:229 msgid "Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:226 +#: ../pyhoca/wxgui/profilemanager.py:231 msgid "Image quality" msgstr "" #. ## #. ## wigdets for the SETTINGS tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:232 +#: ../pyhoca/wxgui/profilemanager.py:237 msgid "Fullscreen" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:233 +#: ../pyhoca/wxgui/profilemanager.py:238 msgid "Custom Size" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:238 +#: ../pyhoca/wxgui/profilemanager.py:243 msgid "Set display DPI" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:240 +#: ../pyhoca/wxgui/profilemanager.py:245 msgid "Keep current keyboard settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:241 +#: ../pyhoca/wxgui/profilemanager.py:246 msgid "Keyboard layout" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:243 +#: ../pyhoca/wxgui/profilemanager.py:248 msgid "Keyboard model" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:245 +#: ../pyhoca/wxgui/profilemanager.py:250 msgid "Enable sound support" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:246 +#: ../pyhoca/wxgui/profilemanager.py:251 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:250 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Arts (not supported)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:253 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "esd" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:254 +#: ../pyhoca/wxgui/profilemanager.py:259 msgid "Use default sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 +#: ../pyhoca/wxgui/profilemanager.py:260 msgid "Custom sound port" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:257 +#: ../pyhoca/wxgui/profilemanager.py:262 msgid "Client Side printing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:259 +#: ../pyhoca/wxgui/profilemanager.py:264 msgid "Use local folder sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:260 +#: ../pyhoca/wxgui/profilemanager.py:265 msgid "Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:263 ../pyhoca/wxgui/profilemanager.py:282 +#: ../pyhoca/wxgui/profilemanager.py:268 ../pyhoca/wxgui/profilemanager.py:287 msgid "Add" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:265 +#: ../pyhoca/wxgui/profilemanager.py:270 msgid "Local Path" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:266 +#: ../pyhoca/wxgui/profilemanager.py:271 msgid "Connect Method" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:267 +#: ../pyhoca/wxgui/profilemanager.py:272 msgid "Delete" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:269 +#: ../pyhoca/wxgui/profilemanager.py:274 msgid "Convert between client and server encodings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:270 +#: ../pyhoca/wxgui/profilemanager.py:275 msgid "Client encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:272 +#: ../pyhoca/wxgui/profilemanager.py:277 msgid "Server encoding" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:275 +#: ../pyhoca/wxgui/profilemanager.py:280 msgid "Use file MIME box for local file import" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:276 +#: ../pyhoca/wxgui/profilemanager.py:281 msgid "Extensions" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:278 +#: ../pyhoca/wxgui/profilemanager.py:283 msgid "Action" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:283 +#: ../pyhoca/wxgui/profilemanager.py:288 msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:290 msgid "Save" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:286 +#: ../pyhoca/wxgui/profilemanager.py:291 msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:329 ../pyhoca/wxgui/profilemanager.py:967 -#: ../pyhoca/wxgui/profilemanager.py:1476 +#: ../pyhoca/wxgui/profilemanager.py:334 ../pyhoca/wxgui/profilemanager.py:982 +#: ../pyhoca/wxgui/profilemanager.py:1489 msgid "automatically" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:331 ../pyhoca/wxgui/profilemanager.py:969 +#: ../pyhoca/wxgui/profilemanager.py:336 ../pyhoca/wxgui/profilemanager.py:984 msgid "manually" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:336 +#: ../pyhoca/wxgui/profilemanager.py:341 msgid "PyHoca-GUI Profile Manager - new profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:338 +#: ../pyhoca/wxgui/profilemanager.py:343 #, python-format msgid "PyHoca-GUI Profile Manager - %s (connected)" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:340 +#: ../pyhoca/wxgui/profilemanager.py:345 #, python-format msgid "PyHoca-GUI Profile Manager - %s" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:695 -msgid "Session Profile" +#: ../pyhoca/wxgui/profilemanager.py:709 +msgid "Profile" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:710 +msgid "Session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:696 +#: ../pyhoca/wxgui/profilemanager.py:711 msgid "Connection" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:697 +#: ../pyhoca/wxgui/profilemanager.py:712 msgid "Settings" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:698 +#: ../pyhoca/wxgui/profilemanager.py:713 msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1287 +#: ../pyhoca/wxgui/profilemanager.py:1163 +msgid "Icon Files (*.png)|*.png|All files (*.*)|*" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:1166 +msgid "Choose an icon for this session profile" +msgstr "" + +#: ../pyhoca/wxgui/profilemanager.py:1300 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1289 -#: ../pyhoca/wxgui/profilemanager.py:1304 +#: ../pyhoca/wxgui/profilemanager.py:1302 +#: ../pyhoca/wxgui/profilemanager.py:1317 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1456 +#: ../pyhoca/wxgui/profilemanager.py:1469 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1520 -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 -#: ../pyhoca/wxgui/profilemanager.py:1531 -#: ../pyhoca/wxgui/profilemanager.py:1541 ../pyhoca/wxgui/menus_taskbar.py:92 +#: ../pyhoca/wxgui/profilemanager.py:1533 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 +#: ../pyhoca/wxgui/profilemanager.py:1544 +#: ../pyhoca/wxgui/profilemanager.py:1554 ../pyhoca/wxgui/menus_taskbar.py:92 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1520 +#: ../pyhoca/wxgui/profilemanager.py:1533 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1523 -#: ../pyhoca/wxgui/profilemanager.py:1526 +#: ../pyhoca/wxgui/profilemanager.py:1536 +#: ../pyhoca/wxgui/profilemanager.py:1539 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1531 +#: ../pyhoca/wxgui/profilemanager.py:1544 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1541 +#: ../pyhoca/wxgui/profilemanager.py:1554 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -594,21 +603,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1561 +#: ../pyhoca/wxgui/profilemanager.py:1574 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1562 +#: ../pyhoca/wxgui/profilemanager.py:1575 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1566 +#: ../pyhoca/wxgui/profilemanager.py:1579 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1567 +#: ../pyhoca/wxgui/profilemanager.py:1580 msgid "Changes to profile have been saved." msgstr "" diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index c876065..0172b7d 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -136,14 +136,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak = copy.deepcopy(self.profile_config) self.X2goTabs = wx.Notebook(self, -1, style=0) + 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_Settings = wx.Panel(self.X2goTabs, -1) self.tab_SharedFilesAndFolders = wx.Panel(self.X2goTabs, -1) # boxes for all tabs - self.staticbox_Profile = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Profile ')) - self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Session')) + self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title')) + self.staticbox_Window = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Window')) + 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_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Connection Link Speed")) self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Compression")) @@ -155,37 +157,40 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_FileMIMEbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import")) ### + ### widgets for the PROFILE tab + ### + self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+":") + self.ProfileName = wx.TextCtrl(self.tab_Profile, -1, "") + self.SetSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Set session window title")) + self.UseDefaultSessionWindowTitle = wx.CheckBox(self.tab_Profile, -1, _(u"Use a default session window title")) + self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Profile, -1, _(u"Custom session window title") + ":") + self.CustomSessionWindowTitle = wx.TextCtrl(self.tab_Profile, -1, "") + _share_location = os.path.split(_icons_location)[0] + if 'icon' in self.profile_config: + path_to_icon = self.profile_config['icon'] + path_to_icon = path_to_icon.lstrip(':') + path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) + if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: + path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) + self.IconPath = path_to_icon + self.IconButtonLabel = wx.StaticText(self.tab_Profile, -1, _(u"Window Icon")+':') + self.IconButton = wx.BitmapButton(self.tab_Profile, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(128,128)) + + ### ### widgets for the SESSION tab ### - self.ProfileNameLabel = wx.StaticText(self.tab_Session, -1, _(u"Name")+":") - self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "") - #_share_location = os.path.split(_icons_location)[0] - #if 'icon' in self.profile_config: - # path_to_icon = self.profile_config['icon'] - # path_to_icon = path_to_icon.lstrip(':') - # path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon)) - #if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config: - # path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location) - #self.IconPath = path_to_icon - #self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':') - #self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY), size=(48,48)) - self.SetSessionWindowTitle = wx.CheckBox(self.tab_Session, -1, _(u"Set session window title")) - self.UseDefaultSessionWindowTitle = wx.CheckBox(self.tab_Session, -1, _(u"Use a default session window title")) - self.CustomSessionWindowTitleLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom session window title") + ":") - self.CustomSessionWindowTitle = wx.TextCtrl(self.tab_Session, -1, "") self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':') self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':') self.Application = wx.ComboBox(self.tab_Session, -1, choices=self.applicationChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) self.CommandLabel = wx.StaticText(self.tab_Session, -1, _(u"Custom command")+':') - self.Command = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(200,20)) - self.RDPSettingsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP settings")+':') + self.Command = wx.TextCtrl(self.tab_Session, -1, "", ) + self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+':') + self.XDMCPServer = wx.TextCtrl(self.tab_Session, -1, "", ) self.RDPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP server")+':') - self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) + self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", ) self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+':') - self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) - self.XDMCPServerLabel = wx.StaticText(self.tab_Session, -1, _(u"XDMCP server")+':') - self.XDMCPServer = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(160,20)) + self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", ) ### ### widgets for the CONNECTION tab @@ -291,7 +296,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.__do_layout() self.__update_fields() - #self.Bind(wx.EVT_BUTTON, self.OnIconChange, self.IconButton) + self.Bind(wx.EVT_BUTTON, self.OnIconChange, self.IconButton) self.Bind(wx.EVT_COMBOBOX, self.OnSessionTypeSelected, self.SessionType) self.Bind(wx.EVT_CHECKBOX, self.OnUseDefaultSessionWindowTitle, self.UseDefaultSessionWindowTitle) self.Bind(wx.EVT_CHECKBOX, self.OnSetSessionWindowTitle, self.SetSessionWindowTitle) @@ -347,9 +352,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseDefaultSessionWindowTitle.SetMinSize((-1, _textfield_height)) self.CustomSessionWindowTitleLabel.SetMinSize((160, 16)) self.CustomSessionWindowTitle.SetMinSize((320, _textfield_height)) - #self.IconButton.SetSize(self.IconButton.GetBestSize()) + self.IconButtonLabel.SetMinSize((168, 16)) + self.IconButton.SetSize(self.IconButton.GetBestSize()) + self.SessionTypeLabel.SetMinSize((120, 16)) - self.SessionType.SetMinSize((-1, _textfield_height)) + self.SessionType.SetMinSize((320, _textfield_height)) self.SessionType.SetSelection(5) self.ApplicationLabel.SetMinSize((120, 16)) self.Application.SetMinSize((-1, _textfield_height)) @@ -357,16 +364,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Command.SetMinSize((-1, _textfield_height)) self.XDMCPServerLabel.SetMinSize((120, 16)) self.XDMCPServer.SetMinSize((-1, _textfield_height)) - self.RDPSettingsLabel.SetMinSize((120, 16)) self.RDPServerLabel.SetMinSize((180, 16)) - self.RDPServer.SetMinSize((180, _textfield_height)) - self.RDPOptionsLabel.SetMinSize((120, 16)) - self.RDPOptions.SetMinSize((120, _textfield_height)) + self.RDPServer.SetMinSize((-1, _textfield_height)) + self.RDPOptionsLabel.SetMinSize((180, 16)) + self.RDPOptions.SetMinSize((-1, _textfield_height)) - self.HostLabel.SetMinSize((110, 16)) - self.Host.SetMinSize((180, _textfield_height)) self.UserNameLabel.SetMinSize((110, 16)) - self.UserName.SetMinSize((180, _textfield_height)) + self.UserName.SetMinSize((220, _textfield_height)) + self.HostLabel.SetMinSize((110, 16)) + self.Host.SetMinSize((220, _textfield_height)) self.SSHPortLabel.SetMinSize((110, 16)) self.SSHPort.SetMinSize((65, _textfield_height)) self.SSHKeyFileLabel.SetMinSize((-1, 16)) @@ -428,271 +434,280 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def __do_layout(self): - # SESSION TAB + # PROFILE TAB sizer_1 = wx.BoxSizer(wx.VERTICAL) sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL) sizer_1_1_1 = wx.FlexGridSizer(1, 2, 7, 9) sizer_1_1_1.Add(self.ProfileNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL) sizer_1_1_1.Add(self.ProfileName) - #sizer_1_1_1.Add(self.IconButtonLabel, flag=wx.TOP) - #sizer_1_1_1.Add(self.IconButton) - sizer_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_1_2.Add(self.SetSessionWindowTitle) - sizer_1_1_2.Add((32,0)) - sizer_1_1_2.Add(self.UseDefaultSessionWindowTitle) - sizer_1_1_3 = wx.FlexGridSizer(1, 2, 7, 9) - sizer_1_1_3.Add(self.CustomSessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_1_1_3.Add(self.CustomSessionWindowTitle) - sizer_1_1.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_1_1.Add(sizer_1_1_2, flag=wx.EXPAND|wx.ALL, border=7) - sizer_1_1.Add(sizer_1_1_3, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL) - sizer_1_2_1 = wx.GridBagSizer(hgap=3,vgap=6) - sizer_1_2_1.Add(self.SessionTypeLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_1_2_1.Add(self.SessionType, pos=(0,1), span=(1,2), flag=wx.EXPAND, ) - sizer_1_2_1.Add(self.ApplicationLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_1_2_1.Add(self.Application, pos=(1,1), span=(1,2), flag=wx.EXPAND, ) - sizer_1_2_1.Add(self.CommandLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_1_2_1.Add(self.Command, pos=(2, 1), span=(1,2), flag=wx.EXPAND, ) - sizer_1_2_1.Add(self.XDMCPServerLabel, (3,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_1_2_1.Add(self.XDMCPServer, pos=(3,1), span=(1,2), flag=wx.EXPAND, ) - sizer_1_2_1.Add(self.RDPServerLabel, pos=(4,1), flag=wx.ALIGN_BOTTOM, ) - sizer_1_2_1.Add(self.RDPOptionsLabel, pos=(4,2), flag=wx.ALIGN_BOTTOM, ) - sizer_1_2_1.Add(self.RDPSettingsLabel, pos=(5,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_1_2_1.Add(self.RDPServer, pos=(5, 1), ) - sizer_1_2_1.Add(self.RDPOptions, pos=(5,2), ) + + sizer_1_2 = wx.StaticBoxSizer(self.staticbox_Window, wx.VERTICAL) + sizer_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_1_2_1.Add(self.SetSessionWindowTitle) + sizer_1_2_1.Add((32,0)) + sizer_1_2_1.Add(self.UseDefaultSessionWindowTitle) + sizer_1_2_2 = wx.FlexGridSizer(1, 2, 7, 9) + sizer_1_2_2.Add(self.CustomSessionWindowTitleLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_1_2_2.Add(self.CustomSessionWindowTitle) + sizer_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_1_2_3.Add(self.IconButtonLabel, flag=wx.TOP) + sizer_1_2_3.Add(self.IconButton) + sizer_1_2.Add(sizer_1_2_1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_1_2.Add(sizer_1_2_2, flag=wx.EXPAND|wx.ALL, border=7) + sizer_1_2.Add(sizer_1_2_3, flag=wx.EXPAND|wx.ALL, border=7) sizer_1.Add(sizer_1_1, flag=wx.EXPAND|wx.ALL, border=5) sizer_1.Add(sizer_1_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_Session.SetSizerAndFit(sizer_1) - self.tab_Session.Layout() + self.tab_Profile.SetSizerAndFit(sizer_1) + self.tab_Profile.Layout() - ## CONNECTION TAB + # SESSION TAB sizer_2 = wx.BoxSizer(wx.VERTICAL) - sizer_2_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL) - sizer_2_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_1_1.Add(self.UserNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_1.Add(self.UserName) - sizer_2_1_1_1.Add((0,32)) - sizer_2_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_1_2.Add(self.HostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_2.Add(self.Host) - sizer_2_1_1_2.Add((0,32)) - sizer_2_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_1_3.Add(self.SSHPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_3.Add(self.SSHPort) - sizer_2_1_1_3.Add((16,0)) - sizer_2_1_1_3.Add(self.SSHKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_3.Add((8,0)) - sizer_2_1_1_3.Add(self.SSHKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_3.Add(self.SSHKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_1_3.Add((0,32)) - sizer_2_1_1.Add(sizer_2_1_1_1, flag=wx.EXPAND) - sizer_2_1_1.Add(sizer_2_1_1_2, flag=wx.EXPAND) - sizer_2_1_1.Add(sizer_2_1_1_3, flag=wx.EXPAND) - - sizer_2_1_2 = wx.BoxSizer(wx.VERTICAL) - sizer_2_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_2_1.Add(self.UseSSHProxy, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_2_2.Add(self.SSHProxyUserLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2.Add(self.SSHProxyUser, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2.Add((16,0)) - sizer_2_1_2_2.Add(self.SSHProxyKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2.Add((8,0)) - sizer_2_1_2_2.Add(self.SSHProxyKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2.Add(self.SSHProxyKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_2.Add((0,32)) - sizer_2_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_2_3.Add(self.SSHProxyHostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_3.Add(self.SSHProxyHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_3.Add((0,32)) - sizer_2_1_2_4 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_1_2_4.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_4.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_4.Add((4, 0)) - sizer_2_1_2_4.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_4.Add((8, 0)) - sizer_2_1_2_4.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_1_2_4.Add((8, 0)) - sizer_2_1_2_4.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_4.Add((4, 0)) - sizer_2_1_2_4.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_1_2_4.Add((0,32)) - sizer_2_1_2.Add(sizer_2_1_2_1, flag=wx.EXPAND) - sizer_2_1_2.Add(sizer_2_1_2_2, flag=wx.EXPAND) - sizer_2_1_2.Add(sizer_2_1_2_3, flag=wx.EXPAND) - sizer_2_1_2.Add(sizer_2_1_2_4, flag=wx.EXPAND) + sizer_2_1 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL) + sizer_2_1_1 = wx.GridBagSizer(hgap=2,vgap=6) + sizer_2_1_1.Add(self.SessionTypeLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.SessionType, pos=(0,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.ApplicationLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.Application, pos=(1,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.CommandLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.Command, pos=(2, 1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.XDMCPServerLabel, (3,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.XDMCPServer, pos=(3,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.RDPServerLabel, pos=(4,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.RDPServer, pos=(4,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.RDPOptionsLabel, pos=(5,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.RDPOptions, pos=(5,1), flag=wx.EXPAND, ) sizer_2_1.Add(sizer_2_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_2_1.Add(sizer_2_1_2, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_2_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) - sizer_2_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2_2_1_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2_2_1_1.Add(self.LinkSpeed) - sizer_2_2_1_2 = wx.GridSizer(1,5,0,0) - sizer_2_2_1_2.SetMinSize((454/5*6 - 30, -1)) - sizer_2_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1.Add(sizer_2_2_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2_1.Add(sizer_2_2_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) - sizer_2_2.Add(sizer_2_2_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_2_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) - sizer_2_3_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_3_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_3_1_1.Add(self.Compression) - sizer_2_3_1_1.Add((0,32)) - sizer_2_3_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_2_3_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_2_3_1_2.Add(self.ImageQuality) - sizer_2_3_1.Add(sizer_2_3_1_1, flag=wx.EXPAND) - sizer_2_3_1.Add(sizer_2_3_1_2, flag=wx.EXPAND) - sizer_2_3.Add(sizer_2_3_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_2.Add(sizer_2_1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_2.Add(sizer_2_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) - sizer_2.Add(sizer_2_3, flag=wx.EXPAND|wx.ALL, border=5) - self.tab_Connection.SetSizerAndFit(sizer_2) - self.tab_Connection.Layout() + sizer_2.Add(sizer_2_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_Session.SetSizerAndFit(sizer_2) + self.tab_Session.Layout() - ## SETTINGS TAB + ## CONNECTION TAB sizer_3 = wx.BoxSizer(wx.VERTICAL) - sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL) + sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL) sizer_3_1_1 = wx.BoxSizer(wx.VERTICAL) sizer_3_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_1.Add((16, 0)) - sizer_3_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_1.Add((8,0)) - sizer_3_1_1_1.Add(self.ScreenWidth) - sizer_3_1_1_1.Add((8,0)) - sizer_3_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_1.Add((8,0)) - sizer_3_1_1_1.Add(self.ScreenHeight) + sizer_3_1_1_1.Add(self.UserNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_1.Add(self.UserName) + sizer_3_1_1_1.Add((0,32)) sizer_3_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_1_2.Add((-1,48)) - sizer_3_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1_2.Add((8,0)) - sizer_3_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_1_1.Add(sizer_3_1_1_1) - sizer_3_1_1.Add(sizer_3_1_1_2) + sizer_3_1_1_2.Add(self.HostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_2.Add(self.Host) + sizer_3_1_1_2.Add((0,32)) + sizer_3_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_1_1_3.Add(self.SSHPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_3.Add(self.SSHPort) + sizer_3_1_1_3.Add((16,0)) + sizer_3_1_1_3.Add(self.SSHKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_3.Add((8,0)) + sizer_3_1_1_3.Add(self.SSHKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_3.Add(self.SSHKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_1_3.Add((0,32)) + sizer_3_1_1.Add(sizer_3_1_1_1, flag=wx.EXPAND) + sizer_3_1_1.Add(sizer_3_1_1_2, flag=wx.EXPAND) + sizer_3_1_1.Add(sizer_3_1_1_3, flag=wx.EXPAND) + + sizer_3_1_2 = wx.BoxSizer(wx.VERTICAL) + sizer_3_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_1_2_1.Add(self.UseSSHProxy, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_1_2_2.Add(self.SSHProxyUserLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2.Add(self.SSHProxyUser, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2.Add((16,0)) + sizer_3_1_2_2.Add(self.SSHProxyKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2.Add((8,0)) + sizer_3_1_2_2.Add(self.SSHProxyKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2.Add(self.SSHProxyKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_2.Add((0,32)) + sizer_3_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_1_2_3.Add(self.SSHProxyHostLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_3.Add(self.SSHProxyHost, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_3.Add((0,32)) + sizer_3_1_2_4 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_1_2_4.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_4.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_4.Add((4, 0)) + sizer_3_1_2_4.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_4.Add((8, 0)) + sizer_3_1_2_4.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_1_2_4.Add((8, 0)) + sizer_3_1_2_4.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_4.Add((4, 0)) + sizer_3_1_2_4.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_1_2_4.Add((0,32)) + sizer_3_1_2.Add(sizer_3_1_2_1, flag=wx.EXPAND) + sizer_3_1_2.Add(sizer_3_1_2_2, flag=wx.EXPAND) + sizer_3_1_2.Add(sizer_3_1_2_3, flag=wx.EXPAND) + sizer_3_1_2.Add(sizer_3_1_2_4, flag=wx.EXPAND) sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7) + sizer_3_1.Add(sizer_3_1_2, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL) + sizer_3_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL) sizer_3_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_2_1_1.Add(self.CurrentKeyBoard, flag=wx.ALIGN_TOP) - sizer_3_2_1_1.Add((0, 32)) - sizer_3_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_2_1_2.Add((32,0)) - sizer_3_2_1_2_1 = wx.BoxSizer(wx.VERTICAL) - sizer_3_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND) - sizer_3_2_1_2_2 = wx.BoxSizer(wx.VERTICAL) - sizer_3_2_1_2_2.Add(self.KeyboardModelLabel) - sizer_3_2_1_2_2.Add(self.KeyboardModel, flag=wx.EXPAND) - sizer_3_2_1_2.Add(sizer_3_2_1_2_1) - sizer_3_2_1_2.Add((32,0)) - sizer_3_2_1_2.Add(sizer_3_2_1_2_2) - sizer_3_2_1.Add(sizer_3_2_1_1) - sizer_3_2_1.Add(sizer_3_2_1_2) + sizer_3_2_1_1 = wx.BoxSizer(wx.VERTICAL) + sizer_3_2_1_1.Add(self.LinkSpeed) + sizer_3_2_1_2 = wx.GridSizer(1,5,0,0) + sizer_3_2_1_2.SetMinSize((454/5*6 - 30, -1)) + sizer_3_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1.Add(sizer_3_2_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL) + sizer_3_2_1.Add(sizer_3_2_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL) sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_3_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL) - sizer_3_3_1 = wx.GridBagSizer(vgap=4, hgap=2) - sizer_3_3_1.Add(self.EnableSound, pos=(0,0), span=(1,2), border=16, ) - sizer_3_3_1.Add(self.PulseAudio, pos=(1,0), flag=wx.RIGHT, border=16, ) - sizer_3_3_1.Add(self.Arts, pos=(2,0), flag=wx.RIGHT, border=16, ) - sizer_3_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, ) - sizer_3_3_1.Add(self.DefaultSoundPort, pos=(1,1), ) + sizer_3_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL) + sizer_3_3_1 = wx.BoxSizer(wx.VERTICAL) sizer_3_3_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_3_1_1.Add((8, -1)) - sizer_3_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_3_3_1.Add(sizer_3_3_1_1, pos=(2,1), ) - sizer_3_3.Add(sizer_3_3_1, flag=wx.EXPAND|wx.ALL, border=7) - - sizer_3_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL) - sizer_3_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7) + sizer_3_3_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_3_1_1.Add(self.Compression) + sizer_3_3_1_1.Add((0,32)) + sizer_3_3_1_2 = wx.BoxSizer(wx.HORIZONTAL) + sizer_3_3_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_3_3_1_2.Add(self.ImageQuality) + sizer_3_3_1.Add(sizer_3_3_1_1, flag=wx.EXPAND) + sizer_3_3_1.Add(sizer_3_3_1_2, flag=wx.EXPAND) + sizer_3_3.Add(sizer_3_3_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, proportion=1, 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_Settings.SetSizerAndFit(sizer_3) - self.tab_Settings.Layout() + sizer_3.Add(sizer_3_3, flag=wx.EXPAND|wx.ALL, border=5) + self.tab_Connection.SetSizerAndFit(sizer_3) + self.tab_Connection.Layout() - # FOLDERSHARING TAB + ## SETTINGS TAB sizer_4 = wx.BoxSizer(wx.VERTICAL) - sizer_4_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL) + sizer_4_1 = wx.StaticBoxSizer(self.staticbox_Display, 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.UseLocalFolderSharing) + 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.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_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT|wx.RIGHT, border=5) - sizer_4_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_1_2.Add(sizer_4_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_4_1_1_2.Add(sizer_4_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) - sizer_4_1_1_2.Add(sizer_4_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) - sizer_4_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND) - sizer_4_1_1.Add(sizer_4_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12) - sizer_4_1_1.Add(sizer_4_1_1_2, flag=wx.EXPAND) - sizer_4_1_1.Add(sizer_4_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5) - sizer_4_1_2 = wx.BoxSizer(wx.VERTICAL) - sizer_4_1_2_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5) - sizer_4_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_2_2.Add((8,0)) - sizer_4_1_2_2.Add(self.ClientEncoding) - sizer_4_1_2_2.Add((16,0)) - sizer_4_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_1_2_2.Add((8,0)) - sizer_4_1_2_2.Add(self.ServerEncoding) - sizer_4_1_2.Add(sizer_4_1_2_1, flag=wx.EXPAND) - sizer_4_1_2.Add(sizer_4_1_2_2, flag=wx.EXPAND) + 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.Add(sizer_4_1_1, flag=wx.EXPAND|wx.ALL, border=7) - sizer_4_1.Add(sizer_4_1_2, flag=wx.EXPAND|wx.ALL, border=7) - sizer_4_2 = wx.StaticBoxSizer(self.staticbox_FileMIMEbox, wx.VERTICAL) + sizer_4_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL) sizer_4_2_1 = wx.BoxSizer(wx.VERTICAL) sizer_4_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) + sizer_4_2_1_1.Add(self.CurrentKeyBoard, flag=wx.ALIGN_TOP) + sizer_4_2_1_1.Add((0, 32)) sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_4_2_1_2.Add(self.FileMIMEboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_2_1_2.Add((8,0)) - sizer_4_2_1_2.Add(self.FileMIMEboxExtensions) - sizer_4_2_1_2.Add((16,0)) - sizer_4_2_1_2.Add(self.FileMIMEboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_4_2_1_2.Add((8,0)) - sizer_4_2_1_2.Add(self.FileMIMEboxAction) - 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_1_2.Add((32,0)) + sizer_4_2_1_2_1 = wx.BoxSizer(wx.VERTICAL) + sizer_4_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_4_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND) + sizer_4_2_1_2_2 = wx.BoxSizer(wx.VERTICAL) + sizer_4_2_1_2_2.Add(self.KeyboardModelLabel) + sizer_4_2_1_2_2.Add(self.KeyboardModel, flag=wx.EXPAND) + sizer_4_2_1_2.Add(sizer_4_2_1_2_1) + sizer_4_2_1_2.Add((32,0)) + sizer_4_2_1_2.Add(sizer_4_2_1_2_2) + 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.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) - self.tab_SharedFilesAndFolders.SetSizerAndFit(sizer_4) + 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() + + # FOLDERSHARING TAB + sizer_5 = wx.BoxSizer(wx.VERTICAL) + sizer_5_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, 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_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|wx.RIGHT, border=5) + sizer_5_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL) + 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) + 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.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_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.BoxSizer(wx.HORIZONTAL) + sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_2_1_2.Add((8,0)) + sizer_5_2_1_2.Add(self.FileMIMEboxExtensions) + sizer_5_2_1_2.Add((16,0)) + sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_2_1_2.Add((8,0)) + sizer_5_2_1_2.Add(self.FileMIMEboxAction) + 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.Add(sizer_5_2_1, 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() - self.X2goTabs.AddPage(self.tab_Session, _(u"Session Profile")) + 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_Settings, _(u"Settings")) self.X2goTabs.AddPage(self.tab_SharedFilesAndFolders, _(u"Sharing")) @@ -711,20 +726,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog): MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT) self.SetSizerAndFit(MainSizer) - max1_x, max1_y = self.tab_Session.GetBestSize() - max2_x, max2_y = self.tab_Connection.GetBestSize() - max3_x, max3_y = self.tab_Settings.GetBestSize() - max4_x, max4_y = self.tab_SharedFilesAndFolders.GetBestSize() + 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() + + #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize()) - self.SetSize(self.GetBestSize()) - self.SetSize((max(max1_x, max2_x, max3_x, max4_x) * 1.05, max(max1_y, max2_y, max3_y, max4_y) + 64)) + 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) + 64)) self.SetAutoLayout(True) self.Layout() self.CentreOnScreen() self.Show(True) # derive ListCtrl widths from sizer information - _sizer_width = sizer_4_1_1_3.GetSize().GetWidth() + _sizer_width = sizer_5_1_1_3.GetSize().GetWidth() self.SharedFoldersList.SetColumnWidth(0, abs(_sizer_width*.7)) self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3)) @@ -836,13 +853,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.XDMCPServer.Enable(True) if _command in ('RDP', 'DirectRDP'): - self.RDPSettingsLabel.Enable(True) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) self.RDPOptionsLabel.Enable(True) self.RDPOptions.Enable(True) else: - self.RDPSettingsLabel.Enable(False) self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) self.RDPOptionsLabel.Enable(False) @@ -1000,8 +1015,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.staticbox_Profile.Enable(False) self.ProfileNameLabel.Enable(False) self.ProfileName.Enable(False) - #self.IconButton.Enable(False) - #self.IconButtonLabel.Enable(False) + self.IconButton.Enable(False) + self.IconButtonLabel.Enable(False) self.HostLabel.Enable(False) self.Host.Enable(False) self.UserNameLabel.Enable(False) @@ -1034,7 +1049,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sessiontitle'] = '' else: self.profile_config['sessiontitle'] = self.CustomSessionWindowTitle.GetValue() - #self.profile_config['icon'] = self.IconPath + self.profile_config['icon'] = self.IconPath self.profile_config['user'] = self.UserName.GetValue() self.profile_config['key'] = self.SSHKeyFile.GetValue() if self.UseSSHProxy.GetValue(): @@ -1140,25 +1155,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _mimebox_action = 'OPEN' self.profile_config['mimeboxaction'] = _mimebox_action - #def OnIconChange(self, event): - # _share_location = os.path.split(_icons_location)[0] - # iconsdir = _icons_location - # if not os.path.exists(iconsdir): - # iconsdir = os.getcwd() - # wildcard = _(u"Icon Files (*.png)|*.png|" \ - # "All files (*.*)|*") - # dlg = wx.FileDialog( - # self, message=_(u"Choose an icon for this session profile"), defaultDir=iconsdir, - # defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) - # # Show the dialog and retrieve the user response. If it is the OK response, - # # process the data. - # if dlg.ShowModal() == wx.ID_OK: - # # This returns a Python list of files that were selected. - # path_to_icon = dlg.GetPath() - # self.IconButton.SetBitmapLabel(wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY)) - # rel_path = path_to_icon.replace('%s/' % _share_location, ':') - # rel_path = rel_path.replace( 'icons/PyHoca/128x128/pyhoca-session.png', 'icons/128x128/x2gosession.png') - # self.IconPath = rel_path + def OnIconChange(self, event): + _share_location = os.path.split(_icons_location)[0] + iconsdir = _icons_location + if not os.path.exists(iconsdir): + iconsdir = os.getcwd() + wildcard = _(u"Icon Files (*.png)|*.png|" \ + "All files (*.*)|*") + dlg = wx.FileDialog( + self, message=_(u"Choose an icon for this session profile"), defaultDir=iconsdir, + defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR ) + # Show the dialog and retrieve the user response. If it is the OK response, + # process the data. + if dlg.ShowModal() == wx.ID_OK: + # This returns a Python list of files that were selected. + path_to_icon = dlg.GetPath() + self.IconButton.SetBitmapLabel(wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY)) + rel_path = path_to_icon.replace('%s/' % _share_location, ':') + rel_path = rel_path.replace( 'icons/PyHoca/128x128/pyhoca-session.png', 'icons/128x128/x2gosession.png') + self.IconPath = rel_path def OnSetSessionWindowTitle(self, event): if self.SetSessionWindowTitle.GetValue(): @@ -1253,13 +1268,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.XDMCPServer.Enable(False) if _session_type in ('RDP', 'DirectRDP', ): - self.RDPSettingsLabel.Enable(True) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) self.RDPOptionsLabel.Enable(True) self.RDPOptions.Enable(True) else: - self.RDPSettingsLabel.Enable(False) self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) self.RDPOptionsLabel.Enable(False) 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)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-6-g54792fe
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 (commit) from 7f7cb5d874a857ab59bef7427734d8edfcca85bd (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 54792fe297c0965c5c5d3a5db0280d064e2d7fa2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-5-g7f7cb5d
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 7f7cb5d874a857ab59bef7427734d8edfcca85bd (commit) from eb5ef91b6b940eb001d8acb95f6413560570c1a7 (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 7f7cb5d874a857ab59bef7427734d8edfcca85bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Feb 7 16:39:58 2012 +0100 more simplification of the main Makefile ----------------------------------------------------------------------- Summary of changes: .../patches/001_add-main-makefile.full+lite.patch | 61 +++++++------------ 1 files changed, 23 insertions(+), 38 deletions(-) The diff of changes is: diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 9f4b8d1..7cd9321 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,50 +5,35 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,46 @@ +@@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +all: build + -+build: build-arch build-indep -+ -+clean: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+distclean: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+build-arch: -+ if test -d nx-X11; then \ -+ cd nxcomp && autoconf; cd ..; \ -+ cd nxcompext && autoconf; cd ..; \ -+ cd nxcompshad && autoconf; cd ..; \ -+ cd nx-X11 && make World && cd ..; \ ++build-lite: ++ cd nxcomp && autoconf && ./configure && $(MAKE) ++ cd nxproxy && autoconf && ./configure && $(MAKE) ++ ++build-full: ++# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... ++ cd nxcomp && autoconf && ./configure ++ cd nxcompext && autoconf ++ cd nxcompshad && autoconf ++ cd nx-X11 && $(MAKE) World ++ cd nxproxy && autoconf && ./configure && $(MAKE) ++ ++build: ++ if ! test -d nx-X11; then \ ++ $(MAKE) build-lite; \ + else \ -+ cd nxcomp && autoconf && ./configure && make; cd ..; \ ++ $(MAKE) build-full; \ + fi -+ cd nxproxy && autoconf && ./configure && make; cd .. -+ -+build-indep: + -+install: ++%: + $(MAKE) -C nxcomp $@ + $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+uninstall: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nx-X11; then \ ++ $(MAKE) -C nxcompext $@; \ ++ $(MAKE) -C nxcompshad; \ ++ $(MAKE) -C nx-X11 $@; \ ++ fi hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-4-geb5ef91
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via eb5ef91b6b940eb001d8acb95f6413560570c1a7 (commit) from 00b266b82503e8155e7195180f287df0392fb770 (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 eb5ef91b6b940eb001d8acb95f6413560570c1a7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Feb 7 16:19:36 2012 +0100 simplify main Makefile a little... ----------------------------------------------------------------------- Summary of changes: .../patches/001_add-main-makefile.full+lite.patch | 26 ++++++++++---------- 1 files changed, 13 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 0adead1..9f4b8d1 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -13,42 +13,42 @@ Last-Update: 2011-12-31 +build: build-arch build-indep + +clean: ++ $(MAKE) -C nxcomp $@ ++ $(MAKE) -C nxproxy $@ + if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi + if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi + if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +distclean: ++ $(MAKE) -C nxcomp $@ ++ $(MAKE) -C nxproxy $@ + if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi + if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi + if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +build-arch: + if test -d nx-X11; then \ -+ if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \ -+ if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \ -+ if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \ ++ cd nxcomp && autoconf; cd ..; \ ++ cd nxcompext && autoconf; cd ..; \ ++ cd nxcompshad && autoconf; cd ..; \ + cd nx-X11 && make World && cd ..; \ + else \ -+ if test -d nxcomp; then cd nxcomp && autoconf && ./configure && make; cd ..; fi; \ ++ cd nxcomp && autoconf && ./configure && make; cd ..; \ + fi -+ if test -d nxproxy; then cd nxproxy && autoconf && ./configure && make; cd ..; fi ++ cd nxproxy && autoconf && ./configure && make; cd .. + +build-indep: + +install: ++ $(MAKE) -C nxcomp $@ ++ $(MAKE) -C nxproxy $@ + if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi + if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi + if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +uninstall: ++ $(MAKE) -C nxcomp $@ ++ $(MAKE) -C nxproxy $@ + if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi + if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi + if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-3-g00b266b
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 00b266b82503e8155e7195180f287df0392fb770 (commit) from f4ef2967b1495e5d9577a94610ee0be3e89ab870 (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 00b266b82503e8155e7195180f287df0392fb770 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Feb 7 16:10:34 2012 +0100 Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +- .../patches/001_add-main-makefile.full+lite.patch | 56 +++++++++++--------- 2 files changed, 32 insertions(+), 27 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c56632c..012c7bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low - * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories. + * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, + make build stanza work for nx-libs-full and nx-libs-lite. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 2d35e82..0adead1 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,42 @@ +@@ -0,0 +1,46 @@ +#!/usr/bin/make -f + +all: build @@ -13,38 +13,42 @@ Last-Update: 2011-12-31 +build: build-arch build-indep + +clean: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +distclean: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +build-arch: -+ cd nxcomp && autoconf && ./configure && make -+ -cd nxcompext && autoconf && ./configure && make -+ -cd nxcompshad && autoconf && ./configure && make -+ -cd nx-X11 && make World && ./configure && make -+ cd nxproxy && autoconf && ./configure && make ++ if test -d nx-X11; then \ ++ if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \ ++ if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \ ++ if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \ ++ cd nx-X11 && make World && cd ..; \ ++ else \ ++ if test -d nxcomp; then cd nxcomp && autoconf && ./configure && make; cd ..; fi; \ ++ fi ++ if test -d nxproxy; then cd nxproxy && autoconf && ./configure && make; cd ..; fi + +build-indep: + +install: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +uninstall: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-2-gf4ef296
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via f4ef2967b1495e5d9577a94610ee0be3e89ab870 (commit) from a751baaab83cc58245632e8fdb406e0b059810da (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 f4ef2967b1495e5d9577a94610ee0be3e89ab870 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Tue Feb 7 15:23:45 2012 +0100 Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- .../patches/001_add-main-makefile.full+lite.patch | 53 ++++++++++---------- 2 files changed, 27 insertions(+), 28 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb3a582..c56632c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low - * Continue development... + * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:48:19 +0100 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 533ce7e..2d35e82 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +all: build @@ -13,39 +13,38 @@ Last-Update: 2011-12-31 +build: build-arch build-indep + +clean: -+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true -+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true -+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true -+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true -+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true -+ ++ -make -C nx-X11 $@ ++ -make -C nxcomp $@ ++ -make -C nxcompext $@ ++ -make -C nxcompshad $@ ++ -make -C nxproxy $@ + +distclean: -+ test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true -+ test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true -+ test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true -+ test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true -+ test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true ++ -make -C nx-X11 $@ ++ -make -C nxcomp $@ ++ -make -C nxcompext $@ ++ -make -C nxcompshad $@ ++ -make -C nxproxy $@ + +build-arch: -+ test -d nxcomp && cd nxcomp && autoconf -+ test -d nxcompext && cd nxcompext && autoconf -+ test -d nxcompshad && cd nxcompshad && autoconf -+ test -d nx-X11 && cd nx-X11 && make World -+ test -d nxproxy && cd nxproxy && autoconf && ./configure && make ++ cd nxcomp && autoconf && ./configure && make ++ -cd nxcompext && autoconf && ./configure && make ++ -cd nxcompshad && autoconf && ./configure && make ++ -cd nx-X11 && make World && ./configure && make ++ cd nxproxy && autoconf && ./configure && make + +build-indep: + +install: -+ test -d nxcomp && cd nxcomp && make install -+ test -d nxcompext && cd nxcompext && make install -+ test -d nxcompshad && cd nxcompshad && make install -+ test -d nx-X11 && cd nx-X11 && make install -+ test -d nxproxy && cd nxproxy && make install ++ -make -C nx-X11 $@ ++ -make -C nxcomp $@ ++ -make -C nxcompext $@ ++ -make -C nxcompshad $@ ++ -make -C nxproxy $@ + +uninstall: -+ test -d nxcomp && cd nxcomp && make uninstall -+ test -d nxcompext && cd nxcompext && make uninstall -+ test -d nxcompshad && cd nxcompshad && make uninstall -+ test -d nx-X11 && cd nx-X11 && make uninstall -+ test -d nxproxy && cd nxproxy && make uninstall ++ -make -C nx-X11 $@ ++ -make -C nxcomp $@ ++ -make -C nxcompext $@ ++ -make -C nxcompshad $@ ++ -make -C nxproxy $@ hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.10-1-ga751baa
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via a751baaab83cc58245632e8fdb406e0b059810da (commit) from 419d505c907972b7823263a843e0de0a57b25b18 (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 a751baaab83cc58245632e8fdb406e0b059810da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

nx-libs.git - build-main (branch) updated: redist-client/3.5.0.10
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, build-main has been updated via 419d505c907972b7823263a843e0de0a57b25b18 (commit) via 28acb2ea138f974452c7001e750f15e28aff2d37 (commit) via 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (commit) via 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (commit) via e326dd760e115dcb48f6823462a737039453a63c (commit) via dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed (commit) from 220c985d366883f4021cc9d84550cc630022f016 (commit) Those revisions listed … [View More]above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 ++++ debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 ++++++++++++++++++ .../patches/008_nxcomp_sa_restorer.full+lite.patch | 46 ++++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 100 insertions(+), 0 deletions(-) create mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch create mode 100644 debian/patches/008_nxcomp_sa_restorer.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cf1715c..9b1a540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nx-libs (2:3.5.0.10-0) unstable; urgency=low + + * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against + libpng 1.5.x. + * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a + version found on etersoft.ru, fixes build on ia64 architecture. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 07 Feb 2012 13:43:50 +0100 + nx-libs (2:3.5.0.9-0) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch new file mode 100644 index 0000000..a75c59b --- /dev/null +++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch @@ -0,0 +1,43 @@ +Description: Fix building against libpng 1.5. + From the libpng homepage... + + The libpng 1.5.x series continues the evolution of the libpng API, + finally hiding the contents of the venerable and hoary png_struct and + png_info data structures inside private (i.e., non-installed) header + files. Instead of direct struct-access, applications should be using + the various png_get_xxx() and png_set_xxx() accessor functions, which + have existed for almost as long as libpng itself. (Apps that compiled + against libpng 1.4 without warnings about deprecated features should + happily compile against 1.5, too. +Forwarded: pending... +Author: Fedora packagers of NX +Last-Update: 2012-02-06 +--- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/debian/patches/008_nxcomp_sa_restorer.full+lite.patch b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch new file mode 100644 index 0000000..f1447cc --- /dev/null +++ b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch @@ -0,0 +1,46 @@ +Description: sa_restorer vs. memset + Use memset instead of setting sa_restorer to NULL. +Forwarded: pending +Author: Alexander Morozov +Last-Update: 2012-02-07 +--- a/nxcomp/Loop.cpp ++++ b/nxcomp/Loop.cpp +@@ -5884,20 +5884,9 @@ + + struct sigaction newAction; + +- newAction.sa_handler = HandleSignal; +- +- // +- // This field doesn't exist on most OSes except +- // Linux. We keep setting the field to NULL to +- // avoid side-effects in the case the field is +- // a value return. +- // ++ memset(&newAction, 0, sizeof(newAction)); + +- #if defined(__linux__) +- +- newAction.sa_restorer = NULL; +- +- #endif ++ newAction.sa_handler = HandleSignal; + + sigemptyset(&(newAction.sa_mask)); + +@@ -6509,13 +6498,9 @@ + + struct sigaction action; + +- action.sa_handler = HandleTimer; +- +- #if defined(__linux__) ++ memset(&action, 0, sizeof(action)); + +- action.sa_restorer = NULL; +- +- #endif ++ action.sa_handler = HandleTimer; + + sigemptyset(&action.sa_mask); + diff --git a/debian/patches/series b/debian/patches/series index d22f4b4..9133bf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,9 @@ 003_nxcompshad_gcc43.full.patch 004_nx-x11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch +006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch +008_nxcomp_sa_restorer.full+lite.patch 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)). [View Less]

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.9-6-g419d505
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 419d505c907972b7823263a843e0de0a57b25b18 (commit) from 28acb2ea138f974452c7001e750f15e28aff2d37 (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 419d505c907972b7823263a843e0de0a57b25b18 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.9-5-g28acb2e
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 28acb2ea138f974452c7001e750f15e28aff2d37 (commit) from 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (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 28acb2ea138f974452c7001e750f15e28aff2d37 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012