mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2704_search_dialog_hotkeys' 

* 2704_search_dialog_hotkeys:
  Updated Russian translation
  Fixed hotkeys in 'Search' dialog in mcdiff viewer.
  Fixed hotkeys in 'Search' and 'Replace' dialogs in mcedit.
  Fixed hotkeys in 'Search' dialog in mcviewer.
  Ticket #2704: added hotkeys for search types.
This commit is contained in:
Andrew Borodin 2011-12-30 17:49:42 +03:00
parent 06c295b7e9 f204f7d4b7
commit 5d90c5d14e
5 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/search/search.c
View File

@ -46,10 +46,10 @@
/*** file scope variables ************************************************************************/
static const mc_search_type_str_t mc_search__list_types[] = {
{N_("Normal"), MC_SEARCH_T_NORMAL},
{N_("&Regular expression"), MC_SEARCH_T_REGEX},
{N_("Hexadecimal"), MC_SEARCH_T_HEX},
{N_("Wildcard search"), MC_SEARCH_T_GLOB},
{N_("&Normal"), 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},
{NULL, -1}
};

43
po/ru.po
View File

@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n"
"POT-Creation-Date: 2011-12-13 13:55+0300\n"
"PO-Revision-Date: 2011-12-13 14:05+0300\n"
"POT-Creation-Date: 2011-12-27 21:26+0300\n"
"PO-Revision-Date: 2011-12-27 21:29+0300\n"
"Last-Translator: Andrew Borodin <aborodin@vmail.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/mc/team/ru/)\n"
"MIME-Version: 1.0\n"
@ -124,17 +124,17 @@ msgstr "Неправильный шаблон цели %d"
msgid "Regular expression error"
msgstr "Ошибка в регулярном выражении"
msgid "Normal"
msgstr "Обычный"
msgid "&Normal"
msgstr "О&бычный"
msgid "&Regular expression"
msgid "Re&gular expression"
msgstr "&Регулярное выражение"
msgid "Hexadecimal"
msgstr "Шестнадцатеричный"
msgid "He&xadecimal"
msgstr "Шестнад&цатеричный"
msgid "Wildcard search"
msgstr "По шаблону"
msgid "Wil&dcard search"
msgstr "По &шаблону"
#, c-format
msgid ""
@ -585,6 +585,9 @@ msgstr "Редактировать файл"
msgid "Forces xterm features"
msgstr "Подразумевать свойства xterm"
msgid "Disable X11 support"
msgstr "Не использовать X11 для получения состояния модификаторов Alt, Ctrl, Shift."
msgid "Tries to use an old highlight mouse tracking"
msgstr "Пытаться использовать старый способ трэкинга мыши"
@ -746,8 +749,8 @@ msgstr ""
msgid "&Dismiss"
msgstr "&Закрыть"
msgid "All charsets"
msgstr "Все кодировки"
msgid "&All charsets"
msgstr "&Все кодировки"
msgid "&Whole words"
msgstr "&Слово целиком"
@ -755,8 +758,8 @@ msgstr "&Слово целиком"
msgid "&Backwards"
msgstr "&Назад"
msgid "Case &sensitive"
msgstr "Учет ре&гистра"
msgid "Cas&e sensitive"
msgstr "У&чёт регистра"
msgid "Enter search string:"
msgstr "Введите строку для поиска:"
@ -793,9 +796,6 @@ msgstr ""
"Невозможно создать временный файл слияния\n"
"%s"
msgid "&Normal"
msgstr "О&бычный"
msgid "&Fastest (Assume large files)"
msgstr "Б&ыстрый (для больших файлов)"
@ -1166,7 +1166,7 @@ msgstr ""
"Продолжение операции приведет к потере изменений"
msgid "In se&lection"
msgstr "В вы&деленном"
msgstr "В в&ыделенном"
msgid "Enter replacement string:"
msgstr "Введите текст для замены:"
@ -2501,27 +2501,18 @@ msgstr "Найден: %ld"
msgid "Malformed regular expression"
msgstr "Регулярное выражение сформировано неверно"
msgid "Cas&e sensitive"
msgstr "У&чёт регистра"
msgid "&Find recursively"
msgstr "Найти ре&курсивно"
msgid "S&kip hidden"
msgstr "Пропускать скр&ытые"
msgid "&All charsets"
msgstr "&Все кодировки"
msgid "Sea&rch for content"
msgstr "Поиск по содер&жимому"
msgid "Case sens&itive"
msgstr "Учёт ре&гистра"
msgid "Re&gular expression"
msgstr "&Регулярное выражение"
msgid "Fir&st hit"
msgstr "До первого в&хождения"

4
src/diffviewer/search.c
View File

