diff --git a/po/zh_CN.po b/po/zh_CN.po index cf54b7de38..7c06fcd00c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -142,8 +142,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2021-10-30 09:36+0800\n" -"PO-Revision-Date: 2021-11-02 18:03+0000\n" +"POT-Creation-Date: 2021-11-04 08:34+0800\n" +"PO-Revision-Date: 2021-11-04 11:01+0000\n" "Last-Translator: Fangyi Zhou \n" "Language-Team: GitHub \n" "Language: zh_CN\n" @@ -158,8 +158,8 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯(%s)?" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510 -#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "不能读取索引" @@ -188,7 +188,7 @@ msgstr "更新" msgid "could not stage '%s'" msgstr "不能暂存 '%s'" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 msgid "could not write index" msgstr "不能写入索引" @@ -1383,8 +1383,8 @@ msgstr "不能为新建文件 %s 创建后端存储" msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242 -#: builtin/gc.c:2277 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 +#: builtin/gc.c:2276 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" @@ -1670,8 +1670,8 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list" msgid "cannot read %s" msgstr "不能读取 %s" -#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112 -#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 #: builtin/merge.c:1145 #, c-format msgid "could not read '%s'" @@ -1954,7 +1954,7 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" #: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 #: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 #: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 @@ -2130,7 +2130,7 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" @@ -2475,7 +2475,7 @@ msgstr "提交图形中的提交 %s 的世代号是 % < %" msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" -#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 #: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2593,7 +2593,7 @@ msgstr "键名没有包含一个小节名称:%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名:%s" -#: config.c:470 sequencer.c:2802 +#: config.c:470 sequencer.c:2804 #, c-format msgid "invalid key: %s" msgstr "无效键名:%s" @@ -4318,23 +4318,23 @@ msgstr "没有这样的远程引用 %s" msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900 -#: gpg-interface.c:916 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 +#: gpg-interface.c:918 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:332 gpg-interface.c:452 +#: gpg-interface.c:332 gpg-interface.c:454 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: gpg-interface.c:443 +#: gpg-interface.c:445 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在" -#: gpg-interface.c:467 +#: gpg-interface.c:469 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4342,61 +4342,61 @@ msgstr "" "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n" "(openssh 8.2p1+ 版本可用)" -#: gpg-interface.c:521 +#: gpg-interface.c:523 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "设置了 ssh 签名吊销文件但无法找到:%s" -#: gpg-interface.c:574 +#: gpg-interface.c:576 #, c-format msgid "bad/incompatible signature '%s'" msgstr "坏的/不兼容的签名 '%s‘" -#: gpg-interface.c:733 gpg-interface.c:738 +#: gpg-interface.c:735 gpg-interface.c:740 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "无法得到密钥 '%s' 的 ssh 指纹" -#: gpg-interface.c:760 +#: gpg-interface.c:762 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一" -#: gpg-interface.c:778 +#: gpg-interface.c:780 #, c-format -msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s" +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand 成功,但没有返回密钥:%s %s" -#: gpg-interface.c:784 +#: gpg-interface.c:786 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 失败:%s %s" -#: gpg-interface.c:872 +#: gpg-interface.c:874 msgid "gpg failed to sign the data" msgstr "gpg 数据签名失败" -#: gpg-interface.c:893 +#: gpg-interface.c:895 msgid "user.signingkey needs to be set for ssh signing" msgstr "ssh 签名需要设置 user.signingkey" -#: gpg-interface.c:904 +#: gpg-interface.c:906 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "无法将 ssh 签名密钥写入 '%s'" -#: gpg-interface.c:922 +#: gpg-interface.c:924 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'" -#: gpg-interface.c:940 +#: gpg-interface.c:942 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" msgstr "ssh 签名需要 ssh-keygen -Y sign (openssh 8.2p1+ 版本可用)" -#: gpg-interface.c:952 +#: gpg-interface.c:954 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "无法从 '%s' 读入 ssh 签名数据" @@ -4406,7 +4406,7 @@ msgstr "无法从 '%s' 读入 ssh 签名数据" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:531 +#: grep.c:533 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" @@ -4414,18 +4414,18 @@ msgstr "" "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此" "功能" -#: grep.c:1907 +#: grep.c:1928 #, c-format msgid "'%s': unable to read %s" msgstr "'%s':无法读取 %s" -#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:1935 +#: grep.c:1956 #, c-format msgid "'%s': short read" msgstr "'%s':读取不完整" @@ -6316,7 +6316,7 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat:%s" -#: pretty.c:988 +#: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" @@ -6353,7 +6353,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:97 sequencer.c:5603 +#: range-diff.c:97 sequencer.c:5605 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -6694,8 +6694,8 @@ msgstr "" "然而,如果您删除全部内容,变基操作将会终止。\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3886 -#: sequencer.c:3912 sequencer.c:5709 builtin/fsck.c:328 builtin/gc.c:1790 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 +#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 #: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" @@ -6948,7 +6948,7 @@ msgstr "这个命令拒绝元素 %%(%.*s)" #: ref-filter.c:1040 #, c-format -msgid "--format=%.*s cannot be used with--python, --shell, --tcl" +msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用" #: ref-filter.c:1706 @@ -7420,7 +7420,7 @@ msgstr "无法写入 rerere 记录" msgid "there were errors while writing '%s' (%s)" msgstr "写入 '%s' (%s) 时出错" -#: rerere.c:482 builtin/gc.c:2247 builtin/gc.c:2282 +#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 #, c-format msgid "failed to flush '%s'" msgstr "刷新 '%s' 失败" @@ -7504,7 +7504,7 @@ msgstr "不能打开 rr-cache 目录" msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: reset.c:70 reset.c:76 sequencer.c:3703 +#: reset.c:70 reset.c:76 sequencer.c:3705 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树" @@ -7597,7 +7597,7 @@ msgstr "无效的提交信息清理模式 '%s'" msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:345 sequencer.c:4752 builtin/rebase.c:563 builtin/rebase.c:1297 +#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 #: builtin/rm.c:408 #, c-format msgid "could not remove '%s'" @@ -7656,13 +7656,13 @@ msgstr "" "\"git revert --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "执行 \"git revert\" 之前的状态,执行 \"git revert --abort\"。" -#: sequencer.c:448 sequencer.c:3288 +#: sequencer.c:448 sequencer.c:3290 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306 -#: sequencer.c:3564 sequencer.c:5619 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 +#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" @@ -7672,8 +7672,8 @@ msgstr "不能写入 '%s'" msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3572 +#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3574 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" @@ -7787,11 +7787,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1227 +#: sequencer.c:1229 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1233 +#: sequencer.c:1235 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7815,7 +7815,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1246 +#: sequencer.c:1248 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7838,349 +7838,349 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1288 +#: sequencer.c:1290 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1290 +#: sequencer.c:1292 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1336 +#: sequencer.c:1338 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后,不能解析 HEAD" -#: sequencer.c:1338 +#: sequencer.c:1340 msgid "detached HEAD" msgstr "分离头指针" # 译者:中文字符串拼接,可删除前导空格 -#: sequencer.c:1342 +#: sequencer.c:1344 msgid " (root-commit)" msgstr "(根提交)" -#: sequencer.c:1363 +#: sequencer.c:1365 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1365 +#: sequencer.c:1367 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交!" -#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707 +#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1425 sequencer.c:2310 +#: sequencer.c:1427 sequencer.c:2312 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1436 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1469 sequencer.c:1589 +#: sequencer.c:1471 sequencer.c:1591 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1500 sequencer.c:1532 +#: sequencer.c:1502 sequencer.c:1534 #, c-format msgid "invalid author identity '%s'" msgstr "无效的作者身份 '%s'" -#: sequencer.c:1506 +#: sequencer.c:1508 msgid "corrupt author: missing date information" msgstr "损坏的作者:缺失日期信息" -#: sequencer.c:1545 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 +#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 #: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1572 sequencer.c:4524 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:1621 +#: sequencer.c:1623 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1626 +#: sequencer.c:1628 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1709 sequencer.c:1990 +#: sequencer.c:1711 sequencer.c:1992 #, c-format msgid "unknown command: %d" msgstr "未知命令:%d" -#: sequencer.c:1751 +#: sequencer.c:1753 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明:" -#: sequencer.c:1752 +#: sequencer.c:1754 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d:" -#: sequencer.c:1753 +#: sequencer.c:1755 msgid "The 1st commit message will be skipped:" msgstr "第一个提交说明将被跳过:" -#: sequencer.c:1754 +#: sequencer.c:1756 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过:" -#: sequencer.c:1755 +#: sequencer.c:1757 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1902 sequencer.c:1959 +#: sequencer.c:1904 sequencer.c:1961 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1949 +#: sequencer.c:1951 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1951 sequencer.c:3599 +#: sequencer.c:1953 sequencer.c:3601 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1953 +#: sequencer.c:1955 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1977 +#: sequencer.c:1979 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:2087 +#: sequencer.c:2089 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:2094 +#: sequencer.c:2096 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:2113 +#: sequencer.c:2115 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:2121 sequencer.c:2129 +#: sequencer.c:2123 sequencer.c:2131 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:2135 +#: sequencer.c:2137 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2154 +#: sequencer.c:2156 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:不能解析父提交 %s" -#: sequencer.c:2220 +#: sequencer.c:2222 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:2280 +#: sequencer.c:2282 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:2281 +#: sequencer.c:2283 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:2302 +#: sequencer.c:2304 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "丢弃 %s %s -- 补丁内容已在上游\n" -#: sequencer.c:2360 +#: sequencer.c:2362 #, c-format msgid "git %s: failed to read the index" msgstr "git %s:无法读取索引" -#: sequencer.c:2368 +#: sequencer.c:2370 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s:无法刷新索引" -#: sequencer.c:2448 +#: sequencer.c:2450 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数:'%s'" -#: sequencer.c:2457 +#: sequencer.c:2459 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2500 +#: sequencer.c:2502 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:2561 +#: sequencer.c:2563 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d:%.*s" -#: sequencer.c:2572 +#: sequencer.c:2574 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2620 builtin/rebase.c:184 +#: sequencer.c:2622 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: sequencer.c:2658 +#: sequencer.c:2660 msgid "cancelling a cherry picking in progress" msgstr "正在取消一个进行中的拣选" -#: sequencer.c:2667 +#: sequencer.c:2669 msgid "cancelling a revert in progress" msgstr "正在取消一个进行中的还原" -#: sequencer.c:2707 +#: sequencer.c:2709 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2709 +#: sequencer.c:2711 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单:'%s'" -#: sequencer.c:2714 +#: sequencer.c:2716 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2725 +#: sequencer.c:2727 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2727 +#: sequencer.c:2729 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2805 +#: sequencer.c:2807 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效:%s" -#: sequencer.c:2914 +#: sequencer.c:2916 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2934 +#: sequencer.c:2936 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单:'%s'" -#: sequencer.c:3029 sequencer.c:4903 +#: sequencer.c:3031 sequencer.c:4905 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:3046 +#: sequencer.c:3048 msgid "revert is already in progress" msgstr "一个还原操作已在进行" -#: sequencer.c:3048 +#: sequencer.c:3050 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3051 +#: sequencer.c:3053 msgid "cherry-pick is already in progress" msgstr "拣选操作已在进行" -#: sequencer.c:3053 +#: sequencer.c:3055 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3067 +#: sequencer.c:3069 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:3082 +#: sequencer.c:3084 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:3142 sequencer.c:4613 +#: sequencer.c:3144 sequencer.c:4615 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:3144 sequencer.c:3155 +#: sequencer.c:3146 sequencer.c:3157 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:3146 sequencer.c:3190 +#: sequencer.c:3148 sequencer.c:3192 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:3176 builtin/grep.c:772 +#: sequencer.c:3178 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:3178 +#: sequencer.c:3180 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s':%s" -#: sequencer.c:3179 +#: sequencer.c:3181 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:3185 +#: sequencer.c:3187 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:3196 +#: sequencer.c:3198 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" -#: sequencer.c:3237 +#: sequencer.c:3239 msgid "no revert in progress" msgstr "没有正在进行的还原" -#: sequencer.c:3246 +#: sequencer.c:3248 msgid "no cherry-pick in progress" msgstr "没有正在进行的拣选" -#: sequencer.c:3256 +#: sequencer.c:3258 msgid "failed to skip the commit" msgstr "无法跳过这个提交" -#: sequencer.c:3263 +#: sequencer.c:3265 msgid "there is nothing to skip" msgstr "没有要跳过的" -#: sequencer.c:3266 +#: sequencer.c:3268 #, c-format msgid "" "have you committed already?\n" @@ -8189,16 +8189,16 @@ msgstr "" "您已经提交了么?\n" "试试 \"git %s --continue\"" -#: sequencer.c:3428 sequencer.c:4504 +#: sequencer.c:3430 sequencer.c:4506 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:3445 +#: sequencer.c:3447 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:3453 +#: sequencer.c:3455 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8217,27 +8217,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3463 +#: sequencer.c:3465 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:3470 +#: sequencer.c:3472 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:639 +#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:3500 +#: sequencer.c:3502 #, c-format msgid "Executing: %s\n" msgstr "正在执行:%s\n" -#: sequencer.c:3515 +#: sequencer.c:3517 #, c-format msgid "" "execution failed: %s\n" @@ -8252,11 +8252,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3521 +#: sequencer.c:3523 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:3527 +#: sequencer.c:3529 #, c-format msgid "" "execution succeeded: %s\n" @@ -8273,90 +8273,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3589 +#: sequencer.c:3591 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称:'%.*s'" -#: sequencer.c:3662 +#: sequencer.c:3664 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3667 +#: sequencer.c:3669 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3746 +#: sequencer.c:3748 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3778 +#: sequencer.c:3780 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3800 +#: sequencer.c:3802 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3809 +#: sequencer.c:3811 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并:'%.*s'" -#: sequencer.c:3821 +#: sequencer.c:3823 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3876 +#: sequencer.c:3878 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:4022 +#: sequencer.c:4024 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:4038 +#: sequencer.c:4040 msgid "merge: Unable to write new index file" msgstr "合并:无法写入新索引文件" -#: sequencer.c:4119 +#: sequencer.c:4121 msgid "Cannot autostash" msgstr "无法自动贮藏" -#: sequencer.c:4122 +#: sequencer.c:4124 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的贮藏响应:'%s'" -#: sequencer.c:4128 +#: sequencer.c:4130 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: sequencer.c:4131 +#: sequencer.c:4133 #, c-format msgid "Created autostash: %s\n" msgstr "创建了自动贮藏:%s\n" -#: sequencer.c:4135 +#: sequencer.c:4137 msgid "could not reset --hard" msgstr "无法硬性重置(reset --hard)" -#: sequencer.c:4160 +#: sequencer.c:4162 #, c-format msgid "Applied autostash.\n" msgstr "已应用自动贮藏。\n" -#: sequencer.c:4172 +#: sequencer.c:4174 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:4175 +#: sequencer.c:4177 #, c-format msgid "" "%s\n" @@ -8367,29 +8367,29 @@ msgstr "" "您的修改在贮藏区中很安全。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:4180 +#: sequencer.c:4182 msgid "Applying autostash resulted in conflicts." msgstr "应用自动贮藏导致冲突。" -#: sequencer.c:4181 +#: sequencer.c:4183 msgid "Autostash exists; creating a new stash entry." msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。" -#: sequencer.c:4253 +#: sequencer.c:4255 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:4268 +#: sequencer.c:4270 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:4270 +#: sequencer.c:4272 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:4302 +#: sequencer.c:4304 #, c-format msgid "" "Could not execute the todo command\n" @@ -8409,58 +8409,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4348 +#: sequencer.c:4350 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "正在变基(%d/%d)%s" -#: sequencer.c:4394 +#: sequencer.c:4396 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4464 +#: sequencer.c:4466 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:4512 +#: sequencer.c:4514 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4517 +#: sequencer.c:4519 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4531 +#: sequencer.c:4533 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4591 +#: sequencer.c:4593 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "成功变基并更新 %s。\n" -#: sequencer.c:4643 +#: sequencer.c:4645 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基:您有未暂存的变更。" -#: sequencer.c:4652 +#: sequencer.c:4654 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4654 +#: sequencer.c:4656 #, c-format msgid "invalid file: '%s'" msgstr "无效文件:'%s'" -#: sequencer.c:4656 +#: sequencer.c:4658 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容:'%s'" -#: sequencer.c:4659 +#: sequencer.c:4661 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8469,59 +8469,59 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4695 sequencer.c:4734 +#: sequencer.c:4697 sequencer.c:4736 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件:'%s'" -#: sequencer.c:4750 +#: sequencer.c:4752 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4760 +#: sequencer.c:4762 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4880 +#: sequencer.c:4882 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s:不能拣选一个%s" -#: sequencer.c:4884 +#: sequencer.c:4886 #, c-format msgid "%s: bad revision" msgstr "%s:错误的版本" -#: sequencer.c:4919 +#: sequencer.c:4921 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:5190 sequencer.c:5419 +#: sequencer.c:5192 sequencer.c:5421 #, c-format msgid "skipped previously applied commit %s" msgstr "跳过了先前已应用的提交 %s" -#: sequencer.c:5260 sequencer.c:5435 +#: sequencer.c:5262 sequencer.c:5437 msgid "use --reapply-cherry-picks to include skipped commits" msgstr "使用 --reapply-cherry-picks 来包括跳过的提交" -#: sequencer.c:5406 +#: sequencer.c:5408 msgid "make_script: unhandled options" msgstr "make_script:有未能处理的选项" -#: sequencer.c:5409 +#: sequencer.c:5411 msgid "make_script: error preparing revisions" msgstr "make_script:准备版本时错误" -#: sequencer.c:5667 sequencer.c:5684 +#: sequencer.c:5669 sequencer.c:5686 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5703 +#: sequencer.c:5705 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5803 +#: sequencer.c:5805 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" @@ -13445,7 +13445,7 @@ msgstr "要计算的变更路径布隆过滤器的最大数" msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c:283 +#: builtin/commit-graph.c:282 msgid "Collecting commits from input" msgstr "正从标准输入收集提交" @@ -15706,16 +15706,16 @@ msgstr "显示进度" msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:860 builtin/index-pack.c:261 +#: builtin/fsck.c:861 builtin/index-pack.c:261 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:888 +#: builtin/fsck.c:889 #, c-format msgid "%s: object missing" msgstr "%s:对象缺失" -#: builtin/fsck.c:899 +#: builtin/fsck.c:900 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数:期望 sha1,得到 '%s'" @@ -15846,171 +15846,171 @@ msgstr "无法启动 'git pack-objects' 进程" msgid "failed to finish 'git pack-objects' process" msgstr "无法完成 'git pack-objects' 进程" -#: builtin/gc.c:1089 +#: builtin/gc.c:1088 msgid "failed to write multi-pack-index" msgstr "无法写入多包索引" -#: builtin/gc.c:1105 +#: builtin/gc.c:1104 msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失败" -#: builtin/gc.c:1164 +#: builtin/gc.c:1163 msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失败" -#: builtin/gc.c:1173 +#: builtin/gc.c:1172 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "跳过增量重新打包任务,因为 core.multiPackIndex 被禁用" -#: builtin/gc.c:1277 +#: builtin/gc.c:1276 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "锁文件 '%s' 已存在,跳过维护" -#: builtin/gc.c:1307 +#: builtin/gc.c:1306 #, c-format msgid "task '%s' failed" msgstr "任务 '%s' 失败" -#: builtin/gc.c:1389 +#: builtin/gc.c:1388 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 不是一个有效的任务" -#: builtin/gc.c:1394 +#: builtin/gc.c:1393 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "任务 '%s' 不能被多次选择" -#: builtin/gc.c:1409 +#: builtin/gc.c:1408 msgid "run tasks based on the state of the repository" msgstr "基于仓库状态来运行任务" -#: builtin/gc.c:1410 +#: builtin/gc.c:1409 msgid "frequency" msgstr "频率" -#: builtin/gc.c:1411 +#: builtin/gc.c:1410 msgid "run tasks based on frequency" msgstr "基于频率运行任务" -#: builtin/gc.c:1414 +#: builtin/gc.c:1413 msgid "do not report progress or other information over stderr" msgstr "不通过标准错误报告进度或其它信息" -#: builtin/gc.c:1415 +#: builtin/gc.c:1414 msgid "task" msgstr "任务" -#: builtin/gc.c:1416 +#: builtin/gc.c:1415 msgid "run a specific task" msgstr "运行一个特定的任务" -#: builtin/gc.c:1433 +#: builtin/gc.c:1432 msgid "use at most one of --auto and --schedule=" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" -#: builtin/gc.c:1476 +#: builtin/gc.c:1475 msgid "failed to run 'git config'" msgstr "无法运行 'git config'" -#: builtin/gc.c:1628 +#: builtin/gc.c:1627 #, c-format msgid "failed to expand path '%s'" msgstr "无法扩展路径 '%s'" -#: builtin/gc.c:1655 builtin/gc.c:1693 +#: builtin/gc.c:1654 builtin/gc.c:1692 msgid "failed to start launchctl" msgstr "无法启动 launchctl" -#: builtin/gc.c:1768 builtin/gc.c:2221 +#: builtin/gc.c:1767 builtin/gc.c:2220 #, c-format msgid "failed to create directories for '%s'" msgstr "无法为 '%s' 创建目录" -#: builtin/gc.c:1795 +#: builtin/gc.c:1794 #, c-format msgid "failed to bootstrap service %s" msgstr "无法引导服务 %s" -#: builtin/gc.c:1888 +#: builtin/gc.c:1887 msgid "failed to create temp xml file" msgstr "无法创建临时 XML 文件" -#: builtin/gc.c:1978 +#: builtin/gc.c:1977 msgid "failed to start schtasks" msgstr "无法启动计划任务" -#: builtin/gc.c:2047 +#: builtin/gc.c:2046 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l',您的系统可能不支持 'cron'" -#: builtin/gc.c:2064 +#: builtin/gc.c:2063 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "无法运行 'crontab',您的系统可能不支持 'cron'" -#: builtin/gc.c:2068 +#: builtin/gc.c:2067 msgid "failed to open stdin of 'crontab'" msgstr "无法打开 'crontab' 的标准输入" -#: builtin/gc.c:2110 +#: builtin/gc.c:2109 msgid "'crontab' died" msgstr "'crontab' 终止" -#: builtin/gc.c:2175 +#: builtin/gc.c:2174 msgid "failed to start systemctl" msgstr "无法启动 systemctl" -#: builtin/gc.c:2185 +#: builtin/gc.c:2184 msgid "failed to run systemctl" msgstr "无法运行 systemctl" -#: builtin/gc.c:2194 builtin/gc.c:2199 builtin/worktree.c:62 +#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 #: builtin/worktree.c:945 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" -#: builtin/gc.c:2379 +#: builtin/gc.c:2378 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" -#: builtin/gc.c:2404 +#: builtin/gc.c:2403 msgid "neither systemd timers nor crontab are available" msgstr "systemd 和 crontab 的定时器都不可用" -#: builtin/gc.c:2419 +#: builtin/gc.c:2418 #, c-format msgid "%s scheduler is not available" msgstr "%s 调度器不可用" -#: builtin/gc.c:2433 +#: builtin/gc.c:2432 msgid "another process is scheduling background maintenance" msgstr "另外一个进程正运行于后台维护" -#: builtin/gc.c:2455 +#: builtin/gc.c:2454 msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=<调度器>]" -#: builtin/gc.c:2464 +#: builtin/gc.c:2463 msgid "scheduler" msgstr "调度器" -#: builtin/gc.c:2465 +#: builtin/gc.c:2464 msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" -#: builtin/gc.c:2479 +#: builtin/gc.c:2478 msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" -#: builtin/gc.c:2488 +#: builtin/gc.c:2487 msgid "git maintenance []" msgstr "git maintenance <子命令> [<选项>]" -#: builtin/gc.c:2507 +#: builtin/gc.c:2506 #, c-format msgid "invalid subcommand: %s" msgstr "无效子命令:%s" @@ -16662,8 +16662,8 @@ msgstr "无法关闭已写入的 %s 文件 '%s'" #: builtin/index-pack.c:1489 #, c-format -msgid "unable to rename temporary '*.%s' file to '%s" -msgstr "不能重命名临时文件 '*.%s' 为 %s" +msgid "unable to rename temporary '*.%s' file to '%s'" +msgstr "不能重命名临时文件 '*.%s' 为 '%s'" #: builtin/index-pack.c:1514 msgid "error while closing pack file"