From d6445f8abfa78c0a9c8680a3ba7422d331391f8f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 7 Nov 2008 22:04:53 +0000
Subject: Merge revisions 36685:36729 from trunk.

svn path=/branches/kill-bonobo/; revision=36763
---
 ui/ChangeLog                 | 15 +++++++++++++++
 ui/evolution-mail-global.xml |  2 +-
 ui/evolution-mail-list.xml   |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index b1ee2caa0a..c591ce10b6 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,18 @@
+2008-11-03  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #559040
+
+	* evolution-addressbook.xml:
+	* evolution-mail-global.xml:
+	* evolution-mail-list.xml:
+	No period at the end of tooltips, and use sentence case.
+
+2008-11-03  Ashish Shrivastava  <shashish@novell.com>
+
+	** Support for Non-intrusive error in calendar.
+
+	* evolution-calendar.xml: Add menu for HelpDebug.
+
 2008-08-27  Philip Withnall  <philip@tecnocode.co.uk>
 
 	** Fix for bug #534762
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 737914f640..c582cd6b62 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -109,7 +109,7 @@
 <!--
         <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 -->
-        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions"/>
+        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscriptions..."/>
 
  	<separator f="" name="Folder1"/>
 
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 5071228f8d..95b62eb996 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -130,7 +130,7 @@
 
  	<placeholder name="FolderOps">
 	  <menuitem name="FolderRename" verb="" _label="_Rename..."/>
-          <menuitem name="FolderRefresh" verb="" _label="Re_fresh..."/>
+          <menuitem name="FolderRefresh" verb="" _label="Re_fresh"/>
 	  <menuitem name="FolderDelete" verb="" _label="_Delete"/>
 
  	  <separator f="" name="FolderOps1"/>
-- 
cgit v1.2.3