fdisk, cfdisk, sfdisk: improve the grammar of three messages

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

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 010a196985ef78decea82d85072b734cf541f19f..3908e313672dca36d9989cc528f94691e5763ab9 100644 (file)
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2436,7 +2436,7 @@ static int ui_run(struct cfdisk *cf)
        DBG(UI, ul_debug("start cols=%zu, lines=%zu", ui_cols, ui_lines));
 
        if (fdisk_get_collision(cf->cxt)) {
-               ui_warnx(_("Device already contains %s signature, it will be removed by write command."),
+               ui_warnx(_("Device already contains a %s signature; it will be removed by a write command."),
                                fdisk_get_collision(cf->cxt));
                fdisk_enable_wipe(cf->cxt, 1);
                ui_hint(_("Press a key to continue."));

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 3f8769d95c823a3107ac7d03d0222f7f03acc208..c941e5b9695fe33a9bd77e1a8e0c1653e9dfa9d8 100644 (file)
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -974,7 +974,7 @@ int main(int argc, char **argv)
                if (fdisk_get_collision(cxt)) {
                        int dowipe = wipemode == WIPEMODE_ALWAYS ? 1 : 0;
 
-                       fdisk_warnx(cxt, _("%s: device already contains %s signature."),
+                       fdisk_warnx(cxt, _("Device %s already contains a %s signature."),
                                argv[optind], fdisk_get_collision(cxt));
 
                        if (isatty(STDIN_FILENO) && wipemode == WIPEMODE_AUTO)
@@ -983,7 +983,7 @@ int main(int argc, char **argv)
                        fdisk_enable_wipe(cxt, dowipe);
                        if (dowipe)
                                fdisk_warnx(cxt, _(
-                                       "The signature will be removed by write command."));
+                                       "The signature will be removed by a write command."));
                        else
                                fdisk_warnx(cxt, _(
                                        "It is strongly recommended to wipe the device with "

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index f1ddd9cb84de2a1a7a9d6d7a5c67a8f07c771563..15fa99c47d699f69d77508a7d24ad63d5565ead1 100644 (file)
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1537,7 +1537,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
        if (fdisk_get_collision(sf->cxt)) {
                int dowipe = sf->wipemode == WIPEMODE_ALWAYS ? 1 : 0;
 
-               fdisk_warnx(sf->cxt, _("%s: device already contains %s signature."),
+               fdisk_warnx(sf->cxt, _("Device %s already contains a %s signature."),
                        devname, fdisk_get_collision(sf->cxt));
 
                if (sf->interactive && sf->wipemode == WIPEMODE_AUTO)
@@ -1546,7 +1546,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
                fdisk_enable_wipe(sf->cxt, dowipe);
                if (dowipe)
                        fdisk_warnx(sf->cxt, _(
-                               "The signature will be removed by write command."));
+                               "The signature will be removed by a write command."));
                else
                        fdisk_warnx(sf->cxt, _(
                                "It is strongly recommended to wipe the device with "