summaryrefslogtreecommitdiffstats
path: root/fdisk/sfdisk.c
diff options
context:
space:
mode:
authorBenno Schulenberg2011-08-10 20:58:49 +0200
committerKarel Zak2011-08-15 15:49:29 +0200
commit850ca1a80849bab07b882b583f5a2e874a947457 (patch)
tree2fb2fa42bea97dad40fa107546f7ca808bf44107 /fdisk/sfdisk.c
parentfdisksgilabel: correct the grammar of an error message (diff)
downloadkernel-qcow2-util-linux-850ca1a80849bab07b882b583f5a2e874a947457.tar.gz
kernel-qcow2-util-linux-850ca1a80849bab07b882b583f5a2e874a947457.tar.xz
kernel-qcow2-util-linux-850ca1a80849bab07b882b583f5a2e874a947457.zip
sfdisk: gettextize each warning as a whole
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Diffstat (limited to 'fdisk/sfdisk.c')
-rw-r--r--fdisk/sfdisk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index 6cd85a2d5..6ae0be4f8 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;
}