From 4bfa0ccbe9a09b2e9e2b7763efdbd771f6f712eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=89?= <ranto2012@163.com>
Date: Thu, 25 Jun 2020 15:56:57 +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 17.6% (1828 of 10343 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 | 72 ++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 1e5ab2a..2e4af0b 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
 "POT-Creation-Date: 2020-06-02 21:43+0200\n"
-"PO-Revision-Date: 2020-05-28 20:42+0000\n"
+"PO-Revision-Date: 2020-06-26 19:42+0000\n"
 "Last-Translator: �� <ranto2012@163.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: zh_HANS-CN\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -1361,8 +1361,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
 
-#. type: Plain text
 # �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:36
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -4442,55 +4442,60 @@ msgstr "none"
 #: en/diff-options.txt:371
 #, priority:280
 msgid "Disable word diff again."
-msgstr ""
+msgstr "�띷А獵곭뵪�뺠칾藥�펰與▼폀��"
 
 #. type: Plain text
 #: en/diff-options.txt:375
 #, priority:280
 msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
-msgstr ""
+msgstr "瑥룡낏�륅펽�좄�寧т�訝ゆÆ凉뤹쉪�띸㎞���阿덌펽倻귝옖��뵪瑥ι�됮」竊뚦컛�ⓩ��됪Æ凉뤶릎鵝욜뵪窯쒑돯竊뚥빳遙섆벽�양ㅊ�닸뵻�꾦깿�녴��"
 
 #. type: Labeled list
 #: en/diff-options.txt:376
 #, no-wrap, priority:280
 msgid "--word-diff-regex=<regex>"
-msgstr ""
+msgstr "--word-diff-regex=<閭ｅ닕烏②씨凉�>"
 
 #. type: Plain text
 #: en/diff-options.txt:380
 #, priority:280
 msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word.  Also implies `--word-diff` unless it was already enabled."
-msgstr ""
+msgstr "鵝욜뵪 <閭ｅ닕烏②씨凉�> �η‘若싧뜒瑥띸쉪�쇔폀竊뚩�뚥툖��컛訝�訝꿴씆令븀쇋烏뚩쭍訝뷴뜒瑥띲�귡솮�욃럴��뵪竊뚦맔�숃퓲�쀥맜 `--word-diff` �됮」��"
 
 #. type: Plain text
 #: en/diff-options.txt:388
-#, priority:280
+#, fuzzy, priority:280
 msgid "Every non-overlapping match of the <regex> is considered a word.  Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences.  You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters.  A match that contains a newline is silently truncated(!) at the newline."
 msgstr ""
+"<閭ｅ닕烏②씨凉�> �백뀓�꾤쉪驪뤶�訝ら씆�띶룧�꾢뙶�띺꺗熬ヨ쭍訝뷰�訝ゅ뜒瑥띲�귛쑉瓦쇾틳�백뀓窈밥퉳�당쉪餓삡퐬�끻��썼˙溫ㅴ맏��㈉�쏙펽亮뜸툝�ⓩ윥�얍량凉귝뿶熬ュ옙��(!)��"
+"�ⓨ룾�썽�誤곩쑉�①쉪閭ｅ닕烏②씨凉뤶릎�꾢뒥 `|[^[:space:]]`竊뚥빳簾�퓷若껃뙶�띷��됮씆令뷸졏耶쀧Е�귛똿�ユ뜟烏뚨쉪�백뀓鴉싧쑉��죱鸚꾥˙�ゆ뼪(!)��"
 
 #. type: Plain text
 #: en/diff-options.txt:391
 #, priority:280
 msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
-msgstr ""
+msgstr "堊뗥쫩竊�`--word-diff-regex=.` 弱녷뒍驪뤶릉耶쀧Е壤볞퐳訝�訝ゅ뜒瑥랃펽亮띄쎑佯붷쑑�먧릉耶쀧Е�양ㅊ藥�펰��"
 
 #. type: Plain text
 #: en/diff-options.txt:396
 #, priority:280
 msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1].  Giving it explicitly overrides any diff driver or configuration setting.  Diff drivers override configuration settings."
 msgstr ""
