Merge branch 'master' of git://github.com/git-l10n/git-po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 34196437b1e20469a5c54deeffc41fbf32abbaab..eabd4d1f8e398fee7fbccd54e2677d5b72ae5039 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -46,7 +46,7 @@
 #   conflict                         |  冲突
 #   core Git                         |  核心 Git 工具
 #   DAG                              |  有向无环图
-#   dangling object                  |  æ\91\87æ\91\86对象
+#   dangling object                  |  æ\82¬ç©º对象
 #   detached HEAD                    |  分离头指针
 #   directory                        |  目录
 #   dirty                            |  脏（的工作区）
@@ -438,7 +438,7 @@ msgstr "补丁应用到空文件 '%s'，但其并非空文件"
 #: apply.c:3190
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr "æ\97 æ³\95读å\8f\96 '%2$s' å¿\85é¡»的目标文件 %1$s"
+msgstr "æ\97 æ³\95读å\8f\96 '%2$s' å¿\85é\9c\80的目标文件 %1$s"
 
 #: apply.c:3203
 #, c-format
@@ -968,12 +968,12 @@ msgstr "参数不支持此格式 '%s'：-%d"
 #: archive-tar.c:125 archive-zip.c:344
 #, c-format
 msgid "cannot stream blob %s"
-msgstr "不能为数据对象 %s 打开流"
+msgstr "不能打开数据对象 %s"
 
 #: archive-tar.c:260 archive-zip.c:361
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "不支持的文件属性：0%o (SHA1: %s)"
+msgstr "不支持的文件模式：0%o (SHA1: %s)"
 
 #: archive-tar.c:287 archive-zip.c:352
 #, c-format
@@ -992,7 +992,7 @@ msgstr "无法重定向描述符"
 #: archive-tar.c:468
 #, c-format
 msgid "'%s' filter reported error"
-msgstr "'%s' 过滤器报告错误"
+msgstr "'%s' 过滤器报告了错误"
 
 #: archive-zip.c:313
 #, c-format
@@ -1012,7 +1012,7 @@ msgstr "压缩错误 (%d)"
 #: archive-zip.c:605
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "对于本系统时间戳太长：%<PRIuMAX>"
+msgstr "对于本系统时间戳太大：%<PRIuMAX>"
 
 #: attr.c:218
 #, c-format
@@ -1499,7 +1499,7 @@ msgstr "不能为 %s 创建先导目录"
 
 #: commit-graph.c:904
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "æ\8f\90交å\9b¾å½¢æ\96\87件ç\9a\84æ ¡éª\8cç \81é\94\99误ï¼\8c好å\83\8f已经损坏"
+msgstr "æ\8f\90交å\9b¾å½¢æ\96\87件ç\9a\84æ ¡éª\8cç \81é\94\99误ï¼\8cå\8f¯è\83½已经损坏"
 
 #: compat/obstack.c:405 compat/obstack.c:407
 msgid "memory exhausted"
@@ -1514,11 +1514,11 @@ msgid ""
 "\t%s\n"
 "This might be due to circular includes."
 msgstr ""
-"è¶\85è¿\87äº\86æ\9c\80大å¼\95ç\94¨深度（%1$d），当从\n"
+"è¶\85è¿\87äº\86æ\9c\80大å\8c\85å\90«深度（%1$d），当从\n"
 "\t%3$s\n"
 "包含\n"
 "\t%2$s\n"
-"è¿\99å\8f¯è\83½æ\98¯å\9b 为循ç\8e¯å¼\95ç\94¨。"
+"è¿\99å\8f¯è\83½æ\98¯å\9b 为循ç\8e¯å\8c\85å\90«。"
 
 #: config.c:139
 #, c-format
@@ -1844,7 +1844,7 @@ msgstr "在能力之后应为一个 flush 包"
 #: connect.c:233
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
-msgstr "忽略第一行 '%s' 之后的功能字段"
+msgstr "忽略第一行 '%s' 之后的能力字段"
 
 #: connect.c:252
 msgid "protocol error: unexpected capabilities^{}"
@@ -1964,7 +1964,7 @@ msgstr "ssh 变体 'simple' 不支持 -6"
 
 #: connect.c:1151
 msgid "ssh variant 'simple' does not support setting port"
-msgstr "'simple' 类型的 ssh 不支持设置端口"
+msgstr "ssh 变体 'simple' 不支持设置端口"
 
 #: connect.c:1262
 #, c-format
