Merging upstream version 3:4.8.31.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 135 insertions, 140 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 34fa2d6..26de15b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Midnight Commander\n"
 "Report-Msgid-Bugs-To: https://www.midnight-commander.org/\n"
-"POT-Creation-Date: 2023-08-13 21:07+0200\n"
+"POT-Creation-Date: 2024-01-27 09:33+0100\n"
 "PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2016-2017,2020,2022-2023\n"
 "Language-Team: English (United Kingdom) (http://app.transifex.com/mc/mc/"
@@ -734,30 +734,13 @@ msgid ""
 "                 errdhotfocus\n"
 "   Menus:        menunormal, menuhot, menusel, menuhotsel, menuinactive\n"
 "   Popup menus:  pmenunormal, pmenusel, pmenutitle\n"
-"   Editor:       editnormal, editbold, editmarked, editwhitespace,\n"
+"   Editor:       editnormal, editbold, editmarked, editwhitespace, "
+"editnonprintable,\n"
 "                 editlinestate, editbg, editframe, editframeactive\n"
 "                 editframedrag\n"
 "   Viewer:       viewnormal,viewbold, viewunderline, viewselected\n"
 "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
 msgstr ""
-"--colors KEYWORD={FORE},{BACK},{ATTR}:KEYWORD2=...\n"
-"\n"
-"{FORE}, {BACK} and {ATTR} can be omitted, and the default will be used\n"
-"\n"
-" Keywords:\n"
-"   Global:       errors, disabled, reverse, gauge, header\n"
-"                 input, inputmark, inputunchanged, commandlinemark\n"
-"                 bbarhotkey, bbarbutton, statusbar\n"
-"   File display: normal, selected, marked, markselect\n"
-"   Dialogue boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n"
-"                 errdhotfocus\n"
-"   Menus:        menunormal, menuhot, menusel, menuhotsel, menuinactive\n"
-"   Popup menus:  pmenunormal, pmenusel, pmenutitle\n"
-"   Editor:       editnormal, editbold, editmarked, editwhitespace,\n"
-"                 editlinestate, editbg, editframe, editframeactive\n"
-"                 editframedrag\n"
-"   Viewer:       viewnormal,viewbold, viewunderline, viewselected\n"
-"   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
 
 #. TRANSLATORS: don't translate color names and attributes
 msgid ""
@@ -1342,205 +1325,205 @@ msgid "Unmar&k"
 msgstr "Unmar&k"
 
 msgid "Cop&y"
-msgstr ""
+msgstr "Cop&y"
 
 msgid "Mo&ve"
-msgstr ""
+msgstr "Mo&ve"
 
 msgid "&Delete"
-msgstr ""
+msgstr "&Delete"
 
 msgid "Co&py to clipfile"
-msgstr ""
+msgstr "Co&py to clipfile"
 
 msgid "&Cut to clipfile"
-msgstr ""
+msgstr "&Cut to clipfile"
 
 msgid "Pa&ste from clipfile"
-msgstr ""
+msgstr "Pa&ste from clipfile"
 
 msgid "&Beginning"
-msgstr ""
+msgstr "&Beginning"
 
 msgid "&End"
-msgstr ""
+msgstr "&End"
 
 msgid "&Search..."
-msgstr ""
+msgstr "&Search..."
 
 msgid "Search &again"
-msgstr ""
+msgstr "Search &again"
 
 msgid "&Replace..."
-msgstr ""
+msgstr "&Replace..."
 
 msgid "&Toggle bookmark"
-msgstr ""
+msgstr "&Toggle bookmark"
 
 msgid "&Next bookmark"
-msgstr ""
+msgstr "&Next bookmark"
 
 msgid "&Prev bookmark"
-msgstr ""
+msgstr "&Prev bookmark"
 
 msgid "&Flush bookmarks"
-msgstr ""
+msgstr "&Flush bookmarks"
 
 msgid "&Go to line..."
-msgstr ""
+msgstr "&Go to line..."
 
 msgid "&Toggle line state"
-msgstr ""
+msgstr "&Toggle line state"
 
 msgid "Go to matching &bracket"
-msgstr ""
+msgstr "Go to matching &bracket"
 
 msgid "Toggle s&yntax highlighting"
-msgstr ""
+msgstr "Toggle s&yntax highlighting"
 
 msgid "&Find declaration"
-msgstr ""
+msgstr "&Find declaration"
 
 msgid "Back from &declaration"
-msgstr ""
+msgstr "Back from &declaration"
 
 msgid "For&ward to declaration"
-msgstr ""
+msgstr "For&ward to declaration"
 
 msgid "Encod&ing..."
-msgstr ""
+msgstr "Encod&ing..."
 
 msgid "&Refresh screen"
-msgstr ""
+msgstr "&Refresh screen"
 
 msgid "&Start/Stop record macro"
-msgstr ""
+msgstr "&Start/Stop record macro"
 
 msgid "Delete macr&o..."
-msgstr ""
+msgstr "Delete macr&o..."
 
 msgid "Record/Repeat &actions"
-msgstr ""
+msgstr "Record/Repeat &actions"
 
 msgid "S&pell check"
-msgstr ""
+msgstr "S&pell check"
 
 msgid "C&heck word"
-msgstr ""
+msgstr "C&heck word"
 
 msgid "Change spelling &language..."
-msgstr ""
+msgstr "Change spelling &language..."
 
 msgid "&Mail..."
-msgstr ""
+msgstr "&Mail..."
 
 msgid "Insert &literal..."
-msgstr ""
+msgstr "Insert &literal..."
 
 msgid "Insert &date/time"
-msgstr ""
+msgstr "Insert &date/time"
 
 msgid "&Format paragraph"
-msgstr ""
+msgstr "&Format paragraph"
 
 msgid "&Sort..."
-msgstr ""
+msgstr "&Sort..."
 
 msgid "&Paste output of..."
-msgstr ""
+msgstr "&Paste output of..."
 
 msgid "&External formatter"
-msgstr ""
+msgstr "&External formatter"
 
 msgid "&Move"
-msgstr ""
+msgstr "&Move"
 
 msgid "&Resize"
-msgstr ""
+msgstr "&Resize"
 
 msgid "&Toggle fullscreen"
-msgstr ""
+msgstr "&Toggle fullscreen"
 
 msgid "&Next"
-msgstr ""
+msgstr "&Next"
 
 msgid "&Previous"
-msgstr ""
+msgstr "&Previous"
 
 msgid "&List..."
-msgstr ""
+msgstr "&List..."
 
 msgid "&General..."
-msgstr ""
+msgstr "&General..."
 
 msgid "Save &mode..."
-msgstr ""
+msgstr "Save &mode..."
 
 msgid "Learn &keys..."
-msgstr ""
+msgstr "Learn &keys..."
 
 msgid "Syntax &highlighting..."
-msgstr ""
+msgstr "Syntax &highlighting..."
 
 msgid "S&yntax file"
-msgstr ""
+msgstr "S&yntax file"
 
 msgid "&Menu file"
-msgstr ""
+msgstr "&Menu file"
 
 msgid "&Save setup"
-msgstr ""
+msgstr "&Save setup"
 
 msgid "&File"
-msgstr ""
+msgstr "&File"
 
 msgid "&Edit"
-msgstr ""
+msgstr "&Edit"
 
 msgid "&Search"
-msgstr ""
+msgstr "&Search"
 
 msgid "&Command"
-msgstr ""
+msgstr "&Command"
 
 msgid "For&mat"
-msgstr ""
+msgstr "For&mat"
 
 msgid "&Window"
-msgstr ""
+msgstr "&Window"
 
 msgid "&Options"
-msgstr ""
+msgstr "&Options"
 
 msgid "&None"
-msgstr ""
+msgstr "&None"
 
 msgid "&Dynamic paragraphing"
-msgstr ""
+msgstr "&Dynamic paragraphing"
 
 msgid "Type &writer wrap"
-msgstr ""
+msgstr "Type &writer wrap"
 
 msgid "Wrap mode"
-msgstr ""
+msgstr "Wrap mode"
 
 msgid "Tabulation"
-msgstr ""
+msgstr "Tabulation"
 
 msgid "&Fake half tabs"
