[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-38-g9470c29c2

paul at claws-mail.org paul at claws-mail.org
Sun Aug 8 17:48:45 CEST 2021


The branch, gtk3 has been updated
       via  9470c29c27e1234e79607b4a50c4e7f9e5644dda (commit)
      from  10349d5e4956de1e2297221381cd7ae4b1b432bd (commit)

Summary of changes:
 src/account.c                             | 12 +++---
 src/action.c                              |  2 +-
 src/addrcustomattr.c                      |  6 +--
 src/addrduplicates.c                      |  6 +--
 src/addressbook.c                         |  4 +-
 src/editaddress.c                         | 18 ++++-----
 src/editaddress_other_attributes_ldap.c   |  8 ++--
 src/editgroup.c                           |  6 +--
 src/edittags.c                            |  6 +--
 src/gtk/foldersort.c                      |  6 +--
 src/gtk/gtkutils.c                        | 67 ++++++++-----------------------
 src/gtk/gtkutils.h                        |  4 +-
 src/gtk/quicksearch.c                     |  4 +-
 src/mainwindow.c                          |  2 +-
 src/message_search.c                      |  8 ++--
 src/plugins/clamd/clamav_plugin_gtk.c     |  4 +-
 src/plugins/libravatar/libravatar_prefs.c |  4 +-
 src/plugins/managesieve/sieve_manager.c   |  6 +--
 src/prefs_actions.c                       | 14 +++----
 src/prefs_customheader.c                  | 10 ++---
 src/prefs_display_header.c                | 16 ++++----
 src/prefs_filtering.c                     | 18 ++++-----
 src/prefs_filtering_action.c              | 12 +++---
 src/prefs_folder_column.c                 | 10 ++---
 src/prefs_matcher.c                       | 12 +++---
 src/prefs_summaries.c                     |  4 +-
 src/prefs_summary_column.c                | 10 ++---
 src/prefs_summary_open.c                  | 10 ++---
 src/prefs_template.c                      | 20 ++++-----
 src/prefs_themes.c                        |  4 +-
 src/prefs_toolbar.c                       | 10 ++---
 src/quote_fmt.c                           |  4 +-
 src/ssl_manager.c                         |  4 +-
 src/summary_search.c                      |  8 ++--
 34 files changed, 153 insertions(+), 186 deletions(-)


- Log -----------------------------------------------------------------
commit 9470c29c27e1234e79607b4a50c4e7f9e5644dda
Author: paul <paul at claws-mail.org>
Date:   Sun Aug 8 16:48:40 2021 +0100

    fix non-translation of some button labels

diff --git a/src/account.c b/src/account.c
index 3dd74eb5a..e3994ffe5 100644
--- a/src/account.c
+++ b/src/account.c
@@ -778,37 +778,37 @@ static void account_edit_create(void)
 	gtk_widget_show (vbox2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
 
-	add_btn = gtk_button_new_with_mnemonic("_New");
+	add_btn = gtk_button_new_with_mnemonic(_("_New"));
 	gtk_widget_show (add_btn);
 	gtk_box_pack_start (GTK_BOX (vbox2), add_btn, FALSE, FALSE, 4);
 	g_signal_connect (G_OBJECT(add_btn), "clicked",
 			  G_CALLBACK (account_add), NULL);
 
-	edit_btn = gtk_button_new_with_mnemonic("_Edit");
+	edit_btn = gtk_button_new_with_mnemonic(_("_Edit"));
 	gtk_widget_show (edit_btn);
 	gtk_box_pack_start (GTK_BOX (vbox2), edit_btn, FALSE, FALSE, 4);
 	g_signal_connect (G_OBJECT(edit_btn), "clicked",
 			  G_CALLBACK (account_edit_prefs), NULL);
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_widget_show (del_btn);
 	gtk_box_pack_start (GTK_BOX (vbox2), del_btn, FALSE, FALSE, 4);
 	g_signal_connect (G_OBJECT(del_btn), "clicked",
 			  G_CALLBACK (account_delete), NULL);
 
-	clone_btn = gtkut_stock_button("edit-copy");
+	clone_btn = gtkut_stock_button("edit-copy", _("_Copy"));
 	gtk_widget_show (clone_btn);
 	gtk_box_pack_start (GTK_BOX (vbox2), clone_btn, FALSE, FALSE, 4);
 	g_signal_connect(G_OBJECT(clone_btn), "clicked",
 			 G_CALLBACK(account_clone), NULL);
 	
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_end (GTK_BOX (vbox2), down_btn, FALSE, FALSE, 4);
 	g_signal_connect (G_OBJECT(down_btn), "clicked",
 			  G_CALLBACK (account_down), NULL);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show (up_btn);
 	gtk_box_pack_end (GTK_BOX (vbox2), up_btn, FALSE, FALSE, 4);
 	g_signal_connect (G_OBJECT(up_btn), "clicked",
diff --git a/src/action.c b/src/action.c
index 84e7a86a0..7ea4434c3 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1366,7 +1366,7 @@ static void create_io_dialog(Children *children)
 		}
 		gtk_widget_show(entry);
 
-		send_button = gtkut_stock_button("system-run");
+		send_button = gtkut_stock_button("system-run", _("_Execute"));
 		g_signal_connect(G_OBJECT(send_button), "clicked",
 				 G_CALLBACK(send_input), children);
 		gtk_box_pack_start(GTK_BOX(input_hbox), send_button, FALSE,
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
index e9b408d36..906542f48 100644
--- a/src/addrcustomattr.c
+++ b/src/addrcustomattr.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2019 The Claws Mail Team
+ * Copyright (C) 2007-2021 The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -486,10 +486,10 @@ static void custom_attr_window_create(void)
 	g_signal_connect(G_OBJECT(new_attr_entry), "key_press_event",
 			 G_CALLBACK(custom_attr_window_add_key_pressed), NULL);
 	
-	add_btn = gtkut_stock_button("list-add");
+	add_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(hbox1), add_btn, FALSE, FALSE, 0);
 	
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0);
 	
 	gtkut_stock_button_set_create(&hbox2, &cancel_btn, _("_Cancel"),
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index 0987afe2e..75235235f 100644
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -1,5 +1,5 @@
 /* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2019 Holger Berndt <hb at claws-mail.org> 
+ * Copyright (C) 2007-2021 Holger Berndt <hb at claws-mail.org> 
  * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -392,11 +392,11 @@ static void present_finder_results(GtkWindow *parent)
 	gtk_box_pack_start(GTK_BOX(hbox), edit_btn, TRUE, TRUE, 0);
 	gtk_widget_set_sensitive(edit_btn, FALSE);
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start(GTK_BOX(hbox), del_btn, TRUE, TRUE, 0);
 	gtk_widget_set_sensitive(del_btn, FALSE);
 
-	close = gtkut_stock_button("window-close");
+	close = gtkut_stock_button("window-close", _("_Close"));
 	gtk_box_pack_start(GTK_BOX(hbox), close, TRUE, TRUE, 0);
 
 	g_signal_connect(dialog, "destroy",
diff --git a/src/addressbook.c b/src/addressbook.c
index e6bd9f5f1..0b83c9202 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1162,7 +1162,7 @@ static void addressbook_create(void)
 	gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
 
 
-	lup_btn = gtkut_stock_button("edit-find");
+	lup_btn = gtkut_stock_button("edit-find", _("_Find"));
 	gtk_widget_set_can_default(lup_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
diff --git a/src/editaddress.c b/src/editaddress.c
index 5c7a7700f..a994e1cc5 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1318,11 +1318,11 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 	gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
 
 	/* Buttons */
-	buttonUp = gtkut_stock_button("go-up");
-	buttonDown = gtkut_stock_button("go-down");
-	buttonDel = gtkut_stock_button("edit-delete");
-	buttonMod = gtkut_stock_button("document-save");
-	buttonAdd = gtkut_stock_button("list-add");
+	buttonUp = gtkut_stock_button("go-up", _("_Up"));
+	buttonDown = gtkut_stock_button("go-down", _("_Down"));
+	buttonDel = gtkut_stock_button("edit-delete", _("D_elete"));
+	buttonMod = gtkut_stock_button("document-save", _("_Save"));
+	buttonAdd = gtkut_stock_button("list-add", _("_Add"));
 	
 
 #ifndef GENERIC_UMPC
@@ -1547,13 +1547,13 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 	gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
 
 	/* Buttons */
-	buttonDel = gtkut_stock_button("edit-delete");
+	buttonDel = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
 
-	buttonMod = gtkut_stock_button("document-save");
+	buttonMod = gtkut_stock_button("document-save", _("_Save"));
 	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
 
-	buttonAdd = gtkut_stock_button("list-add");
+	buttonAdd = gtkut_stock_button("list-add", _("_Add"));
 	gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
 	
 	gtk_widget_set_sensitive(buttonDel,FALSE);
diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c
index 913a83eb7..95b39dc44 100644
--- a/src/editaddress_other_attributes_ldap.c
+++ b/src/editaddress_other_attributes_ldap.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 Michael Rasmussen and the Claws Mail team
+ * Copyright (C) 1999-2021 Michael Rasmussen and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -428,13 +428,13 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
 	gtk_container_add(GTK_CONTAINER(vboxb), vbuttonbox);
 
 	/* Buttons */
-	buttonDel = gtkut_stock_button("edit-delete");
+	buttonDel = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonDel);
 
-	buttonMod = gtkut_stock_button("document-save");
+	buttonMod = gtkut_stock_button("document-save", _("_Save"));
 	gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonMod);
 
