From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 3 Oct 2013 19:40:04 +0000 (+0200)
Subject: textual: change spelling of "disk label" to the more abundant "disklabel"
X-Git-Tag: v2.24-rc2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd56121ac3172de22c3b2fc0481ba21483ee7373;p=thirdparty%2Futil-linux.git

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

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

diff --git a/fdisks/fdisk-menu.c b/fdisks/fdisk-menu.c
index d842b8138b..d24680a1ca 100644
--- a/fdisks/fdisk-menu.c
+++ b/fdisks/fdisk-menu.c
@@ -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;
 		}
diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index f8216bba9a..50f3d412ab 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -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);
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index 3ea06e860c..91826bce1f 100644
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -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;
 	}