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

	Mark up add_setshow functions, replace "PRINT:" comment prefix
	with "FIXME: i18n:".
	* aix-thread.c, alpha-tdep.c, arm-tdep.c, breakpoint.c: Update.
	* cris-tdep.c, dwarf2read.c, frame.c, hppa-tdep.c: Update.
	* infcall.c, m32r-rom.c, maint.c, mips-tdep.c: Update.
	* nto-tdep.c, observer.c, remote-rdi.c, remote.c: Update.
	* target.c, cli/cli-logging.c: Update.

19 files changed, 195 insertions, 184 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cbb5747..8f4d176 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2005-02-14  Andrew Cagney  <cagney@gnu.org>
 
+	Mark up add_setshow functions, replace "PRINT:" comment prefix
+	with "FIXME: i18n:".
+	* aix-thread.c, alpha-tdep.c, arm-tdep.c, breakpoint.c: Update.
+	* cris-tdep.c, dwarf2read.c, frame.c, hppa-tdep.c: Update.
+	* infcall.c, m32r-rom.c, maint.c, mips-tdep.c: Update.
+	* nto-tdep.c, observer.c, remote-rdi.c, remote.c: Update.
+	* target.c, cli/cli-logging.c: Update.
+
 	* utils.c (paddress): New function.
 	* defs.h (paddress): Declare.
 	* printcmd.c (deprecated_print_address_numeric): Rename
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index bc746d9..f7a7331 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -1781,6 +1781,6 @@ _initialize_aix_thread (void)
 			    _("Set debugging of AIX thread module."),
 			    _("Show debugging of AIX thread module."),
 			    _("Enables debugging output (used to debug GDB)."),
-			    _("Debugging of AIX thread module is \"%d\"."),
+			    NULL, /* FIXME: i18n: Debugging of AIX thread module is \"%d\".  */
 			    NULL, NULL, &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index 142bc32..fc6ee9a 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -1586,16 +1586,13 @@ _initialize_alpha_tdep (void)
   /* We need to throw away the frame cache when we set this, since it
      might change our ability to get backtraces.  */
   add_setshow_zinteger_cmd ("heuristic-fence-post", class_support,
-			    &heuristic_fence_post,
-			    _("\
-Set the distance searched for the start of a function."),
-			    _("\
-Show the distance searched for the start of a function."),
-			    _("\
+			    &heuristic_fence_post, _("\
+Set the distance searched for the start of a function."), _("\
+Show the distance searched for the start of a function."), _("\
 If you are debugging a stripped executable, GDB needs to search through the\n\
 program for the start of a function.  This command sets the distance of the\n\
 search.  The only need to set it is when debugging a stripped executable."),
-			    NULL, /* PRINT: The distance searched for the start of a function is \"%d\".  */
+			    NULL, /* FIXME: i18n: The distance searched for the start of a function is \"%d\".  */
 			    reinit_frame_cache_sfunc, NULL,
 			    &setlist, &showlist);
 }
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 8352bf3..6124d42 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -2884,7 +2884,7 @@ _initialize_arm_tdep (void)
 		       _("Set the disassembly style."),
 		       _("Show the disassembly style."),
 		       helptext,
-		       NULL, /* PRINT: The disassembly style is \"%s\".  */
+		       NULL, /* FIXME: i18n: The disassembly style is \"%s\".  */
 		       set_disassembly_style_sfunc, NULL,
 		       &setarmcmdlist, &showarmcmdlist);
 
@@ -2892,7 +2892,7 @@ _initialize_arm_tdep (void)
 			   _("Set usage of ARM 32-bit mode."),
 			   _("Show usage of ARM 32-bit mode."),
 			   _("When off, a 26-bit PC will be used."),
-			   NULL, /* PRINT: "Usage of ARM 32-bit mode is %s.  */
+			   NULL, /* FIXME: i18n: Usage of ARM 32-bit mode is %s.  */
 			   NULL, NULL,
 			   &setarmcmdlist, &showarmcmdlist);
 
@@ -2905,7 +2905,7 @@ softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n\
 fpa - FPA co-processor (GCC compiled).\n\
 softvfp - Software FP with pure-endian doubles.\n\
 vfp - VFP co-processor."),
-			NULL, /* PRINT: "The floating point type is \"%s\".  */
+			NULL, /* FIXME: i18n: "The floating point type is \"%s\".  */
 			set_fp_model_sfunc, show_fp_model,
 			&setarmcmdlist, &showarmcmdlist);
 
