aboutsummaryrefslogtreecommitdiff
path: root/libcpp
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-04-28 15:39:12 +0100
committerJoseph Myers <jsm28@gcc.gnu.org>2016-04-28 15:39:12 +0100
commit1d6701b0d635cf1248d63d6f949be6758e1a2f70 (patch)
treee7dd1020c87c7968f9499be444134145b5b0b0ff /libcpp
parenta17971d4d0eaf5b484ccba5cdcc064f6864e05a8 (diff)
Update .po files.
gcc/po: * be.po, da.po, de.po, el.po, es.po, fi.po, fr.po, hr.po, id.po, ja.po, nl.po, ru.po, sr.po, sv.po, tr.po, uk.po, vi.po, zh_CN.po, zh_TW.po: Update. libcpp/po: * be.po, ca.po, da.po, de.po, el.po, eo.po, es.po, fi.po, fr.po, id.po, ja.po, nl.po, pr_BR.po, ru.po, sr.po, sv.po, tr.po, uk.po, vi.po, zh_CN.po, zh_TW.po: Update. From-SVN: r235572
Diffstat (limited to 'libcpp')
-rw-r--r--libcpp/po/ChangeLog6
-rw-r--r--libcpp/po/be.po147
-rw-r--r--libcpp/po/ca.po147
-rw-r--r--libcpp/po/da.po149
-rw-r--r--libcpp/po/de.po156
-rw-r--r--libcpp/po/el.po147
-rw-r--r--libcpp/po/eo.po149
-rw-r--r--libcpp/po/es.po147
-rw-r--r--libcpp/po/fi.po149
-rw-r--r--libcpp/po/fr.po153
-rw-r--r--libcpp/po/id.po147
-rw-r--r--libcpp/po/ja.po147
-rw-r--r--libcpp/po/nl.po149
-rw-r--r--libcpp/po/pt_BR.po167
-rw-r--r--libcpp/po/ru.po155
-rw-r--r--libcpp/po/sr.po149
-rw-r--r--libcpp/po/sv.po149
-rw-r--r--libcpp/po/tr.po147
-rw-r--r--libcpp/po/uk.po153
-rw-r--r--libcpp/po/vi.po153
-rw-r--r--libcpp/po/zh_CN.po147
-rw-r--r--libcpp/po/zh_TW.po149
22 files changed, 1644 insertions, 1518 deletions
diff --git a/libcpp/po/ChangeLog b/libcpp/po/ChangeLog
index 59e3d393932..b8e04edb9a0 100644
--- a/libcpp/po/ChangeLog
+++ b/libcpp/po/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-28 Joseph Myers <joseph@codesourcery.com>
+
+ * be.po, ca.po, da.po, de.po, el.po, eo.po, es.po, fi.po, fr.po,
+ id.po, ja.po, nl.po, pr_BR.po, ru.po, sr.po, sv.po, tr.po, uk.po,
+ vi.po, zh_CN.po, zh_TW.po: Update.
+
2016-04-27 Release Manager
* GCC 6.1.0 released.
diff --git a/libcpp/po/be.po b/libcpp/po/be.po
index 459c0503e30..64a392b36f5 100644
--- a/libcpp/po/be.po
+++ b/libcpp/po/be.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gcc 3.1\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2002-05-17 15:54+0200\n"
"Last-Translator: Ales Nyakhaychyk <nyakhaychyk@i18n.linux.by>\n"
"Language-Team: Belarusian <i18n@tut.by>\n"
@@ -84,7 +84,7 @@ msgstr ""
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr ""
@@ -147,7 +147,7 @@ msgstr "мнагасімвальная сімвальная канстанта"
msgid "empty character constant"
msgstr "пустая сімвальная канстанта"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr ""
@@ -271,142 +271,147 @@ msgstr ""
msgid "\"%s\" after # is not a positive integer"
msgstr ""
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr ""
-#: directives.c:1131
+#: directives.c:1148
#, fuzzy, c-format
msgid "invalid #%s directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr ""
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr ""
-#: directives.c:1224
+#: directives.c:1241
#, fuzzy, c-format
msgid "#pragma %s %s is already registered"
msgstr "Клас \"%s\" ужо існуе"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr ""
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr ""
-#: directives.c:1497
+#: directives.c:1514
#, fuzzy
msgid "invalid #pragma push_macro directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1552
+#: directives.c:1569
#, fuzzy
msgid "invalid #pragma pop_macro directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr ""
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr ""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr ""
-#: directives.c:1660
+#: directives.c:1677
#, fuzzy, c-format
#| msgid "cannot find source %s"
msgid "cannot find source file %s"
msgstr "не магу знайсці крыніцу %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr ""
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "нерэчаісны ініцыялізатар"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr ""
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr ""
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr ""
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr ""
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr ""
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr ""
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr ""
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr ""
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr ""
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr ""
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr ""
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr ""
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr ""
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr ""
@@ -415,12 +420,12 @@ msgstr ""
msgid "unterminated comment"
msgstr "незавершаныя каментарыі"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr ""
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr ""
@@ -435,7 +440,7 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "`%E' - нерэчаісная нязьменная тыпу string"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr ""
#: expr.c:558
@@ -787,159 +792,159 @@ msgstr ""
msgid "unspellable token %s"
msgstr "немагу адчыніць файл \"%s\""
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr ""
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr ""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
#, fuzzy
msgid "could not determine file timestamp"
msgstr "не магу знайсці крыніцу %s\n"
-#: macro.c:379
+#: macro.c:384
#, fuzzy
#| msgid "Could not open data file %s.\n"
msgid "could not determine date and time"
msgstr "Немагчыма адчыніць файл з дадзенымі %s.\n"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr ""
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr ""
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr ""
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr ""
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr ""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr ""
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr ""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr ""
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr ""
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr ""
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr ""
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr ""
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C89 не падтрымлівае \"long long\""
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr ""
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr ""
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr ""
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3035
+#: macro.c:3047
#, fuzzy
#| msgid "missing white space after number '%.*s'"
msgid "missing whitespace after the macro name"
msgstr "прапушчан прабел пасля нумара \"%.*s\""
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr ""
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr ""
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr ""
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr ""
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr ""
diff --git a/libcpp/po/ca.po b/libcpp/po/ca.po
index f734b32b3d4..9ea4eea2f4e 100644
--- a/libcpp/po/ca.po
+++ b/libcpp/po/ca.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib-4.0.1\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2005-11-25 22:56+0100\n"
"Last-Translator: Mateu Gilles <gilles@mateu.org>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
@@ -91,7 +91,7 @@ msgstr "el nom de carcter universal %.*s no s vlid en un identificador"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "el nom de carcter universal %.*s no s vlid a l'inici d'un identificador"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "convertint UCN al joc font de carcters"
@@ -152,7 +152,7 @@ msgstr "constant de carcter amb mltiples carcters"
msgid "empty character constant"
msgstr "constant de carter buida"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "fallada convertint %s a %s"
@@ -279,146 +279,151 @@ msgstr "\"%s\" no s un nom de fitxer vlid"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" desprs de # no s un enter positiu"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr ""
-#: directives.c:1131
+#: directives.c:1148
#, fuzzy, c-format
#| msgid "invalid #ident directive"
msgid "invalid #%s directive"
msgstr "directiva #ident invlida"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1203
+#: directives.c:1220
#, fuzzy, c-format
#| msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "desant \"%s\" com a pragma i espai de noms de pragma"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "ja s'ha desat #pragma %s %s"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "ja s'ha desat #pragma %s"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma una vegada en el fitxer principal"
-#: directives.c:1497
+#: directives.c:1514
#, fuzzy
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid #pragma push_macro directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1552
+#: directives.c:1569
#, fuzzy
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid #pragma pop_macro directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "enverinant la macro existent \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorat fora del fitxer d'inclusi"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "no es pot trobar la font %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "el fitxer actual s ms vell que %s"
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "directiva #pragma de GCC enverinada invlida"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma pren una cadena literal entre parntesis"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else sense #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else desprs de #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "el condicional va comenar aqu"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif sense #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif desprs de #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif sense #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "falta \"(\" abans del predicat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "falta \")\" per a completar la resposta"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "el predicat de la resposta est buit"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "afirmaci sense predicat"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "el predicat ha de ser un identificador"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" reafirmat"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "#%s sense acabar"
@@ -427,12 +432,12 @@ msgstr "#%s sense acabar"
msgid "unterminated comment"
msgstr "comentari sense acabar"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -451,7 +456,7 @@ msgstr "sufix \"%.*s\" invlid en la constant de coma flotant"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "s d'una constant de coma flotant hexadecimal C99"
#: expr.c:558
@@ -826,163 +831,163 @@ msgstr "comentari en mltiples lnies"
msgid "unspellable token %s"
msgstr "Element %s impronunciable"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "no s'usa la macro \"%s\""
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna \"%s\" invlida"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
#, fuzzy
#| msgid "could not determine date and time"
msgid "could not determine file timestamp"
msgstr "no es pot determinar la data i l'hora"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "no es pot determinar la data i l'hora"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "cadena literal invlida, s'ignora el \"\\\" final"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "enganxar \"%s\" i \"%s\" no dna un element de preprocessament vlid"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requereix que la resta dels arguments sigui usat"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro \"%s\" requereix %u arguments, per noms %u passats"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro \"%s\" va rebre %u arguments, per en va prendre solament %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "llista d'arguments sense acabar a l'invocar la macro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la funci de macro \"%s\" s'ha d'usar amb arguments en C tradicional"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parmetre de macro \"%s\" duplicat"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" podria faltar en la llista de parmetre de macro"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "els parmetres de macro han de ser separats per comes"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "falta el nom del parmetre"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "els macros variadic annims es van introduir en C99"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "els macros variadic annims es van introduir en C99"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C no permet macros variadic nomenats"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "\")\" faltant en la llista de parmetres de macro"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "\"##\" no pot apareixer en o al final d'una expansi de macro"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 requereix espais en blanc desprs del nom de macro"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requereix espais en blanc desprs del nom de macro"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "espais en blanc faltant desprs del nom de macro"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "\"#\" no s seguit per un parmetre de macro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" re-definit"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "aquesta s la ubicaci de la definici prvia"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "l'argument de macro \"%s\" hauria de ser convertit en cadena en C traditional"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "tipus de hash %d invlid en cpp_macro_definition"
diff --git a/libcpp/po/da.po b/libcpp/po/da.po
index 3805d8fadeb..5c8e82a805d 100644
--- a/libcpp/po/da.po
+++ b/libcpp/po/da.po
@@ -130,7 +130,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 6.1-b20160131\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2016-03-27 18:00+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -208,7 +208,7 @@ msgstr "universelt tegn %.*s er ikke gyldigt i et kaldenavn"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universelt tegn %.*s er ikke gyldigt i starten af et kaldenavn"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "konverterer UCN til et kildetegnsæt"
@@ -267,7 +267,7 @@ msgstr "flerbyte-tegnkonstant"
msgid "empty character constant"
msgstr "tom tegnkonstant"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "kunne ikke konvertere %s til %s"
@@ -391,139 +391,144 @@ msgstr "»%s« er ikke et gyldigt filnavn"
msgid "\"%s\" after # is not a positive integer"
msgstr "»%s« efter # er ikke et positivt heltal"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "ugyldig #%s-direktiv"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrerer pragmaer i navnerum »%s« med fejlmatchede navneudvidelse"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrerer pragma »%s« med navneudvidelse og intet navnerum"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrerer »%s« som både et pragma og et pragmanavnerum"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s er allerede registreret"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s er allerede registreret"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "registrerer pragma med NULL-håndtering"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once i hovedfil"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "ugyldigt #pragma push_macro-direktiv"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "ugyldigt #pragma pop_macro-direktiv"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "ugyldigt #pragma GCC poison-direktiv"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "forgifter eksisterende makro »%s«"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignoreret uden for inkluderingsfil"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "kan ikke finde kildefilen %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "aktuel fil er ældre end %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ugyldigt »#pragma GCC %s«-direktiv"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma tager en strengkonstant med paranteser omkring"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else uden #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else efter #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "betingelsen begyndte her"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif uden #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif efter #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif uden #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "manglende »(« efter udsagn"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "manglende »)« til at fuldføre svar"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "udsagnets svar er tomt"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "postulat uden udsagn"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "udsagn skal være et kaldenavn"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "»%s« genpostuleret"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "uafsluttet #%s"
@@ -532,12 +537,12 @@ msgstr "uafsluttet #%s"
msgid "unterminated comment"
msgstr "uafsluttet kommentar"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "standardud"
@@ -550,7 +555,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "ugyldigt præfiks »0b« i kommatalskonstant"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "brug af C++11 hexadecimal kommatalskonstant"
#: expr.c:558
@@ -895,153 +902,153 @@ msgstr "flerlinjekommentar"
msgid "unspellable token %s"
msgstr "symbol %s kan ikke staves"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroen »%s« bliver ikke brugt"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ugyldig indbygget makro »%s«"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makroen »%s« kan forhindre reproducerbare bygninger"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "kunne ikke bestemme filtidsstempel"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "kunne ikke bestemme dato og tid"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ udvidet inden i direktiv med -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "ugyldig strengkonstant, ignorerer afsluttende »\\«"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "indsættelse af »%s« og »%s« giver ikke et gyldigt præprocessorsymbol"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 kræver mindst en parameter for »...« i en makro med vilkårligt antal parametre"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makroen »%s« kræver %u parametre, men modtager kun %u"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makroen »%s« viderebragte %u parametre, men tager kun mod %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "uafsluttet parameterliste ved kald af makroen »%s«"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsagtig makro »%s« skal bruges med parametre i traditionel C"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C+98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "starter makroen %s parameter %d: tomme makroparametre er ikke defineret i ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "makroparameternavnet »%s« optræder mere end en gang"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "»%s« må ikke optræde i makroparameterliste"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "makroparametre skal være kommaadskilte"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "parameternavn mangler"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyme makroer med vilkårligt antal parametre blev introduceret i C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tillader ikke navngivne makroer med vilkårligt antal parametre"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "manglende »)« i makroparameterliste"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "»##« må ikke optræde ved nogen af enderne i en makrokrop"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 kræver mellemrum efter makronavnet"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 kræver mellemrum efter makronavnet"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "manglende mellemrum efter makronavnet"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "»#« efterfølges ikke af en makroparameter"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "»%s« omdefineret"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "den foregående definition er her"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroparameteren »%s« ville blive gjort til en streng i traditionel C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "ugyldig hashtype %d i cpp_macro_definition"
diff --git a/libcpp/po/de.po b/libcpp/po/de.po
index 38bd998e693..0bf977ab0e0 100644
--- a/libcpp/po/de.po
+++ b/libcpp/po/de.po
@@ -4,14 +4,15 @@
# Karl Eichwalder <ke@suse.de>, 2002, 2003.
# Roland Stigge <stigge@antcom.de>, 2003-2008, 2010, 2012-2013.
# Mario Blättermann <mario.blaettermann@gmail.com>, 2014-2016.
+# Philipp Thomas <pth@suse.de>, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 6.1-b20160131\n"
+"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-02-04 13:22+0100\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-28 11:39+0200\n"
+"Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -88,7 +89,7 @@ msgstr "universelles Zeichen %.*s ist nicht gültig in Bezeichner"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universelles Zeichen %.*s ist nicht gültig am Anfang eines Bezeichners"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "UCN wird in Quellzeichensatz konvertiert"
@@ -149,7 +150,7 @@ msgstr "Zeichenkonstante mit mehreren Zeichen"
msgid "empty character constant"
msgstr "Leere Zeichenkonstante"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "Fehler beim Konvertieren von %s nach %s"
@@ -273,139 +274,144 @@ msgstr "»%s« ist kein gültiger Dateiname"
msgid "\"%s\" after # is not a positive integer"
msgstr "»%s« hinter # ist keine positive Ganzzahl"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "der Zeilenmarker in der Datei »%s« wird aufgrung falscher Schachtelung ignoriert"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "ungültige #%s-Direktive"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "Pragmas im Namensraum »%s« werden ohne passende Namensauflösung registriert"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "Pragma »%s« wird mit Namensauflösung und ohne Namensraum registriert"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "»%s« wird sowohl als Pragma als auch als Pragma-Namensraum registriert"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s ist bereits registriert"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s ist bereits registriert"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "Pragma mit NULL-Handler wird registriert"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once in Hauptdatei"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "ungültige #pragma push_macro Direktive"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "ungültige #pragma pop_macro Direktive"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "ungültige #pragma GCC Poison Direktive"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "schlechtes existierendes Makro »%s«"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header außerhalb include-Datei ignoriert"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "Quelldatei %s kann nicht gefunden werden"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "aktuelle Datei ist älter als %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ungültige »#pragma GCC %s« Direktive"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma nimmt ein geklammertes Zeichenkettenliteral"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else ohne #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else hinter #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "die Bedingung begann hier"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif ohne #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif hinter #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif ohne #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "fehlende »(« hinter Prädikat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "fehlende »)«, um Antwort abzuschließen"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "Prädikatantwort ist leer"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "Behauptung ohne Prädikat"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "Prädikat muss ein Bezeichner sein"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "»%s« wieder behauptet"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "unbeendetes #%s"
@@ -414,12 +420,12 @@ msgstr "unbeendetes #%s"
msgid "unterminated comment"
msgstr "nicht beendeter Kommentar"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "Standardausgabe"
@@ -432,8 +438,8 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "ungültiges Präfix »0b« für Gleitkommakonstante"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "Verwendung von hexadezimaler C++11-Gleitkommakonstante"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "Verwendung von hexadezimaler C++1z-Gleitkommakonstante"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
@@ -777,153 +783,153 @@ msgstr "mehrzeiliger Kommentar"
msgid "unspellable token %s"
msgstr "nicht buchstabierbares Token %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "Makro »%s« wird nicht benutzt"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ungültiges eingebautes Makro »%s«"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "Das Makro »%s« könnte reproduzierbare Builds verhindern"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "Zeitstempel der Datei konnte nicht ermittelt werden"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "Datum und Zeit konnten nicht bestimmt werden"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ innerhalb von Anweisung mit -fdirectives-only expandiert"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "ungültiges Zeichenkettenliteral, abschließendes »\\« wird ignoriert"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "das Einfügen von »%s« und »%s« ergibt kein gültiges Präprozessor-Token"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO-C++11 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO-C99 erfordert mindestens ein Argument für »...« in einem variadischen Makro"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "Makro »%s« erfordert %u Argumente, aber nur %u wurden angegeben"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "dem Makro »%s« wurden %u Argumente übergeben, aber es akzeptiert nur %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "unvollendete Argumentliste beim Makroaufruf »%s«"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsähnliches Makro »%s« muss mit Argumenten in traditionellem C verwendet werden"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C++98 unbestimmt"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "Beim Ausführen des Arguments %2$d des Makros %1$s: Leere Makroargumente sind nach ISO-C90 unbestimmt"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "doppelter Makroparameter »%s«"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "»%s« darf nicht in Makroparameterliste auftreten"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "Makroparameter müssen mit Komma getrennt sein"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "Parametername fehlt"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyme variadische Makros wurden in C++11 eingeführt"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyme variadische Makros wurden in C99 eingeführt"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO-C++ erlaubt keine benannten variadischen Makros"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO-C erlaubt keine benannten variadischen Makros"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "fehlendes »)« in Makroparameterliste"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "»##« kann nicht an den Enden einer Makroexpansion auftreten"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO-C++11 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO-C99 erfordert Leerzeichen hinter Makroname"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "Leerzeichen hinter Makroname fehlt"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "»#« wird nicht von einem Makroparameter gefolgt"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "»%s« redefiniert"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "dies ist die Stelle der vorherigen Definition"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "Makroargument »%s« würde in traditionellem C zur Zeichenkette umgewandelt werden"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "ungültiger Hash-Typ %d in cpp_macro_definition"
diff --git a/libcpp/po/el.po b/libcpp/po/el.po
index ed3b425b298..285f4812135 100644
--- a/libcpp/po/el.po
+++ b/libcpp/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gcc 3.2\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2002-08-18 15:46+0100\n"
"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -85,7 +85,7 @@ msgstr ""
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr ""
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr ""
@@ -152,7 +152,7 @@ msgstr " `%s'"
msgid "empty character constant"
msgstr " "
-#: charset.c:1731
+#: charset.c:1738
#, fuzzy, c-format
msgid "failure to convert %s to %s"
msgstr " %s `%s' `%s'"
@@ -279,143 +279,148 @@ msgstr "%s' ."
msgid "\"%s\" after # is not a positive integer"
msgstr "%s' ."
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, fuzzy, c-format
msgid "invalid #%s directive"
msgstr "%%%c: ."
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr ""
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr ""
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr ""
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr ""
-#: directives.c:1227
+#: directives.c:1244
#, fuzzy, c-format
msgid "#pragma %s is already registered"
msgstr " `%s' "
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr ""
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr ""
-#: directives.c:1497
+#: directives.c:1514
#, fuzzy
msgid "invalid #pragma push_macro directive"
msgstr "%%%c: ."
-#: directives.c:1552
+#: directives.c:1569
#, fuzzy
msgid "invalid #pragma pop_macro directive"
msgstr "%%%c: ."
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr ""
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr ""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr ""
-#: directives.c:1660
+#: directives.c:1677
#, fuzzy, c-format
msgid "cannot find source file %s"
msgstr " : %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr ""
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr " `%s' ."
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr ""
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr ""
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr ""
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr ""
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr ""
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr ""
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr ""
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr ""
-#: directives.c:2221
+#: directives.c:2238
#, fuzzy
msgid "assertion without predicate"
msgstr " "
-#: directives.c:2224
+#: directives.c:2241
#, fuzzy
msgid "predicate must be an identifier"
msgstr " "
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr ""
-#: directives.c:2602
+#: directives.c:2619
#, fuzzy, c-format
msgid "unterminated #%s"
msgstr " o "
@@ -426,12 +431,12 @@ msgid "unterminated comment"
msgstr " `s'"
# src/request.c:37
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr ""
@@ -445,7 +450,7 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr " : %s"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr ""
#: expr.c:558
@@ -812,159 +817,159 @@ msgstr ""
msgid "unspellable token %s"
msgstr "%s: %s: %m\n"
-#: macro.c:202
+#: macro.c:203
#, fuzzy, c-format
msgid "macro \"%s\" is not used"
msgstr " `%s' "
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, fuzzy, c-format
msgid "invalid built-in macro \"%s\""
msgstr " : %s"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
#, fuzzy
msgid "could not determine file timestamp"
msgstr " %s"
-#: macro.c:379
+#: macro.c:384
#, fuzzy
msgid "could not determine date and time"
msgstr " %s"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr ""
-#: macro.c:583
+#: macro.c:588
#, fuzzy
msgid "invalid string literal, ignoring final '\\'"
msgstr " : `%s'"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr ""
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr " "
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr ""
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr ""
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr ""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr ""
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr ""
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr ""
-#: macro.c:2794
+#: macro.c:2806
#, fuzzy, c-format
msgid "duplicate macro parameter \"%s\""
msgstr " `%s'"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr ""
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr ""
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr ""
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr ""
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr ""
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr ""
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr ""
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr ""
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr ""
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr ""
-#: macro.c:3010
+#: macro.c:3022
#, fuzzy
msgid "ISO C99 requires whitespace after the macro name"
msgstr " "
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr ""
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr ""
-#: macro.c:3230
+#: macro.c:3242
#, fuzzy, c-format
msgid "\"%s\" redefined"
msgstr ""
-#: macro.c:3235
+#: macro.c:3247
#, fuzzy
msgid "this is the location of the previous definition"
msgstr " "
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr ""
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr ""
diff --git a/libcpp/po/eo.po b/libcpp/po/eo.po
index 50fbdb107af..c9d947030ad 100644
--- a/libcpp/po/eo.po
+++ b/libcpp/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 6.1-b20160131\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2016-02-12 13:14-0300\n"
"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -86,7 +86,7 @@ msgstr "la universala signo %.*s ne estas valida en identiganto"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "la universala signo %.*s ne estas valida en komenco de identiganto"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "konverto de UCN al la fonta signaro"
@@ -145,7 +145,7 @@ msgstr "plursigna signa konstanto"
msgid "empty character constant"
msgstr "malplena signa konstanto"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "problemo por konverti %s al %s"
@@ -269,139 +269,144 @@ msgstr "\"%s\" ne estas valida dosiernomo"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" post # ne estas pozitiva entjero"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "malvalida instrukcio #%s"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registro de pragma en nomspaco \"%s\" kun nekongrua nom-etendigo"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registro de pragma \"%s\" kun nom-etendigo kaj sen nomspaco"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registro de \"%s\" kaj kiel pragma kaj kiel pragma-nomspaco"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s jam estas registrita"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s jam estas registrita"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "registro de pragma kun traktilo de NULL"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma unufoje en ĉefdosiero"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "malvalida instrukcio #pragma push_macro"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "malvalida instrukcio #pragma pop_macro"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "malvalida instrukcio #pragma GCC poison"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "venenigo de ekzistanta makroo \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header estis preteratentata for de inkluziv-dosiero"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "ne eblas trovi la fontan dosieron %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "nuna dosiero estas pli malnova ol %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "malvalida instrukcio \"#pragma GCC %s\""
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma prenas kurbkrampitan ĉenan literaĵon"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else sen #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else post #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "la kondiĉo komencis ĉi tie"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif sen #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif post #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif sen #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "mankas '(' post predikato"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "mankas ')' por kompletigi respondon"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "respondo de predikato estas malplena"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "aserto sen predikato"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predikato devas esti identiganto"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" estas re-asertita"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "nefinigita #%s"
@@ -410,12 +415,12 @@ msgstr "nefinigita #%s"
msgid "unterminated comment"
msgstr "nefinigita komento"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "ĉefeligujo"
@@ -428,7 +433,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "malvalida prefikso \"0b\" por glitkoma konstanto"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "uzo de deksesuma glitkoma konstanto de C++11"
#: expr.c:558
@@ -773,153 +780,153 @@ msgstr "plurlinia komento"
msgid "unspellable token %s"
msgstr "neliterumebla ĵetono %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroo \"%s\" ne estas uzata"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "malvalida enkonstruita makroo \"%s\""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "la makroo \"%s\" povos malebligi reprodukteblajn konstruojn"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "ne eblis determini la dosieran tempomarkon"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "ne eblis determini la daton kaj horon"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ estas etendigata interne de instrukcio per -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "malvalida ĉena literaĵo, ni preterpasas finan '\\'"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "algluo de \"%s\" kaj \"%s\" ne rezultas en valida antaŭproceza ĵetono"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 postulas minimume unu argumenton por la \"...\" en variebl-argumenta makroo"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la makroo \"%s\" postulas %u argumentojn, sed nur %u estis indikataj"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la makroo \"%s\" pasis %u argumentojn, sed ĝi prenas nur %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "nefinigita argumentlisto alvokanta la makroon \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funkci-simila makroo \"%s\" devas esti uzata kun argumentoj laŭ tradicia C"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "alvoko de makroo %s, argumento %d: malplenaj makro-argumentoj estas nedifinitaj en ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "duobligata makro-parametro \"%s\""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" ne povas aperi en makroa parametro-listo"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "makro-parametroj devas esti apartitaj per komoj"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "mankas parametra nomo"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "sennomaj variebl-argumentaj makrooj estis enkondukataj en C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ne permesas nomitajn variebl-argumentajn makroojn"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "mankas ')' en makroa parametro-listo"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' ne povas aperi ĉe iu ajn fino de makroa etendigo"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 postulas blankspacon post la makroa nomo"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 postulas blankspacon post la makroa nomo"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "mankas blankspacon post la makroa nomo"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' ne estas sekvata de makroa parametro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" estas redifinita"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "tiu ĉi estas la loko de la antaŭa difino"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroa argumento \"%s\" devus esti ĉenigita laŭ tradicia C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "malvalida haketa tipo %d en cpp_macro_definition"
diff --git a/libcpp/po/es.po b/libcpp/po/es.po
index 20aa03939dd..567ef3f8b02 100644
--- a/libcpp/po/es.po
+++ b/libcpp/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.7-b20120128\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2012-01-29 12:55-0600\n"
"Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -87,7 +87,7 @@ msgstr "el carácter universal %.*s no es válido en un identificador"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "el carácter universal %.*s no es válido al inicio de un identificador"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "convirtiendo un NUC al conjunto de caracteres fuente"
@@ -146,7 +146,7 @@ msgstr "constante de carácter con múltiples caracteres"
msgid "empty character constant"
msgstr "constante de carácter vacía"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "no se puede convertir %s a %s"
@@ -272,140 +272,145 @@ msgstr "\"%s\" no es un nombre de fichero válido"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" después de # no es un entero positivo"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "directiva #%s inválida"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "se registran pragmas en el espacio de nombres \"%s\" con una expansión de nombre que no coincide"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "se registra el pragma \"%s\" con expansión de nombre y sin un espacio de nombres"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "se registra \"%s\" como un pragma y como un espacio de nombres de pragma"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s ya está registrado"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s ya está registrado"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "se registra un pragma con manejador NULL"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma una vez en el fichero principal"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "directiva #pragma push_macro inválida"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "directiva #pragma pop_macro inválida"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "directiva #pragma de GCC envenenada inválida"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "se envenena la macro existente \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorado fuera del fichero a incluir"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "no se puede encontrar el fichero fuente %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "el fichero actual es más antiguo que %s"
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "directiva #pragma de GCC envenenada inválida"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma lleva una cadena literal entre paréntesis"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else sin #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else después de #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "el condicional empezó aquí"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif sin #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif después de #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif sin #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "falta '(' antes del predicado"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "falta ')' para completar la respuesta"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "la respuesta del predicado está vacía"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "afirmación sin predicado"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "el predicado debe ser un identificador"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" reafirmado"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "#%s sin terminar"
@@ -414,12 +419,12 @@ msgstr "#%s sin terminar"
msgid "unterminated comment"
msgstr "comentario sin terminar"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "salida estándard"
@@ -434,7 +439,7 @@ msgstr "prefijo \"0b\" inválido en la constante de coma flotante"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "uso de una constante de coma flotante hexadecimal C99"
#: expr.c:558
@@ -793,163 +798,163 @@ msgstr "comentario en múltiples líneas"
msgid "unspellable token %s"
msgstr "elemento %s impronunciable"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "la macro \"%s\" no se utiliza"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna \"%s\" inválida"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "no se puede determinar la marca de fecha del fichero"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "no se puede determinar la fecha y la hora"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "se expande __COUNTER__ dentro de una directiva con -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "cadena literal inválida, se ignora el '\\' final"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "pegar \"%s\" y \"%s\" no da un elemento válido de preprocesamiento"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requiere que el resto de los argumentos sea usado"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro \"%s\" requiere %u argumentos, pero solo se proporcionan %u"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro \"%s\" pasó %u argumentos, pero solamente toma %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "lista de argumentos sin terminar al invocar la macro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la función de macro \"%s\" se debe usar con argumentos en C tradicional"
-#: macro.c:1813
+#: macro.c:1825
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C90 y en ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "al invocar el macro %s argumento %d: los argumentos de macro vacíos están indefinidos en ISO C90 y en ISO C++98"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parámetro de macro \"%s\" duplicado"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" podría faltar en la lista de parámetro de macro"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "los parámetros de macro deben ser separados por comas"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "falta el nombre del parámetro"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "los macros variadic anónimos se introdujeron en C99"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "los macros variadic anónimos se introdujeron en C99"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C no permite macros variadic nombrados"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C no permite macros variadic nombrados"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "falta ')' en la lista de parámetros de macro"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' no puede aparece en o al final de una expansión de macro"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 requiere espacios en blanco después del nombre de macro"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requiere espacios en blanco después del nombre de macro"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "faltan espacios en blanco después del nombre de macro"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' no es seguido por un parámetro de macro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "se redefinió \"%s\""
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "esta es la ubicación de la definición previa"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "el argumento de macro \"%s\" debería ser convertido a cadena en C tradicional"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "tipo de hash %d inválido en cpp_macro_definition"
diff --git a/libcpp/po/fi.po b/libcpp/po/fi.po
index c1c3bd15034..bbf184e3568 100644
--- a/libcpp/po/fi.po
+++ b/libcpp/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 6.1-b20160131\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2016-02-09 22:14+0200\n"
"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -89,7 +89,7 @@ msgstr "universaali merkki %.*s ei ole kelvollinen tunniste"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universaali merkki %.*s ei ole kelvollinen tunnisteen alussa"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "muunnetaan UCN lähdemerkistöön"
@@ -148,7 +148,7 @@ msgstr "monimerkkinen merkkivakio"
msgid "empty character constant"
msgstr "tyhjä merkkivakio"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "muunnos %s -> %s epäonnistui"
@@ -272,140 +272,145 @@ msgstr "”%s” ei ole kelvollinen tiedostonimi"
msgid "\"%s\" after # is not a positive integer"
msgstr "#:n jälkeinen ”%s” ei ole positiivinen kokonaisluku"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "virheellinen #%s-direktiivi"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "rekisteröidään pragmat nimiavaruudessa ”%s” epäsopivalla nimenlavennuksella"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "rekisteröidään pragma ”%s” nimenlavennuksella ja ilman nimiavaruutta"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "rekisteröidään ”%s” sekä pragmana että pragma-nimiavaruutena"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s on jo rekisteröity"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s on jo rekisteröity"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "rekisteröidään pragma NULL-käsittelijällä"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once päätiedostossa"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "virheellinen #pragma push_macro -direktiivi"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "virheellinen #pragma pop_macro -direktiivi"
# poison tarkoittaa, että makroa tai direktiiviä ei koskaan määritellä tai käytetä
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "virheellinen #pragma GCC poison -direktiivi"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "myrkytetään olemassa oleva makro ”%s”"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ohitetaan otsaketiedoston ulkopuolella"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "lähdetiedostoa %s ei löydy"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "nykyinen tiedosto on vanhempi kuin %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "virheellinen ”#pragma GCC %s” -direktiivi"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma ottaa sulkeilla ympäröidyn merkkijonoliteraalin"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else ilman #if:iä"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else #else:n jälkeen"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "ehtolause alkoi tästä"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif ilman #if:iä"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif #else:n jälkeen"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif ilman #if:iä"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "’(’ puuttuu predikaatin jäljestä"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "’)’ puuttuu vastauksen täydentämisestä"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "predikaatin vastaus on tyhjä"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "väite ilman predikaattia"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predikaatin on oltava tunniste"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "”%s” väitetty uudelleen"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "päättämätön #%s"
@@ -414,12 +419,12 @@ msgstr "päättämätön #%s"
msgid "unterminated comment"
msgstr "päättämätön kommentti"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "vakiotuloste"
@@ -432,7 +437,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "virheellinen etuliite ”0b” liukulukuvakiolle"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "C++11:n heksadesimaaliliukulukuvakion käyttö"
#: expr.c:558
@@ -784,155 +791,155 @@ msgstr "monirivinen kommentti"
msgid "unspellable token %s"
msgstr "kirjoitusasuton symboli %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makroa ”%s” ei käytetä"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "virheellinen sisäinen makro ”%s”"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makro ”%s” saattaa estää toistettavat käännökset"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "ei voitu selvittää tiedoston aikaleimaa"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "ei voitu selvittää päivämäärää ja aikaa"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ lavennettu direktiivin sisällä valitsimella -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "virheellinen merkijonoliteraali, ohitetaan viimeinen ’\\’"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "liittämällä ”%s” ja ”%s” ei saada kelvollista esikääntäjän symbolia"
# Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
# Variadic-makro on sellainen makro, jonka argumenttien lukumäärä voi vaihdella.
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 vaatii vähintään yhden argumentin variadisen makron ”...”:lle"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro ”%s” vaatii %u argumenttia, mutta vain %u on annettu"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makrolle ”%s” annettu %u argumenttia, mutta se ottaa vain %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "päättämätön argumenttiluettelo ”%s”-makron kutsussa"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktion kaltaista makroa ”%s” on käytettävä argumenttien kanssa perinteisessä C:ssä"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C++98:ssa"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "%s-makron argumentin %d kutsu: tyhjät makroargumentit ovat määrittelemättömiä ISO C90:ssä"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "kahdenkertainen makroparametri ”%s”"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "”%s” ei saa esiintyä makron parametriluettelossa"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "makron parametrien on oltava pilkuin eroteltuja"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "parametrin nimi puuttuu"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyymit variadiset makrot esiteltiin C++11:ssä"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyymit variadiset makrot esiteltiin C99:ssä"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ei salli nimettyjä variadisia makroja"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ei salli nimettyjä variadisia makroja"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "’)’ puuttuu makron parametriluettelosta"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "”##” ei voi esiintyä makrolavennuksen kummassakaan päässä"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 vaatii tyhjemerkin makron nimen jälkeen"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "tyhjemerkki puuttuu makron nimen jäljestä"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "”#” ilman sitä seuraavaa makroparametria"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "”%s” määritelty uudelleen"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "tämä on edellisen määrittelyn sijainti"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makron argumentti ”%s” merkkijonostettaisiin perinteisessä C:ssä"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "virheellinen hash-tyyppi %d funktiossa cpp_macro_definition"
diff --git a/libcpp/po/fr.po b/libcpp/po/fr.po
index 085a19f0dac..06d69c6e4d5 100644
--- a/libcpp/po/fr.po
+++ b/libcpp/po/fr.po
@@ -119,10 +119,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU cpplib 6.1-b20160131\n"
+"Project-Id-Version: GNU cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-03-16 23:56+0100\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-27 23:10+0200\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -201,7 +201,7 @@ msgstr "le caractère universel %.*s n’est pas valide dans un identificateur"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "le caractère universel %.*s n’est pas valide au début d’un identificateur"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "conversion UCN vers le jeu de caractères source"
@@ -260,7 +260,7 @@ msgstr "constante caractère multi-caractères"
msgid "empty character constant"
msgstr "constante caractère vide"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "échec de conversion de %s vers %s"
@@ -384,148 +384,153 @@ msgstr "« %s » n’est pas un nom de fichier valide"
msgid "\"%s\" after # is not a positive integer"
msgstr "« %s » après # n’est pas un nombre entier positif"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "fichier linemarker « %s » ignoré à cause d’une imbriquation incorrecte"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "directive #%s invalide"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "enregistrement des pragmas dans l’espace de nom « %s » avec une expansion de nom ne correspondant pas"
# FIXME
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "enregistrement de la pragma « %s » avec une expansion de nom mais pas d’espace de nom"
# FIXME
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "enregistrement de « %s » à la fois comme une pragma et un espace de nom de pragma"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "la #pragma %s %s est déjà enregistrée"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "la #pragma %s est déjà enregistrée"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "enregistrement d’une pragma avec un handler NULL"
# FIXME
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once utilisée une seule fois dans le fichier principal"
# FIXME
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "directive #pragma push_macro invalide"
# FIXME
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "directive #pragma pop_macro invalide"
# FIXME
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "directive GCC #pragma poison invalide"
# FIXME
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "élimination de la macro existante « %s »"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorée en dehors du fichier d'inclusion"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "impossible de trouver le fichier source %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "le fichier courant est plus vieux que %s"
# FIXME
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "directive « #pragma GCC %s » invalide"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma attend une chaîne entourée de parenthèses"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else sans #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else après #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "la condition débute ici"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif sans #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif après #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif sans #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "« ( » manquante après le prédicat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "« ) » manquante pour completer la réponse"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "la réponse du prédicat est vide"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "assertion sans prédicat"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "le prédicat doit être un identificateur"
# FIXME
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "assertion « %s » redondante"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "#%s non terminé"
@@ -534,12 +539,12 @@ msgstr "#%s non terminé"
msgid "unterminated comment"
msgstr "commentaire non terminé"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s : %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "sortie standard"
@@ -552,8 +557,8 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "préfixe « 0b » invalide pour une constante flottante"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "utilisation d’une constante flottante hexadécimale C++11"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "utilisation d’une constante flottante hexadécimale C++1z"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
@@ -901,154 +906,154 @@ msgstr "commentaire multi-lignes"
msgid "unspellable token %s"
msgstr "l’élément lexical %s ne peut être épelé"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "la macro « %s » n’est pas utilisée"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interne « %s » invalide"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "la macro « %s » empêchera toute compilation reproductible"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "date de modification du fichier indéterminable"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "date et heure indéterminable"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "Expansion de __COUNTER__ à l’intérieur d’une directive avec -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "chaîne invalide, « \\ » final ignoré"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "le collage de « %s » et de « %s » ne donne pas d’élément lexical de pré-traitement valide"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requiert au moins un argument pour « ... » dans une macro à nombre variable d’arguments"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "la macro « %s » requiert %u arguments, mais seulement %u ont été passés"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "la macro « %s » a reçu %u arguments, mais elle n’en prend que %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "liste d'arguments non terminée invoquant la macro « %s »"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "la macro « %s » ressemblant à une fonction doit être utilisée avec des arguments en C traditionnel"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "appel de la macro %s avec l'argument %d : les arguments de macro vides sont indéfinis en ISO C++90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "paramètre de macro « %s » dupliqués"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "« %s » peut ne pas apparaître parmi la liste des paramètres de macro"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "les paramètres de macro doivent être séparés par des virgules"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "nom de paramètre manquant"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "les macros anonymes à nombre variable d’arguments ont été introduites avec le C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C ne permet pas les macros nommées à nombre variable d’arguments"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "« ) » manquante dans la liste des paramètres de macro"
# FIXME
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "« ## » ne peut apparaître à chacune des fins d’une expansion de macro"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 requiert un blanc après le nom de la macro"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requiert un blanc après le nom de la macro"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "espacement manquant après le nom de la macro"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "« # » n'est pas suivi d’un paramètre de macro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "« %s » redéfini"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "ceci est l’emplacement d’une précédente définition"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "l’argument de macro « %s » serait changé en chaine C traditionnel"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "type de hachage %d invalide dans cpp_macro_definition"
diff --git a/libcpp/po/id.po b/libcpp/po/id.po
index 2a9af23966d..764550cb83b 100644
--- a/libcpp/po/id.po
+++ b/libcpp/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.5-b20100204\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2010-02-05 19:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -87,7 +87,7 @@ msgstr "karakter universal %.*s tidak valid dalam sebuah pengidentifikasi"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "karakter universal %.*s tidak valid di awal dari sebuah pengidentifikasi"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "mengubah UCN ke set karakter asal"
@@ -146,7 +146,7 @@ msgstr "konstanta karakter multi-karakter"
msgid "empty character constant"
msgstr "konstanta karakter kosong"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "gagal untuk mengubah %s ke %s"
@@ -272,140 +272,145 @@ msgstr "\"%s\" bukan sebuah nama berkas yang valid"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" setelah # bukan sebuah integer positif"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "direktif #%s tidak valid"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "mendaftarkan pragma dalam ruang-nama \"%s\" dengan ekspansi nama yang tidak cocok"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "mendaftarkan pragma \"%s\" dengan ekspansi nama dan tidak ada ruang-nama"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "mendaftarkan \"%s\" sebagai baik sebuah pragma dan sebuah ruang-nama"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s telah terdaftar"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s telah terdaftar"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "mendaftarkan pragma dengan penanganan KOSONG"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma sekali dalam berkas utama"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "#pragma push_macro direktif tidak valid"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "#pragma pop_macro direktif tidak valid"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "#pragma GCC tidak valid merusak direktif"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "merusak makro \"%s\" yang sudah ada"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header diabaikan diluar berkas include"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "tidak dapat menemukan berkas sumber %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "berkas ini lebih lama daripada %s"
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "#pragma GCC tidak valid merusak direktif"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma mengambil sebuah string literal tanda kurung"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else tanpa #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else setelah #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "kondisional berawal disini"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif tanpa #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif setelah #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif tanpa #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "hilang '(' setelah predikat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "hilang ')' untuk melengkapi jawaban"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "jawaban predikat kosong"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "assertion tanpa predikat"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predikat harus berupa sebuah pengidentifikasi"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" re-asserted"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "tidak terakhiri #%s"
@@ -414,12 +419,12 @@ msgstr "tidak terakhiri #%s"
msgid "unterminated comment"
msgstr "komentar tidak terakhiri"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -434,7 +439,7 @@ msgstr "awalan \"0b\" tidak valid untuk konstanta pecahan"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "penggunaan dari konstanta pecahan heksa desimal C99"
#: expr.c:558
@@ -797,163 +802,163 @@ msgstr "komentar multi baris"
msgid "unspellable token %s"
msgstr "tanda %s tidak dapat disebutkan"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makro \"%s\" tidak digunakan"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "makro bawaan \"%s\" tidak valid"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "tidak dapat menentukan berkas timestamp"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "tidak dapat menentukan tanggal dan waktu"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ diekspans didalam direktif dengan -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "string literal tidak valid, mengabaikan final '\\'"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "pasting \"%s\" dan \"%s\" tidak memberikan sebuah tanda preprosesing valid"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 membutuhkan argumen rest untuk digunakan"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro \"%s\" membutuhkan %u argumen, tetapi hanya %u diberikan"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro \"%s\" melewatkan %u argumen, tetapi hanya mengambil %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "daftar argumen tidak terselesaikan memanggil makro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "makro \"%s\" seperti fungsi harus digunakan dengan argumen dalam tradisional C"
-#: macro.c:1813
+#: macro.c:1825
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "memanggil makro %s argumen %d: argumen makro kosong tidak didefinisikan dalam ISO C90 dan ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "memanggil makro %s argumen %d: argumen makro kosong tidak didefinisikan dalam ISO C90 dan ISO C++98"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "duplikasi parameter makro \"%s\""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" mungkin tidak muncul dalam daftar parameter makro"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "parameter makro yang berupa koma dipisahkan"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "nama parameter hilang"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonymous variadik makro diperkenalkan dalam C99"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonymous variadik makro diperkenalkan dalam C99"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C tidak mengijinkan makro variadik bernama"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tidak mengijinkan makro variadik bernama"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "hilang ')' dalam daftar parameter makro"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' tidak dapat muncul baik diakhir dari sebuah ekspansi makro"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 membutuhkan whitespace setelah nama makro"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 membutuhkan whitespace setelah nama makro"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "kurang spasi setelah nama makro"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' tidak diikuti dengan sebuah parameter makro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" redefinisi"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "ini adalah lokasi dari definisi sebelumnya"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "argumen makro \"%s\" akan stringified dalam tradisional C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "tipe hash %d tidak valid dalam cpp_macro_definition"
diff --git a/libcpp/po/ja.po b/libcpp/po/ja.po
index 2462e103373..3c91c0a9a6d 100644
--- a/libcpp/po/ja.po
+++ b/libcpp/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.9-b20140202\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2014-11-07 08:19+0000\n"
"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -91,7 +91,7 @@ msgstr "ユニバーサル文字 %.*s は識別の中では有効ではありま
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "ユニバーサル文字 %.*s は識別子の最初の文字として有効ではありません"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "UCN をソースの文字集合に変換しています"
@@ -150,7 +150,7 @@ msgstr "複数文字からなる文字定数"
msgid "empty character constant"
msgstr "空の文字定数"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "%s から %s への変換に失敗しました"
@@ -276,139 +276,144 @@ msgstr "\"%s\" は有効なファイル名ではありません"
msgid "\"%s\" after # is not a positive integer"
msgstr "# の後にある \"%s\" が正の整数ではありません"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "無効な #%s 指示です"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "名前空間 \"%s\" 内に pragma を一致しない名前展開で登録しています"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma \"%s\" を名前展開有りおよび名前空間無しで登録しています"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" を pragma および pragma 名前空間の両方として登録しています"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s は既に登録されています"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s は既に登録されています"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "NULL ハンドラで pragma を登録しています"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once がメインファイルにあります"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "無効な #pragma push_macro 指示です"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "無効な #pragma pop_macro 指示です"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "#pragma GCC 汚染ディレクティヴが無効です"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "既存のマクロ \"%s' を汚染します"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "include ファイル外の #pragma system_header は無視されました"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "ソースファイル %s が見つかりません"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "現在のファイルは %s より古いです"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "#pragma GCC %s ディレクティヴが無効です"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pramga が括弧で囲まれた文字列リテラルを受け取りました"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else に #if がありません"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else が #else の後ろにあります"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "その条件はここから始まります"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif に #if がありません"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif が #else の後ろにあります"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif に #if がありません"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "述語の後ろの '(' を欠いています"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "解を補完する ')' を欠いています"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "述語の解が空です"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "述語のないアサーションです"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "述語は識別子でなければなりません"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" が再アサートされました"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "終端のない #%s"
@@ -417,12 +422,12 @@ msgstr "終端のない #%s"
msgid "unterminated comment"
msgstr "終端されていないコメント"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "標準出力"
@@ -437,7 +442,7 @@ msgstr "浮動小数定数に対する無効な接頭辞 \"0b\" です"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "C99 十六進浮動小数定数を使用しています"
#: expr.c:558
@@ -796,163 +801,163 @@ msgstr "複数行のコメント"
msgid "unspellable token %s"
msgstr "綴ることができないトークン %s です"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "マクロ \"%s\" は使用されません"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "無効な組み込みマクロ \"%s\" です"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "マクロ \"%s\" は再生性可能なビルドを阻害するかもしれません"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "ファイルのタイムスタンプを決定できません"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "日付と時間を決定できません"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ が -fdirectives-only がある指示内で展開されました"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "文字列リテラルが無効です、最後の '\\' を無視します"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "\"%s\" と \"%s\" を貼付けましたが正常な前処理トークンとなりません"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 は使用されるべき残りのの引数を要求します"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "マクロ \"%s\" は引数を %u 要求しますが、%u 個しか与えられていません"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "マクロ \"%s\" に引数が %u 渡されましたが、%u しか受け取りません"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "終端されていない引数リストがマクロ \"%s\" を起動しようとしました"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "古い C では、関数型マクロ \"%s\" に引数が与えられねばなりません"
-#: macro.c:1813
+#: macro.c:1825
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "マクロ %s を引数 %d で起動しました。空のマクロ引数は ISO C90 および ISO C++98 内では定義されていません"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "マクロ %s を引数 %d で起動しました。空のマクロ引数は ISO C90 および ISO C++98 内では定義されていません"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "マクロ仮引数 \"%s\" が重複しています"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" はマクロ仮引数リストに現れてはなりません"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "マクロ仮引数はカンマ区切りされなければなりません"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "仮引数名を欠いています"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "無名可変引数マクロは C99 で導入されました"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "無名可変引数マクロは C99 で導入されました"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C では名前つき可変引数マクロを許しません"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C では名前つき可変引数マクロを許しません"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "マクロ仮引数リストに ')' がありません"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' はマクロ展開の両端には出現できません"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 ではマクロ名の後に空白が必要です"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 ではマクロ名の後に空白が必要です"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "マクロ名の後に空白がありません"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' にマクロ仮引数名が続いていません"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" が再定義されました"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "ここが以前の宣言がある位置です"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "マクロ引数 \"%s\" は古い (traditional) C では文字列化されます"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "cpp_macro_definition 内に無効なハッシュ型 %d があります"
diff --git a/libcpp/po/nl.po b/libcpp/po/nl.po
index 148ffaddf8c..78b32283d99 100644
--- a/libcpp/po/nl.po
+++ b/libcpp/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 5.2.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2015-07-23 19:42+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -92,7 +92,7 @@ msgstr "universeel teken %.*s is niet geldig in een naam"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universeel teken %.*s is niet geldig aan het begin van een naam"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "omzetting van UCN naar brontekenset"
@@ -151,7 +151,7 @@ msgstr "tekenconstante bevat meerdere tekens"
msgid "empty character constant"
msgstr "lege tekenconstante"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "fout bij omzetten van %s naar %s"
@@ -278,148 +278,153 @@ msgstr "\"%s\" is geen geldige bestandsnaam"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" (na #) is geen positieve integer"
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
# FIXME: most likely shouldn't have been marked as translatable
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "ongeldig #%s commando"
# goede vertaling voor 'mismatched'?
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registratie van pragma's in naamsruimte \"%s\" met niet-overeenkomstige naamsexpansie"
# moet namespace hier ook vertaald worden?
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registratie van pragma \"%s\" met naamsexpansie maar geen naamsruimte"
# moet namespace hier ook vertaald worden?
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registratie van \"%s\" zowel als pragma en als pragma-naamsruimte"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s is reeds geregistreerd"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s is reeds geregistreerd"
# betere vertaling voor 'handler'?
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "registratie van pragma met NULL als afhandelingsroutine"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once in hoofdbestand"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "ongeldig #pragma push_macro commando"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "ongeldig #pragma pop_macro commando"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "ongeldig #pragma GCC poison commando"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "bestaande macro \"%s\" wordt 'vergiftigd'"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header wordt genegeerd buiten een invoegbestand"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "kan bronbestand %s niet vinden"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "huidig bestand is ouder dan %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ongeldig \"#pragma GCC %s\"-commando"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma verwacht als argument een stringconstante tussen haakjes"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else zonder #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else na #else"
# of gewoon "de conditie"?
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "het conditionele blok begon hier"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif zonder #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif na #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif zonder #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "'(' ontbreekt na predicaat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "')' ontbreekt als afronding van het antwoord"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "antwoord van het predicaat is leeg"
# dit moet beter kunnen...
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "assertie zonder predicaat"
# ... dit klinkt echt niet - maar wat is hier een beter vertaling voor identifier?
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predicaat moet een naam zijn"
# is "asserteren" wel een echt woord?
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" opnieuw geasserteerd"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "niet-beëindigde #%s"
@@ -429,12 +434,12 @@ msgid "unterminated comment"
msgstr "niet-beëindigd commentaar"
# FIXME: hoort niet echt een vertaalbare string te zijn :-)
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "standaarduitvoer"
@@ -447,7 +452,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "ongeldige prefix \"0b\" voor floating-point constante"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "gebruik van een C++11 hexadecimale floating-point constante"
#: expr.c:558
@@ -798,155 +805,155 @@ msgstr "commentaar gespreid over meerdere regels"
msgid "unspellable token %s"
msgstr "kan token %s niet spellen"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "macro \"%s\" wordt nergens gebruikt"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ongeldige ingebouwde macro \"%s\""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "macro \"%s\" kan reproduceerbare compilaties verhinderen"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "kan tijdsstempel van bestand niet achterhalen"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "kan datum en tijd niet achterhalen"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "expansie van __COUNTER__ binnenin commando terwijl -fdirectives-only opgegeven is"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "ongeldige stringconstante; laatste '\\' wordt genegeerd"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "het plakken van \"%s\" en \"%s\" levert geen geldig preprocessing token op"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 vereist minstens één argument voor de \"...\" in een variadische macro"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 vereist minstens één argument voor de \"...\" in een variadische macro"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "macro \"%s\" vereist %u argumenten, maar er werden er slechts %u opgegeven"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "macro \"%s\" kreeg %u argumenten, maar heeft er slechts %u nodig"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "niet-beëindigde argumentenlijst bij aanroep van macro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "functie-achtige macro \"%s\" moet in traditioneel C altijd met argumenten gebruikt worden"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "aanroep van macro %s argument %d: lege macro-argumenten zijn ongedefinieerd in ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "aanroep van macro %s argument %d: lege macro-argumenten zijn ongedefinieerd in ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "herhaalde macro-parameter \"%s\""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" mag niet voorkomen in lijst van macro-parameters"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "macro-parameters moet door komma's gescheiden worden"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "parameternaam ontbreekt"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonieme variadische macro's werden geïntroduceerd in C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonieme variadische macro's werden geïntroduceerd in C99"
# variadic? " met variabele argumentenlijst" is nogal lang...
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ staat geen benoemde variadische macro's toe"
# variadic? " met variabele argumentenlijst" is nogal lang...
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C staat geen benoemde variadische macro's toe"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "')' ontbreekt in lijst van macro-parameters"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' mag niet voorkomen aan het begin of einde van een macro-expansie"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 vereist witruimte na de macronaam"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 vereist witruimte na de macronaam"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "witruimte ontbreekt na de macronaam"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' wordt niet gevolgd door de naam van een macro-parameter"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" opnieuw gedefinieerd"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "dit is de plaats van de eerdere definitie"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "macro-argument \"%s\" zou string gemaakt worden in traditioneel C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "ongeldig hash-type %d in 'cpp_macro_definition'"
diff --git a/libcpp/po/pt_BR.po b/libcpp/po/pt_BR.po
index fc938ece0b8..2d7f5aefca2 100644
--- a/libcpp/po/pt_BR.po
+++ b/libcpp/po/pt_BR.po
@@ -1,13 +1,13 @@
# Brazilian Portuguese translation for cpplib
# Copyright (C) 2016 Free Software Foundation, Inc.
# This file is distributed under the same license as the gcc package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014, 2016.
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2013, 2014, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 6.1-b20160131\n"
+"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-02-02 20:33-0200\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-27 12:21-0200\n"
"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Virtaal 0.7.1\n"
#: charset.c:674
#, c-format
@@ -86,7 +86,7 @@ msgstr "caractere universal %.*s não é válido em um identificador"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "caractere universal %.*s não é válido no começo de um identificador"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "convertendo UCN para conjunto de caracteres fonte"
@@ -145,7 +145,7 @@ msgstr "constante de caractere multi-caractere"
msgid "empty character constant"
msgstr "constante caractere vazia"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "falha ao converter %s para %s"
@@ -244,7 +244,7 @@ msgstr "#include_next no arquivo fonte primário"
#: directives.c:877
#, c-format
msgid "invalid flag \"%s\" in line directive"
-msgstr "opção inválida \"%s\" na diretiva line"
+msgstr "opção inválida \"%s\" na diretiva de linha"
#: directives.c:937
msgid "unexpected end of file after #line"
@@ -269,139 +269,144 @@ msgstr "\"%s\" não é um nome de arquivo válido"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" após # não é um inteiro positivo"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "marcador de linha do arquivo \"%s\" ignorado em razão de aninhamento incorreto"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "diretiva inválida #%s"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrando pragmas em espaço de nomes \"%s\" com expansão de nome incompatível"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrando pragma \"%s\" com expansão de nome e nenhum espaço de nomes"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrando \"%s\" como tanto um pragma e um espaço de nomes de pragma"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s já está registrado"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s já está registrado"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "registrando pragma com manipulador NULO"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma ocorre uma vez no arquivo principal"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "diretiva inválida #pragma push_macro"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "diretiva inválida #pragma pop_macro"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "diretiva inválida #pragma GCC poison"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "envenenando macro existente \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorado fora do arquivo include"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "não foi possível localizar o arquivo fonte %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "arquivo atual é mais velho do que %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "diretiva inválida \"#pragma GCC %s\""
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma leva uma literal de string entre parenteses"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else sem #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else após #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "a condicional começou aqui"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif sem #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif após #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif sem #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "faltando \"(\" após predicado"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "faltando \")\" para uma resposta completa"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "resposta do predicado está vazia"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "asserção sem predicado"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predicado deve ser um identificador"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" re-assertado"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "#%s não terminado"
@@ -410,12 +415,12 @@ msgstr "#%s não terminado"
msgid "unterminated comment"
msgstr "comentário não terminado"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "saída padrão"
@@ -428,8 +433,8 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "prefixo inválido \"0b\" para constante flutuante"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "uso de constante flutuante hexadecimal de C++11"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "uso de constante flutuante hexadecimal de C++1z"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
@@ -477,7 +482,7 @@ msgstr "constantes imaginárias (imaginary constants) são uma extensão GCC"
#: expr.c:704
msgid "binary constants are a C++14 feature or GCC extension"
-msgstr "constantes binárias (binary constants) são um recurso de C++1 ou uma extensão GCC"
+msgstr "constantes binárias (binary constants) são um recurso de C++14 ou uma extensão GCC"
#: expr.c:706
msgid "binary constants are a GCC extension"
@@ -773,162 +778,162 @@ msgstr "comentário multilinha"
msgid "unspellable token %s"
msgstr "token %s impronunciável"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "macro \"%s\" não é usada"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "macro interna inválida \"%s\""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "macro \"%s\" pode evitar compilações reproduzíveis"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "não foi possível determinar o arquivo de marca de tempo"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "não foi possível determinar a data e a hora"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ expandido dentro diretiva com -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "literal de string inválida, ignorando final \"\\\""
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "colar \"%s\" em \"%s\" não resulta em nenhum token de preprocessamento válido"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
-msgstr "ISO C+11 requer pelo menos um argumento para o \"...\" em uma macro variádica"
+msgstr "ISO C++11 requer pelo menos um argumento para o \"...\" em uma macro variádica"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 requer pelo menos um argumento para o \"...\" em uma macro variádica"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "macro \"%s\" requer %u argumentos, mas apenas %u foram fornecidos"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "macro \"%s\" passou %u argumentos, mas usa apenas %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "lista de argumentos interminável chamando macro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "macro \"%s\" do tipo função deve ser usada com argumento em C tradicional"
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33305
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "chamando macro %s argumento %d: argumentos de macro vazios estão indefinidos em ISO C++98"
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33305
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "chamando macro %s argumento %d: argumentos de macro vazios estão indefinidos em ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "parâmetro de macro \"%s\" duplicado"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" não pode aparecer na lista de parâmetros de macro"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "parâmetros de macro devem ser separados por vírgula"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "faltando nome de parâmetro"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "macros variádicas anônimas foram introduzidas em C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "macros variádicas anônimas foram introduzidas em C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ não permite macros variádicas nomeadas"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C não permite macros variádicas nomeadas"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "faltando \")\" na lista de parâmetros de macro"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "\"##\" não pode aparecer no final da expansão de macro"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 requer espaço em branco após o nome de macro"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 requer espaço em branco após o nome de macro"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "faltando espaço em branco após o nome de macro"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "\"#\" não está seguido por um parâmetro de macro"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" re-definido"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "essa é a localização da definição anterior"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "argumento de macro \"%s\" estaria em uma string no C tradicional"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "tipo de hash inválido %d em cpp_macro_definition"
#: pch.c:87 pch.c:345 pch.c:359 pch.c:377 pch.c:383 pch.c:392 pch.c:399
msgid "while writing precompiled header"
-msgstr "enquanto realizava escrita de header pré-compilado"
+msgstr "enquanto realizava escrita de cabeçalho pré-compilado"
#: pch.c:619
#, c-format
@@ -957,7 +962,7 @@ msgstr "%s: não usado porque \"__COUNTER__\" é inválido"
#: pch.c:723 pch.c:900
msgid "while reading precompiled header"
-msgstr "enquanto realizava leitura de header pré-compilado"
+msgstr "enquanto realizava leitura de cabeçalho pré-compilado"
#: traditional.c:889
#, c-format
diff --git a/libcpp/po/ru.po b/libcpp/po/ru.po
index 4ec375cf79d..9fef82bdcba 100644
--- a/libcpp/po/ru.po
+++ b/libcpp/po/ru.po
@@ -5,10 +5,10 @@
# Yuri Kozlov <yuray@komyakino.ru>, 2011, 2012, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 6.1-b20160131\n"
+"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-02-07 09:16+0300\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-27 19:03+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
"Language: ru\n"
@@ -87,7 +87,7 @@ msgstr "универсальный символ %.*s недопустим в и
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "универсальный символ %.*s недопустим в начале идентификатора"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "преобразование UCN в простой набор символов исходного кода"
@@ -146,7 +146,7 @@ msgstr "многознаковая символьная константа"
msgid "empty character constant"
msgstr "пустая символьная константа"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "ошибка при преобразовании %s в %s"
@@ -270,139 +270,144 @@ msgstr "«%s» не является допустимым именем файл
msgid "\"%s\" after # is not a positive integer"
msgstr "«%s» после # не является положительным целым числом"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "маркер строки файла «%s» игнорируется из-за некорректной вложенности"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "неправильная директива #%s"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "регистрируется прагма в пространстве имён «%s» с несовпадающим именным расширением"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "регистрируется прагма «%s» с именным расширением, но без пространства имён"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "регистрируется «%s» как прагма и как пространство имён для прагм"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s уже зарегистрирована"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s уже зарегистрирована"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "регистрируется прагма со значением обработчика равным NULL"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once в главном файле"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "неверная директива #pragma push_macro"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "неверная директива #pragma pop_macro"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "неверная директива #pragma GCC poison"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "отравление существующего макроса «%s»"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header игнорируется вне включаемого файла"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "не удалось найти исходный файл %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "текущий файл старее чем %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "неверная директива #pragma GCC %s"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "для _Pragma требуется указать строковый литерал в скобках"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else без #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else после #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "условие начинается здесь"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif без #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif после #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif без #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "отсутствует «(» после предиката"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "отсутствует «)» для завершения ответа"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "ответ предиката пуст"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "утверждение без предиката"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "предикат должен быть идентификатором"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "повторное утверждение «%s»"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "незавершённая #%s"
@@ -411,12 +416,12 @@ msgstr "незавершённая #%s"
msgid "unterminated comment"
msgstr "незавершённый комментарий"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -429,12 +434,12 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "неверный префикс «0b» в плавающей константе"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "использование шестнадцатеричной константы с плавающей точкой C++11"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "использование шестнадцатеричной константы с плавающей точкой согласно C++1z"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
-msgstr "использование шестнадцатеричной константы с плавающей точкой C99"
+msgstr "использование шестнадцатеричной константы с плавающей точкой согласно C99"
#: expr.c:602
#, c-format
@@ -774,153 +779,153 @@ msgstr "многострочный комментарий"
msgid "unspellable token %s"
msgstr "неразбираемый токен %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макрос «%s» не используется"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "неверный встроенный макрос «%s»"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макрос «%s» может помешать повторным сборкам"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "не удалось определить временную метку файла"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "не удалось определить дату и время"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ раскрывается внутри директивы при указании параметра -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "неверный строковый литерал, игнорируется завершающий «\\»"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "вставка «%s» и «%s» не даёт правильного препроцессорного токена"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "В ISO C++11 требуется не менее одного аргумента для «…» в вариативном макросе"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "В ISO C99 требуется не менее одного аргумента для «…» в вариативном макросе"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "для макроса «%s» требуется %u аргументов, но указано только %u"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "в макрос «%s» передано %u аргументов, но используется только %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "незавершённый список аргументов вызывает макрос «%s»"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "макрос «%s», похожий на функцию, должен использоваться с аргументами в традиционном C"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "вызывается макрос %s (количество аргументов %d): пустые аргументы макрос не определены в ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "вызывается макрос %s (количество аргументов %d): пустые аргументы макрос не определены в ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "повторяющийся параметр макроса «%s»"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "«%s» может не появиться в списке параметров макроса"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "параметры макроса должны указываться через запятую"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "отсутствует имя параметра"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "анонимные вариативные макросы появились в C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "анонимные вариативные макросы появились в C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "В ISO C++ не разрешены вариативные именованные макросы"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "В ISO C не разрешены вариативные именованные макросы"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "отсутствует «)» в списке параметров макроса"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "«##» не может указываться в конце макрорасширения"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "В ISO C++11 требуется пробельный символ после имени макроса"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "в ISO C99 требуется пробельный символ после имени макроса"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "отсутствует пробельный символ после имени макроса"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "после «#» нет параметра макроса"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "«%s» переопределён"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "это расположение предыдущего определения"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "аргумент макроса «%s» был бы строкой, оформленной в традиционном стиле С"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "неверный тип хэша %d в cpp_macro_definition"
diff --git a/libcpp/po/sr.po b/libcpp/po/sr.po
index 31076350cc2..7cbf354481e 100644
--- a/libcpp/po/sr.po
+++ b/libcpp/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib-6.1-b20160131\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2016-03-05 08:37+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -85,7 +85,7 @@ msgstr "свеопшти знак %.*s није исправан у одредн
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "свеопшти знак %.*s није исправан на почетку одредника"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "претварам НСЗ у изворни знаковни скуп"
@@ -144,7 +144,7 @@ msgstr "више-знаковна константа знака"
msgid "empty character constant"
msgstr "празна константа знака"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "неуспех у претварању %s у %s"
@@ -268,139 +268,144 @@ msgstr "„%s“ није исправан назив датотеке"
msgid "\"%s\" after # is not a positive integer"
msgstr "„%s“ након „#“ није позитиван цео број"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "неисправна #%s директива"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "бележим прагме у простору назива „%s“ са неодговарајућим ширењем назива"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "бележим прагму „%s“ са ширењем назива и без простора назива"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "бележим „%s“ и као прагму и као простор назива прагме"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s је већ забележено"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s је већ забележено"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "бележим прагму са НИШТАВНИМ руковаоцем"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma једном у главној датотеци"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "неисправна „#pragma push_macro“ директива"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "неисправна „#pragma pop_macro“ директива"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "неисправна „#pragma GCC poison“ директива"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "трујем постојећи макро „%s“"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "„#pragma system_header“ је занемарено изван датотеке укључивања"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "не могу да пронађем изворну датотеку „%s“"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "текућа датотека је старија од %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "неисправна директива „#pragma GCC %s“"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Прагма узима словност ниске затворене заградом"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "„#else“ без „#if“"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "„#else“ након „#else“"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "условљеност почиње овде"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "„#elif“ без „#if“"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "„#elif“ након „#else“"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "„#endif“ без „#if“"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "недостаје ( након предиката"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "недостаје ) да доврши одговор"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "одговор предиката је празан"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "тврдња без предиката"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "предикат мора бити одредник"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "„%s“ је поново утврђен"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "неокончано #%s"
@@ -409,12 +414,12 @@ msgstr "неокончано #%s"
msgid "unterminated comment"
msgstr "неокончана напомена"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "стдизлаз"
@@ -427,7 +432,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "неисправан префикс „0b“ за покретну константу"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "употреба Ц+11 хексадецималне покретне константе"
#: expr.c:558
@@ -772,153 +779,153 @@ msgstr "напомена више редова"
msgid "unspellable token %s"
msgstr "неизговорљив симбол %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макро „%s“ није коришћен"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "неисправан макро уградње „%s“"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макро „%s“ може да спречи поновљиве изградње"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "не могу да одредим временску ознаку датотеке"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "не могу да одредим датум и време"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "„__COUNTER__“ је проширен у директиви са „-fdirectives-only“"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "неисправна словност ниске, занемарујем завршну \\"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "налепљивање „%s“ и „%s“ не даје исправан симбол претпроцесора"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ИСО Ц++11 захтева барем један аргумент за „...“ у вариадик макроу"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ИСО Ц99 захтева барем један аргумент за „...“ у вариадик макроу"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "макро „%s“ захтева %u аргумента, али само %u су дата"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "макро „%s“ је проследио %u аргумента, али узима само %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "бесконачан списак аргумената призивајући макро „%s“"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "макро налик функцији „%s“ мора бити коришћен са аргументима у уобичајеном Ц-у"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "призивајући макро %s аргумент %d: празни аргументи макроа нису одређени у ИСО Ц++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "призивајући макро %s аргумент %d: празни аргументи макроа нису одређени у ИСО Ц90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "параметар двоструког макроа „%s“"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "„%s“ не може да се појави у списку параметара макроа"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "параметри макроа морају бити раздвојени зарезом"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "недостаје назив параметра"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "безимени вариадик макрои су уведени у Ц++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "безимени вариадик макрои су уведени у Ц99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ИСО Ц++ не дозвољава именоване вариадик макрое"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ИСО Ц не дозвољава именоване вариадик макрое"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "недостаје ) у списку параметара макроа"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "„##“ не може да се појави у или на крају макро ширења"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ИСО Ц++11 захтева празнине након назива макроа"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ИСО Ц99 захтева празнине након назива макроа"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "недостаје празнина након назива макроа"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "за „#“ не следи параметар макроа"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "„%s“ је поново одређено"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "ово је место претходне одреднице"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "макро аргумент „%s“ ће бити нискован у уобичајеном Ц-у"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "неисправна врста хеша %d у цпп_макро_одредници"
diff --git a/libcpp/po/sv.po b/libcpp/po/sv.po
index 696d5a87906..0879b0de3e6 100644
--- a/libcpp/po/sv.po
+++ b/libcpp/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 6.1-b20160131\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2016-02-03 21:55+0100\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -88,7 +88,7 @@ msgstr "universellt tecken %.*s är inte giltigt i en identifierare"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "universellt tecken %.*s är inte giltigt vid början av en identifierare"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "vid konvertering av UCN källteckenuppsättning"
@@ -147,7 +147,7 @@ msgstr "flerteckens teckenkonstant"
msgid "empty character constant"
msgstr "tom teckenkonstant"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "misslyckades att konvertera %s till %s"
@@ -271,139 +271,144 @@ msgstr "”%s” är inte ett giltigt filnamn"
msgid "\"%s\" after # is not a positive integer"
msgstr "”%s” efter # är inte ett positivt heltal"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "ogiltigt #%s-direktiv"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "registrerar pragman i namnrymden ”%s” med namnexpansion som inte passar ihop"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "registrerar pragma ”%s” med namnexpansion och utan namnrymd"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "registrerar ”%s” både som ett pragma och ett pragma namespace"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s är redan registrerat"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s är redan registrerat"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "registrerar pragma med NULL-hanterare"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once i huvudfil"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "ogiltigt direktiv #pragma push_macro"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "ogiltigt direktiv #pragma pop_macro"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "ogiltigt direktiv #pragma GCC poison"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "förgiftar existerande makro ”%s”"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header ignorerat utanför huvudfil"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "kan inte hitta källfil %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "aktuell fil är äldre än %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "ogiltigt direktiv ”#pragma GCC %s”"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma tar en strängkonstant inom parenteser"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else utan #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else efter #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "villkorssatsen började här"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif utan #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif efter #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif utan #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "saknas '(' efter predikat"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "saknas ')' för att avsluta svaret"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "predikatets svar är tomt"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "försäkran utan predikat"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "predikat måste vara en identifierare"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "”%s” omförsäkrat"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "oavslutad #%s"
@@ -412,12 +417,12 @@ msgstr "oavslutad #%s"
msgid "unterminated comment"
msgstr "ej avslutad kommentar"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "standard ut"
@@ -430,7 +435,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "ogiltigt prefix ”0b” på flyttalskonstant"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "användning av hexadecimal flyttalskonstant enligt C++11"
#: expr.c:558
@@ -775,153 +782,153 @@ msgstr "flerradskommentar"
msgid "unspellable token %s"
msgstr "ostavbar symbol %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "makrot ”%s” är inte använt"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "ogiltigt inbyggt makro ”%s”"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "makrot ”%s” kan förhindra reproducerbara byggen"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "det gick inte att avgöra fils tidsstämpel"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "det gick inte att avgöra datum och tid"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ expanderad inuti direktiv med -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "ogiltig strängkonstant, ignorerar avslutande ”\\”"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "att sätta ihop ”%s” och ”%s” ger inte en giltig preprocessorsymbol"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 kräver åtminstone ett argument för ”...” i ett makro med variabelt antal argument"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 kräver åtminstone ett argument för ”...” i ett makro med variabelt antal argument"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makrot ”%s” kräver %u argument, men endast %u anges"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro ”%s” skickade %u argument, men det tar bara %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "oavslutad argumentlista vid anrop av makrot ”%s”"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "funktionsliknande makrot ”%s” måste användas med ett argument i traditionell C"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "vid anrop av makro %s argument %d: tomma makroargument är odefinierade i ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "vid anrop av makro %s argument %d: tomma makroargument är odefinierade i ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "dubblerad makroparameter ”%s”"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "”%s” får inte förekomma i en makroparameterlista"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "makroparametrar måste avdelas av komman"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "parameternamn saknas"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "anonyma variabla makron introducerades i C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "anonyma variabla makron introducerades i C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ tillåter inte namngivna variabla makron"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C tillåter inte namngivna variabla makron"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "saknad ”)” i makroparameterlista"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "”##” kan inte förekomma vid någon av ändarna av makroexpansionen"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 kräver mellanrum efter makronamnet"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 kräver mellanrum efter makronamnet"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "mellanrum saknas efter makronamn"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "”#” följs inte av en makroparameter"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "”%s” omdefinierad"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "detta är platsen för den tidigare definitionen"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makroargumentet ”%s” skulle bli gjort till sträng i traditionell C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "ogiltig hash-typ %d i cpp_macro_definition"
diff --git a/libcpp/po/tr.po b/libcpp/po/tr.po
index 7f58a1ecd4f..83227f90345 100644
--- a/libcpp/po/tr.po
+++ b/libcpp/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.8.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2013-11-01 22:29+0100\n"
"Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -90,7 +90,7 @@ msgstr "evrensel karakter %.*s bir belirteç içinde geçerli değil"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "evrensel karakter %.*s bir belirtecin başında geçerli değil"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "UCN'den kaynak karakter kümesine dönüşüm"
@@ -149,7 +149,7 @@ msgstr "çoklu-karakter karakter sabiti"
msgid "empty character constant"
msgstr "karakter sabit boş"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "`%s' ile `%s' arasında dönüşüm başarısız"
@@ -275,139 +275,144 @@ msgstr "\"%s\" geçerli bir dosya ismi değil"
msgid "\"%s\" after # is not a positive integer"
msgstr "#'dan sonraki \"%s\" bir pozitif tamsayı değil"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "#%s yönergesi geçersiz"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "\"%s\" isim-alanındaki pragmalar uyumsuz isim yorumlaması ile kaydediliyor"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma \"%s\" isim alansız olarak isim yorumlamasıyla kaydediliyor"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" hem pragma hem de pragma isim alanı olarak kaydediliyor"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s zaten kayıtlı"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s zaten kayıtlı"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "pragma NULL eylemci ile kaydediliyor"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "main dosyasında '#pragma once'"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "geçersiz #pragma güdümlü_makro yönergesi"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "geçersiz #pragma güdümlü_makro yönergesi"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "geçersiz #pragma GCC poison yönergesi"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "zehirlenen mevcut makro \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "başlık dosyasının dışındaki '#pragma system_header' yoksayıldı"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "%s kaynak dosyası bulunamıyor"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "mevcut dosya %s den daha eski"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "geçersiz \"#pragma GCC %s\" yönergesi"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma bir parantezli dizge sabiti alır"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#if siz #else"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else den sonra #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "koşul başlangıcı burası"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#if siz #elif "
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#else den sonra #elif"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#if siz #endif"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "dayanaktan sonra '(' eksik"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "yanıtı tamamlayacak ')' eksik"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "dayanakların cevabı boş"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "dayanaksız olumlama"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "dayanak bir tanımlayıcı olmalı"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" tekrar olumlanmış"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "sonlandırılmamış #%s"
@@ -416,12 +421,12 @@ msgstr "sonlandırılmamış #%s"
msgid "unterminated comment"
msgstr "sonlandırılmamış açıklama"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdÇ"
@@ -436,7 +441,7 @@ msgstr "kayan nokta için geçerisz \"0b\" öntakısı"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "C99 onaltılık gerçel sayı sabit kullanımı"
#: expr.c:558
@@ -799,163 +804,163 @@ msgstr "çok satırlı açıklama"
msgid "unspellable token %s"
msgstr "dizgecik %s okunabilir değil"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "\"%s\" makrosu kullanılmadı"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "geçersiz yerleşik makro \"%s\""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "dosya tarih damgası saptanamadı"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "tarih ve saat saptanamadı"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ -fdirectives-only ile talimat içerisinde genişletildi"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "geçersiz dizge sabit, son '\\' yoksayılıyor"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "\"%s\" ve \"%s\" geçişi geçerli bir önişlem dizgeciği vermez"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C kalan argümanların kullanılmış olmasını gerektirir"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "makro \"%s\" %u argüman gerektiriyor ama sadece %u argüman verilmiş"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "makro \"%s\" için %u argüman verilmiş ama tam %u argüman alıyor"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "sonlandırılmamış argüman listesi çağıran makro \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "işlev benzeri makro \"%s\" geleneksel C'de argümanlarla kullanılmalıdır"
-#: macro.c:1813
+#: macro.c:1825
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "%s makrosu %d argümanı uygulanıyor: ISO C90 ve ISO C++98 içerisinde boş makro argümanları tanımsızdır"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "%s makrosu %d argümanı uygulanıyor: ISO C90 ve ISO C++98 içerisinde boş makro argümanları tanımsızdır"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "yinelenmiş makro parametresi \"%s\""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" makro parametre listesinde görünmeyebilir"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "makro parametreleri virgüllerle ayrılmış olmalı"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "parametre ismi eksik"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "argümanlarının sayısı değişebilen anonim makrolar C99 da tanıtıldı"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "argümanlarının sayısı değişebilen anonim makrolar C99 da tanıtıldı"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C argümanlarının sayısı değişebilen isimli makrolara izin vermez"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C argümanlarının sayısı değişebilen isimli makrolara izin vermez"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "makro parametre listesinde ')' eksik"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' bir makronun her iki ucunda da görünemez"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 makro isminden sonra boşluk gerektirir"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 makro isminden sonra boşluk gerektirir"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "makro isminden sonra boşluk gerekir"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' işaretinden sonra bir makro parametresi yok"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "\"%s\" yeniden tanımlanmış"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "burası evvelki tanımın yapıldığı yer"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "makro argümanı \"%s\" geleneksel C'de dizgelenmiş olmalıydı"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "cpp_macro_definition içindeki isimli yapı türü %d geçersiz"
diff --git a/libcpp/po/uk.po b/libcpp/po/uk.po
index 73315000462..587b36003b6 100644
--- a/libcpp/po/uk.po
+++ b/libcpp/po/uk.po
@@ -6,10 +6,10 @@
# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 6.1-b20160131\n"
+"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-02-03 07:22+0200\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-27 17:09+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -88,7 +88,7 @@ msgstr "універсальний символ %.*s не є допустими
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "універсальний символ %.*s не є допустимим на початку ідентифікатора"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "перетворення UCN на первинний набір символів"
@@ -147,7 +147,7 @@ msgstr "багатосимвольна символьна константа"
msgid "empty character constant"
msgstr "порожня символьна константа"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "помилка при перетворені %s на %s"
@@ -271,139 +271,144 @@ msgstr "\"%s\" не є коректною назвою файлу"
msgid "\"%s\" after # is not a positive integer"
msgstr "\"%s\" після # не є додатнім цілим числом"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "засіб позначення рядків файла «%s» проігноровано через некоректну вкладеність"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "некоректна директива #%s"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "прагми реєструються у просторі назв \"%s\" за відсутності розширення назв"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "прагма \"%s\" реєструється з розширенням назви але без простору назви"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "\"%s\" реєструється як прагма та як простір назв прагм"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s вже зареєстровано"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s вже зареєстровано"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "реєструється pragma з NULL-обробником"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma один раз у головному файлі"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "некоректна директива #pragma push_macro"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "некоректна директива #pragma pop_macro"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "некоректна директива #pragma GCC poison"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "використання отруєння (poisoning) вже створеного макроса \"%s\""
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header проігноровано за межами включеного файлу"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "не вдається знайти первинний файл %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "поточний файл старіший ніж %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "некоректна директива «#pragma GCC %s»"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma охоплює дужками символьний літерал"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else без #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else після #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "умова починається тут"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif без #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif після #else"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif без #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "відсутня '(' після предикату"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "відсутня ')' для завершення відповіді"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "відповідь предиката порожня"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "твердження без предиката"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "предикат має бути ідентифікатором"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "\"%s\" повторне ствердження"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "незавершене #%s"
@@ -412,12 +417,12 @@ msgstr "незавершене #%s"
msgid "unterminated comment"
msgstr "незавершений коментар"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -430,8 +435,8 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "некоректний префікс \"0b\" для константи з рухомою крапкою"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "використовуйте десятково-шістнадцяткову константу із рухомою крапкою мови C++11"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "використовуйте десятково-шістнадцяткову константу із рухомою крапкою мови C++1z"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
@@ -775,153 +780,153 @@ msgstr "багаторядковий коментар"
msgid "unspellable token %s"
msgstr "неможливо розібрати лексему %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "макрос \"%s\" не використовується"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "некоректний вбудований макрос \"%s\""
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "макрос \"%s\" може завадити відтворюваному збиранню"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "не вдається визначити часову мітку файлу"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "не вдається визначити дату та час"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ розгорнуто всередині директиви з -fdirectives-only"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "некоректний символьний літерал, ігнорується завершальний символ '\\'"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "вставка \"%s\" та \"%s\" не призводить до коректної лексеми препроцесора"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 потребує принаймні одного аргументу для використання \"...\" у варіативному макросі"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 потребує принаймні одного аргументу для використання \"...\" у варіативному макросі"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "для макроса \"%s\" потрібно вказати %u аргументів, але вказано лише %u"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "макроса \"%s\" передано %u аргументів, але з них використано лише %u"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "незавершений список аргументів у виклику макроса \"%s\""
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "подібний до функції макрос \"%s\" має використовуватися з аргументами у традиційній мові C"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "виклик макроса %s, аргумент %d: порожні аргументи макросів вважаються невизначеними у ISO C++98"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "виклик макроса %s, аргумент %d: порожні аргументи макросів вважаються невизначеними у ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "дублікат параметра макроса \"%s\""
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "\"%s\" не може з'являтися у списку параметрів макроса"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "параметри макроса мають бути розділені комами"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "відсутня назва параметра"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "анонімні варіативні макроси започатковані у C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "анонімні варіативні макроси впроваджено з версії C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ не припускає іменовані варіативні макроси"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C не припускає іменовані варіативні макроси"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "відсутня ')' у списку параметрів макроса"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "'##' не може з'являтися з обох кінців макророзширення"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "у ISO C++11 після назви макроса має бути пробіл"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "у ISO C99 має бути пробіл після назви макроса"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "відсутні пробіл після назви макроса"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "'#' не супроводжується параметром макроса"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "повторне визначення \"%s\""
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "...це місце першого визначення"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "аргумент макроса \"%s\" був би перетворений на рядок у традиційній мові C"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "некоректний типу хешу %d у cpp_macro_definition"
diff --git a/libcpp/po/vi.po b/libcpp/po/vi.po
index ea4d0a15c47..1ba46f80548 100644
--- a/libcpp/po/vi.po
+++ b/libcpp/po/vi.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: cpplib 6.1-b20160131\n"
+"Project-Id-Version: cpplib 6.1.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
-"PO-Revision-Date: 2016-02-03 07:24+0700\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
+"PO-Revision-Date: 2016-04-28 07:51+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -91,7 +91,7 @@ msgstr "ký tự toàn cầu %.*s không hợp lệ trong một định danh"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "ký tự toàn cầu %.*s không hợp lệ tại đầu của một định danh"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "đang chuyển đổi UCN sang bộ ký tự nguồn"
@@ -150,7 +150,7 @@ msgstr "hằng ký tự đa ký tự"
msgid "empty character constant"
msgstr "hằng ký tự trống"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "gặp lỗi nghiêm trong khi chuyển đổi %s sang %s"
@@ -274,139 +274,144 @@ msgstr "“%s” không phải là tên tập tin hợp lệ"
msgid "\"%s\" after # is not a positive integer"
msgstr "“%s” nằm sau “#” không phải là số nguyên dương"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr "tập tin linemarker \"%s\" bị bỏ qua bởi vì lồng nhau không đúng"
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "chỉ thị #%s không hợp lệ"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "việc đăng ký các lệnh mã nguồn điều khiển trình biên dịch (pragma) trong miền tên “%s” sai mở rộng tên "
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "việc đăng ký lệnh mã nguồn điều khiển trình biên dịch (pragma) “%s” có mở rộng tên nhưng không có miền tên"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "đang đăng ký “%s” là cả lệnh nguồn điều khiển trình biện dịch (pragma), lẫn miền tên của lệnh nguồn điều khiển trình biên dịch."
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "“#pragma %s %s” đã được đăng ký"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "“#pragma %s” đã được đăng ký"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "việc đăng ký lệnh mã nguồn điều khiển trình biên dịch (pragma) có bộ quản lý vô giá trị (NULL)"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "Có “#pragma” một lần trong tập tin chính"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "gặp chỉ thị #pragma push_macro sai"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "gặp chỉ thị #pragma pop_macro sai"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "gặp chỉ thị vô hiệu hóa (poison) GCC “#pragma” không hợp lệ"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "đang vô hiệu hóa vĩ lệnh tồn tại “%s”"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "“#pragma system_header” (đầu trang hệ thống) bị bỏ qua ở ngoài tập tin bao gồm"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "không tìm thấy tập tin nguồn %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "tập tin hiện thời là cũ hơn %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "gặp chỉ thị \"#pragma GCC %s\" không hợp lệ"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "“_Pragma” nhận một hằng chuỗi được đặt trong ngoặc đơn"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else (nếu không) mà không có #if (nếu)"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else (nếu không) nằm sau #else"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "điều kiện đã bắt đầu ở đây"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif (nếu không thì nếu) không có #if (nếu)"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif (nếu không thì nếu) nằm sau #else (nếu không)"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif (nếu không đúng) không có #if (nếu)"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "thiếu “(” nằm sau vị ngữ"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "thiếu “)” để hoàn tất câu trả lời"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "vị ngữ chứa trả lời trống"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "sự khẳng định không có vị ngữ"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "vị ngữ phải là định danh"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "“%s” được khẳng định lại"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "#%s chưa chấm dứt"
@@ -415,12 +420,12 @@ msgstr "#%s chưa chấm dứt"
msgid "unterminated comment"
msgstr "gặp chú thích chưa được chấm dứt"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "thiết bị xuất chuẩn"
@@ -433,8 +438,8 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "gặp tiền tố không hợp lệ “0b” cho hằng dấu chấm động"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
-msgstr "dùng hằng dấu chấm động thập lục C++11"
+msgid "use of C++1z hexadecimal floating constant"
+msgstr "dùng hằng dấu chấm động thập lục C++1z"
#: expr.c:558
msgid "use of C99 hexadecimal floating constant"
@@ -778,153 +783,153 @@ msgstr "gặp chú thích đa dòng"
msgid "unspellable token %s"
msgstr "gặp thẻ bài không thể chính tả %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "vĩ lệnh “%s” không được dùng"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "vĩ lệnh dựng-sẵn không hợp lệ “%s”"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "vĩ lệnh \"%s\" có thể ngăn cản việc dịch tái sinh"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "không thể xác định nhãn giờ của tập tin"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "không thể phân giải ngày và giờ"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ đã mở rộng bên trong chỉ thị với “-fdirectives-only”"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "chuỗi văn học không hợp lệ nên bỏ qua “\\” cuối cùng"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "việc dán “%s” và “%s” không đưa ra thẻ bài tiền xử lý hợp lệ"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 cần ít nhất một đối số cho \"...\" còn lại trong vĩ lệnh biến thiên"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 cần ít nhất một đối số cho \"...\" còn lại trong vĩ lệnh biến thiên"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "vĩ lệnh “%s” cần đến %u đối số, nhưng chỉ đưa ra %u thôi"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "vĩ lệnh “%s” đã chuyển %u đối số, nhưng chỉ nhận được %u thôi"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "danh sách đối số không được chấm dứt có gọi vĩ lệnh “%s”"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "vĩ lệnh giống hàm số “%s” phải được dùng với đối số trong ngôn ngữ C truyền thống"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "đang gọi vĩ lệnh %s đối số %d: đối số vĩ lệnh trống rỗng là không hợp lệ trong ISO C++98 "
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "đang gọi vĩ lệnh %s đối số %d: đối số vĩ lệnh trống rỗng là không hợp lệ trong ISO C90"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "tham số vĩ lệnh trùng lặp “%s”"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "không cho phép “%s” xuất hiện trong danh sách tham số vĩ lệnh"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "các tham số bộ đối số phải được ngăn cách bởi dấu phẩy"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "thiếu tên tham số"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "vĩ lệnh biến thiên vô danh đã được giới thiệu trong C++11"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "vĩ lệnh biến thiên vô danh đã được giới thiệu trong C99"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ không cho phép vĩ lệnh biến thiên có tên"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C không cho phép vĩ lệnh biến thiên có tên"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "thiếu “)” trong danh sách tham số bộ đối số"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "không cho phép “##” nằm hoặc trước hoặc sau sự mở rộng vĩ lệnh"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 cần đến khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 cần đến khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "thiếu khoảng trắng nằm sau tên vĩ lệnh"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "“#” không cho phép đi theo sau một tham số vĩ lệnh"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "“%s” bị định nghĩa lại"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "đây là vị trí của lời định nghĩa trước"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "đối số vĩ lệnh “%s” nên được chuyển đổi thành chuỗi trong ngôn ngữ C truyền thống"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "gặp kiểu băm không hợp lệ %d trong “cpp_macro_definition” (lời định nghĩa vĩ lệnh)"
diff --git a/libcpp/po/zh_CN.po b/libcpp/po/zh_CN.po
index 0abe9aa5d6a..e0d938c8763 100644
--- a/libcpp/po/zh_CN.po
+++ b/libcpp/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 4.6.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2011-05-12 17:23+0800\n"
"Last-Translator: Meng Jie <zuxy.meng@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -89,7 +89,7 @@ msgstr "Unicode 字符 %.*s 在标识符中无效"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "Unicode 字符 %.*s 在标识符开头无效"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "将 UCN 转换到源字符集"
@@ -148,7 +148,7 @@ msgstr "多字节字符常量"
msgid "empty character constant"
msgstr "空的字符常量"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "无法从 %s 转换到 %s"
@@ -274,140 +274,145 @@ msgstr "“%s”不是一个有效的文件名"
msgid "\"%s\" after # is not a positive integer"
msgstr "# 后的“%s”不是一个正整数"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "无效的 #%s 指示"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "pragma “%s”被注册为一个命名扩展,而没有命名空间"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s 已经被注册"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s 已经被注册"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "pragma 注册为被 NULL 处理"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma once 出现在主文件中"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "无效的 #pragma push_macro 指示"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "无效的 #pragma pop_macro 指示"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "无效的 #pragma GCC poison 指示"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "对已存在的宏“%s”投毒"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_heade 在包含文件外被忽略"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "找不到源文件 %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "当前文件早于 %s"
-#: directives.c:1688
+#: directives.c:1705
#, fuzzy, c-format
#| msgid "invalid #pragma GCC poison directive"
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "无效的 #pragma GCC poison 指示"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma 需要一个括起的字符串字面常量"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else 没有匹配的 #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else 出现在 #else 后"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "条件自此开始"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif 没有匹配的 #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif 出现在 #else 后"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif 没有匹配的 #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "谓词后缺少‘(’"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "完整的答案缺少‘)’"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "谓词的答案为空"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "断言后没有谓词"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "谓词必须是一个标识符"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "重断言“%s”"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "未终止的 #%s"
@@ -416,12 +421,12 @@ msgstr "未终止的 #%s"
msgid "unterminated comment"
msgstr "未结束的注释"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -436,7 +441,7 @@ msgstr "浮点常量的“0b”前缀无效"
#: expr.c:555
#, fuzzy
#| msgid "use of C99 hexadecimal floating constant"
-msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "使用 C99 式的 16 进制浮点常量"
#: expr.c:558
@@ -797,163 +802,163 @@ msgstr "多行注释"
msgid "unspellable token %s"
msgstr "无法拼出的标识符 %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "宏“%s”未被使用"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "无效的内建宏“%s”"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr ""
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "无法决定文件的时间戳"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "无法决定日期与时间"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "带 -fdirectives-only 时 __COUNTER__ 在指示中扩展"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "无效的字面字符串,忽略最后的‘\\’"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr ""
-#: macro.c:773
+#: macro.c:778
#, fuzzy
#| msgid "ISO C99 requires rest arguments to be used"
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 需要使用剩余的参数"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "宏“%s”需要 %u 个参数,但只给出了 %u 个"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "宏“%s”传递了 %u 个参数,但只需要 %u 个"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "调用宏“%s”时参数列表未终止"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用"
-#: macro.c:1813
+#: macro.c:1825
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "调用宏 %s 的参数 %d:空的宏参数未被 ISO C90 和 ISO C++98 定义"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, fuzzy, c-format
#| msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90 and ISO C++98"
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "调用宏 %s 的参数 %d:空的宏参数未被 ISO C90 和 ISO C++98 定义"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "重复的宏参数“%s”"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "“%s”不能出现在宏参数列表中"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "宏参数必须由逗号隔开"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "缺少形参名"
-#: macro.c:2890
+#: macro.c:2902
#, fuzzy
#| msgid "anonymous variadic macros were introduced in C99"
msgid "anonymous variadic macros were introduced in C++11"
msgstr "匿名可变参数宏在 C99 中被引入"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "匿名可变参数宏在 C99 中被引入"
-#: macro.c:2906
+#: macro.c:2918
#, fuzzy
#| msgid "ISO C does not permit named variadic macros"
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C 不允许有名的可变参数宏"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C 不允许有名的可变参数宏"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "在宏参数表中缺少‘)’"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "‘##’不能出现在宏展开的两端"
-#: macro.c:3007
+#: macro.c:3019
#, fuzzy
#| msgid "ISO C99 requires whitespace after the macro name"
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C99 要求宏名后必须有空白"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 要求宏名后必须有空白"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "宏名后缺少空白"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "‘#’后没有宏参数"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "“%s”重定义"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "这是先前定义的位置"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "宏参数“%s”将在传统 C 中被字符串化"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "cpp_macro_definition 中有无效的散列类型 %d"
diff --git a/libcpp/po/zh_TW.po b/libcpp/po/zh_TW.po
index 3e2b9e2c7e6..edeaf876d60 100644
--- a/libcpp/po/zh_TW.po
+++ b/libcpp/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cpplib 5.2.0\n"
"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
-"POT-Creation-Date: 2016-01-31 15:50+0000\n"
+"POT-Creation-Date: 2016-04-21 15:24+0000\n"
"PO-Revision-Date: 2015-10-08 13:27+0800\n"
"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -87,7 +87,7 @@ msgstr "萬國碼字元 %.*s 在識別字中無效"
msgid "universal character %.*s is not valid at the start of an identifier"
msgstr "萬國碼字元 %.*s 在識別字開頭無效"
-#: charset.c:1110 charset.c:1684
+#: charset.c:1110 charset.c:1691
msgid "converting UCN to source character set"
msgstr "將 UCN 轉換到來源字元集"
@@ -146,7 +146,7 @@ msgstr "多位元組字元常數"
msgid "empty character constant"
msgstr "空的字元常數"
-#: charset.c:1731
+#: charset.c:1738
#, c-format
msgid "failure to convert %s to %s"
msgstr "無法從 %s 轉換到 %s"
@@ -270,139 +270,144 @@ msgstr "「%s」不是一個有效的檔案名稱"
msgid "\"%s\" after # is not a positive integer"
msgstr "# 後的「%s」不是一個正整數"
-#: directives.c:1103 directives.c:1105 directives.c:1107 directives.c:1693
+#: directives.c:1061
+#, c-format
+msgid "file \"%s\" linemarker ignored due to incorrect nesting"
+msgstr ""
+
+#: directives.c:1120 directives.c:1122 directives.c:1124 directives.c:1710
#, c-format
msgid "%s"
msgstr "%s"
-#: directives.c:1131
+#: directives.c:1148
#, c-format
msgid "invalid #%s directive"
msgstr "無效的 #%s 指令"
-#: directives.c:1194
+#: directives.c:1211
#, c-format
msgid "registering pragmas in namespace \"%s\" with mismatched name expansion"
msgstr "以不匹配的名稱擴展去註冊命名空間「%s」中的編譯指示"
-#: directives.c:1203
+#: directives.c:1220
#, c-format
msgid "registering pragma \"%s\" with name expansion and no namespace"
msgstr "以名稱擴展以及無命名空間去註冊編譯指示「%s」"
-#: directives.c:1221
+#: directives.c:1238
#, c-format
msgid "registering \"%s\" as both a pragma and a pragma namespace"
msgstr "「%s」既被註冊為一個編譯指示又被註冊為一個編譯指示命名空間"
-#: directives.c:1224
+#: directives.c:1241
#, c-format
msgid "#pragma %s %s is already registered"
msgstr "#pragma %s %s 已經被註冊"
-#: directives.c:1227
+#: directives.c:1244
#, c-format
msgid "#pragma %s is already registered"
msgstr "#pragma %s 已經被註冊"
-#: directives.c:1257
+#: directives.c:1274
msgid "registering pragma with NULL handler"
msgstr "以空值處理常式去註冊編譯指示"
-#: directives.c:1474
+#: directives.c:1491
msgid "#pragma once in main file"
msgstr "#pragma 出現在主檔案中一次"
-#: directives.c:1497
+#: directives.c:1514
msgid "invalid #pragma push_macro directive"
msgstr "無效的 #pragma push_macro 指令"
-#: directives.c:1552
+#: directives.c:1569
msgid "invalid #pragma pop_macro directive"
msgstr "無效的 #pragma pop_macro 指令"
-#: directives.c:1607
+#: directives.c:1624
msgid "invalid #pragma GCC poison directive"
msgstr "無效的 #pragma GCC poison 指令"
-#: directives.c:1616
+#: directives.c:1633
#, c-format
msgid "poisoning existing macro \"%s\""
msgstr "對已存在的巨集「%s」加料"
-#: directives.c:1635
+#: directives.c:1652
msgid "#pragma system_header ignored outside include file"
msgstr "#pragma system_header 在包含檔案外被忽略"
-#: directives.c:1660
+#: directives.c:1677
#, c-format
msgid "cannot find source file %s"
msgstr "找不到來源檔案 %s"
-#: directives.c:1664
+#: directives.c:1681
#, c-format
msgid "current file is older than %s"
msgstr "目前檔案早於 %s"
-#: directives.c:1688
+#: directives.c:1705
#, c-format
msgid "invalid \"#pragma GCC %s\" directive"
msgstr "無效的 #pragma GCC %s 指令"
-#: directives.c:1889
+#: directives.c:1906
msgid "_Pragma takes a parenthesized string literal"
msgstr "_Pragma 需要一個括起的字串原文"
-#: directives.c:2010
+#: directives.c:2027
msgid "#else without #if"
msgstr "#else 沒有匹配的 #if"
-#: directives.c:2015
+#: directives.c:2032
msgid "#else after #else"
msgstr "#else 出現在 #else 後"
-#: directives.c:2017 directives.c:2050
+#: directives.c:2034 directives.c:2067
msgid "the conditional began here"
msgstr "條件自此開始"
-#: directives.c:2043
+#: directives.c:2060
msgid "#elif without #if"
msgstr "#elif 沒有匹配的 #if"
-#: directives.c:2048
+#: directives.c:2065
msgid "#elif after #else"
msgstr "#elif 出現在 #else 後"
-#: directives.c:2079
+#: directives.c:2096
msgid "#endif without #if"
msgstr "#endif 沒有匹配的 #if"
-#: directives.c:2159
+#: directives.c:2176
msgid "missing '(' after predicate"
msgstr "述語後缺少「(」"
-#: directives.c:2174
+#: directives.c:2191
msgid "missing ')' to complete answer"
msgstr "完整的答案缺少「)」"
-#: directives.c:2194
+#: directives.c:2211
msgid "predicate's answer is empty"
msgstr "述語的答案為空"
-#: directives.c:2221
+#: directives.c:2238
msgid "assertion without predicate"
msgstr "判定語後沒有述語"
-#: directives.c:2224
+#: directives.c:2241
msgid "predicate must be an identifier"
msgstr "述語必須是一個識別字"
-#: directives.c:2310
+#: directives.c:2327
#, c-format
msgid "\"%s\" re-asserted"
msgstr "已再判定「%s」"
-#: directives.c:2602
+#: directives.c:2619
#, c-format
msgid "unterminated #%s"
msgstr "未終止的 #%s"
@@ -411,12 +416,12 @@ msgstr "未終止的 #%s"
msgid "unterminated comment"
msgstr "未終結的註釋"
-#: errors.c:233 errors.c:246
+#: errors.c:234 errors.c:247
#, c-format
msgid "%s: %s"
msgstr "%s:%s"
-#: errors.c:244
+#: errors.c:245
msgid "stdout"
msgstr "stdout"
@@ -429,7 +434,9 @@ msgid "invalid prefix \"0b\" for floating constant"
msgstr "無效的浮點常數前綴「0b」"
#: expr.c:555
-msgid "use of C++11 hexadecimal floating constant"
+#, fuzzy
+#| msgid "use of C++11 hexadecimal floating constant"
+msgid "use of C++1z hexadecimal floating constant"
msgstr "使用 C++11 式的十六進位浮點常數"
#: expr.c:558
@@ -776,153 +783,153 @@ msgstr "多列註釋"
msgid "unspellable token %s"
msgstr "無法拼出的識別字 %s"
-#: macro.c:202
+#: macro.c:203
#, c-format
msgid "macro \"%s\" is not used"
msgstr "巨集「%s」未被使用"
-#: macro.c:240 macro.c:472
+#: macro.c:242 macro.c:477
#, c-format
msgid "invalid built-in macro \"%s\""
msgstr "無效的內建巨集「%s」"
-#: macro.c:247 macro.c:344
+#: macro.c:249 macro.c:349
#, c-format
msgid "macro \"%s\" might prevent reproducible builds"
msgstr "巨集「%s」也許會阻止可重製的組建"
-#: macro.c:278
+#: macro.c:280
msgid "could not determine file timestamp"
msgstr "無法決定檔案時間戳記"
-#: macro.c:379
+#: macro.c:384
msgid "could not determine date and time"
msgstr "無法決定日期與時間"
-#: macro.c:395
+#: macro.c:400
msgid "__COUNTER__ expanded inside directive with -fdirectives-only"
msgstr "__COUNTER__ 以 -fdirectives-only 在指令內部展開"
-#: macro.c:583
+#: macro.c:588
msgid "invalid string literal, ignoring final '\\'"
msgstr "無效的原文字串,忽略最後的「\\」"
-#: macro.c:645
+#: macro.c:650
#, c-format
msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token"
msgstr "粘貼「%s」和「%s」不能給出一個有效的預先處理識別字"
-#: macro.c:769
+#: macro.c:774
msgid "ISO C++11 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C++11 需要至少一個引數做為可變巨集中的「...」"
-#: macro.c:773
+#: macro.c:778
msgid "ISO C99 requires at least one argument for the \"...\" in a variadic macro"
msgstr "ISO C99 需要至少一個引數做為可變巨集中的「...」"
-#: macro.c:780
+#: macro.c:785
#, c-format
msgid "macro \"%s\" requires %u arguments, but only %u given"
msgstr "巨集「%s」需要 %u 個引數,但只給出了 %u 個"
-#: macro.c:785
+#: macro.c:790
#, c-format
msgid "macro \"%s\" passed %u arguments, but takes just %u"
msgstr "巨集「%s」傳遞了 %u 個引數,但只需要 %u 個"
-#: macro.c:979 traditional.c:819
+#: macro.c:984 traditional.c:819
#, c-format
msgid "unterminated argument list invoking macro \"%s\""
msgstr "呼叫巨集「%s」時引數清單未終止"
-#: macro.c:1130
+#: macro.c:1135
#, c-format
msgid "function-like macro \"%s\" must be used with arguments in traditional C"
msgstr "類似函式的巨集「%s」在傳統 C 中必須與引數一起使用"
-#: macro.c:1813
+#: macro.c:1825
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C++98"
msgstr "調用巨集 %s 引數 %d:空的巨集引數在 ISO C++98 中未定義"
-#: macro.c:1821 macro.c:1830
+#: macro.c:1833 macro.c:1842
#, c-format
msgid "invoking macro %s argument %d: empty macro arguments are undefined in ISO C90"
msgstr "調用巨集 %s 引數 %d:空的巨集引數在 ISO C90 中未定義"
-#: macro.c:2794
+#: macro.c:2806
#, c-format
msgid "duplicate macro parameter \"%s\""
msgstr "重複的巨集參數「%s」"
-#: macro.c:2843
+#: macro.c:2855
#, c-format
msgid "\"%s\" may not appear in macro parameter list"
msgstr "「%s」不能出現在巨集參數清單中"
-#: macro.c:2851
+#: macro.c:2863
msgid "macro parameters must be comma-separated"
msgstr "巨集參數必須由逗號隔開"
-#: macro.c:2869
+#: macro.c:2881
msgid "parameter name missing"
msgstr "缺少參數名"
-#: macro.c:2890
+#: macro.c:2902
msgid "anonymous variadic macros were introduced in C++11"
msgstr "匿名可變參數巨集在 C++11 中被引入"
-#: macro.c:2894 macro.c:2899
+#: macro.c:2906 macro.c:2911
msgid "anonymous variadic macros were introduced in C99"
msgstr "匿名可變參數巨集在 C99 中被引入"
-#: macro.c:2906
+#: macro.c:2918
msgid "ISO C++ does not permit named variadic macros"
msgstr "ISO C++ 不允許具名的可變參數巨集"
-#: macro.c:2909
+#: macro.c:2921
msgid "ISO C does not permit named variadic macros"
msgstr "ISO C 不允許具名的可變參數巨集"
-#: macro.c:2919
+#: macro.c:2931
msgid "missing ')' in macro parameter list"
msgstr "在巨集參數表中缺少「)」"
-#: macro.c:2970
+#: macro.c:2982
msgid "'##' cannot appear at either end of a macro expansion"
msgstr "「##」不能出現在巨集展開的兩端"
-#: macro.c:3007
+#: macro.c:3019
msgid "ISO C++11 requires whitespace after the macro name"
msgstr "ISO C++11 要求巨集名後必須有空白"
-#: macro.c:3010
+#: macro.c:3022
msgid "ISO C99 requires whitespace after the macro name"
msgstr "ISO C99 要求巨集名後必須有空白"
-#: macro.c:3035
+#: macro.c:3047
msgid "missing whitespace after the macro name"
msgstr "巨集名後缺少空白"
-#: macro.c:3069
+#: macro.c:3081
msgid "'#' is not followed by a macro parameter"
msgstr "「#」後沒有巨集參數"
-#: macro.c:3230
+#: macro.c:3242
#, c-format
msgid "\"%s\" redefined"
msgstr "「%s」重定義"
-#: macro.c:3235
+#: macro.c:3247
msgid "this is the location of the previous definition"
msgstr "這是先前定義的位置"
-#: macro.c:3296
+#: macro.c:3308
#, c-format
msgid "macro argument \"%s\" would be stringified in traditional C"
msgstr "巨集引數「%s」將在傳統 C 中被字串化"
-#: macro.c:3323
+#: macro.c:3344
#, c-format
msgid "invalid hash type %d in cpp_macro_definition"
msgstr "cpp_macro_definition 中有無效的雜湊類型 %d"