* i18n, part 2
@ 2004-12-04 20:06 Baurjan Ismagulov
2004-12-04 21:52 ` Daniel Jacobowitz
` (3 more replies)
0 siblings, 4 replies; 29+ messages in thread
From: Baurjan Ismagulov @ 2004-12-04 20:06 UTC (permalink / raw)
To: gdb-patches
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hello,
here is the next chunk.
I fell in doubt in two places:
* aix-thread.c:aix_thread_extra_thread_info()
"tid %d, %s" doesn't add much context to ", suspended". Besides,
splitting the execution flow with if (tid != PTHDB_INVALID_TID) would
not be identical to the current code. That is why I left the code as
is.
* arm-tdep.c:_initialize_arm_tdep()
The text "\
When off, a 26-bit PC will be used.\n\
When off, a 26-bit PC will be used." looked strange to me, is it
indended to be so?
Comments?
With kind regards,
Baurjan.
2004-12-04 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>
* ada-valprint.c, aix-thread.c, alpha-nat.c, alphabsd-nat.c,
alphanbsd-tdep.c, amd64-linux-nat.c, amd64-tdep.c,
amd64bsd-nat.c, amd64fbsd-nat.c, arch-utils.c, arm-linux-nat.c,
arm-tdep.c, armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c:
i18n markup.
[-- Attachment #2: gdb-ibr-i18n-20041204-1808.diff --]
[-- Type: text/plain, Size: 49400 bytes --]
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/ada-valprint.c gdb/gdb/ada-valprint.c
--- gdb.orig/gdb/ada-valprint.c 2004-11-12 22:45:05.000000000 +0100
+++ gdb/gdb/ada-valprint.c 2004-12-04 16:47:06.000000000 +0100
@@ -206,7 +206,7 @@ val_print_packed_array_elements (struct
val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format,
0, recurse + 1, pretty);
annotate_elt_rep (i - i0);
- fprintf_filtered (stream, " <repeats %u times>", i - i0);
+ fprintf_filtered (stream, _(" <repeats %u times>"), i - i0);
annotate_elt_rep_end ();
}
@@ -421,11 +421,11 @@ ada_print_scalar (struct type *type, LON
case TYPE_CODE_MEMBER:
case TYPE_CODE_METHOD:
case TYPE_CODE_REF:
- warning ("internal error: unhandled type in ada_print_scalar");
+ warning (_("internal error: unhandled type in ada_print_scalar"));
break;
default:
- error ("Invalid type code in symbol table.");
+ error (_("Invalid type code in symbol table."));
}
gdb_flush (stream);
}
@@ -492,7 +492,7 @@ printstr (struct ui_file *stream, char *
ada_emit_char (char_at (string, i, type_len), stream, '\'',
type_len);
fputs_filtered ("'", stream);
- fprintf_filtered (stream, " <repeats %u times>", reps);
+ fprintf_filtered (stream, _(" <repeats %u times>"), reps);
i = rep1 - 1;
things_printed += repeat_count_threshold;
need_comma = 1;
@@ -1068,7 +1068,7 @@ print_field_values (struct type *type, c
if (TYPE_CPLUS_SPECIFIC (type) != NULL
&& TYPE_FIELD_IGNORE (type, i))
{
- fputs_filtered ("<optimized out or zero length>", stream);
+ fputs_filtered (_("<optimized out or zero length>"), stream);
}
else
{
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/aix-thread.c gdb/gdb/aix-thread.c
--- gdb.orig/gdb/aix-thread.c 2004-10-08 22:29:45.000000000 +0200
+++ gdb/gdb/aix-thread.c 2004-12-04 16:59:10.000000000 +0100
@@ -240,7 +240,7 @@ ptrace_check (int req, int id, int ret)
}
break;
}
- error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)",
+ error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"),
req, id, ret, errno, safe_strerror (errno));
return 0; /* Not reached. */
}
@@ -970,12 +970,12 @@ aix_thread_resume (ptid_t ptid, int step
{
thread = find_thread_pid (ptid);
if (!thread)
- error ("aix-thread resume: unknown pthread %ld",
+ error (_("aix-thread resume: unknown pthread %ld"),
TIDGET (ptid));
tid[0] = thread->private->tid;
if (tid[0] == PTHDB_INVALID_TID)
- error ("aix-thread resume: no tid for pthread %ld",
+ error (_("aix-thread resume: no tid for pthread %ld"),
TIDGET (ptid));
tid[1] = 0;
@@ -1131,7 +1131,7 @@ fetch_regs_user_thread (pthdb_pthread_t
"fetch_regs_user_thread %lx\n", (long) pdtid);
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- error ("aix-thread: fetch_registers: pthdb_pthread_context returned %s",
+ error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"),
pd_status2str (status));
/* General-purpose registers. */
@@ -1412,7 +1412,7 @@ store_regs_user_thread (pthdb_pthread_t
values. */
status = pthdb_pthread_context (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- error ("aix-thread: store_registers: pthdb_pthread_context returned %s",
+ error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"),
pd_status2str (status));
/* Collect general-purpose register values from the regcache. */
@@ -1473,7 +1473,7 @@ store_regs_user_thread (pthdb_pthread_t
status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx);
if (status != PTHDB_SUCCESS)
- error ("aix-thread: store_registers: pthdb_pthread_setcontext returned %s",
+ error (_("aix-thread: store_registers: pthdb_pthread_setcontext returned %s"),
pd_status2str (status));
}
@@ -1660,7 +1660,7 @@ aix_thread_pid_to_str (ptid_t ptid)
xstrprintf(). */
xfree (ret);
- ret = xstrprintf ("Thread %ld", ptid_get_tid (ptid));
+ ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid));
return ret;
}
@@ -1700,16 +1700,16 @@ aix_thread_extra_thread_info (struct thr
status = pthdb_pthread_suspendstate (pd_session, pdtid,
&suspendstate);
if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED)
- fprintf_unfiltered (buf, ", suspended");
+ fprintf_unfiltered (buf, _(", suspended"));
status = pthdb_pthread_detachstate (pd_session, pdtid,
&detachstate);
if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED)
- fprintf_unfiltered (buf, ", detached");
+ fprintf_unfiltered (buf, _(", detached"));
pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend);
if (status == PTHDB_SUCCESS && cancelpend)
- fprintf_unfiltered (buf, ", cancel pending");
+ fprintf_unfiltered (buf, _(", cancel pending"));
ui_file_write (buf, "", 1);
@@ -1727,8 +1727,8 @@ static void
init_aix_thread_ops (void)
{
aix_thread_ops.to_shortname = "aix-threads";
- aix_thread_ops.to_longname = "AIX pthread support";
- aix_thread_ops.to_doc = "AIX pthread support";
+ aix_thread_ops.to_longname = _("AIX pthread support");
+ aix_thread_ops.to_doc = _("AIX pthread support");
aix_thread_ops.to_attach = aix_thread_attach;
aix_thread_ops.to_detach = aix_thread_detach;
@@ -1764,8 +1764,8 @@ _initialize_aix_thread (void)
deprecated_add_show_from_set
(add_set_cmd ("aix-thread", no_class, var_zinteger,
(char *) &debug_aix_thread,
- "Set debugging of AIX thread module.\n"
- "Enables printf debugging output.\n",
+ _("Set debugging of AIX thread module.\n\
+Enables printf debugging output.\n"),
&setdebuglist),
&showdebuglist);
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-nat.c gdb/gdb/alpha-nat.c
--- gdb.orig/gdb/alpha-nat.c 2004-12-01 22:19:21.000000000 +0100
+++ gdb/gdb/alpha-nat.c 2004-12-04 17:00:29.000000000 +0100
@@ -121,7 +121,7 @@ fetch_osf_core_registers (char *core_reg
}
if (bad_reg >= 0)
{
- error ("Register %s not found in core file.", REGISTER_NAME (bad_reg));
+ error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg));
}
}
@@ -131,7 +131,7 @@ fetch_elf_core_registers (char *core_reg
{
if (core_reg_size < 32 * 8)
{
- error ("Core file register section too small (%u bytes).", core_reg_size);
+ error (_("Core file register section too small (%u bytes)."), core_reg_size);
return;
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphabsd-nat.c gdb/gdb/alphabsd-nat.c
--- gdb.orig/gdb/alphabsd-nat.c 2004-08-15 01:37:04.000000000 +0200
+++ gdb/gdb/alphabsd-nat.c 2004-12-04 17:17:57.000000000 +0100
@@ -92,7 +92,7 @@ fetch_inferior_registers (int regno)
if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &gregs, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
alphabsd_supply_reg ((char *) &gregs, regno);
if (regno != -1)
@@ -105,7 +105,7 @@ fetch_inferior_registers (int regno)
if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
alphabsd_supply_fpreg ((char *) &fpregs, regno);
}
@@ -122,13 +122,13 @@ store_inferior_registers (int regno)
struct reg gregs;
if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &gregs, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
alphabsd_fill_reg ((char *) &gregs, regno);
if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &gregs, 0) == -1)
- perror_with_name ("Couldn't write registers");
+ perror_with_name (_("Couldn't write registers"));
if (regno != -1)
return;
@@ -140,12 +140,12 @@ store_inferior_registers (int regno)
if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
alphabsd_fill_fpreg ((char *) &fpregs, regno);
if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't write floating point status");
+ perror_with_name (_("Couldn't write floating point status"));
}
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphanbsd-tdep.c gdb/gdb/alphanbsd-tdep.c
--- gdb.orig/gdb/alphanbsd-tdep.c 2004-09-28 22:02:20.000000000 +0200
+++ gdb/gdb/alphanbsd-tdep.c 2004-12-04 17:18:59.000000000 +0100
@@ -64,7 +64,7 @@ fetch_core_registers (char *core_reg_sec
if (core_reg_size < (SIZEOF_TRAPFRAME + SIZEOF_STRUCT_FPREG))
{
- warning ("Wrong size register set in core file.");
+ warning (_("Wrong size register set in core file."));
return;
}
@@ -86,14 +86,14 @@ fetch_elfcore_registers (char *core_reg_
{
case 0: /* Integer registers. */
if (core_reg_size != SIZEOF_STRUCT_REG)
- warning ("Wrong size register set in core file.");
+ warning (_("Wrong size register set in core file."));
else
alphabsd_supply_reg (core_reg_sect, -1);
break;
case 2: /* Floating point registers. */
if (core_reg_size != SIZEOF_STRUCT_FPREG)
- warning ("Wrong size FP register set in core file.");
+ warning (_("Wrong size FP register set in core file."));
else
alphabsd_supply_fpreg (core_reg_sect, -1);
break;
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-linux-nat.c gdb/gdb/amd64-linux-nat.c
--- gdb.orig/gdb/amd64-linux-nat.c 2004-04-09 23:16:05.000000000 +0200
+++ gdb/gdb/amd64-linux-nat.c 2004-12-04 17:19:59.000000000 +0100
@@ -162,7 +162,7 @@ fetch_inferior_registers (int regnum)
elf_gregset_t regs;
if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
amd64_supply_native_gregset (current_regcache, ®s, -1);
if (regnum != -1)
@@ -174,7 +174,7 @@ fetch_inferior_registers (int regnum)
elf_fpregset_t fpregs;
if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
amd64_supply_fxsave (current_regcache, -1, &fpregs);
}
@@ -199,12 +199,12 @@ store_inferior_registers (int regnum)
elf_gregset_t regs;
if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
amd64_collect_native_gregset (current_regcache, ®s, regnum);
if (ptrace (PTRACE_SETREGS, tid, 0, (long) ®s) < 0)
- perror_with_name ("Couldn't write registers");
+ perror_with_name (_("Couldn't write registers"));
if (regnum != -1)
return;
@@ -215,12 +215,12 @@ store_inferior_registers (int regnum)
elf_fpregset_t fpregs;
if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
amd64_collect_fxsave (current_regcache, regnum, &fpregs);
if (ptrace (PTRACE_SETFPREGS, tid, 0, (long) &fpregs) < 0)
- perror_with_name ("Couldn't write floating point status");
+ perror_with_name (_("Couldn't write floating point status"));
return;
}
@@ -248,7 +248,7 @@ amd64_linux_dr_get (int regnum)
offsetof (struct user, u_debugreg[regnum]), 0);
if (errno != 0)
#if 0
- perror_with_name ("Couldn't read debug register");
+ perror_with_name (_("Couldn't read debug register"));
#else
return 0;
#endif
@@ -269,7 +269,7 @@ amd64_linux_dr_set (int regnum, unsigned
errno = 0;
ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value);
if (errno != 0)
- perror_with_name ("Couldn't write debug register");
+ perror_with_name (_("Couldn't write debug register"));
}
void
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-tdep.c gdb/gdb/amd64-tdep.c
--- gdb.orig/gdb/amd64-tdep.c 2004-11-13 03:15:31.000000000 +0100
+++ gdb/gdb/amd64-tdep.c 2004-12-04 17:21:36.000000000 +0100
@@ -204,7 +204,7 @@ amd64_dwarf_reg_to_regnum (int reg)
regnum = amd64_dwarf_regmap[reg];
if (regnum == -1)
- warning ("Unmapped DWARF Register #%d encountered\n", reg);
+ warning (_("Unmapped DWARF Register #%d encountered\n"), reg);
return regnum;
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64bsd-nat.c gdb/gdb/amd64bsd-nat.c
--- gdb.orig/gdb/amd64bsd-nat.c 2004-09-26 20:42:29.000000000 +0200
+++ gdb/gdb/amd64bsd-nat.c 2004-12-04 17:23:29.000000000 +0100
@@ -49,7 +49,7 @@ amd64bsd_fetch_inferior_registers (int r
if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) ®s, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
amd64_supply_native_gregset (current_regcache, ®s, -1);
if (regnum != -1)
@@ -62,7 +62,7 @@ amd64bsd_fetch_inferior_registers (int r
if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
amd64_supply_fxsave (current_regcache, -1, &fpregs);
}
@@ -80,13 +80,13 @@ amd64bsd_store_inferior_registers (int r
if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) ®s, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ perror_with_name (_("Couldn't get registers"));
amd64_collect_native_gregset (current_regcache, ®s, regnum);
if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) ®s, 0) == -1)
- perror_with_name ("Couldn't write registers");
+ perror_with_name (_("Couldn't write registers"));
if (regnum != -1)
return;
@@ -98,13 +98,13 @@ amd64bsd_store_inferior_registers (int r
if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ perror_with_name (_("Couldn't get floating point status"));
amd64_collect_fxsave (current_regcache, regnum, &fpregs);
if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
(PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
- perror_with_name ("Couldn't write floating point status");
+ perror_with_name (_("Couldn't write floating point status"));
}
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64fbsd-nat.c gdb/gdb/amd64fbsd-nat.c
--- gdb.orig/gdb/amd64fbsd-nat.c 2004-09-26 20:42:29.000000000 +0200
+++ gdb/gdb/amd64fbsd-nat.c 2004-12-04 17:24:18.000000000 +0100
@@ -178,9 +178,9 @@ _initialize_amd64fbsd_nat (void)
if (SC_RIP_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\
-Please report this to <bug-gdb@gnu.org>.",
+Please report this to <bug-gdb@gnu.org>."),
offset, SC_RIP_OFFSET);
}
@@ -191,9 +191,9 @@ Please report this to <bug-gdb@gnu.org>.
if (SC_RSP_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\
-Please report this to <bug-gdb@gnu.org>.",
+Please report this to <bug-gdb@gnu.org>."),
offset, SC_RSP_OFFSET);
}
@@ -204,9 +204,9 @@ Please report this to <bug-gdb@gnu.org>.
if (SC_RBP_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\
-Please report this to <bug-gdb@gnu.org>.",
+Please report this to <bug-gdb@gnu.org>."),
offset, SC_RBP_OFFSET);
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arch-utils.c gdb/gdb/arch-utils.c
--- gdb.orig/gdb/arch-utils.c 2004-11-23 22:05:18.000000000 +0100
+++ gdb/gdb/arch-utils.c 2004-12-04 17:38:05.000000000 +0100
@@ -180,7 +180,7 @@ default_float_format (struct gdbarch *gd
return &floatformat_ieee_single_little;
default:
internal_error (__FILE__, __LINE__,
- "default_float_format: bad byte order");
+ _("default_float_format: bad byte order"));
}
}
@@ -197,7 +197,7 @@ default_double_format (struct gdbarch *g
return &floatformat_ieee_double_little;
default:
internal_error (__FILE__, __LINE__,
- "default_double_format: bad byte order");
+ _("default_double_format: bad byte order"));
}
}
@@ -261,7 +261,7 @@ legacy_virtual_frame_pointer (CORE_ADDR
else
/* Should this be an internal error? I guess so, it is reflecting
an architectural limitation in the current design. */
- internal_error (__FILE__, __LINE__, "No virtual frame pointer available");
+ internal_error (__FILE__, __LINE__, _("No virtual frame pointer available"));
*frame_offset = 0;
}
@@ -372,11 +372,17 @@ static void
show_endian (char *args, int from_tty)
{
if (target_byte_order_auto)
- printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n",
- (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little"));
+ if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
+ printf_unfiltered (_("The target endianness is set automatically \
+(currently big endian)\n"));
+ else
+ printf_unfiltered (_("The target endianness is set automatically \
+(currently little endian)\n"));
else
- printf_unfiltered ("The target is assumed to be %s endian\n",
- (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little"));
+ if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
+ printf_unfiltered ("The target is assumed to be big endian\n");
+ else
+ printf_unfiltered ("The target is assumed to be little endian\n");
}
static void
@@ -393,7 +399,7 @@ set_endian (char *ignore_args, int from_
gdbarch_info_init (&info);
info.byte_order = BFD_ENDIAN_LITTLE;
if (! gdbarch_update_p (info))
- printf_unfiltered ("Little endian target not supported by GDB\n");
+ printf_unfiltered (_("Little endian target not supported by GDB\n"));
}
else if (set_endian_string == endian_big)
{
@@ -402,11 +408,11 @@ set_endian (char *ignore_args, int from_
gdbarch_info_init (&info);
info.byte_order = BFD_ENDIAN_BIG;
if (! gdbarch_update_p (info))
- printf_unfiltered ("Big endian target not supported by GDB\n");
+ printf_unfiltered (_("Big endian target not supported by GDB\n"));
}
else
internal_error (__FILE__, __LINE__,
- "set_endian: bad value");
+ _("set_endian: bad value"));
show_endian (NULL, from_tty);
}
@@ -436,9 +442,9 @@ show_architecture (char *args, int from_
const char *arch;
arch = TARGET_ARCHITECTURE->printable_name;
if (target_architecture_auto)
- printf_filtered ("The target architecture is set automatically (currently %s)\n", arch);
+ printf_filtered (_("The target architecture is set automatically (currently %s)\n"), arch);
else
- printf_filtered ("The target architecture is assumed to be %s\n", arch);
+ printf_filtered (_("The target architecture is assumed to be %s\n"), arch);
}
@@ -459,11 +465,11 @@ set_architecture (char *ignore_args, int
info.bfd_arch_info = bfd_scan_arch (set_architecture_string);
if (info.bfd_arch_info == NULL)
internal_error (__FILE__, __LINE__,
- "set_architecture: bfd_scan_arch failed");
+ _("set_architecture: bfd_scan_arch failed"));
if (gdbarch_update_p (info))
target_architecture_auto = 0;
else
- printf_unfiltered ("Architecture `%s' not recognized.\n",
+ printf_unfiltered (_("Architecture `%s' not recognized.\n"),
set_architecture_string);
}
show_architecture (NULL, from_tty);
@@ -533,7 +539,7 @@ set_gdbarch_from_file (bfd *abfd)
gdbarch = gdbarch_from_bfd (abfd);
if (gdbarch == NULL)
- error ("Architecture of file not recognized.\n");
+ error (_("Architecture of file not recognized.\n"));
deprecated_current_gdbarch_select_hack (gdbarch);
}
@@ -581,11 +587,11 @@ initialize_current_architecture (void)
}
if (chosen == NULL)
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: No arch");
+ _("initialize_current_architecture: No arch"));
info.bfd_arch_info = bfd_scan_arch (chosen);
if (info.bfd_arch_info == NULL)
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: Arch not found");
+ _("initialize_current_architecture: Arch not found"));
}
/* Take several guesses at a byte order. */
@@ -623,7 +629,8 @@ initialize_current_architecture (void)
if (! gdbarch_update_p (info))
internal_error (__FILE__, __LINE__,
- "initialize_current_architecture: Selection of initial architecture failed");
+ _("initialize_current_architecture: Selection of \
+initial architecture failed"));
/* Create the ``set architecture'' command appending ``auto'' to the
list of architectures. */
@@ -640,14 +647,14 @@ initialize_current_architecture (void)
safe. */
c = add_set_enum_cmd ("architecture", class_support,
arches, &set_architecture_string,
- "Set architecture of target.",
+ _("Set architecture of target."),
&setlist);
set_cmd_sfunc (c, set_architecture);
add_alias_cmd ("processor", "architecture", class_support, 1, &setlist);
/* Don't use set_from_show - need to print both auto/manual and
current setting. */
add_cmd ("architecture", class_support, show_architecture,
- "Show the current target architecture", &showlist);
+ _("Show the current target architecture"), &showlist);
}
}
@@ -724,11 +731,11 @@ _initialize_gdbarch_utils (void)
struct cmd_list_element *c;
c = add_set_enum_cmd ("endian", class_support,
endian_enum, &set_endian_string,
- "Set endianness of target.",
+ _("Set endianness of target."),
&setlist);
set_cmd_sfunc (c, set_endian);
/* Don't use set_from_show - need to print both auto/manual and
current setting. */
add_cmd ("endian", class_support, show_endian,
- "Show the current byte-order", &showlist);
+ _("Show the current byte-order"), &showlist);
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-linux-nat.c gdb/gdb/arm-linux-nat.c
--- gdb.orig/gdb/arm-linux-nat.c 2004-07-24 03:00:19.000000000 +0200
+++ gdb/gdb/arm-linux-nat.c 2004-12-04 17:39:20.000000000 +0100
@@ -236,7 +236,7 @@ fetch_fpregister (int regno)
ret = ptrace (PT_GETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to fetch floating point register.");
+ warning (_("Unable to fetch floating point register."));
return;
}
@@ -285,7 +285,7 @@ fetch_fpregs (void)
ret = ptrace (PT_GETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to fetch the floating point registers.");
+ warning (_("Unable to fetch the floating point registers."));
return;
}
@@ -333,7 +333,7 @@ store_fpregister (int regno)
ret = ptrace (PT_GETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to fetch the floating point registers.");
+ warning (_("Unable to fetch the floating point registers."));
return;
}
@@ -350,7 +350,7 @@ store_fpregister (int regno)
ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to store floating point register.");
+ warning (_("Unable to store floating point register."));
return;
}
}
@@ -371,7 +371,7 @@ store_fpregs (void)
ret = ptrace (PT_GETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to fetch the floating point registers.");
+ warning (_("Unable to fetch the floating point registers."));
return;
}
@@ -388,7 +388,7 @@ store_fpregs (void)
ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp);
if (ret < 0)
{
- warning ("Unable to store floating point registers.");
+ warning (_("Unable to store floating point registers."));
return;
}
}
@@ -408,7 +408,7 @@ fetch_register (int regno)
ret = ptrace (PTRACE_GETREGS, tid, 0, ®s);
if (ret < 0)
{
- warning ("Unable to fetch general register.");
+ warning (_("Unable to fetch general register."));
return;
}
@@ -448,7 +448,7 @@ fetch_regs (void)
ret = ptrace (PTRACE_GETREGS, tid, 0, ®s);
if (ret < 0)
{
- warning ("Unable to fetch general registers.");
+ warning (_("Unable to fetch general registers."));
return;
}
@@ -486,7 +486,7 @@ store_register (int regno)
ret = ptrace (PTRACE_GETREGS, tid, 0, ®s);
if (ret < 0)
{
- warning ("Unable to fetch general registers.");
+ warning (_("Unable to fetch general registers."));
return;
}
@@ -496,7 +496,7 @@ store_register (int regno)
ret = ptrace (PTRACE_SETREGS, tid, 0, ®s);
if (ret < 0)
{
- warning ("Unable to store general register.");
+ warning (_("Unable to store general register."));
return;
}
}
@@ -514,7 +514,7 @@ store_regs (void)
ret = ptrace (PTRACE_GETREGS, tid, 0, ®s);
if (ret < 0)
{
- warning ("Unable to fetch general registers.");
+ warning (_("Unable to fetch general registers."));
return;
}
@@ -528,7 +528,7 @@ store_regs (void)
if (ret < 0)
{
- warning ("Unable to store general registers.");
+ warning (_("Unable to store general registers."));
return;
}
}
@@ -691,7 +691,7 @@ get_linux_version (unsigned int *vmajor,
if (-1 == uname (&info))
{
- warning ("Unable to determine GNU/Linux version.");
+ warning (_("Unable to determine GNU/Linux version."));
return -1;
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-tdep.c gdb/gdb/arm-tdep.c
--- gdb.orig/gdb/arm-tdep.c 2004-11-12 22:45:05.000000000 +0100
+++ gdb/gdb/arm-tdep.c 2004-12-04 18:01:07.000000000 +0100
@@ -1322,12 +1322,13 @@ arm_print_float_info (struct gdbarch *gd
int type;
type = (status >> 24) & 127;
- printf ("%s FPU type %d\n",
- (status & (1 << 31)) ? "Hardware" : "Software",
- type);
- fputs ("mask: ", stdout);
+ if (status & (1 << 31))
+ printf (_("Hardware FPU type %d\n"), type);
+ else
+ printf (_("Software FPU type %d\n"), type);
+ fputs (_("mask: "), stdout);
print_fpu_flags (status >> 16);
- fputs ("flags: ", stdout);
+ fputs (_("flags: "), stdout);
print_fpu_flags (status);
}
@@ -1384,7 +1385,7 @@ arm_register_sim_regno (int regnum)
return SIM_ARM_FPS_REGNUM + reg;
reg -= NUM_SREGS;
- internal_error (__FILE__, __LINE__, "Bad REGNUM %d", regnum);
+ internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum);
}
/* NOTE: cagney/2001-08-20: Both convert_from_extended() and
@@ -1549,7 +1550,7 @@ thumb_get_next_pc (CORE_ADDR pc)
nextpc = (CORE_ADDR) read_memory_integer (sp + offset, 4);
nextpc = ADDR_BITS_REMOVE (nextpc);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
}
else if ((inst1 & 0xf000) == 0xd000) /* conditional branch */
{
@@ -1580,7 +1581,7 @@ thumb_get_next_pc (CORE_ADDR pc)
nextpc = ADDR_BITS_REMOVE (nextpc);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
}
return nextpc;
@@ -1620,7 +1621,7 @@ arm_get_next_pc (CORE_ADDR pc)
if (bits (this_instr, 22, 25) == 0
&& bits (this_instr, 4, 7) == 9) /* multiply */
- error ("Illegal update to pc in instruction");
+ error (_("Illegal update to pc in instruction"));
/* BX <reg>, BLX <reg> */
if (bits (this_instr, 4, 28) == 0x12fff1
@@ -1631,7 +1632,7 @@ arm_get_next_pc (CORE_ADDR pc)
nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
return nextpc;
}
@@ -1712,7 +1713,7 @@ arm_get_next_pc (CORE_ADDR pc)
nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
break;
}
@@ -1730,7 +1731,7 @@ arm_get_next_pc (CORE_ADDR pc)
unsigned long base;
if (bit (this_instr, 22))
- error ("Illegal update to pc in instruction");
+ error (_("Illegal update to pc in instruction"));
/* byte write to PC */
rn = bits (this_instr, 16, 19);
@@ -1755,7 +1756,7 @@ arm_get_next_pc (CORE_ADDR pc)
nextpc = ADDR_BITS_REMOVE (nextpc);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
}
}
break;
@@ -1791,7 +1792,7 @@ arm_get_next_pc (CORE_ADDR pc)
}
nextpc = ADDR_BITS_REMOVE (nextpc);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
}
}
break;
@@ -1807,7 +1808,7 @@ arm_get_next_pc (CORE_ADDR pc)
nextpc = ADDR_BITS_REMOVE (nextpc);
if (nextpc == pc)
- error ("Infinite loop detected");
+ error (_("Infinite loop detected"));
break;
}
@@ -1818,7 +1819,7 @@ arm_get_next_pc (CORE_ADDR pc)
break;
default:
- fprintf_filtered (gdb_stderr, "Bad bit-field extraction\n");
+ fprintf_filtered (gdb_stderr, _("Bad bit-field extraction\n"));
return (pc);
}
}
@@ -2012,7 +2013,7 @@ arm_extract_return_value (struct type *t
default:
internal_error
(__FILE__, __LINE__,
- "arm_extract_return_value: Floating point model not supported");
+ _("arm_extract_return_value: Floating point model not supported"));
break;
}
}
@@ -2202,7 +2203,7 @@ arm_store_return_value (struct type *typ
default:
internal_error
(__FILE__, __LINE__,
- "arm_store_return_value: Floating point model not supported");
+ _("arm_store_return_value: Floating point model not supported"));
break;
}
}
@@ -2329,7 +2330,8 @@ arm_skip_stub (CORE_ADDR pc)
static void
set_arm_command (char *args, int from_tty)
{
- printf_unfiltered ("\"set arm\" must be followed by an apporpriate subcommand.\n");
+ printf_unfiltered (_("\"set arm\" must be followed by an apporpriate \
+subcommand.\n"));
help_list (setarmcmdlist, "set arm ", all_commands, gdb_stdout);
}
@@ -2383,7 +2385,7 @@ set_fp_model_sfunc (char *args, int from
}
if (fp_model == ARM_FLOAT_LAST)
- internal_error (__FILE__, __LINE__, "Invalid fp model accepted: %s.",
+ internal_error (__FILE__, __LINE__, _("Invalid fp model accepted: %s."),
current_fp_model);
if (gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm)
@@ -2398,7 +2400,7 @@ show_fp_model (char *args, int from_tty,
if (arm_fp_model == ARM_FLOAT_AUTO
&& gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm)
- printf_filtered (" - the default for the current ABI is \"%s\".\n",
+ printf_filtered (_(" - the default for the current ABI is \"%s\".\n"),
fp_model_strings[tdep->fp_model]);
}
@@ -2561,8 +2563,8 @@ arm_elf_osabi_sniffer (bfd *abfd)
default:
internal_error (__FILE__, __LINE__,
- "arm_elf_osabi_sniffer: Unknown ARM EABI "
- "version 0x%x", eflags);
+ _("arm_elf_osabi_sniffer: Unknown ARM EABI \
+version 0x%x"), eflags);
}
}
break;
@@ -2667,7 +2669,7 @@ arm_gdbarch_init (struct gdbarch_info in
default:
internal_error (__FILE__, __LINE__,
- "arm_gdbarch_init: bad byte order for float format");
+ _("arm_gdbarch_init: bad byte order for float format"));
}
/* On ARM targets char defaults to unsigned. */
@@ -2768,7 +2770,7 @@ arm_gdbarch_init (struct gdbarch_info in
default:
internal_error (__FILE__, __LINE__,
- "arm_gdbarch_init: bad byte order for float format");
+ _("arm_gdbarch_init: bad byte order for float format"));
}
return gdbarch;
@@ -2782,7 +2784,7 @@ arm_dump_tdep (struct gdbarch *current_g
if (tdep == NULL)
return;
- fprintf_unfiltered (file, "arm_dump_tdep: Lowest pc = 0x%lx",
+ fprintf_unfiltered (file, _("arm_dump_tdep: Lowest pc = 0x%lx"),
(unsigned long) tdep->lowest_pc);
}
@@ -2841,11 +2843,11 @@ _initialize_arm_tdep (void)
/* Add root prefix command for all "set arm"/"show arm" commands. */
add_prefix_cmd ("arm", no_class, set_arm_command,
- "Various ARM-specific commands.",
+ _("Various ARM-specific commands."),
&setarmcmdlist, "set arm ", 0, &setlist);
add_prefix_cmd ("arm", no_class, show_arm_command,
- "Various ARM-specific commands.",
+ _("Various ARM-specific commands."),
&showarmcmdlist, "show arm ", 0, &showlist);
/* Sync the opcode insn printer with our register viewer. */
@@ -2853,8 +2855,8 @@ _initialize_arm_tdep (void)
/* Begin creating the help text. */
stb = mem_fileopen ();
- fprintf_unfiltered (stb, "Set the disassembly style.\n"
- "The valid values are:\n");
+ fprintf_unfiltered (stb, _("Set the disassembly style.\n\
+The valid values are:\n"));
/* Initialize the array that will be passed to add_set_enum_cmd(). */
valid_disassembly_styles
@@ -2879,7 +2881,7 @@ _initialize_arm_tdep (void)
valid_disassembly_styles[num_disassembly_options] = NULL;
/* Finish the creation of the help text. */
- fprintf_unfiltered (stb, "The default is \"std\".");
+ fprintf_unfiltered (stb, _("The default is \"std\"."));
helptext = ui_file_xstrdup (stb, &length);
ui_file_delete (stb);
@@ -2902,24 +2904,24 @@ _initialize_arm_tdep (void)
set_cmd_sfunc (new_set, set_disassembly_style_sfunc);
deprecated_add_show_from_set (new_set, &showarmcmdlist);
- add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\
-Set usage of ARM 32-bit mode.", "\
-Show usage of ARM 32-bit mode.", "\
-When off, a 26-bit PC will be used.\n\
-When off, a 26-bit PC will be used.", "\
-Usage of ARM 32-bit mode is %s.",
+ add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32,
+ _("Set usage of ARM 32-bit mode."),
+ _("Show usage of ARM 32-bit mode."),
+ _("When off, a 26-bit PC will be used.\n\
+When off, a 26-bit PC will be used."),
+ _("Usage of ARM 32-bit mode is %s."),
NULL, NULL,
&setarmcmdlist, &showarmcmdlist);
/* Add a command to allow the user to force the FPU model. */
new_set = add_set_enum_cmd
("fpu", no_class, fp_model_strings, ¤t_fp_model,
- "Set the floating point type.\n"
- "auto - Determine the FP typefrom the OS-ABI.\n"
- "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n"
- "fpa - FPA co-processor (GCC compiled).\n"
- "softvfp - Software FP with pure-endian doubles.\n"
- "vfp - VFP co-processor.",
+ _("Set the floating point type.\n\
+auto - Determine the FP typefrom the OS-ABI.\n\
+softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n\
+fpa - FPA co-processor (GCC compiled).\n\
+softvfp - Software FP with pure-endian doubles.\n\
+vfp - VFP co-processor."),
&setarmcmdlist);
set_cmd_sfunc (new_set, set_fp_model_sfunc);
set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist),
@@ -2927,15 +2929,15 @@ Usage of ARM 32-bit mode is %s.",
/* Add the deprecated "othernames" command. */
deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames,
- "Switch to the next set of register names."),
+ _("Switch to the next set of register names.")),
"set arm disassembly");
/* Debugging flag. */
- add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\
-Set ARM debugging.", "\
-Show ARM debugging.", "\
-When on, arm-specific debugging is enabled.", "\
-ARM debugging is %s.",
+ add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug,
+ _("Set ARM debugging."),
+ _("Show ARM debugging."),
+ _("When on, arm-specific debugging is enabled."),
+ _("ARM debugging is %s."),
NULL, NULL,
&setdebuglist, &showdebuglist);
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-nat.c gdb/gdb/armnbsd-nat.c
--- gdb.orig/gdb/armnbsd-nat.c 2004-08-15 01:37:04.000000000 +0200
+++ gdb/gdb/armnbsd-nat.c 2004-12-04 18:03:13.000000000 +0100
@@ -88,7 +88,7 @@ fetch_register (int regno)
if (ret < 0)
{
- warning ("unable to fetch general register");
+ warning (_("unable to fetch general register"));
return;
}
@@ -139,7 +139,7 @@ fetch_regs (void)
if (ret < 0)
{
- warning ("unable to fetch general registers");
+ warning (_("unable to fetch general registers"));
return;
}
@@ -157,7 +157,7 @@ fetch_fp_register (int regno)
if (ret < 0)
{
- warning ("unable to fetch floating-point register");
+ warning (_("unable to fetch floating-point register"));
return;
}
@@ -187,7 +187,7 @@ fetch_fp_regs (void)
if (ret < 0)
{
- warning ("unable to fetch general registers");
+ warning (_("unable to fetch general registers"));
return;
}
@@ -223,7 +223,7 @@ store_register (int regno)
if (ret < 0)
{
- warning ("unable to fetch general registers");
+ warning (_("unable to fetch general registers"));
return;
}
@@ -284,7 +284,7 @@ store_register (int regno)
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
if (ret < 0)
- warning ("unable to write register %d to inferior", regno);
+ warning (_("unable to write register %d to inferior"), regno);
}
static void
@@ -331,7 +331,7 @@ store_regs (void)
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
if (ret < 0)
- warning ("unable to store general registers");
+ warning (_("unable to store general registers"));
}
static void
@@ -345,7 +345,7 @@ store_fp_register (int regno)
if (ret < 0)
{
- warning ("unable to fetch floating-point registers");
+ warning (_("unable to fetch floating-point registers"));
return;
}
@@ -366,7 +366,7 @@ store_fp_register (int regno)
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
if (ret < 0)
- warning ("unable to write register %d to inferior", regno);
+ warning (_("unable to write register %d to inferior"), regno);
}
static void
@@ -388,7 +388,7 @@ store_fp_regs (void)
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
if (ret < 0)
- warning ("unable to store floating-point registers");
+ warning (_("unable to store floating-point registers"));
}
void
@@ -437,7 +437,7 @@ fetch_elfcore_registers (char *core_reg_
{
case 0: /* Integer registers. */
if (core_reg_size != sizeof (struct reg))
- warning ("wrong size of register set in core file");
+ warning (_("wrong size of register set in core file"));
else
{
/* The memcpy may be unnecessary, but we can't really be sure
@@ -449,7 +449,7 @@ fetch_elfcore_registers (char *core_reg_
case 2:
if (core_reg_size != sizeof (struct fpreg))
- warning ("wrong size of FPA register set in core file");
+ warning (_("wrong size of FPA register set in core file"));
else
{
/* The memcpy may be unnecessary, but we can't really be sure
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-tdep.c gdb/gdb/armnbsd-tdep.c
--- gdb.orig/gdb/armnbsd-tdep.c 2004-10-31 21:36:34.000000000 +0100
+++ gdb/gdb/armnbsd-tdep.c 2004-12-04 18:03:39.000000000 +0100
@@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbar
default:
internal_error (__FILE__, __LINE__,
- "arm_gdbarch_init: bad byte order for float format");
+ _("arm_gdbarch_init: bad byte order for float format"));
}
tdep->jb_pc = ARM_NBSD_JB_PC;
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/auxv.c gdb/gdb/auxv.c
--- gdb.orig/gdb/auxv.c 2004-02-24 02:00:30.000000000 +0100
+++ gdb/gdb/auxv.c 2004-12-04 18:06:47.000000000 +0100
@@ -202,50 +202,50 @@ fprint_target_auxv (struct ui_file *file
{
#define TAG(tag, text, kind) \
case tag: name = #tag; description = text; flavor = kind; break
- TAG (AT_NULL, "End of vector", hex);
- TAG (AT_IGNORE, "Entry should be ignored", hex);
- TAG (AT_EXECFD, "File descriptor of program", dec);
- TAG (AT_PHDR, "Program headers for program", hex);
- TAG (AT_PHENT, "Size of program header entry", dec);
- TAG (AT_PHNUM, "Number of program headers", dec);
- TAG (AT_PAGESZ, "System page size", dec);
- TAG (AT_BASE, "Base address of interpreter", hex);
- TAG (AT_FLAGS, "Flags", hex);
- TAG (AT_ENTRY, "Entry point of program", hex);
- TAG (AT_NOTELF, "Program is not ELF", dec);
- TAG (AT_UID, "Real user ID", dec);
- TAG (AT_EUID, "Effective user ID", dec);
- TAG (AT_GID, "Real group ID", dec);
- TAG (AT_EGID, "Effective group ID", dec);
- TAG (AT_CLKTCK, "Frequency of times()", dec);
- TAG (AT_PLATFORM, "String identifying platform", str);
- TAG (AT_HWCAP, "Machine-dependent CPU capability hints", hex);
- TAG (AT_FPUCW, "Used FPU control word", dec);
- TAG (AT_DCACHEBSIZE, "Data cache block size", dec);
- TAG (AT_ICACHEBSIZE, "Instruction cache block size", dec);
- TAG (AT_UCACHEBSIZE, "Unified cache block size", dec);
- TAG (AT_IGNOREPPC, "Entry should be ignored", dec);
- TAG (AT_SYSINFO, "Special system info/entry points", hex);
- TAG (AT_SYSINFO_EHDR, "System-supplied DSO's ELF header", hex);
- TAG (AT_SECURE, "Boolean, was exec setuid-like?", dec);
- TAG (AT_SUN_UID, "Effective user ID", dec);
- TAG (AT_SUN_RUID, "Real user ID", dec);
- TAG (AT_SUN_GID, "Effective group ID", dec);
- TAG (AT_SUN_RGID, "Real group ID", dec);
- TAG (AT_SUN_LDELF, "Dynamic linker's ELF header", hex);
- TAG (AT_SUN_LDSHDR, "Dynamic linker's section headers", hex);
- TAG (AT_SUN_LDNAME, "String giving name of dynamic linker", str);
- TAG (AT_SUN_LPAGESZ, "Large pagesize", dec);
- TAG (AT_SUN_PLATFORM, "Platform name string", str);
- TAG (AT_SUN_HWCAP, "Machine-dependent CPU capability hints", hex);
- TAG (AT_SUN_IFLUSH, "Should flush icache?", dec);
- TAG (AT_SUN_CPU, "CPU name string", str);
- TAG (AT_SUN_EMUL_ENTRY, "COFF entry point address", hex);
- TAG (AT_SUN_EMUL_EXECFD, "COFF executable file descriptor", dec);
+ TAG (AT_NULL, _("End of vector"), hex);
+ TAG (AT_IGNORE, _("Entry should be ignored"), hex);
+ TAG (AT_EXECFD, _("File descriptor of program"), dec);
+ TAG (AT_PHDR, _("Program headers for program"), hex);
+ TAG (AT_PHENT, _("Size of program header entry"), dec);
+ TAG (AT_PHNUM, _("Number of program headers"), dec);
+ TAG (AT_PAGESZ, _("System page size"), dec);
+ TAG (AT_BASE, _("Base address of interpreter"), hex);
+ TAG (AT_FLAGS, _("Flags"), hex);
+ TAG (AT_ENTRY, _("Entry point of program"), hex);
+ TAG (AT_NOTELF, _("Program is not ELF"), dec);
+ TAG (AT_UID, _("Real user ID"), dec);
+ TAG (AT_EUID, _("Effective user ID"), dec);
+ TAG (AT_GID, _("Real group ID"), dec);
+ TAG (AT_EGID, _("Effective group ID"), dec);
+ TAG (AT_CLKTCK, _("Frequency of times()"), dec);
+ TAG (AT_PLATFORM, _("String identifying platform"), str);
+ TAG (AT_HWCAP, _("Machine-dependent CPU capability hints"), hex);
+ TAG (AT_FPUCW, _("Used FPU control word"), dec);
+ TAG (AT_DCACHEBSIZE, _("Data cache block size"), dec);
+ TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec);
+ TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec);
+ TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec);
+ TAG (AT_SYSINFO, _("Special system info/entry points"), hex);
+ TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex);
+ TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec);
+ TAG (AT_SUN_UID, _("Effective user ID"), dec);
+ TAG (AT_SUN_RUID, _("Real user ID"), dec);
+ TAG (AT_SUN_GID, _("Effective group ID"), dec);
+ TAG (AT_SUN_RGID, _("Real group ID"), dec);
+ TAG (AT_SUN_LDELF, _("Dynamic linker's ELF header"), hex);
+ TAG (AT_SUN_LDSHDR, _("Dynamic linker's section headers"), hex);
+ TAG (AT_SUN_LDNAME, _("String giving name of dynamic linker"), str);
+ TAG (AT_SUN_LPAGESZ, _("Large pagesize"), dec);
+ TAG (AT_SUN_PLATFORM, _("Platform name string"), str);
+ TAG (AT_SUN_HWCAP, _("Machine-dependent CPU capability hints"), hex);
+ TAG (AT_SUN_IFLUSH, _("Should flush icache?"), dec);
+ TAG (AT_SUN_CPU, _("CPU name string"), str);
+ TAG (AT_SUN_EMUL_ENTRY, _("COFF entry point address"), hex);
+ TAG (AT_SUN_EMUL_EXECFD, _("COFF executable file descriptor"), dec);
TAG (AT_SUN_EXECNAME,
- "Canonicalized file name given to execve", str);
- TAG (AT_SUN_MMU, "String for name of MMU module", str);
- TAG (AT_SUN_LDDATA, "Dynamic linker's data segment address", hex);
+ _("Canonicalized file name given to execve"), str);
+ TAG (AT_SUN_MMU, _("String for name of MMU module"), str);
+ TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex);
}
fprintf_filtered (file, "%-4s %-20s %-30s ",
@@ -277,14 +277,14 @@ static void
info_auxv_command (char *cmd, int from_tty)
{
if (! target_has_stack)
- error ("The program has no auxiliary information now.");
+ error (_("The program has no auxiliary information now."));
else
{
int ents = fprint_target_auxv (gdb_stdout, ¤t_target);
if (ents < 0)
- error ("No auxiliary vector found, or failed reading it.");
+ error (_("No auxiliary vector found, or failed reading it."));
else if (ents == 0)
- error ("Auxiliary vector is empty.");
+ error (_("Auxiliary vector is empty."));
}
}
@@ -295,6 +295,6 @@ void
_initialize_auxv (void)
{
add_info ("auxv", info_auxv_command,
- "Display the inferior's auxiliary vector.\n\
-This is information provided by the operating system at program startup.");
+ _("Display the inferior's auxiliary vector.\n\
+This is information provided by the operating system at program startup."));
}
diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/avr-tdep.c gdb/gdb/avr-tdep.c
--- gdb.orig/gdb/avr-tdep.c 2004-11-13 03:15:31.000000000 +0100
+++ gdb/gdb/avr-tdep.c 2004-12-04 18:08:19.000000000 +0100
@@ -588,7 +588,7 @@ avr_scan_prologue (CORE_ADDR pc, struct
if (num_pushes > AVR_MAX_PUSHES)
{
- fprintf_unfiltered (gdb_stderr, "Num pushes too large: %d\n",
+ fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"),
num_pushes);
num_pushes = 0;
}
@@ -667,7 +667,7 @@ avr_scan_prologue (CORE_ADDR pc, struct
if (vpc >= AVR_MAX_PROLOGUE_SIZE)
fprintf_unfiltered (gdb_stderr,
- "Hit end of prologue while scanning pushes\n");
+ _("Hit end of prologue while scanning pushes\n"));
/* Second stage of the prologue scanning.
Scan:
@@ -1337,8 +1337,8 @@ avr_io_reg_read_command (char *args, int
if (bufsiz < 0)
{
fprintf_unfiltered (gdb_stderr,
- "ERR: info io_registers NOT supported by current "
- "target\n");
+ _("ERR: info io_registers NOT supported by current \
+target\n"));
return;
}
if (bufsiz > sizeof (buf))
@@ -1352,20 +1352,20 @@ avr_io_reg_read_command (char *args, int
if (strncmp (buf, "", bufsiz) == 0)
{
fprintf_unfiltered (gdb_stderr,
- "info io_registers NOT supported by target\n");
+ _("info io_registers NOT supported by target\n"));
return;
}
if (sscanf (buf, "%x", &nreg) != 1)
{
fprintf_unfiltered (gdb_stderr,
- "Error fetching number of io registers\n");
+ _("Error fetching number of io registers\n"));
return;
}
reinitialize_more_filter ();
- printf_unfiltered ("Target has %u io registers:\n\n", nreg);
+ printf_unfiltered (_("Target has %u io registers:\n\n"), nreg);
/* only fetch up to 8 registers at a time to keep the buffer small */
step = 8;
@@ -1412,5 +1412,5 @@ _initialize_avr_tdep (void)
io_registers' to signify it is not available on other platforms. */
add_cmd ("io_registers", class_info, avr_io_reg_read_command,
- "query remote avr target for io space register values", &infolist);
+ _("query remote avr target for io space register values"), &infolist);
}
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: i18n, part 2 2004-12-04 20:06 i18n, part 2 Baurjan Ismagulov @ 2004-12-04 21:52 ` Daniel Jacobowitz 2004-12-04 22:17 ` Baurjan Ismagulov 2004-12-06 18:53 ` Kevin Buettner ` (2 subsequent siblings) 3 siblings, 1 reply; 29+ messages in thread From: Daniel Jacobowitz @ 2004-12-04 21:52 UTC (permalink / raw) To: gdb-patches On Sat, Dec 04, 2004 at 08:57:02PM +0100, Baurjan Ismagulov wrote: > * arm-tdep.c:_initialize_arm_tdep() > > The text "\ > When off, a 26-bit PC will be used.\n\ > When off, a 26-bit PC will be used." looked strange to me, is it > indended to be so? When the help_doc argument was added to this function, a lot of uses were converted in batch. It looks like this one was just a typo. Old GDB would print: (gdb) help show arm apcs32 Show usage of ARM 32-bit mode. When off, a 26-bit PC will be used. New GDB prints: (gdb) help show arm apcs32 Show usage of ARM 32-bit mode. When off, a 26-bit PC will be used. When off, a 26-bit PC will be used. [In the old interface, the whole thing was one translatable message. Now it is two, on separate lines.] > internal_error (__FILE__, __LINE__, > - "arm_elf_osabi_sniffer: Unknown ARM EABI " > - "version 0x%x", eflags); > + _("arm_elf_osabi_sniffer: Unknown ARM EABI \ > +version 0x%x"), eflags); GDB is already inconsistent about this, but does the "" "" style of string concatenation cause any problem for gettext? Otherwise, I mildly prefer it - it prevents diff -p from getting confused about the function name. -- Daniel Jacobowitz ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 21:52 ` Daniel Jacobowitz @ 2004-12-04 22:17 ` Baurjan Ismagulov 2004-12-04 23:59 ` Daniel Jacobowitz 2004-12-05 21:41 ` Eli Zaretskii 0 siblings, 2 replies; 29+ messages in thread From: Baurjan Ismagulov @ 2004-12-04 22:17 UTC (permalink / raw) To: gdb-patches [-- Attachment #1: Type: text/plain, Size: 1588 bytes --] Hello Daniel, On Sat, Dec 04, 2004 at 03:06:05PM -0500, Daniel Jacobowitz wrote: > > The text "\ > > When off, a 26-bit PC will be used.\n\ > > When off, a 26-bit PC will be used." looked strange to me, is it > > indended to be so? > > When the help_doc argument was added to this function, a lot of uses > were converted in batch. It looks like this one was just a typo. Ok, I removed the second line. > > - "arm_elf_osabi_sniffer: Unknown ARM EABI " > > - "version 0x%x", eflags); > > + _("arm_elf_osabi_sniffer: Unknown ARM EABI \ > > +version 0x%x"), eflags); > > GDB is already inconsistent about this, but does the "" "" style of > string concatenation cause any problem for gettext? Hmm, it did the last time I tried it, but 0.14.1-6 seems to work as expected. I modified the patch. > Otherwise, I mildly prefer it - it prevents diff -p from getting > confused about the function name. I also prefer the "" "" concatenation just for aesthetic reasons. But I couldn't reproduce the behaviour you describe; could you give an example? I tend to consider this a bug. BTW, is there an argument reformatting function in emacs, so that, say, M-q would wrap the arguments and strings up to fill-column? With kind regards, Baurjan. 2004-12-04 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> * ada-valprint.c, aix-thread.c, alpha-nat.c, alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c, amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c, arch-utils.c, arm-linux-nat.c, arm-tdep.c, armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: i18n markup. [-- Attachment #2: gdb-ibr-i18n-02-20041204-2214.diff --] [-- Type: text/plain, Size: 49682 bytes --] diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/ada-valprint.c gdb/gdb/ada-valprint.c --- gdb.orig/gdb/ada-valprint.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/ada-valprint.c 2004-12-04 16:47:06.000000000 +0100 @@ -206,7 +206,7 @@ val_print_packed_array_elements (struct val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format, 0, recurse + 1, pretty); annotate_elt_rep (i - i0); - fprintf_filtered (stream, " <repeats %u times>", i - i0); + fprintf_filtered (stream, _(" <repeats %u times>"), i - i0); annotate_elt_rep_end (); } @@ -421,11 +421,11 @@ ada_print_scalar (struct type *type, LON case TYPE_CODE_MEMBER: case TYPE_CODE_METHOD: case TYPE_CODE_REF: - warning ("internal error: unhandled type in ada_print_scalar"); + warning (_("internal error: unhandled type in ada_print_scalar")); break; default: - error ("Invalid type code in symbol table."); + error (_("Invalid type code in symbol table.")); } gdb_flush (stream); } @@ -492,7 +492,7 @@ printstr (struct ui_file *stream, char * ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len); fputs_filtered ("'", stream); - fprintf_filtered (stream, " <repeats %u times>", reps); + fprintf_filtered (stream, _(" <repeats %u times>"), reps); i = rep1 - 1; things_printed += repeat_count_threshold; need_comma = 1; @@ -1068,7 +1068,7 @@ print_field_values (struct type *type, c if (TYPE_CPLUS_SPECIFIC (type) != NULL && TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("<optimized out or zero length>", stream); + fputs_filtered (_("<optimized out or zero length>"), stream); } else { diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/aix-thread.c gdb/gdb/aix-thread.c --- gdb.orig/gdb/aix-thread.c 2004-10-08 22:29:45.000000000 +0200 +++ gdb/gdb/aix-thread.c 2004-12-04 22:03:48.000000000 +0100 @@ -240,7 +240,7 @@ ptrace_check (int req, int id, int ret) } break; } - error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)", + error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"), req, id, ret, errno, safe_strerror (errno)); return 0; /* Not reached. */ } @@ -970,12 +970,12 @@ aix_thread_resume (ptid_t ptid, int step { thread = find_thread_pid (ptid); if (!thread) - error ("aix-thread resume: unknown pthread %ld", + error (_("aix-thread resume: unknown pthread %ld"), TIDGET (ptid)); tid[0] = thread->private->tid; if (tid[0] == PTHDB_INVALID_TID) - error ("aix-thread resume: no tid for pthread %ld", + error (_("aix-thread resume: no tid for pthread %ld"), TIDGET (ptid)); tid[1] = 0; @@ -1131,7 +1131,7 @@ fetch_regs_user_thread (pthdb_pthread_t "fetch_regs_user_thread %lx\n", (long) pdtid); status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: fetch_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* General-purpose registers. */ @@ -1412,7 +1412,7 @@ store_regs_user_thread (pthdb_pthread_t values. */ status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* Collect general-purpose register values from the regcache. */ @@ -1473,7 +1473,7 @@ store_regs_user_thread (pthdb_pthread_t status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_setcontext returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_setcontext returned %s"), pd_status2str (status)); } @@ -1660,7 +1660,7 @@ aix_thread_pid_to_str (ptid_t ptid) xstrprintf(). */ xfree (ret); - ret = xstrprintf ("Thread %ld", ptid_get_tid (ptid)); + ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid)); return ret; } @@ -1700,16 +1700,16 @@ aix_thread_extra_thread_info (struct thr status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) - fprintf_unfiltered (buf, ", suspended"); + fprintf_unfiltered (buf, _(", suspended")); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) - fprintf_unfiltered (buf, ", detached"); + fprintf_unfiltered (buf, _(", detached")); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) - fprintf_unfiltered (buf, ", cancel pending"); + fprintf_unfiltered (buf, _(", cancel pending")); ui_file_write (buf, "", 1); @@ -1727,8 +1727,8 @@ static void init_aix_thread_ops (void) { aix_thread_ops.to_shortname = "aix-threads"; - aix_thread_ops.to_longname = "AIX pthread support"; - aix_thread_ops.to_doc = "AIX pthread support"; + aix_thread_ops.to_longname = _("AIX pthread support"); + aix_thread_ops.to_doc = _("AIX pthread support"); aix_thread_ops.to_attach = aix_thread_attach; aix_thread_ops.to_detach = aix_thread_detach; @@ -1764,8 +1764,8 @@ _initialize_aix_thread (void) deprecated_add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger, (char *) &debug_aix_thread, - "Set debugging of AIX thread module.\n" - "Enables printf debugging output.\n", + _("Set debugging of AIX thread module.\n" + "Enables printf debugging output.\n"), &setdebuglist), &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-nat.c gdb/gdb/alpha-nat.c --- gdb.orig/gdb/alpha-nat.c 2004-12-01 22:19:21.000000000 +0100 +++ gdb/gdb/alpha-nat.c 2004-12-04 17:00:29.000000000 +0100 @@ -121,7 +121,7 @@ fetch_osf_core_registers (char *core_reg } if (bad_reg >= 0) { - error ("Register %s not found in core file.", REGISTER_NAME (bad_reg)); + error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg)); } } @@ -131,7 +131,7 @@ fetch_elf_core_registers (char *core_reg { if (core_reg_size < 32 * 8) { - error ("Core file register section too small (%u bytes).", core_reg_size); + error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphabsd-nat.c gdb/gdb/alphabsd-nat.c --- gdb.orig/gdb/alphabsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/alphabsd-nat.c 2004-12-04 17:17:57.000000000 +0100 @@ -92,7 +92,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_supply_reg ((char *) &gregs, regno); if (regno != -1) @@ -105,7 +105,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_supply_fpreg ((char *) &fpregs, regno); } @@ -122,13 +122,13 @@ store_inferior_registers (int regno) struct reg gregs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_fill_reg ((char *) &gregs, regno); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regno != -1) return; @@ -140,12 +140,12 @@ store_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_fill_fpreg ((char *) &fpregs, regno); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphanbsd-tdep.c gdb/gdb/alphanbsd-tdep.c --- gdb.orig/gdb/alphanbsd-tdep.c 2004-09-28 22:02:20.000000000 +0200 +++ gdb/gdb/alphanbsd-tdep.c 2004-12-04 17:18:59.000000000 +0100 @@ -64,7 +64,7 @@ fetch_core_registers (char *core_reg_sec if (core_reg_size < (SIZEOF_TRAPFRAME + SIZEOF_STRUCT_FPREG)) { - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); return; } @@ -86,14 +86,14 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != SIZEOF_STRUCT_REG) - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); else alphabsd_supply_reg (core_reg_sect, -1); break; case 2: /* Floating point registers. */ if (core_reg_size != SIZEOF_STRUCT_FPREG) - warning ("Wrong size FP register set in core file."); + warning (_("Wrong size FP register set in core file.")); else alphabsd_supply_fpreg (core_reg_sect, -1); break; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-linux-nat.c gdb/gdb/amd64-linux-nat.c --- gdb.orig/gdb/amd64-linux-nat.c 2004-04-09 23:16:05.000000000 +0200 +++ gdb/gdb/amd64-linux-nat.c 2004-12-04 17:19:59.000000000 +0100 @@ -162,7 +162,7 @@ fetch_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -174,7 +174,7 @@ fetch_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -199,12 +199,12 @@ store_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PTRACE_SETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -215,12 +215,12 @@ store_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PTRACE_SETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); return; } @@ -248,7 +248,7 @@ amd64_linux_dr_get (int regnum) offsetof (struct user, u_debugreg[regnum]), 0); if (errno != 0) #if 0 - perror_with_name ("Couldn't read debug register"); + perror_with_name (_("Couldn't read debug register")); #else return 0; #endif @@ -269,7 +269,7 @@ amd64_linux_dr_set (int regnum, unsigned errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); if (errno != 0) - perror_with_name ("Couldn't write debug register"); + perror_with_name (_("Couldn't write debug register")); } void diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-tdep.c gdb/gdb/amd64-tdep.c --- gdb.orig/gdb/amd64-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/amd64-tdep.c 2004-12-04 17:21:36.000000000 +0100 @@ -204,7 +204,7 @@ amd64_dwarf_reg_to_regnum (int reg) regnum = amd64_dwarf_regmap[reg]; if (regnum == -1) - warning ("Unmapped DWARF Register #%d encountered\n", reg); + warning (_("Unmapped DWARF Register #%d encountered\n"), reg); return regnum; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64bsd-nat.c gdb/gdb/amd64bsd-nat.c --- gdb.orig/gdb/amd64bsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64bsd-nat.c 2004-12-04 17:23:29.000000000 +0100 @@ -49,7 +49,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -62,7 +62,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -80,13 +80,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -98,13 +98,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64fbsd-nat.c gdb/gdb/amd64fbsd-nat.c --- gdb.orig/gdb/amd64fbsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64fbsd-nat.c 2004-12-04 22:08:03.000000000 +0100 @@ -178,9 +178,8 @@ _initialize_amd64fbsd_nat (void) if (SC_RIP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rip) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RIP_OFFSET); } @@ -191,9 +190,8 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RSP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rsp) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RSP_OFFSET); } @@ -204,9 +202,8 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RBP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rbp) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RBP_OFFSET); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arch-utils.c gdb/gdb/arch-utils.c --- gdb.orig/gdb/arch-utils.c 2004-11-23 22:05:18.000000000 +0100 +++ gdb/gdb/arch-utils.c 2004-12-04 22:10:21.000000000 +0100 @@ -180,7 +180,7 @@ default_float_format (struct gdbarch *gd return &floatformat_ieee_single_little; default: internal_error (__FILE__, __LINE__, - "default_float_format: bad byte order"); + _("default_float_format: bad byte order")); } } @@ -197,7 +197,7 @@ default_double_format (struct gdbarch *g return &floatformat_ieee_double_little; default: internal_error (__FILE__, __LINE__, - "default_double_format: bad byte order"); + _("default_double_format: bad byte order")); } } @@ -261,7 +261,7 @@ legacy_virtual_frame_pointer (CORE_ADDR else /* Should this be an internal error? I guess so, it is reflecting an architectural limitation in the current design. */ - internal_error (__FILE__, __LINE__, "No virtual frame pointer available"); + internal_error (__FILE__, __LINE__, _("No virtual frame pointer available")); *frame_offset = 0; } @@ -372,11 +372,17 @@ static void show_endian (char *args, int from_tty) { if (target_byte_order_auto) - printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered (_("The target endianness is set automatically " + "(currently big endian)\n")); + else + printf_unfiltered (_("The target endianness is set automatically " + "(currently little endian)\n")); else - printf_unfiltered ("The target is assumed to be %s endian\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered ("The target is assumed to be big endian\n"); + else + printf_unfiltered ("The target is assumed to be little endian\n"); } static void @@ -393,7 +399,7 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_LITTLE; if (! gdbarch_update_p (info)) - printf_unfiltered ("Little endian target not supported by GDB\n"); + printf_unfiltered (_("Little endian target not supported by GDB\n")); } else if (set_endian_string == endian_big) { @@ -402,11 +408,11 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_BIG; if (! gdbarch_update_p (info)) - printf_unfiltered ("Big endian target not supported by GDB\n"); + printf_unfiltered (_("Big endian target not supported by GDB\n")); } else internal_error (__FILE__, __LINE__, - "set_endian: bad value"); + _("set_endian: bad value")); show_endian (NULL, from_tty); } @@ -436,9 +442,9 @@ show_architecture (char *args, int from_ const char *arch; arch = TARGET_ARCHITECTURE->printable_name; if (target_architecture_auto) - printf_filtered ("The target architecture is set automatically (currently %s)\n", arch); + printf_filtered (_("The target architecture is set automatically (currently %s)\n"), arch); else - printf_filtered ("The target architecture is assumed to be %s\n", arch); + printf_filtered (_("The target architecture is assumed to be %s\n"), arch); } @@ -459,11 +465,11 @@ set_architecture (char *ignore_args, int info.bfd_arch_info = bfd_scan_arch (set_architecture_string); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "set_architecture: bfd_scan_arch failed"); + _("set_architecture: bfd_scan_arch failed")); if (gdbarch_update_p (info)) target_architecture_auto = 0; else - printf_unfiltered ("Architecture `%s' not recognized.\n", + printf_unfiltered (_("Architecture `%s' not recognized.\n"), set_architecture_string); } show_architecture (NULL, from_tty); @@ -533,7 +539,7 @@ set_gdbarch_from_file (bfd *abfd) gdbarch = gdbarch_from_bfd (abfd); if (gdbarch == NULL) - error ("Architecture of file not recognized.\n"); + error (_("Architecture of file not recognized.\n")); deprecated_current_gdbarch_select_hack (gdbarch); } @@ -581,11 +587,11 @@ initialize_current_architecture (void) } if (chosen == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: No arch"); + _("initialize_current_architecture: No arch")); info.bfd_arch_info = bfd_scan_arch (chosen); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Arch not found"); + _("initialize_current_architecture: Arch not found")); } /* Take several guesses at a byte order. */ @@ -623,7 +629,8 @@ initialize_current_architecture (void) if (! gdbarch_update_p (info)) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Selection of initial architecture failed"); + _("initialize_current_architecture: Selection of " + "initial architecture failed")); /* Create the ``set architecture'' command appending ``auto'' to the list of architectures. */ @@ -640,14 +647,14 @@ initialize_current_architecture (void) safe. */ c = add_set_enum_cmd ("architecture", class_support, arches, &set_architecture_string, - "Set architecture of target.", + _("Set architecture of target."), &setlist); set_cmd_sfunc (c, set_architecture); add_alias_cmd ("processor", "architecture", class_support, 1, &setlist); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("architecture", class_support, show_architecture, - "Show the current target architecture", &showlist); + _("Show the current target architecture"), &showlist); } } @@ -724,11 +731,11 @@ _initialize_gdbarch_utils (void) struct cmd_list_element *c; c = add_set_enum_cmd ("endian", class_support, endian_enum, &set_endian_string, - "Set endianness of target.", + _("Set endianness of target."), &setlist); set_cmd_sfunc (c, set_endian); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("endian", class_support, show_endian, - "Show the current byte-order", &showlist); + _("Show the current byte-order"), &showlist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-linux-nat.c gdb/gdb/arm-linux-nat.c --- gdb.orig/gdb/arm-linux-nat.c 2004-07-24 03:00:19.000000000 +0200 +++ gdb/gdb/arm-linux-nat.c 2004-12-04 17:39:20.000000000 +0100 @@ -236,7 +236,7 @@ fetch_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch floating point register."); + warning (_("Unable to fetch floating point register.")); return; } @@ -285,7 +285,7 @@ fetch_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -333,7 +333,7 @@ store_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -350,7 +350,7 @@ store_fpregister (int regno) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point register."); + warning (_("Unable to store floating point register.")); return; } } @@ -371,7 +371,7 @@ store_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -388,7 +388,7 @@ store_fpregs (void) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point registers."); + warning (_("Unable to store floating point registers.")); return; } } @@ -408,7 +408,7 @@ fetch_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general register."); + warning (_("Unable to fetch general register.")); return; } @@ -448,7 +448,7 @@ fetch_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -486,7 +486,7 @@ store_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -496,7 +496,7 @@ store_register (int regno) ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to store general register."); + warning (_("Unable to store general register.")); return; } } @@ -514,7 +514,7 @@ store_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -528,7 +528,7 @@ store_regs (void) if (ret < 0) { - warning ("Unable to store general registers."); + warning (_("Unable to store general registers.")); return; } } @@ -691,7 +691,7 @@ get_linux_version (unsigned int *vmajor, if (-1 == uname (&info)) { - warning ("Unable to determine GNU/Linux version."); + warning (_("Unable to determine GNU/Linux version.")); return -1; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-tdep.c gdb/gdb/arm-tdep.c --- gdb.orig/gdb/arm-tdep.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/arm-tdep.c 2004-12-04 22:12:12.000000000 +0100 @@ -1322,12 +1322,13 @@ arm_print_float_info (struct gdbarch *gd int type; type = (status >> 24) & 127; - printf ("%s FPU type %d\n", - (status & (1 << 31)) ? "Hardware" : "Software", - type); - fputs ("mask: ", stdout); + if (status & (1 << 31)) + printf (_("Hardware FPU type %d\n"), type); + else + printf (_("Software FPU type %d\n"), type); + fputs (_("mask: "), stdout); print_fpu_flags (status >> 16); - fputs ("flags: ", stdout); + fputs (_("flags: "), stdout); print_fpu_flags (status); } @@ -1384,7 +1385,7 @@ arm_register_sim_regno (int regnum) return SIM_ARM_FPS_REGNUM + reg; reg -= NUM_SREGS; - internal_error (__FILE__, __LINE__, "Bad REGNUM %d", regnum); + internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum); } /* NOTE: cagney/2001-08-20: Both convert_from_extended() and @@ -1549,7 +1550,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) read_memory_integer (sp + offset, 4); nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } else if ((inst1 & 0xf000) == 0xd000) /* conditional branch */ { @@ -1580,7 +1581,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } return nextpc; @@ -1620,7 +1621,7 @@ arm_get_next_pc (CORE_ADDR pc) if (bits (this_instr, 22, 25) == 0 && bits (this_instr, 4, 7) == 9) /* multiply */ - error ("Illegal update to pc in instruction"); + error (_("Illegal update to pc in instruction")); /* BX <reg>, BLX <reg> */ if (bits (this_instr, 4, 28) == 0x12fff1 @@ -1631,7 +1632,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); return nextpc; } @@ -1712,7 +1713,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1730,7 +1731,7 @@ arm_get_next_pc (CORE_ADDR pc) unsigned long base; if (bit (this_instr, 22)) - error ("Illegal update to pc in instruction"); + error (_("Illegal update to pc in instruction")); /* byte write to PC */ rn = bits (this_instr, 16, 19); @@ -1755,7 +1756,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1791,7 +1792,7 @@ arm_get_next_pc (CORE_ADDR pc) } nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1807,7 +1808,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1818,7 +1819,7 @@ arm_get_next_pc (CORE_ADDR pc) break; default: - fprintf_filtered (gdb_stderr, "Bad bit-field extraction\n"); + fprintf_filtered (gdb_stderr, _("Bad bit-field extraction\n")); return (pc); } } @@ -2012,7 +2013,7 @@ arm_extract_return_value (struct type *t default: internal_error (__FILE__, __LINE__, - "arm_extract_return_value: Floating point model not supported"); + _("arm_extract_return_value: Floating point model not supported")); break; } } @@ -2202,7 +2203,7 @@ arm_store_return_value (struct type *typ default: internal_error (__FILE__, __LINE__, - "arm_store_return_value: Floating point model not supported"); + _("arm_store_return_value: Floating point model not supported")); break; } } @@ -2329,7 +2330,8 @@ arm_skip_stub (CORE_ADDR pc) static void set_arm_command (char *args, int from_tty) { - printf_unfiltered ("\"set arm\" must be followed by an apporpriate subcommand.\n"); + printf_unfiltered (_("\"set arm\" must be followed by an apporpriate " + "subcommand.\n")); help_list (setarmcmdlist, "set arm ", all_commands, gdb_stdout); } @@ -2383,7 +2385,7 @@ set_fp_model_sfunc (char *args, int from } if (fp_model == ARM_FLOAT_LAST) - internal_error (__FILE__, __LINE__, "Invalid fp model accepted: %s.", + internal_error (__FILE__, __LINE__, _("Invalid fp model accepted: %s."), current_fp_model); if (gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) @@ -2398,7 +2400,7 @@ show_fp_model (char *args, int from_tty, if (arm_fp_model == ARM_FLOAT_AUTO && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) - printf_filtered (" - the default for the current ABI is \"%s\".\n", + printf_filtered (_(" - the default for the current ABI is \"%s\".\n"), fp_model_strings[tdep->fp_model]); } @@ -2561,8 +2563,8 @@ arm_elf_osabi_sniffer (bfd *abfd) default: internal_error (__FILE__, __LINE__, - "arm_elf_osabi_sniffer: Unknown ARM EABI " - "version 0x%x", eflags); + _("arm_elf_osabi_sniffer: Unknown ARM EABI " + "version 0x%x"), eflags); } } break; @@ -2667,7 +2669,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } /* On ARM targets char defaults to unsigned. */ @@ -2768,7 +2770,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } return gdbarch; @@ -2782,7 +2784,7 @@ arm_dump_tdep (struct gdbarch *current_g if (tdep == NULL) return; - fprintf_unfiltered (file, "arm_dump_tdep: Lowest pc = 0x%lx", + fprintf_unfiltered (file, _("arm_dump_tdep: Lowest pc = 0x%lx"), (unsigned long) tdep->lowest_pc); } @@ -2841,11 +2843,11 @@ _initialize_arm_tdep (void) /* Add root prefix command for all "set arm"/"show arm" commands. */ add_prefix_cmd ("arm", no_class, set_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &setarmcmdlist, "set arm ", 0, &setlist); add_prefix_cmd ("arm", no_class, show_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &showarmcmdlist, "show arm ", 0, &showlist); /* Sync the opcode insn printer with our register viewer. */ @@ -2853,8 +2855,8 @@ _initialize_arm_tdep (void) /* Begin creating the help text. */ stb = mem_fileopen (); - fprintf_unfiltered (stb, "Set the disassembly style.\n" - "The valid values are:\n"); + fprintf_unfiltered (stb, _("Set the disassembly style.\n" + "The valid values are:\n")); /* Initialize the array that will be passed to add_set_enum_cmd(). */ valid_disassembly_styles @@ -2879,7 +2881,7 @@ _initialize_arm_tdep (void) valid_disassembly_styles[num_disassembly_options] = NULL; /* Finish the creation of the help text. */ - fprintf_unfiltered (stb, "The default is \"std\"."); + fprintf_unfiltered (stb, _("The default is \"std\".")); helptext = ui_file_xstrdup (stb, &length); ui_file_delete (stb); @@ -2902,24 +2904,23 @@ _initialize_arm_tdep (void) set_cmd_sfunc (new_set, set_disassembly_style_sfunc); deprecated_add_show_from_set (new_set, &showarmcmdlist); - add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\ -Set usage of ARM 32-bit mode.", "\ -Show usage of ARM 32-bit mode.", "\ -When off, a 26-bit PC will be used.\n\ -When off, a 26-bit PC will be used.", "\ -Usage of ARM 32-bit mode is %s.", + add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, + _("Set usage of ARM 32-bit mode."), + _("Show usage of ARM 32-bit mode."), + _("When off, a 26-bit PC will be used."), + _("Usage of ARM 32-bit mode is %s."), NULL, NULL, &setarmcmdlist, &showarmcmdlist); /* Add a command to allow the user to force the FPU model. */ new_set = add_set_enum_cmd ("fpu", no_class, fp_model_strings, ¤t_fp_model, - "Set the floating point type.\n" - "auto - Determine the FP typefrom the OS-ABI.\n" - "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" - "fpa - FPA co-processor (GCC compiled).\n" - "softvfp - Software FP with pure-endian doubles.\n" - "vfp - VFP co-processor.", + _("Set the floating point type.\n" + "auto - Determine the FP typefrom the OS-ABI.\n" + "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" + "fpa - FPA co-processor (GCC compiled).\n" + "softvfp - Software FP with pure-endian doubles.\n" + "vfp - VFP co-processor."), &setarmcmdlist); set_cmd_sfunc (new_set, set_fp_model_sfunc); set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), @@ -2927,15 +2928,15 @@ Usage of ARM 32-bit mode is %s.", /* Add the deprecated "othernames" command. */ deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames, - "Switch to the next set of register names."), + _("Switch to the next set of register names.")), "set arm disassembly"); /* Debugging flag. */ - add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\ -Set ARM debugging.", "\ -Show ARM debugging.", "\ -When on, arm-specific debugging is enabled.", "\ -ARM debugging is %s.", + add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, + _("Set ARM debugging."), + _("Show ARM debugging."), + _("When on, arm-specific debugging is enabled."), + _("ARM debugging is %s."), NULL, NULL, &setdebuglist, &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-nat.c gdb/gdb/armnbsd-nat.c --- gdb.orig/gdb/armnbsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/armnbsd-nat.c 2004-12-04 18:03:13.000000000 +0100 @@ -88,7 +88,7 @@ fetch_register (int regno) if (ret < 0) { - warning ("unable to fetch general register"); + warning (_("unable to fetch general register")); return; } @@ -139,7 +139,7 @@ fetch_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -157,7 +157,7 @@ fetch_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point register"); + warning (_("unable to fetch floating-point register")); return; } @@ -187,7 +187,7 @@ fetch_fp_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -223,7 +223,7 @@ store_register (int regno) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -284,7 +284,7 @@ store_register (int regno) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -331,7 +331,7 @@ store_regs (void) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to store general registers"); + warning (_("unable to store general registers")); } static void @@ -345,7 +345,7 @@ store_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point registers"); + warning (_("unable to fetch floating-point registers")); return; } @@ -366,7 +366,7 @@ store_fp_register (int regno) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -388,7 +388,7 @@ store_fp_regs (void) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to store floating-point registers"); + warning (_("unable to store floating-point registers")); } void @@ -437,7 +437,7 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != sizeof (struct reg)) - warning ("wrong size of register set in core file"); + warning (_("wrong size of register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure @@ -449,7 +449,7 @@ fetch_elfcore_registers (char *core_reg_ case 2: if (core_reg_size != sizeof (struct fpreg)) - warning ("wrong size of FPA register set in core file"); + warning (_("wrong size of FPA register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-tdep.c gdb/gdb/armnbsd-tdep.c --- gdb.orig/gdb/armnbsd-tdep.c 2004-10-31 21:36:34.000000000 +0100 +++ gdb/gdb/armnbsd-tdep.c 2004-12-04 18:03:39.000000000 +0100 @@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbar default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } tdep->jb_pc = ARM_NBSD_JB_PC; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/auxv.c gdb/gdb/auxv.c --- gdb.orig/gdb/auxv.c 2004-02-24 02:00:30.000000000 +0100 +++ gdb/gdb/auxv.c 2004-12-04 22:13:17.000000000 +0100 @@ -202,50 +202,50 @@ fprint_target_auxv (struct ui_file *file { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break - TAG (AT_NULL, "End of vector", hex); - TAG (AT_IGNORE, "Entry should be ignored", hex); - TAG (AT_EXECFD, "File descriptor of program", dec); - TAG (AT_PHDR, "Program headers for program", hex); - TAG (AT_PHENT, "Size of program header entry", dec); - TAG (AT_PHNUM, "Number of program headers", dec); - TAG (AT_PAGESZ, "System page size", dec); - TAG (AT_BASE, "Base address of interpreter", hex); - TAG (AT_FLAGS, "Flags", hex); - TAG (AT_ENTRY, "Entry point of program", hex); - TAG (AT_NOTELF, "Program is not ELF", dec); - TAG (AT_UID, "Real user ID", dec); - TAG (AT_EUID, "Effective user ID", dec); - TAG (AT_GID, "Real group ID", dec); - TAG (AT_EGID, "Effective group ID", dec); - TAG (AT_CLKTCK, "Frequency of times()", dec); - TAG (AT_PLATFORM, "String identifying platform", str); - TAG (AT_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_FPUCW, "Used FPU control word", dec); - TAG (AT_DCACHEBSIZE, "Data cache block size", dec); - TAG (AT_ICACHEBSIZE, "Instruction cache block size", dec); - TAG (AT_UCACHEBSIZE, "Unified cache block size", dec); - TAG (AT_IGNOREPPC, "Entry should be ignored", dec); - TAG (AT_SYSINFO, "Special system info/entry points", hex); - TAG (AT_SYSINFO_EHDR, "System-supplied DSO's ELF header", hex); - TAG (AT_SECURE, "Boolean, was exec setuid-like?", dec); - TAG (AT_SUN_UID, "Effective user ID", dec); - TAG (AT_SUN_RUID, "Real user ID", dec); - TAG (AT_SUN_GID, "Effective group ID", dec); - TAG (AT_SUN_RGID, "Real group ID", dec); - TAG (AT_SUN_LDELF, "Dynamic linker's ELF header", hex); - TAG (AT_SUN_LDSHDR, "Dynamic linker's section headers", hex); - TAG (AT_SUN_LDNAME, "String giving name of dynamic linker", str); - TAG (AT_SUN_LPAGESZ, "Large pagesize", dec); - TAG (AT_SUN_PLATFORM, "Platform name string", str); - TAG (AT_SUN_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_SUN_IFLUSH, "Should flush icache?", dec); - TAG (AT_SUN_CPU, "CPU name string", str); - TAG (AT_SUN_EMUL_ENTRY, "COFF entry point address", hex); - TAG (AT_SUN_EMUL_EXECFD, "COFF executable file descriptor", dec); + TAG (AT_NULL, _("End of vector"), hex); + TAG (AT_IGNORE, _("Entry should be ignored"), hex); + TAG (AT_EXECFD, _("File descriptor of program"), dec); + TAG (AT_PHDR, _("Program headers for program"), hex); + TAG (AT_PHENT, _("Size of program header entry"), dec); + TAG (AT_PHNUM, _("Number of program headers"), dec); + TAG (AT_PAGESZ, _("System page size"), dec); + TAG (AT_BASE, _("Base address of interpreter"), hex); + TAG (AT_FLAGS, _("Flags"), hex); + TAG (AT_ENTRY, _("Entry point of program"), hex); + TAG (AT_NOTELF, _("Program is not ELF"), dec); + TAG (AT_UID, _("Real user ID"), dec); + TAG (AT_EUID, _("Effective user ID"), dec); + TAG (AT_GID, _("Real group ID"), dec); + TAG (AT_EGID, _("Effective group ID"), dec); + TAG (AT_CLKTCK, _("Frequency of times()"), dec); + TAG (AT_PLATFORM, _("String identifying platform"), str); + TAG (AT_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_FPUCW, _("Used FPU control word"), dec); + TAG (AT_DCACHEBSIZE, _("Data cache block size"), dec); + TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec); + TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec); + TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec); + TAG (AT_SYSINFO, _("Special system info/entry points"), hex); + TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex); + TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec); + TAG (AT_SUN_UID, _("Effective user ID"), dec); + TAG (AT_SUN_RUID, _("Real user ID"), dec); + TAG (AT_SUN_GID, _("Effective group ID"), dec); + TAG (AT_SUN_RGID, _("Real group ID"), dec); + TAG (AT_SUN_LDELF, _("Dynamic linker's ELF header"), hex); + TAG (AT_SUN_LDSHDR, _("Dynamic linker's section headers"), hex); + TAG (AT_SUN_LDNAME, _("String giving name of dynamic linker"), str); + TAG (AT_SUN_LPAGESZ, _("Large pagesize"), dec); + TAG (AT_SUN_PLATFORM, _("Platform name string"), str); + TAG (AT_SUN_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_SUN_IFLUSH, _("Should flush icache?"), dec); + TAG (AT_SUN_CPU, _("CPU name string"), str); + TAG (AT_SUN_EMUL_ENTRY, _("COFF entry point address"), hex); + TAG (AT_SUN_EMUL_EXECFD, _("COFF executable file descriptor"), dec); TAG (AT_SUN_EXECNAME, - "Canonicalized file name given to execve", str); - TAG (AT_SUN_MMU, "String for name of MMU module", str); - TAG (AT_SUN_LDDATA, "Dynamic linker's data segment address", hex); + _("Canonicalized file name given to execve"), str); + TAG (AT_SUN_MMU, _("String for name of MMU module"), str); + TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex); } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -277,14 +277,14 @@ static void info_auxv_command (char *cmd, int from_tty) { if (! target_has_stack) - error ("The program has no auxiliary information now."); + error (_("The program has no auxiliary information now.")); else { int ents = fprint_target_auxv (gdb_stdout, ¤t_target); if (ents < 0) - error ("No auxiliary vector found, or failed reading it."); + error (_("No auxiliary vector found, or failed reading it.")); else if (ents == 0) - error ("Auxiliary vector is empty."); + error (_("Auxiliary vector is empty.")); } } @@ -295,6 +295,7 @@ void _initialize_auxv (void) { add_info ("auxv", info_auxv_command, - "Display the inferior's auxiliary vector.\n\ -This is information provided by the operating system at program startup."); + _("Display the inferior's auxiliary vector.\n" + "This is information provided by the operating system " + "at program startup.")); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/avr-tdep.c gdb/gdb/avr-tdep.c --- gdb.orig/gdb/avr-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/avr-tdep.c 2004-12-04 22:13:35.000000000 +0100 @@ -588,7 +588,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (num_pushes > AVR_MAX_PUSHES) { - fprintf_unfiltered (gdb_stderr, "Num pushes too large: %d\n", + fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), num_pushes); num_pushes = 0; } @@ -667,7 +667,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (vpc >= AVR_MAX_PROLOGUE_SIZE) fprintf_unfiltered (gdb_stderr, - "Hit end of prologue while scanning pushes\n"); + _("Hit end of prologue while scanning pushes\n")); /* Second stage of the prologue scanning. Scan: @@ -1337,8 +1337,8 @@ avr_io_reg_read_command (char *args, int if (bufsiz < 0) { fprintf_unfiltered (gdb_stderr, - "ERR: info io_registers NOT supported by current " - "target\n"); + _("ERR: info io_registers NOT supported " + "by current target\n")); return; } if (bufsiz > sizeof (buf)) @@ -1352,20 +1352,20 @@ avr_io_reg_read_command (char *args, int if (strncmp (buf, "", bufsiz) == 0) { fprintf_unfiltered (gdb_stderr, - "info io_registers NOT supported by target\n"); + _("info io_registers NOT supported by target\n")); return; } if (sscanf (buf, "%x", &nreg) != 1) { fprintf_unfiltered (gdb_stderr, - "Error fetching number of io registers\n"); + _("Error fetching number of io registers\n")); return; } reinitialize_more_filter (); - printf_unfiltered ("Target has %u io registers:\n\n", nreg); + printf_unfiltered (_("Target has %u io registers:\n\n"), nreg); /* only fetch up to 8 registers at a time to keep the buffer small */ step = 8; @@ -1412,5 +1412,5 @@ _initialize_avr_tdep (void) io_registers' to signify it is not available on other platforms. */ add_cmd ("io_registers", class_info, avr_io_reg_read_command, - "query remote avr target for io space register values", &infolist); + _("query remote avr target for io space register values"), &infolist); } ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 22:17 ` Baurjan Ismagulov @ 2004-12-04 23:59 ` Daniel Jacobowitz 2004-12-05 21:41 ` Eli Zaretskii 1 sibling, 0 replies; 29+ messages in thread From: Daniel Jacobowitz @ 2004-12-04 23:59 UTC (permalink / raw) To: gdb-patches On Sat, Dec 04, 2004 at 10:54:04PM +0100, Baurjan Ismagulov wrote: > I also prefer the "" "" concatenation just for aesthetic reasons. But I > couldn't reproduce the behaviour you describe; could you give an > example? I tend to consider this a bug. If the continued string starts at the beginning of the next line, diff will interpret it as the start of a function; future changes in that function will be attributed to the quoted string. It's possible this has changed, but unlikely. -- Daniel Jacobowitz ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 22:17 ` Baurjan Ismagulov 2004-12-04 23:59 ` Daniel Jacobowitz @ 2004-12-05 21:41 ` Eli Zaretskii 2004-12-05 23:39 ` Daniel Jacobowitz ` (2 more replies) 1 sibling, 3 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-05 21:41 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches > Date: Sat, 4 Dec 2004 22:54:04 +0100 > From: Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> > > Hmm, it did the last time I tried it, but 0.14.1-6 seems to work as > expected. I modified the patch. Thanks. My comments are below. > BTW, is there an argument reformatting function in emacs, so that, say, > M-q would wrap the arguments and strings up to fill-column? Not that I know of, but you might have better success asking this on emacs-devel@gnu.org. > @@ -1700,16 +1700,16 @@ aix_thread_extra_thread_info (struct thr > status = pthdb_pthread_suspendstate (pd_session, pdtid, > &suspendstate); > if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) > - fprintf_unfiltered (buf, ", suspended"); > + fprintf_unfiltered (buf, _(", suspended")); > > status = pthdb_pthread_detachstate (pd_session, pdtid, > &detachstate); > if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) > - fprintf_unfiltered (buf, ", detached"); > + fprintf_unfiltered (buf, _(", detached")); > > pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); > if (status == PTHDB_SUCCESS && cancelpend) > - fprintf_unfiltered (buf, ", cancel pending"); > + fprintf_unfiltered (buf, _(", cancel pending")); > > ui_file_write (buf, "", 1); We discussed cases like this before, I believe. The original code fragment looks like this: if (tid != PTHDB_INVALID_TID) fprintf_unfiltered (buf, "tid %d", tid); status = pthdb_pthread_state (pd_session, pdtid, &state); if (status != PTHDB_SUCCESS) state = PST_NOTSUP; fprintf_unfiltered (buf, ", %s", state2str (state)); status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) fprintf_unfiltered (buf, ", suspended"); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) fprintf_unfiltered (buf, ", detached"); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) fprintf_unfiltered (buf, ", cancel pending"); ui_file_write (buf, "", 1); This code produces a complete sentence one word at a time, which I think is bad for translating. I think the code needs to be rewritten to have full sentences like these: "tid %d, %s, suspended, detached, cancel pending" "tid %d, %s, detached, cancel pending" "tid %d, %s, cancel pending" "tid %d, %s" "tid %d, %s, suspended, cancel pending" "tid %d, %s, suspended, detached" "tid %d, %s, detached, cancel pending" "tid %d, %s, detached" etc. That makes the code less clever, but the translation is much easier. As the code is now, it will be almost impossible to get right in some languages. > - error ("Illegal update to pc in instruction"); > + error (_("Illegal update to pc in instruction")); Perhaps we should take this opportunity to change "Illegal" to "Invalid" here (and elsewhere in your patch), to follow the GNU coding standards. Otherwise, okay; thanks. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-05 21:41 ` Eli Zaretskii @ 2004-12-05 23:39 ` Daniel Jacobowitz 2004-12-06 2:19 ` Baurjan Ismagulov 2004-12-06 4:59 ` Eli Zaretskii 2004-12-06 0:00 ` Baurjan Ismagulov 2004-12-15 0:50 ` Baurjan Ismagulov 2 siblings, 2 replies; 29+ messages in thread From: Daniel Jacobowitz @ 2004-12-05 23:39 UTC (permalink / raw) To: Eli Zaretskii; +Cc: Baurjan Ismagulov, gdb-patches On Sun, Dec 05, 2004 at 11:34:10PM +0200, Eli Zaretskii wrote: > This code produces a complete sentence one word at a time, which I > think is bad for translating. I think the code needs to be rewritten > to have full sentences like these: > > "tid %d, %s, suspended, detached, cancel pending" > "tid %d, %s, detached, cancel pending" > "tid %d, %s, cancel pending" > "tid %d, %s" > "tid %d, %s, suspended, cancel pending" > "tid %d, %s, suspended, detached" > "tid %d, %s, detached, cancel pending" > "tid %d, %s, detached" > > etc. That makes the code less clever, but the translation is much > easier. As the code is now, it will be almost impossible to get right > in some languages. Yuck! What if someone wants to add another status? I understand that there is a translation problem here, but I find it really hard to accept that enumerating exponential combinations is really the solution. I suspect either: - the message needs to be redesigned in some more friendly way - we need a more friendly way to output a list of translated statuses - or else we need to leave the status message untranslated pending some thought on the above. -- Daniel Jacobowitz ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-05 23:39 ` Daniel Jacobowitz @ 2004-12-06 2:19 ` Baurjan Ismagulov 2004-12-06 4:59 ` Eli Zaretskii 1 sibling, 0 replies; 29+ messages in thread From: Baurjan Ismagulov @ 2004-12-06 2:19 UTC (permalink / raw) To: gdb-patches; +Cc: Eli Zaretskii On Sun, Dec 05, 2004 at 04:41:15PM -0500, Daniel Jacobowitz wrote: > Yuck! What if someone wants to add another status? I understand that > there is a translation problem here, but I find it really hard to > accept that enumerating exponential combinations is really the > solution. I suspect either: > - the message needs to be redesigned in some more friendly way > - we need a more friendly way to output a list of translated statuses > - or else we need to leave the status message untranslated pending > some thought on the above. I don't see a better way to express or output this information. The requirements are conflicting; each solution hurts the other requirement. In this case, I tend to sacrifice the translator's independence of code to the code clarity, since I hate bugs in code more than bugs in translation. That is, I suggest that we keep the code as it is, mark it up, put the context checking burden on translators, and wait for bug reports. The code remains clear, the translators decide between past participle vs. past tense according to the context, the users test the quality. Opinions? With kind regards, Baurjan. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-05 23:39 ` Daniel Jacobowitz 2004-12-06 2:19 ` Baurjan Ismagulov @ 2004-12-06 4:59 ` Eli Zaretskii 1 sibling, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-06 4:59 UTC (permalink / raw) To: Daniel Jacobowitz; +Cc: ibr, gdb-patches > Date: Sun, 5 Dec 2004 16:41:15 -0500 > From: Daniel Jacobowitz <drow@false.org> > Cc: Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr>, > gdb-patches@sources.redhat.com > > Yuck! What if someone wants to add another status? I understand that > there is a translation problem here, but I find it really hard to > accept that enumerating exponential combinations is really the > solution. I suspect either: > - the message needs to be redesigned in some more friendly way > - we need a more friendly way to output a list of translated statuses > - or else we need to leave the status message untranslated pending > some thought on the above. I have a difficulty judging the alternatives (except the last one), without any concrete suggestions. If you have more specific suggestions, please tell. While in principle, having all the permutations is tough, this specific case has a small number of them, so failing an attempt to find a better alternative, I don't see any terribly big problem with what I suggested. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-05 21:41 ` Eli Zaretskii 2004-12-05 23:39 ` Daniel Jacobowitz @ 2004-12-06 0:00 ` Baurjan Ismagulov 2004-12-15 0:50 ` Baurjan Ismagulov 2 siblings, 0 replies; 29+ messages in thread From: Baurjan Ismagulov @ 2004-12-06 0:00 UTC (permalink / raw) To: gdb-patches [-- Attachment #1: Type: text/plain, Size: 720 bytes --] On Sun, Dec 05, 2004 at 11:34:10PM +0200, Eli Zaretskii wrote: > We discussed cases like this before, I believe. That is why I asked about it in http://sources.redhat.com/ml/gdb-patches/2004-12/msg00119.html . > Perhaps we should take this opportunity to change "Illegal" to > "Invalid" here (and elsewhere in your patch), to follow the GNU coding > standards. Modified. With kind regards, Baurjan. 2004-12-04 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> * ada-valprint.c, aix-thread.c, alpha-nat.c, alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c, amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c, arch-utils.c, arm-linux-nat.c, arm-tdep.c, armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: i18n markup. [-- Attachment #2: gdb-ibr-i18n-02-20041206-0046.diff --] [-- Type: text/plain, Size: 49682 bytes --] diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/ada-valprint.c gdb/gdb/ada-valprint.c --- gdb.orig/gdb/ada-valprint.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/ada-valprint.c 2004-12-06 00:44:37.000000000 +0100 @@ -206,7 +206,7 @@ val_print_packed_array_elements (struct val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format, 0, recurse + 1, pretty); annotate_elt_rep (i - i0); - fprintf_filtered (stream, " <repeats %u times>", i - i0); + fprintf_filtered (stream, _(" <repeats %u times>"), i - i0); annotate_elt_rep_end (); } @@ -421,11 +421,11 @@ ada_print_scalar (struct type *type, LON case TYPE_CODE_MEMBER: case TYPE_CODE_METHOD: case TYPE_CODE_REF: - warning ("internal error: unhandled type in ada_print_scalar"); + warning (_("internal error: unhandled type in ada_print_scalar")); break; default: - error ("Invalid type code in symbol table."); + error (_("Invalid type code in symbol table.")); } gdb_flush (stream); } @@ -492,7 +492,7 @@ printstr (struct ui_file *stream, char * ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len); fputs_filtered ("'", stream); - fprintf_filtered (stream, " <repeats %u times>", reps); + fprintf_filtered (stream, _(" <repeats %u times>"), reps); i = rep1 - 1; things_printed += repeat_count_threshold; need_comma = 1; @@ -1068,7 +1068,7 @@ print_field_values (struct type *type, c if (TYPE_CPLUS_SPECIFIC (type) != NULL && TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("<optimized out or zero length>", stream); + fputs_filtered (_("<optimized out or zero length>"), stream); } else { diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/aix-thread.c gdb/gdb/aix-thread.c --- gdb.orig/gdb/aix-thread.c 2004-10-08 22:29:45.000000000 +0200 +++ gdb/gdb/aix-thread.c 2004-12-06 00:44:37.000000000 +0100 @@ -240,7 +240,7 @@ ptrace_check (int req, int id, int ret) } break; } - error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)", + error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"), req, id, ret, errno, safe_strerror (errno)); return 0; /* Not reached. */ } @@ -970,12 +970,12 @@ aix_thread_resume (ptid_t ptid, int step { thread = find_thread_pid (ptid); if (!thread) - error ("aix-thread resume: unknown pthread %ld", + error (_("aix-thread resume: unknown pthread %ld"), TIDGET (ptid)); tid[0] = thread->private->tid; if (tid[0] == PTHDB_INVALID_TID) - error ("aix-thread resume: no tid for pthread %ld", + error (_("aix-thread resume: no tid for pthread %ld"), TIDGET (ptid)); tid[1] = 0; @@ -1131,7 +1131,7 @@ fetch_regs_user_thread (pthdb_pthread_t "fetch_regs_user_thread %lx\n", (long) pdtid); status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: fetch_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* General-purpose registers. */ @@ -1412,7 +1412,7 @@ store_regs_user_thread (pthdb_pthread_t values. */ status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* Collect general-purpose register values from the regcache. */ @@ -1473,7 +1473,7 @@ store_regs_user_thread (pthdb_pthread_t status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_setcontext returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_setcontext returned %s"), pd_status2str (status)); } @@ -1660,7 +1660,7 @@ aix_thread_pid_to_str (ptid_t ptid) xstrprintf(). */ xfree (ret); - ret = xstrprintf ("Thread %ld", ptid_get_tid (ptid)); + ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid)); return ret; } @@ -1700,16 +1700,16 @@ aix_thread_extra_thread_info (struct thr status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) - fprintf_unfiltered (buf, ", suspended"); + fprintf_unfiltered (buf, _(", suspended")); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) - fprintf_unfiltered (buf, ", detached"); + fprintf_unfiltered (buf, _(", detached")); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) - fprintf_unfiltered (buf, ", cancel pending"); + fprintf_unfiltered (buf, _(", cancel pending")); ui_file_write (buf, "", 1); @@ -1727,8 +1727,8 @@ static void init_aix_thread_ops (void) { aix_thread_ops.to_shortname = "aix-threads"; - aix_thread_ops.to_longname = "AIX pthread support"; - aix_thread_ops.to_doc = "AIX pthread support"; + aix_thread_ops.to_longname = _("AIX pthread support"); + aix_thread_ops.to_doc = _("AIX pthread support"); aix_thread_ops.to_attach = aix_thread_attach; aix_thread_ops.to_detach = aix_thread_detach; @@ -1764,8 +1764,8 @@ _initialize_aix_thread (void) deprecated_add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger, (char *) &debug_aix_thread, - "Set debugging of AIX thread module.\n" - "Enables printf debugging output.\n", + _("Set debugging of AIX thread module.\n" + "Enables printf debugging output.\n"), &setdebuglist), &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-nat.c gdb/gdb/alpha-nat.c --- gdb.orig/gdb/alpha-nat.c 2004-12-01 22:19:21.000000000 +0100 +++ gdb/gdb/alpha-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -121,7 +121,7 @@ fetch_osf_core_registers (char *core_reg } if (bad_reg >= 0) { - error ("Register %s not found in core file.", REGISTER_NAME (bad_reg)); + error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg)); } } @@ -131,7 +131,7 @@ fetch_elf_core_registers (char *core_reg { if (core_reg_size < 32 * 8) { - error ("Core file register section too small (%u bytes).", core_reg_size); + error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphabsd-nat.c gdb/gdb/alphabsd-nat.c --- gdb.orig/gdb/alphabsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/alphabsd-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -92,7 +92,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_supply_reg ((char *) &gregs, regno); if (regno != -1) @@ -105,7 +105,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_supply_fpreg ((char *) &fpregs, regno); } @@ -122,13 +122,13 @@ store_inferior_registers (int regno) struct reg gregs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_fill_reg ((char *) &gregs, regno); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regno != -1) return; @@ -140,12 +140,12 @@ store_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_fill_fpreg ((char *) &fpregs, regno); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphanbsd-tdep.c gdb/gdb/alphanbsd-tdep.c --- gdb.orig/gdb/alphanbsd-tdep.c 2004-09-28 22:02:20.000000000 +0200 +++ gdb/gdb/alphanbsd-tdep.c 2004-12-06 00:44:37.000000000 +0100 @@ -64,7 +64,7 @@ fetch_core_registers (char *core_reg_sec if (core_reg_size < (SIZEOF_TRAPFRAME + SIZEOF_STRUCT_FPREG)) { - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); return; } @@ -86,14 +86,14 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != SIZEOF_STRUCT_REG) - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); else alphabsd_supply_reg (core_reg_sect, -1); break; case 2: /* Floating point registers. */ if (core_reg_size != SIZEOF_STRUCT_FPREG) - warning ("Wrong size FP register set in core file."); + warning (_("Wrong size FP register set in core file.")); else alphabsd_supply_fpreg (core_reg_sect, -1); break; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-linux-nat.c gdb/gdb/amd64-linux-nat.c --- gdb.orig/gdb/amd64-linux-nat.c 2004-04-09 23:16:05.000000000 +0200 +++ gdb/gdb/amd64-linux-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -162,7 +162,7 @@ fetch_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -174,7 +174,7 @@ fetch_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -199,12 +199,12 @@ store_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PTRACE_SETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -215,12 +215,12 @@ store_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PTRACE_SETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); return; } @@ -248,7 +248,7 @@ amd64_linux_dr_get (int regnum) offsetof (struct user, u_debugreg[regnum]), 0); if (errno != 0) #if 0 - perror_with_name ("Couldn't read debug register"); + perror_with_name (_("Couldn't read debug register")); #else return 0; #endif @@ -269,7 +269,7 @@ amd64_linux_dr_set (int regnum, unsigned errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); if (errno != 0) - perror_with_name ("Couldn't write debug register"); + perror_with_name (_("Couldn't write debug register")); } void diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-tdep.c gdb/gdb/amd64-tdep.c --- gdb.orig/gdb/amd64-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/amd64-tdep.c 2004-12-06 00:44:37.000000000 +0100 @@ -204,7 +204,7 @@ amd64_dwarf_reg_to_regnum (int reg) regnum = amd64_dwarf_regmap[reg]; if (regnum == -1) - warning ("Unmapped DWARF Register #%d encountered\n", reg); + warning (_("Unmapped DWARF Register #%d encountered\n"), reg); return regnum; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64bsd-nat.c gdb/gdb/amd64bsd-nat.c --- gdb.orig/gdb/amd64bsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64bsd-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -49,7 +49,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -62,7 +62,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -80,13 +80,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -98,13 +98,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64fbsd-nat.c gdb/gdb/amd64fbsd-nat.c --- gdb.orig/gdb/amd64fbsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64fbsd-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -178,9 +178,8 @@ _initialize_amd64fbsd_nat (void) if (SC_RIP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rip) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RIP_OFFSET); } @@ -191,9 +190,8 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RSP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rsp) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RSP_OFFSET); } @@ -204,9 +202,8 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RBP_OFFSET != offset) { - warning ("\ -offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", + warning (_("offsetof (struct sigcontext, sc_rbp) yields %d instead " + "of %d.\nPlease report this to <bug-gdb@gnu.org>."), offset, SC_RBP_OFFSET); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arch-utils.c gdb/gdb/arch-utils.c --- gdb.orig/gdb/arch-utils.c 2004-11-23 22:05:18.000000000 +0100 +++ gdb/gdb/arch-utils.c 2004-12-06 00:44:37.000000000 +0100 @@ -180,7 +180,7 @@ default_float_format (struct gdbarch *gd return &floatformat_ieee_single_little; default: internal_error (__FILE__, __LINE__, - "default_float_format: bad byte order"); + _("default_float_format: bad byte order")); } } @@ -197,7 +197,7 @@ default_double_format (struct gdbarch *g return &floatformat_ieee_double_little; default: internal_error (__FILE__, __LINE__, - "default_double_format: bad byte order"); + _("default_double_format: bad byte order")); } } @@ -261,7 +261,7 @@ legacy_virtual_frame_pointer (CORE_ADDR else /* Should this be an internal error? I guess so, it is reflecting an architectural limitation in the current design. */ - internal_error (__FILE__, __LINE__, "No virtual frame pointer available"); + internal_error (__FILE__, __LINE__, _("No virtual frame pointer available")); *frame_offset = 0; } @@ -372,11 +372,17 @@ static void show_endian (char *args, int from_tty) { if (target_byte_order_auto) - printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered (_("The target endianness is set automatically " + "(currently big endian)\n")); + else + printf_unfiltered (_("The target endianness is set automatically " + "(currently little endian)\n")); else - printf_unfiltered ("The target is assumed to be %s endian\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered ("The target is assumed to be big endian\n"); + else + printf_unfiltered ("The target is assumed to be little endian\n"); } static void @@ -393,7 +399,7 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_LITTLE; if (! gdbarch_update_p (info)) - printf_unfiltered ("Little endian target not supported by GDB\n"); + printf_unfiltered (_("Little endian target not supported by GDB\n")); } else if (set_endian_string == endian_big) { @@ -402,11 +408,11 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_BIG; if (! gdbarch_update_p (info)) - printf_unfiltered ("Big endian target not supported by GDB\n"); + printf_unfiltered (_("Big endian target not supported by GDB\n")); } else internal_error (__FILE__, __LINE__, - "set_endian: bad value"); + _("set_endian: bad value")); show_endian (NULL, from_tty); } @@ -436,9 +442,9 @@ show_architecture (char *args, int from_ const char *arch; arch = TARGET_ARCHITECTURE->printable_name; if (target_architecture_auto) - printf_filtered ("The target architecture is set automatically (currently %s)\n", arch); + printf_filtered (_("The target architecture is set automatically (currently %s)\n"), arch); else - printf_filtered ("The target architecture is assumed to be %s\n", arch); + printf_filtered (_("The target architecture is assumed to be %s\n"), arch); } @@ -459,11 +465,11 @@ set_architecture (char *ignore_args, int info.bfd_arch_info = bfd_scan_arch (set_architecture_string); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "set_architecture: bfd_scan_arch failed"); + _("set_architecture: bfd_scan_arch failed")); if (gdbarch_update_p (info)) target_architecture_auto = 0; else - printf_unfiltered ("Architecture `%s' not recognized.\n", + printf_unfiltered (_("Architecture `%s' not recognized.\n"), set_architecture_string); } show_architecture (NULL, from_tty); @@ -533,7 +539,7 @@ set_gdbarch_from_file (bfd *abfd) gdbarch = gdbarch_from_bfd (abfd); if (gdbarch == NULL) - error ("Architecture of file not recognized.\n"); + error (_("Architecture of file not recognized.\n")); deprecated_current_gdbarch_select_hack (gdbarch); } @@ -581,11 +587,11 @@ initialize_current_architecture (void) } if (chosen == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: No arch"); + _("initialize_current_architecture: No arch")); info.bfd_arch_info = bfd_scan_arch (chosen); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Arch not found"); + _("initialize_current_architecture: Arch not found")); } /* Take several guesses at a byte order. */ @@ -623,7 +629,8 @@ initialize_current_architecture (void) if (! gdbarch_update_p (info)) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Selection of initial architecture failed"); + _("initialize_current_architecture: Selection of " + "initial architecture failed")); /* Create the ``set architecture'' command appending ``auto'' to the list of architectures. */ @@ -640,14 +647,14 @@ initialize_current_architecture (void) safe. */ c = add_set_enum_cmd ("architecture", class_support, arches, &set_architecture_string, - "Set architecture of target.", + _("Set architecture of target."), &setlist); set_cmd_sfunc (c, set_architecture); add_alias_cmd ("processor", "architecture", class_support, 1, &setlist); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("architecture", class_support, show_architecture, - "Show the current target architecture", &showlist); + _("Show the current target architecture"), &showlist); } } @@ -724,11 +731,11 @@ _initialize_gdbarch_utils (void) struct cmd_list_element *c; c = add_set_enum_cmd ("endian", class_support, endian_enum, &set_endian_string, - "Set endianness of target.", + _("Set endianness of target."), &setlist); set_cmd_sfunc (c, set_endian); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("endian", class_support, show_endian, - "Show the current byte-order", &showlist); + _("Show the current byte-order"), &showlist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-linux-nat.c gdb/gdb/arm-linux-nat.c --- gdb.orig/gdb/arm-linux-nat.c 2004-07-24 03:00:19.000000000 +0200 +++ gdb/gdb/arm-linux-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -236,7 +236,7 @@ fetch_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch floating point register."); + warning (_("Unable to fetch floating point register.")); return; } @@ -285,7 +285,7 @@ fetch_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -333,7 +333,7 @@ store_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -350,7 +350,7 @@ store_fpregister (int regno) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point register."); + warning (_("Unable to store floating point register.")); return; } } @@ -371,7 +371,7 @@ store_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -388,7 +388,7 @@ store_fpregs (void) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point registers."); + warning (_("Unable to store floating point registers.")); return; } } @@ -408,7 +408,7 @@ fetch_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general register."); + warning (_("Unable to fetch general register.")); return; } @@ -448,7 +448,7 @@ fetch_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -486,7 +486,7 @@ store_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -496,7 +496,7 @@ store_register (int regno) ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to store general register."); + warning (_("Unable to store general register.")); return; } } @@ -514,7 +514,7 @@ store_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -528,7 +528,7 @@ store_regs (void) if (ret < 0) { - warning ("Unable to store general registers."); + warning (_("Unable to store general registers.")); return; } } @@ -691,7 +691,7 @@ get_linux_version (unsigned int *vmajor, if (-1 == uname (&info)) { - warning ("Unable to determine GNU/Linux version."); + warning (_("Unable to determine GNU/Linux version.")); return -1; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-tdep.c gdb/gdb/arm-tdep.c --- gdb.orig/gdb/arm-tdep.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/arm-tdep.c 2004-12-06 00:45:41.000000000 +0100 @@ -1322,12 +1322,13 @@ arm_print_float_info (struct gdbarch *gd int type; type = (status >> 24) & 127; - printf ("%s FPU type %d\n", - (status & (1 << 31)) ? "Hardware" : "Software", - type); - fputs ("mask: ", stdout); + if (status & (1 << 31)) + printf (_("Hardware FPU type %d\n"), type); + else + printf (_("Software FPU type %d\n"), type); + fputs (_("mask: "), stdout); print_fpu_flags (status >> 16); - fputs ("flags: ", stdout); + fputs (_("flags: "), stdout); print_fpu_flags (status); } @@ -1384,7 +1385,7 @@ arm_register_sim_regno (int regnum) return SIM_ARM_FPS_REGNUM + reg; reg -= NUM_SREGS; - internal_error (__FILE__, __LINE__, "Bad REGNUM %d", regnum); + internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum); } /* NOTE: cagney/2001-08-20: Both convert_from_extended() and @@ -1549,7 +1550,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) read_memory_integer (sp + offset, 4); nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } else if ((inst1 & 0xf000) == 0xd000) /* conditional branch */ { @@ -1580,7 +1581,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } return nextpc; @@ -1620,7 +1621,7 @@ arm_get_next_pc (CORE_ADDR pc) if (bits (this_instr, 22, 25) == 0 && bits (this_instr, 4, 7) == 9) /* multiply */ - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* BX <reg>, BLX <reg> */ if (bits (this_instr, 4, 28) == 0x12fff1 @@ -1631,7 +1632,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); return nextpc; } @@ -1712,7 +1713,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1730,7 +1731,7 @@ arm_get_next_pc (CORE_ADDR pc) unsigned long base; if (bit (this_instr, 22)) - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* byte write to PC */ rn = bits (this_instr, 16, 19); @@ -1755,7 +1756,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1791,7 +1792,7 @@ arm_get_next_pc (CORE_ADDR pc) } nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1807,7 +1808,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1818,7 +1819,7 @@ arm_get_next_pc (CORE_ADDR pc) break; default: - fprintf_filtered (gdb_stderr, "Bad bit-field extraction\n"); + fprintf_filtered (gdb_stderr, _("Bad bit-field extraction\n")); return (pc); } } @@ -2012,7 +2013,7 @@ arm_extract_return_value (struct type *t default: internal_error (__FILE__, __LINE__, - "arm_extract_return_value: Floating point model not supported"); + _("arm_extract_return_value: Floating point model not supported")); break; } } @@ -2202,7 +2203,7 @@ arm_store_return_value (struct type *typ default: internal_error (__FILE__, __LINE__, - "arm_store_return_value: Floating point model not supported"); + _("arm_store_return_value: Floating point model not supported")); break; } } @@ -2329,7 +2330,8 @@ arm_skip_stub (CORE_ADDR pc) static void set_arm_command (char *args, int from_tty) { - printf_unfiltered ("\"set arm\" must be followed by an apporpriate subcommand.\n"); + printf_unfiltered (_("\"set arm\" must be followed by an apporpriate " + "subcommand.\n")); help_list (setarmcmdlist, "set arm ", all_commands, gdb_stdout); } @@ -2383,7 +2385,7 @@ set_fp_model_sfunc (char *args, int from } if (fp_model == ARM_FLOAT_LAST) - internal_error (__FILE__, __LINE__, "Invalid fp model accepted: %s.", + internal_error (__FILE__, __LINE__, _("Invalid fp model accepted: %s."), current_fp_model); if (gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) @@ -2398,7 +2400,7 @@ show_fp_model (char *args, int from_tty, if (arm_fp_model == ARM_FLOAT_AUTO && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) - printf_filtered (" - the default for the current ABI is \"%s\".\n", + printf_filtered (_(" - the default for the current ABI is \"%s\".\n"), fp_model_strings[tdep->fp_model]); } @@ -2561,8 +2563,8 @@ arm_elf_osabi_sniffer (bfd *abfd) default: internal_error (__FILE__, __LINE__, - "arm_elf_osabi_sniffer: Unknown ARM EABI " - "version 0x%x", eflags); + _("arm_elf_osabi_sniffer: Unknown ARM EABI " + "version 0x%x"), eflags); } } break; @@ -2667,7 +2669,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } /* On ARM targets char defaults to unsigned. */ @@ -2768,7 +2770,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } return gdbarch; @@ -2782,7 +2784,7 @@ arm_dump_tdep (struct gdbarch *current_g if (tdep == NULL) return; - fprintf_unfiltered (file, "arm_dump_tdep: Lowest pc = 0x%lx", + fprintf_unfiltered (file, _("arm_dump_tdep: Lowest pc = 0x%lx"), (unsigned long) tdep->lowest_pc); } @@ -2841,11 +2843,11 @@ _initialize_arm_tdep (void) /* Add root prefix command for all "set arm"/"show arm" commands. */ add_prefix_cmd ("arm", no_class, set_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &setarmcmdlist, "set arm ", 0, &setlist); add_prefix_cmd ("arm", no_class, show_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &showarmcmdlist, "show arm ", 0, &showlist); /* Sync the opcode insn printer with our register viewer. */ @@ -2853,8 +2855,8 @@ _initialize_arm_tdep (void) /* Begin creating the help text. */ stb = mem_fileopen (); - fprintf_unfiltered (stb, "Set the disassembly style.\n" - "The valid values are:\n"); + fprintf_unfiltered (stb, _("Set the disassembly style.\n" + "The valid values are:\n")); /* Initialize the array that will be passed to add_set_enum_cmd(). */ valid_disassembly_styles @@ -2879,7 +2881,7 @@ _initialize_arm_tdep (void) valid_disassembly_styles[num_disassembly_options] = NULL; /* Finish the creation of the help text. */ - fprintf_unfiltered (stb, "The default is \"std\"."); + fprintf_unfiltered (stb, _("The default is \"std\".")); helptext = ui_file_xstrdup (stb, &length); ui_file_delete (stb); @@ -2902,24 +2904,23 @@ _initialize_arm_tdep (void) set_cmd_sfunc (new_set, set_disassembly_style_sfunc); deprecated_add_show_from_set (new_set, &showarmcmdlist); - add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\ -Set usage of ARM 32-bit mode.", "\ -Show usage of ARM 32-bit mode.", "\ -When off, a 26-bit PC will be used.\n\ -When off, a 26-bit PC will be used.", "\ -Usage of ARM 32-bit mode is %s.", + add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, + _("Set usage of ARM 32-bit mode."), + _("Show usage of ARM 32-bit mode."), + _("When off, a 26-bit PC will be used."), + _("Usage of ARM 32-bit mode is %s."), NULL, NULL, &setarmcmdlist, &showarmcmdlist); /* Add a command to allow the user to force the FPU model. */ new_set = add_set_enum_cmd ("fpu", no_class, fp_model_strings, ¤t_fp_model, - "Set the floating point type.\n" - "auto - Determine the FP typefrom the OS-ABI.\n" - "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" - "fpa - FPA co-processor (GCC compiled).\n" - "softvfp - Software FP with pure-endian doubles.\n" - "vfp - VFP co-processor.", + _("Set the floating point type.\n" + "auto - Determine the FP typefrom the OS-ABI.\n" + "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" + "fpa - FPA co-processor (GCC compiled).\n" + "softvfp - Software FP with pure-endian doubles.\n" + "vfp - VFP co-processor."), &setarmcmdlist); set_cmd_sfunc (new_set, set_fp_model_sfunc); set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), @@ -2927,15 +2928,15 @@ Usage of ARM 32-bit mode is %s.", /* Add the deprecated "othernames" command. */ deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames, - "Switch to the next set of register names."), + _("Switch to the next set of register names.")), "set arm disassembly"); /* Debugging flag. */ - add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\ -Set ARM debugging.", "\ -Show ARM debugging.", "\ -When on, arm-specific debugging is enabled.", "\ -ARM debugging is %s.", + add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, + _("Set ARM debugging."), + _("Show ARM debugging."), + _("When on, arm-specific debugging is enabled."), + _("ARM debugging is %s."), NULL, NULL, &setdebuglist, &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-nat.c gdb/gdb/armnbsd-nat.c --- gdb.orig/gdb/armnbsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/armnbsd-nat.c 2004-12-06 00:44:37.000000000 +0100 @@ -88,7 +88,7 @@ fetch_register (int regno) if (ret < 0) { - warning ("unable to fetch general register"); + warning (_("unable to fetch general register")); return; } @@ -139,7 +139,7 @@ fetch_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -157,7 +157,7 @@ fetch_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point register"); + warning (_("unable to fetch floating-point register")); return; } @@ -187,7 +187,7 @@ fetch_fp_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -223,7 +223,7 @@ store_register (int regno) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -284,7 +284,7 @@ store_register (int regno) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -331,7 +331,7 @@ store_regs (void) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to store general registers"); + warning (_("unable to store general registers")); } static void @@ -345,7 +345,7 @@ store_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point registers"); + warning (_("unable to fetch floating-point registers")); return; } @@ -366,7 +366,7 @@ store_fp_register (int regno) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -388,7 +388,7 @@ store_fp_regs (void) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to store floating-point registers"); + warning (_("unable to store floating-point registers")); } void @@ -437,7 +437,7 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != sizeof (struct reg)) - warning ("wrong size of register set in core file"); + warning (_("wrong size of register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure @@ -449,7 +449,7 @@ fetch_elfcore_registers (char *core_reg_ case 2: if (core_reg_size != sizeof (struct fpreg)) - warning ("wrong size of FPA register set in core file"); + warning (_("wrong size of FPA register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-tdep.c gdb/gdb/armnbsd-tdep.c --- gdb.orig/gdb/armnbsd-tdep.c 2004-10-31 21:36:34.000000000 +0100 +++ gdb/gdb/armnbsd-tdep.c 2004-12-06 00:44:37.000000000 +0100 @@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbar default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } tdep->jb_pc = ARM_NBSD_JB_PC; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/auxv.c gdb/gdb/auxv.c --- gdb.orig/gdb/auxv.c 2004-02-24 02:00:30.000000000 +0100 +++ gdb/gdb/auxv.c 2004-12-06 00:44:37.000000000 +0100 @@ -202,50 +202,50 @@ fprint_target_auxv (struct ui_file *file { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break - TAG (AT_NULL, "End of vector", hex); - TAG (AT_IGNORE, "Entry should be ignored", hex); - TAG (AT_EXECFD, "File descriptor of program", dec); - TAG (AT_PHDR, "Program headers for program", hex); - TAG (AT_PHENT, "Size of program header entry", dec); - TAG (AT_PHNUM, "Number of program headers", dec); - TAG (AT_PAGESZ, "System page size", dec); - TAG (AT_BASE, "Base address of interpreter", hex); - TAG (AT_FLAGS, "Flags", hex); - TAG (AT_ENTRY, "Entry point of program", hex); - TAG (AT_NOTELF, "Program is not ELF", dec); - TAG (AT_UID, "Real user ID", dec); - TAG (AT_EUID, "Effective user ID", dec); - TAG (AT_GID, "Real group ID", dec); - TAG (AT_EGID, "Effective group ID", dec); - TAG (AT_CLKTCK, "Frequency of times()", dec); - TAG (AT_PLATFORM, "String identifying platform", str); - TAG (AT_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_FPUCW, "Used FPU control word", dec); - TAG (AT_DCACHEBSIZE, "Data cache block size", dec); - TAG (AT_ICACHEBSIZE, "Instruction cache block size", dec); - TAG (AT_UCACHEBSIZE, "Unified cache block size", dec); - TAG (AT_IGNOREPPC, "Entry should be ignored", dec); - TAG (AT_SYSINFO, "Special system info/entry points", hex); - TAG (AT_SYSINFO_EHDR, "System-supplied DSO's ELF header", hex); - TAG (AT_SECURE, "Boolean, was exec setuid-like?", dec); - TAG (AT_SUN_UID, "Effective user ID", dec); - TAG (AT_SUN_RUID, "Real user ID", dec); - TAG (AT_SUN_GID, "Effective group ID", dec); - TAG (AT_SUN_RGID, "Real group ID", dec); - TAG (AT_SUN_LDELF, "Dynamic linker's ELF header", hex); - TAG (AT_SUN_LDSHDR, "Dynamic linker's section headers", hex); - TAG (AT_SUN_LDNAME, "String giving name of dynamic linker", str); - TAG (AT_SUN_LPAGESZ, "Large pagesize", dec); - TAG (AT_SUN_PLATFORM, "Platform name string", str); - TAG (AT_SUN_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_SUN_IFLUSH, "Should flush icache?", dec); - TAG (AT_SUN_CPU, "CPU name string", str); - TAG (AT_SUN_EMUL_ENTRY, "COFF entry point address", hex); - TAG (AT_SUN_EMUL_EXECFD, "COFF executable file descriptor", dec); + TAG (AT_NULL, _("End of vector"), hex); + TAG (AT_IGNORE, _("Entry should be ignored"), hex); + TAG (AT_EXECFD, _("File descriptor of program"), dec); + TAG (AT_PHDR, _("Program headers for program"), hex); + TAG (AT_PHENT, _("Size of program header entry"), dec); + TAG (AT_PHNUM, _("Number of program headers"), dec); + TAG (AT_PAGESZ, _("System page size"), dec); + TAG (AT_BASE, _("Base address of interpreter"), hex); + TAG (AT_FLAGS, _("Flags"), hex); + TAG (AT_ENTRY, _("Entry point of program"), hex); + TAG (AT_NOTELF, _("Program is not ELF"), dec); + TAG (AT_UID, _("Real user ID"), dec); + TAG (AT_EUID, _("Effective user ID"), dec); + TAG (AT_GID, _("Real group ID"), dec); + TAG (AT_EGID, _("Effective group ID"), dec); + TAG (AT_CLKTCK, _("Frequency of times()"), dec); + TAG (AT_PLATFORM, _("String identifying platform"), str); + TAG (AT_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_FPUCW, _("Used FPU control word"), dec); + TAG (AT_DCACHEBSIZE, _("Data cache block size"), dec); + TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec); + TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec); + TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec); + TAG (AT_SYSINFO, _("Special system info/entry points"), hex); + TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex); + TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec); + TAG (AT_SUN_UID, _("Effective user ID"), dec); + TAG (AT_SUN_RUID, _("Real user ID"), dec); + TAG (AT_SUN_GID, _("Effective group ID"), dec); + TAG (AT_SUN_RGID, _("Real group ID"), dec); + TAG (AT_SUN_LDELF, _("Dynamic linker's ELF header"), hex); + TAG (AT_SUN_LDSHDR, _("Dynamic linker's section headers"), hex); + TAG (AT_SUN_LDNAME, _("String giving name of dynamic linker"), str); + TAG (AT_SUN_LPAGESZ, _("Large pagesize"), dec); + TAG (AT_SUN_PLATFORM, _("Platform name string"), str); + TAG (AT_SUN_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_SUN_IFLUSH, _("Should flush icache?"), dec); + TAG (AT_SUN_CPU, _("CPU name string"), str); + TAG (AT_SUN_EMUL_ENTRY, _("COFF entry point address"), hex); + TAG (AT_SUN_EMUL_EXECFD, _("COFF executable file descriptor"), dec); TAG (AT_SUN_EXECNAME, - "Canonicalized file name given to execve", str); - TAG (AT_SUN_MMU, "String for name of MMU module", str); - TAG (AT_SUN_LDDATA, "Dynamic linker's data segment address", hex); + _("Canonicalized file name given to execve"), str); + TAG (AT_SUN_MMU, _("String for name of MMU module"), str); + TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex); } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -277,14 +277,14 @@ static void info_auxv_command (char *cmd, int from_tty) { if (! target_has_stack) - error ("The program has no auxiliary information now."); + error (_("The program has no auxiliary information now.")); else { int ents = fprint_target_auxv (gdb_stdout, ¤t_target); if (ents < 0) - error ("No auxiliary vector found, or failed reading it."); + error (_("No auxiliary vector found, or failed reading it.")); else if (ents == 0) - error ("Auxiliary vector is empty."); + error (_("Auxiliary vector is empty.")); } } @@ -295,6 +295,7 @@ void _initialize_auxv (void) { add_info ("auxv", info_auxv_command, - "Display the inferior's auxiliary vector.\n\ -This is information provided by the operating system at program startup."); + _("Display the inferior's auxiliary vector.\n" + "This is information provided by the operating system " + "at program startup.")); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/avr-tdep.c gdb/gdb/avr-tdep.c --- gdb.orig/gdb/avr-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/avr-tdep.c 2004-12-06 00:44:37.000000000 +0100 @@ -588,7 +588,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (num_pushes > AVR_MAX_PUSHES) { - fprintf_unfiltered (gdb_stderr, "Num pushes too large: %d\n", + fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), num_pushes); num_pushes = 0; } @@ -667,7 +667,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (vpc >= AVR_MAX_PROLOGUE_SIZE) fprintf_unfiltered (gdb_stderr, - "Hit end of prologue while scanning pushes\n"); + _("Hit end of prologue while scanning pushes\n")); /* Second stage of the prologue scanning. Scan: @@ -1337,8 +1337,8 @@ avr_io_reg_read_command (char *args, int if (bufsiz < 0) { fprintf_unfiltered (gdb_stderr, - "ERR: info io_registers NOT supported by current " - "target\n"); + _("ERR: info io_registers NOT supported " + "by current target\n")); return; } if (bufsiz > sizeof (buf)) @@ -1352,20 +1352,20 @@ avr_io_reg_read_command (char *args, int if (strncmp (buf, "", bufsiz) == 0) { fprintf_unfiltered (gdb_stderr, - "info io_registers NOT supported by target\n"); + _("info io_registers NOT supported by target\n")); return; } if (sscanf (buf, "%x", &nreg) != 1) { fprintf_unfiltered (gdb_stderr, - "Error fetching number of io registers\n"); + _("Error fetching number of io registers\n")); return; } reinitialize_more_filter (); - printf_unfiltered ("Target has %u io registers:\n\n", nreg); + printf_unfiltered (_("Target has %u io registers:\n\n"), nreg); /* only fetch up to 8 registers at a time to keep the buffer small */ step = 8; @@ -1412,5 +1412,5 @@ _initialize_avr_tdep (void) io_registers' to signify it is not available on other platforms. */ add_cmd ("io_registers", class_info, avr_io_reg_read_command, - "query remote avr target for io space register values", &infolist); + _("query remote avr target for io space register values"), &infolist); } ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-05 21:41 ` Eli Zaretskii 2004-12-05 23:39 ` Daniel Jacobowitz 2004-12-06 0:00 ` Baurjan Ismagulov @ 2004-12-15 0:50 ` Baurjan Ismagulov 2004-12-15 21:48 ` Eli Zaretskii 2 siblings, 1 reply; 29+ messages in thread From: Baurjan Ismagulov @ 2004-12-15 0:50 UTC (permalink / raw) To: gdb-patches [-- Attachment #1: Type: text/plain, Size: 1555 bytes --] Hello all, here's the new version. I've addressed two issues: * Providing context. I've followed the advice from Andreas Schwab and provided examples of the whole phrases as they are printed by gdb. In this way, the code is readable, and the message file has even more context than is provided by the translated string itself. I've done this only for permutations; obvious cases like "big endian" / "little endian" have been rewritten. The relevant excerpt from the output of "xgettext -o a.po -k_ --add-comments=i18n *.c" is attached. * String concatenation style. I've gone by the following guidelines: - If all lines of a string (including "\n" and quotes) fit in their respective source lines (with "printf", etc.), which means they are surely shorter than 80 characters, divide them as "" "". Example: gdb/gdb/arm-tdep.c, @@ -2902,24 +2904,23 @@. - If not all lines of a string fit in their source lines, divide them with \. Leave the first line of a string on the first source line if it fits in it (gdb/gdb/auxv.c, @@ -295,6 +295,6 @@); otherwise, place it on the next source line after "\ (gdb/gdb/amd64fbsd-nat.c, @@ -178,9 +178,9 @@). Comments? With kind regards, Baurjan. 2004-12-15 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> * ada-valprint.c, aix-thread.c, alpha-nat.c, alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c, amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c, arch-utils.c, arm-linux-nat.c, arm-tdep.c, armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: i18n markup. [-- Attachment #2: a.po --] [-- Type: text/plain, Size: 1010 bytes --] #. i18n: Like "Thread-Id %d, [state] idle" #: aix-thread.c:555 msgid "idle" msgstr "" #. i18n: Like "Thread-Id %d, [state] running" #: aix-thread.c:558 msgid "running" msgstr "" #. i18n: Like "Thread-Id %d, [state] sleeping" #: aix-thread.c:561 msgid "sleeping" msgstr "" #. i18n: Like "Thread-Id %d, [state] ready" #: aix-thread.c:564 msgid "ready" msgstr "" #. i18n: Like "Thread-Id %d, [state] finished" #: aix-thread.c:567 msgid "finished" msgstr "" #. i18n: Like "Thread-Id %d, [state] unknown" #: aix-thread.c:570 msgid "unknown" msgstr "" #. i18n: Like "thread-identifier %d, [state] running, suspended" #: aix-thread.c:1706 #, c-format msgid "tid %d" msgstr "" #. i18n: Like "Thread-Id %d, [state] running, suspended" #: aix-thread.c:1717 msgid ", suspended" msgstr "" #. i18n: Like "Thread-Id %d, [state] running, detached" #: aix-thread.c:1723 msgid ", detached" msgstr "" #. i18n: Like "Thread-Id %d, [state] running, cancel pending" #: aix-thread.c:1728 msgid ", cancel pending" msgstr "" [-- Attachment #3: gdb-ibr-i18n-02-20041215-0026.diff --] [-- Type: text/plain, Size: 51200 bytes --] diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/ada-valprint.c gdb/gdb/ada-valprint.c --- gdb.orig/gdb/ada-valprint.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/ada-valprint.c 2004-12-14 23:54:25.000000000 +0100 @@ -206,7 +206,7 @@ val_print_packed_array_elements (struct val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format, 0, recurse + 1, pretty); annotate_elt_rep (i - i0); - fprintf_filtered (stream, " <repeats %u times>", i - i0); + fprintf_filtered (stream, _(" <repeats %u times>"), i - i0); annotate_elt_rep_end (); } @@ -421,11 +421,11 @@ ada_print_scalar (struct type *type, LON case TYPE_CODE_MEMBER: case TYPE_CODE_METHOD: case TYPE_CODE_REF: - warning ("internal error: unhandled type in ada_print_scalar"); + warning (_("internal error: unhandled type in ada_print_scalar")); break; default: - error ("Invalid type code in symbol table."); + error (_("Invalid type code in symbol table.")); } gdb_flush (stream); } @@ -492,7 +492,7 @@ printstr (struct ui_file *stream, char * ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len); fputs_filtered ("'", stream); - fprintf_filtered (stream, " <repeats %u times>", reps); + fprintf_filtered (stream, _(" <repeats %u times>"), reps); i = rep1 - 1; things_printed += repeat_count_threshold; need_comma = 1; @@ -1068,7 +1068,7 @@ print_field_values (struct type *type, c if (TYPE_CPLUS_SPECIFIC (type) != NULL && TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("<optimized out or zero length>", stream); + fputs_filtered (_("<optimized out or zero length>"), stream); } else { diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/aix-thread.c gdb/gdb/aix-thread.c --- gdb.orig/gdb/aix-thread.c 2004-10-08 22:29:45.000000000 +0200 +++ gdb/gdb/aix-thread.c 2004-12-15 00:16:36.000000000 +0100 @@ -240,7 +240,7 @@ ptrace_check (int req, int id, int ret) } break; } - error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)", + error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"), req, id, ret, errno, safe_strerror (errno)); return 0; /* Not reached. */ } @@ -550,12 +550,24 @@ state2str (pthdb_state_t state) { switch (state) { - case PST_IDLE: return "idle"; /* being created */ - case PST_RUN: return "running"; /* running */ - case PST_SLEEP: return "sleeping"; /* awaiting an event */ - case PST_READY: return "ready"; /* runnable */ - case PST_TERM: return "finished"; /* awaiting a join/detach */ - default: return "unknown"; + case PST_IDLE: + /* i18n: Like "Thread-Id %d, [state] idle" */ + return _("idle"); /* being created */ + case PST_RUN: + /* i18n: Like "Thread-Id %d, [state] running" */ + return _("running"); /* running */ + case PST_SLEEP: + /* i18n: Like "Thread-Id %d, [state] sleeping" */ + return _("sleeping"); /* awaiting an event */ + case PST_READY: + /* i18n: Like "Thread-Id %d, [state] ready" */ + return _("ready"); /* runnable */ + case PST_TERM: + /* i18n: Like "Thread-Id %d, [state] finished" */ + return _("finished"); /* awaiting a join/detach */ + default: + /* i18n: Like "Thread-Id %d, [state] unknown" */ + return _("unknown"); } } @@ -970,12 +982,12 @@ aix_thread_resume (ptid_t ptid, int step { thread = find_thread_pid (ptid); if (!thread) - error ("aix-thread resume: unknown pthread %ld", + error (_("aix-thread resume: unknown pthread %ld"), TIDGET (ptid)); tid[0] = thread->private->tid; if (tid[0] == PTHDB_INVALID_TID) - error ("aix-thread resume: no tid for pthread %ld", + error (_("aix-thread resume: no tid for pthread %ld"), TIDGET (ptid)); tid[1] = 0; @@ -1131,7 +1143,7 @@ fetch_regs_user_thread (pthdb_pthread_t "fetch_regs_user_thread %lx\n", (long) pdtid); status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: fetch_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* General-purpose registers. */ @@ -1412,7 +1424,7 @@ store_regs_user_thread (pthdb_pthread_t values. */ status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* Collect general-purpose register values from the regcache. */ @@ -1473,7 +1485,7 @@ store_regs_user_thread (pthdb_pthread_t status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_setcontext returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_setcontext returned %s"), pd_status2str (status)); } @@ -1660,7 +1672,7 @@ aix_thread_pid_to_str (ptid_t ptid) xstrprintf(). */ xfree (ret); - ret = xstrprintf ("Thread %ld", ptid_get_tid (ptid)); + ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid)); return ret; } @@ -1690,7 +1702,8 @@ aix_thread_extra_thread_info (struct thr tid = thread->private->tid; if (tid != PTHDB_INVALID_TID) - fprintf_unfiltered (buf, "tid %d", tid); + /* i18n: Like "thread-identifier %d, [state] running, suspended" */ + fprintf_unfiltered (buf, _("tid %d"), tid); status = pthdb_pthread_state (pd_session, pdtid, &state); if (status != PTHDB_SUCCESS) @@ -1700,16 +1713,19 @@ aix_thread_extra_thread_info (struct thr status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) - fprintf_unfiltered (buf, ", suspended"); + /* i18n: Like "Thread-Id %d, [state] running, suspended" */ + fprintf_unfiltered (buf, _(", suspended")); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) - fprintf_unfiltered (buf, ", detached"); + /* i18n: Like "Thread-Id %d, [state] running, detached" */ + fprintf_unfiltered (buf, _(", detached")); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) - fprintf_unfiltered (buf, ", cancel pending"); + /* i18n: Like "Thread-Id %d, [state] running, cancel pending" */ + fprintf_unfiltered (buf, _(", cancel pending")); ui_file_write (buf, "", 1); @@ -1727,8 +1743,8 @@ static void init_aix_thread_ops (void) { aix_thread_ops.to_shortname = "aix-threads"; - aix_thread_ops.to_longname = "AIX pthread support"; - aix_thread_ops.to_doc = "AIX pthread support"; + aix_thread_ops.to_longname = _("AIX pthread support"); + aix_thread_ops.to_doc = _("AIX pthread support"); aix_thread_ops.to_attach = aix_thread_attach; aix_thread_ops.to_detach = aix_thread_detach; @@ -1764,8 +1780,8 @@ _initialize_aix_thread (void) deprecated_add_show_from_set (add_set_cmd ("aix-thread", no_class, var_zinteger, (char *) &debug_aix_thread, - "Set debugging of AIX thread module.\n" - "Enables printf debugging output.\n", + _("Set debugging of AIX thread module.\n" + "Enables printf debugging output.\n"), &setdebuglist), &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-nat.c gdb/gdb/alpha-nat.c --- gdb.orig/gdb/alpha-nat.c 2004-12-01 22:19:21.000000000 +0100 +++ gdb/gdb/alpha-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -121,7 +121,7 @@ fetch_osf_core_registers (char *core_reg } if (bad_reg >= 0) { - error ("Register %s not found in core file.", REGISTER_NAME (bad_reg)); + error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg)); } } @@ -131,7 +131,7 @@ fetch_elf_core_registers (char *core_reg { if (core_reg_size < 32 * 8) { - error ("Core file register section too small (%u bytes).", core_reg_size); + error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphabsd-nat.c gdb/gdb/alphabsd-nat.c --- gdb.orig/gdb/alphabsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/alphabsd-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -92,7 +92,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_supply_reg ((char *) &gregs, regno); if (regno != -1) @@ -105,7 +105,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_supply_fpreg ((char *) &fpregs, regno); } @@ -122,13 +122,13 @@ store_inferior_registers (int regno) struct reg gregs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_fill_reg ((char *) &gregs, regno); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regno != -1) return; @@ -140,12 +140,12 @@ store_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_fill_fpreg ((char *) &fpregs, regno); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphanbsd-tdep.c gdb/gdb/alphanbsd-tdep.c --- gdb.orig/gdb/alphanbsd-tdep.c 2004-09-28 22:02:20.000000000 +0200 +++ gdb/gdb/alphanbsd-tdep.c 2004-12-14 23:54:25.000000000 +0100 @@ -64,7 +64,7 @@ fetch_core_registers (char *core_reg_sec if (core_reg_size < (SIZEOF_TRAPFRAME + SIZEOF_STRUCT_FPREG)) { - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); return; } @@ -86,14 +86,14 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != SIZEOF_STRUCT_REG) - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); else alphabsd_supply_reg (core_reg_sect, -1); break; case 2: /* Floating point registers. */ if (core_reg_size != SIZEOF_STRUCT_FPREG) - warning ("Wrong size FP register set in core file."); + warning (_("Wrong size FP register set in core file.")); else alphabsd_supply_fpreg (core_reg_sect, -1); break; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-linux-nat.c gdb/gdb/amd64-linux-nat.c --- gdb.orig/gdb/amd64-linux-nat.c 2004-04-09 23:16:05.000000000 +0200 +++ gdb/gdb/amd64-linux-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -162,7 +162,7 @@ fetch_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -174,7 +174,7 @@ fetch_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -199,12 +199,12 @@ store_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PTRACE_SETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -215,12 +215,12 @@ store_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PTRACE_SETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); return; } @@ -248,7 +248,7 @@ amd64_linux_dr_get (int regnum) offsetof (struct user, u_debugreg[regnum]), 0); if (errno != 0) #if 0 - perror_with_name ("Couldn't read debug register"); + perror_with_name (_("Couldn't read debug register")); #else return 0; #endif @@ -269,7 +269,7 @@ amd64_linux_dr_set (int regnum, unsigned errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); if (errno != 0) - perror_with_name ("Couldn't write debug register"); + perror_with_name (_("Couldn't write debug register")); } void diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-tdep.c gdb/gdb/amd64-tdep.c --- gdb.orig/gdb/amd64-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/amd64-tdep.c 2004-12-14 23:54:25.000000000 +0100 @@ -204,7 +204,7 @@ amd64_dwarf_reg_to_regnum (int reg) regnum = amd64_dwarf_regmap[reg]; if (regnum == -1) - warning ("Unmapped DWARF Register #%d encountered\n", reg); + warning (_("Unmapped DWARF Register #%d encountered\n"), reg); return regnum; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64bsd-nat.c gdb/gdb/amd64bsd-nat.c --- gdb.orig/gdb/amd64bsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64bsd-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -49,7 +49,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -62,7 +62,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -80,13 +80,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -98,13 +98,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64fbsd-nat.c gdb/gdb/amd64fbsd-nat.c --- gdb.orig/gdb/amd64fbsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64fbsd-nat.c 2004-12-15 00:21:55.000000000 +0100 @@ -178,9 +178,9 @@ _initialize_amd64fbsd_nat (void) if (SC_RIP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RIP_OFFSET); } @@ -191,9 +191,9 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RSP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RSP_OFFSET); } @@ -204,9 +204,9 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RBP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RBP_OFFSET); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arch-utils.c gdb/gdb/arch-utils.c --- gdb.orig/gdb/arch-utils.c 2004-11-23 22:05:18.000000000 +0100 +++ gdb/gdb/arch-utils.c 2004-12-14 23:54:25.000000000 +0100 @@ -180,7 +180,7 @@ default_float_format (struct gdbarch *gd return &floatformat_ieee_single_little; default: internal_error (__FILE__, __LINE__, - "default_float_format: bad byte order"); + _("default_float_format: bad byte order")); } } @@ -197,7 +197,7 @@ default_double_format (struct gdbarch *g return &floatformat_ieee_double_little; default: internal_error (__FILE__, __LINE__, - "default_double_format: bad byte order"); + _("default_double_format: bad byte order")); } } @@ -261,7 +261,7 @@ legacy_virtual_frame_pointer (CORE_ADDR else /* Should this be an internal error? I guess so, it is reflecting an architectural limitation in the current design. */ - internal_error (__FILE__, __LINE__, "No virtual frame pointer available"); + internal_error (__FILE__, __LINE__, _("No virtual frame pointer available")); *frame_offset = 0; } @@ -372,11 +372,17 @@ static void show_endian (char *args, int from_tty) { if (target_byte_order_auto) - printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered (_("The target endianness is set automatically " + "(currently big endian)\n")); + else + printf_unfiltered (_("The target endianness is set automatically " + "(currently little endian)\n")); else - printf_unfiltered ("The target is assumed to be %s endian\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered ("The target is assumed to be big endian\n"); + else + printf_unfiltered ("The target is assumed to be little endian\n"); } static void @@ -393,7 +399,7 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_LITTLE; if (! gdbarch_update_p (info)) - printf_unfiltered ("Little endian target not supported by GDB\n"); + printf_unfiltered (_("Little endian target not supported by GDB\n")); } else if (set_endian_string == endian_big) { @@ -402,11 +408,11 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_BIG; if (! gdbarch_update_p (info)) - printf_unfiltered ("Big endian target not supported by GDB\n"); + printf_unfiltered (_("Big endian target not supported by GDB\n")); } else internal_error (__FILE__, __LINE__, - "set_endian: bad value"); + _("set_endian: bad value")); show_endian (NULL, from_tty); } @@ -436,9 +442,9 @@ show_architecture (char *args, int from_ const char *arch; arch = TARGET_ARCHITECTURE->printable_name; if (target_architecture_auto) - printf_filtered ("The target architecture is set automatically (currently %s)\n", arch); + printf_filtered (_("The target architecture is set automatically (currently %s)\n"), arch); else - printf_filtered ("The target architecture is assumed to be %s\n", arch); + printf_filtered (_("The target architecture is assumed to be %s\n"), arch); } @@ -459,11 +465,11 @@ set_architecture (char *ignore_args, int info.bfd_arch_info = bfd_scan_arch (set_architecture_string); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "set_architecture: bfd_scan_arch failed"); + _("set_architecture: bfd_scan_arch failed")); if (gdbarch_update_p (info)) target_architecture_auto = 0; else - printf_unfiltered ("Architecture `%s' not recognized.\n", + printf_unfiltered (_("Architecture `%s' not recognized.\n"), set_architecture_string); } show_architecture (NULL, from_tty); @@ -533,7 +539,7 @@ set_gdbarch_from_file (bfd *abfd) gdbarch = gdbarch_from_bfd (abfd); if (gdbarch == NULL) - error ("Architecture of file not recognized.\n"); + error (_("Architecture of file not recognized.\n")); deprecated_current_gdbarch_select_hack (gdbarch); } @@ -581,11 +587,11 @@ initialize_current_architecture (void) } if (chosen == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: No arch"); + _("initialize_current_architecture: No arch")); info.bfd_arch_info = bfd_scan_arch (chosen); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Arch not found"); + _("initialize_current_architecture: Arch not found")); } /* Take several guesses at a byte order. */ @@ -623,7 +629,8 @@ initialize_current_architecture (void) if (! gdbarch_update_p (info)) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Selection of initial architecture failed"); + _("initialize_current_architecture: Selection of " + "initial architecture failed")); /* Create the ``set architecture'' command appending ``auto'' to the list of architectures. */ @@ -640,14 +647,14 @@ initialize_current_architecture (void) safe. */ c = add_set_enum_cmd ("architecture", class_support, arches, &set_architecture_string, - "Set architecture of target.", + _("Set architecture of target."), &setlist); set_cmd_sfunc (c, set_architecture); add_alias_cmd ("processor", "architecture", class_support, 1, &setlist); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("architecture", class_support, show_architecture, - "Show the current target architecture", &showlist); + _("Show the current target architecture"), &showlist); } } @@ -724,11 +731,11 @@ _initialize_gdbarch_utils (void) struct cmd_list_element *c; c = add_set_enum_cmd ("endian", class_support, endian_enum, &set_endian_string, - "Set endianness of target.", + _("Set endianness of target."), &setlist); set_cmd_sfunc (c, set_endian); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("endian", class_support, show_endian, - "Show the current byte-order", &showlist); + _("Show the current byte-order"), &showlist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-linux-nat.c gdb/gdb/arm-linux-nat.c --- gdb.orig/gdb/arm-linux-nat.c 2004-07-24 03:00:19.000000000 +0200 +++ gdb/gdb/arm-linux-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -236,7 +236,7 @@ fetch_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch floating point register."); + warning (_("Unable to fetch floating point register.")); return; } @@ -285,7 +285,7 @@ fetch_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -333,7 +333,7 @@ store_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -350,7 +350,7 @@ store_fpregister (int regno) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point register."); + warning (_("Unable to store floating point register.")); return; } } @@ -371,7 +371,7 @@ store_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -388,7 +388,7 @@ store_fpregs (void) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point registers."); + warning (_("Unable to store floating point registers.")); return; } } @@ -408,7 +408,7 @@ fetch_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general register."); + warning (_("Unable to fetch general register.")); return; } @@ -448,7 +448,7 @@ fetch_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -486,7 +486,7 @@ store_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -496,7 +496,7 @@ store_register (int regno) ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to store general register."); + warning (_("Unable to store general register.")); return; } } @@ -514,7 +514,7 @@ store_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -528,7 +528,7 @@ store_regs (void) if (ret < 0) { - warning ("Unable to store general registers."); + warning (_("Unable to store general registers.")); return; } } @@ -691,7 +691,7 @@ get_linux_version (unsigned int *vmajor, if (-1 == uname (&info)) { - warning ("Unable to determine GNU/Linux version."); + warning (_("Unable to determine GNU/Linux version.")); return -1; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-tdep.c gdb/gdb/arm-tdep.c --- gdb.orig/gdb/arm-tdep.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/arm-tdep.c 2004-12-14 23:54:25.000000000 +0100 @@ -1322,12 +1322,13 @@ arm_print_float_info (struct gdbarch *gd int type; type = (status >> 24) & 127; - printf ("%s FPU type %d\n", - (status & (1 << 31)) ? "Hardware" : "Software", - type); - fputs ("mask: ", stdout); + if (status & (1 << 31)) + printf (_("Hardware FPU type %d\n"), type); + else + printf (_("Software FPU type %d\n"), type); + fputs (_("mask: "), stdout); print_fpu_flags (status >> 16); - fputs ("flags: ", stdout); + fputs (_("flags: "), stdout); print_fpu_flags (status); } @@ -1384,7 +1385,7 @@ arm_register_sim_regno (int regnum) return SIM_ARM_FPS_REGNUM + reg; reg -= NUM_SREGS; - internal_error (__FILE__, __LINE__, "Bad REGNUM %d", regnum); + internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum); } /* NOTE: cagney/2001-08-20: Both convert_from_extended() and @@ -1549,7 +1550,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) read_memory_integer (sp + offset, 4); nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } else if ((inst1 & 0xf000) == 0xd000) /* conditional branch */ { @@ -1580,7 +1581,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } return nextpc; @@ -1620,7 +1621,7 @@ arm_get_next_pc (CORE_ADDR pc) if (bits (this_instr, 22, 25) == 0 && bits (this_instr, 4, 7) == 9) /* multiply */ - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* BX <reg>, BLX <reg> */ if (bits (this_instr, 4, 28) == 0x12fff1 @@ -1631,7 +1632,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); return nextpc; } @@ -1712,7 +1713,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1730,7 +1731,7 @@ arm_get_next_pc (CORE_ADDR pc) unsigned long base; if (bit (this_instr, 22)) - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* byte write to PC */ rn = bits (this_instr, 16, 19); @@ -1755,7 +1756,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1791,7 +1792,7 @@ arm_get_next_pc (CORE_ADDR pc) } nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1807,7 +1808,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1818,7 +1819,7 @@ arm_get_next_pc (CORE_ADDR pc) break; default: - fprintf_filtered (gdb_stderr, "Bad bit-field extraction\n"); + fprintf_filtered (gdb_stderr, _("Bad bit-field extraction\n")); return (pc); } } @@ -2012,7 +2013,7 @@ arm_extract_return_value (struct type *t default: internal_error (__FILE__, __LINE__, - "arm_extract_return_value: Floating point model not supported"); + _("arm_extract_return_value: Floating point model not supported")); break; } } @@ -2202,7 +2203,7 @@ arm_store_return_value (struct type *typ default: internal_error (__FILE__, __LINE__, - "arm_store_return_value: Floating point model not supported"); + _("arm_store_return_value: Floating point model not supported")); break; } } @@ -2329,7 +2330,8 @@ arm_skip_stub (CORE_ADDR pc) static void set_arm_command (char *args, int from_tty) { - printf_unfiltered ("\"set arm\" must be followed by an apporpriate subcommand.\n"); + printf_unfiltered (_("\"set arm\" must be followed by an apporpriate " + "subcommand.\n")); help_list (setarmcmdlist, "set arm ", all_commands, gdb_stdout); } @@ -2383,7 +2385,7 @@ set_fp_model_sfunc (char *args, int from } if (fp_model == ARM_FLOAT_LAST) - internal_error (__FILE__, __LINE__, "Invalid fp model accepted: %s.", + internal_error (__FILE__, __LINE__, _("Invalid fp model accepted: %s."), current_fp_model); if (gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) @@ -2398,7 +2400,7 @@ show_fp_model (char *args, int from_tty, if (arm_fp_model == ARM_FLOAT_AUTO && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) - printf_filtered (" - the default for the current ABI is \"%s\".\n", + printf_filtered (_(" - the default for the current ABI is \"%s\".\n"), fp_model_strings[tdep->fp_model]); } @@ -2561,8 +2563,8 @@ arm_elf_osabi_sniffer (bfd *abfd) default: internal_error (__FILE__, __LINE__, - "arm_elf_osabi_sniffer: Unknown ARM EABI " - "version 0x%x", eflags); + _("arm_elf_osabi_sniffer: Unknown ARM EABI " + "version 0x%x"), eflags); } } break; @@ -2667,7 +2669,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } /* On ARM targets char defaults to unsigned. */ @@ -2768,7 +2770,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } return gdbarch; @@ -2782,7 +2784,7 @@ arm_dump_tdep (struct gdbarch *current_g if (tdep == NULL) return; - fprintf_unfiltered (file, "arm_dump_tdep: Lowest pc = 0x%lx", + fprintf_unfiltered (file, _("arm_dump_tdep: Lowest pc = 0x%lx"), (unsigned long) tdep->lowest_pc); } @@ -2841,11 +2843,11 @@ _initialize_arm_tdep (void) /* Add root prefix command for all "set arm"/"show arm" commands. */ add_prefix_cmd ("arm", no_class, set_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &setarmcmdlist, "set arm ", 0, &setlist); add_prefix_cmd ("arm", no_class, show_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &showarmcmdlist, "show arm ", 0, &showlist); /* Sync the opcode insn printer with our register viewer. */ @@ -2853,8 +2855,8 @@ _initialize_arm_tdep (void) /* Begin creating the help text. */ stb = mem_fileopen (); - fprintf_unfiltered (stb, "Set the disassembly style.\n" - "The valid values are:\n"); + fprintf_unfiltered (stb, _("Set the disassembly style.\n" + "The valid values are:\n")); /* Initialize the array that will be passed to add_set_enum_cmd(). */ valid_disassembly_styles @@ -2879,7 +2881,7 @@ _initialize_arm_tdep (void) valid_disassembly_styles[num_disassembly_options] = NULL; /* Finish the creation of the help text. */ - fprintf_unfiltered (stb, "The default is \"std\"."); + fprintf_unfiltered (stb, _("The default is \"std\".")); helptext = ui_file_xstrdup (stb, &length); ui_file_delete (stb); @@ -2902,24 +2904,23 @@ _initialize_arm_tdep (void) set_cmd_sfunc (new_set, set_disassembly_style_sfunc); deprecated_add_show_from_set (new_set, &showarmcmdlist); - add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\ -Set usage of ARM 32-bit mode.", "\ -Show usage of ARM 32-bit mode.", "\ -When off, a 26-bit PC will be used.\n\ -When off, a 26-bit PC will be used.", "\ -Usage of ARM 32-bit mode is %s.", + add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, + _("Set usage of ARM 32-bit mode."), + _("Show usage of ARM 32-bit mode."), + _("When off, a 26-bit PC will be used."), + _("Usage of ARM 32-bit mode is %s."), NULL, NULL, &setarmcmdlist, &showarmcmdlist); /* Add a command to allow the user to force the FPU model. */ new_set = add_set_enum_cmd ("fpu", no_class, fp_model_strings, ¤t_fp_model, - "Set the floating point type.\n" - "auto - Determine the FP typefrom the OS-ABI.\n" - "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" - "fpa - FPA co-processor (GCC compiled).\n" - "softvfp - Software FP with pure-endian doubles.\n" - "vfp - VFP co-processor.", + _("Set the floating point type.\n" + "auto - Determine the FP typefrom the OS-ABI.\n" + "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" + "fpa - FPA co-processor (GCC compiled).\n" + "softvfp - Software FP with pure-endian doubles.\n" + "vfp - VFP co-processor."), &setarmcmdlist); set_cmd_sfunc (new_set, set_fp_model_sfunc); set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), @@ -2927,15 +2928,15 @@ Usage of ARM 32-bit mode is %s.", /* Add the deprecated "othernames" command. */ deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames, - "Switch to the next set of register names."), + _("Switch to the next set of register names.")), "set arm disassembly"); /* Debugging flag. */ - add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\ -Set ARM debugging.", "\ -Show ARM debugging.", "\ -When on, arm-specific debugging is enabled.", "\ -ARM debugging is %s.", + add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, + _("Set ARM debugging."), + _("Show ARM debugging."), + _("When on, arm-specific debugging is enabled."), + _("ARM debugging is %s."), NULL, NULL, &setdebuglist, &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-nat.c gdb/gdb/armnbsd-nat.c --- gdb.orig/gdb/armnbsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/armnbsd-nat.c 2004-12-14 23:54:25.000000000 +0100 @@ -88,7 +88,7 @@ fetch_register (int regno) if (ret < 0) { - warning ("unable to fetch general register"); + warning (_("unable to fetch general register")); return; } @@ -139,7 +139,7 @@ fetch_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -157,7 +157,7 @@ fetch_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point register"); + warning (_("unable to fetch floating-point register")); return; } @@ -187,7 +187,7 @@ fetch_fp_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -223,7 +223,7 @@ store_register (int regno) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -284,7 +284,7 @@ store_register (int regno) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -331,7 +331,7 @@ store_regs (void) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to store general registers"); + warning (_("unable to store general registers")); } static void @@ -345,7 +345,7 @@ store_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point registers"); + warning (_("unable to fetch floating-point registers")); return; } @@ -366,7 +366,7 @@ store_fp_register (int regno) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -388,7 +388,7 @@ store_fp_regs (void) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to store floating-point registers"); + warning (_("unable to store floating-point registers")); } void @@ -437,7 +437,7 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != sizeof (struct reg)) - warning ("wrong size of register set in core file"); + warning (_("wrong size of register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure @@ -449,7 +449,7 @@ fetch_elfcore_registers (char *core_reg_ case 2: if (core_reg_size != sizeof (struct fpreg)) - warning ("wrong size of FPA register set in core file"); + warning (_("wrong size of FPA register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-tdep.c gdb/gdb/armnbsd-tdep.c --- gdb.orig/gdb/armnbsd-tdep.c 2004-10-31 21:36:34.000000000 +0100 +++ gdb/gdb/armnbsd-tdep.c 2004-12-14 23:54:25.000000000 +0100 @@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbar default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } tdep->jb_pc = ARM_NBSD_JB_PC; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/auxv.c gdb/gdb/auxv.c --- gdb.orig/gdb/auxv.c 2004-02-24 02:00:30.000000000 +0100 +++ gdb/gdb/auxv.c 2004-12-15 00:25:03.000000000 +0100 @@ -202,50 +202,50 @@ fprint_target_auxv (struct ui_file *file { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break - TAG (AT_NULL, "End of vector", hex); - TAG (AT_IGNORE, "Entry should be ignored", hex); - TAG (AT_EXECFD, "File descriptor of program", dec); - TAG (AT_PHDR, "Program headers for program", hex); - TAG (AT_PHENT, "Size of program header entry", dec); - TAG (AT_PHNUM, "Number of program headers", dec); - TAG (AT_PAGESZ, "System page size", dec); - TAG (AT_BASE, "Base address of interpreter", hex); - TAG (AT_FLAGS, "Flags", hex); - TAG (AT_ENTRY, "Entry point of program", hex); - TAG (AT_NOTELF, "Program is not ELF", dec); - TAG (AT_UID, "Real user ID", dec); - TAG (AT_EUID, "Effective user ID", dec); - TAG (AT_GID, "Real group ID", dec); - TAG (AT_EGID, "Effective group ID", dec); - TAG (AT_CLKTCK, "Frequency of times()", dec); - TAG (AT_PLATFORM, "String identifying platform", str); - TAG (AT_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_FPUCW, "Used FPU control word", dec); - TAG (AT_DCACHEBSIZE, "Data cache block size", dec); - TAG (AT_ICACHEBSIZE, "Instruction cache block size", dec); - TAG (AT_UCACHEBSIZE, "Unified cache block size", dec); - TAG (AT_IGNOREPPC, "Entry should be ignored", dec); - TAG (AT_SYSINFO, "Special system info/entry points", hex); - TAG (AT_SYSINFO_EHDR, "System-supplied DSO's ELF header", hex); - TAG (AT_SECURE, "Boolean, was exec setuid-like?", dec); - TAG (AT_SUN_UID, "Effective user ID", dec); - TAG (AT_SUN_RUID, "Real user ID", dec); - TAG (AT_SUN_GID, "Effective group ID", dec); - TAG (AT_SUN_RGID, "Real group ID", dec); - TAG (AT_SUN_LDELF, "Dynamic linker's ELF header", hex); - TAG (AT_SUN_LDSHDR, "Dynamic linker's section headers", hex); - TAG (AT_SUN_LDNAME, "String giving name of dynamic linker", str); - TAG (AT_SUN_LPAGESZ, "Large pagesize", dec); - TAG (AT_SUN_PLATFORM, "Platform name string", str); - TAG (AT_SUN_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_SUN_IFLUSH, "Should flush icache?", dec); - TAG (AT_SUN_CPU, "CPU name string", str); - TAG (AT_SUN_EMUL_ENTRY, "COFF entry point address", hex); - TAG (AT_SUN_EMUL_EXECFD, "COFF executable file descriptor", dec); + TAG (AT_NULL, _("End of vector"), hex); + TAG (AT_IGNORE, _("Entry should be ignored"), hex); + TAG (AT_EXECFD, _("File descriptor of program"), dec); + TAG (AT_PHDR, _("Program headers for program"), hex); + TAG (AT_PHENT, _("Size of program header entry"), dec); + TAG (AT_PHNUM, _("Number of program headers"), dec); + TAG (AT_PAGESZ, _("System page size"), dec); + TAG (AT_BASE, _("Base address of interpreter"), hex); + TAG (AT_FLAGS, _("Flags"), hex); + TAG (AT_ENTRY, _("Entry point of program"), hex); + TAG (AT_NOTELF, _("Program is not ELF"), dec); + TAG (AT_UID, _("Real user ID"), dec); + TAG (AT_EUID, _("Effective user ID"), dec); + TAG (AT_GID, _("Real group ID"), dec); + TAG (AT_EGID, _("Effective group ID"), dec); + TAG (AT_CLKTCK, _("Frequency of times()"), dec); + TAG (AT_PLATFORM, _("String identifying platform"), str); + TAG (AT_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_FPUCW, _("Used FPU control word"), dec); + TAG (AT_DCACHEBSIZE, _("Data cache block size"), dec); + TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec); + TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec); + TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec); + TAG (AT_SYSINFO, _("Special system info/entry points"), hex); + TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex); + TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec); + TAG (AT_SUN_UID, _("Effective user ID"), dec); + TAG (AT_SUN_RUID, _("Real user ID"), dec); + TAG (AT_SUN_GID, _("Effective group ID"), dec); + TAG (AT_SUN_RGID, _("Real group ID"), dec); + TAG (AT_SUN_LDELF, _("Dynamic linker's ELF header"), hex); + TAG (AT_SUN_LDSHDR, _("Dynamic linker's section headers"), hex); + TAG (AT_SUN_LDNAME, _("String giving name of dynamic linker"), str); + TAG (AT_SUN_LPAGESZ, _("Large pagesize"), dec); + TAG (AT_SUN_PLATFORM, _("Platform name string"), str); + TAG (AT_SUN_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_SUN_IFLUSH, _("Should flush icache?"), dec); + TAG (AT_SUN_CPU, _("CPU name string"), str); + TAG (AT_SUN_EMUL_ENTRY, _("COFF entry point address"), hex); + TAG (AT_SUN_EMUL_EXECFD, _("COFF executable file descriptor"), dec); TAG (AT_SUN_EXECNAME, - "Canonicalized file name given to execve", str); - TAG (AT_SUN_MMU, "String for name of MMU module", str); - TAG (AT_SUN_LDDATA, "Dynamic linker's data segment address", hex); + _("Canonicalized file name given to execve"), str); + TAG (AT_SUN_MMU, _("String for name of MMU module"), str); + TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex); } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -277,14 +277,14 @@ static void info_auxv_command (char *cmd, int from_tty) { if (! target_has_stack) - error ("The program has no auxiliary information now."); + error (_("The program has no auxiliary information now.")); else { int ents = fprint_target_auxv (gdb_stdout, ¤t_target); if (ents < 0) - error ("No auxiliary vector found, or failed reading it."); + error (_("No auxiliary vector found, or failed reading it.")); else if (ents == 0) - error ("Auxiliary vector is empty."); + error (_("Auxiliary vector is empty.")); } } @@ -295,6 +295,6 @@ void _initialize_auxv (void) { add_info ("auxv", info_auxv_command, - "Display the inferior's auxiliary vector.\n\ -This is information provided by the operating system at program startup."); + _("Display the inferior's auxiliary vector.\n\ +This is information provided by the operating system at program startup.")); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/avr-tdep.c gdb/gdb/avr-tdep.c --- gdb.orig/gdb/avr-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/avr-tdep.c 2004-12-14 23:54:25.000000000 +0100 @@ -588,7 +588,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (num_pushes > AVR_MAX_PUSHES) { - fprintf_unfiltered (gdb_stderr, "Num pushes too large: %d\n", + fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), num_pushes); num_pushes = 0; } @@ -667,7 +667,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (vpc >= AVR_MAX_PROLOGUE_SIZE) fprintf_unfiltered (gdb_stderr, - "Hit end of prologue while scanning pushes\n"); + _("Hit end of prologue while scanning pushes\n")); /* Second stage of the prologue scanning. Scan: @@ -1337,8 +1337,8 @@ avr_io_reg_read_command (char *args, int if (bufsiz < 0) { fprintf_unfiltered (gdb_stderr, - "ERR: info io_registers NOT supported by current " - "target\n"); + _("ERR: info io_registers NOT supported " + "by current target\n")); return; } if (bufsiz > sizeof (buf)) @@ -1352,20 +1352,20 @@ avr_io_reg_read_command (char *args, int if (strncmp (buf, "", bufsiz) == 0) { fprintf_unfiltered (gdb_stderr, - "info io_registers NOT supported by target\n"); + _("info io_registers NOT supported by target\n")); return; } if (sscanf (buf, "%x", &nreg) != 1) { fprintf_unfiltered (gdb_stderr, - "Error fetching number of io registers\n"); + _("Error fetching number of io registers\n")); return; } reinitialize_more_filter (); - printf_unfiltered ("Target has %u io registers:\n\n", nreg); + printf_unfiltered (_("Target has %u io registers:\n\n"), nreg); /* only fetch up to 8 registers at a time to keep the buffer small */ step = 8; @@ -1412,5 +1412,5 @@ _initialize_avr_tdep (void) io_registers' to signify it is not available on other platforms. */ add_cmd ("io_registers", class_info, avr_io_reg_read_command, - "query remote avr target for io space register values", &infolist); + _("query remote avr target for io space register values"), &infolist); } ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-15 0:50 ` Baurjan Ismagulov @ 2004-12-15 21:48 ` Eli Zaretskii 0 siblings, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-15 21:48 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches > Date: Wed, 15 Dec 2004 01:07:45 +0100 > From: Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> > > here's the new version. I've addressed two issues: > > * Providing context. > > I've followed the advice from Andreas Schwab and provided examples of > the whole phrases as they are printed by gdb. In this way, the code is > readable, and the message file has even more context than is provided > by the translated string itself. I've done this only for permutations; > obvious cases like "big endian" / "little endian" have been rewritten. > The relevant excerpt from the output of "xgettext -o a.po -k_ > --add-comments=i18n *.c" is attached. Thanks. This version is okay with me, provided that we record somewhere that when the flag day comes, xgettext will be invoked henceforth with the --add-comments=i18n switch. I'm unsure where to put that info. Andrew? > if (arm_fp_model == ARM_FLOAT_AUTO > && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) > - printf_filtered (" - the default for the current ABI is \"%s\".\n", > + printf_filtered (_(" - the default for the current ABI is \"%s\".\n"), > fp_model_strings[tdep->fp_model]); This lacks the leading context, which makes it unclear what default is this string about. Can we either rewrite the printf to include the context, or resolve it with a i18n comment? ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 20:06 i18n, part 2 Baurjan Ismagulov 2004-12-04 21:52 ` Daniel Jacobowitz @ 2004-12-06 18:53 ` Kevin Buettner 2004-12-06 20:59 ` Eli Zaretskii 2004-12-12 18:35 ` Andrew Cagney 2005-01-05 15:48 ` Andrew Cagney 3 siblings, 1 reply; 29+ messages in thread From: Kevin Buettner @ 2004-12-06 18:53 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches On Sat, 4 Dec 2004 20:57:02 +0100 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> wrote: > * aix-thread.c:aix_thread_extra_thread_info() > > "tid %d, %s" doesn't add much context to ", suspended". Besides, > splitting the execution flow with if (tid != PTHDB_INVALID_TID) would > not be identical to the current code. That is why I left the code as > is. Seems reasonable. The string for the %s in the above is supplied by state2str(). I didn't see a patch for annotating the strings in this function. Is this planned for a later phase? Kevin ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-06 18:53 ` Kevin Buettner @ 2004-12-06 20:59 ` Eli Zaretskii 2004-12-06 23:04 ` Kevin Buettner 0 siblings, 1 reply; 29+ messages in thread From: Eli Zaretskii @ 2004-12-06 20:59 UTC (permalink / raw) To: Kevin Buettner; +Cc: ibr, gdb-patches > Date: Mon, 6 Dec 2004 10:39:30 -0700 > From: Kevin Buettner <kevinb@redhat.com> > Cc: gdb-patches@sources.redhat.com > > On Sat, 4 Dec 2004 20:57:02 +0100 > Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> wrote: > > > * aix-thread.c:aix_thread_extra_thread_info() > > > > "tid %d, %s" doesn't add much context to ", suspended". Besides, > > splitting the execution flow with if (tid != PTHDB_INVALID_TID) would > > not be identical to the current code. That is why I left the code as > > is. > > Seems reasonable. Excuse me, but in what language is this ``reasonable''? In any language where ``suspended'' needs to be modified according to the gender (masculine, feminine, etc.) of the corresponding noun, the translator will have no hope of getting the translation right without reading the code and understanding what it does. So much for ``reasonable''. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-06 20:59 ` Eli Zaretskii @ 2004-12-06 23:04 ` Kevin Buettner 2004-12-07 5:08 ` Eli Zaretskii 0 siblings, 1 reply; 29+ messages in thread From: Kevin Buettner @ 2004-12-06 23:04 UTC (permalink / raw) To: gdb-patches On Mon, 06 Dec 2004 22:52:06 +0200 "Eli Zaretskii" <eliz@gnu.org> wrote: > > Date: Mon, 6 Dec 2004 10:39:30 -0700 > > From: Kevin Buettner <kevinb@redhat.com> > > Cc: gdb-patches@sources.redhat.com > > > > On Sat, 4 Dec 2004 20:57:02 +0100 > > Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> wrote: > > > > > * aix-thread.c:aix_thread_extra_thread_info() > > > > > > "tid %d, %s" doesn't add much context to ", suspended". Besides, > > > splitting the execution flow with if (tid != PTHDB_INVALID_TID) would > > > not be identical to the current code. That is why I left the code as > > > is. > > > > Seems reasonable. > > Excuse me, but in what language is this ``reasonable''? In any > language where ``suspended'' needs to be modified according to the > gender (masculine, feminine, etc.) of the corresponding noun, the > translator will have no hope of getting the translation right without > reading the code and understanding what it does. So much for > ``reasonable''. The code in question is simply outputting a list of attributes associated with a particular thread. How should we make the necessary context available to the translator without putting an undue burden on GDB maintainers? What do other projects do in this regard? Kevin ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-06 23:04 ` Kevin Buettner @ 2004-12-07 5:08 ` Eli Zaretskii 2004-12-07 5:10 ` Daniel Jacobowitz ` (2 more replies) 0 siblings, 3 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-07 5:08 UTC (permalink / raw) To: Kevin Buettner; +Cc: gdb-patches > Date: Mon, 6 Dec 2004 15:51:14 -0700 > From: Kevin Buettner <kevinb@redhat.com> > > The code in question is simply outputting a list of attributes > associated with a particular thread. How should we make the necessary > context available to the translator without putting an undue burden > on GDB maintainers? I suggested a way to do that. I don't think it's putting an undue burden on us, but if someone comes with a better idea, I will gladly vote in favor. Just let's not assume the problem does not exist. > What do other projects do in this regard? I don't have any statistics handy; the general request from translators is to give as much context as possible, as close to full phrases or sentences as possible. I find myself in the need to read the sources while translating much more than I would like to, so I guess the maintainers don't do a very good job at that. I'd like GDB to be better. If we want more opinions and suggestions, we could take this to the TP mailing list. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 5:08 ` Eli Zaretskii @ 2004-12-07 5:10 ` Daniel Jacobowitz 2004-12-07 17:28 ` Kevin Buettner 2004-12-07 22:02 ` Eli Zaretskii 2 siblings, 0 replies; 29+ messages in thread From: Daniel Jacobowitz @ 2004-12-07 5:10 UTC (permalink / raw) To: Eli Zaretskii; +Cc: Kevin Buettner, gdb-patches On Tue, Dec 07, 2004 at 07:00:10AM +0200, Eli Zaretskii wrote: > > Date: Mon, 6 Dec 2004 15:51:14 -0700 > > From: Kevin Buettner <kevinb@redhat.com> > > > > The code in question is simply outputting a list of attributes > > associated with a particular thread. How should we make the necessary > > context available to the translator without putting an undue burden > > on GDB maintainers? > > I suggested a way to do that. I don't think it's putting an undue > burden on us, but if someone comes with a better idea, I will gladly > vote in favor. Just let's not assume the problem does not exist. I do think it's an undue burden, as I said earlier. While the eight existing strings in that function aren't too bad: (A) what happens if someone needs to add another option? (B) I would like to have a standard answer to this question for GDB. For instance, infttrace.c:print_thread would need 128 (plus a dubious %s). I hope we agree that's too many. Of course, that seems to be a GDB-internal debugging aid; I wouldn't shed tears if it was never translated. > > What do other projects do in this regard? > > I don't have any statistics handy; the general request from > translators is to give as much context as possible, as close to full > phrases or sentences as possible. I find myself in the need to read > the sources while translating much more than I would like to, so I > guess the maintainers don't do a very good job at that. I'd like GDB > to be better. > > If we want more opinions and suggestions, we could take this to the TP > mailing list. I'm just concerned about the "as possible". It may be possible, but it isn't practical. No, I don't have a suggestion to offer you; I don't know enough about translation issues, but I do see that this change would create a code maintenance issue. -- Daniel Jacobowitz ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 5:08 ` Eli Zaretskii 2004-12-07 5:10 ` Daniel Jacobowitz @ 2004-12-07 17:28 ` Kevin Buettner 2004-12-07 19:59 ` Eli Zaretskii 2004-12-12 18:23 ` Andrew Cagney 2004-12-07 22:02 ` Eli Zaretskii 2 siblings, 2 replies; 29+ messages in thread From: Kevin Buettner @ 2004-12-07 17:28 UTC (permalink / raw) To: Eli Zaretskii; +Cc: gdb-patches On Tue, 07 Dec 2004 07:00:10 +0200 "Eli Zaretskii" <eliz@gnu.org> wrote: > > Date: Mon, 6 Dec 2004 15:51:14 -0700 > > From: Kevin Buettner <kevinb@redhat.com> > > > > The code in question is simply outputting a list of attributes > > associated with a particular thread. How should we make the necessary > > context available to the translator without putting an undue burden > > on GDB maintainers? > > I suggested a way to do that. I don't think it's putting an undue > burden on us, but if someone comes with a better idea, I will gladly > vote in favor. Just let's not assume the problem does not exist. Could we use an alternate macro for such cases? This alternate macro would take two arguments, one of which is the string to be translated, the other. The other is simply a comment providing context for the translators. Perhaps something like this? #define __(str,context_comment) _(str) Then, for "suspended" and other such attributes, we could put something like this in the code: __("suspended", "thread-id attribute") The nice thing about this is that the comment string can contain anything; if a translator finds that not enough information is contained in the string, they can provides suggestions to us to make it more useful. Kevin ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 17:28 ` Kevin Buettner @ 2004-12-07 19:59 ` Eli Zaretskii 2004-12-07 20:28 ` Andreas Schwab 2004-12-12 18:23 ` Andrew Cagney 1 sibling, 1 reply; 29+ messages in thread From: Eli Zaretskii @ 2004-12-07 19:59 UTC (permalink / raw) To: Kevin Buettner; +Cc: gdb-patches > Date: Tue, 7 Dec 2004 09:52:17 -0700 > From: Kevin Buettner <kevinb@redhat.com> > Cc: gdb-patches@sources.redhat.com > > Could we use an alternate macro for such cases? This alternate macro > would take two arguments, one of which is the string to be translated, > the other. The other is simply a comment providing context for the > translators. Perhaps something like this? > > #define __(str,context_comment) _(str) I think this would require support in gettext; I don't know enough about gettext facilities to tell if this is possible. Anyway, if we want a comment-like solution, we could try doing something to force gettext insert a comment into the gdb.pot file. Again, I don't know if this is easy, but I'd assume it should be possible. I'll look when I have time. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 19:59 ` Eli Zaretskii @ 2004-12-07 20:28 ` Andreas Schwab 2004-12-12 19:50 ` Andrew Cagney 0 siblings, 1 reply; 29+ messages in thread From: Andreas Schwab @ 2004-12-07 20:28 UTC (permalink / raw) To: Eli Zaretskii; +Cc: Kevin Buettner, gdb-patches "Eli Zaretskii" <eliz@gnu.org> writes: > Anyway, if we want a comment-like solution, we could try doing > something to force gettext insert a comment into the gdb.pot file. This happens automatically with --add-comments. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, MaxfeldstraÃe 5, 90409 Nürnberg, Germany Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 20:28 ` Andreas Schwab @ 2004-12-12 19:50 ` Andrew Cagney 2004-12-12 22:08 ` Eli Zaretskii 0 siblings, 1 reply; 29+ messages in thread From: Andrew Cagney @ 2004-12-12 19:50 UTC (permalink / raw) To: Andreas Schwab; +Cc: Eli Zaretskii, Kevin Buettner, gdb-patches Andreas Schwab wrote: > "Eli Zaretskii" <eliz@gnu.org> writes: > > >>Anyway, if we want a comment-like solution, we could try doing >>something to force gettext insert a comment into the gdb.pot file. > > > This happens automatically with --add-comments. and is already used when generating the gdb.pot file. Sounds like we just need to make better use of that feature. Andrew ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-12 19:50 ` Andrew Cagney @ 2004-12-12 22:08 ` Eli Zaretskii 0 siblings, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-12 22:08 UTC (permalink / raw) To: Andrew Cagney; +Cc: schwab, kevinb, gdb-patches > Date: Sun, 12 Dec 2004 13:39:49 -0500 > From: Andrew Cagney <cagney@gnu.org> > Cc: Eli Zaretskii <eliz@gnu.org>, Kevin Buettner <kevinb@redhat.com>, > gdb-patches@sources.redhat.com > > > This happens automatically with --add-comments. > > and is already used when generating the gdb.pot file. Sounds like we > just need to make better use of that feature. Unless there's a better alternative, which I'm still looking for. Please be patient. Btw, even if we decide to use --add-comments, we still need to add the comments that explain the context for these one-word messages. So the patch will need tio be revised anyhow. (I guess I'm nervous to see this patch committed some day without waiting for this discussion to come to a consensus ;-) ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 17:28 ` Kevin Buettner 2004-12-07 19:59 ` Eli Zaretskii @ 2004-12-12 18:23 ` Andrew Cagney 2004-12-12 21:49 ` Eli Zaretskii 1 sibling, 1 reply; 29+ messages in thread From: Andrew Cagney @ 2004-12-12 18:23 UTC (permalink / raw) To: Kevin Buettner; +Cc: Eli Zaretskii, gdb-patches Kevin Buettner wrote: > On Tue, 07 Dec 2004 07:00:10 +0200 > "Eli Zaretskii" <eliz@gnu.org> wrote: > > >>>Date: Mon, 6 Dec 2004 15:51:14 -0700 >>>From: Kevin Buettner <kevinb@redhat.com> >>> >>>The code in question is simply outputting a list of attributes >>>associated with a particular thread. How should we make the necessary >>>context available to the translator without putting an undue burden >>>on GDB maintainers? >> >>I suggested a way to do that. I don't think it's putting an undue >>burden on us, but if someone comes with a better idea, I will gladly >>vote in favor. Just let's not assume the problem does not exist. > > > Could we use an alternate macro for such cases? This alternate macro > would take two arguments, one of which is the string to be translated, > the other. The other is simply a comment providing context for the > translators. Perhaps something like this? > > #define __(str,context_comment) _(str) > > Then, for "suspended" and other such attributes, we could put something > like this in the code: > > __("suspended", "thread-id attribute") > > The nice thing about this is that the comment string can contain anything; > if a translator finds that not enough information is contained in the string, > they can provides suggestions to us to make it more useful. When I first asked about i18n on the ``help'' list, it was made very clear to me that not just the pot file, but the entire source code should be made available. That way the translators could more easily refer to the source code examine any text's original context. Andrew ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-12 18:23 ` Andrew Cagney @ 2004-12-12 21:49 ` Eli Zaretskii 0 siblings, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-12 21:49 UTC (permalink / raw) To: Andrew Cagney; +Cc: kevinb, gdb-patches > Date: Sun, 12 Dec 2004 13:20:11 -0500 > From: Andrew Cagney <cagney@gnu.org> > Cc: Eli Zaretskii <eliz@gnu.org>, gdb-patches@sources.redhat.com > > When I first asked about i18n on the ``help'' list, it was made very > clear to me that not just the pot file, but the entire source code > should be made available. > > That way the translators could more easily refer to the source code > examine any text's original context. It's fine to make the sources available, but we cannot assume that translators know C (or any programming language, for that matter). Even if they do know C, they might know nothing about the subject matter, such as threads, and thus will be unable to understand what the code does. Such talents are not requested from them, while other talents, which are utterly irrelevant for a programmer, are. That is why we should try to come up with message string catalog that allows to produce decent translations without reading the code. I'm still waiting for TP people to respond to my questions. If they don't reply in a few more days, I will try alternative addresses. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-07 5:08 ` Eli Zaretskii 2004-12-07 5:10 ` Daniel Jacobowitz 2004-12-07 17:28 ` Kevin Buettner @ 2004-12-07 22:02 ` Eli Zaretskii 2 siblings, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-07 22:02 UTC (permalink / raw) To: kevinb, gdb-patches > Date: Tue, 07 Dec 2004 07:00:10 +0200 > From: "Eli Zaretskii" <eliz@gnu.org> > CC: gdb-patches@sources.redhat.com > > If we want more opinions and suggestions, we could take this to the TP > mailing list. I posted a question there, asking for advice. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 20:06 i18n, part 2 Baurjan Ismagulov 2004-12-04 21:52 ` Daniel Jacobowitz 2004-12-06 18:53 ` Kevin Buettner @ 2004-12-12 18:35 ` Andrew Cagney 2004-12-26 4:46 ` Baurjan Ismagulov 2005-01-05 15:48 ` Andrew Cagney 3 siblings, 1 reply; 29+ messages in thread From: Andrew Cagney @ 2004-12-12 18:35 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches Baurjan Ismagulov wrote: > /* Add a command to allow the user to force the FPU model. */ > new_set = add_set_enum_cmd > ("fpu", no_class, fp_model_strings, ¤t_fp_model, > - "Set the floating point type.\n" > - "auto - Determine the FP typefrom the OS-ABI.\n" > - "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" > - "fpa - FPA co-processor (GCC compiled).\n" > - "softvfp - Software FP with pure-endian doubles.\n" > - "vfp - VFP co-processor.", > + _("Set the floating point type.\n\ > +auto - Determine the FP typefrom the OS-ABI.\n\ > +softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n\ > +fpa - FPA co-processor (GCC compiled).\n\ > +softvfp - Software FP with pure-endian doubles.\n\ > +vfp - VFP co-processor."), > &setarmcmdlist); > set_cmd_sfunc (new_set, set_fp_model_sfunc); > set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), You might want to consider focusing on these set/show commands, and across all files. They need to be switched to the add_setshow_..._cmd form vis: > /* Debugging flag. */ > - add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\ > -Set ARM debugging.", "\ > -Show ARM debugging.", "\ > -When on, arm-specific debugging is enabled.", "\ > -ARM debugging is %s.", > + add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, > + _("Set ARM debugging."), > + _("Show ARM debugging."), > + _("When on, arm-specific debugging is enabled."), > + _("ARM debugging is %s."), > NULL, NULL, > &setdebuglist, &showdebuglist); > } as the former involves deprecated_add_show_from_set and what that does under the hood is very i18n-unfriendly. The current add_setshow_.._cmd implementation also has problems (it doesn't yet use the SHOW string) but at least all strings are present and correct. Andrew PS: Also recall my suggestion for adding something like _XXX or _FIXME as a way to mark that a string needs to be fixed on a second pass. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-12 18:35 ` Andrew Cagney @ 2004-12-26 4:46 ` Baurjan Ismagulov 2004-12-26 23:25 ` Eli Zaretskii 0 siblings, 1 reply; 29+ messages in thread From: Baurjan Ismagulov @ 2004-12-26 4:46 UTC (permalink / raw) To: gdb-patches [-- Attachment #1: Type: text/plain, Size: 1392 bytes --] Hello, here is the new version. On Sun, Dec 12, 2004 at 01:31:39PM -0500, Andrew Cagney wrote: > You might want to consider focusing on these set/show commands, and > across all files. They need to be switched to the add_setshow_..._cmd > form vis: Done for the files modified by this and the previous patches. > PS: Also recall my suggestion for adding something like _XXX or _FIXME > as a way to mark that a string needs to be fixed on a second pass. I had been trying to do so. I forgot to mention that I marked up the state2str function that Mark Kettenis had asked about. Do you see any concrete places where I haven't done that? With kind regards, Baurjan. 2004-12-26 Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> * ada-valprint.c, aix-thread.c, alpha-nat.c, alphabsd-nat.c, alphanbsd-tdep.c, amd64-linux-nat.c, amd64-tdep.c, amd64bsd-nat.c, amd64fbsd-nat.c, arch-utils.c, arm-linux-nat.c, arm-tdep.c, armnbsd-nat.c, armnbsd-tdep.c, auxv.c, avr-tdep.c: i18n markup. * aix-thread.c (_initialize_aix_thread): Get rid of the deprecated_add_show_from_set call. * alpha-tdep.c (_initialize_alpha_tdep): Ditto. * arm-tdep.c (_initialize_arm_tdep): Ditto. * command.h (add_setshow_enum_cmd): Add arguments for returning new list elements. * cli/cli-decode.c (add_setshow_enum_cmd): Ditto. * mips-tdep.c (_initialize_mips_tdep): Modify calls to add_setshow_enum_cmd. [-- Attachment #2: gdb-ibr-intl_02-20041226-0237.diff --] [-- Type: text/plain, Size: 58970 bytes --] diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/ada-valprint.c gdb/gdb/ada-valprint.c --- gdb.orig/gdb/ada-valprint.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/ada-valprint.c 2004-12-25 14:04:15.000000000 +0100 @@ -206,7 +206,7 @@ val_print_packed_array_elements (struct val_print (elttype, VALUE_CONTENTS (v0), 0, 0, stream, format, 0, recurse + 1, pretty); annotate_elt_rep (i - i0); - fprintf_filtered (stream, " <repeats %u times>", i - i0); + fprintf_filtered (stream, _(" <repeats %u times>"), i - i0); annotate_elt_rep_end (); } @@ -421,11 +421,11 @@ ada_print_scalar (struct type *type, LON case TYPE_CODE_MEMBER: case TYPE_CODE_METHOD: case TYPE_CODE_REF: - warning ("internal error: unhandled type in ada_print_scalar"); + warning (_("internal error: unhandled type in ada_print_scalar")); break; default: - error ("Invalid type code in symbol table."); + error (_("Invalid type code in symbol table.")); } gdb_flush (stream); } @@ -492,7 +492,7 @@ printstr (struct ui_file *stream, char * ada_emit_char (char_at (string, i, type_len), stream, '\'', type_len); fputs_filtered ("'", stream); - fprintf_filtered (stream, " <repeats %u times>", reps); + fprintf_filtered (stream, _(" <repeats %u times>"), reps); i = rep1 - 1; things_printed += repeat_count_threshold; need_comma = 1; @@ -1068,7 +1068,7 @@ print_field_values (struct type *type, c if (TYPE_CPLUS_SPECIFIC (type) != NULL && TYPE_FIELD_IGNORE (type, i)) { - fputs_filtered ("<optimized out or zero length>", stream); + fputs_filtered (_("<optimized out or zero length>"), stream); } else { diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/aix-thread.c gdb/gdb/aix-thread.c --- gdb.orig/gdb/aix-thread.c 2004-10-08 22:29:45.000000000 +0200 +++ gdb/gdb/aix-thread.c 2004-12-26 02:04:08.000000000 +0100 @@ -240,7 +240,7 @@ ptrace_check (int req, int id, int ret) } break; } - error ("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)", + error (_("aix-thread: ptrace (%d, %d) returned %d (errno = %d %s)"), req, id, ret, errno, safe_strerror (errno)); return 0; /* Not reached. */ } @@ -550,12 +550,24 @@ state2str (pthdb_state_t state) { switch (state) { - case PST_IDLE: return "idle"; /* being created */ - case PST_RUN: return "running"; /* running */ - case PST_SLEEP: return "sleeping"; /* awaiting an event */ - case PST_READY: return "ready"; /* runnable */ - case PST_TERM: return "finished"; /* awaiting a join/detach */ - default: return "unknown"; + case PST_IDLE: + /* i18n: Like "Thread-Id %d, [state] idle" */ + return _("idle"); /* being created */ + case PST_RUN: + /* i18n: Like "Thread-Id %d, [state] running" */ + return _("running"); /* running */ + case PST_SLEEP: + /* i18n: Like "Thread-Id %d, [state] sleeping" */ + return _("sleeping"); /* awaiting an event */ + case PST_READY: + /* i18n: Like "Thread-Id %d, [state] ready" */ + return _("ready"); /* runnable */ + case PST_TERM: + /* i18n: Like "Thread-Id %d, [state] finished" */ + return _("finished"); /* awaiting a join/detach */ + default: + /* i18n: Like "Thread-Id %d, [state] unknown" */ + return _("unknown"); } } @@ -970,12 +982,12 @@ aix_thread_resume (ptid_t ptid, int step { thread = find_thread_pid (ptid); if (!thread) - error ("aix-thread resume: unknown pthread %ld", + error (_("aix-thread resume: unknown pthread %ld"), TIDGET (ptid)); tid[0] = thread->private->tid; if (tid[0] == PTHDB_INVALID_TID) - error ("aix-thread resume: no tid for pthread %ld", + error (_("aix-thread resume: no tid for pthread %ld"), TIDGET (ptid)); tid[1] = 0; @@ -1131,7 +1143,7 @@ fetch_regs_user_thread (pthdb_pthread_t "fetch_regs_user_thread %lx\n", (long) pdtid); status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: fetch_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: fetch_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* General-purpose registers. */ @@ -1412,7 +1424,7 @@ store_regs_user_thread (pthdb_pthread_t values. */ status = pthdb_pthread_context (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_context returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_context returned %s"), pd_status2str (status)); /* Collect general-purpose register values from the regcache. */ @@ -1473,7 +1485,7 @@ store_regs_user_thread (pthdb_pthread_t status = pthdb_pthread_setcontext (pd_session, pdtid, &ctx); if (status != PTHDB_SUCCESS) - error ("aix-thread: store_registers: pthdb_pthread_setcontext returned %s", + error (_("aix-thread: store_registers: pthdb_pthread_setcontext returned %s"), pd_status2str (status)); } @@ -1660,7 +1672,7 @@ aix_thread_pid_to_str (ptid_t ptid) xstrprintf(). */ xfree (ret); - ret = xstrprintf ("Thread %ld", ptid_get_tid (ptid)); + ret = xstrprintf (_("Thread %ld"), ptid_get_tid (ptid)); return ret; } @@ -1690,7 +1702,8 @@ aix_thread_extra_thread_info (struct thr tid = thread->private->tid; if (tid != PTHDB_INVALID_TID) - fprintf_unfiltered (buf, "tid %d", tid); + /* i18n: Like "thread-identifier %d, [state] running, suspended" */ + fprintf_unfiltered (buf, _("tid %d"), tid); status = pthdb_pthread_state (pd_session, pdtid, &state); if (status != PTHDB_SUCCESS) @@ -1700,16 +1713,19 @@ aix_thread_extra_thread_info (struct thr status = pthdb_pthread_suspendstate (pd_session, pdtid, &suspendstate); if (status == PTHDB_SUCCESS && suspendstate == PSS_SUSPENDED) - fprintf_unfiltered (buf, ", suspended"); + /* i18n: Like "Thread-Id %d, [state] running, suspended" */ + fprintf_unfiltered (buf, _(", suspended")); status = pthdb_pthread_detachstate (pd_session, pdtid, &detachstate); if (status == PTHDB_SUCCESS && detachstate == PDS_DETACHED) - fprintf_unfiltered (buf, ", detached"); + /* i18n: Like "Thread-Id %d, [state] running, detached" */ + fprintf_unfiltered (buf, _(", detached")); pthdb_pthread_cancelpend (pd_session, pdtid, &cancelpend); if (status == PTHDB_SUCCESS && cancelpend) - fprintf_unfiltered (buf, ", cancel pending"); + /* i18n: Like "Thread-Id %d, [state] running, cancel pending" */ + fprintf_unfiltered (buf, _(", cancel pending")); ui_file_write (buf, "", 1); @@ -1727,8 +1743,8 @@ static void init_aix_thread_ops (void) { aix_thread_ops.to_shortname = "aix-threads"; - aix_thread_ops.to_longname = "AIX pthread support"; - aix_thread_ops.to_doc = "AIX pthread support"; + aix_thread_ops.to_longname = _("AIX pthread support"); + aix_thread_ops.to_doc = _("AIX pthread support"); aix_thread_ops.to_attach = aix_thread_attach; aix_thread_ops.to_detach = aix_thread_detach; @@ -1761,11 +1777,10 @@ _initialize_aix_thread (void) target_new_objfile_chain = deprecated_target_new_objfile_hook; deprecated_target_new_objfile_hook = new_objfile; - deprecated_add_show_from_set - (add_set_cmd ("aix-thread", no_class, var_zinteger, - (char *) &debug_aix_thread, - "Set debugging of AIX thread module.\n" - "Enables printf debugging output.\n", - &setdebuglist), - &showdebuglist); + add_setshow_zinteger_cmd ("aix-thread", no_class, (char *) &debug_aix_thread, + _("Set debugging of AIX thread module."), + _("Show debugging of AIX thread module."), + _("Enables debugging output (used to debug GDB)."), + _("Debugging of AIX thread module is \"%d\"."), + NULL, NULL, &setdebuglist, &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-nat.c gdb/gdb/alpha-nat.c --- gdb.orig/gdb/alpha-nat.c 2004-12-01 22:19:21.000000000 +0100 +++ gdb/gdb/alpha-nat.c 2004-12-25 14:04:15.000000000 +0100 @@ -121,7 +121,7 @@ fetch_osf_core_registers (char *core_reg } if (bad_reg >= 0) { - error ("Register %s not found in core file.", REGISTER_NAME (bad_reg)); + error (_("Register %s not found in core file."), REGISTER_NAME (bad_reg)); } } @@ -131,7 +131,7 @@ fetch_elf_core_registers (char *core_reg { if (core_reg_size < 32 * 8) { - error ("Core file register section too small (%u bytes).", core_reg_size); + error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alpha-tdep.c gdb/gdb/alpha-tdep.c --- gdb.orig/gdb/alpha-tdep.c 2004-12-12 20:19:15.000000000 +0100 +++ gdb/gdb/alpha-tdep.c 2004-12-26 01:29:11.000000000 +0100 @@ -1582,16 +1582,20 @@ _initialize_alpha_tdep (void) /* We really would like to have both "0" and "unlimited" work, but command.c doesn't deal with that. So make it a var_zinteger because the user can always use "999999" or some such for unlimited. */ - c = add_set_cmd ("heuristic-fence-post", class_support, var_zinteger, - (char *) &heuristic_fence_post, - _("\ -Set the distance searched for the start of a function.\n\ + /* We need to throw away the frame cache when we set this, since it + might change our ability to get backtraces. */ + add_setshow_zinteger_cmd ("heuristic-fence-post", class_support, + &heuristic_fence_post, + _("\ +Set the distance searched for the start of a function."), + _("\ +Show the distance searched for the start of a function."), + _("\ If you are debugging a stripped executable, GDB needs to search through the\n\ program for the start of a function. This command sets the distance of the\n\ search. The only need to set it is when debugging a stripped executable."), - &setlist); - /* We need to throw away the frame cache when we set this, since it - might change our ability to get backtraces. */ - set_cmd_sfunc (c, reinit_frame_cache_sfunc); - deprecated_add_show_from_set (c, &showlist); + _("\ +The distance searched for the start of a function is \"%d\"."), + reinit_frame_cache_sfunc, NULL, + &setlist, &showlist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphabsd-nat.c gdb/gdb/alphabsd-nat.c --- gdb.orig/gdb/alphabsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/alphabsd-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -92,7 +92,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_supply_reg ((char *) &gregs, regno); if (regno != -1) @@ -105,7 +105,7 @@ fetch_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_supply_fpreg ((char *) &fpregs, regno); } @@ -122,13 +122,13 @@ store_inferior_registers (int regno) struct reg gregs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); alphabsd_fill_reg ((char *) &gregs, regno); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &gregs, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regno != -1) return; @@ -140,12 +140,12 @@ store_inferior_registers (int regno) if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); alphabsd_fill_fpreg ((char *) &fpregs, regno); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/alphanbsd-tdep.c gdb/gdb/alphanbsd-tdep.c --- gdb.orig/gdb/alphanbsd-tdep.c 2004-09-28 22:02:20.000000000 +0200 +++ gdb/gdb/alphanbsd-tdep.c 2004-12-25 14:04:16.000000000 +0100 @@ -64,7 +64,7 @@ fetch_core_registers (char *core_reg_sec if (core_reg_size < (SIZEOF_TRAPFRAME + SIZEOF_STRUCT_FPREG)) { - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); return; } @@ -86,14 +86,14 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != SIZEOF_STRUCT_REG) - warning ("Wrong size register set in core file."); + warning (_("Wrong size register set in core file.")); else alphabsd_supply_reg (core_reg_sect, -1); break; case 2: /* Floating point registers. */ if (core_reg_size != SIZEOF_STRUCT_FPREG) - warning ("Wrong size FP register set in core file."); + warning (_("Wrong size FP register set in core file.")); else alphabsd_supply_fpreg (core_reg_sect, -1); break; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-linux-nat.c gdb/gdb/amd64-linux-nat.c --- gdb.orig/gdb/amd64-linux-nat.c 2004-04-09 23:16:05.000000000 +0200 +++ gdb/gdb/amd64-linux-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -162,7 +162,7 @@ fetch_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -174,7 +174,7 @@ fetch_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -199,12 +199,12 @@ store_inferior_registers (int regnum) elf_gregset_t regs; if (ptrace (PTRACE_GETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PTRACE_SETREGS, tid, 0, (long) ®s) < 0) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -215,12 +215,12 @@ store_inferior_registers (int regnum) elf_fpregset_t fpregs; if (ptrace (PTRACE_GETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PTRACE_SETFPREGS, tid, 0, (long) &fpregs) < 0) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); return; } @@ -248,7 +248,7 @@ amd64_linux_dr_get (int regnum) offsetof (struct user, u_debugreg[regnum]), 0); if (errno != 0) #if 0 - perror_with_name ("Couldn't read debug register"); + perror_with_name (_("Couldn't read debug register")); #else return 0; #endif @@ -269,7 +269,7 @@ amd64_linux_dr_set (int regnum, unsigned errno = 0; ptrace (PT_WRITE_U, tid, offsetof (struct user, u_debugreg[regnum]), value); if (errno != 0) - perror_with_name ("Couldn't write debug register"); + perror_with_name (_("Couldn't write debug register")); } void diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64-tdep.c gdb/gdb/amd64-tdep.c --- gdb.orig/gdb/amd64-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/amd64-tdep.c 2004-12-25 14:04:16.000000000 +0100 @@ -204,7 +204,7 @@ amd64_dwarf_reg_to_regnum (int reg) regnum = amd64_dwarf_regmap[reg]; if (regnum == -1) - warning ("Unmapped DWARF Register #%d encountered\n", reg); + warning (_("Unmapped DWARF Register #%d encountered\n"), reg); return regnum; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64bsd-nat.c gdb/gdb/amd64bsd-nat.c --- gdb.orig/gdb/amd64bsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64bsd-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -49,7 +49,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_supply_native_gregset (current_regcache, ®s, -1); if (regnum != -1) @@ -62,7 +62,7 @@ amd64bsd_fetch_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_supply_fxsave (current_regcache, -1, &fpregs); } @@ -80,13 +80,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + perror_with_name (_("Couldn't get registers")); amd64_collect_native_gregset (current_regcache, ®s, regnum); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); + perror_with_name (_("Couldn't write registers")); if (regnum != -1) return; @@ -98,13 +98,13 @@ amd64bsd_store_inferior_registers (int r if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't get floating point status"); + perror_with_name (_("Couldn't get floating point status")); amd64_collect_fxsave (current_regcache, regnum, &fpregs); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) - perror_with_name ("Couldn't write floating point status"); + perror_with_name (_("Couldn't write floating point status")); } } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/amd64fbsd-nat.c gdb/gdb/amd64fbsd-nat.c --- gdb.orig/gdb/amd64fbsd-nat.c 2004-09-26 20:42:29.000000000 +0200 +++ gdb/gdb/amd64fbsd-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -178,9 +178,9 @@ _initialize_amd64fbsd_nat (void) if (SC_RIP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RIP_OFFSET); } @@ -191,9 +191,9 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RSP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RSP_OFFSET); } @@ -204,9 +204,9 @@ Please report this to <bug-gdb@gnu.org>. if (SC_RBP_OFFSET != offset) { - warning ("\ + warning (_("\ offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n\ -Please report this to <bug-gdb@gnu.org>.", +Please report this to <bug-gdb@gnu.org>."), offset, SC_RBP_OFFSET); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arch-utils.c gdb/gdb/arch-utils.c --- gdb.orig/gdb/arch-utils.c 2004-11-23 22:05:18.000000000 +0100 +++ gdb/gdb/arch-utils.c 2004-12-25 14:04:16.000000000 +0100 @@ -180,7 +180,7 @@ default_float_format (struct gdbarch *gd return &floatformat_ieee_single_little; default: internal_error (__FILE__, __LINE__, - "default_float_format: bad byte order"); + _("default_float_format: bad byte order")); } } @@ -197,7 +197,7 @@ default_double_format (struct gdbarch *g return &floatformat_ieee_double_little; default: internal_error (__FILE__, __LINE__, - "default_double_format: bad byte order"); + _("default_double_format: bad byte order")); } } @@ -261,7 +261,7 @@ legacy_virtual_frame_pointer (CORE_ADDR else /* Should this be an internal error? I guess so, it is reflecting an architectural limitation in the current design. */ - internal_error (__FILE__, __LINE__, "No virtual frame pointer available"); + internal_error (__FILE__, __LINE__, _("No virtual frame pointer available")); *frame_offset = 0; } @@ -372,11 +372,17 @@ static void show_endian (char *args, int from_tty) { if (target_byte_order_auto) - printf_unfiltered ("The target endianness is set automatically (currently %s endian)\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered (_("The target endianness is set automatically " + "(currently big endian)\n")); + else + printf_unfiltered (_("The target endianness is set automatically " + "(currently little endian)\n")); else - printf_unfiltered ("The target is assumed to be %s endian\n", - (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? "big" : "little")); + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + printf_unfiltered ("The target is assumed to be big endian\n"); + else + printf_unfiltered ("The target is assumed to be little endian\n"); } static void @@ -393,7 +399,7 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_LITTLE; if (! gdbarch_update_p (info)) - printf_unfiltered ("Little endian target not supported by GDB\n"); + printf_unfiltered (_("Little endian target not supported by GDB\n")); } else if (set_endian_string == endian_big) { @@ -402,11 +408,11 @@ set_endian (char *ignore_args, int from_ gdbarch_info_init (&info); info.byte_order = BFD_ENDIAN_BIG; if (! gdbarch_update_p (info)) - printf_unfiltered ("Big endian target not supported by GDB\n"); + printf_unfiltered (_("Big endian target not supported by GDB\n")); } else internal_error (__FILE__, __LINE__, - "set_endian: bad value"); + _("set_endian: bad value")); show_endian (NULL, from_tty); } @@ -436,9 +442,9 @@ show_architecture (char *args, int from_ const char *arch; arch = TARGET_ARCHITECTURE->printable_name; if (target_architecture_auto) - printf_filtered ("The target architecture is set automatically (currently %s)\n", arch); + printf_filtered (_("The target architecture is set automatically (currently %s)\n"), arch); else - printf_filtered ("The target architecture is assumed to be %s\n", arch); + printf_filtered (_("The target architecture is assumed to be %s\n"), arch); } @@ -459,11 +465,11 @@ set_architecture (char *ignore_args, int info.bfd_arch_info = bfd_scan_arch (set_architecture_string); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "set_architecture: bfd_scan_arch failed"); + _("set_architecture: bfd_scan_arch failed")); if (gdbarch_update_p (info)) target_architecture_auto = 0; else - printf_unfiltered ("Architecture `%s' not recognized.\n", + printf_unfiltered (_("Architecture `%s' not recognized.\n"), set_architecture_string); } show_architecture (NULL, from_tty); @@ -533,7 +539,7 @@ set_gdbarch_from_file (bfd *abfd) gdbarch = gdbarch_from_bfd (abfd); if (gdbarch == NULL) - error ("Architecture of file not recognized.\n"); + error (_("Architecture of file not recognized.\n")); deprecated_current_gdbarch_select_hack (gdbarch); } @@ -581,11 +587,11 @@ initialize_current_architecture (void) } if (chosen == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: No arch"); + _("initialize_current_architecture: No arch")); info.bfd_arch_info = bfd_scan_arch (chosen); if (info.bfd_arch_info == NULL) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Arch not found"); + _("initialize_current_architecture: Arch not found")); } /* Take several guesses at a byte order. */ @@ -623,7 +629,8 @@ initialize_current_architecture (void) if (! gdbarch_update_p (info)) internal_error (__FILE__, __LINE__, - "initialize_current_architecture: Selection of initial architecture failed"); + _("initialize_current_architecture: Selection of " + "initial architecture failed")); /* Create the ``set architecture'' command appending ``auto'' to the list of architectures. */ @@ -640,14 +647,14 @@ initialize_current_architecture (void) safe. */ c = add_set_enum_cmd ("architecture", class_support, arches, &set_architecture_string, - "Set architecture of target.", + _("Set architecture of target."), &setlist); set_cmd_sfunc (c, set_architecture); add_alias_cmd ("processor", "architecture", class_support, 1, &setlist); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("architecture", class_support, show_architecture, - "Show the current target architecture", &showlist); + _("Show the current target architecture"), &showlist); } } @@ -724,11 +731,11 @@ _initialize_gdbarch_utils (void) struct cmd_list_element *c; c = add_set_enum_cmd ("endian", class_support, endian_enum, &set_endian_string, - "Set endianness of target.", + _("Set endianness of target."), &setlist); set_cmd_sfunc (c, set_endian); /* Don't use set_from_show - need to print both auto/manual and current setting. */ add_cmd ("endian", class_support, show_endian, - "Show the current byte-order", &showlist); + _("Show the current byte-order"), &showlist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-linux-nat.c gdb/gdb/arm-linux-nat.c --- gdb.orig/gdb/arm-linux-nat.c 2004-07-24 03:00:19.000000000 +0200 +++ gdb/gdb/arm-linux-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -236,7 +236,7 @@ fetch_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch floating point register."); + warning (_("Unable to fetch floating point register.")); return; } @@ -285,7 +285,7 @@ fetch_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -333,7 +333,7 @@ store_fpregister (int regno) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -350,7 +350,7 @@ store_fpregister (int regno) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point register."); + warning (_("Unable to store floating point register.")); return; } } @@ -371,7 +371,7 @@ store_fpregs (void) ret = ptrace (PT_GETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to fetch the floating point registers."); + warning (_("Unable to fetch the floating point registers.")); return; } @@ -388,7 +388,7 @@ store_fpregs (void) ret = ptrace (PTRACE_SETFPREGS, tid, 0, &fp); if (ret < 0) { - warning ("Unable to store floating point registers."); + warning (_("Unable to store floating point registers.")); return; } } @@ -408,7 +408,7 @@ fetch_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general register."); + warning (_("Unable to fetch general register.")); return; } @@ -448,7 +448,7 @@ fetch_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -486,7 +486,7 @@ store_register (int regno) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -496,7 +496,7 @@ store_register (int regno) ret = ptrace (PTRACE_SETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to store general register."); + warning (_("Unable to store general register.")); return; } } @@ -514,7 +514,7 @@ store_regs (void) ret = ptrace (PTRACE_GETREGS, tid, 0, ®s); if (ret < 0) { - warning ("Unable to fetch general registers."); + warning (_("Unable to fetch general registers.")); return; } @@ -528,7 +528,7 @@ store_regs (void) if (ret < 0) { - warning ("Unable to store general registers."); + warning (_("Unable to store general registers.")); return; } } @@ -691,7 +691,7 @@ get_linux_version (unsigned int *vmajor, if (-1 == uname (&info)) { - warning ("Unable to determine GNU/Linux version."); + warning (_("Unable to determine GNU/Linux version.")); return -1; } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/arm-tdep.c gdb/gdb/arm-tdep.c --- gdb.orig/gdb/arm-tdep.c 2004-11-12 22:45:05.000000000 +0100 +++ gdb/gdb/arm-tdep.c 2004-12-26 01:52:03.000000000 +0100 @@ -1322,12 +1322,15 @@ arm_print_float_info (struct gdbarch *gd int type; type = (status >> 24) & 127; - printf ("%s FPU type %d\n", - (status & (1 << 31)) ? "Hardware" : "Software", - type); - fputs ("mask: ", stdout); + if (status & (1 << 31)) + printf (_("Hardware FPU type %d\n"), type); + else + printf (_("Software FPU type %d\n"), type); + /* i18n: [floating point unit] mask */ + fputs (_("mask: "), stdout); print_fpu_flags (status >> 16); - fputs ("flags: ", stdout); + /* i18n: [floating point unit] flags */ + fputs (_("flags: "), stdout); print_fpu_flags (status); } @@ -1384,7 +1387,7 @@ arm_register_sim_regno (int regnum) return SIM_ARM_FPS_REGNUM + reg; reg -= NUM_SREGS; - internal_error (__FILE__, __LINE__, "Bad REGNUM %d", regnum); + internal_error (__FILE__, __LINE__, _("Bad REGNUM %d"), regnum); } /* NOTE: cagney/2001-08-20: Both convert_from_extended() and @@ -1549,7 +1552,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) read_memory_integer (sp + offset, 4); nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } else if ((inst1 & 0xf000) == 0xd000) /* conditional branch */ { @@ -1580,7 +1583,7 @@ thumb_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } return nextpc; @@ -1620,7 +1623,7 @@ arm_get_next_pc (CORE_ADDR pc) if (bits (this_instr, 22, 25) == 0 && bits (this_instr, 4, 7) == 9) /* multiply */ - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* BX <reg>, BLX <reg> */ if (bits (this_instr, 4, 28) == 0x12fff1 @@ -1631,7 +1634,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); return nextpc; } @@ -1712,7 +1715,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = (CORE_ADDR) ADDR_BITS_REMOVE (result); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1730,7 +1733,7 @@ arm_get_next_pc (CORE_ADDR pc) unsigned long base; if (bit (this_instr, 22)) - error ("Illegal update to pc in instruction"); + error (_("Invalid update to pc in instruction")); /* byte write to PC */ rn = bits (this_instr, 16, 19); @@ -1755,7 +1758,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1791,7 +1794,7 @@ arm_get_next_pc (CORE_ADDR pc) } nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); } } break; @@ -1807,7 +1810,7 @@ arm_get_next_pc (CORE_ADDR pc) nextpc = ADDR_BITS_REMOVE (nextpc); if (nextpc == pc) - error ("Infinite loop detected"); + error (_("Infinite loop detected")); break; } @@ -1818,7 +1821,7 @@ arm_get_next_pc (CORE_ADDR pc) break; default: - fprintf_filtered (gdb_stderr, "Bad bit-field extraction\n"); + fprintf_filtered (gdb_stderr, _("Bad bit-field extraction\n")); return (pc); } } @@ -2012,7 +2015,7 @@ arm_extract_return_value (struct type *t default: internal_error (__FILE__, __LINE__, - "arm_extract_return_value: Floating point model not supported"); + _("arm_extract_return_value: Floating point model not supported")); break; } } @@ -2202,7 +2205,7 @@ arm_store_return_value (struct type *typ default: internal_error (__FILE__, __LINE__, - "arm_store_return_value: Floating point model not supported"); + _("arm_store_return_value: Floating point model not supported")); break; } } @@ -2329,7 +2332,8 @@ arm_skip_stub (CORE_ADDR pc) static void set_arm_command (char *args, int from_tty) { - printf_unfiltered ("\"set arm\" must be followed by an apporpriate subcommand.\n"); + printf_unfiltered (_("\ +\"set arm\" must be followed by an apporpriate subcommand.\n")); help_list (setarmcmdlist, "set arm ", all_commands, gdb_stdout); } @@ -2383,7 +2387,7 @@ set_fp_model_sfunc (char *args, int from } if (fp_model == ARM_FLOAT_LAST) - internal_error (__FILE__, __LINE__, "Invalid fp model accepted: %s.", + internal_error (__FILE__, __LINE__, _("Invalid fp model accepted: %s."), current_fp_model); if (gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) @@ -2398,7 +2402,8 @@ show_fp_model (char *args, int from_tty, if (arm_fp_model == ARM_FLOAT_AUTO && gdbarch_bfd_arch_info (current_gdbarch)->arch == bfd_arch_arm) - printf_filtered (" - the default for the current ABI is \"%s\".\n", + /* i18n: "the default [floating point model] for the current ABI..." */ + printf_filtered (_(" - the default for the current ABI is \"%s\".\n"), fp_model_strings[tdep->fp_model]); } @@ -2561,8 +2566,9 @@ arm_elf_osabi_sniffer (bfd *abfd) default: internal_error (__FILE__, __LINE__, - "arm_elf_osabi_sniffer: Unknown ARM EABI " - "version 0x%x", eflags); + _("\ +arm_elf_osabi_sniffer: Unknown ARM EABI version 0x%x"), + eflags); } } break; @@ -2667,7 +2673,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } /* On ARM targets char defaults to unsigned. */ @@ -2768,7 +2774,7 @@ arm_gdbarch_init (struct gdbarch_info in default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } return gdbarch; @@ -2782,7 +2788,7 @@ arm_dump_tdep (struct gdbarch *current_g if (tdep == NULL) return; - fprintf_unfiltered (file, "arm_dump_tdep: Lowest pc = 0x%lx", + fprintf_unfiltered (file, _("arm_dump_tdep: Lowest pc = 0x%lx"), (unsigned long) tdep->lowest_pc); } @@ -2820,6 +2826,8 @@ _initialize_arm_tdep (void) const char **regnames; int numregs, i, j; static char *helptext; + char regdesc[1024], *rdptr = regdesc; + size_t rest = sizeof (regdesc); gdbarch_register (bfd_arch_arm, arm_gdbarch_init, arm_dump_tdep); @@ -2841,21 +2849,16 @@ _initialize_arm_tdep (void) /* Add root prefix command for all "set arm"/"show arm" commands. */ add_prefix_cmd ("arm", no_class, set_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &setarmcmdlist, "set arm ", 0, &setlist); add_prefix_cmd ("arm", no_class, show_arm_command, - "Various ARM-specific commands.", + _("Various ARM-specific commands."), &showarmcmdlist, "show arm ", 0, &showlist); /* Sync the opcode insn printer with our register viewer. */ parse_arm_disassembler_option ("reg-names-std"); - /* Begin creating the help text. */ - stb = mem_fileopen (); - fprintf_unfiltered (stb, "Set the disassembly style.\n" - "The valid values are:\n"); - /* Initialize the array that will be passed to add_set_enum_cmd(). */ valid_disassembly_styles = xmalloc ((num_disassembly_options + 1) * sizeof (char *)); @@ -2863,8 +2866,9 @@ _initialize_arm_tdep (void) { numregs = get_arm_regnames (i, &setname, &setdesc, ®names); valid_disassembly_styles[i] = setname; - fprintf_unfiltered (stb, "%s - %s\n", setname, - setdesc); + length = snprintf (rdptr, rest, "%s - %s\n", setname, setdesc); + rdptr += length; + rest -= length; /* Copy the default names (if found) and synchronize disassembler. */ if (!strcmp (setname, "std")) { @@ -2878,64 +2882,70 @@ _initialize_arm_tdep (void) /* Mark the end of valid options. */ valid_disassembly_styles[num_disassembly_options] = NULL; - /* Finish the creation of the help text. */ - fprintf_unfiltered (stb, "The default is \"std\"."); + /* Create the help text. */ + stb = mem_fileopen (); + fprintf_unfiltered (stb, "%s%s%s", + _("The valid values are:\n"), + regdesc, + _("The default is \"std\".")); helptext = ui_file_xstrdup (stb, &length); ui_file_delete (stb); /* Add the deprecated disassembly-flavor command. */ - new_set = add_set_enum_cmd ("disassembly-flavor", no_class, - valid_disassembly_styles, - &disassembly_style, - helptext, - &setlist); - set_cmd_sfunc (new_set, set_disassembly_style_sfunc); + add_setshow_enum_cmd("disassembly-flavor", no_class, + valid_disassembly_styles, + &disassembly_style, + _("Set the disassembly style."), + _("Show the disassembly style."), + helptext, + _("The disassembly style is \"%s\"."), + set_disassembly_style_sfunc, NULL, + &setlist, &showlist, &new_set, &new_show); deprecate_cmd (new_set, "set arm disassembly"); - deprecate_cmd (deprecated_add_show_from_set (new_set, &showlist), - "show arm disassembly"); + deprecate_cmd (new_show, "show arm disassembly"); /* And now add the new interface. */ - new_set = add_set_enum_cmd ("disassembler", no_class, - valid_disassembly_styles, &disassembly_style, - helptext, &setarmcmdlist); - - set_cmd_sfunc (new_set, set_disassembly_style_sfunc); - deprecated_add_show_from_set (new_set, &showarmcmdlist); - - add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, "\ -Set usage of ARM 32-bit mode.", "\ -Show usage of ARM 32-bit mode.", "\ -When off, a 26-bit PC will be used.\n\ -When off, a 26-bit PC will be used.", "\ -Usage of ARM 32-bit mode is %s.", + add_setshow_enum_cmd("disassembler", no_class, + valid_disassembly_styles, &disassembly_style, + _("Set the disassembly style."), + _("Show the disassembly style."), + helptext, + _("The disassembly style is \"%s\"."), + set_disassembly_style_sfunc, NULL, + &setarmcmdlist, &showarmcmdlist, NULL, NULL); + + add_setshow_boolean_cmd ("apcs32", no_class, &arm_apcs_32, + _("Set usage of ARM 32-bit mode."), + _("Show usage of ARM 32-bit mode."), + _("When off, a 26-bit PC will be used."), + _("Usage of ARM 32-bit mode is %s."), NULL, NULL, &setarmcmdlist, &showarmcmdlist); /* Add a command to allow the user to force the FPU model. */ - new_set = add_set_enum_cmd - ("fpu", no_class, fp_model_strings, ¤t_fp_model, - "Set the floating point type.\n" - "auto - Determine the FP typefrom the OS-ABI.\n" - "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n" - "fpa - FPA co-processor (GCC compiled).\n" - "softvfp - Software FP with pure-endian doubles.\n" - "vfp - VFP co-processor.", - &setarmcmdlist); - set_cmd_sfunc (new_set, set_fp_model_sfunc); - set_cmd_sfunc (deprecated_add_show_from_set (new_set, &showarmcmdlist), - show_fp_model); + add_setshow_enum_cmd ("fpu", no_class, fp_model_strings, ¤t_fp_model, + _("Set the floating point type."), + _("Show the floating point type."), + _("auto - Determine the FP typefrom the OS-ABI.\n\ +softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n\ +fpa - FPA co-processor (GCC compiled).\n\ +softvfp - Software FP with pure-endian doubles.\n\ +vfp - VFP co-processor."), + _("The floating point type is \"%s\"."), + set_fp_model_sfunc, show_fp_model, + &setarmcmdlist, &showarmcmdlist, NULL, NULL); /* Add the deprecated "othernames" command. */ deprecate_cmd (add_com ("othernames", class_obscure, arm_othernames, - "Switch to the next set of register names."), + _("Switch to the next set of register names.")), "set arm disassembly"); /* Debugging flag. */ - add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, "\ -Set ARM debugging.", "\ -Show ARM debugging.", "\ -When on, arm-specific debugging is enabled.", "\ -ARM debugging is %s.", + add_setshow_boolean_cmd ("arm", class_maintenance, &arm_debug, + _("Set ARM debugging."), + _("Show ARM debugging."), + _("When on, arm-specific debugging is enabled."), + _("ARM debugging is %s."), NULL, NULL, &setdebuglist, &showdebuglist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-nat.c gdb/gdb/armnbsd-nat.c --- gdb.orig/gdb/armnbsd-nat.c 2004-08-15 01:37:04.000000000 +0200 +++ gdb/gdb/armnbsd-nat.c 2004-12-25 14:04:16.000000000 +0100 @@ -88,7 +88,7 @@ fetch_register (int regno) if (ret < 0) { - warning ("unable to fetch general register"); + warning (_("unable to fetch general register")); return; } @@ -139,7 +139,7 @@ fetch_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -157,7 +157,7 @@ fetch_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point register"); + warning (_("unable to fetch floating-point register")); return; } @@ -187,7 +187,7 @@ fetch_fp_regs (void) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -223,7 +223,7 @@ store_register (int regno) if (ret < 0) { - warning ("unable to fetch general registers"); + warning (_("unable to fetch general registers")); return; } @@ -284,7 +284,7 @@ store_register (int regno) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -331,7 +331,7 @@ store_regs (void) (PTRACE_TYPE_ARG3) &inferior_registers, 0); if (ret < 0) - warning ("unable to store general registers"); + warning (_("unable to store general registers")); } static void @@ -345,7 +345,7 @@ store_fp_register (int regno) if (ret < 0) { - warning ("unable to fetch floating-point registers"); + warning (_("unable to fetch floating-point registers")); return; } @@ -366,7 +366,7 @@ store_fp_register (int regno) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to write register %d to inferior", regno); + warning (_("unable to write register %d to inferior"), regno); } static void @@ -388,7 +388,7 @@ store_fp_regs (void) (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0); if (ret < 0) - warning ("unable to store floating-point registers"); + warning (_("unable to store floating-point registers")); } void @@ -437,7 +437,7 @@ fetch_elfcore_registers (char *core_reg_ { case 0: /* Integer registers. */ if (core_reg_size != sizeof (struct reg)) - warning ("wrong size of register set in core file"); + warning (_("wrong size of register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure @@ -449,7 +449,7 @@ fetch_elfcore_registers (char *core_reg_ case 2: if (core_reg_size != sizeof (struct fpreg)) - warning ("wrong size of FPA register set in core file"); + warning (_("wrong size of FPA register set in core file")); else { /* The memcpy may be unnecessary, but we can't really be sure diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/armnbsd-tdep.c gdb/gdb/armnbsd-tdep.c --- gdb.orig/gdb/armnbsd-tdep.c 2004-10-31 21:36:34.000000000 +0100 +++ gdb/gdb/armnbsd-tdep.c 2004-12-25 14:04:16.000000000 +0100 @@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbar default: internal_error (__FILE__, __LINE__, - "arm_gdbarch_init: bad byte order for float format"); + _("arm_gdbarch_init: bad byte order for float format")); } tdep->jb_pc = ARM_NBSD_JB_PC; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/auxv.c gdb/gdb/auxv.c --- gdb.orig/gdb/auxv.c 2004-02-24 02:00:30.000000000 +0100 +++ gdb/gdb/auxv.c 2004-12-25 14:04:16.000000000 +0100 @@ -202,50 +202,50 @@ fprint_target_auxv (struct ui_file *file { #define TAG(tag, text, kind) \ case tag: name = #tag; description = text; flavor = kind; break - TAG (AT_NULL, "End of vector", hex); - TAG (AT_IGNORE, "Entry should be ignored", hex); - TAG (AT_EXECFD, "File descriptor of program", dec); - TAG (AT_PHDR, "Program headers for program", hex); - TAG (AT_PHENT, "Size of program header entry", dec); - TAG (AT_PHNUM, "Number of program headers", dec); - TAG (AT_PAGESZ, "System page size", dec); - TAG (AT_BASE, "Base address of interpreter", hex); - TAG (AT_FLAGS, "Flags", hex); - TAG (AT_ENTRY, "Entry point of program", hex); - TAG (AT_NOTELF, "Program is not ELF", dec); - TAG (AT_UID, "Real user ID", dec); - TAG (AT_EUID, "Effective user ID", dec); - TAG (AT_GID, "Real group ID", dec); - TAG (AT_EGID, "Effective group ID", dec); - TAG (AT_CLKTCK, "Frequency of times()", dec); - TAG (AT_PLATFORM, "String identifying platform", str); - TAG (AT_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_FPUCW, "Used FPU control word", dec); - TAG (AT_DCACHEBSIZE, "Data cache block size", dec); - TAG (AT_ICACHEBSIZE, "Instruction cache block size", dec); - TAG (AT_UCACHEBSIZE, "Unified cache block size", dec); - TAG (AT_IGNOREPPC, "Entry should be ignored", dec); - TAG (AT_SYSINFO, "Special system info/entry points", hex); - TAG (AT_SYSINFO_EHDR, "System-supplied DSO's ELF header", hex); - TAG (AT_SECURE, "Boolean, was exec setuid-like?", dec); - TAG (AT_SUN_UID, "Effective user ID", dec); - TAG (AT_SUN_RUID, "Real user ID", dec); - TAG (AT_SUN_GID, "Effective group ID", dec); - TAG (AT_SUN_RGID, "Real group ID", dec); - TAG (AT_SUN_LDELF, "Dynamic linker's ELF header", hex); - TAG (AT_SUN_LDSHDR, "Dynamic linker's section headers", hex); - TAG (AT_SUN_LDNAME, "String giving name of dynamic linker", str); - TAG (AT_SUN_LPAGESZ, "Large pagesize", dec); - TAG (AT_SUN_PLATFORM, "Platform name string", str); - TAG (AT_SUN_HWCAP, "Machine-dependent CPU capability hints", hex); - TAG (AT_SUN_IFLUSH, "Should flush icache?", dec); - TAG (AT_SUN_CPU, "CPU name string", str); - TAG (AT_SUN_EMUL_ENTRY, "COFF entry point address", hex); - TAG (AT_SUN_EMUL_EXECFD, "COFF executable file descriptor", dec); + TAG (AT_NULL, _("End of vector"), hex); + TAG (AT_IGNORE, _("Entry should be ignored"), hex); + TAG (AT_EXECFD, _("File descriptor of program"), dec); + TAG (AT_PHDR, _("Program headers for program"), hex); + TAG (AT_PHENT, _("Size of program header entry"), dec); + TAG (AT_PHNUM, _("Number of program headers"), dec); + TAG (AT_PAGESZ, _("System page size"), dec); + TAG (AT_BASE, _("Base address of interpreter"), hex); + TAG (AT_FLAGS, _("Flags"), hex); + TAG (AT_ENTRY, _("Entry point of program"), hex); + TAG (AT_NOTELF, _("Program is not ELF"), dec); + TAG (AT_UID, _("Real user ID"), dec); + TAG (AT_EUID, _("Effective user ID"), dec); + TAG (AT_GID, _("Real group ID"), dec); + TAG (AT_EGID, _("Effective group ID"), dec); + TAG (AT_CLKTCK, _("Frequency of times()"), dec); + TAG (AT_PLATFORM, _("String identifying platform"), str); + TAG (AT_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_FPUCW, _("Used FPU control word"), dec); + TAG (AT_DCACHEBSIZE, _("Data cache block size"), dec); + TAG (AT_ICACHEBSIZE, _("Instruction cache block size"), dec); + TAG (AT_UCACHEBSIZE, _("Unified cache block size"), dec); + TAG (AT_IGNOREPPC, _("Entry should be ignored"), dec); + TAG (AT_SYSINFO, _("Special system info/entry points"), hex); + TAG (AT_SYSINFO_EHDR, _("System-supplied DSO's ELF header"), hex); + TAG (AT_SECURE, _("Boolean, was exec setuid-like?"), dec); + TAG (AT_SUN_UID, _("Effective user ID"), dec); + TAG (AT_SUN_RUID, _("Real user ID"), dec); + TAG (AT_SUN_GID, _("Effective group ID"), dec); + TAG (AT_SUN_RGID, _("Real group ID"), dec); + TAG (AT_SUN_LDELF, _("Dynamic linker's ELF header"), hex); + TAG (AT_SUN_LDSHDR, _("Dynamic linker's section headers"), hex); + TAG (AT_SUN_LDNAME, _("String giving name of dynamic linker"), str); + TAG (AT_SUN_LPAGESZ, _("Large pagesize"), dec); + TAG (AT_SUN_PLATFORM, _("Platform name string"), str); + TAG (AT_SUN_HWCAP, _("Machine-dependent CPU capability hints"), hex); + TAG (AT_SUN_IFLUSH, _("Should flush icache?"), dec); + TAG (AT_SUN_CPU, _("CPU name string"), str); + TAG (AT_SUN_EMUL_ENTRY, _("COFF entry point address"), hex); + TAG (AT_SUN_EMUL_EXECFD, _("COFF executable file descriptor"), dec); TAG (AT_SUN_EXECNAME, - "Canonicalized file name given to execve", str); - TAG (AT_SUN_MMU, "String for name of MMU module", str); - TAG (AT_SUN_LDDATA, "Dynamic linker's data segment address", hex); + _("Canonicalized file name given to execve"), str); + TAG (AT_SUN_MMU, _("String for name of MMU module"), str); + TAG (AT_SUN_LDDATA, _("Dynamic linker's data segment address"), hex); } fprintf_filtered (file, "%-4s %-20s %-30s ", @@ -277,14 +277,14 @@ static void info_auxv_command (char *cmd, int from_tty) { if (! target_has_stack) - error ("The program has no auxiliary information now."); + error (_("The program has no auxiliary information now.")); else { int ents = fprint_target_auxv (gdb_stdout, ¤t_target); if (ents < 0) - error ("No auxiliary vector found, or failed reading it."); + error (_("No auxiliary vector found, or failed reading it.")); else if (ents == 0) - error ("Auxiliary vector is empty."); + error (_("Auxiliary vector is empty.")); } } @@ -295,6 +295,6 @@ void _initialize_auxv (void) { add_info ("auxv", info_auxv_command, - "Display the inferior's auxiliary vector.\n\ -This is information provided by the operating system at program startup."); + _("Display the inferior's auxiliary vector.\n\ +This is information provided by the operating system at program startup.")); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/avr-tdep.c gdb/gdb/avr-tdep.c --- gdb.orig/gdb/avr-tdep.c 2004-11-13 03:15:31.000000000 +0100 +++ gdb/gdb/avr-tdep.c 2004-12-25 14:04:16.000000000 +0100 @@ -588,7 +588,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (num_pushes > AVR_MAX_PUSHES) { - fprintf_unfiltered (gdb_stderr, "Num pushes too large: %d\n", + fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), num_pushes); num_pushes = 0; } @@ -667,7 +667,7 @@ avr_scan_prologue (CORE_ADDR pc, struct if (vpc >= AVR_MAX_PROLOGUE_SIZE) fprintf_unfiltered (gdb_stderr, - "Hit end of prologue while scanning pushes\n"); + _("Hit end of prologue while scanning pushes\n")); /* Second stage of the prologue scanning. Scan: @@ -1337,8 +1337,8 @@ avr_io_reg_read_command (char *args, int if (bufsiz < 0) { fprintf_unfiltered (gdb_stderr, - "ERR: info io_registers NOT supported by current " - "target\n"); + _("ERR: info io_registers NOT supported " + "by current target\n")); return; } if (bufsiz > sizeof (buf)) @@ -1352,20 +1352,20 @@ avr_io_reg_read_command (char *args, int if (strncmp (buf, "", bufsiz) == 0) { fprintf_unfiltered (gdb_stderr, - "info io_registers NOT supported by target\n"); + _("info io_registers NOT supported by target\n")); return; } if (sscanf (buf, "%x", &nreg) != 1) { fprintf_unfiltered (gdb_stderr, - "Error fetching number of io registers\n"); + _("Error fetching number of io registers\n")); return; } reinitialize_more_filter (); - printf_unfiltered ("Target has %u io registers:\n\n", nreg); + printf_unfiltered (_("Target has %u io registers:\n\n"), nreg); /* only fetch up to 8 registers at a time to keep the buffer small */ step = 8; @@ -1412,5 +1412,5 @@ _initialize_avr_tdep (void) io_registers' to signify it is not available on other platforms. */ add_cmd ("io_registers", class_info, avr_io_reg_read_command, - "query remote avr target for io space register values", &infolist); + _("query remote avr target for io space register values"), &infolist); } diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/cli/cli-decode.c gdb/gdb/cli/cli-decode.c --- gdb.orig/gdb/cli/cli-decode.c 2004-10-30 19:10:14.000000000 +0200 +++ gdb/gdb/cli/cli-decode.c 2004-12-26 01:39:33.000000000 +0100 @@ -419,15 +419,19 @@ add_setshow_enum_cmd (char *name, cmd_sfunc_ftype *set_func, cmd_sfunc_ftype *show_func, struct cmd_list_element **set_list, - struct cmd_list_element **show_list) + struct cmd_list_element **show_list, + struct cmd_list_element **set_result, + struct cmd_list_element **show_result) { struct cmd_list_element *c; add_setshow_cmd_full (name, class, var_enum, var, set_doc, show_doc, help_doc, print, set_func, show_func, set_list, show_list, - &c, NULL); + &c, show_result); c->enums = enumlist; + if (set_result) + *set_result = c; } /* Add an auto-boolean command named NAME to both the set and show @@ -1295,7 +1299,7 @@ deprecated_cmd_warning (char **text) struct cmd_list_element *cmd = NULL; struct cmd_list_element *c; char *type; - + if (!lookup_cmd_composition (*text, &alias, &prefix_cmd, &cmd)) /* return if text doesn't evaluate to a command */ return; diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/command.h gdb/gdb/command.h --- gdb.orig/gdb/command.h 2004-10-30 19:10:14.000000000 +0200 +++ gdb/gdb/command.h 2004-12-25 23:13:18.000000000 +0100 @@ -234,7 +234,9 @@ extern void add_setshow_enum_cmd (char * cmd_sfunc_ftype *set_func, cmd_sfunc_ftype *show_func, struct cmd_list_element **set_list, - struct cmd_list_element **show_list); + struct cmd_list_element **show_list, + struct cmd_list_element **set_result, + struct cmd_list_element **show_result); extern void add_setshow_auto_boolean_cmd (char *name, enum command_class class, diff -Naurp -X /home/ibr/tmp/root/prg/dontdiff.ibr -X dontdiff.prj gdb.orig/gdb/mips-tdep.c gdb/gdb/mips-tdep.c --- gdb.orig/gdb/mips-tdep.c 2004-11-13 03:15:32.000000000 +0100 +++ gdb/gdb/mips-tdep.c 2004-12-25 23:15:22.000000000 +0100 @@ -5188,7 +5188,8 @@ This option can be set to one of:\n\ saved GP register size from information contained in the executable.\n\ (default: auto)", "\ Size of general purpose registers saved on the stack is %s.\n", - NULL, NULL, &setmipscmdlist, &showmipscmdlist); + NULL, NULL, &setmipscmdlist, &showmipscmdlist, + NULL, NULL); /* Allow the user to override the argument stack size. */ add_setshow_enum_cmd ("stack-arg-size", class_obscure, @@ -5201,7 +5202,8 @@ This option can be set to one of:\n\ auto - Allow GDB to determine the correct setting from the current\n\ target and executable (default)", "\ The amount of stack space reserved for each argument is %s.\n", - NULL, NULL, &setmipscmdlist, &showmipscmdlist); + NULL, NULL, &setmipscmdlist, &showmipscmdlist, + NULL, NULL); /* Allow the user to override the ABI. */ c = add_set_enum_cmd ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-26 4:46 ` Baurjan Ismagulov @ 2004-12-26 23:25 ` Eli Zaretskii 0 siblings, 0 replies; 29+ messages in thread From: Eli Zaretskii @ 2004-12-26 23:25 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches > Date: Sun, 26 Dec 2004 03:15:32 +0100 > From: Baurjan Ismagulov <ibr@ata.cs.hun.edu.tr> > > here is the new version. Thanks, this is fine. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2004-12-04 20:06 i18n, part 2 Baurjan Ismagulov ` (2 preceding siblings ...) 2004-12-12 18:35 ` Andrew Cagney @ 2005-01-05 15:48 ` Andrew Cagney 2005-01-05 16:07 ` Baurjan Ismagulov 3 siblings, 1 reply; 29+ messages in thread From: Andrew Cagney @ 2005-01-05 15:48 UTC (permalink / raw) To: Baurjan Ismagulov; +Cc: gdb-patches FYI, [I think] I've committed the i18n code that eli approved. thanks! Andrew PS: as a suggestion, each time you post a revision of the patch, update the subject line (start a new thread) as it will help with the tracking down the end of long threads. ^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: i18n, part 2 2005-01-05 15:48 ` Andrew Cagney @ 2005-01-05 16:07 ` Baurjan Ismagulov 0 siblings, 0 replies; 29+ messages in thread From: Baurjan Ismagulov @ 2005-01-05 16:07 UTC (permalink / raw) To: gdb-patches On Wed, Jan 05, 2005 at 10:47:41AM -0500, Andrew Cagney wrote: > FYI, [I think] I've committed the i18n code that eli approved. Thanks! > PS: as a suggestion, each time you post a revision of the patch, update > the subject line (start a new thread) as it will help with the tracking > down the end of long threads. Ok. With kind regards, Baurjan. ^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2005-01-05 16:07 UTC | newest] Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2004-12-04 20:06 i18n, part 2 Baurjan Ismagulov 2004-12-04 21:52 ` Daniel Jacobowitz 2004-12-04 22:17 ` Baurjan Ismagulov 2004-12-04 23:59 ` Daniel Jacobowitz 2004-12-05 21:41 ` Eli Zaretskii 2004-12-05 23:39 ` Daniel Jacobowitz 2004-12-06 2:19 ` Baurjan Ismagulov 2004-12-06 4:59 ` Eli Zaretskii 2004-12-06 0:00 ` Baurjan Ismagulov 2004-12-15 0:50 ` Baurjan Ismagulov 2004-12-15 21:48 ` Eli Zaretskii 2004-12-06 18:53 ` Kevin Buettner 2004-12-06 20:59 ` Eli Zaretskii 2004-12-06 23:04 ` Kevin Buettner 2004-12-07 5:08 ` Eli Zaretskii 2004-12-07 5:10 ` Daniel Jacobowitz 2004-12-07 17:28 ` Kevin Buettner 2004-12-07 19:59 ` Eli Zaretskii 2004-12-07 20:28 ` Andreas Schwab 2004-12-12 19:50 ` Andrew Cagney 2004-12-12 22:08 ` Eli Zaretskii 2004-12-12 18:23 ` Andrew Cagney 2004-12-12 21:49 ` Eli Zaretskii 2004-12-07 22:02 ` Eli Zaretskii 2004-12-12 18:35 ` Andrew Cagney 2004-12-26 4:46 ` Baurjan Ismagulov 2004-12-26 23:25 ` Eli Zaretskii 2005-01-05 15:48 ` Andrew Cagney 2005-01-05 16:07 ` Baurjan Ismagulov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox