From 5101fb4ead62c6b1cf839e0677ad852d22f6f246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=83=E5=A4=B4=E7=81=AF=E7=AC=BC=E9=B1=BC?= <ttdlyu@163.com> Date: Mon, 15 May 2023 12:50:45 +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 35.8% (3938 of 10990 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/ Signed-off-by: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com> --- po/documentation.zh_HANS-CN.po | 276 ++++++++++++++++----------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index ebf3b25..c624711 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-05-03 17:31+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-dev\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-05-18 17:58+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-dev\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 @@ -5871,7 +5871,7 @@ msgstr "--all" #: en/fetch-options.txt:3 #, priority:220 msgid "Fetch all remotes." -msgstr "" +msgstr "�볟룚���됭퓶葉뗣��" #. type: Labeled list #: en/fetch-options.txt:5 @@ -5883,7 +5883,7 @@ msgstr "--append" #: en/fetch-options.txt:9 #, priority:220 msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten." -msgstr "" +msgstr "�� `.git/FETCH_HEAD` �꾤렟�됧냵若밥릎曆삣뒥�룟룚�꾢폊�ⓨ릫燁겼뭽野배괌�띸㎞�� 倻귝옖亦→쐣瓦쇾릉�됮」竊�`.git/FETCH_HEAD` 訝�쉪�㎪빊��컛熬ヨ쫮�뽧��" #. type: Labeled list #: en/fetch-options.txt:10 en/git-send-pack.txt:69 @@ -5895,7 +5895,7 @@ msgstr "--atomic" #: en/fetch-options.txt:13 #, priority:220 msgid "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated." -msgstr "" +msgstr "鵝욜뵪訝�訝ゅ렅耶먧틟�→씎�닸뼭�у쑑榮℡폊�귟쫨阿덃��됬쉪凉뺟뵪�썼˙�닸뼭竊뚩쫨阿덂쑉�븅뵗�띰펽亦→쐣凉뺟뵪熬ユ쎍�겹��" #. type: Labeled list #: en/fetch-options.txt:14 @@ -5907,19 +5907,19 @@ msgstr "--depth=<曆긷벧>" #: en/fetch-options.txt:20 #, priority:220 msgid "Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a 'shallow' repository created by `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched." -msgstr "" +msgstr "�먨댍餓롦캀訝よ퓶葉뗥늽��럣�꿰쉪窈띄ク�룟룚�뉐츣�곈뇧�꾣룓雅ㅳ�귛쫩�쒑렩�뽫쉪��뵳 `git clone` �쎾뻠�� '役끻콆' 餓볟틩竊뚦뭉鵝욜뵪 `--depth=<depth>` �됮」竊덅쭅 linkgit:git-clone[1]竊됵펽�쇿뒥曆길닑煐⑴윮�녶뤁竊뚩씨�경뙁若싨빊�뤹쉪�먧벡�귝런�뽩릮�꾣룓雅ㅷ쉪�뉒�訝띴폏熬ヨ렩�뽧��" #. type: Labeled list #: en/fetch-options.txt:21 #, no-wrap, priority:220 msgid "--deepen=<depth>" -msgstr "" +msgstr "--deepen=<曆긷벧>" #. type: Plain text #: en/fetch-options.txt:25 #, priority:220 msgid "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history." -msgstr "" +msgstr "訝�--depth映삡세竊뚦룵��츆�뉐츣雅녵퍗壤볟뎺役끻콆渦밭븣凉�冶뗧쉪�먧벡�곈뇧竊뚩�뚥툖��퍗驪뤶릉瓦쒐쮮�녷뵱�녶뤁�꾦《塋��冶뗣��" #. type: Labeled list #: en/fetch-options.txt:26 en/git-clone.txt:247 en/git-fetch-pack.txt:90 @@ -5931,7 +5931,7 @@ msgstr "--shallow-since=<�ζ쐿>" #: en/fetch-options.txt:29 en/git-fetch-pack.txt:93 #, priority:220 msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>." -msgstr "" +msgstr "�졿런�뽫섄��탢掠귚퍜佯볡쉪�녶뤁竊뚦똿��<�ζ쐿>阿뗥릮���됧룾鰲�룋�꾣룓雅ㅳ��" #. type: Labeled list #: en/fetch-options.txt:30 en/git-clone.txt:250 en/git-fetch-pack.txt:94 @@ -5943,7 +5943,7 @@ msgstr "--shallow-exclude=<岳���덃쑍>" #: en/fetch-options.txt:34 en/git-fetch-pack.txt:98 #, priority:220 msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times." -msgstr "" +msgstr "曆긷뙑�뽫섄��탢掠귞뎵�у틩�꾢럣�뀐펽餓ζ럲�ㅴ퍗�뉐츣�꾥퓶葉뗥늽��닑�뉓�訝�룾餓ε댆渦양쉪�먧벡�� 瓦쇾릉�됮」��빳�뉐츣鸚싨А��" #. type: Labeled list #: en/fetch-options.txt:35 @@ -5955,13 +5955,13 @@ msgstr "--unshallow" #: en/fetch-options.txt:39 #, priority:220 msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories." -msgstr "" +msgstr "倻귝옖繹먧퍜佯볠삸若뚧빐�꾬펽弱녷탢掠귟탡繹먨틩饔ф뜟訝뷴츑�당쉪餓볟틩竊뚧텋�ㅶ탢掠귚퍜佯볟를�η쉪���됮솏�뜰��" #. type: Plain text #: en/fetch-options.txt:42 #, priority:220 msgid "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository." -msgstr "" +msgstr "倻귝옖繹먧퍜佯볠삸役끻콆�꾬펽弱썲룾�썲쩀�꾥렩�뽳펽鵝욕퐪�띴퍜佯볡쉪�녶뤁訝롦틦餓볟틩�멨릪��" #. type: Labeled list #: en/fetch-options.txt:43 @@ -5973,7 +5973,7 @@ msgstr "--update-shallow" #: en/fetch-options.txt:48 #, priority:220 msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs." -msgstr "" +msgstr "容섋��끻넻訝뗰펽壤볞퍗役끻콆餓볟틩�룟룚�띰펽`git fetch` 鴉싨땼瀯앶�誤곫쎍�� .git/shallow �꾢폊�ⓦ�귟퓳訝ら�됮」�닸뼭雅� .git/shallow 亮뜻렏�쀨퓳�루쉪凉뺟뵪��" #. type: Labeled list #: en/fetch-options.txt:49 @@ -5985,25 +5985,25 @@ msgstr "--negotiation-tip=<commit|glob>" #: en/fetch-options.txt:57 #, priority:220 msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched." -msgstr "" +msgstr "容섋��끻넻訝뗰펽Git 鴉싧릲�띶뒦�ⓩ뒫�듾퍗���됪쑍�겼폊�ⓧ릎��㏄�딁쉪�먧벡竊뚥빳野삥돻�긷릪�꾣룓雅ㅿ펽瑥뺝쎗�뤷컩孃끾렏�띄쉪�볟똿�뉏뻑�꾢ㄷ弱뤵�귛쫩�쒏뙁若싩쉪瑥앾펽Git弱녶룵�ε몜餓롧퍢若싨룓鹽뷰릎�꾢룾渦얏룓雅ㅳ�� 壤볡뵪�루윥�볟벆訝ゆ쑍�겼폊�ⓨ룾�썰툗熬ヨ렩�뽫쉪訝딀만凉뺟뵪�됧뀻�뚨쉪�먧벡�띰펽瓦쇾폏�졾엮�볟룚�뉏뻑�꾦�잌벧��" #. type: Plain text #: en/fetch-options.txt:60 #, priority:220 msgid "This option may be specified more than once; if so, Git will report commits reachable from any of the given commits." -msgstr "" +msgstr "瓦쇾릉�됮」��빳�뉐츣鸚싨А竊쎾쫩�쒏삸瓦숁졆竊똆it弱녷뒫�듾퍗餓삡퐬訝�訝ょ퍢若싩쉪�먧벡訝�룾渦얏룓雅ㅳ��" #. type: Plain text #: en/fetch-options.txt:64 #, priority:220 msgid "The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name." -msgstr "" +msgstr "瓦쇾릉�됮」�꾢뢿�겼룾餓ζ삸訝�訝ゅ폊�ⓨ릫燁곁쉪�싮뀓寧�펽訝�訝ゅ폊�⑨펽�뽬�끺�訝ゆ룓雅ㅷ쉪SHA-1竊덂룾�썸삸煐⒴넍�꾬펹�귝뙁若싦�訝ら�싮뀓寧�쎑壤볞틢鸚싨А�뉐츣瓦쇾릉�됮」竊뚥맏驪뤶릉�백뀓�꾢폊�ⓨ릫燁경뙁若싪��됮」��" #. type: Plain text #: en/fetch-options.txt:68 #, priority:220 msgid "See also the `fetch.negotiationAlgorithm` and `push.negotiate` configuration variables documented in linkgit:git-config[1], and the `--negotiate-only` option below." -msgstr "" +msgstr "�귟쭅 linkgit:git-config[1] 訝��壤뺟쉪 `fetch.negotiAlgorithm` �� `push.negoti` �띸쉰�섌뇧竊뚥빳�듾툔�®쉪 `--negotiate-only` �됮」��" #. type: Labeled list #: en/fetch-options.txt:69 @@ -6021,7 +6021,7 @@ msgstr "" #: en/fetch-options.txt:77 #, priority:220 msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]`. Internally this is used to implement the `push.negotiate` option, see linkgit:git-config[1]." -msgstr "" +msgstr "瓦쇾툗 `--recurse-submodules=[yes|on-demand]` 訝띶끉若밤�� �ⓨ냵�⑨펽瓦숃˙�ⓩ씎若욅렟 `push.negotiate` �됮」竊뚩쭅linkgit:git-config[1]��" #. type: Labeled list #: en/fetch-options.txt:78 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:373 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:117 en/git-rm.txt:53 en/git-send-email.txt:422 en/git-send-pack.txt:52 en/git-svn.txt:687 en/git-worktree.txt:221 @@ -6033,7 +6033,7 @@ msgstr "--dry-run" #: en/fetch-options.txt:80 #, priority:220 msgid "Show what would be done, without making any changes." -msgstr "" +msgstr "�양ㅊ鴉싧걳餓�阿덌펽�뚥툖�싦뻣鵝뺞뵻�섅��" #. type: Labeled list #: en/fetch-options.txt:82 @@ -6045,7 +6045,7 @@ msgstr "--[no-]write-fetch-head" #: en/fetch-options.txt:88 #, priority:220 msgid "Write the list of remote refs fetched in the `FETCH_HEAD` file directly under `$GIT_DIR`. This is the default. Passing `--no-write-fetch-head` from the command line tells Git not to write the file. Under `--dry-run` option, the file is never written." -msgstr "" +msgstr "�닸렏��`$GIT_DIR`訝뗧쉪`FETCH_HEAD`�뉏뻑訝�넍�θ렩�뽫쉪瓦쒐쮮凉뺟뵪�쀨〃�� 瓦숁삸容섋��꾠�� 餓롥뫝餓ㅸ죱鴉좈��`--no-write-fetch-head`竊뚦몜瑥덲it訝띹쫨�쇿뀯瑥ζ뻼餓뜰�� ��`--dry-run`�됮」訝뗰펽瑥ζ뻼餓뜻갭瓦쒍툖鴉싪˙�쇿뀯��" #. type: Labeled list #: en/fetch-options.txt:90 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:169 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:440 en/git-repack.txt:87 en/git-replace.txt:60 en/git-rm.txt:48 en/git-submodule.txt:293 en/git-switch.txt:110 en/git-tag.txt:79 en/git-update-server-info.txt:24 en/git-worktree.txt:162 @@ -60969,13 +60969,13 @@ msgstr "`remove`�믥퍦�좈솮訝�訝よ꼷藥δ퐳�븝펽�ㅹ씆鵝욜뵪`--force`�� 誤� #: en/git-worktree.txt:187 #, priority:240 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new worktree. If `<commit-ish>` is omitted, it defaults to `HEAD`. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`." -msgstr "" +msgstr "�싪퓝`add`竊뚦닗兩뷰�訝ゅ릫訝�`<�겼늽��>`�꾣뼭�녷뵱竊뚥퍗`<�먧벡��>`凉�冶뗰펽亮뜹컛`<�겼늽��>`汝��뷴댆�곁쉪藥δ퐳�묆�� 倻귝옖�곭븼雅�`<�먧벡��>`竊뚦닕容섋�訝�`HEAD`�� 容섋��끻넻訝뗰펽倻귝옖訝�訝ゆ뼭�꾢늽��럴瀯뤷춼�⑨펽`-b`鴉싨땼瀯앭닗兩뷴츆��`-B`�쇾툖鴉싨땼瀯앭닗兩븝펽弱�`<�겼늽��>`�띸쉰訝�`<�먧벡��>`��" #. type: Plain text #: en/git-worktree.txt:192 -#, priority:240 +#, fuzzy, priority:240 msgid "With `add`, detach `HEAD` in the new worktree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]." -msgstr "" +msgstr "�싪퓝 `add`竊뚦쑉�곁쉪藥δ퐳�묇릎�녺┿�� `HEAD`�귛뢿鰲� linkgit:git-checkout[1] 訝�쉪 \"DETACHED HEAD\"��" #. type: Labeled list #: en/git-worktree.txt:193 @@ -60987,7 +60987,7 @@ msgstr "--[no-]checkout" #: en/git-worktree.txt:198 #, priority:240 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]." -msgstr "" +msgstr "容섋��끻넻訝뗰펽`add`鴉싨���`<�먧벡��>`竊뚨꽫�뚳펽`--no-checkout`��빳�ⓩ씎�묈댍汝��븝펽餓δ씩瓦쏂죱若싧댍竊뚧캈倻귡뀓營���뤸��뷩�귛뢿鰲� linkgit:git-read-tree[1] 訝�쉪 \"葉��뤸���\"��" #. type: Labeled list #: en/git-worktree.txt:199 @@ -60999,13 +60999,13 @@ msgstr "--[no-]guess-remote" #: en/git-worktree.txt:205 #, priority:240 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from `HEAD`, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch." -msgstr "" +msgstr "��`worktree add <瓮�푶>`訝뗰펽倻귝옖亦→쐣`<�먧벡��>`竊뚦닕訝띴퍗`HEAD`�쎾뻠�곁쉪�녷뵱竊뚩�뚧삸�ⓩ�也썸쐣訝�訝や툗`<瓮�푶>`�꾢읃�띸쎑�백뀓�꾥퓶葉뗨퇎甕ゅ늽��쉪�끻넻訝뗰펽弱녷뼭�꾢늽��뻠塋뗥쑉瓦쒐쮮瓮잒릉�녷뵱訝딉펽亮뜹컛瓦쒐쮮瓮잒릉�녷뵱�뉓�訝뷸뼭�녷뵱�� \"訝딀만\"��" #. type: Plain text #: en/git-worktree.txt:208 #, priority:240 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option." -msgstr "" +msgstr "瓦쇾튋��빳�싪퓝鵝욜뵪`worktree.guessRemote`�띸쉰�됮」溫양쉰訝븅퍡溫ㅸ죱訝뷩��" #. type: Labeled list #: en/git-worktree.txt:209 @@ -61017,7 +61017,7 @@ msgstr "--[no-]track" #: en/git-worktree.txt:214 #, priority:240 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch. This is the default if `<commit-ish>` is a remote-tracking branch. See `--track` in linkgit:git-branch[1] for details." -msgstr "" +msgstr "壤볟닗兩뷰�訝ゆ뼭�꾢늽��뿶竊뚦쫩�� `<�먧벡��>` ���訝ゅ늽��펽�쇿컛�뜻젃溫겻맏�겼늽��쉪 \"訝딀만\"�� 容섋�溫ㅴ맏 `<�먧벡��>` ���訝よ퓶葉뗨퇎甕ゅ늽���� 瑥�깄鰲� linkgit:git-branch[1] 訝�쉪 `--track`��" #. type: Labeled list #: en/git-worktree.txt:215 @@ -61029,13 +61029,13 @@ msgstr "--lock" #: en/git-worktree.txt:219 #, priority:240 msgid "Keep the worktree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without a race condition." -msgstr "" +msgstr "�ⓨ닗兩뷴릮岳앮똻藥δ퐳�븀쉪�곩츣�귟퓳�멨퐪雅롥쑉`git worktree add`阿뗥릮�㎬죱`git worktree lock`竊뚥퐜亦→쐣壅꾣틦塋욂틝��" #. type: Plain text #: en/git-worktree.txt:224 #, priority:240 msgid "With `prune`, do not remove anything; just report what it would remove." -msgstr "" +msgstr "�ⓧ슴��`prune`�띰펽訝띴폏�좈솮餓삡퐬�뉏뻑竊쎾룵鴉싨뒫�듿츆誤곩닠�ㅷ쉪訝쒑���" #. type: Plain text #: en/git-worktree.txt:230 @@ -61048,37 +61048,37 @@ msgstr "餓ζ삌雅롨㎗�먪쉪�쇔폀瀯쇿눣�싨쑍�꾥풏�뷩�� 瓦숂굳鴉쇌틢嶸���쉪 #: en/git-worktree.txt:236 #, priority:240 msgid "Terminate each line with a NUL rather than a newline when `--porcelain` is specified with `list`. This makes it possible to parse the output when a worktree path contains a newline character." -msgstr "" +msgstr "壤�`--porcelain`訝�`list`訝�壅룡뙁若싨뿶竊뚨뵪NUL�뚥툖��뜟烏뚧씎瀯볠씇驪뤶�烏뚣�귟퓳鵝욕풓�ⓨ램鵝쒎뙷瓮�푶�끻맜��죱寧�뿶竊뚦룾餓θ㎗�먫풏�뷩��" #. type: Plain text #: en/git-worktree.txt:240 #, priority:240 msgid "With `add`, suppress feedback messages." -msgstr "" +msgstr "��`add`竊뚧뒔�뜹룏腰덁에����" #. type: Plain text #: en/git-worktree.txt:244 #, priority:240 msgid "With `prune`, report all removals." -msgstr "" +msgstr "鵝욜뵪`prune`竊뚧뒫�딀��됬쉪燁삯솮�끻넻��" #. type: Plain text #: en/git-worktree.txt:246 #, priority:240 msgid "With `list`, output additional information about worktrees (see below)." -msgstr "" +msgstr "��`list`竊뚩풏�뷴뀽雅롥램鵝쒎뙷�꾦쥫鸚뽨에��펷鰲곦툔�뉛펹��" #. type: Plain text #: en/git-worktree.txt:249 #, priority:240 msgid "With `prune`, only expire unused worktrees older than `<time>`." -msgstr "" +msgstr "鵝욜뵪 `prune`竊뚦룵野배텈瓦�`<�띌뿴>`�や슴�①쉪藥δ퐳�븃퓵烏뚧퇇黎겹��" #. type: Plain text #: en/git-worktree.txt:252 #, priority:240 msgid "With `list`, annotate missing worktrees as prunable if they are older than `<time>`." -msgstr "" +msgstr "鵝욜뵪`list`竊뚦쫩�쒍륭鸚긺쉪藥δ퐳�뷸캈`<�띌뿴>`�⑼펽�쇿컛�뜻낏�듾맏��엶�ゃ��" #. type: Labeled list #: en/git-worktree.txt:253 @@ -61090,7 +61090,7 @@ msgstr "--reason <string>" #: en/git-worktree.txt:256 #, priority:240 msgid "With `lock` or with `add --lock`, an explanation why the worktree is locked." -msgstr "" +msgstr "��`lock`�뽫뵪`add --lock`竊뚩㎗�듾맏餓�阿덂램鵝쒎뙷熬ラ봺若싥��" #. type: Labeled list #: en/git-worktree.txt:257 @@ -61102,13 +61102,13 @@ msgstr "<worktree>" #: en/git-worktree.txt:259 #, priority:240 msgid "Worktrees can be identified by path, either relative or absolute." -msgstr "" +msgstr "藥δ퐳�뷴룾餓ι�싪퓝�멨��뽫퍦野배러孃꾣씎瑥녶닽��" #. type: Plain text #: en/git-worktree.txt:264 #, priority:240 msgid "If the last path components in the worktree's path is unique among worktrees, it can be used to identify a worktree. For example if you only have two worktrees, at `/abc/def/ghi` and `/abc/def/ggg`, then `ghi` or `def/ghi` is enough to point to the former worktree." -msgstr "" +msgstr "倻귝옖藥δ퐳�븃러孃꾡릎�꾢릮�졽릉掠귝А�ⓨ램鵝쒏젒訝�삸����꾬펽�쇿츆��빳�ⓩ씎瑥녶닽訝�訝ゅ램鵝쒏젒�귚풃倻귨펽倻귝옖鵝졾룵�됦륵訝ゅ램鵝쒎뙷竊뚦쑉`/abc/def/ghi`��`/abc/def/ggg`竊뚪궍阿덁슴��`ghi`��`def/ghi`弱김떨餓ζ뙁�묈뎺訝�訝ゅ램鵝쒎뙷��" #. type: Title - #: en/git-worktree.txt:266 @@ -61120,43 +61120,43 @@ msgstr "�귟��" #: en/git-worktree.txt:271 #, priority:240 msgid "When using multiple worktrees, some refs are shared between all worktrees, but others are specific to an individual worktree. One example is `HEAD`, which is different for each worktree. This section is about the sharing rules and how to access refs of one worktree from another." -msgstr "" +msgstr "壤볞슴�ⓨ쩀訝ゅ램鵝쒎뙷�띰펽訝�雅쎾폊�ⓨ쑉���됧램鵝쒎뙷阿뗩뿴�긴벴竊뚥퐜�뜸퍟凉뺟뵪��돶若싦틢�뺜릉藥δ퐳�븀쉪�귝캈倻귨폏`HEAD`竊뚦츆野방캀訝ゅ램鵝쒏젒�썸삸訝띶릪�꾠�귝쑍�귝삸�념틢�긴벴鰲꾢닕竊뚥빳�듿쫩鵝뺜퍗�╊�訝ゅ램鵝쒎뙷溫욥뿮訝�訝ゅ램鵝쒎뙷�꾢폊�ⓦ��" #. type: Plain text #: en/git-worktree.txt:276 #, priority:240 msgid "In general, all pseudo refs are per-worktree and all refs starting with `refs/` are shared. Pseudo refs are ones like `HEAD` which are directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not shared." -msgstr "" +msgstr "訝��ф씎瑥댐펽���됬쉪鴉ゅ폊�③꺗��램鵝쒎뙷�방쐣�꾬펽���됦빳`refs/`凉�鸚당쉪凉뺟뵪�썸삸�긴벴�꾠�귚섈凉뺟뵪��깗`HEAD`�ｆ졆�닸렏��`$GIT_DIR`訝뗰펽�뚥툖��쑉`$GIT_DIR/refs`�끿쉪凉뺟뵪�귚퐜阿잍쐣堊뗥쨼竊�`refs/bisect`��`refs/worktree`�끿쉪凉뺟뵪訝띹˙�긴벴��" #. type: Plain text #: en/git-worktree.txt:281 #, priority:240 msgid "Refs that are per-worktree can still be accessed from another worktree via two special paths, `main-worktree` and `worktrees`. The former gives access to per-worktree refs of the main worktree, while the latter to all linked worktrees." -msgstr "" +msgstr "驪뤶릉藥δ퐳�븀쉪凉뺟뵪餓띸꽫��빳�싪퓝訝ㅴ릉�방츏�꾥러孃꾬펽�� `訝삣램鵝쒎뙷`�� `餓롥램鵝쒎뙷`竊뚥퍗�╊�訝ゅ램鵝쒎뙷溫욥뿮�귛뎺�끻룾餓θ���말藥δ퐳�븀쉪驪뤶릉藥δ퐳�븀쉪凉뺟뵪竊뚩�뚦릮�끻룾餓θ�����됮벦�η쉪藥δ퐳�뷩��" #. type: Plain text #: en/git-worktree.txt:288 #, priority:240 msgid "For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good` resolve to the same value as the main worktree's `HEAD` and `refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or `worktrees/bar/refs/bisect/bad` are the same as `$GIT_COMMON_DIR/worktrees/foo/HEAD` and `$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`." -msgstr "" +msgstr "堊뗥쫩竊�`main-worktree/HEAD`��`main-worktree/refs/bisect/good`�녶닽鰲ｆ옄�겻툗訝삣램鵝쒎뙷��`HEAD`��`refs/bisect/good`�멨릪�꾢�쇈�귞굳鴉쇔쑑竊�`worktrees/foo/HEAD`��`worktrees/bar/refs/bisect/bad`訝�`$GIT_COMMON_DIR/worktrees/foo/HEAD`��`$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`�멨릪��" #. type: Plain text #: en/git-worktree.txt:292 #, priority:240 msgid "To access refs, it's best not to look inside `$GIT_DIR` directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly." -msgstr "" +msgstr "誤곮���폊�⑨펽��也썰툖誤곭쎍�ε쑉 `$GIT_DIR` 訝�윥�얇�귞쎑�랃펽鵝욜뵪 linkgit:git-rev-parse[1] �� linkgit:git-update-ref[1] 瓦숁졆�꾢뫝餓ㅵ룾餓ζ�簾�쨪�녶폊�ⓦ��" #. type: Plain text #: en/git-worktree.txt:299 #, priority:240 msgid "By default, the repository `config` file is shared across all worktrees. If the config variables `core.bare` or `core.worktree` are present in the common config file and `extensions.worktreeConfig` is disabled, then they will be applied to the main worktree only." -msgstr "" +msgstr "容섋��끻넻訝뗰펽壅꾣틦佯볡쉪`config`�뉏뻑�ⓩ��됧램鵝쒎뙷訝듿뀻雅ャ�� 倻귝옖�띸쉰�섌뇧`core.bare`��`core.worktree`耶섇쑉雅롥뀶�깁뀓營�뻼餓뜸릎竊뚦뭉訝�`extensions.worktreeConfig`熬ョ쫨�⑨펽�ｄ퉰若껂뺄弱녶룵佯붺뵪雅롣말藥δ퐳�뷩��" #. type: Plain text #: en/git-worktree.txt:302 #, priority:240 msgid "In order to have worktree-specific configuration, you can turn on the `worktreeConfig` extension, e.g.:" -msgstr "" +msgstr "訝뷰틙野밧램鵝쒎뙷瓦쏂죱�밧츣�띸쉰竊뚥퐷��빳�볟�`worktreeConfig`�⒴콝竊뚥풃倻귨폏" #. type: delimited block - #: en/git-worktree.txt:305 @@ -61168,37 +61168,37 @@ msgstr "$ git config extensions.worktreeConfig true\n" #: en/git-worktree.txt:311 #, priority:240 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension." -msgstr "" +msgstr "�②퓳燁띷Æ凉뤶툔竊뚨돶若싩쉪�띸쉰岳앮똻��`git rev-parse --git-path config.worktree`���뉐릲�꾥러孃꾡릎�귚퐷��빳��`git config --worktree`曆삣뒥�뽪쎍�계��뉏뻑訝�쉪�띸쉰�귝뿧�덃쑍�껯it鴉싨땼瀯앲���를�됭퓳訝ゆ돥掠뺟쉪餓볟틩��" #. type: Plain text #: en/git-worktree.txt:317 #, priority:240 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If they exist in `$GIT_DIR/config`, you must move them to the `config.worktree` of the main worktree. You may also take this opportunity to review and move other configuration that you do not want to share to all worktrees:" -msgstr "" +msgstr "力ⓩ꼷竊뚦쑉瓦쇾릉�뉏뻑訝�펽`core.bare`��`core.worktree`�꾡풃鸚뽪깄�드럴瀯뤸텋鸚긱�귛쫩�쒎츆餓у춼�ⓧ틢`$GIT_DIR/config`訝�펽鵝졾퓚窈삥뒍若껂뺄燁삣댆訝삣램鵝쒎뙷��`config.worktree`訝��귚퐷阿잌룾餓ε�잍��뷰폏若→윥�뚨㎉�ⓨ끀餓뽨퐷訝띷꺍�긴벴�경��됧램鵝쒎뙷�꾦뀓營�폏" #. type: Plain text #: en/git-worktree.txt:319 #, priority:240 msgid "`core.worktree` should never be shared." -msgstr "" +msgstr "`core.worktree`訝띶틪瑥θ˙�긴벴��" #. type: Plain text #: en/git-worktree.txt:321 #, priority:240 msgid "`core.bare` should not be shared if the value is `core.bare=true`." -msgstr "" +msgstr "倻귝옖`core.bare`�꾢�쇌맏`core.bare=true`竊뚦닕訝띶틪�긴벴��" #. type: Plain text #: en/git-worktree.txt:324 #, priority:240 msgid "`core.sparseCheckout` should not be shared, unless you are sure you always use sparse checkout for all worktrees." -msgstr "" +msgstr "`core.sparseCheckout`訝띶틪瑥θ˙�긴벴竊뚪솮�욂퐷簾�에鵝졿�삥삸野방��됧램鵝쒎뙷鵝욜뵪葉��뤸��뷩��" #. type: Plain text #: en/git-worktree.txt:327 #, priority:240 msgid "See the documentation of `extensions.worktreeConfig` in linkgit:git-config[1] for more details." -msgstr "" +msgstr "�닷쩀瀯녻뒄瑥룟뢿鰲� linkgit:git-config[1] 訝�쉪 `extensions.worktreeConfig` �뉑。��" #. type: Title - #: en/git-worktree.txt:329 @@ -61210,55 +61210,55 @@ msgstr "瀯녻뒄" #: en/git-worktree.txt:338 #, priority:240 msgid "Each linked worktree has a private sub-directory in the repository's `$GIT_DIR/worktrees` directory. The private sub-directory's name is usually the base name of the linked worktree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked worktree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)." -msgstr "" +msgstr "驪뤶릉�얏렏藥δ퐳�뷴쑉餓볟틩��`$GIT_DIR/worktrees`��퐬訝뗩꺗�됦�訝ょ쭅�됧춴��퐬�� 燁곫쐣耶먪쎅壤뺟쉪�띸㎞�싧만��˙�얏렏�꾢램鵝쒏젒瓮�푶�꾢읃�у릫燁곤펽鵝녶룾�썲뒥訝듾�訝ゆ빊耶쀤빳鵝욘닇訝뷴뵱訝���퐬�� 堊뗥쫩竊뚦퐪`$GIT_DIR=/path/main/.git`�띰펽�썰빱`git worktree add /path/other/test-next next`鴉싧쑉`/path/other/test-next`訝�닗兩븅벦�ε램鵝쒎뙷竊뚦릪�뜹닗兩뷰�訝�`$GIT_DIR/worktrees/test-next`��퐬竊덂쫩��`test-next`藥꿰퍘熬ュ뜝�⑨펽�쇿닗兩�`$GIT_DIR/worktrees/test-next1`竊됥��" #. type: Plain text #: en/git-worktree.txt:344 #, priority:240 msgid "Within a linked worktree, `$GIT_DIR` is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and `$GIT_COMMON_DIR` is set to point back to the main worktree's `$GIT_DIR` (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked worktree." -msgstr "" +msgstr "�ⓧ�訝ら벦�ε램鵝쒎뙷訝�펽`$GIT_DIR`溫양쉰訝뷸뙁�묋퓳訝ょ쭅�됬쎅壤뺧펷堊뗥쫩竊뚥풃耶먧릎��`/path/main/.git/worktrees/test-next`竊됵펽`$GIT_COMMON_DIR`鴉싪˙溫양쉰訝뷸뙁�묇말藥δ퐳�븀쉪`$GIT_DIR`竊덁풃倻귨펽`/path/main/.git`竊됥�귟퓳雅쏂�營�삸�ⓧ퐤雅롩벦�ε램鵝쒎뙷窈띄벨��퐬��`.git`�뉏뻑訝�퓵烏뚨쉪��" #. type: Plain text #: en/git-worktree.txt:354 #, priority:240 msgid "Path resolution via `git rev-parse --git-path` uses either `$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the linked worktree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses `$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`, since refs are shared across all worktrees, except `refs/bisect` and `refs/worktree`." -msgstr "" +msgstr "�싪퓝`git rev-parse --git-path`瓦쏂죱�꾥러孃꾥㎗�먧슴��`$GIT_DIR`��`$GIT_COMMON_DIR`竊뚦룚�념틢瓮�푶�귚풃倻귨펽�③벦�ε램鵝쒎뙷訝�펽`git rev-parse --git-path HEAD`�썰빱瓦붷썮`/path/main/.git/worktrees/test-next/HEAD`竊덅�뚥툖��`/path/other/test-next/.git/HEAD`�뽬��`/path/main/.git/HEAD`竊됵펽��`git rev-parse --git-path refs/heads/master`�쇾슴��`$GIT_COMMON_DIR`亮띈퓭��`/path/main/.git/refs/heads/master`竊뚦썱訝븅솮雅�`refs/bisect`��`refs/worktree`竊뚧��됧램鵝쒎뙷�썲뀻雅ュ폊�ⓦ��" #. type: Plain text #: en/git-worktree.txt:359 #, priority:240 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to `$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path." -msgstr "" +msgstr "�닷쩀岳→겘鰲� linkgit:gitrepository-layout[5]�귞퍘謠뚧퀡�숁삸竊뚦퐪鵝좈�誤곭쎍�θ���`$GIT_DIR`��`$GIT_COMMON_DIR`�끿쉪訝쒑��띰펽訝띹쫨野배러孃꾣삸��콪雅�`$GIT_DIR`�싧눣餓삡퐬�뉓��귚슴��`git rev-parse --git-path`�θ렩孃쀦�瀯덅러孃꾠��" #. type: Plain text #: en/git-worktree.txt:367 #, priority:240 msgid "If you manually move a linked worktree, you need to update the `gitdir` file in the entry's directory. For example, if a linked worktree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead. Better yet, run `git worktree repair` to reestablish the connection automatically." -msgstr "" +msgstr "倻귝옖鵝졿뎸�①㎉�ⓧ�訝ら벦�ε램鵝쒎뙷竊뚥퐷��誤곫쎍�계��←쎅��퐬訝뗧쉪`gitdir`�뉏뻑�귚풃倻귨펽倻귝옖訝�訝ら벦�ε램鵝쒎뙷熬ョ㎉��`/newpath/test-next`竊뚩�뚦츆��`.git`�뉏뻑�뉐릲`/path/main/.git/worktrees/test-next`竊뚪궍阿덃쎍��`/path/main/.git/worktrees/test-next/gitdir`餓ε폊��`/newpath/test-next`�귡솮閭ㅴ퉳鸚뽳펽�닷��꾦�됪떓��펽瓦먫죱`git worktree repair`�θ눎�③뇥�겼뻠塋뗨퓹�γ��" #. type: Plain text #: en/git-worktree.txt:378 #, priority:240 msgid "To prevent a `$GIT_DIR/worktrees` entry from being pruned (which can be useful in some situations, such as when the entry's worktree is stored on a portable device), use the `git worktree lock` command, which adds a file named `locked` to the entry's directory. The file contains the reason in plain text. For example, if a linked worktree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details." -msgstr "" +msgstr "訝뷰틙�꿩�`$GIT_DIR/worktrees`�←쎅熬ヤ엶�わ펷瓦쇿쑉�먧틳�끻넻訝뗥푽�됬뵪竊뚧캈倻귟��←쎅�꾢램鵝쒎뙷耶섇궓�ⓧ씩�븃�鸚뉏툓竊됵펽鵝욜뵪`git worktree lock`�썰빱竊뚦츆鴉싧쑉�←쎅�꾤쎅壤뺜릎曆삣뒥訝�訝ゅ릫訝�`locked`�꾣뻼餓뜰�귟��뉏뻑�끻맜瀛�뻼�х쉪�잌썱�귚풃倻귨펽倻귝옖訝�訝ら벦�ε램鵝쒎뙷��`.git`�뉏뻑�뉐릲`/path/main/.git/worktrees/test-next`竊뚪궍阿덁�訝ゅ릫訝�`/path/main/.git/worktrees/test-next/locked`�꾣뻼餓뜹컛�삥�`test-next`�←쎅熬ュ돦�ㅳ�� 瑥�깄鰲걄inkgit:gitrepository-layout[5]��" #. type: Plain text #: en/git-worktree.txt:381 #, priority:240 msgid "When `extensions.worktreeConfig` is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is." -msgstr "" +msgstr "壤�`extensions.worktreeConfig`熬ュ맦�ⓩ뿶竊뚦쑉`.git/config`阿뗥릮鴉싪���`.git/worktrees/<id>/config.worktree`�꾦뀓營�뻼餓뜰��" #. type: Title - #: en/git-worktree.txt:383 #, no-wrap, priority:240 msgid "LIST OUTPUT FORMAT" -msgstr "" +msgstr "�쀨〃渦볟눣�쇔폀" #. type: Plain text #: en/git-worktree.txt:386 #, priority:240 msgid "The `worktree list` command has two output formats. The default format shows the details on a single line with columns. For example:" -msgstr "" +msgstr "`worktree list` �썰빱�됦륵燁띹풏�뷸졏凉뤵�귡퍡溫ㅷ쉪�쇔폀��쑉�뺠죱訝딀샑鹽븀퍏�귨펽亮뜹를�됧닓�� 堊뗥쫩竊�" #. type: delimited block - #: en/git-worktree.txt:392 @@ -61278,19 +61278,19 @@ msgstr "" #: en/git-worktree.txt:396 #, priority:240 msgid "The command also shows annotations for each worktree, according to its state. These annotations are:" -msgstr "" +msgstr "瑥ε뫝餓ㅸ퓲�방뜮驪뤶릉藥δ퐳�븀쉪�뜻�곻펽�양ㅊ�뜻낏�듽�� 瓦쇾틳力③뇢��폏" #. type: Plain text #: en/git-worktree.txt:398 #, priority:240 msgid "`locked`, if the worktree is locked." -msgstr "" +msgstr "`locked`竊뚦쫩�쒎램鵝쒎뙷熬ラ봺若싥��" #. type: Plain text #: en/git-worktree.txt:399 #, priority:240 msgid "`prunable`, if the worktree can be pruned via `git worktree prune`." -msgstr "" +msgstr "`prunable`竊뚦쫩�쒎램鵝쒎뙷��빳�싪퓝`git worktree prune`瓦쏂죱岳�돦��" #. type: delimited block - #: en/git-worktree.txt:405 @@ -61308,9 +61308,9 @@ msgstr "" #. type: Plain text #: en/git-worktree.txt:410 -#, priority:240 +#, fuzzy, priority:240 msgid "For these annotations, a reason might also be available and this can be seen using the verbose mode. The annotation is then moved to the next line indented followed by the additional information." -msgstr "" +msgstr "野밥틢瓦쇾틳力③뇢竊뚥튋��꺗�됦�訝ゅ렅�좑펽瓦쇿룾餓ι�싪퓝verbose與▼폀�뗥댆�귞꽫�롦낏�딂˙燁삣댆訝뗤�烏뚨섄瓦쏉펽�롩씊��셿�졽에����" #. type: delimited block - #: en/git-worktree.txt:419 @@ -61329,19 +61329,19 @@ msgstr "$ git worktree list --verbose\n/path/to/linked-worktree #: en/git-worktree.txt:424 #, priority:240 msgid "Note that the annotation is moved to the next line if the additional information is available, otherwise it stays on the same line as the worktree itself." -msgstr "" +msgstr "力ⓩ꼷竊뚦쫩�쒏쐣窯앭쨼�꾡에��펽力③뇢弱녻˙燁삣댆訝뗤�烏뚳펽��닕若껃컛訝롥램鵝쒎뙷�ц벴岳앮똻�ⓨ릪訝�烏뚣��" #. type: Title ~ #: en/git-worktree.txt:426 #, no-wrap, priority:240 msgid "Porcelain Format" -msgstr "" +msgstr "訝듿콆�썰빱�쇔폀" #. type: Plain text #: en/git-worktree.txt:435 #, priority:240 msgid "The porcelain format has a line per attribute. If `-z` is given then the lines are terminated with NUL rather than a newline. Attributes are listed with a label and value separated by a single space. Boolean attributes (like `bare` and `detached`) are listed as a label only, and are present only if the value is true. Some attributes (like `locked`) can be listed as a label only or with a value depending upon whether a reason is available. The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record. For example:" -msgstr "" +msgstr "訝듿콆�썰빱�꾣캀訝ゅ콪�㎪쐣訝�烏뚣�� 倻귝옖瀯쇾틙`-z`竊뚪궍阿덅퓳�좄죱弱녵빳NUL竊덄㈉耶쀧Е竊됭�뚥툖��뜟烏뚧씎瀯볠씇�� 掠욄�㏛빳�뉒��뚦�쇘쉪壤℡폀�쀥눣竊뚨뵪訝�訝ょ㈉�쇤슂凉��� 躍껃컮掠욄�㏆펷倻�`bare`��`detached`竊됦퍎鵝쒍맏�뉒��쀥눣竊뚦뭉訝붶퍎�ⓨ�쇌맏�잍뿶�븀렟�� 訝�雅쎾콪�㏆펷倻�`locked'竊됧룾餓ε룵鵝쒍맏�뉒��쀥눣竊뚥튋��빳�방뜮��맔�됬릤�긷닓�뷰�訝ゅ�쇈�� 藥δ퐳�븀쉪寧т�訝ゅ콪�㎪�삥삸`藥δ퐳��'竊뚥�訝ょ㈉烏뚩〃鹽븃�壤뺟쉪瀯볠씇�� 驪붷쫩瑥댐폏" #. type: delimited block - #: en/git-worktree.txt:440 @@ -61362,7 +61362,7 @@ msgid "" "worktree /path/to/linked-worktree\n" "HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" "branch refs/heads/master\n" -msgstr "" +msgstr "worktree /path/to/linked-worktree\nHEAD abcd1234abcd1234abcd1234abcd1234abcd1234\nbranch refs/heads/master\n" #. type: delimited block - #: en/git-worktree.txt:448 @@ -61371,7 +61371,7 @@ msgid "" "worktree /path/to/other-linked-worktree\n" "HEAD 1234abc1234abc1234abc1234abc1234abc1234a\n" "detached\n" -msgstr "" +msgstr "worktree /path/to/other-linked-worktree\nHEAD 1234abc1234abc1234abc1234abc1234abc1234a\ndetached\n" #. type: delimited block - #: en/git-worktree.txt:453 @@ -61381,7 +61381,7 @@ msgid "" "HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n" "branch refs/heads/locked-no-reason\n" "locked\n" -msgstr "" +msgstr "worktree /path/to/linked-worktree-locked-no-reason\nHEAD 5678abc5678abc5678abc5678abc5678abc5678c\nbranch refs/heads/locked-no-reason\nlocked\n" #. type: delimited block - #: en/git-worktree.txt:458 @@ -61391,7 +61391,7 @@ msgid "" "HEAD 3456def3456def3456def3456def3456def3456b\n" "branch refs/heads/locked-with-reason\n" "locked reason why is locked\n" -msgstr "" +msgstr "worktree /path/to/linked-worktree-locked-with-reason\nHEAD 3456def3456def3456def3456def3456def3456b\nbranch refs/heads/locked-with-reason\nlocked reason why is locked\n" #. type: delimited block - #: en/git-worktree.txt:463 @@ -61401,13 +61401,13 @@ msgid "" "HEAD 1233def1234def1234def1234def1234def1234b\n" "detached\n" "prunable gitdir file points to non-existent location\n" -msgstr "" +msgstr "worktree /path/to/linked-worktree-prunable\nHEAD 1233def1234def1234def1234def1234def1234b\ndetached\n岳�돦�꼏itdir�뉏뻑�뉐릲訝띶춼�①쉪鵝띸쉰\n" #. type: Plain text #: en/git-worktree.txt:470 -#, fuzzy, priority:240 +#, priority:240 msgid "Unless `-z` is used any \"unusual\" characters in the lock reason such as newlines are escaped and the entire reason is quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). For Example:" -msgstr "倻귝옖亦→쐣瓦쇾릉�됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉뺟뵪竊뚧�倻귡뀓營�룜�� `core.quotePath` ��鰲ｉ뇢�꾦궍�뤄펷�귟쭅 linkgit:git-config[1]竊됥��" +msgstr "�ㅹ씆鵝욜뵪`-z`竊뚦맔�숅봺若싩쉪�잌썱訝�뻣鵝� \"訝띶�躍�\"�꾢춻寧�펽倻귝뜟烏뚳펽�썰폏熬ヨ쉬阿됵펽亮뜸툝�답릉�잌썱熬ュ폊�ⓧ맏�띸쉰�섌뇧`core.quotePath`竊덅쭅linkgit:git-config[1]竊됥�� 訝얌풃�θ�竊�" #. type: delimited block - #: en/git-worktree.txt:476 @@ -61427,7 +61427,7 @@ msgstr "" #: en/git-worktree.txt:488 #, priority:240 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked worktree to make the emergency fix, remove it when done, and then resume your earlier refactoring session." -msgstr "" +msgstr "鵝졿��②퓵烏뚪뇥�꾢램鵝쒙펽鵝좂쉪�곫씮瓦쎿씎雅놅펽誤곫콆鵝좂쳦�념엶鸚띴�雅쎽툥蜈욍�귚퐷�싧만鴉싦슴�쮔inkgit:git-stash[1]�ζ쉨�뜹춼�ⓧ퐷�꾡엶�뱄펽�띈�뚥퐷�꾢램鵝쒏젒鸚꾡틢倻귝�曆룝묽�꾤듁�곻펷�됪뼭�꾠�곮˙燁삣뒯�꾠�곮˙�좈솮�꾣뻼餓띰펽餓ε룋�뜸퍟�ｈ맼�꾤쥙�뉛펹竊뚥퐷訝띷꺍�믧솴�삥돀�겼츆�귞쎑�랃펽鵝졾닗兩뷰틙訝�訝や릿�띄쉪�얏렏藥δ퐳�묉씎瓦쏂죱榮㎪�δ엶鸚랃펽若뚧닇�롥컛�뜹닠�ㅿ펽�뜹릮瀯㎫뺌鵝졾뀍�띸쉪�띷엫鴉싪캕��" #. type: delimited block - #: en/git-worktree.txt:496 @@ -61439,13 +61439,13 @@ msgid "" "$ git commit -a -m 'emergency fix for boss'\n" "$ popd\n" "$ git worktree remove ../temp\n" -msgstr "" +msgstr "$ git worktree add -b emergency-fix ../temp master\n$ pushd ../temp\n# ... �③챺若� ...\n$ git commit -a -m '�곫씮溫⒵닊壅띄뇻岳�쨳�꾦뿮窯�'\n$ popd\n$ git worktree remove ../temp\n" #. type: Plain text #: en/git-worktree.txt:503 #, priority:240 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject." -msgstr "" +msgstr "鸚싮뇥汝��뷸�삡퐪訝듾퍖鸚꾡틢瑥뺡챿�뜻�竊뚦�耶먩Æ�쀧쉪��똻阿잋툖若뚧빐�귝닊餓� �덁툖�� 兩븃�野밥�訝ょ댍窈밭쎅瓦쏂죱鸚싮뇥汝��뷩��" #. type: Title = #: en/git-write-tree.txt:2 @@ -62966,49 +62966,49 @@ msgstr "瓦썼릉��'<start>,<end>'瀯쇿눣�꾥죱�꾥똽�댐펽�뽫뵳�썸빊�띸㎞�띶릦 #: en/merge-options.txt:5 #, priority:240 msgid "Perform the merge and commit the result. This option can be used to override --no-commit." -msgstr "" +msgstr "�㎬죱�덂뭉亮뜻룓雅ㅷ퍜�쒌�귟퓳訝ら�됮」��빳�ⓩ씎誤녺썣 --no-commit��" #. type: Plain text #: en/merge-options.txt:7 en/merge-options.txt:100 en/merge-options.txt:141 #, no-wrap, priority:240 msgid "\tOnly useful when merging.\n" -msgstr "" +msgstr "\t�ゆ쐣�ⓨ릦亮띄쉪�뜹�숁뎺�됬뵪��\n" #. type: Plain text #: en/merge-options.txt:12 #, priority:240 msgid "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing." -msgstr "" +msgstr "�� --no-commit �ζ돢烏뚦릦亮띰펽亮뜹쑉�쎾뻠�덂뭉�먧벡�띶걶閭�펽餓δ씩溫⑴뵪�룡쐣�뷰폏�ⓩ룓雅ㅵ뎺汝��ε뭽瓦쎽�閭θ컘�닷릦亮띄퍜�쒌��" #. type: Plain text #: en/merge-options.txt:17 #, priority:240 msgid "Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit." -msgstr "" +msgstr "瑥룡낏�륅펽恙ヨ퓵�닸뼭亮뜸툖雅㎫뵟�덂뭉�먧벡竊뚦썱閭ㅶ깹�됧뒢力뺟뵪 --no-commit �쒏�瓦쇾틳�덂뭉�� �졿�竊뚦쫩�쒍퐷�녕‘岳앬퐷�꾢늽��툖熬ュ릦亮뜹뫝餓ㅶ뵻�섉닑�닸뼭竊뚩�訝�壅룝슴�� --no-ff �� --no-commit�됮」��" #. type: Plain text #: en/merge-options.txt:26 #, priority:240 msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)." -msgstr "" +msgstr "�ⓩ룓雅ㅶ닇�잏쉪�뷸ː�덂뭉阿뗥뎺竊뚩컘�ⓧ�訝ょ폋渦묈솳�θ퓵訝�閭η폋渦묋눎�①뵟�먪쉪�덂뭉岳→겘竊뚥빳堊욜뵪�룟룾餓θ㎗�듿뭽瑥곫삇�덂뭉�꾢릦�녷�㎯�귛룾餓δ슴��`--no-edit`�됮」�ζ렏�쀨눎�①뵟�먪쉪岳→겘竊덁퐜��툖庸볟뒻雅꿱퓳阿덂걳竊됥��" #. type: Plain text #: en/merge-options.txt:30 #, priority:240 msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor." -msgstr "" +msgstr "倻귝옖鵝졾쑉�썰빱烏뚥릎��`-m`�됮」瀯쇿눣訝�訝よ뜆葉요에��펽亮뜻꺍�①폋渦묈솳訝�폋渦묈츆竊�`--edit`竊덃닑`-e`竊됮�됮」餓띸꽫�됬뵪��" #. type: Plain text #: en/merge-options.txt:37 #, priority:240 msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them." -msgstr "" +msgstr "�㎫쉪�싨쑍��꺗堊앲탺雅롣툖�곮��ⓩ댎煐뽬풌�덂뭉�ε퓱岳→겘�꾢럣�꿱죱訝뷩�귚퍟餓т폏�②퓧烏�`git merge`�띄쐦�겻�訝ょ폋渦묈솳熬ユ돀凉��귚맏雅녵슴瓦쇾틳�싨쑍�닷��볢컘�닷댆���곁쉪烏뚥맏竊뚦룾餓ε쑉�싨쑍�꾢�鸚닷컛��쥊�섌뇧`GIT_MERGE_AUTOEDIT`溫양쉰訝�`no`��" #. type: Plain text #: en/merge-options.txt:44 #, priority:240 msgid "This option determines how the merge message will be cleaned up before committing. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict." -msgstr "" +msgstr "瓦쇾릉�됮」�녑츣雅녶쑉�먧벡�띶쫩鵝뺞툍�녶릦亮뜸에���귝쎍鸚싩퍏�귟쭅linkgit:git-commit[1]�귝�鸚뽳펽倻귝옖`<與▼폀>`�꾢�쇌맏 `scissors`竊뚦쑉�묊뵟�덂뭉�꿰챳�띰펽scissors弱녻˙�꾢뒥�� \"MERGE_MSG \"訝딉펽�뜹릮鴉좈�믥퍢�먧벡�뷴댍��" #. type: Labeled list #: en/merge-options.txt:48 en/merge-options.txt:56 @@ -63020,67 +63020,67 @@ msgstr "--ff-only" #: en/merge-options.txt:54 #, priority:240 msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed." -msgstr "" +msgstr "�뉐츣壤볢˙�덂뭉�꾢럣�꿨럴瀯뤸삸壤볟뎺�녶뤁�꾢릮餓ｆ뿶竊뚦쫩鵝뺝쨪�녶릦亮띄쉪��쥦�� 容섋�訝�`--ff`竊뚪솮�욃릦亮띄쉪���訝ゆ쐣力③뇢�꾬펷��꺗��쐣嶺얍릫�꾬펹�뉒�竊뚦쑉瓦숂쭕�끻넻訝뗰펽`--no-ff`�뉓�瓦쇾릉�뉒�亮뜻깹�됧춼�ⓨ쑉`refs/tags/`掠귝А瀯볠엫訝�쉪�ょ꽫鵝띸쉰��" #. type: Plain text #: en/merge-options.txt:60 #, priority:240 msgid "Only update to the new history if there is no divergent local history. This is the default when no method for reconciling divergent histories is provided (via the --rebase=* flags)." -msgstr "" +msgstr "�ゆ쐣�ⓩ깹�됧늽閭㎫쉪�у쑑�녶뤁�뜻뎺�닸뼭�경뼭�꾢럣�꿔�� 壤볠깹�됪룓堊쏂컘�뚦늽閭㎩럣�꿰쉪�방퀡�띰펷�싪퓝--rebase=*�뉐퓱竊됵펽瓦숁삸容섋��꾠��" #. type: Plain text #: en/merge-options.txt:69 #, priority:240 msgid "When merging rather than rebasing, specifies how a merge is handled when the merged-in history is already a descendant of the current history. If merging is requested, `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed." -msgstr "" +msgstr "壤볟릦亮띈�뚥툖��룜�뷸뿶竊뚧뙁若싧퐪熬ュ릦亮띄쉪�녶뤁藥꿰퍘��퐪�띶럣�꿰쉪�롣빰�뜹쫩鵝뺝쨪�녶릦亮뜰�� 倻귝옖誤곫콆�덂뭉竊�`--ff`��퍡溫ㅷ쉪竊뚪솮�욃릦亮띄쉪���訝ゆ쐣力③뇢�꾬펷��꺗��쐣嶺얍릫�꾬펹�뉒�竊뚩�뚩퓳訝ゆ젃嶺얏깹�됧춼�ⓨ쑉`refs/tags/`掠귝А瀯볠엫訝�쉪�ょ꽫鵝띸쉰竊뚦쑉瓦숂쭕�끻넻訝뗰펽�뉐츣`--no-ff`��" #. type: Plain text #: en/merge-options.txt:75 #, priority:240 msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit." -msgstr "" +msgstr "倻귝옖鵝욜뵪 `--ff`竊뚦룾�썹쉪瑥앾펽餓ε엮瓦쎿뼶凉뤺㎗�녑릦亮띌뿮窯섓펷�ゆ쎍�겼늽��뙁�덁빳�백뀓�덂뭉�롧쉪�녷뵱竊쎽툖�쎾뻠�덂뭉�먧벡竊됥�� 壤볞툖��꺗�띰펷壤볟릦亮띄쉪�녶뤁訝띷삸壤볟뎺�녶뤁�꾢릮餓ｏ펹竊뚦닗兩뷰�訝ゅ릦亮뜻룓雅ㅳ��" #. type: Plain text #: en/merge-options.txt:78 #, priority:240 msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward." -msgstr "" +msgstr "鵝욜뵪`--no-ff`竊뚦쑉���됪깄�듕툔�썲닗兩뷰�訝ゅ릦亮뜻룓雅ㅿ펽�념슴瑥ε릦亮뜹룾餓δ퐳訝뷰�訝ゅ엮瓦쏂㎗�녈��" #. type: Plain text #: en/merge-options.txt:82 #, priority:240 msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status." -msgstr "" +msgstr "鵝욜뵪`--ff-only`竊뚦쑉��꺗�꾣깄�듕툔竊뚥빳恙ヨ퓵�꾣뼶凉뤺㎗�녑릦亮띄쉪��쥦�� 壤볞툖��꺗�띰펽�믥퍦�덂뭉亮뜸빳�욇쎏�뜻�곲���뷩��" #. type: Plain text #: en/merge-options.txt:92 #, priority:240 msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`." -msgstr "" +msgstr "野밧릦亮뜹릮�꾣룓雅ㅸ퓵烏똆PG嶺얍릫��`keyid`�귝빊��룾�됬쉪竊뚪퍡溫ㅴ맏�먧벡�끿쉪翁ヤ뻥竊쎾쫩�쒏뙁若싷펽若껃퓚窈삡툗�됮」瓦욃쑉訝�壅뤄펽訝띹꺗�됬㈉�쇈��`--no-gpg-sign`野밥틢�띶뫝餓�`commit.gpgSign`�띸쉰�섌뇧�뚧뿩�잏쉪`--gpg-sign`�썲푽�됬뵪��" #. type: Plain text #: en/merge-options.txt:98 #, priority:240 msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]." -msgstr "" +msgstr "�ㅴ틙�녷뵱�띸㎞鸚뽳펽�ⓩ뿥恙쀤에��릎��鸚싧룵��<n>訝ゆ��ⓨ릦亮띄쉪若욇솀�먧벡�꾢뜒烏뚧룒瓦경씎櫻ュ뀉�귛뢿鰲� linkgit:git-fmt-merge-msg[1]��" #. type: Plain text #: en/merge-options.txt:104 #, priority:240 msgid "With --no-log do not list one-line descriptions from the actual commits being merged." -msgstr "" +msgstr "倻귝옖鵝욜뵪 --no-log竊뚦닕訝띶닓�븃˙�덂뭉�꾢츩�끾룓雅ㅵ냵若밭쉪�뺠죱�뤺염��" #. type: Plain text #: en/merge-options.txt:112 #, priority:240 msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat." -msgstr "" +msgstr "�ⓨ릦亮띄퍜�잍뿶�양ㅊ訝�訝ゅ량凉귞듁�곥�귛량凉귞듁�곦튋�깁뀓營��됮」merge.stat�㎩댍��" #. type: Plain text #: en/merge-options.txt:115 #, priority:240 msgid "With -n or --no-stat do not show a diffstat at the end of the merge." -msgstr "" +msgstr "鵝욜뵪-n��--no-stat竊뚦쑉�덂뭉瀯볠씇�뜸툖�양ㅊ藥�펰�뜻�곥��" #. type: Labeled list #: en/merge-options.txt:116 @@ -63098,49 +63098,49 @@ msgstr "--no-squash" #: en/merge-options.txt:125 #, priority:240 msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)." -msgstr "" +msgstr "雅㎫뵟藥δ퐳�뷴뭽榮℡폊�뜻�곻펽弱긷깗�묊뵟雅녺쐿閭ｇ쉪�덂뭉訝��뤄펷�ㅴ틙�덂뭉岳→겘竊됵펽鵝녵툖若욇솀�먧벡竊뚥툖燁삣뒯`HEAD`竊뚥튋訝띹�壤�`$GIT_DIR/Merge_HEAD`竊덁빳野쇠눜訝뗤�訝�`git commit`�썰빱�쎾뻠訝�訝ゅ릦亮뜻룓雅ㅿ펹�� 瓦쇿뀅溫멧퐷�ⓨ퐪�띶늽��쉪�븀�訝듿닗兩뷰�訝ゅ뜒訝��꾣룓雅ㅿ펽�뜻븞�쒍툗�덂뭉�╊�訝ゅ늽��쎑�뚳펷倻귝옖��쩀瓮�늽��펽�숁쎍鸚싷펹��" #. type: Plain text #: en/merge-options.txt:128 #, priority:240 msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash." -msgstr "" +msgstr "鵝욜뵪 --no-squash 瓦쏂죱�덂뭉亮뜻룓雅ㅷ퍜�쒌�귟퓳訝ら�됮」��빳�ⓩ씎誤녺썣 --quash �됮」��" #. type: Plain text #: en/merge-options.txt:130 #, priority:240 msgid "With --squash, --commit is not allowed, and will fail." -msgstr "" +msgstr "鵝욜뵪 --squash竊�--commit ��툖�곮��꾬펽�뚥툝鴉싧ㅁ兀γ��" #. type: Plain text #: en/merge-options.txt:133 en/merge-options.txt:166 en/merge-options.txt:210 #, priority:240 msgid "Only useful when merging." -msgstr "" +msgstr "�ゆ쐣�ⓨ릦亮띄쉪�뜹�숁뎺�됬뵪��" #. type: Plain text #: en/merge-options.txt:139 #, priority:240 msgid "By default, the pre-merge and commit-msg hooks are run. When `--no-verify` is given, these are bypassed. See also linkgit:githooks[5]." -msgstr "" +msgstr "容섋��끻넻訝뗰펽鴉싪퓧烏� pre-merge �� commit-msg 雅뗤뻑hook�� 壤볡퍢若� `--no-verify`�띰펽瓦쇾틳弱녵툖鴉싨돢烏뚣�� �귟쭅 linkgit:githooks[5]��" #. type: Plain text #: en/merge-options.txt:150 #, priority:240 msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead (`ort` when merging a single head, `octopus` otherwise)." -msgstr "" +msgstr "鵝욜뵪瀯쇿츣�꾢릦亮띄춺�ο폑��빳鸚싨А�먧풘竊뚥빳�뉐츣若껂뺄佯붻�熬ュ컼瑥뺟쉪窈뷴틣�� 倻귝옖亦→쐣`-s`�됮」竊뚦닕鵝욜뵪訝�訝ゅ냵營�쉪嶺뽫븼�쀨〃竊덂퐪�덂뭉�뺜릉鸚닸뿶鵝욜뵪`ort`竊뚦맔�쇾슴��`octopus`竊됥��" #. type: Labeled list #: en/merge-options.txt:151 #, no-wrap, priority:240 msgid "-X <option>" -msgstr "" +msgstr "-X <�됮」>" #. type: Plain text #: en/merge-options.txt:155 #, priority:240 msgid "Pass merge strategy specific option through to the merge strategy." -msgstr "" +msgstr "弱녶릦亮띄춺�η쉪�밧츣�됮」鴉좈�믥퍢�덂뭉嶺뽫븼��" #. type: Labeled list #: en/merge-options.txt:156 @@ -63158,7 +63158,7 @@ msgstr "--no-verify-signatures" #: en/merge-options.txt:163 #, priority:240 msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted." -msgstr "" +msgstr "謠뚩칮熬ュ릦亮띄쉪堊㎬씁�녷뵱�꾣룓鹽뷸룓雅ㅶ삸��뵪�됪븞�꾢칳�η�營뀐펽�념�訝ゅ끁�됪쐣�늱id�꾢칳�ο폏�③퍡溫ㅷ쉪岳▽뻣與▼엹訝�펽瓦숁꼷�녕�嶺양쉿野녽뮙��뵳訝�訝ゅ룛岳▽뻣�꾢칳�η�營꿔�� 倻귝옖堊㎬씁�녷뵱�꾣룓鹽뷸룓雅ㅶ깹�됬뵪�됪븞�꾢칳�η��랃펽�쇿릦亮띈˙瀯덃���" #. type: Labeled list #: en/merge-options.txt:169 @@ -63170,19 +63170,19 @@ msgstr "--no-summary" #: en/merge-options.txt:172 #, priority:240 msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future." -msgstr "" +msgstr "訝� --stat �� --no-stat �뚥퉱竊쏂퓳雅쏃꺗凉껆뵪雅놅펽弱녷씎鴉싪˙�좈솮��" #. type: Plain text #: en/merge-options.txt:177 #, priority:240 msgid "Operate quietly. Implies --no-progress." -msgstr "" +msgstr "若됮쓾�경뱧鵝쒌�귝슅�� --no-progress��" #. type: Plain text #: en/merge-options.txt:188 #, priority:240 msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting." -msgstr "" +msgstr "�롧‘�경돀凉�/�녜뿭瓦쎾벧�귛쫩�쒍륵�낂꺗亦→쐣�뉐츣竊뚦쫩�쒏젃�녽뵗瑥�퓹�ε댆瀯덄ク竊뚦갚鴉싨샑鹽븃퓵佯╉�� 力ⓩ꼷竊뚦뭉�욄��됬쉪�덂뭉嶺뽫븼�썸뵱�곮퓵佯�뒫�듽��" #. type: Plain text #: en/merge-options.txt:199 @@ -63195,19 +63195,19 @@ msgstr "壤볢�營�맏 \"true \"�띰펽�ⓩ뱧鵝쒎�冶뗥뎺�ゅ뒯�쎾뻠訝�訝や릿�� #: en/merge-options.txt:207 #, priority:240 msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added." -msgstr "" +msgstr "容섋��끻넻訝뗰펽`git merge`�썰빱�믥퍦�덂뭉�ｄ틳亦→쐣�긷릪曄뽩뀍�꾢럣�꿔�� 壤볟릦亮뜸륵訝ょ떖塋뗥�冶뗧쉪窈밭쎅�꾢럣�꿩뿶竊뚩퓳訝ら�됮」��빳�ⓩ씎誤녺썣瓦쇾릉若됧뀲�㎯�귞뵳雅롨퓳���訝ら씆躍며퐬鰲곭쉪�끻넻竊뚧깹�됮뀓營�룜�뤸씎容섋���뵪竊뚥튋訝띴폏熬ユ렌�졼��" #. type: Title - #: en/merge-strategies.txt:2 #, no-wrap, priority:240 msgid "MERGE STRATEGIES" -msgstr "" +msgstr "�덂뭉�섊븼" #. type: Plain text #: en/merge-strategies.txt:8 #, priority:240 msgid "The merge mechanism (`git merge` and `git pull` commands) allows the backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`." -msgstr "" +msgstr "�덂뭉�뷴댍竊�`git merge`��`git pull`�썰빱竊됧뀅溫며뵪`s`�됮」�ι�됪떓�롧ク'�덂뭉嶺뽫븼'�� 訝�雅쏁춺�δ튋��빳�뉐룚�ゅ런�꾦�됮」竊뚦룾餓ι�싪퓝瀯�`git merge`��/��`git pull`��`-X<�됮」>`�귝빊�δ폖�믡��" #. type: Labeled list #: en/merge-strategies.txt:9 @@ -63219,13 +63219,13 @@ msgstr "��" #: en/merge-strategies.txt:24 #, priority:240 msgid "This is the default merge strategy when pulling or merging one branch. This strategy can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this strategy can detect and handle merges involving renames. It does not make use of detected copies. The name for this algorithm is an acronym (\"Ostensibly Recursive's Twin\") and came from the fact that it was written as a replacement for the previous default algorithm, `recursive`." -msgstr "" +msgstr "瓦숁삸�됧룚�뽩릦亮뜸�訝ゅ늽��뿶�꾦퍡溫ㅵ릦亮띄춺�γ�� 瓦쇾릉嶺뽫븼�よ꺗鵝욜뵪訝됪뼶�덂뭉嶸쀦퀡鰲ｅ넶訝ㅴ릉鸚담�� 壤볠쐣訝�訝や빳訝딁쉪�긷릪曄뽩뀍��뵪雅롣툒�밧릦亮뜻뿶竊뚦츆鴉싧닗兩뷰�訝ゅ뀻�뚨쪝�덄쉪�덂뭉�묕펽亮뜹컛�뜸퐳訝뷰툒�밧릦亮띄쉪�귟�껅젒�� ��뒫�볩펽�싪퓝野툹inux 2.6�끾졇凉��묈럣�꿜릎�꾢츩�끻릦亮뜻룓雅ㅷ쉪役뗨캊竊뚩퓳野쇠눜雅녻푵弱묊쉪�덂뭉�꿰챳竊뚩�뚥툖鴉싧폊壅룬뵗瑥�쉪�덂뭉�� 閭ㅵ쨼竊뚩퓳訝ょ춺�ε룾餓ζ�役뗥뭉鸚꾤릤易됧룋�띶뫝�띸쉪�덂뭉�� 若껃뭉訝띴슴�ⓩ�役뗥댆�꾢돬�с�� 瓦쇾릉嶸쀦퀡�꾢릫耶쀦삸訝�訝ょ섄�숋펷\"Ostensibly Recursive's Twin\"竊됵펽�θ눎雅롥츆��퐳訝뷰빳�띸쉪容섋�嶸쀦퀡`recursive`�꾣쎘餓ｈ�뚨폋�숂쉪��" #. type: Plain text #: en/merge-strategies.txt:26 #, priority:240 msgid "The 'ort' strategy can take the following options:" -msgstr "" +msgstr "'ort' 嶺뽫븼��빳�뉐룚餓δ툔�됮」竊�" #. type: Labeled list #: en/merge-strategies.txt:27 en/merge-strategies.txt:132 @@ -63237,13 +63237,13 @@ msgstr "ours" #: en/merge-strategies.txt:32 #, priority:240 msgid "This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side." -msgstr "" +msgstr "瓦쇾릉�됮」�싪퓝�얍릲雅� \"�묇뺄\" �꾤뎵�э펽瓦ヤ슴�꿰챳�꾤뙉�⑵˙�ゅ뒯鰲ｅ넶�� �╊�汝든쎅壤뺞젒訝듾툗�묇뺄瓦숃씁訝띶넳囹곭쉪�섇뙑鴉싧룏�졾쑉�덂뭉瀯볠옖訝��� 野밥틢訝�訝や틠瓦쎾댍�뉏뻑竊뚧빐訝ゅ냵若백꺗�θ눎�묇뺄瓦숃씁��" #. type: Plain text #: en/merge-strategies.txt:36 #, priority:240 msgid "This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it." -msgstr "" +msgstr "瓦쇾툖佯붻�訝� \"�묇뺄��\" �덂뭉嶺뽫븼�멩렁曆놅펽�롨�끿뵚�녔졊�т툖�뗥룱訝�汝든쎅壤뺞젒�끻맜雅녵�阿덀�� 若껅뒟凉껂틙�뜸퍟�묉��싩쉪訝��뉛펽若ｅ툋 \"�묇뺄��\" �녶뤁�끻맜雅녶끀訝���묊뵟�꾡��뉎��" #. type: Labeled list #: en/merge-strategies.txt:37 @@ -63255,7 +63255,7 @@ msgstr "theirs" #: en/merge-strategies.txt:40 #, priority:240 msgid "This is the opposite of 'ours'; note that, unlike 'ours', there is no 'theirs' merge strategy to confuse this merge option with." -msgstr "" +msgstr "瓦쇾툗 \"�묇뺄��\" �멨룏竊쎿낏�륅펽訝� \"�묇뺄��\" 訝띶릪竊뚧깹�� \"餓뽨뺄��\" �덂뭉嶺뽫븼�ζ렁曆녻퓳訝ゅ릦亮띌�됮」��" #. type: Labeled list #: en/merge-strategies.txt:44 @@ -63267,25 +63267,25 @@ msgstr "ignore-cr-at-eol" #: en/merge-strategies.txt:50 #, priority:240 msgid "Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, and `--ignore-cr-at-eol`." -msgstr "" +msgstr "訝뷰틙瓦쏂죱訝됪뼶�덂뭉竊뚦컛�룡쐣�뉐츣映삣엹�꾤㈉�썲룜�뽫쉪烏뚩쭍訝뷸깹�됧룜�뽧�� 鵝녷렁�덁틙�뜸퍟�밧뒯�꾥죱�꾤㈉�썸뵻�ⓧ툖鴉싪˙恙썹븼�� �귟쭅linkgit:git-diff[1] `-b`, `-w`, `-ignore-space-at-eol`, �� `-ignore-cr-at-eol`��" #. type: Plain text #: en/merge-strategies.txt:53 #, priority:240 msgid "If 'their' version only introduces whitespace changes to a line, 'our' version is used;" -msgstr "" +msgstr "倻귝옖 \"餓뽨뺄��\" �덃쑍�ゅ쑉訝�烏뚥릎凉뺝뀯雅녺㈉�썹쉪�섇뙑竊뚦닕鵝욜뵪 \"�묇뺄��\" �덃쑍竊�" #. type: Plain text #: en/merge-strategies.txt:55 #, priority:240 msgid "If 'our' version introduces whitespace changes but 'their' version includes a substantial change, 'their' version is used;" -msgstr "" +msgstr "倻귝옖 \"�묇뺄��\" �덃쑍凉뺝뀯雅녺㈉�썹쉪�섇뙑竊뚥퐜 \"餓뽨뺄��\" �덃쑍�끾떖訝�訝ゅ츩兀ⓩ�㎫쉪�섇뙑竊뚦닕鵝욜뵪 \"餓뽨뺄��\" �덃쑍;" #. type: Plain text #: en/merge-strategies.txt:56 #, priority:240 msgid "Otherwise, the merge proceeds in the usual way." -msgstr "" +msgstr "��닕竊뚦릦亮뜹컛餓ε만鰲꾣뼶凉뤺퓵烏뚣��" #. type: Labeled list #: en/merge-strategies.txt:57 @@ -63297,7 +63297,7 @@ msgstr "renormalize" #: en/merge-strategies.txt:64 #, priority:240 msgid "This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5] for details." -msgstr "" +msgstr "�②㎗�념툒�밧릦亮뜻뿶竊뚩퓳弱녶�訝�訝ゆ뻼餓띄쉪���됦툒訝ら샄餘듣퓧烏뚩솞�잍��뷴뭽汝��γ�� 瓦쇾릉�됮」��맏雅녶쑉�덂뭉�룡쐣訝띶릪歷끾큱瓦뉑빱�ⓩ닑烏뚧쑌鰲꾥똽�뽬쭊�숂쉪�녷뵱�뜸슴�ⓦ�� 瑥�깄鰲� linkgit:gitattributes[5] 訝�쉪 \"�덂뭉�룡쐣訝띶릪汝���/汝��뷴콪�㎫쉪�녷뵱\"��" #. type: Labeled list #: en/merge-strategies.txt:65 @@ -63309,7 +63309,7 @@ msgstr "no-renormalize" #: en/merge-strategies.txt:68 #, priority:240 msgid "Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable." -msgstr "" +msgstr "獵곭뵪 `renormalize` �됮」�� 瓦숃쫮�뽨틙 `merge.renormalize` �띸쉰�섌뇧��" #. type: Labeled list #: en/merge-strategies.txt:69 @@ -63321,31 +63321,31 @@ msgstr "find-renames[=<n>]" #: en/merge-strategies.txt:74 #, priority:240 msgid "Turn on rename detection, optionally setting the similarity threshold. This is the default. This overrides the 'merge.renames' configuration variable. See also linkgit:git-diff[1] `--find-renames`." -msgstr "" +msgstr "凉���뇥�띷�役뗰펽���됪떓溫양쉰�멧세佯�삁�쇈�� 瓦숁삸容섋��꾠�귟퓳誤녺썣雅� 'merge.renames' �띸쉰�섌뇧�� �귟쭅linkgit:git-diff[1] `--find-renames`��" #. type: Labeled list #: en/merge-strategies.txt:75 #, no-wrap, priority:240 msgid "rename-threshold=<n>" -msgstr "" +msgstr "rename-threshold=<n>" #. type: Plain text #: en/merge-strategies.txt:77 #, priority:240 msgid "Deprecated synonym for `find-renames=<n>`." -msgstr "" +msgstr "佯잌펱�꾬펽`find-renames=<n>` �꾢릪阿됭칾��" #. type: Labeled list #: en/merge-strategies.txt:78 #, no-wrap, priority:240 msgid "subtree[=<path>]" -msgstr "" +msgstr "subtree[=<瓮�푶>]" #. type: Plain text #: en/merge-strategies.txt:84 #, priority:240 msgid "This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match." -msgstr "" +msgstr "瓦쇾릉�됮」�� '耶먩젒' 嶺뽫븼�꾣쎍遙섊벨壤℡폀竊뚩�嶺뽫븼野밥륵汝득젒�ⓨ릦亮뜻뿶恙낂』倻귚퐬燁삡퐤餓η쎑雅믣뙶�띹퓵烏뚨뙗役뗣�� �멨룏竊뚧뙁若싩쉪瓮�푶��뎺煐�竊덃닑餓롥�冶뗥돟獵삼펹竊뚥빳鵝요륵汝득젒�꾢숱�띄쎑�백뀓��" #. type: Labeled list #: en/merge-strategies.txt:85 @@ -63357,13 +63357,13 @@ msgstr "recursive" #: en/merge-strategies.txt:98 #, priority:240 msgid "This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames. It does not make use of detected copies. This was the default strategy for resolving two heads from Git v0.99.9k until v2.33.0." -msgstr "" +msgstr "瓦쇿룵�썹뵪訝됪뼶�덂뭉嶸쀦퀡鰲ｅ넶訝ㅴ릉鸚담�� 壤볠쐣訝�訝や빳訝딁쉪�긷릪曄뽩뀍��뵪雅롣툒�밧릦亮뜻뿶竊뚦츆鴉싧닗兩뷰�訝ゅ뀻�뚨쪝�덄쉪�덂뭉�묕펽亮뜸슴�ⓨ츆鵝쒍맏訝됪뼶�덂뭉�꾢뢿�껅젒�� ��뒫�볩펽�싪퓝野툹inux 2.6�끾졇凉��묈럣�꿜릎�꾢츩�끻릦亮뜻룓雅ㅷ쉪役뗨캊竊뚩퓳野쇠눜雅녻푵弱묊쉪�덂뭉�꿰챳竊뚩�뚥툖鴉싧폊壅룬뵗瑥�쉪�덂뭉�� 閭ㅵ쨼竊뚦츆��빳汝�役뗥뭉鸚꾤릤易됧룋�띶뫝�띸쉪�덂뭉�� 若껃뭉訝띴슴�ⓩ�役뗥댆�꾢돬�с�� 餓랦it v0.99.9k�컑2.33.0竊뚩퓳��㎗�녑룎鸚당쉪容섋�嶺뽫븼��" #. type: Plain text #: en/merge-strategies.txt:102 #, priority:240 msgid "The 'recursive' strategy takes the same options as 'ort'. However, there are three additional options that 'ort' ignores (not documented above) that are potentially useful with the 'recursive' strategy:" -msgstr "" +msgstr "'recursive' 嶺뽫븼�뉒뵪訝� 'ort' �멨릪�꾦�됮」�� �띈�뚳펽�됦툒訝� 'ort' 恙썹븼�꾦쥫鸚뽭�됮」竊덁툓�€깹�됭�壤뺧펹竊뚦� 'recursive' 嶺뽫븼�됪퐳�①쉪鵝쒐뵪竊�" #. type: Labeled list #: en/merge-strategies.txt:103 @@ -63375,7 +63375,7 @@ msgstr "patience" #: en/merge-strategies.txt:105 #, priority:240 msgid "Deprecated synonym for `diff-algorithm=patience`." -msgstr "" +msgstr "佯잌펱�꾬펽`diff-algorithm=patience` �꾢릪阿됭칾��" #. type: Labeled list #: en/merge-strategies.txt:106 @@ -63387,7 +63387,7 @@ msgstr "diff-algorithm=[patience|minimal|histogram|myers]" #: en/merge-strategies.txt:113 #, priority:240 msgid "Use a different diff algorithm while merging, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`. Note that `ort` specifically uses `diff-algorithm=histogram`, while `recursive` defaults to the `diff.algorithm` config setting." -msgstr "" +msgstr "�ⓨ릦亮뜻뿶鵝욜뵪訝띶릪�꾢량凉귞츞力뺧펽瓦쇿룾餓ε리�⑶겳�띸뵳雅롣툖�띹쫨�꾢뙶�띹죱竊덃캈倻귚툖�뚦눦�곁쉪鸚㎪떖�뤄펹�뚦룕�잏쉪�숃��덂뭉�� �귟쭅linkgit:git-diff[1] `--diff-algorithm`�� 力ⓩ꼷竊�`ort` �밧츣 `diff-algorithm=histogram`竊뚩��`recursive`容섋�訝�`diff.algorithm`�띸쉰溫양쉰��" #. type: Labeled list #: en/merge-strategies.txt:114 @@ -63399,7 +63399,7 @@ msgstr "no-renames" #: en/merge-strategies.txt:118 #, priority:240 msgid "Turn off rename detection. This overrides the `merge.renames` configuration variable. See also linkgit:git-diff[1] `--no-renames`." -msgstr "" +msgstr "�녜뿭�띶릫汝�役뗣�귟퓳誤녺썣雅� `merge.renames` �꾦뀓營�룜�뤵�� �귟쭅linkgit:git-diff[1] `--no-renames`��" #. type: Labeled list #: en/merge-strategies.txt:119 @@ -63411,7 +63411,7 @@ msgstr "resolve" #: en/merge-strategies.txt:124 #, priority:240 msgid "This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities. It does not handle renames." -msgstr "" +msgstr "瓦쇿룵�썹뵪訝됪뼶�덂뭉嶸쀦퀡鰲ｅ넶訝ㅴ릉鸚댐펷�녑퐪�띶늽��뭽鵝졿땳�η쉪�╊�訝ゅ늽��펹�� 若껇캊�얌퍝瀯녷�役뗧볕與や벡�숂쉪�덂뭉閭㏛퉱�� 若껂툖鸚꾤릤�띶릫��" #. type: Labeled list #: en/merge-strategies.txt:125 @@ -63423,13 +63423,13 @@ msgstr "octopus" #: en/merge-strategies.txt:131 #, priority:240 msgid "This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch." -msgstr "" +msgstr "瓦쇿룾餓θ㎗�녔쐣訝ㅴ릉餓δ툓鸚당쉪�끻넻竊뚥퐜�믥퍦�싧쨳�귞쉪�덂뭉竊뚪�誤곫뎸�②㎗�녈�� 若껂말誤곫삸�ⓧ틢弱녵말窯섇늽��ㅄ�녺퍚�ⓧ�壅룔�� 壤볠땳�ⓩ닑�덂뭉訝�訝や빳訝딁쉪�녷뵱�띰펽瓦숁삸容섋��꾢릦亮띄춺�γ��" #. type: Plain text #: en/merge-strategies.txt:139 #, priority:240 msgid "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the 'recursive' merge strategy." -msgstr "" +msgstr "瓦쇿룾餓θ㎗�념뻣鵝뺞빊�뤹쉪鸚댐펽鵝녶릦亮띄쉪瀯볠옖�삥삸壤볟뎺�녷뵱鸚당쉪�묕펽�됪븞�겼옙�δ틙���됧끀餓뽩늽��쉪�섇뙑�� 若껅삸�ⓩ씎�뽨빰堊㎬씁�녷뵱�꾣뿧凉��묈럣�꿰쉪�� 力ⓩ꼷竊뚩퓳訝� 'recursive' �덂뭉嶺뽫븼��-Xours�됮」訝띶릪��" #. type: Labeled list #: en/merge-strategies.txt:140 @@ -63441,13 +63441,13 @@ msgstr "subtree" #: en/merge-strategies.txt:146 #, priority:240 msgid "This is a modified `ort` strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree." -msgstr "" +msgstr "瓦숁삸訝�訝や엶閭ｇ쉪 `ort` 嶺뽫븼�귛퐪�덂뭉�멇�똁�띰펽倻귝옖B野밧틪雅랟�꾢춴�묕펽B腰뽩뀍熬ヨ컘�답맏訝랟�꾣젒瀯볠엫�멨뙶�랃펽�뚥툖��쑉�뚥�瀛㎩닽瑥삣룚�묆�귟퓳燁띹컘�답튋��뭹野밧뀻�뚨쪝�덃젒瓦쏂죱�꾠��" #. type: Plain text #: en/merge-strategies.txt:153 #, priority:240 msgid "With the strategies that use 3-way merge (including the default, 'ort'), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead." -msgstr "" +msgstr "野밥틢鵝욜뵪訝됪뼶�덂뭉�꾤춺�ο펷�끾떖容섋��� 'ort' 嶺뽫븼竊됵펽倻귝옖�ⓧ륵訝ゅ늽��툓�썲걳雅녵엶�뱄펽鵝녶릮�ε쑉�뜸릎訝�訝ゅ늽��툓熬ユ뮘��竊뚪궍阿덅퓳訝や엶�밧갚鴉싧눣�겼쑉�덂뭉�롧쉪瀯볠옖訝�폑�됦틳雅븃쭑孃쀨퓳燁띹죱訝뷰빱雅뷴쎇�묆�� �븀렟瓦숂쭕�끻넻��썱訝뷴쑉�㎬죱�덂뭉�뜹룵�껇솑鸚닻깿�뚦릦亮뜹읃�곤펽�뚥툖��뜒訝ゆ룓雅ㅳ�� �졿�竊뚦릦亮띄츞力뺠�訝븃˙�℡쨳�꾡엶�방졊�у갚亦→쐣�섇뙑竊뚩�뚧삸�②˙岳�뵻�꾤뎵�ф씎餓ｆ쎘��" #. type: Plain text #: en/mergetools-merge.txt:2 @@ -65248,7 +65248,7 @@ msgstr "--no-rerere-autoupdate" #: en/rerere-options.txt:9 #, priority:240 msgid "After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution. `--no-rerere-autoupdate` is a good way to double-check what `rerere` did and catch potential mismerges, before committing the result to the index with a separate `git add`." -msgstr "" +msgstr "�� rerere �뷴댍�띸뵪壤볟뎺�꿰챳�꾥�壤뺠㎗�먩씎�닸뼭藥δ퐳�묇릎�꾣뻼餓뜹릮竊뚦뀅溫멨츆阿잏뵪鰲ｆ옄�꾤퍜�쒏씎�닸뼭榮℡폊�� `--no-rerere-auto-oupdate`���訝ゅ푽也썹쉪�방퀡竊뚦쑉�ⓨ뜒�х쉪 `git add` �먧벡瀯볠옖�곁뇨凉뺜퉳�랃펽��빳�띶쨳汝��� `rerere` ���싩쉪雅뗦깄竊뚦뭉�볞퐦逆쒎쑉�꾦뵗瑥�릦亮뜰��" #. type: Title - #: en/revisions.txt:2 -- GitLab