-	buttonAdd = gtkut_stock_button("list-add");
+	buttonAdd = gtkut_stock_button("list-add", _("_Add"));
 	gtk_container_add(GTK_CONTAINER(vbuttonbox), buttonAdd);
 	
 	gtk_widget_set_sensitive(buttonDel,FALSE);
diff --git a/src/editgroup.c b/src/editgroup.c
index b02a427aa..93533e882 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -343,7 +343,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
 	gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Addresses in Group"));
 	gtk_box_pack_start(GTK_BOX(hboxh), label, TRUE, TRUE, 0);
-	buttonAvail = gtkut_stock_button("list-remove");
+	buttonAvail = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_box_pack_end(GTK_BOX(hboxh), buttonAvail, FALSE, FALSE, 0);
 
 	clist_swin = gtk_scrolled_window_new( NULL, NULL );
@@ -373,7 +373,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
 	hboxh = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0 );
 	gtk_container_set_border_width( GTK_CONTAINER(hboxh), 4 );
 	gtk_box_pack_start(GTK_BOX(vboxl), hboxh, FALSE, FALSE, 0);
-	buttonGroup = gtkut_stock_button("list-add");
+	buttonGroup = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(hboxh), buttonGroup, FALSE, FALSE, 0);
 	label = gtk_label_new(_("Available Addresses"));
 	gtk_box_pack_end(GTK_BOX(hboxh), label, TRUE, TRUE, 0);
