diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/addressbook.error.xml | 3 | ||||
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/calendar.error.xml | 3 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 4 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 2 | ||||
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in | 8 | ||||
| -rw-r--r-- | mail/mail-config.glade | 2 |
9 files changed, 36 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c94af5f428..78ea4f6da7 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2008-02-10 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #510642 + + * addressbook.error.xml: Improved string for read-only-addressbook + error-message. + 2008-01-29 Matthew Barnes <mbarnes@redhat.com> * gui/widgets/e-minicard.c: diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml index a9da7ac38d..c441845f2a 100644 --- a/addressbook/addressbook.error.xml +++ b/addressbook/addressbook.error.xml @@ -120,7 +120,8 @@ <error id="error-read-only" type="error" default="GTK_RESPONSE_YES"> <_primary>Cannot add new contact</_primary> - <_secondary>The address book {0} is read only, thus you cannot add contacts there. Select other address book, please.</_secondary> + <!-- For Translators: {0} is the name of the address book source --> + <_secondary>'{0}' is a read-only address book source. Switch to Contacts View and highlight an address book that can accept contacts.</_secondary> <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> </error> diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7b94fe8694..59dadce6cc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2008-02-10 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #510642 + + * gui/dialogs/comp-editor.c: (prompt_and_save_changes), + (menu_file_save_cb): + * gui/e-calendar-view.c: (e_calendar_view_new_appointment_for): + * calendar.error.xml: Improved string for read-only-calendar + error-message. + 2008-02-08 Milan Crha <mcrha@redhat.com> ** Part of fixes for bug #395939 diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml index 95431369af..6a51831d4f 100644 --- a/calendar/calendar.error.xml +++ b/calendar/calendar.error.xml @@ -230,7 +230,8 @@ <error id="prompt-read-only-cal" type="error" default="GTK_RESPONSE_YES"> <_primary>Cannot create a new event</_primary> - <_secondary>You have a read-only calendar source selected. Change to Calendar View and highlight a calendar that can accept appointments.</_secondary> + <!-- For Translators: {0} is the name of the calendar source --> + <_secondary>'{0}' is a read-only calendar source. Switch to Calendar View and highlight a calendar that can accept appointments.</_secondary> <button stock ="gtk-ok" response="GTK_RESPONSE_YES"/> </error> diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 28f2751295..b01667d6dd 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -921,7 +921,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", NULL); + 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); /* don't discard changes when selected readonly calendar */ return FALSE; } @@ -1296,7 +1296,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", NULL); + 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); return; } diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 9f01ffa0b6..c1845eb992 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -1822,7 +1822,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, if (e_cal_is_read_only (default_client, &readonly, NULL) && readonly) { GtkWidget *widget; - widget = e_error_new (NULL, "calendar:prompt-read-only-cal", NULL); + widget = e_error_new (NULL, "calendar:prompt-read-only-cal", e_source_peek_name (e_cal_get_source (default_client)), NULL); g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy), widget); diff --git a/mail/ChangeLog b/mail/ChangeLog index aadafa8a63..924799235e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2008-02-10 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #510642 + + * evolution-mail.schemas.in: Improved a schema-description. + * mail-config.glade: Improved an error-message. + 2008-02-08 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #509741 diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index 36a685b45b..e984f379b6 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -378,9 +378,9 @@ <type>bool</type> <default>false</default> <locale name="C"> - <short>Show the sender email in the messages column in the message list</short> + <short>Sender email-address column in the message list</short> <long> - Show the email of the sender in the messages composite column in the message list. + Show the email-address of the sender in a separate column in the message list. </long> </locale> </schema> @@ -956,9 +956,9 @@ <type>int</type> <default>60</default> <locale name="C"> - <short>Amount of time in seconds the error should be showed on the status bar.</short> + <short>Amount of time in seconds the error should be shown on the status bar.</short> <long> - Amount of time in seconds the error should be showed on the status bar. + Amount of time in seconds the error should be shown on the status bar. </long> </locale> </schema> diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 20cba0d891..b2654a168c 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -5297,7 +5297,7 @@ For example: "Work" or "Personal"</property> <child> <widget class="GtkLabel" id="lblEnableSFRestart"> <property name="visible">True</property> - <property name="label" translatable="yes">(Note: Requires restart)</property> + <property name="label" translatable="yes">(Note: Requires restart of the application)</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_CENTER</property> |