diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 47c9713ff9ed6b9bc80cdc3e357e8f5ac03f5503..75409100e649adb4f8a3a5515cb2d52af1730211 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/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-06-26 01:28+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.1\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-06-29 22:37+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.1\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
@@ -34390,7 +34390,7 @@ msgstr "<msg>"
 #: en/git-mailinfo.txt:114
 #, priority:100
 msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
-msgstr ""
+msgstr "餓롧뵷耶먬궙餓뜸릎�먨룚�꾣룓雅ㅶ뿥恙쀤에��펽�싧만�ㅴ틙�θ눎�드춴��뻑訝삯쥦�꾣젃窯섋죱��"
 
 #. type: Labeled list
 #: en/git-mailinfo.txt:115
@@ -34402,7 +34402,7 @@ msgstr "<patch>"
 #: en/git-mailinfo.txt:117
 #, priority:100
 msgid "The patch extracted from e-mail."
-msgstr ""
+msgstr "餓롧뵷耶먬궙餓뜸릎�먨룚�꾥‥訝곥��"
 
 #. type: Title =
 #: en/git-mailsplit.txt:2
@@ -34414,7 +34414,7 @@ msgstr "git-mailsplit(1)"
 #: en/git-mailsplit.txt:7
 #, priority:100
 msgid "git-mailsplit - Simple UNIX mbox splitter program"
-msgstr ""
+msgstr "git-mailsplit - 嶸��뺟쉪UNIX mbox�녶돯葉뗥틣"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:13
@@ -34422,19 +34422,19 @@ msgstr ""
 msgid ""
 "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
 "\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
-msgstr ""
+msgstr "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:18
 #, priority:100
 msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" ..  in the specified directory so you can process them further from there."
-msgstr ""
+msgstr "弱녵�訝� mbox �뉏뻑�뽨�訝� Maildir �녶돯�먧�訝ゆ뻼餓뜹닓烏⑨폏 \"0001\" \"0002\"...... 耶섉붂�ⓩ뙁若싩쉪��퐬訝�펽瓦숁졆鵝졾갚��빳餓롩궍�뚩퓵訝�閭ε쨪�녶츆餓с��"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:21
 #, priority:100
 msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order."
-msgstr ""
+msgstr "Maildir �녶돯堊앲탺雅롦뻼餓뜹릫�꾣럲佯륅펽餓δ씩�됬뀱閭ｇ‘�꾦『佯뤺풏�븃‥訝곥��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:24
@@ -34446,7 +34446,7 @@ msgstr "<mbox>"
 #: en/git-mailsplit.txt:27
 #, priority:100
 msgid "Mbox file to split.  If not given, the mbox is read from the standard input."
-msgstr ""
+msgstr "誤곩늽�꿰쉪 Mbox �뉏뻑�� 倻귝옖亦→쐣瀯쇿눣竊뚦닕餓롦젃�녻풏�δ릎瑥삣룚 Mbox��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:28
@@ -34458,7 +34458,7 @@ msgstr "<Maildir>"
 #: en/git-mailsplit.txt:31
 #, priority:100
 msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories."
-msgstr ""
+msgstr "誤곩늽�꿰쉪 Maildir �꾣졊��퐬�귟퓳訝ょ쎅壤뺝틪瑥ε똿�� cur�걎mp �뚧뼭�꾢춴��퐬��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:32
@@ -34470,13 +34470,13 @@ msgstr "-o<directory>"
 #: en/git-mailsplit.txt:34
 #, priority:100
 msgid "Directory in which to place the individual messages."
-msgstr ""
+msgstr "�양쉰�꾡릉岳→겘�꾤쎅壤뺛��"
 
 #. type: Plain text
 #: en/git-mailsplit.txt:38
 #, priority:100
 msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error."
-msgstr ""
+msgstr "倻귝옖餓삡퐬�뉏뻑亦→쐣餓ε룕餓뜸볶烏뚦�冶뗰펽弱긷걞若싧츆���訝ゅ뜒訝��꾦궙餓뜸에��펽�뚥툖���瓦숁삸�숃���"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:39
@@ -34488,7 +34488,7 @@ msgstr "-d<prec>"
 #: en/git-mailsplit.txt:43
 #, priority:100
 msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames."
-msgstr ""
+msgstr "��빳訝븀뵟�먪쉪�뉏뻑�띷뙁若싦툖�뚨쉪暎얍벧竊뚩�뚥툖��퍡溫ㅷ쉪躍�뎺野쇤쎏��4鵝띷빊��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:44
@@ -34500,7 +34500,7 @@ msgstr "-f<nn>"
 #: en/git-mailsplit.txt:47
 #, priority:100
 msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004."
-msgstr ""
+msgstr "瓮녘퓝寧т�訝� <nn>�겼춻竊뚥풃倻귛쫩�쒏뙁若싦틙-f3竊뚦갚餓� 0004 凉�冶뗧폋�룔��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:48
@@ -34512,7 +34512,7 @@ msgstr "--keep-cr"
 #: en/git-mailsplit.txt:50
 #, priority:100
 msgid "Do not remove `\\r` from lines ending with `\\r\\n`."
-msgstr ""
+msgstr "訝띹쫨餓롣빳 `\\r\\n` 瀯볟갼�꾥죱訝�닠��`\\r`��"
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:51
@@ -34524,7 +34524,7 @@ msgstr "--mboxrd"
 #: en/git-mailsplit.txt:54
 #, priority:100
 msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
-msgstr ""
+msgstr "渦볟뀯�� \"mboxrd\" �쇔폀竊�\"^>+From\" 烏뚩쉬阿됭˙窯졾�믡��"
 
 #. type: Title =
 #: en/git-merge-base.txt:2
@@ -35173,7 +35173,7 @@ msgstr "git-merge-one-file(1)"
 #: en/git-merge-one-file.txt:7
 #, priority:100
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
-msgstr ""
+msgstr "git-merge-one-file - 訝� git-merge-index 訝�壅룝슴�①쉪�뉐뇛渦끻뒰葉뗥틣��"
 
 #. type: Plain text
 #: en/git-merge-one-file.txt:13
@@ -35185,19 +35185,19 @@ msgstr "'git merge-one-file'\n"
 #: en/git-merge-one-file.txt:18
 #, priority:100
 msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'."
-msgstr ""
+msgstr "瓦숁삸�뉐뇛�꾥푷�⑴쮮佯륅펽訝� 'git merge-index' 訝�壅룝슴�⑨펽餓θ㎗�녕뵪 'git read-tree -m' 瓦쏂죱�꾤릱閻롥릦亮뜹릮�꾢릦亮띌뿮窯섅��"
 
 #. type: Title =
 #: en/git-mergetool--lib.txt:2
 #, no-wrap, priority:100
 msgid "git-mergetool{litdd}lib(1)"
-msgstr ""
+msgstr "git-mergetool{litdd}lib(1)"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:7
 #, priority:100
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
-msgstr ""
+msgstr "git-mergetool--lib - 躍멱쭅�� Git �덂뭉藥ε끁鶯� shell �싨쑍葉뗥틣"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:12
@@ -35209,19 +35209,19 @@ msgstr "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"
 #: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
 #, priority:100
 msgid "This is not a command the end user would want to run.  Ever.  This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones."
-msgstr ""
+msgstr "瓦쇾툖���訝ょ퍑塋�뵪�룡꺍誤곮퓧烏뚨쉪�썰빱�� 麗멱퓶訝띴폏�� 瓦쇾릉�뉑。��맏�붺㈅ Porcelain-ish �싨쑍��/�뽪��①폋�숁뼭�싨쑍�꾡볶�녶쨭�꾠��"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:23
 #, priority:100
 msgid "The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working with Git merge tools."
-msgstr ""
+msgstr "'git-mergetool{litdd}lib' �싨쑍熬ヨ�溫→닇��빳熬ュ끀餓� shell �싨쑍凉뺟뵪竊덁슴�� `.`竊됵펽餓θ�營�툗 Git �덂뭉藥ε끁訝�壅룟램鵝쒐쉪�잒꺗��"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:27
 #, priority:100
 msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below.  'diff' and 'merge' are valid values."
-msgstr ""
+msgstr "�③벦�ε댆 'git-mergetool{litdd}lib' 阿뗥뎺竊뚥퐷�꾥꽊�у퓚窈삭�營� `TOOL_MODE` �ε츣阿됦툔�쀥눦�곁쉪�띴퐳與▼폀�� 'diff' �� 'merge'��쐣�덂�쇈��"
 
 #. type: Title -
 #: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34
@@ -35233,37 +35233,37 @@ msgstr "�잒꺗"
 #: en/git-mergetool--lib.txt:30
 #, no-wrap, priority:100
 msgid "get_merge_tool"
-msgstr ""
+msgstr "get_merge_tool"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:34
 #, priority:100
 msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool."
-msgstr ""
+msgstr "瓦붷썮訝�訝ゅ릦亮뜹램�룔�귛쫩�쒏닊餓ц퓭�욂�訝よ˙�쒍릎�꾢릦亮뜹램�뤄펽瓦붷썮餓ｇ쟻訝� 1竊뚦맔�쇾맏0��'$GIT_MERGETOOL_GUI' ��빳熬ヨ�營�맏 'true' 餓ζ맂榮℡릦�귞쉪 guitool��"
 
 #. type: Labeled list
 #: en/git-mergetool--lib.txt:35
 #, no-wrap, priority:100
 msgid "get_merge_tool_cmd"
-msgstr ""
+msgstr "get_merge_tool_cmd"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:37
 #, priority:100
 msgid "returns the custom command for a merge tool."
-msgstr ""
+msgstr "瓦붷썮訝�訝ゅ릦亮뜹램�루쉪�ゅ츣阿됧뫝餓ㅳ��"
 
 #. type: Labeled list
 #: en/git-mergetool--lib.txt:38
 #, no-wrap, priority:100
 msgid "get_merge_tool_path"
-msgstr ""
+msgstr "get_merge_tool_path"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:40
 #, priority:100
 msgid "returns the custom path for a merge tool."
-msgstr ""
+msgstr "瓦붷썮訝�訝ゅ릦亮뜹램�루쉪�ゅ츣阿됭러孃꾠��"
 
 #. type: Labeled list
 #: en/git-mergetool--lib.txt:41
@@ -35275,7 +35275,7 @@ msgstr "run_merge_tool"
 #: en/git-mergetool--lib.txt:44
 #, priority:100
 msgid "bring merge tool specific functions into scope so they can be used or overridden."
-msgstr ""
+msgstr "弱녶릦亮뜹램�루쉪�밧츣�썸빊躍�뀯�껃쎍竊뚥빳堊욕츆餓у룾餓θ˙鵝욜뵪�뽭뇥�쇻��"
 
 #. type: Labeled list
 #: en/git-mergetool--lib.txt:45
@@ -35287,7 +35287,7 @@ msgstr "run_merge_tool"
 #: en/git-mergetool--lib.txt:50
 #, priority:100
 msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present.  '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
-msgstr ""
+msgstr "��뒯訝�訝ゅ릦亮뜹램�뤄펽瀯쇿츣藥ε끁�띸㎞�뚥�訝� true/false �뉐퓱竊뚩〃鹽뷸삸��춼�ⓧ�訝ゅ릦亮뜹읃簾��� $MERGED'竊� '$LOCAL'竊�'$REMOTE' �� '$BASE' 恙낂』熬ュ츣阿됵펽餓δ씩�긷릦亮뜹램�룝슴�ⓦ��"
 
 #. type: Title =
 #: en/git-mergetool.txt:2
@@ -35453,31 +35453,31 @@ msgstr "git-merge-tree - Show three-way merge without touching index"
 msgid ""
 "'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n"
 "'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n"
-msgstr ""
+msgstr "'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:23
-#, priority:100
+#, fuzzy, priority:100
 msgid "This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode.  With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of this documentation describes modern `--write-tree` mode."
-msgstr ""
+msgstr " "
 
 #. type: Plain text
 #: en/git-merge-tree.txt:26
 #, priority:100
 msgid "Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index."
-msgstr ""
+msgstr "�㎬죱�덂뭉竊뚥퐜訝띶걳餓삡퐬�곁쉪�먧벡竊뚥튋訝띴퍗藥δ퐳�뷸닑榮℡폊訝���뽪닑�쇿뀯��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:29
 #, priority:100
 msgid "The performed merge will use the same feature as the \"real\" linkgit:git-merge[1], including:"
-msgstr ""
+msgstr "�㎬죱�꾢릦亮뜹컛鵝욜뵪訝� �쒐쐿閭ｇ쉪�� linkgit:git-merge[1] �멨릪�꾢뒣�쏙펽�끾떖竊�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:31
 #, priority:100
 msgid "three way content merges of individual files"
-msgstr ""
+msgstr "�뺜릉�뉏뻑�꾢쩀瓮�릦亮�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:32
@@ -35490,37 +35490,37 @@ msgstr "--rename-section"
 #: en/git-merge-tree.txt:33
 #, priority:100
 msgid "proper directory/file conflict handling"
-msgstr ""
+msgstr "閭ｇ‘鸚꾤릤��퐬/�뉏뻑�꿰챳"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:35
 #, priority:100
 msgid "recursive ancestor consolidation (i.e. when there is more than one merge base, creating a virtual merge base by merging the merge bases)"
-msgstr ""
+msgstr "�믣퐩曄뽩뀍�덂뭉竊덂뜵壤볠쐣訝�訝や빳訝딁쉪�덂뭉�뷸빊�띰펽�싪퓝�덂뭉�뷸빊�쎾뻠訝�訝よ솞�잌릦亮뜹읃�곤펹��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:36
 #, priority:100
 msgid "etc."
-msgstr ""
+msgstr "嶺됬춬��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:39
 #, priority:100
 msgid "After the merge completes, a new toplevel tree object is created.  See `OUTPUT` below for details."
-msgstr ""
+msgstr "�덂뭉若뚧닇�롳펽鴉싧닗兩뷰�訝ゆ뼭�꾦《掠귝젒野배괌�� 瑥�쭅訝뗩씊�� �쒑풏�뷜�앫��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:48
 #, priority:100
 msgid "Do not quote filenames in the <Conflicted file info> section, and end each filename with a NUL character rather than newline.  Also begin the messages section with a NUL character instead of a newline.  See <<OUTPUT>> below for more information."
-msgstr ""
+msgstr "�� <�꿰챳�뉏뻑岳→겘> �ⓨ늽訝띹쫨凉뺟뵪�뉏뻑�랃펽驪뤶릉�뉏뻑�띸뵪 NUL 耶쀧Е�뚥툖��뜟烏뚧씎瀯볠씇�� �ⓧ에��깿�녵튋誤곭뵪 NUL 耶쀧Е�뚥툖��뜟烏뚧씎凉�冶뗣�� �닷쩀岳→겘鰲곦툔�®쉪 <<OUTPUT>>��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:55
 #, priority:100
 msgid "In the Conflicted file info section, instead of writing a list of (mode, oid, stage, path) tuples to output for conflicted files, just provide a list of filenames with conflicts (and do not list filenames multiple times if they have multiple conflicting stages)."
-msgstr ""
+msgstr "�ⓨ넳囹곭쉪�뉏뻑岳→겘�ⓨ늽竊뚥툖誤곦맏�꿰챳�꾣뻼餓뜹넍訝�訝わ펷mode, oid, stage, path竊됧쎗�껃닓烏ⓩ씎渦볟눣竊뚦룵���먧풘訝�訝ゆ쐣�꿰챳�꾣뻼餓뜹릫�쀨〃竊덂쫩�쒏뻼餓뜻쐣鸚싦릉�꿰챳�꾦샄餘듸펽訝띶쩀轝▼닓�뷸뻼餓뜹릫竊됥��"
 
 #. type: Labeled list
 #: en/git-merge-tree.txt:56
@@ -35532,7 +35532,7 @@ msgstr "--[no-]messages"
 #: en/git-merge-tree.txt:61
 #, priority:100
 msgid "Write any informational messages such as \"Auto-merging <path>\" or CONFLICT notices to the end of stdout.  If unspecified, the default is to include these messages if there are merge conflicts, and to omit them otherwise."
-msgstr ""
+msgstr "弱녵뻣鵝뺜에���㎫쉪易덃겘竊뚦쫩\"Auto-merging <path>\" �뽩넳囹곲�싩윥�쇿댆�뉐뇛渦볟눣役곭쉪�ュ갼�� 倻귝옖亦→쐣�뉐츣竊뚪퍡溫ㅶ깄�듕툔竊뚦쫩�쒏쐣�덂뭉�꿰챳竊뚦갚�끾떖瓦쇾틳岳→겘竊뚦맔�쇿갚�곭븼若껂뺄��"
 
 #. type: Labeled list
 #: en/git-merge-tree.txt:62 en/merge-options.txt:200
@@ -35544,7 +35544,7 @@ msgstr "--allow-unrelated-histories"
 #: en/git-merge-tree.txt:66
 #, priority:100
 msgid "merge-tree will by default error out if the two branches specified share no common history.  This flag can be given to override that check and make the merge proceed anyway."
-msgstr ""
+msgstr "倻귝옖�뉐츣�꾡륵訝ゅ늽��깹�됧뀻�뚨쉪�녶뤁竊똫erge-tree 容섋�鴉싧눣�쇻�� 瓦쇾릉�뉐퓱��빳�ⓩ씎誤녺썣瓦쇾릉汝��ο펽亮뜸슴�덂뭉瀯㎫뺌瓦쏂죱��"
 
 #. type: Labeled list
 #: en/git-merge-tree.txt:67
@@ -35556,25 +35556,25 @@ msgstr "--merged [<commit>]"
 #: en/git-merge-tree.txt:71
 #, priority:100
 msgid "Instead of finding the merge-bases for <branch1> and <branch2>, specify a merge-base for the merge, and specifying multiple bases is currently not supported. This option is incompatible with `--stdin`."
-msgstr ""
+msgstr "訝띺�誤곦맏 <branch1> �� <branch2> 野삥돻�덂뭉�븀�竊뚩�뚧삸訝뷴릦亮뜻뙁若싦�訝ゅ릦亮뜹읃簾�竊뚨쎅�띴툖��똻�뉐츣鸚싦릉�덂뭉�븀��귟��됮」訝� `--stdin` 訝띶끉若밤��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:78
 #, priority:100
 msgid "For a successful merge, the output from git-merge-tree is simply one line:"
-msgstr ""
+msgstr "野밥틢訝�訝ゆ닇�잏쉪�덂뭉竊똤it-merge-tree �꾥풏�뷰퍎餓끾삸訝�烏뚳폏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:80
 #, no-wrap, priority:100
 msgid "\t<OID of toplevel tree>\n"
-msgstr ""
+msgstr "\t<OID of toplevel tree>\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:82
 #, priority:100
 msgid "Whereas for a conflicted merge, the output is by default of the form:"
-msgstr ""
+msgstr "�뚦�雅롦쐣�꿰챳�꾢릦亮띰펽容섋��꾥풏�뷴숱凉뤸삸竊�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:86
@@ -35583,19 +35583,19 @@ msgid ""
 "\t<OID of toplevel tree>\n"
 "\t<Conflicted file info>\n"
 "\t<Informational messages>\n"
-msgstr ""
+msgstr "\t<OID of toplevel tree>\n\t<Conflicted file info>\n\t<Informational messages>\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:88
 #, priority:100
 msgid "These are discussed individually below."
-msgstr ""
+msgstr "訝뗩씊弱녶늽�ヨ�溫븃퓳雅쏃뿮窯섅��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:93
 #, priority:100
 msgid "However, there is an exception.  If `--stdin` is passed, then there is an extra section at the beginning, a NUL character at the end, and then all the sections repeat for each line of input.  Thus, if the first merge is conflicted and the second is clean, the output would be of the form:"
-msgstr ""
+msgstr "�띈�뚳펽�됦�訝や풃鸚뽧�� 倻귝옖�싪퓝雅� `--stdin`竊뚪궍阿덂쑉凉�鸚닸쐣訝�訝ら쥫鸚뽫쉪�ⓨ늽竊뚦쑉瀯볟갼�됦�訝� NUL 耶쀧Е竊뚨꽫�롦��됬쉪�ⓨ늽�ⓩ캀烏뚩풏�δ릎�썰폏�띶쨳�� �졿�竊뚦쫩�쒐К訝�轝▼릦亮뜻삸�꿰챳�꾬펽�뚨К雅뚧А��묾���꾬펽渦볟눣弱녷삸瓦숁졆�꾢숱凉륅폏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:102
@@ -35609,7 +35609,7 @@ msgid ""
 "\t<Merge status>\n"
 "\t<OID of toplevel tree>\n"
 "\tNUL\n"
-msgstr ""
+msgstr "\t<Merge status>\n\t<OID of toplevel tree>\n\t<Conflicted file info>\n\t<Informational messages>\n\tNUL\n\t<Merge status>\n\t<OID of toplevel tree>\n\tNUL\n"
 
 #. type: Title ~
 #: en/git-merge-tree.txt:105
@@ -35622,7 +35622,7 @@ msgstr "merge.stat"
 #: en/git-merge-tree.txt:108
 #, priority:100
 msgid "This is an integer status followed by a NUL character.  The integer status is:"
-msgstr ""
+msgstr "瓦숁삸訝�訝ゆ빐�곁듁�곻펽�롩씊�됦�訝� NUL 耶쀧Е�� �닸빊�뜻�곫삸竊�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:113
@@ -35632,31 +35632,31 @@ msgid ""
 "     1: merge was clean\n"
 "     <0: something prevented the merge from running (e.g. access to repository\n"
 "\t objects denied by filesystem)\n"
-msgstr ""
+msgstr "     0竊싧릦亮뜹릮�됧넳囹�\n     1竊� �덂뭉��묾����\n     <0竊싨쐣餓�阿덁툥蜈욥샍閭㏘틙�덂뭉�꾥퓧烏뚳펷堊뗥쫩竊뚧뻼餓띄내瀯잍땼瀯앭�餓볟틩野배괌�꾥���\n\t 野배괌�꾥���˙�뉏뻑楹사퍨�믥퍦)\n"
 
 #. type: Title ~
 #: en/git-merge-tree.txt:116
 #, no-wrap, priority:100
 msgid "OID of toplevel tree"
-msgstr ""
+msgstr "窈뜹콆��퐬�묊쉪 OID"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:122
 #, priority:100
 msgid "This is a tree object that represents what would be checked out in the working tree at the end of `git merge`.  If there were conflicts, then files within this tree may have embedded conflict markers.  This section is always followed by a newline (or NUL if `-z` is passed)."
-msgstr ""
+msgstr "瓦숁삸訝�訝ゆ젒�뜹�穩∽펽餓ｈ〃��`git merge` 瀯볠씇�뜹램鵝쒎뙷訝딀��ε눣�η쉪訝쒑��� 倻귝옖�됧넳囹곻펽�ｄ퉰瓦쇾릉��퐬�묇릎�꾣뻼餓뜹룾�썰폏�됧탪�ε폀�꿰챳�뉓��� 瓦쇾��ⓨ늽�꾢릮�€�삥삸�됦�訝ゆ뜟烏뚨Е竊덂쫩�쒍폖�믢틙 `-z` �쇾맏 NUL竊됥��"
 
 #. type: Title ~
 #: en/git-merge-tree.txt:125
 #, no-wrap, priority:100
 msgid "Conflicted file info"
-msgstr ""
+msgstr "�꿰챳�꾣뻼餓뜸에��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:128
 #, priority:100
 msgid "This is a sequence of lines with the format"
-msgstr ""
+msgstr "瓦숁삸訝�瓦욂림�꾥죱竊뚧졏凉뤶맏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:130
@@ -35680,43 +35680,43 @@ msgstr "岳→겘"
 #: en/git-merge-tree.txt:144
 #, priority:100
 msgid "This section provides informational messages, typically about conflicts.  The format of the section varies significantly depending on whether `-z` is passed."
-msgstr ""
+msgstr "瓦쇾��ⓨ늽�먧풘岳→겘竊뚪�싧만��뀽雅롥넳囹곭쉪岳→겘�� 瑥ι깿�녺쉪�쇔폀�졿삸�╊폖�믢틙 `-z` �뚧쐣孃덂ㄷ訝띶릪��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:146
 #, priority:100
 msgid "If `-z` is passed:"
-msgstr ""
+msgstr "倻귝옖 `-z`熬ヤ폖�믭폏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:149
 #, priority:100
 msgid "The output format is zero or more conflict informational records, each of the form:"
-msgstr ""
+msgstr "渦볟눣�쇔폀��쎏�→닑�닷쩀�꾢넳囹곦에���壤뺧펽驪뤸씉溫겼퐬�꾢숱凉뤻꺗��폏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:151
 #, no-wrap, priority:100
 msgid "\t<list-of-paths><conflict-type>NUL<conflict-message>NUL\n"
-msgstr ""
+msgstr "\t<list-of-paths><conflict-type>NUL<conflict-message>NUL\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:153
 #, priority:100
 msgid "where <list-of-paths> is of the form"
-msgstr ""
+msgstr "�뜸릎 <list-of-paths> �꾢숱凉뤶맏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:155
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "\t<number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL\n"
-msgstr ""
+msgstr "\t<number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL\n"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:159
 #, priority:100
 msgid "and includes paths (or branch names) affected by the conflict or informational message in <conflict-message>.  Also, <conflict-type> is a stable string explaining the type of conflict, such as"
-msgstr ""
+msgstr "亮뜹똿�у룛�꿰챳壤긷뱧�꾥러孃꾬펷�뽩늽��릫燁곤펹�� <conflict-message> 訝�쉪岳→겘易덃겘�� ��쨼竊�<conflict-type> ���訝ょ㉢若싩쉪耶쀧Е訝뀐펽鰲ｉ뇢雅녶넳囹곭쉪映삣엹竊뚧캈倻귟�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:161
@@ -35728,25 +35728,25 @@ msgstr "--series <file>"
 #: en/git-merge-tree.txt:162
 #, priority:100
 msgid "\"CONFLICT (rename/delete)\""
-msgstr ""
+msgstr "\"CONFLICT (rename/delete)\""
 
 #. type: Plain text
 #: en/git-merge-tree.txt:163
 #, priority:100
 msgid "\"CONFLICT (submodule lacks merge base)\""
-msgstr ""
+msgstr "\"CONFLICT (submodule lacks merge base)\""
 
 #. type: Plain text
 #: en/git-merge-tree.txt:164
 #, priority:100
 msgid "\"CONFLICT (binary)\""
-msgstr ""
+msgstr "\"CONFLICT (binary)\""
 
 #. type: Plain text
 #: en/git-merge-tree.txt:168
 #, priority:100
 msgid "and <conflict-message> is a more detailed message about the conflict which often (but not always) embeds the <stable-short-type-description> within it.  These strings may change in future Git versions.  Some examples:"
-msgstr ""
+msgstr "�� <conflict-message> ��뀽雅롥넳囹곭쉪�닺�瀯녺쉪岳→겘竊뚪�싧만竊덁퐜訝띴�若싷펹鴉싧탪�� <stable-short-type-description> 訝��� 瓦쇾틳耶쀧Е訝꿨쑉�ゆ씎�껯it�덃쑍訝�룾�썰폏�밧룜�� 訝�雅쎽풃耶먲폏"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:170
@@ -35758,25 +35758,25 @@ msgstr "--series <file>"
 #: en/git-merge-tree.txt:171
 #, ignore-ellipsis, priority:100
 msgid "\"CONFLICT (rename/delete): <oldfile> renamed...but deleted in...\""
-msgstr ""
+msgstr "\"CONFLICT (rename/delete): <oldfile> 熬ラ뇥�썲릫... 鵝녶쑉... 熬ュ닠�ㅳ��\""
 
 #. type: Plain text
 #: en/git-merge-tree.txt:172
 #, priority:100
 msgid "\"Failed to merge submodule <submodule> (no merge base)\""
-msgstr ""
+msgstr "�쒎릦亮뜹춴與▼쓼 <submodule> 鸚김뇰竊덃깹�됧릦亮뜹읃簾�竊됤��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:173
 #, priority:100
 msgid "\"Warning: cannot merge binary files: <filename>\""
-msgstr ""
+msgstr "�쒑��딉폏訝띹꺗�덂뭉雅뚩퓵�뜻뻼餓띰폏 <filename>��"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:175
 #, priority:100
 msgid "If `-z` is NOT passed:"
-msgstr ""
+msgstr "倻귝옖亦→쐣鴉좈�� `-z`竊�"
 
 #. type: Plain text
 #: en/git-merge-tree.txt:185
@@ -39088,13 +39088,13 @@ msgstr ""
 #: en/git-pack-objects.txt:59
 #, priority:100
 msgid "Write into pairs of files (.pack and .idx), using <base-name> to determine the name of the created file.  When this option is used, the two files in a pair are written in <base-name>-<SHA-1>.{pack,idx} files.  <SHA-1> is a hash based on the pack content and is written to the standard output of the command."
-msgstr ""
+msgstr "�쇿뀯�먨��꾣뻼餓띰펷.pack �� .idx竊됵펽鵝욜뵪 <base-name> �η‘若싧닗兩븀쉪�뉏뻑�띲�� 壤볞슴�②��됮」�띰펽訝�野밥릎�꾡륵訝ゆ뻼餓띈˙�쇿뀯 <base-name>-<SHA-1>.{pack,idx} �뉏뻑�� <SHA-1> ���訝ゅ읃雅� pack �끻��꾢뱢躍뚦�쇽펽鴉싧넍�ε뫝餓ㅷ쉪�뉐뇛渦볟눣訝���"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:63
 #, priority:100
 msgid "Write the pack contents (what would have been written to .pack file) out to the standard output."
-msgstr ""
+msgstr "弱녶똿�꾢냵若뱄펷�ф씎誤곩넍�� .pack �뉏뻑訝�쉪�끻�竊됧넍�경젃�녻풏�뷰릎��"
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:64
@@ -39106,7 +39106,7 @@ msgstr "--revs"
 #: en/git-pack-objects.txt:72
 #, priority:100
 msgid "Read the revision arguments from the standard input, instead of individual object names.  The revision arguments are processed the same way as 'git rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs.  The objects on the resulting list are packed.  Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
-msgstr ""
+msgstr "餓롦젃�녻풏�θ��뽨엶溫℡뢿�곤펽�뚥툖��뜒訝ゅ�穩▼릫燁겹�� 岳���덂뢿�곁쉪鸚꾤릤�밧폀訝롥를�� `--object` �뉐퓱�� 'git rev-list' 鵝욜뵪�� `commit` �귝빊�ε뻠塋뗥끀渦볟눣�꾢�穩▼닓烏①쎑�뚣�� 瀯볠옖�쀨〃訝딁쉪野배괌熬ユ돀�끹�� �ㅴ틙岳��竊뚩퓲�ε룛 `--not` �� `--shallow <SHA-1>` 烏뚣��"
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:73 en/rev-list-options.txt:917
@@ -39118,19 +39118,19 @@ msgstr "--unpacked"
 #: en/git-pack-objects.txt:77
 #, priority:100
 msgid "This implies `--revs`.  When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed."
-msgstr ""
+msgstr "瓦숁슅�� `--revs`�� 壤볟쨪�녵퍗�뉐뇛渦볟뀯瑥삣룚�꾡엶溫℡뢿�겼닓烏ⓩ뿶竊뚦컛�볟똿�꾢�穩↓솏�뜹쑉�ｄ틳弱싨쑋�볟똿�꾢�穩▲��"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:83
 #, priority:100
 msgid "This implies `--revs`.  In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included."
-msgstr ""
+msgstr "瓦숁슅�� `--revs`�� �ㅴ틙餓롦젃�녻풏�δ릎瑥삣룚�꾡엶溫℡뢿�겼닓烏ⓨ쨼竊뚩퓲�뉓��뉐츣誤곩똿�� `refs/`訝뗧쉪���됧폊�ⓦ��"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:88
 #, priority:100
 msgid "Include unasked-for annotated tags if the object they reference was included in the resulting packfile.  This can be useful to send new tags to native Git clients."
-msgstr ""
+msgstr "�끾떖�よ˙誤곫콆�꾣낏�딀젃嶺억펽倻귝옖若껂뺄凉뺟뵪�꾢�穩↑˙�끻맜�①퍜�쒐쉪�볟똿�뉏뻑訝��� 瓦쇿�雅롥릲�у쑑 Git 若€댎塋�룕�곫뼭�꾣젃嶺얍푽�됬뵪��"
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:89
@@ -39142,13 +39142,13 @@ msgstr "--stdin-packs"
 #: en/git-pack-objects.txt:95
 #, priority:100
 msgid "Read the basenames of packfiles (e.g., `pack-1234abcd.pack`)  from the standard input, instead of object names or revision arguments. The resulting pack contains all objects listed in the included packs (those not beginning with `^`), excluding any objects listed in the excluded packs (beginning with `^`)."
-msgstr ""
+msgstr "餓롦젃�녻풏�δ릎瑥삣룚 packfiles竊덁풃倻귨폏`pack-1234abcd.pack`竊됬쉪�뷸쑍�띸㎞竊뚩�뚥툖���穩▼릫燁경닑岳���귝빊�귚벨�잏쉪�경뜮�끻똿�ユ��됧쑉�끻맜�꾣빊��똿訝�닓�븀쉪野배괌竊덆궍雅쎽툖��빳 `^` 凉�鸚당쉪竊됵펽�믧솮�ⓩ럲�ㅷ쉪�경뜮�끺릎�쀥눣�꾡뻣鵝뺝�穩∽펷餓� `^` 凉�鸚댐펹��"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:98
 #, priority:100
 msgid "Incompatible with `--revs`, or options that imply `--revs` (such as `--all`), with the exception of `--unpacked`, which is compatible."
-msgstr ""
+msgstr "訝� `--revs` �뽪슅�� `--revs` �꾦�됮」竊덂쫩 `--all`竊됦툖�쇔�竊뚥퐜 `--unpacked` �ㅵ쨼竊뚦츆��끉若밭쉪��"
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:99 en/git-repack.txt:66
@@ -39160,7 +39160,7 @@ msgstr "--cruft"
 #: en/git-pack-objects.txt:109
 #, priority:100
 msgid "Packs unreachable objects into a separate \"cruft\" pack, denoted by the existence of a `.mtimes` file. Typically used by `git repack --cruft`. Callers provide a list of pack names and indicate which packs will remain in the repository, along with which packs will be deleted (indicated by the `-` prefix). The contents of the cruft pack are all objects not contained in the surviving packs which have not exceeded the grace period (see `--cruft-expiration` below), or which have exceeded the grace period, but are reachable from an other object which hasn't."
-msgstr ""
+msgstr "弱녷뿞力뺝댆渦양쉪野배괌�볟똿�겻�訝ゅ뜒�х쉪 \"cruft\" �끺릎竊뚥빳 `.mtimes` �뉏뻑�꾢춼�ⓧ맏�뉐퓱�귡�싧만��`git repack --cruft`鵝욜뵪�귟컘�②�끾룓堊쎽�訝ゅ똿�꾢릫燁겼닓烏⑨펽亮뜻뙁�뷴벆雅쎾똿弱녵퓷�쇿쑉�덃쑍佯볞릎竊뚥빳�듿벆雅쎾똿弱녻˙�좈솮竊덄뵪 `-` �띸�烏①ㅊ竊됥�괹ruft �끿쉪�끻�����됦툖�끻맜�ⓨ뭏耶섊쉪�끺릎�꾢�穩∽펽若껂뺄亦→쐣擁낁퓝若썽솏�잞펷鰲곦툔�®쉪 `--cruft-expiration`竊됵펽�뽬�끻츆餓у럴瀯뤺텈瓦뉏틙若썽솏�잞펽鵝녶룾餓δ퍗�뜸퍟亦→쐣擁낁퓝若썽솏�잏쉪野배괌訝�댆渦얇��"
 
 #. type: Plain text
 #: en/git-pack-objects.txt:116