From: Tristan Chabredier Date: Mon, 11 Sep 2006 17:19:45 +0000 (+0000) Subject: 2006-09-11 [wwp] 2.4.0cvs175 X-Git-Tag: rel_2_5_0~41 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9cdb03f9c1da0211a150f82afe39a461b8bf4cf1 2006-09-11 [wwp] 2.4.0cvs175 * src/plugins//bogofilter/bogofilter.c * src/plugins//clamav/clamav_plugin.c * src/plugins//demo/demo.c * src/plugins//dillo_viewer/dillo_viewer.c * src/plugins//pgpcore/plugin.c * src/plugins//pgpinline/plugin.c * src/plugins//pgpmime/plugin.c * src/plugins//spamassassin/spamassassin.c gettext-ize more strings (mostly plugin error messages). --- diff --git a/ChangeLog b/ChangeLog index 973cabbad..d156a00b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-09-11 [wwp] 2.4.0cvs175 + + * src/plugins//bogofilter/bogofilter.c + * src/plugins//clamav/clamav_plugin.c + * src/plugins//demo/demo.c + * src/plugins//dillo_viewer/dillo_viewer.c + * src/plugins//pgpcore/plugin.c + * src/plugins//pgpinline/plugin.c + * src/plugins//pgpmime/plugin.c + * src/plugins//spamassassin/spamassassin.c + gettext-ize more strings (mostly plugin error messages). + 2006-09-11 [colin] 2.4.0cvs174 * src/alertpanel.c diff --git a/PATCHSETS b/PATCHSETS index de894f894..2a0f955c0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1866,3 +1866,4 @@ ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/account.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/addrbook.xml; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/handling.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/handling.xml; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/fr/account.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/fr/addrbook.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/handling.xml; ) > 2.4.0cvs172.patchset ( cvs diff -u -r 1.1.4.49 -r 1.1.4.50 src/etpan/imap-thread.c; ) > 2.4.0cvs173.patchset ( cvs diff -u -r 1.17.2.27 -r 1.17.2.28 src/alertpanel.c; ) > 2.4.0cvs174.patchset +( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins//bogofilter/bogofilter.c; cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/plugins//clamav/clamav_plugin.c; cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins//demo/demo.c; cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/plugins//dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins//pgpcore/plugin.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins//pgpinline/plugin.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins//pgpmime/plugin.c; cvs diff -u -r 1.18.2.40 -r 1.18.2.41 src/plugins//spamassassin/spamassassin.c; ) > 2.4.0cvs175.patchset diff --git a/configure.ac b/configure.ac index d0d59a8c7..58b336c53 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=174 +EXTRA_VERSION=175 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c index 8f8897013..f1e99c129 100644 --- a/src/plugins/bogofilter/bogofilter.c +++ b/src/plugins/bogofilter/bogofilter.c @@ -485,12 +485,12 @@ gint plugin_init(gchar **error) hook_id = -1; if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Bogofilter plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the Bogofilter plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the Bogofilter plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the Bogofilter plugin")); return -1; } diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c index 9f4b2d339..d45c7fc8c 100644 --- a/src/plugins/clamav/clamav_plugin.c +++ b/src/plugins/clamav/clamav_plugin.c @@ -194,18 +194,18 @@ gint plugin_init(gchar **error) unsigned int no; if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the ClamAV plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the ClamAV plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the ClamAV plugin")); return -1; } hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL); if (hook_id == -1) { - *error = g_strdup("Failed to register mail filtering hook"); + *error = g_strdup(_("Failed to register mail filtering hook")); return -1; } diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c index a223df828..681fbb55c 100644 --- a/src/plugins/demo/demo.c +++ b/src/plugins/demo/demo.c @@ -42,18 +42,18 @@ static guint hook_id; gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your sylpheed-claws version is newer than the version the plugin was built with"); + *error = g_strdup(_("Your sylpheed-claws version is newer than the version the plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 8, 11, 39))) { - *error = g_strdup("Your sylpheed-claws version is too old"); + *error = g_strdup(_("Your sylpheed-claws version is too old")); return -1; } hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, my_log_hook, NULL); if (hook_id == -1) { - *error = g_strdup("Failed to register log text hook"); + *error = g_strdup(_("Failed to register log text hook")); return -1; } diff --git a/src/plugins/dillo_viewer/dillo_viewer.c b/src/plugins/dillo_viewer/dillo_viewer.c index 7dae01386..8f7fbbafc 100644 --- a/src/plugins/dillo_viewer/dillo_viewer.c +++ b/src/plugins/dillo_viewer/dillo_viewer.c @@ -166,12 +166,12 @@ static MimeViewerFactory dillo_viewer_factory = gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Dillo plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the Dillo plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the Dillo plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the Dillo plugin")); return -1; } diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c index ade59756d..8d2bcc4a6 100644 --- a/src/plugins/pgpcore/plugin.c +++ b/src/plugins/pgpcore/plugin.c @@ -34,12 +34,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the PGP/Core plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/Core plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the PGP/Core plugin")); return -1; } diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c index f59eb28c9..437965444 100644 --- a/src/plugins/pgpinline/plugin.c +++ b/src/plugins/pgpinline/plugin.c @@ -33,12 +33,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/inline plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the PGP/inline plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/inline plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the PGP/inline plugin")); return -1; } diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c index 2e7640c24..a9a636393 100644 --- a/src/plugins/pgpmime/plugin.c +++ b/src/plugins/pgpmime/plugin.c @@ -32,12 +32,12 @@ gint plugin_init(gchar **error) { if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the PGP/MIME plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(2, 1, 0, 1))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the PGP/MIME plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the PGP/MIME plugin")); return -1; } diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index 78474d716..94da2be50 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.c @@ -465,12 +465,12 @@ gint plugin_init(gchar **error) hook_id = -1; if ((sylpheed_get_version() > VERSION_NUMERIC)) { - *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the SpamAssassin plugin was built with"); + *error = g_strdup(_("Your version of Sylpheed-Claws is newer than the version the SpamAssassin plugin was built with")); return -1; } if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) { - *error = g_strdup("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin"); + *error = g_strdup(_("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin")); return -1; } @@ -479,7 +479,7 @@ gint plugin_init(gchar **error) prefs_read_config(param, "SpamAssassin", rcpath, NULL); g_free(rcpath); if (!spamassassin_check_username()) { - *error = g_strdup("Failed to get username"); + *error = g_strdup(_("Failed to get username")); return -1; } spamassassin_gtk_init();