evolution r35260 - in trunk: addressbook calendar calendar/gui/dialogs
- From: mcrha svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35260 - in trunk: addressbook calendar calendar/gui/dialogs
- Date: Thu, 27 Mar 2008 10:38:34 +0000 (GMT)
Author: mcrha
Date: Thu Mar 27 10:38:33 2008
New Revision: 35260
URL: http://svn.gnome.org/viewvc/evolution?rev=35260&view=rev
Log:
2008-03-27 Milan Crha <mcrha redhat com>
** Fix for bug #438613
* addressbook/addressbook.error.xml:
Improved "contact-delete-error-perm" secondary text.
* calendar/calendar.error.xml: New message "prompt-read-only-cal-editor".
* calendar/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.
Modified:
trunk/addressbook/ChangeLog
trunk/addressbook/addressbook.error.xml
trunk/calendar/ChangeLog
trunk/calendar/calendar.error.xml
trunk/calendar/gui/dialogs/comp-editor.c
Modified: trunk/addressbook/addressbook.error.xml
==============================================================================
--- trunk/addressbook/addressbook.error.xml (original)
+++ trunk/addressbook/addressbook.error.xml Thu Mar 27 10:38:33 2008
@@ -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">
Modified: trunk/calendar/calendar.error.xml
==============================================================================
--- trunk/calendar/calendar.error.xml (original)
+++ trunk/calendar/calendar.error.xml Thu Mar 27 10:38:33 2008
@@ -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>
Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor.c Thu Mar 27 10:38:33 2008
@@ -915,7 +915,7 @@
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 @@
}
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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]