From: Craig Small Date: Tue, 12 May 2020 08:57:26 +0000 (+1000) Subject: vmstat: Add NEWS and revert comment from prev X-Git-Tag: v4.0.0~377 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48a201c46fc9d7cb845b82e8161cb8a801badd6b;p=procps-ng vmstat: Add NEWS and revert comment from prev Reverted the translation hint as the fields are used for both normal and wide modes, so need to fit the smaller of the two. Added NEWS item References: commit 01c1b2345ee952c28a9995c5766839f43f8e5ac9 --- diff --git a/NEWS b/NEWS index ede799a1..0f3146f9 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ procps-ng NEXT * sysctl: Document directory order Debian #951550 * top: ensure config file backward compatibility Debian #951335 * top: add command line 'e' for symmetry with 'E' issue #165 + * vmstat: Wide mode gives wider proc columns merge #48 procps-ng-3.3.16 ---------------- diff --git a/po/de.po b/po/de.po index 637c037b..a5ad7a6c 100644 --- a/po/de.po +++ b/po/de.po @@ -121,18 +121,18 @@ msgid "failed to parse count argument: '%s'" msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«" #: free.c:352 -#, c-format +#, fuzzy, c-format msgid "" -" total used free shared buffers " +" total used free shared buffers " "cache available" msgstr "" " gesamt benutzt frei gemeins. Puffer " "Cache verfügbar" #: free.c:354 -#, c-format +#, fuzzy, c-format msgid "" -" total used free shared buff/cache " +" total used free shared buff/cache " "available" msgstr "" " gesamt benutzt frei gemns. Puffer/Cache " diff --git a/po/fr.po b/po/fr.po index ca9a6899..ee156ffb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -137,18 +137,18 @@ msgid "failed to parse count argument: '%s'" msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »" #: free.c:352 -#, c-format +#, fuzzy, c-format msgid "" -" total used free shared buffers " +" total used free shared buffers " "cache available" msgstr "" " total utilisé libre partagé tampons " "cache disponible" #: free.c:354 -#, c-format +#, fuzzy, c-format msgid "" -" total used free shared buff/cache " +" total used free shared buff/cache " "available" msgstr "" " total utilisé libre partagé tamp/cache " diff --git a/vmstat.c b/vmstat.c index 0551a994..0134107c 100644 --- a/vmstat.c +++ b/vmstat.c @@ -260,9 +260,9 @@ static void new_header(void) printf( w_option ? wide_format : format, - /* Translation Hint: max 4 chars */ + /* Translation Hint: max 2 chars */ _("r"), - /* Translation Hint: max 4 chars */ + /* Translation Hint: max 2 chars */ _("b"), /* Translation Hint: max 6 chars */ _("swpd"),