ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

textual: change spelling of "disk label" to the more abundant "disklabel" 

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
Benno Schulenberg 2013-10-03 21:40:04 +02:00 committed by Karel Zak
parent cfa5f791bf
commit fd56121ac3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdisks/fdisk-menu.c
View File

@ -413,7 +413,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
case 'w':
rc = fdisk_write_disklabel(cxt);
if (rc)
err(EXIT_FAILURE, _("failed to write disk label"));
err(EXIT_FAILURE, _("failed to write disklabel"));
if (cxt->parent)
break; /* nested PT, don't leave */
fdisk_info(cxt, _("The partition table has been altered."));
@ -486,7 +486,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
if (cxt->parent) {
*cxt0 = cxt->parent;
fdisk_info(cxt, _("Leaving nested disk label."));
fdisk_info(cxt, _("Leaving nested disklabel."));
fdisk_free_context(cxt);
cxt = *cxt0;
}
@ -569,7 +569,7 @@ static int dos_menu_cb(struct fdisk_context **cxt0,
fdisk_free_context(bsd);
else {
*cxt0 = cxt = bsd;
fdisk_info(cxt, _("Entering to nested BSD disk label"));
fdisk_info(cxt, _("Entering nested BSD disklabel"));
}
break;
}

2
fdisks/fdisk.c
View File

@ -220,7 +220,7 @@ void list_disk_geometry(struct fdisk_context *cxt)
fdisk_colon(cxt, _("Alignment offset: %lu bytes"),
cxt->alignment_offset);
if (fdisk_dev_has_disklabel(cxt))
fdisk_colon(cxt, _("Disk label type: %s"), cxt->label->name);
fdisk_colon(cxt, _("Disklabel type: %s"), cxt->label->name);
if (fdisk_get_disklabel_id(cxt, &id) == 0 && id)
fdisk_colon(cxt, _("Disk identifier: %s"), id);

2
libfdisk/src/bsd.c
View File

@ -576,7 +576,7 @@ int fdisk_bsd_write_bootstrap(struct fdisk_context *cxt)
for (p = dp; p < dp + sizeof(struct bsd_disklabel); p++) {
if (!*p)
continue;
fdisk_warnx(cxt, _("Bootstrap overlaps with disk label!"));
fdisk_warnx(cxt, _("Bootstrap overlaps with disklabel!"));
return -EINVAL;
}