@ -106,7 +106,7 @@ mcdiffview_dialog_search (WDiff * dview)
B_ENTER, NULL),
/* 2 */
#ifdef HAVE_CHARSET
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 8, SEARCH_DLG_HEIGHT, N_("All charsets"),
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 8, SEARCH_DLG_HEIGHT, N_("&All charsets"),
&mcdiffview_search_options.all_codepages),
#endif
@ -116,7 +116,7 @@ mcdiffview_dialog_search (WDiff * dview)
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 6, SEARCH_DLG_HEIGHT, N_("&Backwards"),
&mcdiffview_search_options.backwards),
/* 4 */
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT, N_("Case &sensitive"),
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT, N_("Cas&e sensitive"),
&mcdiffview_search_options.case_sens),
/* 5 */
QUICK_RADIO (3, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT,

8
src/editor/editcmd_dialogs.c
View File

@ -105,7 +105,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
/* 1 */ QUICK_BUTTON (2, 10, 13, REPLACE_DLG_HEIGHT, N_("&OK"), B_ENTER, NULL),
#ifdef HAVE_CHARSET
/* 2 */ QUICK_CHECKBOX (33, REPLACE_DLG_WIDTH, 11, REPLACE_DLG_HEIGHT,
N_("All charsets"),
N_("&All charsets"),
&edit_search_options.all_codepages),
#endif
/* 3 */ QUICK_CHECKBOX (33, REPLACE_DLG_WIDTH, 10, REPLACE_DLG_HEIGHT,
@ -117,7 +117,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha
/* 5 */ QUICK_CHECKBOX (33, REPLACE_DLG_WIDTH, 8, REPLACE_DLG_HEIGHT, N_("&Backwards"),
&edit_search_options.backwards),
/* 6 */ QUICK_CHECKBOX (33, REPLACE_DLG_WIDTH, 7, REPLACE_DLG_HEIGHT,
N_("Case &sensitive"),
N_("Cas&e sensitive"),
&edit_search_options.case_sens),
/* 7 */ QUICK_RADIO (3, REPLACE_DLG_WIDTH, 7, REPLACE_DLG_HEIGHT,
num_of_types, (const char **) list_of_types,
@ -177,7 +177,7 @@ editcmd_dialog_search_show (WEdit * edit)
QUICK_BUTTON (2, 10, 11, SEARCH_DLG_HEIGHT, N_("&OK"), B_ENTER, NULL),
#ifdef HAVE_CHARSET
/* 3 */
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 9, SEARCH_DLG_HEIGHT, N_("All charsets"),
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 9, SEARCH_DLG_HEIGHT, N_("&All charsets"),
&edit_search_options.all_codepages),
#endif
/* 4 */
@ -190,7 +190,7 @@ editcmd_dialog_search_show (WEdit * edit)
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 6, SEARCH_DLG_HEIGHT, N_("&Backwards"),
&edit_search_options.backwards),
/* 7 */
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT, N_("Case &sensitive"),
QUICK_CHECKBOX (33, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT, N_("Cas&e sensitive"),
&edit_search_options.case_sens),
/* 8 */
QUICK_RADIO (3, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT,

4
src/viewer/dialogs.c
View File

@ -92,14 +92,14 @@ mcview_dialog_search (mcview_t * view)
QUICK_BUTTON (2, 10, SEARCH_DLG_HEIGHT - 3, SEARCH_DLG_HEIGHT, N_("&OK"), B_ENTER, NULL),
#ifdef HAVE_CHARSET
QUICK_CHECKBOX (SEARCH_DLG_WIDTH / 2 + 3, SEARCH_DLG_WIDTH, 8, SEARCH_DLG_HEIGHT,
N_("All charsets"), &mcview_search_options.all_codepages),
N_("&All charsets"), &mcview_search_options.all_codepages),
#endif
QUICK_CHECKBOX (SEARCH_DLG_WIDTH / 2 + 3, SEARCH_DLG_WIDTH, 7, SEARCH_DLG_HEIGHT,
N_("&Whole words"), &mcview_search_options.whole_words),
QUICK_CHECKBOX (SEARCH_DLG_WIDTH / 2 + 3, SEARCH_DLG_WIDTH, 6, SEARCH_DLG_HEIGHT,
N_("&Backwards"), &mcview_search_options.backwards),
QUICK_CHECKBOX (SEARCH_DLG_WIDTH / 2 + 3, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT,
N_("Case &sensitive"), &mcview_search_options.case_sens),
N_("Cas&e sensitive"), &mcview_search_options.case_sens),
QUICK_RADIO (3, SEARCH_DLG_WIDTH, 5, SEARCH_DLG_HEIGHT,
num_of_types, (const char **) list_of_types,
(int *) &mcview_search_options.type),