commit 810e41b67dbb24919afb90d7c277f873fc8ee91c
parent 1c5016e935e69475f0d7a4d023eff14434054346
Author: paul <paul@claws-mail.org>
Date: Tue, 24 Aug 2021 16:44:30 +0100
fix text on Delete buttons in alertpanels
Diffstat:
10 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c
@@ -159,7 +159,7 @@ static void custom_attr_window_list_view_clear_list(GtkWidget *list_view, gboole
{
if (!warn || alertpanel(_("Delete all attribute names"),
_("Do you really want to delete all attribute names?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(list_view)));
gtk_list_store_clear(list_store);
@@ -184,7 +184,7 @@ static void custom_attr_popup_delete (void *obj, void *data)
if (alertpanel(_("Delete attribute name"),
_("Do you really want to delete this attribute name?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) == G_ALERTALTERNATE) {
gtk_list_store_remove(GTK_LIST_STORE(model), &sel);
dirty = TRUE;
}
diff --git a/src/addrduplicates.c b/src/addrduplicates.c
@@ -790,7 +790,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data)
aval = alertpanel(_("Delete address(es)"),
_("Really delete the address(es)?"),
- _("_Cancel"), "edit-delete", NULL,
+ _("_Cancel"), _("D_elete"), NULL,
ALERTFOCUS_SECOND);
if(aval != G_ALERTALTERNATE)
return;
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -1480,14 +1480,14 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
aval = alertpanel( _("Delete group"),
_("Really delete the group(s)?\n"
"The addresses it contains will not be lost."),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
} else {
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND );
if( aval != G_ALERTALTERNATE ) {
goto thaw_ret;
}
@@ -2954,7 +2954,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
"results and addresses in '%s'?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND );
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ADDR;
@@ -2980,14 +2980,14 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data)
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will not be lost."), obj->name);
aval = alertpanel(_("Delete"), message, _("_Cancel"),
- "edit-delete", NULL, ALERTFOCUS_SECOND);
+ _("D_elete"), NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_FOLDER_ONLY;
} else {
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will be lost."), obj->name);
aval = alertpanel(_("Delete"), message, _("_Cancel"),
- "edit-delete", NULL, ALERTFOCUS_SECOND);
+ _("D_elete"), NULL, ALERTFOCUS_SECOND);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}
diff --git a/src/edittags.c b/src/edittags.c
@@ -219,7 +219,7 @@ static void apply_popup_delete (GtkAction *action, gpointer data)
if (alertpanel(_("Delete tag"),
_("Do you really want to delete this tag?"),
- _("_Cancel"), "edit-delete", NULL,
+ _("_Cancel"), _("D_elete"), NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -255,7 +255,7 @@ static void apply_popup_delete_all (GtkAction *action, gpointer data)
if (alertpanel(_("Delete all tags"),
_("Do you really want to delete all tags?"),
- _("_Cancel"), "edit-delete", NULL,
+ _("_Cancel"), _("D_elete"), NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
diff --git a/src/mh_gtk.c b/src/mh_gtk.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
@@ -204,7 +204,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -1,7 +1,7 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
* Copyright (C) 1999-2004 Hiroyuki Yamamoto
- * This file (C) 2005-2019 Andrej Kacian <andrej@kacian.sk> and the
+ * This file (C) 2005-2021 Andrej Kacian <andrej@kacian.sk> and the
* Claws Mail team
*
* - callback handler functions for folderview rssyl context menu items
@@ -150,11 +150,11 @@ void rssyl_remove_folder_cb(GtkAction *action,
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
message = g_strdup_printf
- (_("All folders and messages under '%s' will be permanently deleted. "
+ (_("All folders and messages under '%s' will be permanently deleted.\n"
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST, FALSE,
+ _("_Cancel"), _("_Delete"), NULL, ALERTFOCUS_FIRST, FALSE,
NULL, ALERT_WARNING);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
@@ -722,7 +722,7 @@ static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
/* XXX: Here's the reason why we need to store the original
@@ -743,7 +743,7 @@ static void prefs_actions_delete_all_cb(gpointer gtk_action, gpointer data)
if (alertpanel(_("Delete all actions"),
_("Do you really want to delete all the actions?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST) != G_ALERTDEFAULT)
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST) != G_ALERTDEFAULT)
return;
list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view)));
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
@@ -1191,7 +1191,7 @@ static void prefs_filtering_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
model = gtk_tree_view_get_model(list_view);
@@ -1210,7 +1210,7 @@ static void prefs_filtering_delete_all_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete all rules"),
_("Do you really want to delete all the rules?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(filtering.cond_list_view)));
diff --git a/src/prefs_template.c b/src/prefs_template.c
@@ -896,7 +896,7 @@ static void prefs_template_delete_cb(gpointer action, gpointer data)
if (alertpanel(_("Delete template"),
_("Do you really want to delete this template?"),
- _("_Cancel"), "edit-delete", NULL,
+ _("_Cancel"), _("D_elete"), NULL,
ALERTFOCUS_FIRST) != G_ALERTALTERNATE)
return;
@@ -909,7 +909,7 @@ static void prefs_template_delete_all_cb(gpointer action, gpointer data)
{
if (alertpanel(_("Delete all templates"),
_("Do you really want to delete all the templates?"),
- _("_Cancel"), "edit-delete", NULL,
+ _("_Cancel"), _("D_elete"), NULL,
ALERTFOCUS_SECOND) == G_ALERTDEFAULT)
return;
diff --git a/src/ssl_manager.c b/src/ssl_manager.c
@@ -445,7 +445,7 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
val = alertpanel_full(_("Delete certificate"),
_("Do you really want to delete this certificate?"),
- _("_Cancel"), "edit-delete", NULL, ALERTFOCUS_FIRST,
+ _("_Cancel"), _("D_elete"), NULL, ALERTFOCUS_FIRST,
FALSE, NULL, ALERT_WARNING);
