* gcc.pot: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157756 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 369a857..779f048 100644 (file)
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,28 +1,3 @@
-2010-05-01  Joseph Myers  <joseph@codesourcery.com>
-
-       * sv.po: Update.
-
-2010-04-26  Joseph Myers  <joseph@codesourcery.com>
-
-       * sv.po: Update.
-
-2010-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-       * es.po: Update.
-
-2010-04-19  Joseph Myers  <joseph@codesourcery.com>
-
-       * zh_CN.po: Update.
-
-2010-04-16  Joseph Myers  <joseph@codesourcery.com>
-
-       * be.po, da.po, de.po, el.po, es.po, fi.po, fr.po, id.po, ja.po,
-       nl.po, ru.po, sr.po, sv.po, tr.po, zh_CN.po, zh_TW.po: Update.
-
-2010-04-06  Joseph Myers  <joseph@codesourcery.com>
-
-       * gcc.pot: Regenerate.
-

 2010-03-26  Joseph Myers  <joseph@codesourcery.com>
 
        * gcc.pot: Regenerate.
 2010-03-26  Joseph Myers  <joseph@codesourcery.com>
 
        * gcc.pot: Regenerate.

diff --git a/gcc/po/gcc.pot b/gcc/po/gcc.pot
index 6cb2f69..58f1b31 100644 (file)
--- a/gcc/po/gcc.pot
+++ b/gcc/po/gcc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"

-"POT-Creation-Date: 2010-04-06 14:19+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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -283,7 +283,11 @@ msgstr ""
 msgid "({anonymous})"
 msgstr ""
 
 msgid "({anonymous})"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-opts.c:1501 tree.c:3970 cp/error.c:999 fortran/cpp.c:552
 #: 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 "<built-in>"
 msgstr ""
 
 msgid "<built-in>"
 msgstr ""
 


@@ -447,7 +451,11 @@ msgstr ""
 
 #. ??? This should not be an error when inlining calls to
 #. unprototyped functions.
 
 #. ??? This should not be an error when inlining calls to
 #. unprototyped functions.

+<<<<<<< HEAD

 #: c-typeck.c:5906 c-typeck.c:5359 cp/typeck.c:1862
 #: 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 ""
 #, gcc-internal-format
 msgid "invalid use of non-lvalue array"
 msgstr ""


@@ -858,13 +866,21 @@ msgstr ""
 #. handle them.
 #. We can't handle floating point constants;
 #. PRINT_OPERAND must handle them.
 #. handle them.
 #. We can't handle floating point constants;
 #. PRINT_OPERAND must handle them.

+<<<<<<< HEAD

 #: final.c:3582 vmsdbgout.c:496 config/i386/i386.c:10813
 #: 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 ""
 
 #: config/pdp11/pdp11.c:1682
 #, c-format
 msgid "floating constant misused"
 msgstr ""
 

+<<<<<<< HEAD

 #: final.c:3644 vmsdbgout.c:553 config/i386/i386.c:10900
 #: 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"
 #: config/pdp11/pdp11.c:1729
 #, c-format
 msgid "invalid expression as operand"


@@ -2238,12 +2254,20 @@ msgstr ""
 msgid "created and used with different settings of -fpie"
 msgstr ""
 
 msgid "created and used with different settings of -fpie"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:6515
 #: tree-vrp.c:6515

+=======
+#: tree-vrp.c:6502
+>>>>>>>        * gcc.pot: Regenerate.

 msgid ""
 "assuming signed overflow does not occur when simplifying && or || to & or |"
 msgstr ""
 
 msgid ""
 "assuming signed overflow does not occur when simplifying && or || to & or |"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:6519
 #: tree-vrp.c:6519

+=======
+#: tree-vrp.c:6506
+>>>>>>>        * gcc.pot: Regenerate.

 msgid ""
 "assuming signed overflow does not occur when simplifying ==, != or ! to "
 "identity or ^"
 msgid ""
 "assuming signed overflow does not occur when simplifying ==, != or ! to "
 "identity or ^"


@@ -2950,18 +2974,30 @@ msgid "invalid %%r value"
 msgstr ""
 
 #: config/alpha/alpha.c:5196 config/ia64/ia64.c:4929
 msgstr ""
 
 #: config/alpha/alpha.c:5196 config/ia64/ia64.c:4929

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14626 config/xtensa/xtensa.c:2253
 #: 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 ""
 
 #, c-format
 msgid "invalid %%R value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/alpha/alpha.c:5202 config/rs6000/rs6000.c:14545
 #: 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/xtensa/xtensa.c:2220
 #, c-format
 msgid "invalid %%N value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/alpha/alpha.c:5210 config/rs6000/rs6000.c:14573
 #: 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 ""
 #, c-format
 msgid "invalid %%P value"
 msgstr ""


@@ -2976,12 +3012,20 @@ msgstr ""
 msgid "invalid %%L value"
 msgstr ""
 
 msgid "invalid %%L value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/alpha/alpha.c:5265 config/rs6000/rs6000.c:14527
 #: 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 ""
 
 #, c-format
 msgid "invalid %%m value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/alpha/alpha.c:5273 config/rs6000/rs6000.c:14535
 #: 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 ""
 #, c-format
 msgid "invalid %%M value"
 msgstr ""


@@ -2992,7 +3036,11 @@ msgid "invalid %%U value"
 msgstr ""
 
 #: config/alpha/alpha.c:5329 config/alpha/alpha.c:5343
 msgstr ""
 
 #: config/alpha/alpha.c:5329 config/alpha/alpha.c:5343

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14634
 #: config/rs6000/rs6000.c:14634

+=======
+#: config/rs6000/rs6000.c:14632
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%s value"
 msgstr ""
 #, c-format
 msgid "invalid %%s value"
 msgstr ""


@@ -3002,7 +3050,11 @@ msgstr ""
 msgid "invalid %%C value"
 msgstr ""
 
 msgid "invalid %%C value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/alpha/alpha.c:5403 config/rs6000/rs6000.c:14381
 #: 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 ""
 #, c-format
 msgid "invalid %%E value"
 msgstr ""


@@ -3013,7 +3065,11 @@ msgid "unknown relocation unspec"
 msgstr ""
 
 #: config/alpha/alpha.c:5437 config/crx/crx.c:1092
 msgstr ""
 
 #: config/alpha/alpha.c:5437 config/crx/crx.c:1092

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14988 config/spu/spu.c:1695
 #: 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 ""
 #, c-format
 msgid "invalid %%xn code"
 msgstr ""


@@ -3045,21 +3101,34 @@ msgstr ""
 msgid "invalid operand output code"
 msgstr ""
 
 msgid "invalid operand output code"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:14854 config/arm/arm.c:14872
 #: 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 ""
 
 #, c-format
 msgid "predicated Thumb instruction"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:14860
 #: config/arm/arm.c:14860

+=======
+#: config/arm/arm.c:14867
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "predicated instruction in conditional sequence"
 msgstr ""
 
 #, c-format
 msgid "predicated instruction in conditional sequence"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:15030
 #: config/arm/arm.c:15030

+=======
+#: config/arm/arm.c:15037
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid shift operand"
 msgstr ""
 
 #, c-format
 msgid "invalid shift operand"
 msgstr ""
 

+<<<<<<< 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: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


@@ -3070,25 +3139,53 @@ msgstr ""
 #: 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/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 ""
 
 #, c-format
 msgid "invalid operand for code '%c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:15169
 #: config/arm/arm.c:15169

+=======
+#: config/arm/arm.c:15176
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "instruction never executed"
 msgstr ""
 
 #, c-format
 msgid "instruction never executed"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:15472
 #: config/arm/arm.c:15472

+=======
+#: config/arm/arm.c:15479
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "missing operand"
 msgstr ""
 
 #, c-format
 msgid "missing operand"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:17746
 msgid "function parameters cannot have __fp16 type"
 msgstr ""
 
 #: config/arm/arm.c:17756
 #: config/arm/arm.c:17746
 msgid "function parameters cannot have __fp16 type"
 msgstr ""
 
 #: 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 ""
 
 msgid "functions cannot return __fp16 type"
 msgstr ""
 


@@ -3153,7 +3250,11 @@ msgstr ""
 #: 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
 #: 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: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 ""
 #, gcc-internal-format
 msgid "%s"
 msgstr ""


@@ -3387,71 +3488,123 @@ msgstr ""
 msgid " (frv)"
 msgstr ""
 
 msgid " (frv)"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:10894
 #: config/i386/i386.c:10894

+=======
+#: config/i386/i386.c:10897
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid UNSPEC as operand"
 msgstr ""
 
 #, c-format
 msgid "invalid UNSPEC as operand"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11440
 #: config/i386/i386.c:11440

+=======
+#: config/i386/i386.c:11444
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "'%%&' used without any local dynamic TLS references"
 msgstr ""
 
 #, c-format
 msgid "'%%&' used without any local dynamic TLS references"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11531 config/i386/i386.c:11606
 #: 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 ""
 
 #, c-format
 msgid "invalid operand size for operand code '%c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11601
 #: 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 ""
 
 #, c-format
 msgid "invalid operand type used with operand code '%c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11681 config/i386/i386.c:11721
 #: 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 ""
 
 #, c-format
 msgid "operand is not a condition code, invalid operand code 'D'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11747
 #: 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 ""
 
 #, c-format
 msgid ""
 "operand is neither a constant nor a condition code, invalid operand code 'C'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11757
 #: 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 ""
 
 #, c-format
 msgid ""
 "operand is neither a constant nor a condition code, invalid operand code 'F'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11775
 #: 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 ""
 
 #, c-format
 msgid ""
 "operand is neither a constant nor a condition code, invalid operand code 'c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11785
 #: 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 ""
 
 #, c-format
 msgid ""
 "operand is neither a constant nor a condition code, invalid operand code 'f'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11888
 #: 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 ""
 
 #, c-format
 msgid "operand is not a condition code, invalid operand code 'Y'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11903
 #: config/i386/i386.c:11903

+=======
+#: config/i386/i386.c:11915
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid operand code '%c'"
 msgstr ""
 
 #, c-format
 msgid "invalid operand code '%c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11953
 #: config/i386/i386.c:11953

+=======
+#: config/i386/i386.c:11965
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid constraints for operand"
 msgstr ""
 
 #, c-format
 msgid "invalid constraints for operand"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:19549
 #: config/i386/i386.c:19549

+=======
+#: config/i386/i386.c:19561
+>>>>>>>        * gcc.pot: Regenerate.

 msgid "unknown insn mode"
 msgstr ""
 
 msgid "unknown insn mode"
 msgstr ""
 


@@ -3499,7 +3652,11 @@ msgstr ""
 msgid "invalid %%P operand"
 msgstr ""
 
 msgid "invalid %%P operand"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/iq2000/iq2000.c:3173 config/rs6000/rs6000.c:14563
 #: 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 ""
 #, c-format
 msgid "invalid %%p value"
 msgstr ""


@@ -3563,7 +3720,11 @@ msgid "post-increment address is not a register"
 msgstr ""
 
 #: config/m32r/m32r.c:2205 config/m32r/m32r.c:2219
 msgstr ""
 
 #: config/m32r/m32r.c:2205 config/m32r/m32r.c:2219

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23777
 #: config/rs6000/rs6000.c:23777

+=======
+#: config/rs6000/rs6000.c:23775
+>>>>>>>        * gcc.pot: Regenerate.

 msgid "bad address"
 msgstr ""
 
 msgid "bad address"
 msgstr ""
 


@@ -3721,91 +3882,163 @@ msgstr ""
 msgid "-mno-altivec disables vsx"
 msgstr ""
 
 msgid "-mno-altivec disables vsx"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:6691
 msgid "bad move"
 msgstr ""
 
 #: config/rs6000/rs6000.c:14362
 #: 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:14360
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%c value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%c value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14390
 #: config/rs6000/rs6000.c:14390

+=======
+#: config/rs6000/rs6000.c:14388
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%f value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%f value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14399
 #: config/rs6000/rs6000.c:14399

+=======
+#: config/rs6000/rs6000.c:14397
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%F value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%F value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14408
 #: config/rs6000/rs6000.c:14408

+=======
+#: config/rs6000/rs6000.c:14406
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%G value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%G value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14443
 #: config/rs6000/rs6000.c:14443

+=======
+#: config/rs6000/rs6000.c:14441
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%j code"
 msgstr ""
 
 #, c-format
 msgid "invalid %%j code"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14453
 #: config/rs6000/rs6000.c:14453

+=======
+#: config/rs6000/rs6000.c:14451
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%J code"
 msgstr ""
 
 #, c-format
 msgid "invalid %%J code"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14463
 #: config/rs6000/rs6000.c:14463

+=======
+#: config/rs6000/rs6000.c:14461
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%k value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%k value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14483 config/xtensa/xtensa.c:2239
 #: 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 ""
 
 #, c-format
 msgid "invalid %%K value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14553
 #: config/rs6000/rs6000.c:14553

+=======
+#: config/rs6000/rs6000.c:14551
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%O value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%O value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14600
 #: config/rs6000/rs6000.c:14600

+=======
+#: config/rs6000/rs6000.c:14598
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%q value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%q value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14644
 #: config/rs6000/rs6000.c:14644

+=======
+#: config/rs6000/rs6000.c:14642
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%S value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%S value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14684
 #: config/rs6000/rs6000.c:14684

+=======
+#: config/rs6000/rs6000.c:14682
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%T value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%T value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14694
 #: config/rs6000/rs6000.c:14694

+=======
+#: config/rs6000/rs6000.c:14692
+>>>>>>>        * gcc.pot: Regenerate.

 #, c-format
 msgid "invalid %%u value"
 msgstr ""
 
 #, c-format
 msgid "invalid %%u value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14703 config/xtensa/xtensa.c:2209
 #: 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 ""
 
 #, c-format
 msgid "invalid %%v value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14802 config/xtensa/xtensa.c:2260
 #: 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 ""
 
 #, c-format
 msgid "invalid %%x value"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:14947
 #: 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 ""
 
 #, c-format
 msgid "invalid %%y value, try using the 'Z' constraint"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:25750
 #: config/rs6000/rs6000.c:25750

+=======
+#: config/rs6000/rs6000.c:25748
+>>>>>>>        * gcc.pot: Regenerate.

 msgid "AltiVec argument passed to unprototyped function"
 msgstr ""
 
 msgid "AltiVec argument passed to unprototyped function"
 msgstr ""
 


@@ -3974,6 +4207,7 @@ msgstr ""
 msgid "address offset not a constant"
 msgstr ""
 
 msgid "address offset not a constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:2779 cp/pt.c:1701 cp/pt.c:16017
 msgid "candidates are:"
 msgstr ""
 #: cp/call.c:2779 cp/pt.c:1701 cp/pt.c:16017
 msgid "candidates are:"
 msgstr ""


@@ -3987,6 +4221,21 @@ msgid "candidate 1:"
 msgstr ""
 
 #: cp/call.c:7361
 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:16017
+msgid "candidate is:"
+msgstr ""
+
+#: cp/call.c:7356
+msgid "candidate 1:"
+msgstr ""
+
+#: cp/call.c:7357
+>>>>>>>        * gcc.pot: Regenerate.

 msgid "candidate 2:"
 msgstr ""
 
 msgid "candidate 2:"
 msgstr ""
 


@@ -4209,31 +4458,52 @@ msgstr ""
 msgid "source type is not polymorphic"
 msgstr ""
 
 msgid "source type is not polymorphic"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4679 c-typeck.c:3345
 #: 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 ""
 
 #, gcc-internal-format
 msgid "wrong type argument to unary minus"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4680 c-typeck.c:3332
 #: 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 ""
 
 #, gcc-internal-format
 msgid "wrong type argument to unary plus"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4703 c-typeck.c:3371
 #: 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 ""
 
 #, gcc-internal-format
 msgid "wrong type argument to bit-complement"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4710 c-typeck.c:3379
 #: 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 ""
 
 #, gcc-internal-format
 msgid "wrong type argument to abs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4718 c-typeck.c:3391
 #: 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 ""
 
 #, gcc-internal-format
 msgid "wrong type argument to conjugation"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4729
 msgid "in argument to unary !"
 msgstr ""
 #: cp/typeck.c:4729
 msgid "in argument to unary !"
 msgstr ""


@@ -4251,6 +4521,25 @@ msgid "no pre-decrement operator for type"
 msgstr ""
 
 #: cp/typeck.c:4796
 msgstr ""
 
 #: 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 ""
 
 msgid "no post-decrement operator for type"
 msgstr ""
 


@@ -4329,7 +4618,11 @@ msgstr ""
 msgid "Integer value too large in expression at %C"
 msgstr ""
 
 msgid "Integer value too large in expression at %C"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3023
 #: fortran/expr.c:3023

+=======
+#: fortran/expr.c:3022
+>>>>>>>        * gcc.pot: Regenerate.

 msgid "array assignment"
 msgstr ""
 
 msgid "array assignment"
 msgstr ""
 


@@ -4639,14 +4932,22 @@ msgstr ""
 msgid "Different CHARACTER lengths (%ld/%ld) in array constructor"
 msgstr ""
 
 msgid "Different CHARACTER lengths (%ld/%ld) in array constructor"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3989
 #: 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 ""
 
 #, c-format
 msgid ""
 "Actual string length does not match the declared one for dummy argument '%"
 "s' (%ld/%ld)"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3997
 #: 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 '%"
 #, c-format
 msgid ""
 "Actual string length is shorter than the declared one for dummy argument '%"


@@ -4972,12 +5273,15 @@ msgstr ""
 
 #: ada/gcc-interface/lang-specs.h:34
 msgid "-c or -S required for Ada"
 
 #: 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)"
 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
 msgstr ""
 
 #: config/sparc/linux64.h:165 config/sparc/linux64.h:176


@@ -5020,6 +5324,15 @@ msgstr ""
 msgid "shared and mdll are not compatible"
 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/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


@@ -11365,27 +11678,47 @@ msgstr ""
 msgid "Create a position independent executable"
 msgstr ""
 
 msgid "Create a position independent executable"
 msgstr ""
 

+<<<<<<< HEAD

 #: attribs.c:295
 #: attribs.c:295

+=======
+#: attribs.c:294
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE attribute directive ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE attribute directive ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: attribs.c:303
 #: attribs.c:303

+=======
+#: attribs.c:302
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "wrong number of arguments specified for %qE attribute"
 msgstr ""
 
 #, gcc-internal-format
 msgid "wrong number of arguments specified for %qE attribute"
 msgstr ""
 

+<<<<<<< HEAD

 #: attribs.c:321
 #: attribs.c:321

+=======
+#: attribs.c:320
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE attribute does not apply to types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE attribute does not apply to types"
 msgstr ""
 

+<<<<<<< HEAD

 #: attribs.c:373
 #: attribs.c:373

+=======
+#: attribs.c:372
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE attribute only applies to function types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE attribute only applies to function types"
 msgstr ""
 

+<<<<<<< HEAD

 #: attribs.c:383
 #: attribs.c:383

+=======
+#: attribs.c:382
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type attributes ignored after type is already defined"
 msgstr ""
 #, gcc-internal-format
 msgid "type attributes ignored after type is already defined"
 msgstr ""


@@ -11814,7 +12147,11 @@ msgstr ""
 msgid "the address of %qD will always evaluate as %<true%>"
 msgstr ""
 
 msgid "the address of %qD will always evaluate as %<true%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-common.c:4065 cp/semantics.c:593 cp/typeck.c:7135
 #: 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 ""
 #, gcc-internal-format
 msgid "suggest parentheses around assignment used as truth value"
 msgstr ""


@@ -11933,11 +12270,19 @@ msgstr ""
 #: 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
 #: 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: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"
 #: config/spu/spu.c:3909
 #, gcc-internal-format
 msgid "%qE attribute ignored"


@@ -12033,8 +12378,13 @@ msgstr ""
 msgid "section attribute cannot be specified for local variables"
 msgstr ""
 
 msgid "section attribute cannot be specified for local variables"
 msgstr ""
 

+<<<<<<< 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: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 ""
 #, gcc-internal-format
 msgid "section of %q+D conflicts with previous declaration"
 msgstr ""


@@ -12319,7 +12669,11 @@ msgstr ""
 msgid "cannot apply %<offsetof%> to a non constant address"
 msgstr ""
 
 msgid "cannot apply %<offsetof%> to a non constant address"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-common.c:8384 cp/typeck.c:5091
 #: 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 ""
 #, gcc-internal-format
 msgid "attempt to take address of bit-field structure member %qD"
 msgstr ""


@@ -12508,8 +12862,13 @@ msgstr ""
 #. an unprototyped function, it is compile-time undefined;
 #. making it a constraint in that case was rejected in
 #. DR#252.
 #. an unprototyped function, it is compile-time undefined;
 #. making it a constraint in that case was rejected in
 #. DR#252.

+<<<<<<< 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: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 ""
 #, gcc-internal-format
 msgid "void value not ignored as it ought to be"
 msgstr ""


@@ -12564,7 +12923,11 @@ msgstr ""
 msgid "type of array %q+D completed incompatibly with implicit initialization"
 msgstr ""
 
 msgid "type of array %q+D completed incompatibly with implicit initialization"
 msgstr ""
 

+<<<<<<< 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: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 ""
 #, gcc-internal-format
 msgid "originally defined here"
 msgstr ""


@@ -12821,7 +13184,11 @@ msgid ""
 "appears in"
 msgstr ""
 
 "appears in"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:3004 cp/decl.c:2446
 #: 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 ""
 #, gcc-internal-format
 msgid "label %qE referenced outside of any function"
 msgstr ""


@@ -12856,7 +13223,11 @@ msgstr ""
 msgid "duplicate label declaration %qE"
 msgstr ""
 
 msgid "duplicate label declaration %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:3215 cp/decl.c:2755
 #: 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 ""
 #, gcc-internal-format
 msgid "duplicate label %qD"
 msgstr ""


@@ -12988,7 +13359,11 @@ msgstr ""
 msgid "variable %qD has initializer but incomplete type"
 msgstr ""
 
 msgid "variable %qD has initializer but incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:4049 cp/decl.c:4174 cp/decl.c:11712
 #: 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 ""
 #, gcc-internal-format
 msgid "inline function %q+D given attribute noinline"
 msgstr ""


@@ -13008,7 +13383,11 @@ msgstr ""
 msgid "zero or negative size array %q+D"
 msgstr ""
 
 msgid "zero or negative size array %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:4218 varasm.c:2180
 #: 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 ""
 #, gcc-internal-format
 msgid "storage size of %q+D isn%'t known"
 msgstr ""


@@ -13118,7 +13497,11 @@ msgstr ""
 msgid "variable length array %qE is used"
 msgstr ""
 
 msgid "variable length array %qE is used"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:4700 cp/decl.c:7366
 #: 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 ""
 #, gcc-internal-format
 msgid "variable length array is used"
 msgstr ""


@@ -13203,7 +13586,11 @@ msgstr ""
 msgid "storage class specified for unnamed parameter"
 msgstr ""
 
 msgid "storage class specified for unnamed parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:5003 cp/decl.c:8294
 #: 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 ""
 #, gcc-internal-format
 msgid "storage class specified for typename"
 msgstr ""


@@ -13266,7 +13653,11 @@ msgstr ""
 msgid "declaration of type name as array of functions"
 msgstr ""
 
 msgid "declaration of type name as array of functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:5155 c-decl.c:6862
 #: 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 ""
 #, gcc-internal-format
 msgid "invalid use of structure with flexible array member"
 msgstr ""


@@ -13352,7 +13743,11 @@ msgstr ""
 msgid "function definition has qualified void return type"
 msgstr ""
 
 msgid "function definition has qualified void return type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:5497 cp/decl.c:8400
 #: 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 ""
 #, gcc-internal-format
 msgid "type qualifiers ignored on function return type"
 msgstr ""


@@ -13413,7 +13808,11 @@ msgstr ""
 msgid "a member of a structure or union cannot have a variably modified type"
 msgstr ""
 
 msgid "a member of a structure or union cannot have a variably modified type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:5736 cp/decl.c:7580
 #: 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 ""
 #, gcc-internal-format
 msgid "variable or field %qE declared void"
 msgstr ""


@@ -13478,7 +13877,11 @@ msgstr ""
 msgid "object with variably modified type must have no linkage"
 msgstr ""
 
 msgid "object with variably modified type must have no linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6069 c-decl.c:7492
 #: 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 ""
 #, gcc-internal-format
 msgid "function declaration isn%'t a prototype"
 msgstr ""


@@ -13542,278 +13945,498 @@ msgid ""
 "you want"
 msgstr ""
 
 "you want"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6386
 #: c-decl.c:6386

+=======
+#: c-decl.c:6381
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "enum type defined here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "enum type defined here"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6392
 #: c-decl.c:6392

+=======
+#: c-decl.c:6387
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "struct defined here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "struct defined here"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6398
 #: c-decl.c:6398

+=======
+#: c-decl.c:6393
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "union defined here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "union defined here"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6471
 #: c-decl.c:6471

+=======
+#: c-decl.c:6466
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redefinition of %<union %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redefinition of %<union %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6473
 #: c-decl.c:6473

+=======
+#: c-decl.c:6468
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redefinition of %<struct %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redefinition of %<struct %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6482
 #: c-decl.c:6482

+=======
+#: c-decl.c:6477
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "nested redefinition of %<union %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "nested redefinition of %<union %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6484
 #: c-decl.c:6484

+=======
+#: c-decl.c:6479
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "nested redefinition of %<struct %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "nested redefinition of %<struct %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6516 c-decl.c:7094
 #: 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 ""
 
 #, gcc-internal-format
 msgid "defining type in %qs expression is invalid in C++"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6583 cp/decl.c:3910
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration does not declare anything"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6586
 #: c-decl.c:6586

+=======
+#: c-decl.c:6581
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C doesn%'t support unnamed structs/unions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C doesn%'t support unnamed structs/unions"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6649 c-decl.c:6665
 #: 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 ""
 
 #, gcc-internal-format
 msgid "duplicate member %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6768
 #: c-decl.c:6768

+=======
+#: c-decl.c:6763
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "union has no named members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "union has no named members"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6770
 #: c-decl.c:6770

+=======
+#: c-decl.c:6765
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "union has no members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "union has no members"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6775
 #: c-decl.c:6775

+=======
+#: c-decl.c:6770
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "struct has no named members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "struct has no named members"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6777
 #: c-decl.c:6777

+=======
+#: c-decl.c:6772
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "struct has no members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "struct has no members"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6842
 #: c-decl.c:6842

+=======
+#: c-decl.c:6837
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "flexible array member in union"
 msgstr ""
 
 #, gcc-internal-format
 msgid "flexible array member in union"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6848
 #: c-decl.c:6848

+=======
+#: c-decl.c:6843
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "flexible array member not at end of struct"
 msgstr ""
 
 #, gcc-internal-format
 msgid "flexible array member not at end of struct"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6854
 #: c-decl.c:6854

+=======
+#: c-decl.c:6849
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "flexible array member in otherwise empty struct"
 msgstr ""
 
 #, gcc-internal-format
 msgid "flexible array member in otherwise empty struct"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:6971
 #: c-decl.c:6971

+=======
+#: c-decl.c:6966
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "union cannot be made transparent"
 msgstr ""
 
 #, gcc-internal-format
 msgid "union cannot be made transparent"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7067
 #: c-decl.c:7067

+=======
+#: c-decl.c:7062
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "nested redefinition of %<enum %E%>"
 msgstr ""
 
 #. This enum is a named one that has been declared already.
 #, gcc-internal-format
 msgid "nested redefinition of %<enum %E%>"
 msgstr ""
 
 #. This enum is a named one that has been declared already.

+<<<<<<< HEAD

 #: c-decl.c:7074
 #: c-decl.c:7074

+=======
+#: c-decl.c:7069
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redeclaration of %<enum %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redeclaration of %<enum %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7149
 #: c-decl.c:7149

+=======
+#: c-decl.c:7144
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "enumeration values exceed range of largest integer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "enumeration values exceed range of largest integer"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7166
 #: c-decl.c:7166

