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

	Mark up add_cmd.
	* arch-utils.c, avr-tdep.c, breakpoint.c, corefile.c: Update.
	* cp-abi.c, cp-namespace.c, cp-support.c, dummy-frame.c: Update.
	* exec.c, gnu-nat.c, go32-nat.c, hppa-tdep.c, infcmd.c: Update.
	* infrun.c, interps.c, macrocmd.c, maint.c, memattr.c: Update.
	* mips-tdep.c, ocd.c, osabi.c, printcmd.c, regcache.c: Update.
	* reggroups.c, remote-fileio.c, remote-rdi.c, remote.c: Update.
	* sol-thread.c, source.c, stack.c, symfile-mem.c: Update.
	* symfile.c, thread.c, tracepoint.c, valprint.c, value.c: Update.
	* win32-nat.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
	* cli/cli-logging.c, tui/tui-regs.c: Update.

42 files changed, 492 insertions, 486 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8f4d1768a99..d392c9a2096 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
 2005-02-14  Andrew Cagney  <cagney@gnu.org>
 
+	Mark up add_cmd.
+	* arch-utils.c, avr-tdep.c, breakpoint.c, corefile.c: Update.
+	* cp-abi.c, cp-namespace.c, cp-support.c, dummy-frame.c: Update.
+	* exec.c, gnu-nat.c, go32-nat.c, hppa-tdep.c, infcmd.c: Update.
+	* infrun.c, interps.c, macrocmd.c, maint.c, memattr.c: Update.
+	* mips-tdep.c, ocd.c, osabi.c, printcmd.c, regcache.c: Update.
+	* reggroups.c, remote-fileio.c, remote-rdi.c, remote.c: Update.
+	* sol-thread.c, source.c, stack.c, symfile-mem.c: Update.
+	* symfile.c, thread.c, tracepoint.c, valprint.c, value.c: Update.
+	* win32-nat.c, cli/cli-cmds.c, cli/cli-dump.c: Update.
+	* cli/cli-logging.c, tui/tui-regs.c: Update.
+
 	Mark up add_setshow functions, replace "PRINT:" comment prefix
 	with "FIXME: i18n:".
 	* aix-thread.c, alpha-tdep.c, arm-tdep.c, breakpoint.c: Update.
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 5b83fec3654..5ba08e9fdf5 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -653,6 +653,8 @@ initialize_current_architecture (void)
     add_alias_cmd ("processor", "architecture", class_support, 1, &setlist);
     /* Don't use set_from_show - need to print both auto/manual and
        current setting. */
+    /* FIXME: i18n: add_setshow_enum_cmd uses a print function so
+       fancy printing is possible.  */
     add_cmd ("architecture", class_support, show_architecture,
 	     _("Show the current target architecture"), &showlist);
   }
@@ -736,6 +738,8 @@ _initialize_gdbarch_utils (void)
   set_cmd_sfunc (c, set_endian);
   /* Don't use set_from_show - need to print both auto/manual and
      current setting. */
+  /* FIXME: i18n: add_setshow_enum_cmd uses a print function so
+     fancy printing is possible.  */
   add_cmd ("endian", class_support, show_endian,
 	   _("Show the current byte-order"), &showlist);
 }
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 6229047f255..5d8f81e1ccc 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1411,5 +1411,6 @@ _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 --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ae5d79f699f..b7b20f08d2b 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7685,24 +7685,24 @@ This is used to cancel the effect of the \"disable\" command.\n\
 May be abbreviated to simply \"enable\".\n",
 		   &enablebreaklist, "enable breakpoints ", 1, &enablelist);
 
