Translated using Weblate (Chinese (Simplified))

Currently translated at 16.4% (1681 of 10245 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,8 +7,8 @@ msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
 "POT-Creation-Date: 2020-04-04 19:51+0200\n"
-"PO-Revision-Date: 2020-05-04 08:48+0000\n"
-"Last-Translator: Ge Xianglin <gxl200896@163.com>\n"
+"PO-Revision-Date: 2020-05-05 10:12+0000\n"
+"Last-Translator: 冉 <ranto2012@163.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_HANS-CN\n"
 "MIME-Version: 1.0\n"
@@ -3039,63 +3039,69 @@ msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
 #. type: Plain text
 #: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
-#, priority:280
+#, 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
 #, no-wrap, priority:280
 msgid "diff format for merges"
-msgstr ""
+msgstr "合并的差异格式"
 #. type: Plain text
 #: en/diff-format.txt:93
 #, 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
 #, priority:280
 msgid "there is a colon for each parent"
-msgstr ""
+msgstr "每个父提交都有一个冒号"
 #. type: Plain text
 #: en/diff-format.txt:96
-#, priority:280
+#, fuzzy, priority:280
 msgid "there are more \"src\" modes and \"src\" sha1"
-msgstr ""
+msgstr "有更多的 \"src\" 文件模式和 \"src\" sha1"
 #. type: Plain text
 #: en/diff-format.txt:97
 #, priority:280
 msgid "status is concatenated status characters for each parent"
-msgstr ""
+msgstr "状态是每个父提交的状态字符的合并"
 #. type: Plain text
 #: en/diff-format.txt:98
 #, priority:280
 msgid "no optional \"score\" number"
-msgstr ""
+msgstr "无可选的分数（\"score\"）数字"
 #. type: Plain text
 #: en/diff-format.txt:99
 #, priority:280
 msgid "tab-separated pathname(s) of the file"
-msgstr ""
+msgstr "以制表符分隔的文件路径名"
 #. type: Plain text
 #: en/diff-format.txt:104
-#, priority:280
+#, 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
 #, priority:280
 msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
-msgstr ""
+msgstr "以下为带 `-c` 和 `--cc` 选项且不带 `--combined-all-paths` 选项的示例："
 #. type: delimited block -
 #: en/diff-format.txt:110
@@ -3105,12 +3111,15 @@ msgid ""
 "::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
 #, priority:280
 msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
-msgstr ""
+msgstr "以下为使用 `--combined-all-paths` 选项且使用 `-c` 或 `--cc` 选项的示例:"
 #. type: delimited block -
 #: en/diff-format.txt:118
@@ -3120,24 +3129,30 @@ msgid ""
 "::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
 #, priority:280
 msgid "Note that 'combined diff' lists only files which were modified from all parents."
-msgstr ""
+msgstr "请注意 'combined diff' 只列出了从所有父提交中修改过的文件。"
 #. type: Title -
 #: en/diff-format.txt:128
 #, no-wrap, priority:280
 msgid "other diff formats"
-msgstr ""
+msgstr "其他差异格式"
 #. type: Plain text
 #: en/diff-format.txt:134
 #, 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
@@ -5140,7 +5155,7 @@ msgstr ""
 #: en/fetch-options.txt:10
 #, no-wrap, priority:220
 msgid "--depth=<depth>"
-msgstr "--depth=<depth>"
+msgstr "--depth=<深度>"
 #. type: Plain text
 #: en/fetch-options.txt:16
@@ -5699,7 +5714,8 @@ msgstr ""
 "\t  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
 "\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
 "[--renormalize]\n"
-"\t  [--chmod=(+|-)x] [--] [<pathspec>...]\n"
+"\t  [--chmod=(+|-)x] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
+"\t  [--] [<指定路径>...]\n"
 #. type: Title -
 #: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13