From 583fa9e06b1af1cd0c6da01a9ab0ee8a1c4569ce Mon Sep 17 00:00:00 2001 From: zack Date: Wed, 6 Oct 2004 04:47:42 +0000 Subject: [PATCH] * pretty-print.c: Include tree.h. (pp_base_prepare_to_format): New function, logic from text_specifies_location. (pp_base_format_text): Use gcc_assert. * pretty-print.h (pp_prepare_to_format): New macro. (pp_base_prepare_to_format): Prototype. * diagnostic.c (text_specifies_location): Delete. (bug_report_request): Delete. (diagnostic_set_info): Don't call text_specifies_location. (diagnostic_action_after_output): Put text from bug_report_request inline here. Use gcc_unreachable. (diagnostic_report_current_function): Fix comment. (diagnostic_report_diagnostic): Clarify logic for error recursion. Call pp_prepare_to_format before diagnostic_starter. (trim_filename): Use IS_DIR_SEPARATOR. (fatal_error, internal_error): Use gcc_unreachable. (error_recursion): Call diagnostic_action_after_output to issue the bug_report_request message and exit. * Makefile.in (diagnostic.o, pretty-print.o): Update dependencies. * c-parse.in: Add list of diagnostic messages to insulate translation template from version of yacc/bison used to compile the grammar. java: * parse.y, parse-scan.y: Add list of diagnostic messages to insulate translation template from version of yacc/bison used to compile the grammar. treelang: * parse.y: Add list of diagnostic messages to insulate translation template from version of yacc/bison used to compile the grammar. po: * gcc.pot: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88590 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 26 + gcc/Makefile.in | 11 +- gcc/c-parse.in | 18 +- gcc/diagnostic.c | 107 +- gcc/java/ChangeLog | 8 +- gcc/java/parse-scan.y | 17 + gcc/java/parse.y | 17 + gcc/po/ChangeLog | 4 + gcc/po/gcc.pot | 6171 +++++++++++++++++++++++++++--------------------- gcc/pretty-print.c | 47 +- gcc/pretty-print.h | 4 + gcc/treelang/ChangeLog | 6 + gcc/treelang/parse.y | 16 + 13 files changed, 3625 insertions(+), 2827 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5505870..a97d9d8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,29 @@ +2004-10-05 Zack Weinberg + + * pretty-print.c: Include tree.h. + (pp_base_prepare_to_format): New function, logic from + text_specifies_location. + (pp_base_format_text): Use gcc_assert. + * pretty-print.h (pp_prepare_to_format): New macro. + (pp_base_prepare_to_format): Prototype. + * diagnostic.c (text_specifies_location): Delete. + (bug_report_request): Delete. + (diagnostic_set_info): Don't call text_specifies_location. + (diagnostic_action_after_output): Put text from + bug_report_request inline here. Use gcc_unreachable. + (diagnostic_report_current_function): Fix comment. + (diagnostic_report_diagnostic): Clarify logic for error recursion. + Call pp_prepare_to_format before diagnostic_starter. + (trim_filename): Use IS_DIR_SEPARATOR. + (fatal_error, internal_error): Use gcc_unreachable. + (error_recursion): Call diagnostic_action_after_output to + issue the bug_report_request message and exit. + * Makefile.in (diagnostic.o, pretty-print.o): Update dependencies. + + * c-parse.in: Add list of diagnostic messages to insulate + translation template from version of yacc/bison used to + compile the grammar. + 2004-10-06 Alan Modra PR 16406 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2ac670f..2f12927 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1787,9 +1787,9 @@ tree-pretty-print.o : tree-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \ fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(FLAGS_H) real.h toplev.h $(HASHTAB_H) $(EXPR_H) $(RTL_H) $(GGC_H) \ $(TM_P_H) langhooks.h $(MD5_H) -diagnostic.o : diagnostic.c $(DIAGNOSTIC_H) real.h \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) version.h $(TM_P_H) $(FLAGS_H) $(GGC_H) \ - input.h toplev.h intl.h langhooks.h $(LANGHOOKS_DEF_H) +diagnostic.o : diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(TREE_H) version.h $(TM_P_H) $(FLAGS_H) input.h toplev.h intl.h \ + $(DIAGNOSTIC_H) langhooks.h $(LANGHOOKS_DEF_H) opts.o : opts.c opts.h options.h toplev.h $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TREE_H) $(TM_H) langhooks.h $(GGC_H) $(RTL_H) \ output.h $(DIAGNOSTIC_H) $(TM_P_H) $(INSN_ATTR_H) intl.h target.h @@ -2173,7 +2173,8 @@ lambda-code.o: lambda-code.c $(LAMBDA_H) $(GGC_H) $(SYSTEM_H) $(CONFIG_H) \ $(TREE_DATA_REF_H) $(SCEV_H) params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) toplev.h hooks.o: hooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(HOOKS_H) -pretty-print.o: $(CONFIG_H) $(SYSTEM_H) pretty-print.c $(PRETTY_PRINT_H) +pretty-print.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h intl.h $(PRETTY_PRINT_H) \ + $(TREE_H) errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h $(out_object_file): $(out_file) $(CONFIG_H) coretypes.h $(TM_H) $(TREE_H) $(GGC_H) \ @@ -2605,7 +2606,7 @@ build/gengtype$(build_exeext) : build/gengtype.o build/gengtype-lex.o \ $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ \ build/gengtype.o build/gengtype-lex.o build/gengtype-yacc.o \ $(BUILD_ERRORS) $(BUILD_LIBS) - + build/gengtype.o : gengtype.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) \ gengtype.h gtyp-gen.h rtl.def insn-notes.def errors.h diff --git a/gcc/c-parse.in b/gcc/c-parse.in index b682700..3defcd0 100644 --- a/gcc/c-parse.in +++ b/gcc/c-parse.in @@ -52,7 +52,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ggc.h" #include "c-common.h" -/* Like YYERROR but do call yyerror. */ #define YYERROR1 { yyerror ("syntax error"); YYERROR; } /* Like the default stack expander, except (1) use realloc when possible, @@ -3556,4 +3555,21 @@ c_parse_file (void) } } +#ifdef __XGETTEXT__ +/* Depending on the version of Bison used to compile this grammar, + it may issue generic diagnostics spelled "syntax error" or + "parse error". To prevent this from changing the translation + template randomly, we list all the variants of this particular + diagnostic here. Translators: there is no fine distinction + between diagnostics with "syntax error" in them, and diagnostics + with "parse error" in them. It's okay to give them both the same + translation. */ +const char d1[] = N_("syntax error"); +const char d2[] = N_("parse error"); +const char d3[] = N_("syntax error; also virtual memory exhausted"); +const char d4[] = N_("parse error; also virtual memory exhausted"); +const char d5[] = N_("syntax error: cannot back up"); +const char d6[] = N_("parse error: cannot back up"); +#endif + #include "gt-c-parse.h" diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index d6b6ea7..0705c63 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -51,7 +51,6 @@ static void default_diagnostic_finalizer (diagnostic_context *, diagnostic_info *); static void error_recursion (diagnostic_context *) ATTRIBUTE_NORETURN; -static bool text_specifies_location (text_info *, location_t *); static bool diagnostic_count_diagnostic (diagnostic_context *, diagnostic_info *); static void diagnostic_action_after_output (diagnostic_context *, @@ -61,13 +60,6 @@ static void real_abort (void) ATTRIBUTE_NORETURN; /* A diagnostic_context surrogate for stderr. */ static diagnostic_context global_diagnostic_context; diagnostic_context *global_dc = &global_diagnostic_context; - -/* Boilerplate text used in two locations. */ -#define bug_report_request \ -"Please submit a full bug report,\n\ -with preprocessed source if appropriate.\n\ -See %s for instructions.\n" - /* Return a malloc'd string containing MSG formatted a la printf. The caller is responsible for freeing the memory. */ @@ -118,35 +110,6 @@ diagnostic_initialize (diagnostic_context *context) context->lock = 0; } -/* Returns true if the next format specifier in TEXT is a format specifier - for a location_t. If so, update the object pointed by LOCUS to reflect - the specified location in *TEXT->args_ptr. */ -static bool -text_specifies_location (text_info *text, location_t *locus) -{ - const char *p; - /* Skip any leading text. */ - for (p = text->format_spec; *p && *p != '%'; ++p) - ; - - /* Extract the location information if any. */ - if (p[0] == '%' && p[1] == 'H') - { - *locus = *va_arg (*text->args_ptr, location_t *); - text->format_spec = p + 2; - return true; - } - else if (p[0] == '%' && p[1] == 'J') - { - tree t = va_arg (*text->args_ptr, tree); - *locus = DECL_SOURCE_LOCATION (t); - text->format_spec = p + 2; - return true; - } - - return false; -} - void diagnostic_set_info (diagnostic_info *diagnostic, const char *msgid, va_list *args, location_t location, @@ -155,10 +118,7 @@ diagnostic_set_info (diagnostic_info *diagnostic, const char *msgid, diagnostic->message.err_no = errno; diagnostic->message.args_ptr = args; diagnostic->message.format_spec = _(msgid); - /* If the diagnostic message doesn't specify a location, - use LOCATION. */ - if (!text_specifies_location (&diagnostic->message, &diagnostic->location)) - diagnostic->location = location; + diagnostic->location = location; diagnostic->kind = kind; } @@ -274,7 +234,9 @@ diagnostic_action_after_output (diagnostic_context *context, if (context->abort_on_error) real_abort (); - fnotice (stderr, bug_report_request, bug_report_url); + fnotice (stderr, "Please submit a full bug report,\n" + "with preprocessed source if appropriate.\n" + "See %s for instructions.\n", bug_report_url); exit (FATAL_EXIT_CODE); case DK_FATAL: @@ -285,14 +247,12 @@ diagnostic_action_after_output (diagnostic_context *context, exit (FATAL_EXIT_CODE); default: - real_abort (); + gcc_unreachable (); } } /* Prints out, if necessary, the name of the current function - that caused an error. Called from all error and warning functions. - We ignore the FILE parameter, as it cannot be relied upon. */ - + that caused an error. Called from all error and warning functions. */ void diagnostic_report_current_function (diagnostic_context *context) { @@ -355,11 +315,23 @@ void diagnostic_report_diagnostic (diagnostic_context *context, diagnostic_info *diagnostic) { - if (context->lock++ && diagnostic->kind < DK_SORRY) - error_recursion (context); + if (context->lock > 0) + { + /* If we're reporting an ICE in the middle of some other error, + try to flush out the previous error, then let this one + through. Don't do this more than once. */ + if (diagnostic->kind == DK_ICE && context->lock == 1) + pp_flush (context->printer); + else + error_recursion (context); + } + + context->lock++; if (diagnostic_count_diagnostic (context, diagnostic)) { + pp_prepare_to_format (context->printer, &diagnostic->message, + &diagnostic->location); (*diagnostic_starter (context)) (context, diagnostic); pp_format_text (context->printer, &diagnostic->message); (*diagnostic_finalizer (context)) (context, diagnostic); @@ -383,20 +355,10 @@ trim_filename (const char *name) /* First skip any "../" in each filename. This allows us to give a proper reference to a file in a subdirectory. */ - while (p[0] == '.' && p[1] == '.' - && (p[2] == DIR_SEPARATOR -#ifdef DIR_SEPARATOR_2 - || p[2] == DIR_SEPARATOR_2 -#endif - )) + while (p[0] == '.' && p[1] == '.' && IS_DIR_SEPARATOR (p[2])) p += 3; - while (q[0] == '.' && q[1] == '.' - && (q[2] == DIR_SEPARATOR -#ifdef DIR_SEPARATOR_2 - || p[2] == DIR_SEPARATOR_2 -#endif - )) + while (q[0] == '.' && q[1] == '.' && IS_DIR_SEPARATOR (q[2])) q += 3; /* Now skip any parts the two filenames have in common. */ @@ -404,11 +366,7 @@ trim_filename (const char *name) p++, q++; /* Now go backwards until the previous directory separator. */ - while (p > name && p[-1] != DIR_SEPARATOR -#ifdef DIR_SEPARATOR_2 - && p[-1] != DIR_SEPARATOR_2 -#endif - ) + while (p > name && IS_DIR_SEPARATOR (p[-1])) p--; return p; @@ -526,8 +484,7 @@ fatal_error (const char *msgid, ...) report_diagnostic (&diagnostic); va_end (ap); - /* NOTREACHED */ - real_abort (); + gcc_unreachable (); } /* An internal consistency check has failed. We make no attempt to @@ -545,8 +502,7 @@ internal_error (const char *msgid, ...) report_diagnostic (&diagnostic); va_end (ap); - /* NOTREACHED */ - real_abort (); + gcc_unreachable (); } /* Special case error functions. Most are implemented in terms of the @@ -572,13 +528,22 @@ fnotice (FILE *file, const char *msgid, ...) static void error_recursion (diagnostic_context *context) { + diagnostic_info diagnostic; + if (context->lock < 3) pp_flush (context->printer); fnotice (stderr, "Internal compiler error: Error reporting routines re-entered.\n"); - fnotice (stderr, bug_report_request, bug_report_url); - exit (FATAL_EXIT_CODE); + + /* Call diagnostic_action_after_output to get the "please submit a bug + report" message. It only looks at the kind field of diagnostic_info. */ + diagnostic.kind = DK_ICE; + diagnostic_action_after_output (context, &diagnostic); + + /* Do not use gcc_unreachable here; that goes through internal_error + and therefore would cause infinite recursion. */ + real_abort (); } /* Report an internal compiler error in a friendly manner. This is diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 56ac57e..d28ee2c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2004-10-05 Zack Weinberg + + * parse.y, parse-scan.y: Add list of diagnostic messages to + insulate translation template from version of yacc/bison used + to compile the grammar. + 2004-10-05 Ranjit Mathew Prepare for %q, %< and %> in diagnostic message strings. @@ -230,7 +236,7 @@ Fix bootstrap. * gjavah.c (free_method_name_list): Fix function definition so it's a proper C prototype. - + 2004-09-21 Tom Tromey PR java/17575: diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y index e05fdb5..f3f5faa 100644 --- a/gcc/java/parse-scan.y +++ b/gcc/java/parse-scan.y @@ -1360,3 +1360,20 @@ yyerror (const char *msg ATTRIBUTE_UNUSED) fprintf (stderr, "%s: %d: %s\n", input_filename, input_line, msg); exit (1); } + +#ifdef __XGETTEXT__ +/* Depending on the version of Bison used to compile this grammar, + it may issue generic diagnostics spelled "syntax error" or + "parse error". To prevent this from changing the translation + template randomly, we list all the variants of this particular + diagnostic here. Translators: there is no fine distinction + between diagnostics with "syntax error" in them, and diagnostics + with "parse error" in them. It's okay to give them both the same + translation. */ +const char d1[] = N_("syntax error"); +const char d2[] = N_("parse error"); +const char d3[] = N_("syntax error; also virtual memory exhausted"); +const char d4[] = N_("parse error; also virtual memory exhausted"); +const char d5[] = N_("syntax error: cannot back up"); +const char d6[] = N_("parse error: cannot back up"); +#endif diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 5544cae..95bd93a 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -16409,5 +16409,22 @@ emit_test_initialization (void **entry_p, void *info) return true; } +#ifdef __XGETTEXT__ +/* Depending on the version of Bison used to compile this grammar, + it may issue generic diagnostics spelled "syntax error" or + "parse error". To prevent this from changing the translation + template randomly, we list all the variants of this particular + diagnostic here. Translators: there is no fine distinction + between diagnostics with "syntax error" in them, and diagnostics + with "parse error" in them. It's okay to give them both the same + translation. */ +const char d1[] = N_("syntax error"); +const char d2[] = N_("parse error"); +const char d3[] = N_("syntax error; also virtual memory exhausted"); +const char d4[] = N_("parse error; also virtual memory exhausted"); +const char d5[] = N_("syntax error: cannot back up"); +const char d6[] = N_("parse error: cannot back up"); +#endif + #include "gt-java-parse.h" #include "gtype-java.h" diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog index c5a2795..17b92d0 100644 --- a/gcc/po/ChangeLog +++ b/gcc/po/ChangeLog @@ -1,3 +1,7 @@ +2004-10-05 Zack Weinberg + + * gcc.pot: Regenerate. + 2004-10-03 Joseph S. Myers * da.po: Update. diff --git a/gcc/po/gcc.pot b/gcc/po/gcc.pot index 82025b1..80cf50a 100644 --- a/gcc/po/gcc.pot +++ b/gcc/po/gcc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2004-09-30 22:56+0000\n" +"POT-Creation-Date: 2004-10-05 21:45-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,96 +56,96 @@ msgstr "" msgid "invalid third arg to __builtin_prefetch; using zero" msgstr "" -#: builtins.c:4161 +#: builtins.c:3790 msgid "argument of %<__builtin_args_info%> must be constant" msgstr "" -#: builtins.c:4167 +#: builtins.c:3796 msgid "argument of %<__builtin_args_info%> out of range" msgstr "" -#: builtins.c:4173 +#: builtins.c:3802 msgid "missing argument in %<__builtin_args_info%>" msgstr "" -#: builtins.c:4189 builtins.c:9153 +#: builtins.c:3818 builtins.c:8715 msgid "% used in function with fixed args" msgstr "" -#: builtins.c:4208 builtins.c:9169 +#: builtins.c:3837 builtins.c:8731 msgid "second parameter of % not last named argument" msgstr "" #. Evidently an out of date version of ; can't validate #. va_start's second argument, but can still work as intended. -#: builtins.c:4213 builtins.c:9175 +#: builtins.c:3842 builtins.c:8737 msgid "%<__builtin_next_arg%> called without an argument" msgstr "" -#: builtins.c:4298 +#: builtins.c:3927 msgid "too many arguments to function %" msgstr "" -#: builtins.c:4446 +#: builtins.c:4075 msgid "first argument to % not of type %" msgstr "" #. Unfortunately, this is merely undefined, rather than a constraint #. violation, so we cannot make this an error. If this call is never #. executed, the program is still strictly conforming. -#: builtins.c:4460 +#: builtins.c:4089 msgid "%qT is promoted to %qT when passed through %<...%>" msgstr "" -#: builtins.c:4465 +#: builtins.c:4094 msgid "(so you should pass %qT not %qT to %)" msgstr "" #. We can, however, treat "undefined" any way we please. #. Call abort to encourage the user to fix the program. -#: builtins.c:4471 c-typeck.c:1956 +#: builtins.c:4100 c-typeck.c:1956 msgid "if this code is reached, the program will abort" msgstr "" -#: builtins.c:4589 +#: builtins.c:4218 msgid "invalid arg to %<__builtin_frame_address%>" msgstr "" -#: builtins.c:4591 +#: builtins.c:4220 msgid "invalid arg to %<__builtin_return_address%>" msgstr "" -#: builtins.c:4605 +#: builtins.c:4234 msgid "unsupported arg to %<__builtin_frame_address%>" msgstr "" -#: builtins.c:4607 +#: builtins.c:4236 msgid "unsupported arg to %<__builtin_return_address%>" msgstr "" -#: builtins.c:4773 +#: builtins.c:4339 msgid "second arg to %<__builtin_expect%> must be a constant" msgstr "" -#: builtins.c:5980 +#: builtins.c:5546 msgid "__builtin_longjmp second argument must be 1" msgstr "" -#: builtins.c:6325 +#: builtins.c:5891 msgid "target format does not support infinity" msgstr "" -#: builtins.c:8001 builtins.c:8097 c-typeck.c:2185 +#: builtins.c:7566 builtins.c:7662 c-typeck.c:2185 #, c-format msgid "too few arguments to function %qs" msgstr "" -#: builtins.c:8007 builtins.c:8103 c-typeck.c:2044 +#: builtins.c:7572 builtins.c:7668 c-typeck.c:2044 #, c-format msgid "too many arguments to function %qs" msgstr "" -#: builtins.c:8013 builtins.c:8127 +#: builtins.c:7578 builtins.c:7692 #, c-format msgid "non-floating-point argument to function %qs" msgstr "" @@ -568,10 +568,11 @@ msgstr "" #. Use `%s' to print the string in case there are any escape #. characters in the message. -#: c-common.c:5500 c-typeck.c:3994 c-typeck.c:4009 c-typeck.c:4024 +#: c-common.c:5500 c-typeck.c:3975 c-typeck.c:3990 c-typeck.c:4005 #: final.c:2840 final.c:2842 gcc.c:4647 rtl-error.c:113 toplev.c:599 #: config/cris/cris.c:568 cp/parser.c:1924 cp/typeck.c:4160 java/expr.c:368 -#: java/verify.c:1552 java/verify.c:1553 java/verify.c:1572 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:5022 java/verify.c:1552 +#: java/verify.c:1553 java/verify.c:1572 #, c-format msgid "%s" msgstr "" @@ -593,7 +594,7 @@ msgid "attempt to take address of bit-field structure member %qs" msgstr "" #: c-convert.c:83 c-typeck.c:1352 c-typeck.c:3438 cp/typeck.c:1376 -#: cp/typeck.c:5706 fortran/convert.c:89 treelang/tree-convert.c:79 +#: cp/typeck.c:5709 fortran/convert.c:89 treelang/tree-convert.c:79 msgid "void value not ignored as it ought to be" msgstr "" @@ -623,307 +624,307 @@ msgstr "" msgid "%Jlabel %qD declared but not defined" msgstr "" -#: c-decl.c:774 +#: c-decl.c:772 cp/decl.c:574 msgid "%Junused variable %qD" msgstr "" -#: c-decl.c:778 +#: c-decl.c:776 msgid "%Jtype of array %qD completed incompatibly with implicit initialization" msgstr "" -#: c-decl.c:1010 +#: c-decl.c:1008 msgid "" "a parameter list with an ellipsis can't match an empty parameter name list " "declaration" msgstr "" -#: c-decl.c:1017 +#: c-decl.c:1015 msgid "" "an argument type that has a default promotion can't match an empty parameter " "name list declaration" msgstr "" -#: c-decl.c:1053 +#: c-decl.c:1051 msgid "" "%Jprototype for %qD declares more arguments than previous old-style " "definition" msgstr "" -#: c-decl.c:1059 +#: c-decl.c:1057 msgid "" "%Jprototype for %qD declares fewer arguments than previous old-style " "definition" msgstr "" -#: c-decl.c:1068 +#: c-decl.c:1066 msgid "%Jprototype for %qD declares arg %d with incompatible type" msgstr "" #. If we get here, no errors were found, but do issue a warning #. for this poor-style construct. -#: c-decl.c:1080 +#: c-decl.c:1078 msgid "%Jprototype for %qD follows non-prototype definition" msgstr "" -#: c-decl.c:1095 +#: c-decl.c:1093 msgid "%Jprevious definition of %qD was here" msgstr "" -#: c-decl.c:1097 +#: c-decl.c:1095 msgid "%Jprevious implicit declaration of %qD was here" msgstr "" -#: c-decl.c:1099 +#: c-decl.c:1097 msgid "%Jprevious declaration of %qD was here" msgstr "" -#: c-decl.c:1135 +#: c-decl.c:1133 msgid "%J%qD redeclared as different kind of symbol" msgstr "" -#: c-decl.c:1140 +#: c-decl.c:1138 msgid "%Jbuilt-in function %qD declared as non-function" msgstr "" -#: c-decl.c:1143 c-decl.c:1247 c-decl.c:1816 +#: c-decl.c:1141 c-decl.c:1245 c-decl.c:1814 msgid "%Jdeclaration of %qD shadows a built-in function" msgstr "" -#: c-decl.c:1152 +#: c-decl.c:1150 msgid "%Jredeclaration of enumerator %qD" msgstr "" #. If types don't match for a built-in, throw away the #. built-in. No point in calling locate_old_decl here, it #. won't print anything. -#: c-decl.c:1173 +#: c-decl.c:1171 msgid "%Jconflicting types for built-in function %qD" msgstr "" -#: c-decl.c:1197 c-decl.c:1208 +#: c-decl.c:1195 c-decl.c:1206 msgid "%Jconflicting types for %qD" msgstr "" -#: c-decl.c:1206 +#: c-decl.c:1204 msgid "%J conflicting type qualifiers for %qD" msgstr "" #. Allow OLDDECL to continue in use. -#: c-decl.c:1223 +#: c-decl.c:1221 msgid "%Jredefinition of typedef %qD" msgstr "" -#: c-decl.c:1262 c-decl.c:1340 +#: c-decl.c:1260 c-decl.c:1338 msgid "%Jredefinition of %qD" msgstr "" -#: c-decl.c:1297 c-decl.c:1378 +#: c-decl.c:1295 c-decl.c:1376 msgid "%Jstatic declaration of %qD follows non-static declaration" msgstr "" -#: c-decl.c:1307 c-decl.c:1314 c-decl.c:1367 c-decl.c:1375 +#: c-decl.c:1305 c-decl.c:1312 c-decl.c:1365 c-decl.c:1373 msgid "%Jnon-static declaration of %qD follows static declaration" msgstr "" -#: c-decl.c:1327 +#: c-decl.c:1325 msgid "%Jthread-local declaration of %qD follows non-thread-local declaration" msgstr "" -#: c-decl.c:1330 +#: c-decl.c:1328 msgid "%Jnon-thread-local declaration of %qD follows thread-local declaration" msgstr "" -#: c-decl.c:1360 +#: c-decl.c:1358 msgid "%Jextern declaration of %qD follows declaration with no linkage" msgstr "" -#: c-decl.c:1396 +#: c-decl.c:1394 msgid "%Jdeclaration of %qD with no linkage follows extern declaration" msgstr "" -#: c-decl.c:1402 +#: c-decl.c:1400 msgid "%Jredeclaration of %qD with no linkage" msgstr "" -#: c-decl.c:1416 +#: c-decl.c:1414 msgid "" "%Jredeclaration of %qD with different visibility (old visibility preserved)" msgstr "" -#: c-decl.c:1427 +#: c-decl.c:1425 msgid "%Jinline declaration of %qD follows declaration with attribute noinline" msgstr "" -#: c-decl.c:1434 +#: c-decl.c:1432 msgid "" "%Jdeclaration of %qD with attribute noinline follows inline declaration " msgstr "" -#: c-decl.c:1449 +#: c-decl.c:1447 msgid "%J%qD declared inline after being called" msgstr "" -#: c-decl.c:1455 +#: c-decl.c:1453 msgid "%J%qD declared inline after its definition" msgstr "" -#: c-decl.c:1475 +#: c-decl.c:1473 msgid "%Jredefinition of parameter %qD" msgstr "" -#: c-decl.c:1499 +#: c-decl.c:1497 msgid "%Jredundant redeclaration of %qD" msgstr "" -#: c-decl.c:1809 +#: c-decl.c:1807 msgid "%Jdeclaration of %qD shadows a parameter" msgstr "" -#: c-decl.c:1812 +#: c-decl.c:1810 msgid "%Jdeclaration of %qD shadows a global declaration" msgstr "" -#: c-decl.c:1819 +#: c-decl.c:1817 msgid "%Jdeclaration of %qD shadows a previous local" msgstr "" -#: c-decl.c:1824 cp/name-lookup.c:1011 cp/name-lookup.c:1042 +#: c-decl.c:1822 cp/name-lookup.c:1011 cp/name-lookup.c:1042 #: cp/name-lookup.c:1050 msgid "%Jshadowed declaration is here" msgstr "" -#: c-decl.c:1978 +#: c-decl.c:1976 msgid "nested extern declaration of %qD" msgstr "" -#: c-decl.c:2067 +#: c-decl.c:2066 msgid "nested static declaration of %qD" msgstr "" -#: c-decl.c:2162 +#: c-decl.c:2161 #, c-format msgid "implicit declaration of function %qE" msgstr "" -#: c-decl.c:2220 +#: c-decl.c:2219 msgid "incompatible implicit declaration of built-in function %qD" msgstr "" -#: c-decl.c:2229 +#: c-decl.c:2228 msgid "incompatible implicit declaration of function %qD" msgstr "" -#: c-decl.c:2282 +#: c-decl.c:2281 #, c-format msgid "%qE undeclared here (not in a function)" msgstr "" -#: c-decl.c:2287 +#: c-decl.c:2286 #, c-format msgid "%qE undeclared (first use in this function)" msgstr "" -#: c-decl.c:2291 +#: c-decl.c:2290 msgid "(Each undeclared identifier is reported only once" msgstr "" -#: c-decl.c:2292 +#: c-decl.c:2291 msgid "for each function it appears in.)" msgstr "" -#: c-decl.c:2330 +#: c-decl.c:2329 #, c-format msgid "label %qs referenced outside of any function" msgstr "" -#: c-decl.c:2373 +#: c-decl.c:2372 #, c-format msgid "duplicate label declaration %qs" msgstr "" -#: c-decl.c:2408 +#: c-decl.c:2407 msgid "%Hduplicate label %qD" msgstr "" -#: c-decl.c:2430 +#: c-decl.c:2429 msgid "" "%Htraditional C lacks a separate namespace for labels, identifier %qs " "conflicts" msgstr "" -#: c-decl.c:2496 +#: c-decl.c:2495 msgid "%H%qs defined as wrong kind of tag" msgstr "" -#: c-decl.c:2721 +#: c-decl.c:2720 msgid "unnamed struct/union that defines no instances" msgstr "" -#: c-decl.c:2740 c-decl.c:2747 +#: c-decl.c:2739 c-decl.c:2746 msgid "useless type name in empty declaration" msgstr "" -#: c-decl.c:2753 +#: c-decl.c:2752 msgid "% in empty declaration" msgstr "" -#: c-decl.c:2759 +#: c-decl.c:2758 msgid "% in file-scope empty declaration" msgstr "" -#: c-decl.c:2765 +#: c-decl.c:2764 msgid "% in file-scope empty declaration" msgstr "" -#: c-decl.c:2771 +#: c-decl.c:2770 msgid "useless storage class specifier in empty declaration" msgstr "" -#: c-decl.c:2777 +#: c-decl.c:2776 msgid "useless %<__thread%> in empty declaration" msgstr "" -#: c-decl.c:2785 +#: c-decl.c:2784 msgid "useless type qualifier in empty declaration" msgstr "" -#: c-decl.c:2792 c-parse.y:787 c-parse.y:789 objc/objc-parse.y:825 -#: objc/objc-parse.y:827 +#: c-decl.c:2791 c-parse.y:786 c-parse.y:788 objc/objc-parse.y:824 +#: objc/objc-parse.y:826 msgid "empty declaration" msgstr "" -#: c-decl.c:2858 +#: c-decl.c:2857 msgid "" "ISO C90 does not support % or type qualifiers in parameter array " "declarators" msgstr "" -#: c-decl.c:2861 +#: c-decl.c:2860 msgid "ISO C90 does not support %<[*]%> array declarators" msgstr "" -#: c-decl.c:2864 +#: c-decl.c:2863 msgid "GCC does not yet properly implement %<[*]%> array declarators" msgstr "" -#: c-decl.c:2883 +#: c-decl.c:2882 msgid "static or type qualifiers in abstract declarator" msgstr "" -#: c-decl.c:2940 +#: c-decl.c:2939 msgid "%J%qD is usually a function" msgstr "" -#: c-decl.c:2949 +#: c-decl.c:2948 cp/decl.c:3693 cp/decl2.c:857 msgid "typedef %qD is initialized (use __typeof__ instead)" msgstr "" -#: c-decl.c:2954 +#: c-decl.c:2953 msgid "function %qD is initialized like a variable" msgstr "" #. DECL_INITIAL in a PARM_DECL is really DECL_ARG_TYPE. -#: c-decl.c:2960 +#: c-decl.c:2959 msgid "parameter %qD is initialized" msgstr "" @@ -931,746 +932,746 @@ msgstr "" #. of VLAs themselves count as VLAs, it does not make #. sense to permit them to be initialized given that #. ordinary VLAs may not be initialized. -#: c-decl.c:2979 c-decl.c:2999 c-typeck.c:4274 +#: c-decl.c:2978 c-decl.c:2998 c-typeck.c:4255 msgid "variable-sized object may not be initialized" msgstr "" -#: c-decl.c:2985 +#: c-decl.c:2984 msgid "variable %qD has initializer but incomplete type" msgstr "" -#: c-decl.c:2990 +#: c-decl.c:2989 msgid "elements of array %qD have incomplete type" msgstr "" -#: c-decl.c:3066 c-decl.c:5643 +#: c-decl.c:3065 c-decl.c:5642 cp/decl.c:3733 cp/decl.c:9837 msgid "%Jinline function %qD given attribute noinline" msgstr "" -#: c-decl.c:3134 +#: c-decl.c:3133 msgid "%Jinitializer fails to determine size of %qD" msgstr "" -#: c-decl.c:3139 +#: c-decl.c:3138 msgid "%Jarray size missing in %qD" msgstr "" -#: c-decl.c:3155 +#: c-decl.c:3154 msgid "%Jzero or negative size array %qD" msgstr "" -#: c-decl.c:3181 varasm.c:1523 +#: c-decl.c:3180 varasm.c:1523 msgid "%Jstorage size of %qD isn%'t known" msgstr "" -#: c-decl.c:3191 +#: c-decl.c:3190 msgid "%Jstorage size of %qD isn%'t constant" msgstr "" -#: c-decl.c:3246 +#: c-decl.c:3245 msgid "%Jignoring asm-specifier for non-static local variable %qD" msgstr "" -#: c-decl.c:3276 fortran/f95-lang.c:646 +#: c-decl.c:3275 fortran/f95-lang.c:646 msgid "cannot put object with volatile field into register" msgstr "" -#: c-decl.c:3410 +#: c-decl.c:3409 msgid "ISO C forbids forward parameter declarations" msgstr "" -#: c-decl.c:3594 +#: c-decl.c:3593 msgid "" msgstr "" -#: c-decl.c:3603 +#: c-decl.c:3602 #, c-format msgid "bit-field %qs width not an integer constant" msgstr "" -#: c-decl.c:3611 +#: c-decl.c:3610 #, c-format msgid "negative width in bit-field %qs" msgstr "" -#: c-decl.c:3616 +#: c-decl.c:3615 #, c-format msgid "zero width for bit-field %qs" msgstr "" -#: c-decl.c:3626 +#: c-decl.c:3625 #, c-format msgid "bit-field %qs has invalid type" msgstr "" -#: c-decl.c:3635 +#: c-decl.c:3634 #, c-format msgid "type of bit-field %qs is a GCC extension" msgstr "" -#: c-decl.c:3644 +#: c-decl.c:3643 #, c-format msgid "width of %qs exceeds its type" msgstr "" -#: c-decl.c:3657 +#: c-decl.c:3656 #, c-format msgid "%qs is narrower than values of its type" msgstr "" -#: c-decl.c:3782 +#: c-decl.c:3781 msgid "type defaults to % in declaration of %qs" msgstr "" -#: c-decl.c:3814 +#: c-decl.c:3813 msgid "duplicate %" msgstr "" -#: c-decl.c:3816 +#: c-decl.c:3815 msgid "duplicate %" msgstr "" -#: c-decl.c:3818 +#: c-decl.c:3817 msgid "duplicate %" msgstr "" -#: c-decl.c:3837 +#: c-decl.c:3836 msgid "function definition declared %" msgstr "" -#: c-decl.c:3839 +#: c-decl.c:3838 msgid "function definition declared %" msgstr "" -#: c-decl.c:3841 +#: c-decl.c:3840 msgid "function definition declared %" msgstr "" -#: c-decl.c:3843 +#: c-decl.c:3842 msgid "function definition declared %<__thread%>" msgstr "" -#: c-decl.c:3859 +#: c-decl.c:3858 #, c-format msgid "storage class specified for structure field %qs" msgstr "" -#: c-decl.c:3863 +#: c-decl.c:3862 cp/decl.c:7048 #, c-format msgid "storage class specified for parameter %qs" msgstr "" -#: c-decl.c:3866 cp/decl.c:7044 +#: c-decl.c:3865 cp/decl.c:7050 msgid "storage class specified for typename" msgstr "" -#: c-decl.c:3879 +#: c-decl.c:3878 cp/decl.c:7067 msgid "%qs initialized and declared %" msgstr "" -#: c-decl.c:3881 +#: c-decl.c:3880 cp/decl.c:7070 msgid "%qs has both % and initializer" msgstr "" -#: c-decl.c:3886 +#: c-decl.c:3885 msgid "file-scope declaration of %qs specifies %" msgstr "" -#: c-decl.c:3888 +#: c-decl.c:3887 msgid "file-scope declaration of %qs specifies %" msgstr "" -#: c-decl.c:3893 +#: c-decl.c:3892 cp/decl.c:7074 msgid "nested function %qs declared %" msgstr "" -#: c-decl.c:3896 +#: c-decl.c:3895 cp/decl.c:7084 msgid "function-scope %qs implicitly auto and declared %<__thread%>" msgstr "" #. Only the innermost declarator (making a parameter be of #. array type which is converted to pointer type) #. may have static or type qualifiers. -#: c-decl.c:3937 c-decl.c:4131 +#: c-decl.c:3936 c-decl.c:4130 msgid "static or type qualifiers in non-parameter array declarator" msgstr "" -#: c-decl.c:3983 +#: c-decl.c:3982 #, c-format msgid "declaration of %qs as array of voids" msgstr "" -#: c-decl.c:3989 +#: c-decl.c:3988 #, c-format msgid "declaration of %qs as array of functions" msgstr "" -#: c-decl.c:3994 +#: c-decl.c:3993 msgid "invalid use of structure with flexible array member" msgstr "" -#: c-decl.c:4014 +#: c-decl.c:4013 #, c-format msgid "size of array %qs has non-integer type" msgstr "" -#: c-decl.c:4019 +#: c-decl.c:4018 #, c-format msgid "ISO C forbids zero-size array %qs" msgstr "" -#: c-decl.c:4026 +#: c-decl.c:4025 #, c-format msgid "size of array %qs is negative" msgstr "" -#: c-decl.c:4040 +#: c-decl.c:4039 msgid "ISO C90 forbids array %qs whose size can%'t be evaluated" msgstr "" -#: c-decl.c:4044 +#: c-decl.c:4043 #, c-format msgid "ISO C90 forbids variable-size array %qs" msgstr "" -#: c-decl.c:4077 c-decl.c:4246 +#: c-decl.c:4076 c-decl.c:4245 cp/decl.c:7494 #, c-format msgid "size of array %qs is too large" msgstr "" -#: c-decl.c:4090 +#: c-decl.c:4089 msgid "ISO C90 does not support flexible array members" msgstr "" -#: c-decl.c:4099 +#: c-decl.c:4098 msgid "array type has incomplete element type" msgstr "" -#: c-decl.c:4163 +#: c-decl.c:4162 cp/decl.c:7183 #, c-format msgid "%qs declared as function returning a function" msgstr "" -#: c-decl.c:4168 +#: c-decl.c:4167 cp/decl.c:7188 #, c-format msgid "%qs declared as function returning an array" msgstr "" -#: c-decl.c:4188 +#: c-decl.c:4187 msgid "function definition has qualified void return type" msgstr "" -#: c-decl.c:4190 +#: c-decl.c:4189 msgid "type qualifiers ignored on function return type" msgstr "" -#: c-decl.c:4219 c-decl.c:4259 c-decl.c:4353 c-decl.c:4440 +#: c-decl.c:4218 c-decl.c:4258 c-decl.c:4352 c-decl.c:4439 msgid "ISO C forbids qualified function types" msgstr "" -#: c-decl.c:4267 +#: c-decl.c:4266 msgid "%Jtypedef %qD declared %" msgstr "" -#: c-decl.c:4297 +#: c-decl.c:4296 msgid "ISO C forbids const or volatile function types" msgstr "" -#: c-decl.c:4317 +#: c-decl.c:4316 cp/decl.c:7758 #, c-format msgid "variable or field %qs declared void" msgstr "" -#: c-decl.c:4346 +#: c-decl.c:4345 msgid "attributes in parameter array declarator ignored" msgstr "" -#: c-decl.c:4381 +#: c-decl.c:4380 msgid "%Jparameter %qD declared %" msgstr "" -#: c-decl.c:4394 +#: c-decl.c:4393 #, c-format msgid "field %qs declared as a function" msgstr "" -#: c-decl.c:4400 +#: c-decl.c:4399 #, c-format msgid "field %qs has incomplete type" msgstr "" -#: c-decl.c:4417 c-decl.c:4428 c-decl.c:4431 +#: c-decl.c:4416 c-decl.c:4427 c-decl.c:4430 #, c-format msgid "invalid storage class for function %qs" msgstr "" -#: c-decl.c:4446 +#: c-decl.c:4445 msgid "% function returns non-void value" msgstr "" -#: c-decl.c:4474 +#: c-decl.c:4473 msgid "cannot inline function %" msgstr "" -#: c-decl.c:4531 +#: c-decl.c:4530 msgid "variable previously declared % redeclared %" msgstr "" -#: c-decl.c:4540 +#: c-decl.c:4539 msgid "%Jvariable %qD declared %" msgstr "" #. A mere warning is sure to result in improper semantics #. at runtime. Don't bother to allow this to compile. -#: c-decl.c:4571 cp/decl.c:5942 +#: c-decl.c:4570 cp/decl.c:5947 msgid "thread-local storage not supported for this target" msgstr "" -#: c-decl.c:4633 c-decl.c:5682 +#: c-decl.c:4632 c-decl.c:5681 msgid "function declaration isn%'t a prototype" msgstr "" -#: c-decl.c:4641 +#: c-decl.c:4640 msgid "parameter names (without types) in function declaration" msgstr "" -#: c-decl.c:4670 c-decl.c:4682 +#: c-decl.c:4669 c-decl.c:4681 msgid "%Jparameter %u (%qD) has incomplete type" msgstr "" -#: c-decl.c:4673 c-decl.c:4685 +#: c-decl.c:4672 c-decl.c:4684 msgid "%Jparameter %u has incomplete type" msgstr "" -#: c-decl.c:4742 +#: c-decl.c:4741 msgid "% as only parameter may not be qualified" msgstr "" -#: c-decl.c:4746 c-decl.c:4781 +#: c-decl.c:4745 c-decl.c:4780 msgid "% must be the only parameter" msgstr "" -#: c-decl.c:4774 +#: c-decl.c:4773 msgid "%Jparameter %qD has just a forward declaration" msgstr "" #. The %s will be one of 'struct', 'union', or 'enum'. -#: c-decl.c:4820 +#: c-decl.c:4819 msgid "%<%s %E%> declared inside parameter list" msgstr "" #. The %s will be one of 'struct', 'union', or 'enum'. -#: c-decl.c:4824 +#: c-decl.c:4823 #, c-format msgid "anonymous %s declared inside parameter list" msgstr "" -#: c-decl.c:4829 +#: c-decl.c:4828 msgid "" "its scope is only this definition or declaration, which is probably not what " "you want" msgstr "" -#: c-decl.c:4943 +#: c-decl.c:4942 msgid "redefinition of %" msgstr "" -#: c-decl.c:4945 +#: c-decl.c:4944 msgid "redefinition of %" msgstr "" -#: c-decl.c:4950 +#: c-decl.c:4949 msgid "nested redefinition of %" msgstr "" -#: c-decl.c:4953 +#: c-decl.c:4952 msgid "nested redefinition of %" msgstr "" -#: c-decl.c:5025 cp/decl.c:3499 +#: c-decl.c:5024 cp/decl.c:3501 msgid "declaration does not declare anything" msgstr "" -#: c-decl.c:5070 c-decl.c:5086 +#: c-decl.c:5069 c-decl.c:5085 msgid "%Jduplicate member %qD" msgstr "" -#: c-decl.c:5121 +#: c-decl.c:5120 #, c-format msgid "%s has no %s" msgstr "" -#: c-decl.c:5122 +#: c-decl.c:5121 msgid "union" msgstr "" -#: c-decl.c:5122 +#: c-decl.c:5121 msgid "struct" msgstr "" -#: c-decl.c:5123 +#: c-decl.c:5122 msgid "named members" msgstr "" -#: c-decl.c:5123 +#: c-decl.c:5122 msgid "members" msgstr "" -#: c-decl.c:5178 +#: c-decl.c:5177 msgid "%Jflexible array member in union" msgstr "" -#: c-decl.c:5183 +#: c-decl.c:5182 msgid "%Jflexible array member not at end of struct" msgstr "" -#: c-decl.c:5188 +#: c-decl.c:5187 msgid "%Jflexible array member in otherwise empty struct" msgstr "" -#: c-decl.c:5195 +#: c-decl.c:5194 msgid "%Jinvalid use of structure with flexible array member" msgstr "" -#: c-decl.c:5300 +#: c-decl.c:5299 msgid "union cannot be made transparent" msgstr "" -#: c-decl.c:5365 +#: c-decl.c:5364 msgid "nested redefinition of %" msgstr "" #. This enum is a named one that has been declared already. -#: c-decl.c:5372 +#: c-decl.c:5371 msgid "redeclaration of %" msgstr "" -#: c-decl.c:5435 +#: c-decl.c:5434 msgid "enumeration values exceed range of largest integer" msgstr "" -#: c-decl.c:5452 +#: c-decl.c:5451 msgid "specified mode too small for enumeral values" msgstr "" -#: c-decl.c:5551 +#: c-decl.c:5550 #, c-format msgid "enumerator value for %qE is not an integer constant" msgstr "" -#: c-decl.c:5568 +#: c-decl.c:5567 msgid "overflow in enumeration values" msgstr "" -#: c-decl.c:5573 +#: c-decl.c:5572 msgid "ISO C restricts enumerator values to range of %" msgstr "" -#: c-decl.c:5649 +#: c-decl.c:5648 msgid "return type is an incomplete type" msgstr "" -#: c-decl.c:5657 +#: c-decl.c:5656 msgid "return type defaults to %" msgstr "" -#: c-decl.c:5688 +#: c-decl.c:5687 msgid "%Jno previous prototype for %qD" msgstr "" -#: c-decl.c:5694 +#: c-decl.c:5693 msgid "%J%qD was used with no prototype before its definition" msgstr "" -#: c-decl.c:5701 +#: c-decl.c:5700 msgid "%Jno previous declaration for %qD" msgstr "" -#: c-decl.c:5707 +#: c-decl.c:5706 msgid "%J%qD was used with no declaration before its definition" msgstr "" -#: c-decl.c:5740 c-decl.c:6228 +#: c-decl.c:5739 c-decl.c:6227 msgid "%Jreturn type of %qD is not %" msgstr "" -#: c-decl.c:5755 +#: c-decl.c:5754 msgid "%Jfirst argument of %qD should be %" msgstr "" -#: c-decl.c:5764 +#: c-decl.c:5763 msgid "%Jsecond argument of %qD should be %" msgstr "" -#: c-decl.c:5773 +#: c-decl.c:5772 msgid "%Jthird argument of %qD should probably be %" msgstr "" -#: c-decl.c:5783 +#: c-decl.c:5782 msgid "%J%qD takes only zero or two arguments" msgstr "" -#: c-decl.c:5786 +#: c-decl.c:5785 msgid "%J%qD is normally a non-static function" msgstr "" -#: c-decl.c:5832 +#: c-decl.c:5831 msgid "%Jold-style parameter declarations in prototyped function definition" msgstr "" -#: c-decl.c:5845 +#: c-decl.c:5844 msgid "%Jtraditional C rejects ISO C style function definitions" msgstr "" -#: c-decl.c:5857 +#: c-decl.c:5856 msgid "%Jparameter name omitted" msgstr "" -#: c-decl.c:5897 +#: c-decl.c:5896 msgid "%Jold-style function definition" msgstr "" -#: c-decl.c:5905 +#: c-decl.c:5904 msgid "%Jparameter name missing from parameter list" msgstr "" -#: c-decl.c:5916 +#: c-decl.c:5915 msgid "%J%qD declared as a non-parameter" msgstr "" -#: c-decl.c:5921 +#: c-decl.c:5920 msgid "%Jmultiple parameters named %qD" msgstr "" -#: c-decl.c:5929 +#: c-decl.c:5928 msgid "%Jparameter %qD declared with void type" msgstr "" -#: c-decl.c:5944 c-decl.c:5946 +#: c-decl.c:5943 c-decl.c:5945 msgid "%Jtype of %qD defaults to %" msgstr "" -#: c-decl.c:5964 +#: c-decl.c:5963 msgid "%Jparameter %qD has incomplete type" msgstr "" -#: c-decl.c:5970 +#: c-decl.c:5969 msgid "%Jdeclaration for parameter %qD but no such parameter" msgstr "" -#: c-decl.c:6020 +#: c-decl.c:6019 msgid "number of arguments doesn%'t match prototype" msgstr "" -#: c-decl.c:6021 c-decl.c:6051 c-decl.c:6058 +#: c-decl.c:6020 c-decl.c:6050 c-decl.c:6057 msgid "%Hprototype declaration" msgstr "" -#: c-decl.c:6049 +#: c-decl.c:6048 msgid "promoted argument %qD doesn%'t match prototype" msgstr "" -#: c-decl.c:6057 +#: c-decl.c:6056 msgid "argument %qD doesn%'t match prototype" msgstr "" -#: c-decl.c:6255 cp/decl.c:10576 +#: c-decl.c:6254 cp/decl.c:10592 msgid "no return statement in function returning non-void" msgstr "" -#: c-decl.c:6262 +#: c-decl.c:6261 msgid "this function may return with or without a value" msgstr "" #. If we get here, declarations have been used in a for loop without #. the C99 for loop scope. This doesn't make much sense, so don't #. allow it. -#: c-decl.c:6351 +#: c-decl.c:6350 msgid "% loop initial declaration used outside C99 mode" msgstr "" -#: c-decl.c:6380 +#: c-decl.c:6379 msgid "" "%Jdeclaration of static variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:6383 +#: c-decl.c:6382 msgid "" "%Jdeclaration of % variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:6388 +#: c-decl.c:6387 msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:6392 +#: c-decl.c:6391 msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:6396 +#: c-decl.c:6395 msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:6400 +#: c-decl.c:6399 msgid "%Jdeclaration of non-variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:6688 c-decl.c:6836 c-decl.c:7041 +#: c-decl.c:6687 c-decl.c:6835 c-decl.c:7040 cp/decl.c:6756 #, c-format msgid "duplicate %qs" msgstr "" -#: c-decl.c:6708 c-decl.c:6845 c-decl.c:6948 +#: c-decl.c:6707 c-decl.c:6844 c-decl.c:6947 msgid "two or more data types in declaration specifiers" msgstr "" -#: c-decl.c:6720 +#: c-decl.c:6719 cp/decl.c:6732 msgid "% is too long for GCC" msgstr "" -#: c-decl.c:6727 c-decl.c:6919 +#: c-decl.c:6726 c-decl.c:6918 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6733 +#: c-decl.c:6732 msgid "ISO C90 does not support %" msgstr "" -#: c-decl.c:6738 c-decl.c:6758 +#: c-decl.c:6737 c-decl.c:6757 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6741 c-decl.c:6852 +#: c-decl.c:6740 c-decl.c:6851 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6744 c-decl.c:6871 +#: c-decl.c:6743 c-decl.c:6870 msgid "both % and %<_Bool%> in declaration specifiers" msgstr "" -#: c-decl.c:6747 c-decl.c:6890 +#: c-decl.c:6746 c-decl.c:6889 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6750 c-decl.c:6903 +#: c-decl.c:6749 c-decl.c:6902 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6761 c-decl.c:6855 +#: c-decl.c:6760 c-decl.c:6854 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6764 c-decl.c:6874 +#: c-decl.c:6763 c-decl.c:6873 msgid "both % and %<_Bool%> in declaration specifiers" msgstr "" -#: c-decl.c:6767 c-decl.c:6893 +#: c-decl.c:6766 c-decl.c:6892 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6770 c-decl.c:6906 +#: c-decl.c:6769 c-decl.c:6905 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6773 c-decl.c:6922 +#: c-decl.c:6772 c-decl.c:6921 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6781 c-decl.c:6801 +#: c-decl.c:6780 c-decl.c:6800 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6784 c-decl.c:6858 +#: c-decl.c:6783 c-decl.c:6857 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6787 c-decl.c:6877 +#: c-decl.c:6786 c-decl.c:6876 msgid "both % and %<_Bool%> in declaration specifiers" msgstr "" -#: c-decl.c:6790 c-decl.c:6909 +#: c-decl.c:6789 c-decl.c:6908 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6793 c-decl.c:6925 +#: c-decl.c:6792 c-decl.c:6924 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6804 c-decl.c:6861 +#: c-decl.c:6803 c-decl.c:6860 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6807 c-decl.c:6880 +#: c-decl.c:6806 c-decl.c:6879 msgid "both % and %<_Bool%> in declaration specifiers" msgstr "" -#: c-decl.c:6810 c-decl.c:6912 +#: c-decl.c:6809 c-decl.c:6911 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6813 c-decl.c:6928 +#: c-decl.c:6812 c-decl.c:6927 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6821 +#: c-decl.c:6820 msgid "ISO C90 does not support complex types" msgstr "" -#: c-decl.c:6823 c-decl.c:6864 +#: c-decl.c:6822 c-decl.c:6863 msgid "both % and % in declaration specifiers" msgstr "" -#: c-decl.c:6826 c-decl.c:6883 +#: c-decl.c:6825 c-decl.c:6882 msgid "both % and %<_Bool%> in declaration specifiers" msgstr "" -#: c-decl.c:6965 +#: c-decl.c:6964 #, c-format msgid "%qs fails to be a typedef or built in type" msgstr "" -#: c-decl.c:6991 +#: c-decl.c:6990 #, c-format msgid "%qs is not at beginning of declaration" msgstr "" -#: c-decl.c:7006 +#: c-decl.c:7005 msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:7008 +#: c-decl.c:7007 msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:7010 +#: c-decl.c:7009 msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:7021 +#: c-decl.c:7020 cp/parser.c:7187 msgid "%<__thread%> before %" msgstr "" -#: c-decl.c:7030 +#: c-decl.c:7029 cp/parser.c:7177 msgid "%<__thread%> before %" msgstr "" -#: c-decl.c:7046 +#: c-decl.c:7045 msgid "multiple storage classes in declaration specifiers" msgstr "" -#: c-decl.c:7053 +#: c-decl.c:7052 msgid "%<__thread%> used with %qs" msgstr "" -#: c-decl.c:7107 +#: c-decl.c:7106 msgid "ISO C does not support plain % meaning %" msgstr "" -#: c-decl.c:7152 c-decl.c:7178 +#: c-decl.c:7151 c-decl.c:7177 msgid "ISO C does not support complex integer types" msgstr "" -#: c-decl.c:7253 toplev.c:837 +#: c-decl.c:7252 toplev.c:837 msgid "%J%qF used but never defined" msgstr "" @@ -2175,7 +2176,7 @@ msgstr "" msgid "statement with no effect" msgstr "" -#: c-gimplify.c:315 c-typeck.c:6722 cp/parser.c:6491 +#: c-gimplify.c:315 c-typeck.c:6703 cp/parser.c:6508 msgid "break statement not within loop or switch" msgstr "" @@ -2189,7 +2190,6 @@ msgid "ignoring duplicate directory \"%s\"\n" msgstr "" #: c-incpath.c:73 -#, c-format msgid " as it is a non-system directory that duplicates a system directory\n" msgstr "" @@ -2199,17 +2199,14 @@ msgid "ignoring nonexistent directory \"%s\"\n" msgstr "" #: c-incpath.c:283 -#, c-format msgid "#include \"...\" search starts here:\n" msgstr "" #: c-incpath.c:287 -#, c-format msgid "#include <...> search starts here:\n" msgstr "" #: c-incpath.c:292 -#, c-format msgid "End of search list.\n" msgstr "" @@ -2291,15 +2288,15 @@ msgid "" "pending sizes" msgstr "" -#: c-objc-common.c:260 +#: c-objc-common.c:263 msgid "used array that cannot be converted to pointer where scalar is required" msgstr "" -#: c-objc-common.c:264 +#: c-objc-common.c:267 msgid "used struct type value where scalar is required" msgstr "" -#: c-objc-common.c:268 +#: c-objc-common.c:271 msgid "used union type value where scalar is required" msgstr "" @@ -2424,153 +2421,184 @@ msgstr "" msgid "too late for # directive to set debug directory" msgstr "" -#. Like YYERROR but do call yyerror. -#: c-parse.y:55 c-parse.c:5321 gengtype-yacc.c:1559 java/parse-scan.c:3063 -#: java/parse.c:6132 objc/objc-parse.y:54 objc/objc-parse.c:6403 +#. Depending on the version of Bison used to compile this grammar, +#. it may issue generic diagnostics spelled "syntax error" or +#. "parse error". To prevent this from changing the translation +#. template randomly, we list all the variants of this particular +#. diagnostic here. Translators: there is no fine distinction +#. between diagnostics with "syntax error" in them, and diagnostics +#. with "parse error" in them. It's okay to give them both the same +#. translation. +#: c-parse.y:54 c-parse.y:2925 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1373 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16421 +#: objc/objc-parse.y:53 objc/objc-parse.y:3528 msgid "syntax error" msgstr "" -#: c-parse.c:2171 gengtype-yacc.c:555 java/parse-scan.c:1932 java/parse.c:2902 -#: objc/objc-parse.c:2688 +#: /usr/share/bison/bison.simple:179 c-parse.y:2929 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1377 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16425 +#: objc/objc-parse.y:3532 msgid "syntax error: cannot back up" msgstr "" -#: c-parse.y:345 objc/objc-parse.y:367 +#: c-parse.y:344 objc/objc-parse.y:366 msgid "ISO C forbids an empty source file" msgstr "" -#: c-parse.y:379 objc/objc-parse.y:402 +#: c-parse.y:378 objc/objc-parse.y:401 msgid "ISO C forbids data definition with no type or storage class" msgstr "" -#: c-parse.y:381 objc/objc-parse.y:404 +#: c-parse.y:380 objc/objc-parse.y:403 msgid "data definition has no type or storage class" msgstr "" -#: c-parse.y:394 objc/objc-parse.y:417 +#: c-parse.y:393 objc/objc-parse.y:416 msgid "ISO C does not allow extra %<;%> outside of a function" msgstr "" -#: c-parse.y:451 +#: c-parse.y:450 msgid "traditional C rejects the unary plus operator" msgstr "" -#: c-parse.y:504 objc/objc-parse.y:527 +#: c-parse.y:503 objc/objc-parse.y:526 msgid "% applied to a bit-field" msgstr "" -#: c-parse.y:601 objc/objc-parse.y:624 +#: c-parse.y:600 objc/objc-parse.y:623 msgid "ISO C forbids omitting the middle term of a ?: expression" msgstr "" -#: c-parse.y:642 objc/objc-parse.y:665 +#: c-parse.y:641 objc/objc-parse.y:664 msgid "compound literal has variable size" msgstr "" -#: c-parse.y:654 objc/objc-parse.y:677 +#: c-parse.y:653 objc/objc-parse.y:676 msgid "ISO C90 forbids compound literals" msgstr "" -#: c-parse.y:667 objc/objc-parse.y:690 +#: c-parse.y:666 objc/objc-parse.y:689 msgid "ISO C forbids braced-groups within expressions" msgstr "" -#: c-parse.y:703 objc/objc-parse.y:726 +#: c-parse.y:702 objc/objc-parse.y:725 msgid "first argument to __builtin_choose_expr not a constant" msgstr "" -#: c-parse.y:1227 objc/objc-parse.y:1274 +#: c-parse.y:1226 objc/objc-parse.y:1273 msgid "% applied to a bit-field" msgstr "" -#: c-parse.y:1355 objc/objc-parse.y:1402 +#: c-parse.y:1354 objc/objc-parse.y:1401 msgid "ISO C forbids empty initializer braces" msgstr "" -#: c-parse.y:1369 objc/objc-parse.y:1416 +#: c-parse.y:1368 objc/objc-parse.y:1415 msgid "ISO C90 forbids specifying subobject to initialize" msgstr "" -#: c-parse.y:1372 objc/objc-parse.y:1419 +#: c-parse.y:1371 objc/objc-parse.y:1418 msgid "obsolete use of designated initializer without %<=%>" msgstr "" -#: c-parse.y:1376 objc/objc-parse.y:1423 +#: c-parse.y:1375 objc/objc-parse.y:1422 msgid "obsolete use of designated initializer with %<:%>" msgstr "" -#: c-parse.y:1403 objc/objc-parse.y:1450 +#: c-parse.y:1402 objc/objc-parse.y:1449 msgid "ISO C forbids specifying range of elements to initialize" msgstr "" -#: c-parse.y:1411 c-parse.y:1441 objc/objc-parse.y:1458 objc/objc-parse.y:1488 +#: c-parse.y:1410 c-parse.y:1440 objc/objc-parse.y:1457 objc/objc-parse.y:1487 msgid "ISO C forbids nested functions" msgstr "" -#: c-parse.y:1608 objc/objc-parse.y:1659 +#: c-parse.y:1607 objc/objc-parse.y:1658 msgid "ISO C forbids forward references to % types" msgstr "" -#: c-parse.y:1620 cp/parser.c:9903 objc/objc-parse.y:1671 +#: c-parse.y:1619 cp/parser.c:9920 objc/objc-parse.y:1670 msgid "comma at end of enumerator list" msgstr "" -#: c-parse.y:1640 objc/objc-parse.y:1691 +#: c-parse.y:1639 objc/objc-parse.y:1690 msgid "no semicolon at end of struct or union" msgstr "" -#: c-parse.y:1649 objc/objc-parse.y:1700 objc/objc-parse.y:2689 +#: c-parse.y:1648 objc/objc-parse.y:1699 objc/objc-parse.y:2688 msgid "extra semicolon in struct or union specified" msgstr "" -#: c-parse.y:1662 objc/objc-parse.y:1716 +#: c-parse.y:1661 objc/objc-parse.y:1715 msgid "ISO C doesn't support unnamed structs/unions" msgstr "" -#: c-parse.y:1672 objc/objc-parse.y:1726 +#: c-parse.y:1671 objc/objc-parse.y:1725 msgid "ISO C forbids member declarations with no members" msgstr "" -#: c-parse.y:1838 objc/objc-parse.y:1892 +#: c-parse.y:1837 objc/objc-parse.y:1891 msgid "label at end of compound statement" msgstr "" -#: c-parse.y:1857 objc/objc-parse.y:1911 +#: c-parse.y:1856 objc/objc-parse.y:1910 msgid "ISO C90 forbids mixed declarations and code" msgstr "" -#: c-parse.y:1897 objc/objc-parse.y:1951 +#: c-parse.y:1896 objc/objc-parse.y:1950 msgid "ISO C forbids label declarations" msgstr "" -#: c-parse.y:1941 objc/objc-parse.y:1995 +#: c-parse.y:1940 objc/objc-parse.y:1994 msgid "braced-group within expression allowed only inside a function" msgstr "" -#: c-parse.y:2237 objc/objc-parse.y:2334 +#: c-parse.y:2236 objc/objc-parse.y:2333 #, c-format msgid "%E qualifier ignored on asm" msgstr "" -#: c-parse.y:2331 objc/objc-parse.y:2428 +#: c-parse.y:2330 objc/objc-parse.y:2427 msgid "ISO C requires a named argument before %<...%>" msgstr "" -#: c-parse.c:5317 gengtype-yacc.c:1555 java/parse-scan.c:3059 -#: java/parse.c:6128 objc/objc-parse.c:6399 -msgid "syntax error; also virtual memory exhausted" +#: /usr/share/bison/bison.simple:795 c-parse.y:2928 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1376 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16424 +#: objc/objc-parse.y:3531 +msgid "parse error; also virtual memory exhausted" +msgstr "" + +#: /usr/share/bison/bison.simple:799 c-parse.y:2926 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1374 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16422 +#: objc/objc-parse.y:3529 +msgid "parse error" msgstr "" -#: c-parse.c:5435 gengtype-yacc.c:1673 java/parse-scan.c:3177 -#: java/parse.c:6246 objc/objc-parse.c:6517 +#: /usr/share/bison/bison.simple:924 msgid "parser stack overflow" msgstr "" -#: c-parse.y:2847 objc/objc-parse.y:3450 +#: c-parse.y:2846 objc/objc-parse.y:3449 #, c-format msgid "syntax error at %qs token" msgstr "" +#: c-parse.y:2927 /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1375 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16423 +#: objc/objc-parse.y:3530 +msgid "syntax error; also virtual memory exhausted" +msgstr "" + +#: c-parse.y:2930 /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse-scan.y:1378 +#: /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:16426 +#: objc/objc-parse.y:3533 +msgid "parse error: cannot back up" +msgstr "" + #: c-pch.c:130 #, c-format msgid "can't create precompiled header %s: %m" @@ -2878,8 +2906,8 @@ msgstr "" msgid "function called through a non-compatible type" msgstr "" -#: c-typeck.c:1996 c-typeck.c:4221 c-typeck.c:4223 c-typeck.c:4231 -#: c-typeck.c:4256 c-typeck.c:5643 +#: c-typeck.c:1996 c-typeck.c:4202 c-typeck.c:4204 c-typeck.c:4212 +#: c-typeck.c:4237 c-typeck.c:5624 msgid "initializer element is not constant" msgstr "" @@ -3194,7 +3222,7 @@ msgstr "" msgid "cast increases required alignment of target type" msgstr "" -#: c-typeck.c:3182 cp/typeck.c:4956 +#: c-typeck.c:3182 cp/typeck.c:4959 msgid "cast from pointer to integer of different size" msgstr "" @@ -3202,7 +3230,7 @@ msgstr "" msgid "cast from function call of type %qT to non-matching type %qT" msgstr "" -#: c-typeck.c:3195 cp/typeck.c:4963 +#: c-typeck.c:3195 cp/typeck.c:4966 msgid "cast to pointer from integer of different size" msgstr "" @@ -3263,7 +3291,7 @@ msgstr "" msgid "%s from incompatible pointer type" msgstr "" -#: c-typeck.c:3645 c-typeck.c:4181 cp/typeck.c:1402 +#: c-typeck.c:3645 c-typeck.c:4162 cp/typeck.c:1402 msgid "invalid use of non-lvalue array" msgstr "" @@ -3293,315 +3321,304 @@ msgid "incompatible types in %s" msgstr "" #. Function name is known; supply it. -#: c-typeck.c:3747 -#, c-format -msgid "passing arg of '%s'" -msgstr "" - -#. Function name unknown (call through ptr). -#: c-typeck.c:3756 -msgid "passing arg of pointer to function" -msgstr "" - -#. Function name is known; supply it. -#: c-typeck.c:3764 +#: c-typeck.c:3745 #, c-format msgid "passing arg %d of '%s'" msgstr "" #. Function name unknown (call through ptr); just give arg number. -#: c-typeck.c:3773 +#: c-typeck.c:3754 #, c-format msgid "passing arg %d of pointer to function" msgstr "" -#: c-typeck.c:3829 +#: c-typeck.c:3810 msgid "traditional C rejects automatic aggregate initialization" msgstr "" -#: c-typeck.c:3997 c-typeck.c:4012 c-typeck.c:4027 +#: c-typeck.c:3978 c-typeck.c:3993 c-typeck.c:4008 #, c-format msgid "(near initialization for %qs)" msgstr "" -#: c-typeck.c:4041 +#: c-typeck.c:4022 msgid "array initialized from parenthesized string constant" msgstr "" -#: c-typeck.c:4105 cp/typeck2.c:708 +#: c-typeck.c:4086 cp/typeck2.c:708 msgid "char-array initialized from wide string" msgstr "" -#: c-typeck.c:4110 +#: c-typeck.c:4091 msgid "wchar_t-array initialized from non-wide string" msgstr "" -#: c-typeck.c:4128 cp/typeck2.c:730 +#: c-typeck.c:4109 cp/typeck2.c:730 msgid "initializer-string for array of chars is too long" msgstr "" -#: c-typeck.c:4134 +#: c-typeck.c:4115 msgid "array of inappropriate type initialized from string constant" msgstr "" -#: c-typeck.c:4204 +#: c-typeck.c:4185 msgid "array initialized from non-constant array expression" msgstr "" -#: c-typeck.c:4248 +#: c-typeck.c:4229 msgid "initialization" msgstr "" -#: c-typeck.c:4263 c-typeck.c:5647 +#: c-typeck.c:4244 c-typeck.c:5628 msgid "initializer element is not computable at load time" msgstr "" -#: c-typeck.c:4278 cp/typeck2.c:808 +#: c-typeck.c:4259 cp/typeck2.c:808 msgid "invalid initializer" msgstr "" -#: c-typeck.c:4548 cp/decl.c:4507 +#: c-typeck.c:4529 cp/decl.c:4512 msgid "opaque vector types cannot be initialized" msgstr "" -#: c-typeck.c:4744 +#: c-typeck.c:4725 msgid "extra brace group at end of initializer" msgstr "" -#: c-typeck.c:4764 +#: c-typeck.c:4745 msgid "missing braces around initializer" msgstr "" -#: c-typeck.c:4824 +#: c-typeck.c:4805 msgid "braces around scalar initializer" msgstr "" -#: c-typeck.c:4881 +#: c-typeck.c:4862 msgid "initialization of flexible array member in a nested context" msgstr "" -#: c-typeck.c:4883 +#: c-typeck.c:4864 msgid "initialization of a flexible array member" msgstr "" -#: c-typeck.c:4910 +#: c-typeck.c:4891 msgid "missing initializer" msgstr "" -#: c-typeck.c:4932 +#: c-typeck.c:4913 msgid "empty scalar initializer" msgstr "" -#: c-typeck.c:4937 +#: c-typeck.c:4918 msgid "extra elements in scalar initializer" msgstr "" -#: c-typeck.c:5025 +#: c-typeck.c:5006 msgid "initialization designators may not nest" msgstr "" -#: c-typeck.c:5047 c-typeck.c:5122 +#: c-typeck.c:5028 c-typeck.c:5103 msgid "array index in non-array initializer" msgstr "" -#: c-typeck.c:5052 c-typeck.c:5175 +#: c-typeck.c:5033 c-typeck.c:5156 msgid "field name not in record or union initializer" msgstr "" -#: c-typeck.c:5098 +#: c-typeck.c:5079 msgid "array index in initializer not of integer type" msgstr "" -#: c-typeck.c:5118 c-typeck.c:5120 +#: c-typeck.c:5099 c-typeck.c:5101 msgid "nonconstant array index in initializer" msgstr "" -#: c-typeck.c:5124 c-typeck.c:5127 +#: c-typeck.c:5105 c-typeck.c:5108 msgid "array index in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:5138 +#: c-typeck.c:5119 msgid "empty index range in initializer" msgstr "" -#: c-typeck.c:5147 +#: c-typeck.c:5128 msgid "array index range in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:5187 +#: c-typeck.c:5168 #, c-format msgid "unknown field %qs specified in initializer" msgstr "" -#: c-typeck.c:5223 c-typeck.c:5244 c-typeck.c:5710 +#: c-typeck.c:5204 c-typeck.c:5225 c-typeck.c:5691 msgid "initialized field with side-effects overwritten" msgstr "" -#: c-typeck.c:5919 +#: c-typeck.c:5900 msgid "excess elements in char array initializer" msgstr "" -#: c-typeck.c:5926 c-typeck.c:5972 +#: c-typeck.c:5907 c-typeck.c:5953 msgid "excess elements in struct initializer" msgstr "" -#: c-typeck.c:5987 +#: c-typeck.c:5968 msgid "non-static initialization of a flexible array member" msgstr "" -#: c-typeck.c:6055 +#: c-typeck.c:6036 msgid "excess elements in union initializer" msgstr "" -#: c-typeck.c:6077 +#: c-typeck.c:6058 msgid "traditional C rejects initialization of unions" msgstr "" -#: c-typeck.c:6141 +#: c-typeck.c:6122 msgid "excess elements in array initializer" msgstr "" -#: c-typeck.c:6171 +#: c-typeck.c:6152 msgid "excess elements in vector initializer" msgstr "" -#: c-typeck.c:6194 +#: c-typeck.c:6175 msgid "excess elements in scalar initializer" msgstr "" -#: c-typeck.c:6356 +#: c-typeck.c:6337 msgid "ISO C forbids %" msgstr "" -#: c-typeck.c:6370 +#: c-typeck.c:6351 msgid "function declared % has a % statement" msgstr "" -#: c-typeck.c:6377 +#: c-typeck.c:6358 msgid "% with no value, in function returning non-void" msgstr "" -#: c-typeck.c:6384 +#: c-typeck.c:6365 msgid "% with a value, in function returning void" msgstr "" -#: c-typeck.c:6388 +#: c-typeck.c:6369 msgid "return" msgstr "" -#: c-typeck.c:6441 +#: c-typeck.c:6422 msgid "function returns address of local variable" msgstr "" -#: c-typeck.c:6502 cp/semantics.c:856 +#: c-typeck.c:6483 cp/semantics.c:856 msgid "switch quantity not an integer" msgstr "" -#: c-typeck.c:6512 +#: c-typeck.c:6493 msgid "% switch expression not converted to % in ISO C" msgstr "" -#: c-typeck.c:6549 cp/parser.c:6000 +#: c-typeck.c:6530 cp/parser.c:6017 msgid "case label not within a switch statement" msgstr "" -#: c-typeck.c:6551 +#: c-typeck.c:6532 msgid "% label not within a switch statement" msgstr "" -#: c-typeck.c:6615 +#: c-typeck.c:6596 msgid "%Hsuggest explicit braces to avoid ambiguous %" msgstr "" -#: c-typeck.c:6625 +#: c-typeck.c:6606 msgid "%Hempty body in an if-statement" msgstr "" -#: c-typeck.c:6633 +#: c-typeck.c:6614 msgid "%Hempty body in an else-statement" msgstr "" -#: c-typeck.c:6724 cp/parser.c:6502 +#: c-typeck.c:6705 cp/parser.c:6519 msgid "continue statement not within a loop" msgstr "" -#: c-typeck.c:6741 +#: c-typeck.c:6722 msgid "%Hstatement with no effect" msgstr "" -#: c-typeck.c:6770 +#: c-typeck.c:6751 msgid "expression statement has incomplete type" msgstr "" -#: c-typeck.c:7093 c-typeck.c:7132 +#: c-typeck.c:7074 c-typeck.c:7113 msgid "division by zero" msgstr "" -#: c-typeck.c:7177 cp/typeck.c:2965 +#: c-typeck.c:7158 cp/typeck.c:2965 msgid "right shift count is negative" msgstr "" -#: c-typeck.c:7184 cp/typeck.c:2971 +#: c-typeck.c:7165 cp/typeck.c:2971 msgid "right shift count >= width of type" msgstr "" -#: c-typeck.c:7205 cp/typeck.c:2990 +#: c-typeck.c:7186 cp/typeck.c:2990 msgid "left shift count is negative" msgstr "" -#: c-typeck.c:7208 cp/typeck.c:2992 +#: c-typeck.c:7189 cp/typeck.c:2992 msgid "left shift count >= width of type" msgstr "" -#: c-typeck.c:7229 +#: c-typeck.c:7210 msgid "shift count is negative" msgstr "" -#: c-typeck.c:7231 +#: c-typeck.c:7212 msgid "shift count >= width of type" msgstr "" -#: c-typeck.c:7248 cp/typeck.c:3027 +#: c-typeck.c:7229 cp/typeck.c:3027 msgid "comparing floating point with == or != is unsafe" msgstr "" -#: c-typeck.c:7272 c-typeck.c:7279 +#: c-typeck.c:7253 c-typeck.c:7260 msgid "ISO C forbids comparison of % with function pointer" msgstr "" -#: c-typeck.c:7283 c-typeck.c:7323 c-typeck.c:7351 +#: c-typeck.c:7264 c-typeck.c:7304 c-typeck.c:7332 msgid "comparison of distinct pointer types lacks a cast" msgstr "" -#: c-typeck.c:7297 c-typeck.c:7302 c-typeck.c:7371 c-typeck.c:7376 +#: c-typeck.c:7278 c-typeck.c:7283 c-typeck.c:7352 c-typeck.c:7357 msgid "comparison between pointer and integer" msgstr "" -#: c-typeck.c:7318 c-typeck.c:7346 +#: c-typeck.c:7299 c-typeck.c:7327 msgid "ISO C forbids ordered comparisons of pointers to functions" msgstr "" -#: c-typeck.c:7343 +#: c-typeck.c:7324 msgid "comparison of complete and incomplete pointers" msgstr "" -#: c-typeck.c:7359 c-typeck.c:7366 +#: c-typeck.c:7340 c-typeck.c:7347 msgid "ordered comparison of pointer with integer zero" msgstr "" -#: c-typeck.c:7391 cp/typeck.c:3168 +#: c-typeck.c:7372 cp/typeck.c:3168 msgid "unordered comparison on non-floating point argument" msgstr "" -#: c-typeck.c:7604 +#: c-typeck.c:7585 msgid "comparison between signed and unsigned" msgstr "" -#: c-typeck.c:7650 cp/typeck.c:3432 +#: c-typeck.c:7631 cp/typeck.c:3432 msgid "comparison of promoted ~unsigned with constant" msgstr "" -#: c-typeck.c:7658 cp/typeck.c:3440 +#: c-typeck.c:7639 cp/typeck.c:3440 msgid "comparison of promoted ~unsigned with unsigned" msgstr "" @@ -4051,165 +4068,165 @@ msgstr "" msgid "Nodes with no released memory found." msgstr "" -#: collect2.c:406 gcc.c:6742 +#: collect2.c:402 gcc.c:6742 #, c-format msgid "internal gcc abort in %s, at %s:%d" msgstr "" -#: collect2.c:900 +#: collect2.c:895 msgid "no arguments" msgstr "" -#: collect2.c:1192 +#: collect2.c:1187 #, c-format msgid "unknown demangling style '%s'" msgstr "" -#: collect2.c:1266 collect2.c:1414 collect2.c:1449 +#: collect2.c:1261 collect2.c:1409 collect2.c:1444 #, c-format msgid "fopen %s" msgstr "" -#: collect2.c:1269 collect2.c:1419 collect2.c:1452 +#: collect2.c:1264 collect2.c:1414 collect2.c:1447 #, c-format msgid "fclose %s" msgstr "" -#: collect2.c:1278 +#: collect2.c:1273 #, c-format msgid "collect2 version %s" msgstr "" -#: collect2.c:1368 +#: collect2.c:1363 #, c-format msgid "%d constructor(s) found\n" msgstr "" -#: collect2.c:1369 +#: collect2.c:1364 #, c-format msgid "%d destructor(s) found\n" msgstr "" -#: collect2.c:1370 +#: collect2.c:1365 #, c-format msgid "%d frame table(s) found\n" msgstr "" -#: collect2.c:1512 +#: collect2.c:1507 #, c-format msgid "%s terminated with signal %d [%s]%s" msgstr "" -#: collect2.c:1530 +#: collect2.c:1525 #, c-format msgid "%s returned %d exit status" msgstr "" -#: collect2.c:1555 +#: collect2.c:1550 #, c-format msgid "[cannot find %s]" msgstr "" -#: collect2.c:1570 +#: collect2.c:1565 #, c-format msgid "cannot find `%s'" msgstr "" -#: collect2.c:1581 collect2.c:1584 +#: collect2.c:1576 collect2.c:1579 #, c-format msgid "redirecting stdout: %s" msgstr "" -#: collect2.c:1623 +#: collect2.c:1618 #, c-format msgid "[Leaving %s]\n" msgstr "" -#: collect2.c:1843 +#: collect2.c:1838 #, c-format msgid "" "\n" "write_c_file - output name is %s, prefix is %s\n" msgstr "" -#: collect2.c:2047 +#: collect2.c:2042 msgid "cannot find `nm'" msgstr "" -#: collect2.c:2057 collect2.c:2223 +#: collect2.c:2052 collect2.c:2218 msgid "pipe" msgstr "" -#: collect2.c:2061 collect2.c:2227 +#: collect2.c:2056 collect2.c:2222 msgid "fdopen" msgstr "" -#: collect2.c:2087 collect2.c:2253 +#: collect2.c:2082 collect2.c:2248 #, c-format msgid "dup2 %d 1" msgstr "" -#: collect2.c:2090 collect2.c:2093 collect2.c:2106 collect2.c:2256 -#: collect2.c:2259 collect2.c:2272 +#: collect2.c:2085 collect2.c:2088 collect2.c:2101 collect2.c:2251 +#: collect2.c:2254 collect2.c:2267 #, c-format msgid "close %d" msgstr "" -#: collect2.c:2096 collect2.c:2262 +#: collect2.c:2091 collect2.c:2257 #, c-format msgid "execv %s" msgstr "" -#: collect2.c:2150 +#: collect2.c:2145 #, c-format msgid "init function found in object %s" msgstr "" -#: collect2.c:2158 +#: collect2.c:2153 #, c-format msgid "fini function found in object %s" msgstr "" -#: collect2.c:2181 collect2.c:2311 +#: collect2.c:2176 collect2.c:2306 msgid "fclose" msgstr "" -#: collect2.c:2214 +#: collect2.c:2209 msgid "cannot find `ldd'" msgstr "" -#: collect2.c:2275 +#: collect2.c:2270 msgid "" "\n" "ldd output with constructors/destructors.\n" msgstr "" -#: collect2.c:2290 +#: collect2.c:2285 #, c-format msgid "dynamic dependency %s not found" msgstr "" -#: collect2.c:2302 +#: collect2.c:2297 #, c-format msgid "unable to open dynamic dependency '%s'" msgstr "" -#: collect2.c:2461 +#: collect2.c:2456 #, c-format msgid "%s: not a COFF file" msgstr "" -#: collect2.c:2581 +#: collect2.c:2576 #, c-format msgid "%s: cannot open as COFF file" msgstr "" -#: collect2.c:2636 +#: collect2.c:2631 #, c-format msgid "library lib%s not found" msgstr "" -#: combine.c:12363 +#: combine.c:12364 #, c-format msgid "" ";; Combiner statistics: %d attempts, %d substitutions (%d requiring new " @@ -4218,7 +4235,7 @@ msgid "" "\n" msgstr "" -#: combine.c:12372 +#: combine.c:12373 #, c-format msgid "" "\n" @@ -4335,24 +4352,32 @@ msgstr "" msgid ";; Processing block from %d to %d, %d sets.\n" msgstr "" -#: diagnostic.c:208 +#: diagnostic.c:168 #, c-format msgid "%s:%d: confused by earlier errors, bailing out\n" msgstr "" -#: diagnostic.c:268 +#: diagnostic.c:228 msgid "compilation terminated due to -Wfatal-errors.\n" msgstr "" -#: diagnostic.c:284 +#: diagnostic.c:237 +#, c-format +msgid "" +"Please submit a full bug report,\n" +"with preprocessed source if appropriate.\n" +"See %s for instructions.\n" +msgstr "" + +#: diagnostic.c:246 msgid "compilation terminated.\n" msgstr "" -#: diagnostic.c:579 +#: diagnostic.c:537 msgid "Internal compiler error: Error reporting routines re-entered.\n" msgstr "" -#: diagnostic.c:591 +#: diagnostic.c:556 #, c-format msgid "in %s, at %s:%d" msgstr "" @@ -4401,7 +4426,7 @@ msgstr "" msgid "ICE: emit_insn used where emit_jump_insn needed:\n" msgstr "" -#: errors.c:133 java/jv-scan.c:268 +#: errors.c:133 java/jv-scan.c:294 #, c-format msgid "abort in %s, at %s:%d" msgstr "" @@ -4463,16 +4488,12 @@ msgstr "" #. We can't handle floating point constants; #. PRINT_OPERAND must handle them. -#. We can't handle floating point constants; PRINT_OPERAND must -#. handle them. -#. We can't handle floating point constants; -#. PRINT_OPERAND must handle them. -#: final.c:3289 vmsdbgout.c:487 config/i386/i386.c:5853 +#: final.c:3289 vmsdbgout.c:487 config/i386/i386.c:5835 #: config/pdp11/pdp11.c:1690 msgid "floating constant misused" msgstr "" -#: final.c:3345 vmsdbgout.c:544 config/i386/i386.c:5931 +#: final.c:3345 vmsdbgout.c:544 config/i386/i386.c:5913 #: config/pdp11/pdp11.c:1737 msgid "invalid expression as operand" msgstr "" @@ -4503,7 +4524,7 @@ msgstr "" msgid "% of mutually exclusive equal-tests is always 0" msgstr "" -#: fold-const.c:9032 +#: fold-const.c:9031 msgid "fold check: original tree changed by fold" msgstr "" @@ -4523,11 +4544,11 @@ msgstr "" msgid "%Jargument %qD might be clobbered by % or %" msgstr "" -#: function.c:3873 +#: function.c:3869 msgid "function returns an aggregate" msgstr "" -#: function.c:4206 +#: function.c:4202 msgid "%Junused parameter %qD" msgstr "" @@ -4860,12 +4881,11 @@ msgid "%s (GCC) %s\n" msgstr "" #: gcc.c:3408 gcov.c:412 java/gjavah.c:2326 java/jcf-dump.c:916 -#: java/jv-scan.c:126 +#: java/jv-scan.c:128 msgid "(C)" msgstr "" -#: gcc.c:3409 java/gjavah.c:2327 java/jcf-dump.c:917 java/jv-scan.c:127 -#, c-format +#: gcc.c:3409 java/gjavah.c:2327 java/jcf-dump.c:917 java/jv-scan.c:129 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" @@ -5042,7 +5062,6 @@ msgid "libraries: %s\n" msgstr "" #: gcc.c:6337 -#, c-format msgid "" "\n" "For bug reporting instructions, please see:\n" @@ -5468,7 +5487,7 @@ msgstr "" msgid "%s cannot be used in asm here" msgstr "" -#: graph.c:400 passes.c:131 java/jcf-parse.c:908 java/jcf-parse.c:1066 +#: graph.c:400 passes.c:131 java/jcf-parse.c:976 java/jcf-parse.c:1116 #: java/lex.c:1841 objc/objc-act.c:550 #, c-format msgid "can't open %s: %m" @@ -5485,7 +5504,7 @@ msgid "`" msgstr "" #. Closing quotation mark. -#: intl.c:61 +#: intl.c:61 /home/zack/src/gcc/HEAD/pos-diag/gcc/java/parse.y:15438 msgid "'" msgstr "" @@ -6326,7 +6345,6 @@ msgid "collect: tweaking %s in %s\n" msgstr "" #: tlink.c:751 -#, c-format msgid "collect: relinking\n" msgstr "" @@ -6392,7 +6410,6 @@ msgid "type is deprecated" msgstr "" #: toplev.c:1064 -#, c-format msgid "" "\n" "Target specific options:\n" @@ -6404,14 +6421,12 @@ msgid " -m%-23s [undocumented]\n" msgstr "" #: toplev.c:1106 -#, c-format msgid "" "\n" "There are undocumented target specific options as well.\n" msgstr "" #: toplev.c:1108 -#, c-format msgid " They exist, but they are not documented.\n" msgstr "" @@ -6451,11 +6466,11 @@ msgstr "" msgid "can%'t open %s for writing: %m" msgstr "" -#: toplev.c:1474 config/sh/sh.c:7287 +#: toplev.c:1474 config/sh/sh.c:7292 msgid "created and used with different settings of -fpic" msgstr "" -#: toplev.c:1476 config/sh/sh.c:7289 +#: toplev.c:1476 config/sh/sh.c:7294 msgid "created and used with different settings of -fpie" msgstr "" @@ -6464,7 +6479,7 @@ msgstr "" msgid "created and used with differing settings of '-m%s'" msgstr "" -#: toplev.c:1530 config/sh/sh.c:7342 +#: toplev.c:1530 config/sh/sh.c:7347 msgid "out of memory" msgstr "" @@ -6545,158 +6560,158 @@ msgstr "" msgid "error writing to %s: %m" msgstr "" -#: toplev.c:2025 java/jcf-parse.c:927 java/jcf-write.c:3527 +#: toplev.c:2025 java/jcf-parse.c:995 java/jcf-write.c:3527 #, c-format msgid "error closing %s: %m" msgstr "" -#: tree-cfg.c:1127 tree-cfg.c:1826 tree-cfg.c:1828 +#: tree-cfg.c:1139 tree-cfg.c:1838 tree-cfg.c:1840 msgid "%Hwill never be executed" msgstr "" -#: tree-cfg.c:3082 +#: tree-cfg.c:3094 msgid "SSA name in freelist but still referenced" msgstr "" -#: tree-cfg.c:3092 +#: tree-cfg.c:3104 msgid "GIMPLE register modified with BIT_FIELD_REF" msgstr "" -#: tree-cfg.c:3112 +#: tree-cfg.c:3124 msgid "address taken, but ADDRESSABLE bit not set" msgstr "" -#: tree-cfg.c:3121 +#: tree-cfg.c:3133 msgid "non-boolean used in condition" msgstr "" -#: tree-cfg.c:3177 +#: tree-cfg.c:3189 msgid "Invalid reference prefix." msgstr "" -#: tree-cfg.c:3242 +#: tree-cfg.c:3254 msgid "Is not a valid GIMPLE statement." msgstr "" -#: tree-cfg.c:3262 +#: tree-cfg.c:3274 msgid "Statement marked for throw, but doesn%'t." msgstr "" -#: tree-cfg.c:3267 +#: tree-cfg.c:3279 msgid "Statement marked for throw in middle of block." msgstr "" -#: tree-cfg.c:3367 +#: tree-cfg.c:3379 msgid "PHI def is not a GIMPLE value" msgstr "" -#: tree-cfg.c:3383 tree-cfg.c:3399 +#: tree-cfg.c:3395 tree-cfg.c:3411 msgid "Incorrect sharing of tree nodes" msgstr "" -#: tree-cfg.c:3408 +#: tree-cfg.c:3420 msgid "verify_stmts failed." msgstr "" -#: tree-cfg.c:3429 +#: tree-cfg.c:3441 msgid "ENTRY_BLOCK has a statement list associated with it\n" msgstr "" -#: tree-cfg.c:3435 +#: tree-cfg.c:3447 msgid "EXIT_BLOCK has a statement list associated with it\n" msgstr "" -#: tree-cfg.c:3442 +#: tree-cfg.c:3454 #, c-format msgid "Fallthru to exit from bb %d\n" msgstr "" -#: tree-cfg.c:3458 +#: tree-cfg.c:3470 #, c-format msgid "Label %s to block does not match in bb %d\n" msgstr "" -#: tree-cfg.c:3467 +#: tree-cfg.c:3479 #, c-format msgid "Label %s has incorrect context in bb %d\n" msgstr "" -#: tree-cfg.c:3481 +#: tree-cfg.c:3493 #, c-format msgid "Control flow in the middle of basic block %d\n" msgstr "" -#: tree-cfg.c:3491 +#: tree-cfg.c:3503 #, c-format msgid "Label %s in the middle of basic block %d\n" msgstr "" -#: tree-cfg.c:3508 +#: tree-cfg.c:3520 #, c-format msgid "Fallthru edge after a control statement in bb %d \n" msgstr "" -#: tree-cfg.c:3523 +#: tree-cfg.c:3535 #, c-format msgid "Structured COND_EXPR at the end of bb %d\n" msgstr "" -#: tree-cfg.c:3536 tree-cfg.c:3574 tree-cfg.c:3586 tree-cfg.c:3657 +#: tree-cfg.c:3548 tree-cfg.c:3586 tree-cfg.c:3598 tree-cfg.c:3669 #, c-format msgid "Wrong outgoing edge flags at end of bb %d\n" msgstr "" -#: tree-cfg.c:3544 +#: tree-cfg.c:3556 msgid "% label does not match edge at end of bb %d\n" msgstr "" -#: tree-cfg.c:3552 +#: tree-cfg.c:3564 msgid "% label does not match edge at end of bb %d\n" msgstr "" -#: tree-cfg.c:3562 +#: tree-cfg.c:3574 #, c-format msgid "Explicit goto at end of bb %d\n" msgstr "" -#: tree-cfg.c:3591 +#: tree-cfg.c:3603 #, c-format msgid "Return edge does not point to exit in bb %d\n" msgstr "" -#: tree-cfg.c:3624 +#: tree-cfg.c:3636 msgid "Found default case not at end of case vector" msgstr "" -#: tree-cfg.c:3630 +#: tree-cfg.c:3642 msgid "" "Case labels not sorted:\n" " " msgstr "" -#: tree-cfg.c:3641 +#: tree-cfg.c:3653 msgid "No default case found at end of case vector" msgstr "" -#: tree-cfg.c:3649 +#: tree-cfg.c:3661 #, c-format msgid "Extra outgoing edge %d->%d\n" msgstr "" -#: tree-cfg.c:3671 +#: tree-cfg.c:3683 #, c-format msgid "Missing edge %i->%i\n" msgstr "" -#: tree-cfg.c:5247 +#: tree-cfg.c:5255 msgid "%Jfunction might be possible candidate for attribute %" msgstr "" -#: tree-cfg.c:5274 tree-cfg.c:5278 +#: tree-cfg.c:5282 tree-cfg.c:5286 msgid "%H% function does return" msgstr "" -#: tree-cfg.c:5298 tree-cfg.c:5303 +#: tree-cfg.c:5306 tree-cfg.c:5311 msgid "%Hcontrol reaches end of non-void function" msgstr "" @@ -6761,15 +6776,15 @@ msgstr "" msgid "called from here" msgstr "" -#: tree-mudflap.c:768 +#: tree-mudflap.c:791 msgid "mudflap checking not yet implemented for ARRAY_RANGE_REF" msgstr "" -#: tree-mudflap.c:990 +#: tree-mudflap.c:1027 msgid "mudflap ran off end of BIND_EXPR body" msgstr "" -#: tree-mudflap.c:1181 +#: tree-mudflap.c:1218 #, c-format msgid "mudflap cannot track lifetime of %qs" msgstr "" @@ -6778,11 +6793,11 @@ msgstr "" msgid "mudflap: this language is not supported" msgstr "" -#: tree-optimize.c:685 +#: tree-optimize.c:679 msgid "%Jsize of return value of '%D' is %u bytes" msgstr "" -#: tree-optimize.c:688 +#: tree-optimize.c:682 msgid "%Jsize of return value of '%D' is larger than %wd bytes" msgstr "" @@ -6796,7 +6811,7 @@ msgstr "" msgid "unimplemented functionality" msgstr "" -#: tree-ssa-operands.c:1200 +#: tree-ssa-operands.c:1201 msgid "internal error" msgstr "" @@ -6900,24 +6915,28 @@ msgstr "" msgid "verify_flow_sensitive_alias_info failed." msgstr "" -#: tree-ssa.c:558 +#: tree-ssa.c:554 +msgid "PHI argument is not SSA_NAME, or invariant" +msgstr "" + +#: tree-ssa.c:571 msgid "Statement makes aliased stores, but has no V_MAY_DEFS" msgstr "" -#: tree-ssa.c:592 +#: tree-ssa.c:605 #, c-format msgid "AUX pointer initialized for edge %d->%d\n" msgstr "" -#: tree-ssa.c:671 +#: tree-ssa.c:684 msgid "verify_ssa failed." msgstr "" -#: tree-ssa.c:1302 +#: tree-ssa.c:1315 msgid "%H'%D' is used uninitialized in this function" msgstr "" -#: tree-ssa.c:1327 +#: tree-ssa.c:1340 msgid "%H'%D' may be used uninitialized in this function" msgstr "" @@ -7551,7 +7570,7 @@ msgstr "" msgid "bad value `%s' for -mfp-trap-mode switch" msgstr "" -#: config/alpha/alpha.c:347 config/rs6000/rs6000.c:1646 +#: config/alpha/alpha.c:347 config/rs6000/rs6000.c:1645 #, c-format msgid "bad value `%s' for -mtls-size switch" msgstr "" @@ -7606,19 +7625,19 @@ msgstr "" msgid "invalid %%r value" msgstr "" -#: config/alpha/alpha.c:4594 config/rs6000/rs6000.c:10316 +#: config/alpha/alpha.c:4594 config/rs6000/rs6000.c:10304 #: config/xtensa/xtensa.c:1951 #, c-format msgid "invalid %%R value" msgstr "" -#: config/alpha/alpha.c:4600 config/rs6000/rs6000.c:10235 +#: config/alpha/alpha.c:4600 config/rs6000/rs6000.c:10223 #: config/xtensa/xtensa.c:1918 #, c-format msgid "invalid %%N value" msgstr "" -#: config/alpha/alpha.c:4608 config/rs6000/rs6000.c:10263 +#: config/alpha/alpha.c:4608 config/rs6000/rs6000.c:10251 #, c-format msgid "invalid %%P value" msgstr "" @@ -7633,12 +7652,12 @@ msgstr "" msgid "invalid %%L value" msgstr "" -#: config/alpha/alpha.c:4663 config/rs6000/rs6000.c:10217 +#: config/alpha/alpha.c:4663 config/rs6000/rs6000.c:10205 #, c-format msgid "invalid %%m value" msgstr "" -#: config/alpha/alpha.c:4671 config/rs6000/rs6000.c:10225 +#: config/alpha/alpha.c:4671 config/rs6000/rs6000.c:10213 #, c-format msgid "invalid %%M value" msgstr "" @@ -7649,7 +7668,7 @@ msgid "invalid %%U value" msgstr "" #: config/alpha/alpha.c:4727 config/alpha/alpha.c:4741 -#: config/rs6000/rs6000.c:10324 +#: config/rs6000/rs6000.c:10312 #, c-format msgid "invalid %%s value" msgstr "" @@ -7659,8 +7678,8 @@ msgstr "" msgid "invalid %%C value" msgstr "" -#: config/alpha/alpha.c:4801 config/rs6000/rs6000.c:10054 -#: config/rs6000/rs6000.c:10074 +#: config/alpha/alpha.c:4801 config/rs6000/rs6000.c:10042 +#: config/rs6000/rs6000.c:10062 #, c-format msgid "invalid %%E value" msgstr "" @@ -7669,13 +7688,13 @@ msgstr "" msgid "unknown relocation unspec" msgstr "" -#: config/alpha/alpha.c:4835 config/rs6000/rs6000.c:10641 +#: config/alpha/alpha.c:4835 config/rs6000/rs6000.c:10630 #, c-format msgid "invalid %%xn code" msgstr "" -#: config/alpha/alpha.c:5795 config/alpha/alpha.c:5798 config/s390/s390.c:7411 -#: config/s390/s390.c:7414 +#: config/alpha/alpha.c:5795 config/alpha/alpha.c:5798 config/s390/s390.c:7703 +#: config/s390/s390.c:7706 msgid "bad builtin fcode" msgstr "" @@ -7684,14 +7703,6 @@ msgstr "" #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#. WARNING: Do not mark empty strings for translation, as calling -#. gettext on an empty string does NOT return an empty -#. string. -#. Macro to define tables used to set the flags. -#. This is a list in braces of pairs in braces, -#. each pair being { "NAME", VALUE } -#. where VALUE is the bits to set or minus the bits to clear. -#. An empty string NAME is used to identify the default VALUE. #: config/alpha/alpha.h:293 config/i386/i386.h:333 config/i386/i386.h:335 #: config/i386/i386.h:337 config/ns32k/ns32k.h:140 config/s390/s390.h:135 #: config/sparc/sparc.h:616 config/sparc/sparc.h:621 @@ -7858,7 +7869,6 @@ msgid "invalid operand to %%V code" msgstr "" #. Unknown flag. -#. Undocumented flag. #: config/arc/arc.c:1812 config/m32r/m32r.c:2251 config/sparc/sparc.c:7298 msgid "invalid operand output code" msgstr "" @@ -7868,7 +7878,7 @@ msgstr "" msgid "switch -mcpu=%s conflicts with -march= switch" msgstr "" -#: config/arm/arm.c:784 config/rs6000/rs6000.c:1200 config/sparc/sparc.c:621 +#: config/arm/arm.c:784 config/rs6000/rs6000.c:1199 config/sparc/sparc.c:621 #, c-format msgid "bad value (%s) for %s switch" msgstr "" @@ -7969,16 +7979,16 @@ msgstr "" #: config/i386/i386.c:1731 config/ip2k/ip2k.c:3181 #: config/m68hc11/m68hc11.c:1350 config/m68k/m68k.c:288 #: config/mcore/mcore.c:3375 config/ns32k/ns32k.c:1068 -#: config/rs6000/rs6000.c:16369 config/sh/sh.c:7141 config/sh/sh.c:7162 -#: config/sh/sh.c:7197 config/stormy16/stormy16.c:2413 config/v850/v850.c:2207 +#: config/rs6000/rs6000.c:16366 config/sh/sh.c:7146 config/sh/sh.c:7167 +#: config/sh/sh.c:7202 config/stormy16/stormy16.c:2413 config/v850/v850.c:2207 #, c-format msgid "`%s' attribute only applies to functions" msgstr "" #: config/arm/arm.c:2630 config/arm/arm.c:2657 config/avr/avr.c:4514 #: config/h8300/h8300.c:5779 config/h8300/h8300.c:5802 config/i386/i386.c:1713 -#: config/i386/i386.c:14513 config/ia64/ia64.c:512 config/ip2k/ip2k.c:3163 -#: config/m68hc11/m68hc11.c:1314 config/rs6000/rs6000.c:16334 +#: config/i386/i386.c:14495 config/ia64/ia64.c:512 config/ip2k/ip2k.c:3163 +#: config/m68hc11/m68hc11.c:1314 config/rs6000/rs6000.c:16331 #: config/sh/symbian.c:414 config/sh/symbian.c:421 #, c-format msgid "`%s' attribute ignored" @@ -7994,7 +8004,7 @@ msgid "selector must be an immediate" msgstr "" #. @@@ better error message -#: config/arm/arm.c:12002 config/i386/i386.c:13406 config/i386/i386.c:13440 +#: config/arm/arm.c:12002 config/i386/i386.c:13388 config/i386/i386.c:13422 msgid "mask must be an immediate" msgstr "" @@ -8348,6 +8358,12 @@ msgstr "" msgid "c4x_rptb_rpts_p: Repeat block top label moved\n" msgstr "" +#. ??? HACK. We shouldn't have flag_inline_trees at all. +#. Name of the c4x assembler. +#. Name of the c4x linker. +#. Define assembler options. +#. Define linker options. +#. Specify the end file to link with. #. Target compilation option flags. #. Small memory model. #. Use 24-bit MPYI for C3x. @@ -8931,66 +8947,66 @@ msgstr "" msgid "frv_print_operand: unknown code" msgstr "" -#: config/frv/frv.c:5799 +#: config/frv/frv.c:5835 msgid "Bad output_move_single operand" msgstr "" -#: config/frv/frv.c:5926 +#: config/frv/frv.c:5962 msgid "Bad output_move_double operand" msgstr "" -#: config/frv/frv.c:6068 +#: config/frv/frv.c:6104 msgid "Bad output_condmove_single operand" msgstr "" -#: config/frv/frv.c:9563 +#: config/frv/frv.c:9599 msgid "accumulator is not a constant integer" msgstr "" -#: config/frv/frv.c:9568 +#: config/frv/frv.c:9604 msgid "accumulator number is out of bounds" msgstr "" -#: config/frv/frv.c:9579 +#: config/frv/frv.c:9615 #, c-format msgid "inappropriate accumulator for `%s'" msgstr "" -#: config/frv/frv.c:9645 +#: config/frv/frv.c:9681 msgid "invalid IACC argument" msgstr "" -#: config/frv/frv.c:9668 +#: config/frv/frv.c:9704 #, c-format msgid "`%s' expects a constant argument" msgstr "" -#: config/frv/frv.c:9673 +#: config/frv/frv.c:9709 #, c-format msgid "constant argument out of range for `%s'" msgstr "" -#: config/frv/frv.c:10070 +#: config/frv/frv.c:10106 msgid "media functions are not available unless -mmedia is used" msgstr "" -#: config/frv/frv.c:10082 +#: config/frv/frv.c:10118 msgid "this media function is only available on the fr500" msgstr "" -#: config/frv/frv.c:10110 +#: config/frv/frv.c:10146 msgid "this media function is only available on the fr400 and fr550" msgstr "" -#: config/frv/frv.c:10129 +#: config/frv/frv.c:10165 msgid "this builtin function is only available on the fr405 and fr450" msgstr "" -#: config/frv/frv.c:10138 +#: config/frv/frv.c:10174 msgid "this builtin function is only available on the fr500 and fr550" msgstr "" -#: config/frv/frv.c:10150 +#: config/frv/frv.c:10186 msgid "this builtin function is only available on the fr450" msgstr "" @@ -9004,7 +9020,6 @@ msgstr "" #. #define TARGET_VERSION fprintf (stderr, " (68k, MIT syntax)"); #. #endif #: config/frv/frv.h:542 -#, c-format msgid " (frv)" msgstr "" @@ -9212,46 +9227,46 @@ msgstr "" msgid "SSE vector return without SSE enabled changes the ABI" msgstr "" -#: config/i386/i386.c:5925 +#: config/i386/i386.c:5907 msgid "invalid UNSPEC as operand" msgstr "" -#: config/i386/i386.c:6183 +#: config/i386/i386.c:6165 msgid "extended registers have no high halves" msgstr "" -#: config/i386/i386.c:6198 +#: config/i386/i386.c:6180 msgid "unsupported operand size for extended register" msgstr "" -#: config/i386/i386.c:6513 +#: config/i386/i386.c:6495 msgid "" "operand is neither a constant nor a condition code, invalid operand code 'c'" msgstr "" -#: config/i386/i386.c:6559 +#: config/i386/i386.c:6541 #, c-format msgid "invalid operand code `%c'" msgstr "" -#: config/i386/i386.c:6602 +#: config/i386/i386.c:6584 msgid "invalid constraints for operand" msgstr "" -#: config/i386/i386.c:11338 +#: config/i386/i386.c:11320 msgid "unknown insn mode" msgstr "" -#: config/i386/i386.c:13208 config/i386/i386.c:13244 +#: config/i386/i386.c:13190 config/i386/i386.c:13226 #, c-format msgid "selector must be an integer constant in the range 0..%i" msgstr "" -#: config/i386/i386.c:13472 +#: config/i386/i386.c:13454 msgid "shift must be an immediate" msgstr "" -#: config/i386/i386.c:14522 +#: config/i386/i386.c:14504 #, c-format msgid "`%s' incompatible attribute ignored" msgstr "" @@ -9839,7 +9854,7 @@ msgstr "" msgid "invalid %%P operand" msgstr "" -#: config/iq2000/iq2000.c:3389 config/rs6000/rs6000.c:10253 +#: config/iq2000/iq2000.c:3389 config/rs6000/rs6000.c:10241 #, c-format msgid "invalid %%p value" msgstr "" @@ -9937,7 +9952,7 @@ msgid "post-increment address is not a register" msgstr "" #: config/m32r/m32r.c:2355 config/m32r/m32r.c:2371 -#: config/rs6000/rs6000.c:16566 +#: config/rs6000/rs6000.c:16563 msgid "bad address" msgstr "" @@ -10127,7 +10142,7 @@ msgstr "" msgid "-fPIC is not currently supported on the 68000 or 68010\n" msgstr "" -#: config/m68k/m68k.c:543 config/rs6000/rs6000.c:12743 +#: config/m68k/m68k.c:543 config/rs6000/rs6000.c:12732 msgid "stack limit expression is not supported" msgstr "" @@ -10716,7 +10731,7 @@ msgstr "" #. Output assembler code to FILE to increment profiler label # LABELNO #. for profiling a function entry. -#: config/mips/mips.h:2329 +#: config/mips/mips.h:2331 msgid "mips16 function profiling" msgstr "" @@ -10807,6 +10822,23 @@ msgstr "" msgid "MMIX Internal: This is not a constant:" msgstr "" +#. For these target macros, there is no generic documentation here. You +#. should read `Using and Porting GCC' for that. Only comments specific +#. to the MMIX target are here. +#. +#. There are however references to the specific texinfo node (comments +#. with "Node:"), so there should be little or nothing amiss. Probably +#. the opposite, since we don't have to care about old littering and +#. soon outdated generic comments. +#. Node: Driver +#. User symbols are in the same name-space as built-in symbols, but we +#. don't need the built-in symbols, so remove those and instead apply +#. stricter operand checking. Don't warn when expanding insns. +#. Pass on -mset-program-start=N and -mset-data-start=M to the linker. +#. Provide default program start 0x100 unless -mno-set-program-start. +#. Don't do this if linking relocatably, with -r. For a final link, +#. produce mmo, unless ELF is requested or when linking relocatably. +#. Put unused option values here. #: config/mmix/mmix.h:132 msgid "Set start-address of the program" msgstr "" @@ -11312,184 +11344,184 @@ msgstr "" msgid "junk at end of #pragma longcall" msgstr "" -#: config/rs6000/rs6000.c:1224 +#: config/rs6000/rs6000.c:1223 msgid "-mmultiple is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:1231 +#: config/rs6000/rs6000.c:1230 msgid "-mstring is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:1245 +#: config/rs6000/rs6000.c:1244 #, c-format msgid "unknown -mdebug-%s switch" msgstr "" -#: config/rs6000/rs6000.c:1257 +#: config/rs6000/rs6000.c:1256 #, c-format msgid "unknown -mtraceback arg `%s'; expecting `full', `partial' or `none'" msgstr "" -#: config/rs6000/rs6000.c:1268 +#: config/rs6000/rs6000.c:1267 #, c-format msgid "Unknown switch -mlong-double-%s" msgstr "" -#: config/rs6000/rs6000.c:1309 +#: config/rs6000/rs6000.c:1308 msgid "AltiVec and E500 instructions cannot coexist" msgstr "" #. Handle -mfix-and-continue. -#: config/rs6000/rs6000.c:1355 config/rs6000/rs6000.c:1366 +#: config/rs6000/rs6000.c:1354 config/rs6000/rs6000.c:1365 #: config/rs6000/darwin.h:106 #, c-format msgid "invalid option `%s'" msgstr "" -#: config/rs6000/rs6000.c:1587 +#: config/rs6000/rs6000.c:1586 #, c-format msgid "unknown -m%s= option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:1608 +#: config/rs6000/rs6000.c:1607 #, c-format msgid "not configured for ABI: '%s'" msgstr "" -#: config/rs6000/rs6000.c:1614 +#: config/rs6000/rs6000.c:1613 #, c-format msgid "unknown ABI specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:1628 +#: config/rs6000/rs6000.c:1627 #, c-format msgid "unknown -malign-XXXXX option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:4624 +#: config/rs6000/rs6000.c:4631 msgid "" "Cannot return value in vector register because altivec instructions are " "disabled, use -maltivec to enable them." msgstr "" -#: config/rs6000/rs6000.c:4758 +#: config/rs6000/rs6000.c:4765 msgid "" "Cannot pass argument in vector register because altivec instructions are " "disabled, use -maltivec to enable them." msgstr "" -#: config/rs6000/rs6000.c:6216 +#: config/rs6000/rs6000.c:6203 msgid "argument 1 must be a 5-bit signed literal" msgstr "" -#: config/rs6000/rs6000.c:6319 config/rs6000/rs6000.c:6988 +#: config/rs6000/rs6000.c:6306 config/rs6000/rs6000.c:6976 msgid "argument 2 must be a 5-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:6359 +#: config/rs6000/rs6000.c:6346 msgid "argument 1 of __builtin_altivec_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:6413 +#: config/rs6000/rs6000.c:6400 msgid "argument 1 of __builtin_altivec_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:6575 +#: config/rs6000/rs6000.c:6562 msgid "argument 3 must be a 4-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:6747 +#: config/rs6000/rs6000.c:6734 #, c-format msgid "argument to `%s' must be a 2-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:6860 +#: config/rs6000/rs6000.c:6847 msgid "argument to dss must be a 2-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:6875 +#: config/rs6000/rs6000.c:6862 #, c-format msgid "invalid parameter combination for `%s' AltiVec intrinsic" msgstr "" -#: config/rs6000/rs6000.c:7108 +#: config/rs6000/rs6000.c:7096 msgid "argument 1 of __builtin_spe_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:7181 +#: config/rs6000/rs6000.c:7169 msgid "argument 1 of __builtin_spe_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:10083 +#: config/rs6000/rs6000.c:10071 #, c-format msgid "invalid %%f value" msgstr "" -#: config/rs6000/rs6000.c:10092 +#: config/rs6000/rs6000.c:10080 #, c-format msgid "invalid %%F value" msgstr "" -#: config/rs6000/rs6000.c:10101 +#: config/rs6000/rs6000.c:10089 #, c-format msgid "invalid %%G value" msgstr "" -#: config/rs6000/rs6000.c:10136 +#: config/rs6000/rs6000.c:10124 #, c-format msgid "invalid %%j code" msgstr "" -#: config/rs6000/rs6000.c:10146 +#: config/rs6000/rs6000.c:10134 #, c-format msgid "invalid %%J code" msgstr "" -#: config/rs6000/rs6000.c:10156 +#: config/rs6000/rs6000.c:10144 #, c-format msgid "invalid %%k value" msgstr "" -#: config/rs6000/rs6000.c:10176 config/xtensa/xtensa.c:1937 +#: config/rs6000/rs6000.c:10164 config/xtensa/xtensa.c:1937 #, c-format msgid "invalid %%K value" msgstr "" -#: config/rs6000/rs6000.c:10243 +#: config/rs6000/rs6000.c:10231 #, c-format msgid "invalid %%O value" msgstr "" -#: config/rs6000/rs6000.c:10290 +#: config/rs6000/rs6000.c:10278 #, c-format msgid "invalid %%q value" msgstr "" -#: config/rs6000/rs6000.c:10334 +#: config/rs6000/rs6000.c:10322 #, c-format msgid "invalid %%S value" msgstr "" -#: config/rs6000/rs6000.c:10376 +#: config/rs6000/rs6000.c:10364 #, c-format msgid "invalid %%T value" msgstr "" -#: config/rs6000/rs6000.c:10386 +#: config/rs6000/rs6000.c:10374 #, c-format msgid "invalid %%u value" msgstr "" -#: config/rs6000/rs6000.c:10395 config/xtensa/xtensa.c:1907 +#: config/rs6000/rs6000.c:10383 config/xtensa/xtensa.c:1907 #, c-format msgid "invalid %%v value" msgstr "" -#: config/rs6000/rs6000.c:15220 +#: config/rs6000/rs6000.c:15209 msgid "no profiling of 64-bit code for this ABI" msgstr "" -#: config/rs6000/rs6000.c:16285 +#: config/rs6000/rs6000.c:16281 msgid "use of 'long' in AltiVec types is deprecated; use 'int'" msgstr "" @@ -11933,79 +11965,79 @@ msgstr "" msgid "-m%s not supported in this configuration" msgstr "" -#: config/s390/s390.c:1130 +#: config/s390/s390.c:1238 #, c-format msgid "Unknown cpu used in -march=%s." msgstr "" -#: config/s390/s390.c:1149 +#: config/s390/s390.c:1257 #, c-format msgid "Unknown cpu used in -mtune=%s." msgstr "" -#: config/s390/s390.c:1154 +#: config/s390/s390.c:1262 #, c-format msgid "z/Architecture mode not supported on %s." msgstr "" -#: config/s390/s390.c:1156 +#: config/s390/s390.c:1264 msgid "64-bit ABI not supported in ESA/390 mode." msgstr "" -#: config/s390/s390.c:1162 +#: config/s390/s390.c:1270 msgid "invalid value for -mwarn-framesize" msgstr "" -#: config/s390/s390.c:1172 +#: config/s390/s390.c:1280 msgid "invalid value for -mstack-size" msgstr "" -#: config/s390/s390.c:1175 +#: config/s390/s390.c:1283 msgid "stack size must be an exact power of 2" msgstr "" -#: config/s390/s390.c:1181 +#: config/s390/s390.c:1289 msgid "invalid value for -mstack-guard" msgstr "" -#: config/s390/s390.c:1184 +#: config/s390/s390.c:1292 msgid "stack size must be greater than the stack guard value" msgstr "" -#: config/s390/s390.c:1187 +#: config/s390/s390.c:1295 msgid "stack guard value must be an exact power of 2" msgstr "" -#: config/s390/s390.c:1190 +#: config/s390/s390.c:1298 msgid "-mstack-size implies use of -mstack-guard" msgstr "" -#: config/s390/s390.c:1194 +#: config/s390/s390.c:1302 msgid "-mstack-guard implies use of -mstack-size" msgstr "" -#: config/s390/s390.c:3882 +#: config/s390/s390.c:3995 msgid "Cannot decompose address." msgstr "" -#: config/s390/s390.c:4053 +#: config/s390/s390.c:4166 msgid "UNKNOWN in print_operand !?" msgstr "" -#: config/s390/s390.c:5920 +#: config/s390/s390.c:6212 msgid "Total size of local variables exceeds architecture limit." msgstr "" -#: config/s390/s390.c:6459 +#: config/s390/s390.c:6751 #, c-format msgid "frame size of `%s' is " msgstr "" -#: config/s390/s390.c:6459 +#: config/s390/s390.c:6751 msgid " bytes" msgstr "" -#: config/s390/s390.c:6463 +#: config/s390/s390.c:6755 #, c-format msgid "`%s' uses dynamic stack allocation" msgstr "" @@ -12098,34 +12130,33 @@ msgid "" "trap instruction is triggered" msgstr "" -#: config/sh/sh.c:6178 +#: config/sh/sh.c:6183 msgid "__builtin_saveregs not supported by this subtarget" msgstr "" -#: config/sh/sh.c:7147 +#: config/sh/sh.c:7152 msgid "attribute interrupt_handler is not compatible with -m5-compact" msgstr "" #. The sp_switch attribute only has meaning for interrupt functions. -#. The trap_exit attribute only has meaning for interrupt functions. -#: config/sh/sh.c:7169 config/sh/sh.c:7204 +#: config/sh/sh.c:7174 config/sh/sh.c:7209 #, c-format msgid "`%s' attribute only applies to interrupt functions" msgstr "" #. The argument must be a constant string. -#: config/sh/sh.c:7176 +#: config/sh/sh.c:7181 #, c-format msgid "`%s' attribute argument not a string constant" msgstr "" #. The argument must be a constant integer. -#: config/sh/sh.c:7211 +#: config/sh/sh.c:7216 #, c-format msgid "`%s' attribute argument not an integer constant" msgstr "" -#: config/sh/sh.c:7339 +#: config/sh/sh.c:7344 #, c-format msgid "created and used with differing settings of `-m%s'" msgstr "" @@ -12736,15 +12767,15 @@ msgid "candidates are:" msgstr "" #: cp/call.c:2603 -msgid "conversion from `%T' to `%T' is ambiguous" +msgid "conversion from %qT to %qT is ambiguous" msgstr "" #: cp/call.c:2757 cp/call.c:2815 -msgid "no matching function for call to `%D(%A)'" +msgid "no matching function for call to %<%D(%A)%>" msgstr "" #: cp/call.c:2760 cp/call.c:2818 -msgid "call of overloaded `%D(%A)' is ambiguous" +msgid "call of overloaded %<%D(%A)%> is ambiguous" msgstr "" #. It's no good looking for an overloaded operator() on a @@ -12757,41 +12788,35 @@ msgid "" msgstr "" #: cp/call.c:2955 -msgid "no match for call to `(%T) (%A)'" +msgid "no match for call to %<(%T) (%A)%>" msgstr "" #: cp/call.c:2964 -msgid "call of `(%T) (%A)' is ambiguous" +msgid "call of %<(%T) (%A)%> is ambiguous" msgstr "" #: cp/call.c:3001 -#, c-format -msgid "%s for ternary 'operator?:' in '%E ? %E : %E'" +msgid "%s for ternary % in %<%E ? %E : %E%>" msgstr "" #: cp/call.c:3007 -#, c-format -msgid "%s for 'operator%s' in '%E%s'" +msgid "%s for % in %<%E%s%>" msgstr "" #: cp/call.c:3011 -#, c-format -msgid "%s for 'operator[]' in '%E[%E]'" +msgid "%s for % in %<%E[%E]%>" msgstr "" #: cp/call.c:3016 -#, c-format -msgid "%s for '%s' in '%s %E'" +msgid "%s for %qs in %<%s %E%>" msgstr "" #: cp/call.c:3021 -#, c-format -msgid "%s for 'operator%s' in '%E %s %E'" +msgid "%s for % in %<%E %s %E%>" msgstr "" #: cp/call.c:3024 -#, c-format -msgid "%s for 'operator%s' in '%s%E'" +msgid "%s for % in %<%s%E%>" msgstr "" #: cp/call.c:3114 @@ -12799,8 +12824,7 @@ msgid "ISO C++ forbids omitting the middle term of a ?: expression" msgstr "" #: cp/call.c:3191 -#, c-format -msgid "`%E' has type `void' and is not a throw-expression" +msgid "%qE has type % and is not a throw-expression" msgstr "" #: cp/call.c:3230 cp/call.c:3440 @@ -12816,76 +12840,76 @@ msgid "enumeral and non-enumeral type in conditional expression" msgstr "" #: cp/call.c:3696 -msgid "no `%D(int)' declared for postfix `%s', trying prefix operator instead" +msgid "no %<%D(int)%> declared for postfix %qs, trying prefix operator instead" msgstr "" -#: cp/call.c:3748 -msgid "using synthesized `%#D' for copy assignment" +#: cp/call.c:3749 +msgid "using synthesized %q#D for copy assignment" msgstr "" -#: cp/call.c:3750 -msgid " where cfront would use `%#D'" +#: cp/call.c:3751 +msgid " where cfront would use %q#D" msgstr "" -#: cp/call.c:3782 -msgid "comparison between `%#T' and `%#T'" +#: cp/call.c:3783 +msgid "comparison between %q#T and %q#T" msgstr "" -#: cp/call.c:4039 -msgid "no suitable `operator %s' for `%T'" +#: cp/call.c:4040 +msgid "no suitable % for %qT" msgstr "" -#: cp/call.c:4056 -msgid "`%+#D' is private" +#: cp/call.c:4057 +msgid "%q+#D is private" msgstr "" -#: cp/call.c:4058 -msgid "`%+#D' is protected" +#: cp/call.c:4059 +msgid "%q+#D is protected" msgstr "" -#: cp/call.c:4060 -msgid "`%+#D' is inaccessible" +#: cp/call.c:4061 +msgid "%q+#D is inaccessible" msgstr "" -#: cp/call.c:4061 +#: cp/call.c:4062 msgid "within this context" msgstr "" -#: cp/call.c:4144 -msgid "invalid conversion from `%T' to `%T'" +#: cp/call.c:4145 +msgid "invalid conversion from %qT to %qT" msgstr "" -#: cp/call.c:4146 -msgid " initializing argument %P of `%D'" +#: cp/call.c:4147 +msgid " initializing argument %P of %qD" msgstr "" -#: cp/call.c:4289 -msgid "cannot bind bitfield `%E' to `%T'" +#: cp/call.c:4290 +msgid "cannot bind bitfield %qE to %qT" msgstr "" -#: cp/call.c:4292 -msgid "cannot bind packed field `%E' to `%T'" +#: cp/call.c:4293 +msgid "cannot bind packed field %qE to %qT" msgstr "" -#: cp/call.c:4295 -msgid "cannot bind rvalue `%E' to `%T'" +#: cp/call.c:4296 +msgid "cannot bind rvalue %qE to %qT" msgstr "" -#: cp/call.c:4380 +#: cp/call.c:4381 msgid "" -"cannot pass objects of non-POD type `%#T' through `...'; call will abort at " +"cannot pass objects of non-POD type %q#T through %<...%>; call will abort at " "runtime" msgstr "" #. Undefined behavior [expr.call] 5.2.2/7. -#: cp/call.c:4406 +#: cp/call.c:4407 msgid "" -"cannot receive objects of non-POD type `%#T' through `...'; call will abort " -"at runtime" +"cannot receive objects of non-POD type %q#T' through %<...%>; call will " +"abort at runtime" msgstr "" #: cp/call.c:4450 -msgid "the default argument for parameter %d of `%D' has not yet been parsed" +msgid "the default argument for parameter %d of %qD has not yet been parsed" msgstr "" #: cp/call.c:4655 @@ -12893,94 +12917,92 @@ msgid "passing `%T' as `this' argument of `%#D' discards qualifiers" msgstr "" #: cp/call.c:4674 -msgid "`%T' is not an accessible base of `%T'" +msgid "%qT is not an accessible base of %qT" msgstr "" #: cp/call.c:4924 -msgid "could not find class$ field in java interface type `%T'" +msgid "could not find class$ field in java interface type %qT" msgstr "" #: cp/call.c:5186 -msgid "call to non-function `%D'" +msgid "call to non-function %qD" msgstr "" #: cp/call.c:5211 -msgid "request for member `%D' in `%E', which is of non-aggregate type `%T'" +msgid "request for member %qD in %qE, which is of non-aggregate type %qT" msgstr "" -#: cp/call.c:5289 -msgid "no matching function for call to `%T::%s(%A)%#V'" +#: cp/call.c:5290 +msgid "no matching function for call to %<%T::%s(%A)%#V%>" msgstr "" -#: cp/call.c:5307 -#, c-format -msgid "call of overloaded `%s(%A)' is ambiguous" +#: cp/call.c:5308 +msgid "call of overloaded %<%s(%A)%> is ambiguous" msgstr "" -#: cp/call.c:5331 -msgid "cannot call member function `%D' without object" +#: cp/call.c:5332 +msgid "cannot call member function %qD without object" msgstr "" -#: cp/call.c:5936 -msgid "passing `%T' chooses `%T' over `%T'" +#: cp/call.c:5937 +msgid "passing %qT chooses %qT over %qT" msgstr "" -#: cp/call.c:5938 cp/name-lookup.c:4246 -msgid " in call to `%D'" +#: cp/call.c:5939 cp/name-lookup.c:4244 +msgid " in call to %qD" msgstr "" -#: cp/call.c:5995 -msgid "choosing `%D' over `%D'" +#: cp/call.c:5996 +msgid "choosing %qD over %qD" msgstr "" -#: cp/call.c:5996 -msgid " for conversion from `%T' to `%T'" +#: cp/call.c:5997 +msgid " for conversion from %qT to %qT" msgstr "" -#: cp/call.c:5998 +#: cp/call.c:5999 msgid " because conversion sequence for the argument is better" msgstr "" -#: cp/call.c:6119 +#: cp/call.c:6120 msgid "" "ISO C++ says that these are ambiguous, even though the worst conversion for " "the first is better than the worst conversion for the second:" msgstr "" -#: cp/call.c:6123 +#: cp/call.c:6124 msgid "candidate 1:" msgstr "" -#: cp/call.c:6124 +#: cp/call.c:6125 msgid "candidate 2:" msgstr "" -#: cp/call.c:6260 -msgid "could not convert `%E' to `%T'" +#: cp/call.c:6261 +msgid "could not convert %qE to %qT" msgstr "" -#: cp/call.c:6384 +#: cp/call.c:6385 msgid "" -"invalid initialization of non-const reference of type '%T' from a temporary " -"of type '%T'" +"invalid initialization of non-const reference of type %qT from a temporary " +"of type %qT" msgstr "" -#: cp/call.c:6388 +#: cp/call.c:6389 msgid "" -"invalid initialization of reference of type '%T' from expression of type '%T'" +"invalid initialization of reference of type %qT from expression of type %qT" msgstr "" #: cp/class.c:276 -msgid "" -"cannot convert from base `%T' to derived type `%T' via virtual base `%T'" +msgid "cannot convert from base %qT to derived type %qT via virtual base %qT" msgstr "" #: cp/class.c:888 -msgid "Java class '%T' cannot have an implicit non-trivial destructor" +msgid "Java class %qT cannot have an implicit non-trivial destructor" msgstr "" #: cp/class.c:889 -msgid "Java class '%T' cannot have a destructor" +msgid "Java class %qT cannot have a destructor" msgstr "" #: cp/class.c:988 @@ -12988,211 +13010,211 @@ msgid "`%#D' and `%#D' cannot be overloaded" msgstr "" #: cp/class.c:1045 -msgid "conflicting access specifications for method `%D', ignored" +msgid "conflicting access specifications for method %qD, ignored" msgstr "" -#: cp/class.c:1047 +#: cp/class.c:1048 #, c-format -msgid "conflicting access specifications for field `%E', ignored" +msgid "conflicting access specifications for field %qE, ignored" msgstr "" -#: cp/class.c:1097 -msgid "`%D' names constructor" +#: cp/class.c:1098 +msgid "%qD names constructor" msgstr "" -#: cp/class.c:1102 -msgid "`%D' invalid in `%T'" +#: cp/class.c:1103 +msgid "%qD invalid in %qT" msgstr "" -#: cp/class.c:1110 -msgid "no members matching `%D' in `%#T'" +#: cp/class.c:1111 +msgid "no members matching %qD in %q#T" msgstr "" -#: cp/class.c:1142 cp/class.c:1150 -msgid "`%D' invalid in `%#T'" +#: cp/class.c:1143 cp/class.c:1151 +msgid "%qD invalid in %q#T" msgstr "" -#: cp/class.c:1143 -msgid " because of local method `%#D' with same name" +#: cp/class.c:1144 +msgid " because of local method %q#D with same name" msgstr "" -#: cp/class.c:1151 -msgid " because of local member `%#D' with same name" +#: cp/class.c:1152 +msgid " because of local member %q#D with same name" msgstr "" -#: cp/class.c:1196 -msgid "base class `%#T' has a non-virtual destructor" +#: cp/class.c:1197 +msgid "base class %q#T has a non-virtual destructor" msgstr "" #: cp/class.c:1216 msgid "" -"base `%T' with only non-default constructor in class without a constructor" +"base %qT with only non-default constructor in class without a constructor" msgstr "" -#: cp/class.c:1522 -msgid "all member functions in class `%T' are private" +#: cp/class.c:1523 +msgid "all member functions in class %qT are private" msgstr "" -#: cp/class.c:1533 -msgid "`%#T' only defines a private destructor and has no friends" +#: cp/class.c:1534 +msgid "%q#T only defines a private destructor and has no friends" msgstr "" -#: cp/class.c:1573 -msgid "`%#T' only defines private constructors and has no friends" +#: cp/class.c:1574 +msgid "%q#T only defines private constructors and has no friends" msgstr "" -#: cp/class.c:1954 -msgid "no unique final overrider for `%D' in `%T'" +#: cp/class.c:1955 +msgid "no unique final overrider for %qD in %qT" msgstr "" #. Here we know it is a hider, and no overrider exists. -#: cp/class.c:2408 -msgid "`%D' was hidden" +#: cp/class.c:2409 +msgid "%qD was hidden" msgstr "" -#: cp/class.c:2409 -msgid " by `%D'" +#: cp/class.c:2410 +msgid " by %qD" msgstr "" -#: cp/class.c:2450 cp/decl2.c:1143 -msgid "`%#D' invalid; an anonymous union can only have non-static data members" +#: cp/class.c:2451 cp/decl2.c:1143 +msgid "%q#D invalid; an anonymous union can only have non-static data members" msgstr "" -#: cp/class.c:2456 cp/decl2.c:1150 -msgid "private member `%#D' in anonymous union" +#: cp/class.c:2458 cp/decl2.c:1150 +msgid "private member %q#D in anonymous union" msgstr "" -#: cp/class.c:2459 cp/decl2.c:1152 -msgid "protected member `%#D' in anonymous union" +#: cp/class.c:2461 cp/decl2.c:1152 +msgid "protected member %q#D in anonymous union" msgstr "" -#: cp/class.c:2573 +#: cp/class.c:2575 msgid "" -"vtable layout for class `%T' may not be ABI-compliant and may change in a " +"vtable layout for class %qT may not be ABI-compliant and may change in a " "future version of GCC due to implicit virtual destructor" msgstr "" -#: cp/class.c:2631 -msgid "bit-field `%#D' with non-integral type" +#: cp/class.c:2633 +msgid "bit-field %q#D with non-integral type" msgstr "" -#: cp/class.c:2651 -msgid "bit-field `%D' width not an integer constant" +#: cp/class.c:2653 +msgid "bit-field %qD width not an integer constant" msgstr "" -#: cp/class.c:2657 -msgid "negative width in bit-field `%D'" +#: cp/class.c:2659 +msgid "negative width in bit-field %qD" msgstr "" -#: cp/class.c:2662 -msgid "zero width for bit-field `%D'" +#: cp/class.c:2664 +msgid "zero width for bit-field %qD" msgstr "" -#: cp/class.c:2668 -msgid "width of `%D' exceeds its type" +#: cp/class.c:2670 +msgid "width of %qD exceeds its type" msgstr "" -#: cp/class.c:2677 -msgid "`%D' is too small to hold all values of `%#T'" +#: cp/class.c:2679 +msgid "%qD is too small to hold all values of %q#T" msgstr "" -#: cp/class.c:2739 -msgid "member `%#D' with constructor not allowed in union" +#: cp/class.c:2741 +msgid "member %q#D with constructor not allowed in union" msgstr "" -#: cp/class.c:2742 -msgid "member `%#D' with destructor not allowed in union" +#: cp/class.c:2744 +msgid "member %q#D with destructor not allowed in union" msgstr "" -#: cp/class.c:2745 -msgid "member `%#D' with copy assignment operator not allowed in union" +#: cp/class.c:2747 +msgid "member %q#D with copy assignment operator not allowed in union" msgstr "" -#: cp/class.c:2772 -msgid "multiple fields in union `%T' initialized" +#: cp/class.c:2774 +msgid "multiple fields in union %qT initialized" msgstr "" -#: cp/class.c:2838 -msgid "ignoring packed attribute on unpacked non-POD field `%#D'" +#: cp/class.c:2840 +msgid "ignoring packed attribute on unpacked non-POD field %q#D" msgstr "" -#: cp/class.c:2898 -msgid "`%D' may not be static because it is a member of a union" +#: cp/class.c:2900 +msgid "%qD may not be static because it is a member of a union" msgstr "" -#: cp/class.c:2903 -msgid "`%D' may not have reference type `%T' because it is a member of a union" +#: cp/class.c:2905 +msgid "%qD may not have reference type `%T' because it is a member of a union" msgstr "" -#: cp/class.c:2911 -msgid "field `%D' in local class cannot be static" +#: cp/class.c:2913 +msgid "field %qD in local class cannot be static" msgstr "" -#: cp/class.c:2917 -msgid "field `%D' invalidly declared function type" +#: cp/class.c:2919 +msgid "field %qD invalidly declared function type" msgstr "" -#: cp/class.c:2924 -msgid "field `%D' invalidly declared method type" +#: cp/class.c:2925 +msgid "field %qD invalidly declared method type" msgstr "" -#: cp/class.c:2957 -msgid "non-static reference `%#D' in class without a constructor" +#: cp/class.c:2958 +msgid "non-static reference %q#D in class without a constructor" msgstr "" -#: cp/class.c:3005 -msgid "non-static const member `%#D' in class without a constructor" +#: cp/class.c:3006 +msgid "non-static const member %q#D in class without a constructor" msgstr "" -#: cp/class.c:3020 -msgid "field `%#D' with same name as class" +#: cp/class.c:3021 +msgid "field %q#D with same name as class" msgstr "" -#: cp/class.c:3054 -msgid "`%#T' has pointer data members" +#: cp/class.c:3055 +msgid "%q#T has pointer data members" msgstr "" -#: cp/class.c:3058 -msgid " but does not override `%T(const %T&)'" +#: cp/class.c:3059 +msgid " but does not override %<%T(const %T&)%>" msgstr "" -#: cp/class.c:3060 -msgid " or `operator=(const %T&)'" +#: cp/class.c:3061 +msgid " or %" msgstr "" -#: cp/class.c:3063 -msgid " but does not override `operator=(const %T&)'" +#: cp/class.c:3064 +msgid " but does not override %" msgstr "" -#: cp/class.c:3496 +#: cp/class.c:3497 msgid "" -"offset of empty base `%T' may not be ABI-compliant and maychange in a future " +"offset of empty base %qT may not be ABI-compliant and maychange in a future " "version of GCC" msgstr "" -#: cp/class.c:3608 -msgid "class `%T' will be considered nearly empty in a future version of GCC" +#: cp/class.c:3609 +msgid "class %qT will be considered nearly empty in a future version of GCC" msgstr "" -#: cp/class.c:3690 -msgid "initializer specified for non-virtual method `%D'" +#: cp/class.c:3691 +msgid "initializer specified for non-virtual method %qD" msgstr "" -#: cp/class.c:4349 +#: cp/class.c:4350 msgid "" -"offset of virtual base `%T' is not ABI-compliant and may change in a future " +"offset of virtual base %qT is not ABI-compliant and may change in a future " "version of GCC" msgstr "" -#: cp/class.c:4443 -msgid "direct base `%T' inaccessible in `%T' due to ambiguity" +#: cp/class.c:4445 +msgid "direct base %qT inaccessible in %qT due to ambiguity" msgstr "" -#: cp/class.c:4455 -msgid "virtual base `%T' inaccessible in `%T' due to ambiguity" +#: cp/class.c:4457 +msgid "virtual base %qT inaccessible in %qT due to ambiguity" msgstr "" -#: cp/class.c:4626 +#: cp/class.c:4628 msgid "" "size assigned to `%T' may not be ABI-compliant and may change in a future " "version of GCC" @@ -13200,77 +13222,76 @@ msgstr "" #. Versions of G++ before G++ 3.4 did not reset the #. DECL_MODE. -#: cp/class.c:4665 +#: cp/class.c:4667 msgid "" -"the offset of `%D' may not be ABI-compliant and may change in a future " +"the offset of %qD may not be ABI-compliant and may change in a future " "version of GCC" msgstr "" -#: cp/class.c:4688 +#: cp/class.c:4690 msgid "" -"offset of `%D' is not ABI-compliant and may change in a future version of GCC" +"offset of %qD is not ABI-compliant and may change in a future version of GCC" msgstr "" -#: cp/class.c:4697 +#: cp/class.c:4700 msgid "" -"`%D' contains empty classes which may cause base classes to be placed at " +"%qD contains empty classes which may cause base classes to be placed at " "different locations in a future version of GCC" msgstr "" -#: cp/class.c:4756 +#: cp/class.c:4759 msgid "" -"layout of classes derived from empty class `%T' may change in a future " +"layout of classes derived from empty class %qT may change in a future " "version of GCC" msgstr "" -#: cp/class.c:4897 cp/semantics.c:2075 -msgid "redefinition of `%#T'" +#: cp/class.c:4900 +msgid "redefinition of %q#T" msgstr "" -#: cp/class.c:5041 -msgid "%#T' has virtual functions but non-virtual destructor" +#: cp/class.c:5044 +msgid "%q#T has virtual functions but non-virtual destructor" msgstr "" -#: cp/class.c:5136 +#: cp/class.c:5139 msgid "trying to finish struct, but kicked out due to previous parse errors" msgstr "" -#: cp/class.c:5554 +#: cp/class.c:5557 #, c-format msgid "language string `\"%E\"' not recognized" msgstr "" -#: cp/class.c:5641 +#: cp/class.c:5644 msgid "" "cannot resolve overloaded function `%D' based on conversion to type `%T'" msgstr "" -#: cp/class.c:5766 -msgid "no matches converting function `%D' to type `%#T'" +#: cp/class.c:5769 +msgid "no matches converting function %qD to type %q#T" msgstr "" -#: cp/class.c:5789 -msgid "converting overloaded function `%D' to type `%#T' is ambiguous" +#: cp/class.c:5792 +msgid "converting overloaded function %qD to type %q#T is ambiguous" msgstr "" -#: cp/class.c:5815 -msgid "assuming pointer to member `%D'" +#: cp/class.c:5818 +msgid "assuming pointer to member %qD" msgstr "" -#: cp/class.c:5818 -#, c-format -msgid "(a pointer to member can only be formed with `&%E')" +#: cp/class.c:5821 +msgid "(a pointer to member can only be formed with %<&%E%>)" msgstr "" -#: cp/class.c:5863 cp/class.c:6042 cp/class.c:6049 +#: cp/class.c:5866 cp/class.c:6045 cp/class.c:6052 msgid "not enough type information" msgstr "" -#: cp/class.c:5880 -msgid "argument of type `%T' does not match `%T'" +#: cp/class.c:5883 +msgid "argument of type %qT does not match %qT" msgstr "" -#: cp/class.c:6026 +#: cp/class.c:6029 msgid "invalid operation on uninstantiated type" msgstr "" @@ -13279,12 +13300,12 @@ msgstr "" #. A name N used in a class S shall refer to the same declaration #. in its context and when re-evaluated in the completed scope of #. S. -#: cp/class.c:6292 cp/decl.c:1230 cp/name-lookup.c:577 cp/pt.c:2146 -msgid "declaration of `%#D'" +#: cp/class.c:6295 cp/decl.c:1230 cp/name-lookup.c:577 cp/pt.c:2143 +msgid "declaration of %q#D" msgstr "" -#: cp/class.c:6293 -msgid "changes meaning of `%D' from `%+#D'" +#: cp/class.c:6296 +msgid "changes meaning of %qD from %q+#D" msgstr "" #: cp/cvt.c:90 @@ -13382,95 +13403,91 @@ msgid " candidate conversions include `%D' and `%D'" msgstr "" #: cp/decl.c:367 -msgid "label `%D' used but not defined" +msgid "label %qD used but not defined" msgstr "" #: cp/decl.c:378 -msgid "label `%D' defined but not used" -msgstr "" - -#: cp/decl.c:574 -msgid "%Junused variable '%D'" +msgid "label %qD defined but not used" msgstr "" #: cp/decl.c:1137 -msgid "`%D' was declared `extern' and later `static'" +msgid "%qD was declared % and later %" msgstr "" #: cp/decl.c:1138 cp/decl.c:1603 -msgid "previous declaration of `%D'" +msgid "previous declaration of %qD" msgstr "" #: cp/decl.c:1186 -msgid "%Jfunction '%D' redeclared as inline" +msgid "%Jfunction %qD redeclared as inline" msgstr "" #: cp/decl.c:1187 -msgid "%Jprevious declaration of '%D' with attribute noinline" +msgid "%Jprevious declaration of %qD with attribute noinline" msgstr "" #: cp/decl.c:1194 -msgid "%Jfunction '%D' redeclared with attribute noinline" +msgid "%Jfunction %qD redeclared with attribute noinline" msgstr "" #: cp/decl.c:1196 -msgid "%Jprevious declaration of '%D' was inline" +msgid "%Jprevious declaration of %qD was inline" msgstr "" #: cp/decl.c:1217 cp/decl.c:1288 -msgid "shadowing %s function `%#D'" +msgid "shadowing %s function %q#D" msgstr "" #: cp/decl.c:1226 -msgid "library function `%#D' redeclared as non-function `%#D'" +msgid "library function %q#D redeclared as non-function %q#D" msgstr "" #: cp/decl.c:1231 -msgid "conflicts with built-in declaration `%#D'" +msgid "conflicts with built-in declaration %q#D" msgstr "" #: cp/decl.c:1283 cp/decl.c:1392 cp/decl.c:1408 -msgid "new declaration `%#D'" +msgid "new declaration %q#D" msgstr "" #: cp/decl.c:1284 -msgid "ambiguates built-in declaration `%#D'" +msgid "ambiguates built-in declaration %q#D" msgstr "" #: cp/decl.c:1355 -msgid "`%#D' redeclared as different kind of symbol" +msgid "%q#D redeclared as different kind of symbol" msgstr "" #: cp/decl.c:1358 -msgid "previous declaration of `%#D'" +msgid "previous declaration of %q#D" msgstr "" #: cp/decl.c:1377 -msgid "declaration of template `%#D'" +msgid "declaration of template %q#D" msgstr "" #: cp/decl.c:1378 cp/name-lookup.c:578 -msgid "conflicts with previous declaration `%#D'" +msgid "conflicts with previous declaration %q#D" msgstr "" #: cp/decl.c:1393 cp/decl.c:1409 -msgid "ambiguates old declaration `%#D'" +msgid "ambiguates old declaration %q#D" msgstr "" #: cp/decl.c:1401 -msgid "declaration of C function `%#D' conflicts with" +msgid "declaration of C function %q#D conflicts with" msgstr "" #: cp/decl.c:1403 -msgid "previous declaration `%#D' here" +msgid "previous declaration %q#D here" msgstr "" #: cp/decl.c:1416 -msgid "conflicting declaration '%#D'" +msgid "conflicting declaration %q#D" msgstr "" #: cp/decl.c:1417 -msgid "'%D' has a previous declaration as `%#D'" +msgid "%qD has a previous declaration as %q#D" msgstr "" #. [namespace.alias] @@ -13481,24 +13498,24 @@ msgstr "" #. declared as the name of any other entity in any global scope #. of the program. #: cp/decl.c:1470 -msgid "declaration of `namespace %D' conflicts with" +msgid "declaration of namespace %qD conflicts with" msgstr "" #: cp/decl.c:1471 -msgid "previous declaration of `namespace %D' here" +msgid "previous declaration of namespace %qD here" msgstr "" #: cp/decl.c:1483 -msgid "`%#D' previously defined here" +msgid "%q#D previously defined here" msgstr "" #: cp/decl.c:1484 -msgid "`%#D' previously declared here" +msgid "%q#D previously declared here" msgstr "" #. Prototype decl follows defn w/o prototype. #: cp/decl.c:1493 -msgid "prototype for `%#D'" +msgid "prototype for %q#D" msgstr "" #: cp/decl.c:1494 @@ -13506,23 +13523,23 @@ msgid "%Jfollows non-prototype definition here" msgstr "" #: cp/decl.c:1506 -msgid "previous declaration of `%#D' with %L linkage" +msgid "previous declaration of %q#D with %qL linkage" msgstr "" #: cp/decl.c:1508 -msgid "conflicts with new declaration with %L linkage" +msgid "conflicts with new declaration with %qL linkage" msgstr "" #: cp/decl.c:1531 cp/decl.c:1538 -msgid "default argument given for parameter %d of `%#D'" +msgid "default argument given for parameter %d of %q#D" msgstr "" #: cp/decl.c:1533 cp/decl.c:1540 -msgid "after previous specification in `%#D'" +msgid "after previous specification in %q#D" msgstr "" #: cp/decl.c:1549 -msgid "`%#D' was used before it was declared inline" +msgid "%q#D was used before it was declared inline" msgstr "" #: cp/decl.c:1550 @@ -13530,17 +13547,17 @@ msgid "%Jprevious non-inline declaration here" msgstr "" #: cp/decl.c:1602 -msgid "redundant redeclaration of `%D' in same scope" +msgid "redundant redeclaration of %qD in same scope" msgstr "" #: cp/decl.c:1696 #, c-format -msgid "declaration of `%F' throws different exceptions" +msgid "declaration of %qF throws different exceptions" msgstr "" #: cp/decl.c:1698 #, c-format -msgid "than previous declaration `%F'" +msgid "than previous declaration %qF" msgstr "" #. From [temp.expl.spec]: @@ -13556,7 +13573,7 @@ msgid "explicit specialization of %D after first use" msgstr "" #: cp/decl.c:1930 -msgid "%J'%D': visibility attribute ignored because it" +msgid "%J%qD: visibility attribute ignored because it" msgstr "" #: cp/decl.c:1932 @@ -13565,11 +13582,11 @@ msgstr "" #: cp/decl.c:2160 #, c-format -msgid "label `%E' referenced outside of any function" +msgid "label %qE referenced outside of any function" msgstr "" #: cp/decl.c:2256 cp/decl.c:2280 cp/decl.c:2368 -msgid "jump to label `%D'" +msgid "jump to label %qD" msgstr "" #: cp/decl.c:2258 cp/decl.c:2282 @@ -13581,11 +13598,11 @@ msgid "%H from here" msgstr "" #: cp/decl.c:2266 -msgid " crosses initialization of `%#D'" +msgid " crosses initialization of %q#D" msgstr "" #: cp/decl.c:2269 cp/decl.c:2384 -msgid " enters scope of non-POD `%#D'" +msgid " enters scope of non-POD %q#D" msgstr "" #: cp/decl.c:2289 cp/decl.c:2388 @@ -13606,7 +13623,7 @@ msgid "%J enters catch block" msgstr "" #: cp/decl.c:2382 -msgid " skips initialization of `%#D'" +msgid " skips initialization of %q#D" msgstr "" #: cp/decl.c:2416 @@ -13617,797 +13634,736 @@ msgstr "" msgid "duplicate label `%D'" msgstr "" -#: cp/decl.c:2650 cp/parser.c:3525 -msgid "`%D' used without template parameters" +#: cp/decl.c:2650 cp/parser.c:3524 +msgid "%qD used without template parameters" msgstr "" -#: cp/decl.c:2660 cp/decl.c:2676 cp/decl.c:2763 -msgid "no class template named `%#T' in `%#T'" +#: cp/decl.c:2660 cp/decl.c:2675 cp/decl.c:2762 +msgid "no class template named %q#T in %q#T" msgstr "" -#: cp/decl.c:2697 cp/decl.c:2707 cp/decl.c:2727 -msgid "no type named `%#T' in `%#T'" +#: cp/decl.c:2696 cp/decl.c:2706 cp/decl.c:2726 +msgid "no type named %q#T in %q#T" msgstr "" -#: cp/decl.c:3433 +#: cp/decl.c:3432 msgid "%Jan anonymous union cannot have function members" msgstr "" -#: cp/decl.c:3451 -msgid "member %#D' with constructor not allowed in anonymous aggregate" +#: cp/decl.c:3450 +msgid "member %q#D with constructor not allowed in anonymous aggregate" msgstr "" #: cp/decl.c:3454 -msgid "member %#D' with destructor not allowed in anonymous aggregate" +msgid "member %q#D with destructor not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:3457 +#: cp/decl.c:3458 msgid "" -"member %#D' with copy assignment operator not allowed in anonymous aggregate" +"member %q#D with copy assignment operator not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:3482 +#: cp/decl.c:3484 msgid "multiple types in one declaration" msgstr "" -#: cp/decl.c:3486 +#: cp/decl.c:3488 msgid "redeclaration of C++ built-in type %qT" msgstr "" -#: cp/decl.c:3522 +#: cp/decl.c:3524 msgid "missing type-name in typedef-declaration" msgstr "" -#: cp/decl.c:3530 +#: cp/decl.c:3532 msgid "ISO C++ prohibits anonymous structs" msgstr "" -#: cp/decl.c:3537 +#: cp/decl.c:3539 #, c-format -msgid "`%s' can only be specified for functions" -msgstr "" - -#: cp/decl.c:3543 -msgid "`friend' can only be specified inside a class" +msgid "%qs can only be specified for functions" msgstr "" #: cp/decl.c:3545 -msgid "`explicit' can only be specified for constructors" +msgid "% can only be specified inside a class" msgstr "" #: cp/decl.c:3547 -msgid "a storage class can only be specified for objects and functions" -msgstr "" - -#: cp/decl.c:3553 -msgid "qualifiers can only be specified for objects and functions" +msgid "% can only be specified for constructors" msgstr "" -#: cp/decl.c:3691 cp/decl2.c:856 -msgid "typedef `%D' is initialized (use __typeof__ instead)" +#: cp/decl.c:3549 +msgid "a storage class can only be specified for objects and functions" msgstr "" -#: cp/decl.c:3696 -msgid "function `%#D' is initialized like a variable" +#: cp/decl.c:3555 +msgid "qualifiers can only be specified for objects and functions" msgstr "" -#: cp/decl.c:3708 -msgid "declaration of `%#D' has `extern' and is initialized" +#: cp/decl.c:3698 +msgid "function %q#D is initialized like a variable" msgstr "" -#: cp/decl.c:3731 cp/decl.c:9821 -msgid "%Jinline function '%D' given attribute noinline" +#: cp/decl.c:3710 +msgid "declaration of %q#D has % and is initialized" msgstr "" -#: cp/decl.c:3739 -msgid "`%#D' is not a static member of `%#T'" +#: cp/decl.c:3741 +msgid "%q#D is not a static member of %q#T" msgstr "" -#: cp/decl.c:3745 -msgid "ISO C++ does not permit `%T::%D' to be defined as `%T::%D'" +#: cp/decl.c:3747 +msgid "ISO C++ does not permit %<%T::%D%> to be defined as %<%T::%D%>" msgstr "" -#: cp/decl.c:3756 +#: cp/decl.c:3759 msgid "duplicate initialization of %D" msgstr "" -#: cp/decl.c:3789 -msgid "declaration of `%#D' outside of class is not definition" +#: cp/decl.c:3792 +msgid "declaration of %q#D outside of class is not definition" msgstr "" -#: cp/decl.c:3838 -msgid "variable `%#D' has initializer but incomplete type" +#: cp/decl.c:3841 +msgid "variable %q#D has initializer but incomplete type" msgstr "" -#: cp/decl.c:3846 cp/decl.c:4467 -msgid "elements of array `%#D' have incomplete type" +#: cp/decl.c:3848 cp/decl.c:4472 +msgid "elements of array %q#D have incomplete type" msgstr "" -#: cp/decl.c:3862 -msgid "aggregate `%#D' has incomplete type and cannot be defined" +#: cp/decl.c:3864 +msgid "aggregate %q#D has incomplete type and cannot be defined" msgstr "" -#: cp/decl.c:3912 +#: cp/decl.c:3914 msgid "`%D' declared as reference but not initialized" msgstr "" -#: cp/decl.c:3918 -msgid "ISO C++ forbids use of initializer list to initialize reference `%D'" +#: cp/decl.c:3920 +msgid "ISO C++ forbids use of initializer list to initialize reference %qD" msgstr "" -#: cp/decl.c:3946 -msgid "cannot initialize `%T' from `%T'" +#: cp/decl.c:3949 +msgid "cannot initialize %qT from %qT" msgstr "" -#: cp/decl.c:3978 -msgid "initializer fails to determine size of `%D'" +#: cp/decl.c:3981 +msgid "initializer fails to determine size of %qD" msgstr "" -#: cp/decl.c:3983 +#: cp/decl.c:3986 msgid "array size missing in `%D'" msgstr "" -#: cp/decl.c:3995 -msgid "zero-size array `%D'" +#: cp/decl.c:3998 +msgid "zero-size array %qD" msgstr "" #. An automatic variable with an incomplete type: that is an error. #. Don't talk about array types here, since we took care of that #. message in grokdeclarator. -#: cp/decl.c:4032 -msgid "storage size of `%D' isn't known" +#: cp/decl.c:4035 +msgid "storage size of %qD isn't known" msgstr "" -#: cp/decl.c:4054 -msgid "storage size of `%D' isn't constant" +#: cp/decl.c:4057 +msgid "storage size of %qD isn't constant" msgstr "" -#: cp/decl.c:4109 +#: cp/decl.c:4112 msgid "" -"sorry: semantics of inline function static data `%#D' are wrong (you'll wind " +"sorry: semantics of inline function static data %q#D are wrong (you'll wind " "up with multiple copies)" msgstr "" -#: cp/decl.c:4110 +#: cp/decl.c:4115 msgid "%J you can work around this by removing the initializer" msgstr "" -#: cp/decl.c:4136 -msgid "uninitialized const `%D'" +#: cp/decl.c:4142 +msgid "uninitialized const %qD" msgstr "" -#: cp/decl.c:4196 -msgid "name `%D' used in a GNU-style designated initializer for an array" +#: cp/decl.c:4202 +msgid "name %qD used in a GNU-style designated initializer for an array" msgstr "" -#: cp/decl.c:4206 +#: cp/decl.c:4212 #, c-format -msgid "Designated initializer `%E' larger than array size" +msgid "Designated initializer %qE larger than array size" msgstr "" -#: cp/decl.c:4277 -msgid "brace-enclosed initializer used to initialize `%T'" +#: cp/decl.c:4283 +msgid "brace-enclosed initializer used to initialize %qT" msgstr "" -#: cp/decl.c:4340 -msgid "initializer for `%T' must be brace-enclosed" +#: cp/decl.c:4346 +msgid "initializer for %qT must be brace-enclosed" msgstr "" -#: cp/decl.c:4357 +#: cp/decl.c:4362 msgid "ISO C++ does not allow designated initializers" msgstr "" -#: cp/decl.c:4361 -msgid "`%T' has no non-static data member named `%D'" +#: cp/decl.c:4366 +msgid "%qT has no non-static data member named %qD" msgstr "" -#: cp/decl.c:4423 -msgid "too many initializers for `%T'" +#: cp/decl.c:4428 +msgid "too many initializers for %qT" msgstr "" -#: cp/decl.c:4461 -msgid "variable-sized object `%D' may not be initialized" +#: cp/decl.c:4466 +msgid "variable-sized object %qD may not be initialized" msgstr "" -#: cp/decl.c:4472 -msgid "`%D' has incomplete type" +#: cp/decl.c:4477 +msgid "%qD has incomplete type" msgstr "" -#: cp/decl.c:4526 -msgid "`%D' must be initialized by constructor, not by `{...}'" +#: cp/decl.c:4531 +msgid "%qD must be initialized by constructor, not by %<{...}%>" msgstr "" -#: cp/decl.c:4570 -msgid "structure `%D' with uninitialized const members" +#: cp/decl.c:4576 +msgid "structure %qD with uninitialized const members" msgstr "" -#: cp/decl.c:4572 -msgid "structure `%D' with uninitialized reference members" +#: cp/decl.c:4578 +msgid "structure %qD with uninitialized reference members" msgstr "" -#: cp/decl.c:4767 +#: cp/decl.c:4772 msgid "assignment (not initialization) in declaration" msgstr "" -#: cp/decl.c:4784 -msgid "cannot initialize `%D' to namespace `%D'" +#: cp/decl.c:4789 +msgid "cannot initialize %qD to namespace %qD" msgstr "" -#: cp/decl.c:4828 -msgid "shadowing previous type declaration of `%#D'" +#: cp/decl.c:4832 +msgid "shadowing previous type declaration of %q#D" msgstr "" -#: cp/decl.c:4865 -msgid "`%D' cannot be thread-local because it has non-POD type `%T'" +#: cp/decl.c:4869 +msgid "%qD cannot be thread-local because it has non-POD type %qT" msgstr "" -#: cp/decl.c:4880 -msgid "`%D' is thread-local and so cannot be dynamically initialized" +#: cp/decl.c:4884 +msgid "%qD is thread-local and so cannot be dynamically initialized" msgstr "" -#: cp/decl.c:5471 -msgid "destructor for alien class `%T' cannot be a member" +#: cp/decl.c:5475 +msgid "destructor for alien class %qT cannot be a member" msgstr "" -#: cp/decl.c:5474 -msgid "constructor for alien class `%T' cannot be a member" -msgstr "" - -#: cp/decl.c:5496 -msgid "`%D' declared as a `virtual' %s" +#: cp/decl.c:5477 +msgid "constructor for alien class %qT cannot be a member" msgstr "" #: cp/decl.c:5498 -msgid "`%D' declared as an `inline' %s" +msgid "%qD declared as a % %s" msgstr "" #: cp/decl.c:5500 +msgid "%qD declared as an % %s" +msgstr "" + +#: cp/decl.c:5502 msgid "" -"`const' and `volatile' function specifiers on `%D' invalid in %s declaration" +"% and % function specifiers on q%D invalid in %s " +"declaration" msgstr "" -#: cp/decl.c:5503 -msgid "`%D' declared as a friend" +#: cp/decl.c:5506 +msgid "%qD declared as a friend" msgstr "" -#: cp/decl.c:5509 -msgid "`%D' declared with an exception specification" +#: cp/decl.c:5512 +msgid "%qD declared with an exception specification" msgstr "" -#: cp/decl.c:5592 -msgid "cannot declare `::main' to be a template" +#: cp/decl.c:5595 +msgid "cannot declare %<::main%> to be a template" msgstr "" -#: cp/decl.c:5594 -msgid "cannot declare `::main' to be inline" +#: cp/decl.c:5597 +msgid "cannot declare %<::main%> to be inline" msgstr "" -#: cp/decl.c:5596 -msgid "cannot declare `::main' to be static" +#: cp/decl.c:5599 +msgid "cannot declare %<::main%> to be static" msgstr "" -#: cp/decl.c:5600 -msgid "`::main' must return `int'" +#: cp/decl.c:5603 +msgid "%<::main%> must return %" msgstr "" -#: cp/decl.c:5630 -msgid "non-local function `%#D' uses anonymous type" +#: cp/decl.c:5633 +msgid "non-local function %q#D uses anonymous type" msgstr "" -#: cp/decl.c:5633 cp/decl.c:5977 +#: cp/decl.c:5636 cp/decl.c:5982 msgid "" -"`%#D' does not refer to the unqualified type, so it is not used for linkage" +"%q#D does not refer to the unqualified type, so it is not used for linkage" msgstr "" -#: cp/decl.c:5639 -msgid "non-local function `%#D' uses local type `%T'" +#: cp/decl.c:5642 +msgid "non-local function %q#D uses local type %qT" msgstr "" -#: cp/decl.c:5663 -msgid "%smember function `%D' cannot have cv-qualifier" +#: cp/decl.c:5665 +msgid "%smember function %qD cannot have cv-qualifier" msgstr "" -#: cp/decl.c:5687 -msgid "defining explicit specialization `%D' in friend declaration" +#: cp/decl.c:5689 +msgid "defining explicit specialization %qD in friend declaration" msgstr "" #. Something like `template friend void f()'. -#: cp/decl.c:5697 -msgid "invalid use of template-id `%D' in declaration of primary template" +#: cp/decl.c:5699 +msgid "invalid use of template-id %qD in declaration of primary template" msgstr "" -#: cp/decl.c:5724 +#: cp/decl.c:5727 msgid "" "default arguments are not allowed in declaration of friend template " -"specialization `%D'" +"specialization %qD" msgstr "" -#: cp/decl.c:5731 +#: cp/decl.c:5735 msgid "" -"`inline' is not allowed in declaration of friend template specialization `%D'" +"% is not allowed in declaration of friend template specialization %" +"qD" msgstr "" -#: cp/decl.c:5797 -msgid "definition of implicitly-declared `%D'" +#: cp/decl.c:5802 +msgid "definition of implicitly-declared %qD" msgstr "" -#: cp/decl.c:5817 cp/decl2.c:718 -msgid "no `%#D' member function declared in class `%T'" +#: cp/decl.c:5822 cp/decl2.c:719 +msgid "no %q#D member function declared in class %qT" msgstr "" #. It's a typedef referring to an anonymous type. -#: cp/decl.c:5974 -msgid "non-local variable `%#D' uses anonymous type" +#: cp/decl.c:5979 +msgid "non-local variable %q#D uses anonymous type" msgstr "" -#: cp/decl.c:5983 -msgid "non-local variable `%#D' uses local type `%T'" +#: cp/decl.c:5988 +msgid "non-local variable %q#D uses local type %qT" msgstr "" -#: cp/decl.c:6099 +#: cp/decl.c:6103 msgid "" -"invalid in-class initialization of static data member of non-integral type `%" -"T'" +"invalid in-class initialization of static data member of non-integral type %" +"qT" msgstr "" -#: cp/decl.c:6108 -msgid "ISO C++ forbids in-class initialization of non-const static member `%D'" +#: cp/decl.c:6113 +msgid "ISO C++ forbids in-class initialization of non-const static member %qD" msgstr "" -#: cp/decl.c:6111 +#: cp/decl.c:6117 msgid "" -"ISO C++ forbids initialization of member constant `%D' of non-integral type `" -"%T'" +"ISO C++ forbids initialization of member constant %qD of non-integral type %" +"qT" msgstr "" -#: cp/decl.c:6130 -msgid "size of array `%D' has non-integral type `%T'" +#: cp/decl.c:6137 +msgid "size of array %qD has non-integral type %qT" msgstr "" -#: cp/decl.c:6132 -msgid "size of array has non-integral type `%T'" +#: cp/decl.c:6139 +msgid "size of array has non-integral type %qT" msgstr "" -#: cp/decl.c:6168 -msgid "size of array `%D' is negative" +#: cp/decl.c:6175 +msgid "size of array %qD is negative" msgstr "" -#: cp/decl.c:6170 +#: cp/decl.c:6177 msgid "size of array is negative" msgstr "" -#: cp/decl.c:6178 -msgid "ISO C++ forbids zero-size array `%D'" +#: cp/decl.c:6185 +msgid "ISO C++ forbids zero-size array %qD" msgstr "" -#: cp/decl.c:6180 +#: cp/decl.c:6187 msgid "ISO C++ forbids zero-size array" msgstr "" -#: cp/decl.c:6187 -msgid "size of array `%D' is not an integral constant-expression" +#: cp/decl.c:6194 +msgid "size of array %qD is not an integral constant-expression" msgstr "" -#: cp/decl.c:6190 +#: cp/decl.c:6197 msgid "size of array is not an integral constant-expression" msgstr "" -#: cp/decl.c:6195 -msgid "ISO C++ forbids variable-size array `%D'" +#: cp/decl.c:6202 +msgid "ISO C++ forbids variable-size array %qD" msgstr "" -#: cp/decl.c:6197 +#: cp/decl.c:6204 msgid "ISO C++ forbids variable-size array" msgstr "" -#: cp/decl.c:6227 +#: cp/decl.c:6234 msgid "overflow in array dimension" msgstr "" -#: cp/decl.c:6302 -msgid "declaration of `%D' as %s" +#: cp/decl.c:6309 +msgid "declaration of %qD as %s" msgstr "" -#: cp/decl.c:6304 +#: cp/decl.c:6311 #, c-format msgid "creating %s" msgstr "" -#: cp/decl.c:6316 +#: cp/decl.c:6323 msgid "" -"declaration of `%D' as multidimensional array must have bounds for all " +"declaration of %qD as multidimensional array must have bounds for all " "dimensions except the first" msgstr "" -#: cp/decl.c:6319 +#: cp/decl.c:6327 msgid "" "multidimensional array must have bounds for all dimensions except the first" msgstr "" -#: cp/decl.c:6353 +#: cp/decl.c:6362 msgid "return type specification for constructor invalid" msgstr "" -#: cp/decl.c:6363 +#: cp/decl.c:6372 msgid "return type specification for destructor invalid" msgstr "" -#: cp/decl.c:6376 -msgid "operator `%T' declared to return `%T'" +#: cp/decl.c:6385 +msgid "operator %qT declared to return %qT" msgstr "" -#: cp/decl.c:6378 -msgid "return type specified for `operator %T'" +#: cp/decl.c:6387 +msgid "return type specified for %" msgstr "" -#: cp/decl.c:6548 -msgid "type `%T' is not derived from type `%T'" +#: cp/decl.c:6557 +msgid "type %qT is not derived from type %qT" msgstr "" -#: cp/decl.c:6593 -msgid "declarator-id missing; using reserved word `%D'" +#: cp/decl.c:6602 +msgid "declarator-id missing; using reserved word %qD" msgstr "" -#: cp/decl.c:6649 -msgid "declaration of `%D' as non-function" +#: cp/decl.c:6658 +msgid "declaration of %qD as non-function" msgstr "" -#: cp/decl.c:6682 +#: cp/decl.c:6691 #, c-format -msgid "two or more data types in declaration of `%s'" -msgstr "" - -#: cp/decl.c:6723 -msgid "`long long long' is too long for GCC" -msgstr "" - -#: cp/decl.c:6725 -msgid "ISO C++ does not support `long long'" +msgid "two or more data types in declaration of %qs" msgstr "" -#: cp/decl.c:6747 -#, c-format -msgid "duplicate `%s'" +#: cp/decl.c:6734 +msgid "ISO C++ does not support %" msgstr "" -#: cp/decl.c:6785 cp/decl.c:6788 +#: cp/decl.c:6794 cp/decl.c:6796 #, c-format -msgid "ISO C++ forbids declaration of `%s' with no type" +msgid "ISO C++ forbids declaration of %qs with no type" msgstr "" -#: cp/decl.c:6814 +#: cp/decl.c:6821 #, c-format -msgid "short, signed or unsigned invalid for `%s'" +msgid "short, signed or unsigned invalid for %qs" msgstr "" -#: cp/decl.c:6816 +#: cp/decl.c:6823 #, c-format -msgid "long, short, signed or unsigned invalid for `%s'" +msgid "long, short, signed or unsigned invalid for %qs" msgstr "" -#: cp/decl.c:6818 +#: cp/decl.c:6825 #, c-format -msgid "long and short specified together for `%s'" +msgid "long and short specified together for %qs" msgstr "" -#: cp/decl.c:6820 +#: cp/decl.c:6827 #, c-format -msgid "long or short specified with char for `%s'" +msgid "long or short specified with char for %qs" msgstr "" -#: cp/decl.c:6822 +#: cp/decl.c:6829 #, c-format -msgid "long or short specified with floating type for `%s'" +msgid "long or short specified with floating type for %qs" msgstr "" -#: cp/decl.c:6824 +#: cp/decl.c:6831 #, c-format -msgid "signed and unsigned given together for `%s'" +msgid "signed and unsigned given together for %qs" msgstr "" -#: cp/decl.c:6830 +#: cp/decl.c:6837 #, c-format -msgid "long, short, signed or unsigned used invalidly for `%s'" +msgid "long, short, signed or unsigned used invalidly for %qs" msgstr "" -#: cp/decl.c:6895 +#: cp/decl.c:6902 #, c-format -msgid "complex invalid for `%s'" +msgid "complex invalid for %qs" msgstr "" -#: cp/decl.c:6924 -msgid "qualifiers are not allowed on declaration of `operator %T'" +#: cp/decl.c:6931 +msgid "qualifiers are not allowed on declaration of %" msgstr "" -#: cp/decl.c:6945 -msgid "member `%D' cannot be declared both virtual and static" +#: cp/decl.c:6952 +msgid "member %qD cannot be declared both virtual and static" msgstr "" -#: cp/decl.c:6953 -msgid "`%T::%D' is not a valid declarator" +#: cp/decl.c:6959 +msgid "%<%T::%D%> is not a valid declarator" msgstr "" -#: cp/decl.c:6961 +#: cp/decl.c:6967 msgid "typedef declaration invalid in parameter declaration" msgstr "" -#: cp/decl.c:6965 +#: cp/decl.c:6971 msgid "storage class specifiers invalid in parameter declarations" msgstr "" -#: cp/decl.c:6972 +#: cp/decl.c:6978 msgid "virtual outside class declaration" msgstr "" -#: cp/decl.c:6985 cp/decl.c:6992 +#: cp/decl.c:6991 #, c-format msgid "multiple storage classes in declaration of `%s'" msgstr "" -#: cp/decl.c:7035 -#, c-format -msgid "storage class specified for %s `%s'" -msgstr "" - -#: cp/decl.c:7042 -#, c-format -msgid "storage class specified for parameter `%s'" -msgstr "" - -#: cp/decl.c:7061 +#: cp/decl.c:6998 #, c-format -msgid "`%s' initialized and declared `extern'" +msgid "multiple storage classes in declaration of %qs" msgstr "" -#: cp/decl.c:7064 +#: cp/decl.c:7041 #, c-format -msgid "`%s' has both `extern' and initializer" -msgstr "" - -#: cp/decl.c:7068 -#, c-format -msgid "nested function `%s' declared `extern'" -msgstr "" - -#: cp/decl.c:7072 -#, c-format -msgid "top-level declaration of `%s' specifies `auto'" +msgid "storage class specified for %s %qs" msgstr "" #: cp/decl.c:7078 -#, c-format -msgid "function-scope `%s' implicitly auto and declared `__thread'" +msgid "top-level declaration of %qs specifies %" msgstr "" -#: cp/decl.c:7084 +#: cp/decl.c:7090 msgid "storage class specifiers invalid in friend function declarations" msgstr "" -#: cp/decl.c:7177 -#, c-format -msgid "`%s' declared as function returning a function" -msgstr "" - -#: cp/decl.c:7182 -#, c-format -msgid "`%s' declared as function returning an array" -msgstr "" - -#: cp/decl.c:7218 +#: cp/decl.c:7224 msgid "destructor cannot be static member function" msgstr "" -#: cp/decl.c:7221 +#: cp/decl.c:7227 msgid "destructors may not be cv-qualified" msgstr "" -#: cp/decl.c:7241 +#: cp/decl.c:7247 msgid "constructor cannot be static member function" msgstr "" -#: cp/decl.c:7244 +#: cp/decl.c:7250 msgid "constructors cannot be declared virtual" msgstr "" -#: cp/decl.c:7249 +#: cp/decl.c:7255 msgid "constructors may not be cv-qualified" msgstr "" -#: cp/decl.c:7269 +#: cp/decl.c:7275 #, c-format -msgid "can't initialize friend function `%s'" +msgid "can't initialize friend function %qs" msgstr "" #. Cannot be both friend and virtual. -#: cp/decl.c:7273 +#: cp/decl.c:7279 msgid "virtual functions cannot be friends" msgstr "" -#: cp/decl.c:7277 +#: cp/decl.c:7283 msgid "friend declaration not in class definition" msgstr "" -#: cp/decl.c:7279 +#: cp/decl.c:7285 #, c-format -msgid "can't define friend function `%s' in a local class definition" +msgid "can't define friend function %qs in a local class definition" msgstr "" -#: cp/decl.c:7291 +#: cp/decl.c:7298 msgid "destructors may not have parameters" msgstr "" -#: cp/decl.c:7309 cp/decl.c:7316 -msgid "cannot declare reference to `%#T'" -msgstr "" - -#: cp/decl.c:7310 -msgid "cannot declare pointer to `%#T'" +#: cp/decl.c:7316 cp/decl.c:7323 +msgid "cannot declare reference to %q#T" msgstr "" -#: cp/decl.c:7318 -msgid "cannot declare pointer to `%#T' member" +#: cp/decl.c:7317 +msgid "cannot declare pointer to %q#T" msgstr "" -#: cp/decl.c:7374 -msgid "template-id `%D' used as a declarator" +#: cp/decl.c:7325 +msgid "cannot declare pointer to %q#T member" msgstr "" -#: cp/decl.c:7425 -msgid "extra qualification `%T::' on member `%s' ignored" +#: cp/decl.c:7381 +msgid "template-id %qD used as a declarator" msgstr "" -#: cp/decl.c:7444 -msgid "cannot declare member function `%T::%s' within `%T'" +#: cp/decl.c:7432 +msgid "extra qualification %<%T::%> on member %qs ignored" msgstr "" -#: cp/decl.c:7459 -msgid "cannot declare member `%T::%s' within `%T'" +#: cp/decl.c:7451 +msgid "cannot declare member function %<%T::%s%> within %<%T%>" msgstr "" -#: cp/decl.c:7487 -#, c-format -msgid "size of array `%s' is too large" +#: cp/decl.c:7466 +msgid "cannot declare member %<%T::%s%> within %qT" msgstr "" -#: cp/decl.c:7498 -msgid "data member may not have variably modified type `%T'" +#: cp/decl.c:7505 +msgid "data member may not have variably modified type %qT" msgstr "" -#: cp/decl.c:7500 -msgid "parameter may not have variably modified type `%T'" +#: cp/decl.c:7507 +msgid "parameter may not have variably modified type %qT" msgstr "" #. [dcl.fct.spec] The explicit specifier shall only be used in #. declarations of constructors within a class definition. -#: cp/decl.c:7508 -msgid "only declarations of constructors can be `explicit'" +#: cp/decl.c:7515 +msgid "only declarations of constructors can be %" msgstr "" -#: cp/decl.c:7516 -#, c-format -msgid "non-member `%s' cannot be declared `mutable'" +#: cp/decl.c:7523 +msgid "non-member %qs cannot be declared %" msgstr "" -#: cp/decl.c:7521 -#, c-format -msgid "non-object member `%s' cannot be declared `mutable'" +#: cp/decl.c:7528 +msgid "non-object member %qs cannot be declared %" msgstr "" -#: cp/decl.c:7527 -#, c-format -msgid "function `%s' cannot be declared `mutable'" +#: cp/decl.c:7534 +msgid "function %qs cannot be declared %" msgstr "" -#: cp/decl.c:7532 -#, c-format -msgid "static `%s' cannot be declared `mutable'" +#: cp/decl.c:7539 +msgid "static %qs cannot be declared %" msgstr "" -#: cp/decl.c:7537 -#, c-format -msgid "const `%s' cannot be declared `mutable'" +#: cp/decl.c:7544 +msgid "const %qs cannot be declared %" msgstr "" -#: cp/decl.c:7555 -msgid "ISO C++ forbids nested type `%D' with same name as enclosing class" +#: cp/decl.c:7562 +msgid "ISO C++ forbids nested type %qD with same name as enclosing class" msgstr "" -#: cp/decl.c:7563 +#: cp/decl.c:7571 msgid "%Jtypedef name may not be a nested-name-specifier" msgstr "" -#: cp/decl.c:7609 +#: cp/decl.c:7617 msgid "%Jinvalid type qualifier for non-member function type" msgstr "" -#: cp/decl.c:7672 +#: cp/decl.c:7680 msgid "type qualifiers specified for friend class declaration" msgstr "" -#: cp/decl.c:7677 -msgid "`inline' specified for friend class declaration" +#: cp/decl.c:7685 +msgid "% specified for friend class declaration" msgstr "" -#: cp/decl.c:7685 +#: cp/decl.c:7693 msgid "template parameters cannot be friends" msgstr "" -#: cp/decl.c:7687 -msgid "friend declaration requires class-key, i.e. `friend class %T::%D'" +#: cp/decl.c:7695 +msgid "friend declaration requires class-key, i.e. %" msgstr "" -#: cp/decl.c:7691 -msgid "friend declaration requires class-key, i.e. `friend %#T'" +#: cp/decl.c:7699 +msgid "friend declaration requires class-key, i.e. %" msgstr "" -#: cp/decl.c:7704 -msgid "trying to make class `%T' a friend of global scope" +#: cp/decl.c:7712 +msgid "trying to make class %qT a friend of global scope" msgstr "" -#: cp/decl.c:7715 +#: cp/decl.c:7723 msgid "invalid qualifiers on non-member function type" msgstr "" -#: cp/decl.c:7734 -msgid "abstract declarator `%T' used as declaration" +#: cp/decl.c:7742 +msgid "abstract declarator %qT used as declaration" msgstr "" -#: cp/decl.c:7746 +#: cp/decl.c:7754 msgid "unnamed variable or field declared void" msgstr "" -#: cp/decl.c:7750 -#, c-format -msgid "variable or field `%s' declared void" -msgstr "" - -#: cp/decl.c:7753 +#: cp/decl.c:7761 msgid "variable or field declared void" msgstr "" -#: cp/decl.c:7763 -msgid "cannot use `::' in parameter declaration" +#: cp/decl.c:7771 +msgid "cannot use %<::%> in parameter declaration" msgstr "" #. Something like struct S { int N::j; }; -#: cp/decl.c:7808 -msgid "invalid use of `::'" +#: cp/decl.c:7816 +msgid "invalid use of %<::%>" msgstr "" -#: cp/decl.c:7820 -msgid "function `%D' cannot be declared friend" +#: cp/decl.c:7828 +msgid "function %qD cannot be declared friend" msgstr "" -#: cp/decl.c:7832 -msgid "can't make `%D' into a method -- not in a class" +#: cp/decl.c:7840 +msgid "can't make %qD into a method -- not in a class" msgstr "" -#: cp/decl.c:7841 -msgid "function `%D' declared virtual inside a union" +#: cp/decl.c:7849 +msgid "function %qD declared virtual inside a union" msgstr "" -#: cp/decl.c:7850 -msgid "`%D' cannot be declared virtual, since it is always static" +#: cp/decl.c:7858 +msgid "%qD cannot be declared virtual, since it is always static" msgstr "" -#: cp/decl.c:7929 -msgid "field `%D' has incomplete type" +#: cp/decl.c:7938 +msgid "field %qD has incomplete type" msgstr "" -#: cp/decl.c:7931 -msgid "name `%T' has incomplete type" +#: cp/decl.c:7940 +msgid "name %qT has incomplete type" msgstr "" -#: cp/decl.c:7940 -msgid " in instantiation of template `%T'" +#: cp/decl.c:7949 +msgid " in instantiation of template %qT" msgstr "" -#: cp/decl.c:7950 +#: cp/decl.c:7959 #, c-format -msgid "`%E' is neither function nor member function; cannot be declared friend" +msgid "%qE is neither function nor member function; cannot be declared friend" msgstr "" -#: cp/decl.c:7961 +#: cp/decl.c:7970 msgid "member functions are implicitly friends of their class" msgstr "" @@ -14423,87 +14379,82 @@ msgstr "" #. the rest of the compiler does not correctly #. handle the initialization unless the member is #. static so we make it static below. -#: cp/decl.c:8001 -msgid "ISO C++ forbids initialization of member `%D'" +#: cp/decl.c:8010 +msgid "ISO C++ forbids initialization of member %qD" msgstr "" -#: cp/decl.c:8003 -msgid "making `%D' static" +#: cp/decl.c:8012 +msgid "making %qD static" msgstr "" -#: cp/decl.c:8061 -#, c-format -msgid "storage class `auto' invalid for function `%s'" +#: cp/decl.c:8070 +msgid "storage class % invalid for function %qs" msgstr "" -#: cp/decl.c:8063 -#, c-format -msgid "storage class `register' invalid for function `%s'" +#: cp/decl.c:8072 +msgid "storage class % invalid for function %qs" msgstr "" -#: cp/decl.c:8065 -#, c-format -msgid "storage class `__thread' invalid for function `%s'" +#: cp/decl.c:8074 +msgid "storage class %<__thread%> invalid for function %qs" msgstr "" -#: cp/decl.c:8076 -#, c-format +#: cp/decl.c:8085 msgid "" -"`static' specified invalid for function `%s' declared out of global scope" +"% specified invalid for function %qs declared out of global scope" msgstr "" -#: cp/decl.c:8078 -#, c-format +#: cp/decl.c:8088 msgid "" -"`inline' specifier invalid for function `%s' declared out of global scope" +"% specifier invalid for function %qs declared out of global scope" msgstr "" -#: cp/decl.c:8085 +#: cp/decl.c:8096 #, c-format -msgid "virtual non-class function `%s'" +msgid "virtual non-class function %qs" msgstr "" -#: cp/decl.c:8116 -msgid "cannot declare member function `%D' to have static linkage" +#: cp/decl.c:8127 +msgid "cannot declare member function %qD to have static linkage" msgstr "" #. FIXME need arm citation -#: cp/decl.c:8122 +#: cp/decl.c:8134 msgid "cannot declare static function inside another function" msgstr "" -#: cp/decl.c:8151 +#: cp/decl.c:8163 msgid "" -"`static' may not be used when defining (as opposed to declaring) a static " +"% may not be used when defining (as opposed to declaring) a static " "data member" msgstr "" -#: cp/decl.c:8157 -msgid "static member `%D' declared `register'" +#: cp/decl.c:8170 +msgid "static member %qD declared %" msgstr "" -#: cp/decl.c:8162 -msgid "cannot explicitly declare member `%#D' to have extern linkage" +#: cp/decl.c:8175 +msgid "cannot explicitly declare member %q#D to have extern linkage" msgstr "" -#: cp/decl.c:8302 -msgid "default argument for `%#D' has type `%T'" +#: cp/decl.c:8316 +msgid "default argument for %q#D has type %qT" msgstr "" -#: cp/decl.c:8305 -msgid "default argument for parameter of type `%T' has type `%T'" +#: cp/decl.c:8319 +msgid "default argument for parameter of type %qT has type %qT" msgstr "" -#: cp/decl.c:8322 -msgid "default argument `%E' uses local variable `%D'" +#: cp/decl.c:8336 +msgid "default argument %qE uses local variable %qD" msgstr "" -#: cp/decl.c:8391 -msgid "parameter `%D' invalidly declared method type" +#: cp/decl.c:8404 +msgid "parameter %qD invalidly declared method type" msgstr "" -#: cp/decl.c:8415 -msgid "parameter `%D' includes %s to array of unknown bound `%T'" +#: cp/decl.c:8428 +msgid "parameter %qD includes %s to array of unknown bound %qT" msgstr "" #. [class.copy] @@ -14521,103 +14472,103 @@ msgstr "" #. or implicitly defined), there's no need to worry about their #. existence. Theoretically, they should never even be #. instantiated, but that's hard to forestall. -#: cp/decl.c:8572 -msgid "invalid constructor; you probably meant `%T (const %T&)'" +#: cp/decl.c:8586 +msgid "invalid constructor; you probably meant %<%T (const %T&)%>" msgstr "" -#: cp/decl.c:8696 -msgid "`%D' may not be declared within a namespace" +#: cp/decl.c:8710 +msgid "%qD may not be declared within a namespace" msgstr "" -#: cp/decl.c:8698 -msgid "`%D' may not be declared as static" +#: cp/decl.c:8712 +msgid "%qD may not be declared as static" msgstr "" -#: cp/decl.c:8718 -msgid "`%D' must be a nonstatic member function" +#: cp/decl.c:8732 +msgid "%qD must be a nonstatic member function" msgstr "" -#: cp/decl.c:8724 +#: cp/decl.c:8738 msgid "" -"`%D' must be either a non-static member function or a non-member function" +"%qD must be either a non-static member function or a non-member function" msgstr "" -#: cp/decl.c:8741 -msgid "`%D' must have an argument of class or enumerated type" +#: cp/decl.c:8756 +msgid "%qD must have an argument of class or enumerated type" msgstr "" -#: cp/decl.c:8776 +#: cp/decl.c:8791 #, c-format msgid "conversion to %s%s will never use a type conversion operator" msgstr "" #. 13.4.0.3 -#: cp/decl.c:8783 +#: cp/decl.c:8799 msgid "ISO C++ prohibits overloading operator ?:" msgstr "" -#: cp/decl.c:8833 -msgid "postfix `%D' must take `int' as its argument" +#: cp/decl.c:8849 +msgid "postfix %qD must take % as its argument" msgstr "" -#: cp/decl.c:8837 -msgid "postfix `%D' must take `int' as its second argument" +#: cp/decl.c:8853 +msgid "postfix %qD must take % as its second argument" msgstr "" -#: cp/decl.c:8844 -msgid "`%D' must take either zero or one argument" +#: cp/decl.c:8860 +msgid "%qD must take either zero or one argument" msgstr "" -#: cp/decl.c:8846 -msgid "`%D' must take either one or two arguments" +#: cp/decl.c:8862 +msgid "%qD must take either one or two arguments" msgstr "" -#: cp/decl.c:8867 -msgid "prefix `%D' should return `%T'" +#: cp/decl.c:8883 +msgid "prefix %qD should return %qT" msgstr "" -#: cp/decl.c:8873 -msgid "postfix `%D' should return `%T'" +#: cp/decl.c:8889 +msgid "postfix %qD should return %qT" msgstr "" -#: cp/decl.c:8882 -msgid "`%D' must take `void'" +#: cp/decl.c:8898 +msgid "%qD must take %" msgstr "" -#: cp/decl.c:8884 cp/decl.c:8892 -msgid "`%D' must take exactly one argument" +#: cp/decl.c:8900 cp/decl.c:8908 +msgid "%qD must take exactly one argument" msgstr "" -#: cp/decl.c:8894 -msgid "`%D' must take exactly two arguments" +#: cp/decl.c:8910 +msgid "%qD must take exactly two arguments" msgstr "" -#: cp/decl.c:8902 -msgid "user-defined `%D' always evaluates both arguments" +#: cp/decl.c:8918 +msgid "user-defined %qD always evaluates both arguments" msgstr "" -#: cp/decl.c:8916 -msgid "`%D' should return by value" +#: cp/decl.c:8932 +msgid "%qD should return by value" msgstr "" -#: cp/decl.c:8928 cp/decl.c:8931 -msgid "`%D' cannot have default arguments" +#: cp/decl.c:8944 cp/decl.c:8947 +msgid "%qD cannot have default arguments" msgstr "" -#: cp/decl.c:8991 -msgid "using typedef-name `%D' after `%s'" +#: cp/decl.c:9007 +msgid "using typedef-name %qD after %qs" msgstr "" -#: cp/decl.c:8997 -msgid "using template type parameter `%T' after `%s'" +#: cp/decl.c:9013 +msgid "using template type parameter %qT after %qs" msgstr "" -#: cp/decl.c:9005 -msgid "`%T' referred to as `%s'" +#: cp/decl.c:9021 +msgid "%qT referred to as %qs" msgstr "" -#: cp/decl.c:9011 -msgid "`%T' referred to as enum" +#: cp/decl.c:9027 +msgid "%qT referred to as enum" msgstr "" #. If a class template appears as elaborated type specifier @@ -14627,47 +14578,47 @@ msgstr "" #. void f(class C); // No template header here #. #. then the required template argument is missing. -#: cp/decl.c:9026 -msgid "template argument required for `%s %T'" +#: cp/decl.c:9042 +msgid "template argument required for %<%s %T%>" msgstr "" -#: cp/decl.c:9171 -msgid "use of enum `%#D' without previous declaration" +#: cp/decl.c:9187 +msgid "use of enum %q#D without previous declaration" msgstr "" -#: cp/decl.c:9189 -msgid "redeclaration of `%T' as a non-template" +#: cp/decl.c:9205 +msgid "redeclaration of %qT as a non-template" msgstr "" -#: cp/decl.c:9282 -msgid "derived union `%T' invalid" +#: cp/decl.c:9298 +msgid "derived union %qT invalid" msgstr "" -#: cp/decl.c:9288 -msgid "Java class '%T' cannot have multiple bases" +#: cp/decl.c:9304 +msgid "Java class %qT cannot have multiple bases" msgstr "" -#: cp/decl.c:9296 -msgid "Java class '%T' cannot have virtual bases" +#: cp/decl.c:9312 +msgid "Java class %qT cannot have virtual bases" msgstr "" -#: cp/decl.c:9315 -msgid "base type `%T' fails to be a struct or class type" +#: cp/decl.c:9331 +msgid "base type %qT fails to be a struct or class type" msgstr "" -#: cp/decl.c:9348 -msgid "recursive type `%T' undefined" +#: cp/decl.c:9364 +msgid "recursive type %qT undefined" msgstr "" -#: cp/decl.c:9350 -msgid "duplicate base type `%T' invalid" +#: cp/decl.c:9366 +msgid "duplicate base type %qT invalid" msgstr "" -#: cp/decl.c:9418 -msgid "multiple definition of `%#T'" +#: cp/decl.c:9434 +msgid "multiple definition of %q#T" msgstr "" -#: cp/decl.c:9419 +#: cp/decl.c:9435 msgid "%Jprevious definition here" msgstr "" @@ -14675,39 +14626,39 @@ msgstr "" #. #. IF no integral type can represent all the enumerator values, the #. enumeration is ill-formed. -#: cp/decl.c:9544 -msgid "no integral type can represent all of the enumerator values for `%T'" +#: cp/decl.c:9560 +msgid "no integral type can represent all of the enumerator values for %qT" msgstr "" -#: cp/decl.c:9645 -msgid "enumerator value for `%D' not integer constant" +#: cp/decl.c:9661 +msgid "enumerator value for %qD not integer constant" msgstr "" -#: cp/decl.c:9672 -msgid "overflow in enumeration values at `%D'" +#: cp/decl.c:9688 +msgid "overflow in enumeration values at %qD" msgstr "" -#: cp/decl.c:9743 -msgid "return type `%#T' is incomplete" +#: cp/decl.c:9759 +msgid "return type %q#T is incomplete" msgstr "" -#: cp/decl.c:9858 cp/typeck.c:6031 -msgid "`operator=' should return a reference to `*this'" +#: cp/decl.c:9874 +msgid "% should return a reference to %<*this%>" msgstr "" -#: cp/decl.c:10182 -msgid "parameter `%D' declared void" +#: cp/decl.c:10198 +msgid "parameter %qD declared void" msgstr "" -#: cp/decl.c:10664 +#: cp/decl.c:10680 msgid "invalid member function declaration" msgstr "" -#: cp/decl.c:10679 -msgid "`%D' is already defined in class `%T'" +#: cp/decl.c:10695 +msgid "%qD is already defined in class %qT" msgstr "" -#: cp/decl.c:10890 +#: cp/decl.c:10906 msgid "static member function `%#D' declared with type qualifiers" msgstr "" @@ -14720,72 +14671,72 @@ msgid "ambiguous conversion for array subscript" msgstr "" #: cp/decl2.c:381 -msgid "invalid types `%T[%T]' for array subscript" +msgid "invalid types %<%T[%T]%> for array subscript" msgstr "" #: cp/decl2.c:426 -msgid "deleting array `%#D'" +msgid "deleting array %q#D" msgstr "" #: cp/decl2.c:432 -msgid "type `%#T' argument given to `delete', expected pointer" +msgid "type %q#T argument given to %, expected pointer" msgstr "" #: cp/decl2.c:444 msgid "" -"cannot delete a function. Only pointer-to-objects are valid arguments to " -"`delete'" +"cannot delete a function. Only pointer-to-objects are valid arguments to %" +"" msgstr "" -#: cp/decl2.c:451 -msgid "deleting `%T' is undefined" +#: cp/decl2.c:452 +msgid "deleting %qT is undefined" msgstr "" #. 14.5.2.2 [temp.mem] #. #. A local class shall not have member templates. -#: cp/decl2.c:487 -msgid "invalid declaration of member template `%#D' in local class" +#: cp/decl2.c:488 +msgid "invalid declaration of member template %q#D in local class" msgstr "" -#: cp/decl2.c:496 -msgid "invalid use of `virtual' in template declaration of `%#D'" +#: cp/decl2.c:497 +msgid "invalid use of % in template declaration of %q#D" msgstr "" -#: cp/decl2.c:506 cp/pt.c:2905 -msgid "template declaration of `%#D'" +#: cp/decl2.c:507 cp/pt.c:2902 +msgid "template declaration of %q#D" msgstr "" -#: cp/decl2.c:555 -msgid "Java method '%D' has non-Java return type `%T'" +#: cp/decl2.c:556 +msgid "Java method %qD has non-Java return type %qT" msgstr "" -#: cp/decl2.c:571 -msgid "Java method '%D' has non-Java parameter type `%T'" +#: cp/decl2.c:572 +msgid "Java method %qD has non-Java parameter type %qT" msgstr "" -#: cp/decl2.c:680 +#: cp/decl2.c:681 msgid "prototype for `%#D' does not match any in class `%T'" msgstr "" -#: cp/decl2.c:781 -msgid "local class `%#T' shall not have static data member `%#D'" +#: cp/decl2.c:782 +msgid "local class %q#T shall not have static data member %q#D" msgstr "" -#: cp/decl2.c:789 +#: cp/decl2.c:790 msgid "initializer invalid for static member with constructor" msgstr "" -#: cp/decl2.c:792 +#: cp/decl2.c:793 msgid "(an out of class initialization is required)" msgstr "" -#: cp/decl2.c:873 -msgid "member `%D' conflicts with virtual function table field name" +#: cp/decl2.c:874 +msgid "member %qD conflicts with virtual function table field name" msgstr "" -#: cp/decl2.c:890 -msgid "`%D' is already defined in `%T'" +#: cp/decl2.c:891 +msgid "%qD is already defined in %qT" msgstr "" #: cp/decl2.c:937 @@ -14797,27 +14748,27 @@ msgid "`asm' specifiers are not permitted on non-static data members" msgstr "" #: cp/decl2.c:1011 -msgid "cannot declare `%D' to be a bit-field type" +msgid "cannot declare %qD to be a bit-field type" msgstr "" #: cp/decl2.c:1021 -msgid "cannot declare bit-field `%D' with function type" +msgid "cannot declare bit-field %qD with function type" msgstr "" #: cp/decl2.c:1028 -msgid "`%D' is already defined in the class %T" +msgid "%qD is already defined in the class %qT" msgstr "" #: cp/decl2.c:1035 -msgid "static member `%D' cannot be a bit-field" +msgid "static member %qD cannot be a bit-field" msgstr "" #: cp/decl2.c:1094 -msgid "initializer specified for non-member function `%D'" +msgid "initializer specified for non-member function %qD" msgstr "" #: cp/decl2.c:1098 -msgid "invalid initializer for virtual method `%D'" +msgid "invalid initializer for virtual method %qD" msgstr "" #: cp/decl2.c:1130 @@ -14832,48 +14783,48 @@ msgstr "" msgid "anonymous union with no members" msgstr "" -#: cp/decl2.c:1242 -msgid "`operator new' must return type `%T'" +#: cp/decl2.c:1244 +msgid "% must return type %qT" msgstr "" -#: cp/decl2.c:1250 -msgid "`operator new' takes type `size_t' (`%T') as first parameter" +#: cp/decl2.c:1253 +msgid "% takes type % (%qT) as first parameter" msgstr "" -#: cp/decl2.c:1276 -msgid "`operator delete' must return type `%T'" +#: cp/decl2.c:1282 +msgid "% must return type %qT" msgstr "" -#: cp/decl2.c:1284 -msgid "`operator delete' takes type `%T' as first parameter" +#: cp/decl2.c:1291 +msgid "% takes type %qT as first parameter" msgstr "" -#: cp/decl2.c:3020 +#: cp/decl2.c:3028 msgid "inline function `%D' used but never defined" msgstr "" -#: cp/decl2.c:3170 -msgid "default argument missing for parameter %P of `%+#D'" +#: cp/decl2.c:3178 +msgid "default argument missing for parameter %P of %q+#D" msgstr "" #. damn ICE suppression -#: cp/error.c:2368 +#: cp/error.c:2373 #, c-format msgid "unexpected letter `%c' in locate_error\n" msgstr "" #. Can't throw a reference. #: cp/except.c:239 -msgid "type `%T' is disallowed in Java `throw' or `catch'" +msgid "type %qT is disallowed in Java % or %" msgstr "" #: cp/except.c:250 -msgid "call to Java `catch' or `throw' with `jthrowable' undefined" +msgid "call to Java % or % with % undefined" msgstr "" #. Thrown object must be a Throwable. #: cp/except.c:257 -msgid "type `%T' is not derived from `java::lang::Throwable'" +msgid "type %qT is not derived from %" msgstr "" #: cp/except.c:320 @@ -14884,8 +14835,8 @@ msgstr "" msgid "throwing NULL, which has integral, not pointer type" msgstr "" -#: cp/except.c:599 cp/init.c:1876 -msgid "`%D' should never be overloaded" +#: cp/except.c:599 cp/init.c:1875 +msgid "%qD should never be overloaded" msgstr "" #: cp/except.c:666 @@ -14894,73 +14845,72 @@ msgstr "" #: cp/except.c:810 msgid "" -"expression '%E' of abstract class type '%T' cannot be used in throw-" -"expression" +"expression %qE of abstract class type %qT cannot be used in throw-expression" msgstr "" -#: cp/except.c:894 -msgid "%Hexception of type `%T' will be caught" +#: cp/except.c:895 +msgid "%Hexception of type %qT will be caught" msgstr "" -#: cp/except.c:896 -msgid "%H by earlier handler for `%T'" +#: cp/except.c:897 +msgid "%H by earlier handler for %qT" msgstr "" -#: cp/except.c:926 -msgid "%H`...' handler must be the last handler for its try block" +#: cp/except.c:927 +msgid "%H%<...%> handler must be the last handler for its try block" msgstr "" #: cp/friend.c:152 -msgid "`%D' is already a friend of class `%T'" +msgid "%qD is already a friend of class %qT" msgstr "" #: cp/friend.c:204 -msgid "invalid type `%T' declared `friend'" +msgid "invalid type %qT declared %" msgstr "" #. [temp.friend] #. Friend declarations shall not declare partial #. specializations. #: cp/friend.c:220 -msgid "partial specialization `%T' declared `friend'" +msgid "partial specialization %qT declared %" msgstr "" #: cp/friend.c:230 -msgid "class `%T' is implicitly friends with itself" +msgid "class %qT is implicitly friends with itself" msgstr "" #. template friend typename S::X; #: cp/friend.c:248 -msgid "typename type `%#T' declared `friend'" +msgid "typename type %q#T declared %" msgstr "" #. template friend class T; #: cp/friend.c:254 -msgid "template parameter type `%T' declared `friend'" +msgid "template parameter type %qT declared %" msgstr "" #. template friend class A; where A is not a template #: cp/friend.c:260 -msgid "`%#T' is not a template" +msgid "%q#T is not a template" msgstr "" #: cp/friend.c:279 -msgid "`%D' is already a friend of `%T'" +msgid "%qD is already a friend of %qT" msgstr "" -#: cp/friend.c:289 -msgid "`%T' is already a friend of `%T'" +#: cp/friend.c:288 +msgid "%qT is already a friend of %qT" msgstr "" -#: cp/friend.c:414 -msgid "member `%D' declared as friend before type `%T' defined" +#: cp/friend.c:412 +msgid "member %qD declared as friend before type %qT defined" msgstr "" -#: cp/friend.c:470 -msgid "friend declaration `%#D' declares a non-template function" +#: cp/friend.c:468 +msgid "friend declaration %q#D declares a non-template function" msgstr "" -#: cp/friend.c:473 +#: cp/friend.c:472 msgid "" "(if this is not what you intended, make sure the function template has " "already been declared and add <> after the function name here) -Wno-non-" @@ -14989,19 +14939,19 @@ msgid "%Juninitialized member %qD with % type %qT" msgstr "" #: cp/init.c:517 -msgid "`%D' will be initialized after" +msgid "%qD will be initialized after" msgstr "" #: cp/init.c:520 -msgid "base `%T' will be initialized after" +msgid "base %qT will be initialized after" msgstr "" #: cp/init.c:523 -msgid " `%#D'" +msgid " %q#D" msgstr "" #: cp/init.c:525 -msgid " base `%T'" +msgid " base %qT" msgstr "" #: cp/init.c:526 @@ -15022,40 +14972,40 @@ msgstr "" #: cp/init.c:669 msgid "" -"%Jbase class `%#T' should be explicitly initialized in the copy constructor" +"%Jbase class %q#T should be explicitly initialized in the copy constructor" msgstr "" #: cp/init.c:893 cp/init.c:912 -msgid "class `%T' does not have any field named `%D'" +msgid "class %qT does not have any field named %qD" msgstr "" #: cp/init.c:899 msgid "" -"`%#D' is a static data member; it can only be initialized at its definition" +"%q#D is a static data member; it can only be initialized at its definition" msgstr "" #: cp/init.c:906 -msgid "`%#D' is not a non-static data member of `%T'" +msgid "%q#D is not a non-static data member of %qT" msgstr "" #: cp/init.c:945 -msgid "unnamed initializer for `%T', which has no base classes" +msgid "unnamed initializer for %qT, which has no base classes" msgstr "" #: cp/init.c:953 -msgid "unnamed initializer for `%T', which uses multiple inheritance" +msgid "unnamed initializer for %qT, which uses multiple inheritance" msgstr "" #: cp/init.c:999 -msgid "'%D' is both a direct base and an indirect virtual base" +msgid "%qD is both a direct base and an indirect virtual base" msgstr "" #: cp/init.c:1007 -msgid "type `%D' is not a direct or virtual base of `%T'" +msgid "type %qD is not a direct or virtual base of %qT" msgstr "" #: cp/init.c:1010 -msgid "type `%D' is not a direct base of `%T'" +msgid "type %qD is not a direct base of %qT" msgstr "" #: cp/init.c:1090 @@ -15063,93 +15013,93 @@ msgid "bad array initializer" msgstr "" #: cp/init.c:1289 -msgid "`%T' is not an aggregate type" +msgid "%qT is not an aggregate type" msgstr "" -#: cp/init.c:1381 cp/typeck.c:1839 -msgid "qualified type `%T' does not match destructor name `~%T'" +#: cp/init.c:1381 +msgid "qualified type %qT does not match destructor name %<~%T%>" msgstr "" #: cp/init.c:1389 -msgid "incomplete type `%T' does not have member `%D'" +msgid "incomplete type %qT does not have member %qD" msgstr "" -#: cp/init.c:1409 -msgid "`%D' is not a member of type `%T'" +#: cp/init.c:1408 +msgid "%qD is not a member of type %qT" msgstr "" -#: cp/init.c:1436 -msgid "invalid pointer to bit-field `%D'" +#: cp/init.c:1435 +msgid "invalid pointer to bit-field %qD" msgstr "" -#: cp/init.c:1538 -msgid "invalid use of non-static member function `%D'" +#: cp/init.c:1537 +msgid "invalid use of non-static member function %qD" msgstr "" -#: cp/init.c:1544 cp/semantics.c:1268 -msgid "invalid use of non-static data member `%D'" +#: cp/init.c:1543 +msgid "invalid use of non-static data member %qD" msgstr "" -#: cp/init.c:1661 +#: cp/init.c:1660 msgid "new cannot be applied to a reference type" msgstr "" -#: cp/init.c:1667 +#: cp/init.c:1666 msgid "new cannot be applied to a function type" msgstr "" -#: cp/init.c:1699 -msgid "call to Java constructor, while `jclass' undefined" +#: cp/init.c:1698 +msgid "call to Java constructor, while % undefined" msgstr "" -#: cp/init.c:1715 +#: cp/init.c:1714 msgid "can't find class$" msgstr "" -#: cp/init.c:1828 -msgid "invalid type `void' for new" +#: cp/init.c:1827 +msgid "invalid type % for new" msgstr "" -#: cp/init.c:1838 -msgid "uninitialized const in `new' of `%#T'" +#: cp/init.c:1837 +msgid "uninitialized const in % of %q#T" msgstr "" -#: cp/init.c:1871 +#: cp/init.c:1870 #, c-format -msgid "call to Java constructor with `%s' undefined" +msgid "call to Java constructor with %qs undefined" msgstr "" -#: cp/init.c:1911 -msgid "request for member `%D' is ambiguous" +#: cp/init.c:1910 +msgid "request for member %qD is ambiguous" msgstr "" -#: cp/init.c:2044 +#: cp/init.c:2043 msgid "ISO C++ forbids initialization in array new" msgstr "" -#: cp/init.c:2514 +#: cp/init.c:2513 msgid "initializer ends prematurely" msgstr "" -#: cp/init.c:2567 +#: cp/init.c:2566 msgid "cannot initialize multi-dimensional array with initializer" msgstr "" -#: cp/init.c:2726 +#: cp/init.c:2725 msgid "possible problem detected in invocation of delete operator:" msgstr "" -#: cp/init.c:2729 +#: cp/init.c:2728 msgid "" "neither the destructor nor the class-specific operator delete will be " "called, even if they are declared when the class is defined." msgstr "" -#: cp/init.c:2750 +#: cp/init.c:2749 msgid "unknown array size in delete" msgstr "" -#: cp/init.c:3010 +#: cp/init.c:3009 msgid "type to vector delete is neither pointer or array type" msgstr "" @@ -15177,11 +15127,11 @@ msgid "junk at end of #pragma GCC java_exceptions" msgstr "" #: cp/lex.c:569 -msgid "`%D' not defined" +msgid "%qD not defined" msgstr "" #: cp/lex.c:573 -msgid "`%D' was not declared in this scope" +msgid "%qD was not declared in this scope" msgstr "" #. In a template, it is invalid to write "f()" or "f(3)" if no @@ -15196,8 +15146,8 @@ msgstr "" #. be kept in synch. #: cp/lex.c:610 msgid "" -"there are no arguments to `%D' that depend on a template parameter, so a " -"declaration of `%D' must be available" +"there are no arguments to %qD that depend on a template parameter, so a " +"declaration of %qD must be available" msgstr "" #: cp/lex.c:619 @@ -15223,20 +15173,19 @@ msgid "the mangled name of `%D' will change in a future version of GCC" msgstr "" #: cp/method.c:443 -msgid "generic thunk code fails for method `%#D' which uses `...'" +msgid "generic thunk code fails for method %q#D which uses %<...%>" msgstr "" #: cp/method.c:652 -msgid "non-static const member `%#D', can't use default assignment operator" +msgid "non-static const member %q#D, can't use default assignment operator" msgstr "" -#: cp/method.c:657 -msgid "" -"non-static reference member `%#D', can't use default assignment operator" +#: cp/method.c:658 +msgid "non-static reference member %q#D, can't use default assignment operator" msgstr "" #: cp/name-lookup.c:762 -msgid "redeclaration of `wchar_t' as `%T'" +msgid "redeclaration of % as %qT" msgstr "" #. A redeclaration of main, but not a duplicate of the @@ -15246,68 +15195,68 @@ msgstr "" #. #. This function shall not be overloaded. #: cp/name-lookup.c:794 -msgid "invalid redeclaration of `%D'" +msgid "invalid redeclaration of %qD" msgstr "" #: cp/name-lookup.c:795 -msgid "as `%D'" +msgid "as %qD" msgstr "" #: cp/name-lookup.c:883 -msgid "type mismatch with previous external decl of `%#D'" +msgid "type mismatch with previous external decl of %q#D" msgstr "" #: cp/name-lookup.c:884 -msgid "previous external decl of `%#D'" +msgid "previous external decl of %q#D" msgstr "" #: cp/name-lookup.c:966 -msgid "extern declaration of `%#D' doesn't match" +msgid "extern declaration of %q#D doesn't match" msgstr "" #: cp/name-lookup.c:967 -msgid "global declaration `%#D'" +msgid "global declaration %q#D" msgstr "" #: cp/name-lookup.c:1003 cp/name-lookup.c:1010 -msgid "declaration of '%#D' shadows a parameter" +msgid "declaration of %q#D shadows a parameter" msgstr "" #. Location of previous decl is not useful in this case. #: cp/name-lookup.c:1035 -msgid "declaration of '%D' shadows a member of 'this'" +msgid "declaration of %qD shadows a member of 'this'" msgstr "" #: cp/name-lookup.c:1041 -msgid "declaration of '%D' shadows a previous local" +msgid "declaration of %qD shadows a previous local" msgstr "" #: cp/name-lookup.c:1048 -msgid "declaration of '%D' shadows a global declaration" +msgid "declaration of %qD shadows a global declaration" msgstr "" #: cp/name-lookup.c:1164 -msgid "name lookup of `%D' changed" +msgid "name lookup of %qD changed" msgstr "" -#: cp/name-lookup.c:1166 -msgid " matches this `%D' under ISO standard rules" +#: cp/name-lookup.c:1165 +msgid " matches this %qD under ISO standard rules" msgstr "" -#: cp/name-lookup.c:1168 -msgid " matches this `%D' under old rules" +#: cp/name-lookup.c:1167 +msgid " matches this %qD under old rules" msgstr "" -#: cp/name-lookup.c:1186 cp/name-lookup.c:1193 -msgid "name lookup of `%D' changed for new ISO `for' scoping" +#: cp/name-lookup.c:1185 cp/name-lookup.c:1193 +msgid "name lookup of %qD changed for new ISO % scoping" msgstr "" -#: cp/name-lookup.c:1188 -msgid " cannot use obsolete binding at `%D' because it has a destructor" +#: cp/name-lookup.c:1187 +msgid " cannot use obsolete binding at %qD because it has a destructor" msgstr "" #: cp/name-lookup.c:1195 -msgid " using obsolete binding at `%D'" +msgid " using obsolete binding at %qD" msgstr "" #: cp/name-lookup.c:1248 @@ -15329,83 +15278,83 @@ msgid "`%#D' hides constructor for `%#T'" msgstr "" #: cp/name-lookup.c:2026 -msgid "`%#D' conflicts with previous using declaration `%#D'" +msgid "%q#D conflicts with previous using declaration %q#D" msgstr "" #: cp/name-lookup.c:2038 -msgid "previous non-function declaration `%#D'" +msgid "previous non-function declaration %q#D" msgstr "" #: cp/name-lookup.c:2039 -msgid "conflicts with function declaration `%#D'" +msgid "conflicts with function declaration %q#D" msgstr "" #. It's a nested name with template parameter dependent scope. #. This can only be using-declaration for class member. -#: cp/name-lookup.c:2117 cp/name-lookup.c:2141 cp/name-lookup.c:3386 -msgid "`%T' is not a namespace" +#: cp/name-lookup.c:2117 cp/name-lookup.c:2142 cp/name-lookup.c:3386 +msgid "%qT is not a namespace" msgstr "" #. 7.3.3/5 #. A using-declaration shall not name a template-id. #: cp/name-lookup.c:2127 -msgid "a using-declaration cannot specify a template-id. Try `using %D'" +msgid "a using-declaration cannot specify a template-id. Try %" msgstr "" -#: cp/name-lookup.c:2133 -msgid "namespace `%D' not allowed in using-declaration" +#: cp/name-lookup.c:2134 +msgid "namespace %qD not allowed in using-declaration" msgstr "" -#: cp/name-lookup.c:2169 -msgid "`%D' not declared" +#: cp/name-lookup.c:2170 +msgid "%qD not declared" msgstr "" #. If the OLD_FN was really declared, the #. declarations don't match. -#: cp/name-lookup.c:2181 cp/name-lookup.c:2223 cp/name-lookup.c:2260 -msgid "`%D' is already declared in this scope" +#: cp/name-lookup.c:2182 cp/name-lookup.c:2224 cp/name-lookup.c:2261 +msgid "%qD is already declared in this scope" msgstr "" -#: cp/name-lookup.c:2266 -msgid "using declaration `%D' introduced ambiguous type `%T'" +#: cp/name-lookup.c:2267 +msgid "using declaration %qD introduced ambiguous type %qT" msgstr "" #. Definition isn't the kind we were looking for. -#: cp/name-lookup.c:2434 cp/name-lookup.c:2453 -msgid "`%#D' redeclared as %C" +#: cp/name-lookup.c:2435 cp/name-lookup.c:2454 +msgid "%q#D redeclared as %C" msgstr "" -#: cp/name-lookup.c:2821 -msgid "`%D' has the same name as the class in which it is declared" +#: cp/name-lookup.c:2822 +msgid "%qD has the same name as the class in which it is declared" msgstr "" -#: cp/name-lookup.c:2916 +#: cp/name-lookup.c:2917 msgid "using-declaration for non-member at class scope" msgstr "" -#: cp/name-lookup.c:2923 +#: cp/name-lookup.c:2924 msgid "using-declaration cannot name destructor" msgstr "" -#: cp/name-lookup.c:3002 +#: cp/name-lookup.c:3003 msgid "declaration of `%D' not in a namespace surrounding `%D'" msgstr "" -#: cp/name-lookup.c:3042 -msgid "`%D' should have been declared inside `%D'" +#: cp/name-lookup.c:3043 +msgid "%qD should have been declared inside %qD" msgstr "" #: cp/name-lookup.c:3105 -msgid "namespace alias `%D' not allowed here, assuming `%D'" +msgid "namespace alias %qD not allowed here, assuming %qD" msgstr "" #. The parser did not find it, so it's not there. #: cp/name-lookup.c:3220 -msgid "unknown namespace `%D'" +msgid "unknown namespace %qD" msgstr "" #: cp/name-lookup.c:3380 -msgid "namespace `%T' undeclared" +msgid "namespace %qT undeclared" msgstr "" #: cp/name-lookup.c:3424 @@ -15413,60 +15362,60 @@ msgid "strong using only meaningful at namespace scope" msgstr "" #: cp/name-lookup.c:3431 -msgid "`%D' attribute directive ignored" +msgid "%qD attribute directive ignored" msgstr "" #: cp/name-lookup.c:3565 -msgid "use of `%D' is ambiguous" +msgid "use of %qD is ambiguous" msgstr "" #: cp/name-lookup.c:3566 -msgid " first declared as `%#D' here" +msgid " first declared as %q#D here" msgstr "" -#: cp/name-lookup.c:3569 -msgid " also declared as `%#D' here" +#: cp/name-lookup.c:3568 +msgid " also declared as %q#D here" msgstr "" -#: cp/name-lookup.c:3584 -msgid "`%D' denotes an ambiguous type" +#: cp/name-lookup.c:3583 +msgid "%qD denotes an ambiguous type" msgstr "" -#: cp/name-lookup.c:3585 +#: cp/name-lookup.c:3584 msgid "%J first type here" msgstr "" -#: cp/name-lookup.c:3586 +#: cp/name-lookup.c:3585 msgid "%J other type here" msgstr "" #. This happens for A::B where B is a template, and there are no #. template arguments. -#: cp/name-lookup.c:3650 cp/typeck.c:1813 -msgid "invalid use of `%D'" +#: cp/name-lookup.c:3649 +msgid "invalid use of %qD" msgstr "" -#: cp/name-lookup.c:3690 -msgid "`%D::%D' is not a template" +#: cp/name-lookup.c:3689 +msgid "%<%D::%D%> is not a template" msgstr "" -#: cp/name-lookup.c:3707 -msgid "`%D' undeclared in namespace `%D'" +#: cp/name-lookup.c:3705 +msgid "%qD undeclared in namespace %qD" msgstr "" -#: cp/name-lookup.c:4244 -msgid "`%D' is not a function," +#: cp/name-lookup.c:4242 +msgid "%qD is not a function," msgstr "" -#: cp/name-lookup.c:4245 -msgid " conflict with `%D'" +#: cp/name-lookup.c:4243 +msgid " conflict with %qD" msgstr "" -#: cp/name-lookup.c:5008 +#: cp/name-lookup.c:5006 msgid "XXX entering pop_everything ()\n" msgstr "" -#: cp/name-lookup.c:5017 +#: cp/name-lookup.c:5015 msgid "XXX leaving pop_everything ()\n" msgstr "" @@ -15475,19 +15424,19 @@ msgid "invalid token" msgstr "" #: cp/parser.c:1875 -msgid "`%D::%D' has not been declared" +msgid "%<%D::%D%> has not been declared" msgstr "" -#: cp/parser.c:1878 cp/semantics.c:2318 -msgid "`::%D' has not been declared" +#: cp/parser.c:1878 +msgid "%<::%D%> has not been declared" msgstr "" #: cp/parser.c:1881 -msgid "request for member `%D' in non-class type `%T'" +msgid "request for member %qD in non-class type %qT" msgstr "" #: cp/parser.c:1884 -msgid "`%T::%D' has not been declared" +msgid "%<%T::%D%> has not been declared" msgstr "" #: cp/parser.c:1887 @@ -15495,28 +15444,28 @@ msgid "`%D' has not been declared" msgstr "" #: cp/parser.c:1890 -msgid "`%D::%D' %s" +msgid "%<%D::%D%> %s" msgstr "" #: cp/parser.c:1892 -msgid "`::%D' %s" +msgid "%<::%D%> %s" msgstr "" #: cp/parser.c:1894 -msgid "`%D' %s" +msgid "%qD %s" msgstr "" #: cp/parser.c:1947 msgid "new types may not be defined in a return type" msgstr "" -#: cp/parser.c:1965 cp/pt.c:4277 -msgid "`%T' is not a template" +#: cp/parser.c:1965 cp/pt.c:4279 +msgid "%qT is not a template" msgstr "" #: cp/parser.c:1967 #, c-format -msgid "`%E' is not a template" +msgid "%qE is not a template" msgstr "" #: cp/parser.c:1969 @@ -15530,13 +15479,13 @@ msgstr "" #: cp/parser.c:2034 #, c-format -msgid "invalid use of template-name `%E' without an argument list" +msgid "invalid use of template-name %qE without an argument list" msgstr "" #. Issue an error message. #: cp/parser.c:2039 #, c-format -msgid "`%E' does not name a type" +msgid "%qE does not name a type" msgstr "" #: cp/parser.c:2070 @@ -15545,244 +15494,238 @@ msgstr "" #: cp/parser.c:2085 #, c-format -msgid "`%E' in namespace `%E' does not name a type" +msgid "%qE in namespace %qE does not name a type" msgstr "" #: cp/parser.c:2088 -msgid "`%E' in class `%T' does not name a type" +msgid "q%E in class %qT does not name a type" msgstr "" -#: cp/parser.c:2759 +#: cp/parser.c:2758 msgid "ISO C++ forbids braced-groups within expressions" msgstr "" -#: cp/parser.c:2768 +#: cp/parser.c:2767 msgid "statement-expressions are allowed only inside functions" msgstr "" -#: cp/parser.c:2819 -msgid "`this' may not be used in this context" +#: cp/parser.c:2818 +msgid "% may not be used in this context" msgstr "" -#: cp/parser.c:2954 -msgid "local variable `%D' may not appear in this context" +#: cp/parser.c:2953 +msgid "local variable %qD may not appear in this context" msgstr "" -#: cp/parser.c:3319 -msgid "typedef-name `%D' used as destructor declarator" +#: cp/parser.c:3318 +msgid "typedef-name %qD used as destructor declarator" msgstr "" -#: cp/parser.c:3978 +#: cp/parser.c:3976 msgid "ISO C++ forbids compound-literals" msgstr "" -#: cp/parser.c:4845 +#: cp/parser.c:4861 msgid "array bound forbidden after parenthesized type-id" msgstr "" -#: cp/parser.c:4846 +#: cp/parser.c:4862 msgid "try removing the parentheses around the type-id" msgstr "" -#: cp/parser.c:4952 +#: cp/parser.c:4968 msgid "size in array new must have integral type" msgstr "" -#: cp/parser.c:4955 +#: cp/parser.c:4971 msgid "zero size array reserves no space" msgstr "" -#: cp/parser.c:5054 +#: cp/parser.c:5070 msgid "expression in new-declarator must have integral or enumeration type" msgstr "" -#: cp/parser.c:5235 +#: cp/parser.c:5252 msgid "use of old-style cast" msgstr "" -#: cp/parser.c:5990 +#: cp/parser.c:6007 #, c-format -msgid "case label `%E' not within a switch statement" +msgid "case label %qE not within a switch statement" msgstr "" -#: cp/parser.c:6533 +#: cp/parser.c:6550 msgid "ISO C++ forbids computed gotos" msgstr "" -#: cp/parser.c:6658 +#: cp/parser.c:6675 msgid "extra %<;%>" msgstr "" -#: cp/parser.c:6976 +#: cp/parser.c:6993 msgid "mixing declarations and function-definitions is forbidden" msgstr "" -#: cp/parser.c:7108 -msgid "duplicate `friend'" -msgstr "" - -#: cp/parser.c:7160 -msgid "`__thread' before `static'" -msgstr "" - -#: cp/parser.c:7170 -msgid "`__thread' before `extern'" +#: cp/parser.c:7125 +msgid "duplicate %" msgstr "" -#: cp/parser.c:7277 +#: cp/parser.c:7294 msgid "class definition may not be declared a friend" msgstr "" -#: cp/parser.c:7590 +#: cp/parser.c:7607 msgid "only constructors take base initializers" msgstr "" -#: cp/parser.c:7641 +#: cp/parser.c:7658 msgid "anachronistic old-style base class initializer" msgstr "" -#: cp/parser.c:7682 +#: cp/parser.c:7699 msgid "" -"keyword `typename' not allowed in this context (a qualified member " +"keyword % not allowed in this context (a qualified member " "initializer is implicitly a type)" msgstr "" #. Warn that we do not support `export'. -#: cp/parser.c:8044 -msgid "keyword `export' not implemented, and will be ignored" +#: cp/parser.c:8061 +msgid "keyword % not implemented, and will be ignored" msgstr "" #. Otherwise, emit an error about the invalid digraph, but continue #. parsing because we got our argument list. -#: cp/parser.c:8417 -msgid "`<::' cannot begin a template-argument list" +#: cp/parser.c:8434 +msgid "%<<::%> cannot begin a template-argument list" msgstr "" -#: cp/parser.c:8418 +#: cp/parser.c:8435 msgid "" -"`<:' is an alternate spelling for `['. Insert whitespace between `<' and `::'" +"%<<:%> is an alternate spelling for %<[%>. Insert whitespace between %<<%> " +"and %<::%>" msgstr "" -#: cp/parser.c:8425 -msgid "(if you use `-fpermissive' G++ will accept your code)" +#: cp/parser.c:8442 +msgid "(if you use -fpermissive G++ will accept your code)" msgstr "" #. Explain what went wrong. -#: cp/parser.c:8600 -msgid "non-template `%D' used as template" +#: cp/parser.c:8617 +msgid "non-template %qD used as template" msgstr "" -#: cp/parser.c:8601 -msgid "use `%T::template %D' to indicate that it is a template" +#: cp/parser.c:8618 +msgid "use %<%T::template %D%> to indicate that it is a template" msgstr "" -#: cp/parser.c:9628 -msgid "using `typename' outside of template" +#: cp/parser.c:9645 +msgid "using % outside of template" msgstr "" -#: cp/parser.c:9751 +#: cp/parser.c:9768 msgid "expected type-name" msgstr "" -#: cp/parser.c:9810 +#: cp/parser.c:9827 msgid "type attributes are honored only at type definition" msgstr "" #. [namespace.udecl] #. #. A using declaration shall not name a template-id. -#: cp/parser.c:10184 +#: cp/parser.c:10201 msgid "a template-id may not appear in a using-declaration" msgstr "" -#: cp/parser.c:10509 +#: cp/parser.c:10526 msgid "an asm-specification is not allowed on a function-definition" msgstr "" -#: cp/parser.c:10511 +#: cp/parser.c:10528 msgid "attributes are not allowed on a function-definition" msgstr "" -#: cp/parser.c:10642 +#: cp/parser.c:10659 msgid "attributes after parenthesized initializer ignored" msgstr "" -#: cp/parser.c:11071 -msgid "`%T::%D' is not a type" +#: cp/parser.c:11088 +msgid "%<%T::%D%> is not a type" msgstr "" -#: cp/parser.c:11116 +#: cp/parser.c:11133 msgid "invalid use of constructor as a template" msgstr "" -#: cp/parser.c:11117 +#: cp/parser.c:11134 msgid "" -"use `%T::%D' instead of `%T::%T' to name the constructor in a qualified name" +"use %<%T::%D%> instead of %<%T::%T%> to name the constructor in a qualified " +"name" msgstr "" -#: cp/parser.c:11304 +#: cp/parser.c:11322 msgid "duplicate cv-qualifier" msgstr "" -#: cp/parser.c:11818 +#: cp/parser.c:11836 msgid "file ends in default argument" msgstr "" -#: cp/parser.c:11878 +#: cp/parser.c:11896 msgid "deprecated use of default argument for parameter of non-function" msgstr "" -#: cp/parser.c:11881 +#: cp/parser.c:11899 msgid "default arguments are only permitted for function parameters" msgstr "" -#: cp/parser.c:12623 -msgid "declaration of `%D' in `%D' which does not enclose `%D'" +#: cp/parser.c:12641 +msgid "declaration of %qD in %qD which does not enclose %qD" msgstr "" -#: cp/parser.c:12636 +#: cp/parser.c:12654 msgid "extra qualification ignored" msgstr "" -#: cp/parser.c:12647 -msgid "an explicit specialization must be preceded by 'template <>'" +#: cp/parser.c:12665 +msgid "an explicit specialization must be preceded by %