-  add_cmd ("once", no_class, enable_once_command,
-	   "Enable breakpoints for one hit.  Give breakpoint numbers.\n\
-If a breakpoint is hit while enabled in this fashion, it becomes disabled.",
+  add_cmd ("once", no_class, enable_once_command, _("\
+Enable breakpoints for one hit.  Give breakpoint numbers.\n\
+If a breakpoint is hit while enabled in this fashion, it becomes disabled."),
 	   &enablebreaklist);
 
-  add_cmd ("delete", no_class, enable_delete_command,
-	   "Enable breakpoints and delete when hit.  Give breakpoint numbers.\n\
-If a breakpoint is hit while enabled in this fashion, it is deleted.",
+  add_cmd ("delete", no_class, enable_delete_command, _("\
+Enable breakpoints and delete when hit.  Give breakpoint numbers.\n\
+If a breakpoint is hit while enabled in this fashion, it is deleted."),
 	   &enablebreaklist);
 
-  add_cmd ("delete", no_class, enable_delete_command,
-	   "Enable breakpoints and delete when hit.  Give breakpoint numbers.\n\
-If a breakpoint is hit while enabled in this fashion, it is deleted.",
+  add_cmd ("delete", no_class, enable_delete_command, _("\
+Enable breakpoints and delete when hit.  Give breakpoint numbers.\n\
+If a breakpoint is hit while enabled in this fashion, it is deleted."),
 	   &enablelist);
 
-  add_cmd ("once", no_class, enable_once_command,
-	   "Enable breakpoints for one hit.  Give breakpoint numbers.\n\
-If a breakpoint is hit while enabled in this fashion, it becomes disabled.",
+  add_cmd ("once", no_class, enable_once_command, _("\
+Enable breakpoints for one hit.  Give breakpoint numbers.\n\
+If a breakpoint is hit while enabled in this fashion, it becomes disabled."),
 	   &enablelist);
 
   add_prefix_cmd ("disable", class_breakpoint, disable_command,
@@ -7720,12 +7720,12 @@ Arguments are breakpoint numbers with spaces in between.\n\
 To disable all breakpoints, give no argument.\n\
 A disabled breakpoint is not forgotten, but has no effect until reenabled.");
 
-  add_cmd ("breakpoints", class_alias, disable_command,
-	   "Disable some breakpoints.\n\
+  add_cmd ("breakpoints", class_alias, disable_command, _("\
+Disable some breakpoints.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To disable all breakpoints, give no argument.\n\
 A disabled breakpoint is not forgotten, but has no effect until reenabled.\n\
-This command may be abbreviated \"disable\".",
+This command may be abbreviated \"disable\"."),
 	   &disablelist);
 
   add_prefix_cmd ("delete", class_breakpoint, delete_command,
@@ -7743,11 +7743,11 @@ The \"unset\" command is also an alias for \"delete\".",
 Arguments are breakpoint numbers with spaces in between.\n\
 To delete all breakpoints, give no argument.\n");
 
-  add_cmd ("breakpoints", class_alias, delete_command,
-	   "Delete some breakpoints or auto-display expressions.\n\
+  add_cmd ("breakpoints", class_alias, delete_command, _("\
+Delete some breakpoints or auto-display expressions.\n\
 Arguments are breakpoint numbers with spaces in between.\n\
 To delete all breakpoints, give no argument.\n\
-This command may be abbreviated \"delete\".",
+This command may be abbreviated \"delete\"."),
 	   &deletelist);
 
   add_com ("clear", class_breakpoint, clear_command,
@@ -7792,9 +7792,9 @@ Do \"help breakpoints\" for info on other commands dealing with breakpoints.", N
 	"Break in function/address or break at a line in the current file.",
 			     &stoplist, "stop ", 1, &cmdlist);
       add_cmd ("in", class_breakpoint, stopin_command,
-	       "Break in function or address.\n", &stoplist);
+	       _("Break in function or address."), &stoplist);
       add_cmd ("at", class_breakpoint, stopat_command,
-	       "Break at a line in the current file.\n", &stoplist);
+	       _("Break at a line in the current file."), &stoplist);
       add_com ("status", class_info, breakpoints_info,
 	       concat ("Status of user-settable breakpoints, or breakpoint number NUMBER.\n\
 The \"Type\" column indicates one of:\n\
@@ -7839,23 +7839,25 @@ are set to the address of the last breakpoint listed.\n\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
 breakpoint set.", NULL));
 
-  add_cmd ("breakpoints", class_maintenance, maintenance_info_breakpoints,
-	   concat ("Status of all breakpoints, or breakpoint number NUMBER.\n\
+  add_cmd ("breakpoints", class_maintenance, maintenance_info_breakpoints, _("\
+Status of all breakpoints, or breakpoint number NUMBER.\n\
 The \"Type\" column indicates one of:\n\
 \tbreakpoint     - normal breakpoint\n\
 \twatchpoint     - watchpoint\n\
 \tlongjmp        - internal breakpoint used to step through longjmp()\n\
 \tlongjmp resume - internal breakpoint at the target of longjmp()\n\
 \tuntil          - internal breakpoint used by the \"until\" command\n\
-\tfinish         - internal breakpoint used by the \"finish\" command\n",
-		   "The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
+\tfinish         - internal breakpoint used by the \"finish\" command\n\
+The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\n\
 the disposition of the breakpoint after it gets hit.  \"dis\" means that the\n\
 breakpoint will be disabled.  The \"Address\" and \"What\" columns indicate the\n\
-address and file/line number respectively.\n\n",
-		   "Convenience variable \"$_\" and default examine address for \"x\"\n\
-are set to the address of the last breakpoint listed.\n\n\
+address and file/line number respectively.\n\
+\n\
+Convenience variable \"$_\" and default examine address for \"x\"\n\
+are set to the address of the last breakpoint listed.\n\
+\n\
 Convenience variable \"$bpnum\" contains the number of the last\n\
-breakpoint set.", NULL),
+breakpoint set."),
 	   &maintenanceinfolist);
 
   add_com ("catch", class_breakpoint, catch_command,
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index ca093320b21..4fa6a5fb875 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1048,41 +1048,45 @@ init_cli_cmds (void)
   /* Define the classes of commands.
      They will appear in the help list in the reverse of this order.  */
 
-  add_cmd ("internals", class_maintenance, NULL,
-	   "Maintenance commands.\n\
+  add_cmd ("internals", class_maintenance, NULL, _("\
+Maintenance commands.\n\
 Some gdb commands are provided just for use by gdb maintainers.\n\
 These commands are subject to frequent change, and may not be as\n\
-well documented as user commands.",
+well documented as user commands."),
 	   &cmdlist);
-  add_cmd ("obscure", class_obscure, NULL, "Obscure features.", &cmdlist);
-  add_cmd ("aliases", class_alias, NULL, "Aliases of other commands.", &cmdlist);
-  add_cmd ("user-defined", class_user, NULL, "User-defined commands.\n\
+  add_cmd ("obscure", class_obscure, NULL, _("Obscure features."), &cmdlist);
+  add_cmd ("aliases", class_alias, NULL, _("Aliases of other commands."), &cmdlist);
+  add_cmd ("user-defined", class_user, NULL, _("\
+User-defined commands.\n\
 The commands in this class are those defined by the user.\n\
-Use the \"define\" command to define a command.", &cmdlist);
-  add_cmd ("support", class_support, NULL, "Support facilities.", &cmdlist);
+Use the \"define\" command to define a command."), &cmdlist);
+  add_cmd ("support", class_support, NULL, _("Support facilities."), &cmdlist);
   if (!dbx_commands)
-    add_cmd ("status", class_info, NULL, "Status inquiries.", &cmdlist);
-  add_cmd ("files", class_files, NULL, "Specifying and examining files.", &cmdlist);
-  add_cmd ("breakpoints", class_breakpoint, NULL, "Making program stop at certain points.", &cmdlist);
-  add_cmd ("data", class_vars, NULL, "Examining data.", &cmdlist);
-  add_cmd ("stack", class_stack, NULL, "Examining the stack.\n\
+    add_cmd ("status", class_info, NULL, _("Status inquiries."), &cmdlist);
+  add_cmd ("files", class_files, NULL, _("Specifying and examining files."),
+	   &cmdlist);
+  add_cmd ("breakpoints", class_breakpoint, NULL,
+	   _("Making program stop at certain points."), &cmdlist);
+  add_cmd ("data", class_vars, NULL, _("Examining data."), &cmdlist);
+  add_cmd ("stack", class_stack, NULL, _("\
+Examining the stack.\n\
 The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n\
 counting from zero for the innermost (currently executing) frame.\n\n\
 At any time gdb identifies one frame as the \"selected\" frame.\n\
 Variable lookups are done with respect to the selected frame.\n\
 When the program being debugged stops, gdb selects the innermost frame.\n\
-The commands below can be used to select other frames by number or address.",
+The commands below can be used to select other frames by number or address."),
 	   &cmdlist);
-  add_cmd ("running", class_run, NULL, "Running the program.", &cmdlist);
+  add_cmd ("running", class_run, NULL, _("Running the program."), &cmdlist);
 
   /* Define general commands. */
 
   add_com ("pwd", class_files, pwd_command,
 	"Print working directory.  This is used for your program as well.");
-  c = add_cmd ("cd", class_files, cd_command,
-	       "Set working directory to DIR for debugger and program being debugged.\n\
+  c = add_cmd ("cd", class_files, cd_command, _("\
+Set working directory to DIR for debugger and program being debugged.\n\
 The change does not take effect for the program being debugged\n\
-until the next time it is started.", &cmdlist);
+until the next time it is started."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   add_com ("echo", class_support, echo_command,
@@ -1104,10 +1108,10 @@ End with a line of just \"end\".\n\
 Use the \"document\" command to give documentation for the new command.\n\
 Commands defined in this way may have up to ten arguments.");
 
-  c = add_cmd ("source", class_support, source_command,
-	       "Read commands from a file named FILE.\n\
+  c = add_cmd ("source", class_support, source_command, _("\
+Read commands from a file named FILE.\n\
 Note that the file \"" GDBINIT_FILENAME "\" is read automatically in this way\n\
-when gdb is started.", &cmdlist);
+when gdb is started."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   add_com ("quit", class_support, quit_command, "Exit gdb.");
@@ -1150,14 +1154,14 @@ Without an argument, history expansion is enabled.", &sethistlist),
   /* Another way to get at the same thing.  */
   add_info ("set", show_command, "Show all GDB settings.");
 
-  add_cmd ("commands", no_class, show_commands,
-	   "Show the history of commands you typed.\n\
+  add_cmd ("commands", no_class, show_commands, _("\
+Show the history of commands you typed.\n\
 You can supply a command number to start with, or a `+' to start after\n\
-the previous command number shown.",
+the previous command number shown."),
 	   &showlist);
 
   add_cmd ("version", no_class, show_version,
-	   "Show what version of GDB this is.", &showlist);
+	   _("Show what version of GDB this is."), &showlist);
 
   add_com ("while", class_support, while_command,
 	   "Execute nested commands WHILE the conditional expression is non zero.\n\
@@ -1267,10 +1271,10 @@ Two arguments are taken as a range of memory to dump.");
   c = add_com ("make", class_support, make_command,
           "Run the ``make'' program using the rest of the line as arguments.");
   set_cmd_completer (c, filename_completer);
-  add_cmd ("user", no_class, show_user,
-	   "Show definitions of user defined commands.\n\
+  add_cmd ("user", no_class, show_user, _("\
+Show definitions of user defined commands.\n\
 Argument is the name of the user defined command.\n\
-With no argument, show definitions of all user defined commands.", &showlist);
+With no argument, show definitions of all user defined commands."), &showlist);
   add_com ("apropos", class_support, apropos_command, "Search for commands matching a REGEXP");
 
   deprecated_add_show_from_set
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 3a446980737..e1abdc613f3 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -726,64 +726,64 @@ Append target code/data to a raw binary file.",
 		  0 /*allow-unknown*/, 
 		  &append_cmdlist);
 
-  add_cmd ("memory", all_commands, dump_srec_memory, "\
+  add_cmd ("memory", all_commands, dump_srec_memory, _("\
 Write contents of memory to an srec file.\n\
 Arguments are FILE START STOP.  Writes the contents of memory\n\
-within the range [START .. STOP) to the specifed FILE in srec format.",
+within the range [START .. STOP) to the specifed FILE in srec format."),
 	   &srec_cmdlist);
 
-  add_cmd ("value", all_commands, dump_srec_value, "\
+  add_cmd ("value", all_commands, dump_srec_value, _("\
 Write the value of an expression to an srec file.\n\
 Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n\
-to the specified FILE in srec format.",
+to the specified FILE in srec format."),
 	   &srec_cmdlist);
 
-  add_cmd ("memory", all_commands, dump_ihex_memory, "\
+  add_cmd ("memory", all_commands, dump_ihex_memory, _("\
 Write contents of memory to an ihex file.\n\
 Arguments are FILE START STOP.  Writes the contents of memory within\n\
-the range [START .. STOP) to the specifed FILE in intel hex format.",
+the range [START .. STOP) to the specifed FILE in intel hex format."),
 	   &ihex_cmdlist);
 
-  add_cmd ("value", all_commands, dump_ihex_value, "\
+  add_cmd ("value", all_commands, dump_ihex_value, _("\
 Write the value of an expression to an ihex file.\n\
 Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n\
-to the specified FILE in intel hex format.",
+to the specified FILE in intel hex format."),
 	   &ihex_cmdlist);
 
-  add_cmd ("memory", all_commands, dump_tekhex_memory, "\
+  add_cmd ("memory", all_commands, dump_tekhex_memory, _("\
 Write contents of memory to a tekhex file.\n\
 Arguments are FILE START STOP.  Writes the contents of memory\n\
-within the range [START .. STOP) to the specifed FILE in tekhex format.",
+within the range [START .. STOP) to the specifed FILE in tekhex format."),
 	   &tekhex_cmdlist);
 
-  add_cmd ("value", all_commands, dump_tekhex_value, "\
+  add_cmd ("value", all_commands, dump_tekhex_value, _("\
 Write the value of an expression to a tekhex file.\n\
 Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n\
-to the specified FILE in tekhex format.",
+to the specified FILE in tekhex format."),
 	   &tekhex_cmdlist);
 
-  add_cmd ("memory", all_commands, dump_binary_memory, "\
+  add_cmd ("memory", all_commands, dump_binary_memory, _("\
 Write contents of memory to a raw binary file.\n\
 Arguments are FILE START STOP.  Writes the contents of memory\n\
-within the range [START .. STOP) to the specifed FILE in binary format.",
+within the range [START .. STOP) to the specifed FILE in binary format."),
 	   &binary_dump_cmdlist);
 
-  add_cmd ("value", all_commands, dump_binary_value, "\
+  add_cmd ("value", all_commands, dump_binary_value, _("\
 Write the value of an expression to a raw binary file.\n\
 Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n\
-to the specified FILE in raw target ordered bytes.",
+to the specified FILE in raw target ordered bytes."),
 	   &binary_dump_cmdlist);
 
-  add_cmd ("memory", all_commands, append_binary_memory, "\
+  add_cmd ("memory", all_commands, append_binary_memory, _("\
 Append contents of memory to a raw binary file.\n\
 Arguments are FILE START STOP.  Writes the contents of memory within the\n\
-range [START .. STOP) to the specifed FILE in raw target ordered bytes.",
+range [START .. STOP) to the specifed FILE in raw target ordered bytes."),
 	   &binary_append_cmdlist);
 
-  add_cmd ("value", all_commands, append_binary_value, "\
+  add_cmd ("value", all_commands, append_binary_value, _("\
 Append the value of an expression to a raw binary file.\n\
 Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n\
-to the specified FILE in raw target ordered bytes.",
+to the specified FILE in raw target ordered bytes."),
 	   &binary_append_cmdlist);
 
   c = add_com ("restore", class_vars, restore_command, 
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 47e24b35e02..9b4d0949f0b 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -196,9 +196,9 @@ The logfile is used when directing GDB's output."),
 			    NULL, NULL,
 			    &set_logging_cmdlist, &show_logging_cmdlist);
   add_cmd ("on", class_support, set_logging_on,
-	   "Enable logging.", &set_logging_cmdlist);
+	   _("Enable logging."), &set_logging_cmdlist);
   add_cmd ("off", class_support, set_logging_off,
-	   "Disable logging.", &set_logging_cmdlist);
+	   _("Disable logging."), &set_logging_cmdlist);
 
   logging_filename = xstrdup ("gdb.txt");
 }
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 90a2c07034e..2f4fccc5eac 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -442,10 +442,10 @@ void
 _initialize_core (void)
 {
   struct cmd_list_element *c;
-  c = add_cmd ("core-file", class_files, core_file_command,
-	       "Use FILE as core dump for examining memory and registers.\n\
+  c = add_cmd ("core-file", class_files, core_file_command, _("\
+Use FILE as core dump for examining memory and registers.\n\
 No arg means have no core file.  This command has been superseded by the\n\
-`target core' and `detach' commands.", &cmdlist);
+`target core' and `detach' commands."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   c = add_set_cmd ("gnutarget", class_files, var_string_noescape,
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index 2ab4f9dbf48..2b39300e4d2 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -243,11 +243,11 @@ _initialize_cp_abi (void)
   register_cp_abi (&auto_cp_abi);
   switch_to_cp_abi ("auto");
 
-  add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd,
-	   "Set the ABI used for inspecting C++ objects.\n"
-	   "\"set cp-abi\" with no arguments will list the available ABIs.",
+  add_cmd ("cp-abi", class_obscure, set_cp_abi_cmd, _("\
+Set the ABI used for inspecting C++ objects.\n\
+\"set cp-abi\" with no arguments will list the available ABIs."),
 	   &setlist);
 
   add_cmd ("cp-abi", class_obscure, show_cp_abi_cmd,
-	   "Show the ABI used for inspecting C++ objects.", &showlist);
+	   _("Show the ABI used for inspecting C++ objects."), &showlist);
 }
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index f90b22abb71..19c784fa911 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -866,6 +866,6 @@ void
 _initialize_cp_namespace (void)
 {
   add_cmd ("namespace", class_maintenance, maintenance_cplus_namespace,
-	   "Print the list of possible C++ namespaces.",
+	   _("Print the list of possible C++ namespaces."),
 	   &maint_cplus_cmd_list);
 }
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index d9cdc46832d..cba35334e3e 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -751,7 +751,7 @@ _initialize_cp_support (void)
   add_alias_cmd ("cp", "cplus", class_maintenance, 1, &maintenancelist);
 
   add_cmd ("first_component", class_maintenance, first_component_command,
-	   "Print the first class/namespace component of NAME.",
+	   _("Print the first class/namespace component of NAME."),
 	   &maint_cplus_cmd_list);
 		  
 }
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 10596b9bc62..2d4c0975536 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -258,7 +258,7 @@ void
 _initialize_dummy_frame (void)
 {
   add_cmd ("dummy-frames", class_maintenance, maintenance_print_dummy_frames,
-	   "Print the contents of the internal dummy-frame stack.",
+	   _("Print the contents of the internal dummy-frame stack."),
 	   &maintenanceprintlist);
 
 }
diff --git a/gdb/exec.c b/gdb/exec.c
index 8f80825e558..9198a349559 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -718,21 +718,21 @@ _initialize_exec (void)
 
   if (!dbx_commands)
     {
-      c = add_cmd ("file", class_files, file_command,
-		   "Use FILE as program to be debugged.\n\
+      c = add_cmd ("file", class_files, file_command, _("\
+Use FILE as program to be debugged.\n\
 It is read for its symbols, for getting the contents of pure memory,\n\
 and it is the program executed when you use the `run' command.\n\
 If FILE cannot be found as specified, your execution directory path\n\
 ($PATH) is searched for a command of that name.\n\
-No arg means to have no executable file and no symbols.", &cmdlist);
+No arg means to have no executable file and no symbols."), &cmdlist);
       set_cmd_completer (c, filename_completer);
     }
 
-  c = add_cmd ("exec-file", class_files, exec_file_command,
-	       "Use FILE as program for getting contents of pure memory.\n\
+  c = add_cmd ("exec-file", class_files, exec_file_command, _("\
+Use FILE as program for getting contents of pure memory.\n\
 If FILE cannot be found as specified, your execution directory path\n\
 is searched for a command of that name.\n\
-No arg means have no executable file.", &cmdlist);
+No arg means have no executable file."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   add_com ("section", class_files, set_section_command,
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 404ffe46645..36932a76476 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -3069,71 +3069,67 @@ info_port_rights_cmd (char *args, int from_tty)
 static void
 add_task_commands (void)
 {
-  add_cmd ("pause", class_run, set_thread_default_pause_cmd,
-	   "Set whether the new threads are suspended while gdb has control.\n\
+  add_cmd ("pause", class_run, set_thread_default_pause_cmd, _("\
+Set whether the new threads are suspended while gdb has control.\n\
 This property normally has no effect because the whole task is\n\
 suspended, however, that may be disabled with \"set task pause off\".\n\
-The default value is \"off\".",
+The default value is \"off\"."),
 	   &set_thread_default_cmd_list);
-  add_cmd ("pause", no_class, show_thread_default_pause_cmd,
-	   "Show whether new threads are suspended while gdb has control.",
+  add_cmd ("pause", no_class, show_thread_default_pause_cmd, _("\
+Show whether new threads are suspended while gdb has control."),
 	   &show_thread_default_cmd_list);
   
-  add_cmd ("run", class_run, set_thread_default_run_cmd,
-	   "Set whether new threads are allowed to run \
-(once gdb has noticed them).",
+  add_cmd ("run", class_run, set_thread_default_run_cmd, _("\
+Set whether new threads are allowed to run (once gdb has noticed them)."),
 	   &set_thread_default_cmd_list);
-  add_cmd ("run", no_class, show_thread_default_run_cmd,
-	   "Show whether new threads are allowed to run \
-(once gdb has noticed them).",
+  add_cmd ("run", no_class, show_thread_default_run_cmd, _("\
+Show whether new threads are allowed to run (once gdb has noticed them)."),
 	   &show_thread_default_cmd_list);
   
   add_cmd ("detach-suspend-count", class_run, set_thread_default_detach_sc_cmd,
-	   "Set the default detach-suspend-count value for new threads.",
+	   _("Set the default detach-suspend-count value for new threads."),
 	   &set_thread_default_cmd_list);
   add_cmd ("detach-suspend-count", no_class, show_thread_default_detach_sc_cmd,
-	   "Show the default detach-suspend-count value for new threads.",
+	   _("Show the default detach-suspend-count value for new threads."),
 	   &show_thread_default_cmd_list);
 
-  add_cmd ("signals", class_run, set_signals_cmd,
-	   "Set whether the inferior process's signals will be intercepted.\n\
-Mach exceptions (such as breakpoint traps) are not affected.",
+  add_cmd ("signals", class_run, set_signals_cmd, _("\
+Set whether the inferior process's signals will be intercepted.\n\
+Mach exceptions (such as breakpoint traps) are not affected."),
 	   &setlist);
   add_alias_cmd ("sigs", "signals", class_run, 1, &setlist);
-  add_cmd ("signals", no_class, show_signals_cmd,
-	   "Show whether the inferior process's signals will be intercepted.",
+  add_cmd ("signals", no_class, show_signals_cmd, _("\
+Show whether the inferior process's signals will be intercepted."),
 	   &showlist);
   add_alias_cmd ("sigs", "signals", no_class, 1, &showlist);
 
-  add_cmd ("signal-thread", class_run, set_sig_thread_cmd,
-	   "Set the thread that gdb thinks is the libc signal thread.\n\
-This thread is run when delivering a signal to a non-stopped process.",
+  add_cmd ("signal-thread", class_run, set_sig_thread_cmd, _("\
+Set the thread that gdb thinks is the libc signal thread.\n\
+This thread is run when delivering a signal to a non-stopped process."),
 	   &setlist);
   add_alias_cmd ("sigthread", "signal-thread", class_run, 1, &setlist);
-  add_cmd ("signal-thread", no_class, show_sig_thread_cmd,
-	   "Set the thread that gdb thinks is the libc signal thread.",
+  add_cmd ("signal-thread", no_class, show_sig_thread_cmd, _("\
+Set the thread that gdb thinks is the libc signal thread."),
 	   &showlist);
   add_alias_cmd ("sigthread", "signal-thread", no_class, 1, &showlist);
 
-  add_cmd ("stopped", class_run, set_stopped_cmd,
-	   "Set whether gdb thinks the inferior process is stopped \
-as with SIGSTOP.\n\
-Stopped process will be continued by sending them a signal.",
+  add_cmd ("stopped", class_run, set_stopped_cmd, _("\
+Set whether gdb thinks the inferior process is stopped as with SIGSTOP.\n\
+Stopped process will be continued by sending them a signal."),
 	   &setlist);
-  add_cmd ("stopped", no_class, show_signals_cmd,
-	   "Show whether gdb thinks the inferior process is stopped \
-as with SIGSTOP.",
+  add_cmd ("stopped", no_class, show_signals_cmd, _("\
+Show whether gdb thinks the inferior process is stopped as with SIGSTOP."),
 	   &showlist);
 
-  add_cmd ("exceptions", class_run, set_exceptions_cmd,
-	   "Set whether exceptions in the inferior process will be trapped.\n\
+  add_cmd ("exceptions", class_run, set_exceptions_cmd, _("\
+Set whether exceptions in the inferior process will be trapped.\n\
 When exceptions are turned off, neither breakpoints nor single-stepping\n\
-will work.",
+will work."),
 	   &setlist);
   /* Allow `set exc' despite conflict with `set exception-port'.  */
   add_alias_cmd ("exc", "exceptions", class_run, 1, &setlist);
-  add_cmd ("exceptions", no_class, show_exceptions_cmd,
-	   "Show whether exceptions in the inferior process will be trapped.",
+  add_cmd ("exceptions", no_class, show_exceptions_cmd, _("\
+Show whether exceptions in the inferior process will be trapped."),
 	   &showlist);
 
   add_prefix_cmd ("task", no_class, set_task_cmd,
@@ -3143,27 +3139,27 @@ will work.",
 		  "Command prefix for showing task attributes.",
 		  &show_task_cmd_list, "show task ", 0, &showlist);
 
-  add_cmd ("pause", class_run, set_task_pause_cmd,
-	   "Set whether the task is suspended while gdb has control.\n\
+  add_cmd ("pause", class_run, set_task_pause_cmd, _("\
+Set whether the task is suspended while gdb has control.\n\
 A value of \"on\" takes effect immediately, otherwise nothing happens\n\
 until the next time the program is continued.\n\
 When setting this to \"off\", \"set thread default pause on\" can be\n\
-used to pause individual threads by default instead.",
+used to pause individual threads by default instead."),
 	   &set_task_cmd_list);
   add_cmd ("pause", no_class, show_task_pause_cmd,
-	   "Show whether the task is suspended while gdb has control.",
+	   _("Show whether the task is suspended while gdb has control."),
 	   &show_task_cmd_list);
 
   add_cmd ("detach-suspend-count", class_run, set_task_detach_sc_cmd,
-	   "Set the suspend count will leave on the thread when detaching.",
+	   _("Set the suspend count will leave on the thread when detaching."),
 	   &set_task_cmd_list);
   add_cmd ("detach-suspend-count", no_class, show_task_detach_sc_cmd,
-	   "Show the suspend count will leave on the thread when detaching.",
+	   _("Show the suspend count will leave on the thread when detaching."),
 	   &show_task_cmd_list);
 
-  add_cmd ("exception-port", no_class, set_task_exc_port_cmd,
-	   "Set the task exception port to which we forward exceptions.\n\
-The argument should be the value of the send right in the task.",
+  add_cmd ("exception-port", no_class, set_task_exc_port_cmd, _("\
+Set the task exception port to which we forward exceptions.\n\
+The argument should be the value of the send right in the task."),
 	   &set_task_cmd_list);
   add_alias_cmd ("excp", "exception-port", no_class, 1, &set_task_cmd_list);
   add_alias_cmd ("exc-port", "exception-port", no_class, 1,
@@ -3171,27 +3167,27 @@ The argument should be the value of the send right in the task.",
 
   /* A convenient way of turning on all options require to noninvasively
      debug running tasks.  */
-  add_cmd ("noninvasive", no_class, set_noninvasive_cmd,
-	   "Set task options so that we interfere as little as possible.\n\
+  add_cmd ("noninvasive", no_class, set_noninvasive_cmd, _("\
+Set task options so that we interfere as little as possible.\n\
 This is the same as setting `task pause', `exceptions', and\n\
-`signals' to the opposite value.",
+`signals' to the opposite value."),
 	   &setlist);
 
   /* Commands to show information about the task's ports.  */
   add_cmd ("send-rights", class_info, info_send_rights_cmd,
-	   "Show information about the task's send rights",
+	   _("Show information about the task's send rights"),
 	   &infolist);
   add_cmd ("receive-rights", class_info, info_recv_rights_cmd,
-	   "Show information about the task's receive rights",
+	   _("Show information about the task's receive rights"),
 	   &infolist);
   add_cmd ("port-rights", class_info, info_port_rights_cmd,
-	   "Show information about the task's port rights",
+	   _("Show information about the task's port rights"),
 	   &infolist);
   add_cmd ("port-sets", class_info, info_port_sets_cmd,
-	   "Show information about the task's port sets",
+	   _("Show information about the task's port sets"),
 	   &infolist);
   add_cmd ("dead-names", class_info, info_dead_names_cmd,
-	   "Show information about the task's dead names",
+	   _("Show information about the task's dead names"),
 	   &infolist);
   add_info_alias ("ports", "port-rights", 1);
   add_info_alias ("port", "port-rights", 1);
@@ -3318,51 +3314,49 @@ add_thread_commands (void)
 		  &show_thread_default_cmd_list, "show thread default ", 0,
 		  &show_thread_cmd_list);
 
-  add_cmd ("pause", class_run, set_thread_pause_cmd,
-	   "Set whether the current thread is suspended \
-while gdb has control.\n\
+  add_cmd ("pause", class_run, set_thread_pause_cmd, _("\
+Set whether the current thread is suspended while gdb has control.\n\
 A value of \"on\" takes effect immediately, otherwise nothing happens\n\
 until the next time the program is continued.  This property normally\n\
 has no effect because the whole task is suspended, however, that may\n\
 be disabled with \"set task pause off\".\n\
-The default value is \"off\".",
+The default value is \"off\"."),
 	   &set_thread_cmd_list);
-  add_cmd ("pause", no_class, show_thread_pause_cmd,
-	   "Show whether the current thread is suspended \
-while gdb has control.",
+  add_cmd ("pause", no_class, show_thread_pause_cmd, _("\
+Show whether the current thread is suspended while gdb has control."),
 	   &show_thread_cmd_list);
 
   add_cmd ("run", class_run, set_thread_run_cmd,
-	   "Set whether the current thread is allowed to run.",
+	   _("Set whether the current thread is allowed to run."),
 	   &set_thread_cmd_list);
   add_cmd ("run", no_class, show_thread_run_cmd,
-	   "Show whether the current thread is allowed to run.",
+	   _("Show whether the current thread is allowed to run."),
 	   &show_thread_cmd_list);
 
-  add_cmd ("detach-suspend-count", class_run, set_thread_detach_sc_cmd,
-	   "Set the suspend count will leave on the thread when detaching.\n\
+  add_cmd ("detach-suspend-count", class_run, set_thread_detach_sc_cmd, _("\
+Set the suspend count will leave on the thread when detaching.\n\
 Note that this is relative to suspend count when gdb noticed the thread;\n\
-use the `thread takeover-suspend-count' to force it to an absolute value.",
+use the `thread takeover-suspend-count' to force it to an absolute value."),
 	   &set_thread_cmd_list);
-  add_cmd ("detach-suspend-count", no_class, show_thread_detach_sc_cmd,
-	   "Show the suspend count will leave on the thread when detaching.\n\
+  add_cmd ("detach-suspend-count", no_class, show_thread_detach_sc_cmd, _("\
+Show the suspend count will leave on the thread when detaching.\n\
 Note that this is relative to suspend count when gdb noticed the thread;\n\
-use the `thread takeover-suspend-count' to force it to an absolute value.",
+use the `thread takeover-suspend-count' to force it to an absolute value."),
 	   &show_thread_cmd_list);
 
-  add_cmd ("exception-port", no_class, set_thread_exc_port_cmd,
-	   "Set the thread exception port to which we forward exceptions.\n\
+  add_cmd ("exception-port", no_class, set_thread_exc_port_cmd, _("\
+Set the thread exception port to which we forward exceptions.\n\
 This overrides the task exception port.\n\
-The argument should be the value of the send right in the task.",
+The argument should be the value of the send right in the task."),
 	   &set_thread_cmd_list);
   add_alias_cmd ("excp", "exception-port", no_class, 1, &set_thread_cmd_list);
   add_alias_cmd ("exc-port", "exception-port", no_class, 1,
 		 &set_thread_cmd_list);
 
-  add_cmd ("takeover-suspend-count", no_class, thread_takeover_sc_cmd,
-	   "Force the threads absolute suspend-count to be gdb's.\n\
+  add_cmd ("takeover-suspend-count", no_class, thread_takeover_sc_cmd, _("\
+Force the threads absolute suspend-count to be gdb's.\n\
 Prior to giving this command, gdb's thread suspend-counts are relative\n\
-to the thread's initial suspend-count when gdb notices the threads.",
+to the thread's initial suspend-count when gdb notices the threads."),
 	   &thread_cmd_list);
 }
 
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 16e42a52f0e..f49b0dea359 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -1910,39 +1910,39 @@ _initialize_go32_nat (void)
 		  "Print information specific to DJGPP (aka MS-DOS) debugging.",
 		  &info_dos_cmdlist, "info dos ", 0, &infolist);
 
-  add_cmd ("sysinfo", class_info, go32_sysinfo,
-	    "Display information about the target system, including CPU, OS, DPMI, etc.",
+  add_cmd ("sysinfo", class_info, go32_sysinfo, _("\
+Display information about the target system, including CPU, OS, DPMI, etc."),
 	   &info_dos_cmdlist);
-  add_cmd ("ldt", class_info, go32_sldt,
-	   "Display entries in the LDT (Local Descriptor Table).\n"
-	   "Entry number (an expression) as an argument means display only that entry.",
+  add_cmd ("ldt", class_info, go32_sldt, _("\
+Display entries in the LDT (Local Descriptor Table).\n\
+Entry number (an expression) as an argument means display only that entry."),
 	   &info_dos_cmdlist);
-  add_cmd ("gdt", class_info, go32_sgdt,
-	   "Display entries in the GDT (Global Descriptor Table).\n"
-	   "Entry number (an expression) as an argument means display only that entry.",
+  add_cmd ("gdt", class_info, go32_sgdt, _("\
+Display entries in the GDT (Global Descriptor Table).\n\
+Entry number (an expression) as an argument means display only that entry."),
 	   &info_dos_cmdlist);
-  add_cmd ("idt", class_info, go32_sidt,
-	   "Display entries in the IDT (Interrupt Descriptor Table).\n"
-	   "Entry number (an expression) as an argument means display only that entry.",
+  add_cmd ("idt", class_info, go32_sidt, _("\
+Display entries in the IDT (Interrupt Descriptor Table).\n\
+Entry number (an expression) as an argument means display only that entry."),
 	   &info_dos_cmdlist);
-  add_cmd ("pde", class_info, go32_pde,
-	   "Display entries in the Page Directory.\n"
-	   "Entry number (an expression) as an argument means display only that entry.",
+  add_cmd ("pde", class_info, go32_pde, _("\
+Display entries in the Page Directory.\n\
+Entry number (an expression) as an argument means display only that entry."),
 	   &info_dos_cmdlist);
-  add_cmd ("pte", class_info, go32_pte,
-	   "Display entries in Page Tables.\n"
-	   "Entry number (an expression) as an argument means display only entries\n"
-	   "from the Page Table pointed to by the specified Page Directory entry.",
+  add_cmd ("pte", class_info, go32_pte, _("\
+Display entries in Page Tables.\n\
+Entry number (an expression) as an argument means display only entries\n\
+from the Page Table pointed to by the specified Page Directory entry."),
 	   &info_dos_cmdlist);
-  add_cmd ("address-pte", class_info, go32_pte_for_address,
-	   "Display a Page Table entry for a linear address.\n"
-	   "The address argument must be a linear address, after adding to\n"
-	   "it the base address of the appropriate segment.\n"
-	   "The base address of variables and functions in the debuggee's data\n"
-	   "or code segment is stored in the variable __djgpp_base_address,\n"
-	   "so use `__djgpp_base_address + (char *)&var' as the argument.\n"
-	   "For other segments, look up their base address in the output of\n"
-	   "the `info dos ldt' command.",
+  add_cmd ("address-pte", class_info, go32_pte_for_address, _("\
+Display a Page Table entry for a linear address.\n\
+The address argument must be a linear address, after adding to\n\
+it the base address of the appropriate segment.\n\
+The base address of variables and functions in the debuggee's data\n\
+or code segment is stored in the variable __djgpp_base_address,\n\
+so use `__djgpp_base_address + (char *)&var' as the argument.\n\
+For other segments, look up their base address in the output of\n\
+the `info dos ldt' command."),
 	   &info_dos_cmdlist);
 }
 
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 56818aad0ba..1f987993a09 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2868,7 +2868,7 @@ _initialize_hppa_tdep (void)
   hppa_objfile_priv_data = register_objfile_data ();
 
   add_cmd ("unwind", class_maintenance, unwind_command,
-	   "Print unwind table entry at given address.",
+	   _("Print unwind table entry at given address."),
 	   &maintenanceprintlist);
 
   /* Debug this files internals. */
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index ac7d3c511eb..dfcb97f3f81 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1990,29 +1990,28 @@ Follow this command with any number of args, to be passed to the program.",
   c = deprecated_add_show_from_set (c, &showlist);
   set_cmd_sfunc (c, notice_args_read);
 
-  c = add_cmd
-    ("environment", no_class, environment_info,
-     "The environment to give the program, or one variable's value.\n\
+  c = add_cmd ("environment", no_class, environment_info, _("\
+The environment to give the program, or one variable's value.\n\
 With an argument VAR, prints the value of environment variable VAR to\n\
 give the program being debugged.  With no arguments, prints the entire\n\
-environment to be given to the program.", &showlist);
+environment to be given to the program."), &showlist);
   set_cmd_completer (c, noop_completer);
 
   add_prefix_cmd ("unset", no_class, unset_command,
 		  "Complement to certain \"set\" commands.",
 		  &unsetlist, "unset ", 0, &cmdlist);
 
-  c = add_cmd ("environment", class_run, unset_environment_command,
-	       "Cancel environment variable VAR for the program.\n\
-This does not affect the program until the next \"run\" command.",
+  c = add_cmd ("environment", class_run, unset_environment_command, _("\
+Cancel environment variable VAR for the program.\n\
+This does not affect the program until the next \"run\" command."),
 	       &unsetlist);
   set_cmd_completer (c, noop_completer);
 
-  c = add_cmd ("environment", class_run, set_environment_command,
-	       "Set environment variable value to give the program.\n\
+  c = add_cmd ("environment", class_run, set_environment_command, _("\
+Set environment variable value to give the program.\n\
 Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n\
 VALUES of environment variables are uninterpreted strings.\n\
-This does not affect the program until the next \"run\" command.",
+This does not affect the program until the next \"run\" command."),
 	       &setlist);
   set_cmd_completer (c, noop_completer);
 
@@ -2024,12 +2023,12 @@ directories, separated by colons.  These directories are searched to find\n\
 fully linked executable files and separately compiled object files as needed.");
   set_cmd_completer (c, filename_completer);
 
-  c = add_cmd ("paths", no_class, path_info,
-	       "Current search path for finding object files.\n\
+  c = add_cmd ("paths", no_class, path_info, _("\
+Current search path for finding object files.\n\
 $cwd in the path means the current working directory.\n\
 This path is equivalent to the $PATH shell variable.  It is a list of\n\
 directories, separated by colons.  These directories are searched to find\n\
-fully linked executable files and separately compiled object files as needed.",
+fully linked executable files and separately compiled object files as needed."),
 	       &showlist);
   set_cmd_completer (c, noop_completer);
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index a98be36547e..5e053274256 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3832,11 +3832,11 @@ Pass and Stop may be combined.", NULL));
     }
 
   if (!dbx_commands)
-    stop_command =
-      add_cmd ("stop", class_obscure, not_just_help_class_command, 
-	       "There is no `stop' command, but you can set a hook on `stop'.\n\
+    stop_command = add_cmd ("stop", class_obscure,
+			    not_just_help_class_command, _("\
+There is no `stop' command, but you can set a hook on `stop'.\n\
 This allows you to set a list of commands to be run each time execution\n\
-of the program stops.", &cmdlist);
+of the program stops."), &cmdlist);
 
   add_set_cmd ("infrun", class_maintenance, var_zinteger,
 	       &debug_infrun, "Set inferior debugging.\n\
diff --git a/gdb/interps.c b/gdb/interps.c
index dc6574519b9..97befa70336 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -477,9 +477,9 @@ _initialize_interpreter (void)
   struct cmd_list_element *c;
 
   c = add_cmd ("interpreter-exec", class_support,
-	       interpreter_exec_cmd,
-	       "Execute a command in an interpreter.  It takes two arguments:\n\
+	       interpreter_exec_cmd, _("\
+Execute a command in an interpreter.  It takes two arguments:\n\
 The first argument is the name of the interpreter to use.\n\
-The second argument is the command to execute.\n", &cmdlist);
+The second argument is the command to execute.\n"), &cmdlist);
   set_cmd_completer (c, interpreter_completer);
 }
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index c70adb485cc..9ae42b46bda 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -236,54 +236,46 @@ _initialize_macrocmd (void)
      "Prefix for commands dealing with C preprocessor macros.",
      &macrolist, "macro ", 0, &cmdlist);
 
-  add_cmd
-    ("expand", no_class, macro_expand_command,
-     "Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n"
-     "Show the expanded expression.",
-     &macrolist);
+  add_cmd ("expand", no_class, macro_expand_command, _("\
+Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n\
+Show the expanded expression."),
+	   &macrolist);
   add_alias_cmd ("exp", "expand", no_class, 1, &macrolist);
-  add_cmd
-    ("expand-once", no_class, macro_expand_once_command,
-     "Expand C/C++ preprocessor macro invocations appearing directly in"
-     " EXPRESSION.\n"
-     "Show the expanded expression.\n"
-     "\n"
-     "This command differs from `macro expand' in that it only expands macro\n"
-     "invocations that appear directly in EXPRESSION; if expanding a macro\n"
-     "introduces further macro invocations, those are left unexpanded.\n"
-     "\n"
-     "`macro expand-once' helps you see how a particular macro expands,\n"
-     "whereas `macro expand' shows you how all the macros involved in an\n"
-     "expression work together to yield a pre-processed expression.",
-     &macrolist);
+  add_cmd ("expand-once", no_class, macro_expand_once_command, _("\
+Expand C/C++ preprocessor macro invocations appearing directly in EXPRESSION.\n\
+Show the expanded expression.\n\
+\n\
+This command differs from `macro expand' in that it only expands macro\n\
+invocations that appear directly in EXPRESSION; if expanding a macro\n\
+introduces further macro invocations, those are left unexpanded.\n\
+\n\
+`macro expand-once' helps you see how a particular macro expands,\n\
+whereas `macro expand' shows you how all the macros involved in an\n\
+expression work together to yield a pre-processed expression."),
+	   &macrolist);
   add_alias_cmd ("exp1", "expand-once", no_class, 1, &macrolist);
 
-  add_cmd
-    ("macro", no_class, info_macro_command,
-     "Show the definition of MACRO, and its source location.",
-     &infolist);
-
-  add_cmd
-    ("define", no_class, macro_define_command,
-     "Define a new C/C++ preprocessor macro.\n"
-     "The GDB command `macro define DEFINITION' is equivalent to placing a\n"
-     "preprocessor directive of the form `#define DEFINITION' such that the\n"
-     "definition is visible in all the inferior's source files.\n"
-     "For example:\n"
-     "  (gdb) macro define PI (3.1415926)\n"
-     "  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))",
-     &macrolist);
-
-  add_cmd
-    ("undef", no_class, macro_undef_command,
-     "Remove the definition of the C/C++ preprocessor macro with the"
-     " given name.",
-     &macrolist);
-
-  add_cmd
-    ("list", no_class, macro_list_command,
-     "List all the macros defined using the `macro define' command.",
-     &macrolist);
+  add_cmd ("macro", no_class, info_macro_command,
+	   _("Show the definition of MACRO, and its source location."),
+	   &infolist);
+
+  add_cmd ("define", no_class, macro_define_command, _("\
+Define a new C/C++ preprocessor macro.\n\
+The GDB command `macro define DEFINITION' is equivalent to placing a\n\
+preprocessor directive of the form `#define DEFINITION' such that the\n\
+definition is visible in all the inferior's source files.\n\
+For example:\n\
+  (gdb) macro define PI (3.1415926)\n\
+  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))"),
+	   &macrolist);
+
+  add_cmd ("undef", no_class, macro_undef_command, _("\
+Remove the definition of the C/C++ preprocessor macro with the given name."),
+	   &macrolist);
+
+  add_cmd ("list", no_class, macro_list_command,
+	   _("List all the macros defined using the `macro define' command."),
+	   &macrolist);
 
   user_macros = new_macro_table (0, 0);
 }
diff --git a/gdb/maint.c b/gdb/maint.c
index 3b898b3c790..92c40f1c467 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -711,8 +711,8 @@ to test internal functions such as the C++/ObjC demangler, etc.",
 		  &maintenancelist);
   add_alias_cmd ("i", "info", class_maintenance, 1, &maintenancelist);
 
-  add_cmd ("sections", class_maintenance, maintenance_info_sections,
-	   "List the BFD sections of the exec and core files. \n\
+  add_cmd ("sections", class_maintenance, maintenance_info_sections, _("\
+List the BFD sections of the exec and core files. \n\
 Arguments may be any combination of:\n\
 	[one or more section names]\n\
 	ALLOC LOAD RELOC READONLY CODE DATA ROM CONSTRUCTOR\n\
@@ -720,7 +720,7 @@ Arguments may be any combination of:\n\
 Sections matching any argument will be listed (no argument\n\
 implies all sections).  In addition, the special argument\n\
 	ALLOBJ\n\
-lists all sections from all object files, including shared libraries.",
+lists all sections from all object files, including shared libraries."),
 	   &maintenanceinfolist);
 
   add_prefix_cmd ("print", class_maintenance, maintenance_print_command,
@@ -743,110 +743,113 @@ Configure variables internal to GDB that aid in GDB's maintenance",
 		  &maintenancelist);
 
 #ifndef _WIN32
-  add_cmd ("dump-me", class_maintenance, maintenance_dump_me,
-	   "Get fatal error; make debugger dump its core.\n\
+  add_cmd ("dump-me", class_maintenance, maintenance_dump_me, _("\
+Get fatal error; make debugger dump its core.\n\
 GDB sets its handling of SIGQUIT back to SIG_DFL and then sends\n\
-itself a SIGQUIT signal.",
+itself a SIGQUIT signal."),
 	   &maintenancelist);
 #endif
 
-  add_cmd ("internal-error", class_maintenance, maintenance_internal_error,
-	   "Give GDB an internal error.\n\
-Cause GDB to behave as if an internal error was detected.",
+  add_cmd ("internal-error", class_maintenance,
+	   maintenance_internal_error, _("\
+Give GDB an internal error.\n\
+Cause GDB to behave as if an internal error was detected."),
 	   &maintenancelist);
 
-  add_cmd ("internal-warning", class_maintenance, maintenance_internal_warning,
-	   "Give GDB an internal warning.\n\
-Cause GDB to behave as if an internal warning was reported.",
+  add_cmd ("internal-warning", class_maintenance,
+	   maintenance_internal_warning, _("\
+Give GDB an internal warning.\n\
+Cause GDB to behave as if an internal warning was reported."),
 	   &maintenancelist);
 
-  add_cmd ("demangle", class_maintenance, maintenance_demangle,
-	   "Demangle a C++/ObjC mangled name.\n\
+  add_cmd ("demangle", class_maintenance, maintenance_demangle, _("\
+Demangle a C++/ObjC mangled name.\n\
 Call internal GDB demangler routine to demangle a C++ link name\n\
-and prints the result.",
+and prints the result."),
 	   &maintenancelist);
 
-  add_cmd ("time", class_maintenance, maintenance_time_display,
-	   "Set the display of time usage.\n\
+  add_cmd ("time", class_maintenance, maintenance_time_display, _("\
+Set the display of time usage.\n\
 If nonzero, will cause the execution time for each command to be\n\
-displayed, following the command's output.",
+displayed, following the command's output."),
 	   &maintenancelist);
 
-  add_cmd ("space", class_maintenance, maintenance_space_display,
-	   "Set the display of space usage.\n\
+  add_cmd ("space", class_maintenance, maintenance_space_display, _("\
+Set the display of space usage.\n\
 If nonzero, will cause the execution space for each command to be\n\
-displayed, following the command's output.",
+displayed, following the command's output."),
 	   &maintenancelist);
 
-  add_cmd ("type", class_maintenance, maintenance_print_type,
-	   "Print a type chain for a given symbol.\n\
+  add_cmd ("type", class_maintenance, maintenance_print_type, _("\
+Print a type chain for a given symbol.\n\
 For each node in a type chain, print the raw data for each member of\n\
-the type structure, and the interpretation of the data.",
+the type structure, and the interpretation of the data."),
 	   &maintenanceprintlist);
 
-  add_cmd ("symbols", class_maintenance, maintenance_print_symbols,
-	   "Print dump of current symbol definitions.\n\
+  add_cmd ("symbols", class_maintenance, maintenance_print_symbols, _("\
+Print dump of current symbol definitions.\n\
 Entries in the full symbol table are dumped to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's symbols.",
+If a SOURCE file is specified, dump only that file's symbols."),
 	   &maintenanceprintlist);
 
-  add_cmd ("msymbols", class_maintenance, maintenance_print_msymbols,
-	   "Print dump of current minimal symbol definitions.\n\
+  add_cmd ("msymbols", class_maintenance, maintenance_print_msymbols, _("\
+Print dump of current minimal symbol definitions.\n\
 Entries in the minimal symbol table are dumped to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's minimal symbols.",
+If a SOURCE file is specified, dump only that file's minimal symbols."),
 	   &maintenanceprintlist);
 
-  add_cmd ("psymbols", class_maintenance, maintenance_print_psymbols,
-	   "Print dump of current partial symbol definitions.\n\
+  add_cmd ("psymbols", class_maintenance, maintenance_print_psymbols, _("\
+Print dump of current partial symbol definitions.\n\
 Entries in the partial symbol table are dumped to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's partial symbols.",
+If a SOURCE file is specified, dump only that file's partial symbols."),
 	   &maintenanceprintlist);
 
   add_cmd ("objfiles", class_maintenance, maintenance_print_objfiles,
-	   "Print dump of current object file definitions.",
+	   _("Print dump of current object file definitions."),
 	   &maintenanceprintlist);
 
-  add_cmd ("symtabs", class_maintenance, maintenance_info_symtabs,
-	   "List the full symbol tables for all object files.\n\
+  add_cmd ("symtabs", class_maintenance, maintenance_info_symtabs, _("\
+List the full symbol tables for all object files.\n\
 This does not include information about individual symbols, blocks, or\n\
 linetables --- just the symbol table structures themselves.\n\
-With an argument REGEXP, list the symbol tables whose names that match that.",
+With an argument REGEXP, list the symbol tables whose names that match that."),
 	   &maintenanceinfolist);
 
-  add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs,
-	   "List the partial symbol tables for all object files.\n\
+  add_cmd ("psymtabs", class_maintenance, maintenance_info_psymtabs, _("\
+List the partial symbol tables for all object files.\n\
 This does not include information about individual partial symbols,\n\
-just the symbol table structures themselves.",
+just the symbol table structures themselves."),
 	   &maintenanceinfolist);
 
   add_cmd ("statistics", class_maintenance, maintenance_print_statistics,
-	   "Print statistics about internal gdb state.",
+	   _("Print statistics about internal gdb state."),
 	   &maintenanceprintlist);
 
-  add_cmd ("architecture", class_maintenance, maintenance_print_architecture,
-	   "Print the internal architecture configuration.\
-Takes an optional file parameter.",
+  add_cmd ("architecture", class_maintenance,
+	   maintenance_print_architecture, _("\
+Print the internal architecture configuration.\n\
+Takes an optional file parameter."),
 	   &maintenanceprintlist);
 
   add_cmd ("check-symtabs", class_maintenance, maintenance_check_symtabs,
-	   "Check consistency of psymtabs and symtabs.",
+	   _("Check consistency of psymtabs and symtabs."),
 	   &maintenancelist);
 
   add_cmd ("translate-address", class_maintenance, maintenance_translate_address,
-	   "Translate a section name and address to a symbol.",
+	   _("Translate a section name and address to a symbol."),
 	   &maintenancelist);
 
-  add_cmd ("deprecate", class_maintenance, maintenance_deprecate,
-	   "Deprecate a command.  Note that this is just in here so the \n\
+  add_cmd ("deprecate", class_maintenance, maintenance_deprecate, _("\
+Deprecate a command.  Note that this is just in here so the \n\
 testsuite can check the comamnd deprecator. You probably shouldn't use this,\n\
 rather you should use the C function deprecate_cmd().  If you decide you \n\
 want to use it: maintenance deprecate 'commandname' \"replacement\". The \n\
-replacement is optional.", &maintenancelist);
+replacement is optional."), &maintenancelist);
 
-  add_cmd ("undeprecate", class_maintenance, maintenance_undeprecate,
-	   "Undeprecate a command.  Note that this is just in here so the \n\
+  add_cmd ("undeprecate", class_maintenance, maintenance_undeprecate, _("\
+Undeprecate a command.  Note that this is just in here so the \n\
 testsuite can check the comamnd deprecator. You probably shouldn't use this,\n\
-If you decide you want to use it: maintenance undeprecate 'commandname'",
+If you decide you want to use it: maintenance undeprecate 'commandname'"),
 	   &maintenancelist);
 
   deprecated_add_show_from_set
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 7f4f0740b3e..0edeb9704fe 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -526,23 +526,23 @@ where <mode>  may be rw (read/write), ro (read-only) or wo (write-only), \n\
       <width> may be 8, 16, 32, or 64, and \n\
       <cache> may be cache or nocache");
 
-  add_cmd ("mem", class_vars, mem_enable_command,
-	   "Enable memory region.\n\
+  add_cmd ("mem", class_vars, mem_enable_command, _("\
+Enable memory region.\n\
 Arguments are the code numbers of the memory regions to enable.\n\
 Usage: enable mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &enablelist);
+Do \"info mem\" to see current list of code numbers."), &enablelist);
 
-  add_cmd ("mem", class_vars, mem_disable_command,
-	   "Disable memory region.\n\
+  add_cmd ("mem", class_vars, mem_disable_command, _("\
+Disable memory region.\n\
 Arguments are the code numbers of the memory regions to disable.\n\
 Usage: disable mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &disablelist);
+Do \"info mem\" to see current list of code numbers."), &disablelist);
 
-  add_cmd ("mem", class_vars, mem_delete_command,
-	   "Delete memory region.\n\
+  add_cmd ("mem", class_vars, mem_delete_command, _("\
+Delete memory region.\n\
 Arguments are the code numbers of the memory regions to delete.\n\
 Usage: delete mem <code number>\n\
-Do \"info mem\" to see current list of code numbers.", &deletelist);
+Do \"info mem\" to see current list of code numbers."), &deletelist);
 
   add_info ("mem", mem_info_command,
 	    "Memory region attributes");
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 7023503ea6f..48578bf95ce 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5214,7 +5214,7 @@ This option can be set to one of:\n\
      "  o64\n" "  n32\n" "  n64\n" "  eabi32\n" "  eabi64", &setmipscmdlist);
   set_cmd_sfunc (c, mips_abi_update);
   add_cmd ("abi", class_obscure, show_mips_abi,
-	   "Show ABI in use by MIPS target", &showmipscmdlist);
+	   _("Show ABI in use by MIPS target"), &showmipscmdlist);
 
   /* Let the user turn off floating point and set the fence post for
      heuristic_proc_start.  */
@@ -5223,24 +5223,24 @@ This option can be set to one of:\n\
 		  "Set use of MIPS floating-point coprocessor.",
 		  &mipsfpulist, "set mipsfpu ", 0, &setlist);
   add_cmd ("single", class_support, set_mipsfpu_single_command,
-	   "Select single-precision MIPS floating-point coprocessor.",
+	   _("Select single-precision MIPS floating-point coprocessor."),
 	   &mipsfpulist);
   add_cmd ("double", class_support, set_mipsfpu_double_command,
-	   "Select double-precision MIPS floating-point coprocessor.",
+	   _("Select double-precision MIPS floating-point coprocessor."),
 	   &mipsfpulist);
   add_alias_cmd ("on", "double", class_support, 1, &mipsfpulist);
   add_alias_cmd ("yes", "double", class_support, 1, &mipsfpulist);
   add_alias_cmd ("1", "double", class_support, 1, &mipsfpulist);
   add_cmd ("none", class_support, set_mipsfpu_none_command,
-	   "Select no MIPS floating-point coprocessor.", &mipsfpulist);
+	   _("Select no MIPS floating-point coprocessor."), &mipsfpulist);
   add_alias_cmd ("off", "none", class_support, 1, &mipsfpulist);
   add_alias_cmd ("no", "none", class_support, 1, &mipsfpulist);
   add_alias_cmd ("0", "none", class_support, 1, &mipsfpulist);
   add_cmd ("auto", class_support, set_mipsfpu_auto_command,
-	   "Select MIPS floating-point coprocessor automatically.",
+	   _("Select MIPS floating-point coprocessor automatically."),
 	   &mipsfpulist);
   add_cmd ("mipsfpu", class_support, show_mipsfpu_command,
-	   "Show current use of MIPS floating-point coprocessor target.",
+	   _("Show current use of MIPS floating-point coprocessor target."),
 	   &showlist);
 
   /* We really would like to have both "0" and "unlimited" work, but
diff --git a/gdb/ocd.c b/gdb/ocd.c
index 593f63c32bf..9370a8ccf84 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -1165,7 +1165,8 @@ _initialize_remote_ocd (void)
   add_prefix_cmd ("ocd", class_obscure, bdm_command, "", &ocd_cmd_list, "ocd ",
 		  0, &cmdlist);
 
-  add_cmd ("reset", class_obscure, bdm_reset_command, "", &ocd_cmd_list);
-  add_cmd ("restart", class_obscure, bdm_restart_command, "", &ocd_cmd_list);
-  add_cmd ("update-flash", class_obscure, bdm_update_flash_command, "", &ocd_cmd_list);
+  /* FIXME: i18n: what documentation? */
+  add_cmd ("reset", class_obscure, bdm_reset_command, (""), &ocd_cmd_list);
+  add_cmd ("restart", class_obscure, bdm_restart_command, (""), &ocd_cmd_list);
+  add_cmd ("update-flash", class_obscure, bdm_update_flash_command, (""), &ocd_cmd_list);
 }
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 58c2f8cb945..3c4cff00d7a 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -633,7 +633,7 @@ _initialize_gdb_osabi (void)
 			&set_osabi_string, "Set OS ABI of target.", &setlist);
 
   set_cmd_sfunc (c, set_osabi);
