Merge [mark-all-read] plugin into core code

During fixes on bug #602428, rather than do everything twice,
I merged the plugin into the core code, thus it should be easier
to maintain as well.

1 files changed, 10 insertions, 4 deletions

diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 3f1f29599e..d523b543af 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -386,10 +386,11 @@ An mbox account will be created to preserve the old mbox folders. You can delete
   </error>
 
   <error id="ask-mark-all-read-sub" type="question" default="GTK_RESPONSE_NO">
-    <_primary>Do you want to mark all messages as read?</_primary>
-    <_secondary xml:space="preserve">This will mark all messages as read in the selected folder and its subfolders.</_secondary>
-    <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+    <_primary>Also mark messages in subfolders?</_primary>
+    <_secondary xml:space="preserve">Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="In Current Folder and _Subfolders" response="GTK_RESPONSE_YES"/>
+    <button _label="In Current _Folder Only" response="GTK_RESPONSE_NO"/>
   </error>
 
   <error id="ask-reply-close-browser" type="question" default="GTK_RESPONSE_NO">
@@ -488,6 +489,11 @@ An mbox account will be created to preserve the old mbox folders. You can delete
     <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
   </error>
 
+  <error id="mark-all-read" type="error">
+    <_primary>Failed to mark messages as read.</_primary>
+    <_secondary>The reported error was &quot;{0}&quot;.</_secondary>
+  </error>
+
   <error id="remove-attachments" type="error">
     <_primary>Failed to remove attachments from messages.</_primary>
     <_secondary>The reported error was &quot;{0}&quot;.</_secondary>