bb9c886334 · matheusbsbs/matheus-bagliano

@@ -14,6 +14,7 @@

14 # - 依云 <lilydjwg AT gmail.com>

15 # - Yichao Yu <yyc1992 AT gmail.com>

16 # - Zhuang Ya <zhuangya AT me.com>

17 +# - Teng Long <dyroneteng AT gmail.com>

18 #

19 # Git glossary for Chinese translators

20 #

@@ -76,6 +77,7 @@

77 # index entry | 索引条目

78 # loose object | 松散对象

79 # loose refs | 松散引用

80 +# magic | 神奇前缀（路径规格支持的一种前缀表达式）

81 # master | master（默认分支名）

82 # merge | 合并

83 # object | 对象

@@ -85,6 +87,7 @@

87 # object type | 对象类型

88 # octopus | 章鱼式合并（两分支以上的合并）

89 # origin | origin（默认的远程名称）

90 +# orphan | 孤立（一般指孤立分支，即没有任何提交的分支）

91 # pack | 包

92 # pack index | 包索引

93 # packfile | 包文件

@@ -148,8 +151,8 @@ msgid ""

151 msgstr ""

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

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

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

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

154 +"POT-Creation-Date: 2023-08-11 11:21+0800\n"

155 +"PO-Revision-Date: 2023-08-18 19:28+0800\n"

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

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

158 "Language: zh_CN\n"

@@ -1060,6 +1063,14 @@ msgstr "选项 '%s' 和 '%s' 不能同时使用"

1063 msgid "'%s' outside a repository"

1064 msgstr "'%s' 在仓库之外"

1065

1066 +#: apply.c

1067 +msgid "failed to read patch"

1068 +msgstr "无法读取补丁"

1069 +

1070 +#: apply.c

1071 +msgid "patch too large"

1072 +msgstr "补丁过大"

1073 +

1074 #: apply.c

1075 #, c-format

1076 msgid "Cannot prepare timestamp regexp %s"

@@ -2157,8 +2168,8 @@ msgstr "一个名为 '%s' 的分支已经存在"

2168

2169 #: branch.c

2170 #, c-format

2160 -msgid "cannot force update the branch '%s' checked out at '%s'"

2161 -msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"

2171 +msgid "cannot force update the branch '%s' used by worktree at '%s'"

2172 +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"

2173

2174 #: branch.c

2175 #, c-format

@@ -2236,20 +2247,6 @@ msgstr "git add [<选项>] [--] <路径规格>..."

2247 msgid "cannot chmod %cx '%s'"

2248 msgstr "不能 chmod %cx '%s'"

2249

2239 -#: builtin/add.c

2240 -#, c-format

2241 -msgid "unexpected diff status %c"

2242 -msgstr "意外的差异状态 %c"

2243 -

2244 -#: builtin/add.c builtin/commit.c

2245 -msgid "updating files failed"

2246 -msgstr "更新文件失败"

2247 -

2248 -#: builtin/add.c

2249 -#, c-format

2250 -msgid "remove '%s'\n"

2251 -msgstr "删除 '%s'\n"

2252 -

2250 #: builtin/add.c

2251 msgid "Unstaged changes after refreshing the index:"

2252 msgstr "刷新索引之后尚未被暂存的变更："

@@ -2776,10 +2773,6 @@ msgstr "向 git-mailinfo 传递 -m 参数"

2773 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2774 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

2775

2779 -#: builtin/am.c

2780 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2781 -msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

2782 -

2776 #: builtin/am.c

2777 msgid "strip everything before a scissors line"

2778 msgstr "丢弃裁切线前的所有内容"

@@ -4080,12 +4073,12 @@ msgid ""

4073 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"

4074 "objects]\n"

4075 " [--buffer] [--follow-symlinks] [--unordered]\n"

4083 -" [--textconv | --filters] [-z]"

4076 +" [--textconv | --filters] [-Z]"

4077 msgstr ""

4078 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"

4079 "objects]\n"

4080 " [--buffer] [--follow-symlinks] [--unordered]\n"

4088 -" [--textconv | --filters] [-z]"

4081 +" [--textconv | --filters] [-Z]"

4082

4083 #: builtin/cat-file.c

4084 msgid ""

@@ -4143,6 +4136,10 @@ msgstr "类似于 --batch，但不输出 <内容>"

4136 msgid "stdin is NUL-terminated"

4137 msgstr "标准输入以 NUL 字符分隔"

4138

4139 +#: builtin/cat-file.c

4140 +msgid "stdin and stdout is NUL-terminated"

4141 +msgstr "标准输入和标准输出以 NUL 字符分隔"

4142 +

4143 #: builtin/cat-file.c

4144 msgid "read commands from stdin"

4145 msgstr "从标准输入读取命令"

@@ -5039,7 +5036,8 @@ msgid "remove whole directories"

5036 msgstr "删除整个目录"

5037

5038 #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c

