This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to use American spelling in messages
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 15 Dec 2001 20:08:02 +0000 (GMT)
- Subject: Patch to use American spelling in messages
This patch makes diagnostic messages that show up in gcc.pot use
American spelling, in preparation for distributing a new .pot file to
translators at the start of the feature freeze. Applied to mainline.
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.12331
diff -u -r1.12331 ChangeLog
--- ChangeLog 2001/12/15 18:26:23 1.12331
+++ ChangeLog 2001/12/15 20:01:57
@@ -1,3 +1,9 @@
+2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * gcc.c, config/fr30/fr30.c, config/v850/v850-c.c, toplev.c: Use
+ American spelling in messages.
+ * po/gcc.pot: Regenerate.
+
2001-12-15 Kazu Hirata <kazu@hxi.com>
* config/h8300/h8300.md: Adjust whitespacing. Remove
Index: gcc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcc.c,v
retrieving revision 1.278
diff -u -r1.278 gcc.c
--- gcc.c 2001/12/15 11:46:40 1.278
+++ gcc.c 2001/12/15 20:01:58
@@ -3067,7 +3067,7 @@
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\
+ 'none' means revert to the default behavior of\n\
guessing the language based on the file's extension\n\
"), stdout);
@@ -5027,7 +5027,7 @@
/* Catch the case where a spec string contains something like
'%{foo:%*}'. ie there is no * in the pattern on the left
hand side of the :. */
- error ("spec failure: '%%*' has not been initialised by pattern match");
+ error ("spec failure: '%%*' has not been initialized by pattern match");
break;
/* Process a string found as the value of a spec given by name.
@@ -5179,7 +5179,7 @@
break;
default:
- error ("spec failure: unrecognised spec option '%c'", c);
+ error ("spec failure: unrecognized spec option '%c'", c);
break;
}
break;
Index: toplev.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/toplev.c,v
retrieving revision 1.557
diff -u -r1.557 toplev.c
--- toplev.c 2001/12/13 21:37:27 1.557
+++ toplev.c 2001/12/15 20:01:59
@@ -997,11 +997,11 @@
{"cse-skip-blocks", &flag_cse_skip_blocks, 1,
N_("When running CSE, follow conditional jumps") },
{"expensive-optimizations", &flag_expensive_optimizations, 1,
- N_("Perform a number of minor, expensive optimisations") },
+ N_("Perform a number of minor, expensive optimizations") },
{"thread-jumps", &flag_thread_jumps, 1,
- N_("Perform jump threading optimisations") },
+ N_("Perform jump threading optimizations") },
{"strength-reduce", &flag_strength_reduce, 1,
- N_("Perform strength reduction optimisations") },
+ N_("Perform strength reduction optimizations") },
{"unroll-loops", &flag_unroll_loops, 1,
N_("Perform loop unrolling when iteration count is known") },
{"unroll-all-loops", &flag_unroll_all_loops, 1,
@@ -1015,7 +1015,7 @@
{"writable-strings", &flag_writable_strings, 1,
N_("Store strings in writable data section") },
{"peephole", &flag_no_peephole, 0,
- N_("Enable machine specific peephole optimisations") },
+ N_("Enable machine specific peephole optimizations") },
{"force-mem", &flag_force_mem, 1,
N_("Copy memory operands into registers before using") },
{"force-addr", &flag_force_addr, 1,
@@ -1049,9 +1049,9 @@
{"gcse-sm", &flag_gcse_sm, 1,
N_("Perform store motion after global subexpression elimination") },
{"rerun-cse-after-loop", &flag_rerun_cse_after_loop, 1,
- N_("Run CSE pass after loop optimisations") },
+ N_("Run CSE pass after loop optimizations") },
{"rerun-loop-opt", &flag_rerun_loop_opt, 1,
- N_("Run the loop optimiser twice") },
+ N_("Run the loop optimizer twice") },
{"delete-null-pointer-checks", &flag_delete_null_pointer_checks, 1,
N_("Delete useless null pointer checks") },
{"pretend-float", &flag_pretend_float, 1,
@@ -1104,9 +1104,9 @@
{"verbose-asm", &flag_verbose_asm, 1,
N_("Add extra commentry to assembler output") },
{"gnu-linker", &flag_gnu_linker, 1,
- N_("Output GNU ld formatted global initialisers") },
+ N_("Output GNU ld formatted global initializers") },
{"regmove", &flag_regmove, 1,
- N_("Enables a register move optimisation") },
+ N_("Enables a register move optimization") },
{"optimize-register-move", &flag_regmove, 1,
N_("Do the full regmove optimization pass") },
{"pack-struct", &flag_pack_struct, 1,
@@ -1211,10 +1211,10 @@
{ "-fasm", "" },
{ "-fno-asm",
- N_("Do not recognise the 'asm' keyword") },
+ N_("Do not recognize the 'asm' keyword") },
{ "-fbuiltin", "" },
{ "-fno-builtin",
- N_("Do not recognise any built in functions") },
+ N_("Do not recognize any built in functions") },
{ "-fhosted",
N_("Assume normal C execution environment") },
{ "-fno-hosted", "" },
@@ -1297,7 +1297,7 @@
N_("Warn about suspicious declarations of main") },
{ "-Wno-main", "" },
{ "-Wmissing-braces",
- N_("Warn about possibly missing braces around initialisers") },
+ N_("Warn about possibly missing braces around initializers") },
{ "-Wno-missing-braces", "" },
{ "-Wmissing-declarations",
N_("Warn about global funcs without previous declarations") },
@@ -3578,8 +3578,8 @@
f_options[i].string, _(description));
}
- printf (_(" -O[number] Set optimisation level to [number]\n"));
- printf (_(" -Os Optimise for space rather than speed\n"));
+ printf (_(" -O[number] Set optimization level to [number]\n"));
+ printf (_(" -Os Optimize for space rather than speed\n"));
for (i = LAST_PARAM; i--;)
{
const char *description = compiler_params[i].help;
Index: config/fr30/fr30.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/fr30/fr30.c,v
retrieving revision 1.18
diff -u -r1.18 fr30.c
--- fr30.c 2001/12/06 11:49:21 1.18
+++ fr30.c 2001/12/15 20:01:59
@@ -476,7 +476,7 @@
/* Compute the register name of the second register in a hi/lo
register pair. */
if (GET_CODE (x) != REG)
- output_operand_lossage ("fr30_print_operand: unrecognised %p code");
+ output_operand_lossage ("fr30_print_operand: unrecognized %p code");
else
fprintf (file, "r%d", REGNO (x) + 1);
return;
@@ -496,7 +496,7 @@
case GTU: fprintf (file, "hi"); break;
case GEU: fprintf (file, "nc"); break;
default:
- output_operand_lossage ("fr30_print_operand: unrecognised %b code");
+ output_operand_lossage ("fr30_print_operand: unrecognized %b code");
break;
}
return;
@@ -517,7 +517,7 @@
case GTU: fprintf (file, "ls"); break;
case GEU: fprintf (file, "c"); break;
default:
- output_operand_lossage ("fr30_print_operand: unrecognised %B code");
+ output_operand_lossage ("fr30_print_operand: unrecognized %B code");
break;
}
return;
Index: config/v850/v850-c.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/v850/v850-c.c,v
retrieving revision 1.4
diff -u -r1.4 v850-c.c
--- v850-c.c 2001/12/03 19:13:36 1.4
+++ v850-c.c 2001/12/15 20:01:59
@@ -163,7 +163,7 @@
else if (streq (sect, "zbss")) kind = GHS_SECTION_KIND_ZDATA;
else
{
- warning ("unrecognised section name \"%s\"", sect);
+ warning ("unrecognized section name \"%s\"", sect);
return;
}
Index: ch/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/ChangeLog,v
retrieving revision 1.135
diff -u -r1.135 ChangeLog
--- ChangeLog 2001/12/10 11:27:00 1.135
+++ ChangeLog 2001/12/15 20:02:01
@@ -1,3 +1,7 @@
+2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * decl.c, parse.c, typeck.c: Use American spelling in messages.
+
2001-12-10 Joseph S. Myers <jsm28@cam.ac.uk>
* chill.texi: Don't condition menus on @ifinfo.
Index: ch/decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/decl.c,v
retrieving revision 1.34
diff -u -r1.34 decl.c
--- decl.c 2001/12/03 19:13:22 1.34
+++ decl.c 2001/12/15 20:02:01
@@ -1056,7 +1056,7 @@
if (CH_TYPE_NONVALUE_P (type))
{
error_with_decl (decl,
- "no initialisation allowed for `%s'");
+ "no initialization allowed for `%s'");
temp = NULL_TREE;
}
else if (TREE_CODE (type) == REFERENCE_TYPE)
Index: ch/parse.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/parse.c,v
retrieving revision 1.18
diff -u -r1.18 parse.c
--- parse.c 2001/12/03 19:13:23 1.18
+++ parse.c 2001/12/15 20:02:02
@@ -961,7 +961,7 @@
ignoring = save_ignoring;
}
if (init_value == NULL_TREE && loc_decl && pass == 1)
- error ("loc-identity declaration without initialisation");
+ error ("loc-identity declaration without initialization");
do_decls (names, mode,
is_static || global_bindings_p ()
/* the variable becomes STATIC if all_static_flag is set and
Index: ch/typeck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/typeck.c,v
retrieving revision 1.29
diff -u -r1.29 typeck.c
--- typeck.c 2001/12/03 19:13:23 1.29
+++ typeck.c 2001/12/15 20:02:02
@@ -3441,12 +3441,12 @@
}
else if (TREE_CODE (origin) == RECORD_TYPE)
{
- error ("parameterised structures not implemented");
+ error ("parameterized structures not implemented");
return error_mark_node;
}
else
{
- error ("invalid parameterised type");
+ error ("invalid parameterized type");
return error_mark_node;
}
Index: cp/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/ChangeLog,v
retrieving revision 1.2599
diff -u -r1.2599 ChangeLog
--- ChangeLog 2001/12/14 03:01:53 1.2599
+++ ChangeLog 2001/12/15 20:02:04
@@ -1,3 +1,7 @@
+2001-12-15 Joseph S. Myers <jsm28@cam.ac.uk>
+
+ * lang-options.h: Use American spelling in messages.
+
2001-12-13 Jason Merrill <jason@redhat.com>
* Make-lang.in (parse.h): Separate rule, just depend on parse.c.
Index: cp/lang-options.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/lang-options.h,v
retrieving revision 1.42
diff -u -r1.42 lang-options.h
--- lang-options.h 2001/12/03 19:13:38 1.42
+++ lang-options.h 2001/12/15 20:02:04
@@ -61,7 +61,7 @@
N_("Scope of for-init-statement vars extends outside") },
{ "-fgnu-keywords", "" },
{ "-fno-gnu-keywords",
- N_("Do not recognise GNU defined keywords") },
+ N_("Do not recognize GNU defined keywords") },
{ "-fhandle-exceptions", "" },
{ "-fno-handle-exceptions", "" },
{ "-fhuge-objects",
@@ -84,7 +84,7 @@
N_("Don't pedwarn about uses of Microsoft extensions") },
{ "-fno-ms-extensions", "" },
{ "-foperator-names",
- N_("Recognise and/bitand/bitor/compl/not/or/xor") },
+ N_("Recognize and/bitand/bitor/compl/not/or/xor") },
{ "-fno-operator-names", "" },
{ "-foptional-diags", "" },
{ "-fno-optional-diags",
@@ -137,7 +137,7 @@
N_("Warn when the compiler reorders code") },
{ "-Wno-reorder", "" },
{ "-Wsynth",
- N_("Warn when synthesis behaviour differs from Cfront") },
+ N_("Warn when synthesis behavior differs from Cfront") },
{ "-Wno-synth", "" },
{ "-Wpmf-conversions", "" },
{ "-Wno-pmf-conversions",
--
Joseph S. Myers
jsm28@cam.ac.uk