Translated using Weblate (Chinese (Simplified))

Currently translated at 26.0% (2853 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))
8b72a13f · 秃头灯笼鱼 · Hosted Weblate · c6c241f8 · 8b72a13f
Unverified Commit 8b72a13f 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,19 +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\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2022-11-26 21:11+0100\n"
-"PO-Revision-Date: 2022-07-02 09:18+0000\n"
-"Last-Translator: 冉 <ranto2012@163.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_HANS-CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.13.1-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-12 07:19+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
@@ -1673,8 +1661,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
  
-#. type: Plain text
 # 查找给定版本的符号名称
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:39
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -7169,8 +7157,8 @@ msgstr "删除的内容"
 msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
 msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
  
-#. type: Labeled list
 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#. type: Labeled list
 #: en/git-add.txt:388
 #, fuzzy, no-wrap, priority:300
 msgid "modified content"
@@ -56666,7 +56654,7 @@ msgstr "git(1)"
 #: en/git.txt:7
 #, priority:100
 msgid "git - the stupid content tracker"
-msgstr ""
+msgstr "git - 傻瓜式内容追踪器"
  
 #. type: Plain text
 #: en/git.txt:18
@@ -56690,67 +56678,67 @@ msgstr ""
 #: en/git.txt:24
 #, priority:100
 msgid "Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals."
-msgstr ""
+msgstr "Git是一个快速、可扩展的分布式版本控制系统，它拥有异常丰富的命令集，可以提供高级操作和对内部的完全访问。"
  
 #. type: Plain text
 #: en/git.txt:29
 #, priority:100
 msgid "See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] for a useful minimum set of commands.  The link:user-manual.html[Git User's Manual] has a more in-depth introduction."
-msgstr ""
+msgstr "请参阅 linkgit:gittutorial[7] 来开始,然后参阅 linkgit:giteveryday[7] 获取有用的最小命令集。  link:user-manual.html[Git用户手册] 中拥有更为深入的介绍。"
  
 #. type: Plain text
 #: en/git.txt:34
 #, priority:100
 msgid "After you mastered the basic concepts, you can come back to this page to learn what commands Git offers.  You can learn more about individual Git commands with \"git help command\".  linkgit:gitcli[7] manual page gives you an overview of the command-line command syntax."
-msgstr ""
+msgstr "在掌握了基本概念之后，你可以回到本页了解Git提供的命令。  你可以通过“git help”命令了解更多关于单个Git命令的信息。  linkgit:gitcli[7] 手册页面为您提供了命令行命令语法的概述。"
  
 #. type: Plain text
 #: en/git.txt:38
 #, priority:100
 msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at https://git.github.io/htmldocs/git.html or https://git-scm.com/docs."
-msgstr ""
+msgstr "最新Git文档的格式化和超链接副本可以在 https://git.github.io/htmldocs/git.html 或 https://git-scm.com/docs上查看。"
  
 #. type: Plain text
 #: en/git.txt:45
 #, priority:100
 msgid "Prints the Git suite version that the 'git' program came from."
-msgstr ""
+msgstr "打印‘git’程序的Git套件版本。"
  
 #. type: Plain text
 #: en/git.txt:49
 #, ignore-ellipsis, priority:100
 msgid "This option is internally converted to `git version ...` and accepts the same options as the linkgit:git-version[1] command. If `--help` is also given, it takes precedence over `--version`."
-msgstr ""
+msgstr "此选项在内部转换为 `git version ...` 并接受与linkgit:git-version[1] 命令相同的选项。如果`--version`后接`--help` 选项，则会优先展示`--version`选项的帮助信息。"
  
 #. type: Plain text
 #: en/git.txt:56
 #, priority:100
 msgid "Prints the synopsis and a list of the most commonly used commands. If the option `--all` or `-a` is given then all available commands are printed. If a Git command is named this option will bring up the manual page for that command."
-msgstr ""
+msgstr "打印概要和最常用的命令列表。如果给出选项`--all`或`--a`，则打印所有可用的命令。如果给出命令，该选项将调出该命令的手册页面。"
  
 #. type: Plain text
 #: en/git.txt:61
 #, ignore-ellipsis, priority:100
 msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
-msgstr ""
+msgstr "还有其他选项可以控制手册页面的显示方式。参阅linkgit:git-help[1]获取更多信息，因为 `git --help ...` 会在内部转换为 `git help ...`。"
  
 #. type: Labeled list
 #: en/git.txt:62
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
 msgid "-C <path>"
-msgstr ""
+msgstr "-C <path（文件路径）>"
  
 #. type: Plain text
 #: en/git.txt:68
 #, priority:100
 msgid "Run as if git was started in '<path>' instead of the current working directory.  When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`.  If '<path>' is present but empty, e.g. `-C \"\"`, then the current working directory is left unchanged."
