aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mailing-list-actions
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-12-11 02:30:29 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-12-11 02:30:29 +0800
commitd158af8cdfa6e4bf85c1e74769e8d61bc469494c (patch)
treeba55b970ae3a23e5ade4edbddc4eb8dcaf3033bd /plugins/mailing-list-actions
parentdc0d0ee010319425b19d8d8d493f0bc489d5fd07 (diff)
downloadgsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.gz
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.bz2
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.lz
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.xz
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.tar.zst
gsoc2013-evolution-d158af8cdfa6e4bf85c1e74769e8d61bc469494c.zip
Merge revisions 36811:36865 from trunk.
svn path=/branches/kill-bonobo/; revision=36867
Diffstat (limited to 'plugins/mailing-list-actions')
-rw-r--r--plugins/mailing-list-actions/ChangeLog6
-rw-r--r--plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml2
2 files changed, 7 insertions, 1 deletions
diff --git a/plugins/mailing-list-actions/ChangeLog b/plugins/mailing-list-actions/ChangeLog
index 066bf2bda1..f53e9e3961 100644
--- a/plugins/mailing-list-actions/ChangeLog
+++ b/plugins/mailing-list-actions/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08 Jennifer Newman <jennifer.newman@tufts.edu>
+
+ ** Fix for bug #549964
+
+ * org-gnome-mailing-list-actions.error.xml: Fix for an erroneous string
+
2008-09-04 Sankar P <psankar@novell.com>
License Changes
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 a48d5c17b6..d0b860741c 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 process.
+ <_secondary xml:space="preserve">The action could not be performed. The header for this action did not contain any action that could be processed.
Header: {0}</_secondary>
</error>