5042 -#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c

5039 +#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c

5040 +#: ref-filter.h

5041 msgid "pattern"

5042 msgstr "模式"

5043

@@ -5209,14 +5207,6 @@ msgstr "server-specific"

5207 msgid "option to transmit"

5208 msgstr "传输选项"

5209

5212 -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c

5213 -msgid "use IPv4 addresses only"

5214 -msgstr "只使用 IPv4 地址"

5215 -

5216 -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c

5217 -msgid "use IPv6 addresses only"

5218 -msgstr "只使用 IPv6 地址"

5219 -

5210 #: builtin/clone.c

5211 msgid "apply partial clone filters to submodules"

5212 msgstr "对子模组使用部分克隆过滤器"

@@ -5751,6 +5741,10 @@ msgstr ""

5741 " git cherry-pick --skip\n"

5742 "\n"

5743

5744 +#: builtin/commit.c read-cache.c

5745 +msgid "updating files failed"

5746 +msgstr "更新文件失败"

5747 +

5748 #: builtin/commit.c

5749 msgid "failed to unpack HEAD tree object"

5750 msgstr "无法解包 HEAD 树对象"

@@ -5826,8 +5820,8 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"

5820

5821 #: builtin/commit.c builtin/merge-tree.c

5822 #, c-format

5829 -msgid "could not lookup commit %s"

5830 -msgstr "不能查询提交 %s"

5823 +msgid "could not lookup commit '%s'"

5824 +msgstr "不能查询提交 '%s'"

5825

5826 #: builtin/commit.c builtin/shortlog.c

5827 #, c-format

@@ -8050,7 +8044,7 @@ msgstr "对 %s 调用 fstat 失败：%s"

8044 msgid "failed to parse '%s' value '%s'"

8045 msgstr "无法解析 '%s' 值 '%s'"

8046

8053 -#: builtin/gc.c builtin/init-db.c

8047 +#: builtin/gc.c setup.c

8048 #, c-format

8049 msgid "cannot stat '%s'"

8050 msgstr "不能对 '%s' 调用 stat"

@@ -9061,7 +9055,7 @@ msgstr "无法返回当前工作目录"

9055 msgid "bad %s"

9056 msgstr "错误选项 %s"

9057

9064 -#: builtin/index-pack.c builtin/init-db.c

9058 +#: builtin/index-pack.c builtin/init-db.c setup.c

9059 #, c-format

9060 msgid "unknown hash algorithm '%s'"

9061 msgstr "未知的哈希算法 '%s'"

@@ -9078,95 +9072,6 @@ msgstr "--verify 没有提供包文件名参数"

9072 msgid "fsck error in pack objects"

9073 msgstr "在打包对象中 fsck 检查出错"

9074

9081 -#: builtin/init-db.c

9082 -#, c-format

9083 -msgid "cannot stat template '%s'"

9084 -msgstr "不能对模版 '%s' 调用 stat"

9085 -

9086 -#: builtin/init-db.c

9087 -#, c-format

9088 -msgid "cannot opendir '%s'"

9089 -msgstr "不能打开目录 '%s'"

9090 -

9091 -#: builtin/init-db.c

9092 -#, c-format

9093 -msgid "cannot readlink '%s'"

9094 -msgstr "不能读取链接 '%s'"

9095 -

9096 -#: builtin/init-db.c

9097 -#, c-format

9098 -msgid "cannot symlink '%s' '%s'"

9099 -msgstr "不能自 '%s' 到 '%s' 创建符号链接"

9100 -

9101 -#: builtin/init-db.c

9102 -#, c-format

9103 -msgid "cannot copy '%s' to '%s'"

9104 -msgstr "不能拷贝 '%s' 至 '%s'"

9105 -

9106 -#: builtin/init-db.c

9107 -#, c-format

9108 -msgid "ignoring template %s"

9109 -msgstr "忽略模版 %s"

9110 -

9111 -#: builtin/init-db.c

9112 -#, c-format

9113 -msgid "templates not found in %s"

9114 -msgstr "没有在 %s 中找到模版"

9115 -

9116 -#: builtin/init-db.c

9117 -#, c-format

9118 -msgid "not copying templates from '%s': %s"

9119 -msgstr "没有从 '%s' 复制模版：%s"

9120 -

9121 -#: builtin/init-db.c

9122 -#, c-format

9123 -msgid "invalid initial branch name: '%s'"

9124 -msgstr "无效的初始分支名：'%s'"

9125 -

9126 -#: builtin/init-db.c

9127 -#, c-format

9128 -msgid "unable to handle file type %d"

9129 -msgstr "不能处理 %d 类型的文件"

9130 -

9131 -#: builtin/init-db.c

9132 -#, c-format

9133 -msgid "unable to move %s to %s"

9134 -msgstr "不能移动 %s 至 %s"

9135 -

9136 -#: builtin/init-db.c

9137 -msgid "attempt to reinitialize repository with different hash"

9138 -msgstr "尝试用不同的哈希算法重新初始化仓库"

9139 -

9140 -#: builtin/init-db.c

9141 -#, c-format

9142 -msgid "%s already exists"

9143 -msgstr "%s 已经存在"

9144 -

9145 -#: builtin/init-db.c

9146 -#, c-format

9147 -msgid "re-init: ignored --initial-branch=%s"

9148 -msgstr "re-init：已忽略 --initial-branch=%s"

9149 -

9150 -#: builtin/init-db.c

9151 -#, c-format

9152 -msgid "Reinitialized existing shared Git repository in %s%s\n"

9153 -msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"

9154 -

9155 -#: builtin/init-db.c

9156 -#, c-format

9157 -msgid "Reinitialized existing Git repository in %s%s\n"

9158 -msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"

9159 -

9160 -#: builtin/init-db.c

9161 -#, c-format

9162 -msgid "Initialized empty shared Git repository in %s%s\n"

9163 -msgstr "已初始化空的共享 Git 仓库于 %s%s\n"

9164 -

9165 -#: builtin/init-db.c

9166 -#, c-format

9167 -msgid "Initialized empty Git repository in %s%s\n"

9168 -msgstr "已初始化空的 Git 仓库于 %s%s\n"

9169 -

9075 #: builtin/init-db.c

9076 msgid ""

9077 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"

@@ -9714,6 +9619,11 @@ msgid ""

9619 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

9620 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"

9621

9622 +#: builtin/ls-files.c builtin/ls-tree.c

9623 +#, c-format

9624 +msgid "could not get object info about '%s'"

9625 +msgstr "无法获得关于 '%s' 的对象信息"

9626 +

9627 #: builtin/ls-files.c

9628 #, c-format

9629 msgid "bad ls-files format: element '%s' does not start with '('"

@@ -9899,11 +9809,6 @@ msgstr "除了显示指向的对象外，显示指向的引用名"

9809 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

9810 msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"

9811

9902 -#: builtin/ls-tree.c

9903 -#, c-format

9904 -msgid "could not get object info about '%s'"

9905 -msgstr "无法获得关于 '%s' 的对象信息"

9906 -

9812 #: builtin/ls-tree.c

9813 #, c-format

9814 msgid "bad ls-tree format: element '%s' does not start with '('"

@@ -10829,11 +10734,13 @@ msgstr "git notes [--ref <注解引用>] [list [<对象>]]"

10734

10735 #: builtin/notes.c

10736 msgid ""

10832 -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

10833 -"| (-c | -C) <object>] [<object>]"