@@ -2063,17 +2063,17 @@ msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
 #: convert.c:674
 #, c-format
 msgid "cannot fork to run external filter '%s'"
-msgstr "不能 fork 以执行外部过滤程序 '%s'"
+msgstr "不能 fork 以执行外部过滤器 '%s'"
 
 #: convert.c:694
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
-msgstr "不能将标准输入传递给外部过滤器 '%s'"
+msgstr "不能将输入传递给外部过滤器 '%s'"
 
 #: convert.c:701
 #, c-format
 msgid "external filter '%s' failed %d"
-msgstr "外部过滤程序 '%s' 失败码 %d"
+msgstr "外部过滤器 '%s' 失败码 %d"
 
 #: convert.c:736 convert.c:739
 #, c-format
@@ -2341,7 +2341,7 @@ msgstr "不能对文件 '%s' 调用 stat"
 #: environment.c:150
 #, c-format
 msgid "bad git namespace path \"%s\""
-msgstr "糟糕的 git 名字空间路径 \"%s\""
+msgstr "错误的 git 名字空间路径 \"%s\""
 
 #: environment.c:332
 #, c-format
@@ -2574,7 +2574,7 @@ msgstr "没有匹配的远程分支"
 
 #: fetch-pack.c:1621 builtin/clone.c:664
 msgid "remote did not send all necessary objects"
-msgstr "è¿\9cç¨\8b没æ\9c\89å\8f\91é\80\81æ\89\80æ\9c\89å¿\85é¡»的对象"
+msgstr "è¿\9cç¨\8b没æ\9c\89å\8f\91é\80\81æ\89\80æ\9c\89å¿\85é\9c\80的对象"
 
 #: fetch-pack.c:1647
 #, c-format
@@ -3558,7 +3558,7 @@ msgstr "%s 没有指向一个有效的对象！"
 #: refs.c:579
 #, c-format
 msgid "ignoring dangling symref %s"
-msgstr "忽ç\95¥æ\91\87æ\91\86符号引用 %s"
+msgstr "忽ç\95¥æ\82¬ç©º符号引用 %s"
 
 #: refs.c:581 ref-filter.c:2067
 #, c-format
@@ -5771,7 +5771,7 @@ msgstr "%s 线程失败"
 #: transport-helper.c:1310
 #, c-format
 msgid "%s thread failed to join: %s"
-msgstr "%s 加入线程失败：%s"
+msgstr "%s 线程等待失败：%s"
 
 #: transport-helper.c:1329 transport-helper.c:1333
 #, c-format
@@ -8084,12 +8084,12 @@ msgstr "路径 '%s' 没有他们的版本"
 #: builtin/checkout.c:156
 #, c-format
 msgid "path '%s' does not have all necessary versions"
-msgstr "è·¯å¾\84 '%s' 没æ\9c\89å\85¨é\83¨å¿\85é¡»的版本"
+msgstr "è·¯å¾\84 '%s' 没æ\9c\89å\85¨é\83¨å¿\85é\9c\80的版本"
 
 #: builtin/checkout.c:200
 #, c-format
 msgid "path '%s' does not have necessary versions"
-msgstr "è·¯å¾\84 '%s' 没æ\9c\89å¿\85é¡»的版本"
+msgstr "è·¯å¾\84 '%s' 没æ\9c\89å¿\85é\9c\80的版本"
 
 #: builtin/checkout.c:217
 #, c-format
@@ -10355,7 +10355,7 @@ msgstr "非快进"
 #: builtin/fetch.c:790
 #, c-format
 msgid "%s did not send all necessary objects\n"
-msgstr "%s æ\9cªå\8f\91é\80\81æ\89\80æ\9c\89å¿\85é¡»的对象\n"
+msgstr "%s æ\9cªå\8f\91é\80\81æ\89\80æ\9c\89å¿\85é\9c\80的对象\n"
 
 #: builtin/fetch.c:811
 #, c-format
@@ -10380,13 +10380,13 @@ msgstr ""
 #: builtin/fetch.c:981
 #, c-format
 msgid "   (%s will become dangling)"
-msgstr "   ï¼\88%s å°\86æ\88\90为æ\91\87æ\91\86状态）"
+msgstr "   ï¼\88%s å°\86æ\88\90为æ\82¬ç©º状态）"
 
 #  译者：注意保持前导空格
 #: builtin/fetch.c:982
 #, c-format
 msgid "   (%s has become dangling)"
