Index: addressbook/ChangeLog
===================================================================
--- addressbook/ChangeLog	(revision 35170)
+++ addressbook/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-03-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #438613
+
+	* addressbook.error.xml:
+	Improved "contact-delete-error-perm" secondary text.
+
 2008-02-22  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #514836
Index: addressbook/addressbook.error.xml
===================================================================
--- addressbook/addressbook.error.xml	(revision 35170)
+++ addressbook/addressbook.error.xml	(working copy)
@@ -115,7 +115,7 @@
 
  <error id="contact-delete-error-perm" type="warning">
   <_primary>Failed to delete contact</_primary> 
-  <_secondary>Permission Denied.</_secondary>
+  <_secondary>You do not have enough permissions to delete contact in this Address Book.</_secondary>
  </error>
 
  <error id="error-read-only" type="error" default="GTK_RESPONSE_YES">
Index: calendar/calendar.error.xml
===================================================================
--- calendar/calendar.error.xml	(revision 35170)
+++ calendar/calendar.error.xml	(working copy)
@@ -235,6 +235,13 @@
   <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/>
  </error>
 
+ <error id="prompt-read-only-cal-editor" type="error" default="GTK_RESPONSE_YES">
+  <_primary>Cannot save event</_primary>
+  <!-- For Translators: {0} is the name of the calendar source -->
+  <_secondary>'{0}' is a read-only calendar source. Change Calendar to one that can accept appointments.</_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>
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
--- calendar/gui/dialogs/comp-editor.c	(revision 35170)
+++ calendar/gui/dialogs/comp-editor.c	(working copy)
@@ -915,7 +915,7 @@ prompt_and_save_changes (CompEditor *edi
 	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
 	case GTK_RESPONSE_YES: /* Save */
 		if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+			e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 			/* don't discard changes when selected readonly calendar */
 			return FALSE;
 		}
@@ -1290,7 +1290,7 @@ menu_file_save_cb (BonoboUIComponent *ui
 	}
 
 	if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
-		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
+		e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal-editor", e_source_peek_name (e_cal_get_source (priv->client)), NULL);
 		return;
 	}
 
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 35170)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,12 @@
+2008-03-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #438613
+
+	* calendar.error.xml: New message "prompt-read-only-cal-editor".
+	* gui/dialogs/comp-editor.c: (prompt_and_save_changes),
+	(menu_file_save_cb): Use different read-only message when checking
+	from contact editor and from calendar UI.
+
 2008-02-25  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #516498
