2010-01-22 [pawel] 3.7.4cvs8

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 79f8be29446142bf5632e4e3fcd4dccb8e2ba3cc..a8437ea265bab402e5f3e7b173705608c85204e8 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1534,6 +1534,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
        COMBOBOX_ADD (menu, _("Automatic"), 0);
+       COMBOBOX_ADD (menu, NULL, 0);
        COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
        COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
        COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
@@ -1580,7 +1581,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        PACK_CHECK_BUTTON (hbox1, imap_use_trash_checkbtn,
                           _("Move deleted mails to trash and expunge immediately"));
        CLAWS_SET_TIP(imap_use_trash_checkbtn,
-                            _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging. "));
+                            _("Moves deleted mails to trash instead of using the \\Deleted flag without expunging."));
 
        PACK_CHECK_BUTTON (vbox1, filter_on_recv_checkbtn,
                           _("Filter messages on receiving"));
@@ -1723,6 +1724,7 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
 
        COMBOBOX_ADD (menu, _("Automatic"), 0);
+       COMBOBOX_ADD (menu, NULL, 0);
        COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
        COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
        COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
@@ -1891,7 +1893,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 +2536,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 +2611,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);