407b144f35 · matheusbsbs/matheus-bagliano

@@ -22,11 +22,13 @@

22 # 3-way merge | 三方合并

23 # abbreviate | 简写（的 SHA-1 值）

24 # alternate object database | 备用对象库

25 +# attribute source | 属性来源

26 # amend | 修补

27 # ancestor | 祖先，祖先提交

28 # annotated tag | 附注标签

29 # bare repository | 纯仓库

30 # bisect | 二分查找

31 +# bitmap | 位图

32 # blob object | 数据对象

33 # bloom filter | 布隆过滤器

34 # branch | 分支

@@ -102,6 +104,7 @@

104 # rebase | 变基

105 # ref | 引用

106 # reflog | 引用日志

107 +# refmap | 引用映射

108 # refspec | 引用规格

109 # remote | 远程，远程仓库

110 # remote-tracking branch | 远程跟踪分支

@@ -145,10 +148,10 @@ msgid ""

148 msgstr ""

149 "Project-Id-Version: Git\n"

150 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

148 -"POT-Creation-Date: 2023-03-07 23:37+0000\n"

149 -"PO-Revision-Date: 2023-03-07 23:40+0000\n"

150 -"Last-Translator: Fangyi Zhou <me@fangyi.io>\n"

151 -"Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"

151 +"POT-Creation-Date: 2023-05-20 12:27+0800\n"

152 +"PO-Revision-Date: 2023-05-20 12:38+0800\n"

153 +"Last-Translator: Teng Long <dyroneteng@gmail.com>\n"

154 +"Language-Team: GitHub <https://github.com/dyrone/git/>\n"

155 "Language: zh_CN\n"

156 "MIME-Version: 1.0\n"

157 "Content-Type: text/plain; charset=UTF-8\n"

@@ -916,6 +919,24 @@ msgstr "请在合并前先提交您的修改。"

919 msgid "Exiting because of unfinished merge."

920 msgstr "因为存在未完成的合并而退出。"

921

922 +#: advice.c

923 +msgid ""

924 +"Diverging branches can't be fast-forwarded, you need to either:\n"

925 +"\n"

926 +"\tgit merge --no-ff\n"

927 +"\n"

928 +"or:\n"

929 +"\n"

930 +"\tgit rebase\n"

931 +msgstr ""

932 +"无法在偏离的分支上进行快进操作，您需要:\n"

933 +"\n"

934 +"\tgit merge --no-ff\n"

935 +"\n"

936 +"或者：\n"

937 +"\n"

938 +"\tgit rebase\n"

939 +

940 #: advice.c

941 msgid "Not possible to fast-forward, aborting."

942 msgstr "无法快进，终止。"

@@ -1444,6 +1465,11 @@ msgstr "截短 .rej 文件名为 %.*s.rej"

1465 msgid "cannot open %s"

1466 msgstr "不能打开 %s"

1467

1468 +#: apply.c rerere.c

1469 +#, c-format

1470 +msgid "cannot unlink '%s'"

1471 +msgstr "不能删除 '%s'"

1472 +

1473 #: apply.c

1474 #, c-format

1475 msgid "Hunk #%d applied cleanly."

@@ -1681,6 +1707,11 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1707 msgid "cannot read '%s'"

1708 msgstr "不能读取 '%s'"

1709

1710 +#: archive.c

1711 +#, c-format

1712 +msgid "pathspec '%s' matches files outside the current directory"

1713 +msgstr "路径规格 '%s' 匹配了当前目录外的文件'"

1714 +

1715 #: archive.c builtin/add.c builtin/rm.c

1716 #, c-format

1717 msgid "pathspec '%s' did not match any files"

@@ -1701,10 +1732,6 @@ msgstr "不是一个有效的对象名：%s"

1732 msgid "not a tree object: %s"

1733 msgstr "不是一个树对象：%s"

1734

1704 -#: archive.c

1705 -msgid "current working directory is untracked"

1706 -msgstr "当前工作目录未被跟踪"

1707 -

1735 #: archive.c

1736 #, c-format

1737 msgid "File not found: %s"

@@ -1873,6 +1900,10 @@ msgstr "忽略过大的 gitattributes 文件 '%s'"

1900 msgid "ignoring overly large gitattributes blob '%s'"

1901 msgstr "忽略过大的 gitattributes 数据对象 '%s'"

1902

1903 +#: attr.c

1904 +msgid "bad --attr-source or GIT_ATTR_SOURCE"

1905 +msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE"

1906 +

1907 #: bisect.c

1908 #, c-format

1909 msgid "Badly quoted content in file '%s': %s"

@@ -1996,17 +2027,13 @@ msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

2027 msgid "--contents and --reverse do not blend well."

2028 msgstr "--contents 和 --reverse 不能混用。"

2029

1999 -#: blame.c

2000 -msgid "cannot use --contents with final commit object name"

2001 -msgstr "不能将 --contents 和最终的提交对象名共用"

2002 -

2030 #: blame.c

2031 msgid "--reverse and --first-parent together require specified latest commit"

2032 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

2033

2034 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c

2008 -#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c

2009 -#: remote.c sequencer.c submodule.c

2035 +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c

2036 +#: sequencer.c submodule.c

2037 msgid "revision walk setup failed"

2038 msgstr "版本遍历初始化失败"

2039

@@ -2200,11 +2227,6 @@ msgstr "子模组 '%s'：不能创建分支 '%s'"

2227 msgid "'%s' is already checked out at '%s'"

2228 msgstr "'%s' 已经检出到 '%s'"

