Translated using Weblate (Chinese (Simplified))

Currently translated at 27.3% (2997 of 10953 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))
8a8a8153 · 秃头灯笼鱼 · Hosted Weblate · b7bd746c · 8a8a8153
Unverified Commit 8a8a8153 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: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-13 00:11+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.16-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-16 02: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.16-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:763 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
@@ -4031,9 +4031,9 @@ msgstr "--no-stat"
 #. type: Plain text
 #: en/diff-options.txt:19
-#, fuzzy, priority:280
+#, priority:280
 msgid "Generate plain patches without any diffstats."
-msgstr "生成普通的补丁，不显示差异状态（diffstats）。"
+msgstr "生成没有任何差异状态(diffstats)的普通补丁。"
 #. type: Labeled list
 #: en/diff-options.txt:23 en/fetch-options.txt:257 en/git-add.txt:119 en/git-am.txt:90 en/git-checkout-index.txt:26 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:166
@@ -17364,10 +17364,9 @@ msgstr "--local"
 #. type: Labeled list
 #: en/git-config.txt:362
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
-#| msgid "--worktree"
 msgid "worktree"
-msgstr "--worktree"
+msgstr "工作区"
 #. type: Labeled list
 #: en/git-config.txt:365
@@ -21409,9 +21408,9 @@ msgstr "如果给出了 --merge-base，则不使用<commit>，而使用<commit>
 #. type: Labeled list
 #: en/git-diff.txt:57
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
-msgstr "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
+msgstr "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]"
 #. type: Plain text
 #: en/git-diff.txt:64
@@ -32647,10 +32646,9 @@ msgstr "--decorate-refs-exclude=<pattern>"
 #. type: Plain text
 #: en/git-log.txt:54
-#, fuzzy, priority:260
+#, priority:260
-#| msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
 msgid "For each candidate reference, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
-msgstr "如果没有给定`--decorate-refs`，就假装所有的参考文献都被包括在内。  对于每个候选者，如果它与`--decorate-refs-exclude`给出的任何模式相匹配，或者它与`--decorate-refs`给出的任何模式不匹配，就不要将其用于装饰。`log.excludeDecoration`配置选项允许从装饰中排除参考文献，但明确的`--decorate-refs`模式将覆盖`log.excludeDecoration`的匹配。"
+msgstr "对于每个候选者，如果它与`--decorate-refs-exclude`给出的任何模式相匹配，或者它与`--decorate-refs`给出的任何模式不匹配，就不要将其用于装饰。`log.excludeDecoration`配置选项允许从装饰中排除参考文献，但明确的`--decorate-refs`模式将覆盖`log.excludeDecoration`的匹配。"
 #. type: Plain text
 #: en/git-log.txt:58
@@ -35351,9 +35349,9 @@ msgstr ""
 #. type: Plain text
 #: en/git-merge-tree.txt:125
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "\t<mode> <object> <stage> <filename>\n"
-msgstr "        [<tag> ]<mode> <object> <stage> <file>\n"
+msgstr "\t<mode> <object> <stage> <filename>\n"
 #. type: Plain text
 #: en/git-merge-tree.txt:131
@@ -47484,14 +47482,11 @@ msgstr ""
 #. type: Plain text
 #: en/git-revert.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
+#, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n"
 "'git revert' (--continue | --skip | --abort | --quit)\n"
-msgstr ""
+msgstr "'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n'git revert' (--continue | --skip | --abort | --quit)\n"
-"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
-"\t\t  [-S[<keyid>]] <commit>...\n"
-"'git cherry-pick' (--continue | --skip | --abort | --quit)\n"
 #. type: Plain text
 #: en/git-revert.txt:21
@@ -50468,10 +50463,9 @@ msgstr "`trailer:<field>`，`<field>`被解释为不区分大小写的提交消
 #. type: Plain text
 #: en/git-shortlog.txt:70
-#, fuzzy, priority:260
+#, priority:260
-#| msgid "Instead of the commit subject, use some other information to describe each commit.  '<format>' can be any string accepted by the `--format` option of 'git log', such as '* [%h] %s'.  (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
 msgid "`format:<format>`, any string accepted by the `--format` option of 'git log'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
-msgstr "代替提交主题，使用一些其他信息来描述每个提交。  <format>'可以是任何被'git log'的`--format'选项接受的字符串，比如'* [%h] %s'。  参见linkgit:git-log[1]的 \"PRETTY FORMATS \"部分）。"
+msgstr "`格式：<format>`可以是任何被'git log'的`--format'选项接受的字符串，比如'* [%h] %s'。  参见linkgit:git-log[1]的 \"PRETTY FORMATS \"部分）。"
 #. type: Plain text
 #: en/git-shortlog.txt:75
@@ -57395,25 +57389,25 @@ msgstr "请参阅linkgit:gitglossary[7]。"
 #: en/git.txt:465
 #, priority:100
 msgid "Various Git commands pay attention to environment variables and change their behavior.  The environment variables marked as \"Boolean\" take their values the same way as Boolean valued configuration variables, e.g.  \"true\", \"yes\", \"on\" and positive numbers are taken as \"yes\"."
-msgstr ""
+msgstr "各种 Git 命令都会关注环境变量并改变它们的行为。  以\"布尔 值\"为标记的环境变量，其取值方式与布尔值配置变量相同，例如，\"true\"、\"yes\"、\"on \"和正数被视为 \"yes\"。"
 #. type: Plain text
 #: en/git.txt:467
-#, fuzzy, priority:100
+#, priority:100
 msgid "Here are the variables:"
-msgstr "常规变量"
+msgstr "常规变量："
 #. type: Title ~
 #: en/git.txt:469
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "The Git Repository"
-msgstr "The Git Repository"
+msgstr "Git仓库"
 #. type: Plain text
 #: en/git.txt:473
 #, priority:100
 msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
-msgstr ""
+msgstr "这些环境变量适用于 \"所有 \"核心的 Git 命令。注：值得注意的是，它们可能被位于Git之上的SCMS使用/覆盖，所以如果之前使用过其他的源代码管理工具。"
 #. type: Labeled list
 #: en/git.txt:474
@@ -57425,7 +57419,7 @@ msgstr "`GIT_INDEX_FILE`"
 #: en/git.txt:478
 #, priority:100
 msgid "This environment variable specifies an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
-msgstr ""
+msgstr "这个环境变量指定了一个备用的索引文件。如果没有指定，则默认使用`$GIT_DIR/index`。"
 #. type: Labeled list
 #: en/git.txt:479
@@ -57437,7 +57431,7 @@ msgstr "`GIT_INDEX_VERSION`"
 #: en/git.txt:484
 #, priority:100
 msgid "This environment variable specifies what index version is used when writing the index file out.  It won't affect existing index files.  By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
-msgstr ""
+msgstr "这个环境变量指定在写出索引文件时使用什么版本。  它不会影响现有的索引文件。  默认情况下，索引文件的版本为 2 或 3。参见 linkgit:git-update-index[1] 获取更多信息。"
 #. type: Labeled list
 #: en/git.txt:485
@@ -57449,7 +57443,7 @@ msgstr "`GIT_OBJECT_DIRECTORY`"
 #: en/git.txt:490
 #, priority:100
 msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
-msgstr ""
+msgstr "如果对象存储目录是通过这个环境变量指定的，那么sha1目录将在该目录下创建 - 否则将使用默认的`$GIT_DIR/objects`目录。"
 #. type: Labeled list
 #: en/git.txt:491
@@ -57461,13 +57455,13 @@ msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
 #: en/git.txt:497
 #, priority:100
 msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
-msgstr ""
+msgstr "由于Git对象的不可改变性，旧的对象可以被归档到共享的只读目录中。这个变量指定了一个由\": \"分隔（在Windows下为\"; \"分隔）的Git对象目录列表，可以用来搜索Git对象。新的对象将不会写入这些目录中。"
 #. type: Plain text
 #: en/git.txt:503
 #, priority:100
 msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
-msgstr ""
+msgstr "以`\"`（双引号）开头的条目将被解释为C语言风格字符串路径，去掉前导和后导的双引号，并支持反斜杠转义。例如，`\"path-with-\\\"-and-:-in-it\":vanilla-path`有两个路径：`path-with-\"-and-:-in-it`和`vanilla-path`。"
 #. type: Labeled list
 #: en/git.txt:504
@@ -57479,7 +57473,7 @@ msgstr "`GIT_DIR`"
 #: en/git.txt:509
 #, priority:100
 msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository.  The `--git-dir` command-line option also sets this value."
-msgstr ""
+msgstr "如果设置了`GIT_DIR`环境变量，那么它指定了一个路径来代替默认的`.git`作为仓库库的基础。  `--git-dir`命令行选项也能够设置这个值。"
 #. type: Labeled list
 #: en/git.txt:510
@@ -57491,7 +57485,7 @@ msgstr "`GIT_WORK_TREE`"
 #: en/git.txt:514
 #, priority:100
 msgid "Set the path to the root of the working tree.  This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
-msgstr ""
+msgstr "设置到工作区的根部路径。  这也可以由`--work-tree`命令行选项和core.worktree配置变量设置。"
 #. type: Labeled list
 #: en/git.txt:515
@@ -57503,7 +57497,7 @@ msgstr "`GIT_NAMESPACE`"
 #: en/git.txt:518
 #, priority:100
 msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details.  The `--namespace` command-line option also sets this value."
-msgstr ""
+msgstr "设置 Git 命名空间；详见 linkgit:gitnamespaces[7]。  `--namespace`命令行选项也可以设置这个值。"
 #. type: Labeled list
 #: en/git.txt:519
@@ -57515,7 +57509,7 @@ msgstr "`GIT_CEILING_DIRECTORIES`"
 #: en/git.txt:533
 #, priority:100
 msgid "This should be a colon-separated list of absolute paths.  If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories).  It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment.  Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory.  However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
-msgstr ""
+msgstr "这应该是一个用冒号分隔的绝对路径列表。  如果设置了，它是一个目录列表，在寻找仓库目录时，Git不应该向上改变目录(chidir)（对于排除缓慢加载的网络目录很有用）。  它不会排除当前工作目录或在命令行或环境中设置的GIT_DIR。  通常情况下，Git 需要读取这个列表中的条目，并解析任何可能存在的符号链接，以便将它们与当前目录进行比较。  然而，如果连这个访问都很慢，你可以在列表中添加一个空条目，告诉Git后面的条目不是符号链接，不需要解析；例如，`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`。"
 #. type: Labeled list
 #: en/git.txt:534
@@ -57527,7 +57521,7 @@ msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
 #: en/git.txt:543
 #, priority:100
 msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries.  This Boolean environment variable can be set to true to tell Git not to stop at filesystem boundaries.  Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
-msgstr ""
+msgstr "当在一个没有\".git \"仓库目录的目录下运行时，Git 会尝试在父目录中找到这样的目录来寻找工作区的顶端，但默认情况下它不会跨越文件系统的边界。  这个布尔环境变量可以被设置为 \"true\"，以告诉Git不要在文件系统边界处停止。  和`GIT_CEILING_DIRECTORIES`一样，这不会影响通过`GIT_DIR`或在命令行中设置的明确的仓库目录。"
 #. type: Labeled list
 #: en/git.txt:544
@@ -57539,7 +57533,7 @@ msgstr "`GIT_COMMON_DIR`"
 #: en/git.txt:552
 #, ignore-ellipsis, priority:100
 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
-msgstr ""
+msgstr "如果这个变量被设置为一个路径，通常在$GIT_DIR中的非工作树文件将被从这个路径中取出。工作树中特定的文件，如 HEAD 或 index，则从 $GIT_DIR 取出。详情见 linkgit:gitrepository-layout[5] 和 linkgit:git-worktree[1]。这个变量的优先级低于其他路径变量，如 GIT_INDEX_FILE、GIT_OBJECT_DIRECTORY..."
 #. type: Labeled list
 #: en/git.txt:553
@@ -57551,13 +57545,13 @@ msgstr "`GIT_DEFAULT_HASH`"
 #: en/git.txt:559
 #, priority:100
 msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]."
-msgstr ""
+msgstr "如果这个变量被设置，新版本库的默认哈希算法将被设置为这个值。目前这个值在克隆时被忽略，而是使用远程版本库的设置。默认是 \"sha1\"。这 个 变 量 是 实 验 性 的 ！！！参见 linkgit:git-init[1] 中的 `--object-format`。"
 #. type: Title ~
 #: en/git.txt:561
 #, no-wrap, priority:100
 msgid "Git Commits"
-msgstr ""
+msgstr "Git提交"
 #. type: Labeled list
 #: en/git.txt:562
@@ -57569,7 +57563,7 @@ msgstr "`GIT_AUTHOR_NAME`"
 #: en/git.txt:566
 #, priority:100
 msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写日志时，作者身份中使用的可读名称。这会覆盖`user.name`和`author.name`配置的值。"
 #. type: Labeled list
 #: en/git.txt:567
@@ -57581,7 +57575,7 @@ msgstr "`GIT_AUTHOR_EMAIL`"
 #: en/git.txt:571
 #, priority:100
 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写引用日志时，用以表明作者身份所使用的电子邮件地址。这会覆盖`user.email`和`author.email`的配置值。"
 #. type: Labeled list
 #: en/git.txt:572
@@ -57593,7 +57587,7 @@ msgstr "`GIT_AUTHOR_DATE`"
 #: en/git.txt:575
 #, priority:100
 msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写引用日志时，用于标注作者修改的日期。有效格式见 linkgit:git-commit[1]。"
 #. type: Labeled list
 #: en/git.txt:576
@@ -57605,7 +57599,7 @@ msgstr "`GIT_COMMITTER_NAME`"
 #: en/git.txt:580
 #, priority:100
 msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写引用日志时，提交者身份中使用的可读名称。这会覆盖`user.name`和`committer.name`的配置值。"
 #. type: Labeled list
 #: en/git.txt:581
@@ -57617,7 +57611,7 @@ msgstr "`GIT_COMMITTER_EMAIL`"
 #: en/git.txt:585
 #, priority:100
 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写引用日志时，用以表明提交者所使用的电子邮件地址。这会覆盖`user.email`和`author.email`的配置值。"
 #. type: Labeled list
 #: en/git.txt:586
@@ -57629,7 +57623,7 @@ msgstr "`GIT_COMMITTER_DATE`"
 #: en/git.txt:589
 #, priority:100
 msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
-msgstr ""
+msgstr "在创建提交、标签对象或在编写 reflogs 时，用于标注提交者所作修改的日期。有效格式见 linkgit:git-commit[1]。"
 #. type: Labeled list
 #: en/git.txt:590
@@ -57641,13 +57635,13 @@ msgstr "`EMAIL`"
 #: en/git.txt:593
 #, priority:100
 msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
-msgstr ""
+msgstr "如果没有设置其他相关的环境变量或配置设置，作者和提交者的电子邮件地址会参考该值。"
 #. type: Title ~
 #: en/git.txt:595
 #, no-wrap, priority:100
 msgid "Git Diffs"
-msgstr ""
+msgstr "Git差异比较(Diffs)"
 #. type: Labeled list
 #: en/git.txt:596
@@ -57659,7 +57653,7 @@ msgstr "`GIT_DIFF_OPTS`"
 #: en/git.txt:601
 #, priority:100
 msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created.  This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
-msgstr ""
+msgstr "唯一有效的设置是\"--unified=?? \"或\"-u??\"，用于设置创建统一的差异时显示的文本行数。  这优先于 Git diff 命令行中传递的任何 \"-U\" 或 \"--unified\" 选项值。"
 #. type: Labeled list
 #: en/git.txt:602
@@ -57671,13 +57665,13 @@ msgstr "`GIT_EXTERNAL_DIFF`"
 #: en/git.txt:608
 #, priority:100
 msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called to generate diffs, and Git does not use its builtin diff machinery.  For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
-msgstr ""
+msgstr "当环境变量`GIT_EXTERNAL_DIFF`被设置时，由它命名的程序被调用来生成差异化文本，而不使用Git内置的diff工具。  对于一个被添加、删除或修改的操作，`GIT_EXTERNAL_DIFF`会被调用，一共接收7个参数："
 #. type: Plain text
 #: en/git.txt:610
 #, priority:100
 msgid "path old-file old-hex old-mode new-file new-hex new-mode"
-msgstr ""
+msgstr "path old-file old-hex old-mode new-file new-hex new-mode"
 #. type: Plain text
 #: en/git.txt:612
@@ -61704,21 +61698,21 @@ msgstr "Linus Torvalds （林纳斯·本纳第克特·托瓦兹；Git的作者
 #. type: Labeled list
 #: en/glossary-content.txt:181
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_git_archive]]Git archive"
-msgstr "[[def_git_archive]]Git存档"
+msgstr "[[def_git_archive]]仓库（对于arch用户）(Git archive)"
 #. type: Plain text
 #: en/glossary-content.txt:183
 #, priority:310
 msgid "Synonym for <<def_repository,repository>> (for arch people)."
-msgstr "Synonym for <<def_repository,仓库>> (for arch people)."
+msgstr "与<<def_repository,仓库>> 同义(对于arch用户)。"
 #. type: Labeled list
 #: en/glossary-content.txt:184
 #, no-wrap, priority:310
 msgid "[[def_gitfile]]gitfile"
-msgstr "[[def_gitfile]]git 文件"
+msgstr "[[def_gitfile]]gitfile（仓库链接文件）"
 #. type: Plain text
 #: en/glossary-content.txt:187
@@ -61730,13 +61724,13 @@ msgstr "在工作区根部的普通文件 `.git`，指向真正的版本库目
 #: en/glossary-content.txt:188
 #, no-wrap, priority:310
 msgid "[[def_grafts]]grafts"
-msgstr "[[def_grafts]]移植"
+msgstr "[[def_grafts]]（提交）移植(grafts)"
 #. type: Plain text
 #: en/glossary-content.txt:194
-#, fuzzy, priority:310
+#, priority:310
 msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
-msgstr "移植（Grafts）通过记录提交的虚假祖先信息，使两条原本不同的开发线连接在一起。这样你就可以让 Git 假装<<def_commit,提交>>的一组<<def_parent,父提交>>与创建提交时的记录不同。通过 `.git/info/grafts` 文件进行配置。"
+msgstr "移植（Grafts）通过记录提交的虚假祖先信息，使两条原本不同的开发线连接在一起。这样你就可以让 Git 假装<<def_commit,提交>>的一组<<def_parent,父提交>>与创建提交(commit)时的记录不同。通过 `.git/info/grafts` 文件进行配置。"
 #. type: Plain text
 #: en/glossary-content.txt:198
@@ -61760,7 +61754,7 @@ msgstr "在 Git 的上下文中，是<<def_object_name,对象名称>>的同义
 #: en/glossary-content.txt:202
 #, no-wrap, priority:310
 msgid "[[def_head]]head"
-msgstr "[[def_head]]头"
+msgstr "[[def_head]]头/分支(head)"
 #. type: Plain text
 #: en/glossary-content.txt:207
@@ -61770,9 +61764,9 @@ msgstr "一个<<def_ref,命名引用>>到<<def_commit,提交>>在<<def_branch,
 #. type: Labeled list
 #: en/glossary-content.txt:208
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_HEAD]]HEAD"
-msgstr "[[def_HEAD]]HEAD"
+msgstr "[[def_HEAD]]HEAD（头指针，亦即当前分支）"
 #. type: Plain text
 #: en/glossary-content.txt:215
@@ -61832,7 +61826,7 @@ msgstr "关于某个特定文件的信息，存储在<<def_index,索引/暂存
 #: en/glossary-content.txt:242
 #, no-wrap, priority:310
 msgid "[[def_master]]master"
-msgstr "[[def_master]]master"
+msgstr "[[def_master]]master（默认分支名）"
 #. type: Plain text
 #: en/glossary-content.txt:248
@@ -61884,10 +61878,9 @@ msgstr "存储一组\"对象\"，一个单独的<<def_object,对象>>由其<<def
 #. type: Labeled list
 #: en/glossary-content.txt:280
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
-#| msgid "[[def_object_identifier]]object identifier"
 msgid "[[def_object_identifier]]object identifier (oid)"
-msgstr "[[def_object_identifier]]对象标识符"
+msgstr "[[def_object_identifier]]对象标识符[object identifier (oid)]"
 #. type: Plain text
 #: en/glossary-content.txt:282
@@ -61921,9 +61914,9 @@ msgstr "其中一个标识符\"<<def_commit_object,提交>>\", \"<<def_tree_obje
 #. type: Labeled list
 #: en/glossary-content.txt:294
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_octopus]]octopus"
-msgstr "[[def_octopus]]octopus"
+msgstr "[[def_octopus]]章鱼式合并（两分支以上的合并）(octopus)"
 #. type: Plain text
 #: en/glossary-content.txt:296
@@ -61933,9 +61926,9 @@ msgstr "<<def_merge,合并>>两个以上的<<def_branch,分支>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:297
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_origin]]origin"
-msgstr "[[def_origin]]origin"
+msgstr "[[def_origin]]origin（默认的远程名称）"
 #. type: Plain text
 #: en/glossary-content.txt:304
@@ -61945,15 +61938,15 @@ msgstr "默认的上游<<def_repository,仓库>>。大多数项目至少有一
 #. type: Labeled list
 #: en/glossary-content.txt:305
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_overlay]]overlay"
-msgstr "[[def_overlay]]overlay"
+msgstr "[[def_overlay]]覆盖(overlay)"
 #. type: Plain text
 #: en/glossary-content.txt:313
-#, fuzzy, priority:310
+#, priority:310
 msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory.  This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
-msgstr "只更新和添加文件到工作目录，但不删除它们，类似于'cp -R'会更新目标目录中的内容。这是<<def_checkout,检出>>中的默认模式，当从<<def_index,暂存区>>或<<def_tree-ish,tree-ish>>中检出文件时。相反，非覆盖模式也会删除源文件中不存在的跟踪文件，类似于'rsync --delete'。"
+msgstr "只更新和添加文件到工作目录，但不删除它们，类似于'cp -R'会更新目标目录中的内容。这是<<def_checkout,检出>>中的默认模式，当从<<def_index,暂存区>>或<<def_tree-ish,树对象(tree-ish)>>中检出文件时。相反，非覆盖模式也会删除源文件中不存在的跟踪文件，类似于'rsync --delete'。"
 #. type: Labeled list
 #: en/glossary-content.txt:314
@@ -61977,7 +61970,7 @@ msgstr "[[def_pack_index]]包索引(pack index)"
 #: en/glossary-content.txt:322
 #, priority:310
 msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
-msgstr ""
+msgstr "<<def_pack,包>>中的对象的标识符和其他信息的列表，以协助有效地访问一个包的内容。"
 #. type: Labeled list
 #: en/glossary-content.txt:323
@@ -61989,200 +61982,199 @@ msgstr "[[def_pathspec]]路径规范(pathspec)"
 #: en/glossary-content.txt:325
 #, priority:310
 msgid "Pattern used to limit paths in Git commands."
-msgstr ""
+msgstr "用来限制Git命令中的路径的模式。"
 #. type: Plain text
 #: en/glossary-content.txt:333
 #, priority:310
 msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree.  See the documentation of each command for whether paths are relative to the current directory or toplevel.  The pathspec syntax is as follows:"
-msgstr ""
+msgstr "在 \"git ls-files\"、\"git ls-tree\"、\"git add\"、\"git grep\"、\"git diff\"、\"git checkout \"和许多其他命令的命令行中，路径规格被用来将操作范围限制在树或工作区的某个子集。  关于路径是相对于当前目录还是顶层，请参阅每个命令的文档。  pathspec的语法如下："
 #. type: Plain text
 #: en/glossary-content.txt:337
 #, priority:310
 msgid "any path matches itself"
-msgstr ""
+msgstr "任何路径都与自己匹配"
 #. type: Plain text
 #: en/glossary-content.txt:340
 #, priority:310
 msgid "the pathspec up to the last slash represents a directory prefix.  The scope of that pathspec is limited to that subtree."
-msgstr ""
+msgstr "到最后一个斜线的路径规范代表一个目录前缀。  该路径规范的范围只限于该子树。"
 #. type: Plain text
 #: en/glossary-content.txt:344
 #, priority:310
 msgid "the rest of the pathspec is a pattern for the remainder of the pathname.  Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
-msgstr ""
+msgstr "路径规范的其余部分是路径名其余部分的模式。  相对于目录前缀的路径将使用fnmatch(3)（匹配函数）与该模式进行匹配；特别是，‘*’和‘?’_可以_匹配目录分隔符。"
 #. type: Plain text
 #: en/glossary-content.txt:350
 #, priority:310
 msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
-msgstr ""
+msgstr "例如，Documentation/*.jpg将匹配Documentation子树中的所有.jpg文件，包括Documentation/chapter_1/figure_1.jpg。"
 #. type: Plain text
 #: en/glossary-content.txt:360
 #, priority:310
 msgid "A pathspec that begins with a colon `:` has special meaning.  In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path.  The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon.  The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
-msgstr ""
+msgstr "以冒号`:`开头的路径规范有特殊含义。  在简短的形式中，前面的冒号`:`后面是0个或更多的 “魔术签名(magic signature)”（可以选择以另一个冒号`:`结束），剩下的部分是与路径匹配的模式。  “魔术签名”由ASCII符号组成，这些符号既不是字母数字、glob、regex特殊字符也不是冒号。  如果模式以不属于“魔术签名”符号集的字符开始，并且不是冒号，那么结束“魔术签名”的可选冒号就可以省略。"
 #. type: Plain text
 #: en/glossary-content.txt:365
 #, priority:310
 msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
-msgstr ""
+msgstr "在较长规范中，前面的冒号`:`后面是一个开放的小括号`(`，一个用逗号分隔的0个或多个 “魔术单词”列表，以及一个封闭的小括号`)`，其余部分是要与路径匹配的模式。"
 #. type: Plain text
 #: en/glossary-content.txt:368
 #, priority:310
 msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
-msgstr ""
+msgstr "一个只有冒号的路径规范意味着 “不使用路径规范”。这种形式不应该与其他路径规范结合。"
 #. type: Labeled list
 #: en/glossary-content.txt:370
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
-#| msgid "--stop"
 msgid "top"
-msgstr "顶部"
+msgstr "顶部(top)"
 #. type: Plain text
 #: en/glossary-content.txt:374
 #, priority:310
 msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory."
-msgstr ""
+msgstr "魔术词`top`（魔术签名：`/`）使模式从工作区的根目录开始匹配，即使你从子目录内运行命令。"
 #. type: Labeled list
 #: en/glossary-content.txt:375
 #, no-wrap, priority:310
 msgid "literal"
-msgstr "literal"
+msgstr "字面量(literal)"
 #. type: Plain text
 #: en/glossary-content.txt:378
 #, priority:310
 msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters."
-msgstr ""
+msgstr "模式中的通配符，如`*`或`?`被视为字面量字符。"
 #. type: Labeled list
 #: en/glossary-content.txt:379
 #, no-wrap, priority:310
 msgid "icase"
-msgstr "icase"
+msgstr "不敏感匹配(icase)"
 #. type: Plain text
 #: en/glossary-content.txt:381
 #, priority:310
 msgid "Case insensitive match."
-msgstr ""
+msgstr "不区分大小写的匹配。"
 #. type: Labeled list
 #: en/glossary-content.txt:382
 #, no-wrap, priority:310
 msgid "glob"
-msgstr "glob"
+msgstr "通配符(glob)"
 #. type: Plain text
 #: en/glossary-content.txt:389
 #, priority:310
 msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname.  For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"."
-msgstr ""
+msgstr "Git将模式视为适合fnmatch(3)（匹配函数）使用shell的glob模式（shell 所使用的简化了的正则表达式），带有FNM_PATHNAME标志:模式中的通配符将不匹配路径名中的/（即不对子目录或上级目录进行匹配）。例如，\"Documentation/{asterisk}.html\"匹配\"Documentation/git.html\"，而不是\"Documentation/ppc/ppc.html\"或\"tools/perf/Documentation/perff.html\"。"
 #. type: Plain text
 #: en/glossary-content.txt:392
 #, priority:310
 msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:"
-msgstr ""
+msgstr "在与全路径名匹配的模式中，两个连续的星号（\"`**`\"）可能有特殊含义："
 #. type: Plain text
 #: en/glossary-content.txt:398
 #, priority:310
 msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"."
-msgstr ""
+msgstr "\"`**`\"在带斜杠目录之前，表示在所有目录中匹配。例如，\"`**/foo`\"匹配任何文件或目录的\"`foo`\"，与模式\"`foo`\"相同。\"`**/foo/bar`\"匹配任何文件或目录中直接位于目录\"`foo`\"之下的\"`bar`\"。"
 #. type: Plain text
 #: en/glossary-content.txt:402
 #, priority:310
 msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth."
-msgstr ""
+msgstr "路径后跟有\"`/**`\"表示匹配这个目录里面的所有文件。例如，\"`abc/**`\"匹配相对于`.gitignore`文件的位置中目录 \"abc \"内的所有文件，深度无限。"
 #. type: Plain text
 #: en/glossary-content.txt:406
 #, priority:310
 msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on."
-msgstr ""
+msgstr "一个斜杠后面是两个连续的星号再接上一个斜杠，匹配零个或多个目录。例如，\"`a/**/b`\" 匹配 \"`a/b`\"、\"`a/x/b`\"、\"`a/x/y/b`\"，等等，依此类推。"
 #. type: Plain text
 #: en/glossary-content.txt:408
 #, priority:310
 msgid "Other consecutive asterisks are considered invalid."
-msgstr ""
+msgstr "其他连续的星号是无效的。"
 #. type: Plain text
 #: en/glossary-content.txt:410
 #, priority:310
 msgid "Glob magic is incompatible with literal magic."
-msgstr ""
+msgstr "通配符魔术词(glob)与字面量魔术词(literal)是不相容的。"
 #. type: Labeled list
 #: en/glossary-content.txt:411
 #, no-wrap, priority:310
 msgid "attr"
-msgstr "attr"
+msgstr "属性匹配"
 #. type: Plain text
 #: en/glossary-content.txt:417
 #, priority:310
 msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching.  See linkgit:gitattributes[5]."
-msgstr ""
+msgstr "在`attr:` 之后是一个空格分隔的“属性要求”列表，所有这些都必须满足才能被认为是匹配的路径;这是在通常的非魔法路径规范模式匹配之外的。参见linkgit:gitattributes[5]。"
 #. type: Plain text
 #: en/glossary-content.txt:420
 #, priority:310
 msgid "Each of the attribute requirements for the path takes one of these forms:"
-msgstr ""
+msgstr "以下包含了路径的每个属性要求："
 #. type: Plain text
 #: en/glossary-content.txt:422
 #, priority:310
 msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
-msgstr ""
+msgstr "\"`ATTR`\"表示要求设置`ATTR`属性。"
 #. type: Plain text
 #: en/glossary-content.txt:424
 #, priority:310
 msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
-msgstr ""
+msgstr "\"`-ATTR`\"要求属性`ATTR`没有设置。"
 #. type: Plain text
 #: en/glossary-content.txt:427
 #, priority:310
 msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
-msgstr ""
+msgstr "\"`ATTR=VALUE`\"要求将属性`ATTR`设置为字符串`VALUE`。"
 #. type: Plain text
 #: en/glossary-content.txt:430
 #, priority:310
 msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
-msgstr ""
+msgstr "\"`!ATTR`\"要求属性`ATTR`是未指定的。"
 #. type: Plain text
 #: en/glossary-content.txt:433
 #, priority:310
 msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
-msgstr ""
+msgstr "注意，当与树对象进行匹配时，属性仍然是从工作区中获得的，而不是从给定的树对象中获得。"
 #. type: Labeled list
 #: en/glossary-content.txt:434
 #, no-wrap, priority:310
 msgid "exclude"
-msgstr "exclude"
+msgstr "排除匹配(exclude)"
 #. type: Plain text
 #: en/glossary-content.txt:440
 #, priority:310
 msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored.  When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
-msgstr ""
+msgstr "当一个路径匹配了任何规则之外的(non-exclude)路径规范后，它将遍历所有的排除性路径规范（魔术签名：`！`或其同义词`^`）。如果匹配，该路径将被忽略。  当没有规则之外路径规范时，排除法将应用于结果集，就像在没有任何路径规范的情况下调用。"
 #. type: Labeled list
 #: en/glossary-content.txt:442
@@ -62194,67 +62186,67 @@ msgstr "[[def_parent]]父提交(parent)"
 #: en/glossary-content.txt:446
 #, priority:310
 msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
-msgstr ""
+msgstr "一个<<def_commit_object,提交对象>>包含一个开发中的逻辑前驱列表（可能是空的），即其父提交。"
 #. type: Labeled list
 #: en/glossary-content.txt:447
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_pickaxe]]pickaxe"
-msgstr "[[def_pickaxe]]pickaxe"
+msgstr "[[def_pickaxe]]挖掘(pickaxe)"
 #. type: Plain text
 #: en/glossary-content.txt:453
 #, priority:310
 msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
-msgstr ""
+msgstr "术语<<def_pickaxe,挖掘>>指的是diff核心例程(diffcore)的一个选项，辅助选择增加或删除特定文本字符串的变化。通过`--pickaxe-all`选项，它可以用来查看引入或删除的全部<<def_changeset,变更集>>，例如某一行文字。参见linkgit:git-diff[1]。"
 #. type: Labeled list
 #: en/glossary-content.txt:454
 #, no-wrap, priority:310
 msgid "[[def_plumbing]]plumbing"
-msgstr ""
+msgstr "[[def_plumbing]]管件(plumbing)"
 #. type: Plain text
 #: en/glossary-content.txt:456
 #, priority:310
 msgid "Cute name for <<def_core_git,core Git>>."
-msgstr ""
+msgstr "<<def_core_git,Git核心>>的昵称。"
 #. type: Labeled list
 #: en/glossary-content.txt:457
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_porcelain]]porcelain"
-msgstr "[[def_porcelain]]porcelain"
+msgstr "[[def_porcelain]]瓷件(porcelain)"
 #. type: Plain text
 #: en/glossary-content.txt:462
 #, priority:310
 msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
-msgstr ""
+msgstr "依靠<<def_core_git,Git核心>>的程序和程序套件的昵称，是对Git核心上层封装。与<<def_plumbing,管件>>相比，瓷件暴露了更多<<def_SCM,SCM>>接口。"
 #. type: Labeled list
 #: en/glossary-content.txt:463
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_per_worktree_ref]]per-worktree ref"
-msgstr "[[def_per_worktree_ref]]per-worktree ref"
+msgstr "[[def_per_worktree_ref]]工作区引用(per-worktree ref)"
 #. type: Plain text
 #: en/glossary-content.txt:468
 #, priority:310
 msgid "Refs that are per-<<def_worktree,worktree>>, rather than global.  This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
-msgstr ""
+msgstr "相比于全局引用，它是对每个<<def_worktree,工作区>>的引用。  目前只有<<def_HEAD,HEAD>>和任何以`refs/bisect/`开头的引用，但以后可能包括其他不寻常的引用。"
 #. type: Labeled list
 #: en/glossary-content.txt:469
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_pseudoref]]pseudoref"
-msgstr "[[def_pseudoref]]pseudoref"
+msgstr "[[def_pseudoref]]伪引用(pseudoref)"
 #. type: Plain text
 #: en/glossary-content.txt:484
 #, priority:310
 msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git.  Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace.  So, HEAD is not a pseudoref, because it is sometimes a symbolic ref.  They might optionally contain some additional data.  `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples.  Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs.  They also cannot be updated through the normal ref update machinery.  Instead, they are updated by directly writing to the files.  However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
-msgstr ""
+msgstr "伪引用是`$GIT_DIR`下的一类文件，其行为与修订-剖析(rev-parse)中的引用一样，但被Git区分对待。  伪引用的名字一般是由由一行<<def_SHA1,SHA-1>>开始，然后是空格。  所以，HEAD并不是一个伪引用，因为它有时是一个符号性引用。  它可能选择性地包含一些额外的数据。  比如`MERGE_HEAD`和`CHERRY_PICK_HEAD`。  与<<def_per_worktree_ref,工作区引用>>不同，这些文件不能是符号引用，也没有引用日志。  它们也不能通过正常的引用更新机制进行更新。  相反，它们是通过直接写入文件来更新的。  不过，它们可以被当作引用读取，所以 `git rev-parse MERGE_HEAD` 仍可以运行。"
 #. type: Labeled list
 #: en/glossary-content.txt:485
@@ -62266,44 +62258,43 @@ msgstr "[[def_pull]]拉取(pull)"
 #: en/glossary-content.txt:488
 #, priority:310
 msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it.  See also linkgit:git-pull[1]."
-msgstr ""
+msgstr "拉取一个<<def_branch,分支>>意味着<<def_fetch,获取>>一个分支并且<<def_merge,合并>>这个分支。  另见 linkgit:git-pull[1]。"
 #. type: Labeled list
 #: en/glossary-content.txt:489
 #, no-wrap, priority:310
 msgid "[[def_push]]push"
-msgstr ""
+msgstr "[[def_push]]推送(push)"
 #. type: Plain text
 #: en/glossary-content.txt:500
 #, priority:310
 msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
-msgstr ""
+msgstr "推送一个<<def_branch,分支>>意味着从远程的<<def_repository,仓库>>获取该分支的<<def_head_ref,头引用>>，找出它是否是该分支的本地分支引用的一个祖先。在这种情况下，将所有从本地分支引用<<def_reachable,可达>>的对象，以及从远程仓库中丢失的对象，放入远程<<def_object_database,对象库>>，并更新远程分支引用。如果远程<<def_head,头/分支>>不是本地分支的祖先，则推送失败。"
 #. type: Labeled list
 #: en/glossary-content.txt:501
 #, no-wrap, priority:310
 msgid "[[def_reachable]]reachable"
-msgstr "[[def_reachable]]可到达的"
+msgstr "[[def_reachable]]可达的（reachable）"
 #. type: Plain text
 #: en/glossary-content.txt:510
 #, priority:310
 msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
-msgstr ""
+msgstr "一个给定的<<def_commit,提交>>的所有祖先都被称为可以从该提交 “到达”。更一般地说，如果一个<<def_object,对象>>可以通过<<def_chain,对象链>>从一个<<def_tag,标签>>到达任意一个对象链标记的<<def_tag,标签>>，那么该对象就是可达的，<<def_commit_object,提交>>到它们的父提交或树，以及<<def_tree_object,树>>到它们所包含的树或<<def_blob_object,二进制对象>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:511
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
-#| msgid "[[def_reachable]]reachable"
 msgid "[[def_reachability_bitmap]]reachability bitmaps"
-msgstr "[[def_reachable]]可到达的"
+msgstr "[[def_reachability_bitmap]]可达性位图"
 #. type: Plain text
 #: en/glossary-content.txt:518
 #, priority:310
 msgid "Reachability bitmaps store information about the <<def_reachable,reachability>> of a selected set of commits in a packfile, or a multi-pack index (MIDX), to speed up object search.  The bitmaps are stored in a \".bitmap\" file. A repository may have at most one bitmap file in use. The bitmap file may belong to either one pack, or the repository's multi-pack index (if it exists)."
-msgstr ""
+msgstr "可达性位图存储了包文件或多包索引（MIDX）中选定的一组提交的<<def_reachable,可达性>>的信息，以加快对象搜索。  位图被存储在\".bitmap \"文件中。一个版本库最多可以有一个位图文件在使用。这个位图文件可以属于一个包，也可以属于版本库的多包索引（如果有的话）。"
 #. type: Labeled list
 #: en/glossary-content.txt:519
@@ -62315,31 +62306,31 @@ msgstr "[[def_rebase]]变基(rebase)"
 #: en/glossary-content.txt:523
 #, priority:310
 msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
-msgstr ""
+msgstr "将<<def_branch,分支>>的一系列修改重新应用于不同的分支上，并将<<def_head,头>>指针重置为该分支。"
 #. type: Labeled list
 #: en/glossary-content.txt:524
 #, no-wrap, priority:310
 msgid "[[def_ref]]ref"
-msgstr ""
+msgstr "[[def_ref]]引用(ref)"
 #. type: Plain text
 #: en/glossary-content.txt:532
 #, priority:310
 msgid "A name that begins with `refs/` (e.g. `refs/heads/master`)  that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>).  For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details.  Refs are stored in the <<def_repository,repository>>."
-msgstr ""
+msgstr "一个以`refs/`开头的名字（例如`refs/heads/master`），它指向一个<<def_object_name,对象名称>>或另一个引用（后者被称为<<def_symref,符号引用>>）。  为方便起见，当作为 Git 命令的参数时，引用可以使用缩写；参见 linkgit:gitrevisions[7] 。  引用保存在<<def_repository,仓库>>中。"
 #. type: Plain text
 #: en/glossary-content.txt:536
 #, priority:310
 msgid "The ref namespace is hierarchical.  Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
-msgstr ""
+msgstr "引用的命名空间是分层次的。  不同的子层次表示不同的情况（例如，`refs/heads/`层次用于代表本地分支）。"
 #. type: Plain text
 #: en/glossary-content.txt:539
 #, priority:310
 msgid "There are a few special-purpose refs that do not begin with `refs/`.  The most notable example is `HEAD`."
-msgstr ""
+msgstr "有一些特殊意义的引用不以`refs/`开头。  最经典的例子就是`HEAD`。"
 #. type: Labeled list
 #: en/glossary-content.txt:540
@@ -62351,7 +62342,7 @@ msgstr "[[def_reflog]]引用日志(reflog)"
 #: en/glossary-content.txt:545
 #, priority:310
 msgid "A reflog shows the local \"history\" of a ref.  In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm.  See linkgit:git-reflog[1] for details."
-msgstr ""
+msgstr "引用日志显示一个引用的本地 \"历史\"。  换句话说，它可以告诉你，在昨天下午9:14，_这个_版本库的最后三次修订是什么，以及_这个_版本库的当前状态是什么。  详情见 linkgit:git-reflog[1]。"
 #. type: Labeled list
 #: en/glossary-content.txt:546
@@ -62363,31 +62354,31 @@ msgstr "[[def_refspec]]引用规范(refspec)"
 #: en/glossary-content.txt:550
 #, priority:310
 msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
-msgstr ""
+msgstr "“引用规范”是<<def_fetch,获取>>和<<def_push,推送>>用以描述远程<<def_ref,引用>>和本地引用之间的映射关系。"
 #. type: Labeled list
 #: en/glossary-content.txt:551
 #, no-wrap, priority:310
 msgid "[[def_remote]]remote repository"
-msgstr ""
+msgstr "[[def_remote]]远程仓库"
 #. type: Plain text
 #: en/glossary-content.txt:555
 #, priority:310
 msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
-msgstr ""
+msgstr "一个部署在其他地方但用于跟踪同一个项目的<<def_repository,仓库>>。要与远程通信，请参阅<<def_fetch,获取>>或<<def_push,推送>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:556
 #, no-wrap, priority:310
 msgid "[[def_remote_tracking_branch]]remote-tracking branch"
-msgstr ""
+msgstr "[[def_remote_tracking_branch]]远程跟踪分支(remote-tracking branch)"
 #. type: Plain text
 #: en/glossary-content.txt:564
 #, priority:310
 msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
-msgstr ""
+msgstr "一个用来跟踪另一个<<def_repository,仓库>>变化的<<def_ref,引用>>。它通常看起来像'refs/remotes/foo/bar'（表示它跟踪一个名为'foo'的远程中名为'bar'的分支），并对配置好的fetch<<def_refspec,引用规范>>右侧进行匹配。一个远程跟踪分支不应该由直接的修改或是本地的提交构成。"
 #. type: Labeled list
 #: en/glossary-content.txt:565
@@ -62399,7 +62390,7 @@ msgstr "[[def_repository]仓库"
 #: en/glossary-content.txt:572
 #, priority:310
 msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
-msgstr ""
+msgstr "一个<<def_ref,引用>>的集合和一个<<def_object_database,对象库>>的集合，包含了引用中所有的<<def_reachable,可达的>>对象，可能还有一个或多个<<def_porcelain,瓷件>>元数据。一个仓库可以通过<<def_alternate_object_database,轮替对象库>>与其他存储库共享对象数据库。"
 #. type: Labeled list
 #: en/glossary-content.txt:573
@@ -62411,7 +62402,7 @@ msgstr "[[def_resolve]]解决"
 #: en/glossary-content.txt:576
 #, priority:310
 msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
-msgstr ""
+msgstr "手动修复由自动<<def_merge,合并>>产生的遗留错误。"
 #. type: Labeled list
 #: en/glossary-content.txt:577
@@ -62423,7 +62414,7 @@ msgstr "[[def_revision]]版本"
 #: en/glossary-content.txt:579
 #, priority:310
 msgid "Synonym for <<def_commit,commit>> (the noun)."
-msgstr ""
+msgstr "与<<def_commit,提交>>（名词形式）同义。"
 #. type: Labeled list
 #: en/glossary-content.txt:580
@@ -62435,19 +62426,19 @@ msgstr "[[def_rewind]]回退"
 #: en/glossary-content.txt:583
 #, priority:310
 msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
-msgstr ""
+msgstr "删除一部分数据，即把<<def_head,头>>指针指向较早的<<def_revision,版本>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:584
 #, no-wrap, priority:310
 msgid "[[def_SCM]]SCM"
-msgstr ""
+msgstr "[[def_SCM]]SCM（源代码管理工具）"
 #. type: Plain text
 #: en/glossary-content.txt:586
 #, priority:310
 msgid "Source code management (tool)."
-msgstr ""
+msgstr "源代码管理（工具）。"
 #. type: Labeled list
 #: en/glossary-content.txt:587
@@ -62459,7 +62450,7 @@ msgstr "[[def_SHA1]]SHA-1"
 #: en/glossary-content.txt:590
 #, priority:310
 msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function.  In the context of Git used as a synonym for <<def_object_name,object name>>."
-msgstr ""
+msgstr "\"安全哈希算法1\"；一个加密哈希函数。  在Git的上下文中是<<def_object_name,对象名>>的同义词。"
 #. type: Labeled list
 #: en/glossary-content.txt:591
@@ -62471,7 +62462,7 @@ msgstr "[[def_shallow_clone]]浅克隆(shallow clone)"
 #: en/glossary-content.txt:595
 #, ignore-ellipsis, priority:310
 msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
-msgstr ""
+msgstr "大部分是指<<def_shallow_repository,浅仓库>>，但它更明确地表明其是通过运行`git clone --depth=...`命令创建的。"
 #. type: Labeled list
 #: en/glossary-content.txt:596
@@ -62483,7 +62474,7 @@ msgstr "[[def_shallow_repository]浅仓库(shallow repository)"
 #: en/glossary-content.txt:606
 #, priority:310
 msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
-msgstr ""
+msgstr "一个浅<<def_repository,仓库>>不会记录完整的提交历史，其中一些<<def_commit,提交>>的<<def_parent,父>>提交被销毁了（换句话说，Git被告知假装这些提交没有父提交，尽管在<<def_commit_object,提交对象>>中有记录）。当你只对一个项目的近期历史感兴趣时，这是很有用的，尽管上游记录的真实历史要大得多。通过给 linkgit:git-clone[1]提供 `--depth` 选项，可以创建一个浅层的仓库，之后可以用 linkgit:git-fetch[1] 深掘它的历史。"
 #. type: Labeled list
 #: en/glossary-content.txt:607
@@ -62495,7 +62486,7 @@ msgstr "[[def_stash]]贮藏项"
 #: en/glossary-content.txt:610
 #, priority:310
 msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
-msgstr ""
+msgstr "一个<<def_object,对象>>，用于临时存储<<def_dirty,脏>>工作目录的内容和索引，以便将来重新使用。"
 #. type: Labeled list
 #: en/glossary-content.txt:611
@@ -62507,19 +62498,19 @@ msgstr "[[def_submodule]]子模块(submodule)"
 #: en/glossary-content.txt:615
 #, priority:310
 msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
-msgstr ""
+msgstr "一个<<def_repository,仓库>>保存着另一个库内的独立项目的历史（后者被称为<<def_superproject, 父工程>>）。"
 #. type: Labeled list
 #: en/glossary-content.txt:616
 #, no-wrap, priority:310
 msgid "[[def_superproject]]superproject"
-msgstr ""
+msgstr "[[def_superproject]]父工程(superproject)"
 #. type: Plain text
 #: en/glossary-content.txt:621
 #, priority:310
 msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>.  The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
-msgstr ""
+msgstr "一个<<def_repository,仓库>>在其工作区中引用其他项目的仓库，作为<<def_submodule,子模块>>。  父工程包含子模块的提交对象的名称（但不持有其副本）。"
 #. type: Labeled list
 #: en/glossary-content.txt:622
@@ -62531,19 +62522,19 @@ msgstr "[[def_symref]]符号引用"
 #: en/glossary-content.txt:629
 #, priority:310
 msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference.  '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
-msgstr ""
+msgstr "符号引用：它不包含<<def_SHA1,SHA-1>>id，而是采用'ref: refs/some/thing'的格式，当被引用时，它会递归到这个引用。'<<def_HEAD,HEAD>>'是一个符号引用的典型例子。符号引用可通过linkgit:git-symbolic-ref[1]命令对其进行操作。"
 #. type: Labeled list
 #: en/glossary-content.txt:630
 #, no-wrap, priority:310
 msgid "[[def_tag]]tag"
-msgstr ""
+msgstr "[[def_tag]]标签(tag)"
 #. type: Plain text
 #: en/glossary-content.txt:639
 #, priority:310
 msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>).  In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
-msgstr ""
+msgstr "在`refs/tags/`命名空间下的一个<<def_ref,引用>>，指向一个任意类型的对象（通常一个标签指向一个<<def_tag_object,标签>>对象或者一个<<def_commit_object,提交对象>>）。  与<<def_head,head>>标记相比，标签不会被`commit`命令更新。Git的标签与Lisp的标签（在Git的上下文中称为<<def_object_type,对象类型>>）毫无关系。标签最常用的是标记祖先提交中的一个特定<<def_chain,对象链>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:640
@@ -62555,7 +62546,7 @@ msgstr "[[def_tag_object]]标签对象"
 #: en/glossary-content.txt:645
 #, priority:310
 msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP)  signature, in which case it is called a \"signed tag object\"."
-msgstr ""
+msgstr "一个<<def_object,对象>>包含一个指向另一个对象的<<def_ref,引用>>，它可以像<<def_commit_object,提交对象>>那样包含一个消息。它也可以包含一个（PGP）签名，这种情况下PGP被称为： \"有签名的标签对象\"(signed tag object)。"
 #. type: Labeled list
 #: en/glossary-content.txt:646
@@ -62567,19 +62558,19 @@ msgstr "[[def_topic_branch]]主题分支"
 #: en/glossary-content.txt:652
 #, priority:310
 msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
-msgstr ""
+msgstr "一个常规的 Git <<def_branch,分支>>，被开发者用来确定一个概念性的开发路线。由于新建一个分支通常需要很小的代价，所以通常开发中会包含几个小的分支，每个分支都有着非常明确的概念或小的增量但相关的变化。"
 #. type: Labeled list
 #: en/glossary-content.txt:653
 #, no-wrap, priority:310
 msgid "[[def_tree]]tree"
-msgstr ""
+msgstr "[[def_tree]]树/目录树(tree)"
 #. type: Plain text
 #: en/glossary-content.txt:657
 #, priority:310
 msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
-msgstr ""
+msgstr "要么是一个<<def_working_tree,工作区>>，要么是一个<<def_tree_object,树对象>>连同附属的<<def_blob_object,二进制文件>>对对象和对象树（即一个工作区的存储表示）。"
 #. type: Labeled list
 #: en/glossary-content.txt:658
@@ -62591,19 +62582,19 @@ msgstr "[[def_tree_object]]树对象"
 #: en/glossary-content.txt:662
 #, priority:310
 msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
-msgstr ""
+msgstr "一个<<def_object,对象>>包含一个文件名和模式的列表，以及相关的二进制文件和/或对象树的引用。一个<<def_tree,树>>等同于一个<<def_directory,目录>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:663
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_tree-ish]]tree-ish (also treeish)"
-msgstr "[[def_tree-ish]]tree-ish (also treeish)"
+msgstr "[[def_tree-ish]]树状对象[tree-ish (also treeish)]"
 #. type: Plain text
 #: en/glossary-content.txt:676
 #, priority:310
 msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object.  Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>.  The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
-msgstr ""
+msgstr "一个<<def_tree_object,树对象>>或者一个<<def_object,对象>>可以递归推断出一个树状对象。  递归一个<<def_commit_object,提交对象>>可以得到对应于<<def_revision,版本>>的顶层<<def_directory,目录>>树。  以下都是树状对象：<<def_commit-ish,提交号>>、树对象、指向树对象的<<def_tag_object,标签对象>>、指向树对象标签对象的标签对象，等等。"
 #. type: Labeled list
 #: en/glossary-content.txt:677
@@ -62615,19 +62606,19 @@ msgstr "[[def_unmerged_index]未合并暂存区"
 #: en/glossary-content.txt:680
 #, priority:310
 msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
-msgstr ""
+msgstr "一个<<def_index,暂存区>>，包含未合并的<<def_index_entry,索引项>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:681
 #, no-wrap, priority:310
 msgid "[[def_unreachable_object]]unreachable object"
-msgstr ""
+msgstr "[[def_unreachable_object]]不可达对象(unreachable object)"
 #. type: Plain text
 #: en/glossary-content.txt:684
 #, priority:310
 msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
-msgstr ""
+msgstr "一个从<<def_branch,分支>>、<<def_tag,标签>>或任何其他引用中都不<<def_reachable,可达的>><<def_object,对象>>。"
 #. type: Labeled list
 #: en/glossary-content.txt:685
@@ -62639,31 +62630,31 @@ msgstr "[[def_upstream_branch]]上游分支"
 #: en/glossary-content.txt:690
 #, priority:310
 msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
-msgstr ""
+msgstr "默认的 <<def_branch,分支>> 会被合并到相关的分支中（或相关的变基(rebase)分支）。它是通过 `branch.<name>.remote` 和 `branch.<name>.merge` 配置的。如果'A'的上游分支是'origin/B'，这有时会称作“'A'正在跟踪'origin/B'”。"
 #. type: Labeled list
 #: en/glossary-content.txt:691
 #, no-wrap, priority:310
 msgid "[[def_working_tree]]working tree"
-msgstr ""
+msgstr "[[def_working_tree]]工作区(working tree)"
 #. type: Plain text
 #: en/glossary-content.txt:695
 #, priority:310
 msgid "The tree of actual checked out files.  The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
-msgstr ""
+msgstr "实际检查出来的文件树。  工作区通常包含<<def_HEAD,HEAD>>提交树的内容，和一些你已经做了但还没有提交的本地修改。"
 #. type: Labeled list
 #: en/glossary-content.txt:696
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_worktree]]worktree"
-msgstr "[[def_per_worktree_ref]]per-worktree ref"
+msgstr "[[def_worktree]]工作树(worktree)"
 #. type: Plain text
 #: en/glossary-content.txt:703
 #, priority:310
 msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)."
-msgstr ""
+msgstr "一个仓库可以没有（即裸仓库），也可以有一个或多个工作树附属于它。一个 “工作树 ”由 “工作区”和版本库元数据组成，其中大部分元数据在单个仓库的其他工作树中共享，有些元数据在每个工作树中单独维护（例如：索引、HEAD 和像MERGE_HEAD这样的伪引用 、每个工作树索引件和每个工作树）。"
 #. type: Plain text
 #: en/i18n.txt:2
@@ -63285,7 +63276,7 @@ msgstr ""
 #: en/merge-strategies.txt:125
 #, ignore-same, no-wrap, priority:240
 msgid "octopus"
-msgstr "octopus"
+msgstr "多路合并"
 #. type: Plain text
 #: en/merge-strategies.txt:131