From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 5 Oct 2013 21:19:55 +0000 (+0200)
Subject: wdctl: pluralize one thrice-repeated message
X-Git-Tag: v2.24-rc2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce0e6110b65cfb8047b586737173abd1d3443aad;p=thirdparty%2Futil-linux.git

wdctl: pluralize one thrice-repeated message

Also put in one hard space, to keep text and number separated when
the translated string should be too long.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c
index 71309188e7..c0953c9c8c 100644
--- a/sys-utils/wdctl.c
+++ b/sys-utils/wdctl.c
@@ -450,11 +450,14 @@ static void print_oneline(struct wdinfo *wd, uint32_t wanted,
 static void show_timeouts(struct wdinfo *wd)
 {
 	if (wd->has_timeout)
-		printf(_("%-15s%2i seconds\n"), _("Timeout:"), wd->timeout);
+		printf(P_("%-14s %2i second\n", "%-14s %2i seconds\n", wd->timeout),
+			  _("Timeout:"), wd->timeout);
 	if (wd->has_pretimeout)
-		printf(_("%-15s%2i seconds\n"), _("Pre-timeout:"), wd->pretimeout);
+		printf(P_("%-14s %2i second\n", "%-14s %2i seconds\n", wd->pretimeout),
+			  _("Pre-timeout:"), wd->pretimeout);
 	if (wd->has_timeleft)
-		printf(_("%-15s%2i seconds\n"), _("Timeleft:"), wd->timeleft);
+		printf(P_("%-14s %2i second\n", "%-14s %2i seconds\n", wd->timeleft),
+			  _("Timeleft:"), wd->timeleft);
 }
 
 int main(int argc, char *argv[])