diff --git a/src/edittags.c b/src/edittags.c
index 6af44cfae..531ba9dd6 100644
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2007-2019 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2007-2021 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -570,10 +570,10 @@ static void apply_window_create(void)
 	g_signal_connect(G_OBJECT(new_tag_entry), "key_press_event",
 			 G_CALLBACK(apply_window_add_key_pressed), NULL);
 	
-	add_btn = gtkut_stock_button("list-add");
+	add_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(hbox1), add_btn, FALSE, FALSE, 0);
 	
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start(GTK_BOX(hbox1), del_btn, FALSE, FALSE, 0);
 	
 	close_btn = gtk_button_new_with_mnemonic("_Close");
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index 81f67b263..e4ba7ede4 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2019 the Claws Mail Team
+ * Copyright (C) 2004-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -308,11 +308,11 @@ void foldersort_open()
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox2), btn_vbox, FALSE, FALSE, 0);
 
-	moveup_btn = gtkut_stock_button("go-up");
+	moveup_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(moveup_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), moveup_btn, FALSE, FALSE, 0);
 
-	movedown_btn =  gtkut_stock_button("go-down");
+	movedown_btn =  gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show(movedown_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), movedown_btn, FALSE, FALSE, 0);
 
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 012b90841..e76c37039 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,38 +59,6 @@
 #include "manual.h"
 #include "combobox.h"
 
