X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fpo%2Fgcc.pot;h=58f1b31cf75577a96be2d1531271c7aea724eefc;hp=22a8208ddc562a30d79a9eb8d1fd8cd3f3394583;hb=be526aa0465b5a3a31111e756ea2e2e479fb435e;hpb=4223853884370f53b9de5e6da279e5ac7bbcf8a3 diff --git a/gcc/po/gcc.pot b/gcc/po/gcc.pot index 22a8208ddc5..58f1b31cf75 100644 --- a/gcc/po/gcc.pot +++ b/gcc/po/gcc.pot @@ -8,69 +8,70 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2010-02-04 16:20+0000\n" +"POT-Creation-Date: 2010-03-26 17:51+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: c-decl.c:4569 c-pretty-print.c:403 c-typeck.c:5558 toplev.c:1648 +#: c-decl.c:4573 c-pretty-print.c:403 c-typeck.c:5590 toplev.c:1652 #: cp/error.c:581 cp/error.c:854 msgid "" msgstr "" -#: c-format.c:363 c-format.c:387 config/i386/msformat-c.c:49 +#: c-format.c:363 c-format.c:387 config/i386/msformat-c.c:50 msgid "' ' flag" msgstr "" -#: c-format.c:363 c-format.c:387 config/i386/msformat-c.c:49 +#: c-format.c:363 c-format.c:387 config/i386/msformat-c.c:50 msgid "the ' ' printf flag" msgstr "" #: c-format.c:364 c-format.c:388 c-format.c:422 c-format.c:434 c-format.c:493 -#: config/i386/msformat-c.c:50 +#: config/i386/msformat-c.c:51 msgid "'+' flag" msgstr "" #: c-format.c:364 c-format.c:388 c-format.c:422 c-format.c:434 -#: config/i386/msformat-c.c:50 +#: config/i386/msformat-c.c:51 msgid "the '+' printf flag" msgstr "" #: c-format.c:365 c-format.c:389 c-format.c:435 c-format.c:469 -#: config/i386/msformat-c.c:51 config/i386/msformat-c.c:86 +#: config/i386/msformat-c.c:52 config/i386/msformat-c.c:87 msgid "'#' flag" msgstr "" -#: c-format.c:365 c-format.c:389 c-format.c:435 config/i386/msformat-c.c:51 +#: c-format.c:365 c-format.c:389 c-format.c:435 config/i386/msformat-c.c:52 msgid "the '#' printf flag" msgstr "" -#: c-format.c:366 c-format.c:390 c-format.c:467 config/i386/msformat-c.c:52 +#: c-format.c:366 c-format.c:390 c-format.c:467 config/i386/msformat-c.c:53 msgid "'0' flag" msgstr "" -#: c-format.c:366 c-format.c:390 config/i386/msformat-c.c:52 +#: c-format.c:366 c-format.c:390 config/i386/msformat-c.c:53 msgid "the '0' printf flag" msgstr "" #: c-format.c:367 c-format.c:391 c-format.c:466 c-format.c:496 -#: config/i386/msformat-c.c:53 +#: config/i386/msformat-c.c:54 msgid "'-' flag" msgstr "" -#: c-format.c:367 c-format.c:391 config/i386/msformat-c.c:53 +#: c-format.c:367 c-format.c:391 config/i386/msformat-c.c:54 msgid "the '-' printf flag" msgstr "" -#: c-format.c:368 c-format.c:449 config/i386/msformat-c.c:54 -#: config/i386/msformat-c.c:74 +#: c-format.c:368 c-format.c:449 config/i386/msformat-c.c:55 +#: config/i386/msformat-c.c:75 msgid "''' flag" msgstr "" -#: c-format.c:368 config/i386/msformat-c.c:54 +#: c-format.c:368 config/i386/msformat-c.c:55 msgid "the ''' printf flag" msgstr "" @@ -83,34 +84,34 @@ msgid "the 'I' printf flag" msgstr "" #: c-format.c:370 c-format.c:392 c-format.c:447 c-format.c:470 c-format.c:497 -#: c-format.c:1621 config/sol2-c.c:45 config/i386/msformat-c.c:55 -#: config/i386/msformat-c.c:72 +#: c-format.c:1621 config/sol2-c.c:45 config/i386/msformat-c.c:56 +#: config/i386/msformat-c.c:73 msgid "field width" msgstr "" #: c-format.c:370 c-format.c:392 config/sol2-c.c:45 -#: config/i386/msformat-c.c:55 +#: config/i386/msformat-c.c:56 msgid "field width in printf format" msgstr "" #: c-format.c:371 c-format.c:393 c-format.c:424 c-format.c:437 -#: config/i386/msformat-c.c:56 +#: config/i386/msformat-c.c:57 msgid "precision" msgstr "" #: c-format.c:371 c-format.c:393 c-format.c:424 c-format.c:437 -#: config/i386/msformat-c.c:56 +#: config/i386/msformat-c.c:57 msgid "precision in printf format" msgstr "" #: c-format.c:372 c-format.c:394 c-format.c:425 c-format.c:438 c-format.c:448 -#: c-format.c:500 config/sol2-c.c:46 config/i386/msformat-c.c:57 -#: config/i386/msformat-c.c:73 +#: c-format.c:500 config/sol2-c.c:46 config/i386/msformat-c.c:58 +#: config/i386/msformat-c.c:74 msgid "length modifier" msgstr "" #: c-format.c:372 c-format.c:394 c-format.c:425 c-format.c:438 -#: config/sol2-c.c:46 config/i386/msformat-c.c:57 +#: config/sol2-c.c:46 config/i386/msformat-c.c:58 msgid "length modifier in printf format" msgstr "" @@ -122,19 +123,19 @@ msgstr "" msgid "the 'q' diagnostic flag" msgstr "" -#: c-format.c:444 config/i386/msformat-c.c:70 +#: c-format.c:444 config/i386/msformat-c.c:71 msgid "assignment suppression" msgstr "" -#: c-format.c:444 config/i386/msformat-c.c:70 +#: c-format.c:444 config/i386/msformat-c.c:71 msgid "the assignment suppression scanf feature" msgstr "" -#: c-format.c:445 config/i386/msformat-c.c:71 +#: c-format.c:445 config/i386/msformat-c.c:72 msgid "'a' flag" msgstr "" -#: c-format.c:445 config/i386/msformat-c.c:71 +#: c-format.c:445 config/i386/msformat-c.c:72 msgid "the 'a' scanf flag" msgstr "" @@ -146,15 +147,15 @@ msgstr "" msgid "the 'm' scanf flag" msgstr "" -#: c-format.c:447 config/i386/msformat-c.c:72 +#: c-format.c:447 config/i386/msformat-c.c:73 msgid "field width in scanf format" msgstr "" -#: c-format.c:448 config/i386/msformat-c.c:73 +#: c-format.c:448 config/i386/msformat-c.c:74 msgid "length modifier in scanf format" msgstr "" -#: c-format.c:449 config/i386/msformat-c.c:74 +#: c-format.c:449 config/i386/msformat-c.c:75 msgid "the ''' scanf flag" msgstr "" @@ -186,7 +187,7 @@ msgstr "" msgid "the '^' strftime flag" msgstr "" -#: c-format.c:469 config/i386/msformat-c.c:86 +#: c-format.c:469 config/i386/msformat-c.c:87 msgid "the '#' strftime flag" msgstr "" @@ -282,12 +283,16 @@ msgstr "" msgid "({anonymous})" msgstr "" -#: c-opts.c:1497 tree.c:3966 cp/error.c:999 fortran/cpp.c:552 +<<<<<<< HEAD +#: c-opts.c:1501 tree.c:3970 cp/error.c:999 fortran/cpp.c:552 +======= +#: c-opts.c:1501 tree.c:3966 cp/error.c:999 fortran/cpp.c:552 +>>>>>>> * gcc.pot: Regenerate. msgid "" msgstr "" #. Handle deferred options from command-line. -#: c-opts.c:1515 fortran/cpp.c:557 +#: c-opts.c:1519 fortran/cpp.c:557 msgid "" msgstr "" @@ -411,60 +416,64 @@ msgstr "" msgid "" msgstr "" -#: c-pretty-print.c:1136 +#: c-pretty-print.c:1142 msgid "" msgstr "" -#: c-pretty-print.c:1140 cp/cxx-pretty-print.c:154 +#: c-pretty-print.c:1146 cp/cxx-pretty-print.c:154 msgid "" msgstr "" -#: c-typeck.c:5675 +#: c-typeck.c:5707 msgid "array initialized from parenthesized string constant" msgstr "" -#: c-typeck.c:5748 c-typeck.c:6619 +#: c-typeck.c:5780 c-typeck.c:6651 msgid "initialization of a flexible array member" msgstr "" -#: c-typeck.c:5758 cp/typeck2.c:851 +#: c-typeck.c:5790 cp/typeck2.c:851 #, gcc-internal-format msgid "char-array initialized from wide string" msgstr "" -#: c-typeck.c:5766 +#: c-typeck.c:5798 msgid "wide character array initialized from non-wide string" msgstr "" -#: c-typeck.c:5772 +#: c-typeck.c:5804 msgid "wide character array initialized from incompatible wide string" msgstr "" -#: c-typeck.c:5806 +#: c-typeck.c:5838 msgid "array of inappropriate type initialized from string constant" msgstr "" #. ??? This should not be an error when inlining calls to #. unprototyped functions. -#: c-typeck.c:5874 c-typeck.c:5327 cp/typeck.c:1853 +<<<<<<< HEAD +#: c-typeck.c:5906 c-typeck.c:5359 cp/typeck.c:1862 +======= +#: c-typeck.c:5906 c-typeck.c:5359 cp/typeck.c:1876 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of non-lvalue array" msgstr "" -#: c-typeck.c:5900 +#: c-typeck.c:5932 msgid "array initialized from non-constant array expression" msgstr "" -#: c-typeck.c:5914 c-typeck.c:5917 c-typeck.c:5925 c-typeck.c:5964 -#: c-typeck.c:7418 +#: c-typeck.c:5946 c-typeck.c:5949 c-typeck.c:5957 c-typeck.c:5996 +#: c-typeck.c:7450 msgid "initializer element is not constant" msgstr "" -#: c-typeck.c:5930 c-typeck.c:5976 c-typeck.c:7428 +#: c-typeck.c:5962 c-typeck.c:6008 c-typeck.c:7460 msgid "initializer element is not a constant expression" msgstr "" -#: c-typeck.c:5971 c-typeck.c:7423 +#: c-typeck.c:6003 c-typeck.c:7455 #, gcc-internal-format msgid "initializer element is not computable at load time" msgstr "" @@ -473,117 +482,117 @@ 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-typeck.c:5985 c-decl.c:3951 c-decl.c:3966 +#: c-typeck.c:6017 c-decl.c:3954 c-decl.c:3969 #, gcc-internal-format msgid "variable-sized object may not be initialized" msgstr "" -#: c-typeck.c:5989 +#: c-typeck.c:6021 msgid "invalid initializer" msgstr "" -#: c-typeck.c:6198 +#: c-typeck.c:6230 msgid "(anonymous)" msgstr "" -#: c-typeck.c:6476 +#: c-typeck.c:6508 msgid "extra brace group at end of initializer" msgstr "" -#: c-typeck.c:6497 +#: c-typeck.c:6529 msgid "missing braces around initializer" msgstr "" -#: c-typeck.c:6558 +#: c-typeck.c:6590 msgid "braces around scalar initializer" msgstr "" -#: c-typeck.c:6616 +#: c-typeck.c:6648 msgid "initialization of flexible array member in a nested context" msgstr "" -#: c-typeck.c:6647 +#: c-typeck.c:6679 msgid "missing initializer" msgstr "" -#: c-typeck.c:6669 +#: c-typeck.c:6701 msgid "empty scalar initializer" msgstr "" -#: c-typeck.c:6674 +#: c-typeck.c:6706 msgid "extra elements in scalar initializer" msgstr "" -#: c-typeck.c:6782 c-typeck.c:6860 +#: c-typeck.c:6814 c-typeck.c:6892 msgid "array index in non-array initializer" msgstr "" -#: c-typeck.c:6787 c-typeck.c:6916 +#: c-typeck.c:6819 c-typeck.c:6948 msgid "field name not in record or union initializer" msgstr "" -#: c-typeck.c:6833 +#: c-typeck.c:6865 msgid "array index in initializer not of integer type" msgstr "" -#: c-typeck.c:6842 c-typeck.c:6851 +#: c-typeck.c:6874 c-typeck.c:6883 msgid "array index in initializer is not an integer constant expression" msgstr "" -#: c-typeck.c:6856 c-typeck.c:6858 +#: c-typeck.c:6888 c-typeck.c:6890 msgid "nonconstant array index in initializer" msgstr "" -#: c-typeck.c:6862 c-typeck.c:6865 +#: c-typeck.c:6894 c-typeck.c:6897 msgid "array index in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:6879 +#: c-typeck.c:6911 msgid "empty index range in initializer" msgstr "" -#: c-typeck.c:6888 +#: c-typeck.c:6920 msgid "array index range in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:6971 c-typeck.c:6998 c-typeck.c:7517 +#: c-typeck.c:7003 c-typeck.c:7030 c-typeck.c:7549 msgid "initialized field with side-effects overwritten" msgstr "" -#: c-typeck.c:6973 c-typeck.c:7000 c-typeck.c:7519 +#: c-typeck.c:7005 c-typeck.c:7032 c-typeck.c:7551 msgid "initialized field overwritten" msgstr "" -#: c-typeck.c:7445 c-typeck.c:4933 +#: c-typeck.c:7477 c-typeck.c:4965 #, gcc-internal-format msgid "enum conversion in initialization is invalid in C++" msgstr "" -#: c-typeck.c:7734 +#: c-typeck.c:7766 msgid "excess elements in char array initializer" msgstr "" -#: c-typeck.c:7741 c-typeck.c:7800 +#: c-typeck.c:7773 c-typeck.c:7832 msgid "excess elements in struct initializer" msgstr "" -#: c-typeck.c:7815 +#: c-typeck.c:7847 msgid "non-static initialization of a flexible array member" msgstr "" -#: c-typeck.c:7885 +#: c-typeck.c:7917 msgid "excess elements in union initializer" msgstr "" -#: c-typeck.c:7974 +#: c-typeck.c:8006 msgid "excess elements in array initializer" msgstr "" -#: c-typeck.c:8007 +#: c-typeck.c:8039 msgid "excess elements in vector initializer" msgstr "" -#: c-typeck.c:8038 +#: c-typeck.c:8070 msgid "excess elements in scalar initializer" msgstr "" @@ -603,157 +612,163 @@ msgstr "" msgid "return not followed by barrier" msgstr "" -#: collect2.c:486 gcc.c:7719 +#: collect2.c:497 gcc.c:7734 #, c-format msgid "internal gcc abort in %s, at %s:%d" msgstr "" -#: collect2.c:939 +#: collect2.c:950 #, c-format msgid "COLLECT_LTO_WRAPPER must be set." msgstr "" -#: collect2.c:1081 +#: collect2.c:1092 #, c-format msgid "too many lto output files" msgstr "" -#: collect2.c:1297 +#: collect2.c:1308 #, c-format msgid "no arguments" msgstr "" -#: collect2.c:1704 collect2.c:1866 collect2.c:1901 +#: collect2.c:1715 collect2.c:1886 collect2.c:1921 #, c-format msgid "fopen %s" msgstr "" -#: collect2.c:1707 collect2.c:1871 collect2.c:1904 +#: collect2.c:1718 collect2.c:1891 collect2.c:1924 #, c-format msgid "fclose %s" msgstr "" -#: collect2.c:1716 +#: collect2.c:1727 #, c-format msgid "collect2 version %s" msgstr "" -#: collect2.c:1812 +#: collect2.c:1823 #, c-format -msgid "%d constructor(s) found\n" -msgstr "" +msgid "%d constructor found\n" +msgid_plural "%d constructors found\n" +msgstr[0] "" +msgstr[1] "" -#: collect2.c:1813 +#: collect2.c:1827 #, c-format -msgid "%d destructor(s) found\n" -msgstr "" +msgid "%d destructor found\n" +msgid_plural "%d destructors found\n" +msgstr[0] "" +msgstr[1] "" -#: collect2.c:1814 +#: collect2.c:1831 #, c-format -msgid "%d frame table(s) found\n" -msgstr "" +msgid "%d frame table found\n" +msgid_plural "%d frame tables found\n" +msgstr[0] "" +msgstr[1] "" -#: collect2.c:1965 lto-wrapper.c:175 +#: collect2.c:1985 lto-wrapper.c:175 #, c-format msgid "can't get program status" msgstr "" -#: collect2.c:2034 +#: collect2.c:2054 #, c-format msgid "could not open response file %s" msgstr "" -#: collect2.c:2039 +#: collect2.c:2059 #, c-format msgid "could not write to response file %s" msgstr "" -#: collect2.c:2044 +#: collect2.c:2064 #, c-format msgid "could not close response file %s" msgstr "" -#: collect2.c:2062 +#: collect2.c:2082 #, c-format msgid "[cannot find %s]" msgstr "" -#: collect2.c:2077 +#: collect2.c:2097 #, c-format msgid "cannot find '%s'" msgstr "" -#: collect2.c:2081 collect2.c:2604 collect2.c:2800 gcc.c:3085 +#: collect2.c:2101 collect2.c:2624 collect2.c:2820 gcc.c:3085 #: lto-wrapper.c:147 #, c-format msgid "pex_init failed" msgstr "" -#: collect2.c:2119 +#: collect2.c:2139 #, c-format msgid "[Leaving %s]\n" msgstr "" -#: collect2.c:2351 +#: collect2.c:2371 #, c-format msgid "" "\n" "write_c_file - output name is %s, prefix is %s\n" msgstr "" -#: collect2.c:2578 +#: collect2.c:2598 #, c-format msgid "cannot find 'nm'" msgstr "" -#: collect2.c:2626 +#: collect2.c:2646 #, c-format msgid "can't open nm output" msgstr "" -#: collect2.c:2709 +#: collect2.c:2729 #, c-format msgid "init function found in object %s" msgstr "" -#: collect2.c:2719 +#: collect2.c:2739 #, c-format msgid "fini function found in object %s" msgstr "" -#: collect2.c:2821 +#: collect2.c:2841 #, c-format msgid "can't open ldd output" msgstr "" -#: collect2.c:2824 +#: collect2.c:2844 #, c-format msgid "" "\n" "ldd output with constructors/destructors.\n" msgstr "" -#: collect2.c:2839 +#: collect2.c:2859 #, c-format msgid "dynamic dependency %s not found" msgstr "" -#: collect2.c:2851 +#: collect2.c:2871 #, c-format msgid "unable to open dynamic dependency '%s'" msgstr "" -#: collect2.c:3012 +#: collect2.c:3032 #, c-format msgid "%s: not a COFF file" msgstr "" -#: collect2.c:3142 +#: collect2.c:3162 #, c-format msgid "%s: cannot open as COFF file" msgstr "" -#: collect2.c:3200 +#: collect2.c:3220 #, c-format msgid "library lib%s not found" msgstr "" @@ -768,12 +783,12 @@ msgstr "" msgid "too many input files" msgstr "" -#: diagnostic.c:185 +#: diagnostic.c:186 #, c-format msgid "compilation terminated due to -Wfatal-errors.\n" msgstr "" -#: diagnostic.c:194 +#: diagnostic.c:195 #, c-format msgid "" "Please submit a full bug report,\n" @@ -781,66 +796,66 @@ msgid "" "See %s for instructions.\n" msgstr "" -#: diagnostic.c:203 +#: diagnostic.c:204 #, c-format msgid "compilation terminated.\n" msgstr "" -#: diagnostic.c:381 +#: diagnostic.c:382 #, c-format msgid "" "*** WARNING *** there are active plugins, do not report this as a bug unless " "you can reproduce it without enabling any plugins.\n" msgstr "" -#: diagnostic.c:398 +#: diagnostic.c:399 #, c-format msgid "%s:%d: confused by earlier errors, bailing out\n" msgstr "" -#: diagnostic.c:709 +#: diagnostic.c:744 #, c-format msgid "Internal compiler error: Error reporting routines re-entered.\n" msgstr "" -#: final.c:1150 +#: final.c:1153 msgid "negative insn length" msgstr "" -#: final.c:2647 +#: final.c:2650 msgid "could not split insn" msgstr "" -#: final.c:3081 +#: final.c:3084 msgid "invalid 'asm': " msgstr "" -#: final.c:3264 +#: final.c:3267 #, c-format msgid "nested assembly dialect alternatives" msgstr "" -#: final.c:3281 final.c:3293 +#: final.c:3284 final.c:3296 #, c-format msgid "unterminated assembly dialect alternative" msgstr "" -#: final.c:3340 +#: final.c:3343 #, c-format msgid "operand number missing after %%-letter" msgstr "" -#: final.c:3343 final.c:3384 +#: final.c:3346 final.c:3387 #, c-format msgid "operand number out of range" msgstr "" -#: final.c:3403 +#: final.c:3406 #, c-format msgid "invalid %%-code" msgstr "" -#: final.c:3433 +#: final.c:3436 #, c-format msgid "'%%l' operand isn't a label" msgstr "" @@ -851,13 +866,21 @@ msgstr "" #. handle them. #. We can't handle floating point constants; #. PRINT_OPERAND must handle them. -#: final.c:3579 vmsdbgout.c:496 config/i386/i386.c:10747 +<<<<<<< HEAD +#: final.c:3582 vmsdbgout.c:496 config/i386/i386.c:10813 +======= +#: final.c:3582 vmsdbgout.c:496 config/i386/i386.c:10816 +>>>>>>> * gcc.pot: Regenerate. #: config/pdp11/pdp11.c:1682 #, c-format msgid "floating constant misused" msgstr "" -#: final.c:3641 vmsdbgout.c:553 config/i386/i386.c:10834 +<<<<<<< HEAD +#: final.c:3644 vmsdbgout.c:553 config/i386/i386.c:10900 +======= +#: final.c:3644 vmsdbgout.c:553 config/i386/i386.c:10903 +>>>>>>> * gcc.pot: Regenerate. #: config/pdp11/pdp11.c:1729 #, c-format msgid "invalid expression as operand" @@ -932,7 +955,7 @@ msgstr "" msgid "spec file has no spec for linking" msgstr "" -#: gcc.c:2705 gcc.c:5265 +#: gcc.c:2705 gcc.c:5280 #, c-format msgid "%s\n" msgstr "" @@ -1284,136 +1307,136 @@ msgstr "" msgid "argument to '-x' is missing" msgstr "" -#: gcc.c:4533 gcc.c:4983 +#: gcc.c:4533 gcc.c:4998 #, c-format msgid "argument to '-%s' is missing" msgstr "" -#: gcc.c:4771 +#: gcc.c:4786 #, c-format msgid "unable to locate default linker script '%s' in the library search paths" msgstr "" -#: gcc.c:4959 +#: gcc.c:4974 #, c-format msgid "switch '%s' does not start with '-'" msgstr "" -#: gcc.c:5075 +#: gcc.c:5090 #, c-format msgid "could not open temporary response file %s" msgstr "" -#: gcc.c:5081 +#: gcc.c:5096 #, c-format msgid "could not write to temporary response file %s" msgstr "" -#: gcc.c:5087 +#: gcc.c:5102 #, c-format msgid "could not close temporary response file %s" msgstr "" -#: gcc.c:5189 +#: gcc.c:5204 #, c-format msgid "spec '%s' invalid" msgstr "" -#: gcc.c:5338 +#: gcc.c:5353 #, c-format msgid "spec '%s' has invalid '%%0%c'" msgstr "" -#: gcc.c:5647 +#: gcc.c:5662 #, c-format msgid "spec '%s' has invalid '%%W%c" msgstr "" -#: gcc.c:5667 +#: gcc.c:5682 #, c-format msgid "spec '%s' has invalid '%%x%c'" msgstr "" -#: gcc.c:5889 +#: gcc.c:5904 #, c-format msgid "Processing spec %c%s%c, which is '%s'\n" msgstr "" -#: gcc.c:6014 +#: gcc.c:6029 #, c-format msgid "unknown spec function '%s'" msgstr "" -#: gcc.c:6034 +#: gcc.c:6049 #, c-format msgid "error in args to spec function '%s'" msgstr "" -#: gcc.c:6083 +#: gcc.c:6098 #, c-format msgid "malformed spec function name" msgstr "" #. ) -#: gcc.c:6086 +#: gcc.c:6101 #, c-format msgid "no arguments for spec function" msgstr "" -#: gcc.c:6105 +#: gcc.c:6120 #, c-format msgid "malformed spec function arguments" msgstr "" -#: gcc.c:6351 +#: gcc.c:6366 #, c-format msgid "braced spec '%s' is invalid at '%c'" msgstr "" -#: gcc.c:6439 +#: gcc.c:6454 #, c-format msgid "braced spec body '%s' is invalid" msgstr "" -#: gcc.c:7139 +#: gcc.c:7154 #, c-format msgid "install: %s%s\n" msgstr "" -#: gcc.c:7142 +#: gcc.c:7157 #, c-format msgid "programs: %s\n" msgstr "" -#: gcc.c:7144 +#: gcc.c:7159 #, c-format msgid "libraries: %s\n" msgstr "" #. The error status indicates that only one set of fixed #. headers should be built. -#: gcc.c:7210 +#: gcc.c:7225 #, c-format msgid "not configured with sysroot headers suffix" msgstr "" -#: gcc.c:7219 +#: gcc.c:7234 #, c-format msgid "" "\n" "For bug reporting instructions, please see:\n" msgstr "" -#: gcc.c:7235 +#: gcc.c:7250 #, c-format msgid "%s %s%s\n" msgstr "" -#: gcc.c:7238 gcov.c:430 fortran/gfortranspec.c:373 java/jcf-dump.c:1170 +#: gcc.c:7253 gcov.c:430 fortran/gfortranspec.c:373 java/jcf-dump.c:1170 msgid "(C)" msgstr "" -#: gcc.c:7239 java/jcf-dump.c:1171 +#: gcc.c:7254 java/jcf-dump.c:1171 #, c-format msgid "" "This is free software; see the source for copying conditions. There is NO\n" @@ -1421,57 +1444,57 @@ msgid "" "\n" msgstr "" -#: gcc.c:7256 +#: gcc.c:7271 #, c-format msgid "Target: %s\n" msgstr "" -#: gcc.c:7257 +#: gcc.c:7272 #, c-format msgid "Configured with: %s\n" msgstr "" -#: gcc.c:7271 +#: gcc.c:7286 #, c-format msgid "Thread model: %s\n" msgstr "" -#: gcc.c:7282 +#: gcc.c:7297 #, c-format msgid "gcc version %s %s\n" msgstr "" -#: gcc.c:7284 +#: gcc.c:7299 #, c-format msgid "gcc driver version %s %sexecuting gcc version %s\n" msgstr "" -#: gcc.c:7292 +#: gcc.c:7307 #, c-format msgid "no input files" msgstr "" -#: gcc.c:7341 +#: gcc.c:7356 #, c-format msgid "cannot specify -o with -c, -S or -E with multiple files" msgstr "" -#: gcc.c:7375 +#: gcc.c:7390 #, c-format msgid "spec '%s' is invalid" msgstr "" -#: gcc.c:7566 +#: gcc.c:7581 #, c-format msgid "-fuse-linker-plugin, but liblto_plugin.so not found" msgstr "" -#: gcc.c:7571 +#: gcc.c:7586 #, c-format msgid "could not find libgcc.a" msgstr "" -#: gcc.c:7582 +#: gcc.c:7597 #, c-format msgid "" "\n" @@ -1480,59 +1503,59 @@ msgid "" "\n" msgstr "" -#: gcc.c:7583 +#: gcc.c:7598 #, c-format msgid "" "Use \"-Wl,OPTION\" to pass \"OPTION\" to the linker.\n" "\n" msgstr "" -#: gcc.c:7935 +#: gcc.c:7950 #, c-format msgid "multilib spec '%s' is invalid" msgstr "" -#: gcc.c:8126 +#: gcc.c:8141 #, c-format msgid "multilib exclusions '%s' is invalid" msgstr "" -#: gcc.c:8184 gcc.c:8325 +#: gcc.c:8199 gcc.c:8340 #, c-format msgid "multilib select '%s' is invalid" msgstr "" -#: gcc.c:8363 +#: gcc.c:8378 #, c-format msgid "multilib exclusion '%s' is invalid" msgstr "" -#: gcc.c:8569 +#: gcc.c:8584 #, c-format msgid "environment variable \"%s\" not defined" msgstr "" -#: gcc.c:8660 gcc.c:8665 +#: gcc.c:8675 gcc.c:8680 #, c-format msgid "invalid version number `%s'" msgstr "" -#: gcc.c:8708 +#: gcc.c:8723 #, c-format msgid "too few arguments to %%:version-compare" msgstr "" -#: gcc.c:8714 +#: gcc.c:8729 #, c-format msgid "too many arguments to %%:version-compare" msgstr "" -#: gcc.c:8755 +#: gcc.c:8770 #, c-format msgid "unknown operator '%s' in %%:version-compare" msgstr "" -#: gcc.c:8789 +#: gcc.c:8804 #, c-format msgid "" "Assembler options\n" @@ -1540,34 +1563,34 @@ msgid "" "\n" msgstr "" -#: gcc.c:8790 +#: gcc.c:8805 #, c-format msgid "" "Use \"-Wa,OPTION\" to pass \"OPTION\" to the assembler.\n" "\n" msgstr "" -#: gcc.c:8836 +#: gcc.c:8851 #, c-format msgid "too many arguments to %%:compare-debug-dump-opt" msgstr "" -#: gcc.c:8903 +#: gcc.c:8918 #, c-format msgid "too many arguments to %%:compare-debug-self-opt" msgstr "" -#: gcc.c:8938 +#: gcc.c:8953 #, c-format msgid "too few arguments to %%:compare-debug-auxbase-opt" msgstr "" -#: gcc.c:8941 +#: gcc.c:8956 #, c-format msgid "too many arguments to %%:compare-debug-auxbase-opt" msgstr "" -#: gcc.c:8948 +#: gcc.c:8963 #, c-format msgid "argument to %%:compare-debug-auxbase-opt does not end in .gk" msgstr "" @@ -1974,7 +1997,7 @@ msgstr "" msgid "%s terminated with signal %d [%s]" msgstr "" -#: lto-wrapper.c:192 collect2.c:1991 +#: lto-wrapper.c:192 collect2.c:2011 #, gcc-internal-format msgid "%s returned %d exit status" msgstr "" @@ -2009,82 +2032,82 @@ msgstr "" msgid "This switch lacks documentation" msgstr "" -#: opts.c:1316 +#: opts.c:1310 msgid "[enabled]" msgstr "" -#: opts.c:1316 +#: opts.c:1310 msgid "[disabled]" msgstr "" -#: opts.c:1331 +#: opts.c:1325 #, c-format msgid " No options with the desired characteristics were found\n" msgstr "" -#: opts.c:1340 +#: opts.c:1334 #, c-format msgid "" " None found. Use --help=%s to show *all* the options supported by the %s " "front-end\n" msgstr "" -#: opts.c:1346 +#: opts.c:1340 #, c-format msgid "" " All options with the desired characteristics have already been displayed\n" msgstr "" -#: opts.c:1400 +#: opts.c:1394 msgid "The following options are target specific" msgstr "" -#: opts.c:1403 +#: opts.c:1397 msgid "The following options control compiler warning messages" msgstr "" -#: opts.c:1406 +#: opts.c:1400 msgid "The following options control optimizations" msgstr "" -#: opts.c:1409 opts.c:1448 +#: opts.c:1403 opts.c:1442 msgid "The following options are language-independent" msgstr "" -#: opts.c:1412 +#: opts.c:1406 msgid "The --param option recognizes the following as parameters" msgstr "" -#: opts.c:1418 +#: opts.c:1412 msgid "The following options are specific to just the language " msgstr "" -#: opts.c:1420 +#: opts.c:1414 msgid "The following options are supported by the language " msgstr "" -#: opts.c:1431 +#: opts.c:1425 msgid "The following options are not documented" msgstr "" -#: opts.c:1433 +#: opts.c:1427 msgid "The following options take separate arguments" msgstr "" -#: opts.c:1435 +#: opts.c:1429 msgid "The following options take joined arguments" msgstr "" -#: opts.c:1446 +#: opts.c:1440 msgid "The following options are language-related" msgstr "" -#: opts.c:1606 +#: opts.c:1600 #, c-format msgid "warning: --help argument %.*s is ambiguous, please be more specific\n" msgstr "" -#: opts.c:1614 +#: opts.c:1608 #, c-format msgid "warning: unrecognized argument to --help= option: %.*s\n" msgstr "" @@ -2101,21 +2124,21 @@ msgstr "" msgid "unable to generate reloads for:" msgstr "" -#: reload1.c:2141 +#: reload1.c:2158 msgid "this is the insn:" msgstr "" #. It's the compiler's fault. -#: reload1.c:5661 +#: reload1.c:5693 msgid "could not find a spill register" msgstr "" #. It's the compiler's fault. -#: reload1.c:7646 +#: reload1.c:7678 msgid "VOIDmode on an output" msgstr "" -#: reload1.c:8401 +#: reload1.c:8433 msgid "Failure trying to reload:" msgstr "" @@ -2178,65 +2201,73 @@ msgstr "" msgid "unrecoverable error" msgstr "" -#: toplev.c:1213 +#: toplev.c:1217 #, c-format msgid "" "%s%s%s %sversion %s (%s)\n" "%s\tcompiled by GNU C version %s, " msgstr "" -#: toplev.c:1215 +#: toplev.c:1219 #, c-format msgid "%s%s%s %sversion %s (%s) compiled by CC, " msgstr "" -#: toplev.c:1219 +#: toplev.c:1223 #, c-format msgid "GMP version %s, MPFR version %s, MPC version %s\n" msgstr "" -#: toplev.c:1221 +#: toplev.c:1225 #, c-format msgid "%s%swarning: %s header version %s differs from library version %s.\n" msgstr "" -#: toplev.c:1223 +#: toplev.c:1227 #, c-format msgid "" "%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n" msgstr "" -#: toplev.c:1386 +#: toplev.c:1390 msgid "options passed: " msgstr "" -#: toplev.c:1421 +#: toplev.c:1425 msgid "options enabled: " msgstr "" -#: toplev.c:1556 +#: toplev.c:1560 #, c-format msgid "created and used with differing settings of '%s'" msgstr "" -#: toplev.c:1558 +#: toplev.c:1562 msgid "out of memory" msgstr "" -#: toplev.c:1573 +#: toplev.c:1577 msgid "created and used with different settings of -fpic" msgstr "" -#: toplev.c:1575 +#: toplev.c:1579 msgid "created and used with different settings of -fpie" msgstr "" -#: tree-vrp.c:6492 +<<<<<<< HEAD +#: tree-vrp.c:6515 +======= +#: tree-vrp.c:6502 +>>>>>>> * gcc.pot: Regenerate. msgid "" "assuming signed overflow does not occur when simplifying && or || to & or |" msgstr "" -#: tree-vrp.c:6496 +<<<<<<< HEAD +#: tree-vrp.c:6519 +======= +#: tree-vrp.c:6506 +>>>>>>> * gcc.pot: Regenerate. msgid "" "assuming signed overflow does not occur when simplifying ==, != or ! to " "identity or ^" @@ -2520,392 +2551,408 @@ msgstr "" msgid "The maximum number of insns of a peeled loop that rolls only once" msgstr "" -#: params.def:273 -msgid "The maximum number of insns of an unswitched loop" +#: params.def:272 +msgid "The maximum depth of a loop nest we completely peel" msgstr "" #: params.def:278 +msgid "The maximum number of insns of an unswitched loop" +msgstr "" + +#: params.def:283 msgid "The maximum number of unswitchings in a single loop" msgstr "" -#: params.def:285 +#: params.def:290 msgid "" "Bound on the number of iterations the brute force # of iterations analysis " "algorithm evaluates" msgstr "" -#: params.def:291 +#: params.def:296 msgid "Bound on the cost of an expression to compute the number of iterations" msgstr "" -#: params.def:297 +#: params.def:302 msgid "" "A factor for tuning the upper bound that swing modulo scheduler uses for " "scheduling a loop" msgstr "" -#: params.def:301 +#: params.def:306 msgid "" "The number of cycles the swing modulo scheduler considers when checking " "conflicts using DFA" msgstr "" -#: params.def:305 +#: params.def:310 msgid "" "A threshold on the average loop count considered by the swing modulo " "scheduler" msgstr "" -#: params.def:310 +#: params.def:315 msgid "" "Select fraction of the maximal count of repetitions of basic block in " "program given basic block needs to have to be considered hot" msgstr "" -#: params.def:314 +#: params.def:319 msgid "" "Select fraction of the maximal frequency of executions of basic block in " "function given basic block needs to have to be considered hot" msgstr "" -#: params.def:319 +#: params.def:324 msgid "" "Select fraction of the maximal frequency of executions of basic block in " "function given basic block get alignment" msgstr "" -#: params.def:324 +#: params.def:329 msgid "" "Loops iterating at least selected number of iterations will get loop " "alignement." msgstr "" -#: params.def:340 +#: params.def:345 msgid "The maximum number of loop iterations we predict statically" msgstr "" -#: params.def:344 +#: params.def:349 msgid "" "The percentage of function, weighted by execution frequency, that must be " "covered by trace formation. Used when profile feedback is available" msgstr "" -#: params.def:348 +#: params.def:353 msgid "" "The percentage of function, weighted by execution frequency, that must be " "covered by trace formation. Used when profile feedback is not available" msgstr "" -#: params.def:352 +#: params.def:357 msgid "Maximal code growth caused by tail duplication (in percent)" msgstr "" -#: params.def:356 +#: params.def:361 msgid "" "Stop reverse growth if the reverse probability of best edge is less than " "this threshold (in percent)" msgstr "" -#: params.def:360 +#: params.def:365 msgid "" "Stop forward growth if the probability of best edge is less than this " "threshold (in percent). Used when profile feedback is available" msgstr "" -#: params.def:364 +#: params.def:369 msgid "" "Stop forward growth if the probability of best edge is less than this " "threshold (in percent). Used when profile feedback is not available" msgstr "" -#: params.def:370 +#: params.def:375 msgid "The maximum number of incoming edges to consider for crossjumping" msgstr "" -#: params.def:376 +#: params.def:381 msgid "" "The minimum number of matching instructions to consider for crossjumping" msgstr "" -#: params.def:382 +#: params.def:387 msgid "The maximum expansion factor when copying basic blocks" msgstr "" -#: params.def:388 +#: params.def:393 msgid "" "The maximum number of insns to duplicate when unfactoring computed gotos" msgstr "" -#: params.def:394 +#: params.def:399 msgid "The maximum length of path considered in cse" msgstr "" -#: params.def:398 +#: params.def:403 msgid "The maximum instructions CSE process before flushing" msgstr "" -#: params.def:405 +#: params.def:410 msgid "" "The minimum cost of an expensive expression in the loop invariant motion" msgstr "" -#: params.def:414 +#: params.def:419 msgid "" "Bound on number of candidates below that all candidates are considered in iv " "optimizations" msgstr "" -#: params.def:422 +#: params.def:427 msgid "Bound on number of iv uses in loop optimized in iv optimizations" msgstr "" -#: params.def:430 +#: params.def:435 msgid "" "If number of candidates in the set is smaller, we always try to remove " "unused ivs during its optimization" msgstr "" -#: params.def:435 +#: params.def:440 msgid "Bound on size of expressions used in the scalar evolutions analyzer" msgstr "" -#: params.def:440 +#: params.def:445 msgid "Bound on the number of variables in Omega constraint systems" msgstr "" -#: params.def:445 +#: params.def:450 msgid "Bound on the number of inequalities in Omega constraint systems" msgstr "" -#: params.def:450 +#: params.def:455 msgid "Bound on the number of equalities in Omega constraint systems" msgstr "" -#: params.def:455 +#: params.def:460 msgid "Bound on the number of wild cards in Omega constraint systems" msgstr "" -#: params.def:460 +#: params.def:465 msgid "Bound on the size of the hash table in Omega constraint systems" msgstr "" -#: params.def:465 +#: params.def:470 msgid "Bound on the number of keys in Omega constraint systems" msgstr "" -#: params.def:470 +#: params.def:475 msgid "" "When set to 1, use expensive methods to eliminate all redundant constraints" msgstr "" -#: params.def:475 +#: params.def:480 msgid "" "Bound on number of runtime checks inserted by the vectorizer's loop " "versioning for alignment check" msgstr "" -#: params.def:480 +#: params.def:485 msgid "" "Bound on number of runtime checks inserted by the vectorizer's loop " "versioning for alias check" msgstr "" -#: params.def:485 +#: params.def:490 msgid "The maximum memory locations recorded by cselib" msgstr "" -#: params.def:498 +#: params.def:503 msgid "" "Minimum heap expansion to trigger garbage collection, as a percentage of the " "total size of the heap" msgstr "" -#: params.def:503 +#: params.def:508 msgid "Minimum heap size before we start collecting garbage, in kilobytes" msgstr "" -#: params.def:511 +#: params.def:516 msgid "" "The maximum number of instructions to search backward when looking for " "equivalent reload" msgstr "" -#: params.def:516 params.def:526 +#: params.def:521 params.def:531 msgid "" "The maximum number of blocks in a region to be considered for interblock " "scheduling" msgstr "" -#: params.def:521 params.def:531 +#: params.def:526 params.def:536 msgid "" "The maximum number of insns in a region to be considered for interblock " "scheduling" msgstr "" -#: params.def:536 +#: params.def:541 msgid "" "The minimum probability of reaching a source block for interblock " "speculative scheduling" msgstr "" -#: params.def:541 +#: params.def:546 msgid "The maximum number of iterations through CFG to extend regions" msgstr "" -#: params.def:546 +#: params.def:551 msgid "" "The maximum conflict delay for an insn to be considered for speculative " "motion" msgstr "" -#: params.def:551 +#: params.def:556 msgid "" "The minimal probability of speculation success (in percents), so that " "speculative insn will be scheduled." msgstr "" -#: params.def:556 +#: params.def:561 msgid "The maximum size of the lookahead window of selective scheduling" msgstr "" -#: params.def:561 +#: params.def:566 msgid "Maximum number of times that an insn could be scheduled" msgstr "" -#: params.def:566 +#: params.def:571 msgid "" "Maximum number of instructions in the ready list that are considered " "eligible for renaming" msgstr "" -#: params.def:571 +#: params.def:576 msgid "Minimal distance between possibly conflicting store and load" msgstr "" -#: params.def:576 +#: params.def:581 msgid "" "The maximum number of RTL nodes that can be recorded as combiner's last value" msgstr "" -#: params.def:584 +#: params.def:589 msgid "The upper bound for sharing integer constants" msgstr "" -#: params.def:603 +#: params.def:608 msgid "" "Minimum number of virtual mappings to consider switching to full virtual " "renames" msgstr "" -#: params.def:608 +#: params.def:613 msgid "" "Ratio between virtual mappings and virtual symbols to do full virtual renames" msgstr "" -#: params.def:613 +#: params.def:618 msgid "" "The lower bound for a buffer to be considered for stack smashing protection" msgstr "" -#: params.def:631 +#: params.def:636 msgid "" "Maximum number of statements allowed in a block that needs to be duplicated " "when threading jumps" msgstr "" -#: params.def:640 +#: params.def:645 msgid "" "Maximum number of fields in a structure before pointer analysis treats the " "structure as a single variable" msgstr "" -#: params.def:645 +#: params.def:650 msgid "" "The maximum number of instructions ready to be issued to be considered by " "the scheduler during the first scheduling pass" msgstr "" -#: params.def:655 +#: params.def:660 msgid "The number of insns executed before prefetch is completed" msgstr "" -#: params.def:662 +#: params.def:667 msgid "The number of prefetches that can run at the same time" msgstr "" -#: params.def:669 +#: params.def:674 msgid "The size of L1 cache" msgstr "" -#: params.def:676 +#: params.def:681 msgid "The size of L1 cache line" msgstr "" -#: params.def:683 +#: params.def:688 msgid "The size of L2 cache" msgstr "" -#: params.def:694 +#: params.def:699 msgid "Whether to use canonical types" msgstr "" -#: params.def:699 +#: params.def:704 msgid "" "Maximum length of partial antic set when performing tree pre optimization" msgstr "" -#: params.def:709 +#: params.def:714 msgid "Maximum size of a SCC before SCCVN stops processing a function" msgstr "" -#: params.def:714 +#: params.def:719 msgid "Max loops number for regional RA" msgstr "" -#: params.def:719 +#: params.def:724 msgid "Max size of conflict table in MB" msgstr "" -#: params.def:724 +#: params.def:729 msgid "" "The number of registers in each class kept unused by loop invariant motion" msgstr "" -#: params.def:732 +#: params.def:737 msgid "" "The maximum ratio between array size and switch branches for a switch " "conversion to take place" msgstr "" -#: params.def:740 +#: params.def:745 msgid "size of tiles for loop blocking" msgstr "" -#: params.def:747 +#: params.def:752 +msgid "maximum number of parameters in a SCoP" +msgstr "" + +#: params.def:759 +msgid "maximum number of basic blocks per function to be analyzed by Graphite" +msgstr "" + +#: params.def:766 msgid "Max basic blocks number in loop for loop invariant motion" msgstr "" -#: params.def:753 +#: params.def:772 msgid "" "Maximum number of instructions in basic block to be considered for SLP " "vectorization" msgstr "" -#: params.def:758 +#: params.def:777 msgid "" "Min. ratio of insns to prefetches to enable prefetching for a loop with an " "unknown trip count" msgstr "" -#: params.def:764 +#: params.def:783 msgid "Min. ratio of insns to mem ops to enable prefetching in a loop" msgstr "" -#: params.def:771 +#: params.def:790 +msgid "Max. size of var tracking hash tables" +msgstr "" + +#: params.def:797 msgid "The minimum UID to be used for a nondebug insn" msgstr "" -#: params.def:776 +#: params.def:802 msgid "" "Maximum allowed growth of size of new parameters ipa-sra replaces a pointer " "to an aggregate with" @@ -2916,7 +2963,7 @@ msgstr "" msgid "invalid %%H value" msgstr "" -#: config/alpha/alpha.c:5156 config/bfin/bfin.c:1682 +#: config/alpha/alpha.c:5156 config/bfin/bfin.c:1683 #, c-format msgid "invalid %%J value" msgstr "" @@ -2927,18 +2974,30 @@ msgid "invalid %%r value" msgstr "" #: config/alpha/alpha.c:5196 config/ia64/ia64.c:4929 -#: config/rs6000/rs6000.c:14636 config/xtensa/xtensa.c:2253 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14626 config/xtensa/xtensa.c:2253 +======= +#: config/rs6000/rs6000.c:14624 config/xtensa/xtensa.c:2253 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%R value" msgstr "" -#: config/alpha/alpha.c:5202 config/rs6000/rs6000.c:14555 +<<<<<<< HEAD +#: config/alpha/alpha.c:5202 config/rs6000/rs6000.c:14545 +======= +#: config/alpha/alpha.c:5202 config/rs6000/rs6000.c:14543 +>>>>>>> * gcc.pot: Regenerate. #: config/xtensa/xtensa.c:2220 #, c-format msgid "invalid %%N value" msgstr "" -#: config/alpha/alpha.c:5210 config/rs6000/rs6000.c:14583 +<<<<<<< HEAD +#: config/alpha/alpha.c:5210 config/rs6000/rs6000.c:14573 +======= +#: config/alpha/alpha.c:5210 config/rs6000/rs6000.c:14571 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%P value" msgstr "" @@ -2953,12 +3012,20 @@ msgstr "" msgid "invalid %%L value" msgstr "" -#: config/alpha/alpha.c:5265 config/rs6000/rs6000.c:14537 +<<<<<<< HEAD +#: config/alpha/alpha.c:5265 config/rs6000/rs6000.c:14527 +======= +#: config/alpha/alpha.c:5265 config/rs6000/rs6000.c:14525 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%m value" msgstr "" -#: config/alpha/alpha.c:5273 config/rs6000/rs6000.c:14545 +<<<<<<< HEAD +#: config/alpha/alpha.c:5273 config/rs6000/rs6000.c:14535 +======= +#: config/alpha/alpha.c:5273 config/rs6000/rs6000.c:14533 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%M value" msgstr "" @@ -2969,7 +3036,11 @@ msgid "invalid %%U value" msgstr "" #: config/alpha/alpha.c:5329 config/alpha/alpha.c:5343 -#: config/rs6000/rs6000.c:14644 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14634 +======= +#: config/rs6000/rs6000.c:14632 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%s value" msgstr "" @@ -2979,7 +3050,11 @@ msgstr "" msgid "invalid %%C value" msgstr "" -#: config/alpha/alpha.c:5403 config/rs6000/rs6000.c:14391 +<<<<<<< HEAD +#: config/alpha/alpha.c:5403 config/rs6000/rs6000.c:14381 +======= +#: config/alpha/alpha.c:5403 config/rs6000/rs6000.c:14379 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%E value" msgstr "" @@ -2990,7 +3065,11 @@ msgid "unknown relocation unspec" msgstr "" #: config/alpha/alpha.c:5437 config/crx/crx.c:1092 -#: config/rs6000/rs6000.c:14998 config/spu/spu.c:1695 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14988 config/spu/spu.c:1695 +======= +#: config/rs6000/rs6000.c:14986 config/spu/spu.c:1695 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%xn code" msgstr "" @@ -3017,55 +3096,96 @@ msgstr "" #. Unknown flag. #. Undocumented flag. -#: config/arc/arc.c:1796 config/m32r/m32r.c:2101 config/sparc/sparc.c:7160 +#: config/arc/arc.c:1796 config/m32r/m32r.c:2101 config/sparc/sparc.c:7164 #, c-format msgid "invalid operand output code" msgstr "" -#: config/arm/arm.c:14826 config/arm/arm.c:14844 +<<<<<<< HEAD +#: config/arm/arm.c:14854 config/arm/arm.c:14872 +======= +#: config/arm/arm.c:14861 config/arm/arm.c:14879 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "predicated Thumb instruction" msgstr "" -#: config/arm/arm.c:14832 +<<<<<<< HEAD +#: config/arm/arm.c:14860 +======= +#: config/arm/arm.c:14867 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "predicated instruction in conditional sequence" msgstr "" -#: config/arm/arm.c:15002 +<<<<<<< HEAD +#: config/arm/arm.c:15030 +======= +#: config/arm/arm.c:15037 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid shift operand" msgstr "" -#: config/arm/arm.c:15049 config/arm/arm.c:15059 config/arm/arm.c:15069 -#: config/arm/arm.c:15079 config/arm/arm.c:15089 config/arm/arm.c:15128 -#: config/arm/arm.c:15146 config/arm/arm.c:15181 config/arm/arm.c:15200 -#: config/arm/arm.c:15215 config/arm/arm.c:15242 config/arm/arm.c:15249 -#: config/arm/arm.c:15267 config/arm/arm.c:15274 config/arm/arm.c:15282 -#: config/arm/arm.c:15303 config/arm/arm.c:15310 config/arm/arm.c:15400 -#: config/arm/arm.c:15407 config/arm/arm.c:15425 config/arm/arm.c:15432 +<<<<<<< HEAD +#: config/arm/arm.c:15077 config/arm/arm.c:15087 config/arm/arm.c:15097 +#: config/arm/arm.c:15107 config/arm/arm.c:15117 config/arm/arm.c:15156 +#: config/arm/arm.c:15174 config/arm/arm.c:15209 config/arm/arm.c:15228 +#: config/arm/arm.c:15243 config/arm/arm.c:15270 config/arm/arm.c:15277 +#: config/arm/arm.c:15295 config/arm/arm.c:15302 config/arm/arm.c:15310 +#: config/arm/arm.c:15331 config/arm/arm.c:15338 config/arm/arm.c:15428 +#: config/arm/arm.c:15435 config/arm/arm.c:15453 config/arm/arm.c:15460 +#: config/bfin/bfin.c:1696 config/bfin/bfin.c:1703 config/bfin/bfin.c:1710 +#: config/bfin/bfin.c:1717 config/bfin/bfin.c:1726 config/bfin/bfin.c:1733 +#: config/bfin/bfin.c:1740 config/bfin/bfin.c:1747 +======= +#: config/arm/arm.c:15084 config/arm/arm.c:15094 config/arm/arm.c:15104 +#: config/arm/arm.c:15114 config/arm/arm.c:15124 config/arm/arm.c:15163 +#: config/arm/arm.c:15181 config/arm/arm.c:15216 config/arm/arm.c:15235 +#: config/arm/arm.c:15250 config/arm/arm.c:15277 config/arm/arm.c:15284 +#: config/arm/arm.c:15302 config/arm/arm.c:15309 config/arm/arm.c:15317 +#: config/arm/arm.c:15338 config/arm/arm.c:15345 config/arm/arm.c:15435 +#: config/arm/arm.c:15442 config/arm/arm.c:15460 config/arm/arm.c:15467 #: config/bfin/bfin.c:1695 config/bfin/bfin.c:1702 config/bfin/bfin.c:1709 #: config/bfin/bfin.c:1716 config/bfin/bfin.c:1725 config/bfin/bfin.c:1732 #: config/bfin/bfin.c:1739 config/bfin/bfin.c:1746 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid operand for code '%c'" msgstr "" -#: config/arm/arm.c:15141 +<<<<<<< HEAD +#: config/arm/arm.c:15169 +======= +#: config/arm/arm.c:15176 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "instruction never executed" msgstr "" -#: config/arm/arm.c:15444 +<<<<<<< HEAD +#: config/arm/arm.c:15472 +======= +#: config/arm/arm.c:15479 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "missing operand" msgstr "" -#: config/arm/arm.c:17718 +<<<<<<< HEAD +#: config/arm/arm.c:17746 msgid "function parameters cannot have __fp16 type" msgstr "" -#: config/arm/arm.c:17728 +#: config/arm/arm.c:17756 +======= +#: config/arm/arm.c:17753 +msgid "function parameters cannot have __fp16 type" +msgstr "" + +#: config/arm/arm.c:17763 +>>>>>>> * gcc.pot: Regenerate. msgid "functions cannot return __fp16 type" msgstr "" @@ -3117,20 +3237,24 @@ msgstr "" msgid "internal compiler error. Incorrect shift:" msgstr "" -#: config/bfin/bfin.c:1644 +#: config/bfin/bfin.c:1645 #, c-format msgid "invalid %%j value" msgstr "" -#: config/bfin/bfin.c:1837 +#: config/bfin/bfin.c:1838 #, c-format msgid "invalid const_double operand" msgstr "" -#: config/cris/cris.c:528 config/moxie/moxie.c:91 c-typeck.c:5624 -#: c-typeck.c:5640 c-typeck.c:5657 final.c:3086 final.c:3088 fold-const.c:990 -#: gcc.c:5251 loop-iv.c:2968 loop-iv.c:2977 rtl-error.c:105 toplev.c:629 -#: tree-ssa-loop-niter.c:1885 tree-vrp.c:5704 cp/typeck.c:5039 java/expr.c:411 +#: config/cris/cris.c:528 config/moxie/moxie.c:91 c-typeck.c:5656 +#: c-typeck.c:5672 c-typeck.c:5689 final.c:3089 final.c:3091 fold-const.c:990 +#: gcc.c:5266 loop-iv.c:2968 loop-iv.c:2977 rtl-error.c:105 toplev.c:629 +<<<<<<< HEAD +#: tree-ssa-loop-niter.c:1885 tree-vrp.c:5719 cp/typeck.c:5126 java/expr.c:411 +======= +#: tree-ssa-loop-niter.c:1885 tree-vrp.c:5706 cp/typeck.c:5140 java/expr.c:411 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%s" msgstr "" @@ -3364,71 +3488,123 @@ msgstr "" msgid " (frv)" msgstr "" -#: config/i386/i386.c:10828 +<<<<<<< HEAD +#: config/i386/i386.c:10894 +======= +#: config/i386/i386.c:10897 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid UNSPEC as operand" msgstr "" -#: config/i386/i386.c:11357 +<<<<<<< HEAD +#: config/i386/i386.c:11440 +======= +#: config/i386/i386.c:11444 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "'%%&' used without any local dynamic TLS references" msgstr "" -#: config/i386/i386.c:11448 config/i386/i386.c:11523 +<<<<<<< HEAD +#: config/i386/i386.c:11531 config/i386/i386.c:11606 +======= +#: config/i386/i386.c:11535 config/i386/i386.c:11610 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid operand size for operand code '%c'" msgstr "" -#: config/i386/i386.c:11518 +<<<<<<< HEAD +#: config/i386/i386.c:11601 +======= +#: config/i386/i386.c:11605 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid operand type used with operand code '%c'" msgstr "" -#: config/i386/i386.c:11598 config/i386/i386.c:11638 +<<<<<<< HEAD +#: config/i386/i386.c:11681 config/i386/i386.c:11721 +======= +#: config/i386/i386.c:11685 config/i386/i386.c:11725 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "operand is not a condition code, invalid operand code 'D'" msgstr "" -#: config/i386/i386.c:11664 +<<<<<<< HEAD +#: config/i386/i386.c:11747 +======= +#: config/i386/i386.c:11751 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "operand is neither a constant nor a condition code, invalid operand code 'C'" msgstr "" -#: config/i386/i386.c:11674 +<<<<<<< HEAD +#: config/i386/i386.c:11757 +======= +#: config/i386/i386.c:11761 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "operand is neither a constant nor a condition code, invalid operand code 'F'" msgstr "" -#: config/i386/i386.c:11692 +<<<<<<< HEAD +#: config/i386/i386.c:11775 +======= +#: config/i386/i386.c:11779 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "operand is neither a constant nor a condition code, invalid operand code 'c'" msgstr "" -#: config/i386/i386.c:11702 +<<<<<<< HEAD +#: config/i386/i386.c:11785 +======= +#: config/i386/i386.c:11789 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "operand is neither a constant nor a condition code, invalid operand code 'f'" msgstr "" -#: config/i386/i386.c:11813 +<<<<<<< HEAD +#: config/i386/i386.c:11888 +======= +#: config/i386/i386.c:11900 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "operand is not a condition code, invalid operand code 'Y'" msgstr "" -#: config/i386/i386.c:11828 +<<<<<<< HEAD +#: config/i386/i386.c:11903 +======= +#: config/i386/i386.c:11915 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid operand code '%c'" msgstr "" -#: config/i386/i386.c:11878 +<<<<<<< HEAD +#: config/i386/i386.c:11953 +======= +#: config/i386/i386.c:11965 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid constraints for operand" msgstr "" -#: config/i386/i386.c:19474 +<<<<<<< HEAD +#: config/i386/i386.c:19549 +======= +#: config/i386/i386.c:19561 +>>>>>>> * gcc.pot: Regenerate. msgid "unknown insn mode" msgstr "" @@ -3476,7 +3652,11 @@ msgstr "" msgid "invalid %%P operand" msgstr "" -#: config/iq2000/iq2000.c:3173 config/rs6000/rs6000.c:14573 +<<<<<<< HEAD +#: config/iq2000/iq2000.c:3173 config/rs6000/rs6000.c:14563 +======= +#: config/iq2000/iq2000.c:3173 config/rs6000/rs6000.c:14561 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%p value" msgstr "" @@ -3540,7 +3720,11 @@ msgid "post-increment address is not a register" msgstr "" #: config/m32r/m32r.c:2205 config/m32r/m32r.c:2219 -#: config/rs6000/rs6000.c:23731 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23777 +======= +#: config/rs6000/rs6000.c:23775 +>>>>>>> * gcc.pot: Regenerate. msgid "bad address" msgstr "" @@ -3586,7 +3770,7 @@ msgstr "" msgid "invalid Z register replacement for insn" msgstr "" -#: config/mep/mep.c:3415 +#: config/mep/mep.c:3394 #, c-format msgid "invalid %%L code" msgstr "" @@ -3674,115 +3858,187 @@ msgstr "" msgid "Try running '%s' in the shell to raise its limit.\n" msgstr "" -#: config/rs6000/rs6000.c:2422 +#: config/rs6000/rs6000.c:2419 msgid "-mvsx requires hardware floating point" msgstr "" -#: config/rs6000/rs6000.c:2427 +#: config/rs6000/rs6000.c:2424 msgid "-mvsx and -mpaired are incompatible" msgstr "" -#: config/rs6000/rs6000.c:2432 +#: config/rs6000/rs6000.c:2429 msgid "-mvsx used with little endian code" msgstr "" -#: config/rs6000/rs6000.c:2434 +#: config/rs6000/rs6000.c:2431 msgid "-mvsx needs indexed addressing" msgstr "" -#: config/rs6000/rs6000.c:2438 +#: config/rs6000/rs6000.c:2435 msgid "-mvsx and -mno-altivec are incompatible" msgstr "" -#: config/rs6000/rs6000.c:2440 +#: config/rs6000/rs6000.c:2437 msgid "-mno-altivec disables vsx" msgstr "" -#: config/rs6000/rs6000.c:6705 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:6691 +msgid "bad move" +msgstr "" + +#: config/rs6000/rs6000.c:14362 +======= +#: config/rs6000/rs6000.c:6689 msgid "bad move" msgstr "" -#: config/rs6000/rs6000.c:14372 +#: config/rs6000/rs6000.c:14360 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%c value" msgstr "" -#: config/rs6000/rs6000.c:14400 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14390 +======= +#: config/rs6000/rs6000.c:14388 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%f value" msgstr "" -#: config/rs6000/rs6000.c:14409 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14399 +======= +#: config/rs6000/rs6000.c:14397 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%F value" msgstr "" -#: config/rs6000/rs6000.c:14418 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14408 +======= +#: config/rs6000/rs6000.c:14406 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%G value" msgstr "" -#: config/rs6000/rs6000.c:14453 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14443 +======= +#: config/rs6000/rs6000.c:14441 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%j code" msgstr "" -#: config/rs6000/rs6000.c:14463 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14453 +======= +#: config/rs6000/rs6000.c:14451 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%J code" msgstr "" -#: config/rs6000/rs6000.c:14473 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14463 +======= +#: config/rs6000/rs6000.c:14461 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%k value" msgstr "" -#: config/rs6000/rs6000.c:14493 config/xtensa/xtensa.c:2239 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14483 config/xtensa/xtensa.c:2239 +======= +#: config/rs6000/rs6000.c:14481 config/xtensa/xtensa.c:2239 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%K value" msgstr "" -#: config/rs6000/rs6000.c:14563 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14553 +======= +#: config/rs6000/rs6000.c:14551 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%O value" msgstr "" -#: config/rs6000/rs6000.c:14610 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14600 +======= +#: config/rs6000/rs6000.c:14598 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%q value" msgstr "" -#: config/rs6000/rs6000.c:14654 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14644 +======= +#: config/rs6000/rs6000.c:14642 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%S value" msgstr "" -#: config/rs6000/rs6000.c:14694 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14684 +======= +#: config/rs6000/rs6000.c:14682 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%T value" msgstr "" -#: config/rs6000/rs6000.c:14704 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14694 +======= +#: config/rs6000/rs6000.c:14692 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%u value" msgstr "" -#: config/rs6000/rs6000.c:14713 config/xtensa/xtensa.c:2209 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14703 config/xtensa/xtensa.c:2209 +======= +#: config/rs6000/rs6000.c:14701 config/xtensa/xtensa.c:2209 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%v value" msgstr "" -#: config/rs6000/rs6000.c:14812 config/xtensa/xtensa.c:2260 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14802 config/xtensa/xtensa.c:2260 +======= +#: config/rs6000/rs6000.c:14800 config/xtensa/xtensa.c:2260 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%x value" msgstr "" -#: config/rs6000/rs6000.c:14957 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:14947 +======= +#: config/rs6000/rs6000.c:14945 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "invalid %%y value, try using the 'Z' constraint" msgstr "" -#: config/rs6000/rs6000.c:25704 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:25750 +======= +#: config/rs6000/rs6000.c:25748 +>>>>>>> * gcc.pot: Regenerate. msgid "AltiVec argument passed to unprototyped function" msgstr "" @@ -3801,69 +4057,69 @@ msgstr "" msgid "invalid operand for code: '%c'" msgstr "" -#: config/sh/sh.c:1121 +#: config/sh/sh.c:1125 #, c-format msgid "invalid operand to %%R" msgstr "" -#: config/sh/sh.c:1148 +#: config/sh/sh.c:1152 #, c-format msgid "invalid operand to %%S" msgstr "" -#: config/sh/sh.c:8932 +#: config/sh/sh.c:8968 msgid "created and used with different architectures / ABIs" msgstr "" -#: config/sh/sh.c:8934 +#: config/sh/sh.c:8970 msgid "created and used with different ABIs" msgstr "" -#: config/sh/sh.c:8936 +#: config/sh/sh.c:8972 msgid "created and used with different endianness" msgstr "" -#: config/sparc/sparc.c:6968 config/sparc/sparc.c:6974 +#: config/sparc/sparc.c:6972 config/sparc/sparc.c:6978 #, c-format msgid "invalid %%Y operand" msgstr "" -#: config/sparc/sparc.c:7044 +#: config/sparc/sparc.c:7048 #, c-format msgid "invalid %%A operand" msgstr "" -#: config/sparc/sparc.c:7054 +#: config/sparc/sparc.c:7058 #, c-format msgid "invalid %%B operand" msgstr "" -#: config/sparc/sparc.c:7093 +#: config/sparc/sparc.c:7097 #, c-format msgid "invalid %%c operand" msgstr "" -#: config/sparc/sparc.c:7115 +#: config/sparc/sparc.c:7119 #, c-format msgid "invalid %%d operand" msgstr "" -#: config/sparc/sparc.c:7132 +#: config/sparc/sparc.c:7136 #, c-format msgid "invalid %%f operand" msgstr "" -#: config/sparc/sparc.c:7146 +#: config/sparc/sparc.c:7150 #, c-format msgid "invalid %%s operand" msgstr "" -#: config/sparc/sparc.c:7200 +#: config/sparc/sparc.c:7204 #, c-format msgid "long long constant not a valid immediate operand" msgstr "" -#: config/sparc/sparc.c:7203 +#: config/sparc/sparc.c:7207 #, c-format msgid "floating point constant not a valid immediate operand" msgstr "" @@ -3951,23 +4207,39 @@ msgstr "" msgid "address offset not a constant" msgstr "" -#: cp/call.c:2775 cp/pt.c:1700 cp/pt.c:15861 +<<<<<<< HEAD +#: cp/call.c:2779 cp/pt.c:1701 cp/pt.c:16017 +msgid "candidates are:" +msgstr "" + +#: cp/call.c:2779 cp/pt.c:16017 +msgid "candidate is:" +msgstr "" + +#: cp/call.c:7360 +msgid "candidate 1:" +msgstr "" + +#: cp/call.c:7361 +======= +#: cp/call.c:2775 cp/pt.c:1701 cp/pt.c:16017 msgid "candidates are:" msgstr "" -#: cp/call.c:2775 cp/pt.c:15861 +#: cp/call.c:2775 cp/pt.c:16017 msgid "candidate is:" msgstr "" -#: cp/call.c:7348 +#: cp/call.c:7356 msgid "candidate 1:" msgstr "" -#: cp/call.c:7349 +#: cp/call.c:7357 +>>>>>>> * gcc.pot: Regenerate. msgid "candidate 2:" msgstr "" -#: cp/cxx-pretty-print.c:173 cp/error.c:923 objc/objc-act.c:7138 +#: cp/cxx-pretty-print.c:173 cp/error.c:923 objc/objc-act.c:7141 msgid "" msgstr "" @@ -3975,11 +4247,11 @@ msgstr "" msgid "template-parameter-" msgstr "" -#: cp/decl2.c:693 +#: cp/decl2.c:721 msgid "candidates are: %+#D" msgstr "" -#: cp/decl2.c:695 cp/pt.c:1696 +#: cp/decl2.c:723 cp/pt.c:1697 #, gcc-internal-format msgid "candidate is: %+#D" msgstr "" @@ -4121,16 +4393,26 @@ msgstr "" msgid "%s:%d: instantiated from %qs\n" msgstr "" -#: cp/error.c:2756 +#: cp/error.c:2755 #, c-format msgid "%s:%d:%d: instantiated from here" msgstr "" -#: cp/error.c:2759 +#: cp/error.c:2758 #, c-format msgid "%s:%d: instantiated from here" msgstr "" +#: cp/error.c:2794 +#, c-format +msgid "%s:%d:%d: [ skipping %d instantiation contexts ]\n" +msgstr "" + +#: cp/error.c:2798 +#, c-format +msgid "%s:%d: [ skipping %d instantiation contexts ]\n" +msgstr "" + #: cp/g++spec.c:261 java/jvspec.c:403 #, c-format msgid "argument to '%s' missing\n" @@ -4176,48 +4458,88 @@ msgstr "" msgid "source type is not polymorphic" msgstr "" -#: cp/typeck.c:4592 c-typeck.c:3339 +<<<<<<< HEAD +#: cp/typeck.c:4679 c-typeck.c:3345 +======= +#: cp/typeck.c:4693 c-typeck.c:3345 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong type argument to unary minus" msgstr "" -#: cp/typeck.c:4593 c-typeck.c:3326 +<<<<<<< HEAD +#: cp/typeck.c:4680 c-typeck.c:3332 +======= +#: cp/typeck.c:4694 c-typeck.c:3332 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong type argument to unary plus" msgstr "" -#: cp/typeck.c:4616 c-typeck.c:3365 +<<<<<<< HEAD +#: cp/typeck.c:4703 c-typeck.c:3371 +======= +#: cp/typeck.c:4717 c-typeck.c:3371 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong type argument to bit-complement" msgstr "" -#: cp/typeck.c:4623 c-typeck.c:3373 +<<<<<<< HEAD +#: cp/typeck.c:4710 c-typeck.c:3379 +======= +#: cp/typeck.c:4724 c-typeck.c:3379 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong type argument to abs" msgstr "" -#: cp/typeck.c:4631 c-typeck.c:3385 +<<<<<<< HEAD +#: cp/typeck.c:4718 c-typeck.c:3391 +======= +#: cp/typeck.c:4732 c-typeck.c:3391 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong type argument to conjugation" msgstr "" -#: cp/typeck.c:4642 +<<<<<<< HEAD +#: cp/typeck.c:4729 msgid "in argument to unary !" msgstr "" -#: cp/typeck.c:4703 +#: cp/typeck.c:4790 msgid "no pre-increment operator for type" msgstr "" -#: cp/typeck.c:4705 +#: cp/typeck.c:4792 msgid "no post-increment operator for type" msgstr "" -#: cp/typeck.c:4707 +#: cp/typeck.c:4794 msgid "no pre-decrement operator for type" msgstr "" -#: cp/typeck.c:4709 +#: cp/typeck.c:4796 +======= +#: cp/typeck.c:4743 +msgid "in argument to unary !" +msgstr "" + +#: cp/typeck.c:4804 +msgid "no pre-increment operator for type" +msgstr "" + +#: cp/typeck.c:4806 +msgid "no post-increment operator for type" +msgstr "" + +#: cp/typeck.c:4808 +msgid "no pre-decrement operator for type" +msgstr "" + +#: cp/typeck.c:4810 +>>>>>>> * gcc.pot: Regenerate. msgid "no post-decrement operator for type" msgstr "" @@ -4263,40 +4585,44 @@ msgstr "" msgid "arguments 'a%d' and 'a%d' for intrinsic '%s'" msgstr "" -#: fortran/check.c:2238 fortran/intrinsic.c:3639 +#: fortran/check.c:2238 fortran/intrinsic.c:3640 #, c-format msgid "arguments '%s' and '%s' for intrinsic '%s'" msgstr "" -#: fortran/error.c:737 fortran/error.c:791 fortran/error.c:826 -#: fortran/error.c:901 +#: fortran/error.c:738 fortran/error.c:792 fortran/error.c:827 +#: fortran/error.c:902 msgid "Warning:" msgstr "" -#: fortran/error.c:793 fortran/error.c:881 fortran/error.c:931 +#: fortran/error.c:794 fortran/error.c:882 fortran/error.c:932 msgid "Error:" msgstr "" -#: fortran/error.c:955 +#: fortran/error.c:956 msgid "Fatal Error:" msgstr "" -#: fortran/expr.c:256 +#: fortran/expr.c:257 #, c-format msgid "Constant expression required at %C" msgstr "" -#: fortran/expr.c:259 +#: fortran/expr.c:260 #, c-format msgid "Integer expression required at %C" msgstr "" -#: fortran/expr.c:264 +#: fortran/expr.c:265 #, c-format msgid "Integer value too large in expression at %C" msgstr "" -#: fortran/expr.c:3032 +<<<<<<< HEAD +#: fortran/expr.c:3023 +======= +#: fortran/expr.c:3022 +>>>>>>> * gcc.pot: Regenerate. msgid "array assignment" msgstr "" @@ -4457,19 +4783,19 @@ msgstr "" msgid "Expected real string" msgstr "" -#: fortran/module.c:2974 +#: fortran/module.c:2989 msgid "Expected expression type" msgstr "" -#: fortran/module.c:3028 +#: fortran/module.c:3043 msgid "Bad operator" msgstr "" -#: fortran/module.c:3117 +#: fortran/module.c:3132 msgid "Bad type in constant expression" msgstr "" -#: fortran/module.c:5507 +#: fortran/module.c:5522 msgid "Unexpected end of module" msgstr "" @@ -4517,87 +4843,87 @@ msgstr "" msgid "internal function" msgstr "" -#: fortran/resolve.c:1676 +#: fortran/resolve.c:1686 msgid "elemental procedure" msgstr "" -#: fortran/resolve.c:3319 +#: fortran/resolve.c:3330 #, c-format msgid "Invalid context for NULL() pointer at %%L" msgstr "" -#: fortran/resolve.c:3335 +#: fortran/resolve.c:3346 #, c-format msgid "Operand of unary numeric operator '%s' at %%L is %s" msgstr "" -#: fortran/resolve.c:3351 +#: fortran/resolve.c:3362 #, c-format msgid "Operands of binary numeric operator '%s' at %%L are %s/%s" msgstr "" -#: fortran/resolve.c:3366 +#: fortran/resolve.c:3377 #, c-format msgid "Operands of string concatenation operator at %%L are %s/%s" msgstr "" -#: fortran/resolve.c:3385 +#: fortran/resolve.c:3396 #, c-format msgid "Operands of logical operator '%s' at %%L are %s/%s" msgstr "" -#: fortran/resolve.c:3399 +#: fortran/resolve.c:3410 #, c-format msgid "Operand of .not. operator at %%L is %s" msgstr "" -#: fortran/resolve.c:3413 +#: fortran/resolve.c:3424 msgid "COMPLEX quantities cannot be compared at %L" msgstr "" -#: fortran/resolve.c:3442 +#: fortran/resolve.c:3453 #, c-format msgid "Logicals at %%L must be compared with %s instead of %s" msgstr "" -#: fortran/resolve.c:3448 +#: fortran/resolve.c:3459 #, c-format msgid "Operands of comparison operator '%s' at %%L are %s/%s" msgstr "" -#: fortran/resolve.c:3456 +#: fortran/resolve.c:3467 #, c-format msgid "Unknown operator '%s' at %%L" msgstr "" -#: fortran/resolve.c:3458 +#: fortran/resolve.c:3469 #, c-format msgid "Operand of user operator '%s' at %%L is %s" msgstr "" -#: fortran/resolve.c:3461 +#: fortran/resolve.c:3472 #, c-format msgid "Operands of user operator '%s' at %%L are %s/%s" msgstr "" -#: fortran/resolve.c:3547 +#: fortran/resolve.c:3558 #, c-format msgid "Inconsistent ranks for operator at %%L and %%L" msgstr "" -#: fortran/resolve.c:5700 +#: fortran/resolve.c:5722 msgid "Loop variable" msgstr "" -#: fortran/resolve.c:5712 +#: fortran/resolve.c:5734 msgid "Start expression in DO loop" msgstr "" -#: fortran/resolve.c:5716 +#: fortran/resolve.c:5738 msgid "End expression in DO loop" msgstr "" -#: fortran/resolve.c:5720 +#: fortran/resolve.c:5742 msgid "Step expression in DO loop" msgstr "" @@ -4606,21 +4932,29 @@ msgstr "" msgid "Different CHARACTER lengths (%ld/%ld) in array constructor" msgstr "" -#: fortran/trans-decl.c:3975 +<<<<<<< HEAD +#: fortran/trans-decl.c:3989 +======= +#: fortran/trans-decl.c:3982 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "Actual string length does not match the declared one for dummy argument '%" "s' (%ld/%ld)" msgstr "" -#: fortran/trans-decl.c:3983 +<<<<<<< HEAD +#: fortran/trans-decl.c:3997 +======= +#: fortran/trans-decl.c:3990 +>>>>>>> * gcc.pot: Regenerate. #, c-format msgid "" "Actual string length is shorter than the declared one for dummy argument '%" "s' (%ld/%ld)" msgstr "" -#: fortran/trans-expr.c:1620 +#: fortran/trans-expr.c:1624 msgid "internal error: bad hash value in dynamic dispatch" msgstr "" @@ -4650,11 +4984,11 @@ msgstr "" msgid "Assigned label is not a target label" msgstr "" -#: fortran/trans-stmt.c:882 fortran/trans-stmt.c:1143 +#: fortran/trans-stmt.c:882 fortran/trans-stmt.c:1152 msgid "Loop variable has been modified" msgstr "" -#: fortran/trans-stmt.c:1006 +#: fortran/trans-stmt.c:1015 msgid "DO step value is zero" msgstr "" @@ -4670,37 +5004,37 @@ msgstr "" msgid "Incorrect function return value" msgstr "" -#: fortran/trans.c:521 fortran/trans.c:952 -msgid "Attempt to allocate a negative amount of memory." -msgstr "" - -#: fortran/trans.c:541 +#: fortran/trans.c:533 msgid "Memory allocation failed" msgstr "" -#: fortran/trans.c:624 +#: fortran/trans.c:619 msgid "" "Attempt to allocate negative amount of memory. Possible integer overflow" msgstr "" -#: fortran/trans.c:658 fortran/trans.c:971 +#: fortran/trans.c:653 fortran/trans.c:966 msgid "Out of memory" msgstr "" -#: fortran/trans.c:751 +#: fortran/trans.c:746 #, c-format msgid "Attempting to allocate already allocated array '%s'" msgstr "" -#: fortran/trans.c:757 +#: fortran/trans.c:752 msgid "Attempting to allocate already allocatedarray" msgstr "" -#: fortran/trans.c:868 +#: fortran/trans.c:863 #, c-format msgid "Attempt to DEALLOCATE unallocated '%s'" msgstr "" +#: fortran/trans.c:947 +msgid "Attempt to allocate a negative amount of memory." +msgstr "" + #: java/jcf-dump.c:1068 #, c-format msgid "Not a valid Java .class file.\n" @@ -4925,25 +5259,29 @@ msgstr "" msgid "gfortran does not support -E without -cpp" msgstr "" -#: config/rs6000/sysv4.h:870 config/ia64/freebsd.h:26 -#: config/i386/freebsd.h:103 config/alpha/freebsd.h:33 -#: config/sparc/freebsd.h:34 -msgid "consider using `-pg' instead of `-p' with gprof(1)" -msgstr "" - -#: config/rs6000/sysv4.h:907 config/rs6000/sysv4.h:909 -#: config/alpha/linux-elf.h:33 config/alpha/linux-elf.h:35 -#: config/rs6000/linux64.h:354 config/rs6000/linux64.h:356 config/linux.h:111 -#: config/linux.h:113 -msgid "-mglibc and -muclibc used together" +#: config/arc/arc.h:61 config/mips/mips.h:1230 +msgid "may not use both -EB and -EL" msgstr "" #: config/mcore/mcore.h:54 msgid "the m210 does not have little endian support" msgstr "" -#: config/arc/arc.h:61 config/mips/mips.h:1230 -msgid "may not use both -EB and -EL" +#: ada/gcc-interface/lang-specs.h:33 gcc.c:896 java/jvspec.c:81 +msgid "-pg and -fomit-frame-pointer are incompatible" +msgstr "" + +#: ada/gcc-interface/lang-specs.h:34 +msgid "-c or -S required for Ada" +<<<<<<< HEAD +msgstr "" + +#: config/sparc/freebsd.h:34 config/rs6000/sysv4.h:870 +#: config/ia64/freebsd.h:26 config/i386/freebsd.h:103 +#: config/alpha/freebsd.h:33 +msgid "consider using `-pg' instead of `-p' with gprof(1)" +======= +>>>>>>> * gcc.pot: Regenerate. msgstr "" #: config/sparc/linux64.h:165 config/sparc/linux64.h:176 @@ -4973,10 +5311,6 @@ msgstr "" msgid "GCC does not support -C or -CC without -E" msgstr "" -#: gcc.c:896 java/jvspec.c:81 ada/gcc-interface/lang-specs.h:33 -msgid "-pg and -fomit-frame-pointer are incompatible" -msgstr "" - #: gcc.c:1073 msgid "GNU C no longer supports -traditional without -E" msgstr "" @@ -4990,6 +5324,22 @@ msgstr "" msgid "shared and mdll are not compatible" msgstr "" +<<<<<<< HEAD +======= +#: config/rs6000/sysv4.h:870 config/ia64/freebsd.h:26 +#: config/i386/freebsd.h:103 config/alpha/freebsd.h:33 +#: config/sparc/freebsd.h:34 +msgid "consider using `-pg' instead of `-p' with gprof(1)" +msgstr "" + +>>>>>>> * gcc.pot: Regenerate. +#: config/rs6000/sysv4.h:907 config/rs6000/sysv4.h:909 +#: config/alpha/linux-elf.h:33 config/alpha/linux-elf.h:35 +#: config/rs6000/linux64.h:356 config/rs6000/linux64.h:358 config/linux.h:111 +#: config/linux.h:113 +msgid "-mglibc and -muclibc used together" +msgstr "" + #: config/pa/pa-hpux10.h:87 config/pa/pa-hpux10.h:90 config/pa/pa-hpux10.h:98 #: config/pa/pa-hpux10.h:101 config/pa/pa-hpux11.h:108 #: config/pa/pa-hpux11.h:111 config/pa/pa64-hpux.h:30 config/pa/pa64-hpux.h:33 @@ -5044,10 +5394,6 @@ msgstr "" msgid "rx200 cpu does not have FPU hardware" msgstr "" -#: config/s390/tpf.h:119 -msgid "static is not supported on TPF-OS" -msgstr "" - #: config/arm/freebsd.h:31 msgid "consider using `-pg' instead of `-p' with gprof(1) " msgstr "" @@ -5076,6 +5422,10 @@ msgstr "" msgid "`-mno-intel-syntax' is deprecated. Use `-masm=att' instead." msgstr "" +#: config/s390/tpf.h:119 +msgid "static is not supported on TPF-OS" +msgstr "" + #: config/mips/r3900.h:34 msgid "-mhard-float not supported" msgstr "" @@ -5092,10 +5442,6 @@ msgstr "" msgid "cannot use mshared and static together" msgstr "" -#: ada/gcc-interface/lang-specs.h:34 -msgid "-c or -S required for Ada" -msgstr "" - #: java/lang.opt:69 msgid "Warn if deprecated empty statements are found" msgstr "" @@ -5384,7 +5730,7 @@ msgid "Allow arbitrary character line width in fixed mode" msgstr "" #: fortran/lang.opt:249 -msgid "-ffixed-line-length-\t\tUse n as character line width in fixed mode" +msgid "-ffixed-line-length-\tUse n as character line width in fixed mode" msgstr "" #: fortran/lang.opt:253 @@ -5400,7 +5746,7 @@ msgid "Allow arbitrary character line width in free mode" msgstr "" #: fortran/lang.opt:265 -msgid "-ffree-line-length-\t\tUse n as character line width in free mode" +msgid "-ffree-line-length-\tUse n as character line width in free mode" msgstr "" #: fortran/lang.opt:269 @@ -5463,66 +5809,70 @@ msgid "Try to lay out derived types as compactly as possible" msgstr "" #: fortran/lang.opt:329 -msgid "Enable range checking during compilation" +msgid "Protect parentheses in expressions" msgstr "" #: fortran/lang.opt:333 -msgid "Use a 4-byte record marker for unformatted files" +msgid "Enable range checking during compilation" msgstr "" #: fortran/lang.opt:337 -msgid "Use an 8-byte record marker for unformatted files" +msgid "Use a 4-byte record marker for unformatted files" msgstr "" #: fortran/lang.opt:341 -msgid "Allocate local variables on the stack to allow indirect recursion" +msgid "Use an 8-byte record marker for unformatted files" msgstr "" #: fortran/lang.opt:345 -msgid "Copy array sections into a contiguous block on procedure entry" +msgid "Allocate local variables on the stack to allow indirect recursion" msgstr "" #: fortran/lang.opt:349 -msgid "-fcheck=[...]\tSpecify which runtime checks are to be performed" +msgid "Copy array sections into a contiguous block on procedure entry" msgstr "" #: fortran/lang.opt:353 +msgid "-fcheck=[...]\tSpecify which runtime checks are to be performed" +msgstr "" + +#: fortran/lang.opt:357 msgid "Append a second underscore if the name already contains an underscore" msgstr "" -#: fortran/lang.opt:361 +#: fortran/lang.opt:365 msgid "Apply negative sign to zero values" msgstr "" -#: fortran/lang.opt:365 +#: fortran/lang.opt:369 msgid "Append underscores to externally visible names" msgstr "" -#: fortran/lang.opt:369 +#: fortran/lang.opt:373 msgid "Compile all program units at once and check all interfaces" msgstr "" -#: fortran/lang.opt:409 +#: fortran/lang.opt:413 msgid "Statically link the GNU Fortran helper library (libgfortran)" msgstr "" -#: fortran/lang.opt:413 +#: fortran/lang.opt:417 msgid "Conform to the ISO Fortran 2003 standard" msgstr "" -#: fortran/lang.opt:417 +#: fortran/lang.opt:421 msgid "Conform to the ISO Fortran 2008 standard" msgstr "" -#: fortran/lang.opt:421 +#: fortran/lang.opt:425 msgid "Conform to the ISO Fortran 95 standard" msgstr "" -#: fortran/lang.opt:425 +#: fortran/lang.opt:429 msgid "Conform to nothing in particular" msgstr "" -#: fortran/lang.opt:429 +#: fortran/lang.opt:433 msgid "Accept extensions to support legacy code" msgstr "" @@ -9112,789 +9462,793 @@ msgid "Warn for implicit type conversions that may change a value" msgstr "" #: c.opt:176 -msgid "Warn for implicit type conversions between signed and unsigned integers" +msgid "Warn for converting NULL from/to a non-pointer type" msgstr "" #: c.opt:180 -msgid "Warn when all constructors and destructors are private" +msgid "Warn for implicit type conversions between signed and unsigned integers" msgstr "" #: c.opt:184 -msgid "Warn when a declaration is found after a statement" +msgid "Warn when all constructors and destructors are private" msgstr "" #: c.opt:188 -msgid "Warn if a deprecated compiler feature, class, method, or field is used" +msgid "Warn when a declaration is found after a statement" msgstr "" #: c.opt:192 -msgid "Warn about compile-time integer division by zero" +msgid "Warn if a deprecated compiler feature, class, method, or field is used" msgstr "" #: c.opt:196 -msgid "Warn about violations of Effective C++ style rules" +msgid "Warn about compile-time integer division by zero" msgstr "" #: c.opt:200 -msgid "Warn about an empty body in an if or else statement" +msgid "Warn about violations of Effective C++ style rules" msgstr "" #: c.opt:204 -msgid "Warn about stray tokens after #elif and #endif" +msgid "Warn about an empty body in an if or else statement" msgstr "" #: c.opt:208 +msgid "Warn about stray tokens after #elif and #endif" +msgstr "" + +#: c.opt:212 msgid "Warn about comparison of different enum types" msgstr "" -#: c.opt:216 +#: c.opt:220 msgid "" "This switch is deprecated; use -Werror=implicit-function-declaration instead" msgstr "" -#: c.opt:220 +#: c.opt:224 msgid "Warn if testing floating point numbers for equality" msgstr "" -#: c.opt:224 +#: c.opt:228 msgid "Warn about printf/scanf/strftime/strfmon format string anomalies" msgstr "" -#: c.opt:228 +#: c.opt:232 msgid "Warn if passing too many arguments to a function for its format string" msgstr "" -#: c.opt:232 +#: c.opt:236 msgid "Warn about format strings that are not literals" msgstr "" -#: c.opt:236 +#: c.opt:240 msgid "Warn about format strings that contain NUL bytes" msgstr "" -#: c.opt:240 +#: c.opt:244 msgid "Warn about possible security problems with format functions" msgstr "" -#: c.opt:244 +#: c.opt:248 msgid "Warn about strftime formats yielding 2-digit years" msgstr "" -#: c.opt:248 +#: c.opt:252 msgid "Warn about zero-length formats" msgstr "" -#: c.opt:255 +#: c.opt:259 msgid "Warn whenever type qualifiers are ignored." msgstr "" -#: c.opt:259 +#: c.opt:263 msgid "Warn about variables which are initialized to themselves" msgstr "" -#: c.opt:266 +#: c.opt:270 msgid "Warn about implicit function declarations" msgstr "" -#: c.opt:270 +#: c.opt:274 msgid "Warn when a declaration does not specify a type" msgstr "" -#: c.opt:277 +#: c.opt:281 msgid "" "Warn when there is a cast to a pointer from an integer of a different size" msgstr "" -#: c.opt:281 +#: c.opt:285 msgid "Warn about invalid uses of the \"offsetof\" macro" msgstr "" -#: c.opt:285 +#: c.opt:289 msgid "Warn about PCH files that are found but not used" msgstr "" -#: c.opt:289 +#: c.opt:293 msgid "Warn when a jump misses a variable initialization" msgstr "" -#: c.opt:293 +#: c.opt:297 msgid "" "Warn when a logical operator is suspiciously always evaluating to true or " "false" msgstr "" -#: c.opt:297 +#: c.opt:301 msgid "Do not warn about using \"long long\" when -pedantic" msgstr "" -#: c.opt:301 +#: c.opt:305 msgid "Warn about suspicious declarations of \"main\"" msgstr "" -#: c.opt:305 +#: c.opt:309 msgid "Warn about possibly missing braces around initializers" msgstr "" -#: c.opt:309 +#: c.opt:313 msgid "Warn about global functions without previous declarations" msgstr "" -#: c.opt:313 +#: c.opt:317 msgid "Warn about missing fields in struct initializers" msgstr "" -#: c.opt:317 +#: c.opt:321 msgid "Warn about functions which might be candidates for format attributes" msgstr "" -#: c.opt:321 +#: c.opt:325 msgid "Warn about user-specified include directories that do not exist" msgstr "" -#: c.opt:325 +#: c.opt:329 msgid "" "Warn about function parameters declared without a type specifier in K&R-" "style functions" msgstr "" -#: c.opt:329 +#: c.opt:333 msgid "Warn about global functions without prototypes" msgstr "" -#: c.opt:333 +#: c.opt:337 msgid "Warn about use of multi-character character constants" msgstr "" -#: c.opt:337 +#: c.opt:341 msgid "Warn about \"extern\" declarations not at file scope" msgstr "" -#: c.opt:341 +#: c.opt:345 msgid "" "Warn when non-templatized friend functions are declared within a template" msgstr "" -#: c.opt:345 +#: c.opt:349 msgid "Warn about non-virtual destructors" msgstr "" -#: c.opt:349 +#: c.opt:353 msgid "" "Warn about NULL being passed to argument slots marked as requiring non-NULL" msgstr "" -#: c.opt:353 +#: c.opt:357 msgid "-Wnormalized=\tWarn about non-normalised Unicode strings" msgstr "" -#: c.opt:357 +#: c.opt:361 msgid "Warn if a C-style cast is used in a program" msgstr "" -#: c.opt:361 +#: c.opt:365 msgid "Warn for obsolescent usage in a declaration" msgstr "" -#: c.opt:365 +#: c.opt:369 msgid "Warn if an old-style parameter definition is used" msgstr "" -#: c.opt:369 +#: c.opt:373 msgid "" "Warn if a string is longer than the maximum portable length specified by the " "standard" msgstr "" -#: c.opt:373 +#: c.opt:377 msgid "Warn about overloaded virtual function names" msgstr "" -#: c.opt:377 +#: c.opt:381 msgid "Warn about overriding initializers without side effects" msgstr "" -#: c.opt:381 +#: c.opt:385 msgid "Warn about packed bit-fields whose offset changed in GCC 4.4" msgstr "" -#: c.opt:385 +#: c.opt:389 msgid "Warn about possibly missing parentheses" msgstr "" -#: c.opt:389 +#: c.opt:393 msgid "Warn when converting the type of pointers to member functions" msgstr "" -#: c.opt:393 +#: c.opt:397 msgid "Warn about function pointer arithmetic" msgstr "" -#: c.opt:397 +#: c.opt:401 msgid "Warn when a pointer is cast to an integer of a different size" msgstr "" -#: c.opt:401 +#: c.opt:405 msgid "Warn about misuses of pragmas" msgstr "" -#: c.opt:405 +#: c.opt:409 msgid "Warn if inherited methods are unimplemented" msgstr "" -#: c.opt:409 +#: c.opt:413 msgid "Warn about multiple declarations of the same object" msgstr "" -#: c.opt:413 +#: c.opt:417 msgid "Warn when the compiler reorders code" msgstr "" -#: c.opt:417 +#: c.opt:421 msgid "" "Warn whenever a function's return type defaults to \"int\" (C), or about " "inconsistent return types (C++)" msgstr "" -#: c.opt:421 +#: c.opt:425 msgid "Warn if a selector has multiple methods" msgstr "" -#: c.opt:425 +#: c.opt:429 msgid "Warn about possible violations of sequence point rules" msgstr "" -#: c.opt:429 +#: c.opt:433 msgid "Warn about signed-unsigned comparisons" msgstr "" -#: c.opt:433 +#: c.opt:437 msgid "Warn when overload promotes from unsigned to signed" msgstr "" -#: c.opt:437 +#: c.opt:441 msgid "Warn about uncasted NULL used as sentinel" msgstr "" -#: c.opt:441 +#: c.opt:445 msgid "Warn about unprototyped function declarations" msgstr "" -#: c.opt:445 +#: c.opt:449 msgid "Warn if type signatures of candidate methods do not match exactly" msgstr "" -#: c.opt:449 +#: c.opt:453 msgid "" "Warn when __sync_fetch_and_nand and __sync_nand_and_fetch built-in functions " "are used" msgstr "" -#: c.opt:453 +#: c.opt:457 msgid "Deprecated. This switch has no effect" msgstr "" -#: c.opt:461 +#: c.opt:465 msgid "Warn about features not present in traditional C" msgstr "" -#: c.opt:465 +#: c.opt:469 msgid "" "Warn of prototypes causing type conversions different from what would happen " "in the absence of prototype" msgstr "" -#: c.opt:469 +#: c.opt:473 msgid "" "Warn if trigraphs are encountered that might affect the meaning of the " "program" msgstr "" -#: c.opt:473 +#: c.opt:477 msgid "Warn about @selector()s without previously declared methods" msgstr "" -#: c.opt:477 +#: c.opt:481 msgid "Warn if an undefined macro is used in an #if directive" msgstr "" -#: c.opt:481 +#: c.opt:485 msgid "Warn about unrecognized pragmas" msgstr "" -#: c.opt:485 +#: c.opt:489 msgid "Warn about unsuffixed float constants" msgstr "" -#: c.opt:489 +#: c.opt:493 msgid "Warn about macros defined in the main file that are not used" msgstr "" -#: c.opt:493 +#: c.opt:497 msgid "" "Warn if a caller of a function, marked with attribute warn_unused_result, " "does not use its return value" msgstr "" -#: c.opt:497 +#: c.opt:501 msgid "Do not warn about using variadic macros when -pedantic" msgstr "" -#: c.opt:501 +#: c.opt:505 msgid "Warn if a variable length array is used" msgstr "" -#: c.opt:505 +#: c.opt:509 msgid "Warn when a register variable is declared volatile" msgstr "" -#: c.opt:509 +#: c.opt:513 msgid "" "In C++, nonzero means warn about deprecated conversion from string literals " "to `char *'. In C, similar warning, except that the conversion is of course " "not deprecated by the ISO C standard." msgstr "" -#: c.opt:513 +#: c.opt:517 msgid "Warn when a pointer differs in signedness in an assignment" msgstr "" -#: c.opt:517 +#: c.opt:521 msgid "A synonym for -std=c89 (for C) or -std=c++98 (for C++)" msgstr "" -#: c.opt:525 +#: c.opt:529 msgid "Enforce class member access control semantics" msgstr "" -#: c.opt:532 +#: c.opt:536 msgid "Change when template instances are emitted" msgstr "" -#: c.opt:536 +#: c.opt:540 msgid "Recognize the \"asm\" keyword" msgstr "" -#: c.opt:540 +#: c.opt:544 msgid "Recognize built-in functions" msgstr "" -#: c.opt:547 +#: c.opt:551 msgid "Check the return value of new" msgstr "" -#: c.opt:551 +#: c.opt:555 msgid "Allow the arguments of the '?' operator to have different types" msgstr "" -#: c.opt:555 +#: c.opt:559 msgid "Reduce the size of object files" msgstr "" -#: c.opt:559 +#: c.opt:563 msgid "-fconst-string-class=\tUse class for constant strings" msgstr "" -#: c.opt:563 +#: c.opt:567 msgid "" "-fno-deduce-init-list\tdisable deduction of std::initializer_list for a " "template type parameter from a brace-enclosed initializer-list" msgstr "" -#: c.opt:567 +#: c.opt:571 msgid "Inline member functions by default" msgstr "" -#: c.opt:571 +#: c.opt:575 msgid "Preprocess directives only." msgstr "" -#: c.opt:575 +#: c.opt:579 msgid "Permit '$' as an identifier character" msgstr "" -#: c.opt:582 +#: c.opt:586 msgid "Generate code to check exception specifications" msgstr "" -#: c.opt:589 +#: c.opt:593 msgid "" "-fexec-charset=\tConvert all strings and character constants to " "character set " msgstr "" -#: c.opt:593 +#: c.opt:597 msgid "Permit universal character names (\\u and \\U) in identifiers" msgstr "" -#: c.opt:597 +#: c.opt:601 msgid "" "-finput-charset=\tSpecify the default character set for source files" msgstr "" -#: c.opt:605 +#: c.opt:609 msgid "Scope of for-init-statement variables is local to the loop" msgstr "" -#: c.opt:609 +#: c.opt:613 msgid "Do not assume that standard C libraries and \"main\" exist" msgstr "" -#: c.opt:613 +#: c.opt:617 msgid "Recognize GNU-defined keywords" msgstr "" -#: c.opt:617 +#: c.opt:621 msgid "Generate code for GNU runtime environment" msgstr "" -#: c.opt:621 +#: c.opt:625 msgid "Use traditional GNU semantics for inline functions" msgstr "" -#: c.opt:634 +#: c.opt:638 msgid "Assume normal C execution environment" msgstr "" -#: c.opt:638 +#: c.opt:642 msgid "Enable support for huge objects" msgstr "" -#: c.opt:642 +#: c.opt:646 msgid "Export functions even if they can be inlined" msgstr "" -#: c.opt:646 +#: c.opt:650 msgid "Emit implicit instantiations of inline templates" msgstr "" -#: c.opt:650 +#: c.opt:654 msgid "Emit implicit instantiations of templates" msgstr "" -#: c.opt:654 +#: c.opt:658 msgid "Inject friend functions into enclosing namespace" msgstr "" -#: c.opt:661 +#: c.opt:665 msgid "" "Allow implicit conversions between vectors with differing numbers of " "subparts and/or differing element types." msgstr "" -#: c.opt:665 +#: c.opt:669 msgid "Don't warn about uses of Microsoft extensions" msgstr "" -#: c.opt:675 +#: c.opt:679 msgid "Generate code for NeXT (Apple Mac OS X) runtime environment" msgstr "" -#: c.opt:679 +#: c.opt:683 msgid "Assume that receivers of Objective-C messages may be nil" msgstr "" -#: c.opt:691 +#: c.opt:695 msgid "" "Generate special Objective-C methods to initialize/destroy non-POD C++ " "ivars, if needed" msgstr "" -#: c.opt:695 +#: c.opt:699 msgid "Allow fast jumps to the message dispatcher" msgstr "" -#: c.opt:701 +#: c.opt:705 msgid "Enable Objective-C exception and synchronization syntax" msgstr "" -#: c.opt:705 +#: c.opt:709 msgid "Enable garbage collection (GC) in Objective-C/Objective-C++ programs" msgstr "" -#: c.opt:710 +#: c.opt:714 msgid "Enable Objective-C setjmp exception handling runtime" msgstr "" -#: c.opt:714 +#: c.opt:718 msgid "Enable OpenMP (implies -frecursive in Fortran)" msgstr "" -#: c.opt:718 +#: c.opt:722 msgid "Recognize C++ keywords like \"compl\" and \"xor\"" msgstr "" -#: c.opt:722 +#: c.opt:726 msgid "Enable optional diagnostics" msgstr "" -#: c.opt:729 +#: c.opt:733 msgid "Look for and use PCH files even when preprocessing" msgstr "" -#: c.opt:733 +#: c.opt:737 msgid "Downgrade conformance errors to warnings" msgstr "" -#: c.opt:737 +#: c.opt:741 msgid "Treat the input file as already preprocessed" msgstr "" -#: c.opt:741 +#: c.opt:745 msgid "" "-fno-pretty-templates Do not pretty-print template specializations as the " "template signature followed by the arguments" msgstr "" -#: c.opt:745 +#: c.opt:749 msgid "" "Used in Fix-and-Continue mode to indicate that object files may be swapped " "in at runtime" msgstr "" -#: c.opt:749 +#: c.opt:753 msgid "Enable automatic template instantiation" msgstr "" -#: c.opt:753 +#: c.opt:757 msgid "Generate run time type descriptor information" msgstr "" -#: c.opt:757 +#: c.opt:761 msgid "Use the same size for double as for float" msgstr "" -#: c.opt:761 +#: c.opt:765 msgid "Use the narrowest integer type possible for enumeration types" msgstr "" -#: c.opt:765 +#: c.opt:769 msgid "Force the underlying type for \"wchar_t\" to be \"unsigned short\"" msgstr "" -#: c.opt:769 +#: c.opt:773 msgid "When \"signed\" or \"unsigned\" is not given make the bitfield signed" msgstr "" -#: c.opt:773 +#: c.opt:777 msgid "Make \"char\" signed by default" msgstr "" -#: c.opt:780 +#: c.opt:784 msgid "Display statistics accumulated during compilation" msgstr "" -#: c.opt:787 +#: c.opt:791 msgid "-ftabstop=\tDistance between tab stops for column reporting" msgstr "" -#: c.opt:791 -msgid "-ftemplate-depth-\tSpecify maximum template instantiation depth" +#: c.opt:798 +msgid "-ftemplate-depth=\tSpecify maximum template instantiation depth" msgstr "" -#: c.opt:798 +#: c.opt:805 msgid "" "-fno-threadsafe-statics\tDo not generate thread-safe code for initializing " "local statics" msgstr "" -#: c.opt:802 +#: c.opt:809 msgid "When \"signed\" or \"unsigned\" is not given make the bitfield unsigned" msgstr "" -#: c.opt:806 +#: c.opt:813 msgid "Make \"char\" unsigned by default" msgstr "" -#: c.opt:810 +#: c.opt:817 msgid "Use __cxa_atexit to register destructors" msgstr "" -#: c.opt:814 +#: c.opt:821 msgid "Use __cxa_get_exception_ptr in exception handling" msgstr "" -#: c.opt:818 +#: c.opt:825 msgid "Marks all inlined methods as having hidden visibility" msgstr "" -#: c.opt:822 +#: c.opt:829 msgid "Changes visibility to match Microsoft Visual Studio by default" msgstr "" -#: c.opt:826 +#: c.opt:833 msgid "Discard unused virtual functions" msgstr "" -#: c.opt:830 +#: c.opt:837 msgid "Implement vtables using thunks" msgstr "" -#: c.opt:834 +#: c.opt:841 msgid "Emit common-like symbols as weak symbols" msgstr "" -#: c.opt:838 +#: c.opt:845 msgid "" "-fwide-exec-charset=\tConvert all wide strings and character constants " "to character set " msgstr "" -#: c.opt:842 +#: c.opt:849 msgid "Generate a #line directive pointing at the current working directory" msgstr "" -#: c.opt:846 +#: c.opt:853 msgid "Emit cross referencing information" msgstr "" -#: c.opt:850 +#: c.opt:857 msgid "" "Generate lazy class lookup (via objc_getClass()) for use in Zero-Link mode" msgstr "" -#: c.opt:854 +#: c.opt:861 msgid "Dump declarations to a .decl file" msgstr "" -#: c.opt:858 +#: c.opt:865 msgid "-femit-struct-debug-baseonly\tAggressive reduced debug info for structs" msgstr "" -#: c.opt:862 +#: c.opt:869 msgid "" "-femit-struct-debug-reduced\tConservative reduced debug info for structs" msgstr "" -#: c.opt:866 +#: c.opt:873 msgid "" "-femit-struct-debug-detailed=\tDetailed reduced debug info for " "structs" msgstr "" -#: c.opt:870 +#: c.opt:877 msgid "-idirafter \tAdd to the end of the system include path" msgstr "" -#: c.opt:874 +#: c.opt:881 msgid "-imacros \tAccept definition of macros in " msgstr "" -#: c.opt:878 +#: c.opt:885 msgid "-imultilib \tSet to be the multilib include subdirectory" msgstr "" -#: c.opt:882 +#: c.opt:889 msgid "-include \tInclude the contents of before other files" msgstr "" -#: c.opt:886 +#: c.opt:893 msgid "-iprefix \tSpecify as a prefix for next two options" msgstr "" -#: c.opt:890 +#: c.opt:897 msgid "-isysroot \tSet to be the system root directory" msgstr "" -#: c.opt:894 +#: c.opt:901 msgid "-isystem \tAdd to the start of the system include path" msgstr "" -#: c.opt:898 +#: c.opt:905 msgid "-iquote \tAdd to the end of the quote include path" msgstr "" -#: c.opt:902 +#: c.opt:909 msgid "-iwithprefix \tAdd to the end of the system include path" msgstr "" -#: c.opt:906 +#: c.opt:913 msgid "-iwithprefixbefore \tAdd to the end of the main include path" msgstr "" -#: c.opt:916 +#: c.opt:923 msgid "" "Do not search standard system include directories (those specified with -" "isystem will still be used)" msgstr "" -#: c.opt:920 +#: c.opt:927 msgid "Do not search standard system include directories for C++" msgstr "" -#: c.opt:936 +#: c.opt:943 msgid "Generate C header of platform-specific features" msgstr "" -#: c.opt:940 +#: c.opt:947 msgid "Print a checksum of the executable for PCH validity checking, and stop" msgstr "" -#: c.opt:944 +#: c.opt:951 msgid "Remap file names when including files" msgstr "" -#: c.opt:948 +#: c.opt:955 msgid "Conform to the ISO 1998 C++ standard" msgstr "" -#: c.opt:952 +#: c.opt:959 msgid "" "Conform to the ISO 1998 C++ standard, with extensions that are likely to" msgstr "" -#: c.opt:959 c.opt:994 +#: c.opt:966 c.opt:970 c.opt:1009 msgid "Conform to the ISO 1990 C standard" msgstr "" -#: c.opt:963 c.opt:1002 +#: c.opt:974 c.opt:1017 msgid "Conform to the ISO 1999 C standard" msgstr "" -#: c.opt:967 +#: c.opt:978 msgid "Deprecated in favor of -std=c99" msgstr "" -#: c.opt:971 +#: c.opt:982 msgid "Conform to the ISO 1998 C++ standard with GNU extensions" msgstr "" -#: c.opt:975 +#: c.opt:986 msgid "Conform to the ISO 1998 C++ standard, with GNU extensions and" msgstr "" -#: c.opt:982 +#: c.opt:993 c.opt:997 msgid "Conform to the ISO 1990 C standard with GNU extensions" msgstr "" -#: c.opt:986 +#: c.opt:1001 msgid "Conform to the ISO 1999 C standard with GNU extensions" msgstr "" -#: c.opt:990 +#: c.opt:1005 msgid "Deprecated in favor of -std=gnu99" msgstr "" -#: c.opt:998 +#: c.opt:1013 msgid "Conform to the ISO 1990 C standard as amended in 1994" msgstr "" -#: c.opt:1006 +#: c.opt:1021 msgid "Deprecated in favor of -std=iso9899:1999" msgstr "" -#: c.opt:1010 +#: c.opt:1025 msgid "Enable traditional preprocessing" msgstr "" -#: c.opt:1014 +#: c.opt:1029 msgid "-trigraphs\tSupport ISO C trigraphs" msgstr "" -#: c.opt:1018 +#: c.opt:1033 msgid "Do not predefine system-specific and GCC-specific macros" msgstr "" -#: c.opt:1022 +#: c.opt:1037 msgid "Enable verbose output" msgstr "" @@ -10118,7 +10472,7 @@ msgid "-dumpbase \tSet the file basename to be used for dumps" msgstr "" #: common.opt:258 -msgid "-dumpdir \t\tSet the directory name to be used for dumps" +msgid "-dumpdir \tSet the directory name to be used for dumps" msgstr "" #: common.opt:284 @@ -10237,8 +10591,8 @@ msgid "When running CSE, follow jumps to their targets" msgstr "" #: common.opt:419 common.opt:548 common.opt:769 common.opt:1011 -#: common.opt:1132 common.opt:1191 common.opt:1250 common.opt:1266 -#: common.opt:1338 +#: common.opt:1047 common.opt:1132 common.opt:1191 common.opt:1250 +#: common.opt:1266 common.opt:1338 msgid "Does nothing. Preserved for backward compatibility." msgstr "" @@ -10841,10 +11195,6 @@ msgstr "" msgid "If scheduling post reload, do superblock scheduling" msgstr "" -#: common.opt:1047 -msgid "If scheduling post reload, do trace scheduling" -msgstr "" - #: common.opt:1051 msgid "Reschedule instructions before register allocation" msgstr "" @@ -11328,27 +11678,47 @@ msgstr "" msgid "Create a position independent executable" msgstr "" -#: attribs.c:293 +<<<<<<< HEAD +#: attribs.c:295 +======= +#: attribs.c:294 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE attribute directive ignored" msgstr "" -#: attribs.c:301 +<<<<<<< HEAD +#: attribs.c:303 +======= +#: attribs.c:302 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "wrong number of arguments specified for %qE attribute" msgstr "" -#: attribs.c:319 +<<<<<<< HEAD +#: attribs.c:321 +======= +#: attribs.c:320 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE attribute does not apply to types" msgstr "" -#: attribs.c:370 +<<<<<<< HEAD +#: attribs.c:373 +======= +#: attribs.c:372 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE attribute only applies to function types" msgstr "" -#: attribs.c:380 +<<<<<<< HEAD +#: attribs.c:383 +======= +#: attribs.c:382 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "type attributes ignored after type is already defined" msgstr "" @@ -11389,118 +11759,118 @@ msgstr "" msgid "invalid third argument to %<__builtin_prefetch%>; using zero" msgstr "" -#: builtins.c:4303 +#: builtins.c:4318 #, gcc-internal-format msgid "argument of %<__builtin_args_info%> must be constant" msgstr "" -#: builtins.c:4309 +#: builtins.c:4324 #, gcc-internal-format msgid "argument of %<__builtin_args_info%> out of range" msgstr "" -#: builtins.c:4315 +#: builtins.c:4330 #, gcc-internal-format msgid "missing argument in %<__builtin_args_info%>" msgstr "" -#: builtins.c:4452 gimplify.c:2271 +#: builtins.c:4467 gimplify.c:2271 #, gcc-internal-format msgid "too few arguments to function %" msgstr "" -#: builtins.c:4614 +#: builtins.c:4629 #, gcc-internal-format msgid "first argument to % not of type %" msgstr "" -#: builtins.c:4630 +#: builtins.c:4645 #, gcc-internal-format msgid "%qT is promoted to %qT when passed through %<...%>" msgstr "" -#: builtins.c:4635 +#: builtins.c:4650 #, gcc-internal-format 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:4642 c-typeck.c:2664 +#: builtins.c:4657 c-typeck.c:2664 #, gcc-internal-format msgid "if this code is reached, the program will abort" msgstr "" -#: builtins.c:4769 +#: builtins.c:4784 #, gcc-internal-format msgid "invalid argument to %<__builtin_frame_address%>" msgstr "" -#: builtins.c:4771 +#: builtins.c:4786 #, gcc-internal-format msgid "invalid argument to %<__builtin_return_address%>" msgstr "" -#: builtins.c:4784 +#: builtins.c:4799 #, gcc-internal-format msgid "unsupported argument to %<__builtin_frame_address%>" msgstr "" -#: builtins.c:4786 +#: builtins.c:4801 #, gcc-internal-format msgid "unsupported argument to %<__builtin_return_address%>" msgstr "" -#: builtins.c:5041 +#: builtins.c:5056 #, gcc-internal-format msgid "both arguments to %<__builtin___clear_cache%> must be pointers" msgstr "" -#: builtins.c:5418 builtins.c:5432 +#: builtins.c:5435 builtins.c:5449 #, gcc-internal-format msgid "%qD changed semantics in GCC 4.4" msgstr "" #. All valid uses of __builtin_va_arg_pack () are removed during #. inlining. -#: builtins.c:5822 expr.c:9221 +#: builtins.c:5839 expr.c:9229 msgid "%Kinvalid use of %<__builtin_va_arg_pack ()%>" msgstr "" #. All valid uses of __builtin_va_arg_pack_len () are removed during #. inlining. -#: builtins.c:5828 +#: builtins.c:5845 msgid "%Kinvalid use of %<__builtin_va_arg_pack_len ()%>" msgstr "" -#: builtins.c:6056 +#: builtins.c:6073 #, gcc-internal-format msgid "%<__builtin_longjmp%> second argument must be 1" msgstr "" -#: builtins.c:6656 +#: builtins.c:6673 #, gcc-internal-format msgid "target format does not support infinity" msgstr "" -#: builtins.c:11402 +#: builtins.c:11419 #, gcc-internal-format msgid "% used in function with fixed args" msgstr "" -#: builtins.c:11410 +#: builtins.c:11427 #, gcc-internal-format msgid "wrong number of arguments to function %" msgstr "" #. Evidently an out of date version of ; can't validate #. va_start's second argument, but can still work as intended. -#: builtins.c:11423 +#: builtins.c:11440 #, gcc-internal-format msgid "%<__builtin_next_arg%> called without an argument" msgstr "" -#: builtins.c:11428 +#: builtins.c:11445 #, gcc-internal-format msgid "wrong number of arguments to function %<__builtin_next_arg%>" msgstr "" @@ -11510,39 +11880,39 @@ msgstr "" #. argument. We just warn and set the arg to be the last #. argument so that we will get wrong-code because of #. it. -#: builtins.c:11458 +#: builtins.c:11475 #, gcc-internal-format msgid "second parameter of % not last named argument" msgstr "" -#: builtins.c:11468 +#: builtins.c:11485 #, gcc-internal-format msgid "" "undefined behaviour when second parameter of % is declared with %" " storage" msgstr "" -#: builtins.c:11584 +#: builtins.c:11601 msgid "%Kfirst argument of %D must be a pointer, second integer constant" msgstr "" -#: builtins.c:11597 +#: builtins.c:11614 msgid "%Klast argument of %D is not integer constant between 0 and 3" msgstr "" -#: builtins.c:11642 builtins.c:11793 builtins.c:11850 +#: builtins.c:11659 builtins.c:11810 builtins.c:11867 msgid "%Kcall to %D will always overflow destination buffer" msgstr "" -#: builtins.c:11783 +#: builtins.c:11800 msgid "%Kcall to %D might overflow destination buffer" msgstr "" -#: builtins.c:11871 +#: builtins.c:11888 msgid "%Kattempt to free a non-heap object %qD" msgstr "" -#: builtins.c:11874 +#: builtins.c:11891 msgid "%Kattempt to free a non-heap object" msgstr "" @@ -11680,788 +12050,809 @@ msgstr "" msgid "conversion to %qT from %qT may change the sign of the result" msgstr "" -#: c-common.c:2216 +#: c-common.c:2221 #, gcc-internal-format msgid "conversion to %qT from %qT may alter its value" msgstr "" -#: c-common.c:2244 +#: c-common.c:2249 #, gcc-internal-format msgid "large integer implicitly truncated to unsigned type" msgstr "" -#: c-common.c:2250 c-common.c:2257 c-common.c:2265 +#: c-common.c:2255 c-common.c:2262 c-common.c:2270 #, gcc-internal-format msgid "overflow in implicit constant conversion" msgstr "" -#: c-common.c:2438 +#: c-common.c:2443 #, gcc-internal-format msgid "operation on %qE may be undefined" msgstr "" -#: c-common.c:2746 +#: c-common.c:2751 #, gcc-internal-format msgid "case label does not reduce to an integer constant" msgstr "" -#: c-common.c:2786 +#: c-common.c:2791 #, gcc-internal-format msgid "case label value is less than minimum value for type" msgstr "" -#: c-common.c:2794 +#: c-common.c:2799 #, gcc-internal-format msgid "case label value exceeds maximum value for type" msgstr "" -#: c-common.c:2802 +#: c-common.c:2807 #, gcc-internal-format msgid "lower value in case label range less than minimum value for type" msgstr "" -#: c-common.c:2811 +#: c-common.c:2816 #, gcc-internal-format msgid "upper value in case label range exceeds maximum value for type" msgstr "" -#: c-common.c:2885 +#: c-common.c:2890 #, gcc-internal-format msgid "" "GCC cannot support operators with integer types and fixed-point types that " "have too many integral and fractional bits together" msgstr "" -#: c-common.c:3372 +#: c-common.c:3377 #, gcc-internal-format msgid "invalid operands to binary %s (have %qT and %qT)" msgstr "" -#: c-common.c:3608 +#: c-common.c:3613 #, gcc-internal-format msgid "comparison is always false due to limited range of data type" msgstr "" -#: c-common.c:3610 +#: c-common.c:3615 #, gcc-internal-format msgid "comparison is always true due to limited range of data type" msgstr "" -#: c-common.c:3689 +#: c-common.c:3694 #, gcc-internal-format msgid "comparison of unsigned expression >= 0 is always true" msgstr "" -#: c-common.c:3699 +#: c-common.c:3704 #, gcc-internal-format msgid "comparison of unsigned expression < 0 is always false" msgstr "" -#: c-common.c:3741 +#: c-common.c:3746 #, gcc-internal-format msgid "pointer of type % used in arithmetic" msgstr "" -#: c-common.c:3747 +#: c-common.c:3752 #, gcc-internal-format msgid "pointer to a function used in arithmetic" msgstr "" -#: c-common.c:3753 +#: c-common.c:3758 #, gcc-internal-format msgid "pointer to member function used in arithmetic" msgstr "" -#: c-common.c:3959 +#: c-common.c:3964 #, gcc-internal-format msgid "the address of %qD will always evaluate as %" msgstr "" -#: c-common.c:4060 cp/semantics.c:595 cp/typeck.c:7048 +<<<<<<< HEAD +#: c-common.c:4065 cp/semantics.c:593 cp/typeck.c:7135 +======= +#: c-common.c:4065 cp/semantics.c:593 cp/typeck.c:7149 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "suggest parentheses around assignment used as truth value" msgstr "" -#: c-common.c:4142 c-decl.c:3608 c-typeck.c:10266 +#: c-common.c:4147 c-decl.c:3611 c-typeck.c:10296 #, gcc-internal-format msgid "invalid use of %" msgstr "" -#: c-common.c:4365 +#: c-common.c:4370 #, gcc-internal-format msgid "invalid application of % to a function type" msgstr "" -#: c-common.c:4378 +#: c-common.c:4383 #, gcc-internal-format msgid "invalid application of %qs to a void type" msgstr "" -#: c-common.c:4386 +#: c-common.c:4391 #, gcc-internal-format msgid "invalid application of %qs to incomplete type %qT " msgstr "" -#: c-common.c:4428 +#: c-common.c:4433 #, gcc-internal-format msgid "%<__alignof%> applied to a bit-field" msgstr "" -#: c-common.c:5137 +#: c-common.c:5142 #, gcc-internal-format msgid "cannot disable built-in function %qs" msgstr "" -#: c-common.c:5329 +#: c-common.c:5334 #, gcc-internal-format msgid "pointers are not permitted as case values" msgstr "" -#: c-common.c:5336 +#: c-common.c:5341 #, gcc-internal-format msgid "range expressions in switch statements are non-standard" msgstr "" -#: c-common.c:5362 +#: c-common.c:5367 #, gcc-internal-format msgid "empty range specified" msgstr "" -#: c-common.c:5422 +#: c-common.c:5427 #, gcc-internal-format msgid "duplicate (or overlapping) case value" msgstr "" -#: c-common.c:5424 +#: c-common.c:5429 #, gcc-internal-format msgid "this is the first entry overlapping that value" msgstr "" -#: c-common.c:5428 +#: c-common.c:5433 #, gcc-internal-format msgid "duplicate case value" msgstr "" -#: c-common.c:5429 +#: c-common.c:5434 #, gcc-internal-format msgid "previously used here" msgstr "" -#: c-common.c:5433 +#: c-common.c:5438 #, gcc-internal-format msgid "multiple default labels in one switch" msgstr "" -#: c-common.c:5435 +#: c-common.c:5440 #, gcc-internal-format msgid "this is the first default label" msgstr "" -#: c-common.c:5487 +#: c-common.c:5492 #, gcc-internal-format msgid "case value %qs not in enumerated type" msgstr "" -#: c-common.c:5492 +#: c-common.c:5497 #, gcc-internal-format msgid "case value %qs not in enumerated type %qT" msgstr "" -#: c-common.c:5551 +#: c-common.c:5556 #, gcc-internal-format msgid "switch missing default case" msgstr "" -#: c-common.c:5623 +#: c-common.c:5628 #, gcc-internal-format msgid "enumeration value %qE not handled in switch" msgstr "" -#: c-common.c:5649 +#: c-common.c:5654 #, gcc-internal-format msgid "taking the address of a label is non-standard" msgstr "" -#: c-common.c:5822 +#: c-common.c:5827 #, gcc-internal-format msgid "%qE attribute ignored for field of type %qT" msgstr "" -#: c-common.c:5833 c-common.c:5852 c-common.c:5870 c-common.c:5897 -#: c-common.c:5924 c-common.c:5950 c-common.c:5969 c-common.c:5986 -#: c-common.c:6010 c-common.c:6033 c-common.c:6056 c-common.c:6077 -#: c-common.c:6098 c-common.c:6122 c-common.c:6148 c-common.c:6185 -#: c-common.c:6212 c-common.c:6255 c-common.c:6339 c-common.c:6369 -#: c-common.c:6389 c-common.c:6727 c-common.c:6743 c-common.c:6791 -#: c-common.c:6814 c-common.c:6878 c-common.c:7006 c-common.c:7074 -#: c-common.c:7118 c-common.c:7166 c-common.c:7244 c-common.c:7268 -#: c-common.c:7554 c-common.c:7577 c-common.c:7616 c-common.c:7705 -#: c-common.c:7847 tree.c:5295 tree.c:5307 tree.c:5317 config/darwin.c:1456 -#: config/arm/arm.c:4564 config/arm/arm.c:4592 config/arm/arm.c:4609 -#: config/avr/avr.c:4818 config/h8300/h8300.c:5363 config/h8300/h8300.c:5387 -#: config/i386/i386.c:4448 config/i386/i386.c:25938 config/ia64/ia64.c:635 -#: config/m68hc11/m68hc11.c:1142 config/rs6000/rs6000.c:23518 -#: config/spu/spu.c:3919 +#: c-common.c:5838 c-common.c:5857 c-common.c:5875 c-common.c:5902 +#: c-common.c:5929 c-common.c:5955 c-common.c:5974 c-common.c:5991 +#: c-common.c:6015 c-common.c:6038 c-common.c:6061 c-common.c:6082 +#: c-common.c:6103 c-common.c:6127 c-common.c:6153 c-common.c:6190 +#: c-common.c:6217 c-common.c:6260 c-common.c:6344 c-common.c:6374 +#: c-common.c:6394 c-common.c:6732 c-common.c:6748 c-common.c:6796 +#: c-common.c:6819 c-common.c:6883 c-common.c:7011 c-common.c:7079 +#: c-common.c:7123 c-common.c:7171 c-common.c:7249 c-common.c:7273 +#: c-common.c:7559 c-common.c:7582 c-common.c:7621 c-common.c:7710 +<<<<<<< HEAD +#: c-common.c:7852 tree.c:5307 tree.c:5319 tree.c:5329 config/darwin.c:1455 +#: config/arm/arm.c:4561 config/arm/arm.c:4589 config/arm/arm.c:4606 +#: config/avr/avr.c:4818 config/h8300/h8300.c:5367 config/h8300/h8300.c:5391 +#: config/i386/i386.c:4452 config/i386/i386.c:26044 config/ia64/ia64.c:635 +#: config/m68hc11/m68hc11.c:1142 config/rs6000/rs6000.c:23564 +======= +#: c-common.c:7852 tree.c:5303 tree.c:5315 tree.c:5325 config/darwin.c:1455 +#: config/arm/arm.c:4561 config/arm/arm.c:4589 config/arm/arm.c:4606 +#: config/avr/avr.c:4818 config/h8300/h8300.c:5367 config/h8300/h8300.c:5391 +#: config/i386/i386.c:4452 config/i386/i386.c:26054 config/ia64/ia64.c:635 +#: config/m68hc11/m68hc11.c:1142 config/rs6000/rs6000.c:23562 +>>>>>>> * gcc.pot: Regenerate. +#: config/spu/spu.c:3909 #, gcc-internal-format msgid "%qE attribute ignored" msgstr "" -#: c-common.c:5915 c-common.c:5941 +#: c-common.c:5920 c-common.c:5946 #, gcc-internal-format msgid "%qE attribute conflicts with attribute %s" msgstr "" -#: c-common.c:6179 +#: c-common.c:6184 #, gcc-internal-format msgid "%qE attribute have effect only on public objects" msgstr "" -#: c-common.c:6276 +#: c-common.c:6281 #, gcc-internal-format msgid "destructor priorities are not supported" msgstr "" -#: c-common.c:6278 +#: c-common.c:6283 #, gcc-internal-format msgid "constructor priorities are not supported" msgstr "" -#: c-common.c:6295 +#: c-common.c:6300 #, gcc-internal-format msgid "destructor priorities from 0 to %d are reserved for the implementation" msgstr "" -#: c-common.c:6300 +#: c-common.c:6305 #, gcc-internal-format msgid "constructor priorities from 0 to %d are reserved for the implementation" msgstr "" -#: c-common.c:6308 +#: c-common.c:6313 #, gcc-internal-format msgid "destructor priorities must be integers from 0 to %d inclusive" msgstr "" -#: c-common.c:6311 +#: c-common.c:6316 #, gcc-internal-format msgid "constructor priorities must be integers from 0 to %d inclusive" msgstr "" -#: c-common.c:6433 +#: c-common.c:6438 #, gcc-internal-format msgid "unknown machine mode %qE" msgstr "" -#: c-common.c:6462 +#: c-common.c:6467 #, gcc-internal-format msgid "specifying vector types with __attribute__ ((mode)) is deprecated" msgstr "" -#: c-common.c:6465 +#: c-common.c:6470 #, gcc-internal-format msgid "use __attribute__ ((vector_size)) instead" msgstr "" -#: c-common.c:6474 +#: c-common.c:6479 #, gcc-internal-format msgid "unable to emulate %qs" msgstr "" -#: c-common.c:6485 +#: c-common.c:6490 #, gcc-internal-format msgid "invalid pointer mode %qs" msgstr "" -#: c-common.c:6502 +#: c-common.c:6507 #, gcc-internal-format msgid "signness of type and machine mode %qs don't match" msgstr "" -#: c-common.c:6513 +#: c-common.c:6518 #, gcc-internal-format msgid "no data type for mode %qs" msgstr "" -#: c-common.c:6523 +#: c-common.c:6528 #, gcc-internal-format msgid "cannot use mode %qs for enumeral types" msgstr "" -#: c-common.c:6550 +#: c-common.c:6555 #, gcc-internal-format msgid "mode %qs applied to inappropriate type" msgstr "" -#: c-common.c:6582 +#: c-common.c:6587 #, gcc-internal-format msgid "section attribute cannot be specified for local variables" msgstr "" -#: c-common.c:6593 config/bfin/bfin.c:5651 config/bfin/bfin.c:5702 +<<<<<<< HEAD +#: c-common.c:6598 config/bfin/bfin.c:5652 config/bfin/bfin.c:5703 +#: config/bfin/bfin.c:5730 config/bfin/bfin.c:5743 +======= +#: c-common.c:6598 config/bfin/bfin.c:5651 config/bfin/bfin.c:5702 #: config/bfin/bfin.c:5729 config/bfin/bfin.c:5742 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "section of %q+D conflicts with previous declaration" msgstr "" -#: c-common.c:6601 +#: c-common.c:6606 #, gcc-internal-format msgid "section of %q+D cannot be overridden" msgstr "" -#: c-common.c:6609 +#: c-common.c:6614 #, gcc-internal-format msgid "section attribute not allowed for %q+D" msgstr "" -#: c-common.c:6616 +#: c-common.c:6621 #, gcc-internal-format msgid "section attributes are not supported for this target" msgstr "" -#: c-common.c:6648 +#: c-common.c:6653 #, gcc-internal-format msgid "requested alignment is not a constant" msgstr "" -#: c-common.c:6653 +#: c-common.c:6658 #, gcc-internal-format msgid "requested alignment is not a power of 2" msgstr "" -#: c-common.c:6658 +#: c-common.c:6663 #, gcc-internal-format msgid "requested alignment is too large" msgstr "" -#: c-common.c:6684 +#: c-common.c:6689 #, gcc-internal-format msgid "alignment may not be specified for %q+D" msgstr "" -#: c-common.c:6691 +#: c-common.c:6696 #, gcc-internal-format msgid "" "alignment for %q+D was previously specified as %d and may not be decreased" msgstr "" -#: c-common.c:6695 +#: c-common.c:6700 #, gcc-internal-format msgid "alignment for %q+D must be at least %d" msgstr "" -#: c-common.c:6720 +#: c-common.c:6725 #, gcc-internal-format msgid "inline function %q+D cannot be declared weak" msgstr "" -#: c-common.c:6754 +#: c-common.c:6759 #, gcc-internal-format msgid "%q+D defined both normally and as an alias" msgstr "" -#: c-common.c:6770 +#: c-common.c:6775 #, gcc-internal-format msgid "alias argument not a string" msgstr "" -#: c-common.c:6836 +#: c-common.c:6841 #, gcc-internal-format msgid "weakref attribute must appear before alias attribute" msgstr "" -#: c-common.c:6865 +#: c-common.c:6870 #, gcc-internal-format msgid "%qE attribute ignored on non-class types" msgstr "" -#: c-common.c:6871 +#: c-common.c:6876 #, gcc-internal-format msgid "%qE attribute ignored because %qT is already defined" msgstr "" -#: c-common.c:6884 +#: c-common.c:6889 #, gcc-internal-format msgid "visibility argument not a string" msgstr "" -#: c-common.c:6896 +#: c-common.c:6901 #, gcc-internal-format msgid "%qE attribute ignored on types" msgstr "" -#: c-common.c:6912 +#: c-common.c:6917 #, gcc-internal-format msgid "" "visibility argument must be one of \"default\", \"hidden\", \"protected\" or " "\"internal\"" msgstr "" -#: c-common.c:6923 +#: c-common.c:6928 #, gcc-internal-format msgid "%qD redeclared with different visibility" msgstr "" -#: c-common.c:6926 c-common.c:6930 +#: c-common.c:6931 c-common.c:6935 #, gcc-internal-format msgid "%qD was declared %qs which implies default visibility" msgstr "" -#: c-common.c:7014 +#: c-common.c:7019 #, gcc-internal-format msgid "tls_model argument not a string" msgstr "" -#: c-common.c:7027 +#: c-common.c:7032 #, gcc-internal-format msgid "" "tls_model argument must be one of \"local-exec\", \"initial-exec\", \"local-" "dynamic\" or \"global-dynamic\"" msgstr "" -#: c-common.c:7047 c-common.c:7139 config/m32c/m32c.c:2853 +#: c-common.c:7052 c-common.c:7144 config/m32c/m32c.c:2853 #, gcc-internal-format msgid "%qE attribute applies only to functions" msgstr "" -#: c-common.c:7053 c-common.c:7145 +#: c-common.c:7058 c-common.c:7150 #, gcc-internal-format msgid "can%'t set %qE attribute after definition" msgstr "" -#: c-common.c:7099 +#: c-common.c:7104 #, gcc-internal-format msgid "alloc_size parameter outside range" msgstr "" -#: c-common.c:7202 +#: c-common.c:7207 #, gcc-internal-format msgid "deprecated message is not a string" msgstr "" -#: c-common.c:7242 +#: c-common.c:7247 #, gcc-internal-format msgid "%qE attribute ignored for %qE" msgstr "" -#: c-common.c:7302 +#: c-common.c:7307 #, gcc-internal-format msgid "invalid vector type for attribute %qE" msgstr "" -#: c-common.c:7308 ada/gcc-interface/utils.c:5481 +#: c-common.c:7313 ada/gcc-interface/utils.c:5481 #: ada/gcc-interface/utils.c:5575 #, gcc-internal-format msgid "vector size not an integral multiple of component size" msgstr "" -#: c-common.c:7314 ada/gcc-interface/utils.c:5487 +#: c-common.c:7319 ada/gcc-interface/utils.c:5487 #: ada/gcc-interface/utils.c:5581 #, gcc-internal-format msgid "zero vector size" msgstr "" -#: c-common.c:7322 ada/gcc-interface/utils.c:5495 +#: c-common.c:7327 ada/gcc-interface/utils.c:5495 #: ada/gcc-interface/utils.c:5588 #, gcc-internal-format msgid "number of components of the vector not a power of two" msgstr "" -#: c-common.c:7350 ada/gcc-interface/utils.c:5235 +#: c-common.c:7355 ada/gcc-interface/utils.c:5235 #, gcc-internal-format msgid "nonnull attribute without arguments on a non-prototype" msgstr "" -#: c-common.c:7365 ada/gcc-interface/utils.c:5250 +#: c-common.c:7370 ada/gcc-interface/utils.c:5250 #, gcc-internal-format msgid "nonnull argument has invalid operand number (argument %lu)" msgstr "" -#: c-common.c:7384 ada/gcc-interface/utils.c:5269 +#: c-common.c:7389 ada/gcc-interface/utils.c:5269 #, gcc-internal-format msgid "" "nonnull argument with out-of-range operand number (argument %lu, operand %lu)" msgstr "" -#: c-common.c:7392 ada/gcc-interface/utils.c:5277 +#: c-common.c:7397 ada/gcc-interface/utils.c:5277 #, gcc-internal-format msgid "" "nonnull argument references non-pointer operand (argument %lu, operand %lu)" msgstr "" -#: c-common.c:7468 +#: c-common.c:7473 #, gcc-internal-format msgid "not enough variable arguments to fit a sentinel" msgstr "" -#: c-common.c:7482 +#: c-common.c:7487 #, gcc-internal-format msgid "missing sentinel in function call" msgstr "" -#: c-common.c:7523 +#: c-common.c:7528 #, gcc-internal-format msgid "null argument where non-null required (argument %lu)" msgstr "" -#: c-common.c:7588 +#: c-common.c:7593 #, gcc-internal-format msgid "cleanup argument not an identifier" msgstr "" -#: c-common.c:7595 +#: c-common.c:7600 #, gcc-internal-format msgid "cleanup argument not a function" msgstr "" -#: c-common.c:7634 +#: c-common.c:7639 #, gcc-internal-format msgid "%qE attribute requires prototypes with named arguments" msgstr "" -#: c-common.c:7645 +#: c-common.c:7650 #, gcc-internal-format msgid "%qE attribute only applies to variadic functions" msgstr "" -#: c-common.c:7657 ada/gcc-interface/utils.c:5323 +#: c-common.c:7662 ada/gcc-interface/utils.c:5323 #, gcc-internal-format msgid "requested position is not an integer constant" msgstr "" -#: c-common.c:7665 ada/gcc-interface/utils.c:5330 +#: c-common.c:7670 ada/gcc-interface/utils.c:5330 #, gcc-internal-format msgid "requested position is less than zero" msgstr "" -#: c-common.c:7789 +#: c-common.c:7794 #, gcc-internal-format msgid "Bad option %s to optimize attribute." msgstr "" -#: c-common.c:7792 +#: c-common.c:7797 #, gcc-internal-format msgid "Bad option %s to pragma attribute" msgstr "" -#: c-common.c:7987 +#: c-common.c:7994 #, gcc-internal-format msgid "not enough arguments to function %qE" msgstr "" -#: c-common.c:7992 c-typeck.c:2817 +#: c-common.c:8000 c-typeck.c:2818 #, gcc-internal-format msgid "too many arguments to function %qE" msgstr "" -#: c-common.c:8022 c-common.c:8068 +#: c-common.c:8030 c-common.c:8076 #, gcc-internal-format msgid "non-floating-point argument in call to function %qE" msgstr "" -#: c-common.c:8045 +#: c-common.c:8053 #, gcc-internal-format msgid "non-floating-point arguments in call to function %qE" msgstr "" -#: c-common.c:8061 +#: c-common.c:8069 #, gcc-internal-format msgid "non-const integer argument %u in call to function %qE" msgstr "" -#: c-common.c:8351 +#: c-common.c:8359 #, gcc-internal-format msgid "cannot apply % to static data member %qD" msgstr "" -#: c-common.c:8356 +#: c-common.c:8364 #, gcc-internal-format msgid "cannot apply % when % is overloaded" msgstr "" -#: c-common.c:8363 +#: c-common.c:8371 #, gcc-internal-format msgid "cannot apply % to a non constant address" msgstr "" -#: c-common.c:8376 cp/typeck.c:5004 +<<<<<<< HEAD +#: c-common.c:8384 cp/typeck.c:5091 +======= +#: c-common.c:8384 cp/typeck.c:5105 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attempt to take address of bit-field structure member %qD" msgstr "" -#: c-common.c:8435 +#: c-common.c:8443 #, gcc-internal-format msgid "index %E denotes an offset greater than size of %qT" msgstr "" -#: c-common.c:8472 +#: c-common.c:8480 #, gcc-internal-format msgid "lvalue required as left operand of assignment" msgstr "" -#: c-common.c:8475 +#: c-common.c:8483 #, gcc-internal-format msgid "lvalue required as increment operand" msgstr "" -#: c-common.c:8478 +#: c-common.c:8486 #, gcc-internal-format msgid "lvalue required as decrement operand" msgstr "" -#: c-common.c:8481 +#: c-common.c:8489 #, gcc-internal-format msgid "lvalue required as unary %<&%> operand" msgstr "" -#: c-common.c:8484 +#: c-common.c:8492 #, gcc-internal-format msgid "lvalue required in asm statement" msgstr "" -#: c-common.c:8614 +#: c-common.c:8622 #, gcc-internal-format msgid "size of array is too large" msgstr "" -#: c-common.c:8650 c-common.c:8701 c-typeck.c:3041 +#: c-common.c:8658 c-common.c:8709 c-typeck.c:3045 #, gcc-internal-format msgid "too few arguments to function %qE" msgstr "" -#: c-common.c:8667 c-typeck.c:5374 config/mep/mep.c:6341 +#: c-common.c:8675 c-typeck.c:5406 config/mep/mep.c:6321 #, gcc-internal-format msgid "incompatible type for argument %d of %qE" msgstr "" -#: c-common.c:8864 +#: c-common.c:8872 #, gcc-internal-format msgid "array subscript has type %" msgstr "" -#: c-common.c:8899 +#: c-common.c:8907 #, gcc-internal-format msgid "suggest parentheses around %<+%> inside %<<<%>" msgstr "" -#: c-common.c:8902 +#: c-common.c:8910 #, gcc-internal-format msgid "suggest parentheses around %<-%> inside %<<<%>" msgstr "" -#: c-common.c:8908 +#: c-common.c:8916 #, gcc-internal-format msgid "suggest parentheses around %<+%> inside %<>>%>" msgstr "" -#: c-common.c:8911 +#: c-common.c:8919 #, gcc-internal-format msgid "suggest parentheses around %<-%> inside %<>>%>" msgstr "" -#: c-common.c:8917 +#: c-common.c:8925 #, gcc-internal-format msgid "suggest parentheses around %<&&%> within %<||%>" msgstr "" -#: c-common.c:8926 +#: c-common.c:8934 #, gcc-internal-format msgid "suggest parentheses around arithmetic in operand of %<|%>" msgstr "" -#: c-common.c:8931 +#: c-common.c:8939 #, gcc-internal-format msgid "suggest parentheses around comparison in operand of %<|%>" msgstr "" -#: c-common.c:8935 +#: c-common.c:8943 #, gcc-internal-format msgid "" "suggest parentheses around operand of % or change %<|%> to %<||%> or % to %<~%>" msgstr "" -#: c-common.c:8945 +#: c-common.c:8953 #, gcc-internal-format msgid "suggest parentheses around arithmetic in operand of %<^%>" msgstr "" -#: c-common.c:8950 +#: c-common.c:8958 #, gcc-internal-format msgid "suggest parentheses around comparison in operand of %<^%>" msgstr "" -#: c-common.c:8956 +#: c-common.c:8964 #, gcc-internal-format msgid "suggest parentheses around %<+%> in operand of %<&%>" msgstr "" -#: c-common.c:8959 +#: c-common.c:8967 #, gcc-internal-format msgid "suggest parentheses around %<-%> in operand of %<&%>" msgstr "" -#: c-common.c:8964 +#: c-common.c:8972 #, gcc-internal-format msgid "suggest parentheses around comparison in operand of %<&%>" msgstr "" -#: c-common.c:8968 +#: c-common.c:8976 #, gcc-internal-format msgid "" "suggest parentheses around operand of % or change %<&%> to %<&&%> or % to %<~%>" msgstr "" -#: c-common.c:8976 +#: c-common.c:8984 #, gcc-internal-format msgid "suggest parentheses around comparison in operand of %<==%>" msgstr "" -#: c-common.c:8982 +#: c-common.c:8990 #, gcc-internal-format msgid "suggest parentheses around comparison in operand of %" msgstr "" -#: c-common.c:8993 +#: c-common.c:9001 #, gcc-internal-format msgid "comparisons like % do not have their mathematical meaning" msgstr "" -#: c-common.c:9008 +#: c-common.c:9016 #, gcc-internal-format msgid "label %q+D defined but not used" msgstr "" -#: c-common.c:9010 +#: c-common.c:9018 #, gcc-internal-format msgid "label %q+D declared but not defined" msgstr "" -#: c-common.c:9030 +#: c-common.c:9038 #, gcc-internal-format msgid "division by zero" msgstr "" -#: c-common.c:9062 +#: c-common.c:9070 #, gcc-internal-format msgid "comparison between types %qT and %qT" msgstr "" -#: c-common.c:9113 +#: c-common.c:9121 #, gcc-internal-format msgid "comparison between signed and unsigned integer expressions" msgstr "" -#: c-common.c:9164 +#: c-common.c:9172 #, gcc-internal-format msgid "promoted ~unsigned is always non-zero" msgstr "" -#: c-common.c:9167 +#: c-common.c:9175 #, gcc-internal-format msgid "comparison of promoted ~unsigned with constant" msgstr "" -#: c-common.c:9177 +#: c-common.c:9185 #, gcc-internal-format msgid "comparison of promoted ~unsigned with unsigned" msgstr "" @@ -12471,8 +12862,13 @@ msgstr "" #. an unprototyped function, it is compile-time undefined; #. making it a constraint in that case was rejected in #. DR#252. -#: c-convert.c:102 c-typeck.c:1900 c-typeck.c:4950 cp/typeck.c:1827 -#: cp/typeck.c:6328 cp/typeck.c:6953 fortran/convert.c:88 +<<<<<<< HEAD +#: c-convert.c:102 c-typeck.c:1900 c-typeck.c:4982 cp/typeck.c:1836 +#: cp/typeck.c:6415 cp/typeck.c:7040 fortran/convert.c:88 +======= +#: c-convert.c:102 c-typeck.c:1900 c-typeck.c:4982 cp/typeck.c:1850 +#: cp/typeck.c:6429 cp/typeck.c:7054 fortran/convert.c:88 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "void value not ignored as it ought to be" msgstr "" @@ -12502,7 +12898,7 @@ msgstr "" msgid "GCC supports only %u nested scopes" msgstr "" -#: c-decl.c:1102 cp/decl.c:357 +#: c-decl.c:1102 cp/decl.c:356 #, gcc-internal-format msgid "label %q+D used but not defined" msgstr "" @@ -12517,7 +12913,7 @@ msgstr "" msgid "inline function %q+D declared but never defined" msgstr "" -#: c-decl.c:1174 cp/decl.c:600 +#: c-decl.c:1174 cp/decl.c:599 #, gcc-internal-format msgid "unused variable %q+D" msgstr "" @@ -12527,7 +12923,11 @@ msgstr "" msgid "type of array %q+D completed incompatibly with implicit initialization" msgstr "" -#: c-decl.c:1462 c-decl.c:5686 c-decl.c:6464 c-decl.c:7065 +<<<<<<< HEAD +#: c-decl.c:1462 c-decl.c:5690 c-decl.c:6475 c-decl.c:7076 +======= +#: c-decl.c:1462 c-decl.c:5690 c-decl.c:6470 c-decl.c:7071 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "originally defined here" msgstr "" @@ -12596,7 +12996,7 @@ msgstr "" msgid "built-in function %q+D declared as non-function" msgstr "" -#: c-decl.c:1675 c-decl.c:1822 c-decl.c:2510 +#: c-decl.c:1675 c-decl.c:1822 c-decl.c:2514 #, gcc-internal-format msgid "declaration of %q+D shadows a built-in function" msgstr "" @@ -12721,201 +13121,206 @@ msgstr "" msgid "redundant redeclaration of %q+D" msgstr "" -#: c-decl.c:2497 +#: c-decl.c:2501 #, gcc-internal-format msgid "declaration of %q+D shadows previous non-variable" msgstr "" -#: c-decl.c:2502 +#: c-decl.c:2506 #, gcc-internal-format msgid "declaration of %q+D shadows a parameter" msgstr "" -#: c-decl.c:2505 +#: c-decl.c:2509 #, gcc-internal-format msgid "declaration of %q+D shadows a global declaration" msgstr "" -#: c-decl.c:2515 +#: c-decl.c:2519 #, gcc-internal-format msgid "declaration of %q+D shadows a previous local" msgstr "" -#: c-decl.c:2519 cp/name-lookup.c:1050 cp/name-lookup.c:1083 +#: c-decl.c:2523 cp/name-lookup.c:1050 cp/name-lookup.c:1083 #: cp/name-lookup.c:1092 #, gcc-internal-format msgid "shadowed declaration is here" msgstr "" -#: c-decl.c:2646 +#: c-decl.c:2650 #, gcc-internal-format msgid "nested extern declaration of %qD" msgstr "" -#: c-decl.c:2814 c-decl.c:2817 +#: c-decl.c:2818 c-decl.c:2821 #, gcc-internal-format msgid "implicit declaration of function %qE" msgstr "" -#: c-decl.c:2880 +#: c-decl.c:2884 #, gcc-internal-format msgid "incompatible implicit declaration of built-in function %qD" msgstr "" -#: c-decl.c:2889 +#: c-decl.c:2893 #, gcc-internal-format msgid "incompatible implicit declaration of function %qD" msgstr "" -#: c-decl.c:2942 +#: c-decl.c:2946 #, gcc-internal-format msgid "%qE undeclared here (not in a function)" msgstr "" -#: c-decl.c:2947 -#, gcc-internal-format -msgid "%qE undeclared (first use in this function)" -msgstr "" - #: c-decl.c:2951 #, gcc-internal-format -msgid "(Each undeclared identifier is reported only once" +msgid "%qE undeclared (first use in this function)" msgstr "" -#: c-decl.c:2952 +#: c-decl.c:2954 #, gcc-internal-format -msgid "for each function it appears in.)" +msgid "" +"each undeclared identifier is reported only once for each function it " +"appears in" msgstr "" -#: c-decl.c:3001 cp/decl.c:2443 +<<<<<<< HEAD +#: c-decl.c:3004 cp/decl.c:2446 +======= +#: c-decl.c:3004 cp/decl.c:2447 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "label %qE referenced outside of any function" msgstr "" -#: c-decl.c:3037 +#: c-decl.c:3040 #, gcc-internal-format msgid "jump into scope of identifier with variably modified type" msgstr "" -#: c-decl.c:3040 +#: c-decl.c:3043 #, gcc-internal-format msgid "jump skips variable initialization" msgstr "" -#: c-decl.c:3041 c-decl.c:3097 c-decl.c:3182 +#: c-decl.c:3044 c-decl.c:3100 c-decl.c:3185 #, gcc-internal-format msgid "label %qD defined here" msgstr "" -#: c-decl.c:3042 c-decl.c:3306 +#: c-decl.c:3045 c-decl.c:3309 #, gcc-internal-format msgid "%qD declared here" msgstr "" -#: c-decl.c:3096 c-decl.c:3181 +#: c-decl.c:3099 c-decl.c:3184 #, gcc-internal-format msgid "jump into statement expression" msgstr "" -#: c-decl.c:3118 +#: c-decl.c:3121 #, gcc-internal-format msgid "duplicate label declaration %qE" msgstr "" -#: c-decl.c:3212 cp/decl.c:2752 +<<<<<<< HEAD +#: c-decl.c:3215 cp/decl.c:2755 +======= +#: c-decl.c:3215 cp/decl.c:2756 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate label %qD" msgstr "" -#: c-decl.c:3243 +#: c-decl.c:3246 #, gcc-internal-format msgid "" "traditional C lacks a separate namespace for labels, identifier %qE conflicts" msgstr "" -#: c-decl.c:3304 +#: c-decl.c:3307 #, gcc-internal-format msgid "switch jumps over variable initialization" msgstr "" -#: c-decl.c:3305 c-decl.c:3316 +#: c-decl.c:3308 c-decl.c:3319 #, gcc-internal-format msgid "switch starts here" msgstr "" -#: c-decl.c:3315 +#: c-decl.c:3318 #, gcc-internal-format msgid "switch jumps into statement expression" msgstr "" -#: c-decl.c:3386 +#: c-decl.c:3389 #, gcc-internal-format msgid "%qE defined as wrong kind of tag" msgstr "" -#: c-decl.c:3618 +#: c-decl.c:3621 #, gcc-internal-format msgid "unnamed struct/union that defines no instances" msgstr "" -#: c-decl.c:3627 +#: c-decl.c:3630 #, gcc-internal-format msgid "empty declaration with storage class specifier does not redeclare tag" msgstr "" -#: c-decl.c:3640 +#: c-decl.c:3643 #, gcc-internal-format msgid "empty declaration with type qualifier does not redeclare tag" msgstr "" -#: c-decl.c:3662 c-decl.c:3669 +#: c-decl.c:3665 c-decl.c:3672 #, gcc-internal-format msgid "useless type name in empty declaration" msgstr "" -#: c-decl.c:3677 +#: c-decl.c:3680 #, gcc-internal-format msgid "% in empty declaration" msgstr "" -#: c-decl.c:3683 +#: c-decl.c:3686 #, gcc-internal-format msgid "% in file-scope empty declaration" msgstr "" -#: c-decl.c:3689 +#: c-decl.c:3692 #, gcc-internal-format msgid "% in file-scope empty declaration" msgstr "" -#: c-decl.c:3695 +#: c-decl.c:3698 #, gcc-internal-format msgid "useless storage class specifier in empty declaration" msgstr "" -#: c-decl.c:3701 +#: c-decl.c:3704 #, gcc-internal-format msgid "useless %<__thread%> in empty declaration" msgstr "" -#: c-decl.c:3710 +#: c-decl.c:3713 #, gcc-internal-format msgid "useless type qualifier in empty declaration" msgstr "" -#: c-decl.c:3717 c-parser.c:1198 +#: c-decl.c:3720 c-parser.c:1198 #, gcc-internal-format msgid "empty declaration" msgstr "" -#: c-decl.c:3788 +#: c-decl.c:3791 #, gcc-internal-format msgid "" "ISO C90 does not support % or type qualifiers in parameter array " "declarators" msgstr "" -#: c-decl.c:3792 +#: c-decl.c:3795 #, gcc-internal-format msgid "ISO C90 does not support %<[*]%> array declarators" msgstr "" @@ -12923,283 +13328,299 @@ msgstr "" #. C99 6.7.5.2p4 #. A function definition isn't function prototype scope C99 6.2.1p4. #. C99 6.7.5.2p4 -#: c-decl.c:3799 c-decl.c:6060 +#: c-decl.c:3802 c-decl.c:6064 #, gcc-internal-format msgid "%<[*]%> not allowed in other than function prototype scope" msgstr "" -#: c-decl.c:3912 +#: c-decl.c:3915 #, gcc-internal-format msgid "%q+D is usually a function" msgstr "" -#: c-decl.c:3921 +#: c-decl.c:3924 #, gcc-internal-format msgid "typedef %qD is initialized (use __typeof__ instead)" msgstr "" -#: c-decl.c:3926 +#: c-decl.c:3929 #, gcc-internal-format msgid "function %qD is initialized like a variable" msgstr "" #. DECL_INITIAL in a PARM_DECL is really DECL_ARG_TYPE. -#: c-decl.c:3932 +#: c-decl.c:3935 #, gcc-internal-format msgid "parameter %qD is initialized" msgstr "" -#: c-decl.c:3957 +#: c-decl.c:3960 #, gcc-internal-format msgid "variable %qD has initializer but incomplete type" msgstr "" -#: c-decl.c:4046 cp/decl.c:4171 cp/decl.c:11714 +<<<<<<< HEAD +#: c-decl.c:4049 cp/decl.c:4174 cp/decl.c:11712 +======= +#: c-decl.c:4049 cp/decl.c:4175 cp/decl.c:11713 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "inline function %q+D given attribute noinline" msgstr "" -#: c-decl.c:4143 +#: c-decl.c:4146 #, gcc-internal-format msgid "initializer fails to determine size of %q+D" msgstr "" -#: c-decl.c:4148 +#: c-decl.c:4151 #, gcc-internal-format msgid "array size missing in %q+D" msgstr "" -#: c-decl.c:4160 +#: c-decl.c:4163 #, gcc-internal-format msgid "zero or negative size array %q+D" msgstr "" -#: c-decl.c:4215 varasm.c:2139 +<<<<<<< HEAD +#: c-decl.c:4218 varasm.c:2180 +======= +#: c-decl.c:4218 varasm.c:2177 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage size of %q+D isn%'t known" msgstr "" -#: c-decl.c:4226 +#: c-decl.c:4229 #, gcc-internal-format msgid "storage size of %q+D isn%'t constant" msgstr "" -#: c-decl.c:4273 +#: c-decl.c:4276 #, gcc-internal-format msgid "ignoring asm-specifier for non-static local variable %q+D" msgstr "" -#: c-decl.c:4301 +#: c-decl.c:4304 #, gcc-internal-format msgid "cannot put object with volatile field into register" msgstr "" -#: c-decl.c:4391 +#: c-decl.c:4394 #, gcc-internal-format msgid "uninitialized const %qD is invalid in C++" msgstr "" -#: c-decl.c:4437 +#: c-decl.c:4440 #, gcc-internal-format msgid "ISO C forbids forward parameter declarations" msgstr "" -#: c-decl.c:4523 +#: c-decl.c:4527 #, gcc-internal-format msgid "defining a type in a compound literal is invalid in C++" msgstr "" -#: c-decl.c:4575 c-decl.c:4590 +#: c-decl.c:4579 c-decl.c:4594 #, gcc-internal-format msgid "bit-field %qs width not an integer constant" msgstr "" -#: c-decl.c:4585 +#: c-decl.c:4589 #, gcc-internal-format msgid "bit-field %qs width not an integer constant expression" msgstr "" -#: c-decl.c:4596 +#: c-decl.c:4600 #, gcc-internal-format msgid "negative width in bit-field %qs" msgstr "" -#: c-decl.c:4601 +#: c-decl.c:4605 #, gcc-internal-format msgid "zero width for bit-field %qs" msgstr "" -#: c-decl.c:4611 +#: c-decl.c:4615 #, gcc-internal-format msgid "bit-field %qs has invalid type" msgstr "" -#: c-decl.c:4621 +#: c-decl.c:4625 #, gcc-internal-format msgid "type of bit-field %qs is a GCC extension" msgstr "" -#: c-decl.c:4627 +#: c-decl.c:4631 #, gcc-internal-format msgid "width of %qs exceeds its type" msgstr "" -#: c-decl.c:4640 +#: c-decl.c:4644 #, gcc-internal-format msgid "%qs is narrower than values of its type" msgstr "" -#: c-decl.c:4659 +#: c-decl.c:4663 #, gcc-internal-format msgid "ISO C90 forbids array %qE whose size can%'t be evaluated" msgstr "" -#: c-decl.c:4663 +#: c-decl.c:4667 #, gcc-internal-format msgid "ISO C90 forbids array whose size can%'t be evaluated" msgstr "" -#: c-decl.c:4670 +#: c-decl.c:4674 #, gcc-internal-format msgid "ISO C90 forbids variable length array %qE" msgstr "" -#: c-decl.c:4673 +#: c-decl.c:4677 #, gcc-internal-format msgid "ISO C90 forbids variable length array" msgstr "" -#: c-decl.c:4682 +#: c-decl.c:4686 #, gcc-internal-format msgid "the size of array %qE can%'t be evaluated" msgstr "" -#: c-decl.c:4686 +#: c-decl.c:4690 #, gcc-internal-format msgid "the size of array can %'t be evaluated" msgstr "" -#: c-decl.c:4692 +#: c-decl.c:4696 #, gcc-internal-format msgid "variable length array %qE is used" msgstr "" -#: c-decl.c:4696 cp/decl.c:7363 +<<<<<<< HEAD +#: c-decl.c:4700 cp/decl.c:7366 +======= +#: c-decl.c:4700 cp/decl.c:7367 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable length array is used" msgstr "" -#: c-decl.c:4874 c-decl.c:5220 c-decl.c:5230 +#: c-decl.c:4878 c-decl.c:5224 c-decl.c:5234 #, gcc-internal-format msgid "variably modified %qE at file scope" msgstr "" -#: c-decl.c:4876 +#: c-decl.c:4880 #, gcc-internal-format msgid "variably modified field at file scope" msgstr "" -#: c-decl.c:4896 +#: c-decl.c:4900 #, gcc-internal-format msgid "type defaults to % in declaration of %qE" msgstr "" -#: c-decl.c:4900 +#: c-decl.c:4904 #, gcc-internal-format msgid "type defaults to % in type name" msgstr "" -#: c-decl.c:4933 +#: c-decl.c:4937 #, gcc-internal-format msgid "duplicate %" msgstr "" -#: c-decl.c:4935 +#: c-decl.c:4939 #, gcc-internal-format msgid "duplicate %" msgstr "" -#: c-decl.c:4937 +#: c-decl.c:4941 #, gcc-internal-format msgid "duplicate %" msgstr "" -#: c-decl.c:4941 +#: c-decl.c:4945 #, gcc-internal-format msgid "conflicting named address spaces (%s vs %s)" msgstr "" -#: c-decl.c:4963 +#: c-decl.c:4967 #, gcc-internal-format msgid "function definition declared %" msgstr "" -#: c-decl.c:4965 +#: c-decl.c:4969 #, gcc-internal-format msgid "function definition declared %" msgstr "" -#: c-decl.c:4967 +#: c-decl.c:4971 #, gcc-internal-format msgid "function definition declared %" msgstr "" -#: c-decl.c:4969 +#: c-decl.c:4973 #, gcc-internal-format msgid "function definition declared %<__thread%>" msgstr "" -#: c-decl.c:4986 +#: c-decl.c:4990 #, gcc-internal-format msgid "storage class specified for structure field %qE" msgstr "" -#: c-decl.c:4989 +#: c-decl.c:4993 #, gcc-internal-format msgid "storage class specified for structure field" msgstr "" -#: c-decl.c:4993 +#: c-decl.c:4997 #, gcc-internal-format msgid "storage class specified for parameter %qE" msgstr "" -#: c-decl.c:4996 +#: c-decl.c:5000 #, gcc-internal-format msgid "storage class specified for unnamed parameter" msgstr "" -#: c-decl.c:4999 cp/decl.c:8291 +<<<<<<< HEAD +#: c-decl.c:5003 cp/decl.c:8294 +======= +#: c-decl.c:5003 cp/decl.c:8295 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specified for typename" msgstr "" -#: c-decl.c:5016 +#: c-decl.c:5020 #, gcc-internal-format msgid "%qE initialized and declared %" msgstr "" -#: c-decl.c:5020 +#: c-decl.c:5024 #, gcc-internal-format msgid "%qE has both % and initializer" msgstr "" -#: c-decl.c:5025 +#: c-decl.c:5029 #, gcc-internal-format msgid "file-scope declaration of %qE specifies %" msgstr "" -#: c-decl.c:5029 +#: c-decl.c:5033 #, gcc-internal-format msgid "file-scope declaration of %qE specifies %" msgstr "" -#: c-decl.c:5034 +#: c-decl.c:5038 #, gcc-internal-format msgid "nested function %qE declared %" msgstr "" -#: c-decl.c:5037 +#: c-decl.c:5041 #, gcc-internal-format msgid "function-scope %qE implicitly auto and declared %<__thread%>" msgstr "" @@ -13207,579 +13628,815 @@ 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:5084 c-decl.c:5414 +#: c-decl.c:5088 c-decl.c:5418 #, gcc-internal-format msgid "static or type qualifiers in non-parameter array declarator" msgstr "" -#: c-decl.c:5132 +#: c-decl.c:5136 #, gcc-internal-format msgid "declaration of %qE as array of voids" msgstr "" -#: c-decl.c:5134 +#: c-decl.c:5138 #, gcc-internal-format msgid "declaration of type name as array of voids" msgstr "" -#: c-decl.c:5141 +#: c-decl.c:5145 #, gcc-internal-format msgid "declaration of %qE as array of functions" msgstr "" -#: c-decl.c:5144 +#: c-decl.c:5148 #, gcc-internal-format msgid "declaration of type name as array of functions" msgstr "" -#: c-decl.c:5151 c-decl.c:6851 +<<<<<<< HEAD +#: c-decl.c:5155 c-decl.c:6862 +======= +#: c-decl.c:5155 c-decl.c:6857 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of structure with flexible array member" msgstr "" -#: c-decl.c:5177 +#: c-decl.c:5181 #, gcc-internal-format msgid "size of array %qE has non-integer type" msgstr "" -#: c-decl.c:5181 +#: c-decl.c:5185 #, gcc-internal-format msgid "size of unnamed array has non-integer type" msgstr "" -#: c-decl.c:5191 +#: c-decl.c:5195 #, gcc-internal-format msgid "ISO C forbids zero-size array %qE" msgstr "" -#: c-decl.c:5194 +#: c-decl.c:5198 #, gcc-internal-format msgid "ISO C forbids zero-size array" msgstr "" -#: c-decl.c:5203 +#: c-decl.c:5207 #, gcc-internal-format msgid "size of array %qE is negative" msgstr "" -#: c-decl.c:5205 +#: c-decl.c:5209 #, gcc-internal-format msgid "size of unnamed array is negative" msgstr "" -#: c-decl.c:5281 c-decl.c:5645 +#: c-decl.c:5285 c-decl.c:5649 #, gcc-internal-format msgid "size of array %qE is too large" msgstr "" -#: c-decl.c:5284 c-decl.c:5647 +#: c-decl.c:5288 c-decl.c:5651 #, gcc-internal-format msgid "size of unnamed array is too large" msgstr "" -#: c-decl.c:5321 +#: c-decl.c:5325 #, gcc-internal-format msgid "ISO C90 does not support flexible array members" msgstr "" #. C99 6.7.5.2p4 -#: c-decl.c:5342 +#: c-decl.c:5346 #, gcc-internal-format msgid "%<[*]%> not in a declaration" msgstr "" -#: c-decl.c:5355 +#: c-decl.c:5359 #, gcc-internal-format msgid "array type has incomplete element type" msgstr "" -#: c-decl.c:5447 +#: c-decl.c:5451 #, gcc-internal-format msgid "%qE declared as function returning a function" msgstr "" -#: c-decl.c:5450 +#: c-decl.c:5454 #, gcc-internal-format msgid "type name declared as function returning a function" msgstr "" -#: c-decl.c:5457 +#: c-decl.c:5461 #, gcc-internal-format msgid "%qE declared as function returning an array" msgstr "" -#: c-decl.c:5460 +#: c-decl.c:5464 #, gcc-internal-format msgid "type name declared as function returning an array" msgstr "" -#: c-decl.c:5490 +#: c-decl.c:5494 #, gcc-internal-format msgid "function definition has qualified void return type" msgstr "" -#: c-decl.c:5493 cp/decl.c:8397 +<<<<<<< HEAD +#: c-decl.c:5497 cp/decl.c:8400 +======= +#: c-decl.c:5497 cp/decl.c:8401 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "type qualifiers ignored on function return type" msgstr "" -#: c-decl.c:5523 c-decl.c:5661 c-decl.c:5771 c-decl.c:5864 +#: c-decl.c:5527 c-decl.c:5665 c-decl.c:5775 c-decl.c:5868 #, gcc-internal-format msgid "ISO C forbids qualified function types" msgstr "" -#: c-decl.c:5590 +#: c-decl.c:5594 #, gcc-internal-format msgid "%qs combined with % qualifier for %qE" msgstr "" -#: c-decl.c:5594 +#: c-decl.c:5598 #, gcc-internal-format msgid "%qs combined with % qualifier for %qE" msgstr "" -#: c-decl.c:5600 +#: c-decl.c:5604 #, gcc-internal-format msgid "%qs specified for auto variable %qE" msgstr "" -#: c-decl.c:5616 +#: c-decl.c:5620 #, gcc-internal-format msgid "%qs specified for parameter %qE" msgstr "" -#: c-decl.c:5619 +#: c-decl.c:5623 #, gcc-internal-format msgid "%qs specified for unnamed parameter" msgstr "" -#: c-decl.c:5625 +#: c-decl.c:5629 #, gcc-internal-format msgid "%qs specified for structure field %qE" msgstr "" -#: c-decl.c:5628 +#: c-decl.c:5632 #, gcc-internal-format msgid "%qs specified for structure field" msgstr "" -#: c-decl.c:5669 +#: c-decl.c:5673 #, gcc-internal-format msgid "typedef %q+D declared %" msgstr "" -#: c-decl.c:5705 +#: c-decl.c:5709 #, gcc-internal-format msgid "ISO C forbids const or volatile function types" msgstr "" #. C99 6.7.2.1p8 -#: c-decl.c:5715 +#: c-decl.c:5719 #, gcc-internal-format msgid "a member of a structure or union cannot have a variably modified type" msgstr "" -#: c-decl.c:5732 cp/decl.c:7577 +<<<<<<< HEAD +#: c-decl.c:5736 cp/decl.c:7580 +======= +#: c-decl.c:5736 cp/decl.c:7581 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable or field %qE declared void" msgstr "" -#: c-decl.c:5763 +#: c-decl.c:5767 #, gcc-internal-format msgid "attributes in parameter array declarator ignored" msgstr "" -#: c-decl.c:5797 +#: c-decl.c:5801 #, gcc-internal-format msgid "parameter %q+D declared %" msgstr "" -#: c-decl.c:5810 +#: c-decl.c:5814 #, gcc-internal-format msgid "field %qE declared as a function" msgstr "" -#: c-decl.c:5817 +#: c-decl.c:5821 #, gcc-internal-format msgid "field %qE has incomplete type" msgstr "" -#: c-decl.c:5819 +#: c-decl.c:5823 #, gcc-internal-format msgid "unnamed field has incomplete type" msgstr "" -#: c-decl.c:5836 c-decl.c:5847 c-decl.c:5850 +#: c-decl.c:5840 c-decl.c:5851 c-decl.c:5854 #, gcc-internal-format msgid "invalid storage class for function %qE" msgstr "" -#: c-decl.c:5870 +#: c-decl.c:5874 #, gcc-internal-format msgid "% function returns non-void value" msgstr "" -#: c-decl.c:5906 +#: c-decl.c:5910 #, gcc-internal-format msgid "cannot inline function %" msgstr "" -#: c-decl.c:5935 +#: c-decl.c:5939 #, gcc-internal-format msgid "variable previously declared % redeclared %" msgstr "" -#: c-decl.c:5945 +#: c-decl.c:5949 #, gcc-internal-format msgid "variable %q+D declared %" msgstr "" -#: c-decl.c:5980 +#: c-decl.c:5984 #, gcc-internal-format msgid "non-nested function with variably modified type" msgstr "" -#: c-decl.c:5982 +#: c-decl.c:5986 #, gcc-internal-format msgid "object with variably modified type must have no linkage" msgstr "" -#: c-decl.c:6065 c-decl.c:7481 +<<<<<<< HEAD +#: c-decl.c:6069 c-decl.c:7492 +======= +#: c-decl.c:6069 c-decl.c:7487 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function declaration isn%'t a prototype" msgstr "" -#: c-decl.c:6073 +#: c-decl.c:6077 #, gcc-internal-format msgid "parameter names (without types) in function declaration" msgstr "" -#: c-decl.c:6108 +#: c-decl.c:6112 #, gcc-internal-format msgid "parameter %u (%q+D) has incomplete type" msgstr "" -#: c-decl.c:6112 +#: c-decl.c:6116 #, gcc-internal-format msgid "parameter %u has incomplete type" msgstr "" -#: c-decl.c:6122 +#: c-decl.c:6127 #, gcc-internal-format msgid "parameter %u (%q+D) has void type" msgstr "" -#: c-decl.c:6126 +#: c-decl.c:6131 #, gcc-internal-format msgid "parameter %u has void type" msgstr "" -#: c-decl.c:6196 +#: c-decl.c:6202 #, gcc-internal-format msgid "% as only parameter may not be qualified" msgstr "" -#: c-decl.c:6200 c-decl.c:6234 +#: c-decl.c:6206 c-decl.c:6240 #, gcc-internal-format msgid "% must be the only parameter" msgstr "" -#: c-decl.c:6228 +#: c-decl.c:6234 #, gcc-internal-format msgid "parameter %q+D has just a forward declaration" msgstr "" #. The %s will be one of 'struct', 'union', or 'enum'. -#: c-decl.c:6273 +#: c-decl.c:6279 #, gcc-internal-format msgid "%<%s %E%> declared inside parameter list" msgstr "" #. The %s will be one of 'struct', 'union', or 'enum'. -#: c-decl.c:6277 +#: c-decl.c:6283 #, gcc-internal-format msgid "anonymous %s declared inside parameter list" msgstr "" -#: c-decl.c:6282 +#: c-decl.c:6288 #, gcc-internal-format msgid "" "its scope is only this definition or declaration, which is probably not what " "you want" msgstr "" -#: c-decl.c:6375 +<<<<<<< HEAD +#: c-decl.c:6386 +======= +#: c-decl.c:6381 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enum type defined here" msgstr "" -#: c-decl.c:6381 +<<<<<<< HEAD +#: c-decl.c:6392 +======= +#: c-decl.c:6387 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "struct defined here" msgstr "" -#: c-decl.c:6387 +<<<<<<< HEAD +#: c-decl.c:6398 +======= +#: c-decl.c:6393 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "union defined here" msgstr "" -#: c-decl.c:6460 +<<<<<<< HEAD +#: c-decl.c:6471 +======= +#: c-decl.c:6466 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redefinition of %" msgstr "" -#: c-decl.c:6462 +<<<<<<< HEAD +#: c-decl.c:6473 +======= +#: c-decl.c:6468 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redefinition of %" msgstr "" -#: c-decl.c:6471 +<<<<<<< HEAD +#: c-decl.c:6482 +======= +#: c-decl.c:6477 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "nested redefinition of %" msgstr "" -#: c-decl.c:6473 +<<<<<<< HEAD +#: c-decl.c:6484 +======= +#: c-decl.c:6479 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "nested redefinition of %" msgstr "" -#: c-decl.c:6505 c-decl.c:7083 +<<<<<<< HEAD +#: c-decl.c:6516 c-decl.c:7094 +======= +#: c-decl.c:6511 c-decl.c:7089 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "defining type in %qs expression is invalid in C++" msgstr "" -#: c-decl.c:6572 cp/decl.c:3907 +<<<<<<< HEAD +#: c-decl.c:6583 cp/decl.c:3910 +======= +#: c-decl.c:6578 cp/decl.c:3911 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration does not declare anything" msgstr "" -#: c-decl.c:6575 +<<<<<<< HEAD +#: c-decl.c:6586 +======= +#: c-decl.c:6581 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C doesn%'t support unnamed structs/unions" msgstr "" -#: c-decl.c:6638 c-decl.c:6654 +<<<<<<< HEAD +#: c-decl.c:6649 c-decl.c:6665 +======= +#: c-decl.c:6644 c-decl.c:6660 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate member %q+D" msgstr "" -#: c-decl.c:6757 +<<<<<<< HEAD +#: c-decl.c:6768 +======= +#: c-decl.c:6763 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "union has no named members" msgstr "" -#: c-decl.c:6759 +<<<<<<< HEAD +#: c-decl.c:6770 +======= +#: c-decl.c:6765 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "union has no members" msgstr "" -#: c-decl.c:6764 +<<<<<<< HEAD +#: c-decl.c:6775 +======= +#: c-decl.c:6770 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "struct has no named members" msgstr "" -#: c-decl.c:6766 +<<<<<<< HEAD +#: c-decl.c:6777 +======= +#: c-decl.c:6772 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "struct has no members" msgstr "" -#: c-decl.c:6831 +<<<<<<< HEAD +#: c-decl.c:6842 +======= +#: c-decl.c:6837 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "flexible array member in union" msgstr "" -#: c-decl.c:6837 +<<<<<<< HEAD +#: c-decl.c:6848 +======= +#: c-decl.c:6843 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "flexible array member not at end of struct" msgstr "" -#: c-decl.c:6843 +<<<<<<< HEAD +#: c-decl.c:6854 +======= +#: c-decl.c:6849 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "flexible array member in otherwise empty struct" msgstr "" -#: c-decl.c:6960 +<<<<<<< HEAD +#: c-decl.c:6971 +======= +#: c-decl.c:6966 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "union cannot be made transparent" msgstr "" -#: c-decl.c:7056 +<<<<<<< HEAD +#: c-decl.c:7067 +======= +#: c-decl.c:7062 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "nested redefinition of %" msgstr "" #. This enum is a named one that has been declared already. -#: c-decl.c:7063 +<<<<<<< HEAD +#: c-decl.c:7074 +======= +#: c-decl.c:7069 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redeclaration of %" msgstr "" -#: c-decl.c:7138 +<<<<<<< HEAD +#: c-decl.c:7149 +======= +#: c-decl.c:7144 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumeration values exceed range of largest integer" msgstr "" -#: c-decl.c:7155 +<<<<<<< HEAD +#: c-decl.c:7166 +======= +#: c-decl.c:7161 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "specified mode too small for enumeral values" msgstr "" -#: c-decl.c:7259 c-decl.c:7275 +<<<<<<< HEAD +#: c-decl.c:7270 c-decl.c:7286 +======= +#: c-decl.c:7265 c-decl.c:7281 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumerator value for %qE is not an integer constant" msgstr "" -#: c-decl.c:7270 +<<<<<<< HEAD +#: c-decl.c:7281 +======= +#: c-decl.c:7276 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumerator value for %qE is not an integer constant expression" msgstr "" -#: c-decl.c:7294 +<<<<<<< HEAD +#: c-decl.c:7305 +======= +#: c-decl.c:7300 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "overflow in enumeration values" msgstr "" -#: c-decl.c:7302 +<<<<<<< HEAD +#: c-decl.c:7313 +======= +#: c-decl.c:7308 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C restricts enumerator values to range of %" msgstr "" -#: c-decl.c:7387 +<<<<<<< HEAD +#: c-decl.c:7398 +======= +#: c-decl.c:7393 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "inline function %qD given attribute noinline" msgstr "" -#: c-decl.c:7405 +<<<<<<< HEAD +#: c-decl.c:7416 +======= +#: c-decl.c:7411 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type is an incomplete type" msgstr "" -#: c-decl.c:7415 +<<<<<<< HEAD +#: c-decl.c:7426 +======= +#: c-decl.c:7421 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type defaults to %" msgstr "" -#: c-decl.c:7489 +<<<<<<< HEAD +#: c-decl.c:7500 +======= +#: c-decl.c:7495 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no previous prototype for %qD" msgstr "" -#: c-decl.c:7498 +<<<<<<< HEAD +#: c-decl.c:7509 +======= +#: c-decl.c:7504 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD was used with no prototype before its definition" msgstr "" -#: c-decl.c:7505 +<<<<<<< HEAD +#: c-decl.c:7516 +======= +#: c-decl.c:7511 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no previous declaration for %qD" msgstr "" -#: c-decl.c:7515 +<<<<<<< HEAD +#: c-decl.c:7526 +======= +#: c-decl.c:7521 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD was used with no declaration before its definition" msgstr "" -#: c-decl.c:7538 +<<<<<<< HEAD +#: c-decl.c:7549 +======= +#: c-decl.c:7544 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type of %qD is not %" msgstr "" -#: c-decl.c:7544 +<<<<<<< HEAD +#: c-decl.c:7555 +======= +#: c-decl.c:7550 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is normally a non-static function" msgstr "" -#: c-decl.c:7579 +<<<<<<< HEAD +#: c-decl.c:7590 +======= +#: c-decl.c:7585 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "old-style parameter declarations in prototyped function definition" msgstr "" -#: c-decl.c:7593 +<<<<<<< HEAD +#: c-decl.c:7604 +======= +#: c-decl.c:7599 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "traditional C rejects ISO C style function definitions" msgstr "" -#: c-decl.c:7609 +<<<<<<< HEAD +#: c-decl.c:7620 +======= +#: c-decl.c:7615 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter name omitted" msgstr "" -#: c-decl.c:7644 +<<<<<<< HEAD +#: c-decl.c:7657 +======= +#: c-decl.c:7650 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "old-style function definition" msgstr "" -#: c-decl.c:7653 +<<<<<<< HEAD +#: c-decl.c:7666 +======= +#: c-decl.c:7659 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter name missing from parameter list" msgstr "" -#: c-decl.c:7665 +<<<<<<< HEAD +#: c-decl.c:7678 +======= +#: c-decl.c:7671 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD declared as a non-parameter" msgstr "" -#: c-decl.c:7671 +<<<<<<< HEAD +#: c-decl.c:7684 +======= +#: c-decl.c:7677 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "multiple parameters named %qD" msgstr "" -#: c-decl.c:7680 +<<<<<<< HEAD +#: c-decl.c:7693 +======= +#: c-decl.c:7686 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD declared with void type" msgstr "" -#: c-decl.c:7709 c-decl.c:7713 +<<<<<<< HEAD +#: c-decl.c:7722 c-decl.c:7726 +======= +#: c-decl.c:7715 c-decl.c:7719 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "type of %qD defaults to %" msgstr "" -#: c-decl.c:7733 +<<<<<<< HEAD +#: c-decl.c:7746 +======= +#: c-decl.c:7739 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD has incomplete type" msgstr "" -#: c-decl.c:7740 +<<<<<<< HEAD +#: c-decl.c:7753 +======= +#: c-decl.c:7746 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration for parameter %qD but no such parameter" msgstr "" -#: c-decl.c:7792 +<<<<<<< HEAD +#: c-decl.c:7805 +======= +#: c-decl.c:7798 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "number of arguments doesn%'t match built-in prototype" msgstr "" -#: c-decl.c:7803 +<<<<<<< HEAD +#: c-decl.c:7816 +======= +#: c-decl.c:7809 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "number of arguments doesn%'t match prototype" msgstr "" -#: c-decl.c:7806 c-decl.c:7848 c-decl.c:7862 +<<<<<<< HEAD +#: c-decl.c:7819 c-decl.c:7861 c-decl.c:7875 +======= +#: c-decl.c:7812 c-decl.c:7854 c-decl.c:7868 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "prototype declaration" msgstr "" -#: c-decl.c:7840 +<<<<<<< HEAD +#: c-decl.c:7853 +======= +#: c-decl.c:7846 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "promoted argument %qD doesn%'t match built-in prototype" msgstr "" -#: c-decl.c:7845 +<<<<<<< HEAD +#: c-decl.c:7858 +======= +#: c-decl.c:7851 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "promoted argument %qD doesn%'t match prototype" msgstr "" -#: c-decl.c:7855 +<<<<<<< HEAD +#: c-decl.c:7868 +======= +#: c-decl.c:7861 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument %qD doesn%'t match built-in prototype" msgstr "" -#: c-decl.c:7860 +<<<<<<< HEAD +#: c-decl.c:7873 +======= +#: c-decl.c:7866 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument %qD doesn%'t match prototype" msgstr "" -#: c-decl.c:8046 cp/decl.c:12562 +<<<<<<< HEAD +#: c-decl.c:8059 cp/decl.c:12560 +======= +#: c-decl.c:8052 cp/decl.c:12561 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no return statement in function returning non-void" msgstr "" @@ -13787,163 +14444,291 @@ 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:8119 +<<<<<<< HEAD +#: c-decl.c:8132 +======= +#: c-decl.c:8125 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% loop initial declarations are only allowed in C99 mode" msgstr "" -#: c-decl.c:8124 +<<<<<<< HEAD +#: c-decl.c:8137 +======= +#: c-decl.c:8130 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use option -std=c99 or -std=gnu99 to compile your code" msgstr "" -#: c-decl.c:8158 +<<<<<<< HEAD +#: c-decl.c:8171 +======= +#: c-decl.c:8164 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of static variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:8162 +<<<<<<< HEAD +#: c-decl.c:8175 +======= +#: c-decl.c:8168 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "declaration of % variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:8169 +<<<<<<< HEAD +#: c-decl.c:8182 +======= +#: c-decl.c:8175 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:8174 +<<<<<<< HEAD +#: c-decl.c:8187 +======= +#: c-decl.c:8180 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:8178 +<<<<<<< HEAD +#: c-decl.c:8191 +======= +#: c-decl.c:8184 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% declared in % loop initial declaration" msgstr "" -#: c-decl.c:8182 +<<<<<<< HEAD +#: c-decl.c:8195 +======= +#: c-decl.c:8188 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of non-variable %qD in % loop initial declaration" msgstr "" -#: c-decl.c:8433 +<<<<<<< HEAD +#: c-decl.c:8446 +======= +#: c-decl.c:8439 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "incompatible address space qualifiers %qs and %qs" msgstr "" -#: c-decl.c:8472 c-decl.c:8769 c-decl.c:9135 +<<<<<<< HEAD +#: c-decl.c:8485 c-decl.c:8782 c-decl.c:9148 +======= +#: c-decl.c:8478 c-decl.c:8775 c-decl.c:9141 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate %qE" msgstr "" -#: c-decl.c:8498 c-decl.c:8780 c-decl.c:9012 +<<<<<<< HEAD +#: c-decl.c:8511 c-decl.c:8793 c-decl.c:9025 +======= +#: c-decl.c:8504 c-decl.c:8786 c-decl.c:9018 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "two or more data types in declaration specifiers" msgstr "" -#: c-decl.c:8510 cp/parser.c:2185 +<<<<<<< HEAD +#: c-decl.c:8523 cp/parser.c:2187 +======= +#: c-decl.c:8516 cp/parser.c:2187 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% is too long for GCC" msgstr "" -#: c-decl.c:8523 +<<<<<<< HEAD +#: c-decl.c:8536 +======= +#: c-decl.c:8529 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C90 does not support %" msgstr "" -#: c-decl.c:8681 +<<<<<<< HEAD +#: c-decl.c:8694 +======= +#: c-decl.c:8687 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C90 does not support complex types" msgstr "" -#: c-decl.c:8720 +<<<<<<< HEAD +#: c-decl.c:8733 +======= +#: c-decl.c:8726 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C does not support saturating types" msgstr "" -#: c-decl.c:8971 +<<<<<<< HEAD +#: c-decl.c:8984 +======= +#: c-decl.c:8977 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C does not support decimal floating point" msgstr "" -#: c-decl.c:8993 c-decl.c:9196 c-parser.c:5372 +<<<<<<< HEAD +#: c-decl.c:9006 c-decl.c:9209 c-parser.c:5372 +======= +#: c-decl.c:8999 c-decl.c:9202 c-parser.c:5372 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "fixed-point types not supported for this target" msgstr "" -#: c-decl.c:8995 +<<<<<<< HEAD +#: c-decl.c:9008 +======= +#: c-decl.c:9001 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C does not support fixed-point types" msgstr "" -#: c-decl.c:9029 +<<<<<<< HEAD +#: c-decl.c:9042 +======= +#: c-decl.c:9035 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "C++ lookup of %qD would return a field, not a type" msgstr "" -#: c-decl.c:9042 +<<<<<<< HEAD +#: c-decl.c:9055 +======= +#: c-decl.c:9048 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE fails to be a typedef or built in type" msgstr "" -#: c-decl.c:9086 +<<<<<<< HEAD +#: c-decl.c:9099 +======= +#: c-decl.c:9092 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE is not at beginning of declaration" msgstr "" -#: c-decl.c:9100 +<<<<<<< HEAD +#: c-decl.c:9113 +======= +#: c-decl.c:9106 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:9102 +<<<<<<< HEAD +#: c-decl.c:9115 +======= +#: c-decl.c:9108 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:9104 +<<<<<<< HEAD +#: c-decl.c:9117 +======= +#: c-decl.c:9110 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> used with %" msgstr "" -#: c-decl.c:9115 +<<<<<<< HEAD +#: c-decl.c:9128 +======= +#: c-decl.c:9121 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> before %" msgstr "" -#: c-decl.c:9124 +<<<<<<< HEAD +#: c-decl.c:9137 +======= +#: c-decl.c:9130 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> before %" msgstr "" -#: c-decl.c:9140 +<<<<<<< HEAD +#: c-decl.c:9153 +======= +#: c-decl.c:9146 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "multiple storage classes in declaration specifiers" msgstr "" -#: c-decl.c:9147 +<<<<<<< HEAD +#: c-decl.c:9160 +======= +#: c-decl.c:9153 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__thread%> used with %qE" msgstr "" -#: c-decl.c:9194 +<<<<<<< HEAD +#: c-decl.c:9207 +======= +#: c-decl.c:9200 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<_Sat%> is used without %<_Fract%> or %<_Accum%>" msgstr "" -#: c-decl.c:9208 +<<<<<<< HEAD +#: c-decl.c:9221 +======= +#: c-decl.c:9214 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C does not support plain % meaning %" msgstr "" -#: c-decl.c:9253 c-decl.c:9279 +<<<<<<< HEAD +#: c-decl.c:9266 c-decl.c:9292 +======= +#: c-decl.c:9259 c-decl.c:9285 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C does not support complex integer types" msgstr "" -#: c-decl.c:9433 toplev.c:866 +<<<<<<< HEAD +#: c-decl.c:9446 toplev.c:866 +======= +#: c-decl.c:9439 toplev.c:866 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+F used but never defined" msgstr "" @@ -14350,7 +15135,7 @@ msgstr "" msgid "floating constant truncated to zero" msgstr "" -#: c-lex.c:933 cp/parser.c:3003 +#: c-lex.c:933 cp/parser.c:3005 #, gcc-internal-format msgid "unsupported non-standard concatenation of string literals" msgstr "" @@ -14365,7 +15150,7 @@ msgstr "" msgid "invalid expression type for %<#pragma omp atomic%>" msgstr "" -#: c-omp.c:260 cp/semantics.c:4497 +#: c-omp.c:260 cp/semantics.c:4501 #, gcc-internal-format msgid "invalid type for iteration variable %qE" msgstr "" @@ -14375,22 +15160,22 @@ msgstr "" msgid "%qE is not initialized" msgstr "" -#: c-omp.c:290 cp/semantics.c:4412 +#: c-omp.c:290 cp/semantics.c:4416 #, gcc-internal-format msgid "missing controlling predicate" msgstr "" -#: c-omp.c:368 cp/semantics.c:4169 +#: c-omp.c:368 cp/semantics.c:4173 #, gcc-internal-format msgid "invalid controlling predicate" msgstr "" -#: c-omp.c:375 cp/semantics.c:4418 +#: c-omp.c:375 cp/semantics.c:4422 #, gcc-internal-format msgid "missing increment expression" msgstr "" -#: c-omp.c:444 cp/semantics.c:4274 +#: c-omp.c:444 cp/semantics.c:4278 #, gcc-internal-format msgid "invalid increment expression" msgstr "" @@ -14451,117 +15236,117 @@ msgid "" "-fhandle-exceptions has been renamed -fexceptions (and is now on by default)" msgstr "" -#: c-opts.c:909 fortran/cpp.c:381 +#: c-opts.c:911 fortran/cpp.c:381 #, gcc-internal-format msgid "output filename specified twice" msgstr "" -#: c-opts.c:1042 +#: c-opts.c:1046 #, gcc-internal-format msgid "-fexcess-precision=standard for C++" msgstr "" -#: c-opts.c:1055 +#: c-opts.c:1059 #, gcc-internal-format msgid "-fno-gnu89-inline is only supported in GNU99 or C99 mode" msgstr "" -#: c-opts.c:1134 +#: c-opts.c:1138 #, gcc-internal-format msgid "-Wformat-y2k ignored without -Wformat" msgstr "" -#: c-opts.c:1136 +#: c-opts.c:1140 #, gcc-internal-format msgid "-Wformat-extra-args ignored without -Wformat" msgstr "" -#: c-opts.c:1138 +#: c-opts.c:1142 #, gcc-internal-format msgid "-Wformat-zero-length ignored without -Wformat" msgstr "" -#: c-opts.c:1140 +#: c-opts.c:1144 #, gcc-internal-format msgid "-Wformat-nonliteral ignored without -Wformat" msgstr "" -#: c-opts.c:1142 +#: c-opts.c:1146 #, gcc-internal-format msgid "-Wformat-contains-nul ignored without -Wformat" msgstr "" -#: c-opts.c:1144 +#: c-opts.c:1148 #, gcc-internal-format msgid "-Wformat-security ignored without -Wformat" msgstr "" -#: c-opts.c:1168 +#: c-opts.c:1172 #, gcc-internal-format msgid "opening output file %s: %m" msgstr "" -#: c-opts.c:1173 +#: c-opts.c:1177 #, gcc-internal-format msgid "too many filenames given. Type %s --help for usage" msgstr "" -#: c-opts.c:1253 +#: c-opts.c:1257 #, gcc-internal-format msgid "The C parser does not support -dy, option ignored" msgstr "" -#: c-opts.c:1257 +#: c-opts.c:1261 #, gcc-internal-format msgid "The Objective-C parser does not support -dy, option ignored" msgstr "" -#: c-opts.c:1260 +#: c-opts.c:1264 #, gcc-internal-format msgid "The C++ parser does not support -dy, option ignored" msgstr "" -#: c-opts.c:1264 +#: c-opts.c:1268 #, gcc-internal-format msgid "The Objective-C++ parser does not support -dy, option ignored" msgstr "" -#: c-opts.c:1315 +#: c-opts.c:1319 #, gcc-internal-format msgid "opening dependency file %s: %m" msgstr "" -#: c-opts.c:1325 +#: c-opts.c:1329 #, gcc-internal-format msgid "closing dependency file %s: %m" msgstr "" -#: c-opts.c:1328 +#: c-opts.c:1332 #, gcc-internal-format msgid "when writing output to %s: %m" msgstr "" -#: c-opts.c:1408 +#: c-opts.c:1412 #, gcc-internal-format msgid "to generate dependencies you must specify either -M or -MM" msgstr "" -#: c-opts.c:1431 +#: c-opts.c:1435 #, gcc-internal-format msgid "-MG may only be used with -M or -MM" msgstr "" -#: c-opts.c:1461 +#: c-opts.c:1465 #, gcc-internal-format msgid "-fdirectives-only is incompatible with -Wunused_macros" msgstr "" -#: c-opts.c:1463 +#: c-opts.c:1467 #, gcc-internal-format msgid "-fdirectives-only is incompatible with -traditional" msgstr "" -#: c-opts.c:1601 +#: c-opts.c:1605 #, gcc-internal-format msgid "too late for # directive to set debug directory" msgstr "" @@ -14619,7 +15404,11 @@ msgstr "" msgid "expected identifier" msgstr "" -#: c-parser.c:1743 cp/parser.c:12727 +<<<<<<< HEAD +#: c-parser.c:1743 cp/parser.c:12734 +======= +#: c-parser.c:1743 cp/parser.c:12724 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "comma at end of enumerator list" msgstr "" @@ -14694,7 +15483,11 @@ msgstr "" msgid "wide string literal in %" msgstr "" -#: c-parser.c:2765 c-parser.c:7091 cp/parser.c:22952 +<<<<<<< HEAD +#: c-parser.c:2765 c-parser.c:7091 cp/parser.c:22966 +======= +#: c-parser.c:2765 c-parser.c:7091 cp/parser.c:22954 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expected string literal" msgstr "" @@ -14744,7 +15537,11 @@ msgstr "" msgid "expected %<}%> before %" msgstr "" -#: c-parser.c:3564 cp/parser.c:7910 +<<<<<<< HEAD +#: c-parser.c:3564 cp/parser.c:7917 +======= +#: c-parser.c:3564 cp/parser.c:7907 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% without a previous %" msgstr "" @@ -14779,12 +15576,20 @@ msgstr "" msgid "expected statement" msgstr "" -#: c-parser.c:3985 cp/parser.c:7992 +<<<<<<< HEAD +#: c-parser.c:3985 cp/parser.c:7999 +======= +#: c-parser.c:3985 cp/parser.c:7989 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "suggest braces around empty body in an % statement" msgstr "" -#: c-parser.c:4013 cp/parser.c:8015 +<<<<<<< HEAD +#: c-parser.c:4013 cp/parser.c:8022 +======= +#: c-parser.c:4013 cp/parser.c:8012 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "suggest braces around empty body in an % statement" msgstr "" @@ -14854,39 +15659,67 @@ msgstr "" msgid "extra semicolon in method definition specified" msgstr "" -#: c-parser.c:6985 cp/parser.c:22996 +<<<<<<< HEAD +#: c-parser.c:6985 cp/parser.c:23010 +======= +#: c-parser.c:6985 cp/parser.c:22998 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<#pragma omp barrier%> may only be used in compound statements" msgstr "" -#: c-parser.c:6996 cp/parser.c:23011 +<<<<<<< HEAD +#: c-parser.c:6996 cp/parser.c:23025 +======= +#: c-parser.c:6996 cp/parser.c:23013 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<#pragma omp flush%> may only be used in compound statements" msgstr "" -#: c-parser.c:7007 cp/parser.c:23027 +<<<<<<< HEAD +#: c-parser.c:7007 cp/parser.c:23041 +======= +#: c-parser.c:7007 cp/parser.c:23029 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<#pragma omp taskwait%> may only be used in compound statements" msgstr "" -#: c-parser.c:7020 cp/parser.c:23055 +<<<<<<< HEAD +#: c-parser.c:7020 cp/parser.c:23069 +======= +#: c-parser.c:7020 cp/parser.c:23057 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%<#pragma omp section%> may only be used in %<#pragma omp sections%> " "construct" msgstr "" -#: c-parser.c:7026 cp/parser.c:22986 +<<<<<<< HEAD +#: c-parser.c:7026 cp/parser.c:23000 +======= +#: c-parser.c:7026 cp/parser.c:22988 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<#pragma GCC pch_preprocess%> must be first" msgstr "" -#: c-parser.c:7185 cp/parser.c:21275 +<<<<<<< HEAD +#: c-parser.c:7185 cp/parser.c:21289 +======= +#: c-parser.c:7185 cp/parser.c:21277 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "too many %qs clauses" msgstr "" -#: c-parser.c:7287 cp/parser.c:21389 +<<<<<<< HEAD +#: c-parser.c:7287 cp/parser.c:21403 +======= +#: c-parser.c:7287 cp/parser.c:21391 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "collapse argument needs positive constant integer expression" msgstr "" @@ -14911,12 +15744,20 @@ msgstr "" msgid "expected %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, or %<||%>" msgstr "" -#: c-parser.c:7627 cp/parser.c:21677 +<<<<<<< HEAD +#: c-parser.c:7627 cp/parser.c:21691 +======= +#: c-parser.c:7627 cp/parser.c:21679 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "schedule % does not take a % parameter" msgstr "" -#: c-parser.c:7631 cp/parser.c:21680 +<<<<<<< HEAD +#: c-parser.c:7631 cp/parser.c:21694 +======= +#: c-parser.c:7631 cp/parser.c:21682 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "schedule % does not take a % parameter" msgstr "" @@ -14931,7 +15772,11 @@ msgstr "" msgid "expected %<#pragma omp%> clause" msgstr "" -#: c-parser.c:7778 cp/parser.c:21828 +<<<<<<< HEAD +#: c-parser.c:7778 cp/parser.c:21842 +======= +#: c-parser.c:7778 cp/parser.c:21830 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs is not valid for %qs" msgstr "" @@ -14951,7 +15796,7 @@ msgstr "" msgid "for statement expected" msgstr "" -#: c-parser.c:8049 cp/semantics.c:4402 cp/semantics.c:4472 +#: c-parser.c:8049 cp/semantics.c:4406 cp/semantics.c:4476 #, gcc-internal-format msgid "expected iteration declaration or initialization" msgstr "" @@ -14961,12 +15806,20 @@ msgstr "" msgid "not enough perfectly nested loops" msgstr "" -#: c-parser.c:8182 cp/parser.c:22533 +<<<<<<< HEAD +#: c-parser.c:8182 cp/parser.c:22547 +======= +#: c-parser.c:8182 cp/parser.c:22535 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "collapsed loops not perfectly nested" msgstr "" -#: c-parser.c:8220 cp/parser.c:22377 cp/parser.c:22415 cp/pt.c:11272 +<<<<<<< HEAD +#: c-parser.c:8220 cp/parser.c:22391 cp/parser.c:22429 cp/pt.c:11410 +======= +#: c-parser.c:8220 cp/parser.c:22379 cp/parser.c:22417 cp/pt.c:11407 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "iteration variable %qD should not be firstprivate" msgstr "" @@ -14976,17 +15829,17 @@ msgstr "" msgid "%qD is not a variable" msgstr "" -#: c-parser.c:8667 cp/semantics.c:4027 +#: c-parser.c:8667 cp/semantics.c:4031 #, gcc-internal-format msgid "%qE declared % after first use" msgstr "" -#: c-parser.c:8669 cp/semantics.c:4029 +#: c-parser.c:8669 cp/semantics.c:4033 #, gcc-internal-format msgid "automatic variable %qE cannot be %" msgstr "" -#: c-parser.c:8673 cp/semantics.c:4031 +#: c-parser.c:8673 cp/semantics.c:4035 #, gcc-internal-format msgid "% %qE has incomplete type" msgstr "" @@ -14996,52 +15849,52 @@ msgstr "" msgid "can%'t create precompiled header %s: %m" msgstr "" -#: c-pch.c:153 +#: c-pch.c:154 #, gcc-internal-format msgid "can%'t write to %s: %m" msgstr "" -#: c-pch.c:159 +#: c-pch.c:160 #, gcc-internal-format msgid "%qs is not a valid output file" msgstr "" -#: c-pch.c:188 c-pch.c:203 c-pch.c:217 +#: c-pch.c:189 c-pch.c:204 c-pch.c:218 #, gcc-internal-format msgid "can%'t write %s: %m" msgstr "" -#: c-pch.c:193 c-pch.c:210 +#: c-pch.c:194 c-pch.c:211 #, gcc-internal-format msgid "can%'t seek in %s: %m" msgstr "" -#: c-pch.c:201 c-pch.c:243 c-pch.c:284 c-pch.c:335 +#: c-pch.c:202 c-pch.c:244 c-pch.c:285 c-pch.c:336 #, gcc-internal-format msgid "can%'t read %s: %m" msgstr "" -#: c-pch.c:466 +#: c-pch.c:467 #, gcc-internal-format msgid "pch_preprocess pragma should only be used with -fpreprocessed" msgstr "" -#: c-pch.c:467 +#: c-pch.c:468 #, gcc-internal-format msgid "use #include instead" msgstr "" -#: c-pch.c:473 +#: c-pch.c:474 #, gcc-internal-format msgid "%s: couldn%'t open PCH file: %m" msgstr "" -#: c-pch.c:478 +#: c-pch.c:479 #, gcc-internal-format msgid "use -Winvalid-pch for more information" msgstr "" -#: c-pch.c:479 +#: c-pch.c:480 #, gcc-internal-format msgid "%s: PCH file was invalid" msgstr "" @@ -15352,7 +16205,11 @@ msgstr "" msgid "%qD has an incomplete type" msgstr "" -#: c-typeck.c:236 cp/call.c:3089 +<<<<<<< HEAD +#: c-typeck.c:236 cp/call.c:3088 +======= +#: c-typeck.c:236 cp/call.c:3084 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of void expression" msgstr "" @@ -15418,7 +16275,7 @@ msgstr "" msgid "function return types not compatible due to %" msgstr "" -#: c-typeck.c:1690 c-typeck.c:3251 +#: c-typeck.c:1690 c-typeck.c:3257 #, gcc-internal-format msgid "arithmetic on pointer to an incomplete type" msgstr "" @@ -15458,12 +16315,20 @@ msgstr "" msgid "invalid type argument of %<->%> (have %qT)" msgstr "" -#: c-typeck.c:2218 cp/typeck.c:2942 +<<<<<<< HEAD +#: c-typeck.c:2218 cp/typeck.c:2951 +======= +#: c-typeck.c:2218 cp/typeck.c:2965 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "subscripted value is neither array nor pointer" msgstr "" -#: c-typeck.c:2229 cp/typeck.c:2857 cp/typeck.c:2947 +<<<<<<< HEAD +#: c-typeck.c:2229 cp/typeck.c:2866 cp/typeck.c:2956 +======= +#: c-typeck.c:2229 cp/typeck.c:2880 cp/typeck.c:2970 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array subscript is not an integer" msgstr "" @@ -15506,357 +16371,366 @@ msgstr "" msgid "function with qualified void return type called" msgstr "" -#: c-typeck.c:2852 +<<<<<<< HEAD +#: c-typeck.c:2820 c-typeck.c:3047 cp/typeck.c:3315 cp/typeck.c:3429 +======= +#: c-typeck.c:2820 c-typeck.c:3047 cp/typeck.c:3329 cp/typeck.c:3443 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "declared here" +msgstr "" + +#: c-typeck.c:2855 #, gcc-internal-format msgid "type of formal parameter %d is incomplete" msgstr "" -#: c-typeck.c:2867 +#: c-typeck.c:2870 #, gcc-internal-format msgid "" "passing argument %d of %qE as integer rather than floating due to prototype" msgstr "" -#: c-typeck.c:2872 +#: c-typeck.c:2875 #, gcc-internal-format msgid "" "passing argument %d of %qE as integer rather than complex due to prototype" msgstr "" -#: c-typeck.c:2877 +#: c-typeck.c:2880 #, gcc-internal-format msgid "" "passing argument %d of %qE as complex rather than floating due to prototype" msgstr "" -#: c-typeck.c:2882 +#: c-typeck.c:2885 #, gcc-internal-format msgid "" "passing argument %d of %qE as floating rather than integer due to prototype" msgstr "" -#: c-typeck.c:2887 +#: c-typeck.c:2890 #, gcc-internal-format msgid "" "passing argument %d of %qE as complex rather than integer due to prototype" msgstr "" -#: c-typeck.c:2892 +#: c-typeck.c:2895 #, gcc-internal-format msgid "" "passing argument %d of %qE as floating rather than complex due to prototype" msgstr "" -#: c-typeck.c:2905 +#: c-typeck.c:2908 #, gcc-internal-format msgid "" "passing argument %d of %qE as % rather than % due to " "prototype" msgstr "" -#: c-typeck.c:2930 +#: c-typeck.c:2933 #, gcc-internal-format msgid "passing argument %d of %qE as %qT rather than %qT due to prototype" msgstr "" -#: c-typeck.c:2952 +#: c-typeck.c:2955 #, gcc-internal-format msgid "passing argument %d of %qE with different width due to prototype" msgstr "" -#: c-typeck.c:2976 +#: c-typeck.c:2979 #, gcc-internal-format msgid "passing argument %d of %qE as unsigned due to prototype" msgstr "" -#: c-typeck.c:2981 +#: c-typeck.c:2984 #, gcc-internal-format msgid "passing argument %d of %qE as signed due to prototype" msgstr "" -#: c-typeck.c:3121 c-typeck.c:3126 +#: c-typeck.c:3127 c-typeck.c:3132 #, gcc-internal-format msgid "comparison with string literal results in unspecified behavior" msgstr "" -#: c-typeck.c:3140 +#: c-typeck.c:3146 #, gcc-internal-format msgid "comparison between %qT and %qT" msgstr "" -#: c-typeck.c:3192 +#: c-typeck.c:3198 #, gcc-internal-format msgid "pointer of type % used in subtraction" msgstr "" -#: c-typeck.c:3195 +#: c-typeck.c:3201 #, gcc-internal-format msgid "pointer to a function used in subtraction" msgstr "" -#: c-typeck.c:3359 +#: c-typeck.c:3365 #, gcc-internal-format msgid "ISO C does not support %<~%> for complex conjugation" msgstr "" -#: c-typeck.c:3398 +#: c-typeck.c:3404 #, gcc-internal-format msgid "wrong type argument to unary exclamation mark" msgstr "" -#: c-typeck.c:3462 +#: c-typeck.c:3468 #, gcc-internal-format msgid "increment of enumeration value is invalid in C++" msgstr "" -#: c-typeck.c:3465 +#: c-typeck.c:3471 #, gcc-internal-format msgid "decrement of enumeration value is invalid in C++" msgstr "" -#: c-typeck.c:3478 +#: c-typeck.c:3484 #, gcc-internal-format msgid "ISO C does not support %<++%> and %<--%> on complex types" msgstr "" -#: c-typeck.c:3497 c-typeck.c:3529 +#: c-typeck.c:3503 c-typeck.c:3535 #, gcc-internal-format msgid "wrong type argument to increment" msgstr "" -#: c-typeck.c:3499 c-typeck.c:3532 +#: c-typeck.c:3505 c-typeck.c:3538 #, gcc-internal-format msgid "wrong type argument to decrement" msgstr "" -#: c-typeck.c:3519 +#: c-typeck.c:3525 #, gcc-internal-format msgid "increment of pointer to unknown structure" msgstr "" -#: c-typeck.c:3522 +#: c-typeck.c:3528 #, gcc-internal-format msgid "decrement of pointer to unknown structure" msgstr "" -#: c-typeck.c:3599 +#: c-typeck.c:3605 #, gcc-internal-format msgid "taking address of expression of type %" msgstr "" -#: c-typeck.c:3768 +#: c-typeck.c:3774 #, gcc-internal-format msgid "assignment of read-only member %qD" msgstr "" -#: c-typeck.c:3769 +#: c-typeck.c:3775 #, gcc-internal-format msgid "increment of read-only member %qD" msgstr "" -#: c-typeck.c:3770 +#: c-typeck.c:3776 #, gcc-internal-format msgid "decrement of read-only member %qD" msgstr "" -#: c-typeck.c:3771 +#: c-typeck.c:3777 #, gcc-internal-format msgid "read-only member %qD used as % output" msgstr "" -#: c-typeck.c:3775 cp/typeck2.c:141 +#: c-typeck.c:3781 cp/typeck2.c:141 #, gcc-internal-format msgid "assignment of read-only variable %qD" msgstr "" -#: c-typeck.c:3776 cp/typeck2.c:145 +#: c-typeck.c:3782 cp/typeck2.c:145 #, gcc-internal-format msgid "increment of read-only variable %qD" msgstr "" -#: c-typeck.c:3777 cp/typeck2.c:147 +#: c-typeck.c:3783 cp/typeck2.c:147 #, gcc-internal-format msgid "decrement of read-only variable %qD" msgstr "" -#: c-typeck.c:3778 +#: c-typeck.c:3784 #, gcc-internal-format msgid "read-only variable %qD used as % output" msgstr "" -#: c-typeck.c:3781 c-typeck.c:3797 cp/typeck2.c:196 +#: c-typeck.c:3787 c-typeck.c:3803 cp/typeck2.c:196 #, gcc-internal-format msgid "assignment of read-only location %qE" msgstr "" -#: c-typeck.c:3782 c-typeck.c:3800 cp/typeck2.c:200 +#: c-typeck.c:3788 c-typeck.c:3806 cp/typeck2.c:200 #, gcc-internal-format msgid "increment of read-only location %qE" msgstr "" -#: c-typeck.c:3783 c-typeck.c:3803 cp/typeck2.c:202 +#: c-typeck.c:3789 c-typeck.c:3809 cp/typeck2.c:202 #, gcc-internal-format msgid "decrement of read-only location %qE" msgstr "" -#: c-typeck.c:3784 +#: c-typeck.c:3790 #, gcc-internal-format msgid "read-only location %qE used as % output" msgstr "" -#: c-typeck.c:3843 +#: c-typeck.c:3849 #, gcc-internal-format msgid "cannot take address of bit-field %qD" msgstr "" -#: c-typeck.c:3871 +#: c-typeck.c:3877 #, gcc-internal-format msgid "global register variable %qD used in nested function" msgstr "" -#: c-typeck.c:3874 +#: c-typeck.c:3880 #, gcc-internal-format msgid "register variable %qD used in nested function" msgstr "" -#: c-typeck.c:3879 +#: c-typeck.c:3885 #, gcc-internal-format msgid "address of global register variable %qD requested" msgstr "" -#: c-typeck.c:3881 +#: c-typeck.c:3887 #, gcc-internal-format msgid "address of register variable %qD requested" msgstr "" -#: c-typeck.c:3948 +#: c-typeck.c:3982 #, gcc-internal-format msgid "non-lvalue array in conditional expression" msgstr "" -#: c-typeck.c:4076 +#: c-typeck.c:4110 #, gcc-internal-format msgid "ISO C forbids conditional expr with only one void side" msgstr "" -#: c-typeck.c:4093 +#: c-typeck.c:4127 #, gcc-internal-format msgid "pointers to disjoint address spaces used in conditional expression" msgstr "" -#: c-typeck.c:4101 c-typeck.c:4110 +#: c-typeck.c:4135 c-typeck.c:4144 #, gcc-internal-format msgid "ISO C forbids conditional expr between % and function pointer" msgstr "" -#: c-typeck.c:4121 +#: c-typeck.c:4155 #, gcc-internal-format msgid "pointer type mismatch in conditional expression" msgstr "" -#: c-typeck.c:4130 c-typeck.c:4141 +#: c-typeck.c:4164 c-typeck.c:4175 #, gcc-internal-format msgid "pointer/integer type mismatch in conditional expression" msgstr "" -#: c-typeck.c:4155 +#: c-typeck.c:4189 #, gcc-internal-format msgid "type mismatch in conditional expression" msgstr "" -#: c-typeck.c:4251 +#: c-typeck.c:4283 #, gcc-internal-format msgid "left-hand operand of comma expression has no effect" msgstr "" -#: c-typeck.c:4319 +#: c-typeck.c:4351 #, gcc-internal-format msgid "cast adds new qualifiers to function type" msgstr "" -#: c-typeck.c:4325 +#: c-typeck.c:4357 #, gcc-internal-format msgid "cast discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:4395 +#: c-typeck.c:4427 #, gcc-internal-format msgid "cast specifies array type" msgstr "" -#: c-typeck.c:4401 +#: c-typeck.c:4433 #, gcc-internal-format msgid "cast specifies function type" msgstr "" -#: c-typeck.c:4417 +#: c-typeck.c:4449 #, gcc-internal-format msgid "ISO C forbids casting nonscalar to the same type" msgstr "" -#: c-typeck.c:4434 +#: c-typeck.c:4466 #, gcc-internal-format msgid "ISO C forbids casts to union type" msgstr "" -#: c-typeck.c:4444 +#: c-typeck.c:4476 #, gcc-internal-format msgid "cast to union type from type not present in union" msgstr "" -#: c-typeck.c:4479 +#: c-typeck.c:4511 #, gcc-internal-format msgid "" "cast to %s address space pointer from disjoint generic address space pointer" msgstr "" -#: c-typeck.c:4484 +#: c-typeck.c:4516 #, gcc-internal-format msgid "" "cast to generic address space pointer from disjoint %s address space pointer" msgstr "" -#: c-typeck.c:4489 +#: c-typeck.c:4521 #, gcc-internal-format msgid "cast to %s address space pointer from disjoint %s address space pointer" msgstr "" -#: c-typeck.c:4509 +#: c-typeck.c:4541 #, gcc-internal-format msgid "cast increases required alignment of target type" msgstr "" -#: c-typeck.c:4520 +#: c-typeck.c:4552 #, gcc-internal-format msgid "cast from pointer to integer of different size" msgstr "" -#: c-typeck.c:4525 +#: c-typeck.c:4557 #, gcc-internal-format msgid "cast from function call of type %qT to non-matching type %qT" msgstr "" -#: c-typeck.c:4534 +#: c-typeck.c:4566 #, gcc-internal-format msgid "cast to pointer from integer of different size" msgstr "" -#: c-typeck.c:4548 +#: c-typeck.c:4580 #, gcc-internal-format msgid "ISO C forbids conversion of function pointer to object pointer type" msgstr "" -#: c-typeck.c:4557 +#: c-typeck.c:4589 #, gcc-internal-format msgid "ISO C forbids conversion of object pointer to function pointer type" msgstr "" -#: c-typeck.c:4639 +#: c-typeck.c:4671 #, gcc-internal-format msgid "defining a type in a cast is invalid in C++" msgstr "" -#: c-typeck.c:4764 c-typeck.c:4931 +#: c-typeck.c:4796 c-typeck.c:4963 #, gcc-internal-format msgid "enum conversion in assignment is invalid in C++" msgstr "" @@ -15864,466 +16738,518 @@ msgstr "" #. This macro is used to emit diagnostics to ensure that all format #. strings are complete sentences, visible to gettext and checked at #. compile time. -#: c-typeck.c:4869 c-typeck.c:5377 +#: c-typeck.c:4901 c-typeck.c:5409 #, gcc-internal-format msgid "expected %qT but argument is of type %qT" msgstr "" -#: c-typeck.c:4929 +#: c-typeck.c:4961 #, gcc-internal-format msgid "enum conversion when passing argument %d of %qE is invalid in C++" msgstr "" -#: c-typeck.c:4935 +#: c-typeck.c:4967 #, gcc-internal-format msgid "enum conversion in return is invalid in C++" msgstr "" -#: c-typeck.c:4964 +#: c-typeck.c:4996 #, gcc-internal-format msgid "cannot pass rvalue to reference parameter" msgstr "" -#: c-typeck.c:5094 c-typeck.c:5299 +#: c-typeck.c:5126 c-typeck.c:5331 #, gcc-internal-format msgid "" "passing argument %d of %qE makes qualified function pointer from unqualified" msgstr "" -#: c-typeck.c:5097 c-typeck.c:5302 +#: c-typeck.c:5129 c-typeck.c:5334 #, gcc-internal-format msgid "assignment makes qualified function pointer from unqualified" msgstr "" -#: c-typeck.c:5100 c-typeck.c:5304 +#: c-typeck.c:5132 c-typeck.c:5336 #, gcc-internal-format msgid "initialization makes qualified function pointer from unqualified" msgstr "" -#: c-typeck.c:5103 c-typeck.c:5306 +#: c-typeck.c:5135 c-typeck.c:5338 #, gcc-internal-format msgid "return makes qualified function pointer from unqualified" msgstr "" -#: c-typeck.c:5109 c-typeck.c:5263 +#: c-typeck.c:5141 c-typeck.c:5295 #, gcc-internal-format msgid "passing argument %d of %qE discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:5111 c-typeck.c:5265 +#: c-typeck.c:5143 c-typeck.c:5297 #, gcc-internal-format msgid "assignment discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:5113 c-typeck.c:5267 +#: c-typeck.c:5145 c-typeck.c:5299 #, gcc-internal-format msgid "initialization discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:5115 c-typeck.c:5269 +#: c-typeck.c:5147 c-typeck.c:5301 #, gcc-internal-format msgid "return discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:5123 +#: c-typeck.c:5155 #, gcc-internal-format msgid "ISO C prohibits argument conversion to union type" msgstr "" -#: c-typeck.c:5159 +#: c-typeck.c:5191 #, gcc-internal-format msgid "request for implicit conversion from %qT to %qT not permitted in C++" msgstr "" -#: c-typeck.c:5171 +#: c-typeck.c:5203 #, gcc-internal-format msgid "passing argument %d of %qE from pointer to non-enclosed address space" msgstr "" -#: c-typeck.c:5175 +#: c-typeck.c:5207 #, gcc-internal-format msgid "assignment from pointer to non-enclosed address space" msgstr "" -#: c-typeck.c:5179 +#: c-typeck.c:5211 #, gcc-internal-format msgid "initialization from pointer to non-enclosed address space" msgstr "" -#: c-typeck.c:5183 +#: c-typeck.c:5215 #, gcc-internal-format msgid "return from pointer to non-enclosed address space" msgstr "" -#: c-typeck.c:5201 +#: c-typeck.c:5233 #, gcc-internal-format msgid "argument %d of %qE might be a candidate for a format attribute" msgstr "" -#: c-typeck.c:5207 +#: c-typeck.c:5239 #, gcc-internal-format msgid "assignment left-hand side might be a candidate for a format attribute" msgstr "" -#: c-typeck.c:5212 +#: c-typeck.c:5244 #, gcc-internal-format msgid "" "initialization left-hand side might be a candidate for a format attribute" msgstr "" -#: c-typeck.c:5217 +#: c-typeck.c:5249 #, gcc-internal-format msgid "return type might be a candidate for a format attribute" msgstr "" -#: c-typeck.c:5241 +#: c-typeck.c:5273 #, gcc-internal-format msgid "" "ISO C forbids passing argument %d of %qE between function pointer and %" msgstr "" -#: c-typeck.c:5244 +#: c-typeck.c:5276 #, gcc-internal-format msgid "ISO C forbids assignment between function pointer and %" msgstr "" -#: c-typeck.c:5246 +#: c-typeck.c:5278 #, gcc-internal-format msgid "ISO C forbids initialization between function pointer and %" msgstr "" -#: c-typeck.c:5248 +#: c-typeck.c:5280 #, gcc-internal-format msgid "ISO C forbids return between function pointer and %" msgstr "" -#: c-typeck.c:5280 +#: c-typeck.c:5312 #, gcc-internal-format msgid "pointer targets in passing argument %d of %qE differ in signedness" msgstr "" -#: c-typeck.c:5282 +#: c-typeck.c:5314 #, gcc-internal-format msgid "pointer targets in assignment differ in signedness" msgstr "" -#: c-typeck.c:5284 +#: c-typeck.c:5316 #, gcc-internal-format msgid "pointer targets in initialization differ in signedness" msgstr "" -#: c-typeck.c:5286 +#: c-typeck.c:5318 #, gcc-internal-format msgid "pointer targets in return differ in signedness" msgstr "" -#: c-typeck.c:5314 +#: c-typeck.c:5346 #, gcc-internal-format msgid "passing argument %d of %qE from incompatible pointer type" msgstr "" -#: c-typeck.c:5316 +#: c-typeck.c:5348 #, gcc-internal-format msgid "assignment from incompatible pointer type" msgstr "" -#: c-typeck.c:5317 +#: c-typeck.c:5349 #, gcc-internal-format msgid "initialization from incompatible pointer type" msgstr "" -#: c-typeck.c:5319 +#: c-typeck.c:5351 #, gcc-internal-format msgid "return from incompatible pointer type" msgstr "" -#: c-typeck.c:5337 +#: c-typeck.c:5369 #, gcc-internal-format msgid "passing argument %d of %qE makes pointer from integer without a cast" msgstr "" -#: c-typeck.c:5339 +#: c-typeck.c:5371 #, gcc-internal-format msgid "assignment makes pointer from integer without a cast" msgstr "" -#: c-typeck.c:5341 +#: c-typeck.c:5373 #, gcc-internal-format msgid "initialization makes pointer from integer without a cast" msgstr "" -#: c-typeck.c:5343 +#: c-typeck.c:5375 #, gcc-internal-format msgid "return makes pointer from integer without a cast" msgstr "" -#: c-typeck.c:5351 +#: c-typeck.c:5383 #, gcc-internal-format msgid "passing argument %d of %qE makes integer from pointer without a cast" msgstr "" -#: c-typeck.c:5353 +#: c-typeck.c:5385 #, gcc-internal-format msgid "assignment makes integer from pointer without a cast" msgstr "" -#: c-typeck.c:5355 +#: c-typeck.c:5387 #, gcc-internal-format msgid "initialization makes integer from pointer without a cast" msgstr "" -#: c-typeck.c:5357 +#: c-typeck.c:5389 #, gcc-internal-format msgid "return makes integer from pointer without a cast" msgstr "" -#: c-typeck.c:5380 +#: c-typeck.c:5412 #, gcc-internal-format msgid "incompatible types when assigning to type %qT from type %qT" msgstr "" -#: c-typeck.c:5385 +#: c-typeck.c:5417 #, gcc-internal-format msgid "incompatible types when initializing type %qT using type %qT" msgstr "" -#: c-typeck.c:5390 +#: c-typeck.c:5422 #, gcc-internal-format msgid "incompatible types when returning type %qT but %qT was expected" msgstr "" -#: c-typeck.c:5454 +#: c-typeck.c:5486 #, gcc-internal-format msgid "traditional C rejects automatic aggregate initialization" msgstr "" -#: c-typeck.c:5627 c-typeck.c:5643 c-typeck.c:5660 +#: c-typeck.c:5659 c-typeck.c:5675 c-typeck.c:5692 #, gcc-internal-format msgid "(near initialization for %qs)" msgstr "" -#: c-typeck.c:6263 cp/decl.c:5224 +<<<<<<< HEAD +#: c-typeck.c:6295 cp/decl.c:5227 +======= +#: c-typeck.c:6295 cp/decl.c:5228 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "opaque vector types cannot be initialized" msgstr "" -#: c-typeck.c:6928 +#: c-typeck.c:6960 #, gcc-internal-format msgid "unknown field %qE specified in initializer" msgstr "" -#: c-typeck.c:7907 +#: c-typeck.c:7939 #, gcc-internal-format msgid "traditional C rejects initialization of unions" msgstr "" -#: c-typeck.c:8246 +#: c-typeck.c:8278 #, gcc-internal-format msgid "ISO C forbids %" msgstr "" -#: c-typeck.c:8268 cp/typeck.c:7236 +<<<<<<< HEAD +#: c-typeck.c:8300 cp/typeck.c:7323 +======= +#: c-typeck.c:8300 cp/typeck.c:7337 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function declared % has a % statement" msgstr "" -#: c-typeck.c:8291 +#: c-typeck.c:8323 #, gcc-internal-format msgid "% with no value, in function returning non-void" msgstr "" -#: c-typeck.c:8301 +#: c-typeck.c:8333 #, gcc-internal-format msgid "% with a value, in function returning void" msgstr "" -#: c-typeck.c:8303 +#: c-typeck.c:8335 #, gcc-internal-format msgid "ISO C forbids % with expression, in function returning void" msgstr "" -#: c-typeck.c:8364 +#: c-typeck.c:8396 #, gcc-internal-format msgid "function returns address of local variable" msgstr "" -#: c-typeck.c:8437 cp/semantics.c:953 +#: c-typeck.c:8469 cp/semantics.c:951 #, gcc-internal-format msgid "switch quantity not an integer" msgstr "" -#: c-typeck.c:8450 +#: c-typeck.c:8482 #, gcc-internal-format msgid "% switch expression not converted to % in ISO C" msgstr "" -#: c-typeck.c:8486 c-typeck.c:8494 +#: c-typeck.c:8518 c-typeck.c:8526 #, gcc-internal-format msgid "case label is not an integer constant expression" msgstr "" -#: c-typeck.c:8500 cp/parser.c:7750 +<<<<<<< HEAD +#: c-typeck.c:8532 cp/parser.c:7757 +======= +#: c-typeck.c:8532 cp/parser.c:7747 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "case label not within a switch statement" msgstr "" -#: c-typeck.c:8502 +#: c-typeck.c:8534 #, gcc-internal-format msgid "% label not within a switch statement" msgstr "" -#: c-typeck.c:8585 cp/parser.c:8041 +<<<<<<< HEAD +#: c-typeck.c:8617 cp/parser.c:8048 +======= +#: c-typeck.c:8617 cp/parser.c:8038 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "suggest explicit braces to avoid ambiguous %" msgstr "" -#: c-typeck.c:8694 cp/cp-gimplify.c:92 cp/parser.c:8391 +<<<<<<< HEAD +#: c-typeck.c:8726 cp/cp-gimplify.c:92 cp/parser.c:8398 +======= +#: c-typeck.c:8726 cp/cp-gimplify.c:92 cp/parser.c:8388 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "break statement not within loop or switch" msgstr "" -#: c-typeck.c:8696 cp/parser.c:8412 +<<<<<<< HEAD +#: c-typeck.c:8728 cp/parser.c:8419 +======= +#: c-typeck.c:8728 cp/parser.c:8409 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "continue statement not within a loop" msgstr "" -#: c-typeck.c:8701 cp/parser.c:8402 +<<<<<<< HEAD +#: c-typeck.c:8733 cp/parser.c:8409 +======= +#: c-typeck.c:8733 cp/parser.c:8399 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "break statement used with OpenMP for loop" msgstr "" -#: c-typeck.c:8727 cp/cp-gimplify.c:412 +#: c-typeck.c:8759 cp/cp-gimplify.c:412 #, gcc-internal-format msgid "statement with no effect" msgstr "" -#: c-typeck.c:8751 +#: c-typeck.c:8783 #, gcc-internal-format msgid "expression statement has incomplete type" msgstr "" -#: c-typeck.c:9328 cp/typeck.c:3814 +<<<<<<< HEAD +#: c-typeck.c:9360 cp/typeck.c:3825 +======= +#: c-typeck.c:9360 cp/typeck.c:3839 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "right shift count is negative" msgstr "" -#: c-typeck.c:9339 cp/typeck.c:3821 +<<<<<<< HEAD +#: c-typeck.c:9371 cp/typeck.c:3832 +======= +#: c-typeck.c:9371 cp/typeck.c:3846 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "right shift count >= width of type" msgstr "" -#: c-typeck.c:9365 cp/typeck.c:3843 +<<<<<<< HEAD +#: c-typeck.c:9397 cp/typeck.c:3854 +======= +#: c-typeck.c:9397 cp/typeck.c:3868 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "left shift count is negative" msgstr "" -#: c-typeck.c:9372 cp/typeck.c:3849 +<<<<<<< HEAD +#: c-typeck.c:9404 cp/typeck.c:3860 +======= +#: c-typeck.c:9404 cp/typeck.c:3874 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "left shift count >= width of type" msgstr "" -#: c-typeck.c:9392 cp/typeck.c:3895 +<<<<<<< HEAD +#: c-typeck.c:9424 cp/typeck.c:3906 +======= +#: c-typeck.c:9424 cp/typeck.c:3920 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "comparing floating point with == or != is unsafe" msgstr "" -#: c-typeck.c:9420 c-typeck.c:9508 +#: c-typeck.c:9452 c-typeck.c:9540 #, gcc-internal-format msgid "comparison of pointers to disjoint address spaces" msgstr "" -#: c-typeck.c:9427 c-typeck.c:9433 +#: c-typeck.c:9459 c-typeck.c:9465 #, gcc-internal-format msgid "ISO C forbids comparison of % with function pointer" msgstr "" -#: c-typeck.c:9440 c-typeck.c:9518 +#: c-typeck.c:9472 c-typeck.c:9550 #, gcc-internal-format msgid "comparison of distinct pointer types lacks a cast" msgstr "" -#: c-typeck.c:9454 c-typeck.c:9463 cp/typeck.c:3918 cp/typeck.c:3930 +<<<<<<< HEAD +#: c-typeck.c:9486 c-typeck.c:9495 cp/typeck.c:3929 cp/typeck.c:3941 +======= +#: c-typeck.c:9486 c-typeck.c:9495 cp/typeck.c:3943 cp/typeck.c:3955 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the address of %qD will never be NULL" msgstr "" -#: c-typeck.c:9470 c-typeck.c:9475 c-typeck.c:9540 c-typeck.c:9545 +#: c-typeck.c:9502 c-typeck.c:9507 c-typeck.c:9572 c-typeck.c:9577 #, gcc-internal-format msgid "comparison between pointer and integer" msgstr "" -#: c-typeck.c:9501 +#: c-typeck.c:9533 #, gcc-internal-format msgid "comparison of complete and incomplete pointers" msgstr "" -#: c-typeck.c:9503 +#: c-typeck.c:9535 #, gcc-internal-format msgid "ISO C forbids ordered comparisons of pointers to functions" msgstr "" -#: c-typeck.c:9526 c-typeck.c:9529 c-typeck.c:9535 +#: c-typeck.c:9558 c-typeck.c:9561 c-typeck.c:9567 #, gcc-internal-format msgid "ordered comparison of pointer with integer zero" msgstr "" -#: c-typeck.c:9857 +#: c-typeck.c:9887 #, gcc-internal-format msgid "used array that cannot be converted to pointer where scalar is required" msgstr "" -#: c-typeck.c:9861 +#: c-typeck.c:9891 #, gcc-internal-format msgid "used struct type value where scalar is required" msgstr "" -#: c-typeck.c:9865 +#: c-typeck.c:9895 #, gcc-internal-format msgid "used union type value where scalar is required" msgstr "" -#: c-typeck.c:10022 cp/semantics.c:3910 +#: c-typeck.c:10052 cp/semantics.c:3914 #, gcc-internal-format msgid "%qE has invalid type for %" msgstr "" -#: c-typeck.c:10057 cp/semantics.c:3923 +#: c-typeck.c:10087 cp/semantics.c:3927 #, gcc-internal-format msgid "%qE has invalid type for %" msgstr "" -#: c-typeck.c:10074 cp/semantics.c:3933 +#: c-typeck.c:10104 cp/semantics.c:3937 #, gcc-internal-format msgid "%qE must be % for %" msgstr "" -#: c-typeck.c:10084 cp/semantics.c:3730 +#: c-typeck.c:10114 cp/semantics.c:3734 #, gcc-internal-format msgid "%qE is not a variable in clause %qs" msgstr "" -#: c-typeck.c:10092 c-typeck.c:10114 c-typeck.c:10136 +#: c-typeck.c:10122 c-typeck.c:10144 c-typeck.c:10166 #, gcc-internal-format msgid "%qE appears more than once in data clauses" msgstr "" -#: c-typeck.c:10107 cp/semantics.c:3753 +#: c-typeck.c:10137 cp/semantics.c:3757 #, gcc-internal-format msgid "%qE is not a variable in clause %" msgstr "" -#: c-typeck.c:10129 cp/semantics.c:3775 +#: c-typeck.c:10159 cp/semantics.c:3779 #, gcc-internal-format msgid "%qE is not a variable in clause %" msgstr "" -#: c-typeck.c:10191 cp/semantics.c:3974 +#: c-typeck.c:10221 cp/semantics.c:3978 #, gcc-internal-format msgid "%qE is predetermined %qs for %qs" msgstr "" -#: c-typeck.c:10280 +#: c-typeck.c:10310 #, gcc-internal-format msgid "C++ requires promoted type, not enum type, in %" msgstr "" @@ -16333,17 +17259,29 @@ msgstr "" msgid "function call has aggregate value" msgstr "" -#: cfgexpand.c:1018 function.c:919 varasm.c:2167 +<<<<<<< HEAD +#: cfgexpand.c:984 function.c:919 varasm.c:2208 +======= +#: cfgexpand.c:984 function.c:919 varasm.c:2205 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of variable %q+D is too large" msgstr "" -#: cfgexpand.c:3569 +<<<<<<< HEAD +#: cfgexpand.c:3767 +======= +#: cfgexpand.c:3766 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "not protecting local variables: variable length buffer" msgstr "" -#: cfgexpand.c:3572 +<<<<<<< HEAD +#: cfgexpand.c:3770 +======= +#: cfgexpand.c:3769 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "not protecting function: no buffer at least %d bytes long" msgstr "" @@ -16748,7 +17686,7 @@ msgstr "" msgid "number of bb notes in insn chain (%d) != n_basic_blocks (%d)" msgstr "" -#: cgraph.c:1798 +#: cgraph.c:1799 #, gcc-internal-format msgid "%D renamed after being referenced in assembly" msgstr "" @@ -16863,57 +17801,65 @@ msgstr "" msgid "edge points to same body alias:" msgstr "" -#: cgraphunit.c:757 +#: cgraphunit.c:758 #, gcc-internal-format msgid "edge points to wrong declaration:" msgstr "" -#: cgraphunit.c:767 +#: cgraphunit.c:768 #, gcc-internal-format msgid "missing callgraph edge for call stmt:" msgstr "" -#: cgraphunit.c:783 +#: cgraphunit.c:784 #, gcc-internal-format msgid "edge %s->%s has no corresponding call_stmt" msgstr "" -#: cgraphunit.c:795 +#: cgraphunit.c:796 #, gcc-internal-format msgid "verify_cgraph_node failed" msgstr "" -#: cgraphunit.c:898 cgraphunit.c:918 +#: cgraphunit.c:901 cgraphunit.c:921 #, gcc-internal-format msgid "% attribute have effect only on public objects" msgstr "" -#: cgraphunit.c:1160 cgraphunit.c:1181 +#: cgraphunit.c:1163 cgraphunit.c:1184 #, gcc-internal-format msgid "failed to reclaim unneeded function" msgstr "" -#: cgraphunit.c:1903 +<<<<<<< HEAD +#: cgraphunit.c:1906 +======= +#: cgraphunit.c:1908 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "nodes with unreleased memory found" msgstr "" -#: collect2.c:1519 opts.c:1140 +<<<<<<< HEAD +#: collect2.c:1530 opts.c:1134 +======= +#: collect2.c:1530 opts.c:1140 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "LTO support has not been enabled in this configuration" msgstr "" -#: collect2.c:1612 +#: collect2.c:1623 #, gcc-internal-format msgid "unknown demangling style '%s'" msgstr "" -#: collect2.c:1973 lto/lto.c:1241 +#: collect2.c:1993 lto/lto.c:1241 #, gcc-internal-format msgid "%s terminated with signal %d [%s]%s" msgstr "" -#: collect2.c:2775 +#: collect2.c:2795 #, gcc-internal-format msgid "cannot find 'ldd'" msgstr "" @@ -16938,32 +17884,32 @@ msgstr "" msgid "conversion to incomplete type" msgstr "" -#: convert.c:829 convert.c:905 +#: convert.c:854 convert.c:930 #, gcc-internal-format msgid "can't convert between vector values of different size" msgstr "" -#: convert.c:835 +#: convert.c:860 #, gcc-internal-format msgid "aggregate value used where an integer was expected" msgstr "" -#: convert.c:885 +#: convert.c:910 #, gcc-internal-format msgid "pointer value used where a complex was expected" msgstr "" -#: convert.c:889 +#: convert.c:914 #, gcc-internal-format msgid "aggregate value used where a complex was expected" msgstr "" -#: convert.c:911 +#: convert.c:936 #, gcc-internal-format msgid "can't convert value to a vector" msgstr "" -#: convert.c:950 +#: convert.c:975 #, gcc-internal-format msgid "aggregate value used where a fixed-point was expected" msgstr "" @@ -17058,7 +18004,7 @@ msgstr "" msgid "common symbol debug info is not structured as symbol+offset" msgstr "" -#: diagnostic.c:728 +#: diagnostic.c:763 #, gcc-internal-format msgid "in %s, at %s:%d" msgstr "" @@ -17073,18 +18019,35 @@ msgstr "" msgid "dominator of %d should be %d, not %d" msgstr "" -#: dwarf2out.c:4014 +<<<<<<< HEAD +#: dwarf2out.c:4007 +======= +#: dwarf2out.c:4004 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "Multiple EH personalities are supported only with assemblers supporting .cfi." "personality directive." msgstr "" -#: dwarf2out.c:5392 +<<<<<<< HEAD +#: dwarf2out.c:5393 +======= +#: dwarf2out.c:5382 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "DW_LOC_OP %s not implemented" msgstr "" +<<<<<<< HEAD +#: dwarf2out.c:12859 +======= +#: dwarf2out.c:12830 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "non-delegitimized UNSPEC %d found in variable location" +msgstr "" + #: emit-rtl.c:2460 #, gcc-internal-format msgid "invalid rtl sharing found in the insn" @@ -17115,57 +18078,57 @@ msgstr "" msgid "exception handling disabled, use -fexceptions to enable" msgstr "" -#: except.c:2026 +#: except.c:2032 #, gcc-internal-format msgid "argument of %<__builtin_eh_return_regno%> must be constant" msgstr "" -#: except.c:2163 +#: except.c:2169 #, gcc-internal-format msgid "__builtin_eh_return not supported on this target" msgstr "" -#: except.c:3334 except.c:3359 +#: except.c:3340 except.c:3365 #, gcc-internal-format msgid "region_array is corrupted for region %i" msgstr "" -#: except.c:3347 except.c:3378 +#: except.c:3353 except.c:3384 #, gcc-internal-format msgid "lp_array is corrupted for lp %i" msgstr "" -#: except.c:3364 +#: except.c:3370 #, gcc-internal-format msgid "outer block of region %i is wrong" msgstr "" -#: except.c:3369 +#: except.c:3375 #, gcc-internal-format msgid "negative nesting depth of region %i" msgstr "" -#: except.c:3383 +#: except.c:3389 #, gcc-internal-format msgid "region of lp %i is wrong" msgstr "" -#: except.c:3410 +#: except.c:3416 #, gcc-internal-format msgid "tree list ends on depth %i" msgstr "" -#: except.c:3415 +#: except.c:3421 #, gcc-internal-format msgid "region_array does not match region_tree" msgstr "" -#: except.c:3420 +#: except.c:3426 #, gcc-internal-format msgid "lp_array does not match region_tree" msgstr "" -#: except.c:3427 +#: except.c:3433 #, gcc-internal-format msgid "verify_eh_tree failed" msgstr "" @@ -17175,30 +18138,30 @@ msgstr "" msgid "stack limits not supported on this target" msgstr "" -#: expr.c:9228 +#: expr.c:9236 msgid "%Kcall to %qs declared with attribute error: %s" msgstr "" -#: expr.c:9235 +#: expr.c:9243 msgid "%Kcall to %qs declared with attribute warning: %s" msgstr "" -#: final.c:1457 +#: final.c:1460 #, gcc-internal-format msgid "invalid argument %qs to -fdebug-prefix-map" msgstr "" -#: final.c:1574 +#: final.c:1577 #, gcc-internal-format msgid "the frame size of %wd bytes is larger than %wd bytes" msgstr "" -#: final.c:4367 toplev.c:1928 +#: final.c:4370 toplev.c:1936 #, gcc-internal-format msgid "could not open final insn dump file %qs: %s" msgstr "" -#: final.c:4423 +#: final.c:4428 #, gcc-internal-format msgid "could not close final insn dump file %qs: %s" msgstr "" @@ -17251,7 +18214,7 @@ msgid "" "comparison" msgstr "" -#: fold-const.c:14231 +#: fold-const.c:14233 #, gcc-internal-format msgid "fold check: original tree changed by fold" msgstr "" @@ -17261,7 +18224,7 @@ msgstr "" msgid "total size of local objects too large" msgstr "" -#: function.c:1645 gimplify.c:4890 +#: function.c:1645 gimplify.c:4983 #, gcc-internal-format msgid "impossible constraint in %" msgstr "" @@ -17311,7 +18274,7 @@ msgstr "" msgid "warning: -pipe ignored because -save-temps specified" msgstr "" -#: gcc.c:4608 +#: gcc.c:4623 #, gcc-internal-format msgid "warning: '-x %s' after last input file has no effect" msgstr "" @@ -17319,87 +18282,87 @@ msgstr "" #. Catch the case where a spec string contains something like #. '%{foo:%*}'. i.e. there is no * in the pattern on the left #. hand side of the :. -#: gcc.c:5862 +#: gcc.c:5877 #, gcc-internal-format msgid "spec failure: '%%*' has not been initialized by pattern match" msgstr "" -#: gcc.c:5871 +#: gcc.c:5886 #, gcc-internal-format msgid "warning: use of obsolete %%[ operator in specs" msgstr "" -#: gcc.c:5952 +#: gcc.c:5967 #, gcc-internal-format msgid "spec failure: unrecognized spec option '%c'" msgstr "" -#: gcc.c:6688 +#: gcc.c:6703 #, gcc-internal-format msgid "%s: could not determine length of compare-debug file %s" msgstr "" -#: gcc.c:6699 +#: gcc.c:6714 #, gcc-internal-format msgid "%s: -fcompare-debug failure (length)" msgstr "" -#: gcc.c:6709 gcc.c:6750 +#: gcc.c:6724 gcc.c:6765 #, gcc-internal-format msgid "%s: could not open compare-debug file %s" msgstr "" -#: gcc.c:6729 gcc.c:6766 +#: gcc.c:6744 gcc.c:6781 #, gcc-internal-format msgid "%s: -fcompare-debug failure" msgstr "" -#: gcc.c:7002 +#: gcc.c:7017 #, gcc-internal-format msgid "spec failure: more than one arg to SYSROOT_SUFFIX_SPEC" msgstr "" -#: gcc.c:7025 +#: gcc.c:7040 #, gcc-internal-format msgid "spec failure: more than one arg to SYSROOT_HEADERS_SUFFIX_SPEC" msgstr "" -#: gcc.c:7133 +#: gcc.c:7148 #, gcc-internal-format msgid "unrecognized option '-%s'" msgstr "" -#: gcc.c:7366 gcc.c:7429 +#: gcc.c:7381 gcc.c:7444 #, gcc-internal-format msgid "%s: %s compiler not installed on this system" msgstr "" -#: gcc.c:7453 +#: gcc.c:7468 #, gcc-internal-format msgid "Recompiling with -fcompare-debug" msgstr "" -#: gcc.c:7467 +#: gcc.c:7482 #, gcc-internal-format msgid "during -fcompare-debug recompilation" msgstr "" -#: gcc.c:7476 +#: gcc.c:7491 #, gcc-internal-format msgid "Comparing final insns dumps" msgstr "" -#: gcc.c:7600 +#: gcc.c:7615 #, gcc-internal-format msgid "%s: linker input file unused because linking not done" msgstr "" -#: gcc.c:7640 +#: gcc.c:7655 #, gcc-internal-format msgid "language %s not recognized" msgstr "" -#: gcc.c:7711 lto/lto.c:1231 +#: gcc.c:7726 lto/lto.c:1231 #, gcc-internal-format msgid "%s: %s" msgstr "" @@ -17467,52 +18430,52 @@ msgstr "" msgid "using result of function returning %" msgstr "" -#: gimplify.c:4775 +#: gimplify.c:4868 #, gcc-internal-format msgid "invalid lvalue in asm output %d" msgstr "" -#: gimplify.c:4891 +#: gimplify.c:4984 #, gcc-internal-format msgid "non-memory input %d must stay in memory" msgstr "" -#: gimplify.c:4906 +#: gimplify.c:4999 #, gcc-internal-format msgid "memory input %d is not directly addressable" msgstr "" -#: gimplify.c:5407 +#: gimplify.c:5500 #, gcc-internal-format msgid "%qE not specified in enclosing parallel" msgstr "" -#: gimplify.c:5409 +#: gimplify.c:5502 #, gcc-internal-format msgid "enclosing parallel" msgstr "" -#: gimplify.c:5514 +#: gimplify.c:5607 #, gcc-internal-format msgid "iteration variable %qE should be private" msgstr "" -#: gimplify.c:5528 +#: gimplify.c:5621 #, gcc-internal-format msgid "iteration variable %qE should not be firstprivate" msgstr "" -#: gimplify.c:5531 +#: gimplify.c:5624 #, gcc-internal-format msgid "iteration variable %qE should not be reduction" msgstr "" -#: gimplify.c:5694 +#: gimplify.c:5787 #, gcc-internal-format msgid "%s variable %qE is private in outer context" msgstr "" -#: gimplify.c:7214 +#: gimplify.c:7307 #, gcc-internal-format msgid "gimplification failed" msgstr "" @@ -17522,7 +18485,7 @@ msgstr "" msgid "can't open %s: %m" msgstr "" -#: graphite.c:296 toplev.c:1843 +#: graphite.c:289 toplev.c:1851 #, gcc-internal-format msgid "Graphite loop optimizations cannot be used" msgstr "" @@ -17599,27 +18562,27 @@ msgstr "" msgid "bytecode stream: found non-null terminated string" msgstr "" -#: lto-streamer-in.c:1109 +#: lto-streamer-in.c:1133 #, gcc-internal-format msgid "bytecode stream: unknown GIMPLE statement tag %s" msgstr "" -#: lto-streamer-in.c:2391 +#: lto-streamer-in.c:2418 #, gcc-internal-format msgid "optimization options not supported yet" msgstr "" -#: lto-streamer-in.c:2396 +#: lto-streamer-in.c:2423 #, gcc-internal-format msgid "target optimization options not supported yet" msgstr "" -#: lto-streamer-in.c:2539 +#: lto-streamer-in.c:2566 #, gcc-internal-format msgid "bytecode stream: tried to jump backwards in the stream" msgstr "" -#: lto-streamer-in.c:2583 +#: lto-streamer-in.c:2610 #, gcc-internal-format msgid "target specific builtin not available" msgstr "" @@ -17693,59 +18656,63 @@ msgstr "" msgid "function %qD redeclared as variable" msgstr "" -#: omp-low.c:1837 +#: omp-low.c:1838 #, gcc-internal-format msgid "" "barrier region may not be closely nested inside of work-sharing, critical, " "ordered, master or explicit task region" msgstr "" -#: omp-low.c:1842 +#: omp-low.c:1843 #, gcc-internal-format msgid "" "work-sharing region may not be closely nested inside of work-sharing, " "critical, ordered, master or explicit task region" msgstr "" -#: omp-low.c:1860 +#: omp-low.c:1861 #, gcc-internal-format msgid "" "master region may not be closely nested inside of work-sharing or explicit " "task region" msgstr "" -#: omp-low.c:1875 +#: omp-low.c:1876 #, gcc-internal-format msgid "" "ordered region may not be closely nested inside of critical or explicit task " "region" msgstr "" -#: omp-low.c:1881 +#: omp-low.c:1882 #, gcc-internal-format msgid "" "ordered region must be closely nested inside a loop region with an ordered " "clause" msgstr "" -#: omp-low.c:1896 +#: omp-low.c:1897 #, gcc-internal-format msgid "" "critical region may not be nested inside a critical region with the same name" msgstr "" -#: omp-low.c:6750 cp/decl.c:2716 cp/parser.c:8399 cp/parser.c:8419 +<<<<<<< HEAD +#: omp-low.c:6751 cp/decl.c:2719 cp/parser.c:8406 cp/parser.c:8426 +======= +#: omp-low.c:6750 cp/decl.c:2720 cp/parser.c:8396 cp/parser.c:8416 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid exit from OpenMP structured block" msgstr "" -#: omp-low.c:6752 omp-low.c:6757 +#: omp-low.c:6753 omp-low.c:6758 #, gcc-internal-format msgid "invalid entry to OpenMP structured block" msgstr "" #. Otherwise, be vague and lazy, but efficient. -#: omp-low.c:6760 +#: omp-low.c:6761 #, gcc-internal-format msgid "invalid branch to/from an OpenMP structured block" msgstr "" @@ -17808,121 +18775,157 @@ msgstr "" msgid "section anchors must be disabled when toplevel reorder is disabled" msgstr "" -#: opts.c:1061 config/darwin.c:1724 config/sh/sh.c:903 +<<<<<<< HEAD +#: opts.c:1062 config/darwin.c:1723 config/sh/sh.c:907 +======= +#: opts.c:1061 config/darwin.c:1723 config/sh/sh.c:907 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "-freorder-blocks-and-partition does not work with exceptions on this " "architecture" msgstr "" -#: opts.c:1078 config/sh/sh.c:911 +<<<<<<< HEAD +#: opts.c:1079 config/sh/sh.c:915 +======= +#: opts.c:1078 config/sh/sh.c:915 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "-freorder-blocks-and-partition does not support unwind info on this " "architecture" msgstr "" -#: opts.c:1097 +#: opts.c:1098 #, gcc-internal-format msgid "-freorder-blocks-and-partition does not work on this architecture" msgstr "" -#: opts.c:1111 +#: opts.c:1112 #, gcc-internal-format msgid "-fira-algorithm=CB does not work on this architecture" msgstr "" -#: opts.c:1147 +#: opts.c:1141 #, gcc-internal-format msgid "-flto and -fwhopr are mutually exclusive" msgstr "" -#: opts.c:1438 +#: opts.c:1432 #, gcc-internal-format msgid "unrecognized include_flags 0x%x passed to print_specific_help" msgstr "" -#: opts.c:1780 +#: opts.c:1774 #, gcc-internal-format msgid "unknown excess precision style \"%s\"" msgstr "" -#: opts.c:1817 +#: opts.c:1811 #, gcc-internal-format msgid "structure alignment must be a small power of two, not %d" msgstr "" -#: opts.c:1833 opts.c:1841 +#: opts.c:1827 opts.c:1835 #, gcc-internal-format msgid "Plugin support is disabled. Configure with --enable-plugin." msgstr "" -#: opts.c:1920 +#: opts.c:1914 #, gcc-internal-format msgid "unrecognized visibility value \"%s\"" msgstr "" -#: opts.c:1978 +#: opts.c:1972 #, gcc-internal-format msgid "unknown stack check parameter \"%s\"" msgstr "" -#: opts.c:2004 +#: opts.c:1998 #, gcc-internal-format msgid "unrecognized register name \"%s\"" msgstr "" -#: opts.c:2028 +#: opts.c:2022 #, gcc-internal-format msgid "unknown tls-model \"%s\"" msgstr "" -#: opts.c:2037 +#: opts.c:2031 #, gcc-internal-format msgid "unknown ira algorithm \"%s\"" msgstr "" -#: opts.c:2048 +#: opts.c:2042 #, gcc-internal-format msgid "unknown ira region \"%s\"" msgstr "" -#: opts.c:2093 +#: opts.c:2087 #, gcc-internal-format msgid "dwarf version %d is not supported" msgstr "" -#: opts.c:2162 +<<<<<<< HEAD +#: opts.c:2157 +======= +#: opts.c:2163 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%s: --param arguments should be of the form NAME=VALUE" msgstr "" -#: opts.c:2167 +<<<<<<< HEAD +#: opts.c:2162 +======= +#: opts.c:2168 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid --param value %qs" msgstr "" -#: opts.c:2270 +<<<<<<< HEAD +#: opts.c:2265 +======= +#: opts.c:2271 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "target system does not support debug output" msgstr "" -#: opts.c:2277 +<<<<<<< HEAD +#: opts.c:2272 +======= +#: opts.c:2278 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "debug format \"%s\" conflicts with prior selection" msgstr "" -#: opts.c:2293 +<<<<<<< HEAD +#: opts.c:2288 +======= +#: opts.c:2294 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unrecognised debug output level \"%s\"" msgstr "" -#: opts.c:2295 +<<<<<<< HEAD +#: opts.c:2290 +======= +#: opts.c:2296 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "debug output level %s is too high" msgstr "" -#: opts.c:2415 +<<<<<<< HEAD +#: opts.c:2410 +======= +#: opts.c:2416 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "-Werror=%s: No option -%s" msgstr "" @@ -17948,22 +18951,22 @@ msgstr "" msgid "Invalid pass positioning operation" msgstr "" -#: passes.c:639 +#: passes.c:641 #, gcc-internal-format msgid "plugin cannot register a missing pass" msgstr "" -#: passes.c:642 +#: passes.c:644 #, gcc-internal-format msgid "plugin cannot register an unnamed pass" msgstr "" -#: passes.c:646 +#: passes.c:648 #, gcc-internal-format msgid "plugin cannot register pass %qs without reference pass name" msgstr "" -#: passes.c:658 +#: passes.c:666 #, gcc-internal-format msgid "pass %qs not found but is referenced by new pass %qs" msgstr "" @@ -18091,22 +19094,22 @@ msgstr "" msgid "output operand %d must use %<&%> constraint" msgstr "" -#: regcprop.c:978 +#: regcprop.c:1129 #, gcc-internal-format msgid "validate_value_data: [%u] Bad next_regno for empty chain (%u)" msgstr "" -#: regcprop.c:990 +#: regcprop.c:1141 #, gcc-internal-format msgid "validate_value_data: Loop in regno chain (%u)" msgstr "" -#: regcprop.c:993 +#: regcprop.c:1144 #, gcc-internal-format msgid "validate_value_data: [%u] Bad oldest_regno (%u)" msgstr "" -#: regcprop.c:1005 +#: regcprop.c:1156 #, gcc-internal-format msgid "validate_value_data: [%u] Non-empty reg in chain (%s %u %i)" msgstr "" @@ -18117,8 +19120,8 @@ msgid "can't use '%s' as a %s register" msgstr "" #: reginfo.c:834 config/ia64/ia64.c:5396 config/ia64/ia64.c:5403 -#: config/pa/pa.c:380 config/pa/pa.c:387 config/sh/sh.c:8539 -#: config/sh/sh.c:8546 config/spu/spu.c:5062 config/spu/spu.c:5069 +#: config/pa/pa.c:383 config/pa/pa.c:390 config/sh/sh.c:8575 +#: config/sh/sh.c:8582 config/spu/spu.c:5052 config/spu/spu.c:5059 #, gcc-internal-format msgid "unknown register name: %s" msgstr "" @@ -18158,42 +19161,42 @@ msgstr "" msgid "inconsistent operand constraints in an %" msgstr "" -#: reload1.c:1370 +#: reload1.c:1385 #, gcc-internal-format msgid "% operand has impossible constraints" msgstr "" -#: reload1.c:1390 +#: reload1.c:1405 #, gcc-internal-format msgid "frame size too large for reliable stack checking" msgstr "" -#: reload1.c:1393 +#: reload1.c:1408 #, gcc-internal-format msgid "try reducing the number of local variables" msgstr "" -#: reload1.c:2128 +#: reload1.c:2145 #, gcc-internal-format msgid "can't find a register in class %qs while reloading %" msgstr "" -#: reload1.c:2133 +#: reload1.c:2150 #, gcc-internal-format msgid "unable to find a register to spill in class %qs" msgstr "" -#: reload1.c:4284 +#: reload1.c:4309 #, gcc-internal-format msgid "% operand requires impossible reload" msgstr "" -#: reload1.c:5666 +#: reload1.c:5698 #, gcc-internal-format msgid "% operand constraint incompatible with operand size" msgstr "" -#: reload1.c:7647 +#: reload1.c:7679 #, gcc-internal-format msgid "output operand is constant in %" msgstr "" @@ -18358,7 +19361,7 @@ msgstr "" msgid "undefined named operand %qs" msgstr "" -#: stmt.c:1542 cp/cvt.c:917 cp/cvt.c:1033 +#: stmt.c:1542 cp/cvt.c:918 cp/cvt.c:1034 #, gcc-internal-format msgid "value computed is not used" msgstr "" @@ -18388,47 +19391,71 @@ msgstr "" msgid "packed attribute causes inefficient alignment for %q+D" msgstr "" -#: stor-layout.c:1104 +#: stor-layout.c:1105 #, gcc-internal-format msgid "packed attribute is unnecessary for %q+D" msgstr "" -#: stor-layout.c:1122 +#: stor-layout.c:1123 #, gcc-internal-format msgid "padding struct to align %q+D" msgstr "" -#: stor-layout.c:1183 +#: stor-layout.c:1184 #, gcc-internal-format msgid "Offset of packed bit-field %qD has changed in GCC 4.4" msgstr "" -#: stor-layout.c:1489 +<<<<<<< HEAD +#: stor-layout.c:1491 +======= +#: stor-layout.c:1490 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "padding struct size to alignment boundary" msgstr "" -#: stor-layout.c:1519 +<<<<<<< HEAD +#: stor-layout.c:1521 +======= +#: stor-layout.c:1520 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "packed attribute causes inefficient alignment for %qE" msgstr "" -#: stor-layout.c:1523 +<<<<<<< HEAD +#: stor-layout.c:1525 +======= +#: stor-layout.c:1524 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "packed attribute is unnecessary for %qE" msgstr "" -#: stor-layout.c:1529 +<<<<<<< HEAD +#: stor-layout.c:1531 +======= +#: stor-layout.c:1530 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "packed attribute causes inefficient alignment" msgstr "" -#: stor-layout.c:1531 +<<<<<<< HEAD +#: stor-layout.c:1533 +======= +#: stor-layout.c:1532 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "packed attribute is unnecessary" msgstr "" -#: stor-layout.c:2046 +<<<<<<< HEAD +#: stor-layout.c:2048 +======= +#: stor-layout.c:2047 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "alignment of array elements is greater than element size" msgstr "" @@ -18550,659 +19577,667 @@ msgstr "" msgid "type is deprecated" msgstr "" -#: toplev.c:1193 +#: toplev.c:1197 #, gcc-internal-format msgid "unrecognized gcc debugging option: %c" msgstr "" -#: toplev.c:1458 +#: toplev.c:1462 #, gcc-internal-format msgid "can%'t open %s for writing: %m" msgstr "" -#: toplev.c:1479 +#: toplev.c:1483 #, gcc-internal-format msgid "-frecord-gcc-switches is not supported by the current target" msgstr "" -#: toplev.c:1816 +#: toplev.c:1824 #, gcc-internal-format msgid "this target does not support %qs" msgstr "" -#: toplev.c:1873 +#: toplev.c:1881 #, gcc-internal-format msgid "instruction scheduling not supported on this target machine" msgstr "" -#: toplev.c:1877 +#: toplev.c:1885 #, gcc-internal-format msgid "this target machine does not have delayed branches" msgstr "" -#: toplev.c:1891 +#: toplev.c:1899 #, gcc-internal-format msgid "-f%sleading-underscore not supported on this target machine" msgstr "" -#: toplev.c:1934 +#: toplev.c:1942 #, gcc-internal-format msgid "could not close zeroed insn dump file %qs: %s" msgstr "" -#: toplev.c:1999 +#: toplev.c:2007 #, gcc-internal-format msgid "target system does not support the \"%s\" debug format" msgstr "" -#: toplev.c:2011 +#: toplev.c:2019 #, gcc-internal-format msgid "variable tracking requested, but useless unless producing debug info" msgstr "" -#: toplev.c:2014 +#: toplev.c:2022 #, gcc-internal-format msgid "variable tracking requested, but not supported by this debug format" msgstr "" -#: toplev.c:2042 +#: toplev.c:2050 #, gcc-internal-format msgid "var-tracking-assignments changes selective scheduling" msgstr "" -#: toplev.c:2058 +#: toplev.c:2066 #, gcc-internal-format msgid "can%'t open %s: %m" msgstr "" -#: toplev.c:2065 +#: toplev.c:2073 #, gcc-internal-format msgid "-ffunction-sections not supported for this target" msgstr "" -#: toplev.c:2070 +#: toplev.c:2078 #, gcc-internal-format msgid "-fdata-sections not supported for this target" msgstr "" -#: toplev.c:2077 +#: toplev.c:2085 #, gcc-internal-format msgid "-ffunction-sections disabled; it makes profiling impossible" msgstr "" -#: toplev.c:2084 +#: toplev.c:2092 #, gcc-internal-format msgid "-fprefetch-loop-arrays not supported for this target" msgstr "" -#: toplev.c:2090 +#: toplev.c:2098 #, gcc-internal-format msgid "" "-fprefetch-loop-arrays not supported for this target (try -march switches)" msgstr "" -#: toplev.c:2099 +#: toplev.c:2107 #, gcc-internal-format msgid "-fprefetch-loop-arrays is not supported with -Os" msgstr "" -#: toplev.c:2110 +#: toplev.c:2118 #, gcc-internal-format msgid "-fassociative-math disabled; other options take precedence" msgstr "" -#: toplev.c:2126 +#: toplev.c:2134 #, gcc-internal-format msgid "-fstack-protector not supported for this target" msgstr "" -#: toplev.c:2139 +#: toplev.c:2147 #, gcc-internal-format msgid "unwind tables currently require a frame pointer for correctness" msgstr "" -#: toplev.c:2360 +<<<<<<< HEAD +#: toplev.c:2372 +======= +#: toplev.c:2368 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "error writing to %s: %m" msgstr "" -#: toplev.c:2362 java/jcf-parse.c:1767 +<<<<<<< HEAD +#: toplev.c:2374 java/jcf-parse.c:1767 +======= +#: toplev.c:2370 java/jcf-parse.c:1767 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "error closing %s: %m" msgstr "" -#: tree-cfg.c:2519 +#: tree-cfg.c:2507 #, gcc-internal-format msgid "SSA name in freelist but still referenced" msgstr "" -#: tree-cfg.c:2528 +#: tree-cfg.c:2516 #, gcc-internal-format msgid "Indirect reference's operand is not a register or a constant." msgstr "" -#: tree-cfg.c:2537 +#: tree-cfg.c:2525 #, gcc-internal-format msgid "ASSERT_EXPR with an always-false condition" msgstr "" -#: tree-cfg.c:2543 +#: tree-cfg.c:2531 #, gcc-internal-format msgid "MODIFY_EXPR not expected while having tuples." msgstr "" -#: tree-cfg.c:2564 +#: tree-cfg.c:2552 #, gcc-internal-format msgid "constant not recomputed when ADDR_EXPR changed" msgstr "" -#: tree-cfg.c:2569 +#: tree-cfg.c:2557 #, gcc-internal-format msgid "side effects not recomputed when ADDR_EXPR changed" msgstr "" -#: tree-cfg.c:2587 tree-ssa.c:826 +#: tree-cfg.c:2575 tree-ssa.c:826 #, gcc-internal-format msgid "address taken, but ADDRESSABLE bit not set" msgstr "" -#: tree-cfg.c:2592 +#: tree-cfg.c:2580 #, gcc-internal-format msgid "DECL_GIMPLE_REG_P set on a variable with address taken" msgstr "" -#: tree-cfg.c:2603 +#: tree-cfg.c:2591 #, gcc-internal-format msgid "non-integral used in condition" msgstr "" -#: tree-cfg.c:2608 +#: tree-cfg.c:2596 #, gcc-internal-format msgid "invalid conditional operand" msgstr "" -#: tree-cfg.c:2655 +#: tree-cfg.c:2643 #, gcc-internal-format msgid "invalid position or size operand to BIT_FIELD_REF" msgstr "" -#: tree-cfg.c:2662 +#: tree-cfg.c:2650 #, gcc-internal-format msgid "" "integral result type precision does not match field size of BIT_FIELD_REF" msgstr "" -#: tree-cfg.c:2670 +#: tree-cfg.c:2658 #, gcc-internal-format msgid "" "mode precision of non-integral result does not match field size of " "BIT_FIELD_REF" msgstr "" -#: tree-cfg.c:2681 +#: tree-cfg.c:2669 #, gcc-internal-format msgid "invalid reference prefix" msgstr "" -#: tree-cfg.c:2692 +#: tree-cfg.c:2680 #, gcc-internal-format msgid "invalid operand to plus/minus, type is a pointer" msgstr "" -#: tree-cfg.c:2703 +#: tree-cfg.c:2691 #, gcc-internal-format msgid "invalid operand to pointer plus, first operand is not a pointer" msgstr "" -#: tree-cfg.c:2711 +#: tree-cfg.c:2699 #, gcc-internal-format msgid "" "invalid operand to pointer plus, second operand is not an integer with type " "of sizetype." msgstr "" -#: tree-cfg.c:2782 +#: tree-cfg.c:2770 #, gcc-internal-format msgid "invalid expression for min lvalue" msgstr "" -#: tree-cfg.c:2793 +#: tree-cfg.c:2781 #, gcc-internal-format msgid "invalid operand in indirect reference" msgstr "" -#: tree-cfg.c:2800 +#: tree-cfg.c:2788 #, gcc-internal-format msgid "type mismatch in indirect reference" msgstr "" -#: tree-cfg.c:2829 +#: tree-cfg.c:2817 #, gcc-internal-format msgid "invalid operands to array reference" msgstr "" -#: tree-cfg.c:2840 +#: tree-cfg.c:2828 #, gcc-internal-format msgid "type mismatch in array reference" msgstr "" -#: tree-cfg.c:2849 +#: tree-cfg.c:2837 #, gcc-internal-format msgid "type mismatch in array range reference" msgstr "" -#: tree-cfg.c:2860 +#: tree-cfg.c:2848 #, gcc-internal-format msgid "type mismatch in real/imagpart reference" msgstr "" -#: tree-cfg.c:2870 +#: tree-cfg.c:2858 #, gcc-internal-format msgid "type mismatch in component reference" msgstr "" -#: tree-cfg.c:2887 +#: tree-cfg.c:2875 #, gcc-internal-format msgid "Conversion of an SSA_NAME on the left hand side." msgstr "" -#: tree-cfg.c:2945 +#: tree-cfg.c:2933 #, gcc-internal-format msgid "invalid function in gimple call" msgstr "" -#: tree-cfg.c:2954 +#: tree-cfg.c:2942 #, gcc-internal-format msgid "non-function in gimple call" msgstr "" -#: tree-cfg.c:2962 +#: tree-cfg.c:2950 #, gcc-internal-format msgid "invalid LHS in gimple call" msgstr "" -#: tree-cfg.c:2968 +#: tree-cfg.c:2956 #, gcc-internal-format msgid "LHS in noreturn call" msgstr "" -#: tree-cfg.c:2984 +#: tree-cfg.c:2972 #, gcc-internal-format msgid "invalid conversion in gimple call" msgstr "" -#: tree-cfg.c:2993 +#: tree-cfg.c:2981 #, gcc-internal-format msgid "invalid static chain in gimple call" msgstr "" -#: tree-cfg.c:3005 +#: tree-cfg.c:2993 #, gcc-internal-format msgid "static chain in indirect gimple call" msgstr "" -#: tree-cfg.c:3012 +#: tree-cfg.c:3000 #, gcc-internal-format msgid "static chain with function that doesn't use one" msgstr "" -#: tree-cfg.c:3027 +#: tree-cfg.c:3015 #, gcc-internal-format msgid "invalid argument to gimple call" msgstr "" -#: tree-cfg.c:3046 +#: tree-cfg.c:3034 #, gcc-internal-format msgid "invalid operands in gimple comparison" msgstr "" -#: tree-cfg.c:3064 +#: tree-cfg.c:3052 #, gcc-internal-format msgid "type mismatch in comparison expression" msgstr "" -#: tree-cfg.c:3090 +#: tree-cfg.c:3078 #, gcc-internal-format msgid "non-register as LHS of unary operation" msgstr "" -#: tree-cfg.c:3096 +#: tree-cfg.c:3084 #, gcc-internal-format msgid "invalid operand in unary operation" msgstr "" -#: tree-cfg.c:3131 +#: tree-cfg.c:3119 #, gcc-internal-format msgid "invalid types in nop conversion" msgstr "" -#: tree-cfg.c:3146 +#: tree-cfg.c:3134 #, gcc-internal-format msgid "invalid types in address space conversion" msgstr "" -#: tree-cfg.c:3160 +#: tree-cfg.c:3148 #, gcc-internal-format msgid "invalid types in fixed-point conversion" msgstr "" -#: tree-cfg.c:3173 +#: tree-cfg.c:3161 #, gcc-internal-format msgid "invalid types in conversion to floating point" msgstr "" -#: tree-cfg.c:3186 +#: tree-cfg.c:3174 #, gcc-internal-format msgid "invalid types in conversion to integer" msgstr "" -#: tree-cfg.c:3221 +#: tree-cfg.c:3209 #, gcc-internal-format msgid "non-trivial conversion in unary operation" msgstr "" -#: tree-cfg.c:3248 +#: tree-cfg.c:3236 #, gcc-internal-format msgid "non-register as LHS of binary operation" msgstr "" -#: tree-cfg.c:3255 +#: tree-cfg.c:3243 #, gcc-internal-format msgid "invalid operands in binary operation" msgstr "" -#: tree-cfg.c:3270 +#: tree-cfg.c:3258 #, gcc-internal-format msgid "type mismatch in complex expression" msgstr "" -#: tree-cfg.c:3299 +#: tree-cfg.c:3287 #, gcc-internal-format msgid "type mismatch in shift expression" msgstr "" -#: tree-cfg.c:3321 +#: tree-cfg.c:3309 #, gcc-internal-format msgid "type mismatch in vector shift expression" msgstr "" -#: tree-cfg.c:3334 +#: tree-cfg.c:3322 #, gcc-internal-format msgid "non-element sized vector shift of floating point vector" msgstr "" -#: tree-cfg.c:3352 +#: tree-cfg.c:3340 #, gcc-internal-format msgid "invalid non-vector operands to vector valued plus" msgstr "" -#: tree-cfg.c:3376 +#: tree-cfg.c:3364 #, gcc-internal-format msgid "invalid (pointer) operands to plus/minus" msgstr "" -#: tree-cfg.c:3391 +#: tree-cfg.c:3379 #, gcc-internal-format msgid "type mismatch in pointer plus expression" msgstr "" -#: tree-cfg.c:3414 +#: tree-cfg.c:3402 #, gcc-internal-format msgid "type mismatch in binary truth expression" msgstr "" -#: tree-cfg.c:3482 +#: tree-cfg.c:3470 #, gcc-internal-format msgid "type mismatch in binary expression" msgstr "" -#: tree-cfg.c:3507 +#: tree-cfg.c:3495 #, gcc-internal-format msgid "non-trivial conversion at assignment" msgstr "" -#: tree-cfg.c:3524 +#: tree-cfg.c:3512 #, gcc-internal-format msgid "invalid operand in unary expression" msgstr "" -#: tree-cfg.c:3532 +#: tree-cfg.c:3520 #, gcc-internal-format msgid "type mismatch in address expression" msgstr "" -#: tree-cfg.c:3556 tree-cfg.c:3582 +#: tree-cfg.c:3544 tree-cfg.c:3570 #, gcc-internal-format msgid "invalid rhs for gimple memory store" msgstr "" -#: tree-cfg.c:3646 +#: tree-cfg.c:3634 #, gcc-internal-format msgid "invalid operand in return statement" msgstr "" -#: tree-cfg.c:3658 +#: tree-cfg.c:3646 #, gcc-internal-format msgid "invalid conversion in return statement" msgstr "" -#: tree-cfg.c:3682 +#: tree-cfg.c:3670 #, gcc-internal-format msgid "goto destination is neither a label nor a pointer" msgstr "" -#: tree-cfg.c:3697 +#: tree-cfg.c:3685 #, gcc-internal-format msgid "invalid operand to switch statement" msgstr "" -#: tree-cfg.c:3717 +#: tree-cfg.c:3705 #, gcc-internal-format msgid "Invalid PHI result" msgstr "" -#: tree-cfg.c:3729 +#: tree-cfg.c:3717 #, gcc-internal-format msgid "Invalid PHI argument" msgstr "" -#: tree-cfg.c:3735 +#: tree-cfg.c:3723 #, gcc-internal-format msgid "Incompatible types in PHI argument %u" msgstr "" -#: tree-cfg.c:3782 +#: tree-cfg.c:3770 #, gcc-internal-format msgid "invalid comparison code in gimple cond" msgstr "" -#: tree-cfg.c:3790 +#: tree-cfg.c:3778 #, gcc-internal-format msgid "invalid labels in gimple cond" msgstr "" -#: tree-cfg.c:3889 +#: tree-cfg.c:3877 #, gcc-internal-format msgid "verify_gimple failed" msgstr "" -#: tree-cfg.c:3924 +#: tree-cfg.c:3912 #, gcc-internal-format msgid "invalid function in call statement" msgstr "" -#: tree-cfg.c:3935 +#: tree-cfg.c:3923 #, gcc-internal-format msgid "invalid pure const state for function" msgstr "" -#: tree-cfg.c:3948 tree-ssa.c:1001 tree-ssa.c:1010 +#: tree-cfg.c:3936 tree-ssa.c:1001 tree-ssa.c:1010 #, gcc-internal-format msgid "in statement" msgstr "" -#: tree-cfg.c:3968 +#: tree-cfg.c:3956 #, gcc-internal-format msgid "statement marked for throw, but doesn%'t" msgstr "" -#: tree-cfg.c:3974 +#: tree-cfg.c:3962 #, gcc-internal-format msgid "statement marked for throw in middle of block" msgstr "" -#: tree-cfg.c:4046 +#: tree-cfg.c:4034 #, gcc-internal-format msgid "Dead STMT in EH table" msgstr "" -#: tree-cfg.c:4084 +#: tree-cfg.c:4072 #, gcc-internal-format msgid "gimple_bb (phi) is set to a wrong basic block" msgstr "" -#: tree-cfg.c:4095 +#: tree-cfg.c:4083 #, gcc-internal-format msgid "missing PHI def" msgstr "" -#: tree-cfg.c:4106 +#: tree-cfg.c:4094 #, gcc-internal-format msgid "PHI argument is not a GIMPLE value" msgstr "" -#: tree-cfg.c:4115 tree-cfg.c:4188 +#: tree-cfg.c:4103 tree-cfg.c:4176 #, gcc-internal-format msgid "incorrect sharing of tree nodes" msgstr "" -#: tree-cfg.c:4138 +#: tree-cfg.c:4126 #, gcc-internal-format msgid "invalid GIMPLE statement" msgstr "" -#: tree-cfg.c:4147 +#: tree-cfg.c:4135 #, gcc-internal-format msgid "gimple_bb (stmt) is set to a wrong basic block" msgstr "" -#: tree-cfg.c:4160 +#: tree-cfg.c:4148 #, gcc-internal-format msgid "incorrect entry in label_to_block_map" msgstr "" -#: tree-cfg.c:4170 +#: tree-cfg.c:4158 #, gcc-internal-format msgid "incorrect setting of landing pad number" msgstr "" -#: tree-cfg.c:4204 +#: tree-cfg.c:4192 #, gcc-internal-format msgid "verify_stmts failed" msgstr "" -#: tree-cfg.c:4227 +#: tree-cfg.c:4215 #, gcc-internal-format msgid "ENTRY_BLOCK has IL associated with it" msgstr "" -#: tree-cfg.c:4233 +#: tree-cfg.c:4221 #, gcc-internal-format msgid "EXIT_BLOCK has IL associated with it" msgstr "" -#: tree-cfg.c:4240 +#: tree-cfg.c:4228 #, gcc-internal-format msgid "fallthru to exit from bb %d" msgstr "" -#: tree-cfg.c:4264 +#: tree-cfg.c:4252 #, gcc-internal-format msgid "nonlocal label " msgstr "" -#: tree-cfg.c:4273 +#: tree-cfg.c:4261 #, gcc-internal-format msgid "EH landing pad label " msgstr "" -#: tree-cfg.c:4282 tree-cfg.c:4291 tree-cfg.c:4316 +#: tree-cfg.c:4270 tree-cfg.c:4279 tree-cfg.c:4304 #, gcc-internal-format msgid "label " msgstr "" -#: tree-cfg.c:4306 +#: tree-cfg.c:4294 #, gcc-internal-format msgid "control flow in the middle of basic block %d" msgstr "" -#: tree-cfg.c:4339 +#: tree-cfg.c:4327 #, gcc-internal-format msgid "fallthru edge after a control statement in bb %d" msgstr "" -#: tree-cfg.c:4352 +#: tree-cfg.c:4340 #, gcc-internal-format msgid "true/false edge after a non-GIMPLE_COND in bb %d" msgstr "" -#: tree-cfg.c:4375 tree-cfg.c:4397 tree-cfg.c:4410 tree-cfg.c:4479 +#: tree-cfg.c:4363 tree-cfg.c:4385 tree-cfg.c:4398 tree-cfg.c:4467 #, gcc-internal-format msgid "wrong outgoing edge flags at end of bb %d" msgstr "" -#: tree-cfg.c:4385 +#: tree-cfg.c:4373 #, gcc-internal-format msgid "explicit goto at end of bb %d" msgstr "" -#: tree-cfg.c:4415 +#: tree-cfg.c:4403 #, gcc-internal-format msgid "return edge does not point to exit in bb %d" msgstr "" -#: tree-cfg.c:4445 +#: tree-cfg.c:4433 #, gcc-internal-format msgid "found default case not at the start of case vector" msgstr "" -#: tree-cfg.c:4453 +#: tree-cfg.c:4441 #, gcc-internal-format msgid "case labels not sorted: " msgstr "" -#: tree-cfg.c:4470 +#: tree-cfg.c:4458 #, gcc-internal-format msgid "extra outgoing edge %d->%d" msgstr "" -#: tree-cfg.c:4493 +#: tree-cfg.c:4481 #, gcc-internal-format msgid "missing edge %i->%i" msgstr "" -#: tree-cfg.c:7121 +#: tree-cfg.c:7109 #, gcc-internal-format msgid "% function does return" msgstr "" -#: tree-cfg.c:7141 +#: tree-cfg.c:7129 #, gcc-internal-format msgid "control reaches end of non-void function" msgstr "" -#: tree-cfg.c:7204 +#: tree-cfg.c:7192 #, gcc-internal-format msgid "function might be possible candidate for attribute %" msgstr "" -#: tree-cfg.c:7275 +#: tree-cfg.c:7263 #, gcc-internal-format msgid "" "ignoring return value of %qD, declared with attribute warn_unused_result" msgstr "" -#: tree-cfg.c:7280 +#: tree-cfg.c:7268 #, gcc-internal-format msgid "" "ignoring return value of function declared with attribute warn_unused_result" @@ -19218,124 +20253,124 @@ msgstr "" msgid "ignoring unknown option %q.*s in %<-fdump-%s%>" msgstr "" -#: tree-eh.c:3880 +#: tree-eh.c:3923 #, gcc-internal-format msgid "BB %i has multiple EH edges" msgstr "" -#: tree-eh.c:3892 +#: tree-eh.c:3935 #, gcc-internal-format msgid "BB %i can not throw but has an EH edge" msgstr "" -#: tree-eh.c:3900 +#: tree-eh.c:3943 #, gcc-internal-format msgid "BB %i last statement has incorrectly set lp" msgstr "" -#: tree-eh.c:3906 +#: tree-eh.c:3949 #, gcc-internal-format msgid "BB %i is missing an EH edge" msgstr "" -#: tree-eh.c:3912 +#: tree-eh.c:3955 #, gcc-internal-format msgid "Incorrect EH edge %i->%i" msgstr "" -#: tree-eh.c:3946 tree-eh.c:3965 +#: tree-eh.c:3989 tree-eh.c:4008 #, gcc-internal-format msgid "BB %i is missing an edge" msgstr "" -#: tree-eh.c:3982 +#: tree-eh.c:4025 #, gcc-internal-format msgid "BB %i too many fallthru edges" msgstr "" -#: tree-eh.c:3991 +#: tree-eh.c:4034 #, gcc-internal-format msgid "BB %i has incorrect edge" msgstr "" -#: tree-eh.c:3997 +#: tree-eh.c:4040 #, gcc-internal-format msgid "BB %i has incorrect fallthru edge" msgstr "" -#: tree-inline.c:2744 +#: tree-inline.c:2751 #, gcc-internal-format msgid "function %q+F can never be copied because it receives a non-local goto" msgstr "" -#: tree-inline.c:2761 +#: tree-inline.c:2768 #, gcc-internal-format msgid "" "function %q+F can never be copied because it saves address of local label in " "a static variable" msgstr "" -#: tree-inline.c:2799 +#: tree-inline.c:2806 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it uses alloca (override using " "the always_inline attribute)" msgstr "" -#: tree-inline.c:2813 +#: tree-inline.c:2820 #, gcc-internal-format msgid "function %q+F can never be inlined because it uses setjmp" msgstr "" -#: tree-inline.c:2827 +#: tree-inline.c:2834 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it uses variable argument lists" msgstr "" -#: tree-inline.c:2839 +#: tree-inline.c:2846 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it uses setjmp-longjmp exception " "handling" msgstr "" -#: tree-inline.c:2847 +#: tree-inline.c:2854 #, gcc-internal-format msgid "function %q+F can never be inlined because it uses non-local goto" msgstr "" -#: tree-inline.c:2859 +#: tree-inline.c:2866 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it uses __builtin_return or " "__builtin_apply_args" msgstr "" -#: tree-inline.c:2879 +#: tree-inline.c:2886 #, gcc-internal-format msgid "function %q+F can never be inlined because it contains a computed goto" msgstr "" -#: tree-inline.c:2959 +#: tree-inline.c:2966 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it is suppressed using -fno-inline" msgstr "" -#: tree-inline.c:2973 +#: tree-inline.c:2980 #, gcc-internal-format msgid "" "function %q+F can never be inlined because it uses attributes conflicting " "with inlining" msgstr "" -#: tree-inline.c:3544 tree-inline.c:3555 +#: tree-inline.c:3551 tree-inline.c:3562 #, gcc-internal-format msgid "inlining failed in call to %q+F: %s" msgstr "" -#: tree-inline.c:3546 tree-inline.c:3557 +#: tree-inline.c:3553 tree-inline.c:3564 #, gcc-internal-format msgid "called from here" msgstr "" @@ -19370,7 +20405,7 @@ msgstr "" msgid "size of return value of %q+D is larger than %wd bytes" msgstr "" -#: tree-outof-ssa.c:756 tree-outof-ssa.c:813 tree-ssa-coalesce.c:959 +#: tree-outof-ssa.c:777 tree-outof-ssa.c:834 tree-ssa-coalesce.c:959 #: tree-ssa-coalesce.c:974 tree-ssa-coalesce.c:1196 tree-ssa-live.c:1184 #, gcc-internal-format msgid "SSA corruption" @@ -19531,159 +20566,271 @@ msgstr "" msgid "%qD may be used uninitialized in this function" msgstr "" -#: tree-vrp.c:5015 +<<<<<<< HEAD +#: tree-vrp.c:5037 +======= +#: tree-vrp.c:5024 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array subscript is outside array bounds" msgstr "" -#: tree-vrp.c:5030 +<<<<<<< HEAD +#: tree-vrp.c:5052 +======= +#: tree-vrp.c:5039 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array subscript is above array bounds" msgstr "" -#: tree-vrp.c:5037 +<<<<<<< HEAD +#: tree-vrp.c:5059 +======= +#: tree-vrp.c:5046 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array subscript is below array bounds" msgstr "" -#: tree-vrp.c:5686 +<<<<<<< HEAD +#: tree-vrp.c:5701 +======= +#: tree-vrp.c:5688 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "assuming signed overflow does not occur when simplifying conditional to " "constant" msgstr "" -#: tree-vrp.c:5692 +<<<<<<< HEAD +#: tree-vrp.c:5707 +======= +#: tree-vrp.c:5694 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "assuming signed overflow does not occur when simplifying conditional" msgstr "" -#: tree-vrp.c:5736 +<<<<<<< HEAD +#: tree-vrp.c:5751 +======= +#: tree-vrp.c:5738 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "comparison always false due to limited range of data type" msgstr "" -#: tree-vrp.c:5738 +<<<<<<< HEAD +#: tree-vrp.c:5753 +======= +#: tree-vrp.c:5740 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "comparison always true due to limited range of data type" msgstr "" -#: tree-vrp.c:6578 +<<<<<<< HEAD +#: tree-vrp.c:6601 +======= +#: tree-vrp.c:6588 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "assuming signed overflow does not occur when simplifying % or %<%%%> to %" "<>>%> or %<&%>" msgstr "" -#: tree-vrp.c:6660 +<<<<<<< HEAD +#: tree-vrp.c:6683 +======= +#: tree-vrp.c:6670 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "assuming signed overflow does not occur when simplifying % to % or %<-X%>" msgstr "" -#: tree.c:4080 +#: tree.c:4084 #, gcc-internal-format msgid "ignoring attributes applied to %qT after definition" msgstr "" -#: tree.c:5208 +<<<<<<< HEAD +#: tree.c:5220 +======= +#: tree.c:5216 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D already declared with dllexport attribute: dllimport ignored" msgstr "" -#: tree.c:5220 +<<<<<<< HEAD +#: tree.c:5232 +======= +#: tree.c:5228 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%q+D redeclared without dllimport attribute after being referenced with dll " "linkage" msgstr "" -#: tree.c:5235 +<<<<<<< HEAD +#: tree.c:5247 +======= +#: tree.c:5243 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D redeclared without dllimport attribute: previous dllimport ignored" msgstr "" -#: tree.c:5335 +<<<<<<< HEAD +#: tree.c:5347 +======= +#: tree.c:5343 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "inline function %q+D declared as dllimport: attribute ignored" msgstr "" -#: tree.c:5343 +<<<<<<< HEAD +#: tree.c:5355 +======= +#: tree.c:5351 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function %q+D definition is marked dllimport" msgstr "" -#: tree.c:5351 config/sh/symbian-c.c:144 config/sh/symbian-cxx.c:576 +<<<<<<< HEAD +#: tree.c:5363 config/sh/symbian-c.c:144 config/sh/symbian-cxx.c:576 +======= +#: tree.c:5359 config/sh/symbian-c.c:144 config/sh/symbian-cxx.c:576 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable %q+D definition is marked dllimport" msgstr "" -#: tree.c:5378 config/sh/symbian-c.c:164 config/sh/symbian-cxx.c:651 +<<<<<<< HEAD +#: tree.c:5390 config/sh/symbian-c.c:164 config/sh/symbian-cxx.c:651 +======= +#: tree.c:5386 config/sh/symbian-c.c:164 config/sh/symbian-cxx.c:651 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "external linkage required for symbol %q+D because of %qE attribute" msgstr "" -#: tree.c:5392 +<<<<<<< HEAD +#: tree.c:5404 +======= +#: tree.c:5400 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%qE implies default visibility, but %qD has already been declared with a " "different visibility" msgstr "" -#: tree.c:6992 +<<<<<<< HEAD +#: tree.c:7004 +======= +#: tree.c:7000 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "arrays of functions are not meaningful" msgstr "" -#: tree.c:7129 +<<<<<<< HEAD +#: tree.c:7141 +======= +#: tree.c:7137 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function return type cannot be function" msgstr "" -#: tree.c:8341 tree.c:8426 tree.c:8487 +<<<<<<< HEAD +#: tree.c:8361 tree.c:8446 tree.c:8507 +======= +#: tree.c:8357 tree.c:8442 tree.c:8503 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: %s, have %s in %s, at %s:%d" msgstr "" -#: tree.c:8378 +<<<<<<< HEAD +#: tree.c:8398 +======= +#: tree.c:8394 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: expected none of %s, have %s in %s, at %s:%d" msgstr "" -#: tree.c:8391 +<<<<<<< HEAD +#: tree.c:8411 +======= +#: tree.c:8407 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: expected class %qs, have %qs (%s) in %s, at %s:%d" msgstr "" -#: tree.c:8440 +<<<<<<< HEAD +#: tree.c:8460 +======= +#: tree.c:8456 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: did not expect class %qs, have %qs (%s) in %s, at %s:%d" msgstr "" -#: tree.c:8453 +<<<<<<< HEAD +#: tree.c:8473 +======= +#: tree.c:8469 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: expected omp_clause %s, have %s in %s, at %s:%d" msgstr "" -#: tree.c:8513 +<<<<<<< HEAD +#: tree.c:8533 +======= +#: tree.c:8529 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "tree check: expected tree that contains %qs structure, have %qs in %s, at %s:" "%d" msgstr "" -#: tree.c:8527 +<<<<<<< HEAD +#: tree.c:8547 +======= +#: tree.c:8543 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: accessed elt %d of tree_vec with %d elts in %s, at %s:%d" msgstr "" -#: tree.c:8540 +<<<<<<< HEAD +#: tree.c:8560 +======= +#: tree.c:8556 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "tree check: accessed operand %d of %s with %d operands in %s, at %s:%d" msgstr "" -#: tree.c:8553 +<<<<<<< HEAD +#: tree.c:8573 +======= +#: tree.c:8569 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "tree check: accessed operand %d of omp_clause %s with %d operands in %s, at %" @@ -19721,6 +20868,26 @@ msgid "" "count (%d)" msgstr "" +<<<<<<< HEAD +#: var-tracking.c:6051 +======= +#: var-tracking.c:5974 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "" +"variable tracking size limit exceeded with -fvar-tracking-assignments, " +"retrying without" +msgstr "" + +<<<<<<< HEAD +#: var-tracking.c:6055 +======= +#: var-tracking.c:5978 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "variable tracking size limit exceeded" +msgstr "" + #: varasm.c:580 #, gcc-internal-format msgid "%+D causes a section type conflict" @@ -19732,134 +20899,210 @@ msgid "" "alignment of %q+D is greater than maximum object file alignment. Using %d" msgstr "" -#: varasm.c:1363 varasm.c:1371 +#: varasm.c:1364 varasm.c:1372 #, gcc-internal-format msgid "register name not specified for %q+D" msgstr "" -#: varasm.c:1373 +#: varasm.c:1374 #, gcc-internal-format msgid "invalid register name for %q+D" msgstr "" -#: varasm.c:1375 +#: varasm.c:1376 #, gcc-internal-format msgid "data type of %q+D isn%'t suitable for a register" msgstr "" -#: varasm.c:1378 +#: varasm.c:1379 #, gcc-internal-format msgid "register specified for %q+D isn%'t suitable for data type" msgstr "" -#: varasm.c:1388 +#: varasm.c:1389 #, gcc-internal-format msgid "global register variable has initial value" msgstr "" -#: varasm.c:1392 +#: varasm.c:1393 #, gcc-internal-format msgid "optimization may eliminate reads and/or writes to register variables" msgstr "" -#: varasm.c:1430 +#: varasm.c:1431 #, gcc-internal-format msgid "register name given for non-register variable %q+D" msgstr "" -#: varasm.c:1507 +<<<<<<< HEAD +#: varasm.c:1548 +======= +#: varasm.c:1545 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "global destructors not supported on this target" msgstr "" -#: varasm.c:1573 +<<<<<<< HEAD +#: varasm.c:1614 +======= +#: varasm.c:1611 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "global constructors not supported on this target" msgstr "" -#: varasm.c:1960 +<<<<<<< HEAD +#: varasm.c:2001 +======= +#: varasm.c:1998 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "thread-local COMMON data not implemented" msgstr "" -#: varasm.c:1989 +<<<<<<< HEAD +#: varasm.c:2030 +======= +#: varasm.c:2027 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "requested alignment for %q+D is greater than implemented alignment of %wu" msgstr "" -#: varasm.c:4624 +<<<<<<< HEAD +#: varasm.c:4665 +======= +#: varasm.c:4662 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "initializer for integer/fixed-point value is too complicated" msgstr "" -#: varasm.c:4629 +<<<<<<< HEAD +#: varasm.c:4670 +======= +#: varasm.c:4667 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "initializer for floating value is not a floating constant" msgstr "" -#: varasm.c:4935 +<<<<<<< HEAD +#: varasm.c:4976 +======= +#: varasm.c:4973 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid initial value for member %qE" msgstr "" -#: varasm.c:5244 varasm.c:5288 +<<<<<<< HEAD +#: varasm.c:5285 varasm.c:5329 +======= +#: varasm.c:5282 varasm.c:5326 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weak declaration of %q+D must precede definition" msgstr "" -#: varasm.c:5252 +<<<<<<< HEAD +#: varasm.c:5293 +======= +#: varasm.c:5290 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "weak declaration of %q+D after first use results in unspecified behavior" msgstr "" -#: varasm.c:5286 +<<<<<<< HEAD +#: varasm.c:5327 +======= +#: varasm.c:5324 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weak declaration of %q+D must be public" msgstr "" -#: varasm.c:5290 +<<<<<<< HEAD +#: varasm.c:5331 +======= +#: varasm.c:5328 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weak declaration of %q+D not supported" msgstr "" -#: varasm.c:5319 varasm.c:5721 +<<<<<<< HEAD +#: varasm.c:5360 varasm.c:5766 +======= +#: varasm.c:5357 varasm.c:5763 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "only weak aliases are supported in this configuration" msgstr "" -#: varasm.c:5536 +<<<<<<< HEAD +#: varasm.c:5581 +======= +#: varasm.c:5578 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weakref is not supported in this configuration" msgstr "" -#: varasm.c:5650 +<<<<<<< HEAD +#: varasm.c:5695 +======= +#: varasm.c:5692 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D aliased to undefined symbol %qE" msgstr "" -#: varasm.c:5660 +<<<<<<< HEAD +#: varasm.c:5705 +======= +#: varasm.c:5702 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D aliased to external symbol %qE" msgstr "" -#: varasm.c:5699 +<<<<<<< HEAD +#: varasm.c:5744 +======= +#: varasm.c:5741 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weakref %q+D ultimately targets itself" msgstr "" -#: varasm.c:5708 +<<<<<<< HEAD +#: varasm.c:5753 +======= +#: varasm.c:5750 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "weakref %q+D must have static linkage" msgstr "" -#: varasm.c:5715 +<<<<<<< HEAD +#: varasm.c:5760 +======= +#: varasm.c:5757 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "alias definitions not supported in this configuration" msgstr "" -#: varasm.c:5781 +<<<<<<< HEAD +#: varasm.c:5822 config/sol2.c:156 +======= +#: varasm.c:5819 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "visibility attribute not supported in this configuration; ignored" msgstr "" @@ -19946,18 +21189,18 @@ msgstr "" msgid "Unknown value %qs of -mmacosx-version-min" msgstr "" -#: config/darwin.c:1429 +#: config/darwin.c:1428 #, gcc-internal-format msgid "" "%qE 2.95 vtable-compatibility attribute applies only when compiling a kext" msgstr "" -#: config/darwin.c:1436 +#: config/darwin.c:1435 #, gcc-internal-format msgid "%qE 2.95 vtable-compatibility attribute applies only to C++ classes" msgstr "" -#: config/darwin.c:1561 +#: config/darwin.c:1560 #, gcc-internal-format msgid "" "internal and protected visibility attributes not supported in this " @@ -19999,32 +21242,32 @@ msgstr "" msgid "malformed %<#pragma init%>, ignoring" msgstr "" -#: config/sol2-c.c:187 config/sol2-c.c:199 +#: config/sol2-c.c:188 config/sol2-c.c:200 #, gcc-internal-format msgid "malformed %<#pragma init%>" msgstr "" -#: config/sol2-c.c:194 +#: config/sol2-c.c:195 #, gcc-internal-format msgid "junk at end of %<#pragma init%>" msgstr "" -#: config/sol2-c.c:215 config/sol2-c.c:222 +#: config/sol2-c.c:216 config/sol2-c.c:223 #, gcc-internal-format msgid "malformed %<#pragma fini%>, ignoring" msgstr "" -#: config/sol2-c.c:245 config/sol2-c.c:257 +#: config/sol2-c.c:247 config/sol2-c.c:259 #, gcc-internal-format msgid "malformed %<#pragma fini%>" msgstr "" -#: config/sol2-c.c:252 +#: config/sol2-c.c:254 #, gcc-internal-format msgid "junk at end of %<#pragma fini%>" msgstr "" -#: config/sol2.c:53 +#: config/sol2.c:54 #, gcc-internal-format msgid "ignoring %<#pragma align%> for explicitly aligned %q+D" msgstr "" @@ -20050,7 +21293,7 @@ msgstr "" msgid "profiler support for VxWorks" msgstr "" -#: config/alpha/alpha.c:230 config/rs6000/rs6000.c:3147 +#: config/alpha/alpha.c:230 config/rs6000/rs6000.c:3144 #, gcc-internal-format msgid "bad value %qs for -mtls-size switch" msgstr "" @@ -20085,11 +21328,16 @@ msgstr "" msgid "bad value %qs for -mfp-trap-mode switch" msgstr "" -#: config/alpha/alpha.c:379 config/alpha/alpha.c:391 +#: config/alpha/alpha.c:379 #, gcc-internal-format msgid "bad value %qs for -mcpu switch" msgstr "" +#: config/alpha/alpha.c:391 +#, gcc-internal-format +msgid "bad value %qs for -mtune switch" +msgstr "" + #: config/alpha/alpha.c:398 #, gcc-internal-format msgid "trap mode not supported on Unicos/Mk" @@ -20125,8 +21373,8 @@ msgstr "" msgid "bad value %qs for -mmemory-latency" msgstr "" -#: config/alpha/alpha.c:6732 config/alpha/alpha.c:6735 config/s390/s390.c:8805 -#: config/s390/s390.c:8808 +#: config/alpha/alpha.c:6732 config/alpha/alpha.c:6735 config/s390/s390.c:8824 +#: config/s390/s390.c:8827 #, gcc-internal-format msgid "bad builtin fcode" msgstr "" @@ -20146,7 +21394,7 @@ msgstr "" msgid "switch -mcpu=%s conflicts with -march= switch" msgstr "" -#: config/arm/arm.c:1347 config/rs6000/rs6000.c:2366 config/sparc/sparc.c:783 +#: config/arm/arm.c:1347 config/rs6000/rs6000.c:2363 config/sparc/sparc.c:776 #, gcc-internal-format msgid "bad value (%s) for %s switch" msgstr "" @@ -20236,153 +21484,190 @@ msgstr "" msgid "invalid floating point emulation option: -mfpe=%s" msgstr "" -#: config/arm/arm.c:1643 +#: config/arm/arm.c:1645 #, gcc-internal-format msgid "invalid floating point option: -mfpu=%s" msgstr "" -#: config/arm/arm.c:1680 +#: config/arm/arm.c:1684 #, gcc-internal-format msgid "invalid floating point abi: -mfloat-abi=%s" msgstr "" -#: config/arm/arm.c:1688 +#: config/arm/arm.c:1692 #, gcc-internal-format msgid "FPA is unsupported in the AAPCS" msgstr "" -#: config/arm/arm.c:1693 +#: config/arm/arm.c:1697 #, gcc-internal-format msgid "AAPCS does not support -mcaller-super-interworking" msgstr "" -#: config/arm/arm.c:1696 +#: config/arm/arm.c:1700 #, gcc-internal-format msgid "AAPCS does not support -mcallee-super-interworking" msgstr "" -#: config/arm/arm.c:1703 +#: config/arm/arm.c:1707 #, gcc-internal-format msgid "iWMMXt and hardware floating point" msgstr "" -#: config/arm/arm.c:1707 +#: config/arm/arm.c:1711 #, gcc-internal-format msgid "Thumb-2 iWMMXt" msgstr "" -#: config/arm/arm.c:1711 +#: config/arm/arm.c:1715 #, gcc-internal-format msgid "__fp16 and no ldrh" msgstr "" -#: config/arm/arm.c:1731 +#: config/arm/arm.c:1735 #, gcc-internal-format msgid "-mfloat-abi=hard and VFP" msgstr "" -#: config/arm/arm.c:1755 +#: config/arm/arm.c:1759 #, gcc-internal-format msgid "invalid thread pointer option: -mtp=%s" msgstr "" -#: config/arm/arm.c:1768 +#: config/arm/arm.c:1772 #, gcc-internal-format msgid "can not use -mtp=cp15 with 16-bit Thumb" msgstr "" -#: config/arm/arm.c:1782 +#: config/arm/arm.c:1786 #, gcc-internal-format msgid "structure size boundary can only be set to %s" msgstr "" -#: config/arm/arm.c:1788 +#: config/arm/arm.c:1792 #, gcc-internal-format msgid "RTP PIC is incompatible with Thumb" msgstr "" -#: config/arm/arm.c:1797 +#: config/arm/arm.c:1801 #, gcc-internal-format msgid "RTP PIC is incompatible with -msingle-pic-base" msgstr "" -#: config/arm/arm.c:1809 +#: config/arm/arm.c:1813 #, gcc-internal-format msgid "-mpic-register= is useless without -fpic" msgstr "" -#: config/arm/arm.c:1818 +#: config/arm/arm.c:1822 #, gcc-internal-format msgid "unable to use '%s' for PIC register" msgstr "" -#: config/arm/arm.c:1871 +#: config/arm/arm.c:1875 #, gcc-internal-format msgid "-freorder-blocks-and-partition not supported on this architecture" msgstr "" -#: config/arm/arm.c:3633 +#: config/arm/arm.c:3630 #, gcc-internal-format msgid "Non-AAPCS derived PCS variant" msgstr "" -#: config/arm/arm.c:3635 +#: config/arm/arm.c:3632 #, gcc-internal-format msgid "Variadic functions must use the base AAPCS variant" msgstr "" -#: config/arm/arm.c:3654 +#: config/arm/arm.c:3651 #, gcc-internal-format msgid "PCS variant" msgstr "" -#: config/arm/arm.c:4532 config/arm/arm.c:4550 config/avr/avr.c:4838 +#: config/arm/arm.c:4529 config/arm/arm.c:4547 config/avr/avr.c:4838 +<<<<<<< HEAD +#: config/avr/avr.c:4854 config/bfin/bfin.c:5551 config/bfin/bfin.c:5612 +#: config/bfin/bfin.c:5641 config/h8300/h8300.c:5343 config/i386/i386.c:4413 +#: config/i386/i386.c:25989 config/i386/i386.c:26069 +#: config/m68hc11/m68hc11.c:1168 config/m68k/m68k.c:806 +#: config/mcore/mcore.c:3036 config/mep/mep.c:4042 config/mep/mep.c:4056 +#: config/mep/mep.c:4130 config/rs6000/rs6000.c:23490 config/rx/rx.c:2099 +======= #: config/avr/avr.c:4854 config/bfin/bfin.c:5550 config/bfin/bfin.c:5611 -#: config/bfin/bfin.c:5640 config/h8300/h8300.c:5339 config/i386/i386.c:4409 -#: config/i386/i386.c:25883 config/i386/i386.c:25963 -#: config/m68hc11/m68hc11.c:1168 config/m68k/m68k.c:802 -#: config/mcore/mcore.c:3036 config/mep/mep.c:4062 config/mep/mep.c:4076 -#: config/mep/mep.c:4150 config/rs6000/rs6000.c:23444 config/rx/rx.c:2099 -#: config/sh/sh.c:8680 config/sh/sh.c:8698 config/sh/sh.c:8727 -#: config/sh/sh.c:8809 config/sh/sh.c:8832 config/spu/spu.c:3861 +#: config/bfin/bfin.c:5640 config/h8300/h8300.c:5343 config/i386/i386.c:4413 +#: config/i386/i386.c:25999 config/i386/i386.c:26079 +#: config/m68hc11/m68hc11.c:1168 config/m68k/m68k.c:806 +#: config/mcore/mcore.c:3036 config/mep/mep.c:4042 config/mep/mep.c:4056 +#: config/mep/mep.c:4130 config/rs6000/rs6000.c:23488 config/rx/rx.c:2099 +>>>>>>> * gcc.pot: Regenerate. +#: config/sh/sh.c:8716 config/sh/sh.c:8734 config/sh/sh.c:8763 +#: config/sh/sh.c:8845 config/sh/sh.c:8868 config/spu/spu.c:3851 #: config/stormy16/stormy16.c:2230 config/v850/v850.c:2080 #, gcc-internal-format msgid "%qE attribute only applies to functions" msgstr "" -#: config/arm/arm.c:16373 +<<<<<<< HEAD +#: config/arm/arm.c:16401 +======= +#: config/arm/arm.c:16408 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unable to compute real location of stacked parameter" msgstr "" -#: config/arm/arm.c:17953 +<<<<<<< HEAD +#: config/arm/arm.c:17981 +======= +#: config/arm/arm.c:17988 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument must be a constant" msgstr "" #. @@@ better error message -#: config/arm/arm.c:18261 config/arm/arm.c:18298 +<<<<<<< HEAD +#: config/arm/arm.c:18289 config/arm/arm.c:18326 +======= +#: config/arm/arm.c:18296 config/arm/arm.c:18333 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "selector must be an immediate" msgstr "" #. @@@ better error message -#: config/arm/arm.c:18341 +<<<<<<< HEAD +#: config/arm/arm.c:18369 +======= +#: config/arm/arm.c:18376 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "mask must be an immediate" msgstr "" -#: config/arm/arm.c:19003 +<<<<<<< HEAD +#: config/arm/arm.c:19031 +======= +#: config/arm/arm.c:19038 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no low registers available for popping high registers" msgstr "" -#: config/arm/arm.c:19226 +<<<<<<< HEAD +#: config/arm/arm.c:19254 +======= +#: config/arm/arm.c:19261 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "interrupt Service Routines cannot be coded in Thumb mode" msgstr "" -#: config/arm/arm.c:21346 +<<<<<<< HEAD +#: config/arm/arm.c:21374 +======= +#: config/arm/arm.c:21381 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the mangling of % has changed in GCC 4.4" msgstr "" @@ -20442,78 +21727,90 @@ msgstr "" msgid "MCU %qs supported for assembler only" msgstr "" -#: config/bfin/bfin.c:2554 config/m68k/m68k.c:519 +<<<<<<< HEAD +#: config/bfin/bfin.c:2555 config/m68k/m68k.c:523 +======= +#: config/bfin/bfin.c:2554 config/m68k/m68k.c:523 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "-mshared-library-id=%s is not between 0 and %d" msgstr "" -#: config/bfin/bfin.c:2574 +#: config/bfin/bfin.c:2575 #, gcc-internal-format msgid "-mcpu=%s is not valid" msgstr "" -#: config/bfin/bfin.c:2610 +#: config/bfin/bfin.c:2611 #, gcc-internal-format msgid "-mcpu=%s has invalid silicon revision" msgstr "" -#: config/bfin/bfin.c:2675 +#: config/bfin/bfin.c:2676 #, gcc-internal-format msgid "-mshared-library-id= specified without -mid-shared-library" msgstr "" -#: config/bfin/bfin.c:2678 +#: config/bfin/bfin.c:2679 #, gcc-internal-format msgid "Can't use multiple stack checking methods together." msgstr "" -#: config/bfin/bfin.c:2681 +#: config/bfin/bfin.c:2682 #, gcc-internal-format msgid "ID shared libraries and FD-PIC mode can't be used together." msgstr "" -#: config/bfin/bfin.c:2686 config/m68k/m68k.c:627 +<<<<<<< HEAD +#: config/bfin/bfin.c:2687 config/m68k/m68k.c:631 +======= +#: config/bfin/bfin.c:2686 config/m68k/m68k.c:631 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot specify both -msep-data and -mid-shared-library" msgstr "" -#: config/bfin/bfin.c:2706 +#: config/bfin/bfin.c:2707 #, gcc-internal-format msgid "-mmulticore can only be used with BF561" msgstr "" -#: config/bfin/bfin.c:2709 +#: config/bfin/bfin.c:2710 #, gcc-internal-format msgid "-mcorea should be used with -mmulticore" msgstr "" -#: config/bfin/bfin.c:2712 +#: config/bfin/bfin.c:2713 #, gcc-internal-format msgid "-mcoreb should be used with -mmulticore" msgstr "" -#: config/bfin/bfin.c:2715 +#: config/bfin/bfin.c:2716 #, gcc-internal-format msgid "-mcorea and -mcoreb can't be used together" msgstr "" -#: config/bfin/bfin.c:5555 +#: config/bfin/bfin.c:5556 #, gcc-internal-format msgid "multiple function type attributes specified" msgstr "" -#: config/bfin/bfin.c:5622 +#: config/bfin/bfin.c:5623 #, gcc-internal-format msgid "can't apply both longcall and shortcall attributes to the same function" msgstr "" -#: config/bfin/bfin.c:5672 config/i386/winnt.c:59 config/mep/mep.c:3966 -#: config/mep/mep.c:4104 +<<<<<<< HEAD +#: config/bfin/bfin.c:5673 config/i386/winnt.c:59 config/mep/mep.c:3946 +======= +#: config/bfin/bfin.c:5672 config/i386/winnt.c:59 config/mep/mep.c:3946 +>>>>>>> * gcc.pot: Regenerate. +#: config/mep/mep.c:4084 #, gcc-internal-format msgid "%qE attribute only applies to variables" msgstr "" -#: config/bfin/bfin.c:5679 +#: config/bfin/bfin.c:5680 #, gcc-internal-format msgid "%qE attribute cannot be specified for local variables" msgstr "" @@ -20742,425 +22039,533 @@ msgstr "" msgid "can't set position in PCH file: %m" msgstr "" -#: config/i386/i386.c:2824 config/i386/i386.c:3075 +#: config/i386/i386.c:2832 config/i386/i386.c:3081 #, gcc-internal-format msgid "bad value (%s) for %stune=%s %s" msgstr "" -#: config/i386/i386.c:2868 -#, gcc-internal-format -msgid "bad value (%s) for %sstringop-strategy=%s %s" -msgstr "" - -#: config/i386/i386.c:2872 +#: config/i386/i386.c:2835 #, gcc-internal-format msgid "" "%stune=x86-64%s is deprecated. Use %stune=k8%s or %stune=generic%s instead " "as appropriate." msgstr "" -#: config/i386/i386.c:2882 -#, gcc-internal-format -msgid "generic CPU can be used only for %stune=%s %s" -msgstr "" - -#: config/i386/i386.c:2885 config/i386/i386.c:3036 +#: config/i386/i386.c:2881 #, gcc-internal-format -msgid "bad value (%s) for %sarch=%s %s" +msgid "bad value (%s) for %sstringop-strategy=%s %s" msgstr "" -#: config/i386/i386.c:2896 +#: config/i386/i386.c:2898 #, gcc-internal-format msgid "unknown ABI (%s) for %sabi=%s %s" msgstr "" -#: config/i386/i386.c:2911 +#: config/i386/i386.c:2913 #, gcc-internal-format msgid "code model %s does not support PIC mode" msgstr "" -#: config/i386/i386.c:2917 +#: config/i386/i386.c:2919 #, gcc-internal-format msgid "bad value (%s) for %scmodel=%s %s" msgstr "" -#: config/i386/i386.c:2941 +#: config/i386/i386.c:2943 #, gcc-internal-format msgid "bad value (%s) for %sasm=%s %s" msgstr "" -#: config/i386/i386.c:2945 +#: config/i386/i386.c:2947 #, gcc-internal-format msgid "code model %qs not supported in the %s bit mode" msgstr "" -#: config/i386/i386.c:2948 +#: config/i386/i386.c:2950 #, gcc-internal-format msgid "%i-bit mode not compiled in" msgstr "" -#: config/i386/i386.c:2960 config/i386/i386.c:3061 +#: config/i386/i386.c:2962 config/i386/i386.c:3066 #, gcc-internal-format msgid "CPU you selected does not support x86-64 instruction set" msgstr "" -#: config/i386/i386.c:3094 +#: config/i386/i386.c:3038 +#, gcc-internal-format +msgid "generic CPU can be used only for %stune=%s %s" +msgstr "" + +#: config/i386/i386.c:3041 +#, gcc-internal-format +msgid "bad value (%s) for %sarch=%s %s" +msgstr "" + +#: config/i386/i386.c:3100 #, gcc-internal-format msgid "%sregparm%s is ignored in 64-bit mode" msgstr "" -#: config/i386/i386.c:3097 +#: config/i386/i386.c:3103 #, gcc-internal-format msgid "%sregparm=%d%s is not between 0 and %d" msgstr "" -#: config/i386/i386.c:3110 +#: config/i386/i386.c:3116 #, gcc-internal-format msgid "%salign-loops%s is obsolete, use -falign-loops%s" msgstr "" -#: config/i386/i386.c:3116 config/i386/i386.c:3131 config/i386/i386.c:3146 +#: config/i386/i386.c:3122 config/i386/i386.c:3137 config/i386/i386.c:3152 #, gcc-internal-format msgid "%salign-loops=%d%s is not between 0 and %d" msgstr "" -#: config/i386/i386.c:3125 +#: config/i386/i386.c:3131 #, gcc-internal-format msgid "%salign-jumps%s is obsolete, use -falign-jumps%s" msgstr "" -#: config/i386/i386.c:3140 +#: config/i386/i386.c:3146 #, gcc-internal-format msgid "%salign-functions%s is obsolete, use -falign-functions%s" msgstr "" -#: config/i386/i386.c:3175 +#: config/i386/i386.c:3181 #, gcc-internal-format msgid "%sbranch-cost=%d%s is not between 0 and 5" msgstr "" -#: config/i386/i386.c:3183 +#: config/i386/i386.c:3189 #, gcc-internal-format msgid "%slarge-data-threshold=%d%s is negative" msgstr "" -#: config/i386/i386.c:3197 +#: config/i386/i386.c:3201 #, gcc-internal-format msgid "bad value (%s) for %stls-dialect=%s %s" msgstr "" -#: config/i386/i386.c:3205 +#: config/i386/i386.c:3209 #, gcc-internal-format msgid "pc%d is not valid precision setting (32, 64 or 80)" msgstr "" -#: config/i386/i386.c:3221 +#: config/i386/i386.c:3225 #, gcc-internal-format msgid "%srtd%s is ignored in 64bit mode" msgstr "" -#: config/i386/i386.c:3276 +#: config/i386/i386.c:3280 #, gcc-internal-format msgid "%spreferred-stack-boundary=%d%s is not between %d and 12" msgstr "" -#: config/i386/i386.c:3295 +#: config/i386/i386.c:3299 #, gcc-internal-format msgid "-mincoming-stack-boundary=%d is not between %d and 12" msgstr "" -#: config/i386/i386.c:3308 +#: config/i386/i386.c:3312 #, gcc-internal-format msgid "%ssseregparm%s used without SSE enabled" msgstr "" -#: config/i386/i386.c:3319 config/i386/i386.c:3333 +#: config/i386/i386.c:3323 config/i386/i386.c:3337 #, gcc-internal-format msgid "SSE instruction set disabled, using 387 arithmetics" msgstr "" -#: config/i386/i386.c:3338 +#: config/i386/i386.c:3342 #, gcc-internal-format msgid "387 instruction set disabled, using SSE arithmetics" msgstr "" -#: config/i386/i386.c:3345 +#: config/i386/i386.c:3349 #, gcc-internal-format msgid "bad value (%s) for %sfpmath=%s %s" msgstr "" -#: config/i386/i386.c:3361 +#: config/i386/i386.c:3365 #, gcc-internal-format msgid "unknown vectorization library ABI type (%s) for %sveclibabi=%s %s" msgstr "" -#: config/i386/i386.c:3381 +#: config/i386/i386.c:3385 #, gcc-internal-format msgid "" "unwind tables currently require either a frame pointer or %saccumulate-" "outgoing-args%s for correctness" msgstr "" -#: config/i386/i386.c:3394 +#: config/i386/i386.c:3398 #, gcc-internal-format msgid "stack probing requires %saccumulate-outgoing-args%s for correctness" msgstr "" -#: config/i386/i386.c:3805 +#: config/i386/i386.c:3809 #, gcc-internal-format msgid "attribute(target(\"%s\")) is unknown" msgstr "" -#: config/i386/i386.c:3827 +#: config/i386/i386.c:3831 #, gcc-internal-format msgid "option(\"%s\") was already specified" msgstr "" -#: config/i386/i386.c:4422 config/i386/i386.c:4467 +#: config/i386/i386.c:4426 config/i386/i386.c:4471 #, gcc-internal-format msgid "fastcall and regparm attributes are not compatible" msgstr "" -#: config/i386/i386.c:4429 +#: config/i386/i386.c:4433 #, gcc-internal-format msgid "%qE attribute requires an integer constant argument" msgstr "" -#: config/i386/i386.c:4435 +#: config/i386/i386.c:4439 #, gcc-internal-format msgid "argument to %qE attribute larger than %d" msgstr "" -#: config/i386/i386.c:4459 config/i386/i386.c:4494 +#: config/i386/i386.c:4463 config/i386/i386.c:4498 #, gcc-internal-format msgid "fastcall and cdecl attributes are not compatible" msgstr "" -#: config/i386/i386.c:4463 +#: config/i386/i386.c:4467 #, gcc-internal-format msgid "fastcall and stdcall attributes are not compatible" msgstr "" -#: config/i386/i386.c:4477 config/i386/i386.c:4490 +#: config/i386/i386.c:4481 config/i386/i386.c:4494 #, gcc-internal-format msgid "stdcall and cdecl attributes are not compatible" msgstr "" -#: config/i386/i386.c:4481 +#: config/i386/i386.c:4485 #, gcc-internal-format msgid "stdcall and fastcall attributes are not compatible" msgstr "" -#: config/i386/i386.c:4624 +#: config/i386/i386.c:4628 #, gcc-internal-format msgid "Calling %qD with attribute sseregparm without SSE/SSE2 enabled" msgstr "" -#: config/i386/i386.c:4627 +#: config/i386/i386.c:4631 #, gcc-internal-format msgid "Calling %qT with attribute sseregparm without SSE/SSE2 enabled" msgstr "" -#: config/i386/i386.c:4832 +#: config/i386/i386.c:4836 #, gcc-internal-format msgid "ms_hook_prologue is not compatible with nested function" msgstr "" -#: config/i386/i386.c:4905 +#: config/i386/i386.c:4909 #, gcc-internal-format msgid "" "ms_abi attribute requires -maccumulate-outgoing-args or subtarget " "optimization implying it" msgstr "" -#: config/i386/i386.c:5024 +#: config/i386/i386.c:5028 #, gcc-internal-format msgid "AVX vector argument without AVX enabled changes the ABI" msgstr "" -#: config/i386/i386.c:5206 +#: config/i386/i386.c:5210 #, gcc-internal-format msgid "" "The ABI of passing struct with a flexible array member has changed in GCC 4.4" msgstr "" -#: config/i386/i386.c:5322 +#: config/i386/i386.c:5326 #, gcc-internal-format msgid "The ABI of passing union with long double has changed in GCC 4.4" msgstr "" -#: config/i386/i386.c:5437 +#: config/i386/i386.c:5441 #, gcc-internal-format msgid "" "The ABI of passing structure with complex float member has changed in GCC 4.4" msgstr "" -#: config/i386/i386.c:5583 +#: config/i386/i386.c:5587 #, gcc-internal-format msgid "SSE register return with SSE disabled" msgstr "" -#: config/i386/i386.c:5589 +#: config/i386/i386.c:5593 #, gcc-internal-format msgid "SSE register argument with SSE disabled" msgstr "" -#: config/i386/i386.c:5605 +#: config/i386/i386.c:5609 #, gcc-internal-format msgid "x87 register return with x87 disabled" msgstr "" -#: config/i386/i386.c:5975 +#: config/i386/i386.c:5979 #, gcc-internal-format msgid "SSE vector argument without SSE enabled changes the ABI" msgstr "" -#: config/i386/i386.c:6013 +#: config/i386/i386.c:6017 #, gcc-internal-format msgid "MMX vector argument without MMX enabled changes the ABI" msgstr "" -#: config/i386/i386.c:6615 +#: config/i386/i386.c:6619 #, gcc-internal-format msgid "SSE vector return without SSE enabled changes the ABI" msgstr "" -#: config/i386/i386.c:6625 +#: config/i386/i386.c:6629 #, gcc-internal-format msgid "MMX vector return without MMX enabled changes the ABI" msgstr "" -#: config/i386/i386.c:11195 +<<<<<<< HEAD +#: config/i386/i386.c:11279 +======= +#: config/i386/i386.c:11282 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "extended registers have no high halves" msgstr "" -#: config/i386/i386.c:11210 +<<<<<<< HEAD +#: config/i386/i386.c:11294 +======= +#: config/i386/i386.c:11297 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unsupported operand size for extended register" msgstr "" -#: config/i386/i386.c:11455 +<<<<<<< HEAD +#: config/i386/i386.c:11538 +======= +#: config/i386/i386.c:11542 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-integer operand used with operand code '%c'" msgstr "" -#: config/i386/i386.c:22863 +<<<<<<< HEAD +#: config/i386/i386.c:22959 +======= +#: config/i386/i386.c:22971 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "last argument must be an immediate" msgstr "" -#: config/i386/i386.c:23156 +<<<<<<< HEAD +#: config/i386/i386.c:23256 +======= +#: config/i386/i386.c:23268 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the fifth argument must be a 8-bit immediate" msgstr "" -#: config/i386/i386.c:23251 +<<<<<<< HEAD +#: config/i386/i386.c:23351 +======= +#: config/i386/i386.c:23363 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the third argument must be a 8-bit immediate" msgstr "" -#: config/i386/i386.c:23597 +<<<<<<< HEAD +#: config/i386/i386.c:23704 +======= +#: config/i386/i386.c:23716 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be a 4-bit immediate" msgstr "" -#: config/i386/i386.c:23602 +<<<<<<< HEAD +#: config/i386/i386.c:23713 +======= +#: config/i386/i386.c:23725 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be a 2-bit immediate" msgstr "" -#: config/i386/i386.c:23611 +<<<<<<< HEAD +#: config/i386/i386.c:23722 +======= +#: config/i386/i386.c:23734 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be a 1-bit immediate" msgstr "" -#: config/i386/i386.c:23620 +<<<<<<< HEAD +#: config/i386/i386.c:23731 +======= +#: config/i386/i386.c:23743 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be a 5-bit immediate" msgstr "" -#: config/i386/i386.c:23629 +<<<<<<< HEAD +#: config/i386/i386.c:23740 +======= +#: config/i386/i386.c:23752 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the next to last argument must be an 8-bit immediate" msgstr "" -#: config/i386/i386.c:23633 config/i386/i386.c:23831 +<<<<<<< HEAD +#: config/i386/i386.c:23744 config/i386/i386.c:23942 +======= +#: config/i386/i386.c:23756 config/i386/i386.c:23954 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be an 8-bit immediate" msgstr "" -#: config/i386/i386.c:23829 +<<<<<<< HEAD +#: config/i386/i386.c:23940 +======= +#: config/i386/i386.c:23952 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the last argument must be a 32-bit immediate" msgstr "" -#: config/i386/i386.c:23895 config/rs6000/rs6000.c:10249 +<<<<<<< HEAD +#: config/i386/i386.c:24006 config/rs6000/rs6000.c:10239 +======= +#: config/i386/i386.c:24018 config/rs6000/rs6000.c:10237 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "selector must be an integer constant in the range 0..%wi" msgstr "" -#: config/i386/i386.c:24038 +<<<<<<< HEAD +#: config/i386/i386.c:24149 +======= +#: config/i386/i386.c:24161 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE needs unknown isa option" msgstr "" -#: config/i386/i386.c:24042 +<<<<<<< HEAD +#: config/i386/i386.c:24153 +======= +#: config/i386/i386.c:24165 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE needs isa option %s" msgstr "" -#: config/i386/i386.c:25890 +<<<<<<< HEAD +#: config/i386/i386.c:25996 +======= +#: config/i386/i386.c:26006 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE attribute only available for 64-bit" msgstr "" -#: config/i386/i386.c:25901 config/i386/i386.c:25910 +<<<<<<< HEAD +#: config/i386/i386.c:26007 config/i386/i386.c:26016 +======= +#: config/i386/i386.c:26017 config/i386/i386.c:26026 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ms_abi and sysv_abi attributes are not compatible" msgstr "" -#: config/i386/i386.c:25948 config/rs6000/rs6000.c:23527 +<<<<<<< HEAD +#: config/i386/i386.c:26054 config/rs6000/rs6000.c:23573 +======= +#: config/i386/i386.c:26064 config/rs6000/rs6000.c:23571 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE incompatible attribute ignored" msgstr "" -#: config/i386/i386.c:25971 +<<<<<<< HEAD +#: config/i386/i386.c:26077 +======= +#: config/i386/i386.c:26087 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE attribute only available for 32-bit" msgstr "" -#: config/i386/i386.c:25977 +<<<<<<< HEAD +#: config/i386/i386.c:26083 +======= +#: config/i386/i386.c:26093 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ms_hook_prologue attribute needs assembler swap suffix support" msgstr "" -#: config/i386/i386.c:29887 +<<<<<<< HEAD +#: config/i386/i386.c:30003 +======= +#: config/i386/i386.c:30013 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "vector permutation requires vector constant" msgstr "" -#: config/i386/i386.c:29897 +<<<<<<< HEAD +#: config/i386/i386.c:30013 +======= +#: config/i386/i386.c:30023 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid vector permutation constant" msgstr "" -#: config/i386/i386.c:29945 +<<<<<<< HEAD +#: config/i386/i386.c:30061 +======= +#: config/i386/i386.c:30071 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "vector permutation (%d %d)" msgstr "" -#: config/i386/i386.c:29948 +<<<<<<< HEAD +#: config/i386/i386.c:30064 +======= +#: config/i386/i386.c:30074 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "vector permutation (%d %d %d %d)" msgstr "" -#: config/i386/i386.c:29952 +<<<<<<< HEAD +#: config/i386/i386.c:30068 +======= +#: config/i386/i386.c:30078 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "vector permutation (%d %d %d %d %d %d %d %d)" msgstr "" -#: config/i386/i386.c:29957 +<<<<<<< HEAD +#: config/i386/i386.c:30073 +======= +#: config/i386/i386.c:30083 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "vector permutation (%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)" msgstr "" @@ -21239,14 +22644,14 @@ msgstr "" msgid "%qE attribute requires a string constant argument" msgstr "" -#: config/ia64/ia64.c:5384 config/pa/pa.c:368 config/sh/sh.c:8528 -#: config/spu/spu.c:5051 +#: config/ia64/ia64.c:5384 config/pa/pa.c:371 config/sh/sh.c:8564 +#: config/spu/spu.c:5041 #, gcc-internal-format msgid "value of -mfixed-range must have form REG1-REG2" msgstr "" -#: config/ia64/ia64.c:5411 config/pa/pa.c:395 config/sh/sh.c:8554 -#: config/spu/spu.c:5077 +#: config/ia64/ia64.c:5411 config/pa/pa.c:398 config/sh/sh.c:8590 +#: config/spu/spu.c:5067 #, gcc-internal-format msgid "%s-%s is an empty range" msgstr "" @@ -21317,7 +22722,7 @@ msgid "%qE attribute is not supported for R8C target" msgstr "" #. The argument must be a constant integer. -#: config/m32c/m32c.c:2861 config/sh/sh.c:8735 config/sh/sh.c:8841 +#: config/m32c/m32c.c:2861 config/sh/sh.c:8771 config/sh/sh.c:8877 #, gcc-internal-format msgid "%qE attribute argument not an integer constant" msgstr "" @@ -21357,37 +22762,41 @@ msgstr "" msgid "% attribute is already used" msgstr "" -#: config/m68k/m68k.c:568 +#: config/m68k/m68k.c:572 #, gcc-internal-format msgid "-mcpu=%s conflicts with -march=%s" msgstr "" -#: config/m68k/m68k.c:639 +#: config/m68k/m68k.c:643 #, gcc-internal-format msgid "-mpcrel -fPIC is not currently supported on selected cpu" msgstr "" -#: config/m68k/m68k.c:701 +#: config/m68k/m68k.c:705 #, gcc-internal-format msgid "-falign-labels=%d is not supported" msgstr "" -#: config/m68k/m68k.c:706 +#: config/m68k/m68k.c:710 #, gcc-internal-format msgid "-falign-loops=%d is not supported" msgstr "" -#: config/m68k/m68k.c:809 +#: config/m68k/m68k.c:813 #, gcc-internal-format msgid "multiple interrupt attributes not allowed" msgstr "" -#: config/m68k/m68k.c:816 +#: config/m68k/m68k.c:820 #, gcc-internal-format msgid "interrupt_thread is available only on fido" msgstr "" -#: config/m68k/m68k.c:1145 config/rs6000/rs6000.c:18025 +<<<<<<< HEAD +#: config/m68k/m68k.c:1149 config/rs6000/rs6000.c:18071 +======= +#: config/m68k/m68k.c:1149 config/rs6000/rs6000.c:18069 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "stack limit expression is not supported" msgstr "" @@ -21517,152 +22926,152 @@ msgstr "" msgid "unusual TP-relative address" msgstr "" -#: config/mep/mep.c:3531 +#: config/mep/mep.c:3510 #, gcc-internal-format msgid "unconvertible operand %c %qs" msgstr "" -#: config/mep/mep.c:3973 config/mep/mep.c:4036 +#: config/mep/mep.c:3953 config/mep/mep.c:4016 #, gcc-internal-format msgid "address region attributes not allowed with auto storage class" msgstr "" -#: config/mep/mep.c:3979 config/mep/mep.c:4042 +#: config/mep/mep.c:3959 config/mep/mep.c:4022 #, gcc-internal-format msgid "address region attributes on pointed-to types ignored" msgstr "" -#: config/mep/mep.c:4028 +#: config/mep/mep.c:4008 #, gcc-internal-format msgid "%qE attribute only applies to variables and functions" msgstr "" -#: config/mep/mep.c:4048 config/mep/mep.c:4336 +#: config/mep/mep.c:4028 config/mep/mep.c:4316 #, gcc-internal-format msgid "duplicate address region attribute %qE in declaration of %qE on line %d" msgstr "" -#: config/mep/mep.c:4082 +#: config/mep/mep.c:4062 #, gcc-internal-format msgid "cannot inline interrupt function %qE" msgstr "" -#: config/mep/mep.c:4088 +#: config/mep/mep.c:4068 #, gcc-internal-format msgid "interrupt function must have return type of void" msgstr "" -#: config/mep/mep.c:4093 +#: config/mep/mep.c:4073 #, gcc-internal-format msgid "interrupt function must have no arguments" msgstr "" -#: config/mep/mep.c:4114 +#: config/mep/mep.c:4094 #, gcc-internal-format msgid "%qE attribute allows only an integer constant argument" msgstr "" -#: config/mep/mep.c:4147 +#: config/mep/mep.c:4127 #, gcc-internal-format msgid "%qE attribute only applies to functions, not %s" msgstr "" -#: config/mep/mep.c:4157 +#: config/mep/mep.c:4137 #, gcc-internal-format msgid "To describe a pointer to a VLIW function, use syntax like this:" msgstr "" -#: config/mep/mep.c:4158 +#: config/mep/mep.c:4138 #, gcc-internal-format msgid " typedef int (__vliw *vfuncptr) ();" msgstr "" -#: config/mep/mep.c:4165 +#: config/mep/mep.c:4145 #, gcc-internal-format msgid "To describe an array of VLIW function pointers, use syntax like this:" msgstr "" -#: config/mep/mep.c:4166 +#: config/mep/mep.c:4146 #, gcc-internal-format msgid " typedef int (__vliw *vfuncptr[]) ();" msgstr "" -#: config/mep/mep.c:4171 +#: config/mep/mep.c:4151 #, gcc-internal-format msgid "VLIW functions are not allowed without a VLIW configuration" msgstr "" -#: config/mep/mep.c:4319 +#: config/mep/mep.c:4299 #, gcc-internal-format msgid "\"#pragma disinterrupt %s\" not used" msgstr "" -#: config/mep/mep.c:4461 +#: config/mep/mep.c:4441 #, gcc-internal-format msgid "__io address 0x%x is the same for %qE and %qE" msgstr "" -#: config/mep/mep.c:4609 +#: config/mep/mep.c:4589 #, gcc-internal-format msgid "variable %s (%ld bytes) is too large for the %s section (%d bytes)" msgstr "" -#: config/mep/mep.c:4707 +#: config/mep/mep.c:4687 #, gcc-internal-format msgid "variable %D of type % must be uninitialized" msgstr "" -#: config/mep/mep.c:4712 +#: config/mep/mep.c:4692 #, gcc-internal-format msgid "variable %D of type % must be uninitialized" msgstr "" -#: config/mep/mep.c:6165 +#: config/mep/mep.c:6145 #, gcc-internal-format msgid "coprocessor intrinsic %qs is not available in this configuration" msgstr "" -#: config/mep/mep.c:6168 +#: config/mep/mep.c:6148 #, gcc-internal-format msgid "%qs is not available in VLIW functions" msgstr "" -#: config/mep/mep.c:6171 +#: config/mep/mep.c:6151 #, gcc-internal-format msgid "%qs is not available in non-VLIW functions" msgstr "" -#: config/mep/mep.c:6333 config/mep/mep.c:6451 +#: config/mep/mep.c:6313 config/mep/mep.c:6431 #, gcc-internal-format msgid "argument %d of %qE must be in the range %d...%d" msgstr "" -#: config/mep/mep.c:6336 +#: config/mep/mep.c:6316 #, gcc-internal-format msgid "argument %d of %qE must be a multiple of %d" msgstr "" -#: config/mep/mep.c:6390 +#: config/mep/mep.c:6370 #, gcc-internal-format msgid "too few arguments to %qE" msgstr "" -#: config/mep/mep.c:6395 +#: config/mep/mep.c:6375 #, gcc-internal-format msgid "too many arguments to %qE" msgstr "" -#: config/mep/mep.c:6413 +#: config/mep/mep.c:6393 #, gcc-internal-format msgid "argument %d of %qE must be an address" msgstr "" -#: config/mep/mep.c:7209 +#: config/mep/mep.c:7189 #, gcc-internal-format msgid "2 byte cop instructions are not allowed in 64-bit VLIW mode" msgstr "" -#: config/mep/mep.c:7215 +#: config/mep/mep.c:7195 #, gcc-internal-format msgid "unexpected %d byte cop instruction" msgstr "" @@ -21889,27 +23298,27 @@ msgstr "" msgid "MMIX Internal: %s is not a shiftable int" msgstr "" -#: config/pa/pa.c:500 +#: config/pa/pa.c:503 #, gcc-internal-format msgid "PIC code generation is not supported in the portable runtime model" msgstr "" -#: config/pa/pa.c:505 +#: config/pa/pa.c:508 #, gcc-internal-format msgid "PIC code generation is not compatible with fast indirect calls" msgstr "" -#: config/pa/pa.c:510 +#: config/pa/pa.c:513 #, gcc-internal-format msgid "-g is only supported when using GAS on this processor," msgstr "" -#: config/pa/pa.c:511 +#: config/pa/pa.c:514 #, gcc-internal-format msgid "-g option disabled" msgstr "" -#: config/pa/pa.c:8463 +#: config/pa/pa.c:8466 #, gcc-internal-format msgid "" "alignment (%u) for %s exceeds maximum alignment for global common data. " @@ -22071,336 +23480,524 @@ msgstr "" msgid "junk at end of #pragma longcall" msgstr "" -#: config/rs6000/rs6000-c.c:3238 +#: config/rs6000/rs6000-c.c:3246 #, gcc-internal-format msgid "%s only accepts %d arguments" msgstr "" -#: config/rs6000/rs6000-c.c:3243 +#: config/rs6000/rs6000-c.c:3251 #, gcc-internal-format msgid "%s only accepts 1 argument" msgstr "" -#: config/rs6000/rs6000-c.c:3248 +#: config/rs6000/rs6000-c.c:3256 #, gcc-internal-format msgid "%s only accepts 2 arguments" msgstr "" -#: config/rs6000/rs6000-c.c:3313 +#: config/rs6000/rs6000-c.c:3321 #, gcc-internal-format msgid "vec_extract only accepts 2 arguments" msgstr "" -#: config/rs6000/rs6000-c.c:3389 +#: config/rs6000/rs6000-c.c:3397 #, gcc-internal-format msgid "vec_insert only accepts 3 arguments" msgstr "" -#: config/rs6000/rs6000-c.c:3492 +#: config/rs6000/rs6000-c.c:3500 #, gcc-internal-format msgid "passing arg %d of %qE discards qualifiers frompointer target type" msgstr "" -#: config/rs6000/rs6000-c.c:3535 +#: config/rs6000/rs6000-c.c:3543 #, gcc-internal-format msgid "invalid parameter combination for AltiVec intrinsic" msgstr "" -#: config/rs6000/rs6000.c:2111 +#: config/rs6000/rs6000.c:2108 #, gcc-internal-format msgid "-mdynamic-no-pic overrides -fpic or -fPIC" msgstr "" -#: config/rs6000/rs6000.c:2122 +#: config/rs6000/rs6000.c:2119 #, gcc-internal-format msgid "-m64 requires PowerPC64 architecture, enabling" msgstr "" -#: config/rs6000/rs6000.c:2374 +#: config/rs6000/rs6000.c:2371 #, gcc-internal-format msgid "AltiVec not supported in this target" msgstr "" -#: config/rs6000/rs6000.c:2376 +#: config/rs6000/rs6000.c:2373 #, gcc-internal-format msgid "Spe not supported in this target" msgstr "" -#: config/rs6000/rs6000.c:2403 +#: config/rs6000/rs6000.c:2400 #, gcc-internal-format msgid "-mmultiple is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:2410 +#: config/rs6000/rs6000.c:2407 #, gcc-internal-format msgid "-mstring is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:2469 +#: config/rs6000/rs6000.c:2466 #, gcc-internal-format msgid "unknown -mdebug-%s switch" msgstr "" -#: config/rs6000/rs6000.c:2509 +#: config/rs6000/rs6000.c:2506 #, gcc-internal-format msgid "" "unknown -mtraceback arg %qs; expecting %, % or %" msgstr "" -#: config/rs6000/rs6000.c:3130 +#: config/rs6000/rs6000.c:3127 #, gcc-internal-format msgid "unknown -m%s= option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3176 +#: config/rs6000/rs6000.c:3173 #, gcc-internal-format msgid "unknown value %s for -mfpu" msgstr "" -#: config/rs6000/rs6000.c:3505 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3504 +======= +#: config/rs6000/rs6000.c:3502 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "not configured for ABI: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3518 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3517 +======= +#: config/rs6000/rs6000.c:3515 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Using darwin64 ABI" msgstr "" -#: config/rs6000/rs6000.c:3523 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3522 +======= +#: config/rs6000/rs6000.c:3520 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Using old darwin ABI" msgstr "" -#: config/rs6000/rs6000.c:3530 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3529 +======= +#: config/rs6000/rs6000.c:3527 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Using IBM extended precision long double" msgstr "" -#: config/rs6000/rs6000.c:3536 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3535 +======= +#: config/rs6000/rs6000.c:3533 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Using IEEE extended precision long double" msgstr "" -#: config/rs6000/rs6000.c:3541 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3540 +======= +#: config/rs6000/rs6000.c:3538 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unknown ABI specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3568 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3567 +======= +#: config/rs6000/rs6000.c:3565 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid option for -mfloat-gprs: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3578 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3577 +======= +#: config/rs6000/rs6000.c:3575 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Unknown switch -mlong-double-%s" msgstr "" -#: config/rs6000/rs6000.c:3599 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3598 +======= +#: config/rs6000/rs6000.c:3596 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "-malign-power is not supported for 64-bit Darwin; it is incompatible with " "the installed C and C++ libraries" msgstr "" -#: config/rs6000/rs6000.c:3607 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3606 +======= +#: config/rs6000/rs6000.c:3604 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unknown -malign-XXXXX option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3614 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3613 +======= +#: config/rs6000/rs6000.c:3611 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "-msingle-float option equivalent to -mhard-float" msgstr "" -#: config/rs6000/rs6000.c:3630 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:3629 +======= +#: config/rs6000/rs6000.c:3627 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "-msimple-fpu option ignored" msgstr "" -#: config/rs6000/rs6000.c:6793 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:6779 +======= +#: config/rs6000/rs6000.c:6777 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "GCC vector returned by reference: non-standard ABI extension with no " "compatibility guarantee" msgstr "" -#: config/rs6000/rs6000.c:6866 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:6852 +======= +#: config/rs6000/rs6000.c:6850 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "cannot return value in vector register because altivec instructions are " "disabled, use -maltivec to enable them" msgstr "" -#: config/rs6000/rs6000.c:7125 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:7111 +======= +#: config/rs6000/rs6000.c:7109 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "cannot pass argument in vector register because altivec instructions are " "disabled, use -maltivec to enable them" msgstr "" -#: config/rs6000/rs6000.c:8027 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:8013 +======= +#: config/rs6000/rs6000.c:8011 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "GCC vector passed by reference: non-standard ABI extension with no " "compatibility guarantee" msgstr "" -#: config/rs6000/rs6000.c:8609 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:8595 +======= +#: config/rs6000/rs6000.c:8593 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "internal error: builtin function to %s already processed." msgstr "" -#: config/rs6000/rs6000.c:9544 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9534 +======= +#: config/rs6000/rs6000.c:9532 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 must be a 5-bit signed literal" msgstr "" -#: config/rs6000/rs6000.c:9647 config/rs6000/rs6000.c:10619 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9637 config/rs6000/rs6000.c:10609 +======= +#: config/rs6000/rs6000.c:9635 config/rs6000/rs6000.c:10607 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 2 must be a 5-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:9686 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9676 +======= +#: config/rs6000/rs6000.c:9674 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_altivec_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:9738 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9728 +======= +#: config/rs6000/rs6000.c:9726 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_altivec_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:9988 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9978 +======= +#: config/rs6000/rs6000.c:9976 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 3 must be a 4-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:10006 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:9996 +======= +#: config/rs6000/rs6000.c:9994 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 3 must be a 2-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:10018 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10008 +======= +#: config/rs6000/rs6000.c:10006 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 3 must be a 1-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:10194 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10184 +======= +#: config/rs6000/rs6000.c:10182 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument to %qs must be a 2-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:10338 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10328 +======= +#: config/rs6000/rs6000.c:10326 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unresolved overload for Altivec builtin %qF" msgstr "" -#: config/rs6000/rs6000.c:10429 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10419 +======= +#: config/rs6000/rs6000.c:10417 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument to dss must be a 2-bit unsigned literal" msgstr "" -#: config/rs6000/rs6000.c:10739 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10729 +======= +#: config/rs6000/rs6000.c:10727 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_paired_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:10786 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10776 +======= +#: config/rs6000/rs6000.c:10774 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_paired_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:10811 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10801 +======= +#: config/rs6000/rs6000.c:10799 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_spe_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:10883 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:10873 +======= +#: config/rs6000/rs6000.c:10871 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument 1 of __builtin_spe_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:12229 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:12219 +======= +#: config/rs6000/rs6000.c:12217 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "internal error: builtin function %s had no type" msgstr "" -#: config/rs6000/rs6000.c:12236 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:12226 +======= +#: config/rs6000/rs6000.c:12224 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "internal error: builtin function %s had an unexpected return type %s" msgstr "" -#: config/rs6000/rs6000.c:12249 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:12239 +======= +#: config/rs6000/rs6000.c:12237 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "internal error: builtin function %s, argument %d had unexpected argument " "type %s" msgstr "" -#: config/rs6000/rs6000.c:17995 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:18041 +======= +#: config/rs6000/rs6000.c:18039 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "stack frame too large" msgstr "" -#: config/rs6000/rs6000.c:18391 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:18437 +======= +#: config/rs6000/rs6000.c:18435 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Out-of-line save/restore routines not supported on Darwin" msgstr "" -#: config/rs6000/rs6000.c:21286 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:21332 +======= +#: config/rs6000/rs6000.c:21330 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no profiling of 64-bit code for this ABI" msgstr "" -#: config/rs6000/rs6000.c:23314 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23360 +======= +#: config/rs6000/rs6000.c:23358 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of % in AltiVec types is invalid" msgstr "" -#: config/rs6000/rs6000.c:23316 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23362 +======= +#: config/rs6000/rs6000.c:23360 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of boolean types in AltiVec types is invalid" msgstr "" -#: config/rs6000/rs6000.c:23318 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23364 +======= +#: config/rs6000/rs6000.c:23362 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of % in AltiVec types is invalid" msgstr "" -#: config/rs6000/rs6000.c:23320 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23366 +======= +#: config/rs6000/rs6000.c:23364 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of decimal floating point types in AltiVec types is invalid" msgstr "" -#: config/rs6000/rs6000.c:23326 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23372 +======= +#: config/rs6000/rs6000.c:23370 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "use of % in AltiVec types is invalid for 64-bit code without -mvsx" msgstr "" -#: config/rs6000/rs6000.c:23329 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23375 +======= +#: config/rs6000/rs6000.c:23373 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of % in AltiVec types is deprecated; use %" msgstr "" -#: config/rs6000/rs6000.c:23334 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23380 +======= +#: config/rs6000/rs6000.c:23378 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of % in AltiVec types is invalid without -mvsx" msgstr "" -#: config/rs6000/rs6000.c:23337 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:23383 +======= +#: config/rs6000/rs6000.c:23381 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of % in AltiVec types is invalid without -mvsx" msgstr "" -#: config/rs6000/rs6000.c:25739 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:25785 +======= +#: config/rs6000/rs6000.c:25783 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "emitting microcode insn %s\t[%s] #%d" msgstr "" -#: config/rs6000/rs6000.c:25743 +<<<<<<< HEAD +#: config/rs6000/rs6000.c:25789 +======= +#: config/rs6000/rs6000.c:25787 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "emitting conditional microcode insn %s\t[%s] #%d" msgstr "" @@ -22455,7 +24052,7 @@ msgstr "" msgid "-m64 not supported in this configuration" msgstr "" -#: config/rs6000/linux64.h:113 +#: config/rs6000/linux64.h:115 #, gcc-internal-format msgid "-m64 requires a PowerPC64 cpu" msgstr "" @@ -22632,17 +24229,17 @@ msgstr "" msgid "total size of local variables exceeds architecture limit" msgstr "" -#: config/s390/s390.c:7794 +#: config/s390/s390.c:7794 config/s390/s390.c:7810 #, gcc-internal-format msgid "frame size of function %qs is " msgstr "" -#: config/s390/s390.c:7820 +#: config/s390/s390.c:7839 #, gcc-internal-format msgid "frame size of %qs is " msgstr "" -#: config/s390/s390.c:7824 +#: config/s390/s390.c:7843 #, gcc-internal-format msgid "%qs uses dynamic stack allocation" msgstr "" @@ -22652,58 +24249,58 @@ msgstr "" msgid "-fPIC and -G are incompatible" msgstr "" -#: config/sh/sh.c:888 +#: config/sh/sh.c:892 #, gcc-internal-format msgid "ignoring -fschedule-insns because of exception handling bug" msgstr "" -#: config/sh/sh.c:7463 +#: config/sh/sh.c:7499 #, gcc-internal-format msgid "__builtin_saveregs not supported by this subtarget" msgstr "" -#: config/sh/sh.c:8616 +#: config/sh/sh.c:8652 #, gcc-internal-format msgid "%qE attribute only applies to interrupt functions" msgstr "" -#: config/sh/sh.c:8674 +#: config/sh/sh.c:8710 #, gcc-internal-format msgid "%qE attribute is supported only for SH2A" msgstr "" -#: config/sh/sh.c:8704 +#: config/sh/sh.c:8740 #, gcc-internal-format msgid "attribute interrupt_handler is not compatible with -m5-compact" msgstr "" -#: config/sh/sh.c:8721 +#: config/sh/sh.c:8757 #, gcc-internal-format msgid "%qE attribute only applies to SH2A" msgstr "" -#: config/sh/sh.c:8743 +#: config/sh/sh.c:8779 #, gcc-internal-format msgid "%qE attribute argument should be between 0 to 255" msgstr "" #. The argument must be a constant string. -#: config/sh/sh.c:8816 +#: config/sh/sh.c:8852 #, gcc-internal-format msgid "%qE attribute argument not a string constant" msgstr "" -#: config/sh/sh.c:11238 +#: config/sh/sh.c:11274 #, gcc-internal-format msgid "r0 needs to be available as a call-clobbered register" msgstr "" -#: config/sh/sh.c:11259 +#: config/sh/sh.c:11295 #, gcc-internal-format msgid "Need a second call-clobbered general purpose register" msgstr "" -#: config/sh/sh.c:11267 +#: config/sh/sh.c:11303 #, gcc-internal-format msgid "Need a call-clobbered target register" msgstr "" @@ -22756,22 +24353,22 @@ msgstr "" msgid "-mrelax is only supported for RTP PIC" msgstr "" -#: config/sparc/sparc.c:720 +#: config/sparc/sparc.c:713 #, gcc-internal-format msgid "%s is not supported by this configuration" msgstr "" -#: config/sparc/sparc.c:727 +#: config/sparc/sparc.c:720 #, gcc-internal-format msgid "-mlong-double-64 not allowed with -m64" msgstr "" -#: config/sparc/sparc.c:747 +#: config/sparc/sparc.c:740 #, gcc-internal-format msgid "bad value (%s) for -mcmodel= switch" msgstr "" -#: config/sparc/sparc.c:752 +#: config/sparc/sparc.c:745 #, gcc-internal-format msgid "-mcmodel= is not supported on 32 bit systems" msgstr "" @@ -22781,12 +24378,12 @@ msgstr "" msgid "insufficient arguments to overloaded function %s" msgstr "" -#: config/spu/spu-c.c:173 +#: config/spu/spu-c.c:172 #, gcc-internal-format msgid "too many arguments to overloaded function %s" msgstr "" -#: config/spu/spu-c.c:185 +#: config/spu/spu-c.c:184 #, gcc-internal-format msgid "parameter list does not match a valid signature for %s()" msgstr "" @@ -22796,27 +24393,27 @@ msgstr "" msgid "Unknown architecture '%s'" msgstr "" -#: config/spu/spu.c:5331 config/spu/spu.c:5334 +#: config/spu/spu.c:5321 config/spu/spu.c:5324 #, gcc-internal-format msgid "creating run-time relocation for %qD" msgstr "" -#: config/spu/spu.c:5339 config/spu/spu.c:5341 +#: config/spu/spu.c:5329 config/spu/spu.c:5331 #, gcc-internal-format msgid "creating run-time relocation" msgstr "" -#: config/spu/spu.c:6399 +#: config/spu/spu.c:6389 #, gcc-internal-format msgid "%s expects an integer literal in the range [%d, %d]." msgstr "" -#: config/spu/spu.c:6419 +#: config/spu/spu.c:6409 #, gcc-internal-format msgid "%s expects an integer literal in the range [%d, %d]. (" msgstr "" -#: config/spu/spu.c:6449 +#: config/spu/spu.c:6439 #, gcc-internal-format msgid "%d least significant bits of %s are ignored." msgstr "" @@ -22991,432 +24588,740 @@ msgstr "" msgid "only uninitialized variables can be placed in a .bss section" msgstr "" -#: cp/call.c:2706 +#: cp/call.c:2710 #, gcc-internal-format msgid "%s %D(%T, %T, %T) " msgstr "" -#: cp/call.c:2711 +#: cp/call.c:2715 #, gcc-internal-format msgid "%s %D(%T, %T) " msgstr "" -#: cp/call.c:2715 +#: cp/call.c:2719 #, gcc-internal-format msgid "%s %D(%T) " msgstr "" -#: cp/call.c:2719 +#: cp/call.c:2723 #, gcc-internal-format msgid "%s %T " msgstr "" -#: cp/call.c:2721 +#: cp/call.c:2725 #, gcc-internal-format msgid "%s %+#D " msgstr "" -#: cp/call.c:2723 +#: cp/call.c:2727 #, gcc-internal-format msgid "%s %+#D " msgstr "" -#: cp/call.c:2725 cp/pt.c:1703 +<<<<<<< HEAD +#: cp/call.c:2729 cp/pt.c:1704 +======= +#: cp/call.c:2725 cp/pt.c:1704 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%s %+#D" msgstr "" -#: cp/call.c:3020 +<<<<<<< HEAD +#: cp/call.c:3019 +======= +#: cp/call.c:3015 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "conversion from %qT to %qT is ambiguous" msgstr "" -#: cp/call.c:3182 cp/call.c:3203 cp/call.c:3268 +<<<<<<< HEAD +#: cp/call.c:3181 cp/call.c:3202 cp/call.c:3267 +======= +#: cp/call.c:3177 cp/call.c:3198 cp/call.c:3263 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no matching function for call to %<%D(%A)%>" msgstr "" -#: cp/call.c:3206 cp/call.c:3271 +<<<<<<< HEAD +#: cp/call.c:3205 cp/call.c:3270 +======= +#: cp/call.c:3201 cp/call.c:3266 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "call of overloaded %<%D(%A)%> is ambiguous" msgstr "" #. It's no good looking for an overloaded operator() on a #. pointer-to-member-function. -#: cp/call.c:3350 +<<<<<<< HEAD +#: cp/call.c:3349 +======= +#: cp/call.c:3345 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "pointer-to-member function %E cannot be called without an object; consider " "using .* or ->*" msgstr "" -#: cp/call.c:3442 +<<<<<<< HEAD +#: cp/call.c:3432 +======= +#: cp/call.c:3428 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for call to %<(%T) (%A)%>" msgstr "" -#: cp/call.c:3455 +<<<<<<< HEAD +#: cp/call.c:3445 +======= +#: cp/call.c:3441 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "call of %<(%T) (%A)%> is ambiguous" msgstr "" -#: cp/call.c:3497 +<<<<<<< HEAD +#: cp/call.c:3487 +======= +#: cp/call.c:3483 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for ternary % in %<%E ? %E : %E%>" msgstr "" -#: cp/call.c:3500 +<<<<<<< HEAD +#: cp/call.c:3490 +======= +#: cp/call.c:3486 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for ternary % in %<%E ? %E : %E%>" msgstr "" -#: cp/call.c:3507 +<<<<<<< HEAD +#: cp/call.c:3497 +======= +#: cp/call.c:3493 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for % in %<%E%s%>" msgstr "" -#: cp/call.c:3510 +<<<<<<< HEAD +#: cp/call.c:3500 +======= +#: cp/call.c:3496 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for % in %<%E%s%>" msgstr "" -#: cp/call.c:3516 +<<<<<<< HEAD +#: cp/call.c:3506 +======= +#: cp/call.c:3502 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for % in %<%E[%E]%>" msgstr "" -#: cp/call.c:3519 +<<<<<<< HEAD +#: cp/call.c:3509 +======= +#: cp/call.c:3505 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for % in %<%E[%E]%>" msgstr "" -#: cp/call.c:3526 +<<<<<<< HEAD +#: cp/call.c:3516 +======= +#: cp/call.c:3512 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for %qs in %<%s %E%>" msgstr "" -#: cp/call.c:3529 +<<<<<<< HEAD +#: cp/call.c:3519 +======= +#: cp/call.c:3515 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for %qs in %<%s %E%>" msgstr "" -#: cp/call.c:3536 +<<<<<<< HEAD +#: cp/call.c:3526 +======= +#: cp/call.c:3522 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for % in %<%E %s %E%>" msgstr "" -#: cp/call.c:3539 +<<<<<<< HEAD +#: cp/call.c:3529 +======= +#: cp/call.c:3525 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for % in %<%E %s %E%>" msgstr "" -#: cp/call.c:3543 +<<<<<<< HEAD +#: cp/call.c:3533 +======= +#: cp/call.c:3529 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ambiguous overload for % in %<%s%E%>" msgstr "" -#: cp/call.c:3546 +<<<<<<< HEAD +#: cp/call.c:3536 +======= +#: cp/call.c:3532 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no match for % in %<%s%E%>" msgstr "" -#: cp/call.c:3641 +<<<<<<< HEAD +#: cp/call.c:3631 +======= +#: cp/call.c:3627 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids omitting the middle term of a ?: expression" msgstr "" -#: cp/call.c:3722 +<<<<<<< HEAD +#: cp/call.c:3712 +======= +#: cp/call.c:3708 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "second operand to the conditional operator is of type %, but the " "third operand is neither a throw-expression nor of type %" msgstr "" -#: cp/call.c:3727 +<<<<<<< HEAD +#: cp/call.c:3717 +======= +#: cp/call.c:3713 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "third operand to the conditional operator is of type %, but the " "second operand is neither a throw-expression nor of type %" msgstr "" -#: cp/call.c:3769 cp/call.c:4007 +<<<<<<< HEAD +#: cp/call.c:3759 cp/call.c:3997 +======= +#: cp/call.c:3755 cp/call.c:3993 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "operands to ?: have different types %qT and %qT" msgstr "" -#: cp/call.c:3954 +<<<<<<< HEAD +#: cp/call.c:3944 +======= +#: cp/call.c:3940 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumeral mismatch in conditional expression: %qT vs %qT" msgstr "" -#: cp/call.c:3965 +<<<<<<< HEAD +#: cp/call.c:3955 +======= +#: cp/call.c:3951 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumeral and non-enumeral type in conditional expression" msgstr "" -#: cp/call.c:4312 +<<<<<<< HEAD +#: cp/call.c:4302 +======= +#: cp/call.c:4298 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no %<%D(int)%> declared for postfix %qs, trying prefix operator instead" msgstr "" -#: cp/call.c:4314 +<<<<<<< HEAD +#: cp/call.c:4304 +======= +#: cp/call.c:4300 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no %<%D(int)%> declared for postfix %qs" msgstr "" -#: cp/call.c:4408 +<<<<<<< HEAD +#: cp/call.c:4398 +======= +#: cp/call.c:4394 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "comparison between %q#T and %q#T" msgstr "" -#: cp/call.c:4652 +<<<<<<< HEAD +#: cp/call.c:4642 +======= +#: cp/call.c:4638 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-placement deallocation function %q+D" msgstr "" -#: cp/call.c:4653 +<<<<<<< HEAD +#: cp/call.c:4643 +======= +#: cp/call.c:4639 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "selected for placement delete" msgstr "" -#: cp/call.c:4732 +<<<<<<< HEAD +#: cp/call.c:4722 +======= +#: cp/call.c:4718 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no corresponding deallocation function for %qD" msgstr "" -#: cp/call.c:4737 +<<<<<<< HEAD +#: cp/call.c:4727 +======= +#: cp/call.c:4723 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no suitable % for %qT" msgstr "" -#: cp/call.c:4755 +<<<<<<< HEAD +#: cp/call.c:4745 +======= +#: cp/call.c:4741 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+#D is private" msgstr "" -#: cp/call.c:4757 +<<<<<<< HEAD +#: cp/call.c:4747 +======= +#: cp/call.c:4743 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+#D is protected" msgstr "" -#: cp/call.c:4759 +<<<<<<< HEAD +#: cp/call.c:4749 +======= +#: cp/call.c:4745 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+#D is inaccessible" msgstr "" -#: cp/call.c:4760 +<<<<<<< HEAD +#: cp/call.c:4750 +======= +#: cp/call.c:4746 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "within this context" msgstr "" -#: cp/call.c:4807 +<<<<<<< HEAD +#: cp/call.c:4798 +======= +#: cp/call.c:4794 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "passing NULL to non-pointer argument %P of %qD" msgstr "" -#: cp/call.c:4810 +<<<<<<< HEAD +#: cp/call.c:4802 +======= +#: cp/call.c:4798 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "converting to non-pointer type %qT from NULL" msgstr "" -#: cp/call.c:4816 +<<<<<<< HEAD +#: cp/call.c:4808 +======= +#: cp/call.c:4804 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "converting % to pointer type for argument %P of %qD" msgstr "" -#: cp/call.c:4854 +<<<<<<< HEAD +#: cp/call.c:4846 +======= +#: cp/call.c:4842 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "too many braces around initializer for %qT" msgstr "" -#: cp/call.c:4876 cp/cvt.c:217 +<<<<<<< HEAD +#: cp/call.c:4868 cp/cvt.c:218 +======= +#: cp/call.c:4864 cp/cvt.c:218 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid conversion from %qT to %qT" msgstr "" -#: cp/call.c:4878 cp/call.c:5047 +<<<<<<< HEAD +#: cp/call.c:4870 cp/call.c:5039 +======= +#: cp/call.c:4866 cp/call.c:5035 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " initializing argument %P of %qD" msgstr "" -#: cp/call.c:4902 +<<<<<<< HEAD +#: cp/call.c:4894 +======= +#: cp/call.c:4890 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "converting to %qT from initializer list would use explicit constructor %qD" msgstr "" -#: cp/call.c:5062 +<<<<<<< HEAD +#: cp/call.c:5054 +======= +#: cp/call.c:5050 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot bind %qT lvalue to %qT" msgstr "" -#: cp/call.c:5065 +<<<<<<< HEAD +#: cp/call.c:5057 +======= +#: cp/call.c:5053 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " initializing argument %P of %q+D" msgstr "" -#: cp/call.c:5092 +<<<<<<< HEAD +#: cp/call.c:5084 +======= +#: cp/call.c:5080 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot bind bitfield %qE to %qT" msgstr "" -#: cp/call.c:5095 cp/call.c:5113 +<<<<<<< HEAD +#: cp/call.c:5087 cp/call.c:5105 +======= +#: cp/call.c:5083 cp/call.c:5101 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot bind packed field %qE to %qT" msgstr "" -#: cp/call.c:5098 +<<<<<<< HEAD +#: cp/call.c:5090 +======= +#: cp/call.c:5086 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot bind rvalue %qE to %qT" msgstr "" -#: cp/call.c:5217 +<<<<<<< HEAD +#: cp/call.c:5209 +======= +#: cp/call.c:5205 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot pass objects of non-trivially-copyable type %q#T through %<...%>" msgstr "" #. conditionally-supported behavior [expr.call] 5.2.2/7. -#: cp/call.c:5244 +<<<<<<< HEAD +#: cp/call.c:5236 +======= +#: cp/call.c:5232 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "cannot receive objects of non-trivially-copyable type %q#T through %<...%>; " msgstr "" -#: cp/call.c:5290 +<<<<<<< HEAD +#: cp/call.c:5282 +======= +#: cp/call.c:5278 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "the default argument for parameter %d of %qD has not yet been parsed" msgstr "" -#: cp/call.c:5300 +<<<<<<< HEAD +#: cp/call.c:5292 +======= +#: cp/call.c:5288 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "recursive evaluation of default argument for %q#D" msgstr "" -#: cp/call.c:5417 +<<<<<<< HEAD +#: cp/call.c:5409 +======= +#: cp/call.c:5405 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "argument of function call might be a candidate for a format attribute" msgstr "" -#: cp/call.c:5601 +<<<<<<< HEAD +#: cp/call.c:5593 +======= +#: cp/call.c:5589 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "passing %qT as % argument of %q#D discards qualifiers" msgstr "" -#: cp/call.c:5623 +<<<<<<< HEAD +#: cp/call.c:5615 +======= +#: cp/call.c:5611 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qT is not an accessible base of %qT" msgstr "" -#: cp/call.c:5675 +<<<<<<< HEAD +#: cp/call.c:5667 +======= +#: cp/call.c:5663 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "deducing %qT as %qT" msgstr "" -#: cp/call.c:5678 +<<<<<<< HEAD +#: cp/call.c:5670 +======= +#: cp/call.c:5666 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " in call to %q+D" msgstr "" -#: cp/call.c:5680 +<<<<<<< HEAD +#: cp/call.c:5672 +======= +#: cp/call.c:5668 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " (you can disable this with -fno-deduce-init-list)" msgstr "" -#: cp/call.c:5953 +<<<<<<< HEAD +#: cp/call.c:5965 +======= +#: cp/call.c:5961 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "could not find class$ field in java interface type %qT" msgstr "" -#: cp/call.c:6212 +<<<<<<< HEAD +#: cp/call.c:6224 +======= +#: cp/call.c:6220 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "call to non-function %qD" msgstr "" -#: cp/call.c:6257 cp/typeck.c:2537 +<<<<<<< HEAD +#: cp/call.c:6269 cp/typeck.c:2546 +======= +#: cp/call.c:6265 cp/typeck.c:2560 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot call constructor %<%T::%D%> directly" msgstr "" -#: cp/call.c:6259 +<<<<<<< HEAD +#: cp/call.c:6271 +======= +#: cp/call.c:6267 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " for a function-style cast, remove the redundant %<::%D%>" msgstr "" -#: cp/call.c:6381 +<<<<<<< HEAD +#: cp/call.c:6393 +======= +#: cp/call.c:6389 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no matching function for call to %<%T::%s(%A)%#V%>" msgstr "" -#: cp/call.c:6406 +<<<<<<< HEAD +#: cp/call.c:6418 +======= +#: cp/call.c:6414 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "call of overloaded %<%s(%A)%> is ambiguous" msgstr "" -#: cp/call.c:6435 +<<<<<<< HEAD +#: cp/call.c:6447 +======= +#: cp/call.c:6443 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot call member function %qD without object" msgstr "" -#: cp/call.c:7121 +<<<<<<< HEAD +#: cp/call.c:7133 +======= +#: cp/call.c:7129 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "passing %qT chooses %qT over %qT" msgstr "" -#: cp/call.c:7123 cp/name-lookup.c:5018 +<<<<<<< HEAD +#: cp/call.c:7135 cp/name-lookup.c:5019 +======= +#: cp/call.c:7131 cp/name-lookup.c:5019 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " in call to %qD" msgstr "" -#: cp/call.c:7180 +<<<<<<< HEAD +#: cp/call.c:7192 +======= +#: cp/call.c:7188 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "choosing %qD over %qD" msgstr "" -#: cp/call.c:7181 +<<<<<<< HEAD +#: cp/call.c:7193 +======= +#: cp/call.c:7189 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " for conversion from %qT to %qT" msgstr "" -#: cp/call.c:7184 +<<<<<<< HEAD +#: cp/call.c:7196 +======= +#: cp/call.c:7192 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " because conversion sequence for the argument is better" msgstr "" -#: cp/call.c:7302 +<<<<<<< HEAD +#: cp/call.c:7314 +======= +#: cp/call.c:7310 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default argument mismatch in overload resolution" msgstr "" -#: cp/call.c:7305 +<<<<<<< HEAD +#: cp/call.c:7317 +======= +#: cp/call.c:7313 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " candidate 1: %q+#F" msgstr "" -#: cp/call.c:7307 +<<<<<<< HEAD +#: cp/call.c:7319 +======= +#: cp/call.c:7315 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " candidate 2: %q+#F" msgstr "" -#: cp/call.c:7345 +<<<<<<< HEAD +#: cp/call.c:7357 +======= +#: cp/call.c:7353 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format 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:7498 +<<<<<<< HEAD +#: cp/call.c:7510 +======= +#: cp/call.c:7506 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "could not convert %qE to %qT" msgstr "" -#: cp/call.c:7716 +<<<<<<< HEAD +#: cp/call.c:7728 +======= +#: cp/call.c:7724 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "invalid initialization of non-const reference of type %qT from an rvalue of " "type %qT" msgstr "" -#: cp/call.c:7720 +<<<<<<< HEAD +#: cp/call.c:7732 +======= +#: cp/call.c:7728 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "invalid initialization of reference of type %qT from expression of type %qT" @@ -23518,7 +25423,7 @@ msgstr "" msgid " by %q+D" msgstr "" -#: cp/class.c:2549 cp/decl2.c:1292 +#: cp/class.c:2549 cp/decl2.c:1325 #, gcc-internal-format msgid "%q+#D invalid; an anonymous union can only have non-static data members" msgstr "" @@ -23529,7 +25434,7 @@ msgid "" "%q+#D invalid; an anonymous struct can only have non-static data members" msgstr "" -#: cp/class.c:2560 cp/decl2.c:1298 +#: cp/class.c:2560 cp/decl2.c:1331 #, gcc-internal-format msgid "private member %q+#D in anonymous union" msgstr "" @@ -23539,7 +25444,7 @@ msgstr "" msgid "private member %q+#D in anonymous struct" msgstr "" -#: cp/class.c:2567 cp/decl2.c:1300 +#: cp/class.c:2567 cp/decl2.c:1333 #, gcc-internal-format msgid "protected member %q+#D in anonymous union" msgstr "" @@ -23692,108 +25597,112 @@ msgid "" "body" msgstr "" -#: cp/class.c:4679 +#: cp/class.c:4681 #, gcc-internal-format msgid "" "offset of virtual base %qT is not ABI-compliant and may change in a future " "version of GCC" msgstr "" -#: cp/class.c:4780 +#: cp/class.c:4782 #, gcc-internal-format msgid "direct base %qT inaccessible in %qT due to ambiguity" msgstr "" -#: cp/class.c:4792 +#: cp/class.c:4794 #, gcc-internal-format msgid "virtual base %qT inaccessible in %qT due to ambiguity" msgstr "" -#: cp/class.c:4971 +#: cp/class.c:4973 #, gcc-internal-format msgid "" "size assigned to %qT may not be ABI-compliant and may change in a future " "version of GCC" msgstr "" -#: cp/class.c:5011 +#: cp/class.c:5013 #, gcc-internal-format msgid "" "the offset of %qD may not be ABI-compliant and may change in a future " "version of GCC" msgstr "" -#: cp/class.c:5039 +#: cp/class.c:5041 #, gcc-internal-format msgid "" "offset of %q+D is not ABI-compliant and may change in a future version of GCC" msgstr "" -#: cp/class.c:5048 +#: cp/class.c:5051 #, gcc-internal-format msgid "" "%q+D contains empty classes which may cause base classes to be placed at " "different locations in a future version of GCC" msgstr "" -#: cp/class.c:5136 +#: cp/class.c:5139 #, gcc-internal-format msgid "" "layout of classes derived from empty class %qT may change in a future " "version of GCC" msgstr "" -#: cp/class.c:5289 cp/parser.c:16349 +<<<<<<< HEAD +#: cp/class.c:5292 cp/parser.c:16363 +======= +#: cp/class.c:5292 cp/parser.c:16351 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redefinition of %q#T" msgstr "" -#: cp/class.c:5441 +#: cp/class.c:5444 #, gcc-internal-format msgid "%q#T has virtual functions and accessible non-virtual destructor" msgstr "" -#: cp/class.c:5546 +#: cp/class.c:5549 #, gcc-internal-format msgid "trying to finish struct, but kicked out due to previous parse errors" msgstr "" -#: cp/class.c:6010 +#: cp/class.c:6013 #, gcc-internal-format msgid "language string %<\"%E\"%> not recognized" msgstr "" -#: cp/class.c:6100 +#: cp/class.c:6103 #, gcc-internal-format msgid "cannot resolve overloaded function %qD based on conversion to type %qT" msgstr "" -#: cp/class.c:6224 +#: cp/class.c:6227 #, gcc-internal-format msgid "no matches converting function %qD to type %q#T" msgstr "" -#: cp/class.c:6254 +#: cp/class.c:6257 #, gcc-internal-format msgid "converting overloaded function %qD to type %q#T is ambiguous" msgstr "" -#: cp/class.c:6281 +#: cp/class.c:6284 #, gcc-internal-format msgid "assuming pointer to member %qD" msgstr "" -#: cp/class.c:6284 +#: cp/class.c:6287 #, gcc-internal-format msgid "(a pointer to member can only be formed with %<&%E%>)" msgstr "" -#: cp/class.c:6346 cp/class.c:6380 +#: cp/class.c:6349 cp/class.c:6383 #, gcc-internal-format msgid "not enough type information" msgstr "" -#: cp/class.c:6363 +#: cp/class.c:6366 #, gcc-internal-format msgid "argument of type %qT does not match %qT" msgstr "" @@ -23803,12 +25712,16 @@ 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:6665 cp/decl.c:1197 cp/name-lookup.c:525 +<<<<<<< HEAD +#: cp/class.c:6668 cp/decl.c:1196 cp/name-lookup.c:525 +======= +#: cp/class.c:6668 cp/decl.c:1197 cp/name-lookup.c:525 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %q#D" msgstr "" -#: cp/class.c:6666 +#: cp/class.c:6669 #, gcc-internal-format msgid "changes meaning of %qD from %q+#D" msgstr "" @@ -23818,230 +25731,258 @@ msgstr "" msgid "continue statement not within loop or switch" msgstr "" -#: cp/cp-gimplify.c:1192 +#: cp/cp-gimplify.c:1201 #, gcc-internal-format msgid "%qE implicitly determined as % has reference type" msgstr "" -#: cp/cvt.c:90 +#: cp/cvt.c:91 #, gcc-internal-format msgid "can't convert from incomplete type %qT to %qT" msgstr "" -#: cp/cvt.c:99 +#: cp/cvt.c:100 #, gcc-internal-format msgid "conversion of %qE from %qT to %qT is ambiguous" msgstr "" -#: cp/cvt.c:168 cp/cvt.c:193 cp/cvt.c:238 +#: cp/cvt.c:169 cp/cvt.c:194 cp/cvt.c:239 #, gcc-internal-format msgid "cannot convert %qE from type %qT to type %qT" msgstr "" -#: cp/cvt.c:452 +#: cp/cvt.c:371 +#, gcc-internal-format +msgid "initialization of volatile reference type %q#T from rvalue of type %qT" +msgstr "" + +#: cp/cvt.c:374 +#, gcc-internal-format +msgid "conversion to volatile reference type %q#T from rvalue of type %qT" +msgstr "" + +#: cp/cvt.c:377 +#, gcc-internal-format +msgid "initialization of non-const reference type %q#T from rvalue of type %qT" +msgstr "" + +#: cp/cvt.c:380 +#, gcc-internal-format +msgid "conversion to non-const reference type %q#T from rvalue of type %qT" +msgstr "" + +#: cp/cvt.c:453 #, gcc-internal-format msgid "conversion from %qT to %qT discards qualifiers" msgstr "" -#: cp/cvt.c:470 cp/typeck.c:5832 +<<<<<<< HEAD +#: cp/cvt.c:471 cp/typeck.c:5919 +======= +#: cp/cvt.c:471 cp/typeck.c:5933 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "casting %qT to %qT does not dereference pointer" msgstr "" -#: cp/cvt.c:498 +#: cp/cvt.c:499 #, gcc-internal-format msgid "cannot convert type %qT to type %qT" msgstr "" -#: cp/cvt.c:669 +#: cp/cvt.c:670 #, gcc-internal-format msgid "conversion from %q#T to %q#T" msgstr "" -#: cp/cvt.c:684 +#: cp/cvt.c:685 #, gcc-internal-format msgid "" "the result of the conversion is unspecified because %qE is outside the range " "of type %qT" msgstr "" -#: cp/cvt.c:695 cp/cvt.c:715 +#: cp/cvt.c:696 cp/cvt.c:716 #, gcc-internal-format msgid "%q#T used where a %qT was expected" msgstr "" -#: cp/cvt.c:730 +#: cp/cvt.c:731 #, gcc-internal-format msgid "%q#T used where a floating point value was expected" msgstr "" -#: cp/cvt.c:790 +#: cp/cvt.c:791 #, gcc-internal-format msgid "conversion from %qT to non-scalar type %qT requested" msgstr "" -#: cp/cvt.c:829 +#: cp/cvt.c:830 #, gcc-internal-format msgid "pseudo-destructor is not called" msgstr "" -#: cp/cvt.c:892 +#: cp/cvt.c:893 #, gcc-internal-format msgid "object of incomplete type %qT will not be accessed in %s" msgstr "" -#: cp/cvt.c:900 +#: cp/cvt.c:901 #, gcc-internal-format msgid "object of type %qT will not be accessed in %s" msgstr "" -#: cp/cvt.c:931 +#: cp/cvt.c:932 #, gcc-internal-format msgid "object %qE of incomplete type %qT will not be accessed in %s" msgstr "" -#: cp/cvt.c:971 +#: cp/cvt.c:972 #, gcc-internal-format msgid "%s cannot resolve address of overloaded function" msgstr "" -#: cp/cvt.c:981 +#: cp/cvt.c:982 #, gcc-internal-format msgid "%s is a reference, not call, to function %qE" msgstr "" -#: cp/cvt.c:999 +#: cp/cvt.c:1000 #, gcc-internal-format msgid "%s has no effect" msgstr "" -#: cp/cvt.c:1143 +#: cp/cvt.c:1145 #, gcc-internal-format msgid "converting NULL to non-pointer type" msgstr "" -#: cp/cvt.c:1255 +#: cp/cvt.c:1259 #, gcc-internal-format msgid "ambiguous default type conversion from %qT" msgstr "" -#: cp/cvt.c:1257 +#: cp/cvt.c:1261 #, gcc-internal-format msgid " candidate conversions include %qD and %qD" msgstr "" -#: cp/decl.c:1059 +#: cp/decl.c:1058 #, gcc-internal-format msgid "%qD was declared % and later %" msgstr "" -#: cp/decl.c:1060 cp/decl.c:1610 objc/objc-act.c:2983 objc/objc-act.c:7599 +<<<<<<< HEAD +#: cp/decl.c:1059 cp/decl.c:1609 objc/objc-act.c:2986 objc/objc-act.c:7602 +======= +#: cp/decl.c:1060 cp/decl.c:1610 objc/objc-act.c:2986 objc/objc-act.c:7602 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "previous declaration of %q+D" msgstr "" -#: cp/decl.c:1093 +#: cp/decl.c:1092 #, gcc-internal-format msgid "declaration of %qF throws different exceptions" msgstr "" -#: cp/decl.c:1094 +#: cp/decl.c:1093 #, gcc-internal-format msgid "from previous declaration %q+F" msgstr "" -#: cp/decl.c:1150 +#: cp/decl.c:1149 #, gcc-internal-format msgid "function %q+D redeclared as inline" msgstr "" -#: cp/decl.c:1152 +#: cp/decl.c:1151 #, gcc-internal-format msgid "previous declaration of %q+D with attribute noinline" msgstr "" -#: cp/decl.c:1159 +#: cp/decl.c:1158 #, gcc-internal-format msgid "function %q+D redeclared with attribute noinline" msgstr "" -#: cp/decl.c:1161 +#: cp/decl.c:1160 #, gcc-internal-format msgid "previous declaration of %q+D was inline" msgstr "" -#: cp/decl.c:1185 cp/decl.c:1259 +#: cp/decl.c:1184 cp/decl.c:1258 #, gcc-internal-format msgid "shadowing built-in function %q#D" msgstr "" -#: cp/decl.c:1186 cp/decl.c:1260 +#: cp/decl.c:1185 cp/decl.c:1259 #, gcc-internal-format msgid "shadowing library function %q#D" msgstr "" -#: cp/decl.c:1193 +#: cp/decl.c:1192 #, gcc-internal-format msgid "library function %q#D redeclared as non-function %q#D" msgstr "" -#: cp/decl.c:1198 +#: cp/decl.c:1197 #, gcc-internal-format msgid "conflicts with built-in declaration %q#D" msgstr "" -#: cp/decl.c:1252 cp/decl.c:1379 cp/decl.c:1395 +#: cp/decl.c:1251 cp/decl.c:1378 cp/decl.c:1394 #, gcc-internal-format msgid "new declaration %q#D" msgstr "" -#: cp/decl.c:1253 +#: cp/decl.c:1252 #, gcc-internal-format msgid "ambiguates built-in declaration %q#D" msgstr "" -#: cp/decl.c:1343 +#: cp/decl.c:1342 #, gcc-internal-format msgid "%q#D redeclared as different kind of symbol" msgstr "" -#: cp/decl.c:1346 +#: cp/decl.c:1345 #, gcc-internal-format msgid "previous declaration of %q+#D" msgstr "" -#: cp/decl.c:1365 +#: cp/decl.c:1364 #, gcc-internal-format msgid "declaration of template %q#D" msgstr "" -#: cp/decl.c:1366 cp/name-lookup.c:526 cp/name-lookup.c:812 +#: cp/decl.c:1365 cp/name-lookup.c:526 cp/name-lookup.c:812 #: cp/name-lookup.c:823 #, gcc-internal-format msgid "conflicts with previous declaration %q+#D" msgstr "" -#: cp/decl.c:1380 cp/decl.c:1396 +#: cp/decl.c:1379 cp/decl.c:1395 #, gcc-internal-format msgid "ambiguates old declaration %q+#D" msgstr "" -#: cp/decl.c:1388 +#: cp/decl.c:1387 #, gcc-internal-format msgid "declaration of C function %q#D conflicts with" msgstr "" -#: cp/decl.c:1390 +#: cp/decl.c:1389 #, gcc-internal-format msgid "previous declaration %q+#D here" msgstr "" -#: cp/decl.c:1404 +#: cp/decl.c:1403 #, gcc-internal-format msgid "conflicting declaration %q#D" msgstr "" -#: cp/decl.c:1405 +#: cp/decl.c:1404 #, gcc-internal-format msgid "%q+D has a previous declaration as %q#D" msgstr "" @@ -24053,63 +25994,63 @@ msgstr "" #. A namespace-name defined at global scope shall not be #. declared as the name of any other entity in any global scope #. of the program. -#: cp/decl.c:1457 +#: cp/decl.c:1456 #, gcc-internal-format msgid "declaration of namespace %qD conflicts with" msgstr "" -#: cp/decl.c:1458 +#: cp/decl.c:1457 #, gcc-internal-format msgid "previous declaration of namespace %q+D here" msgstr "" -#: cp/decl.c:1469 +#: cp/decl.c:1468 #, gcc-internal-format msgid "%q+#D previously defined here" msgstr "" #. Prototype decl follows defn w/o prototype. -#: cp/decl.c:1479 +#: cp/decl.c:1478 #, gcc-internal-format msgid "prototype for %q+#D" msgstr "" -#: cp/decl.c:1481 +#: cp/decl.c:1480 #, gcc-internal-format msgid "follows non-prototype definition here" msgstr "" -#: cp/decl.c:1521 +#: cp/decl.c:1520 #, gcc-internal-format msgid "previous declaration of %q+#D with %qL linkage" msgstr "" -#: cp/decl.c:1523 +#: cp/decl.c:1522 #, gcc-internal-format msgid "conflicts with new declaration with %qL linkage" msgstr "" -#: cp/decl.c:1546 cp/decl.c:1552 +#: cp/decl.c:1545 cp/decl.c:1551 #, gcc-internal-format msgid "default argument given for parameter %d of %q#D" msgstr "" -#: cp/decl.c:1548 cp/decl.c:1554 +#: cp/decl.c:1547 cp/decl.c:1553 #, gcc-internal-format msgid "after previous specification in %q+#D" msgstr "" -#: cp/decl.c:1609 +#: cp/decl.c:1608 #, gcc-internal-format msgid "redundant redeclaration of %qD in same scope" msgstr "" -#: cp/decl.c:1615 +#: cp/decl.c:1614 #, gcc-internal-format msgid "deleted definition of %qD" msgstr "" -#: cp/decl.c:1616 +#: cp/decl.c:1615 #, gcc-internal-format msgid "after previous declaration %q+D" msgstr "" @@ -24122,43 +26063,63 @@ msgstr "" #. that specialization that would cause an implicit #. instantiation to take place, in every translation unit in #. which such a use occurs. -#: cp/decl.c:1967 +#: cp/decl.c:1966 #, gcc-internal-format msgid "explicit specialization of %qD after first use" msgstr "" -#: cp/decl.c:2064 +#: cp/decl.c:2063 #, gcc-internal-format msgid "%q+D: visibility attribute ignored because it" msgstr "" -#: cp/decl.c:2066 +#: cp/decl.c:2065 #, gcc-internal-format msgid "conflicts with previous declaration here" msgstr "" #. Reject two definitions. -#: cp/decl.c:2213 cp/decl.c:2242 cp/decl.c:2271 cp/decl.c:2288 cp/decl.c:2360 +<<<<<<< HEAD +#: cp/decl.c:2216 cp/decl.c:2245 cp/decl.c:2274 cp/decl.c:2291 cp/decl.c:2363 +======= +#: cp/decl.c:2217 cp/decl.c:2246 cp/decl.c:2275 cp/decl.c:2292 cp/decl.c:2364 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redefinition of %q#D" msgstr "" -#: cp/decl.c:2229 +<<<<<<< HEAD +#: cp/decl.c:2232 +======= +#: cp/decl.c:2233 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD conflicts with used function" msgstr "" -#: cp/decl.c:2239 +<<<<<<< HEAD +#: cp/decl.c:2242 +======= +#: cp/decl.c:2243 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q#D not declared in class" msgstr "" -#: cp/decl.c:2253 cp/decl.c:2298 +<<<<<<< HEAD +#: cp/decl.c:2256 cp/decl.c:2301 +======= +#: cp/decl.c:2257 cp/decl.c:2302 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D redeclared inline with % attribute" msgstr "" -#: cp/decl.c:2256 cp/decl.c:2301 +<<<<<<< HEAD +#: cp/decl.c:2259 cp/decl.c:2304 +======= +#: cp/decl.c:2260 cp/decl.c:2305 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D redeclared inline without % attribute" msgstr "" @@ -24166,334 +26127,594 @@ msgstr "" #. is_primary= #. is_partial= #. is_friend_decl= -#: cp/decl.c:2317 +<<<<<<< HEAD +#: cp/decl.c:2320 +======= +#: cp/decl.c:2321 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redeclaration of friend %q#D may not have default template arguments" msgstr "" -#: cp/decl.c:2331 +<<<<<<< HEAD +#: cp/decl.c:2334 +======= +#: cp/decl.c:2335 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "thread-local declaration of %q#D follows non-thread-local declaration" msgstr "" -#: cp/decl.c:2334 +<<<<<<< HEAD +#: cp/decl.c:2337 +======= +#: cp/decl.c:2338 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-thread-local declaration of %q#D follows thread-local declaration" msgstr "" -#: cp/decl.c:2349 cp/decl.c:2368 +<<<<<<< HEAD +#: cp/decl.c:2352 cp/decl.c:2371 +======= +#: cp/decl.c:2353 cp/decl.c:2372 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redeclaration of %q#D" msgstr "" -#: cp/decl.c:2511 +<<<<<<< HEAD +#: cp/decl.c:2514 +======= +#: cp/decl.c:2515 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "jump to label %qD" msgstr "" -#: cp/decl.c:2513 +<<<<<<< HEAD +#: cp/decl.c:2516 +======= +#: cp/decl.c:2517 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "jump to case label" msgstr "" -#: cp/decl.c:2515 cp/decl.c:2655 cp/decl.c:2696 +<<<<<<< HEAD +#: cp/decl.c:2518 cp/decl.c:2658 cp/decl.c:2699 +======= +#: cp/decl.c:2519 cp/decl.c:2659 cp/decl.c:2700 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " from here" msgstr "" -#: cp/decl.c:2534 cp/decl.c:2699 +<<<<<<< HEAD +#: cp/decl.c:2537 cp/decl.c:2702 +======= +#: cp/decl.c:2538 cp/decl.c:2703 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " exits OpenMP structured block" msgstr "" -#: cp/decl.c:2555 +<<<<<<< HEAD +#: cp/decl.c:2558 +======= +#: cp/decl.c:2559 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " crosses initialization of %q+#D" msgstr "" -#: cp/decl.c:2557 cp/decl.c:2673 +<<<<<<< HEAD +#: cp/decl.c:2560 cp/decl.c:2676 +======= +#: cp/decl.c:2561 cp/decl.c:2677 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " enters scope of %q+#D which has non-trivial destructor" msgstr "" -#: cp/decl.c:2571 cp/decl.c:2678 +<<<<<<< HEAD +#: cp/decl.c:2574 cp/decl.c:2681 +======= +#: cp/decl.c:2575 cp/decl.c:2682 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " enters try block" msgstr "" #. Can't skip init of __exception_info. -#: cp/decl.c:2573 cp/decl.c:2667 cp/decl.c:2680 +<<<<<<< HEAD +#: cp/decl.c:2576 cp/decl.c:2670 cp/decl.c:2683 +======= +#: cp/decl.c:2577 cp/decl.c:2671 cp/decl.c:2684 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " enters catch block" msgstr "" -#: cp/decl.c:2583 cp/decl.c:2683 +<<<<<<< HEAD +#: cp/decl.c:2586 cp/decl.c:2686 +======= +#: cp/decl.c:2587 cp/decl.c:2687 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " enters OpenMP structured block" msgstr "" -#: cp/decl.c:2654 cp/decl.c:2695 +<<<<<<< HEAD +#: cp/decl.c:2657 cp/decl.c:2698 +======= +#: cp/decl.c:2658 cp/decl.c:2699 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "jump to label %q+D" msgstr "" -#: cp/decl.c:2671 +<<<<<<< HEAD +#: cp/decl.c:2674 +======= +#: cp/decl.c:2675 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " skips initialization of %q+#D" msgstr "" -#: cp/decl.c:2748 +<<<<<<< HEAD +#: cp/decl.c:2751 +======= +#: cp/decl.c:2752 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "label named wchar_t" msgstr "" -#: cp/decl.c:3019 +<<<<<<< HEAD +#: cp/decl.c:3022 +======= +#: cp/decl.c:3023 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is not a type" msgstr "" -#: cp/decl.c:3025 cp/parser.c:4238 +<<<<<<< HEAD +#: cp/decl.c:3028 cp/parser.c:4240 +======= +#: cp/decl.c:3029 cp/parser.c:4240 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD used without template parameters" msgstr "" -#: cp/decl.c:3034 +<<<<<<< HEAD +#: cp/decl.c:3037 +======= +#: cp/decl.c:3038 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q#T is not a class" msgstr "" -#: cp/decl.c:3058 cp/decl.c:3145 +<<<<<<< HEAD +#: cp/decl.c:3061 cp/decl.c:3148 +======= +#: cp/decl.c:3062 cp/decl.c:3149 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no class template named %q#T in %q#T" msgstr "" -#: cp/decl.c:3071 +<<<<<<< HEAD +#: cp/decl.c:3074 +======= +#: cp/decl.c:3075 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "lookup of %qT in %qT is ambiguous" msgstr "" -#: cp/decl.c:3080 +<<<<<<< HEAD +#: cp/decl.c:3083 +======= +#: cp/decl.c:3084 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% names %q#T, which is not a class template" msgstr "" -#: cp/decl.c:3087 +<<<<<<< HEAD +#: cp/decl.c:3090 +======= +#: cp/decl.c:3091 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% names %q#T, which is not a type" msgstr "" -#: cp/decl.c:3154 +<<<<<<< HEAD +#: cp/decl.c:3157 +======= +#: cp/decl.c:3158 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template parameters do not match template" msgstr "" -#: cp/decl.c:3155 cp/friend.c:321 cp/friend.c:329 +<<<<<<< HEAD +#: cp/decl.c:3158 cp/friend.c:321 cp/friend.c:329 +======= +#: cp/decl.c:3159 cp/friend.c:321 cp/friend.c:329 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D declared here" msgstr "" -#: cp/decl.c:3837 +<<<<<<< HEAD +#: cp/decl.c:3840 +======= +#: cp/decl.c:3841 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "an anonymous struct cannot have function members" msgstr "" -#: cp/decl.c:3840 +<<<<<<< HEAD +#: cp/decl.c:3843 +======= +#: cp/decl.c:3844 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "an anonymous union cannot have function members" msgstr "" -#: cp/decl.c:3858 +<<<<<<< HEAD +#: cp/decl.c:3861 +======= +#: cp/decl.c:3862 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "member %q+#D with constructor not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:3861 +<<<<<<< HEAD +#: cp/decl.c:3864 +======= +#: cp/decl.c:3865 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "member %q+#D with destructor not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:3864 +<<<<<<< HEAD +#: cp/decl.c:3867 +======= +#: cp/decl.c:3868 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "member %q+#D with copy assignment operator not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:3889 +<<<<<<< HEAD +#: cp/decl.c:3892 +======= +#: cp/decl.c:3893 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "multiple types in one declaration" msgstr "" -#: cp/decl.c:3893 +<<<<<<< HEAD +#: cp/decl.c:3896 +======= +#: cp/decl.c:3897 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redeclaration of C++ built-in type %qT" msgstr "" -#: cp/decl.c:3930 +<<<<<<< HEAD +#: cp/decl.c:3933 +======= +#: cp/decl.c:3934 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "missing type-name in typedef-declaration" msgstr "" -#: cp/decl.c:3937 +<<<<<<< HEAD +#: cp/decl.c:3940 +======= +#: cp/decl.c:3941 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ prohibits anonymous structs" msgstr "" -#: cp/decl.c:3944 +<<<<<<< HEAD +#: cp/decl.c:3947 +======= +#: cp/decl.c:3948 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs can only be specified for functions" msgstr "" -#: cp/decl.c:3950 +<<<<<<< HEAD +#: cp/decl.c:3953 +======= +#: cp/decl.c:3954 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% can only be specified inside a class" msgstr "" -#: cp/decl.c:3952 +<<<<<<< HEAD +#: cp/decl.c:3955 +======= +#: cp/decl.c:3956 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% can only be specified for constructors" msgstr "" -#: cp/decl.c:3954 +<<<<<<< HEAD +#: cp/decl.c:3957 +======= +#: cp/decl.c:3958 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "a storage class can only be specified for objects and functions" msgstr "" -#: cp/decl.c:3960 +<<<<<<< HEAD +#: cp/decl.c:3963 +======= +#: cp/decl.c:3964 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "qualifiers can only be specified for objects and functions" msgstr "" -#: cp/decl.c:3963 +<<<<<<< HEAD +#: cp/decl.c:3966 +======= +#: cp/decl.c:3967 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% was ignored in this declaration" msgstr "" -#: cp/decl.c:3965 +<<<<<<< HEAD +#: cp/decl.c:3968 +======= +#: cp/decl.c:3969 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% cannot be used for type declarations" msgstr "" -#: cp/decl.c:3994 +<<<<<<< HEAD +#: cp/decl.c:3997 +======= +#: cp/decl.c:3998 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attribute ignored in declaration of %q+#T" msgstr "" -#: cp/decl.c:3995 +<<<<<<< HEAD +#: cp/decl.c:3998 +======= +#: cp/decl.c:3999 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attribute for %q+#T must follow the %qs keyword" msgstr "" -#: cp/decl.c:4040 +<<<<<<< HEAD +#: cp/decl.c:4043 +======= +#: cp/decl.c:4044 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ignoring attributes applied to class type %qT outside of definition" msgstr "" #. A template type parameter or other dependent type. -#: cp/decl.c:4044 +<<<<<<< HEAD +#: cp/decl.c:4047 +======= +#: cp/decl.c:4048 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "ignoring attributes applied to dependent type %qT without an associated " "declaration" msgstr "" -#: cp/decl.c:4117 cp/decl2.c:792 +<<<<<<< HEAD +#: cp/decl.c:4120 cp/decl2.c:820 +======= +#: cp/decl.c:4121 cp/decl2.c:820 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "typedef %qD is initialized (use decltype instead)" msgstr "" -#: cp/decl.c:4135 +<<<<<<< HEAD +#: cp/decl.c:4138 +======= +#: cp/decl.c:4139 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %q#D has % and is initialized" msgstr "" -#: cp/decl.c:4160 +<<<<<<< HEAD +#: cp/decl.c:4163 +======= +#: cp/decl.c:4164 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "definition of %q#D is marked %" msgstr "" -#: cp/decl.c:4179 +<<<<<<< HEAD +#: cp/decl.c:4182 +======= +#: cp/decl.c:4183 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q#D is not a static member of %q#T" msgstr "" -#: cp/decl.c:4185 +<<<<<<< HEAD +#: cp/decl.c:4188 +======= +#: cp/decl.c:4189 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ does not permit %<%T::%D%> to be defined as %<%T::%D%>" msgstr "" -#: cp/decl.c:4194 +<<<<<<< HEAD +#: cp/decl.c:4197 +======= +#: cp/decl.c:4198 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "template header not allowed in member definition of explicitly specialized " "class" msgstr "" -#: cp/decl.c:4202 +<<<<<<< HEAD +#: cp/decl.c:4205 +======= +#: cp/decl.c:4206 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate initialization of %qD" msgstr "" -#: cp/decl.c:4207 +<<<<<<< HEAD +#: cp/decl.c:4210 +======= +#: cp/decl.c:4211 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD declared % outside its class" msgstr "" -#: cp/decl.c:4244 +<<<<<<< HEAD +#: cp/decl.c:4247 +======= +#: cp/decl.c:4248 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %q#D outside of class is not definition" msgstr "" -#: cp/decl.c:4342 +<<<<<<< HEAD +#: cp/decl.c:4345 +======= +#: cp/decl.c:4346 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable %q#D has initializer but incomplete type" msgstr "" -#: cp/decl.c:4348 cp/decl.c:5099 +<<<<<<< HEAD +#: cp/decl.c:4351 cp/decl.c:5102 +======= +#: cp/decl.c:4352 cp/decl.c:5103 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "elements of array %q#D have incomplete type" msgstr "" -#: cp/decl.c:4355 cp/decl.c:5595 +<<<<<<< HEAD +#: cp/decl.c:4358 cp/decl.c:5598 +======= +#: cp/decl.c:4359 cp/decl.c:5599 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %q#D has no initializer" msgstr "" -#: cp/decl.c:4357 +<<<<<<< HEAD +#: cp/decl.c:4360 +======= +#: cp/decl.c:4361 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "aggregate %q#D has incomplete type and cannot be defined" msgstr "" -#: cp/decl.c:4393 +<<<<<<< HEAD +#: cp/decl.c:4396 +======= +#: cp/decl.c:4397 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD declared as reference but not initialized" msgstr "" -#: cp/decl.c:4418 +<<<<<<< HEAD +#: cp/decl.c:4421 +======= +#: cp/decl.c:4422 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot initialize %qT from %qT" msgstr "" -#: cp/decl.c:4482 +<<<<<<< HEAD +#: cp/decl.c:4485 +======= +#: cp/decl.c:4486 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "name used in a GNU-style designated initializer for an array" msgstr "" -#: cp/decl.c:4487 +<<<<<<< HEAD +#: cp/decl.c:4490 +======= +#: cp/decl.c:4491 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "name %qD used in a GNU-style designated initializer for an array" msgstr "" -#: cp/decl.c:4537 +<<<<<<< HEAD +#: cp/decl.c:4540 +======= +#: cp/decl.c:4541 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "initializer fails to determine size of %qD" msgstr "" -#: cp/decl.c:4544 +<<<<<<< HEAD +#: cp/decl.c:4547 +======= +#: cp/decl.c:4548 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array size missing in %qD" msgstr "" -#: cp/decl.c:4556 +<<<<<<< HEAD +#: cp/decl.c:4559 +======= +#: cp/decl.c:4560 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "zero-size array %qD" msgstr "" @@ -24501,274 +26722,482 @@ 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:4599 +<<<<<<< HEAD +#: cp/decl.c:4602 +======= +#: cp/decl.c:4603 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage size of %qD isn't known" msgstr "" -#: cp/decl.c:4622 +<<<<<<< HEAD +#: cp/decl.c:4625 +======= +#: cp/decl.c:4626 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage size of %qD isn't constant" msgstr "" -#: cp/decl.c:4668 +<<<<<<< HEAD +#: cp/decl.c:4671 +======= +#: cp/decl.c:4672 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "sorry: semantics of inline function static data %q+#D are wrong (you'll wind " "up with multiple copies)" msgstr "" -#: cp/decl.c:4672 +<<<<<<< HEAD +#: cp/decl.c:4675 +======= +#: cp/decl.c:4676 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " you can work around this by removing the initializer" msgstr "" -#: cp/decl.c:4692 +<<<<<<< HEAD +#: cp/decl.c:4695 +======= +#: cp/decl.c:4696 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "missing initializer for constexpr %qD" msgstr "" -#: cp/decl.c:4702 +<<<<<<< HEAD +#: cp/decl.c:4705 +======= +#: cp/decl.c:4706 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "uninitialized const %qD" msgstr "" -#: cp/decl.c:4814 +<<<<<<< HEAD +#: cp/decl.c:4817 +======= +#: cp/decl.c:4818 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid type %qT as initializer for a vector of type %qT" msgstr "" -#: cp/decl.c:4856 +<<<<<<< HEAD +#: cp/decl.c:4859 +======= +#: cp/decl.c:4860 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "initializer for %qT must be brace-enclosed" msgstr "" -#: cp/decl.c:4874 +<<<<<<< HEAD +#: cp/decl.c:4877 +======= +#: cp/decl.c:4878 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qT has no non-static data member named %qD" msgstr "" -#: cp/decl.c:4933 +<<<<<<< HEAD +#: cp/decl.c:4936 +======= +#: cp/decl.c:4937 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "braces around scalar initializer for type %qT" msgstr "" -#: cp/decl.c:5024 +<<<<<<< HEAD +#: cp/decl.c:5027 +======= +#: cp/decl.c:5028 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "missing braces around initializer for %qT" msgstr "" -#: cp/decl.c:5081 cp/typeck2.c:1017 cp/typeck2.c:1192 cp/typeck2.c:1215 -#: cp/typeck2.c:1258 +<<<<<<< HEAD +#: cp/decl.c:5084 cp/typeck2.c:1019 cp/typeck2.c:1194 cp/typeck2.c:1217 +======= +#: cp/decl.c:5085 cp/typeck2.c:1019 cp/typeck2.c:1194 cp/typeck2.c:1217 +>>>>>>> * gcc.pot: Regenerate. +#: cp/typeck2.c:1260 #, gcc-internal-format msgid "too many initializers for %qT" msgstr "" -#: cp/decl.c:5101 +<<<<<<< HEAD +#: cp/decl.c:5104 +======= +#: cp/decl.c:5105 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "elements of array %q#T have incomplete type" msgstr "" -#: cp/decl.c:5110 +<<<<<<< HEAD +#: cp/decl.c:5113 +======= +#: cp/decl.c:5114 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable-sized object %qD may not be initialized" msgstr "" -#: cp/decl.c:5112 +<<<<<<< HEAD +#: cp/decl.c:5115 +======= +#: cp/decl.c:5116 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable-sized compound literal" msgstr "" -#: cp/decl.c:5166 +<<<<<<< HEAD +#: cp/decl.c:5169 +======= +#: cp/decl.c:5170 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD has incomplete type" msgstr "" -#: cp/decl.c:5186 +<<<<<<< HEAD +#: cp/decl.c:5189 +======= +#: cp/decl.c:5190 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "scalar object %qD requires one element in initializer" msgstr "" -#: cp/decl.c:5217 +<<<<<<< HEAD +#: cp/decl.c:5220 +======= +#: cp/decl.c:5221 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "in C++98 %qD must be initialized by constructor, not by %<{...}%>" msgstr "" -#: cp/decl.c:5249 +<<<<<<< HEAD +#: cp/decl.c:5252 +======= +#: cp/decl.c:5253 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array %qD initialized by parenthesized string literal %qE" msgstr "" -#: cp/decl.c:5263 +<<<<<<< HEAD +#: cp/decl.c:5266 +======= +#: cp/decl.c:5267 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "structure %qD with uninitialized const members" msgstr "" -#: cp/decl.c:5265 +<<<<<<< HEAD +#: cp/decl.c:5268 +======= +#: cp/decl.c:5269 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "structure %qD with uninitialized reference members" msgstr "" -#: cp/decl.c:5562 +<<<<<<< HEAD +#: cp/decl.c:5565 +======= +#: cp/decl.c:5566 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "assignment (not initialization) in declaration" msgstr "" -#: cp/decl.c:5703 +<<<<<<< HEAD +#: cp/decl.c:5706 +======= +#: cp/decl.c:5707 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "shadowing previous type declaration of %q#D" msgstr "" -#: cp/decl.c:5735 +<<<<<<< HEAD +#: cp/decl.c:5738 +======= +#: cp/decl.c:5739 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD cannot be thread-local because it has non-trivial type %qT" msgstr "" -#: cp/decl.c:5778 +<<<<<<< HEAD +#: cp/decl.c:5781 +======= +#: cp/decl.c:5782 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Java object %qD not allocated with %" msgstr "" -#: cp/decl.c:5795 +<<<<<<< HEAD +#: cp/decl.c:5798 +======= +#: cp/decl.c:5799 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is thread-local and so cannot be dynamically initialized" msgstr "" -#: cp/decl.c:5813 +<<<<<<< HEAD +#: cp/decl.c:5816 +======= +#: cp/decl.c:5817 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%qD cannot be initialized by a non-constant expression when being declared" msgstr "" -#: cp/decl.c:5862 +<<<<<<< HEAD +#: cp/decl.c:5865 +======= +#: cp/decl.c:5866 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-static data member %qD has Java class type" msgstr "" -#: cp/decl.c:5926 +<<<<<<< HEAD +#: cp/decl.c:5929 +======= +#: cp/decl.c:5930 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function %q#D is initialized like a variable" msgstr "" -#: cp/decl.c:6506 +<<<<<<< HEAD +#: cp/decl.c:6509 +======= +#: cp/decl.c:6510 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "destructor for alien class %qT cannot be a member" msgstr "" -#: cp/decl.c:6508 +<<<<<<< HEAD +#: cp/decl.c:6511 +======= +#: cp/decl.c:6512 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "constructor for alien class %qT cannot be a member" msgstr "" -#: cp/decl.c:6529 +<<<<<<< HEAD +#: cp/decl.c:6532 +======= +#: cp/decl.c:6533 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD declared as a % %s" msgstr "" -#: cp/decl.c:6531 +<<<<<<< HEAD +#: cp/decl.c:6534 +======= +#: cp/decl.c:6535 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD declared as an % %s" msgstr "" -#: cp/decl.c:6533 +<<<<<<< HEAD +#: cp/decl.c:6536 +======= +#: cp/decl.c:6537 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "% and % function specifiers on %qD invalid in %s " "declaration" msgstr "" -#: cp/decl.c:6537 +<<<<<<< HEAD +#: cp/decl.c:6540 +======= +#: cp/decl.c:6541 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D declared as a friend" msgstr "" -#: cp/decl.c:6543 +<<<<<<< HEAD +#: cp/decl.c:6546 +======= +#: cp/decl.c:6547 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D declared with an exception specification" msgstr "" -#: cp/decl.c:6577 +<<<<<<< HEAD +#: cp/decl.c:6580 +======= +#: cp/decl.c:6581 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "definition of %qD is not in namespace enclosing %qT" msgstr "" -#: cp/decl.c:6698 +<<<<<<< HEAD +#: cp/decl.c:6701 +======= +#: cp/decl.c:6702 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "defining explicit specialization %qD in friend declaration" msgstr "" #. Something like `template friend void f()'. -#: cp/decl.c:6708 +<<<<<<< HEAD +#: cp/decl.c:6711 +======= +#: cp/decl.c:6712 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of template-id %qD in declaration of primary template" msgstr "" -#: cp/decl.c:6738 +<<<<<<< HEAD +#: cp/decl.c:6741 +======= +#: cp/decl.c:6742 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "default arguments are not allowed in declaration of friend template " "specialization %qD" msgstr "" -#: cp/decl.c:6746 +<<<<<<< HEAD +#: cp/decl.c:6749 +======= +#: cp/decl.c:6750 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "% is not allowed in declaration of friend template specialization %" "qD" msgstr "" -#: cp/decl.c:6789 +<<<<<<< HEAD +#: cp/decl.c:6792 +======= +#: cp/decl.c:6793 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare %<::main%> to be a template" msgstr "" -#: cp/decl.c:6791 +<<<<<<< HEAD +#: cp/decl.c:6794 +======= +#: cp/decl.c:6795 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare %<::main%> to be inline" msgstr "" -#: cp/decl.c:6793 +<<<<<<< HEAD +#: cp/decl.c:6796 +======= +#: cp/decl.c:6797 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare %<::main%> to be static" msgstr "" -#: cp/decl.c:6821 +<<<<<<< HEAD +#: cp/decl.c:6824 +======= +#: cp/decl.c:6825 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-local function %q#D uses anonymous type" msgstr "" -#: cp/decl.c:6824 cp/decl.c:7107 cp/decl2.c:3445 +<<<<<<< HEAD +#: cp/decl.c:6827 cp/decl.c:7110 cp/decl2.c:3480 +======= +#: cp/decl.c:6828 cp/decl.c:7111 cp/decl2.c:3480 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%q+#D does not refer to the unqualified type, so it is not used for linkage" msgstr "" -#: cp/decl.c:6830 +<<<<<<< HEAD +#: cp/decl.c:6833 +======= +#: cp/decl.c:6834 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-local function %q#D uses local type %qT" msgstr "" -#: cp/decl.c:6849 +<<<<<<< HEAD +#: cp/decl.c:6852 +======= +#: cp/decl.c:6853 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "static member function %qD cannot have cv-qualifier" msgstr "" -#: cp/decl.c:6850 +<<<<<<< HEAD +#: cp/decl.c:6853 +======= +#: cp/decl.c:6854 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-member function %qD cannot have cv-qualifier" msgstr "" -#: cp/decl.c:6895 +<<<<<<< HEAD +#: cp/decl.c:6898 +======= +#: cp/decl.c:6899 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<::main%> must return %" msgstr "" -#: cp/decl.c:6935 +<<<<<<< HEAD +#: cp/decl.c:6938 +======= +#: cp/decl.c:6939 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "definition of implicitly-declared %qD" msgstr "" -#: cp/decl.c:6952 cp/decl2.c:702 +<<<<<<< HEAD +#: cp/decl.c:6955 cp/decl2.c:730 +======= +#: cp/decl.c:6956 cp/decl2.c:730 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no %q#D member function declared in class %qT" msgstr "" @@ -24777,686 +27206,1218 @@ msgstr "" #. no linkage can only be used to declare extern "C" #. entities. Since it's not always an error in the #. ISO C++ 90 Standard, we only issue a warning. -#: cp/decl.c:7104 +<<<<<<< HEAD +#: cp/decl.c:7107 +======= +#: cp/decl.c:7108 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-local variable %q#D uses anonymous type" msgstr "" -#: cp/decl.c:7113 +<<<<<<< HEAD +#: cp/decl.c:7116 +======= +#: cp/decl.c:7117 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-local variable %q#D uses local type %qT" msgstr "" -#: cp/decl.c:7234 +<<<<<<< HEAD +#: cp/decl.c:7237 +======= +#: cp/decl.c:7238 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "invalid in-class initialization of static data member of non-integral type %" "qT" msgstr "" -#: cp/decl.c:7244 +<<<<<<< HEAD +#: cp/decl.c:7247 +======= +#: cp/decl.c:7248 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids in-class initialization of non-const static member %qD" msgstr "" -#: cp/decl.c:7248 +<<<<<<< HEAD +#: cp/decl.c:7251 +======= +#: cp/decl.c:7252 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "ISO C++ forbids initialization of member constant %qD of non-integral type %" "qT" msgstr "" -#: cp/decl.c:7273 +<<<<<<< HEAD +#: cp/decl.c:7276 +======= +#: cp/decl.c:7277 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array %qD has non-integral type %qT" msgstr "" -#: cp/decl.c:7275 +<<<<<<< HEAD +#: cp/decl.c:7278 +======= +#: cp/decl.c:7279 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array has non-integral type %qT" msgstr "" -#: cp/decl.c:7324 +<<<<<<< HEAD +#: cp/decl.c:7327 +======= +#: cp/decl.c:7328 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array %qD is negative" msgstr "" -#: cp/decl.c:7326 +<<<<<<< HEAD +#: cp/decl.c:7329 +======= +#: cp/decl.c:7330 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array is negative" msgstr "" -#: cp/decl.c:7334 +<<<<<<< HEAD +#: cp/decl.c:7337 +======= +#: cp/decl.c:7338 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids zero-size array %qD" msgstr "" -#: cp/decl.c:7336 +<<<<<<< HEAD +#: cp/decl.c:7339 +======= +#: cp/decl.c:7340 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids zero-size array" msgstr "" -#: cp/decl.c:7343 +<<<<<<< HEAD +#: cp/decl.c:7346 +======= +#: cp/decl.c:7347 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array %qD is not an integral constant-expression" msgstr "" -#: cp/decl.c:7346 +<<<<<<< HEAD +#: cp/decl.c:7349 +======= +#: cp/decl.c:7350 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array is not an integral constant-expression" msgstr "" -#: cp/decl.c:7352 +<<<<<<< HEAD +#: cp/decl.c:7355 +======= +#: cp/decl.c:7356 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids variable length array %qD" msgstr "" -#: cp/decl.c:7354 +<<<<<<< HEAD +#: cp/decl.c:7357 +======= +#: cp/decl.c:7358 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids variable length array" msgstr "" -#: cp/decl.c:7360 +<<<<<<< HEAD +#: cp/decl.c:7363 +======= +#: cp/decl.c:7364 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable length array %qD is used" msgstr "" -#: cp/decl.c:7396 +<<<<<<< HEAD +#: cp/decl.c:7399 +======= +#: cp/decl.c:7400 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "overflow in array dimension" msgstr "" -#: cp/decl.c:7452 +<<<<<<< HEAD +#: cp/decl.c:7455 +======= +#: cp/decl.c:7456 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as array of void" msgstr "" -#: cp/decl.c:7454 +<<<<<<< HEAD +#: cp/decl.c:7457 +======= +#: cp/decl.c:7458 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "creating array of void" msgstr "" -#: cp/decl.c:7459 +<<<<<<< HEAD +#: cp/decl.c:7462 +======= +#: cp/decl.c:7463 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as array of functions" msgstr "" -#: cp/decl.c:7461 +<<<<<<< HEAD +#: cp/decl.c:7464 +======= +#: cp/decl.c:7465 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "creating array of functions" msgstr "" -#: cp/decl.c:7466 +<<<<<<< HEAD +#: cp/decl.c:7469 +======= +#: cp/decl.c:7470 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as array of references" msgstr "" -#: cp/decl.c:7468 +<<<<<<< HEAD +#: cp/decl.c:7471 +======= +#: cp/decl.c:7472 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "creating array of references" msgstr "" -#: cp/decl.c:7473 +<<<<<<< HEAD +#: cp/decl.c:7476 +======= +#: cp/decl.c:7477 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as array of function members" msgstr "" -#: cp/decl.c:7475 +<<<<<<< HEAD +#: cp/decl.c:7478 +======= +#: cp/decl.c:7479 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "creating array of function members" msgstr "" -#: cp/decl.c:7489 +<<<<<<< HEAD +#: cp/decl.c:7492 +======= +#: cp/decl.c:7493 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "declaration of %qD as multidimensional array must have bounds for all " "dimensions except the first" msgstr "" -#: cp/decl.c:7493 +<<<<<<< HEAD +#: cp/decl.c:7496 +======= +#: cp/decl.c:7497 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "multidimensional array must have bounds for all dimensions except the first" msgstr "" -#: cp/decl.c:7528 +<<<<<<< HEAD +#: cp/decl.c:7531 +======= +#: cp/decl.c:7532 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type specification for constructor invalid" msgstr "" -#: cp/decl.c:7538 +<<<<<<< HEAD +#: cp/decl.c:7541 +======= +#: cp/decl.c:7542 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type specification for destructor invalid" msgstr "" -#: cp/decl.c:7551 +<<<<<<< HEAD +#: cp/decl.c:7554 +======= +#: cp/decl.c:7555 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type specified for %" msgstr "" -#: cp/decl.c:7573 +<<<<<<< HEAD +#: cp/decl.c:7576 +======= +#: cp/decl.c:7577 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "unnamed variable or field declared void" msgstr "" -#: cp/decl.c:7580 +<<<<<<< HEAD +#: cp/decl.c:7583 +======= +#: cp/decl.c:7584 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "variable or field declared void" msgstr "" -#: cp/decl.c:7759 +<<<<<<< HEAD +#: cp/decl.c:7762 +======= +#: cp/decl.c:7763 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of qualified-name %<::%D%>" msgstr "" -#: cp/decl.c:7762 +<<<<<<< HEAD +#: cp/decl.c:7765 +======= +#: cp/decl.c:7766 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of qualified-name %<%T::%D%>" msgstr "" -#: cp/decl.c:7765 +<<<<<<< HEAD +#: cp/decl.c:7768 +======= +#: cp/decl.c:7769 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of qualified-name %<%D::%D%>" msgstr "" -#: cp/decl.c:7777 +<<<<<<< HEAD +#: cp/decl.c:7780 +======= +#: cp/decl.c:7781 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "type %qT is not derived from type %qT" msgstr "" -#: cp/decl.c:7793 cp/decl.c:7885 cp/decl.c:9154 +<<<<<<< HEAD +#: cp/decl.c:7796 cp/decl.c:7888 cp/decl.c:9157 +======= +#: cp/decl.c:7797 cp/decl.c:7889 cp/decl.c:9158 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as non-function" msgstr "" -#: cp/decl.c:7799 +<<<<<<< HEAD +#: cp/decl.c:7802 +======= +#: cp/decl.c:7803 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as non-member" msgstr "" -#: cp/decl.c:7830 +<<<<<<< HEAD +#: cp/decl.c:7833 +======= +#: cp/decl.c:7834 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declarator-id missing; using reserved word %qD" msgstr "" -#: cp/decl.c:7877 +<<<<<<< HEAD +#: cp/decl.c:7880 +======= +#: cp/decl.c:7881 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function definition does not declare parameters" msgstr "" -#: cp/decl.c:7919 +<<<<<<< HEAD +#: cp/decl.c:7922 +======= +#: cp/decl.c:7923 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "two or more data types in declaration of %qs" msgstr "" -#: cp/decl.c:7925 +<<<<<<< HEAD +#: cp/decl.c:7928 +======= +#: cp/decl.c:7929 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "conflicting specifiers in declaration of %qs" msgstr "" -#: cp/decl.c:7996 cp/decl.c:7999 cp/decl.c:8002 +<<<<<<< HEAD +#: cp/decl.c:7999 cp/decl.c:8002 cp/decl.c:8005 +======= +#: cp/decl.c:8000 cp/decl.c:8003 cp/decl.c:8006 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids declaration of %qs with no type" msgstr "" -#: cp/decl.c:8027 cp/decl.c:8045 +<<<<<<< HEAD +#: cp/decl.c:8030 cp/decl.c:8048 +======= +#: cp/decl.c:8031 cp/decl.c:8049 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% or % invalid for %qs" msgstr "" -#: cp/decl.c:8029 +<<<<<<< HEAD +#: cp/decl.c:8032 +======= +#: cp/decl.c:8033 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% and % specified together for %qs" msgstr "" -#: cp/decl.c:8031 +<<<<<<< HEAD +#: cp/decl.c:8034 +======= +#: cp/decl.c:8035 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% invalid for %qs" msgstr "" -#: cp/decl.c:8033 +<<<<<<< HEAD +#: cp/decl.c:8036 +======= +#: cp/decl.c:8037 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% invalid for %qs" msgstr "" -#: cp/decl.c:8035 +<<<<<<< HEAD +#: cp/decl.c:8038 +======= +#: cp/decl.c:8039 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% invalid for %qs" msgstr "" -#: cp/decl.c:8037 +<<<<<<< HEAD +#: cp/decl.c:8040 +======= +#: cp/decl.c:8041 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% or % invalid for %qs" msgstr "" -#: cp/decl.c:8039 +<<<<<<< HEAD +#: cp/decl.c:8042 +======= +#: cp/decl.c:8043 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% or % specified with char for %qs" msgstr "" -#: cp/decl.c:8041 +<<<<<<< HEAD +#: cp/decl.c:8044 +======= +#: cp/decl.c:8045 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% and % specified together for %qs" msgstr "" -#: cp/decl.c:8047 +<<<<<<< HEAD +#: cp/decl.c:8050 +======= +#: cp/decl.c:8051 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% or % invalid for %qs" msgstr "" -#: cp/decl.c:8055 +<<<<<<< HEAD +#: cp/decl.c:8058 +======= +#: cp/decl.c:8059 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "long, short, signed or unsigned used invalidly for %qs" msgstr "" -#: cp/decl.c:8119 +<<<<<<< HEAD +#: cp/decl.c:8122 +======= +#: cp/decl.c:8123 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "complex invalid for %qs" msgstr "" -#: cp/decl.c:8150 +<<<<<<< HEAD +#: cp/decl.c:8153 +======= +#: cp/decl.c:8154 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "both % and % cannot be used here" msgstr "" -#: cp/decl.c:8159 +<<<<<<< HEAD +#: cp/decl.c:8162 +======= +#: cp/decl.c:8163 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "qualifiers are not allowed on declaration of %" msgstr "" -#: cp/decl.c:8172 cp/typeck.c:7744 +<<<<<<< HEAD +#: cp/decl.c:8175 cp/typeck.c:7831 +======= +#: cp/decl.c:8176 cp/typeck.c:7845 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ignoring %qV qualifiers added to function type %qT" msgstr "" -#: cp/decl.c:8195 +<<<<<<< HEAD +#: cp/decl.c:8198 +======= +#: cp/decl.c:8199 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "member %qD cannot be declared both virtual and static" msgstr "" -#: cp/decl.c:8203 +<<<<<<< HEAD +#: cp/decl.c:8206 +======= +#: cp/decl.c:8207 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<%T::%D%> is not a valid declarator" msgstr "" -#: cp/decl.c:8212 +<<<<<<< HEAD +#: cp/decl.c:8215 +======= +#: cp/decl.c:8216 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "typedef declaration invalid in parameter declaration" msgstr "" -#: cp/decl.c:8217 +<<<<<<< HEAD +#: cp/decl.c:8220 +======= +#: cp/decl.c:8221 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specified for template parameter %qs" msgstr "" -#: cp/decl.c:8223 +<<<<<<< HEAD +#: cp/decl.c:8226 +======= +#: cp/decl.c:8227 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specifiers invalid in parameter declarations" msgstr "" -#: cp/decl.c:8227 +<<<<<<< HEAD +#: cp/decl.c:8230 +======= +#: cp/decl.c:8231 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter declared %" msgstr "" -#: cp/decl.c:8235 +<<<<<<< HEAD +#: cp/decl.c:8238 +======= +#: cp/decl.c:8239 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "a parameter cannot be declared %" msgstr "" -#: cp/decl.c:8244 +<<<<<<< HEAD +#: cp/decl.c:8247 +======= +#: cp/decl.c:8248 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% outside class declaration" msgstr "" -#: cp/decl.c:8262 +<<<<<<< HEAD +#: cp/decl.c:8265 +======= +#: cp/decl.c:8266 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "multiple storage classes in declaration of %qs" msgstr "" -#: cp/decl.c:8285 +<<<<<<< HEAD +#: cp/decl.c:8288 +======= +#: cp/decl.c:8289 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specified for %qs" msgstr "" -#: cp/decl.c:8289 +<<<<<<< HEAD +#: cp/decl.c:8292 +======= +#: cp/decl.c:8293 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specified for parameter %qs" msgstr "" -#: cp/decl.c:8302 +<<<<<<< HEAD +#: cp/decl.c:8305 +======= +#: cp/decl.c:8306 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "nested function %qs declared %" msgstr "" -#: cp/decl.c:8306 +<<<<<<< HEAD +#: cp/decl.c:8309 +======= +#: cp/decl.c:8310 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "top-level declaration of %qs specifies %" msgstr "" -#: cp/decl.c:8312 +<<<<<<< HEAD +#: cp/decl.c:8315 +======= +#: cp/decl.c:8316 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function-scope %qs implicitly auto and declared %<__thread%>" msgstr "" -#: cp/decl.c:8319 +<<<<<<< HEAD +#: cp/decl.c:8322 +======= +#: cp/decl.c:8323 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class specifiers invalid in friend function declarations" msgstr "" -#: cp/decl.c:8413 +<<<<<<< HEAD +#: cp/decl.c:8416 +======= +#: cp/decl.c:8417 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs declared as function returning a function" msgstr "" -#: cp/decl.c:8418 +<<<<<<< HEAD +#: cp/decl.c:8421 +======= +#: cp/decl.c:8422 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs declared as function returning an array" msgstr "" -#: cp/decl.c:8439 +<<<<<<< HEAD +#: cp/decl.c:8442 +======= +#: cp/decl.c:8443 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs function uses % type specifier without late return type" msgstr "" -#: cp/decl.c:8445 +<<<<<<< HEAD +#: cp/decl.c:8448 +======= +#: cp/decl.c:8449 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%qs function with late return type has %qT as its type rather than plain %" "" msgstr "" -#: cp/decl.c:8453 +<<<<<<< HEAD +#: cp/decl.c:8456 +======= +#: cp/decl.c:8457 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%qs function with late return type not declared with % type specifier" msgstr "" -#: cp/decl.c:8486 +<<<<<<< HEAD +#: cp/decl.c:8489 +======= +#: cp/decl.c:8490 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "destructor cannot be static member function" msgstr "" -#: cp/decl.c:8491 +<<<<<<< HEAD +#: cp/decl.c:8494 +======= +#: cp/decl.c:8495 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "destructors may not be cv-qualified" msgstr "" -#: cp/decl.c:8509 +<<<<<<< HEAD +#: cp/decl.c:8512 +======= +#: cp/decl.c:8513 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "constructors cannot be declared virtual" msgstr "" -#: cp/decl.c:8522 +<<<<<<< HEAD +#: cp/decl.c:8525 +======= +#: cp/decl.c:8526 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "can't initialize friend function %qs" msgstr "" #. Cannot be both friend and virtual. -#: cp/decl.c:8526 +<<<<<<< HEAD +#: cp/decl.c:8529 +======= +#: cp/decl.c:8530 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "virtual functions cannot be friends" msgstr "" -#: cp/decl.c:8530 +<<<<<<< HEAD +#: cp/decl.c:8533 +======= +#: cp/decl.c:8534 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "friend declaration not in class definition" msgstr "" -#: cp/decl.c:8532 +<<<<<<< HEAD +#: cp/decl.c:8535 +======= +#: cp/decl.c:8536 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "can't define friend function %qs in a local class definition" msgstr "" -#: cp/decl.c:8550 +<<<<<<< HEAD +#: cp/decl.c:8553 +======= +#: cp/decl.c:8554 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "the % specifier cannot be used in a function declaration that is " "not a definition" msgstr "" -#: cp/decl.c:8568 +<<<<<<< HEAD +#: cp/decl.c:8571 +======= +#: cp/decl.c:8572 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "destructors may not have parameters" msgstr "" -#: cp/decl.c:8587 +<<<<<<< HEAD +#: cp/decl.c:8590 +======= +#: cp/decl.c:8591 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare pointer to %q#T" msgstr "" -#: cp/decl.c:8600 cp/decl.c:8607 +<<<<<<< HEAD +#: cp/decl.c:8603 cp/decl.c:8610 +======= +#: cp/decl.c:8604 cp/decl.c:8611 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare reference to %q#T" msgstr "" -#: cp/decl.c:8609 +<<<<<<< HEAD +#: cp/decl.c:8612 +======= +#: cp/decl.c:8613 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare pointer to %q#T member" msgstr "" -#: cp/decl.c:8630 +<<<<<<< HEAD +#: cp/decl.c:8633 +======= +#: cp/decl.c:8634 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare reference to qualified function type %qT" msgstr "" -#: cp/decl.c:8631 +<<<<<<< HEAD +#: cp/decl.c:8634 +======= +#: cp/decl.c:8635 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare pointer to qualified function type %qT" msgstr "" -#: cp/decl.c:8667 +<<<<<<< HEAD +#: cp/decl.c:8670 +======= +#: cp/decl.c:8671 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "cannot declare reference to %q#T, which is not a typedef or a template type " "argument" msgstr "" -#: cp/decl.c:8711 +<<<<<<< HEAD +#: cp/decl.c:8714 +======= +#: cp/decl.c:8715 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template-id %qD used as a declarator" msgstr "" -#: cp/decl.c:8762 +<<<<<<< HEAD +#: cp/decl.c:8765 +======= +#: cp/decl.c:8766 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "member functions are implicitly friends of their class" msgstr "" -#: cp/decl.c:8767 +<<<<<<< HEAD +#: cp/decl.c:8770 +======= +#: cp/decl.c:8771 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "extra qualification %<%T::%> on member %qs" msgstr "" -#: cp/decl.c:8799 +<<<<<<< HEAD +#: cp/decl.c:8802 +======= +#: cp/decl.c:8803 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot define member function %<%T::%s%> within %<%T%>" msgstr "" -#: cp/decl.c:8808 +<<<<<<< HEAD +#: cp/decl.c:8811 +======= +#: cp/decl.c:8812 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "a constexpr function cannot be defined outside of its class" msgstr "" -#: cp/decl.c:8822 +<<<<<<< HEAD +#: cp/decl.c:8825 +======= +#: cp/decl.c:8826 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare member %<%T::%s%> within %qT" msgstr "" -#: cp/decl.c:8845 +<<<<<<< HEAD +#: cp/decl.c:8848 +======= +#: cp/decl.c:8849 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-parameter %qs cannot be a parameter pack" msgstr "" -#: cp/decl.c:8855 +<<<<<<< HEAD +#: cp/decl.c:8858 +======= +#: cp/decl.c:8859 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "size of array %qs is too large" msgstr "" -#: cp/decl.c:8866 +<<<<<<< HEAD +#: cp/decl.c:8869 +======= +#: cp/decl.c:8870 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "data member may not have variably modified type %qT" msgstr "" -#: cp/decl.c:8868 +<<<<<<< HEAD +#: cp/decl.c:8871 +======= +#: cp/decl.c:8872 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format 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:8876 +<<<<<<< HEAD +#: cp/decl.c:8879 +======= +#: cp/decl.c:8880 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "only declarations of constructors can be %" msgstr "" -#: cp/decl.c:8884 +<<<<<<< HEAD +#: cp/decl.c:8887 +======= +#: cp/decl.c:8888 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-member %qs cannot be declared %" msgstr "" -#: cp/decl.c:8889 +<<<<<<< HEAD +#: cp/decl.c:8892 +======= +#: cp/decl.c:8893 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-object member %qs cannot be declared %" msgstr "" -#: cp/decl.c:8895 +<<<<<<< HEAD +#: cp/decl.c:8898 +======= +#: cp/decl.c:8899 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function %qs cannot be declared %" msgstr "" -#: cp/decl.c:8900 +<<<<<<< HEAD +#: cp/decl.c:8903 +======= +#: cp/decl.c:8904 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "static %qs cannot be declared %" msgstr "" -#: cp/decl.c:8905 +<<<<<<< HEAD +#: cp/decl.c:8908 +======= +#: cp/decl.c:8909 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "const %qs cannot be declared %" msgstr "" -#: cp/decl.c:8943 +<<<<<<< HEAD +#: cp/decl.c:8946 +======= +#: cp/decl.c:8947 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "typedef name may not be a nested-name-specifier" msgstr "" -#: cp/decl.c:8961 +<<<<<<< HEAD +#: cp/decl.c:8964 +======= +#: cp/decl.c:8965 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids nested type %qD with same name as enclosing class" msgstr "" -#: cp/decl.c:9055 +<<<<<<< HEAD +#: cp/decl.c:9058 +======= +#: cp/decl.c:9059 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "qualified function types cannot be used to declare static member functions" msgstr "" -#: cp/decl.c:9057 +<<<<<<< HEAD +#: cp/decl.c:9060 +======= +#: cp/decl.c:9061 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "qualified function types cannot be used to declare free functions" msgstr "" -#: cp/decl.c:9084 +<<<<<<< HEAD +#: cp/decl.c:9087 +======= +#: cp/decl.c:9088 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "type qualifiers specified for friend class declaration" msgstr "" -#: cp/decl.c:9089 +<<<<<<< HEAD +#: cp/decl.c:9092 +======= +#: cp/decl.c:9093 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% specified for friend class declaration" msgstr "" -#: cp/decl.c:9097 +<<<<<<< HEAD +#: cp/decl.c:9100 +======= +#: cp/decl.c:9101 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template parameters cannot be friends" msgstr "" -#: cp/decl.c:9099 +<<<<<<< HEAD +#: cp/decl.c:9102 +======= +#: cp/decl.c:9103 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "friend declaration requires class-key, i.e. %" msgstr "" -#: cp/decl.c:9103 +<<<<<<< HEAD +#: cp/decl.c:9106 +======= +#: cp/decl.c:9107 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "friend declaration requires class-key, i.e. %" msgstr "" -#: cp/decl.c:9116 +<<<<<<< HEAD +#: cp/decl.c:9119 +======= +#: cp/decl.c:9120 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "trying to make class %qT a friend of global scope" msgstr "" -#: cp/decl.c:9134 +<<<<<<< HEAD +#: cp/decl.c:9137 +======= +#: cp/decl.c:9138 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid qualifiers on non-member function type" msgstr "" -#: cp/decl.c:9144 +<<<<<<< HEAD +#: cp/decl.c:9147 +======= +#: cp/decl.c:9148 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "abstract declarator %qT used as declaration" msgstr "" -#: cp/decl.c:9173 +<<<<<<< HEAD +#: cp/decl.c:9176 +======= +#: cp/decl.c:9177 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot use %<::%> in parameter declaration" msgstr "" #. Something like struct S { int N::j; }; -#: cp/decl.c:9219 +<<<<<<< HEAD +#: cp/decl.c:9222 +======= +#: cp/decl.c:9223 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of %<::%>" msgstr "" -#: cp/decl.c:9234 +<<<<<<< HEAD +#: cp/decl.c:9237 +======= +#: cp/decl.c:9238 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "can't make %qD into a method -- not in a class" msgstr "" -#: cp/decl.c:9243 +<<<<<<< HEAD +#: cp/decl.c:9246 +======= +#: cp/decl.c:9247 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "function %qD declared virtual inside a union" msgstr "" -#: cp/decl.c:9252 +<<<<<<< HEAD +#: cp/decl.c:9255 +======= +#: cp/decl.c:9256 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD cannot be declared virtual, since it is always static" msgstr "" -#: cp/decl.c:9270 +<<<<<<< HEAD +#: cp/decl.c:9273 +======= +#: cp/decl.c:9274 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expected qualified name in friend declaration for destructor %qD" msgstr "" -#: cp/decl.c:9277 +<<<<<<< HEAD +#: cp/decl.c:9280 +======= +#: cp/decl.c:9281 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD as member of %qT" msgstr "" -#: cp/decl.c:9282 +<<<<<<< HEAD +#: cp/decl.c:9285 +======= +#: cp/decl.c:9286 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "a destructor cannot be %" msgstr "" -#: cp/decl.c:9286 +<<<<<<< HEAD +#: cp/decl.c:9289 +======= +#: cp/decl.c:9290 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expected qualified name in friend declaration for constructor %qD" msgstr "" -#: cp/decl.c:9350 +<<<<<<< HEAD +#: cp/decl.c:9353 +======= +#: cp/decl.c:9354 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "field %qD has incomplete type" msgstr "" -#: cp/decl.c:9352 +<<<<<<< HEAD +#: cp/decl.c:9355 +======= +#: cp/decl.c:9356 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "name %qT has incomplete type" msgstr "" -#: cp/decl.c:9361 +<<<<<<< HEAD +#: cp/decl.c:9364 +======= +#: cp/decl.c:9365 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid " in instantiation of template %qT" msgstr "" -#: cp/decl.c:9370 +<<<<<<< HEAD +#: cp/decl.c:9373 +======= +#: cp/decl.c:9374 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE is neither function nor member function; cannot be declared friend" msgstr "" @@ -25473,137 +28434,241 @@ 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:9423 +<<<<<<< HEAD +#: cp/decl.c:9426 +======= +#: cp/decl.c:9427 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids initialization of member %qD" msgstr "" -#: cp/decl.c:9425 +<<<<<<< HEAD +#: cp/decl.c:9428 +======= +#: cp/decl.c:9429 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "making %qD static" msgstr "" -#: cp/decl.c:9459 +<<<<<<< HEAD +#: cp/decl.c:9462 +======= +#: cp/decl.c:9463 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-static data member %qE declared %" msgstr "" -#: cp/decl.c:9494 +<<<<<<< HEAD +#: cp/decl.c:9497 +======= +#: cp/decl.c:9498 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class % invalid for function %qs" msgstr "" -#: cp/decl.c:9496 +<<<<<<< HEAD +#: cp/decl.c:9499 +======= +#: cp/decl.c:9500 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class % invalid for function %qs" msgstr "" -#: cp/decl.c:9498 +<<<<<<< HEAD +#: cp/decl.c:9501 +======= +#: cp/decl.c:9502 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "storage class %<__thread%> invalid for function %qs" msgstr "" -#: cp/decl.c:9510 +<<<<<<< HEAD +#: cp/decl.c:9513 +======= +#: cp/decl.c:9514 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "% specified invalid for function %qs declared out of global scope" msgstr "" -#: cp/decl.c:9514 +<<<<<<< HEAD +#: cp/decl.c:9517 +======= +#: cp/decl.c:9518 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "% specifier invalid for function %qs declared out of global scope" msgstr "" -#: cp/decl.c:9521 +<<<<<<< HEAD +#: cp/decl.c:9524 +======= +#: cp/decl.c:9525 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q#T is not a class or a namespace" msgstr "" -#: cp/decl.c:9529 +<<<<<<< HEAD +#: cp/decl.c:9532 +======= +#: cp/decl.c:9533 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "virtual non-class function %qs" msgstr "" -#: cp/decl.c:9536 +<<<<<<< HEAD +#: cp/decl.c:9539 +======= +#: cp/decl.c:9540 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs defined in a non-class scope" msgstr "" -#: cp/decl.c:9569 +<<<<<<< HEAD +#: cp/decl.c:9572 +======= +#: cp/decl.c:9573 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare member function %qD to have static linkage" msgstr "" #. FIXME need arm citation -#: cp/decl.c:9576 +<<<<<<< HEAD +#: cp/decl.c:9579 +======= +#: cp/decl.c:9580 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot declare static function inside another function" msgstr "" -#: cp/decl.c:9606 +<<<<<<< HEAD +#: cp/decl.c:9609 +======= +#: cp/decl.c:9610 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "% may not be used when defining (as opposed to declaring) a static " "data member" msgstr "" -#: cp/decl.c:9613 +<<<<<<< HEAD +#: cp/decl.c:9616 +======= +#: cp/decl.c:9617 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "static member %qD declared %" msgstr "" -#: cp/decl.c:9619 +<<<<<<< HEAD +#: cp/decl.c:9622 +======= +#: cp/decl.c:9623 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot explicitly declare member %q#D to have extern linkage" msgstr "" -#: cp/decl.c:9633 +<<<<<<< HEAD +#: cp/decl.c:9636 +======= +#: cp/decl.c:9637 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs initialized and declared %" msgstr "" -#: cp/decl.c:9637 +<<<<<<< HEAD +#: cp/decl.c:9640 +======= +#: cp/decl.c:9641 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qs has both % and initializer" msgstr "" -#: cp/decl.c:9764 +<<<<<<< HEAD +#: cp/decl.c:9767 +======= +#: cp/decl.c:9768 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default argument for %q#D has type %qT" msgstr "" -#: cp/decl.c:9767 +<<<<<<< HEAD +#: cp/decl.c:9770 +======= +#: cp/decl.c:9771 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default argument for parameter of type %qT has type %qT" msgstr "" -#: cp/decl.c:9783 +<<<<<<< HEAD +#: cp/decl.c:9786 +======= +#: cp/decl.c:9787 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default argument %qE uses local variable %qD" msgstr "" -#: cp/decl.c:9871 +<<<<<<< HEAD +#: cp/decl.c:9874 +======= +#: cp/decl.c:9875 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD has Java class type" msgstr "" -#: cp/decl.c:9899 +<<<<<<< HEAD +#: cp/decl.c:9902 +======= +#: cp/decl.c:9903 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD invalidly declared method type" msgstr "" -#: cp/decl.c:9924 +<<<<<<< HEAD +#: cp/decl.c:9927 +======= +#: cp/decl.c:9928 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD includes pointer to array of unknown bound %qT" msgstr "" -#: cp/decl.c:9926 +<<<<<<< HEAD +#: cp/decl.c:9929 +======= +#: cp/decl.c:9930 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD includes reference to array of unknown bound %qT" msgstr "" -#: cp/decl.c:9941 +<<<<<<< HEAD +#: cp/decl.c:9944 +======= +#: cp/decl.c:9945 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter packs must be at the end of the parameter list" msgstr "" @@ -25623,169 +28688,293 @@ 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:10164 +<<<<<<< HEAD +#: cp/decl.c:10167 +======= +#: cp/decl.c:10168 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid constructor; you probably meant %<%T (const %T&)%>" msgstr "" -#: cp/decl.c:10286 +<<<<<<< HEAD +#: cp/decl.c:10289 +======= +#: cp/decl.c:10290 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD may not be declared within a namespace" msgstr "" -#: cp/decl.c:10291 +<<<<<<< HEAD +#: cp/decl.c:10294 +======= +#: cp/decl.c:10295 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD may not be declared as static" msgstr "" -#: cp/decl.c:10321 +#: cp/decl.c:10320 #, gcc-internal-format msgid "%qD must be a nonstatic member function" msgstr "" -#: cp/decl.c:10331 +<<<<<<< HEAD +#: cp/decl.c:10329 +======= +#: cp/decl.c:10330 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%qD must be either a non-static member function or a non-member function" msgstr "" -#: cp/decl.c:10353 +<<<<<<< HEAD +#: cp/decl.c:10351 +======= +#: cp/decl.c:10352 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must have an argument of class or enumerated type" msgstr "" -#: cp/decl.c:10382 +<<<<<<< HEAD +#: cp/decl.c:10380 +======= +#: cp/decl.c:10381 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "conversion to a reference to void will never use a type conversion operator" msgstr "" -#: cp/decl.c:10384 +<<<<<<< HEAD +#: cp/decl.c:10382 +======= +#: cp/decl.c:10383 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "conversion to void will never use a type conversion operator" msgstr "" -#: cp/decl.c:10391 +<<<<<<< HEAD +#: cp/decl.c:10389 +======= +#: cp/decl.c:10390 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "conversion to a reference to the same type will never use a type conversion " "operator" msgstr "" -#: cp/decl.c:10393 +<<<<<<< HEAD +#: cp/decl.c:10391 +======= +#: cp/decl.c:10392 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "conversion to the same type will never use a type conversion operator" msgstr "" -#: cp/decl.c:10401 +<<<<<<< HEAD +#: cp/decl.c:10399 +======= +#: cp/decl.c:10400 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "conversion to a reference to a base class will never use a type conversion " "operator" msgstr "" -#: cp/decl.c:10403 +<<<<<<< HEAD +#: cp/decl.c:10401 +======= +#: cp/decl.c:10402 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "conversion to a base class will never use a type conversion operator" msgstr "" #. 13.4.0.3 -#: cp/decl.c:10412 +<<<<<<< HEAD +#: cp/decl.c:10410 +======= +#: cp/decl.c:10411 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ prohibits overloading operator ?:" msgstr "" -#: cp/decl.c:10417 +<<<<<<< HEAD +#: cp/decl.c:10415 +======= +#: cp/decl.c:10416 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must not have variable number of arguments" msgstr "" -#: cp/decl.c:10468 +<<<<<<< HEAD +#: cp/decl.c:10466 +======= +#: cp/decl.c:10467 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "postfix %qD must take % as its argument" msgstr "" -#: cp/decl.c:10471 +<<<<<<< HEAD +#: cp/decl.c:10469 +======= +#: cp/decl.c:10470 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "postfix %qD must take % as its second argument" msgstr "" -#: cp/decl.c:10479 +<<<<<<< HEAD +#: cp/decl.c:10477 +======= +#: cp/decl.c:10478 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must take either zero or one argument" msgstr "" -#: cp/decl.c:10481 +<<<<<<< HEAD +#: cp/decl.c:10479 +======= +#: cp/decl.c:10480 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must take either one or two arguments" msgstr "" -#: cp/decl.c:10503 +<<<<<<< HEAD +#: cp/decl.c:10501 +======= +#: cp/decl.c:10502 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "prefix %qD should return %qT" msgstr "" -#: cp/decl.c:10509 +<<<<<<< HEAD +#: cp/decl.c:10507 +======= +#: cp/decl.c:10508 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "postfix %qD should return %qT" msgstr "" -#: cp/decl.c:10518 +<<<<<<< HEAD +#: cp/decl.c:10516 +======= +#: cp/decl.c:10517 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must take %" msgstr "" -#: cp/decl.c:10520 cp/decl.c:10529 +<<<<<<< HEAD +#: cp/decl.c:10518 cp/decl.c:10527 +======= +#: cp/decl.c:10519 cp/decl.c:10528 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must take exactly one argument" msgstr "" -#: cp/decl.c:10531 +<<<<<<< HEAD +#: cp/decl.c:10529 +======= +#: cp/decl.c:10530 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD must take exactly two arguments" msgstr "" -#: cp/decl.c:10540 +<<<<<<< HEAD +#: cp/decl.c:10538 +======= +#: cp/decl.c:10539 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "user-defined %qD always evaluates both arguments" msgstr "" -#: cp/decl.c:10554 +<<<<<<< HEAD +#: cp/decl.c:10552 +======= +#: cp/decl.c:10553 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD should return by value" msgstr "" -#: cp/decl.c:10565 cp/decl.c:10570 +<<<<<<< HEAD +#: cp/decl.c:10563 cp/decl.c:10568 +======= +#: cp/decl.c:10564 cp/decl.c:10569 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD cannot have default arguments" msgstr "" -#: cp/decl.c:10628 +<<<<<<< HEAD +#: cp/decl.c:10626 +======= +#: cp/decl.c:10627 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "using template type parameter %qT after %qs" msgstr "" -#: cp/decl.c:10644 +<<<<<<< HEAD +#: cp/decl.c:10642 +======= +#: cp/decl.c:10643 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "using typedef-name %qD after %qs" msgstr "" -#: cp/decl.c:10645 +<<<<<<< HEAD +#: cp/decl.c:10643 +======= +#: cp/decl.c:10644 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+D has a previous declaration here" msgstr "" -#: cp/decl.c:10653 +<<<<<<< HEAD +#: cp/decl.c:10651 +======= +#: cp/decl.c:10652 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qT referred to as %qs" msgstr "" -#: cp/decl.c:10654 cp/decl.c:10661 +<<<<<<< HEAD +#: cp/decl.c:10652 cp/decl.c:10659 +======= +#: cp/decl.c:10653 cp/decl.c:10660 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%q+T has a previous declaration here" msgstr "" -#: cp/decl.c:10660 +<<<<<<< HEAD +#: cp/decl.c:10658 +======= +#: cp/decl.c:10659 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qT referred to as enum" msgstr "" @@ -25797,78 +28986,139 @@ msgstr "" #. void f(class C); // No template header here #. #. then the required template argument is missing. -#: cp/decl.c:10675 +<<<<<<< HEAD +#: cp/decl.c:10673 +======= +#: cp/decl.c:10674 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template argument required for %<%s %T%>" msgstr "" -#: cp/decl.c:10723 cp/name-lookup.c:2823 +<<<<<<< HEAD +#: cp/decl.c:10721 cp/name-lookup.c:2823 +======= +#: cp/decl.c:10722 cp/name-lookup.c:2823 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD has the same name as the class in which it is declared" msgstr "" -#: cp/decl.c:10753 cp/name-lookup.c:2328 cp/name-lookup.c:3098 -#: cp/name-lookup.c:3142 cp/parser.c:4243 cp/parser.c:18102 +<<<<<<< HEAD +#: cp/decl.c:10751 cp/name-lookup.c:2328 cp/name-lookup.c:3098 +#: cp/name-lookup.c:3143 cp/parser.c:4245 cp/parser.c:18116 +======= +#: cp/decl.c:10752 cp/name-lookup.c:2328 cp/name-lookup.c:3098 +#: cp/name-lookup.c:3143 cp/parser.c:4245 cp/parser.c:18104 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "reference to %qD is ambiguous" msgstr "" -#: cp/decl.c:10867 +<<<<<<< HEAD +#: cp/decl.c:10865 +======= +#: cp/decl.c:10866 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of enum %q#D without previous declaration" msgstr "" -#: cp/decl.c:10888 +<<<<<<< HEAD +#: cp/decl.c:10886 +======= +#: cp/decl.c:10887 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "redeclaration of %qT as a non-template" msgstr "" -#: cp/decl.c:10889 +<<<<<<< HEAD +#: cp/decl.c:10887 +======= +#: cp/decl.c:10888 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "previous declaration %q+D" msgstr "" -#: cp/decl.c:11003 +<<<<<<< HEAD +#: cp/decl.c:11001 +======= +#: cp/decl.c:11002 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "derived union %qT invalid" msgstr "" -#: cp/decl.c:11012 +<<<<<<< HEAD +#: cp/decl.c:11010 +======= +#: cp/decl.c:11011 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Java class %qT cannot have multiple bases" msgstr "" -#: cp/decl.c:11023 +<<<<<<< HEAD +#: cp/decl.c:11021 +======= +#: cp/decl.c:11022 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "Java class %qT cannot have virtual bases" msgstr "" -#: cp/decl.c:11043 +<<<<<<< HEAD +#: cp/decl.c:11041 +======= +#: cp/decl.c:11042 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "base type %qT fails to be a struct or class type" msgstr "" -#: cp/decl.c:11076 +<<<<<<< HEAD +#: cp/decl.c:11074 +======= +#: cp/decl.c:11075 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "recursive type %qT undefined" msgstr "" -#: cp/decl.c:11078 +<<<<<<< HEAD +#: cp/decl.c:11076 +======= +#: cp/decl.c:11077 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate base type %qT invalid" msgstr "" -#: cp/decl.c:11162 +<<<<<<< HEAD +#: cp/decl.c:11160 +======= +#: cp/decl.c:11161 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "multiple definition of %q#T" msgstr "" -#: cp/decl.c:11164 +<<<<<<< HEAD +#: cp/decl.c:11162 +======= +#: cp/decl.c:11163 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "previous definition here" msgstr "" -#: cp/decl.c:11211 +<<<<<<< HEAD +#: cp/decl.c:11209 +======= +#: cp/decl.c:11210 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "underlying type %<%T%> of %<%T%> must be an integral type" msgstr "" @@ -25877,220 +29127,281 @@ msgstr "" #. #. IF no integral type can represent all the enumerator values, the #. enumeration is ill-formed. -#: cp/decl.c:11345 +<<<<<<< HEAD +#: cp/decl.c:11343 +======= +#: cp/decl.c:11344 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no integral type can represent all of the enumerator values for %qT" msgstr "" -#: cp/decl.c:11477 +<<<<<<< HEAD +#: cp/decl.c:11475 +======= +#: cp/decl.c:11476 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumerator value for %qD is not an integer constant" msgstr "" -#: cp/decl.c:11509 +<<<<<<< HEAD +#: cp/decl.c:11507 +======= +#: cp/decl.c:11508 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "overflow in enumeration values at %qD" msgstr "" -#: cp/decl.c:11529 +<<<<<<< HEAD +#: cp/decl.c:11527 +======= +#: cp/decl.c:11528 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "enumerator value %E is too large for underlying type %<%T%>" msgstr "" -#: cp/decl.c:11630 +<<<<<<< HEAD +#: cp/decl.c:11628 +======= +#: cp/decl.c:11629 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type %q#T is incomplete" msgstr "" -#: cp/decl.c:11632 +<<<<<<< HEAD +#: cp/decl.c:11630 +======= +#: cp/decl.c:11631 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "return type has Java class type %q#T" msgstr "" -#: cp/decl.c:11760 cp/typeck.c:7380 +<<<<<<< HEAD +#: cp/decl.c:11758 cp/typeck.c:7467 +======= +#: cp/decl.c:11759 cp/typeck.c:7481 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% should return a reference to %<*this%>" msgstr "" -#: cp/decl.c:11855 +<<<<<<< HEAD +#: cp/decl.c:11853 +======= +#: cp/decl.c:11854 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "no previous declaration for %q+D" msgstr "" -#: cp/decl.c:12076 +<<<<<<< HEAD +#: cp/decl.c:12074 +======= +#: cp/decl.c:12075 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid function declaration" msgstr "" -#: cp/decl.c:12160 +<<<<<<< HEAD +#: cp/decl.c:12158 +======= +#: cp/decl.c:12159 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parameter %qD declared void" msgstr "" -#: cp/decl.c:12661 +<<<<<<< HEAD +#: cp/decl.c:12659 +======= +#: cp/decl.c:12660 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid member function declaration" msgstr "" -#: cp/decl.c:12676 +<<<<<<< HEAD +#: cp/decl.c:12674 +======= +#: cp/decl.c:12675 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is already defined in class %qT" msgstr "" -#: cp/decl.c:12887 +<<<<<<< HEAD +#: cp/decl.c:12885 +======= +#: cp/decl.c:12886 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "static member function %q#D declared with type qualifiers" msgstr "" -#: cp/decl2.c:287 +#: cp/decl2.c:315 #, gcc-internal-format msgid "name missing for member function" msgstr "" -#: cp/decl2.c:358 cp/decl2.c:372 +#: cp/decl2.c:386 cp/decl2.c:400 #, gcc-internal-format msgid "ambiguous conversion for array subscript" msgstr "" -#: cp/decl2.c:366 +#: cp/decl2.c:394 #, gcc-internal-format msgid "invalid types %<%T[%T]%> for array subscript" msgstr "" -#: cp/decl2.c:409 +#: cp/decl2.c:437 #, gcc-internal-format msgid "deleting array %q#D" msgstr "" -#: cp/decl2.c:415 +#: cp/decl2.c:443 #, gcc-internal-format msgid "type %q#T argument given to %, expected pointer" msgstr "" -#: cp/decl2.c:427 +#: cp/decl2.c:455 #, gcc-internal-format msgid "" "cannot delete a function. Only pointer-to-objects are valid arguments to %" "" msgstr "" -#: cp/decl2.c:435 +#: cp/decl2.c:463 #, gcc-internal-format msgid "deleting %qT is undefined" msgstr "" -#: cp/decl2.c:478 cp/pt.c:4301 +<<<<<<< HEAD +#: cp/decl2.c:506 cp/pt.c:4380 +======= +#: cp/decl2.c:506 cp/pt.c:4377 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template declaration of %q#D" msgstr "" -#: cp/decl2.c:530 +#: cp/decl2.c:558 #, gcc-internal-format msgid "Java method %qD has non-Java return type %qT" msgstr "" -#: cp/decl2.c:547 +#: cp/decl2.c:575 #, gcc-internal-format msgid "Java method %qD has non-Java parameter type %qT" msgstr "" -#: cp/decl2.c:596 +#: cp/decl2.c:624 #, gcc-internal-format msgid "" "template parameter lists provided don't match the template parameters of %qD" msgstr "" -#: cp/decl2.c:664 +#: cp/decl2.c:692 #, gcc-internal-format msgid "prototype for %q#D does not match any in class %qT" msgstr "" -#: cp/decl2.c:740 +#: cp/decl2.c:768 #, gcc-internal-format msgid "local class %q#T shall not have static data member %q#D" msgstr "" -#: cp/decl2.c:748 +#: cp/decl2.c:776 #, gcc-internal-format msgid "initializer invalid for static member with constructor" msgstr "" -#: cp/decl2.c:751 +#: cp/decl2.c:779 #, gcc-internal-format msgid "(an out of class initialization is required)" msgstr "" -#: cp/decl2.c:812 +#: cp/decl2.c:840 #, gcc-internal-format msgid "explicit template argument list not allowed" msgstr "" -#: cp/decl2.c:818 +#: cp/decl2.c:846 #, gcc-internal-format msgid "member %qD conflicts with virtual function table field name" msgstr "" -#: cp/decl2.c:854 +#: cp/decl2.c:882 #, gcc-internal-format msgid "%qD is already defined in %qT" msgstr "" -#: cp/decl2.c:890 +#: cp/decl2.c:917 +#, gcc-internal-format +msgid "invalid initializer for member function %qD" +msgstr "" + +#: cp/decl2.c:923 #, gcc-internal-format msgid "initializer specified for static member function %qD" msgstr "" -#: cp/decl2.c:913 +#: cp/decl2.c:946 #, gcc-internal-format msgid "field initializer is not constant" msgstr "" -#: cp/decl2.c:940 +#: cp/decl2.c:973 #, gcc-internal-format msgid "% specifiers are not permitted on non-static data members" msgstr "" -#: cp/decl2.c:992 +#: cp/decl2.c:1025 #, gcc-internal-format msgid "bit-field %qD with non-integral type" msgstr "" -#: cp/decl2.c:998 +#: cp/decl2.c:1031 #, gcc-internal-format msgid "cannot declare %qD to be a bit-field type" msgstr "" -#: cp/decl2.c:1008 +#: cp/decl2.c:1041 #, gcc-internal-format msgid "cannot declare bit-field %qD with function type" msgstr "" -#: cp/decl2.c:1015 +#: cp/decl2.c:1048 #, gcc-internal-format msgid "%qD is already defined in the class %qT" msgstr "" -#: cp/decl2.c:1022 +#: cp/decl2.c:1055 #, gcc-internal-format msgid "static member %qD cannot be a bit-field" msgstr "" -#: cp/decl2.c:1279 +#: cp/decl2.c:1312 #, gcc-internal-format msgid "anonymous struct not inside named type" msgstr "" -#: cp/decl2.c:1365 +#: cp/decl2.c:1398 #, gcc-internal-format msgid "namespace-scope anonymous aggregates must be static" msgstr "" -#: cp/decl2.c:1374 +#: cp/decl2.c:1407 #, gcc-internal-format msgid "anonymous union with no members" msgstr "" -#: cp/decl2.c:1411 +#: cp/decl2.c:1444 #, gcc-internal-format msgid "% must return type %qT" msgstr "" @@ -26099,109 +29410,116 @@ msgstr "" #. #. The first parameter shall not have an associated default #. argument. -#: cp/decl2.c:1422 +#: cp/decl2.c:1455 #, gcc-internal-format msgid "the first parameter of % cannot have a default argument" msgstr "" -#: cp/decl2.c:1438 +#: cp/decl2.c:1471 #, gcc-internal-format msgid "% takes type % (%qT) as first parameter" msgstr "" -#: cp/decl2.c:1467 +#: cp/decl2.c:1500 #, gcc-internal-format msgid "% must return type %qT" msgstr "" -#: cp/decl2.c:1476 +#: cp/decl2.c:1509 #, gcc-internal-format msgid "% takes type %qT as first parameter" msgstr "" -#: cp/decl2.c:2198 +#: cp/decl2.c:2233 #, gcc-internal-format msgid "%qT has a field %qD whose type uses the anonymous namespace" msgstr "" -#: cp/decl2.c:2205 +#: cp/decl2.c:2240 #, gcc-internal-format msgid "%qT declared with greater visibility than the type of its field %qD" msgstr "" -#: cp/decl2.c:2218 +#: cp/decl2.c:2253 #, gcc-internal-format msgid "%qT has a base %qT whose type uses the anonymous namespace" msgstr "" -#: cp/decl2.c:2224 +#: cp/decl2.c:2259 #, gcc-internal-format msgid "%qT declared with greater visibility than its base %qT" msgstr "" -#: cp/decl2.c:3442 +#: cp/decl2.c:3477 #, gcc-internal-format msgid "%q+#D, declared using anonymous type, is used but never defined" msgstr "" -#: cp/decl2.c:3449 +#: cp/decl2.c:3484 #, gcc-internal-format msgid "%q+#D, declared using local type %qT, is used but never defined" msgstr "" -#: cp/decl2.c:3758 +#: cp/decl2.c:3793 #, gcc-internal-format msgid "inline function %q+D used but never defined" msgstr "" -#: cp/decl2.c:3924 +#: cp/decl2.c:3959 #, gcc-internal-format msgid "default argument missing for parameter %P of %q+#D" msgstr "" -#: cp/decl2.c:3975 cp/search.c:1891 +#. We mark a lambda conversion op as deleted if we can't +#. generate it properly; see maybe_add_lambda_conv_op. +#: cp/decl2.c:4017 +#, gcc-internal-format +msgid "converting lambda which uses %<...%> to function pointer" +msgstr "" + +#: cp/decl2.c:4022 cp/search.c:1892 #, gcc-internal-format msgid "deleted function %q+D" msgstr "" -#: cp/decl2.c:3976 +#: cp/decl2.c:4023 #, gcc-internal-format msgid "used here" msgstr "" -#: cp/error.c:2869 +#: cp/error.c:2922 #, gcc-internal-format msgid "" "extended initializer lists only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2874 +#: cp/error.c:2927 #, gcc-internal-format msgid "" "explicit conversion operators only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2879 +#: cp/error.c:2932 #, gcc-internal-format msgid "variadic templates only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2884 +#: cp/error.c:2937 #, gcc-internal-format msgid "lambda expressions only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2889 +#: cp/error.c:2942 #, gcc-internal-format msgid "C++0x auto only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2893 +#: cp/error.c:2946 #, gcc-internal-format msgid "scoped enums only available with -std=c++0x or -std=gnu++0x" msgstr "" -#: cp/error.c:2897 +#: cp/error.c:2950 #, gcc-internal-format msgid "" "defaulted and deleted functions only available with -std=c++0x or -std=gnu+" @@ -26469,7 +29787,7 @@ msgstr "" msgid "bad array initializer" msgstr "" -#: cp/init.c:1456 cp/semantics.c:2619 +#: cp/init.c:1456 cp/semantics.c:2623 #, gcc-internal-format msgid "%qT is not a class type" msgstr "" @@ -26519,7 +29837,7 @@ msgstr "" msgid "no suitable %qD found in class %qT" msgstr "" -#: cp/init.c:1935 +#: cp/init.c:1935 cp/search.c:1105 #, gcc-internal-format msgid "request for member %qD is ambiguous" msgstr "" @@ -26651,95 +29969,106 @@ msgid "" "use of an undeclared name is deprecated)" msgstr "" -#: cp/mangle.c:1933 +#: cp/mangle.c:1937 #, gcc-internal-format msgid "mangling typeof, use decltype instead" msgstr "" -#: cp/mangle.c:2152 +#: cp/mangle.c:2156 #, gcc-internal-format msgid "mangling unknown fixed point type" msgstr "" -#: cp/mangle.c:2557 +#: cp/mangle.c:2561 #, gcc-internal-format msgid "mangling %C" msgstr "" -#: cp/mangle.c:2609 +#: cp/mangle.c:2613 #, gcc-internal-format msgid "mangling new-expression" msgstr "" -#: cp/mangle.c:2643 +#: cp/mangle.c:2647 #, gcc-internal-format msgid "omitted middle operand to % operand cannot be mangled" msgstr "" -#: cp/mangle.c:2951 +#: cp/mangle.c:2955 #, gcc-internal-format msgid "the mangled name of %qD will change in a future version of GCC" msgstr "" -#: cp/method.c:388 +#: cp/mangle.c:3071 +#, gcc-internal-format +msgid "" +"-fabi-version=4 (or =0) avoids this error with a change in vector mangling" +msgstr "" + +#: cp/method.c:396 #, gcc-internal-format msgid "generic thunk code fails for method %q#D which uses %<...%>" msgstr "" -#: cp/method.c:569 +#: cp/method.c:577 #, gcc-internal-format msgid "non-static const member %q#D, can't use default assignment operator" msgstr "" -#: cp/method.c:575 +#: cp/method.c:583 #, gcc-internal-format msgid "non-static reference member %q#D, can't use default assignment operator" msgstr "" -#: cp/method.c:688 +#: cp/method.c:696 #, gcc-internal-format msgid "synthesized method %qD first required here " msgstr "" -#: cp/method.c:1015 +#: cp/method.c:1023 #, gcc-internal-format msgid "defaulted declaration %q+D" msgstr "" -#: cp/method.c:1017 +#: cp/method.c:1025 #, gcc-internal-format msgid "does not match expected signature %qD" msgstr "" -#: cp/method.c:1049 +#: cp/method.c:1057 #, gcc-internal-format msgid "%qD cannot be defaulted" msgstr "" -#: cp/method.c:1058 +#: cp/method.c:1066 #, gcc-internal-format msgid "defaulted function %q+D with default argument" msgstr "" -#: cp/method.c:1064 +#: cp/method.c:1072 #, gcc-internal-format msgid "%qD declared explicit cannot be defaulted in the class body" msgstr "" -#: cp/method.c:1067 +#: cp/method.c:1075 #, gcc-internal-format msgid "" "%qD declared with non-public access cannot be defaulted in the class body" msgstr "" -#: cp/method.c:1070 +#: cp/method.c:1078 #, gcc-internal-format msgid "" "function %q+D defaulted on its first declaration must not have an exception-" "specification" msgstr "" -#: cp/method.c:1119 +#: cp/method.c:1081 +#, gcc-internal-format +msgid "%qD declared virtual cannot be defaulted in the class body" +msgstr "" + +#: cp/method.c:1130 #, gcc-internal-format msgid "" "vtable layout for class %qT may not be ABI-compliantand may change in a " @@ -26848,7 +30177,11 @@ msgstr "" msgid " using obsolete binding at %q+D" msgstr "" -#: cp/name-lookup.c:1251 cp/parser.c:10890 +<<<<<<< HEAD +#: cp/name-lookup.c:1251 cp/parser.c:10897 +======= +#: cp/name-lookup.c:1251 cp/parser.c:10887 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "(if you use %<-fpermissive%> G++ will accept your code)" msgstr "" @@ -26948,54 +30281,54 @@ msgstr "" msgid "explicit qualification in declaration of %qD" msgstr "" -#: cp/name-lookup.c:3167 +#: cp/name-lookup.c:3168 #, gcc-internal-format msgid "%qD should have been declared inside %qD" msgstr "" -#: cp/name-lookup.c:3212 +#: cp/name-lookup.c:3213 #, gcc-internal-format msgid "%qD attribute requires a single NTBS argument" msgstr "" -#: cp/name-lookup.c:3219 +#: cp/name-lookup.c:3220 #, gcc-internal-format msgid "" "%qD attribute is meaningless since members of the anonymous namespace get " "local symbols" msgstr "" -#: cp/name-lookup.c:3228 cp/name-lookup.c:3598 +#: cp/name-lookup.c:3229 cp/name-lookup.c:3599 #, gcc-internal-format msgid "%qD attribute directive ignored" msgstr "" -#: cp/name-lookup.c:3273 +#: cp/name-lookup.c:3274 #, gcc-internal-format msgid "namespace alias %qD not allowed here, assuming %qD" msgstr "" -#: cp/name-lookup.c:3586 +#: cp/name-lookup.c:3587 #, gcc-internal-format msgid "strong using only meaningful at namespace scope" msgstr "" -#: cp/name-lookup.c:3590 +#: cp/name-lookup.c:3591 #, gcc-internal-format msgid "current namespace %qD does not enclose strongly used namespace %qD" msgstr "" -#: cp/name-lookup.c:5017 +#: cp/name-lookup.c:5018 #, gcc-internal-format msgid "argument dependent lookup finds %q+D" msgstr "" -#: cp/name-lookup.c:5461 +#: cp/name-lookup.c:5462 #, gcc-internal-format msgid "XXX entering pop_everything ()\n" msgstr "" -#: cp/name-lookup.c:5470 +#: cp/name-lookup.c:5471 #, gcc-internal-format msgid "XXX leaving pop_everything ()\n" msgstr "" @@ -27005,332 +30338,488 @@ msgstr "" msgid "making multiple clones of %qD" msgstr "" -#: cp/parser.c:435 +#: cp/parser.c:436 #, gcc-internal-format msgid "identifier %qE will become a keyword in C++0x" msgstr "" -#: cp/parser.c:2100 +#: cp/parser.c:2102 #, gcc-internal-format msgid "%<#pragma%> is not allowed here" msgstr "" -#: cp/parser.c:2131 +#: cp/parser.c:2133 #, gcc-internal-format msgid "%<%E::%E%> has not been declared" msgstr "" -#: cp/parser.c:2134 +#: cp/parser.c:2136 #, gcc-internal-format msgid "%<::%E%> has not been declared" msgstr "" -#: cp/parser.c:2137 +#: cp/parser.c:2139 #, gcc-internal-format msgid "request for member %qE in non-class type %qT" msgstr "" -#: cp/parser.c:2140 +#: cp/parser.c:2142 #, gcc-internal-format msgid "%<%T::%E%> has not been declared" msgstr "" -#: cp/parser.c:2143 +#: cp/parser.c:2145 #, gcc-internal-format msgid "%qE has not been declared" msgstr "" -#: cp/parser.c:2146 +#: cp/parser.c:2148 #, gcc-internal-format msgid "%<%E::%E%> %s" msgstr "" -#: cp/parser.c:2148 +#: cp/parser.c:2150 #, gcc-internal-format msgid "%<::%E%> %s" msgstr "" -#: cp/parser.c:2150 +#: cp/parser.c:2152 #, gcc-internal-format msgid "%qE %s" msgstr "" -#: cp/parser.c:2188 +#: cp/parser.c:2190 #, gcc-internal-format msgid "ISO C++ 1998 does not support %" msgstr "" -#: cp/parser.c:2209 +#: cp/parser.c:2211 #, gcc-internal-format msgid "duplicate %qs" msgstr "" -#: cp/parser.c:2254 +#: cp/parser.c:2256 #, gcc-internal-format msgid "new types may not be defined in a return type" msgstr "" -#: cp/parser.c:2256 +#: cp/parser.c:2258 #, gcc-internal-format msgid "(perhaps a semicolon is missing after the definition of %qT)" msgstr "" -#: cp/parser.c:2276 cp/parser.c:4289 cp/pt.c:6249 +<<<<<<< HEAD +#: cp/parser.c:2278 cp/parser.c:4291 cp/pt.c:6335 +======= +#: cp/parser.c:2278 cp/parser.c:4291 cp/pt.c:6332 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qT is not a template" msgstr "" -#: cp/parser.c:2278 +#: cp/parser.c:2280 #, gcc-internal-format msgid "%qE is not a template" msgstr "" -#: cp/parser.c:2280 +#: cp/parser.c:2282 #, gcc-internal-format msgid "invalid template-id" msgstr "" -#: cp/parser.c:2343 +#: cp/parser.c:2345 #, gcc-internal-format msgid "invalid use of template-name %qE without an argument list" msgstr "" -#: cp/parser.c:2346 +#: cp/parser.c:2348 #, gcc-internal-format msgid "invalid use of destructor %qD as a type" msgstr "" #. Something like 'unsigned A a;' -#: cp/parser.c:2349 +#: cp/parser.c:2351 #, gcc-internal-format msgid "invalid combination of multiple type-specifiers" msgstr "" #. Issue an error message. -#: cp/parser.c:2353 +#: cp/parser.c:2355 #, gcc-internal-format msgid "%qE does not name a type" msgstr "" -#: cp/parser.c:2386 +#: cp/parser.c:2388 #, gcc-internal-format msgid "(perhaps % was intended)" msgstr "" -#: cp/parser.c:2401 +#: cp/parser.c:2403 #, gcc-internal-format msgid "%qE in namespace %qE does not name a type" msgstr "" #. A::A() -#: cp/parser.c:2407 +#: cp/parser.c:2409 #, gcc-internal-format msgid "%<%T::%E%> names the constructor, not the type" msgstr "" -#: cp/parser.c:2410 +#: cp/parser.c:2412 #, gcc-internal-format msgid "and %qT has no template constructors" msgstr "" -#: cp/parser.c:2415 +#: cp/parser.c:2417 #, gcc-internal-format msgid "need % before %<%T::%E%> because %qT is a dependent scope" msgstr "" -#: cp/parser.c:2419 +#: cp/parser.c:2421 #, gcc-internal-format msgid "%qE in class %qT does not name a type" msgstr "" -#: cp/parser.c:3208 +#: cp/parser.c:3210 #, gcc-internal-format msgid "fixed-point types not supported in C++" msgstr "" -#: cp/parser.c:3289 +#: cp/parser.c:3291 #, gcc-internal-format msgid "ISO C++ forbids braced-groups within expressions" msgstr "" -#: cp/parser.c:3301 +#: cp/parser.c:3303 #, gcc-internal-format msgid "" "statement-expressions are not allowed outside functions nor in template-" "argument lists" msgstr "" -#: cp/parser.c:3374 +#: cp/parser.c:3376 #, gcc-internal-format msgid "% may not be used in this context" msgstr "" -#: cp/parser.c:3595 +#: cp/parser.c:3597 #, gcc-internal-format msgid "local variable %qD may not appear in this context" msgstr "" -#: cp/parser.c:3889 +#: cp/parser.c:3891 #, gcc-internal-format msgid "scope %qT before %<~%> is not a class-name" msgstr "" -#: cp/parser.c:4008 +#: cp/parser.c:4010 #, gcc-internal-format msgid "declaration of %<~%T%> as member of %qT" msgstr "" -#: cp/parser.c:4023 +#: cp/parser.c:4025 #, gcc-internal-format msgid "typedef-name %qD used as destructor declarator" msgstr "" +<<<<<<< HEAD +#: cp/parser.c:4552 cp/parser.c:6165 +======= +#: cp/parser.c:4542 cp/parser.c:6155 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in casts" +msgstr "" + +<<<<<<< HEAD +#: cp/parser.c:4615 +======= +#: cp/parser.c:4605 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in a % expression" +msgstr "" + #. Warn the user that a compound literal is not #. allowed in standard C++. -#: cp/parser.c:4713 +<<<<<<< HEAD +#: cp/parser.c:4725 +======= +#: cp/parser.c:4715 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids compound-literals" msgstr "" -#: cp/parser.c:5090 +<<<<<<< HEAD +#: cp/parser.c:5102 +======= +#: cp/parser.c:5092 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qE does not have class type" msgstr "" -#: cp/parser.c:5175 cp/typeck.c:2316 +<<<<<<< HEAD +#: cp/parser.c:5187 cp/typeck.c:2325 +======= +#: cp/parser.c:5177 cp/typeck.c:2339 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of %qD" msgstr "" -#: cp/parser.c:5758 +<<<<<<< HEAD +#: cp/parser.c:5770 +======= +#: cp/parser.c:5760 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "array bound forbidden after parenthesized type-id" msgstr "" -#: cp/parser.c:5760 +<<<<<<< HEAD +#: cp/parser.c:5772 +======= +#: cp/parser.c:5762 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "try removing the parentheses around the type-id" msgstr "" -#: cp/parser.c:5964 +<<<<<<< HEAD +#: cp/parser.c:5852 +======= +#: cp/parser.c:5842 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in a new-type-id" +msgstr "" + +<<<<<<< HEAD +#: cp/parser.c:5976 +======= +#: cp/parser.c:5966 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expression in new-declarator must have integral or enumeration type" msgstr "" -#: cp/parser.c:6218 +<<<<<<< HEAD +#: cp/parser.c:6230 +======= +#: cp/parser.c:6220 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use of old-style cast" msgstr "" -#: cp/parser.c:6349 +<<<<<<< HEAD +#: cp/parser.c:6361 +======= +#: cp/parser.c:6351 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<>>%> operator will be treated as two right angle brackets in C++0x" msgstr "" -#: cp/parser.c:6352 +<<<<<<< HEAD +#: cp/parser.c:6364 +======= +#: cp/parser.c:6354 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "suggest parentheses around %<>>%> expression" msgstr "" -#: cp/parser.c:7187 +<<<<<<< HEAD +#: cp/parser.c:7203 +======= +#: cp/parser.c:7193 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expected end of capture-list" msgstr "" -#: cp/parser.c:7238 +<<<<<<< HEAD +#: cp/parser.c:7254 +======= +#: cp/parser.c:7244 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ does not allow initializers in lambda expression capture lists" msgstr "" -#: cp/parser.c:7332 +<<<<<<< HEAD +#: cp/parser.c:7348 +======= +#: cp/parser.c:7338 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default argument specified for lambda parameter" msgstr "" -#: cp/parser.c:7395 -#, gcc-internal-format -msgid "lambda expression with no captures declared mutable" -msgstr "" - -#: cp/parser.c:7738 +<<<<<<< HEAD +#: cp/parser.c:7745 +======= +#: cp/parser.c:7735 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "case label %qE not within a switch statement" msgstr "" -#: cp/parser.c:7811 +<<<<<<< HEAD +#: cp/parser.c:7818 +======= +#: cp/parser.c:7808 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "need % before %qE because %qT is a dependent scope" msgstr "" -#: cp/parser.c:7820 +<<<<<<< HEAD +#: cp/parser.c:7827 +======= +#: cp/parser.c:7817 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<%T::%D%> names the constructor, not the type" msgstr "" +<<<<<<< HEAD +#: cp/parser.c:8113 +======= +#: cp/parser.c:8103 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in conditions" +msgstr "" + #. Issue a warning about this use of a GNU extension. -#: cp/parser.c:8455 +<<<<<<< HEAD +#: cp/parser.c:8462 +======= +#: cp/parser.c:8452 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ forbids computed gotos" msgstr "" -#: cp/parser.c:8600 cp/parser.c:16601 +<<<<<<< HEAD +#: cp/parser.c:8607 cp/parser.c:16615 +======= +#: cp/parser.c:8597 cp/parser.c:16603 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "extra %<;%>" msgstr "" -#: cp/parser.c:8821 +<<<<<<< HEAD +#: cp/parser.c:8828 +======= +#: cp/parser.c:8818 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<__label__%> not at the beginning of a block" msgstr "" -#: cp/parser.c:8959 +<<<<<<< HEAD +#: cp/parser.c:8966 +======= +#: cp/parser.c:8956 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "mixing declarations and function-definitions is forbidden" msgstr "" -#: cp/parser.c:9100 +<<<<<<< HEAD +#: cp/parser.c:9107 +======= +#: cp/parser.c:9097 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% used outside of class" msgstr "" #. Complain about `auto' as a storage specifier, if #. we're complaining about C++0x compatibility. -#: cp/parser.c:9159 +<<<<<<< HEAD +#: cp/parser.c:9166 +======= +#: cp/parser.c:9156 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% will change meaning in C++0x; please remove it" msgstr "" -#: cp/parser.c:9281 +<<<<<<< HEAD +#: cp/parser.c:9288 +======= +#: cp/parser.c:9278 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "class definition may not be declared a friend" msgstr "" -#: cp/parser.c:9350 cp/parser.c:16925 +<<<<<<< HEAD +#: cp/parser.c:9357 cp/parser.c:16939 +======= +#: cp/parser.c:9347 cp/parser.c:16927 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "templates may not be %" msgstr "" -#: cp/parser.c:9771 +<<<<<<< HEAD +#: cp/parser.c:9523 +======= +#: cp/parser.c:9513 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in % expressions" +msgstr "" + +<<<<<<< HEAD +#: cp/parser.c:9778 +======= +#: cp/parser.c:9768 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of % in conversion operator" msgstr "" -#: cp/parser.c:9856 +<<<<<<< HEAD +#: cp/parser.c:9863 +======= +#: cp/parser.c:9853 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "only constructors take base initializers" msgstr "" -#: cp/parser.c:9878 +<<<<<<< HEAD +#: cp/parser.c:9885 +======= +#: cp/parser.c:9875 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot expand initializer for member %<%D%>" msgstr "" -#: cp/parser.c:9933 +<<<<<<< HEAD +#: cp/parser.c:9940 +======= +#: cp/parser.c:9930 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "anachronistic old-style base class initializer" msgstr "" -#: cp/parser.c:10001 +<<<<<<< HEAD +#: cp/parser.c:10008 +======= +#: cp/parser.c:9998 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "keyword % not allowed in this context (a qualified member " @@ -27338,256 +30827,475 @@ msgid "" msgstr "" #. Warn that we do not support `export'. -#: cp/parser.c:10346 +<<<<<<< HEAD +#: cp/parser.c:10353 +======= +#: cp/parser.c:10343 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "keyword % not implemented, and will be ignored" msgstr "" -#: cp/parser.c:10532 cp/parser.c:10631 cp/parser.c:10738 cp/parser.c:15310 +<<<<<<< HEAD +#: cp/parser.c:10539 cp/parser.c:10638 cp/parser.c:10745 cp/parser.c:15324 +======= +#: cp/parser.c:10529 cp/parser.c:10628 cp/parser.c:10735 cp/parser.c:15312 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template parameter pack %qD cannot have a default argument" msgstr "" -#: cp/parser.c:10536 cp/parser.c:15317 +<<<<<<< HEAD +#: cp/parser.c:10543 cp/parser.c:15331 +======= +#: cp/parser.c:10533 cp/parser.c:15319 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template parameter pack cannot have a default argument" msgstr "" -#: cp/parser.c:10635 cp/parser.c:10742 +<<<<<<< HEAD +#: cp/parser.c:10642 cp/parser.c:10749 +======= +#: cp/parser.c:10632 cp/parser.c:10739 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template parameter packs cannot have default arguments" msgstr "" -#: cp/parser.c:10882 +<<<<<<< HEAD +#: cp/parser.c:10889 +======= +#: cp/parser.c:10879 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<<::%> cannot begin a template-argument list" msgstr "" -#: cp/parser.c:10886 +<<<<<<< HEAD +#: cp/parser.c:10893 +======= +#: cp/parser.c:10883 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "%<<:%> is an alternate spelling for %<[%>. Insert whitespace between %<<%> " "and %<::%>" msgstr "" -#: cp/parser.c:10964 +<<<<<<< HEAD +#: cp/parser.c:10971 +======= +#: cp/parser.c:10961 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "parse error in template argument list" msgstr "" #. Explain what went wrong. -#: cp/parser.c:11078 +<<<<<<< HEAD +#: cp/parser.c:11085 +======= +#: cp/parser.c:11075 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "non-template %qD used as template" msgstr "" -#: cp/parser.c:11080 +<<<<<<< HEAD +#: cp/parser.c:11087 +======= +#: cp/parser.c:11077 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "use %<%T::template %D%> to indicate that it is a template" msgstr "" -#: cp/parser.c:11213 +<<<<<<< HEAD +#: cp/parser.c:11220 +======= +#: cp/parser.c:11210 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "expected parameter pack before %<...%>" msgstr "" -#: cp/parser.c:11631 +<<<<<<< HEAD +#: cp/parser.c:11638 +======= +#: cp/parser.c:11628 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "template specialization with C linkage" msgstr "" -#: cp/parser.c:12447 +<<<<<<< HEAD +#: cp/parser.c:12454 +======= +#: cp/parser.c:12444 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration %qD does not declare anything" msgstr "" -#: cp/parser.c:12533 +<<<<<<< HEAD +#: cp/parser.c:12540 +======= +#: cp/parser.c:12530 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attributes ignored on uninstantiated type" msgstr "" -#: cp/parser.c:12537 +<<<<<<< HEAD +#: cp/parser.c:12544 +======= +#: cp/parser.c:12534 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attributes ignored on template instantiation" msgstr "" -#: cp/parser.c:12542 +<<<<<<< HEAD +#: cp/parser.c:12549 +======= +#: cp/parser.c:12539 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "attributes ignored on elaborated-type-specifier that is not a forward " "declaration" msgstr "" -#: cp/parser.c:12827 +<<<<<<< HEAD +#: cp/parser.c:12834 +======= +#: cp/parser.c:12824 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is not a namespace-name" msgstr "" -#: cp/parser.c:12954 +<<<<<<< HEAD +#: cp/parser.c:12961 +======= +#: cp/parser.c:12951 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "% definition is not allowed here" msgstr "" -#: cp/parser.c:13095 +<<<<<<< HEAD +#: cp/parser.c:13102 +======= +#: cp/parser.c:13092 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "a template-id may not appear in a using-declaration" msgstr "" -#: cp/parser.c:13516 +<<<<<<< HEAD +#: cp/parser.c:13528 +======= +#: cp/parser.c:13518 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "an asm-specification is not allowed on a function-definition" msgstr "" -#: cp/parser.c:13520 +<<<<<<< HEAD +#: cp/parser.c:13532 +======= +#: cp/parser.c:13522 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attributes are not allowed on a function-definition" msgstr "" -#: cp/parser.c:13673 +<<<<<<< HEAD +#: cp/parser.c:13685 +======= +#: cp/parser.c:13675 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "initializer provided for function" msgstr "" -#: cp/parser.c:13706 +<<<<<<< HEAD +#: cp/parser.c:13718 +======= +#: cp/parser.c:13708 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "attributes after parenthesized initializer ignored" msgstr "" -#: cp/parser.c:14101 cp/pt.c:9873 +<<<<<<< HEAD +#: cp/parser.c:14236 +======= +#: cp/parser.c:14103 cp/pt.c:10013 #, gcc-internal-format msgid "array bound is not an integer constant" msgstr "" -#: cp/parser.c:14222 +#: cp/parser.c:14224 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "cannot define member of dependent typedef %qT" msgstr "" -#: cp/parser.c:14226 +<<<<<<< HEAD +#: cp/parser.c:14240 +======= +#: cp/parser.c:14228 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%<%T::%E%> is not a type" msgstr "" -#: cp/parser.c:14254 +<<<<<<< HEAD +#: cp/parser.c:14268 +======= +#: cp/parser.c:14256 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of constructor as a template" msgstr "" -#: cp/parser.c:14256 +<<<<<<< HEAD +#: cp/parser.c:14270 +======= +#: cp/parser.c:14258 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "" "use %<%T::%D%> instead of %<%T::%D%> to name the constructor in a qualified " "name" msgstr "" -#: cp/parser.c:14434 +<<<<<<< HEAD +#: cp/parser.c:14448 +======= +#: cp/parser.c:14436 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "%qD is a namespace" msgstr "" -#: cp/parser.c:14509 +<<<<<<< HEAD +#: cp/parser.c:14523 +======= +#: cp/parser.c:14511 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "duplicate cv-qualifier" msgstr "" -#: cp/parser.c:14631 cp/typeck2.c:501 +<<<<<<< HEAD +#: cp/parser.c:14645 cp/typeck2.c:501 +======= +#: cp/parser.c:14633 cp/typeck2.c:501 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid use of %" msgstr "" -#: cp/parser.c:15243 +<<<<<<< HEAD +#: cp/parser.c:15039 +======= +#: cp/parser.c:15027 +>>>>>>> * gcc.pot: Regenerate. +#, gcc-internal-format +msgid "types may not be defined in parameter types" +msgstr "" + +<<<<<<< HEAD +#: cp/parser.c:15257 +======= +#: cp/parser.c:15245 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "file ends in default argument" msgstr "" -#: cp/parser.c:15289 +<<<<<<< HEAD +#: cp/parser.c:15303 +======= +#: cp/parser.c:15291 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "deprecated use of default argument for parameter of non-function" msgstr "" -#: cp/parser.c:15293 +<<<<<<< HEAD +#: cp/parser.c:15307 +======= +#: cp/parser.c:15295 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "default arguments are only permitted for function parameters" msgstr "" -#: cp/parser.c:15579 +<<<<<<< HEAD +#: cp/parser.c:15593 +======= +#: cp/parser.c:15581 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "ISO C++ does not allow designated initializers" msgstr "" -#: cp/parser.c:16193 +<<<<<<< HEAD +#: cp/parser.c:16207 +======= +#: cp/parser.c:16195 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "invalid class name in declaration of %qD" msgstr "" -#: cp/parser.c:16207 +<<<<<<< HEAD +#: cp/parser.c:16221 +======= +#: cp/parser.c:16209 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD in namespace %qD which does not enclose %qD" msgstr "" -#: cp/parser.c:16212 +<<<<<<< HEAD +#: cp/parser.c:16226 +======= +#: cp/parser.c:16214 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "declaration of %qD in %qD which does not enclose %qD" msgstr "" -#: cp/parser.c:16226 +<<<<<<< HEAD +#: cp/parser.c:16240 +======= +#: cp/parser.c:16228 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "extra qualification not allowed" msgstr "" -#: cp/parser.c:16238 +<<<<<<< HEAD +#: cp/parser.c:16252 +======= +#: cp/parser.c:16240 +>>>>>>> * gcc.pot: Regenerate. #, gcc-internal-format msgid "an explicit specialization must be preceded by %