2009-02-25 Hui Zhu <teawater@gmail.com>

* cli/cli-script.c (define_command): Add _() to query.
	* gnu-nat.c (inf_validate_task_sc): Ditto.
	* infcmd.c (kill_if_already_running): Ditto.
	(jump_command): Ditto.
	(attach_command): Ditto.
	* inflow.c (kill_command): Ditto.
	* infrun.c (handle_command): Ditto.
	* maint.c (maintenance_dump_me): Ditto.
	* memattr.c (mem_delete_command): Ditto.
	* monitor.c (monitor_interrupt_query): Ditto.
	* nto-procfs.c (interrupt_query): Ditto.
	* printcmd.c (undisplay_command): Ditto.
	* remote-mips.c (mips_kill): Ditto.
	* remote.c (interrupt_query): Ditto.
	* solib-irix.c (irix_open_symbol_file_object): Ditto.
	* solib-osf.c (osf_open_symbol_file_object): Ditto.
	* solib-pa64.c (pa64_open_symbol_file_object): Ditto.
	* solib-som.c (som_open_symbol_file_object): Ditto.
	* solib-svr4.c (open_symbol_file_object): Ditto.
	* symfile.c (symbol_file_add_with_addrs_or_offsets): Ditto.
	* target.c (kill_or_be_killed): Ditto.
	* tracepoint.c (delete_trace_command): Ditto.
	* top.c (quit_confirm): Add _() to s that will be used
	in query.
This commit is contained in:
Hui Zhu 2009-02-25 02:14:23 +00:00
parent 619518c5f6
commit 9e2f0ad4e0
22 changed files with 60 additions and 33 deletions

View File

@ -1,3 +1,30 @@
2009-02-25 Hui Zhu <teawater@gmail.com>
* cli/cli-script.c (define_command): Add _() to query.
* gnu-nat.c (inf_validate_task_sc): Ditto.
* infcmd.c (kill_if_already_running): Ditto.
(jump_command): Ditto.
(attach_command): Ditto.
* inflow.c (kill_command): Ditto.
* infrun.c (handle_command): Ditto.
* maint.c (maintenance_dump_me): Ditto.
* memattr.c (mem_delete_command): Ditto.
* monitor.c (monitor_interrupt_query): Ditto.
* nto-procfs.c (interrupt_query): Ditto.
* printcmd.c (undisplay_command): Ditto.
* remote-mips.c (mips_kill): Ditto.
* remote.c (interrupt_query): Ditto.
* solib-irix.c (irix_open_symbol_file_object): Ditto.
* solib-osf.c (osf_open_symbol_file_object): Ditto.
* solib-pa64.c (pa64_open_symbol_file_object): Ditto.
* solib-som.c (som_open_symbol_file_object): Ditto.
* solib-svr4.c (open_symbol_file_object): Ditto.
* symfile.c (symbol_file_add_with_addrs_or_offsets): Ditto.
* target.c (kill_or_be_killed): Ditto.
* tracepoint.c (delete_trace_command): Ditto.
* top.c (quit_confirm): Add _() to s that will be used
in query.
2009-02-24 Pierre Muller <muller@ics.u-strasbg.fr>
Fix windows-nat.c compilation failure.

View File

@ -1379,7 +1379,7 @@ define_command (char *comname, int from_tty)
{
warning (_("Your new `%s' command does not hook any existing command."),
comfull);
if (!query ("Proceed? "))
if (!query (_("Proceed? ")))
error (_("Not confirmed."));
}
}

View File

