This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

NLS related patches


These patches mostly mark messages for translation. As discussed, I changed
display_help in gcc.c to combine messages only where needed because of
length restrictions.

The c-decl.c(parmlist_tags_warning) change is a nice example how
conditional construction of a messages makes translation hard if not
impossible.

OK to install?



2000-06-28  Philipp Thomas  <pthomas@suse.de>

	* bb-reorder.c: Mark messages as translatable.
	* c-decl.c : Mark strings for translation.
	(parmlist_tags_warning): Use distinct messages instead
	of conditional expressions.
	* diagnostic.c (v_message_with_decl): Mark string for translation.
	* gcc.c: Mark messages for translation.
	(display_help): Combine messages into one string where necessary.
	* mips-tfile: Add intl.h. Mark messages for translation.
	* print-rtl.c: Mark messages for translation.
	* rtl.c (fatal_with_file_and_line): Modify function for NLS. Mark
	messages for translation.
	* timevar.c: Mark messages for translation.
	* tlink.c: Likewise.
	* toplev.c: Likewise.

Index: gcc/bb-reorder.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/bb-reorder.c,v
retrieving revision 1.17
diff -u -p -r1.17 bb-reorder.c
--- bb-reorder.c	2000/06/11 04:29:46	1.17
+++ bb-reorder.c	2000/06/28 07:31:25
@@ -729,10 +729,10 @@ verify_insn_chain ()
     {
       if (PREV_INSN (x) != prevx)
 	{
-	  fprintf (stderr, "Forward traversal: insn chain corrupt.\n");
-	  fprintf (stderr, "previous insn:\n");
+	  fprintf (stderr, _("Forward traversal: insn chain corrupt.\n"));
+	  fprintf (stderr, _("previous insn:\n"));
 	  debug_rtx (prevx);
-	  fprintf (stderr, "current insn:\n");
+	  fprintf (stderr, _("current insn:\n"));
 	  debug_rtx (x);
 	  abort ();
 	}
@@ -742,7 +742,7 @@ verify_insn_chain ()
 
   if (prevx != get_last_insn ())
     {
-      fprintf (stderr, "last_insn corrupt.\n");
+      fprintf (stderr, _("last_insn corrupt.\n"));
       abort ();
     }
 
@@ -752,10 +752,10 @@ verify_insn_chain ()
     {
       if (NEXT_INSN (x) != nextx)
 	{
-	  fprintf (stderr, "Reverse traversal: insn chain corrupt.\n");
-	  fprintf (stderr, "current insn:\n");
+	  fprintf (stderr, _("Reverse traversal: insn chain corrupt.\n"));
+	  fprintf (stderr, _("current insn:\n"));
 	  debug_rtx (x);
-	  fprintf (stderr, "next insn:\n");
+	  fprintf (stderr, _("next insn:\n"));
 	  debug_rtx (nextx);
 	  abort ();
 	}
@@ -765,7 +765,7 @@ verify_insn_chain ()
 
   if (insn_cnt1 != insn_cnt2)
     {
-      fprintf (stderr, "insn_cnt1 (%d) not equal to insn_cnt2 (%d).\n",
+      fprintf (stderr, _("insn_cnt1 (%d) not equal to insn_cnt2 (%d).\n"),
 	       insn_cnt1, insn_cnt2);
       abort ();
     }
Index: gcc/c-decl.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/c-decl.c,v
retrieving revision 1.123
diff -u -p -r1.123 c-decl.c
--- c-decl.c	2000/06/26 16:42:22	1.123
+++ c-decl.c	2000/06/28 07:31:32
@@ -5059,11 +5059,15 @@ parmlist_tags_warning ()
 		  : "enum"),
 		 IDENTIFIER_POINTER (TREE_PURPOSE (elt)));
       else
-	warning ("anonymous %s declared inside parameter list",
-		 (code == RECORD_TYPE ? "struct"
-		  : code == UNION_TYPE ? "union"
-		  : "enum"));
-
+        {
+          /* For translation these need to be seperate warnings */
+          if (code == RECORD_TYPE)
+	    warning ("anonymous struct declared inside parameter list");
+	  else if (code == UNION_TYPE)
+	    warning ("anonymous union declared inside parameter list");
+	  else	  
+	    warning ("anonymous enum declared inside parameter list");
+	}
       if (! already)
 	{
 	  warning ("its scope is only this definition or declaration, which is probably not what you want.");
@@ -5207,10 +5211,10 @@ finish_struct (t, fieldlist, attributes)
       {
 	if (pedantic)
 	  pedwarn ("%s defined inside parms",
-		   TREE_CODE (t) == UNION_TYPE ? "union" : "structure");
+		   TREE_CODE (t) == UNION_TYPE ? _("union") : _("structure"));
 	else if (! flag_traditional)
 	  warning ("%s defined inside parms",
-		   TREE_CODE (t) == UNION_TYPE ? "union" : "structure");
+		   TREE_CODE (t) == UNION_TYPE ? _("union") : _("structure"));
       }
 
   if (pedantic)
