diff options
| -rw-r--r-- | ui/ChangeLog | 6 | ||||
| -rw-r--r-- | ui/evolution-calendar.xml | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog index 8206d4d182..6bf7be2005 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,8 @@ +2001-10-30 Federico Mena Quintero <federico@ximian.com> + + * evolution-calendar.xml: Renamed the cut/copy/paste/delete + command/item/verb names to be consistent. + 2001-10-30 Larry Ewing <lewing@ximian.com> * evolution-signature-editor.xml: change Save into Save and close, @@ -112,7 +117,6 @@ * evolution-mail-message.xml: Add a pixtype to /Commands/MessageUndelete so that people can see the icon. ->>>>>>> 1.242 2001-08-23 Larry Ewing <lewing@ximian.com> * evolution-mail-message.xml: added ... to Search Message to diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml index 1261adcb19..e570e186dd 100644 --- a/ui/evolution-calendar.xml +++ b/ui/evolution-calendar.xml @@ -20,10 +20,10 @@ <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/> <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/> - <cmd name="CutEvent" _tip="Cut the selection" accel="*Control*x"/> - <cmd name="CopyEvent" _tip="Copy the selection" accel="*Control*c"/> - <cmd name="PasteEvent" _tip="Paste the clipboard" accel="*Control*v"/> - <cmd name="DeleteEvent" _tip="Delete the appointment"/> + <cmd name="Cut" _tip="Cut the selection" accel="*Control*x"/> + <cmd name="Copy" _tip="Copy the selection" accel="*Control*c"/> + <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v"/> + <cmd name="Delete" _tip="Delete the appointment"/> <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/> </commands> @@ -55,10 +55,10 @@ <placeholder name="EditPlaceholder"> <submenu name="Edit" _label="_Edit"> - <menuitem name="CutEvent" verb="" _label="C_ut" pixtype="pixbuf"/> - <menuitem name="CopyEvent" verb="" _label="_Copy" pixtype="pixbuf"/> - <menuitem name="PasteEvent" verb="" _label="_Paste" pixtype="pixbuf"/> - <menuitem name="DeleteEvent" verb="" _label="_Delete" pixtype="pixbuf"/> + <menuitem name="Cut" verb="" _label="C_ut" pixtype="pixbuf"/> + <menuitem name="Copy" verb="" _label="_Copy" pixtype="pixbuf"/> + <menuitem name="Paste" verb="" _label="_Paste" pixtype="pixbuf"/> + <menuitem name="Delete" verb="" _label="_Delete" pixtype="pixbuf"/> </submenu> </placeholder> @@ -104,7 +104,7 @@ <separator/> <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/> - <toolitem name="Delete" verb="DeleteEvent" pixtype="pixbuf"/> + <toolitem name="Delete" verb="" pixtype="pixbuf"/> <separator/> |