aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail.error.xml8
2 files changed, 13 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9150bf2529..fc39affb51 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-02 Shreyas Srinivasan <sshreyas@novell.com>
+
+ * mail.error.xml: Fix 313095, Add error identifier
+ ask-delete-proxy-accounts.
+
2006-01-02 Harish Krishnaswamy <kharish@novell.com>
* em-folder-view.c: (emfv_setting_notify):
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index dcbe33653d..fc6ce75cdf 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -258,6 +258,14 @@ all proxy information will be deleted permanently.</_secondary>
<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">
+ <_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"/>
+ </error>
+
<error id="no-save-signature" type="error">
<_primary>Could not save signature file.</_primary>
<_secondary xml:space="preserve">Because &quot;{0}&quot;.</_secondary>