[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.2.0.1
X2Go dev team
git-admin at x2go.org
Mon Jul 2 20:49:35 CEST 2012
The branch, build-main has been updated
via 01ce60e2b2b659463f7c603dcf7be49bdefbdb8a (commit)
via e423a9e9c6f83de64383ee0a307892cff861e062 (commit)
via 8421acb2f607018824bfee2b8dd325656ea43c96 (commit)
via 3953333505b3a0ac3b36fdc2763abaabe25f3278 (commit)
via 5b79154e6ceb0af2de159c3ed3365f87fe60dca2 (commit)
via 6acb46cc76d9f3e6bc8c5689aa8106f53ba62ce8 (commit)
via 432b8f6bc6193ebadf5c64705d0173b83e32a8f4 (commit)
via 4511fe21426835a6977a39dc57aa7aac77d5afbb (commit)
from 73647647ec7a3d5c96391eb3b6c94f586c0c947c (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 | 16 ++++++++++++++++
desktop/pyhoca-gui.desktop | 1 -
man/man1/pyhoca-gui.1 | 2 +-
po/{bg.po => fr.po} | 10 +++++-----
pyhoca/wxgui/__init__.py | 2 +-
pyhoca/wxgui/logon.py | 2 +-
pyhoca/wxgui/sessiontitle.py | 2 +-
7 files changed, 25 insertions(+), 10 deletions(-)
copy po/{bg.po => fr.po} (99%)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 29a9f70..f1ccd86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+pyhoca-gui (0.2.0.1-0~x2go1) unstable; urgency=low
+
+ * New upstream version (0.2.0.1):
+ - Drop Encoding key from .desktop file (deprecated as of latest
+ FreeDesktop.org specs.
+ - Fix grammatical error in man page.
+ - Let logon window and session title window be positioned at top
+ of screen also for ,,gnome-fallback'' sessions.
+ - Let logon window and session title window be positioned at top
+ of screen also for ,,ubuntu-2d'' sessions.
+ - Provide empty template for the French translation of PyHoca-GUI.
+ - Let logon window and session title window be positioned at top
+ of screen also for ,,openbox-gnome'' sessions.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 02 Jul 2012 20:26:40 +0200
+
pyhoca-gui (0.2.0.0-0~x2go1) unstable; urgency=low
[ Mike Gabriel ]
diff --git a/desktop/pyhoca-gui.desktop b/desktop/pyhoca-gui.desktop
index 575c623..2c53624 100644
--- a/desktop/pyhoca-gui.desktop
+++ b/desktop/pyhoca-gui.desktop
@@ -9,5 +9,4 @@ X-HildonDesk-ShowInToolbar=true
X-Osso-Type=application/x-executable
Terminal=false
Type=Application
-Encoding=UTF-8
Categories=GNOME;KDE;Network
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index 8e1f50b..1f73aff 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -92,7 +92,7 @@ Define an alternative system tray icon file while connecting to a server (PNG fi
.TP
\*(T<\fB\-\-restricted-trayicon\fR\*(T>
Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is shown in the notification area / system tray. This
-switch limits the icon 's functionality to a right-click menu that allows to raise the ,,About'' window and exit the application. On
+switch limits the icon 's functionality to a right-click menu that allows one to raise the ,,About'' window and exit the application. On
left-click only a minimal session menu is shown.
.TP
\*(T<\fB\-\-start-on-connect\fR\*(T>
diff --git a/po/bg.po b/po/fr.po
similarity index 99%
copy from po/bg.po
copy to po/fr.po
index 816902f..b8bae00 100644
--- a/po/bg.po
+++ b/po/fr.po
@@ -11,14 +11,14 @@ msgstr ""
"POT-Creation-Date: 2012-06-10 21:18+0200\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
-"Language-Team: Bulgarian <chepati at yahoo.com>\n"
-"Language: bg\n"
+"Language-Team: Renaud Gaudin <rgaudin at gmail.com>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Poedit-Language: Bulgarian\n"
-"X-Poedit-Country: Bulgaria\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: French\n"
"X-Poedit-SourceCharset: utf-8\n"
#: ../pyhoca/wxgui/logon.py:92
diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py
index cfd9f2a..0a61762 100644
--- a/pyhoca/wxgui/__init__.py
+++ b/pyhoca/wxgui/__init__.py
@@ -18,6 +18,6 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__ = '0.2.0.0'
+__VERSION__ = '0.2.0.1'
from frontend import *
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 764f1b7..07e8707 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -220,7 +220,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
else:
move_y = self._PyHocaGUI.logon_window_position_y
- elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'awesome', 'ubuntu', )):
+ elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )):
# automatically place logon Window for GNOME, awesome
move_x = maxX - (self.GetSize().GetWidth() + 20)
diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py
index d0156f7..144380f 100644
--- a/pyhoca/wxgui/sessiontitle.py
+++ b/pyhoca/wxgui/sessiontitle.py
@@ -119,7 +119,7 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
else:
move_y = self._PyHocaGUI.logon_window_position_y
- elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'awesome', 'ubuntu', )):
+ elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'gnome-fallback', 'awesome', 'ubuntu', 'ubuntu-2d', 'openbox-gnome', )):
# automatically place logon Window for GNOME, awesome
move_x = maxX - (self.GetSize().GetWidth() + 20)
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