aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2006-06-14 05:33:24 +0800
committerAndre Klapper <aklapper@src.gnome.org>2006-06-14 05:33:24 +0800
commit038d5646ce74cbd54936e6861545f9b7cdd905db (patch)
tree92bbe9fc8974737c6c79327ca21e7744529c73e0 /mail
parent14794b3d26e6be55aba0dd173dbb81c288b13ba5 (diff)
downloadgsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar.gz
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar.bz2
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar.lz
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar.xz
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.tar.zst
gsoc2013-evolution-038d5646ce74cbd54936e6861545f9b7cdd905db.zip
changing string "Ximian Evolution" to "Evolution". Fixes bug #344298.
2006-06-13 Andre Klapper <a9016009@gmx.de> * mail.error.xml: changing string "Ximian Evolution" to "Evolution". Fixes bug #344298. svn path=/trunk/; revision=32130
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail.error.xml4
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index cdc358acb2..10c589de2f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13 Andre Klapper <a9016009@gmx.de>
+
+ * mail.error.xml: changing string "Ximian Evolution" to "Evolution".
+ Fixes bug #344298.
+
2006-06-13 Tor Lillqvist <tml@novell.com>
* em-format-html.c (efh_format_address): Fix build on Win32, where
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 935338ba27..5ed75c12c2 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -167,12 +167,12 @@ Many email systems add an Apparently-To header to messages that only have BCC re
<error id="no-delete-special-folder" type="error">
<_primary>Cannot delete system folder &quot;{0}&quot;.</_primary>
- <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+ <_secondary xml:space="preserve">System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
</error>
<error id="no-rename-special-folder" type="error">
<_primary>Cannot rename or move system folder &quot;{0}&quot;.</_primary>
- <_secondary xml:space="preserve">System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
+ <_secondary xml:space="preserve">System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted.</_secondary>
</error>
<error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">