aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog4
-rw-r--r--bfd/po/zh_CN.po111
-rw-r--r--binutils/ChangeLog4
-rw-r--r--binutils/po/zh_CN.po147
-rw-r--r--gold/ChangeLog4
-rw-r--r--gold/po/zh_CN.po161
6 files changed, 215 insertions, 216 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b63811b..d70dd88 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-28 Nick Clifton <nickc@redhat.com>
+
+ * po/zh_CN.po: Updated Chinese (simplified) translation.
+
2016-04-27 H.J. Lu <hongjiu.lu@intel.com>
PR ld/20006
diff --git a/bfd/po/zh_CN.po b/bfd/po/zh_CN.po
index c7ffde1..92e159a 100644
--- a/bfd/po/zh_CN.po
+++ b/bfd/po/zh_CN.po
@@ -10,14 +10,14 @@ msgstr ""
"Project-Id-Version: bfd 2.24.90\n"
"Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
"POT-Creation-Date: 2014-02-10 09:42+1030\n"
-"PO-Revision-Date: 2015-10-30 00:11-0400\n"
+"PO-Revision-Date: 2015-11-21 03:22-0500\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: aout-adobe.c:127
@@ -28,7 +28,7 @@ msgstr "%s:a.out.adobe 文件中节的类型未知:%x\n"
#: aout-cris.c:200
#, c-format
msgid "%s: Invalid relocation type exported: %d"
-msgstr "%s:导出无效的重定位类型:%d"
+msgstr "%s:导出了无效的重定位类型:%d"
#: aout-cris.c:243
#, fuzzy
@@ -133,11 +133,11 @@ msgstr "不可识别的文件格式"
#: bfd.c:424
msgid "File format is ambiguous"
-msgstr "二义性的文件格式"
+msgstr "存有歧义的文件格式"
#: bfd.c:425
msgid "Section has no contents"
-msgstr "节没有内容"
+msgstr "节不含内容"
#: bfd.c:426
msgid "Nonrepresentable section on output"
@@ -166,7 +166,7 @@ msgstr "读取%s 时出错"
#: bfd.c:432
msgid "#<Invalid error code>"
-msgstr "#<无效的错误码>"
+msgstr "#<无效错误码>"
#: bfd.c:1046
#, c-format
@@ -1070,15 +1070,11 @@ msgstr "字符值超出可接受的范围以外"
#: elf32-arm.c:10670 elf32-nios2.c:3525 elf32-tic6x.c:2740
#: /src/binutils-gdb/bfd/elfnn-aarch64.c:4485
-#, fuzzy
msgid "unsupported relocation"
-msgstr ""
-"\n"
-"重定位节 "
+msgstr "不支持的重定位"
#: elf32-arm.c:10678 elf32-nios2.c:3535 elf32-tic6x.c:2748
#: /src/binutils-gdb/bfd/elfnn-aarch64.c:4493
-#, fuzzy
msgid "unknown error"
msgstr "未知错误"
@@ -1763,22 +1759,18 @@ msgid "%B: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
msgstr ""
#: elf32-i386.c:3610 elf64-x86-64.c:3777
-#, fuzzy
msgid "hidden symbol"
-msgstr "无符号"
+msgstr "隐藏符号"
#: elf32-i386.c:3613 elf64-x86-64.c:3780
-#, fuzzy
msgid "internal symbol"
-msgstr "<内部数据>"
+msgstr "内部符号"
#: elf32-i386.c:3616 elf64-x86-64.c:3783
-#, fuzzy
msgid "protected symbol"
-msgstr "无符号"
+msgstr "受保护符号"
#: elf32-i386.c:3619 elf64-x86-64.c:3786
-#, fuzzy
msgid "symbol"
msgstr "符号"
@@ -1866,9 +1858,9 @@ msgid ": m32rx instructions"
msgstr ":m32rx 指令"
#: elf32-m32r.c:3557
-#, fuzzy, c-format
+#, c-format
msgid ": m32r2 instructions"
-msgstr "为 m32r2 编译"
+msgstr ": m32r2 指令"
#: elf32-m68hc1x.c:1114
#, c-format
@@ -1913,49 +1905,49 @@ msgid "%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"
msgstr ""
#: elf32-m68hc1x.c:1430 elf32-xgate.c:677
-#, fuzzy, c-format
+#, c-format
msgid "[abi=32-bit int, "
-msgstr "使用 32 位 ABI"
+msgstr "[abi=32-bit int, "
#: elf32-m68hc1x.c:1432 elf32-xgate.c:679
-#, fuzzy, c-format
+#, c-format
msgid "[abi=16-bit int, "
-msgstr "指定一个 ABI"
+msgstr "[abi=16-bit int, "
#: elf32-m68hc1x.c:1435 elf32-xgate.c:682
-#, fuzzy, c-format
+#, c-format
msgid "64-bit double, "
-msgstr "使用 64 位 long double"
+msgstr "64-bit double, "
#: elf32-m68hc1x.c:1437 elf32-xgate.c:684
-#, fuzzy, c-format
+#, c-format
msgid "32-bit double, "
-msgstr "指针是 32 位"
+msgstr "32-bit double, "
#: elf32-m68hc1x.c:1440
-#, fuzzy, c-format
+#, c-format
msgid "cpu=HC11]"
-msgstr ",不明 CPU"
+msgstr "cpu=HC11]"
#: elf32-m68hc1x.c:1442
-#, fuzzy, c-format
+#, c-format
msgid "cpu=HCS12]"
-msgstr ",不明 CPU"
+msgstr "cpu=HCS12]"
#: elf32-m68hc1x.c:1444
-#, fuzzy, c-format
+#, c-format
msgid "cpu=HC12]"
-msgstr ",不明 CPU"
+msgstr "cpu=HC12]"
#: elf32-m68hc1x.c:1447
-#, fuzzy, c-format
+#, c-format
msgid " [memory=bank-model]"
-msgstr "内存\n"
+msgstr " [memory=bank-model]"
#: elf32-m68hc1x.c:1449
-#, fuzzy, c-format
+#, c-format
msgid " [memory=flat]"
-msgstr "内存\n"
+msgstr " [memory=flat]"
#: elf32-m68hc1x.c:1452
#, fuzzy, c-format
@@ -2877,14 +2869,14 @@ msgid "private flags = %lx: "
msgstr "私有标志 = %lx:"
#: elf32-v850.c:2558
-#, fuzzy, c-format
+#, c-format
msgid "unknown v850 architecture"
-msgstr "未知的体系结构 %s"
+msgstr "未知的 v850 体系结构"
#: elf32-v850.c:2560
-#, fuzzy, c-format
+#, c-format
msgid "v850 E3 architecture"
-msgstr "为 v850 处理器编译"
+msgstr "v850 e3 体系结构"
#: elf32-v850.c:2562 elf32-v850.c:2572
#, c-format
@@ -2902,24 +2894,24 @@ msgid "v850e architecture"
msgstr "v850e 体系结构"
#: elf32-v850.c:2574
-#, fuzzy, c-format
+#, c-format
msgid "v850e1 architecture"
-msgstr "为 v850e1 处理器编译"
+msgstr "v850e1 体系结构"
#: elf32-v850.c:2575
-#, fuzzy, c-format
+#, c-format
msgid "v850e2 architecture"
-msgstr "为 v850e2 处理器编译"
+msgstr "v850e2 体系结构"
#: elf32-v850.c:2576
-#, fuzzy, c-format
+#, c-format
msgid "v850e2v3 architecture"
-msgstr "为 v850e2v3 处理器编译"
+msgstr "v850e2v3 体系结构"
#: elf32-v850.c:2577
-#, fuzzy, c-format
+#, c-format
msgid "v850e3v5 architecture"
-msgstr "ESA/390 结构"
+msgstr "v850e3v5 体系结构"
#: elf32-vax.c:532
#, c-format
@@ -2927,14 +2919,14 @@ msgid " [nonpic]"
msgstr ""
#: elf32-vax.c:535
-#, fuzzy, c-format
+#, c-format
msgid " [d-float]"
-msgstr "<无名浮点数:"
+msgstr ""
#: elf32-vax.c:538
-#, fuzzy, c-format
+#, c-format
msgid " [g-float]"
-msgstr "<无名浮点数:"
+msgstr ""
#: elf32-vax.c:656
#, c-format
@@ -5989,9 +5981,8 @@ msgid "GALAXY "
msgstr ""
#: vms-alpha.c:7384
-#, fuzzy
msgid "*unknown* "
-msgstr "<未知>"
+msgstr "*未知* "
#: vms-alpha.c:7387
#, fuzzy, c-format
@@ -6034,9 +6025,9 @@ msgid " Shared image : 0x%08x 0x%08x\n"
msgstr "回溯到 %-24.24s (0x%08x)\n"
#: vms-alpha.c:7428
-#, fuzzy, c-format
+#, c-format
msgid "cannot read EIHI\n"
-msgstr "无法读入头"
+msgstr "无法读入 EIHI\n"
#: vms-alpha.c:7431
#, c-format
@@ -6119,7 +6110,6 @@ msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
msgstr ""
#: vms-alpha.c:7546
-#, fuzzy
msgid "NORMAL"
msgstr "一般"
@@ -6480,9 +6470,8 @@ msgid "Delay Import Directory"
msgstr "延迟导入目录"
#: peigen.c:1050 pepigen.c:1050 pex64igen.c:1050
-#, fuzzy
msgid "CLR Runtime Header"
-msgstr "运行时名称。"
+msgstr "CLR 运行时标头"
#: peigen.c:1051 pepigen.c:1051 pex64igen.c:1051
msgid "Reserved"
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index fc495cc..7a19cc7 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,9 @@
2016-04-28 Nick Clifton <nickc@redhat.com>
+ * po/zh_CN.po: Updated Chinese (simplified) translation.
+
+2016-04-28 Nick Clifton <nickc@redhat.com>
+
PR target/19722
* testsuite/binutils-all/aarch64/illegal.s: New test.
* testsuite/binutils-all/aarch64/illegal.d: New test driver.
diff --git a/binutils/po/zh_CN.po b/binutils/po/zh_CN.po
index 25086e8..216a7de 100644
--- a/binutils/po/zh_CN.po
+++ b/binutils/po/zh_CN.po
@@ -3,21 +3,21 @@
# This file is distributed under the same license as the binutils package.
# Wang Li <charles@linux.net.cn>, 2003.
# Wei-Lun Chao <bluebat@member.fsf.org>, 2005, 2013.
-# Mingye Wang <arthur200126@gmail.com>, 2015.
+# Mingye Wang <arthur200126@gmail.com>, 2015, 2016.
#
msgid ""
msgstr ""
"Project-Id-Version: binutils 2.24.90\n"
"Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
"POT-Creation-Date: 2014-02-10 09:42+1030\n"
-"PO-Revision-Date: 2015-10-29 23:56-0400\n"
+"PO-Revision-Date: 2016-04-27 20:35-0400\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.7\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: addr2line.c:81
@@ -362,7 +362,7 @@ msgstr "“u”只在使用“r”选项的时候才有意义。"
#: ar.c:767
msgid "`u' is not meaningful with the `D' option."
-msgstr " “u” 在使用 “D” 选项的时候没有意义。"
+msgstr "“u”在使用“D”选项的时候没有意义。"
#: ar.c:770
msgid "`u' modifier ignored since `D' is the default (see `U')"
@@ -1116,9 +1116,9 @@ msgid " -y --output-delaylib <outname> Create a delay-import library.\n"
msgstr " -y --output-delaylib <outname> 生成延迟导入库。\n"
#: dlltool.c:3933
-#, fuzzy, c-format
+#, c-format
msgid " -a --add-indirect Add dll indirects to export file.\n"
-msgstr " -a --add-indirect 间接添加 dll 至导出文件。\n"
+msgstr " -a --add-indirect 添加 dll 间接至导出文件。\n"
#: dlltool.c:3934
#, c-format
@@ -1232,9 +1232,9 @@ msgid " -n --no-delete Keep temp files (repeat for extra preservati
msgstr " -n --no-delete 保留临时文件 (重复以保留更多)。\n"
#: dlltool.c:3956
-#, fuzzy, c-format
+#, c-format
msgid " -t --temp-prefix <prefix> Use <prefix> to construct temp file names.\n"
-msgstr " -t --temp-prefix <前置> 使用 <前置> 来建构临时文件名称。\n"
+msgstr " -t --temp-prefix <前缀> 使用 <前缀> 来构造临时文件名称。\n"
#: dlltool.c:3957
#, c-format
@@ -1442,9 +1442,9 @@ msgid " --output-lib <outname> Generate input library.\n"
msgstr " --output-lib <outname> 生成输入库。\n"
#: dllwrap.c:497
-#, fuzzy, c-format
+#, c-format
msgid " --add-indirect Add dll indirects to export file.\n"
-msgstr " --add-indirect 间接添加 dll 至导出文件。\n"
+msgstr " --add-indirect 添加 dll 间接至导出文件。\n"
#: dllwrap.c:498
#, c-format
@@ -1805,9 +1805,9 @@ msgid " (Unknown inline attribute value: %s)"
msgstr " (未知的内嵌属性值:%s)"
#: dwarf.c:1869
-#, fuzzy, c-format
+#, c-format
msgid "(implementation defined: %s)"
-msgstr "未实现"
+msgstr "(实现决定:%s)"
#: dwarf.c:1872
#, c-format
@@ -1956,24 +1956,24 @@ msgid " Type Offset: 0x%s\n"
msgstr " 类型偏移量: 0x%s\n"
#: dwarf.c:2333
-#, fuzzy, c-format
+#, c-format
msgid " Section contributions:\n"
-msgstr "区域"
+msgstr " 区段贡献:\n"
#: dwarf.c:2334
-#, fuzzy, c-format
+#, c-format
msgid " .debug_abbrev.dwo: 0x%s 0x%s\n"
-msgstr "设置地址为 0x%s\n"
+msgstr " .debug_abbrev.dwo: 0x%s 0x%s\n"
#: dwarf.c:2337
-#, fuzzy, c-format
+#, c-format
msgid " .debug_line.dwo: 0x%s 0x%s\n"
-msgstr "设置地址为 0x%s\n"
+msgstr " .debug_line.dwo: 0x%s 0x%s\n"
#: dwarf.c:2340
-#, fuzzy, c-format
+#, c-format
msgid " .debug_loc.dwo: 0x%s 0x%s\n"
-msgstr "设置地址为 0x%s\n"
+msgstr " .debug_loc.dwo: 0x%s 0x%s\n"
#: dwarf.c:2343
#, c-format
@@ -2078,7 +2078,7 @@ msgstr " 每个指令中最大操作码数: %d\n"
#: dwarf.c:2734
#, c-format
msgid " Initial value of 'is_stmt': %d\n"
-msgstr " “is_stmt”的初始值: %d\n"
+msgstr " “is_stmt”的初始值: %d\n"
#: dwarf.c:2735
#, c-format
@@ -2524,14 +2524,14 @@ msgid " Unknown macro opcode %02x seen\n"
msgstr ""
#: dwarf.c:4049
-#, fuzzy, c-format
+#, c-format
msgid " DW_MACRO_GNU_%02x\n"
-msgstr " DW_MACINFO_end_file\n"
+msgstr " DW_MACRO_GNU_%02x\n"
#: dwarf.c:4052
-#, fuzzy, c-format
+#, c-format
msgid " DW_MACRO_GNU_%02x -"
-msgstr " DW_MACINFO_end_file\n"
+msgstr " DW_MACRO_GNU_%02x -"
#: dwarf.c:4100
#, fuzzy, c-format
@@ -2680,13 +2680,13 @@ msgstr ""
" 地址 长度\n"
#: dwarf.c:4677
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
" Address Length\n"
msgstr ""
"\n"
-" 地址 长度\n"
+" 地址 长度\n"
#: dwarf.c:4760
#, c-format
@@ -2776,9 +2776,9 @@ msgid "Version %ld\n"
msgstr "版本 %ld\n"
#: dwarf.c:6087
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported version %lu.\n"
-msgstr " 不支持的版本\n"
+msgstr "不支持的版本 %lu。\n"
#: dwarf.c:6091
msgid "The address table data in version 3 may be wrong.\n"
@@ -3150,7 +3150,7 @@ msgstr "%s:文件过大"
#: elfedit.c:454 readelf.c:14603
#, fuzzy, c-format
msgid "Could not locate '%s'. System error message: %s\n"
-msgstr "无法找到 “%s” 的位置。错误消息为:%s\n"
+msgstr "无法找到“%s”的位置。错误消息为:%s\n"
#: elfedit.c:461 readelf.c:14610
#, fuzzy, c-format
@@ -3401,9 +3401,8 @@ msgid "C++ static virtual method"
msgstr "C++ 静态虚拟方法"
#: ieee.c:3108
-#, fuzzy
msgid "unrecognized C++ object overhead spec"
-msgstr "无法识别的 C++ 对象规范"
+msgstr "无法识别的 C++ 对象开销规范"
#: ieee.c:3147
msgid "undefined C++ vtable"
@@ -3710,14 +3709,14 @@ msgstr ""
" -A, --print-file-name 在每个符号前打印输入文件名\n"
" -B 于 --format=bsd 相同\n"
" -C, --demangle[=STYLE] 将底层符号名解码为用户级名称\n"
-" 如果给出 STYLE,STYLE 可能为“auto” (默认)、\n"
-" “gnu”、“lucid”、“arm”、“hp”、“edg”或“gnu-new-abi”\n"
+" 如果给出 STYLE,STYLE 可能为“auto”(默认)、\n"
+" “gnu”、“lucid”、“arm”、“hp”、“edg”或“gnu-new-abi”\n"
" --no-demangle 不要解码底层符号名\n"
" -D, --dynamic 显示动态符号而不是普通符号\n"
" --defined-only 只显示已定义的符号\n"
" -e (忽略)\n"
" -f, --format=FORMAT 使用输出格式 FORMAT。FORMAT 可能是“bsd”、\n"
-" “sysv”或“posix”。默认为“bsd”\n"
+" “sysv”或“posix”。默认为“bsd”\n"
" -g, --extern-only 只显示外部符号\n"
" -l, --line-numbers 使用调试信息以便为每个符号寻找文件名和行号\n"
" -n, --numeric-sort 按地址排序符号\n"
@@ -4364,9 +4363,8 @@ msgid "error in private header data"
msgstr "读取软件包头部错误\n"
#: objcopy.c:2706
-#, fuzzy
msgid "failed to create output section"
-msgstr " -n, --no-output 不创建输出文件\n"
+msgstr "未能创建输出部分"
#: objcopy.c:2720
#, fuzzy
@@ -4654,7 +4652,7 @@ msgstr ""
" -l, --line-numbers 在输出中给出行号和文件名\n"
" -C, --demangle[=STYLE] 对修饰过的 (mangled) 符号名进行解码\n"
" 如果给出了 STYLE,STYLE 可能为“auto”、“gnu”、\n"
-" “lucid”、“arm”、“hp”、“edg”或“gnu-new-abi”\n"
+" “lucid”、“arm”、“hp”、“edg”或“gnu-new-abi”\n"
" -w, --wide 以多于 80 列的宽度对输出进行格式化\n"
" -z, --disassemble-zeroes 反汇编时不要跳过为零的块\n"
" --start-address=ADDR 只有进程数据的地址 >= ADDR\n"
@@ -4832,7 +4830,7 @@ msgstr ""
#: objdump.c:2868
#, fuzzy, c-format
msgid "could not determine the type of symbol number %ld\n"
-msgstr "无法确定符号号码 “%ld” 的类型\n"
+msgstr "无法确定符号号码“%ld”的类型\n"
#: objdump.c:3206
#, c-format
@@ -4970,29 +4968,29 @@ msgid " index entry %u: type: %08x, offset: %08x\n"
msgstr ""
#: od-macho.c:772
-#, fuzzy, c-format
+#, c-format
msgid " version: %08x\n"
-msgstr "标志 0x%08x:\n"
+msgstr " 版本: %08x\n"
#: od-macho.c:773
-#, fuzzy, c-format
+#, c-format
msgid " flags: %08x\n"
-msgstr "标志 0x%08x:\n"
+msgstr " 旗标: %08x\n"
#: od-macho.c:774
-#, fuzzy, c-format
+#, c-format
msgid " hash offset: %08x\n"
-msgstr "不支持的真理哈希偏移量。\n"
+msgstr " 哈希偏移量: %08x\n"
#: od-macho.c:776
-#, fuzzy, c-format
+#, c-format
msgid " ident offset: %08x (- %08x)\n"
-msgstr "标志 0x%08x:\n"
+msgstr " 身份偏移量: %08x (- %08x)\n"
#: od-macho.c:778
-#, fuzzy, c-format
+#, c-format
msgid " identity: %s\n"
-msgstr "启用 Graphite 身份转换"
+msgstr " 身份: %s\n"
#: od-macho.c:779
#, c-format
@@ -5116,9 +5114,9 @@ msgid " time and date: 0x%08x - "
msgstr "回溯到 %-24.24s (0x%08x)\n"
#: od-xcoff.c:422
-#, fuzzy, c-format
+#, c-format
msgid "not set\n"
-msgstr "set"
+msgstr "未设置\n"
#: od-xcoff.c:429
#, fuzzy, c-format
@@ -6408,7 +6406,7 @@ msgstr " 组="
#: readelf.c:5521
#, fuzzy, c-format
msgid "Bad sh_link in group section `%s'\n"
-msgstr "在群组区段 “%s” 中不当的 sh_link\n"
+msgstr "在群组区段“%s”中不当的 sh_link\n"
#: readelf.c:5535
#, fuzzy, c-format
@@ -6418,7 +6416,7 @@ msgstr "Corrupt header in the %s section.\n"
#: readelf.c:5541 readelf.c:5552
#, fuzzy, c-format
msgid "Bad sh_info in group section `%s'\n"
-msgstr "在群组区段 “%s” 中不当的 sh_info\n"
+msgstr "在群组区段“%s”中不当的 sh_info\n"
#: readelf.c:5591
msgid "section data"
@@ -6507,7 +6505,7 @@ msgid ""
"'%s' relocation section at offset 0x%lx contains %ld bytes:\n"
msgstr ""
"\n"
-" “%s” 位于偏移量 0x%lx 的重定位区段含有 %ld 个字节:\n"
+"“%s”位于偏移量 0x%lx 的重定位区段含有 %ld 个字节:\n"
#: readelf.c:5932
#, c-format
@@ -7150,7 +7148,7 @@ msgid ""
"Symbol table '%s' contains %lu entries:\n"
msgstr ""
"\n"
-"符号表 “%s” 含有 %lu 个条目:\n"
+"符号表“%s”含有 %lu 个条目:\n"
#: readelf.c:9854
#, fuzzy, c-format
@@ -7249,7 +7247,7 @@ msgstr ""
msgid "skipping invalid relocation offset 0x%lx in section %s\n"
msgstr ""
"\n"
-" “%s” 位于偏移量 0x%lx 的重定位区段含有 %ld 个字节:\n"
+"“%s”位于偏移量 0x%lx 的重定位区段含有 %ld 个字节:\n"
#: readelf.c:10916
#, c-format
@@ -7329,7 +7327,7 @@ msgid ""
"Section '%s' has no debugging data.\n"
msgstr ""
"\n"
-" “%s” 节不含正在调试的数据。\n"
+"“%s”节不含正在调试的数据。\n"
#. There is no point in dumping the contents of a debugging section
#. which has the NOBITS type - the bits in the file will be random.
@@ -7728,15 +7726,14 @@ msgid "Address"
msgstr "住址"
#: readelf.c:13066 readelf.c:13083 readelf.c:13100
-#, fuzzy
msgid "Access"
-msgstr "没有访问权限"
+msgstr "访问"
#: readelf.c:13067 readelf.c:13084 readelf.c:13101 readelf.c:13166
#: readelf.c:13176
#, fuzzy
msgid "Initial"
-msgstr " “is_stmt”的初始值: %d\n"
+msgstr " “is_stmt”的初始值: %d\n"
#: readelf.c:13069
#, fuzzy, c-format
@@ -7816,7 +7813,7 @@ msgid ""
"Library list section '%s' contains %lu entries:\n"
msgstr ""
"\n"
-" “%s” 函数库列表区段含有 %lu 个条目:\n"
+"“%s”函数库列表区段含有 %lu 个条目:\n"
#: readelf.c:13288
msgid " Library Time Stamp Checksum Version Flags"
@@ -8249,9 +8246,8 @@ msgid " %-20s %10s\tDescription\n"
msgstr "说明"
#: readelf.c:13902
-#, fuzzy
msgid "Owner"
-msgstr "软件包内没有文件拥有者/群组记录\n"
+msgstr "所有者"
#: readelf.c:13902
#, fuzzy
@@ -8680,7 +8676,7 @@ msgstr "使用临时文件“%s”以读取预处理器输出\n"
#: resrc.c:340
#, c-format
msgid "can't popen `%s': %s"
-msgstr "无法 popen “%s”:%s"
+msgstr "无法 popen“%s”:%s"
#: resrc.c:342
#, c-format
@@ -8995,6 +8991,19 @@ msgid ""
" -h --help Display this information\n"
" -v -V --version Print the program's version number\n"
msgstr ""
+" 选项是:\n"
+" -a - --all 扫描整个文件,而非只有 data 数据节\n"
+" -f --print-file-name 在每个字符串前打印文件名\n"
+" -n --bytes=[数字] 寻找并打印任何 NUL 结尾的、至少为 <数字>(默认 4)\n"
+" -<数字> 字符长的序列\n"
+" -t --radix={o,d,x} 以 8、10 或 16 进制打印地址\n"
+" -o --radix=o 的别名\n"
+" -T --target=<BFDNAME> 指定二进制文件格式\n"
+" -e --encoding={s,S,b,l,B,L} 选择字符大小和端序:\n"
+" s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n"
+" @<文件> 从 <文件> 读取选项\n"
+" -h --help 显示此信息\n"
+" -v -V --version 打印本程序的版本号\n"
#: sysdump.c:66
msgid "*undefined*"
@@ -9130,9 +9139,9 @@ msgid "try to add a ill language."
msgstr ""
#: windmc.c:1116
-#, fuzzy, c-format
+#, c-format
msgid "unable to open file `%s' for input.\n"
-msgstr "无法打开输入文件 %s"
+msgstr "无法打开输入文件‘%s’。\n"
#: windmc.c:1124
#, fuzzy, c-format
@@ -9175,9 +9184,9 @@ msgstr "%s:支持的格式:"
#. Otherwise, we give up.
#: windres.c:639
-#, fuzzy, c-format
+#, c-format
msgid "can not determine type of file `%s'; use the -J option"
-msgstr "无法确定文件 “%s” 的类型;请使用 -J 选项"
+msgstr "无法确定文件“%s”的类型;请使用 -J 选项"
#: windres.c:651
#, c-format
@@ -9185,7 +9194,7 @@ msgid "Usage: %s [option(s)] [input-file] [output-file]\n"
msgstr "用法:%s [选项] [输入文件] [输出文件]\n"
#: windres.c:653
-#, fuzzy, c-format
+#, c-format
msgid ""
" The options are:\n"
" -i --input=<file> Name input file\n"
diff --git a/gold/ChangeLog b/gold/ChangeLog
index dfa8eef..fb27663 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-28 Nick Clifton <nickc@redhat.com>
+
+ * po/zh_CN.po: Updated Chinese (simplified) translation.
+
2016-04-15 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.in: Regenerated with automake 1.11.6.
diff --git a/gold/po/zh_CN.po b/gold/po/zh_CN.po
index f936029..6c85b17 100644
--- a/gold/po/zh_CN.po
+++ b/gold/po/zh_CN.po
@@ -10,100 +10,100 @@ msgstr ""
"Project-Id-Version: gold 2.24.90\n"
"Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
"POT-Creation-Date: 2014-02-10 09:42+1030\n"
-"PO-Revision-Date: 2015-10-30 00:09-0400\n"
+"PO-Revision-Date: 2016-02-23 15:25+0100\n"
"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.7\n"
# Warning: I am starting off, and is importing translations from other binutil family + gcc.
#: archive.cc:135
#, c-format
msgid "script or expression reference to %s"
-msgstr ""
+msgstr "指向 %s 的脚本或引用"
#: archive.cc:229
#, c-format
msgid "%s: no archive symbol table (run ranlib)"
-msgstr ""
+msgstr "%s:没有存档符号表(请运行 ranlib)"
#: archive.cc:317
#, c-format
msgid "%s: bad archive symbol table names"
-msgstr ""
+msgstr "%s:不当的存档符号表名称"
#: archive.cc:349
#, c-format
msgid "%s: malformed archive header at %zu"
-msgstr ""
+msgstr "%s:于 %zu 处的结构有误的存档标头"
#: archive.cc:369
#, c-format
msgid "%s: malformed archive header size at %zu"
-msgstr ""
+msgstr "%s:于 %zu 处的结构有误的存档标头大小"
#: archive.cc:380
#, c-format
msgid "%s: malformed archive header name at %zu"
-msgstr ""
+msgstr "%s:于 %zu 处的结构有误的存档标头名"
#: archive.cc:411
#, c-format
msgid "%s: bad extended name index at %zu"
-msgstr ""
+msgstr "%s:于 %zu 处有不当的拓展名索引"
#: archive.cc:421
#, c-format
msgid "%s: bad extended name entry at header %zu"
-msgstr ""
+msgstr "%s:于 %zu 处有不当的拓展名项"
#: archive.cc:518
#, c-format
msgid "%s: short archive header at %zu"
-msgstr ""
+msgstr "%s:于 %zu 处有短存档表头"
#: archive.cc:702
#, c-format
msgid "%s: member at %zu is not an ELF object"
-msgstr ""
+msgstr "%s:于 %zu 处的成员非 ELF 对象"
#: archive.cc:1043
#, c-format
msgid "%s: archive libraries: %u\n"
-msgstr ""
+msgstr "%s: 存档库: %u\n"
#: archive.cc:1045
#, c-format
msgid "%s: total archive members: %u\n"
-msgstr ""
+msgstr "%s: 存档成员总数: %u\n"
#: archive.cc:1047
#, c-format
msgid "%s: loaded archive members: %u\n"
-msgstr ""
+msgstr "%s: 已加载存档成员:%u\n"
#: archive.cc:1277
#, c-format
msgid "%s: lib groups: %u\n"
-msgstr ""
+msgstr "%s: 库组: %u\n"
#: archive.cc:1279
#, c-format
msgid "%s: total lib groups members: %u\n"
-msgstr ""
+msgstr "%s: 总库组成员: %u\n"
#: archive.cc:1281
#, c-format
msgid "%s: loaded lib groups members: %u\n"
-msgstr ""
+msgstr "%s: 已加载库组成员:%u\n"
#: arm-reloc-property.cc:303
#, c-format
msgid "invalid reloc %u"
-msgstr ""
+msgstr "无效重定位 %u"
#: arm-reloc-property.cc:316
msgid "reloc "
@@ -111,23 +111,24 @@ msgstr "重定位 "
#: arm-reloc-property.cc:316
msgid "unimplemented reloc "
-msgstr ""
+msgstr "未实现的重定位 "
#: arm-reloc-property.cc:319
msgid "dynamic reloc "
-msgstr ""
+msgstr "动态重定位 "
#: arm-reloc-property.cc:322
msgid "private reloc "
-msgstr ""
+msgstr "私有重定位 "
#: arm-reloc-property.cc:325
msgid "obsolete reloc "
-msgstr ""
+msgstr "过时重定位"
#: arm.cc:1074
+#, fuzzy
msgid "** ARM cantunwind"
-msgstr ""
+msgstr "** ARM 无法展开"
#: arm.cc:4037
#, c-format
@@ -221,7 +222,7 @@ msgstr ""
#: arm.cc:7293 i386.cc:168 sparc.cc:1349 tilegx.cc:182 x86_64.cc:257
msgid "** PLT"
-msgstr ""
+msgstr "** PLT"
#: arm.cc:7800 i386.cc:1685 powerpc.cc:5111 sparc.cc:2117 tilegx.cc:3123
#: tilegx.cc:3575 x86_64.cc:2169 x86_64.cc:2598
@@ -286,14 +287,14 @@ msgstr ""
#: i386.cc:3102 powerpc.cc:7562 sparc.cc:3589 sparc.cc:3780 sparc.cc:3841
#: sparc.cc:3948 tilegx.cc:4712 x86_64.cc:3486 x86_64.cc:3586 x86_64.cc:3664
#: x86_64.cc:3698
-#, fuzzy, c-format
+#, c-format
msgid "unsupported reloc %u"
-msgstr "不支持的重定位"
+msgstr "不支持的重定位 %u"
#: arm.cc:9564
-#, fuzzy, c-format
+#, c-format
msgid "%s: unexpected %s in object file"
-msgstr "%s:%d:Intel 十六进制文件中的意外字符“%s\n"
+msgstr "%s: 对象文件中未预期的 %s"
#: arm.cc:9899
#, fuzzy, c-format
@@ -609,12 +610,12 @@ msgid "** eh_frame"
msgstr ""
#: errors.cc:81 errors.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "%s: fatal error: "
-msgstr "致命错误:"
+msgstr "%s:致命错误:"
#: errors.cc:103 errors.cc:139
-#, fuzzy, c-format
+#, c-format
msgid "%s: error: "
msgstr "%s:错误:"
@@ -624,19 +625,17 @@ msgid "%s: warning: "
msgstr "%s:警告:"
#: errors.cc:179
-#, fuzzy
msgid "warning"
-msgstr "警告:"
+msgstr "警告"
#: errors.cc:184
-#, fuzzy
msgid "error"
msgstr "错误"
#: errors.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "%s: %s: undefined reference to '%s'\n"
-msgstr "%X%C:对‘%T’未定义的引用\n"
+msgstr "%s: %s: 对‘%s’未定义的引用\n"
#: errors.cc:194
#, fuzzy, c-format
@@ -649,14 +648,14 @@ msgid "%s: the vtable symbol may be undefined because the class is missing its k
msgstr ""
#: errors.cc:208
-#, fuzzy, c-format
+#, c-format
msgid "%s: "
-msgstr "%s:%m"
+msgstr "%s: "
#: expression.cc:192
-#, fuzzy, c-format
+#, c-format
msgid "undefined symbol '%s' referenced in expression"
-msgstr "%F%S:未定义的符号‘%s’在表达式中被引用\n"
+msgstr "未定义的符号‘%s’在表达式中被引用"
#: expression.cc:230
msgid "invalid reference to dot symbol outside of SECTIONS clause"
@@ -681,9 +680,8 @@ msgid "binary "
msgstr ""
#: expression.cc:450
-#, fuzzy
msgid " by zero"
-msgstr "%F%S 被零除\n"
+msgstr " 以零"
#: expression.cc:636
msgid "max applied to section relative value"
@@ -719,9 +717,9 @@ msgid "could not reopen file %s"
msgstr "无法打开响应文件 %s"
#: fileread.cc:401
-#, fuzzy, c-format
+#, c-format
msgid "%s: pread failed: %s"
-msgstr "%s:fread 失败"
+msgstr "%s:pread 失败: %s"
#: fileread.cc:415
#, c-format
@@ -734,14 +732,14 @@ msgid "%s: attempt to map %lld bytes at offset %lld exceeds size of file; the fi
msgstr ""
#: fileread.cc:678
-#, fuzzy, c-format
+#, c-format
msgid "%s: lseek failed: %s"
-msgstr "%s:检索失败:%s\n"
+msgstr "%s:lseek 失败:%s"
#: fileread.cc:684
-#, fuzzy, c-format
+#, c-format
msgid "%s: readv failed: %s"
-msgstr "%s:fread 失败"
+msgstr "%s:readv 失败: %s"
#: fileread.cc:687
#, c-format
@@ -759,9 +757,9 @@ msgid "%s: maximum bytes mapped for read at one time: %llu\n"
msgstr ""
#: fileread.cc:949
-#, fuzzy, c-format
+#, c-format
msgid "%s: stat failed: %s"
-msgstr "%s:检索失败:%s\n"
+msgstr "%s:stat 失败:%s"
#: fileread.cc:1046
#, fuzzy, c-format
@@ -2072,7 +2070,7 @@ msgstr ""
#: options.h:890
msgid "PERCENT"
-msgstr ""
+msgstr "百分比"
#: options.h:893
msgid "Call SYMBOL at load-time"
@@ -2126,7 +2124,7 @@ msgstr "将“目录”添加到库搜索路径中"
#: options.h:915 options.h:1039 options.h:1042 options.h:1046 options.h:1136
msgid "DIR"
-msgstr ""
+msgstr "目录"
#: options.h:918
msgid "Enable text section reordering for GCC section names (default)"
@@ -2151,7 +2149,7 @@ msgstr ""
#: options.h:932
msgid "OFFSET"
-msgstr ""
+msgstr "偏移量"
#: options.h:935
msgid "Set GNU linker emulation; obsolete"
@@ -2226,7 +2224,7 @@ msgstr "优化输出文件"
#: options.h:967
msgid "LEVEL"
-msgstr ""
+msgstr "等级"
#: options.h:970
#, fuzzy
@@ -2288,7 +2286,7 @@ msgstr ""
#: options.h:1000
msgid "OPTION"
-msgstr ""
+msgstr "选项"
#: options.h:1004
msgid "Use posix_fallocate to reserve space in the output file (default)."
@@ -3169,19 +3167,16 @@ msgid "COPY reloc"
msgstr ""
#: resolve.cc:864 resolve.cc:887
-#, fuzzy
msgid "command line"
-msgstr "<命令行>"
+msgstr "命令行"
#: resolve.cc:867
-#, fuzzy
msgid "linker script"
-msgstr "读取链接脚本"
+msgstr "链接器脚本"
#: resolve.cc:871
-#, fuzzy
msgid "linker defined"
-msgstr "用户定义:"
+msgstr "链接器定义的"
#: script-sections.cc:105
#, fuzzy, c-format
@@ -3197,9 +3192,8 @@ msgid "dot may not move backward"
msgstr ""
#: script-sections.cc:1019
-#, fuzzy
msgid "** expression"
-msgstr "需要表达式"
+msgstr "** 表达式"
#: script-sections.cc:1204
#, fuzzy
@@ -3486,9 +3480,9 @@ msgid "%s: symbol table entries: %zu; buckets: %zu\n"
msgstr ""
#: symtab.cc:3158
-#, fuzzy, c-format
+#, c-format
msgid "%s: symbol table entries: %zu\n"
-msgstr "%s:跳过归档符号表失败\n"
+msgstr "%s: 符号表条目数: %zu\n"
#: symtab.cc:3310
#, c-format
@@ -3496,29 +3490,26 @@ msgid "while linking %s: symbol '%s' defined in multiple places (possible ODR vi
msgstr ""
#: symtab.cc:3319 symtab.cc:3322
-#, fuzzy, c-format
+#, c-format
msgid " %s from %s\n"
-msgstr "%<%s %T%>需要模板参数"
+msgstr " %s 来自 %s\n"
#: target-reloc.h:163
-#, fuzzy
msgid "internal"
-msgstr "<内部数据>"
+msgstr "内部"
#: target-reloc.h:166
-#, fuzzy
msgid "hidden"
-msgstr "无符号"
+msgstr "已隐藏"
#: target-reloc.h:169
-#, fuzzy
msgid "protected"
-msgstr "无符号"
+msgstr "受保护"
#: target-reloc.h:174
-#, fuzzy, c-format
+#, c-format
msgid "%s symbol '%s' is not defined locally"
-msgstr "%s:.opd 节中未定义的“%s”"
+msgstr "%s 符号‘%s’未在本地定义"
#: target-reloc.h:414
#, c-format
@@ -3548,14 +3539,12 @@ msgid "requires unsupported dynamic reloc %u; recompile with -fPIC"
msgstr ""
#: tls.h:59
-#, fuzzy
msgid "TLS relocation out of range"
-msgstr "字符值超出可接受的范围以外"
+msgstr "TLS 重定位越界"
#: tls.h:73
-#, fuzzy
msgid "TLS relocation against invalid instruction"
-msgstr "GPDISP 重定位无法找到 ldah 和 lda 指令"
+msgstr "TLS 对无效指令重定位"
#. This output is intended to follow the GNU standards.
#: version.cc:66
@@ -3575,9 +3564,9 @@ msgstr ""
"这个程序完全没有任何担保。\n"
#: workqueue-threads.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "%s failed: %s"
-msgstr "打开 %s 失败:%s"
+msgstr "%s 失败:%s"
#: x86_64.cc:2222
msgid "requires dynamic R_X86_64_32 reloc which may overflow at runtime; recompile with -fPIC"
@@ -3589,11 +3578,11 @@ msgid "requires dynamic %s reloc against '%s' which may overflow at runtime; rec
msgstr ""
#: x86_64.cc:3776
-#, fuzzy, c-format
+#, c-format
msgid "unsupported reloc type %u"
-msgstr "不支持的重定位类型"
+msgstr "不支持的重定位类型 %u"
#: x86_64.cc:4211
-#, fuzzy, c-format
+#, c-format
msgid "unsupported reloc %u against local symbol"
-msgstr "不支持的重定位类型"
+msgstr "不支持对本地符号的重定位 %u"