diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 4 | ||||
| -rw-r--r-- | mail/mail-signature-editor.c | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3444dae643..794d5dc78d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2002-09-30 Aaron Weber <aaron@ximian.com> + + * mail-signature-editor.c (mail_signature_editor): change + string to "Enter a name for this signature" on line 372. + + * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): change + HTML-mail warning on 255 + + * component-factory.c (component_factory_init): change + "Evolution's foo" to "the Evolution foo" in string on 1078 + 2002-09-30 Not Zed <NotZed@Ximian.com> * mail-session.c (request_password): translate prompt from utf8 to diff --git a/mail/component-factory.c b/mail/component-factory.c index c5ca3c4d14..da74969be4 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -1075,7 +1075,7 @@ component_factory_init (void) result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (shell_component)); if (result == OAF_REG_ERROR) { e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, - _("Cannot initialize Evolution's mail component.")); + _("Cannot initialize the Evolution mail component.")); exit (1); } else if (result == OAF_REG_ALREADY_ACTIVE) { g_warning ("evolution-mail is already running"); diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index e55d125e83..eef61fde6a 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -252,8 +252,8 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip } /* FIXME: this wording sucks */ - str = g_string_new (_("You are sending an HTML-formatted message, but the following recipients " - "do not want HTML-formatted mail:\n")); + str = g_string_new (_("You are sending an HTML-formatted message. Please make sure that\n" + "the following recipients are willing and able to receive HTML mail:\n")); for (i = 0; recipients[i] != NULL; ++i) { if (!e_destination_get_html_mail_pref (recipients[i])) { const char *name; diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index dae3e6934d..2a6463d680 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -369,7 +369,7 @@ mail_signature_editor (MailConfigSignature *sig) hbox = gtk_hbox_new (FALSE, 4); vbox1 = gtk_vbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (vbox1), 3); - label = gtk_label_new (_("Type the name by which you would like to refer to this signature.")); + label = gtk_label_new (_("Enter a name for this signature.")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_box_pack_start (GTK_BOX (vbox1), label, FALSE, TRUE, 0); label = gtk_label_new (_("Name:")); |