From 8fa9df6e7a35b34d061e442faba654965336151f Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Sat, 14 Dec 2024 00:06:30 +0000 Subject: [PATCH] New --bar-style option; replace "default" with "plain" or with a lookup against the selected default, as appropriate. --- docs/NEWS.md | 3 +- docs/pv.1 | 37 ++++++++----- docs/pv.1.md | 22 ++++++-- po/cs.po | 104 +++++++++++++++++++----------------- po/de.po | 104 +++++++++++++++++++----------------- po/es.po | 104 +++++++++++++++++++----------------- po/fr.po | 104 +++++++++++++++++++----------------- po/pl.po | 104 +++++++++++++++++++----------------- po/pt.po | 104 +++++++++++++++++++----------------- po/ru.po | 104 +++++++++++++++++++----------------- po/tr.po | 104 +++++++++++++++++++----------------- src/include/options.h | 1 + src/include/pv-internal.h | 2 + src/include/pv.h | 1 + src/main/help.c | 3 ++ src/main/main.c | 1 + src/main/options.c | 11 +++- src/pv/display.c | 3 +- src/pv/format/barstyle.c | 27 +++++++--- src/pv/format/progressbar.c | 24 +++++++-- src/pv/state.c | 15 ++++++ 21 files changed, 568 insertions(+), 414 deletions(-) diff --git a/docs/NEWS.md b/docs/NEWS.md index 78ecb46..974fd75 100644 --- a/docs/NEWS.md +++ b/docs/NEWS.md @@ -1,7 +1,8 @@ ### UNRELEASED + * *feature:* new **--bar-style** option to change the default bar style ([#15](https://codeberg.org/a-j-wood/pv/issues/15)) + * *feature:* new bar formats "**%{bar-plain}**", "**%{bar-block}**", "**%{bar-granular}**", "**%{bar-shaded}**" ([#15](https://codeberg.org/a-j-wood/pv/issues/15)) * *feature:* allow decimal values such as "1.5G" with "**--size**", "**--rate-limit**", "**--buffer-size**", and "**error-skip-block**" ([#35](https://codeberg.org/a-j-wood/pv/issues/35)) - * *feature:* new bar formats "**%{bar-default}**", "**%{bar-block}**", "**%{bar-granular}**", "**%{bar-shaded}**" * *docs:* simplified the synopsis section of the manual ### 1.9.15 - 8 December 2024 diff --git a/docs/pv.1 b/docs/pv.1 index 4fb26dd..7b08ad8 100644 --- a/docs/pv.1 +++ b/docs/pv.1 @@ -204,6 +204,14 @@ Useful in conjunction with \*(lq\fB\-\-cursor\fR\*(rq if you have a complicated pipeline and you want to be able to tell different parts of it apart. .TP +.BI \-u\ STYLE \fR,\ \fB\-\-bar\-style\ STYLE +Change the default progress bar style shown by \*(lq\fB\-\-progress\fR\*(rq, +or by the \*(lq\fB\-\-format\fR\*(rq sequences \*(lq\fB%{progress}\fR\*(rq +or \*(lq\fB%{progress\-bar\-only}\fR\*(rq, to \fISTYLE\fR. +The \fISTYLE\fR can be one of \fBplain\fR (the default), \fBblock\fR, +\fBgranular\fR, or \fBshaded\fR. +These styles are described in the \fBFORMATTING\fR section below. +.TP .BI \-x\ SPEC \fR,\ \fB\-\-extra\-display\ SPEC As well as displaying progress to the terminal, also write it to \fISPEC\fR. The \fISPEC\fR must start with a comma-separated list of destinations, and @@ -391,37 +399,42 @@ Equivalent to \*(lq\fB\-\-progress\fR\*(rq. Expands to fill the remaining space unless prefixed by a number to set the width, such as \*(lq\fB%20p\fR\*(rq or \*(lq\fB%20{progress}\fR\*(rq. .TP -.BR %{progress-bar-only} ", " %{bar} ", " %{bar-default} +.BR %{progress\-bar\-only} Progress bar, without any sides, and without any percentage displayed afterwards. Expands to fill the remaining space unless prefixed by a number. .TP -.B %{progress-amount-only} +.B %{progress\-amount\-only} The percentage completion (or maximum rate, with \*(lq\fB\-\-gauge\fR\*(rq when the size is unknown). .TP -.B %{bar-block} +.B %{bar\-plain} +Progress bar in the standard plain format, without any sides, and without +any percentage displayed afterwards. +Expands to fill the remaining space unless prefixed by a number. +.TP +.B %{bar\-block} Progress bar using Unicode full blocks, without any sides, and without any percentage displayed afterwards. Expands to fill the remaining space unless prefixed by a number. -If UTF-8 output is not available, the default format is used. +If UTF-8 output is not available, the plain format is used. .TP -.B %{bar-granular} +.B %{bar\-granular} Progress bar using Unicode full blocks, and 1/8th blocks for partial fills, providing a more granular display. Like the other \*(lq%{bar}\*(rq strings this shows the bar without any sides, and without any percentage displayed afterwards, and expands to fill the remaining space unless prefixed by a number. -If UTF-8 output is not available, the default format is used. +If UTF-8 output is not available, the plain format is used. .TP -.B %{bar-shaded} +.B %{bar\-shaded} Progress bar using Unicode full blocks and shade characters - dark and medium shade are used for partial fills, and the light shade is used for the background. Like the other \*(lq%{bar}\*(rq strings this shows the bar without any sides, and without any percentage displayed afterwards, and expands to fill the remaining space unless prefixed by a number. -If UTF-8 output is not available, the default format is used. +If UTF-8 output is not available, the plain format is used. .TP .BR %t ", " %{timer} Elapsed time. @@ -439,7 +452,7 @@ Equivalent to \*(lq\fB\-\-fineta\fR\*(rq. Current data transfer rate. Equivalent to \*(lq\fB\-\-rate\fR\*(rq. .TP -.BR %a ", " %{average-rate} +.BR %a ", " %{average\-rate} Average data transfer rate. Equivalent to \*(lq\fB\-\-average\-rate\fR\*(rq. .TP @@ -449,19 +462,19 @@ Equivalent to \*(lq\fB\-\-bytes\fR\*(rq. If \*(lq\fB\-\-bits\fR\*(rq was specified, \*(lq\fB%b\fR\*(rq shows the bits transferred so far, not bytes. .TP -.BR %T ", " %{buffer-percent} +.BR %T ", " %{buffer\-percent} Percentage of the transfer buffer in use. Equivalent to \*(lq\fB\-\-buffer\-percent\fR\*(rq. Displays \*(lq{\-\-\-\-}\*(rq if the transfer is being done with \fBsplice\fR(2), since splicing to or from pipes does not use the buffer. .TP -.BR %nA ", " %n{last-written} +.BR %nA ", " %n{last\-written} Show the last \fIn\fR bytes written (for example, \*(lq\fB%16A\fR\*(rq shows the last 16 bytes). Shows only dots if the transfer is being done with \fBsplice\fR(2), since splicing to or from pipes does not use the buffer. .TP -.BR %nL ", " %n{previous-line} +.BR %nL ", " %n{previous\-line} Show the first \fIn\fR bytes of the most recently written line (for example, \*(lq\fB%40L\fR\*(rq shows the first 40 bytes). If no \fIn\fR is given, then this expands to fill the available space. diff --git a/docs/pv.1.md b/docs/pv.1.md index 9d56a71..e34ba92 100644 --- a/docs/pv.1.md +++ b/docs/pv.1.md @@ -209,6 +209,14 @@ are explicitly switched on will be shown. with "**\--cursor**" if you have a complicated pipeline and you want to be able to tell different parts of it apart. +**-u STYLE, \--bar-style STYLE** + +: Change the default progress bar style shown by "**\--progress**", or + by the "**\--format**" sequences "**%{progress}**" or + "**%{progress-bar-only}**", to *STYLE*. The *STYLE* can be one of + **plain** (the default), **block**, **granular**, or **shaded**. + These styles are described in the **FORMATTING** section below. + **-x SPEC, \--extra-display SPEC** : As well as displaying progress to the terminal, also write it to @@ -403,7 +411,7 @@ contain the following sequences: unless prefixed by a number to set the width, such as "**%20p**" or "**%20{progress}**". -**%{progress-bar-only}**, **%{bar}**, **%{bar-default}** +**%{progress-bar-only}** : Progress bar, without any sides, and without any percentage displayed afterwards. Expands to fill the remaining space unless @@ -414,12 +422,18 @@ contain the following sequences: : The percentage completion (or maximum rate, with "**\--gauge**" when the size is unknown). +**%{bar-plain}** + +: Progress bar in the standard plain format, without any sides, and + without any percentage displayed afterwards. Expands to fill the + remaining space unless prefixed by a number. + **%{bar-block}** : Progress bar using Unicode full blocks, without any sides, and without any percentage displayed afterwards. Expands to fill the remaining space unless prefixed by a number. If UTF-8 output is not - available, the default format is used. + available, the plain format is used. **%{bar-granular}** @@ -428,7 +442,7 @@ contain the following sequences: strings this shows the bar without any sides, and without any percentage displayed afterwards, and expands to fill the remaining space unless prefixed by a number. If UTF-8 output is not available, - the default format is used. + the plain format is used. **%{bar-shaded}** @@ -437,7 +451,7 @@ contain the following sequences: used for the background. Like the other "%{bar}" strings this shows the bar without any sides, and without any percentage displayed afterwards, and expands to fill the remaining space unless prefixed - by a number. If UTF-8 output is not available, the default format is + by a number. If UTF-8 output is not available, the plain format is used. **%t**, **%{timer}** diff --git a/po/cs.po b/po/cs.po index a39e568..9180149 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-13 20:43+0000\n" "Last-Translator: mmatous \n" "Language-Team: Czech \n" @@ -141,130 +141,138 @@ msgid "prefix visual information with NAME" msgstr "přidej JMÉNO před vizuální informace" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "po dokončení vypiš údaje o přenosu" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "vypisuj výstup i pokud standardní chybový výstup není terminál" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "pozicuj kurzor pomocí řídících znaků" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "SOUBOR" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "zapiš výstup do SOUBORu namísto standardního výstupu" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "RYCH" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "omez přenosovou rychlost na RYCH bajtů za sekundu" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "BAJT" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "použij vyrovnávací pamět BAJT bajtů" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "nepoužívej splice(), vždy použij read/write" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "ignoruj chyby při čtení vstupu" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "přeskakuj chyby v blocích BAJTů naráz" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "zastav po přenosu --size bajtů" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "po každém zápisu vyprázdni cache na disk" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "použij přímý V/V k obejítí cache" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "zahoď vstup namísto zápisu na výstup" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "zapiš veškerý vstup do SOUBORu před výpisem na výstup" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "PID[:DS]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "sleduj soubor DS otevřený procesem PID" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "PID" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "aktualizuj nastavení procesu PID" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "ulož id procesu do SOUBORu" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "ukaž pomoc a skonči" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "ukaž informace o verzi a skonči" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "zapiš ladící záznamy do SOUBORu" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Použití: %s [VOLBY] [SOUBOR]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "Spoj SOUBOR(y) nebo standardní vstup na standardního výstup, s monitoringem." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Prosím, hlašte veškeré chyby na: %s" @@ -301,45 +309,45 @@ msgstr "selhalo otevření blokového zařízení" msgid "failed to determine size of block device" msgstr "selhalo zjištění velikosti blokového zařízení" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "selhala alokace struktury pro volby" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "selhala alokace struktury pro argv" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "očekáván celočíselný argument" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "očekáván číselný argument" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "očekáváno ID procesu nebo dvojice PID:DS" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "neplatné ID procesu" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Zkuste `%s --help' pro více informací." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Zkuste `%s --h' pro více informací." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -347,19 +355,19 @@ msgstr "" "při sledování deskriptorů souborů nelze použít řádkový mód nebo volby pro " "modifikaci přenosu" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "při sledování deskriptorů souborů nelze pozicování kurzoru použít" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "při sledování deskriptorů souborů nelze použít vzdálené ovládání" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "při sledování deskriptorů souborů nelze použít přenos souborů" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "není dostupné na systémech bez /proc/self/fdinfo" @@ -411,7 +419,7 @@ msgstr "yzafpnum kMGTPEZY" msgid "yzafpnum KMGTPEZY" msgstr "yzafpnum KMGTPEZY" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "selhala alokace vyrovnávací paměti" @@ -494,7 +502,7 @@ msgstr "pid" msgid "history structure allocation failed" msgstr "selhala alokace struktury historie" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "selhala alokace seznamu souborů" diff --git a/po/de.po b/po/de.po index 13b58a2..b537f1e 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-13 20:43+0000\n" "Last-Translator: fnetX \n" "Language-Team: German \n" @@ -157,132 +157,140 @@ msgid "prefix visual information with NAME" msgstr "setze den NAMEn für visuelle Darstellung" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "Übertragungsstatistiken am Ende ausgeben" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "" "Ausgabe auch dann erzwingen, wenn der Fehlerausgabe-Kanal kein Terminal ist" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "benutze Escape-Sequenzen zur Cursor-Positionierung" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "DATEI" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "schreibe die Ausgabe in DATEI statt in die Standardausgabe" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "RATE" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "BYTES" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "benutze einen Puffer in der Größe von BYTES" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "anstelle von splice() immer read/write benutzen" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "Lesefehler in der Eingabe nicht beachten" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "bei Fehlern BYTES am Stück überspringen" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "anhalten, nachdem --size Bytes übertragen wurden" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "schreibe den Cache nach jedem Schreibvorgang auf die Festplatte" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "verwende direkte E/A, um den Cache zu umgehen" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "verwirf die Eingabe anstatt in die Ausgabe zu schreiben" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "Ausgabe nach FILE schrieben bevor sie ausgegeben wird" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "PID[:FD]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "die vom Prozess PID geöffnete Datei FD beobachten" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "PID" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "Einstellungen der Prozess-PID updaten" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "Prozess-ID in DATEI speichern" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "zeige diese Hilfe und beende" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "zeige Versionsinformationen und beende" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "schreibe Debug-Protokolle in DATEI" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Aufruf: %s [OPTION] [DATEI]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "Verbindet DATEI(en) oder den Standard-Eingabe-Kanal mit dem Standard-Ausgabe-" "Kanal und misst den Datenstrom." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Bitte senden Sie Fehlerberichte an %s" @@ -319,45 +327,45 @@ msgstr "konnte Blockgerät nicht öffnen" msgid "failed to determine size of block device" msgstr "konnte Größe des Blockgeräts nicht ermitteln" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "Speicherzuweisung für `option' fehlgeschlagen" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "Speicherzuweisung für `argv' der Option fehlgeschlagen" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "Ganzzahliges Argument erwartet" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "numerisches Argument erwartet" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "Prozess-ID oder PID:FD-Paar erwartet" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "ungültige Prozess-ID" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "`%s --help' zeigt weitere Informationen an." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "`%s -h' zeigt weitere Informationen an." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -365,24 +373,24 @@ msgstr "" "Beim Beobachten von Dateideskriptoren können keine Optionen für den " "Zeilenmodus oder den Übertragungsmodifikator verwendet werden" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" "Beim Beobachten von Dateideskriptoren kann Cursor-Positionierung nicht " "verwendet werden" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "" "Beim Beobachten von Dateideskriptoren kann die Fernbedienung nicht verwenden " "werden" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "" "Beim Beobachten von Dateideskriptoren können Dateien nicht übertragen werden" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "Nicht verfügbar auf Systemen ohne /proc/self/fdinfo" @@ -434,7 +442,7 @@ msgstr "yzafpnµm kMGTPEZY" msgid "yzafpnum KMGTPEZY" msgstr "yzafpnµm KMGTPEZY" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "Speicherzuweisung für den Puffer fehlgeschlagen" @@ -518,7 +526,7 @@ msgstr "pid" msgid "history structure allocation failed" msgstr "Speicherzuweisung für `history' fehlgeschlagen" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "Speicherzuweisung für die Dateiliste fehlgeschlagen" diff --git a/po/es.po b/po/es.po index 1a695d6..b23ae21 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,129 +136,137 @@ msgid "prefix visual information with NAME" msgstr "" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 -msgid "output transfer statistics at the end" +msgid "also send progress to SPEC" msgstr "" #: src/main/help.c:318 -msgid "output even if standard error is not a terminal" +msgid "output transfer statistics at the end" msgstr "" #: src/main/help.c:321 +msgid "output even if standard error is not a terminal" +msgstr "" + +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "" -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "" @@ -295,63 +303,63 @@ msgstr "" msgid "failed to determine size of block device" msgstr "" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "" -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "" -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" msgstr "" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "" @@ -403,7 +411,7 @@ msgstr "" msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "" @@ -486,7 +494,7 @@ msgstr "" msgid "history structure allocation failed" msgstr "" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "" diff --git a/po/fr.po b/po/fr.po index e9f71dc..3dc7a61 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-12 11:13+0000\n" "Last-Translator: a-j-wood \n" "Language-Team: French \n" @@ -158,132 +158,140 @@ msgid "prefix visual information with NAME" msgstr "préfixer les informations visuelles avec NOM" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "afficher les statistiques de transfert à la fin" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "" "imprimer vers la sortie d'erreur standard même si ce n'est pas un terminal" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "utiliser les séquences d'échappements de positionnement de curseur" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "FICHIER" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "écrire la sortie dans FICHIER au lieu de la sortie standard" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "TAUX" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "limite le taux de transfert à TAUX octets par seconde" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "OCTETS" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "Utiliser une mémoire tampon de OCTETS octets" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "ne jamais utiliser splice(), toujours utiliser read/write" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "ignorer les erreurs de lecture dans l'entrée" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "ignorer les erreurs dans OCTETS blocs à la fois" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "arrêter après le transfert de --size octets" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "vider le cache sur le disque après chaque écriture" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "utiliser les E/S directes pour contourner le cache" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "rejeter l'entrée au lieu de l'écrire vers la sortie" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "écrire toute l'entrée vers FICHIER avant de l'écrire vers la sortie" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "PID[:FD]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "surveiller le fichier FD ouvert par le processus PID" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "PID" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "mettre à jour la configuration du processus PID" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "enregistrer l'ID de processus dans FICHIER" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "afficher cette aide puis quitter" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "afficher la version puis quitter" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "écrire les journaux de déboggage vers FICHIER" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Utilisation : %s [OPTIONS] [FICHIER]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "Concaténer FICHIER(s), ou l'entrée standard, sur la sortie standard avec " "monitorage." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "SVP rapporter tous bogues à %s" @@ -320,45 +328,45 @@ msgstr "" msgid "failed to determine size of block device" msgstr "" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "l'allocation pour la structure d'une option a échoué" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "l'allocation pour la structure de l'option argv a échoué" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "Valeur entière attendue" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "Valeur numérique attendue" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "ID de processus ou paire pid:fd attendue" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "ID de processus non valide" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Essayez `%s --help' pour plus d'informations." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Essayez `%s -h' pour plus d'informations." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -366,25 +374,25 @@ msgstr "" "impossible d'utiliser le mode ligne ou les options de modificateur de " "transfert lors de la visualisation des descripteurs de fichiers" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" "impossible d'utiliser le positionnement du curseur lors de la visualisation " "des descripteurs de fichier" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "" "impossible d'utiliser la télécommande lors de la visualisation des " "descripteurs de fichiers" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "" "impossible de transférer des fichiers lorsque vous regardez des descripteurs " "de fichiers" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "non disponible sur les systèmes sans /proc/self/fdinfo" @@ -438,7 +446,7 @@ msgstr "" msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "échec de l'allocation de mémoire tampon" @@ -521,7 +529,7 @@ msgstr "" msgid "history structure allocation failed" msgstr "l'allocation de la structure de l'historique a échoué" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "échec de l'allocation de la liste de fichiers" diff --git a/po/pl.po b/po/pl.po index ccee774..0bf39af 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-20 14:07+0000\n" "Last-Translator: coralpink \n" "Language-Team: Polish \n" @@ -151,133 +151,141 @@ msgid "prefix visual information with NAME" msgstr "poprzedź informacje prefiksem NAZWA" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "wyświetl na końcu statystyki transferu" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "pokaż wyjście nawet standardowe wyjście błędu nie jest terminalem" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "używaj znaków ucieczki do pozycjonowania kursora" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "PLIK" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "zapisz wyjście do PLIK zamiast do wyjścia standardowego" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "PRĘDKOŚĆ" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "ogranicz przesyłane dane do PRĘDKOŚĆ bajtów na sekundę" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "BAJTY" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "użyj bufora o rozmiarze BAJTY" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "nigdy nie używaj splice(), zawsze używaj read/write" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "pomijaj błędy odczytu wejścia" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "pomijaj błędy w blokach po BAJTY bajtów na raz" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "zakończ po przesłaniu --size bajtów" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "wymuś zapis pamięci podręcznej na dysk po każdym zapisie" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "" "użyj bezpośredniego wejścia/wyjścia celem pominięcia pamięci podręcznej" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "zignoruj dane wejściowe zamiast wyświetlić je na wyjściu standardowym" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "" "zapisz wszystkie dane wejściowe do PLIK przed wyświetleniem ich na wyjściu" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "PID[:FD]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "obserwuj plik FD otworzony przez proces PID" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "PID" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "zaktualizuj ustawienia procesu PID" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "zapisz ID procesu do PLIK" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "wyświetl te informacje z pomocą i wyjdź" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "wyświetl informacje o wersji i wyjdź" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "zapisz logi debugujące do PLIK" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Sposób użycia: %s [OPCJA] [PLIK]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "Łączenie PLIK(ów) lub wejścia standardowego, do wyjścia standardowego z " "monitoringiem." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Proszę przesyłać zgłoszenia błędów do %s" @@ -314,45 +322,45 @@ msgstr "nie udało się otworzyć urządzenia blokowego" msgid "failed to determine size of block device" msgstr "nie udało się ustalić rozmiaru urządzenia blokowego" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "nie udało się zaalokować struktur opcji" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "nie udało się zaalokować struktur opcji argv" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "oczekiwany argument typu liczby całkowitej" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "oczekiwany argument liczbowy" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "oczekiwany proces ID lub para PID:FD" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "niepoprawne ID procesu" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Spróbuj `%s --help' by uzyskać więcej informacji." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Spróbuj `%s -h' by uzyskać więcej informacji." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -360,23 +368,23 @@ msgstr "" "nie można użyć trybu zliczania linii lub opcji modyfikujących przesył " "łącznie z opcją obserwowania deskryptorów plików" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" "nie można użyć pozycjonowania kursora łącznie z opcją obserwowania " "deskryptorów plików" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "" "nie można użyć opcji zaktualizowania ustawień procesu łącznie z opcją " "obserwowania deskryptorów plików" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "nie można przesyłać plików z opcją obserwowania deskryptorów plików" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "niedostępne na systemach bez /proc/self/fdinfo" @@ -429,7 +437,7 @@ msgstr "yzafpnum kMGTPEZY" msgid "yzafpnum KMGTPEZY" msgstr "yzafpnum KMGTPEZY" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "nie udało się zaalokować bufora" @@ -513,7 +521,7 @@ msgstr "pid" msgid "history structure allocation failed" msgstr "nie udało się zaalokować struktury historii" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "nie udało się zaalokować listy plików" diff --git a/po/pt.po b/po/pt.po index eebf670..0334025 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -144,131 +144,139 @@ msgid "prefix visual information with NAME" msgstr "exibe NAME antes das demais informações" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 -msgid "output transfer statistics at the end" +msgid "also send progress to SPEC" msgstr "" #: src/main/help.c:318 +msgid "output transfer statistics at the end" +msgstr "" + +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "gera dados mesmo que a saída de erro seja redirecionada" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "utiliza caracteres de escape para posicionar o cursor" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "limita a transferência a RATE bytes por segundo" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "use um tamanho de buffer de BYTES" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "nunca use splice(), sempre use read/write" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "ignorar erros de leitura em entrada" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "parar após --size bytes terem sido transferidos" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "assistir arquivo FD aberto pelo processo PID" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "atualizar as configurações do processo PID" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "salvar ID do processo em FILE" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "exibe esta tela de ajuda e termina" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "exibe a versão e termina" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "Concatena ARQUIVO(s) ou a entrada padrão e grava na saída padrão, com " "monitoramento." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Por favor, reporte quaisquer defeitos para %s" @@ -305,45 +313,45 @@ msgstr "" msgid "failed to determine size of block device" msgstr "" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "erro na alocação da estrutura de opções" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "erro na alocação da estrutura de opções argv" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "argumento inteiro esperado" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "argumento numérico esperado" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "ID do processo ou par pid:fd esperado" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "ID de processo inválido" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Tente `%s --help' para maiores informações." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Tente `%s -h' para maiores informações." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -351,21 +359,21 @@ msgstr "" "não pode usar o modo de linha ou opções de modificador de transferência ao " "assistir os descritores de arquivo" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" "não pode usar o posicionamento do cursor ao observar os descritores de " "arquivo" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "não pode usar o controle remoto ao assistir os descritores de arquivo" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "não pode transferir arquivos ao assistir descritores de arquivo" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "não disponível em sistemas sem /proc/self/fdinfo" @@ -417,7 +425,7 @@ msgstr "" msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "erro alocando o buffer" @@ -500,7 +508,7 @@ msgstr "" msgid "history structure allocation failed" msgstr "" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "" diff --git a/po/ru.po b/po/ru.po index 36d56ef..c6a7060 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-22 18:07+0000\n" "Last-Translator: 0ko <0ko@users.noreply.translate.codeberg.org>\n" "Language-Team: Russian \n" @@ -142,130 +142,138 @@ msgid "prefix visual information with NAME" msgstr "писать ИМЯ до визуальной информации" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "после завершения показать статистику" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "вевести, даже если стд. ошибка не является терминалом" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "" "использовать символьные последовательности для позиционирования курсора" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "ФАЙЛ" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "направить вывод в ФАЙЛ вместо стд. вывода" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "СКОР" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "ограничить скорость передачи до СКОР байт/сек" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "БАЙТ" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "использовать буфер размера БАЙТ" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "использовать чтение/запись вместо splice()" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "пропустить ошибки чтения во вводе" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "пропускать ошибки в <БАЙТ> блоках за раз" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "остановить после передачи --size байт" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "сбрасывать кеш на диск каждый раз" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "использовать прямой ввод/вывод для обхода кеша" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "отбрасывать ввод вместо записи в вывод" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "записывать весь ввод в ФАЙЛ прежде, чем отправлять на вывод" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "ИДпр[:FD]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "следить за FD файла, открытого процессом ИДпр" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "ИДпр" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "обновить настройки ИДпр процесса" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "сохранить ИД процесса в ФАЙЛ" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "показать справку и завершить работу" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "показать версию программы и завершить работу" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "вести запись отладочного журнала в ФАЙЛ" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Использование: %s [ОПЦИИ] [ФАЙЛ]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Сообщайте о проблемах на: %s" @@ -302,63 +310,63 @@ msgstr "не удалось открыть блочное устройство" msgid "failed to determine size of block device" msgstr "не удалось определить размер блочного устройства" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "не удалось выделить память для структуры опций" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "не удалось выделить память для структуры опций argv" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "ожидалось целое число" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "ожидалось число" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "ожидался ИД процесса или пара ИДпр:ДФ" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "неправильный ИД процесса" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Выполните `%s --help' для получения подробностей." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Выполните `%s -h' для получения подробностей." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" msgstr "" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "удалённое управление невозможно при отслеживании дескрипторов файлов" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "передача файлов невозможна при отслеживании дескрипторов файлов" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "невозможно на системах без /proc/self/fdinfo" @@ -412,7 +420,7 @@ msgstr "" msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "не удалось выделить память для буфера" @@ -495,7 +503,7 @@ msgstr "ИДпр" msgid "history structure allocation failed" msgstr "не удалось выделить память для структуры истории" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "не удалось выделить память для списка файлов" diff --git a/po/tr.po b/po/tr.po index d38d9b6..62ce698 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: pv 1.8.14\n" "Report-Msgid-Bugs-To: pv@ivarch.com\n" -"POT-Creation-Date: 2024-12-13 19:54+0000\n" +"POT-Creation-Date: 2024-12-14 00:00+0000\n" "PO-Revision-Date: 2024-10-12 23:51+0000\n" "Last-Translator: a-j-wood \n" "Language-Team: Turkish \n" @@ -142,130 +142,138 @@ msgid "prefix visual information with NAME" msgstr "görsel bilgiyi İSİM ile öne ekle" #: src/main/help.c:311 -msgid "SPEC" +msgid "STYLE" msgstr "" #: src/main/help.c:312 -msgid "also send progress to SPEC" +msgid "set default bar style to NAME" +msgstr "" + +#: src/main/help.c:314 +msgid "SPEC" msgstr "" #: src/main/help.c:315 +msgid "also send progress to SPEC" +msgstr "" + +#: src/main/help.c:318 msgid "output transfer statistics at the end" msgstr "transfer istatistiklerini sonda göster" -#: src/main/help.c:318 +#: src/main/help.c:321 msgid "output even if standard error is not a terminal" msgstr "standart hata bir terminal olmasa bile çıktı yazdır" -#: src/main/help.c:321 +#: src/main/help.c:324 msgid "use cursor positioning escape sequences" msgstr "imleç konumlandırma kaçış dizilerini kullan" -#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366 -#: src/main/help.c:376 +#: src/main/help.c:327 src/main/help.c:357 src/main/help.c:369 +#: src/main/help.c:379 msgid "FILE" msgstr "DOSYA" -#: src/main/help.c:325 +#: src/main/help.c:328 msgid "write output to FILE instead of stdout" msgstr "çıktıyı stdout yerine DOSYA'ya yaz" -#: src/main/help.c:327 +#: src/main/help.c:330 msgid "RATE" msgstr "ORAN" -#: src/main/help.c:328 +#: src/main/help.c:331 msgid "limit transfer to RATE bytes per second" msgstr "aktarımı saniye başına ORAN bayt ile sınırlandırın" -#: src/main/help.c:330 src/main/help.c:339 +#: src/main/help.c:333 src/main/help.c:342 msgid "BYTES" msgstr "BAYTLAR" -#: src/main/help.c:331 +#: src/main/help.c:334 msgid "use a buffer size of BYTES" msgstr "BAYTLAR tampon boyutu kullanın" -#: src/main/help.c:334 +#: src/main/help.c:337 msgid "never use splice(), always use read/write" msgstr "splice() kullanma, her zaman read/write kullan" -#: src/main/help.c:337 +#: src/main/help.c:340 msgid "skip read errors in input" msgstr "girdideki okuma hatalarını atla" -#: src/main/help.c:340 +#: src/main/help.c:343 msgid "skip errors in BYTES blocks at a time" msgstr "BAYTLAR blokları halinde hataları atla" -#: src/main/help.c:343 +#: src/main/help.c:346 msgid "stop after --size bytes have been transferred" msgstr "--size bayt transfer edildikten sonra dur" -#: src/main/help.c:346 +#: src/main/help.c:349 msgid "flush cache to disk after every write" msgstr "her yazmadan sonra önbelleği diske boşalt" -#: src/main/help.c:349 +#: src/main/help.c:352 msgid "use direct I/O to bypass cache" msgstr "Önbelleği atlamak için doğrudan I/O kullan" -#: src/main/help.c:352 +#: src/main/help.c:355 msgid "discard input instead of writing to output" msgstr "Girdiyi çıktıya yazmak yerine yok say" -#: src/main/help.c:355 +#: src/main/help.c:358 msgid "write all input to FILE before writing to output" msgstr "çıktıya yazmadan önce tüm girdiyi DOSYA'ya yaz" -#: src/main/help.c:357 +#: src/main/help.c:360 msgid "PID[:FD]" msgstr "PID[:FD]" -#: src/main/help.c:358 +#: src/main/help.c:361 msgid "watch file FD opened by process PID" msgstr "FD izleme dosyası PID işlemi tarafından açıldı" -#: src/main/help.c:361 +#: src/main/help.c:364 msgid "PID" msgstr "PID" -#: src/main/help.c:362 +#: src/main/help.c:365 msgid "update settings of process PID" msgstr "süreç PID ayarlarını güncelle" -#: src/main/help.c:367 +#: src/main/help.c:370 msgid "save process ID in FILE" msgstr "FILE'da işlem kimliğini (ID) kaydet" -#: src/main/help.c:370 +#: src/main/help.c:373 msgid "show this help and exit" msgstr "bu yardımı göster ve çık" -#: src/main/help.c:373 +#: src/main/help.c:376 msgid "show version information and exit" msgstr "sürüm bilgilerini göster ve çık" -#: src/main/help.c:377 +#: src/main/help.c:380 msgid "write debug logs to FILE" msgstr "Hata ayıklama kayıtlarını DOSYA'ya yaz" -#: src/main/help.c:403 +#: src/main/help.c:406 #, c-format msgid "Usage: %s [OPTION] [FILE]..." msgstr "Kullanım şekli: %s [AYAR] [DOSYA]..." -#: src/main/help.c:414 +#: src/main/help.c:417 msgid "" "Concatenate FILE(s), or standard input, to standard output, with monitoring." msgstr "" "İzleme ile DOSYA(lar)ı veya standart girdiyi standart çıktı ile birleştirin." -#: src/main/help.c:552 +#: src/main/help.c:555 msgid "Supported format sequences:" msgstr "" -#: src/main/help.c:566 +#: src/main/help.c:569 #, c-format msgid "Please report any bugs to: %s" msgstr "Lütfen hataları şu adrese bildirin: %s" @@ -302,45 +310,45 @@ msgstr "blok aygıtı açılamadı" msgid "failed to determine size of block device" msgstr "blok aygıtının boyutu belirlenemedi" -#: src/main/options.c:344 +#: src/main/options.c:345 msgid "option structure allocation failed" msgstr "seçenek yapısı tahsisi başarısız oldu" -#: src/main/options.c:363 +#: src/main/options.c:364 msgid "option structure argv allocation failed" msgstr "seçenek yapısı argv tahsisi başarısız oldu" -#: src/main/options.c:416 +#: src/main/options.c:417 msgid "numeric value not understood" msgstr "" -#: src/main/options.c:435 +#: src/main/options.c:436 msgid "integer argument expected" msgstr "tamsayı bağımsız değişkeni bekleniyor" -#: src/main/options.c:447 +#: src/main/options.c:448 msgid "numeric argument expected" msgstr "sayısal bağımsız değişken bekleniyor" -#: src/main/options.c:458 +#: src/main/options.c:459 msgid "process ID or pid:fd pair expected" msgstr "süreç kimliği (ID) veya pid:fd çifti bekleniyor" -#: src/main/options.c:465 +#: src/main/options.c:466 msgid "invalid process ID" msgstr "geçersiz süreç kimliği (ID)" -#: src/main/options.c:690 +#: src/main/options.c:699 #, c-format msgid "Try `%s --help' for more information." msgstr "Daha fazla bilgi için `%s --help' seçeneğini deneyin." -#: src/main/options.c:692 +#: src/main/options.c:701 #, c-format msgid "Try `%s -h' for more information." msgstr "Daha fazla bilgi için `%s -h' seçeneğini deneyin." -#: src/main/options.c:723 +#: src/main/options.c:732 msgid "" "cannot use line mode or transfer modifier options when watching file " "descriptors" @@ -348,19 +356,19 @@ msgstr "" "dosya tanımlayıcılarını izlerken satır modu veya aktarım değiştirici " "seçeneklerini kullanamaz" -#: src/main/options.c:732 +#: src/main/options.c:741 msgid "cannot use cursor positioning when watching file descriptors" msgstr "dosya tanımlayıcılarını izlerken imleç konumlandırmayı kullanamaz" -#: src/main/options.c:741 +#: src/main/options.c:750 msgid "cannot use remote control when watching file descriptors" msgstr "dosya tanımlayıcılarını izlerken uzaktan kumandayı kullanamaz" -#: src/main/options.c:750 +#: src/main/options.c:759 msgid "cannot transfer files when watching file descriptors" msgstr "dosya tanımlayıcıları izlenirken dosya aktarılamıyor" -#: src/main/options.c:765 +#: src/main/options.c:774 msgid "not available on systems without /proc/self/fdinfo" msgstr "/proc/self/fdinfo olmayan sistemlerde kullanılamaz" @@ -413,7 +421,7 @@ msgstr "yzafpnum kMGTPEZY" msgid "yzafpnum KMGTPEZY" msgstr "yzafpnum KMGTPEZY" -#: src/pv/display.c:919 src/pv/transfer.c:1056 +#: src/pv/display.c:918 src/pv/transfer.c:1056 msgid "buffer allocation failed" msgstr "arabellek tahsisi başarısız oldu" @@ -496,7 +504,7 @@ msgstr "pid" msgid "history structure allocation failed" msgstr "geçmiş yapısı tahsisi başarısız oldu" -#: src/pv/state.c:576 src/pv/state.c:587 +#: src/pv/state.c:591 src/pv/state.c:602 msgid "file list allocation failed" msgstr "dosya listesi tahsisi başarısız oldu" diff --git a/src/include/options.h b/src/include/options.h index fa16d49..e3bd7d8 100644 --- a/src/include/options.h +++ b/src/include/options.h @@ -34,6 +34,7 @@ struct opts_s { /*@keep@*/ const char *program_name; /* name the program is running as */ /*@keep@*/ /*@null@*/ char *output; /* fd to write output to */ /*@keep@*/ /*@null@*/ char *name; /* display name, if any */ + /*@keep@*/ /*@null@*/ char *default_bar_style; /* default bar style */ /*@keep@*/ /*@null@*/ char *format; /* output format, if any */ /*@keep@*/ /*@null@*/ char *pidfile; /* PID file, if any */ /*@keep@*/ /*@null@*/ char *store_and_forward_file; /* store and forward file, if any */ diff --git a/src/include/pv-internal.h b/src/include/pv-internal.h index ba67206..9ad0062 100644 --- a/src/include/pv-internal.h +++ b/src/include/pv-internal.h @@ -154,6 +154,7 @@ struct pvstate_s { /*@only@*/ /*@null@*/ char *format_string; /* output format string */ /*@only@*/ /*@null@*/ char *extra_format_string; /* extra format string */ /*@null@*/ char *output_name; /* name of the output, for diagnostics */ + /*@null@*/ char *default_bar_style; /* which bar style to use by default */ off_t error_skip_block; /* skip block size, 0 for adaptive */ off_t rate_limit; /* rate limit, in bytes per second */ size_t target_buffer_size; /* buffer size (0=default) */ @@ -496,6 +497,7 @@ size_t pv_formatter_progress(pvformatter_args_t); size_t pv_formatter_progress_bar_only(pvformatter_args_t); size_t pv_formatter_progress_amount_only(pvformatter_args_t); size_t pv_formatter_bar_default(pvformatter_args_t); +size_t pv_formatter_bar_plain(pvformatter_args_t); size_t pv_formatter_bar_block(pvformatter_args_t); size_t pv_formatter_bar_granular(pvformatter_args_t); size_t pv_formatter_bar_shaded(pvformatter_args_t); diff --git a/src/include/pv.h b/src/include/pv.h index c21cdd3..2aea91a 100644 --- a/src/include/pv.h +++ b/src/include/pv.h @@ -225,6 +225,7 @@ extern void pv_state_interval_set(pvstate_t, double); extern void pv_state_width_set(pvstate_t, unsigned int, bool); extern void pv_state_height_set(pvstate_t, unsigned int, bool); extern void pv_state_name_set(pvstate_t, /*@null@*/ const char *); +extern void pv_state_default_bar_style_set(pvstate_t, /*@null@ */ const char *); extern void pv_state_format_string_set(pvstate_t, /*@null@*/ const char *); extern void pv_state_extra_display_set(pvstate_t, /*@null@*/ const char *); extern void pv_state_watch_pid_set(pvstate_t, pid_t); diff --git a/src/main/help.c b/src/main/help.c index cb741f6..91b65c1 100644 --- a/src/main/help.c +++ b/src/main/help.c @@ -308,6 +308,9 @@ void display_help(void) { "-N", "--name", N_("NAME"), N_("prefix visual information with NAME"), { 0, 0, 0, 0} }, + { "-u", "--bar-style", N_("STYLE"), + N_("set default bar style to NAME"), + { 0, 0, 0, 0} }, { "-x", "--extra-display", N_("SPEC"), N_("also send progress to SPEC"), { 0, 0, 0, 0} }, diff --git a/src/main/main.c b/src/main/main.c index 7fc653c..f0ee29b 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -502,6 +502,7 @@ int main(int argc, char **argv) pv_state_no_splice_set(state, opts->no_splice); pv_state_size_set(state, opts->size); pv_state_name_set(state, opts->name); + pv_state_default_bar_style_set(state, opts->default_bar_style); pv_state_format_string_set(state, opts->format); pv_state_extra_display_set(state, opts->extra_display); pv_state_watch_pid_set(state, opts->watch_pid); diff --git a/src/main/options.c b/src/main/options.c index fda3bc0..1647422 100644 --- a/src/main/options.c +++ b/src/main/options.c @@ -296,6 +296,7 @@ opts_t opts_parse(unsigned int argc, char **argv) { "width", 1, NULL, (int) 'w' }, { "height", 1, NULL, (int) 'H' }, { "name", 1, NULL, (int) 'N' }, + { "bar-style", 1, NULL, (int) 'u' }, { "format", 1, NULL, (int) 'F' }, { "extra-display", 1, NULL, (int) 'x' }, { "stats", 0, NULL, (int) 'v' }, @@ -322,7 +323,7 @@ opts_t opts_parse(unsigned int argc, char **argv) /*@+nullassign@ */ int option_index = 0; #endif /* HAVE_GETOPT_LONG */ - char *short_options = "hVpteIrab8kTA:fvnqcWD:s:gl0i:w:H:N:F:x:L:B:CEZ:SYKXU:R:P:d:m:o:" + char *short_options = "hVpteIrab8kTA:fvnqcWD:s:gl0i:w:H:N:u:F:x:L:B:CEZ:SYKXU:R:P:d:m:o:" #ifdef ENABLE_DEBUGGING "!:" #endif @@ -595,6 +596,14 @@ opts_t opts_parse(unsigned int argc, char **argv) return NULL; } break; + case 'u': + opts->default_bar_style = pv_strdup(optarg); + if (NULL == opts->default_bar_style) { + fprintf(stderr, "%s: -u: %s\n", opts->program_name, strerror(errno)); + opts_free(opts); + return NULL; + } + break; case 'L': opts->rate_limit = pv_getnum_size(optarg, opts->decimal_units); break; diff --git a/src/pv/display.c b/src/pv/display.c index 4bea8d9..96bd016 100644 --- a/src/pv/display.c +++ b/src/pv/display.c @@ -541,8 +541,7 @@ static bool pv__format_numeric(pvstate_t state, pvdisplay_t display) { "{progress}", &pv_formatter_progress, true }, { "{progress-amount-only}", &pv_formatter_progress_amount_only, false }, { "{progress-bar-only}", &pv_formatter_bar_default, true }, - { "{bar}", &pv_formatter_bar_default, true }, - { "{bar-default}", &pv_formatter_bar_default, true }, + { "{bar-plain}", &pv_formatter_bar_plain, true }, { "{bar-block}", &pv_formatter_bar_block, true }, { "{bar-granular}", &pv_formatter_bar_granular, true }, { "{bar-shaded}", &pv_formatter_bar_shaded, true }, diff --git a/src/pv/format/barstyle.c b/src/pv/format/barstyle.c index ade76df..f7b8450 100644 --- a/src/pv/format/barstyle.c +++ b/src/pv/format/barstyle.c @@ -20,8 +20,8 @@ /* - * Populate "style" with the named bar style, falling back to the default if - * the name was not recognised. Returns true if the named style was found. + * Populate "style" with the named bar style, falling back to plain if the + * name was not recognised. Returns true if the named style was found. * * Note that strings are copied into the structure, rather than just * updating pointers, to maintain separation of concern between different @@ -96,7 +96,7 @@ static bool pv_barstyle(pvformatter_args_t args, pvbarstyle_t style, const char return true; } - /* Default style. */ + /* Default plain style. */ style->style_id = 1; @@ -108,7 +108,7 @@ static bool pv_barstyle(pvformatter_args_t args, pvbarstyle_t style, const char style->filler_entries = 2; - if (0 == strcmp(name, "default")) + if (0 == strcmp(name, "plain")) return true; return false; @@ -134,7 +134,7 @@ int pv_display_barstyle_index(pvformatter_args_t args, const char *name) #ifdef ENABLE_DEBUGGING found = pv_barstyle(args, &style, name); if (!found) - debug("%s: %s", name, "bar style not found, using default"); + debug("%s: %s", name, "bar style not found, using plain"); #else (void) pv_barstyle(args, &style, name); #endif @@ -161,9 +161,24 @@ int pv_display_barstyle_index(pvformatter_args_t args, const char *name) size_t pv_formatter_bar_default(pvformatter_args_t args) +{ + if (0 == args->segment->parameter) { + const char *default_name; + default_name = args->state->control.default_bar_style; + /*@-branchstate@ */ + if (NULL == default_name) + default_name = "plain"; + /*@+branchstate@ */ + /* splint - it doesn't matter that default_name may be static */ + args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name); + } + return pv_formatter_progress_bar_only(args); +} + +size_t pv_formatter_bar_plain(pvformatter_args_t args) { if (0 == args->segment->parameter) - args->segment->parameter = 1 + pv_display_barstyle_index(args, "default"); + args->segment->parameter = 1 + pv_display_barstyle_index(args, "plain"); return pv_formatter_progress_bar_only(args); } diff --git a/src/pv/format/progressbar.c b/src/pv/format/progressbar.c index b21eecb..8b94ef2 100644 --- a/src/pv/format/progressbar.c +++ b/src/pv/format/progressbar.c @@ -297,8 +297,16 @@ size_t pv_formatter_progress(pvformatter_args_t args) content[0] = '\0'; - if (0 == args->segment->parameter) - args->segment->parameter = 1 + pv_display_barstyle_index(args, "default"); + if (0 == args->segment->parameter) { + const char *default_name; + default_name = args->state->control.default_bar_style; + /*@-branchstate@ */ + if (NULL == default_name) + default_name = "plain"; + /*@+branchstate@ */ + /* splint - it doesn't matter that default_name may be static */ + args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name); + } if (0 == args->buffer_size) return 0; @@ -327,8 +335,16 @@ size_t pv_formatter_progress_bar_only(pvformatter_args_t args) content[0] = '\0'; - if (0 == args->segment->parameter) - args->segment->parameter = 1 + pv_display_barstyle_index(args, "default"); + if (0 == args->segment->parameter) { + const char *default_name; + default_name = args->state->control.default_bar_style; + /*@-branchstate@ */ + if (NULL == default_name) + default_name = "plain"; + /*@+branchstate@ */ + /* splint - it doesn't matter that default_name may be static */ + args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name); + } if (0 == args->buffer_size) return 0; diff --git a/src/pv/state.c b/src/pv/state.c index 534dee4..051d95e 100644 --- a/src/pv/state.c +++ b/src/pv/state.c @@ -202,6 +202,11 @@ void pv_state_free(pvstate_t state) state->control.name = NULL; } + if (NULL != state->control.default_bar_style) { + free(state->control.default_bar_style); + state->control.default_bar_style = NULL; + } + if (NULL != state->control.format_string) { free(state->control.format_string); state->control.format_string = NULL; @@ -429,6 +434,16 @@ void pv_state_name_set(pvstate_t state, /*@null@ */ const char *val) state->control.name = pv_strdup(val); } +void pv_state_default_bar_style_set(pvstate_t state, /*@null@ */ const char *val) +{ + if (NULL != state->control.default_bar_style) { + free(state->control.default_bar_style); + state->control.default_bar_style = NULL; + } + if (NULL != val) + state->control.default_bar_style = pv_strdup(val); +} + void pv_state_format_string_set(pvstate_t state, /*@null@ */ const char *val) { if (NULL != state->control.format_string) {