Translated using Weblate (Chinese (Simplified))

Currently translated at 34.6% (3806 of 10990 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/ Signed-off-by: 秃头灯笼鱼 <ttdlyu@163.com>

Translated using Weblate (Chinese (Simplified))
b96cbc5c · 秃头灯笼鱼 · Hosted Weblate · 100bb9f7 · b96cbc5c
Unverified Commit b96cbc5c authored 2 years ago by 秃头灯笼鱼 Committed by Hosted Weblate 2 years ago
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-05-02 00:50+0000\nLast-Translator: Hou Qiyao <ryanhou24@gmail.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-05-03 17:31+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n"
  
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -51969,49 +51969,49 @@ msgstr "所有已经添加到索引中的变化都保持原样。"
 #: en/git-stash.txt:207
 #, priority:240
 msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed.  The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively.  The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
+msgstr "交互式地从当前分支和工作区之间的差异中选择要存储的内容。  藏匿条目的构造是这样的：它的索引状态与你仓库的索引状态相同，它的工作区只包含你交互选择的变化。  被选中的修改会从你的工作区中回滚。参见 linkgit:git-add[1] 中的 ``互动模式''一节，了解如何操作`--patch`模式。"
  
 #. type: Plain text
 #: en/git-stash.txt:210
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
-msgstr ""
+msgstr "选项`---patch`意味着`---keep-index`。  你可以使用`--no-keep-index`来覆盖它。"
  
 #. type: Plain text
 #: en/git-stash.txt:218
 #, priority:240
 msgid "Stash only the changes that are currently staged. This is similar to basic `git commit` except the state is committed to the stash instead of current branch."
-msgstr ""
+msgstr "只存放当前分阶段的修改。这类似于基本的`git commit`，只不过是将状态提交到贮藏室而不是当前分支。"
  
 #. type: Plain text
 #: en/git-stash.txt:220
 #, priority:240
 msgid "The `--patch` option has priority over this one."
-msgstr ""
+msgstr "`--patch`选项要优先于这个选项。"
  
 #. type: Plain text
 #: en/git-stash.txt:223 en/git-stash.txt:233 en/git-stash.txt:247 en/git-stash.txt:252
 #, priority:240
 msgid "This option is only valid for `push` command."
-msgstr ""
+msgstr "这个选项只对`push`命令有效。"
  
 #. type: Plain text
 #: en/git-stash.txt:242
 #, priority:240
 msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
-msgstr ""
+msgstr "这个选项只对`apply`、`drop`、`pop`、`push`、`save`、`store`命令有效。"
  
 #. type: Plain text
 #: en/git-stash.txt:249
 #, priority:240
 msgid "Separates pathspec from options for disambiguation purposes."
-msgstr ""
+msgstr "为了消除歧义，将路径规范与选项分开。"
  
 #. type: Plain text
 #: en/git-stash.txt:257
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
+msgstr "新的贮藏条目只记录了符合路径规范文件的修改状态。  然后索引条目和工作区文件也被回滚到当前分支中的状态，只留下不符合路径规范的文件。"
  
 #. type: Labeled list
 #: en/git-stash.txt:260
@@ -52023,19 +52023,19 @@ msgstr "<stash>"
 #: en/git-stash.txt:263
 #, priority:240
 msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
-msgstr ""
+msgstr "这个选项只对`apply`、`branch`、`drop`、`pop`、`show`命令有效。"
  
 #. type: Plain text
 #: en/git-stash.txt:266
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
-msgstr ""
+msgstr "一个形式为`stash@{<版本>}`的引用。如果没有给出`<贮藏项>`，则假定是最新的储藏库（即`stash@{0}`）。"
  
 #. type: Plain text
 #: en/git-stash.txt:275
 #, priority:240
 msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created.  The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit.  The ancestry graph looks like this:"
-msgstr ""
+msgstr "一个贮藏库条目被表示为一个提交，它的目录树记录了工作目录的状态，它的第一个父节点是创建该条目时在`HEAD`的提交。  第二个父节点的树记录了条目生成时索引的状态，它是`HEAD`提交的一个子节点。  祖先图看起来像这样："
  
 #. type: Plain text
 #: en/git-stash.txt:279
@@ -52044,31 +52044,31 @@ msgid ""
 "            .----W\n"
 "           /    /\n"
 "     -----H----I\n"
-msgstr ""
+msgstr "            .----W\n           /    /\n     -----H----I\n"
  
 #. type: Plain text
 #: en/git-stash.txt:283
 #, priority:240
 msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
-msgstr ""
+msgstr "其中`H`是`HEAD`提交，`I`是记录索引状态的提交，`W`是记录工作区状态的提交。"
  
 #. type: Labeled list
 #: en/git-stash.txt:288
 #, no-wrap, priority:240
 msgid "Pulling into a dirty tree"
-msgstr ""
+msgstr "拉进一个脏目录树"
  
 #. type: Plain text
 #: en/git-stash.txt:294
 #, priority:240
 msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing.  When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
-msgstr ""
+msgstr "当你在做某件事的时候，你得知上游有一些变化可能与你正在做的事情有关。  当你的本地修改与上游的修改不冲突时，一个简单的`git pull'就可以让你继续前进。"
  
 #. type: Plain text
 #: en/git-stash.txt:299
 #, priority:240
 msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes.  In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
-msgstr ""
+msgstr "然而，在有些情况下，你的本地修改确实与上游修改有冲突，而`git pull`拒绝覆盖你的修改。  在这种情况下，你可以把你的进度保存起来，执行一次拉取，然后再解开，像这样："
  
 #. type: delimited block -
 #: en/git-stash.txt:307
@@ -52092,7 +52092,7 @@ msgstr ""
 #: en/git-stash.txt:315
 #, priority:240
 msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately.  Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
-msgstr ""
+msgstr "当你正在做某件事的时候，你的老板来了，要求你立即修复某件事。  传统上，你会向一个临时分支提交，以储存你的修改，然后返回到你的原始分支进行紧急修复，就像这样："
  
 #. type: delimited block -
 #: en/git-stash.txt:326
@@ -52107,13 +52107,13 @@ msgid ""
 "$ git switch my_wip\n"
 "$ git reset --soft HEAD^\n"
 "# ... continue hacking ...\n"
-msgstr ""
+msgstr "# ... 嗨骇害 ...\n$ git switch -c my_wip\n$ git commit -a -m \"我待会还得写点东西\"\n$ git switch master\n$ edit emergency fix\n$ git commit -a -m \"速速修复BUG\"\n$ git switch my_wip\n$ git reset --soft HEAD^\n# ... 继续骇入 ...\n"
  
 #. type: Plain text
 #: en/git-stash.txt:329
 #, priority:240
 msgid "You can use 'git stash' to simplify the above, like this:"
-msgstr ""
+msgstr "你可以用'git stash'来简化上述工作，像这样："
  
 #. type: delimited block -
 #: en/git-stash.txt:337
@@ -52125,19 +52125,19 @@ msgid ""
 "$ git commit -a -m \"Fix in a hurry\"\n"
 "$ git stash pop\n"
 "# ... continue hacking ...\n"
-msgstr ""
+msgstr "# ... 嗨骇害 ...\n$ git stash\n$ edit emergency fix\n$ git commit -a -m \"紧急修复\"\n$ git stash pop\n# ... 继续骇入 ...\n"
  
 #. type: Labeled list
 #: en/git-stash.txt:339
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "Testing partial commits"
-msgstr ""
+msgstr "部分测试提交"
  
 #. type: Plain text
 #: en/git-stash.txt:344
 #, priority:240
 msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
-msgstr ""
+msgstr "当你想把工作区上的改动做两个或更多的提交，并且想在提交前测试每个改动时，你可以使用`git stash push --keep-index`："
  
 #. type: delimited block -
 #: en/git-stash.txt:355
@@ -52152,19 +52152,19 @@ msgid ""
 "# ... repeat above five steps until one commit remains ...\n"
 "$ edit/build/test remaining parts\n"
 "$ git commit foo -m 'Remaining parts'\n"
-msgstr ""
+msgstr "# ... 嗨骇害 ...\n$ git add --patch foo # 仅将第一部分添加到索引中\n$ git stash push --keep-index # 将所有其他改动保存到储藏室中\n$ edit/build/test first part\n$ git commit -m '第一个部分' # 提交完全测试过的改动\n$ git stash pop # 准备处理所有其他改动\n# ... 重复以上五个步骤，直到剩下一个提交...\n$ 编辑/构建/测试剩余部分\n$ git commit foo -m '剩余部分'。\n"
  
 #. type: Labeled list
 #: en/git-stash.txt:357
 #, no-wrap, priority:240
 msgid "Saving unrelated changes for future use"
-msgstr ""
+msgstr "保存不相关的变化供将来使用"
  
 #. type: Plain text
 #: en/git-stash.txt:364
 #, priority:240
 msgid "When you are in the middle of massive changes and you find some unrelated issue that you don't want to forget to fix, you can do the change(s), stage them, and use `git stash push --staged` to stash them out for future use. This is similar to committing the staged changes, only the commit ends-up being in the stash and not on the current branch."
-msgstr ""
+msgstr "当你在进行大规模修改时，发现一些不相关的问题，你不想忘记修复，你可以进行修改，将其分阶段，然后使用 `git stash push --staged` 将其存放起来，以便将来使用。这类似于提交阶段性修改，只是提交的结果是在贮藏库而不是在当前分支。"
  
 #. type: delimited block -
 #: en/git-stash.txt:373
@@ -52177,19 +52177,19 @@ msgid ""
 "$ git commit -m 'Massive'       # commit fully tested changes\n"
 "$ git switch fixup-branch       # switch to another branch\n"
 "$ git stash pop                 # to finish work on the saved changes\n"
-msgstr ""
+msgstr "# ... 嗨骇害 ...\n$ git add --patch foo # 将不相关的改动添加到索引中\n$ git stash push --staged # 将这些改动保存到储藏库中\n# ... hack hack hack, finish curent changes ...\n$ git commit -m '大规模测试' # 提交完全测试过的改动\n$ git switch fixup-branch # 切换到另一个分支\n$ git stash pop # 完成对保存的修改的工作\n"
  
 #. type: Labeled list
 #: en/git-stash.txt:375
 #, no-wrap, priority:240
 msgid "Recovering stash entries that were cleared/dropped erroneously"
-msgstr ""
+msgstr "恢复被错误地清除/丢弃的贮藏库条目"
  
 #. type: Plain text
 #: en/git-stash.txt:381
 #, priority:240
 msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms.  However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
-msgstr ""
+msgstr "如果你错误地丢弃或清除了贮藏库条目，它们无法通过正常的安全机制恢复。  然而，你可以试试下面的咒语，以获得仍在你的版本库中，但无法到达的贮藏库条目列表："
  
 #. type: delimited block -
 #: en/git-stash.txt:386
@@ -52198,7 +52198,7 @@ msgid ""
 "git fsck --unreachable |\n"
 "grep commit | cut -d\\  -f3 |\n"
 "xargs git log --merges --no-walk --grep=WIP\n"
-msgstr ""
+msgstr "git fsck --unreachable |\ngrep commit | cut -d -f3 |\nxargs git log --merges --no-walk --grep=WIP\n"
  
 #. type: Plain text
 #: en/git-stash.txt:403
@@ -56267,61 +56267,61 @@ msgid ""
 "\t[--create-reflog] [--sort=<key>] [--format=<format>]\n"
 "\t[--merged <commit>] [--no-merged <commit>] [<pattern>...]\n"
 "'git tag' -v [--format=<format>] <tagname>...\n"
-msgstr ""
+msgstr "'git tag' [-a | -s | -u <键-id>] [-f] [-m <信息> | -F <文件>] [-e]\n\t<标签名> [<提交> | <对象>]\n'git tag' -d <标签名>...\n'git tag' [-n[<数字>]] -l [--contains <提交>] [--no-contains <提交>]\n\t[--points-at <对象>] [--column[=<选项>] | --no-column]\n\t[--create-reflog] [--sort=<键>] [--format=<格式>]\n\t[--merged <提交>] [--no-merged <提交>] [<模式>...]\n'git tag' -v [--format=<format>] <标签名>...\n"
  
 #. type: Plain text
 #: en/git-tag.txt:26
 #, priority:240
 msgid "Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, list or verify tags."
-msgstr ""
+msgstr "在`refs/tags/`中添加一个标签引用，除非给出`-d/-l/-v`来删除、列出或验证标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:28
 #, priority:240
 msgid "Unless `-f` is given, the named tag must not yet exist."
-msgstr ""
+msgstr "除非给出`-f`，否则命名的标签必须还不存在。"
  
 #. type: Plain text
 #: en/git-tag.txt:33
 #, priority:240
 msgid "If one of `-a`, `-s`, or `-u <key-id>` is passed, the command creates a 'tag' object, and requires a tag message.  Unless `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message."
-msgstr ""
+msgstr "如果传递了`-a', `-s', 或 `-u <key-id>`中的一个，该命令会创建一个'标签'对象，并要求提供一个标签信息。  除非给出`-m <信息>`或`-F <文件>`，否则会启动一个编辑器，让用户输入标签信息。"
  
 #. type: Plain text
 #: en/git-tag.txt:36
 #, priority:240
 msgid "If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>` are absent, `-a` is implied."
-msgstr ""
+msgstr "如果给定了`-m <消息>`或`-F <文件>`，并且没有`-a`、`-s`和`-u <键-id>`，则默认为`-a`。"
  
 #. type: Plain text
 #: en/git-tag.txt:39
 #, priority:240
 msgid "Otherwise, a tag reference that points directly at the given object (i.e., a lightweight tag) is created."
-msgstr ""
+msgstr "否则，就会创建一个直接指向给定对象的标签引用（即一个轻量级标签）。"
  
 #. type: Plain text
 #: en/git-tag.txt:45
 #, priority:240
 msgid "A GnuPG signed tag object will be created when `-s` or `-u <key-id>` is used.  When `-u <key-id>` is not used, the committer identity for the current user is used to find the GnuPG key for signing. \tThe configuration variable `gpg.program` is used to specify custom GnuPG binary."
-msgstr ""
+msgstr "当使用`-s`或`-u <键-id>`时，将创建一个GnuPG签名标签对象。  当没有使用`-u <键-id>`时，当前用户的提交者身份会被用来寻找GnuPG密钥进行签名。 \t配置变量 `gpg.program` 用于指定自定义 GnuPG 二进制文件。"
  
 #. type: Plain text
 #: en/git-tag.txt:51
 #, priority:240
 msgid "Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is simply a name for an object (usually a commit object)."
-msgstr ""
+msgstr "标签对象（用`-a`、`-s`或`-u`创建）被称为 \"注释 \"标签；它们包含创建日期、标记者姓名和电子邮件、标记信息和可选的GnuPG签名。而 \"轻量级 \"标签只是一个对象（通常是一个提交对象）的名称。"
  
 #. type: Plain text
 #: en/git-tag.txt:56
 #, priority:240
 msgid "Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like `git describe`) will ignore lightweight tags by default."
-msgstr ""
+msgstr "注释性标签是用来发布的，而轻量级标签则是用于私人或临时对象的标签。由于这个原因，一些命名对象的git命令（如`git describe`）默认会忽略轻量级标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:63
 #, priority:240
 msgid "Make an unsigned, annotated tag object"
-msgstr ""
+msgstr "制作一个无符号、有注释的标签对象"
  
 #. type: Labeled list
 #: en/git-tag.txt:65
@@ -56333,7 +56333,7 @@ msgstr "--sign"
 #: en/git-tag.txt:70
 #, priority:240
 msgid "Make a GPG-signed tag, using the default e-mail address's key.  The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled otherwise.  See linkgit:git-config[1]."
-msgstr ""
+msgstr "制作一个GPG签名的标签，使用默认电子邮件地址的密钥。  标签GPG签名的默认行为由`tag.gpgSign`配置变量控制（如果存在），否则禁用。  参见 linkgit:git-config[1]。"
  
 #. type: Labeled list
 #: en/git-tag.txt:71
@@ -56345,7 +56345,7 @@ msgstr "--no-sign"
 #: en/git-tag.txt:74
 #, priority:240
 msgid "Override `tag.gpgSign` configuration variable that is set to force each and every tag to be signed."
-msgstr ""
+msgstr "覆盖`tag.gpgSign`配置变量，该变量被设置为强制每一个标签都被签名。"
  
 #. type: Labeled list
 #: en/git-tag.txt:75
@@ -56364,25 +56364,25 @@ msgstr "--排序=<键>"
 #: en/git-tag.txt:78
 #, priority:240
 msgid "Make a GPG-signed tag, using the given key."
-msgstr ""
+msgstr "制作一个GPG签名的标签，使用给定的密钥。"
  
 #. type: Plain text
 #: en/git-tag.txt:82
 #, priority:240
 msgid "Replace an existing tag with the given name (instead of failing)"
-msgstr ""
+msgstr "用给定的名称替换一个现有的标签（而不是失败）"
  
 #. type: Plain text
 #: en/git-tag.txt:86
 #, priority:240
 msgid "Delete existing tags with the given names."
-msgstr ""
+msgstr "删除给定名字的现存标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:90
 #, priority:240
 msgid "Verify the GPG signature of the given tag names."
-msgstr ""
+msgstr "验证给定标签名称的GPG签名。"
  
 #. type: Labeled list
 #: en/git-tag.txt:91
@@ -56394,85 +56394,85 @@ msgstr "-n<num>"
 #: en/git-tag.txt:94
 #, priority:240
 msgid "<num> specifies how many lines from the annotation, if any, are printed when using -l. Implies `--list`."
-msgstr ""
+msgstr "<数字>指定在使用-l时打印多少行注释，-l是指\"--list\"。"
  
 #. type: Plain text
 #: en/git-tag.txt:98
 #, priority:240
 msgid "The default is not to print any annotation lines.  If no number is given to `-n`, only the first line is printed.  If the tag is not annotated, the commit message is displayed instead."
-msgstr ""
+msgstr "默认是不打印任何注释行。  如果没有给 `n `加上数字，则只打印第一行。  如果标签没有注释，则会显示提交信息。"
  
 #. type: Plain text
 #: en/git-tag.txt:103
 #, ignore-ellipsis, priority:240
 msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
-msgstr ""
+msgstr "列出标签。使用可选的`<模式>...`，例如`git tag --list 'v-*'`，只列出符合模式的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:107
 #, priority:240
 msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
-msgstr ""
+msgstr "运行 \"git tag \"时不加参数也会列出所有标签。模式是一个shell通配符（即用fnmatch(3)匹配）。可以给出多个模式；如果其中任何一个匹配，就会显示该标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:111
 #, priority:240
 msgid "This option is implicitly supplied if any other list-like option such as `--contains` is provided. See the documentation for each of those options for details."
-msgstr ""
+msgstr "如果提供任何其他类似列表的选项，如`--contains`，则隐含地提供该选项。详情请参见这些选项的文档。"
  
 #. type: Plain text
 #: en/git-tag.txt:124
 #, priority:240
 msgid "Sort based on the key given.  Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable.  The keys supported are the same as those in `git for-each-ref`.  Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
-msgstr ""
+msgstr "根据给定的键进行排序。  前缀\"-\"表示按照数值的降序排序。你可以多次使用--sort=<键>选项，在这种情况下，最后一个键成为主键。也支持 \"version:refname \"或 \"v:refname\"（标签名被视为版本）。\"version:refname \"的排序顺序也可以由 \"versionort.senffix \"配置变量影响。  支持的键与`git for-each-ref`中的相同。  排序顺序默认为 \"tag.sort \"变量的配置值（如果存在的话），否则为词法顺序。见linkgit:git-config[1]。"
  
 #. type: Plain text
 #: en/git-tag.txt:133
 #, priority:240
 msgid "Sorting and filtering tags are case insensitive."
-msgstr ""
+msgstr "排序和过滤标签不区分大小写。"
  
 #. type: Plain text
 #: en/git-tag.txt:139
 #, priority:240
 msgid "Display tag listing in columns. See configuration variable `column.tag` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
+msgstr "在列中显示标签列表。选项语法见配置变量`column.tag`。`--column`和`--no-column`没有选项，分别等同于'永远'和'从不'。"
  
 #. type: Plain text
 #: en/git-tag.txt:141
 #, priority:240
 msgid "This option is only applicable when listing tags without annotation lines."
-msgstr ""
+msgstr "这个选项只适用于列出没有注释线的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:145
 #, priority:240
 msgid "Only list tags which contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
+msgstr "只列出包含指定提交内容的标签（如果没有指定则为当前分支）。暗指`--list`。"
  
 #. type: Plain text
 #: en/git-tag.txt:149
 #, priority:240
 msgid "Only list tags which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
+msgstr "只列出包含指定提交内容的标签（如果没有指定则为当前分支）。暗指`--list`。"
  
 #. type: Plain text
 #: en/git-tag.txt:153
 #, priority:240
 msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
+msgstr "只列出其提交可以从指定提交（如果没有指定则为`HEAD`）到达的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:157
 #, priority:240
 msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified)."
