Translated using Weblate (Chinese (Simplified))

Currently translated at 17.3% (1789 of 10338 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

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
 "POT-Creation-Date: 2020-05-16 17:29+0200\n"
-"PO-Revision-Date: 2020-05-14 20:41+0000\n"
+"PO-Revision-Date: 2020-05-24 21:41+0000\n"
 "Last-Translator: 冉 <ranto2012@163.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_HANS-CN\n"
@@ -1337,8 +1337,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
-#. type: Plain text
 # 查找给定版本的符号名称
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:36
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -3907,6 +3907,7 @@ msgstr "--numstat"
 #, priority:280
 msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.  For binary files, outputs two `-` instead of saying `0 0`."
 msgstr ""
+"类似于 `--stat`，但是使用小数点和不含缩写的路径名显示添加和删除的行数，使其对程序更友好。对于二进制文件，输出两个 `-`，而不是 `0 0`。"
 #. type: Labeled list
 #: en/diff-options.txt:156
@@ -3918,25 +3919,27 @@ msgstr "--shortstat"
 #: en/diff-options.txt:160
 #, priority:280
 msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
-msgstr ""
+msgstr "只输出使用 `--stat` 选项输出的最后一行，包含修改的文件总数，添加和删除的行数。"
 #. type: Labeled list
 #: en/diff-options.txt:161
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "-X[<param1,param2,...>]"
-msgstr ""
+msgstr "-X[<参数1,参数2,...>]"
 #. type: Labeled list
 #: en/diff-options.txt:162
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "--dirstat[=<param1,param2,...>]"
-msgstr ""
+msgstr "--dirstat[=<参数1,参数2,...>]"
 #. type: Plain text
 #: en/diff-options.txt:169
 #, priority:280
 msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters.  The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]).  The following parameters are available:"
 msgstr ""
+"输出每个子目录的相对变化量的分布。`--dirstat` 的行为可以通过传递一个以逗号分隔的参数列表来自定义。默认值由`diff.dirstat` "
+"配置变量控制 (参见 linkgit:git-config[1])。以下是可用的参数："
 #. type: Labeled list
 #: en/diff-options.txt:171
@@ -3949,6 +3952,8 @@ msgstr "`changes`"
 #, priority:280
 msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file.  In other words, rearranging lines in a file is not counted as much as other changes.  This is the default behavior when no parameter is given."
 msgstr ""
+"通过计算从源文件中删除的行数或添加到目标文件中的行数来计算分布状态的数字。这忽略了文件内的代码移动行为。也就是说，在文件中重新排列的行不会像其他变化一样被"
+"计算在内。这是在没有给出参数时的默认行为。"
 #. type: Labeled list
 #: en/diff-options.txt:177
@@ -3961,6 +3966,9 @@ msgstr "`lines`"
 #, priority:280
 msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
 msgstr ""
+"通过做常规基于行的差异分析，计算分布状态的数字，并将删除/添加的行数相加。(对于二进制文件，用64字节的块来计算，因为二进制文件没有行的概念)。在使用 "
+"`--dirstat` 时这个选项的行为开销比 `changes` 更大，但会对文件中重新排列的行进行计数。其得到的输出结果与其他的 `--*stat` "
+"选项一致。"
 #. type: Labeled list
 #: en/diff-options.txt:185
@@ -3973,6 +3981,8 @@ msgstr "`files`"
 #, priority:280
 msgid "Compute the dirstat numbers by counting the number of files changed.  Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
 msgstr ""
+"通过计算被改变的文件数量来计算分布状态的数字。在分布状态分析中，每一个被改变的文件都会被平等地计算。这是计算上开销最小的 `--dirstat` "
+"行为，因为它无需查看文件内容。"
 #. type: Labeled list
 #: en/diff-options.txt:190
@@ -3985,24 +3995,28 @@ msgstr "`cumulative`"
 #, priority:280
 msgid "Count changes in a child directory for the parent directory as well.  Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
 msgstr ""
