[Commits] [SCM] claws branch, master, updated. 4.3.1-68-gf58568640
wwp at claws-mail.org
wwp at claws-mail.org
Mon Mar 24 14:46:45 UTC 2025
The branch, master has been updated
via f58568640b4fa6b4a12f9b369f218984c92cb29a (commit)
from 5fbf1909adfb1485aad93ed1d19258d33cb28c57 (commit)
Summary of changes:
src/main.c | 2 +-
src/plugins/acpi_notifier/acpi_notifier.c | 2 +-
src/plugins/attachwarner/attachwarner_prefs.c | 2 +-
src/plugins/bogofilter/bogofilter_gtk.c | 8 ++++----
src/plugins/bsfilter/bsfilter_gtk.c | 4 ++--
src/plugins/keyword_warner/keyword_warner_prefs.c | 2 +-
src/plugins/libravatar/libravatar_prefs.c | 4 ++--
src/plugins/pgpcore/prefs_gpg.c | 2 +-
src/plugins/spamassassin/spamassassin_gtk.c | 4 ++--
src/prefs_account.c | 6 +++---
src/prefs_logging.c | 2 +-
src/prefs_summaries.c | 2 +-
src/textview.c | 8 ++++----
13 files changed, 24 insertions(+), 24 deletions(-)
- Log -----------------------------------------------------------------
commit f58568640b4fa6b4a12f9b369f218984c92cb29a
Author: wwp <subscript at free.fr>
Date: Mon Mar 24 15:46:04 2025 +0100
Review of UI strings: no ending dot in tooltips, add missing surrounding quotes to UI paths descriptors, and more edits.
diff --git a/src/main.c b/src/main.c
index 801cdf4e5..d6fa814fa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1999,7 +1999,7 @@ static void parse_cmd_opt(int argc, char *argv[])
g_print("%s\n", _(" --statistics show session statistics"));
g_print("%s\n", _(" --reset-statistics reset session statistics"));
g_print("%s\n", _(" --select folder[/msg] jump to the specified folder/message\n"
- " folder is a folder id like 'folder/sub_folder', a file:// uri or an absolute path"));
+ " folder is a folder id like 'folder/sub-folder', a file:// uri or an absolute path"));
g_print("%s\n", _(" --import-mbox file import the specified mbox file\n"));
g_print("%s\n", _(" --online switch to online mode"));
g_print("%s\n", _(" --offline switch to offline mode"));
diff --git a/src/plugins/acpi_notifier/acpi_notifier.c b/src/plugins/acpi_notifier/acpi_notifier.c
index 9125af905..2415c0925 100644
--- a/src/plugins/acpi_notifier/acpi_notifier.c
+++ b/src/plugins/acpi_notifier/acpi_notifier.c
@@ -74,7 +74,7 @@ char *acpi_help[] = {
N_("Make sure that the kernel module 'asus_laptop' is loaded."),
N_("Make sure that the kernel module 'asus_acpi' is loaded."),
N_("Make sure that the kernel module 'ibm_acpi' is loaded."),
- N_("Make sure that you have apanelc installed.\n"
+ N_("Make sure that you have 'apanelc' installed.\n"
"You can get it from http://apanel.sourceforge.net/"),
NULL
};
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
index 48c35be32..7b045af83 100644
--- a/src/plugins/attachwarner/attachwarner_prefs.c
+++ b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -124,7 +124,7 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
CLAWS_SET_TIP(skip_quotes_checkbox,
_("Exclude quoted lines from checking for the regular "
"expressions above. Note that handmade quotes cannot "
- "be distinguished from quotes generated by replying."));
+ "be distinguished from quotes generated by replying"));
page->skip_quotes_checkbox = skip_quotes_checkbox;
skip_fwd_redir_checkbox = gtk_check_button_new_with_label(_("Forwarded or redirected messages"));
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index d6792f9bc..2d2a13a0f 100644
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -208,7 +208,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
gtk_widget_show (save_spam_folder_entry);
gtk_box_pack_start (GTK_BOX (hbox), save_spam_folder_entry, TRUE, TRUE, 0);
CLAWS_SET_TIP(save_spam_folder_entry,
- _("Folder for storing identified spam. Leave empty to use the trash folder."));
+ _("Folder for storing identified spam. Leave empty to use the trash folder"));
save_spam_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_spam_folder_select);
@@ -231,13 +231,13 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
gtk_widget_show (save_unsure_folder_entry);
gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_entry, TRUE, TRUE, 0);
CLAWS_SET_TIP(save_unsure_folder_entry,
- _("Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."));
+ _("Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder"));
save_unsure_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_unsure_folder_select);
gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_select, FALSE, FALSE, 0);
CLAWS_SET_TIP(save_unsure_folder_select,
- _("Click this button to select a folder for storing Unsure mails."));
+ _("Click this button to select a folder for storing Unsure mails"));
insert_header_checkbtn = gtk_check_button_new_with_label(_("Insert X-Bogosity header"));
gtk_widget_show(insert_header_checkbtn);
@@ -268,7 +268,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
learn_from_whitelist_chkbtn = gtk_check_button_new_with_label(_("Learn whitelisted emails as ham"));
CLAWS_SET_TIP(learn_from_whitelist_chkbtn,
_("If Bogofilter thought an email was spam or unsure, but it was whitelisted, "
- "learn it as ham."));
+ "learn it as ham"));
gtk_widget_show(learn_from_whitelist_chkbtn);
gtk_box_pack_start (GTK_BOX (vbox2), learn_from_whitelist_chkbtn, TRUE, TRUE, 0);
diff --git a/src/plugins/bsfilter/bsfilter_gtk.c b/src/plugins/bsfilter/bsfilter_gtk.c
index 15283bf2b..8738f401a 100644
--- a/src/plugins/bsfilter/bsfilter_gtk.c
+++ b/src/plugins/bsfilter/bsfilter_gtk.c
@@ -175,7 +175,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
gtk_widget_show (save_spam_folder_entry);
gtk_box_pack_start (GTK_BOX (hbox_save_spam), save_spam_folder_entry, TRUE, TRUE, 0);
CLAWS_SET_TIP(save_spam_folder_entry,
- _("Folder for storing identified spam. Leave empty to use the trash folder."));
+ _("Folder for storing identified spam. Leave empty to use the trash folder"));
save_spam_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_spam_folder_select);
@@ -206,7 +206,7 @@ static void bsfilter_create_widget_func(PrefsPage * _page,
learn_from_whitelist_chkbtn = gtk_check_button_new_with_label(_("Learn whitelisted emails as ham"));
CLAWS_SET_TIP(learn_from_whitelist_chkbtn,
_("If Bsfilter thought an email was spam or unsure, but it was whitelisted, "
- "learn it as ham."));
+ "learn it as ham"));
gtk_widget_show(learn_from_whitelist_chkbtn);
gtk_box_pack_start (GTK_BOX (vbox2), learn_from_whitelist_chkbtn, TRUE, TRUE, 0);
diff --git a/src/plugins/keyword_warner/keyword_warner_prefs.c b/src/plugins/keyword_warner/keyword_warner_prefs.c
index 012a5159a..bf8360c5f 100644
--- a/src/plugins/keyword_warner/keyword_warner_prefs.c
+++ b/src/plugins/keyword_warner/keyword_warner_prefs.c
@@ -124,7 +124,7 @@ static void keyword_warner_prefs_create_widget_func(PrefsPage * _page,
CLAWS_SET_TIP(skip_quotes_checkbox,
_("Exclude quoted lines from checking for the regular "
"expressions above. Note that handmade quotes cannot "
- "be distinguished from quotes generated by replying."));
+ "be distinguished from quotes generated by replying"));
page->skip_quotes_checkbox = skip_quotes_checkbox;
skip_fwd_redir_checkbox = gtk_check_button_new_with_label(_("Forwarded or redirected messages"));
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index b4dbac9ad..5501aa6c7 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -352,7 +352,7 @@ static GtkWidget *p_create_frame_missing(struct LibravatarPrefsPage *page)
CLAWS_SET_TIP(entry, _("Enter the URL you want to be "
"redirected when no user icon is available. "
"Leave an empty URL to use the default "
- "libravatar orange icon."));
+ "libravatar orange icon"));
gtk_entry_set_text(GTK_ENTRY(entry),
libravatarprefs.default_mode_url);
gtk_entry_set_max_length(GTK_ENTRY(entry), MAX_URL_LENGTH);
@@ -430,7 +430,7 @@ static GtkWidget *p_create_frame_network(struct LibravatarPrefsPage *page)
hbox = labeled_spinner_box(_("Request timeout"), spinner, _("second(s)"),
_("Set to 0 to use global socket I/O timeout. "
"Maximum value must be also less than global socket "
- "I/O timeout."));
+ "I/O timeout"));
page->timeout = spinner;
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 2dbd5d505..fa5eea019 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -204,7 +204,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
gpg_path = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox2), gpg_path, TRUE, TRUE, 0);
CLAWS_SET_TIP(gpg_path,
- _("If left blank the location of the GnuPG executable will be automatically determined."));
+ _("If left blank the location of the GnuPG executable will be automatically determined"));
gpg_path_btn = gtkut_get_browse_file_btn(_("Bro_wse"));
gtk_box_pack_start(GTK_BOX(hbox2), gpg_path_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(gpg_path_btn), "clicked",
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index f6ca87f4d..7261ebd8b 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -396,7 +396,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_spinbtn, FALSE, FALSE, 0);
CLAWS_SET_TIP(timeout_spinbtn,
_("Maximum time allowed for checking. If the check takes longer "
- "it will be aborted."));
+ "it will be aborted"));
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(timeout_spinbtn), TRUE);
timeout_seconds_label = gtk_label_new(_("seconds"));
@@ -424,7 +424,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_widget_show (save_spam_folder_entry);
gtk_box_pack_start (GTK_BOX (hbox_save_spam), save_spam_folder_entry, TRUE, TRUE, 0);
CLAWS_SET_TIP(save_spam_folder_entry,
- _("Folder for storing identified spam. Leave empty to use the trash folder."));
+ _("Folder for storing identified spam. Leave empty to use the trash folder"));
save_spam_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
gtk_widget_show (save_spam_folder_select);
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 39cbb1874..adf98fc2b 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1711,7 +1711,7 @@ static void receive_create_widget_func(PrefsPage * _page,
CLAWS_SET_TIP(size_limit_checkbtn,
_("Messages over this limit will be partially retrieved. "
"When selecting them you will be able to download them fully "
- "or delete them."));
+ "or delete them"));
size_limit_spinbtn = gtk_spin_button_new_with_range(0, 100000, 1);
gtk_widget_show (size_limit_spinbtn);
@@ -3305,7 +3305,7 @@ static void proxy_create_widget_func(PrefsPage * _page,
PACK_CHECK_BUTTON(vbox2, proxy_send_checkbtn,
_("Use proxy server for sending"));
CLAWS_SET_TIP(proxy_send_checkbtn,
- _("If disabled, messages will be sent using direct connection to configured outgoing server, bypassing any configured proxy server."));
+ _("If disabled, messages will be sent using direct connection to configured outgoing server, bypassing any configured proxy server"));
SET_TOGGLE_SENSITIVITY(proxy_auth_checkbtn, table);
SET_TOGGLE_SENSITIVITY(socks5_radiobtn, vbox4);
@@ -3447,7 +3447,7 @@ static void advanced_create_widget_func(PrefsPage * _page,
gtk_size_group_add_widget(size_group, checkbtn_domain);
tip_domain = _("The domain name will be used in the generated "
- "Message-ID, and when connecting to SMTP servers.");
+ "Message-ID, and when connecting to SMTP servers");
CLAWS_SET_TIP(checkbtn_domain, tip_domain);
diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index 68097dcd5..723978860 100644
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -172,7 +172,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
CLAWS_SET_TIP(checkbtn_filtering_log,
_("If checked, turns on logging of filtering and processing rules.\n"
- "The log is accessible from 'Tools/Filtering log'.\n"
+ "The log is accessible from '/Tools/Filtering log'.\n"
"Caution: enabling this option will slow down the filtering/processing, "
"this might be critical when applying many rules upon thousands of "
"messages"));
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index df13ee040..6262a126f 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -659,7 +659,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
_("Execute immediately when moving or deleting messages"));
CLAWS_SET_TIP(checkbtn_immedexec,
_("When unchecked moving, copying and deleting of messages"
- " is deferred until you use 'Tools/Execute'"));
+ " is deferred until you use '/Tools/Execute'"));
PACK_CHECK_BUTTON
(vbox1, checkbtn_ask_mark_all_read,
diff --git a/src/textview.c b/src/textview.c
index f6e9f653b..f37eb6019 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -964,7 +964,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/File/SavePartAs");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
- TEXTVIEW_INSERT("')");
+ TEXTVIEW_INSERT(_("')"));
#endif
TEXTVIEW_INSERT("\n");
@@ -976,7 +976,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/AsText");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
- TEXTVIEW_INSERT("')");
+ TEXTVIEW_INSERT(_("')"));
#endif
TEXTVIEW_INSERT("\n");
@@ -988,7 +988,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/Open");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
- TEXTVIEW_INSERT("')\n");
+ TEXTVIEW_INSERT(_("')\n"));
TEXTVIEW_INSERT(_(" (alternately double-click, or click the middle "));
TEXTVIEW_INSERT(_("mouse button)\n"));
#ifndef G_OS_WIN32
@@ -998,7 +998,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/View/Part/OpenWith");
TEXTVIEW_INSERT(shortcut);
g_free(shortcut);
- TEXTVIEW_INSERT("')");
+ TEXTVIEW_INSERT(_("')"));
#endif
#endif
TEXTVIEW_INSERT("\n");
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list