2005-02-10 Andrew Cagney <cagney@gnu.org>

	Mark up all error and warning messages.
	* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
	* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
	* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
	* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
	* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
	* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
	* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
	* event-top.c, exec.c, expprint.c, f-lang.c: Update.
	* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
	* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
	* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
	* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
	* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
	* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
	* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
	* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
	* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
	* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
	* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
	* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
	* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
	* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
	* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
	* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
	* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
	* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
	* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
	* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
	* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
	* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
	* remote-rdp.c, remote-sim.c, remote-st.c: Update.
	* remote-utils.c, remote-utils.h, remote.c: Update.
	* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
	* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
	* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
	* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
	* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
	* somread.c, somsolib.c, source.c, stabsread.c: Update.
	* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
	* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
	* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
	* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
	* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
	* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
	* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
	* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
	* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
	* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
	* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
	* tui/tui-win.c: Update.

6 files changed, 70 insertions, 76 deletions

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 60ede57..23ea710 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -181,7 +181,7 @@ struct cmd_list_element *showchecklist;
 void
 error_no_arg (char *why)
 {
-  error ("Argument required (%s).", why);
+  error (_("Argument required (%s)."), why);
 }
 
 /* The "info" command is defined as a prefix, with allow_unknown = 0.
@@ -305,7 +305,7 @@ void
 quit_command (char *args, int from_tty)
 {
   if (!quit_confirm ())
-    error ("Not confirmed.");
+    error (_("Not confirmed."));
   quit_force (args, from_tty);
 }
 
@@ -313,7 +313,7 @@ static void
 pwd_command (char *args, int from_tty)
 {
   if (args)
-    error ("The \"pwd\" command does not take an argument: %s", args);
+    error (_("The \"pwd\" command does not take an argument: %s"), args);
   getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
 
   if (strcmp (gdb_dirbuf, current_directory) != 0)
@@ -432,7 +432,7 @@ source_command (char *args, int from_tty)
 
   if (file == NULL)
     {
-      error ("source command requires pathname of file to source.");
+      error (_("source command requires pathname of file to source."));
     }
 
   file = tilde_expand (file);
@@ -539,7 +539,7 @@ shell_escape (char *arg, int from_tty)
     while ((rc = wait (&status)) != pid && rc != -1)
       ;
   else
-    error ("Fork failed");
+    error (_("Fork failed"));
 #endif /* Can fork.  */
 }
 
@@ -567,7 +567,7 @@ edit_command (char *arg, int from_tty)
   if (arg == 0)
     {
       if (sal.symtab == 0)
-	error ("No default source file yet.");
+	error (_("No default source file yet."));
       sal.line += get_lines_to_list () / 2;
     }
   else
@@ -589,7 +589,7 @@ edit_command (char *arg, int from_tty)
       xfree (sals.sals);
 
       if (*arg1)
-        error ("Junk at end of line specification.");
+        error (_("Junk at end of line specification."));
 
       /* if line was specified by address,
          first print exactly which line, and which file.
@@ -599,7 +599,7 @@ edit_command (char *arg, int from_tty)
         {
           if (sal.symtab == 0)
 	    /* FIXME-32x64--assumes sal.pc fits in long.  */
-	    error ("No source file for address %s.",
+	    error (_("No source file for address %s."),
 		   hex_string ((unsigned long) sal.pc));
           sym = find_pc_function (sal.pc);
           if (sym)
@@ -621,7 +621,7 @@ edit_command (char *arg, int from_tty)
          symbol which means no source code.  */
 
       if (sal.symtab == 0)
-        error ("No line number known for %s.", arg);
+        error (_("No line number known for %s."), arg);
     }
 
   if ((editor = (char *) getenv ("EDITOR")) == NULL)
@@ -693,7 +693,7 @@ list_command (char *arg, int from_tty)
      set DUMMY_BEG or DUMMY_END to record that fact.  */
 
   if (!have_full_symbols () && !have_partial_symbols ())