2229

2203 -#: branch.c

2204 -#, c-format

2205 -msgid "HEAD of working tree %s is not updated"

2206 -msgstr "工作区 %s 的 HEAD 指向没有被更新"

2207 -

2230 #: builtin/add.c

2231 msgid "git add [<options>] [--] <pathspec>..."

2232 msgstr "git add [<选项>] [--] <路径规格>..."

@@ -2472,7 +2494,7 @@ msgstr "fseek 失败"

2494 msgid "could not open '%s' for reading"

2495 msgstr "无法打开 '%s' 进行读取"

2496

2475 -#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c

2497 +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c

2498 #, c-format

2499 msgid "could not open '%s' for writing"

2500 msgstr "无法打开 '%s' 进行写入"

@@ -3494,6 +3516,15 @@ msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"

3516 msgid "remote-tracking branch '%s' not found."

3517 msgstr "未能找到远程跟踪分支 '%s'。"

3518

3519 +#: builtin/branch.c

3520 +#, c-format

3521 +msgid ""

3522 +"branch '%s' not found.\n"

3523 +"Did you forget --remote?"

3524 +msgstr ""

3525 +"分支 '%s' 未找到。\n"

3526 +"是否忘记指定 --remote 选项？"

3527 +

3528 #: builtin/branch.c

3529 #, c-format

3530 msgid "branch '%s' not found."

@@ -3532,6 +3563,11 @@ msgstr "分支 %s 正被变基到 %s"

3563 msgid "Branch %s is being bisected at %s"

3564 msgstr "分支 %s 正被二分查找于 %s"

3565

3566 +#: builtin/branch.c

3567 +#, c-format

3568 +msgid "HEAD of working tree %s is not updated"

3569 +msgstr "工作区 %s 的 HEAD 指向没有被更新"

3570 +

3571 #: builtin/branch.c

3572 #, c-format

3573 msgid "Invalid branch name: '%s'"

@@ -3661,6 +3697,10 @@ msgstr "移动/重命名一个分支，以及它的引用日志"

3697 msgid "move/rename a branch, even if target exists"

3698 msgstr "移动/重命名一个分支，即使目标已存在"

3699

3700 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c

3701 +msgid "do not output a newline after empty formatted refs"

3702 +msgstr "在格式化引用结果为空之后，不输出换行符"

3703 +

3704 #: builtin/branch.c

3705 msgid "copy a branch and its reflog"

3706 msgstr "拷贝一个分支和它的引用日志"

@@ -3928,12 +3968,10 @@ msgstr "在 '%s' 创建了新报告。\n"

3968

3969 #: builtin/bundle.c

3970 msgid ""

3931 -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3932 -"progress-implied]\n"

3971 +"git bundle create [-q | --quiet | --progress]\n"

3972 " [--version=<version>] <file> <git-rev-list-args>"

3973 msgstr ""

3935 -"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"

3936 -"progress-implied]\n"

3974 +"git bundle create [-q | --quiet | --progress]\n"

3975 " [--version=<版本>] <文件> <git-rev-list-参数>"

3976

3977 #: builtin/bundle.c

@@ -3960,13 +3998,13 @@ msgstr "不显示进度表"

3998 msgid "show progress meter"

3999 msgstr "显示进度表"

4000

3963 -#: builtin/bundle.c builtin/pack-objects.c

3964 -msgid "show progress meter during object writing phase"

3965 -msgstr "在对象写入阶段显示进度表"

4001 +#: builtin/bundle.c

4002 +msgid "historical; same as --progress"

4003 +msgstr "老的参数；等同于 --progress"

4004

3967 -#: builtin/bundle.c builtin/pack-objects.c

3968 -msgid "similar to --all-progress when progress meter is shown"

3969 -msgstr "当进度表显示时类似于 --all-progress"

4005 +#: builtin/bundle.c

4006 +msgid "historical; does nothing"

4007 +msgstr "老的参数；无作用"

4008

4009 #: builtin/bundle.c

4010 msgid "specify bundle format version"

@@ -5214,6 +5252,11 @@ msgstr "无法对 '%s' 调用 stat"

5252 msgid "%s exists and is not a directory"

5253 msgstr "%s 存在且不是一个目录"

5254

5255 +#: builtin/clone.c

5256 +#, c-format

5257 +msgid "'%s' is a symlink, refusing to clone with --local"

5258 +msgstr "'%s' 为符号链接，拒绝用 --local 克隆"

5259 +

5260 #: builtin/clone.c

5261 #, c-format

5262 msgid "failed to start iterator over '%s'"

@@ -6001,7 +6044,7 @@ msgstr "计算完整的领先/落后值"

6044 msgid "version"

6045 msgstr "版本"

6046

6004 -#: builtin/commit.c builtin/push.c builtin/worktree.c

6047 +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c

6048 msgid "machine-readable output"

6049 msgstr "机器可读的输出"

6050

@@ -7076,145 +7119,15 @@ msgstr "git fetch --all [<选项>]"

7119 msgid "fetch.parallel cannot be negative"

7120 msgstr "fetch.parallel 不能为负数"

7121

7079 -#: builtin/fetch.c builtin/pull.c

7080 -msgid "fetch from all remotes"

7081 -msgstr "从所有的远程抓取"

7082 -

7083 -#: builtin/fetch.c builtin/pull.c

7084 -msgid "set upstream for git pull/fetch"

7085 -msgstr "为 git pull/fetch 设置上游"

7086 -

7087 -#: builtin/fetch.c builtin/pull.c

7088 -msgid "append to .git/FETCH_HEAD instead of overwriting"

7089 -msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

7090 -

7091 -#: builtin/fetch.c

7092 -msgid "use atomic transaction to update references"

7093 -msgstr "使用原子事务更新引用"

7094 -

7095 -#: builtin/fetch.c builtin/pull.c

7096 -msgid "path to upload pack on remote end"

7097 -msgstr "上传包到远程的路径"

7098 -

7099 -#: builtin/fetch.c

7100 -msgid "force overwrite of local reference"

7101 -msgstr "强制覆盖本地引用"

7102 -

7103 -#: builtin/fetch.c

7104 -msgid "fetch from multiple remotes"

7105 -msgstr "从多个远程抓取"

7106 -

7107 -#: builtin/fetch.c builtin/pull.c

7108 -msgid "fetch all tags and associated objects"

7109 -msgstr "抓取所有的标签和关联对象"

7110 -

7111 -#: builtin/fetch.c

7112 -msgid "do not fetch all tags (--no-tags)"

7113 -msgstr "不抓取任何标签(--no-tags)"

7114 -

7115 -#: builtin/fetch.c

7116 -msgid "number of submodules fetched in parallel"

7117 -msgstr "子模组获取的并发数"

7118 -

7119 -#: builtin/fetch.c

7120 -msgid "modify the refspec to place all refs within refs/prefetch/"

7121 -msgstr "修改引用规格以将所有引用放入 refs/prefetch/"

7122 -

7123 -#: builtin/fetch.c builtin/pull.c

7124 -msgid "prune remote-tracking branches no longer on remote"

7125 -msgstr "清除远程已经不存在的分支的跟踪分支"

7126 -

7127 -#: builtin/fetch.c

7128 -msgid "prune local tags no longer on remote and clobber changed tags"

7129 -msgstr "清除远程不存在的本地标签，并且替换变更标签"

7130 -

7131 -# 译者：可选值，不能翻译

7132 -#: builtin/fetch.c builtin/pull.c

7133 -msgid "on-demand"

7134 -msgstr "on-demand"

7135 -

7136 -#: builtin/fetch.c

7137 -msgid "control recursive fetching of submodules"

7138 -msgstr "控制子模组的递归抓取"

7139 -

7140 -#: builtin/fetch.c

7141 -msgid "write fetched references to the FETCH_HEAD file"

7142 -msgstr "将获取到的引用写入 FETCH_HEAD 文件"

7143 -

7144 -#: builtin/fetch.c builtin/pull.c

7145 -msgid "keep downloaded pack"

7146 -msgstr "保持下载包"

7147 -

7148 -#: builtin/fetch.c

7149 -msgid "allow updating of HEAD ref"

7150 -msgstr "允许更新 HEAD 引用"

7151 -

7152 -#: builtin/fetch.c builtin/pull.c

7153 -msgid "deepen history of shallow clone"

7154 -msgstr "深化浅克隆的历史"

7155 -

7156 -#: builtin/fetch.c builtin/pull.c

7157 -msgid "deepen history of shallow repository based on time"

7158 -msgstr "基于时间来深化浅克隆的历史"

7159 -

7160 -#: builtin/fetch.c builtin/pull.c

7161 -msgid "convert to a complete repository"

7162 -msgstr "转换为一个完整的仓库"

7163 -

7164 -#: builtin/fetch.c

7165 -msgid "re-fetch without negotiating common commits"

7166 -msgstr "不协商共有提交重新获取"

7167 -

7168 -#: builtin/fetch.c

7169 -msgid "prepend this to submodule path output"

7170 -msgstr "在子模组路径输出的前面加上此目录"

7171 -

7172 -#: builtin/fetch.c

7173 -msgid ""

7174 -"default for recursive fetching of submodules (lower priority than config "

7175 -"files)"

7176 -msgstr "递归获取子模组的缺省值（比配置文件优先级低）"

7177 -

7178 -#: builtin/fetch.c builtin/pull.c

7179 -msgid "accept refs that update .git/shallow"

7180 -msgstr "接受更新 .git/shallow 的引用"

7181 -

7182 -#: builtin/fetch.c builtin/pull.c

7183 -msgid "refmap"

7184 -msgstr "引用映射"

7185 -

7186 -#: builtin/fetch.c builtin/pull.c

7187 -msgid "specify fetch refmap"

7188 -msgstr "指定获取操作的引用映射"

7189 -

7190 -#: builtin/fetch.c builtin/pull.c

7191 -msgid "report that we have only objects reachable from this object"

7192 -msgstr "报告我们只拥有从该对象开始可达的对象"

7193 -

7194 -#: builtin/fetch.c

7195 -msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

7196 -msgstr "不获取包文件；而是打印协商的祖先提交"

7197 -

7198 -#: builtin/fetch.c

7199 -msgid "run 'maintenance --auto' after fetching"

7200 -msgstr "获取后执行 'maintenance --auto'"

7201 -

7202 -#: builtin/fetch.c builtin/pull.c

7203 -msgid "check for forced-updates on all updated branches"

7204 -msgstr "在所有更新分支上检查强制更新"

7205 -

7206 -#: builtin/fetch.c

7207 -msgid "write the commit-graph after fetching"

7208 -msgstr "抓取后写提交图"

7209 -

7210 -#: builtin/fetch.c

7211 -msgid "accept refspecs from stdin"

7212 -msgstr "从标准输入获取引用规格"

7213 -

7122 #: builtin/fetch.c

7123 msgid "couldn't find remote ref HEAD"

7124 msgstr "无法发现远程 HEAD 引用"

7125

7126 +#: builtin/fetch.c

7127 +#, c-format

7128 +msgid "From %.*s\n"

7129 +msgstr "来自 %.*s\n"

7130 +

7131 #: builtin/fetch.c

7132 #, c-format

7133 msgid "object %s not found"

@@ -7300,11 +7213,6 @@ msgstr "%s 未发送所有必需的对象\n"

7213 msgid "rejected %s because shallow roots are not allowed to be updated"

7214 msgstr "拒绝 %s 因为浅克隆的根不允许被更新"

7215

7303 -#: builtin/fetch.c

7304 -#, c-format

7305 -msgid "From %.*s\n"

7306 -msgstr "来自 %.*s\n"

7307 -

7216 #: builtin/fetch.c

7217 #, c-format

7218 msgid ""

@@ -7415,6 +7323,141 @@ msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或

7323 msgid "you need to specify a tag name"

7324 msgstr "您需要指定一个标签名称"

7325

7326 +#: builtin/fetch.c builtin/pull.c

7327 +msgid "fetch from all remotes"

7328 +msgstr "从所有远程抓取"

7329 +

7330 +#: builtin/fetch.c builtin/pull.c

7331 +msgid "set upstream for git pull/fetch"

7332 +msgstr "为 git pull/fetch 设置上游"

7333 +

7334 +#: builtin/fetch.c builtin/pull.c

7335 +msgid "append to .git/FETCH_HEAD instead of overwriting"

7336 +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

7337 +

7338 +#: builtin/fetch.c

7339 +msgid "use atomic transaction to update references"

7340 +msgstr "使用原子事务更新引用"

7341 +

7342 +#: builtin/fetch.c builtin/pull.c

7343 +msgid "path to upload pack on remote end"

7344 +msgstr "上传包到远程的路径"

7345 +

7346 +#: builtin/fetch.c

7347 +msgid "force overwrite of local reference"

7348 +msgstr "强制覆盖本地引用"

7349 +

7350 +#: builtin/fetch.c

7351 +msgid "fetch from multiple remotes"

7352 +msgstr "从多个远程抓取"

7353 +

7354 +#: builtin/fetch.c builtin/pull.c

7355 +msgid "fetch all tags and associated objects"

7356 +msgstr "抓取所有的标签和关联对象"

7357 +

7358 +#: builtin/fetch.c

7359 +msgid "do not fetch all tags (--no-tags)"

7360 +msgstr "不抓取任何标签（--no-tags）"

7361 +

7362 +#: builtin/fetch.c

7363 +msgid "number of submodules fetched in parallel"

7364 +msgstr "获取子模组的并发数"

7365 +

7366 +#: builtin/fetch.c

7367 +msgid "modify the refspec to place all refs within refs/prefetch/"

7368 +msgstr "修改引用规格以将所有引用放入 refs/prefetch/"

7369 +

7370 +#: builtin/fetch.c builtin/pull.c

7371 +msgid "prune remote-tracking branches no longer on remote"

7372 +msgstr "清除远程已经不存在的分支的跟踪分支"

7373 +

7374 +#: builtin/fetch.c

7375 +msgid "prune local tags no longer on remote and clobber changed tags"

7376 +msgstr "清除远程不存在的本地标签，并且替换变更标签"

7377 +

7378 +# 译者：可选值，不能翻译

7379 +#: builtin/fetch.c builtin/pull.c

7380 +msgid "on-demand"

7381 +msgstr "on-demand"

7382 +

7383 +#: builtin/fetch.c

7384 +msgid "control recursive fetching of submodules"

7385 +msgstr "控制子模组的递归抓取"

7386 +

7387 +#: builtin/fetch.c

7388 +msgid "write fetched references to the FETCH_HEAD file"

7389 +msgstr "将获取到的引用写入 FETCH_HEAD 文件"

7390 +

7391 +#: builtin/fetch.c builtin/pull.c

7392 +msgid "keep downloaded pack"

7393 +msgstr "保持已下载的包"

7394 +

7395 +#: builtin/fetch.c

7396 +msgid "allow updating of HEAD ref"

7397 +msgstr "允许更新 HEAD 引用"

7398 +

7399 +#: builtin/fetch.c builtin/pull.c

7400 +msgid "deepen history of shallow clone"

7401 +msgstr "深化浅克隆的历史"

7402 +

7403 +#: builtin/fetch.c builtin/pull.c

7404 +msgid "deepen history of shallow repository based on time"

7405 +msgstr "基于时间来深化浅克隆的历史"

7406 +

7407 +#: builtin/fetch.c builtin/pull.c

7408 +msgid "convert to a complete repository"

7409 +msgstr "转换为一个完整的仓库"

7410 +

7411 +#: builtin/fetch.c

7412 +msgid "re-fetch without negotiating common commits"

7413 +msgstr "重新获取而不协商共同提交"

7414 +

7415 +#: builtin/fetch.c

7416 +msgid "prepend this to submodule path output"

7417 +msgstr "在子模组路径输出的前面加上此目录"

7418 +

7419 +#: builtin/fetch.c

7420 +msgid ""

7421 +"default for recursive fetching of submodules (lower priority than config "

7422 +"files)"

7423 +msgstr "递归获取子模组的缺省值（比配置文件优先级低）"

7424 +

7425 +#: builtin/fetch.c builtin/pull.c

7426 +msgid "accept refs that update .git/shallow"

7427 +msgstr "接受更新 .git/shallow 的引用"

7428 +