+"子目录中的变化计算到父目录中。 注意，当使用 `cumulative` 选项时，报告的百分比之和可能超过100%。默认的（非累积）行为可以用 "
+"`noncumulative` 参数指定。"
 #. type: Labeled list
 #: en/diff-options.txt:195 en/git-cherry.txt:39
 #, no-wrap, priority:280
 msgid "<limit>"
-msgstr ""
+msgstr "<限制>"
 #. type: Plain text
 #: en/diff-options.txt:199
 #, priority:280
 msgid "An integer parameter specifies a cut-off percent (3% by default).  Directories contributing less than this percentage of the changes are not shown in the output."
-msgstr ""
+msgstr "一个整数参数，其指定一个截止百分比（默认为3%）。贡献值小于这个百分比的目录不显示在输出中。"
 #. type: Plain text
 #: en/diff-options.txt:205
 #, priority:280
 msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
 msgstr ""
+"例如：下面的参数会统计更改的文件，同时忽略占更改文件总数10%以下的目录，并累积父目录中的子目录计数：`--dirstat=files,10,cumula"
+"tive`。"
 #. type: Labeled list
 #: en/diff-options.txt:206
@@ -4020,7 +4034,7 @@ msgstr " --dirstat=cumulative "
 #: en/diff-options.txt:209
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "--dirstat-by-file[=<param1,param2>...]"
-msgstr ""
+msgstr "--dirstat-byfile[=<参数1,参数2>...]"
 #. type: Plain text
 #: en/diff-options.txt:211
@@ -4038,7 +4052,7 @@ msgstr "--summary"
 #: en/diff-options.txt:215
 #, priority:280
 msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
-msgstr ""
+msgstr "输出扩展头信息，如创建、重命名和模式变化等，的压缩摘要。"
 #. type: Labeled list
 #: en/diff-options.txt:217
@@ -4062,13 +4076,13 @@ msgstr "-z"
 #: en/diff-options.txt:226
 #, no-wrap, priority:280
 msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
-msgstr ""
+msgstr "\t用 NUL 而不是用换行来分隔提交。\n"
 #. type: Plain text
 #: en/diff-options.txt:229
 #, priority:280
 msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
-msgstr ""
+msgstr "另外，当给出 `--raw` 或 `--numstat` 时，不合并路径名，并使用 NUL 作为输出字段终止符。"
 #. type: Plain text
 #: en/diff-options.txt:233
@@ -4077,12 +4091,16 @@ msgid ""
 "\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
 "\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
 msgstr ""
+"\t另外，当给出 `--raw` 或 `--numstat` 时，\n"
+"\t不合并路径名，并使用 NUL 作为输出字段终止符。\n"
 #. type: Plain text
 #: en/diff-options.txt:238 en/git-apply.txt:122
-#, priority:280
+#, fuzzy, priority:280
 msgid "Without this option, 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: Labeled list
 #: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
@@ -4094,7 +4112,7 @@ msgstr "--name-only"
 #: en/diff-options.txt:241
 #, priority:280
 msgid "Show only names of changed files."
-msgstr ""
+msgstr "仅显示已更改文件的名称。"
 #. type: Labeled list
 #: en/diff-options.txt:242 en/git-ls-tree.txt:60
@@ -4106,31 +4124,38 @@ msgstr "--name-status"
 #: en/diff-options.txt:245
 #, priority:280
 msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
-msgstr ""
+msgstr "仅显示已更改文件的名称和状态。有关状态字母的含义，请参阅 `--diff-filter` 选项的说明。"
 #. type: Labeled list
 #: en/diff-options.txt:246
 #, no-wrap, priority:280
 msgid "--submodule[=<format>]"
-msgstr ""
+msgstr "--submodule[=<格式>]"
 #. type: Plain text
 #: en/diff-options.txt:257
 #, priority:280
 msgid "Specify how differences in submodules are shown.  When specifying `--submodule=short` the 'short' format is used.  This format just shows the names of the commits at the beginning and end of the range.  When `--submodule` or `--submodule=log` is specified, the 'log' format is used.  This format lists the commits in the range like linkgit:git-submodule[1] `summary` does.  When `--submodule=diff` is specified, the 'diff' format is used.  This format shows an inline diff of the changes in the submodule contents between the commit range.  Defaults to `diff.submodule` or the 'short' format if the config option is unset."
 msgstr ""
+"指定子模块中的差异如何显示。当指定 `--submodule=short` 选项时，会使用 'short' "
+"格式。这种格式只显示范围的开头和结尾处的提交名称。当指定了 `--submodule=short` 或  `--submodule=log` 时，会使用 "
+"'log' 格式。这种格式会像 linkgit:git-submodule[1]  `summary` 那样，列出该范围内的提交。当指定了 "
+"`--submodule=diff` 时，会使用 'diff' 格式。这个格式显示的是子模块内在提交范围之间的变化差异。默认为 `diff."
+"submodule`，如果配置选项未设置， 则为 `short` 格式。"
 #. type: Labeled list
 #: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
 #, no-wrap, priority:280
 msgid "--color[=<when>]"
-msgstr ""
+msgstr "--color[=<何时>]"
 #. type: Plain text
 #: en/diff-options.txt:262
 #, priority:280
 msgid "Show colored diff.  `--color` (i.e. without '=<when>') is the same as `--color=always`.  '<when>' can be one of `always`, `never`, or `auto`."
 msgstr ""
+"显示有颜色的差异。`--color`（即不含 '=<何时>'）与 `--color=always` 相同。'<何时>' 可以是 "
+"`always`、`never` 或 `auto`。"
 #. type: Plain text
 #: en/diff-options.txt:265
@@ -4139,6 +4164,8 @@ msgid ""
 "\tIt can be changed by the `color.ui` and `color.diff`\n"
 "\tconfiguration settings.\n"
 msgstr ""
+"\t它可以通过 `color.ui` 和 `color.diff` 来改变\n"
+"\t配置设置。\n"
 #. type: Labeled list
 #: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
@@ -4150,37 +4177,37 @@ msgstr "--no-color"
 #: en/diff-options.txt:269
 #, priority:280
 msgid "Turn off colored diff."
-msgstr ""
+msgstr "关掉带彩色显示的差异。"
 #. type: Plain text
 #: en/diff-options.txt:271
 #, no-wrap, priority:280
 msgid "\tThis can be used to override configuration settings.\n"
-msgstr ""
+msgstr "\t这可以用来覆盖配置设置。\n"
 #. type: Plain text
 #: en/diff-options.txt:273
 #, no-wrap, priority:280
 msgid "\tIt is the same as `--color=never`.\n"
-msgstr ""
+msgstr "\t这和 `--color=never` 相同。\n"
 #. type: Labeled list
 #: en/diff-options.txt:274
 #, no-wrap, priority:280
 msgid "--color-moved[=<mode>]"
-msgstr ""
+msgstr "--color-moved[=<模式>]"
 #. type: Plain text
 #: en/diff-options.txt:276
 #, priority:280
 msgid "Moved lines of code are colored differently."
-msgstr ""
+msgstr "移动的代码行的颜色不同。"
 #. type: Plain text
 #: en/diff-options.txt:278
 #, no-wrap, priority:280
 msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
-msgstr ""
+msgstr "\t它可以通过 `diff.colorMoved` 配置设置来改变。\n"
 #. type: Plain text
 #: en/diff-options.txt:282
@@ -4190,6 +4217,9 @@ msgid ""
 "\tand to 'zebra' if the option with no mode is given.\n"
 "\tThe mode must be one of:\n"
 msgstr ""
+"\t如果没有给出该选项，<模式> 默认为 'no'\n"
+"\t如果没有给定模式选项，则为 'zebra'。\n"
+"\t该模式必须以下其中之一：\n"
 #. type: Labeled list
 #: en/diff-options.txt:284 en/diff-options.txt:326
