aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/addressbook.error.xml2
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/calendar.error.xml7
-rw-r--r--calendar/gui/dialogs/comp-editor.c4
5 files changed, 26 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index d9ff008e20..3e9a670d63 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2008-03-27 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #438613
+
+ * addressbook.error.xml:
+ Improved "contact-delete-error-perm" secondary text.
+
+2008-03-27 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #316572
* gui/component/ldap-config.glade: Do not translate unused text.
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index c441845f2a..ceec857adf 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -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">
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2c88ac569f..1753233db9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-27 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-03-13 Milan Crha <mcrha@redhat.com>
** Fix for bug #512543
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index 6a51831d4f..bca6593eb9 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -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>
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 17b24091d8..a5b2232a0b 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -915,7 +915,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send)
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 *uic,
}
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;
}