From 5bd5dafa9e5b70eb9dd471413d8def40fab3e867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BA=AA=E5=8D=8E=E8=A3=95?= <8042833@qq.com>
Date: Sat, 12 Aug 2023 02:51:54 +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 56.4% (6293 of 11142 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/
Signed-off-by: 瀛ゅ뜋獒� <8042833@qq.com>
---
 po/documentation.zh_HANS-CN.po | 100 ++++++++++++---------------------
 1 file changed, 35 insertions(+), 65 deletions(-)

diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index f6b8b25..183c277 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-08-05 19:25+0200\nPO-Revision-Date: 2023-08-08 13:51+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 5.0-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-08-12 03:23+0000\nLast-Translator: 瀛ゅ뜋獒� <8042833@qq.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 5.0-dev\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:772 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
@@ -6653,7 +6653,7 @@ msgstr "雅ㅴ틨�겼쑉榮℡폊�뚦램鵝쒏젒阿뗩뿴�됪떓烏δ툈�쀥뭉弱녶츆餓ф렌�졾댆
 
 #. type: Plain text
 #: en/git-add.txt:106
-#, fuzzy, priority:300
+#, priority:300
 msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand.  See ``Interactive mode'' for details."
 msgstr "�귟쭅瓦쇿룾餓ζ쐣�덂쑑瓦먫죱 `add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆 `patch` 耶먨뫝餓ㅳ�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
 
@@ -33586,9 +33586,9 @@ msgstr "git-log - �양ㅊ�먧벡�ε퓱"
 
 #. type: Plain text
 #: en/git-log.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
-msgstr "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
+msgstr "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
 
 #. type: Plain text
 #: en/git-log.txt:17
@@ -33612,7 +33612,7 @@ msgstr "--follow"
 #: en/git-log.txt:33
 #, priority:260
 msgid "Continue listing the history of a file beyond renames (works only for a single file)."
-msgstr "瀯㎫뺌�쀥눣訝�訝ゆ뻼餓띄쉪�녶뤁竊뚩텈瓦뉔뇥�썲릫竊덂룵野밧뜒訝ゆ뻼餓뜻쐣�덌펹��"
+msgstr "瀯㎫뺌�쀥눣�뉏뻑�꾢럣�꿱�壤뺧펽�끾떖�띶뫝�띴퉳�롧쉪�끻넻竊덁퍎�귞뵪雅롥뜒訝ゆ뻼餓띰펹��"
 
 #. type: Labeled list
 #: en/git-log.txt:34
@@ -33624,14 +33624,13 @@ msgstr "--no-decorate"
 #: en/git-log.txt:35
 #, no-wrap, priority:260
 msgid "--decorate[=short|full|auto|no]"
-msgstr "--獒낂Ⅰ[=��|��|�ゅ뒯|��]"
+msgstr "--decorate[=short|full|auto|no]"
 
 #. type: Plain text
 #: en/git-log.txt:45
-#, fuzzy, priority:260
-#| msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+#, priority:260
 msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
-msgstr "�볟뜲�뷸샑鹽븀쉪餓삡퐬�먧벡�꾢뢿�껃릫燁겹�귛쫩�쒏뙁若싦틙'short'竊뚦컛訝띷돀�� ref name �꾢뎺煐�'refs/heads/'��'refs/tags/'��'refs/remotes/'�귛쫩�쒏뙁若�'full'竊뚦츑�당쉪�귟�껅뻼��릫燁곤펷�끾떖�띸�竊됧컛熬ユ돀�겹�귛쫩�쒏뙁若싦틙'auto'竊뚪궍阿덂쫩�쒑풏�뷴댆瀯덄ク竊뚦뢿�껅뻼��쉪�띸㎞弱녻˙�양ㅊ竊뚦갚�뤹퍢雅�'short'訝��뤄펽��닕訝띷샑鹽뷴뢿�껅뻼��쉪�띸㎞�귡퍡溫ㅹ�됮」��'short'��"
+msgstr "�볟뜲�양ㅊ�꾡뻣鵝뺞룓雅ㅷ쉪凉뺟뵪�띸㎞�귛쫩�쒏뙁若싦틙 \"short\"竊뚦닕訝띴폏�볟뜲凉뺟뵪�띸㎞�꾢뎺煐� \"refs/heads/\"��\"refs/tags/\" �� \"refs/remotes/\"�귛쫩�쒏뙁若싦틙 \"full\"竊뚦컛�볟뜲若뚧빐�꾢폊�ⓨ릫燁곤펷�끾떖�띸�竊됥�귛쫩�쒏뙁若싦틙 \"auto\"竊뚦닕倻귝옖渦볟눣��룕�곩댆瀯덄ク竊뚦닕�양ㅊ凉뺟뵪�띸㎞竊뚦갚倻귛릪�뉐츣雅�\"short\"訝��뤄펽��닕訝띷샑鹽뷴폊�ⓨ릫燁겹�귡�됮」 `--decorate` �� `--decorate=short` �꾤��쇻�귛쫩�쒒뀓營�틙 `log.decorate` �꾦뀓營��쇽펽容섋�訝븅뀓營��쇽펽��닕訝� \"auto\"��"
 
 #. type: Labeled list
 #: en/git-log.txt:46
@@ -37513,9 +37512,9 @@ msgstr "git-mv - 燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곦�訝ょ쎅壤뺞닑訝�訝ょЕ�룬벦
 
 #. type: Plain text
 #: en/git-mv.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
-msgstr "'git annotate' [<options>] <file> [<revision>]\n"
+msgstr "'git mv' [<options>] <source>... <destination>\n"
 
 #. type: Plain text
 #: en/git-mv.txt:17
@@ -37529,58 +37528,55 @@ msgstr "燁삣뒯�뽭뇥�썲릫訝�訝ゆ뻼餓뜰�곭쎅壤뺞닑寧�뤇�얏렏��"
 msgid ""
 " git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
 " git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
-msgstr ""
-" git mv [-v] [-f] [-n] [-k] <�ζ틦> <��쉪��>��\n"
-" git mv [-v] [-f] [-n] [-k] <source> ...<��쉪��>��퐬\n"
+msgstr " git mv [-v] [-f] [-n] [-k] <繹먩뻼餓�> <��젃�뉏뻑>\n git mv [-v] [-f] [-n] [-k] <繹먩뻼餓�> ...<��젃��퐬>\n"
 
 #. type: Plain text
 #: en/git-mv.txt:25
 #, priority:280
 msgid "In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>.  In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory."
-msgstr "�①К訝�燁띶숱凉뤶릎竊뚦츆弱�<source>�띶뫝�띴맏<destination>竊뚦츆恙낂』耶섇쑉亮뜸툝���訝ゆ뻼餓뜰�곭Е�룬벦�ζ닑��퐬��  �①К雅뚨쭕壤℡폀訝�펽���롣�訝ゅ뢿�겼퓚窈삥삸訝�訝ょ렟�됬쉪��퐬竊쏁퍢若싩쉪繹먨컛熬ョ㎉�계퓳訝ょ쎅壤뺜릎��"
+msgstr "�①К訝�燁띶숱凉뤶릎竊뚦츆弱� <繹먩뻼餓�>竊덂퓚窈삣춼�ⓧ툝��빳��뻼餓뜰�곭Е�룬벦�ζ닑��퐬竊됮뇥�썲릫訝� <��젃�뉏뻑>�귛쑉寧т틠燁띶숱凉뤶릎竊뚧��롣�訝ゅ뢿�겼퓚窈삥삸訝�訝ゅ럴耶섇쑉�꾤쎅壤뺧폑瀯쇿츣�꾣틦�뉏뻑弱녻˙燁삣뒯�계���퐬訝���"
 
 #. type: Plain text
 #: en/git-mv.txt:28
 #, priority:280
 msgid "The index is updated after successful completion, but the change must still be committed."
-msgstr "榮℡폊�ⓩ닇�잌츑�먨릮熬ユ쎍�곤펽鵝녶룜�뽨퍖恙낂』熬ユ룓雅ㅳ��"
+msgstr "�①㎉�ⓩ닇�잌츑�먨릮竊뚨뇨凉뺝갚鴉싪˙�닸뼭竊뚥퐜�닸뵻餓띺�誤곮퓵烏뚧룓雅ㅶ뎺�썹뵟�덀��"
 
 #. type: Plain text
 #: en/git-mv.txt:34
-#, fuzzy, priority:280
-#| msgid "Force renaming or moving of a file even if the target exists"
+#, priority:280
 msgid "Force renaming or moving of a file even if the <destination> exists."
-msgstr "凉뷴댍�띶뫝�띷닑燁삣뒯訝�訝ゆ뻼餓띰펽�념슴��젃耶섇쑉��"
+msgstr "�념슴 <��젃�뉏뻑> 耶섇쑉竊뚥튋凉뷴댍�띶뫝�띷닑燁삣뒯�뉏뻑��"
 
 #. type: Plain text
 #: en/git-mv.txt:39
 #, priority:280
 msgid "Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given."
-msgstr "瓮녘퓝鴉싧��닻뵗瑥�깄�든쉪燁삣뒯�뽭뇥�썲릫�띴퐳�귛퐪訝�訝ゆ틦�뉏뻑�㏘툖耶섇쑉阿잋툖熬첝it�㎩댍竊뚧닑�끻츆弱녻쫮�뽨�訝ょ렟�됬쉪�뉏뻑�띰펽弱긴폏�묊뵟�숃�竊뚪솮�욅퍢��`-f`��"
+msgstr "瓮녘퓝��꺗野쇠눜�숃��▽뻑�꾤㎉�ⓩ닑�띶뫝�띷뱧鵝쒌�귛퐪繹먩뻼餓뜻뿢訝띶춼�ⓧ튋訝띶룛Git�㎩댍竊뚧닑�끻쑉亦→쐣�먧풘 -f �됮」�꾣깄�듕툔誤녺썣�경쐣�뉏뻑�띰펽瑥ζ뙁餓ㅵ갚鴉싧갚鴉싧룕�잓뵗瑥���"
 
 #. type: Plain text
 #: en/git-mv.txt:42
 #, priority:280
 msgid "Do nothing; only show what would happen"
-msgstr "餓�阿덆꺗訝띶걳竊쎾룵�양ㅊ鴉싧룕�잋�阿�"
+msgstr "餓�阿덆꺗訝띶걳竊뚥퍎�양ㅊ弱녵폏�묊뵟�꾣뱧鵝�"
 
 #. type: Plain text
 #: en/git-mv.txt:46
 #, priority:280
 msgid "Report the names of files as they are moved."
-msgstr "壤볠뻼餓띈˙燁삣뒯�띰펽�ε몜若껂뺄�꾢릫燁겹��"
+msgstr "�ε몜�뉏뻑�①㎉�ⓩ뿶�꾢릫燁곁쉪�섇뙑��"
 
 #. type: Plain text
 #: en/git-mv.txt:54
 #, priority:280
 msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location.  It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
-msgstr "鵝욜뵪 gitfile 燁삣뒯訝�訝ゅ춴與▼쓼竊덅퓳�뤷뫑��若껂뺄��뵪 1.7.8 �뽪쎍�곁쉪 Git �덃쑍�뗩쉮�꾬펹弱녷쎍�� gitfile �� core.worktree 溫양쉰餓δ슴耶먩Æ�쀥쑉�곁쉪鵝띸쉰藥δ퐳��  若껂튋鴉싧컼瑥뺞쎍�컇inkgit:gitmodules[5]�뉏뻑訝�쉪submodule.<name>.path溫양쉰竊뚦뭉弱녻��뉏뻑�얍뀯�욃룿竊덆솮�욂슴��-n竊됥��"
+msgstr "鵝욜뵪 gitfile竊덃꼷�녕�若껂뺄��슴�� Git 1.7.8 �뽪쎍�곁뎵�ц퓵烏뚦뀑�녺쉪竊됪씎燁삣뒯耶먩Æ�쀥컛�닸뼭 gitfile �� core.worktree 溫양쉰竊뚥빳鵝욕춴與▼쓼�ⓩ뼭鵝띸쉰閭ｅ만藥δ퐳�귛츆瓦섇컛弱앲캊�닸뼭 linkgit:gitmodules[5] �뉏뻑訝�쉪 submodule.<name>.path 溫양쉰竊뚦뭉弱녻��뉏뻑�귛춼竊덆솮�욂슴�ⓧ틙 -n �됮」竊됥��"
 
 #. type: Plain text
 #: en/git-mv.txt:66
 #, priority:280
 msgid "Each time a superproject update moves a populated submodule (e.g. when switching between commits before and after the move) a stale submodule checkout will remain in the old location and an empty directory will appear in the new location. To populate the submodule again in the new location the user will have to run \"git submodule update\" afterwards. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. Both steps will be obsolete when recursive submodule update has been implemented."
-msgstr "驪뤸А擁끿벨窈밭쎅�닸뼭燁삣뒯訝�訝ゅ럴櫻ュ뀉�꾢춴與▼쓼竊덁풃倻귨펽壤볟쑉燁삣뒯�띶릮�꾣룓雅ㅴ퉳�닷늾�€뿶竊됵펽訝�訝ら솃�㎫쉪耶먩Æ�쀦��뷴컛岳앯븰�ⓩ뿧�꾡퐤營�펽訝�訝ょ㈉��퐬弱녶눣�겼쑉�곁쉪鵝띸쉰�귟쫨�ⓩ뼭�꾡퐤營�냽轝▼∥�끻춴與▼쓼竊뚨뵪�룟컛訝띶풓訝띶쑉阿뗥릮瓦먫죱 \"git submodule update\"�귞㎉�ㅸ닁��똾�ゆ쐣�ⓧ슴�� gitfile �귝뎺��츎�①쉪竊뚦맔�뉐춴與▼죯�꾣��꿜튋�껇˙�ら솮�귛퐪�믣퐩耶먩Æ�쀦쎍�계˙若욄뼺�롳펽瓦쇾륵訝ゆ�謠ㅵ컛熬ユ퇇黎겹��"
+msgstr "驪뤷퐪�뜹램葉뗦쎍�겼��닷춴與▼쓼燁삣뒯�띰펷堊뗥쫩竊뚦쑉燁삣뒯阿뗥뎺�뚥퉳�롧쉪�먧벡阿뗩뿴�뉑뜟�띰펹竊뚧뿧鵝띸쉰弱녵퓷�쇾�訝ら솃�㎫쉪耶먩Æ�쀦��븝펽亮뜹쑉�겻퐤營�눣�겻�訝ょ㈉��퐬�귟쫨�ⓩ뼭鵝띸쉰�띷뼭櫻ュ뀉耶먩Æ�쀯펽�ⓩ댎恙낂』瓦먫죱 \"git submodule update\"�귛룵�됧쑉�㎫쎅壤뺜슴�� gitfile �띰펽�좈솮�㎫쎅壤뺞뎺��츎�①쉪竊뚦맔�쇿춴與▼쓼�꾢럣�꿱�壤뺜튋弱녻˙�좈솮�귛퐪若욅렟�믣퐩耶먩Æ�쀦쎍�경뿶竊뚩퓳訝ㅴ릉閭ιい弱녶룜孃쀤툖�띺�誤곥��"
 
 #. type: Title =
 #: en/git-name-rev.txt:2
@@ -37772,26 +37768,13 @@ msgstr "git-notes(1)"
 
 #. type: Plain text
 #: en/git-notes.txt:7
-#, fuzzy, priority:280
+#, priority:280
 msgid "git-notes - Add or inspect object notes"
-msgstr "git-notes - Add or inspect object notes"
+msgstr "git-notes - 曆삣뒥�뽪윥�뗥�穩→낏��"
 
 #. type: Plain text
 #: en/git-notes.txt:23
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid ""
-#| "'git notes' [list [<object>]]\n"
-#| "'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-#| "'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
-#| "'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-#| "'git notes' edit [--allow-empty] [<object>]\n"
-#| "'git notes' show [<object>]\n"
-#| "'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
-#| "'git notes' merge --commit [-v | -q]\n"
-#| "'git notes' merge --abort [-v | -q]\n"
-#| "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
-#| "'git notes' prune [-n] [-v]\n"
-#| "'git notes' get-ref\n"
+#, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git notes' [list [<object>]]\n"
 "'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -37805,31 +37788,19 @@ msgid ""
 "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
 "'git notes' prune [-n] [-v]\n"
 "'git notes' get-ref\n"
-msgstr ""
-"'git notes' [list [<object>]]\n"
-"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] ��\n"
-"'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
-"'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-"'git notes' edit [--allow-empty] [<object>])\n"
-"'git notes' �양ㅊ [<object>]\n"
-"'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
-"'git notes' merge --commit [-v | -q]\n"
-"'git notes' merge --abort [-v | -q]\n"
-"'git notes' remove [--ignore-missing] [--stdin] [<object>...]��\n"
-"'git notes' prune [-n] [-v]\n"
-"'git notes' get-ref\n"
+msgstr "'git notes' [list [<object>]]\n'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n'git notes' append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' edit [--allow-empty] [<object>] [--[no-]stripspace]\n'git notes' show [<object>]\n'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
 
 #. type: Plain text
 #: en/git-notes.txt:29
 #, priority:280
 msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
-msgstr "曆삣뒥�곩닠�ㅶ닑瑥삣룚�꾢쑉�⒳퐪訝딁쉪力③뇢竊뚩�뚥툖�θ㏄�⒳퐪�ц벴��"
+msgstr "曆삣뒥�곭㎉�ㅶ닑瑥삣룚�꾢뒥�ⓨ�穩▽툓�꾣낏�딉펽�뚥툖壤긷뱧野배괌�ц벴��"
 
 #. type: Plain text
 #: en/git-notes.txt:34
 #, priority:280
 msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden.  See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below.  If this ref does not exist, it will be quietly created when it is first needed to store a note."
-msgstr "容섋��끻넻訝뗰펽寧붻�熬ヤ퓷耶섇댆`refs/notes/commits`亮뜸퍗�ｉ뇤瑥삣룚竊뚥퐜瓦쇾릉容섋��쇔룾餓θ˙誤녺썣��  �귟쭅訝뗩씊�껹PTIONS, CONFIGURATION�똄NVIRONMENT�ⓨ늽��  倻귝옖瓦쇾릉�귟�껅뻼��툖耶섇쑉竊뚦퐪若껆К訝�轝↓�誤곩춼�①쵒溫경뿶竊뚦츆弱녻˙�꾣굜�겼닗兩뷩��"
+msgstr "容섋��끻넻訝뗰펽力③뇢熬ヤ퓷耶섇쑉 `refs/notes/commits` 訝�펽亮뜸툝��빳誤녺썣閭ㅹ퍡溫ㅸ�營��귟��귡쁾訝뗩씊�� OPTIONS�갅ONFIGURATION �� ENVIRONMENT �ⓨ늽�귛쫩�쒑�凉뺟뵪訝띶춼�⑨펽壤볣쫿轝↓�誤곩춼�ⓩ낏�딀뿶竊뚦츆弱녻˙�숅퍡�겼닗兩뷩��"
 
 #. type: Plain text
 #: en/git-notes.txt:41