-msgstr ""
+msgstr "只列出其提交可以从指定提交（如果没有指定则为`HEAD`）到达的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:161
 #, priority:240
 msgid "Only list tags of the given object (HEAD if not specified). Implies `--list`."
-msgstr ""
+msgstr "只列出给定对象的标签（如果没有指定则为当前分支）。暗指`--list`。"
  
 #. type: Plain text
 #: en/git-tag.txt:169
@@ -56492,25 +56492,25 @@ msgstr "从给定文件中获取提交信息。  使用'-'可以从标准输入
 #: en/git-tag.txt:182
 #, priority:240
 msgid "The message taken from file with `-F` and command line with `-m` are usually used as the tag message unmodified.  This option lets you further edit the message taken from these sources."
-msgstr ""
+msgstr "用`-F`从文件中获取的信息和用`-m`从命令行中获取的信息通常被用作未修改的标签信息。  这个选项可以让你进一步编辑从这些来源获取的信息。"
  
 #. type: Plain text
 #: en/git-tag.txt:189
 #, priority:240
 msgid "This option sets how the tag message is cleaned up.  The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'.  The 'strip' mode is default. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary."
-msgstr ""
+msgstr "这个选项设置了标签信息的清理方式。  '<模式>'可以是'verbatim'（逐字记录）、'whitespace'（空白）和'strip'（剥离）中的一个。  其中，'strip'模式是默认的。'verbatim'模式完全不改变信息，'whitespace'只删除前导/后导的空白行，'strip'同时删除空白和注释。"
  
 #. type: Plain text
 #: en/git-tag.txt:196
 #, priority:240
 msgid "Create a reflog for the tag. To globally enable reflogs for tags, see `core.logAllRefUpdates` in linkgit:git-config[1].  The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
-msgstr ""
+msgstr "为标签创建一个引用日志。要全局性地启用标签的引用日志，请参见 linkgit:git-config[1] 中的 `core.logAllRefUpdates`。  否定形式的 `--no-create-reflog` 会覆盖先前的 `--create-reflog` ，但目前不会否定 `core.logAllRefUpdates` 的设置。"
  
 #. type: Plain text
 #: en/git-tag.txt:202
 #, priority:240
 msgid "A string that interpolates `%(fieldname)` from a tag ref being shown and the object it points at.  The format is the same as that of linkgit:git-for-each-ref[1].  When unspecified, defaults to `%(refname:strip=2)`."
-msgstr ""
+msgstr "一个字符串，从正在显示的标签引用和它所指向的对象中插值`%(fieldname)'。  其格式与linkgit:git-for-each-ref[1]相同。  当未指定时，默认为`%(refname:strip=2)`。"
  
 #. type: Labeled list
 #: en/git-tag.txt:203
@@ -56522,7 +56522,7 @@ msgstr "<tagname>"
 #: en/git-tag.txt:208
 #, priority:240
 msgid "The name of the tag to create, delete, or describe.  The new tag name must pass all checks defined by linkgit:git-check-ref-format[1].  Some of these checks may restrict the characters allowed in a tag name."