@@ -5220,9 +5224,9 @@ finish_struct (t, fieldlist, attributes)
 	  break;
 
       if (x == 0)
-	pedwarn ("%s has no %smembers",
-		 TREE_CODE (t) == UNION_TYPE ? "union" : "struct",
-		 fieldlist ? "named " : "");
+	pedwarn ("%s has no %s",
+		 TREE_CODE (t) == UNION_TYPE ? _("union") : _("struct"),
+		 fieldlist ? _("named members") : _("members"));
     }
 
   /* Install struct as DECL_CONTEXT of each field decl.
Index: gcc/diagnostic.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/diagnostic.c,v
retrieving revision 1.17
diff -u -p -r1.17 diagnostic.c
--- diagnostic.c	2000/06/26 16:42:23	1.17
+++ diagnostic.c	2000/06/28 07:31:33
@@ -729,7 +729,7 @@ v_message_with_decl (decl, warn, msgid, 
     {
       const char *n = (DECL_NAME (decl)
 		 ? (*decl_printable_name) (decl, 2)
-		 : "((anonymous))");
+		 : _("((anonymous))"));
       if (doing_line_wrapping ())
         output_add_string (&buffer, n);
       else
Index: gcc/gcc.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/gcc.c,v
retrieving revision 1.148
diff -u -p -r1.148 gcc.c
--- gcc.c	2000/06/18 02:37:02	1.148
+++ gcc.c	2000/06/28 07:31:40
@@ -2804,49 +2804,52 @@ convert_filename (name, do_exe)
 static void
 display_help ()
 {
-  printf ("Usage: %s [options] file...\n", programname);
-  printf ("Options:\n");
+  printf (_("Usage: %s [options] file...\n"), programname);
+  fputs (_("Options:\n"), stdout);
 
-  printf ("  -pass-exit-codes         Exit with highest error code from a phase\n");
-  printf ("  --help                   Display this information\n");
+  fputs (_("  -pass-exit-codes         Exit with highest error code from a phase\n"), stdout);
+  fputs (_("  --help                   Display this information\n"), stdout);
   if (! verbose_flag)
-    printf ("  (Use '-v --help' to display command line options of sub-processes)\n");
-  printf ("  -dumpspecs               Display all of the built in spec strings\n");
-  printf ("  -dumpversion             Display the version of the compiler\n");
-  printf ("  -dumpmachine             Display the compiler's target processor\n");
-  printf ("  -print-search-dirs       Display the directories in the compiler's search path\n");
-  printf ("  -print-libgcc-file-name  Display the name of the compiler's companion library\n");
-  printf ("  -print-file-name=<lib>   Display the full path to library <lib>\n");
-  printf ("  -print-prog-name=<prog>  Display the full path to compiler component <prog>\n");
-  printf ("  -print-multi-directory   Display the root directory for versions of libgcc\n");
-  printf ("  -print-multi-lib         Display the mapping between command line options and\n");
-  printf ("                            multiple library search directories\n");
-  printf ("  -Wa,<options>            Pass comma-separated <options> on to the assembler\n");
-  printf ("  -Wp,<options>            Pass comma-separated <options> on to the preprocessor\n");
-  printf ("  -Wl,<options>            Pass comma-separated <options> on to the linker\n");
-  printf ("  -Xlinker <arg>           Pass <arg> on to the linker\n");
-  printf ("  -save-temps              Do not delete intermediate files\n");
-  printf ("  -pipe                    Use pipes rather than intermediate files\n");
-  printf ("  -time                    Time the execution of each subprocess\n");
-  printf ("  -specs=<file>            Override builtin specs with the contents of <file>\n");
-  printf ("  -std=<standard>          Assume that the input sources are for <standard>\n");
-  printf ("  -B <directory>           Add <directory> to the compiler's search paths\n");
-  printf ("  -b <machine>             Run gcc for target <machine>, if installed\n");
-  printf ("  -V <version>             Run gcc version number <version>, if installed\n");
-  printf ("  -v                       Display the programs invoked by the compiler\n");
-  printf ("  -E                       Preprocess only; do not compile, assemble or link\n");
-  printf ("  -S                       Compile only; do not assemble or link\n");
-  printf ("  -c                       Compile and assemble, but do not link\n");
-  printf ("  -o <file>                Place the output into <file>\n");
-  printf ("  -x <language>            Specify the language of the following input files\n");
-  printf ("                            Permissable languages include: c c++ assembler none\n");
-  printf ("                            'none' means revert to the default behaviour of\n");
-  printf ("                            guessing the language based on the file's extension\n");
-
-  printf ("\nOptions starting with -g, -f, -m, -O or -W are automatically passed on to\n");
-  printf ("the various sub-processes invoked by %s.  In order to pass other options\n",
-	  programname);
-  printf ("on to these processes the -W<letter> options must be used.\n");
+    fputs (_("  (Use '-v --help' to display command line options of sub-processes)\n"), stdout);
+  fputs (_("  -dumpspecs               Display all of the built in spec strings\n"), stdout);
+  fputs (_("  -dumpversion             Display the version of the compiler\n"), stdout);
+  fputs (_("  -dumpmachine             Display the compiler's target processor\n"), stdout);
+  fputs (_("  -print-search-dirs       Display the directories in the compiler's search path\n"), stdout);
+  fputs (_("  -print-libgcc-file-name  Display the name of the compiler's companion library\n"), stdout);
+  fputs (_("  -print-file-name=<lib>   Display the full path to library <lib>\n"), stdout);
+  fputs (_("  -print-prog-name=<prog>  Display the full path to compiler component <prog>\n"), stdout);
+  fputs (_("  -print-multi-directory   Display the root directory for versions of libgcc\n"), stdout);
+  fputs (_("\
+  -print-multi-lib         Display the mapping between command line options and\n\
+                           multiple library search directories\n"), stdout);
+  fputs (_("  -Wa,<options>            Pass comma-separated <options> on to the assembler\n"), stdout);
+  fputs (_("  -Wp,<options>            Pass comma-separated <options> on to the preprocessor\n"), stdout);
+  fputs (_("  -Wl,<options>            Pass comma-separated <options> on to the linker\n"), stdout);
+  fputs (_("  -Xlinker <arg>           Pass <arg> on to the linker\n"), stdout);
+  fputs (_("  -save-temps              Do not delete intermediate files\n"), stdout);
+  fputs (_("  -pipe                    Use pipes rather than intermediate files\n"), stdout);
+  fputs (_("  -time                    Time the execution of each subprocess\n"), stdout);
+  fputs (_("  -specs=<file>            Override builtin specs with the contents of <file>\n"), stdout);
+  fputs (_("  -std=<standard>          Assume that the input sources are for <standard>\n"), stdout);
+  fputs (_("  -B <directory>           Add <directory> to the compiler's search paths\n"), stdout);
+  fputs (_("  -b <machine>             Run gcc for target <machine>, if installed\n"), stdout);
+  fputs (_("  -V <version>             Run gcc version number <version>, if installed\n"), stdout);
+  fputs (_("  -v                       Display the programs invoked by the compiler\n"), stdout);
+  fputs (_("  -E                       Preprocess only; do not compile, assemble or link\n"), stdout);
+  fputs (_("  -S                       Compile only; do not assemble or link\n"), stdout);
+  fputs (_("  -c                       Compile and assemble, but do not link\n"), stdout);
+  fputs (_("  -o <file>                Place the output into <file>\n"), stdout);
+  fputs (_("\
+  -x <language>            Specify the language of the following input files\n\
+                           Permissable languages include: c c++ assembler none\n\
+                           'none' means revert to the default behaviour of\n\
+                           guessing the language based on the file's extension\n\
+"), stdout);
+
+  printf (_("\n\
+Options starting with -g, -f, -m, -O or -W are automatically passed on to\n\
+the various sub-processes invoked by %s.  In order to pass other options\n\
+on to these processes the -W<letter> options must be used.\n\"), programname);
 
   /* The rest of the options are displayed by invocations of the various
      sub-processes.  */
@@ -5428,9 +5431,9 @@ main (argc, argv)
 
   if (print_search_dirs)
     {
-      printf ("install: %s%s\n", standard_exec_prefix, machine_suffix);
-      printf ("programs: %s\n", build_search_list (&exec_prefixes, "", 0));
-      printf ("libraries: %s\n", build_search_list (&startfile_prefixes, "", 0));
+      printf (_("install: %s%s\n"), standard_exec_prefix, machine_suffix);
+      printf (_("programs: %s\n"), build_search_list (&exec_prefixes, "", 0));
+      printf (_("libraries: %s\n"), build_search_list (&startfile_prefixes, "", 0));
       return (0);
     }
 
@@ -5468,7 +5471,7 @@ main (argc, argv)
 
       if (! verbose_flag)
 	{
-	  printf ("\nFor bug reporting instructions, please see:\n");
+	  printf (_("\nFor bug reporting instructions, please see:\n"));
 	  printf ("%s.\n", GCCBUGURL);
 	  
 	  return (0);
@@ -5645,7 +5648,7 @@ main (argc, argv)
 
   if (print_help_list)
     {
-      printf ("\nFor bug reporting instructions, please see:\n");
+      printf (("\nFor bug reporting instructions, please see:\n"));
       printf ("%s\n", GCCBUGURL);
     }
   
Index: gcc/mips-tfile.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/mips-tfile.c,v
retrieving revision 1.32
diff -u -p -r1.32 mips-tfile.c
--- mips-tfile.c	2000/02/26 13:55:09	1.32
+++ mips-tfile.c	2000/06/28 07:31:45
@@ -603,6 +603,7 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include "system.h"
 #include "version.h"
+#include "intl.h"
 
 #ifndef __SABER__
 #define saber_stop()
@@ -4947,23 +4948,23 @@ main (argc, argv)
 
   if (object_name == (char *) 0 || had_errors || optind != argc - 1)
     {
-      fprintf (stderr, "Calling Sequence:\n");
-      fprintf (stderr, "\tmips-tfile [-d <num>] [-v] [-i <o-in-file>] -o <o-out-file> <s-file> (or)\n");
-      fprintf (stderr, "\tmips-tfile [-d <num>] [-v] [-I <o-in-file>] -o <o-out-file> <s-file> (or)\n");
-      fprintf (stderr, "\tmips-tfile [-d <num>] [-v] <s-file> <o-in-file> <o-out-file>\n");
+      fprintf (stderr, _("Calling Sequence:\n"));
+      fprintf (stderr, _("\tmips-tfile [-d <num>] [-v] [-i <o-in-file>] -o <o-out-file> <s-file> (or)\n"));
+      fprintf (stderr, _("\tmips-tfile [-d <num>] [-v] [-I <o-in-file>] -o <o-out-file> <s-file> (or)\n"));
+      fprintf (stderr, _("\tmips-tfile [-d <num>] [-v] <s-file> <o-in-file> <o-out-file>\n"));
       fprintf (stderr, "\n");
-      fprintf (stderr, "Debug levels are:\n");
-      fprintf (stderr, "    1\tGeneral debug + trace functions/blocks.\n");
-      fprintf (stderr, "    2\tDebug level 1 + trace externals.\n");
-      fprintf (stderr, "    3\tDebug level 2 + trace all symbols.\n");
-      fprintf (stderr, "    4\tDebug level 3 + trace memory allocations.\n");
+      fprintf (stderr, _("Debug levels are:\n"));
+      fprintf (stderr, _("    1\tGeneral debug + trace functions/blocks.\n"));
+      fprintf (stderr, _("    2\tDebug level 1 + trace externals.\n"));
+      fprintf (stderr, _("    3\tDebug level 2 + trace all symbols.\n"));
+      fprintf (stderr, _("    4\tDebug level 3 + trace memory allocations.\n"));
       return 1;
     }
 
 
   if (version)
     {
-      fprintf (stderr, "mips-tfile version %s", version_string);
+      fprintf (stderr, _("mips-tfile version %s"), version_string);
 #ifdef TARGET_VERSION
       TARGET_VERSION;
 #endif
Index: gcc/print-rtl.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/print-rtl.c,v
retrieving revision 1.57
diff -u -p -r1.57 print-rtl.c
--- print-rtl.c	2000/06/14 21:04:42	1.57
+++ print-rtl.c	2000/06/28 07:31:45
@@ -390,7 +390,7 @@ print_rtx (in_rtx)
 
       default:
 	fprintf (stderr,
-		 "switch format wrong in rtl.print_rtx(). format was: %c.\n",
+		 _("switch format wrong in rtl.print_rtx(). format was: %c.\n"),
 		 format_ptr[-1]);
 	abort ();
       }
@@ -544,7 +544,7 @@ debug_rtx_find (x, uid)
     }
   else
     {
-      fprintf (stderr, "insn uid %d not found\n", uid);
+      fprintf (stderr, _("insn uid %d not found\n"), uid);
       return 0;
     }
 }