@ -854,8 +854,8 @@ inf_validate_task_sc (struct inf *inf)
int abort;
target_terminal_ours (); /* Allow I/O. */
abort = !query ("Pid %d has an additional task suspend count of %d;"
" clear it? ", inf->pid,
abort = !query (_("Pid %d has an additional task suspend count of %d;"
" clear it? "), inf->pid,
suspend_count - inf->task->cur_sc);
target_terminal_inferior (); /* Give it back to the child. */

View File

@ -441,8 +441,8 @@ kill_if_already_running (int from_tty)
target_require_runnable ();
if (from_tty
&& !query ("The program being debugged has been started already.\n\
Start it from the beginning? "))
&& !query (_("The program being debugged has been started already.\n\
Start it from the beginning? ")))
error (_("Program not restarted."));
target_kill ();
}
@ -1029,7 +1029,7 @@ jump_command (char *arg, int from_tty)
sfn = find_pc_function (sal.pc);
if (fn != NULL && sfn != fn)
{
if (!query ("Line %d is not in `%s'. Jump anyway? ", sal.line,
if (!query (_("Line %d is not in `%s'. Jump anyway? "), sal.line,
SYMBOL_PRINT_NAME (fn)))
{
error (_("Not confirmed."));
@ -1043,7 +1043,7 @@ jump_command (char *arg, int from_tty)
if (section_is_overlay (SYMBOL_OBJ_SECTION (sfn)) &&
!section_is_mapped (SYMBOL_OBJ_SECTION (sfn)))
{
if (!query ("WARNING!!! Destination is in unmapped overlay! Jump anyway? "))
if (!query (_("WARNING!!! Destination is in unmapped overlay! Jump anyway? ")))
{
error (_("Not confirmed."));
/* NOTREACHED */
@ -2235,7 +2235,7 @@ attach_command (char *args, int from_tty)
;
else if (target_has_execution)
{
if (query ("A program is being debugged already. Kill it? "))
if (query (_("A program is being debugged already. Kill it? ")))
target_kill ();
else
error (_("Not killed."));

View File

@ -607,7 +607,7 @@ kill_command (char *arg, int from_tty)
if (ptid_equal (inferior_ptid, null_ptid))
error (_("The program is not being run."));
if (!query ("Kill the program being debugged? "))
if (!query (_("Kill the program being debugged? ")))
error (_("Not confirmed."));
target_kill ();

View File

@ -4637,8 +4637,8 @@ handle_command (char *args, int from_tty)
case TARGET_SIGNAL_INT:
if (!allsigs && !sigs[signum])
{
if (query ("%s is used by the debugger.\n\
Are you sure you want to change it? ", target_signal_to_name ((enum target_signal) signum)))
if (query (_("%s is used by the debugger.\n\
Are you sure you want to change it? "), target_signal_to_name ((enum target_signal) signum)))
{
sigs[signum] = 1;
}

View File

@ -98,7 +98,7 @@ maintenance_command (char *args, int from_tty)
static void
maintenance_dump_me (char *args, int from_tty)
{
if (query ("Should GDB dump core? "))
if (query (_("Should GDB dump core? ")))
{
#ifdef __DJGPP__
/* SIGQUIT by default is ignored, so use SIGABRT instead. */

View File

@ -690,7 +690,7 @@ mem_delete_command (char *args, int from_tty)
if (p == 0)
{
if (query ("Delete all memory regions? "))
if (query (_("Delete all memory regions? ")))
mem_clear ();
dont_repeat ();
return;

View File

@ -1008,8 +1008,8 @@ monitor_interrupt_query (void)
{
target_terminal_ours ();
if (query ("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? "))
if (query (_("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? ")))
{
target_mourn_inferior ();
deprecated_throw_reason (RETURN_QUIT);

View File

@ -593,8 +593,8 @@ interrupt_query (void)
{
target_terminal_ours ();
if (query ("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? "))
if (query (_("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? ")))
{
target_mourn_inferior ();
deprecated_throw_reason (RETURN_QUIT);

View File

@ -1482,7 +1482,7 @@ undisplay_command (char *args, int from_tty)
if (args == 0)
{
if (query ("Delete all auto-display expressions? "))
if (query (_("Delete all auto-display expressions? ")))
clear_displays ();
dont_repeat ();
return;

View File

@ -2142,8 +2142,8 @@ mips_kill (void)
target_terminal_ours ();
if (query ("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? "))
if (query (_("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? ")))
{
/* Clean up in such a way that mips_close won't try to talk to the
board (it almost surely won't work since we weren't able to talk to

View File

@ -3944,8 +3944,8 @@ interrupt_query (void)
}
else
{
if (query ("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? "))
if (query (_("Interrupted while waiting for the program.\n\
Give up (and stop debugging it)? ")))
{
pop_target ();
deprecated_throw_reason (RETURN_QUIT);

View File

@ -611,7 +611,7 @@ irix_open_symbol_file_object (void *from_ttyp)
char *filename;
if (symfile_objfile)
if (!query ("Attempt to reload symbols from process? "))
if (!query (_("Attempt to reload symbols from process? ")))
return 0;
if ((debug_base = locate_base ()) == 0)

View File

@ -584,7 +584,7 @@ osf_open_symbol_file_object (void *from_ttyp)
int found;
if (symfile_objfile)
if (!query ("Attempt to reload symbols from process? "))
if (!query (_("Attempt to reload symbols from process? ")))
return 0;
/* The first module after /sbin/loader is the main program. */

View File

@ -529,7 +529,7 @@ pa64_open_symbol_file_object (void *from_ttyp)
char *dll_path;
if (symfile_objfile)
if (!query ("Attempt to reload symbols from process? "))
if (!query (_("Attempt to reload symbols from process? ")))
return 0;
/* Read in the load map pointer if we have not done so already. */

View File

@ -696,7 +696,7 @@ som_open_symbol_file_object (void *from_ttyp)
char buf[4];
if (symfile_objfile)
if (!query ("Attempt to reload symbols from process? "))
if (!query (_("Attempt to reload symbols from process? ")))
return 0;
/* First link map member should be the executable. */

View File

@ -845,7 +845,7 @@ open_symbol_file_object (void *from_ttyp)
struct cleanup *cleanups = make_cleanup (xfree, l_name_buf);
if (symfile_objfile)
if (!query ("Attempt to reload symbols from process? "))
if (!query (_("Attempt to reload symbols from process? ")))
return 0;
/* Always locate the debug struct, in case it has moved. */

View File

@ -968,7 +968,7 @@ symbol_file_add_with_addrs_or_offsets (bfd *abfd, int from_tty,
if ((have_full_symbols () || have_partial_symbols ())
&& mainline
&& from_tty
&& !query ("Load new symbol table from \"%s\"? ", name))
&& !query (_("Load new symbol table from \"%s\"? "), name))
error (_("Not confirmed."));
objfile = allocate_objfile (abfd, flags);

View File

@ -341,7 +341,7 @@ kill_or_be_killed (int from_tty)
{
printf_unfiltered (_("You are already running a program:\n"));
target_files_info ();
if (query ("Kill it? "))
if (query (_("Kill it? ")))
{
target_kill ();
if (target_has_execution)

View File

@ -1183,11 +1183,11 @@ quit_confirm (void)
see if a GUI is running. The `use_windows' variable doesn't
cut it. */
if (deprecated_init_ui_hook)
s = "A debugging session is active.\nDo you still want to close the debugger?";
s = _("A debugging session is active.\nDo you still want to close the debugger?");
else if (inf->attach_flag)
s = "The program is running. Quit anyway (and detach it)? ";
s = _("The program is running. Quit anyway (and detach it)? ");
else
s = "The program is running. Quit anyway (and kill it)? ";
s = _("The program is running. Quit anyway (and kill it)? ");
if (!query ("%s", s))
return 0;

View File

@ -692,7 +692,7 @@ delete_trace_command (char *args, int from_tty)
if (from_tty) /* confirm only if from_tty... */
if (tracepoint_chain) /* and if there are tracepoints to
delete! */
if (!query ("Delete all tracepoints? "))
if (!query (_("Delete all tracepoints? ")))
return;
map_args_over_tracepoints (args, from_tty, delete_op);