The branch, master has been updated via 76f5cc8bdb1b7a0dfe63a516df806d557320266a (commit) from 64830a5affee7b9b6a001c79c25b8d4b9d868866 (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 76f5cc8bdb1b7a0dfe63a516df806d557320266a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Oct 21 16:23:54 2012 +0200 Rename session type XFCE4 to XFCE (using an unversioned session type name). ----------------------------------------------------------------------- Summary of changes: README.ssh-agent | 4 ++-- debian/changelog | 1 + po/PyHoca-GUI.pot | 2 +- po/bg.po | 2 +- po/de.po | 6 +++--- po/en.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 2 +- po/nb_NO.po | 4 ++-- po/nl.po | 4 ++-- po/ru.po | 4 ++-- po/sv.po | 4 ++-- pyhoca/wxgui/profilemanager.py | 4 +++- 13 files changed, 24 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/README.ssh-agent b/README.ssh-agent index 5b0cf63..da120c7 100644 --- a/README.ssh-agent +++ b/README.ssh-agent @@ -95,7 +95,7 @@ With this little howto, you can test SSH agent authentication request forwarding machine serves a challenge/response request from SSH client programs within X2Go sessions. - Note: if you try the above with a GNOME desktop (XFCE4 probably as well) the + Note: if you try the above with a GNOME desktop (XFCE probably as well) the gnome-keyring will hijack the SSH agent functionality and ignore forwarded SSH agent connections. (This normally happens with the x2goserver-xsession bin:package installed.) @@ -105,6 +105,6 @@ With this little howto, you can test SSH agent authentication request forwarding $ gconftool-2 -s /apps/gnome-keyring/daemon-components/ssh false --type bool - After you have applied this gconf change, logout and re-start a new GNOME (or XFCE4) + After you have applied this gconf change, logout and re-start a new GNOME (or XFCE) session. Now SSH agent stuff is handled properly through ssh-agent and the ssh-agent should also be aware of SSH agent forwarding connections. diff --git a/debian/changelog b/debian/changelog index ded867b..da70aa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Implement SSH agent, automatic key discovery, and SSH agent authentication request forwarding in session profile manager. - Add SSH agent README. + - Rename session type XFCE4 to XFCE (using an unversioned session type name). * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 738907f..d856bb1 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -184,7 +184,7 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:89 diff --git a/po/bg.po b/po/bg.po index d9ff05b..6a8f84b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -188,7 +188,7 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:89 diff --git a/po/de.po b/po/de.po index 9820f7a..4e1dd2b 100644 --- a/po/de.po +++ b/po/de.po @@ -206,8 +206,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Umgebung (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" @@ -489,7 +489,7 @@ msgstr "DPI-Wert für Anzeige setzen" #: ../pyhoca/wxgui/profilemanager.py:299 msgid "Do not set (use server-side tools to configure the keyboard)" -msgstr "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server seitige Tools verwendet werden)" +msgstr "Keine Einstellungen (zum Konfigurieren der Tastatur müssen Server-seitige Tools verwendet werden)" #: ../pyhoca/wxgui/profilemanager.py:300 msgid "Automatically detect and use client-side keyboard configuration inside the session" diff --git a/po/en.po b/po/en.po index 6bc8b39..cac0919 100644 --- a/po/en.po +++ b/po/en.po @@ -196,8 +196,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/po/es.po b/po/es.po index f47191a..59bec5e 100644 --- a/po/es.po +++ b/po/es.po @@ -203,8 +203,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/po/fr.po b/po/fr.po index 6074d4e..f2f7906 100644 --- a/po/fr.po +++ b/po/fr.po @@ -188,7 +188,7 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:89 diff --git a/po/nb_NO.po b/po/nb_NO.po index 60916cf..711c031 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -197,8 +197,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X skrivebords skall (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 skrivebord (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE skrivebord (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/po/nl.po b/po/nl.po index 759a53e..a168de9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -195,8 +195,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/po/ru.po b/po/ru.po index 467f6e4..2e5bb3e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -199,8 +199,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/po/sv.po b/po/sv.po index d2c29ed..3e27425 100644 --- a/po/sv.po +++ b/po/sv.po @@ -196,8 +196,8 @@ msgid "Unity X Desktop Shell (UNITY)" msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:88 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "XFCE4 Desktop (XFCE4)" +msgid "XFCE Desktop (XFCE)" +msgstr "XFCE Desktop (XFCE)" #: ../pyhoca/wxgui/profilemanager.py:89 msgid "Published Applications" diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index ddda5a3..48f8e52 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -85,7 +85,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 'LXDE': _(u'Lightweight X Desktop (LXDE)'), 'TRINITY': _(u'Trinity X Desktop (KDE3-like)'), 'UNITY': _(u'Unity X Desktop Shell (UNITY)'), - 'XFCE4': _(u'XFCE4 Desktop (XFCE4)'), + 'XFCE': _(u'XFCE Desktop (XFCE)'), 'PUBLISHEDAPPLICATIONS': _(u'Published Applications'), 'APPLICATION': _(u'Single Application'), 'XDMCP': _(u'XDMCP Query'), @@ -910,6 +910,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UsePublishedApplications.SetValue(_published) self.Application.SetItems(self.applicationChoices.values()) + # XFCE4 has been renamed to XFCE for 0.2.1.0 + if _command == "XFCE4": _command = "XFCE" if _command == 'RDP' and self.profile_config['directrdp']: self.SessionType.SetValue(self.sessionChoices['DirectRDP']) self.Command.SetValue('') 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)).