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

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

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
Benno Schulenberg 2016-03-16 09:55:49 +01:00 committed by Karel Zak
parent 1a60a5ecb0
commit cb19f5479b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/cfdisk.c
View File

@ -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."));

4
disk-utils/fdisk.c
View File

@ -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 "

4
disk-utils/sfdisk.c
View File

@ -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 "