Merging upstream version 4.23.0.

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

1 files changed, 191 insertions, 37 deletions

diff --git a/templates/man1/nano.1.pot b/templates/man1/nano.1.pot
index a1c8881a..89fe7239 100644
--- a/templates/man1/nano.1.pot
+++ b/templates/man1/nano.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-15 18:05+0100\n"
+"POT-Creation-Date: 2024-06-01 06:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,17 +24,15 @@ msgid "NANO"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "version 7.2"
+msgid "version 8.0"
 msgstr ""
 
 #. type: TH
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 #, no-wrap
-msgid "January 2023"
+msgid "May 2024"
 msgstr ""
 
 #. type: SH
@@ -45,9 +43,8 @@ msgid "NAME"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "nano - Nano's ANOther editor, inspired by Pico"
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "nano - Nano's ANOther text editor, inspired by Pico"
 msgstr ""
 
 #. type: SH
@@ -64,9 +61,49 @@ msgid "B<nano> [I<options>] [[B<+>I<line>[B<,>I<column>]] I<file>]..."
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
-msgid "B<nano> [I<options>] [[B<+>[B<crCR>](B</>|B<?>)I<string>] I<file>]..."
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<nano> [I<options>] [I<file>[B<:>I<line>[B<:>I<column>]]]..."
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<nano> [I<options>] [[B<+>[B<crCR>]{B</>|B<?>}I<string>] I<file>]..."
+msgstr ""
+
+#. type: SH
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "NOTICE"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid ""
+"Since version 8.0, to be newcomer friendly, B<^F> starts a forward search, "
+"B<^B> starts a backward search, B<M-F> searches the next occurrence forward, "
+"and B<M-B> searches the next occurrence backward.  If you want those "
+"keystrokes to do what they did before version 8.0, add the following lines "
+"at the end of your I<nanorc> file:"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<bind ^F forward main>"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<bind ^B back main>"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<bind M-F formatter main>"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid "B<bind M-B linter main>"
 msgstr ""
 
 #. type: SH
@@ -77,31 +114,37 @@ msgid "DESCRIPTION"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
-"B<nano> is a small and friendly editor.  It copies the look and feel of "
+"B<nano> is a small and friendly text editor.  It copies the look and feel of "
 "Pico, but is free software, and implements several features that Pico lacks, "
 "such as: opening multiple files, scrolling per line, undo/redo, syntax "
 "coloring, line numbering, and soft-wrapping overlong lines."
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "When giving a filename on the command line, the cursor can be put on a "
 "specific line by adding the line number with a plus sign (B<+>) before the "
-"filename, and even in a specific column by adding it with a comma.  "
-"(Negative numbers count from the end of the file or line.)  The cursor can "
-"be put on the first or last occurrence of a specific string by specifying "
-"that string after B<+/> or B<+?> before the filename.  The string can be "
-"made case sensitive and/or caused to be interpreted as a regular expression "
-"by inserting B<c> and/or B<r> after the B<+> sign.  These search modes can "
-"be explicitly disabled by using the uppercase variant of those letters: B<C> "
-"and/or B<R>.  When the string contains spaces, it needs to be enclosed in "
-"quotes.  To give an example: to open a file at the first occurrence of the "
-"word \"Foo\", you would do:"
+"filename, and even in a specific column by adding it with a comma.  Negative "
+"numbers count from the end of the file or line.  The line and column numbers "
+"may also be specified by gluing them with colons after the filename.  (When "
+"a filename contains a colon followed by digits, escape the colon by "
+"preceding it with a triple backslash.)"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid ""
+"The cursor can be put on the first or last occurrence of a specific string "
+"by specifying that string after B<+/> or B<+?> before the filename.  The "
+"string can be made case sensitive and/or caused to be interpreted as a "
+"regular expression by inserting B<c> and/or B<r> after the B<+> sign.  These "
+"search modes can be explicitly disabled by using the uppercase variant of "
+"those letters: B<C> and/or B<R>.  When the string contains spaces, it needs "
+"to be enclosed in quotes.  To give an example: to open a file at the first "
+"occurrence of the word \"Foo\", you would do:"
 msgstr ""
 
 #. type: Plain text
@@ -260,11 +303,10 @@ msgid "B<-E>, B<--tabstospaces>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "Convert each typed tab to spaces -- to the number of spaces that a tab at "
-"that position would take up."
+"that position would take up.  (Note: pasted tabs are not converted.)"
 msgstr ""
 
 #. type: TP
@@ -826,11 +868,11 @@ msgid "B<-p>, B<--preserve>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "Preserve the XON and XOFF sequences (B<^Q> and B<^S>) so they will be caught "
-"by the terminal."
+"by the terminal.  Note that option B<-/> (B<--modernbindings>) overrides "
+"this."
 msgstr ""
 
 #. type: TP
@@ -1011,12 +1053,11 @@ msgid "B<-_>, B<--minibar>"
 msgstr ""
 
 #. type: Plain text
-#: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
-#: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
 msgid ""
 "Suppress the title bar and instead show information about the current buffer "
 "at the bottom of the screen, in the space for the status bar.  In this "
-"\"minibar\" the filename is shown on the left, followed by an asterisk if "
+"\"mini bar\" the filename is shown on the left, followed by an asterisk if "
 "the buffer has been modified.  On the right are displayed the current line "
 "and column number, the code of the character under the cursor (in Unicode "
 "format: U+xxxx), the same flags as are shown by B<--stateflags>, and a "
@@ -1048,6 +1089,24 @@ msgid ""
 "title bar plus status bar can be toggled.  With B<M-X> the help lines."
 msgstr ""
 
+#. type: TP
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+#, no-wrap
+msgid "B<-/>, B<--modernbindings>"
+msgstr ""
+
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid ""
+"Use key bindings similar to the ones that most modern programs use: B<^X> "
+"cuts, B<^C> copies, B<^V> pastes, B<^Z> undoes, B<^Y> redoes, B<^F> searches "
+"forward, B<^G> searches next, B<^S> saves, B<^O> opens a file, B<^Q> quits, "
+"and (when the terminal permits) B<^H> shows help.  Furthermore, B<^A> sets "
+"the mark, B<^R> makes replacements, B<^D> searches previous, B<^P> shows the "
+"position, B<^T> goes to a line, B<^W> writes out a file, and B<^E> executes "
+"a command.  Note that this overrides option B<-p> (B<--preserve>)."
+msgstr ""
+
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
@@ -1119,6 +1178,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid ""
+"When you want to copy marked text from B<nano> to the system's clipboard, "
+"see one of the examples in the B<nanorc>(5) man page."
+msgstr ""
+
+#. type: Plain text
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid ""
@@ -1141,6 +1207,13 @@ msgid ""
 "B<nano> will write all the open buffers to their respective emergency files."
 msgstr ""
 
+#. type: Plain text
+#: archlinux debian-unstable fedora-rawhide opensuse-tumbleweed
+msgid ""
+"If you have any question about how to use B<nano> in some specific "
+"situation, you can ask on I<help-nano@gnu.org>."
+msgstr ""
+
 #. type: SH
 #: archlinux debian-bookworm debian-unstable fedora-40 fedora-rawhide
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
@@ -1209,3 +1282,84 @@ msgstr ""
 #: mageia-cauldron opensuse-leap-15-6 opensuse-tumbleweed
 msgid "I</usr/share/doc/nano/> (or equivalent on your system)"
 msgstr ""
+
+#. type: TH
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "version 7.2"
+msgstr ""
+
+#. type: TH
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+#, no-wrap
+msgid "January 2023"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "nano - Nano's ANOther editor, inspired by Pico"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid "B<nano> [I<options>] [[B<+>[B<crCR>](B</>|B<?>)I<string>] I<file>]..."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"B<nano> is a small and friendly editor.  It copies the look and feel of "
+"Pico, but is free software, and implements several features that Pico lacks, "
+"such as: opening multiple files, scrolling per line, undo/redo, syntax "
+"coloring, line numbering, and soft-wrapping overlong lines."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"When giving a filename on the command line, the cursor can be put on a "
+"specific line by adding the line number with a plus sign (B<+>) before the "
+"filename, and even in a specific column by adding it with a comma.  "
+"(Negative numbers count from the end of the file or line.)  The cursor can "
+"be put on the first or last occurrence of a specific string by specifying "
+"that string after B<+/> or B<+?> before the filename.  The string can be "
+"made case sensitive and/or caused to be interpreted as a regular expression "
+"by inserting B<c> and/or B<r> after the B<+> sign.  These search modes can "
+"be explicitly disabled by using the uppercase variant of those letters: B<C> "
+"and/or B<R>.  When the string contains spaces, it needs to be enclosed in "
+"quotes.  To give an example: to open a file at the first occurrence of the "
+"word \"Foo\", you would do:"
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Convert each typed tab to spaces -- to the number of spaces that a tab at "
+"that position would take up."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Preserve the XON and XOFF sequences (B<^Q> and B<^S>) so they will be caught "
+"by the terminal."
+msgstr ""
+
+#. type: Plain text
+#: debian-bookworm fedora-40 mageia-cauldron opensuse-leap-15-6
+msgid ""
+"Suppress the title bar and instead show information about the current buffer "
+"at the bottom of the screen, in the space for the status bar.  In this "
+"\"minibar\" the filename is shown on the left, followed by an asterisk if "
+"the buffer has been modified.  On the right are displayed the current line "
+"and column number, the code of the character under the cursor (in Unicode "
+"format: U+xxxx), the same flags as are shown by B<--stateflags>, and a "
+"percentage that expresses how far the cursor is into the file (linewise).  "
+"When a file is loaded or saved, and also when switching between buffers, the "
+"number of lines in the buffer is displayed after the filename.  This number "
+"is cleared upon the next keystroke, or replaced with an [i/n] counter when "
+"multiple buffers are open.  The line plus column numbers and the character "
+"code are displayed only when B<--constantshow> is used, and can be toggled "
+"on and off with B<M-C>.  The state flags are displayed only when B<--"
+"stateflags> is used."
+msgstr ""