Skip to content
Snippets Groups Projects
Unverified Commit 64f845ad authored by 秃头灯笼鱼's avatar 秃头灯笼鱼 Committed by Hosted Weblate
Browse files

Translated using Weblate (Chinese (Simplified)) 

Currently translated at 49.1% (5434 of 11052 strings)

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


Signed-off-by: default avatar秃头灯笼鱼 <ttdlyu@163.com>
parent 85ffac50
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
po/documentation.zh_HANS-CN.po
+ 248
− 248
View file @ 64f845ad
......@@ -3,7 +3,7 @@
# This file is distributed under the same license as the Git package.
# Matthias Aßhauer <mha1993@live.de>, 2019.
msgid ""
msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-06-01 21:48+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n"
msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-06-03 15:30+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n"
 
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
......@@ -17595,7 +17595,7 @@ msgstr "GIT_CONFIG_NOSYSTEM"
#: en/git-config.txt:407
#, priority:100
msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
msgstr ""
msgstr "是否跳过从全系统 $(prefix)/etc/gitconfig 文件中读取设置。详见 linkgit:git[1]。"
 
#. type: Labeled list
#: en/git-config.txt:410
......@@ -17621,13 +17621,13 @@ msgstr "GIT_CONFIG"
#: en/git-config.txt:421
#, priority:100
msgid "If GIT_CONFIG_COUNT is set to a positive number, all environment pairs GIT_CONFIG_KEY_<n> and GIT_CONFIG_VALUE_<n> up to that number will be added to the process's runtime configuration. The config pairs are zero-indexed. Any missing key or value is treated as an error. An empty GIT_CONFIG_COUNT is treated the same as GIT_CONFIG_COUNT=0, namely no pairs are processed. These environment variables will override values in configuration files, but will be overridden by any explicit options passed via `git -c`."
msgstr ""
msgstr "如果 GIT_CONFIG_COUNT 被设置为一个正数，所有环境对 GIT_CONFIG_KEY_<n> 和 GIT_CONFIG_VALUE_<n> 到这个数字都将被添加到进程的运行时配置中。配置对是零索引的。任何缺失的键或值都被视为一个错误。空的 GIT_CONFIG_COUNT 与 GIT_CONFIG_COUNT=0 的处理方式相同，即不处理配置对。这些环境变量将覆盖配置文件中的值，但会被通过 `git -c` 传递的任何明确选项所覆盖。"
 
#. type: Plain text
#: en/git-config.txt:425
#, priority:100
msgid "This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts."
msgstr ""
msgstr "这在你想用一个共同的配置催生多个 git 命令，但又不能依赖一个配置文件的情况下很有用，例如在编写脚本时。"
 
#. type: Labeled list
#: en/git-config.txt:426
......@@ -17639,13 +17639,13 @@ msgstr "GIT_CONFIG"
#: en/git-config.txt:432
#, priority:100
msgid "If no `--file` option is provided to `git config`, use the file given by `GIT_CONFIG` as if it were provided via `--file`. This variable has no effect on other Git commands, and is mostly for historical compatibility; there is generally no reason to use it instead of the `--file` option."
msgstr ""
msgstr "如果 `git config` 没有提供 `--file` 选项，则使用 `GIT_CONFIG` 提供的文件，就像通过 `--file` 提供的一样。这个变量对其他 Git 命令没有影响，主要是为了历史兼容性；通常没有理由用它来代替 `--file` 选项。"
 
#. type: Plain text
#: en/git-config.txt:438
#, priority:100
msgid "Given a .git/config like this:"
msgstr ""
msgstr "给出一个这样的 .git/config："
 
#. type: delimited block -
#: en/git-config.txt:445
......@@ -17656,7 +17656,7 @@ msgid ""
"# a '#' or ';' character indicates\n"
"# a comment\n"
"#\n"
msgstr ""
msgstr "#\n# 这就是配置文件，并且\n# 一个'#'或';'字符表示\n# 一个注释\n#\n"
 
#. type: delimited block -
#: en/git-config.txt:450 en/git.txt:370
......@@ -17666,7 +17666,7 @@ msgid ""
"[core]\n"
"\t; Don't trust file modes\n"
"\tfilemode = false\n"
msgstr ""
msgstr "; 核心变量\n[core]\n\t; 不信任文件模式\n\tfilemode = false\n"
 
#. type: delimited block -
#: en/git-config.txt:455
......@@ -17676,7 +17676,7 @@ msgid ""
"[diff]\n"
"\texternal = /usr/local/bin/diff-wrapper\n"
"\trenames = true\n"
msgstr ""
msgstr "; 我们的差异算法\n[diff]\n\texternal = /usr/local/bin/diff-wrapper\n\trename = true\n"
 
#. type: delimited block -
#: en/git-config.txt:460
......@@ -17686,7 +17686,7 @@ msgid ""
"[core]\n"
"\tgitproxy=proxy-command for kernel.org\n"
"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
msgstr "; 代理设置\n[core]\n\tgitproxy=proxy-command for kernel.org\n\tgitproxy=default-proxy ; 适用于其他所有网站\n"
 
#. type: delimited block -
#: en/git-config.txt:467
......@@ -17698,13 +17698,13 @@ msgid ""
"[http \"https://weak.example.com\"]\n"
"\tsslVerify = false\n"
"\tcookieFile = /tmp/cookie.txt\n"
msgstr ""
msgstr "; HTTP\n[http]\n\tsslVerify\n[http \"https://weak.example.com\"]\n\tsslVerify = false\n\tcookiFile= /tmp/cookie.txt\n"
 
#. type: Plain text
#: en/git-config.txt:470
#, priority:100
msgid "you can set the filemode to true with"
msgstr ""
msgstr "你可以用以下方法将文件模式设置为真"
 
#. type: delimited block -
#: en/git-config.txt:473
......@@ -17716,7 +17716,7 @@ msgstr "% git config core.filemode true\n"
#: en/git-config.txt:478
#, priority:100
msgid "The hypothetical proxy command entries actually have a postfix to discern what URL they apply to. Here is how to change the entry for kernel.org to \"ssh\"."
msgstr ""
msgstr "假设的代理命令条目实际上有一个后缀来辨别它们适用于什么URL。下面是如何将 kernel.org 的条目改为 \"ssh\"。"
 
#. type: delimited block -
#: en/git-config.txt:481
......@@ -17728,13 +17728,13 @@ msgstr "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
#: en/git-config.txt:484
#, priority:100
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
msgstr "这确保了只有 kernel.org 的键/值对被替换。"
 
#. type: Plain text
#: en/git-config.txt:486
#, priority:100
msgid "To delete the entry for renames, do"
msgstr ""
msgstr "要删除重名的条目，请执行"
 
#. type: delimited block -
#: en/git-config.txt:489
......@@ -17746,13 +17746,13 @@ msgstr "% git config --unset diff.renames\n"
#: en/git-config.txt:493
#, priority:100
msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
msgstr ""
msgstr "如果你想删除一个多变量的条目（如上面的 core.gitproxy），你必须提供一个与恰好一行的值相匹配的正则表达式。"
 
#. type: Plain text
#: en/git-config.txt:495
#, priority:100
msgid "To query the value for a given key, do"
msgstr ""
msgstr "要查询一个给定键的值，请做"
 
#. type: delimited block -
#: en/git-config.txt:498
......@@ -17776,7 +17776,7 @@ msgstr "% git config core.filemode\n"
#: en/git-config.txt:507
#, priority:100
msgid "or, to query a multivar:"
msgstr ""
msgstr "或者，要查询一个多变量："
 
#. type: delimited block -
#: en/git-config.txt:510
......@@ -17788,7 +17788,7 @@ msgstr "% git config --get core.gitproxy \"for kernel.org$\"\n"
#: en/git-config.txt:513
#, priority:100
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
msgstr "如果你想知道一个多变量的所有值，请做："
 
#. type: delimited block -
#: en/git-config.txt:516
......@@ -17800,7 +17800,7 @@ msgstr "% git config --get-all core.gitproxy\n"
#: en/git-config.txt:520
#, priority:100
msgid "If you like to live dangerously, you can replace *all* core.gitproxy by a new one with"
msgstr ""
msgstr "如果你喜欢危险的生活，你可以用一个新的核心.gitproxy来取代 *所有* 的核心 .gitproxy，用的是"
 
#. type: delimited block -
#: en/git-config.txt:523
......@@ -17812,7 +17812,7 @@ msgstr "% git config --replace-all core.gitproxy ssh\n"
#: en/git-config.txt:527
#, ignore-ellipsis, priority:100
msgid "However, if you really only want to replace the line for the default proxy, i.e. the one without a \"for ...\" postfix, do something like this:"
msgstr ""
msgstr "然而，如果你真的只想替换默认代理，即没有 \"for ...\" 后缀的那一行，可以这样做："
 
#. type: delimited block -
#: en/git-config.txt:530
......@@ -17824,7 +17824,7 @@ msgstr "% git config core.gitproxy ssh '! for '\n"
#: en/git-config.txt:533
#, priority:100
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
msgstr "为了真正地只匹配带有感叹号的值，你必须"
 
#. type: delimited block -
#: en/git-config.txt:536
......@@ -17836,7 +17836,7 @@ msgstr "% git config section.key value '[!]'\n"
#: en/git-config.txt:539
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
msgstr "要添加一个新的代理，而不改变任何现有的代理，使用"
 
#. type: delimited block -
#: en/git-config.txt:542
......@@ -17848,7 +17848,7 @@ msgstr "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
#: en/git-config.txt:546
#, priority:100
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
msgstr "一个例子是在你的脚本中使用配置的自定义颜色："
 
#. type: delimited block -
#: en/git-config.txt:552
......@@ -17868,7 +17868,7 @@ msgstr ""
#: en/git-config.txt:556
#, priority:100
msgid "For URLs in `https://weak.example.com`, `http.sslVerify` is set to false, while it is set to `true` for all others:"
msgstr ""
msgstr "对于 `https://weak.example.com` 中的 URL，`http.sslVerify` 被设置为 false，而对于所有其他的 URL，它被设置为 `true`："
 
#. type: delimited block -
#: en/git-config.txt:565
......@@ -17881,7 +17881,7 @@ msgid ""
"% git config --get-urlmatch http https://weak.example.com\n"
"http.cookieFile /tmp/cookie.txt\n"
"http.sslverify false\n"
msgstr ""
msgstr "% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\ntrue\n% git config --type=bool --get-urlmatch http.sslverify https://weak.example.com\nfalse\n% git config --get-urlmatch http https://weak.example.com\nhttp.cookieFile /tmp/cookie.txt\nhttp.sslverify false\n"
 
#. type: Title -
#: en/git-config.txt:570 en/git-describe.txt:202 en/git-fetch.txt:305 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:240 en/git-replace.txt:139 en/git-rm.txt:190 en/git-svn.txt:1150 en/git-worktree.txt:499
......@@ -17893,7 +17893,7 @@ msgstr "漏洞"
#: en/git-config.txt:575
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
msgstr ""
msgstr "当使用废弃的 `[section.subsection]` 语法时，如果 subsection 至少有一个大写字母，改变一个值将导致添加一个多行键而不是改变。例如，当配置看起来像"
 
#. type: delimited block -
#: en/git-config.txt:579
......@@ -17909,7 +17909,7 @@ msgstr ""
#: en/git-config.txt:582
#, priority:100
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
msgstr "并运行 `git config section.Subsection.key value2` 将导致"
 
