2005-05-06 [paul] 1.9.6cvs56

	* src/inc.c
	* src/mainwindow.c
		use gettext plural forms
	* src/imap_gtk.c
	* src/mh_gtk.c
	* src/toolbar.c
		small improvement to english usage

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 297233564f4a98a1ab5fc3a09da698c621dc876a..014816421f013044255567ef251371c0bd196fc3 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,13 @@
+2005-05-06 [paul]      1.9.6cvs56
+
+       * src/inc.c
+       * src/mainwindow.c
+               use gettext plural forms
+       * src/imap_gtk.c
+       * src/mh_gtk.c
+       * src/toolbar.c
+               small improvement to english usage
+
 2005-05-05 [thorsten]  1.9.6cvs55
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 994533da74258e2405f360323a022d31e96e2691..46746f8cc75406ddf53ea924c011b4fce09bd740 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -472,3 +472,4 @@
 ( cvs diff -u -r 1.274.2.36 -r 1.274.2.37 src/mainwindow.c; ) > 1.9.6cvs53.patchset
 ( cvs diff -u -r 1.100.2.16 -r 1.100.2.17 AUTHORS; cvs diff -u -r 1.382.2.119 -r 1.382.2.120 src/compose.c; ) > 1.9.6cvs54.patchset
 ( cvs diff -u -r 1.213.2.24 -r 1.213.2.25 src/folder.c; ) > 1.9.6cvs55.patchset
+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/imap_gtk.c; cvs diff -u -r 1.149.2.23 -r 1.149.2.24 src/inc.c; cvs diff -u -r 1.274.2.37 -r 1.274.2.38 src/mainwindow.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/mh_gtk.c; cvs diff -u -r 1.43.2.16 -r 1.43.2.17 src/toolbar.c; ) > 1.9.6cvs56.patchset

diff --git a/configure.ac b/configure.ac
index 73403c111cae9083d622ab316e8090b42284a4dd..77df5e2d29a81bcc8962945814716087ed6477c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 4313dddcec5f93cd8adfd7ea27b502083f2576da..9bc761c58329fe4274f5ec7b63afda7dd831850c 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -309,7 +309,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        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 folders and messages under `%s' will be deleted.\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel(_("Delete folder"), message,
                            _("Yes"), _("+No"), NULL);

diff --git a/src/inc.c b/src/inc.c
index a6201b3fb0f0dbc5e387a5c73c9d22c8889ef279..64514b96a434e5aa997e26addaa49a2512f4ae48 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -571,8 +571,10 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                switch (inc_state) {
                case INC_SUCCESS:
                        if (pop3_session->cur_total_num > 0)
-                               msg = g_strdup_printf
-                                       (_("Done (%d message(s) (%s) received)"),
+                               msg = g_strdup_printf(
+                                       ngettext("Done (%d message (%s) received)",
+                                                "Done (%d messages (%s) received)",
+                                        pop3_session->cur_total_num),
                                         pop3_session->cur_total_num,
                                         to_human_readable(pop3_session->cur_total_recv_bytes));
                        else
@@ -678,8 +680,9 @@ static gint inc_start(IncProgressDialog *inc_dialog)
 #undef SET_PIXMAP_AND_TEXT
 
        if (new_msgs > 0)
-               fin_msg = g_strdup_printf(_("Finished (%d new message(s))"),
-                                         new_msgs);
+               fin_msg = g_strdup_printf(ngettext("Finished (%d new message)",
+                                                  "Finished (%d new messages)",
+                                                  new_msgs), new_msgs);
        else
                fin_msg = g_strdup_printf(_("Finished (no new messages)"));
 
@@ -928,7 +931,9 @@ static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
 
        if (pop3_session->cur_total_num > 0) {
                g_snprintf(buf, sizeof(buf),
-                          _("Retrieving (%d message(s) (%s) received)"),
+                          ngettext("Retrieving (%d message (%s) received)",
+                                   "Retrieving (%d messages (%s) received)",
+                                   pop3_session->cur_total_num),
                           pop3_session->cur_total_num,
                           to_human_readable
                           (pop3_session->cur_total_recv_bytes));

diff --git a/src/mainwindow.c b/src/mainwindow.c
index d0c35b062e41e9454286f26c4d3db7ab1f1ae6d2..335a12ce1332d35636d9edfba73195bdc65d434d 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2852,7 +2852,9 @@ static void delete_duplicated_all_cb(MainWindow *mainwin, guint action,
        struct DelDupsData data = {0, 0};
 
        folder_func_to_all_folders(deldup_all, &data);
-       alertpanel_notice(_("Deleted %d duplicate message(s) in %d folders.\n"),
+       alertpanel_notice(ngettext("Deleted %d duplicate message in %d folders.\n",
+                                  "Deleted %d duplicate messages in %d folders.\n",
+                                  data.dups),
                          data.dups, data.folders);
 }
 

diff --git a/src/mh_gtk.c b/src/mh_gtk.c
index 69db7eebd3ba3c3d54772d1526201ba94686e561..7d253641d06bc356e4fa75ab109b2ff13de4032e 100644 (file)
--- a/src/mh_gtk.c
+++ b/src/mh_gtk.c
@@ -164,7 +164,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
        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 folders and messages under `%s' will be deleted.\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel(_("Delete folder"), message,
                            _("Yes"), _("+No"), NULL);

diff --git a/src/toolbar.c b/src/toolbar.c
index bced7f0cc56da8488140c0e372b1877351f3cad6..dceb13e8389efe9d08d151aa0f7ceaa6f24fc774 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -154,7 +154,7 @@ struct {
 } toolbar_text [] = {
        { "A_RECEIVE_ALL",      N_("Receive Mail on all Accounts")         },
        { "A_RECEIVE_CUR",      N_("Receive Mail on current Account")      },
-       { "A_SEND_QUEUED",      N_("Send Queued Message(s)")               },
+       { "A_SEND_QUEUED",      N_("Send Queued Messages")                 },
        { "A_COMPOSE_EMAIL",    N_("Compose Email")                        },
        { "A_COMPOSE_NEWS",     N_("Compose News")                         },
        { "A_REPLY_MESSAGE",    N_("Reply to Message")                     },
@@ -1344,7 +1344,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                        toolbar_data->send_btn = item; 
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->send_btn,
-                                          _("Send Queued Message(s)"), NULL);
+                                          _("Send Queued Messages"), NULL);
                        break;
                case A_COMPOSE_EMAIL:
                        icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);