thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

textual: adjust grammar and punctuation of some messages

Browse source 
Also equalize three messages to one other one,
and fix a typo in USE_COLORS_BY_DEFAULT.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
Benno Schulenberg 2015-08-01 10:23:07 +02:00 • committed by Karel Zak
parent d3a1e3bfaa
commit 62eea9ce12
8 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
disk-utils/cfdisk.c
View file

@ -2469,7 +2469,7 @@ static int ui_run(struct cfdisk *cf)
ui_draw_extra(cf); ui_draw_extra(cf);
if (fdisk_is_readonly(cf->cxt)) if (fdisk_is_readonly(cf->cxt))
ui_warnx(_("Device open in read-only mode.")); ui_warnx(_("Device is open in read-only mode."));
else if (cf->wrong_order) else if (cf->wrong_order)
ui_info(_("Note that partition table entries are not in disk order now.")); ui_info(_("Note that partition table entries are not in disk order now."));

2
disk-utils/fdisk-menu.c
View file

@ -535,7 +535,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,
break; break;
case 'w': case 'w':
if (fdisk_is_readonly(cxt)) { if (fdisk_is_readonly(cxt)) {
fdisk_warnx(cxt, _("Device open in read-only mode.")); fdisk_warnx(cxt, _("Device is open in read-only mode."));
break; break;
} }
rc = fdisk_write_disklabel(cxt); rc = fdisk_write_disklabel(cxt);

2
disk-utils/fdisk.c
View file

@ -950,7 +950,7 @@ int main(int argc, char **argv)
if (rc == -EACCES) { if (rc == -EACCES) {
rc = fdisk_assign_device(cxt, argv[optind], 1); rc = fdisk_assign_device(cxt, argv[optind], 1);
if (rc == 0) if (rc == 0)
fdisk_warnx(cxt, _("Device open in read-only mode.")); fdisk_warnx(cxt, _("Device is open in read-only mode."));
} }
if (rc) if (rc)
err(EXIT_FAILURE, _("cannot open %s"), argv[optind]); err(EXIT_FAILURE, _("cannot open %s"), argv[optind]);

6
disk-utils/fsck.c
View file

@ -1523,10 +1523,10 @@ static void parse_argv(int argc, char *argv[])
case 'r': case 'r':
report_stats = 1; report_stats = 1;
if (arg[j+1]) { /* -r<fd> */ if (arg[j+1]) { /* -r<fd> */
report_stats_fd = strtou32_or_err(arg+j+1, _("invalid argument -r")); report_stats_fd = strtou32_or_err(arg+j+1, _("invalid argument of -r"));
goto next_arg; goto next_arg;
} else if (i+1 < argc && *argv[i+1] >= '0' && *argv[i+1] <= '9') { /* -r <fd> */ } else if (i+1 < argc && *argv[i+1] >= '0' && *argv[i+1] <= '9') { /* -r <fd> */
report_stats_fd = strtou32_or_err(argv[i+1], _("invalid argument -r")); report_stats_fd = strtou32_or_err(argv[i+1], _("invalid argument of -r"));
++i; ++i;
goto next_arg; goto next_arg;
} }
@ -1574,7 +1574,7 @@ static void parse_argv(int argc, char *argv[])
report_stats_file = fdopen(report_stats_fd, "w"); report_stats_file = fdopen(report_stats_fd, "w");
if (!report_stats_file) if (!report_stats_file)
err(FSCK_EX_ERROR, err(FSCK_EX_ERROR,
_("invalid argument -r %d"), _("invalid argument of -r: %d"),
report_stats_fd); report_stats_fd);
} }

28
disk-utils/sfdisk.c
View file

