Bug 619637 - Inconsistent buttons in delete confirmation dialogs

3 files changed, 28 insertions, 28 deletions

diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
index a93ea8578b..b674a58104 100644
--- a/addressbook/addressbook.error.xml
+++ b/addressbook/addressbook.error.xml
@@ -35,7 +35,7 @@
  <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
   <_primary>Delete address book '{0}'?</_primary>
   <_secondary>This address book will be removed permanently.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml
index eaaaa35533..6ba4ed1e8d 100644
--- a/calendar/calendar.error.xml
+++ b/calendar/calendar.error.xml
@@ -11,7 +11,7 @@
  <error id="prompt-delete-meeting" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete this meeting?</_primary>
   <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
@@ -25,7 +25,7 @@
  <error id="prompt-delete-task" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete this task?</_primary>
   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
@@ -39,63 +39,63 @@
  <error id="prompt-delete-memo" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete this memo?</_primary>
   <_secondary>All information on this memo will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-titled-meeting" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete the meeting titled '{0}'?</_primary>
   <_secondary>All information on this meeting will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-titled-appointment" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete the appointment titled '{0}'?</_primary>
   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-appointment" type="question" default="GTK_RESPONSE_YES">
   <_primary>Are you sure you want to delete this appointment?</_primary>
   <_secondary>All information on this appointment will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-named-task" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete the '{0}' task?</_primary>
   <_secondary>All information on this task will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-named-memo" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete the memo '{0}'?</_primary>
   <_secondary>All information in this memo will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-appointments" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete these {0} appointments?</_primary>
   <_secondary>All information on these appointments will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-tasks" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete these {0} tasks?</_primary>
   <_secondary>All information on these tasks will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-memos" type="question" default="GTK_RESPONSE_NO">
   <_primary>Are you sure you want to delete these {0} memos?</_primary>
   <_secondary>All information in these memos will be deleted and can not be restored.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
@@ -201,21 +201,21 @@
  <error id="prompt-delete-calendar" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
   <_primary>Delete calendar '{0}'?</_primary>
   <_secondary>This calendar will be removed permanently.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-task-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
   <_primary>Delete task list '{0}'?</_primary>
   <_secondary>This task list will be removed permanently.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="prompt-delete-memo-list" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
   <_primary>Delete memo list '{0}'?</_primary>
   <_secondary>This memo list will be removed permanently.</_secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+  <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
  </error>
  
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index e2ffd243aa..129b4e6250 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -196,26 +196,26 @@ Many email systems add an Apparently-To header to messages that only have BCC re
   <error id="ask-delete-folder" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Really delete folder "{0}" and all of its subfolders?</_primary>
     <_secondary xml:space="preserve">If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="ask-delete-vfolder" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Really delete folder "{0}" and all of its subfolders?</_primary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="ask-delete-folder-nochild" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Really delete folder "{0}"?</_primary>
     <_secondary xml:space="preserve">If you delete the folder, all of its contents will be deleted permanently.</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
   <error id="ask-delete-vfolder-nochild" type="question" default="GTK_RESPONSE_CANCEL">
     <_primary>Really delete folder "{0}"?</_primary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
@@ -223,7 +223,7 @@ Many email systems add an Apparently-To header to messages that only have BCC re
     <_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>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_CANCEL"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
   </error>
 
@@ -275,23 +275,23 @@ Do you really want to do this?</_secondary>
   <error id="ask-delete-account" type="question" default="GTK_RESPONSE_NO" modal="true">
     <_primary>Are you sure you want to delete this account?</_primary>
     <_secondary xml:space="preserve">If you proceed, the account information will be deleted permanently.</_secondary>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-    <button stock="gtk-no" _label="Do not d_elete" response="GTK_RESPONSE_NO"/>
   </error>
 
   <error id="ask-delete-account-with-proxies" type="question" default="GTK_RESPONSE_NO" modal="true">
     <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
     <_secondary xml:space="preserve">If you proceed, the account information and
 all proxy information will be deleted permanently.</_secondary>
+    <button _label="Do _Not Delete" response="GTK_RESPONSE_NO"/>
     <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-    <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
   </error>
 
   <error id="ask-delete-proxy-accounts" type="question" default="GTK_RESPONSE_NO" modal="true">
     <_primary>Are you sure you want to disable this account and delete all its proxies?</_primary>
     <_secondary xml:space="preserve">If you proceed, all proxy accounts will be deleted permanently.</_secondary>
-    <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
-    <button stock="gtk-no" _label="Do not disable" response="GTK_RESPONSE_NO"/>
+    <button _label="Do _Not Disable" response="GTK_RESPONSE_NO"/>
+    <button _label="_Disable" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="no-save-signature" type="error">
@@ -379,15 +379,15 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
   <error id="ask-receipt" type="question" default="GTK_RESPONSE_NO">
     <_primary>Read receipt requested.</_primary>
     <_secondary xml:space="preserve">A read receipt notification has been requested for "{1}". Send the receipt notification to {0}?</_secondary>
-    <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-yes" _label="Send Receipt" response="GTK_RESPONSE_YES"/>
+    <button _label="Do _Not Send" response="GTK_RESPONSE_NO"/>
+    <button _label="_Send Receipt" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-quick-offline" type="question" default="GTK_RESPONSE_NO">
     <_primary>Synchronize folders locally for offline usage?</_primary>
     <_secondary xml:space="preserve">Do you want to locally synchronize the folders that are marked for offline usage?</_secondary>
-    <button stock="gtk-no" _label="_Do not Synchronize" response="GTK_RESPONSE_NO"/>
-    <button stock="gtk-yes" _label="Synchronize" response="GTK_RESPONSE_YES"/>
+    <button _label="Do _Not Synchronize" response="GTK_RESPONSE_NO"/>
+    <button _label="_Synchronize" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-mark-all-read" type="question" default="GTK_RESPONSE_NO">