-msgstr ""
+msgstr "要创建、删除或描述的标签的名称。  新标签名必须通过 linkgit:git-check-ref-format[1] 定义的所有检查。  其中一些检查可能限制了标签名称中允许的字符。"
  
 #. type: Labeled list
 #: en/git-tag.txt:209 en/git.txt:394
@@ -56534,13 +56534,13 @@ msgstr "<commit>"
 #: en/git-tag.txt:213
 #, priority:240
 msgid "The object that the new tag will refer to, usually a commit.  Defaults to HEAD."
-msgstr ""
+msgstr "新标签将引用的对象，通常是一个提交。  默认为当前分支。"
  
 #. type: Plain text
 #: en/git-tag.txt:220
 #, priority:240
 msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key.  If you want to use a different default key, you can specify it in the repository configuration as follows:"
-msgstr ""
+msgstr "默认情况下，sign-with-default模式下的'git tag'（-s）会使用你的提交者身份（形式为`你的名字<your@email.address>`）来寻找一个密钥。  如果你想使用一个不同的默认密钥，你可以在仓库配置中指定它，如下："
  
 #. type: delimited block -
 #: en/git-tag.txt:224
@@ -56556,55 +56556,55 @@ msgstr ""
 #: en/git-tag.txt:229
 #, priority:240
 msgid "`pager.tag` is only respected when listing tags, i.e., when `-l` is used or implied. The default is to use a pager.  See linkgit:git-config[1]."
-msgstr ""
+msgstr "`pager.tag`只在列出标签时被尊重，即使用或暗示使用`-l`时。默认是使用分页器。  参见 linkgit:git-config[1]。"
  
 #. type: Title ~
 #: en/git-tag.txt:234
 #, no-wrap, priority:240
 msgid "On Re-tagging"
-msgstr ""
+msgstr "关于重新打标签"
  
 #. type: Plain text
 #: en/git-tag.txt:238
 #, priority:240
 msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
-msgstr ""
+msgstr "当你标记了一个错误的提交，而你想重新标记时，你应该怎么做？"
  
 #. type: Plain text
 #: en/git-tag.txt:241
 #, priority:240
 msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
-msgstr ""
+msgstr "如果你从未推送到其他地方，只需重新标记。使用\"-f \"来替换旧的标签。然后你就完成了。"
  
 #. type: Plain text
 #: en/git-tag.txt:245
 #, priority:240
 msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
-msgstr ""
+msgstr "但如果你已经推送了（或者别人可以直接读取你的版本库），那么别人就已经看到了旧标签。在这种情况下，你可以在以下两种做法任选其一："
  
 #. type: Plain text
 #: en/git-tag.txt:252
 #, priority:240
 msgid "The sane thing.  Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s.  So just call it \"X.1\" and be done with it."
-msgstr ""
+msgstr "理智的做法是。  只要承认你搞砸了，并使用一个不同的名字。其他人已经看到了一个标签名称，如果你保持相同的名称，你可能会出现这样的情况：两个人都有 \"X版\"，但他们实际上有 \"不同 \"的 \"X\"。  所以，只要叫它 \"X.1 \"就可以了。"
  
 #. type: Plain text
 #: en/git-tag.txt:257
 #, priority:240
 msgid "The insane thing.  You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
-msgstr ""
+msgstr "疯狂的做法。  你真的想把新版本也称为 \"X\"，⌊尽管⌉别人已经看到了旧版本。所以就再用'git tag -f'，就好像你还没有发布过旧版本一样。"
  
 #. type: Plain text
 #: en/git-tag.txt:262
 #, priority:240
 msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
-msgstr ""
+msgstr "然而，Git*不会*（也不应该）背着用户改变标签。所以如果有人已经得到了旧的标签，在你的树上做 \"git pull \"不应该让他们覆盖旧的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:269
 #, priority:240
 msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names.  If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
-msgstr ""
+msgstr "如果有人从你那里得到一个发布标签，你不能通过更新你自己的标签来为他们改变标签。这是一个很大的安全问题，因为人们必须能够信任他们的标签名。  如果你真的想做一件疯狂的事情，你需要承认这一点，并告诉人们你搞砸了。你可以通过发布一个非常公开的公告来做到这一点，比如说："
  
 #. type: delimited block -
 #: en/git-tag.txt:273
@@ -56612,7 +56612,7 @@ msgstr ""
 msgid ""
 "Ok, I messed up, and I pushed out an earlier version tagged as X. I\n"
 "then fixed something, and retagged the *fixed* tree as X again.\n"
-msgstr ""
+msgstr "好吧，我搞砸了，我推送了一个标记为X的早期版本。\n然后修复了一些东西，又把这个*修复的*目录树重新标记为X。\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:276
@@ -56620,7 +56620,7 @@ msgstr ""
 msgid ""
 "If you got the wrong tag, and want the new one, please delete\n"
 "the old one and fetch the new one by doing:\n"
-msgstr ""
+msgstr "如果你得到了错误的标签，并希望得到新的标签，\n请删除旧的标签，并通过以下方式获取新的标签：\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:279
@@ -56628,19 +56628,19 @@ msgstr ""
 msgid ""
 "\tgit tag -d X\n"
 "\tgit fetch origin tag X\n"
-msgstr ""
+msgstr "\tgit tag -d X\n\tgit fetch origin tag X\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:281
 #, no-wrap, priority:240
 msgid "to get my updated tag.\n"
-msgstr ""
+msgstr "以获得我的最新标签。\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:283
 #, no-wrap, priority:240
 msgid "You can test which tag you have by doing\n"
-msgstr ""
+msgstr "你可以通过以下方式测试你的标签\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:285
@@ -56652,7 +56652,7 @@ msgstr "\tgit rev-parse X\n"
 #: en/git-tag.txt:287
 #, no-wrap, priority:240
 msgid "which should return 0123456789abcdef.. if you have the new version.\n"
-msgstr ""
+msgstr "如果你有新的版本，应该返回0123456789abcdef。\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:289
@@ -56664,37 +56664,37 @@ msgstr "对于由此带来的不便,我们深感抱歉。\n"
 #: en/git-tag.txt:294
 #, priority:240
 msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically.  People need to know that their tags might have been changed."
-msgstr ""
+msgstr "这看起来是不是有点复杂？它*应该*是这样的。自动 \"修复 \"它是不可能的。  人们需要知道他们的标签可能已经被改变。"
  
 #. type: Title ~
 #: en/git-tag.txt:297
 #, no-wrap, priority:240
 msgid "On Automatic following"
