Re: [evolution-patches] Proposed UI change: mailer component: ellipsis characters for various menu items (#323951)



On Sat, 2005-12-17 at 17:20 +0100, guenther wrote:
> On Tue, 2005-12-13 at 01:47 -0500, David Malcolm wrote:
> > (trying to get some UI fixes in before the deadline here)
> > 
> > >From the GNOME HIG:
> > "Command items are menu items that initiate a command or perform an action, such
> > as Save, Print or Quit. They may act on the currently active document in a
> > document based application, or on the application itself." ... "Label the menu
> > item with a trailing ellipsis ("...") only if the command requires further input
> > from the user before it can be performed. Do not add an ellipsis to items that
> > only present a confirmation dialog (such as Delete), or that do not require
> > further input (such as Properties, Preferences or About)." (see
> > http://developer.gnome.org/projects/gup/hig/2.0/menus-design.html#menu-grouping 
> > 
> > 
> > Based on the above, I think the following items in the mailer should have
> > trailing ellipsis characters:
> > Message ->
> > 	Compose New Message
> > 	Post New Message to Folder
> > 	Reply
> > 	Post a Reply
> > 	Reply to Sender
> > 	Reply to List
> > 	Forward
> > 	Redirect
> 
> Honestly, I disagree for the above. I don't think they should have the
> ellipsis chars. (Yes, this mostly is a gut feeling of mine, seems crappy
> to me to add it to all of em.) So I'd like to get this reverted.
> 
> Anyway, in either case... Be consistent!
guenther, Let us try to get towards HIG compliance as much as possible
instead of reverting this. :-)
> 
> * If the menu entry "Reply" has the ellipsis, the context menu needs it
>   as well.
> * If the above should have the ellipsis, the same applies to all menu
>   entries in the File / New menu and New dropdown. 
> * Context menu for Calendar, Tasks, ... The list goes on and on.
> 
Yes if it is required. let us try adding it. I have attached a patch,
which adds to the entire evolution menus (context/menu bar). I have
added ellipsis to New menu(Toolbar also), context menus, and most other
places. Please review it.  Post out your nice comments to add/remove
ellipsis in the  patch, we can discuss and fix it. I hope I haven't
missed any menus totally :-).

> 
> IMHO it is way worse to use different styles all over the place, or to
> add hundreds of dots to the UI, than just leaving this as is (was)...
> 
> 
> > 	Move to Folder
> > 	Copy to Folder
> > 
> > Attached is a patch that adds the ellipsis characters to these menu items.
> > OK to commit? (with a ChangeLog entry)
> 
> ...guenther
> 
> 
Index: addressbook/gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.140
diff -u -p -r1.140 addressbook-component.c
--- addressbook/gui/component/addressbook-component.c	25 Nov 2005 13:09:37 -0000	1.140
+++ addressbook/gui/component/addressbook-component.c	18 Dec 2005 09:54:00 -0000
@@ -223,7 +223,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[0].id = "contact";
 	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = _("_Contact");
+	list->_buffer[0].menuDescription = _("_Contact...");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
 	list->_buffer[0].iconName = "stock_contact";
@@ -231,7 +231,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[1].id = "contact_list";
 	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = _("Contact _List");
+	list->_buffer[1].menuDescription = _("Contact _List...");
 	list->_buffer[1].tooltip = _("Create a new contact list");
 	list->_buffer[1].menuShortcut = 'l';
 	list->_buffer[1].iconName = "stock_contact-list";
@@ -239,7 +239,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[2].id = "address_book";
 	list->_buffer[2].description = _("New Address Book");
-	list->_buffer[2].menuDescription = _("Address _Book");
+	list->_buffer[2].menuDescription = _("Address _Book...");
 	list->_buffer[2].tooltip = _("Create a new address book");
 	list->_buffer[2].menuShortcut = 'b';
 	list->_buffer[2].iconName = "stock_addressbook";