@@ -44198,50 +44169,49 @@ msgstr ""
 #: en/git-rebase.txt:466
 #, priority:100
 msgid "If `<upstream>` or `--keep-base` is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`. See also `rebase.forkpoint` in linkgit:git-config[1]."
-msgstr ""
+msgstr "倻귝옖�ⓨ뫝餓ㅸ죱訝�룓堊쎽틙 `<訝딀만餓볟틩> ` �� `--keep-base ` �귝빊竊뚦닕容섋�訝� `--no-fork-point`竊뚦맔�숅퍡溫ㅴ맏 `--fork-point`�귛룱瑥룟뢿�� linkgit:git-config[1] 訝�쉪 `rebase.forkpoint`��"
 
 #. type: Plain text
 #: en/git-rebase.txt:470
 #, priority:100
 msgid "If your branch was based on `<upstream>` but `<upstream>` was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
-msgstr ""
+msgstr "倻귝옖鵝좂쉪�녷뵱�뷰틢 `<訝딀만餓볟틩>`竊뚥퐜 `<訝딀만餓볟틩>` 熬ュ썮��雅놅펽�뚥퐷�꾢늽��똿�ヤ틙熬ュ닠�ㅷ쉪�먧벡竊뚪궍阿덂룾餓δ슴�� `--keep-base` �됮」�δ퍗鵝좂쉪�녷뵱訝�닠�ㅹ궍雅쎿룓雅ㅳ��"
 
 #. type: Plain text
 #: en/git-rebase.txt:477
 #, priority:100
 msgid "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior:"
