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

Merge branch 'master' of https://github.com/yurchor/util-linux 

* 'master' of https://github.com/yurchor/util-linux:
  Fix minor typos
This commit is contained in:
Karel Zak 2017-06-02 11:13:39 +02:00
parent 6ef65081c5 0508f347c8
commit 7dec8dfeca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfdisk/src/gpt.c
View File

@ -2628,7 +2628,7 @@ int fdisk_gpt_set_npartitions(struct fdisk_context *cxt, uint32_t entries)
/* calculate the size (bytes) of the entries array */
rc = gpt_calculate_sizeof_ents(gpt->pheader, entries, &new_size);
if (rc) {
fdisk_warnx(cxt, _("The number of the partition has be smaller than %zu."),
fdisk_warnx(cxt, _("The number of the partition has to be smaller than %zu."),
UINT32_MAX / le32_to_cpu(gpt->pheader->sizeof_partition_entry));
return rc;
}

4
misc-utils/fincore.c
View File

@ -58,8 +58,8 @@ enum {
};
static struct colinfo infos[] = {
[COL_PAGES] = { "PAGES", 1, SCOLS_FL_RIGHT, N_("file data residend in memory in pages")},
[COL_RES] = { "RES", 5, SCOLS_FL_RIGHT, N_("file data residend in memory in bytes")},
[COL_PAGES] = { "PAGES", 1, SCOLS_FL_RIGHT, N_("file data resident in memory in pages")},
[COL_RES] = { "RES", 5, SCOLS_FL_RIGHT, N_("file data resident in memory in bytes")},
[COL_SIZE] = { "SIZE", 5, SCOLS_FL_RIGHT, N_("size of the file")},
[COL_FILE] = { "FILE", 4, 0, N_("file name")},
};

2
sys-utils/lsmem.c
View File

@ -376,7 +376,7 @@ static void __attribute__((__noreturn__)) lsmem_usage(FILE *out)
fputs(USAGE_OPTIONS, out);
fputs(_(" -J, --json use JSON output format\n"), out);
fputs(_(" -P, --pairs use key=\"value\" output format\n"), out);
fputs(_(" -a, --all list each individiual memory block\n"), out);
fputs(_(" -a, --all list each individual memory block\n"), out);
fputs(_(" -b, --bytes print SIZE in bytes rather than in human readable format\n"), out);
fputs(_(" -n, --noheadings don't print headings\n"), out);
fputs(_(" -o, --output <list> output columns\n"), out);