mutt stable branch with some hacks

Fix mark-message translation and keybind menu.

Move the OP_MARK_MESSAGE and hotkey macro from MENU_GENERIC to the
MENU_MAIN keymap. Putting the macro under generic prevents it from
overriding a keybinding in the index (even if the function is bound to
noop). Additionally, the macro can only be executed from the index,
so it doesn't make sense as a generic keybinding.

Use the term "hotkey" in both the OPS and km_bind description.

Mark the km_bind description translatable.

Add L10N messages for the new translation strings.

+13 -3
+1 -1
OPS
··· 131 131 OP_MAIN_TAG_PATTERN "tag messages matching a pattern" 132 132 OP_MAIN_UNDELETE_PATTERN "undelete messages matching a pattern" 133 133 OP_MAIN_UNTAG_PATTERN "untag messages matching a pattern" 134 - OP_MARK_MSG "create a hot-key macro for the current message" 134 + OP_MARK_MSG "create a hotkey macro for the current message" 135 135 OP_MIDDLE_PAGE "move to the middle of the page" 136 136 OP_NEXT_ENTRY "move to the next entry" 137 137 OP_NEXT_LINE "scroll down one line"
+11 -1
curs_main.c
··· 2215 2215 char buf[128]; 2216 2216 2217 2217 buf[0] = '\0'; 2218 + /* L10N: This is the prompt for <mark-message>. Whatever they 2219 + enter will be prefixed by $mark_macro_prefix and will become 2220 + a macro hotkey to jump to the currently selected message. */ 2218 2221 if (!mutt_get_field (_("Enter macro stroke: "), buf, sizeof(buf), 2219 2222 MUTT_CLEAR) && buf[0]) 2220 2223 { 2221 2224 snprintf(str, sizeof(str), "%s%s", MarkMacroPrefix, buf); 2222 2225 snprintf(macro, sizeof(macro), 2223 2226 "<search>~i \"%s\"\n", CURHDR->env->message_id); 2224 - km_bind(str, MENU_GENERIC, OP_MACRO, macro, "Message hotkey"); 2227 + /* L10N: "message hotkey" is the key bindings menu description of a 2228 + macro created by <mark-message>. */ 2229 + km_bind(str, MENU_MAIN, OP_MACRO, macro, _("message hotkey")); 2225 2230 2231 + /* L10N: This is echoed after <mark-message> creates a new hotkey 2232 + macro. %s is the hotkey string ($mark_macro_prefix followed 2233 + by whatever they typed at the prompt.) */ 2226 2234 snprintf(buf, sizeof(buf), _("Message bound to %s."), str); 2227 2235 mutt_message(buf); 2228 2236 dprint (1, (debugfile, "Mark: %s => %s\n", str, macro)); 2229 2237 } 2230 2238 } 2231 2239 else 2240 + /* L10N: This error is printed if <mark-message> cannot find a 2241 + Message-ID for the currently selected message in the index. */ 2232 2242 mutt_error _("No message ID to macro."); 2233 2243 break; 2234 2244
+1 -1
functions.h
··· 65 65 { "previous-line", OP_PREV_LINE, "<" }, 66 66 { "half-up", OP_HALF_UP, "[" }, 67 67 { "half-down", OP_HALF_DOWN, "]" }, 68 - { "mark-message", OP_MARK_MSG, "~" }, 69 68 { "help", OP_HELP, "?" }, 70 69 { "tag-prefix", OP_TAG_PREFIX, ";" }, 71 70 { "tag-prefix-cond", OP_TAG_PREFIX_COND, NULL }, ··· 150 149 { "set-flag", OP_MAIN_SET_FLAG, "w" }, 151 150 { "clear-flag", OP_MAIN_CLEAR_FLAG, "W" }, 152 151 { "display-message", OP_DISPLAY_MESSAGE, MUTT_ENTER_S }, 152 + { "mark-message", OP_MARK_MSG, "~" }, 153 153 { "buffy-list", OP_BUFFY_LIST, "." }, 154 154 { "sync-mailbox", OP_MAIN_SYNC_FOLDER, "$" }, 155 155 { "display-address", OP_DISPLAY_ADDRESS, "@" },