+=======
+#: c-decl.c:7161
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "specified mode too small for enumeral values"
 msgstr ""
 
 #, gcc-internal-format
 msgid "specified mode too small for enumeral values"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7270 c-decl.c:7286
 #: 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 ""
 
 #, gcc-internal-format
 msgid "enumerator value for %qE is not an integer constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7281
 #: 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 ""
 
 #, gcc-internal-format
 msgid "enumerator value for %qE is not an integer constant expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7305
 #: c-decl.c:7305

+=======
+#: c-decl.c:7300
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "overflow in enumeration values"
 msgstr ""
 
 #, gcc-internal-format
 msgid "overflow in enumeration values"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7313
 #: c-decl.c:7313

+=======
+#: c-decl.c:7308
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C restricts enumerator values to range of %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C restricts enumerator values to range of %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7398
 #: c-decl.c:7398

+=======
+#: c-decl.c:7393
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "inline function %qD given attribute noinline"
 msgstr ""
 
 #, gcc-internal-format
 msgid "inline function %qD given attribute noinline"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7416
 #: c-decl.c:7416

+=======
+#: c-decl.c:7411
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type is an incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type is an incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7426
 #: c-decl.c:7426

+=======
+#: c-decl.c:7421
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type defaults to %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type defaults to %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7500
 #: c-decl.c:7500

+=======
+#: c-decl.c:7495
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no previous prototype for %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no previous prototype for %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7509
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD was used with no prototype before its definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7516
 #: c-decl.c:7516

+=======
+#: c-decl.c:7511
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no previous declaration for %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no previous declaration for %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7526
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD was used with no declaration before its definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7549
 #: c-decl.c:7549

+=======
+#: c-decl.c:7544
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type of %qD is not %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type of %qD is not %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7555
 #: c-decl.c:7555

+=======
+#: c-decl.c:7550
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is normally a non-static function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is normally a non-static function"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7590
 #: c-decl.c:7590

+=======
+#: c-decl.c:7585
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "old-style parameter declarations in prototyped function definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid "old-style parameter declarations in prototyped function definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7604
 #: c-decl.c:7604

+=======
+#: c-decl.c:7599
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "traditional C rejects ISO C style function definitions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "traditional C rejects ISO C style function definitions"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7620
 #: c-decl.c:7620

+=======
+#: c-decl.c:7615
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter name omitted"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter name omitted"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7657
 #: c-decl.c:7657

+=======
+#: c-decl.c:7650
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "old-style function definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid "old-style function definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7666
 #: c-decl.c:7666

+=======
+#: c-decl.c:7659
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter name missing from parameter list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter name missing from parameter list"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7678
 #: c-decl.c:7678

+=======
+#: c-decl.c:7671
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD declared as a non-parameter"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD declared as a non-parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7684
 #: c-decl.c:7684

+=======
+#: c-decl.c:7677
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "multiple parameters named %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "multiple parameters named %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7693
 #: c-decl.c:7693

+=======
+#: c-decl.c:7686
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %qD declared with void type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %qD declared with void type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7722 c-decl.c:7726
 #: 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 %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "type of %qD defaults to %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7746
 #: c-decl.c:7746

+=======
+#: c-decl.c:7739
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %qD has incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %qD has incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7753
 #: c-decl.c:7753

+=======
+#: c-decl.c:7746
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration for parameter %qD but no such parameter"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration for parameter %qD but no such parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7805
 #: 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 ""
 
 #, gcc-internal-format
 msgid "number of arguments doesn%'t match built-in prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7816
 #: c-decl.c:7816

+=======
+#: c-decl.c:7809
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "number of arguments doesn%'t match prototype"
 msgstr ""
 
 #, gcc-internal-format
 msgid "number of arguments doesn%'t match prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7819 c-decl.c:7861 c-decl.c:7875
 #: 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 ""
 
 #, gcc-internal-format
 msgid "prototype declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7853
 #: 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 ""
 
 #, gcc-internal-format
 msgid "promoted argument %qD doesn%'t match built-in prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7858
 #: c-decl.c:7858

+=======
+#: c-decl.c:7851
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "promoted argument %qD doesn%'t match prototype"
 msgstr ""
 
 #, gcc-internal-format
 msgid "promoted argument %qD doesn%'t match prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7868
 #: c-decl.c:7868

+=======
+#: c-decl.c:7861
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "argument %qD doesn%'t match built-in prototype"
 msgstr ""
 
 #, gcc-internal-format
 msgid "argument %qD doesn%'t match built-in prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:7873
 #: c-decl.c:7873

+=======
+#: c-decl.c:7866
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "argument %qD doesn%'t match prototype"
 msgstr ""
 
 #, gcc-internal-format
 msgid "argument %qD doesn%'t match prototype"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8059 cp/decl.c:12560
 #: 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 ""
 #, gcc-internal-format
 msgid "no return statement in function returning non-void"
 msgstr ""


@@ -13821,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.
 #. 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.

+<<<<<<< HEAD

 #: c-decl.c:8132
 #: c-decl.c:8132

+=======
+#: c-decl.c:8125
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<for%> loop initial declarations are only allowed in C99 mode"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<for%> loop initial declarations are only allowed in C99 mode"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8137
 #: 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 ""
 
 #, gcc-internal-format
 msgid "use option -std=c99 or -std=gnu99 to compile your code"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8171
 #: c-decl.c:8171

+=======
+#: c-decl.c:8164
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of static variable %qD in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of static variable %qD in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8175
 #: c-decl.c:8175

+=======
+#: c-decl.c:8168
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "declaration of %<extern%> variable %qD in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "declaration of %<extern%> variable %qD in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8182
 #: c-decl.c:8182

+=======
+#: c-decl.c:8175
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<struct %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<struct %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8187
 #: c-decl.c:8187

+=======
+#: c-decl.c:8180
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<union %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<union %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8191
 #: c-decl.c:8191

+=======
+#: c-decl.c:8184
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<enum %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<enum %E%> declared in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8195
 #: c-decl.c:8195

+=======
+#: c-decl.c:8188
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of non-variable %qD in %<for%> loop initial declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of non-variable %qD in %<for%> loop initial declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8446
 #: c-decl.c:8446

+=======
+#: c-decl.c:8439
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "incompatible address space qualifiers %qs and %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "incompatible address space qualifiers %qs and %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8485 c-decl.c:8782 c-decl.c:9148
 #: 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 ""
 
 #, gcc-internal-format
 msgid "duplicate %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8511 c-decl.c:8793 c-decl.c:9025
 #: 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 ""
 
 #, gcc-internal-format
 msgid "two or more data types in declaration specifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8523 cp/parser.c:2187
 #: c-decl.c:8523 cp/parser.c:2187

+=======
+#: c-decl.c:8516 cp/parser.c:2187
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long long long%> is too long for GCC"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long long long%> is too long for GCC"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8536
 #: c-decl.c:8536

+=======
+#: c-decl.c:8529
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C90 does not support %<long long%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C90 does not support %<long long%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8694
 #: c-decl.c:8694

+=======
+#: c-decl.c:8687
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C90 does not support complex types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C90 does not support complex types"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8733
 #: c-decl.c:8733

+=======
+#: c-decl.c:8726
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C does not support saturating types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C does not support saturating types"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:8984
 #: c-decl.c:8984

+=======
+#: c-decl.c:8977
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C does not support decimal floating point"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C does not support decimal floating point"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9006 c-decl.c:9209 c-parser.c:5372
 #: 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 ""
 
 #, gcc-internal-format
 msgid "fixed-point types not supported for this target"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9008
 #: c-decl.c:9008

+=======
+#: c-decl.c:9001
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C does not support fixed-point types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C does not support fixed-point types"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9042
 #: 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 ""
 
 #, gcc-internal-format
 msgid "C++ lookup of %qD would return a field, not a type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9055
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qE fails to be a typedef or built in type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9099
 #: c-decl.c:9099

+=======
+#: c-decl.c:9092
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE is not at beginning of declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE is not at beginning of declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9113
 #: c-decl.c:9113

+=======
+#: c-decl.c:9106
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> used with %<auto%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> used with %<auto%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9115
 #: c-decl.c:9115

+=======
+#: c-decl.c:9108
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> used with %<register%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> used with %<register%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9117
 #: c-decl.c:9117

+=======
+#: c-decl.c:9110
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> used with %<typedef%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> used with %<typedef%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9128
 #: c-decl.c:9128

+=======
+#: c-decl.c:9121
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> before %<extern%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> before %<extern%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9137
 #: c-decl.c:9137

+=======
+#: c-decl.c:9130
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> before %<static%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> before %<static%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9153
 #: c-decl.c:9153

+=======
+#: c-decl.c:9146
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "multiple storage classes in declaration specifiers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "multiple storage classes in declaration specifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9160
 #: c-decl.c:9160

+=======
+#: c-decl.c:9153
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> used with %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> used with %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9207
 #: c-decl.c:9207

+=======
+#: c-decl.c:9200
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<_Sat%> is used without %<_Fract%> or %<_Accum%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<_Sat%> is used without %<_Fract%> or %<_Accum%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9221
 #: c-decl.c:9221

+=======
+#: c-decl.c:9214
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C does not support plain %<complex%> meaning %<double complex%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C does not support plain %<complex%> meaning %<double complex%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9266 c-decl.c:9292
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C does not support complex integer types"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-decl.c:9446 toplev.c:866
 #: 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 ""
 #, gcc-internal-format
 msgid "%q+F used but never defined"
 msgstr ""


@@ -14653,7 +15404,11 @@ msgstr ""
 msgid "expected identifier"
 msgstr ""
 
 msgid "expected identifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:1743 cp/parser.c:12734
 #: 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 ""
 #, gcc-internal-format
 msgid "comma at end of enumerator list"
 msgstr ""


@@ -14728,7 +15483,11 @@ msgstr ""
 msgid "wide string literal in %<asm%>"
 msgstr ""
 
 msgid "wide string literal in %<asm%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:2765 c-parser.c:7091 cp/parser.c:22966
 #: 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 ""
 #, gcc-internal-format
 msgid "expected string literal"
 msgstr ""


@@ -14778,7 +15537,11 @@ msgstr ""
 msgid "expected %<}%> before %<else%>"
 msgstr ""
 
 msgid "expected %<}%> before %<else%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:3564 cp/parser.c:7917
 #: c-parser.c:3564 cp/parser.c:7917

+=======
+#: c-parser.c:3564 cp/parser.c:7907
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<else%> without a previous %<if%>"
 msgstr ""
 #, gcc-internal-format
 msgid "%<else%> without a previous %<if%>"
 msgstr ""


@@ -14813,12 +15576,20 @@ msgstr ""
 msgid "expected statement"
 msgstr ""
 
 msgid "expected statement"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:3985 cp/parser.c:7999
 #: 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 %<if%> statement"
 msgstr ""
 
 #, gcc-internal-format
 msgid "suggest braces around empty body in an %<if%> statement"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:4013 cp/parser.c:8022
 #: 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 %<else%> statement"
 msgstr ""
 #, gcc-internal-format
 msgid "suggest braces around empty body in an %<else%> statement"
 msgstr ""


@@ -14888,39 +15659,67 @@ msgstr ""
 msgid "extra semicolon in method definition specified"
 msgstr ""
 
 msgid "extra semicolon in method definition specified"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:6985 cp/parser.c:23010
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%<#pragma omp barrier%> may only be used in compound statements"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:6996 cp/parser.c:23025
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%<#pragma omp flush%> may only be used in compound statements"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7007 cp/parser.c:23041
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%<#pragma omp taskwait%> may only be used in compound statements"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7020 cp/parser.c:23069
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%<#pragma omp section%> may only be used in %<#pragma omp sections%> "
 "construct"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7026 cp/parser.c:23000
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%<#pragma GCC pch_preprocess%> must be first"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7185 cp/parser.c:21289
 #: 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 ""
 
 #, gcc-internal-format
 msgid "too many %qs clauses"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7287 cp/parser.c:21403
 #: 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 ""
 #, gcc-internal-format
 msgid "collapse argument needs positive constant integer expression"
 msgstr ""


@@ -14945,12 +15744,20 @@ msgstr ""
 msgid "expected %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, or %<||%>"
 msgstr ""
 
 msgid "expected %<+%>, %<*%>, %<-%>, %<&%>, %<^%>, %<|%>, %<&&%>, or %<||%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7627 cp/parser.c:21691
 #: c-parser.c:7627 cp/parser.c:21691

+=======
+#: c-parser.c:7627 cp/parser.c:21679
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "schedule %<runtime%> does not take a %<chunk_size%> parameter"
 msgstr ""
 
 #, gcc-internal-format
 msgid "schedule %<runtime%> does not take a %<chunk_size%> parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7631 cp/parser.c:21694
 #: c-parser.c:7631 cp/parser.c:21694

+=======
+#: c-parser.c:7631 cp/parser.c:21682
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "schedule %<auto%> does not take a %<chunk_size%> parameter"
 msgstr ""
 #, gcc-internal-format
 msgid "schedule %<auto%> does not take a %<chunk_size%> parameter"
 msgstr ""


@@ -14965,7 +15772,11 @@ msgstr ""
 msgid "expected %<#pragma omp%> clause"
 msgstr ""
 
 msgid "expected %<#pragma omp%> clause"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:7778 cp/parser.c:21842
 #: 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 ""
 #, gcc-internal-format
 msgid "%qs is not valid for %qs"
 msgstr ""


@@ -14995,12 +15806,20 @@ msgstr ""
 msgid "not enough perfectly nested loops"
 msgstr ""
 
 msgid "not enough perfectly nested loops"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:8182 cp/parser.c:22547
 #: 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 ""
 
 #, gcc-internal-format
 msgid "collapsed loops not perfectly nested"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-parser.c:8220 cp/parser.c:22391 cp/parser.c:22429 cp/pt.c:11410
 #: 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 ""
 #, gcc-internal-format
 msgid "iteration variable %qD should not be firstprivate"
 msgstr ""


@@ -15386,7 +16205,11 @@ msgstr ""
 msgid "%qD has an incomplete type"
 msgstr ""
 
 msgid "%qD has an incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:236 cp/call.c:3088
 #: 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 ""
 #, gcc-internal-format
 msgid "invalid use of void expression"
 msgstr ""


@@ -15492,12 +16315,20 @@ msgstr ""
 msgid "invalid type argument of %<->%> (have %qT)"
 msgstr ""
 
 msgid "invalid type argument of %<->%> (have %qT)"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:2218 cp/typeck.c:2951
 #: 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 ""
 
 #, gcc-internal-format
 msgid "subscripted value is neither array nor pointer"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:2229 cp/typeck.c:2866 cp/typeck.c:2956
 #: 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 ""
 #, gcc-internal-format
 msgid "array subscript is not an integer"
 msgstr ""


@@ -15540,7 +16371,11 @@ msgstr ""
 msgid "function with qualified void return type called"
 msgstr ""
 
 msgid "function with qualified void return type called"
 msgstr ""
 

+<<<<<<< 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: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 ""
 #, gcc-internal-format
 msgid "declared here"
 msgstr ""


@@ -16142,7 +16977,11 @@ msgstr ""
 msgid "(near initialization for %qs)"
 msgstr ""
 
 msgid "(near initialization for %qs)"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:6295 cp/decl.c:5227
 #: 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 ""
 #, gcc-internal-format
 msgid "opaque vector types cannot be initialized"
 msgstr ""


@@ -16162,7 +17001,11 @@ msgstr ""
 msgid "ISO C forbids %<goto *expr;%>"
 msgstr ""
 
 msgid "ISO C forbids %<goto *expr;%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:8300 cp/typeck.c:7323
 #: 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 %<noreturn%> has a %<return%> statement"
 msgstr ""
 #, gcc-internal-format
 msgid "function declared %<noreturn%> has a %<return%> statement"
 msgstr ""


@@ -16202,7 +17045,11 @@ msgstr ""
 msgid "case label is not an integer constant expression"
 msgstr ""
 
 msgid "case label is not an integer constant expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:8532 cp/parser.c:7757
 #: 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 ""
 #, gcc-internal-format
 msgid "case label not within a switch statement"
 msgstr ""


@@ -16212,22 +17059,38 @@ msgstr ""
 msgid "%<default%> label not within a switch statement"
 msgstr ""
 
 msgid "%<default%> label not within a switch statement"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:8617 cp/parser.c:8048
 #: 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 %<else%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "suggest explicit braces to avoid ambiguous %<else%>"
 msgstr ""
 

+<<<<<<< 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: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 ""
 
 #, gcc-internal-format
 msgid "break statement not within loop or switch"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:8728 cp/parser.c:8419
 #: 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 ""
 
 #, gcc-internal-format
 msgid "continue statement not within a loop"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:8733 cp/parser.c:8409
 #: 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 ""
 #, gcc-internal-format
 msgid "break statement used with OpenMP for loop"
 msgstr ""


@@ -16242,27 +17105,47 @@ msgstr ""
 msgid "expression statement has incomplete type"
 msgstr ""
 
 msgid "expression statement has incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:9360 cp/typeck.c:3825
 #: 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 ""
 
 #, gcc-internal-format
 msgid "right shift count is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:9371 cp/typeck.c:3832
 #: 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 ""
 
 #, gcc-internal-format
 msgid "right shift count >= width of type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:9397 cp/typeck.c:3854
 #: 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 ""
 
 #, gcc-internal-format
 msgid "left shift count is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:9404 cp/typeck.c:3860
 #: 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 ""
 
 #, gcc-internal-format
 msgid "left shift count >= width of type"
 msgstr ""
 

+<<<<<<< HEAD

 #: c-typeck.c:9424 cp/typeck.c:3906
 #: 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 ""
 #, gcc-internal-format
 msgid "comparing floating point with == or != is unsafe"
 msgstr ""


@@ -16282,7 +17165,11 @@ msgstr ""
 msgid "comparison of distinct pointer types lacks a cast"
 msgstr ""
 
 msgid "comparison of distinct pointer types lacks a cast"
 msgstr ""
 

+<<<<<<< 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: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 ""
 #, gcc-internal-format
 msgid "the address of %qD will never be NULL"
 msgstr ""


@@ -16372,17 +17259,29 @@ msgstr ""
 msgid "function call has aggregate value"
 msgstr ""
 
 msgid "function call has aggregate value"
 msgstr ""
 

+<<<<<<< HEAD

 #: cfgexpand.c:984 function.c:919 varasm.c:2208
 #: 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 ""
 
 #, gcc-internal-format
 msgid "size of variable %q+D is too large"
 msgstr ""
 

+<<<<<<< HEAD

 #: cfgexpand.c:3767
 #: cfgexpand.c:3767

+=======
+#: cfgexpand.c:3766
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "not protecting local variables: variable length buffer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "not protecting local variables: variable length buffer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cfgexpand.c:3770
 #: cfgexpand.c:3770

+=======
+#: cfgexpand.c:3769
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "not protecting function: no buffer at least %d bytes long"
 msgstr ""
 #, gcc-internal-format
 msgid "not protecting function: no buffer at least %d bytes long"
 msgstr ""


@@ -16932,12 +17831,20 @@ msgstr ""
 msgid "failed to reclaim unneeded function"
 msgstr ""
 
 msgid "failed to reclaim unneeded function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cgraphunit.c:1906
 #: cgraphunit.c:1906

+=======
+#: cgraphunit.c:1908
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "nodes with unreleased memory found"
 msgstr ""
 
 #, gcc-internal-format
 msgid "nodes with unreleased memory found"
 msgstr ""
 

+<<<<<<< HEAD

 #: collect2.c:1530 opts.c:1134
 #: 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 ""
 #, gcc-internal-format
 msgid "LTO support has not been enabled in this configuration"
 msgstr ""


@@ -17112,19 +18019,31 @@ msgstr ""
 msgid "dominator of %d should be %d, not %d"
 msgstr ""
 
 msgid "dominator of %d should be %d, not %d"
 msgstr ""
 

+<<<<<<< HEAD

 #: dwarf2out.c:4007
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "Multiple EH personalities are supported only with assemblers supporting .cfi."
 "personality directive."
 msgstr ""
 

+<<<<<<< HEAD

 #: dwarf2out.c:5393
 #: dwarf2out.c:5393

+=======
+#: dwarf2out.c:5382
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "DW_LOC_OP %s not implemented"
 msgstr ""
 
 #, gcc-internal-format
 msgid "DW_LOC_OP %s not implemented"
 msgstr ""
 

+<<<<<<< HEAD

 #: dwarf2out.c:12859
 #: dwarf2out.c:12859

+=======
+#: dwarf2out.c:12830
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-delegitimized UNSPEC %d found in variable location"
 msgstr ""
 #, gcc-internal-format
 msgid "non-delegitimized UNSPEC %d found in variable location"
 msgstr ""


@@ -17778,7 +18697,11 @@ msgid ""
 "critical region may not be nested inside a critical region with the same name"
 msgstr ""
 
 "critical region may not be nested inside a critical region with the same name"
 msgstr ""
 

+<<<<<<< HEAD

 #: omp-low.c:6751 cp/decl.c:2719 cp/parser.c:8406 cp/parser.c:8426
 #: 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 ""
 #, gcc-internal-format
 msgid "invalid exit from OpenMP structured block"
 msgstr ""


@@ -17852,14 +18775,22 @@ msgstr ""
 msgid "section anchors must be disabled when toplevel reorder is disabled"
 msgstr ""
 
 msgid "section anchors must be disabled when toplevel reorder is disabled"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:1062 config/darwin.c:1723 config/sh/sh.c:907
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "-freorder-blocks-and-partition does not work with exceptions on this "
 "architecture"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:1079 config/sh/sh.c:915
 #: 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 "
 #, gcc-internal-format
 msgid ""
 "-freorder-blocks-and-partition does not support unwind info on this "


@@ -17936,37 +18867,65 @@ msgstr ""
 msgid "dwarf version %d is not supported"
 msgstr ""
 
 msgid "dwarf version %d is not supported"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2157
 #: opts.c:2157

+=======
+#: opts.c:2163
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%s: --param arguments should be of the form NAME=VALUE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%s: --param arguments should be of the form NAME=VALUE"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2162
 #: opts.c:2162

+=======
+#: opts.c:2168
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid --param value %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid --param value %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2265
 #: opts.c:2265

+=======
+#: opts.c:2271
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "target system does not support debug output"
 msgstr ""
 
 #, gcc-internal-format
 msgid "target system does not support debug output"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2272
 #: opts.c:2272

+=======
+#: opts.c:2278
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "debug format \"%s\" conflicts with prior selection"
 msgstr ""
 
 #, gcc-internal-format
 msgid "debug format \"%s\" conflicts with prior selection"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2288
 #: opts.c:2288

+=======
+#: opts.c:2294
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unrecognised debug output level \"%s\""
 msgstr ""
 
 #, gcc-internal-format
 msgid "unrecognised debug output level \"%s\""
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2290
 #: opts.c:2290

+=======
+#: opts.c:2296
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "debug output level %s is too high"
 msgstr ""
 
 #, gcc-internal-format
 msgid "debug output level %s is too high"
 msgstr ""
 

+<<<<<<< HEAD

 #: opts.c:2410
 #: opts.c:2410

+=======
+#: opts.c:2416
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "-Werror=%s: No option -%s"
 msgstr ""
 #, gcc-internal-format
 msgid "-Werror=%s: No option -%s"
 msgstr ""


@@ -18447,32 +19406,56 @@ msgstr ""
 msgid "Offset of packed bit-field %qD has changed in GCC 4.4"
 msgstr ""
 
 msgid "Offset of packed bit-field %qD has changed in GCC 4.4"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:1491
 #: stor-layout.c:1491

+=======
+#: stor-layout.c:1490
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "padding struct size to alignment boundary"
 msgstr ""
 
 #, gcc-internal-format
 msgid "padding struct size to alignment boundary"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:1521
 #: stor-layout.c:1521

+=======
+#: stor-layout.c:1520
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "packed attribute causes inefficient alignment for %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "packed attribute causes inefficient alignment for %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:1525
 #: stor-layout.c:1525

+=======
+#: stor-layout.c:1524
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "packed attribute is unnecessary for %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "packed attribute is unnecessary for %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:1531
 #: stor-layout.c:1531

+=======
+#: stor-layout.c:1530
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "packed attribute causes inefficient alignment"
 msgstr ""
 
 #, gcc-internal-format
 msgid "packed attribute causes inefficient alignment"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:1533
 #: stor-layout.c:1533

+=======
+#: stor-layout.c:1532
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "packed attribute is unnecessary"
 msgstr ""
 
 #, gcc-internal-format
 msgid "packed attribute is unnecessary"
 msgstr ""
 

+<<<<<<< HEAD

 #: stor-layout.c:2048
 #: 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 ""
 #, gcc-internal-format
 msgid "alignment of array elements is greater than element size"
 msgstr ""


@@ -18705,12 +19688,20 @@ msgstr ""
 msgid "unwind tables currently require a frame pointer for correctness"
 msgstr ""
 
 msgid "unwind tables currently require a frame pointer for correctness"
 msgstr ""
 

+<<<<<<< HEAD

 #: toplev.c:2372
 #: toplev.c:2372

+=======
+#: toplev.c:2368
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "error writing to %s: %m"
 msgstr ""
 
 #, gcc-internal-format
 msgid "error writing to %s: %m"
 msgstr ""
 

+<<<<<<< HEAD

 #: toplev.c:2374 java/jcf-parse.c:1767
 #: 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 ""
 #, gcc-internal-format
 msgid "error closing %s: %m"
 msgstr ""


@@ -19575,51 +20566,87 @@ msgstr ""
 msgid "%qD may be used uninitialized in this function"
 msgstr ""
 
 msgid "%qD may be used uninitialized in this function"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5037
 #: tree-vrp.c:5037

+=======
+#: tree-vrp.c:5024
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array subscript is outside array bounds"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array subscript is outside array bounds"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5052
 #: tree-vrp.c:5052

+=======
+#: tree-vrp.c:5039
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array subscript is above array bounds"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array subscript is above array bounds"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5059
 #: tree-vrp.c:5059

+=======
+#: tree-vrp.c:5046
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array subscript is below array bounds"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array subscript is below array bounds"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5701
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "assuming signed overflow does not occur when simplifying conditional to "
 "constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5707
 #: 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 ""
 
 #, gcc-internal-format
 msgid "assuming signed overflow does not occur when simplifying conditional"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5751
 #: 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 ""
 
 #, gcc-internal-format
 msgid "comparison always false due to limited range of data type"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:5753
 #: 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 ""
 
 #, gcc-internal-format
 msgid "comparison always true due to limited range of data type"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:6601
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "assuming signed overflow does not occur when simplifying %</%> or %<%%%> to %"
 "<>>%> or %<&%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree-vrp.c:6683
 #: tree-vrp.c:6683

+=======
+#: tree-vrp.c:6670
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "assuming signed overflow does not occur when simplifying %<abs (X)%> to %<X%"
 #, gcc-internal-format
 msgid ""
 "assuming signed overflow does not occur when simplifying %<abs (X)%> to %<X%"


@@ -19631,103 +20658,179 @@ msgstr ""
 msgid "ignoring attributes applied to %qT after definition"
 msgstr ""
 
 msgid "ignoring attributes applied to %qT after definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5220
 #: tree.c:5220

+=======
+#: tree.c:5216
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D already declared with dllexport attribute: dllimport ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D already declared with dllexport attribute: dllimport ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5232
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%q+D redeclared without dllimport attribute after being referenced with dll "
 "linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5247
 #: tree.c:5247

+=======
+#: tree.c:5243
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D redeclared without dllimport attribute: previous dllimport ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D redeclared without dllimport attribute: previous dllimport ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5347
 #: tree.c:5347

+=======
+#: tree.c:5343
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "inline function %q+D declared as  dllimport: attribute ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "inline function %q+D declared as  dllimport: attribute ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5355
 #: tree.c:5355

