diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index 7e575adfa..21a8222cc 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -2564,48 +2564,102 @@ cancel the Chattr command. .SH "File Operations" When you copy, move or delete files, Midnight Commander shows the file operations dialog. It shows the files currently being processed -and uses up to three progress bars. The file bar indicates the +and uses up to two progress bars. The file bytes bar indicates the percentage of the current file that has been processed so far. The -count bar shows how many of the tagged files have been handled. The -bytes bar indicates the percentage of the total size of the tagged files -that has been handled. If the verbose option is off, the file and bytes -bars are not shown. +total bytes bar indicates the percentage of the total size of the tagged +files that has been handled. Ccounters that show how many of the tagged +files have been handled are displayed. If the +.I Verbose +option is off, the file bytes bar and total bytes bar are not shown. .PP -There are two buttons at the bottom of the dialog. Pressing the Skip -button will skip the rest of the current file. Pressing the Abort -button will abort the whole operation, the rest of the files are -skipped. +There are three buttons at the bottom of the dialog: +.TP +.B [Skip] +button to skip the rest of the current file. +.TP +.B [Suspend] +button to suspend the file operation and button transforms to the +.B [Continue] +one which continue the suspended operation. +.TP +.B [Abort] +button to abort the whole operation, the rest of the files are skipped. .PP There are three other dialogs which you can run into during the file operations. .PP -The error dialog informs about error conditions and has four choices. -Normally you select either the -.I [Ignore] -button to ignore this error, or the -.I [Ignore all] -button to ignore this and all future errors, or the -.I [Abort] -button to abort the operation altogether. You can also select the -.I [Retry] -button if you fixed the problem from another terminal. +The error dialog informs about error conditions and has four choices: +.TP +.B [Ignore] +button to ignore this error. +.TP +.B [Ignore all] +button to ignore this and all future errors. +.TP +.B [Abort] +button to abort the operation altogether. +.TP +.B [Retry] +button to continue if you fixed the problem from another terminal. .PP The replace dialog is shown when you attempt to copy or move a file on the top of an existing file. The dialog shows the dates and sizes of -the both files. Press the Yes button to overwrite the file, the No -button to skip the file, the All button to overwrite all the files, the -None button to never overwrite and the Update button to overwrite if the -source file is newer than the target file. You can abort the whole -operation by pressing the Abort button. +the both files. There are folloing buttons in this dialog: +.TP +.B [Yes] +button to overwrite the file. +.TP +.B [No] +button to skip the file. +.TP +.B [Append] +button to append the source file to the target one. +.TP +.B [Reget] +button to append the rest of the source file to the target one. +This button is displayed only if the size of the target file +is non-zero and less than the size of the source file. +.TP +.B [All] +button to overwrite all the files. +.TP +.B [Older] +button to overwrite if the source file is newer than the target file. +.TP +.B [None] +button to never overwrite files +.TP +.B [Smaller] +button to overwrite if the source file size is less than the target one. +.TP +.B [Size differs] +button to overwrite files with different sizes. +.TP +.B [Abort] +button to abort the whole operation. +.PP +If the +.B Don't overwrite with zero length file +checkbox is on, the zero\-sized source files don't overwrite the +non\-zero\-sized target files. .PP The recursive delete dialog is shown when you try to delete a directory -which is not empty. Press the Yes button to delete the directory -recursively, the No button to skip the directory, the All button to -delete all the directories and the None button to skip all the non\-empty -directories. You can abort the whole operation by pressing the Abort -button. If you selected the Yes or All button you will be asked for a -confirmation. Type "yes" only if you are really sure you want to do the -recursive delete. +which is not empty. There are folloing buttons in this dialog: +.TP +.B [Yes] +button to delete the directory recursively. +.TP +.B [No] +button to skip the directory. +.TP +.B [All] +button to delete all the directories. +.TP +.B [None] +button to skip all the non\-empty directories. +.TP +.B [Abort] +button to abort the whole operation. .PP If you have tagged files and perform an operation on them only the files on which the operation succeeded are untagged. Failed and skipped files diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 0dab0ad17..0b49fcef1 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -2901,57 +2901,66 @@ chattr \- команде изменения атрибутов файлов и файлов, Midnight Commander отображает на экране диалоговое окно, в котором показано, какой(ие) файл(ы) в данный момент обрабатывается и как идет процесс обработки. Для отображения процесса обработки на экран -выводится до трёх диаграмм\-полосок (progress bars). Первая (file bar) -показывает, какая часть текущего файла обработана (например, -скопирована). Вторая (count bar) показывает, какая доля помеченных файлов -обработана на текущий момент. Третья (bytes bar) показывает долю -выполненных работ (в процентах от суммарного объема помеченных файлов). -Если выключена опция +выводится до двух диаграмм\-полосок (progress bars). Первая показывает, +какая часть текущего файла обработана (например, скопирована). Вторая +показывает долю выполненных работ (в процентах от суммарного объема +помеченных файлов). Если выключена опция .I "Детали операций" (см. .\"LINK2" Настройки/Конфигурация\&. .\"Configuration" -), две последних диаграммы не отображаются. +), вторая диаграмма не отображаются. .PP -В нижней части этого диалогового окна имеются две кнопки. Нажатие на -кнопку +В нижней части этого диалогового окна имеются три кнопки: +.TP .B [Пропустить] -приведёт к тому, что будет пропущена обработка текущего файла. Нажатие -на кнопку +прерывает обработку текущего файла. +.TP +.B [Приостановить] +приостанавливает выполнение операции и при нажатии превращается в кнопку +.BR [Продолжить] , +при нажатии на которую выполнение операции продолжится. +.TP .B [Прервать] прерывает выполнение заданной операции, все оставшиеся файлы будут пропущены. .PP В процессе выполнения файловых операций вы можете увидеть окна ещё трёх видов. .PP -Окно ошибок информирует об ошибке и предлагает четыре варианта продолжения. -Обычно вы выбираете либо вариант +Окно ошибок информирует об ошибке и предлагает четыре варианта продолжения: +.TP .B [Игнорировать] -для того, чтобы пропустить ошибку файловой операции, либо +проигнорировать текущую ошибку файловой операции. +.TP .B [Игнорировать всё] -для того, чтобы пропустить эту и все последующие ошибки файловой операции, либо -.BR [Прервать] , -чтобы вообще отменить выполнение заданной операции. Третий вариант, -.BR [Повторить] , -выбирается тогда, когда вам удалось устранить причину сбоя (например, -воспользовавшись другим терминалом). +игнорировать эту и все последующие ошибки файловой операции. +.TP +.B [Прервать] +отменить выполнение заданной операции. +.TP +.B [Повторить] +продолжить выполнение операции, когда вам удалось устранить причину +сбоя (например, воспользовавшись другим терминалом). .PP Окно подтверждения перезаписи появляется тогда, когда вы пытаетесь переписать существующий файл. В этом окне отображаются время создания и -размер файла\-источника и файла\-приёмника (то есть перезаписываемого -файла, который фактически будет уничтожен). Ниже выведены два вопроса. -На первый вопрос ("Переписать этот файл?") предлагается три варианта -ответа: +размеры файла\-источника и файла\-приёмника. Ннже находится вопрос "Переписать +этот файл?" и предлагается четыре варианта ответа: .TP -.B [Д] -согласиться; +.B [Да] +переписать текущий файл. .TP .B [Нет] -отказаться, то есть пропустить перезапись текущего файла; +пропустить перезапись текущего файла. .TP .B [Дописать в конец] дописать содержимое файла\-источника в конец файла\-приёмника. +.TP +.B [Докачать] +дописать оставшуюся часть файла\-источника в конец файла\-приёмника. +Эта кнопка появляется только в том случае, если размер файла\-приёмника +не нулевой и меньше размера файла\-источника. .PP Выбор одного из вариантов ответа на второй вопрос ("Переписать все файлы?") позволяет принять одно решение по всем выбранным для обработки @@ -2959,41 +2968,49 @@ chattr \- команде изменения атрибутов файлов и варианта решения: .TP .B [Все] -перезаписались без дополнительных вопросов все выбранные файлы; +перезаписать без дополнительных вопросов все выбранные файлы. .TP -.B [Устаревшие] -перезапишутся (затрутся) только файлы, которые созданы раньше -файла\-источника; +.B [Старше] +перезапиcать (затереть) только те файлы, которые созданы раньше +файла\-источника. .TP .B [Ни одного] не перезаписывать файлы (но если не существует файла\-приёмника, то -копирование источника будет произведено); +копирование источника будет произведено). +.TP +.B [Меньше] +перезапиcать (затереть) только те файлы, размеры которых меньше +размеров соответствующих файлов\-источников. +.TP +.B [Различающиеся по длине] +перезапиcать (затереть) только те файлы, размеры которых отличаются +от размеров соответствующих файлов\-источников. .TP -.I [Различающиеся по длине] -Вы можете отказаться от выполнения операции, если нажмете кнопку .B [Прервать] -в нижней части окна запроса. Выбор экранной кнопки производится -.B клавишами\-стрелками -или клавишей -.BR Tab . +прервать выполнение операции. +.PP +Если перекючатель +.B Не перезаписывать файлами нулевой длины +включен, то файлы\-источники с нулевыми размерами не будут перезаписывать +файлы\-приёмники с ненулевымы размерами. .PP Окно запроса на рекурсивное удаление появляется в том случае, если вы -пытаетесь удалить непустой каталог. По кнопке +пытаетесь удалить непустой каталог. В этом диалоге имеются следующие кнопки: +.TP .B [Да] каталог будет удален вместе со всеми файлами. +.TP .B [Нет] -означает отказ от удаления каталога. -.B [Всё] надо выбирать, если вы отметили группу подкаталогов для удаления и -уверены в своём выборе, -.B [Ни одного] -\- чтобы пропустить все непустые каталоги из числа помеченных. -.B [Прервать] -означает отказ от выполнения операции удаления. Выбирайте -.B [Да] -или +отказ от удаления каталога. +.TP .B [Всё] -только в том случае, если вы действительно уверены в том, что хотите удалить -каталог со всеми вложенными подкаталогами. +удалить все помеченные каталоги. +.TP +.B [Ни одного] +пропустить все непустые каталоги из числа помеченных. +.TP +.B [Прервать] +отказ от выполнения операции удаления. .PP Если вы пометили для обработки группу файлов, то после выполнения операции будет снята отметка только с тех файлов, которые успешно diff --git a/po/af.po b/po/af.po index 6df1a3ffa..b9c5b8d49 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Afrikaans (http://app.transifex.com/mc/mc/language/af/)\n" @@ -893,6 +893,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2145,7 +2148,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2496,7 +2499,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2572,13 +2575,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2671,7 +2674,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2683,7 +2686,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ar.po b/po/ar.po index 53700b6f0..19301807b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Arabic (http://app.transifex.com/mc/mc/language/ar/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/az.po b/po/az.po index b260e243e..d4740d042 100644 --- a/po/az.po +++ b/po/az.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Azerbaijani (http://app.transifex.com/mc/mc/language/az/)\n" @@ -896,6 +896,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2148,7 +2151,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2499,7 +2502,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2575,13 +2578,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2674,7 +2677,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2686,7 +2689,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/be.po b/po/be.po index 2b9e3bf8f..a8ed93af8 100644 --- a/po/be.po +++ b/po/be.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Viačasłaŭ , 2023-2024\n" "Language-Team: Belarusian (http://app.transifex.com/mc/mc/language/be/)\n" @@ -991,6 +991,10 @@ msgstr "" msgid "Diff:" msgstr "Адрозненні:" +#, fuzzy +msgid "File name is empty!" +msgstr "Назва файла:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» — каталог" @@ -2274,12 +2278,12 @@ msgstr "" "Немагчыма chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Немагчыма атрымаць сцягі \"%s\"\n" +"Немагчыма атрымаць атрыбуты зыходнага файла «%s»\n" "%s" msgid "set &user ID on execution" @@ -2669,8 +2673,9 @@ msgstr "" "\"%s\"\n" "адзін і той жа файл" -msgid "Ski&p all" -msgstr "Прамінуць &усё" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Не зважаць ні на што(&A)" #, c-format msgid "" @@ -2764,17 +2769,17 @@ msgstr "" "Немагчыма запытаць stat зыходнага файла «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Немагчыма атрымаць атрыбуты зыходнага файла «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Немагчыма задаць атрыбуты зыходнага файла «%s»\n" @@ -2891,9 +2896,9 @@ msgstr "" "Немагчыма закрыць мэтавы файл «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Немагчыма задаць атрыбуты для мэтавага файла «%s»\n" @@ -2907,9 +2912,9 @@ msgstr "" "Немагчыма атрымаць уласцівасці зыходнага файла «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Немагчыма атрымаць атрыбуты зыходнага каталога «%s»\n" @@ -4783,3 +4788,14 @@ msgstr "Працягваць ад пачатку?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Немагчыма атрымаць лакальную копію /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Немагчыма атрымаць сцягі \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Прамінуць &усё" diff --git a/po/bg.po b/po/bg.po index 0dd10e02f..576a76411 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Alexander Shopov , 2022\n" "Language-Team: Bulgarian (http://app.transifex.com/mc/mc/language/bg/)\n" @@ -954,6 +954,10 @@ msgstr "" msgid "Diff:" msgstr "Разлика:" +#, fuzzy +msgid "File name is empty!" +msgstr "Име на файл:" + #, c-format msgid "\"%s\" is a directory" msgstr "„%s“ е директория" @@ -2236,9 +2240,9 @@ msgstr "" "Неуспешно изпълнение на chattr „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Не може да се получат флаговете на „%s“\n" @@ -2617,8 +2621,9 @@ msgstr "" "„%s“\n" "са един и същи файл" -msgid "Ski&p all" -msgstr "Проп&ускане всички" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Прескачане на &всички" #, c-format msgid "" @@ -2712,17 +2717,21 @@ msgstr "" "Не може да се изпълни stat върху изходния файл „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Не може да се изпълни stat върху изходния файл „%s“\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Не може да се изпълни fstat върху целевия файл „%s“\n" +"%s" #, c-format msgid "" @@ -2835,11 +2844,13 @@ msgstr "" "Не може да се затвори целевият файл „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Не може да се изпълни fstat върху целевия файл „%s“\n" +"%s" #, c-format msgid "" @@ -2849,11 +2860,13 @@ msgstr "" "Не може да се изпълне stat върху изходната директория „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Не може да се изпълне stat върху изходната директория „%s“\n" +"%s" #, c-format msgid "" @@ -4708,3 +4721,6 @@ msgstr "Да се продължи ли от началото?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Не може да се изтегли локално копие на „/ftp://some.host/editme.txt“" + +#~ msgid "Ski&p all" +#~ msgstr "Проп&ускане всички" diff --git a/po/br.po b/po/br.po index 8cd4c47ba..32212b959 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Irriep Nala Novram , 2017-2018\n" "Language-Team: Breton (http://app.transifex.com/mc/mc/language/br/)\n" @@ -898,6 +898,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2150,7 +2153,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2501,7 +2504,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2577,13 +2580,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2676,7 +2679,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2688,7 +2691,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ca.po b/po/ca.po index a5381db23..53478be5b 100644 --- a/po/ca.po +++ b/po/ca.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Antoni Bella Pérez , 2017-2024\n" "Language-Team: Catalan (http://app.transifex.com/mc/mc/language/ca/)\n" @@ -988,6 +988,10 @@ msgstr "" msgid "Diff:" msgstr "Diferència:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nom del fitxer:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» és un directori" @@ -2274,12 +2278,12 @@ msgstr "" "No s'ha pogut fer chattr «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"No s'han pogut obtenir els indicadors de «%s»\n" +"No es poden obtenir els atributs del fitxer d'origen «%s»\n" "%s" msgid "set &user ID on execution" @@ -2669,8 +2673,9 @@ msgstr "" "«%s»\n" "són el mateix fitxer" -msgid "Ski&p all" -msgstr "Saltar &tot" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignor&a-ho tot" #, c-format msgid "" @@ -2764,17 +2769,17 @@ msgstr "" "No s'ha pogut fer estat al fitxer d'origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "No es poden obtenir els atributs del fitxer d'origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "No es poden establir els atributs del fitxer de destinació «%s»\n" @@ -2891,9 +2896,9 @@ msgstr "" "No s'ha pogut tancar el fitxer de destinació «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "No es poden establir els atributs per al fitxer de destinació «%s»\n" @@ -2907,9 +2912,9 @@ msgstr "" "No s'ha pogut veure l'estat del directori d'origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "No es poden obtenir els atributs del directori d'origen «%s»\n" @@ -4788,3 +4793,14 @@ msgstr "Voleu continuar des del començament?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" "No s'ha pogut obtenir una còpia local de /ftp://algun.amfitrió/editam.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "No s'han pogut obtenir els indicadors de «%s»\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Saltar &tot" diff --git a/po/cs.po b/po/cs.po index 64a87c042..b332436ba 100644 --- a/po/cs.po +++ b/po/cs.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Pavel Borecki , 2017-2023\n" "Language-Team: Czech (http://app.transifex.com/mc/mc/language/cs/)\n" @@ -956,6 +956,10 @@ msgstr "" msgid "Diff:" msgstr "Rozdíl:" +#, fuzzy +msgid "File name is empty!" +msgstr "Název souboru:" + #, c-format msgid "\"%s\" is a directory" msgstr "„%s“ je složka" @@ -2240,9 +2244,9 @@ msgstr "" "Není možné chattr „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Nedaří se získat příznaky „%s“\n" @@ -2637,8 +2641,9 @@ msgstr "" "„%s“\n" "jsou stejný soubor" -msgid "Ski&p all" -msgstr "&Přeskočit vše" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorov&at vše" #, c-format msgid "" @@ -2732,17 +2737,21 @@ msgstr "" "Na zdrojovém souboru „%s“ nelze provést stat\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Na zdrojovém souboru „%s“ nelze provést stat\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Nelze provést fstat cílového souboru „%s“\n" +"%s" #, c-format msgid "" @@ -2855,11 +2864,13 @@ msgstr "" "Nelze zavřít cílový soubor „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Nelze provést fstat cílového souboru „%s“\n" +"%s" #, c-format msgid "" @@ -2869,11 +2880,13 @@ msgstr "" "Na zdrojovém adresáři „%s“ nelze provést stat\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Na zdrojovém adresáři „%s“ nelze provést stat\n" +"%s" #, c-format msgid "" @@ -4740,3 +4753,6 @@ msgstr "Pokračovat od začátku?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Nedaří získat místní kopii souboru /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "&Přeskočit vše" diff --git a/po/da.po b/po/da.po index dd4d2d3f0..aaaaed600 100644 --- a/po/da.po +++ b/po/da.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Morten Bo Johansen , 2018,2023\n" "Language-Team: Danish (http://app.transifex.com/mc/mc/language/da/)\n" @@ -952,6 +952,10 @@ msgstr "" msgid "Diff:" msgstr "Forskel:" +#, fuzzy +msgid "File name is empty!" +msgstr "Filnavn:" + #, c-format msgid "\"%s\" is a directory" msgstr "»%s« er en mappe" @@ -2234,9 +2238,9 @@ msgstr "" "Kan ikke chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Kan ikke hente flag for \"%s\"\n" @@ -2629,8 +2633,9 @@ msgstr "" "»%s«\n" "er den samme fil" -msgid "Ski&p all" -msgstr "&Spring over alle" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorer &alle" #, c-format msgid "" @@ -2724,17 +2729,21 @@ msgstr "" "Kan ikke stat kildefil »%s«\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Kan ikke stat kildefil »%s«\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Kan ikke fstat målfil »%s«\n" +"%s" #, c-format msgid "" @@ -2847,11 +2856,13 @@ msgstr "" "Kan ikke lukke målfil »%s«\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Kan ikke fstat målfil »%s«\n" +"%s" #, c-format msgid "" @@ -2861,11 +2872,13 @@ msgstr "" "Kan ikke stat kildemappe »%s«\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Kan ikke stat kildemappe »%s«\n" +"%s" #, c-format msgid "" @@ -4719,3 +4732,6 @@ msgstr "Fortsæt fra begyndelsen?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kan ikke hente en lokal kopi af /ftp://en.vært/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "&Spring over alle" diff --git a/po/de.po b/po/de.po index 0c98788bc..b6dcb65f6 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Ettore Atalan , 2015-2024\n" "Language-Team: German (http://app.transifex.com/mc/mc/language/de/)\n" @@ -969,6 +969,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Dateiname:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" ist ein Verzeichnis" @@ -2254,9 +2258,9 @@ msgstr "" "Kann chattr für\"%s\" nicht durchführen\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Kann Flags für \"%s\" nicht ermitteln\n" @@ -2649,8 +2653,9 @@ msgstr "" "\"%s\"\n" "sind die gleichen Dateien" -msgid "Ski&p all" -msgstr "Alle übers&pringen" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Alles ignorieren" #, c-format msgid "" @@ -2744,17 +2749,21 @@ msgstr "" "Kann Quelldatei \"%s\" nicht untersuchen\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Kann Quelldatei \"%s\" nicht untersuchen\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Kann Zieldatei \"%s\" nicht untersuchen\n" +"%s" #, c-format msgid "" @@ -2867,11 +2876,13 @@ msgstr "" "Kann Zieldatei \"%s\" nicht schließen\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Kann Zieldatei \"%s\" nicht untersuchen\n" +"%s" #, c-format msgid "" @@ -2881,11 +2892,13 @@ msgstr "" "Kann Quellverzeichnis \"%s\" nicht untersuchen\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Kann Quellverzeichnis \"%s\" nicht untersuchen\n" +"%s" #, c-format msgid "" @@ -4754,3 +4767,6 @@ msgstr "Am Anfang fortsetzen?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kann lokale Kopie von /ftp://some.host/editme.txt nicht erstellen" + +#~ msgid "Ski&p all" +#~ msgstr "Alle übers&pringen" diff --git a/po/de_CH.po b/po/de_CH.po index 962e4a4b5..213d47acb 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/el.po b/po/el.po index 0fe4a965c..a0848a99b 100644 --- a/po/el.po +++ b/po/el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Efstathios Iosifidis , 2015\n" "Language-Team: Greek (http://app.transifex.com/mc/mc/language/el/)\n" @@ -914,6 +914,10 @@ msgstr "" msgid "Diff:" msgstr "" +#, fuzzy +msgid "File name is empty!" +msgstr "Όνομα αρχείου:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" είναι κατάλογος" @@ -2174,11 +2178,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Αδυναμία δημιουργίας αρχείου στόχου \"%s\"\n" +"%s" msgid "set &user ID on execution" msgstr "" @@ -2539,8 +2545,9 @@ msgstr "" "\"%s\"\n" "είναι το ίδιο αρχείο" -msgid "Ski&p all" -msgstr "&Παράβλεψη όλων" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Παράβλεψη κλειδώματος" #, c-format msgid "" @@ -2625,17 +2632,21 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Αδυναμία ανοίγματος πηγαίου αρχείου \"%s\"\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Αδυναμία εγγραφής στο αρχείο στόχο \"%s\"\n" +"%s" #, c-format msgid "" @@ -2740,11 +2751,13 @@ msgstr "" "Αδυναμία κλεισίματος αρχείου στόχου \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Αδυναμία εγγραφής στο αρχείο στόχο \"%s\"\n" +"%s" #, c-format msgid "" @@ -2752,11 +2765,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Αδυναμία δημιουργίας καταλόγου στόχου \"%s\"\n" +"%s" #, c-format msgid "" @@ -4549,3 +4564,6 @@ msgstr "Συνέχεια από την αρχή;" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" + +#~ msgid "Ski&p all" +#~ msgstr "&Παράβλεψη όλων" diff --git a/po/en_GB.po b/po/en_GB.po index 166bda33c..c551c8b71 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Andi Chandler , 2016-2017,2020,2022-2024\n" "Language-Team: English (United Kingdom) (http://app.transifex.com/mc/mc/" @@ -969,6 +969,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "File name:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" is a directory" @@ -2252,12 +2256,12 @@ msgstr "" "Cannot chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Cannot get flags of \"%s\"\n" +"Cannot get attributes of source file \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2646,8 +2650,9 @@ msgstr "" "\"%s\"\n" "are the same file" -msgid "Ski&p all" -msgstr "Ski&p all" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignore &all" #, c-format msgid "" @@ -2741,17 +2746,17 @@ msgstr "" "Cannot stat source file \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Cannot get attributes of source file \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Cannot set attributes of target file \"%s\"\n" @@ -2868,9 +2873,9 @@ msgstr "" "Cannot close target file \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Cannot set attributes for target file \"%s\"\n" @@ -2884,9 +2889,9 @@ msgstr "" "Cannot stat source directory \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Cannot get attributes of source directory \"%s\"\n" @@ -4752,3 +4757,14 @@ msgstr "Continue from beginning?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Cannot fetch a local copy of /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Ski&p all" diff --git a/po/eo.po b/po/eo.po index 4cd615295..16295754b 100644 --- a/po/eo.po +++ b/po/eo.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Yury V. Zaytsev , 2022\n" "Language-Team: Esperanto (http://app.transifex.com/mc/mc/language/eo/)\n" @@ -970,6 +970,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Dosiernomo:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" estas dosierujo" @@ -2255,12 +2259,12 @@ msgstr "" "Ne eblas plenumi la komandon chattr por \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Ne eblas akiri flagojn de \"%s\"\n" +"Ne eblas atingi atributojn de fonta dosiero \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2647,8 +2651,9 @@ msgstr "" "\"%s\"\n" "estas la sama dosiero" -msgid "Ski&p all" -msgstr "Preter&lasi ĉion" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignori ĉio&n" #, c-format msgid "" @@ -2742,17 +2747,17 @@ msgstr "" "Ne eblas trovi fontan dosieron \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Ne eblas atingi atributojn de fonta dosiero \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Ne eblas agordi atributojn de cela dosiero \"%s\"\n" @@ -2869,9 +2874,9 @@ msgstr "" "Ne eblas fermi celan dosieron \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Ne eblas agordi atributojn por cela dosiero \"%s\"\n" @@ -2885,9 +2890,9 @@ msgstr "" "Ne eblas trovi fontan dosierujon \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Ne eblas atingi atributojn de fonta dosierujon \"%s\"\n" @@ -4752,3 +4757,14 @@ msgstr "Ĉu deiri de la komenco?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Ne eblas atingi lokan kopion de /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Ne eblas akiri flagojn de \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Preter&lasi ĉion" diff --git a/po/es.po b/po/es.po index f70358e5d..01e1132ee 100644 --- a/po/es.po +++ b/po/es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Spanish (http://app.transifex.com/mc/mc/language/es/)\n" @@ -978,6 +978,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Archivos:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» no es un directorio" @@ -2263,12 +2267,12 @@ msgstr "" "Imposible chattr a «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Imposible conseguir atributos de «%s»\n" +"Imposible obtener atributos del archivo origen «%s»\n" "%s" msgid "set &user ID on execution" @@ -2658,8 +2662,9 @@ msgstr "" "«%s»\n" "son el mismo archivo" -msgid "Ski&p all" -msgstr "saltar &Todos" +#, fuzzy +msgid "Ignore a&ll" +msgstr "ignorar &Todos" #, c-format msgid "" @@ -2752,17 +2757,17 @@ msgstr "" "Imposible identificar el archivo origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Imposible obtener atributos del archivo origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Imposible establecer atributos del archivo destino «%s»\n" @@ -2879,9 +2884,9 @@ msgstr "" "Imposible cerrar el archivo destino «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Imposible establecer atributos para el archivo destino «%s»\n" @@ -2895,9 +2900,9 @@ msgstr "" "Imposible identificar el directorio de origen «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Imposible obtener atributos del directorio de origen «%s»\n" @@ -4766,3 +4771,14 @@ msgstr "¿Continuar desde el principio?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Imposible obtener una copia local de /ftp://ese.equipo/edítame.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Imposible conseguir atributos de «%s»\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "saltar &Todos" diff --git a/po/et.po b/po/et.po index 9cd983306..322281698 100644 --- a/po/et.po +++ b/po/et.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Priit Jõerüüt , 2020-2021,2023-2024\n" "Language-Team: Estonian (http://app.transifex.com/mc/mc/language/et/)\n" @@ -976,6 +976,10 @@ msgstr "" msgid "Diff:" msgstr "Erinevused:" +#, fuzzy +msgid "File name is empty!" +msgstr "Faili nimi:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" on kataloog" @@ -2259,12 +2263,12 @@ msgstr "" "\"%s\" attribuutide muutmine nurjus\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"\"%s\" lippe ei saa hankida\n" +"Sihtfaili atribuute ei õnnestu laadida \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2653,8 +2657,9 @@ msgstr "" "\"%s\"\n" "on üks ja see sama fail" -msgid "Ski&p all" -msgstr "Jäta &kõik vahele" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Eira &kõiki" #, c-format msgid "" @@ -2748,17 +2753,17 @@ msgstr "" "Lähtefaili \"%s\" info päring nurjus\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Sihtfaili atribuute ei õnnestu laadida \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Sihtfaili atribuute ei õnnestu väärtustada \"%s\"\n" @@ -2875,9 +2880,9 @@ msgstr "" "Sihtfaili \"%s\" sulgemine nurjus\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Sihtfaili jaoks ei õnnestu atribuute väärtustada \"%s\"\n" @@ -2891,9 +2896,9 @@ msgstr "" "Lähtekataloogi \"%s\" info päring nurjus\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Lähtekausta atribuute ei õnnestu laadida \"%s\"\n" @@ -4759,3 +4764,14 @@ msgstr "Kas jätkata algusest?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kohaliku koopia hankimine failist /ftp://some.host/editme.txt nurjus" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "\"%s\" lippe ei saa hankida\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Jäta &kõik vahele" diff --git a/po/eu.po b/po/eu.po index ce7230788..434382426 100644 --- a/po/eu.po +++ b/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Iñigo Salvador Azurmendi , " "2011,2015-2019\n" @@ -944,6 +944,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Fitxategi izena:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" direktorio bat da" @@ -2222,11 +2226,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Ezin da sortu \"%s\" helburu fitxategia\n" +"%s" msgid "set &user ID on execution" msgstr "ezarri &erabiltzaile ID exekutatzean" @@ -2602,8 +2608,9 @@ msgstr "" "\"%s\"\n" "fitxategi bera dira" -msgid "Ski&p all" -msgstr "Sa&hiestu guztia" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Jaramonik ez &guztiari" #, c-format msgid "" @@ -2697,17 +2704,21 @@ msgstr "" "Ezin da lortu \"%s\" iturburu fitxategiaren egoera\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Ezin da lortu \"%s\" iturburu fitxategiaren egoera\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Ezin da loortu \"%s\" helburu fitxategiaren egoera (fstat)\n" +"%s" #, c-format msgid "" @@ -2820,11 +2831,13 @@ msgstr "" "Ezin da itxi \"%s\" helburu fitxategia\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Ezin da loortu \"%s\" helburu fitxategiaren egoera (fstat)\n" +"%s" #, c-format msgid "" @@ -2834,11 +2847,13 @@ msgstr "" "Ezin da lortu \"%s\" iturburu direktorioaren egoera (stat)\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Ezin da lortu \"%s\" iturburu direktorioaren egoera (stat)\n" +"%s" #, c-format msgid "" @@ -4665,3 +4680,6 @@ msgstr "Hasieratik jarraitu?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" "Ezin eskuratu ondokoaren bertako kopia bat: /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "Sa&hiestu guztia" diff --git a/po/fa.po b/po/fa.po index c9985f152..52a44c50e 100644 --- a/po/fa.po +++ b/po/fa.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Arya Hadi , 2017\n" "Language-Team: Persian (http://app.transifex.com/mc/mc/language/fa/)\n" @@ -898,6 +898,10 @@ msgstr "" msgid "Diff:" msgstr "" +#, fuzzy +msgid "File name is empty!" +msgstr "نام فایل:" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2150,7 +2154,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2501,7 +2505,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2577,13 +2581,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2676,7 +2680,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2688,7 +2692,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/fi.po b/po/fi.po index ebbe8d7fb..f679bd0aa 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Kimmo Kujansuu , 2021\n" "Language-Team: Finnish (http://app.transifex.com/mc/mc/language/fi/)\n" @@ -938,6 +938,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Tiedostonimi:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" on hakemisto" @@ -2200,11 +2204,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Kohdetiedostoa ei voi luoda \"%s\"\n" +"%s" msgid "set &user ID on execution" msgstr "" @@ -2553,8 +2559,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ohita &kaikki" #, c-format msgid "" @@ -2643,17 +2650,21 @@ msgstr "" "Lähdetiedostoa ei voi lisätä \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Lähdetiedostoa ei voi lisätä \"%s\"\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Ei onnistu fstat kohdetiedostoon \"%s\"\n" +"%s" #, c-format msgid "" @@ -2766,11 +2777,13 @@ msgstr "" "Kohdetiedostoa ei voi sulkea \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Ei onnistu fstat kohdetiedostoon \"%s\"\n" +"%s" #, c-format msgid "" @@ -2780,11 +2793,13 @@ msgstr "" "Kohdekansiota ei voi lisätä \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Kohdekansiota ei voi lisätä \"%s\"\n" +"%s" #, c-format msgid "" diff --git a/po/fr.po b/po/fr.po index 62d0c2238..cce61b6cf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Wallon Wallon, 2022-2024\n" "Language-Team: French (http://app.transifex.com/mc/mc/language/fr/)\n" @@ -985,6 +985,10 @@ msgstr "" msgid "Diff:" msgstr "Comparaison :" +#, fuzzy +msgid "File name is empty!" +msgstr "Nom du fichier :" + #, c-format msgid "\"%s\" is a directory" msgstr "« %s » est un répertoire" @@ -2271,12 +2275,12 @@ msgstr "" "Chattr impossible « %s »\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Impossible d’obtenir les drapeaux de « %s »\n" +"Impossible d’obtenir les attributs du fichier source « %s »\n" "%s" msgid "set &user ID on execution" @@ -2667,8 +2671,9 @@ msgstr "" "« %s »\n" "sont identiques" -msgid "Ski&p all" -msgstr "Sauter &tout" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorer &tout" #, c-format msgid "" @@ -2762,17 +2767,17 @@ msgstr "" "Impossible d’obtenir les caractéristiques du fichier source « %s »\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Impossible d’obtenir les attributs du fichier source « %s »\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Impossible de définir les attributs du fichier cible « %s »\n" @@ -2889,9 +2894,9 @@ msgstr "" "Impossible de fermer le fichier cible « %s »\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Impossible de définir les attributs du fichier cible « %s »\n" @@ -2905,9 +2910,9 @@ msgstr "" "Impossible d’obtenir les caractéristiques du fichier source « %s »\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Impossible d’obtenir les attributs du répertoire source « %s »\n" @@ -4791,3 +4796,14 @@ msgstr "Continuer à partir du début ?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" "Impossible de récupérer localement le fichier /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Impossible d’obtenir les drapeaux de « %s »\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Sauter &tout" diff --git a/po/fr_CA.po b/po/fr_CA.po index d216fce09..a453267c6 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/mc/" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ga.po b/po/ga.po index 035082789..5a53d69ff 100644 --- a/po/ga.po +++ b/po/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Irish (http://app.transifex.com/mc/mc/language/ga/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/gl.po b/po/gl.po index 5752204b0..21a9f05a8 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Miguel Anxo Bouzada , " "2012,2014-2015,2019\n" @@ -951,6 +951,10 @@ msgstr "" msgid "Diff:" msgstr "Diferenza:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nome do ficheiro:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» é un directorio" @@ -2228,11 +2232,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Non é posíbel crear o ficheiro destino «%s»\n" +"%s" msgid "set &user ID on execution" msgstr "Estabelecer o ID do &Ususrio na execución" @@ -2607,8 +2613,9 @@ msgstr "" "«%s»\n" "son o mesmo ficheiro" -msgid "Ski&p all" -msgstr "Omitir &Todos" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorar &Todo" #, c-format msgid "" @@ -2702,17 +2709,21 @@ msgstr "" "Non é posíbel identificar o ficheiro orixe «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Non é posíbel identificar o ficheiro orixe «%s»\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Non é posíbel identificar o ficheiro destino «%s»\n" +"%s" #, c-format msgid "" @@ -2825,11 +2836,13 @@ msgstr "" "Non é posíbel pechar o ficheiro destino «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Non é posíbel identificar o ficheiro destino «%s»\n" +"%s" #, c-format msgid "" @@ -2839,11 +2852,13 @@ msgstr "" "Non é posíbel identificar o directorio de orixe «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Non é posíbel identificar o directorio de orixe «%s»\n" +"%s" #, c-format msgid "" @@ -4666,3 +4681,6 @@ msgstr "Continuar desde o principio?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Non é posíbel obter unha copia local de /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "Omitir &Todos" diff --git a/po/he.po b/po/he.po index 02c8a5ea4..83e80028c 100644 --- a/po/he.po +++ b/po/he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Hebrew (http://app.transifex.com/mc/mc/language/he/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/hr.po b/po/hr.po index 9931fb0df..4456d7f34 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Croatian (http://app.transifex.com/mc/mc/language/hr/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/hu.po b/po/hu.po index 9ccbc7a66..8866b3133 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: 6bdcf737f9bcb6037ecba892a70fb951_e9eeb40 " ", 2020\n" @@ -937,6 +937,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Fájlnév:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" egy könyvtár" @@ -2212,11 +2216,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Nem sikerült létrehozni a(z) \"%s\" célfájlt. \n" +"%s" msgid "set &user ID on execution" msgstr "&felhasználó-azonosító beállítása végrehajtáskor" @@ -2582,8 +2588,9 @@ msgstr "" "\"%s\" \n" "ugyanaz a fájl" -msgid "Ski&p all" -msgstr "Ö&sszes kihagyása" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Nem érdekes, tovább" #, c-format msgid "" @@ -2676,17 +2683,22 @@ msgstr "" "A(z) \"%s\" forrásfájl adatai nem elérhetők \n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"A(z) \"%s\" forrásfájl adatai nem elérhetők \n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Nem sikerült lekérdezni a(z) \"%s\" \n" +"célfájl adatait. \n" +"%s" #, c-format msgid "" @@ -2802,11 +2814,14 @@ msgstr "" "Nem sikerült lezárni a(z) \"%s\" célfájlt. \n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Nem sikerült lekérdezni a(z) \"%s\" \n" +"célfájl adatait. \n" +"%s" #, c-format msgid "" @@ -2817,11 +2832,14 @@ msgstr "" "forráskönyvtár adatait. \n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Nem sikerült lekérdezni a(z) \"%s\" \n" +"forráskönyvtár adatait. \n" +"%s" #, c-format msgid "" @@ -4643,3 +4661,6 @@ msgstr "Folytatás az elejéről?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Nem sikerült behozni /ftp://some.host/editme.txt helyi másolatát" + +#~ msgid "Ski&p all" +#~ msgstr "Ö&sszes kihagyása" diff --git a/po/ia.po b/po/ia.po index 87e0540f1..00d20d670 100644 --- a/po/ia.po +++ b/po/ia.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Martijn Dekker , 2012,2017\n" "Language-Team: Interlingua (http://app.transifex.com/mc/mc/language/ia/)\n" @@ -914,6 +914,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nomine del file:" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2166,7 +2170,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2517,8 +2521,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorar serratura" #, c-format msgid "" @@ -2593,15 +2598,17 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Impossibile crear file de fusionamento temporari\n" +"%s" #, c-format msgid "" @@ -2690,11 +2697,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Impossibile crear file de fusionamento temporari\n" +"%s" #, c-format msgid "" @@ -2704,7 +2713,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/id.po b/po/id.po index 63d60b5ae..86a6af00d 100644 --- a/po/id.po +++ b/po/id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Ferriandy Chianiago , 2015\n" "Language-Team: Indonesian (http://app.transifex.com/mc/mc/language/id/)\n" @@ -927,6 +927,9 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" adalah directory" @@ -2181,11 +2184,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Gagal stat \"%s\"\n" +"%s" msgid "set &user ID on execution" msgstr "" @@ -2534,8 +2539,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Aba&ikan kunci" #, c-format msgid "" @@ -2610,15 +2616,17 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Gagal membuat temporary merge file\n" +"%s" #, c-format msgid "" @@ -2707,11 +2715,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Gagal membuat temporary merge file\n" +"%s" #, c-format msgid "" @@ -2721,7 +2731,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ie.po b/po/ie.po index e965c3189..85f3861c4 100644 --- a/po/ie.po +++ b/po/ie.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Interlingue (http://app.transifex.com/mc/mc/language/ie/)\n" @@ -893,6 +893,10 @@ msgstr "" msgid "Diff:" msgstr "" +#, fuzzy +msgid "File name is empty!" +msgstr "Nómine de file:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" es un directoria" @@ -2149,7 +2153,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2500,8 +2504,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorar &omni" #, c-format msgid "" @@ -2576,13 +2581,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2675,7 +2680,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2687,7 +2692,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/it.po b/po/it.po index a59bf7056..d99c65637 100644 --- a/po/it.po +++ b/po/it.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2024-09-27 09:30+0200\n" "Last-Translator: Marco Ciampa , 2023\n" "Language-Team: Italian (http://app.transifex.com/mc/mc/language/it/)\n" @@ -977,6 +977,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nome file:" + #, c-format msgid "\"%s\" is a directory" msgstr "%s è una directory" @@ -2261,12 +2265,12 @@ msgstr "" "Non posso chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Non posso ottenere i flag di \"%s\"\n" +"Non posso ottenere gli attributi del file sorgente \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2655,8 +2659,9 @@ msgstr "" "\"%s\"\n" "sono lo stesso file" -msgid "Ski&p all" -msgstr "Sa<a tutti" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignor&a tutto" #, c-format msgid "" @@ -2750,17 +2755,17 @@ msgstr "" "Non posso fare fstat sul file sorgente \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Non posso ottenere gli attributi del file sorgente \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Non posso impostare gli attributi del file destinazione \"%s\"\n" @@ -2877,9 +2882,9 @@ msgstr "" "Non posso chiudere il file destinazione \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Non posso impostare gli attributi del file destinazione \"%s\"\n" @@ -2893,9 +2898,9 @@ msgstr "" "Non posso ottenere info sulla cartella sorgente \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Non posso ottenere gli attributi della cartella sorgente \"%s\"\n" @@ -4765,3 +4770,14 @@ msgstr "Continuare dall'inizio?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Non posso ricevere copia locale di /ftp://un.host/modificami.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Non posso ottenere i flag di \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Sa<a tutti" diff --git a/po/ja.po b/po/ja.po index 5c73834b1..27771b8e1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Takuro Onoue , 2021\n" "Language-Team: Japanese (http://app.transifex.com/mc/mc/language/ja/)\n" @@ -908,6 +908,10 @@ msgstr "" msgid "Diff:" msgstr "" +#, fuzzy +msgid "File name is empty!" +msgstr "ファイル名:" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2164,7 +2168,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2515,8 +2519,8 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "すべて飛ばす(&P)" +msgid "Ignore a&ll" +msgstr "" #, c-format msgid "" @@ -2591,13 +2595,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2690,7 +2694,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2702,7 +2706,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" @@ -4479,3 +4483,6 @@ msgstr "初めから続けますか?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" + +#~ msgid "Ski&p all" +#~ msgstr "すべて飛ばす(&P)" diff --git a/po/ka.po b/po/ka.po index d7fdc57d0..2a5e2224b 100644 --- a/po/ka.po +++ b/po/ka.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Temuri Doghonadze , 2022\n" "Language-Team: Georgian (http://app.transifex.com/mc/mc/language/ka/)\n" @@ -901,6 +901,10 @@ msgstr "" msgid "Diff:" msgstr "განსხვავება:" +#, fuzzy +msgid "File name is empty!" +msgstr "ფაილის სახელი:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" საქაღალდეა" @@ -2160,7 +2164,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2511,8 +2515,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "&ყველას გამოტოვება" +#, fuzzy +msgid "Ignore a&ll" +msgstr "ყველას იგნორირება" #, c-format msgid "" @@ -2589,13 +2594,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2688,7 +2693,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2700,7 +2705,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" @@ -4444,3 +4449,6 @@ msgstr "თავიდან დავიწყო?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" + +#~ msgid "Ski&p all" +#~ msgstr "&ყველას გამოტოვება" diff --git a/po/kk.po b/po/kk.po index 08b1c1e28..3761287d8 100644 --- a/po/kk.po +++ b/po/kk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Aidos Kakimzhanov , 2016\n" "Language-Team: Kazakh (http://app.transifex.com/mc/mc/language/kk/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ko.po b/po/ko.po index 780752cb1..070f3b828 100644 --- a/po/ko.po +++ b/po/ko.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Seong-ho Cho , 2023-2024\n" "Language-Team: Korean (http://app.transifex.com/mc/mc/language/ko/)\n" @@ -952,6 +952,10 @@ msgstr "" msgid "Diff:" msgstr "비교:" +#, fuzzy +msgid "File name is empty!" +msgstr "파일 이름:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\"은(는) 디렉터리임" @@ -2234,9 +2238,9 @@ msgstr "" "\"%s\" 속성 변경을 할 수 없음\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "\"%s\" 플래그를 가져올 수 없음\n" @@ -2626,8 +2630,9 @@ msgstr "" "\"%s\"\n" "는 같은 파일임" -msgid "Ski&p all" -msgstr "모두 건너뛰기(&P)" +#, fuzzy +msgid "Ignore a&ll" +msgstr "모두 무시(&A)" #, c-format msgid "" @@ -2722,17 +2727,21 @@ msgstr "" "\"%s\" 원본 파일을 통계할 수 없음\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"\"%s\" 원본 파일을 통계할 수 없음\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"\"%s\" 대상 파일을 fstat할 수 없음\n" +"%s" #, c-format msgid "" @@ -2845,11 +2854,13 @@ msgstr "" "\"%s\" 대상 파일을 닫을 수 없음\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"\"%s\" 대상 파일을 fstat할 수 없음\n" +"%s" #, c-format msgid "" @@ -2859,11 +2870,13 @@ msgstr "" "\"%s\" 소스 디렉터리를 stat할 수 없음\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"\"%s\" 소스 디렉터리를 stat할 수 없음\n" +"%s" #, c-format msgid "" @@ -4717,3 +4730,6 @@ msgstr "처음부터 계속하시겠습니까?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "/ftp://some.host/editme.txt의 로컬 복사본을 가져올 수 없음" + +#~ msgid "Ski&p all" +#~ msgstr "모두 건너뛰기(&P)" diff --git a/po/kw.po b/po/kw.po index e03d84ed8..725d115bd 100644 --- a/po/kw.po +++ b/po/kw.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Cornish (http://app.transifex.com/mc/mc/language/kw/)\n" @@ -899,6 +899,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2151,7 +2154,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2502,7 +2505,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2578,13 +2581,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2677,7 +2680,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2689,7 +2692,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/lt.po b/po/lt.po index 31a0ec926..0b7e0b809 100644 --- a/po/lt.po +++ b/po/lt.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Mantas Kriaučiūnas Baltix , 2020\n" "Language-Team: Lithuanian (http://app.transifex.com/mc/mc/language/lt/)\n" @@ -933,6 +933,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Failo pavadinimas:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" yra aplankas" @@ -2199,11 +2203,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Nepavyko perrašyti failo \"%s\"\n" +"%s" msgid "set &user ID on execution" msgstr "" @@ -2559,8 +2565,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "Praleisti viską" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Ignoruoti užraktą" #, c-format msgid "" @@ -2650,17 +2657,21 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Nepavyko perrašyti failo \"%s\"\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Nepavyko sukurti aplanko \"%s\"\n" +"%s" #, c-format msgid "" @@ -2749,11 +2760,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Nepavyko sukurti aplanko \"%s\"\n" +"%s" #, c-format msgid "" @@ -2761,11 +2774,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Nepavyko sukurti aplanko \"%s\"\n" +"%s" #, c-format msgid "" @@ -4572,3 +4587,6 @@ msgstr "Tęsti nuo pradžios?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" + +#~ msgid "Ski&p all" +#~ msgstr "Praleisti viską" diff --git a/po/lv.po b/po/lv.po index f6affc203..6f030e147 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Latvian (http://app.transifex.com/mc/mc/language/lv/)\n" @@ -897,6 +897,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2150,7 +2153,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2501,7 +2504,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2577,13 +2580,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2676,7 +2679,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2688,7 +2691,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/mc.pot b/po/mc.pot index 97f0f6f9f..61bc9f1b0 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.32-80-gaa4e5019f\n" +"Project-Id-Version: mc 4.8.32-180-gfc4d18c9f\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -566,11 +566,11 @@ msgstr "" msgid "Shift" msgstr "" -#: lib/tty/tty.c:117 +#: lib/tty/tty.c:118 msgid "The TERM environment variable is unset!\n" msgstr "" -#: lib/tty/tty.c:209 +#: lib/tty/tty.c:210 msgid "Cannot check SIGWINCH pipe" msgstr "" @@ -630,26 +630,26 @@ msgstr "" msgid "GiB" msgstr "" -#: lib/utilunix.c:508 +#: lib/utilunix.c:563 msgid "Cannot create pipe descriptor" msgstr "" -#: lib/utilunix.c:521 +#: lib/utilunix.c:576 msgid "Cannot create pipe streams" msgstr "" -#: lib/utilunix.c:600 +#: lib/utilunix.c:655 #, c-format msgid "" "Unexpected error in select() reading data from a child process:\n" "%s" msgstr "" -#: lib/utilunix.c:676 +#: lib/utilunix.c:731 msgid "Cannot close pipe descriptor (p == NULL)" msgstr "" -#: lib/utilunix.c:694 +#: lib/utilunix.c:749 #, c-format msgid "" "Unexpected error in waitpid():\n" @@ -729,34 +729,34 @@ msgstr "" #: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3005 src/editor/edit.c:374 #: src/editor/editcmd.c:180 src/editor/editcmd.c:203 src/editor/editcmd.c:1485 -#: src/editor/editcmd.c:1491 src/filemanager/cmd.c:145 -#: src/filemanager/file.c:992 src/filemanager/file.c:1995 -#: src/filemanager/filegui.c:478 src/filemanager/filemanager.c:1049 -#: src/filemanager/filemanager.c:1057 src/filemanager/hotlist.c:1156 -#: src/filemanager/hotlist.c:1173 src/filemanager/panel.c:2963 -#: src/filemanager/tree.c:826 src/subshell/common.c:1653 +#: src/editor/editcmd.c:1491 src/filemanager/cmd.c:138 +#: src/filemanager/file.c:1009 src/filemanager/file.c:2017 +#: src/filemanager/filegui.c:478 src/filemanager/filemanager.c:1061 +#: src/filemanager/filemanager.c:1069 src/filemanager/hotlist.c:1156 +#: src/filemanager/hotlist.c:1173 src/filemanager/panel.c:3016 +#: src/filemanager/tree.c:819 src/subshell/common.c:1667 #: src/vfs/sftpfs/connection.c:562 src/vfs/sftpfs/connection.c:574 -#: src/viewer/actions_cmd.c:634 src/viewer/actions_cmd.c:640 +#: src/viewer/actions_cmd.c:639 src/viewer/actions_cmd.c:645 #: src/viewer/search.c:452 msgid "&Yes" msgstr "" #: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3005 src/editor/edit.c:374 #: src/editor/editcmd.c:180 src/editor/editcmd.c:1485 src/editor/editcmd.c:1491 -#: src/filemanager/cmd.c:145 src/filemanager/file.c:992 -#: src/filemanager/file.c:1995 src/filemanager/filegui.c:480 -#: src/filemanager/filemanager.c:1049 src/filemanager/filemanager.c:1057 +#: src/filemanager/cmd.c:138 src/filemanager/file.c:1009 +#: src/filemanager/file.c:2017 src/filemanager/filegui.c:480 +#: src/filemanager/filemanager.c:1061 src/filemanager/filemanager.c:1069 #: src/filemanager/hotlist.c:1156 src/filemanager/hotlist.c:1173 -#: src/filemanager/panel.c:2963 src/filemanager/tree.c:826 -#: src/subshell/common.c:1653 src/vfs/sftpfs/connection.c:562 -#: src/vfs/sftpfs/connection.c:574 src/viewer/actions_cmd.c:634 -#: src/viewer/actions_cmd.c:640 src/viewer/search.c:453 +#: src/filemanager/panel.c:3016 src/filemanager/tree.c:819 +#: src/subshell/common.c:1667 src/vfs/sftpfs/connection.c:562 +#: src/vfs/sftpfs/connection.c:574 src/viewer/actions_cmd.c:639 +#: src/viewer/actions_cmd.c:645 src/viewer/search.c:453 msgid "&No" msgstr "" #: lib/widget/quick.h:213 src/editor/editsearch.c:105 #: src/editor/editsearch.c:1014 src/editor/editwidget.c:156 -#: src/filemanager/boxes.c:1292 src/filemanager/filegui.c:1382 +#: src/filemanager/boxes.c:1292 src/filemanager/filegui.c:1434 #: src/filemanager/find.c:613 src/filemanager/layout.c:509 src/main.c:425 msgid "&OK" msgstr "" @@ -767,11 +767,11 @@ msgstr "" #: src/editor/editcmd.c:1981 src/editor/editcmd.c:2009 #: src/editor/editsearch.c:107 src/editor/editsearch.c:252 #: src/editor/etags.c:374 src/editor/spell.c:359 src/filemanager/achown.c:88 -#: src/filemanager/achown.c:862 src/filemanager/achown.c:899 -#: src/filemanager/chattr.c:233 src/filemanager/chattr.c:1117 -#: src/filemanager/chmod.c:115 src/filemanager/chmod.c:440 -#: src/filemanager/chown.c:87 src/filemanager/chown.c:312 -#: src/filemanager/cmd.c:1013 src/filemanager/filegui.c:1386 +#: src/filemanager/achown.c:851 src/filemanager/achown.c:888 +#: src/filemanager/chattr.c:233 src/filemanager/chattr.c:1106 +#: src/filemanager/chmod.c:115 src/filemanager/chmod.c:429 +#: src/filemanager/chown.c:87 src/filemanager/chown.c:301 +#: src/filemanager/cmd.c:1030 src/filemanager/filegui.c:1438 #: src/filemanager/find.c:613 src/filemanager/hotlist.c:184 #: src/filemanager/hotlist.c:1010 src/filemanager/hotlist.c:1073 #: src/filemanager/layout.c:510 src/filemanager/panelize.c:171 src/learn.c:260 @@ -798,10 +798,10 @@ msgstr "" msgid "%s (%d)" msgstr "" -#: lib/widget/wtools.c:704 src/filemanager/file.c:885 -#: src/filemanager/file.c:945 src/filemanager/file.c:947 -#: src/filemanager/file.c:993 src/filemanager/file.c:3308 -#: src/filemanager/filegui.c:254 src/filemanager/filegui.c:502 +#: lib/widget/wtools.c:704 src/filemanager/file.c:889 +#: src/filemanager/file.c:957 src/filemanager/file.c:959 +#: src/filemanager/file.c:1010 src/filemanager/file.c:3374 +#: src/filemanager/filegui.c:251 src/filemanager/filegui.c:502 msgid "&Abort" msgstr "" @@ -960,7 +960,7 @@ msgstr "" msgid "[+lineno] file1[:lineno] [file2[:lineno]...]" msgstr "" -#: src/args.c:389 src/filemanager/file.c:171 +#: src/args.c:389 src/filemanager/file.c:170 msgid "file" msgstr "" @@ -979,7 +979,7 @@ msgid "" "as tickets at www.midnight-commander.org\n" msgstr "" -#: src/args.c:417 src/filemanager/filemanager.c:1739 src/textconf.c:145 +#: src/args.c:417 src/filemanager/filemanager.c:1751 src/textconf.c:145 #, c-format msgid "GNU Midnight Commander %s\n" msgstr "" @@ -1008,27 +1008,27 @@ msgstr "" msgid "Two files are required to invoke the diffviewer." msgstr "" -#: src/background.c:182 src/background.c:254 +#: src/background.c:181 src/background.c:253 msgid "Background protocol error" msgstr "" -#: src/background.c:182 +#: src/background.c:181 msgid "Reading failed" msgstr "" -#: src/background.c:222 src/filemanager/file.c:854 src/filemanager/file.c:940 +#: src/background.c:221 src/filemanager/file.c:858 src/filemanager/file.c:952 msgid "Background process error" msgstr "" -#: src/background.c:235 src/background.c:286 +#: src/background.c:234 src/background.c:285 msgid "Unknown error in child" msgstr "" -#: src/background.c:243 +#: src/background.c:242 msgid "Child died unexpectedly" msgstr "" -#: src/background.c:255 +#: src/background.c:254 msgid "" "Background process sent us a request for more arguments\n" "than we can handle." @@ -1166,7 +1166,7 @@ msgid "Enter line:" msgstr "" #: src/diffviewer/ydiff.c:2950 src/editor/editwidget.c:676 -#: src/filemanager/filemanager.c:1627 src/filemanager/tree.c:1176 +#: src/filemanager/filemanager.c:1639 src/filemanager/tree.c:1166 #: src/help.c:1170 src/viewer/display.c:90 msgid "ButtonBar|Help" msgstr "" @@ -1176,7 +1176,7 @@ msgstr "" msgid "ButtonBar|Save" msgstr "" -#: src/diffviewer/ydiff.c:2952 src/filemanager/filemanager.c:1630 +#: src/diffviewer/ydiff.c:2952 src/filemanager/filemanager.c:1642 #: src/viewer/display.c:97 msgid "ButtonBar|Edit" msgstr "" @@ -1195,13 +1195,13 @@ msgid "ButtonBar|Options" msgstr "" #: src/diffviewer/ydiff.c:2956 src/editor/editwidget.c:685 -#: src/filemanager/filemanager.c:1636 src/help.c:1179 src/viewer/display.c:121 +#: src/filemanager/filemanager.c:1648 src/help.c:1179 src/viewer/display.c:121 #: src/viewer/display.c:124 msgid "ButtonBar|Quit" msgstr "" #: src/diffviewer/ydiff.c:3002 src/editor/editcmd.c:1491 -#: src/viewer/actions_cmd.c:632 src/viewer/actions_cmd.c:638 +#: src/viewer/actions_cmd.c:637 src/viewer/actions_cmd.c:643 msgid "Quit" msgstr "" @@ -1219,25 +1219,29 @@ msgstr "" msgid "Diff:" msgstr "" -#: src/diffviewer/ydiff.c:3467 src/diffviewer/ydiff.c:3477 -#: src/diffviewer/ydiff.c:3497 src/diffviewer/ydiff.c:3514 +#: src/diffviewer/ydiff.c:3465 src/diffviewer/ydiff.c:3481 +msgid "File name is empty!" +msgstr "" + +#: src/diffviewer/ydiff.c:3473 src/diffviewer/ydiff.c:3488 +#: src/diffviewer/ydiff.c:3508 src/diffviewer/ydiff.c:3525 #, c-format msgid "\"%s\" is a directory" msgstr "" -#: src/diffviewer/ydiff.c:3503 src/diffviewer/ydiff.c:3520 -#: src/filemanager/file.c:1803 src/viewer/mcviewer.c:356 +#: src/diffviewer/ydiff.c:3514 src/diffviewer/ydiff.c:3531 +#: src/filemanager/file.c:1825 src/viewer/mcviewer.c:356 #, c-format msgid "" "Cannot stat \"%s\"\n" "%s" msgstr "" -#: src/diffviewer/ydiff.c:3529 +#: src/diffviewer/ydiff.c:3540 msgid "Diff viewer: invalid mode" msgstr "" -#: src/diffviewer/ydiff.c:3555 +#: src/diffviewer/ydiff.c:3566 msgid "Two files are needed to compare" msgstr "" @@ -1284,10 +1288,10 @@ msgstr "" #: src/editor/edit.c:374 src/editor/editcmd.c:178 src/editor/editcmd.c:201 #: src/editor/editcmd.c:375 src/editor/editcmd.c:517 src/editor/editcmd.c:953 #: src/editor/editcmd.c:1978 src/editor/editcmd.c:2006 src/editor/etags.c:372 -#: src/execute.c:137 src/filemanager/ext.c:792 src/filemanager/file.c:2514 -#: src/filemanager/panel.c:4710 src/help.c:365 src/main.c:422 -#: src/subshell/common.c:1651 src/vfs/sftpfs/connection.c:562 -#: src/viewer/actions_cmd.c:434 +#: src/execute.c:137 src/filemanager/ext.c:792 src/filemanager/file.c:2566 +#: src/filemanager/panel.c:4803 src/help.c:365 src/main.c:422 +#: src/subshell/common.c:1665 src/vfs/sftpfs/connection.c:562 +#: src/viewer/actions_cmd.c:439 msgid "Warning" msgstr "" @@ -1350,7 +1354,7 @@ msgid "&Macintosh format (CR)" msgstr "" #: src/editor/editcmd.c:398 src/editor/editcmd.c:1053 src/editor/editcmd.c:1713 -#: src/editor/editcmd.c:1744 src/filemanager/cmd.c:719 +#: src/editor/editcmd.c:1744 src/filemanager/cmd.c:734 msgid "Enter file name:" msgstr "" @@ -1429,8 +1433,8 @@ msgid "Which syntax file you want to edit?" msgstr "" #: src/editor/editcmd.c:1143 src/editor/editcmd.c:1194 -#: src/filemanager/cmd.c:818 src/filemanager/cmd.c:859 -#: src/filemanager/cmd.c:917 +#: src/filemanager/cmd.c:835 src/filemanager/cmd.c:876 +#: src/filemanager/cmd.c:934 msgid "&User" msgstr "" @@ -1438,15 +1442,15 @@ msgstr "" msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:1192 src/filemanager/cmd.c:857 +#: src/editor/editcmd.c:1192 src/filemanager/cmd.c:874 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:1193 src/filemanager/cmd.c:858 +#: src/editor/editcmd.c:1193 src/filemanager/cmd.c:875 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:1194 src/filemanager/cmd.c:859 +#: src/editor/editcmd.c:1194 src/filemanager/cmd.c:876 msgid "&Local" msgstr "" @@ -1699,8 +1703,8 @@ msgstr "" msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:112 src/filemanager/file.c:2764 -#: src/filemanager/file.c:2820 src/filemanager/filemanager.c:252 +#: src/editor/editmenu.c:112 src/filemanager/file.c:2824 +#: src/filemanager/file.c:2885 src/filemanager/filemanager.c:255 msgid "&Delete" msgstr "" @@ -1872,7 +1876,7 @@ msgstr "" msgid "Save &mode..." msgstr "" -#: src/editor/editmenu.c:244 src/filemanager/filemanager.c:336 +#: src/editor/editmenu.c:244 src/filemanager/filemanager.c:339 msgid "Learn &keys..." msgstr "" @@ -1888,15 +1892,15 @@ msgstr "" msgid "&Menu file" msgstr "" -#: src/editor/editmenu.c:251 src/filemanager/filemanager.c:341 +#: src/editor/editmenu.c:251 src/filemanager/filemanager.c:344 msgid "&Save setup" msgstr "" -#: src/editor/editmenu.c:275 src/filemanager/filemanager.c:353 +#: src/editor/editmenu.c:275 src/filemanager/filemanager.c:356 msgid "&File" msgstr "" -#: src/editor/editmenu.c:277 src/filemanager/filemanager.c:237 +#: src/editor/editmenu.c:277 src/filemanager/filemanager.c:240 msgid "&Edit" msgstr "" @@ -1904,7 +1908,7 @@ msgstr "" msgid "&Search" msgstr "" -#: src/editor/editmenu.c:282 src/filemanager/filemanager.c:355 +#: src/editor/editmenu.c:282 src/filemanager/filemanager.c:358 msgid "&Command" msgstr "" @@ -1916,7 +1920,7 @@ msgstr "" msgid "&Window" msgstr "" -#: src/editor/editmenu.c:288 src/filemanager/filemanager.c:357 +#: src/editor/editmenu.c:288 src/filemanager/filemanager.c:360 msgid "&Options" msgstr "" @@ -2034,15 +2038,14 @@ msgstr "" msgid "&Replace" msgstr "" -#: src/editor/editsearch.c:250 src/filemanager/file.c:992 +#: src/editor/editsearch.c:250 src/filemanager/file.c:1009 #: src/filemanager/filegui.c:491 msgid "A&ll" msgstr "" #: src/editor/editsearch.c:251 src/editor/spell.c:357 -#: src/filemanager/file.c:885 src/filemanager/file.c:944 -#: src/filemanager/file.c:947 src/filemanager/file.c:3309 -#: src/filemanager/filegui.c:251 +#: src/filemanager/file.c:889 src/filemanager/file.c:3375 +#: src/filemanager/filegui.c:248 msgid "&Skip" msgstr "" @@ -2096,8 +2099,8 @@ msgstr "" msgid "ButtonBar|Replac" msgstr "" -#: src/editor/editwidget.c:680 src/filemanager/filemanager.c:1631 -#: src/filemanager/tree.c:1181 +#: src/editor/editwidget.c:680 src/filemanager/filemanager.c:1643 +#: src/filemanager/tree.c:1171 msgid "ButtonBar|Copy" msgstr "" @@ -2105,11 +2108,11 @@ msgstr "" msgid "ButtonBar|Move" msgstr "" -#: src/editor/editwidget.c:683 src/filemanager/filemanager.c:1634 +#: src/editor/editwidget.c:683 src/filemanager/filemanager.c:1646 msgid "ButtonBar|Delete" msgstr "" -#: src/editor/editwidget.c:684 src/filemanager/filemanager.c:1635 +#: src/editor/editwidget.c:684 src/filemanager/filemanager.c:1647 msgid "ButtonBar|PullDn" msgstr "" @@ -2249,8 +2252,8 @@ msgstr "" msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1544 src/help.c:1105 src/usermenu.c:1001 -#: src/usermenu.c:1032 +#: src/editor/syntax.c:1544 src/help.c:1105 src/usermenu.c:1016 +#: src/usermenu.c:1047 #, c-format msgid "" "Cannot open file %s\n" @@ -2330,35 +2333,36 @@ msgstr "" msgid "Chown advanced command" msgstr "" -#: src/filemanager/achown.c:859 src/filemanager/achown.c:1060 -#: src/filemanager/chmod.c:437 src/filemanager/chmod.c:583 +#: src/filemanager/achown.c:848 src/filemanager/achown.c:1048 +#: src/filemanager/chmod.c:426 src/filemanager/chmod.c:571 #, c-format msgid "" "Cannot chmod \"%s\"\n" "%s" msgstr "" -#: src/filemanager/achown.c:861 src/filemanager/achown.c:898 -#: src/filemanager/chattr.c:1116 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 src/vfs/sftpfs/connection.c:562 +#: src/filemanager/achown.c:850 src/filemanager/achown.c:887 +#: src/filemanager/chattr.c:1105 src/filemanager/chmod.c:428 +#: src/filemanager/chown.c:300 src/filemanager/file.c:956 +#: src/filemanager/file.c:959 src/vfs/sftpfs/connection.c:562 #: src/vfs/sftpfs/connection.c:574 msgid "&Ignore" msgstr "" -#: src/filemanager/achown.c:861 src/filemanager/achown.c:898 -#: src/filemanager/chattr.c:1116 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 +#: src/filemanager/achown.c:850 src/filemanager/achown.c:887 +#: src/filemanager/chattr.c:1105 src/filemanager/chmod.c:428 +#: src/filemanager/chown.c:300 msgid "Ignore &all" msgstr "" -#: src/filemanager/achown.c:861 src/filemanager/achown.c:898 -#: src/filemanager/chattr.c:1116 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 src/filemanager/file.c:944 src/viewer/hex.c:427 +#: src/filemanager/achown.c:850 src/filemanager/achown.c:887 +#: src/filemanager/chattr.c:1105 src/filemanager/chmod.c:428 +#: src/filemanager/chown.c:300 src/filemanager/file.c:956 src/viewer/hex.c:427 msgid "&Retry" msgstr "" -#: src/filemanager/achown.c:896 src/filemanager/achown.c:1064 -#: src/filemanager/chown.c:309 src/filemanager/chown.c:476 +#: src/filemanager/achown.c:885 src/filemanager/achown.c:1052 +#: src/filemanager/chown.c:298 src/filemanager/chown.c:464 #, c-format msgid "" "Cannot chown \"%s\"\n" @@ -2668,7 +2672,7 @@ msgstr "" msgid "Confirmation|&History cleanup" msgstr "" -#: src/filemanager/boxes.c:944 src/filemanager/cmd.c:144 +#: src/filemanager/boxes.c:944 src/filemanager/cmd.c:137 msgid "Confirmation" msgstr "" @@ -2700,7 +2704,7 @@ msgstr "" msgid "Input / display codepage:" msgstr "" -#: src/filemanager/boxes.c:1090 src/filemanager/tree.c:1131 +#: src/filemanager/boxes.c:1090 src/filemanager/tree.c:1121 msgid "Directory tree" msgstr "" @@ -2896,17 +2900,17 @@ msgstr "" msgid "Chattr command" msgstr "" -#: src/filemanager/chattr.c:1114 src/filemanager/chattr.c:1261 +#: src/filemanager/chattr.c:1103 src/filemanager/chattr.c:1249 #, c-format msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" -#: src/filemanager/chattr.c:1236 +#: src/filemanager/chattr.c:1224 #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -3027,182 +3031,182 @@ msgstr "" msgid "" msgstr "" -#: src/filemanager/cmd.c:121 +#: src/filemanager/cmd.c:112 msgid "Enter machine name (F1 for details):" msgstr "" -#: src/filemanager/cmd.c:144 +#: src/filemanager/cmd.c:137 msgid "Files tagged, want to cd?" msgstr "" -#: src/filemanager/cmd.c:319 +#: src/filemanager/cmd.c:312 #, c-format msgid "Link %s to:" msgstr "" -#: src/filemanager/cmd.c:321 +#: src/filemanager/cmd.c:314 msgid "Link" msgstr "" -#: src/filemanager/cmd.c:330 +#: src/filemanager/cmd.c:323 #, c-format msgid "link: %s" msgstr "" -#: src/filemanager/cmd.c:369 +#: src/filemanager/cmd.c:362 #, c-format msgid "symlink: %s" msgstr "" -#: src/filemanager/cmd.c:592 +#: src/filemanager/cmd.c:590 msgid "View file" msgstr "" -#: src/filemanager/cmd.c:592 +#: src/filemanager/cmd.c:590 msgid "Filename:" msgstr "" -#: src/filemanager/cmd.c:626 +#: src/filemanager/cmd.c:631 msgid "Filtered view" msgstr "" -#: src/filemanager/cmd.c:627 +#: src/filemanager/cmd.c:632 msgid "Filter command and arguments:" msgstr "" -#: src/filemanager/cmd.c:719 +#: src/filemanager/cmd.c:734 msgid "Edit file" msgstr "" -#: src/filemanager/cmd.c:754 +#: src/filemanager/cmd.c:771 msgid "Create a new Directory" msgstr "" -#: src/filemanager/cmd.c:755 +#: src/filemanager/cmd.c:772 msgid "Enter directory name:" msgstr "" -#: src/filemanager/cmd.c:816 +#: src/filemanager/cmd.c:833 msgid "Extension file edit" msgstr "" -#: src/filemanager/cmd.c:817 +#: src/filemanager/cmd.c:834 msgid "Which extension file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:818 src/filemanager/cmd.c:859 -#: src/filemanager/cmd.c:917 +#: src/filemanager/cmd.c:835 src/filemanager/cmd.c:876 +#: src/filemanager/cmd.c:934 msgid "&System Wide" msgstr "" -#: src/filemanager/cmd.c:915 +#: src/filemanager/cmd.c:932 msgid "Highlighting groups file edit" msgstr "" -#: src/filemanager/cmd.c:916 +#: src/filemanager/cmd.c:933 msgid "Which highlighting file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:1011 +#: src/filemanager/cmd.c:1028 msgid "Compare directories" msgstr "" -#: src/filemanager/cmd.c:1012 +#: src/filemanager/cmd.c:1029 msgid "Select compare method:" msgstr "" -#: src/filemanager/cmd.c:1013 +#: src/filemanager/cmd.c:1030 msgid "&Quick" msgstr "" -#: src/filemanager/cmd.c:1013 +#: src/filemanager/cmd.c:1030 msgid "&Size only" msgstr "" -#: src/filemanager/cmd.c:1013 +#: src/filemanager/cmd.c:1030 msgid "&Thorough" msgstr "" -#: src/filemanager/cmd.c:1027 +#: src/filemanager/cmd.c:1044 msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -#: src/filemanager/cmd.c:1086 +#: src/filemanager/cmd.c:1106 #, c-format msgid "'%s' is not a symbolic link" msgstr "" -#: src/filemanager/cmd.c:1099 +#: src/filemanager/cmd.c:1119 #, c-format msgid "Symlink '%s' points to:" msgstr "" -#: src/filemanager/cmd.c:1101 +#: src/filemanager/cmd.c:1121 msgid "Edit symlink" msgstr "" -#: src/filemanager/cmd.c:1114 +#: src/filemanager/cmd.c:1134 #, c-format msgid "edit symlink, unable to remove %s: %s" msgstr "" -#: src/filemanager/cmd.c:1122 +#: src/filemanager/cmd.c:1142 #, c-format msgid "edit symlink: %s" msgstr "" -#: src/filemanager/cmd.c:1159 +#: src/filemanager/cmd.c:1179 msgid "FTP to machine" msgstr "" -#: src/filemanager/cmd.c:1170 +#: src/filemanager/cmd.c:1190 msgid "SFTP to machine" msgstr "" -#: src/filemanager/cmd.c:1182 +#: src/filemanager/cmd.c:1202 msgid "Shell link to machine" msgstr "" -#: src/filemanager/cmd.c:1194 +#: src/filemanager/cmd.c:1214 msgid "Undelete files on an ext2 file system" msgstr "" -#: src/filemanager/cmd.c:1195 +#: src/filemanager/cmd.c:1215 msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" -#: src/filemanager/cmd.c:1256 src/filemanager/cmd.c:1290 -#: src/filemanager/file.c:765 +#: src/filemanager/cmd.c:1277 src/filemanager/cmd.c:1311 +#: src/filemanager/file.c:766 msgid "Directory scanning" msgstr "" -#: src/filemanager/cmd.c:1336 src/filemanager/cmd.c:1338 +#: src/filemanager/cmd.c:1357 src/filemanager/cmd.c:1359 msgid "Setup" msgstr "" -#: src/filemanager/cmd.c:1336 +#: src/filemanager/cmd.c:1357 #, c-format msgid "Setup saved to %s" msgstr "" -#: src/filemanager/cmd.c:1338 +#: src/filemanager/cmd.c:1359 #, c-format msgid "Unable to save setup to %s" msgstr "" -#: src/filemanager/command.c:119 src/usermenu.c:990 +#: src/filemanager/command.c:119 src/usermenu.c:1005 msgid "Cannot execute commands on non-local filesystems" msgstr "" -#: src/filemanager/ext.c:257 src/usermenu.c:490 +#: src/filemanager/ext.c:257 src/usermenu.c:504 msgid "Parameter" msgstr "" -#: src/filemanager/ext.c:473 src/usermenu.c:461 +#: src/filemanager/ext.c:473 src/usermenu.c:475 #, c-format msgid "" "Cannot create temporary command file\n" @@ -3242,78 +3246,78 @@ msgid "" "or use that file as an example of how to write it." msgstr "" -#: src/filemanager/file.c:95 src/filemanager/file.c:2762 -#: src/filemanager/file.c:2819 src/filemanager/tree.c:719 +#: src/filemanager/file.c:94 src/filemanager/file.c:2822 +#: src/filemanager/file.c:2884 src/filemanager/tree.c:719 msgid "DialogTitle|Copy" msgstr "" -#: src/filemanager/file.c:96 src/filemanager/tree.c:755 +#: src/filemanager/file.c:95 src/filemanager/tree.c:752 msgid "DialogTitle|Move" msgstr "" -#: src/filemanager/file.c:97 src/filemanager/hotlist.c:1155 -#: src/filemanager/hotlist.c:1172 src/filemanager/tree.c:826 +#: src/filemanager/file.c:96 src/filemanager/hotlist.c:1155 +#: src/filemanager/hotlist.c:1172 src/filemanager/tree.c:819 msgid "DialogTitle|Delete" msgstr "" -#: src/filemanager/file.c:151 +#: src/filemanager/file.c:150 msgid "FileOperation|Copy" msgstr "" -#: src/filemanager/file.c:152 +#: src/filemanager/file.c:151 msgid "FileOperation|Move" msgstr "" -#: src/filemanager/file.c:153 +#: src/filemanager/file.c:152 msgid "FileOperation|Delete" msgstr "" -#: src/filemanager/file.c:166 +#: src/filemanager/file.c:165 #, no-c-format msgid "%o %f%n\"%s\"%m" msgstr "" -#: src/filemanager/file.c:168 +#: src/filemanager/file.c:167 #, no-c-format msgid "%o %d %f%m" msgstr "" -#: src/filemanager/file.c:172 +#: src/filemanager/file.c:171 msgid "files" msgstr "" -#: src/filemanager/file.c:173 +#: src/filemanager/file.c:172 msgid "directory" msgstr "" -#: src/filemanager/file.c:174 +#: src/filemanager/file.c:173 msgid "directories" msgstr "" -#: src/filemanager/file.c:175 +#: src/filemanager/file.c:174 msgid "files/directories" msgstr "" #. TRANSLATORS: keep leading space here to split words in Copy/Move dialog -#: src/filemanager/file.c:177 +#: src/filemanager/file.c:176 msgid " with source mask:" msgstr "" -#: src/filemanager/file.c:409 +#: src/filemanager/file.c:408 #, c-format msgid "" "Cannot stat hardlink source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:429 +#: src/filemanager/file.c:428 #, c-format msgid "" "Cannot create target hardlink \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:465 +#: src/filemanager/file.c:464 #, c-format msgid "Cannot create target hardlink \"%s\"" msgstr "" @@ -3332,14 +3336,14 @@ msgid "" "Option Stable Symlinks will be disabled" msgstr "" -#: src/filemanager/file.c:612 +#: src/filemanager/file.c:613 #, c-format msgid "" "Cannot create target symlink \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:924 +#: src/filemanager/file.c:931 #, c-format msgid "" "\"%s\"\n" @@ -3348,7 +3352,7 @@ msgid "" "are the same directory" msgstr "" -#: src/filemanager/file.c:926 +#: src/filemanager/file.c:933 #, c-format msgid "" "\"%s\"\n" @@ -3357,18 +3361,18 @@ msgid "" "are the same file" msgstr "" -#: src/filemanager/file.c:944 src/filemanager/file.c:947 -msgid "Ski&p all" +#: src/filemanager/file.c:956 src/filemanager/file.c:959 +msgid "Ignore a&ll" msgstr "" -#: src/filemanager/file.c:984 +#: src/filemanager/file.c:1001 #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:985 +#: src/filemanager/file.c:1002 #, c-format msgid "" "Background process:\n" @@ -3376,268 +3380,268 @@ msgid "" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:993 src/filemanager/filegui.c:495 +#: src/filemanager/file.c:1010 src/filemanager/filegui.c:495 msgid "Non&e" msgstr "" -#: src/filemanager/file.c:1187 +#: src/filemanager/file.c:1197 #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1245 +#: src/filemanager/file.c:1253 #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1261 +#: src/filemanager/file.c:1269 #, c-format msgid "Cannot overwrite directory \"%s\"" msgstr "" -#: src/filemanager/file.c:1316 +#: src/filemanager/file.c:1320 #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1425 +#: src/filemanager/file.c:1435 #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1667 src/filemanager/file.c:2290 +#: src/filemanager/file.c:1675 src/filemanager/file.c:2322 #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1669 +#: src/filemanager/file.c:1677 #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1690 +#: src/filemanager/file.c:1699 #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1792 +#: src/filemanager/file.c:1814 msgid "Cannot operate on \"..\"!" msgstr "" -#: src/filemanager/file.c:2309 +#: src/filemanager/file.c:2342 #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2330 +#: src/filemanager/file.c:2373 #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2401 src/filemanager/file.c:2475 +#: src/filemanager/file.c:2446 src/filemanager/file.c:2523 #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2427 +#: src/filemanager/file.c:2472 #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2439 src/filemanager/file.c:2835 +#: src/filemanager/file.c:2486 src/filemanager/file.c:2900 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2454 src/filemanager/file.c:2856 +#: src/filemanager/file.c:2502 src/filemanager/file.c:2921 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2501 +#: src/filemanager/file.c:2554 #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2514 +#: src/filemanager/file.c:2566 msgid "Reget failed, about to overwrite file" msgstr "" -#: src/filemanager/file.c:2525 +#: src/filemanager/file.c:2578 #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2557 +#: src/filemanager/file.c:2611 #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2589 +#: src/filemanager/file.c:2644 #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2610 +#: src/filemanager/file.c:2665 #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2669 +#: src/filemanager/file.c:2723 #, c-format msgid "" "Cannot read source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2708 +#: src/filemanager/file.c:2763 #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2742 +#: src/filemanager/file.c:2802 msgid "(stalled)" msgstr "" -#: src/filemanager/file.c:2763 src/filemanager/file.c:2819 +#: src/filemanager/file.c:2823 src/filemanager/file.c:2884 msgid "Incomplete file was retrieved" msgstr "" -#: src/filemanager/file.c:2764 src/filemanager/file.c:2820 +#: src/filemanager/file.c:2824 src/filemanager/file.c:2885 msgid "&Keep" msgstr "" -#: src/filemanager/file.c:2764 +#: src/filemanager/file.c:2824 msgid "&Continue copy" msgstr "" -#: src/filemanager/file.c:2795 +#: src/filemanager/file.c:2860 #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2807 +#: src/filemanager/file.c:2872 #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2899 +#: src/filemanager/file.c:2965 #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2962 +#: src/filemanager/file.c:3029 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2987 +#: src/filemanager/file.c:3051 #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3034 +#: src/filemanager/file.c:3100 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:3046 +#: src/filemanager/file.c:3112 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:3085 src/filemanager/file.c:3581 -#: src/filemanager/tree.c:769 +#: src/filemanager/file.c:3151 src/filemanager/file.c:3648 +#: src/filemanager/tree.c:766 #, c-format msgid "" "Destination \"%s\" must be a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:3118 +#: src/filemanager/file.c:3184 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3142 +#: src/filemanager/file.c:3209 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3353 +#: src/filemanager/file.c:3419 #, c-format msgid "Directories: %zu, total size: %s" msgstr "" -#: src/filemanager/file.c:3499 +#: src/filemanager/file.c:3563 msgid "Sorry, I could not put the job in background" msgstr "" -#: src/filemanager/filegui.c:252 src/filemanager/find.c:192 +#: src/filemanager/filegui.c:249 src/filemanager/find.c:192 msgid "S&uspend" msgstr "" -#: src/filemanager/filegui.c:253 src/filemanager/find.c:193 +#: src/filemanager/filegui.c:250 src/filemanager/find.c:193 msgid "Con&tinue" msgstr "" -#: src/filemanager/filegui.c:343 +#: src/filemanager/filegui.c:340 #, c-format msgid "%d:%02d:%02d" msgstr "" @@ -3702,385 +3706,385 @@ msgstr "" msgid "&Size differs" msgstr "" -#: src/filemanager/filegui.c:525 +#: src/filemanager/filegui.c:527 msgid "File exists" msgstr "" -#: src/filemanager/filegui.c:527 +#: src/filemanager/filegui.c:529 msgid "Background process: File exists" msgstr "" -#: src/filemanager/filegui.c:1045 -#, c-format -msgid "Files processed: %zu / %zu" -msgstr "" - -#: src/filemanager/filegui.c:1048 -#, c-format -msgid "Files processed: %zu" -msgstr "" - -#: src/filemanager/filegui.c:1093 -#, c-format -msgid "Time: %s %s" -msgstr "" - #: src/filemanager/filegui.c:1097 #, c-format +msgid "Files processed: %zu / %zu" +msgstr "" + +#: src/filemanager/filegui.c:1100 +#, c-format +msgid "Files processed: %zu" +msgstr "" + +#: src/filemanager/filegui.c:1145 +#, c-format +msgid "Time: %s %s" +msgstr "" + +#: src/filemanager/filegui.c:1149 +#, c-format msgid "Time: %s %s (%s)" msgstr "" -#: src/filemanager/filegui.c:1103 +#: src/filemanager/filegui.c:1155 #, c-format msgid "Time: %s" msgstr "" -#: src/filemanager/filegui.c:1107 +#: src/filemanager/filegui.c:1159 #, c-format msgid "Time: %s (%s)" msgstr "" -#: src/filemanager/filegui.c:1117 +#: src/filemanager/filegui.c:1169 #, c-format msgid " Total: %s " msgstr "" -#: src/filemanager/filegui.c:1121 +#: src/filemanager/filegui.c:1173 #, c-format msgid " Total: %s / %s " msgstr "" -#: src/filemanager/filegui.c:1142 +#: src/filemanager/filegui.c:1194 msgid "Source" msgstr "" -#: src/filemanager/filegui.c:1166 +#: src/filemanager/filegui.c:1218 msgid "Target" msgstr "" -#: src/filemanager/filegui.c:1200 +#: src/filemanager/filegui.c:1252 msgid "Deleting" msgstr "" -#: src/filemanager/filegui.c:1369 src/filemanager/find.c:595 -#: src/filemanager/panel.c:2619 +#: src/filemanager/filegui.c:1421 src/filemanager/find.c:595 +#: src/filemanager/panel.c:2672 msgid "&Using shell patterns" msgstr "" -#: src/filemanager/filegui.c:1371 +#: src/filemanager/filegui.c:1423 msgid "to:" msgstr "" -#: src/filemanager/filegui.c:1375 +#: src/filemanager/filegui.c:1427 msgid "Follow &links" msgstr "" -#: src/filemanager/filegui.c:1376 +#: src/filemanager/filegui.c:1428 msgid "Preserve &attributes" msgstr "" -#: src/filemanager/filegui.c:1378 +#: src/filemanager/filegui.c:1430 msgid "Di&ve into subdir if exists" msgstr "" -#: src/filemanager/filegui.c:1379 +#: src/filemanager/filegui.c:1431 msgid "&Stable symlinks" msgstr "" -#: src/filemanager/filegui.c:1384 +#: src/filemanager/filegui.c:1436 msgid "&Background" msgstr "" -#: src/filemanager/filegui.c:1438 +#: src/filemanager/filegui.c:1490 #, c-format msgid "Invalid source pattern '%s'" msgstr "" -#: src/filemanager/filemanager.c:198 +#: src/filemanager/filemanager.c:201 msgid "File listin&g" msgstr "" -#: src/filemanager/filemanager.c:199 +#: src/filemanager/filemanager.c:202 msgid "&Quick view" msgstr "" -#: src/filemanager/filemanager.c:200 +#: src/filemanager/filemanager.c:203 msgid "&Info" msgstr "" -#: src/filemanager/filemanager.c:201 src/filemanager/find.c:613 +#: src/filemanager/filemanager.c:204 src/filemanager/find.c:613 msgid "&Tree" msgstr "" -#: src/filemanager/filemanager.c:204 +#: src/filemanager/filemanager.c:207 msgid "&Listing format..." msgstr "" -#: src/filemanager/filemanager.c:205 +#: src/filemanager/filemanager.c:208 msgid "&Sort order..." msgstr "" -#: src/filemanager/filemanager.c:206 +#: src/filemanager/filemanager.c:209 msgid "&Filter..." msgstr "" -#: src/filemanager/filemanager.c:208 +#: src/filemanager/filemanager.c:211 msgid "&Encoding..." msgstr "" -#: src/filemanager/filemanager.c:212 +#: src/filemanager/filemanager.c:215 msgid "FT&P link..." msgstr "" -#: src/filemanager/filemanager.c:215 +#: src/filemanager/filemanager.c:218 msgid "S&hell link..." msgstr "" -#: src/filemanager/filemanager.c:218 +#: src/filemanager/filemanager.c:221 msgid "SFTP li&nk..." msgstr "" -#: src/filemanager/filemanager.c:220 +#: src/filemanager/filemanager.c:223 msgid "Paneli&ze" msgstr "" -#: src/filemanager/filemanager.c:222 +#: src/filemanager/filemanager.c:225 msgid "&Rescan" msgstr "" -#: src/filemanager/filemanager.c:234 +#: src/filemanager/filemanager.c:237 msgid "&View" msgstr "" -#: src/filemanager/filemanager.c:235 +#: src/filemanager/filemanager.c:238 msgid "Vie&w file..." msgstr "" -#: src/filemanager/filemanager.c:236 +#: src/filemanager/filemanager.c:239 msgid "&Filtered view" msgstr "" -#: src/filemanager/filemanager.c:238 +#: src/filemanager/filemanager.c:241 msgid "&Copy" msgstr "" -#: src/filemanager/filemanager.c:239 +#: src/filemanager/filemanager.c:242 msgid "C&hmod" msgstr "" -#: src/filemanager/filemanager.c:240 +#: src/filemanager/filemanager.c:243 msgid "&Link" msgstr "" -#: src/filemanager/filemanager.c:241 +#: src/filemanager/filemanager.c:244 msgid "&Symlink" msgstr "" -#: src/filemanager/filemanager.c:243 +#: src/filemanager/filemanager.c:246 msgid "Relative symlin&k" msgstr "" -#: src/filemanager/filemanager.c:244 +#: src/filemanager/filemanager.c:247 msgid "Edit s&ymlink" msgstr "" -#: src/filemanager/filemanager.c:245 +#: src/filemanager/filemanager.c:248 msgid "Ch&own" msgstr "" -#: src/filemanager/filemanager.c:246 +#: src/filemanager/filemanager.c:249 msgid "&Advanced chown" msgstr "" -#: src/filemanager/filemanager.c:248 +#: src/filemanager/filemanager.c:251 msgid "Cha&ttr" msgstr "" -#: src/filemanager/filemanager.c:250 +#: src/filemanager/filemanager.c:253 msgid "&Rename/Move" msgstr "" -#: src/filemanager/filemanager.c:251 +#: src/filemanager/filemanager.c:254 msgid "&Mkdir" msgstr "" -#: src/filemanager/filemanager.c:253 +#: src/filemanager/filemanager.c:256 msgid "&Quick cd" msgstr "" -#: src/filemanager/filemanager.c:255 +#: src/filemanager/filemanager.c:258 msgid "Select &group" msgstr "" -#: src/filemanager/filemanager.c:256 +#: src/filemanager/filemanager.c:259 msgid "U&nselect group" msgstr "" -#: src/filemanager/filemanager.c:257 +#: src/filemanager/filemanager.c:260 msgid "&Invert selection" msgstr "" -#: src/filemanager/filemanager.c:259 +#: src/filemanager/filemanager.c:262 msgid "E&xit" msgstr "" -#: src/filemanager/filemanager.c:275 +#: src/filemanager/filemanager.c:278 msgid "&User menu" msgstr "" -#: src/filemanager/filemanager.c:276 +#: src/filemanager/filemanager.c:279 msgid "&Directory tree" msgstr "" -#: src/filemanager/filemanager.c:277 +#: src/filemanager/filemanager.c:280 msgid "&Find file" msgstr "" -#: src/filemanager/filemanager.c:278 +#: src/filemanager/filemanager.c:281 msgid "S&wap panels" msgstr "" -#: src/filemanager/filemanager.c:279 +#: src/filemanager/filemanager.c:282 msgid "Switch &panels on/off" msgstr "" -#: src/filemanager/filemanager.c:280 +#: src/filemanager/filemanager.c:283 msgid "&Compare directories" msgstr "" -#: src/filemanager/filemanager.c:282 +#: src/filemanager/filemanager.c:285 msgid "C&ompare files" msgstr "" -#: src/filemanager/filemanager.c:285 +#: src/filemanager/filemanager.c:288 msgid "E&xternal panelize" msgstr "" -#: src/filemanager/filemanager.c:286 +#: src/filemanager/filemanager.c:289 msgid "Show directory s&izes" msgstr "" -#: src/filemanager/filemanager.c:288 +#: src/filemanager/filemanager.c:291 msgid "Command &history" msgstr "" -#: src/filemanager/filemanager.c:291 +#: src/filemanager/filemanager.c:294 msgid "Viewed/edited files hi&story" msgstr "" -#: src/filemanager/filemanager.c:292 +#: src/filemanager/filemanager.c:295 msgid "Di&rectory hotlist" msgstr "" -#: src/filemanager/filemanager.c:294 +#: src/filemanager/filemanager.c:297 msgid "&Active VFS list" msgstr "" -#: src/filemanager/filemanager.c:297 +#: src/filemanager/filemanager.c:300 msgid "&Background jobs" msgstr "" -#: src/filemanager/filemanager.c:299 +#: src/filemanager/filemanager.c:302 msgid "Screen lis&t" msgstr "" -#: src/filemanager/filemanager.c:303 +#: src/filemanager/filemanager.c:306 msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/filemanager/filemanager.c:306 +#: src/filemanager/filemanager.c:309 msgid "&Listing format edit" msgstr "" -#: src/filemanager/filemanager.c:312 +#: src/filemanager/filemanager.c:315 msgid "Edit &extension file" msgstr "" -#: src/filemanager/filemanager.c:313 +#: src/filemanager/filemanager.c:316 msgid "Edit &menu file" msgstr "" -#: src/filemanager/filemanager.c:316 +#: src/filemanager/filemanager.c:319 msgid "Edit hi&ghlighting group file" msgstr "" -#: src/filemanager/filemanager.c:329 +#: src/filemanager/filemanager.c:332 msgid "&Configuration..." msgstr "" -#: src/filemanager/filemanager.c:330 +#: src/filemanager/filemanager.c:333 msgid "&Layout..." msgstr "" -#: src/filemanager/filemanager.c:331 +#: src/filemanager/filemanager.c:334 msgid "&Panel options..." msgstr "" -#: src/filemanager/filemanager.c:332 +#: src/filemanager/filemanager.c:335 msgid "C&onfirmation..." msgstr "" -#: src/filemanager/filemanager.c:333 +#: src/filemanager/filemanager.c:336 msgid "&Appearance..." msgstr "" -#: src/filemanager/filemanager.c:335 +#: src/filemanager/filemanager.c:338 msgid "&Display bits..." msgstr "" -#: src/filemanager/filemanager.c:338 +#: src/filemanager/filemanager.c:341 msgid "&Virtual FS..." msgstr "" -#: src/filemanager/filemanager.c:440 +#: src/filemanager/filemanager.c:443 msgid "Panels:" msgstr "" -#: src/filemanager/filemanager.c:1046 +#: src/filemanager/filemanager.c:1058 #, c-format msgid "You have %zu opened screen. Quit anyway?" msgid_plural "You have %zu opened screens. Quit anyway?" msgstr[0] "" msgstr[1] "" -#: src/filemanager/filemanager.c:1049 src/filemanager/filemanager.c:1055 -#: src/filemanager/panel.c:2962 +#: src/filemanager/filemanager.c:1061 src/filemanager/filemanager.c:1067 +#: src/filemanager/panel.c:3015 msgid "The Midnight Commander" msgstr "" -#: src/filemanager/filemanager.c:1056 +#: src/filemanager/filemanager.c:1068 msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#: src/filemanager/filemanager.c:1614 +#: src/filemanager/filemanager.c:1626 msgid "&Above" msgstr "" -#: src/filemanager/filemanager.c:1614 +#: src/filemanager/filemanager.c:1626 msgid "&Left" msgstr "" -#: src/filemanager/filemanager.c:1615 +#: src/filemanager/filemanager.c:1627 msgid "&Below" msgstr "" -#: src/filemanager/filemanager.c:1615 +#: src/filemanager/filemanager.c:1627 msgid "&Right" msgstr "" -#: src/filemanager/filemanager.c:1628 +#: src/filemanager/filemanager.c:1640 msgid "ButtonBar|Menu" msgstr "" -#: src/filemanager/filemanager.c:1629 src/viewer/display.c:95 +#: src/filemanager/filemanager.c:1641 src/viewer/display.c:95 msgid "ButtonBar|View" msgstr "" -#: src/filemanager/filemanager.c:1632 src/filemanager/tree.c:1182 +#: src/filemanager/filemanager.c:1644 src/filemanager/tree.c:1172 msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/filemanager.c:1633 src/filemanager/tree.c:1185 +#: src/filemanager/filemanager.c:1645 src/filemanager/tree.c:1175 msgid "ButtonBar|Mkdir" msgstr "" @@ -4110,7 +4114,7 @@ msgid "Found: %lu" msgstr "" #: src/filemanager/find.c:518 src/filemanager/find.c:529 -#: src/filemanager/panel.c:2657 +#: src/filemanager/panel.c:2710 msgid "Malformed regular expression" msgstr "" @@ -4319,106 +4323,106 @@ msgstr "" msgid "Midnight Commander %s" msgstr "" -#: src/filemanager/info.c:149 +#: src/filemanager/info.c:151 #, c-format msgid "File: %s" msgstr "" -#: src/filemanager/info.c:167 +#: src/filemanager/info.c:169 msgid "No node information" msgstr "" -#: src/filemanager/info.c:169 src/filemanager/info.c:171 -#: src/filemanager/info.c:174 +#: src/filemanager/info.c:171 src/filemanager/info.c:173 +#: src/filemanager/info.c:176 msgid "Free nodes:" msgstr "" -#: src/filemanager/info.c:182 +#: src/filemanager/info.c:184 msgid "No space information" msgstr "" -#: src/filemanager/info.c:189 +#: src/filemanager/info.c:191 #, c-format msgid "Free space: %s / %s (%d%%)" msgstr "" -#: src/filemanager/info.c:196 +#: src/filemanager/info.c:198 #, c-format msgid "Type: %s" msgstr "" -#: src/filemanager/info.c:197 +#: src/filemanager/info.c:199 msgid "non-local vfs" msgstr "" -#: src/filemanager/info.c:203 +#: src/filemanager/info.c:205 #, c-format msgid "Device: %s" msgstr "" -#: src/filemanager/info.c:210 +#: src/filemanager/info.c:212 #, c-format msgid "Filesystem: %s" msgstr "" -#: src/filemanager/info.c:217 +#: src/filemanager/info.c:219 #, c-format msgid "Accessed: %s" msgstr "" -#: src/filemanager/info.c:223 +#: src/filemanager/info.c:225 #, c-format msgid "Modified: %s" msgstr "" #. TRANSLATORS: Time of last status change as in stat(2) man. -#: src/filemanager/info.c:232 +#: src/filemanager/info.c:234 #, c-format msgid "Changed: %s" msgstr "" -#: src/filemanager/info.c:240 +#: src/filemanager/info.c:242 #, c-format msgid "Dev. type: major %lu, minor %lu" msgstr "" -#: src/filemanager/info.c:247 +#: src/filemanager/info.c:249 #, c-format msgid "Size: %s" msgstr "" -#: src/filemanager/info.c:249 +#: src/filemanager/info.c:251 #, c-format msgid " (%lu block)" msgid_plural " (%lu blocks)" msgstr[0] "" msgstr[1] "" -#: src/filemanager/info.c:256 +#: src/filemanager/info.c:258 #, c-format msgid "Owner: %s/%s" msgstr "" -#: src/filemanager/info.c:260 +#: src/filemanager/info.c:262 #, c-format msgid "Links: %d" msgstr "" -#: src/filemanager/info.c:273 +#: src/filemanager/info.c:275 #, c-format msgid "Attributes: %s" msgstr "" -#: src/filemanager/info.c:275 src/filemanager/info.c:280 +#: src/filemanager/info.c:277 src/filemanager/info.c:282 msgid "Attributes: unavailable" msgstr "" -#: src/filemanager/info.c:285 +#: src/filemanager/info.c:287 #, c-format msgid "Mode: %s (%04o)" msgstr "" -#: src/filemanager/info.c:290 +#: src/filemanager/info.c:292 #, c-format msgid "Location: %Xh:%Xh" msgstr "" @@ -4601,7 +4605,7 @@ msgstr "" msgid "[dev]" msgstr "" -#: src/filemanager/panel.c:551 src/filemanager/panel.c:1085 +#: src/filemanager/panel.c:551 src/filemanager/panel.c:1088 msgid "UP--DIR" msgstr "" @@ -4613,55 +4617,55 @@ msgstr "" msgid "SUB-DIR" msgstr "" -#: src/filemanager/panel.c:1077 +#: src/filemanager/panel.c:1080 msgid "" msgstr "" -#: src/filemanager/panel.c:1149 +#: src/filemanager/panel.c:1152 #, c-format msgid "%s in %d file" msgid_plural "%s in %d files" msgstr[0] "" msgstr[1] "" -#: src/filemanager/panel.c:1349 +#: src/filemanager/panel.c:1352 msgid "Panelize" msgstr "" -#: src/filemanager/panel.c:1873 +#: src/filemanager/panel.c:1872 msgid "Unknown tag on display format:" msgstr "" -#: src/filemanager/panel.c:2618 +#: src/filemanager/panel.c:2671 msgid "&Files only" msgstr "" -#: src/filemanager/panel.c:2621 +#: src/filemanager/panel.c:2674 msgid "&Case sensitive" msgstr "" -#: src/filemanager/panel.c:2711 +#: src/filemanager/panel.c:2764 msgid "Select" msgstr "" -#: src/filemanager/panel.c:2720 +#: src/filemanager/panel.c:2773 msgid "Unselect" msgstr "" -#: src/filemanager/panel.c:2750 +#: src/filemanager/panel.c:2803 msgid "Filter" msgstr "" -#: src/filemanager/panel.c:2962 +#: src/filemanager/panel.c:3015 msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:3434 src/filemanager/panel.c:4609 -#: src/filemanager/panel.c:4657 src/viewer/actions_cmd.c:310 +#: src/filemanager/panel.c:3499 src/filemanager/panel.c:4696 +#: src/filemanager/panel.c:4747 src/viewer/actions_cmd.c:315 msgid "Cannot read directory contents" msgstr "" -#: src/filemanager/panel.c:4711 +#: src/filemanager/panel.c:4804 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -4737,40 +4741,40 @@ msgstr "" msgid "Copy \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:752 +#: src/filemanager/tree.c:749 #, c-format msgid "Move \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:766 +#: src/filemanager/tree.c:763 #, c-format msgid "" "Cannot stat the destination\n" "%s" msgstr "" -#: src/filemanager/tree.c:824 +#: src/filemanager/tree.c:817 #, c-format msgid "Delete %s?" msgstr "" -#: src/filemanager/tree.c:981 src/filemanager/tree.c:1179 +#: src/filemanager/tree.c:971 src/filemanager/tree.c:1169 msgid "ButtonBar|Static" msgstr "" -#: src/filemanager/tree.c:981 src/filemanager/tree.c:1180 +#: src/filemanager/tree.c:971 src/filemanager/tree.c:1170 msgid "ButtonBar|Dynamc" msgstr "" -#: src/filemanager/tree.c:1177 +#: src/filemanager/tree.c:1167 msgid "ButtonBar|Rescan" msgstr "" -#: src/filemanager/tree.c:1178 +#: src/filemanager/tree.c:1168 msgid "ButtonBar|Forget" msgstr "" -#: src/filemanager/tree.c:1189 +#: src/filemanager/tree.c:1179 msgid "ButtonBar|Rmdir" msgstr "" @@ -4913,16 +4917,16 @@ msgid "" "%s" msgstr "" -#: src/subshell/common.c:1377 +#: src/subshell/common.c:1391 #, c-format msgid "Cannot open named pipe %s\n" msgstr "" -#: src/subshell/common.c:1652 +#: src/subshell/common.c:1666 msgid "The shell is still active. Quit anyway?" msgstr "" -#: src/subshell/common.c:1788 +#: src/subshell/common.c:1802 #, c-format msgid "Warning: Cannot change to %s.\n" msgstr "" @@ -5048,57 +5052,57 @@ msgstr "" msgid "Cache directory:" msgstr "" -#: src/usermenu.c:334 +#: src/usermenu.c:348 msgid "Debug" msgstr "" -#: src/usermenu.c:351 +#: src/usermenu.c:365 msgid "ERROR:" msgstr "" -#: src/usermenu.c:355 +#: src/usermenu.c:369 msgid "True:" msgstr "" -#: src/usermenu.c:357 +#: src/usermenu.c:371 msgid "False:" msgstr "" -#: src/usermenu.c:596 +#: src/usermenu.c:610 msgid "Error calling program" msgstr "" -#: src/usermenu.c:624 +#: src/usermenu.c:638 msgid "Warning -- ignoring file" msgstr "" -#: src/usermenu.c:625 +#: src/usermenu.c:639 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" -#: src/usermenu.c:737 +#: src/usermenu.c:751 msgid "Format error on file Extensions File" msgstr "" -#: src/usermenu.c:738 +#: src/usermenu.c:752 #, c-format msgid "The %%var macro has no default" msgstr "" -#: src/usermenu.c:739 +#: src/usermenu.c:753 #, c-format msgid "The %%var macro has no variable" msgstr "" -#: src/usermenu.c:1120 +#: src/usermenu.c:1136 #, c-format msgid "No suitable entries found in %s" msgstr "" -#: src/usermenu.c:1132 +#: src/usermenu.c:1149 msgid "User menu" msgstr "" @@ -5575,7 +5579,7 @@ msgid "Aborted transfer would be successful." msgstr "" #: src/vfs/tar/tar.c:652 src/vfs/tar/tar.c:727 src/vfs/tar/tar.c:824 -#: src/vfs/tar/tar-internal.c:526 +#: src/vfs/tar/tar-internal.c:530 msgid "Inconsistent tar archive" msgstr "" @@ -5597,7 +5601,7 @@ msgid "" "doesn't look like a tar archive" msgstr "" -#: src/vfs/tar/tar-internal.c:182 +#: src/vfs/tar/tar-internal.c:186 msgid "tar: mc_lseek not stopped at a record boundary" msgstr "" @@ -5690,19 +5694,19 @@ msgstr "" msgid "Ext2lib error" msgstr "" -#: src/viewer/actions_cmd.c:434 +#: src/viewer/actions_cmd.c:439 msgid "Invalid value" msgstr "" -#: src/viewer/actions_cmd.c:633 +#: src/viewer/actions_cmd.c:638 msgid "File was modified. Save with exit?" msgstr "" -#: src/viewer/actions_cmd.c:634 +#: src/viewer/actions_cmd.c:639 msgid "&Cancel quit" msgstr "" -#: src/viewer/actions_cmd.c:639 +#: src/viewer/actions_cmd.c:644 msgid "" "Midnight Commander is being shut down.\n" "Save modified file?" diff --git a/po/mn.po b/po/mn.po index 4742cd6c0..5305b8d91 100644 --- a/po/mn.po +++ b/po/mn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Shuree Nyam-Oidov <99shuree@gmail.com>, 2020\n" "Language-Team: Mongolian (http://app.transifex.com/mc/mc/language/mn/)\n" @@ -897,6 +897,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2149,7 +2152,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2500,7 +2503,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2576,13 +2579,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2675,7 +2678,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2687,7 +2690,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/nb.po b/po/nb.po index 91aae2a23..d73c0535b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: heskjestad, 2024\n" "Language-Team: Norwegian Bokmål (http://app.transifex.com/mc/mc/language/" @@ -979,6 +979,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Filnavn:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» er en mappe" @@ -2264,12 +2268,12 @@ msgstr "" "chattr mislyktes for «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Klarte ikke hente flaggene til «%s»\n" +"Klarte ikke hente attributtene til kildefila «%s»\n" "%s" msgid "set &user ID on execution" @@ -2658,8 +2662,9 @@ msgstr "" "«%s»\n" "er samme fil" -msgid "Ski&p all" -msgstr "H&opp over alle" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorer &alle" #, c-format msgid "" @@ -2753,17 +2758,17 @@ msgstr "" "stat() mislyktes for kildefila «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Klarte ikke hente attributtene til kildefila «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Klarte ikke skrive attributtene til målfila «%s»\n" @@ -2880,9 +2885,9 @@ msgstr "" "Klarte ikke lukke målfila «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Klarte ikke skrive attributtene til målfila «%s»\n" @@ -2896,9 +2901,9 @@ msgstr "" "stat() mislyktes for kildemappa «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Klarte ikke hente attributtene til kildemappa «%s»\n" @@ -4766,3 +4771,14 @@ msgstr "Fortsett fra begynnelsen?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Klarte ikke hente en lokal kopi av /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Klarte ikke hente flaggene til «%s»\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "H&opp over alle" diff --git a/po/nl.po b/po/nl.po index d8a2bfd9c..0d9f18b4d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Jaap Kramer , 2023\n" "Language-Team: Dutch (http://app.transifex.com/mc/mc/language/nl/)\n" @@ -952,6 +952,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Bestandsnaam:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" is een map" @@ -2232,9 +2236,9 @@ msgstr "" "Kan niet chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Kan flags van \"%s\" niet verkrijgen\n" @@ -2616,8 +2620,9 @@ msgstr "" "`%s' \n" "zijn hetzelfde bestand " -msgid "Ski&p all" -msgstr "Alles ove&rslaan" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Alles negeren" #, c-format msgid "" @@ -2711,17 +2716,21 @@ msgstr "" "Bronbestand \"%s\" kan niet geïnspecteerd worden \n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Bronbestand \"%s\" kan niet geïnspecteerd worden \n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"fstat werkt niet op doelbestand \"%s\" \n" +"%s " #, c-format msgid "" @@ -2834,11 +2843,13 @@ msgstr "" "Doelbestand \"%s\" kan niet gesloten worden \n" "%s " -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"fstat werkt niet op doelbestand \"%s\" \n" +"%s " #, c-format msgid "" @@ -2848,11 +2859,13 @@ msgstr "" "Bronmap \"%s\" kan niet geïnspecteerd worden\n" "%s " -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Bronmap \"%s\" kan niet geïnspecteerd worden\n" +"%s " #, c-format msgid "" @@ -4701,3 +4714,6 @@ msgstr "Doorgaan vanaf het begin?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kan geen lokale versie van /ftp://some.host/editme.txt ophalen" + +#~ msgid "Ski&p all" +#~ msgstr "Alles ove&rslaan" diff --git a/po/nl_BE.po b/po/nl_BE.po index c1c08da70..9891b361c 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Dutch (Belgium) (http://app.transifex.com/mc/mc/language/" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/pl.po b/po/pl.po index aeaf4d752..a29be1475 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Piotr Drąg , 2011-2024\n" "Language-Team: Polish (http://app.transifex.com/mc/mc/language/pl/)\n" @@ -980,6 +980,10 @@ msgstr "" msgid "Diff:" msgstr "Różnica:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nazwa pliku:" + #, c-format msgid "\"%s\" is a directory" msgstr "„%s” jest katalogiem" @@ -2264,12 +2268,12 @@ msgstr "" "Nie można wykonać polecenia chattr na „%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Nie można uzyskać flag „%s”\n" +"Nie można uzyskać atrybutów pliku źródłowego „%s”\n" "%s" msgid "set &user ID on execution" @@ -2659,8 +2663,9 @@ msgstr "" "„%s”\n" "to ten sam plik" -msgid "Ski&p all" -msgstr "&Pomiń wszystko" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Zignoruj &wszystko" #, c-format msgid "" @@ -2754,17 +2759,17 @@ msgstr "" "Nie można wykonać polecenia stat na pliku źródłowym „%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Nie można uzyskać atrybutów pliku źródłowego „%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Nie można ustawić atrybutów pliku docelowego „%s”\n" @@ -2881,9 +2886,9 @@ msgstr "" "Nie można zamknąć pliku docelowego „%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Nie można ustawić atrybutów dla pliku docelowego „%s”\n" @@ -2897,9 +2902,9 @@ msgstr "" "Nie można wykonać polecenia stat na katalogu źródłowym „%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Nie można uzyskać atrybutów katalogu źródłowego „%s”\n" @@ -4779,3 +4784,14 @@ msgstr "Kontynuować od początku?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "" "Nie można pobrać lokalnej kopii /ftp://jakiś.komputer/modyfikuj_mnie.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Nie można uzyskać flag „%s”\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "&Pomiń wszystko" diff --git a/po/pt.po b/po/pt.po index 9539852dc..951759600 100644 --- a/po/pt.po +++ b/po/pt.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Gilberto Jorge , 2013-2024\n" "Language-Team: Portuguese (http://app.transifex.com/mc/mc/language/pt/)\n" @@ -978,6 +978,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nome do ficheiro:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" é um diretório" @@ -2263,12 +2267,12 @@ msgstr "" "Não é possível chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Não é possível obter as flags de \"%s\"\n" +"Não é possível obter atributos do ficheiro origem \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2658,8 +2662,9 @@ msgstr "" "\"%s\"\n" "são o mesmo ficheiro" -msgid "Ski&p all" -msgstr "Sal&tar todos" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignor&ar tudo" #, c-format msgid "" @@ -2753,17 +2758,17 @@ msgstr "" "Não é possível efetuar stat no ficheiro fonte \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Não é possível obter atributos do ficheiro origem \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Não é possível definir atributos do ficheiro destino \"%s\"\n" @@ -2880,9 +2885,9 @@ msgstr "" "Não é possível fechar o ficheiro alvo \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Não é possível definir atributos para o ficheiro destino \"%s\"\n" @@ -2896,9 +2901,9 @@ msgstr "" "Não é possível efetuar stat no diretório fonte \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Não é possível obter atributos do directório de origem \"%s\"\n" @@ -4770,3 +4775,14 @@ msgstr "Continuar do início?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Não é possível obter uma cópia local de /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Não é possível obter as flags de \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Sal&tar todos" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3bd13a485..087cc9eed 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: marcelo cripe , 2022-2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/mc/mc/language/" @@ -1000,6 +1000,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nome do arquivo:" + #, c-format msgid "\"%s\" is a directory" msgstr "‘%s’ é um diretório" @@ -2295,12 +2299,12 @@ msgstr "" "Não foi possível executar o comando chattr ‘%s’\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Não foi possível obter os parâmetros de ‘%s’\n" +"Não foi possível obter os atributos do arquivo da origem ‘%s’\n" "%s" msgid "set &user ID on execution" @@ -2696,8 +2700,9 @@ msgstr "" "‘%s’\n" "são o mesmo arquivo" -msgid "Ski&p all" -msgstr "I&gnorar tudo" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignor&ar tudo" #, c-format msgid "" @@ -2791,17 +2796,17 @@ msgstr "" "Não foi possível obter o estado do arquivo da origem ‘%s’\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Não foi possível obter os atributos do arquivo da origem ‘%s’\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Não foi possível definir os atributos do arquivo do destino ‘%s’\n" @@ -2918,9 +2923,9 @@ msgstr "" "Não foi possível fechar o arquivo do destino ‘%s’\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Não foi possível definir os atributos para o arquivo do destino ‘%s’\n" @@ -2934,9 +2939,9 @@ msgstr "" "Não foi possível obter o estado do diretório ‘%s’\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Não foi possível obter os atributos do diretório da origem ‘%s’\n" @@ -4846,3 +4851,14 @@ msgstr "Você quer continuar a partir do início?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Não foi possível obter uma cópia local do /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Não foi possível obter os parâmetros de ‘%s’\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "I&gnorar tudo" diff --git a/po/ro.po b/po/ro.po index a711f403f..f9b721ddd 100644 --- a/po/ro.po +++ b/po/ro.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Simona Iacob , 2021-2023\n" "Language-Team: Romanian (http://app.transifex.com/mc/mc/language/ro/)\n" @@ -959,6 +959,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Nume de fișier:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" este un dosar" @@ -2241,9 +2245,9 @@ msgstr "" "Nu se poate chattr \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Nu se pot obține indicatorii de \"%s\"\n" @@ -2635,8 +2639,9 @@ msgstr "" "\"%s\"\n" "sunt același fișier" -msgid "Ski&p all" -msgstr "Sări t&ot" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignoră &tot" #, c-format msgid "" @@ -2730,17 +2735,21 @@ msgstr "" "Nu se poate găsi fișierul sursă \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul sursă \"%s\"\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul destinație \"%s\"\n" +"%s" #, c-format msgid "" @@ -2853,11 +2862,13 @@ msgstr "" "Nu se poate închide fișierul destinație \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi fișierul destinație \"%s\"\n" +"%s" #, c-format msgid "" @@ -2867,11 +2878,13 @@ msgstr "" "Nu se poate găsi dosarul sursă \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Nu se poate găsi dosarul sursă \"%s\"\n" +"%s" #, c-format msgid "" @@ -4733,3 +4746,6 @@ msgstr "Continuă de la început?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Nu se poate aduce o copie locală a /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "Sări t&ot" diff --git a/po/ru.po b/po/ru.po index d304d9078..cdf78fe43 100644 --- a/po/ru.po +++ b/po/ru.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Andrei Stepanov, 2023-2024\n" "Language-Team: Russian (http://app.transifex.com/mc/mc/language/ru/)\n" @@ -1001,6 +1001,10 @@ msgstr "" msgid "Diff:" msgstr "Различия:" +#, fuzzy +msgid "File name is empty!" +msgstr "Шаблон имени:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" является каталогом" @@ -2284,12 +2288,12 @@ msgstr "" "Не удалось изменить атрибуты \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" -"Невозможно получить флаги \"%s\"\n" +"Не удалось получить атрибуты исходного файла \"%s\"\n" "%s" msgid "set &user ID on execution" @@ -2679,8 +2683,9 @@ msgstr "" "\"%s\"\n" "один и тот же файл" -msgid "Ski&p all" -msgstr "Пропустить вс&ё" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Игнорировать в&сё" #, c-format msgid "" @@ -2774,17 +2779,17 @@ msgstr "" "Не удалось получить свойства исходного файла \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" "Не удалось получить атрибуты исходного файла \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" "Не удалось получить атрибуты целевого файла \"%s\"\n" @@ -2901,9 +2906,9 @@ msgstr "" "Не удалось закрыть целевой файл \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" "Не удалось задать атрибуты целевого файла \"%s\"\n" @@ -2917,9 +2922,9 @@ msgstr "" "Не удалось получить свойства исходного каталога \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" "Не удалось получить атрибуты исходного каталога \"%s\"\n" @@ -4795,3 +4800,14 @@ msgstr "Продолжить с начала?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Не удалось получить локальную копию /ftp://some.host/editme.txt" + +#, c-format +#~ msgid "" +#~ "Cannot get flags of \"%s\"\n" +#~ "%s" +#~ msgstr "" +#~ "Невозможно получить флаги \"%s\"\n" +#~ "%s" + +#~ msgid "Ski&p all" +#~ msgstr "Пропустить вс&ё" diff --git a/po/sk.po b/po/sk.po index da50421bc..916924dfe 100644 --- a/po/sk.po +++ b/po/sk.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: hualahyja, 2019\n" "Language-Team: Slovak (http://app.transifex.com/mc/mc/language/sk/)\n" @@ -949,6 +949,10 @@ msgstr "" msgid "Diff:" msgstr "Rozdiel:" +#, fuzzy +msgid "File name is empty!" +msgstr "Názov súboru:" + #, c-format msgid "\"%s\" is a directory" msgstr "„%s“ je adresár" @@ -2225,11 +2229,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Nemožno vytvoriť cieľový súbor „%s“\n" +"%s" msgid "set &user ID on execution" msgstr "nastaviť ID po&užívateľa pri spustení" @@ -2600,8 +2606,9 @@ msgstr "" "„%s“\n" "sú rovnaký súbor" -msgid "Ski&p all" -msgstr "&Preskočiť všetky" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorovať &všetky" #, c-format msgid "" @@ -2695,17 +2702,21 @@ msgstr "" "Nemožno vykonať stat() zdrojového súboru „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Nemožno vykonať stat() zdrojového súboru „%s“\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Nemožno vykonať fstat() cieľového súboru „%s“\n" +"%s" #, c-format msgid "" @@ -2818,11 +2829,13 @@ msgstr "" "Nemožno zatvoriť cieľový súbor „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Nemožno vykonať fstat() cieľového súboru „%s“\n" +"%s" #, c-format msgid "" @@ -2832,11 +2845,13 @@ msgstr "" "Nemožno vykonať stat() zdrojového adresára „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Nemožno vykonať stat() zdrojového adresára „%s“\n" +"%s" #, c-format msgid "" @@ -4669,3 +4684,6 @@ msgstr "Pokračovať od začiatku?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Nemožno stiahnuť lokálnu kópiu /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "&Preskočiť všetky" diff --git a/po/sl.po b/po/sl.po index b5615d042..9951a72e2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Matej Urbančič <>, 2012\n" "Language-Team: Slovenian (http://app.transifex.com/mc/mc/language/sl/)\n" @@ -906,6 +906,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2158,7 +2161,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2509,8 +2512,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Prezri zaklep" #, c-format msgid "" @@ -2585,13 +2589,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2688,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2696,7 +2700,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/sr.po b/po/sr.po index f7457d4d2..646c2cd1a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Serbian (http://app.transifex.com/mc/mc/language/sr/)\n" @@ -936,6 +936,10 @@ msgstr "" msgid "Diff:" msgstr "Разлике:" +#, fuzzy +msgid "File name is empty!" +msgstr "Датотека:" + #, c-format msgid "\"%s\" is a directory" msgstr "„%s“ је директоријум" @@ -2212,11 +2216,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Не могу да направим циљну датотеку „%s“\n" +"%s" msgid "set &user ID on execution" msgstr "подеси ИБ &корисника при извршавању" @@ -2583,8 +2589,9 @@ msgstr "" "„%s“\n" "су једна иста датотека" -msgid "Ski&p all" -msgstr "Прескочи &све" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Занемари катанац" #, c-format msgid "" @@ -2678,17 +2685,21 @@ msgstr "" "Не могу да добијем податке о изворној датотеци „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Не могу да добијем податке о изворној датотеци „%s“\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Не могу да дознам податке о циљној датотеци „%s“\n" +"%s" #, c-format msgid "" @@ -2799,11 +2810,13 @@ msgstr "" "Не могу да затворим циљну датотеку „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Не могу да дознам податке о циљној датотеци „%s“\n" +"%s" #, c-format msgid "" @@ -2813,11 +2826,13 @@ msgstr "" "Не могу да добијем податке о изворном директоријуму „%s“\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Не могу да добијем податке о изворном директоријуму „%s“\n" +"%s" #, c-format msgid "" @@ -4645,3 +4660,6 @@ msgstr "Да наставим са почетка?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Не могу да довучем месни примерак „/ftp://some.host/editme.txt“" + +#~ msgid "Ski&p all" +#~ msgstr "Прескочи &све" diff --git a/po/sv.po b/po/sv.po index 50e41c2b1..fd9002656 100644 --- a/po/sv.po +++ b/po/sv.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Alexander Kilian , 2022\n" "Language-Team: Swedish (http://app.transifex.com/mc/mc/language/sv/)\n" @@ -954,6 +954,10 @@ msgstr "" msgid "Diff:" msgstr "Diff:" +#, fuzzy +msgid "File name is empty!" +msgstr "Filnamn:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" är en katalog" @@ -2232,11 +2236,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"Att skapa målfilen \"%s\" misslyckades\n" +"%s" msgid "set &user ID on execution" msgstr "sätt användar-I&D vid exekvering" @@ -2610,8 +2616,9 @@ msgstr "" "\"%s\"\n" "är samma fil" -msgid "Ski&p all" -msgstr "Ho&ppa över alla" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ignorera a&lla" #, c-format msgid "" @@ -2705,17 +2712,21 @@ msgstr "" "Stat på källfilen \"%s\" misslyckades\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Stat på källfilen \"%s\" misslyckades\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Fstat på målfilen \"%s\" misslyckades\n" +"%s" #, c-format msgid "" @@ -2828,11 +2839,13 @@ msgstr "" "Stängning av målfilen \"%s\" misslyckades\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Fstat på målfilen \"%s\" misslyckades\n" +"%s" #, c-format msgid "" @@ -2842,11 +2855,13 @@ msgstr "" "Stat på källkatalogen \"%s\" misslyckades\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Stat på källkatalogen \"%s\" misslyckades\n" +"%s" #, c-format msgid "" @@ -4669,3 +4684,6 @@ msgstr "Fortsätt från början?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Kan inte hämta en lokal kopia av /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "Ho&ppa över alla" diff --git a/po/szl.po b/po/szl.po index bd7a85b93..88f411e29 100644 --- a/po/szl.po +++ b/po/szl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Silesian (http://app.transifex.com/mc/mc/language/szl/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/ta.po b/po/ta.po index 1d6352ca2..299b8fea9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Tamil (http://app.transifex.com/mc/mc/language/ta/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/te.po b/po/te.po index b27640571..a105f3e77 100644 --- a/po/te.po +++ b/po/te.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Telugu (http://app.transifex.com/mc/mc/language/te/)\n" @@ -893,6 +893,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2145,7 +2148,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2496,7 +2499,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2572,13 +2575,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2671,7 +2674,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2683,7 +2686,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/tr.po b/po/tr.po index 96244e0a7..0fb817c8e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Mehmet Akif 9oglu, 2023\n" "Language-Team: Turkish (http://app.transifex.com/mc/mc/language/tr/)\n" @@ -955,6 +955,10 @@ msgstr "" msgid "Diff:" msgstr "Fark:" +#, fuzzy +msgid "File name is empty!" +msgstr "Dosya ismi:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" bir dizindir" @@ -2240,11 +2244,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"\"%s\" hedef dosyası oluşturulamıyor \n" +" %sw" msgid "set &user ID on execution" msgstr "kullanıcı çalıştırabilir" @@ -2614,8 +2620,9 @@ msgstr "" "\"%s\"\n" "aynı dosya" -msgid "Ski&p all" -msgstr "Tümünü atla" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Tümünü &yoksay" #, c-format msgid "" @@ -2709,17 +2716,21 @@ msgstr "" "\"%s\" kaynak dosyası durumlanamıyor \n" " %s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"\"%s\" kaynak dosyası durumlanamıyor \n" +" %s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"\"%s\" hedef dosyası fstat yapılamıyor \n" +" %s" #, c-format msgid "" @@ -2832,11 +2843,13 @@ msgstr "" "\"%s\" hedef dosyası kapatılamıyor \n" " %s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"\"%s\" hedef dosyası fstat yapılamıyor \n" +" %s" #, c-format msgid "" @@ -2846,11 +2859,13 @@ msgstr "" "\"%s\" kaynak dizini durumlanamıyor \n" " %s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"\"%s\" kaynak dizini durumlanamıyor \n" +" %s" #, c-format msgid "" @@ -4675,3 +4690,6 @@ msgstr "Başından devam edilsin mi?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr " /ftp://some.host/editme.txt 'in yerel kopyası alınamadı" + +#~ msgid "Ski&p all" +#~ msgstr "Tümünü atla" diff --git a/po/uk.po b/po/uk.po index 3a6f916ed..378c60280 100644 --- a/po/uk.po +++ b/po/uk.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Rostyslav Haitkulov , 2023\n" "Language-Team: Ukrainian (http://app.transifex.com/mc/mc/language/uk/)\n" @@ -963,6 +963,10 @@ msgstr "Midnight Commander закривається. Зберегти зміне msgid "Diff:" msgstr "Різниця:" +#, fuzzy +msgid "File name is empty!" +msgstr "Назва файлу:" + #, c-format msgid "\"%s\" is a directory" msgstr "«%s» є каталогом" @@ -2242,9 +2246,9 @@ msgstr "" "Не вдалося змінити атрибути \"%s\"\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" "Не вдалося отримати прапорець \"%s\"\n" @@ -2626,8 +2630,9 @@ msgstr "" "«%s»\n" "є одним і тим же файлом " -msgid "Ski&p all" -msgstr "П&ропустити все" +#, fuzzy +msgid "Ignore a&ll" +msgstr "Ігнорувати &все" #, c-format msgid "" @@ -2719,17 +2724,21 @@ msgstr "" "Не вдалося отримати властивості вихідного файлу «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"Не вдалося отримати властивості вихідного файлу «%s»\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"Не вдалося отримати властивості цільового файлу «%s»\n" +"%s" #, c-format msgid "" @@ -2842,11 +2851,13 @@ msgstr "" "Не вдалося закрити цільовий файл «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"Не вдалося отримати властивості цільового файлу «%s»\n" +"%s" #, c-format msgid "" @@ -2856,11 +2867,13 @@ msgstr "" "Не вдавдалосяться отримати властивості вихідного каталогу «%s»\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"Не вдавдалосяться отримати властивості вихідного каталогу «%s»\n" +"%s" #, c-format msgid "" @@ -4726,3 +4739,6 @@ msgstr "Почати спочатку?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "Не вдалося отримати локальну копію /ftp://some.host/editme.txt" + +#~ msgid "Ski&p all" +#~ msgstr "П&ропустити все" diff --git a/po/uz.po b/po/uz.po index b10865d61..3a681aee4 100644 --- a/po/uz.po +++ b/po/uz.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Uzbek (http://app.transifex.com/mc/mc/language/uz/)\n" @@ -893,6 +893,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2145,7 +2148,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2496,7 +2499,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2572,13 +2575,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2671,7 +2674,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2683,7 +2686,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/vi.po b/po/vi.po index 12d1413b0..ea0a04761 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Vietnamese (http://app.transifex.com/mc/mc/language/vi/)\n" @@ -896,6 +896,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2148,7 +2151,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2499,8 +2502,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "&Lời đi khóa" #, c-format msgid "" @@ -2575,13 +2579,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2674,7 +2678,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2686,7 +2690,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/wa.po b/po/wa.po index 158433987..3db332a6c 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Slava Zanko , 2011\n" "Language-Team: Walloon (http://app.transifex.com/mc/mc/language/wa/)\n" @@ -894,6 +894,9 @@ msgstr "" msgid "Diff:" msgstr "" +msgid "File name is empty!" +msgstr "" + #, c-format msgid "\"%s\" is a directory" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" #, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" @@ -2497,7 +2500,7 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" +msgid "Ignore a&ll" msgstr "" #, c-format @@ -2573,13 +2576,13 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" #, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" @@ -2672,7 +2675,7 @@ msgstr "" #, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" @@ -2684,7 +2687,7 @@ msgstr "" #, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9250d6eb3..0b13deae5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Gurbuzguven <6mehmet6@gmail.com>, 2021\n" "Language-Team: Chinese (China) (http://app.transifex.com/mc/mc/language/" @@ -949,6 +949,10 @@ msgstr "" msgid "Diff:" msgstr "差异: " +#, fuzzy +msgid "File name is empty!" +msgstr "文件名: " + #, c-format msgid "\"%s\" is a directory" msgstr "“%s”是一个目录" @@ -2225,11 +2229,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"无法创建目标文件“%s”\n" +"%s" msgid "set &user ID on execution" msgstr "执行时设置用户 ID(&U)" @@ -2601,8 +2607,9 @@ msgstr "" "“%s”\n" "是同一个文件" -msgid "Ski&p all" -msgstr "路过全部(&I)" +#, fuzzy +msgid "Ignore a&ll" +msgstr "全部忽略(&A)" #, c-format msgid "" @@ -2696,17 +2703,21 @@ msgstr "" "无法 stat 源文件“%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"无法 stat 源文件“%s”\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"无法 fstat 目标文件\"%s\"\n" +"%s" #, c-format msgid "" @@ -2819,11 +2830,13 @@ msgstr "" "无法关闭目标文件“%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"无法 fstat 目标文件\"%s\"\n" +"%s" #, c-format msgid "" @@ -2833,11 +2846,13 @@ msgstr "" "无法 stat 源目录“%s”\n" "%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"无法 stat 源目录“%s”\n" +"%s" #, c-format msgid "" @@ -4656,3 +4671,6 @@ msgstr "从头继续搜索?" msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt" msgstr "无法获取 /ftp://some.host/editme.txt 的本地副本" + +#~ msgid "Ski&p all" +#~ msgstr "路过全部(&I)" diff --git a/po/zh_TW.po b/po/zh_TW.po index a41eb67f5..060c8622d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n" -"POT-Creation-Date: 2024-10-05 15:11+0300\n" +"POT-Creation-Date: 2024-11-12 12:10+0300\n" "PO-Revision-Date: 2010-12-29 10:19+0000\n" "Last-Translator: Meng Pang Wang, 2023\n" "Language-Team: Chinese (Taiwan) (http://app.transifex.com/mc/mc/language/" @@ -919,6 +919,10 @@ msgstr "" msgid "Diff:" msgstr "不同:" +#, fuzzy +msgid "File name is empty!" +msgstr "檔案名稱:" + #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" 是一個資料夾" @@ -2177,11 +2181,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get flags of \"%s\"\n" +"Cannot get ext2 attributes of \"%s\"\n" "%s" msgstr "" +"無法覆寫檔案 \"%s\"\n" +"%s" msgid "set &user ID on execution" msgstr "" @@ -2532,8 +2538,9 @@ msgid "" "are the same file" msgstr "" -msgid "Ski&p all" -msgstr "" +#, fuzzy +msgid "Ignore a&ll" +msgstr "忽略全部" #, c-format msgid "" @@ -2614,17 +2621,21 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source file \"%s\"\n" +"Cannot get ext2 attributes of source file \"%s\"\n" "%s" msgstr "" +"無法覆寫檔案 \"%s\"\n" +"%s" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes of target file \"%s\"\n" +"Cannot set ext2 attributes of target file \"%s\"\n" "%s" msgstr "" +"無法對目標檔案 \"%s\" 執行 chmod 指令\n" +"%s" #, c-format msgid "" @@ -2715,11 +2726,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot set attributes for target file \"%s\"\n" +"Cannot set ext2 attributes for target file \"%s\"\n" "%s" msgstr "" +"無法對目標檔案 \"%s\" 執行 chmod 指令\n" +"%s" #, c-format msgid "" @@ -2727,11 +2740,13 @@ msgid "" "%s" msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"Cannot get attributes of source directory \"%s\"\n" +"Cannot get ext2 attributes of source directory \"%s\"\n" "%s" msgstr "" +"無法建立目標目錄 \"%s\"\n" +"%s" #, c-format msgid "" diff --git a/src/background.c b/src/background.c index 72a0eda73..85763daf7 100644 --- a/src/background.c +++ b/src/background.c @@ -51,8 +51,6 @@ #include "lib/event-types.h" #include "lib/util.h" /* my_fork() */ -#include "filemanager/fileopctx.h" /* file_op_context_t */ - #include "background.h" /*** global variables ****************************************************************************/ diff --git a/src/background.h b/src/background.h index a8b03233e..2b25facd2 100644 --- a/src/background.h +++ b/src/background.h @@ -6,7 +6,8 @@ #define MC__BACKGROUND_H #include /* pid_t */ -#include "filemanager/fileopctx.h" +#include "filemanager/filegui.h" + /*** typedefs(not structures) and defined constants **********************************************/ enum TaskState diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am index 0b3c36556..4ee044757 100644 --- a/src/filemanager/Makefile.am +++ b/src/filemanager/Makefile.am @@ -15,7 +15,6 @@ libmcfilemanager_la_SOURCES = \ filegui.c filegui.h \ filemanager.h filemanager.c \ filenot.c filenot.h \ - fileopctx.c fileopctx.h \ find.c \ hotlist.c hotlist.h \ info.c info.h \ diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c index acc53db60..299a79bd4 100644 --- a/src/filemanager/cmd.c +++ b/src/filemanager/cmd.c @@ -76,7 +76,7 @@ #include "src/diffviewer/ydiff.h" #endif -#include "fileopctx.h" +#include "filegui.h" #include "filenot.h" #include "hotlist.h" /* hotlist_show() */ #include "tree.h" /* tree_chdir() */ diff --git a/src/filemanager/file.c b/src/filemanager/file.c index cc0696055..3c4a12ceb 100644 --- a/src/filemanager/file.c +++ b/src/filemanager/file.c @@ -77,7 +77,6 @@ /* Needed for other_panel and WTree */ #include "dir.h" -#include "filegui.h" #include "filenot.h" #include "tree.h" #include "filemanager.h" /* other_panel */ @@ -362,7 +361,7 @@ is_in_linklist (const GSList *lp, const vfs_path_t *vpath, const struct stat *sb */ static hardlink_status_t -check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat, +check_hardlinks (file_op_context_t *ctx, const vfs_path_t *src_vpath, const struct stat *src_stat, const vfs_path_t *dst_vpath, gboolean *ignore_all) { link_t *lnk; @@ -406,7 +405,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat, FileProgressStatus status; status = - file_error (TRUE, _("Cannot stat hardlink source file \"%s\"\n%s"), + file_error (ctx, TRUE, _("Cannot stat hardlink source file \"%s\"\n%s"), vfs_path_as_str (lnk->dst_vpath)); if (status == FILE_ABORT) return HARDLINK_ABORT; @@ -426,7 +425,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat, FileProgressStatus status; status = - file_error (TRUE, _("Cannot create target hardlink \"%s\"\n%s"), + file_error (ctx, TRUE, _("Cannot create target hardlink \"%s\"\n%s"), vfs_path_as_str (dst_vpath)); if (status == FILE_ABORT) return HARDLINK_ABORT; @@ -462,7 +461,7 @@ check_hardlinks (const vfs_path_t *src_vpath, const struct stat *src_stat, */ errno = 0; status = - file_error (FALSE, _("Cannot create target hardlink \"%s\""), + file_error (ctx, FALSE, _("Cannot create target hardlink \"%s\""), vfs_path_as_str (dst_vpath)); if (status == FILE_ABORT) @@ -525,7 +524,8 @@ make_symlink (file_op_context_t *ctx, const vfs_path_t *src_vpath, const vfs_pat return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot read source link \"%s\"\n%s"), src_path); + return_status = + file_error (ctx, TRUE, _("Cannot read source link \"%s\"\n%s"), src_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -609,7 +609,8 @@ make_symlink (file_op_context_t *ctx, const vfs_path_t *src_vpath, const vfs_pat return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot create target symlink \"%s\"\n%s"), dst_path); + return_status = + file_error (ctx, TRUE, _("Cannot create target symlink \"%s\"\n%s"), dst_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -765,11 +766,11 @@ panel_operate_init_totals (const WPanel *panel, const vfs_path_t *source, status_msg_init (STATUS_MSG (&dsm), _("Directory scanning"), 0, dirsize_status_init_cb, dirsize_status_update_cb, dirsize_status_deinit_cb); - ctx->progress_count = 0; - ctx->progress_bytes = 0; + ctx->total_count = 0; + ctx->total_bytes = 0; if (source == NULL) - status = panel_compute_totals (panel, &dsm, &ctx->progress_count, &ctx->progress_bytes, + status = panel_compute_totals (panel, &dsm, &ctx->total_count, &ctx->total_bytes, ctx->follow_links); else if (S_ISDIR (source_stat->st_mode) || (ctx->follow_links @@ -778,19 +779,19 @@ panel_operate_init_totals (const WPanel *panel, const vfs_path_t *source, { size_t dir_count = 0; - status = do_compute_dir_size (source, &dsm, &dir_count, &ctx->progress_count, - &ctx->progress_bytes, ctx->stat_func); + status = do_compute_dir_size (source, &dsm, &dir_count, &ctx->total_count, + &ctx->total_bytes, ctx->stat_func); } else { - ctx->progress_count++; - ctx->progress_bytes += (uintmax_t) source_stat->st_size; + ctx->total_count++; + ctx->total_bytes += (uintmax_t) source_stat->st_size; status = FILE_CONT; } status_msg_deinit (STATUS_MSG (&dsm)); - ctx->progress_totals_computed = (status == FILE_CONT); + ctx->totals_computed = (status == FILE_CONT); if (status == FILE_SKIP) status = FILE_CONT; @@ -798,59 +799,62 @@ panel_operate_init_totals (const WPanel *panel, const vfs_path_t *source, else { status = FILE_CONT; - ctx->progress_count = panel->marked; - ctx->progress_bytes = panel->total; - ctx->progress_totals_computed = verbose && dialog_type == FILEGUI_DIALOG_ONE_ITEM; + ctx->total_count = panel->marked; + ctx->total_bytes = panel->total; + ctx->totals_computed = verbose && dialog_type == FILEGUI_DIALOG_ONE_ITEM; } /* destroy already created UI for single file rename operation */ - file_op_context_destroy_ui (ctx); + file_progress_ui_destroy (ctx); - file_op_context_create_ui (ctx, TRUE, dialog_type); + file_progress_ui_create (ctx, TRUE, dialog_type); return status; } /* --------------------------------------------------------------------------------------------- */ -static FileProgressStatus -progress_update_one (file_op_total_context_t *tctx, file_op_context_t *ctx, off_t add) +static void +progress_update_one (gboolean success, file_op_context_t *ctx, off_t add) { gint64 tv_current; static gint64 tv_start = -1; - tctx->progress_count++; - tctx->progress_bytes += (uintmax_t) add; + ctx->total_progress_count++; + ctx->total_progress_bytes += (uintmax_t) add; + + if (!success) + return; tv_current = g_get_monotonic_time (); if (tv_start < 0) tv_start = tv_current; - - if (tv_current - tv_start > FILEOP_UPDATE_INTERVAL_US) + else if (tv_current - tv_start > FILEOP_UPDATE_INTERVAL_US) { if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) { - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - file_progress_show_total (tctx, ctx, tctx->progress_bytes, TRUE); + file_progress_show_count (ctx); + file_progress_show_total (ctx, ctx->total_progress_bytes, tv_current, TRUE); } tv_start = tv_current; } - - return check_progress_buttons (ctx); } /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -real_warn_same_file (enum OperationMode mode, const char *fmt, const char *a, const char *b) +real_warn_same_file (file_op_context_t *ctx, enum OperationMode mode, const char *fmt, + const char *a, const char *b) { char *msg; int result = 0; const char *head_msg; int width_a, width_b, width; + const gint64 t = g_get_monotonic_time (); + head_msg = mode == Foreground ? MSG_ERROR : _("Background process error"); width_a = str_term_width1 (a); @@ -886,44 +890,47 @@ real_warn_same_file (enum OperationMode mode, const char *fmt, const char *a, co g_free (msg); do_refresh (); + ctx->pauses += g_get_monotonic_time () - t; + return (result == 1) ? FILE_ABORT : FILE_SKIP; } /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -warn_same_file (const char *fmt, const char *a, const char *b) +warn_same_file (file_op_context_t *ctx, const char *fmt, const char *a, const char *b) { #ifdef ENABLE_BACKGROUND /* *INDENT-OFF* */ union { void *p; - FileProgressStatus (*f) (enum OperationMode, const char *fmt, const char *a, const char *b); + FileProgressStatus (*f) (file_op_context_t *ctx, enum OperationMode, const char *fmt, + const char *a, const char *b); } pntr; /* *INDENT-ON* */ pntr.f = real_warn_same_file; if (mc_global.we_are_background) - return parent_call (pntr.p, NULL, 3, strlen (fmt), fmt, strlen (a), a, strlen (b), b); + return parent_call (pntr.p, ctx, 3, strlen (fmt), fmt, strlen (a), a, strlen (b), b); #endif - return real_warn_same_file (Foreground, fmt, a, b); + return real_warn_same_file (ctx, Foreground, fmt, a, b); } /* --------------------------------------------------------------------------------------------- */ static gboolean -check_same_file (const char *a, const struct stat *ast, const char *b, const struct stat *bst, - FileProgressStatus *status) +check_same_file (file_op_context_t *ctx, const char *a, const struct stat *ast, const char *b, + const struct stat *bst, FileProgressStatus *status) { if (ast->st_dev != bst->st_dev || ast->st_ino != bst->st_ino) return FALSE; if (S_ISDIR (ast->st_mode)) - *status = warn_same_file (_("\"%s\"\nand\n\"%s\"\nare the same directory"), a, b); + *status = warn_same_file (ctx, _("\"%s\"\nand\n\"%s\"\nare the same directory"), a, b); else - *status = warn_same_file (_("\"%s\"\nand\n\"%s\"\nare the same file"), a, b); + *status = warn_same_file (ctx, _("\"%s\"\nand\n\"%s\"\nare the same file"), a, b); return TRUE; } @@ -932,11 +939,16 @@ check_same_file (const char *a, const struct stat *ast, const char *b, const str /* {{{ Query/status report routines */ static FileProgressStatus -real_do_file_error (enum OperationMode mode, gboolean allow_retry, const char *error) +real_do_file_error (file_op_context_t *ctx, enum OperationMode mode, gboolean allow_retry, + const char *error) { + gint64 t = 0; int result; const char *msg; + if (ctx != NULL) + t = g_get_monotonic_time (); + msg = mode == Foreground ? MSG_ERROR : _("Background process error"); if (allow_retry) @@ -946,6 +958,9 @@ real_do_file_error (enum OperationMode mode, gboolean allow_retry, const char *e else result = query_dialog (msg, error, D_ERROR, 3, _("&Ignore"), _("Ignore a&ll"), _("&Abort")); + if (ctx != NULL) + ctx->pauses += g_get_monotonic_time () - t; + switch (result) { case 0: @@ -980,6 +995,8 @@ real_query_recursive (file_op_context_t *ctx, enum OperationMode mode, const cha const char *msg; char *text; + const gint64 t = g_get_monotonic_time (); + msg = mode == Foreground ? _("Directory \"%s\" not empty.\nDelete it recursively?") : _("Background process:\nDirectory \"%s\" not empty.\nDelete it recursively?"); @@ -995,6 +1012,8 @@ real_query_recursive (file_op_context_t *ctx, enum OperationMode mode, const cha if (ctx->recursive_result != RECURSIVE_ABORT) do_refresh (); + + ctx->pauses += g_get_monotonic_time () - t; } switch (ctx->recursive_result) @@ -1017,22 +1036,22 @@ real_query_recursive (file_op_context_t *ctx, enum OperationMode mode, const cha #ifdef ENABLE_BACKGROUND static FileProgressStatus -do_file_error (gboolean allow_retry, const char *str) +do_file_error (file_op_context_t *ctx, gboolean allow_retry, const char *str) { /* *INDENT-OFF* */ union { void *p; - FileProgressStatus (*f) (enum OperationMode, gboolean, const char *); + FileProgressStatus (*f) (file_op_context_t *ctx, enum OperationMode, gboolean, const char *); } pntr; /* *INDENT-ON* */ pntr.f = real_do_file_error; if (mc_global.we_are_background) - return parent_call (pntr.p, NULL, 2, sizeof (allow_retry), allow_retry, strlen (str), str); + return parent_call (pntr.p, ctx, 2, sizeof (allow_retry), allow_retry, strlen (str), str); else - return real_do_file_error (Foreground, allow_retry, str); + return real_do_file_error (ctx, Foreground, allow_retry, str); } /* --------------------------------------------------------------------------------------------- */ @@ -1084,9 +1103,9 @@ query_replace (file_op_context_t *ctx, const char *src, struct stat *src_stat, c /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -do_file_error (gboolean allow_retry, const char *str) +do_file_error (file_op_context_t *ctx, gboolean allow_retry, const char *str) { - return real_do_file_error (Foreground, allow_retry, str); + return real_do_file_error (ctx, Foreground, allow_retry, str); } /* --------------------------------------------------------------------------------------------- */ @@ -1112,7 +1131,7 @@ query_replace (file_op_context_t *ctx, const char *src, struct stat *src_stat, c /** Report error with two files */ static FileProgressStatus -files_error (const char *format, const char *file1, const char *file2) +files_error (file_op_context_t *ctx, const char *format, const char *file1, const char *file2) { char buf[BUF_MEDIUM]; char *nfile1, *nfile2; @@ -1123,7 +1142,7 @@ files_error (const char *format, const char *file1, const char *file2) g_free (nfile1); g_free (nfile2); - return do_file_error (TRUE, buf); + return do_file_error (ctx, TRUE, buf); } /* }}} */ @@ -1131,49 +1150,39 @@ files_error (const char *format, const char *file1, const char *file2) /* --------------------------------------------------------------------------------------------- */ static void -copy_file_file_display_progress (file_op_total_context_t *tctx, file_op_context_t *ctx, - gint64 tv_current, gint64 tv_transfer_start, off_t file_size, - off_t file_part) +calc_copy_file_progress (file_op_context_t *ctx, gint64 tv_current, off_t file_part, + off_t file_size) { - gint64 dt; + double dt; /* Update rotating dash after some time */ rotate_dash (TRUE); /* Compute ETA */ - dt = (tv_current - tv_transfer_start) / G_USEC_PER_SEC; + dt = (tv_current - ctx->pauses - ctx->transfer_start) / (double) G_USEC_PER_SEC; if (file_part == 0) ctx->eta_secs = 0.0; else - ctx->eta_secs = ((dt / (double) file_part) * file_size) - dt; + ctx->eta_secs = ((double) file_size / file_part - 1) * dt; /* Compute BPS rate */ - ctx->bps_time = MAX (1, dt); - ctx->bps = file_part / ctx->bps_time; + dt = MAX (1.0, dt); + ctx->bps = (long) (file_part / dt); /* Compute total ETA and BPS */ - if (ctx->progress_bytes != 0) + if (ctx->total_bytes != 0) { - uintmax_t remain_bytes; + dt = (tv_current - ctx->pauses - ctx->total_transfer_start) / (double) G_USEC_PER_SEC; - remain_bytes = ctx->progress_bytes - tctx->copied_bytes; -#if 1 - { - gint64 total_secs; + const uintmax_t copied_bytes = ctx->total_progress_bytes + file_part; + if (copied_bytes == 0) + ctx->total_eta_secs = 0; + else + ctx->total_eta_secs = ((double) ctx->total_bytes / copied_bytes - 1) * dt; - total_secs = (tv_current - tctx->transfer_start) / G_USEC_PER_SEC; - total_secs = MAX (1, total_secs); - - tctx->bps = tctx->copied_bytes / total_secs; - tctx->eta_secs = (tctx->bps != 0) ? remain_bytes / tctx->bps : 0; - } -#else - /* broken on lot of little files */ - tctx->bps_count++; - tctx->bps = (tctx->bps * (tctx->bps_count - 1) + ctx->bps) / tctx->bps_count; - tctx->eta_secs = (tctx->bps != 0) ? remain_bytes / tctx->bps : 0; -#endif + dt = MAX (1.0, dt); + ctx->total_bps = (long) (copied_bytes / dt); } } @@ -1184,7 +1193,8 @@ try_remove_file (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgressSt { while (mc_unlink (vpath) != 0 && !ctx->ignore_all) { - *status = file_error (TRUE, _("Cannot remove file \"%s\"\n%s"), vfs_path_as_str (vpath)); + *status = + file_error (ctx, TRUE, _("Cannot remove file \"%s\"\n%s"), vfs_path_as_str (vpath)); if (*status == FILE_RETRY) continue; if (*status == FILE_IGNORE_ALL) @@ -1203,7 +1213,6 @@ try_remove_file (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgressSt * Move single file or one of many files from one location to another. * * @panel pointer to panel in case of single file, NULL otherwise - * @tctx file operation total context object * @ctx file operation context object * @s source file name * @d destination file name @@ -1211,8 +1220,7 @@ try_remove_file (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgressSt * @return operation result */ static FileProgressStatus -move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_context_t *ctx, - const char *s, const char *d) +move_file_file (const WPanel *panel, file_op_context_t *ctx, const char *s, const char *d) { struct stat src_stat, dst_stat; FileProgressStatus return_status = FILE_CONT; @@ -1227,10 +1235,10 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont file_progress_show_target (ctx, dst_vpath); /* FIXME: do we really need to check buttons in case of single file? */ - if (check_progress_buttons (ctx) == FILE_ABORT) + if (file_progress_check_buttons (ctx) == FILE_ABORT) { return_status = FILE_ABORT; - goto ret; + goto ret_fast; } mc_refresh (); @@ -1242,7 +1250,7 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot stat file \"%s\"\n%s"), s); + return_status = file_error (ctx, TRUE, _("Cannot stat file \"%s\"\n%s"), s); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; } @@ -1253,7 +1261,7 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont if (mc_lstat (dst_vpath, &dst_stat) == 0) { - if (check_same_file (s, &src_stat, d, &dst_stat, &return_status)) + if (check_same_file (ctx, s, &src_stat, d, &dst_stat, &return_status)) goto ret; if (S_ISDIR (dst_stat.st_mode)) @@ -1293,11 +1301,7 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont } if (mc_rename (src_vpath, dst_vpath) == 0) - { - /* FIXME: do we really need to update progress in case of single file? */ - return_status = progress_update_one (tctx, ctx, src_stat.st_size); goto ret; - } } #if 0 /* Comparison to EXDEV seems not to work in nfs if you're moving from @@ -1313,7 +1317,7 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont return_status = FILE_IGNORE_ALL; else { - return_status = files_error (_("Cannot move file \"%s\" to \"%s\"\n%s"), s, d); + return_status = files_error (ctx, _("Cannot move file \"%s\" to \"%s\"\n%s"), s, d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -1333,13 +1337,13 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont panel_operate_init_totals (panel, src_vpath, &src_stat, ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM); if (return_status != FILE_CONT) - goto ret; + goto ret_fast; } - old_ask_overwrite = tctx->ask_overwrite; - tctx->ask_overwrite = FALSE; - return_status = copy_file_file (tctx, ctx, s, d); - tctx->ask_overwrite = old_ask_overwrite; + old_ask_overwrite = ctx->ask_overwrite; + ctx->ask_overwrite = FALSE; + return_status = copy_file_file (ctx, s, d); + ctx->ask_overwrite = old_ask_overwrite; if (return_status != FILE_CONT) goto ret; @@ -1350,23 +1354,29 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont if (panel == NULL) { file_progress_show_source (ctx, NULL); - file_progress_show (ctx, 0, 0, "", FALSE); + if (verbose) + file_progress_show (ctx, 0, 0, "", FALSE); - return_status = check_progress_buttons (ctx); + return_status = file_progress_check_buttons (ctx); if (return_status != FILE_CONT) - goto ret; + goto ret_fast; } mc_refresh (); retry_src_remove: if (!try_remove_file (ctx, src_vpath, &return_status) && panel == NULL) - goto ret; - - if (!copy_done) - return_status = progress_update_one (tctx, ctx, src_stat.st_size); + goto ret_fast; ret: + if (return_status != FILE_ABORT) + { + /* if copy_done == TRUE, progress_update_one() was called in copy_file_file() */ + if (!copy_done) + progress_update_one (TRUE, ctx, src_stat.st_size); + return_status = file_progress_check_buttons (ctx); + } + ret_fast: vfs_path_free (src_vpath, TRUE); vfs_path_free (dst_vpath, TRUE); @@ -1380,22 +1390,22 @@ move_file_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_cont /** Don't update progress status if progress_count==NULL */ static FileProgressStatus -erase_file (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_path_t *vpath) +erase_file (file_op_context_t *ctx, const vfs_path_t *vpath) { struct stat buf; FileProgressStatus return_status; /* check buttons if deleting info was changed */ - if (file_progress_show_deleting (ctx, vpath, &tctx->progress_count)) + if (file_progress_show_deleting (ctx, vpath, &ctx->total_progress_count)) { - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - if (check_progress_buttons (ctx) == FILE_ABORT) + file_progress_show_count (ctx); + if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; mc_refresh (); } - if (tctx->progress_count != 0 && mc_lstat (vpath, &buf) != 0) + if (ctx->total_progress_count != 0 && mc_lstat (vpath, &buf) != 0) { /* ignore, most likely the mc_unlink fails, too */ buf.st_size = 0; @@ -1404,10 +1414,10 @@ erase_file (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_pat if (!try_remove_file (ctx, vpath, &return_status) && return_status == FILE_ABORT) return FILE_ABORT; - if (tctx->progress_count == 0) + if (ctx->total_progress_count == 0) return FILE_CONT; - return check_progress_buttons (ctx); + return file_progress_check_buttons (ctx); } /* --------------------------------------------------------------------------------------------- */ @@ -1422,7 +1432,7 @@ try_erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath) while (my_rmdir (dir) != 0 && !ctx->ignore_all) { - return_status = file_error (TRUE, _("Cannot remove directory \"%s\"\n%s"), dir); + return_status = file_error (ctx, TRUE, _("Cannot remove directory \"%s\"\n%s"), dir); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status != FILE_RETRY) @@ -1441,7 +1451,7 @@ try_erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath) ignore_all -> remove as much as possible */ static FileProgressStatus -recursive_erase (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_path_t *vpath) +recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath) { struct vfs_dirent *next; DIR *reading; @@ -1467,9 +1477,9 @@ recursive_erase (file_op_total_context_t *tctx, file_op_context_t *ctx, const vf return FILE_RETRY; } if (S_ISDIR (buf.st_mode)) - return_status = recursive_erase (tctx, ctx, tmp_vpath); + return_status = recursive_erase (ctx, tmp_vpath); else - return_status = erase_file (tctx, ctx, tmp_vpath); + return_status = erase_file (ctx, tmp_vpath); vfs_path_free (tmp_vpath, TRUE); } mc_closedir (reading); @@ -1478,8 +1488,8 @@ recursive_erase (file_op_total_context_t *tctx, file_op_context_t *ctx, const vf return FILE_ABORT; file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - if (check_progress_buttons (ctx) == FILE_ABORT) + file_progress_show_count (ctx); + if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; mc_refresh (); @@ -1526,11 +1536,11 @@ check_dir_is_empty (const vfs_path_t *vpath) /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -erase_dir_iff_empty (file_op_context_t *ctx, const vfs_path_t *vpath, size_t count) +erase_dir_iff_empty (file_op_context_t *ctx, const vfs_path_t *vpath) { file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, count, ctx->progress_count); - if (check_progress_buttons (ctx) == FILE_ABORT) + file_progress_show_count (ctx); + if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; mc_refresh (); @@ -1545,13 +1555,12 @@ erase_dir_iff_empty (file_op_context_t *ctx, const vfs_path_t *vpath, size_t cou /* --------------------------------------------------------------------------------------------- */ static void -erase_dir_after_copy (file_op_total_context_t *tctx, file_op_context_t *ctx, - const vfs_path_t *vpath, FileProgressStatus *status) +erase_dir_after_copy (file_op_context_t *ctx, const vfs_path_t *vpath, FileProgressStatus *status) { if (ctx->erase_at_end && erase_list != NULL) { /* Reset progress count before delete to avoid counting files twice */ - tctx->progress_count = tctx->prev_progress_count; + ctx->total_progress_count = ctx->prev_total_progress_count; while (!g_queue_is_empty (erase_list) && *status != FILE_ABORT) { @@ -1560,18 +1569,18 @@ erase_dir_after_copy (file_op_total_context_t *tctx, file_op_context_t *ctx, lp = (link_t *) g_queue_pop_head (erase_list); if (S_ISDIR (lp->st_mode)) - *status = erase_dir_iff_empty (ctx, lp->src_vpath, tctx->progress_count); + *status = erase_dir_iff_empty (ctx, lp->src_vpath); else - *status = erase_file (tctx, ctx, lp->src_vpath); + *status = erase_file (ctx, lp->src_vpath); free_link (lp); } /* Save progress counter before move next directory */ - tctx->prev_progress_count = tctx->progress_count; + ctx->prev_total_progress_count = ctx->total_progress_count; } - erase_dir_iff_empty (ctx, vpath, tctx->progress_count); + erase_dir_iff_empty (ctx, vpath); } /* }}} */ @@ -1582,7 +1591,6 @@ erase_dir_after_copy (file_op_total_context_t *tctx, file_op_context_t *ctx, * Move single directory or one of many directories from one location to another. * * @panel pointer to panel in case of single directory, NULL otherwise - * @tctx file operation total context object * @ctx file operation context object * @s source directory name * @d destination directory name @@ -1590,8 +1598,7 @@ erase_dir_after_copy (file_op_total_context_t *tctx, file_op_context_t *ctx, * @return operation result */ static FileProgressStatus -do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_context_t *ctx, - const char *s, const char *d) +do_move_dir_dir (const WPanel *panel, file_op_context_t *ctx, const char *s, const char *d) { struct stat src_stat, dst_stat; FileProgressStatus return_status = FILE_CONT; @@ -1606,7 +1613,7 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con file_progress_show_target (ctx, dst_vpath); /* FIXME: do we really need to check buttons in case of single directory? */ - if (panel != NULL && check_progress_buttons (ctx) == FILE_ABORT) + if (panel != NULL && file_progress_check_buttons (ctx) == FILE_ABORT) { return_status = FILE_ABORT; goto ret_fast; @@ -1618,7 +1625,7 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con dstat_ok = (mc_stat (dst_vpath, &dst_stat) == 0); - if (dstat_ok && check_same_file (s, &src_stat, d, &dst_stat, &return_status)) + if (dstat_ok && check_same_file (ctx, s, &src_stat, d, &dst_stat, &return_status)) goto ret_fast; if (!dstat_ok) @@ -1653,7 +1660,7 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con goto ret; } - return_status = copy_dir_dir (tctx, ctx, s, d, FALSE, TRUE, TRUE, NULL); + return_status = copy_dir_dir (ctx, s, d, FALSE, TRUE, TRUE, NULL); if (return_status != FILE_CONT) goto ret; @@ -1664,9 +1671,10 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con else { if (S_ISDIR (dst_stat.st_mode)) - return_status = file_error (TRUE, _("Cannot overwrite directory \"%s\"\n%s"), d); + return_status = + file_error (ctx, TRUE, _("Cannot overwrite directory \"%s\"\n%s"), d); else - return_status = file_error (TRUE, _("Cannot overwrite file \"%s\"\n%s"), d); + return_status = file_error (ctx, TRUE, _("Cannot overwrite file \"%s\"\n%s"), d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -1687,7 +1695,8 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con { if (!ctx->ignore_all) { - return_status = files_error (_("Cannot move directory \"%s\" to \"%s\"\n%s"), s, d); + return_status = + files_error (ctx, _("Cannot move directory \"%s\" to \"%s\"\n%s"), s, d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -1708,7 +1717,7 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con goto ret; } - return_status = copy_dir_dir (tctx, ctx, s, d, FALSE, FALSE, TRUE, NULL); + return_status = copy_dir_dir (ctx, s, d, FALSE, FALSE, TRUE, NULL); if (return_status != FILE_CONT) goto ret; @@ -1720,16 +1729,17 @@ do_move_dir_dir (const WPanel *panel, file_op_total_context_t *tctx, file_op_con { file_progress_show_source (ctx, NULL); file_progress_show_target (ctx, NULL); - file_progress_show (ctx, 0, 0, "", FALSE); + if (verbose) + file_progress_show (ctx, 0, 0, "", FALSE); - return_status = check_progress_buttons (ctx); + return_status = file_progress_check_buttons (ctx); if (return_status != FILE_CONT) goto ret; } mc_refresh (); - erase_dir_after_copy (tctx, ctx, src_vpath, &return_status); + erase_dir_after_copy (ctx, src_vpath, &return_status); ret: erase_list = free_erase_list (erase_list); @@ -2012,9 +2022,8 @@ do_confirm_erase (const WPanel *panel, const char *source, struct stat *src_stat /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -operate_single_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_context_t *ctx, - const char *src, struct stat *src_stat, const char *dest, - filegui_dialog_type_t dialog_type) +operate_single_file (const WPanel *panel, file_op_context_t *ctx, const char *src, + struct stat *src_stat, const char *dest, filegui_dialog_type_t dialog_type) { FileProgressStatus value; vfs_path_t *src_vpath; @@ -2041,9 +2050,9 @@ operate_single_file (const WPanel *panel, file_op_total_context_t *tctx, file_op if (value == FILE_CONT) { if (is_file) - value = erase_file (tctx, ctx, src_vpath); + value = erase_file (ctx, src_vpath); else - value = erase_dir (tctx, ctx, src_vpath); + value = erase_dir (ctx, src_vpath); } } else @@ -2079,9 +2088,9 @@ operate_single_file (const WPanel *panel, file_op_total_context_t *tctx, file_op } if (is_file) - value = copy_file_file (tctx, ctx, src, dest); + value = copy_file_file (ctx, src, dest); else - value = copy_dir_dir (tctx, ctx, src, dest, TRUE, FALSE, FALSE, NULL); + value = copy_dir_dir (ctx, src, dest, TRUE, FALSE, FALSE, NULL); } break; @@ -2090,12 +2099,12 @@ operate_single_file (const WPanel *panel, file_op_total_context_t *tctx, file_op if (!mc_global.we_are_background) #endif /* create UI to show confirmation dialog */ - file_op_context_create_ui (ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM); + file_progress_ui_create (ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM); if (is_file) - value = move_file_file (panel, tctx, ctx, src, dest); + value = move_file_file (panel, ctx, src, dest); else - value = do_move_dir_dir (panel, tctx, ctx, src, dest); + value = do_move_dir_dir (panel, ctx, src, dest); break; default: @@ -2115,8 +2124,8 @@ operate_single_file (const WPanel *panel, file_op_total_context_t *tctx, file_op /* --------------------------------------------------------------------------------------------- */ static FileProgressStatus -operate_one_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_context_t *ctx, - const char *src, struct stat *src_stat, const char *dest) +operate_one_file (const WPanel *panel, file_op_context_t *ctx, const char *src, + struct stat *src_stat, const char *dest) { FileProgressStatus value = FILE_CONT; vfs_path_t *src_vpath; @@ -2132,9 +2141,9 @@ operate_one_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_co if (ctx->operation == OP_DELETE) { if (is_file) - value = erase_file (tctx, ctx, src_vpath); + value = erase_file (ctx, src_vpath); else - value = erase_dir (tctx, ctx, src_vpath); + value = erase_dir (ctx, src_vpath); } else { @@ -2155,17 +2164,17 @@ operate_one_file (const WPanel *panel, file_op_total_context_t *tctx, file_op_co is_file = !S_ISDIR (src_stat->st_mode); if (is_file) - value = copy_file_file (tctx, ctx, src, dest); + value = copy_file_file (ctx, src, dest); else - value = copy_dir_dir (tctx, ctx, src, dest, TRUE, FALSE, FALSE, NULL); + value = copy_dir_dir (ctx, src, dest, TRUE, FALSE, FALSE, NULL); dest_dirs = free_linklist (dest_dirs); break; case OP_MOVE: if (is_file) - value = move_file_file (NULL, tctx, ctx, src, dest); + value = move_file_file (NULL, ctx, src, dest); else - value = do_move_dir_dir (NULL, tctx, ctx, src, dest); + value = do_move_dir_dir (NULL, ctx, src, dest); break; default: @@ -2260,8 +2269,7 @@ file_is_symlink_to_dir (const vfs_path_t *vpath, struct stat *st, gboolean *stal /* --------------------------------------------------------------------------------------------- */ FileProgressStatus -copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, - const char *src_path, const char *dst_path) +copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_path) { uid_t src_uid = (uid_t) (-1); gid_t src_gid = (gid_t) (-1); @@ -2275,7 +2283,6 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, gboolean dst_exists = FALSE, appending = FALSE; off_t file_size = -1; FileProgressStatus return_status, temp_status; - gint64 tv_transfer_start; dest_status_t dst_status = DEST_NONE; int open_flags; vfs_path_t *src_vpath = NULL, *dst_vpath = NULL; @@ -2295,7 +2302,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, file_progress_show_source (ctx, src_vpath); file_progress_show_target (ctx, dst_vpath); - if (check_progress_buttons (ctx) == FILE_ABORT) + if (file_progress_check_buttons (ctx) == FILE_ABORT) { return_status = FILE_ABORT; goto ret_fast; @@ -2312,7 +2319,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, else { return_status = - file_error (TRUE, _("Cannot overwrite directory \"%s\"\n%s"), dst_path); + file_error (ctx, TRUE, _("Cannot overwrite directory \"%s\"\n%s"), dst_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -2331,15 +2338,26 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot stat source file \"%s\"\n%s"), src_path); + return_status = + file_error (ctx, TRUE, _("Cannot stat source file \"%s\"\n%s"), src_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; } if (return_status != FILE_RETRY) + { + /* unknown size */ + progress_update_one (FALSE, ctx, 0); goto ret_fast; + } } + /* After ctx->stat_func() */ + src_mode = src_stat.st_mode; + src_uid = src_stat.st_uid; + src_gid = src_stat.st_gid; + file_size = src_stat.st_size; + while (attrs_ok && mc_fgetflags (src_vpath, &attrs) != 0) { attrs_ok = FALSE; @@ -2352,7 +2370,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, else { return_status = - file_error (TRUE, _("Cannot get ext2 attributes of source file \"%s\"\n%s"), + file_error (ctx, TRUE, _("Cannot get ext2 attributes of source file \"%s\"\n%s"), src_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; @@ -2370,11 +2388,11 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, if (dst_exists) { /* Destination already exists */ - if (check_same_file (src_path, &src_stat, dst_path, &dst_stat, &return_status)) + if (check_same_file (ctx, src_path, &src_stat, dst_path, &dst_stat, &return_status)) goto ret_fast; /* Should we replace destination? */ - if (tctx->ask_overwrite) + if (ctx->ask_overwrite) { ctx->do_reget = 0; return_status = query_replace (ctx, src_path, &src_stat, dst_path, &dst_stat); @@ -2390,7 +2408,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, /* Check the hardlinks */ if (!ctx->follow_links) { - switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->ignore_all)) + switch (check_hardlinks (ctx, src_vpath, &src_stat, dst_vpath, &ctx->ignore_all)) { case HARDLINK_OK: /* We have made a hardlink - no more processing is necessary */ @@ -2424,7 +2442,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, ctx->ignore_all = TRUE; else return_status = - file_error (TRUE, + file_error (ctx, TRUE, _("Cannot set ext2 attributes of target file \"%s\"\n%s"), dst_path); @@ -2451,7 +2469,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, && !ctx->ignore_all) { return_status = - file_error (TRUE, _("Cannot create special file \"%s\"\n%s"), dst_path); + file_error (ctx, TRUE, _("Cannot create special file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; if (return_status == FILE_IGNORE_ALL) @@ -2464,7 +2482,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, && mc_chown (dst_vpath, src_stat.st_uid, src_stat.st_gid) != 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); + temp_status = + file_error (ctx, TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_IGNORE) break; if (temp_status == FILE_IGNORE_ALL) @@ -2479,7 +2498,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, while (ctx->preserve && mc_chmod (dst_vpath, src_stat.st_mode & ctx->umask_kill) != 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); + temp_status = + file_error (ctx, TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_IGNORE) break; if (temp_status == FILE_IGNORE_ALL) @@ -2500,7 +2520,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, break; temp_status = - file_error (TRUE, _("Cannot set ext2 attributes of target file \"%s\"\n%s"), + file_error (ctx, TRUE, _("Cannot set ext2 attributes of target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_IGNORE) break; @@ -2522,19 +2542,23 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, } } - tv_transfer_start = g_get_monotonic_time (); + ctx->transfer_start = g_get_monotonic_time (); - while ((src_desc = mc_open (src_vpath, O_RDONLY | O_LINEAR)) < 0 && !ctx->ignore_all) + while ((src_desc = mc_open (src_vpath, O_RDONLY | O_LINEAR)) < 0) { - return_status = file_error (TRUE, _("Cannot open source file \"%s\"\n%s"), src_path); - if (return_status == FILE_RETRY) - continue; - if (return_status == FILE_IGNORE_ALL) - ctx->ignore_all = TRUE; - if (return_status == FILE_IGNORE) - break; - ctx->do_append = FALSE; - goto ret_fast; + if (ctx->ignore_all) + return_status = FILE_IGNORE_ALL; + else + { + return_status = + file_error (ctx, TRUE, _("Cannot open source file \"%s\"\n%s"), src_path); + if (return_status == FILE_RETRY) + continue; + if (return_status == FILE_IGNORE_ALL) + ctx->ignore_all = TRUE; + ctx->do_append = FALSE; + } + goto ret; } if (ctx->do_reget != 0 && mc_lseek (src_desc, ctx->do_reget, SEEK_SET) != ctx->do_reget) @@ -2550,7 +2574,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot fstat source file \"%s\"\n%s"), src_path); + return_status = + file_error (ctx, TRUE, _("Cannot fstat source file \"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) continue; if (return_status == FILE_IGNORE_ALL) @@ -2560,6 +2585,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, goto ret; } + /* After mc_fstat() */ src_mode = src_stat.st_mode; src_uid = src_stat.st_uid; src_gid = src_stat.st_gid; @@ -2582,7 +2608,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, else { return_status = - file_error (TRUE, _("Cannot create target file \"%s\"\n%s"), dst_path); + file_error (ctx, TRUE, _("Cannot create target file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; if (return_status == FILE_IGNORE_ALL) @@ -2614,7 +2640,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot fstat target file \"%s\"\n%s"), dst_path); + return_status = + file_error (ctx, TRUE, _("Cannot fstat target file \"%s\"\n%s"), dst_path); if (return_status == FILE_RETRY) continue; if (return_status == FILE_IGNORE_ALL) @@ -2635,7 +2662,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, } return_status = - file_error (TRUE, _("Cannot preallocate space for target file \"%s\"\n%s"), dst_path); + file_error (ctx, TRUE, _("Cannot preallocate space for target file \"%s\"\n%s"), + dst_path); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; @@ -2662,39 +2690,37 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, ctx->eta_secs = 0.0; ctx->bps = 0; - if (tctx->bps == 0 || (file_size / tctx->bps) > FILEOP_UPDATE_INTERVAL) - file_progress_show (ctx, 0, file_size, "", TRUE); - else - file_progress_show (ctx, 1, 1, "", TRUE); - return_status = check_progress_buttons (ctx); + if (verbose) + { + if (ctx->total_bps == 0 || (file_size / ctx->total_bps) > FILEOP_UPDATE_INTERVAL) + file_progress_show (ctx, 0, file_size, "", TRUE); + else + file_progress_show (ctx, 1, 1, "", TRUE); + } + + return_status = file_progress_check_buttons (ctx); mc_refresh (); if (return_status == FILE_CONT) { - size_t bufsize; off_t file_part = 0; - gint64 tv_current, tv_last_update; + gint64 tv_last_update = ctx->transfer_start; gint64 tv_last_input = 0; - gint64 usecs, update_usecs; - const char *stalled_msg = ""; gboolean is_first_time = TRUE; - tv_last_update = tv_transfer_start; - - bufsize = io_blksize (dst_stat); + const size_t bufsize = io_blksize (dst_stat); buf = g_malloc (bufsize); while (TRUE) { - ssize_t n_read = -1, n_written; - gboolean force_update; + ssize_t n_read = -1; /* src_read */ if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0) == 0) while ((n_read = mc_read (src_desc, buf, bufsize)) < 0 && !ctx->ignore_all) { return_status = - file_error (TRUE, _("Cannot read source file \"%s\"\n%s"), src_path); + file_error (ctx, TRUE, _("Cannot read source file \"%s\"\n%s"), src_path); if (return_status == FILE_RETRY) continue; if (return_status == FILE_IGNORE_ALL) @@ -2705,10 +2731,11 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, if (n_read == 0) break; - tv_current = g_get_monotonic_time (); + const gint64 tv_current = g_get_monotonic_time (); if (n_read > 0) { + ssize_t n_written; char *t = buf; file_part += n_read; @@ -2733,7 +2760,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, return_status = FILE_IGNORE_ALL; else return_status = - file_error (TRUE, _("Cannot write target file \"%s\"\n%s"), dst_path); + file_error (ctx, TRUE, _("Cannot write target file \"%s\"\n%s"), + dst_path); if (return_status == FILE_IGNORE) { @@ -2752,44 +2780,53 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, } } - tctx->copied_bytes = tctx->progress_bytes + file_part + ctx->do_reget; + ctx->progress_bytes = file_part + ctx->do_reget; - usecs = tv_current - tv_last_update; - update_usecs = tv_current - tv_last_input; + const gint64 usecs = tv_current - tv_last_update; if (is_first_time || usecs > FILEOP_UPDATE_INTERVAL_US) { - copy_file_file_display_progress (tctx, ctx, tv_current, tv_transfer_start, - file_size, file_part); + calc_copy_file_progress (ctx, tv_current, file_part, file_size - ctx->do_reget); tv_last_update = tv_current; } is_first_time = FALSE; - if (update_usecs > FILEOP_STALLING_INTERVAL_US) - stalled_msg = _("(stalled)"); - - force_update = (tv_current - tctx->transfer_start) > FILEOP_UPDATE_INTERVAL_US; - - if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) + if (verbose) { - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - file_progress_show_total (tctx, ctx, tctx->copied_bytes, force_update); + const gint64 total_usecs = tv_current - ctx->total_transfer_start; + const gboolean force_update = total_usecs > FILEOP_UPDATE_INTERVAL_US; + + const gint64 update_usecs = tv_current - tv_last_input; + const char *stalled_msg = + update_usecs > FILEOP_STALLING_INTERVAL_US ? _("(stalled)") : ""; + + file_progress_show (ctx, ctx->progress_bytes, file_size, stalled_msg, force_update); + if (ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) + { + file_progress_show_count (ctx); + file_progress_show_total (ctx, ctx->total_progress_bytes + ctx->progress_bytes, + tv_current, force_update); + } + + mc_refresh (); } - file_progress_show (ctx, file_part + ctx->do_reget, file_size, stalled_msg, - force_update); - mc_refresh (); - - return_status = check_progress_buttons (ctx); + return_status = file_progress_check_buttons (ctx); if (return_status != FILE_CONT) { int query_res; + const gint64 t1 = g_get_monotonic_time (); query_res = query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved"), D_ERROR, 3, _("&Delete"), _("&Keep"), _("&Continue copy")); + const gint64 t2 = g_get_monotonic_time (); + ctx->pauses += t2 - t1; + + /* update info forced */ + calc_copy_file_progress (ctx, t2, file_part, file_size - ctx->do_reget); switch (query_res) { @@ -2820,7 +2857,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, rotate_dash (FALSE); while (src_desc != -1 && mc_close (src_desc) < 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot close source file \"%s\"\n%s"), src_path); + temp_status = file_error (ctx, TRUE, _("Cannot close source file \"%s\"\n%s"), src_path); if (temp_status == FILE_RETRY) continue; if (temp_status == FILE_ABORT) @@ -2832,7 +2869,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, while (dest_desc != -1 && mc_close (dest_desc) < 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path); + temp_status = file_error (ctx, TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; if (temp_status == FILE_IGNORE_ALL) @@ -2860,7 +2897,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, while (ctx->preserve_uidgid && mc_chown (dst_vpath, src_uid, src_gid) != 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); + temp_status = file_error (ctx, TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_ABORT) { return_status = FILE_ABORT; @@ -2881,7 +2918,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, while (ctx->preserve && mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)) != 0 && !ctx->ignore_all) { - temp_status = file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); + temp_status = file_error (ctx, TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_ABORT) { return_status = FILE_ABORT; @@ -2925,7 +2962,7 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, } temp_status = - file_error (TRUE, _("Cannot set ext2 attributes for target file \"%s\"\n%s"), + file_error (ctx, TRUE, _("Cannot set ext2 attributes for target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_ABORT) return_status = FILE_ABORT; @@ -2945,8 +2982,9 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, } } + progress_update_one (return_status == FILE_CONT, ctx, file_size); if (return_status == FILE_CONT) - return_status = progress_update_one (tctx, ctx, file_size); + return_status = file_progress_check_buttons (ctx); ret_fast: vfs_path_free (src_vpath, TRUE); @@ -2963,8 +3001,8 @@ copy_file_file (file_op_total_context_t *tctx, file_op_context_t *ctx, function calls */ FileProgressStatus -copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char *s, const char *d, - gboolean toplevel, gboolean move_over, gboolean do_delete, GSList *parent_dirs) +copy_dir_dir (file_op_context_t *ctx, const char *s, const char *d, gboolean toplevel, + gboolean move_over, gboolean do_delete, GSList *parent_dirs) { struct vfs_dirent *next; struct stat dst_stat, src_stat; @@ -2988,7 +3026,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot stat source directory \"%s\"\n%s"), s); + return_status = file_error (ctx, TRUE, _("Cannot stat source directory \"%s\"\n%s"), s); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; } @@ -3009,8 +3047,8 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char else { return_status = - file_error (TRUE, _("Cannot get ext2 attributes of source directory \"%s\"\n%s"), - s); + file_error (ctx, TRUE, + _("Cannot get ext2 attributes of source directory \"%s\"\n%s"), s); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_ABORT) @@ -3038,7 +3076,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char /* Check the hardlinks */ if (ctx->preserve) { - switch (check_hardlinks (src_vpath, &src_stat, dst_vpath, &ctx->ignore_all)) + switch (check_hardlinks (ctx, src_vpath, &src_stat, dst_vpath, &ctx->ignore_all)) { case HARDLINK_OK: /* We have made a hardlink - no more processing is necessary */ @@ -3059,7 +3097,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Source \"%s\" is not a directory\n%s"), s); + return_status = file_error (ctx, TRUE, _("Source \"%s\" is not a directory\n%s"), s); if (return_status == FILE_RETRY) goto retry_src_stat; if (return_status == FILE_IGNORE_ALL) @@ -3110,7 +3148,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char else { return_status = - file_error (TRUE, _("Destination \"%s\" must be a directory\n%s"), d); + file_error (ctx, TRUE, _("Destination \"%s\" must be a directory\n%s"), d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; if (return_status == FILE_RETRY) @@ -3143,7 +3181,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char else { return_status = - file_error (TRUE, _("Cannot create target directory \"%s\"\n%s"), d); + file_error (ctx, TRUE, _("Cannot create target directory \"%s\"\n%s"), d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; } @@ -3167,7 +3205,8 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char return_status = FILE_IGNORE_ALL; else { - return_status = file_error (TRUE, _("Cannot chown target directory \"%s\"\n%s"), d); + return_status = + file_error (ctx, TRUE, _("Cannot chown target directory \"%s\"\n%s"), d); if (return_status == FILE_IGNORE_ALL) ctx->ignore_all = TRUE; } @@ -3208,8 +3247,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char * dir already exists. So, we give the recursive call the flag 0 * meaning no toplevel. */ - return_status = - copy_dir_dir (tctx, ctx, path, mdpath, FALSE, FALSE, do_delete, parent_dirs); + return_status = copy_dir_dir (ctx, path, mdpath, FALSE, FALSE, do_delete, parent_dirs); g_free (mdpath); } else @@ -3217,7 +3255,7 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char char *dest_file; dest_file = mc_build_filename (d, x_basename (path), (char *) NULL); - return_status = copy_file_file (tctx, ctx, path, dest_file); + return_status = copy_file_file (ctx, path, dest_file); g_free (dest_file); } @@ -3237,9 +3275,9 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char tmp_vpath = NULL; } else if (S_ISDIR (dst_stat.st_mode)) - return_status = erase_dir_iff_empty (ctx, tmp_vpath, tctx->progress_count); + return_status = erase_dir_iff_empty (ctx, tmp_vpath); else - return_status = erase_file (tctx, ctx, tmp_vpath); + return_status = erase_file (ctx, tmp_vpath); } vfs_path_free (tmp_vpath, TRUE); } @@ -3280,9 +3318,9 @@ copy_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char /* {{{ Move routines */ FileProgressStatus -move_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char *s, const char *d) +move_dir_dir (file_op_context_t *ctx, const char *s, const char *d) { - return do_move_dir_dir (NULL, tctx, ctx, s, d); + return do_move_dir_dir (NULL, ctx, s, d); } /* }}} */ @@ -3291,11 +3329,11 @@ move_dir_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const char /* {{{ Erase routines */ FileProgressStatus -erase_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_path_t *vpath) +erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath) { file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - if (check_progress_buttons (ctx) == FILE_ABORT) + file_progress_show_count (ctx); + if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; mc_refresh (); @@ -3313,7 +3351,7 @@ erase_dir (file_op_total_context_t *tctx, file_op_context_t *ctx, const vfs_path error = query_recursive (ctx, vfs_path_as_str (vpath)); if (error == FILE_CONT) - error = recursive_erase (tctx, ctx, vpath); + error = recursive_erase (ctx, vpath); return error; } @@ -3465,7 +3503,6 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl int i; FileProgressStatus value; file_op_context_t *ctx; - file_op_total_context_t *tctx; filegui_dialog_type_t dialog_type = FILEGUI_DIALOG_ONE_ITEM; gboolean do_bg = FALSE; /* do background operation? */ @@ -3511,8 +3548,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl goto ret_fast; } - tctx = file_op_total_context_new (); - tctx->transfer_start = g_get_monotonic_time (); + ctx->total_transfer_start = g_get_monotonic_time (); #ifdef ENABLE_BACKGROUND /* Did the user select to do a background operation? */ @@ -3589,7 +3625,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl } } - value = operate_single_file (panel, tctx, ctx, source, &src_stat, dest, dialog_type); + value = operate_single_file (panel, ctx, source, &src_stat, dest, dialog_type); if ((value == FILE_CONT) && !force_single) unmark_files (panel); } @@ -3609,7 +3645,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl break; if (ctx->ignore_all - || file_error (TRUE, _("Destination \"%s\" must be a directory\n%s"), + || file_error (ctx, TRUE, _("Destination \"%s\" must be a directory\n%s"), dest) != FILE_RETRY) goto clean_up; } @@ -3619,9 +3655,9 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl * some directory movements can be a cross-filesystem and directory scanning is useful * for those directories only. */ - if (panel_operate_init_totals (panel, NULL, NULL, ctx, file_op_compute_totals, dialog_type) - == FILE_CONT) - { + value = + panel_operate_init_totals (panel, NULL, NULL, ctx, file_op_compute_totals, dialog_type); + if (value == FILE_CONT) /* Loop for every file, perform the actual copy operation */ for (i = 0; i < panel->dir.len; i++) { @@ -3633,29 +3669,15 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl source2 = panel->dir.list[i].fname->str; src_stat = panel->dir.list[i].st; - value = operate_one_file (panel, tctx, ctx, source2, &src_stat, dest); - + value = operate_one_file (panel, ctx, source2, &src_stat, dest); if (value == FILE_ABORT) break; if (value == FILE_CONT) do_file_mark (panel, i, 0); - if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) - { - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - file_progress_show_total (tctx, ctx, tctx->progress_bytes, FALSE); - } - - if (operation != OP_DELETE) - file_progress_show (ctx, 0, 0, "", FALSE); - - if (check_progress_buttons (ctx) == FILE_ABORT) - break; - mc_refresh (); } /* Loop for every file */ - } } /* Many entries */ clean_up: @@ -3692,7 +3714,6 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl } #endif /* ENABLE_BACKGROUND */ - file_op_total_context_destroy (tctx); ret_fast: file_op_context_destroy (ctx); @@ -3708,13 +3729,13 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl /* {{{ Query/status report routines */ /** Report error with one file */ FileProgressStatus -file_error (gboolean allow_retry, const char *format, const char *file) +file_error (file_op_context_t *ctx, gboolean allow_retry, const char *format, const char *file) { char buf[BUF_MEDIUM]; g_snprintf (buf, sizeof (buf), format, path_trunc (file, 30), unix_error_string (errno)); - return do_file_error (allow_retry, buf); + return do_file_error (ctx, allow_retry, buf); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/file.h b/src/filemanager/file.h index bf3507ed1..dc84f76f4 100644 --- a/src/filemanager/file.h +++ b/src/filemanager/file.h @@ -10,7 +10,7 @@ #include "lib/global.h" #include "lib/widget.h" -#include "fileopctx.h" +#include "filegui.h" /*** typedefs(not structures) and defined constants **********************************************/ @@ -41,23 +41,21 @@ struct dirsize_status_msg_t gboolean file_is_symlink_to_dir (const vfs_path_t * path, struct stat *st, gboolean * stale_link); -FileProgressStatus copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx, - const char *src_path, const char *dst_path); -FileProgressStatus move_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, - const char *s, const char *d); -FileProgressStatus copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, - const char *s, const char *d, +FileProgressStatus copy_file_file (file_op_context_t * ctx, const char *src_path, + const char *dst_path); +FileProgressStatus move_dir_dir (file_op_context_t * ctx, const char *s, const char *d); +FileProgressStatus copy_dir_dir (file_op_context_t * ctx, const char *s, const char *d, gboolean toplevel, gboolean move_over, gboolean do_delete, GSList * parent_dirs); -FileProgressStatus erase_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, - const vfs_path_t * vpath); +FileProgressStatus erase_dir (file_op_context_t * ctx, const vfs_path_t * vpath); gboolean panel_operate (void *source_panel, FileOperation op, gboolean force_single); /* Error reporting routines */ /* Report error with one file */ -FileProgressStatus file_error (gboolean allow_retry, const char *format, const char *file); +FileProgressStatus file_error (file_op_context_t *ctx, gboolean allow_retry, const char *format, + const char *file); /* return value is FILE_CONT or FILE_ABORT */ FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, dirsize_status_msg_t * sm, diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index b6b0032d8..5b76b649e 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -155,7 +155,6 @@ statfs (char const *filename, struct fs_info *buf) #include "src/setup.h" /* verbose, safe_overwrite */ #include "filemanager.h" -#include "fileopctx.h" /* FILE_CONT */ #include "filegui.h" @@ -215,15 +214,13 @@ typedef struct /* Target file: label and name */ WLabel *tgt_file_label; WLabel *tgt_file; - WGauge *progress_file_gauge; WLabel *progress_file_label; + WHLine *total_bytes_label; WGauge *progress_total_gauge; - WLabel *total_files_processed_label; WLabel *time_label; - WHLine *total_bytes_label; /* Query replace dialog */ WDialog *replace_dlg; @@ -233,7 +230,7 @@ typedef struct gboolean dont_overwrite_with_zero; struct stat *src_stat, *dst_stat; -} file_op_context_ui_t; +} file_progress_ui_t; /*** forward declarations (file scope functions) *************************************************/ @@ -350,14 +347,17 @@ file_eta_prepare_for_show (char *buffer, double eta_secs, gboolean always_show) { char _fmt_buff[BUF_TINY]; - if (eta_secs <= 0.5 && !always_show) + if (eta_secs <= 0.5) { - *buffer = '\0'; - return; + if (!always_show) + { + *buffer = '\0'; + return; + } + + eta_secs = 1.0; } - if (eta_secs <= 0.5) - eta_secs = 1; file_frmt_time (_fmt_buff, eta_secs); g_snprintf (buffer, BUF_TINY, _("ETA %s"), _fmt_buff); } @@ -388,7 +388,7 @@ file_ui_op_dlg_callback (Widget *w, Widget *sender, widget_msg_t msg, int parm, /* Do not close the dialog because the query dialog will be shown */ if (parm == CK_Cancel) { - DIALOG (w)->ret_value = FILE_ABORT; /* for check_progress_buttons() */ + DIALOG (w)->ret_value = FILE_ABORT; /* for file_progress_check_buttons() */ return MSG_HANDLED; } return MSG_NOT_HANDLED; @@ -505,7 +505,7 @@ overwrite_query_dialog (file_op_context_t *ctx, enum OperationMode mode) const int gap = 1; - file_op_context_ui_t *ui = ctx->ui; + file_progress_ui_t *ui = ctx->ui; Widget *wd; WGroup *g; const char *title; @@ -521,6 +521,8 @@ overwrite_query_dialog (file_op_context_t *ctx, enum OperationMode mode) unsigned long yes_id, no_id; int result; + const gint64 t = g_get_monotonic_time (); + if (mode == Foreground) title = _("File exists"); else @@ -693,6 +695,8 @@ overwrite_query_dialog (file_op_context_t *ctx, enum OperationMode mode) widget_destroy (wd); + ctx->pauses += g_get_monotonic_time () - t; + return (result == B_CANCEL) ? REPLACE_ABORT : (replace_action_t) result; #undef ADD_BUTTON @@ -761,14 +765,62 @@ progress_button_callback (WButton *button, int action) /* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ +/** + * \fn file_op_context_t * file_op_context_new (FileOperation op) + * \param op file operation struct + * \return The newly-created context, filled with the default file mask values. + * + * Creates a new file operation context with the default values. If you later want + * to have a user interface for this, call file_progress_ui_create(). + */ + +file_op_context_t * +file_op_context_new (FileOperation op) +{ + file_op_context_t *ctx; + + ctx = g_new0 (file_op_context_t, 1); + ctx->operation = op; + ctx->preserve = TRUE; + ctx->preserve_uidgid = (geteuid () == 0); + ctx->umask_kill = (mode_t) (~0); + ctx->erase_at_end = TRUE; + ctx->do_reget = -1; + ctx->stat_func = mc_lstat; + ctx->ask_overwrite = TRUE; + + return ctx; +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * \fn void file_op_context_destroy (file_op_context_t *ctx) + * \param ctx The file operation context to destroy. + * + * Destroys the specified file operation context and its associated UI data, if + * it exists. + */ + +void +file_op_context_destroy (file_op_context_t *ctx) +{ + if (ctx != NULL) + { + file_progress_ui_destroy (ctx); + mc_search_free (ctx->search_handle); + g_free (ctx); + } +} + /* --------------------------------------------------------------------------------------------- */ FileProgressStatus -check_progress_buttons (file_op_context_t *ctx) +file_progress_check_buttons (file_op_context_t *ctx) { int c; Gpm_Event event; - file_op_context_ui_t *ui; + file_progress_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return FILE_CONT; @@ -816,10 +868,10 @@ check_progress_buttons (file_op_context_t *ctx) /* {{{ File progress display routines */ void -file_op_context_create_ui (file_op_context_t *ctx, gboolean with_eta, - filegui_dialog_type_t dialog_type) +file_progress_ui_create (file_op_context_t *ctx, gboolean with_eta, + filegui_dialog_type_t dialog_type) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; Widget *w; WGroup *g; int buttons_width; @@ -842,7 +894,7 @@ file_op_context_create_ui (file_op_context_t *ctx, gboolean with_eta, ctx->dialog_type = dialog_type; ctx->recursive_result = RECURSIVE_YES; - ctx->ui = g_new0 (file_op_context_ui_t, 1); + ctx->ui = g_new0 (file_progress_ui_t, 1); ui = ctx->ui; ui->replace_result = REPLACE_YES; @@ -854,7 +906,7 @@ file_op_context_create_ui (file_op_context_t *ctx, gboolean with_eta, if (dialog_type != FILEGUI_DIALOG_DELETE_ITEM) { - ui->showing_eta = with_eta && ctx->progress_totals_computed; + ui->showing_eta = with_eta && ctx->totals_computed; ui->showing_bps = with_eta; ui->src_file_label = label_new (y++, x, NULL); @@ -882,7 +934,7 @@ file_op_context_create_ui (file_op_context_t *ctx, gboolean with_eta, ui->total_bytes_label = hline_new (y++, -1, -1); group_add_widget (g, ui->total_bytes_label); - if (ctx->progress_totals_computed) + if (ctx->totals_computed) { ui->progress_total_gauge = gauge_new (y++, x + 3, dlg_width - (x + 3) * 2, FALSE, 100, 0); @@ -966,11 +1018,11 @@ file_op_context_create_ui (file_op_context_t *ctx, gboolean with_eta, /* --------------------------------------------------------------------------------------------- */ void -file_op_context_destroy_ui (file_op_context_t *ctx) +file_progress_ui_destroy (file_op_context_t *ctx) { if (ctx != NULL && ctx->ui != NULL) { - file_op_context_ui_t *ui = (file_op_context_ui_t *) ctx->ui; + file_progress_ui_t *ui = (file_progress_ui_t *) ctx->ui; dlg_run_done (ui->op_dlg); widget_destroy (WIDGET (ui->op_dlg)); @@ -987,9 +1039,9 @@ void file_progress_show (file_op_context_t *ctx, off_t done, off_t total, const char *stalled_msg, gboolean force_update) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; - if (!verbose || ctx == NULL || ctx->ui == NULL) + if (ctx == NULL || ctx->ui == NULL) return; ui = ctx->ui; @@ -1029,9 +1081,9 @@ file_progress_show (file_op_context_t *ctx, off_t done, off_t total, /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_count (file_op_context_t *ctx, size_t done, size_t total) +file_progress_show_count (file_op_context_t *ctx) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1041,22 +1093,23 @@ file_progress_show_count (file_op_context_t *ctx, size_t done, size_t total) if (ui->total_files_processed_label == NULL) return; - if (ctx->progress_totals_computed) - label_set_textv (ui->total_files_processed_label, _("Files processed: %zu / %zu"), done, - total); + if (ctx->totals_computed) + label_set_textv (ui->total_files_processed_label, _("Files processed: %zu / %zu"), + ctx->total_progress_count, ctx->total_count); else - label_set_textv (ui->total_files_processed_label, _("Files processed: %zu"), done); + label_set_textv (ui->total_files_processed_label, _("Files processed: %zu"), + ctx->total_progress_count); } /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_total (file_op_total_context_t *tctx, file_op_context_t *ctx, - uintmax_t copied_bytes, gboolean show_summary) +file_progress_show_total (file_op_context_t *ctx, uintmax_t copied_bytes, gint64 tv_current, + gboolean show_summary) { char buffer2[BUF_TINY]; char buffer3[BUF_TINY]; - file_op_context_ui_t *ui; + file_progress_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1065,45 +1118,44 @@ file_progress_show_total (file_op_total_context_t *tctx, file_op_context_t *ctx, if (ui->progress_total_gauge != NULL) { - if (ctx->progress_bytes == 0) + if (ctx->total_bytes == 0) gauge_show (ui->progress_total_gauge, FALSE); else { gauge_set_value (ui->progress_total_gauge, 1024, - (int) (1024 * copied_bytes / ctx->progress_bytes)); + (int) (1024 * copied_bytes / ctx->total_bytes)); gauge_show (ui->progress_total_gauge, TRUE); } } - if (!show_summary && tctx->bps == 0) + if (!show_summary && ctx->total_bps == 0) return; if (ui->time_label != NULL) { - gint64 tv_current; char buffer4[BUF_TINY]; - tv_current = g_get_monotonic_time (); - file_frmt_time (buffer2, (tv_current - tctx->transfer_start) / G_USEC_PER_SEC); + file_frmt_time (buffer2, + (tv_current - ctx->pauses - ctx->total_transfer_start) / G_USEC_PER_SEC); - if (ctx->progress_totals_computed) + if (ctx->totals_computed) { - file_eta_prepare_for_show (buffer3, tctx->eta_secs, TRUE); - if (tctx->bps == 0) + file_eta_prepare_for_show (buffer3, ctx->total_eta_secs, TRUE); + if (ctx->total_bps == 0) label_set_textv (ui->time_label, _("Time: %s %s"), buffer2, buffer3); else { - file_bps_prepare_for_show (buffer4, (long) tctx->bps); + file_bps_prepare_for_show (buffer4, ctx->total_bps); label_set_textv (ui->time_label, _("Time: %s %s (%s)"), buffer2, buffer3, buffer4); } } else { - if (tctx->bps == 0) + if (ctx->total_bps == 0) label_set_textv (ui->time_label, _("Time: %s"), buffer2); else { - file_bps_prepare_for_show (buffer4, (long) tctx->bps); + file_bps_prepare_for_show (buffer4, ctx->total_bps); label_set_textv (ui->time_label, _("Time: %s (%s)"), buffer2, buffer4); } } @@ -1111,13 +1163,13 @@ file_progress_show_total (file_op_total_context_t *tctx, file_op_context_t *ctx, if (ui->total_bytes_label != NULL) { - size_trunc_len (buffer2, 5, tctx->copied_bytes, 0, panels_options.kilobyte_si); + size_trunc_len (buffer2, 5, copied_bytes, 0, panels_options.kilobyte_si); - if (!ctx->progress_totals_computed) + if (!ctx->totals_computed) hline_set_textv (ui->total_bytes_label, _(" Total: %s "), buffer2); else { - size_trunc_len (buffer3, 5, ctx->progress_bytes, 0, panels_options.kilobyte_si); + size_trunc_len (buffer3, 5, ctx->total_bytes, 0, panels_options.kilobyte_si); hline_set_textv (ui->total_bytes_label, _(" Total: %s / %s "), buffer2, buffer3); } } @@ -1130,7 +1182,7 @@ file_progress_show_total (file_op_total_context_t *tctx, file_op_context_t *ctx, void file_progress_show_source (file_op_context_t *ctx, const vfs_path_t *vpath) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1154,7 +1206,7 @@ file_progress_show_source (file_op_context_t *ctx, const vfs_path_t *vpath) void file_progress_show_target (file_op_context_t *ctx, const vfs_path_t *vpath) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; if (ctx == NULL || ctx->ui == NULL) return; @@ -1191,7 +1243,7 @@ file_progress_show_deleting (file_op_context_t *ctx, const vfs_path_t *vpath, si if (ret) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; const char *s; ui = ctx->ui; @@ -1216,7 +1268,7 @@ file_progress_real_query_replace (file_op_context_t *ctx, enum OperationMode mod const char *src, struct stat *src_stat, const char *dst, struct stat *dst_stat) { - file_op_context_ui_t *ui; + file_progress_ui_t *ui; FileProgressStatus replace_with_zero; if (ctx == NULL || ctx->ui == NULL) diff --git a/src/filemanager/filegui.h b/src/filemanager/filegui.h index 0eb412845..252f33239 100644 --- a/src/filemanager/filegui.h +++ b/src/filemanager/filegui.h @@ -1,41 +1,193 @@ /** \file filegui.h - * \brief Header: file management GUI for the text mode edition + * \brief Header: file management GUI */ #ifndef MC__FILEGUI_H #define MC__FILEGUI_H +#include +#include +#include /* uintmax_t */ + #include "lib/global.h" -#include "fileopctx.h" +#include "lib/vfs/vfs.h" /*** typedefs(not structures) and defined constants **********************************************/ +typedef int (*mc_stat_fn) (const vfs_path_t * vpath, struct stat * buf); + /*** enums ***************************************************************************************/ +typedef enum +{ + FILEGUI_DIALOG_ONE_ITEM, + FILEGUI_DIALOG_MULTI_ITEM, + FILEGUI_DIALOG_DELETE_ITEM +} filegui_dialog_type_t; + +typedef enum +{ + OP_COPY = 0, + OP_MOVE = 1, + OP_DELETE = 2 +} FileOperation; + +typedef enum +{ + RECURSIVE_YES = 0, + RECURSIVE_NO = 1, + RECURSIVE_ALWAYS = 2, + RECURSIVE_NEVER = 3, + RECURSIVE_ABORT = 4 +} FileCopyMode; + +/* ATTENTION: avoid overlapping with B_* values (lib/widget/dialog.h) */ +typedef enum +{ + FILE_CONT = 10, + FILE_RETRY, + FILE_SKIP, + FILE_ABORT, + FILE_IGNORE, + FILE_IGNORE_ALL, + FILE_SUSPEND +} FileProgressStatus; + +/* First argument passed to real functions */ +enum OperationMode +{ + Foreground, + Background +}; + /*** structures declarations (and typedefs of structures)*****************************************/ +struct mc_search_struct; + +/* This structure describes a context for file operations. It is used to update + * the progress windows and pass around options. + */ +typedef struct +{ + /* Operation type (copy, move, delete) */ + FileOperation operation; + + filegui_dialog_type_t dialog_type; + + /* File operation options */ + /* The mask of files to actually operate on */ + char *dest_mask; + /* Whether to dive into subdirectories for recursive operations */ + gboolean dive_into_subdirs; + /* Whether to stat or lstat */ + gboolean follow_links; + /* Whether to recompute symlinks */ + gboolean stable_symlinks; + /* Preserve the original files' owner, group, permissions, and + * timestamps (owner, group only as root). */ + gboolean preserve; + /* If running as root, preserve the original uid/gid (we don't want to + * try chown for non root) preserve_uidgid = preserve && uid == 0 */ + gboolean preserve_uidgid; + /* The bits to preserve in created files' modes on file copy */ + mode_t umask_kill; + /* When moving directories cross filesystem boundaries delete the + * successfully copied files when all files below the directory and its + * subdirectories were processed. + * + * If erase_at_end is FALSE files will be deleted immediately after their + * successful copy (Note: this behavior is not tested and at the moment + * it can't be changed at runtime). */ + gboolean erase_at_end; + + /* Whether to do a reget */ + off_t do_reget; + /* Controls appending to files */ + gboolean do_append; + + /* Pointer to the stat function we will use */ + mc_stat_fn stat_func; + /* search handler */ + struct mc_search_struct *search_handle; + /* toggle if all errors should be ignored */ + gboolean ignore_all; + /* Whether the file operation is in pause */ + gboolean suspended; + gboolean ask_overwrite; + /* Result from the recursive query */ + FileCopyMode recursive_result; + + /* PID of the child for background operations */ + pid_t pid; + + /* One file statuses */ + /* File transfer start time */ + gint64 transfer_start; + /* Counters for progress indicators */ + uintmax_t progress_bytes; + /* The estimated time of arrival in seconds */ + double eta_secs; + /* Transferred bytes per second */ + long bps; + + /* Total statuses */ + /* Whether the panel total has been computed */ + gboolean totals_computed; + /* Files transfer start time */ + gint64 total_transfer_start; + /* Counters for progress indicators */ + size_t total_progress_count; + size_t total_count; + uintmax_t total_progress_bytes; + uintmax_t total_bytes; + /* The estimated time of arrival in seconds */ + double total_eta_secs; + /* Transferred bytes per second */ + long total_bps; + /* Used in OP_MOVE between copy and remove directories */ + size_t prev_total_progress_count; + + /* Time of pauses in query dialogs */ + gint64 pauses; + + /* User interface data goes here */ + void *ui; +} file_op_context_t; + /*** global variables defined in .c file *********************************************************/ +extern const char *op_names[3]; + /*** declarations of public functions ************************************************************/ -void file_op_context_create_ui (file_op_context_t * ctx, gboolean with_eta, - filegui_dialog_type_t dialog_type); -void file_op_context_destroy_ui (file_op_context_t * ctx); +file_op_context_t *file_op_context_new (FileOperation op); +void file_op_context_destroy (file_op_context_t * ctx); + +void file_progress_ui_create (file_op_context_t * ctx, gboolean with_eta, + filegui_dialog_type_t dialog_type); +void file_progress_ui_destroy (file_op_context_t * ctx); char *file_mask_dialog (file_op_context_t * ctx, gboolean only_one, const char *format, const void *text, const char *def_text, gboolean * do_bg); -FileProgressStatus check_progress_buttons (file_op_context_t * ctx); +FileProgressStatus file_progress_check_buttons (file_op_context_t * ctx); void file_progress_show (file_op_context_t * ctx, off_t done, off_t total, const char *stalled_msg, gboolean force_update); -void file_progress_show_count (file_op_context_t * ctx, size_t done, size_t total); -void file_progress_show_total (file_op_total_context_t * tctx, file_op_context_t * ctx, - uintmax_t copied_bytes, gboolean show_summary); +void file_progress_show_count (file_op_context_t * ctx); +void file_progress_show_total (file_op_context_t * ctx, uintmax_t copied_bytes, gint64 tv_current, + gboolean show_summary); void file_progress_show_source (file_op_context_t * ctx, const vfs_path_t * vpath); void file_progress_show_target (file_op_context_t * ctx, const vfs_path_t * vpath); gboolean file_progress_show_deleting (file_op_context_t * ctx, const vfs_path_t * vpath, size_t *count); +/* The following functions are implemented separately by each port */ +FileProgressStatus file_progress_real_query_replace (file_op_context_t * ctx, + enum OperationMode mode, const char *src, + struct stat *src_stat, const char *dst, + struct stat *dst_stat); + /*** inline functions ****************************************************************************/ + #endif /* MC__FILEGUI_H */ diff --git a/src/filemanager/fileopctx.c b/src/filemanager/fileopctx.c deleted file mode 100644 index f29e7b019..000000000 --- a/src/filemanager/fileopctx.c +++ /dev/null @@ -1,127 +0,0 @@ -/* - File operation contexts for the Midnight Commander - - Copyright (C) 1999-2024 - Free Software Foundation, Inc. - - Written by: - Federico Mena - Miguel de Icaza - - This file is part of the Midnight Commander. - - The Midnight Commander is free software: you can redistribute it - and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the License, - or (at your option) any later version. - - The Midnight Commander is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ - -/** \file fileopctx.c - * \brief Source: file operation contexts - * \date 1998-2007 - * \author Federico Mena - * \author Miguel de Icaza - */ - -#include - -#include - -#include "lib/global.h" -#include "fileopctx.h" -#include "filegui.h" -#include "lib/search.h" -#include "lib/vfs/vfs.h" - -/*** global variables ****************************************************************************/ - -/*** file scope macro definitions ****************************************************************/ - -/*** file scope type declarations ****************************************************************/ - -/*** file scope variables ************************************************************************/ - -/*** file scope functions ************************************************************************/ -/* --------------------------------------------------------------------------------------------- */ - -/* --------------------------------------------------------------------------------------------- */ -/*** public functions ****************************************************************************/ -/* --------------------------------------------------------------------------------------------- */ - -/** - * \fn file_op_context_t * file_op_context_new (FileOperation op) - * \param op file operation struct - * \return The newly-created context, filled with the default file mask values. - * - * Creates a new file operation context with the default values. If you later want - * to have a user interface for this, call file_op_context_create_ui(). - */ - -file_op_context_t * -file_op_context_new (FileOperation op) -{ - file_op_context_t *ctx; - - ctx = g_new0 (file_op_context_t, 1); - ctx->operation = op; - ctx->eta_secs = 0.0; - ctx->progress_bytes = 0; - ctx->do_reget = -1; - ctx->stat_func = mc_lstat; - ctx->preserve = TRUE; - ctx->preserve_uidgid = (geteuid () == 0); - ctx->umask_kill = (mode_t) (~0); - ctx->erase_at_end = TRUE; - ctx->ignore_all = FALSE; - - return ctx; -} - -/* --------------------------------------------------------------------------------------------- */ -/** - * \fn void file_op_context_destroy (file_op_context_t *ctx) - * \param ctx The file operation context to destroy. - * - * Destroys the specified file operation context and its associated UI data, if - * it exists. - */ - -void -file_op_context_destroy (file_op_context_t *ctx) -{ - if (ctx != NULL) - { - file_op_context_destroy_ui (ctx); - mc_search_free (ctx->search_handle); - g_free (ctx); - } -} - -/* --------------------------------------------------------------------------------------------- */ - -file_op_total_context_t * -file_op_total_context_new (void) -{ - file_op_total_context_t *tctx; - tctx = g_new0 (file_op_total_context_t, 1); - tctx->ask_overwrite = TRUE; - return tctx; -} - -/* --------------------------------------------------------------------------------------------- */ - -void -file_op_total_context_destroy (file_op_total_context_t *tctx) -{ - g_free (tctx); -} - -/* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/fileopctx.h b/src/filemanager/fileopctx.h deleted file mode 100644 index ddb333b24..000000000 --- a/src/filemanager/fileopctx.h +++ /dev/null @@ -1,192 +0,0 @@ -/** \file fileopctx.h - * \brief Header: file operation contexts - * \date 1998 - * \author Federico Mena - * \author Miguel de Icaza - */ - -#ifndef MC__FILEOPCTX_H -#define MC__FILEOPCTX_H - -#include -#include -#include /* uintmax_t */ - -#include "lib/global.h" -#include "lib/vfs/vfs.h" - - -/*** typedefs(not structures) and defined constants **********************************************/ - -typedef int (*mc_stat_fn) (const vfs_path_t * vpath, struct stat * buf); - -/*** enums ***************************************************************************************/ - -typedef enum -{ - FILEGUI_DIALOG_ONE_ITEM, - FILEGUI_DIALOG_MULTI_ITEM, - FILEGUI_DIALOG_DELETE_ITEM -} filegui_dialog_type_t; - -typedef enum -{ - OP_COPY = 0, - OP_MOVE = 1, - OP_DELETE = 2 -} FileOperation; - -typedef enum -{ - RECURSIVE_YES = 0, - RECURSIVE_NO = 1, - RECURSIVE_ALWAYS = 2, - RECURSIVE_NEVER = 3, - RECURSIVE_ABORT = 4 -} FileCopyMode; - -/* ATTENTION: avoid overlapping with B_* values (lib/widget/dialog.h) */ -typedef enum -{ - FILE_CONT = 10, - FILE_RETRY, - FILE_SKIP, - FILE_ABORT, - FILE_IGNORE, - FILE_IGNORE_ALL, - FILE_SUSPEND -} FileProgressStatus; - -/* First argument passed to real functions */ -enum OperationMode -{ - Foreground, - Background -}; - -/*** structures declarations (and typedefs of structures)*****************************************/ - -struct mc_search_struct; - -/* This structure describes a context for file operations. It is used to update - * the progress windows and pass around options. - */ -typedef struct -{ - /* Operation type (copy, move, delete) */ - FileOperation operation; - - /* The estimated time of arrival in seconds */ - double eta_secs; - - /* Transferred bytes per second */ - long bps; - - /* Transferred seconds */ - long bps_time; - - /* Whether the panel total has been computed */ - gboolean progress_totals_computed; - filegui_dialog_type_t dialog_type; - - /* Counters for progress indicators */ - size_t progress_count; - uintmax_t progress_bytes; - - /* Result from the recursive query */ - FileCopyMode recursive_result; - - /* Whether to do a reget */ - off_t do_reget; - - /* Controls appending to files */ - gboolean do_append; - - /* Whether to stat or lstat */ - gboolean follow_links; - - /* Pointer to the stat function we will use */ - mc_stat_fn stat_func; - - /* Whether to recompute symlinks */ - gboolean stable_symlinks; - - /* Preserve the original files' owner, group, permissions, and - * timestamps (owner, group only as root). - */ - gboolean preserve; - - /* If running as root, preserve the original uid/gid (we don't want to - * try chown for non root) preserve_uidgid = preserve && uid == 0 - */ - gboolean preserve_uidgid; - - /* The bits to preserve in created files' modes on file copy */ - mode_t umask_kill; - - /* The mask of files to actually operate on */ - char *dest_mask; - - /* search handler */ - struct mc_search_struct *search_handle; - - /* Whether to dive into subdirectories for recursive operations */ - gboolean dive_into_subdirs; - - /* When moving directories cross filesystem boundaries delete the - * successfully copied files when all files below the directory and its - * subdirectories were processed. - * - * If erase_at_end is FALSE files will be deleted immediately after their - * successful copy (Note: this behavior is not tested and at the moment - * it can't be changed at runtime). - */ - gboolean erase_at_end; - - /* PID of the child for background operations */ - pid_t pid; - - /* toggle if all errors should be ignored */ - gboolean ignore_all; - - /* Whether the file operation is in pause */ - gboolean suspended; - - /* User interface data goes here */ - void *ui; -} file_op_context_t; - -typedef struct -{ - size_t progress_count; - size_t prev_progress_count; /* Used in OP_MOVE between copy and remove directories */ - uintmax_t progress_bytes; - uintmax_t copied_bytes; - size_t bps; - size_t bps_count; - gint64 transfer_start; - double eta_secs; - - gboolean ask_overwrite; -} file_op_total_context_t; - -/*** global variables defined in .c file *********************************************************/ - -extern const char *op_names[3]; - -/*** declarations of public functions ************************************************************/ - -file_op_context_t *file_op_context_new (FileOperation op); -void file_op_context_destroy (file_op_context_t * ctx); - -file_op_total_context_t *file_op_total_context_new (void); -void file_op_total_context_destroy (file_op_total_context_t * tctx); - -/* The following functions are implemented separately by each port */ -FileProgressStatus file_progress_real_query_replace (file_op_context_t * ctx, - enum OperationMode mode, const char *src, - struct stat *src_stat, const char *dst, - struct stat *dst_stat); - -/*** inline functions ****************************************************************************/ -#endif /* MC__FILEOPCTX_H */ diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c index 9b4b4b3aa..16aa9719f 100644 --- a/src/filemanager/tree.c +++ b/src/filemanager/tree.c @@ -723,15 +723,12 @@ tree_copy (WTree *tree, const char *default_dest) if (dest != NULL && *dest != '\0') { file_op_context_t *ctx; - file_op_total_context_t *tctx; ctx = file_op_context_new (OP_COPY); - tctx = file_op_total_context_new (); - file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_MULTI_ITEM); - tctx->ask_overwrite = FALSE; - copy_dir_dir (tctx, ctx, vfs_path_as_str (tree->selected_ptr->name), dest, TRUE, FALSE, - FALSE, NULL); - file_op_total_context_destroy (tctx); + file_progress_ui_create (ctx, FALSE, FILEGUI_DIALOG_MULTI_ITEM); + ctx->ask_overwrite = FALSE; + copy_dir_dir (ctx, vfs_path_as_str (tree->selected_ptr->name), dest, TRUE, FALSE, FALSE, + NULL); file_op_context_destroy (ctx); } @@ -766,17 +763,14 @@ tree_move (WTree *tree, const char *default_dest) message (D_ERROR, MSG_ERROR, _("Cannot stat the destination\n%s"), unix_error_string (errno)); else if (!S_ISDIR (buf.st_mode)) - file_error (TRUE, _("Destination \"%s\" must be a directory\n%s"), dest); + file_error (NULL, TRUE, _("Destination \"%s\" must be a directory\n%s"), dest); else { file_op_context_t *ctx; - file_op_total_context_t *tctx; ctx = file_op_context_new (OP_MOVE); - tctx = file_op_total_context_new (); - file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_ONE_ITEM); - move_dir_dir (tctx, ctx, vfs_path_as_str (tree->selected_ptr->name), dest); - file_op_total_context_destroy (tctx); + file_progress_ui_create (ctx, FALSE, FILEGUI_DIALOG_ONE_ITEM); + move_dir_dir (ctx, vfs_path_as_str (tree->selected_ptr->name), dest); file_op_context_destroy (ctx); } @@ -811,7 +805,6 @@ tree_rmdir (void *data) { WTree *tree = data; file_op_context_t *ctx; - file_op_total_context_t *tctx; if (tree->selected_ptr == NULL) return; @@ -830,12 +823,9 @@ tree_rmdir (void *data) } ctx = file_op_context_new (OP_DELETE); - tctx = file_op_total_context_new (); - - file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_ONE_ITEM); - if (erase_dir (tctx, ctx, tree->selected_ptr->name) == FILE_CONT) + file_progress_ui_create (ctx, FALSE, FILEGUI_DIALOG_ONE_ITEM); + if (erase_dir (ctx, tree->selected_ptr->name) == FILE_CONT) tree_forget (tree); - file_op_total_context_destroy (tctx); file_op_context_destroy (ctx); } diff --git a/src/util.c b/src/util.c index 417e2e599..056273c7f 100644 --- a/src/util.c +++ b/src/util.c @@ -55,17 +55,14 @@ check_for_default (const vfs_path_t *default_file_vpath, const vfs_path_t *file_ if (!exist_file (vfs_path_as_str (file_vpath))) { file_op_context_t *ctx; - file_op_total_context_t *tctx; if (!exist_file (vfs_path_as_str (default_file_vpath))) return FALSE; ctx = file_op_context_new (OP_COPY); - tctx = file_op_total_context_new (); - file_op_context_create_ui (ctx, 0, FALSE); - copy_file_file (tctx, ctx, vfs_path_as_str (default_file_vpath), + file_progress_ui_create (ctx, 0, FALSE); + copy_file_file (ctx, vfs_path_as_str (default_file_vpath), vfs_path_as_str (file_vpath)); - file_op_total_context_destroy (tctx); file_op_context_destroy (ctx); }