#. type: delimited block -
#: en/git-config.txt:587
......@@ -17918,7 +17918,7 @@ msgid ""
" [section.subsection]\n"
" key = value1\n"
" key = value2\n"
msgstr ""
msgstr " [section.subsection]\n key = value1\n key = value2\n"
 
#. type: Title =
#: en/git-count-objects.txt:2
......@@ -18130,7 +18130,7 @@ msgstr ""
#: en/git-credential-cache.txt:62 en/git-credential-store.txt:75
#, priority:100
msgid "The point of this helper is to reduce the number of times you must type your username or password. For example:"
msgstr ""
msgstr "这个助手的意义在于减少你必须输入用户名或密码的次数。比如说："
 
#. type: delimited block -
#: en/git-credential-cache.txt:68
......@@ -18182,31 +18182,31 @@ msgstr "git-credential-store - Helper to store credentials on disk"
#: en/git-credential-store.txt:12
#, no-wrap, priority:100
msgid "git config credential.helper 'store [<options>]'\n"
msgstr ""
msgstr "git config credential.helper 'store [<选项>]'\n"
 
#. type: Plain text
#: en/git-credential-store.txt:21
#, priority:100
msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system."
msgstr ""
msgstr "使用这个助手会将你的密码未加密地存储在磁盘上，只受文件系统权限的保护。如果这不是一个可接受的安全权衡，请尝试 linkgit:git-credential-cache[1]，或者找一个能与你的操作系统提供的安全存储整合的助手。"
 
#. type: Plain text
#: en/git-credential-store.txt:24
#, priority:100
msgid "This command stores credentials indefinitely on disk for use by future Git programs."
msgstr ""
msgstr "该命令在磁盘上无限期地存储凭证，供未来的 Git 程序使用。"
 
#. type: Plain text
#: en/git-credential-store.txt:28
#, priority:100
msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
msgstr "你可能不想直接调用这个命令；它是作为 git 其他部分的凭证助手来使用的。参见 linkgit:gitcredentials[7] 或下面的 `EXAMPLES`。"
 
#. type: Labeled list
#: en/git-credential-store.txt:32
#, no-wrap, priority:100
msgid "--file=<path>"
msgstr ""
msgstr "--file=<路径>"
 
#. type: Plain text
#: en/git-credential-store.txt:42
......@@ -18619,7 +18619,7 @@ msgstr "每个 'WWW-Authenticate' 头的值都以多值属性 'wwwauth[]' 的形
#: en/git-credential.txt:193
#, priority:100
msgid "Unrecognised attributes are silently discarded."
msgstr ""
msgstr "未识别的属性会被默默地丢弃。"
 
#. type: Title =
#: en/git-cvsexportcommit.txt:2
......@@ -19992,7 +19992,7 @@ msgstr "git-daemon - 一个非常简单的git存储库服务器。"
 
#. type: Plain text
#: en/git-daemon.txt:25
#, ignore-ellipsis, no-wrap, priority:100
#, fuzzy, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git daemon' [--verbose] [--syslog] [--export-all]\n"
"\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n"
......@@ -20008,43 +20008,43 @@ msgid ""
"\t [--user=<user> [--group=<group>]]]\n"
"\t [--log-destination=(stderr|syslog|none)]\n"
"\t [<directory>...]\n"
msgstr ""
msgstr "'git daemon' [--verbose] [--syslog] [--export-all]\n\t [--timeout=<n>] [--init-timeout=<n>] [--max-connections=<n>]\n\t [--strict-paths] [--base-path=<路径>] [--base-path-relaxed]\n\t [--user-path | --user-path=<路径>]\n\t [--interpolated-path=<路径模板>]\n\t [--reuseaddr] [--detach] [--pid-file=<文件>]\n\t [--enable=<服务>] [--disable=<服务>]\n\t [--allow-override=<服务>] [--forbid-override=<服务>]\n\t [--access-hook=<路径>] [--[no-]informative-errors]\n\t [--inetd |\n\t [--listen=<主机或 ip 地址>] [--port=<n>]\n\t [--user=<用户> [--group=<组>]]]\n\t [--log-destination=(stderr|syslog|none)]\n\t [<directory>...]\n"
 
#. type: Plain text
#: en/git-daemon.txt:31
#, priority:100
msgid "A really simple TCP Git daemon that normally listens on port \"DEFAULT_GIT_PORT\" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled."
msgstr ""
msgstr "一个非常简单的 TCP Git 守护进程，通常在端口 \"DEFAULT_GIT_PORT\"（即 9418）上进行监听。 它等待一个要求提供服务的连接，如果该服务被启用，它将提供服务。"
 
#. type: Plain text
#: en/git-daemon.txt:37
#, priority:100
msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you pass some directory paths as 'git daemon' arguments, the offers are limited to repositories within those directories."
msgstr ""
msgstr "它验证该目录是否有神奇的文件 \"git-daemon-export-ok\"，它将拒绝导出任何没有明确标记为这种方式导出的 Gi t目录（除非指定 `--export-all` 参数）。如果你把一些目录路径作为 \"git daemon\" 参数传递，那么提供的内容就会被限制在这些目录内的仓库。"
 
#. type: Plain text
#: en/git-daemon.txt:41
#, priority:100
msgid "By default, only `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', 'git pull', and 'git clone'."
msgstr ""
msgstr "默认情况下，只有 \"upload-pack \"服务被启用，它为 \"git fetch-pack\" 和 \"git ls-remote\" 客户端服务，这些客户端是由 \"git fetch\"、\"git pull\" 和 \"git clone \" 调用的。"
 
#. type: Plain text
#: en/git-daemon.txt:44
#, priority:100
msgid "This is ideally suited for read-only updates, i.e., pulling from Git repositories."
msgstr ""
msgstr "这非常适合于只读更新，即从 Git 仓库拉取。"
 
#. type: Plain text
#: en/git-daemon.txt:46
#, priority:100
msgid "An `upload-archive` also exists to serve 'git archive'."
msgstr ""
msgstr "还存在一个 `upload-archive`，为 'git archive' 服务。"
 
#. type: Plain text
#: en/git-daemon.txt:54
#, priority:100
msgid "Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no directory arguments are provided."
msgstr ""
msgstr "准确匹配路径（即不允许 \"/foo/repo\"，而真正的路径是 \"/foo/repo.git \" 或 \"/foo/repo/.git\"），不做与用户相关的路径。 当这个选项被启用并且没有提供目录参数时，\"git daemon\" 将拒绝启动。"
 
#. type: Labeled list
#: en/git-daemon.txt:55
......@@ -20056,7 +20056,7 @@ msgstr "--base-path=<path>"
#: en/git-daemon.txt:61
#, priority:100
msgid "Remap all the path requests as relative to the given path. This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`."
msgstr ""
msgstr "将所有的路径请求重新映射为相对于给定路径的请求。 这有点像 \"Git root\"--如果你在 example.com 上用 '-base-path=/srv/git' 运行 'git daemon'，那么如果你以后试图拉 'git://example.com/hello.git'，'git daemon' 将把路径解释为 `/srv/git/hello.git`。"
 
#. type: Labeled list
#: en/git-daemon.txt:62
......@@ -20068,7 +20068,7 @@ msgstr "--base-path-relaxed"
#: en/git-daemon.txt:67
#, priority:100
msgid "If --base-path is enabled and repo lookup fails, with this option 'git daemon' will attempt to lookup without prefixing the base path. This is useful for switching to --base-path usage, while still allowing the old paths."
msgstr ""
msgstr "如果启用了 --base-path，并且 repo 查找失败，使用这个选项，'git daemon' 将尝试在不加前缀的基础路径下进行查找。 这对于切换到 --base-path 的使用很有用，同时仍然允许使用旧的路径。"
 
#. type: Labeled list
#: en/git-daemon.txt:68
......@@ -20080,13 +20080,13 @@ msgstr "--interpolated-path=<pathtemplate>"
#: en/git-daemon.txt:77
#, priority:100
msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory list."
msgstr ""
msgstr "为了支持虚拟主机，可以使用插值路径模板来动态地构建备用路径。 该模板支持由客户提供的目标主机名的 %H，但转换为小写字母；支持规范主机名的 %CH；支持服务器 IP 地址的 %IP；支持端口号的 %P；支持命名仓库的绝对路径的 %D。 在插值之后，该路径将根据目录列表进行验证。"
 
#. type: Plain text
#: en/git-daemon.txt:82
#, priority:100
msgid "Allow pulling from all directories that look like Git repositories (have the 'objects' and 'refs' subdirectories), even if they do not have the 'git-daemon-export-ok' file."
msgstr ""
msgstr "允许从所有看起来像 Git 仓库的目录（有 'objects' 和 'refs' 子目录）提取，即使它们没有 'git-daemon-export-ok' 文件。"
 
#. type: Labeled list
#: en/git-daemon.txt:83
......@@ -20098,7 +20098,7 @@ msgstr "--inetd"
#: en/git-daemon.txt:88
#, priority:100
msgid "Have the server run as an inetd service. Implies --syslog (may be overridden with `--log-destination=`). Incompatible with --detach, --port, --listen, --user and --group options."
msgstr ""
msgstr "让服务器作为一个 inetd 服务运行。暗示 --syslog（可以用 `--log-destination=` 重写）。 与 --detach、--port、--listen、--user 和 --group 选项不兼容。"
 
#. type: Labeled list
#: en/git-daemon.txt:89
......@@ -20110,7 +20110,7 @@ msgstr "--listen=<host_or_ipaddr>"
#: en/git-daemon.txt:96
#, priority:100
msgid "Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 is not supported, then --listen=hostname is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option."
msgstr ""
msgstr "在一个特定的 IP 地址或主机名上收听。 IP 地址可以是一个 IPv4 地址，也可以是一个 IPv6 地址（如果支持）。 如果不支持 IPv6，那么 --listen=hostname也不被支持，--listen 必须给出一个 IPv4 地址。 可以多次给出。 与 `--inetd` 选项不兼容。"
 
#. type: Labeled list
#: en/git-daemon.txt:97
......@@ -20122,7 +20122,7 @@ msgstr "--port=<n>"
#: en/git-daemon.txt:99
#, priority:100
msgid "Listen on an alternative port. Incompatible with `--inetd` option."
msgstr ""
msgstr "在另一个端口上监听。 与 `--inetd` 选项不兼容。"
 
#. type: Labeled list
#: en/git-daemon.txt:100
......@@ -20134,31 +20134,31 @@ msgstr "--init-timeout=<n>"
#: en/git-daemon.txt:104
#, priority:100
msgid "Timeout (in seconds) between the moment the connection is established and the client request is received (typically a rather low value, since that should be basically immediate)."
msgstr ""
msgstr "从建立连接到收到客户端请求之间的超时（以秒为单位）（通常是一个相当低的值，因为这基本上应该是即时的）。"
 
#. type: Labeled list
#: en/git-daemon.txt:105 en/git-upload-pack.txt:31
#, no-wrap, priority:100
msgid "--timeout=<n>"
msgstr ""
msgstr "--timeout=<n>"
 
#. type: Plain text
#: en/git-daemon.txt:109
#, priority:100
msgid "Timeout (in seconds) for specific client sub-requests. This includes the time it takes for the server to process the sub-request and the time spent waiting for the next client's request."
msgstr ""
msgstr "特定客户端子请求的超时（单位：秒）。这包括服务器处理子请求的时间和等待下一个客户端请求的时间。"
 
#. type: Labeled list
#: en/git-daemon.txt:110
#, no-wrap, priority:100
msgid "--max-connections=<n>"
msgstr ""
msgstr "--max-connections=<n>"
 
#. type: Plain text
#: en/git-daemon.txt:113
#, priority:100
msgid "Maximum number of concurrent clients, defaults to 32. Set it to zero for no limit."
msgstr ""
msgstr "最大并发客户数，默认为 32。 设置为零表示没有限制。"
 
#. type: Labeled list
#: en/git-daemon.txt:114
......@@ -20170,19 +20170,19 @@ msgstr "--syslog"
#: en/git-daemon.txt:116
#, priority:100
msgid "Short for `--log-destination=syslog`."
msgstr ""
msgstr "是 `--log-destination=syslog` 的简称。"
 
#. type: Labeled list
#: en/git-daemon.txt:117
#, no-wrap, priority:100
msgid "--log-destination=<destination>"
msgstr ""
msgstr "--log-destination=<目的>"
 
#. type: Plain text
#: en/git-daemon.txt:122
#, priority:100
msgid "Send log messages to the specified destination. Note that this option does not imply --verbose, thus by default only error conditions will be logged. The <destination> must be one of:"
msgstr ""
msgstr "发送日志信息到指定的目的地。 注意，这个选项并不意味着 --verbose，因此默认情况下只有错误情况会被记录下来。 <目的> 必须是以下之一："
 
#. type: Labeled list
#: en/git-daemon.txt:124
......@@ -20194,7 +20194,7 @@ msgstr "标准错误"
#: en/git-daemon.txt:129
#, priority:100
msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`."
msgstr ""
msgstr "写入标准错误。 注意，如果指定了 `--detach`，进程就会断开与真正的标准错误的连接，使得这个目的地实际上等同于 `none`。"
 
#. type: Labeled list
#: en/git-daemon.txt:129
......@@ -20206,19 +20206,19 @@ msgstr "日志服务器"
#: en/git-daemon.txt:131
#, priority:100
msgid "Write to syslog, using the `git-daemon` identifier."
msgstr ""
msgstr "写入 syslog，使用 `git-daemon` 标识符。"
 
#. type: Plain text
#: en/git-daemon.txt:133
#, priority:100
msgid "Disable all logging."
msgstr ""
msgstr "禁用所有日志记录。"
 
#. type: Plain text
#: en/git-daemon.txt:137
#, priority:100
msgid "The default destination is `syslog` if `--inetd` or `--detach` is specified, otherwise `stderr`."
msgstr ""
msgstr "如果指定了 `--inetd` 或 `--detach`，默认的目标是 `syslog`，否则是 `stderr`。"
 
#. type: Labeled list
#: en/git-daemon.txt:138
......@@ -20236,13 +20236,13 @@ msgstr "--user-path=<path>"
#: en/git-daemon.txt:147
#, priority:100
msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`."
msgstr ""
msgstr "允许在请求中使用 {tilde} 用户符号。 当没有指定参数时，对 git://host/{tilde}alice/foo 的请求会被视为访问用户 `alice`的主目录下的 'foo' 仓库的请求。 如果指定了 `--user-path=path`，同样的请求将被视为访问用户 `alice` 的主目录下的 `path/foo`存储库。"
 
#. type: Plain text
#: en/git-daemon.txt:150
#, priority:100
msgid "Log details about the incoming connections and requested files."
msgstr ""
msgstr "记录有关传入连接和请求文件的详细信息。"
 
#. type: Labeled list
#: en/git-daemon.txt:151
......@@ -20254,13 +20254,13 @@ msgstr "--reuseaddr"
#: en/git-daemon.txt:155
#, priority:100
msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out."
msgstr ""
msgstr "在绑定监听套接字时使用 SO_REUSEADDR。 这允许服务器重新启动，而不必等待旧的连接超时。"
 
#. type: Plain text
#: en/git-daemon.txt:158
#, priority:100
msgid "Detach from the shell. Implies --syslog."
msgstr ""
msgstr "从 shell 中分离出来。这意味着 --syslog。"
 
#. type: Labeled list
#: en/git-daemon.txt:159
......@@ -20272,7 +20272,7 @@ msgstr "--pid-file=<file>"
#: en/git-daemon.txt:162
#, priority:100
msgid "Save the process id in 'file'. Ignored when the daemon is run under `--inetd`."
msgstr ""
msgstr "在 'file' 中保存进程 ID。 当守护进程在 `--inetd` 下运行时被忽略。"
 
#. type: Labeled list
#: en/git-daemon.txt:163
......@@ -20284,43 +20284,43 @@ msgstr "--user=<user>"
#: en/git-daemon.txt:164
#, no-wrap, priority:100
msgid "--group=<group>"
msgstr ""
msgstr "--group=<组>"
 
#. type: Plain text
#: en/git-daemon.txt:170
#, priority:100
msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported."
msgstr ""
msgstr "在进入服务循环之前，改变 daemon 的 uid 和 gid。 当只给出 `--user` 而没有 `--group` 时，将使用用户的主要组 ID。 该选项的值是给 `getpwnam(3)` 和 `getgrnam(3)` 的，不支持数字 ID。"
 
#. type: Plain text
#: en/git-daemon.txt:174
#, priority:100
msgid "Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning 'git daemon' if needed."
msgstr ""
msgstr "当与 `--inetd` 一起使用时，给出这些选项是一个错误；如果需要，在催生 'git daemon' 之前，使用 inet daemon 的设施来实现同样的目的。"
 
#. type: Plain text
#: en/git-daemon.txt:181
#, priority:100
msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `<user>` before starting the daemon, and make sure any Git configuration files in that directory are readable by `<user>`."
msgstr ""
msgstr "像许多切换用户 ID 的程序一样，守护进程在运行 git 程序（如 `upload-pack` 和 `receive-pack`）时，不会重置 `$HOME` 之类的环境变量。当使用这个选项时，你可能还想在启动守护进程之前设置并导出 `HOME` 指向 `<user>` 的主目录，并确保该目录下的任何 Git 配置文件是 `<user>` 可以读取的。"
 
#. type: Labeled list
#: en/git-daemon.txt:182
#, no-wrap, priority:100
msgid "--enable=<service>"
msgstr ""
msgstr "--enable=<服务>"
 
#. type: Labeled list
#: en/git-daemon.txt:183
#, no-wrap, priority:100
msgid "--disable=<service>"
msgstr ""
msgstr "--disable=<服务>"
 
#. type: Plain text
#: en/git-daemon.txt:189
#, priority:100
msgid "Enable/disable the service site-wide per default. Note that a service disabled site-wide can still be enabled per repository if it is marked overridable and the repository enables the service with a configuration item."
msgstr ""
msgstr "在全站范围内默认启用/禁用该服务。 请注意，如果一个全站禁用的服务被标记为可重写，并且版本库用配置项启用了该服务，那么它仍然可以在每个版本库中启用。"
 
#. type: Labeled list
#: en/git-daemon.txt:190
......@@ -20332,13 +20332,13 @@ msgstr "--allow-override=<service>"
#: en/git-daemon.txt:191
#, no-wrap, priority:100
msgid "--forbid-override=<service>"
msgstr ""
msgstr "--forbid-override=<服务>"
 
#. type: Plain text
#: en/git-daemon.txt:195
#, priority:100
msgid "Allow/forbid overriding the site-wide default with per repository configuration. By default, all the services may be overridden."
msgstr ""
msgstr "允许/禁止用每个版本库的配置来覆盖全站的默认值。 默认情况下，所有的服务都可以被覆盖。"
 
#. type: Labeled list
#: en/git-daemon.txt:196
......@@ -20350,31 +20350,31 @@ msgstr "--[no-]informative-errors"
#: en/git-daemon.txt:204
#, priority:100
msgid "When informative errors are turned on, git-daemon will report more verbose errors to the client, differentiating conditions like \"no such repository\" from \"repository not exported\". This is more convenient for clients, but may leak information about the existence of unexported repositories. When informative errors are not enabled, all errors report \"access denied\" to the client. The default is --no-informative-errors."
msgstr ""
msgstr "当信息性错误被打开时，git-daemon 会向客户端报告更多详细的错误，区分 \"没有这样的仓库\" 和 \"仓库没有被导出\" 这样的情况。这对客户端来说更方便，但可能会泄露未导出版本库的信息。 如果不启用信息性错误，所有错误都会向客户报告 \"拒绝访问\"。默认情况是 --no-informative-errors。"
 
#. type: Labeled list
#: en/git-daemon.txt:205
#, no-wrap, priority:100
msgid "--access-hook=<path>"
msgstr ""
msgstr "--access-hook=<路径>"
 
#. type: Plain text
#: en/git-daemon.txt:215
#, priority:100
msgid "Every time a client connects, first run an external command specified by the <path> with service name (e.g. \"upload-pack\"), path to the repository, hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) as its command-line arguments. The external command can decide to decline the service by exiting with a non-zero status (or to allow it by exiting with a zero status). It can also look at the $REMOTE_ADDR and `$REMOTE_PORT` environment variables to learn about the requestor when making this decision."
msgstr ""
msgstr "每次客户端连接时，首先运行 <路径> 指定的外部命令，以服务名称（如 \"upload-pack\"）、仓库的路径、主机名（%H）、规范主机名（%CH）、IP 地址（%IP）和 TCP 端口（%P）作为其命令行参数。外部命令可以通过以非零状态退出来决定拒绝该服务（或通过以零状态退出来允许它）。 在做出这个决定时，它还可以查看 $REMOTE_ADDR 和 `$REMOTE_PORT` 环境变量来了解请求者的情况。"
 
#. type: Plain text
#: en/git-daemon.txt:219
#, priority:100
msgid "The external command can optionally write a single line to its standard output to be sent to the requestor as an error message when it declines the service."
msgstr ""
msgstr "外部命令可以选择在其标准输出中写入一行，在拒绝服务时作为错误信息发送给请求者。"
 
#. type: Plain text
#: en/git-daemon.txt:226
#, priority:100
msgid "The remaining arguments provide a list of directories. If any directories are specified, then the `git-daemon` process will serve a requested directory only if it is contained in one of these directories. If `--strict-paths` is specified, then the requested directory must match one of these directories exactly."
msgstr ""
msgstr "其余的参数提供了一个目录列表。如果指定了任何目录，那么 `git-daemon` 进程将只在所请求的目录包含在这些目录中时提供服务。如果指定了 `--strict-paths`，那么请求的目录必须与这些目录之一完全匹配。"
 
#. type: Title -
#: en/git-daemon.txt:228 en/git-http-backend.txt:35
......@@ -20386,13 +20386,13 @@ msgstr "服务"
#: en/git-daemon.txt:236
#, priority:100
msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them."
msgstr ""
msgstr "这些服务可以通过该命令的命令行选项全局启用/禁用。 如果需要更精细的控制（例如，允许 'git archive' 只在守护进程所服务的几个选定的仓库中运行），可以使用每个仓库的配置文件来启用或禁用它们。"
 
#. type: Labeled list
#: en/git-daemon.txt:237
#, no-wrap, priority:100
msgid "upload-pack"
msgstr ""
msgstr "upload-pack"
 
