From 8bcf6cff54b7bf6c61b99d41832391dfd20c1506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=89?= <ranto2012@163.com>
Date: Wed, 28 Apr 2021 09:54:15 +0000
Subject: [PATCH] Translated using Weblate (Chinese (Simplified))
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 15.0% (1591 of 10602 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 | 100 +++++++++++++++------------------
 1 file changed, 44 insertions(+), 56 deletions(-)

diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 56bf472..8a9bad3 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,19 +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\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2021-02-27 18:16+0100\n"
-"PO-Revision-Date: 2021-04-06 18:01+0000\n"
-"Last-Translator: Patrick R GUERRERO <jcs.pattystackzz@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_HANS-CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.6-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-04-29 10:32+0000\nLast-Translator: �� <ranto2012@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.7-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
@@ -1649,8 +1637,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
 
-#. type: Plain text
 # �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:39
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -3582,49 +3570,49 @@ msgstr "�③뇥�썲릫�꾣깄�듕툔竊뚦츑�닺러孃꾢뎺鸚싧눣�� `NUL` 訝뷰틙溫⑵�
 #: en/diff-generate-patch.txt:2
 #, no-wrap, priority:280
 msgid "Generating patch text with -p"
-msgstr ""
+msgstr "鵝욜뵪�됮」 `-p` �잍닇烏δ툈�뉑쑍"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:15
 #, priority:280
 msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text.  You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])."
-msgstr ""
+msgstr "瓦먫죱 linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], �� linkgit:git-diff-files[1] �뜹를�� `-p` �됮」鴉싩뵟�먫‥訝곫뻼�с�귚퐷��빳�싪퓝 `GIT_EXTERNAL_DIFF` �� `GIT_DIFF_OPTS` ��쥊�섌뇧�ε츣�띈‥訝곫뻼�у닗兩븝펷�귟쭅 linkgit:git[1]竊됥��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:18
 #, priority:280
 msgid "What the -p option produces is slightly different from the traditional diff format:"
-msgstr ""
+msgstr "-p �됮」雅㎫뵟�꾢냵若밥툗鴉좂퍨�꾢량凉귝졏凉뤹븼�됦툖�뚳폏"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:20
 #, priority:280
 msgid "It is preceded with a \"git diff\" header that looks like this:"
-msgstr ""
+msgstr "若껃뎺�€쐣訝�訝� `git diff` 鸚댐펽倻귚툔��鹽븝폏"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:22
 #, no-wrap, priority:280
 msgid "diff --git a/file1 b/file2\n"
-msgstr ""
+msgstr "diff --git a/file1 b/file2\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:26
 #, priority:280
 msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved.  Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
-msgstr ""
+msgstr "`a/` �� `b/` �꾣뻼餓뜹릫�멨릪竊뚪솮�욄텎�듿댆�띶뫝��/鸚띶댍�귞돶�ュ쑑竊뚦뜵鵝욘삸�쎾뻠�뽩닠�ㅿ펽阿� _訝�_ 鵝욜뵪 `/dev/null` �δ빰�� `a/` �� `b/` �뉏뻑�띲��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:30
 #, priority:280
 msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
-msgstr ""
+msgstr "壤볠텎�듿댆�띶뫝��/鸚띶댍�띰펽`file1` �� `file2` �녶닽�양ㅊ�띶뫝��/鸚띶댍�꾣틦�뉏뻑�꾢릫燁겼뭽�띶뫝��/鸚띶댍雅㎫뵟�꾣뻼餓띄쉪�띸㎞��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:32
 #, priority:280
 msgid "It is followed by one or more extended header lines:"
-msgstr ""
+msgstr "若껆쉪�롩씊���訝ゆ닑鸚싦릉�⒴콝鸚답에��죱竊�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:44
@@ -3641,43 +3629,43 @@ msgid ""
 "similarity index <number>\n"
 "dissimilarity index <number>\n"
 "index <hash>..<hash> <mode>\n"
-msgstr ""
+msgstr "old mode <與▼폀>\nnew mode <與▼폀>\ndeleted file mode <與▼폀>\nnew file mode <與▼폀>\ncopy from <瓮�푶>\ncopy to <瓮�푶>\nrename from <瓮�푶>\nrename to <瓮�푶>\nsimilarity index <�겼춻>\ndissimilarity index <�겼춻>\nindex <�덂툕>..<�덂툕> <與▼폀>\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:47
 #, priority:280
 msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
-msgstr ""
+msgstr "�뉏뻑與▼폀熬ユ돀�겻맏6鵝띶뀵瓦쎾댍�겼춻竊뚦똿�ф뻼餓띄굳�뗥뭽�뉏뻑�껈솏鵝띲��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:49
 #, priority:280
 msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
-msgstr ""
+msgstr "�⒴콝鸚답에��릎�꾥러孃꾢릫燁겻툖�끾떖 `a/` �� `b/` �띸���"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:56
 #, priority:280
 msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines.  It is a rounded down integer, followed by a percent sign.  The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
-msgstr ""
+msgstr "�멧세�㎪뙁�경삸�ゆ뵻�섊쉪烏뚦뜝驪뷂펽�뚥툖�멧세�㎪뙁�경삸�밧룜�꾥죱�졿캈�귛츆��썪�띴틪�η쉪�닸빊竊뚦릮�됬쇍�녶뤇�귛썱閭ㅿ펽100%�꾤쎑鴉쇔벧�뉑빊�뉏맏訝ㅴ릉�뉏뻑�며춬竊뚩�� 100% �꾡툖�멧세佯�꼷�녕��ζ뼭�뉏뻑訝�깹�됪뿧�뉏뻑訝�쉪烏뚣��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:60
 #, priority:280
 msgid "The index line includes the blob object names before and after the change.  The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
-msgstr ""
+msgstr "榮℡폊烏뚦똿�ф뵻�섇뎺�뚧뵻�섇릮�� blob 野배괌�띸㎞�귛쫩�쒏뻼餓뜻Æ凉뤸깹�됧룜�뽳펽�쇿똿�� <與▼폀>竊쎾맔�숋펽�녶닽�양ㅊ�경뿧與▼폀��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:64
 #, priority:280
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
+msgstr "�ユ쐣 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉뺟뵪竊뚩퓳訝��밧쑉�띸쉰�섌뇧` core.quotePath` 訝�쐣��鰲ｉ뇢竊덅쭅 linkgit:git-config[1]竊됥��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:69
 #, priority:280
 msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit.  It is incorrect to apply each change to each file sequentially.  For example, this patch will swap a and b:"
-msgstr ""
+msgstr "渦볟눣訝���됬쉪 `file1` �뉏뻑�썸삸�뉑룓雅ㅵ뎺�꾣뻼餓띰펽�뚧��됬쉪 `file2` �뉏뻑�썸삸�뉑룓雅ㅵ릮�꾣뻼餓뜰�귝뙃窈뷴틣野방캀訝ゆ뻼餓띈퓵烏뚥엶�방삸訝띷�簾�쉪�귚풃倻귨펽瓦쇾릉烏δ툈弱녵벡�€뻼餓� a �� b竊�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:76
@@ -3689,25 +3677,25 @@ msgid ""
 "diff --git a/b b/a\n"
 "rename from b\n"
 "rename to a\n"
-msgstr ""
+msgstr "diff --git a/a b/b\nrename from a\nrename to b\ndiff --git a/b b/a\nrename from b\nrename to a\n"
 
 #. type: Title -
 #: en/diff-generate-patch.txt:79
 #, no-wrap, priority:280
 msgid "Combined diff format"
-msgstr ""
+msgstr "�덂뭉�꾢량凉귝졏凉�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:87
 #, priority:280
 msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format."
-msgstr ""
+msgstr "餓삡퐬�잍닇藥�펰�꾢뫝餓ㅹ꺗��빳鵝욜뵪 `-c` �� `-cc` �됮」竊뚦쑉�양ㅊ�덂뭉�뜸벨�잋�訝� \"�덂뭉藥�펰\"�귛퐪�� linkgit:git-diff[1] �� linkgit:git-show[1] �양ㅊ�덂뭉�띰펽瓦숅퍡溫ㅶ졏凉뤵�귟퓲��誤곫낏�뤹쉪��펽鵝졾룾餓η퍢瓦쇾틳�썰빱�귛퐪�� `--diff-merges` �됮」�ε성�띄뵟�먪돶若싨졏凉뤹쉪藥�펰��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:89
 #, priority:280
 msgid "A \"combined diff\" format looks like this:"
-msgstr ""
+msgstr "\"�덂뭉�꾢량凉�\" �꾣졏凉뤷쫩訝뗰폏"
 
 #. type: delimited block -
 #: en/diff-generate-patch.txt:98
@@ -3720,7 +3708,7 @@ msgid ""
 "@@@ -98,20 -98,12 +98,20 @@@\n"
 "\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
 "  }\n"
-msgstr ""
+msgstr "diff --combined describe.c\nindex fabadb8,cc95eb0..4866510\n--- a/describe.c\n+++ b/describe.c\n@@@ -98,20 -98,12 +98,20 @@@\n\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n  }\n"
 
 #. type: delimited block -
 #: en/diff-generate-patch.txt:108
@@ -3735,7 +3723,7 @@ msgid ""
 "\tstruct commit_list *list;\n"
 "\tstatic int initialized = 0;\n"
 "\tstruct commit_name *n;\n"
-msgstr ""
+msgstr "- static void describe(char *arg)\n -static void describe(struct commit *cmit, int last_one)\n++static void describe(char *arg, int last_one)\n  {\n +\tunsigned char sha1[20];\n +\tstruct commit *cmit;\n\tstruct commit_list *list;\n\tstatic int initialized = 0;\n\tstruct commit_name *n;\n"
 
 #. type: delimited block -
 #: en/diff-generate-patch.txt:118
@@ -3750,37 +3738,37 @@ msgid ""
 "\tif (!initialized) {\n"
 "\t\tinitialized = 1;\n"
 "\t\tfor_each_ref(get_name);\n"
-msgstr ""
+msgstr " +\tif (get_sha1(arg, sha1) < 0)\n +\t\tusage(describe_usage);\n +\tcmit = lookup_commit_reference(sha1);\n +\tif (!cmit)\n +\t\tusage(describe_usage);\n +\n\tif (!initialized) {\n\t\tinitialized = 1;\n\t\tfor_each_ref(get_name);\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:122
 #, priority:280
 msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
-msgstr ""
+msgstr "若껃뎺�€쐣 \"git diff\" 鸚댐펽倻귚툔竊덂퐪鵝욜뵪 `c` �됮」�띰펹竊�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:124
 #, no-wrap, priority:280
 msgid "diff --combined file\n"
-msgstr ""
+msgstr "diff --combined file\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:126
 #, priority:280
 msgid "or like this (when the `--cc` option is used):"
-msgstr ""
+msgstr "�뽩쫩訝뗰펷壤볞슴�� `--cc` �됮」�띰펹竊�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:128
 #, no-wrap, priority:280
 msgid "       diff --cc file\n"
-msgstr ""
+msgstr "       diff --cc file\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:131
 #, priority:280
 msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
-msgstr ""
+msgstr "若껆쉪�롩씊���訝ゆ닑鸚싦릉�⒴콝鸚답에��죱竊덃쑍堊뗦샑鹽븀쉪��툗訝ㅴ릉�뜻룓雅ㅷ쉪�덂뭉竊됵폏"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:136
@@ -3790,7 +3778,7 @@ msgid ""
 "mode <mode>,<mode>..<mode>\n"
 "new file mode <mode>\n"
 "deleted file mode <mode>,<mode>\n"
-msgstr ""
+msgstr "index <�덂툕>,<�덂툕>..<�덂툕>\nmode <與▼폀>,<與▼폀>..<與▼폀>\nnew file mode <與▼폀>\ndeleted file mode <與▼폀>,<與▼폀>\n"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:142
@@ -3802,7 +3790,7 @@ msgstr "`mode<mode>竊�<mode>..<mode>` 烏뚥퍎�� <mode> 訝�눛弱묉쐣訝�訝や툗��
 #: en/diff-generate-patch.txt:144
 #, priority:280
 msgid "It is followed by two-line from-file/to-file header"
-msgstr ""
+msgstr "若껆쉪�롩씊��륵烏뚧틦�뉏뻑/��젃�뉏뻑�꾢ㅄ岳→겘"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
@@ -3820,25 +3808,25 @@ msgstr "Files.index,core,source"
 #: en/diff-generate-patch.txt:151
 #, priority:280
 msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
-msgstr ""
+msgstr "映삡세雅롣폖瀯잏쉪 \"瀯잋�\" 藥�펰�쇔폀�꾢룎烏뚦ㅄ竊�`/dev/null` �ⓩ씎烏①ㅊ�쎾뻠�뽩닠�ㅷ쉪�뉏뻑��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:155
 #, priority:280
 msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