-msgstr ""
+msgstr "在下列情况下自动进行"
  
 #. type: Plain text
 #: en/git-tag.txt:302
 #, priority:240
 msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`).  You usually want the tags from the other end."
-msgstr ""
+msgstr "如果你在跟踪别人的树目录，你很可能在使用远程跟踪的分支（例如：`refs/remotes/origin/master`）。  你通常希望得到另一端的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:309
 #, priority:240
 msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there.  This happens more often for people near the toplevel but not limited to them.  Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
-msgstr ""
+msgstr "另一方面，如果你是因为想从别人那里获得一次性合并而取的，你通常不希望从那里获得标签。  这种情况更经常发生在接近高层的人身上，但不限于他们。  普通人从对方那里取东西时，不一定想从对方那里自动获得私人锚点标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:314
 #, priority:240
 msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
-msgstr ""
+msgstr "通常，邮件列表上的 \"请拉\"信息只提供了两条信息：一个 仓库URL 和一个分支名称；这被设计成可以轻松地剪切和粘贴在 \"git fetch \"命令行的末尾："
  
 #. type: delimited block -
 #: en/git-tag.txt:317
 #, no-wrap, priority:240
 msgid "Linus, please pull from\n"
-msgstr ""
+msgstr "Linus，请从这里拉取\n"
  
 #. type: delimited block -
 #: en/git-tag.txt:319
@@ -56706,13 +56706,13 @@ msgstr "\tgit://git..../proj.git master\n"
 #: en/git-tag.txt:321
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "to get the following updates...\n"
-msgstr ""
+msgstr "以获得以下更新...\n"
  
 #. type: Plain text
 #: en/git-tag.txt:324
 #, priority:240
 msgid "becomes:"
-msgstr ""
+msgstr "成为："
  
 #. type: delimited block -
 #: en/git-tag.txt:327
@@ -56724,43 +56724,43 @@ msgstr "$ git pull git://git..../proj.git master\n"
 #: en/git-tag.txt:331
 #, priority:240
 msgid "In such a case, you do not want to automatically follow the other person's tags."
-msgstr ""
+msgstr "在这种情况下，你不希望自动跟随对方的标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:339
 #, priority:240
 msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system.  On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case.  It only shows that the usage pattern determines who are interested in whose tags."
-msgstr ""
+msgstr "Git 的一个重要方面是它的分布式性质，这很大程度上意味着系统中没有固有的 \"上游 \"或 \"下游\"。  从表面上看，上面的例子似乎表明标签命名空间是由上层人士拥有的，而标签只能向下流动，但事实并非如此。  它只是表明，使用模式决定了谁对谁的标签感兴趣。"
  
 #. type: Plain text
 #: en/git-tag.txt:351
 #, priority:240
 msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\").  The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means).  That is why it is desirable not to follow tags automatically in this case."
-msgstr ""
+msgstr "一次性拉取是一个标志，表明一个提交历史正在跨越一个圈子（例如 \"主要对内核的网络部分感兴趣的人\"）和另一个圈子（例如 \"整合各种子系统改进的人\"）之间的界限，后者可能有自己的一套标签（例如 \"这是网络组的第三个候选版本，将在2.6.21版本中被建议用于一般消费\"）。  后者通常对前一组内部使用的详细标签不感兴趣（这就是 \"内部 \"的意思）。  这就是为什么在这种情况下最好不要自动跟随标签。"
  
 #. type: Plain text
 #: en/git-tag.txt:357
 #, priority:240
 msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches.  Again, the heuristic to automatically follow such tags is a good thing."
-msgstr ""
+msgstr "在这个网络知州，他们可能想交换他们小组内部的标签，但在那个工作流程中，他们很可能是通过有远程跟踪的分支来跟踪对方的进展。  同样，自动跟踪这种标签的启发式方法也是一个好东西。"
  
 #. type: Title ~
 #: en/git-tag.txt:360
-#, no-wrap, priority:240
+#, fuzzy, no-wrap, priority:240
 msgid "On Backdating Tags"
-msgstr ""
+msgstr "关于回溯标签"
  
 #. type: Plain text
 #: en/git-tag.txt:367
 #, priority:240
 msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
-msgstr ""
+msgstr "如果你从另一个VCS导入了一些修改，并想为你工作的主要版本添加标签，能够指定嵌入标签对象内部的日期是很有用的；标签对象中的这种数据会产生影响，例如，gitweb界面中标签的排序。"
  
 #. type: Plain text
 #: en/git-tag.txt:371
 #, priority:240
 msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
-msgstr ""
+msgstr "要设置未来标签对象中使用的日期，请设置环境变量GIT_COMMITTER_DATE（见后面关于可能数值的讨论；最常见的形式是 \"YYY-MM-DD HH:MM\"）。"
  
 #. type: delimited block -
 #: en/git-tag.txt:376
@@ -56772,7 +56772,7 @@ msgstr "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
 #: en/git-tag.txt:389
 #, priority:240
 msgid "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1].  linkgit:git-config[1]."
  
 #. type: Title =
 #: en/git.txt:2
@@ -60774,7 +60774,7 @@ msgstr "git-worktree(1)"
 #: en/git-worktree.txt:7
 #, priority:240
 msgid "git-worktree - Manage multiple working trees"
-msgstr ""
+msgstr "git-worktree - 管理多个工作区"
  
 #. type: Plain text
 #: en/git-worktree.txt:21
@@ -60789,61 +60789,61 @@ msgid ""
 "'git worktree remove' [-f] <worktree>\n"
 "'git worktree repair' [<path>...]\n"
 "'git worktree unlock' <worktree>\n"
-msgstr ""
+msgstr "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n\t\t   [-b <新分支>] <路径> [<提交号>]\n'git worktree list' [-v | --porcelain [-z]]\n'git worktree lock' [--reason <字符串>] <工作区>\n'git worktree move' <工作区> <新分支>\n'git worktree prune' [-n] [-v] [--expire <到期>]\n'git worktree remove' [-f] <工作区>\n'git worktree repair' [<路径>...]\n'git worktree unlock' <工作区>\n"
  
 #. type: Plain text
 #: en/git-worktree.txt:26
 #, priority:240
 msgid "Manage multiple working trees attached to the same repository."
-msgstr ""
+msgstr "管理附属于同一仓库的多个工作区。"
  
 #. type: Plain text
 #: en/git-worktree.txt:32
 #, priority:240
 msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time.  With `git worktree add` a new working tree is associated with the repository, along with additional metadata that differentiates that working tree from others in the same repository.  The working tree, along with this metadata, is called a \"worktree\"."
-msgstr ""
+msgstr "一个 git 仓库可以支持多个工作区，允许你一次签出多个分支。  通过`git worktree add`，一个新的工作区与仓库相关联，同时还有额外的元数据，以区分该工作区与同一仓库中的其他工作区。  工作区目录树，连同这些元数据，被称为 \"工作区\"。"
  
 #. type: Plain text
 #: en/git-worktree.txt:38
 #, priority:240
 msgid "This new worktree is called a \"linked worktree\" as opposed to the \"main worktree\" prepared by linkgit:git-init[1] or linkgit:git-clone[1].  A repository has one main worktree (if it's not a bare repository) and zero or more linked worktrees. When you are done with a linked worktree, remove it with `git worktree remove`."
-msgstr ""
+msgstr "这个新的工作区被称为 \"链接工作区\"，与 linkgit:git-init[1] 或 linkgit:git-clone[1] 所准备的 \"主工作区 \"相对应。  一个仓库有一个主工作区（如果它不是一个裸仓库）和零个或多个链接工作区。当你用完一个链接工作区后，用 `git worktree remove` 删除它。"
  
 #. type: Plain text
 #: en/git-worktree.txt:50
 #, priority:240
 msgid "In its simplest form, `git worktree add <path>` automatically creates a new branch whose name is the final component of `<path>`, which is convenient if you plan to work on a new topic. For instance, `git worktree add ../hotfix` creates new branch `hotfix` and checks it out at path `../hotfix`. To instead work on an existing branch in a new worktree, use `git worktree add <path> <branch>`. On the other hand, if you just plan to make some experimental changes or do testing without disturbing existing development, it is often convenient to create a 'throwaway' worktree not associated with any branch. For instance, `git worktree add -d <path>` creates a new worktree with a detached `HEAD` at the same commit as the current branch."
-msgstr ""
+msgstr "在其最简单的形式中，`git worktree add <路径>`自动创建一个新的分支，其名称是`<路径>`的最后一个组成部分，如果你计划在一个新的主题上工作，这很方便。例如，`git worktree add .../hotfix`创建了新的分支`hotfix`，并在路径`.../hotfix`处签出它。如果要在一个新的工作区中处理现有的分支，可以使用`git worktree add <路径> <分支>`。另一方面，如果你只是打算做一些实验性的修改，或者在不影响现有开发的情况下进行测试，创建一个不与任何分支相关联的 \"抛弃式 \"工作区通常是很方便的。例如，`git worktree add -d <路径>`在与当前分支相同的提交中，创建一个带有分离`HEAD`的新工作区。"
  
 #. type: Plain text
 #: en/git-worktree.txt:57
 #, priority:240
 msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked worktree to clean up any stale administrative files."
-msgstr ""
+msgstr "如果没有使用 `git worktree remove` 就删除了工作区，那么它的相关管理文件，即驻扎在仓库中的文件（见下面的 \"详细说明\"），最终会被自动删除（见 linkgit:git-config[1] 中的 `gc.worktreePruneExpire`），或者你可以在主工作区或任何链接工作区中运行`git worktree prune` 来清理任何过时的管理文件。"
  
 #. type: Plain text
 #: en/git-worktree.txt:63
 #, priority:240
 msgid "If the working tree for a linked worktree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the worktree is locked."
-msgstr ""
+msgstr "如果一个链接的工作区存储在便携设备或网络共享上，而这些设备并不总是被挂载，你可以通过发布`git worktree lock`命令来防止其管理文件被修剪，可以使用选项`--reason`来解释为什么工作树被锁定。"
  
 #. type: Labeled list
 #: en/git-worktree.txt:66
 #, no-wrap, priority:240
 msgid "add <path> [<commit-ish>]"
-msgstr ""
+msgstr "add <路径> [<提交号>]"
  
 #. type: Plain text
 #: en/git-worktree.txt:72
 #, priority:240
 msgid "Create a worktree at `<path>` and checkout `<commit-ish>` into it. The new worktree is linked to the current repository, sharing everything except per-worktree files such as `HEAD`, `index`, etc. As a convenience, `<commit-ish>` may be a bare \"`-`\", which is synonymous with `@{-1}`."
-msgstr ""
+msgstr "在`<路径>`创建一个工作树，并将`<提交号>`签入其中。新的工作区被链接到当前仓库，共享除每个工作区文件（如`HEAD`、`index`等）之外的一切。为了方便起见，`<提交号>`可以是一个光秃秃的\"`-`\"，它与`@{-1}`同义。"
  
 #. type: Plain text
 #: en/git-worktree.txt:77
 #, priority:240
 msgid "If `<commit-ish>` is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`)  with a matching name, treat as equivalent to:"