-static struct {
-	const gchar *icon_name;
-	const gchar *icon_label;
-} STOCK_BTNS[] __attribute__((unused)) = {
-	{ "dialog-information",		N_("_Information") },
-	{ "document-open",		N_("_Open") },
-	{ "document-properties",	N_("_Properties") },
-	{ "document-save",		N_("_Save") },
-	{ "edit-clear", 		N_("C_lear") },
-	{ "edit-copy",			N_("_Copy") },
-	{ "edit-delete", 		N_("D_elete") },
-	{ "edit-find", 			N_("_Find") },
-	{ "edit-find-replace",		N_("Find and _Replace") },
-	{ "edit-redo",			N_("_Replace") },
-	{ "edit-undo",			N_("_Undo") },
-	{ "folder",			N_("_Browse") },
-	{ "go-bottom",			N_("_Bottom") },	
-	{ "go-down",			N_("_Down") },
-	{ "go-next",			N_("_Next") },
-	{ "go-previous",		N_("_Previous") },
-	{ "go-top",			N_("_Top") },
-	{ "go-up", 			N_("_Up") },
-	{ "help-browser",		N_("Help") },
-	{ "list-add",			N_("_Add") },
-	{ "list-remove",		N_("_Remove") },
-	{ "process-stop",		N_("_Stop") },
-	{ "system-run",			N_("_Execute") },
-	{ "view-refresh",		N_("_Refresh") },
-	{ "window-close",		N_("_Close") },
-	{ NULL, NULL }
-};
-
 gboolean gtkut_get_font_size(GtkWidget *widget,
 			     gint *width, gint *height)
 {
@@ -134,7 +102,7 @@ void gtkut_stock_button_add_help(GtkWidget *bbox, GtkWidget **help_btn)
 {
 	cm_return_if_fail(bbox != NULL);
 
-	*help_btn = gtkut_stock_button("help-browser");
+	*help_btn = gtkut_stock_button("help-browser", "Help");
 
 	gtk_widget_set_can_default(*help_btn, TRUE);
 	gtk_box_pack_end(GTK_BOX (bbox), *help_btn, TRUE, TRUE, 0);
@@ -172,20 +140,20 @@ void gtkut_stock_button_set_create(GtkWidget **bbox,
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(*bbox), GTK_BUTTONBOX_END);
 	gtk_box_set_spacing(GTK_BOX(*bbox), 5);
 
-	*button1 = gtkut_stock_button(label1);
+	*button1 = gtk_button_new_with_mnemonic(label1);
 	gtk_widget_set_can_default(*button1, TRUE);
 	gtk_box_pack_start(GTK_BOX(*bbox), *button1, TRUE, TRUE, 0);
 	gtk_widget_show(*button1);
 
 	if (button2) {
-		*button2 = gtkut_stock_button(label2);
+		*button2 = gtk_button_new_with_mnemonic(label2);
 		gtk_widget_set_can_default(*button2, TRUE);
 		gtk_box_pack_start(GTK_BOX(*bbox), *button2, TRUE, TRUE, 0);
 		gtk_widget_show(*button2);
 	}
 
 	if (button3) {
-		*button3 = gtkut_stock_button(label3);
+		*button3 = gtk_button_new_with_mnemonic(label3);
 		gtk_widget_set_can_default(*button3, TRUE);
 		gtk_box_pack_start(GTK_BOX(*bbox), *button3, TRUE, TRUE, 0);
 		gtk_widget_show(*button3);
@@ -955,26 +923,25 @@ GtkWidget *gtkut_get_replace_btn(const gchar *button_label)
 	return button;
 }
 
-GtkWidget *gtkut_stock_button(const gchar *stock_image)
+GtkWidget *gtkut_stock_button(const gchar *stock_image, const gchar *label)
 {
 	GtkWidget *button;
-	const gchar *name = NULL;
-	const gchar *label = NULL;
+
 	gint i;
 	
 	cm_return_val_if_fail(stock_image != NULL, NULL);
 
-	button = gtk_button_new_from_icon_name(stock_image, GTK_ICON_SIZE_BUTTON);
+	GtkSettings *default_settings = gtk_settings_get_default();
+	g_object_set(default_settings, "gtk-button-images", TRUE, NULL);
+	
+	if (label != NULL) {
+		button = gtk_button_new_from_icon_name(stock_image, GTK_ICON_SIZE_BUTTON);
+		gtk_button_set_label(GTK_BUTTON(button), _(label));
+	} else
+		button = gtk_button_new_from_icon_name(stock_image, GTK_ICON_SIZE_BUTTON);
+
 	gtk_button_set_use_underline(GTK_BUTTON(button), TRUE);
-	for (i=0;STOCK_BTNS[i].icon_name != NULL;i++) {
-		name = STOCK_BTNS[i].icon_name;
-		label = STOCK_BTNS[i].icon_label;
-		if (!strcmp(stock_image, name)) {
-			gtk_button_set_label(GTK_BUTTON(button), label);
-			return button;
-		}
-	}
-	button = gtk_button_new_with_mnemonic(stock_image);
+	gtk_button_set_use_stock(GTK_BUTTON(button), TRUE);
 	
 	return button;
 };
diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 6ff0db7e4..dfcdc23e3 100644
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@ GtkWidget *gtkut_get_focused_child	(GtkContainer 	*parent);
 GtkWidget *gtkut_get_browse_file_btn(const gchar *label);
 GtkWidget *gtkut_get_browse_directory_btn(const gchar *label);
 GtkWidget *gtkut_get_replace_btn(const gchar *label);
-GtkWidget *gtkut_stock_button(const gchar *stock_image);
+GtkWidget *gtkut_stock_button(const gchar *stock_image, const gchar *label);
 GtkWidget *gtkut_get_options_frame(GtkWidget *box, GtkWidget **frame, const gchar *frame_label);
 #if HAVE_LIBCOMPFACE
 GtkWidget *xface_get_from_header(const gchar *o_xface);
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index dac0f3df7..6ba924203 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -925,7 +925,7 @@ QuickSearch *quicksearch_new()
 	gtk_widget_show(search_string_entry);
 
 	search_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
-	clear_search = gtkut_stock_button("edit-clear");
+	clear_search = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
 			   FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(clear_search), "clicked",
@@ -944,7 +944,7 @@ QuickSearch *quicksearch_new()
 			     _("Edit search criteria"));
 	gtk_widget_show(search_condition_expression);
 
-	search_description = gtkut_stock_button("dialog-information");
+	search_description = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
 			   FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(search_description), "clicked",
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 4093cdc6e..f7a1f6996 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1918,7 +1918,7 @@ MainWindow *main_window_create()
 	hbox_stat = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
 	gtk_box_pack_end(GTK_BOX(vbox_body), hbox_stat, FALSE, FALSE, 0);
 
-	warning_icon = gtkut_stock_button("dialog-warning");
+	warning_icon = gtkut_stock_button("dialog-warning", NULL);
 	warning_btn = gtk_event_box_new();
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(warning_btn), FALSE);
 	
diff --git a/src/message_search.c b/src/message_search.c
index a1913afe9..3065dc513 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -225,12 +225,12 @@ static void message_search_create(void)
 
 	gtkut_stock_button_add_help(confirm_area, &help_btn);
 
