From a395218ffbb0444c6f992388f45e30ee1f990570 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 27 Dec 2011 21:03:43 +0300 Subject: [PATCH 1/5] Ticket #2704: added hotkeys for search types. Signed-off-by: Andrew Borodin --- lib/search/search.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/search/search.c b/lib/search/search.c index 3f70dbad9..853396722 100644 --- a/lib/search/search.c +++ b/lib/search/search.c @@ -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} }; From 407b57a0b2aff3c273785bae3fa7c4848cf66ed4 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 27 Dec 2011 21:08:39 +0300 Subject: [PATCH 2/5] Fixed hotkeys in 'Search' dialog in mcviewer. Signed-off-by: Andrew Borodin --- src/viewer/dialogs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c index 0742b7a0a..0d697c8b4 100644 --- a/src/viewer/dialogs.c +++ b/src/viewer/dialogs.c @@ -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), From 301e41b3e53db7e1c87529e8b7572dd46315d754 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 27 Dec 2011 21:10:45 +0300 Subject: [PATCH 3/5] Fixed hotkeys in 'Search' and 'Replace' dialogs in mcedit. Signed-off-by: Andrew Borodin --- src/editor/editcmd_dialogs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c index fe1ebde17..a92309ec0 100644 --- a/src/editor/editcmd_dialogs.c +++ b/src/editor/editcmd_dialogs.c @@ -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, From 0aa81e22adc29a48264cfa7d67d825194a8d21c8 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 27 Dec 2011 21:12:03 +0300 Subject: [PATCH 4/5] Fixed hotkeys in 'Search' dialog in mcdiff viewer. Signed-off-by: Andrew Borodin --- src/diffviewer/search.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffviewer/search.c b/src/diffviewer/search.c index d257adfba..7b89af792 100644 --- a/src/diffviewer/search.c +++ b/src/diffviewer/search.c @@ -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, From f204f7d4b754a1b5fd542cc3bf64657aaf1718cc Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 27 Dec 2011 21:31:22 +0300 Subject: [PATCH 5/5] Updated Russian translation Signed-off-by: Andrew Borodin --- po/ru.po | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index 07e7d284c..36a904068 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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 \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 "До первого в&хождения"