in the UI replace 'POP3' with 'POP' and 'IMAP4' with 'IMAP'

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 1b8c7d22bbd5bdee9aadf4b0471e350221f4ecff..c54afcf052cc421baf7b66894f6ff56103a9fdce 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -331,8 +331,8 @@ struct BasicProtocol {
 };
 
 static char *protocol_names[] = {
-       N_("POP3"),
-       N_("IMAP4"),
+       N_("POP"),
+       N_("IMAP"),
        N_("News (NNTP)"),
        N_("Local mbox file"),
        N_("None (SMTP only)")
@@ -1451,7 +1451,7 @@ static void receive_create_widget_func(PrefsPage * _page,
                          G_CALLBACK (prefs_account_select_folder_cb),
                          local_inbox_entry);
 
-       vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("POP3"));
+       vbox2 = gtkut_get_options_frame(vbox1, &frame1, _("POP"));
        PACK_CHECK_BUTTON (vbox2, use_apop_checkbtn,
                           _("Use secure authentication (APOP)"));
 
@@ -1564,7 +1564,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_spin_button_set_numeric
                (GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
 
-       vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
+       vbox2 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -1848,7 +1848,7 @@ static void send_create_widget_func(PrefsPage * _page,
        SET_TOGGLE_SENSITIVITY (smtp_auth_checkbtn, vbox4);
 
        PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_checkbtn,
-               _("Authenticate with POP3 before sending"));
+               _("Authenticate with POP before sending"));
        
        g_signal_connect (G_OBJECT (pop_bfr_smtp_checkbtn), "clicked",
                          G_CALLBACK (pop_bfr_smtp_tm_set_sens),
@@ -2449,32 +2449,32 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       vbox2 = gtkut_get_options_frame(vbox1, &pop_frame, _("POP3"));
+       vbox2 = gtkut_get_options_frame(vbox1, &pop_frame, _("POP"));
 
        CREATE_RADIO_BUTTONS(vbox2,
                             pop_nossl_radiobtn,
-                            _("Don't use SSL"),
+                            _("Don't use SSL/TLS"),
                             SSL_NONE,
                             pop_ssltunnel_radiobtn,
-                            _("Use SSL for POP3 connection"),
+                            _("Use SSL/TLS"),
                             SSL_TUNNEL,
                             pop_starttls_radiobtn,
-                            _("Use STARTTLS command to start SSL session"),
+                            _("Use STARTTLS command to start encrypted session"),
                             SSL_STARTTLS);
        g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
                         G_CALLBACK(pop_ssltunnel_toggled), NULL);
        
-       vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
+       vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP"));
 
        CREATE_RADIO_BUTTONS(vbox3,
                             imap_nossl_radiobtn,
-                            _("Don't use SSL"),
+                            _("Don't use SSL/TLS"),
                             SSL_NONE,
                             imap_ssltunnel_radiobtn,
-                            _("Use SSL for IMAP4 connection"),
+                            _("Use SSL/TLS"),
                             SSL_TUNNEL,
                             imap_starttls_radiobtn,
-                            _("Use STARTTLS command to start SSL session"),
+                            _("Use STARTTLS command to start encrypted session"),
                             SSL_STARTTLS);
        g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled",
                         G_CALLBACK(imap_ssltunnel_toggled), NULL);
@@ -2482,7 +2482,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
        vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
 
        nntp_nossl_radiobtn =
-               gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
+               gtk_radio_button_new_with_label (NULL, _("Don't use SSL/TLS"));
        gtk_widget_show (nntp_nossl_radiobtn);
        gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
                            FALSE, FALSE, 0);
@@ -2491,7 +2491,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
                           GINT_TO_POINTER (SSL_NONE));
 
        CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
-                           _("Use SSL for NNTP connection"), SSL_TUNNEL);
+                           _("Use SSL/TLS"), SSL_TUNNEL);
        g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
                         G_CALLBACK(nntp_ssltunnel_toggled), NULL);
 
@@ -2499,13 +2499,13 @@ static void ssl_create_widget_func(PrefsPage * _page,
 
        CREATE_RADIO_BUTTONS(vbox5,
                             smtp_nossl_radiobtn,
-                            _("Don't use SSL (but, if necessary, use STARTTLS)"),
+                            _("Don't use SSL/TLS (but, if necessary, use STARTTLS)"),
                             SSL_NONE,
                             smtp_ssltunnel_radiobtn,
-                            _("Use SSL for SMTP connection"),
+                            _("Use SSL/TLS"),
                             SSL_TUNNEL,
                             smtp_starttls_radiobtn,
-                            _("Use STARTTLS command to start SSL session"),
+                            _("Use STARTTLS command to start encrypted session"),
                             SSL_STARTTLS);
        g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled",
                         G_CALLBACK(smtp_ssltunnel_toggled), NULL);
@@ -2573,10 +2573,10 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_box_pack_start (GTK_BOX (vbox1), vbox7, FALSE, FALSE, 0);
 
        PACK_CHECK_BUTTON(vbox7, ssl_certs_auto_accept_checkbtn,
-                         _("Automatically accept valid SSL certificates"));
+                         _("Automatically accept valid SSL/TLS certificates"));
 
        PACK_CHECK_BUTTON(vbox7, use_nonblocking_ssl_checkbtn,
-                         _("Use non-blocking SSL"));
+                         _("Use non-blocking SSL/TLS"));
 
        hbox = gtk_hbox_new (FALSE, 0);
        gtk_widget_show (hbox);
@@ -2588,7 +2588,7 @@ static void ssl_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request (hbox_spc, 16, -1);
 
        label = gtk_label_new
-               (_("Turn this off if you have SSL connection problems"));
+               (_("Turn this off if you have SSL/TLS connection problems"));
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
        gtkut_widget_set_small_font_size (label);
@@ -2730,14 +2730,14 @@ static void advanced_create_widget_func(PrefsPage * _page,
        
        PACK_HBOX (hbox_popport);
        PACK_CHECK_BUTTON (hbox_popport, checkbtn_popport,
-                          _("POP3 port"));
+                          _("POP port"));
        PACK_PORT_SPINBTN (hbox_popport, spinbtn_popport);
        SET_TOGGLE_SENSITIVITY (checkbtn_popport, spinbtn_popport);
        gtk_size_group_add_widget(size_group, checkbtn_popport);
 
        PACK_HBOX (hbox_imapport);
        PACK_CHECK_BUTTON (hbox_imapport, checkbtn_imapport,
-                          _("IMAP4 port"));
+                          _("IMAP port"));
        PACK_PORT_SPINBTN (hbox_imapport, spinbtn_imapport);
        SET_TOGGLE_SENSITIVITY (checkbtn_imapport, spinbtn_imapport);
        gtk_size_group_add_widget(size_group, checkbtn_imapport);
@@ -2918,7 +2918,7 @@ static gint prefs_basic_apply(void)
        }
        if (protocol == A_POP3 &&
            *gtk_entry_get_text(GTK_ENTRY(basic_page.recvserv_entry)) == '\0') {
-               alertpanel_error(_("POP3 server is not entered."));
+               alertpanel_error(_("POP server is not entered."));
                return -1;
        }
        if (protocol == A_POP3 || protocol == A_LOCAL) {
@@ -2944,7 +2944,7 @@ static gint prefs_basic_apply(void)
        }
        if (protocol == A_IMAP4 &&
            *gtk_entry_get_text(GTK_ENTRY(basic_page.recvserv_entry)) == '\0') {
-               alertpanel_error(_("IMAP4 server is not entered."));
+               alertpanel_error(_("IMAP server is not entered."));
                return -1;
        }
        if (protocol == A_NNTP &&
@@ -3393,7 +3393,7 @@ static void register_ssl_page(void)
        static gchar *path[3];
 
        path[0] = _("Account");
-       path[1] = _("SSL");
+       path[1] = _("SSL/TLS");
        path[2] = NULL;
         
        ssl_page.page.path = path;