-	prev_btn = gtkut_stock_button("go-previous");
+	prev_btn = gtkut_stock_button("go-previous", _("_Previous"));
 	gtk_widget_set_can_default(prev_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
 	gtk_widget_show(prev_btn);
 
-	next_btn = gtkut_stock_button("go-next");
+	next_btn = gtkut_stock_button("go-next", _("_Next"));
 	gtk_widget_set_can_default(next_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
 	gtk_widget_show(next_btn);
diff --git a/src/plugins/clamd/clamav_plugin_gtk.c b/src/plugins/clamd/clamav_plugin_gtk.c
index 764da5f2c..bfcbb78c9 100644
--- a/src/plugins/clamd/clamav_plugin_gtk.c
+++ b/src/plugins/clamd/clamav_plugin_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2019 the Claws Mail Team
+ * Copyright (C) 2003-2021 the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -345,7 +345,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
 	gtk_widget_show (blank);
 	gtk_box_pack_start (GTK_BOX (hbox_auto2), blank, TRUE, TRUE, 0);
 
-	permission_select = gtkut_stock_button("edit-find-replace");
+	permission_select = gtkut_stock_button("edit-find-replace", _("Find and _Replace"));
 			/*gtk_button_new_with_mnemonic(_("_Check Permission"));*/
 	gtk_widget_show (permission_select);
   	gtk_box_pack_start (GTK_BOX (hbox_auto2), permission_select, FALSE, FALSE, 0);
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index 2eb047b38..4ee40687b 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014-2019 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2014-2021 Ricardo Mones and the Claws Mail Team
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -249,7 +249,7 @@ static GtkWidget *p_create_frame_cache(struct LibravatarPrefsPage *page)
 	g_free(markup);
 	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 
-	button = gtkut_stock_button("edit-clear");
+	button = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_widget_show(button);
 	g_signal_connect(button, "clicked",
 		G_CALLBACK(cache_clean_button_clicked_cb), label);
diff --git a/src/plugins/managesieve/sieve_manager.c b/src/plugins/managesieve/sieve_manager.c
index 13695a100..c5b9f1f65 100644
--- a/src/plugins/managesieve/sieve_manager.c
+++ b/src/plugins/managesieve/sieve_manager.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2019 the Claws Mail team
+ * Copyright (C) 2004-2021 the Claws Mail team
  * Copyright (C) 2014-2015 Charles Lehner
  *
  * This program is free software; you can redistribute it and/or modify
@@ -762,7 +762,7 @@ static SieveManagerPage *sieve_manager_page_new()
 			G_CALLBACK (filter_edit), page);
 
 	/* delete */
-	btn = gtkut_stock_button("edit-delete");
+	btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start (GTK_BOX (vbox_buttons), btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT(btn), "clicked",
 			G_CALLBACK (filter_delete), page);
@@ -774,7 +774,7 @@ static SieveManagerPage *sieve_manager_page_new()
 			G_CALLBACK (filter_rename), page);
 
 	/* refresh */
-	btn = gtkut_stock_button("view-refresh");
+	btn = gtkut_stock_button("view-refresh", "_Refresh");
 	gtk_box_pack_end (GTK_BOX (vbox_allbuttons), btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT(btn), "clicked",
 			G_CALLBACK (account_changed), page);
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index ceb8cf23d..52694403c 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail Team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail Team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -315,7 +315,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	gtk_widget_show(btn_hbox);
 	gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show(reg_btn);
 	gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(reg_btn), "clicked",
@@ -331,7 +331,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected action in list with the action above"));
 
-	del_btn = gtkut_stock_button("list-remove");
+	del_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show(del_btn);
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -339,7 +339,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	CLAWS_SET_TIP(del_btn,
 			_("Delete the selected action from the list"));
 
-	clear_btn = gtkut_stock_button("edit-clear");
+	clear_btn = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_widget_show (clear_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), clear_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -347,7 +347,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	CLAWS_SET_TIP(clear_btn,
 			_("Clear all the input fields in the dialog"));
 
-	info_btn = gtkut_stock_button("dialog-information");
+	info_btn = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_widget_show(info_btn);
 	gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(info_btn), "clicked",
