2005-05-06 [paul] 1.0.4cvs10

	backported from GTK2...

	* 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.claws b/ChangeLog.claws
index 83092c4af003f8d7ed8ad7962c2fcea676103bd7..2a4bf7f9618ce2e4046ddb567e4dbf808e34b15c 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2005-05-06 [paul]      1.0.4cvs10
+
+       backported from GTK2...
+
+       * 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.0.4cvs9
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index e1937dff19113ec0f2fd4d60011e7df83bc016ad..28794d73e0a205253517796792bc411b405db1de 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -277,3 +277,4 @@
 ( cvs diff -u -r 1.483 -r 1.484 src/compose.c; cvs diff -u -r 1.259 -r 1.260 src/folderview.c; cvs diff -u -r 1.318 -r 1.319 src/mainwindow.c; cvs diff -u -r 1.136 -r 1.137 src/messageview.c; cvs diff -u -r 1.3 -r 1.4 src/partial_download.c; cvs diff -u -r 1.74 -r 1.75 src/pop.c; cvs diff -u -r 1.125 -r 1.126 src/prefs_account.c; cvs diff -u -r 1.233 -r 1.234 src/prefs_common.c; cvs diff -u -r 1.118 -r 1.119 src/prefs_common.h; cvs diff -u -r 1.66 -r 1.67 src/prefs_filtering.c; cvs diff -u -r 1.106 -r 1.107 src/procmime.c; cvs diff -u -r 1.18 -r 1.19 src/plugins/pgpmime/pgpmime.c; ) > 1.0.4cvs7.patchset
 ( cvs diff -u -r 1.131 -r 1.132 AUTHORS; cvs diff -u -r 1.484 -r 1.485 src/compose.c; ) > 1.0.4cvs8.patchset
 ( cvs diff -u -r 1.263 -r 1.264 src/folder.c; ) > 1.0.4cvs9.patchset
+( cvs diff -u -r 1.4 -r 1.5 src/imap_gtk.c; cvs diff -u -r 1.180 -r 1.181 src/inc.c; cvs diff -u -r 1.319 -r 1.320 src/mainwindow.c; cvs diff -u -r 1.5 -r 1.6 src/mh_gtk.c; cvs diff -u -r 1.57 -r 1.58 src/toolbar.c; ) > 1.0.4cvs10.patchset

diff --git a/configure.ac b/configure.ac
index 70cd5e92385941eb39787de9f20d0f1314d608ad..bf80ed455b1885aedc80ae4a6b010a7481566e8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index cc46b57c93161a7166207d7a5c6be85e6347848e..96d16be6948979cb0c3d9f2d9ee6d59766f1c9b5 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -307,7 +307,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 797ec9cb8f4dc8ae639a053967238493504321cb..7aa7286986ae204df7cb5bc77a041cf1767247fe 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -573,8 +573,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
@@ -683,8 +685,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)"));
 
@@ -935,7 +938,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 91750cb3e21e025913b0cef243a7ab208a497113..7091c91ea121b2474fcb450fd4deeb5b43728a36 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2787,7 +2787,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 6bc759652d25c49493f8ab7f1e9e88b7dbdabf38..32baa7dc6b8d83e6bc75b4431bf5890bf9501e9b 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 2b54778bd9daf6d9d02e0bca67783d25c1ccc95c..35859270b1add6fea72ff9a39b0cb70f57b6a9fb 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);