@@ -2914,7 +2914,7 @@ vfp - VFP co-processor."),
 			   _("Set ARM debugging."),
 			   _("Show ARM debugging."),
 			   _("When on, arm-specific debugging is enabled."),
-			   NULL, /* PRINT: "ARM debugging is %s.  */
+			   NULL, /* FIXME: i18n: "ARM debugging is %s.  */
 			   NULL, NULL,
 			   &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ca85d51..ae5d79f 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7947,14 +7947,15 @@ pending breakpoint behavior",
 		  &breakpoint_show_cmdlist, "show breakpoint ",
 		  0/*allow-unknown*/, &showlist);
 
-  add_setshow_auto_boolean_cmd ("pending", no_class, &pending_break_support, "\
-Set debugger's behavior regarding pending breakpoints.", "\
-Show debugger's behavior regarding pending breakpoints.", "\
+  add_setshow_auto_boolean_cmd ("pending", no_class,
+				&pending_break_support, _("\
+Set debugger's behavior regarding pending breakpoints."), _("\
+Show debugger's behavior regarding pending breakpoints."), _("\
 If on, an unrecognized breakpoint location will cause gdb to create a\n\
 pending breakpoint.  If off, an unrecognized breakpoint location results in\n\
 an error.  If auto, an unrecognized breakpoint location results in a\n\
-user-query to see if a pending breakpoint should be created.",
-				NULL, /*  PRINT: Debugger's behavior regarding pending breakpoints is %s.  */
+user-query to see if a pending breakpoint should be created."),
+				NULL, /* FIXME: i18n: Debugger's behavior regarding pending breakpoints is %s.  */
 				NULL, NULL,
 				&breakpoint_set_cmdlist,
 				&breakpoint_show_cmdlist);
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index c03b420..47e24b3 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -175,24 +175,24 @@ _initialize_cli_logging (void)
   add_prefix_cmd ("logging", class_support, show_logging_command,
 		  "Show logging options", &show_logging_cmdlist,
 		  "show logging ", 0, &showlist);
-  add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite, "\
-Set whether logging overwrites or appends to the log file.", "\
-Show whether logging overwrites or appends to the log file.", "\
-If set, logging overrides the log file.",
-			   NULL, /* PRINT: Whether logging overwrites or appends to the log file is %s.  */
+  add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite, _("\
+Set whether logging overwrites or appends to the log file."), _("\
+Show whether logging overwrites or appends to the log file."), _("\
+If set, logging overrides the log file."),
+			   NULL, /* FIXME: i18n: Whether logging overwrites or appends to the log file is %s.  */
 			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
-  add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, "\
-Set the logging output mode.", "\
-Show the logging output mode.", "\
+  add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, _("\
+Set the logging output mode."), _("\
+Show the logging output mode."), _("\
 If redirect is off, output will go to both the screen and the log file.\n\
-If redirect is on, output will go only to the log file.",
-			   NULL, /* PRINT: The logging output mode is %s.  */
+If redirect is on, output will go only to the log file."),
+			   NULL, /* FIXME: i18n: The logging output mode is %s.  */
 			   NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
-  add_setshow_filename_cmd ("file", class_support, &logging_filename, "\
-Set the current logfile.", "\
-Show the current logfile.", "\
-The logfile is used when directing GDB's output.",
-			    NULL, /* PRINT: The current logfile is %s.  */
+  add_setshow_filename_cmd ("file", class_support, &logging_filename, _("\
+Set the current logfile."), _("\
+Show the current logfile."), _("\
+The logfile is used when directing GDB's output."),
+			    NULL, /* FIXME: i18n: The current logfile is %s.  */
 			    NULL, NULL,
 			    &set_logging_cmdlist, &show_logging_cmdlist);
   add_cmd ("on", class_support, set_logging_on,
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index b5335e3..bab63c0 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -3916,19 +3916,19 @@ _initialize_cris_tdep (void)
   /* CRIS-specific user-commands.  */
   add_setshow_uinteger_cmd ("cris-version", class_support, 
 			    &usr_cmd_cris_version, 
-			    "Set the current CRIS version.",
-			    "Show the current CRIS version.",
-			    "Set if autodetection fails.",
-			    NULL, /* PRINT: Current CRIS version is %s.  */
+			    _("Set the current CRIS version."),
+			    _("Show the current CRIS version."),
+			    _("Set if autodetection fails."),
+			    NULL, /* FIXME: i18n: Current CRIS version is %s.  */
 			    set_cris_version, NULL,
 			    &setlist, &showlist);
   
   add_setshow_boolean_cmd ("cris-dwarf2-cfi", class_support,
 			   &usr_cmd_cris_dwarf2_cfi,
-			   "Set the usage of Dwarf-2 CFI for CRIS.",
-			   "Show the usage of Dwarf-2 CFI for CRIS.",
-			   "Set to \"off\" if using gcc-cris < R59.",
-			   NULL, /* PRINT: Usage of Dwarf-2 CFI for CRIS is %d.  */
+			   _("Set the usage of Dwarf-2 CFI for CRIS."),
+			   _("Show the usage of Dwarf-2 CFI for CRIS."),
+			   _("Set to \"off\" if using gcc-cris < R59."),
+			   NULL, /* FIXME: i18n: Usage of Dwarf-2 CFI for CRIS is %d.  */
 			   set_cris_dwarf2_cfi, NULL,
 			   &setlist, &showlist);
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 2b5222c..5d0493f 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -9643,17 +9643,13 @@ _initialize_dwarf2_read (void)
                   0/*allow-unknown*/, &maintenance_show_cmdlist);
 
   add_setshow_zinteger_cmd ("max-cache-age", class_obscure,
-			    &dwarf2_max_cache_age,
-			    "Set the upper bound on the age of cached "
-			    "dwarf2 compilation units.",
-			    "Show the upper bound on the age of cached "
-			    "dwarf2 compilation units.",
-			    "A higher limit means that cached "
-			    "compilation units will be stored\n"
-			    "in memory longer, and more total memory will "
-			    "be used.  Zero disables\n"
-			    "caching, which can slow down startup.",
-			    NULL, /* PRINT: The upper bound on the age of cached dwarf2 compilation units is %d.  */
+			    &dwarf2_max_cache_age, _("\
+Set the upper bound on the age of cached dwarf2 compilation units."), _("\
+Show the upper bound on the age of cached dwarf2 compilation units."), _("\
+A higher limit means that cached compilation units will be stored\n\
+in memory longer, and more total memory will be used.  Zero disables\n\
+caching, which can slow down startup."),
+			    NULL, /* FIXME: i18n: The upper bound on the age of cached dwarf2 compilation units is %d.  */
 			    NULL, NULL, &set_dwarf2_cmdlist,
 			    &show_dwarf2_cmdlist);
 }
diff --git a/gdb/frame.c b/gdb/frame.c
index c1988b8..eb1fbdb 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1550,34 +1550,36 @@ Show backtrace variables such as the backtrace limit",
 		  0/*allow-unknown*/, &showlist);
 
   add_setshow_boolean_cmd ("past-main", class_obscure,
-			   &backtrace_past_main, "\
-Set whether backtraces should continue past \"main\".", "\
-Show whether backtraces should continue past \"main\".", "\
+			   &backtrace_past_main, _("\
+Set whether backtraces should continue past \"main\"."), _("\
+Show whether backtraces should continue past \"main\"."), _("\
 Normally the caller of \"main\" is not of interest, so GDB will terminate\n\
 the backtrace at \"main\".  Set this variable if you need to see the rest\n\
-of the stack trace.",
-			   NULL, /* PRINT: Whether backtraces should continue past \"main\" is %s.  */
+of the stack trace."),
+			   NULL, /* FIXME: i18n: Whether backtraces should continue past \"main\" is %s.  */
 			   NULL, NULL, &set_backtrace_cmdlist,
 			   &show_backtrace_cmdlist);
 
   add_setshow_boolean_cmd ("past-entry", class_obscure,
-			   &backtrace_past_entry, "\
-Set whether backtraces should continue past the entry point of a program.", "\
-Show whether backtraces should continue past the entry point of a program.", "\
+			   &backtrace_past_entry, _("\
+Set whether backtraces should continue past the entry point of a program."),
+			   _("\
+Show whether backtraces should continue past the entry point of a program."),
+			   _("\
 Normally there are no callers beyond the entry point of a program, so GDB\n\
 will terminate the backtrace there.  Set this variable if you need to see \n\
-the rest of the stack trace.",
-			   NULL, /* PRINT: Whether backtraces should continue past the entry point is %s.  */
+the rest of the stack trace."),
+			   NULL, /* FIXME: i18n: Whether backtraces should continue past the entry point is %s.  */
 			   NULL, NULL, &set_backtrace_cmdlist,
 			   &show_backtrace_cmdlist);
 
   add_setshow_uinteger_cmd ("limit", class_obscure,
-			    &backtrace_limit, "\
-Set an upper bound on the number of backtrace levels.", "\
-Show the upper bound on the number of backtrace levels.", "\
+			    &backtrace_limit, _("\
+Set an upper bound on the number of backtrace levels."), _("\
+Show the upper bound on the number of backtrace levels."), _("\
 No more than the specified number of frames can be displayed or examined.\n\
-Zero is unlimited.",
-			    NULL, /* PRINT: An upper bound on the number of backtrace levels is %s.  */
+Zero is unlimited."),
+			    NULL, /* FIXME: i18n: An upper bound on the number of backtrace levels is %s.  */
 			    NULL, NULL, &set_backtrace_cmdlist,
 			    &show_backtrace_cmdlist);
 
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index f2d3ff6..56818aa 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -2872,12 +2872,13 @@ _initialize_hppa_tdep (void)
 	   &maintenanceprintlist);
 
   /* Debug this files internals. */