-msgstr ""
+msgstr "鵝녷삸竊뚦쫩�쒏룓堊쎽틙 --combined-all-paths �됮」竊뚥퐷弱긴폏孃쀥댆訝�訝� N+1 烏뚨쉪繹먩뻼餓�/��젃�뉏뻑鸚댐펽�뜸릎 N ��릦亮뜻룓雅ㅴ릎�꾤댍�먧벡�곈뇧"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:164
 #, priority:280
 msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
-msgstr ""
+msgstr "倻귝옖�띶뫝�띷닑鸚띶댍汝�役뗥쨪雅롦뉵�①듁�곻펽瓦숂쭕�⒴콝�쇔폀��꺗孃덃쐣�⑨펽��빳溫⒳퐷�ⓧ툖�뚨쉪�뜻룓雅ㅴ릎�뗥댆�뉏뻑�꾢렅冶뗥릫燁겹��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:170
 #, priority:280
 msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
-msgstr ""
+msgstr "岳�뵻雅녷뻼餓뜹쓼鸚답에��쉪�쇔폀竊뚥빳�꿩�訝띶컦恙껃컛�띌�곩뀯 `patch -p1`�귛릦亮띄쉪藥�펰�쇔폀��맏若→윥�덂뭉�먧벡�꾡엶�배�뚦닗兩븀쉪竊뚦뭉訝띷삸訝뷰틙佯붺뵪�귟퓳訝ゅ룜�뽫굳鴉쇌틢�⒴콝�� \"榮℡폊\" 鸚답에��쉪�섇뙑竊�"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:172
@@ -3850,31 +3838,31 @@ msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
 #: en/diff-generate-patch.txt:175
 #, priority:280
 msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
-msgstr ""
+msgstr "�쀤릎�됵펷�뜻룓雅ㅶ빊��+1竊�`@` 耶쀧Е竊뚨뵪雅롥릦亮띄쉪藥�펰�쇔폀��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:184
 #, ignore-ellipsis, priority:280
 msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN.  One column for each of fileN is prepended to the output line to note how X's line is different from it."
-msgstr ""
+msgstr "訝롣폖瀯잏쉪 \"瀯잋�\" 藥�펰�쇔폀訝띶릪竊뚩퓳燁띷졏凉뤸샑鹽뷰륵訝ゆ뻼餓� A �� B �꾢닓竊뚦끀訝�쐣 `-`竊덂뇧�� -- �� A 訝�눣�곤펽鵝녶쑉 B 訝�닠�ㅿ펹竊�`+`竊덂뒥�� -- �� A 訝�성弱묕펽鵝녶쑉 B 訝�쥭�좑펹竊뚧닑 `\" \"`竊덄㈉�� -- 訝띶룜竊됧뎺煐�竊뚩퓳燁띷졏凉뤸캈渦껂륵訝ゆ닑鸚싦릉�뉏뻑訝롣�訝ゆ뻼餓� X竊뚦뭉�양ㅊ X 訝롥끀訝�캀訝ゆ뻼餓띄쉪藥�펰�귝뻼餓뜸릎�꾣캀訝�訝ら꺗�됦��쀨˙�띸쉰�②풏�븃죱訝�펽餓ζ뙁�� X �꾥죱訝롥츆�꾡툖�뚥퉳鸚꾠��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:190
 #, priority:280
 msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result.  A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
-msgstr ""
+msgstr "寧� N �쀤릎�� `-` 耶쀧Е�뤷뫑��瑥θ죱�븀렟�ⓩ뻼餓� N 訝�펽鵝녶츆亦→쐣�븀렟�①퍜�쒏뻼餓뜸릎�귞К N �쀤릎�� `+` 耶쀧Е�뤷뫑��瑥θ죱�븀렟�①퍜�쒏뻼餓뜸릎竊뚩�뚧뻼餓� N 訝�깹�됭�烏뚳펷�℡룯瑥앲�竊뚥퍗瑥η댍�먧벡�꾥쭜佯�씎�뗰펽瑥θ죱��˙曆삣뒥�꾬펹��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:196
 #, priority:280
 msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
-msgstr ""
+msgstr "�ⓧ툓�®쉪渦볟눣鹽뷰풃訝�펽訝ㅴ릉�뉏뻑訝�쉪�썸빊嶺얍릫�썼˙�밧룜雅놅펷�졿�餓롦뻼餓� 1 �뚧뻼餓� 2 訝�꺗�됭〃鹽뷴닠�ㅷ쉪 `-`竊뚩�� `++` 烏①ㅊ熬ユ렌�좂쉪訝�烏뚧깹�됧눣�겼쑉�뉏뻑 1 �뽪뻼餓� 2 訝�펹�귛룱鸚뽬퓲�� 8 烏뚥툗�뉏뻑 1 訝�쉪�멨릪竊뚥퐜亦→쐣�븀렟�ⓩ뻼餓� 2 訝�펷�졿��띸�訝� `+`竊됥��"
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:202
 #, priority:280
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents).  When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
-msgstr ""
+msgstr "壤볡뵪 `git diff-tree -c` �양ㅊ�띰펽若껃컛�덂뭉�먧벡�꾤댍�먧벡�뉏뻑訝롥릦亮띄퍜�쒑퓵烏뚧캈渦껓펷�녔뻼餓� 1 ... �뉏뻑 N ��댍�먧벡�뉏뻑竊됥�귛퐪�� `git diff-files -c` �양ㅊ�띰펽若껃컛訝ㅴ릉�よ㎗�녕쉪�덂뭉�뜻룓雅ㅶ뻼餓뜸툗藥δ퐳�묉뻼餓띈퓵烏뚧캈渦껓펷�녔뻼餓� 1 ��샄餘� 2 竊뚦룉燁� \"�묇뺄�꾤뎵��\"竊뚧뻼餓� 2 ��샄餘� 3竊뚦룉燁� \"餓뽨뺄�꾤뎵��\"竊됥��"
 
 #. type: Labeled list
 #: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84
@@ -6898,8 +6886,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
 #, fuzzy, no-wrap, priority:300
 msgid "modified content"
@@ -12404,7 +12392,7 @@ msgstr "--no-progress"
 #: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
 #, priority:280
 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
-msgstr ""
+msgstr "壤볟츆�꾢뒥�곁퍑塋�뿶竊뚪솮�욄뙁若� `--quiet`竊뚦맔�숅퍡溫ㅶ깄�듕툔鴉싧쑉�뉐뇛�숃�役곦릎�ε몜瓦쎾벧�뜻�곥�귟퓳訝ゆ젃恙쀥룾餓ε맦�②퓵佯�뒫�딉펽�념슴亦→쐣�꾢쑉�곁퍑塋�펽�뚥툖嶸� `--quiet`��"
 
 #. type: Plain text
 #: en/git-checkout.txt:123
@@ -12626,7 +12614,7 @@ msgstr "--conflict=<style>"
 #: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
 #, priority:280
 msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable.  Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
-msgstr ""
+msgstr "訝롣툓�®쉪 `--merge` �됮」�멨릪竊뚥퐜�밧룜雅녶넳囹곩쓼�꾣샑鹽뷸뼶凉륅펽誤녺썣 `merge.conflictStyle` �띸쉰�섌뇧�귛룾�썹쉪�쇗삸 \"merge\"竊덆퍡溫ㅿ펹�� \"diff3\"竊덆솮雅� \"merge\" �룟폀�양ㅊ�꾢냵若밧쨼竊뚩퓲�양ㅊ�잌쭓�끻�竊됥��"
 
 #. type: Plain text
 #: en/git-checkout.txt:277
@@ -61102,7 +61090,7 @@ msgstr "xxdiff"
 #: en/object-format-disclaimer.txt:6
 #, priority:300
 msgid "THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage.  A SHA-256 repository will in general not be able to share work with \"regular\" SHA-1 repositories.  It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways.  Only use `--object-format=sha256` for testing purposes."
-msgstr ""
+msgstr "閭ㅹ�됮」��츩謠뚧�㎫쉪竊갨HA-256 ��똻��츩謠뚧�㎫쉪竊뚥퍖�뜹쨪雅롦뿩�잓샄餘듐�귚��ф씎瑥댐펽SHA-256 餓볟틩訝띹꺗訝� \"躍멱쭊\" SHA-1 餓볟틩�긷릪藥δ퐳�귛틪瑥ε걞若싷펽堊뗥쫩竊뚥툗 SHA-256 餓볟틩�됧뀽�� Git �낂깿�뉏뻑�쇔폀��꺗鴉싦빳�묈릮訝띶끉若밭쉪�밧폀�밧룜�귚퍎�ⓩ탩瑥뺞뿶鵝욜뵪 `--object-format=sha256` �됮」��"
 
 #. type: Title -
 #: en/pretty-formats.txt:2
-- 
GitLab