7429 +#: builtin/fetch.c builtin/pull.c

7430 +msgid "refmap"

7431 +msgstr "引用映射"

7432 +

7433 +#: builtin/fetch.c builtin/pull.c

7434 +msgid "specify fetch refmap"

7435 +msgstr "指定获取操作的引用映射"

7436 +

7437 +#: builtin/fetch.c builtin/pull.c

7438 +msgid "report that we have only objects reachable from this object"

7439 +msgstr "报告我们只拥有从该对象开始可达的对象"

7440 +

7441 +#: builtin/fetch.c

7442 +msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"

7443 +msgstr "不获取包文件；而是打印协商的祖先提交"

7444 +

7445 +#: builtin/fetch.c

7446 +msgid "run 'maintenance --auto' after fetching"

7447 +msgstr "获取后执行 'maintenance --auto'"

7448 +

7449 +#: builtin/fetch.c builtin/pull.c

7450 +msgid "check for forced-updates on all updated branches"

7451 +msgstr "在所有更新分支上检查强制更新"

7452 +

7453 +#: builtin/fetch.c

7454 +msgid "write the commit-graph after fetching"

7455 +msgstr "抓取后写提交图"

7456 +

7457 +#: builtin/fetch.c

7458 +msgid "accept refspecs from stdin"

7459 +msgstr "从标准输入获取引用规格"

7460 +

7461 #: builtin/fetch.c

7462 msgid "--negotiate-only needs one or more --negotiation-tip=*"

7463 msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*"

@@ -7560,6 +7603,14 @@ msgstr "只打印包含该提交的引用"

7603 msgid "print only refs which don't contain the commit"

7604 msgstr "只打印不包含该提交的引用"

7605

7606 +#: builtin/for-each-ref.c

7607 +msgid "read reference patterns from stdin"

7608 +msgstr "从标准输入读取引用的模式"

7609 +

7610 +#: builtin/for-each-ref.c

7611 +msgid "unknown arguments supplied with --stdin"

7612 +msgstr "为 --stdin 提供了未知的命令参数"

7613 +

7614 #: builtin/for-each-repo.c

7615 msgid "git for-each-repo --config=<config> [--] <arguments>"

7616 msgstr "git for-each-repo --config=<配置> [--] <命令参数>"

@@ -7576,6 +7627,11 @@ msgstr "存储着仓库路径列表的配置项键名"

7627 msgid "missing --config=<config>"

7628 msgstr "缺少 --config=<配置>"

7629

7630 +#: builtin/for-each-repo.c

7631 +#, c-format

7632 +msgid "got bad config --config=%s"

7633 +msgstr "发现错误的配置行 --config=%s"

7634 +

7635 #: builtin/fsck.c

7636 msgid "unknown"

7637 msgstr "未知"

@@ -7761,13 +7817,14 @@ msgid "notice: %s points to an unborn branch (%s)"

7817 msgstr "注意：%s 指向一个尚未诞生的分支（%s）"

7818

7819 #: builtin/fsck.c

7764 -msgid "Checking cache tree"

7765 -msgstr "正在检查缓存树"

7820 +#, c-format

7821 +msgid "Checking cache tree of %s"

7822 +msgstr "正在检查缓存树 %s"

7823

7824 #: builtin/fsck.c

7825 #, c-format

7769 -msgid "%s: invalid sha1 pointer in cache-tree"

7770 -msgstr "%s：cache-tree 中无效的 sha1 指针"

7826 +msgid "%s: invalid sha1 pointer in cache-tree of %s"

7827 +msgstr "%s：cache-tree %s 中存在无效的 sha1 指针"

7828

7829 #: builtin/fsck.c

7830 msgid "non-tree in cache-tree"

@@ -7775,8 +7832,18 @@ msgstr "cache-tree 中非树对象"

7832

7833 #: builtin/fsck.c

7834 #, c-format

7778 -msgid "%s: invalid sha1 pointer in resolve-undo"

7779 -msgstr "%s：resolve-undo 中无效的 sha1 指针"

7835 +msgid "%s: invalid sha1 pointer in resolve-undo of %s"

7836 +msgstr "%s：resolve-undo %s 中存在无效的 sha1 指针"

7837 +

7838 +#: builtin/fsck.c

7839 +#, c-format

7840 +msgid "unable to load rev-index for pack '%s'"

7841 +msgstr "无法为包文件 %s 加载反向索引"

7842 +

7843 +#: builtin/fsck.c

7844 +#, c-format

7845 +msgid "invalid rev-index for pack '%s'"

7846 +msgstr "包文件 '%s' 的反向索引文件无效"

7847

7848 #: builtin/fsck.c

7849 msgid ""

@@ -10371,7 +10438,7 @@ msgstr "对于 %s 没有来自 %s 的远程跟踪分支"

10438 msgid "Bad value '%s' in environment '%s'"

10439 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"

10440

10374 -#: builtin/merge.c read-cache.c strbuf.c wrapper.c

10441 +#: builtin/merge.c editor.c read-cache.c wrapper.c

10442 #, c-format

10443 msgid "could not close '%s'"

10444 msgstr "不能关闭 '%s'"

@@ -11204,7 +11271,7 @@ msgstr "无法写入位图索引"

11271 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"

11272 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"

11273

11207 -#: builtin/pack-objects.c

11274 +#: builtin/pack-objects.c builtin/repack.c

11275 msgid "disabling bitmap writing, as some objects are not being packed"

11276 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"

11277

@@ -11370,6 +11437,14 @@ msgstr "不支持的索引版本 %s"