-msgstr "   ï¼\88%s å·²æ\88\90为æ\91\87æ\91\86状态）"
+msgstr "   ï¼\88%s å·²æ\88\90为æ\82¬ç©º状态）"
 
 #: builtin/fetch.c:1014
 msgid "[deleted]"
@@ -10568,7 +10568,7 @@ msgstr "显示不可达的对象"
 
 #: builtin/fsck.c:673
 msgid "show dangling objects"
-msgstr "æ\98¾ç¤ºæ\91\87æ\91\86的对象"
+msgstr "æ\98¾ç¤ºæ\82¬ç©º的对象"
 
 #: builtin/fsck.c:674
 msgid "report tags"
@@ -10600,7 +10600,7 @@ msgstr "启用更严格的检查"
 
 #: builtin/fsck.c:682
 msgid "write dangling objects in .git/lost-found"
-msgstr "å°\86æ\91\87æ\91\86对象写入 .git/lost-found 中"
+msgstr "å°\86æ\82¬ç©º对象写入 .git/lost-found 中"
 
 #: builtin/fsck.c:683 builtin/prune.c:110
 msgid "show progress"
@@ -13512,7 +13512,7 @@ msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
 
 #: builtin/pack-objects.c:3293
 msgid "minimum pack size limit is 1 MiB"
-msgstr "最小的包文件大小是 1 MB"
+msgstr "最小的包文件大小是 1 MiB"
 
 #: builtin/pack-objects.c:3298
 msgid "--thin cannot be used to build an indexable pack"
@@ -13524,7 +13524,7 @@ msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
 
 #: builtin/pack-objects.c:3307
 msgid "cannot use --filter without --stdout"
-msgstr "不能使用 --filter 而没有 --stdout"
+msgstr "不能在没有 --stdout 的情况下使用 --filter"
 
 #: builtin/pack-objects.c:3363
 msgid "Enumerating objects"
@@ -14660,13 +14660,13 @@ msgstr "不能设置 %s"
 #: builtin/remote.c:1298
 #, c-format
 msgid " %s will become dangling!"
-msgstr " %s å°\86æ\88\90为æ\91\87æ\91\86状态！"
+msgstr " %s å°\86æ\88\90为æ\82¬ç©º状态！"
 
 #  译者：注意保持前导空格
 #: builtin/remote.c:1299
 #, c-format
 msgid " %s has become dangling!"
-msgstr " %s å·²æ\88\90为æ\91\87æ\91\86状态！"
+msgstr " %s å·²æ\88\90为æ\82¬ç©º状态！"
 
 #: builtin/remote.c:1309
 #, c-format
@@ -14904,7 +14904,7 @@ msgstr "未发现替换引用 '%s'"
 #: builtin/replace.c:137
 #, c-format
 msgid "Deleted replace ref '%s'"
-msgstr "删除替换引用 '%s'"
+msgstr "å·²å\88 é\99¤æ\9b¿æ\8d¢å¼\95ç\94¨ '%s'"
 
 #: builtin/replace.c:149
 #, c-format
@@ -15070,7 +15070,7 @@ msgstr "使用此格式"
 
 #: builtin/replace.c:556
 msgid "--format cannot be used when not listing"
-msgstr "不列示æ\97¶ä¸\8dè\83½ä½¿ç\94¨ --format"
+msgstr "不列å\87ºæ\97¶ä¸\8dè\83½ä½¿ç\94¨ --format"
 
 #: builtin/replace.c:564
 msgid "-f only makes sense when writing a replacement"
@@ -15090,7 +15090,7 @@ msgstr "错误的参数个数"
 
 #: builtin/replace.c:586
 msgid "-e needs exactly one argument"
-msgstr "-e 只需要一个参数"
+msgstr "-e 需要且仅需要一个参数"
 
 #: builtin/replace.c:592
 msgid "-g needs at least one argument"
@@ -15490,7 +15490,7 @@ msgstr "在一次单独的请求/响应之后退出"
 
 #: builtin/serve.c:19
 msgid "exit immediately after advertising capabilities"
-msgstr "å\9c¨å¹¿å\91\8aå\8a\9fè\83½后立即退出"
+msgstr "对è\83½å\8a\9b广å\91\8aä¹\8b后立即退出"
 
 #: builtin/shortlog.c:14
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"