@@ -378,7 +378,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(up_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(up_btn), "clicked",
@@ -386,7 +386,7 @@ static void prefs_actions_create(MainWindow *mainwin)
 	CLAWS_SET_TIP(up_btn,
 			_("Move the selected action up"));
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show(down_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(down_btn), "clicked",
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index a9b033246..5d36c96cb 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -246,14 +246,14 @@ static void prefs_custom_header_create(void)
 	gtk_widget_show (btn_hbox);
 	gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	add_btn = gtkut_stock_button("list-add");
+	add_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show (add_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), add_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (add_btn), "clicked",
 			  G_CALLBACK (prefs_custom_header_add_cb),
 			  NULL);
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_widget_show (del_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (del_btn), "clicked",
@@ -280,13 +280,13 @@ static void prefs_custom_header_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (ch_hbox), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show (up_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (up_btn), "clicked",
 			  G_CALLBACK (prefs_custom_header_up), NULL);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (down_btn), "clicked",
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 4e62e2500..e2e168f2d 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -318,14 +318,14 @@ static void prefs_display_header_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show (reg_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (reg_btn), "clicked",
 			    G_CALLBACK
 			    (prefs_display_header_register_cb),
 			    GINT_TO_POINTER(TRUE));
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("list-add", _("_Delete"));
 	gtk_widget_show (del_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT	 (del_btn), "clicked",
@@ -369,26 +369,26 @@ static void prefs_display_header_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show (reg_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (reg_btn), "clicked",
 			  G_CALLBACK (prefs_display_header_register_cb),
 			    GINT_TO_POINTER(FALSE));
-	del_btn = gtkut_stock_button("list-remove");
+	del_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show (del_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (del_btn), "clicked",
 			  G_CALLBACK (prefs_display_header_delete_cb),
 			  headers_list_view);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show (up_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (up_btn), "clicked",
 			  G_CALLBACK (prefs_display_header_up), NULL);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (down_btn), "clicked",
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index cfa5f5d4a..2f8fa9ac1 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -452,7 +452,7 @@ static void prefs_filtering_create(void)
 	gtk_widget_show (btn_hbox);
 	gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show (reg_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (reg_btn), "clicked",
@@ -460,7 +460,7 @@ static void prefs_filtering_create(void)
 	CLAWS_SET_TIP(reg_btn,
 			_("Append the new rule above to the list"));
 
-	subst_btn = gtkut_stock_button("edit-redo");
+	subst_btn = gtkut_stock_button("edit-redo", _("_Replace"));
 	gtk_widget_show (subst_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (subst_btn), "clicked",
@@ -469,14 +469,14 @@ static void prefs_filtering_create(void)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected rule in list with the rule above"));
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (del_btn), "clicked",
 			G_CALLBACK(prefs_filtering_delete_cb), NULL);
 	CLAWS_SET_TIP(del_btn,
 			_("Delete the selected rule from the list"));
 
-	clear_btn = gtkut_stock_button("edit-clear");
+	clear_btn = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_widget_show (clear_btn);
 	gtk_box_pack_start (GTK_BOX (btn_hbox), clear_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -507,7 +507,7 @@ static void prefs_filtering_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-	top_btn = gtkut_stock_button("go-top");
+	top_btn = gtkut_stock_button("go-top", _("_Top"));
 	gtk_widget_show (top_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (top_btn), "clicked",
@@ -527,7 +527,7 @@ static void prefs_filtering_create(void)
 			_("Move the selected rule one page up"));
 #endif
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show (up_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (up_btn), "clicked",
@@ -535,7 +535,7 @@ static void prefs_filtering_create(void)
 	CLAWS_SET_TIP(up_btn,
 			_("Move the selected rule up"));
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (down_btn), "clicked",
@@ -555,7 +555,7 @@ static void prefs_filtering_create(void)
 			_("Move the selected rule one page down"));
 #endif
 
-	bottom_btn = gtkut_stock_button("go-bottom");
+	bottom_btn = gtkut_stock_button("go-bottom", _("_Bottom"));
 	gtk_widget_show (bottom_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (bottom_btn), "clicked",
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index bc5ce4005..36afa63b3 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2019 the Claws Mail team
+ * Copyright (C) 2003-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -559,7 +559,7 @@ static void prefs_filtering_action_create(void)
 			  NULL);
 #endif
 
-	exec_btn = gtkut_stock_button("dialog-information");
+	exec_btn = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (exec_btn), "clicked",
 			  G_CALLBACK(prefs_filtering_action_exec_info),
@@ -577,7 +577,7 @@ static void prefs_filtering_action_create(void)
 	btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(reg_btn), "clicked",
 			 G_CALLBACK(prefs_filtering_action_register_cb), NULL);
@@ -588,7 +588,7 @@ static void prefs_filtering_action_create(void)
 			 G_CALLBACK(prefs_filtering_action_substitute_cb),
 			 NULL);
 
-	del_btn = gtkut_stock_button("list-remove");
+	del_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(del_btn), "clicked",
 			 G_CALLBACK(prefs_filtering_action_delete_cb), NULL);
@@ -612,12 +612,12 @@ static void prefs_filtering_action_create(void)
 	btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
 	gtk_box_pack_start(GTK_BOX(action_hbox), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(up_btn), "clicked",
 			 G_CALLBACK(prefs_filtering_action_up), NULL);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(down_btn), "clicked",
 			 G_CALLBACK(prefs_filtering_action_down), NULL);
diff --git a/src/prefs_folder_column.c b/src/prefs_folder_column.c
index 6298fac04..c3e5edca4 100644
--- a/src/prefs_folder_column.c
+++ b/src/prefs_folder_column.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -268,14 +268,14 @@ static void prefs_folder_column_create(void)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	add_btn = gtkut_stock_button("list-add");
+	add_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show(add_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
 
 	g_signal_connect(G_OBJECT(add_btn), "clicked",
 			 G_CALLBACK(prefs_folder_column_add), NULL);
 
-	remove_btn = gtkut_stock_button("list-remove");
+	remove_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show(remove_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
 
@@ -309,11 +309,11 @@ static void prefs_folder_column_create(void)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(up_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show(down_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
 
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 5f916a364..68ae94310 100644
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -771,7 +771,7 @@ static void prefs_matcher_create(void)
 	gtk_box_pack_start(GTK_BOX(date_hbox), time_label, FALSE, FALSE, 0);
 	
 	/* test info button */
-	test_btn = gtkut_stock_button("dialog-information");
+	test_btn = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (test_btn), "clicked",
 			 G_CALLBACK(prefs_matcher_test_info),
@@ -788,7 +788,7 @@ static void prefs_matcher_create(void)
 	btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW);
 	gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(reg_btn), "clicked",
 			 G_CALLBACK(prefs_matcher_register_cb), NULL);
@@ -799,7 +799,7 @@ static void prefs_matcher_create(void)
 			 G_CALLBACK(prefs_matcher_substitute_cb),
 			 NULL);
 
-	del_btn = gtkut_stock_button("list-remove");
+	del_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(del_btn), "clicked",
 			 G_CALLBACK(prefs_matcher_delete_cb), NULL);
@@ -823,12 +823,12 @@ static void prefs_matcher_create(void)
 	btn_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, VBOX_BORDER);
 	gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(up_btn), "clicked",
 			 G_CALLBACK(prefs_matcher_up), NULL);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(down_btn), "clicked",
 			 G_CALLBACK(prefs_matcher_down), NULL);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index a35f0cdf7..7e85ea632 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2019 Colin Leroy and The Claws Mail Team
