From 1c2804d90fac997af7d98f72214ee327533993ec Mon Sep 17 00:00:00 2001 From: Oleksandr Natalenko Date: Thu, 18 Mar 2010 20:12:17 +0000 Subject: [PATCH 01/14] l10n: Updates to Ukrainian (uk) translation Transmitted-via: Transifex (www.transifex.net) --- po/uk.po | 113 +++++++++++++++++-------------------------------------- 1 file changed, 34 insertions(+), 79 deletions(-) diff --git a/po/uk.po b/po/uk.po index 91a202331..f28920faf 100644 --- a/po/uk.po +++ b/po/uk.po @@ -168,9 +168,8 @@ msgstr "Додатковий /" msgid "* on keypad" msgstr "Додаткова *" -#, fuzzy msgid "Escape key" -msgstr "Додатковий /" +msgstr "Клавіша Escape" msgid "Left arrow keypad" msgstr "Дод. стрілка вліво" @@ -430,9 +429,9 @@ msgid "Inconsistent extfs archive" msgstr "Неузгоджений архів extfs" # , c-format -#, fuzzy, c-format +#, c-format msgid "Warning: cannot open %s directory\n" -msgstr "Не вдалося створити каталог %s" +msgstr "Попередження: не вдалося відкрити каталог %s\n" #, c-format msgid "fish: Disconnecting from %s" @@ -928,7 +927,6 @@ msgid "Show mc with specified skin" msgstr "Показувати mc із обраним скіном" #. TRANSLATORS: don't translate keywords and names of colors -#, fuzzy msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -945,17 +943,15 @@ msgid "" msgstr "" "--colors КЛЮЧ={ТЕКСТ},{ФОН}\n" "\n" -"{ТЕКСТ} і {ФОН} можна опустити, тоді буде використано значення за " -"змовчуванням\n" +"{ТЕКСТ} і {ФОН} можна опустити, тоді буде використано значення за змовчуванням\n" "\n" "Ключі:\n" " Глобальні: errors, reverse, gauge, input, viewunderline\n" " Показ файлів: normal, selected, marked, markselect\n" " Діалоги: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" " errdhotfocus\n" -" Меню: menu, menuhot, menusel, menuhotsel\n" -" Довідка: helpnormal, helpitalic, helplink, helpslink\n" -" Редактор: editnormal, editbold, editmarked, editwhitespace,\n" +" Меню: menu, menuhot, menusel, menuhotsel, menuinactive\n" +" Редактор: editnormal, editbold, editmarked, editwhitespace,\n" " editlinestate\n" #. TRANSLATORS: don't translate keywords and names of colors @@ -1059,35 +1055,29 @@ msgstr "Виконувані першими" msgid "Sort order" msgstr "Порядок сортування" -#, fuzzy msgid "Confirmation" -msgstr " Запит підтвердження " +msgstr "Підтвердження" -#. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix +#. TRANSLATORS: no need to translate 'Confirmation', it's just a context +#. prefix #. 2 -#, fuzzy msgid "Confirmation|&History cleanup" -msgstr " Запит підтвердження " +msgstr "Підтвердження|Очистка історії" -#, fuzzy msgid "Confirmation|&Directory hotlist delete" -msgstr " підтверджувати видалення гарячого списку каталогів " +msgstr "Підтвердження|Видалення гарячого списку каталогів" -#, fuzzy msgid "Confirmation|E&xit" -msgstr " Запит підтвердження " +msgstr "Підтвердження|Вихід" -#, fuzzy msgid "Confirmation|&Execute" -msgstr " Запит підтвердження " +msgstr "Підтвердження|Виконання" -#, fuzzy msgid "Confirmation|O&verwrite" -msgstr " перед пе&резаписом" +msgstr "Підтвердження|Перезапис" -#, fuzzy msgid "Confirmation|&Delete" -msgstr " Запит підтвердження " +msgstr "Підтвердження|Видалення" msgid "UTF-8 output" msgstr "Вивід UTF-8" @@ -1883,44 +1873,36 @@ msgstr "&Вийти" msgid "&Undo" msgstr "Відкотити" -#, fuzzy msgid "&Toggle ins/overw" msgstr "&Режим вставки/заміни" -#, fuzzy msgid "To&ggle mark" msgstr "Перемкнути помічання" msgid "&Mark columns" msgstr "Помітити стовпці" -#, fuzzy msgid "Mark &all" -msgstr "Вст. пом&iч." +msgstr "Помітити все" msgid "Unmar&k" -msgstr "" +msgstr "Зняти помітку" -#, fuzzy msgid "Cop&y" msgstr "Копіювати" -#, fuzzy msgid "Mo&ve" msgstr "Перенести" msgid "&Delete" msgstr "&Видалити" -#, fuzzy msgid "Co&py to clipfile" msgstr "Копіювати до буферного файлу" -#, fuzzy msgid "&Cut to clipfile" msgstr "Вирізати до буферного файлу" -#, fuzzy msgid "Pa&ste from clipfile" msgstr "Вставити із буферного файлу" @@ -1939,7 +1921,6 @@ msgstr "Шукати &знову" msgid "&Replace..." msgstr "&Замінити…" -#, fuzzy msgid "&Toggle bookmark" msgstr "Перемкнути закладку" @@ -2195,26 +2176,16 @@ msgid " %s%s file error" msgstr "%s%s помилка файлу " #, c-format -msgid "" -"The format of the %smc.ext file has changed with version 3.0. It seems that " -"the installation failed. Please fetch a fresh copy from the Midnight " -"Commander package." -msgstr "" -"Формат файлу %smc.ext було змінено у версіі 3.0. Схоже що стався збій при " -"встановленні.Будь ласка візьміть свіжу копію з пакета Midnight Commander." +msgid "The format of the %smc.ext file has changed with version 3.0. It seems that the installation failed. Please fetch a fresh copy from the Midnight Commander package." +msgstr "Формат файлу %smc.ext було змінено у версіі 3.0. Схоже що стався збій при встановленні.Будь ласка візьміть свіжу копію з пакета Midnight Commander." #, c-format msgid " ~/%s file error " msgstr " помилка файлу ~/%s" #, c-format -msgid "" -"The format of the ~/%s file has changed with version 3.0. You may either " -"want to copy it from %smc.ext or use that file as an example of how to write " -"it." -msgstr "" -"Формат файлу %smc.ext було змінено у версіі 3.0. Ви можете зкопіювати його з " -"%smc.ext чи зкористуватися ним як зразком та написати свій." +msgid "The format of the ~/%s file has changed with version 3.0. You may either want to copy it from %smc.ext or use that file as an example of how to write it." +msgstr "Формат файлу %smc.ext було змінено у версіі 3.0. Ви можете зкопіювати його з %smc.ext чи зкористуватися ним як зразком та написати свій." msgid "DialogTitle|Copy" msgstr "Заголовок діалогу|Копіювання" @@ -2241,8 +2212,7 @@ msgid "" "\n" " Option Stable Symlinks will be disabled " msgstr "" -"Неможливо створити стійкі симв. посилання через не локальні файлові " -"системи:\n" +"Неможливо створити стійкі симв. посилання через не локальні файлові системи:\n" "\n" " Параметр Стійкі символьні посилання буде заборонено " @@ -2890,10 +2860,8 @@ msgstr " Завантаження довідника " # , c-format #, c-format -msgid "" -"MC was unable to write ~/%s file, your old hotlist entries were not deleted" -msgstr "" -"MC не зміг записати файл ~/%s, Ваш старий список елементів не був видалений" +msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted" +msgstr "MC не зміг записати файл ~/%s, Ваш старий список елементів не був видалений" #, c-format msgid "Midnight Commander %s" @@ -3391,8 +3359,7 @@ msgid " Enter command label: " msgstr " Введіть мітку команди: " msgid " Cannot run external panelize in a non-local directory " -msgstr "" -" Не можу виконати цю команду, коли знаходжуся не у локальному каталозі " +msgstr " Не можу виконати цю команду, коли знаходжуся не у локальному каталозі " msgid "Find rejects after patching" msgstr "Знайти коректури, відкинуті командою patch" @@ -3738,14 +3705,13 @@ msgid "Pe&rcents" msgstr "" msgid "&Decimal offset" -msgstr "" +msgstr "Десятковий зсув" -#, fuzzy msgid "He&xadecimal offset" -msgstr "Шістнадцятковий" +msgstr "Шістнадцятковий зсув" msgid "Goto" -msgstr "" +msgstr "Йти до" msgid "ButtonBar|Ascii" msgstr "Нижня панель|Ascii" @@ -3817,23 +3783,21 @@ msgstr " Не вдається показати: не звичайний фай msgid "Seeking to search result" msgstr "Перехід до результату пошуку" -#, fuzzy msgid "Search done" -msgstr "Пошук" +msgstr "Пошук завершено" msgid "Continue from begining?" -msgstr "" +msgstr "Почати спочатку?" msgid " History " msgstr "Історія команд" #. TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix -#, fuzzy msgid "DialogTitle|History cleanup" -msgstr "Заголовок діалогу|Копіювання" +msgstr "Заголовок діалогу|Очистка історії" msgid "Do you want clean this history?" -msgstr "" +msgstr "Ви дійсно хочете очистити цю історію?" msgid "Background process:" msgstr "Фоновий процес:" @@ -3856,7 +3820,6 @@ msgstr "Фоновий процес:" #~ msgid " confirm &Delete " #~ msgstr " перед &видаленням" -# , c-format, c-format #~ msgid "" #~ " The current line number is %lld.\n" #~ " Enter the new line number:" @@ -3864,7 +3827,6 @@ msgstr "Фоновий процес:" #~ " Номер поточного рядка %lld.\n" #~ " Введіть номер нового рядка:" -# , c-format, c-format #~ msgid "" #~ " The current address is %s.\n" #~ " Enter the new address:" @@ -3964,7 +3926,6 @@ msgstr "Фоновий процес:" #~ msgid "&Delete F8" #~ msgstr "&Видалити F8" -#, fuzzy #~ msgid "&Next bookmark M-j" #~ msgstr "Наступна закладка " @@ -4007,7 +3968,6 @@ msgstr "Фоновий процес:" #~ msgid "&Go to line... M-l" #~ msgstr "&Перейти на рядок M-l" -#, fuzzy #~ msgid "Encod&ing... M-e" #~ msgstr "Кодування... C-t" @@ -4188,11 +4148,9 @@ msgstr "Фоновий процес:" #~ msgid "Menu" #~ msgstr "Меню" -#, fuzzy #~ msgid "n" #~ msgstr "На" -#, fuzzy #~ msgid "Extension" #~ msgstr "Розширення:" @@ -4319,11 +4277,8 @@ msgstr "Фоновий процес:" #~ msgid " Enter replacement argument order eg. 3,2,1,4 " #~ msgstr " Введіть порядок аргументів заміни, напр. 3,2,1,4 " -#~ msgid "" -#~ " Invalid regular expression, or scanf expression with too many " -#~ "conversions " -#~ msgstr "" -#~ " Неправильний регулярний вираз або у scanf-форматі багато перетворень" +#~ msgid " Invalid regular expression, or scanf expression with too many conversions " +#~ msgstr " Неправильний регулярний вираз або у scanf-форматі багато перетворень" #~ msgid " Error in replacement format string. " #~ msgstr " Помилка у форматі стрічки заміни " From 7e7234915225e7e5a5c88258cfd6ba501478e673 Mon Sep 17 00:00:00 2001 From: Oleksandr Natalenko Date: Thu, 18 Mar 2010 20:14:27 +0000 Subject: [PATCH 02/14] l10n: Updates to Ukrainian (uk) translation Transmitted-via: Transifex (www.transifex.net) --- po/uk.po | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/po/uk.po b/po/uk.po index f28920faf..8424e50d1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.0\n" msgid " Search string not found " msgstr " Така стрічка не знайдена " @@ -1927,7 +1927,6 @@ msgstr "Перемкнути закладку" msgid "&Next bookmark" msgstr "Наступна закладка" -#, fuzzy msgid "&Prev bookmark" msgstr "Попередня закладка" @@ -1937,22 +1936,18 @@ msgstr "Скинути закладки" msgid "&Go to line..." msgstr "Перейти на рядок…" -#, fuzzy msgid "&Toggle line state" msgstr "Перемкнути стан рядка" msgid "Go to matching &bracket" msgstr "Перейти до парної &дужки" -#, fuzzy msgid "&Find declaration" msgstr "Знайти об’явлення" -#, fuzzy msgid "Back from &declaration" msgstr "Повернутися з об’явлення" -#, fuzzy msgid "For&ward to declaration" msgstr "Перейти до об’явлення" @@ -1965,7 +1960,6 @@ msgstr "Пере&малювати екран" msgid "&Start record macro" msgstr "&Розпочати запис макросу" -#, fuzzy msgid "Finis&h record macro..." msgstr "&Завершити запис макросу…" @@ -1987,19 +1981,15 @@ msgstr "Вставити &літерал…" msgid "Insert &date/time" msgstr "Вставити &дату/час" -#, fuzzy msgid "&Format paragraph" msgstr "Форматувати &абзац" -#, fuzzy msgid "&Sort..." msgstr "Сортувати…" -#, fuzzy msgid "&Paste output of..." msgstr "Вставити вивід…" -#, fuzzy msgid "&External formatter" msgstr "З&овнішня програма форматування" @@ -2552,13 +2542,13 @@ msgstr " Видалення: " msgid "Non&e" msgstr "Ж&oдного" -#, fuzzy, c-format +#, c-format msgid "%d:%02d.%02d" -msgstr "ОЧЗ %d:%02d.%02d" +msgstr "%d:%02d.%02d" #, c-format msgid "ETA %s" -msgstr "" +msgstr "ОЧЗ %s" #, c-format msgid "%.2f MB/s" @@ -2574,15 +2564,15 @@ msgstr "%ld Б/с" #, c-format msgid "Files processed: %llu of %llu" -msgstr "" +msgstr "Файлів оброблено: %llu із %llu" -#, fuzzy, c-format +#, c-format msgid "Time: %s %s (%s)" -msgstr "Розмір: %s" +msgstr "Час: %s %s (%s)" #, c-format msgid " Total: %s of %s " -msgstr "" +msgstr "Усього: %s of %s" msgid "Source" msgstr "Джерело" @@ -3406,13 +3396,11 @@ msgstr "За &назвою" #. TRANSLATORS: one single character to represent 'version' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix -#, fuzzy msgid "sort|v" -msgstr "сортування|u" +msgstr "сортування|v" -#, fuzzy msgid "&Version" -msgstr "Права" +msgstr "Версія" #. TRANSLATORS: one single character to represent 'extension' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3688,9 +3676,8 @@ msgstr " Не знайдено записів, які підходять, у %s msgid " User menu " msgstr " Меню користувача " -#, fuzzy msgid "Invalid value" -msgstr "невірне число" +msgstr "Невірне значення" msgid " Cannot spawn child process " msgstr " Не вдається створити процес-нащадок " @@ -3699,10 +3686,10 @@ msgid "Empty output from child filter" msgstr "Фільтр-нащадок не повернув даних" msgid "&Line number (decimal)" -msgstr "" +msgstr "Номер рядка (десяткове число)" msgid "Pe&rcents" -msgstr "" +msgstr "Відсотки" msgid "&Decimal offset" msgstr "Десятковий зсув" From 0400e92fc5bcc6fd0e287505d8ac82ff706a79e2 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Tue, 16 Mar 2010 22:38:12 +0000 Subject: [PATCH 03/14] Ticket #2022 (case sensitive quick search) added new option quick_search_case_sensitive, with 3 position are: 0, 1, 2. if "0", quick search in case insensitive if "1", quick search in case sensitive if "2", get from panel "case_sensitive" Signed-off-by: Ilia Maslakov Signed-off-by: Slava Zanko --- src/main.h | 2 ++ src/screen.c | 22 ++++++++++++++++++++-- src/setup.c | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main.h b/src/main.h index 3ad59c1fc..492dae765 100644 --- a/src/main.h +++ b/src/main.h @@ -44,6 +44,8 @@ extern int mouse_move_pages; extern int option_tab_spacing; +extern int quick_search_case_sensitive; + #ifdef HAVE_CHARSET extern int source_codepage; extern int default_source_codepage; diff --git a/src/screen.c b/src/screen.c index e158312c4..7b2afaa44 100644 --- a/src/screen.c +++ b/src/screen.c @@ -89,6 +89,14 @@ typedef struct format_e const char *id; } format_e; +enum { + QSEARCH_CASE_INSENSITIVE = 0, /* quick search in case insensitive mode */ + QSEARCH_CASE_SENSITIVE = 1, /* quick search in case sensitive mode */ + QSEARCH_PANEL_CASE = 2 /* quick search get value from panel case_sensitive */ +}; + +int quick_search_case_sensitive = QSEARCH_PANEL_CASE; + /* If true, show the mini-info on the panel */ int show_mini_info = 1; @@ -2403,8 +2411,18 @@ do_search (WPanel * panel, int c_code) search = mc_search_new (esc_str, -1); search->search_type = MC_SEARCH_T_GLOB; search->is_entire_line = TRUE; - search->is_case_sentitive = 0; - + switch (quick_search_case_sensitive) + { + case QSEARCH_CASE_SENSITIVE: + search->is_case_sentitive = TRUE; + break; + case QSEARCH_CASE_INSENSITIVE: + search->is_case_sentitive = FALSE; + break; + default: + search->is_case_sentitive = panel->case_sensitive; + break; + } sel = panel->selected; for (i = panel->selected; !wrapped || i != panel->selected; i++) { diff --git a/src/setup.c b/src/setup.c index 78dfb1b65..6e5ee6d2f 100644 --- a/src/setup.c +++ b/src/setup.c @@ -232,6 +232,7 @@ static const struct { { "reverse_files_only", &reverse_files_only }, { "copymove_persistent_attr", &setup_copymove_persistent_attr }, { "select_flags", &select_flags }, + { "quick_search_case_sensitive", &quick_search_case_sensitive }, { 0, 0 } }; /* *INDENT-ON* */ From 334416e1a23762ac3d6e80c9e083d9191670f74a Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 17 Mar 2010 14:53:12 +0000 Subject: [PATCH 04/14] Added description of Quick search modes. Signed-off-by: Andrew Borodin --- doc/man/mc.1.in | 9 +++++++++ doc/man/ru/mc.1.in | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index 970efeb7c..dfdd89861 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -595,6 +595,15 @@ again, the next match is searched for. .P Besides the filename characters, you can also use wildcard characters '*' and '?'. +.P +Quick search mode is defined by +.I quick_search_case_sensitive +option located in [Midnight-Commander] section in configuration file. +This option can have one of the following values: 0, 1 or 2. +If quick_search_case_sensitive=0, quick search is case insensitive. +If quick_search_case_sensitive=1, quick search is case sensitive. +If quick_search_case_sensitive=2 (default value), quick search mode +is matched to the the panel sort order: case sensitive or not. .\"NODE " Shell Command Line" .SH " Shell Command Line" This section lists keys which are useful to avoid excessive typing when diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 42f501c81..b3d166c54 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -597,6 +597,16 @@ Midnight Commander\-а. Для возврата к вашему приложен .P Кроме обычных символов в имени файла также можно использовать символы маски '*' и '?'. +.P +Режим быстрого поиска определяется параметром +.I quick_search_case_sensitive +который должен располагаться в секции [Midnight-Commander] конфигурационного +файла. Этот параметр может иметь одно из следующих значений: 0, 1 или 2. +Если quick_search_case_sensitive=0, при быстром поиске не учитывается +регистр имён файлов. Если quick_search_case_sensitive=1, регистр имён файлов +учитывается. Если quick_search_case_sensitive=2 (значение по умолчанию), +режим быстрого поиска соответствует порядку сортировки в панели: с учётом +регистра или без. .\"NODE " Shell Command Line" .SH " Командная строка оболочки" В этом разделе перечислены команды, которые позволяют сократить число From 14fce3b91e44d8ac57013a64ec8263a23b4c2ff4 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Fri, 12 Mar 2010 11:49:49 +0000 Subject: [PATCH 05/14] Ticket #2093: fixed mouse events handling in file panel. Dont handle wheel events on 2nd line where sort indicator and column header are located. Type accuracy. Signed-off-by: Andrew Borodin --- src/screen.c | 86 ++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/src/screen.c b/src/screen.c index 7b2afaa44..2b1e538a8 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3210,60 +3210,68 @@ mouse_sort_col (Gpm_Event * event, WPanel * panel) /* * Mouse callback of the panel minus repainting. - * If the event is redirected to the menu, *redir is set to 1. + * If the event is redirected to the menu, *redir is set to TRUE. */ static int -do_panel_event (Gpm_Event * event, WPanel * panel, int *redir) +do_panel_event (Gpm_Event * event, WPanel * panel, gboolean *redir) { const int lines = llines (panel); const gboolean is_active = dlg_widget_active (panel); const gboolean mouse_down = (event->type & GPM_DOWN) != 0; - /* "." button show/hide hidden files */ - if (event->type & GPM_DOWN && event->x == panel->widget.cols - 5 && event->y == 1) + *redir = FALSE; + + /* 1st line */ + if (mouse_down && event->y == 1) { - toggle_show_hidden (); - repaint_screen (); + /* "<" button */ + if (event->x == 2) + { + directory_history_prev (panel); + return MOU_NORMAL; + } + + /* "." button show/hide hidden files */ + if (event->x == panel->widget.cols - 5) + { + toggle_show_hidden (); + repaint_screen (); + return MOU_NORMAL; + } + + /* ">" button */ + if (event->x == panel->widget.cols - 1) + { + directory_history_next (panel); + return MOU_NORMAL; + } + + /* "^" button */ + if (event->x >= panel->widget.cols - 4 && event->x <= panel->widget.cols - 2) + { + directory_history_list (panel); + return MOU_NORMAL; + } + + /* rest of the upper frame, the menu is invisible - call menu */ + if (!menubar_visible) + { + *redir = TRUE; + event->x += panel->widget.x; + return the_menubar->widget.mouse (event, the_menubar); + } + + /* no other events on 1st line */ return MOU_NORMAL; } - /* "<" button */ - if (mouse_down && event->y == 1 && event->x == 2) - { - directory_history_prev (panel); - return MOU_NORMAL; - } - - /* ">" button */ - if (mouse_down && event->y == 1 && event->x == panel->widget.cols - 1) - { - directory_history_next (panel); - return MOU_NORMAL; - } - - /* "^" button */ - if (mouse_down && event->y == 1 && event->x >= panel->widget.cols - 4 - && event->x <= panel->widget.cols - 2) - { - directory_history_list (panel); - return MOU_NORMAL; - } - - /* sort on clicked column */ - if (event->type & GPM_DOWN && event->y == 2) + /* sort on clicked column; don't handle wheel events */ + if (mouse_down && (event->buttons & (GPM_B_UP | GPM_B_DOWN)) == 0 && event->y == 2) { mouse_sort_col (event, panel); return MOU_NORMAL; } - /* rest of the upper frame, the menu is invisible - call menu */ - if (mouse_down && event->y == 1 && !menubar_visible) - { - *redir = 1; - event->x += panel->widget.x; - return the_menubar->widget.mouse (event, the_menubar); - } - /* Mouse wheel events */ if (mouse_down && (event->buttons & GPM_B_UP)) { @@ -3348,7 +3356,7 @@ panel_event (Gpm_Event * event, void *data) { WPanel *panel = data; int ret; - int redir = MOU_NORMAL; + gboolean redir; ret = do_panel_event (event, panel, &redir); if (!redir) From 7e427c2cfafc7b642afa3f2d5d875723d48ec5d5 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Thu, 18 Mar 2010 16:58:33 +0300 Subject: [PATCH 06/14] Ticket #2114: Don't treat files ending with a dot as gzip. Signed-off-by: Andrew Borodin --- misc/mc.ext.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/mc.ext.in b/misc/mc.ext.in index 4860c9562..bc174a4da 100644 --- a/misc/mc.ext.in +++ b/misc/mc.ext.in @@ -622,7 +622,7 @@ type/^gzip Open=gzip -dc %f | %var{PAGER:more} View=%view{ascii} gzip -dc %f 2>/dev/null -regex/\.(gz|Z)?$ +regex/\.(gz|Z)$ View=%view{ascii} gzip -dc %f 2>/dev/null # bzip2 From 5610bfbb6c541eb135b5baaa985f3bd74684e3c5 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Wed, 17 Mar 2010 11:23:55 +0200 Subject: [PATCH 07/14] Ticket #2091: Superfluous "Search done, Continue from begining?" dialog When searching from the top of the file for something that's not there we get "Search done, Continue from begining?" dialog before "Search string not found" (and only if we choose "Yes" in the first one). This should happen only if the last position>0 (either the place when search began, or some match before). Signed-off-by: Slava Zanko --- src/viewer/search.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewer/search.c b/src/viewer/search.c index 8773fc01a..fd1fd642b 100644 --- a/src/viewer/search.c +++ b/src/viewer/search.c @@ -277,7 +277,7 @@ mcview_do_search (mcview_t * view) } while (mcview_may_still_grow (view)); - if (!isFound && need_search_again && !mcview_search_options.backwards) + if (view->search_start != 0 && !isFound && need_search_again && !mcview_search_options.backwards) { int result; mcview_update (view); From fc3c32f66e619866d0e219fc988a7e326969b3fb Mon Sep 17 00:00:00 2001 From: Francesco Cosoleto Date: Tue, 16 Feb 2010 02:53:55 +0100 Subject: [PATCH 08/14] Ticket #2056: Don't propose ".." as a dirname. Don't propose ".." as a dirname using mkdir command with automatic name filling enabled. Signed-off-by: Francesco Cosoleto Signed-off-by: Andrew Borodin --- src/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd.c b/src/cmd.c index a8587e945..5adf60090 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -407,7 +407,7 @@ mkdir_cmd (void) const char *name = ""; /* If 'on' then automatically fills name with current selected item name */ - if (auto_fill_mkdir_name) + if (auto_fill_mkdir_name && strcmp (selection (current_panel)->fname, "..") != 0) name = selection (current_panel)->fname; dir = From 4f8a7755f161e8ebe99f5d42852ff86c633bf6c9 Mon Sep 17 00:00:00 2001 From: David Martin Date: Fri, 19 Mar 2010 14:44:21 +0000 Subject: [PATCH 09/14] l10n: Updates to Spanish (Castilian) (es) translation Transmitted-via: Transifex (www.transifex.net) --- po/es.po | 168 ++++++++++++++----------------------------------------- 1 file changed, 41 insertions(+), 127 deletions(-) diff --git a/po/es.po b/po/es.po index 0975f21b2..9c0e1a78f 100644 --- a/po/es.po +++ b/po/es.po @@ -1,14 +1,14 @@ # Spanish locale - Midnight Commander -# Copyright (C) 1998-2009 Free Software Foundation, Inc. -# David Martín , 1998-2009. +# Copyright (C) 1998-2010 Free Software Foundation, Inc. +# David Martín , 1998-2010. # Ismael Olea , 2000. # msgid "" msgstr "" -"Project-Id-Version: 4.7.0\n" -"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" -"POT-Creation-Date: 2010-02-26 13:04+0200\n" -"PO-Revision-Date: 2009-12-24 09:40+0100\n" +"Project-Id-Version: 4.7.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-19 15:42+0100\n" +"PO-Revision-Date: 2010-03-19 15:00+0100\n" "Last-Translator: David Martín \n" "MIME-Version: 1.0\n" @@ -425,9 +425,9 @@ msgstr "" msgid "Inconsistent extfs archive" msgstr "Archivo extfs inconsistente" -#, fuzzy, c-format +#, c-format msgid "Warning: cannot open %s directory\n" -msgstr "Imposible crear directorio %s" +msgstr "Atención: imposible abrir el directorio %s\n" #, c-format msgid "fish: Disconnecting from %s" @@ -921,7 +921,6 @@ msgid "Show mc with specified skin" msgstr "Mostrar mc con la careta (skin) indicada" #. TRANSLATORS: don't translate keywords and names of colors -#, fuzzy msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -945,7 +944,7 @@ msgstr "" " Visor de archivos: normal, selected, marked, markselect\n" " Diálogos: dnormal, dfocus, dhotnormal, dhotfocus,\n" " errdhotnormal, errdhotfocus\n" -" Menús: menu, menuhot, menusel, menuhotsel\n" +" Menús: menu, menuhot, menusel, menuhotsel, menuinactive\n" " Editor: editnormal, editbold, editmarked, editwhitespace,\n" " editlinestate\n" @@ -1049,37 +1048,30 @@ msgid "Executable &first" msgstr "&Ejecutables primero" msgid "Sort order" -msgstr " Ordenar " +msgstr "Ordenar" -#, fuzzy msgid "Confirmation" -msgstr " Confirmación " +msgstr "Confirmación" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix #. 2 -#, fuzzy msgid "Confirmation|&History cleanup" -msgstr " Confirmación " +msgstr "Confirmation|borrar &Historia" -#, fuzzy msgid "Confirmation|&Directory hotlist delete" -msgstr " confirmar eliminación de &Favoritos " +msgstr "Confirmation|borrar &Favoritos" -#, fuzzy msgid "Confirmation|E&xit" -msgstr " Confirmación " +msgstr "Confirmation|sali&R" -#, fuzzy msgid "Confirmation|&Execute" -msgstr " Confirmación " +msgstr "Confirmation|e&Jecutar" -#, fuzzy msgid "Confirmation|O&verwrite" -msgstr " confirmar s&Obrescritura " +msgstr "Confirmation|s&Obrescribir" -#, fuzzy msgid "Confirmation|&Delete" -msgstr " Confirmación " +msgstr "Confirmation|&Borrar" msgid "UTF-8 output" msgstr "salida UTF-8" @@ -1873,46 +1865,38 @@ msgstr "&Salir" msgid "&Undo" msgstr "&Deshacer" -#, fuzzy msgid "&Toggle ins/overw" msgstr "activar &Inserción" -#, fuzzy msgid "To&ggle mark" msgstr "i&Nicio/fin de marca" msgid "&Mark columns" msgstr "marcar c&Olumnas" -#, fuzzy msgid "Mark &all" -msgstr "* t&Odos" +msgstr "marcar &Todo" msgid "Unmar&k" -msgstr "" +msgstr "desma&Rcar" -#, fuzzy msgid "Cop&y" msgstr "&Copiar" -#, fuzzy msgid "Mo&ve" msgstr "&Mover" msgid "&Delete" msgstr "&Borrar" -#, fuzzy msgid "Co&py to clipfile" -msgstr "co&Piar a un archivo..." +msgstr "copiar a un &Archivo..." -#, fuzzy msgid "&Cut to clipfile" -msgstr "cor&Tar a un archivo..." +msgstr "cortar a un arc&Hivo..." -#, fuzzy msgid "Pa&ste from clipfile" -msgstr "pe&Gar de un archivo..." +msgstr "pegar de un archi&Vo..." msgid "&Beginning" msgstr "&Principio del archivo" @@ -1929,14 +1913,12 @@ msgstr "buscar &Siguiente" msgid "&Replace..." msgstr "&Reemplazar..." -#, fuzzy msgid "&Toggle bookmark" msgstr "poner/quitar m&Arca" msgid "&Next bookmark" msgstr "&Ir a marca siguiente" -#, fuzzy msgid "&Prev bookmark" msgstr "&Volver a marca anterior" @@ -1946,22 +1928,18 @@ msgstr "borra&R todas las marcas" msgid "&Go to line..." msgstr "&Ir a la línea..." -#, fuzzy msgid "&Toggle line state" msgstr "&Numeración de líneas" msgid "Go to matching &bracket" msgstr "buscar pare&Ja del operador" -#, fuzzy msgid "&Find declaration" msgstr "buscar &Declaración" -#, fuzzy msgid "Back from &declaration" msgstr "&Volver desde declaración" -#, fuzzy msgid "For&ward to declaration" msgstr "ava&Nzar a declaración" @@ -1974,7 +1952,6 @@ msgstr "&Refrescar la pantalla" msgid "&Start record macro" msgstr "iniciar grabación de &Macro" -#, fuzzy msgid "Finis&h record macro..." msgstr "&Terminar grabación de macro..." @@ -1996,19 +1973,15 @@ msgstr "insertar &Literalmente..." msgid "Insert &date/time" msgstr "insertar &Fecha y hora" -#, fuzzy msgid "&Format paragraph" msgstr "dar formato al &Párrafo" -#, fuzzy msgid "&Sort..." msgstr "&Ordenar bloque de texto..." -#, fuzzy msgid "&Paste output of..." msgstr "peg&Ar desde otro programa..." -#, fuzzy msgid "&External formatter" msgstr "dar formato e&Xterno" @@ -2573,13 +2546,13 @@ msgstr " Borrar: " msgid "Non&e" msgstr "nin&Guno" -#, fuzzy, c-format +#, c-format msgid "%d:%02d.%02d" -msgstr "ETA %d:%02d.%02d" +msgstr "%d:%02d.%02d" #, c-format msgid "ETA %s" -msgstr "" +msgstr "ETA %s" #, c-format msgid "%.2f MB/s" @@ -2595,15 +2568,15 @@ msgstr "%ld B/s" #, c-format msgid "Files processed: %llu of %llu" -msgstr "" +msgstr "Archivos procesados: %llu de %llu" -#, fuzzy, c-format +#, c-format msgid "Time: %s %s (%s)" -msgstr "Tamaño: %s" +msgstr "Tiempo: %s %s (%s)" #, c-format msgid " Total: %s of %s " -msgstr "" +msgstr " Total: %s de %s " msgid "Source" msgstr "Origen" @@ -3425,13 +3398,11 @@ msgstr "&Nombre" #. TRANSLATORS: one single character to represent 'version' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix -#, fuzzy msgid "sort|v" -msgstr "sort|o" +msgstr "sort|v" -#, fuzzy msgid "&Version" -msgstr "Permisos" +msgstr "&Versión" #. TRANSLATORS: one single character to represent 'extension' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3704,9 +3675,8 @@ msgstr " No se encuentran entradas apropiadas en %s " msgid " User menu " msgstr " Menú de usuario " -#, fuzzy msgid "Invalid value" -msgstr " Posición incorrecta " +msgstr "Posición incorrecta" msgid " Cannot spawn child process " msgstr " Imposible ejecutar el proceso hijo " @@ -3715,20 +3685,19 @@ msgid "Empty output from child filter" msgstr "Salida del filtro vacía" msgid "&Line number (decimal)" -msgstr "" +msgstr "número de &Línea (decimal)" msgid "Pe&rcents" -msgstr "" +msgstr "po&Rcentaje del archivo" msgid "&Decimal offset" -msgstr "" +msgstr "desplazamiento (&Decimal)" -#, fuzzy msgid "He&xadecimal offset" -msgstr "he&Xadecimal" +msgstr "desplazamiento (he&Xadecimal)" msgid "Goto" -msgstr "" +msgstr "Ir a" msgid "ButtonBar|Ascii" msgstr "Ascii" @@ -3802,76 +3771,21 @@ msgstr "" msgid "Seeking to search result" msgstr "Avanzando al resultado de búsqueda" -#, fuzzy msgid "Search done" -msgstr "Buscar" +msgstr "Búsqueda finalizada" msgid "Continue from begining?" -msgstr "" +msgstr "¿Continuar desde el principio?" msgid " History " msgstr " Historia " #. TRANSLATORS: no need to translate 'DialogTitle', it's just a context prefix -#, fuzzy msgid "DialogTitle|History cleanup" -msgstr "Copiar" +msgstr "Borrar historia" msgid "Do you want clean this history?" -msgstr "" +msgstr "¿Desea borrar esta historia?" msgid "Background process:" msgstr "Procesos en 2º plano" - -#~ msgid "File" -#~ msgstr "Archivo" - -#~ msgid "Count" -#~ msgstr "Total" - -#~ msgid "Bytes" -#~ msgstr "Bytes" - -#~ msgid " confirm &Exit " -#~ msgstr " confirmar &Salida " - -#~ msgid " confirm e&Xecute " -#~ msgstr " confirmar &Ejecución " - -#~ msgid " confirm &Delete " -#~ msgstr " confirmar e&Liminación " - -#~ msgid "" -#~ " The current line number is %lld.\n" -#~ " Enter the new line number:" -#~ msgstr "" -#~ " La línea actual es la número %lld\n" -#~ " Teclee el número de línea a buscar:" - -#~ msgid "" -#~ " The current address is %s.\n" -#~ " Enter the new address:" -#~ msgstr "" -#~ " La dirección actual es %s.\n" -#~ " Teclee la dirección a buscar:" - -#~ msgid " Goto Address " -#~ msgstr " Ir a posición " - -#~ msgid "ButtonBar|Line" -#~ msgstr "Línea" - -#~ msgid "File: %s" -#~ msgstr "Archivo: %s" - -#~ msgid "Offset 0x%08lx" -#~ msgstr "Offset 0x%08lx" - -#~ msgid "Line %lu Col %lu" -#~ msgstr "Línea %lu Col %lu" - -#~ msgid "%s bytes" -#~ msgstr "%s bytes" - -#~ msgid ">= %s bytes" -#~ msgstr ">= %s bytes" From 3fd5f58cec359699929c603dd4ebbd3b430cecfa Mon Sep 17 00:00:00 2001 From: David Martin Date: Fri, 19 Mar 2010 14:48:26 +0000 Subject: [PATCH 10/14] l10n: Updates to Spanish (Castilian) (es) translation Transmitted-via: Transifex (www.transifex.net) --- po/es.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/es.po b/po/es.po index 9c0e1a78f..91524aadc 100644 --- a/po/es.po +++ b/po/es.po @@ -2,7 +2,7 @@ # Copyright (C) 1998-2010 Free Software Foundation, Inc. # David Martín , 1998-2010. # Ismael Olea , 2000. -# +# msgid "" msgstr "" "Project-Id-Version: 4.7.2\n" @@ -247,7 +247,7 @@ msgid "Exclamation mark" msgstr "Exclamación" msgid "Question mark" -msgstr "Interrrogación" +msgstr "Interrogación" msgid "Ampersand" msgstr "Ampersand" @@ -1053,7 +1053,8 @@ msgstr "Ordenar" msgid "Confirmation" msgstr "Confirmación" -#. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix +#. TRANSLATORS: no need to translate 'Confirmation', it's just a context +#. prefix #. 2 msgid "Confirmation|&History cleanup" msgstr "Confirmation|borrar &Historia" @@ -2158,10 +2159,7 @@ msgid " %s%s file error" msgstr " error en el archivo %s%s " #, c-format -msgid "" -"The format of the %smc.ext file has changed with version 3.0. It seems that " -"the installation failed. Please fetch a fresh copy from the Midnight " -"Commander package." +msgid "The format of the %smc.ext file has changed with version 3.0. It seems that the installation failed. Please fetch a fresh copy from the Midnight Commander package." msgstr "" "El archivo %smc.ext ha cambiado con la versión 3.0.\n" "Parece que la instalación falló. Por favor, trate\n" @@ -2173,10 +2171,7 @@ msgid " ~/%s file error " msgstr " error en el archivo ~/%s " #, c-format -msgid "" -"The format of the ~/%s file has changed with version 3.0. You may either " -"want to copy it from %smc.ext or use that file as an example of how to write " -"it." +msgid "The format of the ~/%s file has changed with version 3.0. You may either want to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" "El archivo ~/%s ha cambiado con la versión 3.0.\n" "Puede hacer una copia de %smc.ext o bien emplearlo\n" @@ -2852,8 +2847,7 @@ msgid " Hotlist Load " msgstr " Cargar favoritos " #, c-format -msgid "" -"MC was unable to write ~/%s file, your old hotlist entries were not deleted" +msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted" msgstr "No se pudo escribir ~/%s, la lista de favoritos antigua no fue borrada" #, c-format From fae80674a9f43b3a7e77bf0852b15e018544e8a9 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Fri, 19 Mar 2010 15:32:24 +0000 Subject: [PATCH 11/14] l10n: Updates to Belarusian (be) translation Transmitted-via: Transifex (www.transifex.net) --- po/be.po | 202 +++++++++++++++++++++++-------------------------------- 1 file changed, 85 insertions(+), 117 deletions(-) diff --git a/po/be.po b/po/be.po index 495c8f27f..ef68f87a4 100644 --- a/po/be.po +++ b/po/be.po @@ -116,10 +116,10 @@ msgid "Function key 20" msgstr "Функцыянальная 20" msgid "Backspace key" -msgstr "Клявіша Backspace" +msgstr "Клfвіша Backspace" msgid "End key" -msgstr "Клявіша End " +msgstr "Клавіша End " msgid "Up arrow key" msgstr "Стрэлка угору " @@ -238,15 +238,14 @@ msgstr "Коска" msgid "Apostrophe" msgstr "Апостраф" -#, fuzzy msgid "Colon" -msgstr "Лік" +msgstr "двукроп'е" msgid "Exclamation mark" -msgstr "" +msgstr "Клічнiк" msgid "Question mark" -msgstr "Пытальны знак" +msgstr "Пытальнiк" msgid "Ampersand" msgstr "Амперсанд" @@ -255,11 +254,10 @@ msgid "Dollar sign" msgstr "Знак даляра" msgid "Quotation mark" -msgstr "" +msgstr "Знак цытаты" -#, fuzzy msgid "Caret" -msgstr "Мэта" +msgstr "карэтка" msgid "Tilda" msgstr "Цiлда" @@ -272,40 +270,38 @@ msgid "Underline" msgstr "Падкрэсленне" msgid "Understrike" -msgstr "" +msgstr "Падкрэсленне" msgid "Pipe" -msgstr "" +msgstr "Канал" #, fuzzy msgid "Enter" msgstr "уладальнік" -#, fuzzy msgid "Tab key" -msgstr "+ на keypad'е" +msgstr "клавiша 'Tab'" msgid "Space key" -msgstr "Клявіша Прабел" +msgstr "клавіша Прабел" -#, fuzzy msgid "Slash key" -msgstr "Slash на keypad'е" +msgstr "клавiша 'дзяленне'" msgid "Backslash key" -msgstr "Клявіша Backspace" +msgstr "клавіша Backspace" msgid "Number sign #" msgstr "Знак нумара #" msgid "Ctrl" -msgstr "" +msgstr "Ctrl" msgid "Alt" -msgstr "" +msgstr "Alt" msgid "Shift" -msgstr "" +msgstr "Shift" #, c-format msgid "" @@ -429,9 +425,9 @@ msgstr "" msgid "Inconsistent extfs archive" msgstr "Няўзгоднены архіў extfs" -#, fuzzy, c-format +#, c-format msgid "Warning: cannot open %s directory\n" -msgstr "Немагчыма змяніць каталог" +msgstr "Папярэджанне: немагчыма адкрыць каталог '%s'\n" #, c-format msgid "fish: Disconnecting from %s" @@ -909,9 +905,8 @@ msgstr "Псеўдаграфіка для малявання" msgid "Resets soft keys on HP terminals" msgstr "Скідае праграмныя клавішы на тэрміналах HP" -#, fuzzy msgid "Load definitions of key bindings from specified file" -msgstr "Весці пратакол дыялёгу з FTP у файл" +msgstr "Загрузіць вызначэння прывязкаў клавішаў з указанага файла" msgid "Requests to run in black and white" msgstr "Запыт на запуск у монахромным рэжыме" @@ -923,10 +918,9 @@ msgid "Specifies a color configuration" msgstr "Вызначае наладкі колераў" msgid "Show mc with specified skin" -msgstr "" +msgstr "Адлюстраваць mc з названым скiнам" #. TRANSLATORS: don't translate keywords and names of colors -#, fuzzy msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -944,23 +938,23 @@ msgstr "" "--colors КЛЮЧ={ТЭКСТ},{ФОН}\n" "\n" "{ТЭКСТ} і {ФОН} можна не ўказваць, каб ужыць прадвызначэнні\n" +"\r\n" "\n" +"\r\n" "КЛЮЧЫ:\n" -" Агульныя: errors, reverse, gauge, input, viewunderline\n" -" Паказ файлаў: normal, selected, marked, markselect\n" -" Дыялогі: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" -" errdhotfocus\n" -" Меню: menu, menuhot, menusel, menuhotsel\n" -" Рэдактар: editnormal, editbold, editmarked\n" -" Дапамога: helpnormal, helpitalic, helpbold, helplink, helpslink\n" -" Тыпы файлаў: directory, executable, link, stalelink, device, special, core\n" -"hidden, temp, doc, archive, source, media, graph, database\n" -"\n" -"Колеры:\n" -" black, gray, red, brightred, green, brightgreen, brown,\n" -" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" -" brightcyan, lightgray, white\n" -"\n" +"\r\n" +"Агульныя: errors, reverse, gauge, input, viewunderline\n" +"\r\n" +"Паказ файлаў: normal, selected, marked, markselect\n" +"\r\n" +"Дыялогі: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n" +"\r\n" +"errdhotfocus\n" +"\r\n" +"Меню: menu, menuhot, menusel, menuhotsel, menuinactive\n" +"\r\n" +"Рэдактар: editnormal, editbold, editmarked\n" +"\r\n" #. TRANSLATORS: don't translate keywords and names of colors msgid "" @@ -972,17 +966,26 @@ msgid "" " brightcyan, lightgray and white\n" "\n" msgstr "" +"Дапамога: helpnormal, helpitalic, helpbold, helplink, helpslink\n" +"\r\n" +"Колеры:\n" +"\r\n" +"black, gray, red, brightred, green, brightgreen, brown,\n" +"\r\n" +"yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +"\r\n" +"brightcyan, lightgray, white\n" +"\n" +"\r\n" -#, fuzzy msgid "Color options" -msgstr "Параметры канфігурацыі" +msgstr "Параметры колеру" msgid "+number" msgstr "+лічба" -#, fuzzy msgid "[this_dir] [other_panel_dir]" -msgstr "[сцягі] [гэты_каталог] [каталог_другой_панэлі]\n" +msgstr "[гэты_каталог] [каталог_другой_панэлі]" msgid "Set initial line number for the internal editor" msgstr "Усталяваць пачатковы нумар радка ва ўнутраным рэдактары" @@ -1080,7 +1083,7 @@ msgid "Confirmation|O&verwrite" msgstr "&Перазапіс" msgid "Confirmation|&Delete" -msgstr "Выдаленне" +msgstr "Вы&даленне" msgid "UTF-8 output" msgstr "UTF-8 вывад" @@ -1106,15 +1109,14 @@ msgstr "Іншыя 8 bit" msgid "Input / display codepage:" msgstr "Кодавая старонка:" -#, fuzzy msgid "&Select" -msgstr " Вылучыць " +msgstr "&Выбраць" msgid "Use passive mode over pro&xy" msgstr "Ужыць &пасіўны рэжым праз проксі" msgid "Use &passive mode" -msgstr "Ужыць &пасіўны рэжым" +msgstr "Ужыць па&сіўны рэжым" msgid "&Use ~/.netrc" msgstr "&Выкарыстоўваць ~/.netrc" @@ -1183,11 +1185,9 @@ msgstr "Пароль для \\\\%s\\%s" msgid "7-bit ASCII" msgstr "7-бiтны ASCII" -#, fuzzy, c-format +#, c-format msgid "Cannot translate from %s to %s" -msgstr "" -" Немагчыма атрымаць уласцівасці файла \"%s\" \n" -" %s " +msgstr " Немагчыма перакласці p '%s' у '%s'" msgid "execute/search by others" msgstr "запуск/пошук для іншых" @@ -1868,75 +1868,62 @@ msgstr "&Капіяваць у файл..." msgid "&User menu..." msgstr "&Меню карыстальніка..." -#, fuzzy msgid "A&bout..." -msgstr "&Вонкавы выгляд" +msgstr "&Аб праграме" msgid "&Quit" msgstr "&Выхад" msgid "&Undo" -msgstr "" +msgstr "&Адкаціць" -#, fuzzy msgid "&Toggle ins/overw" -msgstr "&Рэжым устаўкі/замены Ins" +msgstr "&Рэжым устаўкі/замены" -#, fuzzy msgid "To&ggle mark" -msgstr "&Ачысціць пазначанае" +msgstr "&Смянiць пазначанае" msgid "&Mark columns" -msgstr "" +msgstr "Пазначыць &стаўбец" -#, fuzzy msgid "Mark &all" msgstr "Пазначыць &усе" msgid "Unmar&k" -msgstr "" +msgstr "&Зняць пазначэнне" -#, fuzzy msgid "Cop&y" -msgstr "Копія" +msgstr "&Капiраваць" -#, fuzzy msgid "Mo&ve" -msgstr "Перамясціць" +msgstr "&Перамясціць" msgid "&Delete" msgstr "&Выдаліць" -#, fuzzy msgid "Co&py to clipfile" -msgstr "&Капіяваць у файл..." +msgstr "&Капіяваць у файл" -#, fuzzy msgid "&Cut to clipfile" -msgstr "&Перайсці да радка M-l" +msgstr "&Выдаліць у файл" -#, fuzzy msgid "Pa&ste from clipfile" -msgstr "diff &файлаў C-x C-y" +msgstr "&Уставiць з файла" msgid "&Beginning" msgstr "" -#, fuzzy msgid "&End" -msgstr "&Інода" +msgstr "&Канец" -#, fuzzy msgid "&Search..." -msgstr "Пошук" +msgstr "&Пошук" -#, fuzzy msgid "Search &again" -msgstr "Пра&цяг пошуку F17" +msgstr "П&аўтор пошуку" -#, fuzzy msgid "&Replace..." -msgstr "&Замяніць" +msgstr "&Замяніць..." #, fuzzy msgid "&Toggle bookmark" @@ -1954,24 +1941,20 @@ msgstr "&Ачыстка закладкі" msgid "&Go to line..." msgstr " Перайсці да радка..." -#, fuzzy msgid "&Toggle line state" -msgstr "&Выдаленне блоку F3" +msgstr "Пераключэнне статусу &радка" msgid "Go to matching &bracket" msgstr "Ісці да парнай &дужкі" -#, fuzzy msgid "&Find declaration" -msgstr "Знайсці карэктуры, адкінутыя камандай patch" +msgstr "&Знайсці дэкларацыю" -#, fuzzy msgid "Back from &declaration" -msgstr "Знайсці карэктуры, адкінутыя камандай patch" +msgstr "&Вярнуцца да дэкларацыi" -#, fuzzy msgid "For&ward to declaration" -msgstr "Знайсці карэктуры, адкінутыя камандай patch" +msgstr "&Уперад да дэкларацыi" msgid "Encod&ing..." msgstr "&Кадыроўка" @@ -2006,63 +1989,50 @@ msgstr "Уставіць &Дату/час" msgid "&Format paragraph" msgstr "Фарматаваць &параграф" -#, fuzzy msgid "&Sort..." -msgstr "Парадак &сартавання" +msgstr "&Сартыроўка" -#, fuzzy msgid "&Paste output of..." -msgstr "Уставіць в&ывад ад ... M-u" +msgstr "Уставіць в&ывад ад ..." -#, fuzzy msgid "&External formatter" -msgstr "&Знешняе фарматаванне F19" +msgstr "&Знешняе фарматаванне" msgid "&General... " msgstr "&Асноўнае..." -#, fuzzy msgid "Save &mode..." msgstr "Рэжым &захавання..." -#, fuzzy msgid "Learn &keys..." msgstr "В&ызначэнне клавіш..." -#, fuzzy msgid "Syntax &highlighting..." msgstr "Вылучэнне &колерам сінтаксісу..." -#, fuzzy msgid "S&yntax file" msgstr "Рэдагаванне файла сінтанксісу" -#, fuzzy msgid "&Menu file" msgstr "Файл мен&ю" msgid "&Save setup" msgstr "&Захаваць наладку" -#, fuzzy msgid "&File" -msgstr "Файл" +msgstr "&Файл" -#, fuzzy msgid "&Edit" -msgstr "Праўка" +msgstr "П&раўка" -#, fuzzy msgid "&Search" -msgstr "Пошук" +msgstr "&Пошук" -#, fuzzy msgid "&Command" -msgstr "Каманда" +msgstr "&Каманда" -#, fuzzy msgid "For&mat" -msgstr "Забыцца" +msgstr "&Фармат" #, fuzzy msgid "&Options" @@ -2087,9 +2057,8 @@ msgstr "" msgid "Pers&istent selection" msgstr "Інвер&сія вылучэння M-*" -#, fuzzy msgid "Synta&x highlighting" -msgstr "Падсветка сінтаксісу" +msgstr "Падсветка &сінтаксісу" msgid "Visible tabs" msgstr "" @@ -2128,16 +2097,16 @@ msgid "ButtonBar|Help" msgstr "" msgid "ButtonBar|Save" -msgstr "" +msgstr "Захвц" msgid "ButtonBar|Mark" -msgstr "" +msgstr "Пазнч" msgid "ButtonBar|Replac" msgstr "Замена" msgid "ButtonBar|Copy" -msgstr "" +msgstr "Капр" msgid "ButtonBar|Move" msgstr "" @@ -3838,9 +3807,8 @@ msgstr " Прагляд немагчымы: не звычайны файл " msgid "Seeking to search result" msgstr "" -#, fuzzy msgid "Search done" -msgstr "Пошук" +msgstr "Пошук скончаны" msgid "Continue from begining?" msgstr "" From 8bfa0e0ebdb30c7f72e1d723a64815885b366090 Mon Sep 17 00:00:00 2001 From: Emmanuel Trillaud Date: Mon, 22 Mar 2010 10:02:36 +0000 Subject: [PATCH 12/14] l10n: Updates to French (fr) translation Transmitted-via: Transifex (www.transifex.net) --- po/fr.po | 147 ++++++++++++++++++------------------------------------- 1 file changed, 48 insertions(+), 99 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2393a73f2..0b1703d9b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -17,6 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid " Search string not found " msgstr " Chaîne non trouvée " @@ -445,9 +446,7 @@ msgid "fish: Waiting for initial line..." msgstr "fish : attente de la première ligne..." msgid "Sorry, we cannot do password authenticated connections for now." -msgstr "" -"Désolé, nous ne pouvons pas faire de connexion authentifiée par mot de passe " -"pour l'instant." +msgstr "Désolé, nous ne pouvons pas faire de connexion authentifiée par mot de passe pour l'instant." msgid " fish: Password required for " msgstr " fish : mot de passe requis " @@ -751,8 +750,7 @@ msgstr " lors du démarrage du scrutage de l'inode %d " #, c-format msgid "undelfs: loading deleted files information %d inodes" -msgstr "" -"undelfs : chargement le l'information de fichiers supprimés de %d inodes" +msgstr "undelfs : chargement le l'information de fichiers supprimés de %d inodes" #, c-format msgid " while calling ext2_block_iterate %d " @@ -798,8 +796,7 @@ msgid " vfs_info is not fs! " msgstr " vfs_info n'est pas fs ! " msgid " You have to chdir to extract files first " -msgstr "" -" Vous devez changer de répertoire pour extraire les fichier en premier " +msgstr " Vous devez changer de répertoire pour extraire les fichier en premier " msgid " while iterating over blocks " msgstr " lors de l'itération au dessus des blocs " @@ -959,8 +956,7 @@ msgstr "" "mots clés :\n" " Global : errors, reverse, gauge, input, viewunderline\n" " Affichage fichiers : normal, selected, marked, markselect\n" -" Boîtes de dialogue : dnormal, dfocus, dhotnormal, dhotfocus, " -"errdhotnormal\n" +" Boîtes de dialogue : dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal\n" " errdhotfocus\n" " Menus : menu, menuhot, menusel, menuhotsel\n" " Editeur : editnormal, editbold, editmarked, editwhitespace,\n" @@ -1030,8 +1026,7 @@ msgstr " Erreur de protocole de fond " msgid "" " Background process sent us a request for more arguments \n" " than we can handle. \n" -msgstr "" -"Une tâche de fond a passé plus de paramètres que je ne peux en gérer. \n" +msgstr "Une tâche de fond a passé plus de paramètres que je ne peux en gérer. \n" msgid "&Full file list" msgstr "Liste &Complète des fichiers" @@ -1070,14 +1065,14 @@ msgstr "Ordre de tri" msgid "Confirmation" msgstr " Confirmation " -#. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix +#. TRANSLATORS: no need to translate 'Confirmation', it's just a context +#. prefix #. 2 msgid "Confirmation|&History cleanup" msgstr " Confirmation|Nettoyage de l'&Historique" -#, fuzzy msgid "Confirmation|&Directory hotlist delete" -msgstr "&Répertoire hotlist C-\\" +msgstr "Confirmation|Suppression du &Répertoire hotlist" msgid "Confirmation|E&xit" msgstr " Confirmation|&Quitter" @@ -1398,8 +1393,7 @@ msgid "&Thorough" msgstr "&Exhaustive" msgid " Both panels should be in the listing mode to use this command " -msgstr "" -" Les deux panneaux doivent être en mode liste pour utiliser cette commande " +msgstr " Les deux panneaux doivent être en mode liste pour utiliser cette commande " msgid "" " Not an xterm or Linux console; \n" @@ -1602,8 +1596,7 @@ msgid " Edit Save Mode " msgstr " Éditer le mode de sauvegarde" msgid "The file you are saving is not finished with a newline" -msgstr "" -"Le fichier que vous enregistré ne se termine pas par une nouvelle ligne" +msgstr "Le fichier que vous enregistré ne se termine pas par une nouvelle ligne" msgid "C&ontinue" msgstr "C&ontinuer" @@ -1689,9 +1682,7 @@ msgid " Load " msgstr " Ouvrir " msgid " Block is large, you may not be able to undo this action. " -msgstr "" -" Le bloc est gros et il est possible que vous ne puissiez pas annuler ce " -"changement. " +msgstr " Le bloc est gros et il est possible que vous ne puissiez pas annuler ce changement. " msgid "Replace" msgstr "Remplacer" @@ -1752,9 +1743,7 @@ msgid " Run Sort " msgstr " Lancer le tri " msgid " Enter sort options (see manpage) separated by whitespace: " -msgstr "" -" Saisissez les options de tri (cf page de manuel sort(1)) séparées par des " -"espaces : " +msgstr " Saisissez les options de tri (cf page de manuel sort(1)) séparées par des espaces : " msgid " Sort " msgstr " Trier " @@ -1858,7 +1847,6 @@ msgstr " Remplacer par : " msgid " Confirm replace " msgstr " Confirmer le remplacement " -#, fuzzy msgid "&Dismiss" msgstr "&Fermer" @@ -1909,9 +1897,8 @@ msgstr "&Quitter" msgid "&Undo" msgstr "Ann&uller" -#, fuzzy msgid "&Toggle ins/overw" -msgstr "&Insertion/écrasement Ins" +msgstr "&Insertion/écrasement" #, fuzzy msgid "To&ggle mark" @@ -1924,7 +1911,7 @@ msgid "Mark &all" msgstr "&Marquer tous" msgid "Unmar&k" -msgstr "" +msgstr "Enlever la marque" msgid "Cop&y" msgstr "&Copier" @@ -1978,7 +1965,6 @@ msgstr "Supprimer le marque-page" msgid "&Go to line..." msgstr "&Aller à la ligne..." -#, fuzzy msgid "&Toggle line state" msgstr "I&nverser l'état de la ligne" @@ -1991,9 +1977,8 @@ msgstr "&Trouver la déclaration" msgid "Back from &declaration" msgstr "Trouver la &déclaration" -#, fuzzy msgid "For&ward to declaration" -msgstr "Trouver la déclaration" +msgstr "Aller à la déclaration" msgid "Encod&ing..." msgstr "&Encodage..." @@ -2031,17 +2016,15 @@ msgstr "Insérer &date/heure" msgid "&Format paragraph" msgstr "Formater le p&aragraphe" -#, fuzzy msgid "&Sort..." msgstr "&Tri..." -#, fuzzy msgid "&Paste output of..." msgstr "Coller la sortie de..." #, fuzzy msgid "&External formatter" -msgstr "Formatteur e&xterne" +msgstr "Formateur e&xterne" msgid "&General... " msgstr "&Général... " @@ -2218,27 +2201,16 @@ msgid " %s%s file error" msgstr " %s%s erreur de fichier " #, c-format -msgid "" -"The format of the %smc.ext file has changed with version 3.0. It seems that " -"the installation failed. Please fetch a fresh copy from the Midnight " -"Commander package." -msgstr "" -"Le format du fichier %smc.ext a changé avec la version 3.0. Il semble que " -"l'installation ait échoué. Récupérez une nouvelle copie depuis le paquet " -"Midnight Commander." +msgid "The format of the %smc.ext file has changed with version 3.0. It seems that the installation failed. Please fetch a fresh copy from the Midnight Commander package." +msgstr "Le format du fichier %smc.ext a changé avec la version 3.0. Il semble que l'installation ait échoué. Récupérez une nouvelle copie depuis le paquet Midnight Commander." #, c-format msgid " ~/%s file error " msgstr " ~/%s erreur de fichier " #, c-format -msgid "" -"The format of the ~/%s file has changed with version 3.0. You may either " -"want to copy it from %smc.ext or use that file as an example of how to write " -"it." -msgstr "" -"Le format du fichier ~/%s a changé depuis la version 3.0. Vous pourriez soit " -"copier %smc.ext ou utiliser ce dernier comme exemple pour l'écrire" +msgid "The format of the ~/%s file has changed with version 3.0. You may either want to copy it from %smc.ext or use that file as an example of how to write it." +msgstr "Le format du fichier ~/%s a changé depuis la version 3.0. Vous pourriez soit copier %smc.ext ou utiliser ce dernier comme exemple pour l'écrire" msgid "DialogTitle|Copy" msgstr "TitreDialog|Copie" @@ -2266,8 +2238,7 @@ msgid "" "\n" " Option Stable Symlinks will be disabled " msgstr "" -" Ne peut faire des liens symboliques stables entre des systèmes de fichiers " -"non-locaux : \n" +" Ne peut faire des liens symboliques stables entre des systèmes de fichiers non-locaux : \n" " L'option « Liens symboliques stables » sera désactivée " #, c-format @@ -2678,7 +2649,7 @@ msgstr "Date de la source : %s, taille %llu" msgid "Target date: %s, size %llu" msgstr "Date de la cible : %s, taille %llu" -#, fuzzy, c-format +#, c-format msgid "Source date: %s, size %u" msgstr "Date de la source : %s, taille %u" @@ -2935,11 +2906,8 @@ msgid " Hotlist Load " msgstr " Charger la hotlist " #, c-format -msgid "" -"MC was unable to write ~/%s file, your old hotlist entries were not deleted" -msgstr "" -"MC n'a pu écrire dans le fichier ~/%s, les entrées de votre ancienne hotlist " -"ont été conservées" +msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted" +msgstr "MC n'a pu écrire dans le fichier ~/%s, les entrées de votre ancienne hotlist ont été conservées" #, c-format msgid "Midnight Commander %s" @@ -2987,9 +2955,9 @@ msgid "Modified: %s" msgstr "Modifié : %s" #. TRANSLATORS: "Status changed", like in the stat(2) man page -#, fuzzy, c-format +#, c-format msgid "Status: %s" -msgstr "Créé : %s" +msgstr "Status : %s" #, c-format msgid "Dev. type: major %lu, minor %lu" @@ -2999,11 +2967,11 @@ msgstr "Type périph. : majeur %lu, mineur %lu" msgid "Size: %s" msgstr "Taille : %s" -#, fuzzy, c-format +#, c-format msgid " (%ld block)" msgid_plural " (%ld blocks)" msgstr[0] " (%ld bloc)" -msgstr[1] " (%ld bloc)" +msgstr[1] " (%ld blocs)" #, c-format msgid "Owner: %s/%s" @@ -3171,7 +3139,6 @@ msgstr "Lien S&hell..." msgid "SM&B link..." msgstr "Lien SM&B..." -#, fuzzy msgid "&Rescan" msgstr "&Rafraîchir" @@ -3255,7 +3222,6 @@ msgstr "Aff&Icher la taille des rép." msgid "Command &history" msgstr "&Historique des commandes" -#, fuzzy msgid "Di&rectory hotlist" msgstr "Répe&rtoire hotlist" @@ -3441,9 +3407,7 @@ msgid " Enter command label: " msgstr " Saisissez un nom pour la commande :" msgid " Cannot run external panelize in a non-local directory " -msgstr "" -" Ne peut utiliser un panneau externe lorsque connecté sur un répertoire non " -"local " +msgstr " Ne peut utiliser un panneau externe lorsque connecté sur un répertoire non local " msgid "Find rejects after patching" msgstr "Trouver les déchets de patches" @@ -3490,13 +3454,11 @@ msgstr "&Nom" #. TRANSLATORS: one single character to represent 'version' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix -#, fuzzy msgid "sort|v" -msgstr "sort|m" +msgstr "sort|v" -#, fuzzy msgid "&Version" -msgstr "Permission" +msgstr "&Version" #. TRANSLATORS: one single character to represent 'extension' sort mode #. TRANSLATORS: no need to translate 'sort', it's just a context prefix @@ -3574,34 +3536,31 @@ msgid "" msgstr "<échec de readlink>" # XXX: traduit, reste à vérifier la signification de msgit -#, fuzzy, c-format +#, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "%s octet" msgstr[1] "%s octets" # XXX: idem -#, fuzzy, c-format +#, c-format msgid "%s in %d file" msgid_plural "%s in %d files" -msgstr[0] " %s octets dans %d fichiers" -msgstr[1] " %s octets dans %d fichier" +msgstr[0] " %s octets dans %d fichier" +msgstr[1] " %s octets dans %d fichiers" msgid "Unknown tag on display format: " msgstr "Balise inconnue dans le format d'affichage :" msgid "User supplied format looks invalid, reverting to default." -msgstr "" -"Le format fourni par l'utilisateur semble invalide, retourner aux valeurs " -"par défaut." +msgstr "Le format fourni par l'utilisateur semble invalide, retourner aux valeurs par défaut." msgid " Do you really want to execute? " msgstr " Voulez-vous vraiment exécuter ? " # XXX: trad codepage -#, fuzzy msgid "Choose codepage" -msgstr "Choisissez un codepage" +msgstr "Choisissez un encodage" msgid "- < No translation >" msgstr "- < Pas de conversion >" @@ -3718,13 +3677,13 @@ msgid "ButtonBar|Dynamc" msgstr "ButtonBar|Dynamq" msgid "ButtonBar|Rescan" -msgstr "" +msgstr "ButtonBar|Raffra" msgid "ButtonBar|Forget" msgstr "ButtonBar|Oublie" msgid "ButtonBar|Rmdir" -msgstr "" +msgstr "ButtonBar|SupRep" #, c-format msgid "" @@ -3765,8 +3724,7 @@ msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -"Le fichier %s n'appartient ni à vous ni au root ou tout le monde peux y " -"écrire.\n" +"Le fichier %s n'appartient ni à vous ni au root ou tout le monde peux y écrire.\n" "Son utilisation peut compromettre la sécurité du système" #, c-format @@ -3776,9 +3734,8 @@ msgstr " Aucune entrée appropriée trouvé dans %s " msgid " User menu " msgstr " Menu utilisateur " -#, fuzzy msgid "Invalid value" -msgstr " Adresse invalide " +msgstr "valeur invalide " msgid " Cannot spawn child process " msgstr " Ne peut créer un processus fils " @@ -3787,7 +3744,7 @@ msgid "Empty output from child filter" msgstr "" msgid "&Line number (decimal)" -msgstr "" +msgstr "&Numéro de ligne (décimal)" msgid "Pe&rcents" msgstr "" @@ -4271,8 +4228,7 @@ msgstr "Processus en tâche de fond :" #~ msgstr "Affiche ce message d'aide" #~ msgid "Displays a help screen on how to change the color scheme" -#~ msgstr "" -#~ "Affiche un écran d'aide sur la façon de changer les styles de couleur" +#~ msgstr "Affiche un écran d'aide sur la façon de changer les styles de couleur" #~ msgid "unknown option" #~ msgstr "" @@ -4312,12 +4268,8 @@ msgstr "Processus en tâche de fond :" #~ msgid " Enter replacement argument order eg. 3,2,1,4 " #~ msgstr " Saisissez l'ordre des arguments (ex. : 3,2,1,4) " -#~ msgid "" -#~ " Invalid regular expression, or scanf expression with too many " -#~ "conversions " -#~ msgstr "" -#~ " Expression régulière invalide, ou expression scanf avec trop de " -#~ "conversions " +#~ msgid " Invalid regular expression, or scanf expression with too many conversions " +#~ msgstr " Expression régulière invalide, ou expression scanf avec trop de conversions " #~ msgid " Error in replacement format string. " #~ msgstr " Erreur dans la chaîne de format de remplacement. " @@ -4475,16 +4427,13 @@ msgstr "Processus en tâche de fond :" #~ msgstr "Déformat" #~ msgid "User menu available only in mcedit invoked from mc" -#~ msgstr "" -#~ "Le menu utilisateur n'est disponible que si mcedit est invoqué depuis mc" +#~ msgstr "Le menu utilisateur n'est disponible que si mcedit est invoqué depuis mc" #~ msgid " Socket source routing setup " #~ msgstr " Configuration du routage à la source " #~ msgid " Enter host name to use as a source routing hop: " -#~ msgstr "" -#~ " Saisissez le nom de l'hôte à utiliser comme noeud de routage à la " -#~ "source : " +#~ msgstr " Saisissez le nom de l'hôte à utiliser comme noeud de routage à la source : " #~ msgid " Host name " #~ msgstr " Nom de l'hôte " From fc80034e88a952db5f31fabe62557094561ddb46 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Mon, 22 Mar 2010 22:13:50 +0300 Subject: [PATCH 13/14] Updated Russian translation. Modified titles of file operation dialogs. Signed-off-by: Andrew Borodin --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9e8b21b2e..6baec5287 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2182,13 +2182,13 @@ msgid "The format of the ~/%s file has changed with version 3.0. You may either msgstr "формат файла %smc.ext изменён с версии 3.0. Вы можете либо скопировать его с %smc.ext либо использовать этот файл как пример и написать свой." msgid "DialogTitle|Copy" -msgstr "Копировать" +msgstr "Копирование" msgid "DialogTitle|Move" -msgstr "Переместить" +msgstr "Перемещение" msgid "DialogTitle|Delete" -msgstr "Удалить" +msgstr "Удаление" msgid " Cannot make the hardlink " msgstr " Невозможно создать жесткую ссылку " From fa5303329a35e59f11353689ba9a2e71ae60d951 Mon Sep 17 00:00:00 2001 From: Yasen Pramatarov Date: Tue, 23 Mar 2010 07:25:11 +0000 Subject: [PATCH 14/14] l10n: Updates to Bulgarian (bg) translation Transmitted-via: Transifex (www.transifex.net) --- po/bg.po | 145 +++++++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 102 deletions(-) diff --git a/po/bg.po b/po/bg.po index b6bfac444..dad0d315a 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,3 +1,4 @@ +# msgid "" msgstr "" "Project-Id-Version: 4.5.55\n" @@ -15,7 +16,7 @@ msgid " Search string not found " msgstr " Търсеният низ не е намерен " msgid " Not implemented yet " -msgstr "" +msgstr "Не е внедрено още" msgid " Num of replace tokens not equal to num of found tokens " msgstr "" @@ -24,15 +25,14 @@ msgstr "" msgid " Invalid token number %d " msgstr " Невалидна маска на назначението " -#, fuzzy msgid "Normal" -msgstr "Формат" +msgstr "Нормално" msgid "&Regular expression" msgstr "Регулярен израз" msgid "Hexadecimal" -msgstr "" +msgstr "Шестнадесетично" msgid "Wildcard search" msgstr "" @@ -157,9 +157,8 @@ msgstr "Накл. черта от доп. клв." msgid "* on keypad" msgstr "* от доп. клв." -#, fuzzy msgid "Escape key" -msgstr "Накл. черта от доп. клв." +msgstr "Клавиш Escape" msgid "Left arrow keypad" msgstr "Лява стрелка от доп. клв." @@ -211,68 +210,63 @@ msgid "Function key 24" msgstr "F2" msgid "Plus" -msgstr "" +msgstr "Плюс" -#, fuzzy msgid "Minus" -msgstr "Меню" +msgstr "Минус" msgid "Asterisk" -msgstr "" +msgstr "Звезда" msgid "Dot" -msgstr "" +msgstr "Точка" msgid "Less than" -msgstr "" +msgstr "По-малко" msgid "Great than" -msgstr "" +msgstr "По-голямо" msgid "Equal" -msgstr "" +msgstr "Равно" -#, fuzzy msgid "Comma" -msgstr "Команда" +msgstr "Запетайка" msgid "Apostrophe" -msgstr "" +msgstr "Апостроф" -#, fuzzy msgid "Colon" -msgstr "Брой" +msgstr "Двоеточие" msgid "Exclamation mark" -msgstr "" +msgstr "Удивителна" msgid "Question mark" -msgstr "" +msgstr "Въпросителна" -#, fuzzy msgid "Ampersand" -msgstr "добави" +msgstr "Амперсанд" msgid "Dollar sign" -msgstr "" +msgstr "Долар" msgid "Quotation mark" -msgstr "" +msgstr "Кавички" #, fuzzy msgid "Caret" msgstr "Назначение" msgid "Tilda" -msgstr "" +msgstr "Тилда" #, fuzzy msgid "Prime" msgstr "Преди" -#, fuzzy msgid "Underline" -msgstr " Въведете ред: " +msgstr "Подчертаване" msgid "Understrike" msgstr "" @@ -280,37 +274,32 @@ msgstr "" msgid "Pipe" msgstr "" -#, fuzzy msgid "Enter" -msgstr "собст." +msgstr "Enter" -#, fuzzy msgid "Tab key" -msgstr "+ от доп. клв." +msgstr "Табулация" -#, fuzzy msgid "Space key" -msgstr "Накл. черта от доп. клв." +msgstr "Интервал" -#, fuzzy msgid "Slash key" -msgstr "Накл. черта от доп. клв." +msgstr "Накл. черта" -#, fuzzy msgid "Backslash key" -msgstr "Backspace" +msgstr "Обратна накл. черта" msgid "Number sign #" msgstr "" msgid "Ctrl" -msgstr "" +msgstr "Ctrl" msgid "Alt" -msgstr "" +msgstr "Alt" msgid "Shift" -msgstr "" +msgstr "Shift" #, c-format msgid "" @@ -320,9 +309,9 @@ msgstr "" "Размер на екрана %dx%d не е поддържан.\n" "Проверете променливата на средата TERM.\n" -#, fuzzy, c-format +#, c-format msgid "%s is not a directory\n" -msgstr "директорията" +msgstr "%s не е директория\n" #, c-format msgid "Directory %s is not owned by you\n" @@ -965,8 +954,7 @@ msgstr "" " Диалози: dnormal, dfocus, dhotnormal, dhotfocus\n" " Менюта: menu, menuhot, menusel, menuhotsel\n" " Помощ: helpnormal, helpitalic, helplink, helpslink\n" -" Файлови типове: directory, executable, link, stalelink, device, special, " -"core\n" +" Файлови типове: directory, executable, link, stalelink, device, special, core\n" "\n" "Цветове:\n" " black, gray, red, brightred, green, brightgreen, brown,\n" @@ -1077,7 +1065,8 @@ msgstr "Ред на сортиране" msgid "Confirmation" msgstr " Потвърждение " -#. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix +#. TRANSLATORS: no need to translate 'Confirmation', it's just a context +#. prefix #. 2 #, fuzzy msgid "Confirmation|&History cleanup" @@ -1412,8 +1401,7 @@ msgid "&Thorough" msgstr "Пълен" msgid " Both panels should be in the listing mode to use this command " -msgstr "" -" Двата панела трябва да са в режим на списък, за да използвате тази команда " +msgstr " Двата панела трябва да са в режим на списък, за да използвате тази команда " msgid "" " Not an xterm or Linux console; \n" @@ -1697,8 +1685,7 @@ msgid " Load " msgstr " Зареди " msgid " Block is large, you may not be able to undo this action. " -msgstr "" -" Блокът е голям. Възможно е това действие да не може да бъде отменено. " +msgstr " Блокът е голям. Възможно е това действие да не може да бъде отменено. " #, fuzzy msgid "Replace" @@ -1762,8 +1749,7 @@ msgid " Run Sort " msgstr " Стартирай Sort " msgid " Enter sort options (see manpage) separated by whitespace: " -msgstr "" -" Въведете опции за sort, разделени от интервали (вижте man-страницата): " +msgstr " Въведете опции за sort, разделени от интервали (вижте man-страницата): " msgid " Sort " msgstr " Сортирай " @@ -2266,10 +2252,7 @@ msgid " %s%s file error" msgstr " грешка във файла " #, fuzzy, c-format -msgid "" -"The format of the %smc.ext file has changed with version 3.0. It seems that " -"the installation failed. Please fetch a fresh copy from the Midnight " -"Commander package." +msgid "The format of the %smc.ext file has changed with version 3.0. It seems that the installation failed. Please fetch a fresh copy from the Midnight Commander package." msgstr "" "файлът mc.ext е сменен\n" "с версия 3.0. Изглежда, че инсталацията\n" @@ -2281,10 +2264,7 @@ msgid " ~/%s file error " msgstr " грешка във файла " #, c-format -msgid "" -"The format of the ~/%s file has changed with version 3.0. You may either " -"want to copy it from %smc.ext or use that file as an example of how to write " -"it." +msgid "The format of the ~/%s file has changed with version 3.0. You may either want to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" msgid "DialogTitle|Copy" @@ -2958,8 +2938,7 @@ msgid " Hotlist Load " msgstr " Зареждане на горещия списък " #, fuzzy, c-format -msgid "" -"MC was unable to write ~/%s file, your old hotlist entries were not deleted" +msgid "MC was unable to write ~/%s file, your old hotlist entries were not deleted" msgstr "Старият ви горещ списък не е изтрит" #, c-format @@ -3947,7 +3926,6 @@ msgstr "Фонов процес:" #~ msgid " confirm &Delete " #~ msgstr " Потвърждавай изтриване " -#, fuzzy #~ msgid "" #~ " The current line number is %lld.\n" #~ " Enter the new line number:" @@ -3955,7 +3933,6 @@ msgstr "Фонов процес:" #~ " Текущият ред е %d.\n" #~ " Въведете нов номер на ред:" -#, fuzzy #~ msgid "" #~ " The current address is %s.\n" #~ " Enter the new address:" @@ -3975,7 +3952,6 @@ msgstr "Фонов процес:" #~ msgid "%s bytes" #~ msgstr "%s байта" -#, fuzzy #~ msgid ">= %s bytes" #~ msgstr "%s байта" @@ -4009,63 +3985,48 @@ msgstr "Фонов процес:" #~ msgid "Copy to &file... " #~ msgstr "Копирай във файл... " -#, fuzzy #~ msgid "&Toggle mark F3" #~ msgstr "Маркирай F3" -#, fuzzy #~ msgid "Mar&k columns S-F3" #~ msgstr "Маркирай колони S-F3" -#, fuzzy #~ msgid "&Copy F5" #~ msgstr "Копирай F5" -#, fuzzy #~ msgid "&Move F6" #~ msgstr "Премести F6" -#, fuzzy #~ msgid "&Delete F8" #~ msgstr "Изтрий F8" -#, fuzzy #~ msgid "&Next bookmark M-j" #~ msgstr "Нов C-n" -#, fuzzy #~ msgid "&Undo C-u" #~ msgstr "Отмени действие C-u" -#, fuzzy #~ msgid "&Beginning C-PgUp" #~ msgstr "Начало C-PgUp" -#, fuzzy #~ msgid "&End C-PgDn" #~ msgstr "Край C-PgDn" -#, fuzzy #~ msgid "C&opy to clipfile M-w" #~ msgstr "Отиди на ред... M-l" -#, fuzzy #~ msgid "C&ut to clipfile C-w" #~ msgstr "Отиди на ред... M-l" -#, fuzzy #~ msgid "Toggle bookmar&k " #~ msgstr "Маркирай F3" -#, fuzzy #~ msgid "&Next bookmark " #~ msgstr "Нов C-n" -#, fuzzy #~ msgid "Pre&v bookmark " #~ msgstr "Сортирай... M-t" -#, fuzzy #~ msgid "&Flush bookmark " #~ msgstr "Пусни по пощата... " @@ -4078,7 +4039,6 @@ msgstr "Фонов процес:" #~ msgid "&Go to line... M-l" #~ msgstr "Отиди на ред... M-l" -#, fuzzy #~ msgid "Encod&ing... M-e" #~ msgstr "Сортирай... M-t" @@ -4097,7 +4057,6 @@ msgstr "Фонов процес:" #~ msgid "'ispell' s&pell check M-$" #~ msgstr "Провери с 'ispell' M-$" -#, fuzzy #~ msgid "Save setu&p" #~ msgstr "Запази настройките" @@ -4119,7 +4078,6 @@ msgstr "Фонов процес:" #~ msgid "Emacs" #~ msgstr "Emacs" -#, fuzzy #~ msgid "User-defined" #~ msgstr "Дефиниран от потребителя:" @@ -4240,7 +4198,6 @@ msgstr "Фонов процес:" #~ msgid "e&Xternal panelize C-x !" #~ msgstr "Команда в панел C-x !" -#, fuzzy #~ msgid "Command &history M-h" #~ msgstr " Командна история " @@ -4262,11 +4219,9 @@ msgstr "Фонов процес:" #~ msgid "Menu" #~ msgstr "Меню" -#, fuzzy #~ msgid "n" #~ msgstr "За" -#, fuzzy #~ msgid "Extension" #~ msgstr "Разширение:" @@ -4300,19 +4255,15 @@ msgstr "Фонов процес:" #~ msgid "Rmdir" #~ msgstr "Изтрий" -#, fuzzy #~ msgid "bind: Unknown command: `%s'" #~ msgstr " Команда Chown " -#, fuzzy #~ msgid "%s: Unknown command: `%s'" #~ msgstr " Команда Chown " -#, fuzzy #~ msgid "%s:%d: unknown command `%s'" #~ msgstr " Команда Chown " -#, fuzzy #~ msgid "%s not found!" #~ msgstr "Внимание: файлът %s не е намерен\n" @@ -4331,7 +4282,6 @@ msgstr "Фонов процес:" #~ msgid "Displays a help screen on how to change the color scheme" #~ msgstr "Показва как да се смени цветовата схема" -#, fuzzy #~ msgid "unknown option" #~ msgstr "<Неизвестна>" @@ -4341,7 +4291,6 @@ msgstr "Фонов процес:" #~ msgid "Display brief usage message" #~ msgstr "Покажи кратка инструкция" -#, fuzzy #~ msgid "Usage:" #~ msgstr "Потребителско име:" @@ -4354,15 +4303,12 @@ msgstr "Фонов процес:" #~ msgid "O&ne" #~ msgstr "Един" -#, fuzzy #~ msgid "%b %d %H:%M" #~ msgstr "%b %e %H:%M" -#, fuzzy #~ msgid "%b %d %Y" #~ msgstr "%b %e %Y" -#, fuzzy #~ msgid " The current address is 0x%08" #~ msgstr "" #~ " Текущият адрес е 0x%lx.\n" @@ -4374,16 +4320,12 @@ msgstr "Фонов процес:" #~ msgid " Enter replacement argument order eg. 3,2,1,4 " #~ msgstr " Ред на заместващите аргументи, напр. 3,2,1,4 " -#~ msgid "" -#~ " Invalid regular expression, or scanf expression with too many " -#~ "conversions " -#~ msgstr "" -#~ " Невалиден регулярен израз или scanf израз с прекалено много превръщания " +#~ msgid " Invalid regular expression, or scanf expression with too many conversions " +#~ msgstr " Невалиден регулярен израз или scanf израз с прекалено много превръщания " #~ msgid " Error in replacement format string. " #~ msgstr "Грешка във формата на заместващия низ. " -#, fuzzy #~ msgid " Replacement too long. " #~ msgstr " Въведете заместващия низ:" @@ -4574,7 +4516,6 @@ msgstr "Фонов процес:" #~ msgid "Use to debug the background code" #~ msgstr "Използвай за дебъг на фоновия код" -#, fuzzy #~ msgid "Force subshell execution" #~ msgstr "установи UID при изпълн."