From 80e2be58ed124d1c837296c4578fdc58b2c7f3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Fri, 22 Apr 2011 14:53:49 -0400
Subject: Bug 547954 - Clarify delete-from-search-folder warning

---
 mail/e-mail-reader-utils.c | 2 +-
 mail/mail.error.xml        | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index c7b651b942..c74caadc34 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -106,7 +106,7 @@ e_mail_reader_confirm_delete (EMailReader *reader)
 
 	container = e_alert_dialog_get_content_area (E_ALERT_DIALOG (dialog));
 
-	label = _("Do not ask me again");
+	label = _("Do not warn me again");
 	check_button = gtk_check_button_new_with_label (label);
 	gtk_box_pack_start (GTK_BOX (container), check_button, TRUE, TRUE, 6);
 	gtk_widget_show (check_button);
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 7f07bb9cbe..4b9b98699e 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -244,10 +244,9 @@ Many email systems add an Apparently-To header to messages that only have BCC re
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
-  <error id="ask-delete-vfolder-msg" type="question" default="GTK_RESPONSE_CANCEL">
-    <_primary>Delete messages in Search Folder "{0}"?</_primary>
-    <_secondary xml:space="preserve">Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.
-Do you really want to do this?</_secondary>
+  <error id="ask-delete-vfolder-msg" type="warning" default="GTK_RESPONSE_CANCEL">
+    <_primary>These messages are not copies.</_primary>
+    <_secondary xml:space="preserve">Messages shown in Search Folders are not copies. Deleting them from a Search Folder will delete the actual messages from the folder or folders in which they physically reside. Do you really want to delete these messages?</_secondary>
     <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
-- 
cgit v1.2.3