+ * Copyright (C) 2005-2021 Colin Leroy and The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -491,7 +491,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
 	gtk_widget_show (entry_datefmt);
 	gtk_box_pack_start (GTK_BOX (hbox2), entry_datefmt, FALSE, FALSE, 0);
 
-	button_datefmt = gtkut_stock_button("dialog-information");
+	button_datefmt = gtkut_stock_button("dialog-information", _("_Information"));
 
 	gtk_widget_show (button_datefmt);
 	gtk_box_pack_start (GTK_BOX (hbox2), button_datefmt, FALSE, FALSE, 0);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index d0c6eebdf..65500d6f8 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -282,14 +282,14 @@ static void prefs_summary_column_create(void)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	add_btn = gtkut_stock_button("list-add");
+	add_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show(add_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), add_btn, FALSE, TRUE, 0);
 
 	g_signal_connect(G_OBJECT(add_btn), "clicked",
 			 G_CALLBACK(prefs_summary_column_add), NULL);
 
-	remove_btn = gtkut_stock_button("list-remove");
+	remove_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show(remove_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), remove_btn, FALSE, TRUE, 0);
 
@@ -323,11 +323,11 @@ static void prefs_summary_column_create(void)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(up_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, TRUE, 0);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show(down_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, TRUE, 0);
 
diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index 9c6f2b3b2..473ce5260 100644
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -238,13 +238,13 @@ static void prefs_summary_open_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (list_view_hbox1), btn_vbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show (reg_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect (G_OBJECT (reg_btn), "clicked",
 			  G_CALLBACK (prefs_summary_open_register_cb),
 			  possible_actions_list_view);
-	del_btn = gtkut_stock_button("list-remove");
+	del_btn = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show (del_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
 
@@ -286,13 +286,13 @@ static void prefs_summary_open_create(void)
 	gtk_widget_show (btn_vbox);
 	gtk_box_pack_start (GTK_BOX (list_view_hbox2), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show (up_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (up_btn), "clicked",
 			  G_CALLBACK (prefs_summary_open_up), NULL);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
 	g_signal_connect (G_OBJECT (down_btn), "clicked",
diff --git a/src/prefs_template.c b/src/prefs_template.c
index d0e8884a0..e287ecdfb 100644
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -1,7 +1,7 @@
 /*
  * Claws Mail templates subsystem 
  * Copyright (C) 2001 Alexander Barinov
- * Copyright (C) 2001-2020 The Claws Mail team
+ * Copyright (C) 2001-2021 The Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -296,7 +296,7 @@ static void prefs_template_window_create(void)
 	gtk_widget_show(hbox3);
 	gtk_box_pack_start(GTK_BOX(hbox2), hbox3, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_widget_show(reg_btn);
 	gtk_box_pack_start(GTK_BOX(hbox3), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (reg_btn), "clicked",
@@ -304,7 +304,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(reg_btn,
 			_("Append the new template above to the list"));
 
-	subst_btn = gtkut_stock_button("edit-redo");
+	subst_btn = gtkut_stock_button("edit-redo", _("_Replace"));
 	gtk_widget_show(subst_btn);
 	gtk_box_pack_start(GTK_BOX(hbox3), subst_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(subst_btn), "clicked",
@@ -313,7 +313,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(subst_btn,
 			_("Replace the selected template in list with the template above"));
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_widget_show(del_btn);
 	gtk_box_pack_start(GTK_BOX(hbox3), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(del_btn), "clicked",
@@ -321,7 +321,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(del_btn,
 			_("Delete the selected template from the list"));
 
-	clear_btn = gtkut_stock_button("edit-clear");
+	clear_btn = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_widget_show (clear_btn);
 	gtk_box_pack_start (GTK_BOX (hbox3), clear_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT (clear_btn), "clicked",
@@ -329,7 +329,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(clear_btn,
 			_("Clear all the input fields in the dialog"));
 
-	desc_btn = gtkut_stock_button("dialog-information");
+	desc_btn = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_widget_show(desc_btn);
 	gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(desc_btn), "clicked",
@@ -353,7 +353,7 @@ static void prefs_template_window_create(void)
 	gtk_widget_show(vbox3);
 	gtk_box_pack_start(GTK_BOX(hbox4), vbox3, FALSE, FALSE, 0);
 
-	top_btn = gtkut_stock_button("go-top");
+	top_btn = gtkut_stock_button("go-top", _("_Top"));
 	gtk_widget_show(top_btn);
 	gtk_box_pack_start(GTK_BOX(vbox3), top_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(top_btn), "clicked",
@@ -363,7 +363,7 @@ static void prefs_template_window_create(void)
 
 	PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(up_btn);
 	gtk_box_pack_start (GTK_BOX(vbox3), up_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(up_btn), "clicked",
@@ -371,7 +371,7 @@ static void prefs_template_window_create(void)
 	CLAWS_SET_TIP(up_btn,
 			_("Move the selected template up"));
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show (down_btn);
 	gtk_box_pack_start(GTK_BOX (vbox3), down_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT (down_btn), "clicked",
@@ -381,7 +381,7 @@ static void prefs_template_window_create(void)
 
 	PACK_SPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
-	bottom_btn = gtkut_stock_button("go-bottom");
+	bottom_btn = gtkut_stock_button("go-bottom", _("_Bottom"));
 	gtk_widget_show(bottom_btn);
 	gtk_box_pack_start(GTK_BOX(vbox3), bottom_btn, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(bottom_btn), "clicked",
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 4f2cf7de6..91161bbdb 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 2003-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1098,7 +1098,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START);
 	gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5);
 
-	btn_remove = gtkut_stock_button("list-remove");
+	btn_remove = gtkut_stock_button("list-remove", _("_Remove"));
 	gtk_widget_show (btn_remove);
 	gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
 	gtk_widget_set_can_default (btn_remove, TRUE);
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 5d792fedd..55686969e 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2021 the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -994,7 +994,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 	btn_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-	reg_btn = gtkut_stock_button("list-add");
+	reg_btn = gtkut_stock_button("list-add", _("_Add"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(reg_btn), "clicked",
 			 G_CALLBACK(prefs_toolbar_register),
@@ -1006,7 +1006,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 			 G_CALLBACK(prefs_toolbar_substitute),
 			 prefs_toolbar);
 
-	del_btn = gtkut_stock_button("edit-delete");
+	del_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 	gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
 	g_signal_connect(G_OBJECT(del_btn), "clicked",
 			 G_CALLBACK(prefs_toolbar_delete),
@@ -1050,11 +1050,11 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 	gtk_widget_show(btn_vbox);
 	gtk_box_pack_start(GTK_BOX(hbox_bottom), btn_vbox, FALSE, FALSE, 0);
 
-	up_btn = gtkut_stock_button("go-up");
+	up_btn = gtkut_stock_button("go-up", _("_Up"));
 	gtk_widget_show(up_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 4);
 
-	down_btn = gtkut_stock_button("go-down");
+	down_btn = gtkut_stock_button("go-down", _("_Down"));
 	gtk_widget_show(down_btn);
 	gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(btn_vbox), 8);
diff --git a/src/quote_fmt.c b/src/quote_fmt.c
index c63b3f61d..65cc9eb92 100644
--- a/src/quote_fmt.c
+++ b/src/quote_fmt.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -523,7 +523,7 @@ void quotefmt_add_info_button(GtkWindow *parent_window, GtkWidget *parent_box)
 {
 	GtkWidget *btn_formatdesc;
 
-	btn_formatdesc = gtkut_stock_button("dialog-information");
+	btn_formatdesc = gtkut_stock_button("dialog-information", _("_Information"));
 	gtk_widget_show (btn_formatdesc);
 	gtk_box_pack_start (GTK_BOX (parent_box), btn_formatdesc, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(btn_formatdesc), "clicked",
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
index 9713008e9..f0bd8ed52 100644
--- a/src/ssl_manager.c
+++ b/src/ssl_manager.c
@@ -208,12 +208,12 @@ void ssl_manager_create(void)
 
 	hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 	vbox1 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-	delete_btn = gtkut_stock_button("edit-delete");
+	delete_btn = gtkut_stock_button("edit-delete", _("D_elete"));
 
 	g_signal_connect(G_OBJECT(delete_btn), "clicked",
 			 G_CALLBACK(ssl_manager_delete_cb), NULL);
 
-	view_btn = gtkut_stock_button("document-properties");
+	view_btn = gtkut_stock_button("document-properties", NULL);
 	g_signal_connect(G_OBJECT(view_btn), "clicked",
 			 G_CALLBACK(ssl_manager_view_cb), NULL);
 
diff --git a/src/summary_search.c b/src/summary_search.c
index 48d4a46af..037742950 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -314,7 +314,7 @@ static void summary_search_create(void)
 	g_signal_connect(G_OBJECT(bool_optmenu), "changed",
 			 G_CALLBACK(optmenu_changed), NULL);
 
-	clear_btn = gtkut_stock_button("edit-clear");
+	clear_btn = gtkut_stock_button("edit-clear", _("C_lear"));
 	gtk_widget_show(clear_btn);
 	gtk_box_pack_end(GTK_BOX(bool_hbox), clear_btn, FALSE, FALSE, 0);
 
@@ -482,12 +482,12 @@ static void summary_search_create(void)
 	gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
 	gtk_widget_show(all_btn);
 
-	prev_btn = gtkut_stock_button("go-previous");
+	prev_btn = gtkut_stock_button("go-previous", _("_Previous"));
 	gtk_widget_set_can_default(prev_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
 	gtk_widget_show(prev_btn);
 
-	next_btn = gtkut_stock_button("go-next");
+	next_btn = gtkut_stock_button("go-next", _("_Next"));
 	gtk_widget_set_can_default(next_btn, TRUE);
 	gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
 	gtk_widget_show(next_btn);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list