diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in.in | 4 | ||||
| -rw-r--r-- | plugins/sa-junk-plugin/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/sa-junk-plugin/em-junk-filter.c | 2 | ||||
| -rw-r--r-- | plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml | 6 |
5 files changed, 19 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 6f9de05bd4..b3cfbc2d1b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2007-04-03 Matthew Barnes <mbarnes@redhat.com> + * evolution-mail.schemas.in.in: + Correctly capitalize SpamAssassin. (#375577) + Patch from Priit Laes. + +2007-04-03 Matthew Barnes <mbarnes@redhat.com> + * em-folder-browser.c: * em-folder-view.c: * message-list.c: diff --git a/mail/evolution-mail.schemas.in.in b/mail/evolution-mail.schemas.in.in index 6ab3b1b844..1fbbd9b25f 100644 --- a/mail/evolution-mail.schemas.in.in +++ b/mail/evolution-mail.schemas.in.in @@ -890,9 +890,9 @@ <type>bool</type> <default>true</default> <locale name="C"> - <short>Use Spamassassin daemon and client</short> + <short>Use SpamAssassin daemon and client</short> <long> - Use Spamassassin daemon and client (spamc/spamd) + Use SpamAssassin daemon and client (spamc/spamd) </long> </locale> </schema> diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog index e8231a237a..24278d53b3 100644 --- a/plugins/sa-junk-plugin/ChangeLog +++ b/plugins/sa-junk-plugin/ChangeLog @@ -1,3 +1,10 @@ +2007-04-03 Matthew Barnes <mbarnes@redhat.com> + + * em-junk-filter.c (em_junk_sa_get_name): + * org-gnome-sa-junk-plugin.eplug.xml: + Correctly capitalize SpamAssassin. (#375577) + Patch from Priit Laes. + 2006-08-22 Kjartan Maraas <kmaraas@gnome.org> * em-junk-filter.c: (em_junk_sa_init): #if 0 out unused function and diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index ea5159f59f..68ab67472b 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -99,7 +99,7 @@ char *em_junk_sa_spamd_gconf_binary = NULL; static const char * em_junk_sa_get_name (void) { - return _("Spamassassin (built-in)"); + return _("SpamAssassin (built-in)"); } #endif diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml index 2f76ae93e9..a0688f7fd9 100644 --- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml +++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <e-plugin-list> <e-plugin id="org.gnome.evolution.sa_junk_plugin" - type="shlib" _name="Spamassassin junk plugin" + type="shlib" _name="SpamAssassin junk plugin" location="@PLUGINDIR@/liborg-gnome-sa-junk-plugin@SOEXT@"> - <_description>Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed.</_description> + <_description>Filters junk messages using SpamAssassin. This plugin requires SpamAssassin to be installed.</_description> <author name="Vivek Jain" email="jvivek@novell.com"/> <hook class="org.gnome.evolution.mail.junk:1.0"> <group id="EMJunk"> @@ -13,6 +13,6 @@ report_non_junk="em_junk_sa_report_non_junk" commit_reports="em_junk_sa_commit_reports"/> </group> - </hook> + </hook> </e-plugin> </e-plugin-list> |