From 0af9d59862a00c6d19f4ba6eb88bba43107ba7bc Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Sun, 18 Nov 2012 15:41:02 +0000 Subject: [PATCH] 2012-11-18 [ticho] 3.9.0cvs13 * src/mbox.c Improve i18n plural handling in a string used while importing from mbox. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mbox.c | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b113e1ca..6edf03b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-11-18 [ticho] 3.9.0cvs13 + + * src/mbox.c + Improve i18n plural handling in a string used while + importing from mbox. + 2012-11-16 [ticho] 3.9.0cvs12 * po/bg.po diff --git a/PATCHSETS b/PATCHSETS index 4bd034adf..44ba7e44f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4510,3 +4510,4 @@ ( cvs diff -u -r 1.26.2.49 -r 1.26.2.50 src/foldersel.c; cvs diff -u -r 1.60.2.83 -r 1.60.2.84 src/prefs_actions.c; cvs diff -u -r 1.1.4.80 -r 1.1.4.81 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.97 -r 1.43.2.98 src/prefs_matcher.c; cvs diff -u -r 1.8.2.47 -r 1.8.2.48 src/quote_fmt.c; cvs diff -u -r 1.5.2.36 -r 1.5.2.37 src/gtk/description_window.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/description_window.h; cvs diff -u -r 1.2.2.49 -r 1.2.2.50 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/manage_window.c; cvs diff -u -r 1.1.2.120 -r 1.1.2.121 src/gtk/quicksearch.c; ) > 3.9.0cvs10.patchset ( cvs diff -u -r 1.61.2.106 -r 1.61.2.107 src/account.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/addrcustomattr.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/edittags.c; cvs diff -u -r 1.59.2.93 -r 1.59.2.94 src/prefs_filtering.c; cvs diff -u -r 1.43.2.98 -r 1.43.2.99 src/prefs_matcher.c; cvs diff -u -r 1.1.2.49 -r 1.1.2.50 src/prefs_msg_colors.c; cvs diff -u -r 1.43.2.131 -r 1.43.2.132 src/toolbar.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/uri_opener.c; cvs diff -u -r 1.1.2.88 -r 1.1.2.89 src/wizard.c; cvs diff -u -r 1.36.2.208 -r 1.36.2.209 src/common/utils.c; cvs diff -u -r 1.4.2.86 -r 1.4.2.87 src/gtk/about.c; ) > 3.9.0cvs11.patchset ( cvs diff -u -r 1.21.2.9 -r 1.21.2.10 po/bg.po; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 po/ca.po; cvs diff -u -r 1.9.2.26 -r 1.9.2.27 po/cs.po; cvs diff -u -r 1.58.2.52 -r 1.58.2.53 po/de.po; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 po/en_GB.po; cvs diff -u -r 1.60.2.66 -r 1.60.2.67 po/es.po; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 po/fi.po; cvs diff -u -r 1.42.2.59 -r 1.42.2.60 po/fr.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/he.po; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 po/hu.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/id_ID.po; cvs diff -u -r 1.34.2.30 -r 1.34.2.31 po/it.po; cvs diff -u -r 1.16.2.12 -r 1.16.2.13 po/ja.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/lt.po; cvs diff -u -r 1.28.2.15 -r 1.28.2.16 po/nl.po; cvs diff -u -r 1.10.2.18 -r 1.10.2.19 po/pl.po; cvs diff -u -r 1.50.2.45 -r 1.50.2.46 po/pt_BR.po; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/pt_PT.po; cvs diff -u -r 1.17.2.22 -r 1.17.2.23 po/ru.po; cvs diff -u -r 1.2.2.37 -r 1.2.2.38 po/sk.po; cvs diff -u -r 1.17.2.28 -r 1.17.2.29 po/sr.po; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 po/sv.po; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/uk.po; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 po/zh_CN.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/zh_TW.po; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 po/Makevars; ) > 3.9.0cvs12.patchset +( cvs diff -u -r 1.28.2.55 -r 1.28.2.56 src/mbox.c; ) > 3.9.0cvs13.patchset diff --git a/configure.ac b/configure.ac index c38e19614..3155bbaa9 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=12 +EXTRA_VERSION=13 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mbox.c b/src/mbox.c index 3d63009d9..7dcbbfa0b 100644 --- a/src/mbox.c +++ b/src/mbox.c @@ -140,7 +140,9 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter, if (msgs > 0 && msgs%500 == 0) { if (printed) statusbar_pop_all(); - statusbar_print_all(_("Importing from mbox... (%d mails imported)"), msgs); + statusbar_print_all( + ngettext("Importing from mbox... (%d mail imported)", + "Importing from mbox ... (%d mails imported)", msgs), msgs); printed=TRUE; GTK_EVENTS_FLUSH(); } -- 2.25.1