11437 msgid "bad index version '%s'"

11438 msgstr "坏的索引版本 '%s'"

11439

11440 +#: builtin/pack-objects.c

11441 +msgid "show progress meter during object writing phase"

11442 +msgstr "在对象写入阶段显示进度表"

11443 +

11444 +#: builtin/pack-objects.c

11445 +msgid "similar to --all-progress when progress meter is shown"

11446 +msgstr "当进度表显示时类似于 --all-progress"

11447 +

11448 #: builtin/pack-objects.c

11449 msgid "<version>[,<offset>]"

11450 msgstr "<版本>[,<偏移>]"

@@ -11611,6 +11686,10 @@ msgstr ""

11686 "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"

11687 "使用它。谢谢。\n"

11688

11689 +#: builtin/pack-redundant.c

11690 +msgid "refusing to run without --i-still-use-this"

11691 +msgstr "拒绝在未指定 --i-still-use-this 选项时运行"

11692 +

11693 #: builtin/pack-refs.c

11694 msgid "git pack-refs [--all] [--no-prune]"

11695 msgstr "git pack-refs [--all] [--no-prune]"

@@ -11812,9 +11891,9 @@ msgstr "更新尚未诞生的分支，变更添加至索引。"

11891 msgid "pull with rebase"

11892 msgstr "变基式拉取"

11893

11815 -#: builtin/pull.c

11816 -msgid "please commit or stash them."

11817 -msgstr "请提交或贮藏它们。"

11894 +#: builtin/pull.c builtin/rebase.c

11895 +msgid "Please commit or stash them."

11896 +msgstr "请提交或贮藏修改。"

11897

11898 #: builtin/pull.c

11899 #, c-format

@@ -12061,9 +12140,9 @@ msgstr "'%s' 的值无效"

12140 msgid "repository"

12141 msgstr "仓库"

12142

12064 -#: builtin/push.c builtin/send-pack.c

12065 -msgid "push all refs"

12066 -msgstr "推送所有引用"

12143 +#: builtin/push.c

12144 +msgid "push all branches"

12145 +msgstr "推送所有分支"

12146

12147 #: builtin/push.c builtin/send-pack.c

12148 msgid "mirror all refs"

@@ -12074,8 +12153,8 @@ msgid "delete refs"

12153 msgstr "删除引用"

12154

12155 #: builtin/push.c

12077 -msgid "push tags (can't be used with --all or --mirror)"

12078 -msgstr "推送标签（不能使用 --all or --mirror）"

12156 +msgid "push tags (can't be used with --all or --branches or --mirror)"

12157 +msgstr "推送标签（不能使用 --all or --branches or --mirror）"

12158

12159 #: builtin/push.c builtin/send-pack.c

12160 msgid "force updates"

@@ -12397,6 +12476,11 @@ msgstr ""

12476 "\n"

12477 "因此 git 无法对其变基。"

12478

12479 +#: builtin/rebase.c

12480 +#, c-format

12481 +msgid "Unknown rebase-merges mode: %s"

12482 +msgstr "未知的变基合并模式：%s"

12483 +

12484 #: builtin/rebase.c

12485 #, c-format

12486 msgid "could not switch to %s"

@@ -12413,6 +12497,16 @@ msgid ""

12497 "\"ask\"."

12498 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"

12499

12500 +#: builtin/rebase.c

12501 +msgid ""

12502 +"--rebase-merges with an empty string argument is deprecated and will stop "

12503 +"working in a future version of Git. Use --rebase-merges without an argument "

12504 +"instead, which does the same thing."

12505 +msgstr ""

12506 +"为 --rebase-merges 指定空值参数的方式已经被废弃并且在 Git 未来\n"

12507 +"的版本中将不再支持。支持使用无参数 --rebase-merges 的方式进行替\n"

12508 +"代，它们具有相同的作用。"

12509 +

12510 #: builtin/rebase.c

12511 #, c-format

12512 msgid ""

@@ -12675,20 +12769,21 @@ msgstr ""

12769 msgid "switch `C' expects a numerical value"

12770 msgstr "开关 `C' 期望一个数字值"

12771

12678 -#: builtin/rebase.c

12679 -#, c-format

12680 -msgid "Unknown mode: %s"

12681 -msgstr "未知模式：%s"

12682 -

12772 #: builtin/rebase.c

12773 msgid "--strategy requires --merge or --interactive"

12774 msgstr "--strategy 需要 --merge 或 --interactive"

12775

12776 #: builtin/rebase.c

12777 msgid ""

12689 -"apply options are incompatible with rebase.autosquash. Consider adding --no-"

12778 +"apply options are incompatible with rebase.autoSquash. Consider adding --no-"

12779 "autosquash"

12691 -msgstr "应用的选项与 rebase.autosquash 不兼容。考虑加上 --no-autosquash"

12780 +msgstr "应用的选项与 rebase.autoSquash 不兼容。考虑加上 --no-autosquash"

12781 +

12782 +#: builtin/rebase.c

12783 +msgid ""

12784 +"apply options are incompatible with rebase.rebaseMerges. Consider adding --"

12785 +"no-rebase-merges"

12786 +msgstr "应用的选项与 rebase.rebaseMerges 不兼容。考虑加上 --no-rebase-merges"

12787

12788 #: builtin/rebase.c

12789 msgid ""

@@ -12743,10 +12838,6 @@ msgstr "'%s'：只需要一个合并基线"

12838 msgid "Does not point to a valid commit '%s'"

12839 msgstr "没有指向一个有效的提交 '%s'"

