Translated using Weblate (Chinese (Simplified))

Currently translated at 46.9% (5193 of 11052 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))
85ffac50 · 秃头灯笼鱼 · Hosted Weblate · bc8195e7 · 85ffac50
Unverified Commit 85ffac50 authored 1 year ago by 秃头灯笼鱼 Committed by Hosted Weblate 1 year 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-30 11:22+0000\nLast-Translator: Jean-Noël Avila <jn.avila@free.fr>\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-06-01 21:48+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
@@ -11264,7 +11264,7 @@ msgstr "在创建捆绑包时，可以创建一个独立的捆绑包，可以在
 #: en/git-bundle.txt:185
 #, priority:100
 msgid "Feeding a revision such as `new` to `git bundle create` will create a bundle file that contains all the objects reachable from the revision `new`. That bundle can be unbundled in any repository to obtain a full history that leads to the revision `new`:"
-msgstr ""
+msgstr "向 `git bundle create` 输入诸如`new'这样的修订版将创建一个捆绑包文件，其中包含所有从 `new` 修订版可以到达的对象。捆绑文件可以在任何版本库中解绑，以获得通往 `new` 版本的完整历史："
  
 #. type: delimited block -
 #: en/git-bundle.txt:188
@@ -12235,7 +12235,7 @@ msgstr "列出与指定路径相关的所有属性。 如果使用这个选项
 #: en/git-check-attr.txt:29
 #, priority:100
 msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
-msgstr ""
+msgstr "只考虑索引中的 `.gitattributes`，忽略工作区。"
  
 #. type: Labeled list
 #: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:68 en/git-diff-tree.txt:51 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-for-each-ref.txt:36 en/git-hash-object.txt:33 en/git-http-fetch.txt:37 en/git-index-pack.txt:46 en/git-notes.txt:173 en/git-send-pack.txt:42 en/git-svn.txt:595 en/git-update-index.txt:153 en/rev-list-options.txt:238
@@ -12247,13 +12247,13 @@ msgstr "--stdin"
 #: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
 #, priority:100
 msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
-msgstr ""
+msgstr "从标准输入中读取路径名，每行一个，而不是从命令行读取。"
  
 #. type: Plain text
 #: en/git-check-attr.txt:38
 #, priority:100
 msgid "The output format is modified to be machine-parsable.  If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
-msgstr ""
+msgstr "输出格式被修改为机器可解析的。 如果同时给出 `--stdin`，输入路径将用 NUL 字符而不是换行符来分隔。"
  
 #. type: Labeled list
 #: en/git-check-attr.txt:39
@@ -12273,31 +12273,31 @@ msgstr "用给定树的内容恢复工作树的文件。通常是通过命名与
 #: en/git-check-attr.txt:47
 #, priority:100
 msgid "Interpret all preceding arguments as attributes and all following arguments as path names."
-msgstr ""
+msgstr "将前面的所有参数解释为属性，后面的所有参数解释为路径名称。"
  
 #. type: Plain text
 #: en/git-check-attr.txt:51
 #, priority:100
 msgid "If none of `--stdin`, `--all`, or `--` is used, the first argument will be treated as an attribute and the rest of the arguments as pathnames."
-msgstr ""
+msgstr "如果没有使用 `--stdin`、`--all` 或 `--`，第一个参数将被视为一个属性，其余的参数将被视为路径名。"
  
 #. type: Plain text
 #: en/git-check-attr.txt:57
 #, priority:100
 msgid "The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF"
-msgstr ""
+msgstr "输出的形式是： <路径> COLON SP <属性> COLON SP <信息> LF"
  
 #. type: Plain text
 #: en/git-check-attr.txt:60
 #, priority:100
 msgid "unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL <attribute> NUL <info> NUL"
-msgstr ""
+msgstr "除非 `-z` 生效，在这种情况下，使用 NUL 作为分隔符： <路径> NUL <属性> NUL <信息> NUL"
  
 #. type: Plain text
 #: en/git-check-attr.txt:64
 #, priority:100
 msgid "<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:"
-msgstr ""
+msgstr "<路径> 是被查询的文件的路径，<属性> 是被查询的属性，<信息> 可以是任何一种："
  
 #. type: Labeled list
 #: en/git-check-attr.txt:65
@@ -12309,7 +12309,7 @@ msgstr "'unspecified'"
 #: en/git-check-attr.txt:66
 #, priority:100
 msgid "when the attribute is not defined for the path."
-msgstr ""
+msgstr "当该属性未被定义为路径时。"
  
 #. type: Labeled list
 #: en/git-check-attr.txt:66
@@ -12321,7 +12321,7 @@ msgstr "'unset'"
 #: en/git-check-attr.txt:67
 #, priority:100
 msgid "when the attribute is defined as false."
-msgstr ""
+msgstr "当该属性被定义为 false 时。"
  
 #. type: Labeled list
 #: en/git-check-attr.txt:67
@@ -12333,31 +12333,31 @@ msgstr "'set'"
 #: en/git-check-attr.txt:68
 #, priority:100
 msgid "when the attribute is defined as true."
-msgstr ""
+msgstr "当该属性被定义为真时。"
  
 #. type: Labeled list
 #: en/git-check-attr.txt:68
 #, no-wrap, priority:100
 msgid "<value>"
-msgstr ""
+msgstr "<值>"
  
 #. type: Plain text
 #: en/git-check-attr.txt:69
 #, priority:100
 msgid "when a value has been assigned to the attribute."
-msgstr ""
+msgstr "当一个值被分配给该属性时。"
  
 #. type: Plain text
 #: en/git-check-attr.txt:74 en/git-check-ignore.txt:105
 #, priority:100
 msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1].  The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
-msgstr ""
+msgstr "缓冲发生在 linkgit:git[1] 中的 `GIT_FLUSH` 选项下的记录。 调用者负责避免因过度填充输入缓冲区或从空的输出缓冲区读取而造成的死锁。"
  
 #. type: Plain text
 #: en/git-check-attr.txt:79
 #, priority:100
 msgid "In the examples, the following '.gitattributes' file is used:"
-msgstr ""
+msgstr "在例子中，使用了以下 '.gitattributes' 文件："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:83
@@ -12375,7 +12375,7 @@ msgstr ""
 #: en/git-check-attr.txt:86
 #, priority:100
 msgid "Listing a single attribute:"
-msgstr ""
+msgstr "列出一个单一属性："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:89
@@ -12391,7 +12391,7 @@ msgstr ""
 #: en/git-check-attr.txt:92
 #, priority:100
 msgid "Listing multiple attributes for a file:"
-msgstr ""
+msgstr "列出一个文件的多个属性："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:97
@@ -12411,7 +12411,7 @@ msgstr ""
 #: en/git-check-attr.txt:100
 #, priority:100
 msgid "Listing all attributes for a file:"
-msgstr ""
+msgstr "列出一个文件的所有属性："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:104
@@ -12429,7 +12429,7 @@ msgstr ""
 #: en/git-check-attr.txt:107
 #, priority:100
 msgid "Listing an attribute for multiple files:"
-msgstr ""
+msgstr "为多个文件列出一个属性："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:111
@@ -12447,7 +12447,7 @@ msgstr ""
 #: en/git-check-attr.txt:114
 #, priority:100
 msgid "Not all values are equally unambiguous:"
-msgstr ""
+msgstr "并非所有的价值观都是同样明确的："
  
 #. type: delimited block -
 #: en/git-check-attr.txt:117
@@ -12657,7 +12657,7 @@ msgstr "git-check-mailmap(1)"
 #: en/git-check-mailmap.txt:7
 #, priority:100
 msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
-msgstr ""
+msgstr "git-check-mailmap - 显示联系人的规范名称和电子邮件地址"
  
 #. type: Plain text
 #: en/git-check-mailmap.txt:13
@@ -12669,25 +12669,25 @@ msgstr "'git check-mailmap' [<options>] <contact>...\n"
 #: en/git-check-mailmap.txt:22
 #, priority:100
 msgid "For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
-msgstr ""
+msgstr "对于每一个来自命令行或标准输入（当使用 `--stdin` 时）的 ``Name $$<user@host>$$\" 或 ``$$<user@host>$$'，查找该人的规范名称和电子邮件地址（见下面的 “映射作者”）。如果找到了，就打印出来；否则就按原样打印输入。"
  
 #. type: Plain text
 #: en/git-check-mailmap.txt:29
 #, priority:100
 msgid "Read contacts, one per line, from the standard input after exhausting contacts provided on the command-line."
-msgstr ""
+msgstr "在用完命令行上提供的联系人后，从标准输入中读取联系人，每行一个。"
  
 #. type: Plain text
 #: en/git-check-mailmap.txt:37
 #, priority:100
 msgid "For each contact, a single line is output, terminated by a newline.  If the name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is printed; otherwise only ``$$<user@host>$$'' is printed."
-msgstr ""
+msgstr "对于每个联系人，都会输出一行，以换行结束。 如果名字被提供或被 'mailmap' 知道，``Name $$<user@host>$$'' 被打印；否则只有 ``$$<user@host>$$'' 被打印。"
  
 #. type: Plain text
 #: en/git-check-mailmap.txt:44
 #, priority:100
 msgid "See `mailmap.file` and `mailmap.blob` in linkgit:git-config[1] for how to specify a custom `.mailmap` target file or object."
-msgstr ""
+msgstr "参见 linkgit:git-config[1] 中的 `mailmap.file` 和 `mailmap.blob`，了解如何指定一个自定义的 `.mailmap` 目标文件或对象。"
  
 #. type: Title =
 #: en/git-checkout-index.txt:2
@@ -13964,7 +13964,7 @@ msgstr "git-check-ref-format(1)"
 #: en/git-check-ref-format.txt:7
 #, priority:100
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
-msgstr ""
+msgstr "git-check-ref-format - 确保引用名称的格式正确"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:15
@@ -13974,121 +13974,121 @@ msgid ""
 "       [--[no-]allow-onelevel] [--refspec-pattern]\n"
 "       <refname>\n"
 "'git check-ref-format' --branch <branchname-shorthand>\n"
-msgstr ""
+msgstr "'git check-ref-format' [--normalize]\n       [--[no-]allow-onelevel] [--refspec-pattern]\n       <引用名>\n'git check-ref-format' --branch <branchname-shorthand>\n"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:20
 #, priority:100
 msgid "Checks if a given 'refname' is acceptable, and exits with a non-zero status if it is not."
-msgstr ""
+msgstr "检查给定的 ‘引用名’ 是否可接受，如果不可接受，则以非零状态退出。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:27
 #, priority:100
 msgid "A reference is used in Git to specify branches and tags.  A branch head is stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
-msgstr ""
+msgstr "在 Git 中，引用被用来指定分支和标签。 分支头存储在 `refs/heads` 层次结构中，而标签存储在引用命名空间的 `refs/tags` 层次结构中（通常在 `$GIT_DIR/refs/heads` 和 `$GIT_DIR/refs/tags` 目录中，或者，如果引用是由 `git gc` 打包的，则作为文件 `$GIT_DIR/packed-refs` 的条目）。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:29
 #, priority:100
 msgid "Git imposes the following rules on how references are named:"
-msgstr ""
+msgstr "Git 对引用的命名方式有以下规则："
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:33
 #, priority:100
 msgid "They can include slash `/` for hierarchical (directory)  grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`."
-msgstr ""
+msgstr "它们可以包括斜线`/`，用于分层（目录）分组，但任何斜线分隔的组件都不能以点`.`开头或以序列`.lock`结尾。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:38
 #, priority:100
 msgid "They must contain at least one `/`. This enforces the presence of a category like `heads/`, `tags/` etc. but the actual names are not restricted.  If the `--allow-onelevel` option is used, this rule is waived."
-msgstr ""
+msgstr "它们可以包括斜线 `/`，用于分层（目录）分组，但任何斜线分隔的组件都不能以点 `.` 开头或以序列 `.lock` 结尾。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:40
 #, priority:100
 msgid "They cannot have two consecutive dots `..` anywhere."
-msgstr ""
+msgstr "他们不能在任何地方有两个连续的点 `..`。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:44
 #, priority:100
 msgid "They cannot have ASCII control characters (i.e. bytes whose values are lower than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` anywhere."
-msgstr ""
+msgstr "它们不能有 ASCII 控制字符（即数值低于 \\040，或 177 `DEL` 的字节）、空格、斜体字 `~`、省略号 `^`，或冒号 `:` 的任何一个。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:48
 #, priority:100
 msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere.  See the `--refspec-pattern` option below for an exception to this rule."
-msgstr ""
+msgstr "它们不能有问号 `?`，星号 `*`，或大括号 `[`的地方。 参见下面的 `--refspec-pattern` 选项，以了解这一规则的例外情况。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:52
 #, priority:100
 msgid "They cannot begin or end with a slash `/` or contain multiple consecutive slashes (see the `--normalize` option below for an exception to this rule)"
-msgstr ""
+msgstr "它们不能以斜线 `/` 开头或结尾，也不能包含多个连续的斜线（参见下面的 `--normalize` 选项，该规则的一个例外）"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:54
 #, priority:100
 msgid "They cannot end with a dot `.`."
-msgstr ""
+msgstr "它们不能以点 `.` 结尾。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:56
 #, priority:100
 msgid "They cannot contain a sequence `@{`."
-msgstr ""
+msgstr "它们不能包含一个序列 `@{`。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:58
 #, priority:100
 msgid "They cannot be the single character `@`."
-msgstr ""
+msgstr "它们不能是单个字符 `@`。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:60
 #, priority:100
 msgid "They cannot contain a `\\`."
-msgstr ""
+msgstr "它们不能包含一个 `\\`。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:65
 #, priority:100
 msgid "These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]):"
-msgstr ""
+msgstr "这些规则使基于 shell 脚本的工具很容易解析引用名，当引用名未加引号（错误地）使用时由 shell 进行路径名扩展，同时也避免了某些引用名表达的歧义（见 linkgit:gitrevisions[7]）："
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:69
 #, priority:100
 msgid "A double-dot `..` is often used as in `ref1..ref2`, and in some contexts this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
-msgstr ""
+msgstr "双点 `..` 经常被用作 `ref1..ref2`，在某些情况下，这个符号意味着 `^ref1 ref2`（即不在 `ref1` 和 `ref2` 中）。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:72
 #, priority:100
 msgid "A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and 'peel onion' operation."
-msgstr ""
+msgstr "省略号 `~` 和 `^` 符号用于介绍后缀 ‘第 n 个父亲’ 和 ‘剥洋葱’ 操作。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:77
 #, priority:100
 msgid "A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and store it in dstref\" in fetch and push operations.  It may also be used to select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"."
-msgstr ""
+msgstr "冒号 `:` 在获取和推送操作中被用于 `srcref:dstref`，表示 `使用 srcref（源引用）的值并将其存储在 dstref（目标引用）中。 它也可以用来选择一个特定的对象，如 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:79
 #, priority:100
 msgid "at-open-brace `@{` is used as a notation to access a reflog entry."
-msgstr ""
+msgstr "`@{` 被用来作为访问一个引用日志条目的符号。"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:98
 #, priority:100
 msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state.  The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name).  When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`.  For example, `@{-1}` is a way to refer the last thing that was checked out using \"git switch\" or \"git checkout\" operation.  This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
-msgstr ""
+msgstr "使用 `--branch` 选项，该命令接收一个名字，并检查它是否可以作为一个有效的分支名称（例如在创建新的分支时）。但在使用之前的检查语法时要谨慎，因为它可能指的是一个分离的 HEAD 状态。 `git check-ref-format --branch $name` 实现的规则可能比` git check-ref-format refs/heads/$name` 说的更严格（例如，破折号可以出现在引用组件的开头，但在分支名的开头是明确禁止的）。 当在仓库中使用 `--branch` 选项运行时，输入的内容首先被扩展为 ``以前的检出语法\" `@{-n}`。 例如，`@{-1}` 是指使用 \"git switch\" 或 \"git checkout\" 操作签出的最后一件东西。 这个选项应该被上层命令用来在任何需要分支名的地方接受这个语法，这样他们就可以像你输入分支名一样行事。作为一个例外，请注意，当最后签出的第 N 个东西不是一个分支时，\"以前的签出操作\" 可能会导致一个提交对象的名字。"
  
 #. type: Labeled list
 #: en/git-check-ref-format.txt:101
@@ -14100,7 +14100,7 @@ msgstr "--[no-]allow-onelevel"
 #: en/git-check-ref-format.txt:105
 #, priority:100
 msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components).  The default is `--no-allow-onelevel`."
-msgstr ""
+msgstr "控制是否接受单级参考名称（即不包含多个 `/` 分隔的参考名称）。 默认值是 `--no-allow-onelevel`。"
  
 #. type: Labeled list
 #: en/git-check-ref-format.txt:106
@@ -14112,7 +14112,7 @@ msgstr "--refspec-pattern"
 #: en/git-check-ref-format.txt:112
 #, priority:100
 msgid "Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories).  If this option is enabled, <refname> is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)."
-msgstr ""
+msgstr "将 <引用名> 解释为引用规范的参考名称模式（如用于远程仓库）。 如果这个选项被启用，<引用名> 允许在引用规范中包含一个 `*`（例如， `foo/bar*/baz` 或 `foo/bar*baz/`，但不允许 `foo/bar*/baz*`）。"
  
 #. type: Labeled list
 #: en/git-check-ref-format.txt:113
@@ -14124,13 +14124,13 @@ msgstr "--normalize"
 #: en/git-check-ref-format.txt:120
 #, priority:100
 msgid "Normalize 'refname' by removing any leading slash (`/`)  characters and collapsing runs of adjacent slashes between name components into a single slash.  If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status.  (`--print` is a deprecated way to spell `--normalize`.)"
-msgstr ""
+msgstr "将 ‘引用名’ 规范化，去掉任何前导斜线（`/`）字符，并将名称成分之间的相邻斜线折叠成一个斜线。 如果规范化后的引用名有效，则将其打印到标准输出，并以 0 的状态退出，否则以非零状态退出。 (`--print` 是 `--normalize` 的一种废弃的拼写方式。)"
  
 #. type: Plain text
 #: en/git-check-ref-format.txt:126
 #, priority:100
 msgid "Print the name of the previous thing checked out:"
-msgstr ""
+msgstr "打印前一个检出的东西的名称："
  
 #. type: delimited block -
 #: en/git-check-ref-format.txt:129
@@ -14142,7 +14142,7 @@ msgstr "$ git check-ref-format --branch @{-1}\n"
 #: en/git-check-ref-format.txt:132
 #, priority:100
 msgid "Determine the reference name to use for a new branch:"
-msgstr ""
+msgstr "确定新分支要使用的引用名称："
  
 #. type: delimited block -
 #: en/git-check-ref-format.txt:136
@@ -14182,49 +14182,49 @@ msgstr ""
 #: en/git-cherry-pick.txt:21
 #, priority:100
 msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each.  This requires your working tree to be clean (no modifications from the HEAD commit)."
-msgstr ""
+msgstr "给出一个或多个现有的提交，应用每个提交所带来的变化，为每个提交记录一个新的提交。 这需要您的工作区是干净的（没有对 HEAD 提交的修改）。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:24
 #, priority:100
 msgid "When it is not obvious how to apply a change, the following happens:"
-msgstr ""
+msgstr "当如何应用一个变化不明显时，会发生以下情况："
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:27
 #, priority:100
 msgid "The current branch and `HEAD` pointer stay at the last commit successfully made."
-msgstr ""
+msgstr "当前的分支和 `HEAD` 指针保持在最后一次成功提交的位置。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:29
 #, priority:100
 msgid "The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the change that is difficult to apply."
-msgstr ""
+msgstr "`CHERRY_PICK_HEAD` 引用被设置为指向引入难以应用的修改的提交。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:31
 #, priority:100
 msgid "Paths in which the change applied cleanly are updated both in the index file and in your working tree."
-msgstr ""
+msgstr "在索引文件和你的工作区中，更改应用得很干净的路径都被更新。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:36
-#, priority:100
+#, fuzzy, priority:100
 msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1].  The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`."
-msgstr ""
+msgstr "对于冲突的路径，索引文件最多记录三个版本，如 linkgit:git-merge[1] 的 \"TRUE MERGE \"部分所述。 工作区文件将包括对冲突的描述，括号里是通常的冲突标记 `<<<<<<<` 和 `>>>>>>>`。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:37
 #, priority:100
 msgid "No other modifications are made."
-msgstr ""
+msgstr "不做其他修改。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:40
 #, priority:100
 msgid "See linkgit:git-merge[1] for some hints on resolving such conflicts."
-msgstr ""
+msgstr "参见 linkgit:git-merge[1] 以了解一些解决此类冲突的提示。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:43 en/git-merge.txt:127 en/git-revert.txt:36 en/git-verify-commit.txt:27
@@ -14236,13 +14236,13 @@ msgstr "<commit>..."
 #: en/git-cherry-pick.txt:52
 #, ignore-ellipsis, priority:100
 msgid "Commits to cherry-pick.  For a more complete list of ways to spell commits, see linkgit:gitrevisions[7].  Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
-msgstr ""
+msgstr "拣选（cherry-pick）的提交。 更完整的拼写提交的方法列表，见 linkgit:gitrevisions[7]。 可以传递提交集，但默认不做遍历，就像指定了 `--no-walk` 选项一样，见 linkgit:git-rev-list[1]。注意，指定一个范围会把所有 <提交>... 参数送入一个单一的修订版（见后面的例子，使用 'maint master...next'）。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:57
 #, priority:100
 msgid "With this option, 'git cherry-pick' will let you edit the commit message prior to committing."
-msgstr ""
+msgstr "有了这个选项，'git cherry-pick' 会让你在提交前编辑提交信息。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:58 en/git-commit.txt:232 en/git-revert.txt:70 en/git-tag.txt:187 en/merge-options.txt:38
@@ -14254,7 +14254,7 @@ msgstr "--cleanup=<模式>"
 #: en/git-cherry-pick.txt:64 en/git-revert.txt:76
 #, priority:100
 msgid "This option determines how the commit message will be cleaned up before being passed on to the commit machinery. See linkgit:git-commit[1] for more details. In particular, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on in the case of a conflict."
-msgstr ""
+msgstr "这个选项决定了提交信息在传递给提交机制之前将如何进行清理。更多细节见 linkgit:git-commit[1]。特别是，如果 '<模式>' 的值为 `scissors`，那么在发生冲突时，`scissors` 将被附加到 `MERGE_MSG` 上。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:65 en/git-clean.txt:63
@@ -14266,13 +14266,13 @@ msgstr "-x"
 #: en/git-cherry-pick.txt:78
 #, ignore-ellipsis, priority:100
 msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from.  This is done only for cherry picks without conflicts.  Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient.  If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
-msgstr ""
+msgstr "在记录提交时，在原始提交信息中添加一行 \"(cherry picked from commit ...)\"，以表明这个改动是从哪个提交中拣选的。 这只适用于没有冲突的拣选。 如果你是从自己的私有分支中偷梁换柱，请不要使用这个选项，因为这个信息对接收者来说是无用的。 另一方面，如果您是在两个公开可见的分支之间进行拣选（例如，从开发分支向维护分支回传一个旧版本的修正），添加这一信息会很有用。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:83
 #, priority:100
 msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it.  Now the default is not to do `-x` so this option is a no-op."
-msgstr ""
+msgstr "过去，该命令默认为做上述的 `-x`，`-r` 是禁用它。 现在默认是不做 `-x` ，所以这个选项是一个无用的选项。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:84
@@ -14290,7 +14290,7 @@ msgstr "--mainline parent-number"
 #: en/git-cherry-pick.txt:91
 #, priority:100
 msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline.  This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
-msgstr ""
+msgstr "通常你不能对一个合并进行拣选，因为你不知道合并的哪一边应该被视为主线。 这个选项指定了主线的父号（从 1 开始），允许拣选相对于指定的父号重放修改。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
@@ -14302,19 +14302,19 @@ msgstr "--no-commit"
 #: en/git-cherry-pick.txt:101
 #, priority:100
 msgid "Usually the command automatically creates a sequence of commits.  This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index, without making any commit.  In addition, when this option is used, your index does not have to match the HEAD commit.  The cherry-pick is done against the beginning state of your index."
-msgstr ""
+msgstr "通常该命令会自动创建一连串的提交。 这个标志会对您的工作树和索引进行必要的修改，以摘取每个命名的提交，而不做任何提交。 此外，使用这个选项时，您的索引不需要与 HEAD 提交相匹配。 挑拣是针对你的索引的起始状态进行的。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:104
 #, priority:100
 msgid "This is useful when cherry-picking more than one commits' effect to your index in a row."
-msgstr ""
+msgstr "这在连续摘取多个提交的效果给你的索引时很有用。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:109 en/git-revert.txt:104
 #, priority:100
 msgid "Add a `Signed-off-by` trailer at the end of the commit message.  See the signoff option in linkgit:git-commit[1] for more information."
-msgstr ""
+msgstr "在提交信息的末尾添加一个 `Signed-off-by` 的尾注。 更多信息见 linkgit:git-commit[1] 中的 signoff 选项。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:119 en/merge-options.txt:46 en/merge-options.txt:61
@@ -14326,13 +14326,13 @@ msgstr "--ff"
 #: en/git-cherry-pick.txt:123
 #, priority:100
 msgid "If the current HEAD is the same as the parent of the cherry-pick'ed commit, then a fast forward to this commit will be performed."
-msgstr ""
+msgstr "如果当前的 HEAD 与拣选的提交的父本相同，那么将执行快速合并到这个提交。"
  
 #. type: Plain text
 #: en/git-cherry-pick.txt:136
 #, priority:100
 msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option.  Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent).  Commits which are made empty due to a previous commit are dropped.  To force the inclusion of those commits use `--keep-redundant-commits`."
-msgstr ""
+msgstr "默认情况下，对空提交的偷取会失败，表明需要明确调用 `git commit --allow-empty`。这个选项覆盖了这一行为，允许在偷取时自动保留空的提交。注意，当 \"--ff\" 生效时，即使没有这个选项，符合 “快速合并” 要求的空提交也会被保留。 还要注意的是，使用这个选项只保留最初为空的提交（即提交与它的父级记录在同一目录苏上）。 由于之前的提交而导致的空的提交会被放弃。 如果要强制包含这些提交，请使用 `--keep-redundant-commits`。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:137 en/git-commit.txt:226 en/git-rebase.txt:355
@@ -14344,7 +14344,7 @@ msgstr "--allow-empty-message"
 #: en/git-cherry-pick.txt:141
 #, priority:100
 msgid "By default, cherry-picking a commit with an empty message will fail.  This option overrides that behavior, allowing commits with empty messages to be cherry picked."
-msgstr ""
+msgstr "默认情况下，对空信息的提交进行拣选会失败。 这个选项覆盖了这一行为，允许对空信息的提交进行拣选。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:142
@@ -14356,7 +14356,7 @@ msgstr "--keep-redundant-commits"
 #: en/git-cherry-pick.txt:148
 #, priority:100
 msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty.  By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object.  Implies `--allow-empty`."
-msgstr ""
+msgstr "如果被摘取的提交与当前历史中已有的提交重复，它将变成空的。 默认情况下，这些多余的提交会导致 `cherry-pick` 停止，以便用户能够检查提交。这个选项覆盖了这一行为，并创建一个空的提交对象。暗含 `--allow-empty`。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:376 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:144
@@ -14368,7 +14368,7 @@ msgstr "--strategy=<strategy>"
 #: en/git-cherry-pick.txt:153 en/git-revert.txt:109
 #, priority:100
 msgid "Use the given merge strategy.  Should only be used once.  See the MERGE STRATEGIES section in linkgit:git-merge[1] for details."
-msgstr ""
+msgstr "使用给定的合并策略。 应该只使用一次。 详见 linkgit:git-merge[1] 中的合并策略部分。"
  
 #. type: Labeled list
 #: en/git-cherry-pick.txt:154 en/git-revert.txt:110
@@ -14386,7 +14386,7 @@ msgstr "--strategy-option=<option>"
 #: en/git-cherry-pick.txt:158 en/git-revert.txt:114
 #, priority:100
 msgid "Pass the merge strategy-specific option through to the merge strategy.  See linkgit:git-merge[1] for details."
-msgstr ""
+msgstr "将合并策略特有的选项传递给合并策略。 详见 linkgit:git-merge[1]。"
  
 #. type: Title -
 #: en/git-cherry-pick.txt:162 en/git-revert.txt:127
@@ -14574,7 +14574,7 @@ msgstr "输出 `<limit>...<head>` 中每个提交的 SHA1，对于在 <upstream>
 #: en/git-cherry.txt:31
 #, priority:100
 msgid "Show the commit subjects next to the SHA1s."
-msgstr ""
+msgstr "在 SHA1 旁边显示提交主题。"
  
 #. type: Labeled list
 #: en/git-cherry.txt:32 en/git-rebase.txt:277
@@ -14873,7 +14873,7 @@ msgstr "在标准的忽略规则之外，使用给定的排除模式（见 linkg
 #: en/git-clean.txt:70
 #, priority:100
 msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line.  This allows removing all untracked files, including build products.  This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
-msgstr ""
+msgstr "不要使用标准的忽略规则（见linkgit:gitignore[5]），但仍然使用命令行中用 `-e` 选项给出的忽略规则。 这允许删除所有未跟踪的文件，包括构建产品。 这可以用来（可能与 'git restore' 或 'git reset' 一起使用）创建一个原始的工作目录来测试一个干净的构建。"
  
 #. type: Labeled list
 #: en/git-clean.txt:71
@@ -14885,19 +14885,19 @@ msgstr "-X"
 #: en/git-clean.txt:74
 #, priority:100
 msgid "Remove only files ignored by Git.  This may be useful to rebuild everything from scratch, but keep manually created files."
-msgstr ""
+msgstr "只删除被 Git 忽略的文件。 这对于从头开始重建一切，但保留手动创建的文件可能很有用。"
  
 #. type: Title -
 #: en/git-clean.txt:76
 #, no-wrap, priority:100
 msgid "Interactive mode"
-msgstr ""
+msgstr "交互模式"
  
 #. type: Plain text
 #: en/git-clean.txt:80
 #, priority:100
 msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
-msgstr ""
+msgstr "当命令进入交互式模式时，它会显示要清理的文件和目录，并进入其交互式命令循环。"
  
 #. type: delimited block -
 #: en/git-clean.txt:91
@@ -14907,19 +14907,19 @@ msgid ""
 "\t1: clean                2: filter by pattern    3: select by numbers\n"
 "\t4: ask each             5: quit                 6: help\n"
 "    What now> 1\n"
-msgstr ""
+msgstr "    *** Commands ***\n\t1: clean                2: filter by pattern    3: select by numbers\n\t4: ask each             5: quit                 6: help\n    What now> 1\n"
  
 #. type: Plain text
 #: en/git-clean.txt:94
 #, priority:100
 msgid "You also could say `c` or `clean` above as long as the choice is unique."
-msgstr ""
+msgstr "你也可以在上面输入 `c` 或 `clean`，只要选择是唯一的。"
  
 #. type: Plain text
 #: en/git-clean.txt:96
 #, priority:100
 msgid "The main command loop has 6 subcommands."
-msgstr ""
+msgstr "主命令循环有 6 个子命令。"
  
 #. type: Labeled list
 #: en/git-clean.txt:97
@@ -14931,43 +14931,43 @@ msgstr "清理"
 #: en/git-clean.txt:100
 #, priority:100
 msgid "Start cleaning files and directories, and then quit."
-msgstr ""
+msgstr "开始清理文件和目录，然后退出。"
  
 #. type: Labeled list
 #: en/git-clean.txt:101
 #, no-wrap, priority:100
 msgid "filter by pattern"
-msgstr ""
+msgstr "按模式过滤"
  
 #. type: Plain text
 #: en/git-clean.txt:109
 #, priority:100
 msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion.  E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
-msgstr ""
+msgstr "这将显示要删除的文件和目录，并发出 \"Input ignore patterns>>（输入忽略模式）\" 提示。你可以输入以空格分隔的模式来排除文件和目录的删除。 例如，\"*.c *.h \" 将排除以 \".c \" 和 \".h\" 结尾的文件不被删除。当你对过滤后的结果满意时，按回车（空）键回到主菜单。"
  
 #. type: Labeled list
 #: en/git-clean.txt:110
 #, no-wrap, priority:100
 msgid "select by numbers"
-msgstr ""
+msgstr "按数字选择"
  
 #. type: Plain text
 #: en/git-clean.txt:121
 #, priority:100
 msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma.  Also you can say ranges.  E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list.  If the second number in a range is omitted, all remaining items are selected.  E.g. \"7-\" to choose 7,8,9 from the list.  You can say '*' to choose everything.  Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
-msgstr ""
+msgstr "这显示了要删除的文件和目录，并发出 \"Select items to delete>>（选择要删除的项目）\"提示。当提示像这样以双 '>>' 结束时，你可以做一个以上的选择，用空格或逗号连接起来。 你也可以说范围。 例如，\"2-5 7,9\" 可以从列表中选择 2,3,4,5,7,9。 如果一个范围内的第二个数字被省略了，所有剩下的项目都会被选中。 例如：\"7-\" 从列表中选择 7、8、9。 你可以输入 '*' 来选择所有项目。 另外，当你对过滤后的结果满意时，按回车（空）键回到主菜单。"
  
 #. type: Labeled list
 #: en/git-clean.txt:122
 #, no-wrap, priority:100
 msgid "ask each"
-msgstr ""
+msgstr "逐一询问"
  
 #. type: Plain text
 #: en/git-clean.txt:127
 #, priority:100
 msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
-msgstr ""
+msgstr "这将开始进行清理，你必须逐一确认，以便删除项目。请注意，这个动作没有上述两个动作那么有效。"
  
 #. type: Labeled list
 #: en/git-clean.txt:128
@@ -14979,7 +14979,7 @@ msgstr "&退出"
 #: en/git-clean.txt:131
 #, priority:100
 msgid "This lets you quit without do cleaning."
-msgstr ""
+msgstr "这让你不用做清理就可以退出。"
  
 #. type: Labeled list
 #: en/git-clean.txt:132
@@ -14991,7 +14991,7 @@ msgstr "帮助"
 #: en/git-clean.txt:135
 #, priority:100
 msgid "Show brief usage of interactive git-clean."
-msgstr ""
+msgstr "显示交互式 git-clean 的简要用法。"
  
 #. type: Plain text
 #: en/git-clean.txt:146 en/git-status.txt:523
@@ -17136,7 +17136,7 @@ msgstr "--unset"
 #: en/git-config.txt:177
 #, priority:100
 msgid "Remove the line matching the key from config file."
-msgstr ""
+msgstr "从配置文件中删除与该键匹配的行。"
  
 #. type: Labeled list
 #: en/git-config.txt:178
@@ -17178,31 +17178,31 @@ msgstr "--type <类型>"
 #: en/git-config.txt:195
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
-msgstr ""
+msgstr "'git config' 将确保任何输入或输出在给定的类型约束下是有效的，并将以 `<类型>` 的规范形式将输出的值规范化。"
  
 #. type: Plain text
 #: en/git-config.txt:197
 #, priority:100
 msgid "Valid `<type>`'s include:"
-msgstr ""
+msgstr "有效的 `<类型>` 包括："
  
 #. type: Plain text
 #: en/git-config.txt:199
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
-msgstr ""
+msgstr "'bool'：将数值规范化为 \"true\" 或 \"false\"。"
  
 #. type: Plain text
 #: en/git-config.txt:202
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
-msgstr ""
+msgstr "'int'：将数值规范化为简单的十进制数字。可选的后缀 'k'、'm' 或 'g'将导致输入的值被乘以 1024、1048576 或 1073741824。"
  
 #. type: Plain text
 #: en/git-config.txt:204
 #, priority:100
 msgid "'bool-or-int': canonicalize according to either 'bool' or 'int', as described above."
-msgstr ""
+msgstr "'bool-or-int'：如上所述，根据 'bool '或 'int' 进行规范化。"
  
 #. type: Plain text
 #: en/git-config.txt:208
@@ -17214,13 +17214,13 @@ msgstr "'path': canonicalize by adding a leading `~` to the value of `$HOME` and
 #: en/git-config.txt:210
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
-msgstr ""
+msgstr "'expiry-date'：通过将固定或相对日期字符串转换为时间戳进行规范化。这个指定符在设置值时没有影响。"
  
 #. type: Plain text
 #: en/git-config.txt:214
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
-msgstr ""
+msgstr "'color'： 当获得一个值时，通过转换为 ANSI 颜色转义序列进行规范化。当设置一个值时，会进行理智检查，以确保给定的值可以被规范化为 ANSI 颜色，但它会按原样写入。"
  
 #. type: Labeled list
 #: en/git-config.txt:216
@@ -17256,7 +17256,7 @@ msgstr "--expiry-date"
 #: en/git-config.txt:223
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
-msgstr ""
+msgstr "选择类型指定器的历史选项。更倾向于选择 `--type`（见上文）。"
  
 #. type: Labeled list
 #: en/git-config.txt:224
@@ -17268,19 +17268,19 @@ msgstr "--no-type"
 #: en/git-config.txt:228
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
-msgstr ""
+msgstr "取消先前设置的类型指定器（如果先前有的话）。这个选项要求 'git config' 不对检索的变量进行规范化处理。 `--no-type` 在没有 `--type=<类型>` 或 `--<类型>` 的情况下没有作用。"
  
 #. type: Plain text
 #: en/git-config.txt:237
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
-msgstr ""
+msgstr "对于所有输出值和/或键的选项，总是用空字符（而不是换行）结束值。使用换行符作为键和值之间的分隔符。这样可以安全地解析输出，而不会被包含换行的值所混淆。"
  
 #. type: Plain text
 #: en/git-config.txt:241
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
-msgstr ""
+msgstr "只输出 `--list` 或 `--get-regexp` 的配置变量的名称。"
  
 #. type: Labeled list
 #: en/git-config.txt:242
@@ -17292,7 +17292,7 @@ msgstr "--show-origin"
 #: en/git-config.txt:247
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
-msgstr ""
+msgstr "用来源类型（文件、标准输入、blob、命令行）和实际来源（配置文件路径、引用或 blob id（如适用））对所有查询到的配置选项的输出进行扩充。"
  
 #. type: Labeled list
 #: en/git-config.txt:248
@@ -17304,7 +17304,7 @@ msgstr "--show-scope"
 #: en/git-config.txt:252
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (worktree, local, global, system, command)."
-msgstr ""
+msgstr "类似于 `--show-origin`，它用该值的范围（工作树、本地、全局、系统、命令）来增加所有查询的配置选项的输出。"
  
 #. type: Labeled list
 #: en/git-config.txt:253
@@ -17316,7 +17316,7 @@ msgstr "--get-colorbool name [stdout-is-tty]"
 #: en/git-config.txt:263
 #, priority:100
 msgid "Find the color setting for `<name>` (e.g. `color.diff`) and output \"true\" or \"false\".  `<stdout-is-tty>` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `<stdout-is-tty>` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
-msgstr ""
+msgstr "找到 `<名称>` 的颜色设置（例如 `color.diff`），并输出 \"true\" 或 \"false\"。 `<stdout-is-tty>` 应该是 \"true\" 或 \"false\"，当配置为 \"auto\" 时将被考虑。 如果 `<stdout-is-tty>` 缺失，则检查命令本身的标准输出，如果要使用颜色则以状态 0 退出，否则以状态 1 退出。 当 `name` 的颜色设置未被定义时，该命令使用 `color.ui` 作为回退。"
  
 #. type: Labeled list
 #: en/git-config.txt:264
@@ -17328,19 +17328,19 @@ msgstr "--get-color name [default]"
 #: en/git-config.txt:270
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
-msgstr ""
+msgstr "找到为 `name` 配置的颜色（例如：`color.diff.new`），并将其作为 ANSI 颜色转义序列输出到标准输出。 如果没有为 `name` 配置的颜色，则使用可选的 `default` 参数来代替。"
  
 #. type: Plain text
 #: en/git-config.txt:274
 #, priority:100
 msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
-msgstr ""
+msgstr "`--type=color [--default=<默认>]` 比 `--get-color` 更受欢迎（但注意 `--get-color` 会省略 `--type=color` 打印的尾部换行）。"
  
 #. type: Plain text
 #: en/git-config.txt:279
 #, priority:100
 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
-msgstr ""
+msgstr "打开一个编辑器来修改指定的配置文件；可以是 `--system`，`--global`，也可以是仓库（默认）。"
  
 #. type: Labeled list
 #: en/git-config.txt:280
@@ -17352,31 +17352,31 @@ msgstr "--[no-]includes"
 #: en/git-config.txt:285
 #, priority:100
 msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
-msgstr ""
+msgstr "在查找数值时尊重配置文件中的 `include.*` 指令。当给出一个特定的文件时，默认为 `off`（例如，使用 `--file`、`--global` 等），当搜索所有配置文件时，默认为 `on`。"
  
 #. type: Labeled list
 #: en/git-config.txt:286
 #, no-wrap, priority:100
 msgid "--default <value>"
-msgstr ""
+msgstr "--default <值>"
  
 #. type: Plain text
 #: en/git-config.txt:289
 #, priority:100
 msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
-msgstr ""
+msgstr "当使用 `--get` 时，如果没有找到所要求的变量，则表现为 <值> 是分配给该变量的值。"
  
 #. type: Plain text
 #: en/git-config.txt:295
 #, priority:100
 msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results.  The default is to use a pager."
-msgstr ""
+msgstr "`pager.config` 只在列出配置时被尊重，即在使用 `--list` 或任何可能返回多个结果的 `--get-*` 时。 默认情况下是使用 pager。"
  
 #. type: Plain text
 #: en/git-config.txt:302
 #, priority:100
 msgid "By default, 'git config' will read configuration options from multiple files:"
-msgstr ""
+msgstr "默认情况下，'git config' 会从多个文件中读取配置选项："
  
 #. type: Plain text
 #: en/git-config.txt:303 en/git-config.txt:353
@@ -17388,7 +17388,7 @@ msgstr "$(prefix)/etc/gitconfig"
 #: en/git-config.txt:305
 #, priority:100
 msgid "System-wide configuration file."
-msgstr ""
+msgstr "全系统的配置文件。"
  
 #. type: Plain text
 #: en/git-config.txt:306 en/git-config.txt:356
@@ -17406,25 +17406,25 @@ msgstr "~/.gitconfig"
 #: en/git-config.txt:311
 #, priority:100
 msgid "User-specific configuration files. When the XDG_CONFIG_HOME environment variable is not set or empty, $HOME/.config/ is used as $XDG_CONFIG_HOME."
-msgstr ""
+msgstr "用户特定的配置文件。当 XDG_CONFIG_HOME 环境变量没有设置或为空时，$HOME/.config/ 被用作 $XDG_CONFIG_HOME。"
  
 #. type: Plain text
 #: en/git-config.txt:314
 #, priority:100
 msgid "These are also called \"global\" configuration files. If both files exist, both files are read in the order given above."
-msgstr ""
+msgstr "这些文件也被称为 “全局” 配置文件。如果这两个文件都存在，就按照上面的顺序读取这两个文件。"
  
 #. type: Plain text
 #: en/git-config.txt:315 en/git-config.txt:361
 #, no-wrap, priority:100
 msgid "$GIT_DIR/config"
-msgstr ""
+msgstr "$GIT_DIR/config"
  
 #. type: Plain text
 #: en/git-config.txt:317
 #, priority:100
 msgid "Repository specific configuration file."
-msgstr ""
+msgstr "仓库特定的配置文件。"
  
 #. type: Plain text
 #: en/git-config.txt:318 en/git-config.txt:364
@@ -17436,49 +17436,49 @@ msgstr "$GIT_DIR/config.worktree"
 #: en/git-config.txt:321
 #, priority:100
 msgid "This is optional and is only searched when `extensions.worktreeConfig` is present in $GIT_DIR/config."
-msgstr ""
+msgstr "这是可选的，只有当 $GIT_DIR/config 中存在 `extensions.worktreeConfig` 时才会被搜索到。"
  
 #. type: Plain text
 #: en/git-config.txt:324
 #, priority:100
 msgid "You may also provide additional configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
-msgstr ""
+msgstr "你也可以在运行任何 git 命令时通过使用 `-c` 选项提供额外的配置参数。详情见 linkgit:git[1]。"
  
 #. type: Plain text
 #: en/git-config.txt:330
 #, priority:100
 msgid "Options will be read from all of these files that are available. If the global or the system-wide configuration files are missing or unreadable they will be ignored. If the repository configuration file is missing or unreadable, 'git config' will exit with a non-zero error code. An error message is produced if the file is unreadable, but not if it is missing."
-msgstr ""
+msgstr "选项将从所有这些可用的文件中读取。如果全局或全系统的配置文件丢失或不可读，它们将被忽略。如果版本库的配置文件丢失或不可读，'git config' 将以非零的错误代码退出。如果文件不可读，会产生一个错误信息，但如果文件丢失，则不会产生错误信息。"
  
 #. type: Plain text
 #: en/git-config.txt:334
 #, priority:100
 msgid "The files are read in the order given above, with last value found taking precedence over values read earlier.  When multiple values are taken then all values of a key from all files will be used."
-msgstr ""
+msgstr "文件是按照上述顺序读取的，最后发现的值优先于之前读取的值。 当有多个值时，将使用所有文件中某个键的所有值。"
  
 #. type: Plain text
 #: en/git-config.txt:338
 #, priority:100
 msgid "By default, options are only written to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
-msgstr ""
+msgstr "默认情况下，选项只被写入版本库特定的配置文件中。请注意，这也会影响到 `--replace-all` 和 `--unset` 等选项。*'git config' 一次只能改变一个文件*。"
  
 #. type: Plain text
 #: en/git-config.txt:343
 #, priority:100
 msgid "You can limit which configuration sources are read from or written to by specifying the path of a file with the `--file` option, or by specifying a configuration scope with `--system`, `--global`, `--local`, or `--worktree`.  For more, see <<OPTIONS>> above."
-msgstr ""
+msgstr "你可以通过使用 `--file` 选项指定文件路径，或者使用 `--system`、`--global`、`--local` 或 `--worktree` 指定配置范围，来限制从哪些配置源读取或写入。 更多内容请参见上面的 <<OPTIONS>>。"
  
 #. type: Title -
 #: en/git-config.txt:346
 #, no-wrap, priority:100
 msgid "SCOPES"
-msgstr ""
+msgstr "范围"
  
 #. type: Plain text
 #: en/git-config.txt:350
 #, priority:100
 msgid "Each configuration source falls within a configuration scope. The scopes are:"
-msgstr ""
+msgstr "每个配置源都属于一个配置范围。这些范围包括："
  
 #. type: Labeled list
 #: en/git-config.txt:351
@@ -17517,7 +17517,7 @@ msgstr "命令"
 #: en/git-config.txt:368
 #, priority:100
 msgid "GIT_CONFIG_{COUNT,KEY,VALUE} environment variables (see <<ENVIRONMENT>> below)"
-msgstr ""
+msgstr "GIT_CONFIG_{COUNT,KEY,VALUE} 环境变量（见下文 <<ENVIRONMENT>>）"
  
 #. type: Plain text
 #: en/git-config.txt:370
@@ -17529,19 +17529,19 @@ msgstr "和 `--date` 选项"
 #: en/git-config.txt:373
 #, priority:100
 msgid "With the exception of 'command', each scope corresponds to a command line option: `--system`, `--global`, `--local`, `--worktree`."
-msgstr ""
+msgstr "除了 'command' 之外，每个范围都对应于一个命令行选项：`--system`、`--global`、`--local`、`--worktree`。"
  
 #. type: Plain text
 #: en/git-config.txt:378
 #, priority:100
 msgid "When reading options, specifying a scope will only read options from the files within that scope. When writing options, specifying a scope will write to the files within that scope (instead of the repository specific configuration file). See <<OPTIONS>> above for a complete description."
-msgstr ""
+msgstr "当读取选项时，指定一个范围将只从该范围内的文件读取选项。当写选项时，指定一个范围将写到该范围内的文件（而不是仓库的特定配置文件）。参见上面的<<OPTIONS >>以获得完整的描述。"
  
 #. type: Plain text
 #: en/git-config.txt:382
 #, priority:100
 msgid "Most configuration options are respected regardless of the scope it is defined in, but some options are only respected in certain scopes. See the respective option's documentation for the full details."
-msgstr ""
+msgstr "大多数配置选项无论在哪个作用域中定义都会被尊重，但有些选项只在某些作用域中被尊重。完整的细节请参见相应选项的文档。"
  
 #. type: Title ~
 #: en/git-config.txt:384
@@ -17553,13 +17553,13 @@ msgstr "配置"
 #: en/git-config.txt:389
 #, priority:100
 msgid "Protected configuration refers to the 'system', 'global', and 'command' scopes.  For security reasons, certain options are only respected when they are specified in protected configuration, and ignored otherwise."
-msgstr ""
+msgstr "受保护的配置指的是 'system'、'global' 和 'command' 范围。 出于安全考虑，某些选项只有在受保护的配置中指定时才会被尊重，否则会被忽略。"
  
 #. type: Plain text
 #: en/git-config.txt:394
 #, priority:100
 msgid "Git treats these scopes as if they are controlled by the user or a trusted administrator. This is because an attacker who controls these scopes can do substantial harm without using Git, so it is assumed that the user's environment protects these scopes against attackers."
-msgstr ""
+msgstr "Git 将这些作用域视为由用户或可信的管理员控制。这是因为控制这些作用域的攻击者可以在不使用 Git 的情况下造成实质性的伤害，所以假定用户的环境会保护这些作用域免受攻击。"
  
 #. type: Title -
 #: en/git-config.txt:397 en/git-cvsserver.txt:308 en/git-daemon.txt:333 en/git-http-backend.txt:257 en/git-notes.txt:326 en/git-upload-pack.txt:51
@@ -17583,7 +17583,7 @@ msgstr "GIT_CONFIG_SYSTEM"
 #: en/git-config.txt:403
 #, priority:100
 msgid "Take the configuration from the given files instead from global or system-level configuration. See linkgit:git[1] for details."
-msgstr ""
+msgstr "从给定的文件中获取配置，而不是从全局或系统级配置中获取。详情见 linkgit:git[1]。"
  
 #. type: Labeled list
 #: en/git-config.txt:404
@@ -18212,13 +18212,13 @@ msgstr ""
 #: en/git-credential-store.txt:42
 #, priority:100
 msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>."
-msgstr ""
+msgstr "使用 `<路径>` 来查询和存储证书。该文件将设置其文件系统权限，以防止系统中的其他用户读取它，但不会被加密或其他保护。如果没有指定，将从 `~/.git-credentials` 和 `$XDG_CONFIG_HOME/git/credentials` 中搜索证书，如果证书存在，将被写入 `~/.git-credentials`，如果证书存在而前者不存在，则写入 `$XDG_CONFIG_HOME/git/credentials`。参见 <<FILES>>。"
  
 #. type: Plain text
 #: en/git-credential-store.txt:49
 #, priority:100
 msgid "If not set explicitly with `--file`, there are two files where git-credential-store will search for credentials in order of precedence:"
-msgstr ""
+msgstr "如果没有用 `--file` 明确设置，有两个文件，git-credential-store 将按照优先顺序搜索证书："
  
 #. type: Labeled list
 #: en/git-credential-store.txt:50
@@ -18230,37 +18230,37 @@ msgstr "~/.git-credentials"
 #: en/git-credential-store.txt:52
 #, priority:100
 msgid "User-specific credentials file."
-msgstr ""
+msgstr "用户特定的凭证文件。"
  
 #. type: Labeled list
 #: en/git-credential-store.txt:53
 #, no-wrap, priority:100
 msgid "$XDG_CONFIG_HOME/git/credentials"
-msgstr ""
+msgstr "$XDG_CONFIG_HOME/git/credentials"
  
 #. type: Plain text
 #: en/git-credential-store.txt:59
 #, priority:100
 msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it."
-msgstr ""
+msgstr "第二个用户专用的证书文件。如果 '$XDG_CONFIG_HOME' 没有设置或为空，`$HOME/.config/git/credentials` 将被使用。如果 `~/.git-credentials` 也有匹配的凭证，那么存储在该文件中的任何凭证将不会被使用。如果你有时使用不支持该文件的旧版本的 Git，那么不创建该文件是个好主意。"
  
 #. type: Plain text
 #: en/git-credential-store.txt:63
 #, priority:100
 msgid "For credential lookups, the files are read in the order given above, with the first matching credential found taking precedence over credentials found in files further down the list."
-msgstr ""
+msgstr "对于凭证查询，文件按上述顺序读取，发现的第一个匹配凭证优先于在列表后面的文件中发现的凭证。"
  
 #. type: Plain text
 #: en/git-credential-store.txt:67
 #, priority:100
 msgid "Credential storage will by default write to the first existing file in the list. If none of these files exist, `~/.git-credentials` will be created and written to."
-msgstr ""
+msgstr "凭证存储将默认写到列表中的第一个现有文件。如果这些文件都不存在，`~/.git-credentials` 将被创建并写入。"
  
 #. type: Plain text
 #: en/git-credential-store.txt:69
 #, priority:100
 msgid "When erasing credentials, matching credentials will be erased from all files."
-msgstr ""
+msgstr "擦除证书时，匹配的证书将从所有文件中擦除。"
  
 #. type: delimited block -
 #: en/git-credential-store.txt:81
@@ -18292,13 +18292,13 @@ msgstr ""
 #: en/git-credential-store.txt:88
 #, no-wrap, priority:100
 msgid "STORAGE FORMAT"
-msgstr ""
+msgstr "存储格式"
  
 #. type: Plain text
 #: en/git-credential-store.txt:92
 #, priority:100
 msgid "The `.git-credentials` file is stored in plaintext. Each credential is stored on its own line as a URL like:"
-msgstr ""
+msgstr "`.git-credentials` 文件是以明文存储的。每个凭证都以 URL 的形式存储在自己的一行中，比如："
  
 #. type: delimited block -
 #: en/git-credential-store.txt:95
@@ -18310,13 +18310,13 @@ msgstr "https://user:pass@example.com\n"
 #: en/git-credential-store.txt:100
 #, priority:100
 msgid "No other kinds of lines (e.g. empty lines or comment lines) are allowed in the file, even though some may be silently ignored. Do not view or edit the file with editors."
-msgstr ""
+msgstr "文件中不允许有其他类型的行（如空行或注释行），尽管有些行可能被默默地忽略了。不要用编辑器查看或编辑该文件。"
  
 #. type: Plain text
 #: en/git-credential-store.txt:107
 #, priority:100
 msgid "When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file.  If the protocol, hostname, and username (if we already have one) match, then the password is returned to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information."
-msgstr ""
+msgstr "当 Git 需要对某个特定的 URL 上下文进行认证时，credential-store 会将该上下文视为一种模式，与凭证文件中的每个条目进行匹配。 如果协议、主机名和用户名（如果我们已经有了）相匹配，那么密码就会返回给 Git。更多信息见 linkgit:gitcredentials[7] 中关于配置的讨论。"
  
 #. type: Title =
 #: en/git-credential.txt:2
@@ -18328,19 +18328,19 @@ msgstr "git-credential(1)"
 #: en/git-credential.txt:7
 #, priority:100
 msgid "git-credential - Retrieve and store user credentials"
-msgstr ""
+msgstr "git-credential - 检索和存储用户证书"
  
 #. type: delimited block -
 #: en/git-credential.txt:12
 #, no-wrap, priority:100
 msgid "'git credential' (fill|approve|reject)\n"
-msgstr ""
+msgstr "'git credential' (fill|approve|reject)\n"
  
 #. type: Plain text
 #: en/git-credential.txt:24
 #, priority:100
 msgid "Git has an internal interface for storing and retrieving credentials from system-specific helpers, as well as prompting the user for usernames and passwords. The git-credential command exposes this interface to scripts which may want to retrieve, store, or prompt for credentials in the same manner as Git. The design of this scriptable interface models the internal C API; see credential.h for more background on the concepts."
-msgstr ""
+msgstr "Git 有一个内部接口，用于存储和检索来自系统特定帮助器的凭证，以及提示用户输入用户名和密码。git-credential 命令将这个接口暴露给脚本，这些脚本可能希望以与 Git 相同的方式检索、存储或提示凭证。这个脚本接口的设计仿照了内部的 C 语言应用程序接口；更多概念的背景见 credential.h。"
  
 #. type: Plain text
 #: en/git-credential.txt:28
@@ -18352,49 +18352,49 @@ msgstr "git-credential takes an \"action\" option on the command-line (one of `f
 #: en/git-credential.txt:35
 #, priority:100
 msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided."
-msgstr ""
+msgstr "如果动作是 `fill`，git-credential 将尝试通过读取配置文件、联系任何已配置的凭证助手或提示用户来向描述中添加 “用户名” 和 “密码” 属性。然后，凭证描述中的用户名和密码属性会和已经提供的属性一起打印到标准输出流。"
  
 #. type: Plain text
 #: en/git-credential.txt:39
 #, priority:100
 msgid "If the action is `approve`, git-credential will send the description to any configured credential helpers, which may store the credential for later use."
-msgstr ""
+msgstr "如果动作是 `approve`，git-credential 将把描述发送给任何配置的凭证助手，它们可以存储凭证供以后使用。"
  
 #. type: Plain text
 #: en/git-credential.txt:43
 #, priority:100
 msgid "If the action is `reject`, git-credential will send the description to any configured credential helpers, which may erase any stored credential matching the description."
-msgstr ""
+msgstr "如果动作是 `reject`，git-credential 将把描述发送到任何配置的凭证助手，这可能会删除任何与描述相匹配的存储凭证。"
  
 #. type: Plain text
 #: en/git-credential.txt:45
 #, priority:100
 msgid "If the action is `approve` or `reject`, no output should be emitted."
-msgstr ""
+msgstr "如果动作是 `approve` 或 `reject`，就不应该有输出。"
  
 #. type: Title -
 #: en/git-credential.txt:47
 #, no-wrap, priority:100
 msgid "TYPICAL USE OF GIT CREDENTIAL"
-msgstr ""
+msgstr "git 凭证的典型用途"
  
 #. type: Plain text
 #: en/git-credential.txt:51
 #, priority:100
 msgid "An application using git-credential will typically use `git credential` following these steps:"
-msgstr ""
+msgstr "使用 git-credential 的应用程序通常会按照以下步骤使用 `git credential`："
  
 #. type: Plain text
 #: en/git-credential.txt:53
 #, priority:100
 msgid "Generate a credential description based on the context."
-msgstr ""
+msgstr "根据上下文生成一个凭证描述。"
  
 #. type: Plain text
 #: en/git-credential.txt:59
 #, priority:100
 msgid "For example, if we want a password for `https://example.com/foo.git`, we might generate the following credential description (don't forget the blank line at the end; it tells `git credential` that the application finished feeding all the information it has):"
-msgstr ""
+msgstr "例如，如果我们想要一个 `https://example.com/foo.git` 的密码，我们可能会生成下面的凭证描述（别忘了最后的空行；它告诉 `git credential`，应用程序已经完成了所有信息的输入）："
  
 #. type: Plain text
 #: en/git-credential.txt:63
@@ -18403,13 +18403,13 @@ msgid ""
 "\t protocol=https\n"
 "\t host=example.com\n"
 "\t path=foo.git\n"
-msgstr ""
+msgstr "\t protocol=https\n\t host=example.com\n\t path=foo.git\n"
  
 #. type: Plain text
 #: en/git-credential.txt:69
 #, priority:100
 msgid "Ask git-credential to give us a username and password for this description. This is done by running `git credential fill`, feeding the description from step (1) to its standard input. The complete credential description (including the credential per se, i.e. the login and password) will be produced on standard output, like:"
-msgstr ""
+msgstr "要求 git-credential 为这个描述提供一个用户名和密码。这可以通过运行 `git credential fill` 来实现，将步骤（1）中的描述输入到其标准输入中。完整的凭证描述（包括凭证本身，即登录名和密码）将在标准输出中产生，比如："
  
 #. type: Plain text
 #: en/git-credential.txt:74
@@ -18419,67 +18419,67 @@ msgid ""
 "host=example.com\n"
 "username=bob\n"
 "password=secr3t\n"
-msgstr ""
+msgstr "protocol=https\nhost=example.com\nusername=bob\npassword=secr3t\n"
  
 #. type: Plain text
 #: en/git-credential.txt:79
 #, priority:100
 msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false."
-msgstr ""
+msgstr "在大多数情况下，这意味着输入中给出的属性将在输出中重复出现，但Git也可以修改凭证描述，例如，当协议是HTTP(s)且 `credential.useHttpPath` 为假时，删除 `path` 属性。"
  
 #. type: Plain text
 #: en/git-credential.txt:85
 #, priority:100
 msgid "If the `git credential` knew about the password, this step may not have involved the user actually typing this password (the user may have typed a password to unlock the keychain instead, or no user interaction was done if the keychain was already unlocked) before it returned `password=secr3t`."
-msgstr ""
+msgstr "如果`git credential` 知道密码，在返回 `password=secr3t` 之前，这一步可能不涉及用户实际输入这个密码（用户可能输入了一个密码来代替解锁钥匙串，或者如果钥匙串已经被解锁，则没有进行用户交互）。"
  
 #. type: Plain text
 #: en/git-credential.txt:88
 #, priority:100
 msgid "Use the credential (e.g., access the URL with the username and password from step (2)), and see if it's accepted."
-msgstr ""
+msgstr "使用该证书（例如，用步骤（2）中的用户名和密码访问 URL），看看是否被接受。"
  
 #. type: Plain text
 #: en/git-credential.txt:98
 #, priority:100
 msgid "Report on the success or failure of the password. If the credential allowed the operation to complete successfully, then it can be marked with an \"approve\" action to tell `git credential` to reuse it in its next invocation. If the credential was rejected during the operation, use the \"reject\" action so that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))."
-msgstr ""
+msgstr "报告密码的成功或失败。如果凭证允许操作成功完成，那么可以用 \"approve\" 动作标记，告诉 `git credential` 在下一次调用中重新使用它。如果操作过程中证书被拒绝，使用 \"reject\" 动作，这样 `git credential` 将在下一次调用中要求一个新的密码。在这两种情况下，`git credential` 应该被输入从步骤 (2) 中获得的凭证描述（其中也包含步骤(1)中提供的描述）。"
  
 #. type: Title -
 #: en/git-credential.txt:101
 #, no-wrap, priority:100
 msgid "INPUT/OUTPUT FORMAT"
-msgstr ""
+msgstr "输入/输出格式"
  
 #. type: Plain text
 #: en/git-credential.txt:108
 #, priority:100
 msgid "`git credential` reads and/or writes (depending on the action used)  credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)."
-msgstr ""
+msgstr "`git credential` 在其标准输入/输出中读取和/或写入（取决于使用的操作）凭证信息。这些信息可以对应于 `git credential` 将获得登录信息的键（如主机、协议、路径），或者对应于要获得的实际凭证数据（用户名/密码）。"
  
 #. type: Plain text
 #: en/git-credential.txt:112
 #, priority:100
 msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline."
-msgstr ""
+msgstr "凭证被分割成一组命名的属性，每行一个属性。每个属性由一个键值对指定，用一个 `=`（等号）分隔，后面是换行。"
  
 #. type: Plain text
 #: en/git-credential.txt:115
 #, priority:100
 msgid "The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL."
-msgstr ""
+msgstr "键可以包含任何字节，除了 `=`、换行或 NUL。值可以包含除换行或 NUL 之外的任何字节。"
  
 #. type: Plain text
 #: en/git-credential.txt:121
 #, priority:100
 msgid "Attributes with keys that end with C-style array brackets `[]` can have multiple values. Each instance of a multi-valued attribute forms an ordered list of values - the order of the repeated attributes defines the order of the values. An empty multi-valued attribute (`key[]=\\n`)  acts to clear any previous entries and reset the list."
-msgstr ""
+msgstr "键值以 C 型数组括号 `[]` 结尾的属性可以有多个值。一个多值属性的每个实例形成一个有序的值列表--重复属性的顺序决定了值的顺序。一个空的多值属性（`key[]=\\n`）的作用是清除之前的任何条目并重置列表。"
  
 #. type: Plain text
 #: en/git-credential.txt:125
 #, priority:100
 msgid "In all cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file."
-msgstr ""
+msgstr "在所有情况下，所有字节都按原样处理（即没有引号，也不能传输带有换行或NUL的值）。属性列表以空行或文件结束来结束。"
  
 #. type: Plain text
 #: en/git-credential.txt:127
@@ -18498,7 +18498,7 @@ msgstr "`protocol`"
 #: en/git-credential.txt:132
 #, priority:100
 msgid "The protocol over which the credential will be used (e.g., `https`)."
-msgstr ""
+msgstr "将使用证书的协议（例如，`https`）。"
  
 #. type: Labeled list
 #: en/git-credential.txt:133
@@ -18510,7 +18510,7 @@ msgstr "`host`"
 #: en/git-credential.txt:137
 #, priority:100
 msgid "The remote hostname for a network credential.  This includes the port number if one was specified (e.g., \"example.com:8088\")."
-msgstr ""
+msgstr "网络凭证的远程主机名。 如果指定了端口号，这包括端口号（例如，\"example.com:8088\"）。"
  
 #. type: Labeled list
 #: en/git-credential.txt:138
@@ -18522,7 +18522,7 @@ msgstr "`path`"
 #: en/git-credential.txt:143
 #, priority:100
 msgid "The path with which the credential will be used. E.g., for accessing a remote https repository, this will be the repository's path on the server."
-msgstr ""
+msgstr "证书将被使用的路径。例如，对于访问远程 https 版本库，这将是服务器上版本库的路径。"
  
 #. type: Labeled list
 #: en/git-credential.txt:144
@@ -18534,7 +18534,7 @@ msgstr "`username`"
 #: en/git-credential.txt:148
 #, priority:100
 msgid "The credential's username, if we already have one (e.g., from a URL, the configuration, the user, or from a previously run helper)."
-msgstr ""
+msgstr "证书的用户名，如果我们已经有了一个（例如，从URL、配置、用户，或从先前运行的帮助器）。"
  
 #. type: Labeled list
 #: en/git-credential.txt:149
@@ -18546,7 +18546,7 @@ msgstr "`password`"
 #: en/git-credential.txt:152
 #, priority:100
 msgid "The credential's password, if we are asking it to be stored."
-msgstr ""
+msgstr "凭证的密码，如果我们要求它被存储。"
  
 #. type: Labeled list
 #: en/git-credential.txt:153
@@ -18558,7 +18558,7 @@ msgstr "`password_expiry_utc`"
 #: en/git-credential.txt:158
 #, priority:100
 msgid "Generated passwords such as an OAuth access token may have an expiry date.  When reading credentials from helpers, `git credential fill` ignores expired passwords. Represented as Unix time UTC, seconds since 1970."
-msgstr ""
+msgstr "生成的密码，如 OAuth 访问令牌，可能有一个过期日期。 当从助手那里读取凭证时，`git credential fill` 会忽略过期的密码。表示为 Unix 时间 UTC，自 1970 年以来的秒数。"
  
 #. type: Labeled list
 #: en/git-credential.txt:159
@@ -18570,7 +18570,7 @@ msgstr "`oauth_refresh_token`"
 #: en/git-credential.txt:164
 #, priority:100
 msgid "An OAuth refresh token may accompany a password that is an OAuth access token. Helpers must treat this attribute as confidential like the password attribute. Git itself has no special behaviour for this attribute."
-msgstr ""
+msgstr "一个 OAuth 刷新令牌可以伴随着一个 OAuth 访问令牌的密码。帮助者必须像密码属性一样，将此属性视为机密。Git 本身对这个属性没有特殊行为。"
  
 #. type: Labeled list
 #: en/git-credential.txt:165
@@ -18582,19 +18582,19 @@ msgstr "`url`"
 #: en/git-credential.txt:172
 #, priority:100
 msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves."
-msgstr ""
+msgstr "当这个特殊属性被 `git credential` 读取时，该值被解析为一个 URL，并被当作其组成部分来处理（例如，`url=_00` 的行为就如同提供了 `protocol=https` 和 `host=example.com`）。这可以帮助调用者避免自己解析 URL。"
  
 #. type: Plain text
 #: en/git-credential.txt:177
 #, priority:100
 msgid "Note that specifying a protocol is mandatory and if the URL doesn't specify a hostname (e.g., \"cert:///path/to/file\") the credential will contain a hostname attribute whose value is an empty string."
-msgstr ""
+msgstr "请注意，指定协议是强制性的，如果 URL 没有指定主机名（例如，\"cert:///path/to/file\"），证书将包含一个主机名属性，其值是一个空字符串。"
  
 #. type: Plain text
 #: en/git-credential.txt:180
 #, priority:100
 msgid "Components which are missing from the URL (e.g., there is no username in the example above) will be left unset."
-msgstr ""
+msgstr "URL 中缺少的组件（例如，上面的例子中没有用户名）将不被设置。"
  
 #. type: Labeled list
 #: en/git-credential.txt:181
@@ -18607,13 +18607,13 @@ msgstr "`author`"
 #: en/git-credential.txt:186
 #, priority:100
 msgid "When an HTTP response is received by Git that includes one or more 'WWW-Authenticate' authentication headers, these will be passed by Git to credential helpers."
-msgstr ""
+msgstr "当 Git 收到包含一个或多个 \"WWW-Authenticate\" 认证头的 HTTP 响应时，这些头将被 Git 传递给证书助手。"
  
 #. type: Plain text
 #: en/git-credential.txt:191
 #, priority:100
 msgid "Each 'WWW-Authenticate' header value is passed as a multi-valued attribute 'wwwauth[]', where the order of the attributes is the same as they appear in the HTTP response. This attribute is 'one-way' from Git to pass additional information to credential helpers."
-msgstr ""
+msgstr "每个 'WWW-Authenticate' 头的值都以多值属性 'wwwauth[]' 的形式传递，其中属性的顺序与它们在 HTTP 响应中出现的一样。这个属性是 Git 的 'one-way' 属性，用于传递额外的信息给证书助手。"
  
 #. type: Plain text
 #: en/git-credential.txt:193
@@ -20398,7 +20398,7 @@ msgstr ""
 #: en/git-daemon.txt:242
 #, priority:100
 msgid "This serves 'git fetch-pack' and 'git ls-remote' clients.  It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`."
-msgstr ""
+msgstr "它为 'git fetch-pack' 和 'git ls-remote' 客户端服务。 它默认是启用的，但仓库可以通过设置 `daemon.uploadpack` 配置项为 `false` 来禁用它。"
  
 #. type: Labeled list
 #: en/git-daemon.txt:243
@@ -20410,7 +20410,7 @@ msgstr "upload-archive"
 #: en/git-daemon.txt:247
 #, priority:100
 msgid "This serves 'git archive --remote'.  It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`."
-msgstr ""
+msgstr "这为 'git archive --remote' 服务。 它默认是禁用的，但版本库可以通过设置 `daemon.uploadarch` 配置项为 `true` 来启用它。"
  
 #. type: Labeled list
 #: en/git-daemon.txt:248
@@ -20422,13 +20422,13 @@ msgstr "receive-pack"
 #: en/git-daemon.txt:257
 #, priority:100
 msgid "This serves 'git send-pack' clients, allowing anonymous push.  It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs).  This is solely meant for a closed LAN setting where everybody is friendly.  This service can be enabled by setting `daemon.receivepack` configuration item to `true`."
-msgstr ""
+msgstr "它为 'git send-pack' 客户端服务，允许匿名推送。 它默认是禁用的，因为协议中没有认证（换句话说，任何人都可以推送任何东西到仓库，包括删除引用）。 这只适用于封闭的局域网环境，大家都很友好。 这个服务可以通过设置 `daemon.receivepack` 配置项为 `true` 来启用。"
  
 #. type: Labeled list
 #: en/git-daemon.txt:260
 #, no-wrap, priority:100
 msgid "We assume the following in /etc/services"
-msgstr ""
+msgstr "我们在 /etc/services 中假设如下"
  
 #. type: delimited block -
 #: en/git-daemon.txt:265
@@ -20444,13 +20444,13 @@ msgstr ""
 #: en/git-daemon.txt:267
 #, no-wrap, priority:100
 msgid "'git daemon' as inetd server"
-msgstr ""
+msgstr "'git daemon' 作为 inetd 服务器"
  
 #. type: Plain text
 #: en/git-daemon.txt:271
 #, priority:100
 msgid "To set up 'git daemon' as an inetd service that handles any repository within `/pub/foo` or `/pub/bar`, place an entry like the following into `/etc/inetd` all on one line:"
-msgstr ""
+msgstr "要把 'git daemon' 设置为 inetd 服务，处理 `/pub/foo` 或 `/pub/bar` 内的任何仓库，在 `/etc/inetd` 中放入如下条目，全部放在一行："
  
 #. type: delimited block -
 #: en/git-daemon.txt:276
@@ -20459,19 +20459,19 @@ msgid ""
 "\tgit stream tcp nowait nobody  /usr/bin/git\n"
 "\t\tgit daemon --inetd --verbose --export-all\n"
 "\t\t/pub/foo /pub/bar\n"
-msgstr ""
+msgstr "\tgit stream tcp nowait nobody  /usr/bin/git\n\t\tgit daemon --inetd --verbose --export-all\n\t\t/pub/foo /pub/bar\n"
  
 #. type: Labeled list
 #: en/git-daemon.txt:279
 #, no-wrap, priority:100
 msgid "'git daemon' as inetd server for virtual hosts"
-msgstr ""
+msgstr "作为虚拟主机的 inetd 服务器的 'git daemon'"
  
 #. type: Plain text
 #: en/git-daemon.txt:284
 #, priority:100
 msgid "To set up 'git daemon' as an inetd service that handles repositories for different virtual hosts, `www.example.com` and `www.example.org`, place an entry like the following into `/etc/inetd` all on one line:"
-msgstr ""
+msgstr "要将 'git daemon' 设置为 inetd 服务，处理不同的虚拟主机 `www.example.com` 和 `www.example.org` 的仓库，在 `/etc/inetd` 中放置如下条目，全部在一行："
  
 #. type: delimited block -
 #: en/git-daemon.txt:292
@@ -20483,25 +20483,25 @@ msgid ""
 "\t\t/pub/www.example.org/software\n"
 "\t\t/pub/www.example.com/software\n"
 "\t\t/software\n"
-msgstr ""
+msgstr "\tgit stream tcp nowait nobody /usr/bin/git\n\t\tgit daemon --inetd --verbose --export-all\n\t\t--interpolated-path=/pub/%H%D\n\t\t/pub/www.example.org/software\n\t\t/pub/www.example.com/software\n\t\t/software\n"
  
 #. type: Plain text
 #: en/git-daemon.txt:300
 #, priority:100
 msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host name supported.  Further, both hosts advertise repositories simply as `git://www.example.com/software/repo.git`.  For pre-1.4.0 clients, a symlink from `/software` into the appropriate default repository could be made as well."
-msgstr ""
+msgstr "在这个例子中，根级目录 `/pub` 将包含一个子目录，用于支持每个虚拟主机名。 此外，两台主机都简单地以 `git://www.example.com/software/repo.git` 的方式宣传仓库。 对于 1.4.0 之前的客户端，也可以从 `/software` 建立一个符号链接到相应的默认仓库。"
  
 #. type: Labeled list
 #: en/git-daemon.txt:302
 #, no-wrap, priority:100
 msgid "'git daemon' as regular daemon for virtual hosts"
-msgstr ""
+msgstr "'git daemon' 作为虚拟主机的常规守护程序"
  
 #. type: Plain text
 #: en/git-daemon.txt:306
 #, priority:100
 msgid "To set up 'git daemon' as a regular, non-inetd service that handles repositories for multiple virtual hosts based on their IP addresses, start the daemon like this:"
-msgstr ""
+msgstr "要把 'git daemon' 设置成一个普通的、非 inetd 的服务，处理基于 IP 地址的多个虚拟主机的存储库，可以像这样启动 daemon："
  
 #. type: delimited block -
 #: en/git-daemon.txt:312
@@ -20511,25 +20511,25 @@ msgid ""
 "\t\t--interpolated-path=/pub/%IP/%D\n"
 "\t\t/pub/192.168.1.200/software\n"
 "\t\t/pub/10.10.220.23/software\n"
-msgstr ""
+msgstr "\tgit daemon --verbose --export-all\n\t\t--interpolated-path=/pub/%IP/%D\n\t\t/pub/192.168.1.200/software\n\t\t/pub/10.10.220.23/software\n"
  
 #. type: Plain text
 #: en/git-daemon.txt:318
 #, priority:100
 msgid "In this example, the root-level directory `/pub` will contain a subdirectory for each virtual host IP address supported.  Repositories can still be accessed by hostname though, assuming they correspond to these IP addresses."
-msgstr ""
+msgstr "在这个例子中，根级目录 `/pub` 将包含一个支持每个虚拟主机IP地址的子目录。 虽然仓库仍然可以通过主机名访问，但假设它们对应于这些 IP 地址。"
  
 #. type: Labeled list
 #: en/git-daemon.txt:319
 #, no-wrap, priority:100
 msgid "selectively enable/disable services per repository"
-msgstr ""
+msgstr "选择性地启用/禁用每个仓库的服务"
  
 #. type: Plain text
 #: en/git-daemon.txt:324
 #, priority:100
 msgid "To enable 'git archive --remote' and disable 'git fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
-msgstr ""
+msgstr "要启用 'git archive --remote' 并禁用 'git fetch'，在仓库的配置文件中要有以下内容（也就是在 `HEAD`、'refs' 和 'objects' 旁的 'config'文件）。"
  
 #. type: delimited block -
 #: en/git-daemon.txt:329
@@ -20547,7 +20547,7 @@ msgstr ""
 #: en/git-daemon.txt:338
 #, priority:100
 msgid "'git daemon' will set REMOTE_ADDR to the IP address of the client that connected to it, if the IP address is available. REMOTE_ADDR will be available in the environment of hooks called when services are performed."
-msgstr ""
+msgstr "'git daemon' 将把 REMOTE_ADDR 设置为连接到它的客户端的 IP 地址，如果该 IP 地址是可用的。REMOTE_ADDR 将在执行服务时调用的钩子环境中可用。"
  
 #. type: Title =
 #: en/git-describe.txt:2
@@ -20868,7 +20868,7 @@ msgstr "git-diff-files(1)"
 #: en/git-diff-files.txt:7
 #, priority:100
 msgid "git-diff-files - Compares files in the working tree and the index"
-msgstr ""
+msgstr "git-diff-files - 对比工作区和索引中的文件"
  
 #. type: Plain text
 #: en/git-diff-files.txt:13
@@ -20880,7 +20880,7 @@ msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<pa
 #: en/git-diff-files.txt:20
 #, priority:100
 msgid "Compares the files in the working tree and the index.  When paths are specified, compares only those named paths.  Otherwise all entries in the index are compared.  The output format is the same as for 'git diff-index' and 'git diff-tree'."
-msgstr ""
+msgstr "比较工作区和索引中的文件。 当指定路径时，只比较那些命名的路径。 否则就比较索引中的所有条目。 输出格式与 'git diff-index' 和 'git diff-tree' 的相同。"
  
 #. type: Labeled list
 #: en/git-diff-files.txt:25 en/git-diff.txt:124
@@ -20910,25 +20910,25 @@ msgstr "-0"
 #: en/git-diff-files.txt:32
 #, priority:100
 msgid "Diff against the \"base\" version, \"our branch\" or \"their branch\" respectively.  With these options, diffs for merged entries are not shown."
-msgstr ""
+msgstr "分别与 “基础” 版本、“我们的分支” 或 “他们的分支” 进行比较。 有了这些选项，合并后的条目的差异就不会显示。"
  
 #. type: Plain text
 #: en/git-diff-files.txt:36
 #, priority:100
 msgid "The default is to diff against our branch (-2) and the cleanly resolved paths.  The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"."
-msgstr ""
+msgstr "默认是针对我们的分支 (-2) 和干净的解决路径进行差异比对。 可以给出选项 -0 来省略未合并的条目的差异输出，只显示 \"Unmerged\"。"
  
 #. type: Plain text
 #: en/git-diff-files.txt:43
 #, priority:100
 msgid "This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way 'diff-tree' shows a merge commit with these flags."
-msgstr ""
+msgstr "这将比较第二阶段（我们的分支）、第三阶段（他们的分支）和工作区文件，并输出一个综合的差异，类似于 'diff-tree' 显示带有这些标志的合并提交。"
  
 #. type: Plain text
 #: en/git-diff-files.txt:46
 #, priority:100
 msgid "Remain silent even on nonexistent files"
-msgstr ""
+msgstr "即使对不存在的文件也保持沉默"
  
 #. type: Title =
 #: en/git-diff-index.txt:2
@@ -21132,7 +21132,7 @@ msgstr "git-difftool(1)"
 #: en/git-difftool.txt:7
 #, priority:100
 msgid "git-difftool - Show changes using common diff tools"
-msgstr ""
+msgstr "git-difftool - 使用常见的差异工具显示变化"
  
 #. type: Plain text
 #: en/git-difftool.txt:12
@@ -21156,7 +21156,7 @@ msgstr "--dir-diff"
 #: en/git-difftool.txt:27
 #, priority:100
 msgid "Copy the modified files to a temporary location and perform a directory diff on them. This mode never prompts before launching the diff tool."
-msgstr ""
+msgstr "把修改过的文件复制到一个临时位置，然后对它们进行目录比较。这种模式在启动差异工具之前从不提示。"
  
 #. type: Labeled list
 #: en/git-difftool.txt:28 en/git-mergetool.txt:70
@@ -21174,7 +21174,7 @@ msgstr "--no-prompt"
 #: en/git-difftool.txt:31
 #, priority:100
 msgid "Do not prompt before launching a diff tool."
-msgstr ""
+msgstr "在启动差异工具之前不要提示。"
  
 #. type: Labeled list
 #: en/git-difftool.txt:32 en/git-mergetool.txt:78
@@ -21186,19 +21186,19 @@ msgstr "--prompt"
 #: en/git-difftool.txt:36
 #, priority:100
 msgid "Prompt before each invocation of the diff tool.  This is the default behaviour; the option is provided to override any configuration settings."
-msgstr ""
+msgstr "在每次调用差异工具之前提示。 这是默认行为；提供该选项是为了覆盖任何配置设置。"
  
 #. type: Plain text
 #: en/git-difftool.txt:40
 #, priority:100
 msgid "Start showing the diff for the given path, the paths before it will move to end and output."
-msgstr ""
+msgstr "开始显示给定路径的差异，在它之前的路径将移动到终点并输出。"
  
 #. type: Plain text
 #: en/git-difftool.txt:44
 #, priority:100
 msgid "Start showing the diff for the given path, skipping all the paths before it."
-msgstr ""
+msgstr "开始显示给定路径的差异，跳过前面所有的路径。"
  
 #. type: Labeled list
 #: en/git-difftool.txt:45 en/git-mergetool.txt:27