diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index 1a02c1e86..3303eff7e 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -1962,7 +1962,19 @@ and not to the directory where the link was present. .I Safe delete. If this option is enabled, deleting files and directory hotlist entries unintentionally becomes more difficult. The default selection in the -confirmation dialogs for deletion changes from "Yes" to "No". +confirmation dialogs for deletion changes from +.B Yes +to +.BR No . +This option is disabled by default. +.PP +.I Safe overwrite. +If this option is enabled, overwriting files unintentionally becomes +more difficult. The default selection in the overwrite confirmation dialog +changes from +.B Yes +to +.BR No . This option is disabled by default. .PP .I Auto save setup. diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index 09ecbc01a..f59bd8629 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -2104,6 +2104,15 @@ like regular expressions). Для того, чтобы достичь таког .BR Нет . По умолчанию эта опция отключена. .PP +.I Безопасная перезапись. +Если эта опция включена, непреднамеренно перезаписать файл будет сложнее. В +диалоговом окне подтверждения перезаписи предлагаемая по умолчанию кнопка +изменяется с +.B Да +на +.BR Нет . +По умолчанию эта опция отключена. +.PP .I Автосохранение настроек. Если эта опция включена, то при выходе из программы Midnight Commander значения всех настраиваемых параметров сохраняются в файле diff --git a/po/az.po b/po/az.po index 7c8db07c6..4d5e25fd4 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Azerbaijani (http://www.transifex.com/mc/mc/language/az/)\n" @@ -1567,7 +1567,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1847,6 +1847,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/be.po b/po/be.po index a7b6f688f..36fdca076 100644 --- a/po/be.po +++ b/po/be.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Belarusian (http://www.transifex.com/mc/mc/language/be/)\n" @@ -1632,7 +1632,7 @@ msgstr "" "Зручны тэкставы рэдактар,\n" "напісаны для Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1923,6 +1923,10 @@ msgstr "Зьмяняць каталёґ па &спасылцы" msgid "Sa&fe delete" msgstr "Выдаляць &бясьпечна" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Запісаць паўзьверх" + msgid "A&uto save setup" msgstr "Самарушна захоўваць &налады" diff --git a/po/bg.po b/po/bg.po index ade9f22ef..e7f53d939 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Myselus\n" "Language-Team: Bulgarian (http://www.transifex.com/mc/mc/language/bg/)\n" @@ -1642,7 +1642,8 @@ msgstr "" "Удобен за потребителя текстови редактор\n" "написан за Midnight Commander-а." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1933,6 +1934,10 @@ msgstr "Cd следва линков&ете" msgid "Sa&fe delete" msgstr "Бе&зопасно изтриване" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Презаписване" + msgid "A&uto save setup" msgstr "А&втоматично записване настройка" diff --git a/po/ca.po b/po/ca.po index ffc4a8fd6..7797681f3 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan (http://www.transifex.com/mc/mc/language/ca/)\n" @@ -1667,7 +1667,8 @@ msgstr "" "Un editor de text fàcil d'emprar\n" "escrit per al Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 la Free Software Foundation" msgid "About" @@ -1958,6 +1959,10 @@ msgstr "El canvi de directori seguei&x els enllaços" msgid "Sa&fe delete" msgstr "Suprimeix de &forma segura" +#, fuzzy +msgid "Safe overwrite" +msgstr "S&obreescriu" + msgid "A&uto save setup" msgstr "Desa &automàticament la configuració" diff --git a/po/cs.po b/po/cs.po index 6739db183..e822c86bb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-11-20 17:59+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (http://www.transifex.com/mc/mc/language/cs/)\n" @@ -1657,7 +1657,8 @@ msgstr "" "Uživatelsky přívětivý textový editor\n" "napsaný pro Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1948,6 +1949,10 @@ msgstr "&cd následuje odkazy" msgid "Sa&fe delete" msgstr "&Bezpečné mazání" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Přepsat" + msgid "A&uto save setup" msgstr "&Automatické ukládání parametrů" diff --git a/po/da.po b/po/da.po index f20e98a14..1ee23864a 100644 --- a/po/da.po +++ b/po/da.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Danish (http://www.transifex.com/mc/mc/language/da/)\n" @@ -1607,7 +1607,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1898,6 +1898,10 @@ msgstr "Cd følger &henvisninger" msgid "Sa&fe delete" msgstr "&Sikker sletning" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Overskriv" + msgid "A&uto save setup" msgstr "Opsætning for a&utomatisk gemning" diff --git a/po/de.po b/po/de.po index c5ebd2750..f5679d1d9 100644 --- a/po/de.po +++ b/po/de.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Ettore Atalan \n" "Language-Team: German (http://www.transifex.com/mc/mc/language/de/)\n" @@ -1672,7 +1672,8 @@ msgstr "" "Ein benutzerfreundlicher Texteditor\n" "geschrieben für Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1963,6 +1964,10 @@ msgstr "cd folgt Lin&ks" msgid "Sa&fe delete" msgstr "Sicheres &löschen" +#, fuzzy +msgid "Safe overwrite" +msgstr "Überschreiben" + msgid "A&uto save setup" msgstr "Einstellungen auto&m. speichern" diff --git a/po/de_CH.po b/po/de_CH.po index e8f44fbd2..f7b60c876 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+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/" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/el.po b/po/el.po index 1cf1ddf7e..5d86cccd7 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Greek (http://www.transifex.com/mc/mc/language/el/)\n" @@ -1595,7 +1595,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1882,6 +1882,10 @@ msgstr "Το cd ακολουθεί τους δεσμούς" msgid "Sa&fe delete" msgstr "Ασ&φαλής διαγραφή" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Αντικατάσταση" + msgid "A&uto save setup" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index e79e97c79..99eac9a77 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-10-12 21:56+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/mc/mc/" @@ -1573,7 +1573,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1854,6 +1854,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/eo.po b/po/eo.po index 0477e8b3d..ba931704a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:16+0000\n" "Last-Translator: Keith Bowes \n" "Language-Team: Esperanto (http://www.transifex.com/mc/mc/language/eo/)\n" @@ -1654,7 +1654,8 @@ msgstr "" "Afabla tekstoredaktilo\n" "verkita por Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" "Kopirajto © 1996–2016 Free Software Foundation (Fondaĵo pri liberaj " "programoj)" @@ -1947,6 +1948,10 @@ msgstr "Dosieruja ŝanĝo sek&vas ligilojn" msgid "Sa&fe delete" msgstr "Sendanĝera &forigo" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Anstataŭigi" + msgid "A&uto save setup" msgstr "Aŭtomate konservi agor&don" diff --git a/po/es.po b/po/es.po index d6d8ddf6e..82806aedf 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: David Martin \n" "Language-Team: Spanish (http://www.transifex.com/mc/mc/language/es/)\n" @@ -1659,7 +1659,8 @@ msgstr "" "Un editor de texto amigable\n" "para Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1950,6 +1951,10 @@ msgstr "cd sigue en&Laces" msgid "Sa&fe delete" msgstr "precauciones de &Borrado" +#, fuzzy +msgid "Safe overwrite" +msgstr "s&Obrescribir" + msgid "A&uto save setup" msgstr "auto-guarda con&Figuración" diff --git a/po/et.po b/po/et.po index 0bad1c69f..025725e27 100644 --- a/po/et.po +++ b/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 18:39+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Estonian (http://www.transifex.com/mc/mc/language/et/)\n" @@ -1649,7 +1649,8 @@ msgstr "" "Kasutajasõbralik tekstitoimeti, mis\n" "on loodud Midnight Commanderile." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Autoriõigus (C) 1996-2016 Free Software Foundation" msgid "About" @@ -1939,6 +1940,10 @@ msgstr "&Järgi kataloogide nimeviitu" msgid "Sa&fe delete" msgstr "&Kindel kustutamine" +#, fuzzy +msgid "Safe overwrite" +msgstr "K&irjuta üle" + msgid "A&uto save setup" msgstr "Seadete a&utomaatsalvestus" diff --git a/po/eu.po b/po/eu.po index 3ae12d002..0bc24fa16 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque (http://www.transifex.com/mc/mc/language/eu/)\n" @@ -1652,7 +1652,8 @@ msgstr "" "Testu editore lagunkoi bat\n" "Midnight Commander-rarentzako idatzia." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1943,6 +1944,10 @@ msgstr "Cd-k este&kei jarraitzen die" msgid "Sa&fe delete" msgstr "E&zabatze segurua" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Gainidatzi" + msgid "A&uto save setup" msgstr "A&uto gorde ezarpena" diff --git a/po/fa.po b/po/fa.po index c4b8700b5..fde4ba3e9 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:38+0000\n" "Last-Translator: Arya Hadi \n" "Language-Team: Persian (http://www.transifex.com/mc/mc/language/fa/)\n" @@ -1569,7 +1569,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1848,6 +1848,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/fi.po b/po/fi.po index 4fd01a200..a1cc516fb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-10-29 09:42+0000\n" "Last-Translator: Nikolay Korotkiy \n" "Language-Team: Finnish (http://www.transifex.com/mc/mc/language/fi/)\n" @@ -1576,7 +1576,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1857,6 +1857,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/fr.po b/po/fr.po index e1a16f5e8..b629e6277 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (http://www.transifex.com/mc/mc/language/fr/)\n" @@ -1666,7 +1666,8 @@ msgstr "" "Un éditeur de text facile d'utilisation.\n" "écrit pour Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1957,6 +1958,10 @@ msgstr "cd suit les &liens" msgid "Sa&fe delete" msgstr "E&ffacement sûr" +#, fuzzy +msgid "Safe overwrite" +msgstr "É&craser" + msgid "A&uto save setup" msgstr "Enregistrement a&utomatique de la configuration" diff --git a/po/fr_CA.po b/po/fr_CA.po index 0a366731d..0f6b67198 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+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/" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/gl.po b/po/gl.po index 3dd978988..e6eef4694 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Galician (http://www.transifex.com/mc/mc/language/gl/)\n" @@ -1653,7 +1653,7 @@ msgstr "" "Un editor de texto de uso amigábel\n" "escrito para o Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1944,6 +1944,10 @@ msgstr "Cd segue li&Gazóns" msgid "Sa&fe delete" msgstr "&Borrado seguro" +#, fuzzy +msgid "Safe overwrite" +msgstr "s&Obrescribir" + msgid "A&uto save setup" msgstr "Configuración do &Auto-gardado" diff --git a/po/hr.po b/po/hr.po index 6b7ae486e..b475c65f5 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-05-03 01:03+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Croatian (http://www.transifex.com/mc/mc/language/hr/)\n" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/hu.po b/po/hu.po index 0b1bb4cfc..761f78ecd 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-11-20 23:51+0000\n" "Last-Translator: Rezső Páder \n" "Language-Team: Hungarian (http://www.transifex.com/mc/mc/language/hu/)\n" @@ -1644,7 +1644,8 @@ msgstr "" "Felhasználóbarát szövegszerkesztő\n" "a Midnight Commander-hez készítve" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1935,6 +1936,10 @@ msgstr "Li&nkkövető könyvtárváltás" msgid "Sa&fe delete" msgstr "\"Ó&vatos\" törlés" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Felülírás" + msgid "A&uto save setup" msgstr "Auto &Beállításmentés" diff --git a/po/ia.po b/po/ia.po index e19545ee4..99cfda41e 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 10:23+0000\n" "Last-Translator: Martijn Dekker \n" "Language-Team: Interlingua (http://www.transifex.com/mc/mc/language/ia/)\n" @@ -1585,7 +1585,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1866,6 +1866,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/id.po b/po/id.po index 30aad7abb..4dc5ed063 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Indonesian (http://www.transifex.com/mc/mc/language/id/)\n" @@ -1606,7 +1606,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1887,6 +1887,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/it.po b/po/it.po index e974185cf..7a0a4edd5 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2018-02-24 12:37+0100\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/" @@ -1653,7 +1653,8 @@ msgstr "" "Un semplice editor di testi\n" "scritto per il Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1942,6 +1943,10 @@ msgstr "Cd seg&ue i collegamenti" msgid "Sa&fe delete" msgstr "Cance&llazione sicura" +#, fuzzy +msgid "Safe overwrite" +msgstr "S&ovrascrivi" + msgid "A&uto save setup" msgstr "Autosalva &configurazione" diff --git a/po/ja.po b/po/ja.po index 0f6284af9..7cd31c1e2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Japanese (http://www.transifex.com/mc/mc/language/ja/)\n" @@ -1577,7 +1577,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1861,6 +1861,10 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +#, fuzzy +msgid "Safe overwrite" +msgstr "上書き(&O)" + msgid "A&uto save setup" msgstr "自動保存の設定(&U)" diff --git a/po/ka.po b/po/ka.po index d1aee9788..d49a9b4a8 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:34+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Georgian (http://www.transifex.com/mc/mc/language/ka/)\n" @@ -1565,7 +1565,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1846,6 +1846,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/kk.po b/po/kk.po index f490106b2..b73c890d6 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 18:30+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Kazakh (http://www.transifex.com/mc/mc/language/kk/)\n" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/ko.po b/po/ko.po index 493c0e17f..69aee8ca4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Korean (http://www.transifex.com/mc/mc/language/ko/)\n" @@ -1575,7 +1575,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1856,6 +1856,10 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +#, fuzzy +msgid "Safe overwrite" +msgstr "겹쳐 쓰기(&O)" + msgid "A&uto save setup" msgstr "" diff --git a/po/lt.po b/po/lt.po index b41f5cd66..79f8b5a09 100644 --- a/po/lt.po +++ b/po/lt.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Andrius Burokas\n" "Language-Team: Lithuanian (http://www.transifex.com/mc/mc/language/lt/)\n" @@ -1593,7 +1593,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1874,6 +1874,10 @@ msgstr "" msgid "Sa&fe delete" msgstr "Saugus šalinimas" +#, fuzzy +msgid "Safe overwrite" +msgstr "Perraš&yti" + msgid "A&uto save setup" msgstr "" diff --git a/po/lv.po b/po/lv.po index 25e2ec1fd..fdcedffc7 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Latvian (http://www.transifex.com/mc/mc/language/lv/)\n" @@ -1568,7 +1568,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1848,6 +1848,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/mc.pot b/po/mc.pot index 595082fb0..aefaaf589 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.20-69-gc139b82\n" +"Project-Id-Version: mc 4.8.20-131-g34712ec\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" # "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/charsets.c:216 +#: lib/charsets.c:217 msgid "Warning: cannot load codepages list" msgstr "" -#: lib/charsets.c:219 src/filemanager/boxes.c:355 +#: lib/charsets.c:220 src/filemanager/boxes.c:355 msgid "7-bit ASCII" msgstr "" -#: lib/charsets.c:312 lib/charsets.c:323 +#: lib/charsets.c:316 lib/charsets.c:327 #, c-format msgid "Cannot translate from %s to %s" msgstr "" @@ -144,7 +144,7 @@ msgstr "" msgid "Invalid token number %d" msgstr "" -#: lib/search/regex.c:339 lib/search/regex.c:834 src/filemanager/ext.c:732 +#: lib/search/regex.c:339 lib/search/regex.c:834 src/filemanager/ext.c:741 msgid "Regular expression error" msgstr "" @@ -626,48 +626,48 @@ msgstr "" msgid "GiB" msgstr "" -#: lib/utilunix.c:520 +#: lib/utilunix.c:521 msgid "Cannot create pipe descriptor" msgstr "" -#: lib/utilunix.c:529 +#: lib/utilunix.c:530 msgid "Cannot create pipe streams" msgstr "" -#: lib/utilunix.c:608 +#: lib/utilunix.c:609 #, c-format msgid "" "Unexpected error in select() reading data from a child process:\n" "%s" msgstr "" -#: lib/utilunix.c:651 +#: lib/utilunix.c:652 #, c-format msgid "" "Unexpected error in waitpid():\n" "%s" msgstr "" -#: lib/utilunix.c:721 lib/utilunix.c:726 lib/utilunix.c:781 -#: src/editor/edit.c:358 src/editor/editcmd.c:229 src/editor/editcmd.c:252 -#: src/editor/editcmd.c:422 src/editor/editcmd.c:584 src/editor/editcmd.c:1724 -#: src/editor/editcmd.c:3440 src/editor/editcmd.c:3469 -#: src/editor/editcmd_dialogs.c:481 src/execute.c:135 -#: src/filemanager/file.c:2295 src/filemanager/panel.c:4479 src/help.c:362 +#: lib/utilunix.c:722 lib/utilunix.c:727 lib/utilunix.c:782 +#: src/editor/edit.c:359 src/editor/editcmd.c:229 src/editor/editcmd.c:252 +#: src/editor/editcmd.c:422 src/editor/editcmd.c:584 src/editor/editcmd.c:1720 +#: src/editor/editcmd.c:3436 src/editor/editcmd.c:3465 +#: src/editor/editcmd_dialogs.c:478 src/execute.c:135 +#: src/filemanager/file.c:2305 src/filemanager/panel.c:4479 src/help.c:362 #: src/main.c:401 src/subshell/common.c:418 src/subshell/common.c:1246 #: src/viewer/actions_cmd.c:419 msgid "Warning" msgstr "" -#: lib/utilunix.c:721 src/filemanager/ext.c:714 +#: lib/utilunix.c:722 src/filemanager/ext.c:723 msgid "Pipe failed" msgstr "" -#: lib/utilunix.c:726 +#: lib/utilunix.c:727 msgid "Dup failed" msgstr "" -#: lib/utilunix.c:789 +#: lib/utilunix.c:790 msgid "Error dup'ing old error pipe" msgstr "" @@ -676,21 +676,21 @@ msgstr "" msgid "Directory cache expired for %s" msgstr "" -#: lib/vfs/direntry.c:674 +#: lib/vfs/direntry.c:679 #, c-format msgid "%s: %s: %s %3d%% (%lld) bytes transferred" msgstr "" -#: lib/vfs/direntry.c:677 +#: lib/vfs/direntry.c:682 #, c-format msgid "%s: %s: %s %lld bytes transferred" msgstr "" -#: lib/vfs/direntry.c:1306 +#: lib/vfs/direntry.c:1316 msgid "Starting linear transfer..." msgstr "" -#: lib/vfs/direntry.c:1412 +#: lib/vfs/direntry.c:1423 msgid "Getting file" msgstr "" @@ -740,11 +740,11 @@ msgstr "" msgid "More parsing errors will be ignored." msgstr "" -#: lib/vfs/utilvfs.c:355 +#: lib/vfs/utilvfs.c:356 msgid "Internal error:" msgstr "" -#: lib/vfs/utilvfs.c:364 src/filemanager/boxes.c:1321 +#: lib/vfs/utilvfs.c:365 src/filemanager/boxes.c:1321 msgid "Password:" msgstr "" @@ -765,50 +765,50 @@ msgstr "" msgid "Do you want clean this history?" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:231 src/editor/editcmd.c:254 src/editor/editcmd.c:2855 -#: src/editor/editcmd.c:2861 src/filemanager/cmd.c:140 -#: src/filemanager/file.c:877 src/filemanager/file.c:1860 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:359 +#: src/editor/editcmd.c:231 src/editor/editcmd.c:254 src/editor/editcmd.c:2851 +#: src/editor/editcmd.c:2857 src/filemanager/cmd.c:140 +#: src/filemanager/file.c:880 src/filemanager/file.c:1863 #: src/filemanager/filegui.c:434 src/filemanager/hotlist.c:1158 -#: src/filemanager/hotlist.c:1175 src/filemanager/midnight.c:1032 -#: src/filemanager/midnight.c:1040 src/filemanager/panel.c:2820 +#: src/filemanager/hotlist.c:1175 src/filemanager/midnight.c:1026 +#: src/filemanager/midnight.c:1034 src/filemanager/panel.c:2820 #: src/filemanager/tree.c:828 src/subshell/common.c:1248 #: src/viewer/actions_cmd.c:619 src/viewer/actions_cmd.c:625 #: src/viewer/search.c:398 msgid "&Yes" msgstr "" -#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:231 src/editor/editcmd.c:2855 src/editor/editcmd.c:2861 -#: src/filemanager/cmd.c:140 src/filemanager/file.c:877 -#: src/filemanager/file.c:1860 src/filemanager/filegui.c:436 +#: lib/widget/listbox.c:325 src/diffviewer/ydiff.c:3089 src/editor/edit.c:359 +#: src/editor/editcmd.c:231 src/editor/editcmd.c:2851 src/editor/editcmd.c:2857 +#: src/filemanager/cmd.c:140 src/filemanager/file.c:880 +#: src/filemanager/file.c:1863 src/filemanager/filegui.c:436 #: src/filemanager/hotlist.c:1158 src/filemanager/hotlist.c:1175 -#: src/filemanager/midnight.c:1032 src/filemanager/midnight.c:1040 +#: src/filemanager/midnight.c:1026 src/filemanager/midnight.c:1034 #: src/filemanager/panel.c:2820 src/filemanager/tree.c:828 #: src/subshell/common.c:1248 src/viewer/actions_cmd.c:619 #: src/viewer/actions_cmd.c:625 src/viewer/search.c:399 msgid "&No" msgstr "" -#: lib/widget/quick.h:215 src/editor/editcmd.c:2721 +#: lib/widget/quick.h:215 src/editor/editcmd.c:2717 #: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:150 -#: src/filemanager/boxes.c:1243 src/filemanager/filegui.c:1252 +#: src/filemanager/boxes.c:1243 src/filemanager/filegui.c:1254 #: src/filemanager/find.c:598 src/filemanager/layout.c:458 #: src/subshell/common.c:421 msgid "&OK" msgstr "" #: lib/widget/quick.h:216 src/editor/editcmd.c:231 src/editor/editcmd.c:254 -#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:1725 -#: src/editor/editcmd.c:2073 src/editor/editcmd.c:2855 -#: src/editor/editcmd.c:3443 src/editor/editcmd.c:3472 -#: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:285 -#: src/editor/editcmd_dialogs.c:483 src/editor/spell_dialogs.c:99 +#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:1721 +#: src/editor/editcmd.c:2069 src/editor/editcmd.c:2851 +#: src/editor/editcmd.c:3439 src/editor/editcmd.c:3468 +#: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:282 +#: src/editor/editcmd_dialogs.c:480 src/editor/spell_dialogs.c:99 #: src/filemanager/achown.c:89 src/filemanager/achown.c:847 #: src/filemanager/achown.c:882 src/filemanager/chmod.c:117 #: src/filemanager/chmod.c:411 src/filemanager/chown.c:88 -#: src/filemanager/chown.c:310 src/filemanager/cmd.c:1149 -#: src/filemanager/filegui.c:1256 src/filemanager/find.c:598 +#: src/filemanager/chown.c:310 src/filemanager/cmd.c:1148 +#: src/filemanager/filegui.c:1258 src/filemanager/find.c:598 #: src/filemanager/hotlist.c:187 src/filemanager/hotlist.c:1014 #: src/filemanager/hotlist.c:1076 src/filemanager/layout.c:459 #: src/filemanager/panelize.c:140 src/learn.c:256 src/viewer/hex.c:430 @@ -819,10 +819,10 @@ msgstr "" msgid "Background process:" msgstr "" -#: lib/widget/wtools.c:286 lib/widget/wtools.c:413 src/editor/edit.c:193 -#: src/editor/edit.c:214 src/editor/edit.c:370 src/editor/edit.c:1980 -#: src/editor/edit.c:1990 src/editor/editcmd.c:316 src/editor/editcmd.c:326 -#: src/editor/editcmd.c:367 src/editor/editcmd.c:2958 src/editor/spell.c:315 +#: lib/widget/wtools.c:286 lib/widget/wtools.c:413 src/editor/edit.c:194 +#: src/editor/edit.c:215 src/editor/edit.c:371 src/editor/edit.c:1978 +#: src/editor/edit.c:1988 src/editor/editcmd.c:316 src/editor/editcmd.c:326 +#: src/editor/editcmd.c:367 src/editor/editcmd.c:2954 src/editor/spell.c:315 #: src/editor/spell.c:551 src/editor/spell.c:559 #: tests/src/execute__common.c:145 #: tests/src/execute__execute_with_vfs_arg.c:154 @@ -834,9 +834,9 @@ msgstr "" msgid "%s (%d)" msgstr "" -#: lib/widget/wtools.c:691 src/filemanager/file.c:765 -#: src/filemanager/file.c:836 src/filemanager/file.c:878 -#: src/filemanager/file.c:2977 src/filemanager/filegui.c:256 +#: lib/widget/wtools.c:691 src/filemanager/file.c:768 +#: src/filemanager/file.c:839 src/filemanager/file.c:881 +#: src/filemanager/file.c:2987 src/filemanager/filegui.c:256 #: src/filemanager/filegui.c:452 msgid "&Abort" msgstr "" @@ -1022,7 +1022,7 @@ msgid "" "as tickets at www.midnight-commander.org\n" msgstr "" -#: src/args.c:426 src/filemanager/midnight.c:1728 src/textconf.c:141 +#: src/args.c:426 src/filemanager/midnight.c:1722 src/textconf.c:141 #, c-format msgid "GNU Midnight Commander %s\n" msgstr "" @@ -1055,7 +1055,7 @@ msgstr "" msgid "Reading failed" msgstr "" -#: src/background.c:217 src/filemanager/file.c:762 src/filemanager/file.c:834 +#: src/background.c:217 src/filemanager/file.c:765 src/filemanager/file.c:837 msgid "Background process error" msgstr "" @@ -1073,52 +1073,52 @@ msgid "" "than we can handle." msgstr "" -#: src/diffviewer/internal.h:15 src/diffviewer/search.c:232 +#: src/diffviewer/internal.h:15 src/diffviewer/search.c:229 #: src/editor/edit-impl.h:74 src/editor/edit-impl.h:75 src/viewer/search.c:430 #: src/viewer/search.c:432 msgid "&Dismiss" msgstr "" #: src/diffviewer/search.c:85 src/editor/editcmd_dialogs.c:104 -#: src/editor/editcmd_dialogs.c:202 src/viewer/dialogs.c:89 +#: src/editor/editcmd_dialogs.c:199 src/viewer/dialogs.c:89 msgid "Enter search string:" msgstr "" #: src/diffviewer/search.c:92 src/editor/editcmd_dialogs.c:112 -#: src/editor/editcmd_dialogs.c:212 src/filemanager/boxes.c:639 +#: src/editor/editcmd_dialogs.c:209 src/filemanager/boxes.c:639 #: src/filemanager/boxes.c:860 src/filemanager/find.c:584 #: src/viewer/dialogs.c:97 msgid "Cas&e sensitive" msgstr "" #: src/diffviewer/search.c:93 src/editor/editcmd_dialogs.c:113 -#: src/editor/editcmd_dialogs.c:213 src/viewer/dialogs.c:98 +#: src/editor/editcmd_dialogs.c:210 src/viewer/dialogs.c:98 msgid "&Backwards" msgstr "" #: src/diffviewer/search.c:94 src/editor/editcmd_dialogs.c:115 -#: src/editor/editcmd_dialogs.c:215 src/filemanager/find.c:595 +#: src/editor/editcmd_dialogs.c:212 src/filemanager/find.c:595 #: src/viewer/dialogs.c:99 msgid "&Whole words" msgstr "" #: src/diffviewer/search.c:96 src/editor/editcmd_dialogs.c:117 -#: src/editor/editcmd_dialogs.c:217 src/filemanager/find.c:582 +#: src/editor/editcmd_dialogs.c:214 src/filemanager/find.c:582 #: src/viewer/dialogs.c:101 msgid "&All charsets" msgstr "" -#: src/diffviewer/search.c:106 src/diffviewer/search.c:232 -#: src/diffviewer/search.c:245 src/diffviewer/search.c:278 -#: src/editor/editcmd.c:963 src/editor/editcmd.c:991 src/editor/editcmd.c:1020 -#: src/editor/editcmd.c:2604 src/editor/editcmd.c:2615 +#: src/diffviewer/search.c:106 src/diffviewer/search.c:229 +#: src/diffviewer/search.c:242 src/diffviewer/search.c:275 +#: src/editor/editcmd.c:960 src/editor/editcmd.c:987 src/editor/editcmd.c:1016 +#: src/editor/editcmd.c:2600 src/editor/editcmd.c:2611 #: src/editor/editcmd_dialogs.c:130 src/viewer/dialogs.c:111 #: src/viewer/search.c:350 src/viewer/search.c:410 src/viewer/search.c:430 #: src/viewer/search.c:432 msgid "Search" msgstr "" -#: src/diffviewer/search.c:245 src/diffviewer/search.c:278 +#: src/diffviewer/search.c:242 src/diffviewer/search.c:275 msgid "Search is disabled" msgstr "" @@ -1200,22 +1200,22 @@ msgstr "" msgid "Goto line (right)" msgstr "" -#: src/diffviewer/ydiff.c:2931 src/editor/editcmd.c:3041 +#: src/diffviewer/ydiff.c:2931 src/editor/editcmd.c:3037 msgid "Enter line:" msgstr "" -#: src/diffviewer/ydiff.c:2973 src/editor/editwidget.c:669 -#: src/filemanager/midnight.c:1615 src/filemanager/tree.c:1169 src/help.c:1128 +#: src/diffviewer/ydiff.c:2973 src/editor/editwidget.c:682 +#: src/filemanager/midnight.c:1609 src/filemanager/tree.c:1169 src/help.c:1128 #: src/viewer/display.c:85 msgid "ButtonBar|Help" msgstr "" -#: src/diffviewer/ydiff.c:2974 src/editor/editwidget.c:670 +#: src/diffviewer/ydiff.c:2974 src/editor/editwidget.c:683 #: src/viewer/display.c:97 msgid "ButtonBar|Save" msgstr "" -#: src/diffviewer/ydiff.c:2975 src/filemanager/midnight.c:1618 +#: src/diffviewer/ydiff.c:2975 src/filemanager/midnight.c:1612 #: src/viewer/display.c:92 msgid "ButtonBar|Edit" msgstr "" @@ -1224,7 +1224,7 @@ msgstr "" msgid "ButtonBar|Merge" msgstr "" -#: src/diffviewer/ydiff.c:2977 src/editor/editwidget.c:675 +#: src/diffviewer/ydiff.c:2977 src/editor/editwidget.c:688 #: src/viewer/display.c:107 msgid "ButtonBar|Search" msgstr "" @@ -1233,13 +1233,13 @@ msgstr "" msgid "ButtonBar|Options" msgstr "" -#: src/diffviewer/ydiff.c:2979 src/editor/editwidget.c:678 -#: src/filemanager/midnight.c:1624 src/help.c:1137 src/viewer/display.c:116 +#: src/diffviewer/ydiff.c:2979 src/editor/editwidget.c:691 +#: src/filemanager/midnight.c:1618 src/help.c:1137 src/viewer/display.c:116 #: src/viewer/display.c:119 msgid "ButtonBar|Quit" msgstr "" -#: src/diffviewer/ydiff.c:3086 src/editor/editcmd.c:2861 +#: src/diffviewer/ydiff.c:3086 src/editor/editcmd.c:2857 #: src/viewer/actions_cmd.c:617 src/viewer/actions_cmd.c:623 msgid "Quit" msgstr "" @@ -1265,7 +1265,7 @@ msgid "\"%s\" is a directory" msgstr "" #: src/diffviewer/ydiff.c:3590 src/diffviewer/ydiff.c:3607 -#: src/filemanager/file.c:1664 src/viewer/mcviewer.c:337 +#: src/filemanager/file.c:1667 src/viewer/mcviewer.c:339 #, c-format msgid "" "Cannot stat \"%s\"\n" @@ -1292,52 +1292,52 @@ msgstr "" msgid "< Reload Current Syntax >" msgstr "" -#: src/editor/edit.c:152 +#: src/editor/edit.c:153 #, c-format msgid "Loading: %3d%%" msgstr "" -#: src/editor/edit.c:155 +#: src/editor/edit.c:156 msgid "Loading..." msgstr "" -#: src/editor/edit.c:192 src/editor/edit.c:310 +#: src/editor/edit.c:193 src/editor/edit.c:311 #, c-format msgid "Cannot open %s for reading" msgstr "" -#: src/editor/edit.c:202 +#: src/editor/edit.c:203 msgid "Load file" msgstr "" -#: src/editor/edit.c:213 +#: src/editor/edit.c:214 #, c-format msgid "Error reading %s" msgstr "" -#: src/editor/edit.c:322 +#: src/editor/edit.c:323 #, c-format msgid "Cannot get size/permissions for %s" msgstr "" -#: src/editor/edit.c:331 +#: src/editor/edit.c:332 #, c-format msgid "\"%s\" is not a regular file" msgstr "" -#: src/editor/edit.c:356 +#: src/editor/edit.c:357 #, c-format msgid "" "File \"%s\" is too large.\n" "Open it anyway?" msgstr "" -#: src/editor/edit.c:1979 +#: src/editor/edit.c:1977 #, c-format msgid "Error reading from pipe: %s" msgstr "" -#: src/editor/edit.c:1989 +#: src/editor/edit.c:1987 #, c-format msgid "Cannot open pipe for reading: %s" msgstr "" @@ -1379,8 +1379,8 @@ msgstr "" msgid "The file you are saving does not end with a newline." msgstr "" -#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:3442 -#: src/editor/editcmd.c:3471 src/editor/editcmd_dialogs.c:483 +#: src/editor/editcmd.c:424 src/editor/editcmd.c:587 src/editor/editcmd.c:3438 +#: src/editor/editcmd.c:3467 src/editor/editcmd_dialogs.c:480 msgid "C&ontinue" msgstr "" @@ -1400,8 +1400,8 @@ msgstr "" msgid "&Macintosh format (CR)" msgstr "" -#: src/editor/editcmd.c:445 src/editor/editcmd.c:2094 src/editor/editcmd.c:3082 -#: src/editor/editcmd.c:3114 src/filemanager/cmd.c:747 +#: src/editor/editcmd.c:445 src/editor/editcmd.c:2090 src/editor/editcmd.c:3078 +#: src/editor/editcmd.c:3110 src/filemanager/cmd.c:746 msgid "Enter file name:" msgstr "" @@ -1417,270 +1417,270 @@ msgstr "" msgid "Block is large, you may not be able to undo this action" msgstr "" -#: src/editor/editcmd.c:1249 +#: src/editor/editcmd.c:1245 msgid "Collect completions" msgstr "" -#: src/editor/editcmd.c:1623 +#: src/editor/editcmd.c:1619 msgid "&Quick save" msgstr "" -#: src/editor/editcmd.c:1624 +#: src/editor/editcmd.c:1620 msgid "&Safe save" msgstr "" -#: src/editor/editcmd.c:1625 +#: src/editor/editcmd.c:1621 msgid "&Do backups with following extension:" msgstr "" -#: src/editor/editcmd.c:1644 +#: src/editor/editcmd.c:1640 msgid "Check &POSIX new line" msgstr "" -#: src/editor/editcmd.c:1652 +#: src/editor/editcmd.c:1648 msgid "Edit Save Mode" msgstr "" -#: src/editor/editcmd.c:1709 src/editor/editcmd.c:1779 +#: src/editor/editcmd.c:1705 src/editor/editcmd.c:1775 msgid "Save as" msgstr "" -#: src/editor/editcmd.c:1711 +#: src/editor/editcmd.c:1707 msgid "Cannot save: destination is not a regular file" msgstr "" -#: src/editor/editcmd.c:1725 +#: src/editor/editcmd.c:1721 msgid "A file already exists with this name" msgstr "" -#: src/editor/editcmd.c:1725 +#: src/editor/editcmd.c:1721 msgid "&Overwrite" msgstr "" -#: src/editor/editcmd.c:1779 src/editor/editcmd.c:3092 +#: src/editor/editcmd.c:1775 src/editor/editcmd.c:3088 msgid "Cannot save file" msgstr "" -#: src/editor/editcmd.c:1804 src/editor/editcmd.c:1807 +#: src/editor/editcmd.c:1800 src/editor/editcmd.c:1803 msgid "Delete macro" msgstr "" -#: src/editor/editcmd.c:1804 +#: src/editor/editcmd.c:1800 msgid "Press macro hotkey:" msgstr "" -#: src/editor/editcmd.c:1807 +#: src/editor/editcmd.c:1803 msgid "Macro not deleted" msgstr "" -#: src/editor/editcmd.c:1862 +#: src/editor/editcmd.c:1858 msgid "Save macro" msgstr "" -#: src/editor/editcmd.c:1862 +#: src/editor/editcmd.c:1858 msgid "Press the macro's new hotkey:" msgstr "" -#: src/editor/editcmd.c:1936 +#: src/editor/editcmd.c:1932 msgid "Repeat last commands" msgstr "" -#: src/editor/editcmd.c:1936 +#: src/editor/editcmd.c:1932 msgid "Repeat times:" msgstr "" -#: src/editor/editcmd.c:2071 +#: src/editor/editcmd.c:2067 #, c-format msgid "Confirm save file: \"%s\"" msgstr "" -#: src/editor/editcmd.c:2073 src/viewer/hex.c:418 src/viewer/hex.c:430 +#: src/editor/editcmd.c:2069 src/viewer/hex.c:418 src/viewer/hex.c:430 msgid "Save file" msgstr "" -#: src/editor/editcmd.c:2073 src/editor/editmenu.c:77 src/learn.c:192 +#: src/editor/editcmd.c:2069 src/editor/editmenu.c:77 src/learn.c:192 #: src/learn.c:255 msgid "&Save" msgstr "" -#: src/editor/editcmd.c:2094 +#: src/editor/editcmd.c:2090 msgid "Load" msgstr "" -#: src/editor/editcmd.c:2127 +#: src/editor/editcmd.c:2123 msgid "Syntax file edit" msgstr "" -#: src/editor/editcmd.c:2128 +#: src/editor/editcmd.c:2124 msgid "Which syntax file you want to edit?" msgstr "" -#: src/editor/editcmd.c:2129 src/editor/editcmd.c:2175 -#: src/filemanager/cmd.c:953 src/filemanager/cmd.c:993 -#: src/filemanager/cmd.c:1054 +#: src/editor/editcmd.c:2125 src/editor/editcmd.c:2171 +#: src/filemanager/cmd.c:952 src/filemanager/cmd.c:992 +#: src/filemanager/cmd.c:1053 msgid "&User" msgstr "" -#: src/editor/editcmd.c:2129 src/editor/editcmd.c:2175 +#: src/editor/editcmd.c:2125 src/editor/editcmd.c:2171 msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:2173 src/filemanager/cmd.c:991 +#: src/editor/editcmd.c:2169 src/filemanager/cmd.c:990 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:2174 src/filemanager/cmd.c:992 +#: src/editor/editcmd.c:2170 src/filemanager/cmd.c:991 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:2175 src/filemanager/cmd.c:993 +#: src/editor/editcmd.c:2171 src/filemanager/cmd.c:992 msgid "&Local" msgstr "" -#: src/editor/editcmd.c:2680 src/editor/editcmd.c:2721 -#: src/editor/editcmd.c:2733 src/editor/editcmd_dialogs.c:227 +#: src/editor/editcmd.c:2676 src/editor/editcmd.c:2717 +#: src/editor/editcmd.c:2729 src/editor/editcmd_dialogs.c:224 msgid "Replace" msgstr "" -#: src/editor/editcmd.c:2733 +#: src/editor/editcmd.c:2729 #, c-format msgid "%ld replacements made" msgstr "" -#: src/editor/editcmd.c:2836 src/editor/editwidget.c:391 +#: src/editor/editcmd.c:2832 src/editor/editwidget.c:391 msgid "[NoName]" msgstr "" -#: src/editor/editcmd.c:2854 +#: src/editor/editcmd.c:2850 #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" -#: src/editor/editcmd.c:2855 +#: src/editor/editcmd.c:2851 msgid "Close file" msgstr "" -#: src/editor/editcmd.c:2859 +#: src/editor/editcmd.c:2855 #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -#: src/editor/editcmd.c:2958 +#: src/editor/editcmd.c:2954 msgid "This function is not implemented" msgstr "" -#: src/editor/editcmd.c:2973 +#: src/editor/editcmd.c:2969 msgid "Copy to clipboard" msgstr "" -#: src/editor/editcmd.c:2973 src/editor/editcmd.c:2997 +#: src/editor/editcmd.c:2969 src/editor/editcmd.c:2993 msgid "Unable to save to file" msgstr "" -#: src/editor/editcmd.c:2997 +#: src/editor/editcmd.c:2993 msgid "Cut to clipboard" msgstr "" -#: src/editor/editcmd.c:3041 +#: src/editor/editcmd.c:3037 msgid "Goto line" msgstr "" -#: src/editor/editcmd.c:3082 src/editor/editcmd.c:3092 +#: src/editor/editcmd.c:3078 src/editor/editcmd.c:3088 msgid "Save block" msgstr "" -#: src/editor/editcmd.c:3114 src/editor/editcmd.c:3129 +#: src/editor/editcmd.c:3110 src/editor/editcmd.c:3125 msgid "Insert file" msgstr "" -#: src/editor/editcmd.c:3129 +#: src/editor/editcmd.c:3125 msgid "Cannot insert file" msgstr "" -#: src/editor/editcmd.c:3150 +#: src/editor/editcmd.c:3146 msgid "Sort block" msgstr "" -#: src/editor/editcmd.c:3150 +#: src/editor/editcmd.c:3146 msgid "You must first highlight a block of text" msgstr "" -#: src/editor/editcmd.c:3158 +#: src/editor/editcmd.c:3154 msgid "Run sort" msgstr "" -#: src/editor/editcmd.c:3159 +#: src/editor/editcmd.c:3155 msgid "Enter sort options (see manpage) separated by whitespace:" msgstr "" -#: src/editor/editcmd.c:3179 src/editor/editcmd.c:3186 +#: src/editor/editcmd.c:3175 src/editor/editcmd.c:3182 msgid "Sort" msgstr "" -#: src/editor/editcmd.c:3179 +#: src/editor/editcmd.c:3175 msgid "Cannot execute sort command" msgstr "" -#: src/editor/editcmd.c:3185 +#: src/editor/editcmd.c:3181 #, c-format msgid "Sort returned non-zero: %s" msgstr "" -#: src/editor/editcmd.c:3220 +#: src/editor/editcmd.c:3216 msgid "Paste output of external command" msgstr "" -#: src/editor/editcmd.c:3221 +#: src/editor/editcmd.c:3217 msgid "Enter shell command(s):" msgstr "" -#: src/editor/editcmd.c:3238 +#: src/editor/editcmd.c:3234 msgid "External command" msgstr "" -#: src/editor/editcmd.c:3238 +#: src/editor/editcmd.c:3234 msgid "Cannot execute command" msgstr "" -#: src/editor/editcmd.c:3282 +#: src/editor/editcmd.c:3278 msgid "mail -s -c " msgstr "" -#: src/editor/editcmd.c:3283 +#: src/editor/editcmd.c:3279 msgid "To" msgstr "" -#: src/editor/editcmd.c:3286 +#: src/editor/editcmd.c:3282 msgid "Subject" msgstr "" -#: src/editor/editcmd.c:3289 +#: src/editor/editcmd.c:3285 msgid "Copies to" msgstr "" -#: src/editor/editcmd.c:3299 +#: src/editor/editcmd.c:3295 msgid "Mail" msgstr "" -#: src/editor/editcmd.c:3403 +#: src/editor/editcmd.c:3399 msgid "Insert literal" msgstr "" -#: src/editor/editcmd.c:3404 +#: src/editor/editcmd.c:3400 msgid "Press any key:" msgstr "" -#: src/editor/editcmd.c:3441 src/editor/editcmd.c:3470 +#: src/editor/editcmd.c:3437 src/editor/editcmd.c:3466 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes" msgstr "" -#: src/editor/editcmd_dialogs.c:114 src/editor/editcmd_dialogs.c:214 +#: src/editor/editcmd_dialogs.c:114 src/editor/editcmd_dialogs.c:211 msgid "In se&lection" msgstr "" @@ -1688,38 +1688,38 @@ msgstr "" msgid "&Find all" msgstr "" -#: src/editor/editcmd_dialogs.c:205 +#: src/editor/editcmd_dialogs.c:202 msgid "Enter replacement string:" msgstr "" -#: src/editor/editcmd_dialogs.c:279 +#: src/editor/editcmd_dialogs.c:276 msgid "Replace with:" msgstr "" -#: src/editor/editcmd_dialogs.c:282 src/editor/spell_dialogs.c:95 +#: src/editor/editcmd_dialogs.c:279 src/editor/spell_dialogs.c:95 msgid "&Replace" msgstr "" -#: src/editor/editcmd_dialogs.c:283 src/filemanager/file.c:877 +#: src/editor/editcmd_dialogs.c:280 src/filemanager/file.c:880 #: src/filemanager/filegui.c:444 msgid "A&ll" msgstr "" -#: src/editor/editcmd_dialogs.c:284 src/editor/spell_dialogs.c:97 -#: src/filemanager/file.c:765 src/filemanager/file.c:836 -#: src/filemanager/file.c:2978 src/filemanager/filegui.c:253 +#: src/editor/editcmd_dialogs.c:281 src/editor/spell_dialogs.c:97 +#: src/filemanager/file.c:768 src/filemanager/file.c:839 +#: src/filemanager/file.c:2988 src/filemanager/filegui.c:253 msgid "&Skip" msgstr "" -#: src/editor/editcmd_dialogs.c:292 +#: src/editor/editcmd_dialogs.c:289 msgid "Confirm replace" msgstr "" -#: src/editor/editcmd_dialogs.c:334 +#: src/editor/editcmd_dialogs.c:331 msgid "Cancel" msgstr "" -#: src/editor/editcmd_dialogs.c:482 +#: src/editor/editcmd_dialogs.c:479 msgid "" "Current text was modified without a file save.\n" "Continue discards these changes." @@ -1802,7 +1802,7 @@ msgstr "" msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:112 src/filemanager/file.c:2585 +#: src/editor/editmenu.c:112 src/filemanager/file.c:2595 #: src/filemanager/midnight.c:254 msgid "&Delete" msgstr "" @@ -2119,7 +2119,7 @@ msgid "" msgstr "" #: src/editor/editwidget.c:148 -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" #: src/editor/editwidget.c:157 @@ -2134,28 +2134,28 @@ msgstr "" msgid "Edit: " msgstr "" -#: src/editor/editwidget.c:671 +#: src/editor/editwidget.c:684 msgid "ButtonBar|Mark" msgstr "" -#: src/editor/editwidget.c:672 +#: src/editor/editwidget.c:685 msgid "ButtonBar|Replac" msgstr "" -#: src/editor/editwidget.c:673 src/filemanager/midnight.c:1619 +#: src/editor/editwidget.c:686 src/filemanager/midnight.c:1613 #: src/filemanager/tree.c:1174 msgid "ButtonBar|Copy" msgstr "" -#: src/editor/editwidget.c:674 +#: src/editor/editwidget.c:687 msgid "ButtonBar|Move" msgstr "" -#: src/editor/editwidget.c:676 src/filemanager/midnight.c:1622 +#: src/editor/editwidget.c:689 src/filemanager/midnight.c:1616 msgid "ButtonBar|Delete" msgstr "" -#: src/editor/editwidget.c:677 src/filemanager/midnight.c:1623 +#: src/editor/editwidget.c:690 src/filemanager/midnight.c:1617 msgid "ButtonBar|PullDn" msgstr "" @@ -2283,8 +2283,8 @@ msgstr "" msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1492 src/help.c:1069 src/usermenu.c:960 -#: src/usermenu.c:1001 +#: src/editor/syntax.c:1492 src/help.c:1069 src/usermenu.c:955 +#: src/usermenu.c:995 #, c-format msgid "" "Cannot open file %s\n" @@ -2304,7 +2304,7 @@ msgid "" "extra access permissions with the \"su\" command?" msgstr "" -#: src/execute.c:196 src/filemanager/ext.c:648 +#: src/execute.c:196 src/filemanager/ext.c:657 #, c-format msgid "Cannot fetch a local copy of %s" msgstr "" @@ -2373,7 +2373,7 @@ msgstr "" #: src/filemanager/achown.c:846 src/filemanager/achown.c:881 #: src/filemanager/chmod.c:410 src/filemanager/chown.c:309 -#: src/filemanager/file.c:836 src/viewer/hex.c:430 +#: src/filemanager/file.c:839 src/viewer/hex.c:430 msgid "&Retry" msgstr "" @@ -2499,6 +2499,10 @@ msgid "Sa&fe delete" msgstr "" #: src/filemanager/boxes.c:549 +msgid "Safe overwrite" +msgstr "" + +#: src/filemanager/boxes.c:550 msgid "A&uto save setup" msgstr "" @@ -2937,7 +2941,7 @@ msgstr "" msgid "Files tagged, want to cd?" msgstr "" -#: src/filemanager/cmd.c:147 src/filemanager/cmd.c:1132 +#: src/filemanager/cmd.c:147 src/filemanager/cmd.c:1131 #: src/filemanager/panel.c:2796 src/filemanager/panel.c:3396 msgid "Cannot change directory" msgstr "" @@ -2974,157 +2978,157 @@ msgstr "" msgid "Cannot chdir to \"%s\"" msgstr "" -#: src/filemanager/cmd.c:624 +#: src/filemanager/cmd.c:623 msgid "View file" msgstr "" -#: src/filemanager/cmd.c:624 +#: src/filemanager/cmd.c:623 msgid "Filename:" msgstr "" -#: src/filemanager/cmd.c:658 +#: src/filemanager/cmd.c:657 msgid "Filtered view" msgstr "" -#: src/filemanager/cmd.c:659 +#: src/filemanager/cmd.c:658 msgid "Filter command and arguments:" msgstr "" -#: src/filemanager/cmd.c:747 +#: src/filemanager/cmd.c:746 msgid "Edit file" msgstr "" -#: src/filemanager/cmd.c:835 +#: src/filemanager/cmd.c:834 msgid "Create a new Directory" msgstr "" -#: src/filemanager/cmd.c:836 +#: src/filemanager/cmd.c:835 msgid "Enter directory name:" msgstr "" -#: src/filemanager/cmd.c:951 +#: src/filemanager/cmd.c:950 msgid "Extension file edit" msgstr "" -#: src/filemanager/cmd.c:952 +#: src/filemanager/cmd.c:951 msgid "Which extension file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:953 src/filemanager/cmd.c:993 -#: src/filemanager/cmd.c:1054 +#: src/filemanager/cmd.c:952 src/filemanager/cmd.c:992 +#: src/filemanager/cmd.c:1053 msgid "&System Wide" msgstr "" -#: src/filemanager/cmd.c:1052 +#: src/filemanager/cmd.c:1051 msgid "Highlighting groups file edit" msgstr "" -#: src/filemanager/cmd.c:1053 +#: src/filemanager/cmd.c:1052 msgid "Which highlighting file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:1147 +#: src/filemanager/cmd.c:1146 msgid "Compare directories" msgstr "" -#: src/filemanager/cmd.c:1148 +#: src/filemanager/cmd.c:1147 msgid "Select compare method:" msgstr "" -#: src/filemanager/cmd.c:1149 +#: src/filemanager/cmd.c:1148 msgid "&Quick" msgstr "" -#: src/filemanager/cmd.c:1149 +#: src/filemanager/cmd.c:1148 msgid "&Size only" msgstr "" -#: src/filemanager/cmd.c:1149 +#: src/filemanager/cmd.c:1148 msgid "&Thorough" msgstr "" -#: src/filemanager/cmd.c:1164 +#: src/filemanager/cmd.c:1163 msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -#: src/filemanager/cmd.c:1212 +#: src/filemanager/cmd.c:1211 msgid "" "Not an xterm or Linux console;\n" "the panels cannot be toggled." msgstr "" -#: src/filemanager/cmd.c:1244 +#: src/filemanager/cmd.c:1243 #, c-format msgid "'%s' is not a symbolic link" msgstr "" -#: src/filemanager/cmd.c:1257 +#: src/filemanager/cmd.c:1256 #, c-format msgid "Symlink '%s' points to:" msgstr "" -#: src/filemanager/cmd.c:1259 +#: src/filemanager/cmd.c:1258 msgid "Edit symlink" msgstr "" -#: src/filemanager/cmd.c:1272 +#: src/filemanager/cmd.c:1271 #, c-format msgid "edit symlink, unable to remove %s: %s" msgstr "" -#: src/filemanager/cmd.c:1280 +#: src/filemanager/cmd.c:1279 #, c-format msgid "edit symlink: %s" msgstr "" -#: src/filemanager/cmd.c:1325 +#: src/filemanager/cmd.c:1324 msgid "FTP to machine" msgstr "" -#: src/filemanager/cmd.c:1336 +#: src/filemanager/cmd.c:1335 msgid "SFTP to machine" msgstr "" -#: src/filemanager/cmd.c:1348 +#: src/filemanager/cmd.c:1347 msgid "Shell link to machine" msgstr "" -#: src/filemanager/cmd.c:1360 +#: src/filemanager/cmd.c:1359 msgid "SMB link to machine" msgstr "" -#: src/filemanager/cmd.c:1371 +#: src/filemanager/cmd.c:1370 msgid "Undelete files on an ext2 file system" msgstr "" -#: src/filemanager/cmd.c:1372 +#: src/filemanager/cmd.c:1371 msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" -#: src/filemanager/cmd.c:1438 src/filemanager/cmd.c:1473 +#: src/filemanager/cmd.c:1437 src/filemanager/cmd.c:1472 #: src/filemanager/file.c:681 msgid "Directory scanning" msgstr "" -#: src/filemanager/cmd.c:1519 src/filemanager/cmd.c:1521 +#: src/filemanager/cmd.c:1518 src/filemanager/cmd.c:1520 msgid "Setup" msgstr "" -#: src/filemanager/cmd.c:1519 +#: src/filemanager/cmd.c:1518 #, c-format msgid "Setup saved to %s" msgstr "" -#: src/filemanager/cmd.c:1521 +#: src/filemanager/cmd.c:1520 #, c-format msgid "Unable to save setup to %s" msgstr "" -#: src/filemanager/command.c:282 src/usermenu.c:949 +#: src/filemanager/command.c:282 src/usermenu.c:944 msgid "Cannot execute commands on non-local filesystems" msgstr "" @@ -3140,23 +3144,23 @@ msgstr "" msgid "Cannot read directory contents" msgstr "" -#: src/filemanager/ext.c:245 src/usermenu.c:475 +#: src/filemanager/ext.c:245 src/usermenu.c:476 msgid "Parameter" msgstr "" -#: src/filemanager/ext.c:449 src/usermenu.c:446 +#: src/filemanager/ext.c:458 src/usermenu.c:446 #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -#: src/filemanager/ext.c:830 +#: src/filemanager/ext.c:839 #, c-format msgid " %s%s file error" msgstr "" -#: src/filemanager/ext.c:832 +#: src/filemanager/ext.c:841 #, c-format msgid "" "The format of the %smc.ext file has changed with version 3.0. It seems that " @@ -3164,19 +3168,19 @@ msgid "" "Commander package." msgstr "" -#: src/filemanager/ext.c:852 +#: src/filemanager/ext.c:861 #, c-format msgid "%s file error" msgstr "" -#: src/filemanager/ext.c:854 +#: src/filemanager/ext.c:863 #, c-format msgid "" "The format of the %s file has changed with version 3.0. You may either want " "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" -#: src/filemanager/file.c:95 src/filemanager/file.c:2584 +#: src/filemanager/file.c:95 src/filemanager/file.c:2594 #: src/filemanager/tree.c:716 msgid "DialogTitle|Copy" msgstr "" @@ -3258,7 +3262,7 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:804 +#: src/filemanager/file.c:807 #, c-format msgid "" "\"%s\"\n" @@ -3267,7 +3271,7 @@ msgid "" "are the same directory" msgstr "" -#: src/filemanager/file.c:806 +#: src/filemanager/file.c:809 #, c-format msgid "" "\"%s\"\n" @@ -3276,18 +3280,18 @@ msgid "" "are the same file" msgstr "" -#: src/filemanager/file.c:836 +#: src/filemanager/file.c:839 msgid "Ski&p all" msgstr "" -#: src/filemanager/file.c:869 +#: src/filemanager/file.c:872 #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:870 +#: src/filemanager/file.c:873 #, c-format msgid "" "Background process:\n" @@ -3295,197 +3299,197 @@ msgid "" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:878 src/filemanager/filegui.c:448 +#: src/filemanager/file.c:881 src/filemanager/filegui.c:448 msgid "Non&e" msgstr "" -#: src/filemanager/file.c:1077 +#: src/filemanager/file.c:1080 #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1135 +#: src/filemanager/file.c:1138 #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1151 +#: src/filemanager/file.c:1154 #, c-format msgid "Cannot overwrite directory \"%s\"" msgstr "" -#: src/filemanager/file.c:1197 +#: src/filemanager/file.c:1200 #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1300 +#: src/filemanager/file.c:1303 #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1528 src/filemanager/file.c:2159 +#: src/filemanager/file.c:1531 src/filemanager/file.c:2169 #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1530 +#: src/filemanager/file.c:1533 #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1551 +#: src/filemanager/file.c:1554 #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1653 +#: src/filemanager/file.c:1656 msgid "Cannot operate on \"..\"!" msgstr "" -#: src/filemanager/file.c:2178 +#: src/filemanager/file.c:2188 #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2232 +#: src/filemanager/file.c:2242 #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2244 src/filemanager/file.c:2595 +#: src/filemanager/file.c:2254 src/filemanager/file.c:2605 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2259 src/filemanager/file.c:2615 +#: src/filemanager/file.c:2269 src/filemanager/file.c:2625 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2280 +#: src/filemanager/file.c:2290 #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2295 +#: src/filemanager/file.c:2305 msgid "Reget failed, about to overwrite file" msgstr "" -#: src/filemanager/file.c:2307 +#: src/filemanager/file.c:2317 #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2344 +#: src/filemanager/file.c:2354 #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2366 +#: src/filemanager/file.c:2376 #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2386 +#: src/filemanager/file.c:2396 #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2442 +#: src/filemanager/file.c:2452 #, c-format msgid "" "Cannot read source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2487 +#: src/filemanager/file.c:2497 #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2522 +#: src/filemanager/file.c:2532 msgid "(stalled)" msgstr "" -#: src/filemanager/file.c:2560 +#: src/filemanager/file.c:2570 #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2572 +#: src/filemanager/file.c:2582 #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2584 +#: src/filemanager/file.c:2594 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/filemanager/file.c:2585 +#: src/filemanager/file.c:2595 msgid "&Keep" msgstr "" -#: src/filemanager/file.c:2680 +#: src/filemanager/file.c:2690 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2714 +#: src/filemanager/file.c:2724 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2726 +#: src/filemanager/file.c:2736 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:2764 src/filemanager/file.c:3247 +#: src/filemanager/file.c:2774 src/filemanager/file.c:3257 #: src/filemanager/tree.c:773 #, c-format msgid "" @@ -3493,26 +3497,26 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:2796 +#: src/filemanager/file.c:2806 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2820 +#: src/filemanager/file.c:2830 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3019 +#: src/filemanager/file.c:3029 #, c-format msgid "Directories: %zu, total size: %s" msgstr "" -#: src/filemanager/file.c:3163 +#: src/filemanager/file.c:3173 msgid "Sorry, I could not put the job in background" msgstr "" @@ -3647,36 +3651,36 @@ msgstr "" msgid "Deleting" msgstr "" -#: src/filemanager/filegui.c:1239 src/filemanager/find.c:580 +#: src/filemanager/filegui.c:1241 src/filemanager/find.c:580 #: src/filemanager/panel.c:2531 msgid "&Using shell patterns" msgstr "" -#: src/filemanager/filegui.c:1241 +#: src/filemanager/filegui.c:1243 msgid "to:" msgstr "" -#: src/filemanager/filegui.c:1245 +#: src/filemanager/filegui.c:1247 msgid "Follow &links" msgstr "" -#: src/filemanager/filegui.c:1246 +#: src/filemanager/filegui.c:1248 msgid "Preserve &attributes" msgstr "" -#: src/filemanager/filegui.c:1248 +#: src/filemanager/filegui.c:1250 msgid "Di&ve into subdir if exists" msgstr "" -#: src/filemanager/filegui.c:1249 +#: src/filemanager/filegui.c:1251 msgid "&Stable symlinks" msgstr "" -#: src/filemanager/filegui.c:1254 +#: src/filemanager/filegui.c:1256 msgid "&Background" msgstr "" -#: src/filemanager/filegui.c:1308 +#: src/filemanager/filegui.c:1310 #, c-format msgid "Invalid source pattern '%s'" msgstr "" @@ -3942,60 +3946,60 @@ msgstr "" msgid "Device: %s" msgstr "" -#: src/filemanager/info.c:203 +#: src/filemanager/info.c:204 #, c-format msgid "Filesystem: %s" msgstr "" -#: src/filemanager/info.c:209 +#: src/filemanager/info.c:211 #, c-format msgid "Accessed: %s" msgstr "" -#: src/filemanager/info.c:214 +#: src/filemanager/info.c:217 #, c-format msgid "Modified: %s" msgstr "" #. TRANSLATORS: Time of last status change as in stat(2) man. -#: src/filemanager/info.c:222 +#: src/filemanager/info.c:226 #, c-format msgid "Changed: %s" msgstr "" -#: src/filemanager/info.c:230 +#: src/filemanager/info.c:234 #, c-format msgid "Dev. type: major %lu, minor %lu" msgstr "" -#: src/filemanager/info.c:237 +#: src/filemanager/info.c:241 #, c-format msgid "Size: %s" msgstr "" -#: src/filemanager/info.c:239 +#: src/filemanager/info.c:243 #, c-format msgid " (%lu block)" msgid_plural " (%lu blocks)" msgstr[0] "" msgstr[1] "" -#: src/filemanager/info.c:246 +#: src/filemanager/info.c:250 #, c-format msgid "Owner: %s/%s" msgstr "" -#: src/filemanager/info.c:250 +#: src/filemanager/info.c:254 #, c-format msgid "Links: %d" msgstr "" -#: src/filemanager/info.c:254 +#: src/filemanager/info.c:258 #, c-format msgid "Mode: %s (%04o)" msgstr "" -#: src/filemanager/info.c:259 +#: src/filemanager/info.c:263 #, c-format msgid "Location: %Xh:%Xh" msgstr "" @@ -4284,55 +4288,55 @@ msgstr "" msgid "Panels:" msgstr "" -#: src/filemanager/midnight.c:1029 +#: src/filemanager/midnight.c:1023 #, 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/midnight.c:1032 src/filemanager/midnight.c:1038 +#: src/filemanager/midnight.c:1026 src/filemanager/midnight.c:1032 #: src/filemanager/panel.c:2819 msgid "The Midnight Commander" msgstr "" -#: src/filemanager/midnight.c:1039 +#: src/filemanager/midnight.c:1033 msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#: src/filemanager/midnight.c:1604 +#: src/filemanager/midnight.c:1598 msgid "&Above" msgstr "" -#: src/filemanager/midnight.c:1604 +#: src/filemanager/midnight.c:1598 msgid "&Left" msgstr "" -#: src/filemanager/midnight.c:1605 +#: src/filemanager/midnight.c:1599 msgid "&Below" msgstr "" -#: src/filemanager/midnight.c:1605 +#: src/filemanager/midnight.c:1599 msgid "&Right" msgstr "" -#: src/filemanager/midnight.c:1616 +#: src/filemanager/midnight.c:1610 msgid "ButtonBar|Menu" msgstr "" -#: src/filemanager/midnight.c:1617 src/viewer/display.c:90 +#: src/filemanager/midnight.c:1611 src/viewer/display.c:90 msgid "ButtonBar|View" msgstr "" -#: src/filemanager/midnight.c:1620 src/filemanager/tree.c:1175 +#: src/filemanager/midnight.c:1614 src/filemanager/tree.c:1175 msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/midnight.c:1621 src/filemanager/tree.c:1178 +#: src/filemanager/midnight.c:1615 src/filemanager/tree.c:1178 msgid "ButtonBar|Mkdir" msgstr "" -#: src/filemanager/mountlist.c:1004 +#: src/filemanager/mountlist.c:986 msgid "Memory exhausted!" msgstr "" @@ -4732,15 +4736,15 @@ msgstr "" msgid "- < No translation >" msgstr "" -#: src/setup.c:220 +#: src/setup.c:222 msgid "%b %e %Y" msgstr "" -#: src/setup.c:221 +#: src/setup.c:223 msgid "%b %e %H:%M" msgstr "" -#: src/setup.c:1288 +#: src/setup.c:1291 #, c-format msgid "" "Cannot save file %s:\n" @@ -4883,41 +4887,41 @@ msgstr "" msgid "False:" msgstr "" -#: src/usermenu.c:562 +#: src/usermenu.c:563 msgid "Error calling program" msgstr "" -#: src/usermenu.c:593 +#: src/usermenu.c:590 msgid "Warning -- ignoring file" msgstr "" -#: src/usermenu.c:594 +#: src/usermenu.c:591 #, 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:706 +#: src/usermenu.c:703 msgid "Format error on file Extensions File" msgstr "" -#: src/usermenu.c:707 +#: src/usermenu.c:704 #, c-format msgid "The %%var macro has no default" msgstr "" -#: src/usermenu.c:708 +#: src/usermenu.c:705 #, c-format msgid "The %%var macro has no variable" msgstr "" -#: src/usermenu.c:1103 +#: src/usermenu.c:1101 #, c-format msgid "No suitable entries found in %s" msgstr "" -#: src/usermenu.c:1117 +#: src/usermenu.c:1115 msgid "User menu" msgstr "" @@ -4981,210 +4985,210 @@ msgstr "" msgid "Warning: cannot open %s directory\n" msgstr "" -#: src/vfs/fish/fish.c:308 +#: src/vfs/fish/fish.c:363 #, c-format msgid "fish: Disconnecting from %s" msgstr "" -#: src/vfs/fish/fish.c:484 +#: src/vfs/fish/fish.c:539 msgid "fish: Waiting for initial line..." msgstr "" -#: src/vfs/fish/fish.c:494 +#: src/vfs/fish/fish.c:549 msgid "Sorry, we cannot do password authenticated connections for now." msgstr "" -#: src/vfs/fish/fish.c:502 +#: src/vfs/fish/fish.c:557 #, c-format msgid "fish: Password is required for %s" msgstr "" -#: src/vfs/fish/fish.c:510 +#: src/vfs/fish/fish.c:565 msgid "fish: Sending password..." msgstr "" -#: src/vfs/fish/fish.c:547 +#: src/vfs/fish/fish.c:602 msgid "fish: Sending initial line..." msgstr "" -#: src/vfs/fish/fish.c:558 +#: src/vfs/fish/fish.c:613 msgid "fish: Handshaking version..." msgstr "" -#: src/vfs/fish/fish.c:568 +#: src/vfs/fish/fish.c:624 msgid "fish: Getting host info..." msgstr "" -#: src/vfs/fish/fish.c:692 +#: src/vfs/fish/fish.c:747 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: src/vfs/fish/fish.c:876 src/vfs/ftpfs/ftpfs.c:1814 +#: src/vfs/fish/fish.c:931 src/vfs/ftpfs/ftpfs.c:1808 #: src/vfs/undelfs/undelfs.c:387 #, c-format msgid "%s: done." msgstr "" -#: src/vfs/fish/fish.c:883 src/vfs/ftpfs/ftpfs.c:1762 +#: src/vfs/fish/fish.c:938 src/vfs/ftpfs/ftpfs.c:1756 #: src/vfs/undelfs/undelfs.c:390 #, c-format msgid "%s: failure" msgstr "" -#: src/vfs/fish/fish.c:941 +#: src/vfs/fish/fish.c:995 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: src/vfs/fish/fish.c:980 +#: src/vfs/fish/fish.c:1017 msgid "fish: Local read failed, sending zeros" msgstr "" -#: src/vfs/fish/fish.c:999 +#: src/vfs/fish/fish.c:1036 msgid "fish: storing file" msgstr "" -#: src/vfs/fish/fish.c:1075 +#: src/vfs/fish/fish.c:1111 msgid "Aborting transfer..." msgstr "" -#: src/vfs/fish/fish.c:1091 +#: src/vfs/fish/fish.c:1127 msgid "Error reported after abort." msgstr "" -#: src/vfs/fish/fish.c:1093 +#: src/vfs/fish/fish.c:1129 msgid "Aborted transfer would be successful." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:572 +#: src/vfs/ftpfs/ftpfs.c:566 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:624 +#: src/vfs/ftpfs/ftpfs.c:618 #, c-format msgid "FTP: Password required for %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:666 +#: src/vfs/ftpfs/ftpfs.c:660 msgid "ftpfs: sending login name" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:671 +#: src/vfs/ftpfs/ftpfs.c:665 msgid "ftpfs: sending user password" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:677 +#: src/vfs/ftpfs/ftpfs.c:671 #, c-format msgid "FTP: Account required for user %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:679 +#: src/vfs/ftpfs/ftpfs.c:673 msgid "Account:" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:684 +#: src/vfs/ftpfs/ftpfs.c:678 msgid "ftpfs: sending user account" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:693 +#: src/vfs/ftpfs/ftpfs.c:687 msgid "ftpfs: logged in" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:707 +#: src/vfs/ftpfs/ftpfs.c:701 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: src/vfs/ftpfs/ftpfs.c:838 +#: src/vfs/ftpfs/ftpfs.c:832 msgid "ftpfs: Invalid host name." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:887 src/vfs/ftpfs/ftpfs.c:903 +#: src/vfs/ftpfs/ftpfs.c:881 src/vfs/ftpfs/ftpfs.c:897 #, c-format msgid "ftpfs: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:910 +#: src/vfs/ftpfs/ftpfs.c:904 #, c-format msgid "ftpfs: making connection to %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:920 +#: src/vfs/ftpfs/ftpfs.c:914 msgid "ftpfs: connection interrupted by user" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:922 +#: src/vfs/ftpfs/ftpfs.c:916 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:976 +#: src/vfs/ftpfs/ftpfs.c:970 #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1305 +#: src/vfs/ftpfs/ftpfs.c:1299 msgid "ftpfs: invalid address family" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1313 +#: src/vfs/ftpfs/ftpfs.c:1307 #, c-format msgid "ftpfs: could not create socket: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1347 +#: src/vfs/ftpfs/ftpfs.c:1341 msgid "ftpfs: could not setup passive mode" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1459 +#: src/vfs/ftpfs/ftpfs.c:1453 msgid "ftpfs: aborting transfer." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1462 +#: src/vfs/ftpfs/ftpfs.c:1456 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1470 +#: src/vfs/ftpfs/ftpfs.c:1464 msgid "ftpfs: abort failed" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1601 src/vfs/ftpfs/ftpfs.c:1713 +#: src/vfs/ftpfs/ftpfs.c:1595 src/vfs/ftpfs/ftpfs.c:1707 msgid "ftpfs: CWD failed." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1611 src/vfs/ftpfs/ftpfs.c:1619 +#: src/vfs/ftpfs/ftpfs.c:1605 src/vfs/ftpfs/ftpfs.c:1613 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1680 +#: src/vfs/ftpfs/ftpfs.c:1674 msgid "Resolving symlink..." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1703 +#: src/vfs/ftpfs/ftpfs.c:1697 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1706 +#: src/vfs/ftpfs/ftpfs.c:1700 msgid "(strict rfc959)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1706 +#: src/vfs/ftpfs/ftpfs.c:1700 msgid "(chdir first)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1828 +#: src/vfs/ftpfs/ftpfs.c:1822 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1907 +#: src/vfs/ftpfs/ftpfs.c:1901 msgid "ftpfs: storing file" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:2402 +#: src/vfs/ftpfs/ftpfs.c:2396 msgid "" "~/.netrc file has incorrect mode\n" "Remove password or correct mode" @@ -5445,23 +5449,23 @@ msgid "" "Save modified file?" msgstr "" -#: src/viewer/dialogs.c:179 +#: src/viewer/dialogs.c:176 msgid "&Line number" msgstr "" -#: src/viewer/dialogs.c:180 +#: src/viewer/dialogs.c:177 msgid "Pe&rcents" msgstr "" -#: src/viewer/dialogs.c:181 +#: src/viewer/dialogs.c:178 msgid "&Decimal offset" msgstr "" -#: src/viewer/dialogs.c:182 +#: src/viewer/dialogs.c:179 msgid "He&xadecimal offset" msgstr "" -#: src/viewer/dialogs.c:217 +#: src/viewer/dialogs.c:214 msgid "Goto" msgstr "" @@ -5527,22 +5531,22 @@ msgid "" "%s" msgstr "" -#: src/viewer/lib.c:398 src/viewer/lib.c:400 +#: src/viewer/lib.c:394 src/viewer/lib.c:396 msgid "View: " msgstr "" -#: src/viewer/mcviewer.c:322 +#: src/viewer/mcviewer.c:324 #, c-format msgid "" "Cannot open \"%s\"\n" "%s" msgstr "" -#: src/viewer/mcviewer.c:352 +#: src/viewer/mcviewer.c:354 msgid "Cannot view: not a regular file" msgstr "" -#: src/viewer/mcviewer.c:387 +#: src/viewer/mcviewer.c:389 #, c-format msgid "" "Cannot open \"%s\" in parse mode\n" diff --git a/po/mn.po b/po/mn.po index a8a4d526b..44226c432 100644 --- a/po/mn.po +++ b/po/mn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Mongolian (http://www.transifex.com/mc/mc/language/mn/)\n" @@ -1567,7 +1567,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1847,6 +1847,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/nb.po b/po/nb.po index 13cd95687..78c19f008 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/mc/mc/language/" @@ -1568,7 +1568,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1848,6 +1848,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/nl.po b/po/nl.po index f0e26f0a9..c10271b79 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-11-18 18:04+0000\n" "Last-Translator: Yury V. Zaytsev \n" "Language-Team: Dutch (http://www.transifex.com/mc/mc/language/nl/)\n" @@ -1653,7 +1653,8 @@ msgstr "" "Eeen gebruikersvriendelijke tekstbewerker\n" "geschreven voor de Midnight Commander" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1944,6 +1945,10 @@ msgstr "cd volgt lin&ks" msgid "Sa&fe delete" msgstr "Veili&g verwijderen" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Overschrijven" + msgid "A&uto save setup" msgstr "A&utomatisch instellingen opslaan" diff --git a/po/pl.po b/po/pl.po index 8f2e87e31..0ff57243c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/mc/mc/language/pl/)\n" @@ -1663,7 +1663,8 @@ msgstr "" "Łatwy w obsłudze edytor tekstu,\n" "napisany dla programu Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright © 1996-2016 Free Software Foundation" msgid "About" @@ -1953,6 +1954,10 @@ msgstr "„cd” podąża za &dowiązaniami" msgid "Sa&fe delete" msgstr "Bezpieczne &usuwanie" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Zastąp" + msgid "A&uto save setup" msgstr "Auto&m. zapis ustawień" diff --git a/po/pt.po b/po/pt.po index adfef1e14..c0de734a9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Gilberto Jorge \n" "Language-Team: Portuguese (http://www.transifex.com/mc/mc/language/pt/)\n" @@ -1659,7 +1659,8 @@ msgstr "" "Um editor de texto amigo do utilizador\n" "escrito para o Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1950,6 +1951,10 @@ msgstr "Cd segue ligações" msgid "Sa&fe delete" msgstr "Apa&gar com segurança" +#, fuzzy +msgid "Safe overwrite" +msgstr "Escrever p&or cima" + msgid "A&uto save setup" msgstr "Guardar setup a&uto" diff --git a/po/pt_BR.po b/po/pt_BR.po index db3a7e0a4..3fd7e74d3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Mauro Hemerly Gazzani \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/mc/mc/language/" @@ -1615,7 +1615,8 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1906,6 +1907,10 @@ msgstr "Cd segue lin&ks" msgid "Sa&fe delete" msgstr "" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Sobrescrever" + msgid "A&uto save setup" msgstr "" diff --git a/po/ro.po b/po/ro.po index fbc10501b..ec6fde627 100644 --- a/po/ro.po +++ b/po/ro.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Arthur Țițeică \n" "Language-Team: Romanian (http://www.transifex.com/mc/mc/language/ro/)\n" @@ -1622,7 +1622,8 @@ msgstr "" "Un editor de text ușor de utilizat\n" "creat pentru Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 Free Software Foundation" msgid "About" @@ -1913,6 +1914,10 @@ msgstr "Cd urmărește le&găturile" msgid "Sa&fe delete" msgstr "Ștergere sigu&ră" +#, fuzzy +msgid "Safe overwrite" +msgstr "S&uprascrie" + msgid "A&uto save setup" msgstr "Auto-salvare a configurației" diff --git a/po/ru.po b/po/ru.po index 1a9fd5970..96ee9d13d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: aborodin \n" "Language-Team: Russian (http://www.transifex.com/mc/mc/language/ru/)\n" @@ -1665,7 +1665,8 @@ msgstr "" "Текстовый редактор с дружественным интерфейсом пользователя.\n" "Создан для Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1954,6 +1955,9 @@ msgstr "Смена &каталога по ссылкам" msgid "Sa&fe delete" msgstr "Безопасное &удаление" +msgid "Safe overwrite" +msgstr "Безопасная перезапись" + msgid "A&uto save setup" msgstr "&Автосохранение настроек" diff --git a/po/sk.po b/po/sk.po index ebc360a82..bc7d8ea25 100644 --- a/po/sk.po +++ b/po/sk.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-23 18:02+0000\n" "Last-Translator: Jose Riha \n" "Language-Team: Slovak (http://www.transifex.com/mc/mc/language/sk/)\n" @@ -1653,7 +1653,8 @@ msgstr "" "Používateľsky prívetivý textový editor\n" "napísaný pre Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1944,6 +1945,10 @@ msgstr "Cd nasleduje od&kazy" msgid "Sa&fe delete" msgstr "&Bezpečné zmazanie" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Prepísať" + msgid "A&uto save setup" msgstr "A&utomaticky ukladať konfiguráciu" diff --git a/po/sl.po b/po/sl.po index 56add99ce..81fe006ae 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovenian (http://www.transifex.com/mc/mc/language/sl/)\n" @@ -1577,7 +1577,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1858,6 +1858,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/sr.po b/po/sr.po index 51dd239ce..515a94a99 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Serbian (http://www.transifex.com/mc/mc/language/sr/)\n" @@ -1645,7 +1645,7 @@ msgstr "" "Уређивач текста наклоњен кориснику\n" "написан за Поноћног наредника." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1936,6 +1936,10 @@ msgstr "Цд прати &везе" msgid "Sa&fe delete" msgstr "&Безбедно брисање" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Препиши" + msgid "A&uto save setup" msgstr "&Сам сачувај подешавања" diff --git a/po/sv.po b/po/sv.po index 33ca64eed..1af5d873d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Jonas Hultén \n" "Language-Team: Swedish (http://www.transifex.com/mc/mc/language/sv/)\n" @@ -1659,7 +1659,8 @@ msgstr "" "En användarvänlig texteditor\n" "skriven för Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Copyright (C) 1996-2016 the Free Software Foundation" msgid "About" @@ -1950,6 +1951,10 @@ msgstr "&Cd följer länkar" msgid "Sa&fe delete" msgstr "S&äker borttagning" +#, fuzzy +msgid "Safe overwrite" +msgstr "&O Skriv över" + msgid "A&uto save setup" msgstr "A&utospara inställningar" diff --git a/po/szl.po b/po/szl.po index 0abe5aeaa..e58fddc16 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-05-03 01:03+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Silesian (http://www.transifex.com/mc/mc/language/szl/)\n" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/ta.po b/po/ta.po index d2d0d3631..11b140049 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Tamil (http://www.transifex.com/mc/mc/language/ta/)\n" @@ -1563,7 +1563,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1842,6 +1842,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/te.po b/po/te.po index 7149e429b..1bec14230 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-05-03 01:03+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Telugu (http://www.transifex.com/mc/mc/language/te/)\n" @@ -1562,7 +1562,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1841,6 +1841,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/tr.po b/po/tr.po index e8499c68f..c1e2fc61f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-11-05 02:24+0000\n" "Last-Translator: yusuf \n" "Language-Team: Turkish (http://www.transifex.com/mc/mc/language/tr/)\n" @@ -1652,7 +1652,8 @@ msgstr "" "Kullanıcı dostu bir metin düzenleyici\n" "Midnight Commander için yazıldı" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Telif hakkı (C) 1996-2016 Özgür Yazılım Vakfı" msgid "About" @@ -1945,6 +1946,10 @@ msgstr "cd &Bağları izler" msgid "Sa&fe delete" msgstr "güvenilir si&lme" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Üzerine Yaz" + msgid "A&uto save setup" msgstr "&Ayarları otomatik kaydet" diff --git a/po/uk.po b/po/uk.po index 98834e403..ebd2e42d6 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Ukrainian (http://www.transifex.com/mc/mc/language/uk/)\n" @@ -1635,7 +1635,8 @@ msgstr "" "Дружній до користувача редактор тексту\n" "написаний для Midnight Commander." -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "Авторські права (C) 1996-2016 за Free Software Foundation" msgid "About" @@ -1925,6 +1926,10 @@ msgstr "Зміна &каталогу за посиланнями" msgid "Sa&fe delete" msgstr "Безпечне &видалення" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Замістити" + msgid "A&uto save setup" msgstr "&Автозбереження параметрів" diff --git a/po/vi.po b/po/vi.po index 53735a744..010e61398 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Vietnamese (http://www.transifex.com/mc/mc/language/vi/)\n" @@ -1567,7 +1567,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1848,6 +1848,10 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +#, fuzzy +msgid "Safe overwrite" +msgstr "&Ghi chèn" + msgid "A&uto save setup" msgstr "" diff --git a/po/wa.po b/po/wa.po index 0aa59c402..4bbefdaa0 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: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Walloon (http://www.transifex.com/mc/mc/language/wa/)\n" @@ -1565,7 +1565,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1845,6 +1845,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 0dc68bfff..896afa44b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (China) (http://www.transifex.com/mc/mc/language/" @@ -1654,7 +1654,8 @@ msgstr "" "为 Midnight Commander 编写的\n" "一个界面友好的文本编辑器。" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +#, fuzzy +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "版权所有 (C) 1996-2016 自由软件基金会" msgid "About" @@ -1944,6 +1945,10 @@ msgstr "切换目录跟随链接(&K)" msgid "Sa&fe delete" msgstr "安全删除(&F)" +#, fuzzy +msgid "Safe overwrite" +msgstr "覆盖(&O)" + msgid "A&uto save setup" msgstr "自动保存设置(&U)" diff --git a/po/zh_TW.po b/po/zh_TW.po index aa2bb4a1b..1fc0936e3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2018-02-03 18:28+0300\n" +"POT-Creation-Date: 2018-04-25 11:40+0300\n" "PO-Revision-Date: 2017-09-19 09:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/mc/mc/language/" @@ -1567,7 +1567,7 @@ msgid "" "written for the Midnight Commander." msgstr "" -msgid "Copyright (C) 1996-2016 the Free Software Foundation" +msgid "Copyright (C) 1996-2018 the Free Software Foundation" msgstr "" msgid "About" @@ -1847,6 +1847,9 @@ msgstr "" msgid "Sa&fe delete" msgstr "" +msgid "Safe overwrite" +msgstr "" + msgid "A&uto save setup" msgstr "" diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index c30be9750..a8f4e00e7 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -546,10 +546,10 @@ configure_box (void) QUICK_CHECKBOX (N_("Rotating d&ash"), &nice_rotating_dash, NULL), QUICK_CHECKBOX (N_("Cd follows lin&ks"), &mc_global.vfs.cd_symlinks, NULL), QUICK_CHECKBOX (N_("Sa&fe delete"), &safe_delete, NULL), + QUICK_CHECKBOX (N_("Safe overwrite"), &safe_overwrite, NULL), /* w/o hotkey */ QUICK_CHECKBOX (N_("A&uto save setup"), &auto_save_setup, NULL), QUICK_SEPARATOR (FALSE), QUICK_SEPARATOR (FALSE), - QUICK_SEPARATOR (FALSE), QUICK_STOP_GROUPBOX, QUICK_STOP_COLUMNS, QUICK_BUTTONS_OK_CANCEL, diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index f0053ecbb..8c4fcc030 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -157,7 +157,7 @@ statfs (char const *filename, struct fs_info *buf) #include "lib/util.h" #include "lib/widget.h" -#include "src/setup.h" /* verbose */ +#include "src/setup.h" /* verbose, safe_overwrite */ #include "midnight.h" #include "fileopctx.h" /* FILE_CONT */ @@ -409,7 +409,7 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode) const int rd_ylen = 1; int rd_xlen = 60; int y = 2; - unsigned long yes_id; + unsigned long yes_id, no_id; struct { @@ -565,7 +565,7 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode) ADD_RD_LABEL (4, 0, 0, y); /* Overwrite this target? */ yes_id = ADD_RD_BUTTON (5, y); /* Yes */ - ADD_RD_BUTTON (6, y); /* No */ + no_id = ADD_RD_BUTTON (6, y); /* No */ /* "this target..." widgets */ if (!S_ISDIR (ui->d_stat->st_mode)) @@ -591,7 +591,7 @@ overwrite_query_dialog (file_op_context_t * ctx, enum OperationMode mode) label_set_text (LABEL (label1), str_trunc (stripped_name, rd_xlen - 8)); dlg_set_size (ui->replace_dlg, y + 3, rd_xlen); - dlg_select_by_id (ui->replace_dlg, yes_id); + dlg_select_by_id (ui->replace_dlg, safe_overwrite ? no_id : yes_id); result = dlg_run (ui->replace_dlg); dlg_destroy (ui->replace_dlg); diff --git a/src/setup.c b/src/setup.c index 9f4361cfe..f0fe3a78c 100644 --- a/src/setup.c +++ b/src/setup.c @@ -87,6 +87,8 @@ gboolean boot_current_is_left = TRUE; /* If on, default for "No" in delete operations */ gboolean safe_delete = FALSE; +/* If on, default for "No" in overwrite files */ +gboolean safe_overwrite = FALSE; /* Controls screen clearing before an exec */ gboolean clear_before_exec = TRUE; @@ -293,6 +295,7 @@ static const struct { "confirm_directory_hotlist_delete", &confirm_directory_hotlist_delete }, { "confirm_view_dir", &confirm_view_dir }, { "safe_delete", &safe_delete }, + { "safe_overwrite", &safe_overwrite }, #ifndef HAVE_CHARSET { "eight_bit_clean", &mc_global.eight_bit_clean }, { "full_eight_bits", &mc_global.full_eight_bits }, diff --git a/src/setup.h b/src/setup.h index b483d7da9..7de0fe393 100644 --- a/src/setup.h +++ b/src/setup.h @@ -82,6 +82,7 @@ extern gboolean confirm_exit; extern gboolean confirm_overwrite; extern gboolean confirm_view_dir; extern gboolean safe_delete; +extern gboolean safe_overwrite; extern gboolean clear_before_exec; extern gboolean auto_menu; extern gboolean drop_menus;