From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 10 Aug 2011 18:58:49 +0000 (+0200)
Subject: sfdisk: gettextize each warning as a whole
X-Git-Tag: v2.20-rc2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=850ca1a80849bab07b882b583f5a2e874a947457;p=thirdparty%2Futil-linux.git

sfdisk: gettextize each warning as a whole

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

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 6cd85a2d57..6ae0be4f8e 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -1243,8 +1243,8 @@ partitions_ok(struct disk_desc *z) {
 		q = p->ep;
 		if (p->start < q->start
 		    || p->start + p->size > q->start + q->size) {
-		    my_warn(_("Warning: partition %s "), PNO(p));
-		    my_warn(_("is not contained in partition %s\n"), PNO(q));
+		    my_warn(_("Warning: partition %s is not contained in "
+			      "partition %s\n"), PNO(p), PNO(q));
 		    return 0;
 		}
 	    }
@@ -1255,8 +1255,8 @@ partitions_ok(struct disk_desc *z) {
 	    for (q = p + 1; q < partitions + partno; q++)
 		if (q->size && !is_extended(q->p.sys_type))
 		    if (!((p->start > q->start) ? disj(q, p) : disj(p, q))) {
-			my_warn(_("Warning: partitions %s "), PNO(p));
-			my_warn(_("and %s overlap\n"), PNO(q));
+			my_warn(_("Warning: partitions %s and %s overlap\n"),
+				PNO(p), PNO(q));
 			return 0;
 		    }