Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3887
diff -u -p -r1.3887 ChangeLog
--- ChangeLog	2 Aug 2006 05:37:33 -0000	1.3887
+++ ChangeLog	23 Aug 2006 09:09:42 -0000
@@ -1,3 +1,10 @@
+2006-08-22  Ushveen Kaur <kushveen@novell.com>
+
+	** Fixes bug #302742
+
+	* mail.error.xml : secondary for "vfolder-updated" and 
+	"filter-updated" corrected.
+		
 2006-08-02  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #335241
Index: mail.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail.error.xml,v
retrieving revision 1.21
diff -u -p -r1.21 mail.error.xml
--- mail.error.xml	24 Jul 2006 11:40:54 -0000	1.21
+++ mail.error.xml	23 Aug 2006 09:09:42 -0000
@@ -287,26 +287,22 @@ go to the Search Folder editor to add it
 
   <error id="vfolder-notunique" type="error">
     <_primary>Cannot add Search Folder &quot;{0}&quot;.</_primary>
-    <_secondary xml:space="preserve">A folder named &quot;{1}&quot; already exists. Please use a different name.</_secondary>
+    <_secondary xml:space="preserve">A folder named &quot;{0}&quot; already exists. Please use a different name.</_secondary>
   </error>
 
   <error id="vfolder-updated" type="info">
     <_primary>Search Folders automatically updated.</_primary>
-    <_secondary xml:space="preserve">The following Search Folder(s):
-{0}
-Used the now removed folder:
-    &quot;{1}&quot;
-And have been updated.</_secondary>
+    <_secondary xml:space="preserve">The &quot;{0}&quot; Search Folder(s) have
+    been updated due to removal of &quot;{1}&quot; folder, which was used by
+    the search folder.</_secondary>
   </error>
 
   <error id="filter-updated" type="info">
     <_primary>Mail filters automatically updated.</_primary>
-    <_secondary xml:space="preserve">The following filter rule(s):
-{0}
-Used the now removed folder:
-    &quot;{1}&quot;
-And have been updated.</_secondary>
-  </error>
+    <_secondary xml:space="preserve">The &quot;{0}&quot; Filter Rule(s) have
+    been updated, due to removal of &quot;{1}&quot; folder, which was used by
+    the filter rule.</_secondary>
+   </error>
 
   <error id="no-folder" type="error">
     <_primary>Missing folder.</_primary>