10737 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [--[no-]separator|--"

10738 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10739 +"| -C) <object>] [<object>]"

10740 msgstr ""

10835 -"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "

10836 -"| (-c | -C) <对象>] [<对象>]"

10741 +"git notes [--ref <注解引用>] add [-f] [--allow-empty] [--[no-]separator|--"

10742 +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"

10743 +"对象>] [<对象>]"

10744

10745 #: builtin/notes.c

10746 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"

@@ -10841,11 +10748,13 @@ msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"

10748

10749 #: builtin/notes.c

10750 msgid ""

10844 -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

10845 -"(-c | -C) <object>] [<object>]"

10751 +"git notes [--ref <notes-ref>] append [--allow-empty] [--[no-]separator|--"

10752 +"separator=<paragraph-break>] [--[no-]stripspace] [-m <msg> | -F <file> | (-c "

10753 +"| -C) <object>] [<object>]"

10754 msgstr ""

10847 -"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "

10848 -"(-c | -C) <对象>] [<对象>]"

10755 +"git notes [--ref <注解引用>] append [--allow-empty] [--[no-]separator|--"

10756 +"separator=<分段符>] [--[no-]stripspace] [-m <说明> | -F <文件> | (-c | -C) <"

10757 +"对象>] [<对象>]"

10758

10759 #: builtin/notes.c

10760 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

@@ -11013,6 +10922,18 @@ msgstr "允许保存空白注释"

10922 msgid "replace existing notes"

10923 msgstr "替换已存在的注解"

10924

10925 +#: builtin/notes.c

10926 +msgid "<paragraph-break>"

10927 +msgstr "<分段符>"

10928 +

10929 +#: builtin/notes.c

10930 +msgid "insert <paragraph-break> between paragraphs"

10931 +msgstr "在段落之间插入<分段符>"

10932 +

10933 +#: builtin/notes.c

10934 +msgid "remove unnecessary whitespace"

10935 +msgstr "删除不必要的空白字符"

10936 +

10937 #: builtin/notes.c

10938 #, c-format

10939 msgid ""

@@ -11691,8 +11612,11 @@ msgid "refusing to run without --i-still-use-this"

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

11613

11614 #: builtin/pack-refs.c

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

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

11615 +msgid ""

11616 +"git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude "

11617 +"<pattern>]"

11618 +msgstr ""

11619 +"git pack-refs [--all] [--no-prune] [--include <模式>] [--exclude <模式>]"

11620

11621 #: builtin/pack-refs.c

11622 msgid "pack everything"

@@ -11702,6 +11626,14 @@ msgstr "打包一切"

11626 msgid "prune loose refs (default)"

11627 msgstr "清除松散的引用（默认）"

11628

11629 +#: builtin/pack-refs.c

11630 +msgid "references to include"

11631 +msgstr "需包含的引用"

11632 +

11633 +#: builtin/pack-refs.c

11634 +msgid "references to exclude"

11635 +msgstr "需排除的引用"

11636 +

11637 #: builtin/patch-id.c

11638 msgid "git patch-id [--stable | --unstable | --verbatim]"

11639 msgstr "git patch-id [--stable | --unstable | --verbatim]"

@@ -11778,6 +11710,14 @@ msgstr "强制覆盖本地分支"

11710 msgid "number of submodules pulled in parallel"

11711 msgstr "并发拉取的子模组的数量"

11712

11713 +#: builtin/pull.c parse-options.h

11714 +msgid "use IPv4 addresses only"

11715 +msgstr "只使用 IPv4 地址"

11716 +

11717 +#: builtin/pull.c parse-options.h

11718 +msgid "use IPv6 addresses only"

11719 +msgstr "只使用 IPv6 地址"

11720 +

11721 #: builtin/pull.c

11722 msgid ""

11723 "There is no candidate for rebasing against among the refs that you just "

@@ -12059,36 +11999,36 @@ msgstr ""

11999 #: builtin/push.c

12000 msgid ""

12001 "Updates were rejected because the tip of your current branch is behind\n"

12062 -"its remote counterpart. Integrate the remote changes (e.g.\n"

12063 -"'git pull ...') before pushing again.\n"

12002 +"its remote counterpart. If you want to integrate the remote changes,\n"

12003 +"use 'git pull' before pushing again.\n"

12004 "See the 'Note about fast-forwards' in 'git push --help' for details."

12005 msgstr ""

12006 "更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"

12067 -"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"

12068 -"'git push --help' 中的 'Note about fast-forwards' 小节。"

12007 +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"

12008 +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

12009

12010 #: builtin/push.c

12011 msgid ""

12012 "Updates were rejected because a pushed branch tip is behind its remote\n"

12073 -"counterpart. Check out this branch and integrate the remote changes\n"

12074 -"(e.g. 'git pull ...') before pushing again.\n"

12013 +"counterpart. If you want to integrate the remote changes, use 'git pull'\n"

12014 +"before pushing again.\n"

12015 "See the 'Note about fast-forwards' in 'git push --help' for details."

12016 msgstr ""

12017 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"

12078 -"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"

12079 -"'git push --help' 中的 'Note about fast-forwards' 小节。"

12018 +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"

12019 +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

12020

12021 #: builtin/push.c

12022 msgid ""

12083 -"Updates were rejected because the remote contains work that you do\n"

12084 -"not have locally. This is usually caused by another repository pushing\n"

12085 -"to the same ref. You may want to first integrate the remote changes\n"

12086 -"(e.g., 'git pull ...') before pushing again.\n"

12023 +"Updates were rejected because the remote contains work that you do not\n"

12024 +"have locally. This is usually caused by another repository pushing to\n"

12025 +"the same ref. If you want to integrate the remote changes, use\n"

12026 +"'git pull' before pushing again.\n"

12027 "See the 'Note about fast-forwards' in 'git push --help' for details."

12028 msgstr ""

12029 "更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"

12090 -"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"

12091 -"（如 'git pull ...'）。\n"

12030 +"一个仓库已向该引用进行了推送。如果您希望先与远程变更合并，请在推送\n"

12031 +"前执行 'git pull'。\n"

12032 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

12033

12034 #: builtin/push.c

@@ -12106,13 +12046,14 @@ msgstr ""

12046

12047 #: builtin/push.c

12048 msgid ""

12109 -"Updates were rejected because the tip of the remote-tracking\n"

12110 -"branch has been updated since the last checkout. You may want\n"

12111 -"to integrate those changes locally (e.g., 'git pull ...')\n"

12112 -"before forcing an update.\n"

12049 +"Updates were rejected because the tip of the remote-tracking branch has\n"

12050 +"been updated since the last checkout. If you want to integrate the\n"

12051 +"remote changes, use 'git pull' before pushing again.\n"

12052 +"See the 'Note about fast-forwards' in 'git push --help' for details."

12053 msgstr ""

12054 "更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"

12115 -"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n"

12055 +"如果您希望先与远程变更合并，请在推送前执行 'git pull'。\n"

12056 +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

12057

12058 #: builtin/push.c

12059 #, c-format

@@ -13141,12 +13082,10 @@ msgid "fetch the remote branches"

13082 msgstr "抓取远程的分支"

13083

13084 #: builtin/remote.c

13144 -msgid "import all tags and associated objects when fetching"

13145 -msgstr "抓取时导入所有的标签和关联对象"

13146 -

13147 -#: builtin/remote.c

13148 -msgid "or do not fetch any tag at all (--no-tags)"

13149 -msgstr "或不抓取任何标签（--no-tags）"

13085 +msgid ""

13086 +"import all tags and associated objects when fetching\n"

13087 +"or do not fetch any tag at all (--no-tags)"

13088 +msgstr "抓取时导入所有的标签和关联对象，或不抓取任何标签（--no-tags）"

13089

13090 #: builtin/remote.c

13091 msgid "branch(es) to track"

@@ -15530,6 +15469,11 @@ msgstr "略过未合并的子模组 %s"

15469 msgid "Skipping submodule '%s'"

15470 msgstr "略过子模组 '%s'"

15471

15472 +#: builtin/submodule--helper.c

15473 +#, c-format

15474 +msgid "cannot clone submodule '%s' without a URL"

15475 +msgstr "无法在不提供 URL 时克隆子模组 '%s'"

15476 +

15477 #: builtin/submodule--helper.c

15478 #, c-format

15479 msgid "Failed to clone '%s'. Retry scheduled"

@@ -16442,10 +16386,10 @@ msgstr "打印标签内容"

16386 #: builtin/worktree.c

16387 msgid ""

16388 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"

16445 -" [-b <new-branch>] <path> [<commit-ish>]"

16389 +" [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]"

16390 msgstr ""

16391 "git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n"

16448 -" [-b <新分支>] <路径> [<提交号>]"

16392 +" [--orphan] [(-b | -B) <新分支>] <路径> [<提交号>]"

16393

16394 #: builtin/worktree.c

16395 msgid "git worktree list [-v | --porcelain [-z]]"

@@ -16475,6 +16419,40 @@ msgstr "git worktree repair [<路径>...]"

16419 msgid "git worktree unlock <worktree>"

16420 msgstr "git worktree unlock <工作区>"

16421

16422 +#: builtin/worktree.c

16423 +msgid "No possible source branch, inferring '--orphan'"

16424 +msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断"

16425 +

16426 +#: builtin/worktree.c

16427 +#, c-format

16428 +msgid ""

16429 +"If you meant to create a worktree containing a new orphan branch\n"

16430 +"(branch with no commits) for this repository, you can do so\n"

16431 +"using the --orphan flag:\n"

16432 +"\n"

16433 +" git worktree add --orphan -b %s %s\n"

16434 +msgstr ""

16435 +"如果你打算为此仓库创建一个包含新的孤立分支\n"

16436 +"（没有提交的分支）的工作区，你可以使用选项\n"

16437 +"--orphan 来执行此操作：\n"

16438 +"\n"

16439 +" git worktree add --orphan -b %s %s\n"

16440 +

16441 +#: builtin/worktree.c

16442 +#, c-format

16443 +msgid ""

16444 +"If you meant to create a worktree containing a new orphan branch\n"

16445 +"(branch with no commits) for this repository, you can do so\n"

16446 +"using the --orphan flag:\n"

16447 +"\n"

16448 +" git worktree add --orphan %s\n"

16449 +msgstr ""

16450 +"如果你打算为此仓库创建一个包含新的孤立分支\n"

16451 +"（没有提交的分支）的工作区，你可以使用选项\n"

16452 +"--orphan 来执行此操作：\n"

16453 +"\n"

16454 +" git worktree add --orphan %s\n"

16455 +

16456 #: builtin/worktree.c

16457 #, c-format

16458 msgid "Removing %s/%s: %s"

@@ -16555,11 +16533,40 @@ msgstr "准备工作区（重置分支 '%s'，之前为 %s）"

16533 msgid "Preparing worktree (checking out '%s')"

16534 msgstr "准备工作区（检出 '%s'）"

16535

16536 +#: builtin/worktree.c

16537 +#, c-format

16538 +msgid "unreachable: invalid reference: %s"

16539 +msgstr "不可达：无效引用：%s"

16540 +

16541 #: builtin/worktree.c

16542 #, c-format

16543 msgid "Preparing worktree (detached HEAD %s)"

16544 msgstr "准备工作区（分离头指针 %s）"

16545

16546 +#: builtin/worktree.c

16547 +#, c-format

16548 +msgid ""

16549 +"HEAD points to an invalid (or orphaned) reference.\n"

16550 +"HEAD path: '%s'\n"

16551 +"HEAD contents: '%s'"

16552 +msgstr ""

16553 +"HEAD 指向了一个无用的（或孤立的）引用。\n"

16554 +"HEAD 路径： '%s'\n"

16555 +"HEAD 内容： '%s'"

16556 +

16557 +#: builtin/worktree.c

16558 +msgid ""

16559 +"No local or remote refs exist despite at least one remote\n"

16560 +"present, stopping; use 'add -f' to overide or fetch a remote first"

16561 +msgstr ""

16562 +"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止;\n"

16563 +"请使用 'add -f' 来覆盖或拉取一个远程仓库"

16564 +

16565 +#: builtin/worktree.c

16566 +#, c-format

16567 +msgid "'%s' and '%s' cannot be used together"

16568 +msgstr "'%s' 和 '%s' 不能同时使用"

16569 +

16570 #: builtin/worktree.c

16571 msgid "checkout <branch> even if already checked out in other worktree"

16572 msgstr "检出 <分支>，即使已经被检出到其它工作区"

@@ -16572,6 +16579,10 @@ msgstr "创建一个新分支"

16579 msgid "create or reset a branch"

16580 msgstr "创建或重置一个分支"

16581

16582 +#: builtin/worktree.c

16583 +msgid "create unborn/orphaned branch"

16584 +msgstr "创建一个尚未诞生的/孤立的分支"

16585 +

16586 #: builtin/worktree.c

16587 msgid "populate the new working tree"

16588 msgstr "生成新的工作区"

@@ -16597,6 +16608,15 @@ msgstr "尝试为新分支名匹配一个远程跟踪分支"

16608 msgid "options '%s', '%s', and '%s' cannot be used together"

16609 msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"

16610

16611 +#: builtin/worktree.c

16612 +#, c-format

16613 +msgid "options '%s', and '%s' cannot be used together"

16614 +msgstr "选项 '%s'，与 '%s' 不能同时使用"

16615 +

16616 +#: builtin/worktree.c

16617 +msgid "<commit-ish>"

16618 +msgstr "<提交号>"

16619 +

16620 #: builtin/worktree.c

16621 msgid "added with --lock"

16622 msgstr "由 --lock 添加"

@@ -16877,6 +16897,16 @@ msgid_plural "The bundle requires these %<PRIuMAX> refs:"

16897 msgstr[0] "这个归档包需要这个引用："

16898 msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："

16899

16900 +#: bundle.c

16901 +#, c-format

16902 +msgid "The bundle uses this hash algorithm: %s"

16903 +msgstr "该归档包使用的哈希算法：%s"

16904 +

16905 +#: bundle.c

16906 +#, c-format

16907 +msgid "The bundle uses this filter: %s"

16908 +msgstr "归档包使用了过滤器：%s"

16909 +

16910 #: bundle.c

16911 msgid "unable to dup bundle descriptor"

16912 msgstr "无法复制归档包描述符"

@@ -17174,8 +17204,8 @@ msgid "A portable graphical interface to Git"

17204 msgstr "一个便携的 Git 图形客户端"

17205

17206 #: command-list.h

17177 -msgid "Compute object ID and optionally creates a blob from a file"

17178 -msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"

17207 +msgid "Compute object ID and optionally create an object from a file"

17208 +msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象"

17209

17210 #: command-list.h

17211 msgid "Display help information about Git"

@@ -17715,6 +17745,11 @@ msgstr "提交图形没有基础图形块"

17745 msgid "commit-graph chain does not match"

17746 msgstr "提交图形链不匹配"

17747

17748 +#: commit-graph.c

17749 +#, c-format

17750 +msgid "commit count in base graph too high: %<PRIuMAX>"

17751 +msgstr "基础图形中的提交数量过高：%<PRIuMAX>"

17752 +

17753 #: commit-graph.c

17754 #, c-format

17755 msgid "invalid commit-graph chain: line '%s' not a hash"

@@ -17822,6 +17857,17 @@ msgstr "无法重命名基础提交图形文件"

17857 msgid "failed to rename temporary commit-graph file"

17858 msgstr "无法重命名临时提交图形文件"

17859

17860 +#: commit-graph.c

17861 +#, c-format

17862 +msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"

17863 +msgstr ""

17864 +"无法合并提交图形，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"

17865 +

17866 +#: commit-graph.c

17867 +#, c-format

17868 +msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"

17869 +msgstr "无法合并提交图形 %s, 提交过多：%<PRIuMAX>"

17870 +

17871 #: commit-graph.c

17872 msgid "Scanning merged commits"

17873 msgstr "正在扫描合并提交"

@@ -17857,10 +17903,6 @@ msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"

17903 msgid "failed to parse commit %s from commit-graph"

17904 msgstr "无法从提交图形中解析提交 %s"

17905

17860 -#: commit-graph.c

17861 -msgid "Verifying commits in commit graph"

17862 -msgstr "正在校验提交图中的提交"

17863 -

17906 #: commit-graph.c

17907 #, c-format

17908 msgid "failed to parse commit %s from object database for commit-graph"

@@ -17908,6 +17950,10 @@ msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"

17950 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

17951 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

17952

17953 +#: commit-graph.c

17954 +msgid "Verifying commits in commit graph"

17955 +msgstr "正在校验提交图中的提交"

17956 +

17957 #: commit.c

17958 #, c-format

17959 msgid "%s %s is not a commit!"

@@ -19064,6 +19110,14 @@ msgstr "未找到合并基线"

19110 msgid "multiple merge bases found"

19111 msgstr "找到了多条合并基线"

19112

19113 +#: diff-no-index.c

19114 +msgid "cannot compare stdin to a directory"

19115 +msgstr "无法将标准输入和目录进行比较"

19116 +

19117 +#: diff-no-index.c

19118 +msgid "cannot compare a named pipe to a directory"

19119 +msgstr "无法将命名管道和目录进行比较"

19120 +

19121 #: diff-no-index.c

19122 msgid "git diff --no-index [<options>] <path> <path>"

19123 msgstr "git diff --no-index [<选项>] <路径> <路径>"

@@ -19128,6 +19182,15 @@ msgstr ""

19182 msgid "external diff died, stopping at %s"

19183 msgstr "外部 diff 退出，停止在 %s"

19184

19185 +#: diff.c

19186 +msgid "--follow requires exactly one pathspec"

19187 +msgstr "--follow 明确要求只跟一个路径规格"

19188 +

19189 +#: diff.c

19190 +#, c-format

19191 +msgid "pathspec magic not supported by --follow: %s"

19192 +msgstr "指定 --follow: %s 的同时，不支持在路径规格中使用神奇前缀"

19193 +

19194 #: diff.c parse-options.c

19195 #, c-format

19196 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

@@ -19144,10 +19207,6 @@ msgid ""

19207 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

19208 msgstr "选项 '%1$s'、'%2$s' 不能同时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"

19209

19147 -#: diff.c

19148 -msgid "--follow requires exactly one pathspec"

19149 -msgstr "--follow 明确要求只跟一个路径规格"

19150 -

19210 #: diff.c

19211 #, c-format

19212 msgid "invalid --stat value: %s"

@@ -22607,6 +22666,15 @@ msgstr "无法生成 diff"

22666 msgid "could not parse log for '%s'"

22667 msgstr "不能解析 '%s' 的日志"

22668

22669 +#: reachable.c

22670 +#, c-format

22671 +msgid "invalid extra cruft tip: '%s'"

22672 +msgstr "无效的额外废弃提交版本：'%s'"

22673 +

22674 +#: reachable.c

22675 +msgid "unable to enumerate additional recent objects"

22676 +msgstr "无法枚举额外的近期对象"

22677 +

22678 #: read-cache.c

22679 #, c-format

22680 msgid "will not add file alias '%s' ('%s' already exists in index)"

@@ -22794,6 +22862,16 @@ msgstr "不能修复 '%s' 的权限位"

22862 msgid "%s: cannot drop to stage #0"

22863 msgstr "%s：不能落到暂存区 #0"

22864

22865 +#: read-cache.c

22866 +#, c-format

22867 +msgid "unexpected diff status %c"

22868 +msgstr "意外的差异状态 %c"

22869 +

22870 +#: read-cache.c

22871 +#, c-format

22872 +msgid "remove '%s'\n"

22873 +msgstr "删除 '%s'\n"

22874 +

22875 #: rebase-interactive.c

22876 msgid ""

22877 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -23007,6 +23085,26 @@ msgstr "未知的 %%(trailers) 参数：%s"

23085 msgid "positive value expected contents:lines=%s"

23086 msgstr "期望一个正数 contents:lines=%s"

23087

23088 +#: ref-filter.c

23089 +#, c-format

23090 +msgid "argument expected for %s"

23091 +msgstr "预期参数 %s"

23092 +

23093 +#: ref-filter.c

23094 +#, c-format

23095 +msgid "positive value expected %s=%s"

23096 +msgstr "预期正数参数值 %s=%s"

23097 +

23098 +#: ref-filter.c

23099 +#, c-format

23100 +msgid "cannot fully parse %s=%s"

23101 +msgstr "不能完整解析 %s=%s"

23102 +

23103 +#: ref-filter.c

23104 +#, c-format

23105 +msgid "value expected %s="

23106 +msgstr "预期值 %s="

23107 +

23108 #: ref-filter.c

23109 #, c-format

23110 msgid "positive value expected '%s' in %%(%s)"

@@ -23098,6 +23196,10 @@ msgstr "这个命令拒绝元素 %%(%.*s)"

23196 msgid "--format=%.*s cannot be used with --python, --shell, --tcl"

23197 msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"

23198

23199 +#: ref-filter.c

23200 +msgid "failed to run 'describe'"

23201 +msgstr "无法运行 'describe'"

23202 +

23203 #: ref-filter.c

23204 #, c-format

23205 msgid "(no branch, rebasing %s)"

@@ -23175,6 +23277,10 @@ msgstr "key"

23277 msgid "field name to sort on"

23278 msgstr "排序的字段名"

23279

23280 +#: ref-filter.h

23281 +msgid "exclude refs which match pattern"

23282 +msgstr "排除与 <模式> 相匹配的引用"

23283 +

23284 #: reflog.c

23285 #, c-format

23286 msgid "not a reflog: %s"

@@ -23704,8 +23810,9 @@ msgstr[1] ""

23810

23811 # 译者：注意保持前导空格

23812 #: remote.c

23707 -msgid " (use \"git pull\" to merge the remote branch into yours)\n"

23708 -msgstr " （使用 \"git pull\" 来合并远程分支）\n"

23813 +msgid ""

23814 +" (use \"git pull\" if you want to integrate the remote branch with yours)\n"

23815 +msgstr " （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n"

23816

23817 #: remote.c

23818 #, c-format

@@ -23845,6 +23952,11 @@ msgstr "无法获得 ancestry-path 参数 %s 的提交"

23952 msgid "--unpacked=<packfile> no longer supported"

23953 msgstr "不再支持 --unpacked=<packfile>"

23954

23955 +#: revision.c

23956 +#, c-format

23957 +msgid "invalid option '%s' in --stdin mode"

23958 +msgstr "在 --stdin 模式下的无效选项：'%s'"

23959 +

23960 #: revision.c

23961 msgid "your current branch appears to be broken"

23962 msgstr "您的当前分支好像被损坏"

@@ -25233,6 +25345,95 @@ msgstr "fork 失败"

25345 msgid "setsid failed"

25346 msgstr "setsid 失败"

25347

25348 +#: setup.c

25349 +#, c-format

25350 +msgid "cannot stat template '%s'"

25351 +msgstr "不能对模版 '%s' 调用 stat"

25352 +

25353 +#: setup.c

25354 +#, c-format

25355 +msgid "cannot opendir '%s'"

25356 +msgstr "不能打开目录 '%s'"

25357 +

25358 +#: setup.c

25359 +#, c-format

25360 +msgid "cannot readlink '%s'"

25361 +msgstr "不能读取链接 '%s'"

25362 +

25363 +#: setup.c

25364 +#, c-format

25365 +msgid "cannot symlink '%s' '%s'"

25366 +msgstr "不能自 '%s' 到 '%s' 创建符号链接"

25367 +

25368 +#: setup.c

25369 +#, c-format

25370 +msgid "cannot copy '%s' to '%s'"

25371 +msgstr "不能拷贝 '%s' 至 '%s'"

25372 +

25373 +#: setup.c

25374 +#, c-format

25375 +msgid "ignoring template %s"

25376 +msgstr "忽略模版 %s"

25377 +

25378 +#: setup.c

25379 +#, c-format

25380 +msgid "templates not found in %s"

25381 +msgstr "没有在 %s 中找到模版"

25382 +

25383 +#: setup.c

25384 +#, c-format

25385 +msgid "not copying templates from '%s': %s"

25386 +msgstr "没有从 '%s' 复制模版：%s"

25387 +

25388 +#: setup.c

25389 +#, c-format

25390 +msgid "invalid initial branch name: '%s'"

25391 +msgstr "无效的初始分支名：'%s'"

25392 +

25393 +#: setup.c

25394 +#, c-format

25395 +msgid "unable to handle file type %d"

25396 +msgstr "不能处理 %d 类型的文件"

25397 +

25398 +#: setup.c

25399 +#, c-format

25400 +msgid "unable to move %s to %s"

25401 +msgstr "不能移动 %s 至 %s"

25402 +

25403 +#: setup.c

25404 +msgid "attempt to reinitialize repository with different hash"

25405 +msgstr "尝试用不同的哈希算法重新初始化仓库"

25406 +

25407 +#: setup.c

25408 +#, c-format

25409 +msgid "%s already exists"

25410 +msgstr "%s 已经存在"

25411 +

25412 +#: setup.c

25413 +#, c-format

25414 +msgid "re-init: ignored --initial-branch=%s"

25415 +msgstr "re-init：已忽略 --initial-branch=%s"

25416 +

25417 +#: setup.c

25418 +#, c-format

25419 +msgid "Reinitialized existing shared Git repository in %s%s\n"

25420 +msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"

25421 +

25422 +#: setup.c

25423 +#, c-format

25424 +msgid "Reinitialized existing Git repository in %s%s\n"

25425 +msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n"

25426 +

25427 +#: setup.c

25428 +#, c-format

25429 +msgid "Initialized empty shared Git repository in %s%s\n"

25430 +msgstr "已初始化空的共享 Git 仓库于 %s%s\n"

25431 +

25432 +#: setup.c

25433 +#, c-format

25434 +msgid "Initialized empty Git repository in %s%s\n"

25435 +msgstr "已初始化空的 Git 仓库于 %s%s\n"

25436 +

25437 #: sparse-index.c

25438 #, c-format

25439 msgid "index entry is a directory, but not sparse (%08x)"

l10n: zh_CN: v2.42.0 round 1