-  add_cmd ("osabi", class_support, show_osabi, "Show OS/ABI of target.",
+  add_cmd ("osabi", class_support, show_osabi, _("Show OS/ABI of target."),
 	   &showlist);
   user_osabi_state = osabi_auto;
 }
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 51f677b0d72..90c95b74c5e 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -2016,12 +2016,12 @@ with this command or \"print\".", NULL));
   add_info ("display", display_info,
 	    "Expressions to display when program stops, with code numbers.");
 
-  add_cmd ("undisplay", class_vars, undisplay_command,
-	   "Cancel some expressions to be displayed when program stops.\n\
+  add_cmd ("undisplay", class_vars, undisplay_command, _("\
+Cancel some expressions to be displayed when program stops.\n\
 Arguments are the code numbers of the expressions to stop displaying.\n\
 No argument means cancel all automatic-display expressions.\n\
 \"delete display\" has the same effect as this command.\n\
-Do \"info display\" to see current list of code numbers.",
+Do \"info display\" to see current list of code numbers."),
 	   &cmdlist);
 
   add_com ("display", class_vars, display_command,
@@ -2034,23 +2034,23 @@ With no argument, display all currently requested auto-display expressions.\n\
 Use \"undisplay\" to cancel display requests previously made."
     );
 
-  add_cmd ("display", class_vars, enable_display,
-	   "Enable some expressions to be displayed when program stops.\n\
+  add_cmd ("display", class_vars, enable_display, _("\
+Enable some expressions to be displayed when program stops.\n\
 Arguments are the code numbers of the expressions to resume displaying.\n\
 No argument means enable all automatic-display expressions.\n\
-Do \"info display\" to see current list of code numbers.", &enablelist);
+Do \"info display\" to see current list of code numbers."), &enablelist);
 
