[Commits] [SCM] claws branch, master, updated. 4.2.0-5-ga73e6e2d1
mones at claws-mail.org
mones at claws-mail.org
Thu Dec 7 16:02:20 UTC 2023
The branch, master has been updated
via a73e6e2d1aa60bbd641230d4edbe6529c5a3c778 (commit)
from cba95f39798941eeb29515f8fa45ae161e3486d6 (commit)
Summary of changes:
src/mainwindow.c | 10 ++++------
src/summaryview.c | 8 ++++----
2 files changed, 8 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit a73e6e2d1aa60bbd641230d4edbe6529c5a3c778
Author: Ricardo Mones <ricardo at mones.org>
Date: Thu Dec 7 17:02:06 2023 +0100
Rename also “Color label” to “Color labels”
As suggested by Paul on translators ML.
diff --git a/src/mainwindow.c b/src/mainwindow.c
index b60e80ba2..928b70e76 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -722,7 +722,7 @@ static GtkActionEntry mainwin_entries[] =
{"Message/Marks/Lock", NULL, N_("Lock"), NULL, NULL, G_CALLBACK(lock_msgs_cb) },
{"Message/Marks/Unlock", NULL, N_("Unlock"), NULL, NULL, G_CALLBACK(unlock_msgs_cb) },
- {"Message/ColorLabel", NULL, N_("Color la_bel"), NULL, NULL, NULL },
+ {"Message/ColorLabels", NULL, N_("Color la_bels"), NULL, NULL, NULL },
{"Message/Tags", NULL, N_("Ta_gs"), NULL, NULL, NULL },
/*{"Message/---", NULL, "---", NULL, NULL, NULL },*/
@@ -1158,7 +1158,7 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
gint i;
gchar *accel_path = NULL;
- label_menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/ColorLabel");
+ label_menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/Message/ColorLabels");
g_signal_connect(G_OBJECT(label_menuitem), "activate",
G_CALLBACK(mainwindow_colorlabel_menu_item_activate_item_cb),
mainwin);
@@ -1204,8 +1204,6 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
-
-
}
gtk_widget_show(menu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
@@ -1781,7 +1779,7 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Separator5", "Message/Marks/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Lock", "Message/Marks/Lock", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message/Marks", "Unlock", "Message/Marks/Unlock", GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabel", "Message/ColorLabel", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "ColorLabels", "Message/ColorLabels", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Tags", "Message/Tags", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/Message", "Separator5", "Message/---", GTK_UI_MANAGER_SEPARATOR)
@@ -3198,7 +3196,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
SET_SENSITIVE("Menu/Message/Marks/UnignoreThread", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Marks/Lock", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Marks/Unlock", M_TARGET_EXIST);
- SET_SENSITIVE("Menu/Message/ColorLabel", M_TARGET_EXIST);
+ SET_SENSITIVE("Menu/Message/ColorLabels", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Tags", M_TARGET_EXIST);
SET_SENSITIVE("Menu/Message/Reedit", M_HAVE_ACCOUNT, M_ALLOW_REEDIT);
SET_SENSITIVE("Menu/Message/CheckSignature", M_SINGLE_TARGET_EXIST);
diff --git a/src/summaryview.c b/src/summaryview.c
index 52e999cb4..c187a006d 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -434,7 +434,7 @@ static GtkActionEntry summary_popup_entries[] =
{"SummaryViewPopup/ForwardAtt", NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_FORWARD_AS_ATTACH */
{"SummaryViewPopup/Redirect", NULL, N_("Redirec_t"), NULL, NULL, G_CALLBACK(summary_reply_cb) }, /* COMPOSE_REDIRECT */
{"SummaryViewPopup/Marks", NULL, N_("_Marks"), NULL, NULL, NULL },
- {"SummaryViewPopup/ColorLabel", NULL, N_("Color la_bel"), NULL, NULL, NULL },
+ {"SummaryViewPopup/ColorLabels", NULL, N_("Color la_bels"), NULL, NULL, NULL },
{"SummaryViewPopup/Tags", NULL, N_("Ta_gs"), NULL, NULL, NULL },
{"SummaryViewPopup/CreateFilterRule", NULL, N_("Create _filter rule"), NULL, NULL, NULL },
#ifndef GENERIC_UMPC
@@ -726,7 +726,7 @@ SummaryView *summary_create(MainWindow *mainwin)
#endif
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator3", "Message/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Marks", "SummaryViewPopup/Marks", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ColorLabel", "SummaryViewPopup/ColorLabel", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "ColorLabels", "SummaryViewPopup/ColorLabels", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Tags", "SummaryViewPopup/Tags", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menus/SummaryViewPopup", "Separator4", "Message/---", GTK_UI_MANAGER_SEPARATOR)
@@ -1855,7 +1855,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
SET_SENSITIVE("Menus/SummaryViewPopup/Marks/Unlock", M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkSpam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
SET_SENSITIVE("Menus/SummaryViewPopup/Marks/MarkHam", M_TARGET_EXIST, M_CAN_LEARN_SPAM);
- SET_SENSITIVE("Menus/SummaryViewPopup/ColorLabel", M_TARGET_EXIST);
+ SET_SENSITIVE("Menus/SummaryViewPopup/ColorLabels", M_TARGET_EXIST);
SET_SENSITIVE("Menus/SummaryViewPopup/Tags", M_TARGET_EXIST);
#ifndef GENERIC_UMPC
@@ -6249,7 +6249,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
gint i;
gchar *accel_path = NULL;
- label_menuitem = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menus/SummaryViewPopup/ColorLabel");
+ label_menuitem = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menus/SummaryViewPopup/ColorLabels");
g_signal_connect(G_OBJECT(label_menuitem), "activate",
G_CALLBACK(summary_colorlabel_menu_item_activate_item_cb),
summaryview);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list