[evolution-patches] Bug 53466: Typos and unclear messages in Evolution

[<davef d2 com>]

Attached are several patches, and some questions.

The first one, typos.patch, should be straightforward - some spelling
fixes, basically.

The second one. from-account.patch, slightly more involved - I changed:
"Cannot sign outgoing message: No signing certificate set for from account"

to
"Cannot sign outgoing message: No signing certificate set for account
message is from"

but, that may not be best either. Will further send questions/patches
along as I have a chance.



diff -urp evolution-1.5.7/addressbook/ChangeLog evolution-1.5.7-new/addressbook/ChangeLog
--- evolution-1.5.7/addressbook/ChangeLog       2004-04-19 07:32:18.000000000 -0700
+++ evolution-1.5.7-new/addressbook/ChangeLog   2004-05-03 23:25:40.000000000 -0700
@@ -1,3 +1,8 @@
+2004-05-03  David Fallon  <davef tetsubo com>
+
+       * gui/component/GNOME_Evolution_Addressbook.server.in.in:
+       Fixed typo for bug #53466
+
 2004-04-13  Chris Toshok  <toshok ximian com>
  
        * gui/widgets/eab-contact-display.c (accum_address): disable the
diff -urp evolution-1.5.7/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in evolution-1.5.7-new/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
--- evolution-1.5.7/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in  2003-12-06 15:19:00.000000000 -0800
+++ evolution-1.5.7-new/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in      2004-05-03 21:47:43.000000000 -0700
@@ -105,7 +105,7 @@
                        _value="Certificates"/>
                                                                                            
         <oaf_attribute name="evolution2:config_item:description" type="string"
-                       _value="Manager your S/Mime certificates here"/>
+                       _value="Manage your S/Mime certificates here"/>
                                                                                            
         <oaf_attribute name="evolution2:config_item:icon_name" type="string"
                        value="pgp-signature-ok.png"/>
diff -urp evolution-1.5.7/camel/camel-smime-context.c evolution-1.5.7-new/camel/camel-smime-context.c
--- evolution-1.5.7/camel/camel-smime-context.c 2004-02-19 18:32:08.000000000 -0800
+++ evolution-1.5.7-new/camel/camel-smime-context.c     2004-05-03 21:48:51.000000000 -0700
@@ -525,7 +525,7 @@ sm_status_description(NSSCMSVerification
        case NSSCMSVS_SignatureAlgorithmUnknown:
                return _("Signature algorithm unknown");
        case NSSCMSVS_SignatureAlgorithmUnsupported:
-               return _("Siganture algorithm unsupported");
+               return _("Signature algorithm unsupported");
        case NSSCMSVS_MalformedSignature:
                return _("Malformed signature");
        case NSSCMSVS_ProcessingError:
diff -urp evolution-1.5.7/camel/ChangeLog evolution-1.5.7-new/camel/ChangeLog
--- evolution-1.5.7/camel/ChangeLog     2004-04-19 10:47:04.000000000 -0700
+++ evolution-1.5.7-new/camel/ChangeLog 2004-05-03 23:27:57.000000000 -0700
@@ -1,3 +1,11 @@
+2004-05-03  David Fallon  <davef tetsubo com>
+
+       * camel-smime-context.c (sm_status_description):
+       Fixed typo for bug #53466.
+
+       * providers/nntp/camel-nntp-summary.c (camel_nntp_summary_check):
+       Fixed typo for bug #53466.
+
 2004-04-13  Jeffrey Stedfast  <fejj ximian com>
  
        * providers/imap/camel-imap-store.c (get_folder_online):
diff -urp evolution-1.5.7/camel/providers/nntp/camel-nntp-summary.c evolution-1.5.7-new/camel/providers/nntp/camel-nntp-summary.c
--- evolution-1.5.7/camel/providers/nntp/camel-nntp-summary.c   2004-04-07 08:23:55.000000000 -0700
+++ evolution-1.5.7-new/camel/providers/nntp/camel-nntp-summary.c       2004-05-03 23:27:59.000000000 -0700
@@ -330,7 +330,7 @@ camel_nntp_summary_check(CamelNNTPSummar
  
        if (ret < 0)
                camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-                                    _("Could not get messages: unspecificed error"));
+                                    _("Could not get messages: unspecified error"));
  
        return ret;
 }

diff -urp evolution-1.5.7/composer/ChangeLog evolution-1.5.7-new/composer/ChangeLog
--- evolution-1.5.7/composer/ChangeLog  2004-04-19 07:32:22.000000000 -0700
+++ evolution-1.5.7-new/composer/ChangeLog      2004-05-03 23:41:48.000000000 -0700
@@ -1,3 +1,7 @@
+2004-05-03  David Fallon  <davef tetsubo com>
+
+       * e-msg-composer.c (build_message): Fixed bug #53466
+
 2004-04-13  Jeffrey Stedfast  <fejj ximian com>
  
        * e-msg-composer.c (get_file_content): To be on the safe side
diff -urp evolution-1.5.7/composer/e-msg-composer.c evolution-1.5.7-new/composer/e-msg-composer.c
--- evolution-1.5.7/composer/e-msg-composer.c   2004-04-19 07:32:22.000000000 -0700
+++ evolution-1.5.7-new/composer/e-msg-composer.c       2004-05-03 23:41:49.000000000 -0700
@@ -691,13 +691,13 @@ build_message (EMsgComposer *composer, g
  
                if (composer->smime_sign
                    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-                       camel_exception_setv(&ex, 1, _("Cannot sign outgoing message: No signing certificate set for from account"));
+                       camel_exception_setv(&ex, 1, _("Cannot sign outgoing message: No signing certificate set for account message is from"));
                        goto exception;
                }
  
                if (composer->smime_encrypt
                    && (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
-                       camel_exception_setv(&ex, 1, _("Cannot encrypt outgoing message: No encryption certificate set for from account"));
+                       camel_exception_setv(&ex, 1, _("Cannot encrypt outgoing message: No encryption certificate set for account message is from"));
                        goto exception;
                }