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 d842b8138bfaad60ebc6c41effb44f67b80c20bc..d24680a1ca89121476fdfe21eef09fff4e0e3df4 100644 (file)
--- 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 f8216bba9ace8b6f586fca36fd8f6080c5e04af7..50f3d412ab6113f5ddbae190ed2e1167c7cd3519 100644 (file)
--- 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 3ea06e860c882fcc54078c06f344e6d9644bd612..91826bce1fca0274d9bf5624218c2ccee0d7319a 100644 (file)
--- 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;
        }