ui/evolution-addressbook-ldap.xml, ui/evolution-addressbook.xml,

2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>

	* ui/evolution-addressbook-ldap.xml,
	* ui/evolution-addressbook.xml,
	* ui/evolution-calendar.xml,
	* ui/evolution-contact-editor.xml:
	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
	Also fixed some typos in descr values.

From shell/ChangeLog:

2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>

	* e-shell-view-menu.c (e_shell_view_menu_setup): Use
	`bonobo_ui_component_add_verb_list' instead of
	`bonobo_ui_component_add_verb_list_with_data' for help_verbs,
	so that `command_help' gets an html filename as user_data,
	instead of a ptr to EShellView.
	(menu_do_misc): Move DumpXML from help_verbs to here, because
	`command_xml_dump' needs to get EShellView as user_data.

svn path=/trunk/; revision=5703

7 files changed, 32 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8cf731902d..885af9eac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* ui/evolution-addressbook-ldap.xml,
+	* ui/evolution-addressbook.xml,
+	* ui/evolution-calendar.xml,
+	* ui/evolution-contact-editor.xml:
+	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
+	Also fixed some typos in descr values.
+
 2000-09-29  Peter Williams  <peterw@helixcode.com>
 
 	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6ad17fa0fb..d986283db5 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -2,6 +2,16 @@
 
 	* e-shell-view.c (setup_progress_bar): remove evil usize set.
 
+2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
+
+	* e-shell-view-menu.c (e_shell_view_menu_setup): Use
+	`bonobo_ui_component_add_verb_list' instead of
+	`bonobo_ui_component_add_verb_list_with_data' for help_verbs,
+	so that `command_help' gets an html filename as user_data,
+	instead of a ptr to EShellView.
+	(menu_do_misc): Move DumpXML from help_verbs to here, because
+	`command_xml_dump' needs to get EShellView as user_data.
+
 2000-10-02  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* e-shortcuts-view.c (show_new_group_dialog): Destroy the dialog
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 2779cc94f7..6d6d55b7c7 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -415,7 +415,6 @@ BonoboUIVerb help_verbs [] = {
 	BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"),
 	BONOBO_UI_VERB_DATA ("HelpUsingCalendar", command_help, "usage-calendar.html"),
 	BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"),
-	BONOBO_UI_VERB ("DumpXML", command_xml_dump),
 
 	BONOBO_UI_VERB_END
 };
@@ -436,6 +435,9 @@ menu_do_misc (BonoboUIComponent *component,
 	bonobo_ui_component_add_verb (
 		component, "HelpAbout",
 		(BonoboUIVerbFn) command_about_box, shell_view);
+	bonobo_ui_component_add_verb (
+		component, "DumpXML",
+		(BonoboUIVerbFn) command_xml_dump, shell_view);
 }
 
 
@@ -461,8 +463,8 @@ e_shell_view_menu_setup (EShellView *shell_view)
 	bonobo_ui_component_add_verb_list_with_data (
 		component, new_verbs, shell_view);
 
-	bonobo_ui_component_add_verb_list_with_data (
-		component, help_verbs, shell_view);
+	bonobo_ui_component_add_verb_list (
+		component, help_verbs);
 
 	menu_do_misc (component, shell_view);
 
diff --git a/ui/evolution-addressbook-ldap.xml b/ui/evolution-addressbook-ldap.xml
index 02fb384d30..870981ef70 100644
--- a/ui/evolution-addressbook-ldap.xml
+++ b/ui/evolution-addressbook-ldap.xml
@@ -49,7 +49,7 @@
 
 	<dockitem name="Toolbar" relief="none">
 		<toolitem name="New" _label="New"
-		_decr="Create a new contact" verb="ContactNew"
+		_descr="Create a new contact" verb="ContactNew"
 		pixtype="stock" pixname="New"/>
 
 		<toolitem type="separator"/>
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 192817a0b3..65407378c4 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -38,7 +38,7 @@
 
 	<dockitem name="Toolbar" relief="none">
 		<toolitem name="New" _label="New"
-		_decr="Create a new contact" verb="ContactNew"
+		_descr="Create a new contact" verb="ContactNew"
 		pixtype="stock" pixname="New"/>
 
 		<toolitem type="separator"/>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 00ccc79d84..1c83b6a196 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -48,7 +48,7 @@
 
 	<dockitem name="Toolbar" relief="none">
 		<toolitem name="New" _label="New"
-		_decr="Create a new appointment" verb="EditNewAppointment"
+		_descr="Create a new appointment" verb="EditNewAppointment"
 		pixtype="stock" pixname="New"/>
 
 		<toolitem type="separator"/>
@@ -74,7 +74,7 @@
 		<toolitem type="separator"/>
 
 		<toolitem name="Goto" label="Go to"
-		_descr="Go to a specific data" verb="CalendarGoto"
+		_descr="Go to a specific date" verb="CalendarGoto"
 		pixtype="stock" pixname="Jump To"/>
 		
 		<toolitem type="separator"/>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
index 351f94e1e4..06a1acf484 100644
--- a/ui/evolution-contact-editor.xml
+++ b/ui/evolution-contact-editor.xml
@@ -213,22 +213,22 @@ static GnomeUIInfo main_menu[] = {
 
 	<dockitem name="Toolbar" relief="none">
 	        <toolitem name="Save and Close" _label="Save and Close"
-		_decr="Save the appointment and close the dialog box" verb="ContactEditorSaveClose"
+		_descr="Save the contact and close the dialog box" verb="ContactEditorSaveClose"
 		pixtype="stock" pixname="Save"/>
 
 		<toolitem type="separator"/>
 
 		<toolitem name="Print" _label="Print..."
-		_decr="Print this item" verb="ContactEditorPrint"
+		_descr="Print this item" verb="ContactEditorPrint"
 		pixtype="stock" pixname="Print"/>
 
 		<toolitem name="Delete" _label="Delete"
-		_decr="Delete this item" verb="ContactEditorDelete"
+		_descr="Delete this item" verb="ContactEditorDelete"
 		pixtype="stock" pixname="Trash"/>
 
 <!--
 		<toolitem name="Help" _label="Help"
-		_decr="See online help" verb="ContactEditorHelp"
+		_descr="See online help" verb="ContactEditorHelp"
 		pixtype="stock" pixname="Help"/>
 
 	GNOMEUIINFO_ITEM_STOCK (N_("FIXME: Previous"),