12840

12746 -#: builtin/rebase.c

12747 -msgid "Please commit or stash them."

12748 -msgstr "请提交或贮藏修改。"

12749 -

12841 #: builtin/rebase.c

12842 msgid "HEAD is up to date."

12843 msgstr "HEAD 是最新的。"

@@ -13549,8 +13640,8 @@ msgid "approxidate"

13640 msgstr "近似日期"

13641

13642 #: builtin/repack.c

13552 -msgid "with -C, expire objects older than this"

13553 -msgstr "使用 -C，使早于给定时间的对象过期"

13643 +msgid "with --cruft, expire objects older than this"

13644 +msgstr "使用 --cruft，使早于给定时间的对象过期"

13645

13646 #: builtin/repack.c

13647 msgid "remove redundant packs, and run git-prune-packed"

@@ -14381,6 +14472,10 @@ msgstr ""

14472 msgid "remote name"

14473 msgstr "远程名称"

14474

14475 +#: builtin/send-pack.c

14476 +msgid "push all refs"

14477 +msgstr "推送所有引用"

14478 +

14479 #: builtin/send-pack.c

14480 msgid "use stateless RPC protocol"

14481 msgstr "使用无状态的 RPC 协议"

@@ -14638,9 +14733,11 @@ msgstr "显示从标准输入中读入的不在本地仓库中的引用"

14733

14734 #: builtin/sparse-checkout.c

14735 msgid ""

14737 +"rules) [<options>]"

14738 msgstr ""

14740 +"-rules) [<选项>]"

14741

14742 #: builtin/sparse-checkout.c

14743 msgid "this worktree is not sparse"

@@ -14780,6 +14877,26 @@ msgstr "必须在稀疏检出中重应用稀疏模式"

14877 msgid "error while refreshing working directory"

14878 msgstr "刷新工作目录时出错"

14879

14880 +#: builtin/sparse-checkout.c

14881 +msgid ""

14882 +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"

14883 +"file <file>]"

14884 +msgstr ""

14885 +"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"

14886 +"file <文件>]"

14887 +

14888 +#: builtin/sparse-checkout.c

14889 +msgid "terminate input and output files by a NUL character"

14890 +msgstr "输入和输出的文件使用 NUL 字符终结"

14891 +

14892 +#: builtin/sparse-checkout.c

14893 +msgid "when used with --rules-file interpret patterns as cone mode patterns"

14894 +msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析"

14895 +

14896 +#: builtin/sparse-checkout.c

14897 +msgid "use patterns in <file> instead of the current ones."

14898 +msgstr "从 <文件> 参数中读取模式，而不是从标准输入"

14899 +

14900 #: builtin/stash.c

14901 msgid "git stash list [<log-options>]"

14902 msgstr "git stash list [<日志选项>]"

@@ -18313,8 +18430,8 @@ msgid "bad zlib compression level %d"

18430 msgstr "错误的 zlib 压缩级别 %d"

18431

18432 #: config.c

18316 -msgid "core.commentChar should only be one character"

18317 -msgstr "core.commentChar 应该是一个字符"

18433 +msgid "core.commentChar should only be one ASCII character"

18434 +msgstr "core.commentChar 应该是一个 ASCII 编码的字符"

18435

18436 #: config.c

18437 #, c-format

@@ -18452,6 +18569,11 @@ msgstr "不能设置 '%s' 为 '%s'"

18569 msgid "invalid section name: %s"

18570 msgstr "无效的小节名称：%s"

18571

18572 +#: config.c

18573 +#, c-format

18574 +msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"

18575 +msgstr "拒绝支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"

18576 +

18577 #: config.c

18578 #, c-format

18579 msgid "missing value for '%s'"

@@ -19262,6 +19384,10 @@ msgstr "输出的每一行附加前缀"

19384 msgid "do not show any source or destination prefix"

19385 msgstr "不显示任何源和目标前缀"

19386

19387 +#: diff.c

19388 +msgid "use default prefixes a/ and b/"

19389 +msgstr "使用 a/ 和 b/ 作为默认前缀"

19390 +

19391 #: diff.c

19392 msgid "show context between diff hunks up to the specified number of lines"

19393 msgstr "显示指定行数的差异块间的上下文"

@@ -19631,6 +19757,16 @@ msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

19757 msgid "hint: Waiting for your editor to close the file...%c"

19758 msgstr "提示：等待您的编辑器关闭文件...%c"

19759

19760 +#: editor.c sequencer.c wrapper.c

19761 +#, c-format

19762 +msgid "could not write to '%s'"

19763 +msgstr "不能写入 '%s'"

19764 +

19765 +#: editor.c

19766 +#, c-format

19767 +msgid "could not edit '%s'"

19768 +msgstr "不能编辑 '%s'"

19769 +

19770 #: entry.c

19771 msgid "Filtering content"

19772 msgstr "过滤内容"

@@ -19997,6 +20133,11 @@ msgstr "应为 -c 提供一个配置字符串\n"

20133 msgid "no config key given for --config-env\n"

20134 msgstr "没有为 --config-env 提供配置名称\n"

20135

20136 +#: git.c

20137 +#, c-format

20138 +msgid "no attribute source given for --attr-source\n"

20139 +msgstr "没有为 --attr-source 提供属性来源\n"

20140 +

20141 #: git.c

20142 #, c-format

20143 msgid "unknown option: %s\n"

@@ -21978,6 +22119,11 @@ msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'"

22119 msgid "unable to get disk usage of '%s'"

