16 files changed, 235 insertions, 382 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 39ef0b77a9..56087fe825 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-16  Not Zed  <NotZed@Ximian.com>
+
+	* moved e-error to e-util/
+
 2005-05-16: Srinivasa Ragavan <sragavan@novell.com>
 
 	* gui/GNOME_Evolution_Calendar.server.in.in: Added tooltips
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 56acae59c8..04adbea259 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -6,13 +6,12 @@ endif
 
 SUBDIRS = idl common gui importers $(CONDUIT_DIR)
 
-error_DATA = calendar-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = calendar.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
+@EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
+	calendar.error.xml	\
 	ChangeLog.pre-1-4	\
 	$(error_DATA)		\
 	zones.h
@@ -20,6 +19,6 @@ EXTRA_DIST =			\
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(error_i18n)
+BUILT_SOURCES = $(error_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/calendar-errors.xml b/calendar/calendar-errors.xml
deleted file mode 100644
index ef2bc1e91c..0000000000
--- a/calendar/calendar-errors.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="calendar">
-
- <error id="prompt-cancel-meeting" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send all the participants a cancellation notice?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the meeting is canceled.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-meeting" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this meeting?</primary>
-  <secondary>All information on this meeting will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-cancel-task" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send all the participants a cancellation notice?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the task has been deleted.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-cancel-journal" type="question" defult="GTK_RESPONSE_YES">
-  <primary>Would you like to send a cancellation notice for this journal entry?</primary>
-  <secondary>If you don't send a cancellation notice, the other participants may not know the journal has been deleted.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send Notice" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journal" type="question" defult="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this journal entry?</primary>
-  <secondary>All information on this journal entry will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the appointment titled '{0}'?</primary>
-  <secondary>All information on this appointment will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this appointment?</primary>
-  <secondary>All information on this appointment will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the '{0}' task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this task?</primary>
-  <secondary>All information on this task will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-named-journal" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete the journal entry '{0}'?</primary>
-  <secondary>All information in this journal will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journal" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete this journal entry?</primary>
-  <secondary>All information in this journal will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} appointments?</primary>
-  <secondary>All information on these appointments will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} tasks?</primary>
-  <secondary>All information on these tasks will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-journals" type="question" default="GTK_RESPONSE_NO">
-  <primary>Are you sure you want to delete these {0} journal entries?</primary>
-  <secondary>All information in these journal entries will be deleted and can not be restored.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-save-appointment" type="question" default="GTK_RESPONSE_YES">
-  <title>Save Appointment</title>
-  <primary>Would you like to save your changes to this appointment?</primary>
-  <secondary>You have made changes to this appointment, but not yet saved them.</secondary>
-  <button label="Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="Save Changes" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-save-task" type="question" default="GTK_RESPONSE_YES">
- <title>Save Task</title>
- <primary>Would you like to save your changes to this task?</primary>
- <secondary>You have made changes to this task, but not yet saved them.</secondary>
- <button label="Discard Changes" response="GTK_RESPONSE_NO"/>
- <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="Save Changes" response="GTK_RESPONSE_YES"/>
- </error>
-	      
- <error id="prompt-meeting-invite" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send meeting invitations to participants?</primary>
-  <secondary>Email invitations will be sent to all participants and allow them to RSVP.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-updated-meeting-info" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send updated meeting information to participants?</primary>
-  <secondary>Sending updated information allows other participants to keep their calendars up to date.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-task" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send this task to participants?</primary>
-  <secondary>Email invitations will be sent to all participants and allow them to accept this task.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-updated-task-info" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to send updated task information to participants?</primary>
-  <secondary>Sending updated information allows other participants to keep their task lists up to date.</secondary>
-  <button label="Don't Send" response="GTK_RESPONSE_NO"/>
-  <button label="Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="tasks-crashed" type="error">
-  <primary>The Evolution tasks have quit unexpectedly.</primary>
-  <secondary>Your tasks will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="calendar-crashed" type="error">
-  <primary>The Evolution calendar has quit unexpectedly.</primary>
-  <secondary>Your calendars will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="editor-error" type="error">
-  <primary>Editor could not be loaded.</primary>
-  <secondary>{0}.</secondary>
- </error>
-
- <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete calendar '{0}'?</primary>
-  <secondary>This calendar will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete task list '{0}'?</primary>
-  <secondary>This task list will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
-  <primary>Are you sure you want to send the appointment without a summary?</primary>
-  <secondary>Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
-  <primary>Are you sure you want to send the task without a summary?</primary>
-  <secondary>Adding a meaningful Summary to your task will give your recipients an idea of what your task is about.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Send" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
-  <primary>Error loading calendar</primary>
-  <secondary>The calendar is not marked for offline usage</secondary>
-  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
-  <primary>Error loading task list</primary>
-  <secondary>The task list is not marked for offline usage</secondary>
-  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="server-version" type="warning">
- <title>Server Version</title> 
- <primary>Some features may not work properly with your current server</primary>
- <secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</secondary>
- </error>
-
-</error-list>
diff --git a/calendar/calendar-errors.xml.h b/calendar/calendar-errors.xml.h
deleted file mode 100644
index ed65b4de8a..0000000000
--- a/calendar/calendar-errors.xml.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* calendar:prompt-cancel-meeting primary */
-char *s = N_("Would you like to send all the participants a cancellation notice?");
-/* calendar:prompt-cancel-meeting secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the meeting is canceled.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-meeting primary */
-char *s = N_("Are you sure you want to delete this meeting?");
-/* calendar:prompt-delete-meeting secondary */
-char *s = N_("All information on this meeting will be deleted and can not be restored.");
-/* calendar:prompt-cancel-task primary */
-char *s = N_("Would you like to send all the participants a cancellation notice?");
-/* calendar:prompt-cancel-task secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the task has been deleted.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-task primary */
-char *s = N_("Are you sure you want to delete this task?");
-/* calendar:prompt-delete-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-cancel-journal primary */
-char *s = N_("Would you like to send a cancellation notice for this journal entry?");
-/* calendar:prompt-cancel-journal secondary */
-char *s = N_("If you don't send a cancellation notice, the other participants may not know the journal has been deleted.");
-char *s = N_("Don't Send");
-char *s = N_("Send Notice");
-/* calendar:prompt-delete-journal primary */
-char *s = N_("Are you sure you want to delete this journal entry?");
-/* calendar:prompt-delete-journal secondary */
-char *s = N_("All information on this journal entry will be deleted and can not be restored.");
-/* calendar:prompt-delete-titled-appointment primary */
-char *s = N_("Are you sure you want to delete the appointment titled '{0}'?");
-/* calendar:prompt-delete-titled-appointment secondary */
-char *s = N_("All information on this appointment will be deleted and can not be restored.");
-/* calendar:prompt-delete-appointment primary */
-char *s = N_("Are you sure you want to delete this appointment?");
-/* calendar:prompt-delete-appointment secondary */
-char *s = N_("All information on this appointment will be deleted and can not be restored.");
-/* calendar:prompt-delete-named-task primary */
-char *s = N_("Are you sure you want to delete the '{0}' task?");
-/* calendar:prompt-delete-named-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-delete-task primary */
-char *s = N_("Are you sure you want to delete this task?");
-/* calendar:prompt-delete-task secondary */
-char *s = N_("All information on this task will be deleted and can not be restored.");
-/* calendar:prompt-delete-named-journal primary */
-char *s = N_("Are you sure you want to delete the journal entry '{0}'?");
-/* calendar:prompt-delete-named-journal secondary */
-char *s = N_("All information in this journal will be deleted and can not be restored.");
-/* calendar:prompt-delete-journal primary */
-char *s = N_("Are you sure you want to delete this journal entry?");
-/* calendar:prompt-delete-journal secondary */
-char *s = N_("All information in this journal will be deleted and can not be restored.");
-/* calendar:prompt-delete-appointments primary */
-char *s = N_("Are you sure you want to delete these {0} appointments?");
-/* calendar:prompt-delete-appointments secondary */
-char *s = N_("All information on these appointments will be deleted and can not be restored.");
-/* calendar:prompt-delete-tasks primary */
-char *s = N_("Are you sure you want to delete these {0} tasks?");
-/* calendar:prompt-delete-tasks secondary */
-char *s = N_("All information on these tasks will be deleted and can not be restored.");
-/* calendar:prompt-delete-journals primary */
-char *s = N_("Are you sure you want to delete these {0} journal entries?");
-/* calendar:prompt-delete-journals secondary */
-char *s = N_("All information in these journal entries will be deleted and can not be restored.");
-/* calendar:prompt-save-appointment title */
-char *s = N_("Save Appointment");
-/* calendar:prompt-save-appointment primary */
-char *s = N_("Would you like to save your changes to this appointment?");
-/* calendar:prompt-save-appointment secondary */
-char *s = N_("You have made changes to this appointment, but not yet saved them.");
-char *s = N_("Discard Changes");
-char *s = N_("Save Changes");
-/* calendar:prompt-save-task title */
-char *s = N_("Save Task");
-/* calendar:prompt-save-task primary */
-char *s = N_("Would you like to save your changes to this task?");
-/* calendar:prompt-save-task secondary */
-char *s = N_("You have made changes to this task, but not yet saved them.");
-char *s = N_("Discard Changes");
-char *s = N_("Save Changes");
-/* calendar:prompt-meeting-invite primary */
-char *s = N_("Would you like to send meeting invitations to participants?");
-/* calendar:prompt-meeting-invite secondary */
-char *s = N_("Email invitations will be sent to all participants and allow them to RSVP.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-updated-meeting-info primary */
-char *s = N_("Would you like to send updated meeting information to participants?");
-/* calendar:prompt-send-updated-meeting-info secondary */
-char *s = N_("Sending updated information allows other participants to keep their calendars up to date.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-task primary */
-char *s = N_("Would you like to send this task to participants?");
-/* calendar:prompt-send-task secondary */
-char *s = N_("Email invitations will be sent to all participants and allow them to accept this task.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:prompt-send-updated-task-info primary */
-char *s = N_("Would you like to send updated task information to participants?");
-/* calendar:prompt-send-updated-task-info secondary */
-char *s = N_("Sending updated information allows other participants to keep their task lists up to date.");
-char *s = N_("Don't Send");
-char *s = N_("Send");
-/* calendar:tasks-crashed primary */
-char *s = N_("The Evolution tasks have quit unexpectedly.");
-/* calendar:tasks-crashed secondary */
-char *s = N_("Your tasks will not be available until Evolution is restarted.");
-/* calendar:calendar-crashed primary */
-char *s = N_("The Evolution calendar has quit unexpectedly.");
-/* calendar:calendar-crashed secondary */
-char *s = N_("Your calendars will not be available until Evolution is restarted.");
-/* calendar:editor-error primary */
-char *s = N_("Editor could not be loaded.");
-/* calendar:editor-error secondary */
-char *s = N_("{0}.");
-/* calendar:prompt-delete-calendar primary */
-char *s = N_("Delete calendar '{0}'?");
-/* calendar:prompt-delete-calendar secondary */
-char *s = N_("This calendar will be removed permanently.");
-/* calendar:prompt-delete-task-list primary */
-char *s = N_("Delete task list '{0}'?");
-/* calendar:prompt-delete-task-list secondary */
-char *s = N_("This task list will be removed permanently.");
-/* calendar:prompt-send-no-subject-calendar primary */
-char *s = N_("Are you sure you want to send the appointment without a summary?");
-/* calendar:prompt-send-no-subject-calendar secondary */
-char *s = N_("Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.");
-char *s = N_("_Send");
-/* calendar:prompt-send-no-subject-task primary */
-char *s = N_("Are you sure you want to send the task without a summary?");
-/* calendar:prompt-send-no-subject-task secondary */
-char *s = N_("Adding a meaningful Summary to your task will give your recipients an idea of what your task is about.");
-char *s = N_("_Send");
-/* calendar:prompt-no-contents-offline-calendar primary */
-char *s = N_("Error loading calendar");
-/* calendar:prompt-no-contents-offline-calendar secondary */
-char *s = N_("The calendar is not marked for offline usage");
-/* calendar:prompt-no-contents-offline-tasks primary */
-char *s = N_("Error loading task list");
-/* calendar:prompt-no-contents-offline-tasks secondary */
-char *s = N_("The task list is not marked for offline usage");
-/* calendar:server-version title */
-char *s = N_("Server Version");
-/* calendar:server-version primary */
-char *s = N_("Some features may not work properly with your current server");
-/* calendar:server-version secondary */
-char *s = N_("You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version");
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
new file mode 100644
index 0000000000..b45fe4d453
--- /dev/null
+++ b/calendar/calendar.error.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="calendar">
+
+ <error id="prompt-cancel-meeting" type="question" defult="GTK_RESPONSE_YES">
+  <_primary>Would you like to send all the participants a cancellation notice?</_primary>
+  <_secondary>If you don't send a cancellation notice, the other participants may not know the meeting is canceled.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send Notice" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-meeting" type="question" defult="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this meeting?</_primary>
+  <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-cancel-task" type="question" defult="GTK_RESPONSE_YES">
+  <_primary>Would you like to send all the participants a cancellation notice?</_primary>
+  <_secondary>If you don't send a cancellation notice, the other participants may not know the task has been deleted.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send Notice" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-task" type="question" defult="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this task?</_primary>
+  <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-cancel-journal" type="question" defult="GTK_RESPONSE_YES">
+  <_primary>Would you like to send a cancellation notice for this journal entry?</_primary>
+  <_secondary>If you don't send a cancellation notice, the other participants may not know the journal has been deleted.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send Notice" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-journal" type="question" defult="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this journal entry?</_primary>
+  <_secondary>All information on this journal entry will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete the appointment titled '{0}'?</_primary>
+  <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this appointment?</_primary>
+  <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete the '{0}' task?</_primary>
+  <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this task?</_primary>
+  <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-named-journal" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete the journal entry '{0}'?</_primary>
+  <_secondary>All information in this journal will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-journal" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete this journal entry?</_primary>
+  <_secondary>All information in this journal will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete these {0} appointments?</_primary>
+  <_secondary>All information on these appointments will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete these {0} tasks?</_primary>
+  <_secondary>All information on these tasks will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-journals" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Are you sure you want to delete these {0} journal entries?</_primary>
+  <_secondary>All information in these journal entries will be deleted and can not be restored.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-save-appointment" type="question" default="GTK_RESPONSE_YES">
+  <title>Save Appointment</title>
+  <_primary>Would you like to save your changes to this appointment?</_primary>
+  <_secondary>You have made changes to this appointment, but not yet saved them.</_secondary>
+  <button _label="Discard Changes" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Save Changes" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-save-task" type="question" default="GTK_RESPONSE_YES">
+ <title>Save Task</title>
+ <_primary>Would you like to save your changes to this task?</_primary>
+ <_secondary>You have made changes to this task, but not yet saved them.</_secondary>
+ <button _label="Discard Changes" response="GTK_RESPONSE_NO"/>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button _label="Save Changes" response="GTK_RESPONSE_YES"/>
+ </error>
+	      
+ <error id="prompt-meeting-invite" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to send meeting invitations to participants?</_primary>
+  <_secondary>Email invitations will be sent to all participants and allow them to RSVP.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-updated-meeting-info" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to send updated meeting information to participants?</_primary>
+  <_secondary>Sending updated information allows other participants to keep their calendars up to date.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-task" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to send this task to participants?</_primary>
+  <_secondary>Email invitations will be sent to all participants and allow them to accept this task.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-updated-task-info" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to send updated task information to participants?</_primary>
+  <_secondary>Sending updated information allows other participants to keep their task lists up to date.</_secondary>
+  <button _label="Don't Send" response="GTK_RESPONSE_NO"/>
+  <button _label="Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="tasks-crashed" type="error">
+  <_primary>The Evolution tasks have quit unexpectedly.</_primary>
+  <_secondary>Your tasks will not be available until Evolution is restarted.</_secondary>
+ </error>
+
+ <error id="calendar-crashed" type="error">
+  <_primary>The Evolution calendar has quit unexpectedly.</_primary>
+  <_secondary>Your calendars will not be available until Evolution is restarted.</_secondary>
+ </error>
+
+ <error id="editor-error" type="error">
+  <_primary>Editor could not be loaded.</_primary>
+  <_secondary>{0}.</_secondary>
+ </error>
+
+ <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
+  <_primary>Delete calendar '{0}'?</_primary>
+  <_secondary>This calendar will be removed permanently.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
+  <_primary>Delete task list '{0}'?</_primary>
+  <_secondary>This task list will be removed permanently.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+ 
+ <error id="prompt-send-no-subject-calendar" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Are you sure you want to send the appointment without a summary?</_primary>
+  <_secondary>Adding a meaningful Summary to your appointment will give your recipients an idea of what your appointment is about.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-send-no-subject-task" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Are you sure you want to send the task without a summary?</_primary>
+  <_secondary>Adding a meaningful Summary to your task will give your recipients an idea of what your task is about.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Send" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-no-contents-offline-calendar" type="error" default="GTK_RESPONSE_YES">
+  <_primary>Error loading calendar</_primary>
+  <_secondary>The calendar is not marked for offline usage</_secondary>
+  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
+ </error>
+ 
+ <error id="prompt-no-contents-offline-tasks" type="error" default="GTK_RESPONSE_YES">
+  <_primary>Error loading task list</_primary>
+  <_secondary>The task list is not marked for offline usage</_secondary>
+  <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="server-version" type="warning">
+ <title>Server Version</title> 
+ <_primary>Some features may not work properly with your current server</_primary>
+ <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</_secondary>
+ </error>
+
+</error-list>
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 0a68d1e3b9..0f42e0abb0 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -52,7 +52,7 @@
 #include "config-data.h"
 #include "util.h"
 #include "e-util/e-popup.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 63cb4859e5..c37e87e82a 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -52,7 +52,7 @@
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/event-editor.h"
 #include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
 #include "e-cal-menu.h"
 #include "e-cal-popup.h"
diff --git a/calendar/gui/dialogs/cal-attachment-bar.c b/calendar/gui/dialogs/cal-attachment-bar.c
index 96ea9abf40..cacc7c7d30 100644
--- a/calendar/gui/dialogs/cal-attachment-bar.c
+++ b/calendar/gui/dialogs/cal-attachment-bar.c
@@ -56,7 +56,7 @@
 
 #include "e-util/e-gui-utils.h"
 #include "e-util/e-icon-factory.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "mail/em-popup.h"
 
 #define ICON_WIDTH 64
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index eedd7ce49c..1c19e734ae 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -27,7 +27,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "cancel-comp.h"
 
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 1e41a74ff4..5414b60e9d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -60,7 +60,7 @@
 
 #include "cal-attachment-bar.h"
 #include "widgets/misc/e-expander.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 
 #define d(x) x
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index ed60def95e..6ac8d5d61a 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -27,7 +27,7 @@
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "../calendar-config.h"
 #include "delete-comp.h"
 
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index fa5eae8659..2c9146dac6 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "save-comp.h"
 #include "comp-editor.h"
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index c5269f1854..f685bd1014 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -23,7 +23,7 @@
 #endif
 
 #include <gtk/gtkmessagedialog.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "send-comp.h"
 
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 1d1c405c0d..3845b62bba 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -33,7 +33,7 @@
 #include <gal/menus/gal-view-factory-etable.h>
 #include <gal/menus/gal-view-etable.h>
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-config-listener.h"
 #include "e-util/e-time-utils.h"
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 960f22aa63..a34a6237db 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -51,7 +51,7 @@
 #include <gal/menus/gal-view-etable.h>
 #include <gal/menus/gal-define-views-dialog.h>
 #include "widgets/menus/gal-view-menus.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "e-comp-editor-registry.h"
 #include "dialogs/delete-error.h"
 #include "dialogs/event-editor.h"
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 112e7b607d..3472c31f24 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -48,7 +48,7 @@
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/task-editor.h"
 #include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "e-util/e-icon-factory.h"
 
 #define CREATE_TASK_ID               "task"