aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/groupwise-features
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-01-15 11:39:43 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-15 11:39:43 +0800
commit2e3a3cf26e4d1894707703b15340529b8874466c (patch)
tree880b18c84f6568e805b161d69a80037b251c766c /plugins/groupwise-features
parent7ed2b90bdad0637d72be1815e6634bb352d0ec08 (diff)
downloadgsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.gz
gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.tar.zst
gsoc2013-evolution-2e3a3cf26e4d1894707703b15340529b8874466c.zip
Merge revisions 37047:37074 from trunk.
svn path=/branches/kill-bonobo/; revision=37075
Diffstat (limited to 'plugins/groupwise-features')
-rw-r--r--plugins/groupwise-features/ChangeLog9
-rw-r--r--plugins/groupwise-features/proxy-listing.glade2
-rw-r--r--plugins/groupwise-features/proxy-login-dialog.glade2
3 files changed, 11 insertions, 2 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index aeb89aecb5..9db857dbcc 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-14 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #567744
+
+ * proxy-login-dialog.glade:
+ * proxy-listing.glade:
+ Comment attribute in property tag should be plural.
+ e.g. <property comments="...">
+
2008-12-29 Bharath Acharya <abharath@novell.com>
** Fix for bug bnc #435694
diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade
index 984227c558..5f33da23ad 100644
--- a/plugins/groupwise-features/proxy-listing.glade
+++ b/plugins/groupwise-features/proxy-listing.glade
@@ -169,7 +169,7 @@
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property>
+ <property name="label" translatable="yes" comments="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/plugins/groupwise-features/proxy-login-dialog.glade b/plugins/groupwise-features/proxy-login-dialog.glade
index d2e0bc8fb0..d774555659 100644
--- a/plugins/groupwise-features/proxy-login-dialog.glade
+++ b/plugins/groupwise-features/proxy-login-dialog.glade
@@ -7,7 +7,7 @@
<widget class="GtkDialog" id="proxy_login_dialog">
<property name="visible">True</property>
<property name="height_request">325</property>
- <property name="title" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property>
+ <property name="title" translatable="yes" comments="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">True</property>