Git fork

Merge branch 'jx/zh_CN-2.51' of github.com:jiangxin/git

* 'jx/zh_CN-2.51' of github.com:jiangxin/git:
l10n: zh_CN: updated translation for 2.51

Jiang Xin f84a7b49 b11d0d6f

+444 -248
+444 -248
po/zh_CN.po
··· 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-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" ··· 165 "Content-Transfer-Encoding: 8bit\n" 166 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 167 "X-Generator: Gtranslator 42.0\n" 168 169 #: add-interactive.c 170 #, c-format ··· 1074 #: builtin/describe.c builtin/diff-tree.c builtin/difftool.c 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-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' 不能同时使用" ··· 2459 msgid "adding files failed" 2460 msgstr "添加文件失败" 2461 2462 #: builtin/add.c 2463 #, c-format 2464 msgid "--chmod param '%s' must be either -x or +x" ··· 2497 msgstr "'%2$s' 的错误动作 '%1$s'" 2498 2499 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c 2500 - #: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c 2501 #: ls-refs.c parallel-checkout.c sequencer.c setup.c 2502 #, c-format 2503 msgid "invalid value for '%s': '%s'" ··· 3819 3820 #: builtin/branch.c 3821 msgid "" 3822 - "branch with --recurse-submodules can only be used if " 3823 - "submodule.propagateBranches is enabled" 3824 msgstr "" 3825 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" 3826 ··· 3963 "请检查下面错误报告中余下的内容。\n" 3964 "您可以删除任何您不想共享的内容。\n" 3965 3966 - #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c 3967 - #: parse-options.h 3968 msgid "mode" 3969 msgstr "模式" 3970 ··· 6373 #: builtin/config.c 6374 msgid "" 6375 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" 6376 - "regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>" 6377 msgstr "" 6378 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp] [--" 6379 - "value=<值>] [--fixed-value] [--default=<默认值>] <名称>" 6380 6381 #: builtin/config.c 6382 msgid "" 6383 - "git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--" 6384 - "fixed-value] <name> <value>" 6385 msgstr "" 6386 - "git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-" 6387 - "value] <名称> <值>" 6388 6389 #: builtin/config.c 6390 msgid "" 6391 - "git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] " 6392 "<name>" 6393 msgstr "" 6394 - "git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称>" 6395 6396 #: builtin/config.c 6397 msgid "git config rename-section [<file-option>] <old-name> <new-name>" ··· 6412 #: builtin/config.c 6413 msgid "" 6414 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" 6415 - "regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] " 6416 "<name>" 6417 msgstr "" 6418 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则" 6419 - "表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>" 6420 6421 #: builtin/config.c 6422 msgid "" 6423 "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " 6424 - "[--value=<value>] [--fixed-value] <name> <value>" 6425 msgstr "" 6426 "git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--" 6427 - "value=<值>] [--fixed-value] <名称> <值>" 6428 6429 #: builtin/config.c 6430 msgid "Config file location" ··· 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>]" ··· 7493 msgstr "拒绝 %s 因为浅克隆的根不允许被更新" 7494 7495 #: builtin/fetch.c 7496 - #, c-format 7497 - msgid "" 7498 - "some local refs could not be updated; try running\n" 7499 - " 'git remote prune %s' to remove any old, conflicting branches" 7500 - msgstr "" 7501 - "一些本地引用不能被更新;尝试运行\n" 7502 - " 'git remote prune %s' 来删除旧的、有冲突的分支" 7503 - 7504 - # 译者:注意保持前导空格 7505 - #: builtin/fetch.c 7506 - #, c-format 7507 - msgid " (%s will become dangling)" 7508 - msgstr " (%s 将成为悬空状态)" 7509 - 7510 - # 译者:注意保持前导空格 7511 - #: builtin/fetch.c 7512 - #, c-format 7513 - msgid " (%s has become dangling)" 7514 - msgstr " (%s 已成为悬空状态)" 7515 - 7516 - #: builtin/fetch.c 7517 msgid "[deleted]" 7518 msgstr "[已删除]" 7519 ··· 7536 msgid "option \"%s\" is ignored for %s" 7537 msgstr "选项 \"%s\" 为 %s 所忽略" 7538 7539 - #: builtin/fetch.c object-store.c 7540 #, c-format 7541 msgid "%s is not a valid object" 7542 msgstr "%s 不是一个有效的对象" ··· 7561 "以禁用该警告,直到远程将 HEAD 更改为其他内容。" 7562 7563 #: builtin/fetch.c 7564 msgid "multiple branches detected, incompatible with --set-upstream" 7565 msgstr "检测到多分支,和 --set-upstream 不兼容" 7566 ··· 7799 7800 #: builtin/fetch.c 7801 msgid "" 7802 - "--filter can only be used with the remote configured in " 7803 - "extensions.partialclone" 7804 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" 7805 7806 #: builtin/fetch.c ··· 7857 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" 7858 7859 #: builtin/for-each-ref.c 7860 msgid "quote placeholders suitably for shells" 7861 msgstr "引用占位符适用于 shells" 7862 ··· 7876 msgid "show only <n> matched refs" 7877 msgstr "只显示 <n> 个匹配的引用" 7878 7879 #: builtin/for-each-ref.c builtin/tag.c 7880 msgid "respect format colors" 7881 msgstr "遵照格式中的颜色输出" ··· 7909 msgstr "还包括 HEAD 引用和伪引用" 7910 7911 #: builtin/for-each-ref.c 7912 msgid "unknown arguments supplied with --stdin" 7913 msgstr "为 --stdin 提供了未知的命令参数" 7914 7915 #: builtin/for-each-repo.c 7916 msgid "git for-each-repo --config=<config> [--] <arguments>" ··· 8414 msgstr "用于存储修剪对象的包前缀" 8415 8416 #: builtin/gc.c 8417 #, c-format 8418 msgid "failed to parse gc.logExpiry value %s" 8419 msgstr "无法解析 gc.logExpiry 的值 %s" ··· 8500 8501 #: builtin/gc.c 8502 #, c-format 8503 - msgid "lock file '%s' exists, skipping maintenance" 8504 - msgstr "锁文件 '%s' 已存在,跳过维护" 8505 8506 #: builtin/gc.c 8507 #, c-format 8508 - msgid "task '%s' failed" 8509 - msgstr "任务 '%s' 失败" 8510 8511 #: builtin/gc.c 8512 #, c-format ··· 8545 #: builtin/gc.c 8546 msgid "run a specific task" 8547 msgstr "运行一个特定的任务" 8548 - 8549 - #: builtin/gc.c 8550 - msgid "use at most one of --auto and --schedule=<frequency>" 8551 - msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" 8552 8553 #: builtin/gc.c 8554 #, c-format ··· 9651 9652 #: builtin/log.c 9653 #, c-format 9654 - msgid "Final output: %d %s\n" 9655 - msgstr "最终输出:%d %s\n" 9656 - 9657 - #: builtin/log.c 9658 - #, c-format 9659 msgid "git show %s: bad file" 9660 msgstr "git show %s: 损坏的文件" 9661 ··· 10562 msgstr "(和 --stat 同义)" 10563 10564 #: builtin/merge.c builtin/pull.c 10565 msgid "add (at most <n>) entries from shortlog to merge commit message" 10566 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" 10567 ··· 10890 10891 #: builtin/mktag.c 10892 #, c-format 10893 - msgid "%d (FSCK_IGNORE?) should never trigger this callback" 10894 - msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" 10895 - 10896 - #: builtin/mktag.c 10897 - #, c-format 10898 msgid "could not read tagged object '%s'" 10899 msgstr "不能读取被标记的对象 '%s'" 10900 ··· 11537 msgstr "未知子命令:`%s'" 11538 11539 #: builtin/pack-objects.c 11540 - msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]" 11541 - msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]" 11542 - 11543 - #: builtin/pack-objects.c 11544 msgid "" 11545 - "git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]" 11546 - msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" 11547 11548 #: builtin/pack-objects.c 11549 #, c-format ··· 11672 msgstr "无法获得对象 %s 类型" 11673 11674 #: builtin/pack-objects.c 11675 msgid "Compressing objects" 11676 msgstr "压缩对象中" 11677 ··· 11760 #: builtin/pack-objects.c 11761 msgid "unable to force loose object" 11762 msgstr "无法强制松散对象" 11763 11764 #: builtin/pack-objects.c 11765 #, c-format ··· 11904 #: builtin/pack-objects.c 11905 msgid "create thin packs" 11906 msgstr "创建精简包" 11907 11908 #: builtin/pack-objects.c 11909 msgid "create packs suitable for shallow fetches" ··· 11975 msgid "pack.deltaCacheLimit is too high, forcing %d" 11976 msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" 11977 11978 - #: builtin/pack-objects.c config.c 11979 #, c-format 11980 msgid "bad pack compression level %d" 11981 msgstr "错误的打包压缩级别 %d" ··· 11991 #: builtin/pack-objects.c 11992 msgid "--thin cannot be used to build an indexable pack" 11993 msgstr "--thin 不能用于创建一个可索引包" 11994 - 11995 - #: builtin/pack-objects.c 11996 - msgid "cannot use --filter with --stdin-packs" 11997 - msgstr "不能同时使用 --filter 和 --stdin-packs" 11998 11999 #: builtin/pack-objects.c 12000 msgid "cannot use internal rev list with --stdin-packs" ··· 12005 msgstr "不能同时使用内部版本列表和 --cruft" 12006 12007 #: builtin/pack-objects.c 12008 - msgid "cannot use --stdin-packs with --cruft" 12009 - msgstr "不能将 --stdin-packs 和 --cruft 同时使用" 12010 - 12011 - #: builtin/pack-objects.c 12012 msgid "Enumerating objects" 12013 msgstr "枚举对象中" 12014 ··· 12021 "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 " 12022 "%<PRIu32>(来自 %<PRIuMAX> 个包)" 12023 12024 - #: builtin/pack-redundant.c 12025 - msgid "" 12026 - "'git pack-redundant' is nominated for removal.\n" 12027 - "If you still use this command, please add an extra\n" 12028 - "option, '--i-still-use-this', on the command line\n" 12029 - "and let us know you still use it by sending an e-mail\n" 12030 - "to <git@vger.kernel.org>. Thanks.\n" 12031 - msgstr "" 12032 - "准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n" 12033 - "命令,请在命令行中添加额外参数:'--i-still-use-this',\n" 12034 - "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n" 12035 - "使用它。 谢谢。\n" 12036 - 12037 - #: builtin/pack-redundant.c 12038 - msgid "refusing to run without --i-still-use-this" 12039 - msgstr "拒绝在未指定 --i-still-use-this 选项时运行" 12040 - 12041 #: builtin/pack-refs.c 12042 msgid "" 12043 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " ··· 12395 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" 12396 msgstr "" 12397 "\n" 12398 - "为了让没有追踪上游的分支自动配置,参见 'git help config' 中的 " 12399 - "push.autoSetupRemote。\n" 12400 12401 #: builtin/push.c 12402 #, c-format ··· 12862 #: builtin/rebase.c 12863 #, c-format 12864 msgid "" 12865 - "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " 12866 - "\"stop\"." 12867 msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"stop\"。" 12868 12869 #: builtin/rebase.c ··· 13558 msgstr "未知的 --mirror 参数:%s" 13559 13560 #: builtin/remote.c 13561 msgid "fetch the remote branches" 13562 msgstr "抓取远程的分支" 13563 ··· 13920 msgid "Could not set up %s" 13921 msgstr "不能设置 %s" 13922 13923 - # 译者:注意保持前导空格 13924 - #: builtin/remote.c 13925 - #, c-format 13926 - msgid " %s will become dangling!" 13927 - msgstr " %s 将成为悬空状态!" 13928 - 13929 - # 译者:注意保持前导空格 13930 - #: builtin/remote.c 13931 - #, c-format 13932 - msgid " %s has become dangling!" 13933 - msgstr " %s 已成为悬空状态!" 13934 - 13935 #: builtin/remote.c 13936 #, c-format 13937 msgid "Pruning %s" ··· 14015 msgid "" 14016 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" 14017 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" 14018 - "[--write-midx] [--name-hash-version=<n>]" 14019 msgstr "" 14020 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" 14021 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n" 14022 - "[--write-midx] [--name-hash-version=<n>]" 14023 14024 #: builtin/repack.c 14025 msgid "" ··· 14119 msgid "" 14120 "specify the name hash version to use for grouping similar objects by path" 14121 msgstr "指定要使用的名称哈希算法,以实现按照路径对相似对象分组" 14122 14123 #: builtin/repack.c 14124 msgid "do not run git-update-server-info" ··· 15537 msgstr "git stash create [<消息>]" 15538 15539 #: builtin/stash.c 15540 #, c-format 15541 msgid "'%s' is not a stash-like commit" 15542 msgstr "'%s' 不像是一个贮藏提交" 15543 15544 #: builtin/stash.c 15545 #, c-format 15546 msgid "Too many revisions specified:%s" 15547 msgstr "指定了太多的版本:%s" 15548 - 15549 - #: builtin/stash.c 15550 - msgid "No stash entries found." 15551 - msgstr "未发现贮藏条目。" 15552 15553 #: builtin/stash.c 15554 #, c-format ··· 15745 msgid "include ignore files" 15746 msgstr "包含忽略的文件" 15747 15748 #: builtin/stripspace.c 15749 msgid "skip and remove all lines starting with comment character" 15750 msgstr "跳过和移除所有的注释行" ··· 15755 15756 #: builtin/submodule--helper.c 15757 #, c-format 15758 - msgid "Expecting a full ref name, got %s" 15759 - msgstr "期望一个完整的引用名称,却得到 %s" 15760 15761 #: builtin/submodule--helper.c 15762 #, c-format ··· 15765 15766 #: builtin/submodule--helper.c 15767 #, c-format 15768 - msgid "" 15769 - "could not look up configuration '%s'. Assuming this repository is its own " 15770 - "authoritative upstream." 15771 - msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" 15772 - 15773 - #: builtin/submodule--helper.c 15774 - #, c-format 15775 msgid "No url found for submodule path '%s' in .gitmodules" 15776 msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url" 15777 ··· 16186 "Submodule (%s) branch configured to inherit branch from superproject, but " 16187 "the superproject is not on any branch" 16188 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" 16189 16190 #: builtin/submodule--helper.c 16191 #, c-format ··· 16434 16435 #: builtin/submodule--helper.c 16436 #, c-format 16437 msgid "'%s' is not a valid submodule name" 16438 msgstr "'%s' 不是一个有效的子模组名称" 16439 ··· 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" ··· 17207 17208 #: builtin/worktree.c 17209 #, c-format 17210 - msgid "unreachable: invalid reference: %s" 17211 - msgstr "不可达:无效引用:%s" 17212 - 17213 - #: builtin/worktree.c 17214 - #, c-format 17215 msgid "Preparing worktree (detached HEAD %s)" 17216 msgstr "准备工作区(分离头指针 %s)" 17217 ··· 18657 #: commit-graph.c 18658 #, c-format 18659 msgid "" 18660 - "attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' " 18661 - "(%d) is not supported" 18662 msgstr "尝试写入提交图,但不支持 'commitGraph.changedPathsVersion' (%d)" 18663 18664 #: commit-graph.c ··· 19081 "remote URLs cannot be configured in file directly or indirectly included by " 19082 "includeIf.hasconfig:remote.*.url" 19083 msgstr "" 19084 - "远程 URL 不能在文件中配置,不管直接地还是通过 " 19085 - "includeIf.hasconfig:remote.*.url 间接地包含。" 19086 19087 #: config.c 19088 #, c-format ··· 19228 19229 #: config.c 19230 #, c-format 19231 - msgid "invalid value for variable %s" 19232 - msgstr "变量 %s 的值无效" 19233 - 19234 - #: config.c 19235 - #, c-format 19236 - msgid "ignoring unknown core.fsync component '%s'" 19237 - msgstr "忽略未知的 core.fsync 组件 '%s'" 19238 - 19239 - #: config.c 19240 - #, c-format 19241 msgid "bad boolean config value '%s' for '%s'" 19242 msgstr "'%2$s' 的错误的布尔取值 '%1$s'" 19243 ··· 19253 19254 #: config.c 19255 #, c-format 19256 - msgid "abbrev length out of range: %d" 19257 - msgstr "缩写长度超出范围:%d" 19258 - 19259 - #: config.c 19260 - #, c-format 19261 - msgid "bad zlib compression level %d" 19262 - msgstr "错误的 zlib 压缩级别 %d" 19263 - 19264 - #: config.c 19265 - #, c-format 19266 - msgid "%s cannot contain newline" 19267 - msgstr "%s 不能包含换行符" 19268 - 19269 - #: config.c 19270 - #, c-format 19271 - msgid "%s must have at least one character" 19272 - msgstr "%s 必须至少有一个字符" 19273 - 19274 - #: config.c 19275 - #, c-format 19276 - msgid "ignoring unknown core.fsyncMethod value '%s'" 19277 - msgstr "忽略未知的 core.fsyncMethod 值 '%s'" 19278 - 19279 - #: config.c 19280 - msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" 19281 - msgstr "core.fsyncObjectFiles 已经被弃用;取而代之使用 core.fsync" 19282 - 19283 - #: config.c 19284 - #, c-format 19285 - msgid "invalid mode for object creation: %s" 19286 - msgstr "无效的对象创建模式:%s" 19287 - 19288 - #: config.c 19289 - #, c-format 19290 - msgid "malformed value for %s" 19291 - msgstr "%s 的取值格式错误" 19292 - 19293 - #: config.c 19294 - #, c-format 19295 - msgid "malformed value for %s: %s" 19296 - msgstr "%s 的取值格式错误:%s" 19297 - 19298 - #: config.c 19299 - msgid "must be one of nothing, matching, simple, upstream or current" 19300 - msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" 19301 - 19302 - #: config.c 19303 - #, c-format 19304 msgid "unable to load config blob object '%s'" 19305 msgstr "无法从数据对象 '%s' 加载配置" 19306 ··· 19922 msgstr "无法将命名管道和目录进行比较" 19923 19924 #: diff-no-index.c 19925 - msgid "git diff --no-index [<options>] <path> <path>" 19926 - msgstr "git diff --no-index [<选项>] <路径> <路径>" 19927 19928 #: diff-no-index.c 19929 msgid "" ··· 19931 "tree" 19932 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" 19933 19934 # 译者:注意保持前导空格 19935 #: diff.c 19936 #, c-format ··· 20109 msgid "<n>" 20110 msgstr "<n>" 20111 20112 - #: diff.c 20113 msgid "generate diffs with <n> lines context" 20114 msgstr "生成含 <n> 行上下文的差异" 20115 ··· 20256 msgid "use default prefixes a/ and b/" 20257 msgstr "使用 a/ 和 b/ 作为默认前缀" 20258 20259 - #: diff.c 20260 msgid "show context between diff hunks up to the specified number of lines" 20261 msgstr "显示指定行数的差异块间的上下文" 20262 ··· 20641 msgid "bad git namespace path \"%s\"" 20642 msgstr "错误的 git 名字空间路径 \"%s\"" 20643 20644 #: exec-cmd.c 20645 #, c-format 20646 msgid "too many args to run %s" ··· 21499 msgid "name consists only of disallowed characters: %s" 21500 msgstr "姓名中仅包含禁用字符:%s" 21501 21502 #: list-objects-filter-options.c 21503 msgid "expected 'tree:<depth>'" 21504 msgstr "期望 'tree:<深度>'" ··· 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 ··· 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\"" 22722 - msgstr "无效的对象类型 \"%s\"" 22723 - 22724 - #: object.c 22725 - #, c-format 22726 - msgid "object %s is a %s, not a %s" 22727 - msgstr "对象 %s 是一个 %s,不是一个 %s" 22728 - 22729 - #: object.c 22730 - #, c-format 22731 - msgid "object %s has unknown type id %d" 22732 - msgstr "对象 %s 有未知的类型 id %d" 22733 - 22734 - #: object.c 22735 - #, c-format 22736 - msgid "unable to parse object: %s" 22737 - msgstr "不能解析对象:%s" 22738 - 22739 - #: object.c 22740 - #, c-format 22741 - msgid "hash mismatch %s" 22742 - msgstr "哈希值与 %s 不匹配" 22743 - 22744 #: pack-bitmap-write.c 22745 #, c-format 22746 msgid "duplicate entry when writing bitmap index: %s" ··· 22754 #: pack-bitmap-write.c 22755 msgid "too many pseudo-merges" 22756 msgstr "太多伪合并" 22757 - 22758 - #: pack-bitmap-write.c 22759 - msgid "trying to write commit not in index" 22760 - msgstr "尝试写入未在索引中的提交" 22761 22762 #: pack-bitmap.c 22763 msgid "failed to load bitmap index (corrupted?)" ··· 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 ··· 24214 #, c-format 24215 msgid "%s does not point to a valid object!" 24216 msgstr "%s 没有指向一个有效的对象!" 24217 24218 #: refs.c 24219 #, c-format ··· 26992 msgstr "切换对无趣路径的修剪" 26993 26994 #: t/helper/test-path-walk.c 26995 msgid "read a pattern list over stdin" 26996 msgstr "从标准输入读取模式列表" 26997 ··· 27742 msgid "warning: " 27743 msgstr "警告:" 27744 27745 #: version.c 27746 #, c-format 27747 msgid "uname() failed with error '%s' (%d)\n" ··· 28887 #, perl-format 28888 msgid "(body) Adding cc: %s from line '%s'\n" 28889 msgstr "(body) 添加 cc: %s 自行 '%s'\n" 28890 28891 #: git-send-email.perl 28892 #, perl-format
··· 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-08-12 20:20-0400\n" 159 + "PO-Revision-Date: 2025-08-17 08:14-0400\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" ··· 165 "Content-Transfer-Encoding: 8bit\n" 166 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 167 "X-Generator: Gtranslator 42.0\n" 168 + 169 + #: add-interactive.c 170 + #, c-format 171 + msgid "%s cannot be negative" 172 + msgstr "%s 不能为负数" 173 174 #: add-interactive.c 175 #, c-format ··· 1079 #: builtin/describe.c builtin/diff-tree.c builtin/difftool.c 1080 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c 1081 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c 1082 + #: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c 1083 + #: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c 1084 + #: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c 1085 + #: parse-options.c range-diff.c revision.c 1086 #, c-format 1087 msgid "options '%s' and '%s' cannot be used together" 1088 msgstr "选项 '%s' 和 '%s' 不能同时使用" ··· 2464 msgid "adding files failed" 2465 msgstr "添加文件失败" 2466 2467 + #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c 2468 + #: builtin/stash.c 2469 + #, c-format 2470 + msgid "'%s' cannot be negative" 2471 + msgstr "'%s' 不能为负数" 2472 + 2473 #: builtin/add.c 2474 #, c-format 2475 msgid "--chmod param '%s' must be either -x or +x" ··· 2508 msgstr "'%2$s' 的错误动作 '%1$s'" 2509 2510 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c 2511 + #: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c 2512 #: ls-refs.c parallel-checkout.c sequencer.c setup.c 2513 #, c-format 2514 msgid "invalid value for '%s': '%s'" ··· 3830 3831 #: builtin/branch.c 3832 msgid "" 3833 + "branch with --recurse-submodules can only be used if submodule." 3834 + "propagateBranches is enabled" 3835 msgstr "" 3836 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" 3837 ··· 3974 "请检查下面错误报告中余下的内容。\n" 3975 "您可以删除任何您不想共享的内容。\n" 3976 3977 + #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c 3978 + #: builtin/pack-objects.c builtin/rebase.c parse-options.h 3979 msgid "mode" 3980 msgstr "模式" 3981 ··· 6384 #: builtin/config.c 6385 msgid "" 6386 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" 6387 + "regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--" 6388 + "url=<url>] <name>" 6389 msgstr "" 6390 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp] [--" 6391 + "value=<模式>] [--fixed-value] [--default=<默认值>] [--url=<url>] <名称>" 6392 6393 #: builtin/config.c 6394 msgid "" 6395 + "git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] " 6396 + "[--fixed-value] <name> <value>" 6397 msgstr "" 6398 + "git config set [<文件选项>] [--type=<类型>] [--all] [--value=<模式>] [--" 6399 + "fixed-value] <名称> <值>" 6400 6401 #: builtin/config.c 6402 msgid "" 6403 + "git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] " 6404 "<name>" 6405 msgstr "" 6406 + "git config unset [<文件选项>] [--all] [--value=<模式>] [--fixed-value] <名称>" 6407 6408 #: builtin/config.c 6409 msgid "git config rename-section [<file-option>] <old-name> <new-name>" ··· 6424 #: builtin/config.c 6425 msgid "" 6426 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--" 6427 + "regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] " 6428 "<name>" 6429 msgstr "" 6430 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则" 6431 + "表达式>] [--value=<模式>] [--fixed-value] [--default=<默认值>] <名称>" 6432 6433 #: builtin/config.c 6434 msgid "" 6435 "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] " 6436 + "[--value=<pattern>] [--fixed-value] <name> <value>" 6437 msgstr "" 6438 "git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--" 6439 + "value=<模式>] [--fixed-value] <名称> <值>" 6440 6441 #: builtin/config.c 6442 msgid "Config file location" ··· 7058 #: builtin/diff-pairs.c 7059 #, c-format 7060 msgid "unable to parse object id: %s" 7061 + msgstr "不能解析对象 ID:%s" 7062 7063 #: builtin/diff-pairs.c 7064 msgid "git diff-pairs -z [<diff-options>]" ··· 7505 msgstr "拒绝 %s 因为浅克隆的根不允许被更新" 7506 7507 #: builtin/fetch.c 7508 msgid "[deleted]" 7509 msgstr "[已删除]" 7510 ··· 7527 msgid "option \"%s\" is ignored for %s" 7528 msgstr "选项 \"%s\" 为 %s 所忽略" 7529 7530 + #: builtin/fetch.c odb.c 7531 #, c-format 7532 msgid "%s is not a valid object" 7533 msgstr "%s 不是一个有效的对象" ··· 7552 "以禁用该警告,直到远程将 HEAD 更改为其他内容。" 7553 7554 #: builtin/fetch.c 7555 + #, c-format 7556 + msgid "" 7557 + "some local refs could not be updated; try running\n" 7558 + " 'git remote prune %s' to remove any old, conflicting branches" 7559 + msgstr "" 7560 + "一些本地引用不能被更新;尝试运行\n" 7561 + " 'git remote prune %s' 来删除旧的、有冲突的分支" 7562 + 7563 + #: builtin/fetch.c 7564 + #, c-format 7565 + msgid "fetching ref %s failed: %s" 7566 + msgstr "获取引用 %s 失败:%s" 7567 + 7568 + #: builtin/fetch.c 7569 msgid "multiple branches detected, incompatible with --set-upstream" 7570 msgstr "检测到多分支,和 --set-upstream 不兼容" 7571 ··· 7804 7805 #: builtin/fetch.c 7806 msgid "" 7807 + "--filter can only be used with the remote configured in extensions." 7808 + "partialclone" 7809 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" 7810 7811 #: builtin/fetch.c ··· 7862 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" 7863 7864 #: builtin/for-each-ref.c 7865 + msgid "git for-each-ref [--start-after <marker>]" 7866 + msgstr "git for-each-ref [--start-after <标记>]" 7867 + 7868 + #: builtin/for-each-ref.c 7869 msgid "quote placeholders suitably for shells" 7870 msgstr "引用占位符适用于 shells" 7871 ··· 7885 msgid "show only <n> matched refs" 7886 msgstr "只显示 <n> 个匹配的引用" 7887 7888 + #: builtin/for-each-ref.c 7889 + msgid "marker" 7890 + msgstr "标记" 7891 + 7892 + #: builtin/for-each-ref.c 7893 + msgid "start iteration after the provided marker" 7894 + msgstr "从指定标记之后开始迭代" 7895 + 7896 #: builtin/for-each-ref.c builtin/tag.c 7897 msgid "respect format colors" 7898 msgstr "遵照格式中的颜色输出" ··· 7926 msgstr "还包括 HEAD 引用和伪引用" 7927 7928 #: builtin/for-each-ref.c 7929 + msgid "cannot use --start-after with custom sort options" 7930 + msgstr "不能将 --start-after 与自定义排序选项一同使用" 7931 + 7932 + #: builtin/for-each-ref.c 7933 msgid "unknown arguments supplied with --stdin" 7934 msgstr "为 --stdin 提供了未知的命令参数" 7935 + 7936 + #: builtin/for-each-ref.c 7937 + msgid "cannot use --start-after with patterns" 7938 + msgstr "不能将 --start-after 与模式匹配一同使用" 7939 7940 #: builtin/for-each-repo.c 7941 msgid "git for-each-repo --config=<config> [--] <arguments>" ··· 8439 msgstr "用于存储修剪对象的包前缀" 8440 8441 #: builtin/gc.c 8442 + msgid "skip maintenance tasks typically done in the foreground" 8443 + msgstr "跳过通常在前台执行的维护任务" 8444 + 8445 + #: builtin/gc.c 8446 #, c-format 8447 msgid "failed to parse gc.logExpiry value %s" 8448 msgstr "无法解析 gc.logExpiry 的值 %s" ··· 8529 8530 #: builtin/gc.c 8531 #, c-format 8532 + msgid "task '%s' failed" 8533 + msgstr "任务 '%s' 失败" 8534 8535 #: builtin/gc.c 8536 #, c-format 8537 + msgid "lock file '%s' exists, skipping maintenance" 8538 + msgstr "锁文件 '%s' 已存在,跳过维护" 8539 8540 #: builtin/gc.c 8541 #, c-format ··· 8574 #: builtin/gc.c 8575 msgid "run a specific task" 8576 msgstr "运行一个特定的任务" 8577 8578 #: builtin/gc.c 8579 #, c-format ··· 9676 9677 #: builtin/log.c 9678 #, c-format 9679 msgid "git show %s: bad file" 9680 msgstr "git show %s: 损坏的文件" 9681 ··· 10582 msgstr "(和 --stat 同义)" 10583 10584 #: builtin/merge.c builtin/pull.c 10585 + msgid "show a compact-summary at the end of the merge" 10586 + msgstr "在合并结束时显示简洁摘要" 10587 + 10588 + #: builtin/merge.c builtin/pull.c 10589 msgid "add (at most <n>) entries from shortlog to merge commit message" 10590 msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" 10591 ··· 10914 10915 #: builtin/mktag.c 10916 #, c-format 10917 msgid "could not read tagged object '%s'" 10918 msgstr "不能读取被标记的对象 '%s'" 10919 ··· 11556 msgstr "未知子命令:`%s'" 11557 11558 #: builtin/pack-objects.c 11559 msgid "" 11560 + "git pack-objects [-q | --progress | --all-progress] [--all-progress-" 11561 + "implied]\n" 11562 + " [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" 11563 + " [--local] [--incremental] [--window=<n>] [--depth=<n>]\n" 11564 + " [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n" 11565 + " [--cruft] [--cruft-expiration=<time>]\n" 11566 + " [--stdout [--filter=<filter-spec>] | <base-name>]\n" 11567 + " [--shallow] [--keep-true-parents] [--[no-]sparse]\n" 11568 + " [--name-hash-version=<n>] [--path-walk] < <object-list>" 11569 + msgstr "" 11570 + "git pack-objects [-q | --progress | --all-progress] [--all-progress-" 11571 + "implied]\n" 11572 + " [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" 11573 + " [--local] [--incremental] [--window=<n>] [--depth=<n>]\n" 11574 + " [--revs [--unpacked | --all]] [--keep-pack=<包名>]\n" 11575 + " [--cruft] [--cruft-expiration=<时间>]\n" 11576 + " [--stdout [--filter=<过滤规格>] | <基线名称>]\n" 11577 + " [--shallow] [--keep-true-parents] [--[no-]sparse]\"\n" 11578 + " [--name-hash-version=<n>] [--path-walk] < <对象列表>" 11579 11580 #: builtin/pack-objects.c 11581 #, c-format ··· 11704 msgstr "无法获得对象 %s 类型" 11705 11706 #: builtin/pack-objects.c 11707 + msgid "Compressing objects by path" 11708 + msgstr "按路径压缩对象" 11709 + 11710 + #: builtin/pack-objects.c 11711 + #, c-format 11712 + msgid "Path-based delta compression using up to %d thread" 11713 + msgid_plural "Path-based delta compression using up to %d threads" 11714 + msgstr[0] "基于路径的差值压缩,最多使用 %d 个线程" 11715 + msgstr[1] "基于路径的差值压缩,最多使用 %d 个线程" 11716 + 11717 + #: builtin/pack-objects.c 11718 msgid "Compressing objects" 11719 msgstr "压缩对象中" 11720 ··· 11803 #: builtin/pack-objects.c 11804 msgid "unable to force loose object" 11805 msgstr "无法强制松散对象" 11806 + 11807 + #: builtin/pack-objects.c 11808 + msgid "failed to pack objects via path-walk" 11809 + msgstr "通过 path-walk 打包对象失败" 11810 11811 #: builtin/pack-objects.c 11812 #, c-format ··· 11951 #: builtin/pack-objects.c 11952 msgid "create thin packs" 11953 msgstr "创建精简包" 11954 + 11955 + #: builtin/pack-objects.c 11956 + msgid "use the path-walk API to walk objects when possible" 11957 + msgstr "在可能的情况下使用 path-walk API 遍历对象" 11958 11959 #: builtin/pack-objects.c 11960 msgid "create packs suitable for shallow fetches" ··· 12026 msgid "pack.deltaCacheLimit is too high, forcing %d" 12027 msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" 12028 12029 + #: builtin/pack-objects.c 12030 + #, c-format 12031 + msgid "cannot use %s with %s" 12032 + msgstr "不能将 %s 与 %s 一同使用" 12033 + 12034 + #: builtin/pack-objects.c environment.c 12035 #, c-format 12036 msgid "bad pack compression level %d" 12037 msgstr "错误的打包压缩级别 %d" ··· 12047 #: builtin/pack-objects.c 12048 msgid "--thin cannot be used to build an indexable pack" 12049 msgstr "--thin 不能用于创建一个可索引包" 12050 12051 #: builtin/pack-objects.c 12052 msgid "cannot use internal rev list with --stdin-packs" ··· 12057 msgstr "不能同时使用内部版本列表和 --cruft" 12058 12059 #: builtin/pack-objects.c 12060 msgid "Enumerating objects" 12061 msgstr "枚举对象中" 12062 ··· 12069 "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 " 12070 "%<PRIu32>(来自 %<PRIuMAX> 个包)" 12071 12072 #: builtin/pack-refs.c 12073 msgid "" 12074 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude " ··· 12426 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n" 12427 msgstr "" 12428 "\n" 12429 + "为了让没有追踪上游的分支自动配置,参见 'git help config' 中的 'push." 12430 + "autoSetupRemote'。\n" 12431 12432 #: builtin/push.c 12433 #, c-format ··· 12893 #: builtin/rebase.c 12894 #, c-format 12895 msgid "" 12896 + "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop" 12897 + "\"." 12898 msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"stop\"。" 12899 12900 #: builtin/rebase.c ··· 13589 msgstr "未知的 --mirror 参数:%s" 13590 13591 #: builtin/remote.c 13592 + #, c-format 13593 + msgid "remote name '%s' is a subset of existing remote '%s'" 13594 + msgstr "远程名称 '%s' 是现有远程 '%s' 的子集" 13595 + 13596 + #: builtin/remote.c 13597 + #, c-format 13598 + msgid "remote name '%s' is a superset of existing remote '%s'" 13599 + msgstr "远程名称 '%s' 是现有远程 '%s' 的超集" 13600 + 13601 + #: builtin/remote.c 13602 msgid "fetch the remote branches" 13603 msgstr "抓取远程的分支" 13604 ··· 13961 msgid "Could not set up %s" 13962 msgstr "不能设置 %s" 13963 13964 #: builtin/remote.c 13965 #, c-format 13966 msgid "Pruning %s" ··· 14044 msgid "" 14045 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" 14046 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n" 14047 + "[--write-midx] [--name-hash-version=<n>] [--path-walk]" 14048 msgstr "" 14049 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" 14050 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n" 14051 + "[--write-midx] [--name-hash-version=<n>] [--path-walk]" 14052 14053 #: builtin/repack.c 14054 msgid "" ··· 14148 msgid "" 14149 "specify the name hash version to use for grouping similar objects by path" 14150 msgstr "指定要使用的名称哈希算法,以实现按照路径对相似对象分组" 14151 + 14152 + #: builtin/repack.c 14153 + msgid "pass --path-walk to git-pack-objects" 14154 + msgstr "向 git-pack-objects 传递参数 --path-walk" 14155 14156 #: builtin/repack.c 14157 msgid "do not run git-update-server-info" ··· 15570 msgstr "git stash create [<消息>]" 15571 15572 #: builtin/stash.c 15573 + msgid "git stash export (--print | --to-ref <ref>) [<stash>...]" 15574 + msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]" 15575 + 15576 + #: builtin/stash.c 15577 + msgid "git stash import <commit>" 15578 + msgstr "git stash import <提交>" 15579 + 15580 + #: builtin/stash.c 15581 #, c-format 15582 msgid "'%s' is not a stash-like commit" 15583 msgstr "'%s' 不像是一个贮藏提交" 15584 15585 #: builtin/stash.c 15586 + msgid "No stash entries found." 15587 + msgstr "未发现贮藏条目。" 15588 + 15589 + #: builtin/stash.c 15590 #, c-format 15591 msgid "Too many revisions specified:%s" 15592 msgstr "指定了太多的版本:%s" 15593 15594 #: builtin/stash.c 15595 #, c-format ··· 15786 msgid "include ignore files" 15787 msgstr "包含忽略的文件" 15788 15789 + #: builtin/stash.c 15790 + #, c-format 15791 + msgid "cannot parse commit %s" 15792 + msgstr "不能解析提交 %s" 15793 + 15794 + #: builtin/stash.c 15795 + #, c-format 15796 + msgid "invalid author or committer for %s" 15797 + msgstr "%s 的作者或提交者信息无效" 15798 + 15799 + #: builtin/stash.c 15800 + msgid "could not write commit" 15801 + msgstr "无法写入提交" 15802 + 15803 + #: builtin/stash.c 15804 + #, c-format 15805 + msgid "not a valid revision: %s" 15806 + msgstr "不是有效版本:%s" 15807 + 15808 + #: builtin/stash.c 15809 + #, c-format 15810 + msgid "not a commit: %s" 15811 + msgstr "不是提交:%s" 15812 + 15813 + #: builtin/stash.c 15814 + #, c-format 15815 + msgid "%s is not a valid exported stash commit" 15816 + msgstr "%s 不是一个有效的且已导出的贮藏提交" 15817 + 15818 + #: builtin/stash.c 15819 + #, c-format 15820 + msgid "found root commit %s with invalid data" 15821 + msgstr "发现根提交 %s 包含无效数据" 15822 + 15823 + #: builtin/stash.c 15824 + #, c-format 15825 + msgid "found stash commit %s without expected prefix" 15826 + msgstr "发现贮藏提交 %s 缺少预期前缀" 15827 + 15828 + #: builtin/stash.c 15829 + #, c-format 15830 + msgid "cannot parse parents of commit: %s" 15831 + msgstr "无法解析该提交的父提交:%s" 15832 + 15833 + #: builtin/stash.c 15834 + #, c-format 15835 + msgid "%s does not look like a stash commit" 15836 + msgstr "%s 看起来不像是一个贮藏提交" 15837 + 15838 + #: builtin/stash.c 15839 + #, c-format 15840 + msgid "cannot read commit buffer for %s" 15841 + msgstr "无法读取提交的缓冲区:%s" 15842 + 15843 + #: builtin/stash.c 15844 + #, c-format 15845 + msgid "cannot save the stash for %s" 15846 + msgstr "无法保存 %s 的贮藏" 15847 + 15848 + #: builtin/stash.c 15849 + msgid "unable to write base commit" 15850 + msgstr "无法写入基线提交" 15851 + 15852 + #: builtin/stash.c 15853 + #, c-format 15854 + msgid "unable to find stash entry %s" 15855 + msgstr "无法找到贮藏条目 %s" 15856 + 15857 + #: builtin/stash.c 15858 + msgid "print the object ID instead of writing it to a ref" 15859 + msgstr "打印对象 ID,而不是写入引用" 15860 + 15861 + #: builtin/stash.c 15862 + msgid "save the data to the given ref" 15863 + msgstr "将数据保存到指定引用" 15864 + 15865 + #: builtin/stash.c 15866 + msgid "exactly one of --print and --to-ref is required" 15867 + msgstr "参数 --print 和 --to-ref 必须二选一" 15868 + 15869 #: builtin/stripspace.c 15870 msgid "skip and remove all lines starting with comment character" 15871 msgstr "跳过和移除所有的注释行" ··· 15876 15877 #: builtin/submodule--helper.c 15878 #, c-format 15879 + msgid "" 15880 + "could not look up configuration '%s'. Assuming this repository is its own " 15881 + "authoritative upstream." 15882 + msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" 15883 15884 #: builtin/submodule--helper.c 15885 #, c-format ··· 15888 15889 #: builtin/submodule--helper.c 15890 #, c-format 15891 msgid "No url found for submodule path '%s' in .gitmodules" 15892 msgstr "在 .gitmodules 中未找到子模组路径 '%s' 的 url" 15893 ··· 16302 "Submodule (%s) branch configured to inherit branch from superproject, but " 16303 "the superproject is not on any branch" 16304 msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" 16305 + 16306 + #: builtin/submodule--helper.c 16307 + #, c-format 16308 + msgid "Expecting a full ref name, got %s" 16309 + msgstr "期望一个完整的引用名称,却得到 %s" 16310 16311 #: builtin/submodule--helper.c 16312 #, c-format ··· 16555 16556 #: builtin/submodule--helper.c 16557 #, c-format 16558 + msgid "submodule name '%s' already used for path '%s'" 16559 + msgstr "子模组名称 '%s' 已被用于路径 '%s'" 16560 + 16561 + #: builtin/submodule--helper.c 16562 + #, c-format 16563 msgid "'%s' is not a valid submodule name" 16564 msgstr "'%s' 不是一个有效的子模组名称" 16565 ··· 17114 17115 #: builtin/update-ref.c 17116 msgid "batch reference updates" 17117 + msgstr "批量处理引用更新" 17118 17119 #: builtin/update-server-info.c 17120 msgid "update the info files from scratch" ··· 17333 17334 #: builtin/worktree.c 17335 #, c-format 17336 msgid "Preparing worktree (detached HEAD %s)" 17337 msgstr "准备工作区(分离头指针 %s)" 17338 ··· 18778 #: commit-graph.c 18779 #, c-format 18780 msgid "" 18781 + "attempting to write a commit-graph, but 'commitGraph." 18782 + "changedPathsVersion' (%d) is not supported" 18783 msgstr "尝试写入提交图,但不支持 'commitGraph.changedPathsVersion' (%d)" 18784 18785 #: commit-graph.c ··· 19202 "remote URLs cannot be configured in file directly or indirectly included by " 19203 "includeIf.hasconfig:remote.*.url" 19204 msgstr "" 19205 + "远程 URL 不能在文件中配置,不管直接地还是通过 includeIf.hasconfig:remote.*." 19206 + "url 间接地包含" 19207 19208 #: config.c 19209 #, c-format ··· 19349 19350 #: config.c 19351 #, c-format 19352 msgid "bad boolean config value '%s' for '%s'" 19353 msgstr "'%2$s' 的错误的布尔取值 '%1$s'" 19354 ··· 19364 19365 #: config.c 19366 #, c-format 19367 msgid "unable to load config blob object '%s'" 19368 msgstr "无法从数据对象 '%s' 加载配置" 19369 ··· 19985 msgstr "无法将命名管道和目录进行比较" 19986 19987 #: diff-no-index.c 19988 + msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]" 19989 + msgstr "git diff --no-index [<选项>] <路径> <路径> [<路径规格>...]" 19990 19991 #: diff-no-index.c 19992 msgid "" ··· 19994 "tree" 19995 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" 19996 19997 + #: diff-no-index.c 19998 + msgid "" 19999 + "Limiting comparison with pathspecs is only supported if both paths are " 20000 + "directories." 20001 + msgstr "仅当两个路径均为目录时,才支持使用路径表达式限制比较范围。" 20002 + 20003 # 译者:注意保持前导空格 20004 #: diff.c 20005 #, c-format ··· 20178 msgid "<n>" 20179 msgstr "<n>" 20180 20181 + #: diff.c parse-options.h 20182 msgid "generate diffs with <n> lines context" 20183 msgstr "生成含 <n> 行上下文的差异" 20184 ··· 20325 msgid "use default prefixes a/ and b/" 20326 msgstr "使用 a/ 和 b/ 作为默认前缀" 20327 20328 + #: diff.c parse-options.h 20329 msgid "show context between diff hunks up to the specified number of lines" 20330 msgstr "显示指定行数的差异块间的上下文" 20331 ··· 20710 msgid "bad git namespace path \"%s\"" 20711 msgstr "错误的 git 名字空间路径 \"%s\"" 20712 20713 + #: environment.c 20714 + #, c-format 20715 + msgid "invalid value for variable %s" 20716 + msgstr "变量 %s 的值无效" 20717 + 20718 + #: environment.c 20719 + #, c-format 20720 + msgid "ignoring unknown core.fsync component '%s'" 20721 + msgstr "忽略未知的 core.fsync 组件 '%s'" 20722 + 20723 + #: environment.c 20724 + #, c-format 20725 + msgid "abbrev length out of range: %d" 20726 + msgstr "缩写长度超出范围:%d" 20727 + 20728 + #: environment.c 20729 + #, c-format 20730 + msgid "bad zlib compression level %d" 20731 + msgstr "错误的 zlib 压缩级别 %d" 20732 + 20733 + #: environment.c 20734 + #, c-format 20735 + msgid "%s cannot contain newline" 20736 + msgstr "%s 不能包含换行符" 20737 + 20738 + #: environment.c 20739 + #, c-format 20740 + msgid "%s must have at least one character" 20741 + msgstr "%s 必须至少有一个字符" 20742 + 20743 + #: environment.c 20744 + #, c-format 20745 + msgid "ignoring unknown core.fsyncMethod value '%s'" 20746 + msgstr "忽略未知的 core.fsyncMethod 值 '%s'" 20747 + 20748 + #: environment.c 20749 + msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" 20750 + msgstr "core.fsyncObjectFiles 已经被弃用;取而代之使用 core.fsync" 20751 + 20752 + #: environment.c 20753 + #, c-format 20754 + msgid "invalid mode for object creation: %s" 20755 + msgstr "无效的对象创建模式:%s" 20756 + 20757 + #: environment.c 20758 + #, c-format 20759 + msgid "malformed value for %s" 20760 + msgstr "%s 的取值格式错误" 20761 + 20762 + #: environment.c 20763 + #, c-format 20764 + msgid "malformed value for %s: %s" 20765 + msgstr "%s 的取值格式错误:%s" 20766 + 20767 + #: environment.c 20768 + msgid "must be one of nothing, matching, simple, upstream or current" 20769 + msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" 20770 + 20771 #: exec-cmd.c 20772 #, c-format 20773 msgid "too many args to run %s" ··· 21626 msgid "name consists only of disallowed characters: %s" 21627 msgstr "姓名中仅包含禁用字符:%s" 21628 21629 + #: imap-send.c 21630 + msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>" 21631 + msgstr "" 21632 + "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <mbox>" 21633 + 21634 + #: imap-send.c 21635 + msgid "no IMAP host specified" 21636 + msgstr "未指定 IMAP 主机" 21637 + 21638 + #: imap-send.c 21639 + msgid "" 21640 + "set the IMAP host with 'git config imap.host <host>'.\n" 21641 + "(e.g., 'git config imap.host imaps://imap.example.com')" 21642 + msgstr "" 21643 + "通过 'git config imap.host <主机>' 设置 IMAP 主机。\n" 21644 + "(例如:'git config imap.host imaps://imap.example.com')" 21645 + 21646 + #: imap-send.c 21647 + msgid "no IMAP folder specified" 21648 + msgstr "未指定 IMAP 文件夹" 21649 + 21650 + #: imap-send.c 21651 + msgid "" 21652 + "set the target folder with 'git config imap.folder <folder>'.\n" 21653 + "(e.g., 'git config imap.folder Drafts')" 21654 + msgstr "" 21655 + "通过 'git config imap.folder <文件夹>' 设置目标文件夹。\n" 21656 + "(例如:'git config imap.folder Drafts')" 21657 + 21658 #: list-objects-filter-options.c 21659 msgid "expected 'tree:<depth>'" 21660 msgstr "期望 'tree:<深度>'" ··· 22611 #: object-file.c 22612 #, c-format 22613 msgid "unable to parse type from header '%s' of %s" 22614 + msgstr "无法从 %2$s 的包头 '%1$s' 中解析类型" 22615 22616 #: object-file.c 22617 #, c-format ··· 22790 msgid "invalid object name '%.*s'." 22791 msgstr "无效的对象名 '%.*s'。" 22792 22793 + #: object.c 22794 + #, c-format 22795 + msgid "invalid object type \"%s\"" 22796 + msgstr "无效的对象类型 \"%s\"" 22797 + 22798 + #: object.c 22799 + #, c-format 22800 + msgid "object %s is a %s, not a %s" 22801 + msgstr "对象 %s 是一个 %s,不是一个 %s" 22802 + 22803 + #: object.c 22804 + #, c-format 22805 + msgid "object %s has unknown type id %d" 22806 + msgstr "对象 %s 有未知的类型 id %d" 22807 + 22808 + #: object.c 22809 + #, c-format 22810 + msgid "unable to parse object: %s" 22811 + msgstr "不能解析对象:%s" 22812 + 22813 + #: object.c 22814 + #, c-format 22815 + msgid "hash mismatch %s" 22816 + msgstr "哈希值与 %s 不匹配" 22817 + 22818 + #: odb.c 22819 #, c-format 22820 msgid "object directory %s does not exist; check .git/objects/info/alternates" 22821 msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" 22822 22823 + #: odb.c 22824 #, c-format 22825 msgid "unable to normalize alternate object path: %s" 22826 msgstr "无法规范化备用对象路径:%s" 22827 22828 + #: odb.c 22829 #, c-format 22830 msgid "%s: ignoring alternate object stores, nesting too deep" 22831 msgstr "%s:忽略备用对象库,嵌套太深" 22832 22833 + #: odb.c 22834 msgid "unable to fdopen alternates lockfile" 22835 msgstr "无法 fdopen alternates 的锁文件" 22836 22837 + #: odb.c 22838 msgid "unable to read alternates file" 22839 msgstr "无法读取 alternates 文件" 22840 22841 + #: odb.c 22842 msgid "unable to move new alternates file into place" 22843 msgstr "无法将新的 alternates 文件移动到位" 22844 22845 + #: odb.c 22846 #, c-format 22847 msgid "path '%s' does not exist" 22848 msgstr "路径 '%s' 不存在" 22849 22850 + #: odb.c 22851 #, c-format 22852 msgid "reference repository '%s' as a linked checkout is not supported yet." 22853 msgstr "尚不支持将参考仓库 '%s' 作为链接检出。" 22854 22855 + #: odb.c 22856 #, c-format 22857 msgid "reference repository '%s' is not a local repository." 22858 msgstr "参考仓库 '%s' 不是本地仓库。" 22859 22860 + #: odb.c 22861 #, c-format 22862 msgid "reference repository '%s' is shallow" 22863 msgstr "参考仓库 '%s' 是浅克隆" 22864 22865 + #: odb.c 22866 #, c-format 22867 msgid "reference repository '%s' is grafted" 22868 msgstr "参考仓库 '%s' 已被移植" 22869 22870 + #: odb.c 22871 #, c-format 22872 msgid "could not find object directory matching %s" 22873 msgstr "无法找到和 %s 匹配的对象目录" 22874 22875 + #: odb.c 22876 #, c-format 22877 msgid "invalid line while parsing alternate refs: %s" 22878 msgstr "解析备用引用时遇到无效的行:%s" 22879 22880 + #: odb.c 22881 #, c-format 22882 msgid "replacement %s not found for %s" 22883 msgstr "找不到 %2$s 的替代 %1$s" 22884 22885 + #: odb.c 22886 #, c-format 22887 msgid "packed object %s (stored in %s) is corrupt" 22888 msgstr "打包对象 %s(保存在 %s)已损坏" 22889 22890 + #: odb.c 22891 #, c-format 22892 msgid "missing mapping of %s to %s" 22893 msgstr "缺少 %s 到 %s 的映射" 22894 22895 + #: odb.c 22896 #, c-format 22897 msgid "%s is not a valid '%s' object" 22898 msgstr "%s 不是有效的 '%s' 对象" 22899 22900 #: pack-bitmap-write.c 22901 #, c-format 22902 msgid "duplicate entry when writing bitmap index: %s" ··· 22910 #: pack-bitmap-write.c 22911 msgid "too many pseudo-merges" 22912 msgstr "太多伪合并" 22913 22914 #: pack-bitmap.c 22915 msgid "failed to load bitmap index (corrupted?)" ··· 23215 23216 #: parse-options.c 23217 #, c-format 23218 + msgid "value for %s exceeds %<PRIdMAX>" 23219 + msgstr "%s 的值超出了 %<PRIdMAX>" 23220 + 23221 + #: parse-options.c 23222 + #, c-format 23223 msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]" 23224 msgstr "%2$s 的值 %1$s 不在范围 [%3$<PRIdMAX>,%4$<PRIdMAX>] 内" 23225 ··· 24371 #, c-format 24372 msgid "%s does not point to a valid object!" 24373 msgstr "%s 没有指向一个有效的对象!" 24374 + 24375 + # 译者:注意保持前导空格 24376 + #: refs.c 24377 + #, c-format 24378 + msgid "%s%s will become dangling after %s is deleted\n" 24379 + msgstr "%s%s 将在 %s 被删除后变为悬空引用\n" 24380 + 24381 + # 译者:注意保持前导空格 24382 + #: refs.c 24383 + #, c-format 24384 + msgid "%s%s has become dangling after %s was deleted\n" 24385 + msgstr "%s%s 已在 %s 被删除后变为悬空引用\n" 24386 24387 #: refs.c 24388 #, c-format ··· 27161 msgstr "切换对无趣路径的修剪" 27162 27163 #: t/helper/test-path-walk.c 27164 + msgid "toggle aggressive edge walk" 27165 + msgstr "切换激进边遍历模式" 27166 + 27167 + #: t/helper/test-path-walk.c 27168 msgid "read a pattern list over stdin" 27169 msgstr "从标准输入读取模式列表" 27170 ··· 27915 msgid "warning: " 27916 msgstr "警告:" 27917 27918 + #: usage.c 27919 + #, c-format 27920 + msgid "" 27921 + "'%s' is nominated for removal.\n" 27922 + "If you still use this command, please add an extra\n" 27923 + "option, '--i-still-use-this', on the command line\n" 27924 + "and let us know you still use it by sending an e-mail\n" 27925 + "to <git@vger.kernel.org>. Thanks.\n" 27926 + msgstr "" 27927 + "'%s' 命令已被提名移除。\n" 27928 + "如果您仍在使用该命令,请在命令行中添加额外选项\n" 27929 + "'--i-still-use-this',并通过发送邮件至 <git@vger.kernel.org> \n" 27930 + "通知我们您仍在使用它。谢谢。\n" 27931 + 27932 + #: usage.c 27933 + msgid "refusing to run without --i-still-use-this" 27934 + msgstr "拒绝在未指定 --i-still-use-this 选项时运行" 27935 + 27936 #: version.c 27937 #, c-format 27938 msgid "uname() failed with error '%s' (%d)\n" ··· 29078 #, perl-format 29079 msgid "(body) Adding cc: %s from line '%s'\n" 29080 msgstr "(body) 添加 cc: %s 自行 '%s'\n" 29081 + 29082 + #: git-send-email.perl 29083 + #, perl-format 29084 + msgid "error: invalid SMTP port '%s'\n" 29085 + msgstr "错误:无效的 SMTP 端口 '%s'\n" 29086 29087 #: git-send-email.perl 29088 #, perl-format