@matheusbsbs / matheus-bagliano / commits / 925035958b

l10n: zh_CN: updated translation for 2.50

Helped-by: 依云 <lilydjwg@gmail.com> Helped-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Teng Long <dyroneteng@gmail.com>

Teng Long committed Jun 11, 2025 at 22:04 UTC 925035958b366eacad03dd6abc399af7ab5db810
1 file changed +344 -481
po/zh_CN.po
+344 -481
@@ -155,8 +155,8 @@ msgid ""
155 msgstr ""
156 "Project-Id-Version: Git\n"
157 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
158 -"POT-Creation-Date: 2025-03-09 20:34+0800\n"
159 -"PO-Revision-Date: 2025-03-12 14:47+0800\n"
158 +"POT-Creation-Date: 2025-06-08 20:30+0800\n"
159 +"PO-Revision-Date: 2025-06-12 14:50+0800\n"
160 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
161 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
162 "Language: zh_CN\n"
@@ -1075,10 +1075,9 @@ msgstr "未能识别的空白字符忽略选项 '%s'"
1075 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
1076 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
1077 #: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
1078 -#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
1079 -#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
1080 -#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
1081 -#: range-diff.c revision.c
1078 +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
1079 +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
1080 +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
1081 #, c-format
1082 msgid "options '%s' and '%s' cannot be used together"
1083 msgstr "选项 '%s' 和 '%s' 不能同时使用"
@@ -1965,7 +1964,7 @@ msgstr "无法在没有仓库的情况下使用 --attr-source 或 GIT_ATTR_SOURC
1964 msgid "bad --attr-source or GIT_ATTR_SOURCE"
1965 msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE"
1966
1968 -#: attr.c read-cache.c
1967 +#: attr.c read-cache.c refs/packed-backend.c
1968 #, c-format
1969 msgid "unable to stat '%s'"
1970 msgstr "无法对 %s 执行 stat"
@@ -2777,7 +2776,7 @@ msgstr "以交互式方式运行"
2776 msgid "bypass pre-applypatch and applypatch-msg hooks"
2777 msgstr "绕过 pre-applypatch 和 applypatch-msg 钩子"
2778
2780 -#: builtin/am.c
2779 +#: builtin/am.c builtin/cat-file.c
2780 msgid "historical option -- no-op"
2781 msgstr "老的参数 —— 无作用"
2782
@@ -4084,7 +4083,7 @@ msgstr "需要一个仓库来解开归档包。"
4083 msgid "Unbundling objects"
4084 msgstr "解包对象中"
4085
4087 -#: builtin/cat-file.c merge-recursive.c
4086 +#: builtin/cat-file.c
4087 #, c-format
4088 msgid "cannot read object %s '%s'"
4089 msgstr "不能读取对象 %s '%s'"
@@ -4121,12 +4120,8 @@ msgid "git cat-file <type> <object>"
4120 msgstr "git cat-file <类型> <对象>"
4121
4122 #: builtin/cat-file.c
4124 -msgid "git cat-file (-e | -p) <object>"
4125 -msgstr "git cat-file (-e | -p) <对象>"
4126 -
4127 -#: builtin/cat-file.c
4128 -msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
4129 -msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>"
4123 +msgid "git cat-file (-e | -p | -t | -s) <object>"
4124 +msgstr "git cat-file (-e | -p | -t | -s) <对象>"
4125
4126 #: builtin/cat-file.c
4127 msgid ""
@@ -4172,10 +4167,6 @@ msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中
4167 msgid "show object size"
4168 msgstr "显示对象大小"
4169
4175 -#: builtin/cat-file.c
4176 -msgid "allow -s and -t to work with broken/corrupt objects"
4177 -msgstr "允许 -s 和 -t 对损坏的对象生效"
4178 -
4170 #: builtin/cat-file.c builtin/log.c
4171 msgid "use mail map file"
4172 msgstr "使用邮件映射文件"
@@ -4246,6 +4237,15 @@ msgstr "数据对象|树"
4237 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"
4238 msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'"
4239
4240 +#: builtin/cat-file.c
4241 +msgid "objects filter only supported in batch mode"
4242 +msgstr "对象过滤器只支持批处理模式"
4243 +
4244 +#: builtin/cat-file.c
4245 +#, c-format
4246 +msgid "objects filter not supported: '%s'"
4247 +msgstr "不支持对象过滤器：'%s'"
4248 +
4249 #: builtin/cat-file.c
4250 #, c-format
4251 msgid "'%s=<%s>' needs '%s' or '%s'"
@@ -5952,7 +5952,7 @@ msgstr "不能读取 MERGE_MSG"
5952 #: builtin/commit.c bundle.c rerere.c sequencer.c
5953 #, c-format
5954 msgid "could not open '%s'"
5955 -msgstr "不能打开 '%s'"
5955 +msgstr "无法打开 '%s'"
5956
5957 #: builtin/commit.c
5958 msgid "could not write commit template"
@@ -7038,6 +7038,64 @@ msgstr "指定文件的 strftime 格式后缀"
7038 msgid "specify the content of the diagnostic archive"
7039 msgstr "指定诊断信息归档包的内容"
7040
7041 +#: builtin/diff-pairs.c
7042 +#, c-format
7043 +msgid "unable to parse mode: %s"
7044 +msgstr "不能解析模式：%s"
7045 +
7046 +#: builtin/diff-pairs.c
7047 +#, c-format
7048 +msgid "unable to parse object id: %s"
7049 +msgstr "不能解析对象ID：%s"
7050 +
7051 +#: builtin/diff-pairs.c
7052 +msgid "git diff-pairs -z [<diff-options>]"
7053 +msgstr "git diff-pairs -z [<差异选项>]"
7054 +
7055 +#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c
7056 +#: bundle.c
7057 +#, c-format
7058 +msgid "unrecognized argument: %s"
7059 +msgstr "未识别的参数：%s"
7060 +
7061 +#: builtin/diff-pairs.c
7062 +msgid "working without -z is not supported"
7063 +msgstr "不支持在不带 -z 参数的情况下工作"
7064 +
7065 +#: builtin/diff-pairs.c
7066 +msgid "pathspec arguments not supported"
7067 +msgstr "不支持路径规格参数"
7068 +
7069 +#: builtin/diff-pairs.c
7070 +msgid "revision arguments not allowed"
7071 +msgstr "不支持版本参数"
7072 +
7073 +#: builtin/diff-pairs.c
7074 +msgid "invalid raw diff input"
7075 +msgstr "无效的原始 diff 输入"
7076 +
7077 +#: builtin/diff-pairs.c
7078 +msgid "tree objects not supported"
7079 +msgstr "不支持树对象"
7080 +
7081 +#: builtin/diff-pairs.c
7082 +msgid "got EOF while reading path"
7083 +msgstr "读取路径时遇到文件结束"
7084 +
7085 +#: builtin/diff-pairs.c
7086 +msgid "got EOF while reading destination path"
7087 +msgstr "读取目标路径时遇到文件结束"
7088 +
7089 +#: builtin/diff-pairs.c
7090 +#, c-format
7091 +msgid "unable to parse rename/copy score: %s"
7092 +msgstr "无法解析重命名/复制分数：%s"
7093 +
7094 +#: builtin/diff-pairs.c
7095 +#, c-format
7096 +msgid "unknown diff status: %c"
7097 +msgstr "未知的差异状态：%c"
7098 +
7099 #: builtin/diff-tree.c
7100 msgid "--merge-base only works with two commits"
7101 msgstr "--merge-base 仅适用于两个提交"
@@ -7214,6 +7272,10 @@ msgstr "在 <n> 个对象之后显示进度"
7272 msgid "select handling of signed tags"
7273 msgstr "选择如何处理签名标签"
7274
7275 +#: builtin/fast-export.c
7276 +msgid "select handling of signed commits"
7277 +msgstr "选择如何处理已签名提交"
7278 +
7279 #: builtin/fast-export.c
7280 msgid "select handling of tags that tag filtered objects"
7281 msgstr "选择当标签指向被过滤对象时该标签的处理方式"
@@ -7474,7 +7536,7 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7536 msgid "option \"%s\" is ignored for %s"
7537 msgstr "选项 \"%s\" 为 %s 所忽略"
7538
7477 -#: builtin/fetch.c object-file.c
7539 +#: builtin/fetch.c object-store.c
7540 #, c-format
7541 msgid "%s is not a valid object"
7542 msgstr "%s 不是一个有效的对象"
@@ -8011,11 +8073,6 @@ msgstr "%s：哈希路径不匹配，发现于 %s"
8073 msgid "%s: object corrupt or missing: %s"
8074 msgstr "%s：对象损坏或丢失：%s"
8075
8014 -#: builtin/fsck.c
8015 -#, c-format
8016 -msgid "%s: object is of unknown type '%s': %s"
8017 -msgstr "%s：对象有未知的类型 '%s': %s"
8018 -
8076 #: builtin/fsck.c
8077 #, c-format
8078 msgid "%s: object could not be parsed: %s"
@@ -8088,17 +8145,21 @@ msgstr "无法为包文件 %s 加载反向索引"
8145 msgid "invalid rev-index for pack '%s'"
8146 msgstr "包文件 '%s' 的反向索引文件无效"
8147
8148 +#: builtin/fsck.c
8149 +msgid "Checking ref database"
8150 +msgstr "正在检查引用数据库"
8151 +
8152 #: builtin/fsck.c
8153 msgid ""
8154 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
8155 " [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
8156 " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
8096 -" [--[no-]name-objects] [<object>...]"
8157 +" [--[no-]name-objects] [--[no-]references] [<object>...]"
8158 msgstr ""
8159 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
8160 " [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
8161 " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
8101 -" [--[no-]name-objects] [<对象>...]"
8162 +" [--[no-]name-objects] [--[no-]references] [<对象>...]"
8163
8164 #: builtin/fsck.c
8165 msgid "show unreachable objects"
@@ -8148,6 +8209,10 @@ msgstr "显示进度"
8209 msgid "show verbose names for reachable objects"
8210 msgstr "显示可达对象的详细名称"
8211
8212 +#: builtin/fsck.c
8213 +msgid "check reference database consistency"
8214 +msgstr "检查引用数据库一致性"
8215 +
8216 #: builtin/fsck.c builtin/index-pack.c
8217 msgid "Checking objects"
8218 msgstr "正在检查对象"
@@ -9580,11 +9645,6 @@ msgid ""
9645 "<file>"
9646 msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
9647
9583 -#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
9584 -#, c-format
9585 -msgid "unrecognized argument: %s"
9586 -msgstr "未能识别的参数：%s"
9587 -
9648 #: builtin/log.c
9649 msgid "-L<range>:<file> cannot be used with pathspec"
9650 msgstr "-L<范围>:<文件> 不能和路径表达式共用"
@@ -9602,7 +9662,7 @@ msgstr "git show %s: 损坏的文件"
9662 #: builtin/log.c
9663 #, c-format
9664 msgid "could not read object %s"
9605 -msgstr "不能读取对象 %s"
9665 +msgstr "无法读取对象 %s"
9666
9667 #: builtin/log.c
9668 #, c-format
@@ -10419,6 +10479,10 @@ msgstr "只进行简单的合并"
10479 msgid "also show informational/conflict messages"
10480 msgstr "同时显示额外信息/冲突消息"
10481
10482 +#: builtin/merge-tree.c
10483 +msgid "suppress all output; only exit status wanted"
10484 +msgstr "抑制所有输出；只保留退出状态"
10485 +
10486 #: builtin/merge-tree.c
10487 msgid "list filenames without modes/oids/stages"
10488 msgstr "列出没有模式/对象 ID/暂存的文件名"
@@ -10580,7 +10644,7 @@ msgstr "读取树失败"
10644 msgid "Already up to date. (nothing to squash)"
10645 msgstr "已经是最新的。（无可挤压）"
10646
10583 -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
10647 +#: builtin/merge.c merge-ort-wrappers.c
10648 msgid "Already up to date."
10649 msgstr "已经是最新的。"
10650
@@ -10604,7 +10668,7 @@ msgstr "'%s' 没有指向一个提交"
10668 msgid "Bad branch.%s.mergeoptions string: %s"
10669 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
10670
10607 -#: builtin/merge.c merge-recursive.c
10671 +#: builtin/merge.c merge-ort-wrappers.c
10672 msgid "Unable to write index."
10673 msgstr "不能写入索引。"
10674
@@ -10760,7 +10824,7 @@ msgstr "只能将一个提交合并到空分支上"
10824 msgid "Updating %s..%s\n"
10825 msgstr "更新 %s..%s\n"
10826
10763 -#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
10827 +#: builtin/merge.c merge-ort-wrappers.c
10828 #, c-format
10829 msgid ""
10830 "Your local changes to the following files would be overwritten by merge:\n"
@@ -10922,8 +10986,12 @@ msgid ""
10986 msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
10987
10988 #: builtin/mv.c
10925 -msgid "git mv [<options>] <source>... <destination>"
10926 -msgstr "git mv [<选项>] <源>... <目标>"
10989 +msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>"
10990 +msgstr "git mv [-v] [-f] [-n] [-k] <源> <目标>"
10991 +
10992 +#: builtin/mv.c
10993 +msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>"
10994 +msgstr "git mv [-v] [-f] [-n] [-k] <源>... <目标目录>"
10995
10996 #: builtin/mv.c
10997 #, c-format
@@ -11011,6 +11079,11 @@ msgstr "目标在索引中已存在"
11079 msgid "%s, source=%s, destination=%s"
11080 msgstr "%s，源=%s，目标=%s"
11081
11082 +#: builtin/mv.c
11083 +#, c-format
11084 +msgid "cannot move both '%s' and its parent directory '%s'"
11085 +msgstr "不能同时移动 '%s' 及其父目录 '%s'"
11086 +
11087 #: builtin/mv.c
11088 #, c-format
11089 msgid "Renaming %s to %s\n"
@@ -12151,6 +12224,11 @@ msgstr ""
12224 msgid "unable to access commit %s"
12225 msgstr "无法访问提交 %s"
12226
12227 +#: builtin/pull.c refspec.c
12228 +#, c-format
12229 +msgid "invalid refspec '%s'"
12230 +msgstr "无效的引用规格：'%s'"
12231 +
12232 #: builtin/pull.c
12233 msgid "ignoring --verify-signatures for rebase"
12234 msgstr "为变基操作忽略 --verify-signatures"
@@ -13254,6 +13332,10 @@ msgstr ""
13332 msgid "git reflog exists <ref>"
13333 msgstr "git reflog exists <引用>"
13334
13335 +#: builtin/reflog.c
13336 +msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
13337 +msgstr "git reflog drop [--all [--single-worktree] | <引用>...]"
13338 +
13339 #: builtin/reflog.c
13340 #, c-format
13341 msgid "invalid timestamp '%s' given to '--%s'"
@@ -13314,8 +13396,8 @@ msgstr "正在标记可达对象..."
13396
13397 #: builtin/reflog.c
13398 #, c-format
13317 -msgid "%s points nowhere!"
13318 -msgstr "%s 指向不存在！"
13399 +msgid "reflog could not be found: '%s'"
13400 +msgstr "无法找到引用日志：'%s'"
13401
13402 #: builtin/reflog.c
13403 msgid "no reflog specified to delete"
@@ -13326,6 +13408,18 @@ msgstr "未指定要删除的引用日志"
13408 msgid "invalid ref format: %s"
13409 msgstr "无效的引用格式：%s"
13410
13411 +#: builtin/reflog.c
13412 +msgid "drop the reflogs of all references"
13413 +msgstr "丢弃所有引用的引用日志"
13414 +
13415 +#: builtin/reflog.c
13416 +msgid "drop reflogs from the current worktree only"
13417 +msgstr "仅从当前工作区中丢弃引用日志"
13418 +
13419 +#: builtin/reflog.c
13420 +msgid "references specified along with --all"
13421 +msgstr "--all 选项不能与具体引用同时使用"
13422 +
13423 #: builtin/refs.c
13424 msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
13425 msgstr "git refs migrate --ref-format=<格式> [--no-reflog] [--dry-run]"
@@ -14005,6 +14099,10 @@ msgstr "近似日期"
14099 msgid "with --cruft, expire objects older than this"
14100 msgstr "使用 --cruft，使早于给定时间的对象过期"
14101
14102 +#: builtin/repack.c
14103 +msgid "with --cruft, only repack cruft packs smaller than this"
14104 +msgstr "使用 --cruft 时，仅重新打包小于此大小的废弃包文件"
14105 +
14106 #: builtin/repack.c
14107 msgid "remove redundant packs, and run git-prune-packed"
14108 msgstr "删除多余的包，运行 git-prune-packed"
@@ -14596,6 +14694,10 @@ msgstr "无法得到 %s 的磁盘使用量"
14694 msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
14695 msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'"
14696
14697 +#: builtin/rev-list.c
14698 +msgid "-z option used with unsupported option"
14699 +msgstr "-z 选项与不支持的选项同时使用"
14700 +
14701 #: builtin/rev-list.c
14702 msgid "rev-list does not support display of notes"
14703 msgstr "rev-list 不支持显示注解"
@@ -16865,8 +16967,8 @@ msgid "git update-ref [<options>] <refname> <new-oid> [<old-oid>]"
16967 msgstr "git update-ref [<选项>] <引用名> <新对象> [<旧对象>]"
16968
16969 #: builtin/update-ref.c
16868 -msgid "git update-ref [<options>] --stdin [-z]"
16869 -msgstr "git update-ref [<选项>] --stdin [-z]"
16970 +msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]"
16971 +msgstr "git update-ref [<选项>] --stdin [-z] [--batch-updates]"
16972
16973 #: builtin/update-ref.c
16974 msgid "delete the reference"
@@ -16884,6 +16986,10 @@ msgstr "标准输入有以 NUL 字符终止的参数"
16986 msgid "read updates from stdin"
16987 msgstr "从标准输入读取更新"
16988
16989 +#: builtin/update-ref.c
16990 +msgid "batch reference updates"
16991 +msgstr "批量引用更新"
16992 +
16993 #: builtin/update-server-info.c
16994 msgid "update the info files from scratch"
16995 msgstr "从头开始更新文件信息"
@@ -17729,6 +17835,10 @@ msgstr "比较工作区和索引区中的文件"
17835 msgid "Compare a tree to the working tree or index"
17836 msgstr "将一个树和工作区或索引做比较"
17837
17838 +#: command-list.h
17839 +msgid "Compare the content and mode of provided blob pairs"
17840 +msgstr "比较提供的 blob 对的内容和模式"
17841 +
17842 #: command-list.h
17843 msgid "Compares the content and mode of blobs found via two tree objects"
17844 msgstr "比较两个树对象的文件内容和模式"
@@ -19861,7 +19971,7 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模
19971 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
19972 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
19973
19864 -#: diff.c merge-recursive.c transport.c
19974 +#: diff.c merge-ort.c transport.c
19975 #, c-format
19976 msgid "unknown value for config '%s': %s"
19977 msgstr "配置 '%s' 未知的取值：%s"
@@ -21288,6 +21398,11 @@ msgstr "不支持委托控制，因为 cURL < 7.22.0"
21398 msgid "Unknown value for http.proactiveauth"
21399 msgstr "http.proactiveauth 为未知取值"
21400
21401 +#: http.c parse.c
21402 +#, c-format
21403 +msgid "failed to parse %s"
21404 +msgstr "无法解析 %s"
21405 +
21406 #: http.c
21407 #, c-format
21408 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
@@ -21512,7 +21627,12 @@ msgstr "无法格式化消息：%s"
21627 msgid "invalid marker-size '%s', expecting an integer"
21628 msgstr "无效的标记大小 '%s'，应为一个整数"
21629
21515 -#: merge-ort.c merge-recursive.c
21630 +#: merge-ort-wrappers.c
21631 +#, c-format
21632 +msgid "Could not parse object '%s'"
21633 +msgstr "不能解析对象 '%s'"
21634 +
21635 +#: merge-ort.c
21636 #, c-format
21637 msgid "Failed to merge submodule %s (not checked out)"
21638 msgstr "无法合并子模组 %s （没有检出）"
@@ -21522,7 +21642,7 @@ msgstr "无法合并子模组 %s （没有检出）"
21642 msgid "Failed to merge submodule %s (no merge base)"
21643 msgstr "无法合并子模组 %s （没有合并基线）"
21644
21525 -#: merge-ort.c merge-recursive.c
21645 +#: merge-ort.c
21646 #, c-format
21647 msgid "Failed to merge submodule %s (commits not present)"
21648 msgstr "无法合并子模组 %s（提交不存在）"
@@ -21532,7 +21652,7 @@ msgstr "无法合并子模组 %s（提交不存在）"
21652 msgid "error: failed to merge submodule %s (repository corrupt)"
21653 msgstr "错误：无法合并子模组 %s（仓库损坏）"
21654
21535 -#: merge-ort.c merge-recursive.c
21655 +#: merge-ort.c
21656 #, c-format
21657 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
21658 msgstr "无法合并子模组 %s （提交未跟随合并基线）"
@@ -21572,12 +21692,12 @@ msgstr "错误：无法为 %s 执行内部合并"
21692 msgid "error: unable to add %s to database"
21693 msgstr "错误：不能添加 %s 至对象库"
21694
21575 -#: merge-ort.c merge-recursive.c
21695 +#: merge-ort.c
21696 #, c-format
21697 msgid "Auto-merging %s"
21698 msgstr "自动合并 %s"
21699
21580 -#: merge-ort.c merge-recursive.c
21700 +#: merge-ort.c
21701 #, c-format
21702 msgid ""
21703 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -21586,7 +21706,7 @@ msgstr ""
21706 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
21707 "在：%s。"
21708
21589 -#: merge-ort.c merge-recursive.c
21709 +#: merge-ort.c
21710 #, c-format
21711 msgid ""
21712 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -21605,14 +21725,14 @@ msgstr ""
21725 "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目"
21726 "录中，没有一个目标目录中包含多数文件。"
21727
21608 -#: merge-ort.c merge-recursive.c
21728 +#: merge-ort.c
21729 #, c-format
21730 msgid ""
21731 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
21732 "renamed."
21733 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
21734
21615 -#: merge-ort.c merge-recursive.c
21735 +#: merge-ort.c
21736 #, c-format
21737 msgid ""
21738 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -21620,7 +21740,7 @@ msgid ""
21740 msgstr ""
21741 "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
21742
21623 -#: merge-ort.c merge-recursive.c
21743 +#: merge-ort.c
21744 #, c-format
21745 msgid ""
21746 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -21629,7 +21749,7 @@ msgstr ""
21749 "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
21750 "动到 %5$s。"
21751
21632 -#: merge-ort.c merge-recursive.c
21752 +#: merge-ort.c
21753 #, c-format
21754 msgid ""
21755 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -21638,7 +21758,7 @@ msgstr ""
21758 "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
21759 "到 %s。"
21760
21641 -#: merge-ort.c merge-recursive.c
21761 +#: merge-ort.c
21762 #, c-format
21763 msgid ""
21764 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -21703,19 +21823,19 @@ msgstr ""
21823 "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同"
21824 "位置。"
21825
21706 -#: merge-ort.c merge-recursive.c
21826 +#: merge-ort.c
21827 msgid "content"
21828 msgstr "内容"
21829
21710 -#: merge-ort.c merge-recursive.c
21830 +#: merge-ort.c
21831 msgid "add/add"
21832 msgstr "添加/添加"
21833
21714 -#: merge-ort.c merge-recursive.c
21834 +#: merge-ort.c
21835 msgid "submodule"
21836 msgstr "子模组"
21837
21718 -#: merge-ort.c merge-recursive.c
21838 +#: merge-ort.c
21839 #, c-format
21840 msgid "CONFLICT (%s): Merge conflict in %s"
21841 msgstr "冲突（%s）：合并冲突于 %s"
@@ -21777,312 +21897,6 @@ msgstr ""
21897 msgid "collecting merge info failed for trees %s, %s, %s"
21898 msgstr "无法收集树 %s、%s、%s 的合并信息"
21899
21780 -#: merge-recursive.c
21781 -msgid "(bad commit)\n"
21782 -msgstr "（坏提交）\n"
21783 -
21784 -#: merge-recursive.c
21785 -#, c-format
21786 -msgid "add_cacheinfo failed for path '%s'; merge aborting."
21787 -msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"
21788 -
21789 -#: merge-recursive.c
21790 -#, c-format
21791 -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
21792 -msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"
21793 -
21794 -#: merge-recursive.c
21795 -#, c-format
21796 -msgid "failed to create path '%s'%s"
21797 -msgstr "无法创建路径 '%s'%s"
21798 -
21799 -#: merge-recursive.c
21800 -#, c-format
21801 -msgid "Removing %s to make room for subdirectory\n"
21802 -msgstr "删除 %s 以便为子目录留出空间\n"
21803 -
21804 -#: merge-recursive.c
21805 -msgid ": perhaps a D/F conflict?"
21806 -msgstr "：可能是一个目录/文件冲突？"
21807 -
21808 -#: merge-recursive.c
21809 -#, c-format
21810 -msgid "refusing to lose untracked file at '%s'"
21811 -msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
21812 -
21813 -#: merge-recursive.c
21814 -#, c-format
21815 -msgid "blob expected for %s '%s'"
21816 -msgstr "%s '%s' 应为数据对象"
21817 -
21818 -#: merge-recursive.c
21819 -#, c-format
21820 -msgid "failed to open '%s': %s"
21821 -msgstr "无法打开 '%s'：%s"
21822 -
21823 -#: merge-recursive.c
21824 -#, c-format
21825 -msgid "failed to symlink '%s': %s"
21826 -msgstr "无法创建符号链接 '%s'：%s"
21827 -
21828 -#: merge-recursive.c
21829 -#, c-format
21830 -msgid "do not know what to do with %06o %s '%s'"
21831 -msgstr "不知道如何处理 %06o %s '%s'"
21832 -
21833 -#: merge-recursive.c
21834 -#, c-format
21835 -msgid "Failed to merge submodule %s (repository corrupt)"
21836 -msgstr "无法合并子模组 %s（仓库损坏）"
21837 -
21838 -#: merge-recursive.c
21839 -#, c-format
21840 -msgid "Fast-forwarding submodule %s to the following commit:"
21841 -msgstr "子模组 %s 快进到如下提交："
21842 -
21843 -#: merge-recursive.c
21844 -#, c-format
21845 -msgid "Fast-forwarding submodule %s"
21846 -msgstr "快进子模组 %s"
21847 -
21848 -#: merge-recursive.c
21849 -#, c-format
21850 -msgid "Failed to merge submodule %s (merge following commits not found)"
21851 -msgstr "无法合并子模组 %s （没发现合并跟随的提交）"
21852 -
21853 -#: merge-recursive.c
21854 -#, c-format
21855 -msgid "Failed to merge submodule %s (not fast-forward)"
21856 -msgstr "无法合并子模组 %s（非快进）"
21857 -
21858 -#: merge-recursive.c
21859 -msgid "Found a possible merge resolution for the submodule:\n"
21860 -msgstr "找到子模组的一个可能的合并方案：\n"
21861 -
21862 -#: merge-recursive.c
21863 -#, c-format
21864 -msgid ""
21865 -"If this is correct simply add it to the index for example\n"
21866 -"by using:\n"
21867 -"\n"
21868 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
21869 -"\n"
21870 -"which will accept this suggestion.\n"
21871 -msgstr ""
21872 -"如果这个正确，将其添加到索引，例如使用命令：\n"
21873 -"\n"
21874 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
21875 -"\n"
21876 -"以接受此建议。\n"
21877 -
21878 -#: merge-recursive.c
21879 -#, c-format
21880 -msgid "Failed to merge submodule %s (multiple merges found)"
21881 -msgstr "无法合并子模组 %s （发现多个合并）"
21882 -
21883 -#: merge-recursive.c
21884 -msgid "failed to execute internal merge"
21885 -msgstr "无法执行内部合并"
21886 -
21887 -#: merge-recursive.c
21888 -#, c-format
21889 -msgid "unable to add %s to database"
21890 -msgstr "不能添加 %s 至对象库"
21891 -
21892 -#: merge-recursive.c
21893 -#, c-format
21894 -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
21895 -msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"
21896 -
21897 -#: merge-recursive.c
21898 -#, c-format
21899 -msgid ""
21900 -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
21901 -"in tree."
21902 -msgstr ""
21903 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
21904 -"本被保留。"
21905 -
21906 -#: merge-recursive.c
21907 -#, c-format
21908 -msgid ""
21909 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
21910 -"left in tree."
21911 -msgstr ""
21912 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
21913 -"%7$s 版本被保留。"
21914 -
21915 -#: merge-recursive.c
21916 -#, c-format
21917 -msgid ""
21918 -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
21919 -"in tree at %s."
21920 -msgstr ""
21921 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
21922 -"本保留在 %8$s 中。"
21923 -
21924 -#: merge-recursive.c
21925 -#, c-format
21926 -msgid ""
21927 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
21928 -"left in tree at %s."
21929 -msgstr ""
21930 -"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
21931 -"%7$s 版本保留在 %9$s 中。"
21932 -
21933 -#: merge-recursive.c
21934 -msgid "rename"
21935 -msgstr "重命名"
21936 -
21937 -#: merge-recursive.c
21938 -msgid "renamed"
21939 -msgstr "重命名"
21940 -
21941 -#: merge-recursive.c
21942 -#, c-format
21943 -msgid "Refusing to lose dirty file at %s"
21944 -msgstr "拒绝丢失脏文件 '%s'"
21945 -
21946 -#: merge-recursive.c
21947 -#, c-format
21948 -msgid "Refusing to lose untracked file at %s, even though it's in the way."
21949 -msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"
21950 -
21951 -#: merge-recursive.c
21952 -#, c-format
21953 -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
21954 -msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
21955 -
21956 -#: merge-recursive.c
21957 -#, c-format
21958 -msgid "%s is a directory in %s adding as %s instead"
21959 -msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
21960 -
21961 -#: merge-recursive.c
21962 -#, c-format
21963 -msgid "Refusing to lose untracked file at %s; adding as %s instead"
21964 -msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"
21965 -
21966 -#: merge-recursive.c
21967 -#, c-format
21968 -msgid ""
21969 -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
21970 -"\"%s\"->\"%s\" in \"%s\"%s"
21971 -msgstr ""
21972 -"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
21973 -"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
21974 -
21975 -#: merge-recursive.c
21976 -msgid " (left unresolved)"
21977 -msgstr "（留下未解决）"
21978 -
21979 -#: merge-recursive.c
21980 -#, c-format
21981 -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
21982 -msgstr ""
21983 -"冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s-"
21984 -">%5$s"
21985 -
21986 -#: merge-recursive.c
21987 -#, c-format
21988 -msgid ""
21989 -"CONFLICT (directory rename split): Unclear where to place %s because "
21990 -"directory %s was renamed to multiple other directories, with no destination "
21991 -"getting a majority of the files."
21992 -msgstr ""
21993 -"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
21994 -"其它目录，没有目录包含大部分文件。"
21995 -
21996 -#: merge-recursive.c
21997 -#, c-format
21998 -msgid ""
21999 -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
22000 -">%s in %s"
22001 -msgstr ""
22002 -"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
22003 -"%4$s->%5$s"
22004 -
22005 -#: merge-recursive.c
22006 -#, c-format
22007 -msgid "cannot read object %s"
22008 -msgstr "不能读取对象 %s"
22009 -
22010 -#: merge-recursive.c
22011 -#, c-format
22012 -msgid "object %s is not a blob"
22013 -msgstr "对象 %s 不是一个数据对象"
22014 -
22015 -#: merge-recursive.c
22016 -msgid "modify"
22017 -msgstr "修改"
22018 -
22019 -#: merge-recursive.c
22020 -msgid "modified"
22021 -msgstr "修改"
22022 -
22023 -#: merge-recursive.c
22024 -#, c-format
22025 -msgid "Skipped %s (merged same as existing)"
22026 -msgstr "略过 %s（已经做过相同合并）"
22027 -
22028 -#: merge-recursive.c
22029 -#, c-format
22030 -msgid "Adding as %s instead"
22031 -msgstr "而是以 %s 为名添加"
22032 -
22033 -#: merge-recursive.c
22034 -#, c-format
22035 -msgid "Removing %s"
22036 -msgstr "删除 %s"
22037 -
22038 -#: merge-recursive.c
22039 -msgid "file/directory"
22040 -msgstr "文件/目录"
22041 -
22042 -#: merge-recursive.c
22043 -msgid "directory/file"
22044 -msgstr "目录/文件"
22045 -
22046 -#: merge-recursive.c
22047 -#, c-format
22048 -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
22049 -msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
22050 -
22051 -#: merge-recursive.c
22052 -#, c-format
22053 -msgid "Adding %s"
22054 -msgstr "添加 %s"
22055 -
22056 -#: merge-recursive.c
22057 -#, c-format
22058 -msgid "CONFLICT (add/add): Merge conflict in %s"
22059 -msgstr "冲突（add/add）：合并冲突于 %s"
22060 -
22061 -#: merge-recursive.c
22062 -#, c-format
22063 -msgid "merging of trees %s and %s failed"
22064 -msgstr "无法合并树 %s 和 %s"
22065 -
22066 -#: merge-recursive.c
22067 -msgid "Merging:"
22068 -msgstr "合并："
22069 -
22070 -#: merge-recursive.c
22071 -#, c-format
22072 -msgid "found %u common ancestor:"
22073 -msgid_plural "found %u common ancestors:"
22074 -msgstr[0] "发现 %u 个共同祖先："
22075 -msgstr[1] "发现 %u 个共同祖先："
22076 -
22077 -#: merge-recursive.c
22078 -msgid "merge returned no commit"
22079 -msgstr "合并未返回提交"
22080 -
22081 -#: merge-recursive.c
22082 -#, c-format
22083 -msgid "Could not parse object '%s'"
22084 -msgstr "不能解析对象 '%s'"
22085 -
21900 #: merge.c
21901 msgid "failed to read the cache"
21902 msgstr "无法读取缓存"
@@ -22135,14 +21949,15 @@ msgstr "无法将 '%s' 链接至 '%s'"
21949 msgid "failed to clear multi-pack-index at %s"
21950 msgstr "无法清理位于 %s 的多包索引"
21951
22138 -#: midx-write.c
22139 -msgid "cannot write incremental MIDX with bitmap"
22140 -msgstr "无法使用位图写入增量 MIDX"
22141 -
21952 #: midx-write.c
21953 msgid "ignoring existing multi-pack-index; checksum mismatch"
21954 msgstr "忽略已存在的多包索引，校验码不匹配"
21955
21956 +#: midx-write.c
21957 +#, c-format
21958 +msgid "could not load reverse index for MIDX %s"
21959 +msgstr "无法加载多包索引 %s 的反向索引"
21960 +
21961 #: midx-write.c
21962 msgid "Adding packfiles to multi-pack-index"
21963 msgstr "添加包文件到多包索引"
@@ -22457,78 +22272,6 @@ msgstr "无法将 %s %s 映射到提交对象中"
22272 msgid "Failed to convert object from %s to %s"
22273 msgstr "无法将对象从 %s 转换为 %s"
22274
22460 -#: object-file.c
22461 -#, c-format
22462 -msgid "object directory %s does not exist; check .git/objects/info/alternates"
22463 -msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
22464 -
22465 -#: object-file.c
22466 -#, c-format
22467 -msgid "unable to normalize alternate object path: %s"
22468 -msgstr "无法规范化备用对象路径：%s"
22469 -
22470 -#: object-file.c
22471 -#, c-format
22472 -msgid "%s: ignoring alternate object stores, nesting too deep"
22473 -msgstr "%s：忽略备用对象库，嵌套太深"
22474 -
22475 -#: object-file.c
22476 -msgid "unable to fdopen alternates lockfile"
22477 -msgstr "无法 fdopen 替换锁文件"
22478 -
22479 -#: object-file.c
22480 -msgid "unable to read alternates file"
22481 -msgstr "无法读取替代文件"
22482 -
22483 -#: object-file.c
22484 -msgid "unable to move new alternates file into place"
22485 -msgstr "无法将新的备用文件移动到位"
22486 -
22487 -#: object-file.c
22488 -#, c-format
22489 -msgid "path '%s' does not exist"
22490 -msgstr "路径 '%s' 不存在"
22491 -
22492 -#: object-file.c
22493 -#, c-format
22494 -msgid "reference repository '%s' as a linked checkout is not supported yet."
22495 -msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
22496 -
22497 -#: object-file.c
22498 -#, c-format
22499 -msgid "reference repository '%s' is not a local repository."
22500 -msgstr "参考仓库 '%s' 不是一个本地仓库。"
22501 -
22502 -#: object-file.c
22503 -#, c-format
22504 -msgid "reference repository '%s' is shallow"
22505 -msgstr "参考仓库 '%s' 是一个浅克隆"
22506 -
22507 -#: object-file.c
22508 -#, c-format
22509 -msgid "reference repository '%s' is grafted"
22510 -msgstr "参考仓库 '%s' 已被移植"
22511 -
22512 -#: object-file.c
22513 -#, c-format
22514 -msgid "could not find object directory matching %s"
22515 -msgstr "无法找到和 %s 匹配的对象目录"
22516 -
22517 -#: object-file.c
22518 -#, c-format
22519 -msgid "invalid line while parsing alternate refs: %s"
22520 -msgstr "解析备用引用时无效的行：%s"
22521 -
22522 -#: object-file.c
22523 -#, c-format
22524 -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
22525 -msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
22526 -
22527 -#: object-file.c
22528 -#, c-format
22529 -msgid "mmap failed%s"
22530 -msgstr "mmap 失败%s"
22531 -
22275 #: object-file.c
22276 #, c-format
22277 msgid "object file %s is empty"
@@ -22573,21 +22316,6 @@ msgstr "%s 的头部太长，超出了 %d 字节"
22316 msgid "loose object %s (stored in %s) is corrupt"
22317 msgstr "松散对象 %s（保存在 %s）已损坏"
22318
22576 -#: object-file.c
22577 -#, c-format
22578 -msgid "replacement %s not found for %s"
22579 -msgstr "找不到 %2$s 的替代 %1$s"
22580 -
22581 -#: object-file.c
22582 -#, c-format
22583 -msgid "packed object %s (stored in %s) is corrupt"
22584 -msgstr "打包对象 %s（保存在 %s）已损坏"
22585 -
22586 -#: object-file.c
22587 -#, c-format
22588 -msgid "missing mapping of %s to %s"
22589 -msgstr "缺少 %s 到 %s 的映射"
22590 -
22319 #: object-file.c
22320 #, c-format
22321 msgid "unable to open %s"
@@ -22704,11 +22432,6 @@ msgstr "%s：无法插入数据库"
22432 msgid "%s: unsupported file type"
22433 msgstr "%s：不支持的文件类型"
22434
22707 -#: object-file.c
22708 -#, c-format
22709 -msgid "%s is not a valid '%s' object"
22710 -msgstr "%s 不是一个有效的 '%s' 对象"
22711 -
22435 #: object-file.c
22436 #, c-format
22437 msgid "hash mismatch for %s (expected %s)"
@@ -22729,6 +22452,11 @@ msgstr "无法解压缩 %s 的头部"
22452 msgid "unable to parse header of %s"
22453 msgstr "无法解析 %s 的头部"
22454
22455 +#: object-file.c
22456 +#, c-format
22457 +msgid "unable to parse type from header '%s' of %s"
22458 +msgstr "无法从 %s 的包头 '%s' 中解析类型"
22459 +
22460 #: object-file.c
22461 #, c-format
22462 msgid "unable to unpack contents of %s"
@@ -22906,6 +22634,88 @@ msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
22634 msgid "invalid object name '%.*s'."
22635 msgstr "无效的对象名 '%.*s'。"
22636
22637 +#: object-store.c
22638 +#, c-format
22639 +msgid "object directory %s does not exist; check .git/objects/info/alternates"
22640 +msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
22641 +
22642 +#: object-store.c
22643 +#, c-format
22644 +msgid "unable to normalize alternate object path: %s"
22645 +msgstr "无法规范化备用对象路径：%s"
22646 +
22647 +#: object-store.c
22648 +#, c-format
22649 +msgid "%s: ignoring alternate object stores, nesting too deep"
22650 +msgstr "%s：忽略备用对象库，嵌套太深"
22651 +
22652 +#: object-store.c
22653 +msgid "unable to fdopen alternates lockfile"
22654 +msgstr "无法 fdopen alternates 的锁文件"
22655 +
22656 +#: object-store.c
22657 +msgid "unable to read alternates file"
22658 +msgstr "无法读取 alternates 文件"
22659 +
22660 +#: object-store.c
22661 +msgid "unable to move new alternates file into place"
22662 +msgstr "无法将新的 alternates 文件移动到位"
22663 +
22664 +#: object-store.c
22665 +#, c-format
22666 +msgid "path '%s' does not exist"
22667 +msgstr "路径 '%s' 不存在"
22668 +
22669 +#: object-store.c
22670 +#, c-format
22671 +msgid "reference repository '%s' as a linked checkout is not supported yet."
22672 +msgstr "尚不支持将参考仓库 '%s' 作为链接检出。"
22673 +
22674 +#: object-store.c
22675 +#, c-format
22676 +msgid "reference repository '%s' is not a local repository."
22677 +msgstr "参考仓库 '%s' 不是本地仓库。"
22678 +
22679 +#: object-store.c
22680 +#, c-format
22681 +msgid "reference repository '%s' is shallow"
22682 +msgstr "参考仓库 '%s' 是浅克隆"
22683 +
22684 +#: object-store.c
22685 +#, c-format
22686 +msgid "reference repository '%s' is grafted"
22687 +msgstr "参考仓库 '%s' 已被移植"
22688 +
22689 +#: object-store.c
22690 +#, c-format
22691 +msgid "could not find object directory matching %s"
22692 +msgstr "无法找到和 %s 匹配的对象目录"
22693 +
22694 +#: object-store.c
22695 +#, c-format
22696 +msgid "invalid line while parsing alternate refs: %s"
22697 +msgstr "解析备用引用时遇到无效的行：%s"
22698 +
22699 +#: object-store.c
22700 +#, c-format
22701 +msgid "replacement %s not found for %s"
22702 +msgstr "找不到 %2$s 的替代 %1$s"
22703 +
22704 +#: object-store.c
22705 +#, c-format
22706 +msgid "packed object %s (stored in %s) is corrupt"
22707 +msgstr "打包对象 %s（保存在 %s）已损坏"
22708 +
22709 +#: object-store.c
22710 +#, c-format
22711 +msgid "missing mapping of %s to %s"
22712 +msgstr "缺少 %s 到 %s 的映射"
22713 +
22714 +#: object-store.c
22715 +#, c-format
22716 +msgid "%s is not a valid '%s' object"
22717 +msgstr "%s 不是有效的 '%s' 对象"
22718 +
22719 #: object.c
22720 #, c-format
22721 msgid "invalid object type \"%s\""
@@ -23251,6 +23061,16 @@ msgstr "%s 不取值"
23061 msgid "%s isn't available"
23062 msgstr "%s 不可用"
23063
23064 +#: parse-options.c
23065 +#, c-format
23066 +msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
23067 +msgstr "%2$s 的值 %1$s 不在范围 [%3$<PRIdMAX>,%4$<PRIdMAX>] 内"
23068 +
23069 +#: parse-options.c
23070 +#, c-format
23071 +msgid "%s expects an integer value with an optional k/m/g suffix"
23072 +msgstr "%s 期望一个带可选 k/m/g 后缀的整数"
23073 +
23074 #: parse-options.c
23075 #, c-format
23076 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
@@ -23437,11 +23257,6 @@ msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
23257 msgid "bad boolean environment value '%s' for '%s'"
23258 msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'"
23259
23440 -#: parse.c
23441 -#, c-format
23442 -msgid "failed to parse %s"
23443 -msgstr "无法解析 %s"
23444 -
23260 #: path-walk.c
23261 #, c-format
23262 msgid "failed to walk children of tree %s: not found"
@@ -23644,8 +23459,13 @@ msgstr "无法从承诺者远程获取 %s"
23459
23460 #: promisor-remote.c
23461 #, c-format
23647 -msgid "known remote named '%s' but with url '%s' instead of '%s'"
23648 -msgstr "已知远程名称为 '%s'，但 url 为 '%s' 而不是 '%s'"
23462 +msgid "no or empty URL advertised for remote '%s'"
23463 +msgstr "远程 '%s' 的 URL 没有公布或为空"
23464 +
23465 +#: promisor-remote.c
23466 +#, c-format
23467 +msgid "known remote named '%s' but with URL '%s' instead of '%s'"
23468 +msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'"
23469
23470 #: promisor-remote.c
23471 #, c-format
@@ -24546,6 +24366,11 @@ msgstr "无法打开目录 %s"
24366 msgid "Checking references consistency"
24367 msgstr "正在检查引用一致性"
24368
24369 +#: refs/packed-backend.c
24370 +#, c-format
24371 +msgid "unable to open '%s'"
24372 +msgstr "无法打开 '%s'"
24373 +
24374 #: refs/reftable-backend.c
24375 #, c-format
24376 msgid "refname is dangerous: %s"
@@ -24624,11 +24449,6 @@ msgstr "引用名称 %s 未找到"
24449 msgid "refname %s is a symbolic ref, copying it is not supported"
24450 msgstr "引用名 %s 是一个符号引用，不支持复制"
24451
24627 -#: refspec.c
24628 -#, c-format
24629 -msgid "invalid refspec '%s'"
24630 -msgstr "无效的引用规格：'%s'"
24631 -
24452 #: refspec.c
24453 #, c-format
24454 msgid "pattern '%s' has no '*'"
@@ -25286,8 +25106,8 @@ msgid "could not set recommended config"
25106 msgstr "无法设置推荐的配置"
25107
25108 #: scalar.c
25289 -msgid "could not turn on maintenance"
25290 -msgstr "无法打开维护模式"
25109 +msgid "could not toggle maintenance"
25110 +msgstr "无法切换维护模式"
25111
25112 #: scalar.c
25113 msgid "could not start the FSMonitor daemon"
@@ -25346,13 +25166,17 @@ msgstr "在 'src' 目录中创建仓库"
25166 msgid "specify if tags should be fetched during clone"
25167 msgstr "如若应在克隆期间获取标签则指定"
25168
25169 +#: scalar.c
25170 +msgid "specify if background maintenance should be enabled"
25171 +msgstr "指定是否启用后台维护"
25172 +
25173 #: scalar.c
25174 msgid ""
25175 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
25352 -"\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]"
25176 +"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]"
25177 msgstr ""
25178 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
25355 -"\t[--[no-]src] [--[no-]tags] <url> [<登记>]"
25179 +"\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<登记>]"
25180
25181 #: scalar.c
25182 #, c-format
@@ -25401,21 +25225,37 @@ msgid "`scalar list` does not take arguments"
25225 msgstr "`scalar list` 不带参数"
25226
25227 #: scalar.c
25404 -msgid "scalar register [<enlistment>]"
25405 -msgstr "scalar register [<登记>]"
25228 +msgid "scalar register [--[no-]maintenance] [<enlistment>]"
25229 +msgstr "scalar register [--[no-]maintenance] [<登记>]"
25230
25231 #: scalar.c
25232 msgid "reconfigure all registered enlistments"
25233 msgstr "重新配置所有注册的登记"
25234
25235 #: scalar.c
25412 -msgid "scalar reconfigure [--all | <enlistment>]"
25413 -msgstr "scalar reconfigure [--all | <登记>]"
25236 +msgid "(enable|disable|keep)"
25237 +msgstr "(enable|disable|keep)"
25238 +
25239 +#: scalar.c
25240 +msgid "signal how to adjust background maintenance"
25241 +msgstr "指定如何调整后台维护"
25242 +
25243 +#: scalar.c
25244 +msgid ""
25245 +"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | "
25246 +"<enlistment>]"
25247 +msgstr ""
25248 +"scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | <登记>]"
25249
25250 #: scalar.c
25251 msgid "--all or <enlistment>, but not both"
25252 msgstr "--all 或者 <登记>，而不是两个一起"
25253
25254 +#: scalar.c
25255 +#, c-format
25256 +msgid "unknown mode for --maintenance option: %s"
25257 +msgstr "--maintenance 选项的模式未知：%s"
25258 +
25259 #: scalar.c
25260 #, c-format
25261 msgid "could not remove stale scalar.repo '%s'"
@@ -27123,6 +26963,10 @@ msgstr "在每次迭代前清除缓存树"
26963 msgid "number of entries in the cache tree to invalidate (default 0)"
26964 msgstr "缓存树中无效化的条目数量（默认 0）"
26965
26966 +#: t/helper/test-pack-deltas.c
26967 +msgid "the number of objects to write"
26968 +msgstr "写入对象的数量"
26969 +
26970 #: t/helper/test-path-walk.c
26971 msgid "test-tool path-walk <options> -- <revision-options>"
26972 msgstr "test-tool path-walk <选项> -- <版本选项>"
@@ -28051,6 +27895,16 @@ msgstr "不能获取当前工作目录"
27895 msgid "unable to get random bytes"
27896 msgstr "无法获取随机字节"
27897
27898 +#: wrapper.c
27899 +#, c-format
27900 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
27901 +msgstr "尝试内存映射(mmap) %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
27902 +
27903 +#: wrapper.c
27904 +#, c-format
27905 +msgid "mmap failed%s"
27906 +msgstr "mmap 失败%s"
27907 +
27908 #: wt-status.c
27909 msgid "Unmerged paths:"
27910 msgstr "未合并的路径："
@@ -28969,6 +28823,15 @@ msgstr "STARTTLS 失败！%s"
28823 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
28824 msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
28825
28826 +#: git-send-email.perl
28827 +#, perl-format
28828 +msgid "Outlook reassigned Message-ID to: %s\n"
28829 +msgstr "Outlook 重新分配了 Message-ID 为：%s\n"
28830 +
28831 +#: git-send-email.perl
28832 +msgid "Warning: Could not retrieve Message-ID from server response.\n"
28833 +msgstr "警告：无法从服务器响应中获取 Message-ID。\n"
28834 +
28835 #: git-send-email.perl
28836 #, perl-format
28837 msgid "Failed to send %s\n"