-msgstr ""
+msgstr "运行时就像git在'<path>'而不是在当前工作目录下启动一样。  当给出多个`-C`选项时，每个后续的非绝对的`-C <path>`都是相对于前一个`-C <path>`解释的。  如果'<path>'存在但为空，例如`-C \"\"`，那么就在当前工作目录启动。"
  
 #. type: Plain text
 #: en/git.txt:73
 #, priority:100
 msgid "This option affects options that expect path name like `--git-dir` and `--work-tree` in that their interpretations of the path names would be made relative to the working directory caused by the `-C` option. For example the following invocations are equivalent:"
-msgstr ""
+msgstr "这个选项会影响到像`--git-dir`和`--work-tree`这样的需要路径名的选项，因为它们会用`-C`选项设置的工作目录进行相对路径的解释。例如，下面的调用是等价的："
  
 #. type: Plain text
 #: en/git.txt:76
@@ -56758,7 +56746,7 @@ msgstr ""
 msgid ""
 "    git --git-dir=a.git --work-tree=b -C c status\n"
 "    git --git-dir=c/a.git --work-tree=c/b status\n"
-msgstr ""
+msgstr "    git --git-dir=a.git --work-tree=b -C c status\n    git --git-dir=c/a.git --work-tree=c/b status\n"
  
 #. type: Labeled list
 #: en/git.txt:77
@@ -56770,37 +56758,37 @@ msgstr "-c <name>=<value>"
 #: en/git.txt:82
 #, priority:100
 msgid "Pass a configuration parameter to the command. The value given will override values from configuration files.  The <name> is expected in the same format as listed by 'git config' (subkeys separated by dots)."
-msgstr ""
+msgstr "向命令传递一个配置参数。给出的值将覆盖配置文件的值。  <name>的格式应与'git config'列出的格式相同（子键由`.`分隔）。"
  
 #. type: Plain text
 #: en/git.txt:88
-#, ignore-ellipsis, priority:100
+#, fuzzy, ignore-ellipsis, priority:100
 msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
-msgstr ""
+msgstr "注意在`git -c foo.bar ...`中省略`=`是允许的，并将`foo.bar`设置为true（就像配置文件中的`[foo]bar`一样）。包括等号但有一个空值（如`git -c foo.bar= ...`）会将`foo.bar`设置为空字符串，如果`git config --type=bool`空值会转换为`false`。"
  
 #. type: Labeled list
 #: en/git.txt:89
 #, fuzzy, no-wrap, priority:100
 msgid "--config-env=<name>=<envvar>"
-msgstr "--config <key>=<value>"
+msgstr "--config-env=<name>=<envvar（环境变量）>"
  
 #. type: Plain text
 #: en/git.txt:98
 #, priority:100
 msgid "Like `-c <name>=<value>`, give configuration variable '<name>' a value, where <envvar> is the name of an environment variable from which to retrieve the value. Unlike `-c` there is no shortcut for directly setting the value to an empty string, instead the environment variable itself must be set to the empty string.  It is an error if the `<envvar>` does not exist in the environment. `<envvar>` may not contain an equals sign to avoid ambiguity with `<name>` containing one."
-msgstr ""
+msgstr "像`-c <name>=<value>`一样，给配置变量'<name>'一个值，其中<envvar>是一个环境变量的名字，可以从中获取该环境变量的值。与`-c`不同的是，没有直接将值设置为空字符串的快捷方式，除非环境变量本身就设置为空字符串。  如果`<envvar>`在环境变量中不存在，则会报错。`<envvar>`可能不包含等号，以避免与包含等号的`<name>`产生歧义。"
  
 #. type: Plain text
 #: en/git.txt:105
 #, priority:100
 msgid "This is useful for cases where you want to pass transitory configuration options to git, but are doing so on OS's where other processes might be able to read your cmdline (e.g. `/proc/self/cmdline`), but not your environ (e.g. `/proc/self/environ`). That behavior is the default on Linux, but may not be on your system."
-msgstr ""
+msgstr "这对于你想向git传递临时配置选项，在其他进程可能能够读取你的cmdline（如`/proc/self/cmdline`），但不能读取你的environ（如`/proc/self/environ`）的操作系统上这样做很有用。这种行为在Linux上是默认的，但在你的系统上可能不是这样。"
  
 #. type: Plain text
 #: en/git.txt:110
 #, priority:100
 msgid "Note that this might add security for variables such as `http.extraHeader` where the sensitive information is part of the value, but not e.g. `url.<base>.insteadOf` where the sensitive information can be part of the key."
-msgstr ""
+msgstr "请注意，这可能会增加变量的安全性，例如`http.extraHeader`，因为他的敏感信息包含在值中，但并不会增加例如`url.<base>.insteadOf`这种变量的安全性，因为其敏感信息可能会包含在部分键中。"
  
 #. type: Labeled list
 #: en/git.txt:111
@@ -56812,7 +56800,7 @@ msgstr "--exec-path[=<path>]"
 #: en/git.txt:116
 #, priority:100
 msgid "Path to wherever your core Git programs are installed.  This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit."
-msgstr ""
+msgstr "安装Git核心程序的路径。  这也可以通过设置 GIT_EXEC_PATH 环境变量来控制。如果没有给出路径，'git'会打印当前的设置，然后退出。"
  
 #. type: Labeled list
 #: en/git.txt:117
@@ -56824,7 +56812,7 @@ msgstr "--html-path"
 #: en/git.txt:120
 #, priority:100
 msgid "Print the path, without trailing slash, where Git's HTML documentation is installed and exit."
-msgstr ""
+msgstr "打印Git的HTML文档的安装路径（尾部不带斜杠）然后退出。"
  
 #. type: Labeled list
 #: en/git.txt:121
@@ -56836,7 +56824,7 @@ msgstr "--man-path"
 #: en/git.txt:124
 #, priority:100
 msgid "Print the manpath (see `man(1)`) for the man pages for this version of Git and exit."
-msgstr ""
+msgstr "打印该版本Git man page的manpath（参阅`man(1)`），然后退出。"
  
 #. type: Labeled list
 #: en/git.txt:125
@@ -56848,7 +56836,7 @@ msgstr "--info-path"
 #: en/git.txt:128
 #, priority:100
 msgid "Print the path where the Info files documenting this version of Git are installed and exit."
-msgstr ""
+msgstr "打印记录该版本Git信息文件的安装路径并退出。"
  
 #. type: Labeled list
 #: en/git.txt:130
@@ -56860,7 +56848,7 @@ msgstr "--paginate"
 #: en/git.txt:135
 #, priority:100
 msgid "Pipe all output into 'less' (or if set, $PAGER) if standard output is a terminal.  This overrides the `pager.<cmd>` configuration options (see the \"Configuration Mechanism\" section below)."
-msgstr ""
+msgstr "如果标准输出是一个终端，则将所有的输出输出到'less（git默认的分页器）'（如果设置，则为$PAGER）中。  这会覆盖`pager.<cmd>`配置选项（参阅下面的 \"配置机制 \"部分）。"
  
 #. type: Labeled list
 #: en/git.txt:137
@@ -56872,43 +56860,43 @@ msgstr "--no-pager"
 #: en/git.txt:139
 #, priority:100
 msgid "Do not pipe Git output into a pager."
-msgstr ""
+msgstr "不使用分页器进行Git的输出。"
  
 #. type: Labeled list
 #: en/git.txt:140
-#, fuzzy, no-wrap, priority:100
+#, no-wrap, priority:100
 msgid "--git-dir=<path>"
-msgstr "--git-dir=<path>"
+msgstr "--git-dir=<path（文件路径）>"
  
 #. type: Plain text
 #: en/git.txt:144
 #, priority:100
 msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
-msgstr ""
+msgstr "设置存储库的路径（\".git \"目录）。这也可以通过设置`GIT_DIR`环境变量来控制。<path>可以是绝对路径或是当前工作目录的相对路径。"
  
 #. type: Plain text
 #: en/git.txt:155
 #, priority:100
 msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree.  If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
-msgstr ""
+msgstr "使用该选项（或`GIT_DIR`环境变量）指定\".git \"目录的位置，这会关闭对带有\".git \"子目录仓库的扫描（这是找到仓库和顶级工作区的方式），并告诉 Git 当前在顶级工作区。  如果当前并不在工作区的顶级目录，你应该用`--work-tree=<path>`选项（或`GIT_WORK_TREE`环境变量）告诉Git顶级工作区在哪里。"
  
 #. type: Plain text
 #: en/git.txt:158
 #, priority:100
 msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
-msgstr ""
+msgstr "如果你只是想在`<path>`中运行Git，可以使用`git -C <path>`。"
  
 #. type: Labeled list
 #: en/git.txt:159
 #, no-wrap, priority:100
 msgid "--work-tree=<path>"
-msgstr ""
+msgstr "--work-tree=<path（文件路径）>"
  
 #. type: Plain text
 #: en/git.txt:166
 #, priority:100
 msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory.  This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
-msgstr ""
+msgstr "设置工作树的路径。<path>可以是一个绝对路径或与当前工作目录相对的路径。  这也可以通过设置 GIT_WORK_TREE 环境变量和 core.worktree 配置变量来控制（参阅linkgit:git-config[1] 中的 core.worktree获取更为详细的论述）。"
  
 #. type: Labeled list
 #: en/git.txt:167
@@ -56920,7 +56908,7 @@ msgstr "--namespace=<path>"
 #: en/git.txt:171
 #, priority:100
 msgid "Set the Git namespace.  See linkgit:gitnamespaces[7] for more details.  Equivalent to setting the `GIT_NAMESPACE` environment variable."
-msgstr ""
+msgstr "设置 Git 命名空间。  参阅 linkgit:gitnamespaces[7] 以了解更多细节。  这相当于设置 `GIT_NAMESPACE` 环境变量。"
  
 #. type: Labeled list
 #: en/git.txt:172
@@ -56932,13 +56920,13 @@ msgstr "--super-prefix=<path>"
 #: en/git.txt:176
 #, priority:100
 msgid "Currently for internal use only.  Set a prefix which gives a path from above a repository down to its root.  One use is to give submodules context about the superproject that invoked it."
-msgstr ""
+msgstr "目前只供内部使用。  设置一个前缀，提供一个从仓库到其根目录的路径。  一个用途是给子模块提供关于调用它父模块的上下文。"
  
 #. type: Plain text
 #: en/git.txt:181
 #, priority:100
 msgid "Treat the repository as a bare repository.  If GIT_DIR environment is not set, it is set to the current working directory."
-msgstr ""
+msgstr "将该仓库视为裸仓库。  如果没有设置GIT_DIR环境变量，它将在当前工作目录生成仓库。"
  
 #. type: Labeled list
 #: en/git.txt:182
@@ -56950,7 +56938,7 @@ msgstr "--no-replace-objects"
 #: en/git.txt:185
 #, priority:100
 msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
-msgstr ""
+msgstr "不使用候补引用来替换 Git 对象。更多信息参阅 linkgit:git-replace[1]。"
  
 #. type: Labeled list
 #: en/git.txt:186
@@ -56962,7 +56950,7 @@ msgstr "--literal-pathspecs"
 #: en/git.txt:190
 #, priority:100
 msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic).  This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
-msgstr ""
+msgstr "按字面意思处理路径规格（即不使用通配符，不使用路径规范功能）。  这相当于将`GIT_LITERAL_PATHSPECS`环境变量设置为`1`。"
  
 #. type: Labeled list
 #: en/git.txt:191
@@ -56974,7 +56962,7 @@ msgstr "--glob-pathspecs"
 #: en/git.txt:196
 #, priority:100
 msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
-msgstr ""
+msgstr "在所有的路径规范中添加 \"glob\"功能。这相当于将`GIT_GLOB_PATHSPECS`环境变量设置为`1`。在单个路径规格上禁用通配符可以用路径规范功能\":(literal) \"来完成。"
  
 #. type: Labeled list
 #: en/git.txt:197
@@ -56986,7 +56974,7 @@ msgstr "--noglob-pathspecs"
 #: en/git.txt:202
 #, priority:100
 msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
-msgstr ""
+msgstr "在所有路径规范中添加 \"literal\"功能。这相当于将`GIT_NOGLOB_PATHSPECS`环境变量设为`1`。在单个路径规范上启用通配符功能，可以使用路径规范功能\":(glob) \"来完成。"
  
 #. type: Labeled list
 #: en/git.txt:203
@@ -56998,7 +56986,7 @@ msgstr "--icase-pathspecs"
 #: en/git.txt:206
 #, priority:100
 msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
-msgstr ""
+msgstr "在所有的路径规范中添加 \"icase \"功能。这相当于将`GIT_ICASE_PATHSPECS`环境变量设置为`1`。"
  
 #. type: Labeled list
 #: en/git.txt:207
@@ -57010,7 +56998,7 @@ msgstr "--no-optional-locks"
 #: en/git.txt:210
 #, priority:100
 msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
-msgstr ""
+msgstr "禁止执行需要锁的可选操作。这相当于将`GIT_OPTIONAL_LOCKS`设置为`0'。"
  
 #. type: Labeled list
 #: en/git.txt:211
@@ -57022,79 +57010,79 @@ msgstr "--list-cmds=group[,group...]"
 #: en/git.txt:220
 #, priority:100
 msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
-msgstr ""
+msgstr "按组列出命令。这是一个内部/实验性的选项，将来可能会改变或删除。支持的组有：buildins、parseopt（使用parse-options的内置命令）、main（libexec目录下的所有命令）、others（`$PATH`中其他带有git-前缀的命令）、list-<category>（参阅command-list.txt中的目录【原文是这么说的，但是下面那个Git命令章节已经列出了所有命令列表】）、nohelpers（排除辅助命令）、alias和config（在配置completion.commands中检索命令列表）"
  
 #. type: Title -
 #: en/git.txt:222
 #, no-wrap, priority:100
 msgid "GIT COMMANDS"
-msgstr ""
+msgstr "Git命令"
  
 #. type: Plain text
 #: en/git.txt:226
 #, priority:100
 msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
-msgstr ""
+msgstr "我们把Git分为上层封装命令（“瓷件”）和底层核心命令（“管件”）。"
  
 #. type: Title -
 #: en/git.txt:228
 #, no-wrap, priority:100
 msgid "High-level commands (porcelain)"
-msgstr ""
+msgstr "上层封装命令（瓷件）"
  
 #. type: Plain text
 #: en/git.txt:232
 #, priority:100
 msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
-msgstr ""
+msgstr "我们将瓷件命令分为主要命令和一些辅助性的用户工具。"
  
 #. type: Title ~
 #: en/git.txt:234
 #, no-wrap, priority:100
 msgid "Main porcelain commands"
-msgstr ""
+msgstr "主要瓷件命令"
  
 #. type: Title ~
 #: en/git.txt:239
 #, no-wrap, priority:100
 msgid "Ancillary Commands"
-msgstr ""
+msgstr "辅助命令"
  
 #. type: Plain text
 #: en/git.txt:241
-#, fuzzy, priority:100
+#, priority:100
 msgid "Manipulators:"
-msgstr "Manipulators:"
+msgstr "控制相关："
  
 #. type: Plain text
 #: en/git.txt:245
 #, priority:100
 msgid "Interrogators:"
-msgstr ""
+msgstr "审阅相关："
  
 #. type: Title ~
 #: en/git.txt:250
 #, no-wrap, priority:100
 msgid "Interacting with Others"
-msgstr ""
+msgstr "与其他应用交互"
  
 #. type: Plain text
 #: en/git.txt:254
 #, priority:100
 msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
-msgstr ""
+msgstr "这些命令是为了与外部SCM（源代码管理工具）以及通过电子邮件与其他人进行交互。"
  
 #. type: Title ~
 #: en/git.txt:258
 #, no-wrap, priority:100
 msgid "Reset, restore and revert"
-msgstr ""
+msgstr "重置、恢复和还原"
  
 #. type: Plain text
 #: en/git.txt:261
 #, priority:100
 msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
-msgstr ""
+msgstr "包括了三个名称相似的命令：`git reset`、`git restore`和`git revert`。"
  
 #. type: Plain text
 #: en/git.txt:264
@@ -57106,85 +57094,85 @@ msgstr "linkgit:git-revert[1] 是关于进行新的提交，以还原其他提
 #: en/git.txt:269
 #, priority:100
 msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
-msgstr ""
+msgstr "linkgit:git-restore[1] 是有关从索引或其他提交中恢复工作区中文件的命令。这个命令不会更新你的分支。该命令也可以用来从另一个提交中恢复索引中的文件。"
  
 #. type: Plain text
 #: en/git.txt:273
 #, priority:100
 msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
-msgstr ""
+msgstr "linkgit:git-reset[1] 是有关更新分支、移动提示的命令，以便从分支中添加或删除提交。这个操作会修改提交历史。"
  
 #. type: Plain text
 #: en/git.txt:276
 #, priority:100
 msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
-msgstr ""
+msgstr "`git reset`也可以用来恢复索引，这个功能`git restore`的功能有些重合。"
  
 #. type: Title -
 #: en/git.txt:279
 #, no-wrap, priority:100
 msgid "Low-level commands (plumbing)"
-msgstr ""
+msgstr "底层核心命令（管件）"
  
 #. type: Plain text
 #: en/git.txt:286
 #, priority:100
 msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains.  Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
-msgstr ""
+msgstr "尽管 Git 包含了它自己的瓷件层，但它的底层核心命令足以支持替代瓷件的开发。  此类瓷件开发者可以从阅读 linkgit:git-update-index[1] 和 linkgit:git-read-tree[1] 开始。"
  
 #. type: Plain text
 #: en/git.txt:293
 #, priority:100
 msgid "The interface (input, output, set of options and the semantics)  to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use.  The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
-msgstr ""
+msgstr "这些底层命令的界面（输入、输出、选项集和语义）要比上层封装命令稳定得多，因为这些命令主要是用于脚本的使用。  另一方面，为了改善终端用户的体验，上层封装命令接口是可以改变的。"
  
 #. type: Plain text
 #: en/git.txt:299
 #, priority:100
 msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
-msgstr ""
+msgstr "下面的描述将底层核心命令分为操作对象（在存储库、索引和工作树中）的命令、审阅和比较对象的命令，以及在存储库之间移动对象和引用的命令。"
  
 #. type: Title ~
 #: en/git.txt:302
 #, no-wrap, priority:100
 msgid "Manipulation commands"
-msgstr ""
+msgstr "控制命令"
  
 #. type: Title ~
 #: en/git.txt:308
 #, no-wrap, priority:100
 msgid "Interrogation commands"
-msgstr ""
+msgstr "审阅命令"
  
 #. type: Plain text
 #: en/git.txt:314
 #, priority:100
 msgid "In general, the interrogate commands do not touch the files in the working tree."
-msgstr ""
+msgstr "一般来说，审阅命令不接触工作区中的文件。"
  
 #. type: Title ~
 #: en/git.txt:317
 #, no-wrap, priority:100
 msgid "Syncing repositories"
-msgstr ""
+msgstr "同步仓库"
  
 #. type: Plain text
 #: en/git.txt:323
 #, priority:100
 msgid "The following are helper commands used by the above; end users typically do not use them directly."
-msgstr ""
+msgstr "以下是上面使用的辅助命令，终端用户一般不会直接使用这些命令。"
  
 #. type: Title ~
 #: en/git.txt:328
 #, no-wrap, priority:100
 msgid "Internal helper commands"
-msgstr ""
+msgstr "内部辅助命令"
  
 #. type: Plain text
 #: en/git.txt:332
 #, priority:100
 msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
-msgstr ""
+msgstr "这些是其他命令使用的内部辅助命令；终端用户一般不会直接使用这些命令。"
  
 #. type: Title -
 #: en/git.txt:336
@@ -57197,43 +57185,43 @@ msgstr "指南"
 #: en/git.txt:339
 #, priority:100
 msgid "The following documentation pages are guides about Git concepts."
-msgstr ""
+msgstr "以下文档页是关于Git概念的指南。"
  
 #. type: Title -
 #: en/git.txt:343
 #, no-wrap, priority:100
 msgid "Repository, command and file interfaces"
-msgstr ""
+msgstr "仓库、命令和文件接口"
  
 #. type: Plain text
 #: en/git.txt:348
 #, priority:100
 msgid "This documentation discusses repository and command interfaces which users are expected to interact with directly. See `--user-formats` in linkgit:git-help[1] for more details on the criteria."
-msgstr ""
+msgstr "本文档讨论了用户希望直接与之交互的仓库和命令接口。有关标准的更多细节，请参阅linkgit:git-help[1]中的`--user-formats`。"
  
 #. type: Title -
 #: en/git.txt:352
 #, no-wrap, priority:100
 msgid "File formats, protocols and other developer interfaces"
-msgstr ""
+msgstr "文件格式、协议和其他开发者接口"
  
 #. type: Plain text
 #: en/git.txt:357
 #, priority:100
 msgid "This documentation discusses file formats, over-the-wire protocols and other git developer interfaces. See `--developer-interfaces` in linkgit:git-help[1]."
-msgstr ""
+msgstr "本文档讨论了文件格式、线上协议和其他git开发者接口。参阅 linkgit:git-help[1] 中的`--developer-interfaces`。"
  
 #. type: Title -
 #: en/git.txt:361
 #, no-wrap, priority:100
 msgid "Configuration Mechanism"
-msgstr ""
+msgstr "配置机制"
  
 #. type: Plain text
 #: en/git.txt:366
 #, priority:100
 msgid "Git uses a simple text format to store customizations that are per repository and are per user.  Such a configuration file may look like this:"
-msgstr ""
+msgstr "Git 使用一种简单的文本格式来存储每个仓库和每个用户的定制内容。  这样的配置文件可能是像这样："
  
 #. type: delimited block -
 #: en/git.txt:371
@@ -57242,7 +57230,7 @@ msgid ""
 "#\n"
 "# A '#' or ';' character indicates a comment.\n"
 "#\n"
-msgstr ""
+msgstr "#\n# 符号 '#' 或是 ';' 表示本行是注释信息\n#\n"
  
 #. type: delimited block -
 #: en/git.txt:381
@@ -57252,25 +57240,25 @@ msgid ""
 "[user]\n"
 "\tname = \"Junio C Hamano\"\n"
 "\temail = \"gitster@pobox.com\"\n"
-msgstr ""
+msgstr "; 用户身份信息\n[user]\n\tname = \"Junio C Hamano\"\n\temail = \"gitster@pobox.com\"\n"
  
 #. type: Plain text
 #: en/git.txt:387
 #, priority:100
 msgid "Various commands read from the configuration file and adjust their operation accordingly.  See linkgit:git-config[1] for a list and more details about the configuration mechanism."
-msgstr ""
+msgstr "各种命令从配置文件中读取并相应地调整其操作。有关配置机制的列表和更多细节，请参阅 linkgit:git-config[1]。"
  
 #. type: Title -
 #: en/git.txt:390
 #, no-wrap, priority:100
 msgid "Identifier Terminology"
-msgstr ""
+msgstr "标识符术语"
  
 #. type: Plain text
 #: en/git.txt:393
 #, priority:100
 msgid "Indicates the object name for any type of object."
-msgstr ""
+msgstr "表示任何类型的对象的名称。"
  
 #. type: Labeled list
 #: en/git.txt:394 en/git-unpack-file.txt:23
@@ -57282,25 +57270,25 @@ msgstr "<blob>"
 #: en/git.txt:396
 #, priority:100
 msgid "Indicates a blob object name."
-msgstr ""
+msgstr "表示一个数据对象的名称。"
  
 #. type: Plain text
 #: en/git.txt:399
 #, priority:100
 msgid "Indicates a tree object name."
-msgstr ""
+msgstr "表示一个树对象名称。"
  
 #. type: Plain text
 #: en/git.txt:402
 #, priority:100
 msgid "Indicates a commit object name."
-msgstr ""
+msgstr "表示一个提交对象名称。"
  
 #. type: Plain text
 #: en/git.txt:408
 #, priority:100
 msgid "Indicates a tree, commit or tag object name.  A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
-msgstr ""
+msgstr "表示一个树、提交或标签对象的名称。  一个需要<tree-ish>参数的命令最终会对<tree>对象进行操作，但会自动解除对指向<tree>对象的<commit>和<tag>对象的引用。"
  
 #. type: Labeled list
 #: en/git.txt:409
@@ -57312,37 +57300,37 @@ msgstr "<commit-ish>"
 #: en/git.txt:414
 #, priority:100
 msgid "Indicates a commit or tag object name.  A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
-msgstr ""
+msgstr "表示一个提交或标记对象的名称。  一个需要<commit-ish>参数的命令最终要对<commit>对象进行操作，但会自动解除对指向<commit>的<tag>对象的引用。"
  
 #. type: Plain text
 #: en/git.txt:418
 #, priority:100
 msgid "Indicates that an object type is required.  Currently one of: `blob`, `tree`, `commit`, or `tag`."
-msgstr ""
+msgstr "表示需要一个对象类型。  目前是其中之一：`blob`、`tree`、`commit`或`tag`。"
  
 #. type: Plain text
 #: en/git.txt:422
 #, priority:100
 msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
-msgstr ""
+msgstr "表示一个文件名——几乎总是相对于`GIT_INDEX_FILE`描述的树状结构的根部文件。"
  
 #. type: Title -
 #: en/git.txt:424
 #, no-wrap, priority:100
 msgid "Symbolic Identifiers"
-msgstr ""
+msgstr "符号标识符"
  
 #. type: Plain text
 #: en/git.txt:427
 #, priority:100
 msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
-msgstr ""
+msgstr "任何接受任意<object>的Git命令也可以使用下面的符号表示法："
  
 #. type: Plain text
 #: en/git.txt:430
 #, priority:100
 msgid "indicates the head of the current branch."
-msgstr ""
+msgstr "表示当前分支。"
  
 #. type: Labeled list
 #: en/git.txt:431
@@ -57354,43 +57342,43 @@ msgstr "<tag>"
 #: en/git.txt:434
 #, priority:100
 msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
-msgstr ""
+msgstr "一个有效的标签 \"名称\"（即一个`refs/tags/<tag>`引用）。"
  
 #. type: Plain text
 #: en/git.txt:438
 #, priority:100
 msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
-msgstr ""
+msgstr "一个有效的分支 \"名称\"（即一个`refs/heads/<head>`引用）。"
  
 #. type: Plain text
 #: en/git.txt:441
 #, priority:100
 msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
-msgstr ""
+msgstr "更完整的对象名称列表，请参阅 linkgit:gitrevisions[7] 中的 \"校正说明 \"部分。"
  
 #. type: Title -
 #: en/git.txt:444
 #, no-wrap, priority:100
 msgid "File/Directory Structure"
-msgstr ""
+msgstr "文件/目录结构"
  
 #. type: Plain text
 #: en/git.txt:447
 #, priority:100
 msgid "Please see the linkgit:gitrepository-layout[5] document."
-msgstr ""
+msgstr "请参阅 linkgit:gitrepository-layout[5] 文档。"
  
 #. type: Plain text
 #: en/git.txt:449
 #, priority:100
 msgid "Read linkgit:githooks[5] for more details about each hook."
-msgstr ""
+msgstr "阅读 linkgit:githooks[5] 了解关于每个钩子的更多细节。"
  
 #. type: Plain text
 #: en/git.txt:452
 #, priority:100
 msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
-msgstr ""
+msgstr "更高级别的源代码管理工具(SCM)可以在\"$GIT_DIR \"中提供和管理额外的信息。"
  
 #. type: Title -
 #: en/git.txt:455
@@ -57402,7 +57390,7 @@ msgstr "术语"
 #: en/git.txt:457
 #, priority:100
 msgid "Please see linkgit:gitglossary[7]."
-msgstr ""
+msgstr "请参阅linkgit:gitglossary[7]。"
  
 #. type: Plain text
 #: en/git.txt:465
@@ -61413,7 +61401,7 @@ msgstr "[[def_alternate_object_database]] 替代的对象库 (object database)"
 #: en/glossary-content.txt:5
 #, priority:310
 msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
-msgstr "通过替代机制, 一个 <<def_repository,repository>> 能够从另一个对象库中继承 <<def_object_database,object database>> 的一部分对象, 这被称作替代。"
+msgstr "通过替代机制, 一个 <<def_repository,repository>> 能够从另一个对象库中继承 <<def_object_database,object database>> 的一部分对象, 这被称作“轮替”。"
  
 #. type: Labeled list
 #: en/glossary-content.txt:6
@@ -61447,10 +61435,9 @@ msgstr "[[def_branch]] 分支 (branch)"
  
 #. type: Plain text
 #: en/glossary-content.txt:30
-#, fuzzy, priority:310
-#| msgid "A \"branch\" is a line of development.  The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch.  The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch.  A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
+#, priority:310
 msgid "A \"branch\" is a line of development.  The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch.  The tip of the branch is <<def_ref,referenced>> by a branch <<def_head,head>>, which moves forward as additional development is done on the branch.  A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
-msgstr "一个\"分支\"就是一条开发线。  一个分支上最近的<<def_commit,提交>>被称为该分支的顶端。  分支的顶端被分支的<<def_head,头指针>>所引用，随着该分支上的额外开发，该分支会向前移动。  一个Git的<<def_repository,仓库>>可以跟踪任意数量的分支，但你的<<def_working_tree,工作树>>只与其中一个分支（\"当前（current）\"或\"检出（checked out）\"分支）相关，并且<<def_HEAD,头指针>>指向该分支。"
+msgstr "一个 \"分支 \"就是一条开发线。  一个分支上最近的<<def_commit,commit>>被称为该分支的顶端。  分支的顶端被<<def_ref,引用>>分支<<def_head,head>>引用，当分支上有更多的开发工作时，它就会向前移动。  一个Git<<def_repository,仓库>>可以跟踪任意数量的分支，但你的<<def_working_tree,工作区>>只与其中一个分支（\"当前(current) \"或 \"检出(checked out)\"分支）相关联，而<<def_HEAD,头指针>>指向该分支。"
  
 #. type: Labeled list
 #: en/glossary-content.txt:31
@@ -61468,7 +61455,7 @@ msgstr "已过时：<<def_index，索引>>。"
 #: en/glossary-content.txt:34
 #, no-wrap, priority:310
 msgid "[[def_chain]]chain"
-msgstr "[[def_chain]]对象链（chain）"
+msgstr "[[def_chain]]（提交）链(chain)"
  
 #. type: Plain text
 #: en/glossary-content.txt:38
@@ -61484,7 +61471,7 @@ msgstr "[[def_changeset]] 变更集 (changeset)"
  
 #. type: Plain text
 #: en/glossary-content.txt:43
-#, fuzzy, priority:310
+#, priority:310
 msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
 msgstr "BitKeeper/cvsps是指\"<<def_commit,提交>>\"。由于Git并不存储变化，而是存储状态，所以在Git中使用\"变化集（changesets）\"这个词真的没有意义。"
  
@@ -61498,13 +61485,13 @@ msgstr "[[def_checkout]] 检出 (checkout)"
 #: en/glossary-content.txt:51
 #, priority:310
 msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
-msgstr "用<<def_object_database,对象库>>中的<<def_tree_object,树对象>>或<<def_blob_object,blob>>更新全部或部分<<def_working_tree,工作树>>，如果整个工作树已经指向一个新<<def_branch,分支>>，就更新<<def_index,暂存区>>和<<def_HEAD,头指针>>。"
+msgstr "用<<def_object_database,对象库>>中的<<def_tree_object,树对象>>或<<def_blob_object,blob>>更新全部或部分<<def_working_tree,工作区>>，如果整个工作树已经指向一个新<<def_branch,分支>>，就更新<<def_index,暂存区>>和<<def_HEAD,头指针>>。"
  
 #. type: Labeled list
 #: en/glossary-content.txt:52
-#, fuzzy, no-wrap, priority:310
+#, no-wrap, priority:310
 msgid "[[def_cherry-picking]]cherry-picking"
-msgstr "[[def_cherry-picking]]拾取（cherry-picking）"
+msgstr "[[def_cherry-picking]]拣选（cherry-picking）"
  
 #. type: Plain text
 #: en/glossary-content.txt:59