# This file is distributed under the same license as the Git package.
# Contributors:
# - Jiang Xin <worldhello.net AT gmail.com>
+# - Lian Cheng <rhythm.mail AT gmail.com>
+# - Ray Chen <oldsharp AT gmail.com>
# - Riku <lu.riku AT gmail.com>
+# - Thynson <lanxingcan AT gmail.com>
+# - ws3389 <willsmith3389 AT gmail.com>
+# - Wang Sheng <wangsheng2008love AT 163.com>
+# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
-# - Lian Cheng <rhythm.mail AT gmail.com>
+#
+# Git glossary for Chinese translators
+#
+# English | Chinese
+# ---------------------------------+--------------------------------------
+# 3-way merge | 三方合并
+# abbreviate | 简写（的 SHA-1 值）
+# alternate object database | 备用对象库
+# amend | 修补
+# ancestor | 祖先，祖先提交
+# annotated tag | 附注标签
+# bare repository | 纯仓库
+# bisect | 二分查找
+# blob object | 数据对象
+# branch | 分支
+# bundle | 包
+# bypass | 绕过
+# cache | 索引（的别称）
+# chain | （提交）链
+# changeset | 变更集
+# checkout | 检出
+# checksum | 校验，校验和
+# cherry-picking | 拣选
+# clean | 干净（的工作区）
+# clone | 克隆
+# commit | 提交
+# commit object | 提交对象
+# commit-ish (also committish) | 提交号
+# conflict | 冲突
+# core Git | 核心 Git 工具
+# DAG | 有向无环图
+# dangling object | 摇摆对象
+# detached HEAD | 分离头指针
+# directory | 目录
+# dirty | 脏（的工作区）
+# dumb HTTP protocol | 哑 HTTP 协议
+# evil merge | 坏合并（合并引入了父提交没有的修改）
+# fast-forward | 快进
+# fetch | 获取
+# file system | 文件系统
+# fork | 派生，复刻
+# Git archive | 仓库（对于 arch 用户）
+# gitfile | gitfile（仓库链接文件）
+# grafts | （提交）嫁接
+# hash | 哈希值
+# HEAD | HEAD（头指针，亦即当前分支）
+# head | 头、分支
+# head ref | 分支
+# header | 头信息
+# hook | 钩子
+# hunk | 补丁片段
+# index | 索引
+# index entry | 索引条目
+# loose object | 松散对象
+# loose refs | 松散引用
+# master | master（默认分支名）
+# merge | 合并
+# object | 对象
+# object database | 对象库
+# object identifier | 对象标识符
+# object name | 对象名称
+# object type | 对象类型
+# octopus | 章鱼式合并（两分支以上的合并）
+# origin | origin（默认的远程名称）
+# pack | 包
+# pack index | 包索引
+# packfile | 包文件
+# parent | 父提交
+# patch | 补丁
+# pathspec | 路径规格
+# pattern | 模式
+# pickaxe | pickaxe
+# plumbing | 管件（Git 底层核心命令的别称）
+# porcelain | 瓷件（Git 上层封装命令的别称）
+# prune | 清除
+# pull | 拉，拉取
+# push | 推，推送
+# reachable | 可达
+# rebase | 变基
+# ref | 引用
+# reflog | 引用日志
+# refspec | 引用规格
+# remote | 远程，远程仓库
+# remote-tracking branch | 远程跟踪分支
+# replay | 重放
+# repo | 仓库
+# repository | 仓库
+# resolve | （冲突）解决
+# revert | 还原
+# revision | 版本
+# rewind | 回退
+# SCM | 源代码管理（工具）
+# SHA-1 | SHA-1（安全哈希算法1）
+# shallow repository | 浅（克隆）仓库
+# signed tag | 签名标签
+# smart HTTP protocol | 智能 HTTP 协议
+# squash | 压缩
+# stage | n. 暂存区（即索引）; v. 暂存
+# stash | n. 进度保存; v. 保存进度
+# submodule | 子模组
+# symref | 符号引用
+# tag | 标签
+# tag object | 标签对象
+# tagger | 打标签者
+# topic branch | 主题分支
+# track | 跟踪
+# tree | 树（工作区或树对象）
+# tree object | 树对象
+# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
+# unmerged index | 未合并索引
+# unpack | 解包
+# unreachable object | 不可达对象
+# unstage | 取消暂存
+# upstream | 上游
+# upstream branch | 上游分支
+# working tree | 工作区
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-06-27 19:17+0800\n"
-"PO-Revision-Date: 2015-07-05 23:12+0800\n"
+"POT-Creation-Date: 2015-07-14 07:19+0800\n"
+"PO-Revision-Date: 2015-08-04 00:43+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
-"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
+"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
#: archive.c:14
msgid "git archive --remote <repo> [--exec <cmd>] --list"
-msgstr "git archive --remote <版本库> [--exec <命令>] --list"
+msgstr "git archive --remote <仓库> [--exec <命令>] --list"
#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327
#, c-format
msgid "pathspec '%s' did not match any files"
-msgstr "路径规则 '%s' 未匹配任何文件"
+msgstr "路径规格 '%s' 未匹配任何文件"
#: archive.c:427
msgid "fmt"
#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77
msgid "repo"
-msgstr "版本库"
+msgstr "仓库"
#: archive.c:450 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
-msgstr "从远程版本库（<版本库>）提取归档文件"
+msgstr "从远程仓库（<仓库>）提取归档文件"
#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478
msgid "command"
#: bundle.c:139
msgid "Repository lacks these prerequisite commits:"
-msgstr "版本库缺少这些必备的提交："
+msgstr "仓库中缺少这些必备的提交："
#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:94 builtin/checkout.c:383 builtin/checkout.c:594
-#: builtin/clone.c:654
+#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587
+#: builtin/clone.c:647
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: merge-recursive.c:765
#, c-format
msgid "blob expected for %s '%s'"
-msgstr "%s '%s' 应为数据（blob）对象"
+msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:788 builtin/clone.c:313
+#: merge-recursive.c:788 builtin/clone.c:306
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
#: merge-recursive.c:1527
#, c-format
msgid "object %s is not a blob"
-msgstr "对象 %s 不是一个数据（blob）对象"
+msgstr "对象 %s 不是一个数据对象"
#: merge-recursive.c:1575
msgid "modify"
#: pathspec.c:133
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
-msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
+msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
#: pathspec.c:143
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
-msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
+msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
#: pathspec.c:177
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "路径规则包含无效的神奇前缀"
+msgstr "路径规格包含无效的神奇前缀"
#: pathspec.c:183
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
+msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
#: pathspec.c:187
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
-msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
+msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
#: pathspec.c:205
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
+msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
#: pathspec.c:230
#, c-format
#: pathspec.c:241
#, c-format
msgid "%s: '%s' is outside repository"
-msgstr "%s：'%s' 在版本库之外"
+msgstr "%s：'%s' 在仓库之外"
#: pathspec.c:291
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
+msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
#: pathspec.c:353
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
-msgstr "%s：路径规则神奇前缀不被此命令支持：%s"
+msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
#: pathspec.c:432
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "路径规则 '%s' 位于符号链接中"
+msgstr "路径规格 '%s' 位于符号链接中"
#: pathspec.c:441
msgid ""
#: remote.c:1782
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
-msgstr "å\90\91 '%s' æ\8e¨é\80\81å¼\95ç\94¨è¡¨è¾¾å¼\8f未包含 '%s'"
+msgstr "å\90\91 '%s' æ\8e¨é\80\81å¼\95ç\94¨è§\84æ ¼未包含 '%s'"
#: remote.c:1795
msgid "push has no destination (push.default is 'nothing')"
#: urlmatch.c:172
msgid "missing host and scheme is not 'file:'"
-msgstr "缺失主机名且URL方案不是 'file:'"
+msgstr "缺失主机名且 URL 方案不是 'file:'"
#: urlmatch.c:189
msgid "a 'file:' URL may not have a port number"
#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " （使用 \"git reset %s <文件>...\" 撤出暂存区）"
+msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
-msgstr " （使用 \"git rm --cached <文件>...\" 撤出暂存区）"
+msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
#: wt-status.c:183
msgid "behind "
msgstr "落后 "
-#: compat/precompose_utf8.c:55 builtin/clone.c:352
+#: compat/precompose_utf8.c:55 builtin/clone.c:345
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
#: builtin/add.c:22
msgid "git add [<options>] [--] <pathspec>..."
-msgstr "git add [<选项>] [--] <路径规则>..."
+msgstr "git add [<选项>] [--] <路径规格>..."
#: builtin/add.c:65
#, c-format
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:253 builtin/checkout.c:1364 builtin/reset.c:286
+#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: builtin/apply.c:3909 builtin/checkout.c:237 builtin/reset.c:135
+#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: builtin/apply.c:4555
msgid "attempt three-way merge if a patch does not apply"
-msgstr "如果一个补丁不能应用则尝试三路合并"
+msgstr "如果一个补丁不能应用则尝试三方合并"
#: builtin/apply.c:4557
msgid "build a temporary index based on embedded index information"
#: builtin/apply.c:4610
msgid "--3way outside a repository"
-msgstr "--3way 在一个版本库之外"
+msgstr "--3way 在一个仓库之外"
#: builtin/apply.c:4618
msgid "--index outside a repository"
-msgstr "--index 在一个版本库之外"
+msgstr "--index 在一个仓库之外"
#: builtin/apply.c:4621
msgid "--cached outside a repository"
-msgstr "--cached 在一个版本库之外"
+msgstr "--cached 在一个仓库之外"
#: builtin/apply.c:4640
#, c-format
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
-msgstr "git archive：未提供远程URL"
+msgstr "git archive：未提供远程 URL"
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive：应为ACK/NACK，却得到EOF"
+msgstr "git archive：应为 ACK/NACK，却得到 EOF"
#: builtin/archive.c:61
#, c-format
#: builtin/blame.c:2511
msgid "Show long commit SHA1 (Default: off)"
-msgstr "显示长的SHA1提交号（默认：关闭）"
+msgstr "显示长的 SHA1 提交号（默认：关闭）"
#: builtin/blame.c:2512
msgid "Suppress author name and timestamp (Default: off)"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: builtin/branch.c:878 builtin/clone.c:629
+#: builtin/branch.c:878 builtin/clone.c:622
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
#: builtin/bundle.c:64
msgid "Need a repository to create a bundle."
-msgstr "需要一个版本库来创建包。"
+msgstr "需要一个仓库来创建包。"
#: builtin/bundle.c:68
msgid "Need a repository to unbundle."
-msgstr "需要一个版本库来解包。"
+msgstr "需要一个仓库来解包。"
#: builtin/cat-file.c:369
msgid ""
#: builtin/cat-file.c:414
msgid "for blob objects, run textconv on object's content"
-msgstr "对于数据（blob）对象，对其内容执行 textconv"
+msgstr "对于数据对象，对其内容执行 textconv"
#: builtin/cat-file.c:416
msgid "allow -s and -t to work with broken/corrupt objects"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1345 builtin/gc.c:279
+#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279
msgid "suppress progress reporting"
msgstr "不显示进度报告"
#: builtin/checkout-index.c:205
msgid "when creating files, prepend <string>"
-msgstr "在创建文件时，在前面加上<字符串>"
+msgstr "在创建文件时，在前面加上 <字符串>"
#: builtin/checkout-index.c:208
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:24
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:25
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:138 builtin/checkout.c:171
+#: builtin/checkout.c:134 builtin/checkout.c:167
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:140 builtin/checkout.c:173
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:156
+#: builtin/checkout.c:152
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:200
+#: builtin/checkout.c:196
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:217
+#: builtin/checkout.c:213
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:234
+#: builtin/checkout.c:230
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261
-#: builtin/checkout.c:264 builtin/checkout.c:277
+#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257
+#: builtin/checkout.c:260
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:267 builtin/checkout.c:270
+#: builtin/checkout.c:263 builtin/checkout.c:266
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:273
+#: builtin/checkout.c:269
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:287 builtin/checkout.c:481
+#: builtin/checkout.c:280 builtin/checkout.c:474
msgid "corrupt index file"
msgstr "损坏的索引文件"
-#: builtin/checkout.c:347 builtin/checkout.c:354
+#: builtin/checkout.c:340 builtin/checkout.c:347
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:503
+#: builtin/checkout.c:496
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:634
+#: builtin/checkout.c:627
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "不能对 '%s' 执行 reflog 操作\n"
-#: builtin/checkout.c:670
+#: builtin/checkout.c:663
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:670
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:673
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:677
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1285
+#: builtin/checkout.c:679 builtin/checkout.c:1134
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:681
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:740
+#: builtin/checkout.c:733
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:746
+#: builtin/checkout.c:739
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"\n"
"%s\n"
-#: builtin/checkout.c:765
+#: builtin/checkout.c:758
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:801
+#: builtin/checkout.c:794
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:805
+#: builtin/checkout.c:798
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:832 builtin/checkout.c:1280
+#: builtin/checkout.c:825 builtin/checkout.c:1129
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:893
-msgid "no branch specified"
-msgstr "未指定分支名"
-
-#: builtin/checkout.c:895
-#, c-format
-msgid "'%s' already exists"
-msgstr "'%s' 已经存在"
-
-#: builtin/checkout.c:910 builtin/checkout.c:937 builtin/clone.c:842
-#: builtin/clone.c:853
-#, c-format
-msgid "could not create leading directories of '%s'"
-msgstr "不能为 '%s' 创建先导目录"
-
-#: builtin/checkout.c:924
-#, c-format
-msgid "could not create directory of '%s'"
-msgstr "不能创建目录 '%s'"
-
-#: builtin/checkout.c:960
-#, c-format
-msgid "Enter %s (identifier %s)"
-msgstr "输入 %s （标识符 %s）"
-
-#: builtin/checkout.c:1070
+#: builtin/checkout.c:931
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1036
#, c-format
msgid "only one reference expected, %d given."
msgstr "只要一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1215
+#: builtin/checkout.c:1075
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1255
+#: builtin/checkout.c:1104
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1294
+#: builtin/checkout.c:1143
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1297 builtin/checkout.c:1301
+#: builtin/checkout.c:1146 builtin/checkout.c:1150
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1305 builtin/checkout.c:1308 builtin/checkout.c:1313
-#: builtin/checkout.c:1316
+#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162
+#: builtin/checkout.c:1165
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1321
+#: builtin/checkout.c:1170
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1346 builtin/checkout.c:1348 builtin/clone.c:83
-#: builtin/remote.c:159 builtin/remote.c:161
+#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83
+#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282
+#: builtin/worktree.c:284
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1347
+#: builtin/checkout.c:1204
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1349
+#: builtin/checkout.c:1206
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1350
+#: builtin/checkout.c:1207
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1351
+#: builtin/checkout.c:1208
msgid "detach the HEAD at named commit"
msgstr "成为指向该提交的分离头指针"
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1209
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1354
+#: builtin/checkout.c:1211
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1354
+#: builtin/checkout.c:1211
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1355
+#: builtin/checkout.c:1212
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1357
+#: builtin/checkout.c:1214
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1359
+#: builtin/checkout.c:1216
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1217
msgid "perform a 3-way merge with the new branch"
-msgstr "和新的分支执行三路合并"
+msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1361 builtin/merge.c:227
+#: builtin/checkout.c:1218 builtin/merge.c:227
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1362 builtin/log.c:1239 parse-options.h:244
+#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1363
+#: builtin/checkout.c:1220
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1223
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1225
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1370
-msgid "check a branch out in a separate working directory"
-msgstr "检出一个分支到单独的工作目录"
-
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1227
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1406
+#: builtin/checkout.c:1252
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1423
+#: builtin/checkout.c:1269
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1274
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1464
+#: builtin/checkout.c:1310
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1317
#, c-format
msgid ""
"Cannot update paths and switch to branch '%s' at the same time.\n"
"不能同时更新路径并切换到分支'%s'。\n"
"您是想要检出 '%s' 但其未能解析为提交么？"
-#: builtin/checkout.c:1476
+#: builtin/checkout.c:1322
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1480
+#: builtin/checkout.c:1326
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
#: builtin/clean.c:32
#, c-format
msgid "Skipping repository %s\n"
-msgstr "忽略版本库 %s\n"
+msgstr "忽略仓库 %s\n"
#: builtin/clean.c:33
#, c-format
msgid "Would skip repository %s\n"
-msgstr "将忽略版本库 %s\n"
+msgstr "将忽略仓库 %s\n"
#: builtin/clean.c:34
#, c-format
#: builtin/clean.c:880
msgid "add <pattern> to ignore rules"
-msgstr "添加<模式>到忽略规则"
+msgstr "添加 <模式> 到忽略规则"
#: builtin/clean.c:881
msgid "remove ignored files, too"
#: builtin/clone.c:37
msgid "git clone [<options>] [--] <repo> [<dir>]"
-msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
+msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224
#: builtin/push.c:523
#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503
msgid "create a bare repository"
-msgstr "创建一个纯版本库"
+msgstr "创建一个纯仓库"
#: builtin/clone.c:64
msgid "create a mirror repository (implies bare)"
-msgstr "创建一个镜像版本库（也是纯版本库）"
+msgstr "创建一个镜像仓库（也是纯仓库）"
#: builtin/clone.c:66
msgid "to clone from a local repository"
-msgstr "从本地版本库克隆"
+msgstr "从本地仓库克隆"
#: builtin/clone.c:68
msgid "don't use local hardlinks, always copy"
#: builtin/clone.c:70
msgid "setup as shared repository"
-msgstr "设置为共享版本库"
+msgstr "设置为共享仓库"
#: builtin/clone.c:72 builtin/clone.c:74
msgid "initialize submodules in the clone"
#: builtin/clone.c:78
msgid "reference repository"
-msgstr "参考版本库"
+msgstr "参考仓库"
#: builtin/clone.c:80
msgid "use --reference only while cloning"
-msgstr "仅在克隆时参考 --reference 指向的本地版本库"
+msgstr "仅在克隆时参考 --reference 指向的本地仓库"
#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44
msgid "name"
#: builtin/clone.c:82
msgid "use <name> instead of 'origin' to track upstream"
-msgstr "使用<名称>而不是 'origin' 去跟踪上游"
+msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
#: builtin/clone.c:84
msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "检出<分支>而不是远程HEAD"
+msgstr "检出 <分支> 而不是远程 HEAD"
#: builtin/clone.c:86
msgid "path to git-upload-pack on the remote"
#: builtin/clone.c:94
msgid "set config inside the new repository"
-msgstr "在新版本库中设置配置信息"
+msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:247
+#: builtin/clone.c:240
#, c-format
msgid "reference repository '%s' is not a local repository."
-msgstr "参考版本库 '%s' 不是一个本地版本库。"
+msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: builtin/clone.c:251
+#: builtin/clone.c:244
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "参考版本库 '%s' 是一个浅克隆"
+msgstr "参考仓库 '%s' 是一个浅克隆"
-#: builtin/clone.c:254
+#: builtin/clone.c:247
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "参考版本库 '%s' 已被嫁接"
+msgstr "参考仓库 '%s' 已被嫁接"
-#: builtin/clone.c:317
+#: builtin/clone.c:310
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/clone.c:319 builtin/diff.c:84
+#: builtin/clone.c:312 builtin/diff.c:84
#, c-format
msgid "failed to stat '%s'"
msgstr "无法枚举 '%s' 状态"
-#: builtin/clone.c:321
+#: builtin/clone.c:314
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:335
+#: builtin/clone.c:328
#, c-format
msgid "failed to stat %s\n"
msgstr "无法枚举 %s 状态\n"
-#: builtin/clone.c:357
+#: builtin/clone.c:350
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:361
+#: builtin/clone.c:354
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:384 builtin/clone.c:558
+#: builtin/clone.c:377 builtin/clone.c:551
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:396
+#: builtin/clone.c:389
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:473
+#: builtin/clone.c:466
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:553
+#: builtin/clone.c:546
#, c-format
msgid "Checking connectivity... "
msgstr "检查连接... "
-#: builtin/clone.c:556
+#: builtin/clone.c:549
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:620
+#: builtin/clone.c:613
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:651
+#: builtin/clone.c:644
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:738
+#: builtin/clone.c:731
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:740
+#: builtin/clone.c:733
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:770
+#: builtin/clone.c:763
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:774
+#: builtin/clone.c:767
msgid "You must specify a repository to clone."
-msgstr "您必须指定一个版本库来克隆。"
+msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:785
+#: builtin/clone.c:778
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:788
+#: builtin/clone.c:781
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:801
+#: builtin/clone.c:794
#, c-format
msgid "repository '%s' does not exist"
-msgstr "版本库 '%s' 不存在"
+msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:807 builtin/fetch.c:1160
+#: builtin/clone.c:800 builtin/fetch.c:1160
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:817
+#: builtin/clone.c:810
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:827
+#: builtin/clone.c:820
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:845
+#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193
+#: builtin/worktree.c:220
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "不能为 '%s' 创建先导目录"
+
+#: builtin/clone.c:838
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:863
+#: builtin/clone.c:856
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "克隆到纯版本库 '%s'...\n"
+msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:865
+#: builtin/clone.c:858
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:890
+#: builtin/clone.c:883
msgid "--dissociate given, but there is no --reference"
msgstr "提供了参数 --dissociate，但未提供 --reference"
-#: builtin/clone.c:907
+#: builtin/clone.c:900
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
-#: builtin/clone.c:910
+#: builtin/clone.c:903
msgid "source repository is shallow, ignoring --local"
-msgstr "源版本库是浅克隆，忽略 --local"
+msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:915
+#: builtin/clone.c:908
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:919
+#: builtin/clone.c:912
#, c-format
msgid "Don't know how to clone %s"
msgstr "不知道如何克隆 %s"
-#: builtin/clone.c:968 builtin/clone.c:976
+#: builtin/clone.c:961 builtin/clone.c:969
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:979
+#: builtin/clone.c:972
msgid "You appear to have cloned an empty repository."
-msgstr "您似乎克隆了一个空版本库。"
+msgstr "您似乎克隆了一个空仓库。"
#: builtin/column.c:9
msgid "git column [<options>]"
#: builtin/commit.c:37
msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<选项>] [--] <路径规则>..."
+msgstr "git commit [<选项>] [--] <路径规格>..."
#: builtin/commit.c:42
msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<选项>] [--] <路径规则>..."
+msgstr "git status [<选项>] [--] <路径规格>..."
#: builtin/commit.c:47
msgid ""
#: builtin/commit.c:1195
msgid "Clever... amending the last one with dirty index."
-msgstr "聪明... 在索引不干净下修补最后的提交。"
+msgstr "聪明... 用脏索引修补最后一个提交。"
#: builtin/commit.c:1197
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
#: builtin/commit.c:1334 builtin/commit.c:1612
msgid "terminate entries with NUL"
-msgstr "条目以NUL字符结尾"
+msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980
#: builtin/fast-export.c:983 builtin/tag.c:603
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."
msgstr ""
-"版本库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
+"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满\n"
"或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
#: builtin/config.c:8
#: builtin/config.c:56
msgid "use repository config file"
-msgstr "使用版本库级配置文件"
+msgstr "使用仓库级配置文件"
#: builtin/config.c:57
msgid "use given config file"
#: builtin/config.c:58
msgid "blob-id"
-msgstr "数据对象ID"
+msgstr "数据对象 ID"
#: builtin/config.c:58
msgid "read config from given blob object"
#: builtin/config.c:80
msgid "terminate values with NUL byte"
-msgstr "终止值是NUL字节"
+msgstr "终止值是 NUL 字节"
#: builtin/config.c:81
msgid "respect include directives on lookup"
#: builtin/config.c:316
msgid "unable to parse default color value"
-msgstr "不能解析缺省的颜色值"
+msgstr "不能解析默认颜色值"
#: builtin/config.c:457
#, c-format
#: builtin/describe.c:217
#, c-format
msgid "annotated tag %s not available"
-msgstr "注释 tag %s 无效"
+msgstr "附注标签 %s 无效"
#: builtin/describe.c:221
#, c-format
msgid "annotated tag %s has no embedded name"
-msgstr "注释 tag %s 没有嵌入名称"
+msgstr "附注标签 %s 没有嵌入名称"
#: builtin/describe.c:223
#, c-format
msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' 的确是在 '%s'"
+msgstr "标签 '%s' 的确是在 '%s'"
#: builtin/describe.c:250 builtin/log.c:452
#, c-format
#: builtin/describe.c:270
#, c-format
msgid "no tag exactly matches '%s'"
-msgstr "没有 tag 准确匹配 '%s'"
+msgstr "没有标签准确匹配 '%s'"
#: builtin/describe.c:272
#, c-format
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-"没有注释 tag 能描述 '%s'。\n"
-"然而，有非注释 tag：尝试 --tags。"
+"没有附注标签能描述 '%s'。\n"
+"然而，存在未附注标签：尝试 --tags。"
#: builtin/describe.c:350
#, c-format
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-"没æ\9c\89注é\87\8a tag 能描述 '%s'。\n"
-"尝试 --always，或者创建一些 tag。"
+"没æ\9c\89æ \87ç¾能描述 '%s'。\n"
+"尝试 --always，或者创建一些标签。"
#: builtin/describe.c:371
#, c-format
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-"发现多于 %i 个 tag，列出最近的 %i 个\n"
+"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
#: builtin/describe.c:396
msgid "find the tag that comes after the commit"
-msgstr "寻找提交之后的 tag（用于描述提交）"
+msgstr "寻找该提交之后的标签"
#: builtin/describe.c:397
msgid "debug search strategy on stderr"
#: builtin/describe.c:399
msgid "use any tag, even unannotated"
-msgstr "使用任意 tag，即使未带注解"
+msgstr "使用任意标签，即使未附带注释"
#: builtin/describe.c:400
msgid "always use long format"
#: builtin/describe.c:406
msgid "consider <n> most recent tags (default: 10)"
-msgstr "考虑最近 <n> 个 tags（默认：10）"
+msgstr "考虑最近 <n> 个标签（默认：10）"
#: builtin/describe.c:408
msgid "only consider tags matching <pattern>"
-msgstr "只考虑匹配 <模式> 的 tags"
+msgstr "只考虑匹配 <模式> 的标签"
#: builtin/describe.c:410 builtin/name-rev.c:318
msgid "show abbreviated commit object as fallback"
#: builtin/describe.c:412
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"
+msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
#: builtin/describe.c:430
msgid "--long is incompatible with --abbrev=0"
#: builtin/diff.c:358
msgid "Not a git repository"
-msgstr "不是一个 git 版本库"
+msgstr "不是一个 git 仓库"
#: builtin/diff.c:401
#, c-format
#: builtin/diff.c:410
#, c-format
msgid "more than two blobs given: '%s'"
-msgstr "提供了超过两个数据（blob）对象：'%s'"
+msgstr "提供了超过两个数据对象：'%s'"
#: builtin/diff.c:417
#, c-format
#: builtin/fast-export.c:981
msgid "select handling of signed tags"
-msgstr "选择如何处理签名 tags"
+msgstr "选择如何处理签名标签"
#: builtin/fast-export.c:984
msgid "select handling of tags that tag filtered objects"
-msgstr "选择当 tag 指向被过滤时 tags 的处理方式"
+msgstr "选择当标签指向被过滤对象时该标签的处理方式"
#: builtin/fast-export.c:987
msgid "Dump marks to this file"
#: builtin/fast-export.c:991
msgid "Fake a tagger when tags lack one"
-msgstr "当 tags 缺少标记者字段时，假装提供一个"
+msgstr "当标签缺少标记者字段时，假装提供一个"
#: builtin/fast-export.c:993
msgid "Output full tree for each commit"
#: builtin/fast-export.c:997
msgid "refspec"
-msgstr "å¼\95ç\94¨è¡¨è¾¾å¼\8f"
+msgstr "å¼\95ç\94¨è§\84æ ¼"
#: builtin/fast-export.c:998
msgid "Apply refspec to exported refs"
-msgstr "对导å\87ºç\9a\84å¼\95ç\94¨åº\94ç\94¨å¼\95ç\94¨è¡¨è¾¾å¼\8f"
+msgstr "对导å\87ºç\9a\84å¼\95ç\94¨åº\94ç\94¨å¼\95ç\94¨è§\84æ ¼"
#: builtin/fast-export.c:999
msgid "anonymize output"
#: builtin/fetch.c:19
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
-msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
+msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/fetch.c:20
msgid "git fetch [<options>] <group>"
#: builtin/fetch.c:21
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
-msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
+msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
#: builtin/fetch.c:22
msgid "git fetch --all [<options>]"
#: builtin/fetch.c:98
msgid "fetch all tags and associated objects"
-msgstr "抓取所有的 tags 和关联对象"
+msgstr "抓取所有的标签和关联对象"
#: builtin/fetch.c:100
msgid "do not fetch all tags (--no-tags)"
-msgstr "不抓取任何 tags (--no-tags)"
+msgstr "不抓取任何标签(--no-tags)"
#: builtin/fetch.c:102
msgid "prune remote-tracking branches no longer on remote"
#: builtin/fetch.c:115
msgid "convert to a complete repository"
-msgstr "转换为一个完整的版本库"
+msgstr "转换为一个完整的仓库"
#: builtin/fetch.c:117 builtin/log.c:1208
msgid "dir"
#: builtin/fetch.c:488
msgid "[tag update]"
-msgstr "[tag更新]"
+msgstr "[标签更新]"
# 译者：注意保持前导空格
#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543
#: builtin/fetch.c:508
msgid "[new tag]"
-msgstr "[新tag]"
+msgstr "[新标签]"
#: builtin/fetch.c:511
msgid "[new branch]"
#: builtin/fetch.c:822
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒绝获取到非纯版本库的当前分支 %s"
+msgstr "拒绝获取到非纯仓库的当前分支 %s"
#: builtin/fetch.c:841
#, c-format
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
-msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
+msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
#: builtin/fetch.c:1106
msgid "You need to specify a tag name."
-msgstr "您需要指定一个 tag 名称。"
+msgstr "您需要指定一个标签名称。"
#: builtin/fetch.c:1148
msgid "--depth and --unshallow cannot be used together"
#: builtin/fetch.c:1150
msgid "--unshallow on a complete repository does not make sense"
-msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"
+msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
#: builtin/fetch.c:1173
msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all 不能带一个版本库参数"
+msgstr "fetch --all 不能带一个仓库参数"
#: builtin/fetch.c:1175
msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all 带引用规则没有任何意义"
+msgstr "fetch --all 带引用规格没有任何意义"
#: builtin/fetch.c:1186
#, c-format
#: builtin/fetch.c:1194
msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "获取组并指定引用规则没有意义"
+msgstr "获取组并指定引用规格没有意义"
#: builtin/fmt-merge-msg.c:13
msgid ""
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/fsck.c:147 builtin/prune.c:236
+#: builtin/fsck.c:147 builtin/prune.c:137
msgid "Checking connectivity"
msgstr "检查连接中"
#: builtin/fsck.c:619
msgid "report tags"
-msgstr "报告 tags"
+msgstr "报告标签"
#: builtin/fsck.c:620
msgid "report root nodes"
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:627 builtin/prune.c:198
+#: builtin/fsck.c:627 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
#: builtin/gc.c:327
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
-msgstr "自动在后台执行版本库打包以求最佳性能。\n"
+msgstr "自动在后台执行仓库打包以求最佳性能。\n"
#: builtin/gc.c:329
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "自动打包版本库以求最佳性能。\n"
+msgstr "自动打包仓库以求最佳性能。\n"
#: builtin/gc.c:330
#, c-format
#: builtin/index-pack.c:825
#, c-format
msgid "invalid blob object %s"
-msgstr "无效的数据（blob）对象 %s"
+msgstr "无效的数据对象 %s"
#: builtin/index-pack.c:839
#, c-format
#: builtin/index-pack.c:1707 builtin/index-pack.c:1716
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包名 '%s' 没有以 '.pack' 结尾"
+msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
#: builtin/index-pack.c:1724
msgid "--verify with no packfile name given"
-msgstr "--verify 没有提供包名参数"
+msgstr "--verify 没有提供包文件名参数"
#: builtin/init-db.c:35
#, c-format
#: builtin/init-db.c:433
#, c-format
msgid "%s%s Git repository in %s%s\n"
-msgstr "%s%s Git 版本库于 %s%s\n"
+msgstr "%s%s Git 仓库于 %s%s\n"
#: builtin/init-db.c:434
msgid "Reinitialized existing"
#: builtin/init-db.c:506
msgid "specify that the git repository is to be shared amongst several users"
-msgstr "指定 git 版本库是多个用户之间共享的"
+msgstr "指定 git 仓库是多个用户之间共享的"
#: builtin/init-db.c:508 builtin/prune-packed.c:57 builtin/repack.c:171
msgid "be quiet"
#: builtin/log.c:1228
msgid "set From address to <ident> (or committer ident if absent)"
-msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者ID做为地址）"
+msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
#: builtin/log.c:1230
msgid "message-id"
#: builtin/ls-tree.c:134
msgid "terminate entries with NUL byte"
-msgstr "条目以NUL字符终止"
+msgstr "条目以 NUL 字符终止"
#: builtin/ls-tree.c:135
msgid "include object size"
#: builtin/merge.c:937
msgid "No remote for the current branch."
-msgstr "当前分支没有对应的远程版本库。"
+msgstr "当前分支没有对应的远程仓库。"
#: builtin/merge.c:939
msgid "No default upstream defined for the current branch."
#: builtin/merge-base.c:222
msgid "find where <commit> forked from reflog of <ref>"
-msgstr "æ\9f¥æ\89¾ <æ\8f\90交> ä»\8e<å¼\95ç\94¨>æ\97¥å¿\97ç\9a\84ä½\95å¤\84å\88\86æ\94¯ç\9a\84"
+msgstr "æ ¹æ\8d®å¼\95ç\94¨æ\97¥å¿\97 <å¼\95ç\94¨> æ\9f¥æ\89¾ <æ\8f\90交> ç\9a\84æ´¾ç\94\9få¤\84"
#: builtin/merge-file.c:8
msgid ""
#: builtin/mv.c:71
msgid "Please stage your changes to .gitmodules or stash them to proceed"
-msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"
+msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
#: builtin/mv.c:89
#, c-format
#: builtin/name-rev.c:310
msgid "only use tags to name the commits"
-msgstr "只使用 tags 来命名提交"
+msgstr "只使用标签来命名提交"
#: builtin/name-rev.c:312
msgid "only use refs matching <pattern>"
#: builtin/name-rev.c:322
msgid "dereference tags in the input (internal use)"
-msgstr "反向解析输入中的 tags（内部使用）"
+msgstr "反向解析输入中的标签（内部使用）"
#: builtin/notes.c:24
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
#: builtin/pack-objects.c:2633
msgid "ignore borrowed objects from alternate object store"
-msgstr "忽略从替代对象存储里借用对象"
+msgstr "忽略从备用对象存储里借用对象"
#: builtin/pack-objects.c:2635
msgid "ignore packed objects"
#: builtin/pack-objects.c:2669
msgid "include tag objects that refer to objects to be packed"
-msgstr "包括引用了打包对象的 tag"
+msgstr "包括那些引用了待打包对象的标签对象"
#: builtin/pack-objects.c:2671
msgid "keep unreachable objects"
#: builtin/pack-objects.c:2678
msgid "create packs suitable for shallow fetches"
-msgstr "创建适合浅克隆版本库获取的包"
+msgstr "创建适合浅克隆仓库获取的包"
#: builtin/pack-objects.c:2680
msgid "ignore packs that have companion .keep file"
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
-#: builtin/prune.c:12
+#: builtin/prune.c:11
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
-#: builtin/prune.c:86
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "删除工作区/%s：不是一个有效的目录"
-
-#: builtin/prune.c:92
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "删除 worktrees/%s：gitdir 文件不存在"
-
-#: builtin/prune.c:97
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-
-#: builtin/prune.c:108
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-
-#: builtin/prune.c:124
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-
-#: builtin/prune.c:159
-#, c-format
-msgid "failed to remove: %s"
-msgstr "无法删除：%s"
-
-#: builtin/prune.c:196
+#: builtin/prune.c:105 builtin/worktree.c:112
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/prune.c:197
+#: builtin/prune.c:106 builtin/worktree.c:113
msgid "report pruned objects"
msgstr "报告清除的对象"
-#: builtin/prune.c:199
-msgid "prune .git/worktrees"
-msgstr "清理 .git/worktrees"
-
-#: builtin/prune.c:201
+#: builtin/prune.c:109 builtin/worktree.c:115
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
-#: builtin/prune.c:216
-msgid "--worktrees does not take extra arguments"
-msgstr "--worktrees 没有附加参数"
-
#: builtin/push.c:14
msgid "git push [<options>] [<repository> [<refspec>...]]"
-msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"
+msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/push.c:85
msgid "tag shorthand without <tag>"
-msgstr "tag 后面未提供 <标签> 参数"
+msgstr "标签后面未提供 <标签> 参数"
#: builtin/push.c:95
msgid "--delete only accepts plain target ref names"
"当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n"
"本地分支。\n"
"\n"
-"从 Git 2.0 开始，Git 缺省采用更为保守的 'simple' 模式，只推送当前\n"
+"从 Git 2.0 开始，Git 默认采用更为保守的 'simple' 模式，只推送当前\n"
"分支到远程关联的同名分支，即 'git push' 推送当前分支。\n"
"\n"
"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
#: builtin/push.c:272
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。"
+msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
#: builtin/push.c:279
msgid ""
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
-"一个版本库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
+"更新被拒绝，因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
+"一个仓库已向该引用进行了推送。再次推送前，您可能需要先整合远程变更\n"
"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
#: builtin/push.c:298
msgid "Updates were rejected because the tag already exists in the remote."
-msgstr "更新被拒绝因为 tag 在远程已经存在。"
+msgstr "更新被拒绝，因为该标签在远程已经存在。"
#: builtin/push.c:301
msgid ""
#: builtin/push.c:394
#, c-format
msgid "bad repository '%s'"
-msgstr "坏的版本库 '%s'"
+msgstr "坏的仓库 '%s'"
#: builtin/push.c:395
msgid ""
" git push <name>\n"
msgstr ""
"没有配置推送目标。\n"
-"或通过命令行指定URL，或用下面命令配置一个远程版本库\n"
+"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n"
"\n"
" git remote add <名称> <地址>\n"
"\n"
-"然后使用该远程版本库名执行推送\n"
+"然后使用该远程仓库名执行推送\n"
"\n"
" git push <名称>\n"
#: builtin/push.c:411
msgid "--all can't be combined with refspecs"
-msgstr "--all 不能和引用规则同时使用"
+msgstr "--all 不能和引用规格同时使用"
#: builtin/push.c:416
msgid "--mirror and --tags are incompatible"
#: builtin/push.c:417
msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror 不能和引用规则同时使用"
+msgstr "--mirror 不能和引用规格同时使用"
#: builtin/push.c:422
msgid "--all and --mirror are incompatible"
#: builtin/push.c:502
msgid "repository"
-msgstr "版本库"
+msgstr "仓库"
#: builtin/push.c:503
msgid "push all refs"
#: builtin/push.c:507
msgid "push tags (can't be used with --all or --mirror)"
-msgstr "推送 tags（不能使用 --all or --mirror）"
+msgstr "推送标签（不能使用 --all or --mirror）"
#: builtin/push.c:510
msgid "force updates"
#: builtin/push.c:527
msgid "push missing but relevant tags"
-msgstr "推送缺失的有关的 tags"
+msgstr "推送缺失但有关的标签"
#: builtin/push.c:529
msgid "GPG sign the push"
#: builtin/read-tree.c:119
msgid "3-way merge if no file level merging required"
-msgstr "如果没有文件级合并需要，执行三路合并"
+msgstr "如果没有文件级合并需要，执行三方合并"
#: builtin/read-tree.c:121
msgid "3-way merge in presence of adds and removes"
-msgstr "存在添加和删除时，也执行三路合并"
+msgstr "存在添加和删除时，也执行三方合并"
#: builtin/read-tree.c:123
msgid "same as -m, but discard unmerged entries"
#: builtin/remote.c:155
msgid "import all tags and associated objects when fetching"
-msgstr "抓取时导入所有的 tags 和关联对象"
+msgstr "抓取时导入所有的标签和关联对象"
#: builtin/remote.c:158
msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "或不抓取任何 tag（--no-tags）"
+msgstr "或不抓取任何标签（--no-tags）"
#: builtin/remote.c:160
msgid "branch(es) to track"
#: builtin/remote.c:335
#, c-format
msgid "Could not get fetch map for refspec %s"
-msgstr "无法得到引用规则 %s 的获取列表"
+msgstr "无法得到引用规格 %s 的获取列表"
#: builtin/remote.c:436 builtin/remote.c:444
msgid "(matching)"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"没有更新非默认的获取引用规则\n"
+"没有更新非默认的获取引用规格\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197
#, c-format
msgid " HEAD branch: %s"
-msgstr " HEAD分支：%s"
+msgstr " HEAD 分支：%s"
#: builtin/remote.c:1199
#, c-format
#: builtin/remote.c:1565
#, c-format
msgid "Invalid old URL pattern: %s"
-msgstr "无效的旧URL匹配模版：%s"
+msgstr "无效的旧 URL 匹配模版：%s"
#: builtin/remote.c:1573
#, c-format
msgid "No such URL found: %s"
-msgstr "未找到此URL：%s"
+msgstr "未找到此 URL：%s"
#: builtin/remote.c:1575
msgid "Will not delete all non-push URLs"
-msgstr "将不会删除所有非推送URL地址"
+msgstr "将不会删除所有非推送 URL 地址"
#: builtin/remote.c:1589
msgid "be verbose; must be placed before a subcommand"
#: builtin/repack.c:185
msgid "maximum size of each packfile"
-msgstr "每个包的最大尺寸"
+msgstr "每个包文件的最大尺寸"
#: builtin/repack.c:187
msgid "repack objects in packs marked with .keep"
#: builtin/replace.c:355
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "提交 '%s' 中损坏的 mergetag"
+msgstr "提交 '%s' 中含有损坏的合并标签"
#: builtin/replace.c:357
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "提交 '%s' 中非法的 mergetag"
+msgstr "提交 '%s' 中含有非法的合并标签"
#: builtin/replace.c:368
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
-msgstr "原始提交 '%s' 包含已经丢弃的 mergetag '%s'，使用 --edit 代替 --graft"
+msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
#: builtin/replace.c:401
#, c-format
#: builtin/reset.c:343
#, c-format
msgid "%s reset is not allowed in a bare repository"
-msgstr "不能对纯版本库进行%s重置"
+msgstr "不能对纯仓库进行%s重置"
#: builtin/reset.c:347
msgid "-N can only be used with --mixed"
#: builtin/reset.c:364
msgid "Unstaged changes after reset:"
-msgstr "重置后撤出暂存区的变更："
+msgstr "重置后取消暂存的变更："
#: builtin/reset.c:370
#, c-format
#: builtin/rm.c:239
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
-msgstr[0] "如下文件相对索引区的内容有修改"
-msgstr[1] "如下文件相对索引区的内容有修改"
+msgstr[0] "下列文件索引中有变更"
+msgstr[1] "下列文件索引中有变更"
#: builtin/rm.c:243 builtin/rm.c:254
msgid ""
#: builtin/show-ref.c:170
msgid "only show tags (can be combined with heads)"
-msgstr "只显示 tags（可以和头共用）"
+msgstr "只显示标签（可以和头共用）"
#: builtin/show-ref.c:171
msgid "only show heads (can be combined with tags)"
-msgstr "只显示头（可以和 tags 共用）"
+msgstr "只显示头（可以和标签共用）"
#: builtin/show-ref.c:172
msgid "stricter reference checking, requires exact ref path"
#: builtin/show-ref.c:179
msgid "dereference tags into object IDs"
-msgstr "转换 tags 到对象ID"
+msgstr "转换标签到对象 ID"
#: builtin/show-ref.c:181
msgid "only show SHA1 hash using <n> digits"
#: builtin/show-ref.c:187
msgid "show refs from stdin that aren't in local repository"
-msgstr "显示从标准输入中读入的不在本地版本库中的引用"
+msgstr "显示从标准输入中读入的不在本地仓库中的引用"
#: builtin/symbolic-ref.c:7
msgid "git symbolic-ref [<options>] <name> [<ref>]"
#: builtin/tag.c:301
#, c-format
msgid "tag name too long: %.*s..."
-msgstr "tag 名字太长：%.*s..."
+msgstr "标签名称太长：%.*s..."
#: builtin/tag.c:306
#, c-format
msgid "tag '%s' not found."
-msgstr "tag '%s' 未发现。"
+msgstr "未发现标签 '%s'。"
#: builtin/tag.c:321
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
-msgstr "已删除 tag '%s'（曾为 %s）\n"
+msgstr "已删除标签 '%s'（曾为 %s）\n"
#: builtin/tag.c:333
#, c-format
msgid "could not verify the tag '%s'"
-msgstr "不能校验 tag '%s'"
+msgstr "不能校验该标签 '%s'"
#: builtin/tag.c:343
#, c-format
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"输入一个 tag 说明：\n"
+"输入一个标签说明：\n"
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
"want to.\n"
msgstr ""
"\n"
-"输入一个 tag 说明：\n"
+"输入一个标签说明：\n"
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
#: builtin/tag.c:428
msgid "unable to sign the tag"
-msgstr "无法签署 tag"
+msgstr "无法签署标签"
#: builtin/tag.c:430
msgid "unable to write tag file"
-msgstr "无法写 tag 文件"
+msgstr "无法写标签文件"
#: builtin/tag.c:455
msgid "bad object type."
#: builtin/tag.c:468
msgid "tag header too big."
-msgstr "tag 头信息太大。"
+msgstr "标签头信息太大。"
#: builtin/tag.c:504
msgid "no tag message?"
-msgstr "无 tag 说明？"
+msgstr "无标签说明？"
#: builtin/tag.c:510
#, c-format
msgid "The tag message has been left in %s\n"
-msgstr "tag 说明被保留在 %s\n"
+msgstr "标签说明被保留在 %s\n"
#: builtin/tag.c:559
msgid "switch 'points-at' requires an object"
#: builtin/tag.c:589
msgid "list tag names"
-msgstr "列出tag名称"
+msgstr "列出标签名称"
#: builtin/tag.c:591
msgid "print <n> lines of each tag message"
-msgstr "每个 tag 信息打印 <n> 行"
+msgstr "每个标签信息打印 <n> 行"
#: builtin/tag.c:593
msgid "delete tags"
-msgstr "删除 tags"
+msgstr "删除标签"
#: builtin/tag.c:594
msgid "verify tags"
-msgstr "验证 tags"
+msgstr "验证标签"
#: builtin/tag.c:596
msgid "Tag creation options"
-msgstr "Tag 创建选项"
+msgstr "标签创建选项"
#: builtin/tag.c:598
msgid "annotated tag, needs a message"
-msgstr "注解 tag，需要一个说明"
+msgstr "附注标签，需要一个说明"
#: builtin/tag.c:600
msgid "tag message"
-msgstr "tag 说明"
+msgstr "标签说明"
#: builtin/tag.c:602
msgid "annotated and GPG-signed tag"
-msgstr "注解并 GPG 签名的 tag"
+msgstr "附注并附加 GPG 签名的标签"
#: builtin/tag.c:606
msgid "use another key to sign the tag"
-msgstr "使用另外的私钥签名 tag"
+msgstr "使用另外的私钥签名该标签"
#: builtin/tag.c:607
msgid "replace the tag if exists"
-msgstr "如果存在，替换现有的 tag"
+msgstr "如果存在，替换现有的标签"
#: builtin/tag.c:609
msgid "Tag listing options"
-msgstr "Tag 列表选项"
+msgstr "标签列表选项"
#: builtin/tag.c:610
msgid "show tag list in columns"
-msgstr "以列的方式显示 tag"
+msgstr "以列的方式显示标签列表"
#: builtin/tag.c:612
msgid "sort tags"
-msgstr "排序 tags"
+msgstr "排序标签"
#: builtin/tag.c:617 builtin/tag.c:623
msgid "print only tags that contain the commit"
-msgstr "只打印包含提交的tags"
+msgstr "只打印包含提交的标签"
#: builtin/tag.c:629
msgid "print only tags of the object"
-msgstr "只打印tags对象"
+msgstr "只打印对象的标签"
#: builtin/tag.c:655
msgid "--column and -n are incompatible"
#: builtin/tag.c:712
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s' 不是一个有效的tag名称。"
+msgstr "'%s' 不是一个有效的标签名称。"
#: builtin/tag.c:717
#, c-format
msgid "tag '%s' already exists"
-msgstr "tag '%s' 已存在"
+msgstr "标签 '%s' 已存在"
#: builtin/tag.c:741
#, c-format
msgid "Updated tag '%s' (was %s)\n"
-msgstr "已更新tag '%s'（曾为 %s）\n"
+msgstr "已更新标签 '%s'（曾为 %s）\n"
#: builtin/unpack-objects.c:489
msgid "Unpacking objects"
#: builtin/verify-tag.c:73
msgid "print tag contents"
-msgstr "打印 tag 内容"
+msgstr "打印标签内容"
+
+#: builtin/worktree.c:11
+msgid "git worktree add [<options>] <path> <branch>"
+msgstr "git worktree add [<选项>] <路径> <分支>"
+
+#: builtin/worktree.c:12
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<选项>]"
+
+#: builtin/worktree.c:27
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "删除工作区/%s：不是一个有效的目录"
+
+#: builtin/worktree.c:33
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "删除 worktrees/%s：gitdir 文件不存在"
+
+#: builtin/worktree.c:38
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
+
+#: builtin/worktree.c:49
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "删除 worktrees/%s：无效的 gitdir 文件"
+
+#: builtin/worktree.c:65
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
+
+#: builtin/worktree.c:100
+#, c-format
+msgid "failed to remove: %s"
+msgstr "无法删除：%s"
+
+#: builtin/worktree.c:186
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' 已经存在"
+
+#: builtin/worktree.c:207
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "不能创建目录 '%s'"
+
+#: builtin/worktree.c:241
+msgid "unable to resolve HEAD"
+msgstr "不能解析 HEAD"
+
+#: builtin/worktree.c:249
+#, c-format
+msgid "Enter %s (identifier %s)"
+msgstr "输入 %s （标识符 %s）"
+
+#: builtin/worktree.c:281
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
+
+#: builtin/worktree.c:283
+msgid "create a new branch"
+msgstr "创建一个新分支"
+
+#: builtin/worktree.c:285
+msgid "create or reset a branch"
+msgstr "创建或重置一个分支"
+
+#: builtin/worktree.c:286
+msgid "detach HEAD at named commit"
+msgstr "HEAD 从指定的提交分离"
+
+#: builtin/worktree.c:292
+msgid "-b and -B are mutually exclusive"
+msgstr "-b 和 -B 互斥"
#: builtin/write-tree.c:13
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "列出、创建或删除分支"
#: common-cmds.h:21
-msgid "Checkout a branch or paths to the working tree"
-msgstr "检出一个分支或路径到工作区"
+msgid "Switch branches or restore working tree files"
+msgstr "切换分支或恢复工作区文件"
#: common-cmds.h:22
msgid "Clone a repository into a new directory"
-msgstr "克隆一个版本库到一个新目录"
+msgstr "克隆一个仓库到一个新目录"
#: common-cmds.h:23
msgid "Record changes to the repository"
-msgstr "记录变更到版本库"
+msgstr "记录变更到仓库"
#: common-cmds.h:24
msgid "Show changes between commits, commit and working tree, etc"
#: common-cmds.h:25
msgid "Download objects and refs from another repository"
-msgstr "从另外一个版本库下载对象和引用"
+msgstr "从另外一个仓库下载对象和引用"
#: common-cmds.h:26
msgid "Print lines matching a pattern"
#: common-cmds.h:27
msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"
+msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
#: common-cmds.h:28
msgid "Show commit logs"
#: common-cmds.h:31
msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "获取并整合另外的版本库或一个本地分支"
+msgstr "获取并整合另外的仓库或一个本地分支"
#: common-cmds.h:32
msgid "Update remote refs along with associated objects"
#: common-cmds.h:34
msgid "Reset current HEAD to the specified state"
-msgstr "重置当前HEAD到指定状态"
+msgstr "重置当前 HEAD 到指定状态"
#: common-cmds.h:35
msgid "Remove files from the working tree and from the index"
#: common-cmds.h:38
msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
+msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
#: parse-options.h:142
msgid "expiry-date"
#: git-am.sh:126
msgid "Cannot fall back to three-way merge."
-msgstr "无法求助于三路合并。"
+msgstr "无法求助于三方合并。"
#: git-am.sh:142
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。"
+msgstr "仓库缺乏必要的数据对象以进行三方合并。"
#: git-am.sh:144
msgid "Using index info to reconstruct a base tree..."
-msgstr "使用索引来重建一个（三路合并的）基础目录树..."
+msgstr "使用索引来重建一个（三方合并的）基础目录树..."
#: git-am.sh:159
msgid ""
"It does not apply to blobs recorded in its index."
msgstr ""
"您是否曾手动编辑过您的补丁？\n"
-"无法应用补丁到索引中的数据（blob）对象上。"
+"无法应用补丁到索引中的数据对象上。"
#: git-am.sh:168
msgid "Falling back to patching base and 3-way merge..."
-msgstr "转而在基础版本上打补丁及进行三路合并..."
+msgstr "转而在基础版本上打补丁及进行三方合并..."
#: git-am.sh:185
msgid "Failed to merge in the changes."
#: git-am.sh:635
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
-msgstr "è\84\8fç\9a\84ç´¢å¼\95ï¼\9aä¸\8dè\83½åº\94ç\94¨è¡¥ä¸\81ï¼\88è\84\8fæ\96\87件ï¼\9a$filesï¼\89"
+msgstr "脏索引：不能应用补丁（脏文件：$files）"
#: git-am.sh:747
#, sh-format
#: git-rebase.sh:610
msgid "First, rewinding head to replay your work on top of it..."
-msgstr "首先，重置头指针以便在上面重放您的工作..."
+msgstr "首先，回退分支以便在上面重放您的工作..."
#: git-rebase.sh:620
#, sh-format
#: git-stash.sh:507
msgid "Cannot unstage modified files"
-msgstr "无法还原修改的文件"
+msgstr "无法将修改的文件取消暂存"
#: git-stash.sh:522
msgid "Index was not unstashed."
#: git-submodule.sh:416
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
+msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
#: git-submodule.sh:433
#, sh-format
#: git-submodule.sh:455
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "添加位于 '$sm_path' 的现存版本库到索引"
+msgstr "添加位于 '$sm_path' 的现存仓库到索引"
#: git-submodule.sh:457
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
+msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
#: git-submodule.sh:465
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库："
+msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
#: git-submodule.sh:467
#, sh-format
#, sh-format
msgid ""
"use the '--force' option. If the local git directory is not the correct repo"
-msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库"
+msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的仓库"
#: git-submodule.sh:470
#, sh-format
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
-
-#~ msgid "Cannot apply stash: Your index contains uncommitted changes."
-#~ msgstr "无法应用 stash：您的索引中包含未提交的变更。"
-
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "最常用的 git 命令有："
-
-#~ msgid "No such branch: '%s'"
-#~ msgstr "没有此分支：'%s'"
-
-#~ msgid "Could not create git link %s"
-#~ msgstr "不能创建 git link %s"
-
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "无效的 gc.pruneexpire：'%s'"