@@ -4201,7 +4231,7 @@ msgstr "no"
 #: en/diff-options.txt:286
 #, priority:280
 msgid "Moved lines are not highlighted."
-msgstr ""
+msgstr "被移动的行不突出显示。"
 #. type: Labeled list
 #: en/diff-options.txt:286 en/git-commit.txt:212
@@ -4213,7 +4243,7 @@ msgstr "default"
 #: en/diff-options.txt:289
 #, priority:280
 msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
-msgstr ""
+msgstr "是 `zebra` 的同义词。今后可能会改成更合理的模式。"
 #. type: Labeled list
 #: en/diff-options.txt:289 en/diff-options.txt:358
@@ -4223,9 +4253,12 @@ msgstr "plain"
 #. type: Plain text
 #: en/diff-options.txt:296
-#, priority:280
+#, fuzzy, priority:280
 msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'.  Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
 msgstr ""
+"任何在某个位置被添加，且在另一个位置被删除的行，都会被用 'color.diff.newMoved' 着色。同样的，"
+"在差异中在某处删除且在其它地方添加的行会使用 'color.diff.oldMoved' "
+"着色。这种模式可以读取任何被移动的行，但在代码审查中，它不能确定一个代码块是否未经排列而进行了移动。"
 #. type: Labeled list
 #: en/diff-options.txt:296
@@ -4238,6 +4271,8 @@ msgstr "blocks"
 #, priority:280
 msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color.  Adjacent blocks cannot be told apart."
 msgstr ""
+"使用贪心方法检测含至少20个字母数字字符的移动文本块。检测到的区块使用 'color.diff.{old,new}Moved' "
+"的颜色。相邻的区块不能被区分开。"
 #. type: Labeled list
 #: en/diff-options.txt:301
@@ -6275,7 +6310,7 @@ msgstr ""
 "g - 选择并跳转至一个区块\n"
 "/ - 搜索与给定正则表达示匹配的区块\n"
 "j - 暂不决定，转至下一个未决定的区块\n"
-"J - 暂不决定，转至一个区块\n"
+"J - 暂不决定，转至下一个区块\n"
 "k - 暂不决定，转至上一个未决定的区块\n"
 "K - 暂不决定，转至上一个区块\n"
 "s - 将当前的区块分割成多个较小的区块\n"
@@ -6342,8 +6377,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
 #, no-wrap, priority:300
 msgid "modified content"
@@ -13703,13 +13738,17 @@ msgstr "初始化稀疏检出文件，以便工作目录仅从存储库根目录
 #: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
 #, no-wrap, priority:300
 msgid "--filter=<filter-spec>"
-msgstr ""
+msgstr "--filter=<过滤器定义>"
 #. type: Plain text
 #: en/git-clone.txt:175
-#, priority:300
+#, fuzzy, priority:300
 msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter.  When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
 msgstr ""
+"使用部分克隆功能，要求服务器根据给定的对象过滤器发送一个可到达的对象的子集。当使用 `--filter` 选项时，提供的 `<过滤器定义>` "
+"将被用于部分克隆。例如，`--filter=blob:none` 将过滤掉所有的数据对象（文件内容），直到 Git "
+"需要相应的数据。另外，`--filter=blob:limit=<大小>` 将过滤掉所有文件大小至少为 `<大小>` "
+"的数据对象。关于过滤器定义的更多细节，请参阅 linkgit:git-rev-list[1] 中的 `--filter` 选项。"
 #. type: Labeled list
 #: en/git-clone.txt:176 en/git-push.txt:161
@@ -29229,7 +29268,7 @@ msgstr "--patch-format"
 #: en/git-init.txt:55
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
-msgstr ""
+msgstr "指定存储库的对象格式（哈希算法）。有效值为 'sha1' 和（如果启用）'sha256'。'sha1' 是默认值。"
 #. type: Plain text
 #: en/git-init.txt:60