From: Lauri Nurmi <lanurmi@iki.fi>
Date: Sat, 26 Jul 2014 09:43:42 +0000 (+0300)
Subject: more: replace ad-hoc support for plurals with gettext plurals.
X-Git-Tag: v2.26-rc1~583
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140d91471dde15d583f45ca704a32b4c192618a5;p=thirdparty%2Futil-linux.git

more: replace ad-hoc support for plurals with gettext plurals.
---

diff --git a/text-utils/more.c b/text-utils/more.c
index d05e9467cb..a489953b55 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -1232,10 +1232,9 @@ int command(char *filename, register FILE *f)
 				putchar('\n');
 				if (clreol)
 					cleareol();
-				if (nlines != 1)
-					printf(_("...back %d pages"), nlines);
-				else
-					putsout(_("...back 1 page"));
+				printf(P_("...back %d page",
+					"...back %d pages", nlines),
+					nlines);
 				if (clreol)
 					cleareol();
 				putchar('\n');
@@ -1281,10 +1280,9 @@ int command(char *filename, register FILE *f)
 			putchar('\n');
 			if (clreol)
 				cleareol();
-			if (nlines == 1)
-				putsout(_("...skipping one line"));
-			else
-				printf(_("...skipping %d lines"), nlines);
+			printf(P_("...skipping %d line",
+				"...skipping %d lines", nlines),
+				nlines);
 
 			if (clreol)
 				cleareol();