mirror of
https://github.com/MidnightCommander/mc
synced 2025-04-03 13:42:53 +03:00
Merge branch '2843_search_hotkey_conflict' into 4.8.1-stable
* 2843_search_hotkey_conflict: Ticket #2842: change hotkey for Normal search mode.
This commit is contained in:
commit
62901bbce1
@ -47,7 +47,7 @@
|
|||||||
/*** file scope variables ************************************************************************/
|
/*** file scope variables ************************************************************************/
|
||||||
|
|
||||||
static const mc_search_type_str_t mc_search__list_types[] = {
|
static const mc_search_type_str_t mc_search__list_types[] = {
|
||||||
{N_("&Normal"), MC_SEARCH_T_NORMAL},
|
{N_("No&rmal"), MC_SEARCH_T_NORMAL},
|
||||||
{N_("Re&gular expression"), MC_SEARCH_T_REGEX},
|
{N_("Re&gular expression"), MC_SEARCH_T_REGEX},
|
||||||
{N_("He&xadecimal"), MC_SEARCH_T_HEX},
|
{N_("He&xadecimal"), MC_SEARCH_T_HEX},
|
||||||
{N_("Wil&dcard search"), MC_SEARCH_T_GLOB},
|
{N_("Wil&dcard search"), MC_SEARCH_T_GLOB},
|
||||||
|
@ -2404,7 +2404,7 @@ static void
|
|||||||
dview_diff_options (WDiff * dview)
|
dview_diff_options (WDiff * dview)
|
||||||
{
|
{
|
||||||
const char *quality_str[] = {
|
const char *quality_str[] = {
|
||||||
N_("&Normal"),
|
N_("No&rmal"),
|
||||||
N_("&Fastest (Assume large files)"),
|
N_("&Fastest (Assume large files)"),
|
||||||
N_("&Minimal (Find a smaller set of change)")
|
N_("&Minimal (Find a smaller set of change)")
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user