-msgstr ""
+msgstr "如果`<提交号>`是一个分支名称（称其为`<分支>`），并且没有找到，也没有使用`-b`或`-B`或`-detach`，但确实在正好一个远程仓库（称其为`<远程仓库>`）中存在一个名称匹配的跟踪分支，则视为等同于："
  
 #. type: delimited block -
 #: en/git-worktree.txt:80
@@ -60855,19 +60855,19 @@ msgstr "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n"
 #: en/git-worktree.txt:90
 #, priority:240
 msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the `origin` remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
-msgstr ""
+msgstr "如果该分支存在于多个远程仓库，并且其中一个是由`checkout.defaultRemote`配置变量命名的，为了消除歧义，我们将使用该变量，即使`<分支>`在所有远程中并不唯一。将其设置为例如 `checkout.defaultRemote=origin`，以便在`<分支>`不明确但存在于'origin'远程时，总是从那里签出远程分支。参见 linkgit:git-config[1] 中的 `checkout.defaultRemote`。"
  
 #. type: Plain text
 #: en/git-worktree.txt:98
 #, priority:240
 msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`.  If `<branch>` doesn't exist, a new branch based on `HEAD` is automatically created as if `-b <branch>` was given.  If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
-msgstr ""
+msgstr "如果省略了`<提交号>`，也没有使用`-b`或`-B`或`-detach`，那么作为一种方便，新的工作树将与一个以`$(basename <路径>)`命名的分支（称为`<分支>`）相关联。  如果`<分支>`不存在，一个基于`HEAD`的新分支将被自动创建，就像给出`-b <分支>`一样。  如果`<分支>`确实存在，它将在新的工作树中被签出，如果它没有在其他地方被签出，否则命令将拒绝创建工作区（除非使用`--force`）。"
  
 #. type: Plain text
 #: en/git-worktree.txt:107
 #, priority:240
 msgid "List details of each worktree.  The main worktree is listed first, followed by each of the linked worktrees.  The output details include whether the worktree is bare, the revision currently checked out, the branch currently checked out (or \"detached HEAD\" if none), \"locked\" if the worktree is locked, \"prunable\" if the worktree can be pruned by the `prune` command."
-msgstr ""
+msgstr "列出每个工作区的细节。  主工作区被首先列出，接着是每个链接工作区。  输出的细节包括该工作区是否为裸树，当前签出的修订版，当前检出的分支（如果没有则为 \"分离的HEAD\"），如果工作树被锁定则为 \"锁定\"，如果工作树可以被`prune`命令修剪则为 \"可修剪\"。"
  
 #. type: Labeled list
 #: en/git-worktree.txt:108
@@ -60879,7 +60879,7 @@ msgstr "lock"
 #: en/git-worktree.txt:114
 #, priority:240
 msgid "If a worktree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted.  Optionally, specify a reason for the lock with `--reason`."
-msgstr ""
+msgstr "如果一个工作区在便携式设备或网络共享上，而这个设备或网络共享并不总是被挂载，请锁定它以防止其管理文件被自动修剪。这也可以防止它被移动或删除。  可以选择用`--reason`选项来指定锁定的原因。"
  
 #. type: Labeled list
 #: en/git-worktree.txt:115
@@ -60891,49 +60891,49 @@ msgstr "move"
 #: en/git-worktree.txt:121
 #, priority:240
 msgid "Move a worktree to a new location. Note that the main worktree or linked worktrees containing submodules cannot be moved with this command. (The `git worktree repair` command, however, can reestablish the connection with linked worktrees if you move the main worktree manually.)"
-msgstr ""
+msgstr "将一个工作区移动到一个新的位置。注意，主工作区或包含子模块的链接工作区不能用此命令移动。(然而，如果你手动移动主工作区，`git worktree repair`命令可以重新建立与链接工作区的连接。）"
  
 #. type: Plain text
 #: en/git-worktree.txt:125
 #, priority:240
 msgid "Prune worktree information in `$GIT_DIR/worktrees`."
-msgstr ""
+msgstr "修剪`$GIT_DIR/worktrees`中的工作区信息。"
  
 #. type: Plain text
 #: en/git-worktree.txt:132
 #, priority:240
 msgid "Remove a worktree. Only clean worktrees (no untracked files and no modification in tracked files) can be removed. Unclean worktrees or ones with submodules can be removed with `--force`. The main worktree cannot be removed."
-msgstr ""
+msgstr "移除一个工作区。只有干净的工作区（没有未跟踪的文件和未修改的跟踪文件）可以被删除。脏工作区或有子模块的工作区可以用 `--force` 删除。主工作区不能被删除。"
  
 #. type: Labeled list
 #: en/git-worktree.txt:133
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "repair [<path>...]"
-msgstr ""
+msgstr "repair [<路径>...]"
  
 #. type: Plain text
 #: en/git-worktree.txt:137
 #, priority:240
 msgid "Repair worktree administrative files, if possible, if they have become corrupted or outdated due to external factors."
-msgstr ""
+msgstr "如果可能的话，修复工作区的管理文件，如果它们由于外部因素而变得损坏或过时。"
  
 #. type: Plain text
 #: en/git-worktree.txt:142
 #, priority:240
 msgid "For instance, if the main worktree (or bare repository) is moved, linked worktrees will be unable to locate it. Running `repair` in the main worktree will reestablish the connection from linked worktrees back to the main worktree."
-msgstr ""
+msgstr "例如，如果主工作区（或裸仓库）被移动，链接工作区将无法找到它。在主工作区中运行 `repair` 将重新建立从链接工作区到主工作区的连接。"
  
 #. type: Plain text
 #: en/git-worktree.txt:149
 #, priority:240
 msgid "Similarly, if the working tree for a linked worktree is moved without using `git worktree move`, the main worktree (or bare repository) will be unable to locate it. Running `repair` within the recently-moved worktree will reestablish the connection. If multiple linked worktrees are moved, running `repair` from any worktree with each tree's new `<path>` as an argument, will reestablish the connection to all the specified paths."
-msgstr ""
+msgstr "同样地，如果没有使用 `git worktree move` 就移动了链接工作区，主工作区（或裸仓库）将无法定位它。在最近移动的工作区中运行`repair`将重新建立连接。如果多个链接工作区被移动，在任何工作区中运行`repair`，以每个树的新`<路径>`作为参数，将重新建立与所有指定路径的连接。"
  
 #. type: Plain text
 #: en/git-worktree.txt:154
 #, priority:240
 msgid "If both the main worktree and linked worktrees have been moved manually, then running `repair` in the main worktree and specifying the new `<path>` of each linked worktree will reestablish all connections in both directions."
-msgstr ""
+msgstr "如果主工作区和链接工作区都被手动移动，那么在主工作区中运行`repair`并指定每个链接工作树的新`<路径>`将重新建立两个方向的所有连接。"
  
 #. type: Labeled list
 #: en/git-worktree.txt:155
@@ -60945,25 +60945,25 @@ msgstr "unlock"
 #: en/git-worktree.txt:158
 #, priority:240
 msgid "Unlock a worktree, allowing it to be pruned, moved or deleted."
-msgstr ""
+msgstr "解锁一个工作区，允许它被修剪、移动或删除。"
  
 #. type: Plain text
 #: en/git-worktree.txt:170
 #, priority:240
 msgid "By default, `add` refuses to create a new worktree when `<commit-ish>` is a branch name and is already checked out by another worktree, or if `<path>` is already assigned to some worktree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked worktree path, specify `--force` twice."
-msgstr ""
+msgstr "默认情况下，当`<提交号>`是一个分支名称，并且已经被另一个工作树签出，或者`<路径>`已经被分配给某个工作树，但丢失了（例如，如果`<路径>`被手动删除），`add`拒绝创建一个新的工作树。这个选项覆盖了这些保护措施。要添加一个缺失但锁定的工作区路径，请指定`--force`两次。"
  
 #. type: Plain text
 #: en/git-worktree.txt:175
 #, priority:240
 msgid "`move` refuses to move a locked worktree unless `--force` is specified twice. If the destination is already assigned to some other worktree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use `--force` twice if the destination is locked."
-msgstr ""
+msgstr "`move`拒绝移动一个被锁定的工作区，除非`--force`被指定两次。如果目的地已经被分配给其他工作区，但没有找到（例如，如果`<新路径>`被手动删除），那么`--force`允许移动；如果目的地被锁定，则使用`--force`两次。"
  
 #. type: Plain text
 #: en/git-worktree.txt:178
 #, priority:240
 msgid "`remove` refuses to remove an unclean worktree unless `--force` is used.  To remove a locked worktree, specify `--force` twice."
-msgstr ""
+msgstr "`remove`拒绝删除一个脏工作区，除非使用`--force`。  要删除一个锁定的工作区，需要指定`--force`两次。"
  
 #. type: Plain text
 #: en/git-worktree.txt:187