po-man: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/po-man/cs.po b/po-man/cs.po
index 8a7926cb6720abbc3e05393c158e9a1522cf062a..888b894e6e35a24b2986230c2ad02ee4b64376f0 100644 (file)
--- a/po-man/cs.po
+++ b/po-man/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.38-rc4\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2022-03-19 16:33+01:00\n"
 "Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -133,7 +133,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Zobrazí text nápovědy a skončí."
 
@@ -141,12 +141,13 @@ msgstr "Zobrazí text nápovědy a skončí."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "Zobrazí verzi a skončí."
 
@@ -591,7 +592,7 @@ msgstr ""
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1769,7 +1770,7 @@ msgstr ""
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -7528,7 +7529,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -9723,10 +9724,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr ""
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, fuzzy, no-wrap
 #| msgid "*-h*, *--help*"
-msgid "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
 msgstr "*-h*, *--help*"
 
 #. type: Plain text
@@ -9863,7 +9865,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -13479,14 +13481,6 @@ msgid ""
 "kernel mount options which are normally not listed."
 msgstr ""
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, fuzzy, no-wrap
-#| msgid "*-h*, *--help*"
-msgid "*-y*, *--shell*"
-msgstr "*-h*, *--help*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -16407,7 +16401,7 @@ msgstr ""
 #: ../misc-utils/lsfd.1.adoc:73
 #, fuzzy, no-wrap
 #| msgid "*-V*, *--version*"
-msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
@@ -42920,168 +42914,175 @@ msgstr "*-f*, *--fast*"
 msgid "Output multiple spaces instead of tabs."
 msgstr ""
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, fuzzy, no-wrap
+#| msgid "*-h*, *--help*"
+msgid "*-H*, *--help*"
+msgstr "*-h*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 #, fuzzy
 #| msgid "A *write* command appeared in Version 6 AT&T UNIX."
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Příkaz *write* se objevil v AT&T UNIXu verze 6."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, fuzzy, no-wrap
 #| msgid ""
 #| "*mesg*(1),\n"
@@ -45890,6 +45891,11 @@ msgid ""
 "*terminfo*(5)\n"
 msgstr ""
 
+#, fuzzy, no-wrap
+#~| msgid "*-h*, *--help*"
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*-h*, *--help*"
+
 #, fuzzy
 #~| msgid "A *write* command appeared in Version 6 AT&T UNIX."
 #~ msgid "A *mesg* command appeared in Version 6 AT&T UNIX."

diff --git a/po-man/de.po b/po-man/de.po
index ff5ce5e2fe1bc18828dd3a99e5dccf913c03ea86..9873e0e072fa7456028b121bc3e5ae79e2cbbac5 100644 (file)
--- a/po-man/de.po
+++ b/po-man/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.39-rc3\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2023-05-11 19:43+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -136,7 +136,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "zeigt einen Hilfetext an und beendet das Programm."
 
@@ -144,12 +144,13 @@ msgstr "zeigt einen Hilfetext an und beendet das Programm."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "zeigt Versionsinformationen an und beendet das Programm."
 
@@ -592,7 +593,7 @@ msgstr "gibt die Länge der Partition (in 512-Byte-Sektoren) an."
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1908,7 +1909,7 @@ msgstr ""
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -8800,7 +8801,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -11404,10 +11405,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr "gibt einen alternativen Pfad für *lastlog*(8) an."
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, no-wrap
-msgid "*y-*, *--shell*"
-msgstr "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
+msgstr "*-y*, *--shell*"
 
 #. type: Plain text
 #: ../login-utils/lslogins.1.adoc:100 ../sys-utils/lsipc.1.adoc:85
@@ -11558,7 +11560,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -15524,13 +15526,6 @@ msgstr ""
 "standardmäßige VFS-Kernel-Einhängeoptionen aufgelistet werden, die "
 "normalerweise nicht aufgelistet werden würden."
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, no-wrap
-msgid "*-y*, *--shell*"
-msgstr "*-y*, *--shell*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -19147,8 +19142,9 @@ msgstr ""
 
 #. type: Labeled list
 #: ../misc-utils/lsfd.1.adoc:73
-#, no-wrap
-msgid "*-i*[4|6], *--inet*[=4|6]"
+#, fuzzy, no-wrap
+#| msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*[4|6], *--inet*[=4|6]"
 
 #. type: Plain text
@@ -50975,8 +50971,14 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr "gibt mehrere Leerzeichen anstatt Tabulatoren aus."
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-H*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
@@ -50985,7 +50987,7 @@ msgstr ""
 "Version 2. Die Option *-l* ist eine Erweiterung dieses Standards."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
@@ -50994,140 +50996,140 @@ msgstr ""
 "folgenden Tabelle zusammen mit ihren dezimalen Werten aufgelistet:"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr "*ESC-7*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr "Rückwärts-Zeilenvorschub (Esc, dann 7)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr "*ESC-8*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr "halber Rückwärts-Zeilenvorschub (Esc, dann 8)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr "*ESC-9*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr "halber Vorwärts-Zeilenvorschub (Esc, dann 9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr "*Rückschritt*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr "bewegt eine Spalte zurück (8); wird in der ersten Spalte ignoriert."
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr "*Zeilenumbruch*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr "bewegt eine Zeile vorwärts (10); führt auch einen Wagenrücklauf aus."
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr "*Wagenrücklauf*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr "*Umschalttaste ein*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr "wechselt in den normalen Zeichensatz (15)."
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr "*Umschalttaste aus*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr "wechselt zu dem alternativen Zeichensatz (14)."
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr "*Leeertaste*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr "bewegt eine Spalte vorwärts (32)."
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr "*Tabulator*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr "Vorwärts zum nächsten Tabulator (9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr "*vertikaler Tabulator*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr "umgekehrter Zeilenvorschub (11)"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 "Alle nicht erkannten Steuerzeichen und Escape-Sequenzen werden verworfen."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr "*col* verfolgt den Zeichensatz, während Zeichen gelesen werden, und stellt sicher, dass bei der Ausgabe der Zeichen der Zeichensatz korrekt ist.\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
@@ -51136,12 +51138,12 @@ msgstr ""
 "zurückzuspringen, gibt *col* eine Warnmeldung aus."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Ein *col*-Befehl erschien in Version 6 von AT&T UNIX."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -54348,6 +54350,10 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#, no-wrap
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*y-*, *--shell*"
+
 #~ msgid ""
 #~ "Causes everything to be done except for the actual system call; if it's "
 #~ "not obvious, this \"fakes\" mounting the filesystem. This option is "
@@ -54677,9 +54683,6 @@ msgstr ""
 #~ msgid "Displays a help text and exits."
 #~ msgstr "zeigt einen Hilfetext an und beendet das Programm."
 
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-H*, *--help*"
-
 #~ msgid ""
 #~ "Implicit coloring can be disabled by an empty file _/etc/terminal-colors."
 #~ "d/hexdump.disable_."

diff --git a/po-man/es.po b/po-man/es.po
index fcddc599afe7216ec0d1ff00f56369262574eb63..ebb032e012a5d554347b7b43da23580aefcf3450 100644 (file)
--- a/po-man/es.po
+++ b/po-man/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.37-rc2\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2021-09-11 20:10+0200\n"
 "Last-Translator: Antonio Ceballos Roa <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -141,7 +141,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Mostrar texto de ayuda y finalizar."
 
@@ -149,12 +149,13 @@ msgstr "Mostrar texto de ayuda y finalizar."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 #, fuzzy
 #| msgid "Display version information and exit."
 msgid "Print version and exit."
@@ -594,7 +595,7 @@ msgstr "La longitud de la partición (en sectores de 512 bytes)."
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1790,7 +1791,7 @@ msgstr "Salta la verificación que normalmente se realiza tras dar el formato."
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -7906,7 +7907,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -10243,10 +10244,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr ""
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, fuzzy, no-wrap
 #| msgid "*-h*, *--help*"
-msgid "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
 msgstr "*-h*, *--help*"
 
 #. type: Plain text
@@ -10381,7 +10383,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -13837,14 +13839,6 @@ msgid ""
 "kernel mount options which are normally not listed."
 msgstr ""
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, fuzzy, no-wrap
-#| msgid "*-h*, *--help*"
-msgid "*-y*, *--shell*"
-msgstr "*-h*, *--help*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -17026,7 +17020,7 @@ msgstr ""
 #: ../misc-utils/lsfd.1.adoc:73
 #, fuzzy, no-wrap
 #| msgid "*-i*, *--invert*"
-msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*, *--invert*"
 
 #. type: Plain text
@@ -44797,166 +44791,172 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr ""
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-H*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr "*ESC-7*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr "*ESC-8*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr "*ESC-9*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Una orden *col* apareció en la Versión 6 del UNIX de AT&T."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -47893,6 +47893,11 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#, fuzzy, no-wrap
+#~| msgid "*-h*, *--help*"
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*-h*, *--help*"
+
 #, fuzzy
 #~| msgid ""
 #~| "Causes everything to be done except for the actual system call; if it's "
@@ -48121,10 +48126,6 @@ msgstr ""
 #~ msgid "Displays a help text and exits."
 #~ msgstr "Mostrar texto de ayuda y finalizar."
 
-#, no-wrap
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-H*, *--help*"
-
 #~ msgid "AGETTY"
 #~ msgstr "AGETTY"
 

diff --git a/po-man/fr.po b/po-man/fr.po
index 72e5e307b729f6c63888edd6cd47df80c4ef9c83..df571cd307f6bf0141a3bbcf400108e9bc6886fb 100644 (file)
--- a/po-man/fr.po
+++ b/po-man/fr.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.39-rc3\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2023-05-11 16:26+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -162,7 +162,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Afficher l’aide-mémoire puis quitter."
 
@@ -170,12 +170,13 @@ msgstr "Afficher l’aide-mémoire puis quitter."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "Afficher le numéro de version et quitter."
 
@@ -623,7 +624,7 @@ msgstr "La taille de la partition (en secteur de 512 octets)."
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1938,7 +1939,7 @@ msgstr "Sauter la vérification normalement effectuée après le formatage."
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -8846,7 +8847,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -11406,10 +11407,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr ""
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, fuzzy, no-wrap
 #| msgid "*-h*, *--help*"
-msgid "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
 msgstr "*-h*, *--help*"
 
 #. type: Plain text
@@ -11544,7 +11546,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -15541,14 +15543,6 @@ msgid ""
 "kernel mount options which are normally not listed."
 msgstr ""
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, fuzzy, no-wrap
-#| msgid "*-h*, *--help*"
-msgid "*-y*, *--shell*"
-msgstr "*-h*, *--help*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -19203,7 +19197,7 @@ msgstr ""
 #: ../misc-utils/lsfd.1.adoc:73
 #, fuzzy, no-wrap
 #| msgid "*-i*, *--invert*"
-msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*, *--invert*"
 
 #. type: Plain text
@@ -50849,169 +50843,175 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr ""
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-H*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr "*ESC-7*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr "*ESC-8*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr "*ESC-9*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, fuzzy, no-wrap
 #| msgid "Carriage Return (ASCII 13)"
 msgid "*carriage return*"
 msgstr "retour chariot (ASCII 13)"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, fuzzy, no-wrap
 #| msgid "Space"
 msgid "*space*"
 msgstr "espace"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, fuzzy, no-wrap
 #| msgid "B<vertical>"
 msgid "*vertical tab*"
 msgstr "B<vertical>"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Une commande *col* est apparue dans la Version 6 du UNIX AT&T."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -53966,6 +53966,11 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#, fuzzy, no-wrap
+#~| msgid "*-h*, *--help*"
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*-h*, *--help*"
+
 #~ msgid ""
 #~ "Causes everything to be done except for the actual system call; if it's "
 #~ "not obvious, this \"fakes\" mounting the filesystem. This option is "
@@ -54692,9 +54697,6 @@ msgstr ""
 #~ msgid "Displays a help text and exits."
 #~ msgstr "Afficher un texte d'aide puis quitter."
 
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-H*, *--help*"
-
 #~ msgid ""
 #~ "Implicit coloring can be disabled by an empty file _/etc/terminal-colors."
 #~ "d/hexdump.disable_."

diff --git a/po-man/pt_BR.po b/po-man/pt_BR.po
index a46fa5568a16a5664f95ce0c033a10032ddf4f71..a92ae4ad573d8aba0591fbff7722619b24307326 100644 (file)
--- a/po-man/pt_BR.po
+++ b/po-man/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.37-rc2\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2021-08-31 20:06-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -134,7 +134,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Exibe um texto de ajuda e sai."
 
@@ -142,12 +142,13 @@ msgstr "Exibe um texto de ajuda e sai."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "Imprime a versão e sai."
 
@@ -587,7 +588,7 @@ msgstr "O comprimento da partição (em setores de 512 setores)."
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1911,7 +1912,7 @@ msgstr "Ignora a verificação que normalmente é realizada após a formatação
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -8725,7 +8726,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -10899,10 +10900,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr "     --lastlog <caminho>  define um caminho alternativo para lastlog\n"
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, fuzzy, no-wrap
 #| msgid "*-h*, *--help*"
-msgid "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
 msgstr "*-h*, *--help*"
 
 #. type: Plain text
@@ -11040,7 +11042,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -14491,14 +14493,6 @@ msgid ""
 "kernel mount options which are normally not listed."
 msgstr ""
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, fuzzy, no-wrap
-#| msgid "*-h*, *--help*"
-msgid "*-y*, *--shell*"
-msgstr "*-h*, *--help*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -17465,7 +17459,7 @@ msgstr ""
 #: ../misc-utils/lsfd.1.adoc:73
 #, fuzzy, no-wrap
 #| msgid "*-i*, *--invert*"
-msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*, *--invert*"
 
 #. type: Plain text
@@ -44463,66 +44457,72 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr ""
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, fuzzy, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-h*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, fuzzy, no-wrap
 msgid "*backspace*"
 msgstr "     --erase-chars <texto>  caracteres adicionais de backspace\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, fuzzy, no-wrap
 msgid "*newline*"
 msgstr ""
@@ -44530,34 +44530,34 @@ msgstr ""
 "                              \"issue\"\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, fuzzy, no-wrap
 msgid "*carriage return*"
 msgstr " -w, --wait-cr              espera pelo caractere de retorno de carro\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, fuzzy, no-wrap
 msgid "*shift out*"
 msgstr ""
@@ -44565,23 +44565,23 @@ msgstr ""
 "\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, fuzzy, no-wrap
 msgid "*space*"
 msgstr "Pré-aloca espaço a, ou desaloca espaço de, um arquivo.\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, fuzzy, no-wrap
 msgid "*tab*"
 msgstr ""
@@ -44589,46 +44589,46 @@ msgstr ""
 "                        arquivo alternativo para opções -s, -m ou -k\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, fuzzy, no-wrap
 msgid "*vertical tab*"
 msgstr "vertical"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -47636,6 +47636,11 @@ msgid ""
 "*terminfo*(5)\n"
 msgstr ""
 
+#, fuzzy, no-wrap
+#~| msgid "*-h*, *--help*"
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*-h*, *--help*"
+
 #, fuzzy
 #~| msgid ""
 #~| "Use exclusive BSD lock for device or file it operates. The optional "
@@ -47923,10 +47928,6 @@ msgstr ""
 #~ msgid "Displays a help text and exits."
 #~ msgstr "   help     mostra esta ajuda e sai\n"
 
-#, fuzzy, no-wrap
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-h*, *--help*"
-
 #, fuzzy
 #~ msgid ""
 #~ "Implicit coloring can be disabled by an empty file _/etc/terminal-colors."

diff --git a/po-man/sr.po b/po-man/sr.po
index 1c2a0ae4bb2767f4b41abea8148c4446c90a993e..60931fa4ce0635111dcc81b9b41b92f95e845de8 100644 (file)
--- a/po-man/sr.po
+++ b/po-man/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.39-rc3\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2023-07-17 09:13+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -131,7 +131,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Приказује текст помоћи и излази."
 
@@ -139,12 +139,13 @@ msgstr "Приказује текст помоћи и излази."
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "Исписује издање и излази."
 
@@ -581,7 +582,7 @@ msgstr "Величина партиције (у 512-бајтним сектор
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1877,7 +1878,7 @@ msgstr "Прескаче проверавање које се обично об
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -8571,7 +8572,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -11108,10 +11109,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr "Алтернативна путања за *lastlog*(8)."
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, no-wrap
-msgid "*y-*, *--shell*"
-msgstr "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
+msgstr "*-y*, *--shell*"
 
 #. type: Plain text
 #: ../login-utils/lslogins.1.adoc:100 ../sys-utils/lsipc.1.adoc:85
@@ -11255,7 +11257,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -15133,13 +15135,6 @@ msgstr ""
 "заставице. Ова опција је осмишљена за сврхе испитивања за испис такође "
 "основних опција качења VFS језгра које се обично не исписују."
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, no-wrap
-msgid "*-y*, *--shell*"
-msgstr "*-y*, *--shell*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -18638,8 +18633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: ../misc-utils/lsfd.1.adoc:73
-#, no-wrap
-msgid "*-i*[4|6], *--inet*[=4|6]"
+#, fuzzy, no-wrap
+#| msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*[4|6], *--inet*[=4|6]"
 
 #. type: Plain text
@@ -49687,8 +49683,14 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr "Резултира са више простора уместо табулатора."
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-H*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
@@ -49697,7 +49699,7 @@ msgstr ""
 "је проширење стандарду."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
@@ -49706,139 +49708,139 @@ msgstr ""
 "вредности наведене су у следећој табели:"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr "*ESC-7*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr "враћа увод реда („esc“ затим 7)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr "*ESC-8*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr "враћа увод реда за пола („esc“ затим 8)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr "*ESC-9*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr "напредује увод реда за пола („esc“ затим 9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr "*backspace*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr "помера се назад једну колону (8); занемарено у првој колони"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr "*newline*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr "напредује увод реда (10); такође обавља повратник реда"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr "*carriage return*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr "*shift in*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr "помера се на нормалан скуп знакова (15)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr "*shift out*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr "помера се на заменски скуп знакова (14)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr "*space*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr "иде напред једну колону (32)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr "*tab*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr "иде напред до следећег заустављања табулатора (9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr "*vertical tab*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr "враћа увод реда (11)"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr "Сви непрепознати контролни знакови и изменски низови се одбацују."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr "*col* прати скуп знакова како се знакови читају и осигурава да је скуп знакова тачан када се исписују.\n"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
@@ -49847,12 +49849,12 @@ msgstr ""
 "поруку грешке."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Наредба *col* се појавила у издању 6 AT&T UNIX-а."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -52964,6 +52966,10 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#, no-wrap
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*y-*, *--shell*"
+
 #~ msgid ""
 #~ "Causes everything to be done except for the actual system call; if it's "
 #~ "not obvious, this \"fakes\" mounting the filesystem. This option is "
@@ -53449,9 +53455,6 @@ msgstr ""
 #~ msgid "Displays a help text and exits."
 #~ msgstr "Приказује текст помоћи и излази."
 
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-H*, *--help*"
-
 #~ msgid ""
 #~ "Implicit coloring can be disabled by an empty file _/etc/terminal-colors."
 #~ "d/hexdump.disable_."

diff --git a/po-man/uk.po b/po-man/uk.po
index d7eedf9b7685fcb25763c8567a5946d5c0745cff..9a3fd3cf7211560f28375ee4e5a5bf2d81c221c9 100644 (file)
--- a/po-man/uk.po
+++ b/po-man/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-man 2.39-rc3\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 12:26+0100\n"
 "PO-Revision-Date: 2023-05-22 15:13+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -131,7 +131,7 @@ msgstr "*-h*, *--help*"
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr "Вивести текст довідки і завершити роботу."
 
@@ -139,12 +139,13 @@ msgstr "Вивести текст довідки і завершити робо
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr "*-V*, *--version*"
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr "Вивести дані щодо версії і завершити роботу."
 
@@ -584,7 +585,7 @@ msgstr "Довжина розділу (у 512-байтових секторах)
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1894,7 +1895,7 @@ msgstr "Пропустити верифікацію, яка, зазвичай, 
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -8680,7 +8681,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -11235,10 +11236,11 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr "Змінити шлях для *lastlog*(8)."
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, no-wrap
-msgid "*y-*, *--shell*"
-msgstr "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
+msgstr "*-y*, *--shell*"
 
 #. type: Plain text
 #: ../login-utils/lslogins.1.adoc:100 ../sys-utils/lsipc.1.adoc:85
@@ -11376,7 +11378,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -15307,13 +15309,6 @@ msgstr ""
 "списку типових параметрів монтування віртуальних файлових систем у ядрі, "
 "які, зазвичай, не потрапляють до списку."
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, no-wrap
-msgid "*-y*, *--shell*"
-msgstr "*-y*, *--shell*"
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -18899,8 +18894,9 @@ msgstr ""
 
 #. type: Labeled list
 #: ../misc-utils/lsfd.1.adoc:73
-#, no-wrap
-msgid "*-i*[4|6], *--inet*[=4|6]"
+#, fuzzy, no-wrap
+#| msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr "*-i*[4|6], *--inet*[=4|6]"
 
 #. type: Plain text
@@ -49176,168 +49172,174 @@ msgstr "*-x*, *--spaces*"
 msgid "Output multiple spaces instead of tabs."
 msgstr "Виводити послідовність пробілів замість табуляцій."
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr "*-H*, *--help*"
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr "*ESC-7*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr "зворотна подача рядків (escape, потім 7)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr "*ESC-8*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr "напів зворотна подача рядків (escape, потім 8)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr "*ESC-9*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr "напів подача рядків вперед (escape, потім 9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr "*витирання символу ліворуч*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 "пересуває на одну позиції назад (8); буде проігноровано у першій позиції"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr "*новий рядок*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr "подача рядка вперед (10); також виконує повернення каретки"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr "*повернення каретки*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr "(13)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr "пересунутися до звичайного набору символів (15)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr "пересунутися до альтернативного набору символів (14)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr "*пробіл*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr "пересуває вперед на одну позицію (32)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr "*табуляція*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr "пересуває вперед до наступної позиції табуляції (9)"
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr "*вертикальна табуляція*"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr "зворотна подача рядка (11)"
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 "Усі нерозпізнані символи керування та керівні послідовності буде відкинуто."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid "*col* keeps track of the character set as characters are read and makes sure the character set is correct when they are output.\n"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr "Команда *col* з'явилася у AT&T UNIX версії 6."
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"
@@ -52343,6 +52345,10 @@ msgstr ""
 "*setenv*(3),\n"
 "*terminfo*(5)\n"
 
+#, no-wrap
+#~ msgid "*y-*, *--shell*"
+#~ msgstr "*y-*, *--shell*"
+
 #~ msgid ""
 #~ "Causes everything to be done except for the actual system call; if it's "
 #~ "not obvious, this \"fakes\" mounting the filesystem. This option is "
@@ -52541,6 +52547,3 @@ msgstr ""
 
 #~ msgid "*-V, --version*"
 #~ msgstr "*-V, --version*"
-
-#~ msgid "*-H*, *--help*"
-#~ msgstr "*-H*, *--help*"

diff --git a/po-man/util-linux-man.pot b/po-man/util-linux-man.pot
index a5c1a10d701df5db64ee7af9634c980048b8434e..8546a729ee6d817701f6d8f95cfbb4cc86726170 100644 (file)
--- a/po-man/util-linux-man.pot
+++ b/po-man/util-linux-man.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-08-17 10:46+0200\n"
+"POT-Creation-Date: 2023-12-04 13:21+0100\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"
@@ -118,7 +118,7 @@ msgstr ""
 #: ../man-common/help-version.adoc:3 ../disk-utils/fsck.8.adoc:114
 #: ../disk-utils/sfdisk.8.adoc:224 ../login-utils/chfn.1.adoc:51
 #: ../sys-utils/blkpr.8.adoc:47 ../sys-utils/rfkill.8.adoc:48
-#: ../sys-utils/setsid.1.adoc:39
+#: ../sys-utils/setsid.1.adoc:39 ../text-utils/col.1.adoc:82
 msgid "Display help text and exit."
 msgstr ""
 
@@ -126,12 +126,13 @@ msgstr ""
 #: ../man-common/help-version.adoc:4 ../disk-utils/fdisk.8.adoc:100
 #: ../login-utils/chfn.1.adoc:52 ../login-utils/chsh.1.adoc:43
 #: ../sys-utils/blkpr.8.adoc:42 ../sys-utils/setsid.1.adoc:34
+#: ../text-utils/col.1.adoc:83
 #, no-wrap
 msgid "*-V*, *--version*"
 msgstr ""
 
 #. type: Plain text
-#: ../man-common/help-version.adoc:5
+#: ../man-common/help-version.adoc:5 ../text-utils/col.1.adoc:85
 msgid "Print version and exit."
 msgstr ""
 
@@ -565,7 +566,7 @@ msgstr ""
 #: ../term-utils/mesg.1.adoc:96 ../term-utils/script.1.adoc:161
 #: ../term-utils/scriptlive.1.adoc:75 ../term-utils/scriptreplay.1.adoc:95
 #: ../term-utils/setterm.1.adoc:167 ../term-utils/wall.1.adoc:81
-#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:123
+#: ../term-utils/write.1.adoc:80 ../text-utils/col.1.adoc:127
 #: ../text-utils/colcrt.1.adoc:92 ../text-utils/colrm.1.adoc:67
 #: ../text-utils/column.1.adoc:234 ../text-utils/line.1.adoc:22
 #: ../text-utils/more.1.adoc:198 ../text-utils/pg.1.adoc:142
@@ -1729,7 +1730,7 @@ msgstr ""
 #: ../sys-utils/setpriv.1.adoc:94 ../sys-utils/swapon.8.adoc:139
 #: ../sys-utils/switch_root.8.adoc:33 ../sys-utils/tunelp.8.adoc:64
 #: ../sys-utils/unshare.1.adoc:146 ../term-utils/script.1.adoc:134
-#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:86
+#: ../term-utils/wall.1.adoc:73 ../text-utils/col.1.adoc:90
 #: ../text-utils/pg.1.adoc:136
 #, no-wrap
 msgid "NOTES"
@@ -7533,7 +7534,7 @@ msgstr ""
 #: ../libuuid/man/uuid.3.adoc:55 ../libuuid/man/uuid_generate.3.adoc:76
 #: ../libuuid/man/uuid_parse.3.adoc:62 ../libuuid/man/uuid_unparse.3.adoc:59
 #: ../misc-utils/logger.1.adoc:229 ../misc-utils/uuidgen.1.adoc:54
-#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:82
+#: ../sys-utils/ipcs.1.adoc:76 ../text-utils/col.1.adoc:86
 #: ../text-utils/hexdump.1.adoc:223
 #, no-wrap
 msgid "CONFORMING TO"
@@ -9692,9 +9693,10 @@ msgid "Alternate path for *lastlog*(8)."
 msgstr ""
 
 #. type: Labeled list
-#: ../login-utils/lslogins.1.adoc:98
+#: ../login-utils/lslogins.1.adoc:98 ../misc-utils/findmnt.8.adoc:177
+#: ../misc-utils/lsblk.8.adoc:125 ../sys-utils/lsipc.1.adoc:83
 #, no-wrap
-msgid "*y-*, *--shell*"
+msgid "*-y*, *--shell*"
 msgstr ""
 
 #. type: Plain text
@@ -9827,7 +9829,7 @@ msgstr ""
 #: ../sys-utils/rtcwake.8.adoc:118 ../sys-utils/swapon.8.adoc:163
 #: ../sys-utils/umount.8.adoc:169 ../term-utils/mesg.1.adoc:91
 #: ../term-utils/script.1.adoc:151 ../term-utils/wall.1.adoc:77
-#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:119
+#: ../term-utils/write.1.adoc:76 ../text-utils/col.1.adoc:123
 #: ../text-utils/colcrt.1.adoc:66 ../text-utils/colrm.1.adoc:63
 #: ../text-utils/column.1.adoc:181 ../text-utils/more.1.adoc:186
 #: ../text-utils/ul.1.adoc:72
@@ -13242,13 +13244,6 @@ msgid ""
 "VFS kernel mount options which are normally not listed."
 msgstr ""
 
-#. type: Labeled list
-#: ../misc-utils/findmnt.8.adoc:177 ../misc-utils/lsblk.8.adoc:125
-#: ../sys-utils/lsipc.1.adoc:83
-#, no-wrap
-msgid "*-y*, *--shell*"
-msgstr ""
-
 #. type: Plain text
 #: ../misc-utils/findmnt.8.adoc:179
 msgid ""
@@ -16150,7 +16145,7 @@ msgstr ""
 #. type: Labeled list
 #: ../misc-utils/lsfd.1.adoc:73
 #, no-wrap
-msgid "*-i*[4|6], *--inet*[=4|6]"
+msgid "*-i*[4|6], *--inet*[=4|=6]"
 msgstr ""
 
 #. type: Plain text
@@ -42502,148 +42497,154 @@ msgstr ""
 msgid "Output multiple spaces instead of tabs."
 msgstr ""
 
+#. type: Labeled list
+#: ../text-utils/col.1.adoc:80
+#, no-wrap
+msgid "*-H*, *--help*"
+msgstr ""
+
 #. type: Plain text
-#: ../text-utils/col.1.adoc:85
+#: ../text-utils/col.1.adoc:89
 msgid ""
 "The *col* utility conforms to the Single UNIX Specification, Version 2. The "
 "*-l* option is an extension to the standard."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:89
+#: ../text-utils/col.1.adoc:93
 msgid ""
 "The control sequences for carriage motion that *col* understands and their "
 "decimal values are listed in the following table:"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:90
+#: ../text-utils/col.1.adoc:94
 #, no-wrap
 msgid "*ESC-7*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 msgid "reverse line feed (escape then 7)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:92
+#: ../text-utils/col.1.adoc:96
 #, no-wrap
 msgid "*ESC-8*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 msgid "half reverse line feed (escape then 8)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:94
+#: ../text-utils/col.1.adoc:98
 #, no-wrap
 msgid "*ESC-9*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 msgid "half forward line feed (escape then 9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:96
+#: ../text-utils/col.1.adoc:100
 #, no-wrap
 msgid "*backspace*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 msgid "moves back one column (8); ignored in the first column"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:98
+#: ../text-utils/col.1.adoc:102
 #, no-wrap
 msgid "*newline*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 msgid "forward line feed (10); also does carriage return"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:100
+#: ../text-utils/col.1.adoc:104
 #, no-wrap
 msgid "*carriage return*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 msgid "(13)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:102
+#: ../text-utils/col.1.adoc:106
 #, no-wrap
 msgid "*shift in*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 msgid "shift to normal character set (15)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:104
+#: ../text-utils/col.1.adoc:108
 #, no-wrap
 msgid "*shift out*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 msgid "shift to alternate character set (14)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:106
+#: ../text-utils/col.1.adoc:110
 #, no-wrap
 msgid "*space*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 msgid "moves forward one column (32)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:108
+#: ../text-utils/col.1.adoc:112
 #, no-wrap
 msgid "*tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 msgid "moves forward to next tab stop (9)"
 msgstr ""
 
 #. type: Labeled list
-#: ../text-utils/col.1.adoc:110
+#: ../text-utils/col.1.adoc:114
 #, no-wrap
 msgid "*vertical tab*"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:112
+#: ../text-utils/col.1.adoc:116
 msgid "reverse line feed (11)"
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:114
+#: ../text-utils/col.1.adoc:118
 msgid "All unrecognized control characters and escape sequences are discarded."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:116
+#: ../text-utils/col.1.adoc:120
 #, no-wrap
 msgid ""
 "*col* keeps track of the character set as characters are read and makes sure "
@@ -42651,19 +42652,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:118
+#: ../text-utils/col.1.adoc:122
 msgid ""
 "If the input attempts to back up to the last flushed line, *col* will "
 "display a warning message."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:122
+#: ../text-utils/col.1.adoc:126
 msgid "A *col* command appeared in Version 6 AT&T UNIX."
 msgstr ""
 
 #. type: Plain text
-#: ../text-utils/col.1.adoc:128
+#: ../text-utils/col.1.adoc:132
 #, no-wrap
 msgid ""
 "*expand*(1),\n"