textual: fix some typos and inconsistencies in various messages
Fixing plain typos, miswordings, inconsistent periods, some missing angular brackets, and a proper pluralization (even when it involves a constant, because for some languages the precise value matters). Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
parent
a3c74d88e1
commit
09af3db48e
|
@ -1806,9 +1806,9 @@ static int main_menu_action(struct cfdisk *cf, int key)
|
|||
ref = 1;
|
||||
|
||||
if (t && fdisk_set_partition_type(cf->cxt, n, t) == 0)
|
||||
info = _("Changed type of the partition %zu.");
|
||||
info = _("Changed type of partition %zu.");
|
||||
else
|
||||
info = _("Type of the partition %zu is unchanged.");
|
||||
info = _("The type of partition %zu is unchanged.");
|
||||
break;
|
||||
}
|
||||
case 's': /* fix order */
|
||||
|
@ -1830,7 +1830,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
|
|||
rc = ui_get_string(cf,
|
||||
_("Are you sure you want to write the partition "
|
||||
"table to disk? "),
|
||||
_("Type \"yes\" or \"no\" or press ESC to left dialog."),
|
||||
_("Type \"yes\" or \"no\", or press ESC to leave this dialog."),
|
||||
buf, sizeof(buf));
|
||||
|
||||
ref = 1;
|
||||
|
|
|
@ -958,7 +958,7 @@ int main(int argc, char **argv)
|
|||
|
||||
} else if (fdisk_is_disklabel(cxt, GPT) && fdisk_gpt_is_hybrid(cxt))
|
||||
fdisk_warnx(cxt, _(
|
||||
"The hybrid GPT detected. You have to sync "
|
||||
"A hybrid GPT was detected. You have to sync "
|
||||
"the hybrid MBR manually (expert command 'M')."));
|
||||
|
||||
while (1)
|
||||
|
|
|
@ -105,7 +105,7 @@ static void __attribute__((__noreturn__)) usage(int status)
|
|||
|
||||
fputs(USAGE_HEADER, stream);
|
||||
fprintf(stream,
|
||||
_(" %s [options] file\n"), program_invocation_short_name);
|
||||
_(" %s [options] <file>\n"), program_invocation_short_name);
|
||||
fputs(USAGE_OPTIONS, stream);
|
||||
fputs(_(" -a for compatibility only, ignored\n"), stream);
|
||||
fputs(_(" -v, --verbose be more verbose\n"), stream);
|
||||
|
|
|
@ -797,7 +797,7 @@ int fdisk_bsd_link_partition(struct fdisk_context *cxt)
|
|||
struct bsd_disklabel *d = self_disklabel(cxt);
|
||||
|
||||
if (!cxt->parent || !fdisk_is_disklabel(cxt->parent, DOS)) {
|
||||
fdisk_warnx(cxt, _("BSD label is not nested within a DOS partition"));
|
||||
fdisk_warnx(cxt, _("BSD label is not nested within a DOS partition."));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
@ -514,7 +514,7 @@ static int gpt_mknew_header(struct fdisk_context *cxt,
|
|||
header->size = cpu_to_le32(sizeof(struct gpt_header));
|
||||
|
||||
/*
|
||||
* 128 partitions is the default. It can go behond this, however,
|
||||
* 128 partitions are the default. It can go beyond that, but
|
||||
* we're creating a de facto header here, so no funny business.
|
||||
*/
|
||||
header->npartition_entries = cpu_to_le32(GPT_NPARTITIONS);
|
||||
|
@ -958,7 +958,7 @@ static uint32_t partition_start_after_end(struct gpt_header *header, struct gpt_
|
|||
}
|
||||
|
||||
/*
|
||||
* Check if partition e1 overlaps with partition e2
|
||||
* Check if partition e1 overlaps with partition e2.
|
||||
*/
|
||||
static inline int partition_overlap(struct gpt_entry *e1, struct gpt_entry *e2)
|
||||
{
|
||||
|
@ -971,7 +971,7 @@ static inline int partition_overlap(struct gpt_entry *e1, struct gpt_entry *e2)
|
|||
}
|
||||
|
||||
/*
|
||||
* Find any paritions that overlap.
|
||||
* Find any partitions that overlap.
|
||||
*/
|
||||
static uint32_t partition_check_overlaps(struct gpt_header *header, struct gpt_entry *e)
|
||||
{
|
||||
|
|
|
@ -140,7 +140,7 @@ int fdisk_sgi_create_info(struct fdisk_context *cxt)
|
|||
sgilabel->volume[0].num_bytes = cpu_to_be32(sizeof(struct sgi_info));
|
||||
strncpy((char *) sgilabel->volume[0].name, "sgilabel", 8);
|
||||
|
||||
fdisk_info(cxt, _("SGI info created on second sector"));
|
||||
fdisk_info(cxt, _("SGI info created on second sector."));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ static int save_new_data(struct finfo *pinfo);
|
|||
static void __attribute__((__noreturn__)) usage(FILE *fp)
|
||||
{
|
||||
fputs(USAGE_HEADER, fp);
|
||||
fprintf(fp, _(" %s [options] [username]\n"), program_invocation_short_name);
|
||||
fprintf(fp, _(" %s [options] [<username>]\n"), program_invocation_short_name);
|
||||
fputs(USAGE_OPTIONS, fp);
|
||||
fputs(_(" -f, --full-name <full-name> real name\n"), fp);
|
||||
fputs(_(" -o, --office <office> office number\n"), fp);
|
||||
|
|
|
@ -69,7 +69,7 @@ static int get_shell_list(char *shell);
|
|||
static void __attribute__((__noreturn__)) usage (FILE *fp)
|
||||
{
|
||||
fputs(USAGE_HEADER, fp);
|
||||
fprintf(fp, _(" %s [options] [username]\n"), program_invocation_short_name);
|
||||
fprintf(fp, _(" %s [options] [<username>]\n"), program_invocation_short_name);
|
||||
fputs(USAGE_OPTIONS, fp);
|
||||
fputs(_(" -s, --shell <shell> specify login shell\n"), fp);
|
||||
fputs(_(" -l, --list-shells print list of shells and exit\n"), fp);
|
||||
|
@ -112,7 +112,7 @@ int main(int argc, char **argv)
|
|||
|
||||
#ifndef HAVE_LIBUSER
|
||||
if (!(is_local(pw->pw_name)))
|
||||
errx(EXIT_FAILURE, _("can only change local entries."));
|
||||
errx(EXIT_FAILURE, _("can only change local entries"));
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBSELINUX
|
||||
|
|
|
@ -564,11 +564,11 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
|
|||
fputs(_(" -R, --nohostname don't display the hostname field\n"), out);
|
||||
fputs(_(" -s, --since <time> display the lines since the specified time\n"), out);
|
||||
fputs(_(" -t, --until <time> display the lines until the specified time\n"), out);
|
||||
fputs(_(" -p, --present <time> display who where present at the specified time\n"), out);
|
||||
fputs(_(" -p, --present <time> display who were present at the specified time\n"), out);
|
||||
fputs(_(" -w, --fullnames display full user and domain names\n"), out);
|
||||
fputs(_(" -x, --system display system shutdown entries and run level changes\n"), out);
|
||||
fputs(_(" --time-format <format> show time stamp using format:\n"), out);
|
||||
fputs(_(" [notime|short|full|iso]\n"), out);
|
||||
fputs(_(" --time-format <format> show timestamps in the specified <format>:\n"
|
||||
" notime|short|full|iso\n"), out);
|
||||
|
||||
fputs(USAGE_SEPARATOR, out);
|
||||
fputs(USAGE_HELP, out);
|
||||
|
|
|
@ -1187,7 +1187,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
|
|||
fputs(_(" -a, --acc-expiration display info about passwords expiration\n"), out);
|
||||
fputs(_(" -c, --colon-separate display data in a format similar to /etc/passwd\n"), out);
|
||||
fputs(_(" -e, --export display in an export-able output format\n"), out);
|
||||
fputs(_(" -f, --failed display data about the last users' failed logins\n"), out);
|
||||
fputs(_(" -f, --failed display data about the users' last failed logins\n"), out);
|
||||
fputs(_(" -G, --groups-info display information about groups\n"), out);
|
||||
fputs(_(" -g, --groups=<groups> display users belonging to a group in <groups>\n"), out);
|
||||
fputs(_(" -L, --last show info about the users' last login sessions\n"), out);
|
||||
|
|
|
@ -857,7 +857,7 @@ su_main (int argc, char **argv, int mode)
|
|||
}
|
||||
|
||||
if (simulate_login && !change_environment) {
|
||||
warnx(_("ignore --preserve-environment, it's mutually exclusive to --login."));
|
||||
warnx(_("ignoring --preserve-environment, it's mutually exclusive with --login"));
|
||||
change_environment = true;
|
||||
}
|
||||
|
||||
|
@ -869,10 +869,10 @@ su_main (int argc, char **argv, int mode)
|
|||
if (shell || fast_startup || command || simulate_login) {
|
||||
errx(EXIT_FAILURE,
|
||||
_("options --{shell,fast,command,session-command,login} and "
|
||||
"--user are mutually exclusive."));
|
||||
"--user are mutually exclusive"));
|
||||
}
|
||||
if (optind == argc)
|
||||
errx(EXIT_FAILURE, _("COMMAND not specified."));
|
||||
errx(EXIT_FAILURE, _("no command was specified"));
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -509,7 +509,7 @@ int main(int argc, char **argv)
|
|||
|
||||
if (!found) {
|
||||
nerrs++, ct++;
|
||||
warnx(_("cannot find process \"%s\"."), ctl.arg);
|
||||
warnx(_("cannot find process \"%s\""), ctl.arg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -130,7 +130,7 @@ static int pencode(char *s)
|
|||
*s = '\0';
|
||||
fac = decode(save, facilitynames);
|
||||
if (fac < 0)
|
||||
errx(EXIT_FAILURE, _("unknown facility name: %s."), save);
|
||||
errx(EXIT_FAILURE, _("unknown facility name: %s"), save);
|
||||
*s++ = '.';
|
||||
}
|
||||
else {
|
||||
|
@ -139,7 +139,7 @@ static int pencode(char *s)
|
|||
}
|
||||
lev = decode(s, prioritynames);
|
||||
if (lev < 0)
|
||||
errx(EXIT_FAILURE, _("unknown priority name: %s."), save);
|
||||
errx(EXIT_FAILURE, _("unknown priority name: %s"), save);
|
||||
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
|
||||
}
|
||||
|
||||
|
|
|
@ -174,7 +174,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
|
||||
if (ctl.maxsz && ctl.nfiles == 0)
|
||||
warnx(_("--max-size ignored when used without --file."));
|
||||
warnx(_("--max-size ignored when used without --file"));
|
||||
|
||||
randomness_from_files(&ctl);
|
||||
free(ctl.files);
|
||||
|
@ -182,8 +182,9 @@ int main(int argc, char **argv)
|
|||
random_get_bytes(&buf, RAND_BYTES);
|
||||
MD5Update(&ctl.ctx, buf, RAND_BYTES);
|
||||
if (ctl.verbose)
|
||||
fprintf(stderr, _("Got %d bytes from %s\n"), RAND_BYTES,
|
||||
random_tell_source());
|
||||
fprintf(stderr, P_("Got %zu byte from %s\n",
|
||||
"Got %zu bytes from %s\n", RAND_BYTES),
|
||||
RAND_BYTES, random_tell_source());
|
||||
|
||||
MD5Final(digest, &ctl.ctx);
|
||||
for (i = 0; i < MD5LENGTH; i++)
|
||||
|
|
|
@ -426,7 +426,7 @@ static void usage(int rc)
|
|||
|
||||
fputs(_("\nUsage:\n"), out);
|
||||
fprintf(out,
|
||||
_(" %s [options] pathname [pathname ...]\n"), p);
|
||||
_(" %s [options] <pathname>...\n"), p);
|
||||
|
||||
fputs(_("\nOptions:\n"), out);
|
||||
fputs(_(" -h, --help displays this help text\n"
|
||||
|
|
|
@ -114,11 +114,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
|
|||
{
|
||||
fputs(USAGE_HEADER, out);
|
||||
fprintf(out,
|
||||
_(" %s [options] expression replacement file...\n"),
|
||||
_(" %s [options] <expression> <replacement> <file>...\n"),
|
||||
program_invocation_short_name);
|
||||
fputs(USAGE_OPTIONS, out);
|
||||
fputs(_(" -v, --verbose explain what is being done\n"), out);
|
||||
fputs(_(" -s, --symlink act on symlink target\n"), out);
|
||||
fputs(_(" -s, --symlink act on the target of symlinks\n"), out);
|
||||
fputs(USAGE_SEPARATOR, out);
|
||||
fputs(USAGE_HELP, out);
|
||||
fputs(USAGE_VERSION, out);
|
||||
|
|
|
@ -165,7 +165,7 @@ static const char *srcdirs[] = {
|
|||
static void __attribute__((__noreturn__)) usage(FILE *out)
|
||||
{
|
||||
fputs(USAGE_HEADER, out);
|
||||
fprintf(out, _(" %s [options] file\n"), program_invocation_short_name);
|
||||
fprintf(out, _(" %s [options] <file>\n"), program_invocation_short_name);
|
||||
|
||||
fputs(USAGE_OPTIONS, out);
|
||||
fputs(_(" -b search only for binaries\n"), out);
|
||||
|
|
|
@ -408,8 +408,8 @@ do_wipe(struct wipe_desc *wp, const char *devname, int flags)
|
|||
if (!(flags & WP_FL_FORCE)
|
||||
&& wp->is_parttable
|
||||
&& !blkid_probe_is_wholedisk(pr)) {
|
||||
warnx(_("%s: ignore nested \"%s\" partition "
|
||||
"table on non-whole disk device."), devname, wp->type);
|
||||
warnx(_("%s: ignoring nested \"%s\" partition table "
|
||||
"on non-whole disk device"), devname, wp->type);
|
||||
need_force = 1;
|
||||
continue;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue