Translated using Weblate (Japanese)

Currently translated at 18.3% (1971 of 10729 strings)

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


Signed-off-by: yajamon <yajamon.tatsuki@gmail.com>

po/documentation.ja.po

@@ -4,7 +4,7 @@
 # Jean-Noël AVILA <jn.avila@free.fr>, 2020.
 #
 msgid ""
-msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-12 16:53+0000\nLast-Translator: yajamon <yajamon.tatsuki@gmail.com>\nLanguage-Team: Japanese\nLanguage: ja\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.9.1-dev\n"
+msgstr "Project-Id-Version: git-manpages-l 10n\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-10-31 17:03+0100\nPO-Revision-Date: 2021-11-15 16:49+0000\nLast-Translator: yajamon <yajamon.tatsuki@gmail.com>\nLanguage-Team: Japanese\nLanguage: ja\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.9.1-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:128 en/git-status.txt:31
@@ -4009,7 +4009,7 @@ msgstr "--diff-merges=separate"
 #: en/diff-options.txt:66
 #, priority:280
 msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
-msgstr ""
+msgstr "これにより、マージコミットはそれぞれの親に対する完全な diff を表示します。親ごとに個別のログエントリと差分が生成されます。"
 #. type: Labeled list
 #: en/diff-options.txt:67
@@ -4033,7 +4033,7 @@ msgstr "-c"
 #: en/diff-options.txt:76
 #, priority:280
 msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`."
-msgstr ""
+msgstr "このオプションを使用すると、マージコミットのdiff出力は、親と結果のペアごとの差分を一度に1つずつ表示するのではなく、各親からの差分をマージ結果に同時に表示します。さらに、すべての親から変更されたファイルのみが一覧表示されます。 `-c`は`-p`を意味します。"
 #. type: Labeled list
 #: en/diff-options.txt:77