Translated using Weblate (Chinese (Simplified))

Currently translated at 33.5% (3684 of 10990 strings)

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


Signed-off-by: Hou Qiyao <ryanhou24@gmail.com>

po/documentation.zh_HANS-CN.po

@@ -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-05-02 00:50+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-05-02 00:50+0000\nLast-Translator: Hou Qiyao <ryanhou24@gmail.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
@@ -36155,7 +36155,7 @@ msgstr "使用一个mergetool。  `git mergetool`启动一个图形化的mergeto
 #: en/git-merge.txt:340
 #, priority:240
 msgid "Look at the diffs.  `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
-msgstr ""
+msgstr "查看差异。`git diff`将会显示一个三向差异，突出显示从`HEAD`和`MERGE_HEAD`版本的变化。"
 #. type: Plain text
 #: en/git-merge.txt:344
@@ -36173,7 +36173,7 @@ msgstr "看一下原件。  `git show :1:filename`显示共同的祖先，`git s
 #: en/git-merge.txt:356
 #, priority:240
 msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
-msgstr ""
+msgstr "合并分支 `fixes` 和 `enhancements`到当前分支之上, 进行多路合并。"
 #. type: delimited block -
 #: en/git-merge.txt:359
@@ -36185,7 +36185,7 @@ msgstr "$ git merge fixes enhancements\n"
 #: en/git-merge.txt:363
 #, priority:240
 msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
-msgstr ""
+msgstr "将分支`obsolete`合并到当前分支，使用`ours`的合并策略："
 #. type: delimited block -
 #: en/git-merge.txt:366
@@ -36197,7 +36197,7 @@ msgstr "$ git merge -s ours obsolete\n"
 #: en/git-merge.txt:370
 #, priority:240
 msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
-msgstr ""
+msgstr "合并分支`maint`到当前分支，但是我们不做自动创建新提交:"
 #. type: delimited block -
 #: en/git-merge.txt:373
@@ -36209,25 +36209,25 @@ msgstr "$ git merge --no-commit maint\n"
 #: en/git-merge.txt:377
 #, priority:240
 msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
-msgstr ""
+msgstr "当您想在合并中加入进一步的更改，或者您想手动编写合并提交信息时，就可以使用此功能。"
 #. type: Plain text
 #: en/git-merge.txt:381
 #, priority:240
 msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit.  Small fixups like bumping release/version name would be acceptable."
-msgstr ""
+msgstr "你应该避免滥用这个选项，它可以在合并提交中偷偷地进行版本库中实质性的修改。 小的修正，例如修改发布日志内容/版本名称，是推荐的。"
 #. type: Labeled list
 #: en/git-merge.txt:388
 #, no-wrap, priority:240
 msgid "branch.<name>.mergeOptions"
-msgstr ""
+msgstr "分支 .<名字>.合并操作选项"
 #. type: Plain text
 #: en/git-merge.txt:392
 #, priority:240
 msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
-msgstr ""
+msgstr "设置合并到分支<分支名>的默认选项。语法和支持的选项与'git merge'相同，不过目前不支持包含空格的选项值。"
 #. type: Plain text
 #: en/git-merge.txt:405
@@ -51350,7 +51350,7 @@ msgstr "'git show' [<options>] [<object>...]\n"
 #: en/git-show.txt:17
 #, priority:240
 msgid "Shows one or more objects (blobs, trees, tags and commits)."
-msgstr ""
+msgstr "显示一个或多个对象（Blobs、树、标签和提交）。"
 #. type: Plain text
 #: en/git-show.txt:21