Use _() in calls to build_help
Currently some code in gdb uses build_help with N_(), like: static const std::string compile_print_help = gdb::option::build_help (N_("\ I believe this is incorrect. The N_ macro is used to mark text that should end up in the message catalog, but which will be translated by a later call to gettext. However, in this case, there is no later call to gettext, so (if gdb had translations), this text would remain untranslated. Instead, I think using the ordinary _() macro is correct here. Translators will have to know to preserve "%OPTIONS%" in the text -- but that seems both unavoidable and fine. Tested by rebuilding as there's not much else to do. gdb/ChangeLog 2019-08-05 Tom Tromey <tromey@adacore.com> * compile/compile.c (_initialize_compile): Use _(), not N_(). * thread.c (_initialize_thread): Use _(), not N_(). * stack.c (_initialize_stack): Use _(), not N_(). * printcmd.c (_initialize_printcmd): Use _(), not N_().
This commit is contained in:
parent
23d188c74e
commit
8abfcabcb4
5 changed files with 17 additions and 10 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2019-08-05 Tom Tromey <tromey@adacore.com>
|
||||||
|
|
||||||
|
* compile/compile.c (_initialize_compile): Use _(), not N_().
|
||||||
|
* thread.c (_initialize_thread): Use _(), not N_().
|
||||||
|
* stack.c (_initialize_stack): Use _(), not N_().
|
||||||
|
* printcmd.c (_initialize_printcmd): Use _(), not N_().
|
||||||
|
|
||||||
2019-08-04 Simon Marchi <simon.marchi@polymtl.ca>
|
2019-08-04 Simon Marchi <simon.marchi@polymtl.ca>
|
||||||
|
|
||||||
* dwarf2read.c (struct dw2_symtab_iterator):
|
* dwarf2read.c (struct dw2_symtab_iterator):
|
||||||
|
|
|
@ -971,7 +971,7 @@ Command to compile source code and inject it into the inferior."),
|
||||||
const auto compile_opts = make_compile_options_def_group (nullptr);
|
const auto compile_opts = make_compile_options_def_group (nullptr);
|
||||||
|
|
||||||
static const std::string compile_code_help
|
static const std::string compile_code_help
|
||||||
= gdb::option::build_help (N_("\
|
= gdb::option::build_help (_("\
|
||||||
Compile, inject, and execute code.\n\
|
Compile, inject, and execute code.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: compile code [OPTION]... [CODE]\n\
|
Usage: compile code [OPTION]... [CODE]\n\
|
||||||
|
@ -994,7 +994,7 @@ indicate the end of the expression."),
|
||||||
set_cmd_completer_handle_brkchars (c, compile_code_command_completer);
|
set_cmd_completer_handle_brkchars (c, compile_code_command_completer);
|
||||||
|
|
||||||
static const std::string compile_file_help
|
static const std::string compile_file_help
|
||||||
= gdb::option::build_help (N_("\
|
= gdb::option::build_help (_("\
|
||||||
Evaluate a file containing source code.\n\
|
Evaluate a file containing source code.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: compile file [OPTION].. [FILENAME]\n\
|
Usage: compile file [OPTION].. [FILENAME]\n\
|
||||||
|
@ -1011,7 +1011,7 @@ Options:\n\
|
||||||
const auto compile_print_opts = make_value_print_options_def_group (nullptr);
|
const auto compile_print_opts = make_value_print_options_def_group (nullptr);
|
||||||
|
|
||||||
static const std::string compile_print_help
|
static const std::string compile_print_help
|
||||||
= gdb::option::build_help (N_("\
|
= gdb::option::build_help (_("\
|
||||||
Evaluate EXPR by using the compiler and print result.\n\
|
Evaluate EXPR by using the compiler and print result.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: compile print [[OPTION]... --] [/FMT] [EXPR]\n\
|
Usage: compile print [[OPTION]... --] [/FMT] [EXPR]\n\
|
||||||
|
|
|
@ -2848,7 +2848,7 @@ This may usually be abbreviated to simply \"set\"."),
|
||||||
|
|
||||||
const auto print_opts = make_value_print_options_def_group (nullptr);
|
const auto print_opts = make_value_print_options_def_group (nullptr);
|
||||||
|
|
||||||
static const std::string print_help = gdb::option::build_help (N_("\
|
static const std::string print_help = gdb::option::build_help (_("\
|
||||||
Print value of expression EXP.\n\
|
Print value of expression EXP.\n\
|
||||||
Usage: print [[OPTION]... --] [/FMT] [EXP]\n\
|
Usage: print [[OPTION]... --] [/FMT] [EXP]\n\
|
||||||
\n\
|
\n\
|
||||||
|
|
|
@ -3275,7 +3275,7 @@ Options:\n\
|
||||||
const auto frame_apply_opts
|
const auto frame_apply_opts
|
||||||
= make_frame_apply_options_def_group (nullptr, nullptr);
|
= make_frame_apply_options_def_group (nullptr, nullptr);
|
||||||
|
|
||||||
static std::string frame_apply_cmd_help = gdb::option::build_help (N_("\
|
static std::string frame_apply_cmd_help = gdb::option::build_help (_("\
|
||||||
Apply a command to a number of frames.\n\
|
Apply a command to a number of frames.\n\
|
||||||
Usage: frame apply COUNT [OPTION]... COMMAND\n\
|
Usage: frame apply COUNT [OPTION]... COMMAND\n\
|
||||||
With a negative COUNT argument, applies the command on outermost -COUNT frames.\n"
|
With a negative COUNT argument, applies the command on outermost -COUNT frames.\n"
|
||||||
|
@ -3288,7 +3288,7 @@ With a negative COUNT argument, applies the command on outermost -COUNT frames.\
|
||||||
&frame_cmd_list);
|
&frame_cmd_list);
|
||||||
set_cmd_completer_handle_brkchars (cmd, frame_apply_cmd_completer);
|
set_cmd_completer_handle_brkchars (cmd, frame_apply_cmd_completer);
|
||||||
|
|
||||||
static std::string frame_apply_all_cmd_help = gdb::option::build_help (N_("\
|
static std::string frame_apply_all_cmd_help = gdb::option::build_help (_("\
|
||||||
Apply a command to all frames.\n\
|
Apply a command to all frames.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: frame apply all [OPTION]... COMMAND\n"
|
Usage: frame apply all [OPTION]... COMMAND\n"
|
||||||
|
@ -3300,7 +3300,7 @@ Usage: frame apply all [OPTION]... COMMAND\n"
|
||||||
&frame_apply_cmd_list);
|
&frame_apply_cmd_list);
|
||||||
set_cmd_completer_handle_brkchars (cmd, frame_apply_all_cmd_completer);
|
set_cmd_completer_handle_brkchars (cmd, frame_apply_all_cmd_completer);
|
||||||
|
|
||||||
static std::string frame_apply_level_cmd_help = gdb::option::build_help (N_("\
|
static std::string frame_apply_level_cmd_help = gdb::option::build_help (_("\
|
||||||
Apply a command to a list of frames.\n\
|
Apply a command to a list of frames.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: frame apply level LEVEL... [OPTION]... COMMAND\n\
|
Usage: frame apply level LEVEL... [OPTION]... COMMAND\n\
|
||||||
|
@ -3407,7 +3407,7 @@ Usage: select-frame level LEVEL"),
|
||||||
= make_backtrace_options_def_group (nullptr, nullptr, nullptr);
|
= make_backtrace_options_def_group (nullptr, nullptr, nullptr);
|
||||||
|
|
||||||
static std::string backtrace_help
|
static std::string backtrace_help
|
||||||
= gdb::option::build_help (N_("\
|
= gdb::option::build_help (_("\
|
||||||
Print backtrace of all stack frames, or innermost COUNT frames.\n\
|
Print backtrace of all stack frames, or innermost COUNT frames.\n\
|
||||||
Usage: backtrace [OPTION]... [QUALIFIER]... [COUNT | -COUNT]\n\
|
Usage: backtrace [OPTION]... [QUALIFIER]... [COUNT | -COUNT]\n\
|
||||||
\n\
|
\n\
|
||||||
|
|
|
@ -2150,7 +2150,7 @@ Options:\n\
|
||||||
|
|
||||||
const auto thread_apply_opts = make_thread_apply_options_def_group (nullptr);
|
const auto thread_apply_opts = make_thread_apply_options_def_group (nullptr);
|
||||||
|
|
||||||
static std::string thread_apply_help = gdb::option::build_help (N_("\
|
static std::string thread_apply_help = gdb::option::build_help (_("\
|
||||||
Apply a command to a list of threads.\n\
|
Apply a command to a list of threads.\n\
|
||||||
Usage: thread apply ID... [OPTION]... COMMAND\n\
|
Usage: thread apply ID... [OPTION]... COMMAND\n\
|
||||||
ID is a space-separated list of IDs of threads to apply COMMAND on.\n"
|
ID is a space-separated list of IDs of threads to apply COMMAND on.\n"
|
||||||
|
@ -2166,7 +2166,7 @@ THREAD_APPLY_OPTION_HELP),
|
||||||
const auto thread_apply_all_opts
|
const auto thread_apply_all_opts
|
||||||
= make_thread_apply_all_options_def_group (nullptr, nullptr);
|
= make_thread_apply_all_options_def_group (nullptr, nullptr);
|
||||||
|
|
||||||
static std::string thread_apply_all_help = gdb::option::build_help (N_("\
|
static std::string thread_apply_all_help = gdb::option::build_help (_("\
|
||||||
Apply a command to all threads.\n\
|
Apply a command to all threads.\n\
|
||||||
\n\
|
\n\
|
||||||
Usage: thread apply all [OPTION]... COMMAND\n"
|
Usage: thread apply all [OPTION]... COMMAND\n"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue