documentation.zh_HANS-CN.po

#. type: Labeled list
#: en/config/merge.txt:92
#, ignore-same, no-wrap, priority:240
msgid "merge.tool"
msgstr "merge.tool"

#. type: Plain text
#: en/config/merge.txt:97
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1].  The list below shows the valid built-in values.  Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
msgstr "控制linkgit:git-mergetool[1]使用哪个合并工具。  下面的列表显示了有效的内置值。  任何其他值都被视为自定义的合并工具，需要定义一个相应的mergetool.<tool>.cmd变量。"

#. type: Labeled list
#: en/config/merge.txt:98
#, ignore-same, no-wrap, priority:240
msgid "merge.guitool"
msgstr "merge.guitool"

#. type: Plain text
#: en/config/merge.txt:103
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values.  Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined."
msgstr "控制linkgit:git-mergetool[1]在指定-g/-gui标志时使用的合并工具。下面的列表显示了有效的内置值。  任何其他值都被视为自定义的合并工具，需要定义一个相应的mergetool.<guitool>.cmd变量。"

#. type: Labeled list
#: en/config/merge.txt:106
#, ignore-same, no-wrap, priority:240
msgid "merge.verbosity"
msgstr "merge.verbosity"

#. type: Plain text
#: en/config/merge.txt:113
#, priority:240
msgid "Controls the amount of output shown by the recursive merge strategy.  Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes.  Level 5 and above outputs debugging information.  The default is level 2.  Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr "控制递归合并策略所显示的输出量。  0级除了在检测到冲突时有一个最终的错误信息外，什么都不输出。1级只输出冲突，2级输出冲突和文件变化。  5级及以上输出调试信息。  默认是第2级。  可以通过`GIT_MERGE_VERBOSITY`环境变量覆盖。"

#. type: Labeled list
#: en/config/merge.txt:114
#, no-wrap, priority:240
msgid "merge.<driver>.name"
msgstr "合并.<driver>.name"

#. type: Plain text
#: en/config/merge.txt:117
#, priority:240
msgid "Defines a human-readable name for a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
msgstr "为自定义的低级合并驱动定义了一个人类可读的名字。  详情见 linkgit:gitattributes[5]。"

#. type: Labeled list
#: en/config/merge.txt:118
#, no-wrap, priority:240
msgid "merge.<driver>.driver"
msgstr "merge.<driver>.driver"

#. type: Plain text
#: en/config/merge.txt:121
#, priority:240
msgid "Defines the command that implements a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
msgstr "定义实现自定义低级合并驱动程序的命令。详见链接git:gitattributes[5]。"

#. type: Labeled list
#: en/config/merge.txt:122
#, fuzzy, no-wrap, priority:240
msgid "merge.<driver>.recursive"
msgstr "merge.<driver>.recursive"

#. type: Plain text
#: en/config/merge.txt:125
#, priority:240
msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors.  See linkgit:gitattributes[5] for details."
msgstr "在执行共同祖先之间的内部合并时，命名一个低级别的合并驱动。  详情见 linkgit:gitattributes[5]。"

#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
#, ignore-same, no-wrap, priority:240
msgid "merge.branchdesc"
msgstr "merge.branchdesc"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:5
#, fuzzy, priority:240
msgid "In addition to branch names, populate the log message with the branch description text associated with them.  Defaults to false."
msgstr "除了分支名称之外，还使用与其关联的分支描述文本填充日志消息。默认为 false。"

#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
#, ignore-same, no-wrap, priority:240
msgid "merge.log"
msgstr "merge.log"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:11
#, fuzzy, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged.  Defaults to false, and true is a synonym for 20."
msgstr "除了分支名称外，在日志信息中最多加入指定数量的被合并的实际提交的单行描述。  默认为false，true是20的同义词。"

#. type: Labeled list
#: en/config/fmt-merge-msg.txt:12
#, ignore-same, no-wrap, priority:240
msgid "merge.suppressDest"
msgstr "merge.suppressDest"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:18
#, fuzzy, priority:240
msgid "By adding a glob that matches the names of integration branches to this multi-valued configuration variable, the default merge message computed for merges into these integration branches will omit \"into <branch name>\" from its title."
msgstr "通过向这个多值配置变量添加一个匹配集成分支名称的 glob，为合并到这些集成分支计算的默认合并消息将在其标题中省略“into <branch name>”。"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:22
#, priority:240
msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries.  When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility."
msgstr "一个空值的元素可以用来清除以前配置项积累的globs列表。  当没有定义`merge.suppressDest`变量时，为了向后兼容，会使用默认值`master`。"

#. type: Title -
#: en/date-formats.txt:2
#, fuzzy, no-wrap, priority:280
msgid "DATE FORMATS"
msgstr "日期格式"

#. type: Plain text
#: en/date-formats.txt:6
#, fuzzy, priority:280
msgid "The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support the following date formats:"
msgstr "`GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` 环境变量"

#. type: Labeled list
#: en/date-formats.txt:7
#, fuzzy, no-wrap, priority:280
msgid "Git internal format"
msgstr "Git 内部格式"

#. type: Plain text
#: en/date-formats.txt:12
#, fuzzy, priority:280
msgid "It is `<unix-timestamp> <time-zone-offset>`, where `<unix-timestamp>` is the number of seconds since the UNIX epoch.  `<time-zone-offset>` is a positive or negative offset from UTC.  For example CET (which is 1 hour ahead of UTC) is `+0100`."
msgstr "`<unix  时间戳> <时区偏移量>`，其中 `<unix 时间戳>` 是自 UNIX epoch 以来的秒数。 `<时区偏移量>` 是相对于 UTC 的正或负偏移量。例如，CET（比 UTC 提前1小时）为 `+0100`。"

#. type: Labeled list
#: en/date-formats.txt:13
#, fuzzy, no-wrap, priority:280
msgid "RFC 2822"
msgstr "RFC 2822"

#. type: Plain text
#: en/date-formats.txt:16
#, fuzzy, priority:280
msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`."
msgstr "由 RFC 2822 描述的标准电子邮件格式，例如 `Thu, 07 Apr 2005 22:13:13 +0200`。"

#. type: Labeled list
#: en/date-formats.txt:17
#, fuzzy, no-wrap, priority:280
msgid "ISO 8601"
msgstr "ISO 8601"

#. type: Plain text
#: en/date-formats.txt:23
#, fuzzy, priority:280
#| msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr "ISO 8601 标准规定的时间和日期，例如 `2005-04-07T22:13:13`。解析器也接受将 `T` 替换为空格。"

#. type: Plain text
#: en/date-formats.txt:26
#, fuzzy, priority:280
msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr "此外，日期部分还接受以下格式：`YYYY.MM.DD`，`MM/DD/YYYY` 和 `DD.MM.YYYY`。"

#. type: Plain text
#: en/date-formats.txt:31
#, priority:280
msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"."
msgstr "除了识别上述所有日期格式外，`--date` 选项还将尝试理解其它非标准化的日期格式，如 \"昨天\" 或 \"上周五中午\" 等相对日期。"

#. type: Title -
#: en/diff-format.txt:2
#, fuzzy, no-wrap, priority:280
msgid "Raw output format"
msgstr "原始输出格式"

#. type: Plain text
#: en/diff-format.txt:6
#, fuzzy, priority:280
msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
msgstr "\"git-diff-index\"，\"git-diff-tree\"，\"git-diff-files\" 和 \"git diff --raw\" 的原始输出格式非常相似。"

#. type: Plain text
#: en/diff-format.txt:9
#, fuzzy, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
msgstr "这些命令都比较两组事物。但比较的内容有所不同："

#. type: Labeled list
#: en/diff-format.txt:10
#, no-wrap, priority:280
msgid "git-diff-index <tree-ish>"
msgstr "git-diff-index <tree-ish>"

#. type: Plain text
#: en/diff-format.txt:12
#, fuzzy, priority:280
msgid "compares the <tree-ish> and the files on the filesystem."
msgstr "比较 <文件树> 和文件系统上的文件。"

#. type: Labeled list
#: en/diff-format.txt:13
#, no-wrap, priority:280
msgid "git-diff-index --cached <tree-ish>"
msgstr "git-diff-index --cached <tree-ish>"

#. type: Plain text
#: en/diff-format.txt:15
#, fuzzy, priority:280
msgid "compares the <tree-ish> and the index."
msgstr "比较 <文件树> 和索引。"

#. type: Labeled list
#: en/diff-format.txt:16
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"

#. type: Plain text
#: en/diff-format.txt:18
#, fuzzy, priority:280
msgid "compares the trees named by the two arguments."
msgstr "比较由两个参数传递的文件树。"

#. type: Labeled list
#: en/diff-format.txt:19
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
msgstr "git-diff-files [<pattern>...]"

#. type: Plain text
#: en/diff-format.txt:21
#, fuzzy, priority:280
msgid "compares the index and the files on the filesystem."
msgstr "比较索引和文件系统上的文件。"

#. type: Plain text
#: en/diff-format.txt:25
#, fuzzy, priority:280
msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file."
msgstr "\"git-diff-tree\" 命令在最开始输出被比较对象的哈希值。之后，所有命令都会为每个更改的文件打印一个输出行。"

#. type: Plain text
#: en/diff-format.txt:27
#, fuzzy, priority:280
msgid "An output line is formatted this way:"
msgstr "输出行的格式如下："

#. type: delimited block -
#: en/diff-format.txt:35
#, fuzzy, no-wrap, priority:280
msgid ""
"in-place edit  :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\n"
"rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\n"
"create         :000000 100644 0000000 1234567 A file4\n"
"delete         :100644 000000 1234567 0000000 D file5\n"
"unmerged       :000000 000000 0000000 0000000 U file6\n"
msgstr ""
"in-place edit  :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\n"
"rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\n"
"create         :000000 100644 0000000 1234567 A file4\n"
"delete         :100644 000000 1234567 0000000 D file5\n"
"unmerged       :000000 000000 0000000 0000000 U file6\n"

#. type: Plain text
#: en/diff-format.txt:38
#, fuzzy, priority:280
msgid "That is, from the left to the right:"
msgstr "含义如下，从左到右依次："

#. type: Plain text
#: en/diff-format.txt:40
#, fuzzy, priority:280
msgid "a colon."
msgstr "冒号。"

#. type: Plain text
#: en/diff-format.txt:41
#, fuzzy, priority:280
msgid "mode for \"src\"; 000000 if creation or unmerged."
msgstr "\"src\"（源文件）的模式；如果是新建或是未合并的，则为 000000。"

#. type: Plain text
#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
#, fuzzy, priority:280
msgid "a space."
msgstr "空格。"

#. type: Plain text
#: en/diff-format.txt:43
#, fuzzy, priority:280
msgid "mode for \"dst\"; 000000 if deletion or unmerged."
msgstr "\"dst\"(目标文件）的模式；如果被删除或未合并则为 000000。"

#. type: Plain text
#: en/diff-format.txt:45
#, fuzzy, priority:280
msgid "sha1 for \"src\"; 0\\{40\\} if creation or unmerged."
msgstr "\"src\"（源文件）的 sha1 值；如果为新建或未合并则为 0\\{40\\}。"

#. type: Plain text
#: en/diff-format.txt:47
#, fuzzy, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if deletion, unmerged or \"work tree out of sync with the index\"."
msgstr "\"dst\"（目标文件）的 sha1 值；如果为新建、未合并或 \"参见工作树\"，则为 0\\{40\\}。"

#. type: Plain text
#: en/diff-format.txt:49
#, fuzzy, priority:280
msgid "status, followed by optional \"score\" number."
msgstr "状态，在可选值 \"score\" 之后。"

#. type: Plain text
#: en/diff-format.txt:50
#, fuzzy, priority:280
msgid "a tab or a NUL when `-z` option is used."
msgstr "当使用 `-z` 选项时为制表符或 NUL。"

#. type: Plain text
#: en/diff-format.txt:51
#, fuzzy, priority:280
msgid "path for \"src\""
msgstr "\"src\" 的路径"

#. type: Plain text
#: en/diff-format.txt:52
#, fuzzy, priority:280
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
msgstr "使用 `-z` 选项时为制表符或 NUL；仅当状态为 C 或 R 时存在。"

#. type: Plain text
#: en/diff-format.txt:53
#, fuzzy, priority:280
msgid "path for \"dst\"; only exists for C or R."
msgstr "\"dst\" 的路径；仅当状态为 C 或 R 时存在。"

#. type: Plain text
#: en/diff-format.txt:54
#, fuzzy, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
msgstr "当使用 `-z` 选项时为 LF 或 NUL，用于终止记录。"

#. type: Plain text
#: en/diff-format.txt:56
#, fuzzy, priority:280
msgid "Possible status letters are:"
msgstr "可能的状态字母为："

#. type: Plain text
#: en/diff-format.txt:58
#, fuzzy, priority:280
msgid "A: addition of a file"
msgstr "A：文件新增部分"

#. type: Plain text
#: en/diff-format.txt:59
#, fuzzy, priority:280
msgid "C: copy of a file into a new one"
msgstr "C：复制到一个新文件"

#. type: Plain text
#: en/diff-format.txt:60
#, fuzzy, priority:280
msgid "D: deletion of a file"
msgstr "D：文件删除部分"

#. type: Plain text
#: en/diff-format.txt:61
#, fuzzy, priority:280
msgid "M: modification of the contents or mode of a file"
msgstr "M：文件内容或文件模式修改"

#. type: Plain text
#: en/diff-format.txt:62
#, fuzzy, priority:280
msgid "R: renaming of a file"
msgstr "R：文件重命名"

#. type: Plain text
#: en/diff-format.txt:63
#, fuzzy, priority:280
msgid "T: change in the type of the file (regular file, symbolic link or submodule)"
msgstr "T：文件类型改变"

#. type: Plain text
#: en/diff-format.txt:65
#, fuzzy, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
msgstr "U：文件未合并（你必须在提交之前完成合并）"

#. type: Plain text
#: en/diff-format.txt:66
#, fuzzy, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
msgstr "X：\"unknown\"（未知）更改类型（可能为错误，请报告）"

#. type: Plain text
#: en/diff-format.txt:71
#, fuzzy, priority:280
msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy).  Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites."
msgstr "状态字母 C 和 R 后面总是一个分数（表示移动或复制的源与目标之间的相似性百分比）。状态字母M后面可能有文件重写的分数（表示相异百分比）。"

#. type: Plain text
#: en/diff-format.txt:74
#, fuzzy, priority:280
msgid "The sha1 for \"dst\" is shown as all 0's if a file on the filesystem is out of sync with the index."
msgstr "如果文件是文件系统上的新文件，并且与索引不同步，则 <sha1> 将显示为全0。"

#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
#, fuzzy, no-wrap, priority:280
msgid "Example:"
msgstr "例如："

#. type: delimited block -
#: en/diff-format.txt:79
#, fuzzy, no-wrap, priority:280
msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"

#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:255 en/git-ls-tree.txt:134
#, fuzzy, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]).  Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
msgstr "如果没有 `-z` 选项，带 \"不常见\" 字符的路径名会被加上引号，正如配置变量 \"core.quotePath\" 所解释的那样（参见 linkgit:git-config[1]）。  使用 `-z` 选项，文件名将被逐字输出，并以 NUL 字节结束。"

#. type: Title -
#: en/diff-format.txt:87
#, fuzzy, no-wrap, priority:280
msgid "diff format for merges"
msgstr "合并的差异格式"

#. type: Plain text
#: en/diff-format.txt:93
#, fuzzy, priority:280
msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits.  The output differs from the format described above in the following way:"
msgstr "\"git-diff-tree\"、\"git-diff-files\" 和 \"git-diff --raw\" 可以使用 `-c` 或 `--cc` 选项来生成差异输出，也可以用于合并提交。其输出与上面描述的格式有以下不同："

#. type: Plain text
#: en/diff-format.txt:95
#, fuzzy, priority:280
msgid "there is a colon for each parent"
msgstr "每个父提交都有一个冒号"

#. type: Plain text
#: en/diff-format.txt:96
#, fuzzy, priority:280
msgid "there are more \"src\" modes and \"src\" sha1"
msgstr "有更多的 \"src\" 文件模式和 \"src\" sha1"

#. type: Plain text
#: en/diff-format.txt:97
#, fuzzy, priority:280
msgid "status is concatenated status characters for each parent"
msgstr "状态是每个父提交的状态字符的合并"

#. type: Plain text
#: en/diff-format.txt:98
#, fuzzy, priority:280
msgid "no optional \"score\" number"
msgstr "无可选的分数（\"score\"）数字"

#. type: Plain text
#: en/diff-format.txt:99
#, fuzzy, priority:280
msgid "tab-separated pathname(s) of the file"
msgstr "以制表符分隔的文件路径名"

#. type: Plain text
#: en/diff-format.txt:104
#, fuzzy, priority:280
msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history.  With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit."
msgstr "对于 `-c` 和 `--cc` 选项，即使文件在历史中的任何一边被重命名，也只显示目标路径或最终路径。使用 `--combined-all-paths` 选项，则每个父提交中的路径名称会在合并提交中的路径名称后面显示。"

#. type: Plain text
#: en/diff-format.txt:106
#, fuzzy, priority:280
msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
msgstr "以下为带 `-c` 和 `--cc` 选项且不带 `--combined-all-paths` 选项的示例："

#. type: delimited block -
#: en/diff-format.txt:110
#, fuzzy, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"
msgstr ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"

#. type: Plain text
#: en/diff-format.txt:113
#, fuzzy, priority:280
msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
msgstr "以下为使用 `--combined-all-paths` 选项且使用 `-c` 或 `--cc` 选项的示例:"

#. type: delimited block -
#: en/diff-format.txt:118
#, fuzzy, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
msgstr ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"

#. type: Plain text
#: en/diff-format.txt:122
#, fuzzy, priority:280
msgid "Note that 'combined diff' lists only files which were modified from all parents."
msgstr "请注意 'combined diff' 只列出了从所有父提交中修改过的文件。"

#. type: Title -
#: en/diff-format.txt:128
#, fuzzy, no-wrap, priority:280
msgid "other diff formats"
msgstr "其他差异格式"

#. type: Plain text
#: en/diff-format.txt:134
#, fuzzy, priority:280
msgid "The `--summary` option describes newly added, deleted, renamed and copied files.  The `--stat` option adds diffstat(1) graph to the output.  These options can be combined with other options, such as `-p`, and are meant for human consumption."
msgstr "`--summary` 选项描述新添加、删除、重命名和复制的文件。`--stat` 选项将 diffstat(1) 图添加到输出中。这些选项可以与其他选项组合在一起，如 `-p` 选项可以提高可读性。"

#. type: Plain text
#: en/diff-format.txt:139
#, fuzzy, priority:280
msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames.  For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr "当显示一个涉及到重命名或复制的更改时，`--stat` 输出会将路径名的前缀和后缀结合在一起，会以较紧凑的方式显示。例如，将 \"arch/i386/Makefile\" 移动到 \"arch/x86/Makefile\"，同时修改了4行，就会显示出这样的变化："

#. type: delimited block -
#: en/diff-format.txt:142
#, fuzzy, no-wrap, priority:280
msgid "arch/{i386 => x86}/Makefile    |   4 +--\n"
msgstr "arch/{i386 => x86}/Makefile    |   4 +--\n"

#. type: Plain text
#: en/diff-format.txt:147
#, fuzzy, priority:280
msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption.  An entry in `--numstat` output looks like this:"
msgstr "`--numstat` 选项提供了 diffstat(1) 的信息，但其是为了方便程序使用而设计的。`--numstat` 输出中的一个条目如下："

#. type: delimited block -
#: en/diff-format.txt:151
#, fuzzy, no-wrap, priority:280
msgid ""
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"
msgstr ""
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"

#. type: Plain text
#: en/diff-format.txt:154
#, fuzzy, priority:280
msgid "That is, from left to right:"
msgstr "从左至右依次是："

#. type: Plain text
#: en/diff-format.txt:156 en/diff-format.txt:172
#, fuzzy, priority:280
msgid "the number of added lines;"
msgstr "添加的行数；"

#. type: Plain text
#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175
#, fuzzy, priority:280
msgid "a tab;"
msgstr "制表符；"

#. type: Plain text
#: en/diff-format.txt:158 en/diff-format.txt:174
#, priority:280
msgid "the number of deleted lines;"
msgstr "已删除行数;"

#. type: Plain text
#: en/diff-format.txt:160
#, fuzzy, priority:280
msgid "pathname (possibly with rename/copy information);"
msgstr "路径名（可能有重命名/复制信息）；"

#. type: Plain text
#: en/diff-format.txt:161
#, fuzzy, priority:280
msgid "a newline."
msgstr "换行符。"

#. type: Plain text
#: en/diff-format.txt:163
#, fuzzy, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
msgstr "当 `-z` 输出选项生效时，输出的格式如下："

#. type: delimited block -
#: en/diff-format.txt:167
#, fuzzy, no-wrap, priority:280
msgid ""
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
msgstr ""
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"

#. type: Plain text
#: en/diff-format.txt:170
#, fuzzy, priority:280
msgid "That is:"
msgstr "依次是："

#. type: Plain text
#: en/diff-format.txt:176 en/diff-format.txt:178
#, fuzzy, priority:280
msgid "a NUL (only exists if renamed/copied);"
msgstr "NUL（仅在重命名/复制时存在）；"

#. type: Plain text
#: en/diff-format.txt:177
#, fuzzy, priority:280
msgid "pathname in preimage;"
msgstr "完整路径名；"

#. type: Plain text
#: en/diff-format.txt:179
#, fuzzy, priority:280
msgid "pathname in postimage (only exists if renamed/copied);"
msgstr "完整路径名（仅在重命名/复制时存在）；"

#. type: Plain text
#: en/diff-format.txt:180
#, priority:280
msgid "a NUL."
msgstr "a NUL."

#. type: Plain text
#: en/diff-format.txt:185
#, fuzzy, priority:280
msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead.  After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
msgstr "在重命名的情况下，完整路径前多出的 `NUL` 为了让读取输出的脚本能够判断，当前被读取的记录是单路径记录还是重命名/复制记录，而不需要提前读取。在读完增删行数后，读至 `NUL` 会得到路径名，但如果先读到 `NUL`，记录将显示两个路径。"

#. type: Title -
#: en/diff-generate-patch.txt:3
#, no-wrap, priority:280
msgid "Generating patch text with -p"
msgstr "使用选项 `-p` 生成补丁文本"

#. type: Plain text
#: en/diff-generate-patch.txt:16
#, fuzzy, priority:280
#| msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text.  You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text.  You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5])."
msgstr "运行 linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], 或 linkgit:git-diff-files[1] 时带有 `-p` 选项会生成补丁文本。你可以通过 `GIT_EXTERNAL_DIFF` 和 `GIT_DIFF_OPTS` 环境变量来定制补丁文本创建（参见 linkgit:git[1]）。"

#. type: Plain text
#: en/diff-generate-patch.txt:19
#, priority:280
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr "-p 选项产生的内容与传统的差异格式略有不同："

#. type: Plain text
#: en/diff-generate-patch.txt:21
#, priority:280
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr "它前面有一个 `git diff` 头，如下所示："

#. type: Plain text
#: en/diff-generate-patch.txt:23
#, no-wrap, priority:280
msgid "diff --git a/file1 b/file2\n"
msgstr "diff --git a/file1 b/file2\n"

#. type: Plain text
#: en/diff-generate-patch.txt:27
#, priority:280
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved.  Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr "`a/` 和 `b/` 的文件名相同，除非涉及到重命名/复制。特别地，即使是创建或删除，也 _不_ 使用 `/dev/null` 来代替 `a/` 或 `b/` 文件名。"

#. type: Plain text
#: en/diff-generate-patch.txt:31
#, priority:280
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr "当涉及到重命名/复制时，`file1` 和 `file2` 分别显示重命名/复制的源文件的名称和重命名/复制产生的文件的名称。"

#. type: Plain text
#: en/diff-generate-patch.txt:33
#, priority:280
msgid "It is followed by one or more extended header lines:"
msgstr "它的后面是一个或多个扩展头信息行："

#. type: Plain text
#: en/diff-generate-patch.txt:45
#, no-wrap, priority:280
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
"deleted file mode <mode>\n"
"new file mode <mode>\n"
"copy from <path>\n"
"copy to <path>\n"
"rename from <path>\n"
"rename to <path>\n"
"similarity index <number>\n"
"dissimilarity index <number>\n"
"index <hash>..<hash> <mode>\n"
msgstr ""
"old mode <模式>\n"
"new mode <模式>\n"
"deleted file mode <模式>\n"
"new file mode <模式>\n"
"copy from <路径>\n"
"copy to <路径>\n"
"rename from <路径>\n"
"rename to <路径>\n"
"similarity index <数字>\n"
"dissimilarity index <数字>\n"
"index <哈希>..<哈希> <模式>\n"

#. type: Plain text
#: en/diff-generate-patch.txt:48
#, priority:280
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr "文件模式被打印为6位八进制数字，包括文件类型和文件权限位。"

#. type: Plain text
#: en/diff-generate-patch.txt:50
#, priority:280
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr "扩展头信息中的路径名称不包括 `a/` 和 `b/` 前缀。"

#. type: Plain text
#: en/diff-generate-patch.txt:57
#, priority:280
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines.  It is a rounded down integer, followed by a percent sign.  The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr "相似性指数是未改变的行占比，而不相似性指数是改变的行占比。它是四舍五入的整数，后有百分号。因此，100%的相似度指数指为两个文件相等，而 100% 的不相似度意味着入新文件中没有旧文件中的行。"

#. type: Plain text
#: en/diff-generate-patch.txt:61
#, priority:280
msgid "The index line includes the blob object names before and after the change.  The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr "索引行包括改变前和改变后的 blob 对象名称。如果文件模式没有变化，则包含 <模式>；否则，分别显示新旧模式。"

#. type: Plain text
#: en/diff-generate-patch.txt:65
#, priority:280
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr "含有 \"不常见\" 字符的路径名会被引用，这一点在配置变量` core.quotePath` 中有所解释（见 linkgit:git-config[1]）。"

#. type: Plain text
#: en/diff-generate-patch.txt:70
#, priority:280
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit.  It is incorrect to apply each change to each file sequentially.  For example, this patch will swap a and b:"
msgstr "输出中所有的 `file1` 文件都是指提交前的文件，而所有的 `file2` 文件都是指提交后的文件。按顺序对每个文件进行修改是不正确的。例如，这个补丁将交换文件 a 和 b："

#. type: Plain text
#: en/diff-generate-patch.txt:77
#, no-wrap, priority:280
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
"rename to b\n"
"diff --git a/b b/a\n"
"rename from b\n"
"rename to a\n"
msgstr ""
"diff --git a/a b/b\n"
"rename from a\n"
"rename to b\n"
"diff --git a/b b/a\n"
"rename from b\n"
"rename to a\n"

#. type: Plain text
#: en/diff-generate-patch.txt:82
#, priority:280
msgid "Hunk headers mention the name of the function to which the hunk applies.  See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor to this to specific languages."
msgstr "块头提到了块头所适用的函数的名称。  参见 linkgit:gitattributes[5] 中的 \"定义自定义 hunk-header\"，以了解如何针对特定语言进行定制。"

#. type: Title -
#: en/diff-generate-patch.txt:85
#, no-wrap, priority:280
msgid "Combined diff format"
msgstr "合并的差异格式"

#. type: Plain text
#: en/diff-generate-patch.txt:93
#, priority:280
msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
msgstr "任何生成差异的命令都可以使用 `-c` 或 `-cc` 选项，在显示合并时产生一个 \"合并差异\"。当用 linkgit:git-diff[1] 或 linkgit:git-show[1] 显示合并时，这默认格式。还需要注意的是，你可以给这些命令适当的 `--diff-merges` 选项来强制生成特定格式的差异。"

#. type: Plain text
#: en/diff-generate-patch.txt:95
#, priority:280
msgid "A \"combined diff\" format looks like this:"
msgstr "\"合并的差异\" 的格式如下："

#. type: delimited block -
#: en/diff-generate-patch.txt:104
#, no-wrap, priority:280
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
"--- a/describe.c\n"
"+++ b/describe.c\n"
"@@@ -98,20 -98,12 +98,20 @@@\n"
"\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
"  }\n"
msgstr ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
"--- a/describe.c\n"
"+++ b/describe.c\n"
"@@@ -98,20 -98,12 +98,20 @@@\n"
"\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
"  }\n"

#. type: delimited block -
#: en/diff-generate-patch.txt:114
#, no-wrap, priority:280
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
"++static void describe(char *arg, int last_one)\n"
"  {\n"
" +\tunsigned char sha1[20];\n"
" +\tstruct commit *cmit;\n"
"\tstruct commit_list *list;\n"
"\tstatic int initialized = 0;\n"
"\tstruct commit_name *n;\n"
msgstr ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
"++static void describe(char *arg, int last_one)\n"
"  {\n"
" +\tunsigned char sha1[20];\n"
" +\tstruct commit *cmit;\n"
"\tstruct commit_list *list;\n"
"\tstatic int initialized = 0;\n"
"\tstruct commit_name *n;\n"

#. type: delimited block -
#: en/diff-generate-patch.txt:124
#, no-wrap, priority:280
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
" +\tcmit = lookup_commit_reference(sha1);\n"
" +\tif (!cmit)\n"
" +\t\tusage(describe_usage);\n"
" +\n"
"\tif (!initialized) {\n"
"\t\tinitialized = 1;\n"
"\t\tfor_each_ref(get_name);\n"
msgstr ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
" +\tcmit = lookup_commit_reference(sha1);\n"
" +\tif (!cmit)\n"
" +\t\tusage(describe_usage);\n"
" +\n"
"\tif (!initialized) {\n"
"\t\tinitialized = 1;\n"
"\t\tfor_each_ref(get_name);\n"

#. type: Plain text
#: en/diff-generate-patch.txt:128
#, priority:280
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr "它前面有 \"git diff\" 头，如下（当使用 `c` 选项时）："

#. type: Plain text
#: en/diff-generate-patch.txt:130
#, no-wrap, priority:280
msgid "diff --combined file\n"
msgstr "diff --combined file\n"

#. type: Plain text
#: en/diff-generate-patch.txt:132
#, priority:280
msgid "or like this (when the `--cc` option is used):"
msgstr "或如下（当使用 `--cc` 选项时）："

#. type: Plain text
#: en/diff-generate-patch.txt:134
#, no-wrap, priority:280
msgid "       diff --cc file\n"
msgstr "       diff --cc file\n"

#. type: Plain text
#: en/diff-generate-patch.txt:137
#, priority:280
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr "它的后面是一个或多个扩展头信息行（本例显示的是与两个父提交的合并）："

#. type: Plain text
#: en/diff-generate-patch.txt:142
#, no-wrap, priority:280
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
"new file mode <mode>\n"
"deleted file mode <mode>,<mode>\n"
msgstr ""
"index <哈希>,<哈希>..<哈希>\n"
"mode <模式>,<模式>..<模式>\n"
"new file mode <模式>\n"
"deleted file mode <模式>,<模式>\n"

#. type: Plain text
#: en/diff-generate-patch.txt:148
#, fuzzy, priority:280
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr "`mode<mode>，<mode>..<mode>` 行仅在 <mode> 中至少有一个与其余的不同时才会出现。包含有关检测到的内容移动的信息 (重命名和复制检测) 的扩展标头设计为使用两个 <tree-ish> 的 diff，不能用于组合的 diff 格式。"

#. type: Plain text
#: en/diff-generate-patch.txt:150
#, priority:280
msgid "It is followed by two-line from-file/to-file header"
msgstr "它的后面是两行源文件/目标文件的头信息"

#. type: Plain text
#: en/diff-generate-patch.txt:152 en/diff-generate-patch.txt:163 en/diff-generate-patch.txt:164 en/diff-generate-patch.txt:165
#, priority:280
msgid "a/file"
msgstr "a/file"

#. type: Plain text
#: en/diff-generate-patch.txt:153 en/diff-generate-patch.txt:166
#, priority:280
msgid "b/file"
msgstr "b/file"

#. type: Plain text
#: en/diff-generate-patch.txt:157
#, priority:280
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr "类似于传统的 \"统一\" 差异格式的双行头，`/dev/null` 用来表示创建或删除的文件。"

#. type: Plain text
#: en/diff-generate-patch.txt:161
#, priority:280
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr "但是，如果提供了 --combined-all-paths 选项，你就会得到一个 N+1 行的源文件/目标文件头，其中 N 是合并提交中的父提交数量"

#. type: Plain text
#: en/diff-generate-patch.txt:170
#, priority:280
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr "如果重命名或复制检测处于活动状态，这种扩展格式可能很有用，可以让你在不同的父提交中看到文件的原始名称。"

#. type: Plain text
#: en/diff-generate-patch.txt:176
#, priority:280
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr "修改了文件块头信息的格式，以防止不小心将其送入 `patch -p1`。合并的差异格式是为审查合并提交的修改而创建的，并不是为了应用。这个变化类似于扩展的 \"索引\" 头信息的变化："

#. type: Plain text
#: en/diff-generate-patch.txt:178
#, no-wrap, priority:280
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"

#. type: Plain text
#: en/diff-generate-patch.txt:181
#, priority:280
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr "块中有（父提交数量+1）`@` 字符，用于合并的差异格式。"

#. type: Plain text
#: en/diff-generate-patch.txt:190
#, ignore-ellipsis, priority:280
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN.  One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr "与传统的 \"统一\" 差异格式不同，这种格式显示两个文件 A 和 B 的列，其中有 `-`（减号 -- 在 A 中出现，但在 B 中删除），`+`（加号 -- 在 A 中缺少，但在 B 中增加），或 `\" \"`（空格 -- 不变）前缀，这种格式比较两个或多个文件与一个文件 X，并显示 X 与其中每个文件的差异。文件中的每一个都有一列被前置在输出行中，以指出 X 的行与它的不同之处。"

#. type: Plain text
#: en/diff-generate-patch.txt:196
#, priority:280
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result.  A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr "第 N 列中的 `-` 字符意味着该行出现在文件 N 中，但它没有出现在结果文件中。第 N 列中的 `+` 字符意味着该行出现在结果文件中，而文件 N 中没有该行（换句话说，从该父提交的角度来看，该行是被添加的）。"

#. type: Plain text
#: en/diff-generate-patch.txt:202
#, priority:280
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr "在上面的输出示例中，两个文件中的函数签名都被改变了（因此从文件 1 和文件 2 中都有表示删除的 `-`，而 `++` 表示被添加的一行没有出现在文件 1 或文件 2 中）。另外还有 8 行与文件 1 中的相同，但没有出现在文件 2 中（因此前缀为 `+`）。"

#. type: Plain text
#: en/diff-generate-patch.txt:208
#, priority:280