textual: fix spellos and inconsistencies in several program messages

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

4 files changed, 22 insertions, 22 deletions

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 1d4e2d579..509fbbd63 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1660,7 +1660,7 @@ static int ui_script_read(struct cfdisk *cf)
 	errno = 0;
 	sc = fdisk_new_script_from_file(cf->cxt, buf);
 	if (!sc && errno)
-		ui_warn(_("Cannot open: %s"), buf);
+		ui_warn(_("Cannot open %s"), buf);
 	else if (!sc)
 		ui_warnx(_("Failed to parse script file %s"), buf);
 	else if (fdisk_apply_script(cf->cxt, sc) != 0)
@@ -1701,7 +1701,7 @@ static int ui_script_write(struct cfdisk *cf)
 	DBG(UI, ul_debug("writing dump into: '%s'", buf));
 	f = fopen(buf, "w");
 	if (!f) {
-		ui_warn(_("Cannot open: %s"), buf);
+		ui_warn(_("Cannot open %s"), buf);
 		rc = -errno;
 		goto done;
 	}
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
index 824eb48b8..c65b8b475 100644
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
@@ -104,13 +104,13 @@ void list_disklabel(struct fdisk_context *cxt)
 
 	itr = fdisk_new_iter(FDISK_ITER_FORWARD);
 	if (!itr) {
-		fdisk_warn(cxt, _("faild to allocate iterator"));
+		fdisk_warn(cxt, _("failed to allocate iterator"));
 		goto done;
 	}
 
 	out = scols_new_table();
 	if (!out) {
-		fdisk_warn(cxt, _("faild to allocate output table"));
+		fdisk_warn(cxt, _("failed to allocate output table"));
 		goto done;
 	}
 
@@ -151,7 +151,7 @@ void list_disklabel(struct fdisk_context *cxt)
 		struct libscols_line *ln = scols_table_new_line(out, NULL);
 
 		if (!ln) {
-			fdisk_warn(cxt, _("faild to allocate output line"));
+			fdisk_warn(cxt, _("failed to allocate output line"));
 			goto done;
 		}
 
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index a8af7b837..64e7ba144 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -459,7 +459,7 @@ static int script_read(struct fdisk_context *cxt)
 	errno = 0;
 	sc = fdisk_new_script_from_file(cxt, filename);
 	if (!sc && errno)
-		fdisk_warn(cxt, _("Cannot open: %s"), filename);
+		fdisk_warn(cxt, _("Cannot open %s"), filename);
 	else if (!sc)
 		fdisk_warnx(cxt, _("Failed to parse script file %s"), filename);
 	else if (fdisk_apply_script(cxt, sc) != 0)
@@ -491,13 +491,13 @@ static int script_write(struct fdisk_context *cxt)
 
 	rc = fdisk_script_read_context(sc, NULL);
 	if (rc) {
-		fdisk_warnx(cxt, _("Failed to read disk layout into script."));
+		fdisk_warnx(cxt, _("Failed to transform disk layout into script"));
 		goto done;
 	}
 
 	f = fopen(filename, "w");
 	if (!f) {
-		fdisk_warn(cxt, _("Cannot open: %s"), filename);
+		fdisk_warn(cxt, _("Cannot open %s"), filename);
 		goto done;
 	}
 
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 4142181d3..8cbb2bc18 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -304,7 +304,7 @@ static int write_changes(struct sfdisk *sf)
 	int rc = 0;
 
 	if (sf->noact)
-		fdisk_info(sf->cxt, _("The partition table unchanged (--no-act)."));
+		fdisk_info(sf->cxt, _("The partition table is unchanged (--no-act)."));
 	else {
 		rc = fdisk_write_disklabel(sf->cxt);
 		if (!rc) {
@@ -380,7 +380,7 @@ static int verify_device(struct sfdisk *sf, const char *devname)
 	fdisk_enable_listonly(sf->cxt, 1);
 
 	if (fdisk_assign_device(sf->cxt, devname, 1)) {
-		warn(_("cannot open: %s"), devname);
+		warn(_("cannot open %s"), devname);
 		return 1;
 	}
 
@@ -436,7 +436,7 @@ static int get_size(const char *dev, int silent, uintmax_t *sz)
 	fd = open(dev, O_RDONLY);
 	if (fd < 0) {
 		if (!silent)
-			warn(_("cannot open: %s"), dev);
+			warn(_("cannot open %s"), dev);
 		return -errno;
 	}
 
@@ -490,7 +490,7 @@ static int print_geom(struct sfdisk *sf, const char *devname)
 	fdisk_enable_listonly(sf->cxt, 1);
 
 	if (fdisk_assign_device(sf->cxt, devname, 1)) {
-		warn(_("cannot open: %s"), devname);
+		warn(_("cannot open %s"), devname);
 		return 1;
 	}
 
@@ -656,10 +656,10 @@ static void assign_device_partition(struct sfdisk *sf,
 
 	n = fdisk_get_npartitions(sf->cxt);
 	if (partno > n)
-		errx(EXIT_FAILURE, _("%s: partition %zu: partition table contains %zu "
-				     "partitions only."), devname, partno, n);
+		errx(EXIT_FAILURE, _("%s: partition %zu: partition table contains "
+				     "only %zu partitions"), devname, partno, n);
 	if (!fdisk_is_partition_used(sf->cxt, partno - 1))
-		errx(EXIT_FAILURE, _("%s: partition %zu: partition unnused"),
+		errx(EXIT_FAILURE, _("%s: partition %zu: partition is unused"),
 				devname, partno);
 }
 
@@ -1111,14 +1111,14 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
 	if (partno >= 0) {
 		size_t n;
 		if (!fdisk_has_label(sf->cxt))
-			errx(EXIT_FAILURE, _("%s: cannot modify partition %d, "
-					     "not found partition table."),
+			errx(EXIT_FAILURE, _("%s: cannot modify partition %d: "
+					     "no partition table was found"),
 					devname, partno);
 		n = fdisk_get_npartitions(sf->cxt);
 		if ((size_t) partno > n)
-			errx(EXIT_FAILURE, _("%s: cannot modify partition %d, "
-					     "partition table contains %zu "
-					     "partitions only."),
+			errx(EXIT_FAILURE, _("%s: cannot modify partition %d: "
+					     "partition table contains only %zu "
+					     "partitions"),
 					devname, partno, n);
 		created = 1;
 		next_partno = partno;
@@ -1234,7 +1234,7 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv)
 
 			if (!fdisk_partition_has_start(pa) &&
 			    !fdisk_partition_start_is_default(pa)) {
-				fdisk_info(sf->cxt, _("Ignore partition %zu"), next_partno + 1);
+				fdisk_info(sf->cxt, _("Ignoring partition %zu."), next_partno + 1);
 				continue;
 			}
 			if (!created) {		/* create a new disklabel */
@@ -1490,7 +1490,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'u':
 			if (*optarg != 'S')
-				errx(EXIT_FAILURE, _("unssupported unit '%c'"), *optarg);
+				errx(EXIT_FAILURE, _("unsupported unit '%c'"), *optarg);
 			break;
 		case 'v':
 			printf(_("%s from %s\n"), program_invocation_short_name,