Merge branch '2843_search_hotkey_conflict'

* 2843_search_hotkey_conflict:
  Ticket #2842: change hotkey for Normal search mode.
This commit is contained in:
Andrew Borodin 2012-07-10 20:59:21 +04:00
commit 54b2b2fe67
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@
/*** file scope variables ************************************************************************/
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_("He&xadecimal"), MC_SEARCH_T_HEX},
{N_("Wil&dcard search"), MC_SEARCH_T_GLOB},

View File

@ -2404,7 +2404,7 @@ static void
dview_diff_options (WDiff * dview)
{
const char *quality_str[] = {
N_("&Normal"),
N_("No&rmal"),
N_("&Fastest (Assume large files)"),
N_("&Minimal (Find a smaller set of change)")
};