Index: addressbook/gui/component/addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-view.c,v
retrieving revision 1.41
diff -u -p -r1.41 addressbook-view.c
--- addressbook/gui/component/addressbook-view.c	26 Nov 2005 01:32:18 -0000	1.41
+++ addressbook/gui/component/addressbook-view.c	18 Dec 2005 09:54:03 -0000
@@ -766,10 +807,10 @@ primary_source_selection_changed_callbac
 }
 
 static EPopupItem abv_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Address Book..."), new_addressbook_cb, NULL, "stock_contact", 0, 0 },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "stock_delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_BAR,  "30.bar"},
-	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY },
 };
 
 static void
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.174
diff -u -p -r1.174 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c	26 Nov 2005 01:51:38 -0000	1.174
+++ addressbook/gui/widgets/e-addressbook-view.c	18 Dec 2005 09:54:13 -0000
@@ -948,12 +968,12 @@ static EPopupItem eabv_popup_items[] = {
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
-	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
-	{ E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
+	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contact..."), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "40.forward", N_("_Forward Contacts..."), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact..."), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to List..."), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST },
+	{ E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts..."), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL },
+	{ E_POPUP_ITEM, "60.print", N_("_Print..."), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY },
 
 	{ E_POPUP_BAR, "70.bar" },
 	{ E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY },
Index: calendar/gui/calendar-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.c,v
retrieving revision 1.210
diff -u -p -r1.210 calendar-component.c
--- calendar/gui/calendar-component.c	25 Nov 2005 13:14:19 -0000	1.210
+++ calendar/gui/calendar-component.c	18 Dec 2005 09:54:18 -0000
@@ -532,10 +532,10 @@ edit_calendar_cb (EPopup *ep, EPopupItem
 }
 
 static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Calendar..."), new_calendar_cb, NULL, "stock_calendar", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1473,7 +1473,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[0].id = CREATE_EVENT_ID;
 	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
+	list->_buffer[0].menuDescription = _("_Appointment...");
 	list->_buffer[0].tooltip = _("Create a new appointment");
 	list->_buffer[0].menuShortcut = 'a';
 	list->_buffer[0].iconName = "stock_new-appointment";
@@ -1481,7 +1481,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[1].id = CREATE_MEETING_ID;
 	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
+	list->_buffer[1].menuDescription = _("M_eeting...");
 	list->_buffer[1].tooltip = _("Create a new meeting request");
 	list->_buffer[1].menuShortcut = 'e';
 	list->_buffer[1].iconName = "stock_new-meeting";
@@ -1489,7 +1489,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
 	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All Day A_ppointment");
+	list->_buffer[2].menuDescription = _("All Day A_ppointment...");
 	list->_buffer[2].tooltip = _("Create a new all-day appointment");
 	list->_buffer[2].menuShortcut = 'p';
 	list->_buffer[2].iconName = "stock_new-24h-appointment";
@@ -1497,7 +1497,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[3].id = CREATE_CALENDAR_ID;
 	list->_buffer[3].description = _("New calendar");
-	list->_buffer[3].menuDescription = _("Cale_ndar");
+	list->_buffer[3].menuDescription = _("Cale_ndar...");
 	list->_buffer[3].tooltip = _("Create a new calendar");
 	list->_buffer[3].menuShortcut = 'n';
 	list->_buffer[3].iconName = "stock_calendar";
Index: calendar/gui/e-cal-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-popup.c,v
retrieving revision 1.18
diff -u -p -r1.18 e-cal-popup.c
--- calendar/gui/e-cal-popup.c	18 Oct 2005 09:58:28 -0000	1.18
+++ calendar/gui/e-cal-popup.c	18 Dec 2005 09:54:20 -0000
@@ -269,7 +269,7 @@ static const EPopupItem ecalp_standard_p
 static ECalPopupItem ecalp_attachment_object_popups[] = {
 	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE },
 	{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE },
-	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
+	{ E_POPUP_ITEM, "00.attach.20", N_("_Save Selected..."), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE },
 	{ E_POPUP_BAR, "05.attach", },
 };
 
Index: calendar/gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.146
diff -u -p -r1.146 e-calendar-table.c
--- calendar/gui/e-calendar-table.c	17 Dec 2005 13:30:41 -0000	1.146
+++ calendar/gui/e-calendar-table.c	18 Dec 2005 09:54:22 -0000
@@ -1186,8 +1186,8 @@ static EPopupItem tasks_popup_items [] =
 
 	{ E_POPUP_BAR, "70.bar" },
 
-	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task..."), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
+	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar..."), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
 	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
 	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
 
Index: calendar/gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.106
diff -u -p -r1.106 e-calendar-view.c
--- calendar/gui/e-calendar-view.c	17 Dec 2005 13:31:49 -0000	1.106
+++ calendar/gui/e-calendar-view.c	18 Dec 2005 09:54:29 -0000
@@ -1538,9 +1538,9 @@ on_paste (EPopup *ep, EPopupItem *pitem,
 
 static EPopupItem ecv_main_items [] = {
 	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 },
-	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
-	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
-	{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
+	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event..."), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
+	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting..."), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
+	{ E_POPUP_ITEM, "30.task", N_("New _Task..."), on_new_task, NULL, "stock_task", 0, 0},
 
 	{ E_POPUP_BAR, "40."},
 	{ E_POPUP_ITEM, "40.print", N_("_Print..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 },
Index: calendar/gui/e-memo-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-memo-table.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-memo-table.c
--- calendar/gui/e-memo-table.c	17 Dec 2005 13:36:29 -0000	1.3
+++ calendar/gui/e-memo-table.c	18 Dec 2005 09:54:30 -0000
@@ -864,7 +864,7 @@ static EPopupItem memos_popup_items [] =
 
 	{ E_POPUP_BAR, "70.bar" },
 
-	{ E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar..."), e_memo_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE },
 
 	{ E_POPUP_BAR, "90.bar" },
 
Index: calendar/gui/memos-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/memos-component.c,v
retrieving revision 1.2
diff -u -p -r1.2 memos-component.c
--- calendar/gui/memos-component.c	6 Dec 2005 05:29:34 -0000	1.2
+++ calendar/gui/memos-component.c	18 Dec 2005 09:54:42 -0000
@@ -445,10 +445,10 @@ edit_memo_list_cb (EPopup *ep, EPopupIte
 }
 
 static EPopupItem emc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("New Memo List..."), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "20.delete", N_("Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("Properties"), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1154,7 +1154,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[0].id = CREATE_MEMO_ID;
 	list->_buffer[0].description = _("New memo");
-	list->_buffer[0].menuDescription = _("_Memo");
+	list->_buffer[0].menuDescription = _("_Memo...");
 	list->_buffer[0].tooltip = _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
 	list->_buffer[0].iconName = "stock_insert-note";
@@ -1162,7 +1162,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[1].id = CREATE_MEMO_LIST_ID;
 	list->_buffer[1].description = _("New memo list");
-	list->_buffer[1].menuDescription = _("Memo l_ist");
+	list->_buffer[1].menuDescription = _("Memo l_ist...");
 	list->_buffer[1].tooltip = _("Create a new memo list");
 	list->_buffer[1].menuShortcut = 'i';
 	list->_buffer[1].iconName = "stock_notes";
Index: calendar/gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.94
diff -u -p -r1.94 tasks-component.c
--- calendar/gui/tasks-component.c	25 Nov 2005 13:19:17 -0000	1.94
+++ calendar/gui/tasks-component.c	18 Dec 2005 09:54:45 -0000
@@ -436,10 +436,10 @@ edit_task_list_cb (EPopup *ep, EPopupIte
 }
 
 static EPopupItem etc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("_New Task List..."), new_task_list_cb, NULL, "stock_todo", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "30.properties", N_("_Properties"), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1169,7 +1169,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[0].id = CREATE_TASK_ID;
 	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = _("_Task");
+	list->_buffer[0].menuDescription = _("_Task...");
 	list->_buffer[0].tooltip = _("Create a new task");
 	list->_buffer[0].menuShortcut = 't';
 	list->_buffer[0].iconName = "stock_task";
@@ -1177,7 +1177,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
 	list->_buffer[1].description = _("New assigned task");
-	list->_buffer[1].menuDescription = _("Assigne_d Task");
+	list->_buffer[1].menuDescription = _("Assigne_d Task...");
 	list->_buffer[1].tooltip = _("Create a new assigned task");
 	list->_buffer[1].menuShortcut = 'd';
 	list->_buffer[1].iconName = "stock_task";
@@ -1185,7 +1185,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[2].id = CREATE_TASK_LIST_ID;
 	list->_buffer[2].description = _("New task list");
-	list->_buffer[2].menuDescription = _("Task l_ist");
+	list->_buffer[2].menuDescription = _("Task l_ist...");
 	list->_buffer[2].tooltip = _("Create a new task list");
 	list->_buffer[2].menuShortcut = 'i';
 	list->_buffer[2].iconName = "stock_todo";
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.157
diff -u -p -r1.157 em-folder-tree.c
--- mail/em-folder-tree.c	22 Oct 2005 08:18:50 -0000	1.157
+++ mail/em-folder-tree.c	18 Dec 2005 09:54:57 -0000
@@ -974,8 +974,8 @@ emft_drop_popup_cancel(EPopup *ep, EPopu
 }
 
 static EPopupItem emft_drop_popup_menu[] = {
-	{ E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 },
-	{ E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 },
+	{ E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder..."), emft_drop_popup_copy, NULL, NULL, 1 },
+	{ E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder..."), emft_drop_popup_move, NULL, NULL, 1 },
 	{ E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 },
 	{ E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 },
 	{ E_POPUP_BAR, "10.emc" },
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.136
diff -u -p -r1.136 em-folder-view.c
--- mail/em-folder-view.c	12 Dec 2005 12:40:37 -0000	1.136
+++ mail/em-folder-view.c	18 Dec 2005 09:55:04 -0000
@@ -1037,9 +1037,9 @@ static EPopupItem emfv_popup_items[] = {
 
 	{ E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL },
 
-	{ E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY },
+	{ E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender..."), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All..."), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, "10.emfv.02", N_("_Forward..."), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY },
 
 	{ E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL },
 	{ E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_EDIT },
@@ -1072,17 +1072,17 @@ static EPopupItem emfv_popup_items[] = {
  
 	{ E_POPUP_BAR, "90.filter", NULL, NULL, NULL, NULL },
 	{ E_POPUP_SUBMENU, "90.filter.00", N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder from _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("Search Folder from Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("Search Folder from _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder from Mailing _List"),
+	{ E_POPUP_ITEM, "90.filter.00/00.00", N_("Search Folder from _Subject..."), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.01", N_("Search Folder from Se_nder..."), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.02", N_("Search Folder from _Recipients..."), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/00.03", N_("Search Folder from Mailing _List..."),
 	  emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	
 	{ E_POPUP_BAR, "90.filter.00/10", NULL, NULL, NULL, NULL },
-	{ E_POPUP_ITEM, "90.filter.00/10.00", N_("Filter on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/10.01", N_("Filter on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/10.02", N_("Filter on Re_cipients"), emfv_popup_filter_recipients,  NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	{ E_POPUP_ITEM, "90.filter.00/10.03", N_("Filter on _Mailing List"),
+	{ E_POPUP_ITEM, "90.filter.00/10.00", N_("Filter on Sub_ject..."), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/10.01", N_("Filter on Sen_der..."), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/10.02", N_("Filter on Re_cipients..."), emfv_popup_filter_recipients,  NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+	{ E_POPUP_ITEM, "90.filter.00/10.03", N_("Filter on _Mailing List..."),
 	  emfv_popup_filter_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY },
 };
 
@@ -2415,8 +2421,8 @@ static EPopupItem emfv_uri_popups[] = {
 	{ E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_NOT_MAILTO },
 
 	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
-	{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
-	{ E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address"), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO },
+	{ E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address..."), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO },
+	{ E_POPUP_ITEM, "99.uri.00/00.00", N_("_To this Address..."), emp_uri_popup_vfolder_recipient, NULL, NULL, EM_POPUP_URI_MAILTO },
 };
 
 static void
Index: mail/em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.38
diff -u -p -r1.38 em-popup.c
--- mail/em-popup.c	18 Oct 2005 08:31:39 -0000	1.38
+++ mail/em-popup.c	18 Dec 2005 09:55:06 -0000
@@ -553,22 +553,22 @@ static EMPopupItem emp_standard_object_p
 	{ E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 },
 	{ E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE },
 	{ E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
-	{ E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE },
-	{ E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE},
-	{ E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE},
+	{ E_POPUP_ITEM, "10.part.00", N_("_Reply to sender..."), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE },
+	{ E_POPUP_ITEM, "10.part.01", N_("Reply to _List..."), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE},
+	{ E_POPUP_ITEM, "10.part.03", N_("Reply to _All..."), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE},
 	{ E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
-	{ E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE },
+	{ E_POPUP_ITEM, "20.part.00", N_("_Forward..."), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE },
 };
 
 static EMPopupItem emp_attachment_object_popups[] = {
 	{ E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 },
 	{ E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_ATTACHMENTS_IMAGE },
 	{ E_POPUP_BAR, "05.attach", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE },
-	{ E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE },
-	{ E_POPUP_ITEM, "05.attach.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE},
-	{ E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE},
+	{ E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender..."), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE },
+	{ E_POPUP_ITEM, "05.attach.01", N_("Reply to _List..."), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE},
+	{ E_POPUP_ITEM, "05.attach.03", N_("Reply to _All..."), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE},
 	{ E_POPUP_BAR, "05.attach.10", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE },
-	{ E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE },
+	{ E_POPUP_ITEM, "05.attach.15", N_("_Forward..."), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE },
 };
 
 static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" };
@@ -618,7 +618,7 @@ emp_uri_popup_address_add(EPopup *ep, EP
 static EPopupItem emp_standard_uri_popups[] = {
 	{ E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_NOT_MAILTO },
 	{ E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, NULL, EM_POPUP_URI_MAILTO },
-	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Addressbook"), emp_uri_popup_address_add, NULL, NULL, EM_POPUP_URI_MAILTO },
+	{ E_POPUP_ITEM, "00.uri.20", N_("_Add to Addressbook..."), emp_uri_popup_address_add, NULL, NULL, EM_POPUP_URI_MAILTO },
 };
 
 /* ********************************************************************** */
Index: mail/mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.125
diff -u -p -r1.125 mail-component.c
--- mail/mail-component.c	22 Aug 2005 02:54:51 -0000	1.125
+++ mail/mail-component.c	18 Dec 2005 09:55:09 -0000
@@ -763,7 +763,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[0].id = "message";
 	list->_buffer[0].description = _("New Mail Message");
-	list->_buffer[0].menuDescription = _("_Mail Message");
+	list->_buffer[0].menuDescription = _("_Mail Message...");
 	list->_buffer[0].tooltip = _("Compose a new mail message");
 	list->_buffer[0].menuShortcut = 'm';
 	list->_buffer[0].iconName = "stock_mail-compose";
@@ -771,7 +771,7 @@ impl__get_userCreatableItems (PortableSe
 
 	list->_buffer[1].id = "folder";
 	list->_buffer[1].description = _("New Mail Folder");
-	list->_buffer[1].menuDescription = _("Mail _Folder");
+	list->_buffer[1].menuDescription = _("Mail _Folder...");
 	list->_buffer[1].tooltip = _("Create a new mail folder");
 	list->_buffer[1].menuShortcut = 'f';
 	list->_buffer[1].iconName = "stock_new-dir";
Index: plugins/plugin-manager/org-gnome-plugin-manager.xml
===================================================================
RCS file: /cvs/gnome/evolution/plugins/plugin-manager/org-gnome-plugin-manager.xml,v
retrieving revision 1.3
diff -u -p -r1.3 org-gnome-plugin-manager.xml
--- plugins/plugin-manager/org-gnome-plugin-manager.xml	21 Jul 2005 07:07:19 -0000	1.3
+++ plugins/plugin-manager/org-gnome-plugin-manager.xml	18 Dec 2005 09:55:48 -0000
@@ -1,6 +1,6 @@
 <Root>
   <commands>
-    <cmd name="EPluginManagerManage" _label="Plugins"
+    <cmd name="EPluginManagerManage" _label="Plu_gins"
       _tip="Enable and disable plugins"/>
   </commands>
 
Index: ui/evolution-calendar.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-calendar.xml,v
retrieving revision 1.70
diff -u -p -r1.70 evolution-calendar.xml
--- ui/evolution-calendar.xml	13 May 2005 21:29:27 -0000	1.70
+++ ui/evolution-calendar.xml	18 Dec 2005 09:55:54 -0000
@@ -61,7 +61,7 @@
       <placeholder name="ViewBegin">
 	<menuitem name="Today" verb="CalendarToday" _label="Select _Today"
                   accel="*Control**Alt*t"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Select _Date" accel="*Control**Alt*g"/>
+	<menuitem name="Goto" verb="CalendarGoto" _label="Select _Date..." accel="*Control**Alt*g"/>
 	<separator f="" name="ecal"/>
       </placeholder>
 
Index: ui/evolution-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-editor.xml,v
retrieving revision 1.1
diff -u -p -r1.1 evolution-editor.xml
--- ui/evolution-editor.xml	14 Nov 2005 18:15:53 -0000	1.1
+++ ui/evolution-editor.xml	18 Dec 2005 09:55:54 -0000
@@ -39,7 +39,7 @@
 
     <submenu name="Insert" _label="_Insert">
       <placeholder name="Attachments">
-	      <menuitem name="InsertAttachments" verb="" _label="_Attachments" pixtype="pixbuf"/>
+	      <menuitem name="InsertAttachments" verb="" _label="_Attachments..." pixtype="pixbuf"/>
 	<separator f="" name="attach"/>
       </placeholder>
      </submenu>
Index: ui/evolution-event-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-event-editor.xml,v
retrieving revision 1.18
diff -u -p -r1.18 evolution-event-editor.xml
--- ui/evolution-event-editor.xml	18 Nov 2005 08:43:24 -0000	1.18
+++ ui/evolution-event-editor.xml	18 Dec 2005 09:55:54 -0000
@@ -63,10 +63,10 @@
       </placeholder>
     </submenu>
     <submenu  name="Insert">
-	    <menuitem name="InsertSendOptions" verb="" _label="Send Options"/>	    
+	    <menuitem name="InsertSendOptions" verb="" _label="Send Options..."/>	    
     </submenu>
     <submenu name="Options">
-	    <menuitem name="ActionAlarm" verb="" _label="_Alarms" pixtype="pixbuf"/>
+	    <menuitem name="ActionAlarm" verb="" _label="_Alarms..." pixtype="pixbuf"/>
 	    <menuitem name="ActionShowTimeBusy" verb="" _label="Show time as b_usy"/>
 	    <menuitem name="ActionAllDayEvent" verb="" _label="_All day Event"/>
 	    <submenu name="Classification" _label="_Classification">
@@ -74,8 +74,8 @@
 		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
 		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
 	    </submenu>
-	    <menuitem name="ActionRecurrence" verb="" _label="Recurrence" pixtype="pixbuf"/>
-	    <menuitem name="ActionFreeBusy" verb="" _label="Free/Busy"/>	    
+	    <menuitem name="ActionRecurrence" verb="" _label="Recurrence..." pixtype="pixbuf"/>
+	    <menuitem name="ActionFreeBusy" verb="" _label="Free/Busy..."/>	    
     </submenu>
   </menu>
 
Index: ui/evolution-mail-message.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-mail-message.xml,v
retrieving revision 1.83
diff -u -p -r1.83 evolution-mail-message.xml
--- ui/evolution-mail-message.xml	16 Dec 2005 08:16:17 -0000	1.83
+++ ui/evolution-mail-message.xml	18 Dec 2005 09:55:55 -0000
@@ -72,12 +72,10 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageForwardAttached"
-     _tip="Forward the selected message to someone as an attachment"
-     accel="*Control*j"/>
+    _tip="Forward the selected message to someone as an attachment"/>
 
     <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"
-     accel="*Control**Shift*j"/>
+    _tip="Forward the selected message in the body of a new message"/>
 
     <cmd name="MessageForwardQuoted"
      _tip="Forward the selected message quoted like a reply"/>
@@ -317,7 +315,7 @@
           <menuitem name="MailPost" verb="" _label="Pos_t New Message to Folder..."/>
           <menuitem name="MessageOpen" verb="" _label="_Open in New Window"/>
           <menuitem name="MessageEdit" verb="" _label="_Edit as New Message..."/>
-          <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book"/>
+          <menuitem name="AddSenderToAddressbook" verb="" _label="A_dd Sender to Address Book..."/>
         </placeholder>
 
         <placeholder name="MessageNavigation">
@@ -340,10 +338,10 @@
           <menuitem name="MessageReplyAll" verb="" _label="Reply to _All..."/>
           <menuitem name="MessagePostReply" verb="" _label="Post a Repl_y..."/>
           <menuitem name="MessageForward" verb="" _label="_Forward..."/>
-          <submenu name="ForwardAs" _label="F_orward As...">
-            <menuitem verb="MessageForwardAttached" _label="_Attached"/>
-            <menuitem verb="MessageForwardInline" _label="_Inline"/>
-            <menuitem verb="MessageForwardQuoted" _label="_Quoted"/>
+          <submenu name="ForwardAs" _label="For_ward As">
+            <menuitem verb="MessageForwardAttached" _label="_Attached..."/>
+            <menuitem verb="MessageForwardInline" _label="_Inline..."/>
+            <menuitem verb="MessageForwardQuoted" _label="_Quoted..."/>
             <separator f="" name="forwardlist1"/>
             <menuitem verb="MessageRedirect" _label="Re_direct..."/>
           </submenu>
Index: ui/evolution-task-editor.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-task-editor.xml,v
retrieving revision 1.7
diff -u -p -r1.7 evolution-task-editor.xml
--- ui/evolution-task-editor.xml	16 Nov 2005 13:07:42 -0000	1.7
+++ ui/evolution-task-editor.xml	18 Dec 2005 09:55:55 -0000
@@ -53,7 +53,7 @@
       </placeholder>
     </submenu>
     <submenu  name="Insert">
-	    <menuitem name="InsertSendOptions" verb="" _label="Send Options"/>	    
+	    <menuitem name="InsertSendOptions" verb="" _label="Send Options..."/>	    
     </submenu>
     <submenu name="Options">
 	    <submenu name="Classification" _label="_Classification">
@@ -61,7 +61,7 @@
 		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
 		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
 	    </submenu>
-	      <menuitem name="OptionStatus" verb="" _label="_Status Details" pixtype="pixbuf"/>	    
+	      <menuitem name="OptionStatus" verb="" _label="_Status Details..." pixtype="pixbuf"/>	    
     </submenu>
   </menu>
 
Index: ui/evolution-tasks.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-tasks.xml,v
retrieving revision 1.40
diff -u -p -r1.40 evolution-tasks.xml
--- ui/evolution-tasks.xml	16 Dec 2005 08:10:30 -0000	1.40
+++ ui/evolution-tasks.xml	18 Dec 2005 09:55:55 -0000
@@ -58,8 +58,8 @@
     <placeholder name="ActionsPlaceholder">
     <submenu name="Actions" _label="_Actions">
 	<menuitem name="TasksPurge" verb=""/>
-	<menuitem name="TasksAssign" verb=""/>
-	<menuitem name="TasksForward" verb=""/>
+	<menuitem name="TasksAssign" verb="" _label="_Assign Task..."/>
+	<menuitem name="TasksForward" verb="" _label="_Forward as iCalendar..."/>
     </submenu>
     </placeholder>
 
Index: ui/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.102
diff -u -p -r1.102 evolution.xml
--- ui/evolution.xml	16 Dec 2005 08:10:30 -0000	1.102
+++ ui/evolution.xml	18 Dec 2005 09:55:56 -0000
@@ -105,7 +105,8 @@
 
       <placeholder name="PluginManagerPlaceholder"/>
 
-      <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings"/>
+      <menuitem name="Settings" verb="" _label="Prefere_nces" _tip="Change Evolution's settings"
+      accel="*Control**Shift*s"/>
     </submenu>
 
     <submenu name="View" _label="_View">
@@ -157,7 +158,7 @@
       <separator f="" name="eshell4"/>
 
       <menuitem name="HelpAbout" verb=""
-	_label="_About Evolution..."/>
+	_label="_About Evolution"/>
 
     </submenu>
   </menu>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]