+"閭ｅ닕烏②씨凉뤶튋��빳�싪퓝藥�펰葉뗥틣�뽭뀓營��됮」�θ�營�펽�귟쭅 linkgit:gitattributes[5] �� linkgit:git-"
+"config[1]�귝샑凉뤸뙁�롣폏誤녺썣餓삡퐬葉뗥틣�뽭뀓營��귛량凉귞쮮佯뤶폏誤녺썣�띸쉰��"
 
 #. type: Labeled list
 #: en/diff-options.txt:397
 #, no-wrap, priority:280
 msgid "--color-words[=<regex>]"
-msgstr ""
+msgstr "--color-words[=<閭ｅ닕烏②씨凉�>]"
 
 #. type: Plain text
 #: en/diff-options.txt:400
 #, priority:280
 msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
 msgstr ""
+"訝� `--word-diff=color` �뚳펷倻귝옖�뉑삇雅녷��숃〃渦얍폀竊�`--word-diff-regex=<閭ｅ닕烏②씨凉�>` 訝ㅴ릉�됮」�ヤ퉱�멨릪��"
 
 #. type: Labeled list
 #: en/diff-options.txt:402 en/git-status.txt:143
@@ -4500,9 +4505,9 @@ msgstr "--no-renames"
 
 #. type: Plain text
 #: en/diff-options.txt:405
-#, priority:280
+#, fuzzy, priority:280
 msgid "Turn off rename detection, even when the configuration file gives the default to do so."
-msgstr ""
+msgstr "�녜뿭�띶뫝�띷�役뗰펽�념슴�띸쉰�뉏뻑瀯쇿눣�꾦퍡溫ㅶ삸瓦숁졆�싥��"
 
 #. type: Labeled list
 #: en/diff-options.txt:406
@@ -4512,9 +4517,9 @@ msgstr "--[no-]rename-empty"
 
 #. type: Plain text
 #: en/diff-options.txt:408
-#, priority:280
+#, fuzzy, priority:280
 msgid "Whether to use empty blobs as rename source."
-msgstr ""
+msgstr "��맔鵝욜뵪令븀쉪�경뜮野배괌鵝쒍맏�띶뫝�띷틦��"
 
 #. type: Labeled list
 #: en/diff-options.txt:410 en/git-apply.txt:58
@@ -4527,18 +4532,25 @@ msgstr "--check"
 #, priority:280
 msgid "Warn if changes introduce conflict markers or whitespace errors.  What are considered whitespace errors is controlled by `core.whitespace` configuration.  By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors.  Exits with non-zero status if problems are found. Not compatible with --exit-code."
 msgstr ""
+"倻귝옖�닸뵻凉뺝뀯�꿰챳�뉓��뽫㈉�쇤뵗瑥�펽�쇿룕�븃��듽�귛벆雅쏂˙溫ㅴ맏��㈉�쇤뵗瑥�삸�� `core.whitespace` "
+"�띸쉰�㎩댍�꾠�귡퍡溫ㅶ깄�듕툔竊뚩죱弱얗깿�꾤㈉�쇔춻寧�펷�끾떖餓끿뵳令뷸졏耶쀧Е瀯꾣닇�꾥죱竊됧뭽榮㎬퇎�②죱�앯섄瓦쎾냵 tab "
+"耶쀧Е�롧쉪令뷸졏耶쀧Е竊뚪꺗熬ヨ�訝뷸삸令뷸졏耶쀧Е�숃��귛쫩�쒎룕�곈뿮窯섓펽�쇾빳�욇쎏�뜻�곲���뷩�귚툗 --exit-code �됮」訝띶끉若밤��"
 
 #. type: Labeled list
 #: en/diff-options.txt:420
 #, no-wrap, priority:280
 msgid "--ws-error-highlight=<kind>"
-msgstr ""
+msgstr "--ws-error-highlight=<燁띸굳>"
 
 #. type: Plain text
 #: en/diff-options.txt:429
 #, priority:280
 msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff.  Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`.  When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
 msgstr ""
+"囹곩눣�양ㅊ藥�펰訝� `context`竊덁툓訝뗦뻼竊됥��`old`竊덃뿧竊됪닑 `new`竊덃뼭竊됭죱訝�쉪令뷸졏�숃��귛쩀訝ゅ�쇘뵪�쀥뤇�붷�竊�`none` "
+"�됮」鴉싮뇥營�빳�띸쉪�쇽펽`default` �띸쉰�쀨〃訝� 쨌new`竊�`all` �� `old,new,context` �꾤��쇻�귛퐪亦→쐣瀯쇿츣瓦쇾릉�됮」竊�"
+"亮뜸툝�띸쉰�섌뇧 `diff.wsErrorHighlight``亦→쐣溫양쉰�띰펽�ゆ쐣 `new` 烏뚥릎�꾤㈉�쇤뵗瑥�폏熬ラ쳵雅�샑鹽뷩�귞㈉�쇤뵗瑥�폏�� `color."
+"diff.whitespace` �띸쉰瓦쏂죱���꿔��"
 
 #. type: Labeled list
 #: en/diff-options.txt:432
@@ -4550,7 +4562,7 @@ msgstr "--full-index"
 #: en/diff-options.txt:436
 #, priority:280
 msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
-msgstr ""
+msgstr "�①뵟�먫‥訝곫졏凉뤺풏�뷸뿶竊뚦쑉 `index`竊덄뇨凉뺧펹烏뚥툓�양ㅊ若뚧빐�꾢쎗�뤷뎺�뚦쎗�뤷릮�경뜮野배괌�띸㎞竊뚩�뚥툖餓끾삸�띶뇿訝ゅ춻寧╉��"
 
 #. type: Labeled list
 #: en/diff-options.txt:437 en/git-apply.txt:160
@@ -4563,66 +4575,74 @@ msgstr "--binary"
 #, priority:280
 msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
 msgstr ""
+"�ㅴ틙 `--full-index`渦볟눣�꾢량凉귚퉳鸚뽳펽渦볟눣雅뚩퓵�띄쉪藥�펰�귛끀��빳�� `git-apply` �썰빱�ε틪�ⓦ�귝슅�� `--patch` �됮」��"
 
 #. type: Labeled list
 #: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
 #, no-wrap, priority:280
 msgid "--abbrev[=<n>]"
-msgstr ""
+msgstr "--abbrev[=<n>]"
 
 #. type: Plain text
 #: en/diff-options.txt:448
 #, priority:280
 msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix.  This is independent of the `--full-index` option above, which controls the diff-patch output format.  Non default number of digits can be specified with `--abbrev=<n>`."
 msgstr ""
+"�� diff-raw竊덂렅冶뗥량凉귨펹�쇔폀渦볟눣�� diff-tree竊덃젒�뜹량凉귨펹鸚닺죱訝�펽訝띷샑鹽뷴츑�당쉪 40 耶쀨뒄�곩뀷瓦쎾댍野배괌�띸㎞竊뚩�뚦룵�양ㅊ�ⓨ늽�띸��귟퓳訝롣툓�®쉪 "
+"`--full-index` �됮」�졾뀽竊뚦릮�끾렒�뜸틙 diff-patch竊덂량凉귟‥訝곻펹�꾥풏�뷸졏凉뤵�귡씆容섋��꾡퐤�겼룾餓η뵪 `--abbrev=<n>` �뉐츣��"
 
 #. type: Labeled list
 #: en/diff-options.txt:449
 #, no-wrap, priority:280
 msgid "-B[<n>][/<m>]"
-msgstr ""
+msgstr "-B[<n>][/<m>]"
 
 #. type: Labeled list
 #: en/diff-options.txt:450
 #, no-wrap, priority:280
 msgid "--break-rewrites[=[<n>][/<m>]]"
-msgstr ""
+msgstr "--break-rewrites[=[<n>][/<m>]]"
 
 #. type: Plain text
 #: en/diff-options.txt:453
 #, priority:280
 msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
-msgstr ""
+msgstr "弱녶츑�당쉪�띶넍�닸뵻�뉐늽�먨닠�ㅵ뭽�쎾뻠野뱄펷pair竊됥�귟퓳�됦륵訝ょ쎅�꾬폏"
 
 #. type: Plain text
 #: en/diff-options.txt:463
-#, priority:280
+#, fuzzy, priority:280
 msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
 msgstr ""
+"若껂폏壤긷뱧�녑츣�닸뵻壤℡폀�꾦삁�쇽펽壤볟뜒訝ゆ뻼餓뜹냵岳�뵻�삯뇧渦얍댆訝�若싧�쇗뿶竊뚥폏溫ㅴ맏瑥ζ뻼餓띈퓵烏뚥틙若뚦뀲�띶넍竊뚩�뚥툖��컛訝�楹삣닓�좈솮�뚧룖�ζ뱧鵝쒑쭍訝뷰엶�밤�귛쫩�쒑쭍訝뷴쩀訝ゅ닠�ㅵ뭽�믣뀯岳�뵻"
+"竊뚥엶�밥릎�꾥죱��꺗鴉싩ː藥㎩쑉�뉑쑍訝듾툗�잍뻼訝��댐펽餓롨�뚩˙壤볞퐳訝듾툔�뉎�귡�됮」訝�쉪�겼춻 `m` �㎩댍 -B �됮」�꾥퓳訝��백씊竊덆퍡溫ㅴ맏 60竊낉펹��`-B/70竊�` "
+"烏①ㅊ竊뚦쫩�쒎쑉瀯볠옖訝�퓷�숂쉪�잌쭓�끻�弱묇틢�잌쭓�끻���30竊낉펽�� Git 溫ㅴ맏若껅삸若뚦뀲�띶넍�꾬펷��닕竊뚨뵟�먪쉪烏δ툈弱녷삸訝�楹삣닓�좈솮�뚧룖�ο펽亮뜸툗訝듾툔�뉓죱曆룟릦�ⓧ�壅뤄펹��"
 
 #. type: Plain text
 #: en/diff-options.txt:471
-#, priority:280
+#, fuzzy, priority:280
 msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
 msgstr ""
+"鵝욜뵪 -M �됮」�띰펽訝�訝ゅ츑�ⓩ뵻�숂쉪�뉏뻑阿잒˙溫ㅴ맏��뇥�썲릫�뉏뻑�꾣씎繹먲펷�싧만 -M �よ�껅윥訝�訝ゆ텋鸚길뻼餓뜸퐳訝븅뇥�썲릫�꾣씎繹�)�귡�됮」訝�쉪�곈뇧 `n` �㎩댍 -B "
+"�됮」�꾥퓳訝��백씊竊덆퍡溫ㅴ맏 50竊�)��`-B20%` 烏ⓩ삇竊뚦퐪�믣뀯訝롥닠�ㅶ캈 20竊� �꾣뻼餓뜹ㄷ弱뤸쎍鸚싷펽瑥ζ뻼餓뜹룾鵝쒍맏�띶뫝�띶댆�╊��뉏뻑�꾢룾�썸씎繹먦��"
 
 #. type: Labeled list
 #: en/diff-options.txt:472
 #, no-wrap, priority:280
 msgid "-M[<n>]"
-msgstr ""
+msgstr "-M[<n>]"
 
 #. type: Labeled list
 #: en/diff-options.txt:473 en/git-status.txt:147
 #, no-wrap, priority:280
 msgid "--find-renames[=<n>]"
-msgstr ""
+msgstr "--find-renames[=<n>]"
 
 #. type: Plain text
 #: en/diff-options.txt:476
 #, no-wrap, priority:280
 msgid "\tDetect renames.\n"
-msgstr ""
+msgstr "\t�띶뫝�띷�役뗣��\n"
 
 #. type: Plain text
 #: en/diff-options.txt:481
@@ -6373,8 +6393,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
 #, no-wrap, priority:300
 msgid "modified content"
-- 
GitLab