22120 msgstr "无法得到 '%s' 的磁盘使用量"

22121

22122 +#: pack-bitmap.c

22123 +#, c-format

22124 +msgid "bitmap file '%s' has invalid checksum"

22125 +msgstr "位图文件 '%s' 有无效的校验码"

22126 +

22127 #: pack-mtimes.c

22128 #, c-format

22129 msgid "mtimes file %s is too small"

@@ -22028,6 +22174,15 @@ msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"

22174 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

22175 msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"

22176

22177 +#: pack-revindex.c

22178 +msgid "invalid checksum"

22179 +msgstr "无效的校验码 %s"

22180 +

22181 +#: pack-revindex.c

22182 +#, c-format

22183 +msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"

22184 +msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>"

22185 +

22186 #: pack-write.c

22187 msgid "cannot both write and verify reverse index"

22188 msgstr "无法同时写入和校验反向索引"

@@ -22882,6 +23037,11 @@ msgstr "未能识别的 %%(%s) 参数：%s"

23037 msgid "positive width expected with the %%(align) atom"

23038 msgstr "元素 %%(align) 需要一个正数的宽度"

23039

23040 +#: ref-filter.c

23041 +#, c-format

23042 +msgid "expected format: %%(ahead-behind:<committish>)"

23043 +msgstr "期望的格式：%%(ahead-behind:<提交号>)"

23044 +

23045 #: ref-filter.c

23046 #, c-format

23047 msgid "malformed field name: %.*s"

@@ -23635,11 +23795,6 @@ msgstr "无法更新 '%s' 中的冲突状态"

23795 msgid "no remembered resolution for '%s'"

23796 msgstr "没有为 '%s' 记忆的解决方案"

23797

23638 -#: rerere.c

23639 -#, c-format

23640 -msgid "cannot unlink '%s'"

23641 -msgstr "不能删除 '%s'"

23642 -

23798 #: rerere.c

23799 #, c-format

23800 msgid "Updated preimage for '%s'"

@@ -24052,11 +24207,6 @@ msgstr ""

24207 msgid "could not lock '%s'"

24208 msgstr "不能锁定 '%s'"

24209

24055 -#: sequencer.c strbuf.c wrapper.c

24056 -#, c-format

24057 -msgid "could not write to '%s'"

24058 -msgstr "不能写入 '%s'"

24059 -

24210 #: sequencer.c

24211 #, c-format

24212 msgid "could not write eol to '%s'"

@@ -24494,10 +24644,6 @@ msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""

24644 msgid "could not create sequencer directory '%s'"

24645 msgstr "不能创建序列目录 '%s'"

24646

24497 -#: sequencer.c

24498 -msgid "could not lock HEAD"

24499 -msgstr "不能锁定 HEAD"

24500 -

24647 #: sequencer.c

24648 msgid "no cherry-pick or revert in progress"

24649 msgstr "拣选或还原操作并未进行"

@@ -24612,21 +24758,21 @@ msgstr ""

24758 "\n"

24759

24760 #: sequencer.c

24615 -msgid "and made changes to the index and/or the working tree\n"

24616 -msgstr "并且修改索引和/或工作区\n"

24761 +msgid "and made changes to the index and/or the working tree.\n"

24762 +msgstr "并且修改索引和/或工作区。\n"

24763

24764 #: sequencer.c

24765 #, c-format

24766 msgid ""

24767 "execution succeeded: %s\n"

24622 -"but left changes to the index and/or the working tree\n"

24768 +"but left changes to the index and/or the working tree.\n"

24769 "Commit or stash your changes, and then run\n"

24770 "\n"

24771 " git rebase --continue\n"

24772 "\n"

24773 msgstr ""

24774 "执行成功：%s\n"

24629 -"但是在索引和/或工作区中存在变更\n"

24775 +"但是在索引和/或工作区中存在变更。\n"

24776 "提交或贮藏修改，然后运行\n"

24777 "\n"

24778 " git rebase --continue\n"

@@ -25148,11 +25294,6 @@ msgid_plural "%u bytes/s"

25294 msgstr[0] "%u 字节/秒"

25295 msgstr[1] "%u 字节/秒"

25296

25151 -#: strbuf.c

25152 -#, c-format

25153 -msgid "could not edit '%s'"

25154 -msgstr "不能编辑 '%s'"

25155 -

25297 #: submodule-config.c

25298 #, c-format

25299 msgid "ignoring suspicious submodule name: %s"

@@ -27244,14 +27385,19 @@ msgstr "(%s) 不能执行 '%s'"

27385

27386 #: git-send-email.perl

27387 #, perl-format

27247 -msgid "(%s) Adding %s: %s from: '%s'\n"

27248 -msgstr "(%s) 添加 %s: %s 自：'%s'\n"

27388 +msgid "(%s) Malformed output from '%s'"

27389 +msgstr "(%s) 非法的输出信息，来自于: '%s'"

27390

27391 #: git-send-email.perl

27392 #, perl-format

27393 msgid "(%s) failed to close pipe to '%s'"

27394 msgstr "(%s) 无法关闭管道至 '%s'"

27395

27396 +#: git-send-email.perl

27397 +#, perl-format

27398 +msgid "(%s) Adding %s: %s from: '%s'\n"

27399 +msgstr "(%s) 添加 %s: %s 自：'%s'\n"

27400 +

27401 #: git-send-email.perl

27402 msgid "cannot send message as 7bit"

27403 msgstr "不能以 7bit 形式发送信息"

l10n: zh_CN: Git 2.41.0 round #1