]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
sfdisk: gettextize each warning as a whole
authorBenno Schulenberg <bensberg@justemail.net>
Wed, 10 Aug 2011 18:58:49 +0000 (20:58 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 15 Aug 2011 13:49:29 +0000 (15:49 +0200)
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
fdisk/sfdisk.c

index 6cd85a2d572bdb92bc36d6894199a3daf584da6f..6ae0be4f8e15c305c2261937b70214ad71fb34f0 100644 (file)
@@ -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;
                    }