summaryrefslogtreecommitdiff
path: root/libcpp/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'libcpp/po/zh_CN.po')
-rw-r--r--libcpp/po/zh_CN.po147
1 files changed, 76 insertions, 71 deletions
diff --git a/libcpp/po/zh_CN.po b/libcpp/po/zh_CN.po
index 0abe9aa5d6..e0d938c876 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"