-msgstr ""
+msgstr "�ⓨ컼瑥뺝뜌瘟껃량凉귝뿶令뷸졏�꾢량凉귙�귞쎅�랃펽驪뤶릉�롧ク�썲츩�겻틙野방�烏뚥맏�꾥퓩鴉쇔쨪�놅폏"
 
 #. type: Labeled list
 #: en/git-rebase.txt:478
 #, no-wrap, priority:100
 msgid "apply backend"
-msgstr ""
+msgstr "佯붺뵪�롧ク"
 
 #. type: Plain text
 #: en/git-rebase.txt:484
 #, priority:100
 msgid "When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the \"old\" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application."
-msgstr ""
+msgstr "�ⓨ틪�②‥訝곫뿶竊뚦옙�δ툓訝뗦뻼烏뚥릎�꾤㈉�쇗쎍�밤�귚툖亮며쉪��펽瓦숁꼷�녕�倻귝옖烏δ툈訝�쫨�욘뜟�꾟�쒏뿧�앲죱訝롧렟�됪뻼餓뜸릎�꾥죱餓끻쑉令뷸졏�백씊�됧량凉귨펽鵝졾컛孃쀥댆訝�訝ゅ릦亮뜹넳囹곮�뚥툖��닇�잏쉪烏δ툈佯붺뵪��"
 
 #. type: Labeled list
 #: en/git-rebase.txt:485
-#, fuzzy, no-wrap, priority:100
-#| msgid "--merge-base"
+#, no-wrap, priority:100
 msgid "merge backend"
-msgstr "--merge-base"
+msgstr "�덂뭉�롧ク"
 
 #. type: Plain text
 #: en/git-rebase.txt:490
 #, priority:100
 msgid "Treat lines with only whitespace changes as unchanged when merging.  Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted."
-msgstr ""
+msgstr "�ⓨ릦亮뜻뿶竊뚦컛餓끻똿�ョ㈉�쇗쎍�밭쉪烏뚩쭍訝뷸쑋�닸뵻�귚툖亮며쉪��펽瓦숁꼷�녕�餓삡퐬�ⓨ쑉岳�뵻令뷸졏�뚥툖易됧룋�뜸퍟�닸뵻�꾥‥訝곩쓼弱녻˙訝℡펱竊뚦뜵鵝욕룱訝��방깹�됧룕�잌넳囹곭쉪�닸뵻��"
 
 #. type: Plain text
 #: en/git-rebase.txt:495
 #, priority:100
 msgid "This flag is passed to the `git apply` program (see linkgit:git-apply[1]) that applies the patch.  Implies `--apply`."
-msgstr ""
+msgstr "瓦쇾릉�뉐퓱熬ヤ폖�믥퍢佯붺뵪烏δ툈�� `git apply` 葉뗥틣竊덂뢿�� linkgit:git-apply[1]竊됥�귛츆�먨맜雅� `--apply`��"
 
 #. type: Plain text
 #: en/git-rebase.txt:502
-- 
GitLab