-msgstr ""
+msgstr "&Fake half tabs"
 
 msgid "&Backspace through tabs"
-msgstr ""
+msgstr "&Backspace through tabs"
 
 msgid "Fill tabs with &spaces"
-msgstr ""
+msgstr "Fill tabs with &spaces"
 
 msgid "Tab spacing:"
-msgstr ""
+msgstr "Tab spacing:"
 
 msgid "Other options"
-msgstr ""
+msgstr "Other options"
 
 msgid "&Return does autoindent"
 msgstr ""
@@ -1622,7 +1605,7 @@ msgid ""
 "written for the Midnight Commander."
 msgstr ""
 
-msgid "Copyright (C) 1996-2023 the Free Software Foundation"
+msgid "Copyright (C) 1996-2024 the Free Software Foundation"
 msgstr ""
 
 msgid "About"
@@ -3983,65 +3966,23 @@ msgid ""
 "%s"
 msgstr ""
 
-#, c-format
-msgid "Warning: cannot open %s directory\n"
-msgstr ""
-
-#, c-format
-msgid "fish: Disconnecting from %s"
-msgstr ""
-
-msgid "fish: Waiting for initial line..."
-msgstr ""
-
-msgid "Sorry, we cannot do password authenticated connections for now."
-msgstr ""
-
-#, c-format
-msgid "fish: Password is required for %s"
-msgstr ""
-
-msgid "fish: Sending password..."
-msgstr ""
-
-msgid "fish: Sending initial line..."
-msgstr ""
-
-msgid "fish: Handshaking version..."
-msgstr ""
-
-msgid "fish: Getting host info..."
-msgstr ""
-
-#, c-format
-msgid "fish: Reading directory %s..."
+msgid ""
+"EXTFS virtual file system:\n"
+"wrong file name"
 msgstr ""
 
-#, c-format
-msgid "%s: done."
+msgid ""
+"EXTFS virtual file system:\n"
+"wrong archive name"
 msgstr ""
 
-#, c-format
-msgid "%s: failure"
+msgid ""
+"EXTFS virtual file system:\n"
+"cannot build command"
 msgstr ""
 
 #, c-format
-msgid "fish: store %s: sending command..."
-msgstr ""
-
-msgid "fish: Local read failed, sending zeros"
-msgstr ""
-
-msgid "fish: storing file"
-msgstr ""
-
-msgid "Aborting transfer..."
-msgstr ""
-
-msgid "Error reported after abort."
-msgstr ""
-
-msgid "Aborted transfer would be successful."
+msgid "Warning: cannot open %s directory\n"
 msgstr ""
 
 #, c-format
@@ -4154,6 +4095,14 @@ msgstr ""
 msgid "ftpfs: failed; nowhere to fallback to"
 msgstr ""
 
+#, c-format
+msgid "%s: failure"
+msgstr ""
+
+#, c-format
+msgid "%s: done."
+msgstr ""
+
 msgid "ftpfs: storing file"
 msgstr ""
 
@@ -4287,6 +4236,52 @@ msgstr ""
 msgid "sftp: Listing done."
 msgstr ""
 
+#, c-format
+msgid "shell: Disconnecting from %s"
+msgstr ""
+
+msgid "shell: Waiting for initial line..."
+msgstr ""
+
+msgid "Sorry, we cannot do password authenticated connections for now."
+msgstr ""
+
+#, c-format
+msgid "shell: Password is required for %s"
+msgstr ""
+
+msgid "shell: Sending password..."
+msgstr ""
+
+msgid "shell: Sending initial line..."
+msgstr ""
+
+msgid "shell: Getting host info..."
+msgstr ""
+
+#, c-format
+msgid "shell: Reading directory %s..."
+msgstr ""
+
+#, c-format
+msgid "shell: store %s: sending command..."
+msgstr ""
+
+msgid "shell: Local read failed, sending zeros"
+msgstr ""
+
+msgid "shell: storing file"
+msgstr ""
+
+msgid "Aborting transfer..."
+msgstr ""
+
+msgid "Error reported after abort."
+msgstr ""
+
+msgid "Aborted transfer would be successful."
+msgstr ""
+
 msgid "Inconsistent tar archive"
 msgstr ""