Commit 924a01f2 authored by Jiang Xin's avatar Jiang Xin

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

parents 8a0ba68f 26a567e4
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -46,7 +46,7 @@
# conflict | 冲突
# core Git | 核心 Git 工具
# DAG | 有向无环图
# dangling object | 摇摆对象
# dangling object | 悬空对象
# 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 "无法读取 '%2$s' 必的目标文件 %1$s"
msgstr "无法读取 '%2$s' 必的目标文件 %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 "提交图形文件的校验码错误,好像已经损坏"
msgstr "提交图形文件的校验码错误,可能已经损坏"
#: 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 ""
"超过了最大引用深度(%1$d),当从\n"
"超过了最大包含深度(%1$d),当从\n"
"\t%3$s\n"
"包含\n"
"\t%2$s\n"
"这可能是因为循环引用。"
"这可能是因为循环包含。"
#: 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 "远程没有发送所有必的对象"
msgstr "远程没有发送所有必的对象"
#: fetch-pack.c:1647
#, c-format
......@@ -3558,7 +3558,7 @@ msgstr "%s 没有指向一个有效的对象!"
#: refs.c:579
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略摇摆符号引用 %s"
msgstr "忽略悬空符号引用 %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 "路径 '%s' 没有全部必的版本"
msgstr "路径 '%s' 没有全部必的版本"
#: builtin/checkout.c:200
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必的版本"
msgstr "路径 '%s' 没有必的版本"
#: 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 未发送所有必的对象\n"
msgstr "%s 未发送所有必的对象\n"
#: builtin/fetch.c:811
#, c-format
......@@ -10380,13 +10380,13 @@ msgstr ""
#: builtin/fetch.c:981
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 将成为摇摆状态)"
msgstr " (%s 将成为悬空状态)"
# 译者:注意保持前导空格
#: builtin/fetch.c:982
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 已成为摇摆状态)"
msgstr " (%s 已成为悬空状态)"
#: builtin/fetch.c:1014
msgid "[deleted]"
......@@ -10568,7 +10568,7 @@ msgstr "显示不可达的对象"
#: builtin/fsck.c:673
msgid "show dangling objects"
msgstr "显示摇摆的对象"
msgstr "显示悬空的对象"
#: 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 "将摇摆对象写入 .git/lost-found 中"
msgstr "将悬空对象写入 .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 将成为摇摆状态!"
msgstr " %s 将成为悬空状态!"
# 译者:注意保持前导空格
#: builtin/remote.c:1299
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态!"
msgstr " %s 已成为悬空状态!"
#: 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 "删除替换引用 '%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 "不列时不能使用 --format"
msgstr "不列时不能使用 --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 "在广告功能后立即退出"
msgstr "对能力广告之后立即退出"
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment