aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-utils.c4
-rw-r--r--mail/mail-config.glade4
-rw-r--r--mail/mail.error.xml4
4 files changed, 13 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index d3ca202ace..a5761ba422 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-01 Harish Krishnaswamy <kharish@novell.com>
+
+
+ * em-utils.c (em_utils_prompt_user),
+ mail-config.glade, mail.error.xml :
+ s/don't/do not/ string changes. Fixes #325276.
+
2005-12-30 Andre Klapper <a9016009@gmx.de>
* mail.error.xml: Fixing several typos and harmonizing
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 4041d82a46..0ea8caf442 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -97,7 +97,7 @@ extern struct _CamelSession *session;
* @arg0: The first of a NULL terminated list of arguments for the error.
*
* Convenience function to query the user with a Yes/No dialog and a
- * "Don't show this dialog again" checkbox. If the user checks that
+ * "Do not show this dialog again" checkbox. If the user checks that
* checkbox, then @promptkey is set to %FALSE, otherwise it is set to
* %TRUE.
*
@@ -120,7 +120,7 @@ em_utils_prompt_user(GtkWindow *parent, const char *promptkey, const char *tag,
va_end(ap);
if (promptkey) {
- check = gtk_check_button_new_with_label (_("Don't show this message again."));
+ check = gtk_check_button_new_with_label (_("Do not show this message again."));
gtk_container_set_border_width((GtkContainer *)check, 12);
gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0);
gtk_widget_show (check);
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 6eb3ec52bb..cc6fa68d27 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -3607,7 +3607,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<widget class="GtkCheckButton" id="pgp_no_imip_sign">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Don't sign meeting requests (for Outlook compatibility)</property>
+ <property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -5672,7 +5672,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<widget class="GtkCheckButton" id="chkPromptWantHTML">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that don't want them</property>
+ <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that do not want them</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index 8a86132dd1..98feead1ec 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -246,7 +246,7 @@ The message is stored in the Outbox folder. Check the message for errors and re
<_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="Don't delete" response="GTK_RESPONSE_NO"/>
+ <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
</error>
<error id="ask-delete-account-with-proxies" type="question" default="GTK_RESPONSE_NO" modal="true">
@@ -255,7 +255,7 @@ The message is stored in the Outbox folder. Check the message for errors and re
<_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="Don't delete" response="GTK_RESPONSE_NO"/>
+ <button stock="gtk-no" _label="Do not delete" response="GTK_RESPONSE_NO"/>
</error>
<error id="no-save-signature" type="error">