-    error ("No symbol table is loaded.  Use the \"file\" command.");
+    error (_("No symbol table is loaded.  Use the \"file\" command."));
 
   arg1 = arg;
   if (*arg1 == ',')
@@ -750,13 +750,13 @@ list_command (char *arg, int from_tty)
     }
 
   if (*arg1)
-    error ("Junk at end of line specification.");
+    error (_("Junk at end of line specification."));
 
   if (!no_end && !dummy_beg && !dummy_end
       && sal.symtab != sal_end.symtab)
-    error ("Specified start and end are in different files.");
+    error (_("Specified start and end are in different files."));
   if (dummy_beg && dummy_end)
-    error ("Two empty args do not say what lines to list.");
+    error (_("Two empty args do not say what lines to list."));
 
   /* if line was specified by address,
      first print exactly which line, and which file.
@@ -766,7 +766,7 @@ list_command (char *arg, int from_tty)
     {
       if (sal.symtab == 0)
 	/* FIXME-32x64--assumes sal.pc fits in long.  */
-	error ("No source file for address %s.",
+	error (_("No source file for address %s."),
 	       hex_string ((unsigned long) sal.pc));
       sym = find_pc_function (sal.pc);
       if (sym)
@@ -789,7 +789,7 @@ list_command (char *arg, int from_tty)
      which means no source code.  */
 
   if (!linenum_beg && sal.symtab == 0)
-    error ("No line number known for %s.", arg);
+    error (_("No line number known for %s."), arg);
 
   /* If this command is repeated with RET,
      turn it into the no-arg variant.  */
@@ -798,13 +798,13 @@ list_command (char *arg, int from_tty)
     *arg = 0;
 
   if (dummy_beg && sal_end.symtab == 0)
-    error ("No default source file yet.  Do \"help list\".");
+    error (_("No default source file yet.  Do \"help list\"."));
   if (dummy_beg)
     print_source_lines (sal_end.symtab,
 			max (sal_end.line - (get_lines_to_list () - 1), 1),
 			sal_end.line + 1, 0);
   else if (sal.symtab == 0)
-    error ("No default source file yet.  Do \"help list\".");
+    error (_("No default source file yet.  Do \"help list\"."));
   else if (no_end)
     {
       int first_line = sal.line - get_lines_to_list () / 2;
@@ -846,11 +846,11 @@ disassemble_command (char *arg, int from_tty)
   if (!arg)
     {
       if (!deprecated_selected_frame)
-	error ("No frame selected.\n");
+	error (_("No frame selected."));
 
       pc = get_frame_pc (deprecated_selected_frame);
       if (find_pc_partial_function (pc, &name, &low, &high) == 0)
-	error ("No function contains program counter for selected frame.\n");
+	error (_("No function contains program counter for selected frame."));
 #if defined(TUI)
       /* NOTE: cagney/2003-02-13 The `tui_active' was previously
 	 `tui_version'.  */
@@ -865,7 +865,7 @@ disassemble_command (char *arg, int from_tty)
       /* One argument.  */
       pc = parse_and_eval_address (arg);
       if (find_pc_partial_function (pc, &name, &low, &high) == 0)
-	error ("No function contains specified address.\n");
+	error (_("No function contains specified address."));
 #if defined(TUI)
       /* NOTE: cagney/2003-02-13 The `tui_active' was previously
 	 `tui_version'.  */
@@ -942,7 +942,7 @@ show_user (char *args, int from_tty)
     {
       c = lookup_cmd (&args, cmdlist, "", 0, 1);
       if (c->class != class_user)
-	error ("Not a user command.");
+	error (_("Not a user command."));
       show_user_1 (c, gdb_stdout);
     }
   else
@@ -967,7 +967,7 @@ apropos_command (char *searchstr, int from_tty)
   char errorbuffer[512];
   pattern_fastmap = xcalloc (256, sizeof (char));
   if (searchstr == NULL)
-      error("REGEXP string is empty");
+      error (_("REGEXP string is empty"));
 
   if (regcomp(&pattern,searchstr,REG_ICASE) == 0)
     {
@@ -978,7 +978,7 @@ apropos_command (char *searchstr, int from_tty)
   else
     {
       regerror(regcomp(&pattern,searchstr,REG_ICASE),NULL,errorbuffer,512);
-      error("Error in regular expression:%s",errorbuffer);
+      error (_("Error in regular expression:%s"),errorbuffer);
     }
   xfree (pattern_fastmap);
 }
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 40d5cd6..883f7d0 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1154,7 +1154,7 @@ lookup_cmd_1 (char **text, struct cmd_list_element *clist,
 static void
 undef_cmd_error (char *cmdtype, char *q)
 {
-  error ("Undefined %scommand: \"%s\".  Try \"help%s%.*s\".",
+  error (_("Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."),
 	 cmdtype,
 	 q,
 	 *cmdtype ? " " : "",
@@ -1192,7 +1192,7 @@ lookup_cmd (char **line, struct cmd_list_element *list, char *cmdtype,
       if (!allow_unknown)
 	{
 	  if (!*line)
-	    error ("Lack of needed %scommand", cmdtype);
+	    error (_("Lack of needed %scommand"), cmdtype);
 	  else
 	    {
 	      char *p = *line, *q;
@@ -1254,7 +1254,7 @@ lookup_cmd (char **line, struct cmd_list_element *list, char *cmdtype,
 		    break;
 		  }
 	      }
-	  error ("Ambiguous %scommand \"%s\": %s.", local_cmdtype,
+	  error (_("Ambiguous %scommand \"%s\": %s."), local_cmdtype,
 		 *line, ambbuf);
 	  return 0;		/* lint */
 	}
@@ -1636,7 +1636,7 @@ cmd_func (struct cmd_list_element *cmd, char *args, int from_tty)
   if (cmd_func_p (cmd))
     (*cmd->func) (cmd, args, from_tty);
   else
-    error ("Invalid command");
+    error (_("Invalid command"));
 }
 
 
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 4030a85..593e637 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -94,7 +94,7 @@ scan_filename_with_cleanup (char **cmd, const char *defname)
   if ((*cmd) == NULL)
     {
       if (defname == NULL)
-	error ("Missing filename.");
+	error (_("Missing filename."));
       filename = xstrdup (defname);
       make_cleanup (xfree, filename);
     }
@@ -134,12 +134,12 @@ bfd_openr_with_cleanup (const char *filename, const char *target)
 
   ibfd = bfd_openr (filename, target);
   if (ibfd == NULL)
-    error ("Failed to open %s: %s.", filename, 
+    error (_("Failed to open %s: %s."), filename, 
 	   bfd_errmsg (bfd_get_error ()));
 
   make_cleanup_bfd_close (ibfd);
   if (!bfd_check_format (ibfd, bfd_object))
-    error ("'%s' is not a recognized file format.", filename);
+    error (_("'%s' is not a recognized file format."), filename);
 
   return ibfd;
 }
@@ -154,18 +154,18 @@ bfd_openw_with_cleanup (const char *filename, const char *target,
     {
       obfd = bfd_openw (filename, target);
       if (obfd == NULL)
-	error ("Failed to open %s: %s.", filename, 
+	error (_("Failed to open %s: %s."), filename, 
 	       bfd_errmsg (bfd_get_error ()));
       make_cleanup_bfd_close (obfd);
       if (!bfd_set_format (obfd, bfd_object))
-	error ("bfd_openw_with_cleanup: %s.", bfd_errmsg (bfd_get_error ()));
+	error (_("bfd_openw_with_cleanup: %s."), bfd_errmsg (bfd_get_error ()));
     }
   else if (*mode == 'a')	/* Append to existing file */
     {	/* FIXME -- doesn't work... */
-      error ("bfd_openw does not work with append.");
+      error (_("bfd_openw does not work with append."));
     }
   else
-    error ("bfd_openw_with_cleanup: unknown mode %s.", mode);
+    error (_("bfd_openw_with_cleanup: unknown mode %s."), mode);
 
   return obfd;
 }
@@ -241,18 +241,18 @@ dump_memory_to_file (char *cmd, char *mode, char *file_format)
 
   /* Find the low address.  */
   if (cmd == NULL || *cmd == '\0')
-    error ("Missing start address.");
+    error (_("Missing start address."));
   lo_exp = scan_expression_with_cleanup (&cmd, NULL);
 
   /* Find the second address - rest of line.  */
   if (cmd == NULL || *cmd == '\0')
-    error ("Missing stop address.");
+    error (_("Missing stop address."));
   hi_exp = cmd;
 
   lo = parse_and_eval_address (lo_exp);
   hi = parse_and_eval_address (hi_exp);
   if (hi <= lo)
-    error ("Invalid memory address range (start >= end).");
+    error (_("Invalid memory address range (start >= end)."));
   count = hi - lo;
 
   /* FIXME: Should use read_memory_partial() and a magic blocking
@@ -292,10 +292,10 @@ dump_value_to_file (char *cmd, char *mode, char *file_format)
 
   /* Find the value.  */
   if (cmd == NULL || *cmd == '\0')
-    error ("No value to %s.", *mode == 'a' ? "append" : "dump");
+    error (_("No value to %s."), *mode == 'a' ? "append" : "dump");
   val = parse_and_eval (cmd);
   if (val == NULL)
-    error ("Invalid expression.");
+    error (_("Invalid expression."));
 
   /* Have everything.  Open/write the data.  */
   if (file_format == NULL || strcmp (file_format, "binary") == 0)
@@ -314,7 +314,7 @@ dump_value_to_file (char *cmd, char *mode, char *file_format)
       else
 	{
 	  vaddr = 0;
-	  warning ("value is not an lval: address assumed to be zero");
+	  warning (_("value is not an lval: address assumed to be zero"));
 	}
 
       dump_bfd_file (filename, mode, file_format, vaddr, 
@@ -492,7 +492,7 @@ restore_section_callback (bfd *ibfd, asection *isec, void *args)
   buf = xmalloc (size);
   old_chain = make_cleanup (xfree, buf);
   if (!bfd_get_section_contents (ibfd, isec, buf, 0, size))
-    error ("Failed to read bfd file %s: '%s'.", bfd_get_filename (ibfd), 
+    error (_("Failed to read bfd file %s: '%s'."), bfd_get_filename (ibfd), 
 	   bfd_errmsg (bfd_get_error ()));
 
   printf_filtered ("Restoring section %s (0x%lx to 0x%lx)",
@@ -513,7 +513,7 @@ restore_section_callback (bfd *ibfd, asection *isec, void *args)
   ret = target_write_memory (sec_start + sec_offset + data->load_offset, 
 			     buf + sec_offset, sec_load_count);
   if (ret != 0)
-    warning ("restore: memory write failed (%s).", safe_strerror (ret));
+    warning (_("restore: memory write failed (%s)."), safe_strerror (ret));
   do_cleanups (old_chain);
   return;
 }
@@ -533,7 +533,7 @@ restore_binary_file (char *filename, struct callback_data *data)
     perror_with_name (filename);
 
   if (len <= data->load_start)
-    error ("Start address is greater than length of binary file %s.", 
+    error (_("Start address is greater than length of binary file %s."), 
 	   filename);
 
   /* Chop off "len" if it exceeds the requested load_end addr. */
@@ -562,7 +562,7 @@ restore_binary_file (char *filename, struct callback_data *data)
   /* Now write the buffer into target memory. */
   len = target_write_memory (data->load_start + data->load_offset, buf, len);
   if (len != 0)
-    warning ("restore: memory write failed (%s).", safe_strerror (len));
+    warning (_("restore: memory write failed (%s)."), safe_strerror (len));
   return;
 }
 
@@ -608,7 +608,7 @@ restore_command (char *args, int from_tty)
 	      /* Parse end address (optional). */
 	      data.load_end = parse_and_eval_long (args);
 	      if (data.load_end <= data.load_start)
-		error ("Start must be less than end.");
+		error (_("Start must be less than end."));
 	    }
 	}
     }
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 773a420..c42892d 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -102,7 +102,7 @@ handle_redirections (int from_tty)
   gdb_stdtarg = output;
 
   if (ui_out_redirect (uiout, gdb_stdout) < 0)
-    warning ("Current output protocol does not support redirection");
+    warning (_("Current output protocol does not support redirection"));
 }
 
 static void
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 458559a..51d55f1 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -73,7 +73,7 @@ build_command_line (enum command_control_type type, char *args)
   struct command_line *cmd;
 
   if (args == NULL)
-    error ("if/while commands require arguments.\n");
+    error (_("if/while commands require arguments."));
 
   cmd = (struct command_line *) xmalloc (sizeof (struct command_line));
   cmd->next = NULL;
@@ -105,7 +105,7 @@ get_command_line (enum command_control_type type, char *arg)
   /* Read in the body of this command.  */
   if (recurse_read_control_structure (cmd) == invalid_control)
     {
-      warning ("error reading in control structure\n");
+      warning (_("Error reading in control structure."));
       do_cleanups (old_chain);
       return NULL;
     }
@@ -263,7 +263,7 @@ execute_user_command (struct cmd_list_element *c, char *args)
     return;
 
   if (++user_call_depth > max_user_call_depth)
-    error ("Max user call depth exceeded -- command aborted\n");
+    error (_("Max user call depth exceeded -- command aborted."));
 
   old_chain = make_cleanup (do_restore_user_call_depth, &user_call_depth);
 
@@ -276,7 +276,7 @@ execute_user_command (struct cmd_list_element *c, char *args)
       ret = execute_control_command (cmdlines);
       if (ret != simple_control && ret != break_control)
 	{
-	  warning ("Error in control structure.\n");
+	  warning (_("Error in control structure."));
 	  break;
 	}
       cmdlines = cmdlines->next;
@@ -424,7 +424,7 @@ execute_control_command (struct command_line *cmd)
       }
 
     default:
-      warning ("Invalid control type in command structure.");
+      warning (_("Invalid control type in command structure."));
       break;
     }
 
@@ -512,7 +512,7 @@ setup_user_args (char *p)
 
       if (arg_count >= MAXUSERARGS)
 	{
-	  error ("user defined function may only have %d arguments.\n",
+	  error (_("user defined function may only have %d arguments."),
 		 MAXUSERARGS);
 	  return old_chain;
 	}
@@ -598,7 +598,7 @@ insert_args (char *line)
 
       if (i >= user_args->count)
 	{
-	  error ("Missing argument %d in user function.\n", i);
+	  error (_("Missing argument %d in user function."), i);
 	  return NULL;
 	}
       len += user_args->a[i].len;
@@ -679,7 +679,7 @@ read_next_line (struct command_line **command)
   int i = 0;
 
   if (control_level >= 254)
-    error ("Control nesting too deep!\n");
+    error (_("Control nesting too deep!"));
 
   /* Set a prompt based on the nesting of the control commands.  */
   if (instream == stdin || (instream == 0 && deprecated_readline_hook != NULL))
@@ -794,16 +794,10 @@ recurse_read_control_structure (struct command_line *current_cmd)
 
   /* Sanity checks.  */
   if (current_cmd->control_type == simple_control)
-    {
-      error ("Recursed on a simple control type\n");
-      return invalid_control;
-    }
+    error (_("Recursed on a simple control type."));
 
   if (current_body > current_cmd->body_count)
-    {
-      error ("Allocated body is smaller than this command type needs\n");
-      return invalid_control;
-    }
+    error (_("Allocated body is smaller than this command type needs."));
 
   /* Read lines from the input stream and build control structures.  */
   while (1)
@@ -1058,7 +1052,7 @@ validate_comname (char *comname)
   while (*p)
     {
       if (!isalnum (*p) && *p != '-' && *p != '_')
-	error ("Junk in argument list: \"%s\"", p);
+	error (_("Junk in argument list: \"%s\""), p);
       p++;
     }
 }
@@ -1107,7 +1101,7 @@ define_command (char *comname, int from_tty)
       else
 	q = query ("Really redefine built-in command \"%s\"? ", c->name);
       if (!q)
-	error ("Command \"%s\" not redefined.", c->name);
+	error (_("Command \"%s\" not redefined."), c->name);
     }
 
   /* If this new command is a hook, then mark the command which it
@@ -1134,10 +1128,10 @@ define_command (char *comname, int from_tty)
 	hookc = 0;
       if (!hookc)
 	{
-	  warning ("Your new `%s' command does not hook any existing command.",
+	  warning (_("Your new `%s' command does not hook any existing command."),
 		   comname);
 	  if (!query ("Proceed? "))
-	    error ("Not confirmed.");
+	    error (_("Not confirmed."));
 	}
     }
 
@@ -1194,7 +1188,7 @@ document_command (char *comname, int from_tty)
   c = lookup_cmd (&tem, cmdlist, "", 0, 1);
 
   if (c->class != class_user)
-    error ("Command \"%s\" is built-in.", comname);
+    error (_("Command \"%s\" is built-in."), comname);
 
   sprintf (tmpbuf, "Type documentation for \"%s\".", comname);
   doclines = read_command_lines (tmpbuf, from_tty);
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 8f84345a..d87791e 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -56,7 +56,7 @@ parse_auto_binary_operation (const char *arg)
 	       || (strncmp (arg, "-1", length) == 0 && length > 1))
 	return AUTO_BOOLEAN_AUTO;
     }
-  error ("\"on\", \"off\" or \"auto\" expected.");
+  error (_("\"on\", \"off\" or \"auto\" expected."));
   return AUTO_BOOLEAN_AUTO; /* pacify GCC */
 }
 
@@ -85,7 +85,7 @@ parse_binary_operation (char *arg)
     return 0;
   else
     {
-      error ("\"on\" or \"off\" expected.");
+      error (_("\"on\" or \"off\" expected."));
       return 0;
     }
 }
@@ -183,7 +183,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 	    if (val == 0)
 	      *(int *) c->var = INT_MAX;
 	    else if (val >= INT_MAX)
-	      error ("integer %u out of range", val);
+	      error (_("integer %u out of range"), val);
 	    else
 	      *(int *) c->var = val;
 	    break;
@@ -213,7 +213,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 		    strcat (msg, c->enums[i]);
 		  }
 		strcat (msg, ".");
-		error ("%s", msg);
+		error (("%s"), msg);
 	      }
 
 	    p = strchr (arg, ' ');
@@ -241,16 +241,16 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 		}
 
 	    if (nmatches <= 0)
-	      error ("Undefined item: \"%s\".", arg);
+	      error (_("Undefined item: \"%s\"."), arg);
 
 	    if (nmatches > 1)
-	      error ("Ambiguous item \"%s\".", arg);
+	      error (_("Ambiguous item \"%s\"."), arg);
 
 	    *(const char **) c->var = match;
 	  }
 	  break;
 	default:
-	  error ("gdb internal error: bad var_type in do_setshow_command");
+	  error (_("gdb internal error: bad var_type in do_setshow_command"));
 	}
     }
   else if (c->type == show_cmd)
@@ -326,7 +326,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 	  break;
 
 	default:
-	  error ("gdb internal error: bad var_type in do_setshow_command");
+	  error (_("gdb internal error: bad var_type in do_setshow_command"));
 	}
 
 
@@ -363,7 +363,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
       do_cleanups (old_chain);
     }
   else
-    error ("gdb internal error: bad cmd_type in do_setshow_command");
+    error (_("gdb internal error: bad cmd_type in do_setshow_command"));
   c->func (c, NULL, from_tty);
   if (c->type == set_cmd && deprecated_set_hook)
     deprecated_set_hook (c);