From d9a569ce87658e7b1f1fee8f24bd3eac7006a673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=83=E5=A4=B4=E7=81=AF=E7=AC=BC=E9=B1=BC?= <ttdlyu@163.com> Date: Mon, 29 May 2023 00:41:18 +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 45.0% (4981 of 11052 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 | 970 ++++++++++++++++----------------- 1 file changed, 485 insertions(+), 485 deletions(-) diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 4a7e72d..a56e4e0 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Matthias A횩hauer <mha1993@live.de>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-05-26 07:57+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-05-30 11:22+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 @@ -1596,7 +1596,7 @@ msgstr "linkgit:git-merge-base[1]" #: en/cmds-plumbinginterrogators.txt:36 #, priority:100 msgid "Find as good common ancestors as possible for a merge." -msgstr "" +msgstr "弱썲룾�썸돻�겼��꾢뀻�뚨쪝�덅퓵烏뚦릦亮뜰��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 @@ -1609,7 +1609,7 @@ msgstr "linkgit:git-name-rev[1]" #: en/cmds-plumbinginterrogators.txt:39 #, priority:100 msgid "Find symbolic names for given revs." -msgstr "" +msgstr "訝븀퍢若싩쉪 revs 野삥돻寧�뤇�띸㎞��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 @@ -1621,7 +1621,7 @@ msgstr "linkgit:git-pack-redundant[1]" #: en/cmds-plumbinginterrogators.txt:42 #, priority:100 msgid "Find redundant pack files." -msgstr "" +msgstr "野삥돻鸚싦퐰�꾢똿�뉏뻑��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 @@ -1633,7 +1633,7 @@ msgstr "linkgit:git-rev-list[1]" #: en/cmds-plumbinginterrogators.txt:45 #, priority:100 msgid "Lists commit objects in reverse chronological order." -msgstr "" +msgstr "�됪뿶�닻『佯뤷�믣틣�쀥눣�먧벡野배괌��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 @@ -1645,7 +1645,7 @@ msgstr "linkgit:git-rev-parse[1]" #: en/cmds-plumbinginterrogators.txt:48 #, priority:100 msgid "Pick out and massage parameters." -msgstr "" +msgstr "�묌�됧뭉�됪뫆�귝빊��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:49 @@ -1657,7 +1657,7 @@ msgstr "linkgit:git-show-index[1]" #: en/cmds-plumbinginterrogators.txt:51 #, priority:100 msgid "Show packed archive index." -msgstr "" +msgstr "�양ㅊ�볟똿�꾣。旅덄뇨凉뺛��" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:52 en/git-for-each-ref.txt:438 @@ -1669,7 +1669,7 @@ msgstr "linkgit:git-show-ref[1]" #: en/cmds-plumbinginterrogators.txt:54 #, priority:100 msgid "List references in a local repository." -msgstr "" +msgstr "�쀥눣�у쑑餓볟틩訝�쉪凉뺟뵪��" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 @@ -2689,7 +2689,7 @@ msgstr "��" #: en/config.txt:272 #, priority:100 msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them." -msgstr "" +msgstr "溫멨쩀�섌뇧�꾢�쇤꺗熬ュ퐪鵝쒍�訝ょ��뺟쉪耶쀧Е訝뀐펽鵝녷쐣雅쎾룜�뤷룚�꾣삸�밧츣映삣엹�꾢�쇽펽野밥틢倻귚퐬�쇔넍若껂뺄�됦�雅쏂쭊�쇻��" #. type: Labeled list #: en/config.txt:273 @@ -2701,7 +2701,7 @@ msgstr "躍껃컮" #: en/config.txt:278 #, priority:100 msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive." -msgstr "" +msgstr "壤볞�訝ゅ룜�뤺˙燁겻맏�뉐룚躍껃컮�쇗뿶竊뚩�鸚싧릪阿됭칾熬ユ렏�쀤맏 'true' �� 'false' 竊쏂퓳雅쏃꺗��툖�녶ㄷ弱뤷넍�꾠��" #. type: Labeled list #: en/config.txt:279 @@ -2713,7 +2713,7 @@ msgstr "��" #: en/config.txt:282 #, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true." -msgstr "" +msgstr "躍껃컮�잌�쇗삸 `yes`��`on`��`true`�� `1`�� 閭ㅵ쨼竊뚥�訝ゆ깹�� `= <��>` �꾢룜�뤺˙溫ㅴ맏��쐿��" #. type: Labeled list #: en/config.txt:283 @@ -2725,13 +2725,13 @@ msgstr "�숃�" #: en/config.txt:285 #, priority:100 msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." -msgstr "" +msgstr "躍껃컮�뉐�쇗삸 `no`��`off`��`false`��`0` �뚨㈉耶쀧Е訝꿔��" #. type: Plain text #: en/config.txt:289 #, priority:100 msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)." -msgstr "" +msgstr "壤볞슴�� `--type=bool` 映삣엹�뉐츣寧�컛訝�訝ゅ�쇠쉬�㏘맏�띈쭊�껃숱凉뤸뿶竊�'git config' 弱녺‘岳앲풏�뷰맏 \"true\" �� \"false\"竊덄뵪弱뤷넍耶쀦칾�쇔넍竊됥��" #. type: Labeled list #: en/config.txt:290 @@ -2743,7 +2743,7 @@ msgstr "�닸빊" #: en/config.txt:294 #, ignore-ellipsis, priority:100 msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc." -msgstr "" +msgstr "溫멨쩀�뉐츣�꾤쭕弱뷴��꾢룜�뤹쉪�쇔룾餓δ빳 `k`��`M`...訝뷴릮煐�竊뚩〃鹽� �쒍빳1024訝뷸캈堊뗧쉪�겼춻�앫�곣�쒍빳1024x1024訝뷸캈堊뗢�앾펽嶺됬춬��" #. type: Labeled list #: en/config.txt:295 en/diff-options.txt:440 en/git-for-each-ref.txt:184 @@ -2755,55 +2755,55 @@ msgstr "color" #: en/config.txt:299 #, priority:100 msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces." -msgstr "" +msgstr "�ε룛窯쒑돯�꾢룜�뤹쉪�쇗삸訝�訝ら쥪�뀐펷��鸚싦륵訝わ펽訝�訝ょ뵪雅롥뎺��펽訝�訝ょ뵪雅롨깒��펹�뚦콪�㏆펷鵝졿꺍誤곩쩀弱묈갚�됧쩀弱묕펹�꾢닓烏⑨펽�①㈉�쇔늽�붵��" #. type: Plain text #: en/config.txt:305 #, priority:100 msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan`, `white` and `default`. The first color given is the foreground; the second is the background. All the basic colors except `normal` and `default` have a bright variant that can be specified by prefixing the color with `bright`, like `brightred`." -msgstr "" +msgstr "�ε룛�꾢읃�ч쥪�꿩삸 `normal`��`black`��`red`��`green`��`yellow`��`blue`��`magenta`��`cyan`��`white` �� `default`�� 瀯쇿눣�꾤К訝�燁띺쥪�꿩삸�띷솺竊쏁К雅뚨쭕��깒���� �ㅴ틙`normal'��`default'阿뗥쨼竊뚧��됬쉪�뷸쑍窯쒑돯�썸쐣訝�訝ゆ삇雅�쉪�섆퐪竊뚦룾餓ι�싪퓝�③쥪�꿨뎺�℡뒥訝�`bright'�ζ뙁若싷펽驪붷쫩`brightred'��" #. type: Plain text #: en/config.txt:309 #, priority:100 msgid "The color `normal` makes no change to the color. It is the same as an empty string, but can be used as the foreground color when specifying a background color alone (for example, \"normal red\")." -msgstr "" +msgstr "窯쒑돯`normal`訝띴폏鵝욥쥪�꿨룕�잌룜�뽧�귛츆訝롧㈉耶쀧Е訝꿰쎑�뚳펽鵝녶쑉�뺟떖�뉐츣�뚧솺窯쒑돯�뜹룾餓δ퐳訝뷴뎺��쥪�뀐펷堊뗥쫩竊�\"normal red\"竊됥��" #. type: Plain text #: en/config.txt:313 #, priority:100 msgid "The color `default` explicitly resets the color to the terminal default, for example to specify a cleared background. Although it varies between terminals, this is usually not the same as setting to \"white black\"." -msgstr "" +msgstr "窯쒑돯`default` �롧‘�겼컛窯쒑돯�띸쉰訝븀퍑塋�쉪容섋��쇽펽堊뗥쫩竊뚧뙁若싦�訝ゆ툍�ㅷ쉪�뚧솺�귟쇋�뜸툖�뚨쉪瀯덄ク�됧량凉귨펽鵝녻퓳�싧만訝롨�營�맏 \"white black\" 訝띴��룔��" #. type: Plain text #: en/config.txt:318 #, priority:100 msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`." -msgstr "" +msgstr "窯쒑돯阿잌룾餓η뵪 0 �� 255 阿뗩뿴�꾣빊耶쀦씎烏①ㅊ竊쏂퓳雅쏃쥪�꿜슴�� ANSI 256 �꿩Æ凉륅펷鵝녷낏�뤶툖����됬쉪瀯덄ク�썸뵱�곮퓳訝わ펹�� 倻귝옖鵝좂쉪瀯덄ク��똻竊뚥퐷阿잌룾餓ζ뙁若� 24 鵝� RGB �쇌맏�곩뀷瓦쎾댍竊뚦쫩 `#ff0ab3`��" #. type: Plain text #: en/config.txt:325 #, priority:100 msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)." -msgstr "" +msgstr "��렏�쀧쉪掠욄�㎪삸 `bold`��`dim`��`ul`��`blink`��`reverse`��`italic` �� `strike`竊덄뵪雅롥닋�됬쉪耶쀦칾�� �쒎닠�ㅷ봇�앾펹�� 餓삡퐬掠욄�㎫쎑野밥틢窯쒑돯�꾡퐤營�펷�ⓨ뎺竊뚦쑉�롳펽�뽩쑉訝�뿴竊됧뭉訝띺뇥誤곥�귞돶若싩쉪掠욄�㎩룾餓ι�싪퓝�ⓨ츆餓у뎺�℡뒥訝� `no` �� `no-` �ε뀽��펷堊뗥쫩竊�`noreverse`竊�`no-ul`竊뚨춬嶺됵펹��" #. type: Plain text #: en/config.txt:330 #, priority:100 msgid "The pseudo-attribute `reset` resets all colors and attributes before applying the specified coloring. For example, `reset green` will result in a green foreground and default background without any active attributes." -msgstr "" +msgstr "鴉ゅ콪�� `reset` �ⓨ틪�ⓩ뙁若싩쉪���꿜퉳�띺뇥營���됮쥪�꿨뭽掠욄�㎯�귚풃倻귨펽`reset green` 弱녶��답�訝ょ뼁�꿰쉪�띷솺�뚪퍡溫ㅷ쉪�뚧솺竊뚧깹�됦뻣鵝뺞�域사쉪掠욄�㎯��" #. type: Plain text #: en/config.txt:333 #, priority:100 msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely." -msgstr "" +msgstr "訝�訝ょ㈉�꾦쥪�꿨춻寧╊림�방쑍訝띴폏雅㎫뵟餓삡퐬窯쒑돯�덃옖�귟퓳��빳�ⓩ씎�욕뀓瀯숂돶若싩쉪�껆킔訝딂돯�뚥툖若뚦뀲獵곭뵪窯쒑돯��" #. type: Plain text #: en/config.txt:342 #, priority:100 msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there." -msgstr "" +msgstr "野밥틢 git �꾦쥋若싦퉱窯쒑돯礪쏙펽掠욄�㎪삸訝뷰틙�ⓨ쉘�꿱풏�븀쉪驪뤶�窈밧�冶뗦뿶熬ラ뇥營��귝�餓ε컛 `color.decorate.branch` 溫양쉰訝� `black` 鴉싧컛瑥ε늽��릫燁경텂�먩솹�싩쉪 `black`竊뚦뜵鵝욕릪訝�渦볟눣烏뚥릎�꾢뎺訝�訝や툥蜈울펷堊뗥쫩`log -decorate`渦볟눣訝�쉪�녷뵱�띸㎞�쀨〃�띸쉪�у뤇竊됭˙溫양쉰訝� `bold` �뽩끀餓뽩콪�㎯�� �띈�뚳펽�ゅ츣阿됬쉪�ε퓱�쇔폀��꺗鴉싧걳�닷쨳�귛뭽�녶콆�꾤��뀐펽�뚦맔若싩쉪壤℡폀�③궍�뚦룾�썲푽�됬뵪��" #. type: Labeled list #: en/config.txt:343 @@ -2815,13 +2815,13 @@ msgstr "pathname" #: en/config.txt:349 #, priority:100 msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory." -msgstr "" +msgstr "訝�訝よ렩�뽬러孃꾢릫�쇘쉪�섌뇧��빳熬ヨ탩雅덁�訝や빳 \"`~/`\" �� \"`~user/`\" 凉�鸚당쉪耶쀧Е訝뀐펽�싧만�� tilde �⒴콝鴉싧룕�잌쑉瓦숁졆訝�訝ゅ춻寧╊림訝딉폏 `~/` 熬ユ돥掠뺜맏 `$HOME` �꾢�쇽펽�� `~user/` 熬ユ돥掠뺜맏�뉐츣�ⓩ댎�꾡말��퐬��" #. type: Plain text #: en/config.txt:358 #, priority:100 msgid "If a path starts with `%(prefix)/`, the remainder is interpreted as a path relative to Git's \"runtime prefix\", i.e. relative to the location where Git itself was installed. For example, `%(prefix)/bin/` refers to the directory in which the Git executable itself lives. If Git was compiled without runtime prefix support, the compiled-in prefix will be substituted instead. In the unlikely event that a literal path needs to be specified that should _not_ be expanded, it needs to be prefixed by `./`, like so: `./%(prefix)/bin`." -msgstr "" +msgstr "倻귝옖訝�訝よ러孃꾡빳 `%(prefix)/` 凉�鸚댐펽�뜸퐰�ⓨ늽弱녻˙鰲i뇢訝븀쎑野밥틢 Gi t�� \"瓦먫죱�뜹뎺煐�\" �꾥러孃꾬펽�녕쎑野밥틢 Git �ц벴若됭즳�꾡퐤營��귚풃倻귨펽`%(prefix)/bin/` �뉒쉪�� Git ��돢烏뚧뻼餓뜻쑍翁ユ��①쉪��퐬�귛쫩�� Git �①폋瑥묉뿶訝띷뵱�곮퓧烏뚧뿶�띸�竊뚪궍阿덄폋瑥묉뿶�꾢뎺煐�弱녻˙�요빰�귛쑉訝띶ㄺ��꺗�꾣깄�듕툔竊뚦쫩�쒒�誤곫뙁若싦�訝や툖佯붻�熬ユ돥掠뺟쉪耶쀩씊瓮�푶竊뚪�誤곦빳 `./` 訝뷴뎺煐�竊뚦갚�뤺퓳�뤄폏 `./%竊덂뎺煐�竊�/bin`��" #. type: Title ~ #: en/config.txt:361 @@ -2833,13 +2833,13 @@ msgstr "�섌뇧" #: en/config.txt:366 #, priority:100 msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page." -msgstr "" +msgstr "瑥룡낏�륅펽瓦쇾릉�쀨〃亮뜸툖�③씊竊뚥튋訝띴�若싧츑�담�� 野밥틢�밧츣�썰빱�꾢룜�륅펽鵝졽폏�①쎑佯붺쉪�뗥냼窈듕릎�얍댆�닺�瀯녺쉪�뤺염��" #. type: Plain text #: en/config.txt:371 #, priority:100 msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation." -msgstr "" +msgstr "�뜸퍟訝� git �멨뀽�꾢램�룟룾�썰튋簾�츩鵝욜뵪雅녵퍟餓ц눎藥긺쉪�섌뇧�� 壤볟룕�롦뼭�꾢룜�뤹뵪雅롨눎藥긺쉪藥ε끁�띰펽誤곭‘岳앭츆餓х쉪�띶춻訝띴툗 Git �ц벴�뚦끀餓뽪탛烏뚨쉪藥ε끁��鵝욜뵪�꾢릫耶쀥넳囹곻펽亮뜹쑉鵝좂쉪�뉑。訝�룒瓦겼츆餓с��" #. type: Labeled list #: en/config/merge.txt:1 @@ -7260,7 +7260,7 @@ msgstr "git-am - Apply a series of patches from a mailbox" #. type: Plain text #: en/git-am.txt:22 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n" "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" @@ -7272,25 +7272,25 @@ msgid "" "\t [--empty=(stop|drop|keep)]\n" "\t [(<mbox> | <Maildir>)...]\n" "'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)\n" -msgstr "" +msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]\n\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=<�됮」>] [-C<n>] [-p<n>] [--directory=<dir>]\n\t [--exclude=<瓮�푶>] [--include=<瓮�푶>] [--reject] [-q | --quiet]\n\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n\t [--quoted-cr=<action>]\n\t [--empty=(stop|drop|keep)]\n\t [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)\n" #. type: Plain text #: en/git-am.txt:30 #, priority:100 msgid "Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch. You could think of it as a reverse operation of linkgit:git-format-patch[1] run on a branch with a straight history without merges." -msgstr "" +msgstr "弱녽궙嶸긴릎�꾦궙餓뜸에��땰�녵맏�먧벡�ε퓱岳→겘�곦퐳�끺에��뭽烏δ툈竊뚦뭉弱녶끀佯붺뵪�겼퐪�띶늽���귚퐷��빳�듿츆�뗤퐳�� linkgit:git-format-patch[1] �꾢룏�묉뱧鵝쒙펽�ⓧ�訝ゆ깹�됧릦亮뜹럣�꿰쉪�녷뵱訝딂퓧烏뚣��" #. type: Labeled list #: en/git-am.txt:33 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "(<mbox>|<Maildir>)..." -msgstr "" +msgstr "(<mbox>|<Maildir>)..." #. type: Plain text #: en/git-am.txt:37 #, priority:100 msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs." -msgstr "" +msgstr "誤곮��뽬‥訝곭쉪����뉏뻑�꾢닓烏ⓦ�귛쫩�쒍퐷訝띷룓堊쏂퓳訝ゅ뢿�곤펽�썰빱弱녵퍗�뉐뇛渦볟뀯訝���뽧�� 倻귝옖鵝졿룓堊쏁쎅壤뺧펽若껂뺄弱녻˙鰲녵맏�����퐬��" #. type: Labeled list #: en/git-am.txt:39 en/git-cherry-pick.txt:106 en/git-format-patch.txt:139 en/git-rebase.txt:511 en/git-revert.txt:101 en/signoff-option.txt:4 @@ -7302,13 +7302,13 @@ msgstr "--signoff" #: en/git-am.txt:43 en/git-format-patch.txt:143 #, priority:100 msgid "Add a `Signed-off-by` trailer to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information." -msgstr "" +msgstr "�ⓩ룓雅ㅴ에��릎�졾뀯 `Signed-off-by` �꾢갼力⑨펽鵝욜뵪�ゅ런�꾣룓雅ㅸ�낁벴餓썬�� �닷쩀岳→겘鰲� linkgit:git-commit[1] 訝�쉪 signoff �됮」��" #. type: Plain text #: en/git-am.txt:47 #, priority:100 msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "鴉좈��`-k` �뉐퓱瀯� 'git mailinfo'竊덅쭅linkgit:git-mailinfo[1]竊됥��" #. type: Labeled list #: en/git-am.txt:48 en/git-quiltimport.txt:59 @@ -7320,7 +7320,7 @@ msgstr "--keep-non-patch" #: en/git-am.txt:50 en/git-quiltimport.txt:61 #, priority:100 msgid "Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "弱� `-b` �뉐퓱鴉좈�믥퍢 'git mailinfo'竊덅쭅linkgit:git-mailinfo[1]竊됥��" #. type: Labeled list #: en/git-am.txt:51 @@ -7332,7 +7332,7 @@ msgstr "--[no-]keep-cr" #: en/git-am.txt:56 #, priority:100 msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`." -msgstr "" +msgstr "鵝욜뵪 `--keep-cr`竊뚩컘�� 'git mailsplit'竊덅쭅linkgit:git-mailsplit[1]竊됵펽亮뜸슴�①쎑�뚨쉪�됮」竊뚥빳�꿩�若껃쑉烏뚧쑌�η┿ CR��`am.keepcr` �띸쉰�섌뇧��빳�ⓩ씎�뉐츣容섋�烏뚥맏�� `--no-keep-cr` ��빳�ⓩ씎誤녺썣 `am.keepcr`��" #. type: Labeled list #: en/git-am.txt:58 en/git-mailinfo.txt:76 @@ -7344,7 +7344,7 @@ msgstr "--scissors" #: en/git-am.txt:62 #, priority:100 msgid "Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). Can be activated by default using the `mailinfo.scissors` configuration variable." -msgstr "" +msgstr "燁삯솮閭f뻼訝�돦�뉓죱阿뗥뎺�꾣��됧냵若뱄펷鰲걄inkgit:git-mailinfo[1]竊됥�귛룾餓δ슴�� `mailinfo.scissors` �띸쉰�섌뇧�ι퍡溫ㅶ�域삠��" #. type: Labeled list #: en/git-am.txt:63 en/git-mailinfo.txt:91 @@ -7356,7 +7356,7 @@ msgstr "--no-scissors" #: en/git-am.txt:65 #, priority:100 msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "恙썹븼�ゅ늾瀛울펷鰲걄inkgit:git-mailinfo[1]竊됥��" #. type: Labeled list #: en/git-am.txt:66 en/git-mailinfo.txt:94 @@ -7368,7 +7368,7 @@ msgstr "--whitespace=<action>" #: en/git-am.txt:68 #, priority:100 msgid "This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "瓦쇾릉�뉐퓱弱녻˙鴉좈�믥퍢 'git mailinfo'竊덅쭅 linkgit:git-mailinfo[1]竊됥��" #. type: Labeled list #: en/git-am.txt:69 @@ -7380,7 +7380,7 @@ msgstr "--empty={drop,keep,ask}" #: en/git-am.txt:76 #, priority:100 msgid "By default, or when the option is set to 'stop', the command errors out on an input e-mail message lacking a patch and stops into the middle of the current am session. When this option is set to 'drop', skip such an e-mail message instead. When this option is set to 'keep', create an empty commit, recording the contents of the e-mail message as its log." -msgstr "" +msgstr "容섋��끻넻訝뗰펽�뽬�끻퐪瑥ι�됮」熬ヨ�營�맏 'stop' �띰펽瑥ε뫝餓ㅵ쑉渦볟뀯煐뷰퉷烏δ툈�꾤뵷耶먬궙餓뜻뿶�븅뵗竊뚦뭉�쒏��겼퐪�� am 鴉싪캕�꾡릎�담�귛퐪瓦쇾릉�됮」熬ヨ�營�맏 'drop' �띰펽瓮녘퓝瓦숁졆�꾤뵷耶먬궙餓뜸에���� 壤볢퓳訝ら�됮」熬ヨ�營�맏 'keep' �띰펽鴉싧닗兩뷰�訝ょ㈉�꾣룓雅ㅿ펽弱녺뵷耶먬궙餓띄쉪�끻�溫겼퐬訝뷸뿥恙쀣��" #. type: Labeled list #: en/git-am.txt:78 en/git-mailinfo.txt:72 @@ -7392,7 +7392,7 @@ msgstr "--message-id" #: en/git-am.txt:83 #, priority:100 msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour." -msgstr "" +msgstr "鴉좈�� `-m` �뉐퓱瀯� 'git mailinfo'竊덅쭅 linkgit:git-mailinfo[1]竊됵펽瓦숁졆 Message-ID 鸚답폏熬ユ렌�졾댆�먧벡岳→겘訝��� `am.messageid` �띸쉰�섌뇧��빳�ⓩ씎�뉐츣容섋�烏뚥맏��" #. type: Labeled list #: en/git-am.txt:84 @@ -7404,13 +7404,13 @@ msgstr "--no-message-id" #: en/git-am.txt:87 #, priority:100 msgid "Do not add the Message-ID header to the commit message. `no-message-id` is useful to override `am.messageid`." -msgstr "" +msgstr "訝띹쫨�ⓩ룓雅ㅴ에��릎曆삣뒥 Message-ID 鸚담�� `no-message-id` 野밥틢誤녺썣 `am.messageid` 孃덃쐣�ⓦ��" #. type: Plain text #: en/git-am.txt:91 #, priority:100 msgid "Be quiet. Only print error messages." -msgstr "" +msgstr "岳앮똻若됮쓾�귛룵�볟뜲�숃�岳→겘��" #. type: Labeled list #: en/git-am.txt:93 @@ -7422,7 +7422,7 @@ msgstr "--utf8" #: en/git-am.txt:99 #, priority:100 msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitEncoding` can be used to specify project's preferred encoding if it is not UTF-8)." -msgstr "" +msgstr "鴉좈�� `-u` �뉐퓱瀯� 'git mailinfo'竊덅쭅linkgit:git-mailinfo[1]竊됥�� 兩븃�餓롩궙餓뜸릎�먨룚�꾣룓雅ㅶ뿥恙쀤에��˙�띷뼭煐뽫쟻訝� UTF-8 煐뽫쟻竊덆뀓營�룜�� `i18n.commitEncoding` ��빳�ⓩ씎�뉐츣窈밭쎅�꾦쫿�됬폋�곻펽倻귝옖若껂툖�� UTF-8竊됥��" #. type: Plain text #: en/git-am.txt:102 @@ -7430,7 +7430,7 @@ msgstr "" msgid "" "This was optional in prior versions of git, but now it is the\n" "default. You can use `--no-utf8` to override this.\n" -msgstr "" +msgstr "瓦쇿쑉餓ε뎺�� git �덃쑍訝�삸���됬쉪竊뚥퐜�겼쑉若껅삸\n容섋��꾠�� 鵝졾룾餓δ슴�� `--no-utf8` �θ쫮�뽩츆��\n" #. type: Labeled list #: en/git-am.txt:103 @@ -7442,7 +7442,7 @@ msgstr "--no-utf8" #: en/git-am.txt:106 #, priority:100 msgid "Pass `-n` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "" +msgstr "鴉좈�� `-n` �뉐퓱瀯� 'git mailinfo'竊덅쭅linkgit:git-mailinfo[1]竊됥��" #. type: Labeled list #: en/git-am.txt:107 en/git-apply.txt:85 @@ -7466,7 +7466,7 @@ msgstr "--no-3way" #: en/git-am.txt:116 #, priority:100 msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. `--no-3way` can be used to override am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]." -msgstr "" +msgstr "壤볢‥訝곦툖�썲묾���겼틪�ⓩ뿶竊뚦쫩�쒑‥訝곮�壤뺜틙若껃틪瑥ε틪�ⓨ댆�꾡틠瓦쎾댍�뉏뻑�꾥벴餓쏙펽亮뜸툝�묇뺄�됭퓳雅쎽틠瓦쎾댍�뉏뻑��빳�ⓩ쑍�겻슴�⑨펽�d퉰弱깁���욃댆訝됭러�덂뭉��`--no-3way` ��빳�ⓩ씎誤녺썣 am.threeWay �띸쉰�섌뇧�귝쎍鸚싦에��펽鰲� linkgit:git-config[1] 訝�쉪 am.threeWay��" #. type: Labeled list #: en/git-am.txt:120 en/git-apply.txt:184 en/git-rebase.txt:473 @@ -7502,7 +7502,7 @@ msgstr "--directory=<dir>" #: en/git-am.txt:125 #, no-wrap, priority:100 msgid "--exclude=<path>" -msgstr "" +msgstr "--exclude=<瓮�푶>" #. type: Labeled list #: en/git-am.txt:126 @@ -7520,7 +7520,7 @@ msgstr "--reject" #: en/git-am.txt:131 #, priority:100 msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch." -msgstr "" +msgstr "瓦쇾틳�뉐퓱鴉싦폖�믥퍢佯붺뵪烏δ툈�� \"git apply\"竊덅쭅 linkgit:git-apply[1]竊됬쮮佯뤵��" #. type: Labeled list #: en/git-am.txt:132 @@ -7532,13 +7532,13 @@ msgstr "--patch-format" #: en/git-am.txt:138 #, priority:100 msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg." -msgstr "" +msgstr "容섋��끻넻訝뗰펽瑥ε뫝餓ㅵ컛弱앲캊�ゅ뒯汝�役뗨‥訝곫졏凉뤵�귟퓳訝ら�됮」�곮��ⓩ댎瀯뺠퓝�ゅ뒯汝�役뗰펽亮뜻뙁若싪‥訝곭쉪�쇔폀竊뚥빳堊욕컛�띈㎗�듾맏烏δ툈�귝쐣�덄쉪�쇔폀�� mbox�걅boxrd�걌tgit�걌tgit-series �� hg��" #. type: Plain text #: en/git-am.txt:142 #, priority:100 msgid "Run interactively." -msgstr "" +msgstr "雅ㅴ틨凉뤺퓧烏뚣��" #. type: Labeled list #: en/git-am.txt:144 en/git-rebase.txt:423 @@ -7563,7 +7563,7 @@ msgstr "--committer-date-is-author-date" #: en/git-am.txt:155 #, priority:100 msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date." -msgstr "" +msgstr "容섋��끻넻訝뗰펽瑥ε뫝餓ㅵ컛�드춴��뻑訝�쉪�ζ쐿鵝쒍맏�먧벡�끾뿥�잞펽亮뜸슴�ⓩ룓雅ㅸ�끿쉪�쎾뻠�띌뿴鵝쒍맏�먧벡�끾뿥�잆�귟퓳鵝욕풓�ⓩ댎��빳�싪퓝鵝욜뵪訝롣퐳�끾뿥�잏쎑�뚨쉪�쇗씎瘟롦뒫�먧벡�끾뿥�잆��" #. type: Labeled list #: en/git-am.txt:156 en/git-rebase.txt:503 @@ -7575,7 +7575,7 @@ msgstr "--ignore-date" #: en/git-am.txt:162 #, priority:100 msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date." -msgstr "" +msgstr "容섋��끻넻訝뗰펽瑥ε뫝餓ㅵ컛�드춴��뻑訝�쉪�ζ쐿鵝쒍맏�먧벡�끾뿥�잞펽亮뜸슴�ⓩ룓雅ㅸ�끿쉪�쎾뻠�띌뿴鵝쒍맏�먧벡�끾뿥�잆�귟퓳鵝욕풓�ⓩ댎��빳�싪퓝鵝욜뵪訝롦룓雅ㅸ�끾뿥�잏쎑�뚨쉪�쇗씎瘟롦뒫鵝쒑�끾뿥�잆��" #. type: Labeled list #: en/git-am.txt:163 en/git-rebase.txt:220 en/sequencer.txt:6 @@ -7587,7 +7587,7 @@ msgstr "--skip" #: en/git-am.txt:166 #, priority:100 msgid "Skip the current patch. This is only meaningful when restarting an aborted patch." -msgstr "" +msgstr "瓮녘퓝壤볟뎺�꾥‥訝곥�� 瓦쇿룵�됧쑉�띷뼭��뒯訝�訝や릎閭®쉪烏δ툈�뜻뎺�됪꼷阿됥��" #. type: Labeled list #: en/git-am.txt:167 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:389 en/git-rebase.txt:398 en/git-revert.txt:91 en/merge-options.txt:84 @@ -7635,7 +7635,7 @@ msgstr "--resolved" #: en/git-am.txt:185 #, priority:100 msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue." -msgstr "" +msgstr "烏δ툈鸚김뇰�롳펷倻귟캊�얍틪�ⓨ넳囹곭쉪烏δ툈竊됵펽�ⓩ댎藥꿰퍘�뗥램佯붺뵪竊뚨뇨凉뺞뻼餓뜹춼�ⓧ틙佯붺뵪�꾤퍜�쒌�� 鵝욜뵪餓롧뵷耶먬궙餓뜸릎�먨룚�꾡퐳�끻뭽�먧벡�ε퓱餓ε룋壤볟뎺�꾤뇨凉뺞뻼餓띈퓵烏뚧룓雅ㅿ펽�뜹릮瀯㎫뺌瓦먫죱��" #. type: Labeled list #: en/git-am.txt:186 @@ -7647,7 +7647,7 @@ msgstr "--resolvemsg=<msg>" #: en/git-am.txt:192 #, priority:100 msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'." -msgstr "" +msgstr "壤볟룕�잒‥訝곩ㅁ兀ζ뿶竊�<岳→겘> 弱녶쑉���뷴뎺熬ユ돀�겼댆掠뤷퉽訝듽�� 瓦쇿컛誤녺썣�뉐뇛岳→겘竊뚪�싩윥鵝졽슴�� `--continue` �� `--skip` �ε쨪�녶ㅁ兀γ�� 瓦쇿룵��맏雅녶쑉 'git rebase' �� 'git am' 阿뗩뿴�꾢냵�ⓧ슴�ⓦ��" #. type: Labeled list #: en/git-am.txt:193 en/git-merge.txt:101 en/git-notes.txt:201 en/git-rebase.txt:223 en/sequencer.txt:15 @@ -7659,7 +7659,7 @@ msgstr "--abort" #: en/git-am.txt:197 #, priority:100 msgid "Restore the original branch and abort the patching operation. Revert contents of files involved in the am operation to their pre-am state." -msgstr "" +msgstr "�℡쨳�잍씎�꾢늽��펽�얍펱�볢‥訝곭쉪�띴퐳�� 弱� am �띴퐳訝�텎�딁쉪�뉏뻑�끻��℡쨳�� am �띸쉪�뜻�곥��" #. type: Labeled list #: en/git-am.txt:198 en/git-merge.txt:117 en/git-rebase.txt:230 en/sequencer.txt:10 @@ -7671,7 +7671,7 @@ msgstr "--quit" #: en/git-am.txt:201 #, priority:100 msgid "Abort the patching operation but keep HEAD and the index untouched." -msgstr "" +msgstr "訝���볢‥訝곭쉪�띴퐳竊뚥퐜岳앯븰 HEAD �뚨뇨凉뺜툖熬ユ렏鰲╉��" #. type: Labeled list #: en/git-am.txt:202 @@ -7684,7 +7684,7 @@ msgstr "--show-current-patch[=(diff|raw)]" #: en/git-am.txt:207 #, priority:100 msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`." -msgstr "" +msgstr "�양ㅊ`git am` �졾넳囹곮�뚦걶閭®쉪易덃겘�� 倻귝옖�뉐츣雅� `raw`竊뚧샑鹽븀뵷耶먬궙餓띄쉪�잌쭓�끻�竊쎾쫩�쒏삸 `diff`竊뚦룵�양ㅊ藥�펰�ⓨ늽�� 容섋�訝� `raw`��" #. type: Labeled list #: en/git-am.txt:208 en/git-apply.txt:259 en/git-cherry-pick.txt:124 en/git-commit.txt:220 en/git-notes.txt:158 @@ -7696,7 +7696,7 @@ msgstr "--allow-empty" #: en/git-am.txt:212 #, priority:100 msgid "After a patch failure on an input e-mail message lacking a patch, create an empty commit with the contents of the e-mail message as its log message." -msgstr "" +msgstr "�ⓨ�煐뷰퉷烏δ툈�꾥풏�ι궙餓뜸에��퓵烏뚩‥訝곩ㅁ兀ε릮竊뚦닗兩뷰�訝ょ㈉�꾣룓雅ㅿ펽弱녽궙餓뜸에��쉪�끻�鵝쒍맏�뜻뿥恙쀤에����" #. type: Title - #: en/git-am.txt:214 en/git-commit.txt:541 en/git-format-patch.txt:430 en/git-fsck.txt:115 en/git-log.txt:193 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:202 en/git-rerere.txt:77 en/git-reset.txt:381 en/git-show.txt:84 en/git-stash.txt:268 en/git-tag.txt:235 @@ -7708,79 +7708,79 @@ msgstr "溫②�" #: en/git-am.txt:222 #, priority:100 msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text." -msgstr "" +msgstr "�먧벡�끿쉪�띶춻�뽬눎岳→겘�� \"From:\" 烏뚳펽�뚧룓雅ㅸ�끿쉪�ζ쐿�쇿룚�や에��쉪 \"Date:\" 烏뚣�� \"Subject:\" 烏뚧삸�먧벡�꾣젃窯섓펽�ⓨ렮�됪솹�싧뎺煐� \"[PATCH <餓삡퐬訝쒑�>]\" 阿뗥릮�� \"Sbuject: \" ��맏雅녺뵪訝�烏뚧뻼耶쀧�域곩쑑�뤺염�먧벡�꾢냵若밤��" #. type: Plain text #: en/git-am.txt:225 #, priority:100 msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers." -msgstr "" +msgstr "\"From: \"��\"Date: \" �� \"Subject: \" 烏뚦�冶뗧쉪閭f뻼誤녺썣雅녵퍗�뉔쥦訝�렩�뽫쉪�꾥눎�꾣룓雅ㅸ�끻릫燁겼뭽�뉔쥦�쇈��" #. type: Plain text #: en/git-am.txt:230 #, priority:100 msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped." -msgstr "" +msgstr "�먧벡岳→겘�� \"Subject: \" 訝�쉪�뉔쥦�곦�訝ょ㈉烏뚦뭽�닷댆烏δ툈凉�冶뗧쉪岳→겘閭f뻼瀯꾣닇�� 驪뤺죱�ュ갼鸚싦퐰�꾤㈉�쇌폏熬ヨ눎�ⓨ닠�ㅳ��" #. type: Plain text #: en/git-am.txt:233 #, priority:100 msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:" -msgstr "" +msgstr "烏δ툈佯붻���냵�붺쉪竊뚨쎍�θ퇎�ⓧ에��릮�㏂�� 餓삡퐬壤℡폀�꾥죱竊�" #. type: Plain text #: en/git-am.txt:235 #, priority:100 msgid "three-dashes and end-of-line, or" -msgstr "" +msgstr "訝됦릉�닸뒛�룟뭽烏뚧쑌竊뚧닑" #. type: Plain text #: en/git-am.txt:236 #, priority:100 msgid "a line that begins with \"diff -\", or" -msgstr "" +msgstr "餓� \"diff - \" 凉�鸚당쉪訝�烏뚳펽��" #. type: Plain text #: en/git-am.txt:237 #, priority:100 msgid "a line that begins with \"Index: \"" -msgstr "" +msgstr "餓� \"index: \" 凉�鸚당쉪訝�烏�" #. type: Plain text #: en/git-am.txt:240 #, priority:100 msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line." -msgstr "" +msgstr "熬ヨ�訝뷸삸訝�訝よ‥訝곭쉪凉�冶뗰펽�먧벡�ε퓱岳→겘�①К訝�轝▼눣�계퓳�루쉪烏뚥퉳�띶갚瀯볠씇雅녴��" #. type: Plain text #: en/git-am.txt:244 #, priority:100 msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:" -msgstr "" +msgstr "壤볠��앲컘�� `git am` �띰펽鵝좂퍢雅녶츆誤곩쨪�녺쉪����꾢릫耶쀣�� 壤볡쐦�곁К訝�訝や툖�귞뵪�꾥‥訝곫뿶竊뚦츆弱긴폏�ⓧ릎�답릎閭㏂�� 鵝졾룾餓ι�싪퓝餓δ툔訝ㅷ쭕�밧폀阿뗤��℡쨳竊�" #. type: Plain text #: en/git-am.txt:247 #, priority:100 msgid "skip the current patch by re-running the command with the `--skip` option." -msgstr "" +msgstr "�싪퓝�띷뼭瓦먫죱躍�쐣 `--skip` �됮」�꾢뫝餓ㅿ펽瓮녘퓝壤볟뎺烏δ툈��" #. type: Plain text #: en/git-am.txt:251 #, priority:100 msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option." -msgstr "" +msgstr "�뗨㎗�녑램鵝쒐쎅壤뺜릎�꾢넳囹곻펽亮뜻쎍�곁뇨凉뺞뻼餓띰펽鵝욕끀瓦쎾뀯烏δ툈佯붻�雅㎫뵟�꾤듁�곥�� �뜹릮�� `--continue` �됮」瓦먫죱瑥ε뫝餓ㅳ��" #. type: Plain text #: en/git-am.txt:256 #, priority:100 msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names." -msgstr "" +msgstr "�ⓨ퐪�띷뱧鵝쒎츑�먧퉳�랃펽瑥ε뫝餓ㅶ땼瀯앭쨪�녷뼭�꾦궙嶸깍펽��餓ε쫩�쒍퐷�녑츣餓롥ㅄ凉�冶뗰펽�②퓧烏뚦를�됮궙嶸긷릫燁곁쉪�썰빱阿뗥뎺竊뚩퓧烏� `git am --abort`��" #. type: Plain text #: en/git-am.txt:262 #, priority:100 msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)." -msgstr "" +msgstr "�ⓨ틪�ⓧ뻣鵝뺠‥訝곦퉳�랃펽ORIG_HEAD 熬ヨ�營�맏壤볟뎺�녷뵱�꾦《塋��� 倻귝옖鵝졾쑉鸚싦릉�먧벡訝�걞�곈뿮窯섓펽驪붷쫩�③뵗瑥�쉪�녷뵱訝딂퓧烏� 'git am'竊뚧닑�끾룓雅ㅴ릎�꾦뵗瑥�쎍若방삌�싪퓝�밧룜����θ㎗�놂펷驪붷쫩 \"From: \" 烏뚥릎�꾦뵗瑥�펹竊뚩퓳弱긷푽�됬뵪雅녴��" #. type: Title - #: en/git-am.txt:264 en/git-commit.txt:565 en/git-gc.txt:153 @@ -7792,7 +7792,7 @@ msgstr "�⒴춴" #: en/git-am.txt:268 #, priority:100 msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information." -msgstr "" +msgstr "瓦쇾릉�썰빱��빳瓦먫죱 `applypatch-msg`, `pre-applypatch`, �� `post-applypatch` �⒴춴�� �닷쩀岳→겘鰲� linkgit:githooks[5]��" #. type: Plain text #: en/git-am.txt:280 @@ -7822,13 +7822,13 @@ msgstr "'git annotate' [<options>] <file> [<revision>]\n" #: en/git-annotate.txt:17 #, priority:100 msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision." -msgstr "" +msgstr "�ⓨ폊�θ�烏뚨쉪�먧벡岳→겘�ζ낏�딁퍢若싨뻼餓뜸릎�꾣캀訝�烏뚣�귚튋��빳�됪떓餓롧퍢若싩쉪岳���덁릎瓦쏂죱力③뇢��" #. type: Plain text #: en/git-annotate.txt:22 #, priority:100 msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems." -msgstr "" +msgstr "瓦쇾릉�썰빱�� linkgit:git-blame[1] �꾢뵱訝��뷴닽��펽若껂뺄鵝욜뵪�꾥풏�뷸졏凉뤹븼�됦툖�뚳펽瓦쇾릉�썰빱�꾢춼�ⓨ룵��맏雅녶릲�롥끉若뱄펽餓ζ뵱�곭렟�됬쉪�싨쑍竊뚦뭉訝뷸씎�ゅ끀餓� SCM 楹사퍨�꾡볶�먧풘訝�訝ゆ쎍�잍굢�꾢뫝餓ㅵ릫燁겹��" #. type: Title = #: en/git-apply.txt:2 @@ -7844,7 +7844,7 @@ msgstr "/" #. type: Plain text #: en/git-apply.txt:20 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" "\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n" @@ -7854,19 +7854,19 @@ msgid "" "\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n" "\t [--exclude=<path>] [--include=<path>] [--directory=<root>]\n" "\t [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]\n" -msgstr "" +msgstr "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n\t [--allow-binary-replacement | --binary] [--reject] [-z]\n\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n\t [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n\t [--exclude=<瓮�푶>] [--include=<瓮�푶>] [--directory=<�밭쎅壤�>]\n\t [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]\n" #. type: Plain text #: en/git-apply.txt:30 #, priority:100 msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository." -msgstr "" +msgstr "瑥삣룚�먧풘�꾢량凉귟풏�븝펷�� \"訝�訝よ‥訝�\" 竊됧뭉弱녶끀佯붺뵪雅롦뻼餓뜰�� 壤볞퍗�덃쑍佯볞릎�꾢춴��퐬瓦먫죱�띰펽��퐬鸚뽫쉪烏δ툈瓮�푶鴉싪˙恙썹븼�� 鵝욜뵪 `--index `�됮」竊뚩‥訝곦튋鴉싧틪�ⓨ댆榮℡폊訝�펽鵝욜뵪 `--cached` �됮」竊뚩‥訝곩룵佯붺뵪�곁뇨凉뺜릎�� 倻귝옖亦→쐣瓦쇾틳�됮」竊뚩��썰빱�ゅ��뉏뻑�볢‥訝곻펽�뚥툖誤곫콆若껂뺄�� Git 餓볟틩訝���" #. type: Plain text #: en/git-apply.txt:34 #, priority:100 msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email." -msgstr "" +msgstr "瑥ε뫝餓ㅴ폏佯붺뵪烏δ툈竊뚥퐜訝띴폏�쎾뻠�먧벡�� 鵝욜뵪 linkgit:git-am[1] 餓� linkgit:git-format-patch[1] �잍닇�꾢뭽/�뽭�싪퓝�드춴��뻑�뜹댆�꾥‥訝곩닗兩뷸룓雅ㅳ��" #. type: Labeled list #: en/git-apply.txt:37 @@ -7878,7 +7878,7 @@ msgstr "<patch>..." #: en/git-apply.txt:40 #, priority:100 msgid "The files to read the patch from. '-' can be used to read from the standard input." -msgstr "" +msgstr "誤곮��뽬‥訝곭쉪�뉏뻑�� '-' ��빳�ⓩ씎餓롦젃�녻풏�δ릎瑥삣룚��" #. type: Labeled list #: en/git-apply.txt:41 en/git-rebase.txt:415 en/merge-options.txt:107 @@ -7890,25 +7890,25 @@ msgstr "--stat" #: en/git-apply.txt:44 #, priority:100 msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"." -msgstr "" +msgstr "訝띶틪�②‥訝곻펽�뚧삸渦볟눣渦볟뀯�꾢량凉귞듁�곥�� �녔럦 \"apply\"��" #. type: Plain text #: en/git-apply.txt:51 #, priority:100 msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"." -msgstr "" +msgstr "映삡세雅� `--stat`竊뚥퐜��뵪�곮퓵�띄Е�룡샑鹽뷴쥭�졾뭽�좈솮�꾥죱�곤펽瓮�푶�띴툖�좂섄�숋펽鵝욕끀野방쑛�ⓩ쎍�뗥��� 野밥틢雅뚩퓵�뜻뻼餓띰펽渦볟눣訝ㅴ릉`-` �뚥툖�� `0 0`�� �녜뿭 \"apply\"��" #. type: Plain text #: en/git-apply.txt:57 #, priority:100 msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. Turns off \"apply\"." -msgstr "" +msgstr "訝띶틪�②‥訝곻펽�뚧삸渦볟눣餓� git dif f�⒴콝鸚닸뻼餓뜸릎�룟풓�꾡에��쉪役볡섄�섋쫨竊뚦쫩�쎾뻠�곲뇥�썲릫�뚧Æ凉뤷룜�뽧�� �녜뿭 \"apply\"��" #. type: Plain text #: en/git-apply.txt:62 #, priority:100 msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"." -msgstr "" +msgstr "�뗧쐦瑥θ‥訝곫삸���귞뵪雅롥퐪�띶램鵝쒏젒��/�뽫뇨凉뺞뻼餓띰펽亮뜻�役뗥댆�숃�竊뚩�뚥툖��틪�②�烏δ툈�� �녜뿭 \"apply\"��" #. type: Labeled list #: en/git-apply.txt:63 en/git-checkout-index.txt:27 en/git-stash.txt:181 @@ -7920,7 +7920,7 @@ msgstr "--index" #: en/git-apply.txt:71 #, priority:100 msgid "Apply the patch to both the index and the working tree (or merely check that it would apply cleanly to both if `--check` is in effect). Note that `--index` expects index entries and working tree copies for relevant paths to be identical (their contents and metadata such as file mode must match), and will raise an error if they are not, even if the patch would apply cleanly to both the index and the working tree in isolation." -msgstr "" +msgstr "�①뇨凉뺝뭽藥δ퐳��퐬訝딃꺗�볞툓烏δ툈竊덂쫩�� `--check`�� �덌펽�쇿룵��汝��ε츆��맔�썲묾���겼틪�ⓧ틢訝ㅸ�낉펹�귝낏�륅펽`--index` 躍뚧쐹�멨뀽瓮�푶�꾤뇨凉뺞씉��뭽藥δ퐳�뷴돬�ф삸�멨릪�꾬펷若껂뺄�꾢냵若밧뭽�껅빊��펽倻귝뻼餓뜻Æ凉뤷퓚窈삣뙶�랃펹竊뚦쫩�쒎츆餓т툖�멨릪竊뚦컛凉뺝룕訝�訝ら뵗瑥�펽�념슴瑥θ‥訝곩룾餓ε묾���겼틪�ⓧ틢榮℡폊�뚦램鵝쒎뙷��" #. type: Labeled list #: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:44 en/git-ls-files.txt:39 en/git-rm.txt:67 en/git-submodule.txt:306 @@ -7932,19 +7932,19 @@ msgstr "--cached" #: en/git-apply.txt:76 #, priority:100 msgid "Apply the patch to just the index, without touching the working tree. If `--check` is in effect, merely check that it would apply cleanly to the index entry." -msgstr "" +msgstr "弱녻‥訝곩룵佯붺뵪雅롧뇨凉뺧펽�뚥툖鰲�룋藥δ퐳��퐬�귛쫩�� `--check` ��쐣�덄쉪竊뚦룵��汝��ε츆��맔�썲묾���겼틪�ⓧ틢榮℡폊�←쎅��" #. type: Plain text #: en/git-apply.txt:84 #, priority:100 msgid "When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` option in linkgit:git-add[1]). This option is ignored unless running in a Git repository and `--index` is not specified. Note that `--index` could be implied by other options such as `--cached` or `--3way`." -msgstr "" +msgstr "壤볟룵�ⓨ램鵝쒏젒訝듿틪�②‥訝곫뿶竊뚧젃溫경뼭�꾣뻼餓띰펽餓δ씩餓ε릮曆삣뒥�곁뇨凉뺜릎竊덅쭅 linkgit:git-add[1] 訝�쉪 `--intent-to-add` �됮」竊됥�귡솮�욃쑉 Git 餓볟틩訝�퓧烏뚥툝亦→쐣�뉐츣 `--index`竊뚦맔�숃��됮」弱녻˙恙썹븼�� 瑥룡낏�륅펽`--index` ��꺗��뵳�뜸퍟�됮」�쀧ㅊ�꾬펽倻� `--cached` �� `--3way`��" #. type: Plain text #: en/git-apply.txt:94 #, priority:100 msgid "Attempt 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option unless the `--cached` option is used, and is incompatible with the `--reject` option. When used with the `--cached` option, any conflicts are left at higher stages in the cache." -msgstr "" +msgstr "倻귝옖烏δ툈溫겼퐬雅녶츆佯붻�佯붺뵪�곁쉪雅뚩퓵�뜻뻼餓띄쉪翁ヤ뻥竊뚦뭉訝붹닊餓ф쐣瓦쇾틳雅뚩퓵�뜻뻼餓뜹쑉�у쑑��뵪竊뚦닕弱앲캊訝됪뼶�덂뭉竊뚦룾�썰폏�ⓨ램鵝쒏젒訝�쉪�뉏뻑訝�븰訝뗥넳囹곫젃溫곤펽�긺뵪�룩㎗�녈�� 瓦쇾릉�됮」�뤷뫑�� `--index` �됮」竊뚪솮�욂슴�� `--cached` �됮」竊뚦뭉訝붶툗 `--reject` �됮」訝띶끉若밤�� 壤볞툗 `--cached` �됮」訝�壅룝슴�ⓩ뿶竊뚥뻣鵝뺝넳囹곲꺗熬ョ븰�①폆耶섊쉪渦껈쳵�뜻���" #. type: Labeled list #: en/git-apply.txt:95 @@ -7956,13 +7956,13 @@ msgstr "--build-fake-ancestor=<file>" #: en/git-apply.txt:101 #, priority:100 msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs." -msgstr "" +msgstr "渦껅뼭�� \"git diff\" 渦볟눣訝뷸캀訝� blob 葯뚦뀯雅� \"榮℡폊岳→겘\"竊뚥빳躍�뒰瑥녶닽烏δ툈���귞뵪�꾢렅冶뗧뎵�с�� 壤볡퍢�븃퓳訝ゆ젃恙쀦뿶竊뚦쫩�� blob �꾢렅冶뗧뎵�у쑉�у쑑��뵪竊뚦닕兩븀쳦訝�訝ゅ똿�ヨ퓳雅� blob �꾡릿�띄뇨凉뺛��" #. type: Plain text #: en/git-apply.txt:104 #, priority:100 msgid "When a pure mode change is encountered (which has no index information), the information is read from the current index instead." -msgstr "" +msgstr "壤볣걞�겻�訝ょ변暎밭쉪與▼폀�섇뙑竊덃깹�됬뇨凉뺜에��펹�띰펽弱녵퍗壤볟뎺榮℡폊訝���뽨에����" #. type: Labeled list #: en/git-apply.txt:106 en/rev-list-options.txt:876 @@ -7974,31 +7974,31 @@ msgstr "--reverse" #: en/git-apply.txt:108 #, priority:100 msgid "Apply the patch in reverse." -msgstr "" +msgstr "�띹퓝�ε틪�②‥訝곥��" #. type: Plain text #: en/git-apply.txt:115 #, priority:100 msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files." -msgstr "" +msgstr "訝뷰틙岳앲칮�잌춴�㏆펽'git apply' 容섋��끻넻訝뗤폏鵝욘빐訝よ‥訝곩ㅁ�덌펽亮뜸툝�ⓩ윇雅쏁쎅�뉏툖�귞뵪�꾣깄�듕툔訝띴폏�θ㏄藥δ퐳�뷩�� 瓦쇾릉�됮」溫⒴츆佯붺뵪烏δ툈訝��귞뵪�꾦깿�놅펽亮뜹컛熬ユ땼瀯앯쉪��젃�쇿쑉�멨틪�� *.rej �뉏뻑訝���" #. type: Plain text #: en/git-apply.txt:119 #, priority:100 msgid "When `--numstat` has been given, do not munge pathnames, but use a NUL-terminated machine-readable format." -msgstr "" +msgstr "壤� `--numstat` 熬ョ퍢�뷸뿶竊뚥툖野배러孃꾢릫瓦쏂죱煐뽫쟻竊뚩�뚧삸鵝욜뵪餓� NUL 瀯볟갼�꾣쑛�ⓨ룾瑥삥졏凉뤵��" #. type: Plain text #: en/git-apply.txt:129 -#, priority:100 +#, fuzzy, priority:100 msgid "Remove <n> leading path components (separated by slashes) from traditional diff paths. E.g., with `-p2`, a patch against `a/dir/file` will be applied directly to `file`. The default is 1." -msgstr "" +msgstr "燁삯솮鴉좂퍨 diff 瓮�푶訝�쉪 <n> �띶�瓮�푶�먨늽竊덄뵪�쒐봇�녽슂竊됥�귚풃倻귨펽鵝욜뵪 `-p2`竊뚪뭹野� `a/dir/file` �꾥‥訝곩컛�닸렏佯붺뵪雅� `file`�귡퍡溫ㅴ맏 1��" #. type: Plain text #: en/git-apply.txt:135 #, priority:100 msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored." -msgstr "" +msgstr "簾�퓷驪뤸А�닸뵻�띶릮�녑컩�� <n> 烏뚨쉪�ⓨ쎍��쥊�멨뙶�띲�� 壤볟뫅�당렞罌껆쉪烏뚧빊渦껃컩�띰펽若껂뺄恙낂』�③깿�백뀓�� �③퍡溫ㅶ깄�듕툔竊뚧깹�됦뻣鵝뺜툓訝뗦뻼熬ュ옙�γ��" #. type: Labeled list #: en/git-apply.txt:136 @@ -8010,13 +8010,13 @@ msgstr "--unidiff-zero" #: en/git-apply.txt:142 #, priority:100 msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`." -msgstr "" +msgstr "容섋��끻넻訝뗰펽'git apply' 躍뚧쐹熬ュ틪�①쉪烏δ툈���訝よ눛弱묉쐣訝�烏뚥툓訝뗦뻼�꾤퍨訝�藥�펰�� 瓦숁룓堊쎽틙孃덂��꾢츎�ⓩ렕�쏙펽鵝녶쑉佯붺뵪餓� `--unified=0` �잍닇�꾢량凉귝뿶竊뚥폏�븀렟��쥦�귟쫨瀯뺠퓝瓦쇾틳汝��ο펽瑥룝슴�� `--unidiff-zero`��" #. type: Plain text #: en/git-apply.txt:145 #, priority:100 msgid "Note, for the reasons stated above usage of context-free patches is discouraged." -msgstr "" +msgstr "力ⓩ꼷竊뚨뵳雅롣툓瓦겼렅�좑펽訝띺폆�긴슴�ⓩ뿞瑥�쥊烏δ툈��" #. type: Plain text #: en/git-apply.txt:146 en/git-rebase.txt:285 en/git-rebase.txt:648 @@ -8028,7 +8028,7 @@ msgstr "--apply" #: en/git-apply.txt:152 #, priority:100 msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch." -msgstr "" +msgstr "倻귝옖�ⓧ슴�ⓧ틙訝딃씊�뉑쐣 \"�녜뿭 'apply' \" �꾡뻣鵝뺡�됮」竊�'git apply' 鴉싪��뽩뭉渦볟눣�����꾡에��펽�뚥툖鴉싧츩�끻틪�②‥訝곥�� �②퓳雅쎿젃恙쀤퉳�롧퍢�븃퓳訝ゆ젃恙쀯펽阿잌룾餓ε틪�②�烏δ툈��" #. type: Labeled list #: en/git-apply.txt:153 @@ -8040,7 +8040,7 @@ msgstr "--no-add" #: en/git-apply.txt:159 #, priority:100 msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part." -msgstr "" +msgstr "壤볟틪�ⓧ�訝よ‥訝곫뿶竊뚦옙�θ�烏δ툈���싩쉪曆삣뒥�끻��� 瓦쇿룾餓η뵪�ζ룓�뽨륵訝ゆ뻼餓뜸퉳�당쉪�긷릪�ⓨ늽竊뚪쫿�덂�若껂뺄瓦먫죱 'diff'竊뚨꽫�롧뵪瓦쇾릉�됮」佯붺뵪瀯볠옖竊뚩퓳弱녶틪�ⓨ닠�ㅷ쉪�ⓨ늽竊뚥퐜訝띶틪�ⓨ쥭�좂쉪�ⓨ늽��" #. type: Labeled list #: en/git-apply.txt:160 @@ -8052,7 +8052,7 @@ msgstr "--allow-binary-replacement" #: en/git-apply.txt:166 #, priority:100 msgid "Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no-op." -msgstr "" +msgstr "�녶뤁訝딉펽�묇뺄訝띶뀅溫멨쑉亦→쐣�ⓩ댎�롧‘溫멨룾�꾣깄�듕툔佯붺뵪雅뚩퓵�띈‥訝곻펽�뚩퓳訝ゆ젃恙쀦삸瓦숁졆�싩쉪�� ��뎺竊뚧닊餓ф�삥삸�곮�佯붺뵪雅뚩퓵�띈‥訝곻펽��餓θ퓳���訝ゆ뿞�ⓨ뒣��" #. type: Labeled list #: en/git-apply.txt:167 @@ -8064,7 +8064,7 @@ msgstr "--exclude=<path-pattern>" #: en/git-apply.txt:171 #, priority:100 msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories." -msgstr "" +msgstr "訝띹쫨野밭Е�덄퍢若싪러孃꾣Æ凉뤹쉪�뉏뻑瓦쏂죱岳�뵻�귟퓳�ⓨ��θ‥訝곲썓�띰펽鵝졿꺍�딀윇雅쎿뻼餓뜻닑��퐬�믧솮�ⓨ쨼�꾣깄�듕툔孃덃쐣�ⓦ��" #. type: Labeled list #: en/git-apply.txt:172 @@ -8076,19 +8076,19 @@ msgstr "--include=<path-pattern>" #: en/git-apply.txt:176 #, priority:100 msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories." -msgstr "" +msgstr "弱녵엶�밧틪�ⓧ틢訝롧퍢若싪러孃꾣Æ凉뤹쎑�백뀓�꾣뻼餓뜰�귟퓳�ⓨ��θ‥訝곲썓�띰펽鵝졿꺍�끾떖�먧틳�뉏뻑�뽫쎅壤뺟쉪�끻넻訝뗥푽�됬뵪��" #. type: Plain text #: en/git-apply.txt:182 #, priority:100 msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern." -msgstr "" +msgstr "壤볞슴�� `--exclude` �� `-include` 與▼폀�띰펽鴉싨뙃�㎩츆餓у쑉�썰빱烏뚥릎�븀렟�꾦『佯뤺퓵烏뚧��ο펽寧т�訝ゅ뙶�띺」�녑츣��맔鵝욜뵪驪뤶릉瓮�푶�꾥‥訝곥�� 倻귝옖�썰빱烏뚥툓亦→쐣include與▼폀竊뚦닕容섋�鵝욜뵪訝띶뙶�띴뻣鵝� include/exclude 與▼폀�꾥러孃꾤쉪烏δ툈竊뚦쫩�쒏쐣餓삡퐬 include 與▼폀竊뚦닕恙썹븼��" #. type: Plain text #: en/git-apply.txt:190 #, priority:100 msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though." -msgstr "" +msgstr "壤볟틪�ⓧ�訝よ‥訝곫뿶竊뚦쫩�쒏쐣恙낁쫨竊뚩�恙썹븼訝듾툔�뉓죱訝�쉪令븀쇋�섇뙑�� 訝듾툔�뉓죱弱녵퓷�쇿끀令븀쇋竊뚧뿞溫� `--whitespace` �됮」�꾢�쇗삸鸚싧컩竊뚦츆餓ч꺗訝띴폏瓦쏂죱令븀쇋岳���귚툖瓦뉛펽�곁쉪烏뚥퍖�뜸폏熬ヤ엶鸚띲��" #. type: Labeled list #: en/git-apply.txt:191 @@ -8100,49 +8100,49 @@ msgstr "--whitespace=<action>" #: en/git-apply.txt:199 #, priority:100 msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors." -msgstr "" +msgstr "壤볟틪�ⓧ�訝よ‥訝곫뿶竊뚧�役뗤�訝ゆ뼭�꾣닑岳�뵻瓦뉒쉪烏뚧쐣令뷸졏�숃��� 餓�阿덃삸令뷸졏�숃���뵳 `core.whitespace` �띸쉰�㎩댍�꾠�� 容섋��끻넻訝뗰펽弱얗깿�꾤㈉�쏙펷�끾떖餓끿뵳令븀쇋瀯꾣닇�꾥죱竊됧뭽榮㎬퇎�②죱�꾢닜冶뗧섄瓦쎾냵�� Tab 耶쀧Е�꾤㈉�썲춻寧�˙溫ㅴ맏��㈉�썽뵗瑥���" #. type: Plain text #: en/git-apply.txt:203 #, priority:100 msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`." -msgstr "" +msgstr "容섋��끻넻訝뗰펽瑥ε뫝餓ㅸ풏�븃��듾에��펽鵝녵폏佯붺뵪烏δ툈�� 壤� `git-apply` 熬ョ뵪雅롧퍨溫↑�뚥툖佯붺뵪烏δ툈�띰펽若껈퍡溫ㅴ맏 `nowarn`��" #. type: Plain text #: en/git-apply.txt:206 -#, priority:100 +#, fuzzy, priority:100 msgid "You can use different `<action>` values to control this behavior:" -msgstr "" +msgstr "鵝졾룾餓δ슴�ⓧ툖�뚨쉪 `<action>` �쇗씎�㎩댍瓦숂쭕烏뚥맏竊�" #. type: Plain text #: en/git-apply.txt:208 #, priority:100 msgid "`nowarn` turns off the trailing whitespace warning." -msgstr "" +msgstr "`nowarn` �녜뿭弱얗깿令븀쇋鈺�몜��" #. type: Plain text #: en/git-apply.txt:210 #, priority:100 msgid "`warn` outputs warnings for a few such errors, but applies the patch as-is (default)." -msgstr "" +msgstr "`warn` 野밧컩�경�映삯뵗瑥�풏�븃��딉펽鵝녷뙃�잍졆佯붺뵪烏δ툈竊덆퍡溫ㅿ펹��" #. type: Plain text #: en/git-apply.txt:214 #, priority:100 msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym -- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)." -msgstr "" +msgstr "`fix` 野밥�雅쏂퓳�루쉪�숃�渦볟눣鈺�몜竊뚦뭉�ⓧ엶鸚띶릮佯붺뵪烏δ툈竊�`strip` ���訝ゅ릪阿됭칾--瑥ε램�룩퓝�삣룵�껇솑弱얗깿令븀쇋耶쀧Е�꾦뵗瑥�펽岳�쨳易됧룋 'stripping' 嶺됵펽鵝녺렟餓� Gits �싧풓�닷쩀竊됥��" #. type: Plain text #: en/git-apply.txt:216 #, priority:100 msgid "`error` outputs warnings for a few such errors, and refuses to apply the patch." -msgstr "" +msgstr "`error` 野밧뇿訝よ퓳�루쉪�숃�渦볟눣鈺�몜竊뚦뭉�믥퍦佯붺뵪烏δ툈��" #. type: Plain text #: en/git-apply.txt:217 #, priority:100 msgid "`error-all` is similar to `error` but shows all errors." -msgstr "" +msgstr "`error-all` 訝� `error` 映삡세竊뚥퐜�양ㅊ���됮뵗瑥���" #. type: Labeled list #: en/git-apply.txt:218 @@ -8154,19 +8154,19 @@ msgstr "--inaccurate-eof" #: en/git-apply.txt:224 #, priority:100 msgid "Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug." -msgstr "" +msgstr "�ⓩ윇雅쎿깄�듕툔竊뚧윇雅쏁뎵�х쉪 'diff ' 訝띹꺗閭g‘汝�役뗥댆�뉏뻑�ュ갼煐뷴컩�꾣뜟烏뚣�귛썱閭ㅿ펽�김퓳映� 'diff' 葉뗥틣�쎾뻠�꾥‥訝곦툖�썸�簾��壤뺜툖若뚧빐�꾥죱�귟퓳訝ら�됮」�싪퓝鰲e넶瓦쇾릉�숃��ε쥭�졾�佯붺뵪瓦숂쭕烏δ툈�꾣뵱�곥��" #. type: Plain text #: en/git-apply.txt:230 #, priority:100 msgid "Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported." -msgstr "" +msgstr "�묉젃�녽뵗瑥�탛�ε몜瓦쎾벧�귡퍡溫ㅶ깄�듕툔竊뚦룵�됧뀽雅롥퐪�띷��ⓨ틪�①쉪烏δ툈�꾡에��폏熬ユ돀�겼눣�γ�귟퓳訝ら�됮」弱녶��닸뒫�딃쥫鸚뽫쉪岳→겘��" #. type: Plain text #: en/git-apply.txt:235 #, priority:100 msgid "Suppress stderr output. Messages about patch status and progress will not be printed." -msgstr "" +msgstr "�묈댍�뉐뇛�숃�役곮풏�뷩�귛뀽雅롨‥訝곭듁�곩뭽瓦쎾벧�꾡에��컛訝띹˙�볟뜲��" #. type: Labeled list #: en/git-apply.txt:236 @@ -8178,7 +8178,7 @@ msgstr "--recount" #: en/git-apply.txt:240 #, priority:100 msgid "Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately)." -msgstr "" +msgstr "訝띴에餓사퍍鸚답릎�꾥죱�곤펽�뚧삸�싪퓝汝��θ‥訝곫씎�ⓩ뼪竊덁풃倻귨펽�①폋渦묋‥訝곩릮亦→쐣�귛퐪瘟껅빐瀯꾢ㅄ竊됥��" #. type: Labeled list #: en/git-apply.txt:241 @@ -8190,13 +8190,13 @@ msgstr "--directory=<root>" #: en/git-apply.txt:244 #, priority:100 msgid "Prepend <root> to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root." -msgstr "" +msgstr "弱� <�밭쎅壤�> 窯꾤쉰�경��됪뻼餓뜹릫訝��� 倻귝옖瓦섆폖�믢틙 \"-p \" �귝빊竊뚦닕�③쥋營�뼭�밭쎅壤뺜퉳�띶틪�ⓦ��" #. type: Plain text #: en/git-apply.txt:248 #, priority:100 msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`." -msgstr "" +msgstr "堊뗥쫩竊뚥�訝ゅ뀽雅롥컛 `a/git-gui.sh` �닸뼭訝� `b/git-gui.sh` �꾥‥訝곩룾餓ι�싪퓝瓦먫죱 `git apply --directory=modules/git-gui` �ε틪�ⓧ틢藥δ퐳�� `modules/git-gui/git-gui.sh` 訝�쉪�뉏뻑��" #. type: Labeled list #: en/git-apply.txt:249 @@ -8208,19 +8208,19 @@ msgstr "--unsafe-paths" #: en/git-apply.txt:254 #, priority:100 msgid "By default, a patch that affects outside the working area (either a Git controlled working tree, or the current working directory when \"git apply\" is used as a replacement of GNU patch) is rejected as a mistake (or a mischief)." -msgstr "" +msgstr "容섋��끻넻訝뗰펽壤긷뱧�겼램鵝쒎뙷�잋퉳鸚뽳펷�좄��� Git �㎩댍�꾢램鵝쒎뙷竊뚩퓲��뵪 \"git apply\" �요빰 GNU patch �띄쉪壤볟뎺藥δ퐳��퐬竊됬쉪烏δ툈鴉싪˙壤볞퐳�숃�竊덃닑�뜸퐳�㏆펹�뚧땼瀯앫��" #. type: Plain text #: en/git-apply.txt:258 #, priority:100 msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use." -msgstr "" +msgstr "壤� `git apply` 熬ョ뵪鵝� \"�닷��� GNU 烏δ툈\" �띰펽�ⓩ댎��빳�싪퓝 `--unsafe-paths` �됮」�θ쫮�뽬퓳訝ゅ츎�ⓩ��γ�� 壤볞슴�� `--index` �� `--cached` �띰펽瑥ι�됮」亦→쐣鵝쒐뵪��" #. type: Plain text #: en/git-apply.txt:262 #, priority:100 msgid "Don't return error for patches containing no diff. This includes empty patches and patches with commit text only." -msgstr "" +msgstr "野밥틢訝띶똿�ュ량凉귞쉪烏δ툈竊뚥툖瓦붷썮�숃��귟퓳�끾떖令븃‥訝곩뭽�ゆ쐣�먧벡�뉑쑍�꾥‥訝곥��" #. type: Title - #: en/git-apply.txt:271 en/git-mv.txt:48 en/git-rm.txt:153 @@ -8232,19 +8232,19 @@ msgstr "耶먩Æ��" #: en/git-apply.txt:274 #, priority:100 msgid "If the patch contains any changes to submodules then 'git apply' treats these changes as follows." -msgstr "" +msgstr "倻귝옖瑥θ‥訝곩똿�ュ�耶먩Æ�쀧쉪餓삡퐬岳�뵻竊뚪궍阿� 'git apply' 鴉싧�瓦쇾틳岳�뵻瓦쏂죱倻귚툔鸚꾤릤��" #. type: Plain text #: en/git-apply.txt:280 #, priority:100 msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated." -msgstr "" +msgstr "倻귝옖 `--index` 熬ユ뙁若싷펷�얍폀�뽭쉺凉륅펹竊뚪궍阿덂춴與▼쓼�꾣룓雅ㅵ퓚窈삡툗榮℡폊若뚦뀲�백뀓竊뚩‥訝곫뎺�썲틪�ⓦ�� 倻귝옖餓삡퐬訝�訝ゅ춴與▼쓼熬ユ��븝펽�d퉰瓦쇾틳汝��븀쉪與▼쓼弱녻˙若뚦뀲恙썹븼竊뚥튋弱길삸瑥댐펽若껂뺄訝띺�誤곫삸���곁쉪�뽩묾���꾬펽若껂뺄阿잋툖鴉싪˙�닸뼭��" #. type: Plain text #: en/git-apply.txt:284 #, priority:100 msgid "If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated." -msgstr "" +msgstr "倻귝옖亦→쐣�뉐츣 `--index`竊뚪궍阿덅‥訝곦릎�꾢춴與▼쓼�먧벡弱녻˙恙썹븼竊뚦룵汝��η쎑佯붺쉪耶먪쎅壤뺞삸��춼�⑨펽亮띰펷倻귝옖��꺗竊됪쎍�겹��" #. type: Plain text #: en/git-apply.txt:288 @@ -8262,7 +8262,7 @@ msgstr "git-archimport(1)" #: en/git-archimport.txt:7 #, priority:100 msgid "git-archimport - Import a GNU Arch repository into Git" -msgstr "" +msgstr "git-archimport - 弱� GNU Arch 餓볟틩野쇔뀯 Git 訝�" #. type: Plain text #: en/git-archimport.txt:14 @@ -8270,49 +8270,49 @@ msgstr "" msgid "" "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]\n" "\t <archive>/<branch>[:<git-branch>]...\n" -msgstr "" +msgstr "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <曆긷벧>] [-t <煐볟춼��퐬>]\n\t <壤믤。>/<�녷뵱>[:<git �녷뵱>]...\n" #. type: Plain text #: en/git-archimport.txt:23 #, priority:100 msgid "Imports a project from one or more GNU Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive>/<branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)." -msgstr "" +msgstr "餓롣�訝ゆ닑鸚싦릉 GNU Arch 餓볟틩野쇔뀯訝�訝ら」���� 若껃컛�ⓩ��먧풘�� <壤믤。>/<�녷뵱> �귝빊��若싦퉱�꾢뫝�띸㈉�닷냵瓮잒릉�녷뵱�뚥퍜佯볝�귛쫩�쒎츆�얌툖�겼릦亮뜹릮�꾥퓶葉뗥늽��펽弱긴폏�듿츆鵝쒍맏訝�訝ゆ솹�싩쉪�먧벡野쇔뀯�귛쫩�쒎츆�썸돻�겼츆竊뚦츆鴉싧갹��꺗�겼컛�뜻젃溫겻맏�덂뭉竊덅쭅訝뗩씊�꾥�溫븝펹��" #. type: Plain text #: en/git-archimport.txt:27 #, priority:100 msgid "The script expects you to provide the key roots where it can start the import from an 'initial import' or 'tag' type of Arch commit. It will follow and import new branches within the provided roots." -msgstr "" +msgstr "瑥θ꽊�у툕�쎽퐷�먧풘�녜뵰�꾣졊��퐬竊뚦츆��빳餓� 'initial' �� 'tag' 映삣엹�� Arch �먧벡凉�冶뗥��γ�귛츆弱녻퇎甕ゅ뭉野쇔뀯���먧풘�꾣졊��퐬訝뗧쉪�겼늽����" #. type: Plain text #: en/git-archimport.txt:32 #, priority:100 msgid "It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, edit your <archive>/<branch> parameters to define clearly the scope of the import." -msgstr "" +msgstr "若껃툕�쎾룵鸚꾤릤訝�訝ら」���귛쫩�쒎츆�뗥댆�됦툖�뚧졊��퐬�꾢늽��펽若껃컛�믥퍦瓦먫죱�귛쑉瓦숂쭕�끻넻訝뗰펽煐뽬풌鵝좂쉪 <壤믤。>/<�녷뵱> �귝빊竊뚥빳�롧‘若싦퉱野쇔뀯�꾥똽�담��" #. type: Plain text #: en/git-archimport.txt:37 #, priority:100 msgid "'git archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must know about the repositories you pass to 'git archimport'." -msgstr "" +msgstr "'git archimport' �ⓨ릮�겼뮈力쎽슴�� `tla` �θ��췆rch餓볟틩�� 簾�퓷鵝좂쉪瓮�푶訝�쐣訝�訝ゆ��곁뎵�х쉪 `tla`��`tla` 恙낂』�ι걪鵝졽폖�믥퍢 'git archimport' �꾡퍜佯볝��" #. type: Plain text #: en/git-archimport.txt:42 -#, priority:100 +#, fuzzy, priority:100 msgid "For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun 'git archimport' with the same parameters as the initial import to perform incremental imports." -msgstr "" +msgstr "野밥틢�앭쭓野쇔뀯竊�'git archimport' 躍뚧쐹�썲쑉訝�訝ょ㈉��퐬訝�돻�계눎藥긱�귟쫨瓮잒릉訝�訝や슴�� Arch �꾦」��쉪�묈콝竊뚪뇥�계퓧烏� 'git archimport'竊뚦뢿�겻툗�앭쭓野쇔뀯�멨릪竊뚥빳�㎬죱罌욇뇧野쇔뀯��" #. type: Plain text #: en/git-archimport.txt:49 #, priority:100 msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive>/<branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"." -msgstr "" +msgstr "�썹꽫 'git archimport' 鴉싧컼瑥뺜맏若껃��η쉪旅f죭�쎾뻠�덄릤�꾢늽��릫竊뚥퐜阿잌룾餓ζ뎸�ⓩ뙁若� Git �녷뵱�띲�� 誤곩걳�계퓳訝��뱄펽�ⓩ캀訝� <壤믤。>/<�녷뵱> �귝빊�롩씊�쇾�訝� Git �녷뵱�랃펽�ⓨ넂�룬슂凉��� 瓦숁졆竊뚥퐷��빳煐⑴윮 Arch �녷뵱�꾢릫燁곤펽亮뜹컛 Arch �꾥죱瑥앲쉬�€닇 Git �꾥죱瑥앾펽堊뗥쫩弱� \"PROJECT{litdd}devo{litdd}VERSION\" �녷뵱�졾컙訝� \"master\"��" #. type: Plain text #: en/git-archimport.txt:54 #, priority:100 msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically." -msgstr "" +msgstr "弱녶쩀訝� Arch �녷뵱�녘걫�겻�訝� Git �녷뵱��룾�썹쉪竊쎾룵�됧쑉�쎾뻠寧т틠訝ゅ늽��릮亦→쐣�묊К訝�訝ゅ늽��룓雅ㅷ쉪�끻넻訝뗰펽�띄퍜�쒏뎺����덄릤�꾠�� 訝띹퓝竊뚩퓳野밥틢饔ф뜟若싨쐿饔�뜟�� Arch 餓볟틩瓦섉삸孃덃쐣�①쉪��" #. type: Title - #: en/git-archimport.txt:57 @@ -8324,25 +8324,25 @@ msgstr "MERGES" #: en/git-archimport.txt:63 #, priority:100 msgid "Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata." -msgstr "" +msgstr "Arch �꾥‥訝곩릦亮뜻빊��쑉 Git 訝�튋熬ョ뵪�ζ젃溫겼릦亮뜰�괛it 亮뜸툖�녑퓘野배‥訝곭쉪瓦썼릉竊뚦룵�됧퐪訝�訝ゅ늽��똿�ヤ틙�ゅ늽�됬궧餓ζ씎�꾣��됪룓雅ㅶ뿶竊뚧뎺鴉싪�껇솑�덂뭉�귝�瀯덄쉪瀯볠옖��펽Git 鴉싧푽也썲쑑雅녻㎗�녷뵱�꾢늽閭㎫쮮佯╉�귝�餓ε��θ퓝葉뗧‘若욂폏訝℡ㅁ訝�雅쏂‥訝곦벡�볡쉪�껅빊����" #. type: Plain text #: en/git-archimport.txt:67 #, priority:100 msgid "Fortunately, when you try and merge branches imported from Arch, Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches." -msgstr "" +msgstr "亮멱퓧�꾣삸竊뚦퐪鵝졾컼瑥뺝릦亮뜸퍗 Arch 野쇔뀯�꾢늽��뿶竊똆it 鴉싨돻�겻�訝ゅ��꾢릦亮뜹읃簾�竊뚩�뚥툝若껅쐣孃덂ㄷ�꾣쑛鴉싪칳�ュ눣�ⓨ늽��퉳�닺˙雅ㅶ삌�꾡툖寧�릦窈뷴틣�꾥‥訝곥��" #. type: Plain text #: en/git-archimport.txt:73 #, priority:100 msgid "Display usage." -msgstr "" +msgstr "�양ㅊ�③�붵��" #. type: Plain text #: en/git-archimport.txt:76 -#, priority:100 +#, fuzzy, priority:100 msgid "Verbose output." -msgstr "" +msgstr "暎쀧븼�꾥풏�뷩��" #. type: Labeled list #: en/git-archimport.txt:77 @@ -8354,13 +8354,13 @@ msgstr "-T" #: en/git-archimport.txt:80 #, priority:100 msgid "Many tags. Will create a tag for every commit, reflecting the commit name in the Arch repository." -msgstr "" +msgstr "鸚싨젃嶺얇�귛컛訝뷸캀訝ゆ룓雅ㅵ닗兩뷰�訝ゆ젃嶺억펽�띷삝 Arch 佯볞릎�꾣룓雅ㅵ릫燁겹��" #. type: Plain text #: en/git-archimport.txt:85 #, priority:100 msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe." -msgstr "" +msgstr "鵝욜뵪恙ラ�잒‥訝곲썓野쇔뀯嶺뽫븼�� 瓦쇿�鸚㎫쎅壤뺞젒�θ���빳�롦샑�졾엮竊뚥퐜訝띹꺗鸚꾤릤��퐬�띶릫�뽪쓢�먨룜�뽧�� 容섋�嶺뽫븼��폆���뚦츎�①쉪��" #. type: Labeled list #: en/git-archimport.txt:86 en/git-commit.txt:308 en/git-grep.txt:183 en/git-ls-files.txt:53 en/git-merge-index.txt:29 @@ -8372,7 +8372,7 @@ msgstr "-o" #: en/git-archimport.txt:93 #, priority:100 msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones." -msgstr "" +msgstr "訝뷰틙訝롦뿩�잏뎵�х쉪 'git archimport' ��鵝욜뵪�꾣뿧凉뤷늽��릫�쇔�竊뚥슴�②퓳訝ゅ릫耶쀣�� �㎩폀�꾢늽��릫�� category{litdd}branch竊뚩�뚧뼭凉뤹쉪�녷뵱�띷삸 archive,category{litdd}branch{litdd}version�� �②퓳訝ㅷ쭕�끻넻訝뗰펽�ⓨ뫝餓ㅸ죱訝�퍢�븀쉪�띶춻弱녻쫮�뽬눎�①뵟�먪쉪�띶춻��" #. type: Labeled list #: en/git-archimport.txt:94 @@ -8384,25 +8384,25 @@ msgstr "-D <depth>" #: en/git-archimport.txt:98 #, priority:100 msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned." -msgstr "" +msgstr "�드쑵�덂뭉�꾤쪝�덌펽亮뜹컼瑥뺝��ε럴瀯뤷릦亮띄쉪��퐬�묆�� 倻귝옖烏δ툈�ε퓱藥꿰퍘熬ヤ엶�わ펽�숁뙁若싦�訝ゅㄷ雅� 1 �꾣런佯╉��" #. type: Plain text #: en/git-archimport.txt:102 #, priority:100 msgid "Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This is particularly useful with the -D option." -msgstr "" +msgstr "弱앲캊�� `http://mirrors.sourcecontrol.net` 訝딂눎�ⓩ낏�뚧。旅덌펽瓦쇿쑉 -D �됮」訝뗧돶�ユ쐣�ⓦ��" #. type: Labeled list #: en/git-archimport.txt:103 #, no-wrap, priority:100 msgid "-t <tmpdir>" -msgstr "" +msgstr "-t <煐볟춼��퐬>" #. type: Plain text #: en/git-archimport.txt:105 #, priority:100 msgid "Override the default tempdir." -msgstr "" +msgstr "�띶넍容섋�煐볟춼��퐬��" #. type: Labeled list #: en/git-archimport.txt:107 @@ -8414,7 +8414,7 @@ msgstr "--branch <branch>" #: en/git-archimport.txt:109 #, priority:100 msgid "<archive>/<branch> identifier in a format that `tla log` understands." -msgstr "" +msgstr "<壤믤。>/<�녷뵱> �뉓칳寧�쉪�쇔폀�� `tla log` �썹릤鰲g쉪��" #. type: Title = #: en/git-archive.txt:2 @@ -8426,29 +8426,29 @@ msgstr "git-archive(1)" #: en/git-archive.txt:7 #, priority:100 msgid "git-archive - Create an archive of files from a named tree" -msgstr "" +msgstr "git-archive - 餓롥뫝�띸쉪��퐬�묇릎�쎾뻠訝�訝ゅ퐩旅f뻼餓�" #. type: Plain text #: en/git-archive.txt:16 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n" "\t [-o <file> | --output=<file>] [--worktree-attributes]\n" "\t [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>\n" "\t [<path>...]\n" -msgstr "" +msgstr "'git archive' [--format=<fmt>] [--list] [--prefix=<�띸�>/] [<extra>]\n\t [-o <�뉏뻑> | --output=<�뉏뻑>] [--worktree-attributes]\n\t [--remote=<餓볟틩> [--exec=<git-upload-archive>]] <�묊듁野배괌>\n\t [<瓮�푶>...]\n" #. type: Plain text #: en/git-archive.txt:23 #, priority:100 msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive." -msgstr "" +msgstr "�쎾뻠訝�訝ゆ뙁若싨졏凉뤹쉪旅f죭竊뚦똿�ュ뫝�띸쉪��퐬�묊쉪瀯볠엫竊뚦뭉弱녶끀�쇿뀯�뉐뇛渦볟눣�� 倻귝옖 <�띸�> 熬ユ뙁若싷펽若껃컛熬ラ쥋營�쑉壤믤。�뉏뻑�꾣뻼餓뜹릫訝듽��" #. type: Plain text #: en/git-archive.txt:32 #, priority:100 msgid "'git archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as the modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment." -msgstr "" +msgstr "'git archive' �①퍢若싨젒�� ID �뚨퍢若싨룓雅ㅷ쉪 ID �뽪젃嶺양쉪 ID �띈〃�겻툖�뚣�� �ⓨ뎺訝�燁띷깄�듕툔竊뚦퐪�띷뿶�닺˙�ⓧ퐳旅f죭訝�캀訝ゆ뻼餓띄쉪岳�뵻�띌뿴�� �ⓨ릮訝�燁띷깄�듕툔竊뚦닕鵝욜뵪�귟�껆쉪�먧벡野배괌訝��壤뺟쉪�먧벡�띌뿴�� 閭ㅵ쨼竊뚦쫩�쒍슴�� tar �쇔폀竊뚧룓雅� ID 鴉싪˙耶섇궓�ⓧ�訝ゅ뀲掠��⒴콝�� pax 鸚답릎竊쎾룾餓η뵪 'git get-tar-commit-id' �ζ룓�뽩츆�귛쑉 ZIP �뉏뻑訝�펽若껇˙耶섇궓訝뷰�訝ゆ뻼餓뜻낏�듽��" #. type: Labeled list #: en/git-archive.txt:36 @@ -8460,7 +8460,7 @@ msgstr "--format=<fmt>" #: en/git-archive.txt:44 #, priority:100 msgid "Format of the resulting archive. Possible values are `tar`, `zip`, `tar.gz`, `tgz`, and any format defined using the configuration option `tar.<format>.command`. If `--format` is not given, and the output file is specified, the format is inferred from the filename if possible (e.g. writing to `foo.zip` makes the output to be in the `zip` format). Otherwise the output format is `tar`." -msgstr "" +msgstr "壤믤。�뉏뻑�꾣졏凉뤵�귛룾�썹쉪�쇗삸 `tar`, `zip`, `tar.gz`, `tgz`, 餓ε룋鵝욜뵪�띸쉰�됮」 `tar.<�쇔폀>.command` 若싦퉱�꾡뻣鵝뺞졏凉뤵�귛쫩�쒏깹�됬퍢�� `--format`竊뚦뭉訝붹뙁若싦틙渦볟눣�뉏뻑竊뚦쫩�쒎룾�썹쉪瑥앾펽弱녵퍗�뉏뻑�띴릎�ⓩ뼪�뷸졏凉륅펷堊뗥쫩竊뚦넍��`foo.zip` 鴉싦슴渦볟눣訝�`zip`�쇔폀竊됥�귛맔�숋펽渦볟눣�쇔폀訝�`tar`��" #. type: Labeled list #: en/git-archive.txt:46 en/git-branch.txt:182 en/git-config.txt:182 en/git-show-branch.txt:80 en/git-tag.txt:100 @@ -8472,13 +8472,13 @@ msgstr "--list" #: en/git-archive.txt:48 #, priority:100 msgid "Show all available formats." -msgstr "" +msgstr "�양ㅊ���됧룾�①쉪�쇔폀��" #. type: Plain text #: en/git-archive.txt:52 #, priority:100 msgid "Report progress to stderr." -msgstr "" +msgstr "�묉젃�녽뵗瑥�탛�ε몜瓦쎾벧��" #. type: Labeled list #: en/git-archive.txt:53 en/git-write-tree.txt:35 @@ -8490,7 +8490,7 @@ msgstr "--prefix=<prefix>/" #: en/git-archive.txt:57 #, priority:100 msgid "Prepend <prefix>/ to paths in the archive. Can be repeated; its rightmost value is used for all tracked files. See below which value gets used by `--add-file` and `--add-virtual-file`." -msgstr "" +msgstr "弱� <�띸�>/ 窯꾤쉰�겼춼旅d릎�꾥러孃꾠�� ��빳�띶쨳鵝욜뵪竊쎾끀���녘씁�꾢�쇘뵪雅롦��됭퇎甕ょ쉪�뉏뻑�� 瑥루쐦訝뗩씊�� `--add-file` �� `--add-virtual-file` ��鵝욜뵪�꾢�쇈��" #. type: Labeled list #: en/git-archive.txt:58 @@ -8502,7 +8502,7 @@ msgstr "-o <file>" #: en/git-archive.txt:61 #, priority:100 msgid "Write the archive to <file> instead of stdout." -msgstr "" +msgstr "弱녶춼旅e넍�� <�뉏뻑> �뚥툖��젃�녻풏�뷸탛��" #. type: Labeled list #: en/git-archive.txt:62 @@ -8515,31 +8515,31 @@ msgstr "--add-file=<file>" #: en/git-archive.txt:67 #, priority:100 msgid "Add a non-tracked file to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-file` and the basename of <file>." -msgstr "" +msgstr "曆삣뒥訝�訝ら씆瓮잒릉�꾣뻼餓뜹댆耶섉。�� ��빳�띶쨳曆삣뒥鸚싦릉�뉏뻑�� 壤믤。�뉏뻑�꾥러孃꾣삸�김퓳訝� `--add-file` 阿뗥뎺�꾣��롣�訝� `--prefix` �됮」竊덂쫩�쒏쐣�꾥캕竊됬쉪�쇔뭽 <�뉏뻑> �꾢읃�у릫燁계퓹�θ�뚧닇�꾠��" #. type: Labeled list #: en/git-archive.txt:68 #, no-wrap, priority:100 msgid "--add-virtual-file=<path>:<content>" -msgstr "" +msgstr "--add-virtual-file=<瓮�푶>:<�끻�>" #. type: Plain text #: en/git-archive.txt:73 #, priority:100 msgid "Add the specified contents to the archive. Can be repeated to add multiple files. The path of the file in the archive is built by concatenating the value of the last `--prefix` option (if any) before this `--add-virtual-file` and `<path>`." -msgstr "" +msgstr "弱녷뙁若싩쉪�끻�曆삣뒥�경。旅덁릎�� ��빳�띶쨳曆삣뒥鸚싦릉�뉏뻑�� 壤믤。�뉏뻑�꾥러孃꾣삸�김퓳訝� `--add-virtual-file` 阿뗥뎺�꾣��롣�訝� `--prefix` �됮」竊덂쫩�쒏쐣�꾥캕竊됧뭽 `<瓮�푶>` �멱퓹�뚧닇�꾠��" #. type: Plain text #: en/git-archive.txt:80 #, priority:100 msgid "The `<path>` argument can start and end with a literal double-quote character; the contained file name is interpreted as a C-style string, i.e. the backslash is interpreted as escape character. The path must be quoted if it contains a colon, to avoid the colon from being misinterpreted as the separator between the path and the contents, or if the path begins or ends with a double-quote character." -msgstr "" +msgstr "`<瓮�푶>` �귝빊��빳餓ε춻�®쉪�뚦폊�룟춻寧��冶뗥뭽瀯볠씇竊쎾똿�ョ쉪�뉏뻑�띹˙鰲i뇢訝� C 繇롦졏�꾢춻寧╊림竊뚦뜵�띷뼔�좄˙鰲i뇢訝븃쉬阿됧춻寧╉�귛쫩�쒑러孃꾢똿�ヤ�訝ゅ넂�뤄펽�쇿퓚窈삣뒥凉뺝뤇竊뚥빳�욕뀓�믣뤇熬ヨ�鰲d맏瓮�푶�뚦냵若밥퉳�당쉪�녽슂寧�펽�뽬�끻쫩�쒑러孃꾡빳�뚦폊�룟춻寧��冶뗦닑瀯볠씇��" #. type: Plain text #: en/git-archive.txt:84 #, priority:100 msgid "The file mode is limited to a regular file, and the option may be subject to platform-dependent command-line limits. For non-trivial cases, write an untracked file and use `--add-file` instead." -msgstr "" +msgstr "�뉏뻑與▼폀熬ラ솏�뜸맏���싨뻼餓띰펽瑥ι�됮」��꺗鴉싧룛�겻풚壅뽩뭄�곁쉪�썰빱烏뚨쉪�먨댍�귛�雅롩씆鸚띷쓡�꾣깄�듸펽�쇾�訝ら씆瓮잒릉�꾣뻼餓뜹뭉鵝욜뵪 `--add-file` 餓f쎘��" #. type: Labeled list #: en/git-archive.txt:85 @@ -8551,7 +8551,7 @@ msgstr "--worktree-attributes" #: en/git-archive.txt:88 #, priority:100 msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)." -msgstr "" +msgstr "阿잌룾餓ε쑉藥δ퐳�뷰릎�� .gitattributes �뉏뻑訝���얍콪�㏆펷鰲� <<ATTRIBUTES>>竊됥��" #. type: Labeled list #: en/git-archive.txt:89 @@ -8563,19 +8563,19 @@ msgstr "--expire <time>" #: en/git-archive.txt:93 #, priority:100 msgid "Set modification time of archive entries. Without this option the committer time is used if `<tree-ish>` is a commit or tag, and the current time if it is a tree." -msgstr "" +msgstr "溫양쉰耶섉。�←쎅�꾡엶�방뿶�담�� 倻귝옖亦→쐣瓦쇾릉�됮」竊뚦쫩�� `<�묊듁野배괌>` ���訝ゆ룓雅ㅶ닑�뉒�竊뚦닕鵝욜뵪�먧벡�끿쉪�띌뿴竊뚦쫩�쒏삸訝�訝ゆ젒竊뚦닕鵝욜뵪壤볟뎺�띌뿴��" #. type: Labeled list #: en/git-archive.txt:94 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "<extra>" -msgstr "" +msgstr "<extra>" #. type: Plain text #: en/git-archive.txt:97 #, priority:100 msgid "This can be any options that the archiver backend understands. See next section." -msgstr "" +msgstr "瓦쇿룾餓ζ삸耶섉。�ⓨ릮塋�꺗�녻㎗�꾡뻣鵝뺡�됮」�� 鰲곦툔訝��귙��" #. type: Labeled list #: en/git-archive.txt:98 @@ -8587,7 +8587,7 @@ msgstr "--remote=<repo>" #: en/git-archive.txt:104 #, priority:100 msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details." -msgstr "" +msgstr "訝롥끀餓롦쑍�곁뎵�у틩�뜸퐳訝�訝� tar 壤믤。竊뚥툖倻귚퍗瓦쒐쮮�덃쑍佯볠�榮㏘�訝� tar 壤믤。�귝낏�륅펽瓦쒐쮮餓볟틩��꺗鴉싧� `<�묊듁野배괌>` 訝�뀅溫며쉪 sha1 烏②씨凉뤺퓵烏뚪솏�뜰�귟��낁쭅 linkgit:git-upload-archive[1]��" #. type: Labeled list #: en/git-archive.txt:105 @@ -8599,7 +8599,7 @@ msgstr "--exec=<git-upload-archive>" #: en/git-archive.txt:108 #, priority:100 msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side." -msgstr "" +msgstr "訝� --remote 訝�壅룝슴�⑨펽�뉐츣瓦쒐쮮塋�쉪 \"git-upload-archive\" �꾥러孃꾠��" #. type: Labeled list #: en/git-archive.txt:109 en/git-checkout.txt:356 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:397 @@ -8611,7 +8611,7 @@ msgstr "<tree-ish>" #: en/git-archive.txt:111 #, priority:100 msgid "The tree or commit to produce an archive for." -msgstr "" +msgstr "誤곩댍鵝쒎춼旅g쉪�묊쎅壤뺞닑�먧벡��" #. type: Labeled list #: en/git-archive.txt:112 @@ -8623,13 +8623,13 @@ msgstr "<path>" #: en/git-archive.txt:116 #, priority:100 msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included." -msgstr "" +msgstr "倻귝옖亦→쐣���됬쉪瓮�푶�귝빊竊뚦퐪�띶램鵝쒐쎅壤뺜툔�꾣��됪뻼餓뜹뭽耶먪쎅壤뺡꺗鴉싧똿�у쑉耶섉。訝��� 倻귝옖�뉐츣雅녵�訝ゆ닑鸚싦릉瓮�푶竊뚦닕�ゅ똿�ц퓳雅쏂러孃꾠��" #. type: Title - #: en/git-archive.txt:118 #, no-wrap, priority:100 msgid "BACKEND EXTRA OPTIONS" -msgstr "" +msgstr "�롥룿窯앭쨼�됮」" #. type: Title ~ #: en/git-archive.txt:121 @@ -8641,13 +8641,13 @@ msgstr "�들걻����" #: en/git-archive.txt:122 #, no-wrap, priority:100 msgid "-<digit>" -msgstr "" +msgstr "-<�겼춻 0-9>" #. type: Plain text #: en/git-archive.txt:127 #, priority:100 msgid "Specify compression level. Larger values allow the command to spend more time to compress to smaller size. Supported values are from `-0` (store-only) to `-9` (best ratio). Default is `-6` if not given." -msgstr "" +msgstr "�뉐츣�뗧섄瀛㎩닽�� 渦껃ㄷ�꾢�쇔뀅溫멨뫝餓ㅸ뒻兀방쎍鸚싩쉪�띌뿴�ε럨煐⒴댆渦껃컦�꾢갰野멥�� ��똻�꾢�쇌퍗 `-0`竊덂룵耶섇궓竊됧댆 `-9`竊덃�鵝녔캈堊뗰펹�� 倻귝옖亦→쐣瀯쇿눣竊뚪퍡溫ㅴ맏 `-6'��" #. type: Title ~ #: en/git-archive.txt:129 @@ -8665,7 +8665,7 @@ msgstr "-<��>" #: en/git-archive.txt:135 #, priority:100 msgid "Specify compression level. The value will be passed to the compression command configured in `tar.<format>.command`. See manual page of the configured command for the list of supported levels and the default level if this option isn't specified." -msgstr "" +msgstr "�뉐츣�뗧섄瀛㎩닽�귟��쇔컛熬ヤ폖�믥퍢 `tar.<�쇔폀>.command` 訝�뀓營�쉪�뗧섄�썰빱�귛쫩�쒏깹�됪뙁若싪퓳訝ら�됮」竊뚩��귡쁾�띸쉰�꾢뫝餓ㅷ쉪�뗥냼窈듸펽雅녻㎗��똻�꾤벨�ュ뭽容섋�瀛㎩닽��" #. type: Labeled list #: en/git-archive.txt:139 @@ -8677,37 +8677,37 @@ msgstr "tar.umask" #: en/git-archive.txt:146 #, priority:100 msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect." -msgstr "" +msgstr "瓦쇾릉�섌뇧��빳�ⓩ씎�먨댍 tar 耶섉。�←쎅�꾣쓢�먧퐤�� 容섋��쇗삸 0002竊뚦츆�녜뿭雅녵툟�뚦넍�δ퐤�� �방츏�� \"user\" 烏①ㅊ弱녵슴�ⓨ퐩旅g뵪�루쉪 umask �δ빰�욍�� 瑥�깄鰲� umask(2)�� 倻귝옖鵝욜뵪 `--remote`竊뚪궍阿덂룵�됭퓶葉뗤퍜佯볡쉪�띸쉰�띴폏�잍븞��" #. type: Labeled list #: en/git-archive.txt:147 #, no-wrap, priority:100 msgid "tar.<format>.command" -msgstr "" +msgstr "tar.<�쇔폀>.command" #. type: Plain text #: en/git-archive.txt:154 #, priority:100 msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., `-9`)." -msgstr "" +msgstr "瓦쇾릉�섌뇧�뉐츣雅녵�訝� shel l�썰빱竊뚨뵳 `git archive` 雅㎫뵟�� tar 渦볟눣佯붻��싪퓝嶸↓걪�귟��썰빱鵝욜뵪 shell �㎬죱竊뚦쑉�뜻젃�녻풏�δ릎�잍닇 tar �뉏뻑竊뚦뭉佯붷쑉�뜻젃�녻풏�뷰릎雅㎫뵟��瀯덅풏�뷩�귚뻣鵝뺝럨煐⑴벨�ョ쉪�됮」弱녻˙鴉좈�믥퍢瑥ε뫝餓ㅿ펷堊뗥쫩竊�`-9'竊됥��" #. type: Plain text #: en/git-archive.txt:158 #, priority:100 msgid "The `tar.gz` and `tgz` formats are defined automatically and use the magic command `git archive gzip` by default, which invokes an internal implementation of gzip." -msgstr "" +msgstr "`tar.gz` �� `tgz` �쇔폀��눎�ⓨ츣阿됬쉪竊뚪퍡溫ㅴ슴�①쪥也뉒쉪�썰빱 `git archive gzip`竊뚦츆瘟껆뵪雅� gzip �꾢냵�ⓨ츩�겹��" #. type: Labeled list #: en/git-archive.txt:159 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "tar.<format>.remote" -msgstr "" +msgstr "tar.<format>.remote" #. type: Plain text #: en/git-archive.txt:164 #, priority:100 msgid "If true, enable the format for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the `tar.gz` and `tgz` formats." -msgstr "" +msgstr "倻귝옖訝븀쐿竊뚦닕�싪퓝 linkgit:git-upload-archive[1] ��뵪瑥ζ졏凉뤶풘瓦쒐쮮若€댎塋�슴�ⓦ�귛�雅롧뵪�룟츣阿됬쉪�쇔폀竊뚪퍡溫ㅴ맏 false竊뚥퐜野밥틢 `tar.gz` �� `tgz` �쇔폀訝� true��" #. type: Title - #: en/git-archive.txt:167 @@ -8719,79 +8719,79 @@ msgstr "掠욄��" #: en/git-archive.txt:169 #, no-wrap, priority:100 msgid "export-ignore" -msgstr "" +msgstr "export-ignore" #. type: Plain text #: en/git-archive.txt:172 #, priority:100 msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details." -msgstr "" +msgstr "躍�쐣 export-ignore 掠욄�㎫쉪�뉏뻑�뚨쎅壤뺜툖鴉싪˙曆삣뒥�겼춼旅f뻼餓뜸릎�� 瑥�깄鰲� linkgit:gitattributes[5]��" #. type: Labeled list #: en/git-archive.txt:173 #, no-wrap, priority:100 msgid "export-subst" -msgstr "" +msgstr "export-subst" #. type: Plain text #: en/git-archive.txt:177 #, priority:100 msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details." -msgstr "" +msgstr "倻귝옖訝뷰�訝ゆ뻼餓띈�營�틙 export-subst 掠욄�㏆펽�d퉰壤볠뒍瓦쇾릉�뉏뻑曆삣뒥�겼춼旅f뿶竊똆it 鴉싧콝凉��졽릉�졽퐤寧╉�� 瑥�깄鰲� linkgit:gitattributes[5]��" #. type: Plain text #: en/git-archive.txt:185 #, priority:100 msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file." -msgstr "" +msgstr "力ⓩ꼷竊뚪퍡溫ㅶ깄�듕툔竊뚦콪�㎪씎�よ˙壤믤。�꾣젒訝�쉪 `.gitattributes` �뉏뻑�� 倻귝옖鵝졿꺍�ⓧ틟�롨컘�닺풏�븀쉪�밧폀竊덁풃倻귨펽鵝졿룓雅ㅶ뿶亦→쐣�ⓨ끀 `.gitattributes` 訝�렌�좈�귛퐪�� export-ignore 竊됵펽瑥룡졊���誤곮컘�닸��ε눣�η쉪 `.gitattributes` �뉏뻑亮뜸슴�� `--worktreeattributes` �됮」�� ��쨼竊뚥퐷阿잌룾餓ε쑉鵝좂쉪 `$GIT_DIR/info/attributes` �뉏뻑訝�퓷�쇿퐩旅d뻣鵝뺞젒�뜹틪瑥ι�귞뵪�꾢퓚誤곩콪�㎯��" #. type: Labeled list #: en/git-archive.txt:188 #, no-wrap, priority:100 msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`" -msgstr "" +msgstr "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`" #. type: Plain text #: en/git-archive.txt:193 #, priority:100 msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory." -msgstr "" +msgstr "�쎾뻠訝�訝ゅ똿�ュ퐪�띶늽��툓���경룓雅ㅵ냵若밭쉪 tar 壤믤。�뉏뻑竊뚦뭉弱녶끀鰲e럨�� `/var/tmp/junk` ��퐬訝���" #. type: Labeled list #: en/git-archive.txt:194 #, no-wrap, priority:100 msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`" -msgstr "" +msgstr "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`" #. type: Plain text #: en/git-archive.txt:197 #, priority:100 msgid "Create a compressed tarball for v1.4.0 release." -msgstr "" +msgstr "訝� v1.4.0 �덃쑍�쎾뻠訝�訝ゅ럨煐⑴쉪�뗧섄�끹��" #. type: Labeled list #: en/git-archive.txt:198 #, no-wrap, priority:100 msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`" -msgstr "" +msgstr "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`" #. type: Plain text #: en/git-archive.txt:201 #, priority:100 msgid "Same as above, but using the builtin tar.gz handling." -msgstr "" +msgstr "�뚥툓�㏘��뤄펽鵝녵슴�ⓨ냵營�쉪 tar.gz 鸚꾤릤��" #. type: Labeled list #: en/git-archive.txt:202 #, no-wrap, priority:100 msgid "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`" -msgstr "" +msgstr "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`" #. type: Plain text #: en/git-archive.txt:205 #, priority:100 msgid "Same as above, but the format is inferred from the output file." -msgstr "" +msgstr "訝롣툓瓦곁쎑�뚳펽鵝녷졏凉뤸삸餓롨풏�뷸뻼餓뜸릎�ⓩ뼪�뷸씎�꾠��" #. type: Labeled list #: en/git-archive.txt:206 @@ -8803,7 +8803,7 @@ msgstr "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git- #: en/git-archive.txt:210 #, priority:100 msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header." -msgstr "" +msgstr "訝� v1.4.0 �덃쑍�쎾뻠訝�訝ゅ럨煐⑴쉪 tarball竊뚥퐜亦→쐣�ⓨ��⒴콝�� pax 鸚담��" #. type: Labeled list #: en/git-archive.txt:211 @@ -8815,31 +8815,31 @@ msgstr "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1 #: en/git-archive.txt:215 #, priority:100 msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'." -msgstr "" +msgstr "弱녶퐪�띶ㅄ�뉏뻑�뽫쎅壤뺜툔�꾣��됧냵若방붂�� 'git-1.4.0-docs.zip'竊뚦뎺煐�訝� 'git-docs/'��" #. type: Labeled list #: en/git-archive.txt:216 #, no-wrap, priority:100 msgid "`git archive -o latest.zip HEAD`" -msgstr "" +msgstr "`git archive -o latest.zip HEAD`" #. type: Plain text #: en/git-archive.txt:221 #, priority:100 msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file." -msgstr "" +msgstr "�쎾뻠訝�訝ゅ똿�ュ퐪�띶늽��툓���경룓雅ㅵ냵若밭쉪 Zip 旅f죭�귝낏�륅펽渦볟눣�쇔폀��뵳渦볟눣�뉏뻑�꾣돥掠뺝릫�ⓩ뼪�뷸씎�꾠��" #. type: Labeled list #: en/git-archive.txt:222 #, no-wrap, priority:100 msgid "`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`" -msgstr "" +msgstr "`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`" #. type: Plain text #: en/git-archive.txt:227 #, priority:100 msgid "Creates a tar archive that contains the contents of the latest commit on the current branch with no prefix and the untracked file 'configure' with the prefix 'build/'." -msgstr "" +msgstr "�쎾뻠訝�訝� tar 壤믤。�뉏뻑竊뚦끀訝�똿�ュ퐪�띶늽��툓�꾣��경룓雅ㅵ냵若뱄펽�졾뎺煐�竊뚥빳�딀뿞瓮잒릉�꾣뻼餓� 'configure'竊뚦뎺煐�訝� 'build/'��" #. type: Labeled list #: en/git-archive.txt:228 @@ -8851,7 +8851,7 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`" #: en/git-archive.txt:233 #, priority:100 msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`." -msgstr "" +msgstr "�띸쉰訝�訝� \"tar.xz\" �쇔폀�ε댍鵝� LZMA �뗧섄�� tarf �뉏뻑�� 鵝졾룾餓ζ뙁若� `--format=tar.xz` �δ슴�ⓨ츆竊뚧닑�낂�싪퓝�쎾뻠訝�訝ゅ깗 `-o foo.tar.xz` 瓦숁졆�꾥풏�뷸뻼餓뜰��" #. type: Plain text #: en/git-archive.txt:238 @@ -8881,11 +8881,11 @@ msgstr "'git bisect' <subcommand> <options>\n" #: en/git-bisect.txt:18 en/git-reflog.txt:34 #, priority:100 msgid "The command takes various subcommands, and different options depending on the subcommand:" -msgstr "" +msgstr "瑥ε뫝餓ㅹ뇞�뽨툖�뚨쉪耶먨뫝餓ㅿ펽亮뜻졊��춴�썰빱�됦툖�뚨쉪�됮」竊�" #. type: Plain text #: en/git-bisect.txt:31 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "" " git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n" "\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n" @@ -8899,31 +8899,31 @@ msgid "" " git bisect log\n" " git bisect run <cmd>...\n" " git bisect help\n" -msgstr "" +msgstr " git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]\n\t\t [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]\n git bisect (bad|new|<term-new>) [<rev>]\n git bisect (good|old|<term-old>) [<rev>...]\n git bisect terms [--term-good | --term-bad]\n git bisect skip [(<rev>|<range>)...]\n git bisect reset [<commit>]\n git bisect (visualize|view)\n git bisect replay <logfile>\n git bisect log\n git bisect run <cmd>...\n git bisect help\n" #. type: Plain text #: en/git-bisect.txt:40 #, priority:100 msgid "This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a \"bad\" commit that is known to contain the bug, and a \"good\" commit that is known to be before the bug was introduced. Then `git bisect` picks a commit between those two endpoints and asks you whether the selected commit is \"good\" or \"bad\". It continues narrowing down the range until it finds the exact commit that introduced the change." -msgstr "" +msgstr "瓦쇾릉�썰빱鵝욜뵪雅뚦늽�쒐뇨嶸쀦퀡�ζ윥�얗」��럣�꿜릎�や릉�먧벡凉뺝뀯雅녵�訝ら뵗瑥��귚슴�②��썰빱�띰펽腰뽩뀍�딂칹若껂�訝ゅ럴�ε똿�ラ뵗瑥�쉪 \"��\" �먧벡竊뚥빳�듾�訝ゅ럴�ε쑉�숃��븀렟阿뗥뎺�� \"也�\" �먧벡�귞꽫�� `git bisect` �②퓳訝ㅴ릉塋�궧阿뗩뿴�묌�됦�訝ゆ룓雅ㅿ펽亮띈���퐷���됬쉪�먧벡�� \"也�\" 瓦섉삸 \"��\"�귛츆瀯㎫뺌煐⒴컦�껃쎍竊뚨쎍�경돻�겼폊�θ�岳�뵻�꾤‘�뉑룓雅ㅳ��" #. type: Plain text #: en/git-bisect.txt:47 #, priority:100 msgid "In fact, `git bisect` can be used to find the commit that changed *any* property of your project; e.g., the commit that fixed a bug, or the commit that caused a benchmark's performance to improve. To support this more general usage, the terms \"old\" and \"new\" can be used in place of \"good\" and \"bad\", or you can choose your own terms. See section \"Alternate terms\" below for more information." -msgstr "" +msgstr "雅뗥츩訝딉펽`git bisect` ��빳�ⓩ씎�ζ돻�밧룜窈밭쎅 *餓삡퐬* 掠욄�㎫쉪�먧벡竊쎽풃倻귨펽岳�쨳雅녵�訝� bug �꾣룓雅ㅿ펽�뽬�끺슴訝�訝ゅ읃�녺쉪�㎬꺗孃쀥댆�밧뻹�꾣룓雅ㅳ�귚맏雅녷뵱�곮퓳燁띷쎍��걤�꾤뵪力뺧펽��빳�� \"old\" �� \"new\" �δ빰�� \"good\" �� \"bad\"竊뚧닑�끾궓��빳�됪떓�ゅ런�꾣쑐瑥��귝쎍鸚싦에��쭅訝뗦뻼 \"�요빰��� \"訝��귙��" #. type: Title ~ #: en/git-bisect.txt:49 #, no-wrap, priority:100 msgid "Basic bisect commands: start, bad, good" -msgstr "" +msgstr "�뷸쑍�꾡틠�녶뫝餓ㅿ폏start, bad, good" #. type: Plain text #: en/git-bisect.txt:54 #, priority:100 msgid "As an example, suppose you are trying to find the commit that broke a feature that was known to work in version `v2.6.13-rc2` of your project. You start a bisect session as follows:" -msgstr "" +msgstr "訝얌릉堊뗥춴竊뚦걞溫얌퐷�녔돻�곁졃�뤶틙訝�訝ゅ럴�ε쑉鵝좂쉪窈밭쎅�� `v2.6.13-rc2` �덃쑍訝�램鵝쒐쉪�방�㎫쉪�먧벡�귚퐷��뒯雅녵�訝� bisect 鴉싪캕竊뚦쫩訝뗦�鹽븝폏" #. type: delimited block - #: en/git-bisect.txt:59 @@ -8941,31 +8941,31 @@ msgstr "" #: en/git-bisect.txt:64 #, priority:100 msgid "Once you have specified at least one bad and one good commit, `git bisect` selects a commit in the middle of that range of history, checks it out, and outputs something similar to the following:" -msgstr "" +msgstr "訝��╊퐷�뉐츣雅녻눛弱묇�訝ゅ쓯�꾢뭽訝�訝ゅ��꾣룓雅ㅿ펽`git bisect` 弱긴폏�②퓳訝ゅ럣�꿱똽�당쉪訝�뿴�됪떓訝�訝ゆ룓雅ㅿ펽汝��ε츆竊뚦뭉渦볟눣映삡세雅롣빳訝뗧쉪�끻�竊�" #. type: delimited block - #: en/git-bisect.txt:67 #, no-wrap, priority:100 msgid "Bisecting: 675 revisions left to test after this (roughly 10 steps)\n" -msgstr "" +msgstr "Bisecting: 675 revisions left to test after this (roughly 10 steps) | �②퓳阿뗥릮竊뚩퓲��675轝▽엶溫��誤곫탩瑥뺧펷鸚㎫벧10閭ο펹\n" #. type: Plain text #: en/git-bisect.txt:71 #, priority:100 msgid "You should now compile the checked-out version and test it. If that version works correctly, type" -msgstr "" +msgstr "鵝좂렟�ⓨ틪瑥η폋瑥묉��븀쉪�덃쑍亮띈퓵烏뚧탩瑥뺛�귛쫩�쒑��덃쑍藥δ퐳閭e만竊뚩�渦볟뀯" #. type: delimited block - #: en/git-bisect.txt:74 #, no-wrap, priority:100 msgid "$ git bisect good\n" -msgstr "" +msgstr "$ git bisect good\n" #. type: Plain text #: en/git-bisect.txt:77 #, priority:100 msgid "If that version is broken, type" -msgstr "" +msgstr "倻귝옖瑥η뎵�ц˙�닷쓯竊뚩�渦볟뀯" #. type: delimited block - #: en/git-bisect.txt:80 @@ -8977,37 +8977,37 @@ msgstr "$ git bisect bad\n" #: en/git-bisect.txt:83 #, priority:100 msgid "Then `git bisect` will respond with something like" -msgstr "" +msgstr "�뜹릮竊�`git bisect`鴉싧걳�뷴쫩訝뗥룏佯�" #. type: delimited block - #: en/git-bisect.txt:86 #, no-wrap, priority:100 msgid "Bisecting: 337 revisions left to test after this (roughly 9 steps)\n" -msgstr "" +msgstr "Bisecting: 337 revisions left to test after this (roughly 9 steps) | �②퓳阿뗥릮瓦섉쐣337訝や엶溫�쫨役뗨캊竊덂ㄷ瀛�9訝ゆ�謠ㅿ펹��\n" #. type: Plain text #: en/git-bisect.txt:91 #, priority:100 msgid "Keep repeating the process: compile the tree, test it, and depending on whether it is good or bad run `git bisect good` or `git bisect bad` to ask for the next commit that needs testing." -msgstr "" +msgstr "訝띷뼪�띶쨳瓦쇾릉瓦뉒쮮竊싩폋瑥묉젒竊뚧탩瑥뺝츆竊뚧졊��츆�����쓯竊뚩퓧烏� `git bisect good` �� `git bisect bad` �θ쫨黎귚툔訝�訝ら�誤곫탩瑥뺟쉪�먧벡��" #. type: Plain text #: en/git-bisect.txt:95 #, priority:100 msgid "Eventually there will be no more revisions left to inspect, and the command will print out a description of the first bad commit. The reference `refs/bisect/bad` will be left pointing at that commit." -msgstr "" +msgstr "��瀯덌펽弱녷깹�됪쎍鸚싩쉪岳����빳汝��ο펽瑥ε뫝餓ㅵ컛�볟뜲�븀К訝�訝ゅ쓯�먧벡�꾣룒瓦겹�귛폊�� `refs/bisect/bad` 弱녻˙�쇿쑉瑥ζ룓雅ㅵ쨪��" #. type: Title ~ #: en/git-bisect.txt:98 #, no-wrap, priority:100 msgid "Bisect reset" -msgstr "" +msgstr "�띸쉰雅뚦늽�ζ돻" #. type: Plain text #: en/git-bisect.txt:102 #, priority:100 msgid "After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:" -msgstr "" +msgstr "�ⓧ�訝や틠�녷윥�얌폏瑥앬퉳�롳펽誤곫툍�녵틠�녷윥�양듁�곩뭉瓦붷썮�겼렅�η쉪 HEAD竊뚩��묈눣餓δ툔�썰빱竊�" #. type: delimited block - #: en/git-bisect.txt:105 @@ -9019,13 +9019,13 @@ msgstr "$ git bisect reset\n" #: en/git-bisect.txt:110 #, priority:100 msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)" -msgstr "" +msgstr "容섋��끻넻訝뗰펽瓦쇿컛鵝요퐷�꾣젒瓦붷썮�� `git bisect start` 阿뗥뎺汝��ε눣�η쉪�먧벡�� (�곁쉪 `git bisect start` 阿잋폏瓦숁졆�싷펽�졽맏若껅툍�녵틙�㎫쉪�녺븣�뜻�곻펹" #. type: Plain text #: en/git-bisect.txt:113 #, priority:100 msgid "With an optional argument, you can return to a different commit instead:" -msgstr "" +msgstr "�싪퓝訝�訝ゅ룾�됧뢿�곤펽鵝졾룾餓θ퓭�욃댆訝�訝や툖�뚨쉪�먧벡竊뚩�뚥툖��폏" #. type: delimited block - #: en/git-bisect.txt:116 @@ -9037,133 +9037,133 @@ msgstr "$ git bisect reset <commit>\n" #: en/git-bisect.txt:121 #, priority:100 msgid "For example, `git bisect reset bisect/bad` will check out the first bad revision, while `git bisect reset HEAD` will leave you on the current bisection commit and avoid switching commits at all." -msgstr "" +msgstr "堊뗥쫩竊�`git bisect reset bisect/bad` 鴉싨��ε눣寧т�訝ゅ쓯�꾡엶溫�펽�� `git bisect reset HEAD` 鴉싪�鵝졾걶�쇿쑉壤볟뎺�꾢늽�뚧룓雅ㅴ툓竊뚦츑�③겳�띶늾�€룓雅ㅳ��" #. type: Title ~ #: en/git-bisect.txt:124 #, no-wrap, priority:100 msgid "Alternate terms" -msgstr "" +msgstr "�요빰�→Ь" #. type: Plain text #: en/git-bisect.txt:132 #, priority:100 msgid "Sometimes you are not looking for the commit that introduced a breakage, but rather for a commit that caused a change between some other \"old\" state and \"new\" state. For example, you might be looking for the commit that introduced a particular fix. Or you might be looking for the first commit in which the source-code filenames were finally all converted to your company's naming standard. Or whatever." -msgstr "" +msgstr "�됪뿶竊뚧궓誤곫돻�꾡툖��폊�ζ뼪獒귞쉪�먧벡竊뚩�뚧삸�ⓨ끀餓� \"��\" �뜻�곩뭽 \"��\" �뜻�곦퉳�닷폊壅룟룜�뽫쉪�먧벡�귚풃倻귨펽鵝졾룾�썼쫨�양쉪��폊�ζ윇窈밥엶鸚띸쉪�먧벡�귝닑�끺퐷�녔돻�꾣삸寧т�轝→룓雅ㅿ펽�②퓳轝→룓雅ㅴ릎竊뚧틦餓g쟻�뉏뻑�띷�瀯덆꺗熬ヨ쉬�㏘맏鵝졾뀶�며쉪�썲릫�뉐뇛�귝닑�끻끀餓뽨�阿덀��" #. type: Plain text #: en/git-bisect.txt:138 #, priority:100 msgid "In such cases it can be very confusing to use the terms \"good\" and \"bad\" to refer to \"the state before the change\" and \"the state after the change\". So instead, you can use the terms \"old\" and \"new\", respectively, in place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)" -msgstr "" +msgstr "�②퓳燁띷깄�듕툔竊뚨뵪 \"也�\" �� \"��\" �ζ뙁餓� \"�섇뙑�띸쉪�뜻��\" �� \"�섇뙑�롧쉪�뜻��\" 鴉싮씆躍멩렁阿긱�귛썱閭ㅿ펽鵝졾룾餓η뵪 \"�� \"�� \"��\" �δ빰�� \"也�\" �� \"��\"��(鵝녻쫨力ⓩ꼷竊뚥퐷訝띹꺗�ⓧ�訝や폏瑥앬릎�� \"也�\"�� \"��\" 訝� \"��\"�� \"��\" 曆룟쑉訝�壅뤄펹��" #. type: Plain text #: en/git-bisect.txt:145 #, priority:100 msgid "In this more general usage, you provide `git bisect` with a \"new\" commit that has some property and an \"old\" commit that doesn't have that property. Each time `git bisect` checks out a commit, you test if that commit has the property. If it does, mark the commit as \"new\"; otherwise, mark it as \"old\". When the bisection is done, `git bisect` will report which commit introduced the property." -msgstr "" +msgstr "�②퓳燁띷쎍��걤�꾤뵪力뺜릎竊뚥퐷�� `git bisect` �먧풘雅녵�訝ゅ끁�됪윇燁띶콪�㎫쉪 \"��\" �먧벡�뚥�訝や툖�룡쐣瑥ε콪�㎫쉪 \"��\" �먧벡�귝캀轝� `git bisect` 汝��δ�訝ゆ룓雅ㅶ뿶竊뚪꺗誤곫탩瑥뺠��먧벡��맔�룡쐣瑥ε콪�㎯�귛쫩�쒏쐣竊뚦닕弱녻��먧벡�뉓�訝� \"��\"竊쎾맔�숋펽�뉓�訝� \"��\"�귛늽�꿨츑�먨릮竊�`git bisect` 鴉싨뒫�듿벆訝ゆ룓雅ㅵ폊�δ틙瑥ε콪�㎯��" #. type: Plain text #: en/git-bisect.txt:149 #, priority:100 msgid "To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git bisect start` without commits as argument and then run the following commands to add the commits:" -msgstr "" +msgstr "誤곦슴�� \"��\" �� \"��\"竊뚩�뚥툖�� \"也�\" �� \"��\"竊뚥퐷恙낂』瓦먫죱 `git bisect start`竊뚩�뚥툖餓ζ룓雅ㅴ맏�귝빊竊뚨꽫�롨퓧烏뚥빳訝뗥뫝餓ㅶ씎曆삣뒥�먧벡竊�" #. type: delimited block - #: en/git-bisect.txt:152 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "git bisect old [<rev>]\n" -msgstr "" +msgstr "git bisect old [<rev>]\n" #. type: Plain text #: en/git-bisect.txt:155 #, priority:100 msgid "to indicate that a commit was before the sought change, or" -msgstr "" +msgstr "烏ⓩ삇�먧벡�띌뿴�ⓩ�野삥콆�꾢룜�답퉳�랃펽��" #. type: delimited block - #: en/git-bisect.txt:158 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "git bisect new [<rev>...]\n" -msgstr "" +msgstr "git bisect new [<rev>...]\n" #. type: Plain text #: en/git-bisect.txt:161 #, priority:100 msgid "to indicate that it was after." -msgstr "" +msgstr "餓θ〃�롥츆��쑉阿뗥릮��" #. type: Plain text #: en/git-bisect.txt:163 #, priority:100 msgid "To get a reminder of the currently used terms, use" -msgstr "" +msgstr "誤곮렩孃쀥퐪�띴슴�①쉪����꾣룓�믭펽瑥룝슴��" #. type: delimited block - #: en/git-bisect.txt:166 #, no-wrap, priority:100 msgid "git bisect terms\n" -msgstr "" +msgstr "git bisect terms\n" #. type: Plain text #: en/git-bisect.txt:170 #, priority:100 msgid "You can get just the old (respectively new) term with `git bisect terms --term-old` or `git bisect terms --term-good`." -msgstr "" +msgstr "鵝졾룾餓η뵪 `git bisect terms --term-old` �� `git bisect terms --term-good` �ゅ풓�경뿧�꾬펷�녶닽��뼭�꾬펹�����" #. type: Plain text #: en/git-bisect.txt:175 -#, ignore-ellipsis, priority:100 +#, fuzzy, ignore-ellipsis, priority:100 msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using" -msgstr "" +msgstr "倻귝옖鵝졿꺍鵝욜뵪鵝좄눎藥긺쉪���竊뚩�뚥툖�� \"��\" / \"也� \" �� \"��\" / \"��\"竊뚥퐷��빳�됪떓餓삡퐬鵝졾뼔轝®쉪�띶춻竊덆솮雅녺렟�됬쉪 bisect 耶먨뫝餓ㅵ쫩 `reset`竊�`start`竊�......竊됵펽�싪퓝鵝욜뵪餓δ툔�썰빱��뒯 bisection" #. type: delimited block - #: en/git-bisect.txt:178 #, no-wrap, priority:100 msgid "git bisect start --term-old <term-old> --term-new <term-new>\n" -msgstr "" +msgstr "git bisect start --term-old <term-old> --term-new <term-new>\n" #. type: Plain text #: en/git-bisect.txt:182 #, priority:100 msgid "For example, if you are looking for a commit that introduced a performance regression, you might use" -msgstr "" +msgstr "堊뗥쫩竊뚦쫩�쒍퐷誤곫돻訝�訝ゅ폊�ζ�㎬꺗�욃퐩�꾣룓雅ㅿ펽鵝졾룾餓η뵪" #. type: delimited block - #: en/git-bisect.txt:185 #, no-wrap, priority:100 msgid "git bisect start --term-old fast --term-new slow\n" -msgstr "" +msgstr "git bisect start --term-old fast --term-new slow\n" #. type: Plain text #: en/git-bisect.txt:188 #, priority:100 msgid "Or if you are looking for the commit that fixed a bug, you might use" -msgstr "" +msgstr "�뽬�낉펽倻귝옖鵝좄쫨�양쉪��엶鸚띴틙�먧릉�숃��꾣룓雅ㅿ펽鵝졾룾餓δ슴��" #. type: delimited block - #: en/git-bisect.txt:191 #, no-wrap, priority:100 msgid "git bisect start --term-new fixed --term-old broken\n" -msgstr "" +msgstr "git bisect start --term-new fixed --term-old broken\n" #. type: Plain text #: en/git-bisect.txt:195 #, priority:100 msgid "Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of `git bisect good` and `git bisect bad` to mark commits." -msgstr "" +msgstr "�뜹릮竊뚨뵪`git bisect <term-old>` �� `git bisect <term-new>` 餓f쎘 `git bisect good` ��`git bisect bad` �ζ젃溫경룓雅ㅳ��" #. type: Title ~ #: en/git-bisect.txt:197 #, no-wrap, priority:100 msgid "Bisect visualize/view" -msgstr "" +msgstr "鰲녻쭑��/鰲녶쎗�꾡틠�녷윥��" #. type: Plain text #: en/git-bisect.txt:202 #, priority:100 msgid "To see the currently remaining suspects in 'gitk', issue the following command during the bisection process (the subcommand `view` can be used as an alternative to `visualize`):" -msgstr "" +msgstr "誤곫윥�� 'gitk' 訝�퐪�띶돥鵝숂쉪椰뚨뼇雅븝펽�ⓧ틠�녷윥�얕퓝葉뗤릎�묈눣餓δ툔�썰빱竊덂춴�썰빱`view`��빳�ⓩ씎�요빰`visualize`竊됵폏" #. type: delimited block - #: en/git-bisect.txt:205 @@ -9175,7 +9175,7 @@ msgstr "$ git bisect visualize\n" #: en/git-bisect.txt:210 #, priority:100 msgid "If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`." -msgstr "" +msgstr "倻귝옖亦→쐣溫양쉰 `DISPLAY` ��쥊�섌뇧竊뚦닕鵝욜뵪 'git log' 餓f쎘�� 鵝졽튋��빳瀯쇿눣�썰빱烏뚪�됮」竊뚦쫩 `-p` �� `-stat`��" #. type: delimited block - #: en/git-bisect.txt:213 @@ -9187,13 +9187,13 @@ msgstr "$ git bisect visualize --stat\n" #: en/git-bisect.txt:216 #, no-wrap, priority:100 msgid "Bisect log and bisect replay" -msgstr "" +msgstr "雅뚦늽�ζ돻�ε퓱�뚪뇥�얌틠�녷윥��" #. type: Plain text #: en/git-bisect.txt:220 #, priority:100 msgid "After having marked revisions as good or bad, issue the following command to show what has been done so far:" -msgstr "" +msgstr "�ⓨ컛岳���뉓�訝뷴��꾣닑�뤹쉪阿뗥릮竊뚦룕�뷰빳訝뗥뫝餓ㅶ씎�양ㅊ�곁쎅�띴맏閭€��싩쉪雅뗦깄竊�" #. type: delimited block - #: en/git-bisect.txt:223 @@ -9205,7 +9205,7 @@ msgstr "$ git bisect log\n" #: en/git-bisect.txt:229 #, priority:100 msgid "If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state:" -msgstr "" +msgstr "倻귝옖鵝졾룕�겻퐷�ⓩ뙁若싦엶溫®뎵�꾤듁�곫뿶��틙�숃�竊뚥퐷��빳�딂퓳訝ゅ뫝餓ㅷ쉪渦볟눣岳앭춼�겻�訝ゆ뻼餓뜸릎竊뚨폋渦묈츆餓ε닠�ㅴ툖閭g‘�꾣씉��펽�뜹릮�묈눣訝뗩씊�꾢뫝餓ㅶ씎瓦붷썮�겻�訝ゆ�簾�쉪�뜻�곻폏" #. type: delimited block - #: en/git-bisect.txt:233 @@ -9221,13 +9221,13 @@ msgstr "" #: en/git-bisect.txt:236 #, no-wrap, priority:100 msgid "Avoiding testing a commit" -msgstr "" +msgstr "�욕뀓役뗨캊訝�訝ゆ룓雅�" #. type: Plain text #: en/git-bisect.txt:243 #, priority:100 msgid "If, in the middle of a bisect session, you know that the suggested revision is not a good one to test (e.g. it fails to build and you know that the failure does not have anything to do with the bug you are chasing), you can manually select a nearby commit and test that one instead." -msgstr "" +msgstr "倻귝옖�ⓧ틠�녷윥�얌폏瑥앬릎竊뚥퐷�ι걪兩븃��꾡엶溫®뎵訝띷삸訝�訝ゅ��꾣탩瑥뺝�穩∽펷堊뗥쫩竊뚦츆訝띹꺗�꾢뻠竊뚩�뚥퐷�ι걪瓦쇾릉鸚김뇰訝롣퐷閭e쑉瓦썲��꾦뵗瑥�뿞�놂펹竊뚥퐷��빳�뗥뒯�됪떓訝�訝ら셿瓦묊쉪�먧벡竊뚦뭉役뗨캊瑥ζ룓雅ㅳ��" #. type: Plain text #: en/git-bisect.txt:245 en/git-name-rev.txt:53 en/git-tag.txt:377 en/git-bisect-lk2009.txt:914 en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152 en/git-bisect-lk2009.txt:1175 @@ -9255,37 +9255,37 @@ msgstr "" #: en/git-bisect.txt:256 #, priority:100 msgid "Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner." -msgstr "" +msgstr "�뜹릮煐뽬캂�뚧탩瑥뺞��됪떓�꾡엶溫®뎵竊뚥퉳�롣빳�싧만�꾣뼶凉뤷컛岳���덃젃溫겻맏也썸닑�뤵��" #. type: Title ~ #: en/git-bisect.txt:258 #, no-wrap, priority:100 msgid "Bisect skip" -msgstr "" +msgstr "瓮녘퓝雅뚦늽�ζ돻" #. type: Plain text #: en/git-bisect.txt:262 #, priority:100 msgid "Instead of choosing a nearby commit by yourself, you can ask Git to do it for you by issuing the command:" -msgstr "" +msgstr "訝롥끀�ゅ런�됪떓�꾥퓩�꾣룓雅ㅿ펽鵝졾룾餓ι�싪퓝�묈툋�썰빱溫� Git 訝뷰퐷�싪퓳餓뜸틟竊�" #. type: delimited block - #: en/git-bisect.txt:265 #, no-wrap, priority:100 msgid "$ git bisect skip # Current version cannot be tested\n" -msgstr "" +msgstr "$ git bisect skip # 壤볟뎺�덃쑍訝띹꺗熬ユ탩瑥�\n" #. type: Plain text #: en/git-bisect.txt:270 #, priority:100 msgid "However, if you skip a commit adjacent to the one you are looking for, Git will be unable to tell exactly which of those commits was the first bad one." -msgstr "" +msgstr "�띈�뚳펽倻귝옖鵝좄럼瓦뉏틙訝롣퐷誤곫돻�꾣룓雅ㅷ쎑�사쉪�먧벡竊똆it 弱녷뿞力뺝뇛簾�닩��눣�や릉�먧벡��К訝�訝ゅ쓯�먧벡��" #. type: Plain text #: en/git-bisect.txt:273 #, priority:100 msgid "You can also skip a range of commits, instead of just one commit, using range notation. For example:" -msgstr "" +msgstr "�ⓧ튋��빳鵝욜뵪�껃쎍寧�뤇瓮녘퓝訝�楹삣닓�꾣룓雅ㅿ펽�뚥툖餓끺퍎���訝ゆ룓雅ㅳ�귝캈倻귟�竊�" #. type: delimited block - #: en/git-bisect.txt:276 @@ -9297,13 +9297,13 @@ msgstr "$ git bisect skip v2.5..v2.6\n" #: en/git-bisect.txt:280 #, priority:100 msgid "This tells the bisect process that no commit after `v2.5`, up to and including `v2.6`, should be tested." -msgstr "" +msgstr "瓦쇿몜瑥됦틠�녷윥�얕퓵葉뗰펽`v2.5` 阿뗥릮�꾣룓雅ㅿ펽�끾떖 `v2.6`竊뚪꺗訝띶틪瑥θ˙役뗨캊��" #. type: Plain text #: en/git-bisect.txt:283 #, priority:100 msgid "Note that if you also want to skip the first commit of the range you would issue the command:" -msgstr "" +msgstr "瑥룡낏�륅펽倻귝옖鵝졽튋�녘럼瓦뉓똽�닷냵�꾤К訝�訝ゆ룓雅ㅿ펽鵝졽폏�묈눣瓦쇾릉�썰빱竊�" #. type: delimited block - #: en/git-bisect.txt:286 @@ -9315,31 +9315,31 @@ msgstr "$ git bisect skip v2.5 v2.5..v2.6\n" #: en/git-bisect.txt:290 #, priority:100 msgid "This tells the bisect process that the commits between `v2.5` and `v2.6` (inclusive) should be skipped." -msgstr "" +msgstr "瓦쇿몜瑥됦틠�녷윥�얕퓵葉뗰펽佯붻�瓮녘퓝 `v2.5` �� `v2.6`竊덂똿�э펹阿뗩뿴�꾣룓雅ㅳ��" #. type: Title ~ #: en/git-bisect.txt:293 #, no-wrap, priority:100 msgid "Cutting down bisection by giving more parameters to bisect start" -msgstr "" +msgstr "�싪퓝�먧풘�닷쩀�꾢뢿�경씎�듿뇧雅뚦늽�ζ돻�꾥돈��" #. type: Plain text #: en/git-bisect.txt:298 #, priority:100 msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the `bisect start` command:" -msgstr "" +msgstr "倻귝옖鵝좂윥�볞퐷誤곮옙甕ょ쉪��쥦易됧룋�경젒�꾢벆訝��ⓨ늽竊뚥퐷��빳�싪퓝�ⓨ룕�� `bisect start` �썰빱�뜻뙁若싪러孃꾢뢿�경씎瓦쎽�閭ε뇧弱묋캊謠뚨쉪�곈뇧竊�" #. type: delimited block - #: en/git-bisect.txt:301 #, no-wrap, priority:100 msgid "$ git bisect start -- arch/i386 include/asm-i386\n" -msgstr "" +msgstr "$ git bisect start -- arch/i386 include/asm-i386\n" #. type: Plain text #: en/git-bisect.txt:306 #, priority:100 msgid "If you know beforehand more than one good commit, you can narrow the bisect space down by specifying all of the good commits immediately after the bad commit when issuing the `bisect start` command:" -msgstr "" +msgstr "倻귝옖鵝졽틟�덄윥�볠쐣訝�訝や빳訝딁쉪也썹쉪�먧벡竊뚥퐷��빳�ⓨ룕�� `bisect start ` �썰빱�띰펽�뉐츣�뤹쉪�먧벡阿뗥릮�꾣��됧��꾣룓雅ㅿ펽餓롨�뚨섄弱뤶틠�녷윥�양쉪令븅뿴竊�" #. type: delimited block - #: en/git-bisect.txt:311 @@ -9357,13 +9357,13 @@ msgstr "" #: en/git-bisect.txt:314 #, no-wrap, priority:100 msgid "Bisect run" -msgstr "" +msgstr "瓦먫죱雅뚦늽�ζ돻" #. type: Plain text #: en/git-bisect.txt:318 #, priority:100 msgid "If you have a script that can tell if the current source code is good or bad, you can bisect by issuing the command:" -msgstr "" +msgstr "倻귝옖鵝졿쐣訝�訝よ꽊�э펽��빳�ι걪壤볟뎺�꾣틦餓g쟻�����쓯竊뚥퐷��빳�싪퓝�묈눣�썰빱�θ퓵烏뚥틠�녷윥�억폏" #. type: delimited block - #: en/git-bisect.txt:321 @@ -9375,31 +9375,31 @@ msgstr "$ git bisect run my_script arguments\n" #: en/git-bisect.txt:327 #, priority:100 msgid "Note that the script (`my_script` in the above example) should exit with code 0 if the current source code is good/old, and exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad/new." -msgstr "" +msgstr "力ⓩ꼷竊뚦쫩�쒎퐪�띸쉪繹먧빰�곫삸也썹쉪�뽪삸�㎫쉪竊뚩꽊�э펷訝딃씊堊뗥춴訝�쉪 `my_script`竊됧틪瑥δ빳餓g쟻 0 ���븝펽倻귝옖壤볟뎺�꾣틦餓g쟻��쓯�꾣닑��뼭�꾬펽�쇾빳餓g쟻 1�� 127竊덂똿�э펹阿뗩뿴���븝펽鵝� 125 �ㅵ쨼��" #. type: Plain text #: en/git-bisect.txt:331 #, priority:100 msgid "Any other exit code will abort the bisect process. It should be noted that a program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) manual page), as the value is chopped with `& 0377`." -msgstr "" +msgstr "餓삡퐬�뜸퍟�꾦���뷰빰�곲꺗鴉싦릎閭㏘틠�녷윥�얕퓵葉뗣�귛틪瑥ζ낏�뤹쉪��펽�싪퓝 `exit(-1)` 瀯덃��꾤쮮佯뤶폏�쇾툔 $? = 255竊뚳펷鰲� exit(3) �뗥냼窈듸펹竊뚦썱訝븃퓳訝ゅ�쇗삸�� `& 0377` �띷럦�꾠��" #. type: Plain text #: en/git-bisect.txt:340 #, priority:100 msgid "The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see `git bisect skip` above). 125 was chosen as the highest sensible value to use for this purpose, because 126 and 127 are used by POSIX shells to signal specific error status (127 is for command not found, 126 is for command found but not executable--these details do not matter, as they are normal errors in the script, as far as `bisect run` is concerned)." -msgstr "" +msgstr "壤볟퐪�띸쉪繹먧빰�곦툖�썼˙役뗨캊�띰펽佯붻�鵝욜뵪�방츏�꾦���뷰빰�� 125�귛쫩�쒑꽊�т빳瓦쇾릉餓g쟻���븝펽壤볟뎺�꾡엶溫®뎵弱녻˙瓮녘퓝竊덅쭅訝딃씊�� `git bisect skip`竊됥��125 熬ラ�됦맏�ⓧ틢閭ㅷ쎅�꾤쉪��遙섇릦�녶�쇽펽�졽맏 126 �� 127 熬� POSIX shells �ⓩ씎烏①ㅊ�밧츣�꾦뵗瑥�듁�곻펷127 烏①ㅊ�ゆ돻�겼뫝餓ㅿ펽126 烏①ㅊ�얍댆�썰빱鵝녵툖��돢烏뚢�붴�붻퓳雅쏁퍏�귛뭉訝띺뇥誤곻펽�졽맏弱� `bisect run` �뚩�竊뚦츆餓ф삸�싨쑍訝�쉪閭e만�숃�竊됥��" #. type: Plain text #: en/git-bisect.txt:346 #, priority:100 msgid "You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or \"revision that does not have this commit needs this patch applied to work around another problem this bisection is not interested in\") applied to the revision being tested." -msgstr "" +msgstr "鵝졾룾�썹퍘躍멨룕�곤펽�ⓧ�訝や틠�녷윥�얌폏瑥앬릎竊뚥퐷�녘�訝닸뿶�꾡엶�뱄펷堊뗥쫩竊뚦ㅄ�뉏뻑訝�쉪 /#define DEBUG 0/#define DEBUG 1/竊뚧닑�� �쒏깹�됭퓳訝ゆ룓雅ㅷ쉪�덃쑍��誤곩틪�②퓳訝よ‥訝곫씎鰲e넶瓦쇾릉�ζ돻訝띷꽏�닺땃�꾢룱訝�訝ら뿮窯섃�앾펹佯붺뵪�경��ⓩ탩瑥뺟쉪�덃쑍訝���" #. type: Plain text #: en/git-bisect.txt:354 #, priority:100 msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session." -msgstr "" +msgstr "訝뷰틙佯붷�瓦숂쭕�끻넻竊뚦쑉�낂깿�� 'git bisect' �얍댆誤곫탩瑥뺟쉪訝뗤�訝や엶溫®뎵�롳펽�싨쑍��빳�①폋瑥묈뎺佯붺뵪烏δ툈竊뚩퓧烏뚨쐿閭g쉪役뗨캊竊뚥퉳�롥넶若싪�岳���덌펷��꺗�됮�誤곭쉪烏δ툈竊됪삸���싪퓝役뗨캊竊뚨꽫�롥컛�묈�믣썮�잌쭓�뜻�곥�� ���롳펽�싨쑍佯붻�餓η쐿若욄탩瑥뺟쉪�뜻�곲���븝펽溫� `git bisect run` �썰빱孃ょ렞�녑츣雅뚦늽�ζ돻鴉싪캕�꾣�瀯덄퍜�쒌��" #. type: Labeled list #: en/git-bisect.txt:357 en/git-clone.txt:154 @@ -9411,43 +9411,43 @@ msgstr "--no-checkout" #: en/git-bisect.txt:362 #, priority:100 msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested." -msgstr "" +msgstr "�ⓧ틠�녷윥�얕퓝葉뗧쉪驪뤶릉瓦�빰訝�펽訝띹쫨汝��뷸뼭�꾢램鵝쒎뙷�귞쎑�랃펽�ら��닸뼭訝�訝ゅ릫訝� `BISECT_HEAD` �꾤돶餘듿폊�⑨펽鵝욕끀�뉐릲佯붻˙役뗨캊�꾣룓雅ㅳ��" #. type: Plain text #: en/git-bisect.txt:365 #, priority:100 msgid "This option may be useful when the test you would perform in each step does not require a checked out tree." -msgstr "" +msgstr "壤볞퐷�ⓩ캀訝ゆ�謠ㅴ릎�㎬죱�꾣탩瑥뺜툖��誤곫��ε눣�η쉪��퐬�묉뿶竊뚩퓳訝ら�됮」��꺗孃덃쐣�ⓦ��" #. type: Plain text #: en/git-bisect.txt:367 #, priority:100 msgid "If the repository is bare, `--no-checkout` is assumed." -msgstr "" +msgstr "倻귝옖�덃쑍佯볠삸獒멧퍜佯볩펽�쇿걞若� `--no-checkout`��" #. type: Plain text #: en/git-bisect.txt:371 #, priority:100 msgid "Follow only the first parent commit upon seeing a merge commit." -msgstr "" +msgstr "�①쐦�겼릦亮뜻룓雅ㅶ뿶竊뚦룵瓮잓쉹寧т�訝ょ댍�먧벡��" #. type: Plain text #: en/git-bisect.txt:375 #, priority:100 msgid "In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored." -msgstr "" +msgstr "�ⓩ�役뗩�싪퓝�덂뭉�녷뵱凉뺝뀯�꾢썮壤믤뿶竊뚦릦亮뜹릮�꾣룓雅ㅵ컛熬ヨ칳�ヤ맏凉뺝뀯雅녻��숃�竊뚦끀曄뽩뀍弱녻˙恙썹븼��" #. type: Plain text #: en/git-bisect.txt:378 #, priority:100 msgid "This option is particularly useful in avoiding false positives when a merged branch contained broken or non-buildable commits, but the merge itself was OK." -msgstr "" +msgstr "瓦쇾릉�됮」�③겳�띶걞�녔�㎪뼶�®돶�ユ쐣�⑨펽壤볞�訝ゅ릦亮띄쉪�녷뵱�끻맜�됬졃�잍닑訝띶룾�꾢뻠�꾣룓雅ㅿ펽鵝녶릦亮뜻쑍翁ユ삸閭e만�꾠��" #. type: Plain text #: en/git-bisect.txt:383 #, priority:100 msgid "Automatically bisect a broken build between v1.2 and HEAD:" -msgstr "" +msgstr "�ゅ뒯弱� V1.2 �� HEAD 阿뗩뿴�꾤졃�잍엫兩뷰틠�녷윥�억폏" #. type: delimited block - #: en/git-bisect.txt:388 @@ -9465,7 +9465,7 @@ msgstr "" #: en/git-bisect.txt:391 #, priority:100 msgid "Automatically bisect a test failure between origin and HEAD:" -msgstr "" +msgstr "�②돈繹먨뭽HEAD阿뗩뿴�ゅ뒯雅뚦늽�ζ돻鸚김뇰役뗨캊竊�" #. type: delimited block - #: en/git-bisect.txt:396 @@ -9483,7 +9483,7 @@ msgstr "" #: en/git-bisect.txt:399 en/git-bisect.txt:453 #, priority:100 msgid "Automatically bisect a broken test case:" -msgstr "" +msgstr "�ゅ뒯雅뚦늽�ζ돻�숃��꾤쉪役뗨캊�ⓧ풃竊�" #. type: delimited block - #: en/git-bisect.txt:408 @@ -9496,25 +9496,25 @@ msgid "" "$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10\n" "$ git bisect run ~/test.sh\n" "$ git bisect reset # quit the bisect session\n" -msgstr "" +msgstr "$ cat ~/test.sh\n#!/bin/sh\nmake || exit 125 # 瓮녘퓝雅녽뵗瑥�엫兩�\n~/check_test_case.sh # 役뗨캊旅덁풃��맔�싪퓝竊�\n$ git bisect start HEAD HEAD~10 -- # 營ら춠曄면쫿弱긷쑉����10訝や릎\n$ git bisect run ~/test.sh\n$ git bisect reset # ���뷰틠�녷윥�얌폏瑥�\n" #. type: Plain text #: en/git-bisect.txt:414 #, priority:100 msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise." -msgstr "" +msgstr "瓦숅뇤�묇뺄鵝욜뵪訝�訝� `test.sh `�ゅ츣阿됭꽊�с�귛쑉瓦쇾릉�싨쑍訝�펽倻귝옖 `make` 鸚김뇰竊뚧닊餓у갚瓮녘퓝壤볟뎺�꾣룓雅ㅳ�� `check_test_case.sh` 倻귝옖役뗨캊�ⓧ풃�싪퓝竊뚦틪瑥� `exit 0`竊뚦맔�� `exit 1`��" #. type: Plain text #: en/git-bisect.txt:418 #, priority:100 msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts." -msgstr "" +msgstr "倻귝옖 `test.sh` �� `check_test_case.sh `�썲쑉餓볟틩阿뗥쨼竊뚥빳�꿩� bisect�걅ake �� test 瓦쏁쮮訝롨꽊�т퉳�당쉪�멧틨鵝쒐뵪竊뚩퓳�룝폏�닷츎�ⓦ��" #. type: Plain text #: en/git-bisect.txt:420 #, priority:100 msgid "Automatically bisect with temporary modifications (hot-fix):" -msgstr "" +msgstr "�ⓧ릿�뜸엶�밭쉪�밧폀�ゅ뒯雅뚦늽�ζ돻竊덄꺆岳�쨳竊됵폏" #. type: delimited block - #: en/git-bisect.txt:424 @@ -9542,7 +9542,7 @@ msgid "" "\t# tell the caller this is untestable\n" "\tstatus=125\n" "fi\n" -msgstr "" +msgstr "# �싪퓝�덂뭉��엶鸚띷씎瘟껅빐藥δ퐳��\n# �뜹릮弱앲캊�꾢뻠\nif\tgit merge --no-commit --no-ff hot-fix &&\n\tmake\nthen\n\t# 瓦먫죱窈밭쎅�밧츣�꾣탩瑥뺝뭉�ε몜�띄듁��\n\t~/check_test_case.sh\n\tstatus=$?\nelse\n\t# �딁윥�묋돈瓦쏁쮮瓦숁삸訝띶룾役뗨캊��\n\tstatus=125\nfi\n" #. type: delimited block - #: en/git-bisect.txt:440 @@ -9550,7 +9550,7 @@ msgstr "" msgid "" "# undo the tweak to allow clean flipping to the next commit\n" "git reset --hard\n" -msgstr "" +msgstr "# �ㅹ�瘟껅빐竊뚥빳堊욕묾���⑵맼�곁옐饔у댆訝뗤�轝→룓雅�\ngit reset --hard\n" #. type: delimited block - #: en/git-bisect.txt:443 @@ -9558,13 +9558,13 @@ msgstr "" msgid "" "# return control\n" "exit $status\n" -msgstr "" +msgstr "# 雅ㅵ썮�㎩댍��\nexit $status\n" #. type: Plain text #: en/git-bisect.txt:451 #, priority:100 msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)" -msgstr "" +msgstr "瓦숁삸�ⓩ캀轝→탩瑥뺝뎺佯붺뵪��엶鸚띶늽��쉪岳�뵻竊뚥풃倻귨펽倻귝옖鵝좂쉪�꾢뻠�뽪탩瑥뺟렞罌껃룕�잌룜�뽳펽�곭뎵�у룾�썽�誤곦�訝ゆ뼭�덃쑍�꾡엶鸚띲��(簾�퓷��엶鸚띶늽��삸�뷰틢訝�訝ゅ똿�ュ쑉���됦엶溫®뎵訝�쉪�먧벡竊뚩퓳�룟릦亮뜻뿶弱긴툖鴉싨땳�εㄺ鸚싷펽�뽬�끺슴�� `git cherry-pick` 餓f쎘 `git merge`��)" #. type: delimited block - #: en/git-bisect.txt:458 @@ -9582,13 +9582,13 @@ msgstr "" #: en/git-bisect.txt:462 #, priority:100 msgid "This shows that you can do without a run script if you write the test on a single line." -msgstr "" +msgstr "瓦숃〃�롳펽倻귝옖鵝졿뒍役뗨캊�쇿쑉訝�烏뚥툓竊뚥퐷��빳訝띴슴�②퓧烏뚩꽊�с��" #. type: Plain text #: en/git-bisect.txt:464 #, priority:100 msgid "Locate a good region of the object graph in a damaged repository" -msgstr "" +msgstr "�ⓨ룛�잏쉪耶섇궓佯볞릎�얍댆野배괌�양쉪訝�訝よ돬也썲뙷��" #. type: delimited block - #: en/git-bisect.txt:474 @@ -9602,7 +9602,7 @@ msgid "" "\trc=$?\n" "\trm -f tmp.$$\n" "\ttest $rc = 0'\n" -msgstr "" +msgstr "$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-checkout\n$ git bisect run sh -c '\n\tGOOD=$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&\n\tgit rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&\n\tgit pack-objects --stdout >/dev/null <tmp.$$\n\trc=$?\n\trm -f tmp.$$\n\ttest $rc = 0'\n" #. type: delimited block - #: en/git-bisect.txt:476 @@ -9614,13 +9614,13 @@ msgstr "$ git bisect reset # quit the bisect session\n" #: en/git-bisect.txt:481 #, priority:100 msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'." -msgstr "" +msgstr "�②퓳燁띷깄�듕툔竊뚦퐪 'git bisect run' 若뚧닇�띰펽bisect/bad 弱녷뙁�꾣삸�녑컩�됦�訝ょ댍瀛㎫쉪�먧벡竊뚦끀��씨�얍쑉 'git pack objects' �꾣꼷阿됦툓��츑�ⓨ룾令욤텏�꾠��" #. type: Plain text #: en/git-bisect.txt:483 #, priority:100 msgid "Look for a fix instead of a regression in the code" -msgstr "" +msgstr "�ⓧ빰�곦릎野삥돻岳�쨳�뚥툖��썮壤믥쉪�방퀡" #. type: delimited block - #: en/git-bisect.txt:488 @@ -9638,7 +9638,7 @@ msgstr "" #: en/git-bisect.txt:491 #, priority:100 msgid "or:" -msgstr "" +msgstr "�뽳폏" #. type: delimited block - #: en/git-bisect.txt:495 @@ -9656,19 +9656,19 @@ msgstr "" #: en/git-bisect.txt:498 #, no-wrap, priority:100 msgid "Getting help" -msgstr "" +msgstr "�룟풓躍�뒰" #. type: Plain text #: en/git-bisect.txt:502 #, priority:100 msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description." -msgstr "" +msgstr "鵝욜뵪 `git bisect` �룟풓嶸���쉪鵝욜뵪瑥닸삇竊뚥슴�� `git bisect help` �� `git bisect -h` �룟풓�욜쉪鵝욜뵪瑥닸삇��" #. type: Plain text #: en/git-bisect.txt:507 #, priority:100 msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]." -msgstr "" +msgstr "link:git-bisect-lk2009.html [�� git bisect 野방뒚�욃퐩]竊똪inkgit:git-blame[1]��" #. type: Title = #: en/git-blame.txt:2 @@ -9684,44 +9684,44 @@ msgstr "git-blame - Show what revision and author last modified each line of a f #. type: Plain text #: en/git-blame.txt:16 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "" "'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n" "\t [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]\n" "\t [--ignore-rev <rev>] [--ignore-revs-file <file>]\n" "\t [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]\n" "\t [ --contents <file> ] [<rev> | --reverse <rev>..<rev>] [--] <file>\n" -msgstr "" +msgstr "'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n\t [-L <�껃쎍i>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<�ζ쐿>]\n\t [--ignore-rev <rev>] [--ignore-revs-file <�뉏뻑>]\n\t [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]\n\t [ --contents <�뉏뻑> ] [<rev> | --reverse <rev>..<rev>] [--] <�뉏뻑>\n" #. type: Plain text #: en/git-blame.txt:22 #, priority:100 msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision." -msgstr "" +msgstr "�ⓩ��롣�轝▽엶�배�烏뚨쉪岳���덄쉪岳→겘�ζ낏�딁퍢若싨뻼餓뜸릎�꾣캀訝�烏뚣�귛룾餓ι�됪떓餓롧퍢若싩쉪岳���덂�冶뗥걳力③뇢��" #. type: Plain text #: en/git-blame.txt:25 #, priority:100 msgid "When specified one or more times, `-L` restricts annotation to the requested lines." -msgstr "" +msgstr "壤볠뙁若싦�轝→닑鸚싨А�띰펽`-L` 弱녷낏�딃솏�뜹쑉誤곫콆�꾥죱訝���" #. type: Plain text #: en/git-blame.txt:31 #, priority:100 msgid "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the `-C` and `-M` options." -msgstr "" +msgstr "�ⓩ빐訝ゆ뻼餓띄쉪�띶뫝�띹퓝葉뗤릎竊뚩죱�꾥돈繹먫˙�ゅ뒯瓮잒릉竊덄쎅�띷깹�됮�됮」��빳�녜뿭�띶뫝�띹퇎甕わ펹�귟쫨瓮잒릉餓롣�訝ゆ뻼餓띄㎉�겼룱訝�訝ゆ뻼餓띄쉪烏뚳펽�뽬�낁퇎甕や퍗�╊�訝ゆ뻼餓뜹쨳�뜹뭽暎섋눼�꾥죱竊뚨춬嶺됵펽瑥룟뢿鰲� `-C` �� `-M` �됮」��" #. type: Plain text #: en/git-blame.txt:35 #, priority:100 msgid "The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" interface briefly mentioned in the following paragraph." -msgstr "" +msgstr "�ε몜訝띴폏�딂칹鵝졽뻣鵝뺝뀽雅롨˙�좈솮�뽪쎘�®쉪烏뚨쉪岳→겘竊쎽퐷��誤곦슴�ⓧ�訝ゅ램�뤄펽倻� 'git diff' �뽨툔餘듕릎嶸�誤곫룓�곁쉪 'pickaxe' �ε룭��" #. type: Plain text #: en/git-blame.txt:42 #, priority:100 msgid "Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example of the pickaxe interface that searches for `blame_usage`:" -msgstr "" +msgstr "�ㅴ틙��똻�뉏뻑力③뇢鸚뽳펽Git 瓦섉뵱�곩쑉凉��묈럣�꿜릎�쒐뇨餓g쟻�뉑�鵝뺞뿶�묊뵟�섇뙑�귟퓳鵝욕풓瓦썼릉訝�訝や빰�곭뎴餘듕퐬�띈˙曆삣뒥�겻�訝ゆ뻼餓띰펽�ⓩ뻼餓뜸퉳�당㎉�ⓩ닑鸚띶댍竊뚥빳�딀�瀯덅˙�좈솮�뽪쎘�€닇訝뷴룾�썬�귛츆�꾢램鵝쒎렅�녷삸�ⓨ량凉귚릎�쒐뇨訝�訝ゆ뻼�у춻寧╊림�귚�訝ゆ맂榮� `blame_usage` �� pickaxe �뚪씊�꾢컦堊뗥춴竊�" #. type: delimited block - #: en/git-blame.txt:47 @@ -9751,7 +9751,7 @@ msgstr "--score-debug" #: en/git-blame.txt:64 #, priority:100 msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved." -msgstr "" +msgstr "�끾떖訝롦뻼餓뜸퉳�닺죱�꾤㎉�⑨펷鰲� `-C`竊됧뭽�뉏뻑�낁죱�꾤㎉�⑨펷鰲� `-M`竊됪쐣�녕쉪瘟껇캊岳→겘�� �쀥눣�꾤К訝�訝ゆ빊耶쀦삸�녷빊�� 瓦숁삸汝�役뗥댆�꾢쑉�뉏뻑�닸닑�뉏뻑�끿㎉�①쉪耶쀦칾�겼춻耶쀧Е�꾣빊�뤵�� 瓦쇾릉�겼춻恙낂』擁낁퓝訝�若싩쉪�덂�쇽펽'git blame' �띴폏溫ㅴ맏瓦쇾틳餓g쟻烏뚩˙燁삣뒯雅녴��" #. type: Labeled list #: en/git-blame.txt:66 @@ -9763,7 +9763,7 @@ msgstr "--show-name" #: en/git-blame.txt:70 #, priority:100 msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection." -msgstr "" +msgstr "�양ㅊ�잌쭓�먧벡訝�쉪�뉏뻑�띲�� 容섋��끻넻訝뗰펽倻귝옖�됦뻣鵝뺜�烏뚧씎�や툖�뚦릫耶쀧쉪�뉏뻑竊뚨뵳雅롩뇥�띷�役뗰펽�뉏뻑�띴폏�양ㅊ�뷸씎��" #. type: Labeled list #: en/git-blame.txt:72 @@ -9775,13 +9775,13 @@ msgstr "--show-number" #: en/git-blame.txt:74 #, priority:100 msgid "Show the line number in the original commit (Default: off)." -msgstr "" +msgstr "�양ㅊ�잌쭓�먧벡訝�쉪烏뚦뤇竊덆퍡溫ㅿ폏off竊됥��" #. type: Plain text #: en/git-blame.txt:77 #, priority:100 msgid "Suppress the author name and timestamp from the output." -msgstr "" +msgstr "�묈댍渦볟눣訝�쉪鵝쒑�끻쭞�띶뭽�띌뿴�녈��" #. type: Labeled list #: en/git-blame.txt:79 @@ -9793,13 +9793,13 @@ msgstr "--show-email" #: en/git-blame.txt:83 #, priority:100 msgid "Show the author email instead of author name (Default: off). This can also be controlled via the `blame.showEmail` config option." -msgstr "" +msgstr "�양ㅊ鵝쒑�끿쉪�드춴��뻑�뚥툖��퐳�끿쉪�띶춻竊덆퍡溫ㅿ폏off竊됥�� 瓦쇾튋��빳�싪퓝 `blame.showEmail` �띸쉰�됮」�ζ렒�뜰��" #. type: Plain text #: en/git-blame.txt:87 #, priority:100 msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from." -msgstr "" +msgstr "�ⓩ캈渦껆댍�у뭽耶먩쑍�꾤뎵�ф뿶竊뚦옙�η㈉�쏙펽餓ζ돻�계죱�꾣씎繹먦��" #. type: Labeled list #: en/git-blame.txt:88 en/git-branch.txt:207 en/git-describe.txt:65 @@ -9811,7 +9811,7 @@ msgstr "--abbrev=<n>" #: en/git-blame.txt:94 #, priority:100 msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <m>+1 digits, where <m> is at least <n> but ensures the commit object names are unique. Note that 1 column is used for a caret to mark the boundary commit." -msgstr "" +msgstr "訝띹쫨鵝욜뵪容섋���7+1訝ゅ뛻��퓵�뜻빊耶쀤퐳訝뷴�穩←쉪煐⒴넍竊뚩�뚧삸鵝욜뵪 <m>+1 訝ゆ빊耶쀯펽�뜸릎 <m> �녑컩�� <n>竊뚥퐜簾�퓷�먧벡野배괌�꾢릫燁경삸����꾠�� 瑥룡낏�륅펽��1�쀦삸�ⓩ씎�뉓�渦밭븣�먧벡�꾢뀽�θ칾��" #. type: Title - #: en/git-blame.txt:97 @@ -9823,19 +9823,19 @@ msgstr "�ζ쐿�쇔폀" #: en/git-blame.txt:101 #, priority:100 msgid "When neither `--porcelain` nor `--incremental` option is specified, `git blame` will output annotation for each line with:" -msgstr "" +msgstr "壤볠뿢亦→쐣�뉐츣`--porcelain` 阿잍깹�됪뙁若�`--incremental` �됮」�띰펽`git blame` 弱녵맏驪뤶�烏뚩풏�뷸낏�딉폏" #. type: Plain text #: en/git-blame.txt:103 #, priority:100 msgid "abbreviated object name for the commit the line came from;" -msgstr "" +msgstr "瑥θ죱�θ눎�꾣룓雅ㅷ쉪煐⒴넍野배괌�띸㎞竊�" #. type: Plain text #: en/git-blame.txt:105 #, priority:100 msgid "author ident (by default author name and date, unless `-s` or `-e` is specified); and" -msgstr "" +msgstr "鵝쒑�낁벴餓쏙펷容섋�訝뷰퐳�끻쭞�띶뭽�ζ쐿竊뚪솮�욄뙁若�`s`��`e`竊됵폑餓ε룋" #. type: Plain text #: en/git-blame.txt:106 @@ -9848,79 +9848,79 @@ msgstr "--line-number" #: en/git-blame.txt:108 #, priority:100 msgid "before the line contents." -msgstr "" +msgstr "�②�烏뚦냵若밥퉳�띲��" #. type: Title - #: en/git-blame.txt:110 #, no-wrap, priority:100 msgid "THE PORCELAIN FORMAT" -msgstr "" +msgstr "訝듿콆�썰빱�쇔폀" #. type: Plain text #: en/git-blame.txt:114 #, priority:100 msgid "In this format, each line is output after a header; the header at the minimum has the first line which has:" -msgstr "" +msgstr "�②퓳燁띷졏凉뤶릎竊뚧캀訝�烏뚪꺗��쑉窈든쐣阿뗥릮渦볟눣�꾬폑窈든쐣�녑컩�됬К訝�烏뚳펽若껅쐣竊�" #. type: Plain text #: en/git-blame.txt:116 #, priority:100 msgid "40-byte SHA-1 of the commit the line is attributed to;" -msgstr "" +msgstr "瑥θ죱��壤믣콪�꾣룓雅ㅷ쉪 40 耶쀨뒄 SHA-1竊�" #. type: Plain text #: en/git-blame.txt:117 #, priority:100 msgid "the line number of the line in the original file;" -msgstr "" +msgstr "�잌쭓�뉏뻑訝��烏뚨쉪烏뚦뤇竊�" #. type: Plain text #: en/git-blame.txt:118 #, priority:100 msgid "the line number of the line in the final file;" -msgstr "" +msgstr "���롦뻼餓뜸릎瑥θ죱�꾥죱�뤄폑" #. type: Plain text #: en/git-blame.txt:121 #, priority:100 msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent." -msgstr "" +msgstr "�ⓨ�冶뗤�瀯꾡툗�띴�轝▽툖�뚨쉪�먧벡�꾥죱訝딉펽瑥η퍍�꾥죱�겹�� �③쉹�롧쉪烏뚥릎竊뚩퓳訝ゅ춻餘득삸訝띶춼�①쉪��" #. type: Plain text #: en/git-blame.txt:124 #, priority:100 msgid "This header line is followed by the following information at least once for each commit:" -msgstr "" +msgstr "瓦쇾릉�뉔쥦烏뚦릮�€삸餓δ툔岳→겘竊뚧캀轝→룓雅ㅸ눛弱묉쐣訝�轝∽폏" #. type: Plain text #: en/git-blame.txt:128 #, priority:100 msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer." -msgstr "" +msgstr "鵝쒑�끻쭞�랃펷\"author\"竊됥�곭뵷耶먬궙餓띰펷\"author-mail\"竊됥�곫뿶�댐펷\"author-time\"竊됧뭽�뜹뙷竊�\"author-tz\"竊됵폑野방룓雅ㅸ�끺튋��쫩閭ㅳ��" #. type: Plain text #: en/git-blame.txt:129 #, priority:100 msgid "the filename in the commit that the line is attributed to." -msgstr "" +msgstr "瑥θ죱壤믣콪�꾣룓雅ㅴ릎�꾣뻼餓뜹릫��" #. type: Plain text #: en/git-blame.txt:130 #, priority:100 msgid "the first line of the commit log message (\"summary\")." -msgstr "" +msgstr "�먧벡�ε퓱岳→겘�꾤К訝�烏뚳펷\"�섋쫨\"竊됥��" #. type: Plain text #: en/git-blame.txt:134 #, priority:100 msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later." -msgstr "" +msgstr "若욇솀烏뚨쉪�끻�鴉싧쑉訝딂염�뉔쥦阿뗥릮渦볟눣竊뚦뎺煐�訝� TAB�귟퓳��맏雅녶뀅溫멧빳�롦렌�졿쎍鸚싩쉪�뉔쥦�껆킔��" #. type: Plain text #: en/git-blame.txt:142 #, priority:100 msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:" -msgstr "" +msgstr "訝듿콆�썰빱�쇔폀�싧만鴉싨뒔�뜹럴瀯뤹쐦瓦뉒쉪�먧벡岳→겘�귚풃倻귨펽訝ㅸ죱壤믣뭿雅롥릪訝�訝ゆ룓雅ㅷ쉪�끻��썰폏熬ユ샑鹽뷴눣�ο펽鵝녻��먧벡�꾤퍏�귛룵鴉싪˙�양ㅊ訝�轝▲�귟퓳�룟걳�닸쐣�덄럤竊뚥퐜��꺗��誤곮��끺퓷耶섉쎍鸚싩쉪�뜻�곻폏" #. type: Plain text #: en/git-blame.txt:147 @@ -9930,25 +9930,25 @@ msgid "" "\tgit blame --line-porcelain file |\n" "\tsed -n 's/^author //p' |\n" "\tsort | uniq -c | sort -rn\n" -msgstr "" +msgstr "\t# count the number of lines attributed to each author\n\tgit blame --line-porcelain file |\n\tsed -n 's/^author //p' |\n\tsort | uniq -c | sort -rn\n" #. type: Title - #: en/git-blame.txt:150 en/revisions.txt:245 #, no-wrap, priority:100 msgid "SPECIFYING RANGES" -msgstr "" +msgstr "�뉐츣�껃쎍" #. type: Plain text #: en/git-blame.txt:156 #, priority:100 msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times." -msgstr "" +msgstr "訝롦뿧�덃쑍�� \"git blame\" �� \"git annotate\" 訝띶릪竊뚧낏�딁쉪�껃쎍��빳�먨댍�②죱�꾥똽�닷뭽岳���껃쎍��`-L` �됮」弱녷낏�딃솏�뜹쑉訝�訝よ죱�꾥똽�닷냵竊뚦룾餓ε쩀轝→뙁若싥��" #. type: Plain text #: en/git-blame.txt:161 #, priority:100 msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):" -msgstr "" +msgstr "壤볞퐷野방윥�얏뻼餓� `foo` �꾤К 40-60 烏뚨쉪�잏궧�잌뀾擁f뿶竊뚥퐷��빳�뤺퓳�룝슴�� `-L` �됮」竊덂츆餓х쉪�뤸�앮삸訝��루쉪--�썼쫨黎귚퍗寧� 40 烏뚦�冶뗧쉪 21 烏뚳펹竊�" #. type: Plain text #: en/git-blame.txt:164 @@ -9964,7 +9964,7 @@ msgstr "" #: en/git-blame.txt:166 #, priority:100 msgid "Also you can use a regular expression to specify the line range:" -msgstr "" +msgstr "鵝졽튋��빳鵝욜뵪閭e닕烏②씨凉뤸씎�뉐츣烏뚨쉪�껃쎍竊�" #. type: Plain text #: en/git-blame.txt:168 @@ -9976,13 +9976,13 @@ msgstr "\tgit blame -L '/^sub hello {/,/^}$/' foo\n" #: en/git-blame.txt:170 #, priority:100 msgid "which limits the annotation to the body of the `hello` subroutine." -msgstr "" +msgstr "若껃컛力③뇢�먨댍�� `hello` 耶먪쮮佯뤹쉪訝삡퐪訝���" #. type: Plain text #: en/git-blame.txt:174 #, priority:100 msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':" -msgstr "" +msgstr "壤볞퐷野배텈瓦� v2.6.18 �덃쑍�꾡엶�밥툖�잌뀾擁o펽�뽬�낁텈瓦� 3 �①쉪岳�뵻訝띷꽏�닺땃�띰펽鵝졾룾餓δ슴�①굳鴉쇌틢 `git rev-list` �꾡엶溫�똽�닸뙁若싧솳竊�" #. type: Plain text #: en/git-blame.txt:177 @@ -9998,55 +9998,55 @@ msgstr "" #: en/git-blame.txt:183 #, priority:100 msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit." -msgstr "" +msgstr "壤볞엶溫�똽�닸뙁若싩Е熬ョ뵪�ι솏�뜻낏�딀뿶竊뚩눎�껃쎍渦밭븣竊덂쑉訝딃씊�꾡풃耶먧릎竊뚧룓雅� v2.6.18 �뽬텈瓦� 3 �①쉪���경룓雅ㅿ펹餓ζ씎亦→쐣�밧룜�꾥죱熬ユ뙁兀d맏瑥θ똽�닺씁�뚧룓雅ㅳ��" #. type: Plain text #: en/git-blame.txt:189 #, priority:100 msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:" -msgstr "" +msgstr "訝�訝ょ돶�ユ쐣�①쉪�방퀡��쐦訝�訝ゆ뼭罌욅쉪�뉏뻑��맔�됦퍗�경쐣�뉏뻑訝�쨳�뜹뭽暎섋눼�꾥죱�� �됪뿶竊뚩퓳烏ⓩ삇凉��묇볶�섇푽要ц솊竊뚧깹�됪�簾�쑑�띷엫餓g쟻�� 鵝졾룾餓ι쫿�덃돻�겼폊�θ��뉏뻑�꾣룓雅ㅿ폏" #. type: Plain text #: en/git-blame.txt:191 #, no-wrap, priority:100 msgid "\tgit log --diff-filter=A --pretty=short -- foo\n" -msgstr "" +msgstr "\tgit log --diff-filter=A --pretty=short -- foo\n" #. type: Plain text #: en/git-blame.txt:194 #, priority:100 msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:" -msgstr "" +msgstr "�뜹릮�� 'commit^!' 寧�뤇�ζ낏�딂��먧벡�뚦끀�띈푽阿뗩뿴�꾢룜�뽳폏" #. type: Plain text #: en/git-blame.txt:196 #, no-wrap, priority:100 msgid "\tgit blame -C -C -f $commit^! -- foo\n" -msgstr "" +msgstr "\tgit blame -C -C -f $commit^! -- foo\n" #. type: Title - #: en/git-blame.txt:199 #, no-wrap, priority:100 msgid "INCREMENTAL OUTPUT" -msgstr "" +msgstr "罌욇뇧渦볟눣" #. type: Plain text #: en/git-blame.txt:206 #, priority:100 msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers." -msgstr "" +msgstr "壤볢컘�� `--incremental` �됮」�띰펽瑥ε뫝餓ㅵ쑉�꾢뻠瓦뉒쮮訝�풏�븀퍜�쒌�� 訝��ф씎瑥댐펽渦볟눣瀯볠옖鴉싧뀍瘟덂룋��瓦묉룓雅ㅷ쉪烏뚳펷阿잌갚���竊뚩퓳雅쏂죱鴉싪˙訝띷뙃窈뷴틣�꾣낏�딉펹竊뚦뭉訝붹삸訝뷰틙瀯쇾벡雅믣폀役뤺쭏�끺슴�ⓦ��" #. type: Plain text #: en/git-blame.txt:210 #, priority:100 msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated." -msgstr "" +msgstr "渦볟눣�쇔폀映삡세雅롣툓掠귛뫝餓ㅶ졏凉륅펽鵝녶츆訝띶똿�ヨ˙力③뇢�꾣뻼餓띄쉪若욇솀烏뚧빊��" #. type: Plain text #: en/git-blame.txt:212 #, priority:100 msgid "Each blame entry always starts with a line of:" -msgstr "" +msgstr "驪뤶릉�녶뤁瓦썸변�←쎅�삥삸餓δ�烏뚦춻凉�冶뗰폏" #. type: Plain text #: en/git-blame.txt:214 @@ -10058,37 +10058,37 @@ msgstr "<40-byte hex sha1> <sourceline> <resultline> <num_lines>\n" #: en/git-blame.txt:216 #, priority:100 msgid "Line numbers count from 1." -msgstr "" +msgstr "烏뚧빊餓� 1 凉�冶뗨�嶸쀣��" #. type: Plain text #: en/git-blame.txt:221 #, priority:100 msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)." -msgstr "" +msgstr "壤볞�訝ゆ룓雅ㅹ쫿轝▼눣�겼쑉�경뜮役곦릎�띰펽若껆쉪�꾤쭕�뜸퍟岳→겘鴉싪˙�볟뜲�뷸씎竊뚧캀訝�烏뚨쉪凉�鸚닻꺗�됦�訝ゅ뜒耶쀦젃嶺억펽�뤺염窯앭쨼�꾣룓雅ㅴ에��펷鵝쒑�끹�곭뵷耶먬궙餓뜰�곫룓雅ㅸ�끹�곫뿥�잆�곫몮誤곭춬竊됥��" #. type: Plain text #: en/git-blame.txt:224 #, priority:100 msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:" -msgstr "" +msgstr "訝롣툓掠귛뫝餓ㅶ졏凉뤶툖�뚳펽�뉏뻑�띴에���삥삸瀯쇿츣�꾬펽亮띄퍑閭€씉��폏" #. type: Plain text #: en/git-blame.txt:226 #, no-wrap, priority:100 msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n" -msgstr "" +msgstr "\"filename\" <whitespace-quoted-filename-goes-here>\n" #. type: Plain text #: en/git-blame.txt:229 #, priority:100 msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)." -msgstr "" +msgstr "�졿�竊뚦�雅롣�雅쏃씊�묋죱�뚦춻�꾥㎗�먨솳�θ�竊뚦츆簾�츩孃덂��볢㎗�먲펷瓦쇿�雅롥ㄷ鸚싨빊�싨쑍瑥���θ�佯붻���푽�ょ꽫�꾬펹��" #. type: Plain text #: en/git-blame.txt:237 #, priority:100 msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care." -msgstr "" +msgstr "野밥틢�싪㎗�먪쉪雅뷸씎瑥댐폏訝뷰틙鵝욕츆�닷겈鶯�펽�よ쫨恙썹븼寧т��뚧��롣�訝わ펷\"<sha1>\" �� \"filename\" 烏뚳펹阿뗩뿴�꾡뻣鵝뺠죱竊뚦쑉 \"�⒴콝岳→겘\" 烏뚨쉪凉�鸚댐펽鵝졽툖溫ㅸ칳�뉒�瑥랃펷�뽩뀽恙껈궍訝ょ돶若싩쉪竊됥�귟퓳�룝��ο펽倻귝옖�됦�鸚⒴쥭�졽틙岳→겘竊덃캈倻귝룓雅ㅷ폋�곫닑�⒴콝�꾣룓雅ㅶ낏�딉펹竊뚦럣�꿱옙繹�윥�뗨�끻갚訝띴폏�ⓩ꼷��" #. type: Title - #: en/git-blame.txt:240 en/git-check-mailmap.txt:47 en/git-shortlog.txt:120 @@ -10853,7 +10853,7 @@ msgstr "git-bugreport(1)" #: en/git-bugreport.txt:7 #, priority:100 msgid "git-bugreport - Collect information for user to file a bug report" -msgstr "" +msgstr "git-bugreport - �띌썓�ⓩ댎�먧벡�숃��ε몜�꾡에��" #. type: Plain text #: en/git-bugreport.txt:13 @@ -10861,67 +10861,67 @@ msgstr "" msgid "" "'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n" "\t\t[--diagnose[=<mode>]]\n" -msgstr "" +msgstr "'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <�쇔폀>]\n\t\t[--diagnose[=<與▼폀>]]\n" #. type: Plain text #: en/git-bugreport.txt:20 #, priority:100 msgid "Captures information about the user's machine, Git client, and repository state, as well as a form requesting information about the behavior the user observed, into a single text file which the user can then share, for example to the Git mailing list, in order to report an observed bug." -msgstr "" +msgstr "�뺠렩�념틢�ⓩ댎�꾣쑛�ⓦ�갍it 若€댎塋�뭽餓볟틩�뜻�곭쉪岳→겘竊뚥빳�딂쫨黎귝룓堊쏁뵪�룩쭆野잌댆�꾥죱訝뷰에��쉪烏ⓩ졏竊뚦뭉弱녶끀�얍뀯訝�訝ゆ뻼�ф뻼餓뜸릎竊뚨꽫�롧뵪�룟룾餓ε늽雅ヨ��뉏뻑竊뚥풃倻귛늽雅ュ댆 Git ��뻑�쀨〃竊뚥빳堊욘뒫�딂쭆野잌댆�꾦뵗瑥���" #. type: Plain text #: en/git-bugreport.txt:22 #, priority:100 msgid "The following information is requested from the user:" -msgstr "" +msgstr "誤곫콆�ⓩ댎�먧풘餓δ툔岳→겘竊�" #. type: Plain text #: en/git-bugreport.txt:24 #, priority:100 msgid "Reproduction steps" -msgstr "" +msgstr "�띸뵟雅㎪�謠�" #. type: Plain text #: en/git-bugreport.txt:25 #, priority:100 msgid "Expected behavior" -msgstr "" +msgstr "窯꾣쐿�꾥죱訝�" #. type: Plain text #: en/git-bugreport.txt:26 #, priority:100 msgid "Actual behavior" -msgstr "" +msgstr "若욇솀烏뚥맏" #. type: Plain text #: en/git-bugreport.txt:28 #, priority:100 msgid "The following information is captured automatically:" -msgstr "" +msgstr "餓δ툔岳→겘��눎�③뇞�녺쉪竊�" #. type: Plain text #: en/git-bugreport.txt:30 #, priority:100 msgid "'git version --build-options'" -msgstr "" +msgstr "'git version --build-options'" #. type: Plain text #: en/git-bugreport.txt:31 #, priority:100 msgid "uname sysname, release, version, and machine strings" -msgstr "" +msgstr "uname sysname, release, version, and machine strings" #. type: Plain text #: en/git-bugreport.txt:32 #, priority:100 msgid "Compiler-specific info string" -msgstr "" +msgstr "煐뽬캂�①돶若싦에��춻寧╊림" #. type: Plain text #: en/git-bugreport.txt:33 #, priority:100 msgid "A list of enabled hooks" -msgstr "" +msgstr "��뵪�꾦뮝耶먪쉪�쀨〃" #. type: Plain text #: en/git-bugreport.txt:34 @@ -10933,13 +10933,13 @@ msgstr "$SHELL" #: en/git-bugreport.txt:38 #, priority:100 msgid "Additional information may be gathered into a separate zip archive using the `--diagnose` option, and can be attached alongside the bugreport document to provide additional context to readers." -msgstr "" +msgstr "窯앭쨼�꾡에��룾餓δ슴�� `--diagnose` �됮」�띌썓�겻�訝ゅ뜒�х쉪�뗧섄�뉏뻑訝�펽亮뜹룾餓δ툗 bugreport �뉏뻑訝�壅룬셿訝딉펽訝븃��끾룓堊쏃쥫鸚뽫쉪訝듾툔�뉎��" #. type: Plain text #: en/git-bugreport.txt:43 #, priority:100 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help." -msgstr "" +msgstr "瓦쇾릉藥ε끁���싪퓝�멨엹�� Git 溫양쉰瓦뉒쮮瘟껆뵪�꾬펽瓦숁꼷�녕��ⓩ윇雅쎿깄�듕툔竊뚦츆��꺗�졿퀡��뒯�붴�붶풃倻귨펽倻귝옖�멨뀽�꾦뀓營�뻼餓뜻뿞力뺠��뽧�귛쑉瓦숂쭕�끻넻訝뗰펽�ⓩ뎸�②�黎귛리�⒵뿶竊뚧뎸�ⓩ뵸�녵툓�℡닓�븀쉪�g쭕岳→겘��꺗鴉싨쐣躍�뒰��" #. type: Labeled list #: en/git-bugreport.txt:46 @@ -10959,7 +10959,7 @@ msgstr "--output-directory <path>" #: en/git-bugreport.txt:50 #, priority:100 msgid "Place the resulting bug report file in `<path>` instead of the current directory." -msgstr "" +msgstr "弱녵벨�잏쉪�숃��ε몜�뉏뻑�얍쑉 `<瓮�푶>` �뚥툖��퐪�띸쎅壤뺜릎��" #. type: Labeled list #: en/git-bugreport.txt:51 @@ -10978,7 +10978,7 @@ msgstr "--suffix <format>" #: en/git-bugreport.txt:56 #, priority:100 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used." -msgstr "" +msgstr "訝� bugreport �띸㎞�뉐츣訝�訝ゅ쨭�ⓨ릮煐�竊뚥빳�쎾뻠訝�訝ゅ릫訝� \"git-bugreport-<�쇔폀�뽩릮煐�>\"�꾣뻼餓뜰�귟퓳佯붻��뉐룚 strftime(3) �쇔폀耶쀧Е訝꿰쉪壤℡폀竊쎾컛鵝욜뵪壤볟뎺�꾣쑍�경뿶�담��" #. type: Labeled list #: en/git-bugreport.txt:57 @@ -10996,13 +10996,13 @@ msgstr "--ignored[=<mode>]" #: en/git-bugreport.txt:63 #, priority:100 msgid "Create a zip archive of supplemental information about the user's machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named 'git-diagnostics-<formatted suffix>'." -msgstr "" +msgstr "�쎾뻠訝�訝ゅ똿�ョ뵪�룡쑛�ⓦ�갍it 若€댎塋�뭽餓볟틩�뜻�곭춬烏ε뀉岳→겘�� zip 旅f죭�귟�壤믤。�뉏뻑訝롩뵗瑥�뒫�듿넍�ε릪訝�渦볟눣��퐬竊뚦뭉�썲릫訝� 'git-diagnostics-<�쇔폀�뽩릮煐�>'��" #. type: Plain text #: en/git-bugreport.txt:69 #, priority:100 msgid "Without `mode` specified, the diagnostic archive will contain the default set of statistics reported by `git diagnose`. An optional `mode` value may be specified to change which information is included in the archive. See linkgit:git-diagnose[1] for the list of valid values for `mode` and details about their usage." -msgstr "" +msgstr "倻귝옖亦→쐣�뉐츣`mode'竊뚩칺��。旅덂컛�끻맜 `git diagnose` �ε몜�꾦퍡溫ㅷ퍨溫▽에���귛룾餓ζ뙁若싦�訝ゅ룾�됬쉪 `mode` �쇗씎�밧룜耶섉。訝�똿�ョ쉪岳→겘�귛뢿鰲� linkgit:git-diagnose[1]竊뚥틙鰲� `mode` �꾣쐣�덂�쇔닓烏ⓨ룋�뜸슴�①퍏�귙��" #. type: Title = #: en/git-bundle.txt:2 @@ -11025,31 +11025,31 @@ msgid "" "'git bundle' verify [-q | --quiet] <file>\n" "'git bundle' list-heads <file> [<refname>...]\n" "'git bundle' unbundle [--progress] <file> [<refname>...]\n" -msgstr "" +msgstr "'git bundle' create [-q | --quiet | --progress]\n\t\t [--version=<�덃쑍>] <�뉏뻑> <git-rev-list-args>\n'git bundle' verify [-q | --quiet] <�뉏뻑>\n'git bundle' list-heads <�뉏뻑> [<凉뺟뵪��>...]\n'git bundle' unbundle [--progress] <�뉏뻑> [<凉뺟뵪��>...]\n" #. type: Plain text #: en/git-bundle.txt:24 #, priority:100 msgid "Create, unpack, and manipulate \"bundle\" files. Bundles are used for the \"offline\" transfer of Git objects without an active \"server\" sitting on the other side of the network connection." -msgstr "" +msgstr "�쎾뻠�곮㎗�끻뭽�띴퐳 �쒏돀�끸�� �뉏뻑�귝뜂瀯묉뻼餓띄뵪雅� Git 野배괌�� �쒐┿瀛욋�� 鴉좄풏竊뚩�뚥툖��誤곩쑉營묊퍥瓦욄렏�꾢룱訝�塋�쐣訝�訝ゆ뉵瓮껆쉪 �쒏쐨�▼솳�앫��" #. type: Plain text #: en/git-bundle.txt:28 #, priority:100 msgid "They can be used to create both incremental and full backups of a repository, and to relay the state of the references in one repository to another." -msgstr "" +msgstr "若껂뺄��빳�ⓩ씎�쎾뻠餓볟틩�꾢쥭�뤷뭽若뚦뀲鸚뉏뻥竊뚦뭉弱녵�訝や퍜佯볞릎�꾢폊�①듁�곦폖�믥퍢�╊�訝ょ뎵�у틩��" #. type: Plain text #: en/git-bundle.txt:36 #, priority:100 msgid "Git commands that fetch or otherwise \"read\" via protocols such as `ssh://` and `https://` can also operate on bundle files. It is possible linkgit:git-clone[1] a new repository from a bundle, to use linkgit:git-fetch[1] to fetch from one, and to list the references contained within it with linkgit:git-ls-remote[1]. There's no corresponding \"write\" support, i.e.a 'git push' into a bundle is not supported." -msgstr "" +msgstr "�싪퓝 `ssh://` �� `https://` 嶺됧뜌溫�렩�뽪닑餓ε끀餓뽪뼶凉� �쒑��뽦�� �� Git �썰빱阿잌룾餓ε��볟똿�뉏뻑瓦쏂죱�띴퐳�귛츆��빳�싪퓝 linkgit:git-clone[1] 餓롦돀�끺릎兩븀쳦�곁쉪餓볟틩竊뚨뵪 linkgit:git-fetch[1] 餓롥끀訝�렩�뽳펽亮띌�싪퓝 linkgit:git-ls-remote[1] �쀥눣�뜸릎�꾢폊�ⓦ�귝깹�됬쎑佯붺쉪 \"��\" ��똻竊뚥튋弱길삸瑥댐펽訝띷뵱�� 'git push' �녺퍚�끹��" #. type: Plain text #: en/git-bundle.txt:38 #, priority:100 msgid "See the \"EXAMPLES\" section below for examples of how to use bundles." -msgstr "" +msgstr "�념틢倻귚퐬鵝욜뵪�녺퍚�끿쉪堊뗥춴竊뚩쭅訝뗩씊�� �쒎츩堊뗢�� �ⓨ늽��" #. type: Title - #: en/git-bundle.txt:40 @@ -11061,79 +11061,79 @@ msgstr "�ζ쐿�쇔폀" #: en/git-bundle.txt:44 #, priority:100 msgid "Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a header indicating what references are contained within the bundle." -msgstr "" +msgstr "�녺퍚�끾삸 `.pack` �뉏뻑竊덅쭅 linkgit:git-pack-objects[1]竊됵펽�됦�訝ゆ젃鸚닺��롦뜂瀯묈똿訝�똿�ュ벆雅쎾폊�ⓦ��" #. type: Plain text #: en/git-bundle.txt:48 #, priority:100 msgid "Like the packed archive format itself bundles can either be self-contained, or be created using exclusions. See the \"OBJECT PREREQUISITES\" section below." -msgstr "" +msgstr "弱긷깗�볟똿�꾢퐩旅f졏凉뤸쑍翁ヤ��뤄펽�녺퍚�끾뿢��빳��떖塋뗧쉪竊뚥튋��빳鵝욜뵪�믧솮力뺝닗兩뷩�� �귟쭅訝뗩씊�� \"��젃�띷룓\" �ⓨ늽��" #. type: Plain text #: en/git-bundle.txt:52 #, priority:100 msgid "Bundles created using revision exclusions are \"thin packs\" created using the `--thin` option to linkgit:git-pack-objects[1], and unbundled using the `--fix-thin` option to linkgit:git-index-pack[1]." -msgstr "" +msgstr "鵝욜뵪岳���덃럲�ㅶ퀡�쎾뻠�꾣뜂瀯묈똿��슴�� linkgit:git-pack-objects[1] �� `--thin` �됮」�쎾뻠�� �쒑슥�뤷똿�앾펽亮뜸슴�� linkgit:git-index-pack[1] �� `--fix-thin` �됮」鰲i솮�녺퍚��" #. type: Plain text #: en/git-bundle.txt:58 #, priority:100 msgid "There is no option to create a \"thick pack\" when using revision exclusions, and users should not be concerned about the difference. By using \"thin packs\", bundles created using exclusions are smaller in size. That they're \"thin\" under the hood is merely noted here as a curiosity, and as a reference to other documentation." -msgstr "" +msgstr "�ⓧ슴�ⓧ엶溫€럲�ㅶ퀡�띰펽亦→쐣�쎾뻠 �쒎쨳�귛똿�� �꾦�됮」竊뚨뵪�룝툖佯붻��끻퓘瓦숂쭕藥�펰�귡�싪퓝鵝욜뵪 �쒑슥�뤷똿�앾펽鵝욜뵪�믧솮力뺝닗兩븀쉪�녺퍚�뉏뻑弱뷴�渦껃컦�귛츆餓у쑉凉뺞뱨�뽨툔�� �쒑뻹�� �꾬펽�ⓩ��ゆ삸鵝쒍맏訝�燁띶�也뉛펽亮뜸퐳訝뷴끀餓뽪뻼旅g쉪�귟�껁��" #. type: Plain text #: en/git-bundle.txt:61 #, priority:100 msgid "See linkgit:gitformat-bundle[5] for more details and the discussion of \"thin pack\" in linkgit:gitformat-pack[5] for further details." -msgstr "" +msgstr "�닷쩀瀯녻뒄鰲� linkgit:gitformat-bundle[5] 竊뚥빳�� linkgit:gitformat-pack[5] 訝�뀽雅� �쒑슥�뤷똿�� �꾥�溫뷩��" #. type: Labeled list #: en/git-bundle.txt:65 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "create [options] <file> <git-rev-list-args>" -msgstr "" +msgstr "create [options] <�뉏뻑> <git-rev-list-args>" #. type: Plain text #: en/git-bundle.txt:70 #, priority:100 msgid "Used to create a bundle named 'file'. This requires the '<git-rev-list-args>' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand. If 'file' is `-`, the bundle is written to stdout." -msgstr "" +msgstr "�ⓩ씎�쎾뻠訝�訝ゅ릫訝� '<�뉏뻑>' �꾣뜂瀯묈똿�� 瓦숅�誤� '<git-rev-list-args>' �귝빊�ε츣阿됧똿�꾢냵若밤�� '�됮」' �끻맜 'git bundle create' 耶먨뫝餓ㅷ쉪�밧츣�됮」�귛쫩�� 'file' �� '-'竊뚧뜂瀯묈냵若밧컛熬ュ넍�ζ젃�녻풏�뷸탛��" #. type: Labeled list #: en/git-bundle.txt:71 #, no-wrap, priority:100 msgid "verify <file>" -msgstr "" +msgstr "verify <�뉏뻑>" #. type: Plain text #: en/git-bundle.txt:82 #, priority:100 msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. Then, 'git bundle' prints a list of missing commits, if any. Finally, information about additional capabilities, such as \"object filter\", is printed. See \"Capabilities\" in linkgit:gitformat-bundle[5] for more information. The exit code is zero for success, but will be nonzero if the bundle file is invalid. If 'file' is `-`, the bundle is read from stdin." -msgstr "" +msgstr "�ⓧ틢汝��ζ뜂瀯묈똿�뉏뻑��맔�됪븞竊뚧삸��꺗亮꿨��겼틪�ⓨ댆壤볟뎺餓볟틩�� 瓦쇿똿�у��녺퍚�끾졏凉뤸쑍翁ョ쉪汝��ο펽餓ε룋汝��ε뎺�먩룓雅ㅶ삸��춼�⑨펽亮뜹쑉壤볟뎺�덃쑍佯볞릎熬ュ츑�③벦�γ�� �뜹릮竊�'git bundle' 鴉싨돀�겼눣訝�訝ょ성鸚길룓雅ㅷ쉪�쀨〃竊뚦쫩�쒏쐣�꾥캕�� ���롳펽�볟뜲�뷴뀽雅롩쥫鸚뽬꺗�쏁쉪岳→겘竊뚧캈倻� �쒎�穩↑퓝譯ㅵ솳�앫�귝쎍鸚싦에��쭅 linkgit:gitformat-bundle[5] 訝�쉪 �쒑꺗�쎻�앫�귝닇�잍뿶���뷰빰�곦맏�띰펽鵝녶쫩�쒏뜂瀯묈똿�뉏뻑�졿븞竊뚪���뷰빰�곩컛訝븅씆�뜰�귛쫩�� 'file' �� `-`竊뚦닕餓롦젃�녻풏�ζ탛瑥삣룚�녺퍚�끾뻼餓뜰��" #. type: Labeled list #: en/git-bundle.txt:83 #, no-wrap, priority:100 msgid "list-heads <file>" -msgstr "" +msgstr "list-heads <�뉏뻑>" #. type: Plain text #: en/git-bundle.txt:87 #, priority:100 msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out. If 'file' is `-`, the bundle is read from stdin." -msgstr "" +msgstr "�쀥눣�녺퍚訝�츣阿됬쉪凉뺟뵪�� 倻귝옖�롩씊��폊�ⓨ닓烏⑨펽�쇿룵�볟뜲�뷰툗阿뗥뙶�띸쉪凉뺟뵪�귛쫩�� 'file' �� `-`竊뚦닕餓롦젃�녻풏�ζ탛訝���뽪뜂瀯묈똿�뉏뻑��" #. type: Labeled list #: en/git-bundle.txt:88 #, no-wrap, priority:100 msgid "unbundle <file>" -msgstr "" +msgstr "unbundle <�뉏뻑>" #. type: Plain text #: en/git-bundle.txt:95 #, priority:100 msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'. If 'file' is `-`, the bundle is read from stdin." -msgstr "" +msgstr "弱녷뜂瀯묈똿訝�쉪野배괌鴉좈�믥퍢 'git index-pack' 餓ε춼�ⓨ쑉餓볟틩訝�펽�뜹릮�볟뜲�뷸��됧츣阿됬쉪凉뺟뵪�꾢릫燁겹�귛쫩�쒐퍢雅녵�訝ゅ폊�ⓨ닓烏⑨펽�쇿룵�볟뜲�쀨〃訝�뙶�띸쉪凉뺟뵪�귟퓳訝ゅ뫝餓ㅶ삸�잍��꾤��볩펽�ゆ돀嶸쀧뵳 'git fetch' 瘟껆뵪�� 倻귝옖 'file' �� `-`竊뚦닕餓롦젃�녻풏�ζ탛瑥삣룚�녺퍚�끾뻼餓뜰��" #. type: Labeled list #: en/git-bundle.txt:96 @@ -11145,19 +11145,19 @@ msgstr "<git-rev-list-args>" #: en/git-bundle.txt:105 #, priority:100 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged." -msgstr "" +msgstr "訝�訝ゅ뢿�겼닓烏⑨펽��빳熬� 'git rev-parse' �� 'git rev-list' �ε룛竊덂뭉�끻맜訝�訝ゅ뫝�띸쉪凉뺟뵪竊뚩쭅訝뗩씊�� �뉐츣凉뺟뵪竊됵펽若껅뙁若싦틙誤곦폖�곭쉪�밧츣野배괌�뚦폊�ⓦ�� 堊뗥쫩竊�`master~10...master` 鴉싧��닷퐪�띸쉪訝삣폊�ⓧ툗�ゅ끀寧� 10 轝←쪝�덃룓雅ㅵ릮曆삣뒥�꾣��됧�穩▽�壅룩˙�볟똿�� 野밥틢��빳�볟똿�꾢폊�ⓨ뭽野배괌�꾣빊�뤸깹�됪삇簾�쉪�먨댍��" #. type: Labeled list #: en/git-bundle.txt:107 #, ignore-ellipsis, no-wrap, priority:100 msgid "[<refname>...]" -msgstr "" +msgstr "[<凉뺟뵪��>...]" #. type: Plain text #: en/git-bundle.txt:113 #, priority:100 msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')." -msgstr "" +msgstr "�ⓧ틢�먨댍�ε몜�꾢룾�ⓨ폊�①쉪�쀨〃�귟퓳訝삭쫨��� 'git fetch' �됬뵪竊뚦츆躍뚧쐹�ゆ뵸�곈궍雅쏂쫨黎귞쉪凉뺟뵪竊뚩�뚥툖訝�若싨삸�끺릎�꾣��됧냵若뱄펷�②퓳燁띷깄�듕툔竊� 'git bundle' 弱긷깗 'git fetch-pack'竊됥��" #. type: Labeled list #: en/git-bundle.txt:120 @@ -11170,43 +11170,43 @@ msgstr "--version=<version>" #: en/git-bundle.txt:125 #, priority:100 msgid "Specify the bundle version. Version 2 is the older format and can only be used with SHA-1 repositories; the newer version 3 contains capabilities that permit extensions. The default is the oldest supported format, based on the hash algorithm in use." -msgstr "" +msgstr "�뉐츣�녺퍚�끿쉪�덃쑍�� �덃쑍 2 ��푵�곭쉪�쇔폀竊뚦룵�썹뵪雅� SHA-1 餓볟틩竊쏂푵�곁쉪�덃쑍 3 �끻맜�곮��⒴콝�꾢뒣�썬�귡퍡溫ㅶ삸���ㅸ�곭쉪��똻�쇔폀竊뚦읃雅롣슴�ⓧ릎�꾢뱢躍뚨츞力뺛��" #. type: Plain text #: en/git-bundle.txt:130 en/git-pack-objects.txt:216 #, priority:100 msgid "This flag makes the command not to report its progress on the standard error stream." -msgstr "" +msgstr "瓦쇾릉�뉐퓱鵝욕뫝餓ㅴ툖�ⓩ젃�녽뵗瑥�탛訝�뒫�듿끀瓦쎾벧��" #. type: Title - #: en/git-bundle.txt:132 #, no-wrap, priority:100 msgid "SPECIFYING REFERENCES" -msgstr "" +msgstr "�뉐츣凉뺟뵪" #. type: Plain text #: en/git-bundle.txt:136 #, priority:100 msgid "Revisions must be accompanied by reference names to be packaged in a bundle." -msgstr "" +msgstr "岳��恙낂』�꾣쐣凉뺟뵪�띸㎞竊뚧뎺�썸돀�끾닇�녺퍚�끹��" #. type: Plain text #: en/git-bundle.txt:140 #, priority:100 msgid "More than one reference may be packaged, and more than one set of prerequisite objects can be specified. The objects packaged are those not contained in the union of the prerequisites." -msgstr "" +msgstr "��빳�볟똿訝�訝や빳訝딁쉪凉뺟뵪竊뚥튋��빳�뉐츣訝�瀯꾡빳訝딁쉪�덂넶�▽뻑野배괌�� 熬ユ돀�끿쉪野배괌��궍雅쎽툖�끻맜�ⓨ뀍�녔씉餓띄퍍�덁릎�꾢�穩▲��" #. type: Plain text #: en/git-bundle.txt:145 #, priority:100 msgid "The 'git bundle create' command resolves the reference names for you using the same rules as `git rev-parse --abbrev-ref=loose`. Each prerequisite can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)." -msgstr "" +msgstr "'git bundle create' �썰빱鵝욜뵪訝� `git rev-parse --abbrev-ref=loose' �멨릪�꾥쭊�쇾맏�②㎗�먨폊�ⓨ릫燁겹�귝캀訝ゅ뀍�녔씉餓띌꺗��빳�롧‘�뉐츣竊덁풃倻�`^master~10`竊됵펽�뽬�낂쉺�ュ쑑�뉐츣竊덁풃倻� `master~10...master`竊�`--since=10.day.after master`竊됥��" #. type: Plain text #: en/git-bundle.txt:148 #, priority:100 msgid "All of these simple cases are OK (assuming we have a \"master\" and \"next\" branch):" -msgstr "" +msgstr "���됭퓳雅쏁��뺟쉪�끻넻�썸깹�됮뿮窯섓펷�뉓��묇뺄�됦�訝� \"master\" �� \"next\" �녷뵱竊됵폏" #. type: delimited block - #: en/git-bundle.txt:154 @@ -11216,13 +11216,13 @@ msgid "" "$ echo master | git bundle create master.bundle --stdin\n" "$ git bundle create master-and-next.bundle master next\n" "$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin\n" -msgstr "" +msgstr "$ git bundle create master.bundle master\n$ echo master | git bundle create master.bundle --stdin\n$ git bundle create master-and-next.bundle master next\n$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin\n" #. type: Plain text #: en/git-bundle.txt:157 #, priority:100 msgid "And so are these (and the same but omitted `--stdin` examples):" -msgstr "" +msgstr "瓦쇾틳阿잍삸倻귝�竊덅퓲�됬쎑�뚨쉪鵝녺쐛�δ틙 `--stdin` �꾡풃耶먲펹竊�" #. type: delimited block - #: en/git-bundle.txt:161 @@ -11230,13 +11230,13 @@ msgstr "" msgid "" "$ git bundle create recent-master.bundle master~10..master\n" "$ git bundle create recent-updates.bundle master~10..master next~5..next\n" -msgstr "" +msgstr "$ git bundle create recent-master.bundle master~10..master\n$ git bundle create recent-updates.bundle master~10..master next~5..next\n" #. type: Plain text #: en/git-bundle.txt:165 #, priority:100 msgid "A revision name or a range whose right-hand-side cannot be resolved to a reference is not accepted:" -msgstr "" +msgstr "訝띷렏�쀤엶溫℡릫燁경닑�뜹뤂堊㏛툖�썼˙鰲f옄訝뷴폊�①쉪�껃쎍竊�" #. type: delimited block - #: en/git-bundle.txt:171 @@ -11246,19 +11246,19 @@ msgid "" "fatal: Refusing to create empty bundle.\n" "$ git bundle create master-yesterday.bundle master~10..master~5\n" "fatal: Refusing to create empty bundle.\n" -msgstr "" +msgstr "$ git bundle create HEAD.bundle $(git rev-parse HEAD)\nfatal: Refusing to create empty bundle.\n$ git bundle create master-yesterday.bundle master~10..master~5\nfatal: Refusing to create empty bundle.\n" #. type: Title - #: en/git-bundle.txt:174 -#, no-wrap, priority:100 +#, fuzzy, no-wrap, priority:100 msgid "OBJECT PREREQUISITES" -msgstr "" +msgstr "野배괌�꾢뀍�녔씉餓�" #. type: Plain text #: en/git-bundle.txt:180 #, priority:100 msgid "When creating bundles it is possible to create a self-contained bundle that can be unbundled in a repository with no common history, as well as providing negative revisions to exclude objects needed in the earlier parts of the history." -msgstr "" +msgstr "�ⓨ닗兩뷸뜂瀯묈똿�띰펽��빳�쎾뻠訝�訝ょ떖塋뗧쉪�녺퍚�낉펽��빳�ⓩ깹�됧뀻�뚦럣�꿰쉪�덃쑍佯볞릎鰲g퍚竊뚥튋��빳�먧풘兀잋엶溫�펽餓ζ럲�ㅵ럣�꿩뿩�잓깿�녷����꾢�穩▲��" #. type: Plain text #: en/git-bundle.txt:185 @@ -11276,7 +11276,7 @@ msgstr "$ git bundle create mybundle -10 master\n" #: en/git-bundle.txt:193 #, priority:100 msgid "A revision range such as `old..new` will produce a bundle file that will require the revision `old` (and any objects reachable from it) to exist for the bundle to be \"unbundle\"-able:" -msgstr "" +msgstr "��`git bundle create` 渦볟뀯瑥멨쫩 `new` 瓦숁졆�꾡엶溫®뎵弱녶닗兩뷰�訝ゆ뜂瀯묈똿�뉏뻑竊뚦끀訝�똿�ユ��됦퍗 `new` 岳���덂룾餓ε댆渦양쉪野배괌�귝뜂瀯묈똿�뉏뻑��빳�ⓧ뻣鵝뺜퍜佯볞릎鰲g퍚竊뚥빳�룟풓�싧� `new` �덃쑍�꾢츑�닷럣�뀐폏" #. type: delimited block - #: en/git-bundle.txt:196 @@ -11288,37 +11288,37 @@ msgstr "$ git bundle create mybundle v1.0.0..master\n" #: en/git-bundle.txt:201 #, priority:100 msgid "A self-contained bundle without any prerequisites can be extracted into anywhere, even into an empty repository, or be cloned from (i.e., `new`, but not `old..new`)." -msgstr "" +msgstr "訝�訝ゆ깹�됦뻣鵝뺝뀍�녔씉餓띄쉪�х쳦饔�뻑�끻룾餓θ˙�먨룚�겻뻣鵝뺝쑑�뱄펽�싪눛��빳�먨룚�겻�訝ょ㈉�꾡퍜佯볞릎竊뚧닑�낁˙�뗩쉮�뷸씎竊덂뜵 `new`竊뚥퐜訝띷삸 `old..new`竊됥��" #. type: Plain text #: en/git-bundle.txt:205 #, priority:100 msgid "It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination." -msgstr "" +msgstr "瘟ⓩ뀕烏뚥틟��룾餓η쉪竊뚥슴�녺퍚�뉏뻑�끻맜藥꿰퍘�①쎅�꾢쑑�꾢�穩∽펽�졽맏�①쎅�꾢쑑鰲e똿�띈퓳雅쎾�穩▽폏熬ュ옙�γ��" #. type: Plain text #: en/git-bundle.txt:211 #, priority:100 msgid "If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`." -msgstr "" +msgstr "倻귝옖鵝졿꺍�백뀓 `git clone --mirror`竊뚩퓳弱녶똿�т퐷�� refs 倻� `refs/remotes/*`竊뚥슴�� `--all`�� 倻귝옖鵝졿꺍�먧풘訝롧쎍�δ퍗繹먪쟻佯볟뀑�녶풓�곁쉪�멨릪�꾢폊�⑨펽鵝욜뵪 `--branches --tags` 鵝쒍맏 `<git-rev-list-args>`��" #. type: Plain text #: en/git-bundle.txt:215 #, priority:100 msgid "The 'git bundle verify' command can be used to check whether your recipient repository has the required prerequisite commits for a bundle." -msgstr "" +msgstr "'git bundle verify' �썰빱��빳�ⓩ씎汝��δ퐷�꾣렏�뜹틩��맔�됦�訝ゆ뜂瀯묈똿�����꾢뀍�녔씉餓뜻룓雅ㅳ��" #. type: Plain text #: en/git-bundle.txt:224 #, priority:100 msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1." -msgstr "" +msgstr "�뉓�鵝졿꺍�� A �뷴솳訝딁쉪�덃쑍佯� R1 �꾢럣�꿱�壤뺠쉬燁삣댆 B �뷴솳訝딁쉪�╊�訝ょ뎵�у틩 R2�귞뵳雅롦윇燁띶렅�좑펽A �� B 阿뗩뿴訝띶뀅溫며쎍�θ퓹�ο펽鵝녷닊餓у룾餓ι�싪퓝�먪쭕�뷴댍竊뉱D�곭뵷耶먬궙餓띄춬竊됪뒍�경뜮餓� A 饔х㎉�� B�� �묇뺄�녕뵪 R1 訝�쉪�녷뵱 master 訝딁쉪凉��묉씎�닸뼭 R2��" #. type: Plain text #: en/git-bundle.txt:229 #, priority:100 msgid "To bootstrap the process, you can first create a bundle that does not have any prerequisites. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:" -msgstr "" +msgstr "訝뷰틙��뒯瓦쇾릉瓦뉒쮮竊뚥퐷��빳�덂닗兩뷰�訝ゆ깹�됦뻣鵝뺝뀍�녔씉餓띄쉪�녺퍚�끹�귚퐷��빳鵝욜뵪訝�訝ゆ젃嶺얏씎溫겻퐦鵝졿��롥쨪�녺쉪�먧벡竊뚥빳�밥씩餓ε릮�ⓨ쥭�뤹쉪�녺퍚�끾씎�닸뼭�뜸퍟餓볟틩竊�" #. type: delimited block - #: en/git-bundle.txt:234 @@ -11327,25 +11327,25 @@ msgid "" "machineA$ cd R1\n" "machineA$ git bundle create file.bundle master\n" "machineA$ git tag -f lastR2bundle master\n" -msgstr "" +msgstr "machineA$ cd R1\nmachineA$ git bundle create file.bundle master\nmachineA$ git tag -f lastR2bundle master\n" #. type: Plain text #: en/git-bundle.txt:239 #, priority:100 msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:" -msgstr "" +msgstr "�뜹릮鵝졿뒍 file.bundle 鴉좄풏�곁쎅�뉑쑛�� B�귛썱訝븃퓳訝ゆ뜂瀯묈똿訝띺�誤곫룓�뽨뻣鵝뺟렟�됬쉪野배괌竊뚥퐷��빳�싪퓝�뗩쉮若껃쑉�뷴솳 B 訝듿닗兩뷰�訝ゆ뼭�꾡퍜佯볩폏" #. type: delimited block - #: en/git-bundle.txt:242 #, no-wrap, priority:100 msgid "machineB$ git clone -b master /home/me/tmp/file.bundle R2\n" -msgstr "" +msgstr "�뷴솳 B $ git clone -b master /home/me/tmp/file.bundle R2\n" #. type: Plain text #: en/git-bundle.txt:247 #, priority:100 msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:" -msgstr "" +msgstr "瓦쇿컛�①뵟�먪쉪�덃쑍佯볞릎若싦퉱訝�訝ゅ릫訝� \"origin\" �꾥퓶葉뗰펽溫⒳퐷餓롦뜂瀯묈똿訝�렩�뽩뭽�됧룚�괨2 訝�쉪 $GIT_DIR/config �뉏뻑弱녷쐣訝�訝よ퓳�루쉪�←쎅竊�" #. type: delimited block - #: en/git-bundle.txt:252 @@ -11363,13 +11363,13 @@ msgstr "" #: en/git-bundle.txt:257 #, priority:100 msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates." -msgstr "" +msgstr "誤곫쎍�겻벨�잏쉪 mine.git 餓볟틩竊뚥퐷��빳�①뵪罌욇뇧�닸뼭�욘뜟耶섇궓�� /home/me/tmp/file.bundle �꾣뜂瀯묈똿�롥룚�ⓩ닑�됧룚��" #. type: Plain text #: en/git-bundle.txt:260 #, priority:100 msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:" -msgstr "" +msgstr "�ⓨ렅冶뗤퍜佯볞릎�띶램鵝쒍�餘득뿶�닷릮竊뚥퐷��빳�쎾뻠訝�訝ゅ쥭�뤷똿�ζ쎍�겼룱訝�訝ょ뎵�у틩竊�" #. type: delimited block - #: en/git-bundle.txt:265 @@ -11378,13 +11378,13 @@ msgid "" "machineA$ cd R1\n" "machineA$ git bundle create file.bundle lastR2bundle..master\n" "machineA$ git tag -f lastR2bundle master\n" -msgstr "" +msgstr "�뷴솳 A $ cd R1\n�뷴솳 A $ git bundle create file.bundle lastR2bundle..master\n�뷴솳 A $ git tag -f lastR2bundle master\n" #. type: Plain text #: en/git-bundle.txt:269 #, priority:100 msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it." -msgstr "" +msgstr "�뜹릮鵝졿뒍�녺퍚�낁쉬燁삣댆�╊��경쑛�ⓧ툓竊뚥빳�뽨빰 /home/me/tmp/file.bundle竊뚦뭉餓롥끀訝�룓�뽧��" #. type: delimited block - #: en/git-bundle.txt:273 @@ -11392,19 +11392,19 @@ msgstr "" msgid "" "machineB$ cd R2\n" "machineB$ git pull\n" -msgstr "" +msgstr "�뷴솳 B $ cd R2\n�뷴솳 B $ git pull\n" #. type: Plain text #: en/git-bundle.txt:281 #, priority:100 msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the prerequisites, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:" -msgstr "" +msgstr "倻귝옖鵝좂윥�볣쥋�잏쉪�ζ뵸佯볟틪瑥ε쑉�ゆА�먧벡訝�떏�됧퓚誤곭쉪野배괌竊뚥퐷��빳�②퓳雅쏁윥瑥녷씎�뉐츣�덂넶�▽뻑竊뚨퍢�뷰�訝ゆ닼閭®궧�ι솏�뜸벨�잏쉪�녺퍚�끺릎�꾡엶溫℡뭽野배괌�귛뎺�®쉪堊뗥춴訝뷸�鵝욜뵪雅� lastR2bundle �뉒�竊뚥퐜鵝졽튋��빳鵝욜뵪餓삡퐬�뜸퍟�됮」竊뚦갚�뤶퐷瀯� linkgit:git-log[1] �썰빱�꾦궍�룔�귟퓳�뚧쐣�닷쩀�꾡풃耶먲폏" #. type: Plain text #: en/git-bundle.txt:283 #, priority:100 msgid "You can use a tag that is present in both:" -msgstr "" +msgstr "鵝졾룾餓δ슴�ⓧ�訝ゅ쑉訝ㅸ�끺릎�썲춼�①쉪�뉒�竊�" #. type: delimited block - #: en/git-bundle.txt:286 @@ -11416,7 +11416,7 @@ msgstr "$ git bundle create mybundle v1.0.0..master\n" #: en/git-bundle.txt:289 #, priority:100 msgid "You can use a prerequisite based on time:" -msgstr "" +msgstr "鵝졾룾餓δ슴�ⓨ읃雅롦뿶�당쉪�덂넶�▽뻑竊�" #. type: delimited block - #: en/git-bundle.txt:292 @@ -11428,7 +11428,7 @@ msgstr "$ git bundle create mybundle --since=10.days master\n" #: en/git-bundle.txt:295 #, priority:100 msgid "You can use the number of commits:" -msgstr "" +msgstr "鵝졾룾餓δ슴�ⓩ룓雅ㅷ쉪�곈뇧竊�" #. type: delimited block - #: en/git-bundle.txt:298 @@ -11440,7 +11440,7 @@ msgstr "$ git bundle create mybundle -10 master\n" #: en/git-bundle.txt:302 #, priority:100 msgid "You can run `git-bundle verify` to see if you can extract from a bundle that was created with a prerequisite:" -msgstr "" +msgstr "鵝졾룾餓θ퓧烏� `git-bundle verify` �η쐦�뗤퐷��맔��빳餓롣�訝ょ뵪�덂넶�▽뻑�쎾뻠�꾢똿訝�룓�뽳폏" #. type: delimited block - #: en/git-bundle.txt:305 @@ -11452,13 +11452,13 @@ msgstr "$ git bundle verify mybundle\n" #: en/git-bundle.txt:309 #, priority:100 msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them." -msgstr "" +msgstr "瓦쇿컛�쀥눣鵝졾퓚窈삥쐣�や틳�먧벡�띹꺗餓롦뜂瀯묈똿訝�룓�뽳펽倻귝옖鵝졿깹�됭퓳雅쎿룓雅ㅵ갚鴉싧눣�쇻��" #. type: Plain text #: en/git-bundle.txt:313 #, priority:100 msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:" -msgstr "" +msgstr "餓롦렏�띈�끺퍜佯볡쉪鰲믣벧�η쐦竊뚥�訝ゆ뜂瀯묈똿弱긷깗訝�訝ゆ솹�싩쉪餓볟틩竊뚦츆餓롩궍�뚩렩�뽪닑�됧룚�귚풃倻귨펽鵝졾룾餓ε쑉�룟룚�꾣뿶�숁삝弱꾢폊�⑨폏" #. type: delimited block - #: en/git-bundle.txt:316 @@ -11470,7 +11470,7 @@ msgstr "$ git fetch mybundle master:localRef\n" #: en/git-bundle.txt:319 #, priority:100 msgid "You can also see what references it offers:" -msgstr "" +msgstr "鵝졽튋��빳�뗧쐦若껅룓堊쎾벆雅쎾폊�⑨폏" #. type: delimited block - #: en/git-bundle.txt:322 @@ -11568,7 +11568,7 @@ msgstr "" #: en/git-cat-file.txt:60 en/git.txt:409 #, no-wrap, priority:100 msgid "<type>" -msgstr "" +msgstr "<映삣엹>" #. type: Plain text #: en/git-cat-file.txt:67 @@ -12179,7 +12179,7 @@ msgstr "" #: en/git-cat-file.txt:388 en/git-for-each-ref.txt:417 en/git-format-patch.txt:758 en/git-svn.txt:998 #, no-wrap, priority:100 msgid "CAVEATS" -msgstr "" +msgstr "力ⓩ꼷雅뗩」" #. type: Plain text #: en/git-cat-file.txt:396 en/git-for-each-ref.txt:425 @@ -12203,7 +12203,7 @@ msgstr "git-check-attr(1)" #: en/git-check-attr.txt:7 #, priority:100 msgid "git-check-attr - Display gitattributes information" -msgstr "" +msgstr "git-check-attr - �양ㅊ gitattributes 岳→겘" #. type: Plain text #: en/git-check-attr.txt:14 @@ -12211,13 +12211,13 @@ msgstr "" msgid "" "'git check-attr' [--source <tree-ish>] [-a | --all | <attr>...] [--] <pathname>...\n" "'git check-attr' --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]\n" -msgstr "" +msgstr "'git check-attr' [--source <�묊듁野배괌>] [-a | --all | <掠욄��>...] [--] <瓮�푶��>...\n'git check-attr' --stdin [-z] [--source <�묊듁野배괌>] [-a | --all | <掠욄��>...]\n" #. type: Plain text #: en/git-check-attr.txt:19 #, priority:100 msgid "For every pathname, this command will list if each attribute is 'unspecified', 'set', or 'unset' as a gitattribute on that pathname." -msgstr "" +msgstr "野밥틢驪뤶릉瓮�푶�랃펽瑥ε뫝餓ㅵ컛�쀥눣驪뤶릉掠욄�㎪삸�╊맏 �쒏쑋�뉐츣�앫�곣�쒎럴溫양쉰�� �� �쒏쑋溫양쉰�앾펽鵝쒍맏瑥θ러孃꾢릫�� gitattribute��" #. type: Labeled list #: en/git-check-attr.txt:22 @@ -12229,7 +12229,7 @@ msgstr "-a, --all" #: en/git-check-attr.txt:26 #, priority:100 msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output." -msgstr "" +msgstr "�쀥눣訝롦뙁若싪러孃꾤쎑�녕쉪���됧콪�㎯�� 倻귝옖鵝욜뵪瓦쇾릉�됮」竊뚪궍阿� �쒏쑋�뉐츣�꾟�� 掠욄�㎩컛訝띶똿�у쑉渦볟눣訝���" #. type: Plain text #: en/git-check-attr.txt:29 @@ -14392,7 +14392,7 @@ msgstr "" #: en/git-cherry-pick.txt:162 en/git-revert.txt:127 #, no-wrap, priority:100 msgid "SEQUENCER SUBCOMMANDS" -msgstr "" +msgstr "佯뤷닓�ⓨ춴�썰빱" #. type: Labeled list #: en/git-cherry-pick.txt:167 @@ -14404,13 +14404,13 @@ msgstr "`git cherry-pick master`" #: en/git-cherry-pick.txt:171 #, priority:100 msgid "Apply the change introduced by the commit at the tip of the master branch and create a new commit with this change." -msgstr "" +msgstr "佯붺뵪訝삣늽��《塋�쉪�먧벡��凉뺝뀯�꾡엶�뱄펽亮뜸빳瓦쇾릉岳�뵻�쎾뻠訝�訝ゆ뼭�꾣룓雅ㅳ��" #. type: Labeled list #: en/git-cherry-pick.txt:172 #, no-wrap, priority:100 msgid "`git cherry-pick ..master`" -msgstr "" +msgstr "`git cherry-pick ..master`" #. type: Labeled list #: en/git-cherry-pick.txt:173 @@ -14422,25 +14422,25 @@ msgstr "`git cherry-pick ^HEAD master`" #: en/git-cherry-pick.txt:177 #, priority:100 msgid "Apply the changes introduced by all commits that are ancestors of master but not of HEAD to produce new commits." -msgstr "" +msgstr "佯붺뵪���됧콪雅� master 鵝녵툖掠욂틢 HEAD �꾤쪝�덄쉪�먧벡��躍�씎�꾢룜�뽳펽雅㎫뵟�곁쉪�먧벡��" #. type: Labeled list #: en/git-cherry-pick.txt:178 #, no-wrap, priority:100 msgid "`git cherry-pick maint next ^master`" -msgstr "" +msgstr "`git cherry-pick maint next ^master`" #. type: Labeled list #: en/git-cherry-pick.txt:179 #, no-wrap, priority:100 msgid "`git cherry-pick maint master..next`" -msgstr "" +msgstr "`git cherry-pick maint master..next`" #. type: Plain text #: en/git-cherry-pick.txt:186 #, priority:100 msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors. Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`." -msgstr "" +msgstr "佯붺뵪���됧콪雅� maint �� next �꾤쪝�덄쉪�먧벡��躍�씎�꾢룜�뽳펽鵝녵툖�끾떖 master �뽩끀餓삡퐬曄뽩뀍�� 力ⓩ꼷竊뚦릮�끺툖��뙁 `maint` �� `master` 訝� `next` 阿뗩뿴�꾡��뉛폑�룝퐪�θ�竊뚦쫩�� `maint` �끻맜�� `master` 訝�펽�쇾툖鴉싪˙鵝욜뵪��" #. type: Labeled list #: en/git-cherry-pick.txt:187 @@ -14452,7 +14452,7 @@ msgstr "`git cherry-pick master~4 master~2`" #: en/git-cherry-pick.txt:192 #, priority:100 msgid "Apply the changes introduced by the fifth and third last commits pointed to by master and create 2 new commits with these changes." -msgstr "" +msgstr "佯붺뵪 master �뉐릲�꾤К雅붹А�뚧��롧К訝됪А�먧벡��躍�씎�꾢룜�뽳펽亮뜻졊��퓳雅쎾룜�뽩닗兩뷰륵訝ゆ뼭�꾣룓雅ㅳ��" #. type: Labeled list #: en/git-cherry-pick.txt:193 @@ -14464,7 +14464,7 @@ msgstr "`git cherry-pick -n master~1 next`" #: en/git-cherry-pick.txt:199 #, priority:100 msgid "Apply to the working tree and the index the changes introduced by the second last commit pointed to by master and by the last commit pointed to by next, but do not create any commit with these changes." -msgstr "" +msgstr "�ⓨ램鵝쒎뙷�뚨뇨凉뺜릎佯붺뵪 master �뉐릲�꾢�믤빊寧т틠訝ゆ룓雅ㅵ뭽 next �뉐릲�꾣��롣�訝ゆ룓雅ㅶ�躍�씎�꾢룜�뽳펽鵝녵툖誤곭뵪瓦쇾틳�섇뙑�쎾뻠餓삡퐬�먧벡��" #. type: Labeled list #: en/git-cherry-pick.txt:200 @@ -14476,7 +14476,7 @@ msgstr "`git cherry-pick --ff ..next`" #: en/git-cherry-pick.txt:207 #, priority:100 msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next. Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change." -msgstr "" +msgstr "倻귝옖�녶뤁��봇�㎫쉪竊뚦뭉訝� HEAD �� next �꾤쪝�덌펽�숁쎍�겼램鵝쒎뙷亮뜹컛 HEAD �뉔뭹�묈뎺�②퓵餓ε뙶�� next�� ��닕竊뚦컛�d틳�� next 鵝녵툖�� HEAD 訝�쉪�먧벡��躍�씎�꾢룜�뽩틪�ⓨ댆壤볟뎺�녷뵱竊뚥맏驪뤶릉�겼룜�뽩닗兩뷰�訝ゆ뼭�꾣룓雅ㅳ��" #. type: Labeled list #: en/git-cherry-pick.txt:208 @@ -14488,13 +14488,13 @@ msgstr "`git rev-list --reverse master -- README | git cherry-pick -n --stdin`" #: en/git-cherry-pick.txt:214 #, priority:100 msgid "Apply the changes introduced by all commits on the master branch that touched README to the working tree and index, so the result can be inspected and made into a single new commit if suitable." -msgstr "" +msgstr "弱녵말亮꿨늽��툓���됭㏄�� README �꾣룓雅ㅶ�躍�씎�꾢룜�뽩틪�ⓨ댆藥δ퐳�뷴뭽榮℡폊訝�펽瓦숁졆弱긷룾餓ζ��η퍜�쒙펽亮뜹쑉�덆�귞쉪�뜹�쇿걳�먧�訝ゆ뼭�꾣룓雅ㅳ��" #. type: Plain text #: en/git-cherry-pick.txt:218 #, priority:100 msgid "The following sequence attempts to backport a patch, bails out because the code the patch applies to has changed too much, and then tries again, this time exercising more care about matching up context lines." -msgstr "" +msgstr "訝뗩씊�꾢틣�쀨캊�얍썮鴉졽�訝よ‥訝곻펽�졽맏烏δ툈���귞뵪�꾡빰�곩룜�뽩ㄺ鸚㏆펽��餓ζ붂凉껂틙竊뚨꽫�롥냽瑥뺜�轝∽펽瓦숁А野밥툓訝뗦뻼烏뚨쉪�백뀓�닷뒥瘟ⓩ뀕��" #. type: delimited block - #: en/git-cherry-pick.txt:224 @@ -14514,25 +14514,25 @@ msgstr "" #: en/git-cherry-pick.txt:229 #, priority:100 msgid "apply the change that would be shown by `git show topic^`. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results." -msgstr "" +msgstr "佯붺뵪弱녺뵳 `git show topic^` �양ㅊ�꾢룜�뽧�� �②퓳訝や풃耶먧릎竊뚩‥訝곫깹�됧묾���겼틪�⑨펽��餓ε넳囹곭쉪岳→겘熬ュ넍�η뇨凉뺝뭽藥δ퐳�묕펽亦→쐣�곁쉪�먧벡瀯볠옖��" #. type: Plain text #: en/git-cherry-pick.txt:230 #, priority:100 msgid "summarize changes to be reconciled" -msgstr "" +msgstr "�사퍜��誤곮컘�귞쉪�섇뙑" #. type: Plain text #: en/git-cherry-pick.txt:233 #, priority:100 msgid "cancel the cherry-pick. In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree." -msgstr "" +msgstr "�뽪텋 cherry-pick�� �℡룯瑥앲�竊뚩퓭�욃댆 cherry-pick �띸쉪�뜻�곻펽岳앯븰鵝졾쑉藥δ퐳�뷰툓�꾡뻣鵝뺞쑍�겻엶�밤��" #. type: Plain text #: en/git-cherry-pick.txt:236 #, priority:100 msgid "try to apply the change introduced by `topic^` again, spending extra time to avoid mistakes based on incorrectly matching context lines." -msgstr "" +msgstr "弱앲캊�띷А佯붺뵪�� `topic^` 凉뺝뀯�꾡엶�뱄펽�김뉩窯앭쨼�꾣뿶�닸씎�욕뀓�뷰틢訝띷�簾�뙶�띸쉪訝듾툔�뉓죱�꾦뵗瑥���" #. type: Title = #: en/git-cherry.txt:2 @@ -14544,7 +14544,7 @@ msgstr "git-cherry(1)" #: en/git-cherry.txt:7 #, priority:100 msgid "git-cherry - Find commits yet to be applied to upstream" -msgstr "" +msgstr "git-cherry - �ζ돻弱싨쑋佯붺뵪雅롣툓歷며쉪�먧벡�끻�" #. type: Plain text #: en/git-cherry.txt:12 @@ -14556,19 +14556,19 @@ msgstr "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n" #: en/git-cherry.txt:17 #, priority:100 msgid "Determine whether there are commits in `<head>..<upstream>` that are equivalent to those in the range `<limit>..<head>`." -msgstr "" +msgstr "簾�츣 `<head>...<upstream>` 訝�삸��쐣訝� `<limit>...<head>` �껃쎍�끿쉪�먧벡�며춬��" #. type: Plain text #: en/git-cherry.txt:22 #, priority:100 msgid "The equivalence test is based on the diff, after removing whitespace and line numbers. git-cherry therefore detects when commits have been \"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-rebase[1]." -msgstr "" +msgstr "�졿�竊똤it-cherry �싪퓝 linkgit:git-cherry-pick[1]�걄inkgit:git-am[1] �� linkgit:git-rebase[1] �ζ�役뗦룓雅ㅶ삸��˙ �쒎쨳�뜯�� 雅녴��" #. type: Plain text #: en/git-cherry.txt:26 #, priority:100 msgid "Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for commits that have an equivalent in <upstream>, and `+` for commits that do not." -msgstr "" +msgstr "渦볟눣 `<limit>...<head>` 訝�캀訝ゆ룓雅ㅷ쉪 SHA1竊뚦�雅롥쑉 <upstream> 訝�쐣野밧틪�꾣룓雅ㅿ펽餓� `-` 訝뷴뎺煐�竊뚦�雅롦깹�됧�佯붺쉪�먧벡竊뚥빳 `+` 訝뷴뎺煐���" #. type: Plain text #: en/git-cherry.txt:31 @@ -14586,7 +14586,7 @@ msgstr "<upstream>" #: en/git-cherry.txt:35 #, priority:100 msgid "Upstream branch to search for equivalent commits. Defaults to the upstream branch of HEAD." -msgstr "" +msgstr "�� SHA1 �곮씁�양ㅊ�먧벡訝삯쥦��" #. type: Labeled list #: en/git-cherry.txt:36 en/git.txt:429 @@ -14598,25 +14598,25 @@ msgstr "<head>" #: en/git-cherry.txt:38 #, priority:100 msgid "Working branch; defaults to HEAD." -msgstr "" +msgstr "藥δ퐳�녷뵱竊쏃퍡溫ㅴ맏 HEAD��" #. type: Plain text #: en/git-cherry.txt:41 #, priority:100 msgid "Do not report commits up to (and including) limit." -msgstr "" +msgstr "訝띷뒫�딂씨�곤펷�뚦똿�э펹�곲솏�꾣룓雅ㅳ��" #. type: Title ~ #: en/git-cherry.txt:46 #, no-wrap, priority:100 msgid "Patch workflows" -msgstr "" +msgstr "烏δ툈藥δ퐳役곭쮮" #. type: Plain text #: en/git-cherry.txt:52 #, priority:100 msgid "git-cherry is frequently used in patch-based workflows (see linkgit:gitworkflows[7]) to determine if a series of patches has been applied by the upstream maintainer. In such a workflow you might create and send a topic branch like this:" -msgstr "" +msgstr "git-cherry 躍며뵪雅롥읃雅롨‥訝곭쉪藥δ퐳役곭쮮竊덅쭅 linkgit:gitworkflows[7]竊됵펽餓η‘若싦�楹삣닓烏δ툈��맔藥꿱˙訝딀만瀯닸뒪�끻틪�ⓦ�� �②퓳�루쉪藥δ퐳役곭쮮訝�펽鵝졾룾�썰폏�쎾뻠亮뜹룕�곦�訝ょ굳鴉쇠퓳�루쉪訝삯쥦�녷뵱竊�" #. type: delimited block - #: en/git-cherry.txt:58 @@ -14636,7 +14636,7 @@ msgstr "" #: en/git-cherry.txt:62 #, priority:100 msgid "Later, you can see whether your changes have been applied by saying (still on `topic`):" -msgstr "" +msgstr "�롦씎竊뚥퐷��빳�싪퓝瑥댐펷餓띸꽫��쑉 `topic`訝딉펹�뗥댆鵝좂쉪岳�뵻��맔熬ュ틪�⑨폏" #. type: delimited block - #: en/git-cherry.txt:66 @@ -14658,7 +14658,7 @@ msgstr "Concrete example" #: en/git-cherry.txt:73 #, priority:100 msgid "In a situation where topic consisted of three commits, and the maintainer applied two of them, the situation might look like:" -msgstr "" +msgstr "倻귝옖瑥앶쥦�긴툒訝ゆ룓雅ㅷ퍍�먲펽�뚨뺨�ㅸ�끻틪�ⓧ틙�뜸릎�꾡륵訝ゆ룓雅ㅿ펽�끻넻��꺗��퓳�루쉪竊�" #. type: delimited block - #: en/git-cherry.txt:86 @@ -14675,13 +14675,13 @@ msgid "" "| * aaaa000 commit A\n" "|/\n" "o 1234567 branch point\n" -msgstr "" +msgstr "$ git log --graph --oneline --decorate --boundary origin/master...topic\n* 7654321 (origin/master) upstream tip commit\n[... snip some other commits ...]\n* cccc111 cherry-pick of C\n* aaaa111 cherry-pick of A\n[... snip a lot more that has happened ...]\n| * cccc000 (topic) commit C\n| * bbbb000 commit B\n| * aaaa000 commit A\n|/\no 1234567 branch point\n" #. type: Plain text #: en/git-cherry.txt:90 #, priority:100 msgid "In such cases, git-cherry shows a concise summary of what has yet to be applied:" -msgstr "" +msgstr "�②퓳燁띷깄�듕툔竊똤it-cherry 鴉싨샑鹽뷰�訝ょ��롧쉪�섋쫨竊뚩��롨퓲�됧벆雅쎾쑑�백�誤곩틪�⑨폏" #. type: delimited block - #: en/git-cherry.txt:96 @@ -14701,19 +14701,19 @@ msgstr "" #: en/git-cherry.txt:102 #, priority:100 msgid "Here, we see that the commits A and C (marked with `-`) can be dropped from your `topic` branch when you rebase it on top of `origin/master`, while the commit B (marked with `+`) still needs to be kept so that it will be sent to be applied to `origin/master`." -msgstr "" +msgstr "�②퓳�뚳펽�묇뺄�뗥댆竊뚦퐪鵝졾쑉 `origin/master` 阿뗤툓�띷뼭兩븀쳦�녷뵱�띰펽��빳餓� `topic` �녷뵱訝�닠�� A �� C竊덃젃�� `-`竊됵펽�� B竊덃젃�� `+`竊됦퍖�띌�誤곦퓷�숋펽瓦숁졆若껃갚鴉싪˙�묌�곩댆 `origin/master `訝듿틪�ⓦ��" #. type: Title ~ #: en/git-cherry.txt:105 #, no-wrap, priority:100 msgid "Using a limit" -msgstr "" +msgstr "鵝욜뵪訝�訝ら솏��" #. type: Plain text #: en/git-cherry.txt:110 #, priority:100 msgid "The optional <limit> is useful in cases where your topic is based on other work that is not in upstream. Expanding on the previous example, this might look like:" -msgstr "" +msgstr "���됬쉪 <�먨댍> �ⓧ퐷�꾡말窯섉삸�뷰틢�뜸퍟訝띶쑉訝딀만�꾢램鵝쒐쉪�끻넻訝뗥푽�됬뵪�� �ⓨ뎺�®쉪堊뗥춴�븀�訝딀돥掠뺧펽瓦쇿룾�썹쐦壅룡씎�륅폏" #. type: delimited block - #: en/git-cherry.txt:126 @@ -14733,13 +14733,13 @@ msgid "" "| * 0000aaa unpublished stuff A\n" "|/\n" "o 1234567 merge-base between upstream and topic\n" -msgstr "" +msgstr "$ git log --graph --oneline --decorate --boundary origin/master...topic\n* 7654321 (origin/master) upstream tip commit\n[... snip some other commits ...]\n* cccc111 cherry-pick of C\n* aaaa111 cherry-pick of A\n[... snip a lot more that has happened ...]\n| * cccc000 (topic) commit C\n| * bbbb000 commit B\n| * aaaa000 commit A\n| * 0000fff (base) unpublished stuff F\n[... snip ...]\n| * 0000aaa unpublished stuff A\n|/\no 1234567 merge-base between upstream and topic\n" #. type: Plain text #: en/git-cherry.txt:130 #, priority:100 msgid "By specifying `base` as the limit, you can avoid listing commits between `base` and `topic`:" -msgstr "" +msgstr "�싪퓝�뉐츣 `base` 鵝쒍맏�먨댍竊뚥퐷��빳�욕뀓�쀥눣 `base` �� `topic` 阿뗩뿴�꾣룓雅ㅿ폏" #. type: delimited block - #: en/git-cherry.txt:136 @@ -14765,7 +14765,7 @@ msgstr "git-citool(1)" #: en/git-citool.txt:7 #, priority:100 msgid "git-citool - Graphical alternative to git-commit" -msgstr "" +msgstr "git-citool �붴�� �요빰 git-commit �꾢쎗壤℡뙑藥ε끁" #. type: Plain text #: en/git-citool.txt:12 @@ -14777,7 +14777,7 @@ msgstr "'git citool'\n" #: en/git-citool.txt:19 #, priority:100 msgid "A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch. This interface is an alternative to the less interactive 'git commit' program." -msgstr "" +msgstr "訝�訝ゅ읃雅� Tcl/Tk �꾢쎗壤®븣��펽�ⓧ틢�η쐦岳�뵻瓦뉒쉪�뉏뻑竊뚦컛�뜻붂�η뇨凉뺧펽渦볟뀯�먧벡岳→겘竊뚦뭉弱녷뼭�꾣룓雅ㅸ�壤뺝댆壤볟뎺�녷뵱�� 瓦쇾릉�뚪씊���雅믣뒯�㎬푵藥�쉪 'git commit' 葉뗥틣�꾡�燁띷쎘餓c��" #. type: Plain text #: en/git-citool.txt:22 @@ -14807,49 +14807,49 @@ msgstr "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path #: en/git-clean.txt:18 #, priority:100 msgid "Cleans the working tree by recursively removing files that are not under version control, starting from the current directory." -msgstr "" +msgstr "餓롥퐪�띸쎅壤뺝�冶뗰펽�싪퓝�믣퐩�좈솮訝띶쑉�덃쑍�㎩댍阿뗤툔�꾣뻼餓뜻씎歷끿릤藥δ퐳�뷩��" #. type: Plain text #: en/git-clean.txt:22 #, priority:100 msgid "Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products." -msgstr "" +msgstr "�싧만�끻넻訝뗰펽�ゆ쐣 Git �ょ윥�꾣뻼餓뜸폏熬ュ닠�ㅿ펽鵝녶쫩�쒏뙁若싦틙 `-x` �됮」竊뚩˙恙썹븼�꾣뻼餓뜸튋鴉싪˙�좈솮�귚풃倻귨펽瓦쇿��좈솮���됪엫兩뷰벨�곩푽�됬뵪��" #. type: Plain text #: en/git-clean.txt:25 #, ignore-ellipsis, priority:100 msgid "If any optional `<pathspec>...` arguments are given, only those paths that match the pathspec are affected." -msgstr "" +msgstr "倻귝옖瀯쇿눣餓삡퐬���됬쉪`<瓮�푶鰲꾥똽>...`�귝빊竊뚦룵�됮궍雅쎽툗瓮�푶鰲꾥똽�멨뙶�띸쉪瓮�푶鴉싧룛�겼쉽�띲��" #. type: Plain text #: en/git-clean.txt:35 #, priority:100 msgid "Normally, when no <pathspec> is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. If a <pathspec> is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed." -msgstr "" +msgstr "�싧만竊뚦퐪亦→쐣�뉐츣 <瓮�푶鰲꾥똽> �띰펽git clean 訝띴폏�믣퐩�경쑋瓦썼릉�꾤쎅壤뺧펽餓ι겳�띶닠�ㅵㄺ鸚싥�� �뉐츣 -d ��빳溫⒴츆阿잓�믣퐩�계퓳雅쏁쎅壤뺛�� 倻귝옖�뉐츣雅�<瓮�푶鰲꾥똽>竊�-d 弱긴툖�띹쫨雅놅폑���됬Е�덃뙁若싪러孃꾤쉪�よ옙甕ゆ뻼餓띰펷`--force` 訝뗦룓�곁쉪葯뚦쪞�� git ��퐬�ㅵ쨼竊됧컛熬ュ닠�ㅳ��" #. type: Plain text #: en/git-clean.txt:43 #, priority:100 msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given." -msgstr "" +msgstr "倻귝옖 Git �띸쉰�섌뇧 clean.requireForce 亦→쐣溫양쉰訝� false竊�'git clean' 弱녷땼瀯앭닠�ㅶ뻼餓뜻닑��퐬竊뚪솮�욅퍢�� -f �� -i�� �ㅹ씆瀯쇿눣寧т틠訝� -f竊뚦맔�� Git 弱녷땼瀯앬엶�방쑋瓮잒릉�꾢탪也� git 餓볟틩竊덃쐣.git耶먪쎅壤뺟쉪��퐬竊됥��" #. type: Plain text #: en/git-clean.txt:48 #, priority:100 msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details." -msgstr "" +msgstr "�양ㅊ鴉싧걳餓�阿덌펽亮뜸빳雅ㅴ틨�밧폀歷끿릤�뉏뻑�귟�鰲� �쒍벡雅믤Æ凉뤴�앫��" #. type: Plain text #: en/git-clean.txt:52 #, priority:100 msgid "Don't actually remove anything, just show what would be done." -msgstr "" +msgstr "若욇솀訝듾툖誤곩닠�ㅴ뻣鵝뺜툥蜈울펽�ゆ삸�양ㅊ鴉싧걳餓�阿덀��" #. type: Plain text #: en/git-clean.txt:57 #, priority:100 msgid "Be quiet, only report errors, but not the files that are successfully removed." -msgstr "" +msgstr "誤곩츎�숋펽�ゆ뒫�딃뵗瑥�펽鵝녵툖�ε몜�먨뒣�좈솮�꾣뻼餓뜰��" #. type: Labeled list #: en/git-clean.txt:58 @@ -14867,7 +14867,7 @@ msgstr "--exclude=<pattern>" #: en/git-clean.txt:62 #, priority:100 msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])." -msgstr "" +msgstr "�ⓩ젃�녺쉪恙썹븼鰲꾢닕阿뗥쨼竊뚥슴�①퍢若싩쉪�믧솮與▼폀竊덅쭅 linkgit:gitignore[5]竊됥��" #. type: Plain text #: en/git-clean.txt:70 -- GitLab