@ -698,7 +698,7 @@ static void assign_device_partition(struct sfdisk *sf,
lb = fdisk_get_label(sf->cxt, NULL); lb = fdisk_get_label(sf->cxt, NULL);
if (!lb) if (!lb)
errx(EXIT_FAILURE, _("%s: not found partition table."), devname); errx(EXIT_FAILURE, _("%s: no partition table found"), devname);
n = fdisk_get_npartitions(sf->cxt); n = fdisk_get_npartitions(sf->cxt);
if (partno > n) if (partno > n)
@ -980,10 +980,10 @@ static void command_fdisk_help(void)
fputs(_(" write write table to disk and exit\n"), stdout); fputs(_(" write write table to disk and exit\n"), stdout);
fputs(_(" quit show new situation and wait for user's feedback before write\n"), stdout); fputs(_(" quit show new situation and wait for user's feedback before write\n"), stdout);
fputs(_(" abort exit sfdisk shell\n"), stdout); fputs(_(" abort exit sfdisk shell\n"), stdout);
fputs(_(" print print partition table.\n"), stdout); fputs(_(" print display the partition table\n"), stdout);
fputs(_(" help this help.\n"), stdout); fputs(_(" help show this help text\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
fputs(_(" CTRL-D the same like 'quit' command\n"), stdout); fputs(_(" Ctrl-D the same as 'quit'\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
color_scheme_enable("help-title", UL_COLOR_BOLD); color_scheme_enable("help-title", UL_COLOR_BOLD);
@ -992,28 +992,28 @@ static void command_fdisk_help(void)
fputs(_(" <start>, <size>, <type>, <bootable>\n"), stdout); fputs(_(" <start>, <size>, <type>, <bootable>\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
fputs(_(" <start> begin of the partition in sectors or bytes if specified\n" fputs(_(" <start> Beginning of the partition in sectors, or bytes if\n"
" in format <number>{K,M,G,T,P,E,Z,Y}. The default is\n" " specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
" the first free space.\n"), stdout); " The default is the first free space.\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
fputs(_(" <size> size of the partition in sectors if specified in format\n" fputs(_(" <size> Size of the partition in sectors, or bytes if\n"
" <number>{K,M,G,T,P,E,Z,Y} then it's interpreted as size\n" " specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
" in bytes. The default is all available space.\n"), stdout); " The default is all available space.\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
fputs(_(" <type> partition type. The default is Linux data partition.\n"), stdout); fputs(_(" <type> The partition type. Default is a Linux data partition.\n"), stdout);
fputs(_(" MBR: hex or L,S,E,X shortcuts.\n"), stdout); fputs(_(" MBR: hex or L,S,E,X shortcuts.\n"), stdout);
fputs(_(" GPT: uuid or L,S,H shortcuts.\n"), stdout); fputs(_(" GPT: UUID or L,S,H shortcuts.\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
fputs(_(" <bootable> '*' to mark MBR partition as bootable. \n"), stdout); fputs(_(" <bootable> Use '*' to mark an MBR partition as bootable.\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
color_scheme_enable("help-title", UL_COLOR_BOLD); color_scheme_enable("help-title", UL_COLOR_BOLD);
fputs(_(" Example:\n"), stdout); fputs(_(" Example:\n"), stdout);
color_disable(); color_disable();
fputs(_(" , 4G creates 4GiB partition on default start offset.\n"), stdout); fputs(_(" , 4G Creates a 4GiB partition at default start offset.\n"), stdout);
fputc('\n', stdout); fputc('\n', stdout);
} }

6
include/colors.h
View file

@ -23,10 +23,10 @@ enum colortmode {
__UL_NCOLORMODES /* last */ __UL_NCOLORMODES /* last */
}; };
#ifdef USE_COLORS_BY_DEFAUL #ifdef USE_COLORS_BY_DEFAULT
# define USAGE_COLORS_DEFAULT N_("colors enabled by default") # define USAGE_COLORS_DEFAULT N_("colors are enabled by default")
#else #else
# define USAGE_COLORS_DEFAULT N_("colors disabled by default") # define USAGE_COLORS_DEFAULT N_("colors are disabled by default")
#endif #endif
extern int colormode_from_string(const char *str); extern int colormode_from_string(const char *str);

2
sys-utils/flock.c
View file

@ -250,7 +250,7 @@ int main(int argc, char *argv[])
block = LOCK_NB; block = LOCK_NB;
} else } else
if (setup_timer(&t_id, &timeout, &timeout_handler)) if (setup_timer(&t_id, &timeout, &timeout_handler))
err(EX_OSERR, _("cannot not setup timer")); err(EX_OSERR, _("cannot set up timer"));
} }
if (verbose) if (verbose)

10
sys-utils/lsipc.c
View file

@ -294,15 +294,15 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++) for (i = COLDESC_IDX_GEN_FIRST; i <= COLDESC_IDX_GEN_LAST; i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, _("\nShared memory columns (--shmems):\n")); fprintf(out, _("\nShared-memory columns (--shmems):\n"));
for (i = COLDESC_IDX_SHM_FIRST; i <= COLDESC_IDX_SHM_LAST; i++) for (i = COLDESC_IDX_SHM_FIRST; i <= COLDESC_IDX_SHM_LAST; i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, _("\nMessages queues columns (--queues):\n")); fprintf(out, _("\nMessage-queue columns (--queues):\n"));
for (i = COLDESC_IDX_MSG_FIRST; i <= COLDESC_IDX_MSG_LAST; i++) for (i = COLDESC_IDX_MSG_FIRST; i <= COLDESC_IDX_MSG_LAST; i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
fprintf(out, _("\nSemaphores columns (--semaphores):\n")); fprintf(out, _("\nSemaphore columns (--semaphores):\n"));
for (i = COLDESC_IDX_SEM_FIRST; i <= COLDESC_IDX_SEM_LAST; i++) for (i = COLDESC_IDX_SEM_FIRST; i <= COLDESC_IDX_SEM_LAST; i++)
fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help)); fprintf(out, " %14s %s\n", coldescs[i].name, _(coldescs[i].help));
@ -716,7 +716,7 @@ static void do_sem_global(struct libscols_table *tb)
} }
global_set_data(tb, "SEMMNS", _("Total number of semaphores"), nsems, lim.semmns); global_set_data(tb, "SEMMNS", _("Total number of semaphores"), nsems, lim.semmns);
global_set_data(tb, "SEMMNI", _("Number of Semaphore IDs"), nsets, lim.semmni); global_set_data(tb, "SEMMNI", _("Number of semaphore IDs"), nsets, lim.semmni);
} }
static void do_msg(int id, struct lsipc_control *ctl, struct libscols_table *tb) static void do_msg(int id, struct lsipc_control *ctl, struct libscols_table *tb)
@ -1266,7 +1266,7 @@ int main(int argc, char *argv[])
if (msg + shm + sem == 0) { if (msg + shm + sem == 0) {
msg = shm = sem = global = 1; msg = shm = sem = global = 1;
if (show_time || show_creat || id != -1) if (show_time || show_creat || id != -1)
errx(EXIT_FAILURE, _("the --global is mutually exclusive with --creator, --id and --time")); errx(EXIT_FAILURE, _("--global is mutually exclusive with --creator, --id and --time"));
} }
if (global) { if (global) {
add_column(columns, ncolumns++, COL_RESOURCE); add_column(columns, ncolumns++, COL_RESOURCE);