From 7e031d208409c4792db6ca2a918f0598d0fcdede 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: Thu, 24 Aug 2023 00:32:26 +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 60.7% (6768 of 11142 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 | 930 ++++++++++++++++----------------- 1 file changed, 465 insertions(+), 465 deletions(-) diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 810b6b6..a8545e6 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-17 10:45+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-24 04:48+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" #. 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 @@ -44281,13 +44281,13 @@ msgstr "��뎺�よ꺗鵝욜뵪 `ort` �덂뭉嶺뽫븼�띷뼭�쎾뻠�덂뭉�먧벡竊쎾룵�� #: en/git-rebase.txt:557 #, priority:100 msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below." -msgstr "" +msgstr "����귡쁾訝뗩씊�꾦뇥營�릦亮뜹뭽訝띶끉若백�됮」��" #. type: Labeled list #: en/git-rebase.txt:558 #, no-wrap, priority:100 msgid "-x <cmd>" -msgstr "" +msgstr "-x <�썰빱>" #. type: Labeled list #: en/git-rebase.txt:559 @@ -44299,13 +44299,13 @@ msgstr "--exec <cmd>" #: en/git-rebase.txt:564 #, priority:100 msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. `<cmd>` will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1." -msgstr "" +msgstr "�ⓩ�瀯덂럣�꿱�壤뺜릎�쎾뻠�먧벡�꾣캀訝�烏뚦릮曆삣뒥 \"exec <�썰빱>\"��`<�썰빱>` 弱녻˙鰲i뇢訝뷰�訝ゆ닑鸚싦릉 shell �썰빱�귚뻣鵝뺝ㅁ兀η쉪�썰빱�썰폏訝�뼪�띸쉰竊뚪���뷰빰�곦맏 1��" #. type: Plain text #: en/git-rebase.txt:567 #, priority:100 msgid "You may execute several commands by either using one instance of `--exec` with several commands:" -msgstr "" +msgstr "�ⓨ룾餓ι�싪퓝鵝욜뵪訝�訝ゅ똿�ュ쩀訝ゅ뫝餓ㅷ쉪 `--exec` 若욂풃�ζ돢烏뚦쩀訝ゅ뫝餓ㅿ폏" #. type: Plain text #: en/git-rebase.txt:569 @@ -44317,7 +44317,7 @@ msgstr "\tgit rebase -i --exec \"cmd1 && cmd2 && ...\"\n" #: en/git-rebase.txt:571 #, priority:100 msgid "or by giving more than one `--exec`:" -msgstr "" +msgstr "�뽫퍢�뷴쩀訝� `--exec`竊�" #. type: Plain text #: en/git-rebase.txt:573 @@ -44329,19 +44329,19 @@ msgstr "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n" #: en/git-rebase.txt:577 #, priority:100 msgid "If `--autosquash` is used, `exec` lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series." -msgstr "" +msgstr "倻귝옖鵝욜뵪雅� `--autosquash`竊뚦닕訝띴폏訝뷰릎�닸룓雅ㅹ셿�� `exec` 烏뚳펽�뚦룵鴉싧눣�겼쑉驪뤶릉 squash/fixup 楹삣닓�꾣쑌弱얇��" #. type: Plain text #: en/git-rebase.txt:580 #, priority:100 msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`." -msgstr "" +msgstr "若껃쑉�낂깿鵝욜뵪 `--interactive` �뷴댍竊뚥퐜阿잌룾餓ε쑉亦→쐣�얍폀 `--interactive` �꾣깄�듕툔瓦먫죱��" #. type: Plain text #: en/git-rebase.txt:587 #, priority:100 msgid "Rebase all commits reachable from `<branch>`, instead of limiting them with an `<upstream>`. This allows you to rebase the root commit(s) on a branch." -msgstr "" +msgstr "�띸쉰餓� `<�녷뵱>` �곁쉪���됪룓雅ㅿ펽�뚥툖��뵪 `<訝딀만�녷뵱>` �ι솏�뜹츆餓с�� 瓦숁졆弱긷룾餓ι뇥若싧릲�녷뵱訝딁쉪�방룓雅ㅳ��" #. type: Plain text #: en/git-rebase.txt:590 en/git-rebase.txt:657 @@ -44359,13 +44359,13 @@ msgstr "--no-autosquash" #: en/git-rebase.txt:603 #, ignore-ellipsis, priority:100 msgid "When the commit log message begins with \"squash! ...\" or \"fixup! ...\" or \"amend! ...\", and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of `rebase -i`, so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` or `fixup` or `fixup -C` respectively. A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/amend/squash commits is by using the `--fixup`, `--fixup=amend:` or `--fixup=reword:` and `--squash` options respectively of linkgit:git-commit[1]." -msgstr "" +msgstr "壤볠룓雅ㅶ뿥恙쀤에��빳 \"squash竊�...\" �� \"fixup竊�...\" �� \"amend竊�......\"竊뚦뭉訝붷푷�욂틟窈밧닓烏ⓧ릎藥꿰퍘�됦�訝や툗�멨릪�� `...` �백뀓�꾣룓雅ㅶ뿶竊뚦갚鴉싪눎�ⓧ엶�� `rebase -i` �꾢푷�욂틟窈밧닓烏⑨펽鵝욘젃溫겻맏�뗦뎮�꾣룓雅ㅷ뇻瓮잌쑉誤곦엶�밭쉪�먧벡阿뗥릮竊뚦뭉弱녺㎉�ⓩ룓雅ㅷ쉪�띴퐳餓� `pick` �녶닽�밥맏 `squash` �� `fixup` �� `fixup -C`�귛쫩�쒏룓雅ㅴ말窯섇뙶�� `...`竊뚧닑�� `...` �뉒쉪��룓雅ㅷ쉪�덂툕�쇽펽�숃��먧벡�백뀓 `...`�귚퐳訝뷴릮鸚뉛펽�먧벡訝삯쥦�꾦깿�녶뙶�띴튋鴉싪돈鵝쒐뵪�귛뻠溫�슴�� linkgit:git-commit[1] �� `--fixup`��`--fixup=amend:` �� `--fixup=reword:`��`--squash` �됮」�ε닗兩� fixup/amend/squash �먧벡��" #. type: Plain text #: en/git-rebase.txt:607 #, priority:100 msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting." -msgstr "" +msgstr "倻귝옖容섋��끻넻訝뗤슴�③뀓營�룜�� `rebase.autoSquash` ��뵪雅� `--autosquash` �됮」竊뚦닕��빳鵝욜뵪閭ㅹ�됮」誤녺썣亮띄쫨�ⓩ�溫양쉰��" #. type: Labeled list #: en/git-rebase.txt:610 en/merge-options.txt:191 @@ -44383,7 +44383,7 @@ msgstr "--no-autostash" #: en/git-rebase.txt:617 #, priority:100 msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts." -msgstr "" +msgstr "�ⓩ뱧鵝쒎�冶뗥뎺�ゅ뒯�쎾뻠訝닸뿶耶섇궓�←쎅竊뚦뭉�ⓩ뱧鵝쒐퍜�잌릮佯붺뵪若껁�� 瓦숁꼷�녕�鵝졾룾餓ε쑉�뤷램鵝쒏젒訝딂퓧烏뚦룜�뷸뱧鵝쒌�� 訝띹퓝竊뚩�瘟ⓩ뀕鵝욜뵪竊싨닇�잓뇥�ⓨ릮�꾣�瀯덂궓�뤷틪�ⓨ룾�썰폏野쇠눜�욃츩兀ⓩ�㎩넳囹곥��" #. type: Labeled list #: en/git-rebase.txt:618 @@ -44401,13 +44401,13 @@ msgstr "--no-reschedule-failed-exec" #: en/git-rebase.txt:622 #, priority:100 msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)." -msgstr "" +msgstr "�ゅ뒯�띷뼭若됪럲�㎬죱鸚김뇰�� `exec` �썰빱�귟퓳�ゆ쐣�ⓧ벡雅믤Æ凉뤶툔竊덃닑�먧풘雅� `--exec` �됮」�띰펹�띷쐣�뤶퉱��" #. type: Plain text #: en/git-rebase.txt:630 #, priority:100 msgid "Even though this option applies once a rebase is started, it's set for the whole rebase at the start based on either the `rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1] or \"CONFIGURATION\" below) or whether this option is provided. Otherwise an explicit `--no-reschedule-failed-exec` at the start would be overridden by the presence of `rebase.rescheduleFailedExec=true` configuration." -msgstr "" +msgstr "弱썹�瑥ι�됮」�ⓨ맦�ⓧ�訝ゅ룜�뷸뱧鵝쒏뿶弱긴폏佯붺뵪竊뚥퐜若껂폏�ⓨ맦�ⓩ뿶�방뜮 `rebase.rescheduleFailedExec` �띸쉰竊덂뢿鰲� linkgit:git-config[1] �뽨툔�®쉪 �쒒뀓營��앾펹�뽪삸��룓堊쎽틙瑥ι�됮」訝뷸빐訝ゅ룜�븀쉪溫양쉰�귛맔�숋펽倻귝옖耶섇쑉 `rebase.rescheduleFailedExec=true` �띸쉰竊뚥�凉�冶뗦삇簾�쉪 `--no-reschedule-failed-exec` 弱긴폏熬ヨ쫮�뽧��" #. type: Plain text #: en/git-rebase.txt:631 en/git-rebase.txt:664 @@ -44425,25 +44425,25 @@ msgstr "--no-update-refs" #: en/git-rebase.txt:636 #, priority:100 msgid "Automatically force-update any branches that point to commits that are being rebased. Any branches that are checked out in a worktree are not updated in this way." -msgstr "" +msgstr "�ゅ뒯凉뷴댍�닸뼭餓삡퐬�뉐릲閭e쑉�띶츣�묊쉪�먧벡�꾢늽���귚뻣鵝뺝쑉藥δ퐳�뷰릎嶺얍눣�꾢늽��꺗訝띴폏餓θ퓳燁띷뼶凉뤸쎍�겹��" #. type: Plain text #: en/git-rebase.txt:639 #, priority:100 msgid "If the configuration variable `rebase.updateRefs` is set, then this option can be used to override and disable this setting." -msgstr "" +msgstr "倻귝옖溫양쉰雅녽뀓營�룜�� `rebase.updateRefs`, �쇿룾鵝욜뵪閭ㅹ�됮」誤녺썣亮띄쫨�ⓩ�溫양쉰��" #. type: Title - #: en/git-rebase.txt:643 #, no-wrap, priority:100 msgid "INCOMPATIBLE OPTIONS" -msgstr "" +msgstr "訝띶끉若백�됮」" #. type: Plain text #: en/git-rebase.txt:646 #, priority:100 msgid "The following options:" -msgstr "" +msgstr "訝뗥닓�됮」竊�" #. type: Plain text #: en/git-rebase.txt:649 @@ -44455,7 +44455,7 @@ msgstr "--whitespace" #: en/git-rebase.txt:652 #, priority:100 msgid "are incompatible with the following options:" -msgstr "" +msgstr "訝롣툔�쀩�됮」訝띶끉若뱄폏" #. type: Plain text #: en/git-rebase.txt:655 @@ -44505,7 +44505,7 @@ msgstr "--root when used in combination with --onto" #: en/git-rebase.txt:667 #, priority:100 msgid "In addition, the following pairs of options are incompatible:" -msgstr "" +msgstr "閭ㅵ쨼竊뚥빳訝뗥뇿野백�됮」��툖�쇔��꾬폏" #. type: Plain text #: en/git-rebase.txt:669 @@ -44530,13 +44530,13 @@ msgstr "--fork-point and --root" #: en/git-rebase.txt:673 #, no-wrap, priority:100 msgid "BEHAVIORAL DIFFERENCES" -msgstr "" +msgstr "烏뚥맏藥�펰" #. type: Plain text #: en/git-rebase.txt:682 #, priority:100 msgid "`git rebase` has two primary backends: 'apply' and 'merge'. (The 'apply' backend used to be known as the 'am' backend, but the name led to confusion as it looks like a verb instead of a noun. Also, the 'merge' backend used to be known as the interactive backend, but it is now used for non-interactive cases as well. Both were renamed based on lower-level functionality that underpinned each.) There are some subtle differences in how these two backends behave:" -msgstr "" +msgstr "`git rebase` �됦륵訝や말誤곭쉪�롥룿竊싢�섇틪�ⓥ�� �� �섇릦亮뜯�숋펷�섇틪�ⓥ�� �롥룿�얕˙燁겻맏 'am' �롥룿竊뚥퐜瓦쇾릉�띶춻�뗨돈�ε깗�②칾�뚪씆�띹칾竊뚦썱閭ㅵ폊壅룝틙曆룡톮竊됥�� 閭ㅵ쨼竊뚢�섇릦亮뜯�� �롥룿�얕˙燁겻맏雅ㅴ틨凉뤷릮�곤펽鵝녺렟�ⓧ튋�ⓧ틢�욂벡雅믣폀�끻넻�� 訝ㅸ�낂꺗��졊��릢�ょ쉪佯뺝콆�잒꺗�띷뼭�썲릫�꾬펹�귟퓳訝ㅴ릉�롥룿�②죱訝뷸뼶凉뤶툓�됦�雅쎾쒜倻숂쉪�뷴닽竊�" #. type: Title ~ #: en/git-rebase.txt:684 @@ -44548,37 +44548,37 @@ msgstr "Empty commits" #: en/git-rebase.txt:690 #, priority:100 msgid "The 'apply' backend unfortunately drops intentionally empty commits, i.e. commits that started empty, though these are rare in practice. It also drops commits that become empty and has no option for controlling this behavior." -msgstr "" +msgstr "訝띶뭏�꾣삸竊뚢�섇틪�ⓥ�� �롥룿鴉싦륭凉껅븙�뤶맏令븀쉪�먧벡竊뚦뜵凉�冶뗦뿶訝븀㈉�꾣룓雅ㅿ펽訝띹퓝瓦숂쭕�끻넻�ⓨ츩瓮듕릎亮뜸툖鸚싪쭅�� 若껇퓲鴉싦륭凉껃룜訝븀㈉�꾣룓雅ㅿ펽�뚥툝亦→쐣�㎩댍瓦숂쭕烏뚥맏�꾦�됮」��" #. type: Plain text #: en/git-rebase.txt:694 #, priority:100 msgid "The 'merge' backend keeps intentionally empty commits by default (though with `-i` they are marked as empty in the todo list editor, or they can be dropped automatically with `--no-keep-empty`)." -msgstr "" +msgstr "容섋��끻넻訝뗰펽�섇릦亮뜯�� �롥룿鴉싦퓷�숁븙�뤶맏令븀쉪�먧벡竊덁툖瓦뉛펽倻귝옖鵝욜뵪 `-i` �됮」竊뚩퓳雅쎿룓雅ㅴ폏�ⓨ푷�욂틟窈밧닓烏①폋渦묈솳訝�젃溫겻맏令븝펽�뽬�끺슴�� `--no-keep-empty` �ゅ뒯�좈솮竊됥��" #. type: Plain text #: en/git-rebase.txt:700 #, priority:100 msgid "Similar to the apply backend, by default the merge backend drops commits that become empty unless `-i`/`--interactive` is specified (in which case it stops and asks the user what to do). The merge backend also has an `--empty={drop,keep,ask}` option for changing the behavior of handling commits that become empty." -msgstr "" +msgstr "訝롥틪�ⓨ릮塋�굳鴉쇽펽�덂뭉�롧ク容섋��끻넻訝뗤튋鴉싦륭凉껃룜訝븀㈉�꾣룓雅ㅿ펽�ㅹ씆�뉐츣雅� `-i` �� `--interactive` �됮」竊덂쑉瓦숂쭕�끻넻訝뗰펽�덂뭉鴉싧걶閭℡뭉瑥�뿮�ⓩ댎瑥ζ�롣퉰�싷펹�� �덂뭉�롧ク瓦섉쐣訝�訝� `--empty={drop,keep,ask}` �됮」竊뚨뵪雅롦뵻�섇쨪�녶룜訝븀㈉�꾣룓雅ㅷ쉪烏뚥맏��" #. type: Title ~ #: en/git-rebase.txt:702 #, no-wrap, priority:100 msgid "Directory rename detection" -msgstr "" +msgstr "��퐬�띶뫝�띷�役�" #. type: Plain text #: en/git-rebase.txt:712 #, priority:100 msgid "Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the 'apply' backend. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory." -msgstr "" +msgstr "�긴틢煐뷰퉷�녺‘�꾤쎅壤뺞젒岳→겘竊덂닶�②‥訝곦릎�꾣쐣�먧에��엫兩뷴걞曄뽩뀍竊됵펽�섇틪�ⓥ�� �롥룿獵곭뵪雅녺쎅壤뺡뇥�썲릫汝�役뗣�� 獵곭뵪��퐬�띶뫝�띷�役뗦꼷�녕�竊뚦쫩�쒎럣�꿱�壤뺟쉪訝��백뇥�썲릫雅녵�訝ょ쎅壤뺧펽�뚦룱訝��밧쑉�㎫쎅壤뺜릎曆삣뒥雅녷뼭�뉏뻑竊뚪궍阿덃뼭�뉏뻑弱긴폏熬ョ븰�ⓩ뿧��퐬訝�펽�뚥툖鴉싧쑉�띷뼭煐뽪럲�뜹룕�뷰뻣鵝뺠��딉펽�먬넂�ⓨ룾�썽�誤곩컛瓦쇾틳�뉏뻑燁삣댆�곁쎅壤뺜릎��" #. type: Plain text #: en/git-rebase.txt:715 #, priority:100 msgid "Directory rename detection works with the 'merge' backend to provide you warnings in such cases." -msgstr "" +msgstr "��퐬�띶뫝�띷�役뗤툗 �섇릦亮뜯�� �롥룿�뤷릪藥δ퐳竊뚦쑉瓦숂쭕�끻넻訝뗤폏�묇퐷�묈눣鈺�몜��" #. type: Title ~ #: en/git-rebase.txt:717 @@ -44591,13 +44591,13 @@ msgstr "--text" #: en/git-rebase.txt:733 #, priority:100 msgid "The 'apply' backend works by creating a sequence of patches (by calling `format-patch` internally), and then applying the patches in sequence (calling `am` internally). Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked. There are real-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported. Setting `diff.context` to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)." -msgstr "" +msgstr "�섇틪�ⓥ�� �롥룿�꾢램鵝쒏뼶凉뤸삸�쎾뻠訝�楹삣닓烏δ툈竊덂쑉�낂깿瘟껆뵪 `format-patch`竊됵펽�뜹릮堊앮А佯붺뵪瓦쇾틳烏δ툈竊덂쑉�낂깿瘟껆뵪 `am`竊됥�� 烏δ툈�긷쩀訝ゅ쓼瀯꾣닇竊뚧캀訝ゅ쓼�끻맜烏뚦뤇�곦툓訝뗦뻼�뷴윜�뚦츩�끾쎍�밤�� 烏뚦뤇�꾥렩�뽩퓚窈삭감�롳펽�졽맏�╊��밧푽��꺗�ⓩ뻼餓뜸릎�믣뀯�뽩닠�ㅴ틙�닸뿩�꾥죱�� 訝듾툔�뉐뙷�잏쉪��쉪��리�⒵돻�겼쫩鵝뺠컘�닺죱�뤄펽餓δ씩弱녷쎍�밧틪�ⓨ댆閭g‘�꾥죱訝듽�� 鵝녷삸竊뚦쫩�쒍빰�곭쉪鸚싦릉�뷴윜�됬쎑�뚨쉪訝듾툔�뉓죱竊뚦갚��꺗�됮뵗�� �①렟若욂툟�뚥릎竊뚩퓳燁띷깄�득쎗野쇠눜�먧벡熬ラ뵗瑥�쑑�띷뼭佯붺뵪竊뚩�뚧깹�됪뒫�듾뻣鵝뺝넳囹곥�� 弱� `diff.context` 溫양쉰訝뷸쎍鸚㎫쉪�쇔룾�썰폏�욕뀓閭ㅷ굳��쥦竊뚥퐜鴉싧쥭�졾룕�잒솞�뉐넳囹곭쉪�좂럤竊덂썱訝븅�誤곫쎍鸚싪죱�백뀓�꾡툓訝뗦뻼�띹꺗佯붺뵪竊됥��" #. type: Plain text #: en/git-rebase.txt:736 #, priority:100 msgid "The 'merge' backend works with a full copy of each relevant file, insulating it from these types of problems." -msgstr "" +msgstr "�섇릦亮뜯�� �롥룿鵝욜뵪驪뤶릉�멨뀽�뉏뻑�꾢츑�닷돬�э펽餓롨�뚪겳�띴틙閭ㅷ굳��쥦��" #. type: Title ~ #: en/git-rebase.txt:738 @@ -44609,13 +44609,13 @@ msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" #: en/git-rebase.txt:750 #, priority:100 msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the 'apply' backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when `merge.conflictStyle` is set to `diff3` or `zdiff3`, the 'apply' backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever." -msgstr "" +msgstr "壤볟눣�겼냵若밧넳囹곫뿶竊뚦릦亮뜻쑛�뜸폏弱앲캊�ⓩ캀訝��밭쉪�꿰챳�뉓�訝딀젃力ⓨ냵若방씎繹먪쉪�먧벡�� �긴틢 �섇틪�ⓥ�� �롥룿訝℡펱雅녶뀽雅롩뇥兩븀쉪�먧벡�듿끀�뜻룓雅ㅷ쉪�잌쭓岳→겘竊덅�뚧삸�방뜮�잍닇�꾥‥訝곦릎�꾣쐣�먧에��뵟�먩뼭�꾢걞�먧벡竊됵펽�졿��졿퀡瑥녶닽瓦쇾틳�먧벡竊뚩�뚦룵�썰슴�ⓩ룓雅ㅶ몮誤곥�� 閭ㅵ쨼竊뚦퐪 `merge.conflictStyle` 溫양쉰訝� `diff3` �� `zdiff3` �띰펽�섇틪�ⓥ�� �롧ク弱녵슴�� \"constructed merge base\"竊덃엫兩븀쉪�덂뭉�븀�竊됪씎�뉑낏�θ눎�덂뭉�븀��꾢냵若뱄펽�졿�訝띴폏�먧풘餓삡퐬�념틢�덂뭉�븀��먧벡�꾡에����" #. type: Plain text #: en/git-rebase.txt:753 #, priority:100 msgid "The 'merge' backend works with the full commits on both sides of history and thus has no such limitations." -msgstr "" +msgstr "�섇릦亮뜯�� �롥룿鵝욜뵪�녶뤁訝듿룎�밭쉪若뚧빐�먧벡竊뚦썱閭ㅶ깹�됭퓳雅쏃솏�뜰��" #. type: Title ~ #: en/git-rebase.txt:755 @@ -44627,61 +44627,61 @@ msgstr "�⒴춴" #: en/git-rebase.txt:769 #, priority:100 msgid "The 'apply' backend has not traditionally called the post-commit hook, while the 'merge' backend has. Both have called the post-checkout hook, though the 'merge' backend has squelched its output. Further, both backends only call the post-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like `git checkout` or `git commit` that would call the hooks). Both backends should have the same behavior, though it is not entirely clear which, if any, is correct. We will likely make rebase stop calling either of these hooks in the future." -msgstr "" +msgstr "鴉좂퍨訝딉펽�섇틪�ⓥ�� �롥룿亮뜸툖瘟껆뵪�먧벡�롳펷post-commit竊됮뮝耶먲펽�� �섇릦亮뜯�� �롥룿�닺컘�ⓧ틙�� �썹꽫 �섇릦亮뜯�� �롥룿藥꿨룚易덁틙�띈풏�븝펽鵝녵륵�낂꺗瘟껆뵪雅녷��뷴릮竊늩ost-checkout竊됮뮝耶먦�� 閭ㅵ쨼竊뚩퓳訝ㅴ릉�롧ク�썲룵瘟껆뵪雅녶룜�뷸뱧鵝쒐쉪壅루궧�먧벡竊뚩�뚥툖��릎�닸룓雅ㅶ닑��瀯덃룓雅ㅷ쉪汝��뷴릮竊늩ost-checkout竊됮뮝耶먦�� �ⓩ캀燁띷깄�듕툔竊뚩컘�②퓳雅쏃뮝耶먬꺗��겤�띄쉪竊뚩�뚥툖���溫▼눣�η쉪竊덁륵訝ゅ릮�경��앶꺗��빳 shell �싨쑍�꾢숱凉뤷츩�곁쉪竊뚨ː藥㎬컘�ⓧ틙�뜸퍟鴉싪컘�③뮝耶먪쉪�썰빱竊뚦쫩 `git checkout` �� `git commit`竊됥�� 瓦쇾륵訝ゅ릮�겼틪瑥ε끁�됬쎑�뚨쉪烏뚥맏竊뚥퐜��뎺瓦섆툖若뚦뀲歷끾쪡�や�訝ゆ뎺���簾�쉪�� �묇뺄弱녷씎��꺗鴉싪��섇읃�띴퐳�쒏�瘟껆뵪瓦쇾틳�⒴춴��" #. type: Title ~ #: en/git-rebase.txt:771 #, no-wrap, priority:100 msgid "Interruptability" -msgstr "" +msgstr "��릎����" #. type: Plain text #: en/git-rebase.txt:780 #, priority:100 msgid "The 'apply' backend has safety problems with an ill-timed interrupt; if the user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent `git rebase --abort`. The 'merge' backend does not appear to suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)" -msgstr "" +msgstr "倻귝옖�ⓩ댎�③뵗瑥�쉪�띌뿴�됦툔 Ctrl-C 瑥뺝쎗瀯덃��띸쉰竊뚪뇥營�갚鴉싪퓵�ζ뿞力뺡�싪퓝�롧뺌�� `git rebase --abort` 瀯덃��꾤듁�곥�� �섇릦亮뜯�� �롥룿鴉쇌퉶訝띶춼�ⓨ릪�루쉪煐븅쇃�� (瑥�쭅 https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/竊�" #. type: Title ~ #: en/git-rebase.txt:782 #, no-wrap, priority:100 msgid "Commit Rewording" -msgstr "" +msgstr "�띶넍�먧벡" #. type: Plain text #: en/git-rebase.txt:790 #, priority:100 msgid "When a conflict occurs while rebasing, rebase stops and asks the user to resolve. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run `git rebase --continue`, the rebase should open an editor and ask the user to update the commit message. The 'merge' backend does this, while the 'apply' backend blindly applies the original commit message." -msgstr "" +msgstr "壤볣뇥兩븃퓝葉뗤릎�묊뵟�꿰챳�띰펽�섇읃�띴퐳�쒏�亮띈쫨黎귞뵪�룩㎗�녈�� �긴틢�ⓩ댎��꺗��誤곩쑉鰲e넶�꿰챳�꾢릪�뜹걳訝�雅쎿샑�쀧쉪�밧뒯竊뚦썱閭ㅵ쑉�꿰챳鰲e넶訝붺뵪�룩퓧烏뚥틙 `git rebase --continue` 阿뗥릮竊뚦룜�뷸뿶佯붹돀凉�訝�訝ょ폋渦묈솳亮띈쫨黎귞뵪�룡쎍�경룓雅ㅴ에���� �섇릦亮뜯�� �롥룿鴉싪퓳�룟걳竊뚩�� �섇틪�ⓥ�� �롥룿�쇾폏�꿰쎅佯붺뵪�잌쭓�꾣룓雅ㅴ에����" #. type: Title ~ #: en/git-rebase.txt:792 #, no-wrap, priority:100 msgid "Miscellaneous differences" -msgstr "" +msgstr "�뜸퍟藥�펰" #. type: Plain text #: en/git-rebase.txt:797 #, priority:100 msgid "There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness:" -msgstr "" +msgstr "瓦섉쐣訝�雅쏂죱訝뷰툓�꾢량凉귨펽鸚㎩쩀�겻볶��꺗鴉싪�訝뷸뿞�녕뇻誤곻펽鵝녵맏雅녶츑�닺돈鰲곻펽瓦섉삸誤곫룓訝�訝뗰폏" #. type: Plain text #: en/git-rebase.txt:801 #, priority:100 msgid "Reflog: The two backends will use different wording when describing the changes made in the reflog, though both will make use of the word \"rebase\"." -msgstr "" +msgstr "凉뺟뵪�ε퓱竊� 訝ㅴ릉�롥룿�ⓩ룒瓦겼폊�ⓩ뿥恙쀤릎�꾣쎍�방뿶鴉싦슴�ⓧ툖�뚨쉪�よ풛竊뚥퐜�썰폏鵝욜뵪 �쒎룜�븝펷rebase竊됤�� 訝�瑥띲��" #. type: Plain text #: en/git-rebase.txt:807 #, ignore-ellipsis, priority:100 msgid "Progress, informational, and error messages: The two backends provide slightly different progress and informational messages. Also, the apply backend writes error messages (such as \"Your files would be overwritten...\") to stdout, while the merge backend writes them to stderr." -msgstr "" +msgstr "瓦쎾벧�곦에��뭽�숃�岳→겘竊� 訝ㅴ릉�롧ク�먧풘�꾥퓵佯�뭽岳→겘�ζ쐣訝띶릪�� 閭ㅵ쨼竊뚦틪�ⓨ릮塋�폏弱녽뵗瑥�에��펷倻� �쒏궓�꾣뻼餓뜹컛熬ヨ쫮��......�앾펹�쇿뀯�뉐뇛渦볟눣役곻펽�뚦릦亮뜹릮�겼닕�쇿뀯�뉐뇛�숃�役곥��" #. type: Plain text #: en/git-rebase.txt:810 #, priority:100 msgid "State directories: The two backends keep their state in different directories under `.git/`" -msgstr "" +msgstr "�뜻�곭쎅壤뺧폏訝ㅴ릉�롥룿弱녺듁�곦퓷耶섇쑉訝띶릪�꾤쎅壤뺜릎竊뚦늽�ヤ퐤雅�`.git/`訝�" #. type: Plain text #: en/git-rebase.txt:819 @@ -44694,43 +44694,43 @@ msgstr "倻귝옖鵝졽엶�밥틙訝�訝ゅ럴瀯뤷룕躍껆쉪�먧벡竊뚥퐷佯붻��롧쇋�띶넍�� #: en/git-rebase.txt:824 #, priority:100 msgid "When the rebase is run, it will first execute a `pre-rebase` hook if one exists. You can use this hook to do sanity checks and reject the rebase if it isn't appropriate. Please see the template `pre-rebase` hook script for an example." -msgstr "" +msgstr "�②퓧烏뚦룜�뷴뫝餓ㅶ뿶竊뚦쫩�쒎춼�� `pre-rebase` 竊덂룜�뷴뎺竊됮뮝耶먲펽若껂폏腰뽩뀍�㎬죱瑥ι뮝耶먦�� �ⓨ룾餓δ슴�ⓩ��⒴춴瓦쏂죱閭g‘�㎪��ο펽亮뜹쑉訝띶릦�귝뿶�믥퍦�띸쉰�� �됧뀽鹽뷰풃竊뚩��귡쁾與→씮 `pre-rebase`竊덂룜�뷴뎺竊� �⒴춴�싨쑍��" #. type: Plain text #: en/git-rebase.txt:826 #, priority:100 msgid "Upon completion, `<branch>` will be the current branch." -msgstr "" +msgstr "若뚧닇�롳펽`<�녷뵱>` 弱녷닇訝뷴퐪�띶늽����" #. type: Plain text #: en/git-rebase.txt:833 #, priority:100 msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)." -msgstr "" +msgstr "雅ㅴ틨凉뤻뇥若싧릲�뤷뫑��鵝졿쐣�뷰폏煐뽬풌熬ラ뇥若싧릲�꾣룓雅ㅳ�� 鵝졾룾餓ι뇥�경럲�쀦룓雅ㅷ쉪窈뷴틣竊뚥튋��빳�좈솮若껂뺄竊덂돁�ㅵ쓯�꾣닑訝띺�誤곭쉪烏δ툈竊됥��" #. type: Plain text #: en/git-rebase.txt:835 #, priority:100 msgid "The interactive mode is meant for this type of workflow:" -msgstr "" +msgstr "雅믣뒯與▼폀弱길삸訝븃퓳燁띶램鵝쒏탛葉뗨�溫←쉪竊�" #. type: Plain text #: en/git-rebase.txt:837 #, priority:100 msgid "have a wonderful idea" -msgstr "" +msgstr "�득쑛訝���" #. type: Plain text #: en/git-rebase.txt:838 #, priority:100 msgid "hack on the code" -msgstr "" +msgstr "�꿜빰��" #. type: Plain text #: en/git-rebase.txt:839 #, priority:100 msgid "prepare a series for submission" -msgstr "" +msgstr "煐뽩넍�먧벡楹삣닓" #. type: Plain text #: en/git-rebase.txt:840 @@ -44742,19 +44742,19 @@ msgstr "�먧벡" #: en/git-rebase.txt:842 #, priority:100 msgid "where point 2. consists of several instances of" -msgstr "" +msgstr "�뜸릎寧� 2 �밭뵳餓δ툔�졽릉若욂풃瀯꾣닇" #. type: Plain text #: en/git-rebase.txt:844 #, priority:100 msgid "regular use" -msgstr "" +msgstr "躍멱쭊鵝욜뵪" #. type: Plain text #: en/git-rebase.txt:846 #, priority:100 msgid "finish something worthy of a commit" -msgstr "" +msgstr "若뚧닇�쇔풓�먧벡�꾡틟��" #. type: Labeled list #: en/git-rebase.txt:847 en/git-update-ref.txt:136 @@ -44766,13 +44766,13 @@ msgstr "�먧벡" #: en/git-rebase.txt:849 #, priority:100 msgid "independent fixup" -msgstr "" +msgstr "�х쳦岳�쨳" #. type: Plain text #: en/git-rebase.txt:851 #, priority:100 msgid "realize that something does not work" -msgstr "" +msgstr "�묊렟�됦�阿덁툥蜈욘깹�됬뵪" #. type: Plain text #: en/git-rebase.txt:852 @@ -44784,19 +44784,19 @@ msgstr "fix that" #: en/git-rebase.txt:853 #, priority:100 msgid "commit it" -msgstr "" +msgstr "�먧벡" #. type: Plain text #: en/git-rebase.txt:859 #, priority:100 msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series. That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one." -msgstr "" +msgstr "�됪뿶竊똟.2.訝�엶閭g쉪�끻��졿퀡岳���겼츆��岳���꾢뭉訝띶츑獰롧쉪�먧벡訝�펽�졽맏瑥ζ룓雅ㅶ런�뗥쑉訝�楹삣닓烏δ툈訝��� 瓦숁���벡雅믣폀�섇읃�꾤뵪�뷂폏�ⓨㄷ�뤹쉪 \"a\" �� \"b\" 阿뗥릮鵝욜뵪若껓펽�띷뼭�믣닓�뚨폋渦묉룓雅ㅿ펽弱녶쩀訝ゆ룓雅ㅵ릦亮뜸맏訝�訝ゆ룓雅ㅳ��" #. type: Plain text #: en/git-rebase.txt:861 #, priority:100 msgid "Start it with the last commit you want to retain as-is:" -msgstr "" +msgstr "餓롦궓躍뚧쐹岳앯븰�잍졆�꾣��롣�轝→룓雅ㅵ�冶뗰폏" #. type: Plain text #: en/git-rebase.txt:863 @@ -44808,7 +44808,7 @@ msgstr "\tgit rebase -i <after-this-commit>\n" #: en/git-rebase.txt:868 #, priority:100 msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can reorder the commits in this list to your heart's content, and you can remove them. The list looks more or less like this:" -msgstr "" +msgstr "煐뽬풌�ⓧ폏凉밧눣壤볟뎺�녷뵱�꾣��됪룓雅ㅿ펷恙썹븼�덂뭉�먧벡竊됵펽瓦쇾틳�먧벡�썲쑉瀯쇿츣�먧벡阿뗥릮�� 鵝졾룾餓ι쉹恙껅�轝꿨쑑瘟껅빐�쀨〃訝�룓雅ㅷ쉪窈뷴틣竊뚥튋��빳�좈솮若껂뺄�� �쀨〃鸚㎬눜倻귚툔竊�" #. type: delimited block - #: en/git-rebase.txt:873 @@ -44817,55 +44817,55 @@ msgid "" "pick deadbee The oneline of this commit\n" "pick fa1afe1 The oneline of the next commit\n" "...\n" -msgstr "" +msgstr "�됪떓 deadbee 竊뚧쑍轝→룓雅ㅷ쉪訝딁봇\n�됦릎 fa1afe1 竊뚥툔訝�轝→룓雅ㅷ쉪訝딁봇\n...\n" #. type: Plain text #: en/git-rebase.txt:878 #, priority:100 msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names." -msgstr "" +msgstr "訝딁봇�뤺염瀛�껸��맏雅녷뼶堊욘궓�η쐦竊�'git rebase' 訝띴폏�η쐦瓦쇾틳�뤺염竊뚦룵鴉싨윥�뗦룓雅ㅵ릫燁곤펷�т풃訝�맏 \"deadbee\" �� \"fa1afe1\"竊됵펽�졿�瑥룟떯�좈솮�뽫폋渦묋퓳雅쎾릫燁겹��" #. type: Plain text #: en/git-rebase.txt:883 #, priority:100 msgid "By replacing the command \"pick\" with the command \"edit\", you can tell `git rebase` to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing." -msgstr "" +msgstr "�� \"edit\" �썰빱�욘뜟 \"pick\" �썰빱�롳펽鵝졾룾餓ε몜瑥� `git rebase` �ⓨ틪�②��먧벡�롥걶閭�펽瓦숁졆鵝졾갚��빳煐뽬풌�뉏뻑��/�뽪룓雅ㅴ에��펽岳�뵻�먧벡竊뚨꽫�롧빵瀯�뇥營���" #. type: Plain text #: en/git-rebase.txt:886 #, priority:100 msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command." -msgstr "" +msgstr "誤곦릎��뇥營�펷弱긷깗 \"edit\" �썰빱訝��뤄펽鵝녵툖鴉싧뀍�됪떓餓삡퐬�먧벡竊됵펽瑥룝슴�� \"break \"�썰빱��" #. type: Plain text #: en/git-rebase.txt:889 #, priority:100 msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"." -msgstr "" +msgstr "倻귝옖�ゆ꺍煐뽬풌�먧벡岳→겘竊뚩��� \"reword\" �썰빱�욘뜟 \"pick\" �썰빱��" #. type: Plain text #: en/git-rebase.txt:892 #, priority:100 msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line." -msgstr "" +msgstr "誤곫붂凉껅룓雅ㅿ펽瑥루뵪 \"drop\" �욘뜟 \"pick\" �썰빱竊뚧닑�닸렏�좈솮�백뀓�꾥죱��" #. type: Plain text #: en/git-rebase.txt:907 #, priority:100 msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the first commit's message with those identified by \"squash\" commands, omitting the messages of commits identified by \"fixup\" commands, unless \"fixup -c\" is used. In that case the suggested commit message is only the message of the \"fixup -c\" commit, and an editor is opened allowing you to edit the message. The contents (patch) of the \"fixup -c\" commit are still incorporated into the folded commit. If there is more than one \"fixup -c\" commit, the message from the final one is used. You can also use \"fixup -C\" to get the same behavior as \"fixup -c\" except without opening an editor." -msgstr "" +msgstr "倻귝옖誤곩컛訝ㅴ릉�뽪쎍鸚싨룓雅ㅶ뒛�졽맏訝�訝ゆ룓雅ㅿ펽瑥루뵪 \"squash\" �� \"fixup\" 餓f쎘�썰빱 \"pick\" �ε쨪�녺К雅뚥릉�듿릮瀯�룓雅ㅳ�� 倻귝옖�먧벡�꾡퐳�끺툖�뚳펽�섇룧�롧쉪�먧벡弱녶퐩掠욂틢寧т�訝ゆ룓雅ㅷ쉪鵝쒑�끹�� �ㅹ씆鵝욜뵪雅� \"fixup -c\" �썰빱竊뚦맔�숁뒛�졿룓雅ㅷ쉪兩븃��먧벡岳→겘��К訝�訝ゆ룓雅ㅴ에��툗 \"squash\" �썰빱簾�츣�꾣룓雅ㅴ에��쉪�덂뭉竊뚨쐛�δ틙 \"fixup\" �썰빱簾�츣�꾣룓雅ㅴ에���� �②퓳燁띷깄�듕툔竊뚦뻠溫�쉪�먧벡岳→겘�ゆ삸 \"fixup -c\" �먧벡�꾡에��펽�뚥툝鴉싨돀凉�訝�訝ょ폋渦묈솳�곮�鵝좂폋渦묇에���� \"fixup -c\" �먧벡�꾢냵若뱄펷烏δ툈竊됦퍖�뜹똿�ュ쑉�섇룧�먧벡訝��귛쫩�쒏쐣鸚싦릉 \"fixup -c\" �먧벡竊뚦닕鵝욜뵪���롣�訝ゆ룓雅ㅷ쉪岳→겘�� �ⓧ튋��빳鵝욜뵪 \"fixup -C\" �룟풓訝� \"fixup -c\" �멨릪�꾣븞�쒙펽鵝녵툖��誤곫돀凉�煐뽬풌�ⓦ��" #. type: Plain text #: en/git-rebase.txt:911 #, priority:100 msgid "`git rebase` will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`." -msgstr "" +msgstr "壤� \"pick\" �썰빱熬ユ쎘�㏘맏 \"煐뽬풌\" �썰빱�뽩뫝餓ㅵ썱�덂뭉�숃��뚦ㅁ兀ζ뿶竊�`git rebase` 弱녶걶閭㏂�귛츑�먪폋渦묈뭽/�뽬㎗�녑넳囹곩릮竊뚦룾餓δ슴�� `git rebase --continue` 瀯㎫뺌��" #. type: Plain text #: en/git-rebase.txt:915 #, priority:100 msgid "For example, if you want to reorder the last 5 commits, such that what was `HEAD~4` becomes the new `HEAD`. To achieve that, you would call `git rebase` like this:" -msgstr "" +msgstr "堊뗥쫩竊뚦쫩�쒏궓�녜뇥�경럲�쀦�瓦� 5 轝→룓雅ㅷ쉪窈뷴틣竊뚩��잍씎�� `HEAD~4` �섉닇�곁쉪 `HEAD`�귟쫨�싧댆瓦쇾��뱄펽��빳瓦숁졆瘟껆뵪 `git rebase`竊�" #. type: delimited block - #: en/git-rebase.txt:918 @@ -44877,13 +44877,13 @@ msgstr "$ git rebase -i HEAD~5\n" #: en/git-rebase.txt:921 #, priority:100 msgid "And move the first patch to the end of the list." -msgstr "" +msgstr "亮뜹컛寧т�訝よ‥訝곭㎉�겼닓烏ⓩ쑌弱얇��" #. type: Plain text #: en/git-rebase.txt:924 #, priority:100 msgid "You might want to recreate merge commits, e.g. if you have a history like this:" -msgstr "" +msgstr "堊뗥쫩竊뚦쫩�쒏궓�됭퓳�루쉪�녶뤁溫겼퐬竊뚧궓��꺗��誤곲뇥�겼닗兩뷴릦亮뜻룓雅ㅿ폏" #. type: delimited block - #: en/git-rebase.txt:931 @@ -44905,7 +44905,7 @@ msgstr "" #: en/git-rebase.txt:935 #, priority:100 msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current `HEAD` is \"B\", and call" -msgstr "" +msgstr "�뉓�誤곩컛餓� \"A\" 凉�冶뗧쉪堊㎩늽��뇥營�맏 \"Q\"�귞‘岳앭퐪�띸쉪 `HEAD` �� \"B\"竊뚨꽫�롨컘��" #. type: delimited block - #: en/git-rebase.txt:938 @@ -44917,7 +44917,7 @@ msgstr "$ git rebase -i -r --onto Q O\n" #: en/git-rebase.txt:945 #, priority:100 msgid "Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\"). You may do so by creating a todo list like this one:" -msgstr "" +msgstr "�띷뼭�믣틣�뚨폋渦묉룓雅ㅹ�싧만鴉싦벨�잍쑋瀯뤸탩瑥뺟쉪訝�뿴閭ιい�� �ⓨ룾�썸꺍�싪퓝瓦먫죱役뗨캊�ζ��ζ궓�꾢럣�꿰폋渦묉삸��졃�뤶틙餓삡퐬訝쒑�竊뚧닑�낁눛弱묇슴�� \"exec\" �썰빱竊덂엮�룬뵰 \"x\"竊됧쑉�녶뤁�꾡릎�당궧�띷뼭煐뽬캂�� 訝뷸�竊뚧궓��빳�쎾뻠映삡세瓦숁졆�꾢푷�욂틟窈밧닓烏⑨폏" #. type: delimited block - #: en/git-rebase.txt:954 @@ -44930,19 +44930,19 @@ msgid "" "edit deadbab The oneline of the commit after\n" "exec cd subdir; make test\n" "...\n" -msgstr "" +msgstr "�됪떓 deadbee �㎬죱�잒꺗 XXX\n岳�쨳 f1a5c00 岳�쨳�잒꺗 XXX\n�㎬죱 make\n�됧룚 c0ffeee 訝뗤�轝→룓雅ㅷ쉪訝딁봇\n煐뽬풌 deadbab 阿뗥릮�먧벡�꾡툓瀛�\nexec cd subdir; make test\n...\n" #. type: Plain text #: en/git-rebase.txt:959 #, priority:100 msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`." -msgstr "" +msgstr "壤볟뫝餓ㅵㅁ兀ο펷�념빳�� 0 �뜻�곲���븝펹�띰펽雅ㅴ틨凉뤷룜�뷸뱧鵝쒎갚鴉싧걶閭�펽餓δ씩�ⓩ쐣�뷰폏鰲e넶��쥦�귝궓��빳鵝욜뵪 `git rebase --continue` 瀯㎫뺌��" #. type: Plain text #: en/git-rebase.txt:964 #, ignore-ellipsis, priority:100 msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree." -msgstr "" +msgstr "\"exec\" �썰빱�� shell竊덂쑉 `$SHELL` 訝�뙁若싩쉪 shell竊뚦쫩�쒏쑋溫양쉰 `$SHELL`竊뚦닕鵝욜뵪容섋� shell竊됦릎�㎬죱�썰빱竊뚦썱閭ㅵ룾餓δ슴�� shell �잒꺗竊덂쫩 \"cd\"��\">\"��\";\"......竊됥�귛뫝餓ㅴ퍗藥δ퐳�븀쉪�밭쎅壤뺠퓧烏뚣��" #. type: delimited block - #: en/git-rebase.txt:967 @@ -44954,7 +44954,7 @@ msgstr "$ git rebase -i --exec \"make test\"\n" #: en/git-rebase.txt:971 #, priority:100 msgid "This command lets you check that intermediate commits are compilable. The todo list becomes like that:" -msgstr "" +msgstr "瑥ε뫝餓ㅷ뵪雅롦��δ릎�닸룓雅ㅶ삸��룾煐뽬캂�� 孃끻뒢雅뗩」�쀨〃弱긴폏�섉닇瓦숁졆竊�" #. type: delimited block - #: en/git-rebase.txt:981 @@ -44968,85 +44968,85 @@ msgid "" "exec make test\n" "pick f4593f9 four\n" "exec make test\n" -msgstr "" +msgstr "�됪떓 5928aea one\nexec make test\n�� 04d0fda 雅�\nexec make test\n�됪떓 ba46169 訝�\n�㎬죱�뜸퐳役뗨캊\n�됪떓 f4593F9 ��\nexec make test\n" #. type: Title - #: en/git-rebase.txt:984 #, no-wrap, priority:100 msgid "SPLITTING COMMITS" -msgstr "" +msgstr "�녶늽�먧벡" #. type: Plain text #: en/git-rebase.txt:990 #, priority:100 msgid "In interactive mode, you can mark commits with the action \"edit\". However, this does not necessarily mean that `git rebase` expects the result of this edit to be exactly one commit. Indeed, you can undo the commit, or you can add other commits. This can be used to split a commit into two:" -msgstr "" +msgstr "�ⓧ벡雅믤Æ凉뤶툔竊뚦룾餓η뵪 \"edit\"竊덄폋渦묕펹�ζ젃溫경룓雅ㅳ�� 訝띹퓝竊뚩퓳亮뜸툖訝�若싨꼷�녕� `git rebase` 躍뚧쐹煐뽬풌�꾤퍜�쒏삸訝�訝ゆ룓雅ㅳ�� 雅뗥츩訝딉펽鵝졾룾餓ζ뮘���먧벡竊뚥튋��빳曆삣뒥�뜸퍟�먧벡�� 瓦쇿룾餓η뵪�ε컛訝�訝ゆ룓雅ㅴ��녵맏雅뚳폏" #. type: Plain text #: en/git-rebase.txt:994 #, priority:100 msgid "Start an interactive rebase with `git rebase -i <commit>^`, where `<commit>` is the commit you want to split. In fact, any commit range will do, as long as it contains that commit." -msgstr "" +msgstr "鵝욜뵪 `git rebase -i <�먧벡>^` 凉�冶뗤벡雅믣폀�섇읃竊뚦끀訝� `<�먧벡>`��쫨�녶돯�꾣룓雅ㅳ�� 雅뗥츩訝딉펽�よ쫨�끻맜瑥ζ룓雅ㅿ펽餓삡퐬�먧벡�껃쎍�썲룾餓γ��" #. type: Plain text #: en/git-rebase.txt:996 #, priority:100 msgid "Mark the commit you want to split with the action \"edit\"." -msgstr "" +msgstr "�� \"edit\" �띴퐳�뉓�誤곩늽�꿰쉪�먧벡��" #. type: Plain text #: en/git-rebase.txt:1000 #, priority:100 msgid "When it comes to editing that commit, execute `git reset HEAD^`. The effect is that the `HEAD` is rewound by one, and the index follows suit. However, the working tree stays the same." -msgstr "" +msgstr "�①폋渦묋��먧벡�띰펽�㎬죱 `git reset HEAD^`�� �뜻븞�쒏삸弱� `HEAD` �띸퍞訝��덌펽榮℡폊阿잒퇎���띸퍞訝��덀�� 鵝녶램鵝쒎뙷岳앮똻訝띶룜��" #. type: Plain text #: en/git-rebase.txt:1004 #, priority:100 msgid "Now add the changes to the index that you want to have in the first commit. You can use `git add` (possibly interactively) or `git gui` (or both) to do that." -msgstr "" +msgstr "�겼쑉竊뚦컛�ⓨ툕�쎾쑉寧т�轝→룓雅ㅴ릎�꾣뵻�ⓩ렌�졾댆榮℡폊訝��� 鵝졾룾餓δ슴�� `git add` 竊덂룾�썸삸雅ㅴ틨凉뤹쉪竊됪닑 `git gui` 竊덃닑訝ㅸ�낉펹�ε츑�먦��" #. type: Plain text #: en/git-rebase.txt:1007 #, priority:100 msgid "Commit the now-current index with whatever commit message is appropriate now." -msgstr "" +msgstr "餓δ뻣鵝뺝릦�귞쉪�먧벡岳→겘�먧벡壤볟뎺榮℡폊��" #. type: Plain text #: en/git-rebase.txt:1009 #, priority:100 msgid "Repeat the last two steps until your working tree is clean." -msgstr "" +msgstr "�띶쨳���롣륵訝ゆ�謠ㅿ펽�닷댆藥δ퐳�뷴묾��訝뷸���" #. type: Plain text #: en/git-rebase.txt:1011 #, priority:100 msgid "Continue the rebase with `git rebase --continue`." -msgstr "" +msgstr "鵝욜뵪 `git rebase --continue` 瀯㎫뺌�섇읃��" #. type: Plain text #: en/git-rebase.txt:1016 #, priority:100 msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use `git stash` to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary." -msgstr "" +msgstr "倻귝옖訝띹꺗瀯앭�簾�츣訝�뿴岳������당쉪竊덄폋瑥묆�곲�싪퓝 testsuite 嶺됵펹竊뚦닕佯붶슴�� `git stash` �ⓩ캀轝→룓雅ㅳ�곫탩瑥뺜퉳�롳펽弱녶컶�ゆ룓雅ㅷ쉪�밧뒯岳앭춼壅룡씎竊뚦뭉�ⓨ퓚誤곫뿶岳�뵻�먧벡��" #. type: Title - #: en/git-rebase.txt:1019 #, no-wrap, priority:100 msgid "RECOVERING FROM UPSTREAM REBASE" -msgstr "" +msgstr "餓롣툓�됦퍜佯볟룜�뷰릎�℡쨳" #. type: Plain text #: en/git-rebase.txt:1026 #, priority:100 msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history. This section explains how to do the fix from the downstream's point of view. The real fix, however, would be to avoid rebasing the upstream in the first place." -msgstr "" +msgstr "�섇읃竊덃닑餓δ뻣鵝뺝끀餓뽩숱凉뤸뵻�숋펹餓뽨볶�뷰틢�뜹램鵝쒐쉪�녷뵱��릉�뤶말�륅폏�뜸툔歷며쉪餓삡퐬雅븅꺗訝띶풓訝띷뎸�ⓧ엶閭h눎藥긺쉪�녶뤁�� �ц뒄弱녵퍗訝뗦만�꾥쭜佯�㎗�듿쫩鵝뺠퓵烏뚥엶鸚띲�� 訝띹퓝竊뚨쐿閭g쉪岳�쨳�방퀡��쫿�덆겳�띺뇥營�툓歷멨늽����" #. type: Plain text #: en/git-rebase.txt:1031 #, priority:100 msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'. You might end up with a history like the following:" -msgstr "" +msgstr "訝얌풃瑥닸삇竊뚦걞溫얏쐣雅뷴��묇틙訝�訝� �섇춴楹사퍨�� �녷뵱竊뚩�뚥퐷閭e쑉凉��묇�訝や풚壅뽨틢瑥� �섇춴楹사퍨�� �� �섆말窯섃�쇻�� 鵝졾룾�썰폏�됧쫩訝뗧쉪�녶뤁溫겼퐬竊�" #. type: delimited block - #: en/git-rebase.txt:1038 @@ -45068,7 +45068,7 @@ msgstr "" #: en/git-rebase.txt:1041 #, priority:100 msgid "If 'subsystem' is rebased against 'master', the following happens:" -msgstr "" +msgstr "倻귝옖 �섇춴楹사퍨�� �덂� 'master' 瓦쏂죱�띶츣�묕펽鴉싧눣�겻빳訝뗦깄�듸폏" #. type: delimited block - #: en/git-rebase.txt:1048 @@ -45090,7 +45090,7 @@ msgstr "" #: en/git-rebase.txt:1052 #, priority:100 msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:" -msgstr "" +msgstr "倻귝옖�겼쑉�뤷�躍멧��루빵瀯���묕펽亮뜻�瀯덂컛 �섆말窯섃�� �덂뭉�� �섇춴楹사퍨�숋펽�d퉰 �섇춴楹사퍨�� 訝�쉪�먧벡弱녷갭瓦쒒뇥鸚랃폏" #. type: delimited block - #: en/git-rebase.txt:1059 @@ -45112,55 +45112,55 @@ msgstr "" #: en/git-rebase.txt:1066 #, priority:100 msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow. To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'. This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!" -msgstr "" +msgstr "瓦숂쭕�띶쨳�싧만��툖�쀦Б瓦롧쉪竊뚦썱訝뷴츆餓т폏鵝욕럣�꿱�壤뺝룜孃쀦쓡阿길뿞塋좑펽�얌빳瓮잒릉�� 誤곫툍�녻퓳雅쏃뇥鸚띷룓雅ㅿ펽弱깁�誤곩컛 �섆말窯섃�� 訝딁쉪�먧벡燁삥쨳�경뼭�� �섇춴楹사퍨�� tip 訝딉펽�녜뇥營� �섆말窯섃�쇻�� 瓦쇿갚鴉싦벨�잒퓹�곩룏佯뷂폏�섆말窯섃�� �꾡뻣鵝뺜툔歷멩룓雅ㅹ꺗鴉싪˙瓦ラ뇥營�펽堊앮�映삥렓竊�" #. type: Plain text #: en/git-rebase.txt:1068 #, priority:100 msgid "There are two kinds of fixes, discussed in the following subsections:" -msgstr "" +msgstr "�됦륵燁띴엶鸚띷뼶力뺧펽弱녶쑉訝뗩씊�꾢컦�귚릎溫②�竊�" #. type: Labeled list #: en/git-rebase.txt:1069 #, no-wrap, priority:100 msgid "Easy case: The changes are literally the same." -msgstr "" +msgstr "嶸��뺟쉪堊뗥춴竊� �섇뙑若뚦뀲�멨릪��" #. type: Plain text #: en/git-rebase.txt:1073 #, priority:100 msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts." -msgstr "" +msgstr "倻귝옖 �섇춴楹사퍨�� �섇읃����뺟쉪�띸쉰竊뚧깹�됧넳囹곻펽弱긴폏�븀렟瓦숂쭕�끻넻��" #. type: Labeled list #: en/git-rebase.txt:1074 #, no-wrap, priority:100 msgid "Hard case: The changes are not the same." -msgstr "" +msgstr "渦껈슻�꾡풃耶먲폏 �섇뙑訝띴��룔��" #. type: Plain text #: en/git-rebase.txt:1081 #, priority:100 msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]." -msgstr "" +msgstr "倻귝옖 �섇춴楹사퍨�� �섇읃�됧넳囹곻펽�뽬�끺슴�ⓧ틙 `--interactive` �η쐛�γ�곭폋渦묆�곩럨�뜻닑岳�쨳�먧벡竊뚧닑�끺툓歷멧슴�ⓧ틙 `commit --amend`, `reset` �뽩츑�닷럣�꿴뇥�쇿뫝餓ㅿ펷倻� https://github.com/newren/git-filter-repo[`filter-repo`]竊됵펽弱긴폏�묊뵟瓦숂쭕�끻넻��" #. type: Title ~ #: en/git-rebase.txt:1084 #, no-wrap, priority:100 msgid "The easy case" -msgstr "" +msgstr "嶸��뺞죭堊�" #. type: Plain text #: en/git-rebase.txt:1089 #, priority:100 msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did." -msgstr "" +msgstr "�ゆ쐣壤� �섇춴楹사퍨�� 訝딁쉪�닸뵻竊덂읃雅롥량凉귛냵若밭쉪烏δ툈 ID竊됧쑉 �섇춴楹사퍨�� �섇읃�띶릮若뚦뀲�멨릪�뜻뎺�됪븞��" #. type: Plain text #: en/git-rebase.txt:1094 #, priority:100 msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream (unless `--reapply-cherry-picks` is given). So if you say (assuming you're on 'topic')" -msgstr "" +msgstr "�②퓳燁띷깄�듕툔竊뚥엶鸚띶갚孃덄��뺜틙竊뚦썱訝� 'git rebase' �ι걪瓮녘퓝�겻툓歷멧릎藥꿰퍘耶섇쑉�꾣뵻�⑨펷�ㅹ씆瀯쇿눣 `--reapply-cherry-picks` �됮」竊됥�귝�餓ο펽倻귝옖鵝좄�竊덂걞溫얌퐷�� �섆말窯섃�� �녷뵱訝딉펹" #. type: delimited block - #: en/git-rebase.txt:1096 @@ -45172,7 +45172,7 @@ msgstr " $ git rebase subsystem\n" #: en/git-rebase.txt:1098 #, priority:100 msgid "you will end up with the fixed history" -msgstr "" +msgstr "�ⓨ컛�룟풓�뷴츣�꾢럣�꿱�壤�" #. type: delimited block - #: en/git-rebase.txt:1104 @@ -45194,13 +45194,13 @@ msgstr "" #: en/git-rebase.txt:1108 #, no-wrap, priority:100 msgid "The hard case" -msgstr "" +msgstr "�곈슻�꾡풃耶�" #. type: Plain text #: en/git-rebase.txt:1112 #, priority:100 msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase." -msgstr "" +msgstr "倻귝옖 �섇춴楹사퍨�� �꾢룜�뽨툗�띸쉰�띸쉪�섇뙑訝띶츑�ⓧ��댐펽�끻넻弱긴폏�섇풓�닷뒥鸚띷쓡��" #. type: Plain text #: en/git-rebase.txt:1117 @@ -45210,31 +45210,31 @@ msgid "" " even in the hard case, it may have unintended consequences. For\n" " example, a commit that was removed via `git rebase\n" " --interactive` will be **resurrected**!\n" -msgstr "" +msgstr "�썹꽫 �섊��뺞걿鸚띷죭堊뗢�� �됪뿶�뗤세�먨뒣\n �념슴�①뼇�얏죭餓뜸릎竊뚥튋��꺗雅㎫뵟�뤸꺍訝띶댆�꾢릮�쒌�� \n 堊뗥쫩竊뚪�싪퓝 `git rebase\n --interactive` �좈솮�꾣룓雅ㅵ컛熬�**�℡쨳**竊�\n" #. type: Plain text #: en/git-rebase.txt:1122 #, priority:100 msgid "The idea is to manually tell `git rebase` \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example:" -msgstr "" +msgstr "�묇뺄�꾣꺍力뺞삸�뗥뒯�딂칹 `git rebase` �쒏뿧�� �섇춴楹사퍨�� �녷뵱�ⓨ벆�뚨퍜�잞펽�뚧궓�� �섆말窯섃�� �녷뵱�ⓨ벆�뚦�冶뗢�앾펽阿잌갚���竊뚦츆餓т퉳�당쉪�㎩릦亮뜹읃簾����阿덀�� 堊뗥쫩竊뚥퐷恙낂』�얍댆訝�燁띷뼶力뺞씎�썲릫�� �섇춴楹사퍨�� �녷뵱�꾣��롣�轝→룓雅ㅿ폏" #. type: Plain text #: en/git-rebase.txt:1126 #, priority:100 msgid "With the 'subsystem' reflog: after `git fetch`, the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)" -msgstr "" +msgstr "鵝욜뵪 �섇춴楹사퍨�� 凉뺟뵪�ε퓱竊싧쑉 `git fetch` 阿뗥릮竊뚢�섇춴楹사퍨�� �꾣뿧 tip 鵝띴틢 `subsystem@{1}`�� �뤷릮�꾥렩�뽩컛罌욃뒥瓦쇾릉�겼춻�� (�귟쭅 linkgit:git-reflog[1]竊�" #. type: Plain text #: en/git-rebase.txt:1129 #, priority:100 msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`." -msgstr "" +msgstr "訝� �섆말窯섃�� �녷뵱�� tip �됧뀽竊싩뵳雅� �쁳opic�� �녷뵱�됦툒轝→룓雅ㅿ펽��餓� �섇춴楹사퍨�� �녷뵱�꾣뿧�먪ㅊ恙낂』�� `topic~3`��" #. type: Plain text #: en/git-rebase.txt:1132 #, priority:100 msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):" -msgstr "" +msgstr "�뜹릮竊뚧궓��빳弱녷뿧�� `subsystem..topic`竊덂춴楹사퍨..訝삯쥦竊됬㎉濾띶댆�곁쉪�먪ㅊ訝�펽�방퀡��펷野밥틢凉뺟뵪�ε퓱�꾣깄�듸펽�뉓��ⓨ럴瀯뤷쑉 �섆말窯섃�� �녷뵱訝�펹竊�" #. type: delimited block - #: en/git-rebase.txt:1134 @@ -45246,31 +45246,31 @@ msgstr " $ git rebase --onto subsystem subsystem@{1}\n" #: en/git-rebase.txt:1139 #, priority:100 msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!" -msgstr "" +msgstr "�쒎쎇�얌풃耶먥�� �℡쨳�꾥퓹�곩룏佯붷갇�띄퀫楹뺧폏�섆말窯섃�� 訝뗦만�� �섉캀訝や볶�� �겼쑉阿잌퓚窈삥돢烏� �쒎쎇�얌풃耶먥�� �℡쨳竊�" #. type: Title - #: en/git-rebase.txt:1141 #, no-wrap, priority:100 msgid "REBASING MERGES" -msgstr "" +msgstr "�섇읃�덂뭉" #. type: Plain text #: en/git-rebase.txt:1149 #, priority:100 msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)." -msgstr "" +msgstr "雅ㅴ틨凉뤷룜�뷴뫝餓ㅶ��앮삸訝뷴쨪�녶뜒訝よ‥訝곭내�쀨�뚩�溫←쉪�귛썱閭ㅿ펽弱녶릦亮뜻룓雅ㅶ럲�ㅵ쑉孃끻뒢雅뗩」�쀨〃阿뗥쨼��쐣�볡릤�꾬펽�졽맏凉��묇볶�섇쑉�녷뵱訝듿램鵝쒏뿶竊뚦룾�썲럴瀯뤷릦亮뜸틙壤볠뿶�� `master`竊뚦룵���瀯덂컛���됪룓雅ㅹ뇥營�댆雅� `master`訝딉펷瓮녘퓝雅녶릦亮뜻룓雅ㅿ펹��" #. type: Plain text #: en/git-rebase.txt:1153 #, priority:100 msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches." -msgstr "" +msgstr "訝띹퓝竊뚦��묇볶�섉꺍誤곲뇥�겼닗兩뷴릦亮뜻룓雅ㅴ튋�됧릦�녺쉪�잌썱竊싧쑉鸚싦릉�멧틨�녘걫�꾢늽��툓藥δ퐳�띰펽訝뷰틙岳앮똻�녷뵱瀯볠엫竊덃닑 �쒏룓雅ㅶ땽�묅�앾펹��" #. type: Plain text #: en/git-rebase.txt:1158 #, priority:100 msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:" -msgstr "" +msgstr "�ⓧ툔�®쉪鹽뷰풃訝�펽凉��묇볶�섇쑉訝�訝ら뇥�꾡틙�됮뮢若싦퉱�밧폀�꾤돶�㎩늽��툓藥δ퐳竊뚦뭉�ⓨ룱訝�訝ょ돶�㎩늽��툓鵝욜뵪�띷엫若욅렟雅� �쒏뒫�딃뵗瑥��� �됮뮢��`git log --graph --format=%s -5` �꾥풏�뷴룾�썸삸瓦숁졆�꾬폏" #. type: delimited block - #: en/git-rebase.txt:1168 @@ -45298,19 +45298,19 @@ msgstr "" #: en/git-rebase.txt:1175 #, priority:100 msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`." -msgstr "" +msgstr "凉��묇볶�섇룾�썲툕�쎾쑉岳앯븰�녷뵱�볠뎾�꾢릪�띰펽弱녻퓳雅쎿룓雅ㅹ뇥若싧릲�경쎍�곁쉪 `master` �녷뵱竊뚥풃倻귨펽壤볡К訝�訝ょ돶�㎩늽��캈寧т틠訝ゅ늽��쎍�⑶썓�먨댆 `master` �녷뵱�띰펽凉��묇볶�섇룾�썲툕�쏂㎗�념툗 �쒍툔饔썸뙃���� 映사쉪�덂뭉�꿰챳竊뚦썱訝� �쒍툔饔썸뙃���� 映삣럴瀯뤻썓�먨댆雅� `master` �녷뵱��" #. type: Plain text #: en/git-rebase.txt:1178 #, priority:100 msgid "This rebase can be performed using the `--rebase-merges` option. It will generate a todo list looking like this:" -msgstr "" +msgstr "��빳鵝욜뵪 `--rebase-merges` �됮」瓦쏂죱�띸쉰�� 若껃컛�잍닇倻귚툔�꾢푷�욂틟窈밧닓烏⑨폏" #. type: delimited block - #: en/git-rebase.txt:1181 en/git-rebase.txt:1262 #, no-wrap, priority:100 msgid "label onto\n" -msgstr "" +msgstr "�뉒�訝딁쉪\n" #. type: delimited block - #: en/git-rebase.txt:1187 @@ -45321,7 +45321,7 @@ msgid "" "pick 123456 Extract a generic Button class from the DownloadButton one\n" "pick 654321 Use the Button class for all buttons\n" "label refactor-button\n" -msgstr "" +msgstr "# �녷뵱竊싮뇥�꾣뙃��\n�띸쉰��\n�� 123456 餓롣툔饔썸뙃��굳訝�룓�뽨�訝ら�싩뵪�됮뮢映�\n�됧룚 654321 野방��됪뙃��슴�ⓩ뙃��굳\nlabel refactor-button竊덆뇥�꾣뙃��펹\n" #. type: delimited block - #: en/git-rebase.txt:1192 @@ -45331,7 +45331,7 @@ msgid "" "reset refactor-button # Use the Button class for all buttons\n" "pick abcdef Add the feedback button\n" "label report-a-bug\n" -msgstr "" +msgstr "# �녷뵱竊싨뒫�듾�訝ら뵗瑥�\nreset refactor-button 竊덆뇥�꾣뙃��펹# ���됪뙃��꺗鵝욜뵪�됮뮢映�\npick abcdef 曆삣뒥�띺쫰�됮뮢\nlabel report-a-bug竊덃뒫�듾�訝ら뵗瑥�펹\n" #. type: delimited block - #: en/git-rebase.txt:1196 @@ -45340,13 +45340,13 @@ msgid "" "reset onto\n" "merge -C a1b2c3 refactor-button # Merge 'refactor-button'\n" "merge -C 6f5e4d report-a-bug # Merge 'report-a-bug'\n" -msgstr "" +msgstr "�띸쉰��\nmerge -C a1b2c3 refactor-button # �덂뭉 �쒒뇥�꾣뙃����\nmerge -C 6f5e4d report-a-bug # �덂뭉 �쒏뒫�듾�訝ら뵗瑥���\n" #. type: Plain text #: en/git-rebase.txt:1200 #, priority:100 msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones." -msgstr "" +msgstr "訝롥만鰲꾤쉪雅ㅴ틨凉뤷룜�뷰툖�뚳펽�ㅴ틙 `pick`竊덆�됧룚竊됧뫝餓ㅵ쨼竊뚩퓲�� `label`竊덃젃嶺억펹��`reset`竊덆뇥營�펹 �� `merge`竊덂릦亮띰펹 �썰빱��" #. type: Plain text #: en/git-rebase.txt:1208 @@ -45364,31 +45364,31 @@ msgstr "" #: en/git-rebase.txt:1221 #, priority:100 msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message." -msgstr "" +msgstr "`merge`竊덂릦亮띰펹�썰빱鴉싧컛�뉐츣�꾤뎵�у릦亮뜹댆壤볠뿶�� HEAD 訝��귚슴�� `-C <繹먩룓雅�>` �띰펽弱녵슴�ⓩ뙁若싧릦亮뜻룓雅ㅷ쉪�먧벡岳→겘�귛쫩�쒎컛 `-C` �밥맏弱뤷넍�� `-c`竊뚦릦亮뜻닇�잌릮竊뚧룓雅ㅴ에��컛�①폋渦묈솳訝�돀凉�竊뚥빳堊욜뵪�루폋渦묇에����" #. type: Plain text #: en/git-rebase.txt:1224 #, priority:100 msgid "If a `merge` command fails for any reason other than merge conflicts (i.e. when the merge operation did not even start), it is rescheduled immediately." -msgstr "" +msgstr "倻귝옖 `merge`竊덂릦亮띰펹�썰빱�졾릦亮뜹넳囹곦빳鸚뽫쉪餓삡퐬�잌썱鸚김뇰竊덂뜵�덂뭉�띴퐳�싪눛亦→쐣凉�冶뗰펹竊뚦닕鴉싩쳦�녜뇥�겼츎�믡��" #. type: Plain text #: en/git-rebase.txt:1235 #, priority:100 msgid "By default, the `merge` command will use the `ort` merge strategy for regular merges, and `octopus` for octopus merges. One can specify a default strategy for all merges using the `--strategy` argument when invoking rebase, or can override specific merges in the interactive list of commands by using an `exec` command to call `git merge` explicitly with a `--strategy` argument. Note that when calling `git merge` explicitly like this, you can make use of the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example) in order to refer to the branches you want to merge." -msgstr "" +msgstr "容섋��끻넻訝뗰펽`merge`竊덂릦亮띰펹�썰빱弱녶�躍멱쭊�덂뭉鵝욜뵪 `ort ` �덂뭉嶺뽫븼竊뚦�鸚싪러�덂뭉鵝욜뵪 `octopus` �덂뭉嶺뽫븼�� �묇뺄��빳�②컘�ⓨ룜�뷴뫝餓ㅶ뿶鵝욜뵪 `--strategy` �귝빊訝뷸��됧릦亮뜻뙁若싦�訝ら퍡溫ㅷ춺�ο펽阿잌룾餓ε쑉雅ㅴ틨凉뤷뫝餓ㅵ닓烏ⓧ릎鵝욜뵪 `exec` �썰빱�얍폀�계컘�� `git merge` 亮뜹뒥訝� `--strategy` �귝빊�θ쫮�뽫돶若싩쉪�덂뭉嶺뽫븼�� ��誤곫낏�뤹쉪��펽�뤺퓳�룡샑凉뤺컘�� `git merge` �띰펽��빳�⑴뵪�뉒���램鵝쒎뙷�у쑑凉뺟뵪竊덁풃倻귨펽凉뺟뵪 `refs/rewritten/onto` 弱녶�佯붹젃嶺� `onto`竊됭퓳訝�雅뗥츩�ε폊�②쫨�덂뭉�꾢늽����" #. type: Plain text #: en/git-rebase.txt:1239 #, priority:100 msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option." -msgstr "" +msgstr "力ⓩ꼷竊싩К訝��▼뫝餓ㅿ펷`label onto`竊됦폏�뉑낏�먧벡���뷰틢�꾡엶溫®뎵�э폑`onto ` �ゆ삸訝�訝ょ벧若싦퓱�먪쉪�띸㎞竊뚧삸野� `--onto` �됮」�꾡�燁띷룓鹽뷩��" #. type: Plain text #: en/git-rebase.txt:1246 #, priority:100 msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:" -msgstr "" +msgstr "阿잌룾餓ι�싪퓝曆삣뒥 `merge <�덂뭉壅루궧>` �썰빱竊뚥퍗鸚닷�冶뗥폊�ε뀲�곁쉪�덂뭉�먧벡�귟퓳燁띶숱凉뤶폏�잍닇�귛츣�먧벡岳→겘竊뚦뭉冶뗧퍑�볟�煐뽬풌�②��ⓩ댎煐뽬풌�귚풃倻귨펽壤볞�訝ょ돶�㎩늽��쫨鰲e넶�꾦뿮窯섆툖閭㏘�訝わ펽��誤곫땰�녷닇訝ㅴ릉�싪눛�닷쩀�방�㎩늽��뿶竊뚩퓳訝ゅ뫝餓ㅵ갚孃덃쐣�ⓦ�귟��뗨퓳訝ゅ푷�욂틟窈밧닓烏⑨폏" #. type: delimited block - #: en/git-rebase.txt:1253 @@ -45399,13 +45399,13 @@ msgid "" "pick 918273 Fix detection of OpenSSL in CMake\n" "pick afbecd http: add support for TLS v1.3\n" "pick fdbaec Fix detection of cURL in CMake on Windows\n" -msgstr "" +msgstr "pick 192837 餓� GNU Makefiles �뉑뜟�� CMake\npick 5a6c7e 溫겼퐬�뉑뜟�� CMake �꾥퓝葉�\npick 918273 岳�쨳 CMake 訝�쉪 OpenSSL 汝�役뗩뿮窯�\npick afbecd http竊싨렌�졾� TLS v1.3 �꾣뵱��\npick fdbaec �� Windows 訝듾엶鸚� CMake 野� cURL �꾣�役�\n" #. type: Plain text #: en/git-rebase.txt:1259 #, priority:100 msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:" -msgstr "" +msgstr "瑥ε닓烏ⓧ릎訝� CMake �졾뀽�꾡�訝ゆ룓雅ㅵ푽��꺗��맏雅녵엶鸚띷��됧썱�밭뵪 CMake �뚦폊�η쉪�숃�竊뚥퐜若껇㎗�녕쉪��룱訝�訝ら뿮窯섅�귟쫨�딂퓳訝ゅ늽��늽�먧륵訝や말窯섇늽��펽��빳瓦숁졆煐뽬풌孃끻뒢雅뗩」�쀨〃竊�" #. type: delimited block - #: en/git-rebase.txt:1265 @@ -45413,7 +45413,7 @@ msgstr "" msgid "" "pick afbecd http: add support for TLS v1.3\n" "label tlsv1.3\n" -msgstr "" +msgstr "�됪떓 afbecd http竊싨렌�졾� TLS v1.3 �꾣뵱��\nlabel tlsv1.3\n" #. type: delimited block - #: en/git-rebase.txt:1272 @@ -45425,7 +45425,7 @@ msgid "" "pick fdbaec Fix detection of cURL in CMake on Windows\n" "pick 5a6c7e Document the switch to CMake\n" "label cmake\n" -msgstr "" +msgstr "reset onto\npick 192837 餓� GNU Makefiles �뉑뜟�� CMake\npick 918273 岳�쨳 CMake 訝�쉪 OpenSSL 汝�役뗩뿮窯�\npick fdbaec �� Windows 訝듾엶鸚� CMake 野� cURL �꾣�役�\npick 5a6c7e 溫겼퐬�뉑뜟�� CMake �꾥퓝葉�\nlabel cmake\n" #. type: delimited block - #: en/git-rebase.txt:1276 @@ -45434,7 +45434,7 @@ msgid "" "reset onto\n" "merge tlsv1.3\n" "merge cmake\n" -msgstr "" +msgstr "reset onto\nmerge tlsv1.3\nmerge cmake\n" #. type: Title = #: en/git-receive-pack.txt:2 @@ -45895,67 +45895,67 @@ msgid "" "'git reflog delete' [--rewrite] [--updateref]\n" "\t[--dry-run | -n] [--verbose] <ref>@{<specifier>}...\n" "'git reflog exists' <ref>\n" -msgstr "" +msgstr "'git reflog' [show] [<�ε퓱�됮」>] [<凉뺟뵪>]\n'git reflog expire' [--expire=<�띌뿴>] [--expire-unreachable=<�띌뿴>]\n\t[--rewrite] [--updateref] [--stale-fix]\n\t[--dry-run | -n] [--verbose] [--all [--single-worktree] | <凉뺟뵪>...]\n'git reflog delete' [--rewrite] [--updateref]\n\t[--dry-run | -n] [--verbose] <凉뺟뵪>@{<�뉑낏>}...\n'git reflog exists' <凉뺟뵪>\n" #. type: Plain text #: en/git-reflog.txt:23 #, priority:100 msgid "This command manages the information recorded in the reflogs." -msgstr "" +msgstr "瑥ε뫝餓ㅷ��녻�壤뺝쑉凉뺟뵪�ε퓱訝�쉪岳→겘��" #. type: Plain text #: en/git-reflog.txt:31 #, priority:100 msgid "Reference logs, or \"reflogs\", record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a reference. For example, `HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week.ago}` means \"where master used to point to one week ago in this local repository\", and so on. See linkgit:gitrevisions[7] for more details." -msgstr "" +msgstr "凉뺟뵪�ε퓱竊덃닑燁� \"reflogs\"竊됭�壤뺜틙�у쑑餓볟틩訝�늽��뭽�뜸퍟凉뺟뵪�꾣룓鹽뷸쎍�경뿶�담�귛뢿�껅뿥恙쀥쑉�꾤쭕 Git �썰빱訝�꺗孃덃쐣�⑨펽��빳�ⓩ씎�뉐츣凉뺟뵪�꾣뿧�쇈�귚풃倻귨펽`HEAD@{2}` 烏①ㅊ �쒍륵閭ε뎺 HEAD ���①쉪鵝띸쉰�앾펽`master@{one.week.previous}` 烏①ㅊ �쒍��ⓨ뎺�т퍜佯볞릎 master ���①쉪鵝띸쉰�앾펽嶺됬춬�귟�鰲� linkgit:gitrevisions[7]��" #. type: Plain text #: en/git-reflog.txt:41 #, priority:100 msgid "The \"show\" subcommand (which is also the default, in the absence of any subcommands) shows the log of the reference provided in the command-line (or `HEAD`, by default). The reflog covers all recent actions, and in addition the `HEAD` reflog records branch switching. `git reflog show` is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] for more information." -msgstr "" +msgstr "\"show\" 耶먨뫝餓ㅿ펷阿잍삸容섋��썰빱竊뚦쑉亦→쐣餓삡퐬耶먨뫝餓ㅷ쉪�끻넻訝뗰펹�양ㅊ�썰빱烏뚥릎�먧풘�꾢폊�ⓩ뿥恙쀯펷�뽭퍡溫ㅷ쉪 `HEAD`竊됥�귛폊�ⓩ뿥恙쀥똿�ф��됪�瓦묊쉪�띴퐳竊뚧�鸚뽳펽`HEAD` 凉뺟뵪�ε퓱瓦섋�壤뺝늽��늾�㏂�� `git reflog show` �� `git log -g --abbrev-commit --pretty=oneline` �꾢닽�랃폑瑥�쭅 linkgit:git-log[1]��" #. type: Plain text #: en/git-reflog.txt:47 #, priority:100 msgid "The \"expire\" subcommand prunes older reflog entries. Entries older than `expire` time, or entries older than `expire-unreachable` time and not reachable from the current tip, are removed from the reflog. This is typically not used directly by end users -- instead, see linkgit:git-gc[1]." -msgstr "" +msgstr "\"expire\" 耶먨뫝餓ㅷ뵪雅롥닠�ㅶ뿧�꾢폊�ⓩ뿥恙쀦씉���귟텈瓦� `expire` �띌뿴�꾣씉��펽�뽬텈瓦� `expire-unreachable` �띌뿴訝붷퐪�� tip �졿퀡溫욥뿮�꾣씉��펽�썰폏餓롥폊�ⓩ뿥恙쀤릎�좈솮�� 瀯덄ク�ⓩ댎�싧만訝띴폏�닸렏鵝욜뵪瑥ε춴窈뱄펽瑥룟뢿鰲� linkgit:git-gc[1]��" #. type: Plain text #: en/git-reflog.txt:52 #, priority:100 msgid "The \"delete\" subcommand deletes single entries from the reflog. Its argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). This subcommand is also typically not used directly by end users." -msgstr "" +msgstr "\"delete\" 耶먨뫝餓ㅷ뵪雅롥닠�ㅵ틪�ⓩ뿥恙쀤릎�꾢뜒訝ゆ씉���귛끀�귝빊恙낂』���訝�_exact_�←쎅竊덁풃倻�\"`git reflog delete master@{2}`\"竊됥�귝�瀯덄뵪�룬�싧만阿잋툖鴉싩쎍�δ슴�②�耶먨뫝餓ㅳ��" #. type: Plain text #: en/git-reflog.txt:56 #, priority:100 msgid "The \"exists\" subcommand checks whether a ref has a reflog. It exits with zero status if the reflog exists, and non-zero status if it does not." -msgstr "" +msgstr "\"exists\" 耶먨뫝餓ㅶ��ε폊�ⓩ삸��쐣凉뺟뵪�ε퓱�� 倻귝옖凉뺟뵪�ε퓱耶섇쑉竊뚦닕餓ι쎏�뜻�곲���븝폑倻귝옖訝띶춼�⑨펽�쇾빳�욇쎏�뜻�곲���뷩��" #. type: Title ~ #: en/git-reflog.txt:61 #, no-wrap, priority:100 msgid "Options for `show`" -msgstr "" +msgstr "`show`竊덃샑鹽븝펹�꾦�됮」" #. type: Plain text #: en/git-reflog.txt:64 #, priority:100 msgid "`git reflog show` accepts any of the options accepted by `git log`." -msgstr "" +msgstr "`git reflog show` �ε룛 `git log` �ε룛�꾡뻣鵝뺡�됮」��" #. type: Title ~ #: en/git-reflog.txt:67 #, no-wrap, priority:100 msgid "Options for `expire`" -msgstr "" +msgstr "`expire` �꾦�됮」" #. type: Plain text #: en/git-reflog.txt:71 #, priority:100 msgid "Process the reflogs of all references." -msgstr "" +msgstr "鸚꾤릤���됧폊�①쉪凉뺟뵪�ε퓱��" #. type: Labeled list #: en/git-reflog.txt:72 en/rev-list-options.txt:218 @@ -45967,31 +45967,31 @@ msgstr "--single-worktree" #: en/git-reflog.txt:76 #, priority:100 msgid "By default when `--all` is specified, reflogs from all working trees are processed. This option limits the processing to reflogs from the current working tree only." -msgstr "" +msgstr "容섋��끻넻訝뗰펽倻귝옖�뉐츣雅� `--all`�됮」竊뚧��됧램鵝쒎뙷�꾢폊�ⓩ뿥恙쀩꺗鴉싪˙鸚꾤릤�귝��됮」�먨댍�ゅ쨪�녶퐪�띶램鵝쒎뙷�꾢폊�ⓩ뿥恙쀣��" #. type: Labeled list #: en/git-reflog.txt:77 #, no-wrap, priority:100 msgid "--expire=<time>" -msgstr "" +msgstr "--expire=<�띌뿴>" #. type: Plain text #: en/git-reflog.txt:84 #, priority:100 msgid "Prune entries older than the specified time. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes entries regardless of their age; `--expire=never` turns off pruning of reachable entries (but see `--expire-unreachable`)." -msgstr "" +msgstr "�ら솮擁낁퓝�뉐츣�띌뿴�꾣씉���귛쫩�쒏쑋�뉐츣閭ㅹ�됮」竊뚦닕瓦뉑쐿�띌뿴�뽬눎�띸쉰溫양쉰 `gc.reflogExpire`竊뚪퍡溫ㅴ맏 90 鸚⒲��`expire=all` 鴉싧돦�ㅴ뻣鵝뺝뭅榕꾤쉪�←쎅竊�`--expire=never` 鴉싧뀽��돦�ㅵ룾�계씨�←쎅�꾢뒣�쏙펷鵝녻��귡쁾 `--expire-unreachable`竊됥��" #. type: Labeled list #: en/git-reflog.txt:85 #, no-wrap, priority:100 msgid "--expire-unreachable=<time>" -msgstr "" +msgstr "--expire-unreachable=<�띌뿴>" #. type: Plain text #: en/git-reflog.txt:94 #, priority:100 msgid "Prune entries older than `<time>` that are not reachable from the current tip of the branch. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpireUnreachable`, which in turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable entries regardless of their age; `--expire-unreachable=never` turns off early pruning of unreachable entries (but see `--expire`)." -msgstr "" +msgstr "�ら솮餓롥늽��퐪�띺《塋�뿞力뺝댆渦양쉪擁낁퓝 `<�띌뿴>` �꾣씉���귛쫩�쒏쑋�뉐츣閭ㅹ�됮」竊뚦닕瓦뉑쐿�띌뿴�뽬눎�띸쉰溫양쉰 `gc.reflogExpireUnreachable`竊뚪퍡溫ㅴ맏 30 鸚⒲��`--expire-unreachable=all` 鴉싦엶�ゆ뿞力뺠���쉪�←쎅竊뚧뿞溫뷴끀亮닻푶鸚㎩컦竊�`--expire-unreachable=never` 鴉싧뀽����졿퀡溫욥뿮�←쎅�꾣뿩�잋엶�わ펷鵝녻��귟쭅 `--expire`竊됥��" #. type: Labeled list #: en/git-reflog.txt:95 @@ -46003,7 +46003,7 @@ msgstr "--updateref" #: en/git-reflog.txt:99 #, priority:100 msgid "Update the reference to the value of the top reflog entry (i.e. <ref>@\\{0\\}) if the previous top entry was pruned. (This option is ignored for symbolic references.)" -msgstr "" +msgstr "倻귝옖�띴�訝ら《掠귝씉��럴熬ュ돦�앾펽�쇿컛凉뺟뵪�닸뼭訝븅《掠귛폊�ⓩ뿥恙쀦씉��쉪�쇽펷�� <凉뺟뵪>@\\{0\\}竊됥�� (寧�뤇凉뺟뵪弱녶옙�ζ��됮」竊�" #. type: Labeled list #: en/git-reflog.txt:100 @@ -46015,7 +46015,7 @@ msgstr "--rewrite" #: en/git-reflog.txt:104 #, priority:100 msgid "If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be equal to the \"new\" SHA-1 field of the entry that now precedes it." -msgstr "" +msgstr "倻귝옖�띶넍�ε퓱�←쎅�꾢뎺訝�訝ゆ씉��˙�ゆ옗竊뚦닕瘟껅빐�� �쒏뿧�� SHA-1竊뚥슴�띄춬雅롧렟�ⓩ럲�ⓨ끀�띺씊�꾣씉��쉪 �쒏뼭�� SHA-1 耶쀦���" #. type: Labeled list #: en/git-reflog.txt:105 @@ -46027,31 +46027,31 @@ msgstr "--stale-fix" #: en/git-reflog.txt:110 #, priority:100 msgid "Prune any reflog entries that point to \"broken commits\". A broken commit is a commit that is not reachable from any of the reference tips and that refers, directly or indirectly, to a missing commit, tree, or blob object." -msgstr "" +msgstr "�좈솮餓삡퐬�뉐릲 �쒍릎��룓雅ㅲ�� �꾢폊�ⓩ뿥恙쀦씉���귚릎��룓雅ㅶ삸�뉏퍗餓삡퐬凉뺟뵪�먪ㅊ�썸뿞力뺝댆渦양쉪�먧벡竊뚦츆�닸렏�뽭뿴�ε쑑�뉐릲訝℡ㅁ�꾣룓雅ㅳ�곫젒�뽨틠瓦쎾댍野배괌��" #. type: Plain text #: en/git-reflog.txt:115 #, priority:100 msgid "This computation involves traversing all the reachable objects, i.e. it has the same cost as 'git prune'. It is primarily intended to fix corruption caused by garbage collecting using older versions of Git, which didn't protect objects referred to by reflogs." -msgstr "" +msgstr "瓦숂쭕溫←츞易됧룋�띶럣���됧룾�계씨�꾢�穩∽펽阿잌갚���竊뚦끀餓d뻔訝� 'git prune' �멨릪�� 若껆쉪訝삭쫨��쉪��엶鸚띷뿧�덃쑍 Git �껃쑟�욄뵸���졿닇�꾣뜜�륅펽�졽맏�㎫뎵�х쉪 Git �졿퀡岳앮뒪凉뺟뵪�ε퓱��凉뺟뵪�꾢�穩▲��" #. type: Plain text #: en/git-reflog.txt:120 #, priority:100 msgid "Do not actually prune any entries; just show what would have been pruned." -msgstr "" +msgstr "訝띹쫨若욇솀岳�돦餓삡퐬�←쎅竊뚦룵���양ㅊ�у틪岳�돦�꾢냵若밤��" #. type: Plain text #: en/git-reflog.txt:123 #, priority:100 msgid "Print extra information on screen." -msgstr "" +msgstr "�ⓨ콓亮뺜툓�볟뜲窯앭쨼岳→겘��" #. type: Title ~ #: en/git-reflog.txt:126 #, no-wrap, priority:100 msgid "Options for `delete`" -msgstr "" +msgstr "`delete`竊덂닠�ㅿ펹�꾦�됮」" #. type: Plain text #: en/git-reflog.txt:131 @@ -46847,49 +46847,49 @@ msgstr "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] #: en/git-repack.txt:20 #, priority:100 msgid "This command is used to combine all objects that do not currently reside in a \"pack\", into a pack. It can also be used to re-organize existing packs into a single, more efficient pack." -msgstr "" +msgstr "瑥ε뫝餓ㅷ뵪雅롥컛壤볟뎺訝띶쑉 �쒏빊��똿�� 訝�쉪���됧�穩▼릦亮뜹댆訝�訝ゆ빊��똿訝��� 若껇퓲��빳�ⓩ씎弱녺렟�됬쉪�경뜮�낂뇥�곁퍍瀯뉑닇訝�訝ゆ쎍�됪븞�꾣빊��똿��" #. type: Plain text #: en/git-repack.txt:39 #, priority:100 msgid "Instead of incrementally packing the unpacked objects, pack everything referenced into a single pack. Especially useful when packing a repository that is used for private development. Use with `-d`. This will clean up the objects that `git prune` leaves behind, but `git fsck --full --dangling` shows as dangling." -msgstr "" +msgstr "弱녷��됧폊�ⓨ�穩→돀�끾닇訝�訝ゅ똿竊뚩�뚥툖���먩��볟똿�ゆ돀�끿쉪野배괌�� �ⓩ돀�끿뵪雅롧쭅雅뷴��묊쉪�덃쑍佯볠뿶弱ㅵ끀�됬뵪�귚툗 `-d` 訝�壅룝슴�ⓦ�� 瓦쇿컛歷끿릤 `git prune` �쇾툔�꾢�穩∽펽鵝� `git fsck --full --dangling` �양ㅊ訝뷸궗令뷩��" #. type: Plain text #: en/git-repack.txt:43 #, priority:100 msgid "Note that users fetching over dumb protocols will have to fetch the whole new pack in order to get any contained object, no matter how many other objects in that pack they already have locally." -msgstr "" +msgstr "瑥룡낏�륅펽�싪퓝�묈뜌溫�렩�뽫쉪�ⓩ댎恙낂』�룟룚�답릉�경빊��똿竊뚧뎺�썼렩孃쀥끀訝�똿�ョ쉪餓삡퐬野배괌竊뚧뿞溫뷰퍟餓ф쑍�겼럴瀯뤸떏�됧쩀弱묋��경뜮�끺릎�꾢끀餓뽩�穩▲��" #. type: Plain text #: en/git-repack.txt:48 #, priority:100 msgid "Promisor packfiles are repacked separately: if there are packfiles that have an associated \".promisor\" file, these packfiles will be repacked into another separate pack, and an empty \".promisor\" file corresponding to the new separate pack will be written." -msgstr "" +msgstr "Promisor �끾뻼餓뜹컛�뺟떖�띷뼭�볟똿竊싧쫩�쒏쐣�꾢똿�뉏뻑�됦�訝ょ쎑�녕쉪 \".promisor \" �뉏뻑竊뚩퓳雅쎾똿�뉏뻑弱녻˙�띷뼭�볟똿�겼룱訝�訝ゅ뜒�х쉪�끺릎竊뚦뭉�쇿뀯訝�訝や툗�곁쉪�뺟떖�끿쎑野밧틪�꾤㈉ \".promisor \" �뉏뻑��" #. type: Plain text #: en/git-repack.txt:59 #, priority:100 msgid "Same as `-a`, unless `-d` is used. Then any unreachable objects in a previous pack become loose, unpacked objects, instead of being left in the old pack. Unreachable objects are never intentionally added to a pack, even when repacking. This option prevents unreachable objects from being immediately deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]." -msgstr "" +msgstr "訝� `-a` �멨릪竊뚪솮�욂슴�ⓧ틙 `-d`�� 瓦숁졆竊뚥빳�띸쉪�경뜮�끺릎餓삡퐬�졿퀡�계씨�꾢�穩↓꺗鴉싧룜�먩씭�g쉪�곫쑋�볟똿�꾢�穩∽펽�뚥툖��븰�ⓩ뿧�경뜮�끺릎�� �념슴�③뇥�경돀�끾뿶竊뚥튋訝띴폏�됪꼷弱녷뿞力뺝댆渦양쉪野배괌曆삣뒥�경빊��똿訝��� 瑥ι�됮」��빳�꿩��졿퀡�계씨�꾢�穩←븰�ⓩ뿧�경뜮�끺릎�롨˙塋뗥뜵�좈솮�� �멨룏竊뚧씭�g쉪訝띶룾渦얍�穩▼컛�ⓧ툔訝�轝↑컘�� 'git gc' �뜻졊���躍며쉪瓦뉑쐿鰲꾢닕瓦쏂죱岳�돦�귛뢿鰲� linkgit:git-gc[1]��" #. type: Plain text #: en/git-repack.txt:65 #, priority:100 msgid "After packing, if the newly created packs make some existing packs redundant, remove the redundant packs. Also run 'git prune-packed' to remove redundant loose object files." -msgstr "" +msgstr "�볟똿�롳펽倻귝옖�겼닗兩븀쉪�끺슴孃쀦윇雅쏁렟�됧똿�섇풓鸚싦퐰竊뚦닕�좈솮鸚싦퐰�꾢똿�� �뚧뿶瓦먫죱 'git prune-packed' �좈솮鸚싦퐰�꾣씭�e�穩→뻼餓뜰��" #. type: Plain text #: en/git-repack.txt:71 #, priority:100 msgid "Same as `-a`, unless `-d` is used. Then any unreachable objects are packed into a separate cruft pack. Unreachable objects can be pruned using the normal expiry rules with the next `git gc` invocation (see linkgit:git-gc[1]). Incompatible with `-k`." -msgstr "" +msgstr "訝� `-a` �멨릪竊뚪솮�욂슴�ⓧ틙 `-d`�귞꽫�롳펽餓삡퐬�졿퀡溫욥뿮�꾢�穩↓꺗鴉싪˙�볟똿�겻�訝ゅ뜒�х쉪�뗧섄�끺릎�귝뿞力뺠���쉪野배괌��빳�ⓧ툔訝�轝↑컘�� `git gc` �뜸슴�ⓩ�躍며쉪瓦뉑쐿鰲꾢닕瓦쏂죱�ゆ옗竊덂뢿鰲� linkgit:git-gc[1]竊됥�귚툗 `-k` 訝띶끉若밤��" #. type: Plain text #: en/git-repack.txt:76 #, priority:100 msgid "Expire unreachable objects older than `<approxidate>` immediately instead of waiting for the next `git gc` invocation. Only useful with `--cruft -d`." -msgstr "" +msgstr "塋뗥뜵瓦뉑쐿擁낁퓝 `<approxidate>` �꾡툖������穩∽펽�뚥툖��춬孃끺툔訝�轝↑컘�� `git gc`�� 餓끻쑉鵝욜뵪 `--cruft -d` �됮」�뜻쐣�ⓦ��" #. type: Labeled list #: en/git-repack.txt:77 @@ -46901,61 +46901,61 @@ msgstr "--directory=<dir>" #: en/git-repack.txt:82 #, priority:100 msgid "Write a cruft pack containing pruned objects (if any) to the directory `<dir>`. This option is useful for keeping a copy of any pruned objects in a separate directory as a backup. Only useful with `--cruft -d`." -msgstr "" +msgstr "弱녶똿�ヤ엶�ゅ�穩∽펷倻귝옖�됵펹�꾢럨煐⒴똿�쇿뀯��퐬 `<瓮�푶>`�귟��됮」��뵪雅롥쑉�뺟떖�꾤쎅壤뺜릎岳앯븰�ゆ옗野배괌�꾢돬�т퐳訝뷴쨭餓썬�귚퍎�ⓧ슴�� `--cruft -d` �뜻쐣�ⓦ��" #. type: Plain text #: en/git-repack.txt:86 #, priority:100 msgid "Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-objects[1]." -msgstr "" +msgstr "�� 'git pack-objects' 鴉좈�� `--local` �됮」�귛뢿鰲� linkgit:git-pack-objects[1]��" #. type: Plain text #: en/git-repack.txt:90 #, priority:100 msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." -msgstr "" +msgstr "�� `git-pack-objects` 鴉좈�� `--no-reuse-delta` �됮」竊뚦뢿鰲� linkgit:git-pack-objects[1]��" #. type: Plain text #: en/git-repack.txt:94 #, priority:100 msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." -msgstr "" +msgstr "�� `git-pack-objects` 鴉좈�� `--no-reuse-object` �됮」竊뚦뢿鰲� linkgit:git-pack-objects[1]��" #. type: Plain text #: en/git-repack.txt:99 #, priority:100 msgid "Show no progress over the standard error stream and pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]." -msgstr "" +msgstr "�ⓩ젃�녽뵗瑥�탛訝�툖�양ㅊ瓦쎾벧竊뚦뭉�� 'git pack-objects' 鴉좈�� `-q` �됮」�귛뢿鰲� linkgit:git-pack-objects[1]��" #. type: Plain text #: en/git-repack.txt:106 #, priority:100 msgid "Do not update the server information with 'git update-server-info'. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) over HTTP or FTP. See linkgit:git-update-server-info[1]." -msgstr "" +msgstr "訝띴슴�� 'git update-server-info' �닸뼭�띶뒦�ⓧ에���� 瑥ι�됮」鴉싪럼瓦뉑쎍�곈�싪퓝 HTTP �� FTP �묈툋瑥δ퍜佯볩펷�뽩끀�닸렏��쑍竊됪����꾣쑍�곁쎅壤뺞뻼餓뜰�� �귟쭅 linkgit:git-update-server-info[1]��" #. type: Plain text #: en/git-repack.txt:116 #, priority:100 msgid "These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within `--window` to see if using delta compression saves space. `--depth` limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object." -msgstr "" +msgstr "瓦쇾륵訝ら�됮」鴉싧쉽�띶쫩鵝뺜슴�� delta �뗧섄�ε춼�ⓩ빊��똿訝�쉪野배괌�귛�穩↓쫿�덁폏�됬굳�뗣�곩ㄷ弱뤷뭽���됧릫燁계퓵烏뚦냵�ⓩ럲佯륅펽�뜹릮訝� `--window`訝�쉪�뜸퍟野배괌瓦쏂죱驪붻푵竊뚥빳簾�츣鵝욜뵪 delta �뗧섄��맔�썼뒄�곭㈉�담��`--depth` �먨댍雅� delta 曆긷벧�꾣�鸚㎩�쇽폑瓦뉑런鴉싧쉽�띹㎗�끻솳�꾣�㎬꺗竊뚦썱訝븅�誤곩쩀轝▼틪�� delta �경뜮�띹꺗�얍댆�����꾢�穩▲��" #. type: Plain text #: en/git-repack.txt:122 #, priority:100 msgid "This option is passed through to `git pack-objects`." -msgstr "" +msgstr "瑥ι�됮」弱녵폖�믥퍢 `git pack-objects`��" #. type: Plain text #: en/git-repack.txt:135 #, priority:100 msgid "This option provides an additional limit on top of `--window`; the window size will dynamically scale down so as to not take up more than '<n>' bytes in memory. This is useful in repositories with a mix of large and small objects to not run out of memory with a large window, but still be able to take advantage of the large window for the smaller objects. The size can be suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory usage unlimited. The default is taken from the `pack.windowMemory` configuration variable. Note that the actual memory usage will be the limit multiplied by the number of threads used by linkgit:git-pack-objects[1]." -msgstr "" +msgstr "瑥ι�됮」�� `--window` �꾢읃簾�訝딀룓堊쎽틙窯앭쨼�꾦솏�띰폑囹쀥룭鸚㎩컦鴉싧뒯�곭섄�륅펽餓ι겳�띶뜝�②텈瓦� '<n>' 耶쀨뒄�꾢냵耶섅�� 瓦쇿�雅롥ㄷ弱뤷�穩→렁�귞쉪�덃쑍佯볣씆躍멩쐣�⑨펽�㏘툖鴉싧썱訝븀첊�h퓝鸚㎬�뚩�쀥갹�끻춼竊뚦룉�썲닶�ⓨㄷ囹쀥룭鸚꾤릤弱뤷�穩▲�� 鸚㎩컦�롧���빳�� \"k\"��\"m\" �� \"g\"��`window-memory=0` 烏①ㅊ�끻춼鵝욜뵪訝띶룛�먨댍�� 容섋��쇔룚�� `pack.windowMemory` �띸쉰�섌뇧�� 瑥룡낏�륅펽若욇솀�끻춼鵝욜뵪�뤷컛�� linkgit:git-pack-objects[1] 鵝욜뵪�꾤봇葉뗦빊阿섆빳�먨댍�쇈��" #. type: Plain text #: en/git-repack.txt:145 #, priority:100 msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB. If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index. The default is unlimited, unless the config variable `pack.packSizeLimit` is set. Note that this option may result in a larger and slower repository; see the discussion in `pack.packSizeLimit`." -msgstr "" +msgstr "驪뤶릉渦볟눣�끾뻼餓띄쉪��鸚㎩ㄷ弱뤵�귛ㄷ弱뤷룾餓ε릮煐�訝� \"k\"��\"m\" �� \"g\"�귛뀅溫며쉪��弱뤷ㄷ弱뤻솏�뜸맏 1MB�� 倻귝옖�뉐츣竊뚦룾�썰폏�쎾뻠鸚싦릉�경뜮�끾뻼餓띰펽瓦쇾튋鴉싮샍閭㏘퐤�양뇨凉뺟쉪�쎾뻠�� 容섋��쇗삸�좈솏鸚㏆펽�ㅹ씆溫양쉰雅녽뀓營�룜�� `pack.packSizeLimit`�귟�力ⓩ꼷竊뚩��됮」��꺗鴉싧��당뎵�у틩�섇ㄷ�곩룜��폑瑥룟뢿�� `pack.packSizeLimit` 訝�쉪溫②���" #. type: Labeled list #: en/git-repack.txt:147 @@ -46967,7 +46967,7 @@ msgstr "--write-bitmap-index" #: en/git-repack.txt:154 #, priority:100 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a`, `-A` or `-m`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`. This option has no effect if multiple packfiles are created, unless writing a MIDX (in which case a multi-pack bitmap is created)." -msgstr "" +msgstr "鵝쒍맏�띷뼭�볟똿�꾡��ⓨ늽竊뚦넍�ε룾渦얏�㏛퐤�양뇨凉뺛�귟퓳�ゆ쐣�ⓧ툗 `-a`��`-A` �� `-m` �귝빊訝�壅룝슴�ⓩ뿶�띷쐣�뤶퉱竊뚦썱訝뷰퐤�얍퓚窈삭꺗鸚잍뙁�묉��됧룾渦얍�穩▲�귝��됮」鴉싪쫮�� `repack.writeBitmaps` �꾥�營��귛쫩�쒎닗兩뷰틙鸚싦릉�끾뻼餓띰펽閭ㅹ�됮」弱녵툖壅룝퐳�⑨펽�ㅹ씆閭e쑉�쇿뀯訝�訝� MIDX竊덂쑉瓦숂쭕�끻넻訝뗥컛�쎾뻠訝�訝ゅ쩀�끺퐤�억펹��" #. type: Labeled list #: en/git-repack.txt:155 @@ -46979,13 +46979,13 @@ msgstr "--pack-kept-objects" #: en/git-repack.txt:163 #, priority:100 msgid "Include objects in `.keep` files when repacking. Note that we still do not delete `.keep` packs after `pack-objects` finishes. This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches. This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects." -msgstr "" +msgstr "�띷뼭�볟똿�뜹컛野배괌�끻맜�� `.keep` �뉏뻑訝��� 瑥룡낏�륅펽�� `pack-objects` 若뚧닇�롳펽�묇뺄餓띴툖鴉싧닠�� `.keep` �끹�� 瓦숁꼷�녕��묇뺄��꺗鴉싮뇥鸚띶�穩∽펽鵝녻퓳鵝욕풓瑥ι�됮」�ⓩ쐣亮뜹룕�③�곫닑�룟룚�뜹룾餓ε츎�ⓧ슴�ⓦ�� �싧만�ゆ쐣�ⓧ슴�� `-b` �� `repack.writeBitmaps` 煐뽩넍鵝띶쎗�띰펽瑥ι�됮」�띴폏�됬뵪竊뚦썱訝뷴츆��빳簾�퓷鵝띶쎗�끾뻼餓뜸릎�끻맜恙낁쫨�꾢�穩▲��" #. type: Plain text #: en/git-repack.txt:170 #, priority:100 msgid "Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs." -msgstr "" +msgstr "弱녺퍢若싩쉪饔�뻑�끾럲�ㅵ쑉�띷뼭�볟똿阿뗥쨼�귟퓳�멨퐪雅롥쑉饔�뻑�끺릎�졾뀯 `.keep` �뉏뻑��`<�끻릫>`��쉴餓뜹똿�뉏뻑�랃펽訝띶맜�띶���퐬竊덂쫩 `pack-123.pack`竊됥�� ��쩀轝→뙁若싪��됮」餓δ퓷�쇿쩀訝よ쉴餓뜹똿��" #. type: Labeled list #: en/git-repack.txt:171 @@ -46997,61 +46997,61 @@ msgstr "--unpack-unreachable=<when>" #: en/git-repack.txt:176 #, priority:100 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`." -msgstr "" +msgstr "壤볠씭�ⓩ뿞力뺠���쉪野배괌�띰펽訝띹쫨兀밧퓘�얍뒯餓삡퐬�⒳틢 `<�뜹��>`�꾢�穩▲�귟퓳��빳�ⓩ씎鴉섇뙑�쇿뀯野배괌�꾥퓝葉뗰펽�졽맏�롧뺌�� `git prune` 鴉싩쳦�녑돦�앲퓳雅쎾�穩▲��" #. type: Plain text #: en/git-repack.txt:183 #, priority:100 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)." -msgstr "" +msgstr "訝� `-ad` 訝�壅룝슴�ⓩ뿶竊뚨렟�됪빊��똿訝�뻣鵝뺞뿞力뺠���쉪野배괌弱녻˙�꾢뒥�경빊��똿�뉏뻑�꾣쑌弱억펽�뚥툖��˙燁삯솮�귝�鸚뽳펽餓삡퐬�졿퀡溫욥뿮�꾣씭�e�穩▽튋弱녻˙�볟똿竊덂뭉燁삯솮�뜻씭�e�佯붷�穩∽펹��" #. type: Plain text #: en/git-repack.txt:188 #, priority:100 msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]." -msgstr "" +msgstr "�� `git-pack-objects` 鴉좈�� `--delta-islands` �됮」竊뚦뢿鰲� linkgit:git-pack-objects[1]��" #. type: Labeled list #: en/git-repack.txt:189 #, no-wrap, priority:100 msgid "-g=<factor>" -msgstr "" +msgstr "-g=<�▽뻑>" #. type: Labeled list #: en/git-repack.txt:190 #, no-wrap, priority:100 msgid "--geometric=<factor>" -msgstr "" +msgstr "--geometric=<�▽뻑>" #. type: Plain text #: en/git-repack.txt:194 #, priority:100 msgid "Arrange resulting pack structure so that each successive pack contains at least `<factor>` times the number of objects as the next-largest pack." -msgstr "" +msgstr "�믣닓�잍닇�꾣빊��똿瀯볠엫竊뚥슴驪뤶릉瓦욅뺌�꾣빊��똿�끻맜�꾢�穩→빊�뤺눛弱묉삸訝뗤�訝ゆ�鸚㎪빊��똿�� `<�▽뻑>` �띲��" #. type: Plain text #: en/git-repack.txt:200 #, priority:100 msgid "`git repack` ensures this by determining a \"cut\" of packfiles that need to be repacked into one in order to ensure a geometric progression. It picks the smallest set of packfiles such that as many of the larger packfiles (by count of objects contained in that pack) may be left intact." -msgstr "" +msgstr "`git repack` �싪퓝 �쒎늾�꿎�� ��誤곲뇥�경돀�끾닇訝�訝ょ쉪�뉏뻑�끾씎簾�퓷�졽퐬瀛㎪빊�꾢쥭�욍�귛츆鴉싨뙌�됪�弱뤹쉪�뉏뻑�낂썓�덌펽餓δ씩弱썲룾�썲쩀�겻퓷�숃푵鸚㎫쉪�뉏뻑�낉펷�됭��뉏뻑�끾��ュ�穩←쉪�곈뇧溫←츞竊됥��" #. type: Plain text #: en/git-repack.txt:205 #, priority:100 msgid "Unlike other repack modes, the set of objects to pack is determined uniquely by the set of packs being \"rolled-up\"; in other words, the packs determined to need to be combined in order to restore a geometric progression." -msgstr "" +msgstr "訝롥끀餓뽭뇥�겼똿獒끾Æ凉뤶툖�뚨쉪��펽��誤곩똿獒끿쉪野배괌�녷삸�� �쒎뜼壅룐�� �꾢똿獒낂썓����녑츣�꾬폑�℡룯瑥앲�竊뚥맏雅녷걿鸚띶뇿鵝뺟벨�곤펽簾�츣��誤곭퍍�덄쉪�낁즳��" #. type: Plain text #: en/git-repack.txt:211 #, priority:100 msgid "When `--unpacked` is specified, loose objects are implicitly included in this \"roll-up\", without respect to their reachability. This is subject to change in the future. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to `git repack`." -msgstr "" +msgstr "壤볠뙁若싦틙 `--unpacked` �띰펽�얏븺�꾢�穩▽폏熬ラ쉺�ュ쑑�끻맜�②퓳訝� �쒎뜼燁��� 訝�펽�뚥툖�껇솑若껂뺄�꾢룾渦얏�㎯�귟퓳訝��밧컛�ε룾�썰폏�밧룜�귝��됮」竊덃꼷�녕�訝�燁띷닼�뜸툖�뚨쉪�띷뼭�볟똿與▼폀竊됧뭉訝띴퓷瑥곦툗 `git repack` �꾣��됧끀餓뽭�됮」瀯꾢릦訝�壅룝슴�ⓦ��" #. type: Plain text #: en/git-repack.txt:215 #, priority:100 msgid "When writing a multi-pack bitmap, `git repack` selects the largest resulting pack as the preferred pack for object selection by the MIDX (see linkgit:git-multi-pack-index[1])." -msgstr "" +msgstr "�①폋�쇿쩀�끺퐤�얏뿶竊�`git repack` 鴉싮�됪떓�잍닇�꾣�鸚㎩똿鵝쒍맏 MIDX �됪떓野배괌�꾦쫿�됧똿竊덂뢿鰲� linkgit:git-multi-pack-index[1]竊됥��" #. type: Labeled list #: en/git-repack.txt:217 @@ -47063,19 +47063,19 @@ msgstr "--write-midx" #: en/git-repack.txt:220 #, priority:100 msgid "Write a multi-pack index (see linkgit:git-multi-pack-index[1]) containing the non-redundant packs." -msgstr "" +msgstr "煐뽩넍�끻맜�욃넇鵝숃쉴餓뜹똿�꾢쩀饔�뻑�끿뇨凉뺧펷�귟쭅 linkgit:git-multi-pack-index[1]竊됥��" #. type: Plain text #: en/git-repack.txt:236 #, priority:100 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case." -msgstr "" +msgstr "容섋��끻넻訝뗰펽瑥ε뫝餓ㅴ폏�� 'git pack-objects' 訝�폖�� `--delta-base-offset` �됮」竊쏂퓳�싧만鴉싧��당뵟�먪쉪�경뜮�끿븼弱륅펽鵝녺뵟�먪쉪�경뜮�끺툗�덃쑍 1.4.4 餓δ툓�� Git �덃쑍訝띶끉若밤�귛쫩�쒍퐷��誤곭쎍�ζ닑�싪퓝寧③뇥�� http �뤺�訝롨퓳雅쎾룮�곭쉪 Git �덃쑍�긴벴鵝좂쉪餓볟틩竊뚪궍阿덁퐷��誤곩컛�띸쉰�섌뇧 `repack.UseDeltaBaseOffset` 溫얌맏 \"false\"竊뚨꽫�롩뇥�경돀�끹�귡�싪퓝�у쑑�뤺�溫욥뿮�㎫뎵�х쉪 Git 訝띶룛閭ㅹ�됮」壤긷뱧竊뚦썱訝뷴쑉瓦숂쭕�끻넻訝뗰펽饔ф뜟��졊���誤곩뜵�띈퓵烏뚨쉪��" #. type: Plain text #: en/git-repack.txt:240 #, priority:100 msgid "Delta compression is not used on objects larger than the `core.bigFileThreshold` configuration variable and on files with the attribute `delta` set to false." -msgstr "" +msgstr "野밥틢鸚㏛틢 `core.bigFileThreshold` �띸쉰�섌뇧�꾢�穩▼뭽掠욄�� `delta` 溫양쉰訝� false �꾣뻼餓띰펽訝띴폏鵝욜뵪 Delta �뗧섄��" #. type: Plain text #: en/git-repack.txt:245 @@ -47093,7 +47093,7 @@ msgstr "git-replace(1)" #: en/git-replace.txt:7 #, priority:100 msgid "git-replace - Create, list, delete refs to replace objects" -msgstr "" +msgstr "git-replace - �쎾뻠�곩닓�뷩�곩닠�ㅷ뵪雅롦쎘�℡�穩←쉪凉뺟뵪" #. type: Plain text #: en/git-replace.txt:17 @@ -47117,49 +47117,49 @@ msgstr "" #: en/git-replace.txt:21 #, priority:100 msgid "Adds a 'replace' reference in `refs/replace/` namespace." -msgstr "" +msgstr "�� `refs/replace/` �썲릫令븅뿴訝�렌�� 'replace' 凉뺟뵪��" #. type: Plain text #: en/git-replace.txt:25 #, priority:100 msgid "The name of the 'replace' reference is the SHA-1 of the object that is replaced. The content of the 'replace' reference is the SHA-1 of the replacement object." -msgstr "" +msgstr "'replace' 凉뺟뵪�꾢릫燁경삸熬ユ쎘�℡�穩←쉪 SHA-1 'replace' 凉뺟뵪�꾢냵若방삸熬ユ쎘�℡�穩←쉪 SHA-1 �쇈��" #. type: Plain text #: en/git-replace.txt:28 #, priority:100 msgid "The replaced object and the replacement object must be of the same type. This restriction can be bypassed using `-f`." -msgstr "" +msgstr "熬ユ쎘�℡�穩▼뭽�욘뜟野배괌恙낂』��릪訝�映삣엹�� 鵝욜뵪 `-f` ��빳瀯뺠퓝瓦쇾��먨댍��" #. type: Plain text #: en/git-replace.txt:30 #, priority:100 msgid "Unless `-f` is given, the 'replace' reference must not yet exist." -msgstr "" +msgstr "�ㅹ씆瀯쇿눣 `-f`竊뚦맔�� 'replace' 凉뺟뵪恙낂』訝띶춼�ⓦ��" #. type: Plain text #: en/git-replace.txt:33 #, priority:100 msgid "There is no other restriction on the replaced and replacement objects. Merge commits can be replaced by non-merge commits and vice versa." -msgstr "" +msgstr "熬ユ쎘�℡뭽�욘뜟野배괌亦→쐣�뜸퍟�먨댍�� �덂뭉�먧벡��빳熬ラ씆�덂뭉�먧벡�욘뜟竊뚦룏阿뗤벧�뜰��" #. type: Plain text #: en/git-replace.txt:37 #, priority:100 msgid "Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck)." -msgstr "" +msgstr "�ㅴ틙瓦쏂죱��씨�㏝걤�녺쉪�썰빱竊덂돦�앫�곫돀�낁쉬燁삣뭽 fsck竊됧쨼竊뚧��� Git �썰빱�썲컛容섋�鵝욜뵪�욘뜟凉뺟뵪��" #. type: Plain text #: en/git-replace.txt:40 #, priority:100 msgid "It is possible to disable use of replacement references for any command using the `--no-replace-objects` option just after 'git'." -msgstr "" +msgstr "鵝욜뵪 'git' �롩씊�� `--no-replace-objects` �됮」竊뚦룾餓η쫨閭℡쑉餓삡퐬�썰빱訝�슴�ⓩ쎘�℡폊�ⓦ��" #. type: Plain text #: en/git-replace.txt:42 #, priority:100 msgid "For example if commit 'foo' has been replaced by commit 'bar':" -msgstr "" +msgstr "堊뗥쫩竊뚦쫩�쒏룓雅� 'foo' 藥꿱˙�먧벡 'bar' �뽨빰竊�" #. type: delimited block - #: en/git-replace.txt:45 @@ -47171,7 +47171,7 @@ msgstr "$ git --no-replace-objects cat-file commit foo\n" #: en/git-replace.txt:48 #, priority:100 msgid "shows information about commit 'foo', while:" -msgstr "" +msgstr "�양ㅊ�됧뀽�먧벡 'foo' �꾡에��펽�뚳폏" #. type: delimited block - #: en/git-replace.txt:51 @@ -47183,25 +47183,25 @@ msgstr "$ git cat-file commit foo\n" #: en/git-replace.txt:54 #, priority:100 msgid "shows information about commit 'bar'." -msgstr "" +msgstr "�양ㅊ�됧뀽�먧벡 'bar' �꾡에����" #. type: Plain text #: en/git-replace.txt:57 #, priority:100 msgid "The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the same effect as the `--no-replace-objects` option." -msgstr "" +msgstr "��빳溫양쉰 `GIT_NO_REPLACE_OBJECTS` ��쥊�섌뇧竊뚥빳渦얍댆訝� `--no-replace-objects` �됮」�멨릪�꾣븞�쒌��" #. type: Plain text #: en/git-replace.txt:64 #, priority:100 msgid "If an existing replace ref for the same object exists, it will be overwritten (instead of failing)." -msgstr "" +msgstr "倻귝옖�뚥�野배괌藥꿩쐣訝�訝ゆ쎘�℡폊�⑨펽若껃컛熬ヨ쫮�뽳펷�뚥툖��ㅁ�덌펹��" #. type: Plain text #: en/git-replace.txt:68 #, priority:100 msgid "Delete existing replace refs for the given objects." -msgstr "" +msgstr "�좈솮瀯쇿츣野배괌�꾤렟�됪쎘�℡폊�ⓦ��" #. type: Labeled list #: en/git-replace.txt:69 @@ -47219,7 +47219,7 @@ msgstr "" #: en/git-replace.txt:85 #, priority:100 msgid "When editing, provide the raw object contents rather than pretty-printed ones. Currently this only affects trees, which will be shown in their binary form. This is harder to work with, but can help when repairing a tree that is so corrupted it cannot be pretty-printed. Note that you may need to configure your editor to cleanly read and write binary data." -msgstr "" +msgstr "煐뽬풌�띰펽瑥룡룓堊쎾렅冶뗥�穩▼냵若뱄펽�뚥툖��졏凉뤷뙑�볟뜲�꾢냵若밤�귞쎅�띹퓳�ゅ쉽�띸쎅壤뺞젒竊뚦썱訝븀쎅壤뺞젒弱녵빳雅뚩퓵�뜹숱凉뤸샑鹽뷩�귟퓳驪붻푵�얍쨪�놅펽鵝녶쑉岳�쨳藥꿩뜜�뤷댆�졿퀡�쇔폀�뽪돀�곁쉪��퐬�묉뿶��빳�됪�躍�뒰�귡�誤곫낏�뤹쉪��펽鵝졾룾�썽�誤곩�煐뽬풌�②퓵烏뚪뀓營�펽餓δ씩亮꿨��⑵맼�계��쇾틠瓦쎾댍�경뜮��" #. type: Labeled list #: en/git-replace.txt:86 @@ -47231,7 +47231,7 @@ msgstr "--graft <commit> [<parent>...]" #: en/git-replace.txt:93 #, ignore-ellipsis, priority:100 msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead." -msgstr "" +msgstr "�쎾뻠椰곫렏�먧벡�귝뼭�쎾뻠�꾣룓雅ㅵ냵若밥툗 <�먧벡> �멨릪竊뚦룵��츆�꾤댍�먧벡弱녷삸 [<�뜻룓雅�>...]竊뚩�뚥툖�� <�먧벡> �꾤댍�먧벡�귞꽫�롣폏�쎾뻠訝�訝ゆ쎘�℡폊�⑨펽�ⓩ뼭�쎾뻠�꾣룓雅ㅶ쎘�� <�먧벡>�귚슴�� `--convert-graft-file`竊뚩쉬�� `$GIT_DIR/info/grafts` �뉏뻑亮뜸슴�ⓩ쎘�℡폊�ⓧ빰�욍��" #. type: Labeled list #: en/git-replace.txt:94 @@ -47243,7 +47243,7 @@ msgstr "--convert-graft-file" #: en/git-replace.txt:98 #, priority:100 msgid "Creates graft commits for all entries in `$GIT_DIR/info/grafts` and deletes that file upon success. The purpose is to help users with transitioning off of the now-deprecated graft file." -msgstr "" +msgstr "訝� `$GIT_DIR/info/grafts` 訝�쉪���됪씉��닗兩뷴쳛�ζ룓雅ㅿ펽亮뜹쑉�먨뒣�롥닠�ㅸ��뉏뻑�귞쎅�꾣삸躍�뒰�ⓩ댎餓롧렟藥꿱퓝�띄쉪 graft �뉏뻑瓦뉑륫��" #. type: Labeled list #: en/git-replace.txt:99 @@ -47261,13 +47261,13 @@ msgstr "--list <pattern>" #: en/git-replace.txt:105 #, priority:100 msgid "List replace refs for objects that match the given pattern (or all if no pattern is given). Typing \"git replace\" without arguments, also lists all replace refs." -msgstr "" +msgstr "�쀥눣訝롧퍢若싨Æ凉뤷뙶�띸쉪野배괌�꾣쎘�℡룏弱꾬펷倻귝옖亦→쐣瀯쇿츣與▼폀竊뚦닕�쀥눣���됧�穩∽펹�� 渦볟뀯訝띶를�귝빊�� \"git replace\"竊뚥튋鴉싧닓�뷸��됪쎘�℡룏弱꾠��" #. type: Plain text #: en/git-replace.txt:110 #, priority:100 msgid "When listing, use the specified <format>, which can be one of 'short', 'medium' and 'long'. When omitted, the format defaults to 'short'." -msgstr "" +msgstr "�쀨〃�띰펽鵝욜뵪�뉐츣�� <�쇔폀>竊뚦츆��빳�� 'short'竊덄윮竊됥��'medium'竊덁릎竊됧뭽 'long'竊덆빣竊됪졏凉뤶퉳訝��귛쫩�쒐쐛�ο펽�쇔폀容섋�訝� 'short'竊덄윮竊됥��" #. type: Title - #: en/git-replace.txt:112 @@ -47279,7 +47279,7 @@ msgstr "與▼폀" #: en/git-replace.txt:115 #, priority:100 msgid "The following format are available:" -msgstr "" +msgstr "�먧풘餓δ툔�쇔폀竊�" #. type: Plain text #: en/git-replace.txt:117 @@ -47321,31 +47321,31 @@ msgstr "" #: en/git-replace.txt:124 #, no-wrap, priority:100 msgid "CREATING REPLACEMENT OBJECTS" -msgstr "" +msgstr "�쎾뻠�욘뜟野배괌" #. type: Plain text #: en/git-replace.txt:131 #, priority:100 msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object." -msgstr "" +msgstr "linkgit:git-hash-object[1]�걄inkgit:git-rebase[1]�갿ttps://github.com/newren/git-filter-repo[git-filter-repo] 嶺� git �썰빱��빳�ⓩ씎餓롧렟�됧�穩▼닗兩뷸쎘�℡�穩▲�귝�鸚뽳펽`--edit` �됮」阿잌룾餓δ툗 'git replace' 訝�壅룝슴�⑨펽�싪퓝煐뽬풌�경쐣野배괌�ε닗兩뷸쎘�℡�穩▲��" #. type: Plain text #: en/git-replace.txt:137 #, priority:100 msgid "If you want to replace many blobs, trees or commits that are part of a string of commits, you may just want to create a replacement string of commits and then only replace the commit at the tip of the target string of commits with the commit at the tip of the replacement string of commits." -msgstr "" +msgstr "倻귝옖�ⓩ꺍�욘뜟掠욂틢�먧벡訝꿜��ⓨ늽�꾥�鸚싦틠瓦쎾댍野배괌�곭쎅壤뺞젒�뽪룓雅ㅿ펽�ⓨ룾�썲룵�녑닗兩뷰�訝ゆ쎘�€룓雅ㅴ림竊뚨꽫�롥룵�ⓩ쎘�€룓雅ㅴ림窈띄ク�꾣룓雅ㅶ쎘�®쎅�뉑룓雅ㅴ림窈띄ク�꾣룓雅ㅳ��" #. type: Plain text #: en/git-replace.txt:144 #, priority:100 msgid "Comparing blobs or trees that have been replaced with those that replace them will not work properly. And using `git reset --hard` to go back to a replaced commit will move the branch to the replacement commit instead of the replaced commit." -msgstr "" +msgstr "驪붻푵熬ユ쎘�®쉪雅뚩퓵�뜹�穩→닑��퐬�묇툗�욘뜟若껂뺄�꾡틠瓦쎾댍野배괌�뽫쎅壤뺞젒弱녷뿞力뺞�躍멨램鵝쒌�귚슴�� `git reset --hard` �욃댆熬ユ쎘�®쉪�먧벡竊뚥폏弱녶늽��㎉�ⓨ댆�욘뜟�먧벡竊뚩�뚥툖��˙�욘뜟�꾣룓雅ㅳ��" #. type: Plain text #: en/git-replace.txt:147 #, priority:100 msgid "There may be other problems when using 'git rev-list' related to pending objects." -msgstr "" +msgstr "鵝욜뵪 'git rev-list' �띰펽��꺗鴉싮걞�겻툗孃끻쨪�녶�穩←쎑�녕쉪�뜸퍟��쥦��" #. type: Plain text #: en/git-replace.txt:158 @@ -47364,31 +47364,31 @@ msgstr "git-request-pull(1)" #: en/git-request-pull.txt:7 #, priority:100 msgid "git-request-pull - Generates a summary of pending changes" -msgstr "" +msgstr "git-request-pull - �잍닇孃끻쨪�녷쎍�밭쉪�섋쫨" #. type: Plain text #: en/git-request-pull.txt:12 #, no-wrap, priority:100 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n" -msgstr "" +msgstr "'git request-pull' [-p] <凉�冶�> <URL> [<瀯볠씇>竊�\n" #. type: Plain text #: en/git-request-pull.txt:20 #, priority:100 msgid "Generate a request asking your upstream project to pull changes into their tree. The request, printed to the standard output, begins with the branch description, summarizes the changes and indicates from where they can be pulled." -msgstr "" +msgstr "�잍닇訝�訝よ�黎귨펽誤곫콆鵝좂쉪訝딀만窈밭쎅弱녶룜�닸땳�δ퍟餓х쉪�녷뵱�묆�� 瑥θ�黎귚폏�볟뜲�경젃�녻풏�뷰릎竊뚥빳�녷뵱�뤺염凉�鸚댐펽�사퍜�섉쎍�끻�竊뚦뭉�뉐눣��빳餓롥벆�뚧땳�뽩룜�담��" #. type: Plain text #: en/git-request-pull.txt:25 #, priority:100 msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<URL>`." -msgstr "" +msgstr "訝딀만窈밭쎅窯꾥�鴉싨쐣餓� `<凉�冶�>` �썲릫�꾣룓雅ㅿ펽渦볟눣鴉싪쫨黎귛츆�싪퓝溫욥뿮餓� `<URL>` �썲릫�꾡퍜佯볩펽�닷릦�②눎瑥ζ룓雅ㅵ릮���싩쉪�닸뵻竊뚨쎍�념빳 `<瀯볠씇>` �썲릫�꾣룓雅ㅳ��" #. type: Plain text #: en/git-request-pull.txt:31 #, priority:100 msgid "Include patch text in the output." -msgstr "" +msgstr "�②풏�뷰릎�끻맜烏δ툈�뉑쑍��" #. type: Labeled list #: en/git-request-pull.txt:32 @@ -47400,19 +47400,19 @@ msgstr "<start>" #: en/git-request-pull.txt:35 #, priority:100 msgid "Commit to start at. This names a commit that is already in the upstream history." -msgstr "" +msgstr "餓롦룓雅ㅵ�冶뗣�� 瓦쇿컛�썲릫訝�訝ゅ럴�ⓧ툓歷멨럣�꿜릎�꾣룓雅ㅳ��" #. type: Labeled list #: en/git-request-pull.txt:36 #, no-wrap, priority:100 msgid "<URL>" -msgstr "" +msgstr "<URL>" #. type: Plain text #: en/git-request-pull.txt:38 #, priority:100 msgid "The repository URL to be pulled from." -msgstr "" +msgstr "誤곫룓�뽫쉪餓볟틩 URL��" #. type: Labeled list #: en/git-request-pull.txt:39 @@ -47424,67 +47424,67 @@ msgstr "<end>" #: en/git-request-pull.txt:42 #, priority:100 msgid "Commit to end at (defaults to HEAD). This names the commit at the tip of the history you are asking to be pulled." -msgstr "" +msgstr "�먧벡瀯볠씇雅롳펷容섋�訝� HEAD竊됥�� 瓦쇿컛�썲릫�②쫨黎귝룓�뽫쉪�녶뤁���띷꼬�꾣룓雅ㅳ��" #. type: Plain text #: en/git-request-pull.txt:47 #, priority:100 msgid "When the repository named by `<URL>` has the commit at a tip of a ref that is different from the ref you have locally, you can use the `<local>:<remote>` syntax, to have its local name, a colon `:`, and its remote name." -msgstr "" +msgstr "壤볞빳 `<URL>` �썲릫�꾡퍜佯볡쉪�먧벡鵝띴틢訝롦쑍�겻퍜佯볞툖�뚨쉪凉뺟뵪�꾦《塋�뿶竊뚦룾餓δ슴�� `<�у쑑>:<瓦쒐쮮>` 瑥�퀡竊뚥빳�룟풓�뜻쑍�겼릫燁겹�곩넂�� `:`�뚩퓶葉뗥릫燁겹��" #. type: Plain text #: en/git-request-pull.txt:56 #, priority:100 msgid "Imagine that you built your work on your `master` branch on top of the `v1.0` release, and want it to be integrated to the project. First you push that change to your public repository for others to see:" -msgstr "" +msgstr "�녘괌訝�訝뗰펽�ⓨ쑉 `v1.0` �덃쑍�꾢읃簾�訝듿뻠塋뗤틙�ゅ런�� `master` �녷뵱竊뚦뭉躍뚧쐹弱녶끀�녷닇�곈」��릎�� 腰뽩뀍竊뚥퐷弱녻��섉쎍�③�곩댆�у뀻餓볟틩竊뚥풘�뜸퍟雅뷸윥�뗰폏" #. type: Plain text #: en/git-request-pull.txt:58 #, no-wrap, priority:100 msgid "\tgit push https://git.ko.xz/project master\n" -msgstr "" +msgstr "\tgit push https://git.ko.xz/project master\n" #. type: Plain text #: en/git-request-pull.txt:60 #, priority:100 msgid "Then, you run this command:" -msgstr "" +msgstr "�뜹릮竊뚩퓧烏뚩퓳�▼뫝餓ㅿ폏" #. type: Plain text #: en/git-request-pull.txt:62 #, no-wrap, priority:100 msgid "\tgit request-pull v1.0 https://git.ko.xz/project master\n" -msgstr "" +msgstr "\tgit request-pull v1.0 https://git.ko.xz/project master\n" #. type: Plain text #: en/git-request-pull.txt:66 #, priority:100 msgid "which will produce a request to the upstream, summarizing the changes between the `v1.0` release and your `master`, to pull it from your public repository." -msgstr "" +msgstr "鴉싧릲訝딀만�묈눣瑥룡콆竊뚧�사퍜餓� `v1.0` �덃쑍�경궓�� `master` �덃쑍阿뗩뿴�꾢룜�뽳펽餓δ씩餓롦궓�꾢뀶�긴퍜佯볞릎�먨룚��" #. type: Plain text #: en/git-request-pull.txt:69 #, priority:100 msgid "If you pushed your change to a branch whose name is different from the one you have locally, e.g." -msgstr "" +msgstr "倻귝옖�ⓨ컛�닸뵻�③�곩댆�꾢늽��릫燁겻툗�у쑑�녷뵱訝띶릪竊뚥풃倻�" #. type: Plain text #: en/git-request-pull.txt:71 #, no-wrap, priority:100 msgid "\tgit push https://git.ko.xz/project master:for-linus\n" -msgstr "" +msgstr "\tgit push https://git.ko.xz/project master:for-linus\n" #. type: Plain text #: en/git-request-pull.txt:73 #, priority:100 msgid "then you can ask that to be pulled with" -msgstr "" +msgstr "�뜹릮竊뚧궓��빳��" #. type: Plain text #: en/git-request-pull.txt:75 #, no-wrap, priority:100 msgid "\tgit request-pull v1.0 https://git.ko.xz/project master:for-linus\n" -msgstr "" +msgstr "\tgit request-pull v1.0 https://git.ko.xz/project master:for-linus\n" #. type: Title = #: en/git-rerere.txt:2 @@ -47508,61 +47508,61 @@ msgstr "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'g #: en/git-rerere.txt:20 #, priority:100 msgid "In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the \"release\" branch, or sent out and accepted upstream)." -msgstr "" +msgstr "�③뇞�①쎑野배푵�욜쉪�방�㎩늽��쉪藥δ퐳役곭쮮訝�펽凉��묇볶�섉쐣�띌�誤곩룏鸚띹㎗�녕쎑�뚨쉪�꿰챳竊뚨쎍�곁돶�㎩늽��츑�먲펷誤곦퉰�덂뭉�� �쒎룕躍꺿�� �녷뵱竊뚩쫨阿덂룕�곩댆訝딀만亮띈˙�ε룛竊됥��" #. type: Plain text #: en/git-rerere.txt:25 #, priority:100 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results." -msgstr "" +msgstr "�ⓩ�瓦뉒쮮訝�펽瑥ε뫝餓ㅹ�싪퓝溫겼퐬�꿰챳�꾥눎�ⓨ릦亮띄퍜�쒎뭽�앭쭓�뗥뒯�덂뭉�꾤쎑佯붹뎸藥θ㎗�먪퍜�쒙펽亮뜹컛�덂뎺溫겼퐬�꾣뎸藥θ㎗�먪퍜�쒎틪�ⓧ틢�멨틪�꾥눎�ⓨ릦亮띄퍜�쒙펽�ε리�⒴��묇볶�섅��" #. type: Plain text #: en/git-rerere.txt:29 #, priority:100 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command." -msgstr "" +msgstr "�③�誤곮�營�뀓營�룜�� `rerere.enabled` �띹꺗��뵪瑥ε뫝餓ㅳ��" #. type: Plain text #: en/git-rerere.txt:37 #, priority:100 msgid "Normally, 'git rerere' is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state." -msgstr "" +msgstr "�싧만竊�'git rerere' �꾥퓧烏뚥툖��誤곩뢿�경닑�ⓩ댎亮꿴쥋�� 訝띹퓝竊뚦츆�됧뇿�▼뫝餓ㅵ뀅溫멨츆訝롥램鵝쒐듁�곦벡雅믡��" #. type: Labeled list #: en/git-rerere.txt:38 #, no-wrap, priority:100 msgid "'clear'" -msgstr "" +msgstr "'clear'竊덃툍�ㅿ펹" #. type: Plain text #: en/git-rerere.txt:43 #, priority:100 msgid "Reset the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command." -msgstr "" +msgstr "倻귝옖誤곦릎閭℡릦亮띈㎗�먲펽�띸쉰 rerere 鵝욜뵪�꾢뀇�경뜮�� 瘟껆뵪 'git am [--skip|--abort]' �� 'git rebase [--skip|--abort]' 鴉싪눎�②컘�ⓩ��썰빱��" #. type: Labeled list #: en/git-rerere.txt:44 #, no-wrap, priority:100 msgid "'forget' <pathspec>" -msgstr "" +msgstr "'forget' <瓮�푶鰲꾥똽>" #. type: Plain text #: en/git-rerere.txt:48 #, priority:100 msgid "Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>." -msgstr "" +msgstr "�띸쉰 rerere �� <瓮�푶鰲꾥똽> 訝��壤뺟쉪壤볟뎺�꿰챳�꾢넳囹곩넶溫���" #. type: Labeled list #: en/git-rerere.txt:49 #, no-wrap, priority:100 msgid "'diff'" -msgstr "" +msgstr "'diff'" #. type: Plain text #: en/git-rerere.txt:55 #, priority:100 msgid "Display diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system 'diff' command installed in PATH." -msgstr "" +msgstr "�양ㅊ壤볟뎺�꿰챳鰲e넶�뜻�곭쉪藥�펰�� 瓦쇿�雅롨퇎甕ょ뵪�룟쑉鰲e넶�꿰챳�뜹룕�잋틙�や틳�섇뙑�욃만�됬뵪�� �꾢뒥�귝빊鴉싩쎍�δ폖�믥퍢若됭즳�� PATH 訝�쉪楹사퍨 'diff' �썰빱��" #. type: Labeled list #: en/git-rerere.txt:56 @@ -47574,19 +47574,19 @@ msgstr "'status'" #: en/git-rerere.txt:59 #, priority:100 msgid "Print paths with conflicts whose merge resolution rerere will record." -msgstr "" +msgstr "�볟뜲�됧넳囹곭쉪瓮�푶竊똱erere 弱녻�壤뺝끀�덂뭉鰲e넶�방죭��" #. type: Labeled list #: en/git-rerere.txt:60 #, no-wrap, priority:100 msgid "'remaining'" -msgstr "" +msgstr "'remaining'" #. type: Plain text #: en/git-rerere.txt:65 #, priority:100 msgid "Print paths with conflicts that have not been autoresolved by rerere. This includes paths whose resolutions cannot be tracked by rerere, such as conflicting submodules." -msgstr "" +msgstr "�볟뜲 rerere 弱싨쑋�ゅ뒯鰲e넶�꿰챳�꾥러孃꾠�� 瓦쇿똿�� rerere �졿퀡瓮잒릉�띈㎗�녕쉪瓮�푶竊뚦쫩�꿰챳�꾢춴與▼쓼��" #. type: Labeled list #: en/git-rerere.txt:66 en/git-svn.txt:511 @@ -47598,13 +47598,13 @@ msgstr "'gc'" #: en/git-rerere.txt:74 #, priority:100 msgid "Prune records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the `gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively." -msgstr "" +msgstr "岳�돦孃덁퉭餓ε뎺�묊뵟�꾢넳囹곩릦亮띈�壤뺛�� 容섋��끻넻訝뗰펽擁낁퓝 15 鸚⑴쉪�よ㎗�녑넳囹곩뭽擁낁퓝 60 鸚⑴쉪藥꿱㎗�녑넳囹곦폏熬ュ돦�ㅳ�� 瓦쇾틳容섋��쇔늽�ョ뵳 `gc.rerereUnresolved` �� `gc.rerereResolved` �띸쉰�섌뇧�㎩댍��" #. type: Plain text #: en/git-rerere.txt:83 #, priority:100 msgid "When your topic branch modifies an overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:" -msgstr "" +msgstr "壤볞퐷�꾤돶�㎩늽��엶�밥틙訝삣늽��펷�뽨툓歷멨늽��펹餓롧돶�㎩늽��늽�됧눣�ε릮�θ㏄瓦뉒쉪�띶룧�뷴윜�띰펽鵝졾룾�썸꺍�ⓩ��곁쉪訝삣늽��퓵烏뚧탩瑥뺧펽�싪눛�①돶�㎩늽��뇛鸚뉐��③�곩댆訝딀만阿뗥뎺竊�" #. type: delimited block - #: en/git-rerere.txt:88 @@ -47622,7 +47622,7 @@ msgstr "" #: en/git-rerere.txt:92 #, priority:100 msgid "For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:" -msgstr "" +msgstr "誤곮퓵烏뚩퓳�루쉪役뗨캊竊뚪�誤곦빳�먪쭕�밧폀�덂뭉訝삣늽��뭽�방�㎩늽���� 訝�燁띷뼶力뺞삸弱녵말�녷뵱�됧뀯�방�㎩늽��폏" #. type: delimited block - #: en/git-rerere.txt:96 @@ -47650,13 +47650,13 @@ msgstr "" #: en/git-rerere.txt:106 #, priority:100 msgid "The commits marked with `*` touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with `+`. Then you can test the result to make sure your work-in-progress still works with what is in the latest master." -msgstr "" +msgstr "�뉑쐣 `*` �꾣룓雅ㅶ텎�듿릪訝��뉏뻑訝�쉪�뚥��뷴윜竊쎿궓��誤곩쑉�쎾뻠�뉑쐣 `+` �꾣룓雅ㅶ뿶鰲e넶�꿰챳�� �뜹릮竊뚧궓弱긷룾餓ζ탩瑥뺟퍜�쒙펽餓η‘岳앮궓閭e쑉瓦쏂죱�꾢램鵝쒍퍖�썰툗���곁쉪 master 訝�쉪�끻�訝�壅룩퓧烏뚣��" #. type: Plain text #: en/git-rerere.txt:114 #, priority:100 msgid "After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit `+`, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this:" -msgstr "" +msgstr "役뗨캊�덂뭉�롳펽�됦륵燁띷뼶力뺝룾餓η빵瀯�말窯섇램鵝쒌�� ��嶸��뺟쉪�방퀡��뻠塋뗥쑉役뗨캊�덂뭉�먧벡 `+` 阿뗤툓竊뚦퐪鵝졾쑉�방�㎩늽��릎�꾢램鵝쒏�瀯덂뇛鸚뉐갚瀯ゆ뿶竊뚦컛�방�㎩늽��땳�δ말�녷뵱竊뚦뭽/�뽬�黎귚툓歷멧퍗鵝좈궍�뚧땳�뽧�� 訝띹퓝竊뚦댆�f뿶竊뚥말�녷뵱�뽨툓歷멨늽��룾�썲럴瀯뤷쑉役뗨캊�덂뭉 `+` �롦룓�띴틙竊뚦쑉瓦숂쭕�끻넻訝뗰펽��瀯덄쉪�먧벡�얌폏��퓳�루쉪竊�" #. type: delimited block - #: en/git-rerere.txt:121 @@ -47667,7 +47667,7 @@ msgid "" "\t$ ... work on both topic and master branches\n" "\t$ git switch master\n" "\t$ git merge topic\n" -msgstr "" +msgstr "\t$ git switch topic\n\t$ git merge master\n\t$ ... work on both topic and master branches\n\t$ git switch master\n\t$ git merge topic\n" #. type: delimited block - #: en/git-rerere.txt:125 @@ -47685,13 +47685,13 @@ msgstr "" #: en/git-rerere.txt:133 #, priority:100 msgid "When your topic branch is long-lived, however, your topic branch would end up having many such \"Merge from master\" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem maintainer asked to pull from a branch full of \"useless merges\"." -msgstr "" +msgstr "�띈�뚳펽壤볞퐷�꾤돶�㎩늽����썲푽�욘뿶竊뚥퐷�꾤돶�㎩늽��툓弱긴폏�됧푽鸚싪퓳�루쉪 �쒍퍗訝삣늽��릦亮뜯�� �먧벡竊뚩퓳弱녵툖恙낁쫨�경돭阿긷��묈럣�꿔�� Linux �끾졇��뻑�쀨〃�꾥��끻룾�썼퓲溫겼풓竊뚦퐪訝�訝ゅ춴楹사퍨瀯닸뒪�낁쫨黎귚퍗訝�訝ゅ뀉譯� �쒏뿞�ⓨ릦亮뜯�� �꾢늽��릎�됧룚餓g쟻�띰펽Linus �길�②퓝瓦숂쭕瓦뉏틢窯묊퉩�꾣탩瑥뺝릦亮뜰��" #. type: Plain text #: en/git-rerere.txt:137 #, priority:100 msgid "As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:" -msgstr "" +msgstr "鵝쒍맏訝�燁띷쎘餓f뼶力뺧펽訝뷰틙鵝요말窯섇늽��툖�쀦탩瑥뺝릦亮띄쉪壤긷뱧竊뚦룾餓ε닠�ㅶ탩瑥뺝릦亮띰펽亮뜹쑉役뗨캊�덂뭉阿뗥뎺瀯㎫뺌�ⓩ룓鹽뷰퉳訝딀엫兩븝폏" #. type: delimited block - #: en/git-rerere.txt:145 @@ -47727,37 +47727,37 @@ msgstr "" #: en/git-rerere.txt:159 #, priority:100 msgid "This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with `*`. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. 'git rerere' helps you resolve this final conflicted merge using the information from your earlier hand resolve." -msgstr "" +msgstr "瓦숁졆竊뚦퐪鵝좂쉪�방�㎩늽���瀯덂뇛鸚뉐갚瀯ゅ뭉�덂뭉�겻말�녷뵱�띰펽弱긷룵�⒳툔訝�訝ゅ릦亮뜻룓雅ㅴ틙�� 瓦숁А�덂뭉��誤곮㎗�녔젃�� `*` �꾣룓雅ㅶ�躍�씎�꾢넳囹곥�� �띈�뚳펽瓦쇾릉�꿰챳孃�孃�弱길삸鵝졾쑉�쎾뻠役뗨캊�덂뭉�띈㎗�녕쉪�꿰챳�� 'git rerere' ��빳躍�뒰鵝졽슴�ⓧ퉳�띷뎸藥θ㎗�녕쉪岳→겘�θ㎗�녔�瀯덄쉪�꿰챳�덂뭉��" #. type: Plain text #: en/git-rerere.txt:167 #, priority:100 msgid "Running the 'git rerere' command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done resolving the conflicts, running 'git rerere' again will record the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch." -msgstr "" +msgstr "�②눎�ⓨ릦�먨넳囹곩릮塋뗥뜵瓦먫죱 'git rerere' �썰빱竊뚥폏溫겼퐬訝뗥넳囹곭쉪藥δ퐳�묉뻼餓띰펽亮뜹쑉�뜸릎�졽툓�싧만�꾢넳囹곫젃溫�`<<<<<<<`��`=======` �� `>>>>>>>`�� 葉띶릮竊뚦퐪鵝좄㎗�녑츑�꿰챳�롳펽�띷А瓦먫죱 'git rerere' 弱긴폏溫겼퐬訝뗨퓳雅쎿뻼餓뜹럴鰲e넶�꾤듁�곥�� �뉓�鵝졾쑉�쎾뻠弱� master �덂뭉�겻말窯섇늽��쉪役뗨캊�뜹걳雅녻퓳訝ゆ뱧鵝쒌��" #. type: Plain text #: en/git-rerere.txt:177 #, priority:100 msgid "Next time, after seeing the same conflicted automerge, running 'git rerere' will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually resolve it. Note that 'git rerere' leaves the index file alone, so you still need to do the final sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are satisfied." -msgstr "" +msgstr "訝뗤�轝∽펽�①쐦�곁쎑�뚨쉪�ゅ뒯�잍닇�ⓨ넳囹곩릮竊뚩퓧烏� 'git rerere' 弱녶쑉阿뗥뎺�꾥눎�①뵟�먨솳�꿰챳�곦퉳�띸쉪�뗥뒯鰲e넶�뚦퐪�띸쉪�ゅ뒯�잍닇�ⓨ넳囹곦퉳�닸돢烏뚥�轝▽툒�묈릦亮뜰�� 倻귝옖瓦숁А訝됪뼶�덂뭉鰲e넶孃쀥푽亮꿨�竊뚨퍜�쒎갚鴉싧넍�ε램鵝쒎뙷�꾣뻼餓뜸릎竊뚦썱閭ㅴ퐷弱긴툖恙끻냽�뗥뒯鰲e넶雅녴�� 瑥룡낏�륅펽'git rerere' 訝띴폏壤긷뱧榮℡폊�뉏뻑竊뚦썱閭ㅶ궓餓띺�誤곦슴�� `git diff`竊덃닑 `git diff -c`竊됧뭽 `git add` 瓦쏂죱���롧쉪閭g‘�㎪��γ��" #. type: Plain text #: en/git-rerere.txt:185 #, priority:100 msgid "As a convenience measure, 'git merge' automatically invokes 'git rerere' upon exiting with a failed automerge and 'git rerere' records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not. 'git commit' also invokes 'git rerere' when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable)." -msgstr "" +msgstr "訝뷰틙�밥씩壅룩쭅竊�'git merge' 鴉싧쑉�ゅ뒯�덂뭉鸚김뇰���뷸뿶�ゅ뒯瘟껆뵪 'git rerere'竊뚦쫩�쒏삸�곁쉪�꿰챳竊�'git rerere' 鴉싪�壤뺞뎸藥θ㎗�먲펽倻귝옖訝띷삸竊뚦닕�띸뵪阿뗥뎺�꾣뎸藥θ㎗�먦�� �ⓩ룓雅ㅵ릦亮띄퍜�쒏뿶竊�'git commit' 阿잋폏瘟껆뵪 'git rerere' �� 瓦숁꼷�녕�竊뚪솮雅녶맦�� rerere.enabled �띸쉰�섌뇧鸚뽳펽鵝졿뿞���싦뻣鵝뺟돶�ョ쉪雅뗦깄��" #. type: Plain text #: en/git-rerere.txt:190 #, priority:100 msgid "In our example, when you do the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable." -msgstr "" +msgstr "�ⓩ닊餓х쉪鹽뷰풃訝�펽壤볞퐷瓦쏂죱役뗨캊�덂뭉�띰펽�뗥뒯鰲e넶�방퀡鴉싪˙溫겼퐬訝뗦씎竊뚦룵誤곮�壤뺜툔�η쉪鰲e넶�방퀡餓띸꽫�귞뵪竊뚦갚鴉싧쑉葉띶릮訝롦쎍�곁쉪訝삣늽��뭽訝삯쥦�녷뵱瓦쏂죱若욇솀�덂뭉�띌뇥鸚띴슴�ⓦ��" #. type: Plain text #: en/git-rerere.txt:194 #, priority:100 msgid "The information 'git rerere' records is also used when running 'git rebase'. After blowing away the test merge and continuing development on the topic branch:" -msgstr "" +msgstr "'git rerere' 溫겼퐬�꾡에��튋鴉싧쑉瓦먫죱 'git rebase' �뜸슴�ⓦ�� 弱녷탩瑥뺝릦亮뜹릮竊뚨빵瀯�쑉訝삯쥦�녷뵱訝딂퓵烏뚦��묕폏" #. type: delimited block - #: en/git-rerere.txt:199 @@ -47793,7 +47793,7 @@ msgstr "" #: en/git-rerere.txt:213 #, priority:100 msgid "you could run `git rebase master topic`, to bring yourself up to date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. 'git rerere' will be run by 'git rebase' to help you resolve this conflict." -msgstr "" +msgstr "�ⓨ룾餓θ퓧烏� `git rebase master topic`竊뚦쑉�①쉪訝삯쥦�녶쨭也썼˙�묌�곩댆訝딀만阿뗥뎺�닸뼭�ゅ런�� 瓦쇿컛野쇠눜���욃댆訝됪뼶�덂뭉竊뚩�뚥툝鴉싧뭽阿뗥뎺�꾣탩瑥뺝릦亮뜸벨�잌넳囹곥�� ' git rebase' 鴉싪퓧烏� 'git rerere' �ε리鵝좄㎗�녘퓳訝ゅ넳囹곥��" #. type: Plain text #: en/git-rerere.txt:219 @@ -48941,7 +48941,7 @@ msgstr "git-revert(1)" #: en/git-revert.txt:7 #, priority:100 msgid "git-revert - Revert some existing commits" -msgstr "" +msgstr "git-revert - 瓦섇렅�먧틳�경쐣�먧벡" #. type: Plain text #: en/git-revert.txt:13 @@ -48957,31 +48957,31 @@ msgstr "" #: en/git-revert.txt:21 #, priority:100 msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)." -msgstr "" +msgstr "瀯쇿츣訝�訝ゆ닑鸚싦릉�경쐣�먧벡竊뚩퓲�잏쎑�녘‥訝곩폊�η쉪�닸뵻竊뚦뭉溫겼퐬訝�雅쎿뼭�먧벡�θ�壤뺠퓳雅쎿쎍�밤�� 瓦숃쫨黎귚퐷�꾢램鵝쒎뙷��묾���꾬펷亦→쐣野� HEAD �먧벡�꾡엶�뱄펹��" #. type: Plain text #: en/git-revert.txt:30 #, priority:100 msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-restore[1], specifically the `--source` option. Take care with these alternatives as both will discard uncommitted changes in your working directory." -msgstr "" +msgstr "力ⓩ꼷竊�'git revert' �ⓧ틢溫겼퐬訝�雅쎿뼭�꾣룓雅ㅿ펽餓ζ돪饔у뀍�띷룓雅ㅿ펷�싧만�ゆ삸�숃��꾣룓雅ㅿ펹�꾢쉽�띲�� 倻귝옖�ⓩ꺍訝℡펱藥δ퐳��퐬訝���됪쑋�먧벡�꾣뵻�⑨펽瑥룟뢿�� linkgit:git-reset[1]竊뚦갇�뜻삸 `--hard` �됮」�� 倻귝옖鵝졿꺍�먨룚�뜸퍟�먧벡訝�쉪�밧츣�뉏뻑竊뚩��귡쁾 linkgit:git-restore[1]竊뚦갇�뜻삸 `--source`�됮」�귚슴�②퓳雅쏃�됮」�띈쫨弱뤷퓘竊뚦썱訝뷴츆餓ч꺗鴉싦륭凉껃램鵝쒐쎅壤뺜릎�ゆ룓雅ㅷ쉪�밧뒯��" #. type: Plain text #: en/git-revert.txt:43 #, priority:100 msgid "Commits to revert. For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option." -msgstr "" +msgstr "誤곮퓲�잏쉪�먧벡�� �닷츑�당쉪�먧벡�띷떬�숁뼶凉륅펽瑥룟뢿鰲� linkgit:gitrevisions[7]�� 阿잌룾餓η퍢�뷸룓雅ㅹ썓竊뚥퐜容섋��끻넻訝뗤툖瓦쏂죱�띶럣竊뚦뢿鰲� linkgit:git-rev-list[1] �듿끀 `--no-walk`�됮」��" #. type: Plain text #: en/git-revert.txt:49 #, priority:100 msgid "With this option, 'git revert' will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal." -msgstr "" +msgstr "�됦틙瓦쇾릉�됮」竊�'git revert' 鴉싪�鵝졾쑉�먧벡阿뗥뎺煐뽬풌�먧벡岳→겘�귛쫩�쒍퍗瀯덄ク瓦먫죱瑥ε뫝餓ㅿ펽容섋��끻넻訝뗤튋��쫩閭ㅳ��" #. type: Labeled list #: en/git-revert.txt:50 #, no-wrap, priority:100 msgid "-m parent-number" -msgstr "" +msgstr "-m �띄폋��" #. type: Labeled list #: en/git-revert.txt:51 @@ -48993,37 +48993,37 @@ msgstr "--mainline parent-number" #: en/git-revert.txt:57 #, priority:100 msgid "Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent." -msgstr "" +msgstr "�싧만�끻넻訝뗰펽�긴틢訝띸윥�볟릦亮띄쉪�や��밧틪熬ヨ쭍訝뷰말瀛울펽�졿��졿퀡瓦섇렅�덂뭉�� 瑥ι�됮」�뉐츣雅녵말瀛욜쉪�띄봇煐뽩뤇竊덁퍗 1 凉�冶뗰펹竊뚦뀅溫멱퓲�잍뙁餓ㅷ쎑野밥틢�뉐츣�꾤댍瀛욕룏�묉쎍�밤��" #. type: Plain text #: en/git-revert.txt:62 #, priority:100 msgid "Reverting a merge commit declares that you will never want the tree changes brought in by the merge. As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge. This may or may not be what you want." -msgstr "" +msgstr "瓦섇렅�덂뭉�먧벡弱길꼷�녕�鵝졿갭瓦쒍툖��誤곩릦亮뜹를�η쉪��퐬�묈룜�뽧�� �졿�竊뚥빳�롧쉪�덂뭉�や폏凉뺝뀯��퐬�묈룜�뽳펽�뚩퓳雅쎾룜�뽨툖��뵳�덂뎺藥꿱퓲�잌릦亮띄쉪曄뽩뀍�먧벡凉뺝뀯�꾠�� 瓦쇿룾�썸삸鵝졿꺍誤곭쉪竊뚥튋��꺗訝띷삸��" #. type: Plain text #: en/git-revert.txt:65 #, priority:100 msgid "See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for more details." -msgstr "" +msgstr "�닷쩀瑥�깄竊뚩��귡쁾 link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge 倻귚퐬�띴퐳]��" #. type: Plain text #: en/git-revert.txt:69 #, priority:100 msgid "With this option, 'git revert' will not start the commit message editor." -msgstr "" +msgstr "鵝욜뵪瑥ι�됮」�롳펽'git revert' 弱녵툖鴉싧맦�ⓩ룓雅ㅴ에��폋渦묈솳��" #. type: Plain text #: en/git-revert.txt:87 #, priority:100 msgid "Usually the command automatically creates some commits with commit log messages stating which commits were reverted. This flag applies the changes necessary to revert the named commits to your working tree and the index, but does not make the commits. In addition, when this option is used, your index does not have to match the HEAD commit. The revert is done against the beginning state of your index." -msgstr "" +msgstr "�싧만竊뚩��썰빱鴉싪눎�ⓨ닗兩뷰�雅쎿룓雅ㅿ펽亮뜹쑉�먧벡�ε퓱岳→겘訝���롥벆雅쎿룓雅ㅸ˙瓦섇렅�� 瑥ζ젃溫겻폏野밧램鵝쒎뙷�뚨뇨凉뺠퓵烏뚦퓚誤곭쉪岳�뵻竊뚥빳瓦섇렅�뉐츣�꾣룓雅ㅿ펽鵝녵툖鴉싪퓵烏뚧룓雅ㅳ�� 閭ㅵ쨼竊뚥슴�②��됮」�띰펽榮℡폊訝띶퓚訝� HEAD �먧벡�멨뙶�띲�� 瓦섇렅��뭹野밭뇨凉뺟쉪壅룟쭓�뜻�곮퓵烏뚨쉪��" #. type: Plain text #: en/git-revert.txt:90 #, priority:100 msgid "This is useful when reverting more than one commits' effect to your index in a row." -msgstr "" +msgstr "瓦쇿쑉瓦욅뺌�℡쨳鸚싦릉�먧벡野밭뇨凉뺟쉪壤긷뱧�띌씆躍멩쐣�ⓦ��" #. type: Labeled list #: en/git-revert.txt:117 @@ -49035,31 +49035,31 @@ msgstr "--reference" #: en/git-revert.txt:124 #, priority:100 msgid "Instead of starting the body of the log message with \"This reverts <full object name of the commit being reverted>.\", refer to the commit using \"--pretty=reference\" format (cf. linkgit:git-log[1]). The `revert.reference` configuration variable can be used to enable this option by default." -msgstr "" +msgstr "�뚥툖��빳 �쒍퍟瓦섇렅雅� <若뚧빐�꾣룓雅ㅵ�穩▼릫燁�>�귘�� 鵝쒍맏�ε퓱岳→겘�꾢�鸚댐펽�뚧삸鵝욜뵪 \"--pretty=reference\" �쇔폀�ε폊�ⓩ룓雅ㅿ펷�귟쭅 linkgit:git-log[1]竊됥�� `revert.reference` �띸쉰�섌뇧��뵪雅롩퍡溫ㅵ맦�ⓩ��됮」��" #. type: Labeled list #: en/git-revert.txt:132 #, no-wrap, priority:100 msgid "`git revert HEAD~3`" -msgstr "" +msgstr "`git revert HEAD~3`" #. type: Plain text #: en/git-revert.txt:136 #, priority:100 msgid "Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes." -msgstr "" +msgstr "瓦섇렅 HEAD 訝��믤빊寧у썪訝ゆ룓雅ㅶ뙁若싩쉪�닸뵻竊뚦뭉�쎾뻠訝�訝ゅ똿�ヨ퓲�잍쎍�밭쉪�경룓雅ㅳ��" #. type: Labeled list #: en/git-revert.txt:137 #, no-wrap, priority:100 msgid "`git revert -n master~5..master~2`" -msgstr "" +msgstr "`git revert -n master~5..master~2`" #. type: Plain text #: en/git-revert.txt:144 #, priority:100 msgid "Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but do not create any commit with the reverted changes. The revert only modifies the working tree and the index." -msgstr "" +msgstr "弱� master 訝��믤빊寧т틪轝→룓雅ㅿ펷�끻맜竊됧댆 master 訝��믤빊寧т툒轝→룓雅ㅿ펷�끻맜竊됬쉪�밧뒯瓦섇렅竊뚥퐜訝띶닗兩뷰뻣鵝뺝똿�ヨ퓲�잍뵻�①쉪�먧벡�귟퓲�잌룵鴉싦엶�밧램鵝쒎뙷�뚨뇨凉뺛��" #. type: Title = #: en/git-rev-list.txt:2 @@ -50453,49 +50453,49 @@ msgid "" "'git send-email' [<options>] <file|directory>...\n" "'git send-email' [<options>] <format-patch options>\n" "'git send-email' --dump-aliases\n" -msgstr "" +msgstr "'git send-email' [<�됮」>] <�뉏뻑�뽪삸��퐬>...\ngit send-email' [<�됮」>] <�쇔폀烏δ툈�됮」>\ngit send-email' --dump-aliases\n" #. type: Plain text #: en/git-send-email.txt:25 #, priority:100 msgid "Takes the patches given on the command line and emails them out. Patches can be specified as files, directories (which will send all files in the directory), or directly as a revision list. In the last case, any format accepted by linkgit:git-format-patch[1] can be passed to git send-email, as well as options understood by linkgit:git-format-patch[1]." -msgstr "" +msgstr "�룟룚�썰빱烏뚥릎瀯쇿눣�꾥‥訝곩뭉弱녶끀�묌�곩눣�삠�� 烏δ툈��빳�뉐츣訝뷸뻼餓뜰�곭쎅壤뺧펷弱녶룕�곭쎅壤뺜릎�꾣��됪뻼餓띰펹竊뚧닑�닸렏�뉐츣訝뷰엶溫℡닓烏ⓦ�� �ⓩ��롣�燁띷깄�듕툔竊똪inkgit:git-format-patch[1] �ε룛�꾡뻣鵝뺞졏凉륅펽餓ε룋 linkgit:git-format-patch[1] ��빳�녻㎗�꾦�됮」竊뚪꺗��빳鴉좈�믥퍢 git send-email��" #. type: Plain text #: en/git-send-email.txt:29 #, priority:100 msgid "The header of the email is configurable via command-line options. If not specified on the command line, the user will be prompted with a ReadLine enabled interface to provide the necessary information." -msgstr "" +msgstr "�드춴��뻑�꾣젃窯섇룾�싪퓝�썰빱烏뚪�됮」瓦쏂죱�띸쉰�� 倻귝옖�ゅ쑉�썰빱烏뚥릎�뉐츣竊뚨내瀯잌컛�ⓨ맦�②��뽬죱�꾤븣�㏘툓�먪ㅊ�ⓩ댎�먧풘恙낁쫨�꾡에����" #. type: Plain text #: en/git-send-email.txt:31 #, priority:100 msgid "There are two formats accepted for patch files:" -msgstr "" +msgstr "烏δ툈�뉏뻑�됦륵燁띷졏凉륅폏" #. type: Plain text #: en/git-send-email.txt:33 #, priority:100 msgid "mbox format files" -msgstr "" +msgstr "mbox �쇔폀�뉏뻑" #. type: Plain text #: en/git-send-email.txt:36 #, priority:100 msgid "This is what linkgit:git-format-patch[1] generates. Most headers and MIME formatting are ignored." -msgstr "" +msgstr "瓦쇿갚�� linkgit:git-format-patch[1] �잍닇�꾢냵若밤�� 鸚㏝깿�녶ㅄ�뉏뻑�� MIME �쇔폀�썰폏熬ュ옙�γ��" #. type: Plain text #: en/git-send-email.txt:39 #, priority:100 msgid "The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' script" -msgstr "" +msgstr "Greg Kroah-Hartman �� 'send_lots_of_email.pl' �싨쑍鵝욜뵪�꾢렅冶뗦졏凉�" #. type: Plain text #: en/git-send-email.txt:42 #, priority:100 msgid "This format expects the first line of the file to contain the \"Cc:\" value and the \"Subject:\" of the message as the second line." -msgstr "" +msgstr "瓦숂쭕�쇔폀躍뚧쐹�뉏뻑�꾤К訝�烏뚦똿�� \"Cc:\"竊덃뒆�곻펹�쇽펽寧т틠烏뚦똿�ラ궙餓띄쉪 \"訝삯쥦竊�\"��" #. type: Title ~ #: en/git-send-email.txt:48 @@ -50513,7 +50513,7 @@ msgstr "--annotate" #: en/git-send-email.txt:54 #, priority:100 msgid "Review and edit each patch you're about to send. Default is the value of `sendemail.annotate`. See the CONFIGURATION section for `sendemail.multiEdit`." -msgstr "" +msgstr "若→졇亮띄폋渦묉궓�녑컛�묌�곭쉪驪뤶릉烏δ툈�귡퍡溫ㅴ맏 `sendemail.annotate` �꾢�쇈�귝쐣�� `sendemail.multiEdit` 瑥룟뢿�낂뀓營�깿�녴��" #. type: Labeled list #: en/git-send-email.txt:55 @@ -50525,13 +50525,13 @@ msgstr "--bcc=<address>,..." #: en/git-send-email.txt:58 #, priority:100 msgid "Specify a \"Bcc:\" value for each email. Default is the value of `sendemail.bcc`." -msgstr "" +msgstr "訝뷸캀弱곭뵷耶먬궙餓뜻뙁若싦�訝� \"Bcc竊�\"竊덂칳�곻펹�쇈�귡퍡溫ㅴ맏 `sendemail.bcc` �꾢�쇈��" #. type: Plain text #: en/git-send-email.txt:60 en/git-send-email.txt:66 en/git-send-email.txt:128 #, priority:100 msgid "This option may be specified multiple times." -msgstr "" +msgstr "瑥ι�됮」��뙁若싧쩀轝▲��" #. type: Labeled list #: en/git-send-email.txt:61 @@ -50543,7 +50543,7 @@ msgstr "--cc=<address>,..." #: en/git-send-email.txt:64 #, priority:100 msgid "Specify a starting \"Cc:\" value for each email. Default is the value of `sendemail.cc`." -msgstr "" +msgstr "訝뷸캀弱곭뵷耶먬궙餓뜻뙁若싦�訝よ돈冶� \"Cc竊�\"竊덃뒆�곻펹�쇈�� 容섋��쇌맏 `sendemail.cc`��" #. type: Labeled list #: en/git-send-email.txt:67 @@ -50555,25 +50555,25 @@ msgstr "--compose" #: en/git-send-email.txt:70 #, priority:100 msgid "Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an introductory message for the patch series." -msgstr "" +msgstr "瘟껆뵪�뉑쑍煐뽬풌�⑨펷�귟쭅 linkgit:git-var[1] 訝�쉪 GIT_EDITOR竊됬폋渦묋‥訝곭내�쀧쉪餓뗧퍖岳→겘��" #. type: Plain text #: en/git-send-email.txt:76 #, priority:100 msgid "When `--compose` is used, git send-email will use the From, Subject, and In-Reply-To headers specified in the message. If the body of the message (what you type after the headers and a blank line) only contains blank (or Git: prefixed) lines, the summary won't be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed." -msgstr "" +msgstr "鵝욜뵪 `--compose` �띰펽git send-email 弱녵슴�③궙餓뜸릎�뉐츣�꾢룕餓뜸볶�곦말窯섇뭽�뜸뻑雅뷸젃窯섅�귛쫩�쒒궙餓뜻��뉛펷�ⓩ젃窯섇뭽令븃죱阿뗥릮渦볟뀯�꾢냵若뱄펹�ゅ똿�ョ㈉烏뚳펷�� Git: �띸�竊됵펽�섋쫨弱녵툖鴉싪˙�묌�곻펽鵝녶룕餓뜸볶�곦말窯섇뭽�뜸뻑雅뷸젃窯섇컛熬ヤ슴�⑨펽�ㅹ씆若껂뺄熬ョ㎉�ㅳ��" #. type: Plain text #: en/git-send-email.txt:78 #, priority:100 msgid "Missing From or In-Reply-To headers will be prompted for." -msgstr "" +msgstr "弱녷룓鹽뷸삸��쐣煐뷴ㅁ�꾢룕餓뜸볶�뽪뵸餓뜸볶�뉔쥦��" #. type: Plain text #: en/git-send-email.txt:80 #, priority:100 msgid "See the CONFIGURATION section for `sendemail.multiEdit`." -msgstr "" +msgstr "瑥룟뢿�� `sendemail.multiEdit` �꾦뀓營�깿�녴��" #. type: Labeled list #: en/git-send-email.txt:81 @@ -50585,7 +50585,7 @@ msgstr "--from=<address>" #: en/git-send-email.txt:88 #, priority:100 msgid "Specify the sender of the emails. If not specified on the command line, the value of the `sendemail.from` configuration option is used. If neither the command-line option nor `sendemail.from` are set, then the user will be prompted for the value. The default for the prompt will be the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by \"git var -l\"." -msgstr "" +msgstr "�뉐츣�드춴��뻑�꾢룕餓뜸볶�� 倻귝옖�ゅ쑉�썰빱烏뚥릎�뉐츣竊뚦닕鵝욜뵪�띸쉰�됮」 `sendemail.from` �꾢�쇈�� 倻귝옖�썰빱烏뚪�됮」�� `sendemail.from` �뉑쑋溫양쉰竊뚦닕鴉싨룓鹽븀뵪�룩풏�ε�쇈�� �먪ㅊ�꾦퍡溫ㅵ�쇗삸 GIT_AUTHOR_IDENT �꾢�쇽펽倻귝옖亦→쐣溫양쉰 GIT_COMMITTER_IDENT竊뚦닕鵝욜뵪 \"git var -l\" 瓦붷썮�꾢�쇈��" #. type: Labeled list #: en/git-send-email.txt:89 @@ -50597,7 +50597,7 @@ msgstr "--reply-to=<address>" #: en/git-send-email.txt:93 #, priority:100 msgid "Specify the address where replies from recipients should go to. Use this if replies to messages should go to another address than what is specified with the --from parameter." -msgstr "" +msgstr "�뉐츣�뜸뻑雅뷴썮鸚띸쉪�겼��� 倻귝옖��뻑�꾢썮鸚띶쑑��訝� --from �귝빊�뉐츣�꾢쑑��訝띶릪竊뚩�鵝욜뵪閭ㅵ뢿�겹��" #. type: Labeled list #: en/git-send-email.txt:94 @@ -50609,13 +50609,13 @@ msgstr "--in-reply-to=<identifier>" #: en/git-send-email.txt:100 #, priority:100 msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-ID, which avoids breaking threads to provide a new patch series. The second and subsequent emails will be sent as replies according to the `--[no-]chain-reply-to` setting." -msgstr "" +msgstr "鵝욜К訝�弱곲궙餓띰펷�뽪��됧를�� `--[no-thread]`竊덃뿞瀛욜쮮竊됬쉪��뻑竊됦퐳訝븀퍢若� Message-ID �꾢썮鸚띶눣�곤펽餓롨�뚪겳�띴맏�먧풘�곁쉪烏δ툈楹삣닓�뚥릎��봇葉뗣�� 寧т틠弱곩룋�뜹릮�꾦궙餓뜹컛�방뜮 \"--[no-]chain-reply-to \"溫양쉰鵝쒍맏�욃쨳�묌�곥��" #. type: Plain text #: en/git-send-email.txt:104 #, priority:100 msgid "So for example when `--thread` and `--no-chain-reply-to` are specified, the second and subsequent patches will be replies to the first one like in the illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:" -msgstr "" +msgstr "堊뗥쫩竊뚦쫩�쒏뙁若싦틙 `--thread` �� `--no-chain-reply-to`竊뚦닕寧т틠訝ゅ뭽�롧뺌烏δ툈弱녷삸野밭К訝�訝よ‥訝곭쉪�욃쨳竊뚦쫩訝뗥쎗��鹽븝펽`[PATCH v2 0/3]` ��� `[PATCH 0/2]` �꾢썮鸚랃폏" #. type: Plain text #: en/git-send-email.txt:112 @@ -50641,7 +50641,7 @@ msgstr "" #: en/git-send-email.txt:115 #, priority:100 msgid "Only necessary if --compose is also set. If --compose is not set, this will be prompted for." -msgstr "" +msgstr "�ゆ쐣�뚧뿶溫양쉰雅� --compose �뜻뎺�됧퓚誤곥�� 倻귝옖�よ�營� --compose竊뚦닕鴉싨룓鹽뷩��" #. type: Labeled list #: en/git-send-email.txt:116 @@ -50653,7 +50653,7 @@ msgstr "--subject=<string>" #: en/git-send-email.txt:120 #, priority:100 msgid "Specify the initial subject of the email thread. Only necessary if --compose is also set. If --compose is not set, this will be prompted for." -msgstr "" +msgstr "�뉐츣�드춴��뻑瀛욜쮮�꾢닜冶뗤말窯섅�� �ゆ쐣�뚧뿶溫양쉰雅� --compose �뜻뎺��誤곥�� 倻귝옖�よ�營� --compose竊뚨내瀯잌컛�먪ㅊ渦볟뀯��" #. type: Labeled list #: en/git-send-email.txt:121 @@ -50665,7 +50665,7 @@ msgstr "--to=<address>,..." #: en/git-send-email.txt:126 #, priority:100 msgid "Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. Default is the value of the `sendemail.to` configuration value; if that is unspecified, and --to-cmd is not specified, this will be prompted for." -msgstr "" +msgstr "�뉐츣���잍닇�드춴��뻑�꾡말誤곫뵸餓뜸볶�귚��ф씎瑥댐펽瓦쇿컛��쎑�녜」��쉪訝딀만瀯닸뒪�끹�귡퍡溫ㅵ�쇗삸 `sendemail.to` �띸쉰�쇘쉪�쇽펽倻귝옖�ゆ뙁若싪��쇽펽訝붹쑋�뉐츣 --to-cmd �귝빊竊뚦닕鴉싨룓鹽븃��쇈��" #. type: Labeled list #: en/git-send-email.txt:129 @@ -50677,13 +50677,13 @@ msgstr "--8bit-encoding=<encoding>" #: en/git-send-email.txt:135 #, priority:100 msgid "When encountering a non-ASCII message or subject that does not declare its encoding, add headers/quoting to indicate it is encoded in <encoding>. Default is the value of the 'sendemail.assume8bitEncoding'; if that is unspecified, this will be prompted for if any non-ASCII files are encountered." -msgstr "" +msgstr "壤볣걞�경쑋鶯경삇�띄폋�곭쉪�� ASCII ��뻑�뽨말窯섉뿶竊뚧렌�졿젃鸚�/凉뺝뤇餓θ〃�롥츆��빳 <煐뽫쟻> 煐뽫쟻�꾠�� 容섋��쇗삸 'sendemail.assume8bitEncoding ' �꾢�쇽폑倻귝옖�ゆ뙁若싪��쇽펽�쇿쑉�뉐댆餓삡퐬�� ASCII �뉏뻑�뜸폏�먪ㅊ鵝욜뵪瑥ε�쇈��" #. type: Plain text #: en/git-send-email.txt:137 #, priority:100 msgid "Note that no attempts whatsoever are made to validate the encoding." -msgstr "" +msgstr "瑥룡낏�륅펽�묇뺄訝띴폏弱앲캊謠뚩칮煐뽫쟻��" #. type: Labeled list #: en/git-send-email.txt:138 @@ -50695,7 +50695,7 @@ msgstr "--compose-encoding=<encoding>" #: en/git-send-email.txt:141 #, priority:100 msgid "Specify encoding of compose message. Default is the value of the 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed." -msgstr "" +msgstr "�뉐츣�겼넍��뻑�꾤폋�곥�귡퍡溫ㅵ�쇗삸 'sendemail.composingencoding' �꾢�쇽폑倻귝옖�ゆ뙁若싷펽�쇿걞若싦맏 UTF-8��" #. type: Labeled list #: en/git-send-email.txt:142 @@ -50707,13 +50707,13 @@ msgstr "--transfer-encoding=(7bit|8bit|quoted-printable|base64|auto)" #: en/git-send-email.txt:150 #, priority:100 msgid "Specify the transfer encoding to be used to send the message over SMTP. 7bit will fail upon encountering a non-ASCII message. quoted-printable can be useful when the repository contains files that contain carriage returns, but makes the raw patch email file (as saved from a MUA) much harder to inspect manually. base64 is even more fool proof, but also even more opaque. auto will use 8bit when possible, and quoted-printable otherwise." -msgstr "" +msgstr "�뉐츣�싪퓝 SMTP �묌�곲궙餓뜻뿶鵝욜뵪�꾡폖渦볡폋�곥�� 倻귚퍜�у틩訝�똿�ュ맜�됧썮饔�쉪�뉏뻑竊똰uoted-printable 鴉싧푽�됬뵪竊뚥퐜鴉싦슴�잌쭓烏δ툈��뻑�뉏뻑竊덁퍗 MUA 訝�퓷耶섓펹�닻슻�뗥뒯汝��γ��" #. type: Plain text #: en/git-send-email.txt:153 #, priority:100 msgid "Default is the value of the `sendemail.transferEncoding` configuration value; if that is unspecified, default to `auto`." -msgstr "" +msgstr "容섋�訝� `sendemail.transferEncoding` �띸쉰�쇘쉪�쇽펽倻귝옖�ゆ뙁若싷펽�숅퍡溫ㅴ맏 `auto`��" #. type: Labeled list #: en/git-send-email.txt:154 @@ -50731,7 +50731,7 @@ msgstr "--no-xmailer" #: en/git-send-email.txt:159 #, priority:100 msgid "Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is added, but it can be turned off by setting the `sendemail.xmailer` configuration variable to `false`." -msgstr "" +msgstr "曆삣뒥竊덃닑�삥�曆삣뒥竊�\"X-Mailer: \" �뉐ㅄ�� 容섋��끻넻訝뗤폏曆삣뒥竊뚥퐜��빳�싪퓝弱녽뀓營�룜�� `sendemail.xmailer` 溫얌맏 `false`�ε뀽����" #. type: Title ~ #: en/git-send-email.txt:161 @@ -50749,7 +50749,7 @@ msgstr "--envelope-sender=<address>" #: en/git-send-email.txt:171 #, priority:100 msgid "Specify the envelope sender used to send the emails. This is useful if your default address is not the address that is subscribed to a list. In order to use the 'From' address, set the value to \"auto\". If you use the sendmail binary, you must have suitable privileges for the -f parameter. Default is the value of the `sendemail.envelopeSender` configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA." -msgstr "" +msgstr "�뉐츣�ⓧ틢�묌�곭뵷耶먬궙餓띄쉪岳▼컖�묇뻑雅뷩�� 倻귝옖�①쉪容섋��겼�訝띷삸溫�쁾�쀨〃�꾢쑑��竊뚩퓳弱녽씆躍멩쐣�ⓦ�귚맏雅녵슴�� 'From'竊덂룕餓뜸볶竊됧쑑��竊뚩�弱녶�쇠�營�맏 \"auto\"�귛쫩�쒍슴�� sendmail 雅뚩퓵�뜻뻼餓띰펽恙낂』訝� -f �귝빊溫양쉰�귛퐪�꾣쓢�먦�� 容섋��쇗삸 `sendemail.envelopeSender` �띸쉰�섌뇧�꾢�쇽폑倻귝옖�ゆ뙁若싷펽�숂뵳 MTA �됪떓岳▼컖�묇뻑雅뷩��" #. type: Labeled list #: en/git-send-email.txt:172 @@ -50761,7 +50761,7 @@ msgstr "--to-cmd=<command>" #: en/git-send-email.txt:179 #, priority:100 msgid "Specify a command to run to send the email. The command should be sendmail-like; specifically, it must support the `-i` option. The command will be executed in the shell if necessary. Default is the value of `sendemail.sendmailcmd`. If unspecified, and if --smtp-server is also unspecified, git-send-email will search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH." -msgstr "" +msgstr "�뉐츣�묌�곭뵷耶먬궙餓뜻뿶誤곮퓧烏뚨쉪�썰빱�귟��썰빱佯붺굳鴉쇌틢 sendmail竊쎾끁鵝볠씎瑥댐펽若껃퓚窈삥뵱�� `-i` �됮」�� 倻귝쐣恙낁쫨竊뚩��썰빱弱녶쑉 shell 訝�돢烏뚣�� 容섋��쇌맏 `sendemail.sendmailcmd`�� 倻귝옖�ゆ뙁若싷펽亮뜸툝 --smtp-server 阿잍쑋�뉐츣竊똤it-send-email 弱녶쑉 `/usr/sbin`��`/usr/lib` �� $PATH 訝�맂榮� `sendmail`��" #. type: Labeled list #: en/git-send-email.txt:180 @@ -50773,7 +50773,7 @@ msgstr "--smtp-encryption=<encryption>" #: en/git-send-email.txt:193 #, priority:100 msgid "Specify in what way encrypting begins for the SMTP connection. Valid values are 'ssl' and 'tls'. Any other value reverts to plain (unencrypted) SMTP, which defaults to port 25. Despite the names, both values will use the same newer version of TLS, but for historic reasons have these names. 'ssl' refers to \"implicit\" encryption (sometimes called SMTPS), that uses port 465 by default. 'tls' refers to \"explicit\" encryption (often known as STARTTLS), that uses port 25 by default. Other ports might be used by the SMTP server, which are not the default. Commonly found alternative port for 'tls' and unencrypted is 587. You need to check your provider's documentation or your server configuration to make sure for your own case. Default is the value of `sendemail.smtpEncryption`." -msgstr "" +msgstr "�뉐츣 SMTP 瓦욄렏�꾢뒥野녷뼶凉뤵�� �됪븞�쇌맏 'ssl' �� 'tls'�귚뻣鵝뺝끀餓뽩�쇤꺗弱녷걿鸚띴맏���싷펷�ゅ뒥野놅펹SMTP竊뚪퍡溫ㅷク�d맏 25�� 弱썹��띸㎞訝띶릪竊뚥퐜瓦쇾륵訝ゅ�쇤꺗弱녵슴�①쎑�뚨쉪 TLS �닸뼭�덃쑍竊뚦룵��뵳雅롥럣�꿨렅�졿뎺鵝욜뵪雅녻퓳雅쎾릫燁겹��'ssl' �� �쒒쉺凉뤴�� �졾칳竊덃쐣�띄㎞訝� SMTPS竊됵펽容섋�鵝욜뵪 465 塋�룭�� 'tls' �� �쒏샑凉뤴�� �졾칳竊덆�싧만燁겻맏 STARTTLS竊됵펽容섋�鵝욜뵪 25 塋�룭�괪MTP �띶뒦�②퓲��꺗鵝욜뵪�뜸퍟塋�룭竊뚥퐜瓦쇾틳塋�룭亮띌씆容섋�塋�룭�귛만鰲곭쉪 'tls' �뚧쑋�졾칳�꾣쎘餓gク�f삸 587�귝궓��誤곫윥�뗤풘佯붷븚�꾣뻼旅f닑�띶뒦�③뀓營�펽餓η‘若싪눎藥긺쉪�끻넻�귡퍡溫ㅵ�쇌맏 `sendemail.smtpEncryption`��" #. type: Labeled list #: en/git-send-email.txt:194 @@ -50785,19 +50785,19 @@ msgstr "--smtp-domain=<FQDN>" #: en/git-send-email.txt:200 #, priority:100 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts to determine your FQDN automatically. Default is the value of `sendemail.smtpDomain`." -msgstr "" +msgstr "�뉐츣�묌�곩댆 SMTP �띶뒦�①쉪 HELO/EHLO �썰빱訝�슴�①쉪若뚦뀲�먨츣�잌릫 (FQDN)�� �됦틳�띶뒦�②쫨黎� FQDN 訝롦궓�� IP �겼��백뀓�� 倻귝옖�よ�營�펽git send-email 鴉싧컼瑥뺠눎�①‘若싨궓�� FQDN�� 容섋��쇌맏 `sendemail.smtpDomain`��" #. type: Labeled list #: en/git-send-email.txt:201 #, no-wrap, priority:100 msgid "--smtp-auth=<mechanisms>" -msgstr "" +msgstr "--smtp-auth=<謠뚩칮�뷴댍>" #. type: Plain text #: en/git-send-email.txt:204 #, priority:100 msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:" -msgstr "" +msgstr "餓η㈉�썲늽�붺쉪�곮� SMTP-AUTH �뷴댍�쀨〃�귝�溫양쉰�ゅ성�뜸슴�ⓨ닓�븀쉪�뷴댍�귚풃倻귨폏" #. type: delimited block - #: en/git-send-email.txt:207 @@ -50809,7 +50809,7 @@ msgstr "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n" #: en/git-send-email.txt:215 #, priority:100 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`" -msgstr "" +msgstr "倻귝옖�뉐츣�꾣쑛�뜸릎�녑컩�됦�燁띴툗 SMTP �띶뒦�ⓨ뀶躍껆쉪�뷴댍�멨뙶�랃펽訝붷룛��鵝욜뵪�� SASL 佯볠뵱�곻펽�숃��뷴댍弱녺뵪雅롨벴餓썽챿瑥곥�귛쫩�쒏뿢�ゆ뙁若� 'sendemail.smtpAuth'竊뚥튋�ゆ뙁若� `--smtp-auth`�귝빊竊뚦닕��슴�� SASL 佯볠뵱�곭쉪���됪쑛�뜰�귛쫩�쒏뙁若싦틙�방츏�� 'none'竊뚦닕��빳若뚦뀲獵곭뵪訝� `--smtp-user` �귝빊�졾뀽�꾥벴餓썽챿瑥�" #. type: Labeled list #: en/git-send-email.txt:216 @@ -50821,13 +50821,13 @@ msgstr "--smtp-pass[=<password>]" #: en/git-send-email.txt:221 #, priority:100 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value." -msgstr "" +msgstr "SMTP-AUTH �꾢칳�곥�귛뢿�겻맏���됧뢿�곤폏倻귝옖�ゆ뙁若싧뢿�곤펽�쇾슴�①㈉耶쀧Е訝꿜퐳訝뷴칳�곥�귡퍡溫ㅵ�쇗삸 `sendemail.smtpPass` �꾢�쇽펽鵝� `--smtp-pass` 冶뗧퍑鴉싪쫮�뽬��쇈��" #. type: Plain text #: en/git-send-email.txt:227 #, priority:100 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'." -msgstr "" +msgstr "閭ㅵ쨼竊뚧뿞���③뀓營�뻼餓뜻닑�썰빱烏뚥릎�뉐츣野녺쟻�귛쫩�쒎럴�뉐츣�ⓩ댎�랃펷鵝욜뵪 `--smtp-user` �� `sendemail.smtpUser`竊됵펽鵝녷쑋�뉐츣野녺쟻竊덁슴�� `--smtp-pass` �� `sendemail.smtpPass`竊됵펽�쇾슴�� 'git-credential' �룟룚野녺쟻��" #. type: Labeled list #: en/git-send-email.txt:228 @@ -50839,25 +50839,25 @@ msgstr "--no-smtp-auth" #: en/git-send-email.txt:230 #, priority:100 msgid "Disable SMTP authentication. Short hand for `--smtp-auth=none`" -msgstr "" +msgstr "獵곭뵪 SMTP 謠뚩칮��`--smtp-auth=none` �꾤�燁�" #. type: Labeled list #: en/git-send-email.txt:231 #, no-wrap, priority:100 msgid "--smtp-server=<host>" -msgstr "" +msgstr "--smtp-server=<訝삥쑛>" #. type: Plain text #: en/git-send-email.txt:237 #, priority:100 msgid "If set, specifies the outgoing SMTP server to use (e.g. `smtp.example.com` or a raw IP address). If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a program is available, falling back to `localhost` otherwise." -msgstr "" +msgstr "倻귝옖溫양쉰竊뚦닕�뉐츣誤곦슴�①쉪鸚뽩룕 SMTP �띶뒦�⑨펷堊뗥쫩 `smtp.example.com` �뽩렅冶� IP �겼�竊됥�� 倻귝옖�ゆ뙁若싷펽�뚥툝`-sendmail-cmd` 阿잍쑋�뉐츣竊뚪퍡溫ㅶ깄�듕툔鴉싧쑉`/usr/sbin`��`/usr/lib` �� $PATH 訝�맂榮� `sendmail`竊덂쫩�쒏쐣竊됵펽��닕鴉싪퓭�욃댆 `localhost`��" #. type: Plain text #: en/git-send-email.txt:243 #, priority:100 msgid "For backward compatibility, this option can also specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. This method does not support passing arguments or using plain command names. For those use cases, consider using `--sendmail-cmd` instead." -msgstr "" +msgstr "訝뷰틙�묈릮�쇔�竊뚩��됮」阿잌룾餓ζ뙁若싦�訝ょ굳鴉쇌틢 sendmail �꾤쮮佯뤹쉪若뚧빐瓮�푶�랃폑瑥η쮮佯뤷퓚窈삥뵱�� `-i` �됮」�� 瓦숂쭕�방퀡訝띷뵱�곦폖�믣뢿�경닑鵝욜뵪瀛�뫝餓ㅵ릫�� �②퓳雅쎿깄�듕툔竊뚩��껇솑鵝욜뵪 `-sendmail-cmd`��" #. type: Labeled list #: en/git-send-email.txt:244 @@ -50869,25 +50869,25 @@ msgstr "--smtp-server-port=<port>" #: en/git-send-email.txt:251 #, priority:100 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587) are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable." -msgstr "" +msgstr "�뉐츣訝�訝や툖�뚥틢容섋�塋�룭�꾤ク�o펷SMTP �띶뒦�③�싧만�묈맟 smtp 塋�룭 25竊뚥퐜阿잌룾�썹썞�� submission 塋�룭 587 �뽩만�①쉪 SSL smtp 塋�룭 465竊됵폑阿잍렏�쀧Е�루ク�e릫燁곤펷倻귞뵪 \"submission\" 餓f쎘 587竊됥�귞ク�d튋��빳�싪퓝 `sendemail.smtpServerPort` �띸쉰�섌뇧�θ�營���" #. type: Labeled list #: en/git-send-email.txt:252 #, no-wrap, priority:100 msgid "--smtp-server-option=<option>" -msgstr "" +msgstr "--smtp-server-option=<�됮」>" #. type: Plain text #: en/git-send-email.txt:256 #, priority:100 msgid "If set, specifies the outgoing SMTP server option to use. Default value can be specified by the `sendemail.smtpServerOption` configuration option." -msgstr "" +msgstr "倻귝옖溫양쉰竊뚦닕�뉐츣誤곦슴�①쉪鸚뽩룕 SMTP �띶뒦�③�됮」�� 容섋��쇔룾�� `sendemail.smtpServerOption` �띸쉰�됮」�뉐츣��" #. type: Plain text #: en/git-send-email.txt:260 #, priority:100 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option." -msgstr "" +msgstr "野밥틢誤곦폖�믥퍢�띶뒦�①쉪驪뤶릉�됮」竊뚪꺗恙낂』�띶쨳鵝욜뵪 --smtp-server-option �됮」�귛릪�뤄펽驪뤶릉�됮」恙낂』�③뀓營�뻼餓뜸릎鵝욜뵪訝띶릪�꾥죱��" #. type: Labeled list #: en/git-send-email.txt:261 @@ -50899,7 +50899,7 @@ msgstr "--smtp-ssl" #: en/git-send-email.txt:263 #, priority:100 msgid "Legacy alias for '--smtp-encryption ssl'." -msgstr "" +msgstr "'--smtp-encryption ssl' �꾦걮�쇿닽�띲��" #. type: Labeled list #: en/git-send-email.txt:264 @@ -50911,7 +50911,7 @@ msgstr "--smtp-ssl-cert-path" #: en/git-send-email.txt:274 #, priority:100 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)." -msgstr "" +msgstr "�ⓧ틢 SMTP SSL/TLS 瑥곦묘謠뚩칮�꾢룾岳� CA 瑥곦묘耶섇궓�꾥러孃꾬펷��빳��럴熬� 'c_rehash' 鸚꾤릤瓦뉒쉪��퐬竊뚥튋��빳��똿�ヤ�訝ゆ닑鸚싦릉 PEM �쇔폀瑥곦묘�꾢뜒訝ゆ뻼餓띰폏瑥룟뢿�� verify(1) -CAfile �� -CApath竊뚥틙鰲f쎍鸚싩쎑�념에��펹�귛컛�띈�營�맏令뷴춻寧╊림��쫨�②칮阿�챿瑥곥�귛쫩�쒑�營�틙竊뚪퍡溫ㅵ�쇌맏 `sendemail.smtpsslcertpath` �띸쉰�섌뇧�꾢�쇽펽��닕容섋��쇌맏鸚뉒뵪 SSL 佯볡폋瑥묈릮�꾦퍡溫ㅵ�쇽펷瓦쇿틪瑥ζ삸鸚㎩쩀�겼뭄�겻툓�꾣�鵝녜�됪떓竊됥��" #. type: Labeled list #: en/git-send-email.txt:275 @@ -50923,7 +50923,7 @@ msgstr "--smtp-user=<user>" #: en/git-send-email.txt:279 #, priority:100 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted." -msgstr "" +msgstr "SMTP-AUTH �꾤뵪�룟릫�귡퍡溫ㅵ�쇗삸 `sendemail.smtpUser` �꾢�쇽폑倻귝옖�ゆ뙁若싩뵪�룟릫竊덁슴�� `--smtp-user` �� `sendemail.smtpUser`竊됵펽�쇾툖鴉싧컼瑥뺡챿瑥곥��" #. type: Labeled list #: en/git-send-email.txt:280 @@ -50935,19 +50935,19 @@ msgstr "--smtp-debug=0|1" #: en/git-send-email.txt:284 #, priority:100 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems." -msgstr "" +msgstr "��뵪 (1) �뽫쫨�� (0) 瘟껇캊渦볟눣�귛쫩�쒎맦�⑨펽弱녷돀�� SMTP �썰빱�뚦썮鸚띲�귞뵪雅롨컘瑥� TLS 瓦욄렏�뚩벴餓썽챿瑥곲뿮窯섅��" #. type: Labeled list #: en/git-send-email.txt:285 #, no-wrap, priority:100 msgid "--batch-size=<num>" -msgstr "" +msgstr "--batch-size=<�겼��>" #. type: Plain text #: en/git-send-email.txt:294 #, priority:100 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages. With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay) and reconnect, to work around such a limit. You may want to use some form of credential helper to avoid having to retype your password every time this happens. Defaults to the `sendemail.smtpBatchSize` configuration variable." -msgstr "" +msgstr "�먧틳��뻑�띶뒦�⑨펷倻� smtp.163.com竊됮솏�뜻캀轝▽폏瑥앾펷瓦욄렏竊됧룕�곭쉪��뻑�곈뇧竊뚩퓳弱녶��닷룕�곩ㄷ�뤻궙餓뜻뿶�븀렟�낂슌�� �됦틙瓦쇾릉�됮」竊똲end-email 鴉싧쑉�묌�� $<�겼��> ��뻑�롦뼪凉�瓦욄렏竊뚨춬孃끻뇿燁믧뮓竊덂뢿鰲� --relogin-delay 竊됵펽�뜹릮�띷뼭瓦욄렏竊뚥빳鰲꾦겳瓦숂쭕�먨댍�� 鵝졾룾�썽�誤곦슴�ⓩ윇燁띶숱凉뤹쉪��칮�⒵뎸竊뚥빳�욕뀓驪뤸А�썼쫨�띷뼭渦볟뀯野녺쟻�� 容섋�訝� `sendemail.smtpBatchSize` �띸쉰�섌뇧��" #. type: Labeled list #: en/git-send-email.txt:295 @@ -50959,25 +50959,25 @@ msgstr "--relogin-delay=<int>" #: en/git-send-email.txt:299 #, priority:100 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option. Defaults to the `sendemail.smtpReloginDelay` configuration variable." -msgstr "" +msgstr "�띷뼭瓦욄렏 SMTP �띶뒦�ⓨ뎺嶺됧푷 $<�닸빊> 燁믡�귚툗 --batch-size �됮」訝�壅룝슴�ⓦ�� 容섋�訝� `sendemail.smtpReloginDelay` �띸쉰�섌뇧��" #. type: Title ~ #: en/git-send-email.txt:301 #, no-wrap, priority:100 msgid "Automating" -msgstr "" +msgstr "�ゅ뒯��" #. type: Labeled list #: en/git-send-email.txt:303 #, no-wrap, priority:100 msgid "--no-[to|cc|bcc]" -msgstr "" +msgstr "--no-[to|cc|bcc]" #. type: Plain text #: en/git-send-email.txt:306 #, priority:100 msgid "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via config." -msgstr "" +msgstr "歷낂솮阿뗥뎺�싪퓝�띸쉰溫양쉰�� \"To:\"竊덃뵸餓뜸볶竊됥��\"Cc:\"竊덃뒆�곦볶竊됥��\"Bcc:\"竊덂칳�곦볶竊됧쑑���쀨〃��" #. type: Labeled list #: en/git-send-email.txt:307 @@ -50989,7 +50989,7 @@ msgstr "--no-identity" #: en/git-send-email.txt:310 #, priority:100 msgid "Clears the previously read value of `sendemail.identity` set via config, if any." -msgstr "" +msgstr "歷낂솮�덂뎺瑥삣룚�꾦�싪퓝�띸쉰溫양쉰�� `sendemail.identity` �쇽펷倻귝옖�됵펹��" #. type: Labeled list #: en/git-send-email.txt:311 @@ -51001,7 +51001,7 @@ msgstr "--to-cmd=<command>" #: en/git-send-email.txt:316 #, priority:100 msgid "Specify a command to execute once per patch file which should generate patch file specific \"To:\" entries. Output of this command must be single email address per line. Default is the value of 'sendemail.tocmd' configuration value." -msgstr "" +msgstr "�뉐츣驪뤶릉烏δ툈�뉏뻑�㎬죱訝�轝←쉪�썰빱竊뚩��썰빱佯붺뵟�먫‥訝곫뻼餓띄돶若싩쉪 \"To:\"竊덃뵸餓뜸볶竊됪씉���� 瑥ε뫝餓ㅷ쉪渦볟눣恙낂』��캀烏뚥�訝ょ뵷耶먬궙餓뜹쑑���� 容섋��쇌맏 'sendemail.tocmd' �띸쉰�쇈��" #. type: Labeled list #: en/git-send-email.txt:317 @@ -51013,7 +51013,7 @@ msgstr "--cc-cmd=<command>" #: en/git-send-email.txt:322 #, priority:100 msgid "Specify a command to execute once per patch file which should generate patch file specific \"Cc:\" entries. Output of this command must be single email address per line. Default is the value of `sendemail.ccCmd` configuration value." -msgstr "" +msgstr "�뉐츣驪뤶릉烏δ툈�뉏뻑�㎬죱訝�轝←쉪�썰빱竊뚩��썰빱佯붺뵟�먫‥訝곫뻼餓띄돶若싩쉪 \"Cc:\"竊덃뒆�곦볶竊됪씉���� 瑥ε뫝餓ㅷ쉪渦볟눣恙낂』��캀烏뚥�訝ょ뵷耶먬궙餓뜹쑑���� 容섋��쇌맏 `sendemail.ccCmd` �띸쉰�쇈��" #. type: Labeled list #: en/git-send-email.txt:323 @@ -51025,7 +51025,7 @@ msgstr "--to-cmd=<command>" #: en/git-send-email.txt:330 #, priority:100 msgid "Specify a command that is executed once per outgoing message and output RFC 2822 style header lines to be inserted into them. When the `sendemail.headerCmd` configuration variable is set, its value is always used. When --header-cmd is provided at the command line, its value takes precedence over the `sendemail.headerCmd` configuration variable." -msgstr "" +msgstr "�뉐츣訝��▼뫝餓ㅿ펽驪뤷컖�묌�곲궙餓뜻돢烏뚥�轝∽펽亮띈풏�� RFC 2822 �룟폀�꾣젃窯섋죱�믣뀯�뜸릎�귛쫩�쒑�營�틙 `sendemail.headerCmd` �띸쉰�섌뇧竊뚦닕冶뗧퍑鵝욜뵪�뜹�쇈�귛쑉�썰빱烏뚥릎�먧풘 --header-cmd �귝빊�띰펽�뜹�쇌폍�덁틢 `sendemail.headerCmd` �띸쉰�섌뇧��" #. type: Labeled list #: en/git-send-email.txt:331 @@ -51037,7 +51037,7 @@ msgstr "--no-header-cmd" #: en/git-send-email.txt:333 #, priority:100 msgid "Disable any header command in use." -msgstr "" +msgstr "獵곭뵪餓삡퐬閭e쑉鵝욜뵪�꾣젃窯섇뫝餓ㅳ��" #. type: Labeled list #: en/git-send-email.txt:334 @@ -51049,7 +51049,7 @@ msgstr "--[no-]chain-reply-to" #: en/git-send-email.txt:341 #, priority:100 msgid "If this is set, each email will be sent as a reply to the previous email sent. If disabled with \"--no-chain-reply-to\", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Disabled by default, but the `sendemail.chainReplyTo` configuration variable can be used to enable it." -msgstr "" +msgstr "倻귝옖溫양쉰雅녷�窈뱄펽驪뤷컖��뻑�썲컛鵝쒍맏野밧뎺訝�弱곲궙餓띄쉪�욃쨳�묌�곥�� 倻귝옖鵝욜뵪 \"--no-chain-reply-to\" 獵곭뵪瑥ι�됮」竊뚦닕寧т�弱곲궙餓뜸퉳�롧쉪���됮궙餓띌꺗弱녵퐳訝뷴�寧т�弱곲궙餓띄쉪�욃쨳�묌�곥�� 鵝욜뵪閭ㅵ뒣�썸뿶竊뚦뻠溫�퍢�븀쉪寧т�訝ゆ뻼餓뜻삸�답릉烏δ툈楹삣닓�꾣쫩瓦겹�귡퍡溫ㅶ깄�듕툔藥꿰쫨�⑨펽鵝녶룾餓δ슴�� `sendemail.chainReplyTo` �띸쉰�섌뇧��뵪若껁��" #. type: Labeled list #: en/git-send-email.txt:342 @@ -51061,7 +51061,7 @@ msgstr "--identity=<identity>" #: en/git-send-email.txt:347 #, priority:100 msgid "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`." -msgstr "" +msgstr "�띸쉰�뉓칳�귞퍢若싧릮竊�'sendemail.<溫ㅸ칮>' �녻뒄訝�쉪�쇔컛鴉섇뀍雅� 'sendemail' �ⓨ늽訝�쉪�쇈�귡퍡溫ㅸ벴餓썸삸 `sendemail.identity` �꾢�쇈��" #. type: Labeled list #: en/git-send-email.txt:348 @@ -51085,7 +51085,7 @@ msgstr "--[no-]cc-cover" #: en/git-send-email.txt:358 #, priority:100 msgid "If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list for each email set. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover." -msgstr "" +msgstr "倻귝옖溫양쉰雅녷�窈뱄펽�①내�쀩궙餓띄쉪寧т�訝よ‥訝곻펷�싧만��컖�㏘에竊됬쉪�꾦�곫젃窯섆릎�얍댆�꾤뵷耶먬궙餓뜹컛熬ユ렌�졾댆驪뤶릉��뻑�녺쉪�꾦�곩닓烏ⓧ릎�귡퍡溫ㅵ�쇌맏 'sendemail.cccover' �띸쉰�쇽폑倻귝옖�ゆ뙁若싷펽容섋��쇌맏 --no-cc-cover��" #. type: Labeled list #: en/git-send-email.txt:359 @@ -51097,7 +51097,7 @@ msgstr "--[no-]to-cover" #: en/git-send-email.txt:364 #, priority:100 msgid "If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list for each email set. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover." -msgstr "" +msgstr "倻귝옖溫양쉰雅녷�窈뱄펽�①내�쀩궙餓띄쉪寧т�訝よ‥訝곻펷�싧만��컖�㏘에�쏙펹�꾣뵸餓뜸볶�뉔쥦訝�돻�곁쉪��뻑弱녻˙曆삣뒥�경캀訝ら궙餓띌썓�꾣뵸餓뜸볶�쀨〃訝��귡퍡溫ㅵ�쇌맏 'sendemail.tocover' �띸쉰�쇽폑倻귝옖�ゆ뙁若싷펽容섋��쇌맏--no-to-cover��" #. type: Labeled list #: en/git-send-email.txt:365 @@ -51109,31 +51109,31 @@ msgstr "--suppress-cc=<category>" #: en/git-send-email.txt:368 #, priority:100 msgid "Specify an additional category of recipients to suppress the auto-cc of:" -msgstr "" +msgstr "�뉐츣訝�訝ら쥫鸚뽫쉪�뜸뻑雅븀굳�ワ펽餓η쫨閭�눎�ⓩ뵸餓띰폏" #. type: Plain text #: en/git-send-email.txt:371 #, priority:100 msgid "'author' will avoid including the patch author." -msgstr "" +msgstr "'author' 弱녽겳�띶똿�ヨ‥訝곦퐳�끹��" #. type: Plain text #: en/git-send-email.txt:372 #, priority:100 msgid "'self' will avoid including the sender." -msgstr "" +msgstr "'self' 弱녽겳�띶똿�у룕餓뜸볶��" #. type: Plain text #: en/git-send-email.txt:374 #, priority:100 msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)." -msgstr "" +msgstr "'cc' 弱녽겳�띶똿�ц‥訝곩ㅄ訝�뒆�곮죱�먨댆�꾡뻣鵝뺜볶竊뚥퐜�ゅ런�ㅵ쨼竊덁슴�� 'self' �녑룾竊됥��" #. type: Plain text #: en/git-send-email.txt:376 #, priority:100 msgid "'bodycc' will avoid including anyone mentioned in Cc lines in the patch body (commit message) except for self (use 'self' for that)." -msgstr "" +msgstr "'bodycc' 弱녽겳�띶쑉烏δ툈閭f뻼竊덃룓雅ㅴ에��펹訝�똿�ユ뒆�곮죱訝�룓�곁쉪餓삡퐬雅븝펽鵝녻눎藥깁솮鸚뽳펷訝뷸�鵝욜뵪 'self'竊됥��" #. type: Plain text #: en/git-send-email.txt:378 @@ -51145,31 +51145,31 @@ msgstr "'sob' 弱녽겳�띶똿�х��띹죱訝�룓�곁쉪餓삡퐬雅븝펽 �ㅴ틙�ゆ닊 竊� #: en/git-send-email.txt:381 #, priority:100 msgid "'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, Tested-by and other \"-by\" lines in the patch body, except Signed-off-by (use 'sob' for that)." -msgstr "" +msgstr "'misc-by' 弱녽겳�띶똿�ヨ‥訝곫��뉏릎�� Acked-by�갧eviewed-by�갩ested-by �뚦끀餓� \"-by \" 烏뚧룓�곁쉪餓삡퐬雅븝펽鵝� Signed-off-by �ㅵ쨼竊덁슴�� 'sob' 竊됥��" #. type: Plain text #: en/git-send-email.txt:382 #, priority:100 msgid "'cccmd' will avoid running the --cc-cmd." -msgstr "" +msgstr "'cccmd' 弱녽겳�띹퓧烏� --cc-cmd �썰빱��" #. type: Plain text #: en/git-send-email.txt:383 #, priority:100 msgid "'body' is equivalent to 'sob' + 'bodycc' + 'misc-by'." -msgstr "" +msgstr "'body' 嶺됧릪雅� 'sob' + 'bodycc' + 'misc-by'��" #. type: Plain text #: en/git-send-email.txt:384 #, priority:100 msgid "'all' will suppress all auto cc values." -msgstr "" +msgstr "'all' 鴉싨뒔�뜻��됭눎�ⓩ뒆�곩�쇈��" #. type: Plain text #: en/git-send-email.txt:389 #, priority:100 msgid "Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified." -msgstr "" +msgstr "容섋��쇗삸 `sendemail.suppresscc` �띸쉰�쇘쉪�쇽펽倻귝옖�ゆ뙁若싷펽�쇿쑉�뉐츣 --suppress-from �귝빊�띌퍡溫ㅴ맏 'self'竊뚦쑉�뉐츣 --no-signed-off-cc �귝빊�띌퍡溫ㅴ맏 'body'��" #. type: Labeled list #: en/git-send-email.txt:390 @@ -51181,7 +51181,7 @@ msgstr "--[no-]suppress-from" #: en/git-send-email.txt:394 #, priority:100 msgid "If this is set, do not add the From: address to the cc: list. Default is the value of `sendemail.suppressFrom` configuration value; if that is unspecified, default to --no-suppress-from." -msgstr "" +msgstr "倻귝옖溫양쉰雅녷�窈뱄펽�쇾툖鴉싧컛�묇뻑雅뷴쑑��曆삣뒥�경뒆�곩쑑���쀨〃訝��� 容섋��쇗삸 `sendemail.suppressFrom` �띸쉰�쇘쉪�쇽펽倻귝옖�ゆ뙁若싷펽�숅퍡溫ㅴ맏 --no-suppress-from �귝빊��" #. type: Labeled list #: en/git-send-email.txt:395 @@ -51193,7 +51193,7 @@ msgstr "--[no-]thread" #: en/git-send-email.txt:401 #, priority:100 msgid "If this is set, the In-Reply-To and References headers will be added to each email sent. Whether each mail refers to the previous email (`deep` threading per 'git format-patch' wording) or to the first email (`shallow` threading) is governed by \"--[no-]chain-reply-to\"." -msgstr "" +msgstr "倻귝옖溫양쉰雅녷�窈뱄펽驪뤷컖��뻑�썰폏曆삣뒥 In-Reply-To �� References �뉐ㅄ�� 驪뤷컖��뻑��폊�ⓨ뎺訝�弱곲궙餓띰펷'git format-patch' 訝�쉪 `deep` 瀛욜쮮竊됵펽瓦섉삸凉뺟뵪寧т�弱곲궙餓띰펷`shallow` 瀛욜쮮竊됵펽�� \"--[no-]chain-reply-to\" �녑츣��" #. type: Plain text #: en/git-send-email.txt:406 @@ -51205,13 +51205,13 @@ msgstr "If disabled with \"--no-thread\", those headers will not be added (unles #: en/git-send-email.txt:412 #, priority:100 msgid "It is up to the user to ensure that no In-Reply-To header already exists when 'git send-email' is asked to add it (especially note that 'git format-patch' can be configured to do the threading itself). Failure to do so may not produce the expected result in the recipient's MUA." -msgstr "" +msgstr "壤� 'git send-email' 熬ヨ쫨黎귝렌�� In-Reply-To 鸚답에��뿶竊뚨뵪�룟틪簾�퓷瑥εㅄ�▽에��툖耶섇쑉竊덄돶�ヨ쫨力ⓩ꼷�꾣삸竊�'git format-patch' ��˙�띸쉰訝븃눎烏뚩퓵烏뚨봇葉뗥쨪�놅펹�� ��닕��꺗�졿퀡�ⓩ뵸餓뜸볶�� MUA 訝�벨�잓쥋�잏퍜�쒌��" #. type: Title ~ #: en/git-send-email.txt:415 #, no-wrap, priority:100 msgid "Administering" -msgstr "" +msgstr "嶸←릤" #. type: Labeled list #: en/git-send-email.txt:417 @@ -51223,49 +51223,49 @@ msgstr "--confirm=<mode>" #: en/git-send-email.txt:419 #, priority:100 msgid "Confirm just before sending:" -msgstr "" +msgstr "�묌�곩뎺簾��竊�" #. type: Plain text #: en/git-send-email.txt:422 #, priority:100 msgid "'always' will always confirm before sending" -msgstr "" +msgstr "'always' �삡폏�ⓨ룕�곩뎺簾��" #. type: Plain text #: en/git-send-email.txt:423 #, priority:100 msgid "'never' will never confirm before sending" -msgstr "" +msgstr "'never' �ⓨ룕�곩뎺訝띴폏簾��" #. type: Plain text #: en/git-send-email.txt:425 #, priority:100 msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list" -msgstr "" +msgstr "倻귝옖�묌�곲궙餓뜹럴�ゅ뒯弱녻‥訝곦릎�꾢쑑��曆삣뒥�경뒆�곩닓烏ⓧ릎竊�'cc' 弱녶쑉�묌�곩뎺瓦쏂죱簾��" #. type: Plain text #: en/git-send-email.txt:426 #, priority:100 msgid "'compose' will confirm before sending the first message when using --compose." -msgstr "" +msgstr "壤볞슴�� --compose �됮」�띰펽'compose' 鴉싧쑉�묌�곭К訝��▽에��뎺瓦쏂죱簾����" #. type: Plain text #: en/git-send-email.txt:427 #, priority:100 msgid "'auto' is equivalent to 'cc' + 'compose'" -msgstr "" +msgstr "'auto' 嶺됧릪雅� 'cc' + 'compose'" #. type: Plain text #: en/git-send-email.txt:432 #, priority:100 msgid "Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'." -msgstr "" +msgstr "容섋��쇗삸 `sendemail.confirm` �띸쉰�쇘쉪�쇽펽倻귝옖�ゆ뙁若싷펽�숅퍡溫ㅴ맏 'auto'竊뚪솮�욄뙁若싦틙餓삡퐬�묈댍�됮」竊뚦쑉瓦숂쭕�끻넻訝뗩퍡溫ㅴ맏 'compose'��" #. type: Plain text #: en/git-send-email.txt:435 #, priority:100 msgid "Do everything except actually send the emails." -msgstr "" +msgstr "�ㅴ틙若욇솀�묌�곲궙餓뜹쨼竊뚥�阿덆꺗�싥��" #. type: Labeled list #: en/git-send-email.txt:436 @@ -51277,13 +51277,13 @@ msgstr "--[no-]format-patch" #: en/git-send-email.txt:441 #, priority:100 msgid "When an argument may be understood either as a reference or as a file name, choose to understand it as a format-patch argument (`--format-patch`) or as a file name (`--no-format-patch`). By default, when such a conflict occurs, git send-email will fail." -msgstr "" +msgstr "壤볟뢿�겼룾餓η릤鰲d맏凉뺟뵪�뽪뻼餓뜹릫�띰펽�됪떓弱녶끀�녻㎗訝뷸졏凉뤺‥訝곩뢿�곤펷`--format-patch`竊됪닑�뉏뻑�랃펷`--no-format-patch`竊됥�귡퍡溫ㅶ깄�듕툔竊뚦퐪�븀렟瓦숂쭕�꿰챳�띰펽git send-email �띴퐳弱녶ㅁ兀γ��" #. type: Plain text #: en/git-send-email.txt:445 #, priority:100 msgid "Make git-send-email less verbose. One line per email should be all that is output." -msgstr "" +msgstr "溫� git-send-email 弱묋풏�뷰�雅쎼�� 驪뤷컖��뻑�よ풏�뷰�烏뚦뜵����" #. type: Labeled list #: en/git-send-email.txt:446 @@ -51295,19 +51295,19 @@ msgstr "--[no-]validate" #: en/git-send-email.txt:449 #, priority:100 msgid "Perform sanity checks on patches. Currently, validation means the following:" -msgstr "" +msgstr "野배‥訝곮퓵烏뚧�簾��㎪��γ�� ��뎺竊뚪챿瑥곭쉪�ヤ퉱倻귚툔竊�" #. type: Plain text #: en/git-send-email.txt:452 #, priority:100 msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])." -msgstr "" +msgstr "瘟껆뵪 sendemail-validate 竊덂룕�곲궙餓띌챿瑥곻펹�⒴춴竊덂쫩�쒎춼�⑨펹竊덂뢿鰲� linkgit:githooks[5])��" #. type: Plain text #: en/git-send-email.txt:453 #, priority:100 msgid "Warn of patches that contain lines longer than" -msgstr "" +msgstr "鈺�몜�ユ쐣�요틢" #. type: Plain text #: en/git-send-email.txt:457 @@ -51317,19 +51317,19 @@ msgid "" "('auto', 'base64', or 'quoted-printable') is used;\n" "this is due to SMTP limits as described by\n" "http://www.ietf.org/rfc/rfc5322.txt.\n" -msgstr "" +msgstr "998 訝ゅ춻寧�펽�ㅹ씆鵝욜뵪雅녶릦�귞쉪鴉좄풏煐뽫쟻\n('auto'��'base64' �� 'quoted-printable'竊됮꺗鴉싦슴�⑨폑\n瓦숁삸�졽맏 SMTP �꾦솏�띰펽倻�\nhttp://www.ietf.org/rfc/rfc5322.txt��\n" #. type: Plain text #: en/git-send-email.txt:461 #, priority:100 msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`." -msgstr "" +msgstr "容섋�訝� `sendemail.validate` �꾢�쇽폑倻귝옖�よ�營�펽�숅퍡溫ㅴ맏 `--validate` �귝빊��" #. type: Plain text #: en/git-send-email.txt:464 #, priority:100 msgid "Send emails even if safety checks would prevent it." -msgstr "" +msgstr "�념슴若됧뀲汝��δ툖�곮�竊뚥튋誤곩룕�곭뵷耶먬궙餓뜰��" #. type: Title ~ #: en/git-send-email.txt:467 @@ -51347,19 +51347,19 @@ msgstr "--dump-aliases" #: en/git-send-email.txt:474 #, priority:100 msgid "Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order. Note, this only includes the alias name and not its expanded email addresses. See 'sendemail.aliasesfile' for more information about aliases." -msgstr "" +msgstr "訝띷돢烏뚧�躍멩뱧鵝쒙펽�뚧삸餓롩뀓營�쉪�ュ릫�뉏뻑訝�뙃耶쀦칾窈뷴틣驪뤺죱饔у춼訝�訝ら�잒��ュ릫�귝낏�륅펽瓦쇿룵�끾떖�ュ릫竊뚥툖�끾떖�뜻돥掠뺟쉪�드춴��뻑�겼��� �됧뀽�ュ릫�꾣쎍鸚싦에��펽瑥룟뢿�� 'sendemail.aliasesfile'��" #. type: Title ~ #: en/git-send-email.txt:486 #, no-wrap, priority:100 msgid "Use gmail as the smtp server" -msgstr "" +msgstr "鵝욜뵪 gmail 鵝쒍맏 smtp �띶뒦��" #. type: Plain text #: en/git-send-email.txt:489 #, priority:100 msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:" -msgstr "" +msgstr "誤곦슴�� 'git send-email' �싪퓝 GMail SMTP �띶뒦�ⓨ룕�곮‥訝곻펽瑥루폋渦� ~/.gitconfig �뉐츣兀�댎溫양쉰竊�" #. type: delimited block - #: en/git-send-email.txt:496 @@ -51381,13 +51381,13 @@ msgstr "" #: en/git-send-email.txt:501 #, priority:100 msgid "If you have multi-factor authentication set up on your Gmail account, you can generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it." -msgstr "" +msgstr "倻귝옖�①쉪 Gmail 兀�댎溫양쉰雅녶쩀�좂킔翁ヤ뻥謠뚩칮竊뚧궓��빳�잍닇訝�訝ゅ틪�①쮮佯뤶툜�ⓨ칳�곻펽堊� 'git send-email' 鵝욜뵪�귟�溫욥뿮 https://security.google.com/settings/security/apppasswords �쎾뻠野녺쟻��" #. type: Plain text #: en/git-send-email.txt:504 #, priority:100 msgid "Once your commits are ready to be sent to the mailing list, run the following commands:" -msgstr "" +msgstr "訝���궓�꾣룓雅ㅵ럴�녶쨭也썲룕�곮눛��뻑�쀨〃竊뚩�瓦먫죱餓δ툔�썰빱竊�" #. type: Plain text #: en/git-send-email.txt:508 @@ -51405,19 +51405,19 @@ msgstr "" #: en/git-send-email.txt:513 #, priority:100 msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time." -msgstr "" +msgstr "腰뽪А瓦먫죱�띰펽楹사퍨鴉싨룓鹽뷸궓渦볟뀯��뜮�� 瑥룡졊��깄�듣풏�η돶若싦틢佯붺뵪葉뗥틣�꾢칳�곫닑躍멱쭊野녺쟻�� 倻귝옖�띸쉰雅녶눑��뒰�뗰펷�귟쭅 linkgit:git-credential[1]竊됵펽野녺쟻鴉싦퓷耶섇쑉��뜮耶섇궓�븝펽訝뗦А弱긴툖�ⓨ냽渦볟뀯雅녴��" #. type: Plain text #: en/git-send-email.txt:519 #, priority:100 msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP. These additional Perl modules are also required: Authen::SASL and Mail::Address." -msgstr "" +msgstr "力ⓩ꼷竊싮�誤곩츎獒끺빳訝� Perl �멨퓘與▼쓼竊뚩퓳雅쎿Æ�쀥룾�썲럴�� Perl �묋죱�덁�壅룟츎獒낉폏 MIME::Base64�갡IME::QuotedPrint�갢et::Domain �� Net::SMTP�� 瓦섌�誤곩츎獒낁퓳雅쏃쥫鸚뽫쉪 Perl 與▼쓼竊� Authen::SASL �� Mail::Address��" #. type: Plain text #: en/git-send-email.txt:524 #, priority:100 msgid "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)" -msgstr "" +msgstr "linkgit:git-format-patch[1], linkgit:git-imap-send[1], mbox(5)" #. type: Title = #: en/git-send-pack.txt:2 @@ -51575,13 +51575,13 @@ msgid "" "'chsh' -s $(command -v git-shell) <user>\n" "'git clone' <user>`@localhost:/path/to/repo.git`\n" "'ssh' <user>`@localhost`\n" -msgstr "" +msgstr "'chsh' -s $(command -v git-shell) <�ⓩ댎>\n'git clone' <�ⓩ댎>`@localhost:/path/to/repo.git`\n'ssh' <�ⓩ댎>`@localhost`\n" #. type: Plain text #: en/git-shell.txt:23 #, priority:100 msgid "This is a login shell for SSH accounts to provide restricted Git access. It permits execution only of server-side Git commands implementing the pull/push functionality, plus custom commands present in a subdirectory named `git-shell-commands` in the user's home directory." -msgstr "" +msgstr "瓦숁삸 SSH 兀�댎�꾤쇉壤� shell竊뚧룓堊쎾룛�먪쉪 Git 溫욥뿮�껈솏�� 若껃룵�곮��㎬죱若욅렟��/�ⓨ뒣�썹쉪�띶뒦�①ク Git �썰빱竊뚥빳�딁뵪�룝말��퐬訝�릫訝� `git-shell-commands` 耶먪쎅壤뺜툔�꾥눎若싦퉱�썰빱��" #. type: Plain text #: en/git-shell.txt:28 @@ -51593,79 +51593,79 @@ msgstr "'git shell' accepts the following commands after the `-c` option:" #: en/git-shell.txt:29 #, no-wrap, priority:100 msgid "'git receive-pack <argument>'" -msgstr "" +msgstr "'git receive-pack <�귝빊>'" #. type: Labeled list #: en/git-shell.txt:30 #, no-wrap, priority:100 msgid "'git upload-pack <argument>'" -msgstr "" +msgstr "'git upload-pack <�귝빊>'" #. type: Labeled list #: en/git-shell.txt:31 #, no-wrap, priority:100 msgid "'git upload-archive <argument>'" -msgstr "" +msgstr "'git upload-archive <�귝빊>'" #. type: Plain text #: en/git-shell.txt:35 #, priority:100 msgid "Call the corresponding server-side command to support the client's 'git push', 'git fetch', or 'git archive --remote' request." -msgstr "" +msgstr "瘟껆뵪�멨틪�꾣쐨�▼솳塋�뫝餓ㅿ펽餓ζ뵱�곩��루ク�� 'git push'��'git fetch' �� 'git archive --remote' 瑥룡콆��" #. type: Labeled list #: en/git-shell.txt:35 #, no-wrap, priority:100 msgid "'cvs server'" -msgstr "" +msgstr "�쁟vs �띶뒦�ⓥ��" #. type: Plain text #: en/git-shell.txt:37 #, priority:100 msgid "Imitate a CVS server. See linkgit:git-cvsserver[1]." -msgstr "" +msgstr "與▽뼁 CVS �띶뒦�ⓦ�� �귟쭅 linkgit:git-cvsserver[1]��" #. type: Plain text #: en/git-shell.txt:42 #, priority:100 msgid "If a `~/git-shell-commands` directory is present, 'git shell' will also handle other, custom commands by running \"`git-shell-commands/<command> <arguments>`\" from the user's home directory." -msgstr "" +msgstr "倻귝옖�� `~/git-shell-commands` ��퐬竊�'git shell' 阿잋폏鸚꾤릤�뜸퍟�ゅ츣阿됧뫝餓ㅿ펽�방퀡��퍗�ⓩ댎�꾡말��퐬瓦먫죱 \"`git-shell-commands/<�썰빱> <�귝빊>`\"��" #. type: Title - #: en/git-shell.txt:44 #, no-wrap, priority:100 msgid "INTERACTIVE USE" -msgstr "" +msgstr "雅ㅴ틨凉뤶슴��" #. type: Plain text #: en/git-shell.txt:48 #, priority:100 msgid "By default, the commands above can be executed only with the `-c` option; the shell is not interactive." -msgstr "" +msgstr "容섋��끻넻訝뗰펽訝딂염�썰빱�よ꺗�싪퓝 `-c` �됮」�㎬죱竊썆hell 訝띷삸雅ㅴ틨凉뤹쉪��" #. type: Plain text #: en/git-shell.txt:56 #, priority:100 msgid "If a `~/git-shell-commands` directory is present, 'git shell' can also be run interactively (with no arguments). If a `help` command is present in the `git-shell-commands` directory, it is run to provide the user with an overview of allowed actions. Then a \"git> \" prompt is presented at which one can enter any of the commands from the `git-shell-commands` directory, or `exit` to close the connection." -msgstr "" +msgstr "倻귝옖�� `~/git-shell-commands` ��퐬竊�'git shell' 阿잌룾餓δ벡雅믣폀瓦먫죱竊덁툖躍�뢿�곤펹�� 倻귝옖 `git-shell-commands` ��퐬訝�쐣 `help` �썰빱竊뚦닕鴉싪퓧烏뚩��썰빱�묊뵪�룡룓堊쎾뀅溫멩뱧鵝쒐쉪礖귟쭏�� �뜹릮鴉싧눣�� \"git>\" �먪ㅊ竊뚨뵪�룟룾餓ε쑉閭ㅸ풏��`git-shell-commands`��퐬訝뗧쉪餓삡퐬�썰빱竊뚧닑`exit`�녜뿭瓦욄렏��" #. type: Plain text #: en/git-shell.txt:61 #, priority:100 msgid "Generally this mode is used as an administrative interface to allow users to list repositories they have access to, create, delete, or rename repositories, or change repository descriptions and permissions." -msgstr "" +msgstr "訝��ф깄�듕툔竊뚩�與▼폀�ⓧ퐳嶸←릤�뚪씊竊뚦뀅溫며뵪�룟닓�뷰퍟餓у룾餓θ���쉪壅꾣틦佯볩펽�쎾뻠�곩닠�ㅶ닑�띶뫝�띹탡繹먨틩竊뚧닑�닸뵻壅꾣틦佯볢��롥뭽�껈솏��" #. type: Plain text #: en/git-shell.txt:64 #, priority:100 msgid "If a `no-interactive-login` command exists, then it is run and the interactive shell is aborted." -msgstr "" +msgstr "倻귝옖耶섇쑉 `no-interactive-login` �썰빱竊뚦닕瓦먫죱瑥ε뫝餓ㅵ뭉瀯덃�雅ㅴ틨凉� shell��" #. type: Plain text #: en/git-shell.txt:69 #, priority:100 msgid "To disable interactive logins, displaying a greeting instead:" -msgstr "" +msgstr "獵곭뵪雅ㅴ틨凉뤹쇉壤뺧펽�양ㅊ���숃�竊�" #. type: delimited block - #: en/git-shell.txt:80 @@ -51695,7 +51695,7 @@ msgstr "" #: en/git-shell.txt:85 #, priority:100 msgid "To enable git-cvsserver access (which should generally have the `no-interactive-login` example above as a prerequisite, as creating the git-shell-commands directory allows interactive logins):" -msgstr "" +msgstr "誤곩맦�� git-cvsserver 溫욥뿮�껈솏竊덁��у틪餓δ툓�®쉪 `no-interactive-login` 鹽뷰풃訝뷴뎺�먲펽�졽맏�쎾뻠 git-shell-commands ��퐬�곮�雅ㅴ틨凉뤹쇉壤뺧펹竊�" #. type: delimited block - #: en/git-shell.txt:96 @@ -52028,7 +52028,7 @@ msgstr "git-show-branch(1)" #: en/git-show-branch.txt:7 #, priority:100 msgid "git-show-branch - Show branches and their commits" -msgstr "" +msgstr "git-show-branch - �양ㅊ�녷뵱�듿끀�먧벡�끻넻" #. type: Plain text #: en/git-show-branch.txt:17 @@ -52052,19 +52052,19 @@ msgstr "" #: en/git-show-branch.txt:24 #, priority:100 msgid "Shows the commit ancestry graph starting from the commits named with <rev>s or <glob>s (or all refs under refs/heads and/or refs/tags) semi-visually." -msgstr "" +msgstr "餓ε뜇�닺쭆�꾣뼶凉뤸샑鹽뷰퍗餓� <rev>s �� <�싮뀓寧�>s �썲릫�꾣룓雅ㅿ펷�� refs/heads ��/�� refs/tags 訝뗧쉪���됧폊�⑨펹凉�冶뗧쉪�먧벡曄뽩뀍�얇��" #. type: Plain text #: en/git-show-branch.txt:26 #, priority:100 msgid "It cannot show more than 29 branches and commits at a time." -msgstr "" +msgstr "若껂툖�썲릪�뜻샑鹽븃텈瓦� 29 訝ゅ늽��뭽�먧벡��" #. type: Plain text #: en/git-show-branch.txt:29 #, priority:100 msgid "It uses `showbranch.default` multi-valued configuration items if no <rev> or <glob> is given on the command line." -msgstr "" +msgstr "倻귝옖�썰빱烏뚥릎亦→쐣瀯쇿눣 <rev> �� <�싮뀓寧�>竊뚦츆鴉싦슴�� `showbranch.default` 鸚싧�쇤뀓營�」��" #. type: Labeled list #: en/git-show-branch.txt:33 @@ -52076,31 +52076,31 @@ msgstr "<rev>" #: en/git-show-branch.txt:36 #, priority:100 msgid "Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that typically names a branch head or a tag." -msgstr "" +msgstr "餓삥꼷�⒴콝�� SHA-1 烏②씨凉륅펷�귟쭅 linkgit:gitrevisions[7]竊됵펽�싧만�ⓧ틢�썲릫�녷뵱鸚닸닑�뉒���" #. type: Labeled list #: en/git-show-branch.txt:37 #, no-wrap, priority:100 msgid "<glob>" -msgstr "" +msgstr "<�싮뀓寧�>" #. type: Plain text #: en/git-show-branch.txt:42 #, priority:100 msgid "A glob pattern that matches branch or tag names under refs/. For example, if you have many topic branches under refs/heads/topic, giving `topic/*` would show all of them." -msgstr "" +msgstr "�백뀓 refs/ 訝뗥늽��닑�뉓��띸㎞�꾦�싮뀓與▼폀�� 堊뗥쫩竊뚦쫩�쒎쑉 refs/heads/topic 訝뗦쐣溫멨쩀訝삯쥦�녷뵱竊뚪궍阿덅풏�� `topic/*` 弱긴폏�양ㅊ���됧늽����" #. type: Plain text #: en/git-show-branch.txt:46 #, priority:100 msgid "Show the remote-tracking branches." -msgstr "" +msgstr "�양ㅊ瓦쒐쮮瓮잒릉�녷뵱��" #. type: Plain text #: en/git-show-branch.txt:50 #, priority:100 msgid "Show both remote-tracking branches and local branches." -msgstr "" +msgstr "�뚧뿶�양ㅊ瓦쒐쮮瓮잒릉�녷뵱�뚧쑍�겼늽����" #. type: Labeled list #: en/git-show-branch.txt:51 @@ -52112,7 +52112,7 @@ msgstr "--current" #: en/git-show-branch.txt:55 #, priority:100 msgid "With this option, the command includes the current branch to the list of revs to be shown when it is not given on the command line." -msgstr "" +msgstr "鵝욜뵪瑥ι�됮」�롳펽壤볟뫝餓ㅸ죱訝�깹�됬퍢�뷴퐪�띶늽��쉪�덃쑍�룡뿶竊뚦뫝餓ㅴ폏弱녻��녷뵱�끻맜�②쫨�양ㅊ�꾤뎵�у뤇�쀨〃訝���" #. type: Labeled list #: en/git-show-branch.txt:56 en/rev-list-options.txt:853 @@ -52124,7 +52124,7 @@ msgstr "--topo-order" #: en/git-show-branch.txt:61 #, priority:100 msgid "By default, the branches and their commits are shown in reverse chronological order. This option makes them appear in topological order (i.e., descendant commits are shown before their parents)." -msgstr "" +msgstr "容섋��끻넻訝뗰펽�녷뵱�듿끀�먧벡�됪뿶�닷�믣틣�양ㅊ�� 閭ㅹ�됮」��슴若껂뺄�됪땽�묌『佯뤸샑鹽븝펷�녑춴�녷뵱�먧벡�양ㅊ�①댍�녷뵱阿뗥뎺竊됥��" #. type: Labeled list #: en/git-show-branch.txt:62 en/rev-list-options.txt:845 @@ -52136,13 +52136,13 @@ msgstr "--date-order" #: en/git-show-branch.txt:66 #, priority:100 msgid "This option is similar to `--topo-order` in the sense that no parent comes before all of its children, but otherwise commits are ordered according to their commit date." -msgstr "" +msgstr "瑥ι�됮」映삡세雅� `-topo-order`竊뚦뜵�뜻룓雅ㅴ툖鴉싨럲�ⓩ��됧춴�먧벡阿뗥뎺竊뚥퐜阿잋폏�방뜮�먧벡�ζ쐿野방룓雅ㅸ퓵烏뚧럲佯뤵��" #. type: Plain text #: en/git-show-branch.txt:71 #, priority:100 msgid "By default, the output omits merges that are reachable from only one tip being shown. This option makes them visible." -msgstr "" +msgstr "容섋��끻넻訝뗰펽渦볟눣鴉싧옙�ε룵�양ㅊ訝�訝ゆ룓鹽븀쉪�덂뭉�� 瑥ι�됮」弱녵슴若껂뺄��쭅��" #. type: Labeled list #: en/git-show-branch.txt:72 @@ -52154,7 +52154,7 @@ msgstr "--more=<n>" #: en/git-show-branch.txt:78 #, priority:100 msgid "Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go <n> more common commits beyond that. When <n> is negative, display only the <ref>s given, without showing the commit ancestry tree." -msgstr "" +msgstr "�싧만竊뚦뫝餓ㅴ폏�ⓩ샑鹽뷸��됧늽��쉪�긷릪曄뽩뀍�먧벡�롥걶閭�풏�뷩�� 閭ㅶ젃溫겻폏�딂칹�썰빱�ⓩ��븀�訝듿냽�양ㅊ <n> 轝▼뀻�뚧룓雅ㅳ�� 壤� <n> 訝븃킓�경뿶竊뚦룵�양ㅊ瀯쇿눣�� <凉뺟뵪>竊뚩�뚥툖�양ㅊ�먧벡曄뽩뀍�묆��" #. type: Plain text #: en/git-show-branch.txt:81 @@ -52166,13 +52166,13 @@ msgstr "�� `--more=-1`" #: en/git-show-branch.txt:88 #, priority:100 msgid "Instead of showing the commit list, determine possible merge bases for the specified commits. All merge bases will be contained in all specified commits. This is different from how linkgit:git-merge-base[1] handles the case of three or more commits." -msgstr "" +msgstr "訝띷샑鹽뷸룓雅ㅵ닓烏⑨펽�뚧삸簾�츣�뉐츣�먧벡�꾢룾�썲릦亮뜹틩�귝��됧릦亮뜹틩�썲컛�끻맜�ⓩ��됪뙁若싩쉪�먧벡訝��귟퓳訝� linkgit:git-merge-base[1] 鸚꾤릤訝됦릉�뽪쎍鸚싨룓雅ㅷ쉪�밧폀訝띶릪��" #. type: Plain text #: en/git-show-branch.txt:92 #, priority:100 msgid "Among the <ref>s given, display only the ones that cannot be reached from any other <ref>." -msgstr "" +msgstr "�①퍢�븀쉪鸚싦릉 <凉뺟뵪> 訝�펽�ゆ샑鹽뷸뿞力뺜퍗�뜸퍟 <凉뺟뵪> �계씨�� <凉뺟뵪> ��" #. type: Labeled list #: en/git-show-branch.txt:93 @@ -52184,7 +52184,7 @@ msgstr "--no-name" #: en/git-show-branch.txt:95 #, priority:100 msgid "Do not show naming strings for each commit." -msgstr "" +msgstr "訝띷샑鹽뷸캀轝→룓雅ㅷ쉪�썲릫耶쀧Е訝꿔��" #. type: Labeled list #: en/git-show-branch.txt:96 @@ -52196,7 +52196,7 @@ msgstr "--sha1-name" #: en/git-show-branch.txt:101 #, priority:100 msgid "Instead of naming the commits using the path to reach them from heads (e.g. \"master~2\" to mean the grandparent of \"master\"), name them with the unique prefix of their object names." -msgstr "" +msgstr "�ⓨ뫝�띷룓雅ㅶ뿶竊뚥툖誤곦슴�ⓧ퍗鸚닷댆弱양쉪瓮�푶竊덁풃倻귨펽\"master~2\" 烏①ㅊ \"master\" �꾤쪝�덌펹竊뚩�뚧삸鵝욜뵪野배괌�띸㎞�꾢뵱訝��띸���" #. type: Labeled list #: en/git-show-branch.txt:102 @@ -52208,7 +52208,7 @@ msgstr "--topics" #: en/git-show-branch.txt:109 #, priority:100 msgid "Shows only commits that are NOT on the first branch given. This helps track topic branches by hiding any commit that is already in the main line of development. When given \"git show-branch --topics master topic1 topic2\", this will show the revisions given by \"git rev-list {caret}master topic1 topic2\"" -msgstr "" +msgstr "�ゆ샑鹽뷰툖�①К訝�訝ゅ늽��툓�꾣룓雅ㅳ�� 瓦숁쐣�⒳틢瓮잒릉訝삯쥦�녷뵱竊뚪쉺�뤶뻣鵝뺝럴�ⓧ말瀛욕��묇릎�꾣룓雅ㅳ�� 壤볡퍢�� \"git show-branch --topics master topic1 topic2\" �띰펽弱녷샑鹽� \"git rev-list {caret}master topic1 topic2\" 瀯쇿눣�꾡엶溫®뎵��" #. type: Labeled list #: en/git-show-branch.txt:111 @@ -52220,43 +52220,43 @@ msgstr "--reflog[=<n>[,<base>]] [<ref>]" #: en/git-show-branch.txt:117 #, priority:100 msgid "Shows <n> most recent ref-log entries for the given ref. If <base> is given, <n> entries going back from that entry. <base> can be specified as count or date. When no explicit <ref> parameter is given, it defaults to the current branch (or `HEAD` if it is detached)." -msgstr "" +msgstr "�양ㅊ瀯쇿츣凉뺟뵪�� <n> �→��겼폊�ⓩ뿥恙쀨�壤뺛�� 倻귝옖瀯쇿츣 <�븀궧>竊뚦닕�양ㅊ餓롨��←쎅凉�冶뗧쉪 <n> �←쎅�� <�븀궧> ��빳�뉐츣訝븃��경닑�ζ쐿�� 倻귝옖亦→쐣瀯쇿눣�롧‘�� <凉뺟뵪> �귝빊竊뚦닕容섋�訝뷴퐪�띶늽��펷倻귝옖��늽獵삣늽��펽�쇾맏 `HEAD`竊됥��" #. type: Plain text #: en/git-show-branch.txt:122 #, priority:100 msgid "Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. The value must be always (the default), never, or auto." -msgstr "" +msgstr "訝뷸캀訝ゆ룓雅ㅷ쉪�뜻�곭Е�뤄펷�뜸릎阿뗤�竊�`*``竊�```+```-`竊됬��뀐펽訝롥츆���①쉪�녷뵱�멨�佯붵�� �쇔퓚窈삥삸 always竊덃�삥삸竊됵펷容섋��쇽펹�걆ever竊덁퍗訝랃펹�� auto竊덅눎�⑨펹��" #. type: Plain text #: en/git-show-branch.txt:127 #, priority:100 msgid "Turn off colored output, even when the configuration file gives the default to color output. Same as `--color=never`." -msgstr "" +msgstr "�녜뿭壤⑵돯渦볟눣竊뚦뜵鵝욥뀓營�뻼餓띌퍡溫ㅴ맏壤⑵돯渦볟눣�� 訝� `-color=never` �멨릪��" #. type: Plain text #: en/git-show-branch.txt:130 #, priority:100 msgid "Note that --more, --list, --independent and --merge-base options are mutually exclusive." -msgstr "" +msgstr "瑥룡낏�륅펽--more��--list��--independent �� --merge-base �됮」��틨�η쉪��" #. type: Plain text #: en/git-show-branch.txt:139 #, priority:100 msgid "Given N <ref>s, the first N lines are the one-line description from their commit message. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other heads are prefixed with a `!` character." -msgstr "" +msgstr "瀯쇿츣 N 訝� <凉뺟뵪>竊뚦뎺 N 烏뚧삸�뜻룓雅ㅴ에��릎�꾢뜒烏뚧룒瓦겹��$GIT_DIR/HEAD ���뉐릲�꾢늽��ㅄ�띸�訝뷸삜�� `*` 耶쀧Е竊뚩�뚦끀餓뽩늽��ㅄ�띸�訝� `!` 耶쀧Е��" #. type: Plain text #: en/git-show-branch.txt:146 #, priority:100 msgid "Following these N lines, one-line log for each commit is displayed, indented N places. If a commit is on the I-th branch, the I-th indentation character shows a `+` sign; otherwise it shows a space. Merge commits are denoted by a `-` sign. Each commit shows a short name that can be used as an extended SHA-1 to name that commit." -msgstr "" +msgstr "�②퓳 N 烏뚥퉳�롳펽鴉싨샑鹽뷸캀訝ゆ룓雅ㅷ쉪�뺠죱�ε퓱竊뚨섄瓦� N 鵝띲�� 倻귝옖�먧벡�①К I 訝ゅ늽��툓竊뚦닕寧� I 訝ょ섄瓦쎾춻寧�샑鹽뷰맏 `+` �뤄펽��닕�양ㅊ訝븀㈉�쇈�� �덂뭉�먧벡�� `-` 寧�뤇烏①ㅊ�� 驪뤶릉�먧벡�썰폏�양ㅊ訝�訝ょ���쉪�띸㎞竊뚦룾餓δ퐳訝뷸돥掠� SHA-1 �ε뫝�띹��먧벡��" #. type: Plain text #: en/git-show-branch.txt:149 #, priority:100 msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":" -msgstr "" +msgstr "訝뗩씊�꾤ㅊ堊뗦샑鹽뷰틙訝됦릉�녷뵱竊�\"master\"��\"fixes \"�� \"mhf\"竊�" #. type: delimited block - #: en/git-show-branch.txt:155 @@ -52289,19 +52289,19 @@ msgid "" " + [mhf~7] Multi-head fetch.\n" " + [mhf~8] Start adding the $GIT_DIR/remotes/ support.\n" "*++ [master] Add 'git show-branch'.\n" -msgstr "" +msgstr " + [mhf] �곮� \"+remote:local\" 凉뺟뵪鰲꾥똽�②렩�뽪뿶野쇠눜 --force��\n + [mhf~1] �됧룚鸚싦릉鸚닸뿶鵝욜뵪 git-octopus��\n + [fixes] �� \"git reset\" 訝�폊�� \"reset type\" �뉐퓱\n + [mhf~2] \"git fetch --force\".\n + [mhf~3] 鵝욜뵪 .git/remote/origin竊뚩�뚥툖�� .git/branches/origin��\n + [mhf~4] 弱� \"git pull\" �� \"git fetch\" 容섋�訝� origin\n + [mhf~5] ��릫��몭�� �섊쳽浴쇽펷鸚싪러竊됧릦亮뜯��\n + [mhf~6] �띹캊 git-parse-remote��\n + [mhf~7] �룟룚鸚싦릉鸚�\n + [mhf~8] 凉�冶뗦렌�� $GIT_DIR/remotes/ ��똻��\n*++ [master] 曆삣뒥 'git show-branch'��\n" #. type: Plain text #: en/git-show-branch.txt:174 #, priority:100 msgid "These three branches all forked from a common commit, [master], whose commit message is \"Add \\'git show-branch'\". The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" branch adds many other commits. The current branch is \"master\"." -msgstr "" +msgstr "瓦쇾툒訝ゅ늽��꺗�녶룊�や�訝ゅ뀻�뚨쉪�먧벡 [master]竊뚦끀�먧벡岳→겘�� �쒏렌�� \\'git show-branch'�앫�� \"fixes\" �녷뵱罌욃뒥雅녵�訝ゆ룓雅� \"�� \"git reset \"訝�폊�� \"reset type\" �뉐퓱\"��\"mhf\" �녷뵱罌욃뒥雅녻�鸚싧끀餓뽪룓雅ㅳ�� 壤볟뎺�녷뵱�� \"master\"��" #. type: Plain text #: en/git-show-branch.txt:182 #, priority:100 msgid "If you keep your primary branches immediately under `refs/heads`, and topic branches in subdirectories of it, having the following in the configuration file may help:" -msgstr "" +msgstr "倻귝옖鵝졾컛訝삣늽��붂�� `refs/heads` 訝뗰펽�뚥말窯섇늽��붂�ⓨ끀耶먪쎅壤뺜릎竊뚪궍阿덂쑉�띸쉰�뉏뻑訝�뒥�δ빳訝뗥냵若밧룾�썰폏�됪�躍�뒰竊�" #. type: delimited block - #: en/git-show-branch.txt:187 @@ -52310,13 +52310,13 @@ msgid "" "[showbranch]\n" "\tdefault = --topo-order\n" "\tdefault = heads/*\n" -msgstr "" +msgstr "[showbranch]\n\tdefault = --topo-order\n\tdefault = heads/*\n" #. type: Plain text #: en/git-show-branch.txt:193 #, priority:100 msgid "With this, `git show-branch` without extra parameters would show only the primary branches. In addition, if you happen to be on your topic branch, it is shown as well." -msgstr "" +msgstr "瓦숁졆竊뚥툖躍�쥫鸚뽩뢿�곁쉪 `git show-branch` 弱긷룵�썸샑鹽뷰말�녷뵱�� 閭ㅵ쨼竊뚦쫩�쒏궓�겼��ⓩ궓�꾡말窯섇늽��툓竊뚦츆阿잋폏�양ㅊ�뷸씎��" #. type: delimited block - #: en/git-show-branch.txt:196 @@ -52328,7 +52328,7 @@ msgstr "$ git show-branch --reflog=\"10,1 hour ago\" --list master\n" #: en/git-show-branch.txt:201 #, priority:100 msgid "shows 10 reflog entries going back from the tip as of 1 hour ago. Without `--list`, the output also shows how these tips are topologically related with each other." -msgstr "" +msgstr "�양ㅊ雅� 10 �▽퍗 1 弱뤸뿶�띸쉪�먪ㅊ凉�冶뗧쉪凉뺟뵪�ε퓱�←쎅�� 倻귝옖訝띴슴�� `--list`竊뚩풏�븀퍜�쒑퓲鴉싨샑鹽븃퓳雅쎿룓鹽뷰퉳�당쉪�볠뎾�녕내��" #. type: Title = #: en/git-show-index.txt:2 @@ -52340,7 +52340,7 @@ msgstr "git-show-index(1)" #: en/git-show-index.txt:7 #, priority:100 msgid "git-show-index - Show packed archive index" -msgstr "" +msgstr "git-show-index - �양ㅊ�볟똿�꾣。旅덄뇨凉�" #. type: Plain text #: en/git-show-index.txt:13 @@ -52352,37 +52352,37 @@ msgstr "'git show-index' [--object-format=<hash-algorithm>]\n" #: en/git-show-index.txt:22 #, priority:100 msgid "Read the `.idx` file for a Git packfile (created with linkgit:git-pack-objects[1] or linkgit:git-index-pack[1]) from the standard input, and dump its contents. The output consists of one object per line, with each line containing two or three space-separated columns:" -msgstr "" +msgstr "餓롦젃�녻풏�θ��� Git packfile �� `.idx` �뉏뻑竊덁슴�� linkgit:git-pack-objects[1] �� linkgit:git-index-pack[1] �쎾뻠竊됵펽亮띈쉬�ⓨ끀�끻��귟풏�뷴똿�ф캀烏뚥�訝ゅ�穩∽펽驪뤺죱�끻맜訝ㅵ댆訝됦릉令뷸졏�녽슂�꾢닓竊�" #. type: Plain text #: en/git-show-index.txt:25 #, priority:100 msgid "the first column is the offset in bytes of the object within the corresponding packfile" -msgstr "" +msgstr "寧т��쀦삸野배괌�①쎑佯붹돀�끾뻼餓뜸릎�꾢걦燁삯뇧竊덁빳耶쀨뒄訝뷴뜒鵝랃펹" #. type: Plain text #: en/git-show-index.txt:27 #, priority:100 msgid "the second column is the object id of the object" -msgstr "" +msgstr "寧т틠�쀦삸野배괌�꾢�穩� ID" #. type: Plain text #: en/git-show-index.txt:30 #, priority:100 msgid "if the index version is 2 or higher, the third column contains the CRC32 of the object data" -msgstr "" +msgstr "倻귝옖榮℡폊�덃쑍訝� 2 �뽪쎍遙섓펽寧т툒�쀥똿�ュ�穩→빊��쉪 CRC32" #. type: Plain text #: en/git-show-index.txt:34 #, priority:100 msgid "The objects are output in the order in which they are found in the index file, which should be (in a correctly constructed file) sorted by object id." -msgstr "" +msgstr "野배괌弱녷뙃�㎩쑉榮℡폊�뉏뻑訝�돻�곁쉪窈뷴틣渦볟눣竊뚨뇨凉뺞뻼餓뜹틪竊덂쑉閭g‘�꾢뻠�꾣뻼餓뜸릎竊됪뙃�㎩�穩� ID �믣틣��" #. type: Plain text #: en/git-show-index.txt:38 #, priority:100 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible." -msgstr "" +msgstr "瑥룡낏�륅펽�ⓨ룾餓ι�싪퓝瘟껆뵪 linkgit:git-verify-pack[1] �룟룚�닷쩀�념틢�볟똿�뉏뻑�꾡에���귚툖瓦뉛펽�긴틢瑥ε뫝餓ㅵ룵�껇솑榮℡폊�뉏뻑�ц벴竊뚦썱閭ㅹ�잌벧�닷엮竊뚥튋�당겣域삠��" #. type: Plain text #: en/git-show-index.txt:47 @@ -52870,13 +52870,13 @@ msgstr "The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by ot #: en/git-sh-setup.txt:29 #, priority:100 msgid "Before sourcing it, your script should set up a few variables; `USAGE` (and `LONG_USAGE`, if any) is used to define message given by `usage()` shell function. `SUBDIRECTORY_OK` can be set if the script can run from a subdirectory of the working tree (some commands do not)." -msgstr "" +msgstr "�ⓩ틦�곩뙑阿뗥뎺竊뚩꽊�у틪瑥θ�營��雅쎾룜�륅폑`USAGE`竊덂뭽 `LONG_USAGE`竊뚦쫩�쒏쐣�꾥캕竊됬뵪雅롥츣阿� shell �썸빊 `usage()` 瀯쇿눣�꾡에���� 倻귝옖�싨쑍��빳餓롥램鵝쒏젒�꾢춴��퐬瓦먫죱竊뚦닕��빳溫양쉰 `SUBDIRECTORY_OK`竊덃윇雅쎾뫝餓ㅴ툖�썰퍗耶먪쎅壤뺠퓧烏뚳펹��" #. type: Plain text #: en/git-sh-setup.txt:32 #, priority:100 msgid "The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but does *not* export them to the environment." -msgstr "" +msgstr "�싨쑍弱뤹쮮佯뤶폏溫양쉰 `GIT_DIR` �� `GIT_OBJECT_DIRECTORY` shell �섌뇧竊뚥퐜*訝띴폏*野쇔눣若껂뺄�곁렞罌껂릎��" #. type: Labeled list #: en/git-sh-setup.txt:36 @@ -52888,7 +52888,7 @@ msgstr "die" #: en/git-sh-setup.txt:39 #, priority:100 msgid "exit after emitting the supplied error message to the standard error stream." -msgstr "" +msgstr "弱녷룓堊쏁쉪�숃�岳→겘�묌�곩댆�뉐뇛�숃�役곩릮���뷩��" #. type: Labeled list #: en/git-sh-setup.txt:40 @@ -52900,7 +52900,7 @@ msgstr "usage" #: en/git-sh-setup.txt:42 #, priority:100 msgid "die with the usage message." -msgstr "" +msgstr "瀯볠씇竊뚦뭉�양ㅊ鵝욜뵪岳→겘��" #. type: Labeled list #: en/git-sh-setup.txt:43 @@ -52912,7 +52912,7 @@ msgstr "set_reflog_action" #: en/git-sh-setup.txt:49 #, priority:100 msgid "Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of the program) unless it is already set. Whenever the script runs a `git` command that updates refs, a reflog entry is created using the value of this string to leave the record of what command updated the ref." -msgstr "" +msgstr "弱� `GIT_REFLOG_ACTION` ��쥊溫양쉰訝븀퍢若싩쉪耶쀧Е訝뀐펷�싧만��쮮佯뤷릫燁곤펹竊뚪솮�욃츆藥꿰퍘熬ヨ�營��� 驪뤷퐪�싨쑍瓦먫죱�닸뼭凉뺟뵪�� `git` �썰빱�띰펽弱긴폏鵝욜뵪瑥ε춻寧╊림�꾢�쇔닗兩뷰�訝ゅ폊�ⓩ뿥恙쀦씉��펽餓θ�壤뺞쎍�겼폊�①쉪�썰빱��" #. type: Labeled list #: en/git-sh-setup.txt:50 @@ -52924,7 +52924,7 @@ msgstr "git_editor" #: en/git-sh-setup.txt:54 #, priority:100 msgid "runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) on a given file, but error out if no editor is specified and the terminal is dumb." -msgstr "" +msgstr "�①퍢若싨뻼餓뜸툓瓦먫죱�ⓩ댎�됪떓�꾤폋渦묈솳竊뉷IT_EDITOR�갷ore.editor�갫ISUAL �� EDITOR竊됵펽鵝녶쫩�쒏쑋�뉐츣煐뽬풌�ⓧ툝瀯덄ク訝뷴뱫瀯덄ク竊뚦닕鴉싧눣�쇻��" #. type: Labeled list #: en/git-sh-setup.txt:55 @@ -52936,7 +52936,7 @@ msgstr "is_bare_repository" #: en/git-sh-setup.txt:59 #, priority:100 msgid "outputs `true` or `false` to the standard output stream to indicate if the repository is a bare repository (i.e. without an associated working tree)." -msgstr "" +msgstr "鴉싧릲�뉐뇛渦볟눣役곮풏�� `true` �� `false`竊뚥빳�뉒ㅊ�덃쑍佯볠삸�╊맏獒멧퍜佯볩펷�녔깹�됦뻣鵝뺝뀽�붺쉪藥δ퐳�븝펹��" #. type: Labeled list #: en/git-sh-setup.txt:60 @@ -52960,7 +52960,7 @@ msgstr "require_work_tree" #: en/git-sh-setup.txt:66 #, priority:100 msgid "checks if the current directory is within the working tree of the repository, and otherwise dies." -msgstr "" +msgstr "鴉싨��ε퐪�띸쎅壤뺞삸��쑉餓볟틩�꾢램鵝쒎뙷訝�펽��닕弱길똼壅룔��" #. type: Labeled list #: en/git-sh-setup.txt:67 @@ -52972,25 +52972,25 @@ msgstr "require_work_tree_exists" #: en/git-sh-setup.txt:72 #, priority:100 msgid "checks if the working tree associated with the repository exists, and otherwise dies. Often done before calling cd_to_toplevel, which is impossible to do if there is no working tree." -msgstr "" +msgstr "汝��δ툗餓볟틩�멨뀽�붺쉪藥δ퐳�뷸삸��춼�⑨펽��닕�귝럦�� �싧만�②컘�� cd_to_toplevel 阿뗥뎺瓦쏂죱竊뚦쫩�쒏깹�됧램鵝쒎뙷竊뚦갚訝띶룾�썼컘�� cd_to_toplevel��" #. type: Labeled list #: en/git-sh-setup.txt:73 #, no-wrap, priority:100 msgid "require_clean_work_tree <action> [<hint>]" -msgstr "" +msgstr "require_clean_work_tree <烏뚥맏> [<�먪ㅊ>]" #. type: Plain text #: en/git-sh-setup.txt:78 #, priority:100 msgid "checks that the working tree and index associated with the repository have no uncommitted changes to tracked files. Otherwise it emits an error message of the form `Cannot <action>: <reason>. <hint>`, and dies. Example:" -msgstr "" +msgstr "鴉싨��δ툗餓볟틩�녘걫�꾢램鵝쒎뙷�뚨뇨凉뺜릎��맔�됪쑋�먧벡�꾥퇎甕ゆ뻼餓뜹룜�담�� ��닕竊뚦츆弱녶룕�� \"�졿퀡�㎬죱 <烏뚥맏>:<�잌썱>. <�먪ㅊ>\"竊뚨꽫�롦똼�됥�귚풃倻귨폏" #. type: delimited block - #: en/git-sh-setup.txt:81 #, no-wrap, priority:100 msgid "require_clean_work_tree rebase \"Please commit or stash them.\"\n" -msgstr "" +msgstr "require_clean_work_tree rebase \"瑥룡룓雅ㅶ닑�낁눔�뤶퍟餓с��\"\n" #. type: Labeled list #: en/git-sh-setup.txt:83 @@ -53002,7 +53002,7 @@ msgstr "get_author_ident_from_commit" #: en/git-sh-setup.txt:86 #, priority:100 msgid "outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit." -msgstr "" +msgstr "渦볟눣訝� eval �띶릦鵝욜뵪�꾡빰�곻펽餓θ�營�뙁若싨룓雅ㅷ쉪 GIT_AUTHOR_NAME�갍IT_AUTHOR_EMAIL �� GIT_AUTHOR_DATE �섌뇧��" #. type: Labeled list #: en/git-sh-setup.txt:87 @@ -53014,7 +53014,7 @@ msgstr "create_virtual_base" #: en/git-sh-setup.txt:92 #, priority:100 msgid "modifies the first file so only lines in common with the second file remain. If there is insufficient common material, then the first file is left empty. The result is suitable as a virtual base input for a 3-way merge." -msgstr "" +msgstr "岳�뵻寧т�訝ゆ뻼餓띰펽�や퓷�쇾툗寧т틠訝ゆ뻼餓띄쎑�뚨쉪烏뚣�귛쫩�쒎뀻�뚦냵若밥툖擁놂펽�숂К訝�訝ゆ뻼餓띄븰令뷩�귞퍜�쒒�귛릦鵝쒍맏訝됧릲�덂뭉�꾥솞�잌읃簾�渦볟뀯��" #. type: Title = #: en/git-stage.txt:2 @@ -53026,7 +53026,7 @@ msgstr "git-stage(1)" #: en/git-stage.txt:7 #, priority:100 msgid "git-stage - Add file contents to the staging area" -msgstr "" +msgstr "git-stage - 弱녷뻼餓뜹냵若방렌�졾댆�귛춼��" #. type: Plain text #: en/git-stage.txt:13 @@ -53038,7 +53038,7 @@ msgstr "'git rev-parse' [<options>] <args>...\n" #: en/git-stage.txt:20 #, priority:100 msgid "This is a synonym for linkgit:git-add[1]. Please refer to the documentation of that command." -msgstr "" +msgstr "瓦숁삸 linkgit:git-add[1] �꾢릪阿됭칾�� 瑥룟뢿�낁��썰빱�꾣뻼旅c��" #. type: Title = #: en/git-stash.txt:2 @@ -54520,7 +54520,7 @@ msgstr "git-stripspace(1)" #: en/git-stripspace.txt:7 #, priority:100 msgid "git-stripspace - Remove unnecessary whitespace" -msgstr "" +msgstr "git-stripspace - �삯솮訝띶퓚誤곭쉪令븀쇋" #. type: Plain text #: en/git-stripspace.txt:14 @@ -54528,49 +54528,49 @@ msgstr "" msgid "" "'git stripspace' [-s | --strip-comments]\n" "'git stripspace' [-c | --comment-lines]\n" -msgstr "" +msgstr "'git stripspace' [-s | --strip-comments]\n'git stripspace' [-c | --comment-lines]\n" #. type: Plain text #: en/git-stripspace.txt:21 #, priority:100 msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git." -msgstr "" +msgstr "餓롦젃�녻풏�δ릎瑥삣룚�뉑쑍竊뚦쫩�먧벡岳→겘�곫낏�듽�곫젃嶺얍뭽�녷뵱�뤺염竊뚦뭉�됬뀱 Git 鵝욜뵪�꾣뼶凉뤺퓵烏뚧툍�녴��" #. type: Plain text #: en/git-stripspace.txt:23 #, priority:100 msgid "With no arguments, this will:" -msgstr "" +msgstr "倻귝옖亦→쐣餓삡퐬�귝빊竊뚦갚鴉싪퓳�뤄폏" #. type: Plain text #: en/git-stripspace.txt:25 #, priority:100 msgid "remove trailing whitespace from all lines" -msgstr "" +msgstr "�좈솮���됭죱�꾢갼�①㈉��" #. type: Plain text #: en/git-stripspace.txt:26 #, priority:100 msgid "collapse multiple consecutive empty lines into one empty line" -msgstr "" +msgstr "弱녶쩀訝よ퓹瀯�㈉烏뚧뒛�졽맏訝�訝ょ㈉烏�" #. type: Plain text #: en/git-stripspace.txt:27 #, priority:100 msgid "remove empty lines from the beginning and end of the input" -msgstr "" +msgstr "�좈솮渦볟뀯�끻�凉�鸚닷뭽瀯볟갼�꾤㈉烏�" #. type: Plain text #: en/git-stripspace.txt:28 #, priority:100 msgid "add a missing '\\n' to the last line if necessary." -msgstr "" +msgstr "倻귝쐣恙낁쫨竊뚦쑉���롣�烏뚧렌�졽�訝ょ성鸚긺쉪 '\\n'��" #. type: Plain text #: en/git-stripspace.txt:31 #, priority:100 msgid "In the case where the input consists entirely of whitespace characters, no output will be produced." -msgstr "" +msgstr "倻귝옖渦볟뀯若뚦뀲�긺㈉�썲춻寧�퍍�먲펽�쇾툖鴉싦벨�잋뻣鵝뺠풏�뷩��" #. type: Plain text #: en/git-stripspace.txt:35 @@ -54579,7 +54579,7 @@ msgid "" "*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix`\n" "mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n" "the repository.\n" -msgstr "" +msgstr "*力ⓩ꼷*竊� 瓦숁삸�ⓩ씎歷끿릤�껅빊��쉪竊뚩�鴉섇뀍鵝욜뵪 `--whitespace=fix` 與▼폀�δ엶閭h‥訝곫닑�뉏뻑訝�쉪令븀쇋��\n與▼폀�δ엶閭h‥訝곫닑餓볟틩訝�뻼餓띄쉪令븀쇋��\n餓볟틩訝�쉪烏δ툈�뽪뻼餓�\n" #. type: Labeled list #: en/git-stripspace.txt:39 @@ -54591,7 +54591,7 @@ msgstr "--strip-comments" #: en/git-stripspace.txt:41 #, priority:100 msgid "Skip and remove all lines starting with comment character (default '#')." -msgstr "" +msgstr "瓮녘퓝亮뜹닠�ㅶ��됦빳力③뇢耶쀧Е竊덆퍡溫ㅴ맏 \"#\"竊됧�鸚당쉪烏뚣��" #. type: Labeled list #: en/git-stripspace.txt:43 @@ -54603,13 +54603,13 @@ msgstr "--comment-lines" #: en/git-stripspace.txt:47 #, priority:100 msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended." -msgstr "" +msgstr "�ⓩ캀烏뚦뎺曆삣뒥力③뇢耶쀧Е�뚨㈉�썬�귟죱弱녻눎�ⓧ빳��죱寧�퍜�잆�귛�雅롧㈉烏뚳펽�や폏窯꾤쉰力③뇢耶쀧Е��" #. type: Plain text #: en/git-stripspace.txt:52 #, priority:100 msgid "Given the following noisy input with '$' indicating the end of a line:" -msgstr "" +msgstr "瀯쇿츣餓δ툔�ら윹渦볟뀯竊�'$' 烏①ㅊ訝�烏뚨쉪瀯볠씇竊�" #. type: delimited block - #: en/git-stripspace.txt:65 @@ -54643,7 +54643,7 @@ msgstr "" #: en/git-stripspace.txt:68 #, priority:100 msgid "Use 'git stripspace' with no arguments to obtain:" -msgstr "" +msgstr "鵝욜뵪訝띶를�귝빊�� 'git stripspace' �룟룚竊�" #. type: delimited block - #: en/git-stripspace.txt:79 @@ -54673,7 +54673,7 @@ msgstr "" #: en/git-stripspace.txt:82 #, priority:100 msgid "Use 'git stripspace --strip-comments' to obtain:" -msgstr "" +msgstr "鵝욜뵪 'git stripspace --strip-comments' �룟룚竊�" #. type: delimited block - #: en/git-stripspace.txt:90 -- GitLab