From a6b1fb2b5f1cfee02703fae9fa06d2a3a6eba8dd Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 17 Oct 2009 04:10:33 +0000 Subject: [PATCH] 2009-10-17 [paul] 3.7.3cvs1 * src/prefs_account.c * src/prefs_compose_writing.c * src/prefs_receive.c * src/prefs_summaries.c * src/prefs_wrapping.c reword a few labels. (this incorporates everything that seemed worthwhile from bug 2020) * src/prefs_customheader.c use a 'Browse' button instead of button with label 'From file...' --- ChangeLog | 13 +++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_account.c | 18 ++++++++---------- src/prefs_compose_writing.c | 6 +++--- src/prefs_customheader.c | 2 +- src/prefs_receive.c | 2 +- src/prefs_summaries.c | 2 +- src/prefs_wrapping.c | 2 +- 9 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1f673e8a..d519aa930 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-10-17 [paul] 3.7.3cvs1 + + * src/prefs_account.c + * src/prefs_compose_writing.c + * src/prefs_receive.c + * src/prefs_summaries.c + * src/prefs_wrapping.c + reword a few labels. (this incorporates everything + that seemed worthwhile from bug 2020) + * src/prefs_customheader.c + use a 'Browse' button instead of button with + label 'From file...' + 2009-10-12 [colin] * CVS repository change diff --git a/PATCHSETS b/PATCHSETS index f8bab6d6f..182e39fb3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3874,3 +3874,4 @@ ( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 po/cs.po; cvs diff -u -r 1.58.2.44 -r 1.58.2.45 po/de.po; cvs diff -u -r 1.5.2.14 -r 1.5.2.15 po/hu.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/id.po; cvs diff -u -r 1.16.2.9 -r 1.16.2.10 po/ja.po; cvs diff -u -r 1.50.2.36 -r 1.50.2.37 po/pt_BR.po; ) > 3.7.2cvs47.patchset ( cvs diff -u -r 1.5.10.29 -r 1.5.10.30 src/addrgather.c; cvs diff -u -r 1.204.2.192 -r 1.204.2.193 src/prefs_common.c; cvs diff -u -r 1.103.2.125 -r 1.103.2.126 src/prefs_common.h; ) > 3.7.2cvs48.patchset ( cvs diff -u -r 1.207.2.214 -r 1.207.2.215 src/folderview.c; cvs diff -u -r 1.20.2.25 -r 1.20.2.26 src/folderview.h; cvs diff -u -r 1.274.2.302 -r 1.274.2.303 src/mainwindow.c; ) > 3.7.2cvs49.patchset +( cvs diff -u -r 1.105.2.155 -r 1.105.2.156 src/prefs_account.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_compose_writing.c; cvs diff -u -r 1.16.2.39 -r 1.16.2.40 src/prefs_customheader.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_receive.c; cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/prefs_summaries.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_wrapping.c; ) > 3.7.3cvs1.patchset diff --git a/configure.ac b/configure.ac index cadecfa62..95a967f3e 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=3 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=0 +EXTRA_VERSION=1 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_account.c b/src/prefs_account.c index c1a139a12..091ee17bd 100644 --- a/src/prefs_account.c +++ b/src/prefs_account.c @@ -1891,7 +1891,7 @@ static void compose_create_widget_func(PrefsPage * _page, vbox_sig = gtkut_get_options_frame(vbox1, &frame_sig, _("Signature")); PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig, - _("Insert signature automatically")); + _("Automatically insert signature")); hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -2534,6 +2534,7 @@ static void advanced_create_widget_func(PrefsPage * _page, GtkWidget *spinbtn_nntpport; GtkWidget *checkbtn_domain; GtkWidget *entry_domain; + gchar *tip_domain; GtkWidget *checkbtn_msgid_with_addr; GtkWidget *checkbtn_crosspost; GtkWidget *colormenu_crosspost; @@ -2608,22 +2609,19 @@ static void advanced_create_widget_func(PrefsPage * _page, PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Domain name")); gtk_size_group_add_widget(size_group, checkbtn_domain); - CLAWS_SET_TIP(checkbtn_domain, - _("The domain name will be used in the right part of " - "the generated Message-Ids, and when connecting to " - "SMTP servers.")); + tip_domain = _("The domain name will be used in the generated " + "Message-ID, and when connecting to SMTP servers."); + + CLAWS_SET_TIP(checkbtn_domain, tip_domain); entry_domain = gtk_entry_new (); gtk_widget_show (entry_domain); gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0); SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain); - CLAWS_SET_TIP(entry_domain, - _("The domain name will be used in the right part of " - "the generated Message-Ids, and when connecting to " - "SMTP servers.")); + CLAWS_SET_TIP(entry_domain, tip_domain); PACK_HBOX (hbox1); PACK_CHECK_BUTTON (hbox1, checkbtn_msgid_with_addr, - _("Send account mail address in Message-Id")); + _("Send account mail address in Message-ID")); #ifndef G_OS_WIN32 PACK_HBOX (hbox1); diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c index ad1a66534..fec3a4650 100644 --- a/src/prefs_compose_writing.c +++ b/src/prefs_compose_writing.c @@ -144,7 +144,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win gtk_box_pack_start (GTK_BOX (vbox2), hbox_autosave, FALSE, FALSE, 0); PACK_CHECK_BUTTON (hbox_autosave, checkbtn_autosave, - _("Autosave message text to Drafts folder every")); + _("Automatically save message to Drafts folder every")); spinbtn_autosave_adj = gtk_adjustment_new (50, 0, 1000, 1, 10, 0); spinbtn_autosave_length = gtk_spin_button_new @@ -181,7 +181,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win gtk_box_pack_start (GTK_BOX (vbox2), hbox_warn_large_insert, FALSE, FALSE, 0); PACK_CHECK_BUTTON (hbox_warn_large_insert, checkbtn_warn_large_insert, - _("Warn when inserting in message body a file larger than")); + _("Warn when inserting a file larger than")); spinbtn_warn_large_insert_adj = gtk_adjustment_new (50, 0, 10000, 1, 10, 0); spinbtn_warn_large_insert_size = gtk_spin_button_new @@ -193,7 +193,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_warn_large_insert_size), TRUE); - label_warn_large_insert_size = gtk_label_new(_("KB")); + label_warn_large_insert_size = gtk_label_new(_("KB into message body ")); gtk_widget_show (label_warn_large_insert_size); gtk_box_pack_start (GTK_BOX (hbox_warn_large_insert), label_warn_large_insert_size, FALSE, FALSE, 0); diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c index 2afef7700..1cf1ab3a9 100644 --- a/src/prefs_customheader.c +++ b/src/prefs_customheader.c @@ -233,7 +233,7 @@ static void prefs_custom_header_create(void) 0, 0, 0); gtk_widget_set_size_request (val_entry, 200, -1); - val_btn = gtk_button_new_with_label (_("From file...")); + val_btn = gtkut_get_browse_file_btn(_("Bro_wse")); gtk_widget_show (val_btn); gtk_table_attach (GTK_TABLE (table1), val_btn, 2, 3, 1, 2, GTK_EXPAND | GTK_SHRINK | GTK_FILL, diff --git a/src/prefs_receive.c b/src/prefs_receive.c index e7bc78438..b7c534fc4 100644 --- a/src/prefs_receive.c +++ b/src/prefs_receive.c @@ -159,7 +159,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0); PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk, - _("Automatically check for new mail every")); + _("Check for new mail every")); spinbtn_autochk_adj = gtk_adjustment_new (5, 1, 100, 1, 10, 0); spinbtn_autochk = gtk_spin_button_new diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c index 86ddbc9c7..87da4d5d5 100644 --- a/src/prefs_summaries.c +++ b/src/prefs_summaries.c @@ -561,7 +561,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window, PACK_CHECK_BUTTON (vbox1, checkbtn_ask_mark_all_read, - _("Confirm before marking all mails in a folder as read")); + _("Confirm before marking all messages in a folder as read")); PACK_CHECK_BUTTON (vbox1, checkbtn_transhdr, _("Translate header names")); diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c index 03ba9235f..efef90afc 100644 --- a/src/prefs_wrapping.c +++ b/src/prefs_wrapping.c @@ -85,7 +85,7 @@ static void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window, gtk_widget_show (hbox1); gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0); - label_linewrap = gtk_label_new (_("Wrap messages at")); + label_linewrap = gtk_label_new (_("Wrap text at")); gtk_widget_show (label_linewrap); gtk_box_pack_start (GTK_BOX (hbox1), label_linewrap, FALSE, FALSE, 4); -- 2.25.1