{N_("/_File/_Import mbox file..."), NULL, import_mbox_cb, 0, NULL},
{N_("/_File/_Export to mbox file..."), NULL, export_mbox_cb, 0, NULL},
{N_("/_File/Empty _trash"), "<shift>D", empty_trash_cb, 0, NULL},
- {N_("/_File/_Gather addresses..."), NULL, addr_gather_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
{N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
{N_("/_Message/_Copy..."), "<shift><control>O", copy_to_cb, 0, NULL},
{N_("/_Message/_Delete"), "<control>D", delete_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Delete du_plicated messages"),
- NULL, delete_duplicated_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Mark/_Mark"), NULL, mark_cb, 0, NULL},
+ {N_("/_Message/_Mark/_Mark"), "<shift>asterisk", mark_cb, 0, NULL},
{N_("/_Message/_Mark/_Unmark"), "U", unmark_cb, 0, NULL},
{N_("/_Message/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
+ {N_("/_Message/_Mark/Mark as unr_ead"), "<shift>exclam", mark_as_unread_cb, 0, NULL},
{N_("/_Message/_Mark/Mark as rea_d"),
NULL, mark_as_read_cb, 0, NULL},
{N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
- {N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/_Address book"), "<shift><control>A", addressbook_open_cb, 0, NULL},
- {N_("/_Tool/Add sender to address boo_k"),
+ {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Selective download..."), "<alt>S", sel_download_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/_Address book..."), "<shift><control>A", addressbook_open_cb, 0, NULL},
+ {N_("/_Tools/Add sender to address boo_k"),
NULL, add_address_cb, 0, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/_Filter messages"), NULL, filter_cb, 0, NULL},
- {N_("/_Tool/_Create filter rule"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/_Create filter rule/_Automatically"),
+ {N_("/_Tools/_Gather addresses..."), NULL, addr_gather_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/_Filter messages"), NULL, filter_cb, 0, NULL},
+ {N_("/_Tools/_Create filter rule"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Create filter rule/_Automatically"),
NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
- {N_("/_Tool/_Create filter rule/by _From"),
+ {N_("/_Tools/_Create filter rule/by _From"),
NULL, create_filter_cb, FILTER_BY_FROM, NULL},
- {N_("/_Tool/_Create filter rule/by _To"),
+ {N_("/_Tools/_Create filter rule/by _To"),
NULL, create_filter_cb, FILTER_BY_TO, NULL},
- {N_("/_Tool/_Create filter rule/by _Subject"),
+ {N_("/_Tools/_Create filter rule/by _Subject"),
NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/Actio_ns"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/E_xecute"), "X", execute_summary_cb, 0, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
- {N_("/_Tool/_Selective Download"), "<alt>S", sel_download_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/E_xecute"), "X", execute_summary_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Delete du_plicated messages"),
+ NULL, delete_duplicated_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
{N_("/_Configuration"), NULL, NULL, 0, "<Branch>"},
{N_("/_Configuration/_Common preferences..."),
NULL, prefs_common_open_cb, 0, NULL},
{N_("/_Configuration/_Filter setting..."),
NULL, prefs_filter_open_cb, 0, NULL},
- {N_("/_Configuration/_Scoring ..."),
+ {N_("/_Configuration/_Scoring..."),
NULL, prefs_scoring_open_cb, 0, NULL},
- {N_("/_Configuration/_Filtering ..."),
+ {N_("/_Configuration/_Filtering..."),
NULL, prefs_filtering_open_cb, 0, NULL},
{N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL},
{N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL},
{"/File/Import mbox file..." , M_UNLOCKED},
{"/File/Export to mbox file...", M_UNLOCKED},
{"/File/Empty trash" , M_UNLOCKED},
- {"/File/Gather addresses...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/File/Print..." , M_TARGET_EXIST|M_UNLOCKED},
/* {"/File/Close", M_UNLOCKED}, */
{"/Message/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Message/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Message/Mark" , M_TARGET_EXIST},
- {"/Message/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
- {"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
- {"/Tool/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Tool/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
- {"/Tool/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Tool/Actions" , M_MSG_EXIST},
+ {"/Tools/Selective download" , M_HAVE_ACCOUNT|M_UNLOCKED},
+ {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+ {"/Tools/Gather addresses..." , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/Tools/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Tools/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/Tools/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Tools/Actions" , M_MSG_EXIST},
+ {"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+
{"/Configuration", M_UNLOCKED},
{NULL, 0}
{
GList *list;
- if (procmsg_send_queue() < 0)
+ if (procmsg_send_queue(prefs_common.savemsg) < 0)
alertpanel_error(_("Some errors occurred while sending queued messages."));
statusbar_pop_all();
projects / claws.git / blobdiff