Index: evolution/mail/mail.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail.error.xml,v
retrieving revision 1.20
diff -p -u -r1.20 mail.error.xml
--- evolution/mail/mail.error.xml	13 Jun 2006 21:33:24 -0000	1.20
+++ evolution/mail/mail.error.xml	19 Jul 2006 15:53:30 -0000
@@ -236,28 +236,28 @@ Many email systems add an Apparently-To 
   </error>
 
   <error id="ask-delete-account" type="question" default="GTK_RESPONSE_NO" modal="true">
-    <_title>Delete account?</_title>
-    <_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 stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-    <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
+    <_title>Remove account?</_title>
+    <_primary>Are you sure you want to remove this account?</_primary>
+    <_secondary xml:space="preserve">If you proceed, the account information will be removed permanently.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-remove" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-delete-account-with-proxies" type="question" default="GTK_RESPONSE_NO" modal="true">
-    <_title>Delete account?</_title>
-    <_primary>Are you sure you want to delete this account and all its proxies?</_primary>
+    <_title>Remove account?</_title>
+    <_primary>Are you sure you want to remove 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 stock="gtk-delete" response="GTK_RESPONSE_YES"/>
-    <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
+all proxy information will be removed permanently.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-remove" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="ask-delete-proxy-accounts" type="question" default="GTK_RESPONSE_NO" modal="true">
-    <_title>Delete account?</_title>
-    <_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"/>
+    <_title>Remove account?</_title>
+    <_primary>Are you sure you want to disable this account and remove all its proxies?</_primary>
+    <_secondary xml:space="preserve">If you proceed, all proxy accounts will be removed permanently.</_secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_NO"/>
+    <button stock="gtk-remove" response="GTK_RESPONSE_YES"/>
   </error>
 
   <error id="no-save-signature" type="error">
Index: evolution/mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3873
diff -p -u -r1.3873 ChangeLog
--- evolution/mail/ChangeLog	19 Jul 2006 15:30:18 -0000	1.3873
+++ evolution/mail/ChangeLog	19 Jul 2006 15:53:47 -0000
@@ -1,3 +1,8 @@
+2006-07-19  Michael Terry  <mike@mterry.name>
+
+	* mail.error.xml: HIGify Remove account dialog. Fixes bug #307443
+	(Patch enhanced by Andre Klapper).
+
 2006-07-14 Raghavendran R <raghavguru7@gmail.com>
 
 	** Fix for bug #330355