-  add_cmd ("display", class_vars, disable_display_command,
-	   "Disable some expressions to be displayed when program stops.\n\
+  add_cmd ("display", class_vars, disable_display_command, _("\
+Disable some expressions to be displayed when program stops.\n\
 Arguments are the code numbers of the expressions to stop displaying.\n\
 No argument means disable all automatic-display expressions.\n\
-Do \"info display\" to see current list of code numbers.", &disablelist);
+Do \"info display\" to see current list of code numbers."), &disablelist);
 
-  add_cmd ("display", class_vars, undisplay_command,
-	   "Cancel some expressions to be displayed when program stops.\n\
+  add_cmd ("display", class_vars, undisplay_command, _("\
+Cancel some expressions to be displayed when program stops.\n\
 Arguments are the code numbers of the expressions to stop displaying.\n\
 No argument means cancel all automatic-display expressions.\n\
-Do \"info display\" to see current list of code numbers.", &deletelist);
+Do \"info display\" to see current list of code numbers."), &deletelist);
 
   add_com ("printf", class_vars, printf_command,
 	   "printf \"printf format string\", arg1, arg2, arg3, ..., argn\n\
@@ -2089,13 +2089,13 @@ current working language.  The result is printed and saved in the value\n\
 history, if it is not void.");
   set_cmd_completer (c, location_completer);
 
-  add_cmd ("variable", class_vars, set_command,
-	   "Evaluate expression EXP and assign result to variable VAR, using assignment\n\
+  add_cmd ("variable", class_vars, set_command, _("\
+Evaluate expression EXP and assign result to variable VAR, using assignment\n\
 syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n\
 example).  VAR may be a debugger \"convenience\" variable (names starting\n\
 with $), a register (a few standard names starting with $), or an actual\n\
 variable in the program being debugged.  EXP is any valid expression.\n\
-This may usually be abbreviated to simply \"set\".",
+This may usually be abbreviated to simply \"set\"."),
 	   &setlist);
 
   c = add_com ("print", class_vars, print_command,
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 769077ecd4c..f65a67fd735 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -1421,25 +1421,21 @@ _initialize_regcache (void)
       registers.  For now, -1 is special, and means `no current process'.  */
   registers_ptid = pid_to_ptid (-1);
 
-  add_cmd ("registers", class_maintenance,
-	   maintenance_print_registers,
-	   "Print the internal register configuration.\
-Takes an optional file parameter.",
-	   &maintenanceprintlist);
+  add_cmd ("registers", class_maintenance, maintenance_print_registers, _("\
+Print the internal register configuration.\n\
+Takes an optional file parameter."), &maintenanceprintlist);
   add_cmd ("raw-registers", class_maintenance,
-	   maintenance_print_raw_registers,
-	   "Print the internal register configuration including raw values.\
-Takes an optional file parameter.",
-	   &maintenanceprintlist);
+	   maintenance_print_raw_registers, _("\
+Print the internal register configuration including raw values.\n\
+Takes an optional file parameter."), &maintenanceprintlist);
   add_cmd ("cooked-registers", class_maintenance,
-	   maintenance_print_cooked_registers,
-	   "Print the internal register configuration including cooked values.\
-Takes an optional file parameter.",
-	   &maintenanceprintlist);
+	   maintenance_print_cooked_registers, _("\
+Print the internal register configuration including cooked values.\n\
+Takes an optional file parameter."), &maintenanceprintlist);
   add_cmd ("register-groups", class_maintenance,
-	   maintenance_print_register_groups,
-	   "Print the internal register configuration including each register's group.\
-Takes an optional file parameter.",
+	   maintenance_print_register_groups, _("\
+Print the internal register configuration including each register's group.\n\
+Takes an optional file parameter."),
 	   &maintenanceprintlist);
 
 }
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 858ab9d958c..407a5b274b0 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -280,9 +280,9 @@ _initialize_reggroup (void)
   add_group (&default_groups, restore_reggroup, XMALLOC (struct reggroup_el));
 
   add_cmd ("reggroups", class_maintenance,
-	   maintenance_print_reggroups, "\
+	   maintenance_print_reggroups, _("\
 Print the internal register group names.\n\
-Takes an optional file parameter.",
+Takes an optional file parameter."),
 	   &maintenanceprintlist);
 
 }
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 26297a9906a..d2090e602a4 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -1376,10 +1376,10 @@ initialize_remote_fileio (struct cmd_list_element *remote_set_cmdlist,
 {
   add_cmd ("system-call-allowed", no_class,
 	   set_system_call_allowed,
-	   "Set if the host system(3) call is allowed for the target.\n",
+	   _("Set if the host system(3) call is allowed for the target."),
 	   &remote_set_cmdlist);
   add_cmd ("system-call-allowed", no_class,
 	   show_system_call_allowed,
-	   "Show if the host system(3) call is allowed for the target.\n",
+	   _("Show if the host system(3) call is allowed for the target."),
 	   &remote_show_cmdlist);
 }
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 5532086c571..28d86891c22 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -971,24 +971,22 @@ _initialize_remote_rdi (void)
   Adp_SetLogfile (log_filename);
   Adp_SetLogEnable (log_enable);
 
-  c = add_cmd ("rdilogfile", class_maintenance,
-	       rdilogfile_command,
-	       "Set filename for ADP packet log.\n"
-	       "This file is used to log Angel Debugger Protocol packets.\n"
-	       "With a single argument, sets the logfile name to that value.\n"
-	       "Without an argument, shows the current logfile name.\n"
-	       "See also: rdilogenable\n",
+  c = add_cmd ("rdilogfile", class_maintenance, rdilogfile_command, _("\
+Set filename for ADP packet log.\n\
+This file is used to log Angel Debugger Protocol packets.\n\
+With a single argument, sets the logfile name to that value.\n\
+Without an argument, shows the current logfile name.\n\
+See also: rdilogenable\n"),
 	       &maintenancelist);
   set_cmd_completer (c, filename_completer);
 
-  add_cmd ("rdilogenable", class_maintenance,
-	   rdilogenable_command,
-	   "Set enable logging of ADP packets.\n"
-	   "This will log ADP packets exchanged between gdb and the\n"
-	   "rdi target device.\n"
-	   "An argument of 1, t, true, y or yes will enable.\n"
-	   "An argument of 0, f, false, n or no will disabled.\n"
-	   "Withough an argument, it will display current state.\n",
+  add_cmd ("rdilogenable", class_maintenance, rdilogenable_command, _("\
+Set enable logging of ADP packets.\n\
+This will log ADP packets exchanged between gdb and the\n\
+rdi target device.\n\
+An argument of 1, t, true, y or yes will enable.\n\
+An argument of 0, f, false, n or no will disabled.\n\
+Withough an argument, it will display current state."),
 	   &maintenancelist);
 
   add_setshow_boolean_cmd ("rdiromatzero", no_class, &rom_at_zero, _("\
diff --git a/gdb/remote.c b/gdb/remote.c
index 26921a4f991..33379fdb9ef 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5583,18 +5583,18 @@ the packets being used",
 		  &remote_show_cmdlist, "show remote ",
 		  0 /* allow-unknown */, &showlist);
 
-  add_cmd ("compare-sections", class_obscure, compare_sections_command,
-	   "Compare section data on target to the exec file.\n\
-Argument is a single section name (default: all loaded sections).",
+  add_cmd ("compare-sections", class_obscure, compare_sections_command, _("\
+Compare section data on target to the exec file.\n\
+Argument is a single section name (default: all loaded sections)."),
 	   &cmdlist);
 
-  add_cmd ("packet", class_maintenance, packet_command,
-	   "Send an arbitrary packet to a remote target.\n\
+  add_cmd ("packet", class_maintenance, packet_command, _("\
+Send an arbitrary packet to a remote target.\n\
    maintenance packet TEXT\n\
 If GDB is talking to an inferior via the GDB serial protocol, then\n\
 this command sends the string TEXT to the inferior, and displays the\n\
 response packet.  GDB supplies the initial `$' character, and the\n\
-terminating `#' character and checksum.",
+terminating `#' character and checksum."),
 	   &maintenancelist);
 
   add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, _("\
@@ -5607,35 +5607,35 @@ If set, a break, instead of a cntrl-c, is sent to the remote target."),
 
   /* Install commands for configuring memory read/write packets.  */
 
-  add_cmd ("remotewritesize", no_class, set_memory_write_packet_size,
-	   "Set the maximum number of bytes per memory write packet (deprecated).\n",
+  add_cmd ("remotewritesize", no_class, set_memory_write_packet_size, _("\
+Set the maximum number of bytes per memory write packet (deprecated)."),
 	   &setlist);
-  add_cmd ("remotewritesize", no_class, show_memory_write_packet_size,
-	   "Show the maximum number of bytes per memory write packet (deprecated).\n",
+  add_cmd ("remotewritesize", no_class, show_memory_write_packet_size, _("\
+Show the maximum number of bytes per memory write packet (deprecated)."),
 	   &showlist);
   add_cmd ("memory-write-packet-size", no_class,
-	   set_memory_write_packet_size,
-	   "Set the maximum number of bytes per memory-write packet.\n"
-	   "Specify the number of bytes in a packet or 0 (zero) for the\n"
-	   "default packet size.  The actual limit is further reduced\n"
-	   "dependent on the target.  Specify ``fixed'' to disable the\n"
-	   "further restriction and ``limit'' to enable that restriction\n",
+	   set_memory_write_packet_size, _("\
+Set the maximum number of bytes per memory-write packet.\n\
+Specify the number of bytes in a packet or 0 (zero) for the\n\
+default packet size.  The actual limit is further reduced\n\
+dependent on the target.  Specify ``fixed'' to disable the\n\
+further restriction and ``limit'' to enable that restriction."),
 	   &remote_set_cmdlist);
   add_cmd ("memory-read-packet-size", no_class,
-	   set_memory_read_packet_size,
-	   "Set the maximum number of bytes per memory-read packet.\n"
-	   "Specify the number of bytes in a packet or 0 (zero) for the\n"
-	   "default packet size.  The actual limit is further reduced\n"
-	   "dependent on the target.  Specify ``fixed'' to disable the\n"
-	   "further restriction and ``limit'' to enable that restriction\n",
+	   set_memory_read_packet_size, _("\
+Set the maximum number of bytes per memory-read packet.\n\
+Specify the number of bytes in a packet or 0 (zero) for the\n\
+default packet size.  The actual limit is further reduced\n\
+dependent on the target.  Specify ``fixed'' to disable the\n\
+further restriction and ``limit'' to enable that restriction."),
 	   &remote_set_cmdlist);
   add_cmd ("memory-write-packet-size", no_class,
 	   show_memory_write_packet_size,
-	   "Show the maximum number of bytes per memory-write packet.\n",
+	   _("Show the maximum number of bytes per memory-write packet."),
 	   &remote_show_cmdlist);
   add_cmd ("memory-read-packet-size", no_class,
 	   show_memory_read_packet_size,
-	   "Show the maximum number of bytes per memory-read packet.\n",
+	   _("Show the maximum number of bytes per memory-read packet."),
 	   &remote_show_cmdlist);
 
   add_setshow_zinteger_cmd ("hardware-watchpoint-limit", no_class,
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 18d24e730d1..8b208765e4b 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -1658,7 +1658,7 @@ _initialize_sol_thread (void)
   procfs_suppress_run = 1;
 
   add_cmd ("sol-threads", class_maintenance, info_solthreads,
-	   "Show info on Solaris user threads.\n", &maintenanceinfolist);
+	   _("Show info on Solaris user threads."), &maintenanceinfolist);
 
   memcpy (&orig_core_ops, &core_ops, sizeof (struct target_ops));
   memcpy (&core_ops, &sol_core_ops, sizeof (struct target_ops));
diff --git a/gdb/source.c b/gdb/source.c
index 1b3690fbf63..1539b6c2cf2 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1574,12 +1574,12 @@ _initialize_source (void)
      just an approximation.  */
   re_set_syntax (RE_SYNTAX_GREP);
 
-  c = add_cmd ("directory", class_files, directory_command,
-	       "Add directory DIR to beginning of search path for source files.\n\
+  c = add_cmd ("directory", class_files, directory_command, _("\
+Add directory DIR to beginning of search path for source files.\n\
 Forget cached info on source file locations and line positions.\n\
 DIR can also be $cwd for the current working directory, or $cdir for the\n\
 directory in which the source file was compiled into object code.\n\
-With no argument, reset the search path to $cdir:$cwd, the default.",
+With no argument, reset the search path to $cdir:$cwd, the default."),
 	       &cmdlist);
 
   if (dbx_commands)
@@ -1587,19 +1587,19 @@ With no argument, reset the search path to $cdir:$cwd, the default.",
 
   set_cmd_completer (c, filename_completer);
 
-  add_cmd ("directories", no_class, show_directories,
-	   "Current search path for finding source files.\n\
+  add_cmd ("directories", no_class, show_directories, _("\
+Current search path for finding source files.\n\
 $cwd in the path means the current working directory.\n\
-$cdir in the path means the compilation directory of the source file.",
+$cdir in the path means the compilation directory of the source file."),
 	   &showlist);
 
   if (xdb_commands)
     {
       add_com_alias ("D", "directory", class_files, 0);
-      add_cmd ("ld", no_class, show_directories,
-	       "Current search path for finding source files.\n\
+      add_cmd ("ld", no_class, show_directories, _("\
+Current search path for finding source files.\n\
 $cwd in the path means the current working directory.\n\
-$cdir in the path means the compilation directory of the source file.",
+$cdir in the path means the compilation directory of the source file."),
 	       &cmdlist);
     }
 
diff --git a/gdb/stack.c b/gdb/stack.c
index d1e8f83bf42..54af2b9480a 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2099,8 +2099,8 @@ Usage: T <count>\n");
 	    "Exceptions that can be caught in the current stack frame.");
 
 #if 0
-  add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command,
-  "Specify maximum number of frames for \"backtrace\" to print by default.",
+  add_cmd ("backtrace-limit", class_stack, set_backtrace_limit_command, _(\
+"Specify maximum number of frames for \"backtrace\" to print by default."),
 	   &setlist);
   add_info ("backtrace-limit", backtrace_limit_info,
      "The maximum number of frames for \"backtrace\" to print by default.");
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 2094a9c2a41..6e2fca4c2c7 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -223,10 +223,9 @@ void
 _initialize_symfile_mem (void)
 {
   add_cmd ("add-symbol-file-from-memory", class_files,
-           add_symbol_file_from_memory_command,
-           "\
+           add_symbol_file_from_memory_command, _("\
 Load the symbols out of memory from a dynamically loaded object file.\n\
-Give an expression for the address of the file's shared object file header.",
+Give an expression for the address of the file's shared object file header."),
            &cmdlist);
 
   /* Want to know of each new inferior so that its vsyscall info can
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 08ae12d0a6b..e17e53aa84b 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -3534,32 +3534,32 @@ _initialize_symfile (void)
 {
   struct cmd_list_element *c;
 
-  c = add_cmd ("symbol-file", class_files, symbol_file_command,
-	       "Load symbol table from executable file FILE.\n\
+  c = add_cmd ("symbol-file", class_files, symbol_file_command, _("\
+Load symbol table from executable file FILE.\n\
 The `file' command can also load symbol tables, as well as setting the file\n\
-to execute.", &cmdlist);
+to execute."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
-  c = add_cmd ("add-symbol-file", class_files, add_symbol_file_command,
-	       "Usage: add-symbol-file FILE ADDR [-s <SECT> <SECT_ADDR> -s <SECT> <SECT_ADDR> ...]\n\
+  c = add_cmd ("add-symbol-file", class_files, add_symbol_file_command, _("\
+Usage: add-symbol-file FILE ADDR [-s <SECT> <SECT_ADDR> -s <SECT> <SECT_ADDR> ...]\n\
 Load the symbols from FILE, assuming FILE has been dynamically loaded.\n\
 ADDR is the starting address of the file's text.\n\
 The optional arguments are section-name section-address pairs and\n\
 should be specified if the data and bss segments are not contiguous\n\
-with the text.  SECT is a section name to be loaded at SECT_ADDR.",
+with the text.  SECT is a section name to be loaded at SECT_ADDR."),
 	       &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   c = add_cmd ("add-shared-symbol-files", class_files,
-	       add_shared_symbol_files_command,
-   "Load the symbols from shared objects in the dynamic linker's link map.",
+	       add_shared_symbol_files_command, _("\
+Load the symbols from shared objects in the dynamic linker's link map."),
 	       &cmdlist);
   c = add_alias_cmd ("assf", "add-shared-symbol-files", class_files, 1,
 		     &cmdlist);
 
-  c = add_cmd ("load", class_files, load_command,
-	       "Dynamically load FILE into the running program, and record its symbols\n\
-for access from GDB.", &cmdlist);
+  c = add_cmd ("load", class_files, load_command, _("\
+Dynamically load FILE into the running program, and record its symbols\n\
+for access from GDB."), &cmdlist);
   set_cmd_completer (c, filename_completer);
 
   deprecated_add_show_from_set
@@ -3577,22 +3577,22 @@ for access from GDB.", &cmdlist);
   add_com_alias ("ov", "overlay", class_alias, 1);
 
   add_cmd ("map-overlay", class_support, map_overlay_command,
-	   "Assert that an overlay section is mapped.", &overlaylist);
+	   _("Assert that an overlay section is mapped."), &overlaylist);
 
   add_cmd ("unmap-overlay", class_support, unmap_overlay_command,
-	   "Assert that an overlay section is unmapped.", &overlaylist);
+	   _("Assert that an overlay section is unmapped."), &overlaylist);
 
   add_cmd ("list-overlays", class_support, list_overlays_command,
-	   "List mappings of overlay sections.", &overlaylist);
+	   _("List mappings of overlay sections."), &overlaylist);
 
   add_cmd ("manual", class_support, overlay_manual_command,
-	   "Enable overlay debugging.", &overlaylist);
+	   _("Enable overlay debugging."), &overlaylist);
   add_cmd ("off", class_support, overlay_off_command,
-	   "Disable overlay debugging.", &overlaylist);
+	   _("Disable overlay debugging."), &overlaylist);
   add_cmd ("auto", class_support, overlay_auto_command,
-	   "Enable automatic overlay debugging.", &overlaylist);
+	   _("Enable automatic overlay debugging."), &overlaylist);
   add_cmd ("load-target", class_support, overlay_load_command,
-	   "Read the overlay mapping state from the target.", &overlaylist);
+	   _("Read the overlay mapping state from the target."), &overlaylist);
 
   /* Filename extension to source language lookup table: */
   init_filename_language_table ();
diff --git a/gdb/thread.c b/gdb/thread.c
index 9202bec9dfa..249f096b057 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -693,7 +693,7 @@ The new thread ID must be currently known.", &thread_cmd_list, "thread ", 1, &cm
 		  &thread_apply_list, "apply ", 1, &thread_cmd_list);
 
   add_cmd ("all", class_run, thread_apply_all_command,
-	   "Apply a command to all threads.", &thread_apply_list);
+	   _("Apply a command to all threads."), &thread_apply_list);
 
   if (!xdb_commands)
     add_com_alias ("t", "thread", class_run, 1);
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 9ec09fa8173..b005c566e2a 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2713,7 +2713,7 @@ _initialize_tracepoint (void)
 	    "List the variables local to a scope");
 
   add_cmd ("tracepoints", class_trace, NULL,
-	   "Tracing of program execution without stopping the program.",
+	   _("Tracing of program execution without stopping the program."),
 	   &cmdlist);
 
   add_info ("tracepoints", tracepoints_info,
@@ -2736,44 +2736,44 @@ Use the 'source' command in another debug session to restore them.");
 No argument means forward by one frame; '-' means backward by one frame.",
 		  &tfindlist, "tfind ", 1, &cmdlist);
 
-  add_cmd ("outside", class_trace, trace_find_outside_command,
-	   "Select a trace frame whose PC is outside the given \
-range.\nUsage: tfind outside addr1, addr2",
+  add_cmd ("outside", class_trace, trace_find_outside_command, _("\
+Select a trace frame whose PC is outside the given range.\n\
+Usage: tfind outside addr1, addr2"),
 	   &tfindlist);
 
-  add_cmd ("range", class_trace, trace_find_range_command,
-	   "Select a trace frame whose PC is in the given range.\n\
-Usage: tfind range addr1,addr2",
+  add_cmd ("range", class_trace, trace_find_range_command, _("\
+Select a trace frame whose PC is in the given range.\n\
+Usage: tfind range addr1,addr2"),
 	   &tfindlist);
 
-  add_cmd ("line", class_trace, trace_find_line_command,
-	   "Select a trace frame by source line.\n\
+  add_cmd ("line", class_trace, trace_find_line_command, _("\
+Select a trace frame by source line.\n\
 Argument can be a line number (with optional source file), \n\
 a function name, or '*' followed by an address.\n\
-Default argument is 'the next source line that was traced'.",
+Default argument is 'the next source line that was traced'."),
 	   &tfindlist);
 
-  add_cmd ("tracepoint", class_trace, trace_find_tracepoint_command,
-	   "Select a trace frame by tracepoint number.\n\
-Default is the tracepoint for the current trace frame.",
+  add_cmd ("tracepoint", class_trace, trace_find_tracepoint_command, _("\
+Select a trace frame by tracepoint number.\n\
+Default is the tracepoint for the current trace frame."),
 	   &tfindlist);
 
-  add_cmd ("pc", class_trace, trace_find_pc_command,
-	   "Select a trace frame by PC.\n\
-Default is the current PC, or the PC of the current trace frame.",
+  add_cmd ("pc", class_trace, trace_find_pc_command, _("\
+Select a trace frame by PC.\n\
+Default is the current PC, or the PC of the current trace frame."),
 	   &tfindlist);
 
-  add_cmd ("end", class_trace, trace_find_end_command,
-	   "Synonym for 'none'.\n\
-De-select any trace frame and resume 'live' debugging.",
+  add_cmd ("end", class_trace, trace_find_end_command, _("\
+Synonym for 'none'.\n\
+De-select any trace frame and resume 'live' debugging."),
 	   &tfindlist);
 
   add_cmd ("none", class_trace, trace_find_none_command,
-	   "De-select any trace frame and resume 'live' debugging.",
+	   _("De-select any trace frame and resume 'live' debugging."),
 	   &tfindlist);
 
   add_cmd ("start", class_trace, trace_find_start_command,
-	   "Select the first trace frame in the trace buffer.",
+	   _("Select the first trace frame in the trace buffer."),
 	   &tfindlist);
 
   add_com ("tstatus", class_trace, trace_status_command,
@@ -2825,22 +2825,22 @@ Tracepoint actions may include collecting of specified data, \n\
 single-stepping, or enabling/disabling other tracepoints, \n\
 depending on target's capabilities.");
 
-  add_cmd ("tracepoints", class_trace, delete_trace_command,
-	   "Delete specified tracepoints.\n\
+  add_cmd ("tracepoints", class_trace, delete_trace_command, _("\
+Delete specified tracepoints.\n\
 Arguments are tracepoint numbers, separated by spaces.\n\
-No argument means delete all tracepoints.",
+No argument means delete all tracepoints."),
 	   &deletelist);
 
-  add_cmd ("tracepoints", class_trace, disable_trace_command,
-	   "Disable specified tracepoints.\n\
+  add_cmd ("tracepoints", class_trace, disable_trace_command, _("\
+Disable specified tracepoints.\n\
 Arguments are tracepoint numbers, separated by spaces.\n\
-No argument means disable all tracepoints.",
+No argument means disable all tracepoints."),
 	   &disablelist);
 
-  add_cmd ("tracepoints", class_trace, enable_trace_command,
-	   "Enable specified tracepoints.\n\
+  add_cmd ("tracepoints", class_trace, enable_trace_command, _("\
+Enable specified tracepoints.\n\
 Arguments are tracepoint numbers, separated by spaces.\n\
-No argument means enable all tracepoints.",
+No argument means enable all tracepoints."),
 	   &enablelist);
 
   c = add_com ("trace", class_trace, trace_command,
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index f7626b4b2c4..659c2b65adc 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -600,16 +600,16 @@ _initialize_tui_regs (void)
                   tuicmd);
 
   add_cmd ("float", class_tui, tui_reg_float_command,
-           "Display only floating point registers\n",
+           _("Display only floating point registers."),
            &tuireglist);
   add_cmd ("general", class_tui, tui_reg_general_command,
-           "Display only general registers\n",
+           _("Display only general registers."),
            &tuireglist);
   add_cmd ("system", class_tui, tui_reg_system_command,
-           "Display only system registers\n",
+           _("Display only system registers."),
            &tuireglist);
   add_cmd ("next", class_tui, tui_reg_next_command,
-           "Display next register group\n",
+           _("Display next register group."),
            &tuireglist);
 
   if (xdb_commands)
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 0085d7de5c8..189d1b9755e 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -1272,14 +1272,14 @@ _initialize_valprint (void)
      independent variables to be either set or shown with a single
      command.  So the usual deprecated_add_set_cmd() and
      add_show_from_set() commands aren't really appropriate. */
-  add_cmd ("radix", class_support, set_radix,
-	   "Set default input and output number radices.\n\
+  add_cmd ("radix", class_support, set_radix, _("\
+Set default input and output number radices.\n\
 Use 'set input-radix' or 'set output-radix' to independently set each.\n\
-Without an argument, sets both radices back to the default value of 10.",
+Without an argument, sets both radices back to the default value of 10."),
 	   &setlist);
-  add_cmd ("radix", class_support, show_radix,
-	   "Show the default input and output number radices.\n\
-Use 'show input-radix' or 'show output-radix' to independently show each.",
+  add_cmd ("radix", class_support, show_radix, _("\
+Show the default input and output number radices.\n\
+Use 'show input-radix' or 'show output-radix' to independently show each."),
 	   &showlist);
 
   /* Give people the defaults which they are used to.  */
diff --git a/gdb/value.c b/gdb/value.c
index 4f870928afc..eb0cc2c8633 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1606,16 +1606,17 @@ using_struct_return (struct type *value_type, int gcc_p)
 void
 _initialize_values (void)
 {
-  add_cmd ("convenience", no_class, show_convenience,
-	   "Debugger convenience (\"$foo\") variables.\n\
+  add_cmd ("convenience", no_class, show_convenience, _("\
+Debugger convenience (\"$foo\") variables.\n\
 These variables are created when you assign them values;\n\
-thus, \"print $foo=1\" gives \"$foo\" the value 1.  Values may be any type.\n\n\
+thus, \"print $foo=1\" gives \"$foo\" the value 1.  Values may be any type.\n\
+\n\
 A few convenience variables are given values automatically:\n\
 \"$_\"holds the last address examined with \"x\" or \"info lines\",\n\
-\"$__\" holds the contents of the last address examined with \"x\".",
+\"$__\" holds the contents of the last address examined with \"x\"."),
 	   &showlist);
 
   add_cmd ("values", no_class, show_values,
-	   "Elements of value history around item number IDX (or last ten).",
+	   _("Elements of value history around item number IDX (or last ten)."),
 	   &showlist);
 }
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 643135c6a03..b5edd6de02c 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -2180,7 +2180,7 @@ _initialize_win32_nat (void)
 		  &info_w32_cmdlist, "info w32 ", 0, &infolist);
 
   add_cmd ("selector", class_info, display_selectors,
-	   "Display selectors infos.",
+	   _("Display selectors infos."),
 	   &info_w32_cmdlist);
 
   add_target (&deprecated_child_ops);