fix some string inconsistencies

diff --git a/src/addressbook.c b/src/addressbook.c
index 56dbd23..76c8fb5 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -2915,7 +2915,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
                if( iface && iface->externalQuery ) {
                        message = g_strdup_printf( _(
                                "Do you want to delete the query " \
-                               "results and addresses in '%s' ?" ),
+                               "results and addresses in '%s'?" ),
                                obj->name );
                        aval = alertpanel( _("Delete"), message,
                                GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
@@ -2926,7 +2926,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
                }
                else {
                        message = g_strdup_printf
-                               ( _( "Do you want to delete '%s' ? "
+                               ( _( "Do you want to delete '%s'? "
                                     "If you delete the folder only, the addresses it contains will be moved into the parent folder." ),
                                 obj->name );
                        aval = alertpanel( _("Delete folder"), message,

diff --git a/src/compose.c b/src/compose.c
index f351d8f..77370de 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -10089,7 +10089,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
        tmpl = g_object_get_data(G_OBJECT(widget), "template");
        cm_return_if_fail(tmpl != NULL);
 
-       msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
+       msg = g_strdup_printf(_("Do you want to apply the template '%s'?"),
                              tmpl->name);
        val = alertpanel(_("Apply template"), msg,
                         _("_Replace"), _("_Insert"), GTK_STOCK_CANCEL);

diff --git a/src/folderview.c b/src/folderview.c
index 44ec9cf..14b2f51 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1018,11 +1018,11 @@ static void folderview_set_folders(FolderView *folderview)
 static gchar *get_scan_str(FolderItem *item)
 {
        if (item->path)
-               return g_strdup_printf(_("Scanning folder %s%c%s ..."),
+               return g_strdup_printf(_("Scanning folder %s%c%s..."),
                                      item->folder->name, G_DIR_SEPARATOR,
                                      item->path);
        else
-               return g_strdup_printf(_("Scanning folder %s ..."),
+               return g_strdup_printf(_("Scanning folder %s..."),
                                      item->folder->name);      
 }
 static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
@@ -2482,8 +2482,8 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        cm_return_if_fail(to_folder != NULL);
 
        if (prefs_common.warn_dnd) {
-               buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
-                                            _("Do you really want to make folder '%s' a subfolder of '%s' ?"), 
+               buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s'?"):
+                                            _("Do you really want to make folder '%s' a subfolder of '%s'?"), 
                                        from_folder->name, to_folder->name);
                status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
                                         GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,

diff --git a/src/imap.c b/src/imap.c
index 7c671e5..94de747 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -4487,12 +4487,12 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 
        lock_session(session); /* unlocked by get_list_of_uids */
        if (FOLDER_ITEM(item)->path) 
-               statusbar_print_all(_("Scanning folder %s%c%s ..."),
+               statusbar_print_all(_("Scanning folder %s%c%s..."),
                                      FOLDER_ITEM(item)->folder->name, 
                                      G_DIR_SEPARATOR,
                                      FOLDER_ITEM(item)->path);
        else
-               statusbar_print_all(_("Scanning folder %s ..."),
+               statusbar_print_all(_("Scanning folder %s..."),
                                      FOLDER_ITEM(item)->folder->name);
 
        if (item->should_trash_cache) {

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index aa5893e..dae79e1 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -274,7 +274,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
                return;
        }
        if (strchr(new_folder, '/') != NULL) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
+               alertpanel_error(_("'%c' can't be included in folder name."),
                                 '/');
                return;
        }

diff --git a/src/inc.c b/src/inc.c
index d692ea0..1a63e85 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -933,7 +933,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));
                statuswindow_pop_all();
-               statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
+               statusbar_print_all(_("Retrieving messages from %s (%s)..."),
                                    SESSION(session)->server,
                                    session->ac_prefs->account_name);
                break;

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 6e28758..8b4ef16 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -5305,12 +5305,12 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        gchar *str;
 
        if (item->path)
-               str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
+               str = g_strdup_printf(_("Scanning folder %s%c%s..."),
                                      LOCAL_FOLDER(folder)->rootpath,
                                      G_DIR_SEPARATOR,
                                      item->path);
        else
-               str = g_strdup_printf(_("Scanning folder %s ..."),
+               str = g_strdup_printf(_("Scanning folder %s..."),
                                      LOCAL_FOLDER(folder)->rootpath);
 
        STATUSBAR_PUSH(mainwin, str);

diff --git a/src/mbox.c b/src/mbox.c
index 7dcbbfa..7ad328c 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -142,7 +142,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
                                statusbar_pop_all();
                        statusbar_print_all(
                                        ngettext("Importing from mbox... (%d mail imported)",
-                                               "Importing from mbox ... (%d mails imported)", msgs), msgs);
+                                               "Importing from mbox... (%d mails imported)", msgs), msgs);
                        printed=TRUE;
                        GTK_EVENTS_FLUSH();
                }

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index c763c51..064fac4 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -355,7 +355,7 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
 
        name = trim_string(item->folder->name, 32);
        message = g_markup_printf_escaped
-               (_("Really remove the mailbox '%s' ?\n"
+               (_("Really remove the mailbox '%s'?\n"
                   "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel_full(_("Remove mailbox"), message,
                                 GTK_STOCK_CANCEL, _("_Remove"), NULL, FALSE,

diff --git a/src/news.c b/src/news.c
index 508495d..72083f6 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -351,7 +351,7 @@ static Session *news_session_new(Folder *folder, const gchar *server, gushort po
                r = nntp_threaded_connect(folder, server, port);
        
        if (r != NEWSNNTP_NO_ERROR) {
-               log_error(LOG_PROTOCOL, _("Error logging in to %s:%d ...\n"), server, port);
+               log_error(LOG_PROTOCOL, _("Error logging in to %s:%d...\n"), server, port);
                session_destroy(SESSION(session));
                return NULL;
        }
@@ -456,7 +456,7 @@ static Session *news_session_new_for_folder(Folder *folder)
        if ((session != NULL) && ac->use_nntp_auth) { /* FIXME:  && ac->use_nntp_auth_onconnect */
                if (nntp_threaded_login(folder, userid, passwd) !=
                        NEWSNNTP_NO_ERROR) {
-                       log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d ...\n"), ac->nntp_server, port);
+                       log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d...\n"), ac->nntp_server, port);
                        session_destroy(SESSION(session));
                        g_free(passwd);
                        if (ac->session_passwd) {

diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index dc73b29..82a7fc6 100644 (file)
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -231,7 +231,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
 
-       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
+       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select..."));
        gtk_widget_show (whitelist_ab_select_btn);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
        CLAWS_SET_TIP(whitelist_ab_select_btn,

diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c
index 4271146..115ac9a 100644 (file)
--- a/src/plugins/bsfilter/bsfilter_gtk.c
+++ b/src/plugins/bsfilter/bsfilter_gtk.c
@@ -198,7 +198,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
 
-       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
+       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select..."));
        gtk_widget_show (whitelist_ab_select_btn);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
        CLAWS_SET_TIP(whitelist_ab_select_btn,

diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index e2f5b00..3c7803c 100644 (file)
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -193,7 +193,7 @@ static void add_mailbox(GtkAction *action, gpointer callback_data)
                            "Mail");
        if (!path) return;
        if (folder_find_from_path(path)) {
-               alertpanel_error(_("The mailbox `%s' already exists."), path);
+               alertpanel_error(_("The mailbox '%s' already exists."), path);
                g_free(path);
                return;
        }
@@ -246,7 +246,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
        if (p == NULL)
                p = strchr(new_folder, '.');
        if (p) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
+               alertpanel_error(_("'%c' can't be included in folder name."),
                                 p[0]);
                return;
        }
@@ -258,14 +258,14 @@ static void new_folder_cb(GtkAction *action, gpointer data)
        p = g_strconcat(item->path ? item->path : "", ".", new_folder, NULL);
        if (folder_find_child_item_by_name(item, p)) {
                g_free(p);
-               alertpanel_error(_("The folder `%s' already exists."), name);
+               alertpanel_error(_("The folder '%s' already exists."), name);
                return;
        }
        g_free(p);
 
        new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
-               alertpanel_error(_("Can't create the folder `%s'."), name);
+               alertpanel_error(_("Can't create the folder '%s'."), name);
                return;
        }
 
@@ -287,7 +287,7 @@ static void remove_mailbox_cb(GtkAction *action, gpointer data)
 
        name = trim_string(item->folder->name, 32);
        message = g_strdup_printf
-               (_("Really remove the mailbox `%s' ?\n"
+               (_("Really remove the mailbox '%s'?\n"
                   "(The messages are NOT deleted from the disk)"), name);
        avalue = alertpanel_full(_("Remove mailbox"), message,
                                 GTK_STOCK_CANCEL, _("_Remove"), NULL, FALSE,
@@ -320,7 +320,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        name = trim_string(item->name, 32);
        AUTORELEASE_STR(name, {g_free(name); return;});
        message = g_strdup_printf
-               (_("All folder(s) and message(s) under `%s' will be deleted.\n"
+               (_("All folder(s) and message(s) under '%s' will be deleted.\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel_full(_("Delete folder"), message,
                                 GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
@@ -340,7 +340,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        }
 
        if (item->folder->klass->remove_folder(item->folder, item) < 0) {
-               alertpanel_error(_("Can't remove the folder `%s'."), name);
+               alertpanel_error(_("Can't remove the folder '%s'."), name);
                if (folderview->opened == folderview->selected)
                        summary_show(folderview->summaryview,
                                     folderview->summaryview->folder_item);
@@ -405,7 +405,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
        g_return_if_fail(item->folder != NULL);
 
        name = trim_string(item->name, 32);
-       message = g_strdup_printf(_("Input new name for `%s':"), name);
+       message = g_strdup_printf(_("Input new name for '%s':"), name);
        new_folder = input_dialog(_("Rename folder"), message, item->name);
        g_free(message);
        g_free(name);
@@ -416,7 +416,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
        if (p == NULL)
                p = strchr(new_folder, '.');
        if (p) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
+               alertpanel_error(_("'%c' can't be included in folder name."),
                                 p[0]);
                return;
        }
@@ -425,7 +425,7 @@ static void rename_folder_cb(GtkAction *action, gpointer data)
        p = g_strconcat(parent->path ? parent->path : "", ".", new_folder, NULL);
        if (folder_find_child_item_by_name(parent, p)) {
                name = trim_string(new_folder, 32);
-               alertpanel_error(_("The folder `%s' already exists."), name);
+               alertpanel_error(_("The folder '%s' already exists."), name);
                g_free(name);
                return;
        }

diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 1e36d09..85b51fe 100644 (file)
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -135,7 +135,7 @@ void rssyl_remove_rss_cb(GtkAction *action, gpointer data)
        g_return_if_fail( !folder_item_parent(item) );
 
        name = trim_string(item->folder->name, 32);
-       message = g_strdup_printf(_("Really remove the folder tree '%s' ?\n"), name);
+       message = g_strdup_printf(_("Really remove the folder tree '%s'?\n"), name);
        aval = alertpanel_full(_("Remove folder tree"), message,
                         GTK_STOCK_CANCEL, _("_Remove"), NULL, FALSE, NULL,
                          ALERT_WARNING, G_ALERTDEFAULT);

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 5eb0f43..1121ec2 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -444,7 +444,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
 
-       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
+       whitelist_ab_select_btn = gtk_button_new_with_label(_("Select..."));
        gtk_widget_show (whitelist_ab_select_btn);
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
        CLAWS_SET_TIP(whitelist_ab_select_btn,

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index f2c2505..9cb7af0 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -570,14 +570,14 @@ static void prefs_filtering_action_create(void)
        gtk_table_attach(GTK_TABLE(table), hbox1, 2, 3, 2, 3, 
                        GTK_FILL, GTK_SHRINK, 0, 0);
 
-       dest_btn = gtk_button_new_with_label (_("Select ..."));
+       dest_btn = gtk_button_new_with_label (_("Select..."));
        gtk_box_pack_start (GTK_BOX (hbox1), dest_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (dest_btn), "clicked",
                          G_CALLBACK(prefs_filtering_action_select_dest),
                          NULL);
 
 #ifndef USE_NEW_ADDRBOOK
-       addressbook_btn = gtk_button_new_with_label (_("Select ..."));
+       addressbook_btn = gtk_button_new_with_label (_("Select..."));
        gtk_box_pack_start (GTK_BOX (hbox1), addressbook_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (addressbook_btn), "clicked",
                          G_CALLBACK(prefs_filtering_action_select_addressbook),

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 23a961d..c4f0774 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -673,7 +673,7 @@ static void prefs_matcher_create(void)
        gtk_widget_set_size_request(addressbook_folder_combo, 150, -1);
        gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_folder_combo, TRUE, TRUE, 0);                        
 
-       addressbook_select_btn = gtk_button_new_with_label(_("Select ..."));
+       addressbook_select_btn = gtk_button_new_with_label(_("Select..."));
        gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_select_btn, FALSE, FALSE, 0);
 #ifndef USE_NEW_ADDRBOOK
        g_signal_connect(G_OBJECT (addressbook_select_btn), "clicked",

diff --git a/src/setup.c b/src/setup.c
index d8df4ce..ac62453 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -88,12 +88,12 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        gchar *str;
 
        if (item->path)
-               str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
+               str = g_strdup_printf(_("Scanning folder %s%c%s..."),
                                      LOCAL_FOLDER(folder)->rootpath,
                                      G_DIR_SEPARATOR,
                                      item->path);
        else
-               str = g_strdup_printf(_("Scanning folder %s ..."),
+               str = g_strdup_printf(_("Scanning folder %s..."),
                                      LOCAL_FOLDER(folder)->rootpath);
 
        if (mainwin->statusbar)