[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.2.0.4-7-g7b18f2d
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:56:17 CEST 2013
The branch, twofactorauth has been updated
via 7b18f2d1e27306b0cea947cfb88eedce4cb56bd2 (commit)
from 804944e3c211b676a3e08c668cba238d4e3b238a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 ++-
po/PyHoca-GUI.pot | 38 +++++++++++++++++++-------------------
pyhoca/wxgui/profilemanager.py | 5 ++++-
3 files changed, 25 insertions(+), 21 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 666b16f..1491b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* New upstream version (0.2.0.5):
- - Continue development...
+ - Session profile file option ,,export'': stay empty if no exports are
+ definded.
* /debian/control:
+ Add Oleksandr Shneyder to Uploaders.
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index 96396f3..1bf667b 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-06-10 21:18+0200\n"
+"POT-Creation-Date: 2012-09-05 12:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -548,7 +548,7 @@ msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:365
#: ../pyhoca/wxgui/profilemanager.py:1078
-#: ../pyhoca/wxgui/profilemanager.py:1832
+#: ../pyhoca/wxgui/profilemanager.py:1829
msgid "automatically"
msgstr ""
@@ -603,50 +603,50 @@ msgstr ""
msgid "<xkbvariant>"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1284
+#: ../pyhoca/wxgui/profilemanager.py:1281
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1287
+#: ../pyhoca/wxgui/profilemanager.py:1284
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1509
+#: ../pyhoca/wxgui/profilemanager.py:1506
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1511
-#: ../pyhoca/wxgui/profilemanager.py:1533
+#: ../pyhoca/wxgui/profilemanager.py:1508
+#: ../pyhoca/wxgui/profilemanager.py:1530
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1784
+#: ../pyhoca/wxgui/profilemanager.py:1781
msgid "Choose a folder to share within a session"
msgstr ""
+#: ../pyhoca/wxgui/profilemanager.py:1909
#: ../pyhoca/wxgui/profilemanager.py:1912
#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
-#: ../pyhoca/wxgui/profilemanager.py:1923
-#: ../pyhoca/wxgui/profilemanager.py:1933 ../pyhoca/wxgui/menus_taskbar.py:118
+#: ../pyhoca/wxgui/profilemanager.py:1920
+#: ../pyhoca/wxgui/profilemanager.py:1930 ../pyhoca/wxgui/menus_taskbar.py:118
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1912
+#: ../pyhoca/wxgui/profilemanager.py:1909
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
+#: ../pyhoca/wxgui/profilemanager.py:1912
#: ../pyhoca/wxgui/profilemanager.py:1915
-#: ../pyhoca/wxgui/profilemanager.py:1918
#, python-format
msgid "Profile name %s already exists!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1923
+#: ../pyhoca/wxgui/profilemanager.py:1920
msgid "The SSH proxy configuration is incomplete. Try again."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1933
+#: ../pyhoca/wxgui/profilemanager.py:1930
#, python-format
msgid ""
"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
@@ -654,21 +654,21 @@ msgid ""
"Please change the SSH proxy settings accordingly."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1960
+#: ../pyhoca/wxgui/profilemanager.py:1957
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1961
+#: ../pyhoca/wxgui/profilemanager.py:1958
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1965
+#: ../pyhoca/wxgui/profilemanager.py:1962
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1966
+#: ../pyhoca/wxgui/profilemanager.py:1963
msgid "Changes to profile have been saved."
msgstr ""
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2ff1987..9b58823 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -1245,7 +1245,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
_item_id = self.SharedFoldersList.GetNextItem(_item_id)
- self.profile_config['export'] = '"%s;"' % ';'.join([ f for f in _shared_folders if f ])
+ if _shared_folders:
+ self.profile_config['export'] = '"%s;"' % ';'.join([ f for f in _shared_folders if f ])
+ else:
+ self.profile_config['export'] = ''
self.profile_config['useiconv'] = self.UseEncodingConverter.GetValue()
self.profile_config['iconvfrom'] = self.ClientEncoding.GetValue()
self.profile_config['iconvto'] = self.ServerEncoding.GetValue()
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list