diff options
-rw-r--r-- | po/zh_CN.po | 4207 |
1 files changed, 2761 insertions, 1446 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 4f5c3ab9ae..622b61c95a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -135,8 +135,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2017-01-02 20:11+0800\n" +"POT-Creation-Date: 2017-02-18 01:00+0800\n" +"PO-Revision-Date: 2017-02-25 00:10+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -187,7 +187,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" @@ -360,34 +360,34 @@ msgstr "未能识别的二进制补丁位于第 %d 行" msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2274 +#: apply.c:2265 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2278 +#: apply.c:2269 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2931 +#: apply.c:2922 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" -#: apply.c:3050 +#: apply.c:3041 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" -#: apply.c:3062 +#: apply.c:3053 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" -#: apply.c:3068 +#: apply.c:3059 #, c-format msgid "" "while searching for:\n" @@ -396,437 +396,438 @@ msgstr "" "当查询:\n" "%.*s" -#: apply.c:3090 +#: apply.c:3081 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3098 +#: apply.c:3089 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3144 +#: apply.c:3135 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3154 +#: apply.c:3145 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" -#: apply.c:3162 +#: apply.c:3153 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s',但其并非空文件" -#: apply.c:3180 +#: apply.c:3171 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" -#: apply.c:3193 +#: apply.c:3184 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3199 +#: apply.c:3190 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" -#: apply.c:3220 +#: apply.c:3211 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" -#: apply.c:3342 +#: apply.c:3333 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3398 +#: apply.c:3389 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3427 apply.c:3667 +#: apply.c:3418 apply.c:3658 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3510 apply.c:3681 +#: apply.c:3501 apply.c:3672 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" -#: apply.c:3519 apply.c:3689 +#: apply.c:3510 apply.c:3680 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" -#: apply.c:3554 +#: apply.c:3545 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: apply.c:3557 +#: apply.c:3548 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" -#: apply.c:3573 apply.c:3577 +#: apply.c:3564 apply.c:3568 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3589 +#: apply.c:3580 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" -#: apply.c:3603 +#: apply.c:3594 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3608 +#: apply.c:3599 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3634 +#: apply.c:3625 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3706 +#: apply.c:3697 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" -#: apply.c:3708 +#: apply.c:3699 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" -#: apply.c:3859 apply.c:3861 +#: apply.c:3850 apply.c:3852 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3917 +#: apply.c:3908 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" -#: apply.c:3920 +#: apply.c:3911 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" -#: apply.c:3940 +#: apply.c:3931 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" -#: apply.c:3945 +#: apply.c:3936 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" -#: apply.c:3965 +#: apply.c:3956 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3969 +#: apply.c:3960 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" -#: apply.c:3984 +#: apply.c:3975 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: apply.c:4075 +#: apply.c:4066 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4082 +#: apply.c:4073 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式被改变,但它不在当前 HEAD 中" -#: apply.c:4085 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效(%s)。" -#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: apply.c:4094 +#: apply.c:4085 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4104 +#: apply.c:4095 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4242 +#: apply.c:4233 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4277 +#: apply.c:4268 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4283 +#: apply.c:4274 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: apply.c:4291 +#: apply.c:4282 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4297 apply.c:4441 +#: apply.c:4288 apply.c:4432 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4338 +#: apply.c:4329 #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" -#: apply.c:4342 +#: apply.c:4333 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4412 +#: apply.c:4403 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4510 +#: apply.c:4501 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4518 +#: apply.c:4509 msgid "internal error" msgstr "内部错误" -#: apply.c:4521 +#: apply.c:4512 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." -#: apply.c:4532 +#: apply.c:4523 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4554 +#: apply.c:4545 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4558 +#: apply.c:4549 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4668 +#: apply.c:4659 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4676 +#: apply.c:4667 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4695 +#: apply.c:4686 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4833 +#: apply.c:4824 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s':%s" -#: apply.c:4858 +#: apply.c:4849 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4864 apply.c:4879 +#: apply.c:4855 apply.c:4870 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行有空白字符误用。" msgstr[1] "%d 行有空白字符误用。" -#: apply.c:4872 +#: apply.c:4863 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后,应用了 %d 行。" msgstr[1] "修复空白错误后,应用了 %d 行。" -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "路径" -#: apply.c:4920 +#: apply.c:4911 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4923 +#: apply.c:4914 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4925 builtin/am.c:2286 +#: apply.c:4916 builtin/am.c:2286 msgid "num" msgstr "数字" -#: apply.c:4926 +#: apply.c:4917 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4929 +#: apply.c:4920 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4931 +#: apply.c:4922 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" -#: apply.c:4935 +#: apply.c:4926 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4937 +#: apply.c:4928 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" -#: apply.c:4939 +#: apply.c:4930 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" -#: apply.c:4941 +#: apply.c:4932 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4943 +#: apply.c:4934 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4945 +#: apply.c:4936 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4947 +#: apply.c:4938 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" -#: apply.c:4949 +#: apply.c:4940 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:4951 +#: apply.c:4942 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:4956 +#: apply.c:4947 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:4957 builtin/am.c:2265 +#: apply.c:4948 builtin/am.c:2265 msgid "action" msgstr "动作" -#: apply.c:4958 +#: apply.c:4949 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:4961 apply.c:4964 +#: apply.c:4952 apply.c:4955 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:4967 +#: apply.c:4958 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:4969 +#: apply.c:4960 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:4971 +#: apply.c:4962 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:4973 +#: apply.c:4964 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" -#: apply.c:4976 +#: apply.c:4967 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:4979 +#: apply.c:4970 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:4981 builtin/am.c:2274 +#: apply.c:4972 builtin/am.c:2274 msgid "root" msgstr "根目录" -#: apply.c:4982 +#: apply.c:4973 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" @@ -848,7 +849,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -869,11 +870,11 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "文件" @@ -906,7 +907,7 @@ msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "仓库" @@ -1002,7 +1003,7 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" @@ -1031,7 +1032,7 @@ msgstr "二分查找中:合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" @@ -1218,7 +1219,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -1227,10 +1228,10 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -1269,7 +1270,7 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数:%s" @@ -1287,13 +1288,13 @@ msgstr "不能创建 '%s'" msgid "index-pack died" msgstr "index-pack 终止" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值:%.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -1317,123 +1318,133 @@ msgstr "" msgid "memory exhausted" msgstr "内存耗尽" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "超出范围" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "无效的单位" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" -#: config.c:666 +#: config.c:668 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" -#: config.c:669 +#: config.c:671 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" -#: config.c:672 +#: config.c:674 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" -#: config.c:675 +#: config.c:677 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" -#: config.c:678 +#: config.c:680 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" -#: config.c:681 +#: config.c:683 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" -#: config.c:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式:%s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "错误的打包压缩级别 %d" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:1718 +#: config.c:1745 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "在 %s 上执行 fstat 失败" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" @@ -1453,7 +1464,7 @@ msgstr "" "\n" "请确认您有正确的访问权限并且仓库存在。" -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "检查连接中" @@ -1591,12 +1602,12 @@ msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1605,20 +1616,20 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误:\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出,停止在 %s" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1627,33 +1638,38 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数:\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数:'%s'" -#: diff.c:4700 +#: diff.c:4696 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多,略过不严格的重命名检查。" -#: diff.c:4703 +#: diff.c:4699 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多,只在修改的路径中查找拷贝。" -#: diff.c:4706 +#: diff.c:4702 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" -#: dir.c:1866 +#: dir.c:1862 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:1985 +#: dir.c:1981 msgid "Untracked cache is disabled on this system or location." msgstr "缓存未跟踪文件在本系统或位置中被禁用。" +#: dir.c:2759 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "不能从 '%s' 迁移 git 目录到 '%s'" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack:应为 shallow 列表" @@ -1834,35 +1850,40 @@ msgstr "不能创建临时文件" msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "'%s':无法读取 %s" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "无法枚举 '%s' 状态" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "'%s':读取不完整" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令:" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1871,11 +1892,11 @@ msgstr "" "'%s' 像是一个 git 命令,但却无法运行。\n" "可能是 git-%s 受损?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统中未发现 Git 命令。" -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1884,17 +1905,17 @@ msgstr "" "警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n" "是 '%s'" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1908,7 +1929,7 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s:%s - %s" @@ -1974,69 +1995,69 @@ msgstr "无法写新的索引文件" msgid "(bad commit)\n" msgstr "(坏提交)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "无法创建树" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "无法创建路径 '%s'%s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ":可能是一个目录/文件冲突?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "无法打开 '%s':%s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "无法创建符号链接 '%s':%s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2045,7 +2066,7 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本被保留。" -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2054,20 +2075,20 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中" "的版本保留于 %8$s 中。" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2076,135 +2097,135 @@ msgstr "" "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr "(留下未解决)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是重命名 %s 至 %s,以及 %s 至 %s" -#: merge-recursive.c:1531 +#: merge-recursive.c:1535 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" |