From a68d628adfa9256e085584cd55e929f482a2fad9 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 12 May 2020 18:57:26 +1000 Subject: [PATCH] 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 --- NEWS | 1 + po/de.po | 8 ++++---- po/fr.po | 8 ++++---- vmstat.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index a5b61e09..20bfb4b3 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 a4e21b75..f73be488 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 394299ca..a00115c3 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 f7314248..270c431d 100644 --- a/vmstat.c +++ b/vmstat.c @@ -213,9 +213,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"),