Index: gcc/rtl.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/rtl.c,v
retrieving revision 1.70
diff -u -p -r1.70 rtl.c
--- rtl.c	2000/06/09 21:47:38	1.70
+++ rtl.c	2000/06/28 07:31:46
@@ -684,18 +684,18 @@ int read_rtx_lineno = 1;
 const char *read_rtx_filename = "<unknown>";
 
 static void
-fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msg, ...))
+fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
 {
 #ifndef ANSI_PROTOTYPES
   FILE *infile;
-  const char *msg;
+  const char *msgid;
 #endif
   va_list ap;
   char context[64];
   size_t i;
   int c;
 
-  VA_START (ap, msg);
+  VA_START (ap, msgid);
 
 #ifndef ANSI_PROTOTYPES
   infile = va_arg (ap, FILE *);
@@ -703,7 +703,7 @@ fatal_with_file_and_line VPARAMS ((FILE 
 #endif
 
   fprintf (stderr, "%s:%d: ", read_rtx_filename, read_rtx_lineno);
-  vfprintf (stderr, msg, ap);
+  vfprintf (stderr, _(msgid), ap);
   putc ('\n', stderr);
 
   /* Gather some following context.  */
@@ -718,7 +718,7 @@ fatal_with_file_and_line VPARAMS ((FILE 
     }
   context[i] = '\0';
 
-  fprintf (stderr, "%s:%d: following context is `%s'\n",
+  fprintf (stderr, _("%s:%d: following context is `%s'\n"),
 	   read_rtx_filename, read_rtx_lineno, context);
 
   va_end (ap);
Index: gcc/timevar.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/timevar.c,v
retrieving revision 1.6
diff -u -p -r1.6 timevar.c
--- timevar.c	2000/06/09 16:23:44	1.6
+++ timevar.c	2000/06/28 07:31:47
@@ -427,7 +427,7 @@ timevar_print (fp)
      TIMEVAR. */
   start_time = now;
 
-  fprintf (fp, "\nExecution times (seconds)\n");
+  fprintf (fp, _("\nExecution times (seconds)\n"));
   for (id = 0; id < TIMEVAR_LAST; ++id)
     {
       struct timevar_def *tv = &timevars[id];
@@ -475,7 +475,7 @@ timevar_print (fp)
     }
 
   /* Print total time.  */
-  fprintf (fp, " TOTAL                 :");
+  fprintf (fp, _(" TOTAL                 :"));
 #ifdef HAVE_USER_TIME
   fprintf (fp, "%4ld.%02ld          ", 
 	   total->user / 1000000, (total->user % 1000000) / 10000);
@@ -514,7 +514,7 @@ print_time (str, total)
 {
   long all_time = get_run_time ();
   fprintf (stderr,
-	   "time in %s: %ld.%06ld (%ld%%)\n",
+	   _("time in %s: %ld.%06ld (%ld%%)\n"),
 	   str, total / 1000000, total % 1000000,
  	   all_time == 0 ? 0
  	   : (long) (((100.0 * (double) total) / (double) all_time) + .5));
Index: gcc/tlink.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/tlink.c,v
retrieving revision 1.28
diff -u -p -r1.28 tlink.c
--- tlink.c	2000/04/06 21:03:45	1.28
+++ tlink.c	2000/06/28 07:31:47
@@ -424,7 +424,7 @@ read_repo_file (f)
   FILE *stream = fopen ((char*) f->root.key, "r");
 
   if (tlink_verbose >= 2)
-    fprintf (stderr, "collect: reading %s\n", 
+    fprintf (stderr, _("collect: reading %s\n"), 
 	     (char*) f->root.key);
 
   while (fscanf (stream, "%c ", &c) == 1)
@@ -525,7 +525,7 @@ recompile_files ()
       command = obstack_copy0 (&temporary_obstack, f->main, strlen (f->main));
 
       if (tlink_verbose)
-	fprintf (stderr, "collect: recompiling %s\n", f->main);
+	fprintf (stderr, _("collect: recompiling %s\n"), f->main);
       if (tlink_verbose >= 3)
 	fprintf (stderr, "%s\n", command);
 
@@ -676,7 +676,7 @@ scan_linker_output (fname)
       if (sym && !sym->tweaking)
 	{
 	  if (tlink_verbose >= 2)
-	    fprintf (stderr, "collect: tweaking %s in %s\n",
+	    fprintf (stderr, _("collect: tweaking %s in %s\n"),
 		     (char*) sym->root.key, (char*) sym->file->root.key);
 	  sym->tweaking = 1;
 	  file_push (sym->file);
@@ -723,7 +723,7 @@ do_tlink (ld_argv, object_lst)
 	    if (! recompile_files ())
 	      break;
 	    if (tlink_verbose)
-	      fprintf (stderr, "collect: relinking\n");
+	      fprintf (stderr, _("collect: relinking\n"));
 	    exit = tlink_execute ("ld", ld_argv, ldout);
 	  }
     }
Index: gcc/toplev.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/toplev.c,v
retrieving revision 1.351
diff -u -p -r1.351 toplev.c
--- toplev.c	2000/06/22 21:01:04	1.351
+++ toplev.c	2000/06/28 07:31:53
@@ -3696,15 +3696,15 @@ display_help ()
   const char * lang;
   
 #ifndef USE_CPPLIB  
-  printf ("Usage: %s input [switches]\n", progname);
-  printf ("Switches:\n");
+  printf (_("Usage: %s input [switches]\n"), progname);
+  printf (_("Switches:\n"));
 #endif
-  printf ("  -ffixed-<register>      Mark <register> as being unavailable to the compiler\n");
-  printf ("  -fcall-used-<register>  Mark <register> as being corrupted by function calls\n");
-  printf ("  -fcall-saved-<register> Mark <register> as being preserved across functions\n");
-  printf ("  -finline-limit=<number> Limits the size of inlined functions to <number>\n");
-  printf ("  -fmessage-length=<number> Limits diagnostics messages lengths to <number> characters per line.  0 suppresses line-wrapping\n");
-  printf ("  -fdiagnostics-show-location=[once | never] Indicates how often source location information should be emitted, as prefix, at the beginning of diagnostics when line-wrapping\n");
+  printf (_("  -ffixed-<register>      Mark <register> as being unavailable to the compiler\n"));
+  printf (_("  -fcall-used-<register>  Mark <register> as being corrupted by function calls\n"));
+  printf (_("  -fcall-saved-<register> Mark <register> as being preserved across functions\n"));
+  printf (_("  -finline-limit=<number> Limits the size of inlined functions to <number>\n"));
+  printf (_("  -fmessage-length=<number> Limits diagnostics messages lengths to <number> characters per line.  0 suppresses line-wrapping\n"));
+  printf (_("  -fdiagnostics-show-location=[once | never] Indicates how often source location information should be emitted, as prefix, at the beginning of diagnostics when line-wrapping\n"));
 
   for (i = NUM_ELEM (f_options); i--;)
     {
@@ -3715,12 +3715,12 @@ display_help ()
 		f_options[i].string, description);
     }
   
-  printf ("  -O[number]              Set optimisation level to [number]\n");
-  printf ("  -Os                     Optimise for space rather than speed\n");
-  printf ("  -pedantic               Issue warnings needed by strict compliance to ANSI C\n");
-  printf ("  -pedantic-errors        Like -pedantic except that errors are produced\n");
-  printf ("  -w                      Suppress warnings\n");
-  printf ("  -W                      Enable extra warnings\n");
+  printf (_("  -O[number]              Set optimisation level to [number]\n"));
+  printf (_("  -Os                     Optimise for space rather than speed\n"));
+  printf (_("  -pedantic               Issue warnings needed by strict compliance to ANSI C\n"));
+  printf (_("  -pedantic-errors        Like -pedantic except that errors are produced\n"));
+  printf (_("  -w                      Suppress warnings\n"));
+  printf (_("  -W                      Enable extra warnings\n"));
   
   for (i = NUM_ELEM (W_options); i--;)
     {
@@ -3731,19 +3731,20 @@ display_help ()
 		W_options[i].string, description);
     }
   
-  printf ("  -Wunused                Enable unused warnings\n");
-  printf ("  -Wid-clash-<num>        Warn if 2 identifiers have the same first <num> chars\n");
-  printf ("  -Wlarger-than-<number>  Warn if an object is larger than <number> bytes\n");
-  printf ("  -p                      Enable function profiling\n");
+  printf (_("  -Wunused                Enable unused warnings\n"));
+  printf (_("  -Wid-clash-<num>        Warn if 2 identifiers have the same first <num> chars\n"));
+  printf (_("  -Wlarger-than-<number>  Warn if an object is larger than <number> bytes\n"));
+  printf (_("  -p                      Enable function profiling\n"));
 #if defined (BLOCK_PROFILER) || defined (FUNCTION_BLOCK_PROFILER)
-  printf ("  -a                      Enable block profiling \n");
+  printf (_("  -a                      Enable block profiling \n"));
 #endif  
 #if defined (BLOCK_PROFILER) || defined (FUNCTION_BLOCK_PROFILER) || defined FUNCTION_BLOCK_PROFILER_EXIT
-  printf ("  -ax                     Enable jump profiling \n");
+  printf (_("  -ax                     Enable jump profiling \n"));
 #endif  
-  printf ("  -o <file>               Place output into <file> \n");
-  printf ("  -G <number>             Put global and static data smaller than <number>\n");
-  printf ("                           bytes into a special section (on some targets)\n");
+  printf (_("  -o <file>               Place output into <file> \n"));
+  printf (_("\
+  -G <number>             Put global and static data smaller than <number>\n\
+                          bytes into a special section (on some targets)\n"));
   
   for (i = NUM_ELEM (debug_args); i--;)
     {
@@ -3751,15 +3752,15 @@ display_help ()
 	printf ("  -g%-21s %s\n", debug_args[i].arg, debug_args[i].description);
     }
   
-  printf ("  -aux-info <file>        Emit declaration info into <file>.X\n");
-  printf ("  -quiet                  Do not display functions compiled or elapsed time\n");
-  printf ("  -version                Display the compiler's version\n");
-  printf ("  -d[letters]             Enable dumps from specific passes of the compiler\n");
-  printf ("  -dumpbase <file>        Base name to be used for dumps from specific passes\n");
+  printf (_("  -aux-info <file>        Emit declaration info into <file>.X\n"));
+  printf (_("  -quiet                  Do not display functions compiled or elapsed time\n"));
+  printf (_("  -version                Display the compiler's version\n"));
+  printf (_("  -d[letters]             Enable dumps from specific passes of the compiler\n"));
+  printf (_("  -dumpbase <file>        Base name to be used for dumps from specific passes\n"));
 #if defined INSN_SCHEDULING
-  printf ("  -fsched-verbose=<number> Set the verbosity level of the scheduler\n");
+  printf (_("  -fsched-verbose=<number> Set the verbosity level of the scheduler\n"));
 #endif
-  printf ("  --help                  Display this information\n");
+  printf (_("  --help                  Display this information\n"));
 
   undoc = 0;
   lang  = "language";
@@ -3774,7 +3775,7 @@ display_help ()
   
   if (NUM_ELEM (documented_lang_options) > 1)
     {
-      printf ("\nLanguage specific options:\n");
+      printf (_("\nLanguage specific options:\n"));
 
       for (i = 0; i < NUM_ELEM (documented_lang_options); i++)
 	{
@@ -3786,7 +3787,7 @@ display_help ()
 	      undoc = 1;
 
 	      if (extra_warnings)
-		printf ("  %-23.23s [undocumented]\n", option);
+		printf (_("  %-23.23s [undocumented]\n"), option);
 	    }
 	  else if (* description == 0)
 	    continue;
@@ -3794,11 +3795,11 @@ display_help ()
 	    {
 	      if (undoc)
 		printf
-		  ("\nThere are undocumented %s specific options as well.\n",
+		  (_("\nThere are undocumented %s specific options as well.\n"),
 			lang);
 	      undoc = 0;
 	      
-	      printf ("\n Options for %s:\n", description);
+	      printf (_("\n Options for %s:\n"), description);
 
 	      lang = description;
 	    }
@@ -3808,7 +3809,7 @@ display_help ()
     }
 
   if (undoc)
-    printf ("\nThere are undocumented %s specific options as well.\n", lang);
+    printf (_("\nThere are undocumented %s specific options as well.\n"), lang);
 
   if (NUM_ELEM (target_switches) > 1
 #ifdef TARGET_OPTIONS
@@ -3820,7 +3821,7 @@ display_help ()
       
       undoc = 0;
   
-      printf ("\nTarget specific options:\n");
+      printf (_("\nTarget specific options:\n"));
 
       for (i = NUM_ELEM (target_switches); i--;)
 	{
@@ -3834,7 +3835,7 @@ display_help ()
 	      undoc = 1;
 	      
 	      if (extra_warnings)
-		printf ("  -m%-21.21s [undocumented]\n", option);
+		printf (_("  -m%-21.21s [undocumented]\n"), option);
 	    }
 	  else if (* description != 0)
 	    doc += printf ("  -m%-21.21s %s\n", option, description);
@@ -3853,7 +3854,7 @@ display_help ()
 	      undoc = 1;
 	      
 	      if (extra_warnings)
-		printf ("  -m%-21.21s [undocumented]\n", option);
+		printf (_("  -m%-21.21s [undocumented]\n"), option);
 	    }
 	  else if (* description != 0)
 	    doc += printf ("  -m%-21.21s %s\n", option, description);
@@ -3862,9 +3863,9 @@ display_help ()
       if (undoc)
 	{
 	  if (doc)
-	    printf ("\nThere are undocumented target specific options as well.\n");
+	    printf (_("\nThere are undocumented target specific options as well.\n"));
 	  else
-	    printf ("  They exist, but they are not documented.\n");
+	    printf (_("  They exist, but they are not documented.\n"));
 	}
     }
 }

	



-- 
Philipp Thomas <pthomas@suse.de>
Development, SuSE GmbH, Schanzaecker Str. 10, D-90443 Nuremberg, Germany

#define NINODE  50              /* number of in core inodes */
#define NPROC   30              /* max number of processes */
 	-- Version 7 UNIX for PDP 11, /usr/include/sys/param.h

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]