From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 5 Oct 2013 08:43:40 +0000 (+0200)
Subject: libfdisk/sgi: properly pluralize three messages
X-Git-Tag: v2.24-rc2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0b289aa115421702a68da0b9ae84b1d63e9d48a;p=thirdparty%2Futil-linux.git

libfdisk/sgi: properly pluralize three messages

Reported-by: Petr Písař <petr.pisar@atlas.cz>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index d2e8778329..43adea2cad 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -417,8 +417,10 @@ static int sgi_check_bootfile(struct fdisk_context *cxt, const char *name)
 		return -EINVAL;
 
 	} else if (sz > sizeof(sgilabel->boot_file)) {
-		fdisk_warnx(cxt, _("Name of Bootfile too long: %zu bytes maximum."),
-				sizeof(sgilabel->boot_file));
+		fdisk_warnx(cxt, P_("Name of bootfile is too long: %zu byte maximum.",
+				    "Name of bootfile is too long: %zu bytes maximum.",
+				    sizeof(sgilabel->boot_file)),
+			    sizeof(sgilabel->boot_file));
 		return -EINVAL;
 
 	} else if (*name != '/') {
@@ -656,19 +658,23 @@ static int verify_disklabel(struct fdisk_context *cxt, int verbose)
 			continue;
 		if (start > sgi_get_start_sector(cxt, Index[i])) {
 			if (verbose)
-				fdisk_info(cxt, _("The Partition %d and %d overlap "
-					  "by %d sectors."),
-				       Index[i-1]+1, Index[i]+1,
-				       start - sgi_get_start_sector(cxt, Index[i]));
+				fdisk_info(cxt,
+					   P_("Partitions %d and %d overlap by %d sector.",
+					      "Partitions %d and %d overlap by %d sectors.",
+					      start - sgi_get_start_sector(cxt, Index[i])),
+					   Index[i-1]+1, Index[i]+1,
+					   start - sgi_get_start_sector(cxt, Index[i]));
 			if (gap >  0) gap = -gap;
 			if (gap == 0) gap = -1;
 		}
 		if (start < sgi_get_start_sector(cxt, Index[i])) {
 			if (verbose)
-				fdisk_info(cxt, _("Unused gap of %8u sectors "
-					    "- sectors %8u-%u"),
-				       sgi_get_start_sector(cxt, Index[i]) - start,
-				       start, sgi_get_start_sector(cxt, Index[i])-1);
+				fdisk_info(cxt,
+					   P_("Unused gap of %8u sector: sector %8u",
+					      "Unused gap of %8u sectors: sectors %8u-%u",
+					      sgi_get_start_sector(cxt, Index[i]) - start),
+					   sgi_get_start_sector(cxt, Index[i]) - start,
+					   start, sgi_get_start_sector(cxt, Index[i])-1);
 			gap += sgi_get_start_sector(cxt, Index[i]) - start;
 			add_to_freelist(cxt, start,
 					sgi_get_start_sector(cxt, Index[i]));
@@ -686,8 +692,10 @@ static int verify_disklabel(struct fdisk_context *cxt, int verbose)
 	}
 	if (start < lastblock) {
 		if (verbose)
-			fdisk_info(cxt, _("Unused gap of %8u sectors - sectors %8u-%u"),
-				lastblock - start, start, lastblock-1);
+			fdisk_info(cxt, P_("Unused gap of %8u sector: sector %8u",
+					   "Unused gap of %8u sectors: sectors %8u-%u",
+					   lastblock - start),
+				   lastblock - start, start, lastblock-1);
 		gap += lastblock - start;
 		add_to_freelist(cxt, start, lastblock);
 	}