[Commits] [SCM] claws branch, master, updated. 4.3.1-60-g154290542
wwp at claws-mail.org
wwp at claws-mail.org
Sun Mar 23 17:47:54 UTC 2025
The branch, master has been updated
via 1542905420c61d556c675fd6688ab7b36fec18d6 (commit)
from e5fb3f03ed8d80433f194750aa57d1a73c473d8d (commit)
Summary of changes:
src/compose.c | 2 +-
src/plugins/archive/archiver.c | 6 +++---
src/plugins/bogofilter/bogofilter.c | 6 +++---
src/plugins/bsfilter/bsfilter.c | 10 ++++-----
src/plugins/clamd/clamav_plugin.c | 18 ++++++++--------
src/plugins/dillo/dillo_viewer.c | 2 +-
src/plugins/fancy/fancy_viewer.c | 6 +++---
src/plugins/fetchinfo/fetchinfo_plugin.c | 2 +-
src/plugins/libravatar/libravatar.c | 14 ++++++-------
src/plugins/litehtml_viewer/plugin.c | 6 +++---
src/plugins/newmail/newmail.c | 2 +-
src/plugins/notification/notification_plugin.c | 2 +-
src/plugins/pdf_viewer/poppler_viewer.c | 2 +-
src/plugins/perl/perl_plugin.c | 2 +-
src/plugins/pgpcore/plugin.c | 6 +++---
src/plugins/pgpinline/plugin.c | 6 +++---
src/plugins/pgpmime/plugin.c | 6 +++---
src/plugins/python/python_plugin.c | 29 ++++++++++++--------------
src/plugins/smime/plugin.c | 8 +++----
src/plugins/spam_report/spam_report.c | 2 +-
src/plugins/spamassassin/spamassassin.c | 2 +-
src/plugins/tnef_parse/tnef_parse.c | 2 +-
22 files changed, 69 insertions(+), 72 deletions(-)
- Log -----------------------------------------------------------------
commit 1542905420c61d556c675fd6688ab7b36fec18d6
Author: wwp <subscript at free.fr>
Date: Sun Mar 23 18:46:49 2025 +0100
Review of UI strings (mostly in plugins): add missing punctuation or missing quotes surrounding paths, etc.
diff --git a/src/compose.c b/src/compose.c
index 14a1d7558..a8e3cd41c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7699,7 +7699,7 @@ static void compose_spell_menu_changed(void *data)
parent_item = gtk_ui_manager_get_widget(compose->ui_manager,
"/Menu/Spelling/Options");
- /* setting the submenu removes /Spelling/Options from the factory
+ /* setting the submenu removes '/Spelling/Options' from the factory
* so we need to save it */
if (parent_item == NULL) {
diff --git a/src/plugins/archive/archiver.c b/src/plugins/archive/archiver.c
index 5e7fd2d70..108e072a0 100644
--- a/src/plugins/archive/archiver.c
+++ b/src/plugins/archive/archiver.c
@@ -138,10 +138,10 @@ const gchar* plugin_desc(void) {
"The supported folder types are MH, IMAP, RSSyl and "
"vCalendar.\n"
"\n"
- "To activate the archiving feature go to /Tools/Create Archive\n"
+ "To activate the archiving feature go to '/Tools/Create Archive'.\n"
"\n"
- "Default options can be set in /Configuration/Preferences/Plugins"
- "/Mail Archiver"),
+ "Default options can be set in "
+ "'/Configuration/Preferences/Plugins/Mail Archiver'."),
/* archive formats (untranslated, libarchive-version dependant) */
"\tTAR\n\tPAX\n\tSHAR\n\tCPIO\n",
diff --git a/src/plugins/bogofilter/bogofilter.c b/src/plugins/bogofilter/bogofilter.c
index 5bc7020fc..5088a8a3b 100644
--- a/src/plugins/bogofilter/bogofilter.c
+++ b/src/plugins/bogofilter/bogofilter.c
@@ -588,8 +588,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
msg = g_strdup_printf(_("The Bogofilter plugin couldn't filter "
"a message. The probable cause of the "
"error is that it didn't learn from any mail.\n"
- "Use \"/Marks/Mark as spam\" and \"/Marks/Mark as "
- "ham\" to train Bogofilter with a few hundred "
+ "Use '/Marks/Mark as spam' and '/Marks/Mark as "
+ "ham' to train Bogofilter with a few hundred "
"spam and ham messages."));
else
msg = g_strdup_printf(_("The Bogofilter plugin couldn't filter "
@@ -996,7 +996,7 @@ const gchar *plugin_desc(void)
"When a message is identified as spam it can be deleted or "
"saved in a specially designated folder.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/Bogofilter");
+ "Options can be found in '/Configuration/Preferences/Plugins/Bogofilter'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
index 6781a81e0..2742263c8 100644
--- a/src/plugins/bsfilter/bsfilter.c
+++ b/src/plugins/bsfilter/bsfilter.c
@@ -368,8 +368,8 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
msg = g_strdup_printf(_("The Bsfilter plugin couldn't filter "
"a message. The probable cause of the "
"error is that it didn't learn from any mail.\n"
- "Use \"/Marks/Mark as spam\" and \"/Marks/Mark as "
- "ham\" to train Bsfilter with a few hundred "
+ "Use '/Marks/Mark as spam' and '/Marks/Mark as "
+ "ham' to train Bsfilter with a few hundred "
"spam and ham messages."));
else
msg = g_strdup_printf(_("The Bsfilter plugin couldn't filter "
@@ -621,13 +621,13 @@ const gchar *plugin_desc(void)
"\n"
"Before Bsfilter can recognize spam messages, you have to "
"train it by marking a few hundred spam and ham messages "
- "with the use of \"/Marks/Mark as spam\" and \"/Marks/Mark as "
- "ham\".\n"
+ "with the use of '/Marks/Mark as spam' and '/Marks/Mark as "
+ "ham'.\n"
"\n"
"When a message is identified as spam it can be deleted or "
"saved in a specially designated folder.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/Bsfilter");
+ "Options can be found in '/Configuration/Preferences/Plugins/Bsfilter'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/clamd/clamav_plugin.c b/src/plugins/clamd/clamav_plugin.c
index be8640d78..30ebb2488 100644
--- a/src/plugins/clamd/clamav_plugin.c
+++ b/src/plugins/clamd/clamav_plugin.c
@@ -339,19 +339,19 @@ const gchar *plugin_desc(void)
"When a message attachment is found to contain a virus it can be "
"deleted or saved in a specially designated folder.\n"
"\n"
- "Because this plugin communicates with clamd via a\n"
- "socket then there are some minimum requirements to\n"
- "the permissions for your home folder and the\n"
- ".claws-mail folder provided the clamav-daemon is\n"
- "configured to communicate via a unix socket. All\n"
- "users at least need to be given execute permissions\n"
+ "Because this plugin communicates with clamd via a "
+ "socket then there are some minimum requirements to "
+ "the permissions for your home folder and the "
+ ".claws-mail folder provided the clamav-daemon is "
+ "configured to communicate via a unix socket. All "
+ "users at least need to be given execute permissions "
"on these folders.\n"
"\n"
- "To avoid changing permissions you could configure\n"
- "the clamav-daemon to communicate via a TCP socket\n"
+ "To avoid changing permissions you could configure "
+ "the clamav-daemon to communicate via a TCP socket "
"and choose manual configuration for clamd.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/Clam AntiVirus");
+ "Options can be found in '/Configuration/Preferences/Plugins/Clam AntiVirus'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
index 8a93511d7..663cfbcea 100644
--- a/src/plugins/dillo/dillo_viewer.c
+++ b/src/plugins/dillo/dillo_viewer.c
@@ -263,7 +263,7 @@ const gchar *plugin_desc(void)
return _("This plugin renders HTML mail using the Dillo "
"web browser.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser");
+ "Options can be found in '/Configuration/Preferences/Plugins/Dillo Browser'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index b328024a2..9e59ca140 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -1295,9 +1295,9 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
return g_strdup_printf(_("This plugin renders HTML mail using the WebKit "
- "%d.%d.%d library.\nBy default all remote content is "
- "blocked. Options "
- "can be found in /Configuration/Preferences/Plugins/Fancy"),
+ "%d.%d.%d library.\n\n"
+ "By default all remote content is blocked.\n\n"
+ "Options can be found in '/Configuration/Preferences/Plugins/Fancy'."),
WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION,
WEBKIT_MICRO_VERSION);
}
diff --git a/src/plugins/fetchinfo/fetchinfo_plugin.c b/src/plugins/fetchinfo/fetchinfo_plugin.c
index 39f239442..2b07e0e3f 100644
--- a/src/plugins/fetchinfo/fetchinfo_plugin.c
+++ b/src/plugins/fetchinfo/fetchinfo_plugin.c
@@ -204,7 +204,7 @@ const gchar *plugin_desc(void)
"information: UIDL, Claws Mail account name, "
"POP server, user ID and retrieval time.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/Fetchinfo");
+ "Options can be found in '/Configuration/Preferences/Plugins/Fetchinfo'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/libravatar/libravatar.c b/src/plugins/libravatar/libravatar.c
index 54d933979..16ce95493 100644
--- a/src/plugins/libravatar/libravatar.c
+++ b/src/plugins/libravatar/libravatar.c
@@ -406,14 +406,14 @@ const gchar *plugin_name(void)
*/
const gchar *plugin_desc(void)
{
- return _("Display libravatar profiles' images for mail messages. More\n"
- "info about libravatar at http://www.libravatar.org/. If you have\n"
- "a gravatar.com profile but not a libravatar one, those will also\n"
- "be retrieved (when redirections are allowed in plugin config).\n"
+ return _("Display libravatar profiles' images for mail messages. More "
+ "info about libravatar at http://www.libravatar.org/. If you have "
+ "a gravatar.com profile but not a libravatar one, those will also "
+ "be retrieved (when redirections are allowed in plugin config).\n\n"
"Plugin config page is available from main window at:\n"
- "/Configuration/Preferences/Plugins/Libravatar.\n\n"
- "This plugin uses libcurl to retrieve images, so if you're behind a\n"
- "proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
+ "'/Configuration/Preferences/Plugins/Libravatar'.\n\n"
+ "This plugin uses libcurl to retrieve images, so if you're behind a "
+ "proxy please refer to curl(1) manpage for details on 'http_proxy' "
"configuration. More details about this and others on README file.\n\n"
"Feedback to <ricardo at mones.org> is welcome.\n");
}
diff --git a/src/plugins/litehtml_viewer/plugin.c b/src/plugins/litehtml_viewer/plugin.c
index f8d99aa3e..a15824a39 100644
--- a/src/plugins/litehtml_viewer/plugin.c
+++ b/src/plugins/litehtml_viewer/plugin.c
@@ -58,9 +58,9 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
return _("This plugin renders HTML mail using the litehtml library "
- "(http://www.litehtml.com/).\nBy default all remote content is "
- "blocked. Options can be found in "
- "/Configuration/Preferences/Plugins/LiteHTML");
+ "(http://www.litehtml.com/).\n\n"
+ "By default all remote content is blocked.\n\n"
+ "Options can be found in '/Configuration/Preferences/Plugins/LiteHTML'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/newmail/newmail.c b/src/plugins/newmail/newmail.c
index d50a42a98..862c2bff3 100644
--- a/src/plugins/newmail/newmail.c
+++ b/src/plugins/newmail/newmail.c
@@ -141,7 +141,7 @@ gint plugin_init (gchar **error)
pluginDesc = g_strdup_printf(
_("This plugin writes a header summary to a log file for each "
"mail received after sorting.\n\n"
- "Default is ~/Mail/NewLog\n\nCurrent log is %s"), LogName);
+ "Default is '~/Mail/NewLog'.\n\nCurrent log is '%s'."), LogName);
return (0);
} /* plugin_init */
diff --git a/src/plugins/notification/notification_plugin.c b/src/plugins/notification/notification_plugin.c
index 9b883cce9..82cb2fa46 100644
--- a/src/plugins/notification/notification_plugin.c
+++ b/src/plugins/notification/notification_plugin.c
@@ -428,7 +428,7 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
return _("This plugin provides various ways "
- "to notify the user of new and unread email.\n"
+ "to notify the user of new and unread email.\n\n"
"The plugin is extensively configurable in the "
"plugins section of the preferences dialog.\n\n"
"Feedback to <berndth at gmx.de> is welcome.");
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index 5acd6e2bd..e58520784 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -2127,7 +2127,7 @@ gint plugin_init(gchar **error)
msg = g_strdup_printf(_("This plugin enables the viewing of PDF and PostScript "
"attachments using the Poppler %s Lib and the gs tool.\n\n"
- "Any feedback is welcome: iwkse at claws-mail.org"
+ "Feedback to <iwkse at claws-mail.org> is welcome."
), poppler_get_version());
if (!check_plugin_version(MAKE_NUMERIC_VERSION(3,8,1,46),
diff --git a/src/plugins/perl/perl_plugin.c b/src/plugins/perl/perl_plugin.c
index 8688aa42d..7739b18a9 100644
--- a/src/plugins/perl/perl_plugin.c
+++ b/src/plugins/perl/perl_plugin.c
@@ -2522,7 +2522,7 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
- return _("This plugin provides a Perl scripting interface for mail filters.\n"
+ return _("This plugin provides a Perl scripting interface for mail filters.\n\n"
"Feedback to <berndth at gmx.de> is welcome.\n");
}
diff --git a/src/plugins/pgpcore/plugin.c b/src/plugins/pgpcore/plugin.c
index 1dc1963a3..38d1890aa 100644
--- a/src/plugins/pgpcore/plugin.c
+++ b/src/plugins/pgpcore/plugin.c
@@ -72,12 +72,12 @@ const gchar *plugin_desc(void)
"autocompletion from the GPG keyring. It is used by other "
"plugins, like PGP/Mime.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/GPG "
- "and /Configuration/[Account Preferences]/Plugins/GPG\n"
+ "Options can be found in '/Configuration/Preferences/Plugins/GPG' "
+ "and '/Configuration/[Account Preferences]/Plugins/GPG'.\n"
"\n"
"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
"\n"
- "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>");
+ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/pgpinline/plugin.c b/src/plugins/pgpinline/plugin.c
index ff4ed3f1e..c6dfe2d00 100644
--- a/src/plugins/pgpinline/plugin.c
+++ b/src/plugins/pgpinline/plugin.c
@@ -62,12 +62,12 @@ const gchar *plugin_desc(void)
"verify signatures or sign and encrypt your own mails.\n"
"\n"
"It can be selected as the Default Privacy System in "
- "/Configuration/[Account Preferences]/Privacy and when "
- "composing a message from /Options/Privacy System\n"
+ "'/Configuration/[Account Preferences]/Privacy' and when "
+ "composing a message from '/Options/Privacy System'.\n"
"\n"
"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
"\n"
- "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>");
+ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index b09f75e41..9e401ef5c 100644
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -62,12 +62,12 @@ const gchar *plugin_desc(void)
"sign and encrypt your own mails.\n"
"\n"
"It can be selected as the Default Privacy System in "
- "/Configuration/[Account Preferences]/Privacy and when "
- "composing a message from /Options/Privacy System\n"
+ "'/Configuration/[Account Preferences]/Privacy' and when "
+ "composing a message from '/Options/Privacy System'.\n"
"\n"
"The plugin uses the GPGME library as a wrapper for GnuPG.\n"
"\n"
- "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>");
+ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/python/python_plugin.c b/src/plugins/python/python_plugin.c
index 895e2ceaa..94aeee1cc 100644
--- a/src/plugins/python/python_plugin.c
+++ b/src/plugins/python/python_plugin.c
@@ -724,7 +724,7 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
- return _("This plugin provides Python integration features.\n"
+ return _("This plugin provides Python integration features.\n\n"
"Python code can be entered interactively into an embedded Python console, "
"under Tools -> Show Python console, or stored in scripts.\n\n"
"These scripts are then available via the menu. You can assign "
@@ -732,29 +732,26 @@ const gchar *plugin_desc(void)
"You can also put buttons for script invocation into the toolbars "
"using Claws Mail's builtin toolbar editor.\n\n"
"You can provide scripts working on the main window by placing files "
- "into ~/.claws-mail/python-scripts/main.\n\n"
+ "into '~/.claws-mail/python-scripts/main'.\n\n"
"You can also provide scripts working on an open compose window "
- "by placing files into ~/.claws-mail/python-scripts/compose.\n\n"
- "The folder ~/.claws-mail/python-scripts/auto/ may contain some "
+ "by placing files into '~/.claws-mail/python-scripts/compose'.\n\n"
+ "The folder '~/.claws-mail/python-scripts/auto/' may contain some "
"scripts that are automatically executed when certain events "
"occur. Currently, the following files in this directory "
"are recognised:\n\n"
- "compose_any\n"
- "Gets executed whenever a compose window is opened, no matter "
+ " 'compose_any' - gets executed whenever a compose window is opened, no matter "
"if that opening happened as a result of composing a new message, "
"replying or forwarding a message.\n\n"
- "startup\n"
- "Executed at plugin load\n\n"
- "shutdown\n"
- "Executed at plugin unload\n\n"
- "\nFor the most up-to-date API documentation, type\n"
- "\n help(clawsmail)\n"
- "\nin the interactive Python console.\n"
- "\nThe source distribution of this plugin comes with various example scripts "
+ " 'startup' - executed at plugin load.\n\n"
+ " 'shutdown' - executed at plugin unload.\n\n"
+ "For the most up-to-date API documentation, type:\n\n"
+ " help(clawsmail)\n\n"
+ "in the interactive Python console.\n\n"
+ "The source distribution of this plugin comes with various example scripts "
"in the \"examples\" subdirectory. If you wrote a script that you would be "
"interested in sharing, feel free to send it to me to have it considered "
- "for inclusion in the examples.\n"
- "\nFeedback to <berndth at gmx.de> is welcome.");
+ "for inclusion in the examples.\n\n"
+ "Feedback to <berndth at gmx.de> is welcome.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/smime/plugin.c b/src/plugins/smime/plugin.c
index a026f0317..011c23595 100644
--- a/src/plugins/smime/plugin.c
+++ b/src/plugins/smime/plugin.c
@@ -60,11 +60,11 @@ const gchar *plugin_desc(void)
{
return _("This plugin handles S/MIME signed and/or encrypted "
"mails. You can decrypt mails, verify signatures or "
- "sign and encrypt your own mails.\n"
+ "sign and encrypt your own mails.\n"
"\n"
"It can be selected as the Default Privacy System in "
- "/Configuration/[Account Preferences]/Privacy and when "
- "composing a message from /Options/Privacy System\n"
+ "'/Configuration/[Account Preferences]/Privacy' and when "
+ "composing a message from '/Options/Privacy System'.\n"
"\n"
"This plugin uses the GPGME library as a wrapper for GnuPG.\n"
"This plugin also needs gpgsm, gnupg-agent and dirmngr "
@@ -74,7 +74,7 @@ const gchar *plugin_desc(void)
"with GPGSM can be found at:\n"
"http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
"\n"
- "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>");
+ "GPGME is copyright 2001 by Werner Koch <dd9jn at gnu.org>.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/spam_report/spam_report.c b/src/plugins/spam_report/spam_report.c
index 50157818e..a83d40420 100644
--- a/src/plugins/spam_report/spam_report.c
+++ b/src/plugins/spam_report/spam_report.c
@@ -398,7 +398,7 @@ const gchar *plugin_name(void)
const gchar *plugin_desc(void)
{
- return _("This plugin reports spam to various places.\n"
+ return _("This plugin reports spam to various places.\n\n"
"Currently the following sites or methods are supported:\n\n"
" * spam-signal.fr\n"
" * spamcop.net\n"
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 1162c0150..79c73e545 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -627,7 +627,7 @@ const gchar *plugin_desc(void)
"When a message is identified as spam it can be deleted or "
"saved in a specially designated folder.\n"
"\n"
- "Options can be found in /Configuration/Preferences/Plugins/SpamAssassin");
+ "Options can be found in '/Configuration/Preferences/Plugins/SpamAssassin'.");
}
const gchar *plugin_type(void)
diff --git a/src/plugins/tnef_parse/tnef_parse.c b/src/plugins/tnef_parse/tnef_parse.c
index bc893ea7b..fe9efba4b 100644
--- a/src/plugins/tnef_parse/tnef_parse.c
+++ b/src/plugins/tnef_parse/tnef_parse.c
@@ -446,7 +446,7 @@ const gchar *plugin_desc(void)
{
return _("This Claws Mail plugin allows you to read application/ms-tnef attachments.\n\n"
"The plugin uses the Ytnef library, which is copyright 2002-2007 by "
- "Randall Hand <yerase at yerot.com>");
+ "Randall Hand <yerase at yerot.com>.");
}
const gchar *plugin_type(void)
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list