#. type: Plain text
#: en/git-daemon.txt:242
......@@ -21216,31 +21216,31 @@ msgstr "--tool=<tool>"
#: en/git-difftool.txt:50
#, priority:100
msgid "Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid <tool> settings."
msgstr ""
msgstr "使用由 <工具> 指定的差异工具。 有效值包括 emerge, kompare, meld, 和 vimdiff。运行 `git difftool --tool-help` 以获得有效的 <工具> 设置列表。"
 
#. type: Plain text
#: en/git-difftool.txt:55
#, priority:100
msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default."
msgstr ""
msgstr "如果没有指定差异工具，'git difftool' 将使用配置变量 `diff.tool`。 如果配置变量 `diff.tool` 没有设置，'git difftool' 将选择一个合适的默认值。"
 
#. type: Plain text
#: en/git-difftool.txt:61
#, priority:100
msgid "You can explicitly provide a full path to the tool by setting the configuration variable `difftool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is available in PATH."
msgstr ""
msgstr "你可以通过设置配置变量 `difftool.<工具>.path` 来明确提供工具的完整路径。例如，你可以通过设置 `difftool.kdiff3.path` 来配置 kdiff3 的绝对路径。否则，'git difftool' 会假定该工具在 PATH 中可用。"
 
#. type: Plain text
#: en/git-difftool.txt:66
#, priority:100
msgid "Instead of running one of the known diff tools, 'git difftool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `difftool.<tool>.cmd`."
msgstr ""
msgstr "通过在配置变量 `difftool.<工具>.cmd` 中指定要调用的命令行，可以定制 'git difftool'，而不是运行一个已知的比较工具，以运行一个替代程序。"
 
#. type: Plain text
#: en/git-difftool.txt:76
#, priority:100
msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable) the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
msgstr "当 'git difftool' 与此工具一起调用时（通过 `-t` 或 `--tool` 选项或 `diff.tool` 配置变量），配置的命令行将被调用，以下变量可用： `$LOCAL` 被设置为包含差异比对前图像内容的临时文件名，`$REMOTE` 被设置为包含差异比对后图像内容的临时文件名。 `$MERGED` 是被比较的文件的名称。`$BASE` 是为了与自定义合并工具命令兼容而提供的，其值与 `$MERGED` 相同。"
 
#. type: Labeled list
#: en/git-difftool.txt:77 en/git-mergetool.txt:67
......@@ -21270,13 +21270,13 @@ msgstr "'git difftool''s default behavior is create symlinks to the working tree
#: en/git-difftool.txt:88
#, priority:100
msgid "Specifying `--no-symlinks` instructs 'git difftool' to create copies instead. `--no-symlinks` is the default on Windows."
msgstr ""
msgstr "指定 `---no-symlinks` 会指示 'git difftool' 创建副本。 `--no-symlinks` 是 Windows 上的默认值。"
 
#. type: Labeled list
#: en/git-difftool.txt:89
#, no-wrap, priority:100
msgid "-x <command>"
msgstr ""
msgstr "-x <命令>"
 
#. type: Labeled list
#: en/git-difftool.txt:90
......@@ -21288,7 +21288,7 @@ msgstr "--extcmd=<command>"
#: en/git-difftool.txt:95
#, priority:100
msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs `$command $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment."
msgstr ""
msgstr "指定一个用于查看差异的自定义命令。 'git-difftool' 忽略了配置的默认值，当这个选项被指定时，运行`$command $LOCAL $REMOTE`。 此外，`$BASE`在环境中被设置。"
 
#. type: Labeled list
#: en/git-difftool.txt:96 en/git-help.txt:70 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:127 en/rev-list-options.txt:301
......@@ -21319,43 +21319,43 @@ msgstr "--[no-]trust-exit-code"
#: en/git-difftool.txt:112
#, priority:100
msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code."
msgstr ""
msgstr "'git-difftool' 在每个文件上单独调用一个差异工具。 默认情况下，差异工具报告的错误会被忽略。 使用 `--trust-exit-code` 使 'git-difftool' 在被调用的差异工具返回非零的退出代码时退出。"
 
#. type: Plain text
#: en/git-difftool.txt:115
#, priority:100
msgid "'git-difftool' will forward the exit code of the invoked tool when `--trust-exit-code` is used."
msgstr ""
msgstr "'git-difftool' 在使用 `--trust-exit-code` 时将转发被调用工具的退出代码。"
 
#. type: Plain text
#: en/git-difftool.txt:117
#, priority:100
msgid "See linkgit:git-diff[1] for the full list of supported options."
msgstr ""
msgstr "关于支持的选项的完整列表，见 linkgit:git-diff[1]。"
 
#. type: Plain text
#: en/git-difftool.txt:122
#, priority:100
msgid "'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined."
msgstr ""
msgstr "当差异工具等价物没有被定义时，'git difftool' 会返回到 'git mergetool' 配置变量。"
 
#. type: Plain text
#: en/git-difftool.txt:131
#, priority:100
msgid "Show changes between commits, commit and working tree, etc"
msgstr ""
msgstr "显示提交之间的变化，提交和工作区，等等"
 
#. type: Plain text
#: en/git-difftool.txt:134
#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
msgstr "运行合并冲突解决工具来解决合并冲突"
 
#. type: Plain text
#: en/git-difftool.txt:137
#, priority:100
msgid "Get and set repository or global options"
msgstr ""
msgstr "获取和设置仓库或全局选项"
 
#. type: Title =
#: en/git-diff-tree.txt:2
......@@ -22540,7 +22540,7 @@ msgstr ""
#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85 en/git-pack-objects.txt:129 en/git-repack.txt:108
#, no-wrap, priority:100
msgid "--depth=<n>"
msgstr ""
msgstr "--depth=<n>"
 
#. type: Plain text
#: en/git-fast-import.txt:161
......@@ -22564,7 +22564,7 @@ msgstr ""
#: en/git-fast-import.txt:171 en/git-pack-objects.txt:154 en/git-repack.txt:136
#, no-wrap, priority:100
msgid "--max-pack-size=<n>"
msgstr ""
msgstr "--max-pack-size=<n>"
 
#. type: Plain text
#: en/git-fast-import.txt:174
......@@ -22660,7 +22660,7 @@ msgstr ""
#: en/git-fast-import.txt:244 en/git-merge-tree.txt:225
#, no-wrap, priority:100
msgid "INPUT FORMAT"
msgstr ""
msgstr "输入格式"
 
#. type: Plain text
#: en/git-fast-import.txt:250
......@@ -26258,13 +26258,13 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:20
#, priority:100
msgid "Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the '<merge-message>' argument of 'git merge'."
msgstr ""
msgstr "接收标准输入流中的合并对象列表，并产生一个合适的提交信息，用于合并提交，通常作为 'git merge' 的 '<merge-message>' 参数传递。"
 
#. type: Plain text
#: en/git-fmt-merge-msg.txt:23
#, priority:100
msgid "This command is intended mostly for internal use by scripts automatically invoking 'git merge'."
msgstr ""
msgstr "这条命令主要是供自动调用 'git merge' 的脚本内部使用。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:93
......@@ -26276,7 +26276,7 @@ msgstr "--log[=<n>]"
#: en/git-fmt-merge-msg.txt:33
#, priority:100
msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most <n> commits from each merge parent will be used (20 if <n> is omitted). This overrides the `merge.log` configuration variable."
msgstr ""
msgstr "除了分支名称外，在日志信息中加入被合并的实际提交内容的单行描述。 最多使用每个合并父分支的 <n> 个提交（如果 <n> 被省略，则为 20 个）。 这覆盖了 `merge.log` 配置变量。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:94
......@@ -26288,7 +26288,7 @@ msgstr "--no-log"
#: en/git-fmt-merge-msg.txt:37
#, priority:100
msgid "Do not list one-line descriptions from the actual commits being merged."
msgstr ""
msgstr "不要列出被合并的实际提交中的单行描述。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
......@@ -26300,7 +26300,7 @@ msgstr "--[no-]summary"
#: en/git-fmt-merge-msg.txt:41
#, priority:100
msgid "Synonyms to --log and --no-log; these are deprecated and will be removed in the future."
msgstr ""
msgstr "与 --log 和 --no-log 的同义词；这些都是废弃的，将来会被删除。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:43
......@@ -26312,7 +26312,7 @@ msgstr "--message <message>"
#: en/git-fmt-merge-msg.txt:46
#, priority:100
msgid "Use <message> instead of the branch names for the first line of the log message. For use with `--log`."
msgstr ""
msgstr "在日志信息的第一行使用 <message> 而不是分支名称。 与 `--log` 一起使用。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:47 en/git-merge.txt:81
......@@ -26324,19 +26324,19 @@ msgstr "--state-branch <branch>"
#: en/git-fmt-merge-msg.txt:50
#, priority:100
msgid "Prepare the merge message as if merging to the branch `<branch>`, instead of the name of the real branch to which the merge is made."
msgstr ""
msgstr "准备合并信息，就像合并到分支 `<branch>` 一样，而不是合并到真正的分支名称。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:52
#, no-wrap, priority:100
msgid "--file <file>"
msgstr ""
msgstr "--file <文件>"
 
#. type: Plain text
#: en/git-fmt-merge-msg.txt:55
#, priority:100
msgid "Take the list of merged objects from <file> instead of stdin."
msgstr ""
msgstr "从 <文件> 而不是标准输入流获取合并后的对象列表。"
 
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:60
......@@ -26348,7 +26348,7 @@ msgstr "merge.summary"
#: en/git-fmt-merge-msg.txt:63
#, priority:100
msgid "Synonym to `merge.log`; this is deprecated and will be removed in the future."
msgstr ""
msgstr "`merge.log` 的同义词；这已被废弃，将来会被删除。"
 
#. type: delimited block -
#: en/git-fmt-merge-msg.txt:70
......@@ -26364,7 +26364,7 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:74
#, priority:100
msgid "Print a log message describing a merge of the \"master\" branch from the \"origin\" remote."
msgstr ""
msgstr "打印一条日志信息，描述从 \"origin\" 远程分支合并到 \"master\" 分支的情况。"
 
#. type: Title =
#: en/git-for-each-ref.txt:2
......@@ -27079,11 +27079,11 @@ msgstr "git-format-patch(1)"
#: en/git-format-patch.txt:7
#, priority:100
msgid "git-format-patch - Prepare patches for e-mail submission"
msgstr ""
msgstr "git-format-patch - 为提交电子邮件准备补丁"
 
#. type: Plain text
#: en/git-format-patch.txt:35
#, no-wrap, priority:100
#, fuzzy, no-wrap, priority:100
msgid ""
"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
"\t\t [--no-thread | --thread[=<style>]]\n"
......@@ -27108,97 +27108,97 @@ msgid ""
"\t\t [--progress]\n"
"\t\t [<common diff options>]\n"
"\t\t [ <since> | <revision range> ]\n"
msgstr ""
msgstr "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n\t\t [--no-thread | --thread[=<风格>]]\n\t\t [(--attach|--inline)[=<boundary>] | --no-attach]\n\t\t [-s | --signoff]\n\t\t [--signature=<signature> | --no-signature]\n\t\t [--signature-file=<file>]\n\t\t [-n | --numbered | -N | --no-numbered]\n\t\t [--start-number <n>] [--numbered-files]\n\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n\t\t [--ignore-if-in-upstream] [--always]\n\t\t [--cover-from-description=<模式>]\n\t\t [--rfc] [--subject-prefix=<subject prefix>]\n\t\t [(--reroll-count|-v) <n>]\n\t\t [--to=<e-mail>] [--cc=<e-mail>]\n\t\t [--[no-]cover-letter] [--quiet]\n\t\t [--[no-]encode-email-headers]\n\t\t [--no-notes | --notes[=<引用>]]\n\t\t [--interdiff=<previous>]\n\t\t [--range-diff=<previous> [--creation-factor=<percent>]]\n\t\t [--filename-max-length=<n>]\n\t\t [--progress]\n\t\t [<common diff options>]\n\t\t [ <since> | <revision range> ]\n"
 
#. type: Plain text
#: en/git-format-patch.txt:43
#, priority:100
msgid "Prepare each non-merge commit with its \"patch\" in one \"message\" per commit, formatted to resemble a UNIX mailbox. The output of this command is convenient for e-mail submission or for use with 'git am'."
msgstr ""
msgstr "将每个非合并提交及其 “补丁” 准备在每个提交的一个 “消息” 中，格式类似于 UNIX 邮箱。 这条命令的输出便于提交电子邮件或与 \"git am\" 一起使用。"
 
#. type: Plain text
#: en/git-format-patch.txt:45
#, priority:100
msgid "A \"message\" generated by the command consists of three parts:"
msgstr ""
msgstr "命令产生的 \"信息\" 由三部分组成："
 
#. type: Plain text
#: en/git-format-patch.txt:52
#, priority:100
msgid "A brief metadata header that begins with `From <commit>` with a fixed `Mon Sep 17 00:00:00 2001` datestamp to help programs like \"file(1)\" to recognize that the file is an output from this command, fields that record the author identity, the author date, and the title of the change (taken from the first paragraph of the commit log message)."
msgstr ""
msgstr "一个简短的元数据头，以 \"From <提交>\" 开始，带有固定的 \"Mon Sep 17 00:00:00 2001\" 的日期，以帮助 \"file(1)\" 等程序识别该文件是该命令的输出，记录作者身份、作者日期和修改标题的字段（取自提交日志信息的第一段）。"
 
#. type: Plain text
#: en/git-format-patch.txt:54
#, priority:100
msgid "The second and subsequent paragraphs of the commit log message."
msgstr ""
msgstr "提交日志信息的第二段和后续段落。"
 
#. type: Plain text
#: en/git-format-patch.txt:57
#, priority:100
msgid "The \"patch\", which is the \"diff -p --stat\" output (see linkgit:git-diff[1]) between the commit and its parent."
msgstr ""
msgstr "“补丁”，也就是该提交和其父辈之间的 \"diff -p -stat\" 输出（见 linkgit:git-diff[1]）。"
 
#. type: Plain text
#: en/git-format-patch.txt:60
#, priority:100
msgid "The log message and the patch is separated by a line with a three-dash line."
msgstr ""
msgstr "日志信息和补丁之间用一行三折线分开。"
 
#. type: Plain text
#: en/git-format-patch.txt:62
#, priority:100
msgid "There are two ways to specify which commits to operate on."
msgstr ""
msgstr "有两种方法可以指定要对哪些提交进行操作。"
 
#. type: Plain text
#: en/git-format-patch.txt:66
#, priority:100
#, fuzzy, priority:100
msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
msgstr ""
msgstr "单一的提交，<since>，指定导致当前分支顶端的提交不在导致<since>的历史中，要被输出。"
 
#. type: Plain text
#: en/git-format-patch.txt:70
#, priority:100
msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
msgstr "通用的 <修订范围> 表达式（见 linkgit:gitrevisions[7]中的 \"指定修订\" 一节）表示指定范围内的提交。"
 
#. type: Plain text
#: en/git-format-patch.txt:76
#, priority:100
msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the `--root` option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
msgstr ""
msgstr "在只有一个 <提交> 的情况下，第一条规则具有优先权。 要应用第二条规则，即格式化从历史开始到 <提交> 为止的所有内容，使用 `--root` 选项：`git format-patch --root <提交>`。 如果你只想格式化 <提交> 本身，你可以用`git format-patch -1 <提交>`来做。"
 
#. type: Plain text
#: en/git-format-patch.txt:83
#, priority:100
msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
msgstr ""
msgstr "默认情况下，每个输出文件从 1 开始依次编号，并使用提交信息的第一行（为保证路径名的安全而进行了调整）作为文件名。使用 `--numbered-files` 选项，输出文件名将只有数字，而没有附加提交信息的第一行。 除非指定 `--stdout` 选项，否则输出文件的名称将被打印到标准输出。"
 
#. type: Plain text
#: en/git-format-patch.txt:91
#, priority:100
msgid "If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
msgstr ""
msgstr "如果指定了 `-o`，输出文件将在<目录>创建。 否则，它们将在当前工作目录下创建。默认路径可以通过 `format.outputDirectory` 配置选项来设置。 `-o` 选项优先于 `format.outputDirectory`。 要在当前工作目录下存储补丁，即使 `format.outputDirectory` 指向其他地方，使用 `-o .`。所有的目录组件都将被创建。"
 
#. type: Plain text
#: en/git-format-patch.txt:95
#, priority:100
msgid "By default, the subject of a single patch is \"[PATCH] \" followed by the concatenation of lines from the commit message up to the first blank line (see the DISCUSSION section of linkgit:git-commit[1])."
msgstr ""
msgstr "默认情况下，单个补丁的主题是 \"[PATCH]\"，后面是提交信息到第一个空行的串联（见 linkgit:git-commit[1] 的讨论部分）。"
 
#. type: Plain text
#: en/git-format-patch.txt:99
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
msgstr ""
msgstr "当输出多个补丁时，主题前缀将改为 \"[PATCH n/m] \"。 要强制为单个补丁添加 1/1，使用 `-n`。 要从主题中省略补丁编号，使用 `-N`。"
 
#. type: Plain text
#: en/git-format-patch.txt:104
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-ID` header to reference."
msgstr ""
msgstr "如果给出 `--thread`，`git-format-patch` 将生成 `In-Reply-To` 和 `References` 头，使第二封和随后的补丁邮件显示为对第一封邮件的回复；这也会生成一个 `Message-ID` 头供参考。"
 
#. type: Labeled list
#: en/git-format-patch.txt:110
......@@ -27210,13 +27210,13 @@ msgstr "-<n>"
#: en/git-format-patch.txt:112
#, priority:100
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
msgstr "从最上面的 <n> 个提交中准备补丁。"
 
#. type: Labeled list
#: en/git-format-patch.txt:113
#, no-wrap, priority:100
msgid "-o <dir>"
msgstr ""
msgstr "-o <目录>"
 
#. type: Labeled list
#: en/git-format-patch.txt:114
......@@ -27228,7 +27228,7 @@ msgstr "--output-directory <dir>"
#: en/git-format-patch.txt:117
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
msgstr ""
msgstr "使用 <目录> 来存储结果文件，而不是当前工作目录。"
 
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-shortlog.txt:30
......@@ -27240,7 +27240,7 @@ msgstr "--numbered"
#: en/git-format-patch.txt:121
#, priority:100
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
msgstr "以 '[PATCH n/m]' 的格式输出名称，即使只有一个补丁。"
 
#. type: Labeled list
#: en/git-format-patch.txt:123
......@@ -27252,13 +27252,13 @@ msgstr "--no-numbered"
#: en/git-format-patch.txt:125
#, priority:100
msgid "Name output in '[PATCH]' format."
msgstr ""
msgstr "以 '[PATCH]' 格式输出名称。"
 
#. type: Labeled list
#: en/git-format-patch.txt:126
#, no-wrap, priority:100
msgid "--start-number <n>"
msgstr ""
msgstr "--start-number <n>"
 
#. type: Plain text
#: en/git-format-patch.txt:128
......@@ -27276,7 +27276,7 @@ msgstr "--numbered-files"
#: en/git-format-patch.txt:132
#, priority:100
msgid "Output file names will be a simple number sequence without the default first line of the commit appended."
msgstr ""
msgstr "输出文件名将是一个简单的数字序列，没有附加默认的第一行提交。"
 
#. type: Labeled list
#: en/git-format-patch.txt:134
......@@ -27288,7 +27288,7 @@ msgstr "--keep-subject"
#: en/git-format-patch.txt:137
#, priority:100
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
msgstr "不要从提交日志信息的第一行剥离/添加 '[PATCH]'。"
 
#. type: Labeled list
#: en/git-format-patch.txt:144 en/git-pack-objects.txt:60
......@@ -27300,7 +27300,7 @@ msgstr "--stdout"
#: en/git-format-patch.txt:147
#, priority:100
msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
msgstr ""
msgstr "以 mbox 格式将所有的提交打印到标准输出，而不是为每个提交创建一个文件。"
 
#. type: Labeled list
#: en/git-format-patch.txt:148
......@@ -27312,7 +27312,7 @@ msgstr "--attach[=<boundary>]"
#: en/git-format-patch.txt:152
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
msgstr ""
msgstr "创建多部分/混合附件，第一部分是提交信息，第二部分是补丁本身，`Content-Disposition: attachment`。"
 
#. type: Labeled list
#: en/git-format-patch.txt:153
......@@ -27324,7 +27324,7 @@ msgstr "--no-attach"
#: en/git-format-patch.txt:156
#, priority:100
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
msgstr "禁用附件的创建，覆盖配置设置。"
 
#. type: Labeled list
#: en/git-format-patch.txt:157
......@@ -27336,7 +27336,7 @@ msgstr "--inline[=<boundary>]"
#: en/git-format-patch.txt:161
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
msgstr ""
msgstr "创建 multipart/mixed 附件，第一部分是提交信息，第二部分是补丁本身，使用 `Content-Disposition: inline`。"
 
#. type: Labeled list
#: en/git-format-patch.txt:162
......@@ -27354,25 +27354,25 @@ msgstr "--no-thread"
#: en/git-format-patch.txt:168
#, priority:100
msgid "Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the first. Also controls generation of the `Message-ID` header to reference."
msgstr ""
msgstr "控制添加 `In-Reply-To` 和 `References` 标头，使第二封及以后的邮件显示为对第一封邮件的回复。 还控制生成 `Message-ID` 头，以便参考。"
 
#. type: Plain text
#: en/git-format-patch.txt:174
#, priority:100
msgid "The optional <style> argument can be either `shallow` or `deep`. 'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one."
msgstr ""
msgstr "可选的 <风格> 参数可以是 `shallow` 或 `deep`。 ‘浅’ 线程使每封邮件都是对该系列的头的回复，其中头是从封面信、`--in-reply-to` 和第一个补丁邮件中选择的，按这个顺序。 ‘深’ 线程使每封邮件都是对前一封的回复。"
 
#. type: Plain text
#: en/git-format-patch.txt:177
#, priority:100
msgid "The default is `--no-thread`, unless the `format.thread` configuration is set. `--thread` without an argument is equivalent to `--thread=shallow`."
msgstr ""
msgstr "默认是 `--no-thread`，除非设置了 `format.thread` 配置。 没有参数的 `--thread` 等同于 `--thread=shallow`。"
 
#. type: Plain text
#: en/git-format-patch.txt:181
#, priority:100
msgid "Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`."
msgstr ""
msgstr "请注意，'git send-email' 的默认设置是对邮件本身进行线程处理。 如果你想让 `git format-patch` 负责线程，你要确保 `git send-email` 的线程被禁用。"
 
#. type: Labeled list
#: en/git-format-patch.txt:182
......@@ -27385,7 +27385,7 @@ msgstr "--in-reply-to=<message id>"
#: en/git-format-patch.txt:186
#, priority:100
msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
msgstr ""
msgstr "使第一封邮件（或所有带有 `--no-thread` 的邮件）作为给定的 <消息 id> 的回复出现，这可以避免破坏线程以提供一个新的补丁系列。"
 
#. type: Labeled list
#: en/git-format-patch.txt:187
......@@ -27397,13 +27397,13 @@ msgstr "--ignore-if-in-upstream"
#: en/git-format-patch.txt:193
#, priority:100
msgid "Do not include a patch that matches a commit in <until>..<since>. This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
msgstr ""
msgstr "不包括与 <until>...<since> 中的提交相匹配的补丁。 这将检查所有可从 <since> 到达但不在 <until> 的补丁，并将它们与正在生成的补丁进行比较，任何匹配的补丁都将被忽略。"
 
#. type: Plain text
#: en/git-format-patch.txt:197
#, priority:100
msgid "Include patches for commits that do not introduce any change, which are omitted by default."
msgstr ""
msgstr "包括那些没有引入任何变化的提交的补丁，这些补丁默认是省略的。"
 
#. type: Labeled list
#: en/git-format-patch.txt:198
......@@ -27416,31 +27416,31 @@ msgstr "--cover-from-description=<mode>"
#: en/git-format-patch.txt:201
#, priority:100
msgid "Controls which parts of the cover letter will be automatically populated using the branch's description."
msgstr ""
msgstr "控制求职信的哪些部分将使用分支机构的描述自动填充。"
 
#. type: Plain text
#: en/git-format-patch.txt:206
#, priority:100
msgid "If `<mode>` is `message` or `default`, the cover letter subject will be populated with placeholder text. The body of the cover letter will be populated with the branch's description. This is the default mode when no configuration nor command line option is specified."
msgstr ""
msgstr "如果 `<模式>` 是 `message` 或 `default`，求职信的主题将被填充为占位符文本。信函的正文将被填入分支的描述。这是没有指定配置或命令行选项时的默认模式。"
 
#. type: Plain text
#: en/git-format-patch.txt:210
#, priority:100
msgid "If `<mode>` is `subject`, the first paragraph of the branch description will populate the cover letter subject. The remainder of the description will populate the body of the cover letter."
msgstr ""
msgstr "如果 `<模式>` 是 `subject`，分支描述的第一段将填入求职信的主题。描述的其余部分将填充到求职信的正文中。"
 
#. type: Plain text
#: en/git-format-patch.txt:214
#, priority:100
msgid "If `<mode>` is `auto`, if the first paragraph of the branch description is greater than 100 bytes, then the mode will be `message`, otherwise `subject` will be used."
msgstr ""
msgstr "如果 `<模式>` 是 `auto`，如果分支描述的第一段大于100字节，那么模式将是 `message`，否则将使用 `subject`。"
 
#. type: Plain text
#: en/git-format-patch.txt:217
#, priority:100
msgid "If `<mode>` is `none`, both the cover letter subject and body will be populated with placeholder text."
msgstr ""
msgstr "如果 `<模式>` 为 `none`，求职信的主题和正文都将被填充为占位符文本。"
 
#. type: Labeled list
#: en/git-format-patch.txt:218
......@@ -27452,19 +27452,19 @@ msgstr "--subject-prefix=<subject prefix>"
#: en/git-format-patch.txt:223
#, priority:100
msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
msgstr ""
msgstr "在主题行中不要使用标准的 '[PATCH]' 前缀，而要使用 '[<subject prefix>]'。这允许对一个补丁系列进行有用的命名，并可以与 `--numbered` 选项结合使用。"
 
#. type: Labeled list
#: en/git-format-patch.txt:224
#, no-wrap, priority:100
msgid "--filename-max-length=<n>"
msgstr ""
msgstr "--filename-max-length=<n>"
 
#. type: Plain text
#: en/git-format-patch.txt:230
#, priority:100
msgid "Instead of the standard 64 bytes, chomp the generated output filenames at around '<n>' bytes (too short a value will be silently raised to a reasonable length). Defaults to the value of the `format.filenameMaxLength` configuration variable, or 64 if unconfigured."
msgstr ""
msgstr "代替标准的 64 字节，将生成的输出文件名压缩到 '<n>' 字节左右（太短的值会被默默提升到合理的长度）。 默认为 `format.filenameMaxLength` 配置变量的值，如果没有配置，则为 64。"
 
#. type: Labeled list
#: en/git-format-patch.txt:231
......@@ -27476,7 +27476,7 @@ msgstr "--rfc"
#: en/git-format-patch.txt:235
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
msgstr ""
msgstr "`--subject-prefix=\"RFC PATCH\"` 的别名。RFC 的意思是 \"Request For Comments\"；在发送实验性补丁供讨论而非应用时使用。"
 
#. type: Labeled list
#: en/git-format-patch.txt:236
......@@ -27494,19 +27494,19 @@ msgstr "--reroll-count=<n>"
#: en/git-format-patch.txt:249
#, priority:100
msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it. `<n>` does not have to be an integer (e.g. \"--reroll-count=4.4\", or \"--reroll-count=4rev2\" are allowed), but the downside of using such a reroll-count is that the range-diff/interdiff with the previous version does not state exactly which version the new interation is compared against."
msgstr ""
msgstr "将该系列标记为该主题的第 <n> 次迭代。输出的文件名有 `v<n>`，主题前缀（默认为 \"PATCH\"，但可通过 `--subject-prefix` 选项配置）有 `v<n>` 附加在上面。 例如，`--reroll-count=4` 可能产生 `v4-0001-add-makefile.patch` 文件，其中有 \"Subject： [PATCH v4 1/20] Add makefile\"。 `<n>` 不一定是整数（例如，\"--reroll-count=4.4\"，或 \"--reroll-count=4rev2 \"都可以），但使用这种 reroll-count 的缺点是，与前一版本的 range-diff/interdiff 并没有准确说明新的 interation 是与哪个版本比较。"
 
#. type: Labeled list
#: en/git-format-patch.txt:250
#, no-wrap, priority:100
msgid "--to=<email>"
msgstr ""
msgstr "--to=<e-mail>"
 
#. type: Plain text
#: en/git-format-patch.txt:255
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
msgstr ""
msgstr "在邮件标题中增加一个 `To: ` 头。这是在任何配置的头信息之外的，可以多次使用。 否定的形式 `--no-to` 会丢弃到目前为止添加的所有 `To:` 头信息（来自配置或命令行）。"
 
#. type: Labeled list
#: en/git-format-patch.txt:256
......@@ -27518,7 +27518,7 @@ msgstr "--cc=<email>"
#: en/git-format-patch.txt:261
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
msgstr ""
msgstr "在邮件标题中添加 `Cc: ` 标头。这是在任何配置的头信息之外的，可以多次使用。 否定的形式 `--no-cc` 会丢弃到目前为止添加的所有 `Cc:` 头信息（来自配置或命令行）。"
 
#. type: Labeled list
#: en/git-format-patch.txt:262
......@@ -27536,13 +27536,13 @@ msgstr "--from=<ident>"
#: en/git-format-patch.txt:269
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
msgstr ""
msgstr "在每封提交邮件的`From:` 标头中使用 `ident`。如果提交的作者身份与所提供的 `ident` 在文字上不一致，则在邮件正文中放置一个 `From: ` 头，注明原作者。如果没有给出 `ident`，则使用提交者的身份。"
 
#. type: Plain text
#: en/git-format-patch.txt:276
#, priority:100
msgid "Note that this option is only useful if you are actually sending the emails and want to identify yourself as the sender, but retain the original author (and `git am` will correctly pick up the in-body header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`."
msgstr ""
msgstr "注意，这个选项只有在你实际发送邮件时才有用，并且想把你自己确定为发件人，但保留原作者（`git am` 会正确接收正文头）。还要注意的是，`git send-email` 已经为你处理了这种转换，如果你将结果反馈给 `git send-email`，就不应该使用这个选项。"
 
#. type: Labeled list
#: en/git-format-patch.txt:277
......@@ -27554,7 +27554,7 @@ msgstr "--[no-]force-in-body-from"
#: en/git-format-patch.txt:287
#, priority:100
msgid "With the e-mail sender specified via the `--from` option, by default, an in-body \"From:\" to identify the real author of the commit is added at the top of the commit log message if the sender is different from the author. With this option, the in-body \"From:\" is added even when the sender and the author have the same name and address, which may help if the mailing list software mangles the sender's identity. Defaults to the value of the `format.forceInBodyFrom` configuration variable."
msgstr ""
msgstr "对于通过 `--from` 选项指定的电子邮件发件人，默认情况下，如果发件人与作者不同，会在提交日志信息的顶部添加一个内文 \"From:\"，以确定提交的真正作者。 有了这个选项，即使发件人和作者的名字和地址相同，也会在正文中加入 \"From：\"，这在邮件列表软件混淆发件人身份时可能会有帮助。 默认为 `format.forceInBodyFrom` 配置变量的值。"
 
#. type: Labeled list
#: en/git-format-patch.txt:288
......@@ -27566,7 +27566,7 @@ msgstr "--add-header=<header>"
#: en/git-format-patch.txt:295
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
msgstr ""
msgstr "在邮件头中添加一个任意的头。 这是在任何配置的头文件之外的，并且可以多次使用。 例如，`--add-header=\"Organization: git-foo\"`。 否定的形式 `--no-add-header` 会丢弃 *所有*（`To:`, `Cc:`, 和自定义）从配置或命令行添加的头信息。"
 
#. type: Labeled list
#: en/git-format-patch.txt:296
......@@ -27578,7 +27578,7 @@ msgstr "--[no-]cover-letter"
#: en/git-format-patch.txt:300
#, priority:100
msgid "In addition to the patches, generate a cover letter file containing the branch description, shortlog and the overall diffstat. You can fill in a description in the file before sending it out."
msgstr ""
msgstr "除了补丁之外，还要生成一个包含分支描述、短日志和整体差异状态的封面文件。 你可以在发送之前在文件中填写描述。"
 
#. type: Labeled list
#: en/git-format-patch.txt:301
......@@ -27596,7 +27596,7 @@ msgstr "--no-encode-email-headers"
#: en/git-format-patch.txt:307
#, priority:100
msgid "Encode email headers that have non-ASCII characters with \"Q-encoding\" (described in RFC 2047), instead of outputting the headers verbatim. Defaults to the value of the `format.encodeEmailHeaders` configuration variable."
msgstr ""
msgstr "用 \"Q-encoding\"（在RFC 2047中描述）对有非 ASCII 字符的邮件头进行编码，而不是逐字输出邮件头。默认为 `format.encodeEmailHeaders` 配置变量的值。"
 
#. type: Labeled list
#: en/git-format-patch.txt:308
......@@ -27608,7 +27608,7 @@ msgstr "--interdiff=<previous>"
#: en/git-format-patch.txt:316
#, priority:100
msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
msgstr ""
msgstr "作为审查员的帮助，在封面信中插入一个 interdiff，或者作为1个补丁系列中唯一一个补丁的注释，显示补丁系列的前一个版本与当前被格式化的系列之间的差异。`previous` 是一个单一的修订，命名了与被格式化的系列有共同基础的前一个系列的提示（例如 `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`）。"
 
#. type: Labeled list
#: en/git-format-patch.txt:317
......@@ -27620,25 +27620,25 @@ msgstr "--range-diff=<previous>"
#: en/git-format-patch.txt:328
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
msgstr "作为审查员的辅助工具，在封面信中插入一个 range-diff（见 linkgit:git-range-diff[1]），或者作为1个补丁系列中唯一一个补丁的注释，显示该补丁系列的前一个版本与当前被格式化的系列之间的差异。 `previous` 可以是一个单一的修订版，如果它与被格式化的系列有共同的基础，则命名为前一个系列的提示（例如 `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`），如果两个系列的版本不相干，则是一个修订范围（例如 `git format-patch --cover-letter --range-diff=feature/v1~3.feature/v1 -3 feature/v2`）。"
 
#. type: Plain text
#: en/git-format-patch.txt:333
#, priority:100
msgid "Note that diff options passed to the command affect how the primary product of `format-patch` is generated, and they are not passed to the underlying `range-diff` machinery used to generate the cover-letter material (this may change in the future)."
msgstr ""
msgstr "请注意，传递给命令的差异选项会影响 `format-patch` 的主要产品如何生成，它们不会传递给用于生成封面材料的基础 `range-diff ` 机器（这在将来可能会改变）。"
 
#. type: Labeled list
#: en/git-format-patch.txt:334 en/git-range-diff.txt:68
#, no-wrap, priority:100
msgid "--creation-factor=<percent>"
msgstr ""
msgstr "--creation-factor=<百分比>"
 
#. type: Plain text
#: en/git-format-patch.txt:339
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
msgstr "与 `--range-diff` 一起使用，通过调整创建/删除成本的模糊系数，来调整匹配上一个和当前系列补丁之间提交的启发式方法。详情见 linkgit:git-range-diff[1]）。"
 
#. type: Labeled list
#: en/git-format-patch.txt:340 en/pretty-options.txt:62
......@@ -27656,19 +27656,19 @@ msgstr "--no-notes"
#: en/git-format-patch.txt:344
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
msgstr "在三折线之后添加该提交的注释（见 linkgit:git-notes[1]）。"
 
#. type: Plain text
#: en/git-format-patch.txt:352
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
msgstr ""
msgstr "预期的用例是为提交编写不属于提交日志信息本身的支持性解释，并将其包含在补丁提交中。虽然我们可以在 `format-patch` 运行后但在发送前简单地写下这些解释，但将其保留为 Git 笔记，可以在补丁系列的不同版本之间进行维护（但要使用这种工作流程，请参考 linkgit:git-notes[1] 中关于`notes.rewrite` 配置选项的讨论）。"
 
#. type: Plain text
#: en/git-format-patch.txt:355
#, priority:100
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
msgstr "默认为`--no-notes`，除非设置了 `format.notes` 配置。"
 
#. type: Labeled list
#: en/git-format-patch.txt:356
......@@ -27680,7 +27680,7 @@ msgstr "--[no-]signature=<signature>"
#: en/git-format-patch.txt:361
#, priority:100
msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
msgstr ""
msgstr "给每个产生的信息添加一个签名。根据 RFC 3676，签名与正文之间用一行 '--' 分隔。如果签名选项被省略，则签名默认为 Git 版本号。"
 
#. type: Labeled list
#: en/git-format-patch.txt:362
......@@ -27692,7 +27692,7 @@ msgstr "--signature-file=<file>"
#: en/git-format-patch.txt:364
#, priority:100
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
msgstr "工作原理与--签名相同，只是签名是从文件中读取的。"
 
#. type: Labeled list
#: en/git-format-patch.txt:365
......@@ -27704,19 +27704,19 @@ msgstr "--suffix=.<sfx>"
#: en/git-format-patch.txt:370
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
msgstr ""
msgstr "不使用 `.patch` 作为生成文件名的后缀，而使用指定的后缀。 一个常见的选择是 `--suffix=.txt`。 将此留空将删除 `.patch` 后缀。"
 
#. type: Plain text
#: en/git-format-patch.txt:373
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
msgstr ""
msgstr "请注意，前导字符不一定是点；例如，你可以使用 `--suffix=-patch` 来获得 `0001-description-of-my-change-patch`。"
 
#. type: Plain text
#: en/git-format-patch.txt:377
#, priority:100
msgid "Do not print the names of the generated files to standard output."
msgstr ""
msgstr "不要将生成的文件名打印到标准输出。"
 
#. type: Labeled list
#: en/git-format-patch.txt:378
......@@ -27728,7 +27728,7 @@ msgstr "--no-binary"
#: en/git-format-patch.txt:383
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
msgstr ""
msgstr "不输出二进制文件中的变化内容，而是显示这些文件变化的通知。 使用该选项生成的补丁不能被正确应用，但它们对代码审查仍然有用。"
 
#. type: Labeled list
#: en/git-format-patch.txt:384
......@@ -27740,7 +27740,7 @@ msgstr "--zero-commit"
#: en/git-format-patch.txt:387
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
msgstr ""
msgstr "在每个补丁的 From 头中输出一个全零的哈希值，而不是提交的哈希值。"
 
#. type: Labeled list
#: en/git-format-patch.txt:388
......@@ -27753,25 +27753,25 @@ msgstr "--[no-]base[=<commit>]"
#: en/git-format-patch.txt:394
#, priority:100
msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen. The `--no-base` option overrides a `format.useAutoBase` configuration."
msgstr ""
msgstr "记录基树信息，以确定该补丁系列所适用的状态。 详见下面的基树信息部分。如果 <提交> 是 \"auto\"，就会自动选择一个基数提交。`--no-base` 选项会覆盖 `format.useAutoBase` 配置。"
 
#. type: Plain text
#: en/git-format-patch.txt:401
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
msgstr ""
msgstr "将修订版参数视为 <revision range>，即使它只是一个单一的提交（通常会被视为 <since>）。 注意，包含在指定范围内的根提交总是被格式化为创建补丁，与此标志无关。"
 
#. type: Plain text
#: en/git-format-patch.txt:404
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
msgstr "在生成补丁时在标准错误流上显示进度报告。"
 
#. type: Plain text
#: en/git-format-patch.txt:412
#, priority:100
msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
msgstr ""
msgstr "你可以指定额外的邮件标题行添加到每封邮件中，主题前缀和文件后缀的默认值，在输出多个补丁时对补丁进行编号，添加 \"To: \" 或 \"Cc: \" 标题，配置附件，更改补丁输出目录，以及用配置变量签署补丁。"
 
#. type: delimited block -
#: en/git-format-patch.txt:426
......@@ -27807,7 +27807,7 @@ msgstr ""
#: en/git-format-patch.txt:435
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
msgstr ""
msgstr "由 'git format-patch' 产生的补丁是 UNIX 邮箱格式，有一个固定的 \"magic\" 时间戳，以表明该文件是由 format-patch 输出的，而不是一个真正的邮箱，像这样："
 
#. type: delimited block -
#: en/git-format-patch.txt:445
......@@ -27821,7 +27821,7 @@ msgid ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgstr ""
msgstr "From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\nFrom: Tony Luck <tony.luck@intel.com>\nDate: Tue, 13 Jul 2010 11:42:54 -0700\nSubject: [PATCH] =?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=\n =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20diet?=\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
#. type: delimited block -
#: en/git-format-patch.txt:448
......@@ -27829,7 +27829,7 @@ msgstr ""
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"(See commit c2330e286f68f1c408b4aa6515ba49d57f05beae comment)\n"
msgstr ""
msgstr "arch/arm config files were slimmed down using a python script\n(见提交 c2330e286f68f1c408b4aa6515ba49d57f05beae 评论)\n"
 
#. type: delimited block -
#: en/git-format-patch.txt:451
......@@ -27837,19 +27837,19 @@ msgstr ""
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
msgstr ""
msgstr "为 ia64 做同样的事情，这样我们就可以有光滑和修长的外观了。\n...\n"
 
#. type: Plain text
#: en/git-format-patch.txt:459
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
msgstr ""
msgstr "通常情况下，它会被放在 MUA 的 drafts 文件夹中，被编辑以添加及时的评论，这些评论不应该被放在 changelog 中的三个破折号之后，然后以消息的形式发送，在我们的例子中，其正文以 \"arch/arm config files were...\" 开始。 在接收端，读者可以将有趣的补丁保存在 UNIX 邮箱中，并通过 linkgit:git-am[1] 应用它们。"
 
#. type: Plain text
#: en/git-format-patch.txt:465
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
msgstr ""
msgstr "当一个补丁是正在进行的讨论的一部分时，由 'git format-patch' 生成的补丁可以进行调整，以利用 'git am --scissors' 功能。 在你对讨论的回应之后，有一行只由 \"`-- >8 --`\"（剪刀和打孔）组成，后面是去除不必要的头域的补丁："
 
#. type: delimited block -
#: en/git-format-patch.txt:469
......@@ -27865,7 +27865,7 @@ msgstr ""
#: en/git-format-patch.txt:471
#, no-wrap, priority:100
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
msgstr "对我来说是有意义的。 这个补丁怎么样？\n"
 
#. type: delimited block -
#: en/git-format-patch.txt:474
......@@ -27873,7 +27873,7 @@ msgstr ""
msgid ""
"-- >8 --\n"
"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
msgstr "-- >8 --\nSubject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
 
#. type: delimited block -
#: en/git-format-patch.txt:477
......@@ -27881,61 +27881,61 @@ msgstr ""
msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
msgstr ""
msgstr "使用 python 脚本对 arch/arm 配置文件进行了精简\n...\n"
 
#. type: Plain text
#: en/git-format-patch.txt:485
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
msgstr ""
msgstr "当用这种方式发送补丁时，大多数情况下是发送你自己的补丁，所以除了 \"`From $SHA1 $magic_timestamp`\" 标记外，你应该从补丁文件中省略 `From: ` 和 `Date: ` 行。 补丁的标题很可能与补丁所回应的讨论主题不同，所以很可能要保留 Subject: 这一行，就像上面的例子一样。"
 
#. type: Title ~
#: en/git-format-patch.txt:487
#, no-wrap, priority:100
msgid "Checking for patch corruption"
msgstr ""
msgstr "检查补丁是否损坏"
 
#. type: Plain text
#: en/git-format-patch.txt:490
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
msgstr ""
msgstr "许多邮件如果设置不当就会破坏空白。 以下是两种常见的损坏类型："
 
#. type: Plain text
#: en/git-format-patch.txt:492
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
msgstr "没有「任何」空格的空的上下文行。"
 
#. type: Plain text
#: en/git-format-patch.txt:495
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
msgstr "非空的上下文行，在开头有一个额外的空白。"
 
#. type: Plain text
#: en/git-format-patch.txt:497
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
msgstr "测试你的 MUA 是否设置正确的一个方法是："
 
#. type: Plain text
#: en/git-format-patch.txt:501
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
msgstr ""
msgstr "将补丁发送给自己，完全按照你的方式，只是在 To: 和 Cc: 行中不包含列表和维护者地址。"
 
#. type: Plain text
#: en/git-format-patch.txt:504
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
msgstr ""
msgstr "将该补丁保存为 UNIX 邮箱格式的文件。 称之为 a.patch，例如。"
 
#. type: Plain text
#: en/git-format-patch.txt:506
#, priority:100
msgid "Apply it:"
msgstr ""
msgstr "应用它："
 
#. type: Plain text
#: en/git-format-patch.txt:511
......@@ -27955,37 +27955,37 @@ msgstr ""
#: en/git-format-patch.txt:513
#, priority:100
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
msgstr "如果它不能正确应用，可能有各种原因。"
 
#. type: Plain text
#: en/git-format-patch.txt:518
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
msgstr ""
msgstr "补丁本身不能干净地应用。 这很糟糕，但与你的 MUA 没有多大关系。 在这种情况下，你可能要先用 linkgit:git-rebase[1] 把补丁重新归位，再重新生成。"
 
#. type: Plain text
#: en/git-format-patch.txt:523
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
msgstr ""
msgstr "MUA 损坏了你的补丁；\"am\" 会抱怨补丁不适用。 查看 .git/rebase-apply/ 子目录，看看 \"补丁\" 文件包含哪些内容，并检查上面提到的常见损坏模式。"
 
#. type: Plain text
#: en/git-format-patch.txt:531
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
msgstr ""
msgstr "同时，还要检查 'info' 和 'final-commit' 文件。 如果 'final-commit' 中的内容与你希望在提交日志信息中看到的不完全一样，那么很可能接收者在应用你的补丁时最终会手工编辑日志信息。 补丁邮件中的 \"Hi, this is my first patch.\\n\" 等内容应该出现在提交信息末尾的三折线之后。"
 
#. type: Title -
#: en/git-format-patch.txt:533
#, no-wrap, priority:100
msgid "MUA-SPECIFIC HINTS"
msgstr ""
msgstr "针对 Mua 的提示"
 
#. type: Plain text
#: en/git-format-patch.txt:536
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
msgstr ""
msgstr "这里有一些关于如何使用各种邮件工具成功地在线提交补丁的提示。"
 
#. type: Title ~
#: en/git-format-patch.txt:538
......@@ -27997,19 +27997,19 @@ msgstr "GMail"
#: en/git-format-patch.txt:544
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
msgstr ""
msgstr "GMail 没有办法在网页界面上关闭换行，所以它会把你发送的任何邮件弄得一团糟。 然而，你可以使用 \"git send-email\"，通过 GMail 的 SMTP 服务器发送你的补丁，或者使用任何 IMAP 电子邮件客户端连接到谷歌的 IMAP 服务器，并通过它转发电子邮件。"
 
#. type: Plain text
#: en/git-format-patch.txt:547
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
msgstr ""
msgstr "关于使用 'git send-email' 通过 GMail SMTP 服务器发送补丁的提示，请参见 linkgit:git-send-email[1] 的案例部分。"
 
#. type: Plain text
#: en/git-format-patch.txt:550
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
msgstr ""
msgstr "关于使用 IMAP 接口提交的提示，请参见 linkgit:git-imap-send[1] 的案例部分。"
 
#. type: Title ~
#: en/git-format-patch.txt:552
......@@ -28021,103 +28021,103 @@ msgstr "ThunderbirdName"
#: en/git-format-patch.txt:556
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
msgstr "默认情况下，Thunderbird 会将邮件包裹起来，并将其标记为 'format=flowed'，这两种情况都会使 Git 无法使用这些邮件。"
 
#. type: Plain text
#: en/git-format-patch.txt:560
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
msgstr ""
msgstr "有三种不同的方法：使用插件来关闭换行，配置 Thunderbird 使其不纠缠补丁，或者使用外部编辑器来防止 Thunderbird 纠缠补丁。"
 
#. type: Title ^
#: en/git-format-patch.txt:562
#, no-wrap, priority:100
msgid "Approach #1 (add-on)"
msgstr ""
msgstr "办法1（附加的）"
 
#. type: Plain text
#: en/git-format-patch.txt:570
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
msgstr ""
msgstr "安装 Toggle Word Wrap 插件，该插件可从 https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/。它在作曲家的 \"选项\" 菜单中增加了一个 \"启用换行符\" 的菜单项，你可以将其勾掉。现在你可以像其他方式一样编写信息（剪切+粘贴，'git format-patch'|'git imap-send'，等等），但你必须在你输入的任何文本中手动插入换行符。"
 
#. type: Title ^
#: en/git-format-patch.txt:572
#, no-wrap, priority:100
msgid "Approach #2 (configuration)"
msgstr ""
msgstr "方法#2（配置）"
 
#. type: Plain text
#: en/git-format-patch.txt:574
#, priority:100
msgid "Three steps:"
msgstr ""
msgstr "三个步骤："
 
#. type: Plain text
#: en/git-format-patch.txt:578
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
msgstr ""
msgstr "将你的邮件服务器组成配置为纯文本： 编辑......账户设置......组成和地址，取消勾选 \"以HTML编写邮件\"。"
 
#. type: Plain text
#: en/git-format-patch.txt:580
#, priority:100
msgid "Configure your general composition window to not wrap."
msgstr ""
msgstr "配置你的一般组成窗口，使其不被包裹。"
 
#. type: Plain text
#: en/git-format-patch.txt:583
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
msgstr ""
msgstr "在 Thunderbird 2 中：编辑...偏好...组成，将纯文本信息包在 0 处"
 
#. type: Plain text
#: en/git-format-patch.txt:589
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
msgstr ""
msgstr "在 Thunderbird 3 中：编辑...偏好...高级...配置编辑器。 搜索 \"mail.wrap_long_lines\"。 切换它，确保它被设置为 \"false\"。另外，搜索 \"mailnews.wraplength\" 并将其设置为 0。"
 
#. type: Plain text
#: en/git-format-patch.txt:594
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
msgstr ""
msgstr "禁止使用 format=flowed： 编辑...偏好...高级...配置编辑器。 搜索 \"mailnews.send_plaintext_flowed\"。 拨动它，确保它被设置为 `false`。"
 
#. type: Plain text
#: en/git-format-patch.txt:598
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
msgstr ""
msgstr "完成后，你应该能够像其他方式一样编写电子邮件（剪切+粘贴，'git format-patch' | 'git imap-send'，等等），而且补丁不会被弄乱。"
 
#. type: Title ^
#: en/git-format-patch.txt:600
#, no-wrap, priority:100
msgid "Approach #3 (external editor)"
msgstr ""
msgstr "方法三（外部编辑）"
 
#. type: Plain text
#: en/git-format-patch.txt:605
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
msgstr ""
msgstr "需要以下 Thunderbird 扩展： http://aboutconfig.mozdev.org/ 中的 AboutConfig和http://globs.org/articles.php?lng=en&pg=8 中的 External Editor"
 
#. type: Plain text
#: en/git-format-patch.txt:607
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
msgstr "用你选择的方法把补丁准备成一个文本文件。"
 
#. type: Plain text
#: en/git-format-patch.txt:612
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
msgstr ""
msgstr "在打开撰写窗口之前，使用 Edit->Account Settingd 取消勾选要用来发送补丁的账户的 \"Composition & Addressing\" 面板中的 \"Compose messages in HTML format\" 设置。"
 
#. type: Plain text
#: en/git-format-patch.txt:616
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
msgstr "在 Thunderbird 主窗口中，在你打开补丁的撰写窗口之前，使用 Tools->about:config 将以下内容设置为指定值："
 
#. type: delimited block -
#: en/git-format-patch.txt:620
......@@ -28125,25 +28125,25 @@ msgstr ""
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
"\tmailnews.wraplength => 0\n"
msgstr ""
msgstr "\tmailnews.send_plaintext_flowed => false\n\tmailnews.wraplength => 0\n"
 
#. type: Plain text
#: en/git-format-patch.txt:623
#, priority:100
msgid "Open a compose window and click the external editor icon."
msgstr ""
msgstr "打开一个作曲窗口，点击外部编辑器图标。"
 
#. type: Plain text
#: en/git-format-patch.txt:626
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
msgstr ""
msgstr "在外部编辑器窗口，读入补丁文件并正常退出编辑器。"
 
#. type: Plain text
#: en/git-format-patch.txt:629
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
msgstr ""
msgstr "题外话：也许可以用 about:config 和以下设置来完成第二步，但还没有人试过。"
 
#. type: delimited block -
#: en/git-format-patch.txt:634
......@@ -28152,13 +28152,13 @@ msgid ""
"\tmail.html_compose => false\n"
"\tmail.identity.default.compose_html => false\n"
"\tmail.identity.id?.compose_html => false\n"
msgstr ""
msgstr "\tmail.html_compose => false\n\tmail.identity.default.compose_html => false\n\tmail.identity.id?.compose_html => false\n"
 
#. type: Plain text
#: en/git-format-patch.txt:639
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
msgstr ""
msgstr "contrib/thunderbird-patch-inline 中有一个脚本，可以帮助你以一种简单的方式将补丁加入 Thunderbird。要使用它，请执行上面的步骤，然后使用该脚本作为外部编辑器。"
 
#. type: Title ~
#: en/git-format-patch.txt:641
......@@ -28170,55 +28170,55 @@ msgstr "KMail"
#: en/git-format-patch.txt:643
#, priority:100
msgid "This should help you to submit patches inline using KMail."
msgstr ""
msgstr "这应该有助于你使用 KMail 在线提交补丁。"
 
#. type: Plain text
#: en/git-format-patch.txt:645
#, priority:100
msgid "Prepare the patch as a text file."
msgstr ""
msgstr "把补丁准备成一个文本文件。"
 
#. type: Plain text
#: en/git-format-patch.txt:647
#, priority:100
msgid "Click on New Mail."
msgstr ""
msgstr "点击 \"New Mail\"。"
 
#. type: Plain text
#: en/git-format-patch.txt:650
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
msgstr ""
msgstr "在合成器窗口的 \"Otions\" 下，确保没有设置 \"Word warp\"。"
 
#. type: Plain text
#: en/git-format-patch.txt:652
#, ignore-ellipsis, priority:100
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
msgstr "Use Message -> Insert file... 并插入补丁。"
 
#. type: Plain text
#: en/git-format-patch.txt:655
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
msgstr ""
msgstr "回到撰写窗口：在信息中添加你想要的任何其他文本，完成地址和主题字段，然后按发送。"
 
#. type: Title -
#: en/git-format-patch.txt:657
#, no-wrap, priority:100
msgid "BASE TREE INFORMATION"
msgstr ""
msgstr "基准树信息"
 
#. type: Plain text
#: en/git-format-patch.txt:666
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
msgstr ""
msgstr "基准树信息块用于维护者或第三方测试人员了解补丁系列所适用的确切状态。它由 ‘基本提交’ 和零个或多个 ‘前提补丁’ 组成，前者是众所周知的提交，是项目历史中稳定部分的一部分，而后者是正在运行的知名补丁，还不是 ‘基本提交’ 的一部分，在应用这些补丁之前需要在 ‘基本提交’ 之上按拓扑顺序应用。"
 
#. type: Plain text
#: en/git-format-patch.txt:672
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
msgstr ""
msgstr "‘基本提交’ 显示为 \"base-commit: \"，后面是提交对象名称的 40-hex。 ‘先决补丁’ 显示为 \"prerequisite-patch-id: \"，后面是 40-hex 的 “补丁ID”，这个 ID 可以通过 `git patch-id --stable` 命令来获得。"
 
#. type: Plain text
#: en/git-format-patch.txt:676
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr