This commit was manufactured by cvs2svn to create tagGNOME_CONTROL_CENTER_1_5_6

'GNOME_CONTROL_CENTER_1_5_6'.

svn path=/tags/GNOME_CONTROL_CENTER_1_5_6/; revision=12298

23 files changed, 0 insertions, 3282 deletions

diff --git a/ui/.cvsignore b/ui/.cvsignore
deleted file mode 100644
index 22bfb15732..0000000000
--- a/ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-*.h
diff --git a/ui/ChangeLog b/ui/ChangeLog
deleted file mode 100644
index 1af4f0567d..0000000000
--- a/ui/ChangeLog
+++ /dev/null
@@ -1,1293 +0,0 @@
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-mail-message.xml: set MessageDelete pixtype to pixbuf.
-
-	* evolution-contact-editor.xml: use bigger Save icon for toolbar.
-	set Delete pixtype to pixbuf.
-
-	* evolution-comp-editor.xml: used Delete icon for menu.
-
-	* evolution-tasks.xml: changed 'Tasks Settings' to 'Tasks Settings...'.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed Goto icon to pixbuf.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: use new Delete icon for menu.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: added Delete command to menu and toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: added Cut/Copy/Paste items to toolbar, though
-	I'm not sure they are very useful.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: use new delete icons in menu & toolbar.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-mail-list.xml: use Cut/Copy/Paste icons.
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-comp-editor.xml: don't use old stock icon for the menu,
-	to be consistent with other components. Use new delete icon for
-	toolbar.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: use new Cut/Copy/Paste/Save/Search icons.
-
-2001-08-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-list.xml: Added Cut/Copy/Paste underline
-	thingies.
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: used the new Cut/Copy/Paste icons.
-	Removed the Save As/Print/Print Preview commands as they do nothing.
-
-	* evolution-comp-editor.xml: used the new Save/Save As icons.
-
-	* evolution-calendar.xml: used the new Cut/Copy/Paste icons.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Set the pixtype for
-	"ContactEditorDelete" to "pixbuf".
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-contact-list-editor.xml: Likewise.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove "Control-W" accelerator for closing the
-	window.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Change pixtype of "MessageDelete" to
-	"pixbuf".
-
-2001-08-18  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed goto icon from stock icon to pixbuf
-	for the toolbar. Note that the menu still uses the stock icon. Yuck!
-	Added 'New Task' command to toolbar and menus.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: changed print icon types to pixbuf.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-addressbook.xml: changed 'Search for Contacts'.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-contact-editor.xml: changed 'Send contact to other'
-	to 'Forward Contact' and capitalized 'Send message to Contact' to
-	be consistent with address book.
-
-	* evolution-addressbook.xml: added '...' to 'Forward Contact' and
-	'Send Message to Contact' to be consistent with contact editor.
-
-2001-08-17  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-global.xml : Changed the order of the toolbar icons
-	(moved "New Message" (formerly "Compose") to be the left-most item).
-
-	* evolution-addressbook.xml: Changed Send Contact to Other to Forward
-	Contact.
-
-
-2001-08-16  Anna Marie Dirks  <anna@ximian.com> 
-
-	* evolution.xml : Changed "Import file..." to "Import File..."
-	* evolution-addressbook.xml : Fixed a few lack of capitalization 
-	issues.
-
-2001-08-16  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-message.xml: Stop search message from conflicting
-	with expunge.
-
-2001-08-16  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: add save menu item
-
-	* evolution-task-editor.xml: rename menu item to Assign Task and
-	tidy
-
-	
-2001-08-16  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-mail-message.xml : removed the Print Setup menu
-	item, and changed Print Message to Print for consistency's sake.
-
-2001-08-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add a "BuiltMenuItems" placeholder in the "Help"
-	menu so we can do the fancy Bonobo help stuff.
-
-2001-08-15  Anna Marie Dirks  <anna@ximian.com> 
-
-	*evolution-calendar.xml : Changed "print calendar" to "print".
- 
-
-2001-08-15  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: s/My Evolution/Summary/
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-calendar.xml: Add Tigert's new icons for Prev and Next.
-
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Rearranged this Edit menu to fit the
-	standards.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-contact-editor.xml, evolution-contact-list-editor.xml:
-	Added accelerators here.
-
-2001-08-13  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml: removed the redundant view-switching
-	menu items from the bottom of the view menu. 
-
-2001-08-13  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: Add the reload button and fix the print button.
-
-2001-08-13 Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml : applied Neil Conway's 
-	<nconway@klamath.dyndns.org> menu-improvement patch.
-
-	* evolution-tasks.xml : same as above.
-
-2001-08-13  Iain Holmes  <iain@ximian.com>
-
-	* my-evolution.xml: Set the label for Print to be shown on priority.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-global.xml: Remove a separator after the
-	"Subscribe to Folders" item.
-
-2001-08-13  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-calendar.xml: Add labels for the ShowDayView,
-	ShowWorkWeekView, ShowWeekView, ShowMonthView buttons.
-
-2001-08-13  Anna Marie Dirks  <anna@ximian.com>
-
-	* evolution-calendar.xml: Changed the tooltips for several toolbar
-	icons to make all tooltips consistent (in terms of capitalization
-	and language). Also changed "Go to the present time" to "Go to
-	today".
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	[Fix #7069, New - Missing name for "Tools" menu.]
-	
-	* my-evolution.xml: Put the Tools menu in the
-	ComponentToolsPlaceholder.
-	
-2001-08-11  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Make the label for the resending
-	menu item read "Edit as New Message...", bug #6838.
-
-2001-08-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #7608, New - Phantom menu entry in Tasks.]
-
-	* evolution-tasks.xml: Put the Tools menu in the
-	ComponentToolsPlaceholder.
-
-2001-08-10  Jason Leach  <jleach@ximian.com>
-
-	* evolution-addressbook.xml: End a placeholder block with
-	</placeholder> instead of <placeholder/>
-
-2001-08-09  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml: Give the (pre)view pane toggle
-	an accelerator of 'q', like we were implementing the hard
-	manual way before.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove all the "New ... FIXME" items.
-
-2001-08-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Put the "Tools" and "Actions" menus
-	in the "ComponentToolsPlaceholder" and
-	"ComponentActionsPlaceholder", respectively.
-	* evolution-calendar.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-mail-global.xml: Likewise.
-	* evolution-mail-message.xml: Likewise.
-
-	* evolution.xml: Remove "Tools" and "Actions" menus.  Create a
-	"ComponentActionsPlaceholder" and a "ComponentToolsPlaceholder"
-	instead.
-	* evolution-mail-messagedisplay.xml: Likewise, put "Tools" and
-	"Actions" in placeholders.
-
-2001-08-08  Anna Marie Dirks <anna@ximian.com>
-
-	* evolution-mail-list.xml: Changed the "Show All" menu item
-	to be "Show Hidden Messages". 
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-list-editor.xml: improvements, make it look
-	more like the event editor.
-
-	* evolution-contact-editor.xml: same.
-
-	* evolution-addressbook.xml: Contact Group => Contact List.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* evolution-contact-editor.xml: Removed Print Envelope since it's
-	disabled for Evolution 1.0.
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-messagedisplay.xml: Remove "Customize toolbar"
-	item.
-	* evolution.xml: Here too.
-	* evolution-message-composer.xml: Here too.
-
-2001-08-03  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml: Rename "Manage Subscriptons" to
-	"Subscribe to Folders" as per Aaron's suggestion. Hopefully a little
-	more intuitive.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* evolution-contact-editor.xml: Update the updated Save, Save As,
-	and Print icons for menus and the toolbar.  Also added a Close
-	button to the toolbar and some other fixes suggested in #5518.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact menu
-	items.  Fixes Ximian bug #5708.
-
-2001-08-01  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Use Jakub's new Find icon for
-	Edit/Search Message menu item.
-
-	* evolution-message-composer.xml: And the new Save and Save As
-	icons for the composer.
-
-2001-07-31  Peter Williams  <peterw@ximian.com>
-
-	* evolution-message-composer.xml: Add "Customize Toolbars" menu item
-	and command.
-
-2001-07-31  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Added Next/Previous menu items under
-	Actions/GoTo.
-
-2001-07-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-tasks.xml: Add a pixmap to the Tasks Settings option
-	to make it consistent with the one in the calendar folder.
-
-2001-07-31  Jason Leach  <jleach@ximian.com>
-
-	* evolution-message-composer.xml: Use the new Send and Send Later
-	icons from Jakub and Tuomas.
-
-2001-07-29  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: use the new print icons.
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Correct the tooltip for the Print
-	button.  Bug #5801.
-
-2001-07-27  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: renamed "Tasks Preferences" to "Tasks Settings"
-	to be consistent with the other components.
-
-2001-07-27  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-comp-editor.xml: removed Edit & Help menus. Fixes #5500.
-
-2001-07-26  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-calendar.xml: Consistency fixes, and reindented the
-	goddamn thing.
-
-2001-07-27  Jason Leach  <jleach@ximian.com>
-
-	* evolution-addressbook.xml: Removed the unused "Settings"
-	submenu, because it creates an extra blank menu after the Help
-	submenu.  Bug #4275.
-
-2001-07-25  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: changed "Settings" to "Calendar Settings".
-	Fixes bug #5498.
-
-2001-07-24  Peter Williams  <peterw@ximian.com>
-
-	* evolution-message-composer.xml: Move Insert File from the File
-	menu into the Insert Menu. Change the accelerators to reflect
-	what's being inserted and add ellipses.
-
-	* evolution-mail-global.xml: Add "Compose New Message" to the
-	Actions menu as suggested in bug #866. Also fix it so that the
-	pixmaps for the Compose menu items are displayed.
-
-2001-07-23  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-message.xml: Add the "Mark as Unimportant" cmd
-	and menu item to the Edit menu. Bug #5225.
-
-2001-07-21  Jason Leach  <jleach@ximian.com>
-
-	* evolution-mail-list.xml: Capitalize "messages" in "Hide Read
-	messages" menu item label.  Bug #5091.
-
-2001-07-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail-message.xml: Removed the "Redirect" menu since
-	this is now a future feature.
-
-2001-07-19  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-calendar.xml: 
-	* evolution-comp-editor.xml: update to use new print icon.
-
-2001-07-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Add closing dots to the "Filter
-	on..." items for consistency with the "VFolder on..." ones.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-list-editor.xml: Remove Print commands and
-	toolbar/menu items.  Also, use "list" instead of "group".
-
-2001-07-09  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-message-composer.xml: remove FileSaveInFolder menu
-	item. rename Insert->File to Insert->Attachment.
-
-2001-07-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Remove "ChangeFolderProperties" item.
-
-	* evolution-mail-list.xml: Add the folder properties item back in;
-	use the "ChangeFolderProperties" verb instead.
-
-	* evolution.xml: Removed "Folder Properties" item from the "File"
-	menu.
-
-2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-mail-message.xml: MessageApplyFilters now has an icon.
-
-2001-07-03  Jason Leach  <jleach@ximian.com>
-
-	[Bug #3612: Accelerator for attach file in composer]
-
-	* evolution-message-composer.xml: Ctrl-Alt-f for attaching files
-	(seemed consistent with the other insert menu items)
-
-	[Bug #809: Mark as important bindings]
-		
-	* evolution-mail-message.xml: Added "Mark as Important" menu
-	thingy.
-
-2001-07-03  Iain Holmes  <iain@ximian.com>
-
-	* Add the seperate pixbuf for the Print button
-
-2001-07-02  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-calendar.xml: Add publish free/busy item
-
-2001-07-02  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: make the 'Task Preferences' menu item appear
-	as the first item in the 'Tools' menu
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Set it up to have an
-	e-charset-picker bonobo-ui menu attached to the Edit menu.
-
-2001-07-02  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Rename "New -> Evolution bar shortcut" into "New
-	-> Shortcut".
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-subscribe.xml: add a separate dockitem for the search
-	entry.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-message-composer.xml: Enable the label next to the
-	"Attach" toolbar button, and get rid of the "Help" menu.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed "NewBarShortcut" verb into "NewShortcut".
-
-2001-06-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail-message.xml: Change type of "MailPrevious" and
-	"MailNext" buttons from "stock" to "pixbuf".
-
-2001-06-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: fixed typos
-
-2001-06-28  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-signature-editor.xml: new file
-
-2001-06-28  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-tasks.xml: added cut/copy/paste entries to the main menu
-
-2001-06-27  Rodrigo Moya <rodrigo@ximian.com>
-
-	* evolution-calendar.xml: added cut/copy/paste entries to the main
-	menu
-
-2001-06-27  Larry Ewing  <lewing@ximian.com>
-
-	* evolution-message-composer.xml: remove FIXME from
-	FileInsertFile.
-
-2001-06-27  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Updated to use TigerT's
-	attachment icon.
-
-	* evolution-mail-message.xml: Copy and Move to Folder now require
-	the Shift key.
-
-	* evolution-mail-list.xml: Changed the Expunge accel to ^E instead
-	of ^X since ^X is Cut and reveresed the order of the
-	Cut/Copy/Paste and Select* menu item groups.
-
-2001-06-26  Peter Williams  <peterw@ximian.com>
-
-	* evolution-mail-global.xml:
-	* evolution-mail-list.xml:
-	* evolution-mail-message.xml: New files. These are the result
-	of splitting evolution-mail.xml into three pieces: one for the
-	global mailer operations, one for the operations on a messagelist,
-	and one for the operations on one or more messages.
-
-	* evolution-mail-messagedisplay: New file. UI for the standalone
-	message browser that you get when you double-click. Very skeleton.
-	
-	* evolution-mail.xml: Removed.
-
-	* Makefile.am: Updated to install new files.
-	
-2001-06-25  jacob berkman  <jacob@ximian.com>
-
-	* evolution-mail.xml: add a preview toggle item
-
-2001-06-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Cut/Copy/Paste menu items.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add cmd for ContactNewList and
-	ContactsPrintPreview.  Also, correct the tip for Select All and
-	add the accelerator.  Add menu/tool items for ContactNewList, and
-	remove the tool item for ContactViewAll.
-
-	* Makefile.am (XML_FILES): add evolution-contact-list-editor.xml.
-
-2001-06-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Get rid of the status bar.
-
-2001-06-22  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-task-editor.xml: new commands
-
-2001-06-21  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: add toolbar
-
-2001-06-20  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-comp-editor.xml: collapse print commands here
-
-2001-06-20  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* evolution-event-editor.xml: Fix typo. s/Cancel then meeting/
-	Cancel the meeting/.
-	
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-contact-editor.xml: split out commands from
-	toolitems/menuitems.
-
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-task-editor.xml: ui xml for task editor
-
-	* Makefile.am: install new file
-	
-2001-06-19  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: change to event specific operations
-
-	* evolution-comp-editor.xml: split non-specific operations out
-	here
-
-	* Makefile.am: install new file
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added a Reply-to-list menu item.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Change for the new stuff.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* evolution.xml: Fix a little thing where it was actually saying
-	"_Delete this folder" in the statusbar.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: change Print Preview's name to
-	ContactsPrintPreview.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add commands/menu items for
-	Cut/Copy/Paste/Select All.
-
-2001-05-28  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Undo Jeff's View menu changes, as they
-	resulted in the normal/fullheaders/source radio group being split
-	across two levels of hiearchy, and grouped "Hide Deleted" with
-	the unrelated other Hide/Show commands.
-
-2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added MailNextUnread, MailNextFlagged,
-	MailPreviousUnread, and MailPreviousFlagged commands. Also
-	rearranged the View menu to be a bit more user-friendly.
-
-	Now where should we put the next/previous menu items?
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* evolution-addressbook.xml: Changed the tooltips here based on
-	Taylor's work.
-
-2001-05-24  Radek Doulik  <rodo@ximian.com>
-
-	* evolution-message-composer.xml: added delete all to edit menu
-	added placeholders for all edit menu parts
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: make the name of menuitem/toolitem's
-	the same as the verb to save us from having to specify both, and
-	move some more accels into the <commands>.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: remove ViewAsTable menu item.
-
-2001-05-21  Federico Mena Quintero  <federico@ximian.com>
-
-	* evolution-tasks.xml: Added a Delete button on the toolbar.
-
-2001-05-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add a control placeholder named "OfflineToggle"
-	to the status bar.
-
-2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Removed verb "NewView"; use
-	"OpenFolderInNewWindow" instead.
-
-2001-05-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add commands for the Folder submenu in the File
-	menu.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* evolution-addressbook.xml: add <commands> for the toolbar/menu
-	items we set the sensitivity on.
-
-2001-05-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Added a "FolderPopup" element and reformatted
-	lots of it.
-
-2001-05-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Added S/MIME menu items.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Add an "Evolution FAQ" entry to the "Help" menu.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Create a "Message Display" submenu in View,
-	move source/full headers/normal there and make it a radio group.
-	Add "Load Images" there.
-
-2001-05-15  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Clean this up A LOT. In addition to cosmetic
-	changes, now every command appears in the <commands> section, and
-	has a tooltip. Also, move "Search" to the "Edit" menu for
-	consistency with other apps.
-
-2001-05-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Remove Help->About.
-
-2001-05-14  Dan Winship  <danw@ximian.com>
-
-	* evolution-mail.xml: Redo forwarding stuff so there's "Forward",
-	"ForwardAttached", "ForwardInline" (not "inlined"), and
-	"ForwardQuoted", where the first uses a default style. Make
-	Actions->Forward and the toolbar Forward button use the default
-	style.
-
-2001-05-12  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-mail.xml: add pixmaps for MessageCopy and
-	MessageForwardAttached. Thanks Wayne Davis <wfdavis@seas.upenn.edu>
-	for a patch.
-
-2001-05-07  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution.xml: Added command entry for 'ToggleOffline'.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed `WorkOffline' to `ToggleOffline'.
-
-2001-05-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Renamed `WorkOffLine' to `WorkOffline'.
-
-2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-04-26  Jon Trowbridge  <trow@ximian.com>
-
-	* evolution-mail.xml: Added "Search Message" to "View" menu.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution.xml: Rename "New View" to "New Window" as suggested in
-	#2124.  Also remove the stock pixmap [a piece of paper doesn't
-	mean much anyway].  Also rename "New Evolution Bar Shortcut" into
-	"New Evolution Shortcut" as we never really refer to it as the
-	"Evolution bar", but rather as the "shortcut bar".  Finally, bind
-	"New Folder" to `Control-Shift-F'.
-
-2001-04-16  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-calendar.xml: toolitems which have non-default pixmaps, must
-	have "pixtype=pixbuf" arg. Now *View buttons show up again.
-
-2001-04-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Filter/VFolder on mailing list. Yay. I
-	also figured I'd expand this like MessageFilterSubj to
-	MessageFilterSubject, what's with the abreviation? It makes no
-	sense when the verb is that long anyway...
-
-2001-03-13  Michael Meeks  <michael@ximian.com>
-
-	* evolution-mail.xml: Add a load of commands, sigh, people do this
-	so brokenly.
-
-2001-04-02  Anders Carlsson  <andersca@codefactory.se>
-
-	* evolution-mail.xml: Added a space after an attribute to make
-	libxml happy.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: as Jacub
-	suggested, added some icons, replaced stock Print with ours, etc.
-
-2001-03-29  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Move the 'hide deleted' to the option list
-	under the view menu.
-
-2001-03-28  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Bind "MessageMarkAsRead" to `Control-k'
-	instead of `Control-q'.
-
-2001-03-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Change "Send and Receive" to "Send /
-	Receive".
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-addressbook.xml: Added artwork from Jakub.
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Add Resend Message under the File menu.
-
-2001-03-17  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-calendar.xml: Added ShowWeekView, ShowMonthView,
-	ShowDay, ShowWorkWeek to the View menu.
-
-	* evolution.xml, evolution-mail.xml: Provide "Actions" in the
-	toplevel evolution.  Fill in Actions/Component in Evolution-mail
-	(no visual changes, just internal changes).
-
-	* evolution-calendar.xml: Added Actions menu.  Added New Verb
-	EditNewEvent. 
-
-2001-03-16  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-mail.xml: Added accelerator to elements missing
-	accelerators (Reply, Inline, Quoted, Attachments, Empty Trash,
-	Full Headers).
-
-	* evolution.xml: Added a placeholder for the beginning of the
-	view. 
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Added Reply-To field.
-
-2001-03-11  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Add an ActionsEmptyTrash menu item.
-
-2001-03-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Took out the "IMPLEMENT ME"'s from the
-	forward menu items since I've coded them now.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Renamed the "Get Mail" button to "Send and
-	Receive" for consistency with the command in the "Actions" menu.
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-message-composer.xml: Reorder menus to be File, Edit,
-	View, Insert, Format (instead of File, Edit, Format, View, Insert).
-
-	Add View/From Field and View/From BCC
-
-	Add Insert/File.
-
-	Add File/Send menu item.
-
-	Change the look to follow the "mailer" look (thiner display).
-
-2001-03-06  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution-tasks.xml: Added "File/New/Task" as well.
-
-	* evolution-mail.xml: Added "File/New/Mail Message" at the top
-	with binding C-n.  
-
-	* evolution-calendar.xml: Set the binding for New Appointment to C-n
-
-	* evolution-contact-editor.xml: Set the toolbar to hlook=text
-	vlook=icon;  Set all icons priority-text to 1. 
-
-	* evolution-addressbook.xml: Added "Contact" to the New menu.
-
-	* evolution.xml: Provide an entry point to put "New" items on the
-	first level. 
-
-	We are going to need some Bonobo support to "hide" objects when
-	other objects appear (like, having Mail Message bound to C-S-X in
-	the global space, and when we switch to Mail, we only show the
-	entry that has C-n as the binding).
-
-2001-02-28  Miguel de Icaza  <miguel@ximian.com>
-
-	* evolution.xml: Moved Importer after the Folder operations per
-	Dan's proposal.
-
-	* evolution-addressbook.xml: Renamed Settings/AddressBook
-	Configuration to Tools/Settings.
-
-	Make all the items have "Print" items that use the same icon
-	instead of a collection of icons.
-
-	* evolution-calendar.xml: Moved "Calendar Preferences" from
-	"Settings" to "Tools/Settings".
-
-	* evolution-mail.xml: Settings menu is fully gone.  All things
-	that run a dialog now end up in "Tools" while actions end up in
-	"Actions".  Hence I am right.
-
-	Renamed "Mail Configuration..." to "Identieies and Servers"
-
-	Move MessageMarkAsRead, MessageMarkAsUnRead
-	to Edit menu.  Add MessageMarkAllAsRead.
-
-	Remove "Print Message" from Message menu.  Remove "Print Preview
-	Message" from Message menu.  Leave them on the "File" menu.
-
-	Renamed "Reply to Sender" to "Reply" (awaiting Ettore's
-	permission). 
-
-	Renamed "Messages" to "Actions".
-
-	Open Message renamed to "Open Selected Items" (as this is what it
-	actually does). 
-
-	Moved "Save Message As" to "File" menu.
-
-	Added "Properties" to the File/Folder submenu.
-
-	Edit menu now looks like this: Message Move, Message Copy, Select
-	All, Invert Selection, Delete, Undelete, Mark as Read, Mark as
-	Unread.  Some of them were moved from the "Messages" menu.
-
-	"Forward message" shortcut changed to C-f
-
-	Tools menu created.
-	
-	Create Rule From message moved to "Tools".
-
-	* evolution.xml: Added Tools menu.  Moved Edit/Customize to
-	Tools/Customize Toolbar.
-
-	Added File/Folder submenu.  Duplicate "New Folder" in here. 
-
-2001-03-04  Damon Chaplin  <damon@ximian.com>
-
-	* evolution-tasks.xml: "New" -> "New Task".
-
-	* evolution-calendar.xml: "New appointment" -> "New Appointment",
-	"Go to" -> "Go To".
-
-2001-02-21  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Setup a command for MailStop.
-
-2001-02-05  Iain Holmes  <iain@ximian.com>
-
-	* evolution-executive-summary.xml: Add a priority.
-
-2001-02-02  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: cmd / widgetify.
-
-2001-01-30  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: Use hlook and vlook so by default we get
-	no text in vertical mode, and priority only in horizontal
-	mode.
-
-2001-01-27  JP Rosevear  <jpr@ximian.com>
-
-	* evolution-event-editor.xml: Menu cleanups
-
-	* evolution-task-editor-dialog.xml: ditto
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml, evolution-calendar.xml,
-	evolution-mail.xml, evolution-tasks.xml, evolution.xml: Change the
-	toolbars to only show some of the labels, a la Outlook.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "PrintMessage" and
-	"PrintPreviewMessage" items to "pixbuf".  Likewise for
-	"MessageSaveAs", "MessageEdit", "MessagePrint", "MessageMove", "MessageReplySndr"
-	and "MessageReplyAll".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-mail.xml: Set the `pixtype' of the "Configure Folder"
-	and "Mail Configuration" items to "pixbuf".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "Find a
-	contact" item to "pixbuf".  Also set the type to "pixbuf" for
-	"Addressbook Configuration", and "Print Contacts".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* evolution-addressbook.xml: Change the type of the "View All"
-	button to "pixbuf".
-
-2001-01-24  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-message-composer.xml: Change Security* to SecurityPGP*
-	as we may someday have S/MIME sign/encrypt.
-
-2001-01-24  Jason Leach  <jasonleach@usa.net>
-
-	(Fix #1252: Need a File->Close way to close a view)
-	
-	* evolution.xml: new File->Close menu item and associated command.
-
-2001-01-22  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Removed the temporary get mail button.
-
-2001-01-19  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Added a temporary button to test new receive
-	code.
-
-2001-01-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* evolution-mail.xml: Added Next/Previous toolbar buttons.
-
-2001-01-15  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: progressive cmd/widgetization and
-	add the 'Customize' entry.
-
-2001-01-16  Not Zed  <NotZed@Ximian.com>
-
-	* evolution-mail.xml: Add a stop button to the toolbar.
-
-2001-01-15  Jason Leach  <jasonleach@usa.net>
-
-	(Bug #1143: Add elipses to more menu items that lead to dialogs)
-	
-	* evolution-mail.xml: "Folder/Configure Folder..."
-	* evolution.xml: "File/Import file..."
-	
-2001-01-10  Miguel de Icaza  <miguel@helixcode.com>
-
-	* evolution.xml: Remove fixme from NewMailMessage.
-
-2001-01-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added SaveDraft bonobo menu verb
-	thingy.
-
-2001-01-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-tasks.xml: new file for the Tasks controls.
-
-	* Makefile.am (XML_FILES): added the above file.
-
-2001-01-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-event-editor.xml:
-	* evolution-task-editor-dialog.xml: Make the ordering of the
-	toolbar items consistent.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: remove evolution-addressbook-ldap.xml so we
-	build again.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: add "Settings/Addressbook
-	Configuration..."  Analogous to "Settings/Mail Configuration..." in
-	evolution-mail.
-
-	* evolution-addressbook-ldap.xml: removed.
-	
-2000-12-23  Jason Leach  <jasonleach@usa.net>
-
-	* evolution-mail.xml: Added ellipsis to Settings menu entries that
-	  bring up dialogs.  Bug #1019.
-
-2000-12-23  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: s/<menuitem\/>/<separator\/>/
-
-	* evolution.xml: ditto.
-
-2000-12-21  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: remove wierd extraneous '>'
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-executive-summary.xml: stop executive summary
-	making the UI flicker when switching to / from it.
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* evolution-calendar.xml: Fix bug #635
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* evolution-addressbook.xml: give View->As Table its verb back so
-	it works.
-
-2000-12-14  Not Zed  <NotZed@HelixCode.com>
-
-	* evolution-mail.xml: Added message hiding items.
-
-2000-12-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-message-composer.xml: Added Security menu
-
-2000-12-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Make the forward button in the toolbar
-	forward as an attachment.
-
-2000-12-13  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: redone shortcuts
-
-2000-12-12  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: removed Bold item from toolbar
-
-2000-12-04  Dan Winship  <danw@helixcode.com>
-
-	* evolution-mail.xml: Fix typo
-
-2000-12-04  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-mail.xml: Renamed "MessageForward" to
-	"MessageForwardInlined" and "MessageForwardAttach" to
-	"MessageForwardAttached".  Make the attached forward the default,
-	and the one advertised on the toolbar as well.
-
-2000-12-01  Anna Marie Dirks  <anna@helixcode.com>
-
-	* evolution.xml: Redid all the keyboard shortcuts to comply with GNOME
-	standards. Removed unnecessary shortcuts from less commonly used menu 
-	items, changed all references to "alt", etc. 
-	* evolution-addressbook.xml: see above
-	* evolution-mail.xml: see above
-	* evolution-calendar.xml: Same as above, but I also reorganized menus slightly by moving "new appointment" from the edit menu to the file menu.   
-
-2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Save As...
-
-2000-11-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-message-composer.xml: Make "Toolbar"'s behavior
-	"exclusive".
-	* evolution-task-editor-dialog.xml: Likewise.
-
-2000-11-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Moved ViewSource to the View menu and made
-	it a toggle menu.
-
-2000-11-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added View Message Source.
-
-2000-11-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added Forward as Attachment.
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added Send contact as attachment
-	and Send to contact to menus.
-
-2000-11-09  Anna Marie Dirks <anna@helixcode.com>
-	* evolution-calendar.xml: Added (and cleaned up) keyboard shortcuts.
-	* evolution-addressbook.xml: Added keyboard shortcuts.  
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-	* evolution.xml: Added keyboard shortcuts to all shell menus.
-	* evolution-mail.xml: Added keyboard shortcuts to all shell menus.
-
-2000-11-08  Anna Marie Dirks <anna@helixcode.com>
-        * evolution-message-composer.xml: Added keyboard shortcuts
-	to all of the composer menus.
-
-2000-11-07  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* evolution-event-editor.xml: removed ``FIXME'' from the
-	``Schedule Meeting'' menu.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Updated Message menu.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-contact-editor.xml: Added print envelope menus.  Added
-	...s.
-
-2000-11-05  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am (uidir): kill all the bonob-ui-extract crud.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* evolution-addressbook.xml: Removed QuickSearch widget.
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* evolution-message-composer.xml: added accel="*Control*Return" to
-	FileSend
-	replace FileSendNow with FileSend as FileSendNow wasn't defined
-	
-2000-10-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Added a MessageApplyFilters menu item.
-
-	* evolution-subscribe.xml: Don't have a Unselect All, use Invert
-	Selection instead.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Makefile.am (H_FILES): New.
-	(EXTRA_DIST): Add `$(H_FILES)'.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-message-composer.xml: add.
-
-	* checking all generated .h files ( sim. to glade ) to make
-	translator's lives easier.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-event-editor.xml: added.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-task-editor-dialog.xml: added.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* Makefile.am: Add rule to use bonobo-ui-extract to build
-	translatable files.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: drasticaly shrink to just the
-	new features available with ldap; don't duplicate stuff.
-
-	* evolution-addressbook.xml: fix tooltips.
-
-	* *.xml: remove redundant attributes causing toolber rebuilds.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: add translation '_'s to some labels.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: Added toolbar buttons to switch views.
-	We'll use plain buttons for the view buttons for now, until Bonobo
-	toolbars support radio buttons.
-
-2000-10-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-addressbook-ldap.xml: Apply behavior "exclusive" to
-	"Toolbar".
-	* evolution.xml: Likewise.
-	* evolution-addressbook.xml: Likewise.
-	* evolution-mail.xml: Likewise.
-	* evolution-contact-editor.xml: Likewise.
-	* evolution-subscribe.xml: Likewise.
-
-2000-10-08  Damon Chaplin  <damon@helixcode.com>
-
-	* evolution-calendar.xml: moved the calendar settings menu item to the
-	Settings menu and renamed it to "Calendar Preferences".
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: s/Menu_//
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml fix the mess with separators.
-
-2000-10-09  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-subscribe.xml: s/descr/tip/
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove redundant separator.
-
-	* *.xml: Remove replicated attributes from structural elements.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* evolution.xml: fix from Darin toolbar -> dockitem.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* evolution-mail.xml: Add Invert Selection
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: bind 'D' to MessageDelete; a proto binding.
-
-2000-10-04  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-calendar.xml: move Open, Save into FileOps
-
-	* evolution.xml: add FileOps placeholder.
-
-2000-09-15  Michael Meeks  <michael@helixcode.com>
-
-	* *.xml: Update to new keybinding syntax.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* evolution-mail.xml: remove stock icons on toolbar.
-	add back 2 stocks I lost somewhere.
-
-	* ui/evolution.xml: Add status bar
diff --git a/ui/Makefile.am b/ui/Makefile.am
deleted file mode 100644
index 007170e330..0000000000
--- a/ui/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-XML_FILES =				\
-	evolution.xml			\
-	evolution-addressbook.xml	\
-	evolution-calendar.xml		\
-	evolution-contact-editor.xml	\
-	evolution-contact-list-editor.xml	\
-	evolution-comp-editor.xml	\
-	evolution-event-editor.xml	\
-	evolution-executive-summary.xml	\
-	evolution-mail-message.xml	\
-	evolution-mail-list.xml		\
-	evolution-mail-global.xml	\
-	evolution-mail-messagedisplay.xml	\
-	evolution-message-composer.xml	\
-	evolution-signature-editor.xml		\
-	evolution-subscribe.xml		\
-	evolution-task-editor.xml	\
-	evolution-tasks.xml		\
-	my-evolution.xml
-
-uidir = $(datadir)/gnome/ui
-ui_DATA = $(XML_FILES)
-
-EXTRA_DIST = $(XML_FILES)
diff --git a/ui/evolution-addressbook.h b/ui/evolution-addressbook.h
deleted file mode 100644
index 3128ccfb83..0000000000
--- a/ui/evolution-addressbook.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  This file is autogenerated from evolution-addressbook.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Print Contacts...");
-gchar *s = N_("As _Table");
-gchar *s = N_("_New Contact");
-gchar *s = N_("_Tools");
-gchar *s = N_("_Search for contacts");
-gchar *s = N_("New");
-gchar *s = N_("Create a new contact");
-gchar *s = N_("Find");
-gchar *s = N_("Find a contact");
-gchar *s = N_("Print");
-gchar *s = N_("Print contacts");
-gchar *s = N_("Delete");
-gchar *s = N_("Delete a contact");
-gchar *s = N_("View All");
-gchar *s = N_("View all contacts");
-gchar *s = N_("Stop");
-gchar *s = N_("Stop Loading");
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index 2481bbba95..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<Root>
-	<commands>
-		<cmd name="ContactDelete"
-		 _tip="Delete selected contacts"
-		 accel="*Control*d"/>
-
-		<cmd name="ContactNew"
-		 _tip="Create new contact"
-		 accel="*Control*n"/>
-
-		<cmd name="ContactNewList"
-		 _tip="Create new contact list"/>
-
-		<cmd name="ContactsPrint"
-		 _tip="Print selected contacts"
-		 pixtype="stock" pixname="Print"
-		 accel="*Control*p"/>
-
-		<cmd name="ContactsPrintPreview"
-		 _tip="Previews the contacts to be printed"
-		 pixtype="stock" pixname="Print"
-		 accel="*Control*p"/>
-
-		<cmd name="ContactStop"
-		 _tip="Stop Loading"
-		 pixtype="stock" pixname="Stop"/>
-
-		<cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
-		 accel="*Control*x"/>
-
-                <cmd name="ContactsCopy" _label="Copy"
-		 _tip="Copy the selection"
-		 accel="*Control*c"/>
-
-		<cmd name="ContactsPaste" _label="Paste"
-		 _tip="Paste the clipboard"
-		 accel="*Control*v"/>
-
-		<cmd name="ContactsSelectAll" _label="Select All"
-		 _tip="Select all contacts"
-		 accel="*Control*a"/>
-
-		<cmd name="ContactsSaveAsVCard" _label="Save as VCard"
-		 _tip="Save selected contacts as a VCard."
-		 accel="*Control*v"/>
-
-		<cmd name="ContactsSendContactToOther" _label="Forward Contact"
-		 _tip="Send selected contacts to another person."/>
-
-		<cmd name="ContactsSendMessageToContact" _label="Send message to contact"
-		 _tip="Send a mess to the selected contacts."/>
-
-	</commands>
-
-	<menu>
-		<submenu name="File">
-		        <placeholder name="FileOps">
-			        <menuitem name="ContactsSaveAsVCard"
-				 verb="" _label="_Save as VCard"
-				 pixtype="pixbuf"/>
-			</placeholder>
-
-                        <submenu name="New">
-	                	<placeholder name="NewFirstItem">
-	                        	<menuitem name="ContactNew" verb=""
-	                        	 _label="_Contact"
-					 pixtype="pixbuf"/>
-	                        	<menuitem name="ContactNewList" verb=""
-	                        	 _label="_Contact List"
-					 pixtype="pixbuf"/>
-	                                <separator/>
-	                        </placeholder>
-		                </submenu>
-      
-			<placeholder name="Print">
-
-			    <menuitem name="ContactsPrintPreview" verb=""
-			      _label="Print Preview"
-			      pixtype="pixbuf"/>
-			    <menuitem name="ContactsPrint" verb=""
-			    _label="_Print..."
-			      pixtype="pixbuf"/>
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-			<menuitem name="ContactsCut" verb="" _label="C_ut"
-			 pixtype="pixbuf"/>
-	
-			<menuitem name="ContactsCopy" verb="" _label="_Copy"
-			 pixtype="pixbuf"/>
-	
-			<menuitem name="ContactsPaste" verb="" _label="_Paste"
-			 pixtype="pixbuf"/>
-
-		        <menuitem name="ContactDelete" verb=""
-		        _label="Delete" pixtype="pixbuf"/>
-			<separator/>
-
-			<menuitem name="ContactsSelectAll" verb="" _label="_Select All"/>
-		</submenu>
-
-		<submenu name="View">
-		</submenu>
-
-                <placeholder name="ComponentToolsPlaceholder">
-			<submenu name="Tools" _label="_Tools">
-				<menuitem name="ToolSearch" verb=""
-				 _label="_Search for Contacts"
-				 pixtype="pixbuf"/>
-
-	        	        <menuitem name="AddressbookConfig" verb=""
-	        	         _label="_Addressbook Sources..."
-	        	         pixtype ="pixbuf"/>
-			</submenu>
-                </placeholder>
-
-		<placeholder name="ComponentActionsPlaceholder">
-                        <submenu name="Actions" _label="_Actions">
-
-			    <menuitem name="ContactsSendContactToOther"
-			     _label="_Forward Contact..." verb=""/>
-
-			    <menuitem name="ContactsSendMessageToContact"
-			     _label="Send _Message to Contact..." verb=""/>
-	                </submenu>
-		</placeholder>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="ContactNew" verb=""
-		_label="New Contact"
-		pixtype="pixbuf" priority="1"/>
-
-		<toolitem name="ContactNewList" verb=""
-		_label="New List"
-		pixtype="pixbuf" priority="1"/>
-
-		<separator/>
-
-		<toolitem name="ContactsPrint" verb=""
-		_label="Print" pixtype="pixbuf"/>
-
-		<toolitem name="ContactDelete" verb=""
-		_label="Delete" pixtype="pixbuf"/>
-
-		<toolitem name="ContactStop" verb=""
-		_label="Stop"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index e44b36e411..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="CalendarNewAppointment" _tip="Create a new appointment"
-	 accel="*Control*n"/>
-    <cmd name="CalendarNewEvent" _tip="Create an event for the whole day"/>
-
-    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf" 
-	 accel="*Control*p"/>
-    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
-    <cmd name="CalendarSettings" _tip="Configure the calendar's settings"/>
-
-    <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
-    <cmd name="CalendarToday" _tip="Go to today" pixtype="stock" pixname="Home"/>
-    <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Go to a specific date"/>
-
-    <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
-    <cmd name="ShowWorkWeekView" _tip="Show work week" pixtype="pixbuf"/>
-    <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="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
-  </commands>
-
-  <menu>
-    <submenu name="File">
-
-      <submenu name="New">
-
-	<placeholder name="NewFirstItem">
-	  <menuitem name="NewAppointment" verb="CalendarNewAppointment"
-		    _label="_Appointment..." pixtype="pixbuf"/>
-	  <menuitem name="NewTask" verb="CalendarNewTask"
-		    _label="_Task..." pixtype="pixbuf"/>
-	  <separator/>
-	</placeholder>
-
-      </submenu>
-
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
-		  _label="Print Pre_view" pixtype="pixbuf"/>
-
-	<menuitem name="Print" verb="CalendarPrint" accel="*Control*p"
-		  _label="_Print..." pixtype="pixbuf"/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="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"/>
-    </submenu>
-
-    <submenu name="View">
-      <placeholder name="ViewBegin">
-	<menuitem name="Today" verb="CalendarToday" _label="Go to _Today"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date" pixtype="pixbuf"/>
-	<separator/>
-      </placeholder>
-
-     </submenu>
-
-    <placeholder name="ComponentToolsPlaceholder">
-      <submenu name="Tools" _label="_Tools">
-	<menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/>
-      </submenu>
-    </placeholder>
-
-    <placeholder name="ComponentActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-	<menuitem name="NewAppointment" verb="CalendarNewAppointment"
-		  _label="Create a _New Appointment" pixtype="pixbuf"/>
-	<menuitem name="NewEvent" verb="CalendarNewEvent" _label="Create a New All-Day _Event" pixtype="pixbuf"/>
-
-	<menuitem name="NewTask" verb="CalendarNewTask" _label="Create a New _Task" pixtype="pixbuf"/>
-
-	<separator/>
-
-	<menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/>
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-  
-    <toolitem name="New" verb="CalendarNewAppointment" _label="New Appointment"
-	      priority="1" pixtype="pixbuf"/>
-
-    <toolitem name="NewTask" verb="CalendarNewTask" _label="New Task"
-	      priority="1" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
-    <toolitem name="Delete" verb="DeleteEvent" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Prev" verb="CalendarPrev" pixtype="pixbuf"/>
-    <toolitem name="Today" verb="CalendarToday"/>
-    <toolitem name="Next" verb="CalendarNext" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WeekView" verb="ShowWeekView" _label="Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="MonthView" verb="ShowMonthView" _label="Month" priority="1" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-comp-editor.xml b/ui/evolution-comp-editor.xml
deleted file mode 100644
index 90bd20ebf8..0000000000
--- a/ui/evolution-comp-editor.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<Root>
-
-<commands>
-
-        <cmd name="FilePrint" _label="Print..."
-	_tip="Print this item"/>
-
-        <cmd name="FilePrintPreview" _label="Print Pre_view"
-          _tip="Preview the printed item"/>
-
-        <cmd name="FilePrintSetup" _label="Print S_etup"
-          _tip="Setup the page settings for your current printer"/>
-
-        <cmd name="FileSave" _label="Save"
-	_tip="Save the item and close the dialog box"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAndClose" _label="Save and Close"
-	_tip="Save the item and close the dialog box"
-	accel="*Control*s"/>
-
-        <cmd name="FileSaveAs" _label="Save As..."
-	_tip="Save this item to disk"
-        accel="*Control*Alt*s"/>
-
-	<cmd name="FileDelete" _label="Delete"
-	_tip="Delete this item"/>
-
-        <cmd name="FileClose" _label="C_lose"
-	_tip="Close this item"
-        pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-</commands>
-
-<menu>
-
-<submenu name="File" _label="_File">
-
-        <menuitem name="FileSave" verb="" pixtype="pixbuf"/>
-
-        <menuitem name="FileSaveAndClose" verb="" pixtype="pixbuf"/>
-
-        <menuitem name="FileSaveAs" verb="" pixtype="pixbuf"/>
-
-	<separator/>
-
-        <menuitem name="FileDelete" verb="" pixtype="pixbuf"/>
-
-	<separator/>
-
-	<menuitem name="FilePrint" verb="" pixtype="pixbuf"/>
-
-	<menuitem name="FilePrintPreview" verb="" pixtype="pixbuf"/>
-
-	<menuitem name="FilePrintSetup" verb=""/>
-
-	<separator/>
-
-        <menuitem name="FileClose" verb=""/>
-
-</submenu>	
-
-<submenu name="Actions" _label="_Actions">
-
-	<placeholder name="Actions"/>
-
-</submenu>
-
-</menu>
-
-<dockitem name="Toolbar"relief="none" behavior="exclusive"
- _tip="Main toolbar" hlook="text" vlook="icon">
-
-        <toolitem name="FileSaveAndClose" verb="" _label="Save and Close" priority="1" pixtype="pixbuf"/>
-
-	<separator/>
-        
-	<toolitem name="FilePrint" verb="" _label="Print" priority="1" pixtype="pixbuf"/>
-
-	<toolitem name="FilePrintPreview" verb="" _label="Print Preview" priority="1" pixtype="pixbuf"/>
-
-	<separator/>
-
-        <toolitem name="FileDelete" verb="" _label="Delete" priority="1" pixtype="pixbuf"/>
-
-        <toolitem name="FileClose" verb="" _label="Close" priority="1"/>
-
-</dockitem>
-
-</Root>
diff --git a/ui/evolution-contact-editor.xml b/ui/evolution-contact-editor.xml
deleted file mode 100644
index 4ec5876629..0000000000
--- a/ui/evolution-contact-editor.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<Root>
-        <commands>
-		<cmd name="ContactEditorSave" pixtype="pixbuf" accel="*Control*s"/>
-		<cmd name="ContactEditorSaveAs" pixtype="pixbuf" accel="*Control*v"/>
-
-		<cmd name="ContactEditorSendAs"/>
-
-		<cmd name="ContactEditorSendTo"/>
-
-		<cmd name="ContactEditorDelete" pixtype="pixbuf"
-		 _tip="Delete this item" accel="*Control*d"/>
-
-		<cmd name="ContactEditorPrint"
-		 _tip="Print this item"
-		 pixtype="pixbuf" accel="*Control*p"/>
-
-<!-- Envelope printing is disabled for Evolution 1.0.
-		<cmd name="ContactEditorPrintEnvelope"
-		 pixtype="pixbuf"/>
--->
-
-		<cmd name="ContactEditorClose"
-		 pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-		<cmd name="ContactEditorSaveClose"
-		 _tip="Save the contact and close the dialog box"
-		 pixtype="stock" pixname="Save"/>
-	</commands>
-
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-		        <menuitem name="ContactEditorSave" verb="" _label="_Save"/>
-		        <menuitem name="ContactEditorSaveAs" verb="" _label="Save _As..."/>
-
-			<separator/>
-
-		        <menuitem name="ContactEditorDelete" verb=""
-			_label="Delete"/>
-
-			<separator/>
-
-			<placeholder name="Print">
-
-				<menuitem name="ContactEditorPrint" verb=""
-				_label="_Print..."/>
-
-<!-- Envelope printing is disabled for Evolution 1.0.
-
-				<menuitem name="ContactEditorPrintEnvelope" verb=""
-				_label="Print En_velope..."/>
--->
-
-			</placeholder>
-
-			<separator/>
-
-		        <menuitem name="ContactEditorClose" verb=""
-			_label="Close"/>
-
-		</submenu>
-		<submenu name="Actions" _label="_Actions">
-		        <menuitem name="ContactEditorSendAs" verb="" 
-			_label="_Forward Contact..."/>
-
-		        <menuitem name="ContactEditorSendTo" verb=""
-			_label="Send _Message to Contact..."/>
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-			hlook="text" vlook="icon">
-	        <toolitem name="ContactEditorSave" verb=""
-		_label="Save" priority="1" pixtype="pixbuf"/>
-
-		<separator/>
-
-		<toolitem name="ContactEditorPrint" verb=""
-		_label="Print" priority="1" pixtype="pixbuf"/>
-
-		<separator/>
-
-		<toolitem name="ContactEditorDelete" verb=""
-		_label="Delete" pixtype="pixbuf" priority="1"/>
-
-		<toolitem name="ContactEditorClose" verb=""
-		_label="Close" priority="1"/>	
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-contact-list-editor.xml b/ui/evolution-contact-list-editor.xml
deleted file mode 100644
index 49cc8b6abe..0000000000
--- a/ui/evolution-contact-list-editor.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<Root>
-        <commands>
-		<cmd name="ContactListEditorSave" pixtype="pixbuf" accel="*Control*s"/>
-		<cmd name="ContactListEditorSaveAs" pixtype="pixbuf" accel="*Control*v"/>
-
-		<cmd name="ContactListEditorSendAs"/>
-		<cmd name="ContactListEditorSendTo"/>
-
-		<cmd name="ContactListEditorDelete"
-		 _tip="Delete this list"
-		 pixtype="pixbuf" accel="*Control*d"/>
-
-		<cmd name="ContactListEditorClose"
-		 pixtype="stock" pixname="Close" accel="*Control*w"/>
-
-		<cmd name="ContactListEditorSaveClose"
-		 _tip="Save the list and close the dialog box"
-		 pixtype="pixbuf"/>
-	</commands>
-
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-		        <menuitem name="ContactListEditorSave" verb=""
-			_label="_Save"/>
-
-		        <menuitem name="ContactListEditorSaveAs" verb=""
-			_label="Save _As..."/>
-
-			<separator/>
-
-		        <menuitem name="ContactListEditorDelete" verb=""
-			_label="Delete..."/>
-
-			<separator/>
-
-		        <menuitem name="ContactListEditorClose" verb=""
-			_label="Close"/>
-
-		</submenu>
-
-		<submenu name="Actions" _label="_Actions">
-		        <menuitem name="ContactListEditorSendAs" verb=""
-			_label="Se_nd list to other..."/>
-
-		        <menuitem name="ContactListEditorSendTo" verb=""
-			_label="Send _message to list..."/>
-		</submenu>
-
-	</menu>
-
-	<dockitem name="Toolbar" relief="none" behavior="exclusive"
-			hlook="text" vlook="icon">
-	        <toolitem name="ContactListEditorSave" verb=""
-		_label="Save" priority="1" />
-
-		<separator/>
-
-		<toolitem name="ContactListEditorDelete" verb=""
-		_label="Delete" priority="1" />
-
-	        <toolitem name="ContactListEditorClose" verb=""
-		_label="Close" priority="1" />
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
deleted file mode 100644
index 92057ef6be..0000000000
--- a/ui/evolution-event-editor.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-
-<commands>
-
-	<cmd name="ActionScheduleMeeting" _label="Schedule _Meeting"
-        _tip="Schedule a meeting for this item"/>
-
-	<cmd name="ActionRefreshMeeting" _label="Re_fresh Meeting"
-        _tip="Obtain the latest meeting information"/>
-
-	<cmd name="ActionCancelMeeting" _label="Cancel Mee_ting"
-        _tip="Cancel the meeting for this item"/>
-
-	<cmd name="ActionForward" _label="Forward as i_Calendar"
-        _tip="Forward this item via email"/>
-
-</commands>
-
-<menu>
-
-<submenu name="Actions" _label="_Actions">
-
-	<placeholder name="Actions">
-
-	         <menuitem name="ActionScheduleMeeting" verb=""/>
-
-	         <menuitem name="ActionRefreshMeeting" verb=""/>
-
-	         <menuitem name="ActionCancelMeeting" verb=""/>
-
-                 <separator/>
-
-	         <menuitem name="ActionForward" verb=""/>
-
-	</placeholder>
-
-</submenu>
-
-</menu>
-
-</Root>
diff --git a/ui/evolution-executive-summary.xml b/ui/evolution-executive-summary.xml
deleted file mode 100644
index d6f53e236e..0000000000
--- a/ui/evolution-executive-summary.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Root>
-  <menu>
-
-    <submenu name="Settings">
-
-	<menuitem name="CustomiseMyEvolution" verb="CustomiseMyEvolution"
-	_label="Customise My Evolution"/>
-
-    </submenu>
-
-  </menu>
-</Root>
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
deleted file mode 100644
index 2cf57118e2..0000000000
--- a/ui/evolution-mail-global.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="EmptyTrash"
-     _tip="Permanently remove all deleted messages from all folders"/>
-
-    <cmd name="ForgetPasswords"
-     _tip="Forget remembered passwords so you will be prompted for them again"/>
-
-    <cmd name="MailCompose"
-     _tip="Open a window for composing a mail message"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailGetSend"
-     _tip="Send queued mail and retrieve new mail"
-     pixtype="pixbuf"/>
-
-    <cmd name="MailStop"
-     _tip="Cancel the current mail operation"
-     pixtype="stock" pixname="Stop"/>
-
-    <cmd name="ToolsFilters"
-     _tip="Create or edit rules for filtering new mail"/>
-
-    <cmd name="ToolsSettings"
-     _tip="Create or edit mail accounts and other preferences"
-     pixtype="pixbuf"/>
-
-    <cmd name="ToolsSubscriptions"
-     _tip="Subscribe or unsubscribe to folders on remote servers"/>
-
-    <cmd name="ToolsVFolders"
-     _tip="Create or edit virtual folder definitions"/>
-
-    <cmd name="ViewPreview"
-     _tip="Show message preview window"
-     accel="q"
-     type="toggle"  />
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <submenu name="New">
-        <placeholder name="NewFirstItem">
-          <menuitem name="MessageNew" verb="MailCompose"
-           accel="*Control*n" _label="_Mail Message"/>
-
-          <separator/>
-        </placeholder>
-      </submenu>
-    </submenu>
-
-    <submenu name="View">
-      <menuitem name="ViewPreview" verb="" _label="_Preview Pane"/>
-      <separator/>
-      <placeholder name="MailMessageView"/>
-      <placeholder name="MailListView"/>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="MailListEdit"/>
-      <placeholder name="MailMessageEdit"/>
-      <placeholder name="MailListEditFlags"/>
-    </submenu>
-
-    <placeholder name="ComponentActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-        <menuitem name="MailGetSend" verb="" _label="_Send / Receive"/>
-        <menuitem name="ActionCompose" verb="MailCompose" _label="Compose _New Message"/>
-
-        <separator/>
-
-        <placeholder name="MailMessageActions"/>
-
-        <menuitem name="ForgetPasswords" verb="" _label="Forget _Passwords"/>
-
-        <placeholder name="MailListActions"/>
-
-        <menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
-      </submenu>
-    </placeholder>
-
-    <placeholder name="ComponentToolsPlaceholder">
-      <submenu name="Tools" _label="_Tools">
-
-        <menuitem name="ToolsSettings" verb="" _label="_Mail Settings..."/>
-
-        <separator/>
-
-        <placeholder name="MailFilterTools">
-          <menuitem name="ToolsFilters" verb="" _label="_Filters..."/>
-        </placeholder>
-
-        <separator/>
-
-        <placeholder name="MailVFolderTools">
-          <menuitem name="ToolsVFolders" verb="" _label="Virtual Folder _Editor..."/>
-        </placeholder>
-
-        <separator/>
-
-        <menuitem name="ToolsSubscriptions" verb="" _label="_Subscribe to Folders..."/>
-
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-     <toolitem name="MailCompose" verb=""
-     _label="New Message" priority="1"
-     pixtype="pixbuf"/>
-
-    <toolitem name="MailGetSend" verb=""
-     _label="Send / Receive" priority="1"
-     pixtype="pixbuf"/>
-
-    <separator/>
-
-    <placeholder name="MailMessageToolbar"/>
-
-    <toolitem name="MailStop" verb=""
-     _label="Cancel"/>
-
-    <separator/>
-
-    <placeholder name="MailNextButtons"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
deleted file mode 100644
index 070a3de221..0000000000
--- a/ui/evolution-mail-list.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="EditCut"
-     _tip="Cut selected messages"
-     accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="EditCopy"
-     _tip="Copy selected messages"
-     accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="EditPaste"
-     _tip="Paste message in the clipboard"
-     accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="EditInvertSelection"
-     _tip="Select all and only the messages that are not currently selected"
-     accel="*Control*i"/>
-
-    <cmd name="EditSelectAll"
-     _tip="Select all visible messages"
-     accel="*Control*a"/>
-
-    <cmd name="EditSelectThread"
-     _tip="Select all messages in the same thread as the selected message"
-     accel="*Control*h"/>
-
-    <cmd name="ChangeFolderProperties"
-     _tip="Change the properties of this folder"
-     pixtype="pixbuf"/>
-
-    <cmd name="FolderExpunge"
-     _tip="Permanently remove all deleted messages from this folder"
-     accel="*Control*e"/>
-
-    <cmd name="HideDeleted"
-     _tip="Hide deleted messages rather than displaying them with a line through them"
-     type="toggle" />
-
-    <cmd name="MessageMarkAllAsRead"
-     _tip="Mark all visible messages as read"/>
-
-    <cmd name="ViewHideRead"
-     _tip="Temporarily hide all messages that have already been read"
-     pixtype="pixbuf"/>
-
-    <cmd name="ViewHideSelected"
-     _tip="Temporarily hide the selected messages"
-     pixtype="pixbuf"/>
-
-    <cmd name="ViewShowAll"
-     _tip="Show messages that have been temporarily hidden"
-     pixtype="pixbuf"/>
-
-    <cmd name="ViewThreaded"
-     _tip="Threaded Message list"
-     accel="*Control*t"
-     type="toggle" />
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <submenu name="Folder" _label="_Folder">
-         <menuitem name="ChangeFolderProperties" verb="" _label="_Properties..."/>
-      </submenu>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="MailListEdit">
-        <menuitem name="EditSelectAll" verb="" _label="Select _All"/>
-        <menuitem name="EditSelectThread" verb="" _label="Select _Thread"/>
-        <menuitem name="EditInvertSelection" verb="" _label="_Invert Selection"/>
-
-        <separator/>
-
-        <menuitem name="EditCut" verb="" _label="Cu_t"/>
-        <menuitem name="EditCopy" verb="" _label="_Copy"/>
-        <menuitem name="EditPaste" verb="" _label="_Paste"/>
-
-        <separator/>
-      </placeholder>
-
-      <placeholder name="MailListEditFlags">
-        <menuitem name="MessageMarkAllAsRead" verb="" _label="Mark All as R_ead"/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="View">
-      <placeholder name="MailMessageView">
-        <menuitem name="ViewThreaded" verb="" _label="_Threaded Message List"/>
-        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
-      </placeholder>
-
-      <placeholder name="MailListView">
-        <separator/>
-        <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
-        <menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/>
-        <menuitem name="ViewShowAll" verb="" _label="Sh_ow Hidden Messages"/>
-     </placeholder>
-    </submenu>
-
-    <placeholder name="ComponentActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-        <placeholder name="MailListActions">
-          <menuitem name="FolderExpunge" verb="" _label="_Expunge"/>
-        </placeholder>
-      </submenu>
-    </placeholder>
-  </menu>
-
-</Root>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
deleted file mode 100644
index 19a8c82696..0000000000
--- a/ui/evolution-mail-message.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<Root>
-
-  <commands>   <!-- Alphabetical by name, yo -->
-
-    <cmd name="MailNext"
-     _tip="Display the next message"
-     accel="f"/>
-
-    <cmd name="MailNextFlagged"
-     _tip="Display the next important message"/>
-
-    <cmd name="MailNextUnread"
-     _tip="Display the next unread message"
-     accel="n"/>
-
-    <cmd name="MailNextThread"
-     _tip="Display the next unread thread"
-     accel="t"/>
-
-    <cmd name="MailPrevious"
-     _tip="Display the previous message"
-     accel="b"/>
-
-    <cmd name="MailPreviousFlagged"
-     _tip="Display the previous important message"/>
-
-    <cmd name="MailPreviousUnread"
-     _tip="Display the previous unread message"
-     accel="p"/>
-
-    <cmd name="MessageApplyFilters"
-     _tip="Apply filter rules to the selected messages"
-     accel="*Control*y"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageCopy"
-     _tip="Copy selected messages to another folder"
-     accel="*Control**Shift*c"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageDelete"
-     _tip="Mark the selected messages for deletion"
-     accel="*Control*d"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageForward"
-     _tip="Forward the selected message to someone"
-     accel="*Control*f"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageForwardAttached"
-     _tip="Forward the selected message to someone as an attachment"
-     accel="*Control*j"/>
-
-    <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"
-     accel="*Control**Shift*j"/>
-
-    <cmd name="MessageForwardQuoted"
-     _tip="Forward the selected message quoted like a reply"/>
-
-    <cmd name="MessageMarkAsRead"
-     _tip="Mark the selected messages as having been read"
-     accel="*Control*k"/>
-
-    <cmd name="MessageMarkAsUnRead"
-     _tip="Mark the selected messages as not having been read"
-     accel="*Control**Shift*k"/>
-
-    <cmd name="MessageMarkAsImportant"
-     _tip="Mark the selected messages as important"/>
-
-    <cmd name="MessageMarkAsUnimportant"
-     _tip="Mark the selected messages as unimportant"/>
-
-    <cmd name="MessageMove"
-     _tip="Move selected messages to another folder"
-     accel="*Control**Shift*m"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageOpen"
-     _tip="Open the selected message in a new window"
-     accel="*Control*o"/>
-
-    <cmd name="MessageReplyAll"
-     _tip="Compose a reply to all of the recipients of the selected message"
-     accel="*Control**Shift*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageReplyList"
-     _tip="Compose a reply to the mailing list of the selected message"
-     accel=""
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageReplySender"
-     _tip="Compose a reply to the sender of the selected message"
-     accel="*Control*r"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageResend"
-     _tip="Open the selected message in the composer to re-send it"/>
-
-    <cmd name="MessageSaveAs"
-     _tip="Save the message as a text file"
-     accel="*Control**Alt*s"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageSearch"
-     _tip="Search for text in the body of the displayed message"
-     pixtype="pixbuf"/>
-
-    <cmd name="MessageUndelete"
-     _tip="Un-delete the selected messages"
-     accel="*Control*u"/>
-
-    <cmd name="PrintMessage"
-     _tip="Print this message"
-     accel="*Control*p"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintPreviewMessage"
-     _tip="Preview the message to be printed"
-     pixtype="pixbuf"/>
-
-    <cmd name="PrintSetup"
-     _tip="Setup the page settings for your current printer"
-     pixtype="pixbuf"/>
-
-    <cmd name="ToolsFilterMailingList"
-     _tip="Create a rule to filter messages to this mailing list"/>
-
-    <cmd name="ToolsFilterRecipient"
-     _tip="Create a rule to filter messages to these recipients"/>
-
-    <cmd name="ToolsFilterSender"
-     _tip="Create a rule to filter messages from this sender"/>
-
-    <cmd name="ToolsFilterSubject"
-     _tip="Create a rule to filter messages with this subject"/>
-
-    <cmd name="ToolsVFolderMailingList"
-     _tip="Create a virtual folder for this mailing list"/>
-
-    <cmd name="ToolsVFolderRecipient"
-     _tip="Create a virtual folder for these recipients"/>
-
-    <cmd name="ToolsVFolderSender"
-     _tip="Create a virtual folder for this sender"/>
-
-    <cmd name="ToolsVFolderSubject"
-     _tip="Create a virtual folder for this subject"/>
-
-    <cmd name="ViewFullHeaders"
-     _tip="Show message with all email headers"
-     type="radio" group="message_display"/>
-
-    <cmd name="ViewLoadImages"
-     _tip="Force images in HTML mail to be loaded"/>
-
-    <cmd name="ViewNormal"
-     _tip="Show message in the normal style"
-     type="radio" group="message_display"/>
-
-    <cmd name="ViewSource"
-     _tip="Show the raw email source of the message"
-     type="radio" group="message_display"/>
-
-  </commands>
-
-  <keybindings>
-
-  </keybindings>
-
-  <menu>
-
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="MessageOpen" verb="" _label="_Open Message"/>
-        <menuitem name="MessageResend" verb="" _label="_Edit as New Message..."/>
-        <menuitem name="MessageSaveAs" verb="" _label="_Save As..."/>
-      </placeholder>
-
-      <placeholder name="Print">
-        <menuitem name="PrintPreviewMessage" verb="" _label="Print Preview"/>
-        <menuitem name="PrintMessage" verb="" _label="_Print..."/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="Edit">
-      <placeholder name="MailMessageEdit">
-        <menuitem name="MessageSearch" verb="" _label="S_earch Message"/>
-
-        <separator/>
-
-        <menuitem name="MessageDelete" verb="" _label="_Delete"/>
-        <menuitem name="MessageUndelete" verb="" _label="_Undelete"/>
-
-        <separator/>
-
-        <menuitem name="MessageMarkAsRead" verb="" _label="Mar_k as Read"/>
-        <menuitem name="MessageMarkAsUnRead" verb="" _label="Mark as U_nread"/>
-	<menuitem name="MessageMarkAsImportant" verb="" _label="Mark as I_mportant"/>
-	<menuitem name="MessageMarkAsUnimportant" verb="" _label="Mark as Unimp_ortant"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View">
-      <placeholder name="MailMessageView">
-        <submenu name="MessageDisplay" _label="_Message Display">
-          <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
-
-          <separator/>
-
-          <menuitem name="ViewNormal" verb="" _label="_Normal Display"/>
-	  <menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/>
-	  <menuitem name="ViewSource" verb="" _label="Show Email _Source"/>
-        </submenu>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="ComponentActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-        <placeholder name="MailMessageActions">
-          <submenu name="GoTo" _label="Go To">
-            <menuitem name="MailNext" verb="" _label="Next Message"/>
-            <menuitem name="MailNextUnread" verb="" _label="Next Unread Message"/>
-            <menuitem name="MailNextFlagged" verb="" _label="Next Important Message"/>
-            <menuitem name="MailNextThread" verb="" _label="Next Thread"/>
-            <separator/>
-            <menuitem name="MailPrevious" verb="" _label="Previous Message"/>
-            <menuitem name="MailPreviousUnread" verb="" _label="Previous Unread Message"/>
-            <menuitem name="MailPreviousFlagged" verb="" _label="Previous Important Message"/>
-          </submenu>
-          <menuitem name="MessageReplySender" verb="" _label="_Reply to Sender"/>
-          <menuitem name="MessageReplyList" verb="" _label="Reply to _List"/>
-          <menuitem name="MessageReplyAll" verb="" _label="Reply to _All"/>
-          <menuitem name="MessageForward" verb="" _label="_Forward Message"/>
-          <submenu name="ForwardAs" _label="Forward As">
-            <menuitem verb="MessageForwardAttached" _label="Forward _Attached"/>
-            <menuitem verb="MessageForwardInline" _label="Forward _Inline"/>
-            <menuitem verb="MessageForwardQuoted" _label="Forward _Quoted"/>
-          </submenu>
-
-          <separator/>
-
-          <menuitem name="MessageMove" verb="" _label="_Move to Folder"/>
-          <menuitem name="MessageCopy" verb="" _label="_Copy to Folder"/>
-
-          <separator/>
-
-          <menuitem name="MessageApplyFilters" verb="" _label="_Apply Filters"/>
-        </placeholder>
-      </submenu>
-    </placeholder>
-
-    <placeholder name="ComponentToolsPlaceholder">
-      <submenu name="Tools" _label="_Tools">
-
-        <placeholder name="MailFilterTools">
-          <submenu name="ToolsFilterFromMessage" _label="_Create Filter From Message">
-            <menuitem name="ToolsFilterSubject" verb="" _label="Filter on _Subject..."/>
-            <menuitem name="ToolsFilterSender" verb="" _label="Filter on Se_nder..."/>
-            <menuitem name="ToolsFilterRecipient" verb="" _label="Filter on _Recipients..."/>
-            <menuitem name="ToolsFilterMailingList" verb="" _label="Filter on Mailing _List..."/>
-          </submenu>
-        </placeholder>
-
-        <placeholder name="MailVFolderTools">
-          <submenu name="ToolsVFolderFromMessage" _label="Create _Virtual Folder From Message">
-            <menuitem name="ToolsVFolderSubject" verb="" _label="VFolder on _Subject..."/>
-            <menuitem name="ToolsVFolderSender" verb="" _label="VFolder on Se_nder..."/>
-            <menuitem name="ToolsVFolderRecipient" verb="" _label="VFolder on _Recipients..."/>
-            <menuitem name="ToolsVFolderMailingList" verb="" _label="VFolder on Mailing _List..."/>
-          </submenu>
-        </placeholder>
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <placeholder name="MailMessageToolbar">
-      <toolitem name="MessageReplySender" verb=""
-       _label="Reply" priority="1"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageReplyAll" verb=""
-       _label="Reply to All" priority="1"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageForward" verb=""
-       _label="Forward" priority="1"
-       pixtype="pixbuf"/>
-
-      <separator/>
-
-      <toolitem name="MessageMove" verb=""
-       _label="Move"
-       pixtype="pixbuf"/>
- 
-      <toolitem name="MessageCopy" verb=""
-       _label="Copy"
-       pixtype="pixbuf"/>
-
-      <separator/>
-
-      <toolitem name="PrintMessage" verb=""
-       _label="Print"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MessageDelete" verb=""
-       _label="Delete"
-       pixtype="pixbuf"/>
-    </placeholder>
-
-    <placeholder name="MailNextButtons">
-      <toolitem name="MailPrevious" verb=""
-       _label="Previous"
-       pixtype="pixbuf"/>
-
-      <toolitem name="MailNext" verb=""
-       _label="Next"
-       pixtype="pixbuf"/>
-    </placeholder>
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-mail-messagedisplay.xml b/ui/evolution-mail-messagedisplay.xml
deleted file mode 100644
index 1be99c0a5d..0000000000
--- a/ui/evolution-mail-messagedisplay.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="MessageBrowserClose" _label="Close" _tip="Close this window"
-	 pixtype="stock" pixname="Close" accel="*Control*w"/>
-  </commands>
-
-  <menu>
-    <submenu name="File" _label="_File">
-      <placeholder name="FileOps"/>
-
-      <separator/>
-
-      <placeholder name="Print"/>
-
-      <separator/>
-
-      <menuitem name="MessageBrowserClose" verb=""
-		_label="_Close"/>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="MailMessageView"/>
-    </submenu>
-
-    <placeholder name="ComponentActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-        <placeholder name="MailMessageActions"/>
-      </submenu>
-    </placeholder>
-
-    <placeholder name="ComponentToolsPlaceholder">
-      <submenu name="Tools" _label="_Tools">
-	<placeholder name="Component">
-	  <placeholder name="MailFilterTools"/>
-	  <placeholder name="MailVFolderTools"/>
-	</placeholder>
-      </submenu>
-    </placeholder>
-
-  </menu>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive"
-	    _tip="Main toolbar" hlook="text" vlook="icon">
-    <placeholder name="MailMessageToolbar"/>
-    <separator/>
-    <placeholder name="MailNextButtons"/>
-  </dockitem>
-</Root>
diff --git a/ui/evolution-message-composer.h b/ui/evolution-message-composer.h
deleted file mode 100644
index bcc259c4d5..0000000000
--- a/ui/evolution-message-composer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  This file is autogenerated from evolution-message-composer.xml, do not edit
- *
- *  This file contains translatable strings generated by
- * bonobo-ui-extract. Add this file to your project's
- * POTFILES.in. DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Open");
-gchar *s = N_("Open a file");
-gchar *s = N_("Save");
-gchar *s = N_("Save the current file");
-gchar *s = N_("Save As");
-gchar *s = N_("Save the current file with a different name");
-gchar *s = N_("Close");
-gchar *s = N_("Close the current file");
-gchar *s = N_("Save in folder...");
-gchar *s = N_("Save the message in a specified folder");
-gchar *s = N_("Insert text file...");
-gchar *s = N_("Insert a file as text into the message");
-gchar *s = N_("Send");
-gchar *s = N_("Send the message now");
-gchar *s = N_("Send _later");
-gchar *s = N_("Send the message later");
-gchar *s = N_("Attach");
-gchar *s = N_("Attach a file");
-gchar *s = N_("HTML");
-gchar *s = N_("Send the mail in HTML format");
-gchar *s = N_("Show attachments");
-gchar *s = N_("Show / hide attachments");
-gchar *s = N_("_File");
-gchar *s = N_("_Open...");
-gchar *s = N_("_Save");
-gchar *s = N_("Save _As...");
-gchar *s = N_("Save in _folder... (FIXME)");
-gchar *s = N_("_Insert text file... (FIXME)");
-gchar *s = N_("Send");
-gchar *s = N_("Send _Later");
-gchar *s = N_("_Close");
-gchar *s = N_("_Edit");
-gchar *s = N_("F_ormat");
-gchar *s = N_("_View");
-gchar *s = N_("Show _attachments");
-gchar *s = N_("_Help");
-gchar *s = N_("_About...");
-gchar *s = N_("_Debug");
-gchar *s = N_("Send this message now");
-gchar *s = N_("Bold");
-gchar *s = N_("Sets something as bold");
-
-
-
-
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
deleted file mode 100644
index 823e5fe188..0000000000
--- a/ui/evolution-message-composer.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/>
-		
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="pixbuf"
-		accel="*Ctrl*s"/>
-		
-	        <cmd name="FileSaveAs" _label="Save As"
-	        _tip="Save the current file with a different name"
-		pixtype="pixbuf"/>
-		
-	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="Close"
-		accel="*Ctrl*w"/>
-		
-		<cmd name="FileSaveInFolder" _label="Save in folder..."
-		_tip="Save the message in a specified folder"/>
-		
-		<cmd name="FileInsertFile" _label="Insert text file..."
-                accel="*Ctrl**Alt*f"
-		_tip="Insert a file as text into the message"/>
-		
-		<cmd name="FileSend" _label="Send" _tip="Send this message now"
-		accel="*Ctrl*Return"
-                pixtype="pixbuf"/>
-		
-		<cmd name="FileSendLater" _label="Send _later" _tip="Send the message later"
-		pixtype="pixbuf"/>
-		
-		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		accel="*Ctrl**Alt*a"
-		pixtype="pixbuf"/>
-		
-		<cmd name="DeleteAll" _label="_Delete all"
-		_tip="Delete all but signature"/>
-		
-		<cmd name="FormatHtml" _label="HTML" _tip="Send the mail in HTML format"
-		type="toggle" state="0"/> 
-		
-		<cmd name="ViewFrom" _label="_From Field"
-		_tip="Toggles whether the From chooser is displayed" type="toggle" state="0"/>
-		
-                <cmd name="ViewReplyTo" _label="_Reply-To Field"
-		_tip="Toggles whether the Reply-To field is displayed"
-		type="toggle" state="0"/>
-		
-		<cmd name="ViewCC" _label="_Cc Field"
-		_tip="Toggles whether the CC field is displayed"
-		type="toggle" state="0"/>
-			    
-		<cmd name="ViewBCC" _label="_Bcc Field"
-		_tip="Toggles whether the BCC field is displayed"
-		type="toggle" state="0"/>
-		
-		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
-		type="toggle" state="0"/>
-		
-                <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
-		type="toggle" state="0"/>
-		
-                <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
-		type="toggle" state="0"/>
-		
-                <cmd name="SecuritySMimeSign" _label="S/MIME Sign" 
-                _tip="Sign this message with your S/MIME Signature Certificate"
-		type="toggle" state="0" hidden="1"/>
-		
-                <cmd name="SecuritySMimeEncrypt" _label="S/MIME Encrypt" 
-                _tip="Encrypt this message with your S/MIME Encryption Cetificate"
-		type="toggle" state="0" hidden="1"/>
-	</commands>
-	
-        <keybindings>
-	
-        </keybindings>
-	
-	<menu>
-	
-		<submenu name="File" _label="_File">
-			<menuitem name="FileOpen" verb="" _label="_Open..."/>
-			<placeholder name="FileOps"/>
-			<menuitem name="FileSend" verb=""
-			_label="Send"/>
-			<menuitem name="FileSendLater" verb=""
-			_label="Send _Later"/>
-			<separator/>
-			<menuitem name="FileSave" verb="" _label="_Save"/>
-			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-                        <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
-			<placeholder name="Print" delimit="top"/>
-			<separator/>
-			<menuitem name="FileClose" verb="" _label="_Close"/>
-		</submenu>
-		
-		<submenu name="Edit" _label="_Edit">
-			 <placeholder name="EditUndoRedo"/>
-			 <separator/>
-			 <placeholder name="EditCutCopyPaste"/>
-			 <menuitem name="DeleteAll" _label="_Delete all" verb="" accel="*Ctrl**Alt*d"/>
-			 <separator/>
-			 <placeholder name="EditFindReplace"/>
-			 <separator/>
-			 <placeholder name="EditMisc"/>
-		</submenu>
-		
-		<submenu name="View" _label="_View">
-			<menuitem name="ViewAttach" verb="" _label="Show _attachments"/>
-	                <separator/>
-	                <menuitem name="ViewFrom" verb=""/>
-                        <menuitem name="ViewReplyTo" verb=""/>
-	                <menuitem name="ViewCC" verb=""/>
-	                <menuitem name="ViewBCC" verb=""/>
-			<separator/>
-                        <menuitem name="BonoboCustomize" verb="" pos="bottom"/>
-		</submenu>
-		
-                <submenu name="Insert" _label="_Insert">
-	                <menuitem name="FileAttach" verb=""
-	                _label="_Attachment..." pixtype="pixbuf"/>
-			<menuitem name="FileInsertFile" verb="" 
-                        _label="Inline Text _File..."/>
-                	<placeholder name="Component"/>
-                </submenu>
-		
-		<submenu name="Format" _label="F_ormat">
-			<menuitem name="FormatHtml" verb=""/>
-		</submenu>
-		
-		<placeholder name="Component"/>
-		
-                <submenu name="Security" _label="_Security">
-                        <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
-                        <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
-                        <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sign"/>
-                        <menuitem name="SecuritySMimeEncrypt" verb="" _label="S/MIME Encrypt"/>
-                </submenu>
-		
-		<submenu name="Debug" _label="_Debug" hidden="1">
-			<menuitem name="DebugDumpXml" verb=""/>
-		</submenu>
-		
-	</menu>
-	
-	<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
-	
-		<toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/>
-		
-		<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
-		
-		<separator/>
-		
-	</dockitem>
-	
-</Root>
diff --git a/ui/evolution-signature-editor.xml b/ui/evolution-signature-editor.xml
deleted file mode 100644
index 492d960014..0000000000
--- a/ui/evolution-signature-editor.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Root>
-	<commands>
-
-	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="stock" pixname="Save"
-		accel="*Ctrl*s"/>
-
-	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="Close"
-		accel="*Ctrl*w"/>
-
-	</commands>
-
-        <keybindings>
-
-        </keybindings>
-
-	<menu>
-
-		<submenu name="File" _label="_File">
-
-			<placeholder name="FileOps"/>
-
-			<menuitem name="FileSave" verb="" _label="_Save"/>
-
-			<placeholder name="Print" delimit="top"/>
-
-			<separator/>
-
-
-			<menuitem name="FileClose" verb="" _label="_Close"/>
-
-		</submenu>
-
-
-		<submenu name="Edit" _label="_Edit">
-			 <placeholder name="EditUndoRedo"/>
-			 <separator/>
-			 <placeholder name="EditCutCopyPaste"/>
-			 <separator/>
-			 <placeholder name="EditFindReplace"/>
-			 <separator/>
-			 <placeholder name="EditMisc"/>
-		</submenu>
-
-                <submenu name="Insert" _label="_Insert">
-	  
-                	<placeholder name="Component">
-	                </placeholder>
-                </submenu>
-
-		<placeholder name="Component"/>
-
-		<submenu name="Help" _label="_Help">
-	
-			<placeholder name="BuiltMenuItems"/>
-
-		</submenu>
-
-		<submenu name="Debug" _label="_Debug" hidden="1">
-
-			<menuitem name="DebugDumpXml" verb=""/>
-
-		</submenu>
-
-	</menu>
-
-	<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
deleted file mode 100644
index 48be3210b3..0000000000
--- a/ui/evolution-subscribe.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<Root>
-  <menu>
-    <submenu name="File" _label="_File">
-
-        <menuitem name="FileCloseWin" verb=""
-        pixtype="stock" pixname="Close" _label="_Close" accel="*Control*w"/>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-
-        <menuitem name="EditSelectAll" verb=""
-        _label="Select _All"/>
-
-        <menuitem name="EditInvertSelection" verb=""
-        _label="_Invert Selection"/>
-
-    </submenu>
-
-    <placeholder name="Component">
-
-      <submenu name="Folder" _label="F_older">
-
-        <menuitem name="SubscribeFolder" verb=""
-        _label="Subscribe"/>
-
-        <menuitem name="UnsubscribeFolder" verb=""
-        _label="Unsubscribe"/>
-
-      </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Searchbar" relief="none" behavior="exclusive">
-    <control name="FolderSearch"/>
-
-  </dockitem>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive">
-
-    <toolitem name="SubscribeFolder" verb=""
-    _label="Subscribe" _tip="Add folder to your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <toolitem name="UnsubscribeFolder" verb=""
-    _label="Unsubscribe" _tip="Remove folder from your list of subscribed folders"
-    pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="RefreshList" verb=""
-    _label="Refresh List" _tip="Refresh List of Folders"
-    pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml
deleted file mode 100644
index f9fe541784..0000000000
--- a/ui/evolution-task-editor.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Root>
-
-<commands>
-
-	<cmd name="ActionAssignTask" _label="Assign Task"
-        _tip="Assign this task to others"/>
-
-	<cmd name="ActionRefreshTask" _label="Re_fresh Task"
-        _tip="Obtain the latest task information"/>
-
-	<cmd name="ActionCancelTask" _label="Cancel Task"
-        _tip="Cancel this task"/>
-
-	<cmd name="ActionForward" _label="Forward as i_Calendar"
-        _tip="Forward this item via email"/>
-
-</commands>
-
-<menu>
-
-<submenu name="Actions" _label="_Actions">
-
-	<placeholder name="Actions">
-
-	         <menuitem name="ActionAssignTask" verb=""/>
-
-	         <menuitem name="ActionRefreshTask" verb=""/>
-
-	         <menuitem name="ActionCancelTask" verb=""/>
-
-	         <separator/>
-
-	         <menuitem name="ActionForward" verb=""/>
-
-	</placeholder>
-
-</submenu>
-
-</menu>
-
-</Root>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
deleted file mode 100644
index 4571f9aeb0..0000000000
--- a/ui/evolution-tasks.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<Root>
-
-        <commands>
-		<cmd name="TasksNewTask" pixtype="pixbuf"
-		 _tip="Create a new task" verb="TasksNewTask"/>
-		<cmd name="TasksDelete" _label="Delete"
-		 _tip="Delete selected tasks" verb="TasksDelete"
-		 accel="Delete" sensitive="0"/>
-
-		<cmd name="TasksCut"
-		 _tip="Cut selected task" verb="TasksCut" accel="*Control*x"/>
-		<cmd name="TasksCopy"
-		 _tip="Copy selected task" verb="TasksCopy" accel="*Control*c"/>
-		<cmd name="TasksPaste"
-		 _tip="Paste task from the clipboard" verb="TasksPaste" accel="*Control*v"/>
-
-		<cmd name="TasksSettings" _tip="Configure the task view's settings"/>
-  	</commands>
-  
-	<menu>
-		<submenu name="File">
-
-                        <submenu name="New">
-				<placeholder name="NewFirstItem">
-	  				<menuitem name="NewTask"
-	  				verb="TasksNewTask"
-					_label="_Task"
-	                                accel="*Control*n"
-					pixtype="pixbuf"/>
-	                        </placeholder>
-	                </submenu>
-      
-		</submenu>
-
-		<submenu name="Edit">
-
-			<menuitem name="Cut" verb="TasksCut" _label="C_ut" pixtype="pixbuf"/>
-			<menuitem name="Copy" verb="TasksCopy" _label="_Copy" pixtype="pixbuf"/>
-			<menuitem name="Paste" verb="TasksPaste" _label="_Paste" pixtype="pixbuf"/>
-			<menuitem name="Delete" verb="TasksDelete"
-			_label="_Delete" pixtype="pixbuf"/>
-
-		</submenu>
-
-	        <placeholder name="ComponentToolsPlaceholder">
-          	        <submenu name="Tools" _label="_Tools">
-				<menuitem name="TasksSettings"
-				 _label="Tasks Settings..."
-				 verb="TasksSettings" pixtype="pixbuf"/>
-		        </submenu>
-                </placeholder>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New Task" verb="TasksNewTask"
-		priority="1" pixtype="pixbuf"/>
-
-	  	<separator/>
-
-		<toolitem name="Cut" _label="Cut" verb="TasksCut"
-		pixtype="pixbuf"/>
-		<toolitem name="Copy" _label="Copy" verb="TasksCopy"
-		pixtype="pixbuf"/>
-		<toolitem name="Paste" _label="Paste" verb="TasksPaste"
-		pixtype="pixbuf"/>
-
-	  	<separator/>
-
-		<toolitem name="Delete" verb="TasksDelete" pixtype="pixbuf"/>
-
-	</dockitem>
-
-</Root>
diff --git a/ui/evolution.xml b/ui/evolution.xml
deleted file mode 100644
index 2b90419af8..0000000000
--- a/ui/evolution.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="FileClose" _label="Close" _tip="Close this window"
-	 pixtype="stock" pixname="Close"/>
-
-    <cmd name="FileExit" _label="E_xit" _tip="Exit the program"
-	 pixtype="stock" pixname="Quit" accel="*Control*q"/>
-
-    <cmd name="ViewShortcutBar" type="toggle"
-	 _label="_Shortcut Bar"
-	 _tip="Toggle whether to show the shortcut bar"/>
-
-    <cmd name="ViewFolderBar" type="toggle"
-	 _label="_Folder Bar"
-	 _tip="Toggle whether to show the folder bar"/>
-
-    <cmd name="HelpSubmitBug" _label="Submit Bug Report"
-	 _tip="Submit a bug report using Bug Buddy"/>
-
-    <cmd name="ToggleOffline" _type="Toggle"
-	 _label="_Work Offline"
-	 _tip="Toggle whether we are working offline."/>
-
-    <cmd name="HelpAbout" _label="About Evolution..."
-	 _tip="Show information about Evolution"
-	 pixtype="stock" pixname="About"/>
-  </commands>
-
-  <menu>
-    <submenu name="File" _label="_File">
-      <submenu name="New" _label="_New">
-	<placeholder name="NewFirstItem">
-	</placeholder>
-	
-	<menuitem name="EvolutionWindow" verb="OpenFolderInNewWindow" _label="Evolution _Window"
-		  accel="*Control**Shift*w"/>
-
-	<menuitem name="Folder" verb="NewFolder"
-		  _label="_Folder"
-		  accel="*Control**Shift*e"
-		  pixtype="pixbuf"/>
-
-	<menuitem name="Shortcut" verb="NewShortcut"
-		  _label="_Shortcut"
-		  accel="*Control**Shift*s"/>
-
-	<placeholder name="NewItems"/>
-      </submenu>
-
-      <placeholder name="FileOps"/>
-
-      <separator/>
-
-      <submenu name="Folder" _label="_Folder">
-	<menuitem name="Folder"
-                  verb="NewFolder"
-		  _label="_New Folder"
-		  accel="*Control**Shift*e"
-		  pixtype="pixbuf"/>
-
-        <separator/>
-
-        <menuitem name="OpenFolderInNewWindow"
-                  verb="OpenFolderInNewWindow"
-                  _label="Open in New _Window"
-                  _tip="Open this folder in an other window"/>
-        
-        <separator/>
-
-        <menuitem name="MoveFolder"
-                  verb="MoveFolder"
-                  _label="_Move..."
-                  _tip="Move this folder to another place"/>
-
-        <menuitem name="CopyFolder"
-                  verb="CopyFolder"
-                  _label="_Copy..."
-                  _tip="Copy this folder"/>
-
-        <separator/>
-
-        <menuitem name="DeleteFolder"
-                  verb="DeleteFolder"
-                  _label="_Delete"
-                  _tip="Delete this folder"/>
-
-        <menuitem name="RenameFolder"
-                  verb="RenameFolder"
-                  _label="_Rename..."
-                  _tip="Change the name of this folder"/>
-
-        <separator/>
-
-        <menuitem name="AddFolderToShortcutBar"
-                  verb="AddFolderToShortcutBar"
-                  _label="Add to _Shortcut Bar"
-                  _tip="Create a link to this folder in the shortcut bar"/>
-        
-        <separator/>
-
-        <placeholder name="ComponentPlaceholder"
-                     delimit="top"/>
-
-      </submenu>
-      
-      <menuitem name="FileGoToFolder" verb=""
-		_label="_Go to Folder..."
-		_tip="Display a different folder" accel="*Control*g"/>
-
-      <separator/>
-      
-      <menuitem name="FileImporter" verb=""
-		_label="_Import File..."
-		_tip="Import an external file format" accel="*Control*i"
-		pixtype="pixbuf"/>
-
-      <placeholder name="Print" delimit="top"/>
-
-      <separator/>
-
-      <menuitem name="ToggleOffline" verb=""
-		_label="Work Offline"
-		pixtype="pixbuf"/>
-      
-      <menuitem name="FileClose" verb=""
-		_label="_Close"/>
-
-      <menuitem name="FileExit" verb="FileExit"/>
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="ViewBegin"/>
-      <menuitem name="ShortcutBar" id="ViewShortcutBar"/>
-      <menuitem name="FolderBar" id="ViewFolderBar"/>
-      <placeholder name="ViewAfterControl"/>
-    </submenu>
-
-    <placeholder name="Component"/>
-
-    <placeholder name="ComponentActionsPlaceholder"/>
-    <placeholder name="ComponentToolsPlaceholder"/>
-
-    <submenu name="Help" _label="_Help">
-
-      <placeholder name="BuiltMenuItems"/>
-
-      <separator/>
-
-      <menuitem name="HelpFAQ" verb=""
-		_label="Evolution _FAQ"/>
-
-      <separator/>
-
-      <menuitem name="HelpSubmitBug" verb=""
-		_label="Submit _Bug Report"/>
-
-      <separator/>
-
-      <menuitem name="HelpAbout" verb=""
-		_label="_About Evolution..."/>
-
-    </submenu>
-  </menu>
-
-  <dockitem name="Toolbar" relief="none" behavior="exclusive"
-	    _tip="Main toolbar" hlook="text" vlook="icon"/>
-
-  <popups>
-    <popup name="FolderPopup">
-      <menuitem name="ActivateView"
-		verb="ActivateView"
-		_label="_View"
-		_tip="View the selected folder"/>
-
-      <menuitem name="OpenFolderInNewWindow"
-		verb="OpenFolderInNewWindow"
-		_label="Open in New Window"
-		_tip="Open this folder in an other window"/>
-      
-      <separator/>
-
-      <menuitem name="MoveFolder"
-		verb="MoveFolder"
-		_label="_Move..."
-		_tip="Move this folder to another place"/>
-
-      <menuitem name="CopyFolder"
-		verb="CopyFolder"
-		_label="_Copy..."
-		_tip="Copy this folder"/>
-
-      <separator/>
-
-      <menuitem name="DeleteFolder"
-                verb="DeleteFolder"
-                _label="_Delete"
-                _tip="Delete this folder"/>
-
-      <menuitem name="RenameFolder"
-                verb="RenameFolder"
-                _label="_Rename..."
-                _tip="Change the name of this folder"/>
-
-      <menuitem name="CreateNewFolder"
-                verb="NewFolder"
-                _label="Create _New Folder..."
-                _tip="Create a new folder"/>
-
-      <separator/>
-
-      <menuitem name="AddFolderToShortcutBar"
-                verb="AddFolderToShortcutBar"
-                _label="Add to _Shortcut Bar"
-                _tip="Create a link to this folder in the shortcut bar"/>
-                
-      <placeholder name="ComponentPlaceholder"
-		   delimit="top"/>
-
-    </popup>
-  </popups>
-</Root>
diff --git a/ui/my-evolution.xml b/ui/my-evolution.xml
deleted file mode 100644
index f1fe463d63..0000000000
--- a/ui/my-evolution.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Root>
-
-  <commands>
-	<cmd name="PrintMyEvolution" _label="Print" _tip="Print Summary"
-	 pixtype="stock" pixname="Print"/>
-
-	<cmd name="ToolsSettings"
-	 _tip="Change the settings for the summary"
-	 pixtype="pixbuf"/>
-
-	<cmd name="Reload" _label="Reload" _tip="Reload the view" 
-	 pixtype="stock" pixname="Refresh"/>
-  </commands>
-
-  <menu>
-	<submenu name="File">
-		<placeholder name="Print">
-			<menuitem name="Print" verb="PrintMyEvolution"
-			_label="_Print..." _tip="Print summary"
-			accel="*Control*p" pixtype="pixbuf"/>
-		</placeholder>
-	</submenu>
-	
-	<placeholder name="ComponentToolsPlaceholder">
-		<submenu name="Tools" _label="_Tools">
-			<menuitem name="ToolsSettings" verb=""
-			 _label="_Summary Settings..."/>
-		</submenu>
-	</placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-
-    <toolitem name="PrintMyEvolution" verb="PrintMyEvolution"
-	_label="Print" pixtype="pixbuf" priority="1"/>
-
-    <toolitem name="Reload" verb="Reload"
-	_label="Reload" priority="1"/>
-  </dockitem>
-</Root>