aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-format-html-display.c2
-rw-r--r--plugins/exchange-operations/ChangeLog6
-rw-r--r--plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml2
-rw-r--r--plugins/mailing-list-actions/ChangeLog6
-rw-r--r--plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml2
-rw-r--r--plugins/startup-wizard/ChangeLog6
-rw-r--r--plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml2
8 files changed, 28 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0fea6f5750..ded70d8136 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02 Jacob Brown <jeblinux@gmail.com>
+
+ ** Fix for bug #529464
+
+ * em-format-html-display.c: (efhd_format_optional): Do not use "handle"
+
2008-06-02 Milan Crha <mcrha@redhat.com>
** Fix for bug #535749
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 6738990a0d..bd8bcc6c2d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -2486,7 +2486,7 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C
EM_FORMAT_HTML_VPAD
"<table cellspacing=0 cellpadding=0><tr><td><h3><font size=-1 color=red>");
- html = camel_text_to_html(_("Evolution cannot render this email as it is too large to handle. You can view it unformatted or with an external text editor."), ((EMFormatHTML *)emf)->text_html_flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+ html = camel_text_to_html(_("Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."), ((EMFormatHTML *)emf)->text_html_flags & CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
camel_stream_write_string(stream, html);
camel_stream_write_string(stream,
"</font></h3></td></tr></table>\n");
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index b7115c39bd..eb9546fa23 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02 Jacob Brown <jeblinux@gmail.com>
+
+ ** Fix for bug #529464
+
+ * org-gnome-exchange-operations.eplug.xml: Do not use "handle"
+
2008-05-27 Bharath Acharya <abharath@novell.com>
* Fixes bnc #394441
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
index eddf713e12..b551b8d746 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml
@@ -10,7 +10,7 @@
<author name="Praveen Kumar" email="kpraveen@novell.com"/>
<author name="Shakti Sen" email="shprasad@novell.com"/>
<author name="Raghavendran R" email="raghavguru7@gmail.com"/>
- <_description>A plugin that handles a collection of Exchange account specific operations and features.</_description>
+ <_description>A plugin that manages a collection of Exchange account specific operations and features.</_description>
<hook class="org.gnome.evolution.mail.config:1.0">
<group
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index 4ee1500d4d..8241315310 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02 Jacob Brown <jeblinux@gmail.com>
+
+ ** Fix for bug #529464
+
+ * org-gnome-mailing-list-actions.error.xml: Do not use "handle"
+
2008-04-02 Matthew Barnes <mbarnes@redhat.com>
* mailing-list-actions.c (emla_list_action_do):
diff --git a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
index 31089a5dcd..a48d5c17b6 100644
--- a/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
+++ b/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml
@@ -30,7 +30,7 @@ Header: {1}</_secondary>
<error id="no-action" type="error">
<_primary>No e-mail action</_primary>
- <_secondary xml:space="preserve">The action could not be performed. This means the header for this action did not contain any action we could handle.
+ <_secondary xml:space="preserve">The action could not be performed. This means the header for this action did not contain any action we could process.
Header: {0}</_secondary>
</error>
diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog
index 817255bd4c..2aad1c410e 100644
--- a/plugins/startup-wizard/ChangeLog
+++ b/plugins/startup-wizard/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02 Jacob Brown <jeblinux@gmail.com>
+
+ ** Fix for bug #529464
+
+ * org-gnome-evolution-startup-wizard.eplug.xml: Do not use "handle"
+
2007-08-20 Matthew Barnes <mbarnes@redhat.com>
* Makefile.am: Fix a distcheck error.
diff --git a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
index bbb002ac46..0f57b6db89 100644
--- a/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
+++ b/plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
@@ -6,7 +6,7 @@
location="@PLUGINDIR@/liborg-gnome-evolution-startup-wizard@SOEXT@"
_name="Startup wizard">
<author name="JP Rosevear" email="jpr@novell.com"/>
- <_description>A plugin that handles the Startup wizard.</_description>
+ <_description>A plugin that manages the Startup wizard.</_description>
<hook class="org.gnome.evolution.shell.events:1.0">
<event
id="upgrade.done"