@matheusbsbs / matheus-bagliano / commits / d5be499eed

l10n: zh_CN v2.38.0 rounds 1 & 2

Reviewed-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Li Linchao <lilinchao@oschina.cn> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Fangyi Zhou committed Sep 16, 2022 at 11:31 UTC d5be499eed5593426c29debeb8898e73bf0a97cb
1 file changed +1057 -484
po/zh_CN.po
+1057 -484
@@ -144,8 +144,8 @@ msgid ""
144 msgstr ""
145 "Project-Id-Version: Git\n"
146 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
147 -"POT-Creation-Date: 2022-06-22 10:25+0100\n"
148 -"PO-Revision-Date: 2022-06-14 20:52+0100\n"
147 +"POT-Creation-Date: 2022-09-23 14:51+0100\n"
148 +"PO-Revision-Date: 2022-09-23 14:53+0100\n"
149 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
150 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
151 "Language: zh_CN\n"
@@ -153,14 +153,14 @@ msgstr ""
153 "Content-Type: text/plain; charset=UTF-8\n"
154 "Content-Transfer-Encoding: 8bit\n"
155 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
156 -"X-Generator: Gtranslator 40.0\n"
156 +"X-Generator: Gtranslator 42.0\n"
157
158 #: add-interactive.c
159 #, c-format
160 msgid "Huh (%s)?"
161 msgstr "嗯（%s）？"
162
163 -#: add-interactive.c builtin/rebase.c reset.c sequencer.c
163 +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c
164 msgid "could not read index"
165 msgstr "不能读取索引"
166
@@ -341,8 +341,8 @@ msgid "unstaged"
341 msgstr "未缓存"
342
343 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
344 -#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
345 -#: git-add--interactive.perl
344 +#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
345 +#: builtin/submodule--helper.c git-add--interactive.perl
346 msgid "path"
347 msgstr "路径"
348
@@ -623,6 +623,26 @@ msgstr ""
623 "a - 应用该块和本文件中后面的全部块\n"
624 "d - 不要应用该块和本文件中后面的全部块\n"
625
626 +#: add-patch.c git-add--interactive.perl
627 +#, c-format, perl-format
628 +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
629 +msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
630 +
631 +#: add-patch.c git-add--interactive.perl
632 +#, c-format, perl-format
633 +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
634 +msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
635 +
636 +#: add-patch.c git-add--interactive.perl
637 +#, c-format, perl-format
638 +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
639 +msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
640 +
641 +#: add-patch.c git-add--interactive.perl
642 +#, c-format, perl-format
643 +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
644 +msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
645 +
646 #: add-patch.c
647 msgid ""
648 "y - apply this hunk to worktree\n"
@@ -642,11 +662,6 @@ msgstr ""
662 msgid "could not parse hunk header '%.*s'"
663 msgstr "无法解析数据块头信息 '%.*s'"
664
645 -#: add-patch.c
646 -#, c-format
647 -msgid "could not parse colored hunk header '%.*s'"
648 -msgstr "无法解析彩色数据块头信息 '%.*s'"
649 -
665 #: add-patch.c
666 msgid "could not parse diff"
667 msgstr "不能解析差异信息"
@@ -973,6 +988,26 @@ msgstr ""
988 "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
989 "\n"
990
991 +#: advice.c
992 +#, c-format
993 +msgid ""
994 +"The following paths have been moved outside the\n"
995 +"sparse-checkout definition but are not sparse due to local\n"
996 +"modifications.\n"
997 +msgstr ""
998 +"下列的路径已经被移动至稀疏检出的定义之外，\n"
999 +"但是由于本地的修改而并非稀疏。\n"
1000 +
1001 +#: advice.c
1002 +msgid ""
1003 +"To correct the sparsity of these paths, do the following:\n"
1004 +"* Use \"git add --sparse <paths>\" to update the index\n"
1005 +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules"
1006 +msgstr ""
1007 +"为了修正这些的路径的稀疏性，请运行下列命令：\n"
1008 +"* 使用 \"git add --sparse <路径>\" 来更新索引\n"
1009 +"* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则"
1010 +
1011 #: alias.c
1012 msgid "cmdline ends with \\"
1013 msgstr "命令行以 \\ 结尾"
@@ -1204,7 +1239,7 @@ msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却
1239 msgid "patch failed: %s:%ld"
1240 msgstr "打补丁失败：%s:%ld"
1241
1207 -#: apply.c
1242 +#: apply.c builtin/mv.c
1243 #, c-format
1244 msgid "cannot checkout %s"
1245 msgstr "不能检出 %s"
@@ -1597,6 +1632,11 @@ msgstr "不能打开数据对象 %s"
1632 msgid "unsupported file mode: 0%o (SHA1: %s)"
1633 msgstr "不支持的文件模式：0%o (SHA1: %s)"
1634
1635 +#: archive-tar.c archive-zip.c builtin/pack-objects.c
1636 +#, c-format
1637 +msgid "deflate error (%d)"
1638 +msgstr "压缩错误 (%d)"
1639 +
1640 #: archive-tar.c
1641 #, c-format
1642 msgid "unable to start '%s' filter"
@@ -1621,11 +1661,6 @@ msgstr "路径不是有效的 UTF-8：%s"
1661 msgid "path too long (%d chars, SHA1: %s): %s"
1662 msgstr "路径太长（%d 字符，SHA1：%s）：%s"
1663
1624 -#: archive-zip.c builtin/pack-objects.c
1625 -#, c-format
1626 -msgid "deflate error (%d)"
1627 -msgstr "压缩错误 (%d)"
1628 -
1664 #: archive-zip.c
1665 #, c-format
1666 msgid "timestamp too large for this system: %<PRIuMAX>"
@@ -1941,10 +1976,10 @@ msgid "--reverse and --first-parent together require specified latest commit"
1976 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1977
1978 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1944 -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
1945 -#: remote.c sequencer.c submodule.c
1979 +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
1980 +#: ref-filter.c remote.c sequencer.c submodule.c
1981 msgid "revision walk setup failed"
1947 -msgstr "版本遍历设置失败"
1982 +msgstr "版本遍历初始化失败"
1983
1984 #: blame.c
1985 msgid ""
@@ -2399,7 +2434,7 @@ msgstr "fseek 失败"
2434 msgid "could not open '%s' for reading"
2435 msgstr "无法打开 '%s' 进行读取"
2436
2402 -#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
2437 +#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c
2438 #, c-format
2439 msgid "could not open '%s' for writing"
2440 msgstr "无法打开 '%s' 进行写入"
@@ -2700,8 +2735,8 @@ msgid "n"
2735 msgstr "n"
2736
2737 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2703 -#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2704 -#: builtin/verify-tag.c
2738 +#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
2739 +#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
2740 msgid "format"
2741 msgstr "格式"
2742
@@ -2804,7 +2839,7 @@ msgstr "交互式模式需要命令行上提供补丁"
2839 msgid "git apply [<options>] [<patch>...]"
2840 msgstr "git apply [<选项>] [<补丁>...]"
2841
2807 -#: builtin/archive.c contrib/scalar/scalar.c
2842 +#: builtin/archive.c diagnose.c
2843 msgid "could not redirect output"
2844 msgstr "不能重定向输出"
2845
@@ -3686,8 +3721,8 @@ msgstr "排序和过滤属于大小写不敏感"
3721 msgid "recurse through submodules"
3722 msgstr "在子模组中递归"
3723
3689 -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
3690 -#: builtin/verify-tag.c
3724 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c
3725 +#: builtin/tag.c builtin/verify-tag.c
3726 msgid "format to use for the output"
3727 msgstr "输出格式"
3728
@@ -3810,8 +3845,12 @@ msgid "not run from a git repository - no hooks to show\n"
3845 msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
3846
3847 #: builtin/bugreport.c
3813 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
3814 -msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]"
3848 +msgid ""
3849 +"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"
3850 +"diagnose[=<mode>]"
3851 +msgstr ""
3852 +"git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>] [--"
3853 +"diagnose[=<模式>]"
3854
3855 #: builtin/bugreport.c
3856 msgid ""
@@ -3847,19 +3886,34 @@ msgstr ""
3886 "请检查下面错误报告中余下的内容。\n"
3887 "您可以删除任何您不想共享的内容。\n"
3888
3889 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
3890 +#: parse-options.h
3891 +msgid "mode"
3892 +msgstr "模式"
3893 +
3894 +#: builtin/bugreport.c
3895 +msgid ""
3896 +"create an additional zip archive of detailed diagnostics (default 'stats')"
3897 +msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）"
3898 +
3899 #: builtin/bugreport.c
3851 -msgid "specify a destination for the bugreport file"
3900 +msgid "specify a destination for the bugreport file(s)"
3901 msgstr "指定错误报告文件的目标位置"
3902
3903 #: builtin/bugreport.c
3855 -msgid "specify a strftime format suffix for the filename"
3904 +msgid "specify a strftime format suffix for the filename(s)"
3905 msgstr "指定文件的 strftime 格式后缀"
3906
3858 -#: builtin/bugreport.c
3907 +#: builtin/bugreport.c builtin/diagnose.c
3908 #, c-format
3909 msgid "could not create leading directories for '%s'"
3910 msgstr "不能为 '%s' 创建先导目录"
3911
3912 +#: builtin/bugreport.c builtin/diagnose.c
3913 +#, c-format
3914 +msgid "unable to create diagnostics archive %s"
3915 +msgstr "不能创建诊断归档包 %s"
3916 +
3917 #: builtin/bugreport.c
3918 msgid "System Info"
3919 msgstr "系统信息"
@@ -3935,11 +3989,6 @@ msgstr "需要一个仓库来解开归档包。"
3989 msgid "Unbundling objects"
3990 msgstr "解包对象中"
3991
3938 -#: builtin/bundle.c builtin/remote.c
3939 -#, c-format
3940 -msgid "Unknown subcommand: %s"
3941 -msgstr "未知子命令：%s"
3942 -
3992 #: builtin/cat-file.c merge-recursive.c
3993 #, c-format
3994 msgid "cannot read object %s '%s'"
@@ -4037,6 +4086,10 @@ msgstr "显示对象大小"
4086 msgid "allow -s and -t to work with broken/corrupt objects"
4087 msgstr "允许 -s 和 -t 对损坏的对象生效"
4088
4089 +#: builtin/cat-file.c builtin/log.c
4090 +msgid "use mail map file"
4091 +msgstr "使用邮件映射文件"
4092 +
4093 #: builtin/cat-file.c
4094 msgid "Batch objects requested on stdin (or --batch-all-objects)"
4095 msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）"
@@ -4049,6 +4102,10 @@ msgstr "显示完整的 <对象> 或 <版本> 内容"
4102 msgid "like --batch, but don't emit <contents>"
4103 msgstr "类似于 --batch，但不输出 <内容>"
4104
4105 +#: builtin/cat-file.c
4106 +msgid "stdin is NUL-terminated"
4107 +msgstr "标准输入以 NUL 字符分隔"
4108 +
4109 #: builtin/cat-file.c
4110 msgid "read commands from stdin"
4111 msgstr "从标准输入读取命令"
@@ -4725,7 +4782,7 @@ msgstr ""
4782
4783 #: builtin/checkout.c
4784 msgid "you must specify path(s) to restore"
4728 -msgstr "您必须指定一个要恢复的路径"
4785 +msgstr "您必须指定要恢复的路径"
4786
4787 #: builtin/checkout.c builtin/clone.c builtin/remote.c
4788 #: builtin/submodule--helper.c builtin/worktree.c
@@ -5130,6 +5187,14 @@ msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
5187 msgid "initialize sparse-checkout file to include only files at root"
5188 msgstr "初始化稀疏检出文件，只包含根目录文件"
5189
5190 +#: builtin/clone.c
5191 +msgid "uri"
5192 +msgstr "uri"
5193 +
5194 +#: builtin/clone.c
5195 +msgid "a URI for downloading bundles before fetching from origin remote"
5196 +msgstr "用于在从 origin 远程获取之前下载归档包的 URI"
5197 +
5198 #: builtin/clone.c
5199 #, c-format
5200 msgid "info: Could not add alternate for '%s': %s\n"
@@ -5204,8 +5269,8 @@ msgid "failed to initialize sparse-checkout"
5269 msgstr "无法初始化稀疏检出"
5270
5271 #: builtin/clone.c
5207 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
5208 -msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
5272 +msgid "remote HEAD refers to nonexistent ref, unable to checkout"
5273 +msgstr "远程 HEAD 指向一个不存在的引用，无法检出"
5274
5275 #: builtin/clone.c
5276 msgid "unable to checkout working tree"
@@ -5227,7 +5292,7 @@ msgstr "无法删除临时的 alternates 文件"
5292 msgid "Too many arguments."
5293 msgstr "太多参数。"
5294
5230 -#: builtin/clone.c contrib/scalar/scalar.c
5295 +#: builtin/clone.c scalar.c
5296 msgid "You must specify a repository to clone."
5297 msgstr "您必须指定一个仓库来克隆。"
5298
@@ -5236,6 +5301,12 @@ msgstr "您必须指定一个仓库来克隆。"
5301 msgid "options '%s' and '%s %s' cannot be used together"
5302 msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
5303
5304 +#: builtin/clone.c
5305 +msgid ""
5306 +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
5307 +"exclude"
5308 +msgstr "--bundle-uri 与 --depth、--shallow-since 和 --shallow-exclude 不兼容"
5309 +
5310 #: builtin/clone.c
5311 #, c-format
5312 msgid "repository '%s' does not exist"
@@ -5324,6 +5395,15 @@ msgstr "--local 被忽略"
5395 msgid "cannot clone from filtered bundle"
5396 msgstr "无法从经过过滤的归档包克隆"
5397
5398 +#: builtin/clone.c
5399 +msgid "failed to initialize the repo, skipping bundle URI"
5400 +msgstr "无法初始化仓库，跳过归档包 URI"
5401 +
5402 +#: builtin/clone.c
5403 +#, c-format
5404 +msgid "failed to fetch objects from bundle URI '%s'"
5405 +msgstr "无法从归档包 URI '%s' 获取对象"
5406 +
5407 #: builtin/clone.c
5408 msgid "remote transport reported error"
5409 msgstr "远程传输报告错误"
@@ -5471,11 +5551,6 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
5551 msgid "Collecting commits from input"
5552 msgstr "正从标准输入收集提交"
5553
5474 -#: builtin/commit-graph.c builtin/multi-pack-index.c
5475 -#, c-format
5476 -msgid "unrecognized subcommand: %s"
5477 -msgstr "未识别的子命令：%s"
5478 -
5554 #: builtin/commit-tree.c
5555 msgid ""
5556 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -5903,10 +5978,6 @@ msgstr "以长格式显示状态（默认）"
5978 msgid "terminate entries with NUL"
5979 msgstr "条目以 NUL 字符结尾"
5980
5906 -#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h
5907 -msgid "mode"
5908 -msgstr "模式"
5909 -
5981 #: builtin/commit.c
5982 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
5983 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
@@ -6644,6 +6715,26 @@ msgstr "没有发现名称，无法描述任何东西。"
6715 msgid "option '%s' and commit-ishes cannot be used together"
6716 msgstr "选项 '%s' 和提交号不能同时使用"
6717
6718 +#: builtin/diagnose.c
6719 +msgid ""
6720 +"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"
6721 +"mode=<mode>]"
6722 +msgstr ""
6723 +"git diagnose [-o|--output-directory <文件>] [-s|--suffix <格式>] [--mode=<模"
6724 +"式>]"
6725 +
6726 +#: builtin/diagnose.c
6727 +msgid "specify a destination for the diagnostics archive"
6728 +msgstr "指定诊断归档包的目标位置"
6729 +
6730 +#: builtin/diagnose.c
6731 +msgid "specify a strftime format suffix for the filename"
6732 +msgstr "指定文件的 strftime 格式后缀"
6733 +
6734 +#: builtin/diagnose.c
6735 +msgid "specify the content of the diagnostic archive"
6736 +msgstr "指定诊断信息归档包的内容"
6737 +
6738 #: builtin/diff-tree.c
6739 msgid "--merge-base only works with two commits"
6740 msgstr "--merge-base 仅适用于两个提交"
@@ -7115,12 +7206,8 @@ msgid "[rejected]"
7206 msgstr "[已拒绝]"
7207
7208 #: builtin/fetch.c
7118 -msgid "can't fetch in current branch"
7119 -msgstr "当前分支下不能执行获取操作"
7120 -
7121 -#: builtin/fetch.c
7122 -msgid "checked out in another worktree"
7123 -msgstr "已在另一个工作树中检出"
7209 +msgid "can't fetch into checked-out branch"
7210 +msgstr "无法获取到已检出的分支"
7211
7212 #: builtin/fetch.c
7213 msgid "[tag update]"
@@ -7658,6 +7745,11 @@ msgstr "%s：cache-tree 中无效的 sha1 指针"
7745 msgid "non-tree in cache-tree"
7746 msgstr "cache-tree 中非树对象"
7747
7748 +#: builtin/fsck.c
7749 +#, c-format
7750 +msgid "%s: invalid sha1 pointer in resolve-undo"
7751 +msgstr "%s：resolve-undo 中无效的 sha1 指针"
7752 +
7753 #: builtin/fsck.c
7754 msgid "git fsck [<options>] [<object>...]"
7755 msgstr "git fsck [<选项>] [<对象>...]"
@@ -8075,12 +8167,16 @@ msgid "failed to run 'crontab -l'; your system might not support 'cron'"
8167 msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
8168
8169 #: builtin/gc.c
8078 -msgid "failed to run 'crontab'; your system might not support 'cron'"
8079 -msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
8170 +msgid "failed to create crontab temporary file"
8171 +msgstr "无法创建 crontab 临时文件"
8172
8173 #: builtin/gc.c
8082 -msgid "failed to open stdin of 'crontab'"
8083 -msgstr "无法打开 'crontab' 的标准输入"
8174 +msgid "failed to open temporary file"
8175 +msgstr "无法打开临时文件"
8176 +
8177 +#: builtin/gc.c
8178 +msgid "failed to run 'crontab'; your system might not support 'cron'"
8179 +msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
8180
8181 #: builtin/gc.c
8182 msgid "'crontab' died"
@@ -8142,11 +8238,6 @@ msgstr "无法将仓库添加到全局配置"
8238 msgid "git maintenance <subcommand> [<options>]"
8239 msgstr "git maintenance <子命令> [<选项>]"
8240
8145 -#: builtin/gc.c
8146 -#, c-format
8147 -msgid "invalid subcommand: %s"
8148 -msgstr "无效子命令：%s"
8149 -
8241 #: builtin/grep.c
8242 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
8243 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
@@ -8370,6 +8461,10 @@ msgstr "分页显示匹配的文件"
8461 msgid "allow calling of grep(1) (ignored by this build)"
8462 msgstr "允许调用 grep(1)（本次构建忽略）"
8463
8464 +#: builtin/grep.c
8465 +msgid "maximum number of results per file"
8466 +msgstr "每个文件的最大结果数量"
8467 +
8468 #: builtin/grep.c
8469 msgid "no pattern given"
8470 msgstr "未提供匹配模式"
@@ -8481,13 +8576,21 @@ msgstr "打印命令描述"
8576 msgid "print list of useful guides"
8577 msgstr "显示有用的指南列表"
8578
8579 +#: builtin/help.c
8580 +msgid "print list of user-facing repository, command and file interfaces"
8581 +msgstr "打印面向用户的仓库、命令和文件接口列表"
8582 +
8583 +#: builtin/help.c
8584 +msgid "print list of file formats, protocols and other developer interfaces"
8585 +msgstr "打印文件格式、协议和其他开发者接口列表"
8586 +
8587 #: builtin/help.c
8588 msgid "print all configuration variable names"
8589 msgstr "打印所有配置变量名称"
8590
8591 #: builtin/help.c
8489 -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
8490 -msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>]"
8592 +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]"
8593 +msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]"
8594
8595 #: builtin/help.c
8596 #, c-format
@@ -9078,8 +9181,8 @@ msgid "show source"
9181 msgstr "显示源"
9182
9183 #: builtin/log.c
9081 -msgid "use mail map file"
9082 -msgstr "使用邮件映射文件"
9184 +msgid "clear all previously-defined decoration filters"
9185 +msgstr "清除所有之前定义的修饰过滤器"
9186
9187 #: builtin/log.c
9188 msgid "only decorate refs that match <pattern>"
@@ -9404,6 +9507,10 @@ msgstr "在附函或单个补丁中显示和 <引用规格> 的差异"
9507 msgid "percentage by which creation is weighted"
9508 msgstr "创建权重的百分比"
9509
9510 +#: builtin/log.c
9511 +msgid "show in-body From: even if identical to the e-mail header"
9512 +msgstr "显示正文内的 From:，即使其与电子邮件头中一致"
9513 +
9514 #: builtin/log.c
9515 #, c-format
9516 msgid "invalid ident line: %s"
@@ -9479,11 +9586,26 @@ msgid ""
9586 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
9587 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
9588
9589 +#: builtin/ls-files.c
9590 +#, c-format
9591 +msgid "bad ls-files format: element '%s' does not start with '('"
9592 +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头"
9593 +
9594 +#: builtin/ls-files.c
9595 +#, c-format
9596 +msgid "bad ls-files format: element '%s' does not end in ')'"
9597 +msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾"
9598 +
9599 +#: builtin/ls-files.c
9600 +#, c-format
9601 +msgid "bad ls-files format: %%%.*s"
9602 +msgstr "坏的 ls-files 格式: %%%.*s"
9603 +
9604 #: builtin/ls-files.c
9605 msgid "git ls-files [<options>] [<file>...]"
9606 msgstr "git ls-files [<选项>] [<文件>...]"
9607
9486 -#: builtin/ls-files.c
9608 +#: builtin/ls-files.c builtin/merge-tree.c
9609 msgid "separate paths with the NUL character"
9610 msgstr "用 NUL 字符分隔路径"
9611
@@ -9591,6 +9713,14 @@ msgstr "抑制重复条目"
9713 msgid "show sparse directories in the presence of a sparse index"
9714 msgstr "在稀疏索引存在时显示稀疏目录"
9715
9716 +#: builtin/ls-files.c
9717 +msgid ""
9718 +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, "
9719 +"--eol"
9720 +msgstr ""
9721 +"--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使"
9722 +"用"
9723 +
9724 #: builtin/ls-remote.c
9725 msgid ""
9726 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -9874,6 +10004,50 @@ msgstr "无法解析引用 '%s'"
10004 msgid "Merging %s with %s\n"
10005 msgstr "合并 %s 和 %s\n"
10006
10007 +#: builtin/merge-tree.c builtin/merge.c
10008 +msgid "not something we can merge"
10009 +msgstr "不是可以合并的东西"
10010 +
10011 +#: builtin/merge-tree.c builtin/merge.c
10012 +msgid "refusing to merge unrelated histories"
10013 +msgstr "拒绝合并无关的历史"
10014 +
10015 +#: builtin/merge-tree.c
10016 +msgid "failure to merge"
10017 +msgstr "合并失败"
10018 +
10019 +#: builtin/merge-tree.c
10020 +msgid "git merge-tree [--write-tree] [<options>] <branch1> <branch2>"
10021 +msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>"
10022 +
10023 +#: builtin/merge-tree.c
10024 +msgid "git merge-tree [--trivial-merge] <base-tree> <branch1> <branch2>"
10025 +msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>"
10026 +
10027 +#: builtin/merge-tree.c
10028 +msgid "do a real merge instead of a trivial merge"
10029 +msgstr "进行真正的合并而不是简单的合并"
10030 +
10031 +#: builtin/merge-tree.c
10032 +msgid "do a trivial merge only"
10033 +msgstr "只进行简单的合并"
10034 +
10035 +#: builtin/merge-tree.c
10036 +msgid "also show informational/conflict messages"
10037 +msgstr "同时显示额外信息/冲突消息"
10038 +
10039 +#: builtin/merge-tree.c
10040 +msgid "list filenames without modes/oids/stages"
10041 +msgstr "列出没有模式/对象 ID/暂存的文件名"
10042 +
10043 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
10044 +msgid "allow merging unrelated histories"
10045 +msgstr "允许合并不相关的历史"
10046 +
10047 +#: builtin/merge-tree.c
10048 +msgid "--trivial-merge is incompatible with all other options"
10049 +msgstr "--trivial-merge 与其他所有选项不兼容"
10050 +
10051 #: builtin/merge.c
10052 msgid "git merge [<options>] [<commit>...]"
10053 msgstr "git merge [<选项>] [<提交>...]"
@@ -9980,10 +10154,6 @@ msgstr "--abort，但是保留索引和工作区"
10154 msgid "continue the current in-progress merge"
10155 msgstr "继续当前正在进行的合并"
10156
9983 -#: builtin/merge.c builtin/pull.c
9984 -msgid "allow merging unrelated histories"
9985 -msgstr "允许合并不相关的历史"
9986 -
10157 #: builtin/merge.c
10158 msgid "bypass pre-merge-commit and commit-msg hooks"
10159 msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
@@ -10128,10 +10298,6 @@ msgstr "不能关闭 '%s'"
10298 msgid "not something we can merge in %s: %s"
10299 msgstr "不能在 %s 中合并：%s"
10300
10131 -#: builtin/merge.c
10132 -msgid "not something we can merge"
10133 -msgstr "不能合并"
10134 -
10301 #: builtin/merge.c
10302 msgid "--abort expects no arguments"
10303 msgstr "--abort 不带参数"
@@ -10193,15 +10359,20 @@ msgstr "%s - 不能被合并"
10359 msgid "Can merge only exactly one commit into empty head"
10360 msgstr "只能将一个提交合并到空分支上"
10361
10196 -#: builtin/merge.c
10197 -msgid "refusing to merge unrelated histories"
10198 -msgstr "拒绝合并无关的历史"
10199 -
10362 #: builtin/merge.c
10363 #, c-format
10364 msgid "Updating %s..%s\n"
10365 msgstr "更新 %s..%s\n"
10366
10367 +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c
10368 +#, c-format
10369 +msgid ""
10370 +"Your local changes to the following files would be overwritten by merge:\n"
10371 +" %s"
10372 +msgstr ""
10373 +"您对下列文件的本地修改将被合并操作覆盖：\n"
10374 +" %s"
10375 +
10376 #: builtin/merge.c
10377 #, c-format
10378 msgid "Trying really trivial in-index merge...\n"
@@ -10242,6 +10413,11 @@ msgstr "使用 %s 策略以准备手工解决。\n"
10413 msgid "Automatic merge went well; stopped before committing as requested\n"
10414 msgstr "自动合并进展顺利，按要求在提交前停止\n"
10415
10416 +#: builtin/merge.c
10417 +#, c-format
10418 +msgid "When finished, apply stashed changes with `git stash pop`\n"
10419 +msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n"
10420 +
10421 #: builtin/mktag.c
10422 #, c-format
10423 msgid "warning: tag input does not pass fsck: %s"
@@ -10389,6 +10565,10 @@ msgstr "检查 '%s' 到 '%s' 的重命名\n"
10565 msgid "bad source"
10566 msgstr "坏的源"
10567
10568 +#: builtin/mv.c
10569 +msgid "destination exists"
10570 +msgstr "目标已存在"
10571 +
10572 #: builtin/mv.c
10573 msgid "can not move directory into itself"
10574 msgstr "不能将目录移动到自身"
@@ -10409,10 +10589,6 @@ msgstr "不在版本控制之下"
10589 msgid "conflicted"
10590 msgstr "冲突"
10591
10412 -#: builtin/mv.c
10413 -msgid "destination exists"
10414 -msgstr "目标已存在"
10415 -
10592 #: builtin/mv.c
10593 #, c-format
10594 msgid "overwriting '%s'"
@@ -10430,6 +10606,10 @@ msgstr "同一目标具有多个源"
10606 msgid "destination directory does not exist"
10607 msgstr "目标目录不存在"
10608
10609 +#: builtin/mv.c
10610 +msgid "destination exists in the index"
10611 +msgstr "目标在索引中已存在"
10612 +
10613 #: builtin/mv.c
10614 #, c-format
10615 msgid "%s, source=%s, destination=%s"
@@ -10872,10 +11052,10 @@ msgstr "注解引用"
11052 msgid "use notes from <notes-ref>"
11053 msgstr "从 <注解引用> 使用注解"
11054
10875 -#: builtin/notes.c builtin/stash.c
11055 +#: builtin/notes.c builtin/remote.c parse-options.c
11056 #, c-format
10877 -msgid "unknown subcommand: %s"
10878 -msgstr "未知子命令：%s"
11057 +msgid "unknown subcommand: `%s'"
11058 +msgstr "未知子命令：`%s'"
11059
11060 #: builtin/pack-objects.c
11061 msgid ""
@@ -11473,7 +11653,7 @@ msgstr "详见 git-pull(1)。"
11653 msgid "<remote>"
11654 msgstr "<远程>"
11655
11476 -#: builtin/pull.c contrib/scalar/scalar.c
11656 +#: builtin/pull.c scalar.c
11657 msgid "<branch>"
11658 msgstr "<分支>"
11659
@@ -11924,14 +12104,20 @@ msgstr "仅显示与第一个范围有关的输出"
12104 msgid "only emit output related to the second range"
12105 msgstr "仅显示与第二个范围有关的输出"
12106
12107 +#: builtin/range-diff.c
12108 +#, c-format
12109 +msgid "not a revision: '%s'"
12110 +msgstr "不是版本：'%s'"
12111 +
12112 #: builtin/range-diff.c
12113 #, c-format
12114 msgid "not a commit range: '%s'"
11930 -msgstr "不是一个提交范围：'%s'"
12115 +msgstr "不是提交范围：'%s'"
12116
12117 #: builtin/range-diff.c
11933 -msgid "single arg format must be symmetric range"
11934 -msgstr "单个参数格式必须是对称范围（即包含...）"
12118 +#, c-format
12119 +msgid "not a symmetric range: '%s'"
12120 +msgstr "不是对称的范围：'%s'"
12121
12122 #: builtin/range-diff.c
12123 msgid "need two commit ranges"
@@ -12265,6 +12451,10 @@ msgstr "保留初始为空的提交"
12451 msgid "move commits that begin with squash!/fixup! under -i"
12452 msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
12453
12454 +#: builtin/rebase.c
12455 +msgid "update branches that point to commits that are being rebased"
12456 +msgstr "更新指向正在被变基的提交的分支"
12457 +
12458 #: builtin/rebase.c
12459 msgid "add exec lines after each commit of the editable list"
12460 msgstr "可编辑列表的每一个提交下面增加一行 exec"
@@ -12888,6 +13078,10 @@ msgstr " 新的（下一次获取将存储于 remotes/%s）"
13078 msgid " tracked"
13079 msgstr " 已跟踪"
13080
13081 +#: builtin/remote.c
13082 +msgid " skipped"
13083 +msgstr " 已跳过"
13084 +
13085 #: builtin/remote.c
13086 msgid " stale (use 'git remote prune' to remove)"
13087 msgstr " 过时（使用 'git remote prune' 来移除）"
@@ -13729,11 +13923,16 @@ msgstr "不能重置索引文件至版本 '%s'。"
13923 msgid "Could not write new index file."
13924 msgstr "不能写入新的索引文件。"
13925
13732 -#: builtin/rev-list.c pack-bitmap.c
13926 +#: builtin/rev-list.c
13927 #, c-format
13928 msgid "unable to get disk usage of %s"
13929 msgstr "无法得到 %s 的磁盘使用量"
13930
13931 +#: builtin/rev-list.c
13932 +#, c-format
13933 +msgid "invalid value for '%s': '%s', the only allowed format is '%s'"
13934 +msgstr "'%s' 的值无效：'%s'，唯一允许的格式是 '%s'"
13935 +
13936 #: builtin/rev-list.c
13937 msgid "rev-list does not support display of notes"
13938 msgstr "rev-list 不支持显示注解"
@@ -13767,6 +13966,10 @@ msgstr "输入过早结束"
13966 msgid "no usage string given before the `--' separator"
13967 msgstr "在 `--' 分隔符之前没有给出使用方法字符串"
13968
13969 +#: builtin/rev-parse.c
13970 +msgid "missing opt-spec before option flags"
13971 +msgstr "选项参数之前缺少选项规格"
13972 +
13973 #: builtin/rev-parse.c
13974 msgid "Needed a single revision"
13975 msgstr "需要一个单独的版本"
@@ -14317,7 +14520,7 @@ msgstr "初始化稀疏检出为锥形模式"
14520 msgid "toggle the use of a sparse index"
14521 msgstr "切换稀疏索引的使用"
14522
14320 -#: builtin/sparse-checkout.c commit-graph.c midx.c
14523 +#: builtin/sparse-checkout.c commit-graph.c midx.c sequencer.c
14524 #, c-format
14525 msgid "unable to create leading directories of %s"
14526 msgstr "不能为 %s 创建先导目录"
@@ -14711,6 +14914,11 @@ msgstr "为每一行的行首添加注释符和空格"
14914 msgid "Expecting a full ref name, got %s"
14915 msgstr "期望一个完整的引用名称，却得到 %s"
14916
14917 +#: builtin/submodule--helper.c
14918 +#, c-format
14919 +msgid "could not get a repository handle for submodule '%s'"
14920 +msgstr "无法获得子模组 '%s' 的仓库句柄"
14921 +
14922 #: builtin/submodule--helper.c
14923 #, c-format
14924 msgid ""
@@ -14718,14 +14926,6 @@ msgid ""
14926 "authoritative upstream."
14927 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
14928
14721 -#: builtin/submodule--helper.c
14722 -msgid "alternative anchor for relative paths"
14723 -msgstr "相对路径的替代锚记（anchor）"
14724 -
14725 -#: builtin/submodule--helper.c
14726 -msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
14727 -msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
14728 -
14929 #: builtin/submodule--helper.c
14930 #, c-format
14931 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -14764,8 +14964,8 @@ msgid "recurse into nested submodules"
14964 msgstr "递归进入嵌套子模组中"
14965
14966 #: builtin/submodule--helper.c
14767 -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
14768 -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
14967 +msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
14968 +msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>"
14969
14970 #: builtin/submodule--helper.c
14971 #, c-format
@@ -14792,8 +14992,8 @@ msgid "suppress output for initializing a submodule"
14992 msgstr "抑制子模组初始化的输出"
14993
14994 #: builtin/submodule--helper.c
14795 -msgid "git submodule--helper init [<options>] [<path>]"
14796 -msgstr "git submodule--helper init [<选项>] [<路径>]"
14995 +msgid "git submodule init [<options>] [<path>]"
14996 +msgstr "git submodule init [<选项>] [<路径>]"
14997
14998 #: builtin/submodule--helper.c
14999 #, c-format
@@ -14824,10 +15024,6 @@ msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的
15024 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
15025 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
15026
14827 -#: builtin/submodule--helper.c
14828 -msgid "git submodule--helper name <path>"
14829 -msgstr "git submodule--helper name <路径>"
14830 -
15027 #: builtin/submodule--helper.c
15028 #, c-format
15029 msgid "* %s %s(blob)->%s(submodule)"
@@ -14870,8 +15066,8 @@ msgid "limit the summary size"
15066 msgstr "限制总结的大小"
15067
15068 #: builtin/submodule--helper.c
14873 -msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
14874 -msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]"
15069 +msgid "git submodule summary [<options>] [<commit>] [--] [<path>]"
15070 +msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]"
15071
15072 #: builtin/submodule--helper.c
15073 msgid "could not fetch a revision for HEAD"
@@ -14887,11 +15083,6 @@ msgstr "为 '%s' 同步子模组 url\n"
15083 msgid "failed to register url for submodule path '%s'"
15084 msgstr "无法为子模组路径 '%s' 注册 url"
15085
14890 -#: builtin/submodule--helper.c
14891 -#, c-format
14892 -msgid "failed to get the default remote for submodule '%s'"
14893 -msgstr "无法得到子模组 '%s' 的默认远程关联"
14894 -
15086 #: builtin/submodule--helper.c
15087 #, c-format
15088 msgid "failed to update remote for submodule '%s'"
@@ -14902,8 +15093,8 @@ msgid "suppress output of synchronizing submodule url"
15093 msgstr "抑制子模组 URL 同步的输出"
15094
15095 #: builtin/submodule--helper.c
14905 -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
14906 -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
15096 +msgid "git submodule sync [--quiet] [--recursive] [<path>]"
15097 +msgstr "git submodule sync [--quiet] [--recursive] [<路径>]"
15098
15099 #: builtin/submodule--helper.c
15100 #, c-format
@@ -14971,6 +15162,11 @@ msgstr ""
15162 "Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
15163 "'--reference' 来克隆。"
15164
15165 +#: builtin/submodule--helper.c
15166 +#, c-format
15167 +msgid "could not get a repository handle for gitdir '%s'"
15168 +msgstr "无法获得 git 目录 '%s' 的仓库句柄"
15169 +
15170 #: builtin/submodule--helper.c
15171 #, c-format
15172 msgid "submodule '%s' cannot add alternate: %s"
@@ -15006,6 +15202,10 @@ msgstr "目录非空：'%s'"
15202 msgid "could not get submodule directory for '%s'"
15203 msgstr "无法得到 '%s' 的子模组目录"
15204
15205 +#: builtin/submodule--helper.c
15206 +msgid "alternative anchor for relative paths"
15207 +msgstr "相对路径的替代锚记（anchor）"
15208 +
15209 #: builtin/submodule--helper.c
15210 msgid "where the new submodule will be cloned to"
15211 msgstr "新的子模组将要克隆的路径"
@@ -15040,11 +15240,6 @@ msgstr ""
15240 "[--name <名字>] [--depth <深度>] [--single-branch] [--filter <过滤器规格>] --"
15241 "url <url> --path <路径>"
15242
15043 -#: builtin/submodule--helper.c
15044 -#, c-format
15045 -msgid "Invalid update mode '%s' for submodule path '%s'"
15046 -msgstr "子模组路径 '%2$s' 的更新模式 '%1$s' 无效"
15047 -
15243 #: builtin/submodule--helper.c
15244 #, c-format
15245 msgid "Invalid update mode '%s' configured for submodule path '%s'"
@@ -15131,6 +15326,11 @@ msgid ""
15326 "of that commit failed."
15327 msgstr "获取了子模组路径 '%s'，但是它没有包含 %s。直接获取该提交失败。"
15328
15329 +#: builtin/submodule--helper.c
15330 +#, c-format
15331 +msgid "could not initialize submodule at path '%s'"
15332 +msgstr "无法在路径 '%s' 初始化子模组"
15333 +
15334 #: builtin/submodule--helper.c
15335 #, c-format
15336 msgid ""
@@ -15138,11 +15338,6 @@ msgid ""
15338 "the superproject is not on any branch"
15339 msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
15340
15141 -#: builtin/submodule--helper.c
15142 -#, c-format
15143 -msgid "could not get a repository handle for submodule '%s'"
15144 -msgstr "无法获得子模组 '%s' 的仓库句柄"
15145 -
15341 #: builtin/submodule--helper.c
15342 #, c-format
15343 msgid "Unable to find current revision in submodule path '%s'"
@@ -15188,12 +15383,16 @@ msgid "path into the working tree"
15383 msgstr "到工作区的路径"
15384
15385 #: builtin/submodule--helper.c
15191 -msgid "path into the working tree, across nested submodule boundaries"
15192 -msgstr "工作区中的路径，递归嵌套子模组"
15386 +msgid "use the 'checkout' update strategy (default)"
15387 +msgstr "使用 'checkout' 更新策略（默认）"
15388
15389 #: builtin/submodule--helper.c
15195 -msgid "rebase, merge, checkout or none"
15196 -msgstr "rebase、merge、checkout 或 none"
15390 +msgid "use the 'merge' update strategy"
15391 +msgstr "使用 'merge' 更新策略"
15392 +
15393 +#: builtin/submodule--helper.c
15394 +msgid "use the 'rebase' update strategy"
15395 +msgstr "使用 'rebase' 更新策略"
15396
15397 #: builtin/submodule--helper.c
15398 msgid "create a shallow clone truncated to the specified number of revisions"
@@ -15211,6 +15410,10 @@ msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
15410 msgid "don't print cloning progress"
15411 msgstr "不要输出克隆进度"
15412
15413 +#: builtin/submodule--helper.c
15414 +msgid "disallow cloning into non-empty directory, implies --init"
15415 +msgstr "不允许克隆到一个非空目录，暗含 --init"
15416 +
15417 #: builtin/submodule--helper.c
15418 msgid ""
15419 "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] "
@@ -15223,17 +15426,13 @@ msgstr ""
15426 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
15427 "径>...]"
15428
15226 -#: builtin/submodule--helper.c
15227 -msgid "bad value for update parameter"
15228 -msgstr "update 参数取值错误"
15229 -
15429 #: builtin/submodule--helper.c
15430 msgid "recurse into submodules"
15431 msgstr "在子模组中递归"
15432
15433 #: builtin/submodule--helper.c
15235 -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
15236 -msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
15434 +msgid "git submodule absorbgitdirs [<options>] [<path>...]"
15435 +msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]"
15436
15437 #: builtin/submodule--helper.c
15438 msgid "check if it is safe to write to the .gitmodules file"
@@ -15260,8 +15459,8 @@ msgid "suppress output for setting url of a submodule"
15459 msgstr "抑制设置子模组 URL 的输出"
15460
15461 #: builtin/submodule--helper.c
15263 -msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
15264 -msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>"
15462 +msgid "git submodule set-url [--quiet] <path> <newurl>"
15463 +msgstr "git submodule set-url [--quiet] <路径> <新地址>"
15464
15465 #: builtin/submodule--helper.c
15466 msgid "set the default tracking branch to master"
@@ -15272,14 +15471,12 @@ msgid "set the default tracking branch"
15471 msgstr "设置默认跟踪分支"
15472
15473 #: builtin/submodule--helper.c
15275 -msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
15276 -msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
15474 +msgid "git submodule set-branch [-q|--quiet] (-d|--default) <path>"
15475 +msgstr "git submodule set-branch [-q|--quiet] (-d|--default) <路径>"
15476
15477 #: builtin/submodule--helper.c
15279 -msgid ""
15280 -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15281 -msgstr ""
15282 -"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
15478 +msgid "git submodule set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
15479 +msgstr "git submodule set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
15480
15481 #: builtin/submodule--helper.c
15482 msgid "--branch or --default required"
@@ -15394,8 +15591,8 @@ msgid ""
15591 msgstr "将子模组的名称设置为给定的字符串，而非默认为其路径"
15592
15593 #: builtin/submodule--helper.c
15397 -msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
15398 -msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
15594 +msgid "git submodule add [<options>] [--] <repository> [<path>]"
15595 +msgstr "git submodule add [<选项>] [--] <仓库> [<路径>]"
15596
15597 #: builtin/submodule--helper.c
15598 msgid "Relative path can only be used from the toplevel of the working tree"
@@ -15648,6 +15845,19 @@ msgstr "已更新标签 '%s'（曾为 %s）\n"
15845 msgid "pack exceeds maximum allowed size"
15846 msgstr "包超过了最大允许大小"
15847
15848 +#: builtin/unpack-objects.c
15849 +msgid "failed to write object in stream"
15850 +msgstr "无法在流中写入对象"
15851 +
15852 +#: builtin/unpack-objects.c
15853 +#, c-format
15854 +msgid "inflate returned (%d)"
15855 +msgstr "解压缩返回了 (%d)"
15856 +
15857 +#: builtin/unpack-objects.c
15858 +msgid "invalid blob object from stream"
15859 +msgstr "流中无效的数据对象"
15860 +
15861 #: builtin/unpack-objects.c
15862 msgid "Unpacking objects"
15863 msgstr "展开对象中"
@@ -16290,6 +16500,33 @@ msgstr "将 <前缀> 子目录内容写到一个树对象"
16500 msgid "only useful for debugging"
16501 msgstr "只对调试有用"
16502
16503 +#: bulk-checkin.c
16504 +msgid "core.fsyncMethod = batch is unsupported on this platform"
16505 +msgstr "core.fsyncMethod = batch 不支持本平台"
16506 +
16507 +#: bundle-uri.c
16508 +msgid "failed to create temporary file"
16509 +msgstr "无法创建临时文件"
16510 +
16511 +#: bundle-uri.c
16512 +msgid "insufficient capabilities"
16513 +msgstr "缺乏能力"
16514 +
16515 +#: bundle-uri.c
16516 +#, c-format
16517 +msgid "failed to download bundle from URI '%s'"
16518 +msgstr "无法从 URI '%s' 下载归档包"
16519 +
16520 +#: bundle-uri.c
16521 +#, c-format
16522 +msgid "file at URI '%s' is not a bundle"
16523 +msgstr "位于 URI '%s' 的文件不是归档包"
16524 +
16525 +#: bundle-uri.c
16526 +#, c-format
16527 +msgid "failed to unbundle bundle from URI '%s'"
16528 +msgstr "无法从 URI '%s' 解开归档包"
16529 +
16530 #: bundle.c
16531 #, c-format
16532 msgid "unrecognized bundle hash algorithm: %s"
@@ -16552,6 +16789,10 @@ msgstr "一个非常简单的 Git 仓库服务器"
16789 msgid "Give an object a human readable name based on an available ref"
16790 msgstr "基于一个现存的引用为一个对象起一个可读的名称"
16791
16792 +#: command-list.h
16793 +msgid "Generate a zip archive of diagnostic information"
16794 +msgstr "生成诊断信息的压缩包"
16795 +
16796 #: command-list.h
16797 msgid "Show changes between commits, commit and working tree, etc"
16798 msgstr "显示提交之间、提交和工作区之间等的差异"
@@ -16721,8 +16962,8 @@ msgid "The standard helper program to use with git-merge-index"
16962 msgstr "与 git-merge-index 一起使用的标准向导程序"
16963
16964 #: command-list.h
16724 -msgid "Show three-way merge without touching index"
16725 -msgstr "在不动索引的情况下显示三路合并"
16965 +msgid "Perform merge without touching index or working tree"
16966 +msgstr "在不触碰索引或工作树情况下应用合并"
16967
16968 #: command-list.h
16969 msgid "Run merge conflict resolution tools to resolve merge conflicts"
@@ -16982,6 +17223,10 @@ msgstr "校验打包的Git存仓文件"
17223 msgid "Check the GPG signature of tags"
17224 msgstr "检查标签的 GPG 签名"
17225
17226 +#: command-list.h
17227 +msgid "Display version information about Git"
17228 +msgstr "显示关于 Git 的版本信息"
17229 +
17230 #: command-list.h
17231 msgid "Show logs with difference each commit introduces"
17232 msgstr "显示每一个提交引入的差异日志"
@@ -17027,16 +17272,40 @@ msgid "Frequently asked questions about using Git"
17272 msgstr "关于使用 Git 的常见问题"
17273
17274 #: command-list.h
17030 -msgid "A Git Glossary"
17031 -msgstr "Git 词汇表"
17275 +msgid "The bundle file format"
17276 +msgstr "归档包文件格式"
17277
17278 #: command-list.h
17034 -msgid "Hooks used by Git"
17279 +msgid "Chunk-based file formats"
17280 +msgstr "块式文件格式"
17281 +
17282 +#: command-list.h
17283 +msgid "Git commit graph format"
17284 +msgstr "Git 提交图格式"
17285 +
17286 +#: command-list.h
17287 +msgid "Git index format"
17288 +msgstr "Git 索引格式"
17289 +
17290 +#: command-list.h
17291 +msgid "Git pack format"
17292 +msgstr "Git 包格式"
17293 +
17294 +#: command-list.h
17295 +msgid "Git cryptographic signature formats"
17296 +msgstr "Git 密码学签名格式"
17297 +
17298 +#: command-list.h
17299 +msgid "A Git Glossary"
17300 +msgstr "Git 词汇表"
17301 +
17302 +#: command-list.h
17303 +msgid "Hooks used by Git"
17304 msgstr "Git 使用的钩子"
17305
17306 #: command-list.h
17307 msgid "Specifies intentionally untracked files to ignore"
17039 -msgstr "忽略指定的未跟踪文件"
17308 +msgstr "指定故意忽略的未跟踪文件"
17309
17310 #: command-list.h
17311 msgid "The Git repository browser"
@@ -17054,6 +17323,26 @@ msgstr "定义子模组属性"
17323 msgid "Git namespaces"
17324 msgstr "Git 名字空间"
17325
17326 +#: command-list.h
17327 +msgid "Protocol v0 and v1 capabilities"
17328 +msgstr "协议 v0 和 v1 能力"
17329 +
17330 +#: command-list.h
17331 +msgid "Things common to various protocols"
17332 +msgstr "不同协议的共同部分"
17333 +
17334 +#: command-list.h
17335 +msgid "Git HTTP-based protocols"
17336 +msgstr "Git 基于 HTTP 的协议"
17337 +
17338 +#: command-list.h
17339 +msgid "How packs are transferred over-the-wire"
17340 +msgstr "包在线路中传输的方式"
17341 +
17342 +#: command-list.h
17343 +msgid "Git Wire Protocol, Version 2"
17344 +msgstr "Git 传输协议，第二版"
17345 +
17346 #: command-list.h
17347 msgid "Helper programs to interact with remote repositories"
17348 msgstr "与远程仓库交互的助手程序"
@@ -17086,6 +17375,10 @@ msgstr "Git web 界面（Git 仓库的 web 前端）"
17375 msgid "An overview of recommended workflows with Git"
17376 msgstr "Git 推荐的工作流概览"
17377
17378 +#: command-list.h
17379 +msgid "A tool for managing large Git repositories"
17380 +msgstr "一个管理大型 Git 仓库的工具"
17381 +
17382 #: commit-graph.c
17383 msgid "commit-graph file is too small"
17384 msgstr "提交图形文件太小"
@@ -17374,6 +17667,16 @@ msgstr "编译器信息不可用\n"
17667 msgid "no libc information available\n"
17668 msgstr "libc 信息不可用\n"
17669
17670 +#: compat/disk.h
17671 +#, c-format
17672 +msgid "could not determine free disk size for '%s'"
17673 +msgstr "不能确定 '%s' 的空余磁盘空间"
17674 +
17675 +#: compat/disk.h
17676 +#, c-format
17677 +msgid "could not get info for '%s'"
17678 +msgstr "无法获得 '%s' 的信息"
17679 +
17680 #: compat/fsmonitor/fsm-health-win32.c
17681 #, c-format
17682 msgid "[GLE %ld] health thread could not open '%ls'"
@@ -17442,6 +17745,16 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"
17745 msgid "could not read directory changes [GLE %ld]"
17746 msgstr "无法获取目录变更 [GLE %ld]"
17747
17748 +#: compat/fsmonitor/fsm-settings-win32.c
17749 +#, c-format
17750 +msgid "[GLE %ld] unable to open for read '%ls'"
17751 +msgstr "[GLE %ld] 无法打开要读取的 '%ls'"
17752 +
17753 +#: compat/fsmonitor/fsm-settings-win32.c
17754 +#, c-format
17755 +msgid "[GLE %ld] unable to get protocol information for '%ls'"
17756 +msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "
17757 +
17758 #: compat/mingw.c
17759 #, c-format
17760 msgid "failed to copy SID (%ld)"
@@ -18115,229 +18428,6 @@ msgstr "写入 rev-list 失败"
18428 msgid "failed to close rev-list's stdin"
18429 msgstr "无法关闭 rev-list 的标准输入"
18430
18118 -#: contrib/scalar/scalar.c worktree.c
18119 -#, c-format
18120 -msgid "'%s' does not exist"
18121 -msgstr "'%s' 不存在"
18122 -
18123 -#: contrib/scalar/scalar.c
18124 -msgid "need a working directory"
18125 -msgstr "需要一个工作目录"
18126 -
18127 -#: contrib/scalar/scalar.c
18128 -msgid "could not find enlistment root"
18129 -msgstr "无法找到登记根"
18130 -
18131 -#: contrib/scalar/scalar.c
18132 -#, c-format
18133 -msgid "could not switch to '%s'"
18134 -msgstr "无法切换到 '%s'"
18135 -
18136 -#: contrib/scalar/scalar.c
18137 -#, c-format
18138 -msgid "could not configure %s=%s"
18139 -msgstr "无法配置 %s=%s"
18140 -
18141 -#: contrib/scalar/scalar.c
18142 -msgid "could not configure log.excludeDecoration"
18143 -msgstr "无法配置 log.excludeDecoration"
18144 -
18145 -#: contrib/scalar/scalar.c
18146 -msgid "Scalar enlistments require a worktree"
18147 -msgstr "Scalar 登记需要一个工作树"
18148 -
18149 -#: contrib/scalar/scalar.c dir.c
18150 -#, c-format
18151 -msgid "could not open directory '%s'"
18152 -msgstr "不能打开目录 '%s'"
18153 -
18154 -#: contrib/scalar/scalar.c
18155 -#, c-format
18156 -msgid "skipping '%s', which is neither file nor directory"
18157 -msgstr "跳过 '%s'，既不是文件又不是目录"
18158 -
18159 -#: contrib/scalar/scalar.c
18160 -#, c-format
18161 -msgid "could not determine free disk size for '%s'"
18162 -msgstr "不能确定 '%s' 的空余磁盘空间"
18163 -
18164 -#: contrib/scalar/scalar.c
18165 -#, c-format
18166 -msgid "could not get info for '%s'"
18167 -msgstr "不能获得 '%s' 的信息"
18168 -
18169 -#: contrib/scalar/scalar.c
18170 -#, c-format
18171 -msgid "remote HEAD is not a branch: '%.*s'"
18172 -msgstr "远程 HEAD 不是一个分支：'%.*s'"
18173 -
18174 -#: contrib/scalar/scalar.c
18175 -msgid "failed to get default branch name from remote; using local default"
18176 -msgstr "无法从远程获取默认分支名称；使用本地默认值"
18177 -
18178 -#: contrib/scalar/scalar.c
18179 -msgid "failed to get default branch name"
18180 -msgstr "无法获取默认分支名称"
18181 -
18182 -#: contrib/scalar/scalar.c
18183 -msgid "failed to unregister repository"
18184 -msgstr "无法取消注册仓库"
18185 -
18186 -#: contrib/scalar/scalar.c
18187 -msgid "failed to delete enlistment directory"
18188 -msgstr "无法删除登记目录"
18189 -
18190 -#: contrib/scalar/scalar.c
18191 -msgid "branch to checkout after clone"
18192 -msgstr "克隆后要检出的分支"
18193 -
18194 -#: contrib/scalar/scalar.c
18195 -msgid "when cloning, create full working directory"
18196 -msgstr "在克隆时，创建完整的工作目录"
18197 -
18198 -#: contrib/scalar/scalar.c
18199 -msgid "only download metadata for the branch that will be checked out"
18200 -msgstr "只下载要检出的分支的元信息"
18201 -
18202 -#: contrib/scalar/scalar.c
18203 -msgid "scalar clone [<options>] [--] <repo> [<dir>]"
18204 -msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
18205 -
18206 -#: contrib/scalar/scalar.c
18207 -#, c-format
18208 -msgid "cannot deduce worktree name from '%s'"
18209 -msgstr "无法从 '%s' 猜测工作区名称"
18210 -
18211 -#: contrib/scalar/scalar.c
18212 -#, c-format
18213 -msgid "directory '%s' exists already"
18214 -msgstr "目录 '%s' 已存在"
18215 -
18216 -#: contrib/scalar/scalar.c
18217 -#, c-format
18218 -msgid "failed to get default branch for '%s'"
18219 -msgstr "无法获取 '%s' 的默认分支"
18220 -
18221 -#: contrib/scalar/scalar.c
18222 -#, c-format
18223 -msgid "could not configure remote in '%s'"
18224 -msgstr "无法在 '%s' 中配置远程"
18225 -
18226 -#: contrib/scalar/scalar.c
18227 -#, c-format
18228 -msgid "could not configure '%s'"
18229 -msgstr "无法配置 '%s'"
18230 -
18231 -#: contrib/scalar/scalar.c
18232 -msgid "partial clone failed; attempting full clone"
18233 -msgstr "部分克隆失败；尝试完整克隆"
18234 -
18235 -#: contrib/scalar/scalar.c
18236 -msgid "could not configure for full clone"
18237 -msgstr "无法配置完整克隆"
18238 -
18239 -#: contrib/scalar/scalar.c
18240 -msgid "scalar diagnose [<enlistment>]"
18241 -msgstr "scalar diagnose [<登记>]"
18242 -
18243 -#: contrib/scalar/scalar.c
18244 -#, c-format
18245 -msgid "could not create directory for '%s'"
18246 -msgstr "不能为 '%s' 创建目录"
18247 -
18248 -#: contrib/scalar/scalar.c
18249 -msgid "could not duplicate stdout"
18250 -msgstr "不能复制标准输出"
18251 -
18252 -#: contrib/scalar/scalar.c
18253 -msgid "failed to write archive"
18254 -msgstr "无法写入归档"
18255 -
18256 -#: contrib/scalar/scalar.c
18257 -msgid "`scalar list` does not take arguments"
18258 -msgstr "`scalar list` 不带参数"
18259 -
18260 -#: contrib/scalar/scalar.c
18261 -msgid "scalar register [<enlistment>]"
18262 -msgstr "scalar register [<登记>]"
18263 -
18264 -#: contrib/scalar/scalar.c
18265 -msgid "reconfigure all registered enlistments"
18266 -msgstr "重新配置所有注册的登记"
18267 -
18268 -#: contrib/scalar/scalar.c
18269 -msgid "scalar reconfigure [--all | <enlistment>]"
18270 -msgstr "scalar reconfigure [--all | <登记>]"
18271 -
18272 -#: contrib/scalar/scalar.c
18273 -msgid "--all or <enlistment>, but not both"
18274 -msgstr "--all 或者 <登记>，而不是两个一起"
18275 -
18276 -#: contrib/scalar/scalar.c
18277 -#, c-format
18278 -msgid "git repository gone in '%s'"
18279 -msgstr "在 '%s' 的 git 仓库已消失"
18280 -
18281 -#: contrib/scalar/scalar.c
18282 -msgid ""
18283 -"scalar run <task> [<enlistment>]\n"
18284 -"Tasks:\n"
18285 -msgstr ""
18286 -"scalar run <任务> [<登记>]\n"
18287 -"任务：\n"
18288 -
18289 -#: contrib/scalar/scalar.c
18290 -#, c-format
18291 -msgid "no such task: '%s'"
18292 -msgstr "没有此任务：'%s'"
18293 -
18294 -#: contrib/scalar/scalar.c
18295 -msgid "scalar unregister [<enlistment>]"
18296 -msgstr "scalar unregister [<登记>]"
18297 -
18298 -#: contrib/scalar/scalar.c
18299 -msgid "scalar delete <enlistment>"
18300 -msgstr "scalar delete <登记>"
18301 -
18302 -#: contrib/scalar/scalar.c
18303 -msgid "refusing to delete current working directory"
18304 -msgstr "拒绝删除当前工作目录"
18305 -
18306 -#: contrib/scalar/scalar.c
18307 -msgid "include Git version"
18308 -msgstr "包括 Git 的版本"
18309 -
18310 -#: contrib/scalar/scalar.c
18311 -msgid "include Git's build options"
18312 -msgstr "包括 Git 的构建选项"
18313 -
18314 -#: contrib/scalar/scalar.c
18315 -msgid "scalar verbose [-v | --verbose] [--build-options]"
18316 -msgstr "scalar verbose [-v | --verbose] [--build-options]"
18317 -
18318 -#: contrib/scalar/scalar.c
18319 -msgid "-C requires a <directory>"
18320 -msgstr "-C 需要 <目录>"
18321 -
18322 -#: contrib/scalar/scalar.c
18323 -#, c-format
18324 -msgid "could not change to '%s'"
18325 -msgstr "无法变更到 '%s'"
18326 -
18327 -#: contrib/scalar/scalar.c
18328 -msgid "-c requires a <key>=<value> argument"
18329 -msgstr "-c 需要 <键>=<值> 参数"
18330 -
18331 -#: contrib/scalar/scalar.c
18332 -msgid ""
18333 -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
18334 -"\n"
18335 -"Commands:\n"
18336 -msgstr ""
18337 -"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
18338 -"\n"
18339 -"命令：\n"
18340 -
18431 #: convert.c
18432 #, c-format
18433 msgid "illegal crlf_action %d"
@@ -18578,6 +18668,39 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多
18668 msgid "Marked %d islands, done.\n"
18669 msgstr "已标记 %d 个数据岛，结束。\n"
18670
18671 +#: diagnose.c
18672 +#, c-format
18673 +msgid "invalid --%s value '%s'"
18674 +msgstr "无效的 --%s 值 '%s'"
18675 +
18676 +#: diagnose.c
18677 +#, c-format
18678 +msgid "could not archive missing directory '%s'"
18679 +msgstr "无法归档缺失的目录 '%s'"
18680 +
18681 +#: diagnose.c dir.c
18682 +#, c-format
18683 +msgid "could not open directory '%s'"
18684 +msgstr "无法打开目录 '%s'"
18685 +
18686 +#: diagnose.c
18687 +#, c-format
18688 +msgid "skipping '%s', which is neither file nor directory"
18689 +msgstr "跳过 '%s'，既不是文件又不是目录"
18690 +
18691 +#: diagnose.c
18692 +msgid "could not duplicate stdout"
18693 +msgstr "无法复制标准输出"
18694 +
18695 +#: diagnose.c
18696 +#, c-format
18697 +msgid "could not add directory '%s' to archiver"
18698 +msgstr "无法添加目录 '%s' 至归档器"
18699 +
18700 +#: diagnose.c
18701 +msgid "failed to write archive"
18702 +msgstr "无法写入归档"
18703 +
18704 #: diff-lib.c
18705 msgid "--merge-base does not work with ranges"
18706 msgstr "--merge-base 不适用于范围"
@@ -19327,6 +19450,10 @@ msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
19450 msgid "unable to write to remote"
19451 msgstr "无法写到远程"
19452
19453 +#: fetch-pack.c
19454 +msgid "Server supports filter"
19455 +msgstr "服务器支持 filter"
19456 +
19457 #: fetch-pack.c
19458 #, c-format
19459 msgid "invalid shallow line: %s"
@@ -19468,10 +19595,6 @@ msgstr "服务器不支持算法 '%s'"
19595 msgid "Server does not support shallow requests"
19596 msgstr "服务器不支持浅克隆请求"
19597
19471 -#: fetch-pack.c
19472 -msgid "Server supports filter"
19473 -msgstr "服务器支持 filter"
19474 -
19598 #: fetch-pack.c
19599 msgid "unable to write request to remote"
19600 msgstr "无法将请求写到远程"
@@ -19886,6 +20009,14 @@ msgstr "低级命令/同步仓库"
20009 msgid "Low-level Commands / Internal Helpers"
20010 msgstr "低级命令/内部助手"
20011
20012 +#: help.c
20013 +msgid "User-facing repository, command and file interfaces"
20014 +msgstr "面向用户的仓库、命令和文件接口"
20015 +
20016 +#: help.c
20017 +msgid "Developer-facing file formats, protocols and other interfaces"
20018 +msgstr "面向开发者的文件格式、协议和其他接口"
20019 +
20020 #: help.c
20021 #, c-format
20022 msgid "available git commands in '%s'"
@@ -19903,6 +20034,14 @@ msgstr "这些是各种场合常见的 Git 命令："
20034 msgid "The Git concept guides are:"
20035 msgstr "Git 概念向导有："
20036
20037 +#: help.c
20038 +msgid "User-facing repository, command and file interfaces:"
20039 +msgstr "面向用户的仓库、命令和文件接口："
20040 +
20041 +#: help.c
20042 +msgid "File formats, protocols and other developer interfaces:"
20043 +msgstr "文件格式、协议和其他开发者接口列表："
20044 +
20045 #: help.c
20046 msgid "External commands"
20047 msgstr "外部命令"
@@ -19999,11 +20138,6 @@ msgstr ""
20138 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
20139 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
20140
20002 -#: hook.c
20003 -#, c-format
20004 -msgid "Couldn't start hook '%s'\n"
20005 -msgstr "不能启动钩子 '%s'\n"
20006 -
20141 #: http-fetch.c
20142 #, c-format
20143 msgid "argument to --packfile must be a valid hash (got '%s')"
@@ -20221,20 +20355,16 @@ msgstr "在 ls-refs 参数后应该有一个 flush 包"
20355 msgid "quoted CRLF detected"
20356 msgstr "检测到被引用的 CRLF"
20357
20224 -#: merge-ort-wrappers.c merge-recursive.c
20225 -#, c-format
20226 -msgid ""
20227 -"Your local changes to the following files would be overwritten by merge:\n"
20228 -" %s"
20229 -msgstr ""
20230 -"您对下列文件的本地修改将被合并操作覆盖：\n"
20231 -" %s"
20232 -
20358 #: merge-ort.c merge-recursive.c
20359 #, c-format
20360 msgid "Failed to merge submodule %s (not checked out)"
20361 msgstr "无法合并子模组 %s （没有检出）"
20362
20363 +#: merge-ort.c
20364 +#, c-format
20365 +msgid "Failed to merge submodule %s (no merge base)"
20366 +msgstr "无法合并子模组 %s （没有合并基线）"
20367 +
20368 #: merge-ort.c merge-recursive.c
20369 #, c-format
20370 msgid "Failed to merge submodule %s (commits not present)"
@@ -20258,27 +20388,8 @@ msgstr "无法合并子模组 %s"
20388 #: merge-ort.c
20389 #, c-format
20390 msgid ""
20261 -"Failed to merge submodule %s, but a possible merge resolution exists:\n"
20262 -"%s\n"
20263 -msgstr ""
20264 -"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
20265 -"%s\n"
20266 -
20267 -#: merge-ort.c merge-recursive.c
20268 -#, c-format
20269 -msgid ""
20270 -"If this is correct simply add it to the index for example\n"
20271 -"by using:\n"
20272 -"\n"
20273 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
20274 -"\n"
20275 -"which will accept this suggestion.\n"
20276 -msgstr ""
20277 -"如果这个正确，将其添加到索引，例如使用命令：\n"
20278 -"\n"
20279 -" git update-index --cacheinfo 160000 %s \"%s\"\n"
20280 -"\n"
20281 -"以接受此建议。\n"
20391 +"Failed to merge submodule %s, but a possible merge resolution exists: %s"
20392 +msgstr "无法合并子模组 %s，但是存在一个可能的合并方案：%s"
20393
20394 #: merge-ort.c
20395 #, c-format
@@ -20455,12 +20566,45 @@ msgstr ""
20566 "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
20567 "在树中被保留。"
20568
20569 +#. TRANSLATORS: This is a line of advice to resolve a merge
20570 +#. conflict in a submodule. The first argument is the submodule
20571 +#. name, and the second argument is the abbreviated id of the
20572 +#. commit that needs to be merged. For example:
20573 +#. - go to submodule (mysubmodule), and either merge commit abc1234"
20574 +#.
20575 +#: merge-ort.c
20576 +#, c-format
20577 +msgid ""
20578 +" - go to submodule (%s), and either merge commit %s\n"
20579 +" or update to an existing commit which has merged those changes\n"
20580 +msgstr ""
20581 +" - 进入子模组（%s），要么合并提交 %s\n"
20582 +" 要么更新至已合并这些变更的提交\n"
20583 +
20584 #: merge-ort.c
20585 #, c-format
20586 msgid ""
20461 -"Note: %s not up to date and in way of checking out conflicted version; old "
20462 -"copy renamed to %s"
20463 -msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s"
20587 +"Recursive merging with submodules currently only supports trivial cases.\n"
20588 +"Please manually handle the merging of each conflicted submodule.\n"
20589 +"This can be accomplished with the following steps:\n"
20590 +"%s - come back to superproject and run:\n"
20591 +"\n"
20592 +" git add %s\n"
20593 +"\n"
20594 +" to record the above merge or update\n"
20595 +" - resolve any other conflicts in the superproject\n"
20596 +" - commit the resulting index in the superproject\n"
20597 +msgstr ""
20598 +"子模组内的递归合并现在只支持简单的情况。\n"
20599 +"请手动合并每个有冲突的子模组。\n"
20600 +"这可以通过下列步骤完成：\n"
20601 +"%s - 回到上级项目并运行：\n"
20602 +"\n"
20603 +" git add %s\n"
20604 +"\n"
20605 +" 来记录上述的合并或更新\n"
20606 +" - 解决上级项目中的其他冲突\n"
20607 +" - 提交上级项目中的结果索引\n"
20608
20609 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
20610 #. base, and 2-3) the trees for the two trees we're merging.
@@ -20547,6 +20691,22 @@ msgstr "无法合并子模组 %s（非快进）"
20691 msgid "Found a possible merge resolution for the submodule:\n"
20692 msgstr "找到子模组的一个可能的合并方案：\n"
20693
20694 +#: merge-recursive.c
20695 +#, c-format
20696 +msgid ""
20697 +"If this is correct simply add it to the index for example\n"
20698 +"by using:\n"
20699 +"\n"
20700 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
20701 +"\n"
20702 +"which will accept this suggestion.\n"
20703 +msgstr ""
20704 +"如果这个正确，将其添加到索引，例如使用命令：\n"
20705 +"\n"
20706 +" git update-index --cacheinfo 160000 %s \"%s\"\n"
20707 +"\n"
20708 +"以接受此建议。\n"
20709 +
20710 #: merge-recursive.c
20711 #, c-format
20712 msgid "Failed to merge submodule %s (multiple merges found)"
@@ -21182,6 +21342,26 @@ msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
21342 msgid "confused by unstable object source data for %s"
21343 msgstr "被 %s 的不稳定对象源数据搞糊涂了"
21344
21345 +#: object-file.c
21346 +#, c-format
21347 +msgid "write stream object %ld != %<PRIuMAX>"
21348 +msgstr "写入流对象 %ld != %<PRIuMAX>"
21349 +
21350 +#: object-file.c
21351 +#, c-format
21352 +msgid "unable to stream deflate new object (%d)"
21353 +msgstr "不能流式压缩新对象（%d）"
21354 +
21355 +#: object-file.c
21356 +#, c-format
21357 +msgid "deflateEnd on stream object failed (%d)"
21358 +msgstr "在流对象上调用 deflateEnd 失败（%d）"
21359 +
21360 +#: object-file.c
21361 +#, c-format
21362 +msgid "unable to create directory %s"
21363 +msgstr "无法创建目录 %s"
21364 +
21365 #: object-file.c
21366 #, c-format
21367 msgid "cannot read object for %s"
@@ -21412,59 +21592,184 @@ msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
21592 msgid "relative path syntax can't be used outside working tree"
21593 msgstr "不能在工作区之外使用相对路径语法"
21594
21415 -#: object-name.c
21416 -#, c-format
21417 -msgid "<object>:<path> required, only <object> '%s' given"
21418 -msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
21595 +#: object-name.c
21596 +#, c-format
21597 +msgid "<object>:<path> required, only <object> '%s' given"
21598 +msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
21599 +
21600 +#: object-name.c
21601 +#, c-format
21602 +msgid "invalid object name '%.*s'."
21603 +msgstr "无效的对象名 '%.*s'。"
21604 +
21605 +#: object.c
21606 +#, c-format
21607 +msgid "invalid object type \"%s\""
21608 +msgstr "无效的对象类型 \"%s\""
21609 +
21610 +#: object.c
21611 +#, c-format
21612 +msgid "object %s is a %s, not a %s"
21613 +msgstr "对象 %s 是一个 %s，不是一个 %s"
21614 +
21615 +#: object.c
21616 +#, c-format
21617 +msgid "object %s has unknown type id %d"
21618 +msgstr "对象 %s 有未知的类型 id %d"
21619 +
21620 +#: object.c
21621 +#, c-format
21622 +msgid "unable to parse object: %s"
21623 +msgstr "不能解析对象：%s"
21624 +
21625 +#: object.c
21626 +#, c-format
21627 +msgid "hash mismatch %s"
21628 +msgstr "哈希值与 %s 不匹配"
21629 +
21630 +#: pack-bitmap-write.c
21631 +msgid "trying to write commit not in index"
21632 +msgstr "尝试写入未在索引中的提交"
21633 +
21634 +#: pack-bitmap.c
21635 +msgid "failed to load bitmap index (corrupted?)"
21636 +msgstr "无法载入位图索引（已损坏？）"
21637 +
21638 +#: pack-bitmap.c
21639 +msgid "corrupted bitmap index (too small)"
21640 +msgstr "损坏的位图索引（太小）"
21641 +
21642 +#: pack-bitmap.c
21643 +msgid "corrupted bitmap index file (wrong header)"
21644 +msgstr "损坏的位图索引（错误的文件头）"
21645 +
21646 +#: pack-bitmap.c
21647 +#, c-format
21648 +msgid "unsupported version '%d' for bitmap index file"
21649 +msgstr "不支持的位图索引文件版本 '%d'"
21650 +
21651 +#: pack-bitmap.c
21652 +msgid "corrupted bitmap index file (too short to fit hash cache)"
21653 +msgstr "损坏的位图索引（太小，容不下哈希缓存）"
21654 +
21655 +#: pack-bitmap.c
21656 +msgid "corrupted bitmap index file (too short to fit lookup table)"
21657 +msgstr "损坏的位图索引（太小，容不下查询表）"
21658 +
21659 +#: pack-bitmap.c
21660 +#, c-format
21661 +msgid "duplicate entry in bitmap index: '%s'"
21662 +msgstr "位图索引中的重复条目：'%s'"
21663 +
21664 +#: pack-bitmap.c
21665 +#, c-format
21666 +msgid "corrupt ewah bitmap: truncated header for entry %d"
21667 +msgstr "损坏的 EWAH 位图：条目 %d 截断的文件头"
21668 +
21669 +#: pack-bitmap.c
21670 +#, c-format
21671 +msgid "corrupt ewah bitmap: commit index %u out of range"
21672 +msgstr "损坏的 EWAH 位图：提交索引 %u 超出范围"
21673 +
21674 +#: pack-bitmap.c
21675 +msgid "corrupted bitmap pack index"
21676 +msgstr "损坏的位图包索引"
21677 +
21678 +#: pack-bitmap.c
21679 +msgid "invalid XOR offset in bitmap pack index"
21680 +msgstr "位图包索引中 XOR 偏移值无效"
21681 +
21682 +#: pack-bitmap.c
21683 +msgid "cannot fstat bitmap file"
21684 +msgstr "不能对位图文件调用 fstat"
21685 +
21686 +#: pack-bitmap.c
21687 +#, c-format
21688 +msgid "ignoring extra bitmap file: '%s'"
21689 +msgstr "忽略额外的位图文件：'%s'"
21690 +
21691 +#: pack-bitmap.c
21692 +msgid "checksum doesn't match in MIDX and bitmap"
21693 +msgstr "MIDX 和位图中的校验码不匹配"
21694 +
21695 +#: pack-bitmap.c
21696 +msgid "multi-pack bitmap is missing required reverse index"
21697 +msgstr "多包位图缺少必需的反向索引"
21698 +
21699 +#: pack-bitmap.c
21700 +#, c-format
21701 +msgid "could not open pack %s"
21702 +msgstr "不能打开包 %s"
21703 +
21704 +#: pack-bitmap.c
21705 +#, c-format
21706 +msgid "preferred pack (%s) is invalid"
21707 +msgstr "首选包 (%s) 无效"
21708 +
21709 +#: pack-bitmap.c
21710 +msgid "corrupt bitmap lookup table: triplet position out of index"
21711 +msgstr "损坏的位图查询表：三元组位置超出索引"
21712 +
21713 +#: pack-bitmap.c
21714 +msgid "corrupt bitmap lookup table: xor chain exceed entry count"
21715 +msgstr "损坏的位图查询表：xor 链超出条目数"
21716
21420 -#: object-name.c
21717 +#: pack-bitmap.c
21718 #, c-format
21422 -msgid "invalid object name '%.*s'."
21423 -msgstr "无效的对象名 '%.*s'。"
21719 +msgid "corrupt bitmap lookup table: commit index %u out of range"
21720 +msgstr "损坏的位图查询表：提交索引 %u 超出范围"
21721
21425 -#: object.c
21722 +#: pack-bitmap.c
21723 #, c-format
21427 -msgid "invalid object type \"%s\""
21428 -msgstr "无效的对象类型 \"%s\""
21724 +msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
21725 +msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断"
21726
21430 -#: object.c
21727 +#: pack-bitmap.c
21728 #, c-format
21432 -msgid "object %s is a %s, not a %s"
21433 -msgstr "对象 %s 是一个 %s，不是一个 %s"
21729 +msgid "object '%s' not found in type bitmaps"
21730 +msgstr "对象 %s 为在类型位图中找到"
21731
21435 -#: object.c
21732 +#: pack-bitmap.c
21733 #, c-format
21437 -msgid "object %s has unknown type id %d"
21438 -msgstr "对象 %s 有未知的类型 id %d"
21734 +msgid "object '%s' does not have a unique type"
21735 +msgstr "对象 '%s' 没有唯一的类型"
21736
21440 -#: object.c
21737 +#: pack-bitmap.c
21738 #, c-format
21442 -msgid "unable to parse object: %s"
21443 -msgstr "不能解析对象：%s"
21739 +msgid "object '%s': real type '%s', expected: '%s'"
21740 +msgstr "对象 '%s'：实际类型 '%s'，预期：'%s'"
21741
21445 -#: object.c
21742 +#: pack-bitmap.c
21743 #, c-format
21447 -msgid "hash mismatch %s"
21448 -msgstr "哈希值与 %s 不匹配"
21744 +msgid "object not in bitmap: '%s'"
21745 +msgstr "对象不在位图中：%s"
21746
21747 #: pack-bitmap.c
21451 -msgid "multi-pack bitmap is missing required reverse index"
21452 -msgstr "多包位图缺少必需的反向索引"
21748 +msgid "failed to load bitmap indexes"
21749 +msgstr "无法载入位图索引"
21750 +
21751 +#: pack-bitmap.c
21752 +msgid "you must specify exactly one commit to test"
21753 +msgstr "您必须准确指定一个提交来测试"
21754
21755 #: pack-bitmap.c
21756 #, c-format
21456 -msgid "could not open pack %s"
21457 -msgstr "不能打开包 %s"
21757 +msgid "commit '%s' doesn't have an indexed bitmap"
21758 +msgstr "提交 '%s' 没有索引位图"
21759 +
21760 +#: pack-bitmap.c
21761 +msgid "mismatch in bitmap results"
21762 +msgstr "位图结果不一致"
21763
21764 #: pack-bitmap.c
21765 #, c-format
21461 -msgid "preferred pack (%s) is invalid"
21462 -msgstr "首选包 (%s) 无效"
21766 +msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
21767 +msgstr "无法在包 '%2$s' 偏移 %3$<PRIuMAX> 中找到 '%1$s'"
21768
21769 #: pack-bitmap.c
21770 #, c-format
21466 -msgid "could not find %s in pack %s at offset %<PRIuMAX>"
21467 -msgstr "在包 %2$s 偏移 %3$<PRIuMAX> 中无法找到 %1$s"
21771 +msgid "unable to get disk usage of '%s'"
21772 +msgstr "无法得到 '%s' 的磁盘使用量"
21773
21774 #: pack-mtimes.c
21775 #, c-format
@@ -21619,6 +21924,10 @@ msgstr "您的意思是 `--%s`（有两个短线）？"
21924 msgid "alias of --%s"
21925 msgstr "--%s 的别名"
21926
21927 +#: parse-options.c
21928 +msgid "need a subcommand"
21929 +msgstr "需要一个子命令"
21930 +
21931 #: parse-options.c
21932 #, c-format
21933 msgid "unknown option `%s'"
@@ -22147,9 +22456,12 @@ msgid ""
22456 "l, label <label> = label current HEAD with a name\n"
22457 "t, reset <label> = reset HEAD to a label\n"
22458 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
22150 -". create a merge commit using the original merge commit's\n"
22151 -". message (or the oneline, if no original merge commit was\n"
22152 -". specified); use -c <commit> to reword the commit message\n"
22459 +" create a merge commit using the original merge commit's\n"
22460 +" message (or the oneline, if no original merge commit was\n"
22461 +" specified); use -c <commit> to reword the commit message\n"
22462 +"u, update-ref <ref> = track a placeholder for the <ref> to be updated\n"
22463 +" to this position in the new commits. The <ref> is\n"
22464 +" updated at the end of the rebase\n"
22465 "\n"
22466 "These lines can be re-ordered; they are executed from top to bottom.\n"
22467 msgstr ""
@@ -22157,7 +22469,7 @@ msgstr ""
22469 "命令:\n"
22470 "p, pick <提交> = 使用提交\n"
22471 "r, reword <提交> = 使用提交，但编辑提交说明\n"
22160 -"e, edit <提交> = 使用提交，但停止以便在 shell 中修补提交\n"
22472 +"e, edit <提交> = 使用提交，但停止以便修补提交\n"
22473 "s, squash <提交> = 使用提交，但挤压到前一个提交\n"
22474 "f, fixup [-C | -c] <提交> = 类似于 \"squash\"，但只保留前一个提交\n"
22475 " 的提交说明，除非使用了 -C 参数，此情况下则只\n"
@@ -22172,6 +22484,9 @@ msgstr ""
22484 ". 创建一个合并提交，并使用原始的合并提交说明（如果没有指定\n"
22485 ". 原始提交，使用注释部分的 oneline 作为提交说明）。使用\n"
22486 ". -c <提交> 可以编辑提交说明。\n"
22487 +"u, update-ref <引用> = 为引用 <ref> 设置一个占位符，以将该引用更新为此处的新"
22488 +"提交。\n"
22489 +" 此 <引用> 在变基结束后更新。\n"
22490 "\n"
22491 "可以对这些行重新排序，将从上至下执行。\n"
22492
@@ -22737,6 +23052,15 @@ msgstr "协议错误：期望 sha/ref，却得到 '%s'"
23052 msgid "http transport does not support %s"
23053 msgstr "http 传输协议不支持 %s"
23054
23055 +#: remote-curl.c
23056 +msgid "protocol error: expected '<url> <path>', missing space"
23057 +msgstr "协议错误：预期 '<url> <path>'，缺少空格"
23058 +
23059 +#: remote-curl.c
23060 +#, c-format
23061 +msgid "failed to download file at URL '%s'"
23062 +msgstr "无法下载位于 URL '%s' 的文件"
23063 +
23064 #: remote-curl.c
23065 msgid "git-http-push failed"
23066 msgstr "git-http-push 失败"
@@ -23142,6 +23466,16 @@ msgstr "不能确定 HEAD 版本"
23466 msgid "failed to find tree of %s"
23467 msgstr "无法找到 %s 指向的树"
23468
23469 +#: revision.c
23470 +#, c-format
23471 +msgid "resolve-undo records `%s` which is missing"
23472 +msgstr "resolve-undo 记录 `%s`，现缺失"
23473 +
23474 +#: revision.c
23475 +#, c-format
23476 +msgid "could not get commit for ancestry-path argument %s"
23477 +msgstr "无法获得 ancestry-path 参数 %s 的提交"
23478 +
23479 #: revision.c
23480 msgid "--unpacked=<packfile> no longer supported"
23481 msgstr "不再支持 --unpacked=<packfile>"
@@ -23168,6 +23502,220 @@ msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
23502 msgid "cannot create async thread: %s"
23503 msgstr "不能创建 async 线程：%s"
23504
23505 +#: scalar.c worktree.c
23506 +#, c-format
23507 +msgid "'%s' does not exist"
23508 +msgstr "'%s' 不存在"
23509 +
23510 +#: scalar.c
23511 +#, c-format
23512 +msgid "could not switch to '%s'"
23513 +msgstr "无法切换到 '%s'"
23514 +
23515 +#: scalar.c
23516 +msgid "need a working directory"
23517 +msgstr "需要一个工作目录"
23518 +
23519 +#: scalar.c
23520 +msgid "Scalar enlistments require a worktree"
23521 +msgstr "Scalar 登记需要一个工作树"
23522 +
23523 +#: scalar.c
23524 +#, c-format
23525 +msgid "could not configure %s=%s"
23526 +msgstr "无法配置 %s=%s"
23527 +
23528 +#: scalar.c
23529 +msgid "could not configure log.excludeDecoration"
23530 +msgstr "无法配置 log.excludeDecoration"
23531 +
23532 +#: scalar.c
23533 +msgid "could not add enlistment"
23534 +msgstr "无法添加登记"
23535 +
23536 +#: scalar.c
23537 +msgid "could not set recommended config"
23538 +msgstr "无法设置推荐的配置"
23539 +
23540 +#: scalar.c
23541 +msgid "could not turn on maintenance"
23542 +msgstr "无法打开维护模式"
23543 +
23544 +#: scalar.c
23545 +msgid "could not start the FSMonitor daemon"
23546 +msgstr "无法启动 FSMonitor 守护进程"
23547 +
23548 +#: scalar.c
23549 +msgid "could not turn off maintenance"
23550 +msgstr "无法关闭维护模式"
23551 +
23552 +#: scalar.c
23553 +msgid "could not remove enlistment"
23554 +msgstr "无法删除登记"
23555 +
23556 +#: scalar.c
23557 +#, c-format
23558 +msgid "remote HEAD is not a branch: '%.*s'"
23559 +msgstr "远程 HEAD 不是一个分支：'%.*s'"
23560 +
23561 +#: scalar.c
23562 +msgid "failed to get default branch name from remote; using local default"
23563 +msgstr "无法从远程获取默认分支名称；使用本地默认值"
23564 +
23565 +#: scalar.c
23566 +msgid "failed to get default branch name"
23567 +msgstr "无法获取默认分支名称"
23568 +
23569 +#: scalar.c
23570 +msgid "failed to unregister repository"
23571 +msgstr "无法取消注册仓库"
23572 +
23573 +#: scalar.c
23574 +msgid "failed to stop the FSMonitor daemon"
23575 +msgstr "无法停止 FSMonitor 守护进程"
23576 +
23577 +#: scalar.c
23578 +msgid "failed to delete enlistment directory"
23579 +msgstr "无法删除登记目录"
23580 +
23581 +#: scalar.c
23582 +msgid "branch to checkout after clone"
23583 +msgstr "克隆后要检出的分支"
23584 +
23585 +#: scalar.c
23586 +msgid "when cloning, create full working directory"
23587 +msgstr "在克隆时，创建完整的工作目录"
23588 +
23589 +#: scalar.c
23590 +msgid "only download metadata for the branch that will be checked out"
23591 +msgstr "只下载要检出的分支的元信息"
23592 +
23593 +#: scalar.c
23594 +msgid "scalar clone [<options>] [--] <repo> [<dir>]"
23595 +msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
23596 +
23597 +#: scalar.c
23598 +#, c-format
23599 +msgid "cannot deduce worktree name from '%s'"
23600 +msgstr "无法从 '%s' 猜测工作区名称"
23601 +
23602 +#: scalar.c
23603 +#, c-format
23604 +msgid "directory '%s' exists already"
23605 +msgstr "目录 '%s' 已存在"
23606 +
23607 +#: scalar.c
23608 +#, c-format
23609 +msgid "failed to get default branch for '%s'"
23610 +msgstr "无法获取 '%s' 的默认分支"
23611 +
23612 +#: scalar.c
23613 +#, c-format
23614 +msgid "could not configure remote in '%s'"
23615 +msgstr "无法在 '%s' 中配置远程"
23616 +
23617 +#: scalar.c
23618 +#, c-format
23619 +msgid "could not configure '%s'"
23620 +msgstr "无法配置 '%s'"
23621 +
23622 +#: scalar.c
23623 +msgid "partial clone failed; attempting full clone"
23624 +msgstr "部分克隆失败；尝试完整克隆"
23625 +
23626 +#: scalar.c
23627 +msgid "could not configure for full clone"
23628 +msgstr "无法配置完整克隆"
23629 +
23630 +#: scalar.c
23631 +msgid "scalar diagnose [<enlistment>]"
23632 +msgstr "scalar diagnose [<登记>]"
23633 +
23634 +#: scalar.c
23635 +msgid "`scalar list` does not take arguments"
23636 +msgstr "`scalar list` 不带参数"
23637 +
23638 +#: scalar.c
23639 +msgid "scalar register [<enlistment>]"
23640 +msgstr "scalar register [<登记>]"
23641 +
23642 +#: scalar.c
23643 +msgid "reconfigure all registered enlistments"
23644 +msgstr "重新配置所有注册的登记"
23645 +
23646 +#: scalar.c
23647 +msgid "scalar reconfigure [--all | <enlistment>]"
23648 +msgstr "scalar reconfigure [--all | <登记>]"
23649 +
23650 +#: scalar.c
23651 +msgid "--all or <enlistment>, but not both"
23652 +msgstr "--all 或者 <登记>，而不是两个一起"
23653 +
23654 +#: scalar.c
23655 +#, c-format
23656 +msgid "git repository gone in '%s'"
23657 +msgstr "在 '%s' 的 git 仓库已消失"
23658 +
23659 +#: scalar.c
23660 +msgid ""
23661 +"scalar run <task> [<enlistment>]\n"
23662 +"Tasks:\n"
23663 +msgstr ""
23664 +"scalar run <任务> [<登记>]\n"
23665 +"任务：\n"
23666 +
23667 +#: scalar.c
23668 +#, c-format
23669 +msgid "no such task: '%s'"
23670 +msgstr "没有此任务：'%s'"
23671 +
23672 +#: scalar.c
23673 +msgid "scalar unregister [<enlistment>]"
23674 +msgstr "scalar unregister [<登记>]"
23675 +
23676 +#: scalar.c
23677 +msgid "scalar delete <enlistment>"
23678 +msgstr "scalar delete <登记>"
23679 +
23680 +#: scalar.c
23681 +msgid "refusing to delete current working directory"
23682 +msgstr "拒绝删除当前工作目录"
23683 +
23684 +#: scalar.c
23685 +msgid "include Git version"
23686 +msgstr "包括 Git 的版本"
23687 +
23688 +#: scalar.c
23689 +msgid "include Git's build options"
23690 +msgstr "包括 Git 的构建选项"
23691 +
23692 +#: scalar.c
23693 +msgid "scalar verbose [-v | --verbose] [--build-options]"
23694 +msgstr "scalar verbose [-v | --verbose] [--build-options]"
23695 +
23696 +#: scalar.c
23697 +msgid "-C requires a <directory>"
23698 +msgstr "-C 需要 <目录>"
23699 +
23700 +#: scalar.c
23701 +#, c-format
23702 +msgid "could not change to '%s'"
23703 +msgstr "无法变更到 '%s'"
23704 +
23705 +#: scalar.c
23706 +msgid "-c requires a <key>=<value> argument"
23707 +msgstr "-c 需要 <键>=<值> 参数"
23708 +
23709 +#: scalar.c
23710 +msgid ""
23711 +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n"
23712 +"\n"
23713 +"Commands:\n"
23714 +msgstr ""
23715 +"scalar [-C <目录>] [-c <键>=<值>] <命令> [<选项>]\n"
23716 +"\n"
23717 +"命令：\n"
23718 +
23719 #: send-pack.c
23720 msgid "unexpected flush packet while reading remote unpack status"
23721 msgstr "读取远程解包状态时收到意外的 flush 包"
@@ -23308,11 +23856,6 @@ msgstr "您的本地修改将被%s覆盖。"
23856 msgid "commit your changes or stash them to proceed."
23857 msgstr "提交您的修改或贮藏后再继续。"
23858
23311 -#: sequencer.c
23312 -#, c-format
23313 -msgid "%s: fast-forward"
23314 -msgstr "%s：快进"
23315 -
23859 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
23860 #. "rebase".
23861 #.
@@ -23899,6 +24442,30 @@ msgstr "甚至不能尝试合并 '%.*s'"
24442 msgid "merge: Unable to write new index file"
24443 msgstr "合并：无法写入新索引文件"
24444
24445 +#: sequencer.c
24446 +#, c-format
24447 +msgid ""
24448 +"another 'rebase' process appears to be running; '%s.lock' already exists"
24449 +msgstr "另一个 'rebase' 进程似乎在运行；'%s.lock' 已存在"
24450 +
24451 +#: sequencer.c
24452 +#, c-format
24453 +msgid ""
24454 +"Updated the following refs with %s:\n"
24455 +"%s"
24456 +msgstr ""
24457 +"已用 %s 更新下列引用：\n"
24458 +"%s"
24459 +
24460 +#: sequencer.c
24461 +#, c-format
24462 +msgid ""
24463 +"Failed to update the following refs with %s:\n"
24464 +"%s"
24465 +msgstr ""
24466 +"无法用 %s 更新下列引用：\n"
24467 +"%s"
24468 +
24469 #: sequencer.c
24470 msgid "Cannot autostash"
24471 msgstr "无法自动贮藏"
@@ -24101,6 +24668,11 @@ msgstr "无法跳过不必要的拣选"
24668 msgid "the script was already rearranged."
24669 msgstr "脚本已经重新编排。"
24670
24671 +#: sequencer.c
24672 +#, c-format
24673 +msgid "update-refs file at '%s' is invalid"
24674 +msgstr "位于 '%s' 的 update-refs 文件无效"
24675 +
24676 #: setup.c
24677 #, c-format
24678 msgid "'%s' is outside repository at '%s'"
@@ -24243,16 +24815,21 @@ msgstr ""
24815 #: setup.c
24816 #, c-format
24817 msgid ""
24246 -"unsafe repository ('%s' is owned by someone else)\n"
24247 -"To add an exception for this directory, call:\n"
24818 +"detected dubious ownership in repository at '%s'\n"
24819 +"%sTo add an exception for this directory, call:\n"
24820 "\n"
24821 "\tgit config --global --add safe.directory %s"
24822 msgstr ""
24251 -"仓库不安全（'%s' 的所有者是其他人）\n"
24252 -"要为本仓库创建特例，请使用：\n"
24823 +"在 '%s' 检测到可疑的仓库所有权\n"
24824 +"%s要为本仓库创建特例，请运行：\n"
24825 "\n"
24826 "\tgit config --global --add safe.directory %s"
24827
24828 +#: setup.c
24829 +#, c-format
24830 +msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
24831 +msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）"
24832 +
24833 #: setup.c
24834 #, c-format
24835 msgid ""
@@ -25278,6 +25855,22 @@ msgstr "无效的端口号"
25855 msgid "invalid '..' path segment"
25856 msgstr "无效的 '..' 路径片段"
25857
25858 +#: usage.c
25859 +msgid "usage: "
25860 +msgstr "用法："
25861 +
25862 +#: usage.c
25863 +msgid "fatal: "
25864 +msgstr "致命错误："
25865 +
25866 +#: usage.c
25867 +msgid "error: "
25868 +msgstr "错误："
25869 +
25870 +#: usage.c
25871 +msgid "warning: "
25872 +msgstr "警告："
25873 +
25874 #: walker.c
25875 msgid "Fetching objects"
25876 msgstr "正在获取对象"
@@ -25970,7 +26563,7 @@ msgstr "另外，您的索引中包含未提交的变更。"
26563 msgid "cannot %s: Your index contains uncommitted changes."
26564 msgstr "不能%s：您的索引中包含未提交的变更。"
26565
25973 -#: git-merge-octopus.sh
26566 +#: git-merge-octopus.sh git-merge-resolve.sh
26567 msgid ""
26568 "Error: Your local changes to the following files would be overwritten by "
26569 "merge"
@@ -26258,26 +26851,6 @@ msgstr "选中的块不能应用到索引！\n"
26851 msgid "ignoring unmerged: %s\n"
26852 msgstr "忽略未合入的：%s\n"
26853
26261 -#: git-add--interactive.perl
26262 -#, perl-format
26263 -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
26264 -msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
26265 -
26266 -#: git-add--interactive.perl
26267 -#, perl-format
26268 -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
26269 -msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
26270 -
26271 -#: git-add--interactive.perl
26272 -#, perl-format
26273 -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
26274 -msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
26275 -
26276 -#: git-add--interactive.perl
26277 -#, perl-format
26278 -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
26279 -msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
26280 -
26854 #: git-add--interactive.perl
26855 msgid "No other hunks to goto\n"
26856 msgstr "没有其它可供跳转的块\n"