Translated using Weblate (Chinese (Simplified))

Currently translated at 15.0% (1591 of 10602 strings)

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


Signed-off-by: 冉 <ranto2012@163.com>

po/documentation.zh_HANS-CN.po

@@ -3,19 +3,7 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr ""
-"Project-Id-Version: git documentation\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2021-02-27 18:16+0100\n"
-"PO-Revision-Date: 2021-04-06 18:01+0000\n"
-"Last-Translator: Patrick R GUERRERO <jcs.pattystackzz@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_HANS-CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-04-29 10:32+0000\nLast-Translator: 冉 <ranto2012@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.7-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
@@ -1649,8 +1637,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
-#. type: Plain text
 # 查找给定版本的符号名称
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:39
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -3582,49 +3570,49 @@ msgstr "在重命名的情况下，完整路径前多出的 `NUL` 为了让读
 #: en/diff-generate-patch.txt:2
 #, no-wrap, priority:280
 msgid "Generating patch text with -p"
-msgstr ""
+msgstr "使用选项 `-p` 生成补丁文本"
 #. type: Plain text
 #: en/diff-generate-patch.txt:15
 #, 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])."
-msgstr ""
+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:18
 #, priority:280
 msgid "What the -p option produces is slightly different from the traditional diff format:"
-msgstr ""
+msgstr "-p 选项产生的内容与传统的差异格式略有不同："
 #. type: Plain text
 #: en/diff-generate-patch.txt:20
 #, priority:280
 msgid "It is preceded with a \"git diff\" header that looks like this:"
-msgstr ""
+msgstr "它前面有一个 `git diff` 头，如下所示："
 #. type: Plain text
 #: en/diff-generate-patch.txt:22
 #, no-wrap, priority:280
 msgid "diff --git a/file1 b/file2\n"
-msgstr ""
+msgstr "diff --git a/file1 b/file2\n"
 #. type: Plain text
 #: en/diff-generate-patch.txt:26
 #, 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 ""
+msgstr "`a/` 和 `b/` 的文件名相同，除非涉及到重命名/复制。特别地，即使是创建或删除，也 _不_ 使用 `/dev/null` 来代替 `a/` 或 `b/` 文件名。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:30
 #, 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 ""
+msgstr "当涉及到重命名/复制时，`file1` 和 `file2` 分别显示重命名/复制的源文件的名称和重命名/复制产生的文件的名称。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:32
 #, priority:280
 msgid "It is followed by one or more extended header lines:"
-msgstr ""
+msgstr "它的后面是一个或多个扩展头信息行："
 #. type: Plain text
 #: en/diff-generate-patch.txt:44
@@ -3641,43 +3629,43 @@ msgid ""
 "similarity index <number>\n"
 "dissimilarity index <number>\n"
 "index <hash>..<hash> <mode>\n"
-msgstr ""
+msgstr "old mode <模式>\nnew mode <模式>\ndeleted file mode <模式>\nnew file mode <模式>\ncopy from <路径>\ncopy to <路径>\nrename from <路径>\nrename to <路径>\nsimilarity index <数字>\ndissimilarity index <数字>\nindex <哈希>..<哈希> <模式>\n"
 #. type: Plain text
 #: en/diff-generate-patch.txt:47
 #, priority:280
 msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
-msgstr ""
+msgstr "文件模式被打印为6位八进制数字，包括文件类型和文件权限位。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
-msgstr ""
+msgstr "扩展头信息中的路径名称不包括 `a/` 和 `b/` 前缀。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:56
 #, 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 ""
+msgstr "相似性指数是未改变的行占比，而不相似性指数是改变的行占比。它是四舍五入的整数，后有百分号。因此，100%的相似度指数指为两个文件相等，而 100% 的不相似度意味着入新文件中没有旧文件中的行。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:60
 #, 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 ""
+msgstr "索引行包括改变前和改变后的 blob 对象名称。如果文件模式没有变化，则包含 <模式>；否则，分别显示新旧模式。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:64
 #, priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
+msgstr "含有 \"不常见\" 字符的路径名会被引用，这一点在配置变量` core.quotePath` 中有所解释（见 linkgit:git-config[1]）。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:69
 #, 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 ""
+msgstr "输出中所有的 `file1` 文件都是指提交前的文件，而所有的 `file2` 文件都是指提交后的文件。按顺序对每个文件进行修改是不正确的。例如，这个补丁将交换文件 a 和 b："
 #. type: Plain text
 #: en/diff-generate-patch.txt:76
@@ -3689,25 +3677,25 @@ msgid ""
 "diff --git a/b b/a\n"
 "rename from b\n"
 "rename to a\n"
-msgstr ""
+msgstr "diff --git a/a b/b\nrename from a\nrename to b\ndiff --git a/b b/a\nrename from b\nrename to a\n"
 #. type: Title -
 #: en/diff-generate-patch.txt:79
 #, no-wrap, priority:280
 msgid "Combined diff format"
-msgstr ""
+msgstr "合并的差异格式"
 #. type: Plain text
 #: en/diff-generate-patch.txt:87
 #, 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 ""
+msgstr "任何生成差异的命令都可以使用 `-c` 或 `-cc` 选项，在显示合并时产生一个 \"合并差异\"。当用 linkgit:git-diff[1] 或 linkgit:git-show[1] 显示合并时，这默认格式。还需要注意的是，你可以给这些命令适当的 `--diff-merges` 选项来强制生成特定格式的差异。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:89
 #, priority:280
 msgid "A \"combined diff\" format looks like this:"
-msgstr ""
+msgstr "\"合并的差异\" 的格式如下："
 #. type: delimited block -
 #: en/diff-generate-patch.txt:98
@@ -3720,7 +3708,7 @@ msgid ""
 "@@@ -98,20 -98,12 +98,20 @@@\n"
 "\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
 "  }\n"
-msgstr ""
+msgstr "diff --combined describe.c\nindex 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:108
@@ -3735,7 +3723,7 @@ msgid ""
 "\tstruct commit_list *list;\n"
 "\tstatic int initialized = 0;\n"
 "\tstruct commit_name *n;\n"
-msgstr ""
+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:118
@@ -3750,37 +3738,37 @@ msgid ""
 "\tif (!initialized) {\n"
 "\t\tinitialized = 1;\n"
 "\t\tfor_each_ref(get_name);\n"
-msgstr ""
+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:122
 #, priority:280
 msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
-msgstr ""
+msgstr "它前面有 \"git diff\" 头，如下（当使用 `c` 选项时）："
 #. type: Plain text
 #: en/diff-generate-patch.txt:124
 #, no-wrap, priority:280
 msgid "diff --combined file\n"
-msgstr ""
+msgstr "diff --combined file\n"
 #. type: Plain text
 #: en/diff-generate-patch.txt:126
 #, priority:280
 msgid "or like this (when the `--cc` option is used):"
-msgstr ""
+msgstr "或如下（当使用 `--cc` 选项时）："
 #. type: Plain text
 #: en/diff-generate-patch.txt:128
 #, no-wrap, priority:280
 msgid "       diff --cc file\n"
-msgstr ""
+msgstr "       diff --cc file\n"
 #. type: Plain text
 #: en/diff-generate-patch.txt:131
 #, priority:280
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
-msgstr ""
+msgstr "它的后面是一个或多个扩展头信息行（本例显示的是与两个父提交的合并）："
 #. type: Plain text
 #: en/diff-generate-patch.txt:136
@@ -3790,7 +3778,7 @@ msgid ""
 "mode <mode>,<mode>..<mode>\n"
 "new file mode <mode>\n"
 "deleted file mode <mode>,<mode>\n"
-msgstr ""
+msgstr "index <哈希>,<哈希>..<哈希>\nmode <模式>,<模式>..<模式>\nnew file mode <模式>\ndeleted file mode <模式>,<模式>\n"
 #. type: Plain text
 #: en/diff-generate-patch.txt:142
@@ -3802,7 +3790,7 @@ msgstr "`mode<mode>，<mode>..<mode>` 行仅在 <mode> 中至少有一个与其
 #: en/diff-generate-patch.txt:144
 #, priority:280
 msgid "It is followed by two-line from-file/to-file header"
-msgstr ""
+msgstr "它的后面是两行源文件/目标文件的头信息"
 #. type: Plain text
 #: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
@@ -3820,25 +3808,25 @@ msgstr "Files.index,core,source"
 #: en/diff-generate-patch.txt:151
 #, priority:280
 msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
-msgstr ""
+msgstr "类似于传统的 \"统一\" 差异格式的双行头，`/dev/null` 用来表示创建或删除的文件。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:155
 #, 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 ""
+msgstr "但是，如果提供了 --combined-all-paths 选项，你就会得到一个 N+1 行的源文件/目标文件头，其中 N 是合并提交中的父提交数量"
 #. type: Plain text
 #: en/diff-generate-patch.txt:164
 #, 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 ""
+msgstr "如果重命名或复制检测处于活动状态，这种扩展格式可能很有用，可以让你在不同的父提交中看到文件的原始名称。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:170
 #, 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 ""
+msgstr "修改了文件块头信息的格式，以防止不小心将其送入 `patch -p1`。合并的差异格式是为审查合并提交的修改而创建的，并不是为了应用。这个变化类似于扩展的 \"索引\" 头信息的变化："
 #. type: Plain text
 #: en/diff-generate-patch.txt:172
@@ -3850,31 +3838,31 @@ msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 #: en/diff-generate-patch.txt:175
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
-msgstr ""
+msgstr "块中有（父提交数量+1）`@` 字符，用于合并的差异格式。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:184
 #, 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 ""
+msgstr "与传统的 \"统一\" 差异格式不同，这种格式显示两个文件 A 和 B 的列，其中有 `-`（减号 -- 在 A 中出现，但在 B 中删除），`+`（加号 -- 在 A 中缺少，但在 B 中增加），或 `\" \"`（空格 -- 不变）前缀，这种格式比较两个或多个文件与一个文件 X，并显示 X 与其中每个文件的差异。文件中的每一个都有一列被前置在输出行中，以指出 X 的行与它的不同之处。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:190
 #, 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 ""
+msgstr "第 N 列中的 `-` 字符意味着该行出现在文件 N 中，但它没有出现在结果文件中。第 N 列中的 `+` 字符意味着该行出现在结果文件中，而文件 N 中没有该行（换句话说，从该父提交的角度来看，该行是被添加的）。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:196
 #, 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 ""
+msgstr "在上面的输出示例中，两个文件中的函数签名都被改变了（因此从文件 1 和文件 2 中都有表示删除的 `-`，而 `++` 表示被添加的一行没有出现在文件 1 或文件 2 中）。另外还有 8 行与文件 1 中的相同，但没有出现在文件 2 中（因此前缀为 `+`）。"
 #. type: Plain text
 #: en/diff-generate-patch.txt:202
 #, priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents).  When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
-msgstr ""
+msgstr "当用 `git diff-tree -c` 显示时，它将合并提交的父提交文件与合并结果进行比较（即文件 1 ... 文件 N 是父提交文件）。当用 `git diff-files -c` 显示时，它将两个未解决的合并父提交文件与工作树文件进行比较（即文件 1 是阶段 2 ，又称 \"我们的版本\"，文件 2 是阶段 3，又称 \"他们的版本\"）。"
 #. type: Labeled list
 #: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84
@@ -6898,8 +6886,8 @@ msgstr "删除的内容"
 msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
 msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
-#. type: Labeled list
 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#. type: Labeled list
 #: en/git-add.txt:379
 #, fuzzy, no-wrap, priority:300
 msgid "modified content"
@@ -12404,7 +12392,7 @@ msgstr "--no-progress"
 #: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
 #, priority:280
 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
-msgstr ""
+msgstr "当它附加到终端时，除非指定 `--quiet`，否则默认情况下会在标准错误流中报告进度状态。这个标志可以启用进度报告，即使没有附在到终端，而不管 `--quiet`。"
 #. type: Plain text
 #: en/git-checkout.txt:123
@@ -12626,7 +12614,7 @@ msgstr "--conflict=<style>"
 #: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
 #, priority:280
 msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable.  Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
-msgstr ""
+msgstr "与上面的 `--merge` 选项相同，但改变了冲突块的显示方式，覆盖 `merge.conflictStyle` 配置变量。可能的值是 \"merge\"（默认）和 \"diff3\"（除了 \"merge\" 样式显示的内容外，还显示原始内容）。"
 #. type: Plain text
 #: en/git-checkout.txt:277
@@ -61102,7 +61090,7 @@ msgstr "xxdiff"
 #: en/object-format-disclaimer.txt:6
 #, priority:300
 msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage.  A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories.  It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways.  Only use `--object-format=sha256` for testing purposes."
-msgstr ""
+msgstr "此选项是实验性的！SHA-256 支持是实验性的，仍然处于早期阶段。一般来说，SHA-256 仓库不能与 \"常规\" SHA-1 仓库共同工作。应该假定，例如，与 SHA-256 仓库有关的 Git 内部文件格式可能会以向后不兼容的方式改变。仅在测试时使用 `--object-format=sha256` 选项。"
 #. type: Title -
 #: en/pretty-formats.txt:2