+=======
+#: tree.c:5351
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function %q+D definition is marked dllimport"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function %q+D definition is marked dllimport"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5363 config/sh/symbian-c.c:144 config/sh/symbian-cxx.c:576
 #: 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 ""
 
 #, gcc-internal-format
 msgid "variable %q+D definition is marked dllimport"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5390 config/sh/symbian-c.c:164 config/sh/symbian-cxx.c:651
 #: 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 ""
 
 #, gcc-internal-format
 msgid "external linkage required for symbol %q+D because of %qE attribute"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:5404
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%qE implies default visibility, but %qD has already been declared with a "
 "different visibility"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:7004
 #: tree.c:7004

+=======
+#: tree.c:7000
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "arrays of functions are not meaningful"
 msgstr ""
 
 #, gcc-internal-format
 msgid "arrays of functions are not meaningful"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:7141
 #: tree.c:7141

+=======
+#: tree.c:7137
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function return type cannot be function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function return type cannot be function"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8361 tree.c:8446 tree.c:8507
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: %s, have %s in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8398
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: expected none of %s, have %s in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8411
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: expected class %qs, have %qs (%s) in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8460
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: did not expect class %qs, have %qs (%s) in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8473
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: expected omp_clause %s, have %s in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8533
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "tree check: expected tree that contains %qs structure, have %qs in %s, at %s:"
 "%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8547
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: accessed elt %d of tree_vec with %d elts in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8560
 #: 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 ""
 
 #, gcc-internal-format
 msgid "tree check: accessed operand %d of %s with %d operands in %s, at %s:%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: tree.c:8573
 #: 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 %"
 #, gcc-internal-format
 msgid ""
 "tree check: accessed operand %d of omp_clause %s with %d operands in %s, at %"


@@ -19765,14 +20868,22 @@ msgid ""
 "count (%d)"
 msgstr ""
 
 "count (%d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: var-tracking.c:6051
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "variable tracking size limit exceeded with -fvar-tracking-assignments, "
 "retrying without"
 msgstr ""
 

+<<<<<<< HEAD

 #: var-tracking.c:6055
 #: var-tracking.c:6055

+=======
+#: var-tracking.c:5978
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable tracking size limit exceeded"
 msgstr ""
 #, gcc-internal-format
 msgid "variable tracking size limit exceeded"
 msgstr ""


@@ -19823,99 +20934,175 @@ msgstr ""
 msgid "register name given for non-register variable %q+D"
 msgstr ""
 
 msgid "register name given for non-register variable %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:1548
 #: varasm.c:1548

+=======
+#: varasm.c:1545
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "global destructors not supported on this target"
 msgstr ""
 
 #, gcc-internal-format
 msgid "global destructors not supported on this target"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:1614
 #: varasm.c:1614

+=======
+#: varasm.c:1611
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "global constructors not supported on this target"
 msgstr ""
 
 #, gcc-internal-format
 msgid "global constructors not supported on this target"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:2001
 #: varasm.c:2001

+=======
+#: varasm.c:1998
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "thread-local COMMON data not implemented"
 msgstr ""
 
 #, gcc-internal-format
 msgid "thread-local COMMON data not implemented"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:2030
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "requested alignment for %q+D is greater than implemented alignment of %wu"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:4665
 #: varasm.c:4665

+=======
+#: varasm.c:4662
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "initializer for integer/fixed-point value is too complicated"
 msgstr ""
 
 #, gcc-internal-format
 msgid "initializer for integer/fixed-point value is too complicated"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:4670
 #: varasm.c:4670

+=======
+#: varasm.c:4667
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "initializer for floating value is not a floating constant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "initializer for floating value is not a floating constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:4976
 #: varasm.c:4976

+=======
+#: varasm.c:4973
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid initial value for member %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid initial value for member %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5285 varasm.c:5329
 #: 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 ""
 
 #, gcc-internal-format
 msgid "weak declaration of %q+D must precede definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5293
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "weak declaration of %q+D after first use results in unspecified behavior"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5327
 #: varasm.c:5327

+=======
+#: varasm.c:5324
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "weak declaration of %q+D must be public"
 msgstr ""
 
 #, gcc-internal-format
 msgid "weak declaration of %q+D must be public"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5331
 #: varasm.c:5331

+=======
+#: varasm.c:5328
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "weak declaration of %q+D not supported"
 msgstr ""
 
 #, gcc-internal-format
 msgid "weak declaration of %q+D not supported"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5360 varasm.c:5766
 #: 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 ""
 
 #, gcc-internal-format
 msgid "only weak aliases are supported in this configuration"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5581
 #: varasm.c:5581

+=======
+#: varasm.c:5578
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "weakref is not supported in this configuration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "weakref is not supported in this configuration"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5695
 #: varasm.c:5695

+=======
+#: varasm.c:5692
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D aliased to undefined symbol %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D aliased to undefined symbol %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5705
 #: varasm.c:5705

+=======
+#: varasm.c:5702
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D aliased to external symbol %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D aliased to external symbol %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5744
 #: varasm.c:5744

+=======
+#: varasm.c:5741
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "weakref %q+D ultimately targets itself"
 msgstr ""
 
 #, gcc-internal-format
 msgid "weakref %q+D ultimately targets itself"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5753
 #: varasm.c:5753

+=======
+#: varasm.c:5750
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "weakref %q+D must have static linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid "weakref %q+D must have static linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5760
 #: varasm.c:5760

+=======
+#: varasm.c:5757
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "alias definitions not supported in this configuration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "alias definitions not supported in this configuration"
 msgstr ""
 

+<<<<<<< HEAD

 #: varasm.c:5822 config/sol2.c:156
 #: 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 ""
 #, gcc-internal-format
 msgid "visibility attribute not supported in this configuration; ignored"
 msgstr ""


@@ -20398,12 +21585,21 @@ msgid "PCS variant"
 msgstr ""
 
 #: config/arm/arm.c:4529 config/arm/arm.c:4547 config/avr/avr.c:4838
 msgstr ""
 
 #: 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: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: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
 #: 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


@@ -20411,39 +21607,67 @@ msgstr ""
 msgid "%qE attribute only applies to functions"
 msgstr ""
 
 msgid "%qE attribute only applies to functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:16401
 #: 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 ""
 
 #, gcc-internal-format
 msgid "unable to compute real location of stacked parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:17981
 #: 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
 #, gcc-internal-format
 msgid "argument must be a constant"
 msgstr ""
 
 #. @@@ better error message

+<<<<<<< HEAD

 #: config/arm/arm.c:18289 config/arm/arm.c:18326
 #: 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
 #, gcc-internal-format
 msgid "selector must be an immediate"
 msgstr ""
 
 #. @@@ better error message

+<<<<<<< HEAD

 #: config/arm/arm.c:18369
 #: config/arm/arm.c:18369

+=======
+#: config/arm/arm.c:18376
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "mask must be an immediate"
 msgstr ""
 
 #, gcc-internal-format
 msgid "mask must be an immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:19031
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no low registers available for popping high registers"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:19254
 #: 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 ""
 
 #, gcc-internal-format
 msgid "interrupt Service Routines cannot be coded in Thumb mode"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/arm/arm.c:21374
 #: config/arm/arm.c:21374

+=======
+#: config/arm/arm.c:21381
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "the mangling of %<va_list%> has changed in GCC 4.4"
 msgstr ""
 #, gcc-internal-format
 msgid "the mangling of %<va_list%> has changed in GCC 4.4"
 msgstr ""


@@ -20503,7 +21727,11 @@ msgstr ""
 msgid "MCU %qs supported for assembler only"
 msgstr ""
 
 msgid "MCU %qs supported for assembler only"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/bfin/bfin.c:2555 config/m68k/m68k.c:523
 #: 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 ""
 #, gcc-internal-format
 msgid "-mshared-library-id=%s is not between 0 and %d"
 msgstr ""


@@ -20533,7 +21761,11 @@ msgstr ""
 msgid "ID shared libraries and FD-PIC mode can't be used together."
 msgstr ""
 
 msgid "ID shared libraries and FD-PIC mode can't be used together."
 msgstr ""
 

+<<<<<<< HEAD

 #: config/bfin/bfin.c:2687 config/m68k/m68k.c:631
 #: 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 ""
 #, gcc-internal-format
 msgid "cannot specify both -msep-data and -mid-shared-library"
 msgstr ""


@@ -20568,7 +21800,11 @@ msgstr ""
 msgid "can't apply both longcall and shortcall attributes to the same function"
 msgstr ""
 
 msgid "can't apply both longcall and shortcall attributes to the same function"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/bfin/bfin.c:5673 config/i386/winnt.c:59 config/mep/mep.c:3946
 #: 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"
 #: config/mep/mep.c:4084
 #, gcc-internal-format
 msgid "%qE attribute only applies to variables"


@@ -21091,137 +22327,245 @@ msgstr ""
 msgid "MMX vector return without MMX enabled changes the ABI"
 msgstr ""
 
 msgid "MMX vector return without MMX enabled changes the ABI"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11279
 #: config/i386/i386.c:11279

+=======
+#: config/i386/i386.c:11282
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "extended registers have no high halves"
 msgstr ""
 
 #, gcc-internal-format
 msgid "extended registers have no high halves"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11294
 #: config/i386/i386.c:11294

+=======
+#: config/i386/i386.c:11297
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unsupported operand size for extended register"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unsupported operand size for extended register"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:11538
 #: 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 ""
 
 #, gcc-internal-format
 msgid "non-integer operand used with operand code '%c'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:22959
 #: config/i386/i386.c:22959

+=======
+#: config/i386/i386.c:22971
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "last argument must be an immediate"
 msgstr ""
 
 #, gcc-internal-format
 msgid "last argument must be an immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23256
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the fifth argument must be a 8-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23351
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the third argument must be a 8-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23704
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be a 4-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23713
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be a 2-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23722
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be a 1-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23731
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be a 5-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23740
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the next to last argument must be an 8-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23744 config/i386/i386.c:23942
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be an 8-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:23940
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the last argument must be a 32-bit immediate"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:24006 config/rs6000/rs6000.c:10239
 #: 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 ""
 
 #, gcc-internal-format
 msgid "selector must be an integer constant in the range 0..%wi"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:24149
 #: config/i386/i386.c:24149

+=======
+#: config/i386/i386.c:24161
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE needs unknown isa option"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE needs unknown isa option"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:24153
 #: config/i386/i386.c:24153

+=======
+#: config/i386/i386.c:24165
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE needs isa option %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE needs isa option %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:25996
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qE attribute only available for 64-bit"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:26007 config/i386/i386.c:26016
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ms_abi and sysv_abi attributes are not compatible"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:26054 config/rs6000/rs6000.c:23573
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qE incompatible attribute ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:26077
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qE attribute only available for 32-bit"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:26083
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ms_hook_prologue attribute needs assembler swap suffix support"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30003
 #: config/i386/i386.c:30003

+=======
+#: config/i386/i386.c:30013
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "vector permutation requires vector constant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "vector permutation requires vector constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30013
 #: config/i386/i386.c:30013

+=======
+#: config/i386/i386.c:30023
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid vector permutation constant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid vector permutation constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30061
 #: config/i386/i386.c:30061

+=======
+#: config/i386/i386.c:30071
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "vector permutation (%d %d)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "vector permutation (%d %d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30064
 #: config/i386/i386.c:30064

+=======
+#: config/i386/i386.c:30074
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "vector permutation (%d %d %d %d)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "vector permutation (%d %d %d %d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30068
 #: 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 ""
 
 #, gcc-internal-format
 msgid "vector permutation (%d %d %d %d %d %d %d %d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/i386/i386.c:30073
 #: 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 ""
 #, gcc-internal-format
 msgid "vector permutation (%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d)"
 msgstr ""


@@ -21448,7 +22792,11 @@ msgstr ""
 msgid "interrupt_thread is available only on fido"
 msgstr ""
 
 msgid "interrupt_thread is available only on fido"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/m68k/m68k.c:1149 config/rs6000/rs6000.c:18071
 #: 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 ""
 #, gcc-internal-format
 msgid "stack limit expression is not supported"
 msgstr ""


@@ -22218,250 +23566,438 @@ msgstr ""
 msgid "unknown value %s for -mfpu"
 msgstr ""
 
 msgid "unknown value %s for -mfpu"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3504
 #: config/rs6000/rs6000.c:3504

+=======
+#: config/rs6000/rs6000.c:3502
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "not configured for ABI: '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "not configured for ABI: '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3517
 #: config/rs6000/rs6000.c:3517

+=======
+#: config/rs6000/rs6000.c:3515
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Using darwin64 ABI"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Using darwin64 ABI"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3522
 #: config/rs6000/rs6000.c:3522

+=======
+#: config/rs6000/rs6000.c:3520
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Using old darwin ABI"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Using old darwin ABI"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3529
 #: config/rs6000/rs6000.c:3529

+=======
+#: config/rs6000/rs6000.c:3527
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Using IBM extended precision long double"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Using IBM extended precision long double"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3535
 #: config/rs6000/rs6000.c:3535

+=======
+#: config/rs6000/rs6000.c:3533
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Using IEEE extended precision long double"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Using IEEE extended precision long double"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3540
 #: config/rs6000/rs6000.c:3540

+=======
+#: config/rs6000/rs6000.c:3538
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unknown ABI specified: '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unknown ABI specified: '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3567
 #: config/rs6000/rs6000.c:3567

+=======
+#: config/rs6000/rs6000.c:3565
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid option for -mfloat-gprs: '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid option for -mfloat-gprs: '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3577
 #: config/rs6000/rs6000.c:3577

+=======
+#: config/rs6000/rs6000.c:3575
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unknown switch -mlong-double-%s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unknown switch -mlong-double-%s"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3598
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "-malign-power is not supported for 64-bit Darwin; it is incompatible with "
 "the installed C and C++ libraries"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3606
 #: config/rs6000/rs6000.c:3606

+=======
+#: config/rs6000/rs6000.c:3604
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unknown -malign-XXXXX option specified: '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unknown -malign-XXXXX option specified: '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3613
 #: 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 ""
 
 #, gcc-internal-format
 msgid "-msingle-float option equivalent to -mhard-float"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:3629
 #: config/rs6000/rs6000.c:3629

+=======
+#: config/rs6000/rs6000.c:3627
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "-msimple-fpu option ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "-msimple-fpu option ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:6779
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "GCC vector returned by reference: non-standard ABI extension with no "
 "compatibility guarantee"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:6852
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "cannot return value in vector register because altivec instructions are "
 "disabled, use -maltivec to enable them"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:7111
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "cannot pass argument in vector register because altivec instructions are "
 "disabled, use -maltivec to enable them"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:8013
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "GCC vector passed by reference: non-standard ABI extension with no "
 "compatibility guarantee"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:8595
 #: 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 ""
 
 #, gcc-internal-format
 msgid "internal error: builtin function to %s already processed."
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9534
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 must be a 5-bit signed literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9637 config/rs6000/rs6000.c:10609
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 2 must be a 5-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9676
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_altivec_predicate must be a constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9728
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_altivec_predicate is out of range"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9978
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 3 must be a 4-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:9996
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 3 must be a 2-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10008
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 3 must be a 1-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10184
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument to %qs must be a 2-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10328
 #: config/rs6000/rs6000.c:10328

+=======
+#: config/rs6000/rs6000.c:10326
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unresolved overload for Altivec builtin %qF"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unresolved overload for Altivec builtin %qF"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10419
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument to dss must be a 2-bit unsigned literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10729
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_paired_predicate must be a constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10776
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_paired_predicate is out of range"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10801
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_spe_predicate must be a constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:10873
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument 1 of __builtin_spe_predicate is out of range"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:12219
 #: 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 ""
 
 #, gcc-internal-format
 msgid "internal error: builtin function %s had no type"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:12226
 #: 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 ""
 
 #, gcc-internal-format
 msgid "internal error: builtin function %s had an unexpected return type %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:12239
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "internal error: builtin function %s, argument %d had unexpected argument "
 "type %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:18041
 #: config/rs6000/rs6000.c:18041

+=======
+#: config/rs6000/rs6000.c:18039
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "stack frame too large"
 msgstr ""
 
 #, gcc-internal-format
 msgid "stack frame too large"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:18437
 #: 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 ""
 
 #, gcc-internal-format
 msgid "Out-of-line save/restore routines not supported on Darwin"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:21332
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no profiling of 64-bit code for this ABI"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23360
 #: config/rs6000/rs6000.c:23360

+=======
+#: config/rs6000/rs6000.c:23358
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %<long double%> in AltiVec types is invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %<long double%> in AltiVec types is invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23362
 #: 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 ""
 
 #, gcc-internal-format
 msgid "use of boolean types in AltiVec types is invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23364
 #: config/rs6000/rs6000.c:23364

+=======
+#: config/rs6000/rs6000.c:23362
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %<complex%> in AltiVec types is invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %<complex%> in AltiVec types is invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23366
 #: 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 ""
 
 #, gcc-internal-format
 msgid "use of decimal floating point types in AltiVec types is invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23372
 #: config/rs6000/rs6000.c:23372

+=======
+#: config/rs6000/rs6000.c:23370
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "use of %<long%> in AltiVec types is invalid for 64-bit code without -mvsx"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "use of %<long%> in AltiVec types is invalid for 64-bit code without -mvsx"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23375
 #: config/rs6000/rs6000.c:23375

+=======
+#: config/rs6000/rs6000.c:23373
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %<long%> in AltiVec types is deprecated; use %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %<long%> in AltiVec types is deprecated; use %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23380
 #: config/rs6000/rs6000.c:23380

+=======
+#: config/rs6000/rs6000.c:23378
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %<long long%> in AltiVec types is invalid without -mvsx"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %<long long%> in AltiVec types is invalid without -mvsx"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:23383
 #: config/rs6000/rs6000.c:23383

+=======
+#: config/rs6000/rs6000.c:23381
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %<double%> in AltiVec types is invalid without -mvsx"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %<double%> in AltiVec types is invalid without -mvsx"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:25785
 #: 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 ""
 
 #, gcc-internal-format
 msgid "emitting microcode insn %s\t[%s] #%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: config/rs6000/rs6000.c:25789
 #: 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 ""
 #, gcc-internal-format
 msgid "emitting conditional microcode insn %s\t[%s] #%d"
 msgstr ""


@@ -23082,402 +24618,710 @@ msgstr ""
 msgid "%s %+#D <deleted>"
 msgstr ""
 
 msgid "%s %+#D <deleted>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:2729 cp/pt.c:1704
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%s %+#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3019
 #: cp/call.c:3019

+=======
+#: cp/call.c:3015
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "conversion from %qT to %qT is ambiguous"
 msgstr ""
 
 #, gcc-internal-format
 msgid "conversion from %qT to %qT is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3181 cp/call.c:3202 cp/call.c:3267
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no matching function for call to %<%D(%A)%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3205 cp/call.c:3270
 #: 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.
 #, 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.

+<<<<<<< HEAD

 #: cp/call.c:3349
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "pointer-to-member function %E cannot be called without an object; consider "
 "using .* or ->*"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3432
 #: cp/call.c:3432

+=======
+#: cp/call.c:3428
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for call to %<(%T) (%A)%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for call to %<(%T) (%A)%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3445
 #: cp/call.c:3445

+=======
+#: cp/call.c:3441
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "call of %<(%T) (%A)%> is ambiguous"
 msgstr ""
 
 #, gcc-internal-format
 msgid "call of %<(%T) (%A)%> is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3487
 #: cp/call.c:3487

+=======
+#: cp/call.c:3483
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for ternary %<operator?:%> in %<%E ? %E : %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for ternary %<operator?:%> in %<%E ? %E : %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3490
 #: cp/call.c:3490

+=======
+#: cp/call.c:3486
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for ternary %<operator?:%> in %<%E ? %E : %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for ternary %<operator?:%> in %<%E ? %E : %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3497
 #: cp/call.c:3497

+=======
+#: cp/call.c:3493
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%E%s%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%E%s%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3500
 #: cp/call.c:3500

+=======
+#: cp/call.c:3496
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%E%s%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%E%s%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3506
 #: cp/call.c:3506

+=======
+#: cp/call.c:3502
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for %<operator[]%> in %<%E[%E]%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for %<operator[]%> in %<%E[%E]%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3509
 #: cp/call.c:3509

+=======
+#: cp/call.c:3505
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for %<operator[]%> in %<%E[%E]%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for %<operator[]%> in %<%E[%E]%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3516
 #: cp/call.c:3516

+=======
+#: cp/call.c:3512
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for %qs in %<%s %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for %qs in %<%s %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3519
 #: cp/call.c:3519

+=======
+#: cp/call.c:3515
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for %qs in %<%s %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for %qs in %<%s %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3526
 #: cp/call.c:3526

+=======
+#: cp/call.c:3522
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%E %s %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%E %s %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3529
 #: cp/call.c:3529

+=======
+#: cp/call.c:3525
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%E %s %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%E %s %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3533
 #: cp/call.c:3533

+=======
+#: cp/call.c:3529
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%s%E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ambiguous overload for %<operator%s%> in %<%s%E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3536
 #: cp/call.c:3536

+=======
+#: cp/call.c:3532
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%s%E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no match for %<operator%s%> in %<%s%E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3631
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids omitting the middle term of a ?: expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3712
 #: cp/call.c:3712

+=======
+#: cp/call.c:3708
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "second operand to the conditional operator is of type %<void%>, but the "
 "third operand is neither a throw-expression nor of type %<void%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "second operand to the conditional operator is of type %<void%>, but the "
 "third operand is neither a throw-expression nor of type %<void%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3717
 #: cp/call.c:3717

+=======
+#: cp/call.c:3713
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "third operand to the conditional operator is of type %<void%>, but the "
 "second operand is neither a throw-expression nor of type %<void%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "third operand to the conditional operator is of type %<void%>, but the "
 "second operand is neither a throw-expression nor of type %<void%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3759 cp/call.c:3997
 #: 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 ""
 
 #, gcc-internal-format
 msgid "operands to ?: have different types %qT and %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3944
 #: cp/call.c:3944

+=======
+#: cp/call.c:3940
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "enumeral mismatch in conditional expression: %qT vs %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "enumeral mismatch in conditional expression: %qT vs %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:3955
 #: cp/call.c:3955

+=======
+#: cp/call.c:3951
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "enumeral and non-enumeral type in conditional expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "enumeral and non-enumeral type in conditional expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4302
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no %<%D(int)%> declared for postfix %qs, trying prefix operator instead"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4304
 #: cp/call.c:4304

+=======
+#: cp/call.c:4300
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no %<%D(int)%> declared for postfix %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no %<%D(int)%> declared for postfix %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4398
 #: cp/call.c:4398

+=======
+#: cp/call.c:4394
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "comparison between %q#T and %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "comparison between %q#T and %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4642
 #: cp/call.c:4642

+=======
+#: cp/call.c:4638
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-placement deallocation function %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-placement deallocation function %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4643
 #: cp/call.c:4643

+=======
+#: cp/call.c:4639
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "selected for placement delete"
 msgstr ""
 
 #, gcc-internal-format
 msgid "selected for placement delete"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4722
 #: cp/call.c:4722

+=======
+#: cp/call.c:4718
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no corresponding deallocation function for %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no corresponding deallocation function for %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4727
 #: cp/call.c:4727

+=======
+#: cp/call.c:4723
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no suitable %<operator %s%> for %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no suitable %<operator %s%> for %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4745
 #: cp/call.c:4745

+=======
+#: cp/call.c:4741
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+#D is private"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+#D is private"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4747
 #: cp/call.c:4747

+=======
+#: cp/call.c:4743
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+#D is protected"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+#D is protected"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4749
 #: cp/call.c:4749

+=======
+#: cp/call.c:4745
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+#D is inaccessible"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+#D is inaccessible"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4750
 #: cp/call.c:4750

+=======
+#: cp/call.c:4746
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "within this context"
 msgstr ""
 
 #, gcc-internal-format
 msgid "within this context"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4798
 #: 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 ""
 
 #, gcc-internal-format
 msgid "passing NULL to non-pointer argument %P of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4802
 #: cp/call.c:4802

+=======
+#: cp/call.c:4798
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "converting to non-pointer type %qT from NULL"
 msgstr ""
 
 #, gcc-internal-format
 msgid "converting to non-pointer type %qT from NULL"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4808
 #: cp/call.c:4808

+=======
+#: cp/call.c:4804
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "converting %<false%> to pointer type for argument %P of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "converting %<false%> to pointer type for argument %P of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4846
 #: cp/call.c:4846

+=======
+#: cp/call.c:4842
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too many braces around initializer for %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too many braces around initializer for %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4868 cp/cvt.c:218
 #: 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 ""
 
 #, gcc-internal-format
 msgid "invalid conversion from %qT to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4870 cp/call.c:5039
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  initializing argument %P of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:4894
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "converting to %qT from initializer list would use explicit constructor %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5054
 #: cp/call.c:5054

+=======
+#: cp/call.c:5050
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot bind %qT lvalue to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot bind %qT lvalue to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5057
 #: cp/call.c:5057

+=======
+#: cp/call.c:5053
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  initializing argument %P of %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  initializing argument %P of %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5084
 #: cp/call.c:5084

+=======
+#: cp/call.c:5080
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot bind bitfield %qE to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot bind bitfield %qE to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5087 cp/call.c:5105
 #: 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 ""
 
 #, gcc-internal-format
 msgid "cannot bind packed field %qE to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5090
 #: cp/call.c:5090

+=======
+#: cp/call.c:5086
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot bind rvalue %qE to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot bind rvalue %qE to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5209
 #: 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.
 #, 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.

+<<<<<<< HEAD

 #: cp/call.c:5236
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "cannot receive objects of non-trivially-copyable type %q#T through %<...%>; "
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5282
 #: 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 ""
 
 #, gcc-internal-format
 msgid "the default argument for parameter %d of %qD has not yet been parsed"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5292
 #: cp/call.c:5292

+=======
+#: cp/call.c:5288
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "recursive evaluation of default argument for %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "recursive evaluation of default argument for %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5409
 #: 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 ""
 
 #, gcc-internal-format
 msgid "argument of function call might be a candidate for a format attribute"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5593
 #: cp/call.c:5593

+=======
+#: cp/call.c:5589
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "passing %qT as %<this%> argument of %q#D discards qualifiers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "passing %qT as %<this%> argument of %q#D discards qualifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5615
 #: cp/call.c:5615

+=======
+#: cp/call.c:5611
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not an accessible base of %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not an accessible base of %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5667
 #: cp/call.c:5667

+=======
+#: cp/call.c:5663
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "deducing %qT as %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "deducing %qT as %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5670
 #: cp/call.c:5670

+=======
+#: cp/call.c:5666
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  in call to %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  in call to %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5672
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  (you can disable this with -fno-deduce-init-list)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:5965
 #: 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 ""
 
 #, gcc-internal-format
 msgid "could not find class$ field in java interface type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6224
 #: cp/call.c:6224

+=======
+#: cp/call.c:6220
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "call to non-function %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "call to non-function %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6269 cp/typeck.c:2546
 #: 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 ""
 
 #, gcc-internal-format
 msgid "cannot call constructor %<%T::%D%> directly"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6271
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  for a function-style cast, remove the redundant %<::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6393
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no matching function for call to %<%T::%s(%A)%#V%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6418
 #: cp/call.c:6418

+=======
+#: cp/call.c:6414
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "call of overloaded %<%s(%A)%> is ambiguous"
 msgstr ""
 
 #, gcc-internal-format
 msgid "call of overloaded %<%s(%A)%> is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:6447
 #: cp/call.c:6447

+=======
+#: cp/call.c:6443
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot call member function %qD without object"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot call member function %qD without object"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7133
 #: cp/call.c:7133

+=======
+#: cp/call.c:7129
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "passing %qT chooses %qT over %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "passing %qT chooses %qT over %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7135 cp/name-lookup.c:5019
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  in call to %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7192
 #: cp/call.c:7192

+=======
+#: cp/call.c:7188
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "choosing %qD over %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "choosing %qD over %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7193
 #: cp/call.c:7193

+=======
+#: cp/call.c:7189
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  for conversion from %qT to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  for conversion from %qT to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7196
 #: cp/call.c:7196

+=======
+#: cp/call.c:7192
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  because conversion sequence for the argument is better"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  because conversion sequence for the argument is better"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7314
 #: cp/call.c:7314

+=======
+#: cp/call.c:7310
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default argument mismatch in overload resolution"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default argument mismatch in overload resolution"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7317
 #: cp/call.c:7317

+=======
+#: cp/call.c:7313
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid " candidate 1: %q+#F"
 msgstr ""
 
 #, gcc-internal-format
 msgid " candidate 1: %q+#F"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7319
 #: cp/call.c:7319

+=======
+#: cp/call.c:7315
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid " candidate 2: %q+#F"
 msgstr ""
 
 #, gcc-internal-format
 msgid " candidate 2: %q+#F"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7357
 #: 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 ""
 
 #, 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 ""
 

+<<<<<<< HEAD

 #: cp/call.c:7510
 #: cp/call.c:7510

+=======
+#: cp/call.c:7506
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "could not convert %qE to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "could not convert %qE to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7728
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "invalid initialization of non-const reference of type %qT from an rvalue of "
 "type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/call.c:7732
 #: 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"
 #, gcc-internal-format
 msgid ""
 "invalid initialization of reference of type %qT from expression of type %qT"


@@ -23804,7 +25648,11 @@ msgid ""
 "version of GCC"
 msgstr ""
 
 "version of GCC"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/class.c:5292 cp/parser.c:16363
 #: 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 ""
 #, gcc-internal-format
 msgid "redefinition of %q#T"
 msgstr ""


@@ -23864,7 +25712,11 @@ 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.
 #. 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.

+<<<<<<< HEAD

 #: cp/class.c:6668 cp/decl.c:1196 cp/name-lookup.c:525
 #: 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 ""
 #, gcc-internal-format
 msgid "declaration of %q#D"
 msgstr ""


@@ -23924,7 +25776,11 @@ msgstr ""
 msgid "conversion from %qT to %qT discards qualifiers"
 msgstr ""
 
 msgid "conversion from %qT to %qT discards qualifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/cvt.c:471 cp/typeck.c:5919
 #: 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 ""
 #, gcc-internal-format
 msgid "casting %qT to %qT does not dereference pointer"
 msgstr ""


@@ -24016,7 +25872,11 @@ msgstr ""
 msgid "%qD was declared %<extern%> and later %<static%>"
 msgstr ""
 
 msgid "%qD was declared %<extern%> and later %<static%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:1059 cp/decl.c:1609 objc/objc-act.c:2986 objc/objc-act.c:7602
 #: 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 ""
 #, gcc-internal-format
 msgid "previous declaration of %q+D"
 msgstr ""


@@ -24219,27 +26079,47 @@ msgid "conflicts with previous declaration here"
 msgstr ""
 
 #. Reject two definitions.
 msgstr ""
 
 #. Reject two definitions.

+<<<<<<< HEAD

 #: cp/decl.c:2216 cp/decl.c:2245 cp/decl.c:2274 cp/decl.c:2291 cp/decl.c:2363
 #: 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 ""
 
 #, gcc-internal-format
 msgid "redefinition of %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2232
 #: cp/decl.c:2232

+=======
+#: cp/decl.c:2233
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD conflicts with used function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD conflicts with used function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2242
 #: cp/decl.c:2242

+=======
+#: cp/decl.c:2243
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q#D not declared in class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q#D not declared in class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2256 cp/decl.c:2301
 #: 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 %<gnu_inline%> attribute"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D redeclared inline with %<gnu_inline%> attribute"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2259 cp/decl.c:2304
 #: 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 %<gnu_inline%> attribute"
 msgstr ""
 #, gcc-internal-format
 msgid "%q+D redeclared inline without %<gnu_inline%> attribute"
 msgstr ""


@@ -24247,334 +26127,594 @@ msgstr ""
 #. is_primary=
 #. is_partial=
 #. is_friend_decl=
 #. is_primary=
 #. is_partial=
 #. is_friend_decl=

+<<<<<<< HEAD

 #: cp/decl.c:2320
 #: 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 ""
 
 #, gcc-internal-format
 msgid "redeclaration of friend %q#D may not have default template arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2334
 #: 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 ""
 
 #, gcc-internal-format
 msgid "thread-local declaration of %q#D follows non-thread-local declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2337
 #: 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 ""
 
 #, gcc-internal-format
 msgid "non-thread-local declaration of %q#D follows thread-local declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2352 cp/decl.c:2371
 #: 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 ""
 
 #, gcc-internal-format
 msgid "redeclaration of %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2514
 #: cp/decl.c:2514

+=======
+#: cp/decl.c:2515
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "jump to label %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "jump to label %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2516
 #: cp/decl.c:2516

+=======
+#: cp/decl.c:2517
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "jump to case label"
 msgstr ""
 
 #, gcc-internal-format
 msgid "jump to case label"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2518 cp/decl.c:2658 cp/decl.c:2699
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  from here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2537 cp/decl.c:2702
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  exits OpenMP structured block"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2558
 #: cp/decl.c:2558

+=======
+#: cp/decl.c:2559
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  crosses initialization of %q+#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  crosses initialization of %q+#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2560 cp/decl.c:2676
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  enters scope of %q+#D which has non-trivial destructor"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2574 cp/decl.c:2681
 #: 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.
 #, gcc-internal-format
 msgid "  enters try block"
 msgstr ""
 
 #. Can't skip init of __exception_info.

+<<<<<<< HEAD

 #: cp/decl.c:2576 cp/decl.c:2670 cp/decl.c:2683
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  enters catch block"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2586 cp/decl.c:2686
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  enters OpenMP structured block"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2657 cp/decl.c:2698
 #: 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 ""
 
 #, gcc-internal-format
 msgid "jump to label %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2674
 #: cp/decl.c:2674

+=======
+#: cp/decl.c:2675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  skips initialization of %q+#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  skips initialization of %q+#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:2751
 #: cp/decl.c:2751

+=======
+#: cp/decl.c:2752
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "label named wchar_t"
 msgstr ""
 
 #, gcc-internal-format
 msgid "label named wchar_t"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3022
 #: cp/decl.c:3022

+=======
+#: cp/decl.c:3023
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is not a type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3028 cp/parser.c:4240
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD used without template parameters"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3037
 #: cp/decl.c:3037

+=======
+#: cp/decl.c:3038
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q#T is not a class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q#T is not a class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3061 cp/decl.c:3148
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no class template named %q#T in %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3074
 #: cp/decl.c:3074

+=======
+#: cp/decl.c:3075
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "lookup of %qT in %qT is ambiguous"
 msgstr ""
 
 #, gcc-internal-format
 msgid "lookup of %qT in %qT is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3083
 #: cp/decl.c:3083

+=======
+#: cp/decl.c:3084
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<typename %T::%D%> names %q#T, which is not a class template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<typename %T::%D%> names %q#T, which is not a class template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3090
 #: cp/decl.c:3090

+=======
+#: cp/decl.c:3091
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<typename %T::%D%> names %q#T, which is not a type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<typename %T::%D%> names %q#T, which is not a type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3157
 #: cp/decl.c:3157

+=======
+#: cp/decl.c:3158
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template parameters do not match template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template parameters do not match template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3158 cp/friend.c:321 cp/friend.c:329
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%q+D declared here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3840
 #: cp/decl.c:3840

+=======
+#: cp/decl.c:3841
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "an anonymous struct cannot have function members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "an anonymous struct cannot have function members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3843
 #: cp/decl.c:3843

+=======
+#: cp/decl.c:3844
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "an anonymous union cannot have function members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "an anonymous union cannot have function members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3861
 #: 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 ""
 
 #, gcc-internal-format
 msgid "member %q+#D with constructor not allowed in anonymous aggregate"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3864
 #: 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 ""
 
 #, gcc-internal-format
 msgid "member %q+#D with destructor not allowed in anonymous aggregate"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3867
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "member %q+#D with copy assignment operator not allowed in anonymous aggregate"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3892
 #: cp/decl.c:3892

+=======
+#: cp/decl.c:3893
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "multiple types in one declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "multiple types in one declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3896
 #: cp/decl.c:3896

+=======
+#: cp/decl.c:3897
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redeclaration of C++ built-in type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redeclaration of C++ built-in type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3933
 #: cp/decl.c:3933

+=======
+#: cp/decl.c:3934
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "missing type-name in typedef-declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "missing type-name in typedef-declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3940
 #: cp/decl.c:3940

+=======
+#: cp/decl.c:3941
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ prohibits anonymous structs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ prohibits anonymous structs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3947
 #: cp/decl.c:3947

+=======
+#: cp/decl.c:3948
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs can only be specified for functions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs can only be specified for functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3953
 #: cp/decl.c:3953

+=======
+#: cp/decl.c:3954
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<friend%> can only be specified inside a class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<friend%> can only be specified inside a class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3955
 #: cp/decl.c:3955

+=======
+#: cp/decl.c:3956
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<explicit%> can only be specified for constructors"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<explicit%> can only be specified for constructors"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3957
 #: 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 ""
 
 #, gcc-internal-format
 msgid "a storage class can only be specified for objects and functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3963
 #: 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 ""
 
 #, gcc-internal-format
 msgid "qualifiers can only be specified for objects and functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3966
 #: cp/decl.c:3966

+=======
+#: cp/decl.c:3967
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<typedef%> was ignored in this declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<typedef%> was ignored in this declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3968
 #: cp/decl.c:3968

+=======
+#: cp/decl.c:3969
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<constexpr> cannot be used for type declarations"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<constexpr> cannot be used for type declarations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3997
 #: cp/decl.c:3997

+=======
+#: cp/decl.c:3998
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "attribute ignored in declaration of %q+#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "attribute ignored in declaration of %q+#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:3998
 #: 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 ""
 
 #, gcc-internal-format
 msgid "attribute for %q+#T must follow the %qs keyword"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4043
 #: 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.
 #, gcc-internal-format
 msgid "ignoring attributes applied to class type %qT outside of definition"
 msgstr ""
 
 #. A template type parameter or other dependent type.

+<<<<<<< HEAD

 #: cp/decl.c:4047
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "ignoring attributes applied to dependent type %qT without an associated "
 "declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4120 cp/decl2.c:820
 #: 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 ""
 
 #, gcc-internal-format
 msgid "typedef %qD is initialized (use decltype instead)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4138
 #: cp/decl.c:4138

+=======
+#: cp/decl.c:4139
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %q#D has %<extern%> and is initialized"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %q#D has %<extern%> and is initialized"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4163
 #: cp/decl.c:4163

+=======
+#: cp/decl.c:4164
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "definition of %q#D is marked %<dllimport%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "definition of %q#D is marked %<dllimport%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4182
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%q#D is not a static member of %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4188
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ does not permit %<%T::%D%> to be defined as %<%T::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4197
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "template header not allowed in member definition of explicitly specialized "
 "class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4205
 #: cp/decl.c:4205

+=======
+#: cp/decl.c:4206
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "duplicate initialization of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "duplicate initialization of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4210
 #: cp/decl.c:4210

+=======
+#: cp/decl.c:4211
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD declared %<constexpr%> outside its class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD declared %<constexpr%> outside its class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4247
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration of %q#D outside of class is not definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4345
 #: cp/decl.c:4345

+=======
+#: cp/decl.c:4346
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable %q#D has initializer but incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable %q#D has initializer but incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4351 cp/decl.c:5102
 #: 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 ""
 
 #, gcc-internal-format
 msgid "elements of array %q#D have incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4358 cp/decl.c:5598
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration of %q#D has no initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4360
 #: 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 ""
 
 #, gcc-internal-format
 msgid "aggregate %q#D has incomplete type and cannot be defined"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4396
 #: cp/decl.c:4396

+=======
+#: cp/decl.c:4397
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD declared as reference but not initialized"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD declared as reference but not initialized"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4421
 #: cp/decl.c:4421

+=======
+#: cp/decl.c:4422
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot initialize %qT from %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot initialize %qT from %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4485
 #: 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 ""
 
 #, gcc-internal-format
 msgid "name used in a GNU-style designated initializer for an array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4490
 #: 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 ""
 
 #, gcc-internal-format
 msgid "name %qD used in a GNU-style designated initializer for an array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4540
 #: cp/decl.c:4540

+=======
+#: cp/decl.c:4541
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "initializer fails to determine size of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "initializer fails to determine size of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4547
 #: cp/decl.c:4547

+=======
+#: cp/decl.c:4548
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array size missing in %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array size missing in %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4559
 #: cp/decl.c:4559

+=======
+#: cp/decl.c:4560
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "zero-size array %qD"
 msgstr ""
 #, gcc-internal-format
 msgid "zero-size array %qD"
 msgstr ""


@@ -24582,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.
 #. 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.

+<<<<<<< HEAD

 #: cp/decl.c:4602
 #: cp/decl.c:4602

+=======
+#: cp/decl.c:4603
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage size of %qD isn't known"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage size of %qD isn't known"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4625
 #: cp/decl.c:4625

+=======
+#: cp/decl.c:4626
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage size of %qD isn't constant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage size of %qD isn't constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4671
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "sorry: semantics of inline function static data %q+#D are wrong (you'll wind "
 "up with multiple copies)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4675
 #: 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 ""
 
 #, gcc-internal-format
 msgid "  you can work around this by removing the initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4695
 #: cp/decl.c:4695

+=======
+#: cp/decl.c:4696
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "missing initializer for constexpr %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "missing initializer for constexpr %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4705
 #: cp/decl.c:4705

+=======
+#: cp/decl.c:4706
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "uninitialized const %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "uninitialized const %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4817
 #: 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 ""
 
 #, gcc-internal-format
 msgid "invalid type %qT as initializer for a vector of type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4859
 #: cp/decl.c:4859

+=======
+#: cp/decl.c:4860
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "initializer for %qT must be brace-enclosed"
 msgstr ""
 
 #, gcc-internal-format
 msgid "initializer for %qT must be brace-enclosed"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4877
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qT has no non-static data member named %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:4936
 #: cp/decl.c:4936

+=======
+#: cp/decl.c:4937
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "braces around scalar initializer for type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "braces around scalar initializer for type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5027
 #: cp/decl.c:5027

+=======
+#: cp/decl.c:5028
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "missing braces around initializer for %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "missing braces around initializer for %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5084 cp/typeck2.c:1019 cp/typeck2.c:1194 cp/typeck2.c:1217
 #: 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/typeck2.c:1260
 #, gcc-internal-format
 msgid "too many initializers for %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5104
 #: cp/decl.c:5104

+=======
+#: cp/decl.c:5105
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "elements of array %q#T have incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "elements of array %q#T have incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5113
 #: cp/decl.c:5113

+=======
+#: cp/decl.c:5114
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable-sized object %qD may not be initialized"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable-sized object %qD may not be initialized"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5115
 #: cp/decl.c:5115

+=======
+#: cp/decl.c:5116
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable-sized compound literal"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable-sized compound literal"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5169
 #: cp/decl.c:5169

+=======
+#: cp/decl.c:5170
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD has incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD has incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5189
 #: cp/decl.c:5189

+=======
+#: cp/decl.c:5190
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "scalar object %qD requires one element in initializer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "scalar object %qD requires one element in initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5220
 #: 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 ""
 
 #, gcc-internal-format
 msgid "in C++98 %qD must be initialized by constructor, not by %<{...}%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5252
 #: cp/decl.c:5252

+=======
+#: cp/decl.c:5253
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array %qD initialized by parenthesized string literal %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array %qD initialized by parenthesized string literal %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5266
 #: cp/decl.c:5266

+=======
+#: cp/decl.c:5267
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "structure %qD with uninitialized const members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "structure %qD with uninitialized const members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5268
 #: cp/decl.c:5268

+=======
+#: cp/decl.c:5269
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "structure %qD with uninitialized reference members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "structure %qD with uninitialized reference members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5565
 #: cp/decl.c:5565

+=======
+#: cp/decl.c:5566
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "assignment (not initialization) in declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "assignment (not initialization) in declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5706
 #: cp/decl.c:5706

+=======
+#: cp/decl.c:5707
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "shadowing previous type declaration of %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "shadowing previous type declaration of %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5738
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD cannot be thread-local because it has non-trivial type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5781
 #: cp/decl.c:5781

+=======
+#: cp/decl.c:5782
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Java object %qD not allocated with %<new%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Java object %qD not allocated with %<new%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5798
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD is thread-local and so cannot be dynamically initialized"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5816
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%qD cannot be initialized by a non-constant expression when being declared"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5865
 #: 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 ""
 
 #, gcc-internal-format
 msgid "non-static data member %qD has Java class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:5929
 #: cp/decl.c:5929

+=======
+#: cp/decl.c:5930
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function %q#D is initialized like a variable"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function %q#D is initialized like a variable"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6509
 #: 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 ""
 
 #, gcc-internal-format
 msgid "destructor for alien class %qT cannot be a member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6511
 #: 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 ""
 
 #, gcc-internal-format
 msgid "constructor for alien class %qT cannot be a member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6532
 #: cp/decl.c:6532

+=======
+#: cp/decl.c:6533
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD declared as a %<virtual%> %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD declared as a %<virtual%> %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6534
 #: cp/decl.c:6534

+=======
+#: cp/decl.c:6535
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD declared as an %<inline%> %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD declared as an %<inline%> %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6536
 #: cp/decl.c:6536

+=======
+#: cp/decl.c:6537
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<const%> and %<volatile%> function specifiers on %qD invalid in %s "
 "declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%<const%> and %<volatile%> function specifiers on %qD invalid in %s "
 "declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6540
 #: cp/decl.c:6540

+=======
+#: cp/decl.c:6541
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D declared as a friend"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D declared as a friend"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6546
 #: cp/decl.c:6546

+=======
+#: cp/decl.c:6547
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D declared with an exception specification"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D declared with an exception specification"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6580
 #: 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 ""
 
 #, gcc-internal-format
 msgid "definition of %qD is not in namespace enclosing %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6701
 #: 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 <class T> friend void f<T>()'.
 #, gcc-internal-format
 msgid "defining explicit specialization %qD in friend declaration"
 msgstr ""
 
 #. Something like `template <class T> friend void f<T>()'.

+<<<<<<< HEAD

 #: cp/decl.c:6711
 #: 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 ""
 
 #, gcc-internal-format
 msgid "invalid use of template-id %qD in declaration of primary template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6741
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "default arguments are not allowed in declaration of friend template "
 "specialization %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6749
 #: cp/decl.c:6749

+=======
+#: cp/decl.c:6750
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<inline%> is not allowed in declaration of friend template specialization %"
 "qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%<inline%> is not allowed in declaration of friend template specialization %"
 "qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6792
 #: cp/decl.c:6792

+=======
+#: cp/decl.c:6793
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be a template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be a template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6794
 #: cp/decl.c:6794

+=======
+#: cp/decl.c:6795
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be inline"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be inline"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6796
 #: cp/decl.c:6796

+=======
+#: cp/decl.c:6797
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be static"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare %<::main%> to be static"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6824
 #: cp/decl.c:6824

+=======
+#: cp/decl.c:6825
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-local function %q#D uses anonymous type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-local function %q#D uses anonymous type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6827 cp/decl.c:7110 cp/decl2.c:3480
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%q+#D does not refer to the unqualified type, so it is not used for linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6833
 #: 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 ""
 
 #, gcc-internal-format
 msgid "non-local function %q#D uses local type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6852
 #: cp/decl.c:6852

+=======
+#: cp/decl.c:6853
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "static member function %qD cannot have cv-qualifier"
 msgstr ""
 
 #, gcc-internal-format
 msgid "static member function %qD cannot have cv-qualifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6853
 #: cp/decl.c:6853

+=======
+#: cp/decl.c:6854
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-member function %qD cannot have cv-qualifier"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-member function %qD cannot have cv-qualifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6898
 #: cp/decl.c:6898

+=======
+#: cp/decl.c:6899
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<::main%> must return %<int%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<::main%> must return %<int%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6938
 #: cp/decl.c:6938

+=======
+#: cp/decl.c:6939
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "definition of implicitly-declared %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "definition of implicitly-declared %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:6955 cp/decl2.c:730
 #: 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 ""
 #, gcc-internal-format
 msgid "no %q#D member function declared in class %qT"
 msgstr ""


@@ -24858,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.
 #. 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.

+<<<<<<< HEAD

 #: cp/decl.c:7107
 #: cp/decl.c:7107

+=======
+#: cp/decl.c:7108
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-local variable %q#D uses anonymous type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-local variable %q#D uses anonymous type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7116
 #: 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 ""
 
 #, gcc-internal-format
 msgid "non-local variable %q#D uses local type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7237
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "invalid in-class initialization of static data member of non-integral type %"
 "qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7247
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids in-class initialization of non-const static member %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7251
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids initialization of member constant %qD of non-integral type %"
 "qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7276
 #: 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 ""
 
 #, gcc-internal-format
 msgid "size of array %qD has non-integral type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7278
 #: cp/decl.c:7278

+=======
+#: cp/decl.c:7279
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "size of array has non-integral type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "size of array has non-integral type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7327
 #: cp/decl.c:7327

+=======
+#: cp/decl.c:7328
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "size of array %qD is negative"
 msgstr ""
 
 #, gcc-internal-format
 msgid "size of array %qD is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7329
 #: cp/decl.c:7329

+=======
+#: cp/decl.c:7330
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "size of array is negative"
 msgstr ""
 
 #, gcc-internal-format
 msgid "size of array is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7337
 #: cp/decl.c:7337

+=======
+#: cp/decl.c:7338
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids zero-size array %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids zero-size array %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7339
 #: cp/decl.c:7339

+=======
+#: cp/decl.c:7340
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids zero-size array"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids zero-size array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7346
 #: 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 ""
 
 #, gcc-internal-format
 msgid "size of array %qD is not an integral constant-expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7349
 #: 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 ""
 
 #, gcc-internal-format
 msgid "size of array is not an integral constant-expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7355
 #: cp/decl.c:7355

+=======
+#: cp/decl.c:7356
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids variable length array %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids variable length array %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7357
 #: cp/decl.c:7357

+=======
+#: cp/decl.c:7358
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids variable length array"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids variable length array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7363
 #: cp/decl.c:7363

+=======
+#: cp/decl.c:7364
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable length array %qD is used"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable length array %qD is used"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7399
 #: cp/decl.c:7399

+=======
+#: cp/decl.c:7400
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "overflow in array dimension"
 msgstr ""
 
 #, gcc-internal-format
 msgid "overflow in array dimension"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7455
 #: cp/decl.c:7455

+=======
+#: cp/decl.c:7456
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as array of void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as array of void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7457
 #: cp/decl.c:7457

+=======
+#: cp/decl.c:7458
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7462
 #: cp/decl.c:7462

+=======
+#: cp/decl.c:7463
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as array of functions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as array of functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7464
 #: cp/decl.c:7464

+=======
+#: cp/decl.c:7465
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of functions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7469
 #: cp/decl.c:7469

+=======
+#: cp/decl.c:7470
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as array of references"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as array of references"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7471
 #: cp/decl.c:7471

+=======
+#: cp/decl.c:7472
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of references"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of references"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7476
 #: cp/decl.c:7476

+=======
+#: cp/decl.c:7477
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as array of function members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as array of function members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7478
 #: cp/decl.c:7478

+=======
+#: cp/decl.c:7479
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of function members"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of function members"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7492
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "declaration of %qD as multidimensional array must have bounds for all "
 "dimensions except the first"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7496
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "multidimensional array must have bounds for all dimensions except the first"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7531
 #: cp/decl.c:7531

+=======
+#: cp/decl.c:7532
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type specification for constructor invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type specification for constructor invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7541
 #: cp/decl.c:7541

+=======
+#: cp/decl.c:7542
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type specification for destructor invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type specification for destructor invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7554
 #: cp/decl.c:7554

+=======
+#: cp/decl.c:7555
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type specified for %<operator %T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type specified for %<operator %T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7576
 #: cp/decl.c:7576

+=======
+#: cp/decl.c:7577
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unnamed variable or field declared void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unnamed variable or field declared void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7583
 #: cp/decl.c:7583

+=======
+#: cp/decl.c:7584
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable or field declared void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable or field declared void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7762
 #: cp/decl.c:7762

+=======
+#: cp/decl.c:7763
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of qualified-name %<::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of qualified-name %<::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7765
 #: cp/decl.c:7765

+=======
+#: cp/decl.c:7766
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of qualified-name %<%T::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of qualified-name %<%T::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7768
 #: cp/decl.c:7768

+=======
+#: cp/decl.c:7769
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of qualified-name %<%D::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of qualified-name %<%D::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7780
 #: cp/decl.c:7780

+=======
+#: cp/decl.c:7781
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type %qT is not derived from type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "type %qT is not derived from type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7796 cp/decl.c:7888 cp/decl.c:9157
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as non-function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7802
 #: cp/decl.c:7802

+=======
+#: cp/decl.c:7803
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as non-member"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as non-member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7833
 #: cp/decl.c:7833

+=======
+#: cp/decl.c:7834
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declarator-id missing; using reserved word %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declarator-id missing; using reserved word %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7880
 #: cp/decl.c:7880

+=======
+#: cp/decl.c:7881
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function definition does not declare parameters"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function definition does not declare parameters"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7922
 #: 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 ""
 
 #, gcc-internal-format
 msgid "two or more data types in declaration of %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7928
 #: cp/decl.c:7928

+=======
+#: cp/decl.c:7929
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "conflicting specifiers in declaration of %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "conflicting specifiers in declaration of %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:7999 cp/decl.c:8002 cp/decl.c:8005
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids declaration of %qs with no type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8030 cp/decl.c:8048
 #: cp/decl.c:8030 cp/decl.c:8048

+=======
+#: cp/decl.c:8031 cp/decl.c:8049
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<signed%> or %<unsigned%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<signed%> or %<unsigned%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8032
 #: cp/decl.c:8032

+=======
+#: cp/decl.c:8033
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<signed%> and %<unsigned%> specified together for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<signed%> and %<unsigned%> specified together for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8034
 #: cp/decl.c:8034

+=======
+#: cp/decl.c:8035
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long long%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long long%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8036
 #: cp/decl.c:8036

+=======
+#: cp/decl.c:8037
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8038
 #: cp/decl.c:8038

+=======
+#: cp/decl.c:8039
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<short%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<short%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8040
 #: cp/decl.c:8040

+=======
+#: cp/decl.c:8041
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long%> or %<short%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long%> or %<short%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8042
 #: cp/decl.c:8042

+=======
+#: cp/decl.c:8043
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long%> or %<short%> specified with char for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long%> or %<short%> specified with char for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8044
 #: cp/decl.c:8044

+=======
+#: cp/decl.c:8045
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<long%> and %<short%> specified together for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<long%> and %<short%> specified together for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8050
 #: cp/decl.c:8050

+=======
+#: cp/decl.c:8051
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<short%> or %<long%> invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<short%> or %<long%> invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8058
 #: 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 ""
 
 #, gcc-internal-format
 msgid "long, short, signed or unsigned used invalidly for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8122
 #: cp/decl.c:8122

+=======
+#: cp/decl.c:8123
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "complex invalid for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "complex invalid for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8153
 #: cp/decl.c:8153

+=======
+#: cp/decl.c:8154
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "both %<const%> and %<constexpr%> cannot be used here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "both %<const%> and %<constexpr%> cannot be used here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8162
 #: cp/decl.c:8162

+=======
+#: cp/decl.c:8163
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "qualifiers are not allowed on declaration of %<operator %T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "qualifiers are not allowed on declaration of %<operator %T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8175 cp/typeck.c:7831
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ignoring %qV qualifiers added to function type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8198
 #: 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 ""
 
 #, gcc-internal-format
 msgid "member %qD cannot be declared both virtual and static"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8206
 #: cp/decl.c:8206

+=======
+#: cp/decl.c:8207
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<%T::%D%> is not a valid declarator"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<%T::%D%> is not a valid declarator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8215
 #: cp/decl.c:8215

+=======
+#: cp/decl.c:8216
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "typedef declaration invalid in parameter declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "typedef declaration invalid in parameter declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8220
 #: cp/decl.c:8220

+=======
+#: cp/decl.c:8221
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class specified for template parameter %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class specified for template parameter %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8226
 #: cp/decl.c:8226

+=======
+#: cp/decl.c:8227
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class specifiers invalid in parameter declarations"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class specifiers invalid in parameter declarations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8230
 #: cp/decl.c:8230

+=======
+#: cp/decl.c:8231
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter declared %<auto%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter declared %<auto%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8238
 #: cp/decl.c:8238

+=======
+#: cp/decl.c:8239
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "a parameter cannot be declared %<constexpr%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "a parameter cannot be declared %<constexpr%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8247
 #: cp/decl.c:8247

+=======
+#: cp/decl.c:8248
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<virtual%> outside class declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<virtual%> outside class declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8265
 #: cp/decl.c:8265

+=======
+#: cp/decl.c:8266
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "multiple storage classes in declaration of %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "multiple storage classes in declaration of %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8288
 #: cp/decl.c:8288

+=======
+#: cp/decl.c:8289
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class specified for %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class specified for %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8292
 #: cp/decl.c:8292

+=======
+#: cp/decl.c:8293
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class specified for parameter %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class specified for parameter %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8305
 #: cp/decl.c:8305

+=======
+#: cp/decl.c:8306
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "nested function %qs declared %<extern%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "nested function %qs declared %<extern%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8309
 #: cp/decl.c:8309

+=======
+#: cp/decl.c:8310
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "top-level declaration of %qs specifies %<auto%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "top-level declaration of %qs specifies %<auto%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8315
 #: cp/decl.c:8315

+=======
+#: cp/decl.c:8316
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function-scope %qs implicitly auto and declared %<__thread%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function-scope %qs implicitly auto and declared %<__thread%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8322
 #: cp/decl.c:8322

+=======
+#: cp/decl.c:8323
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class specifiers invalid in friend function declarations"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class specifiers invalid in friend function declarations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8416
 #: cp/decl.c:8416

+=======
+#: cp/decl.c:8417
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs declared as function returning a function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs declared as function returning a function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8421
 #: cp/decl.c:8421

+=======
+#: cp/decl.c:8422
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs declared as function returning an array"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs declared as function returning an array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8442
 #: cp/decl.c:8442

+=======
+#: cp/decl.c:8443
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs function uses %<auto%> type specifier without late return type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs function uses %<auto%> type specifier without late return type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8448
 #: 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 %"
 "<auto%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qs function with late return type has %qT as its type rather than plain %"
 "<auto%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8456
 #: cp/decl.c:8456

+=======
+#: cp/decl.c:8457
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qs function with late return type not declared with %<auto%> type specifier"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qs function with late return type not declared with %<auto%> type specifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8489
 #: cp/decl.c:8489

+=======
+#: cp/decl.c:8490
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "destructor cannot be static member function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "destructor cannot be static member function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8494
 #: cp/decl.c:8494

+=======
+#: cp/decl.c:8495
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "destructors may not be cv-qualified"
 msgstr ""
 
 #, gcc-internal-format
 msgid "destructors may not be cv-qualified"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8512
 #: cp/decl.c:8512

+=======
+#: cp/decl.c:8513
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "constructors cannot be declared virtual"
 msgstr ""
 
 #, gcc-internal-format
 msgid "constructors cannot be declared virtual"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8525
 #: 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.
 #, gcc-internal-format
 msgid "can't initialize friend function %qs"
 msgstr ""
 
 #. Cannot be both friend and virtual.

+<<<<<<< HEAD

 #: cp/decl.c:8529
 #: cp/decl.c:8529

+=======
+#: cp/decl.c:8530
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "virtual functions cannot be friends"
 msgstr ""
 
 #, gcc-internal-format
 msgid "virtual functions cannot be friends"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8533
 #: cp/decl.c:8533

+=======
+#: cp/decl.c:8534
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "friend declaration not in class definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid "friend declaration not in class definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8535
 #: 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 ""
 
 #, gcc-internal-format
 msgid "can't define friend function %qs in a local class definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8553
 #: cp/decl.c:8553

+=======
+#: cp/decl.c:8554
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "the %<constexpr%> specifier cannot be used in a function declaration that is "
 "not a definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "the %<constexpr%> specifier cannot be used in a function declaration that is "
 "not a definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8571
 #: cp/decl.c:8571

+=======
+#: cp/decl.c:8572
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "destructors may not have parameters"
 msgstr ""
 
 #, gcc-internal-format
 msgid "destructors may not have parameters"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8590
 #: cp/decl.c:8590

+=======
+#: cp/decl.c:8591
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare pointer to %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare pointer to %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8603 cp/decl.c:8610
 #: 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 ""
 
 #, gcc-internal-format
 msgid "cannot declare reference to %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8612
 #: cp/decl.c:8612

+=======
+#: cp/decl.c:8613
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare pointer to %q#T member"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare pointer to %q#T member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8633
 #: cp/decl.c:8633

+=======
+#: cp/decl.c:8634
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare reference to qualified function type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare reference to qualified function type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8634
 #: cp/decl.c:8634

+=======
+#: cp/decl.c:8635
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare pointer to qualified function type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare pointer to qualified function type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8670
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "cannot declare reference to %q#T, which is not a typedef or a template type "
 "argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8714
 #: cp/decl.c:8714

+=======
+#: cp/decl.c:8715
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template-id %qD used as a declarator"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template-id %qD used as a declarator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8765
 #: cp/decl.c:8765

+=======
+#: cp/decl.c:8766
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "member functions are implicitly friends of their class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "member functions are implicitly friends of their class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8770
 #: cp/decl.c:8770

+=======
+#: cp/decl.c:8771
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "extra qualification %<%T::%> on member %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "extra qualification %<%T::%> on member %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8802
 #: cp/decl.c:8802

+=======
+#: cp/decl.c:8803
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot define member function %<%T::%s%> within %<%T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot define member function %<%T::%s%> within %<%T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8811
 #: 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 ""
 
 #, gcc-internal-format
 msgid "a constexpr function cannot be defined outside of its class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8825
 #: cp/decl.c:8825

+=======
+#: cp/decl.c:8826
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare member %<%T::%s%> within %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare member %<%T::%s%> within %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8848
 #: cp/decl.c:8848

+=======
+#: cp/decl.c:8849
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-parameter %qs cannot be a parameter pack"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-parameter %qs cannot be a parameter pack"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8858
 #: cp/decl.c:8858

+=======
+#: cp/decl.c:8859
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "size of array %qs is too large"
 msgstr ""
 
 #, gcc-internal-format
 msgid "size of array %qs is too large"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8869
 #: 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 ""
 
 #, gcc-internal-format
 msgid "data member may not have variably modified type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8871
 #: 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.
 #, 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.

+<<<<<<< HEAD

 #: cp/decl.c:8879
 #: cp/decl.c:8879

+=======
+#: cp/decl.c:8880
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "only declarations of constructors can be %<explicit%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "only declarations of constructors can be %<explicit%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8887
 #: cp/decl.c:8887

+=======
+#: cp/decl.c:8888
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-member %qs cannot be declared %<mutable%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-member %qs cannot be declared %<mutable%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8892
 #: cp/decl.c:8892

+=======
+#: cp/decl.c:8893
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-object member %qs cannot be declared %<mutable%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-object member %qs cannot be declared %<mutable%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8898
 #: cp/decl.c:8898

+=======
+#: cp/decl.c:8899
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function %qs cannot be declared %<mutable%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function %qs cannot be declared %<mutable%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8903
 #: cp/decl.c:8903

+=======
+#: cp/decl.c:8904
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "static %qs cannot be declared %<mutable%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "static %qs cannot be declared %<mutable%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8908
 #: cp/decl.c:8908

+=======
+#: cp/decl.c:8909
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "const %qs cannot be declared %<mutable%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "const %qs cannot be declared %<mutable%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8946
 #: 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 ""
 
 #, gcc-internal-format
 msgid "typedef name may not be a nested-name-specifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:8964
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids nested type %qD with same name as enclosing class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9058
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "qualified function types cannot be used to declare static member functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9060
 #: 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 ""
 
 #, gcc-internal-format
 msgid "qualified function types cannot be used to declare free functions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9087
 #: cp/decl.c:9087

+=======
+#: cp/decl.c:9088
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type qualifiers specified for friend class declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "type qualifiers specified for friend class declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9092
 #: cp/decl.c:9092

+=======
+#: cp/decl.c:9093
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<inline%> specified for friend class declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<inline%> specified for friend class declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9100
 #: cp/decl.c:9100

+=======
+#: cp/decl.c:9101
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template parameters cannot be friends"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template parameters cannot be friends"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9102
 #: cp/decl.c:9102

+=======
+#: cp/decl.c:9103
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "friend declaration requires class-key, i.e. %<friend class %T::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "friend declaration requires class-key, i.e. %<friend class %T::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9106
 #: cp/decl.c:9106

+=======
+#: cp/decl.c:9107
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "friend declaration requires class-key, i.e. %<friend %#T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "friend declaration requires class-key, i.e. %<friend %#T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9119
 #: 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 ""
 
 #, gcc-internal-format
 msgid "trying to make class %qT a friend of global scope"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9137
 #: cp/decl.c:9137

+=======
+#: cp/decl.c:9138
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid qualifiers on non-member function type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid qualifiers on non-member function type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9147
 #: cp/decl.c:9147

+=======
+#: cp/decl.c:9148
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "abstract declarator %qT used as declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "abstract declarator %qT used as declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9176
 #: 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; };
 #, gcc-internal-format
 msgid "cannot use %<::%> in parameter declaration"
 msgstr ""
 
 #. Something like struct S { int N::j; };

+<<<<<<< HEAD

 #: cp/decl.c:9222
 #: cp/decl.c:9222

+=======
+#: cp/decl.c:9223
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of %<::%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of %<::%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9237
 #: 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 ""
 
 #, gcc-internal-format
 msgid "can't make %qD into a method -- not in a class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9246
 #: cp/decl.c:9246

+=======
+#: cp/decl.c:9247
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function %qD declared virtual inside a union"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function %qD declared virtual inside a union"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9255
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD cannot be declared virtual, since it is always static"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9273
 #: 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 ""
 
 #, gcc-internal-format
 msgid "expected qualified name in friend declaration for destructor %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9280
 #: cp/decl.c:9280

+=======
+#: cp/decl.c:9281
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration of %qD as member of %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration of %qD as member of %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9285
 #: cp/decl.c:9285

+=======
+#: cp/decl.c:9286
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "a destructor cannot be %<constexpr%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "a destructor cannot be %<constexpr%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9289
 #: 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 ""
 
 #, gcc-internal-format
 msgid "expected qualified name in friend declaration for constructor %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9353
 #: cp/decl.c:9353

+=======
+#: cp/decl.c:9354
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "field %qD has incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "field %qD has incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9355
 #: cp/decl.c:9355

+=======
+#: cp/decl.c:9356
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "name %qT has incomplete type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "name %qT has incomplete type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9364
 #: cp/decl.c:9364

+=======
+#: cp/decl.c:9365
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  in instantiation of template %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  in instantiation of template %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9373
 #: 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 ""
 #, gcc-internal-format
 msgid "%qE is neither function nor member function; cannot be declared friend"
 msgstr ""


@@ -25554,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.
 #. the rest of the compiler does not correctly
 #. handle the initialization unless the member is
 #. static so we make it static below.

+<<<<<<< HEAD

 #: cp/decl.c:9426
 #: cp/decl.c:9426

+=======
+#: cp/decl.c:9427
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids initialization of member %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids initialization of member %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9428
 #: cp/decl.c:9428

+=======
+#: cp/decl.c:9429
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "making %qD static"
 msgstr ""
 
 #, gcc-internal-format
 msgid "making %qD static"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9462
 #: cp/decl.c:9462

+=======
+#: cp/decl.c:9463
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-static data member %qE declared %<constexpr%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-static data member %qE declared %<constexpr%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9497
 #: cp/decl.c:9497

+=======
+#: cp/decl.c:9498
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class %<auto%> invalid for function %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class %<auto%> invalid for function %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9499
 #: cp/decl.c:9499

+=======
+#: cp/decl.c:9500
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class %<register%> invalid for function %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class %<register%> invalid for function %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9501
 #: cp/decl.c:9501

+=======
+#: cp/decl.c:9502
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "storage class %<__thread%> invalid for function %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "storage class %<__thread%> invalid for function %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9513
 #: cp/decl.c:9513

+=======
+#: cp/decl.c:9514
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<static%> specified invalid for function %qs declared out of global scope"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%<static%> specified invalid for function %qs declared out of global scope"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9517
 #: cp/decl.c:9517

+=======
+#: cp/decl.c:9518
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<inline%> specifier invalid for function %qs declared out of global scope"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%<inline%> specifier invalid for function %qs declared out of global scope"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9524
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%q#T is not a class or a namespace"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9532
 #: cp/decl.c:9532

+=======
+#: cp/decl.c:9533
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "virtual non-class function %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "virtual non-class function %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9539
 #: cp/decl.c:9539

+=======
+#: cp/decl.c:9540
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs defined in a non-class scope"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs defined in a non-class scope"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9572
 #: 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
 #, gcc-internal-format
 msgid "cannot declare member function %qD to have static linkage"
 msgstr ""
 
 #. FIXME need arm citation

+<<<<<<< HEAD

 #: cp/decl.c:9579
 #: cp/decl.c:9579

+=======
+#: cp/decl.c:9580
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot declare static function inside another function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot declare static function inside another function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9609
 #: cp/decl.c:9609

+=======
+#: cp/decl.c:9610
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<static%> may not be used when defining (as opposed to declaring) a static "
 "data member"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%<static%> may not be used when defining (as opposed to declaring) a static "
 "data member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9616
 #: cp/decl.c:9616

+=======
+#: cp/decl.c:9617
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "static member %qD declared %<register%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "static member %qD declared %<register%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9622
 #: 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 ""
 
 #, gcc-internal-format
 msgid "cannot explicitly declare member %q#D to have extern linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9636
 #: cp/decl.c:9636

+=======
+#: cp/decl.c:9637
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs initialized and declared %<extern%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs initialized and declared %<extern%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9640
 #: cp/decl.c:9640

+=======
+#: cp/decl.c:9641
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs has both %<extern%> and initializer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs has both %<extern%> and initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9767
 #: cp/decl.c:9767

+=======
+#: cp/decl.c:9768
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default argument for %q#D has type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default argument for %q#D has type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9770
 #: 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 ""
 
 #, gcc-internal-format
 msgid "default argument for parameter of type %qT has type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9786
 #: cp/decl.c:9786

+=======
+#: cp/decl.c:9787
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default argument %qE uses local variable %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default argument %qE uses local variable %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9874
 #: cp/decl.c:9874

+=======
+#: cp/decl.c:9875
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %qD has Java class type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %qD has Java class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9902
 #: cp/decl.c:9902

+=======
+#: cp/decl.c:9903
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %qD invalidly declared method type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %qD invalidly declared method type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9927
 #: 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 ""
 
 #, gcc-internal-format
 msgid "parameter %qD includes pointer to array of unknown bound %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9929
 #: 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 ""
 
 #, gcc-internal-format
 msgid "parameter %qD includes reference to array of unknown bound %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:9944
 #: 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 ""
 #, gcc-internal-format
 msgid "parameter packs must be at the end of the parameter list"
 msgstr ""


@@ -25704,17 +28688,29 @@ 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.
 #. 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.

+<<<<<<< HEAD

 #: cp/decl.c:10167
 #: cp/decl.c:10167

+=======
+#: cp/decl.c:10168
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid constructor; you probably meant %<%T (const %T&)%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid constructor; you probably meant %<%T (const %T&)%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10289
 #: cp/decl.c:10289

+=======
+#: cp/decl.c:10290
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD may not be declared within a namespace"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD may not be declared within a namespace"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10294
 #: cp/decl.c:10294

+=======
+#: cp/decl.c:10295
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD may not be declared as static"
 msgstr ""
 #, gcc-internal-format
 msgid "%qD may not be declared as static"
 msgstr ""


@@ -25724,149 +28720,261 @@ msgstr ""
 msgid "%qD must be a nonstatic member function"
 msgstr ""
 
 msgid "%qD must be a nonstatic member function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10329
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%qD must be either a non-static member function or a non-member function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10351
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD must have an argument of class or enumerated type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10380
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "conversion to a reference to void will never use a type conversion operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10382
 #: 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 ""
 
 #, gcc-internal-format
 msgid "conversion to void will never use a type conversion operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10389
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "conversion to a reference to the same type will never use a type conversion "
 "operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10391
 #: 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 ""
 
 #, gcc-internal-format
 msgid "conversion to the same type will never use a type conversion operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10399
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "conversion to a reference to a base class will never use a type conversion "
 "operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10401
 #: 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
 #, gcc-internal-format
 msgid "conversion to a base class will never use a type conversion operator"
 msgstr ""
 
 #. 13.4.0.3

+<<<<<<< HEAD

 #: cp/decl.c:10410
 #: cp/decl.c:10410

+=======
+#: cp/decl.c:10411
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ prohibits overloading operator ?:"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ prohibits overloading operator ?:"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10415
 #: cp/decl.c:10415

+=======
+#: cp/decl.c:10416
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD must not have variable number of arguments"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD must not have variable number of arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10466
 #: cp/decl.c:10466

+=======
+#: cp/decl.c:10467
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "postfix %qD must take %<int%> as its argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "postfix %qD must take %<int%> as its argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10469
 #: cp/decl.c:10469

+=======
+#: cp/decl.c:10470
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "postfix %qD must take %<int%> as its second argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "postfix %qD must take %<int%> as its second argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10477
 #: cp/decl.c:10477

+=======
+#: cp/decl.c:10478
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD must take either zero or one argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD must take either zero or one argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10479
 #: cp/decl.c:10479

+=======
+#: cp/decl.c:10480
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD must take either one or two arguments"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD must take either one or two arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10501
 #: cp/decl.c:10501

+=======
+#: cp/decl.c:10502
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "prefix %qD should return %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "prefix %qD should return %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10507
 #: cp/decl.c:10507

+=======
+#: cp/decl.c:10508
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "postfix %qD should return %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "postfix %qD should return %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10516
 #: cp/decl.c:10516

+=======
+#: cp/decl.c:10517
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD must take %<void%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD must take %<void%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10518 cp/decl.c:10527
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD must take exactly one argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10529
 #: cp/decl.c:10529

+=======
+#: cp/decl.c:10530
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD must take exactly two arguments"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD must take exactly two arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10538
 #: cp/decl.c:10538

+=======
+#: cp/decl.c:10539
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "user-defined %qD always evaluates both arguments"
 msgstr ""
 
 #, gcc-internal-format
 msgid "user-defined %qD always evaluates both arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10552
 #: cp/decl.c:10552

+=======
+#: cp/decl.c:10553
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD should return by value"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD should return by value"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10563 cp/decl.c:10568
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD cannot have default arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10626
 #: cp/decl.c:10626

+=======
+#: cp/decl.c:10627
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "using template type parameter %qT after %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "using template type parameter %qT after %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10642
 #: cp/decl.c:10642

+=======
+#: cp/decl.c:10643
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "using typedef-name %qD after %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "using typedef-name %qD after %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10643
 #: cp/decl.c:10643

+=======
+#: cp/decl.c:10644
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%q+D has a previous declaration here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%q+D has a previous declaration here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10651
 #: cp/decl.c:10651

+=======
+#: cp/decl.c:10652
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT referred to as %qs"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT referred to as %qs"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10652 cp/decl.c:10659
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%q+T has a previous declaration here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10658
 #: cp/decl.c:10658

+=======
+#: cp/decl.c:10659
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT referred to as enum"
 msgstr ""
 #, gcc-internal-format
 msgid "%qT referred to as enum"
 msgstr ""


@@ -25878,78 +28986,139 @@ msgstr ""
 #. void f(class C);            // No template header here
 #.
 #. then the required template argument is missing.
 #. void f(class C);            // No template header here
 #.
 #. then the required template argument is missing.

+<<<<<<< HEAD

 #: cp/decl.c:10673
 #: cp/decl.c:10673

+=======
+#: cp/decl.c:10674
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template argument required for %<%s %T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template argument required for %<%s %T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10721 cp/name-lookup.c:2823
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%qD has the same name as the class in which it is declared"
 msgstr ""
 

+<<<<<<< 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: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 ""
 
 #, gcc-internal-format
 msgid "reference to %qD is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10865
 #: cp/decl.c:10865

+=======
+#: cp/decl.c:10866
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of enum %q#D without previous declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of enum %q#D without previous declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10886
 #: cp/decl.c:10886

+=======
+#: cp/decl.c:10887
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redeclaration of %qT as a non-template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redeclaration of %qT as a non-template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:10887
 #: cp/decl.c:10887

+=======
+#: cp/decl.c:10888
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "previous declaration %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "previous declaration %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11001
 #: cp/decl.c:11001

+=======
+#: cp/decl.c:11002
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "derived union %qT invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "derived union %qT invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11010
 #: cp/decl.c:11010

+=======
+#: cp/decl.c:11011
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Java class %qT cannot have multiple bases"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Java class %qT cannot have multiple bases"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11021
 #: cp/decl.c:11021

+=======
+#: cp/decl.c:11022
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Java class %qT cannot have virtual bases"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Java class %qT cannot have virtual bases"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11041
 #: 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 ""
 
 #, gcc-internal-format
 msgid "base type %qT fails to be a struct or class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11074
 #: cp/decl.c:11074

+=======
+#: cp/decl.c:11075
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "recursive type %qT undefined"
 msgstr ""
 
 #, gcc-internal-format
 msgid "recursive type %qT undefined"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11076
 #: cp/decl.c:11076

+=======
+#: cp/decl.c:11077
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "duplicate base type %qT invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "duplicate base type %qT invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11160
 #: cp/decl.c:11160

+=======
+#: cp/decl.c:11161
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "multiple definition of %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "multiple definition of %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11162
 #: cp/decl.c:11162

+=======
+#: cp/decl.c:11163
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "previous definition here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "previous definition here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11209
 #: 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 ""
 #, gcc-internal-format
 msgid "underlying type %<%T%> of %<%T%> must be an integral type"
 msgstr ""


@@ -25958,67 +29127,119 @@ msgstr ""
 #.
 #. IF no integral type can represent all the enumerator values, the
 #. enumeration is ill-formed.
 #.
 #. IF no integral type can represent all the enumerator values, the
 #. enumeration is ill-formed.

+<<<<<<< HEAD

 #: cp/decl.c:11343
 #: 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 ""
 
 #, gcc-internal-format
 msgid "no integral type can represent all of the enumerator values for %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11475
 #: 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 ""
 
 #, gcc-internal-format
 msgid "enumerator value for %qD is not an integer constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11507
 #: cp/decl.c:11507

+=======
+#: cp/decl.c:11508
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "overflow in enumeration values at %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "overflow in enumeration values at %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11527
 #: 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 ""
 
 #, gcc-internal-format
 msgid "enumerator value %E is too large for underlying type %<%T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11628
 #: cp/decl.c:11628

+=======
+#: cp/decl.c:11629
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type %q#T is incomplete"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type %q#T is incomplete"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11630
 #: cp/decl.c:11630

+=======
+#: cp/decl.c:11631
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return type has Java class type %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return type has Java class type %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11758 cp/typeck.c:7467
 #: cp/decl.c:11758 cp/typeck.c:7467

+=======
+#: cp/decl.c:11759 cp/typeck.c:7481
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<operator=%> should return a reference to %<*this%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<operator=%> should return a reference to %<*this%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:11853
 #: cp/decl.c:11853

+=======
+#: cp/decl.c:11854
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no previous declaration for %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no previous declaration for %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:12074
 #: cp/decl.c:12074

+=======
+#: cp/decl.c:12075
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid function declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid function declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:12158
 #: cp/decl.c:12158

+=======
+#: cp/decl.c:12159
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %qD declared void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %qD declared void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:12659
 #: cp/decl.c:12659

+=======
+#: cp/decl.c:12660
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid member function declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid member function declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:12674
 #: cp/decl.c:12674

+=======
+#: cp/decl.c:12675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is already defined in class %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is already defined in class %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl.c:12885
 #: 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 ""
 #, gcc-internal-format
 msgid "static member function %q#D declared with type qualifiers"
 msgstr ""


@@ -26060,7 +29281,11 @@ msgstr ""
 msgid "deleting %qT is undefined"
 msgstr ""
 
 msgid "deleting %qT is undefined"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/decl2.c:506 cp/pt.c:4380
 #: 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 ""
 #, gcc-internal-format
 msgid "template declaration of %q#D"
 msgstr ""


@@ -26952,7 +30177,11 @@ msgstr ""
 msgid "  using obsolete binding at %q+D"
 msgstr ""
 
 msgid "  using obsolete binding at %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/name-lookup.c:1251 cp/parser.c:10897
 #: 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 ""
 #, gcc-internal-format
 msgid "(if you use %<-fpermissive%> G++ will accept your code)"
 msgstr ""


@@ -27179,7 +30408,11 @@ msgstr ""
 msgid "(perhaps a semicolon is missing after the definition of %qT)"
 msgstr ""
 
 msgid "(perhaps a semicolon is missing after the definition of %qT)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:2278 cp/parser.c:4291 cp/pt.c:6335
 #: 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 ""
 #, gcc-internal-format
 msgid "%qT is not a template"
 msgstr ""


@@ -27289,172 +30522,304 @@ msgstr ""
 msgid "typedef-name %qD used as destructor declarator"
 msgstr ""
 
 msgid "typedef-name %qD used as destructor declarator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:4552 cp/parser.c:6165
 #: 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 ""
 
 #, gcc-internal-format
 msgid "types may not be defined in casts"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:4615
 #: cp/parser.c:4615

+=======
+#: cp/parser.c:4605
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "types may not be defined in a %<typeid%> expression"
 msgstr ""
 
 #. Warn the user that a compound literal is not
 #. allowed in standard C++.
 #, gcc-internal-format
 msgid "types may not be defined in a %<typeid%> expression"
 msgstr ""
 
 #. Warn the user that a compound literal is not
 #. allowed in standard C++.

+<<<<<<< HEAD

 #: cp/parser.c:4725
 #: cp/parser.c:4725

+=======
+#: cp/parser.c:4715
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids compound-literals"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids compound-literals"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5102
 #: cp/parser.c:5102

+=======
+#: cp/parser.c:5092
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE does not have class type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE does not have class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5187 cp/typeck.c:2325
 #: 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 ""
 
 #, gcc-internal-format
 msgid "invalid use of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5770
 #: cp/parser.c:5770

+=======
+#: cp/parser.c:5760
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array bound forbidden after parenthesized type-id"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array bound forbidden after parenthesized type-id"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5772
 #: cp/parser.c:5772

+=======
+#: cp/parser.c:5762
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "try removing the parentheses around the type-id"
 msgstr ""
 
 #, gcc-internal-format
 msgid "try removing the parentheses around the type-id"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5852
 #: 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 ""
 
 #, gcc-internal-format
 msgid "types may not be defined in a new-type-id"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:5976
 #: 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 ""
 
 #, gcc-internal-format
 msgid "expression in new-declarator must have integral or enumeration type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:6230
 #: cp/parser.c:6230

+=======
+#: cp/parser.c:6220
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of old-style cast"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of old-style cast"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:6361
 #: 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 ""
 
 #, gcc-internal-format
 msgid "%<>>%> operator will be treated as two right angle brackets in C++0x"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:6364
 #: cp/parser.c:6364

+=======
+#: cp/parser.c:6354
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "suggest parentheses around %<>>%> expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "suggest parentheses around %<>>%> expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7203
 #: cp/parser.c:7203

+=======
+#: cp/parser.c:7193
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "expected end of capture-list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "expected end of capture-list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7254
 #: 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 ""
 
 #, gcc-internal-format
 msgid "ISO C++ does not allow initializers in lambda expression capture lists"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7348
 #: cp/parser.c:7348

+=======
+#: cp/parser.c:7338
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default argument specified for lambda parameter"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default argument specified for lambda parameter"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7745
 #: cp/parser.c:7745

+=======
+#: cp/parser.c:7735
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "case label %qE not within a switch statement"
 msgstr ""
 
 #, gcc-internal-format
 msgid "case label %qE not within a switch statement"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7818
 #: cp/parser.c:7818

+=======
+#: cp/parser.c:7808
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "need %<typename%> before %qE because %qT is a dependent scope"
 msgstr ""
 
 #, gcc-internal-format
 msgid "need %<typename%> before %qE because %qT is a dependent scope"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:7827
 #: cp/parser.c:7827

+=======
+#: cp/parser.c:7817
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<%T::%D%> names the constructor, not the type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<%T::%D%> names the constructor, not the type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:8113
 #: 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.
 #, gcc-internal-format
 msgid "types may not be defined in conditions"
 msgstr ""
 
 #. Issue a warning about this use of a GNU extension.

+<<<<<<< HEAD

 #: cp/parser.c:8462
 #: cp/parser.c:8462

+=======
+#: cp/parser.c:8452
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids computed gotos"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids computed gotos"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:8607 cp/parser.c:16615
 #: 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 ""
 
 #, gcc-internal-format
 msgid "extra %<;%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:8828
 #: cp/parser.c:8828

+=======
+#: cp/parser.c:8818
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__label__%> not at the beginning of a block"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__label__%> not at the beginning of a block"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:8966
 #: cp/parser.c:8966

+=======
+#: cp/parser.c:8956
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "mixing declarations and function-definitions is forbidden"
 msgstr ""
 
 #, gcc-internal-format
 msgid "mixing declarations and function-definitions is forbidden"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9107
 #: cp/parser.c:9107

+=======
+#: cp/parser.c:9097
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<friend%> used outside of class"
 msgstr ""
 
 #. Complain about `auto' as a storage specifier, if
 #. we're complaining about C++0x compatibility.
 #, gcc-internal-format
 msgid "%<friend%> used outside of class"
 msgstr ""
 
 #. Complain about `auto' as a storage specifier, if
 #. we're complaining about C++0x compatibility.

+<<<<<<< HEAD

 #: cp/parser.c:9166
 #: cp/parser.c:9166

+=======
+#: cp/parser.c:9156
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<auto%> will change meaning in C++0x; please remove it"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<auto%> will change meaning in C++0x; please remove it"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9288
 #: cp/parser.c:9288

+=======
+#: cp/parser.c:9278
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "class definition may not be declared a friend"
 msgstr ""
 
 #, gcc-internal-format
 msgid "class definition may not be declared a friend"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9357 cp/parser.c:16939
 #: 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 %<virtual%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "templates may not be %<virtual%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9523
 #: cp/parser.c:9523

+=======
+#: cp/parser.c:9513
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "types may not be defined in %<decltype%> expressions"
 msgstr ""
 
 #, gcc-internal-format
 msgid "types may not be defined in %<decltype%> expressions"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9778
 #: cp/parser.c:9778

+=======
+#: cp/parser.c:9768
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of %<auto%> in conversion operator"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of %<auto%> in conversion operator"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9863
 #: cp/parser.c:9863

+=======
+#: cp/parser.c:9853
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "only constructors take base initializers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "only constructors take base initializers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9885
 #: cp/parser.c:9885

+=======
+#: cp/parser.c:9875
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot expand initializer for member %<%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot expand initializer for member %<%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:9940
 #: cp/parser.c:9940

+=======
+#: cp/parser.c:9930
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "anachronistic old-style base class initializer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "anachronistic old-style base class initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10008
 #: cp/parser.c:10008

+=======
+#: cp/parser.c:9998
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "keyword %<typename%> not allowed in this context (a qualified member "
 #, gcc-internal-format
 msgid ""
 "keyword %<typename%> not allowed in this context (a qualified member "


@@ -27462,266 +30827,475 @@ msgid ""
 msgstr ""
 
 #. Warn that we do not support `export'.
 msgstr ""
 
 #. Warn that we do not support `export'.

+<<<<<<< HEAD

 #: cp/parser.c:10353
 #: cp/parser.c:10353

+=======
+#: cp/parser.c:10343
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "keyword %<export%> not implemented, and will be ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "keyword %<export%> not implemented, and will be ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10539 cp/parser.c:10638 cp/parser.c:10745 cp/parser.c:15324
 #: 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 ""
 
 #, gcc-internal-format
 msgid "template parameter pack %qD cannot have a default argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10543 cp/parser.c:15331
 #: 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 ""
 
 #, gcc-internal-format
 msgid "template parameter pack cannot have a default argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10642 cp/parser.c:10749
 #: 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 ""
 
 #, gcc-internal-format
 msgid "template parameter packs cannot have default arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10889
 #: cp/parser.c:10889

+=======
+#: cp/parser.c:10879
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<<::%> cannot begin a template-argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<<::%> cannot begin a template-argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10893
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "%<<:%> is an alternate spelling for %<[%>. Insert whitespace between %<<%> "
 "and %<::%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:10971
 #: 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.
 #, gcc-internal-format
 msgid "parse error in template argument list"
 msgstr ""
 
 #. Explain what went wrong.

+<<<<<<< HEAD

 #: cp/parser.c:11085
 #: cp/parser.c:11085

+=======
+#: cp/parser.c:11075
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-template %qD used as template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-template %qD used as template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:11087
 #: 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 ""
 
 #, gcc-internal-format
 msgid "use %<%T::template %D%> to indicate that it is a template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:11220
 #: cp/parser.c:11220

+=======
+#: cp/parser.c:11210
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "expected parameter pack before %<...%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "expected parameter pack before %<...%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:11638
 #: cp/parser.c:11638

+=======
+#: cp/parser.c:11628
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template specialization with C linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template specialization with C linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12454
 #: cp/parser.c:12454

+=======
+#: cp/parser.c:12444
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "declaration %qD does not declare anything"
 msgstr ""
 
 #, gcc-internal-format
 msgid "declaration %qD does not declare anything"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12540
 #: cp/parser.c:12540

+=======
+#: cp/parser.c:12530
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "attributes ignored on uninstantiated type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "attributes ignored on uninstantiated type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12544
 #: cp/parser.c:12544

+=======
+#: cp/parser.c:12534
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "attributes ignored on template instantiation"
 msgstr ""
 
 #, gcc-internal-format
 msgid "attributes ignored on template instantiation"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12549
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "attributes ignored on elaborated-type-specifier that is not a forward "
 "declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12834
 #: cp/parser.c:12834

+=======
+#: cp/parser.c:12824
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a namespace-name"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is not a namespace-name"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:12961
 #: cp/parser.c:12961

+=======
+#: cp/parser.c:12951
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<namespace%> definition is not allowed here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<namespace%> definition is not allowed here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:13102
 #: 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 ""
 
 #, gcc-internal-format
 msgid "a template-id may not appear in a using-declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:13528
 #: 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 ""
 
 #, gcc-internal-format
 msgid "an asm-specification is not allowed on a function-definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:13532
 #: cp/parser.c:13532

+=======
+#: cp/parser.c:13522
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "attributes are not allowed on a function-definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid "attributes are not allowed on a function-definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:13685
 #: cp/parser.c:13685

+=======
+#: cp/parser.c:13675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "initializer provided for function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "initializer provided for function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:13718
 #: cp/parser.c:13718

+=======
+#: cp/parser.c:13708
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "attributes after parenthesized initializer ignored"
 msgstr ""
 
 #, gcc-internal-format
 msgid "attributes after parenthesized initializer ignored"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14236
 #: 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:14224
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot define member of dependent typedef %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot define member of dependent typedef %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14240
 #: cp/parser.c:14240

+=======
+#: cp/parser.c:14228
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<%T::%E%> is not a type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<%T::%E%> is not a type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14268
 #: cp/parser.c:14268

+=======
+#: cp/parser.c:14256
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of constructor as a template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of constructor as a template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14270
 #: 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 ""
 
 #, gcc-internal-format
 msgid ""
 "use %<%T::%D%> instead of %<%T::%D%> to name the constructor in a qualified "
 "name"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14448
 #: cp/parser.c:14448

+=======
+#: cp/parser.c:14436
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is a namespace"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is a namespace"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14523
 #: cp/parser.c:14523

+=======
+#: cp/parser.c:14511
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "duplicate cv-qualifier"
 msgstr ""
 
 #, gcc-internal-format
 msgid "duplicate cv-qualifier"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:14645 cp/typeck2.c:501
 #: 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 %<auto%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of %<auto%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:15039
 #: cp/parser.c:15039

+=======
+#: cp/parser.c:15027
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "types may not be defined in parameter types"
 msgstr ""
 
 #, gcc-internal-format
 msgid "types may not be defined in parameter types"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:15257
 #: cp/parser.c:15257

+=======
+#: cp/parser.c:15245
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "file ends in default argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "file ends in default argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:15303
 #: 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 ""
 
 #, gcc-internal-format
 msgid "deprecated use of default argument for parameter of non-function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:15307
 #: cp/parser.c:15307

+=======
+#: cp/parser.c:15295
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default arguments are only permitted for function parameters"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default arguments are only permitted for function parameters"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:15593
 #: cp/parser.c:15593

+=======
+#: cp/parser.c:15581
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ does not allow designated initializers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ does not allow designated initializers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16207
 #: cp/parser.c:16207

+=======
+#: cp/parser.c:16195
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid class name in declaration of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid class name in declaration of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16221
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration of %qD in namespace %qD which does not enclose %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16226
 #: 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 ""
 
 #, gcc-internal-format
 msgid "declaration of %qD in %qD which does not enclose %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16240
 #: cp/parser.c:16240

+=======
+#: cp/parser.c:16228
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "extra qualification not allowed"
 msgstr ""
 
 #, gcc-internal-format
 msgid "extra qualification not allowed"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16252
 #: cp/parser.c:16252

+=======
+#: cp/parser.c:16240
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "an explicit specialization must be preceded by %<template <>%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "an explicit specialization must be preceded by %<template <>%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16282
 #: cp/parser.c:16282

+=======
+#: cp/parser.c:16270
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function template %qD redeclared as a class template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function template %qD redeclared as a class template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16365
 #: cp/parser.c:16365

+=======
+#: cp/parser.c:16353
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "previous definition of %q+#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "previous definition of %q+#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16634
 #: cp/parser.c:16634

+=======
+#: cp/parser.c:16622
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "a class-key must be used when declaring a friend"
 msgstr ""
 
 #, gcc-internal-format
 msgid "a class-key must be used when declaring a friend"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16649
 #: cp/parser.c:16649

+=======
+#: cp/parser.c:16637
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "friend declaration does not name a class or function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "friend declaration does not name a class or function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:16831
 #: cp/parser.c:16831

+=======
+#: cp/parser.c:16819
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "pure-specifier on function-definition"
 msgstr ""
 
 #, gcc-internal-format
 msgid "pure-specifier on function-definition"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:17144
 #: cp/parser.c:17144

+=======
+#: cp/parser.c:17132
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "keyword %<typename%> not allowed outside of templates"
 msgstr ""
 
 #, gcc-internal-format
 msgid "keyword %<typename%> not allowed outside of templates"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:17147
 #: cp/parser.c:17147

+=======
+#: cp/parser.c:17135
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "keyword %<typename%> not allowed in this context (the base class is "
 "implicitly a type)"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "keyword %<typename%> not allowed in this context (the base class is "
 "implicitly a type)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:17229
 #: cp/parser.c:17229

+=======
+#: cp/parser.c:17217
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "types may not be defined in an exception-specification"
 msgstr ""
 
 #, gcc-internal-format
 msgid "types may not be defined in an exception-specification"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:17410
 #: cp/parser.c:17410

+=======
+#: cp/parser.c:17398
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "types may not be defined in exception-declarations"
 msgstr ""
 
 #, gcc-internal-format
 msgid "types may not be defined in exception-declarations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18303
 #: cp/parser.c:18303

+=======
+#: cp/parser.c:18291
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "specializing member %<%T::%E%> requires %<template<>%> syntax"
 msgstr ""
 
 #, gcc-internal-format
 msgid "specializing member %<%T::%E%> requires %<template<>%> syntax"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18308
 #: cp/parser.c:18308

+=======
+#: cp/parser.c:18296
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid declaration of %<%T::%E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid declaration of %<%T::%E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18312
 #: cp/parser.c:18312

+=======
+#: cp/parser.c:18300
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too few template-parameter-lists"
 msgstr ""
 #, gcc-internal-format
 msgid "too few template-parameter-lists"
 msgstr ""


@@ -27730,112 +31304,200 @@ msgstr ""
 #. something like:
 #.
 #. template <class T> template <class U> void S::f();
 #. something like:
 #.
 #. template <class T> template <class U> void S::f();

+<<<<<<< HEAD

 #: cp/parser.c:18319
 #: cp/parser.c:18319

+=======
+#: cp/parser.c:18307
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too many template-parameter-lists"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too many template-parameter-lists"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18607
 #: cp/parser.c:18607

+=======
+#: cp/parser.c:18595
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "named return values are no longer supported"
 msgstr ""
 
 #, gcc-internal-format
 msgid "named return values are no longer supported"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18687
 #: cp/parser.c:18687

+=======
+#: cp/parser.c:18675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid declaration of member template in local class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid declaration of member template in local class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18696
 #: cp/parser.c:18696

+=======
+#: cp/parser.c:18684
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template with C linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template with C linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18844
 #: cp/parser.c:18844

+=======
+#: cp/parser.c:18832
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template declaration of %<typedef%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template declaration of %<typedef%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:18913
 #: cp/parser.c:18913

+=======
+#: cp/parser.c:18901
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "explicit template specialization cannot have a storage class"
 msgstr ""
 
 #, gcc-internal-format
 msgid "explicit template specialization cannot have a storage class"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19138
 #: cp/parser.c:19138

+=======
+#: cp/parser.c:19126
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<>>%> should be %<> >%> within a nested template argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<>>%> should be %<> >%> within a nested template argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19151
 #: cp/parser.c:19151

+=======
+#: cp/parser.c:19139
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "spurious %<>>%>, use %<>%> to terminate a template argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "spurious %<>>%>, use %<>%> to terminate a template argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19494
 #: cp/parser.c:19494

+=======
+#: cp/parser.c:19482
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of %qD in linkage specification"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of %qD in linkage specification"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19507
 #: cp/parser.c:19507

+=======
+#: cp/parser.c:19495
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<__thread%> before %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<__thread%> before %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19828
 #: cp/parser.c:19828

+=======
+#: cp/parser.c:19816
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qs tag used in naming %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qs tag used in naming %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19849
 #: cp/parser.c:19849

+=======
+#: cp/parser.c:19837
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD redeclared with different access"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD redeclared with different access"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:19868
 #: cp/parser.c:19868

+=======
+#: cp/parser.c:19856
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<template%> (as a disambiguator) is only allowed within templates"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<template%> (as a disambiguator) is only allowed within templates"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:20135 cp/parser.c:21063 cp/parser.c:21196
 #: cp/parser.c:20135 cp/parser.c:21063 cp/parser.c:21196

+=======
+#: cp/parser.c:20123 cp/parser.c:21051 cp/parser.c:21184
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "misplaced %<@%D%> Objective-C++ construct"
 msgstr ""
 
 #, gcc-internal-format
 msgid "misplaced %<@%D%> Objective-C++ construct"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:20280
 #: cp/parser.c:20280

+=======
+#: cp/parser.c:20268
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<@encode%> must specify a type as an argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<@encode%> must specify a type as an argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:20596
 #: cp/parser.c:20596

+=======
+#: cp/parser.c:20584
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid Objective-C++ selector name"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid Objective-C++ selector name"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:20927
 #: cp/parser.c:20927

+=======
+#: cp/parser.c:20915
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "identifier expected after %<@protocol%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "identifier expected after %<@protocol%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:22266
 #: cp/parser.c:22266

+=======
+#: cp/parser.c:22254
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parenthesized initialization is not allowed in OpenMP %<for%> loop"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parenthesized initialization is not allowed in OpenMP %<for%> loop"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:22434 cp/pt.c:11413
 #: cp/parser.c:22434 cp/pt.c:11413

+=======
+#: cp/parser.c:22422 cp/pt.c:11410
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "iteration variable %qD should not be reduction"
 msgstr ""
 
 #, gcc-internal-format
 msgid "iteration variable %qD should not be reduction"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:22501
 #: cp/parser.c:22501

+=======
+#: cp/parser.c:22489
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "not enough collapsed for loops"
 msgstr ""
 
 #, gcc-internal-format
 msgid "not enough collapsed for loops"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:22963
 #: cp/parser.c:22963

+=======
+#: cp/parser.c:22951
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "junk at end of %<#pragma GCC pch_preprocess%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "junk at end of %<#pragma GCC pch_preprocess%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/parser.c:23126
 #: cp/parser.c:23126

+=======
+#: cp/parser.c:23114
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "inter-module optimizations not implemented for C++"
 msgstr ""
 #, gcc-internal-format
 msgid "inter-module optimizations not implemented for C++"
 msgstr ""


@@ -28025,7 +31687,11 @@ msgstr ""
 msgid "parameter packs not expanded with %<...%>:"
 msgstr ""
 
 msgid "parameter packs not expanded with %<...%>:"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3209 cp/pt.c:3897
 #: cp/pt.c:3209 cp/pt.c:3897

+=======
+#: cp/pt.c:3209 cp/pt.c:3894
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "        %qD"
 msgstr ""
 #, gcc-internal-format
 msgid "        %qD"
 msgstr ""


@@ -28045,87 +31711,147 @@ msgstr ""
 msgid " shadows template parm %q+#D"
 msgstr ""
 
 msgid " shadows template parm %q+#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3893
 #: cp/pt.c:3893

+=======
+#: cp/pt.c:3890
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template parameters not used in partial specialization:"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template parameters not used in partial specialization:"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3908
 #: cp/pt.c:3908

+=======
+#: cp/pt.c:3905
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "partial specialization %qT does not specialize any template arguments"
 msgstr ""
 
 #, gcc-internal-format
 msgid "partial specialization %qT does not specialize any template arguments"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3953
 #: cp/pt.c:3953

+=======
+#: cp/pt.c:3950
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "parameter pack argument %qE must be at the end of the template argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "parameter pack argument %qE must be at the end of the template argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3956
 #: cp/pt.c:3956

+=======
+#: cp/pt.c:3953
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "parameter pack argument %qT must be at the end of the template argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "parameter pack argument %qT must be at the end of the template argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:3975
 #: cp/pt.c:3975

+=======
+#: cp/pt.c:3972
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template argument %qE involves template parameter(s)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template argument %qE involves template parameter(s)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4022
 #: cp/pt.c:4022

+=======
+#: cp/pt.c:4019
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type %qT of template argument %qE depends on a template parameter"
 msgid_plural "type %qT of template argument %qE depends on template parameters"
 msgstr[0] ""
 msgstr[1] ""
 
 #, gcc-internal-format
 msgid "type %qT of template argument %qE depends on a template parameter"
 msgid_plural "type %qT of template argument %qE depends on template parameters"
 msgstr[0] ""
 msgstr[1] ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4129
 #: cp/pt.c:4129

+=======
+#: cp/pt.c:4126
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no default argument for %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no default argument for %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4150
 #: cp/pt.c:4150

+=======
+#: cp/pt.c:4147
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter pack %qE must be at the end of the template parameter list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter pack %qE must be at the end of the template parameter list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4153
 #: cp/pt.c:4153

+=======
+#: cp/pt.c:4150
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter pack %qT must be at the end of the template parameter list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter pack %qT must be at the end of the template parameter list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4190
 #: cp/pt.c:4190

+=======
+#: cp/pt.c:4187
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function template friend re-"
 "declaration"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function template friend re-"
 "declaration"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4193
 #: cp/pt.c:4193

+=======
+#: cp/pt.c:4190
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function template friend "
 "declarations"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function template friend "
 "declarations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4196
 #: cp/pt.c:4196

+=======
+#: cp/pt.c:4193
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function templates without -"
 "std=c++0x or -std=gnu++0x"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "default template arguments may not be used in function templates without -"
 "std=c++0x or -std=gnu++0x"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4199
 #: cp/pt.c:4199

+=======
+#: cp/pt.c:4196
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default template arguments may not be used in partial specializations"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default template arguments may not be used in partial specializations"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4202 cp/pt.c:4253
 #: cp/pt.c:4202 cp/pt.c:4253

+=======
+#: cp/pt.c:4199 cp/pt.c:4250
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "default argument for template parameter for class enclosing %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "default argument for template parameter for class enclosing %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4346
 #: cp/pt.c:4346

+=======
+#: cp/pt.c:4343
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template class without a name"
 msgstr ""
 #, gcc-internal-format
 msgid "template class without a name"
 msgstr ""


@@ -28133,7 +31859,11 @@ msgstr ""
 #. [temp.mem]
 #.
 #. A destructor shall not be a member template.
 #. [temp.mem]
 #.
 #. A destructor shall not be a member template.

+<<<<<<< HEAD

 #: cp/pt.c:4356
 #: cp/pt.c:4356

+=======
+#: cp/pt.c:4353
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "destructor %qD declared as member template"
 msgstr ""
 #, gcc-internal-format
 msgid "destructor %qD declared as member template"
 msgstr ""


@@ -28143,76 +31873,132 @@ msgstr ""
 #. An allocation function can be a function
 #. template. ... Template allocation functions shall
 #. have two or more parameters.
 #. An allocation function can be a function
 #. template. ... Template allocation functions shall
 #. have two or more parameters.

+<<<<<<< HEAD

 #: cp/pt.c:4371
 #: cp/pt.c:4371

+=======
+#: cp/pt.c:4368
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid template declaration of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid template declaration of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4488
 #: cp/pt.c:4488

+=======
+#: cp/pt.c:4485
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template definition of non-template %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template definition of non-template %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4531
 #: cp/pt.c:4531

+=======
+#: cp/pt.c:4528
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "expected %d levels of template parms for %q#D, got %d"
 msgstr ""
 
 #, gcc-internal-format
 msgid "expected %d levels of template parms for %q#D, got %d"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4543
 #: cp/pt.c:4543

+=======
+#: cp/pt.c:4540
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "got %d template parameters for %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "got %d template parameters for %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4546
 #: cp/pt.c:4546

+=======
+#: cp/pt.c:4543
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "got %d template parameters for %q#T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "got %d template parameters for %q#T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4548
 #: cp/pt.c:4548

+=======
+#: cp/pt.c:4545
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  but %d required"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  but %d required"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4569
 #: cp/pt.c:4569

+=======
+#: cp/pt.c:4563
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template arguments to %qD do not match original template %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template arguments to %qD do not match original template %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4573
 #: cp/pt.c:4573

+=======
+#: cp/pt.c:4567
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use template<> for an explicit specialization"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use template<> for an explicit specialization"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4669
 #: cp/pt.c:4669

+=======
+#: cp/pt.c:4666
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not a template type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not a template type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4682
 #: cp/pt.c:4682

+=======
+#: cp/pt.c:4679
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template specifiers not specified in declaration of %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template specifiers not specified in declaration of %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4693
 #: cp/pt.c:4693

+=======
+#: cp/pt.c:4690
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redeclared with %d template parameter"
 msgid_plural "redeclared with %d template parameters"
 msgstr[0] ""
 msgstr[1] ""
 
 #, gcc-internal-format
 msgid "redeclared with %d template parameter"
 msgid_plural "redeclared with %d template parameters"
 msgstr[0] ""
 msgstr[1] ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4697
 #: cp/pt.c:4697

+=======
+#: cp/pt.c:4694
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "previous declaration %q+D used %d template parameter"
 msgid_plural "previous declaration %q+D used %d template parameters"
 msgstr[0] ""
 msgstr[1] ""
 
 #, gcc-internal-format
 msgid "previous declaration %q+D used %d template parameter"
 msgid_plural "previous declaration %q+D used %d template parameters"
 msgstr[0] ""
 msgstr[1] ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4734
 #: cp/pt.c:4734

+=======
+#: cp/pt.c:4731
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template parameter %q+#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template parameter %q+#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4735
 #: cp/pt.c:4735

+=======
+#: cp/pt.c:4732
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redeclared here as %q#D"
 msgstr ""
 #, gcc-internal-format
 msgid "redeclared here as %q#D"
 msgstr ""


@@ -28221,244 +32007,416 @@ msgstr ""
 #.
 #. A template-parameter may not be given default arguments
 #. by two different declarations in the same scope.
 #.
 #. A template-parameter may not be given default arguments
 #. by two different declarations in the same scope.

+<<<<<<< HEAD

 #: cp/pt.c:4745
 #: cp/pt.c:4745

+=======
+#: cp/pt.c:4742
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "redefinition of default argument for %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "redefinition of default argument for %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4747
 #: cp/pt.c:4747

+=======
+#: cp/pt.c:4744
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "original definition appeared here"
 msgstr ""
 
 #, gcc-internal-format
 msgid "original definition appeared here"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4851
 #: cp/pt.c:4851

+=======
+#: cp/pt.c:4848
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because function %qD has "
 "not external linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because function %qD has "
 "not external linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4870 cp/pt.c:5157
 #: cp/pt.c:4870 cp/pt.c:5157

+=======
+#: cp/pt.c:4867 cp/pt.c:5154
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE is not a valid template argument for type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE is not a valid template argument for type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4872
 #: cp/pt.c:4872

+=======
+#: cp/pt.c:4869
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "it must be a pointer-to-member of the form `&X::Y'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "it must be a pointer-to-member of the form `&X::Y'"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4908
 #: cp/pt.c:4908

+=======
+#: cp/pt.c:4905
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because string literals "
 "can never be used in this context"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because string literals "
 "can never be used in this context"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:4985
 #: cp/pt.c:4985

+=======
+#: cp/pt.c:4982
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is a non-"
 "constant expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is a non-"
 "constant expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5029
 #: cp/pt.c:5029

+=======
+#: cp/pt.c:5026
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qD is not a valid template argument because %qD is a variable, not the "
 "address of a variable"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qD is not a valid template argument because %qD is a variable, not the "
 "address of a variable"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5047
 #: cp/pt.c:5047

+=======
+#: cp/pt.c:5044
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument of type %qT because %qE is not a "
 "variable"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument of type %qT because %qE is not a "
 "variable"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5054
 #: cp/pt.c:5054

+=======
+#: cp/pt.c:5051
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument of type %qT because %qD does not have "
 "external linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument of type %qT because %qD does not have "
 "external linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5084
 #: cp/pt.c:5084

+=======
+#: cp/pt.c:5081
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because of conflicts in cv-"
 "qualification"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because of conflicts in cv-"
 "qualification"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5091
 #: cp/pt.c:5091

+=======
+#: cp/pt.c:5088
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is not an lvalue"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is not an lvalue"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5108
 #: cp/pt.c:5108

+=======
+#: cp/pt.c:5105
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%q#D is not a valid template argument for type %qT because a reference "
 "variable does not have a constant address"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%q#D is not a valid template argument for type %qT because a reference "
 "variable does not have a constant address"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5117
 #: cp/pt.c:5117

+=======
+#: cp/pt.c:5114
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is not an "
 "object with external linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is not an "
 "object with external linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5125
 #: cp/pt.c:5125

+=======
+#: cp/pt.c:5122
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because object %qD has not "
 "external linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because object %qD has not "
 "external linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5158
 #: cp/pt.c:5158

+=======
+#: cp/pt.c:5155
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "it must be the address of a function with external linkage"
 msgstr ""
 
 #, gcc-internal-format
 msgid "it must be the address of a function with external linkage"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5172
 #: cp/pt.c:5172

+=======
+#: cp/pt.c:5169
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is a pointer"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is a pointer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5174
 #: cp/pt.c:5174

+=======
+#: cp/pt.c:5171
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "try using %qE instead"
 msgstr ""
 
 #, gcc-internal-format
 msgid "try using %qE instead"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5212
 #: cp/pt.c:5212

+=======
+#: cp/pt.c:5209
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is of type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "%qE is not a valid template argument for type %qT because it is of type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5218
 #: cp/pt.c:5218

+=======
+#: cp/pt.c:5215
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "standard conversions are not allowed in this context"
 msgstr ""
 
 #, gcc-internal-format
 msgid "standard conversions are not allowed in this context"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5551
 #: cp/pt.c:5551

+=======
+#: cp/pt.c:5548
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "injected-class-name %qD used as template template argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "injected-class-name %qD used as template template argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5576
 #: cp/pt.c:5576

+=======
+#: cp/pt.c:5573
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "to refer to a type member of a template parameter, use %<typename %E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "to refer to a type member of a template parameter, use %<typename %E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5592 cp/pt.c:5611 cp/pt.c:5657
 #: cp/pt.c:5592 cp/pt.c:5611 cp/pt.c:5657

+=======
+#: cp/pt.c:5589 cp/pt.c:5608 cp/pt.c:5654
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type/value mismatch at argument %d in template parameter list for %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "type/value mismatch at argument %d in template parameter list for %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5596
 #: cp/pt.c:5596

+=======
+#: cp/pt.c:5593
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a constant of type %qT, got %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  expected a constant of type %qT, got %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5600
 #: cp/pt.c:5600

+=======
+#: cp/pt.c:5597
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a class template, got %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  expected a class template, got %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5602
 #: cp/pt.c:5602

+=======
+#: cp/pt.c:5599
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a type, got %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  expected a type, got %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5615
 #: cp/pt.c:5615

+=======
+#: cp/pt.c:5612
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a type, got %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  expected a type, got %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5617
 #: cp/pt.c:5617

+=======
+#: cp/pt.c:5614
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a class template, got %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  expected a class template, got %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5660
 #: cp/pt.c:5660

+=======
+#: cp/pt.c:5657
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  expected a template of type %qD, got %qT"
 msgstr ""
 
 #. Not sure if this is reachable, but it doesn't hurt
 #. to be robust.
 #, gcc-internal-format
 msgid "  expected a template of type %qD, got %qT"
 msgstr ""
 
 #. Not sure if this is reachable, but it doesn't hurt
 #. to be robust.

+<<<<<<< HEAD

 #: cp/pt.c:5693
 #: cp/pt.c:5693

+=======
+#: cp/pt.c:5690
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "type mismatch in nontype parameter pack"
 msgstr ""
 
 #, gcc-internal-format
 msgid "type mismatch in nontype parameter pack"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5715
 #: cp/pt.c:5715

+=======
+#: cp/pt.c:5712
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "could not convert template argument %qE to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "could not convert template argument %qE to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5780
 #: cp/pt.c:5780

+=======
+#: cp/pt.c:5777
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "wrong number of template arguments (%d, should be %d)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "wrong number of template arguments (%d, should be %d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5922
 #: cp/pt.c:5922

+=======
+#: cp/pt.c:5919
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "wrong number of template arguments (%d, should be %d%s)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "wrong number of template arguments (%d, should be %d%s)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5926
 #: cp/pt.c:5926

+=======
+#: cp/pt.c:5923
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "provided for %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "provided for %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5993
 #: cp/pt.c:5993

+=======
+#: cp/pt.c:5990
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot expand %<%E%> into a fixed-length argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot expand %<%E%> into a fixed-length argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:5996
 #: cp/pt.c:5996

+=======
+#: cp/pt.c:5993
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot expand %<%T%> into a fixed-length argument list"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot expand %<%T%> into a fixed-length argument list"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:6019
 #: cp/pt.c:6019

+=======
+#: cp/pt.c:6016
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template argument %d is invalid"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template argument %d is invalid"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:6347
 #: cp/pt.c:6347

+=======
+#: cp/pt.c:6344
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "non-template type %qT used as a template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "non-template type %qT used as a template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:6349
 #: cp/pt.c:6349

+=======
+#: cp/pt.c:6346
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "for template declaration %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "for template declaration %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:7060
 #: cp/pt.c:7060

+=======
+#: cp/pt.c:7057
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "template instantiation depth exceeds maximum of %d (use -ftemplate-depth= to "
 "increase the maximum) instantiating %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "template instantiation depth exceeds maximum of %d (use -ftemplate-depth= to "
 "increase the maximum) instantiating %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:8326
 #: cp/pt.c:8326

+=======
+#: cp/pt.c:8323
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "mismatched argument pack lengths while expanding %<%T%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "mismatched argument pack lengths while expanding %<%T%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:8330
 #: cp/pt.c:8330

+=======
+#: cp/pt.c:8327
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "mismatched argument pack lengths while expanding %<%E%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "mismatched argument pack lengths while expanding %<%E%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9370
 #: cp/pt.c:9370

+=======
+#: cp/pt.c:9367
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "instantiation of %q+D as type %qT"
 msgstr ""
 #, gcc-internal-format
 msgid "instantiation of %q+D as type %qT"
 msgstr ""


@@ -28476,175 +32434,307 @@ msgstr ""
 #.
 #. is an attempt to declare a variable with function
 #. type.
 #.
 #. is an attempt to declare a variable with function
 #. type.

+<<<<<<< HEAD

 #: cp/pt.c:9515
 #: cp/pt.c:9515

+=======
+#: cp/pt.c:9512
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "variable %qD has function type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "variable %qD has function type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9678
 #: cp/pt.c:9678

+=======
+#: cp/pt.c:9675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid parameter type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid parameter type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9680
 #: cp/pt.c:9680

+=======
+#: cp/pt.c:9677
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "in declaration %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "in declaration %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9757
 #: cp/pt.c:9757

+=======
+#: cp/pt.c:9754
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function returning an array"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function returning an array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9759
 #: cp/pt.c:9759

+=======
+#: cp/pt.c:9756
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "function returning a function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "function returning a function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:9786
 #: cp/pt.c:9786

+=======
+#: cp/pt.c:9783
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating pointer to member function of non-class type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating pointer to member function of non-class type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10016
 #, gcc-internal-format
 msgid "array bound is not an integer constant"
 msgstr ""
 
 #: cp/pt.c:10036
 #: cp/pt.c:10016
 #, gcc-internal-format
 msgid "array bound is not an integer constant"
 msgstr ""
 
 #: cp/pt.c:10036

+=======
+#: cp/pt.c:10033
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array with negative size (%qE)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array with negative size (%qE)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10285
 #: cp/pt.c:10285

+=======
+#: cp/pt.c:10282
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "forming reference to void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "forming reference to void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10287
 #: cp/pt.c:10287

+=======
+#: cp/pt.c:10284
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "forming pointer to reference type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "forming pointer to reference type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10289
 #: cp/pt.c:10289

+=======
+#: cp/pt.c:10286
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "forming reference to reference type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "forming reference to reference type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10338
 #: cp/pt.c:10338

+=======
+#: cp/pt.c:10335
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating pointer to member of non-class type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating pointer to member of non-class type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10344
 #: cp/pt.c:10344

+=======
+#: cp/pt.c:10341
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating pointer to member reference type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating pointer to member reference type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10350
 #: cp/pt.c:10350

+=======
+#: cp/pt.c:10347
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating pointer to member of type void"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating pointer to member of type void"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10412
 #: cp/pt.c:10412

+=======
+#: cp/pt.c:10409
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10418
 #: cp/pt.c:10418

+=======
+#: cp/pt.c:10415
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "creating array of %qT, which is an abstract class type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "creating array of %qT, which is an abstract class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10470
 #: cp/pt.c:10470

+=======
+#: cp/pt.c:10467
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not a class, struct, or union type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not a class, struct, or union type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10506
 #: cp/pt.c:10506

+=======
+#: cp/pt.c:10503
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT resolves to %qT, which is not an enumeration type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT resolves to %qT, which is not an enumeration type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10509
 #: cp/pt.c:10509

+=======
+#: cp/pt.c:10506
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT resolves to %qT, which is is not a class type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT resolves to %qT, which is is not a class type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10630
 #: cp/pt.c:10630

+=======
+#: cp/pt.c:10627
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use of %qs in template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use of %qs in template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10761
 #: cp/pt.c:10761

+=======
+#: cp/pt.c:10758
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "qualifying type %qT does not match destructor name ~%qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "qualifying type %qT does not match destructor name ~%qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10776
 #: cp/pt.c:10776

+=======
+#: cp/pt.c:10773
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "dependent-name %qE is parsed as a non-type, but instantiation yields a type"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "dependent-name %qE is parsed as a non-type, but instantiation yields a type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10778
 #: cp/pt.c:10778

+=======
+#: cp/pt.c:10775
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "say %<typename %E%> if a type is meant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "say %<typename %E%> if a type is meant"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:10924
 #: cp/pt.c:10924

+=======
+#: cp/pt.c:10921
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "using invalid field %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "using invalid field %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:11254 cp/pt.c:11926
 #: cp/pt.c:11254 cp/pt.c:11926

+=======
+#: cp/pt.c:11251 cp/pt.c:11923
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of pack expansion expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of pack expansion expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:11258 cp/pt.c:11930
 #: cp/pt.c:11258 cp/pt.c:11930

+=======
+#: cp/pt.c:11255 cp/pt.c:11927
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "use %<...%> to expand argument pack"
 msgstr ""
 
 #, gcc-internal-format
 msgid "use %<...%> to expand argument pack"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12090
 #: cp/pt.c:12090

+=======
+#: cp/pt.c:12087
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "a cast to a type other than an integral or enumeration type cannot appear in "
 "a constant-expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "a cast to a type other than an integral or enumeration type cannot appear in "
 "a constant-expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12630
 #: cp/pt.c:12630

+=======
+#: cp/pt.c:12627
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not a class or namespace"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not a class or namespace"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12633
 #: cp/pt.c:12633

+=======
+#: cp/pt.c:12630
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a class or namespace"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is not a class or namespace"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12896
 #: cp/pt.c:12896

+=======
+#: cp/pt.c:12893
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is/uses anonymous type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is/uses anonymous type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12898
 #: cp/pt.c:12898

+=======
+#: cp/pt.c:12895
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "template argument for %qD uses local type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "template argument for %qD uses local type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12908
 #: cp/pt.c:12908

+=======
+#: cp/pt.c:12905
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is a variably modified type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is a variably modified type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12919
 #: cp/pt.c:12919

+=======
+#: cp/pt.c:12916
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "integral expression %qE is not constant"
 msgstr ""
 
 #, gcc-internal-format
 msgid "integral expression %qE is not constant"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/pt.c:12937
 #: cp/pt.c:12937

+=======
+#: cp/pt.c:12934
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  trying to instantiate %qD"
 msgstr ""
 #, gcc-internal-format
 msgid "  trying to instantiate %qD"
 msgstr ""


@@ -28946,7 +33036,11 @@ msgstr ""
 msgid "invalid qualifying scope in pseudo-destructor name"
 msgstr ""
 
 msgid "invalid qualifying scope in pseudo-destructor name"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/semantics.c:2158 cp/typeck.c:2351
 #: cp/semantics.c:2158 cp/typeck.c:2351

+=======
+#: cp/semantics.c:2158 cp/typeck.c:2365
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "qualified type %qT does not match destructor name ~%qT"
 msgstr ""
 #, gcc-internal-format
 msgid "qualified type %qT does not match destructor name ~%qT"
 msgstr ""


@@ -29007,7 +33101,11 @@ msgstr ""
 msgid "reference to %<%T::%D%> is ambiguous"
 msgstr ""
 
 msgid "reference to %<%T::%D%> is ambiguous"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/semantics.c:2664 cp/typeck.c:2151
 #: cp/semantics.c:2664 cp/typeck.c:2151

+=======
+#: cp/semantics.c:2664 cp/typeck.c:2165
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a member of %qT"
 msgstr ""
 #, gcc-internal-format
 msgid "%qD is not a member of %qT"
 msgstr ""


@@ -29304,448 +33402,796 @@ msgid ""
 "lacks a cast"
 msgstr ""
 
 "lacks a cast"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1416
 #: cp/typeck.c:1416

+=======
+#: cp/typeck.c:1430
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "canonical types differ for identical types %T and %T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "canonical types differ for identical types %T and %T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1423
 #: cp/typeck.c:1423

+=======
+#: cp/typeck.c:1437
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "same canonical type node for different types %T and %T"
 msgstr ""
 
 #, gcc-internal-format
 msgid "same canonical type node for different types %T and %T"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1536
 #: cp/typeck.c:1536

+=======
+#: cp/typeck.c:1550
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid application of %qs to a member function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid application of %qs to a member function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1604
 #: cp/typeck.c:1604

+=======
+#: cp/typeck.c:1618
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid application of %<sizeof%> to a bit-field"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid application of %<sizeof%> to a bit-field"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1612
 #: cp/typeck.c:1612

+=======
+#: cp/typeck.c:1626
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids applying %<sizeof%> to an expression of function type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids applying %<sizeof%> to an expression of function type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1661
 #: cp/typeck.c:1661

+=======
+#: cp/typeck.c:1675
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid application of %<__alignof%> to a bit-field"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid application of %<__alignof%> to a bit-field"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1672
 #: cp/typeck.c:1672

+=======
+#: cp/typeck.c:1686
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids applying %<__alignof%> to an expression of function type"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids applying %<__alignof%> to an expression of function type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1730
 #: cp/typeck.c:1730

+=======
+#: cp/typeck.c:1744
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of non-static member function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of non-static member function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:1997
 #: cp/typeck.c:1997

+=======
+#: cp/typeck.c:2011
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "deprecated conversion from string constant to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "deprecated conversion from string constant to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2120 cp/typeck.c:2495
 #: cp/typeck.c:2120 cp/typeck.c:2495

+=======
+#: cp/typeck.c:2134 cp/typeck.c:2509
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "request for member %qD in %qE, which is of non-class type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "request for member %qD in %qE, which is of non-class type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2149
 #: cp/typeck.c:2149

+=======
+#: cp/typeck.c:2163
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of nonstatic data member %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of nonstatic data member %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2204
 #: cp/typeck.c:2204

+=======
+#: cp/typeck.c:2218
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid access to non-static data member %qD of NULL object"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid access to non-static data member %qD of NULL object"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2207 cp/typeck.c:2238
 #: cp/typeck.c:2207 cp/typeck.c:2238

+=======
+#: cp/typeck.c:2221 cp/typeck.c:2252
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "(perhaps the %<offsetof%> macro was used incorrectly)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "(perhaps the %<offsetof%> macro was used incorrectly)"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2235
 #: cp/typeck.c:2235

+=======
+#: cp/typeck.c:2249
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid access to non-static data member %qD  of NULL object"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid access to non-static data member %qD  of NULL object"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2363
 #: cp/typeck.c:2363

+=======
+#: cp/typeck.c:2377
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "object type %qT does not match destructor name ~%qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "object type %qT does not match destructor name ~%qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2371
 #: cp/typeck.c:2371

+=======
+#: cp/typeck.c:2385
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "the type being destroyed is %qT, but the destructor refers to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "the type being destroyed is %qT, but the destructor refers to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2410 cp/typeck.c:2430
 #: cp/typeck.c:2410 cp/typeck.c:2430

+=======
+#: cp/typeck.c:2424 cp/typeck.c:2444
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a template"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is not a template"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2534
 #: cp/typeck.c:2534

+=======
+#: cp/typeck.c:2548
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%<%D::%D%> is not a member of %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%<%D::%D%> is not a member of %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2558
 #: cp/typeck.c:2558

+=======
+#: cp/typeck.c:2572
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not a base of %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not a base of %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2578
 #: cp/typeck.c:2578

+=======
+#: cp/typeck.c:2592
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD has no member named %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD has no member named %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2594
 #: cp/typeck.c:2594

+=======
+#: cp/typeck.c:2608
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qD is not a member template function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qD is not a member template function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2739
 #: cp/typeck.c:2739

+=======
+#: cp/typeck.c:2753
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qT is not a pointer-to-object type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qT is not a pointer-to-object type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2770
 #: cp/typeck.c:2770

+=======
+#: cp/typeck.c:2784
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of array indexing on pointer to member"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of array indexing on pointer to member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2773
 #: cp/typeck.c:2773

+=======
+#: cp/typeck.c:2787
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of unary %<*%> on pointer to member"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of unary %<*%> on pointer to member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2776
 #: cp/typeck.c:2776

+=======
+#: cp/typeck.c:2790
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of implicit conversion on pointer to member"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of implicit conversion on pointer to member"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2785
 #: cp/typeck.c:2785

+=======
+#: cp/typeck.c:2799
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid type argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid type argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2788
 #: cp/typeck.c:2788

+=======
+#: cp/typeck.c:2802
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid type argument of array indexing"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid type argument of array indexing"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2791
 #: cp/typeck.c:2791

+=======
+#: cp/typeck.c:2805
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid type argument of unary %<*%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid type argument of unary %<*%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2794
 #: cp/typeck.c:2794

+=======
+#: cp/typeck.c:2808
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid type argument of implicit conversion"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid type argument of implicit conversion"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2824
 #: cp/typeck.c:2824

+=======
+#: cp/typeck.c:2838
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "subscript missing in array reference"
 msgstr ""
 
 #, gcc-internal-format
 msgid "subscript missing in array reference"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2904
 #: cp/typeck.c:2904

+=======
+#: cp/typeck.c:2918
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids subscripting non-lvalue array"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids subscripting non-lvalue array"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:2916
 #: cp/typeck.c:2916

+=======
+#: cp/typeck.c:2930
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "subscripting array declared %<register%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "subscripting array declared %<register%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3008
 #: cp/typeck.c:3008

+=======
+#: cp/typeck.c:3022
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "object missing in use of %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "object missing in use of %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3187
 #: cp/typeck.c:3187

+=======
+#: cp/typeck.c:3201
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids calling %<::main%> from within program"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids calling %<::main%> from within program"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3206
 #: cp/typeck.c:3206

+=======
+#: cp/typeck.c:3220
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "must use %<.*%> or %<->*%> to call pointer-to-member function in %<%E (...)%"
 ">, e.g. %<(... ->* %E) (...)%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "must use %<.*%> or %<->*%> to call pointer-to-member function in %<%E (...)%"
 ">, e.g. %<(... ->* %E) (...)%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3221
 #: cp/typeck.c:3221

+=======
+#: cp/typeck.c:3235
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%qE cannot be used as a function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%qE cannot be used as a function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3312
 #: cp/typeck.c:3312

+=======
+#: cp/typeck.c:3326
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too many arguments to %s %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too many arguments to %s %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3318
 #: cp/typeck.c:3318

+=======
+#: cp/typeck.c:3332
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too many arguments to function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too many arguments to function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3353
 #: cp/typeck.c:3353

+=======
+#: cp/typeck.c:3367
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %P of %qD has incomplete type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %P of %qD has incomplete type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3356
 #: cp/typeck.c:3356

+=======
+#: cp/typeck.c:3370
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "parameter %P has incomplete type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "parameter %P has incomplete type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3426
 #: cp/typeck.c:3426

+=======
+#: cp/typeck.c:3440
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too few arguments to %s %q#D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too few arguments to %s %q#D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3432
 #: cp/typeck.c:3432

+=======
+#: cp/typeck.c:3446
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "too few arguments to function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "too few arguments to function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3638 cp/typeck.c:3649
 #: cp/typeck.c:3638 cp/typeck.c:3649

+=======
+#: cp/typeck.c:3652 cp/typeck.c:3663
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "assuming cast to type %qT from overloaded function"
 msgstr ""
 
 #. Some sort of arithmetic operation involving NULL was
 #. performed.
 #, gcc-internal-format
 msgid "assuming cast to type %qT from overloaded function"
 msgstr ""
 
 #. Some sort of arithmetic operation involving NULL was
 #. performed.

+<<<<<<< HEAD

 #: cp/typeck.c:3692
 #: cp/typeck.c:3692

+=======
+#: cp/typeck.c:3706
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "NULL used in arithmetic"
 msgstr ""
 
 #, gcc-internal-format
 msgid "NULL used in arithmetic"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3883
 #: cp/typeck.c:3883

+=======
+#: cp/typeck.c:3897
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "left rotate count is negative"
 msgstr ""
 
 #, gcc-internal-format
 msgid "left rotate count is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3884
 #: cp/typeck.c:3884

+=======
+#: cp/typeck.c:3898
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "right rotate count is negative"
 msgstr ""
 
 #, gcc-internal-format
 msgid "right rotate count is negative"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3890
 #: cp/typeck.c:3890

+=======
+#: cp/typeck.c:3904
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "left rotate count >= width of type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "left rotate count >= width of type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3891
 #: cp/typeck.c:3891

+=======
+#: cp/typeck.c:3905
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "right rotate count >= width of type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "right rotate count >= width of type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3910 cp/typeck.c:4133
 #: cp/typeck.c:3910 cp/typeck.c:4133

+=======
+#: cp/typeck.c:3924 cp/typeck.c:4147
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "comparison with string literal results in unspecified behaviour"
 msgstr ""
 
 #, gcc-internal-format
 msgid "comparison with string literal results in unspecified behaviour"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:3950 cp/typeck.c:3958 cp/typeck.c:4153 cp/typeck.c:4161
 #: cp/typeck.c:3950 cp/typeck.c:3958 cp/typeck.c:4153 cp/typeck.c:4161

+=======
+#: cp/typeck.c:3964 cp/typeck.c:3972 cp/typeck.c:4167 cp/typeck.c:4175
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids comparison between pointer and integer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids comparison between pointer and integer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4178
 #: cp/typeck.c:4178

+=======
+#: cp/typeck.c:4192
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "unordered comparison on non-floating point argument"
 msgstr ""
 
 #, gcc-internal-format
 msgid "unordered comparison on non-floating point argument"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4218
 #: cp/typeck.c:4218

+=======
+#: cp/typeck.c:4232
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid operands of types %qT and %qT to binary %qO"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid operands of types %qT and %qT to binary %qO"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4435
 #: cp/typeck.c:4435

+=======
+#: cp/typeck.c:4449
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer of type %<void *%> in subtraction"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer of type %<void *%> in subtraction"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4437
 #: cp/typeck.c:4437

+=======
+#: cp/typeck.c:4451
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer to a function in subtraction"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer to a function in subtraction"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4439
 #: cp/typeck.c:4439

+=======
+#: cp/typeck.c:4453
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer to a method in subtraction"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids using pointer to a method in subtraction"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4452
 #: cp/typeck.c:4452

+=======
+#: cp/typeck.c:4466
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of a pointer to an incomplete type in pointer arithmetic"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of a pointer to an incomplete type in pointer arithmetic"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4510
 #: cp/typeck.c:4510

+=======
+#: cp/typeck.c:4524
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "taking address of constructor %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "taking address of constructor %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4511
 #: cp/typeck.c:4511

+=======
+#: cp/typeck.c:4525
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "taking address of destructor %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "taking address of destructor %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4525
 #: cp/typeck.c:4525

+=======
+#: cp/typeck.c:4539
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of %qE to form a pointer-to-member-function"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of %qE to form a pointer-to-member-function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4528
 #: cp/typeck.c:4528

+=======
+#: cp/typeck.c:4542
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  a qualified-id is required"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  a qualified-id is required"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4533
 #: cp/typeck.c:4533

+=======
+#: cp/typeck.c:4547
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "parentheses around %qE cannot be used to form a pointer-to-member-function"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "parentheses around %qE cannot be used to form a pointer-to-member-function"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4556
 #: cp/typeck.c:4556

+=======
+#: cp/typeck.c:4570
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "taking address of temporary"
 msgstr ""
 
 #, gcc-internal-format
 msgid "taking address of temporary"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4826
 #: cp/typeck.c:4826

+=======
+#: cp/typeck.c:4840
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids incrementing an enum"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids incrementing an enum"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4827
 #: cp/typeck.c:4827

+=======
+#: cp/typeck.c:4841
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids decrementing an enum"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids decrementing an enum"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4843
 #: cp/typeck.c:4843

+=======
+#: cp/typeck.c:4857
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot increment a pointer to incomplete type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot increment a pointer to incomplete type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4844
 #: cp/typeck.c:4844

+=======
+#: cp/typeck.c:4858
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot decrement a pointer to incomplete type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot decrement a pointer to incomplete type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4855
 #: cp/typeck.c:4855

+=======
+#: cp/typeck.c:4869
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids incrementing a pointer of type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids incrementing a pointer of type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4856
 #: cp/typeck.c:4856

+=======
+#: cp/typeck.c:4870
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids decrementing a pointer of type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids decrementing a pointer of type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4882
 #: cp/typeck.c:4882

+=======
+#: cp/typeck.c:4896
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid use of Boolean expression as operand to %<operator--%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid use of Boolean expression as operand to %<operator--%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4917
 #: cp/typeck.c:4917

+=======
+#: cp/typeck.c:4931
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids taking address of function %<::main%>"
 msgstr ""
 
 #. An expression like &memfn.
 #, gcc-internal-format
 msgid "ISO C++ forbids taking address of function %<::main%>"
 msgstr ""
 
 #. An expression like &memfn.

+<<<<<<< HEAD

 #: cp/typeck.c:4978
 #: cp/typeck.c:4978

+=======
+#: cp/typeck.c:4992
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids taking the address of an unqualified or parenthesized non-"
 "static member function to form a pointer to member function.  Say %<&%T::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids taking the address of an unqualified or parenthesized non-"
 "static member function to form a pointer to member function.  Say %<&%T::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:4983
 #: cp/typeck.c:4983

+=======
+#: cp/typeck.c:4997
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids taking the address of a bound member function to form a "
 "pointer to member function.  Say %<&%T::%D%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids taking the address of a bound member function to form a "
 "pointer to member function.  Say %<&%T::%D%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5012
 #: cp/typeck.c:5012

+=======
+#: cp/typeck.c:5026
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids taking the address of a cast to a non-lvalue expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids taking the address of a cast to a non-lvalue expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5040
 #: cp/typeck.c:5040

+=======
+#: cp/typeck.c:5054
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot create pointer to reference member %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot create pointer to reference member %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5255
 #: cp/typeck.c:5255

+=======
+#: cp/typeck.c:5269
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot take the address of %<this%>, which is an rvalue expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot take the address of %<this%>, which is an rvalue expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5278
 #: cp/typeck.c:5278

+=======
+#: cp/typeck.c:5292
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "address of explicit register variable %qD requested"
 msgstr ""
 
 #, gcc-internal-format
 msgid "address of explicit register variable %qD requested"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5283
 #: cp/typeck.c:5283

+=======
+#: cp/typeck.c:5297
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "address requested for %qD, which is declared %<register%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "address requested for %qD, which is declared %<register%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5350 cp/typeck.c:5377
 #: cp/typeck.c:5350 cp/typeck.c:5377

+=======
+#: cp/typeck.c:5364 cp/typeck.c:5391
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%s expression list treated as compound expression"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%s expression list treated as compound expression"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5450
 #: cp/typeck.c:5450

+=======
+#: cp/typeck.c:5464
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "no context to resolve type of %qE"
 msgstr ""
 
 #, gcc-internal-format
 msgid "no context to resolve type of %qE"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5481
 #: cp/typeck.c:5481

+=======
+#: cp/typeck.c:5495
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5486
 #: cp/typeck.c:5486

+=======
+#: cp/typeck.c:5500
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "static_cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "static_cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5491
 #: cp/typeck.c:5491

+=======
+#: cp/typeck.c:5505
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "reinterpret_cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 
 #, gcc-internal-format
 msgid "reinterpret_cast from type %qT to type %qT casts away qualifiers"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5834
 #: cp/typeck.c:5834

+=======
+#: cp/typeck.c:5848
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid static_cast from type %qT to type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid static_cast from type %qT to type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5857
 #: cp/typeck.c:5857

+=======
+#: cp/typeck.c:5871
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "converting from %qT to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "converting from %qT to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5906
 #: cp/typeck.c:5906

+=======
+#: cp/typeck.c:5920
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid cast of an rvalue expression of type %qT to type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid cast of an rvalue expression of type %qT to type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:5973
 #: cp/typeck.c:5973

+=======
+#: cp/typeck.c:5987
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cast from %qT to %qT loses precision"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cast from %qT to %qT loses precision"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6003
 #: cp/typeck.c:6003

+=======
+#: cp/typeck.c:6017
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cast from %qT to %qT increases required alignment of target type"
 msgstr ""
 #, gcc-internal-format
 msgid "cast from %qT to %qT increases required alignment of target type"
 msgstr ""


@@ -29754,172 +34200,300 @@ msgstr ""
 #. where possible, and it is necessary in some cases.  DR 195
 #. addresses this issue, but as of 2004/10/26 is still in
 #. drafting.
 #. where possible, and it is necessary in some cases.  DR 195
 #. addresses this issue, but as of 2004/10/26 is still in
 #. drafting.

+<<<<<<< HEAD

 #: cp/typeck.c:6022
 #: cp/typeck.c:6022

+=======
+#: cp/typeck.c:6036
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids casting between pointer-to-function and pointer-to-object"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "ISO C++ forbids casting between pointer-to-function and pointer-to-object"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6035
 #: cp/typeck.c:6035

+=======
+#: cp/typeck.c:6049
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid cast from type %qT to type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid cast from type %qT to type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6091
 #: cp/typeck.c:6091

+=======
+#: cp/typeck.c:6105
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "invalid use of const_cast with type %qT, which is not a pointer, reference, "
 "nor a pointer-to-data-member type"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "invalid use of const_cast with type %qT, which is not a pointer, reference, "
 "nor a pointer-to-data-member type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6100
 #: cp/typeck.c:6100

+=======
+#: cp/typeck.c:6114
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "invalid use of const_cast with type %qT, which is a pointer or reference to "
 "a function type"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "invalid use of const_cast with type %qT, which is a pointer or reference to "
 "a function type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6125
 #: cp/typeck.c:6125

+=======
+#: cp/typeck.c:6139
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid const_cast of an rvalue of type %qT to type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid const_cast of an rvalue of type %qT to type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6174
 #: cp/typeck.c:6174

+=======
+#: cp/typeck.c:6188
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid const_cast from type %qT to type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid const_cast from type %qT to type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6251 cp/typeck.c:6259
 #: cp/typeck.c:6251 cp/typeck.c:6259

+=======
+#: cp/typeck.c:6265 cp/typeck.c:6273
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "ISO C++ forbids casting to an array type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "ISO C++ forbids casting to an array type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6268
 #: cp/typeck.c:6268

+=======
+#: cp/typeck.c:6282
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid cast to function type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid cast to function type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6514
 #: cp/typeck.c:6514

+=======
+#: cp/typeck.c:6528
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "  in evaluation of %<%Q(%#T, %#T)%>"
 msgstr ""
 
 #, gcc-internal-format
 msgid "  in evaluation of %<%Q(%#T, %#T)%>"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6572
 #: cp/typeck.c:6572

+=======
+#: cp/typeck.c:6586
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "incompatible types in assignment of %qT to %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "incompatible types in assignment of %qT to %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6586
 #: cp/typeck.c:6586

+=======
+#: cp/typeck.c:6600
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "array used as initializer"
 msgstr ""
 
 #, gcc-internal-format
 msgid "array used as initializer"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6588
 #: cp/typeck.c:6588

+=======
+#: cp/typeck.c:6602
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid array assignment"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid array assignment"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6688
 #: cp/typeck.c:6688

+=======
+#: cp/typeck.c:6702
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "   in pointer to member function conversion"
 msgstr ""
 
 #, gcc-internal-format
 msgid "   in pointer to member function conversion"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6699
 #: cp/typeck.c:6699

+=======
+#: cp/typeck.c:6713
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "pointer to member conversion via virtual base %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "pointer to member conversion via virtual base %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6739 cp/typeck.c:6752
 #: cp/typeck.c:6739 cp/typeck.c:6752

+=======
+#: cp/typeck.c:6753 cp/typeck.c:6766
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "   in pointer to member conversion"
 msgstr ""
 
 #, gcc-internal-format
 msgid "   in pointer to member conversion"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:6830
 #: cp/typeck.c:6830

+=======
+#: cp/typeck.c:6844
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "invalid conversion to type %qT from type %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "invalid conversion to type %qT from type %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7101
 #: cp/typeck.c:7101

+=======
+#: cp/typeck.c:7115
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot convert %qT to %qT for argument %qP to %qD"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot convert %qT to %qT for argument %qP to %qD"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7104
 #: cp/typeck.c:7104

+=======
+#: cp/typeck.c:7118
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot convert %qT to %qT in %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "cannot convert %qT to %qT in %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7118
 #: cp/typeck.c:7118

+=======
+#: cp/typeck.c:7132
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "%s might be a candidate for a format attribute"
 msgstr ""
 
 #, gcc-internal-format
 msgid "%s might be a candidate for a format attribute"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7211 cp/typeck.c:7213
 #: cp/typeck.c:7211 cp/typeck.c:7213

+=======
+#: cp/typeck.c:7225 cp/typeck.c:7227
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "in passing argument %P of %q+D"
 msgstr ""
 
 #, gcc-internal-format
 msgid "in passing argument %P of %q+D"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7268
 #: cp/typeck.c:7268

+=======
+#: cp/typeck.c:7282
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "returning reference to temporary"
 msgstr ""
 
 #, gcc-internal-format
 msgid "returning reference to temporary"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7275
 #: cp/typeck.c:7275

+=======
+#: cp/typeck.c:7289
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "reference to non-lvalue returned"
 msgstr ""
 
 #, gcc-internal-format
 msgid "reference to non-lvalue returned"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7291
 #: cp/typeck.c:7291

+=======
+#: cp/typeck.c:7305
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "reference to local variable %q+D returned"
 msgstr ""
 
 #, gcc-internal-format
 msgid "reference to local variable %q+D returned"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7294
 #: cp/typeck.c:7294

+=======
+#: cp/typeck.c:7308
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "address of local variable %q+D returned"
 msgstr ""
 
 #, gcc-internal-format
 msgid "address of local variable %q+D returned"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7329
 #: cp/typeck.c:7329

+=======
+#: cp/typeck.c:7343
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "returning a value from a destructor"
 msgstr ""
 
 #. If a return statement appears in a handler of the
 #. function-try-block of a constructor, the program is ill-formed.
 #, gcc-internal-format
 msgid "returning a value from a destructor"
 msgstr ""
 
 #. If a return statement appears in a handler of the
 #. function-try-block of a constructor, the program is ill-formed.

+<<<<<<< HEAD

 #: cp/typeck.c:7337
 #: cp/typeck.c:7337

+=======
+#: cp/typeck.c:7351
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "cannot return from a handler of a function-try-block of a constructor"
 msgstr ""
 
 #. You can't return a value from a constructor.
 #, gcc-internal-format
 msgid "cannot return from a handler of a function-try-block of a constructor"
 msgstr ""
 
 #. You can't return a value from a constructor.

+<<<<<<< HEAD

 #: cp/typeck.c:7340
 #: cp/typeck.c:7340

+=======
+#: cp/typeck.c:7354
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "returning a value from a constructor"
 msgstr ""
 
 #, gcc-internal-format
 msgid "returning a value from a constructor"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7358
 #: cp/typeck.c:7358

+=======
+#: cp/typeck.c:7372
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "lambda return type can only be deduced when the return statement is the only "
 "statement in the function body"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "lambda return type can only be deduced when the return statement is the only "
 "statement in the function body"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7364
 #: cp/typeck.c:7364

+=======
+#: cp/typeck.c:7378
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "inconsistent types %qT and %qT deduced for lambda return type"
 msgstr ""
 
 #, gcc-internal-format
 msgid "inconsistent types %qT and %qT deduced for lambda return type"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7390
 #: cp/typeck.c:7390

+=======
+#: cp/typeck.c:7404
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return-statement with no value, in function returning %qT"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return-statement with no value, in function returning %qT"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7411
 #: cp/typeck.c:7411

+=======
+#: cp/typeck.c:7425
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "return-statement with a value, in function returning 'void'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "return-statement with a value, in function returning 'void'"
 msgstr ""
 

+<<<<<<< HEAD

 #: cp/typeck.c:7441
 #: cp/typeck.c:7441

+=======
+#: cp/typeck.c:7455
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "%<operator new%> must not return NULL unless it is declared %<throw()%> (or -"
 #, gcc-internal-format
 msgid ""
 "%<operator new%> must not return NULL unless it is declared %<throw()%> (or -"


@@ -31588,7 +36162,11 @@ msgstr ""
 
 #: fortran/decl.c:4737 fortran/decl.c:4741 fortran/decl.c:4940
 #: fortran/decl.c:4944 fortran/decl.c:5130 fortran/decl.c:5134
 
 #: fortran/decl.c:4737 fortran/decl.c:4741 fortran/decl.c:4940
 #: fortran/decl.c:4944 fortran/decl.c:5130 fortran/decl.c:5134

+<<<<<<< HEAD

 #: fortran/symbol.c:1520
 #: fortran/symbol.c:1520

+=======
+#: fortran/symbol.c:1519
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "BIND(C) attribute at %L can only be used for variables or common blocks"
 msgstr ""
 #, gcc-internal-format
 msgid "BIND(C) attribute at %L can only be used for variables or common blocks"
 msgstr ""


@@ -31979,7 +36557,11 @@ msgstr ""
 
 #. Since the extension field is 8 bit wide, we can only have
 #. up to 255 extension levels.
 
 #. Since the extension field is 8 bit wide, we can only have
 #. up to 255 extension levels.

+<<<<<<< HEAD

 #: fortran/decl.c:6945 fortran/symbol.c:4737
 #: fortran/decl.c:6945 fortran/symbol.c:4737

+=======
+#: fortran/decl.c:6945 fortran/symbol.c:4736
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Maximum extension level reached with type '%s' at %L"
 msgstr ""
 #, gcc-internal-format
 msgid "Maximum extension level reached with type '%s' at %L"
 msgstr ""


@@ -32439,7 +37021,11 @@ msgstr ""
 msgid "Different shape for %s at %L on dimension %d (%d and %d)"
 msgstr ""
 
 msgid "Different shape for %s at %L on dimension %d (%d and %d)"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:2930 fortran/expr.c:3180
 #: fortran/expr.c:2930 fortran/expr.c:3180

+=======
+#: fortran/expr.c:2929 fortran/expr.c:3179
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Cannot assign to INTENT(IN) variable '%s' at %L"
 msgstr ""
 #, gcc-internal-format
 msgid "Cannot assign to INTENT(IN) variable '%s' at %L"
 msgstr ""


@@ -32464,160 +37050,272 @@ msgstr ""
 msgid "NULL appears on right-hand side in assignment at %L"
 msgstr ""
 
 msgid "NULL appears on right-hand side in assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3018
 #: fortran/expr.c:3018

+=======
+#: fortran/expr.c:3017
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "POINTER valued function appears on right-hand side of assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "POINTER valued function appears on right-hand side of assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3028
 #: fortran/expr.c:3028

+=======
+#: fortran/expr.c:3027
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Extension: BOZ literal at %L used to initialize non-integer variable '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Extension: BOZ literal at %L used to initialize non-integer variable '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3034 fortran/resolve.c:7874
 #: fortran/expr.c:3034 fortran/resolve.c:7874

+=======
+#: fortran/expr.c:3033 fortran/resolve.c:7874
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Extension: BOZ literal at %L outside a DATA statement and outside INT/REAL/"
 "DBLE/CMPLX"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Extension: BOZ literal at %L outside a DATA statement and outside INT/REAL/"
 "DBLE/CMPLX"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3044 fortran/resolve.c:7884
 #: fortran/expr.c:3044 fortran/resolve.c:7884

+=======
+#: fortran/expr.c:3043 fortran/resolve.c:7884
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "BOZ literal at %L is bitwise transferred non-integer symbol '%s'"
 msgstr ""
 
 #, gcc-internal-format
 msgid "BOZ literal at %L is bitwise transferred non-integer symbol '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3052 fortran/resolve.c:7893
 #: fortran/expr.c:3052 fortran/resolve.c:7893

+=======
+#: fortran/expr.c:3051 fortran/resolve.c:7893
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Arithmetic underflow of bit-wise transferred BOZ at %L. This check can be "
 "disabled with the option -fno-range-check"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Arithmetic underflow of bit-wise transferred BOZ at %L. This check can be "
 "disabled with the option -fno-range-check"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3056 fortran/resolve.c:7897
 #: fortran/expr.c:3056 fortran/resolve.c:7897

+=======
+#: fortran/expr.c:3055 fortran/resolve.c:7897
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Arithmetic overflow of bit-wise transferred BOZ at %L. This check can be "
 "disabled with the option -fno-range-check"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Arithmetic overflow of bit-wise transferred BOZ at %L. This check can be "
 "disabled with the option -fno-range-check"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3060 fortran/resolve.c:7901
 #: fortran/expr.c:3060 fortran/resolve.c:7901

+=======
+#: fortran/expr.c:3059 fortran/resolve.c:7901
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Arithmetic NaN of bit-wise transferred BOZ at %L. This check can be disabled "
 "with the option -fno-range-check"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Arithmetic NaN of bit-wise transferred BOZ at %L. This check can be disabled "
 "with the option -fno-range-check"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3082
 #: fortran/expr.c:3082

+=======
+#: fortran/expr.c:3081
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Incompatible types in DATA statement at %L; attempted conversion of %s to %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Incompatible types in DATA statement at %L; attempted conversion of %s to %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3118
 #: fortran/expr.c:3118

+=======
+#: fortran/expr.c:3117
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer assignment target is not a POINTER at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Pointer assignment target is not a POINTER at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3127
 #: fortran/expr.c:3127

+=======
+#: fortran/expr.c:3126
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "'%s' in the pointer assignment at %L cannot be an l-value since it is a "
 "procedure"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "'%s' in the pointer assignment at %L cannot be an l-value since it is a "
 "procedure"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3158
 #: fortran/expr.c:3158

+=======
+#: fortran/expr.c:3157
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Expected bounds specification for '%s' at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Expected bounds specification for '%s' at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3163
 #: fortran/expr.c:3163

+=======
+#: fortran/expr.c:3162
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Fortran 2003: Bounds specification for '%s' in pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Fortran 2003: Bounds specification for '%s' in pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3169
 #: fortran/expr.c:3169

+=======
+#: fortran/expr.c:3168
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer bounds remapping at %L is not yet implemented in gfortran"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Pointer bounds remapping at %L is not yet implemented in gfortran"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3189
 #: fortran/expr.c:3189

+=======
+#: fortran/expr.c:3188
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer assignment to non-POINTER at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Pointer assignment to non-POINTER at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3198
 #: fortran/expr.c:3198

+=======
+#: fortran/expr.c:3197
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Bad pointer object in PURE procedure at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Bad pointer object in PURE procedure at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3223
 #: fortran/expr.c:3223

+=======
+#: fortran/expr.c:3222
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Invalid procedure pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Invalid procedure pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3229
 #: fortran/expr.c:3229

+=======
+#: fortran/expr.c:3228
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Abstract interface '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Abstract interface '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3239
 #: fortran/expr.c:3239

+=======
+#: fortran/expr.c:3238
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Statement function '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Statement function '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3245
 #: fortran/expr.c:3245

+=======
+#: fortran/expr.c:3244
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Internal procedure '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Internal procedure '%s' is invalid in procedure pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3268
 #: fortran/expr.c:3268

+=======
+#: fortran/expr.c:3267
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Mismatch in the procedure pointer assignment at %L: mismatch in the calling "
 "convention"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Mismatch in the procedure pointer assignment at %L: mismatch in the calling "
 "convention"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3299
 #: fortran/expr.c:3299

+=======
+#: fortran/expr.c:3298
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Interface mismatch in procedure pointer assignment at %L: %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Interface mismatch in procedure pointer assignment at %L: %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3309
 #: fortran/expr.c:3309

+=======
+#: fortran/expr.c:3308
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Different types in pointer assignment at %L; attempted assignment of %s to %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Different types in pointer assignment at %L; attempted assignment of %s to %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3317
 #: fortran/expr.c:3317

+=======
+#: fortran/expr.c:3316
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Different kind type parameters in pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Different kind type parameters in pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3324
 #: fortran/expr.c:3324

+=======
+#: fortran/expr.c:3323
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Different ranks in pointer assignment at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Different ranks in pointer assignment at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3346
 #: fortran/expr.c:3346

+=======
+#: fortran/expr.c:3345
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer assignment target is neither TARGET nor POINTER at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Pointer assignment target is neither TARGET nor POINTER at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3353
 #: fortran/expr.c:3353

+=======
+#: fortran/expr.c:3352
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Bad target in pointer assignment in PURE procedure at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Bad target in pointer assignment in PURE procedure at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3359
 #: fortran/expr.c:3359

+=======
+#: fortran/expr.c:3358
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer assignment with vector subscript on rhs at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Pointer assignment with vector subscript on rhs at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/expr.c:3367
 #: fortran/expr.c:3367

+=======
+#: fortran/expr.c:3366
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Pointer assignment target has PROTECTED attribute at %L"
 msgstr ""
 #, gcc-internal-format
 msgid "Pointer assignment target has PROTECTED attribute at %L"
 msgstr ""


@@ -32731,12 +37429,20 @@ msgstr ""
 msgid "Second argument of defined assignment at %L must be INTENT(IN)"
 msgstr ""
 
 msgid "Second argument of defined assignment at %L must be INTENT(IN)"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/interface.c:672 fortran/resolve.c:12245
 #: fortran/interface.c:672 fortran/resolve.c:12245

+=======
+#: fortran/interface.c:671 fortran/resolve.c:12245
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "First argument of operator interface at %L must be INTENT(IN)"
 msgstr ""
 
 #, gcc-internal-format
 msgid "First argument of operator interface at %L must be INTENT(IN)"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/interface.c:679 fortran/resolve.c:12263
 #: fortran/interface.c:679 fortran/resolve.c:12263

+=======
+#: fortran/interface.c:678 fortran/resolve.c:12263
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Second argument of operator interface at %L must be INTENT(IN)"
 msgstr ""
 #, gcc-internal-format
 msgid "Second argument of operator interface at %L must be INTENT(IN)"
 msgstr ""


@@ -33476,7 +38182,11 @@ msgid "Cannot write to internal file unit '%s' at %C inside a PURE procedure"
 msgstr ""
 
 #. A general purpose syntax error.
 msgstr ""
 
 #. A general purpose syntax error.

+<<<<<<< HEAD

 #: fortran/io.c:3088 fortran/io.c:3692 fortran/gfortran.h:2350
 #: fortran/io.c:3088 fortran/io.c:3692 fortran/gfortran.h:2350

+=======
+#: fortran/io.c:3088 fortran/io.c:3692 fortran/gfortran.h:2349
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Syntax error in %s statement at %C"
 msgstr ""
 #, gcc-internal-format
 msgid "Syntax error in %s statement at %C"
 msgstr ""


@@ -34527,102 +39237,182 @@ msgstr ""
 msgid "not enough DO loops for collapsed !$OMP DO at %L"
 msgstr ""
 
 msgid "not enough DO loops for collapsed !$OMP DO at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:240
 #: fortran/options.c:240

+=======
+#: fortran/options.c:239
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "-fexcess-precision=standard for Fortran"
 msgstr ""
 
 #, gcc-internal-format
 msgid "-fexcess-precision=standard for Fortran"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:310
 #: fortran/options.c:310

+=======
+#: fortran/options.c:309
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Reading file '%s' as free form"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Reading file '%s' as free form"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:320
 #: fortran/options.c:320

+=======
+#: fortran/options.c:319
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "'-fd-lines-as-comments' has no effect in free form"
 msgstr ""
 
 #, gcc-internal-format
 msgid "'-fd-lines-as-comments' has no effect in free form"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:323
 #: fortran/options.c:323

+=======
+#: fortran/options.c:322
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "'-fd-lines-as-code' has no effect in free form"
 msgstr ""
 
 #, gcc-internal-format
 msgid "'-fd-lines-as-code' has no effect in free form"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:341
 #: fortran/options.c:341

+=======
+#: fortran/options.c:340
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -fmax-stack-var-size=%d"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -fmax-stack-var-size=%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:344
 #: fortran/options.c:344

+=======
+#: fortran/options.c:343
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -frecursive"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -frecursive"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:346
 #: fortran/options.c:346

+=======
+#: fortran/options.c:345
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -frecursive implied by -fopenmp"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Flag -fno-automatic overwrites -frecursive implied by -fopenmp"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:350
 #: fortran/options.c:350

+=======
+#: fortran/options.c:349
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Flag -frecursive overwrites -fmax-stack-var-size=%d"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Flag -frecursive overwrites -fmax-stack-var-size=%d"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:354
 #: fortran/options.c:354

+=======
+#: fortran/options.c:353
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Flag -fmax-stack-var-size=%d overwrites -frecursive implied by -fopenmp"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Flag -fmax-stack-var-size=%d overwrites -frecursive implied by -fopenmp"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:434
 #: fortran/options.c:434

+=======
+#: fortran/options.c:433
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "gfortran: Only one -J option allowed"
 msgstr ""
 
 #, gcc-internal-format
 msgid "gfortran: Only one -J option allowed"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:477
 #: fortran/options.c:477

+=======
+#: fortran/options.c:476
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Argument to -ffpe-trap is not valid: %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Argument to -ffpe-trap is not valid: %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:516
 #: fortran/options.c:516

+=======
+#: fortran/options.c:515
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Argument to -fcheck is not valid: %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Argument to -fcheck is not valid: %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:673
 #: fortran/options.c:673

+=======
+#: fortran/options.c:672
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Fixed line length must be at least seven."
 msgstr ""
 
 #, gcc-internal-format
 msgid "Fixed line length must be at least seven."
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:691
 #: fortran/options.c:691

+=======
+#: fortran/options.c:690
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Free line length must be at least three."
 msgstr ""
 
 #, gcc-internal-format
 msgid "Free line length must be at least three."
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:709
 #: fortran/options.c:709

+=======
+#: fortran/options.c:708
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "-static-libgfortran is not supported in this configuration"
 msgstr ""
 
 #, gcc-internal-format
 msgid "-static-libgfortran is not supported in this configuration"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:757
 #: fortran/options.c:757

+=======
+#: fortran/options.c:756
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Maximum supported identifier length is %d"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Maximum supported identifier length is %d"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:789
 #: fortran/options.c:789

+=======
+#: fortran/options.c:788
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unrecognized option to -finit-logical: %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unrecognized option to -finit-logical: %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:805
 #: fortran/options.c:805

+=======
+#: fortran/options.c:804
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unrecognized option to -finit-real: %s"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unrecognized option to -finit-real: %s"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:821
 #: fortran/options.c:821

+=======
+#: fortran/options.c:820
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "The value of n in -finit-character=n must be between 0 and 127"
 msgstr ""
 
 #, gcc-internal-format
 msgid "The value of n in -finit-character=n must be between 0 and 127"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/options.c:912
 #: fortran/options.c:912

+=======
+#: fortran/options.c:911
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Maximum subrecord length cannot exceed %d"
 msgstr ""
 #, gcc-internal-format
 msgid "Maximum subrecord length cannot exceed %d"
 msgstr ""


@@ -37959,17 +42749,29 @@ msgid ""
 "(C)"
 msgstr ""
 
 "(C)"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/symbol.c:4535
 #: fortran/symbol.c:4535

+=======
+#: fortran/symbol.c:4534
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Symbol '%s' is used before it is typed at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Symbol '%s' is used before it is typed at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/symbol.c:4541
 #: fortran/symbol.c:4541

+=======
+#: fortran/symbol.c:4540
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Extension: Symbol '%s' is used before it is typed at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Extension: Symbol '%s' is used before it is typed at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/symbol.c:4883 fortran/symbol.c:4957
 #: fortran/symbol.c:4883 fortran/symbol.c:4957

+=======
+#: fortran/symbol.c:4882 fortran/symbol.c:4956
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "'%s' of '%s' is PRIVATE at %L"
 msgstr ""
 #, gcc-internal-format
 msgid "'%s' of '%s' is PRIVATE at %L"
 msgstr ""


@@ -38004,14 +42806,22 @@ msgstr ""
 msgid "Creating array temporary at %L for argument '%s'"
 msgstr ""
 
 msgid "Creating array temporary at %L for argument '%s'"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-array.c:6218
 #: fortran/trans-array.c:6218

+=======
+#: fortran/trans-array.c:6199
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid ""
 "Possible frontend bug: Deferred array size without pointer, allocatable "
 "attribute or derived type without allocatable components."
 msgstr ""
 
 #, gcc-internal-format
 msgid ""
 "Possible frontend bug: Deferred array size without pointer, allocatable "
 "attribute or derived type without allocatable components."
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-array.c:6705
 #: fortran/trans-array.c:6705

+=======
+#: fortran/trans-array.c:6682
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "bad expression type during walk (%d)"
 msgstr ""
 #, gcc-internal-format
 msgid "bad expression type during walk (%d)"
 msgstr ""


@@ -38108,37 +42918,65 @@ msgstr ""
 msgid "intrinsic variable which isn't a procedure"
 msgstr ""
 
 msgid "intrinsic variable which isn't a procedure"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3095 fortran/trans-decl.c:4446
 #: fortran/trans-decl.c:3095 fortran/trans-decl.c:4446

+=======
+#: fortran/trans-decl.c:3088 fortran/trans-decl.c:4439
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Return value of function '%s' at %L not set"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Return value of function '%s' at %L not set"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3435
 #: fortran/trans-decl.c:3435

+=======
+#: fortran/trans-decl.c:3428
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "backend decl for module variable %s already exists"
 msgstr ""
 
 #, gcc-internal-format
 msgid "backend decl for module variable %s already exists"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3808
 #: fortran/trans-decl.c:3808

+=======
+#: fortran/trans-decl.c:3801
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Dummy argument '%s' at %L was declared INTENT(OUT) but was not set"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Dummy argument '%s' at %L was declared INTENT(OUT) but was not set"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3813
 #: fortran/trans-decl.c:3813

+=======
+#: fortran/trans-decl.c:3806
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unused dummy argument '%s' at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unused dummy argument '%s' at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3819
 #: fortran/trans-decl.c:3819

+=======
+#: fortran/trans-decl.c:3812
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unused variable '%s' declared at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unused variable '%s' declared at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3867
 #: fortran/trans-decl.c:3867

+=======
+#: fortran/trans-decl.c:3860
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Unused parameter '%s' declared at %L"
 msgstr ""
 
 #, gcc-internal-format
 msgid "Unused parameter '%s' declared at %L"
 msgstr ""
 

+<<<<<<< HEAD

 #: fortran/trans-decl.c:3881
 #: fortran/trans-decl.c:3881

+=======
+#: fortran/trans-decl.c:3874
+>>>>>>>        * gcc.pot: Regenerate.

 #, gcc-internal-format
 msgid "Return value '%s' of function '%s' declared at %L not set"
 msgstr ""
 #, gcc-internal-format
 msgid "Return value '%s' of function '%s' declared at %L not set"
 msgstr ""