* [commit] mark some of printf_(un)filtered
@ 2005-02-12 10:56 Andrew Cagney
2005-02-12 17:17 ` Eli Zaretskii
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Cagney @ 2005-02-12 10:56 UTC (permalink / raw)
To: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
Only some, where in doubt I tried to skip (sometimes entire files).
Where fairly certain that there shouldn't be a translation, I marked it
as (("string")).
committed,
Andrew
[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 144677 bytes --]
2005-02-11 Andrew Cagney <cagney@gnu.org>
Mark up some of printf_filtered and printf_unfiltered.
* ada-lang.c, annotate.c, arch-utils.c, breakpoint.c: Update.
* corelow.c, cp-namespace.c, cp-support.c, dcache.c: Update.
* demangle.c, dsrec.c, dwarf2read.c, dwarfread.c: Update.
* event-loop.c, event-top.c, exec.c, f-valprint.c: Update.
* gdbtypes.c, inf-loop.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcmd.c, inflow.c, infrun.c, inftarg.c, language.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, maint.c: Update.
* mdebugread.c, memattr.c, monitor.c, objc-lang.c: Update.
* ocd.c, osabi.c, printcmd.c, procfs.c, regcache.c: Update.
* remote.c, solib-som.c, solib.c, somsolib.c, source.c: Update.
* stack.c, symfile.c, symmisc.c, target.c, thread.c: Update.
* top.c, utils.c, valprint.c, value.c, cli/cli-cmds.c: Update.
* cli/cli-dump.c, cli/cli-logging.c, tui/tui-hooks.c: Update.
* tui/tui-regs.c, tui/tui-win.c: Update.
Index: ada-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/ada-lang.c,v
retrieving revision 1.76
diff -p -u -r1.76 ada-lang.c
--- ada-lang.c 11 Feb 2005 04:05:41 -0000 1.76
+++ ada-lang.c 12 Feb 2005 00:38:02 -0000
@@ -3091,7 +3091,7 @@ user_select_syms (struct ada_symbol_info
else if (is_enumeral
&& TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
{
- printf_unfiltered ("[%d] ", i + first_choice);
+ printf_unfiltered (("[%d] "), i + first_choice);
ada_print_type (SYMBOL_TYPE (syms[i].sym), NULL,
gdb_stdout, -1, 0);
printf_unfiltered (_("'(%s) (enumeral)\n"),
@@ -3151,7 +3151,7 @@ get_selections (int *choices, int n_choi
if (prompt == NULL)
prompt = ">";
- printf_unfiltered ("%s ", prompt);
+ printf_unfiltered (("%s "), prompt);
gdb_flush (gdb_stdout);
args = command_line_input ((char *) NULL, 0, annotation_suffix);
Index: annotate.c
===================================================================
RCS file: /cvs/src/src/gdb/annotate.c,v
retrieving revision 1.7
diff -p -u -r1.7 annotate.c
--- annotate.c 21 Apr 2004 23:52:19 -0000 1.7
+++ annotate.c 12 Feb 2005 00:38:02 -0000
@@ -47,9 +47,9 @@ static void
print_value_flags (struct type *t)
{
if (can_dereference (t))
- printf_filtered ("*");
+ printf_filtered (("*"));
else
- printf_filtered ("-");
+ printf_filtered (("-"));
}
\f
void
@@ -58,7 +58,7 @@ breakpoints_changed (void)
if (annotation_level > 1)
{
target_terminal_ours ();
- printf_unfiltered ("\n\032\032breakpoints-invalid\n");
+ printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
if (ignore_count_changed)
ignore_count_changed = 0; /* Avoid multiple break annotations. */
}
@@ -81,21 +81,21 @@ void
annotate_breakpoint (int num)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032breakpoint %d\n", num);
+ printf_filtered (("\n\032\032breakpoint %d\n"), num);
}
void
annotate_catchpoint (int num)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032catchpoint %d\n", num);
+ printf_filtered (("\n\032\032catchpoint %d\n"), num);
}
void
annotate_watchpoint (int num)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032watchpoint %d\n", num);
+ printf_filtered (("\n\032\032watchpoint %d\n"), num);
}
void
@@ -108,7 +108,7 @@ annotate_starting (void)
{
if (annotation_level > 1)
{
- printf_filtered ("\n\032\032starting\n");
+ printf_filtered (("\n\032\032starting\n"));
}
}
}
@@ -121,7 +121,7 @@ annotate_stopped (void)
else
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032stopped\n");
+ printf_filtered (("\n\032\032stopped\n"));
}
if (annotation_level > 1 && ignore_count_changed)
{
@@ -138,7 +138,7 @@ annotate_exited (int exitstatus)
else
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032exited %d\n", exitstatus);
+ printf_filtered (("\n\032\032exited %d\n"), exitstatus);
}
}
@@ -149,35 +149,35 @@ annotate_signalled (void)
deprecated_annotate_signalled_hook ();
if (annotation_level > 1)
- printf_filtered ("\n\032\032signalled\n");
+ printf_filtered (("\n\032\032signalled\n"));
}
void
annotate_signal_name (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032signal-name\n");
+ printf_filtered (("\n\032\032signal-name\n"));
}
void
annotate_signal_name_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032signal-name-end\n");
+ printf_filtered (("\n\032\032signal-name-end\n"));
}
void
annotate_signal_string (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032signal-string\n");
+ printf_filtered (("\n\032\032signal-string\n"));
}
void
annotate_signal_string_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032signal-string-end\n");
+ printf_filtered (("\n\032\032signal-string-end\n"));
}
void
@@ -187,42 +187,42 @@ annotate_signal (void)
deprecated_annotate_signal_hook ();
if (annotation_level > 1)
- printf_filtered ("\n\032\032signal\n");
+ printf_filtered (("\n\032\032signal\n"));
}
\f
void
annotate_breakpoints_headers (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032breakpoints-headers\n");
+ printf_filtered (("\n\032\032breakpoints-headers\n"));
}
void
annotate_field (int num)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032field %d\n", num);
+ printf_filtered (("\n\032\032field %d\n"), num);
}
void
annotate_breakpoints_table (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032breakpoints-table\n");
+ printf_filtered (("\n\032\032breakpoints-table\n"));
}
void
annotate_record (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032record\n");
+ printf_filtered (("\n\032\032record\n"));
}
void
annotate_breakpoints_table_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032breakpoints-table-end\n");
+ printf_filtered (("\n\032\032breakpoints-table-end\n"));
}
void
@@ -231,7 +231,7 @@ annotate_frames_invalid (void)
if (annotation_level > 1)
{
target_terminal_ours ();
- printf_unfiltered ("\n\032\032frames-invalid\n");
+ printf_unfiltered (("\n\032\032frames-invalid\n"));
}
}
@@ -240,9 +240,9 @@ annotate_field_begin (struct type *type)
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032field-begin ");
+ printf_filtered (("\n\032\032field-begin "));
print_value_flags (type);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -250,35 +250,35 @@ void
annotate_field_name_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032field-name-end\n");
+ printf_filtered (("\n\032\032field-name-end\n"));
}
void
annotate_field_value (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032field-value\n");
+ printf_filtered (("\n\032\032field-value\n"));
}
void
annotate_field_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032field-end\n");
+ printf_filtered (("\n\032\032field-end\n"));
}
\f
void
annotate_quit (void)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032quit\n");
+ printf_filtered (("\n\032\032quit\n"));
}
void
annotate_error (void)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032error\n");
+ printf_filtered (("\n\032\032error\n"));
}
void
@@ -293,9 +293,9 @@ annotate_value_history_begin (int histin
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032value-history-begin %d ", histindex);
+ printf_filtered (("\n\032\032value-history-begin %d "), histindex);
print_value_flags (type);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -304,9 +304,9 @@ annotate_value_begin (struct type *type)
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032value-begin ");
+ printf_filtered (("\n\032\032value-begin "));
print_value_flags (type);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -314,84 +314,84 @@ void
annotate_value_history_value (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032value-history-value\n");
+ printf_filtered (("\n\032\032value-history-value\n"));
}
void
annotate_value_history_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032value-history-end\n");
+ printf_filtered (("\n\032\032value-history-end\n"));
}
void
annotate_value_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032value-end\n");
+ printf_filtered (("\n\032\032value-end\n"));
}
void
annotate_display_begin (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-begin\n");
+ printf_filtered (("\n\032\032display-begin\n"));
}
void
annotate_display_number_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-number-end\n");
+ printf_filtered (("\n\032\032display-number-end\n"));
}
void
annotate_display_format (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-format\n");
+ printf_filtered (("\n\032\032display-format\n"));
}
void
annotate_display_expression (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-expression\n");
+ printf_filtered (("\n\032\032display-expression\n"));
}
void
annotate_display_expression_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-expression-end\n");
+ printf_filtered (("\n\032\032display-expression-end\n"));
}
void
annotate_display_value (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-value\n");
+ printf_filtered (("\n\032\032display-value\n"));
}
void
annotate_display_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032display-end\n");
+ printf_filtered (("\n\032\032display-end\n"));
}
void
annotate_arg_begin (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032arg-begin\n");
+ printf_filtered (("\n\032\032arg-begin\n"));
}
void
annotate_arg_name_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032arg-name-end\n");
+ printf_filtered (("\n\032\032arg-name-end\n"));
}
void
@@ -399,9 +399,9 @@ annotate_arg_value (struct type *type)
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032arg-value ");
+ printf_filtered (("\n\032\032arg-value "));
print_value_flags (type);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -409,22 +409,22 @@ void
annotate_arg_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032arg-end\n");
+ printf_filtered (("\n\032\032arg-end\n"));
}
void
annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc)
{
if (annotation_level > 1)
- printf_filtered ("\n\032\032source ");
+ printf_filtered (("\n\032\032source "));
else
- printf_filtered ("\032\032");
+ printf_filtered (("\032\032"));
- printf_filtered ("%s:%d:%d:%s:0x", filename,
+ printf_filtered (("%s:%d:%d:%s:0x"), filename,
line, character,
mid ? "middle" : "beg");
print_address_numeric (pc, 0, gdb_stdout);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
void
@@ -432,9 +432,9 @@ annotate_frame_begin (int level, CORE_AD
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032frame-begin %d 0x", level);
+ printf_filtered (("\n\032\032frame-begin %d 0x"), level);
print_address_numeric (pc, 0, gdb_stdout);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -442,91 +442,91 @@ void
annotate_function_call (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032function-call\n");
+ printf_filtered (("\n\032\032function-call\n"));
}
void
annotate_signal_handler_caller (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032signal-handler-caller\n");
+ printf_filtered (("\n\032\032signal-handler-caller\n"));
}
void
annotate_frame_address (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-address\n");
+ printf_filtered (("\n\032\032frame-address\n"));
}
void
annotate_frame_address_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-address-end\n");
+ printf_filtered (("\n\032\032frame-address-end\n"));
}
void
annotate_frame_function_name (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-function-name\n");
+ printf_filtered (("\n\032\032frame-function-name\n"));
}
void
annotate_frame_args (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-args\n");
+ printf_filtered (("\n\032\032frame-args\n"));
}
void
annotate_frame_source_begin (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-source-begin\n");
+ printf_filtered (("\n\032\032frame-source-begin\n"));
}
void
annotate_frame_source_file (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-source-file\n");
+ printf_filtered (("\n\032\032frame-source-file\n"));
}
void
annotate_frame_source_file_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-source-file-end\n");
+ printf_filtered (("\n\032\032frame-source-file-end\n"));
}
void
annotate_frame_source_line (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-source-line\n");
+ printf_filtered (("\n\032\032frame-source-line\n"));
}
void
annotate_frame_source_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-source-end\n");
+ printf_filtered (("\n\032\032frame-source-end\n"));
}
void
annotate_frame_where (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-where\n");
+ printf_filtered (("\n\032\032frame-where\n"));
}
void
annotate_frame_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032frame-end\n");
+ printf_filtered (("\n\032\032frame-end\n"));
}
\f
void
@@ -534,9 +534,9 @@ annotate_array_section_begin (int index,
{
if (annotation_level == 2)
{
- printf_filtered ("\n\032\032array-section-begin %d ", index);
+ printf_filtered (("\n\032\032array-section-begin %d "), index);
print_value_flags (elttype);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
}
@@ -544,28 +544,28 @@ void
annotate_elt_rep (unsigned int repcount)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032elt-rep %u\n", repcount);
+ printf_filtered (("\n\032\032elt-rep %u\n"), repcount);
}
void
annotate_elt_rep_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032elt-rep-end\n");
+ printf_filtered (("\n\032\032elt-rep-end\n"));
}
void
annotate_elt (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032elt\n");
+ printf_filtered (("\n\032\032elt\n"));
}
void
annotate_array_section_end (void)
{
if (annotation_level == 2)
- printf_filtered ("\n\032\032array-section-end\n");
+ printf_filtered (("\n\032\032array-section-end\n"));
}
static void
Index: arch-utils.c
===================================================================
RCS file: /cvs/src/src/gdb/arch-utils.c,v
retrieving revision 1.126
diff -p -u -r1.126 arch-utils.c
--- arch-utils.c 11 Feb 2005 04:05:43 -0000 1.126
+++ arch-utils.c 12 Feb 2005 00:38:02 -0000
@@ -380,9 +380,9 @@ show_endian (char *args, int from_tty)
"(currently little endian)\n"));
else
if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
- printf_unfiltered ("The target is assumed to be big endian\n");
+ printf_unfiltered (_("The target is assumed to be big endian\n"));
else
- printf_unfiltered ("The target is assumed to be little endian\n");
+ printf_unfiltered (_("The target is assumed to be little endian\n"));
}
static void
Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.204
diff -p -u -r1.204 breakpoint.c
--- breakpoint.c 11 Feb 2005 18:13:47 -0000 1.204
+++ breakpoint.c 12 Feb 2005 00:38:02 -0000
@@ -394,7 +394,7 @@ get_number_trailer (char **pp, int trail
retval = (int) value_as_long (val);
else
{
- printf_filtered ("Convenience variable must have integer value.\n");
+ printf_filtered (_("Convenience variable must have integer value.\n"));
retval = 0;
}
}
@@ -548,7 +548,7 @@ condition_command (char *arg, int from_t
b->cond = 0;
b->cond_string = NULL;
if (from_tty)
- printf_filtered ("Breakpoint %d now unconditional.\n", bnum);
+ printf_filtered (_("Breakpoint %d now unconditional.\n"), bnum);
}
else
{
@@ -995,9 +995,10 @@ insert_bp_location (struct bp_location *
}
else
{
- printf_filtered (_("Hardware watchpoint %d deleted "), bpt->owner->number);
- printf_filtered ("because the program has left the block \n");
- printf_filtered ("in which its expression is valid.\n");
+ printf_filtered (_("\
+Hardware watchpoint %d deleted because the program has left the block \n\
+in which its expression is valid.\n"),
+ bpt->owner->number);
if (bpt->owner->related_breakpoint)
bpt->owner->related_breakpoint->disposition = disp_del_at_next_stop;
bpt->owner->disposition = disp_del_at_next_stop;
@@ -2098,60 +2099,58 @@ print_it_typical (bpstat bs)
/* Did we stop because the user set the stop_on_solib_events
variable? (If so, we report this as a generic, "Stopped due
to shlib event" message.) */
- printf_filtered ("Stopped due to shared library event\n");
+ printf_filtered (_("Stopped due to shared library event\n"));
return PRINT_NOTHING;
break;
case bp_thread_event:
/* Not sure how we will get here.
GDB should not stop for these breakpoints. */
- printf_filtered ("Thread Event Breakpoint: gdb should not stop!\n");
+ printf_filtered (_("Thread Event Breakpoint: gdb should not stop!\n"));
return PRINT_NOTHING;
break;
case bp_overlay_event:
/* By analogy with the thread event, GDB should not stop for these. */
- printf_filtered ("Overlay Event Breakpoint: gdb should not stop!\n");
+ printf_filtered (_("Overlay Event Breakpoint: gdb should not stop!\n"));
return PRINT_NOTHING;
break;
case bp_catch_load:
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
- printf_filtered ("loaded");
- printf_filtered (" %s), ", bs->breakpoint_at->triggered_dll_pathname);
+ printf_filtered (_("\nCatchpoint %d (loaded %s), "),
+ bs->breakpoint_at->number,
+ bs->breakpoint_at->triggered_dll_pathname);
return PRINT_SRC_AND_LOC;
break;
case bp_catch_unload:
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
- printf_filtered ("unloaded");
- printf_filtered (" %s), ", bs->breakpoint_at->triggered_dll_pathname);
+ printf_filtered (_("\nCatchpoint %d (unloaded %s), "),
+ bs->breakpoint_at->number,
+ bs->breakpoint_at->triggered_dll_pathname);
return PRINT_SRC_AND_LOC;
break;
case bp_catch_fork:
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
- printf_filtered ("forked");
- printf_filtered (" process %d), ",
+ printf_filtered (_("\nCatchpoint %d (forked process %d), "),
+ bs->breakpoint_at->number,
bs->breakpoint_at->forked_inferior_pid);
return PRINT_SRC_AND_LOC;
break;
case bp_catch_vfork:
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (", bs->breakpoint_at->number);
- printf_filtered ("vforked");
- printf_filtered (" process %d), ",
+ printf_filtered (_("\nCatchpoint %d (vforked process %d), "),
+ bs->breakpoint_at->number,
bs->breakpoint_at->forked_inferior_pid);
return PRINT_SRC_AND_LOC;
break;
case bp_catch_exec:
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (exec'd %s), ",
+ printf_filtered (_("\nCatchpoint %d (exec'd %s), "),
bs->breakpoint_at->number,
bs->breakpoint_at->exec_pathname);
return PRINT_SRC_AND_LOC;
@@ -2162,25 +2161,22 @@ print_it_typical (bpstat bs)
(CURRENT_EXCEPTION_KIND == EX_EVENT_CATCH))
{
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (exception caught), ",
+ printf_filtered (_("\nCatchpoint %d (exception caught), "),
bs->breakpoint_at->number);
- printf_filtered ("throw location ");
if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
- printf_filtered ("%s:%d",
+ printf_filtered (_("throw location %s:%d, "),
CURRENT_EXCEPTION_THROW_FILE,
CURRENT_EXCEPTION_THROW_LINE);
else
- printf_filtered ("unknown");
+ printf_filtered (_("throw location unknown, "));
- printf_filtered (", catch location ");
if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
- printf_filtered ("%s:%d",
+ printf_filtered (_("catch location %s:%d\n"),
CURRENT_EXCEPTION_CATCH_FILE,
CURRENT_EXCEPTION_CATCH_LINE);
else
- printf_filtered ("unknown");
+ printf_filtered (_("catch location unknown\n"));
- printf_filtered ("\n");
/* don't bother to print location frame info */
return PRINT_SRC_ONLY;
}
@@ -2196,25 +2192,22 @@ print_it_typical (bpstat bs)
(CURRENT_EXCEPTION_KIND == EX_EVENT_THROW))
{
annotate_catchpoint (bs->breakpoint_at->number);
- printf_filtered ("\nCatchpoint %d (exception thrown), ",
+ printf_filtered (_("\nCatchpoint %d (exception thrown), "),
bs->breakpoint_at->number);
- printf_filtered ("throw location ");
if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
- printf_filtered ("%s:%d",
+ printf_filtered (_("throw location %s:%d, "),
CURRENT_EXCEPTION_THROW_FILE,
CURRENT_EXCEPTION_THROW_LINE);
else
- printf_filtered ("unknown");
+ printf_filtered (_("throw location unknown, "));
- printf_filtered (", catch location ");
if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
- printf_filtered ("%s:%d",
+ printf_filtered (_("catch location %s:%d\n"),
CURRENT_EXCEPTION_CATCH_FILE,
CURRENT_EXCEPTION_CATCH_LINE);
else
- printf_filtered ("unknown");
+ printf_filtered (_("catch location unknown\n"));
- printf_filtered ("\n");
/* don't bother to print location frame info */
return PRINT_SRC_ONLY;
}
@@ -2704,7 +2697,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
/* FALLTHROUGH */
case 0:
/* Error from catch_errors. */
- printf_filtered ("Watchpoint %d deleted.\n", b->number);
+ printf_filtered (_("Watchpoint %d deleted.\n"), b->number);
if (b->related_breakpoint)
b->related_breakpoint->disposition = disp_del_at_next_stop;
b->disposition = disp_del_at_next_stop;
@@ -2781,7 +2774,7 @@ bpstat_stop_status (CORE_ADDR bp_addr, p
/* Can't happen. */
case 0:
/* Error from catch_errors. */
- printf_filtered ("Watchpoint %d deleted.\n", b->number);
+ printf_filtered (_("Watchpoint %d deleted.\n"), b->number);
if (b->related_breakpoint)
b->related_breakpoint->disposition = disp_del_at_next_stop;
b->disposition = disp_del_at_next_stop;
@@ -3754,7 +3747,10 @@ describe_other_breakpoints (CORE_ADDR pc
others++;
if (others > 0)
{
- printf_filtered ("Note: breakpoint%s ", (others > 1) ? "s" : "");
+ if (others == 1)
+ printf_filtered (_("Note: breakpoint "));
+ else /* if (others == ???) */
+ printf_filtered (_("Note: breakpoints "));
ALL_BREAKPOINTS (b)
if (b->loc->address == pc) /* address match / overlay match */
if (!b->pending && (!overlay_debugging || b->loc->section == section))
@@ -3772,7 +3768,7 @@ describe_other_breakpoints (CORE_ADDR pc
(others > 1) ? ","
: ((others == 1) ? " and" : ""));
}
- printf_filtered ("also set at pc ");
+ printf_filtered (_("also set at pc "));
print_address_numeric (pc, 1, gdb_stdout);
printf_filtered (".\n");
}
@@ -4309,7 +4305,7 @@ resolve_pending_breakpoint (struct break
if (rc == GDB_RC_OK)
/* Pending breakpoint has been resolved. */
- printf_filtered ("Pending breakpoint \"%s\" resolved\n", b->addr_string);
+ printf_filtered (_("Pending breakpoint \"%s\" resolved\n"), b->addr_string);
do_cleanups (old_chain);
return rc;
@@ -4750,7 +4746,7 @@ mention (struct breakpoint *b)
switch (b->type)
{
case bp_none:
- printf_filtered ("(apparently deleted?) Eventpoint %d: ", b->number);
+ printf_filtered (_("(apparently deleted?) Eventpoint %d: "), b->number);
break;
case bp_watchpoint:
ui_out_text (uiout, "Watchpoint ");
@@ -4794,7 +4790,7 @@ mention (struct breakpoint *b)
say_where = 0;
break;
}
- printf_filtered ("Breakpoint %d", b->number);
+ printf_filtered (_("Breakpoint %d"), b->number);
say_where = 1;
break;
case bp_hardware_breakpoint:
@@ -4803,12 +4799,12 @@ mention (struct breakpoint *b)
say_where = 0;
break;
}
- printf_filtered ("Hardware assisted breakpoint %d", b->number);
+ printf_filtered (_("Hardware assisted breakpoint %d"), b->number);
say_where = 1;
break;
case bp_catch_load:
case bp_catch_unload:
- printf_filtered ("Catchpoint %d (%s %s)",
+ printf_filtered (_("Catchpoint %d (%s %s)"),
b->number,
(b->type == bp_catch_load) ? "load" : "unload",
(b->dll_pathname != NULL) ?
@@ -4816,17 +4812,17 @@ mention (struct breakpoint *b)
break;
case bp_catch_fork:
case bp_catch_vfork:
- printf_filtered ("Catchpoint %d (%s)",
+ printf_filtered (_("Catchpoint %d (%s)"),
b->number,
(b->type == bp_catch_fork) ? "fork" : "vfork");
break;
case bp_catch_exec:
- printf_filtered ("Catchpoint %d (exec)",
+ printf_filtered (_("Catchpoint %d (exec)"),
b->number);
break;
case bp_catch_catch:
case bp_catch_throw:
- printf_filtered ("Catchpoint %d (%s)",
+ printf_filtered (_("Catchpoint %d (%s)"),
b->number,
(b->type == bp_catch_catch) ? "catch" : "throw");
break;
@@ -4847,9 +4843,11 @@ mention (struct breakpoint *b)
if (say_where)
{
+ /* i18n: cagney/2005-02-11: Below needs to be merged into a
+ single string. */
if (b->pending)
{
- printf_filtered (" (%s) pending.", b->addr_string);
+ printf_filtered (_(" (%s) pending."), b->addr_string);
}
else
{
@@ -5511,9 +5509,9 @@ thbreak_command (char *arg, int from_tty
static void
stop_command (char *arg, int from_tty)
{
- printf_filtered ("Specify the type of breakpoint to set.\n\
+ printf_filtered (_("Specify the type of breakpoint to set.\n\
Usage: stop in <function | address>\n\
- stop at <line>\n");
+ stop at <line>\n"));
}
static void
@@ -5544,7 +5542,7 @@ stopin_command (char *arg, int from_tty)
}
if (badInput)
- printf_filtered ("Usage: stop in <function | address>\n");
+ printf_filtered (_("Usage: stop in <function | address>\n"));
else
break_command_1 (arg, 0, from_tty, NULL);
}
@@ -5576,7 +5574,7 @@ stopat_command (char *arg, int from_tty)
}
if (badInput)
- printf_filtered ("Usage: stop at <line>\n");
+ printf_filtered (_("Usage: stop at <line>\n"));
else
break_command_1 (arg, 0, from_tty, NULL);
}
@@ -6277,10 +6275,10 @@ print_exception_catchpoint (struct break
annotate_catchpoint (b->number);
if (strstr (b->addr_string, "throw") != NULL)
- printf_filtered ("\nCatchpoint %d (exception thrown)\n",
+ printf_filtered (_("\nCatchpoint %d (exception thrown)\n"),
b->number);
else
- printf_filtered ("\nCatchpoint %d (exception caught)\n",
+ printf_filtered (_("\nCatchpoint %d (exception caught)\n"),
b->number);
return PRINT_SRC_AND_LOC;
@@ -6306,9 +6304,9 @@ static void
print_mention_exception_catchpoint (struct breakpoint *b)
{
if (strstr (b->addr_string, "throw") != NULL)
- printf_filtered ("Catchpoint %d (throw)", b->number);
+ printf_filtered (_("Catchpoint %d (throw)"), b->number);
else
- printf_filtered ("Catchpoint %d (catch)", b->number);
+ printf_filtered (_("Catchpoint %d (catch)"), b->number);
}
static struct breakpoint_ops gnu_v3_exception_catchpoint_ops = {
@@ -6651,7 +6649,12 @@ clear_command (char *arg, int from_tty)
if (found->next)
from_tty = 1; /* Always report if deleted more than one */
if (from_tty)
- printf_unfiltered ("Deleted breakpoint%s ", found->next ? "s" : "");
+ {
+ if (!found->next)
+ printf_unfiltered (_("Deleted breakpoint "));
+ else
+ printf_unfiltered (_("Deleted breakpoints "));
+ }
breakpoints_changed ();
while (found)
{
@@ -7143,7 +7146,7 @@ breakpoint_re_set_one (void *bint)
break;
default:
- printf_filtered ("Deleting unknown breakpoint type %d\n", b->type);
+ printf_filtered (_("Deleting unknown breakpoint type %d\n"), b->type);
/* fall through */
/* Delete longjmp and overlay event breakpoints; they will be
reset later by breakpoint_re_set. */
@@ -7243,13 +7246,13 @@ set_ignore_count (int bptnum, int count,
if (from_tty)
{
if (count == 0)
- printf_filtered ("Will stop next time breakpoint %d is reached.",
+ printf_filtered (_("Will stop next time breakpoint %d is reached."),
bptnum);
else if (count == 1)
- printf_filtered ("Will ignore next crossing of breakpoint %d.",
+ printf_filtered (_("Will ignore next crossing of breakpoint %d."),
bptnum);
else
- printf_filtered ("Will ignore next %d crossings of breakpoint %d.",
+ printf_filtered (_("Will ignore next %d crossings of breakpoint %d."),
count, bptnum);
}
breakpoints_changed ();
@@ -7332,7 +7335,7 @@ map_breakpoint_numbers (char *args, void
break;
}
if (match == 0)
- printf_unfiltered ("No breakpoint number %d.\n", num);
+ printf_unfiltered (_("No breakpoint number %d.\n"), num);
}
p = p1;
}
@@ -7455,9 +7458,9 @@ do_enable_breakpoint (struct breakpoint
fr = frame_find_by_id (bpt->watchpoint_frame);
if (fr == NULL)
{
- printf_filtered ("\
+ printf_filtered (_("\
Cannot enable watchpoint %d because the block in which its expression\n\
-is valid is not currently in scope.\n", bpt->number);
+is valid is not currently in scope.\n"), bpt->number);
bpt->enable_state = bp_disabled;
return;
}
@@ -7486,9 +7489,9 @@ is valid is not currently in scope.\n",
bp_watchpoint in the following condition */
if (target_resources_ok < 0)
{
- printf_filtered ("\
+ printf_filtered (_("\
Cannot enable watchpoint %d because target watch resources\n\
-have been allocated for other watchpoints.\n", bpt->number);
+have been allocated for other watchpoints.\n"), bpt->number);
bpt->enable_state = bp_disabled;
value_free_to_mark (mark);
return;
Index: corelow.c
===================================================================
RCS file: /cvs/src/src/gdb/corelow.c,v
retrieving revision 1.45
diff -p -u -r1.45 corelow.c
--- corelow.c 11 Feb 2005 04:05:45 -0000 1.45
+++ corelow.c 12 Feb 2005 00:38:03 -0000
@@ -373,7 +373,7 @@ core_open (char *filename, int from_tty)
p = bfd_core_file_failing_command (core_bfd);
if (p)
- printf_filtered ("Core was generated by `%s'.\n", p);
+ printf_filtered (_("Core was generated by `%s'.\n"), p);
siggy = bfd_core_file_failing_signal (core_bfd);
if (siggy > 0)
@@ -381,7 +381,7 @@ core_open (char *filename, int from_tty)
into gdb's internal signal value. Unfortunately gdb's internal
value is called ``target_signal'' and this function got the
name ..._from_host(). */
- printf_filtered ("Program terminated with signal %d, %s.\n", siggy,
+ printf_filtered (_("Program terminated with signal %d, %s.\n"), siggy,
target_signal_to_string (target_signal_from_host (siggy)));
/* Build up thread list from BFD sections. */
@@ -422,7 +422,7 @@ core_detach (char *args, int from_tty)
unpush_target (&core_ops);
reinit_frame_cache ();
if (from_tty)
- printf_filtered ("No core file now.\n");
+ printf_filtered (_("No core file now.\n"));
}
Index: cp-namespace.c
===================================================================
RCS file: /cvs/src/src/gdb/cp-namespace.c,v
retrieving revision 1.14
diff -p -u -r1.14 cp-namespace.c
--- cp-namespace.c 11 Feb 2005 18:13:48 -0000 1.14
+++ cp-namespace.c 12 Feb 2005 00:38:03 -0000
@@ -849,7 +849,7 @@ static void
maintenance_cplus_namespace (char *args, int from_tty)
{
struct objfile *objfile;
- printf_unfiltered ("Possible namespaces:\n");
+ printf_unfiltered (_("Possible namespaces:\n"));
ALL_OBJFILES (objfile)
{
struct dict_iterator iter;
Index: cp-support.c
===================================================================
RCS file: /cvs/src/src/gdb/cp-support.c,v
retrieving revision 1.15
diff -p -u -r1.15 cp-support.c
--- cp-support.c 11 Feb 2005 18:13:48 -0000 1.15
+++ cp-support.c 12 Feb 2005 00:38:03 -0000
@@ -720,7 +720,7 @@ cp_lookup_rtti_type (const char *name, s
static void
maint_cplus_command (char *arg, int from_tty)
{
- printf_unfiltered ("\"maintenance cplus\" must be followed by the name of a command.\n");
+ printf_unfiltered (_("\"maintenance cplus\" must be followed by the name of a command.\n"));
help_list (maint_cplus_cmd_list, "maintenance cplus ", -1, gdb_stdout);
}
Index: dcache.c
===================================================================
RCS file: /cvs/src/src/gdb/dcache.c,v
retrieving revision 1.19
diff -p -u -r1.19 dcache.c
--- dcache.c 26 Jul 2004 14:52:59 -0000 1.19
+++ dcache.c 12 Feb 2005 00:38:03 -0000
@@ -558,22 +558,22 @@ dcache_info (char *exp, int tty)
{
struct dcache_block *p;
- printf_filtered ("Dcache line width %d, depth %d\n",
+ printf_filtered (_("Dcache line width %d, depth %d\n"),
LINE_SIZE, DCACHE_SIZE);
if (last_cache)
{
- printf_filtered ("Cache state:\n");
+ printf_filtered (_("Cache state:\n"));
for (p = last_cache->valid_head; p; p = p->p)
{
int j;
- printf_filtered ("Line at %s, referenced %d times\n",
+ printf_filtered (_("Line at %s, referenced %d times\n"),
paddr (p->addr), p->refs);
for (j = 0; j < LINE_SIZE; j++)
printf_filtered ("%02x", p->data[j] & 0xFF);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
for (j = 0; j < LINE_SIZE; j++)
printf_filtered ("%2x", p->state[j]);
Index: demangle.c
===================================================================
RCS file: /cvs/src/src/gdb/demangle.c,v
retrieving revision 1.14
diff -p -u -r1.14 demangle.c
--- demangle.c 11 Feb 2005 04:05:46 -0000 1.14
+++ demangle.c 12 Feb 2005 00:38:03 -0000
@@ -105,10 +105,10 @@ set_demangling_command (char *ignore, in
{
if (*current_demangling_style_string != '\0')
{
- printf_unfiltered ("Unknown demangling style `%s'.\n",
+ printf_unfiltered (_("Unknown demangling style `%s'.\n"),
current_demangling_style_string);
}
- printf_unfiltered ("The currently understood settings are:\n\n");
+ printf_unfiltered (_("The currently understood settings are:\n\n"));
for (dem = libiberty_demanglers;
dem->demangling_style != unknown_demangling;
dem++)
Index: dsrec.c
===================================================================
RCS file: /cvs/src/src/gdb/dsrec.c,v
retrieving revision 1.17
diff -p -u -r1.17 dsrec.c
--- dsrec.c 11 Feb 2005 18:13:49 -0000 1.17
+++ dsrec.c 12 Feb 2005 00:38:03 -0000
@@ -64,13 +64,13 @@ load_srec (struct serial *desc, const ch
abfd = bfd_openr (file, 0);
if (!abfd)
{
- printf_filtered ("Unable to open file %s\n", file);
+ printf_filtered (_("Unable to open file %s\n"), file);
return;
}
if (bfd_check_format (abfd, bfd_object) == 0)
{
- printf_filtered ("File is not an object file\n");
+ printf_filtered (_("File is not an object file\n"));
return;
}
Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.172
diff -p -u -r1.172 dwarf2read.c
--- dwarf2read.c 11 Feb 2005 18:13:49 -0000 1.172
+++ dwarf2read.c 12 Feb 2005 00:38:03 -0000
@@ -2315,7 +2315,7 @@ dwarf2_psymtab_to_symtab (struct partial
{
if (info_verbose)
{
- printf_filtered ("Reading in symbols for %s...", pst->filename);
+ printf_filtered (_("Reading in symbols for %s..."), pst->filename);
gdb_flush (gdb_stdout);
}
@@ -2327,7 +2327,7 @@ dwarf2_psymtab_to_symtab (struct partial
/* Finish up the debug error message. */
if (info_verbose)
- printf_filtered ("done.\n");
+ printf_filtered (_("done.\n"));
}
}
}
@@ -2438,6 +2438,7 @@ psymtab_to_symtab_1 (struct partial_symt
/* Inform about additional files that need to be read in. */
if (info_verbose)
{
+ /* FIXME: i18n: Need to make this a single string. */
fputs_filtered (" ", gdb_stdout);
wrap_here ("");
fputs_filtered ("and ", gdb_stdout);
Index: dwarfread.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarfread.c,v
retrieving revision 1.43
diff -p -u -r1.43 dwarfread.c
--- dwarfread.c 11 Feb 2005 18:13:49 -0000 1.43
+++ dwarfread.c 12 Feb 2005 00:38:03 -0000
@@ -2348,6 +2348,8 @@ psymtab_to_symtab_1 (struct partial_symt
/* Inform about additional files that need to be read in. */
if (info_verbose)
{
+ /* FIXME: i18n: Need to make this a single
+ string. */
fputs_filtered (" ", gdb_stdout);
wrap_here ("");
fputs_filtered ("and ", gdb_stdout);
@@ -2367,7 +2369,7 @@ psymtab_to_symtab_1 (struct partial_symt
read_ofile_symtab (pst);
if (info_verbose)
{
- printf_filtered ("%d DIE's, sorting...", diecount);
+ printf_filtered (_("%d DIE's, sorting..."), diecount);
wrap_here ("");
gdb_flush (gdb_stdout);
}
@@ -2415,7 +2417,7 @@ dwarf_psymtab_to_symtab (struct partial_
disconcerting pauses. */
if (info_verbose)
{
- printf_filtered ("Reading in symbols for %s...",
+ printf_filtered (_("Reading in symbols for %s..."),
pst->filename);
gdb_flush (gdb_stdout);
}
@@ -2434,7 +2436,7 @@ dwarf_psymtab_to_symtab (struct partial_
/* Finish up the verbose info message. */
if (info_verbose)
{
- printf_filtered ("done.\n");
+ printf_filtered (_("done.\n"));
gdb_flush (gdb_stdout);
}
}
Index: event-loop.c
===================================================================
RCS file: /cvs/src/src/gdb/event-loop.c,v
retrieving revision 1.23
diff -p -u -r1.23 event-loop.c
--- event-loop.c 11 Feb 2005 18:13:49 -0000 1.23
+++ event-loop.c 12 Feb 2005 00:38:03 -0000
@@ -688,11 +688,11 @@ handle_file_event (int event_file_desc)
/* Work in progress. We may need to tell somebody what
kind of error we had. */
if (error_mask_returned & POLLHUP)
- printf_unfiltered ("Hangup detected on fd %d\n", file_ptr->fd);
+ printf_unfiltered (_("Hangup detected on fd %d\n"), file_ptr->fd);
if (error_mask_returned & POLLERR)
- printf_unfiltered ("Error detected on fd %d\n", file_ptr->fd);
+ printf_unfiltered (_("Error detected on fd %d\n"), file_ptr->fd);
if (error_mask_returned & POLLNVAL)
- printf_unfiltered ("Invalid or non-`poll'able fd %d\n", file_ptr->fd);
+ printf_unfiltered (_("Invalid or non-`poll'able fd %d\n"), file_ptr->fd);
file_ptr->error = 1;
}
else
@@ -706,7 +706,7 @@ handle_file_event (int event_file_desc)
{
if (file_ptr->ready_mask & GDB_EXCEPTION)
{
- printf_unfiltered ("Exception condition detected on fd %d\n", file_ptr->fd);
+ printf_unfiltered (_("Exception condition detected on fd %d\n"), file_ptr->fd);
file_ptr->error = 1;
}
else
Index: event-top.c
===================================================================
RCS file: /cvs/src/src/gdb/event-top.c,v
retrieving revision 1.38
diff -p -u -r1.38 event-top.c
--- event-top.c 11 Feb 2005 04:05:47 -0000 1.38
+++ event-top.c 12 Feb 2005 00:38:03 -0000
@@ -410,7 +410,7 @@ stdin_event_handler (int error, gdb_clie
{
if (error)
{
- printf_unfiltered ("error detected on stdin\n");
+ printf_unfiltered (_("error detected on stdin\n"));
delete_file_handler (input_fd);
discard_all_continuations ();
/* If stdin died, we may as well kill gdb. */
@@ -533,7 +533,7 @@ command_handler (char *command)
{
long cmd_time = get_run_time () - time_at_cmd_start;
- printf_unfiltered ("Command execution time: %ld.%06ld\n",
+ printf_unfiltered (_("Command execution time: %ld.%06ld\n"),
cmd_time / 1000000, cmd_time % 1000000);
}
@@ -544,7 +544,7 @@ command_handler (char *command)
long space_now = lim - lim_at_start;
long space_diff = space_now - space_at_cmd_start;
- printf_unfiltered ("Space used: %ld (%c%ld for this command)\n",
+ printf_unfiltered (_("Space used: %ld (%c%ld for this command)\n"),
space_now,
(space_diff >= 0 ? '+' : '-'),
space_diff);
@@ -572,7 +572,7 @@ command_line_handler_continuation (struc
{
long cmd_time = get_run_time () - time_at_cmd_start;
- printf_unfiltered ("Command execution time: %ld.%06ld\n",
+ printf_unfiltered (_("Command execution time: %ld.%06ld\n"),
cmd_time / 1000000, cmd_time % 1000000);
}
if (display_space)
@@ -582,7 +582,7 @@ command_line_handler_continuation (struc
long space_now = lim - lim_at_start;
long space_diff = space_now - space_at_cmd_start;
- printf_unfiltered ("Space used: %ld (%c%ld for this command)\n",
+ printf_unfiltered (_("Space used: %ld (%c%ld for this command)\n"),
space_now,
(space_diff >= 0 ? '+' : '-'),
space_diff);
@@ -615,9 +615,9 @@ command_line_handler (char *rl)
if (annotation_level > 1 && instream == stdin)
{
- printf_unfiltered ("\n\032\032post-");
+ printf_unfiltered (("\n\032\032post-"));
puts_unfiltered (async_annotation_suffix);
- printf_unfiltered ("\n");
+ printf_unfiltered (("\n"));
}
if (linebuffer == 0)
Index: exec.c
===================================================================
RCS file: /cvs/src/src/gdb/exec.c,v
retrieving revision 1.45
diff -p -u -r1.45 exec.c
--- exec.c 11 Feb 2005 18:13:49 -0000 1.45
+++ exec.c 12 Feb 2005 00:38:03 -0000
@@ -150,7 +150,7 @@ exec_file_clear (int from_tty)
unpush_target (&exec_ops);
if (from_tty)
- printf_unfiltered ("No executable file now.\n");
+ printf_unfiltered (_("No executable file now.\n"));
}
/* Process the first arg in ARGS as the new exec file.
@@ -183,7 +183,7 @@ exec_file_attach (char *filename, int fr
if (!filename)
{
if (from_tty)
- printf_unfiltered ("No executable file now.\n");
+ printf_unfiltered (_("No executable file now.\n"));
}
else
{
@@ -527,10 +527,10 @@ print_section_info (struct target_ops *t
printf_filtered ("\t`%s', ", bfd_get_filename (abfd));
wrap_here (" ");
- printf_filtered ("file type %s.\n", bfd_get_target (abfd));
+ printf_filtered (_("file type %s.\n"), bfd_get_target (abfd));
if (abfd == exec_bfd)
{
- printf_filtered ("\tEntry point: ");
+ printf_filtered (_("\tEntry point: "));
print_address_numeric (bfd_get_start_address (abfd), 1, gdb_stdout);
printf_filtered ("\n");
}
@@ -544,14 +544,13 @@ print_section_info (struct target_ops *t
since most output will then be much wider than necessary. It
may make sense to test the size of the file and choose the
format string accordingly. */
+ /* FIXME: i18n: Need to rewrite this sentence. */
if (info_verbose)
printf_filtered (" @ %s",
hex_string_custom (p->the_bfd_section->filepos, 8));
printf_filtered (" is %s", bfd_section_name (p->bfd, p->the_bfd_section));
if (p->bfd != abfd)
- {
- printf_filtered (" in %s", bfd_get_filename (p->bfd));
- }
+ printf_filtered (" in %s", bfd_get_filename (p->bfd));
printf_filtered ("\n");
}
}
@@ -565,7 +564,7 @@ exec_files_info (struct target_ops *t)
{
struct vmap *vp;
- printf_unfiltered ("\tMapping info for file `%s'.\n", vmap->name);
+ printf_unfiltered (_("\tMapping info for file `%s'.\n"), vmap->name);
printf_unfiltered ("\t %*s %*s %*s %*s %8.8s %s\n",
strlen_paddr (), "tstart",
strlen_paddr (), "tend",
Index: f-valprint.c
===================================================================
RCS file: /cvs/src/src/gdb/f-valprint.c,v
retrieving revision 1.25
diff -p -u -r1.25 f-valprint.c
--- f-valprint.c 11 Feb 2005 04:05:47 -0000 1.25
+++ f-valprint.c 12 Feb 2005 00:38:03 -0000
@@ -597,7 +597,7 @@ list_all_visible_commons (char *funname)
tmp = head_common_list;
- printf_filtered ("All COMMON blocks visible at this level:\n\n");
+ printf_filtered (_("All COMMON blocks visible at this level:\n\n"));
while (tmp != NULL)
{
@@ -683,9 +683,9 @@ info_common_command (char *comname, int
if (the_common)
{
if (strcmp (comname, BLANK_COMMON_NAME_LOCAL) == 0)
- printf_filtered ("Contents of blank COMMON block:\n");
+ printf_filtered (_("Contents of blank COMMON block:\n"));
else
- printf_filtered ("Contents of F77 COMMON block '%s':\n", comname);
+ printf_filtered (_("Contents of F77 COMMON block '%s':\n"), comname);
printf_filtered ("\n");
entry = the_common->entries;
@@ -699,7 +699,7 @@ info_common_command (char *comname, int
}
}
else
- printf_filtered ("Cannot locate the common block %s in function '%s'\n",
+ printf_filtered (_("Cannot locate the common block %s in function '%s'\n"),
comname, funname);
}
Index: gdbtypes.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtypes.c,v
retrieving revision 1.95
diff -p -u -r1.95 gdbtypes.c
--- gdbtypes.c 11 Feb 2005 18:13:49 -0000 1.95
+++ gdbtypes.c 12 Feb 2005 00:38:04 -0000
@@ -2694,13 +2694,9 @@ print_bit_vector (B_TYPE *bits, int nbit
puts_filtered (" ");
}
if (B_TST (bits, bitno))
- {
- printf_filtered ("1");
- }
+ printf_filtered (("1"));
else
- {
- printf_filtered ("0");
- }
+ printf_filtered (("0"));
}
}
@@ -2737,7 +2733,7 @@ dump_fn_fieldlists (struct type *type, i
TYPE_FN_FIELDLIST_NAME (type, method_idx));
gdb_print_host_address (TYPE_FN_FIELDLIST_NAME (type, method_idx),
gdb_stdout);
- printf_filtered (") length %d\n",
+ printf_filtered (_(") length %d\n"),
TYPE_FN_FIELDLIST_LENGTH (type, method_idx));
for (overload_idx = 0;
overload_idx < TYPE_FN_FIELDLIST_LENGTH (type, method_idx);
@@ -2857,7 +2853,7 @@ print_bound_type (int bt)
printf_filtered ("(BOUND_SIMPLE)");
break;
default:
- printf_filtered ("(unknown bound type)");
+ printf_filtered (_("(unknown bound type)"));
break;
}
}
@@ -2887,7 +2883,7 @@ recursive_dump_type (struct type *type,
{
printfi_filtered (spaces, "type node ");
gdb_print_host_address (type, gdb_stdout);
- printf_filtered (" <same as already seen type>\n");
+ printf_filtered (_(" <same as already seen type>\n"));
return;
}
}
@@ -3140,7 +3136,7 @@ recursive_dump_type (struct type *type,
gdb_print_host_address (TYPE_CPLUS_SPECIFIC (type), gdb_stdout);
if (TYPE_CPLUS_SPECIFIC (type) != NULL)
{
- printf_filtered (" (unknown data form)");
+ printf_filtered (_(" (unknown data form)"));
}
printf_filtered ("\n");
break;
Index: inf-loop.c
===================================================================
RCS file: /cvs/src/src/gdb/inf-loop.c,v
retrieving revision 1.2
diff -p -u -r1.2 inf-loop.c
--- inf-loop.c 12 Jan 2005 18:31:31 -0000 1.2
+++ inf-loop.c 12 Feb 2005 00:38:04 -0000
@@ -48,7 +48,7 @@ inferior_event_handler (enum inferior_ev
switch (event_type)
{
case INF_ERROR:
- printf_unfiltered ("error detected from target.\n");
+ printf_unfiltered (_("error detected from target.\n"));
target_async (NULL, 0);
pop_target ();
discard_all_continuations ();
@@ -94,7 +94,7 @@ inferior_event_handler (enum inferior_ev
case INF_TIMER:
default:
- printf_unfiltered ("Event type not recognized.\n");
+ printf_unfiltered (_("Event type not recognized.\n"));
break;
}
}
@@ -128,6 +128,6 @@ complete_execution (void)
else
{
if (exec_done_display_p)
- printf_unfiltered ("completed.\n");
+ printf_unfiltered (_("completed.\n"));
}
}
Index: inf-ptrace.c
===================================================================
RCS file: /cvs/src/src/gdb/inf-ptrace.c,v
retrieving revision 1.18
diff -p -u -r1.18 inf-ptrace.c
--- inf-ptrace.c 11 Feb 2005 18:13:50 -0000 1.18
+++ inf-ptrace.c 12 Feb 2005 00:38:04 -0000
@@ -202,10 +202,10 @@ inf_ptrace_attach (char *args, int from_
exec_file = (char *) get_exec_file (0);
if (exec_file)
- printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
- printf_unfiltered ("Attaching to %s\n",
+ printf_unfiltered (_("Attaching to %s\n"),
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
@@ -254,7 +254,7 @@ inf_ptrace_detach (char *args, int from_
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
@@ -280,7 +280,7 @@ inf_ptrace_detach (char *args, int from_
static void
inf_ptrace_files_info (struct target_ops *ignore)
{
- printf_unfiltered ("\tUsing the running image of %s %s.\n",
+ printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
attach_flag ? "attached" : "child",
target_pid_to_str (inferior_ptid));
}
Index: inf-ttrace.c
===================================================================
RCS file: /cvs/src/src/gdb/inf-ttrace.c,v
retrieving revision 1.7
diff -p -u -r1.7 inf-ttrace.c
--- inf-ttrace.c 11 Feb 2005 18:13:50 -0000 1.7
+++ inf-ttrace.c 12 Feb 2005 00:38:04 -0000
@@ -415,13 +415,13 @@ static void
inf_ttrace_prepare (void)
{
if (pipe (inf_ttrace_pfd1) == -1)
- perror_with_name ("pipe");
+ perror_with_name (("pipe"));
if (pipe (inf_ttrace_pfd2) == -1)
{
close (inf_ttrace_pfd1[0]);
close (inf_ttrace_pfd2[0]);
- perror_with_name ("pipe");
+ perror_with_name (("pipe"));
}
}
@@ -568,7 +568,7 @@ inf_ttrace_attach (char *args, int from_
ttevent_t tte;
if (!args)
- error_no_arg ("process-id to attach");
+ error_no_arg (_("process-id to attach"));
dummy = args;
pid = strtol (args, &dummy, 0);
@@ -583,10 +583,10 @@ inf_ttrace_attach (char *args, int from_
exec_file = (char *) get_exec_file (0);
if (exec_file)
- printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
- printf_unfiltered ("Attaching to %s\n",
+ printf_unfiltered (_("Attaching to %s\n"),
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
@@ -630,7 +630,7 @@ inf_ttrace_detach (char *args, int from_
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
@@ -709,7 +709,7 @@ inf_ttrace_wait (ptid_t ptid, struct tar
set_sigio_trap ();
if (ttrace_wait (pid, lwpid, TTRACE_WAITOK, &tts, sizeof tts) == -1)
- perror_with_name ("ttrace_wait");
+ perror_with_name (("ttrace_wait"));
clear_sigio_trap ();
clear_sigint_trap ();
@@ -757,14 +757,14 @@ inf_ttrace_wait (ptid_t ptid, struct tar
add_thread (ptid_build (tts.tts_pid, tts.tts_lwpid, 0));
inf_ttrace_num_lwps++;
}
- printf_filtered ("[New %s]\n", target_pid_to_str (ptid));
+ printf_filtered (_("[New %s]\n"), target_pid_to_str (ptid));
add_thread (ptid);
inf_ttrace_num_lwps++;
ptid = ptid_build (tts.tts_pid, tts.tts_lwpid, 0);
break;
case TTEVT_LWP_EXIT:
- printf_filtered("[%s exited]\n", target_pid_to_str (ptid));
+ printf_filtered(_("[%s exited]\n"), target_pid_to_str (ptid));
delete_thread (ptid);
inf_ttrace_num_lwps--;
/* If we don't return -1 here, core GDB will re-add the thread. */
@@ -774,7 +774,7 @@ inf_ttrace_wait (ptid_t ptid, struct tar
case TTEVT_LWP_TERMINATE:
lwpid = tts.tts_u.tts_thread.tts_target_lwpid;
ptid = ptid_build (tts.tts_pid, lwpid, 0);
- printf_filtered("[%s has been terminated]\n", target_pid_to_str (ptid));
+ printf_filtered(_("[%s has been terminated]\n"), target_pid_to_str (ptid));
delete_thread (ptid);
inf_ttrace_num_lwps--;
ptid = ptid_build (tts.tts_pid, tts.tts_lwpid, 0);
@@ -890,7 +890,7 @@ inf_ttrace_xfer_partial (struct target_o
static void
inf_ttrace_files_info (struct target_ops *ignore)
{
- printf_unfiltered ("\tUsing the running image of %s %s.\n",
+ printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
attach_flag ? "attached" : "child",
target_pid_to_str (inferior_ptid));
}
Index: infcmd.c
===================================================================
RCS file: /cvs/src/src/gdb/infcmd.c,v
retrieving revision 1.129
diff -p -u -r1.129 infcmd.c
--- infcmd.c 11 Feb 2005 18:13:50 -0000 1.129
+++ infcmd.c 12 Feb 2005 00:38:04 -0000
@@ -563,7 +563,7 @@ continue_command (char *proc_count_exp,
}
if (from_tty)
- printf_filtered ("Continuing.\n");
+ printf_filtered (_("Continuing.\n"));
clear_proceed_status ();
@@ -666,9 +666,9 @@ step_1 (int skip_subroutines, int single
error (_("Cannot find bounds of current function"));
target_terminal_ours ();
- printf_filtered ("\
+ printf_filtered (_("\
Single stepping until exit from function %s, \n\
-which has no line number information.\n", name);
+which has no line number information.\n"), name);
}
}
else
@@ -771,9 +771,9 @@ step_once (int skip_subroutines, int sin
error (_("Cannot find bounds of current function"));
target_terminal_ours ();
- printf_filtered ("\
+ printf_filtered (_("\
Single stepping until exit from function %s, \n\
-which has no line number information.\n", name);
+which has no line number information.\n"), name);
}
}
else
@@ -888,7 +888,7 @@ jump_command (char *arg, int from_tty)
if (from_tty)
{
- printf_filtered ("Continuing at ");
+ printf_filtered (_("Continuing at "));
print_address_numeric (addr, 1, gdb_stdout);
printf_filtered (".\n");
}
@@ -944,9 +944,9 @@ signal_command (char *signum_exp, int fr
if (from_tty)
{
if (oursig == TARGET_SIGNAL_0)
- printf_filtered ("Continuing with no signal.\n");
+ printf_filtered (_("Continuing with no signal.\n"));
else
- printf_filtered ("Continuing with signal %s.\n",
+ printf_filtered (_("Continuing with signal %s.\n"),
target_signal_to_name (oursig));
}
@@ -1242,7 +1242,7 @@ finish_command (char *arg, int from_tty)
source. */
if (from_tty)
{
- printf_filtered ("Run till exit from ");
+ printf_filtered (_("Run till exit from "));
print_stack_frame (get_selected_frame (NULL), 1, LOCATION);
}
@@ -1312,15 +1312,15 @@ program_info (char *args, int from_tty)
if (!target_has_execution)
{
- printf_filtered ("The program being debugged is not being run.\n");
+ printf_filtered (_("The program being debugged is not being run.\n"));
return;
}
target_files_info ();
- printf_filtered ("Program stopped at %s.\n",
+ printf_filtered (_("Program stopped at %s.\n"),
hex_string ((unsigned long) stop_pc));
if (stop_step)
- printf_filtered ("It stopped after being stepped.\n");
+ printf_filtered (_("It stopped after being stepped.\n"));
else if (num != 0)
{
/* There may be several breakpoints in the same place, so this
@@ -1329,25 +1329,25 @@ program_info (char *args, int from_tty)
{
if (num < 0)
{
- printf_filtered ("It stopped at a breakpoint that has ");
- printf_filtered ("since been deleted.\n");
+ printf_filtered (_("\
+It stopped at a breakpoint that has since been deleted.\n"));
}
else
- printf_filtered ("It stopped at breakpoint %d.\n", num);
+ printf_filtered (_("It stopped at breakpoint %d.\n"), num);
num = bpstat_num (&bs);
}
}
else if (stop_signal != TARGET_SIGNAL_0)
{
- printf_filtered ("It stopped with signal %s, %s.\n",
+ printf_filtered (_("It stopped with signal %s, %s.\n"),
target_signal_to_name (stop_signal),
target_signal_to_string (stop_signal));
}
if (!from_tty)
{
- printf_filtered ("Type \"info stack\" or \"info registers\" ");
- printf_filtered ("for more information.\n");
+ printf_filtered (_("\
+Type \"info stack\" or \"info registers\" for more information.\n"));
}
}
\f
@@ -1435,8 +1435,9 @@ set_environment_command (char *arg, int
var = savestring (arg, p - arg);
if (nullset)
{
- printf_filtered ("Setting environment variable ");
- printf_filtered ("\"%s\" to null value.\n", var);
+ printf_filtered (_("\
+Setting environment variable \"%s\" to null value.\n"),
+ var);
set_in_environ (inferior_environ, var, "");
}
else
@@ -1965,8 +1966,8 @@ float_info (char *args, int from_tty)
static void
unset_command (char *args, int from_tty)
{
- printf_filtered ("\"unset\" must be followed by the name of ");
- printf_filtered ("an unset subcommand.\n");
+ printf_filtered (_("\
+\"unset\" must be followed by the name of an unset subcommand.\n"));
help_list (unsetlist, "unset ", -1, gdb_stdout);
}
Index: inflow.c
===================================================================
RCS file: /cvs/src/src/gdb/inflow.c,v
retrieving revision 1.27
diff -p -u -r1.27 inflow.c
--- inflow.c 11 Feb 2005 18:13:50 -0000 1.27
+++ inflow.c 12 Feb 2005 00:38:04 -0000
@@ -429,11 +429,11 @@ child_terminal_info (char *args, int fro
{
if (!gdb_has_a_terminal ())
{
- printf_filtered ("This GDB does not control a terminal.\n");
+ printf_filtered (_("This GDB does not control a terminal.\n"));
return;
}
- printf_filtered ("Inferior's terminal status (currently saved by GDB):\n");
+ printf_filtered (_("Inferior's terminal status (currently saved by GDB):\n"));
/* First the fcntl flags. */
{
@@ -590,7 +590,7 @@ kill_command (char *arg, int from_tty)
print the state we are left in. */
if (target_has_stack)
{
- printf_filtered ("In %s,\n", target_longname);
+ printf_filtered (_("In %s,\n"), target_longname);
if (deprecated_selected_frame == NULL)
fputs_filtered ("No selected stack frame.\n", gdb_stdout);
else
Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.191
diff -p -u -r1.191 infrun.c
--- infrun.c 11 Feb 2005 18:13:50 -0000 1.191
+++ infrun.c 12 Feb 2005 00:38:04 -0000
@@ -390,7 +390,7 @@ follow_exec (int pid, char *execd_pathna
step_range_end = 0;
/* What is this a.out's name? */
- printf_unfiltered ("Executing new program: %s\n", execd_pathname);
+ printf_unfiltered (_("Executing new program: %s\n"), execd_pathname);
/* We've followed the inferior through an exec. Therefore, the
inferior has essentially been killed & reborn. */
@@ -2939,7 +2939,7 @@ normal_stop (void)
&& last.kind != TARGET_WAITKIND_EXITED)
{
target_terminal_ours_for_output ();
- printf_filtered ("[Switching to %s]\n",
+ printf_filtered (_("[Switching to %s]\n"),
target_pid_or_tid_to_str (inferior_ptid));
previous_inferior_ptid = inferior_ptid;
}
@@ -2960,10 +2960,10 @@ normal_stop (void)
if (remove_breakpoints ())
{
target_terminal_ours_for_output ();
- printf_filtered ("Cannot remove breakpoints because ");
- printf_filtered ("program is no longer writable.\n");
- printf_filtered ("It might be running in another process.\n");
- printf_filtered ("Further execution is probably impossible.\n");
+ printf_filtered (_("\
+Cannot remove breakpoints because program is no longer writable.\n\
+It might be running in another process.\n\
+Further execution is probably impossible.\n"));
}
}
breakpoints_inserted = 0;
@@ -3145,8 +3145,8 @@ signal_pass_update (int signo, int state
static void
sig_print_header (void)
{
- printf_filtered ("\
-Signal Stop\tPrint\tPass to program\tDescription\n");
+ printf_filtered (_("\
+Signal Stop\tPrint\tPass to program\tDescription\n"));
}
static void
@@ -3311,7 +3311,7 @@ Are you sure you want to change it? ", t
}
else
{
- printf_unfiltered ("Not confirmed, unchanged.\n");
+ printf_unfiltered (_("Not confirmed, unchanged.\n"));
gdb_flush (gdb_stdout);
}
}
@@ -3407,7 +3407,7 @@ xdb_handle_command (char *args, int from
if (validFlag)
handle_command (argBuf, from_tty);
else
- printf_filtered ("Invalid signal handling flag.\n");
+ printf_filtered (_("Invalid signal handling flag.\n"));
if (argBuf)
xfree (argBuf);
}
@@ -3453,7 +3453,7 @@ signals_info (char *signum_exp, int from
sig_print_info (oursig);
}
- printf_filtered ("\nUse the \"handle\" command to change these tables.\n");
+ printf_filtered (_("\nUse the \"handle\" command to change these tables.\n"));
}
\f
struct inferior_status
Index: inftarg.c
===================================================================
RCS file: /cvs/src/src/gdb/inftarg.c,v
retrieving revision 1.40
diff -p -u -r1.40 inftarg.c
--- inftarg.c 11 Feb 2005 18:13:50 -0000 1.40
+++ inftarg.c 12 Feb 2005 00:38:04 -0000
@@ -198,10 +198,10 @@ child_attach (char *args, int from_tty)
exec_file = (char *) get_exec_file (0);
if (exec_file)
- printf_unfiltered ("Attaching to program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
else
- printf_unfiltered ("Attaching to %s\n",
+ printf_unfiltered (_("Attaching to %s\n"),
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
@@ -245,7 +245,7 @@ child_detach (char *args, int from_tty)
char *exec_file = get_exec_file (0);
if (exec_file == 0)
exec_file = "";
- printf_unfiltered ("Detaching from program: %s, %s\n", exec_file,
+ printf_unfiltered (_("Detaching from program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
@@ -277,7 +277,7 @@ child_prepare_to_store (void)
static void
child_files_info (struct target_ops *ignore)
{
- printf_unfiltered ("\tUsing the running image of %s %s.\n",
+ printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid));
}
Index: language.c
===================================================================
RCS file: /cvs/src/src/gdb/language.c,v
retrieving revision 1.56
diff -p -u -r1.56 language.c
--- language.c 11 Feb 2005 18:13:50 -0000 1.56
+++ language.c 12 Feb 2005 00:38:04 -0000
@@ -170,8 +170,9 @@ set_language_command (char *ignore, int
if (!language || !language[0])
{
- printf_unfiltered ("The currently understood settings are:\n\n");
- printf_unfiltered ("local or auto Automatic setting based on source file\n");
+ printf_unfiltered (_("\
+The currently understood settings are:\n\n\
+local or auto Automatic setting based on source file\n"));
for (i = 0; i < languages_size; ++i)
{
@@ -180,8 +181,8 @@ set_language_command (char *ignore, int
|| languages[i]->la_language == language_auto)
continue;
- /* FIXME for now assume that the human-readable name is just
- a capitalization of the internal name. */
+ /* FIXME: i18n: for now assume that the human-readable name
+ is just a capitalization of the internal name. */
printf_unfiltered ("%-16s Use the %c%s language\n",
languages[i]->la_name,
/* Capitalize first letter of language
@@ -513,16 +514,16 @@ language_info (int quietly)
return;
expected_language = current_language;
- printf_unfiltered ("Current language: %s\n", language);
+ printf_unfiltered (_("Current language: %s\n"), language);
show_language_command ((char *) 0, 1);
if (!quietly)
{
- printf_unfiltered ("Type checking: %s\n", type);
+ printf_unfiltered (_("Type checking: %s\n"), type);
show_type_command ((char *) 0, 1);
- printf_unfiltered ("Range checking: %s\n", range);
+ printf_unfiltered (_("Range checking: %s\n"), range);
show_range_command ((char *) 0, 1);
- printf_unfiltered ("Case sensitivity: %s\n", case_sensitive);
+ printf_unfiltered (_("Case sensitivity: %s\n"), case_sensitive);
show_case_command ((char *) 0, 1);
}
}
Index: linespec.c
===================================================================
RCS file: /cvs/src/src/gdb/linespec.c,v
retrieving revision 1.61
diff -p -u -r1.61 linespec.c
--- linespec.c 11 Feb 2005 18:13:50 -0000 1.61
+++ linespec.c 12 Feb 2005 00:38:04 -0000
@@ -500,7 +500,7 @@ decode_line_2 (struct symbol *sym_arr[],
}
i = 0;
- printf_unfiltered ("[0] cancel\n[1] all\n");
+ printf_unfiltered (_("[0] cancel\n[1] all\n"));
while (i < nelts)
{
init_sal (&return_values.sals[i]); /* Initialize to zeroes. */
@@ -515,14 +515,14 @@ decode_line_2 (struct symbol *sym_arr[],
values.sals[i].symtab->filename,
values.sals[i].line);
else
- printf_unfiltered ("[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n",
+ printf_unfiltered (_("[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n"),
(i + 2),
SYMBOL_PRINT_NAME (sym_arr[i]),
values.sals[i].line);
}
else
- printf_unfiltered ("?HERE\n");
+ printf_unfiltered (_("?HERE\n"));
i++;
}
@@ -573,7 +573,7 @@ decode_line_2 (struct symbol *sym_arr[],
if (num >= nelts + 2)
{
- printf_unfiltered ("No choice number %d.\n", num);
+ printf_unfiltered (_("No choice number %d.\n"), num);
}
else
{
@@ -591,7 +591,7 @@ decode_line_2 (struct symbol *sym_arr[],
}
else
{
- printf_unfiltered ("duplicate request for %d ignored.\n", num);
+ printf_unfiltered (_("duplicate request for %d ignored.\n"), num);
}
}
Index: linux-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-nat.c,v
retrieving revision 1.21
diff -p -u -r1.21 linux-nat.c
--- linux-nat.c 11 Feb 2005 18:13:50 -0000 1.21
+++ linux-nat.c 12 Feb 2005 00:38:04 -0000
@@ -822,7 +822,7 @@ lin_lwp_attach_lwp (ptid_t ptid, int ver
}
if (verbose)
- printf_filtered ("[New %s]\n", target_pid_to_str (ptid));
+ printf_filtered (_("[New %s]\n"), target_pid_to_str (ptid));
found_lp = lp = find_lwp_pid (ptid);
if (lp == NULL)
@@ -1218,7 +1218,7 @@ wait_lwp (struct lwp_info *lp)
/* Core GDB cannot deal with us deleting the current thread. */
if (!ptid_equal (lp->ptid, inferior_ptid))
delete_thread (lp->ptid);
- printf_unfiltered ("[%s exited]\n",
+ printf_unfiltered (_("[%s exited]\n"),
target_pid_to_str (lp->ptid));
}
@@ -1470,7 +1470,7 @@ flush_callback (struct lwp_info *lp, voi
if (lp->status)
{
if (debug_linux_nat)
- printf_unfiltered ("FC: LP has pending status %06x\n", lp->status);
+ printf_unfiltered (_("FC: LP has pending status %06x\n"), lp->status);
if (WIFSTOPPED (lp->status) && sigismember (flush_mask, WSTOPSIG (lp->status)))
lp->status = 0;
}
@@ -1967,7 +1967,7 @@ retry:
}
add_thread (lp->ptid);
- printf_unfiltered ("[New %s]\n",
+ printf_unfiltered (_("[New %s]\n"),
target_pid_to_str (lp->ptid));
}
}
@@ -1995,7 +1995,7 @@ retry:
thread. */
if (!ptid_equal (lp->ptid, inferior_ptid))
delete_thread (lp->ptid);
- printf_unfiltered ("[%s exited]\n",
+ printf_unfiltered (_("[%s exited]\n"),
target_pid_to_str (lp->ptid));
}
@@ -2048,7 +2048,7 @@ retry:
thread. */
if (!ptid_equal (lp->ptid, inferior_ptid))
delete_thread (lp->ptid);
- printf_unfiltered ("[%s exited]\n",
+ printf_unfiltered (_("[%s exited]\n"),
target_pid_to_str (lp->ptid));
}
if (debug_linux_nat)
@@ -2729,7 +2729,7 @@ linux_nat_info_proc_cmd (char *args, int
if (stat (fname1, &dummy) != 0)
error (_("No /proc directory: '%s'"), fname1);
- printf_filtered ("process %lld\n", pid);
+ printf_filtered (_("process %lld\n"), pid);
if (cmdline_f || all)
{
sprintf (fname1, "/proc/%lld/cmdline", pid);
@@ -2768,7 +2768,7 @@ linux_nat_info_proc_cmd (char *args, int
long long addr, endaddr, size, offset, inode;
char permissions[8], device[8], filename[MAXPATHLEN];
- printf_filtered ("Mapped address spaces:\n\n");
+ printf_filtered (_("Mapped address spaces:\n\n"));
if (TARGET_ADDR_BIT == 32)
{
printf_filtered ("\t%10s %10s %10s %10s %7s\n",
@@ -2841,34 +2841,34 @@ linux_nat_info_proc_cmd (char *args, int
char ctmp;
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Process: %d\n", itmp);
+ printf_filtered (_("Process: %d\n"), itmp);
if (fscanf (procfile, "%s ", &buffer[0]) > 0)
- printf_filtered ("Exec file: %s\n", buffer);
+ printf_filtered (_("Exec file: %s\n"), buffer);
if (fscanf (procfile, "%c ", &ctmp) > 0)
- printf_filtered ("State: %c\n", ctmp);
+ printf_filtered (_("State: %c\n"), ctmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Parent process: %d\n", itmp);
+ printf_filtered (_("Parent process: %d\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Process group: %d\n", itmp);
+ printf_filtered (_("Process group: %d\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Session id: %d\n", itmp);
+ printf_filtered (_("Session id: %d\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("TTY: %d\n", itmp);
+ printf_filtered (_("TTY: %d\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("TTY owner process group: %d\n", itmp);
+ printf_filtered (_("TTY owner process group: %d\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Flags: 0x%x\n", itmp);
+ printf_filtered (_("Flags: 0x%x\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Minor faults (no memory page): %u\n",
+ printf_filtered (_("Minor faults (no memory page): %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Minor faults, children: %u\n",
+ printf_filtered (_("Minor faults, children: %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Major faults (memory page faults): %u\n",
+ printf_filtered (_("Major faults (memory page faults): %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Major faults, children: %u\n",
+ printf_filtered (_("Major faults, children: %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
printf_filtered ("utime: %d\n", itmp);
@@ -2879,48 +2879,48 @@ linux_nat_info_proc_cmd (char *args, int
if (fscanf (procfile, "%d ", &itmp) > 0)
printf_filtered ("stime, children: %d\n", itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("jiffies remaining in current time slice: %d\n",
+ printf_filtered (_("jiffies remaining in current time slice: %d\n"),
itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
printf_filtered ("'nice' value: %d\n", itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("jiffies until next timeout: %u\n",
+ printf_filtered (_("jiffies until next timeout: %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
printf_filtered ("jiffies until next SIGALRM: %u\n",
(unsigned int) itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("start time (jiffies since system boot): %d\n",
+ printf_filtered (_("start time (jiffies since system boot): %d\n"),
itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Virtual memory size: %u\n",
+ printf_filtered (_("Virtual memory size: %u\n"),
(unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Resident set size: %u\n", (unsigned int) itmp);
+ printf_filtered (_("Resident set size: %u\n"), (unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
printf_filtered ("rlim: %u\n", (unsigned int) itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Start of text: 0x%x\n", itmp);
+ printf_filtered (_("Start of text: 0x%x\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("End of text: 0x%x\n", itmp);
+ printf_filtered (_("End of text: 0x%x\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0)
- printf_filtered ("Start of stack: 0x%x\n", itmp);
+ printf_filtered (_("Start of stack: 0x%x\n"), itmp);
#if 0 /* Don't know how architecture-dependent the rest is...
Anyway the signal bitmap info is available from "status". */
if (fscanf (procfile, "%u ", &itmp) > 0) /* FIXME arch? */
- printf_filtered ("Kernel stack pointer: 0x%x\n", itmp);
+ printf_filtered (_("Kernel stack pointer: 0x%x\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0) /* FIXME arch? */
- printf_filtered ("Kernel instr pointer: 0x%x\n", itmp);
+ printf_filtered (_("Kernel instr pointer: 0x%x\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Pending signals bitmap: 0x%x\n", itmp);
+ printf_filtered (_("Pending signals bitmap: 0x%x\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Blocked signals bitmap: 0x%x\n", itmp);
+ printf_filtered (_("Blocked signals bitmap: 0x%x\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Ignored signals bitmap: 0x%x\n", itmp);
+ printf_filtered (_("Ignored signals bitmap: 0x%x\n"), itmp);
if (fscanf (procfile, "%d ", &itmp) > 0)
- printf_filtered ("Catched signals bitmap: 0x%x\n", itmp);
+ printf_filtered (_("Catched signals bitmap: 0x%x\n"), itmp);
if (fscanf (procfile, "%u ", &itmp) > 0) /* FIXME arch? */
- printf_filtered ("wchan (system call): 0x%x\n", itmp);
+ printf_filtered (_("wchan (system call): 0x%x\n"), itmp);
#endif
fclose (procfile);
}
Index: linux-thread-db.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-thread-db.c,v
retrieving revision 1.3
diff -p -u -r1.3 linux-thread-db.c
--- linux-thread-db.c 11 Feb 2005 04:05:56 -0000 1.3
+++ linux-thread-db.c 12 Feb 2005 00:38:04 -0000
@@ -641,7 +641,7 @@ thread_db_new_objfile (struct objfile *o
if (library == NULL)
/* Paranoid - don't let a NULL path slip through. */
library = LIBTHREAD_DB_SO;
- printf_unfiltered ("Using host libthread_db library \"%s\".\n",
+ printf_unfiltered (_("Using host libthread_db library \"%s\".\n"),
library);
dejavu = 1;
}
@@ -682,7 +682,7 @@ thread_db_new_objfile (struct objfile *o
break;
case TD_OK:
- printf_unfiltered ("[Thread debugging using libthread_db enabled]\n");
+ printf_unfiltered (_("[Thread debugging using libthread_db enabled]\n"));
/* The thread library was detected. Activate the thread_db target. */
push_target (&thread_db_ops);
@@ -743,7 +743,7 @@ attach_thread (ptid_t ptid, const td_thr
memset (tp->private, 0, sizeof (struct private_thread_info));
if (verbose)
- printf_unfiltered ("[New %s]\n", target_pid_to_str (ptid));
+ printf_unfiltered (_("[New %s]\n"), target_pid_to_str (ptid));
if (ti_p->ti_state == TD_THR_UNKNOWN || ti_p->ti_state == TD_THR_ZOMBIE)
return; /* A zombie thread -- do not attach. */
@@ -783,7 +783,7 @@ detach_thread (ptid_t ptid, int verbose)
struct thread_info *thread_info;
if (verbose)
- printf_unfiltered ("[%s exited]\n", target_pid_to_str (ptid));
+ printf_unfiltered (_("[%s exited]\n"), target_pid_to_str (ptid));
/* Don't delete the thread now, because it still reports as active
until it has executed a few instructions after the event
Index: maint.c
===================================================================
RCS file: /cvs/src/src/gdb/maint.c,v
retrieving revision 1.48
diff -p -u -r1.48 maint.c
--- maint.c 11 Feb 2005 18:13:51 -0000 1.48
+++ maint.c 12 Feb 2005 00:38:04 -0000
@@ -87,7 +87,7 @@ int watchdog = 0;
static void
maintenance_command (char *args, int from_tty)
{
- printf_unfiltered ("\"maintenance\" must be followed by the name of a maintenance command.\n");
+ printf_unfiltered (_("\"maintenance\" must be followed by the name of a maintenance command.\n"));
help_list (maintenancelist, "maintenance ", -1, gdb_stdout);
}
@@ -146,7 +146,7 @@ maintenance_demangle (char *args, int fr
if (args == NULL || *args == '\0')
{
- printf_unfiltered ("\"maintenance demangle\" takes an argument to demangle.\n");
+ printf_unfiltered (_("\"maintenance demangle\" takes an argument to demangle.\n"));
}
else
{
@@ -159,7 +159,7 @@ maintenance_demangle (char *args, int fr
}
else
{
- printf_unfiltered ("Can't demangle \"%s\"\n", args);
+ printf_unfiltered (_("Can't demangle \"%s\"\n"), args);
}
}
}
@@ -170,7 +170,7 @@ maintenance_time_display (char *args, in
extern int display_time;
if (args == NULL || *args == '\0')
- printf_unfiltered ("\"maintenance time\" takes a numeric argument.\n");
+ printf_unfiltered (_("\"maintenance time\" takes a numeric argument.\n"));
else
display_time = strtol (args, NULL, 10);
}
@@ -193,7 +193,7 @@ maintenance_space_display (char *args, i
static void
maintenance_info_command (char *arg, int from_tty)
{
- printf_unfiltered ("\"maintenance info\" must be followed by the name of an info command.\n");
+ printf_unfiltered (_("\"maintenance info\" must be followed by the name of an info command.\n"));
help_list (maintenanceinfolist, "maintenance info ", -1, gdb_stdout);
}
@@ -356,10 +356,10 @@ maintenance_info_sections (char *arg, in
{
if (exec_bfd)
{
- printf_filtered ("Exec file:\n");
+ printf_filtered (_("Exec file:\n"));
printf_filtered (" `%s', ", bfd_get_filename (exec_bfd));
wrap_here (" ");
- printf_filtered ("file type %s.\n", bfd_get_target (exec_bfd));
+ printf_filtered (_("file type %s.\n"), bfd_get_target (exec_bfd));
if (arg && *arg && match_substring (arg, "ALLOBJ"))
{
struct objfile *ofile;
@@ -374,7 +374,7 @@ maintenance_info_sections (char *arg, in
ALL_OBJFILES (ofile)
{
- printf_filtered (" Object file: %s\n",
+ printf_filtered (_(" Object file: %s\n"),
bfd_get_filename (ofile->obfd));
ALL_OBJFILE_OSECTIONS (ofile, osect)
{
@@ -388,10 +388,10 @@ maintenance_info_sections (char *arg, in
if (core_bfd)
{
- printf_filtered ("Core file:\n");
+ printf_filtered (_("Core file:\n"));
printf_filtered (" `%s', ", bfd_get_filename (core_bfd));
wrap_here (" ");
- printf_filtered ("file type %s.\n", bfd_get_target (core_bfd));
+ printf_filtered (_("file type %s.\n"), bfd_get_target (core_bfd));
bfd_map_over_sections (core_bfd, print_bfd_section_info, arg);
}
}
@@ -425,7 +425,7 @@ maintenance_print_architecture (char *ar
static void
maintenance_print_command (char *arg, int from_tty)
{
- printf_unfiltered ("\"maintenance print\" must be followed by the name of a print command.\n");
+ printf_unfiltered (_("\"maintenance print\" must be followed by the name of a print command.\n"));
help_list (maintenanceprintlist, "maintenance print ", -1, gdb_stdout);
}
@@ -483,9 +483,9 @@ maintenance_translate_address (char *arg
SYMBOL_PRINT_NAME (sym),
paddr_u (address - SYMBOL_VALUE_ADDRESS (sym)));
else if (sect)
- printf_filtered ("no symbol at %s:0x%s\n", sect->name, paddr (address));
+ printf_filtered (_("no symbol at %s:0x%s\n"), sect->name, paddr (address));
else
- printf_filtered ("no symbol at 0x%s\n", paddr (address));
+ printf_filtered (_("no symbol at 0x%s\n"), paddr (address));
return;
}
@@ -500,9 +500,9 @@ maintenance_deprecate (char *args, int f
{
if (args == NULL || *args == '\0')
{
- printf_unfiltered ("\"maintenance deprecate\" takes an argument, \n\
+ printf_unfiltered (_("\"maintenance deprecate\" takes an argument, \n\
the command you want to deprecate, and optionally the replacement command \n\
-enclosed in quotes.\n");
+enclosed in quotes.\n"));
}
maintenance_do_deprecate (args, 1);
@@ -515,8 +515,8 @@ maintenance_undeprecate (char *args, int
{
if (args == NULL || *args == '\0')
{
- printf_unfiltered ("\"maintenance undeprecate\" takes an argument, \n\
-the command you want to undeprecate.\n");
+ printf_unfiltered (_("\"maintenance undeprecate\" takes an argument, \n\
+the command you want to undeprecate.\n"));
}
maintenance_do_deprecate (args, 0);
@@ -548,7 +548,7 @@ maintenance_do_deprecate (char *text, in
if (!lookup_cmd_composition (text, &alias, &prefix_cmd, &cmd))
{
- printf_filtered ("Can't find command '%s' to deprecate.\n", text);
+ printf_filtered (_("Can't find command '%s' to deprecate.\n"), text);
return;
}
@@ -615,7 +615,7 @@ struct cmd_list_element *maintenance_sho
static void
maintenance_set_cmd (char *args, int from_tty)
{
- printf_unfiltered ("\"maintenance set\" must be followed by the name of a set command.\n");
+ printf_unfiltered (_("\"maintenance set\" must be followed by the name of a set command.\n"));
help_list (maintenance_set_cmdlist, "maintenance set ", -1, gdb_stdout);
}
Index: mdebugread.c
===================================================================
RCS file: /cvs/src/src/gdb/mdebugread.c,v
retrieving revision 1.75
diff -p -u -r1.75 mdebugread.c
--- mdebugread.c 11 Feb 2005 18:13:51 -0000 1.75
+++ mdebugread.c 12 Feb 2005 00:38:05 -0000
@@ -311,7 +311,7 @@ mdebug_psymtab_to_symtab (struct partial
if (info_verbose)
{
- printf_filtered ("Reading in symbols for %s...", pst->filename);
+ printf_filtered (_("Reading in symbols for %s..."), pst->filename);
gdb_flush (gdb_stdout);
}
@@ -324,7 +324,7 @@ mdebug_psymtab_to_symtab (struct partial
scan_file_globals (pst->objfile);
if (info_verbose)
- printf_filtered ("done.\n");
+ printf_filtered (_("done.\n"));
}
\f
/* File-level interface functions */
@@ -407,9 +407,9 @@ mdebug_build_psymtabs (struct objfile *o
if (compare_glevel (max_glevel, GLEVEL_2) < 0)
{
if (max_gdbinfo == 0)
- printf_unfiltered ("\n%s not compiled with -g, debugging support is limited.\n",
+ printf_unfiltered (_("\n%s not compiled with -g, debugging support is limited.\n"),
objfile->name);
- printf_unfiltered ("You should compile with -g2 or -g3 for best debugging support.\n");
+ printf_unfiltered (_("You should compile with -g2 or -g3 for best debugging support.\n"));
gdb_flush (gdb_stdout);
}
#endif
@@ -2043,7 +2043,7 @@ parse_external (EXTR *es, int bigend, st
n_undef_symbols++;
/* FIXME: Turn this into a complaint? */
if (info_verbose)
- printf_filtered ("Warning: %s `%s' is undefined (in %s)\n",
+ printf_filtered (_("Warning: %s `%s' is undefined (in %s)\n"),
what, debug_info->ssext + es->asym.iss,
fdr_name (cur_fdr));
return;
@@ -4109,7 +4109,7 @@ psymtab_to_symtab_1 (struct partial_symt
from a shared library, so tell the user only if verbose is on. */
if (info_verbose && n_undef_symbols)
{
- printf_filtered ("File %s contains %d unresolved references:",
+ printf_filtered (_("File %s contains %d unresolved references:"),
st->filename, n_undef_symbols);
printf_filtered ("\n\t%4d variables\n\t%4d procedures\n\t%4d labels\n",
n_undef_vars, n_undef_procs, n_undef_labels);
Index: memattr.c
===================================================================
RCS file: /cvs/src/src/gdb/memattr.c,v
retrieving revision 1.18
diff -p -u -r1.18 memattr.c
--- memattr.c 11 Feb 2005 18:13:51 -0000 1.18
+++ memattr.c 12 Feb 2005 00:38:05 -0000
@@ -49,7 +49,7 @@ create_mem_region (CORE_ADDR lo, CORE_AD
/* lo == hi is a useless empty region */
if (lo >= hi && hi != 0)
{
- printf_unfiltered ("invalid memory region: low >= high\n");
+ printf_unfiltered (_("invalid memory region: low >= high\n"));
return NULL;
}
@@ -61,7 +61,7 @@ create_mem_region (CORE_ADDR lo, CORE_AD
|| (hi > n->lo && (hi <= n->hi || n->hi == 0))
|| (lo <= n->lo && (hi >= n->hi || hi == 0)))
{
- printf_unfiltered ("overlapping memory region\n");
+ printf_unfiltered (_("overlapping memory region\n"));
return NULL;
}
n = n->next;
@@ -218,7 +218,7 @@ mem_info_command (char *args, int from_t
if (!mem_region_chain)
{
- printf_unfiltered ("There are no memory regions defined.\n");
+ printf_unfiltered (_("There are no memory regions defined.\n"));
return;
}
@@ -346,7 +346,7 @@ mem_enable (int num)
m->enabled_p = 1;
return;
}
- printf_unfiltered ("No memory region number %d.\n", num);
+ printf_unfiltered (_("No memory region number %d.\n"), num);
}
static void
@@ -396,7 +396,7 @@ mem_disable (int num)
m->enabled_p = 0;
return;
}
- printf_unfiltered ("No memory region number %d.\n", num);
+ printf_unfiltered (_("No memory region number %d.\n"), num);
}
static void
@@ -455,7 +455,7 @@ mem_delete (int num)
if (!mem_region_chain)
{
- printf_unfiltered ("No memory region number %d.\n", num);
+ printf_unfiltered (_("No memory region number %d.\n"), num);
return;
}
Index: monitor.c
===================================================================
RCS file: /cvs/src/src/gdb/monitor.c,v
retrieving revision 1.57
diff -p -u -r1.57 monitor.c
--- monitor.c 11 Feb 2005 18:13:51 -0000 1.57
+++ monitor.c 12 Feb 2005 00:38:05 -0000
@@ -839,7 +839,7 @@ monitor_open (char *args, struct monitor
}
if (from_tty)
- printf_unfiltered ("Remote target %s connected to %s\n", name, dev_name);
+ printf_unfiltered (_("Remote target %s connected to %s\n"), name, dev_name);
push_target (targ_ops);
@@ -879,7 +879,7 @@ monitor_detach (char *args, int from_tty
{
pop_target (); /* calls monitor_close to do the real work */
if (from_tty)
- printf_unfiltered ("Ending remote %s debugging\n", target_shortname);
+ printf_unfiltered (_("Ending remote %s debugging\n"), target_shortname);
}
/* Convert VALSTR into the target byte-ordered value of REGNO and store it. */
@@ -1411,7 +1411,7 @@ monitor_prepare_to_store (void)
static void
monitor_files_info (struct target_ops *ops)
{
- printf_unfiltered ("\tAttached to %s at %d baud.\n", dev_name, baud_rate);
+ printf_unfiltered (_("\tAttached to %s at %d baud.\n"), dev_name, baud_rate);
}
static int
Index: objc-lang.c
===================================================================
RCS file: /cvs/src/src/gdb/objc-lang.c,v
retrieving revision 1.45
diff -p -u -r1.45 objc-lang.c
--- objc-lang.c 11 Feb 2005 18:13:51 -0000 1.45
+++ objc-lang.c 12 Feb 2005 00:38:05 -0000
@@ -899,7 +899,7 @@ selectors_info (char *regexp, int from_t
}
if (matches)
{
- printf_filtered ("Selectors matching \"%s\":\n\n",
+ printf_filtered (_("Selectors matching \"%s\":\n\n"),
regexp ? regexp : "*");
sym_arr = alloca (matches * sizeof (struct symbol *));
@@ -946,7 +946,7 @@ selectors_info (char *regexp, int from_t
begin_line();
}
else
- printf_filtered ("No selectors matching \"%s\"\n", regexp ? regexp : "*");
+ printf_filtered (_("No selectors matching \"%s\"\n"), regexp ? regexp : "*");
}
/*
@@ -1033,7 +1033,7 @@ classes_info (char *regexp, int from_tty
}
if (matches)
{
- printf_filtered ("Classes matching \"%s\":\n\n",
+ printf_filtered (_("Classes matching \"%s\":\n\n"),
regexp ? regexp : "*");
sym_arr = alloca (matches * sizeof (struct symbol *));
matches = 0;
@@ -1072,7 +1072,7 @@ classes_info (char *regexp, int from_tty
begin_line();
}
else
- printf_filtered ("No classes matching \"%s\"\n", regexp ? regexp : "*");
+ printf_filtered (_("No classes matching \"%s\"\n"), regexp ? regexp : "*");
}
/*
@@ -1568,7 +1568,7 @@ print_object_command (char *args, int fr
read_memory (string_addr + i++, &c, 1);
} while (c != 0);
else
- printf_filtered("<object returns empty description>");
+ printf_filtered(_("<object returns empty description>"));
printf_filtered ("\n");
}
Index: ocd.c
===================================================================
RCS file: /cvs/src/src/gdb/ocd.c,v
retrieving revision 1.37
diff -p -u -r1.37 ocd.c
--- ocd.c 11 Feb 2005 18:13:51 -0000 1.37
+++ ocd.c 12 Feb 2005 00:38:05 -0000
@@ -189,7 +189,7 @@ ocd_start_remote (void *dummy)
p = ocd_do_command (OCD_GET_VERSION, &status, &pktlen);
- printf_unfiltered ("[Wiggler version %x.%x, capability 0x%x]\n",
+ printf_unfiltered (_("[Wiggler version %x.%x, capability 0x%x]\n"),
p[0], p[1], (p[2] << 16) | p[3]);
/* If processor is still running, stop it. */
Index: osabi.c
===================================================================
RCS file: /cvs/src/src/gdb/osabi.c,v
retrieving revision 1.29
diff -p -u -r1.29 osabi.c
--- osabi.c 11 Feb 2005 18:13:51 -0000 1.29
+++ osabi.c 12 Feb 2005 00:38:05 -0000
@@ -600,14 +600,14 @@ static void
show_osabi (char *args, int from_tty)
{
if (user_osabi_state == osabi_auto)
- printf_filtered ("The current OS ABI is \"auto\" (currently \"%s\").\n",
+ printf_filtered (_("The current OS ABI is \"auto\" (currently \"%s\").\n"),
gdbarch_osabi_name (gdbarch_osabi (current_gdbarch)));
else
- printf_filtered ("The current OS ABI is \"%s\".\n",
+ printf_filtered (_("The current OS ABI is \"%s\".\n"),
gdbarch_osabi_name (user_selected_osabi));
if (GDB_OSABI_DEFAULT != GDB_OSABI_UNKNOWN)
- printf_filtered ("The default OS ABI is \"%s\".\n",
+ printf_filtered (_("The default OS ABI is \"%s\".\n"),
gdbarch_osabi_name (GDB_OSABI_DEFAULT));
}
\f
Index: printcmd.c
===================================================================
RCS file: /cvs/src/src/gdb/printcmd.c,v
retrieving revision 1.87
diff -p -u -r1.87 printcmd.c
--- printcmd.c 11 Feb 2005 18:13:52 -0000 1.87
+++ printcmd.c 12 Feb 2005 00:38:05 -0000
@@ -1021,16 +1021,16 @@ sym_info (char *arg, int from_tty)
printf_filtered ("%s in ",
SYMBOL_PRINT_NAME (msymbol));
if (pc_in_unmapped_range (addr, sect))
- printf_filtered ("load address range of ");
+ printf_filtered (_("load address range of "));
if (section_is_overlay (sect))
- printf_filtered ("%s overlay ",
+ printf_filtered (_("%s overlay "),
section_is_mapped (sect) ? "mapped" : "unmapped");
- printf_filtered ("section %s", sect->name);
+ printf_filtered (_("section %s"), sect->name);
printf_filtered ("\n");
}
}
if (matches == 0)
- printf_filtered ("No symbol matches %s.\n", arg);
+ printf_filtered (_("No symbol matches %s.\n"), arg);
}
static void
@@ -1131,84 +1131,84 @@ address_info (char *exp, int from_tty)
break;
case LOC_REGISTER:
- printf_filtered ("a variable in register %s", REGISTER_NAME (val));
+ printf_filtered (_("a variable in register %s"), REGISTER_NAME (val));
break;
case LOC_STATIC:
- printf_filtered ("static storage at address ");
+ printf_filtered (_("static storage at address "));
print_address_numeric (load_addr = SYMBOL_VALUE_ADDRESS (sym),
1, gdb_stdout);
if (section_is_overlay (section))
{
load_addr = overlay_unmapped_address (load_addr, section);
- printf_filtered (",\n -- loaded at ");
+ printf_filtered (_(",\n -- loaded at "));
print_address_numeric (load_addr, 1, gdb_stdout);
- printf_filtered (" in overlay section %s", section->name);
+ printf_filtered (_(" in overlay section %s"), section->name);
}
break;
case LOC_INDIRECT:
- printf_filtered ("external global (indirect addressing), at address *(");
+ printf_filtered (_("external global (indirect addressing), at address *("));
print_address_numeric (load_addr = SYMBOL_VALUE_ADDRESS (sym),
1, gdb_stdout);
printf_filtered (")");
if (section_is_overlay (section))
{
load_addr = overlay_unmapped_address (load_addr, section);
- printf_filtered (",\n -- loaded at ");
+ printf_filtered (_(",\n -- loaded at "));
print_address_numeric (load_addr, 1, gdb_stdout);
- printf_filtered (" in overlay section %s", section->name);
+ printf_filtered (_(" in overlay section %s"), section->name);
}
break;
case LOC_REGPARM:
- printf_filtered ("an argument in register %s", REGISTER_NAME (val));
+ printf_filtered (_("an argument in register %s"), REGISTER_NAME (val));
break;
case LOC_REGPARM_ADDR:
- printf_filtered ("address of an argument in register %s", REGISTER_NAME (val));
+ printf_filtered (_("address of an argument in register %s"), REGISTER_NAME (val));
break;
case LOC_ARG:
- printf_filtered ("an argument at offset %ld", val);
+ printf_filtered (_("an argument at offset %ld"), val);
break;
case LOC_LOCAL_ARG:
- printf_filtered ("an argument at frame offset %ld", val);
+ printf_filtered (_("an argument at frame offset %ld"), val);
break;
case LOC_LOCAL:
- printf_filtered ("a local variable at frame offset %ld", val);
+ printf_filtered (_("a local variable at frame offset %ld"), val);
break;
case LOC_REF_ARG:
- printf_filtered ("a reference argument at offset %ld", val);
+ printf_filtered (_("a reference argument at offset %ld"), val);
break;
case LOC_BASEREG:
- printf_filtered ("a variable at offset %ld from register %s",
+ printf_filtered (_("a variable at offset %ld from register %s"),
val, REGISTER_NAME (basereg));
break;
case LOC_BASEREG_ARG:
- printf_filtered ("an argument at offset %ld from register %s",
+ printf_filtered (_("an argument at offset %ld from register %s"),
val, REGISTER_NAME (basereg));
break;
case LOC_TYPEDEF:
- printf_filtered ("a typedef");
+ printf_filtered (_("a typedef"));
break;
case LOC_BLOCK:
- printf_filtered ("a function at address ");
+ printf_filtered (_("a function at address "));
print_address_numeric (load_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)),
1, gdb_stdout);
if (section_is_overlay (section))
{
load_addr = overlay_unmapped_address (load_addr, section);
- printf_filtered (",\n -- loaded at ");
+ printf_filtered (_(",\n -- loaded at "));
print_address_numeric (load_addr, 1, gdb_stdout);
- printf_filtered (" in overlay section %s", section->name);
+ printf_filtered (_(" in overlay section %s"), section->name);
}
break;
@@ -1222,15 +1222,15 @@ address_info (char *exp, int from_tty)
else
{
section = SYMBOL_BFD_SECTION (msym);
- printf_filtered ("static storage at address ");
+ printf_filtered (_("static storage at address "));
print_address_numeric (load_addr = SYMBOL_VALUE_ADDRESS (msym),
1, gdb_stdout);
if (section_is_overlay (section))
{
load_addr = overlay_unmapped_address (load_addr, section);
- printf_filtered (",\n -- loaded at ");
+ printf_filtered (_(",\n -- loaded at "));
print_address_numeric (load_addr, 1, gdb_stdout);
- printf_filtered (" in overlay section %s", section->name);
+ printf_filtered (_(" in overlay section %s"), section->name);
}
}
}
@@ -1243,11 +1243,11 @@ address_info (char *exp, int from_tty)
break;
case LOC_OPTIMIZED_OUT:
- printf_filtered ("optimized out");
+ printf_filtered (_("optimized out"));
break;
default:
- printf_filtered ("of unknown (botched) type");
+ printf_filtered (_("of unknown (botched) type"));
break;
}
printf_filtered (".\n");
@@ -1591,7 +1591,7 @@ disable_display (int num)
d->enabled_p = 0;
return;
}
- printf_unfiltered ("No display number %d.\n", num);
+ printf_unfiltered (_("No display number %d.\n"), num);
}
void
@@ -1612,10 +1612,10 @@ display_info (char *ignore, int from_tty
struct display *d;
if (!display_chain)
- printf_unfiltered ("There are no auto-display expressions now.\n");
+ printf_unfiltered (_("There are no auto-display expressions now.\n"));
else
- printf_filtered ("Auto-display expressions now in effect:\n\
-Num Enb Expression\n");
+ printf_filtered (_("Auto-display expressions now in effect:\n\
+Num Enb Expression\n"));
for (d = display_chain; d; d = d->next)
{
@@ -1627,7 +1627,7 @@ Num Enb Expression\n");
printf_filtered ("/%c ", d->format.format);
print_expression (d->exp, gdb_stdout);
if (d->block && !contained_in (get_selected_block (0), d->block))
- printf_filtered (" (cannot be evaluated in the current context)");
+ printf_filtered (_(" (cannot be evaluated in the current context)"));
printf_filtered ("\n");
gdb_flush (gdb_stdout);
}
@@ -1663,7 +1663,7 @@ enable_display (char *args, int from_tty
d->enabled_p = 1;
goto win;
}
- printf_unfiltered ("No display number %d.\n", num);
+ printf_unfiltered (_("No display number %d.\n"), num);
win:
p = p1;
while (*p == ' ' || *p == '\t')
Index: procfs.c
===================================================================
RCS file: /cvs/src/src/gdb/procfs.c,v
retrieving revision 1.64
diff -p -u -r1.64 procfs.c
--- procfs.c 11 Feb 2005 18:13:52 -0000 1.64
+++ procfs.c 12 Feb 2005 00:38:05 -0000
@@ -3523,10 +3523,10 @@ procfs_attach (char *args, int from_tty)
exec_file = get_exec_file (0);
if (exec_file)
- printf_filtered ("Attaching to program `%s', %s\n",
+ printf_filtered (_("Attaching to program `%s', %s\n"),
exec_file, target_pid_to_str (pid_to_ptid (pid)));
else
- printf_filtered ("Attaching to %s\n",
+ printf_filtered (_("Attaching to %s\n"),
target_pid_to_str (pid_to_ptid (pid)));
fflush (stdout);
@@ -3552,7 +3552,7 @@ procfs_detach (char *args, int from_tty)
if (exec_file == NULL)
exec_file = "";
- printf_filtered ("Detaching from program: %s, %s\n", exec_file,
+ printf_filtered (_("Detaching from program: %s, %s\n"), exec_file,
target_pid_to_str (pid_to_ptid (pid)));
gdb_flush (gdb_stdout);
}
@@ -3973,7 +3973,7 @@ wait_again:
case PR_SYSENTRY:
if (syscall_is_lwp_exit (pi, what))
{
- printf_filtered ("[%s exited]\n",
+ printf_filtered (_("[%s exited]\n"),
target_pid_to_str (retval));
delete_thread (retval);
status->kind = TARGET_WAITKIND_SPURIOUS;
@@ -4020,7 +4020,7 @@ wait_again:
}
else
{
- printf_filtered ("procfs: trapped on entry to ");
+ printf_filtered (_("procfs: trapped on entry to "));
proc_prettyprint_syscall (proc_what (pi), 0);
printf_filtered ("\n");
#ifndef PIOCSSPCACT
@@ -4030,7 +4030,7 @@ wait_again:
if ((nsysargs = proc_nsysarg (pi)) > 0 &&
(sysargs = proc_sysargs (pi)) != NULL)
{
- printf_filtered ("%ld syscall arguments:\n", nsysargs);
+ printf_filtered (_("%ld syscall arguments:\n"), nsysargs);
for (i = 0; i < nsysargs; i++)
printf_filtered ("#%ld: 0x%08lx\n",
i, sysargs[i]);
@@ -4097,7 +4097,7 @@ wait_again:
/* If not in GDB's thread list, add it. */
if (!in_thread_list (temp_ptid))
{
- printf_filtered ("[New %s]\n",
+ printf_filtered (_("[New %s]\n"),
target_pid_to_str (temp_ptid));
add_thread (temp_ptid);
}
@@ -4107,7 +4107,7 @@ wait_again:
}
else if (syscall_is_lwp_exit (pi, what))
{
- printf_filtered ("[%s exited]\n",
+ printf_filtered (_("[%s exited]\n"),
target_pid_to_str (retval));
delete_thread (retval);
status->kind = TARGET_WAITKIND_SPURIOUS;
@@ -4124,7 +4124,7 @@ wait_again:
}
else
{
- printf_filtered ("procfs: trapped on exit from ");
+ printf_filtered (_("procfs: trapped on exit from "));
proc_prettyprint_syscall (proc_what (pi), 0);
printf_filtered ("\n");
#ifndef PIOCSSPCACT
@@ -4134,7 +4134,7 @@ wait_again:
if ((nsysargs = proc_nsysarg (pi)) > 0 &&
(sysargs = proc_sysargs (pi)) != NULL)
{
- printf_filtered ("%ld syscall arguments:\n", nsysargs);
+ printf_filtered (_("%ld syscall arguments:\n"), nsysargs);
for (i = 0; i < nsysargs; i++)
printf_filtered ("#%ld: 0x%08lx\n",
i, sysargs[i]);
@@ -4152,7 +4152,7 @@ wait_again:
#else
if (retry < 5)
{
- printf_filtered ("Retry #%d:\n", retry);
+ printf_filtered (_("Retry #%d:\n"), retry);
pi->status_valid = 0;
goto wait_again;
}
@@ -4167,7 +4167,7 @@ wait_again:
temp_ptid = MERGEPID (pi->pid, temp_tid);
if (!in_thread_list (temp_ptid))
{
- printf_filtered ("[New %s]\n",
+ printf_filtered (_("[New %s]\n"),
target_pid_to_str (temp_ptid));
add_thread (temp_ptid);
}
@@ -4230,7 +4230,7 @@ wait_again:
default: /* FIXME: use si_signo if possible for fault */
retval = pid_to_ptid (-1);
printf_filtered ("procfs:%d -- ", __LINE__);
- printf_filtered ("child stopped for unknown reason:\n");
+ printf_filtered (_("child stopped for unknown reason:\n"));
proc_prettyprint_why (why, what, 1);
error (_("... giving up..."));
break;
@@ -4238,7 +4238,7 @@ wait_again:
break; /* case PR_FAULTED: */
default: /* switch (why) unmatched */
printf_filtered ("procfs:%d -- ", __LINE__);
- printf_filtered ("child stopped for unknown reason:\n");
+ printf_filtered (_("child stopped for unknown reason:\n"));
proc_prettyprint_why (why, what, 1);
error (_("... giving up..."));
break;
@@ -4257,7 +4257,7 @@ wait_again:
* If we don't create a procinfo, resume may be unhappy
* later.
*/
- printf_filtered ("[New %s]\n", target_pid_to_str (retval));
+ printf_filtered (_("[New %s]\n"), target_pid_to_str (retval));
add_thread (retval);
if (find_procinfo (PIDGET (retval), TIDGET (retval)) == NULL)
create_procinfo (PIDGET (retval), TIDGET (retval));
@@ -4614,7 +4614,7 @@ procfs_notice_signals (ptid_t ptid)
static void
procfs_files_info (struct target_ops *ignore)
{
- printf_filtered ("\tUsing the running image of %s %s via /proc.\n",
+ printf_filtered (_("\tUsing the running image of %s %s via /proc.\n"),
attach_flag? "attached": "child",
target_pid_to_str (inferior_ptid));
}
@@ -5770,7 +5770,7 @@ info_proc_mappings (procinfo *pi, int su
if (summary)
return; /* No output for summary mode. */
- printf_filtered ("Mapped address spaces:\n\n");
+ printf_filtered (_("Mapped address spaces:\n\n"));
printf_filtered (header_fmt_string,
"Start Addr",
" End Addr",
@@ -5854,7 +5854,7 @@ info_proc_cmd (char *args, int from_tty)
if (process)
{
- printf_filtered ("process %d flags:\n", process->pid);
+ printf_filtered (_("process %d flags:\n"), process->pid);
proc_prettyprint_flags (proc_flags (process), 1);
if (proc_flags (process) & (PR_STOPPED | PR_ISTOP))
proc_prettyprint_why (proc_why (process), proc_what (process), 1);
@@ -5864,7 +5864,7 @@ info_proc_cmd (char *args, int from_tty)
}
if (thread)
{
- printf_filtered ("thread %d flags:\n", thread->tid);
+ printf_filtered (_("thread %d flags:\n"), thread->tid);
proc_prettyprint_flags (proc_flags (thread), 1);
if (proc_flags (thread) & (PR_STOPPED | PR_ISTOP))
proc_prettyprint_why (proc_why (thread), proc_what (thread), 1);
Index: regcache.c
===================================================================
RCS file: /cvs/src/src/gdb/regcache.c,v
retrieving revision 1.130
diff -p -u -r1.130 regcache.c
--- regcache.c 11 Feb 2005 18:13:52 -0000 1.130
+++ regcache.c 12 Feb 2005 00:38:05 -0000
@@ -1140,7 +1140,7 @@ reg_flush_command (char *command, int fr
/* Force-flush the register cache. */
registers_changed ();
if (from_tty)
- printf_filtered ("Register cache flushed.\n");
+ printf_filtered (_("Register cache flushed.\n"));
}
static void
Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.166
diff -p -u -r1.166 remote.c
--- remote.c 11 Feb 2005 18:13:52 -0000 1.166
+++ remote.c 12 Feb 2005 00:38:06 -0000
@@ -490,12 +490,12 @@ set_memory_packet_size (char *args, stru
static void
show_memory_packet_size (struct memory_packet_config *config)
{
- printf_filtered ("The %s is %ld. ", config->name, config->size);
+ printf_filtered (_("The %s is %ld. "), config->name, config->size);
if (config->fixed_p)
- printf_filtered ("Packets are fixed at %ld bytes.\n",
+ printf_filtered (_("Packets are fixed at %ld bytes.\n"),
get_memory_packet_size (config));
else
- printf_filtered ("Packets are limited to %ld bytes.\n",
+ printf_filtered (_("Packets are limited to %ld bytes.\n"),
get_memory_packet_size (config));
}
@@ -618,12 +618,12 @@ show_packet_config_cmd (struct packet_co
switch (config->detect)
{
case AUTO_BOOLEAN_AUTO:
- printf_filtered ("Support for remote protocol `%s' (%s) packet is auto-detected, currently %s.\n",
+ printf_filtered (_("Support for remote protocol `%s' (%s) packet is auto-detected, currently %s.\n"),
config->name, config->title, support);
break;
case AUTO_BOOLEAN_TRUE:
case AUTO_BOOLEAN_FALSE:
- printf_filtered ("Support for remote protocol `%s' (%s) packet is currently %s.\n",
+ printf_filtered (_("Support for remote protocol `%s' (%s) packet is currently %s.\n"),
config->name, config->title, support);
break;
}
@@ -4161,7 +4161,7 @@ read_frame (char *buf,
}
buf[bc] = '\0';
- printf_filtered ("Repeat count %d too large for buffer: ",
+ printf_filtered (_("Repeat count %d too large for buffer: "),
repeat);
puts_filtered (buf);
puts_filtered ("\n");
@@ -4287,7 +4287,7 @@ getpkt_sane (char *buf,
/* We have tried hard enough, and just can't receive the packet.
Give up. */
- printf_unfiltered ("Ignoring packet error, continuing...\n");
+ printf_unfiltered (_("Ignoring packet error, continuing...\n"));
serial_write (remote_desc, "+", 1);
return 1;
}
@@ -4797,7 +4797,7 @@ remote_remove_hw_breakpoint (CORE_ADDR a
void
push_remote_target (char *name, int from_tty)
{
- printf_filtered ("Switching to remote protocol\n");
+ printf_filtered (_("Switching to remote protocol\n"));
remote_open (name, from_tty);
}
@@ -4918,7 +4918,7 @@ compare_sections_command (char *args, in
warning (_("One or more sections of the remote executable does not match\n\
the loaded file\n"));
if (args && !matched)
- printf_filtered ("No loaded section named '%s'.\n", args);
+ printf_filtered (_("No loaded section named '%s'.\n"), args);
}
static LONGEST
@@ -5164,7 +5164,7 @@ threadset_test_cmd (char *cmd, int tty)
{
int sample_thread = SAMPLE_THREAD;
- printf_filtered ("Remote threadset test\n");
+ printf_filtered (_("Remote threadset test\n"));
set_thread (sample_thread, 1);
}
Index: solib-som.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-som.c,v
retrieving revision 1.4
diff -p -u -r1.4 solib-som.c
--- solib-som.c 11 Feb 2005 04:06:05 -0000 1.4
+++ solib-som.c 12 Feb 2005 00:38:06 -0000
@@ -253,7 +253,7 @@ GDB will be unable to track shl_load/shl
msymbol = lookup_minimal_symbol ("__d_trap", NULL, symfile_objfile);
if (msymbol == NULL)
{
- warning (_(\
+ warning (_("\
Unable to find __dld_d_trap symbol in object file.\n\
Suggest linking with /opt/langtools/lib/end.o.\n\
GDB will be unable to track shl_load/shl_unload calls"));
Index: solib.c
===================================================================
RCS file: /cvs/src/src/gdb/solib.c,v
retrieving revision 1.73
diff -p -u -r1.73 solib.c
--- solib.c 11 Feb 2005 18:13:53 -0000 1.73
+++ solib.c 12 Feb 2005 00:38:06 -0000
@@ -381,7 +381,7 @@ solib_read_symbols (struct so_list *so,
if (so->symbols_loaded)
{
if (from_tty)
- printf_unfiltered ("Symbols already loaded for %s\n", so->so_name);
+ printf_unfiltered (_("Symbols already loaded for %s\n"), so->so_name);
}
else
{
@@ -390,7 +390,7 @@ solib_read_symbols (struct so_list *so,
RETURN_MASK_ALL))
{
if (from_tty)
- printf_unfiltered ("Loaded symbols for %s\n", so->so_name);
+ printf_unfiltered (_("Loaded symbols for %s\n"), so->so_name);
so->symbols_loaded = 1;
return 1;
}
@@ -703,7 +703,7 @@ info_sharedlibrary_command (char *ignore
}
if (so_list_head == NULL)
{
- printf_unfiltered ("No shared libraries loaded at this time.\n");
+ printf_unfiltered (_("No shared libraries loaded at this time.\n"));
}
}
Index: somsolib.c
===================================================================
RCS file: /cvs/src/src/gdb/somsolib.c,v
retrieving revision 1.41
diff -p -u -r1.41 somsolib.c
--- somsolib.c 11 Feb 2005 04:06:05 -0000 1.41
+++ somsolib.c 12 Feb 2005 00:38:06 -0000
@@ -829,7 +829,7 @@ the program."));
return;
old_dld:
- error (_("Debugging dynamic executables loaded via the hpux8 dld.sl is not supported.));
+ error (_("Debugging dynamic executables loaded via the hpux8 dld.sl is not supported."));
err:
error (_("Error while reading dynamic library list."));
Index: source.c
===================================================================
RCS file: /cvs/src/src/gdb/source.c,v
retrieving revision 1.62
diff -p -u -r1.62 source.c
--- source.c 11 Feb 2005 18:13:53 -0000 1.62
+++ source.c 12 Feb 2005 00:38:06 -0000
@@ -583,21 +583,21 @@ source_info (char *ignore, int from_tty)
if (!s)
{
- printf_filtered ("No current source file.\n");
+ printf_filtered (_("No current source file.\n"));
return;
}
- printf_filtered ("Current source file is %s\n", s->filename);
+ printf_filtered (_("Current source file is %s\n"), s->filename);
if (s->dirname)
- printf_filtered ("Compilation directory is %s\n", s->dirname);
+ printf_filtered (_("Compilation directory is %s\n"), s->dirname);
if (s->fullname)
- printf_filtered ("Located in %s\n", s->fullname);
+ printf_filtered (_("Located in %s\n"), s->fullname);
if (s->nlines)
- printf_filtered ("Contains %d line%s.\n", s->nlines,
+ printf_filtered (_("Contains %d line%s.\n"), s->nlines,
s->nlines == 1 ? "" : "s");
- printf_filtered ("Source language is %s.\n", language_str (s->language));
- printf_filtered ("Compiled with %s debugging format.\n", s->debugformat);
- printf_filtered ("%s preprocessor macro info.\n",
+ printf_filtered (_("Source language is %s.\n"), language_str (s->language));
+ printf_filtered (_("Compiled with %s debugging format.\n"), s->debugformat);
+ printf_filtered (_("%s preprocessor macro info.\n"),
s->macro_table ? "Includes" : "Does not include");
}
\f
@@ -1317,7 +1317,7 @@ line_info (char *arg, int from_tty)
if (sal.symtab == 0)
{
- printf_filtered ("No line number information available");
+ printf_filtered (_("No line number information available"));
if (sal.pc != 0)
{
/* This is useful for "info line *0x7f34". If we can't tell the
@@ -1372,7 +1372,7 @@ line_info (char *arg, int from_tty)
/* Is there any case in which we get here, and have an address
which the user would want to see? If we have debugging symbols
and no line numbers? */
- printf_filtered ("Line number %d is out of range for \"%s\".\n",
+ printf_filtered (_("Line number %d is out of range for \"%s\".\n"),
sal.line, sal.symtab->filename);
}
xfree (sals.sals);
@@ -1469,7 +1469,7 @@ forward_search_command (char *regex, int
line++;
}
- printf_filtered ("Expression not found\n");
+ printf_filtered (_("Expression not found\n"));
fclose (stream);
}
@@ -1556,7 +1556,7 @@ reverse_search_command (char *regex, int
}
}
- printf_filtered ("Expression not found\n");
+ printf_filtered (_("Expression not found\n"));
fclose (stream);
return;
}
Index: stack.c
===================================================================
RCS file: /cvs/src/src/gdb/stack.c,v
retrieving revision 1.125
diff -p -u -r1.125 stack.c
--- stack.c 11 Feb 2005 18:13:53 -0000 1.125
+++ stack.c 12 Feb 2005 00:38:06 -0000
@@ -939,14 +939,14 @@ frame_info (char *addr_exp, int from_tty
if (selected_frame_p && frame_relative_level (fi) >= 0)
{
- printf_filtered ("Stack level %d, frame at ",
+ printf_filtered (_("Stack level %d, frame at "),
frame_relative_level (fi));
print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
printf_filtered (":\n");
}
else
{
- printf_filtered ("Stack frame at ");
+ printf_filtered (_("Stack frame at "));
print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
printf_filtered (":\n");
}
@@ -1218,7 +1218,7 @@ backtrace_command_1 (char *count_exp, in
/* If we've stopped before the end, mention that. */
if (fi && from_tty)
- printf_filtered ("(More stack frames follow...)\n");
+ printf_filtered (_("(More stack frames follow...)\n"));
}
struct backtrace_command_args
@@ -1977,7 +1977,7 @@ func_command (char *arg, int from_tty)
xfree (func_bounds);
if (!found)
- printf_filtered ("'%s' not within current stack frame.\n", arg);
+ printf_filtered (_("'%s' not within current stack frame.\n"), arg);
else if (fp != deprecated_selected_frame)
select_and_print_frame (fp);
}
Index: symfile.c
===================================================================
RCS file: /cvs/src/src/gdb/symfile.c,v
retrieving revision 1.146
diff -p -u -r1.146 symfile.c
--- symfile.c 11 Feb 2005 18:13:53 -0000 1.146
+++ symfile.c 12 Feb 2005 00:38:06 -0000
@@ -831,7 +831,7 @@ symbol_file_add_with_addrs_or_offsets (b
deprecated_pre_add_symbol_hook (name);
else
{
- printf_unfiltered ("Reading symbols from %s...", name);
+ printf_unfiltered (_("Reading symbols from %s..."), name);
wrap_here ("");
gdb_flush (gdb_stdout);
}
@@ -848,7 +848,7 @@ symbol_file_add_with_addrs_or_offsets (b
{
if (from_tty || info_verbose)
{
- printf_unfiltered ("expanding to full symbols...");
+ printf_unfiltered (_("expanding to full symbols..."));
wrap_here ("");
gdb_flush (gdb_stdout);
}
@@ -887,7 +887,7 @@ symbol_file_add_with_addrs_or_offsets (b
if (!have_partial_symbols () && !have_full_symbols ())
{
wrap_here ("");
- printf_filtered ("(no debugging symbols found)");
+ printf_filtered (_("(no debugging symbols found)"));
if (from_tty || info_verbose)
printf_filtered ("...");
else
@@ -901,7 +901,7 @@ symbol_file_add_with_addrs_or_offsets (b
deprecated_post_add_symbol_hook ();
else
{
- printf_unfiltered ("done.\n");
+ printf_unfiltered (_("done.\n"));
}
}
@@ -999,7 +999,7 @@ symbol_file_clear (int from_tty)
symfile_objfile = NULL;
if (from_tty)
- printf_unfiltered ("No symbol file now.\n");
+ printf_unfiltered (_("No symbol file now.\n"));
}
static char *
@@ -1745,7 +1745,7 @@ add_symbol_file_command (char *args, int
statements because hex_string returns a local static
string. */
- printf_unfiltered ("add symbol table from file \"%s\" at\n", filename);
+ printf_unfiltered (_("add symbol table from file \"%s\" at\n"), filename);
section_addrs = alloc_section_addr_info (section_index);
make_cleanup (xfree, section_addrs);
for (i = 0; i < section_index; i++)
@@ -1824,7 +1824,7 @@ reread_symbols (void)
if (res != 0)
{
/* FIXME, should use print_sys_errmsg but it's not filtered. */
- printf_unfiltered ("`%s' has disappeared; keeping its symbols.\n",
+ printf_unfiltered (_("`%s' has disappeared; keeping its symbols.\n"),
objfile->name);
continue;
}
@@ -1836,7 +1836,7 @@ reread_symbols (void)
int num_offsets;
char *obfd_filename;
- printf_unfiltered ("`%s' has changed; re-reading symbols.\n",
+ printf_unfiltered (_("`%s' has changed; re-reading symbols.\n"),
objfile->name);
/* There are various functions like symbol_file_add,
@@ -1963,7 +1963,7 @@ reread_symbols (void)
if (!have_partial_symbols () && !have_full_symbols ())
{
wrap_here ("");
- printf_unfiltered ("(no debugging symbols found)\n");
+ printf_unfiltered (_("(no debugging symbols found)\n"));
wrap_here ("");
}
objfile->flags |= OBJF_SYMS;
@@ -2151,7 +2151,7 @@ info_ext_lang_command (char *args, int f
{
int i;
- printf_filtered ("Filename extensions and the languages they represent:");
+ printf_filtered (_("Filename extensions and the languages they represent:"));
printf_filtered ("\n\n");
for (i = 0; i < fl_table_next; i++)
printf_filtered ("\t%s\t- %s\n",
@@ -3092,7 +3092,7 @@ list_overlays_command (char *args, int f
nmapped++;
}
if (nmapped == 0)
- printf_filtered ("No sections are mapped.\n");
+ printf_filtered (_("No sections are mapped.\n"));
}
/* Function: map_overlay_command
@@ -3135,7 +3135,7 @@ the 'overlay manual' command."));
sec2->the_bfd_section))
{
if (info_verbose)
- printf_unfiltered ("Note: section %s unmapped by overlap\n",
+ printf_unfiltered (_("Note: section %s unmapped by overlap\n"),
bfd_section_name (objfile->obfd,
sec2->the_bfd_section));
sec2->ovly_mapped = 0; /* sec2 overlaps sec: unmap sec2 */
@@ -3185,7 +3185,7 @@ overlay_auto_command (char *args, int fr
overlay_debugging = ovly_auto;
enable_overlay_breakpoints ();
if (info_verbose)
- printf_unfiltered ("Automatic overlay debugging enabled.");
+ printf_unfiltered (_("Automatic overlay debugging enabled."));
}
/* Function: overlay_manual_command
@@ -3198,7 +3198,7 @@ overlay_manual_command (char *args, int
overlay_debugging = ovly_on;
disable_overlay_breakpoints ();
if (info_verbose)
- printf_unfiltered ("Overlay debugging enabled.");
+ printf_unfiltered (_("Overlay debugging enabled."));
}
/* Function: overlay_off_command
@@ -3211,7 +3211,7 @@ overlay_off_command (char *args, int fro
overlay_debugging = ovly_off;
disable_overlay_breakpoints ();
if (info_verbose)
- printf_unfiltered ("Overlay debugging disabled.");
+ printf_unfiltered (_("Overlay debugging disabled."));
}
static void
Index: symmisc.c
===================================================================
RCS file: /cvs/src/src/gdb/symmisc.c,v
retrieving revision 1.36
diff -p -u -r1.36 symmisc.c
--- symmisc.c 11 Feb 2005 04:06:06 -0000 1.36
+++ symmisc.c 12 Feb 2005 00:38:06 -0000
@@ -174,7 +174,7 @@ print_symbol_bcache_statistics (void)
immediate_quit++;
ALL_OBJFILES (objfile)
{
- printf_filtered ("Byte cache statistics for '%s':\n", objfile->name);
+ printf_filtered (_("Byte cache statistics for '%s':\n"), objfile->name);
print_bcache_statistics (objfile->psymbol_cache, "partial symbol cache");
}
immediate_quit--;
@@ -191,21 +191,21 @@ print_objfile_statistics (void)
immediate_quit++;
ALL_OBJFILES (objfile)
{
- printf_filtered ("Statistics for '%s':\n", objfile->name);
+ printf_filtered (_("Statistics for '%s':\n"), objfile->name);
if (OBJSTAT (objfile, n_stabs) > 0)
- printf_filtered (" Number of \"stab\" symbols read: %d\n",
+ printf_filtered (_(" Number of \"stab\" symbols read: %d\n"),
OBJSTAT (objfile, n_stabs));
if (OBJSTAT (objfile, n_minsyms) > 0)
- printf_filtered (" Number of \"minimal\" symbols read: %d\n",
+ printf_filtered (_(" Number of \"minimal\" symbols read: %d\n"),
OBJSTAT (objfile, n_minsyms));
if (OBJSTAT (objfile, n_psyms) > 0)
- printf_filtered (" Number of \"partial\" symbols read: %d\n",
+ printf_filtered (_(" Number of \"partial\" symbols read: %d\n"),
OBJSTAT (objfile, n_psyms));
if (OBJSTAT (objfile, n_syms) > 0)
- printf_filtered (" Number of \"full\" symbols read: %d\n",
+ printf_filtered (_(" Number of \"full\" symbols read: %d\n"),
OBJSTAT (objfile, n_syms));
if (OBJSTAT (objfile, n_types) > 0)
- printf_filtered (" Number of \"types\" defined: %d\n",
+ printf_filtered (_(" Number of \"types\" defined: %d\n"),
OBJSTAT (objfile, n_types));
i = 0;
ALL_OBJFILE_PSYMTABS (objfile, ps)
@@ -213,7 +213,7 @@ print_objfile_statistics (void)
if (ps->readin == 0)
i++;
}
- printf_filtered (" Number of psym tables (not yet expanded): %d\n", i);
+ printf_filtered (_(" Number of psym tables (not yet expanded): %d\n"), i);
i = linetables = blockvectors = 0;
ALL_OBJFILE_SYMTABS (objfile, s)
{
@@ -223,20 +223,20 @@ print_objfile_statistics (void)
if (s->primary == 1)
blockvectors++;
}
- printf_filtered (" Number of symbol tables: %d\n", i);
- printf_filtered (" Number of symbol tables with line tables: %d\n",
+ printf_filtered (_(" Number of symbol tables: %d\n"), i);
+ printf_filtered (_(" Number of symbol tables with line tables: %d\n"),
linetables);
- printf_filtered (" Number of symbol tables with blockvectors: %d\n",
+ printf_filtered (_(" Number of symbol tables with blockvectors: %d\n"),
blockvectors);
if (OBJSTAT (objfile, sz_strtab) > 0)
- printf_filtered (" Space used by a.out string tables: %d\n",
+ printf_filtered (_(" Space used by a.out string tables: %d\n"),
OBJSTAT (objfile, sz_strtab));
- printf_filtered (" Total memory used for objfile obstack: %d\n",
+ printf_filtered (_(" Total memory used for objfile obstack: %d\n"),
obstack_memory_used (&objfile->objfile_obstack));
- printf_filtered (" Total memory used for psymbol cache: %d\n",
+ printf_filtered (_(" Total memory used for psymbol cache: %d\n"),
bcache_memory_used (objfile->psymbol_cache));
- printf_filtered (" Total memory used for macro cache: %d\n",
+ printf_filtered (_(" Total memory used for macro cache: %d\n"),
bcache_memory_used (objfile->macro_cache));
}
immediate_quit--;
Index: target.c
===================================================================
RCS file: /cvs/src/src/gdb/target.c,v
retrieving revision 1.95
diff -p -u -r1.95 target.c
--- target.c 11 Feb 2005 18:13:54 -0000 1.95
+++ target.c 12 Feb 2005 00:38:06 -0000
@@ -306,7 +306,7 @@ nosupport_runtime (void)
static void
default_terminal_info (char *args, int from_tty)
{
- printf_unfiltered ("No saved terminal information.\n");
+ printf_unfiltered (_("No saved terminal information.\n"));
}
/* This is the default target_create_inferior and target_attach function.
@@ -319,7 +319,7 @@ kill_or_be_killed (int from_tty)
{
if (target_has_execution)
{
- printf_unfiltered ("You are already running a program:\n");
+ printf_unfiltered (_("You are already running a program:\n"));
target_files_info ();
if (query ("Kill it? "))
{
@@ -1391,7 +1391,7 @@ target_info (char *args, int from_tty)
int has_all_mem = 0;
if (symfile_objfile != NULL)
- printf_unfiltered ("Symbols from \"%s\".\n", symfile_objfile->name);
+ printf_unfiltered (_("Symbols from \"%s\".\n"), symfile_objfile->name);
for (t = target_stack; t != NULL; t = t->beneath)
{
@@ -1401,7 +1401,7 @@ target_info (char *args, int from_tty)
if ((int) (t->to_stratum) <= (int) dummy_stratum)
continue;
if (has_all_mem)
- printf_unfiltered ("\tWhile running this, GDB does not access memory from...\n");
+ printf_unfiltered (_("\tWhile running this, GDB does not access memory from...\n"));
printf_unfiltered ("%s:\n", t->to_longname);
(t->to_files_info) (t);
has_all_mem = t->to_has_all_memory;
Index: thread.c
===================================================================
RCS file: /cvs/src/src/gdb/thread.c,v
retrieving revision 1.43
diff -p -u -r1.43 thread.c
--- thread.c 11 Feb 2005 04:06:06 -0000 1.43
+++ thread.c 12 Feb 2005 00:38:06 -0000
@@ -534,7 +534,7 @@ thread_apply_all_command (char *cmd, int
if (thread_alive (tp))
{
switch_to_thread (tp->ptid);
- printf_filtered ("\nThread %d (%s):\n",
+ printf_filtered (_("\nThread %d (%s):\n"),
tp->num, target_tid_to_str (inferior_ptid));
execute_command (cmd, from_tty);
strcpy (cmd, saved_cmd); /* Restore exact command used previously */
@@ -605,7 +605,7 @@ thread_apply_command (char *tidlist, int
else
{
switch_to_thread (tp->ptid);
- printf_filtered ("\nThread %d (%s):\n", tp->num,
+ printf_filtered (_("\nThread %d (%s):\n"), tp->num,
target_tid_to_str (inferior_ptid));
execute_command (cmd, from_tty);
strcpy (cmd, saved_cmd); /* Restore exact command used previously */
@@ -627,7 +627,7 @@ thread_command (char *tidstr, int from_t
{
/* Don't generate an error, just say which thread is current. */
if (target_has_stack)
- printf_filtered ("[Current thread is %d (%s)]\n",
+ printf_filtered (_("[Current thread is %d (%s)]\n"),
pid_to_thread_id (inferior_ptid),
target_tid_to_str (inferior_ptid));
else
Index: top.c
===================================================================
RCS file: /cvs/src/src/gdb/top.c,v
retrieving revision 1.97
diff -p -u -r1.97 top.c
--- top.c 11 Feb 2005 04:06:07 -0000 1.97
+++ top.c 12 Feb 2005 00:38:06 -0000
@@ -519,7 +519,7 @@ command_loop (void)
{
long cmd_time = get_run_time () - time_at_cmd_start;
- printf_unfiltered ("Command execution time: %ld.%06ld\n",
+ printf_unfiltered (_("Command execution time: %ld.%06ld\n"),
cmd_time / 1000000, cmd_time % 1000000);
}
@@ -530,7 +530,7 @@ command_loop (void)
long space_now = lim - lim_at_start;
long space_diff = space_now - space_at_cmd_start;
- printf_unfiltered ("Space used: %ld (%c%ld for this command)\n",
+ printf_unfiltered (_("Space used: %ld (%c%ld for this command)\n"),
space_now,
(space_diff >= 0 ? '+' : '-'),
space_diff);
@@ -1265,7 +1265,7 @@ set_history_size_command (char *args, in
void
set_history (char *args, int from_tty)
{
- printf_unfiltered ("\"set history\" must be followed by the name of a history subcommand.\n");
+ printf_unfiltered (_("\"set history\" must be followed by the name of a history subcommand.\n"));
help_list (sethistlist, "set history ", -1, gdb_stdout);
}
Index: utils.c
===================================================================
RCS file: /cvs/src/src/gdb/utils.c,v
retrieving revision 1.151
diff -p -u -r1.151 utils.c
--- utils.c 11 Feb 2005 18:13:54 -0000 1.151
+++ utils.c 12 Feb 2005 00:38:06 -0000
@@ -1130,15 +1130,15 @@ query (const char *ctlstr, ...)
gdb_flush (gdb_stdout);
if (annotation_level > 1)
- printf_filtered ("\n\032\032pre-query\n");
+ printf_filtered (("\n\032\032pre-query\n"));
va_start (args, ctlstr);
vfprintf_filtered (gdb_stdout, ctlstr, args);
va_end (args);
- printf_filtered ("(y or n) ");
+ printf_filtered (_("(y or n) "));
if (annotation_level > 1)
- printf_filtered ("\n\032\032query\n");
+ printf_filtered (("\n\032\032query\n"));
wrap_here ("");
gdb_flush (gdb_stdout);
@@ -1171,11 +1171,11 @@ query (const char *ctlstr, ...)
retval = 0;
break;
}
- printf_filtered ("Please answer y or n.\n");
+ printf_filtered (_("Please answer y or n.\n"));
}
if (annotation_level > 1)
- printf_filtered ("\n\032\032post-query\n");
+ printf_filtered (("\n\032\032post-query\n"));
return retval;
}
\f
@@ -1232,13 +1232,13 @@ defaulted_query (const char *ctlstr, con
gdb_flush (gdb_stdout);
if (annotation_level > 1)
- printf_filtered ("\n\032\032pre-query\n");
+ printf_filtered (("\n\032\032pre-query\n"));
vfprintf_filtered (gdb_stdout, ctlstr, args);
- printf_filtered ("(%s or %s) ", y_string, n_string);
+ printf_filtered (_("(%s or %s) "), y_string, n_string);
if (annotation_level > 1)
- printf_filtered ("\n\032\032query\n");
+ printf_filtered (("\n\032\032query\n"));
wrap_here ("");
gdb_flush (gdb_stdout);
@@ -1277,12 +1277,12 @@ defaulted_query (const char *ctlstr, con
break;
}
/* Invalid entries are not defaulted and require another selection. */
- printf_filtered ("Please answer %s or %s.\n",
+ printf_filtered (_("Please answer %s or %s.\n"),
y_string, n_string);
}
if (annotation_level > 1)
- printf_filtered ("\n\032\032post-query\n");
+ printf_filtered (("\n\032\032post-query\n"));
return retval;
}
\f
@@ -1666,7 +1666,7 @@ prompt_for_continue (void)
char cont_prompt[120];
if (annotation_level > 1)
- printf_unfiltered ("\n\032\032pre-prompt-for-continue\n");
+ printf_unfiltered (("\n\032\032pre-prompt-for-continue\n"));
strcpy (cont_prompt,
"---Type <return> to continue, or q <return> to quit---");
@@ -1692,7 +1692,7 @@ prompt_for_continue (void)
ignore = gdb_readline_wrapper (cont_prompt);
if (annotation_level > 1)
- printf_unfiltered ("\n\032\032post-prompt-for-continue\n");
+ printf_unfiltered (("\n\032\032post-prompt-for-continue\n"));
if (ignore)
{
Index: valprint.c
===================================================================
RCS file: /cvs/src/src/gdb/valprint.c,v
retrieving revision 1.43
diff -p -u -r1.43 valprint.c
--- valprint.c 11 Feb 2005 18:13:54 -0000 1.43
+++ valprint.c 12 Feb 2005 00:38:06 -0000
@@ -161,12 +161,12 @@ value_print (struct value *val, struct u
{
if (val == 0)
{
- printf_filtered ("<address of value unknown>");
+ printf_filtered (_("<address of value unknown>"));
return 0;
}
if (value_optimized_out (val))
{
- printf_filtered ("<value optimized out>");
+ printf_filtered (_("<value optimized out>"));
return 0;
}
return LA_VALUE_PRINT (val, stream, format, pretty);
@@ -1086,7 +1086,7 @@ set_input_radix_1 (int from_tty, unsigne
input_radix = radix;
if (from_tty)
{
- printf_filtered ("Input radix now set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Input radix now set to decimal %u, hex %x, octal %o.\n"),
radix, radix, radix);
}
}
@@ -1122,7 +1122,7 @@ set_output_radix_1 (int from_tty, unsign
output_radix = radix;
if (from_tty)
{
- printf_filtered ("Output radix now set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Output radix now set to decimal %u, hex %x, octal %o.\n"),
radix, radix, radix);
}
}
@@ -1145,7 +1145,7 @@ set_radix (char *arg, int from_tty)
set_input_radix_1 (0, radix);
if (from_tty)
{
- printf_filtered ("Input and output radices now set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Input and output radices now set to decimal %u, hex %x, octal %o.\n"),
radix, radix, radix);
}
}
@@ -1159,14 +1159,14 @@ show_radix (char *arg, int from_tty)
{
if (input_radix == output_radix)
{
- printf_filtered ("Input and output radices set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Input and output radices set to decimal %u, hex %x, octal %o.\n"),
input_radix, input_radix, input_radix);
}
else
{
- printf_filtered ("Input radix set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Input radix set to decimal %u, hex %x, octal %o.\n"),
input_radix, input_radix, input_radix);
- printf_filtered ("Output radix set to decimal %u, hex %x, octal %o.\n",
+ printf_filtered (_("Output radix set to decimal %u, hex %x, octal %o.\n"),
output_radix, output_radix, output_radix);
}
}
Index: value.c
===================================================================
RCS file: /cvs/src/src/gdb/value.c,v
retrieving revision 1.24
diff -p -u -r1.24 value.c
--- value.c 11 Feb 2005 04:06:09 -0000 1.24
+++ value.c 12 Feb 2005 00:38:07 -0000
@@ -682,9 +682,9 @@ show_values (char *num_exp, int from_tty
for (i = num; i < num + 10 && i <= value_history_count; i++)
{
val = access_value_history (i);
- printf_filtered ("$%d = ", i);
+ printf_filtered (("$%d = "), i);
value_print (val, gdb_stdout, 0, Val_pretty_default);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
/* The next "info history +" should start after what we just printed. */
@@ -819,14 +819,15 @@ show_convenience (char *ignore, int from
{
varseen = 1;
}
- printf_filtered ("$%s = ", var->name);
+ printf_filtered (("$%s = "), var->name);
value_print (var->value, gdb_stdout, 0, Val_pretty_default);
- printf_filtered ("\n");
+ printf_filtered (("\n"));
}
if (!varseen)
- printf_unfiltered ("No debugger convenience variables now defined.\n\
+ printf_unfiltered (_("\
+No debugger convenience variables now defined.\n\
Convenience variables have names starting with \"$\";\n\
-use \"set\" as in \"set $foo = 5\" to define them.\n");
+use \"set\" as in \"set $foo = 5\" to define them.\n"));
}
\f
/* Extract a value as a C number (either long or double).
Index: cli/cli-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v
retrieving revision 1.49
diff -p -u -r1.49 cli-cmds.c
--- cli/cli-cmds.c 11 Feb 2005 18:13:54 -0000 1.49
+++ cli/cli-cmds.c 12 Feb 2005 00:38:07 -0000
@@ -190,7 +190,7 @@ error_no_arg (char *why)
static void
info_command (char *arg, int from_tty)
{
- printf_unfiltered ("\"info\" must be followed by the name of an info command.\n");
+ printf_unfiltered (_("\"info\" must be followed by the name of an info command.\n"));
help_list (infolist, "info ", -1, gdb_stdout);
}
@@ -317,10 +317,10 @@ pwd_command (char *args, int from_tty)
getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
if (strcmp (gdb_dirbuf, current_directory) != 0)
- printf_unfiltered ("Working directory %s\n (canonically %s).\n",
+ printf_unfiltered (_("Working directory %s\n (canonically %s).\n"),
current_directory, gdb_dirbuf);
else
- printf_unfiltered ("Working directory %s.\n", current_directory);
+ printf_unfiltered (_("Working directory %s.\n"), current_directory);
}
void
@@ -994,14 +994,14 @@ ambiguous_line_spec (struct symtabs_and_
int i;
for (i = 0; i < sals->nelts; ++i)
- printf_filtered ("file: \"%s\", line number: %d\n",
+ printf_filtered (_("file: \"%s\", line number: %d\n"),
sals->sals[i].symtab->filename, sals->sals[i].line);
}
static void
set_debug (char *arg, int from_tty)
{
- printf_unfiltered ("\"set debug\" must be followed by the name of a print subcommand.\n");
+ printf_unfiltered (_("\"set debug\" must be followed by the name of a print subcommand.\n"));
help_list (setdebuglist, "set debug ", -1, gdb_stdout);
}
Index: cli/cli-dump.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-dump.c,v
retrieving revision 1.16
diff -p -u -r1.16 cli-dump.c
--- cli/cli-dump.c 11 Feb 2005 04:06:10 -0000 1.16
+++ cli/cli-dump.c 12 Feb 2005 00:38:07 -0000
@@ -181,14 +181,14 @@ struct cmd_list_element *binary_append_c
static void
dump_command (char *cmd, int from_tty)
{
- printf_unfiltered ("\"dump\" must be followed by a subcommand.\n\n");
+ printf_unfiltered (_("\"dump\" must be followed by a subcommand.\n\n"));
help_list (dump_cmdlist, "dump ", -1, gdb_stdout);
}
static void
append_command (char *cmd, int from_tty)
{
- printf_unfiltered ("\"append\" must be followed by a subcommand.\n\n");
+ printf_unfiltered (_("\"append\" must be followed by a subcommand.\n\n"));
help_list (dump_cmdlist, "append ", -1, gdb_stdout);
}
@@ -473,7 +473,7 @@ restore_section_callback (bfd *ibfd, ase
|| (data->load_end > 0 && sec_start >= data->load_end))
{
/* No, no useable data in this section. */
- printf_filtered ("skipping section %s...\n",
+ printf_filtered (_("skipping section %s...\n"),
bfd_section_name (ibfd, isec));
return;
}
Index: cli/cli-logging.c
===================================================================
RCS file: /cvs/src/src/gdb/cli/cli-logging.c,v
retrieving revision 1.7
diff -p -u -r1.7 cli-logging.c
--- cli/cli-logging.c 11 Feb 2005 18:13:54 -0000 1.7
+++ cli/cli-logging.c 12 Feb 2005 00:38:07 -0000
@@ -133,33 +133,34 @@ set_logging_off (char *args, int from_tt
static void
set_logging_command (char *args, int from_tty)
{
- printf_unfiltered ("\"set logging\" lets you log output to a file.\n");
- printf_unfiltered ("Usage: set logging on [FILENAME]\n");
- printf_unfiltered (" set logging off\n");
- printf_unfiltered (" set logging file FILENAME\n");
- printf_unfiltered (" set logging overwrite [on|off]\n");
- printf_unfiltered (" set logging redirect [on|off]\n");
+ printf_unfiltered (_("\
+\"set logging\" lets you log output to a file.\n\
+Usage: set logging on [FILENAME]\n\
+ set logging off\n\
+ set logging file FILENAME\n\
+ set logging overwrite [on|off]\n\
+ set logging redirect [on|off]\n"));
}
void
show_logging_command (char *args, int from_tty)
{
if (saved_filename)
- printf_unfiltered ("Currently logging to \"%s\".\n", saved_filename);
+ printf_unfiltered (_("Currently logging to \"%s\".\n"), saved_filename);
if (saved_filename == NULL
|| strcmp (logging_filename, saved_filename) != 0)
- printf_unfiltered ("Future logs will be written to %s.\n",
+ printf_unfiltered (_("Future logs will be written to %s.\n"),
logging_filename);
if (logging_overwrite)
- printf_unfiltered ("Logs will overwrite the log file.\n");
+ printf_unfiltered (_("Logs will overwrite the log file.\n"));
else
- printf_unfiltered ("Logs will be appended to the log file.\n");
+ printf_unfiltered (_("Logs will be appended to the log file.\n"));
if (logging_redirect)
- printf_unfiltered ("Output will be sent only to the log file.\n");
+ printf_unfiltered (_("Output will be sent only to the log file.\n"));
else
- printf_unfiltered ("Output will be logged and displayed.\n");
+ printf_unfiltered (_("Output will be logged and displayed.\n"));
}
void
Index: tui/tui-hooks.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-hooks.c,v
retrieving revision 1.23
diff -p -u -r1.23 tui-hooks.c
--- tui/tui-hooks.c 26 Jun 2004 20:37:13 -0000 1.23
+++ tui/tui-hooks.c 12 Feb 2005 00:38:07 -0000
@@ -88,7 +88,7 @@ tui_query_hook (const char * msg, va_lis
gdb_flush (gdb_stdout);
vfprintf_filtered (gdb_stdout, msg, argp);
- printf_filtered ("(y or n) ");
+ printf_filtered (_("(y or n) "));
wrap_here ("");
gdb_flush (gdb_stdout);
@@ -121,7 +121,7 @@ tui_query_hook (const char * msg, va_lis
retval = 0;
break;
}
- printf_filtered ("Please answer y or n.\n");
+ printf_filtered (_("Please answer y or n.\n"));
}
noecho ();
return retval;
Index: tui/tui-regs.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-regs.c,v
retrieving revision 1.14
diff -p -u -r1.14 tui-regs.c
--- tui/tui-regs.c 28 Mar 2004 10:18:07 -0000 1.14
+++ tui/tui-regs.c 12 Feb 2005 00:38:07 -0000
@@ -582,8 +582,8 @@ static struct cmd_list_element *tuiregli
static void
tui_reg_command (char *args, int from_tty)
{
- printf_unfiltered ("\"tui reg\" must be followed by the name of a "
- "tui reg command.\n");
+ printf_unfiltered (_("\"tui reg\" must be followed by the name of a "
+ "tui reg command.\n"));
help_list (tuireglist, "tui reg ", -1, gdb_stdout);
}
Index: tui/tui-win.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui-win.c,v
retrieving revision 1.21
diff -p -u -r1.21 tui-win.c
--- tui/tui-win.c 11 Feb 2005 04:06:14 -0000 1.21
+++ tui/tui-win.c 12 Feb 2005 00:38:07 -0000
@@ -295,8 +295,8 @@ static struct cmd_list_element *tuilist;
static void
tui_command (char *args, int from_tty)
{
- printf_unfiltered ("\"tui\" must be followed by the name of a "
- "tui command.\n");
+ printf_unfiltered (_("\"tui\" must be followed by the name of a "
+ "tui command.\n"));
help_list (tuilist, "tui ", -1, gdb_stdout);
}
@@ -866,7 +866,7 @@ The window name specified must be valid
if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
tui_refresh_data_win ();
xfree (buf_ptr);
- printf_filtered ("Focus set to %s window.\n",
+ printf_filtered (_("Focus set to %s window.\n"),
tui_win_name ((struct tui_gen_win_info *) tui_win_with_focus ()));
}
else
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [commit] mark some of printf_(un)filtered
2005-02-12 10:56 [commit] mark some of printf_(un)filtered Andrew Cagney
@ 2005-02-12 17:17 ` Eli Zaretskii
0 siblings, 0 replies; 2+ messages in thread
From: Eli Zaretskii @ 2005-02-12 17:17 UTC (permalink / raw)
To: Andrew Cagney; +Cc: gdb-patches
> Date: Fri, 11 Feb 2005 19:39:45 -0500
> From: Andrew Cagney <ac131313@redhat.com>
>
> Only some, where in doubt I tried to skip (sometimes entire files).
> Where fairly certain that there shouldn't be a translation, I marked it
> as (("string")).
Thanks.
These patches have many such (("string")) ``translations''. IMHO, it
certainly should have never been committed without discussions.
Anyway, those strings which we decide not to translate should have
comments explaining why, lest someone in the future will decide that
it's an omission.
> committed,
Sigh... yet another commit without an RFA. Am I the only one who is
astonished to see commits of massive patches whose author says that he
is uncertain what would be the best way of making the very changes he
just committed??
> @@ -3091,7 +3091,7 @@ user_select_syms (struct ada_symbol_info
> else if (is_enumeral
> && TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
> {
> - printf_unfiltered ("[%d] ", i + first_choice);
> + printf_unfiltered (("[%d] "), i + first_choice);
This should be translated, as some languages have rules for numerals.
> @@ -3151,7 +3151,7 @@ get_selections (int *choices, int n_choi
> if (prompt == NULL)
> prompt = ">";
>
> - printf_unfiltered ("%s ", prompt);
> + printf_unfiltered (("%s "), prompt);
The prompt shouldn't be translated, I think.
> print_value_flags (struct type *t)
> {
> if (can_dereference (t))
> - printf_filtered ("*");
> + printf_filtered (("*"));
> else
> - printf_filtered ("-");
> + printf_filtered (("-"));
No translations needed here, I think.
> @@ -58,7 +58,7 @@ breakpoints_changed (void)
> if (annotation_level > 1)
> {
> target_terminal_ours ();
> - printf_unfiltered ("\n\032\032breakpoints-invalid\n");
> + printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
Annotations should never be translated, since front ends depend on
their literal text.
> @@ -2162,25 +2161,22 @@ print_it_typical (bpstat bs)
> (CURRENT_EXCEPTION_KIND == EX_EVENT_CATCH))
> {
> annotate_catchpoint (bs->breakpoint_at->number);
> - printf_filtered ("\nCatchpoint %d (exception caught), ",
> + printf_filtered (_("\nCatchpoint %d (exception caught), "),
> bs->breakpoint_at->number);
> - printf_filtered ("throw location ");
> if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
> - printf_filtered ("%s:%d",
> + printf_filtered (_("throw location %s:%d, "),
> CURRENT_EXCEPTION_THROW_FILE,
> CURRENT_EXCEPTION_THROW_LINE);
> else
> - printf_filtered ("unknown");
> + printf_filtered (_("throw location unknown, "));
>
> - printf_filtered (", catch location ");
> if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
> - printf_filtered ("%s:%d",
> + printf_filtered (_("catch location %s:%d\n"),
> CURRENT_EXCEPTION_CATCH_FILE,
> CURRENT_EXCEPTION_CATCH_LINE);
> else
> - printf_filtered ("unknown");
> + printf_filtered (_("catch location unknown\n"));
>
> - printf_filtered ("\n");
> /* don't bother to print location frame info */
> return PRINT_SRC_ONLY;
> }
This code fragment assembles a sentence from several parts. While the
refactoring of individual parts is well done (thanks, Andrew), the
overall result will be less than perfect for right-to-left languages.
Therefore, I suggest to rewrite this as a single call to
printf_filtered that has the entire output line as its argument.
> @@ -2196,25 +2192,22 @@ print_it_typical (bpstat bs)
> (CURRENT_EXCEPTION_KIND == EX_EVENT_THROW))
> {
> annotate_catchpoint (bs->breakpoint_at->number);
> - printf_filtered ("\nCatchpoint %d (exception thrown), ",
> + printf_filtered (_("\nCatchpoint %d (exception thrown), "),
> bs->breakpoint_at->number);
> - printf_filtered ("throw location ");
> if (CURRENT_EXCEPTION_THROW_PC && CURRENT_EXCEPTION_THROW_LINE)
> - printf_filtered ("%s:%d",
> + printf_filtered (_("throw location %s:%d, "),
> CURRENT_EXCEPTION_THROW_FILE,
> CURRENT_EXCEPTION_THROW_LINE);
> else
> - printf_filtered ("unknown");
> + printf_filtered (_("throw location unknown, "));
>
> - printf_filtered (", catch location ");
> if (CURRENT_EXCEPTION_CATCH_PC && CURRENT_EXCEPTION_CATCH_LINE)
> - printf_filtered ("%s:%d",
> + printf_filtered (_("catch location %s:%d\n"),
> CURRENT_EXCEPTION_CATCH_FILE,
> CURRENT_EXCEPTION_CATCH_LINE);
> else
> - printf_filtered ("unknown");
> + printf_filtered (_("catch location unknown\n"));
>
> - printf_filtered ("\n");
> /* don't bother to print location frame info */
> return PRINT_SRC_ONLY;
> }
Same here.
> - printf_filtered ("Catchpoint %d (%s %s)",
> + printf_filtered (_("Catchpoint %d (%s %s)"),
> b->number,
> (b->type == bp_catch_load) ? "load" : "unload",
> (b->dll_pathname != NULL) ?
The "load" and "unload" parts should not be separate strings, but part
of a full translatable string.
> for (j = 0; j < LINE_SIZE; j++)
> printf_filtered ("%02x", p->data[j] & 0xFF);
> - printf_filtered ("\n");
> + printf_filtered (("\n"));
No need to translate the newline, obviously.
> @@ -2315,7 +2315,7 @@ dwarf2_psymtab_to_symtab (struct partial
> {
> if (info_verbose)
> {
> - printf_filtered ("Reading in symbols for %s...", pst->filename);
> + printf_filtered (_("Reading in symbols for %s..."), pst->filename);
> gdb_flush (gdb_stdout);
> }
>
> @@ -2327,7 +2327,7 @@ dwarf2_psymtab_to_symtab (struct partial
>
> /* Finish up the debug error message. */
> if (info_verbose)
> - printf_filtered ("done.\n");
> + printf_filtered (_("done.\n"));
This "done" part should have an i18n comment telling translators that
it's the end of the "Reading in symbols for %s...done" sentence.
> @@ -2415,7 +2417,7 @@ dwarf_psymtab_to_symtab (struct partial_
> disconcerting pauses. */
> if (info_verbose)
> {
> - printf_filtered ("Reading in symbols for %s...",
> + printf_filtered (_("Reading in symbols for %s..."),
> pst->filename);
> gdb_flush (gdb_stdout);
> }
> @@ -2434,7 +2436,7 @@ dwarf_psymtab_to_symtab (struct partial_
> /* Finish up the verbose info message. */
> if (info_verbose)
> {
> - printf_filtered ("done.\n");
> + printf_filtered (_("done.\n"));
Same here.
> @@ -527,10 +527,10 @@ print_section_info (struct target_ops *t
>
> printf_filtered ("\t`%s', ", bfd_get_filename (abfd));
> wrap_here (" ");
> - printf_filtered ("file type %s.\n", bfd_get_target (abfd));
> + printf_filtered (_("file type %s.\n"), bfd_get_target (abfd));
This should be made a single sentence, I think.
> @@ -2694,13 +2694,9 @@ print_bit_vector (B_TYPE *bits, int nbit
> puts_filtered (" ");
> }
> if (B_TST (bits, bitno))
> - {
> - printf_filtered ("1");
> - }
> + printf_filtered (("1"));
> else
> - {
> - printf_filtered ("0");
> - }
> + printf_filtered (("0"));
Don't think these need translation.
> if (pipe (inf_ttrace_pfd1) == -1)
> - perror_with_name ("pipe");
> + perror_with_name (("pipe"));
Names of functions and system calls should not be translated.
> inf_ttrace_files_info (struct target_ops *ignore)
> {
> - printf_unfiltered ("\tUsing the running image of %s %s.\n",
> + printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
> attach_flag ? "attached" : "child",
> target_pid_to_str (inferior_ptid));
This needs top be rewritten so as to make "attached" and "child" parts
of a single translatable string.
> if (from_tty)
> {
> - printf_filtered ("Continuing at ");
> + printf_filtered (_("Continuing at "));
> print_address_numeric (addr, 1, gdb_stdout);
> printf_filtered (".\n");
Can we make this a single string with a format specifier?
> @@ -3145,8 +3145,8 @@ signal_pass_update (int signo, int state
> static void
> sig_print_header (void)
> {
> - printf_filtered ("\
> -Signal Stop\tPrint\tPass to program\tDescription\n");
> + printf_filtered (_("\
> +Signal Stop\tPrint\tPass to program\tDescription\n"));
> }
This is okay, but the related "Yes" and "No" strings in sig_print_info
should be marked up for translation as well, and the code there
rewritten to use a single string, not fragments.
> child_files_info (struct target_ops *ignore)
> {
> - printf_unfiltered ("\tUsing the running image of %s %s.\n",
> + printf_unfiltered (_("\tUsing the running image of %s %s.\n"),
> attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid));
> }
"attached" and "child" should be part of the full string.
> @@ -311,7 +311,7 @@ mdebug_psymtab_to_symtab (struct partial
>
> if (info_verbose)
> {
> - printf_filtered ("Reading in symbols for %s...", pst->filename);
> + printf_filtered (_("Reading in symbols for %s..."), pst->filename);
> gdb_flush (gdb_stdout);
> }
>
> @@ -324,7 +324,7 @@ mdebug_psymtab_to_symtab (struct partial
> scan_file_globals (pst->objfile);
>
> if (info_verbose)
> - printf_filtered ("done.\n");
> + printf_filtered (_("done.\n"));
We need a comment here about "Reading in symbols for %s..." and "done"
being part of the same sentence.
> @@ -4109,7 +4109,7 @@ psymtab_to_symtab_1 (struct partial_symt
> from a shared library, so tell the user only if verbose is on. */
> if (info_verbose && n_undef_symbols)
> {
> - printf_filtered ("File %s contains %d unresolved references:",
> + printf_filtered (_("File %s contains %d unresolved references:"),
> st->filename, n_undef_symbols);
> printf_filtered ("\n\t%4d variables\n\t%4d procedures\n\t%4d labels\n",
> n_undef_vars, n_undef_procs, n_undef_labels);
I think the "\n\t%4d variables\n\t%4d procedures\n\t%4d labels\n"
part should be marked up for translation.
> --- printcmd.c 11 Feb 2005 18:13:52 -0000 1.87
> +++ printcmd.c 12 Feb 2005 00:38:05 -0000
> @@ -1021,16 +1021,16 @@ sym_info (char *arg, int from_tty)
> printf_filtered ("%s in ",
> SYMBOL_PRINT_NAME (msymbol));
> if (pc_in_unmapped_range (addr, sect))
> - printf_filtered ("load address range of ");
> + printf_filtered (_("load address range of "));
> if (section_is_overlay (sect))
> - printf_filtered ("%s overlay ",
> + printf_filtered (_("%s overlay "),
> section_is_mapped (sect) ? "mapped" : "unmapped");
> - printf_filtered ("section %s", sect->name);
> + printf_filtered (_("section %s"), sect->name);
> printf_filtered ("\n");
> }
This should be produced as a single sentence, and "mapped"/"unmapped"
parts should be part of it.
> if (section_is_overlay (section))
> {
> load_addr = overlay_unmapped_address (load_addr, section);
> - printf_filtered (",\n -- loaded at ");
> + printf_filtered (_(",\n -- loaded at "));
> print_address_numeric (load_addr, 1, gdb_stdout);
> - printf_filtered (" in overlay section %s", section->name);
> + printf_filtered (_(" in overlay section %s"), section->name);
Can we use some format specifier instead of print_address_numeric? If
we can, then this should be a single translatable string.
> if (section_is_overlay (section))
> {
> load_addr = overlay_unmapped_address (load_addr, section);
> - printf_filtered (",\n -- loaded at ");
> + printf_filtered (_(",\n -- loaded at "));
> print_address_numeric (load_addr, 1, gdb_stdout);
> - printf_filtered (" in overlay section %s", section->name);
> + printf_filtered (_(" in overlay section %s"), section->name);
> }
Same here.
> if (section_is_overlay (section))
> {
> load_addr = overlay_unmapped_address (load_addr, section);
> - printf_filtered (",\n -- loaded at ");
> + printf_filtered (_(",\n -- loaded at "));
> print_address_numeric (load_addr, 1, gdb_stdout);
> - printf_filtered (" in overlay section %s", section->name);
> + printf_filtered (_(" in overlay section %s"), section->name);
> }
And here.
> @@ -1222,15 +1222,15 @@ address_info (char *exp, int from_tty)
> else
> {
> section = SYMBOL_BFD_SECTION (msym);
> - printf_filtered ("static storage at address ");
> + printf_filtered (_("static storage at address "));
> print_address_numeric (load_addr = SYMBOL_VALUE_ADDRESS (msym),
> 1, gdb_stdout);
> if (section_is_overlay (section))
> {
> load_addr = overlay_unmapped_address (load_addr, section);
> - printf_filtered (",\n -- loaded at ");
> + printf_filtered (_(",\n -- loaded at "));
> print_address_numeric (load_addr, 1, gdb_stdout);
> - printf_filtered (" in overlay section %s", section->name);
> + printf_filtered (_(" in overlay section %s"), section->name);
> }
And here (two counts).
> @@ -4230,7 +4230,7 @@ wait_again:
> default: /* FIXME: use si_signo if possible for fault */
> retval = pid_to_ptid (-1);
> printf_filtered ("procfs:%d -- ", __LINE__);
> - printf_filtered ("child stopped for unknown reason:\n");
> + printf_filtered (_("child stopped for unknown reason:\n"));
The "procfs:%d -- " part that prints the value of __LINE__ should be
made part of the translatable string.
> @@ -4238,7 +4238,7 @@ wait_again:
> break; /* case PR_FAULTED: */
> default: /* switch (why) unmatched */
> printf_filtered ("procfs:%d -- ", __LINE__);
> - printf_filtered ("child stopped for unknown reason:\n");
> + printf_filtered (_("child stopped for unknown reason:\n"));
Same here.
> procfs_files_info (struct target_ops *ignore)
> {
> - printf_filtered ("\tUsing the running image of %s %s via /proc.\n",
> + printf_filtered (_("\tUsing the running image of %s %s via /proc.\n"),
> attach_flag? "attached": "child",
> target_pid_to_str (inferior_ptid));
The "attached" and "child" parts should be part of the translatable
string.
> @@ -5770,7 +5770,7 @@ info_proc_mappings (procinfo *pi, int su
> if (summary)
> return; /* No output for summary mode. */
>
> - printf_filtered ("Mapped address spaces:\n\n");
> + printf_filtered (_("Mapped address spaces:\n\n"));
> printf_filtered (header_fmt_string,
> "Start Addr",
> " End Addr",
I think "Start Addr" and "End Addr" should be translatable.
> @@ -490,12 +490,12 @@ set_memory_packet_size (char *args, stru
> static void
> show_memory_packet_size (struct memory_packet_config *config)
> {
> - printf_filtered ("The %s is %ld. ", config->name, config->size);
> + printf_filtered (_("The %s is %ld. "), config->name, config->size);
> if (config->fixed_p)
> - printf_filtered ("Packets are fixed at %ld bytes.\n",
> + printf_filtered (_("Packets are fixed at %ld bytes.\n"),
> get_memory_packet_size (config));
> else
> - printf_filtered ("Packets are limited to %ld bytes.\n",
> + printf_filtered (_("Packets are limited to %ld bytes.\n"),
> get_memory_packet_size (config));
This should be produced as a single sentence, not as 2 parts.
> + printf_filtered (_("%s preprocessor macro info.\n"),
> s->macro_table ? "Includes" : "Does not include");
This should be rewritten as 2 calls to printf_filtered with either
"Includes" or "Does not include" as part of the full translatable
format string.
> @@ -939,14 +939,14 @@ frame_info (char *addr_exp, int from_tty
>
> if (selected_frame_p && frame_relative_level (fi) >= 0)
> {
> - printf_filtered ("Stack level %d, frame at ",
> + printf_filtered (_("Stack level %d, frame at "),
> frame_relative_level (fi));
> print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
> printf_filtered (":\n");
> }
> else
> {
> - printf_filtered ("Stack frame at ");
> + printf_filtered (_("Stack frame at "));
> print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
> printf_filtered (":\n");
> }
If we can replace print_address_numeric with a format specifier, these
two fragments should each be replaced with a single call to
printf_filtered.
> @@ -887,7 +887,7 @@ symbol_file_add_with_addrs_or_offsets (b
> if (!have_partial_symbols () && !have_full_symbols ())
> {
> wrap_here ("");
> - printf_filtered ("(no debugging symbols found)");
> + printf_filtered (_("(no debugging symbols found)"));
> if (from_tty || info_verbose)
> printf_filtered ("...");
> else
> @@ -901,7 +901,7 @@ symbol_file_add_with_addrs_or_offsets (b
> deprecated_post_add_symbol_hook ();
> else
> {
> - printf_unfiltered ("done.\n");
> + printf_unfiltered (_("done.\n"));
> }
This seems to produce a sentence in chunks, so either rewrite as a
single sentence or add i18n comments that make this clear.
> @@ -1401,7 +1401,7 @@ target_info (char *args, int from_tty)
> if ((int) (t->to_stratum) <= (int) dummy_stratum)
> continue;
> if (has_all_mem)
> - printf_unfiltered ("\tWhile running this, GDB does not access memory from...\n");
> + printf_unfiltered (_("\tWhile running this, GDB does not access memory from...\n"));
> printf_unfiltered ("%s:\n", t->to_longname);
I think these two calls to printf_unfiltered should be replaced with a
single call.
> @@ -1130,15 +1130,15 @@ query (const char *ctlstr, ...)
> gdb_flush (gdb_stdout);
>
> if (annotation_level > 1)
> - printf_filtered ("\n\032\032pre-query\n");
> + printf_filtered (("\n\032\032pre-query\n"));
>
> va_start (args, ctlstr);
> vfprintf_filtered (gdb_stdout, ctlstr, args);
> va_end (args);
> - printf_filtered ("(y or n) ");
> + printf_filtered (_("(y or n) "));
This string's translation should be consistent with the translations
of the 'Y' and 'N' characters we expect as responses, so that the
result is guaranteed to be correct. E.g., there should not be two or
more places in the function that translate "Y" and "N": the "(y or n)"
string should actually use the translations of "Y" and "N".
Also, the simple-minded up-casing code, viz.
if (answer >= 'a')
answer -= 040;
should be replaced with a call to `toupper', or perhaps even with a
series of calls to `toupper', in case the translation of "Y" or "N" is
not a single character.
> - printf_filtered ("Please answer y or n.\n");
> + printf_filtered (_("Please answer y or n.\n"));
This string should also use the translation of "Y" and "N" instead of
literal characters.
> @@ -1232,13 +1232,13 @@ defaulted_query (const char *ctlstr, con
> gdb_flush (gdb_stdout);
>
> if (annotation_level > 1)
> - printf_filtered ("\n\032\032pre-query\n");
> + printf_filtered (("\n\032\032pre-query\n"));
>
> vfprintf_filtered (gdb_stdout, ctlstr, args);
> - printf_filtered ("(%s or %s) ", y_string, n_string);
> + printf_filtered (_("(%s or %s) "), y_string, n_string);
>
> if (annotation_level > 1)
> - printf_filtered ("\n\032\032query\n");
> + printf_filtered (("\n\032\032query\n"));
>
> wrap_here ("");
> gdb_flush (gdb_stdout);
> @@ -1277,12 +1277,12 @@ defaulted_query (const char *ctlstr, con
> break;
> }
> /* Invalid entries are not defaulted and require another selection. */
> - printf_filtered ("Please answer %s or %s.\n",
> + printf_filtered (_("Please answer %s or %s.\n"),
> y_string, n_string);
> }
`defaulted_query' needs much more work than this: 'y' and 'n' should
be made translatable strings, as well as y_string and n_string. Also,
the comment about up-casing in `query' applies here as well.
`yquery' and `nquery' should be modified to pass strings, not single
characters, to `defaulted_query'.
> @@ -682,9 +682,9 @@ show_values (char *num_exp, int from_tty
> for (i = num; i < num + 10 && i <= value_history_count; i++)
> {
> val = access_value_history (i);
> - printf_filtered ("$%d = ", i);
> + printf_filtered (("$%d = "), i);
This should probably be translatable.
> value_print (val, gdb_stdout, 0, Val_pretty_default);
> - printf_filtered ("\n");
> + printf_filtered (("\n"));
Obviously, no need to translate a newline.
> @@ -819,14 +819,15 @@ show_convenience (char *ignore, int from
> {
> varseen = 1;
> }
> - printf_filtered ("$%s = ", var->name);
> + printf_filtered (("$%s = "), var->name);
> value_print (var->value, gdb_stdout, 0, Val_pretty_default);
> - printf_filtered ("\n");
> + printf_filtered (("\n"));
Same here.
> @@ -88,7 +88,7 @@ tui_query_hook (const char * msg, va_lis
> gdb_flush (gdb_stdout);
>
> vfprintf_filtered (gdb_stdout, msg, argp);
> - printf_filtered ("(y or n) ");
> + printf_filtered (_("(y or n) "));
>
> wrap_here ("");
> gdb_flush (gdb_stdout);
> @@ -121,7 +121,7 @@ tui_query_hook (const char * msg, va_lis
> retval = 0;
> break;
> }
> - printf_filtered ("Please answer y or n.\n");
> + printf_filtered (_("Please answer y or n.\n"));
> }
`tui_query_hook' needs the same work as `query' and `defaulted_query',
to make it i18n-clean.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-02-12 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-02-12 10:56 [commit] mark some of printf_(un)filtered Andrew Cagney
2005-02-12 17:17 ` Eli Zaretskii
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox