Translated using Weblate (Chinese (Simplified))

Currently translated at 64.3% (7172 of 11142 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/


Signed-off-by: 秃头灯笼鱼 <ttdlyu@163.com>

po/documentation.zh_HANS-CN.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-10-06 23:02+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 5.1-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-10-08 10:01+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 5.1-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:772 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
@@ -61655,13 +61655,13 @@ msgstr "由 linkgit:git-http-backend[1] 使用，用于提供 `$GIT_URL/info/ref
 #: en/git-upload-pack.txt:49
 #, priority:100
 msgid "The repository to sync from."
-msgstr ""
+msgstr "要同步的仓库。"
 #. type: Plain text
 #: en/git-upload-pack.txt:57
 #, priority:100
 msgid "Internal variable used for handshaking the wire protocol. Server admins may need to configure some transports to allow this variable to be passed. See the discussion in linkgit:git[1]."
-msgstr ""
+msgstr "用于与传输协议握手的内部变量。服务器管理员可能需要配置某些传输协议，以允许传递此变量。请参阅 linkgit:git[1] 中的讨论。"
 #. type: Title =
 #: en/git-var.txt:2
@@ -61673,7 +61673,7 @@ msgstr "git-var(1)"
 #: en/git-var.txt:7
 #, priority:100
 msgid "git-var - Show a Git logical variable"
-msgstr ""
+msgstr "git-var - 显示 Git 逻辑变量"
 #. type: Plain text
 #: en/git-var.txt:13
@@ -61685,13 +61685,13 @@ msgstr "'git var' ( -l | <variable> )\n"
 #: en/git-var.txt:18
 #, priority:100
 msgid "Prints a Git logical variable. Exits with code 1 if the variable has no value."
-msgstr ""
+msgstr "打印 Git 逻辑变量。如果变量没有值，则以代码 1 退出。"
 #. type: Plain text
 #: en/git-var.txt:26
 #, priority:100
 msgid "Cause the logical variables to be listed. In addition, all the variables of the Git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of `git config -l`.)"
-msgstr ""
+msgstr "会导致逻辑变量被列出。此外，Git 配置文件 .git/config 中的所有变量也会被列出。(不过，列出配置变量的功能已被弃用，改用 `git config -l`。）"
 #. type: Plain text
 #: en/git-var.txt:31
@@ -61707,7 +61707,7 @@ msgstr ""
 #: en/git-var.txt:34
 #, no-wrap, priority:100
 msgid "VARIABLES"
-msgstr ""
+msgstr "变量"
 #. type: Labeled list
 #: en/git-var.txt:35
@@ -61719,7 +61719,7 @@ msgstr "GIT_AUTHOR_IDENT"
 #: en/git-var.txt:37
 #, priority:100
 msgid "The author of a piece of code."
-msgstr ""
+msgstr "一段代码的作者。"
 #. type: Labeled list
 #: en/git-var.txt:38
@@ -61731,7 +61731,7 @@ msgstr "GIT_COMMITTER_IDENT"
 #: en/git-var.txt:40
 #, priority:100
 msgid "The person who put a piece of code into Git."
-msgstr ""
+msgstr "将代码放入 Git 的人。"
 #. type: Labeled list
 #: en/git-var.txt:41
@@ -61743,13 +61743,13 @@ msgstr "GIT_EDITOR"
 #: en/git-var.txt:49
 #, priority:100
 msgid "Text editor for use by Git commands.  The value is meant to be interpreted by the shell when it is used.  Examples: `~/bin/vi`, `$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --nofork`.  The order of preference is the `$GIT_EDITOR` environment variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then the default chosen at compile time, which is usually 'vi'."
-msgstr ""
+msgstr "供 Git 命令使用的文本编辑器。  该值在使用时由 shell 解释。  例如~/bin/vi`、`$SOME_ENVIRONMENT_VARIABLE`、`\"C:\\Program Files\\Vim\\gvim.exe\" --nofork`。  首选顺序是 `$GIT_EDITOR` 环境变量，然后是 `core.editor` 配置，然后是 `$VISUAL`，然后是 `$EDITOR`，然后是编译时选择的默认值，通常是 'vi'。"
 #. type: Plain text
 #: en/git-var.txt:51
 #, no-wrap, priority:100
 msgid "    The build you are using chose '{git-default-editor}' as the default.\n"
-msgstr ""
+msgstr "    您正在使用的版本选择了 '{git-default-editor}' 作为默认编辑器。\n"
 #. type: Labeled list
 #: en/git-var.txt:53
@@ -61761,7 +61761,7 @@ msgstr "GIT_SEQUENCE_EDITOR"
 #: en/git-var.txt:60
 #, priority:100
 msgid "Text editor used to edit the 'todo' file while running `git rebase -i`. Like `GIT_EDITOR`, the value is meant to be interpreted by the shell when it is used. The order of preference is the `$GIT_SEQUENCE_EDITOR` environment variable, then `sequence.editor` configuration, and then the value of `git var GIT_EDITOR`."
-msgstr ""
+msgstr "用于在运行 `git rebase -i` 时编辑 'todo' 文件的文本编辑器。与 `GIT_EDITOR`一样，该值在使用时由 shell 解释。首选顺序是 `$GIT_SEQUENCE_EDITOR` 环境变量，然后是 `sequence.editor` 配置，最后是 `git var GIT_EDITOR` 的值。"
 #. type: Labeled list
 #: en/git-var.txt:61
@@ -61773,13 +61773,13 @@ msgstr "GIT_PAGER"
 #: en/git-var.txt:67
 #, priority:100
 msgid "Text viewer for use by Git commands (e.g., 'less').  The value is meant to be interpreted by the shell.  The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')."
-msgstr ""
+msgstr "供 Git 命令（如 'less'）使用的文本查看器。  该值由 shell 解释。  首选顺序是 `$GIT_PAGER` 环境变量，然后是 `core.pager` 配置，然后是 `$PAGER`，然后是编译时选择的默认值（通常是 'less'）。"
 #. type: Plain text
 #: en/git-var.txt:69
 #, no-wrap, priority:100
 msgid "    The build you are using chose '{git-default-pager}' as the default.\n"
-msgstr ""
+msgstr "    您正在使用的构建选择了 '{git-default-pager}' 作为默认设置。\n"
 #. type: Labeled list
 #: en/git-var.txt:71
@@ -61791,7 +61791,7 @@ msgstr "GIT_DEFAULT_BRANCH"
 #: en/git-var.txt:73
 #, priority:100
 msgid "The name of the first branch created in newly initialized repositories."
-msgstr ""
+msgstr "在新初始化的仓库中创建的第一个分支的名称。"
 #. type: Labeled list
 #: en/git-var.txt:74
@@ -61803,7 +61803,7 @@ msgstr "GIT_SHELL_PATH"
 #: en/git-var.txt:76
 #, priority:100
 msgid "The path of the binary providing the POSIX shell for commands which use the shell."
-msgstr ""
+msgstr "为使用 shell 的命令提供 POSIX shell 的二进制文件路径。"
 #. type: Labeled list
 #: en/git-var.txt:77
@@ -61815,7 +61815,7 @@ msgstr "GIT_ATTR_SYSTEM"
 #: en/git-var.txt:79
 #, priority:100
 msgid "The path to the system linkgit:gitattributes[5] file, if one is enabled."
-msgstr ""
+msgstr "系统 linkgit:gitattributes[5] 文件的路径（如果已启用）。"
 #. type: Labeled list
 #: en/git-var.txt:80
@@ -61827,31 +61827,31 @@ msgstr "GIT_ATTR_GLOBAL"
 #: en/git-var.txt:82
 #, priority:100
 msgid "The path to the global (per-user) linkgit:gitattributes[5] file."
-msgstr ""
+msgstr "全局（每个用户）linkgit:gitattributes[5] 文件的路径。"
 #. type: Plain text
 #: en/git-var.txt:85
 #, priority:100
 msgid "The path to the system configuration file, if one is enabled."
-msgstr ""
+msgstr "系统配置文件的路径（如果已启用）。"
 #. type: Plain text
 #: en/git-var.txt:88
 #, priority:100
 msgid "The path to the global (per-user) configuration files, if any."
-msgstr ""
+msgstr "全局（按用户）配置文件的路径（如果有）。"
 #. type: Plain text
 #: en/git-var.txt:93
 #, priority:100
 msgid "Most path values contain only one value. However, some can contain multiple values, which are separated by newlines, and are listed in order from highest to lowest priority.  Callers should be prepared for any such path value to contain multiple items."
-msgstr ""
+msgstr "大多数路径值只包含一个值。不过，有些路径值可能包含多个值，这些值之间用换行分隔，并按优先级从高到低排列。  调用者应做好任何此类路径值包含多个项目的准备。"
 #. type: Plain text
 #: en/git-var.txt:96
 #, priority:100
 msgid "Note that paths are printed even if they do not exist, but not if they are disabled by other environment variables."
-msgstr ""
+msgstr "请注意，即使路径不存在，也会打印出来，但如果路径被其他环境变量禁用，则不会打印出来。"
 #. type: Plain text
 #: en/git-var.txt:102
@@ -61869,7 +61869,7 @@ msgstr "git-verify-commit(1)"
 #: en/git-verify-commit.txt:7
 #, priority:100
 msgid "git-verify-commit - Check the GPG signature of commits"
-msgstr ""
+msgstr "git-verify-commit - 检查提交的 GPG 签名"
 #. type: Plain text
 #: en/git-verify-commit.txt:12
@@ -61881,25 +61881,25 @@ msgstr "'git verify-commit' <commit>...\n"
 #: en/git-verify-commit.txt:16
 #, priority:100
 msgid "Validates the GPG signature created by 'git commit -S'."
-msgstr ""
+msgstr "验证 'git commit -S' 创建的 GPG 签名。"
 #. type: Plain text
 #: en/git-verify-commit.txt:22 en/git-verify-tag.txt:22
 #, priority:100
 msgid "Print the raw gpg status output to standard error instead of the normal human-readable output."
-msgstr ""
+msgstr "将原始 gpg 状态输出打印到标准错误，而不是正常的人类可读输出。"
 #. type: Plain text
 #: en/git-verify-commit.txt:26
 #, priority:100
 msgid "Print the contents of the commit object before validating it."
-msgstr ""
+msgstr "在验证之前打印提交对象的内容。"
 #. type: Plain text
 #: en/git-verify-commit.txt:29
 #, priority:100
 msgid "SHA-1 identifiers of Git commit objects."
-msgstr ""
+msgstr "Git 提交对象的 SHA-1 标识符。"
 #. type: Title =
 #: en/git-verify-pack.txt:2
@@ -62001,7 +62001,7 @@ msgstr "git-verify-tag(1)"
 #: en/git-verify-tag.txt:7
 #, priority:100
 msgid "git-verify-tag - Check the GPG signature of tags"
-msgstr ""
+msgstr "git-verify-tag - 检查标签的 GPG 签名"
 #. type: Plain text
 #: en/git-verify-tag.txt:12
@@ -62013,31 +62013,31 @@ msgstr "'git verify-tag' [--format=<format>] <tag>...\n"
 #: en/git-verify-tag.txt:16
 #, priority:100
 msgid "Validates the gpg signature created by 'git tag'."
-msgstr ""
+msgstr "验证由 'git tag' 创建的 gpg 签名。"
 #. type: Plain text
 #: en/git-verify-tag.txt:26
 #, priority:100
 msgid "Print the contents of the tag object before validating it."
-msgstr ""
+msgstr "在验证之前打印标记对象的内容。"
 #. type: Labeled list
 #: en/git-verify-tag.txt:27
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "<tag>..."
-msgstr ""
+msgstr "<标签>..."
 #. type: Plain text
 #: en/git-verify-tag.txt:29
 #, priority:100
 msgid "SHA-1 identifiers of Git tag objects."
-msgstr ""
+msgstr "Git 标签对象的 SHA-1 标识符。"
 #. type: Title =
 #: en/git-web--browse.txt:2
 #, no-wrap, priority:100
 msgid "git-web{litdd}browse(1)"
-msgstr ""
+msgstr "git-web{litdd}browse(1)"
 #. type: Plain text
 #: en/git-web--browse.txt:7
@@ -62055,25 +62055,25 @@ msgstr "'git rev-parse' [<options>] <args>...\n"
 #: en/git-web--browse.txt:19
 #, priority:100
 msgid "This script tries, as much as possible, to display the URLs and FILEs that are passed as arguments, as HTML pages in new tabs on an already opened web browser."
-msgstr ""
+msgstr "该脚本尽可能将作为参数传递的 URL 和 FILE 作为 HTML 页面显示在已打开的网页浏览器的新标签页中。"
 #. type: Plain text
 #: en/git-web--browse.txt:21
 #, priority:100
 msgid "The following browsers (or commands) are currently supported:"
-msgstr ""
+msgstr "目前支持以下浏览器（或命令）："
 #. type: Plain text
 #: en/git-web--browse.txt:23
 #, priority:100
 msgid "firefox (this is the default under X Window when not using KDE)"
-msgstr ""
+msgstr "firefox（不使用 KDE 时，这是 X Window 下的默认设置）"
 #. type: Plain text
 #: en/git-web--browse.txt:24
 #, priority:100
 msgid "iceweasel"
-msgstr ""
+msgstr "iceweasel"
 #. type: Plain text
 #: en/git-web--browse.txt:25
@@ -62085,25 +62085,25 @@ msgstr "seamonkey"
 #: en/git-web--browse.txt:26
 #, priority:100
 msgid "iceape"
-msgstr ""
+msgstr "iceape"
 #. type: Plain text
 #: en/git-web--browse.txt:27
 #, priority:100
 msgid "chromium (also supported as chromium-browser)"
-msgstr ""
+msgstr "chromium (也支持其他 chromium 内核浏览器)"
 #. type: Plain text
 #: en/git-web--browse.txt:28
 #, priority:100
 msgid "google-chrome (also supported as chrome)"
-msgstr ""
+msgstr "谷歌浏览器（也支持chrome浏览器）"
 #. type: Plain text
 #: en/git-web--browse.txt:29
 #, priority:100
 msgid "konqueror (this is the default under KDE, see 'Note about konqueror' below)"
-msgstr ""
+msgstr "konqueror（这是 KDE 下的默认设置，参见下文 ‘关于 konqueror 的说明’）"
 #. type: Plain text
 #: en/git-web--browse.txt:30
@@ -62121,7 +62121,7 @@ msgstr "w3m (this is the default outside graphical environments)"
 #: en/git-web--browse.txt:32
 #, priority:100
 msgid "elinks"
-msgstr ""
+msgstr "elinks"
 #. type: Plain text
 #: en/git-web--browse.txt:33
@@ -62139,25 +62139,25 @@ msgstr "猞猁"
 #: en/git-web--browse.txt:35
 #, priority:100
 msgid "dillo"
-msgstr ""
+msgstr "dillo"
 #. type: Plain text
 #: en/git-web--browse.txt:36
 #, priority:100
 msgid "open (this is the default under Mac OS X GUI)"
-msgstr ""
+msgstr "open（这是 Mac OS X 图形用户界面下的默认设置）"
 #. type: Plain text
 #: en/git-web--browse.txt:37
 #, priority:100
 msgid "start (this is the default under MinGW)"
-msgstr ""
+msgstr "start（这是 MinGW 下的默认设置）"
 #. type: Plain text
 #: en/git-web--browse.txt:38
 #, priority:100
 msgid "cygstart (this is the default under Cygwin)"
-msgstr ""
+msgstr "cygstart（这是 Cygwin 下的默认设置）"
 #. type: Plain text
 #: en/git-web--browse.txt:39
@@ -62169,7 +62169,7 @@ msgstr "xdg-open"
 #: en/git-web--browse.txt:41
 #, priority:100
 msgid "Custom commands may also be specified."
-msgstr ""
+msgstr "也可指定自定义命令。"
 #. type: Labeled list
 #: en/git-web--browse.txt:44
@@ -62187,7 +62187,7 @@ msgstr "--browser=<browser>"
 #: en/git-web--browse.txt:48
 #, priority:100
 msgid "Use the specified browser. It must be in the list of supported browsers."
-msgstr ""
+msgstr "使用指定的浏览器。它必须在支持的浏览器列表中。"
 #. type: Labeled list
 #: en/git-web--browse.txt:49
@@ -62205,7 +62205,7 @@ msgstr "--tool=<browser>"
 #: en/git-web--browse.txt:53
 #, no-wrap, priority:100
 msgid "-c <conf.var>"
-msgstr ""
+msgstr "-c <conf.var>"
 #. type: Labeled list
 #: en/git-web--browse.txt:54
@@ -62217,61 +62217,61 @@ msgstr "--config=<conf.var>"
 #: en/git-web--browse.txt:57
 #, priority:100
 msgid "CONF.VAR is looked up in the Git config files. If it's set, then its value specifies the browser that should be used."
-msgstr ""
+msgstr "CONF.VAR 会在 Git 配置文件中查找。如果设置了 CONF.VAR，则其值将指定应使用的浏览器。"
 #. type: Title ~
 #: en/git-web--browse.txt:62
 #, no-wrap, priority:100
 msgid "CONF.VAR (from -c option) and web.browser"
-msgstr ""
+msgstr "CONF.VAR（来自 -c 选项）和 web.browser"
 #. type: Plain text
 #: en/git-web--browse.txt:67
 #, priority:100
 msgid "The web browser can be specified using a configuration variable passed with the -c (or --config) command-line option, or the `web.browser` configuration variable if the former is not used."
-msgstr ""
+msgstr "网络浏览器可以通过与 -c（或 --config）命令行选项一起传递的配置变量来指定，如果不使用前者，则使用 `web.browser` 配置变量。"
 #. type: Title ~
 #: en/git-web--browse.txt:69
 #, no-wrap, priority:100
 msgid "browser.<tool>.path"
-msgstr ""
+msgstr "browser.<工具>.path"
 #. type: Plain text
 #: en/git-web--browse.txt:76
 #, priority:100
 msgid "You can explicitly provide a full path to your preferred browser by setting the configuration variable `browser.<tool>.path`. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH."
-msgstr ""
+msgstr "您可以通过设置配置变量 `browser.<工具>.path`，明确提供首选浏览器的完整路径。例如，可以通过设置 'browser.firefox.path' 来配置 firefox 的绝对路径。否则，'git web{litdd}browse' 会假定该工具在 PATH 中可用。"
 #. type: Title ~
 #: en/git-web--browse.txt:78
 #, no-wrap, priority:100
 msgid "browser.<tool>.cmd"
-msgstr ""
+msgstr "browser.<工具>.cmd"
 #. type: Plain text
 #: en/git-web--browse.txt:86
 #, priority:100
 msgid "When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding `browser.<tool>.cmd` configuration variable will be looked up. If this variable exists then 'git web{litdd}browse' will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments."
-msgstr ""
+msgstr "如果选项或配置变量指定的浏览器不在支持之列，则会查找相应的 `browser.<工具>.cmd` 配置变量。如果该变量存在，'git web{litdd}browse' 就会将指定的工具视为自定义命令，并使用 shell eval 以传递的 URL 作为参数运行该命令。"
 #. type: Title -
 #: en/git-web--browse.txt:88
 #, no-wrap, priority:100
 msgid "NOTE ABOUT KONQUEROR"
-msgstr ""
+msgstr "关于 Konqueror 的说明"
 #. type: Plain text
 #: en/git-web--browse.txt:93
 #, priority:100
 msgid "When 'konqueror' is specified by a command-line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible."
-msgstr ""
+msgstr "当命令行选项或配置变量指定了 'konqueror' 时，我们会启动 'kfmclient'，尽可能在已打开的 konqueror 上以新标签页打开 HTML man 页面。"
 #. type: Plain text
 #: en/git-web--browse.txt:97
 #, priority:100
 msgid "For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
-msgstr ""
+msgstr "为了保持一致性，如果 'browser.konqueror.path ' 被设置为 `A_PATH_TO/konqueror`，我们也会尝试这样做。这意味着我们将尝试启动 `A_PATH_TO/kfmclient`，而不是 `A_PATH_TO/kfmclient`。"
 #. type: delimited block -
 #: en/git-web--browse.txt:104
@@ -62297,13 +62297,13 @@ msgstr ""
 #: en/git-web--browse.txt:110
 #, no-wrap, priority:100
 msgid "Note about git-config --global"
-msgstr ""
+msgstr "关于 git-config --global 的注意事项"
 #. type: Plain text
 #: en/git-web--browse.txt:114
 #, priority:100
 msgid "Note that these configuration variables should probably be set using the `--global` flag, for example like this:"
-msgstr ""
+msgstr "请注意，这些配置变量可能应该使用 `--global` 标志来设置，例如像这样："
 #. type: delimited block -
 #: en/git-web--browse.txt:117
@@ -62321,31 +62321,31 @@ msgstr "git-whatchanged(1)"
 #: en/git-whatchanged.txt:7
 #, priority:100
 msgid "git-whatchanged - Show logs with difference each commit introduces"
-msgstr ""
+msgstr "git-whatchanged - 显示每次提交引入的差异日志"
 #. type: Plain text
 #: en/git-whatchanged.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git whatchanged' <option>...\n"
-msgstr ""
+msgstr "'git whatchanged' <选项>...\n"
 #. type: Plain text
 #: en/git-whatchanged.txt:18
 #, priority:100
 msgid "Shows commit logs and diff output each commit introduces."
-msgstr ""
+msgstr "显示每次提交引入的提交日志和差异输出。"
 #. type: Plain text
 #: en/git-whatchanged.txt:22
 #, priority:100
 msgid "New users are encouraged to use linkgit:git-log[1] instead.  The `whatchanged` command is essentially the same as linkgit:git-log[1] but defaults to show the raw format diff output and to skip merges."
-msgstr ""
+msgstr "建议新用户使用 linkgit:git-log[1] 代替。 `whatchanged` 命令与 linkgit:git-log[1] 基本相同，但默认显示原始格式的差异输出并跳过合并。"
 #. type: Plain text
 #: en/git-whatchanged.txt:26
 #, priority:100
 msgid "The command is kept primarily for historical reasons; fingers of many people who learned Git long before `git log` was invented by reading Linux kernel mailing list are trained to type it."
-msgstr ""
+msgstr "保留该命令主要是出于历史原因；早在 `git log` 被发明之前，许多人就通过阅读 Linux 内核邮件列表学会了输入该命令。"
 #. type: Labeled list
 #: en/git-whatchanged.txt:30
@@ -62357,19 +62357,19 @@ msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
 #: en/git-whatchanged.txt:34
 #, priority:100
 msgid "Show as patches the commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories"
-msgstr ""
+msgstr "以补丁形式显示自版本 'v2.6.12' 以来修改了 include/scsi 或 drivers/scsi 子目录中任何文件的提交内容"
 #. type: Labeled list
 #: en/git-whatchanged.txt:35
 #, no-wrap, priority:100
 msgid "`git whatchanged --since=\"2 weeks ago\" -- gitk`"
-msgstr ""
+msgstr "`git whatchanged --since=\"2 weeks ago\" -- gitk`"
 #. type: Plain text
 #: en/git-whatchanged.txt:40
 #, priority:100
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The \"--\" is necessary to avoid confusion with the *branch* named 'gitk'"
-msgstr ""
+msgstr "显示过去两周内 'gitk' 文件的改动。  为了避免与名为 'gitk' 的*分支*混淆，\"--\" 是必要的"
 #. type: Title =
 #: en/git-worktree.txt:2
@@ -65134,7 +65134,7 @@ msgstr "`araxis`"
 #: en/mergetools-merge.txt:2
 #, priority:100
 msgid "Use Araxis Merge (requires a graphical session)"
-msgstr ""
+msgstr "使用 Araxis 合并（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:2
@@ -65146,19 +65146,19 @@ msgstr "`bc`"
 #: en/mergetools-merge.txt:3 en/mergetools-merge.txt:4 en/mergetools-merge.txt:5
 #, priority:100
 msgid "Use Beyond Compare (requires a graphical session)"
-msgstr ""
+msgstr "使用 Beyond Compare（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:3
 #, no-wrap, priority:100
 msgid "`bc3`"
-msgstr ""
+msgstr "`bc3`"
 #. type: Labeled list
 #: en/mergetools-merge.txt:4
 #, no-wrap, priority:100
 msgid "`bc4`"
-msgstr ""
+msgstr "`bc4`"
 #. type: Labeled list
 #: en/mergetools-merge.txt:5
@@ -65170,7 +65170,7 @@ msgstr "`codecompare`"
 #: en/mergetools-merge.txt:6
 #, priority:100
 msgid "Use Code Compare (requires a graphical session)"
-msgstr ""
+msgstr "使用代码比较（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:6
@@ -65182,7 +65182,7 @@ msgstr "`deltawalker`"
 #: en/mergetools-merge.txt:7
 #, priority:100
 msgid "Use DeltaWalker (requires a graphical session)"
-msgstr ""
+msgstr "使用 DeltaWalker（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:7
@@ -65194,7 +65194,7 @@ msgstr "`diffmerge`"
 #: en/mergetools-merge.txt:8
 #, priority:100
 msgid "Use DiffMerge (requires a graphical session)"
-msgstr ""
+msgstr "使用 DiffMerge（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:8
@@ -65206,7 +65206,7 @@ msgstr "`diffuse`"
 #: en/mergetools-merge.txt:9
 #, priority:100
 msgid "Use Diffuse (requires a graphical session)"
-msgstr ""
+msgstr "使用 Diffuse（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:9
@@ -65218,7 +65218,7 @@ msgstr "`ecmerge`"
 #: en/mergetools-merge.txt:10
 #, priority:100
 msgid "Use ECMerge (requires a graphical session)"
-msgstr ""
+msgstr "使用 ECMerge（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:10
@@ -65230,7 +65230,7 @@ msgstr "`emerge`"
 #: en/mergetools-merge.txt:11
 #, priority:100
 msgid "Use Emacs' Emerge"
-msgstr ""
+msgstr "使用 Emacs 的 Emerge"
 #. type: Labeled list
 #: en/mergetools-merge.txt:11
@@ -65242,7 +65242,7 @@ msgstr "`examdiff`"
 #: en/mergetools-merge.txt:12
 #, priority:100
 msgid "Use ExamDiff Pro (requires a graphical session)"
-msgstr ""
+msgstr "使用 ExamDiff Pro（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:12
@@ -65254,7 +65254,7 @@ msgstr "`guiffy`"
 #: en/mergetools-merge.txt:13
 #, priority:100
 msgid "Use Guiffy's Diff Tool (requires a graphical session)"
-msgstr ""
+msgstr "使用 Guiffy 的 Diff 工具（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:13
@@ -65266,7 +65266,7 @@ msgstr "`gvimdiff`"
 #: en/mergetools-merge.txt:14
 #, priority:100
 msgid "Use gVim (requires a graphical session) with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)"
-msgstr ""
+msgstr "使用 gVim（需要图形会话）和自定义布局（参见 `git help mergetool` 的 `BACKEND SPECIFIC HINTS` 部分）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:14
@@ -65279,7 +65279,7 @@ msgstr "gvimdiff1"
 #: en/mergetools-merge.txt:15
 #, priority:100
 msgid "Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)"
-msgstr ""
+msgstr "使用 gVim（需要图形会话），采用双窗格布局（本地和远程）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:15
@@ -65292,7 +65292,7 @@ msgstr "gvimdiff2"
 #: en/mergetools-merge.txt:16
 #, priority:100
 msgid "Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)"
-msgstr ""
+msgstr "使用 gVim（需要图形会话），采用 3 个面板布局（本地、合并和远程）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:16
@@ -65305,7 +65305,7 @@ msgstr "gvimdiff3"
 #: en/mergetools-merge.txt:17
 #, priority:100
 msgid "Use gVim (requires a graphical session) where only the MERGED file is shown"
-msgstr ""
+msgstr "使用 gVim（需要图形会话），只显示 MERGED 文件"
 #. type: Labeled list
 #: en/mergetools-merge.txt:17
@@ -65318,7 +65318,7 @@ msgstr "kdiff3"
 #: en/mergetools-merge.txt:18
 #, priority:100
 msgid "Use KDiff3 (requires a graphical session)"
-msgstr ""
+msgstr "使用 KDiff3（需要图形会话）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:18
@@ -65330,7 +65330,7 @@ msgstr "`meld`"
 #: en/mergetools-merge.txt:19
 #, priority:100
 msgid "Use Meld (requires a graphical session) with optional `auto merge` (see `git help mergetool`'s `CONFIGURATION` section)"
-msgstr ""
+msgstr "使用带可选 `auto merge` 功能的 Meld（需要图形会话）（请参阅 `git help mergetool` 的 `配置` 部分）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:19
@@ -65342,7 +65342,7 @@ msgstr "`nvimdiff`"
 #: en/mergetools-merge.txt:20
 #, priority:100
 msgid "Use Neovim with a custom layout (see `git help mergetool`'s `BACKEND SPECIFIC HINTS` section)"
-msgstr ""
+msgstr "使用带有自定义布局的 Neovim（请参阅 `git help mergetool` 的 `BACKEND SPECIFIC HINTS` 部分）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:20
@@ -65355,7 +65355,7 @@ msgstr "nvimdiff1"
 #: en/mergetools-merge.txt:21
 #, priority:100
 msgid "Use Neovim with a 2 panes layout (LOCAL and REMOTE)"
-msgstr ""
+msgstr "使用 Neovim 的双窗格布局（本地和远程）"
 #. type: Labeled list
 #: en/mergetools-merge.txt:21