-  add_setshow_boolean_cmd ("hppa", class_maintenance, &hppa_debug, "\
-Set whether hppa target specific debugging information should be displayed.", "\
-Show whether hppa target specific debugging information is displayed.", "\
+  add_setshow_boolean_cmd ("hppa", class_maintenance, &hppa_debug, _("\
+Set whether hppa target specific debugging information should be displayed."),
+			   _("\
+Show whether hppa target specific debugging information is displayed."), _("\
 This flag controls whether hppa target specific debugging information is\n\
 displayed.  This information is particularly useful for debugging frame\n\
-unwinding problems.",
-			   NULL, /* PRINT hppa debug flag is %s.  */
+unwinding problems."),
+			   NULL, /* FIXME: i18n: hppa debug flag is %s.  */
 			   NULL, NULL, &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 9246cc0..b9bca75 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -876,27 +876,27 @@ void
 _initialize_infcall (void)
 {
   add_setshow_boolean_cmd ("coerce-float-to-double", class_obscure,
-			   &coerce_float_to_double_p, "\
-Set coercion of floats to doubles when calling functions.", "\
-Show coercion of floats to doubles when calling functions", "\
+			   &coerce_float_to_double_p, _("\
+Set coercion of floats to doubles when calling functions."), _("\
+Show coercion of floats to doubles when calling functions"), _("\
 Variables of type float should generally be converted to doubles before\n\
 calling an unprototyped function, and left alone when calling a prototyped\n\
 function.  However, some older debug info formats do not provide enough\n\
 information to determine that a function is prototyped.  If this flag is\n\
 set, GDB will perform the conversion for a function it considers\n\
 unprototyped.\n\
-The default is to perform the conversion.\n",
-			   NULL, /* PRINT: Coercion of floats to doubles when calling functions is %s.  */
+The default is to perform the conversion.\n"),
+			   NULL, /* FIXME: i18n: Coercion of floats to doubles when calling functions is %s.  */
 			   NULL, NULL, &setlist, &showlist);
 
   add_setshow_boolean_cmd ("unwindonsignal", no_class,
-			   &unwind_on_signal_p, "\
-Set unwinding of stack if a signal is received while in a call dummy.", "\
-Show unwinding of stack if a signal is received while in a call dummy.", "\
+			   &unwind_on_signal_p, _("\
+Set unwinding of stack if a signal is received while in a call dummy."), _("\
+Show unwinding of stack if a signal is received while in a call dummy."), _("\
 The unwindonsignal lets the user determine what gdb should do if a signal\n\
 is received while in a function called from gdb (call dummy).  If set, gdb\n\
 unwinds the stack and restore the context to what as it was before the call.\n\
-The default is to stop in the frame where the signal was received.",
-			   NULL, /* PRINT: Unwinding of stack if a signal is received while in a call dummy is %s.  */
+The default is to stop in the frame where the signal was received."),
+			   NULL, /* FIXME: i18n: Unwinding of stack if a signal is received while in a call dummy is %s.  */
 			   NULL, NULL, &setlist, &showlist);
 }
diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c
index f4538fe..1a93ca2 100644
--- a/gdb/m32r-rom.c
+++ b/gdb/m32r-rom.c
@@ -559,26 +559,26 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
   mon2000_ops.to_open = mon2000_open;
   add_target (&mon2000_ops);
 
-  add_setshow_string_cmd ("download-path", class_obscure, &download_path, "\
-Set the default path for downloadable SREC files.", "\
-Show the default path for downloadable SREC files.", "\
-Determines the default path for downloadable SREC files.",
-			  NULL, /* PRINT: The default path for downloadable SREC files is %s.  */
-		   NULL, NULL, &setlist, &showlist);
-
-  add_setshow_string_cmd ("board-address", class_obscure, &board_addr, "\
-Set IP address for M32R-EVA target board.", "\
-Show IP address for M32R-EVA target board.", "\
-Determine the IP address for M32R-EVA target board.",
-			  NULL, /* PRINT: IP address for M32R-EVA target board is %s.  */
-		   NULL, NULL, &setlist, &showlist);
-
-  add_setshow_string_cmd ("server-address", class_obscure, &server_addr, "\
-Set IP address for download server (GDB's host computer).", "\
-Show IP address for download server (GDB's host computer).", "\
-Determine the IP address for download server (GDB's host computer).",
-			  NULL, /* PRINT: IP address for download server (GDB's host computer) is %s.  */
-		   NULL, NULL, &setlist, &showlist);
+  add_setshow_string_cmd ("download-path", class_obscure, &download_path, _("\
+Set the default path for downloadable SREC files."), _("\
+Show the default path for downloadable SREC files."), _("\
+Determines the default path for downloadable SREC files."),
+			  NULL, /* FIXME: i18n: The default path for downloadable SREC files is %s.  */
+			  NULL, NULL, &setlist, &showlist);
+
+  add_setshow_string_cmd ("board-address", class_obscure, &board_addr, _("\
+Set IP address for M32R-EVA target board."), _("\
+Show IP address for M32R-EVA target board."), _("\
+Determine the IP address for M32R-EVA target board."),
+			  NULL, /* FIXME: i18n: IP address for M32R-EVA target board is %s.  */
+			  NULL, NULL, &setlist, &showlist);
+
+  add_setshow_string_cmd ("server-address", class_obscure, &server_addr, _("\
+Set IP address for download server (GDB's host computer)."), _("\
+Show IP address for download server (GDB's host computer)."), _("\
+Determine the IP address for download server (GDB's host computer)."),
+			  NULL, /* FIXME: i18n: IP address for download server (GDB's host computer) is %s.  */
+			  NULL, NULL, &setlist, &showlist);
 
   add_com ("upload", class_obscure, m32r_upload_command,
 	   "Upload the srec file via the monitor's Ethernet upload capability.");
diff --git a/gdb/maint.c b/gdb/maint.c
index 243adad..3b898b3 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -861,11 +861,11 @@ of time passes without a response from the target, an error occurs.",
 
 
   add_setshow_boolean_cmd ("profile", class_maintenance,
-			   &maintenance_profile_p, "\
-Set internal profiling.", "\
-Show internal profiling.", "\
-When enabled GDB is profiled.",
-			   NULL, /* PRINT: Internal profiling is %s.  */
+			   &maintenance_profile_p, _("\
+Set internal profiling."), _("\
+Show internal profiling."), _("\
+When enabled GDB is profiled."),
+			   NULL, /* FIXME: i18n: Internal profiling is %s.  */
 			   maintenance_set_profile_cmd, NULL,
 			   &maintenance_set_cmdlist,
 			   &maintenance_show_cmdlist);
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 608c146..7023503 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5179,29 +5179,29 @@ _initialize_mips_tdep (void)
 
   /* Allow the user to override the saved register size. */
   add_setshow_enum_cmd ("saved-gpreg-size", class_obscure,
-			size_enums, &mips_abi_regsize_string, "\
-Set size of general purpose registers saved on the stack.\n", "\
-Show size of general purpose registers saved on the stack.\n", "\
+			size_enums, &mips_abi_regsize_string, _("\
+Set size of general purpose registers saved on the stack."), _("\
+Show size of general purpose registers saved on the stack."), _("\
 This option can be set to one of:\n\
   32    - Force GDB to treat saved GP registers as 32-bit\n\
   64    - Force GDB to treat saved GP registers as 64-bit\n\
   auto  - Allow GDB to use the target's default setting or autodetect the\n\
-          saved GP register size from information contained in the executable.\n\
-          (default: auto)",
-			NULL, /* PRINT: Size of general purpose registers saved on the stack is %s.  */
+          saved GP register size from information contained in the\n\
+          executable (default)."),
+			NULL, /* FIXME: i18n: Size of general purpose registers saved on the stack is %s.  */
 			NULL, NULL, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the argument stack size. */
   add_setshow_enum_cmd ("stack-arg-size", class_obscure,
-		       size_enums, &mips_stack_argsize_string, "\
-Set the amount of stack space reserved for each argument.\n", "\
-Show the amount of stack space reserved for each argument.\n", "\
+			size_enums, &mips_stack_argsize_string, _("\
+Set the amount of stack space reserved for each argument."), _("\
+Show the amount of stack space reserved for each argument."), _("\
 This option can be set to one of:\n\
   32    - Force GDB to allocate 32-bit chunks per argument\n\
   64    - Force GDB to allocate 64-bit chunks per argument\n\
   auto  - Allow GDB to determine the correct setting from the current\n\
-          target and executable (default)",
-			NULL, /* PRINT: The amount of stack space reserved for each argument is %s.  */
+          target and executable (default)"),
+			NULL, /* FIXME: i18n: The amount of stack space reserved for each argument is %s.  */
 			NULL, NULL, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the ABI. */
@@ -5247,45 +5247,49 @@ This option can be set to one of:\n\
      command.c doesn't deal with that.  So make it a var_zinteger
      because the user can always use "999999" or some such for unlimited.  */
   add_setshow_zinteger_cmd ("heuristic-fence-post", class_support,
-			    &heuristic_fence_post, "\
-Set the distance searched for the start of a function.\n", "\
-Show the distance searched for the start of a function.\n", "\
+			    &heuristic_fence_post, _("\
+Set the distance searched for the start of a function."), _("\
+Show the distance searched for the start of a function."), _("\
 If you are debugging a stripped executable, GDB needs to search through the\n\
 program for the start of a function.  This command sets the distance of the\n\
-search.  The only need to set it is when debugging a stripped executable.",
-			    NULL, /* PRINT: The distance searched for the start of a function is %s.  */
+search.  The only need to set it is when debugging a stripped executable."),
+			    NULL, /* FIXME: i18n: The distance searched for the start of a function is %s.  */
 			    reinit_frame_cache_sfunc, NULL,
 			    &setlist, &showlist);
 
   /* Allow the user to control whether the upper bits of 64-bit
      addresses should be zeroed.  */
-  add_setshow_auto_boolean_cmd ("mask-address", no_class, &mask_address_var, "\
-Set zeroing of upper 32 bits of 64-bit addresses.", "\
-Show zeroing of upper 32 bits of 64-bit addresses.", "\
+  add_setshow_auto_boolean_cmd ("mask-address", no_class,
+				&mask_address_var, _("\
+Set zeroing of upper 32 bits of 64-bit addresses."), _("\
+Show zeroing of upper 32 bits of 64-bit addresses."), _("\
 Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to \n\
-allow GDB to determine the correct value.\n",
-				NULL, /* PRINT: Zerroing of upper 32 bits of 64-bit address is %s.  */
+allow GDB to determine the correct value."),
+				NULL, /* FIXME: i18n: Zerroing of upper 32 bits of 64-bit address is %s.  */
 				NULL, show_mask_address, &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to control the size of 32 bit registers within the
      raw remote packet.  */
   add_setshow_boolean_cmd ("remote-mips64-transfers-32bit-regs", class_obscure,
-			   &mips64_transfers_32bit_regs_p, "\
-Set compatibility with 64-bit MIPS target that transfers 32-bit quantities.", "\
-Show compatibility with 64-bit MIPS target that transfers 32-bit quantities.", "\
+			   &mips64_transfers_32bit_regs_p, _("\
+Set compatibility with 64-bit MIPS target that transfers 32-bit quantities."),
+			   _("\
+Show compatibility with 64-bit MIPS target that transfers 32-bit quantities."),
+			   _("\
 Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n\
 that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
-64 bits for others.  Use \"off\" to disable compatibility mode",
-			   NULL, /* PRINT: Compatibility with 64-bit MIPS target that transfers 32-bit quantities is %s.  */
- set_mips64_transfers_32bit_regs, NULL, &setlist, &showlist);
+64 bits for others.  Use \"off\" to disable compatibility mode"),
+			   NULL, /* FIXME: i18n: Compatibility with 64-bit MIPS target that transfers 32-bit quantities is %s.  */
+			   set_mips64_transfers_32bit_regs, NULL,
+			   &setlist, &showlist);
 
   /* Debug this files internals. */
   add_setshow_zinteger_cmd ("mips", class_maintenance,
-			    &mips_debug, "\
-Set mips debugging.\n", "\
-Show mips debugging.\n", "\
-When non-zero, mips specific debugging is enabled.\n",
-			    NULL, /* PRINT: Mips debugging is currently %s.  */
+			    &mips_debug, _("\
+Set mips debugging."), _("\
+Show mips debugging."), _("\
+When non-zero, mips specific debugging is enabled."),
+			    NULL, /* FIXME: i18n: Mips debugging is currently %s.  */
 			    NULL, NULL,
 			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 7cc1218..36556ce 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -376,11 +376,12 @@ void
 _initialize_nto_tdep (void)
 {
   add_setshow_zinteger_cmd ("nto-debug", class_maintenance,
-			    &nto_internal_debugging, "\
-Set QNX NTO internal debugging.", "\
-Show QNX NTO internal debugging.", "\
+			    &nto_internal_debugging, _("\
+Set QNX NTO internal debugging."), _("\
+Show QNX NTO internal debugging."), _("\
 When non-zero, nto specific debug info is\n\
 displayed. Different information is displayed\n\
-for different positive values.", "\
-QNX NTO internal debugging is %s.", NULL, NULL, &setdebuglist, &showdebuglist);
+for different positive values."),
+			    NULL, /* FIXME: i18n: QNX NTO internal debugging is %s.  */
+			    NULL, NULL, &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/observer.c b/gdb/observer.c
index 2ec8371..3509ee5 100644
--- a/gdb/observer.c
+++ b/gdb/observer.c
@@ -199,11 +199,12 @@ extern initialize_file_ftype _initialize_observer; /* -Wmissing-prototypes */
 void
 _initialize_observer (void)
 {
-  add_setshow_zinteger_cmd ("observer", class_maintenance, &observer_debug, "\
-Set observer debugging.", "\
-Show observer debugging.", "\
-When non-zero, observer debugging is enabled.",
-			    NULL, /* PRINT: Observer debugging is %s.  */
+  add_setshow_zinteger_cmd ("observer", class_maintenance,
+			    &observer_debug, _("\
+Set observer debugging."), _("\
+Show observer debugging."), _("\
+When non-zero, observer debugging is enabled."),
+			    NULL, /* FIXME: i18n: Observer debugging is %s.  */
 			    NULL, NULL,
 			    &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index 2f10971..5532086 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -991,22 +991,22 @@ _initialize_remote_rdi (void)
 	   "Withough an argument, it will display current state.\n",
 	   &maintenancelist);
 
-  add_setshow_boolean_cmd ("rdiromatzero", no_class, &rom_at_zero, "\
-Set target has ROM at addr 0.", "\
-Show if target has ROM at addr 0.", "\
+  add_setshow_boolean_cmd ("rdiromatzero", no_class, &rom_at_zero, _("\
+Set target has ROM at addr 0."), _("\
+Show if target has ROM at addr 0."), _("\
 A true value disables vector catching, false enables vector catching.\n\
-This is evaluated at the time the 'target rdi' command is executed.",
-			   NULL, /* PRINT: Target has ROM at addr 0 is %s.  */
+This is evaluated at the time the 'target rdi' command is executed."),
+			   NULL, /* FIXME: i18n: Target has ROM at addr 0 is %s.  */
 			   NULL, NULL,
 			   &setlist, &showlist);
 
-  add_setshow_boolean_cmd ("rdiheartbeat", no_class, &rdi_heartbeat, "\
-Set enable for ADP heartbeat packets.", "\
-Show enable for ADP heartbeat packets.", "\
+  add_setshow_boolean_cmd ("rdiheartbeat", no_class, &rdi_heartbeat, _("\
+Set enable for ADP heartbeat packets."), _("\
+Show enable for ADP heartbeat packets."), _("\
 I don't know why you would want this. If you enable them,\n\
 it will confuse ARM and EPI JTAG interface boxes as well\n\
-as the Angel Monitor.",
-			   NULL, /* PRINT: Enable for ADP heartbeat packets is %s.  */
+as the Angel Monitor."),
+			   NULL, /* FIXME: i18n: Enable for ADP heartbeat packets is %s.  */
 			   NULL, NULL,
 			   &setlist, &showlist);
 }
diff --git a/gdb/remote.c b/gdb/remote.c
index dd164ec..26921a4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -660,7 +660,7 @@ add_packet_config_cmd (struct packet_config *config,
   cmd_name = xstrprintf ("%s-packet", title);
   add_setshow_auto_boolean_cmd (cmd_name, class_obscure,
 				&config->detect, set_doc, show_doc,
-				"", NULL /*print*/,
+				"", NULL /* FIXME: i18n: Print message is? */,
 				set_func, show_func,
 				set_remote_list, show_remote_list);
   /* set/show remote NAME-packet {auto,on,off} -- legacy.  */
@@ -5597,11 +5597,11 @@ response packet.  GDB supplies the initial `$' character, and the\n\
 terminating `#' character and checksum.",
 	   &maintenancelist);
 
-  add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, "\
-Set whether to send break if interrupted.", "\
-Show whether to send break if interrupted.", "\
-If set, a break, instead of a cntrl-c, is sent to the remote target.",
-			   NULL, /* PRINT: Whether to send break if interrupted is %s.  */
+  add_setshow_boolean_cmd ("remotebreak", no_class, &remote_break, _("\
+Set whether to send break if interrupted."), _("\
+Show whether to send break if interrupted."), _("\
+If set, a break, instead of a cntrl-c, is sent to the remote target."),
+			   NULL, /* FIXME: i18n: Whether to send break if interrupted is %s.  */
 			   NULL, NULL,
 			   &setlist, &showlist);
 
@@ -5639,19 +5639,19 @@ If set, a break, instead of a cntrl-c, is sent to the remote target.",
 	   &remote_show_cmdlist);
 
   add_setshow_zinteger_cmd ("hardware-watchpoint-limit", no_class,
-			    &remote_hw_watchpoint_limit, "\
-Set the maximum number of target hardware watchpoints.", "\
-Show the maximum number of target hardware watchpoints.", "\
-Specify a negative limit for unlimited.",
-			    NULL, /* PRINT: The maximum number of target hardware watchpoints is %s.  */
+			    &remote_hw_watchpoint_limit, _("\
+Set the maximum number of target hardware watchpoints."), _("\
+Show the maximum number of target hardware watchpoints."), _("\
+Specify a negative limit for unlimited."),
+			    NULL, /* FIXME: i18n: The maximum number of target hardware watchpoints is %s.  */
 			    NULL, NULL,
 			    &remote_set_cmdlist, &remote_show_cmdlist);
   add_setshow_zinteger_cmd ("hardware-breakpoint-limit", no_class,
-			    &remote_hw_breakpoint_limit, "\
-Set the maximum number of target hardware breakpoints.", "\
-Show the maximum number of target hardware breakpoints.", "\
-Specify a negative limit for unlimited.",
-			    NULL, /* PRINT: The maximum number of target hardware breakpoints is %s.  */
+			    &remote_hw_breakpoint_limit, _("\
+Set the maximum number of target hardware breakpoints."), _("\
+Show the maximum number of target hardware breakpoints."), _("\
+Specify a negative limit for unlimited."),
+			    NULL, /* FIXME: i18n: The maximum number of target hardware breakpoints is %s.  */
 			    NULL, NULL,
 			    &remote_set_cmdlist, &remote_show_cmdlist);
 
@@ -5751,12 +5751,12 @@ in a memory packet.\n",
 
   /* Keep the old ``set remote Z-packet ...'' working.  */
   add_setshow_auto_boolean_cmd ("Z-packet", class_obscure,
-				&remote_Z_packet_detect, "\
-Set use of remote protocol `Z' packets", "\
-Show use of remote protocol `Z' packets ", "\
+				&remote_Z_packet_detect, _("\
+Set use of remote protocol `Z' packets"), _("\
+Show use of remote protocol `Z' packets "), _("\
 When set, GDB will attempt to use the remote breakpoint and watchpoint\n\
-packets.",
-				NULL, /* PRINT: Use of remote protocol `Z' packets is %s.  */
+packets."),
+				NULL, /* FIXME: i18n: Use of remote protocol `Z' packets is %s.  */
 				set_remote_protocol_Z_packet_cmd,
 				show_remote_protocol_Z_packet_cmd,
 				&remote_set_cmdlist, &remote_show_cmdlist);
diff --git a/gdb/target.c b/gdb/target.c
index 48d6c39..e061c72 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -2562,13 +2562,13 @@ command.", &setdebuglist),
      &showdebuglist);
 
   add_setshow_boolean_cmd ("trust-readonly-sections", class_support, 
-			   &trust_readonly, "\
-Set mode for reading from readonly sections.", "\
-Show mode for reading from readonly sections.", "\
+			   &trust_readonly, _("\
+Set mode for reading from readonly sections."), _("\
+Show mode for reading from readonly sections."), _("\
 When this mode is on, memory reads from readonly sections (such as .text)\n\
 will be read from the object file instead of from the target.  This will\n\
-result in significant performance improvement for remote targets.",
-			   NULL, /* PRINT: Mode for reading from readonly sections is %s.  */
+result in significant performance improvement for remote targets."),
+			   NULL, /* FIXME: i18n: Mode for reading from readonly sections is %s.  */
 			   NULL, NULL,
 			   &setlist, &showlist);