diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index c63d2ad17a36a3b5294452ff9e8b0cc2b6274450..a6452c0c3e27774c30629f4e2ab935d4ca31c5b4 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,19 +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\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2023-02-26 14:06+0100\n" -"PO-Revision-Date: 2023-05-18 17:58+0000\n" -"Last-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: zh_HANS-CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-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-21 07: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 @@ -1616,8 +1604,8 @@ msgstr "" msgid "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]" -#. type: Plain text # �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁� +#. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 #, priority:100 msgid "Find symbolic names for given revs." @@ -5796,7 +5784,7 @@ msgstr "--default-prefix" #: en/diff-options.txt:859 #, priority:280 msgid "Use the default source and destination prefixes (\"a/\" and \"b/\"). This is usually the default already, but may be used to override config such as `diff.noprefix`." -msgstr "" +msgstr "鵝욜뵪容섋��꾣틦�뚨쎅�뉐뎺煐�竊�\"a/\"�� \"b/\"竊됥�� 瓦숅�싧만藥꿰퍘��퍡溫ㅷ쉪竊뚥퐜��빳�ⓩ씎誤녺썣�띸쉰竊뚦쫩 `diff.noprefix`��" #. type: Labeled list #: en/diff-options.txt:860 @@ -5982,7 +5970,7 @@ msgstr "--negotiate-only" #: en/fetch-options.txt:73 #, priority:220 msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server." -msgstr "" +msgstr "訝띴퍗�띶뒦�②렩�뽨뻣鵝뺜툥蜈울펽�뚧삸�볟뜲���먧풘�� `--negotiation-tip=*` �귝빊訝롦쐨�▼솳訝딁쉪�긷릪曄뽩뀍��" #. type: Plain text #: en/fetch-options.txt:77 @@ -6006,13 +5994,13 @@ msgstr "�양ㅊ鴉싧걳餓�阿덌펽�뚥툖�싦뻣鵝뺞뵻�섅��" #: en/fetch-options.txt:84 #, priority:220 msgid "Print the output to standard output in an easy-to-parse format for scripts. See section OUTPUT in linkgit:git-fetch[1] for details." -msgstr "" +msgstr "弱녻풏�븀퍜�쒍빳�볞틢鰲f옄�꾣졏凉뤸돀�겼댆�뉐뇛渦볟눣竊뚥풘�싨쑍鵝욜뵪�귟��낁쭅 linkgit:git-fetch[1] 訝�쉪渦볟눣�ⓨ늽��" #. type: Plain text #: en/fetch-options.txt:87 #, priority:220 msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes precedence over the `fetch.output` config option." -msgstr "" +msgstr "瓦쇾툗 `--recurse-submodules=[yes|on-demand]` �됮」訝띶끉若뱄펽亮뜸툝鴉섇뀍雅� `fetch.output` �띸쉰�됮」��" #. type: Labeled list #: en/fetch-options.txt:89 @@ -6042,7 +6030,7 @@ msgstr "--force" #: en/fetch-options.txt:101 #, priority:220 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed" -msgstr "" +msgstr "閭e쫩溫②��꾦궍�뤄펽壤� 'git fetch' 訝� `<src>:<dst>` 凉뺟뵪鰲꾥똽訝�壅룝슴�ⓩ뿶竊뚦츆��꺗鴉싨땼瀯앮쎍�경쑍�겼늽��" #. type: Plain text #: en/fetch-options.txt:104 @@ -6050,19 +6038,19 @@ msgstr "" msgid "" "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n" "\tdocumentation.\n" -msgstr "" +msgstr "\t�쮔inkgit:git-fetch[1]��`<凉뺟뵪鰲꾥똽>`�ⓨ늽��\n\t�뉑。訝���\n" #. type: Plain text #: en/fetch-options.txt:107 #, no-wrap, priority:220 msgid "\tin the `<refspec>` part below.\n" -msgstr "" +msgstr "\t�ⓧ툔�®쉪 `<凉뺟뵪鰲꾥똽>` �ⓨ늽��\n" #. type: Plain text #: en/fetch-options.txt:109 #, no-wrap, priority:220 msgid "\tThis option overrides that check.\n" -msgstr "" +msgstr "\t瓦쇾릉�됮」誤녺썣雅녻퓳訝ゆ��γ��\n" #. type: Labeled list #: en/fetch-options.txt:110 en/git-am.txt:44 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:86 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:177 en/git-stash.txt:189 @@ -6080,7 +6068,7 @@ msgstr "--keep" #: en/fetch-options.txt:113 #, priority:220 msgid "Keep downloaded pack." -msgstr "" +msgstr "岳앭춼訝뗨슬�꾢똿��" #. type: Labeled list #: en/fetch-options.txt:115 @@ -6092,7 +6080,7 @@ msgstr "--multiple" #: en/fetch-options.txt:118 #, priority:220 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified." -msgstr "" +msgstr "�곮��뉐츣�졽릉 <餓볟틩> �� <group> �귝빊�귚툖��빳�뉐츣 <凉뺟뵪鰲꾥똽>��" #. type: Labeled list #: en/fetch-options.txt:119 @@ -6110,7 +6098,7 @@ msgstr "--[no-]auto-gc" #: en/fetch-options.txt:124 #, priority:220 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) This is enabled by default." -msgstr "" +msgstr "�ⓩ��롨퓧烏� `git maintenance run --auto`竊뚥빳�③�誤곫뿶�㎬죱�ゅ뒯餓볟틩瀯닸뒪�귨펷訝� \"--[no-]auto-gc\" �됮」�덃옖訝��룔�귨펹瓦쇾릉�잒꺗容섋���뵪��" #. type: Labeled list #: en/fetch-options.txt:125 @@ -6122,7 +6110,7 @@ msgstr "--[no-]write-commit-graph" #: en/fetch-options.txt:128 #, priority:220 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`." -msgstr "" +msgstr "�②렩�뽩릮�쇾�訝ゆ룓雅ㅵ쎗�귟퓳鴉싪쫮�� `fetch.writeCommitGraph` �띸쉰�됮」��" #. type: Labeled list #: en/fetch-options.txt:130 @@ -6132,9 +6120,9 @@ msgstr "--prefetch" #. type: Plain text #: en/fetch-options.txt:134 -#, priority:220 +#, fuzzy, priority:220 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]." -msgstr "" +msgstr "岳�뵻�띸쉰�꾢폊�②쭊�껓펽弱녷��됧폊�ⓩ붂�� `refs/prefetch/` �썲릫令븅뿴訝��귛뢿鰲� linkgit:git-maintenance[1] 訝�쉪 `prefetch` 餓삣뒦��" #. type: Labeled list #: en/fetch-options.txt:136 en/git-push.txt:154 @@ -6146,13 +6134,13 @@ msgstr "--prune" #: en/fetch-options.txt:146 #, priority:220 msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec." -msgstr "" +msgstr "�②렩�뽨퉳�랃펽�좈솮餓삡퐬訝띶냽耶섇쑉雅롨퓶葉뗧쉪瓦쒐쮮瓮잒릉凉뺟뵪�� 倻귝옖�ゆ삸�졽맏容섋��꾣젃嶺얕눎�②퇎甕ゆ닑�끻썱訝� --tags �됮」�뚩렩�뽪젃嶺억펽�쇾툖��誤곩돦�앫�� �띈�뚳펽倻귝옖�뉒���뵳雅롦삇簾�쉪凉뺟뵪鰲꾥똽竊덃뿞溫뷸삸�ⓨ뫝餓ㅸ죱瓦섉삸�②퓶葉뗩뀓營�릎竊뚥풃倻귨펽倻귝옖瓦쒐쮮��뵪 --mirror �됮」�뗩쉮�꾬펹�뚩˙�룟룚�꾬펽�d퉰若껂뺄阿잋폏熬ュ돦�ㅳ�귝룓堊� `--prune-tags` ��룓堊쎿젃嶺얍폊�②쭊�껆쉪�잒��방퀡��" #. type: Plain text #: en/fetch-options.txt:149 en/fetch-options.txt:160 #, priority:220 msgid "See the PRUNING section below for more details." -msgstr "" +msgstr "�닷쩀瀯녻뒄鰲곦툔�®쉪 �ゆ옗 �ⓨ늽��" #. type: Labeled list #: en/fetch-options.txt:150 en/git-cvsexportcommit.txt:57 en/git-grep.txt:135 en/git.txt:135 en/rev-list-options.txt:97 @@ -6170,7 +6158,7 @@ msgstr "--prune-tags" #: en/fetch-options.txt:158 #, priority:220 msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation." -msgstr "" +msgstr "�②렩�뽨퉳�랃펽倻귝옖 `--prune` 熬ュ맦�⑨펽�쇿닠�ㅴ뻣鵝뺜툖�띶춼�ⓧ틢瓦쒐쮮�꾣쑍�경젃嶺얇�귟퓳訝ら�됮」佯붻��닺감�롣슴�⑨펽訝�`--prune`訝띶릪竊뚦츆弱녶닠�ㅴ뻣鵝뺝럴瀯뤷닗兩븀쉪�у쑑凉뺟뵪竊덃쑍�경젃嶺억펹�귟퓳訝ら�됮」��툗`--prune`訝�壅룡룓堊쎿삇簾�쉪�뉒�凉뺟뵪鰲꾥똽�꾦�잒�壤℡폀竊뚩쭅�뜻뻼旅d릎�념틢瓦쇾릉�꾥�溫뷩��" #. type: Labeled list #: en/fetch-options.txt:164 en/git-add.txt:69 en/git-am.txt:143 en/git-blame.txt:71 en/git-checkout-index.txt:45 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:153 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:148 en/git-mailinfo.txt:68 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:173 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:419 en/git-reflog.txt:116 en/git-repack.txt:100 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:316 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:220 en/merge-options.txt:108 @@ -6188,7 +6176,7 @@ msgstr "--no-tags" #: en/fetch-options.txt:172 #, priority:220 msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]." -msgstr "" +msgstr "容섋��끻넻訝뗰펽�뉐릲餓롨퓶葉뗤퍜佯볞툔饔썹쉪野배괌�꾣젃嶺얌폏熬ヨ렩�뽩뭉耶섇궓�경쑍�겹�� 瓦쇾릉�됮」獵곭뵪雅녻퓳燁띹눎�ⓩ젃溫계퇎甕ゃ�귟퓶葉뗧쉪容섋�烏뚥맏��빳�싪퓝 remote.<瓦쒐쮮�띸㎞>.tagOpt 溫양쉰�ζ뙁若싥�귛뢿鰲� linkgit:git-config[1]��" #. type: Labeled list #: en/fetch-options.txt:174 en/git-fetch-pack.txt:104 @@ -6200,7 +6188,7 @@ msgstr "--refetch" #: en/fetch-options.txt:181 #, priority:220 msgid "Instead of negotiating with the server to avoid transferring commits and associated objects that are already present locally, this option fetches all objects as a fresh clone would. Use this to reapply a partial clone filter from configuration or using `--filter=` when the filter definition has changed. Automatic post-fetch maintenance will perform object database pack consolidation to remove any duplicate objects." -msgstr "" +msgstr "瓦쇾릉�됮」訝띷삸訝롦쐨�▼솳�뤷븚餓ι겳�띴폖渦볠쑍�겼럴瀯뤷춼�①쉪�먧벡�뚨쎑�녑�穩∽펽�뚧삸�뤶�訝ゆ뼭�꾢뀑�녽궍�룩렩�뽪��됧�穩▲�귛퐪瓦뉑빱�ⓨ츣阿됧룕�잌룜�뽪뿶竊뚥슴�ⓩ��됮」�띷뼭佯붺뵪�띸쉰訝�쉪�ⓨ늽�뗩쉮瓦뉑빱�ⓩ닑鵝욜뵪 `--filter=`�귟눎�②렩�뽩릮�꾤뺨�ㅵ컛�㎬죱野배괌�경뜮佯볟똿�꾣빐�덌펽餓ε닠�ㅴ뻣鵝뺡뇥鸚띸쉪野배괌��" #. type: Labeled list #: en/fetch-options.txt:183 @@ -6212,7 +6200,7 @@ msgstr "--refmap=<refspec>" #: en/fetch-options.txt:193 #, priority:220 msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details." -msgstr "" +msgstr "壤볢렩�뽩뫝餓ㅸ죱訝듿닓�븀쉪凉뺟뵪�띰펽鵝욜뵪�뉐츣�꾢폊�②쭊�껓펷��빳��쩀訝わ펹�ζ삝弱꾢폊�ⓨ댆瓦쒐쮮瓮잒릉�녷뵱竊뚩�뚥툖��퓶葉뗤퍜佯볡쉪 `remote.*.fetch` �띸쉰�섌뇧�꾢�쇈�� 訝� `--refmap` �됮」�먧풘訝�訝ょ㈉�� `<凉뺟뵪鰲꾥똽>` 鴉싧��퀶it恙썹븼�띸쉰�꾢폊�②쭊�껓펽�뚦츑�ⓧ풚壅뽨퐳訝뷴뫝餓ㅸ죱�귝빊�먧풘�꾢폊�②쭊�껁�귟�鰲� \"�띸쉰�꾥퓶葉뗨퇎甕ゅ늽��\" 訝��귙��" #. type: Labeled list #: en/fetch-options.txt:195 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:187 en/git-show-ref.txt:41 @@ -6224,7 +6212,7 @@ msgstr "--tags" #: en/fetch-options.txt:202 #, priority:220 msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)." -msgstr "" +msgstr "餓롨퓶葉뗨렩�뽪��됪젃嶺억펷�놂펽弱녻퓶葉뗦젃嶺� `refs/tags/*` �룟룚訝뷴릪�띸쉪�у쑑�뉒�竊됵펽�ㅶ�阿뗥쨼竊뚩퓲��빳�룟룚�뜸퍟訝쒑��� �뺟떖鵝욜뵪瓦쇾릉�됮」竊뚦뜵鵝요슴�ⓧ틙 --prune竊뚥튋訝띴폏野방젃嶺얕퓵烏뚥엶�わ펷弱썹��뉒����訝ゆ삇簾�틙�좄�倻귚퐬阿잒쫨�좈솮�꾢폊�②쭊�껆쎅�뉛펽鰲� `--prune` �됮」竊됥��" #. type: Labeled list #: en/fetch-options.txt:204 @@ -6236,19 +6224,19 @@ msgstr "--recurse-submodules[=yes|on-demand|no]" #: en/fetch-options.txt:214 #, priority:220 msgid "This option controls if and under what conditions new commits of submodules should be fetched too. When recursing through submodules, `git fetch` always attempts to fetch \"changed\" submodules, that is, a submodule that has commits that are referenced by a newly fetched superproject commit but are missing in the local submodule clone. A changed submodule can be fetched as long as it is present locally e.g. in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`." -msgstr "" +msgstr "瓦쇾릉�됮」�㎩댍��맔餓ε룋�ⓧ�阿덃씉餓뜸툔竊뚦춴與▼쓼�꾣뼭�먧벡阿잌틪瑥θ˙�룟룚�귛퐪�띶럣耶먩Æ�쀦뿶竊�`git fetch` �삥삸瑥뺝쎗�룟룚 \"�밧룜��\" 耶먩Æ�쀯펽阿잌갚���竊뚥�訝ゅ춴與▼쓼�꾣룓雅ㅸ˙�계렩�뽫쉪�띌」��룓雅ㅶ�凉뺟뵪竊뚥퐜�ⓩ쑍�곁쉪耶먩Æ�쀥뀑�녵릎�닸깹�됥�귚�訝ゆ뵻�섆틙�꾢춴與▼쓼��빳熬ヨ렩�뽳펽�よ쫨若껃쑉�у쑑耶섇쑉竊뚥풃倻귛쑉`$GIT_DIR/modules/`竊덅쭅linkgit:gitsubmodules[7]竊됵폑倻귝옖訝딀만曆삣뒥雅녵�訝ゆ뼭�꾢춴與▼쓼竊뚩�耶먩Æ�쀤툖�썼˙�룟룚竊뚨쎍�겼츆熬ュ뀑�놅펽堊뗥쫩�싪퓝`git submodule update`��" #. type: Plain text #: en/fetch-options.txt:219 #, priority:220 msgid "When set to 'on-demand', only changed submodules are fetched. When set to 'yes', all populated submodules are fetched and submodules that are both unpopulated and changed are fetched. When set to 'no', submodules are never fetched." -msgstr "" +msgstr "壤볢�營�맏 'on-demand' �띰펽�ゅ룚�욃럴�밧룜�꾢춴與▼쓼�귛퐪溫양쉰訝� 'yes' �띰펽���됧럴櫻ュ뀉�꾢춴與▼쓼�썼˙�룟룚竊뚦릪�뜻쑋櫻ュ뀉�뚦럴�밧룜�꾢춴與▼쓼阿잒˙�룟룚�귛퐪溫양쉰訝� 'no' �띰펽耶먩Æ�쀦갭瓦쒍툖鴉싪˙�룟룚��" #. type: Plain text #: en/fetch-options.txt:223 #, priority:220 msgid "When unspecified, this uses the value of `fetch.recurseSubmodules` if it is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset. When this option is used without any value, it defaults to 'yes'." -msgstr "" +msgstr "壤볠쑋�뉐츣�띰펽倻귝옖溫양쉰雅� `fetch.recurseSubmodules`竊뚦닕鵝욜뵪瑥ε�쇽펷鰲걄inkgit:git-config[1]竊됵펽倻귝옖�よ�營�닕容섋�訝� 'on-demand'�� 壤볢퓳訝ら�됮」熬ヤ슴�②�뚧깹�됦뻣鵝뺝�쇗뿶竊뚦츆容섋�訝� 'yes'��" #. type: Labeled list #: en/fetch-options.txt:225 @@ -6266,19 +6254,19 @@ msgstr "--jobs=<n>" #: en/fetch-options.txt:228 #, priority:220 msgid "Number of parallel children to be used for all forms of fetching." -msgstr "" +msgstr "�ⓧ틢���됧숱凉뤹쉪�룟룚�꾢뭉烏뚦춴瓦쏁쮮�꾣빊�뤵��" #. type: Plain text #: en/fetch-options.txt:233 #, priority:220 msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])." -msgstr "" +msgstr "倻귝옖�뉐츣雅� `--multiple` �됮」竊뚥툖�뚨쉪瓦쒐쮮弱녻˙亮띈죱�룟룚�귛쫩�쒎쩀訝ゅ춴與▼쓼熬ュ룚壅곤펽若껂뺄弱녶뭉烏뚩렩�뽧�귟쫨�х쳦�㎩댍若껂뺄竊뚥슴�③뀓營� `fetch.parallel` �� `submodule.fetchJobs`竊덅쭅linkgit:git-config[1]竊됥��" #. type: Plain text #: en/fetch-options.txt:236 #, priority:220 msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel." -msgstr "" +msgstr "�싧만�끻넻訝뗰펽亮띈죱�꾦�믣퐩�뚦쩀瓦쒐쮮�꾣룓�뽨폏�닷엮�귡퍡溫ㅶ깄�듕툔竊뚧�榮€삸�됮『佯뤺퓵烏뚨쉪竊뚩�뚥툖��뭉烏뚨쉪��" #. type: Labeled list #: en/fetch-options.txt:238 en/git-checkout.txt:300 en/git-push.txt:402 en/git-restore.txt:111 en/git-switch.txt:184 @@ -6290,7 +6278,7 @@ msgstr "--no-recurse-submodules" #: en/fetch-options.txt:241 #, priority:220 msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)." -msgstr "" +msgstr "獵곭뵪耶먩Æ�쀧쉪�믣퐩�룟룚竊덅퓳訝롣슴�� `--recurse-submodules=no` �됮」�꾣븞�쒐쎑�뚳펹��" #. type: Labeled list #: en/fetch-options.txt:243 en/git-branch.txt:267 en/git-push.txt:374 @@ -6302,7 +6290,7 @@ msgstr "--set-upstream" #: en/fetch-options.txt:249 #, priority:220 msgid "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]." -msgstr "" +msgstr "倻귝옖瓦쒐쮮熬ユ닇�잒렩�뽳펽曆삣뒥訝딀만竊덅퇎甕わ펹凉뺟뵪竊뚨뵳�졾뢿�곁쉪 linkgit:git-pull[1] �뚦끀餓뽩뫝餓ㅴ슴�ⓦ�귝쎍鸚싦에��펽鰲� linkgit:git-config[1] 訝�쉪 `branch.<�띸㎞>.merge` �� `branch.<�띸㎞>.remote`��" #. type: Labeled list #: en/fetch-options.txt:251 @@ -6314,7 +6302,7 @@ msgstr "--submodule-prefix=<path>" #: en/fetch-options.txt:255 #, priority:220 msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules." -msgstr "" +msgstr "弱� <瓮�푶> 曆삣뒥�겻에���㎪텋��릎�볟뜲�꾥러孃꾬펽堊뗥쫩�쒑렩�뽩춴與▼쓼 foo�앫�귡�믣퐩耶먩Æ�쀦뿶�ⓨ냵�ⓧ슴�ⓩ��됮」��" #. type: Labeled list #: en/fetch-options.txt:256 @@ -6326,7 +6314,7 @@ msgstr "--recurse-submodules-default=[yes|on-demand]" #: en/fetch-options.txt:263 #, priority:220 msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly." -msgstr "" +msgstr "瓦쇾릉�됮」�ⓨ냵�②˙�ⓩ씎訝� --recurse-submodules �됮」�귝뿶�먧풘訝�訝ら씆兀잏쉪容섋��쇈�� ���됧끀餓뽭뀓營�렩�뽩춴與▼쓼�믣퐩�꾣뼶力뺧펷驪붷쫩 linkgit:gitmodules[5] �� linkgit:git-config[1] 訝�쉪溫양쉰竊됮꺗誤녺썣瓦쇾릉�됮」竊뚨쎍�ζ뙁若� --[no-]recurse-submodules 阿잍삸倻귝���" #. type: Labeled list #: en/fetch-options.txt:265 @@ -6338,7 +6326,7 @@ msgstr "--update-head-ok" #: en/fetch-options.txt:272 #, priority:220 msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it." -msgstr "" +msgstr "容섋��끻넻訝뗰펽\"git fetch\" �믥퍦�닸뼭訝롥퐪�띶늽��쎑野밧틪�꾢ㅄ�ⓦ�� 瓦쇾릉�뉐퓱獵곭뵪雅녻퓳燁띷��γ�� 瓦숂변暎방삸訝뷰틙溫� 'git pull' 訝� 'git fetch' 亦잓�싩쉪�낂깿鵝욜뵪竊뚪솮�욂퐷閭e쑉若욅렟鵝좄눎藥긺쉪訝듿콆�썰빱竊뚦맔�쇾퐷訝띶틪瑥δ슴�ⓨ츆��" #. type: Labeled list #: en/fetch-options.txt:274 en/git-clone.txt:219 @@ -6350,7 +6338,7 @@ msgstr "--upload-pack <upload-pack>" #: en/fetch-options.txt:279 #, priority:220 msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end." -msgstr "" +msgstr "壤볡퍢�뷸뿶竊뚦뭉訝붻쫨�룟룚�꾡퍜佯볠삸�� 'git fetch-pack' 鸚꾤릤�꾬펽`--exec=<upload-pack>` 熬ヤ폖�믣댆�썰빱訝�펽訝뷴룱訝�塋�퓧烏뚨쉪�썰빱�뉐츣�욇퍡溫ㅸ러孃꾠��" #. type: Labeled list #: en/fetch-options.txt:281 en/git-am.txt:88 en/git-apply.txt:231 en/git-branch.txt:202 en/git-bundle.txt:126 en/git-checkout-index.txt:31 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:129 en/git-commit.txt:369 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:374 en/git-grep.txt:294 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:213 en/git-prune-packed.txt:36 en/git-pull.txt:80 en/git-push.txt:386 en/git-read-tree.txt:117 en/git-rebase.txt:407 en/git-repack.txt:95 en/git-reset.txt:107 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:81 en/git-show-ref.txt:70 en/git-stash.txt:238 en/git-submodule.txt:269 en/git-svn.txt:670 en/git-switch.txt:142 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:237 en/merge-options.txt:174 @@ -6362,7 +6350,7 @@ msgstr "-q" #: en/fetch-options.txt:286 #, priority:220 msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream." -msgstr "" +msgstr "弱� --quiet 鴉좈�믥퍢 git-fetch-pack竊뚦뭉鵝요뻣鵝뺝끀餓뽩냵�ⓧ슴�①쉪 git �썰빱岳앮똻亦됮퍡�귟퓵佯╊툖鴉싨뒫�딁퍢�뉐뇛�숃�役곥��" #. type: Labeled list #: en/fetch-options.txt:287 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:49 en/git-branch.txt:191 en/git-cherry.txt:29 en/git-clone.txt:134 en/git-commit.txt:354 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:115 en/git-grep.txt:110 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:164 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:86 en/git-push.txt:392 en/git-read-tree.txt:63 en/git-rebase.txt:411 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git.txt:41 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:241 en/merge-options.txt:178 @@ -6392,7 +6380,7 @@ msgstr "--progress" #: en/fetch-options.txt:297 en/git-bundle.txt:119 en/git-pack-objects.txt:196 en/git-push.txt:401 #, priority:220 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal." -msgstr "" +msgstr "壤볠젃�녽뵗瑥�탛瓦욄렏�곁퍑塋�뿶竊뚪솮�욄뙁若싦틙 -q竊뚦맔�숅퍡溫ㅶ깄�듕툔鴉싧쑉�뉐뇛�숃�役곦툓�ε몜瓦쎾콝�뜻�곥�귛뜵鵝욘젃�녽뵗瑥�탛亦→쐣�뉐릲瀯덄ク竊뚩퓳訝ゆ젃恙쀤튋鴉싧성�뜻샑鹽븃퓵佯�듁�곥��" #. type: Labeled list #: en/fetch-options.txt:298 en/git-ls-remote.txt:75 en/git-push.txt:216 @@ -6422,7 +6410,7 @@ msgstr "--show-forced-updates" #: en/fetch-options.txt:312 #, priority:220 msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]." -msgstr "" +msgstr "容섋��끻넻訝뗰펽git �②렩�뽬퓝葉뗤릎鴉싨��δ�訝ゅ늽��삸��˙凉뷴댍�닸뼭雅녴�귟퓳��빳�싪퓝 fetch.showForcedUpdates 獵곭뵪竊뚥퐜 --show-forced-updates �됮」岳앲칮雅녻퓳燁띷��η쉪�묊뵟�� �귟쭅 linkgit:git-config[1]��" #. type: Labeled list #: en/fetch-options.txt:313 @@ -6434,7 +6422,7 @@ msgstr "--no-show-forced-updates" #: en/fetch-options.txt:319 #, priority:220 msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]." -msgstr "" +msgstr "容섋��끻넻訝뗰펽git 鴉싧쑉�룟룚瓦뉒쮮訝���δ�訝ゅ늽��삸��˙凉뷴댍�닸뼭雅녴�귡�싪퓝 --no-show-forced-updates �뽩컛 fetch.showForcedUpdates 溫양쉰訝� false �θ럼瓦뉓퓳訝ゆ��ο펽餓δ퓷瑥곫�㎬꺗�귛쫩�쒎쑉 'git-pull' 訝�슴�� --ff-only �됮」竊뚦쑉弱앲캊恙ラ�잍쎍�겼뎺餓띴폏汝��ε성�뜻쎍�겹�귟쭅 linkgit:git-config[1]��" #. type: Labeled list #: en/fetch-options.txt:320 en/git-push.txt:427 @@ -6470,7 +6458,7 @@ msgstr "--ipv6" #: en/fetch-options.txt:326 en/git-push.txt:434 #, priority:220 msgid "Use IPv6 addresses only, ignoring IPv4 addresses." -msgstr "" +msgstr "餓끺슴�� IPv6 �겼�竊뚦옙�� IPv4 �겼���" #. type: Title = #: en/git-add.txt:2 @@ -7143,8 +7131,8 @@ msgstr "�좈솮�꾢냵若�" msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)." msgstr "�좈솮�꾢냵若밥빳��-�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�싪퓝弱녳��-�앲쉬�㏘맏�� �앾펷令뷸졏竊됪씎�꿩�弱녶끀�좈솮��" -#. type: Labeled list # 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻 +#. type: Labeled list #: en/git-add.txt:388 #, no-wrap, priority:300 msgid "modified content" @@ -10363,7 +10351,7 @@ msgstr "--omit-empty" #: en/git-branch.txt:162 en/git-for-each-ref.txt:104 en/git-tag.txt:137 #, priority:260 msgid "Do not print a newline after formatted refs where the format expands to the empty string." -msgstr "" +msgstr "�ⓩ졏凉뤷뙑�꾢폊�ⓨ릮訝띷돀�경뜟烏뚳펽�졽맏�쇔폀�뽫쉪凉뺟뵪鴉싨돥掠뺜맏令뷴춻寧╊림��" #. type: Labeled list #: en/git-branch.txt:163 en/git-status.txt:130 en/git-tag.txt:138 @@ -12615,7 +12603,7 @@ msgstr "" #: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239 en/git-merge-tree.txt:187 en/git-remote.txt:209 #, no-wrap, priority:220 msgid "EXIT STATUS" -msgstr "" +msgstr "���븀듁�곭쟻" #. type: Labeled list #: en/git-check-ignore.txt:109 @@ -13790,7 +13778,7 @@ msgstr "壤볟룵�됦�訝ゅ뢿�겻툝訝띷삸`--`�띰펷堊뗥쫩`git checkout abc`竊됵펽 #: en/git-checkout.txt:519 #, no-wrap, priority:240 msgid "1. Paths" -msgstr "" +msgstr "1.瓮�푶" #. type: Plain text #: en/git-checkout.txt:524 @@ -15096,7 +15084,7 @@ msgstr "倻귝옖弱녶춼�ⓨ틩�뉐츣訝뷸쑍�계러孃꾬펷堊뗥쫩竊�`/path/to/repo`竊됵펽 #: en/git-clone.txt:65 #, priority:300 msgid "If the repository's `$GIT_DIR/objects` has symbolic links or is a symbolic link, the clone will fail. This is a security measure to prevent the unintentional copying of files by dereferencing the symbolic links." -msgstr "" +msgstr "倻귝옖餓볟틩�� `$GIT_DIR/objects` �됬Е�룬벦�ζ닑�끻츆弱길삸寧�뤇�얏렏竊뚦뀑�녶컛鴉싧ㅁ兀γ�귟퓳���窈밧츎�ⓩ렕�쏙펽餓ι삻閭��싪퓝鰲h�寧�뤇�얏렏�뤷쨼�겼쨳�뜻뻼餓뜰��" #. type: Plain text #: en/git-clone.txt:69 @@ -24854,7 +24842,7 @@ msgstr "" #: en/git-fetch-pack.txt:117 en/git-push.txt:395 en/git-send-pack.txt:64 #, priority:220 msgid "Run verbosely." -msgstr "" +msgstr "瑥�퍏瓦먫죱��" #. type: Plain text #: en/git-fetch-pack.txt:120 @@ -24900,61 +24888,61 @@ msgid "" "'git fetch' [<options>] <group>\n" "'git fetch' --multiple [<options>] [(<repository> | <group>)...]\n" "'git fetch' --all [<options>]\n" -msgstr "" +msgstr "'git fetch' [<�됮」>] [<餓볟틩> [<凉뺟뵪鰲꾥똽>...]]\n'git fetch' [<�됮」>] <瀯�>\n'git fetch' --multiple [<�됮」>] [(<餓볟틩> | <瀯�>)...]\n'git fetch' --all [<�됮」>]\n" #. type: Plain text #: en/git-fetch.txt:24 #, priority:220 msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)." -msgstr "" +msgstr "餓롣�訝ゆ닑鸚싦릉�뜹츆餓볟틩�룟룚�녷뵱��/�뽪젃溫곤펷瀯잏㎞訝� \"refs\"竊됵펽餓ε룋若뚧닇�뜹럣�꿩����꾢�穩▲�� 瓦쒐쮮瓮잒릉�꾢늽��폏熬ユ쎍�곤펷�념틢�㎩댍瓦숂쭕烏뚥맏�꾣뼶力뺧펽瑥룟뢿鰲곦툔�� <凉뺟뵪鰲꾥똽> �꾣룒瓦곤펹��" #. type: Plain text #: en/git-fetch.txt:32 #, priority:220 msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well." -msgstr "" +msgstr "容섋��끻넻訝뗰펽餓삡퐬�뉐릲熬ヨ렩�뽫쉪�녶뤁�꾣젃嶺얌튋鴉싪˙�룟룚竊쎾끀�덃옖��렩�뽪뙁�묇퐷�잌뀾擁g쉪�녷뵱�꾣젃嶺얇�� 瓦쇾릉容섋�烏뚥맏��빳�싪퓝鵝욜뵪 --tags �� --no-tags �됮」�뽬�낂뀓營� remote.<瓦쒐쮮餓볟틩�띸㎞>.tagOpt �ζ뵻�섅�� �싪퓝鵝욜뵪�롧‘�룟룚�뉒��꾢폊�②쭊�껓펽鵝졽튋��빳�룟룚�d틳亦→쐣�뉐릲鵝졿꽏�닺땃�꾢늽��쉪�뉒���" #. type: Plain text #: en/git-fetch.txt:37 #, priority:220 msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file. (See linkgit:git-config[1])." -msgstr "" +msgstr "'git fetch' ��빳餓롣�訝ゅ뫝�띸쉪餓볟틩�� URL 訝�렩�뽳펽�뽬�끻쫩�쒐퍢若싦틙 <瀯�> 亮뜸툝�③뀓營�뻼餓뜸릎�� remotes.<瀯�> 窈뱄펽�쇿룾餓ε릪�뜸퍗�졽릉餓볟틩�룟룚�� (�귟쭅 linkgit:git-config[1]竊됥��" #. type: Plain text #: en/git-fetch.txt:40 #, priority:220 msgid "When no remote is specified, by default the `origin` remote will be used, unless there's an upstream branch configured for the current branch." -msgstr "" +msgstr "壤볠깹�됪뙁若싪퓶葉뗤퍜佯볠뿶竊뚪퍡溫ㅶ깄�듕툔弱녵슴�� `origin` 瓦쒐쮮餓볟틩竊뚪솮�욄쐣訝�訝や툓歷멨늽��뀓營�쑉壤볟뎺�녷뵱訝듽��" #. type: Plain text #: en/git-fetch.txt:44 #, priority:220 msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]." -msgstr "" +msgstr "熬ヨ렩�뽫쉪凉뺟뵪�띸㎞竊뚥빳�듿츆餓ф��뉐릲�꾢�穩▼릫燁곤펽熬ュ넍�� `.git/FETCH_HEAD`�� 瓦쇾틳岳→겘��빳熬ヨ꽊�ф닑�뜸퍟 git �썰빱鵝욜뵪竊뚧캈倻굃inkgit:git-pull[1]��" #. type: Plain text #: en/git-fetch.txt:54 #, priority:220 msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported." -msgstr "" +msgstr "餓럖tdin訝���뽩폊�②쭊�껓펽驪뤺죱訝�訝わ펽�ㅴ틙鵝쒍맏�귝빊�먧풘�꾦궍雅쎽퉳鸚뽧�귚툖��똻 \"�뉒� <�띸㎞>\" �쇔폀��" #. type: Title - #: en/git-fetch.txt:59 #, no-wrap, priority:220 msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]" -msgstr "" +msgstr "�띸쉰�꾥퓶葉뗨퇎甕ゅ늽�� [[CRTB]]" #. type: Plain text #: en/git-fetch.txt:65 #, priority:220 msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables." -msgstr "" +msgstr "鵝좈�싪퓝瀯뤷만若싨쐿�뚪뇥鸚띶쑑餓롥릪訝�訝よ퓶葉뗤퍜佯볟룚訝쒑��δ툗阿뗤틨�ⓦ�� 訝뷰틙瓮잒릉瓦숂쭕瓦쒐쮮餓볟틩�꾥퓵佯�펽`git fetch` �곮�鵝좈뀓營� `remote.<餓볟틩>.fetch` �띸쉰�섌뇧��" #. type: Plain text #: en/git-fetch.txt:67 #, priority:220 msgid "Typically such a variable may look like this:" -msgstr "" +msgstr "訝��ф씎瑥댐펽瓦숂쭕�섌뇧��꺗�뗨돈�ε깗瓦숁졆竊�" #. type: delimited block - #: en/git-fetch.txt:71 @@ -24970,49 +24958,49 @@ msgstr "" #: en/git-fetch.txt:74 #, priority:220 msgid "This configuration is used in two ways:" -msgstr "" +msgstr "瓦숂쭕�띸쉰�됦륵燁띴슴�ⓩ뼶凉륅폏" #. type: Plain text #: en/git-fetch.txt:84 #, priority:220 msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy." -msgstr "" +msgstr "壤� `git fetch` 瓦먫죱�띰펽亦→쐣�ⓨ뫝餓ㅸ죱訝�뙁若싪쫨�뽩벆雅쎾늽��뭽/�뽪젃溫곤펽堊뗥쫩 `git fetch origin` �� `git fetch`竊�`remote.<餓볟틩>.fetch` �쇠˙�ⓧ퐳凉뺟뵪鰲꾥똽�붴�붷츆餓ф뙁若싪쫨�뽩벆雅쎾폊�ⓨ뭽誤곫쎍�겼벆雅쎿쑍�겼폊�ⓦ�� 訝딃씊�꾡풃耶먨컛�룟룚���됧춼�ⓧ틢 `origin` 訝�쉪�녷뵱竊덂뜵餓삡퐬訝롦빊�쇔랩渦밭쉪`refs/heads/*`�멨뙶�띸쉪凉뺟뵪竊됵펽亮뜻쎍�� `refs/remotes/origin/*` 掠귝А瀯볠엫訝�쎑佯붺쉪瓦쒐쮮瓮잒릉�꾢늽����" #. type: Plain text #: en/git-fetch.txt:101 #, priority:220 msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping." -msgstr "" +msgstr "壤� `git fetch` 瓦먫죱�띰펽�썰빱烏뚥툓�됪삇簾�쉪誤곩룚�꾢늽��뭽/�뽪젃溫곤펽堊뗥쫩 `git fetch origin master`竊뚦뫝餓ㅸ죱訝딁퍢�븀쉪���� <凉뺟뵪鰲꾥똽> �녑츣雅녻쫨�뽫쉪���阿덌펷堊뗥쫩堊뗥춴訝�쉪 `master` �� `master:` �꾤�燁곤펽�뤸�앮삸 \"�룟룚 'master' �녷뵱竊뚥퐜�묉깹�됪삇簾��誤곩쑉�썰빱烏뚥릎�닸뼭�や릉瓦쒐쮮瓮잒릉�녷뵱\"竊됵펽�뚩퓳訝や풃耶먪쉪�썰빱弱녴�뚦룵�띹렩�� 'master' �녷뵱�� `remote.<餓볟틩>.fetch`�쇔넶若싦틙�や릉瓦쒐쮮瓮잒릉�녷뵱竊덂쫩�쒏쐣�꾥캕竊됭˙�닸뼭�� 壤볞빳瓦숂쭕�밧폀鵝욜뵪�띰펽`remote.<餓볟틩>.fetch` �쇔��녑츣�룟룚餓�阿덃깹�됦뻣鵝뺝쉽�랃펷�녑퐪�썰빱烏뚦닓�뷴폊�②쭊�껅뿶竊뚩퓳雅쎾�쇌툖鴉싪˙�ⓧ퐳凉뺟뵪鰲꾥똽竊됵폑若껂뺄�ゆ삸�싪퓝鵝쒍맏訝�訝ゆ삝弱꾣씎�녑츣�룟룚�꾢폊�②˙耶섇궓�ⓨ벆�뚣��" #. type: Plain text #: en/git-fetch.txt:105 #, priority:220 msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line." -msgstr "" +msgstr "�롨�끻� `remote.<餓볟틩>.fetch` �쇘쉪鵝욜뵪��빳�싪퓝�ⓨ뫝餓ㅸ죱訝�퍢�� `--refmap=<凉뺟뵪鰲꾥똽>` �귝빊�삭쫮�뽧��" #. type: Title - #: en/git-fetch.txt:107 #, no-wrap, priority:220 msgid "PRUNING" -msgstr "" +msgstr "�ゆ옗" #. type: Plain text #: en/git-fetch.txt:112 #, priority:220 msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches." -msgstr "" +msgstr "Git容섋�岳앯븰�경뜮竊뚪솮�욃츆熬ユ삇簾�쑑�붹럦竊쏂퓳兩뜸섯�겻퓷�쇿�瓦쒐쮮�녷뵱�꾣쑍�겼폊�⑨펽�뚩퓳雅쎾늽��쑍翁ュ럴瀯뤺˙�좈솮��" #. type: Plain text #: en/git-fetch.txt:118 #, priority:220 msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references." -msgstr "" +msgstr "倻귝옖餓삣끀燁�눕竊뚩퓳雅쏃솃�㎫쉪凉뺟뵪��꺗鴉싦슴鸚㎩엹濚곩퓳餓볟틩�꾣�㎬꺗�섇량竊뚥풃倻귨펽鵝� `git branch -a --contains <�먧벡>` 嶺됧뫝餓ㅷ쉪渦볟눣訝띶퓚誤곩쑑�쀩빣竊뚥빳�듿쉽�띶끀餓뽨뻣鵝뺜툗若뚧빐�꾢럴�ε폊�ⓩ쐣�녕쉪藥δ퐳��" #. type: Plain text #: en/git-fetch.txt:121 #, priority:220 msgid "These remote-tracking references can be deleted as a one-off with either of:" -msgstr "" +msgstr "瓦쇾틳瓦쒐쮮瓮잒릉凉뺟뵪��빳�싪퓝餓δ툔訝ㅷ쭕�밧폀訝�轝→�㎩닠�ㅿ폏" #. type: delimited block - #: en/git-fetch.txt:125 @@ -25020,7 +25008,7 @@ msgstr "" msgid "" "# While fetching\n" "$ git fetch --prune <name>\n" -msgstr "" +msgstr "# �②렩�뽫쉪�뜹��\n$ git fetch --prune <�띸㎞>\n" #. type: delimited block - #: en/git-fetch.txt:128 @@ -25036,43 +25024,43 @@ msgstr "" #: en/git-fetch.txt:134 #, priority:220 msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]." -msgstr "" +msgstr "誤곫뒍岳�돦凉뺟뵪鵝쒍맏閭e만藥δ퐳役곭쮮�꾡��ⓨ늽竊뚩�뚥툖��誤곮�鵝뤺퓧烏뚩�葉뗥틣竊뚦룾餓ε쑉�ⓨ�溫양쉰 `fetch.prune`竊뚧닑�끻쑉�띸쉰訝��營� `remote.<�띸㎞>.prune`竊뚥맏驪뤶릉瓦쒐쮮餓볟틩瓦쏂죱溫양쉰�귟쭅linkgit:git-config[1]��" #. type: Plain text #: en/git-fetch.txt:139 #, priority:220 msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <--> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)." -msgstr "" +msgstr "瓦숅뇤��틟�끻룜孃쀦짌�뗥뭽�닷끁鵝볡쉪�경뼶�귚엶�ゅ뒣�썲츩�끺툓亮뜸툖�녑퓘�녷뵱竊뚨쎑�랃펽若껃컛岳�돦�у쑑<-->瓦쒐쮮凉뺟뵪竊뚥퐳訝븃퓶葉뗧쉪凉뺟뵪鰲꾥똽�꾢눦�곤펷鰲곦툓�®쉪`<凉뺟뵪鰲꾥똽>`�뚥툓�®쉪<<CRTB竊뚪뀓營�퓶葉뗨퇎甕ゅ늽��>>竊됥��" #. type: Plain text #: en/git-fetch.txt:145 #, priority:220 msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote." -msgstr "" +msgstr "�졿�竊뚦쫩�쒑퓶葉뗧쉪凉뺟뵪鰲꾥똽�끾떖堊뗥쫩 `refs/tags/*:refs/tags/*`瓦숁졆�꾥쭊�껓펽�뽬�끺퐷�뗥뒯瓦먫죱堊뗥쫩 `git fetch --prune <�띸㎞> \"refs/tags/*:refs/tags/*\"`竊뚪궍阿덅˙�좈솮�꾢갚訝띷삸瓦뉑뿶�꾥퓶葉뗨퇎甕ゅ늽��펽�뚧삸瓦쒐쮮訝듾툖耶섇쑉�꾡뻣鵝뺞쑍�경젃嶺얇��" #. type: Plain text #: en/git-fetch.txt:150 #, priority:220 msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place." -msgstr "" +msgstr "瓦쇿룾�썰툖��퐷���잍쐹�꾬펽�념퐷�념엶�よ퓶葉뗧쉪 `<�띸㎞>`竊뚥퐜阿잍삇簾�쑑餓롥츆�i뇤�룟룚�뉒�竊뚧�餓ε퐪鵝졽퍗若껈궍�뚩렩�뽪뿶竊뚥퐷鴉싧닠�ㅶ��됬쉪�у쑑�뉒�竊뚦끀訝�ㄷ�ⓨ늽��꺗腰뽩뀍訝띷삸�θ눎瓦쒐쮮�� `<�띸㎞>`��" #. type: Plain text #: en/git-fetch.txt:154 #, priority:220 msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace." -msgstr "" +msgstr "�졿�竊뚦퐪訝� `refs/tags/*:refs/tags/*` 瓦숁졆�꾢폊�②쭊�껂�壅룝슴�ⓩ뿶誤곩컦恙껓펽�뽬�끺뻣鵝뺝끀餓뽩룾�썲컛鸚싦릉瓦쒐쮮�꾢폊�ⓩ삝弱꾢댆�뚥��у쑑�썲릫令븅뿴�꾢폊�②쭊�껁��" #. type: Plain text #: en/git-fetch.txt:161 #, priority:220 msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]." -msgstr "" +msgstr "�긴틢�②퓶葉뗤퓷�곫��곁쉪�녷뵱�뚧젃嶺얏삸訝�訝ゅ만鰲곭쉪鵝욜뵪�끻넻竊�`--prune-tags` �됮」��빳�� `--prune` 訝�壅룝슴�⑨펽餓δ엶�ゅ쑉瓦쒐쮮訝띶춼�①쉪�у쑑�뉒�竊뚦뭉凉뷴댍�닸뼭�d틳訝띶릪�꾣젃嶺얇�귝젃嶺얌엶�や튋��빳�싪퓝�띸쉰訝�쉪 `fetch.pruneTags` �� `remote.<�띸㎞>.pruneTags` ��뵪�귟쭅linkgit:git-config[1]��" #. type: Plain text #: en/git-fetch.txt:165 #, priority:220 msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:" -msgstr "" +msgstr "`--prune-tags` �됮」�멨퐪雅롥쑉瓦쒐쮮�꾢폊�②쭊�껂릎鶯경삇 `refs/tags/*:refs/tags/*` �귟퓳��꺗鴉싧��답�雅쏁쐦壅룡씎孃덂쪍�ょ쉪瀯볠옖竊�" #. type: delimited block - #: en/git-fetch.txt:170 @@ -25081,25 +25069,25 @@ msgid "" "# These both fetch tags\n" "$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n" "$ git fetch --no-tags --prune-tags origin\n" -msgstr "" +msgstr "# 瓦쇾륵訝ゅ뫝餓ㅹ꺗��빳�ⓩ씎�룟룚�뉒�\n$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n$ git fetch --no-tags --prune-tags origin\n" #. type: Plain text #: en/git-fetch.txt:176 #, priority:220 msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do." -msgstr "" +msgstr "�ⓩ깹�� `--prune` �뽩끀�띸쉰�꾣깄�듕툔竊뚦츆訝띴폏�븅뵗�꾢렅�졿삸訝뷰틙�띸쉰�꾤겣域삥�㏆펽餓ε룋�ⓨ뫝餓ㅸ죱�뉐퓱�뚪뀓營�퉳�답퓷�� 1=1 �꾣삝弱꾠��" #. type: Plain text #: en/git-fetch.txt:181 #, priority:220 msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error." -msgstr "" +msgstr "堊뗥쫩竊뚦쑉 `~/.gitconfig` 訝�뀓營� `fetch.pruneTags=true`竊뚥빳堊욕쑉瓦먫죱 `git fetch --prune` �뜸엶�ゆ젃嶺억펽瓦숁삸孃덂릦�녺쉪竊뚥툖鴉싦슴驪뤸А瘟껆뵪 `git fetch` �뚧깹�� `--prune` �띌꺗�븀렟�숃���" #. type: Plain text #: en/git-fetch.txt:185 #, priority:220 msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:" -msgstr "" +msgstr "鵝욜뵪 `--prune-tags` 岳�돦�뉒�竊뚦쑉�룟룚訝�訝챇RL�뚥툖���訝ゅ뫝�띸쉪瓦쒐쮮�뜸튋�썲룕�δ퐳�ⓦ�귟퓳雅쏃꺗鴉싦엶�ゅ쑉�잏궧亦→쐣�묊렟�꾣젃嶺억폏" #. type: delimited block - #: en/git-fetch.txt:191 @@ -25119,13 +25107,13 @@ msgstr "" #: en/git-fetch.txt:199 #, priority:220 msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol." -msgstr "" +msgstr "\"git fetch\" �꾥풏�뷴룚�념틢��鵝욜뵪�꾡폖渦볠뼶凉륅폑�ц뒄�뤺염雅녽�싪퓝 Git �뤺�竊덃쑍�경닑�싪퓝 ssh竊됧뭽�븃꺗 HTTP �뤺��룟룚�띄쉪渦볟눣��" #. type: Plain text #: en/git-fetch.txt:202 #, priority:220 msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:" -msgstr "" +msgstr "�룟룚�꾤듁�곦빳烏ⓩ졏�꾢숱凉뤺풏�븝펽驪뤶�烏뚥빰烏ⓧ�訝ゅ폊�①쉪�뜻�곥�귝캀訝�烏뚨쉪壤℡폀��폏" #. type: delimited block - #: en/git-fetch.txt:205 @@ -25137,25 +25125,25 @@ msgstr " <flag> <summary> <from> -> <to> [<reason>]\n" #: en/git-fetch.txt:211 #, priority:220 msgid "When using `--porcelain`, the output format is intended to be machine-parseable. In contrast to the human-readable output formats it thus prints to standard output instead of standard error. Each line is of the form:" -msgstr "" +msgstr "壤볞슴�� `--porcelain` �띰펽渦볟눣�쇔폀�꾤쎅�꾣삸溫⒵쑛�ⓨ룾餓θ㎗�먦�귚툗雅븀굳����꾥풏�뷸졏凉뤶툖�뚳펽若껃컛�볟뜲�경젃�녻풏�븃�뚥툖��젃�녽뵗瑥��귝캀訝�烏뚪꺗��퓳�루쉪壤℡폀竊�" #. type: delimited block - #: en/git-fetch.txt:214 #, no-wrap, priority:220 msgid "<flag> <old-object-id> <new-object-id> <local-reference>\n" -msgstr "" +msgstr "<�뉐퓱> <�㎩�穩좮D> <�겼�穩좮D> <�у쑑凉뺟뵪>\n" #. type: Plain text #: en/git-fetch.txt:218 #, priority:220 msgid "The status of up-to-date refs is shown only if the --verbose option is used." -msgstr "" +msgstr "�ゆ쐣�ⓧ슴�� --verbose �됮」�띰펽�띴폏�양ㅊ���곁쉪凉뺟뵪�뜻�곥��" #. type: Plain text #: en/git-fetch.txt:223 #, priority:220 msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`." -msgstr "" +msgstr "�①뇻�묋풏�뷸Æ凉뤶툔竊뚪�싪퓝�띸쉰�섌뇧 fetch.output �뉐츣竊뚦쫩�쒎쑉�╊�訝ゅ춻寧╊림訝�룕�경빐訝� `<壅루궧>` �� `<瀯덄궧>`竊뚦츆弱녻˙�욘뜟�먨룱訝�訝ゅ춻寧╊림訝�쉪 `*`�귚풃倻귨펽`master -> origin/master` �섉닇 `master -> origin/*`��" #. type: Labeled list #: en/git-fetch.txt:224 en/git-push.txt:460 @@ -25167,19 +25155,19 @@ msgstr "�뉓�" #: en/git-fetch.txt:226 en/git-push.txt:462 #, priority:220 msgid "A single character indicating the status of the ref:" -msgstr "" +msgstr "烏①ㅊ凉뺟뵪�뜻�곭쉪�뺜릉耶쀧Е竊�" #. type: Labeled list #: en/git-fetch.txt:226 en/git-push.txt:462 #, no-wrap, priority:220 msgid "(space)" -msgstr "" +msgstr "竊덄㈉�쇽펹" #. type: Plain text #: en/git-fetch.txt:227 #, priority:220 msgid "for a successfully fetched fast-forward;" -msgstr "" +msgstr "烏①ㅊ�먨뒣�꾢엮�잌릦亮띰폑" #. type: Labeled list #: en/git-fetch.txt:227 en/git-push.txt:463 @@ -25191,7 +25179,7 @@ msgstr "`+`" #: en/git-fetch.txt:228 en/git-push.txt:464 #, priority:220 msgid "for a successful forced update;" -msgstr "" +msgstr "烏①ㅊ訝�訝ゆ닇�잏쉪凉뷴댍�닸뼭竊�" #. type: Labeled list #: en/git-fetch.txt:228 en/git-push.txt:464 @@ -25203,7 +25191,7 @@ msgstr "`-`" #: en/git-fetch.txt:229 #, priority:220 msgid "for a successfully pruned ref;" -msgstr "" +msgstr "烏①ㅊ�먨뒣岳�돦凉뺟뵪竊�" #. type: Labeled list #: en/git-fetch.txt:229 @@ -25215,7 +25203,7 @@ msgstr "`t`" #: en/git-fetch.txt:230 #, priority:220 msgid "for a successful tag update;" -msgstr "" +msgstr "烏①ㅊ�먨뒣�닸뼭�뉒�竊�" #. type: Labeled list #: en/git-fetch.txt:230 en/git-push.txt:465 @@ -25227,7 +25215,7 @@ msgstr "`*`" #: en/git-fetch.txt:231 #, priority:220 msgid "for a successfully fetched new ref;" -msgstr "" +msgstr "烏①ㅊ�먨뒣�룟룚�겼폊�⑨폑" #. type: Labeled list #: en/git-fetch.txt:231 en/git-push.txt:466 @@ -25239,7 +25227,7 @@ msgstr "`!`" #: en/git-fetch.txt:232 #, priority:220 msgid "for a ref that was rejected or failed to update; and" -msgstr "" +msgstr "烏①ㅊ熬ユ땼瀯앮닑�닸뼭鸚김뇰�꾢폊�⑨폑餓ε룋" #. type: Labeled list #: en/git-fetch.txt:232 en/git-push.txt:467 @@ -25251,7 +25239,7 @@ msgstr "`=`" #: en/git-fetch.txt:233 #, priority:220 msgid "for a ref that was up to date and did not need fetching." -msgstr "" +msgstr "烏①ㅊ訝�訝ゆ��곁쉪�곦툖��誤곮렩�뽫쉪凉뺟뵪��" #. type: Labeled list #: en/git-fetch.txt:234 en/git-push.txt:469 @@ -25263,7 +25251,7 @@ msgstr "�사퍜" #: en/git-fetch.txt:239 #, ignore-ellipsis, priority:220 msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)." -msgstr "" +msgstr "野밥틢訝�訝ゆ닇�잒렩�뽫쉪凉뺟뵪竊뚧몮誤곦빳�귛릦鵝쒍맏 `git log` �귝빊�꾢숱凉뤸샑鹽븃�凉뺟뵪�꾣뼭�㎩�쇽펷�ⓨㄷ鸚싨빊�끻넻訝뗦삸 `<��>..<��>`竊뚦�雅롥성�띌씆恙ラ�잌릦亮뜻삸 `<��>...<��>`竊됥��" #. type: Labeled list #: en/git-fetch.txt:240 en/git-push.txt:497 @@ -25275,7 +25263,7 @@ msgstr "餓�" #: en/git-fetch.txt:244 #, priority:220 msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"." -msgstr "" +msgstr "熬ヨ렩�뽫쉪瓦쒐쮮凉뺟뵪�꾢릫燁곤펽�뤷렮��`refs/<映삣엹>/`�띸��귛쑉�좈솮�꾣깄�듕툔竊뚩퓶葉뗥폊�①쉪�띸㎞�� \"(none)\"��" #. type: Labeled list #: en/git-fetch.txt:245 en/git-push.txt:502 @@ -25287,7 +25275,7 @@ msgstr "��" #: en/git-fetch.txt:248 #, priority:220 msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix." -msgstr "" +msgstr "熬ユ쎍�곁쉪�у쑑凉뺟뵪�꾢릫燁곤펽�삥럦�� `refs/<映삣엹>/` �띸���" #. type: Labeled list #: en/git-fetch.txt:249 en/git-push.txt:506 @@ -25299,13 +25287,13 @@ msgstr "�잌썱" #: en/git-fetch.txt:253 #, priority:220 msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described." -msgstr "" +msgstr "訝�訝や볶映삣룾瑥사쉪鰲i뇢�귛쫩�쒏삸�먨뒣�룟룚�꾢폊�⑨펽訝띺�誤곮㎗�듽�귛�雅롥ㅁ兀η쉪凉뺟뵪竊뚦컛�뤺염鸚김뇰�꾢렅�졼��" #. type: Plain text #: en/git-fetch.txt:258 #, priority:220 msgid "Update the remote-tracking branches:" -msgstr "" +msgstr "�닸뼭瓦쒐쮮瓦썼릉�꾢늽��폏" #. type: delimited block - #: en/git-fetch.txt:261 @@ -25317,13 +25305,13 @@ msgstr "$ git fetch origin\n" #: en/git-fetch.txt:267 #, priority:220 msgid "The above command copies all branches from the remote `refs/heads/` namespace and stores them to the local `refs/remotes/origin/` namespace, unless the `remote.<repository>.fetch` option is used to specify a non-default refspec." -msgstr "" +msgstr "訝딂염�썰빱餓롨퓶葉뗧쉪 `refs/heads/` �썲릫令븅뿴鸚띶댍���됧늽��펽亮뜹춼�ⓨ댆�у쑑�� `refs/remotes/origin/` �썲릫令븅뿴竊뚪솮�욂슴�� `remote.<餓볟틩>.fetch` �됮」�ζ뙁若싦�訝ら씆容섋��꾢폊�②쭊�껁��" #. type: Plain text #: en/git-fetch.txt:269 #, priority:220 msgid "Using refspecs explicitly:" -msgstr "" +msgstr "�롧‘鵝욜뵪凉뺟뵪鰲꾥똽竊�" #. type: delimited block - #: en/git-fetch.txt:272 @@ -25335,19 +25323,19 @@ msgstr "$ git fetch origin +seen:seen maint:tmp\n" #: en/git-fetch.txt:277 #, priority:220 msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively) `seen` and `maint` from the remote repository." -msgstr "" +msgstr "瓦숅�싪퓝餓롨퓶葉뗥춼�ⓨ틩�꾢늽��펷�녶닽竊됭렩�� `seen` �� `maint` �ζ쎍�곤펷�뽪졊���誤곩닗兩븝펹�у쑑耶섇궓佯볞릎�꾢늽�� `seen` �� `tmp`��" #. type: Plain text #: en/git-fetch.txt:280 #, priority:220 msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be." -msgstr "" +msgstr "�념슴訝띶엮瓦쏉펽`seen` �녷뵱阿잋폏熬ユ쎍�곤펽�졽맏若껆쉪�띸���뒥�뤄폑`tmp` �쇾툖鴉싥��" #. type: Plain text #: en/git-fetch.txt:283 #, priority:220 msgid "Peek at a remote's branch, without configuring the remote in your local repository:" -msgstr "" +msgstr "囹θ쭍訝�訝よ퓶葉뗧쉪�녷뵱竊뚩�뚥툖��誤곩쑉鵝좂쉪�у쑑�덃쑍佯볞릎�띸쉰瓦쒐쮮竊�" #. type: delimited block - #: en/git-fetch.txt:287 @@ -25355,19 +25343,19 @@ msgstr "" msgid "" "$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n" "$ git log FETCH_HEAD\n" -msgstr "" +msgstr "$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n$ git log FETCH_HEAD\n" #. type: Plain text #: en/git-fetch.txt:294 #, priority:220 msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])." -msgstr "" +msgstr "寧т��▼뫝餓ㅴ퍗 `git://git.kernel.org/pub/scm/git.git` �꾢춼�ⓨ틩訝�렩�� `maint` �녷뵱竊뚨К雅뚧씉�썰빱鵝욜뵪 `FETCH_HEAD` �� linkgit:git-log[1] �ζ��θ��녷뵱�� �뽩눣�꾢�穩→�瀯덁폏熬� git �끿쉰�꾢냵�←��녶닠�ㅿ펷鰲� linkgit:git-gc[1]竊됥��" #. type: Plain text #: en/git-fetch.txt:310 #, priority:220 msgid "Using --recurse-submodules can only fetch new commits in submodules that are present locally e.g. in `$GIT_DIR/modules/`. If the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`. This is expected to be fixed in a future Git version." -msgstr "" +msgstr "鵝욜뵪 --recurse-submodules �よ꺗�룟룚�у쑑耶섇쑉�꾢춴與▼쓼訝�쉪�경룓雅ㅿ펽堊뗥쫩�� `$GIT_DIR/modules/`�귛쫩�쒍툓歷멩렌�졽틙訝�訝ゆ뼭�꾢춴與▼쓼竊뚩�耶먩Æ�쀤툖�썼˙�룟룚竊뚨쎍�겼츆熬ュ뀑�놅펽堊뗥쫩竊뚪�싪퓝`git submodule update`�귟퓳訝ら뿮窯섉쐣�쎾쑉�ゆ씎�� Git �덃쑍訝�˙岳�쨳��" #. type: Title = #: en/git-filter-branch.txt:2 @@ -31010,7 +30998,7 @@ msgstr "" #: en/git-http-push.txt:39 en/git-push.txt:176 en/git-send-pack.txt:54 #, priority:220 msgid "Do everything except actually send the updates." -msgstr "" +msgstr "�싮솮雅녶츩�끻룕�곫쎍�겼쨼�꾣��됦틟��" #. type: Plain text #: en/git-http-push.txt:43 @@ -40086,25 +40074,25 @@ msgstr "'git pull' [<options>] [<repository> [<refspec>...]]\n" #: en/git-pull.txt:24 #, priority:220 msgid "Incorporates changes from a remote repository into the current branch. If the current branch is behind the remote, then by default it will fast-forward the current branch to match the remote. If the current branch and the remote have diverged, the user needs to specify how to reconcile the divergent branches with `--rebase` or `--no-rebase` (or the corresponding configuration option in `pull.rebase`)." -msgstr "" +msgstr "弱녻퓶葉뗧뎵�у틩�꾡엶�밧뭉�ε퐪�띶늽���� 倻귝옖壤볟뎺�녷뵱�썲릮雅롨퓶葉뗥늽��펽�d퉰容섋��끻넻訝뗰펽若껃컛恙ラ�잌릦亮뜹퐪�띶늽��빳�백뀓瓦쒐쮮�녷뵱�� 倻귝옖壤볟뎺�녷뵱�뚩퓶葉뗥늽��쐣�녷�竊뚨뵪�룬�誤곭뵪 `--rebase` �� `--no-rebase`竊덃닑 `pull.rebase` 訝�쉪�멨틪�띸쉰�됮」竊됪씎�뉐츣倻귚퐬瘟껃뭽�녷��꾢늽����" #. type: Plain text #: en/git-pull.txt:29 #, priority:220 msgid "More precisely, `git pull` runs `git fetch` with the given parameters and then depending on configuration options or command line flags, will call either `git rebase` or `git merge` to reconcile diverging branches." -msgstr "" +msgstr "�당‘�뉐쑑瑥댐펽`git pull` 瓦먫죱 `git fetch` 亮띄퍢�뷴뢿�곤펽�뜹릮�방뜮�띸쉰�됮」�뽩뫝餓ㅸ죱�뉐퓱竊뚩컘�� `git rebase` �� `git merge` �ε뜌瘟껂툖�뚨쉪�녷뵱��" #. type: Plain text #: en/git-pull.txt:36 #, priority:220 msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository." -msgstr "" +msgstr "<餓볟틩> 佯붻���폖�믥퍢 linkgit:git-fetch [1] �꾥퓶葉뗤퍜佯볡쉪�띸㎞�� < �ⓨ폊鰲꾥똽 > ��빳�썲릫訝�訝や뻣�뤹쉪瓦쒐쮮凉뺟뵪竊덁풃倻귨펽訝�訝ゆ젃嶺양쉪�띸㎞竊됵펽�싪눛���訝ゆ쐣�멨틪瓦쒐쮮瓮잒릉�녷뵱�꾢폊�③썓�덌펷堊뗥쫩竊똱efs/heads/{asterisk}:refs/remotes/origin/{asterisk}竊됵펽鵝녽�싧만若껅삸瓦쒐쮮餓볟틩�꾡�訝ゅ늽��릫燁겹��" #. type: Plain text #: en/git-pull.txt:40 #, priority:220 msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`." -msgstr "" +msgstr "<餓볟틩> �� < �녷뵱 > �꾦퍡溫ㅵ�쇗삸餓� linkgit:git-branch [1] `--track` 溫양쉰�꾢퐪�띶늽��쉪 \"瓦쒐쮮\" �� \"�덂뭉\" �띸쉰訝���뽧��" #. type: delimited block - #: en/git-pull.txt:50 @@ -40115,13 +40103,13 @@ msgid "" " D---E---F---G master\n" "\t^\n" "\torigin/master in your repository\n" -msgstr "" +msgstr "\t A---B---C master on origin\n\t /\n D---E---F---G master\n\t^\n\t鵝졽퍜佯볞릎�� origin/master\n" #. type: Plain text #: en/git-pull.txt:57 #, priority:220 msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`) until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes." -msgstr "" +msgstr "�뜹릮竊�\"`git pull`\" 弱녵퍗瓦쒐쮮�� `master` �녷뵱�룟룚亮띌뇥�얕눎若껂툗�у쑑 `master`竊덂뜵 `E`竊됧늽閭㏛빳�η쉪�섇뙑竊뚨쎍�겼츆�� `master` 阿뗤툓�꾢퐪�띷룓雅ㅿ펷`C`竊됵펽亮뜹컛瀯볠옖訝롣륵訝ょ댍�먧벡�꾢릫燁겼뭽�ⓩ댎�뤺염�섇뙑�꾣뿥恙쀤에���壅룩�壤뺝쑉訝�訝ゆ뼭�먧벡訝���" #. type: delimited block - #: en/git-pull.txt:62 @@ -40130,37 +40118,37 @@ msgid "" "\t A---B---C origin/master\n" "\t / \\\n" " D---E---F---G---H master\n" -msgstr "" +msgstr "\t A---B---C origin/master\n\t / \\\n D---E---F---G---H master\n" #. type: Plain text #: en/git-pull.txt:66 #, priority:220 msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled." -msgstr "" +msgstr "瑥�깄鰲� linkgit:git-merge[1]竊뚦똿�у쫩鵝뺝몚�겼뭽鸚꾤릤�꿰챳��" #. type: Plain text #: en/git-pull.txt:71 #, priority:220 msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict." -msgstr "" +msgstr "�� Git 1.7.0 �뽪쎍遙섊뎵�т릎竊뚩쫨�뽪텋訝�訝ゅ넳囹곭쉪�덂뭉竊뚩�鵝욜뵪 `git reset --merge`�� * 鈺�몜 *竊싧쑉�㎫뎵�х쉪 Git 訝�펽訝띺폆�긷쑉�ゆ룓雅ㅷ쉪�끻넻訝뗨퓧烏� \"git pull\"竊싪쇋�뜻쐣��꺗竊뚥퐜�ⓨ룕�잌넳囹곭쉪�끻넻訝뗰펽鴉싪�鵝졾쨪雅롣�訝ら슻餓ζ걿鸚띸쉪�뜻�곥��" #. type: Plain text #: en/git-pull.txt:76 #, priority:220 msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]." -msgstr "" +msgstr "倻귝옖餓삡퐬瓦쒐쮮岳�뵻訝롦쑍�경쑋�먧벡�꾡엶�백뇥�좑펽�덂뭉弱녻˙�ゅ뒯�뽪텋竊뚦램鵝쒐쎅壤뺞젒訝띴폏熬ユ뵻�ⓦ�� 訝��ф씎瑥댐펽��也썸삸�ⓩ땳�뽨퉳�띷뒍餓삡퐬�у쑑�꾡엶�밧펲�겼램鵝쒐듁�곻펽�뽬�끿뵪 linkgit:git-stash[1] �듿츆餓ц눔�뤺돈�γ��" #. type: Plain text #: en/git-pull.txt:85 #, priority:220 msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging." -msgstr "" +msgstr "瓦쇿컛熬ヤ폖�믥퍢佯뺝콆�� git-fetch竊뚥빳堊욕쑉鴉좄풏瓦뉒쮮訝�뒔�뜻뒫�딉펽餓ε룋佯뺝콆�� git-merge竊뚥빳堊욕쑉�덂뭉瓦뉒쮮訝�뒔�띈풏�뷩��" #. type: Plain text #: en/git-pull.txt:89 #, priority:220 msgid "Pass --verbose to git-fetch and git-merge." -msgstr "" +msgstr "弱� --verbose 鴉좂퍢 git-fetch �� git-merge��" #. type: Labeled list #: en/git-pull.txt:90 @@ -40172,25 +40160,25 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]" #: en/git-pull.txt:95 #, priority:220 msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])." -msgstr "" +msgstr "瓦쇾릉�됮」�㎩댍��맔佯붻��룟룚藥꿨∥�끻춴與▼쓼�꾣뼭�먧벡竊뚥빳�딀삸��틪瑥ζ쎍�경뉵�ⓨ춴與▼쓼�꾢램鵝쒏젒竊덅쭅linkgit:git-fetch[1], linkgit:git-config[1] �� linkgit:gitmodules[5]竊됥��" #. type: Plain text #: en/git-pull.txt:97 #, priority:220 msgid "If the checkout is done via rebase, local submodule commits are rebased as well." -msgstr "" +msgstr "倻귝옖嶺얍눣���싪퓝�섇읃若뚧닇�꾬펽�d퉰�у쑑耶먩Æ�쀧쉪�먧벡阿잋폏熬ュ룜�뷩��" #. type: Plain text #: en/git-pull.txt:99 #, priority:220 msgid "If the update is done via merge, the submodule conflicts are resolved and checked out." -msgstr "" +msgstr "倻귝옖�닸뼭���싪퓝�덂뭉若뚧닇�꾬펽耶먩Æ�쀧쉪�꿰챳弱긴폏熬ヨ㎗�녑뭉熬ユ��ε눣�γ��" #. type: Title ~ #: en/git-pull.txt:101 #, no-wrap, priority:220 msgid "Options related to merging" -msgstr "" +msgstr "訝롥릦亮뜻쐣�녕쉪�됮」" #. type: Labeled list #: en/git-pull.txt:108 @@ -40202,13 +40190,13 @@ msgstr "--preserve-merges and --interactive" #: en/git-pull.txt:114 #, priority:220 msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes." -msgstr "" +msgstr "訝븀쐿�띰펽�②렩�뽩릮弱녶퐪�띶늽��룜�뷴댆訝딀만�녷뵱阿뗤툓�귛쫩�쒏쐣訝�訝よ퓶葉뗨퇎甕ょ쉪�녷뵱訝롣툓歷멨늽��쎑野밧틪竊뚦뭉訝붶툓歷멨늽��쑉訝딀А�룟룚�롨˙�띷뼭兩븀쳦雅녶읃簾�竊뚪궍阿덂룜�뷴갚鴉싦슴�②�岳→겘餓ι겳�띺뇥�겼뻠塋뗩씆�у쑑�꾢룜�뽧��" #. type: Plain text #: en/git-pull.txt:118 #, priority:220 msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details)." -msgstr "" +msgstr "壤볢�營�맏 `merges` �띰펽鵝욜뵪 `git rebase --rebase-merges` 瓦쏂죱�띶뻠竊뚩퓳�룡쑍�곁쉪�덂뭉�먧벡弱긴폏�끻맜�③뇥兩뷰릎竊덅�鰲� linkgit:git-rebase [1]竊됥��" #. type: Plain text #: en/git-pull.txt:120 @@ -40220,19 +40208,19 @@ msgstr "倻귝옖訝튴alse竊뚦닕弱녵툓歷멨늽��릦亮뜹댆壤볟뎺�녷뵱訝���" #: en/git-pull.txt:122 #, priority:220 msgid "When `interactive`, enable the interactive mode of rebase." -msgstr "" +msgstr "壤볢�營�맏 `interactive` �띰펽��뵪�섇읃�꾡벡雅믤Æ凉뤵��" #. type: Plain text #: en/git-pull.txt:126 #, priority:220 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging." -msgstr "" +msgstr "倻귝옖鵝졿꺍溫� `git pull` �삥삸鵝욜뵪 `--rebase` �뚥툖��릦亮띰펽瑥룟뢿鰲� linkgit:git-config [1] 訝�쉪 `pull.rebase`, `branch.< �녷뵱�� >.rebase` �� `branch.autoSetupRebase`��" #. type: Plain text #: en/git-pull.txt:132 #, priority:220 msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully." -msgstr "" +msgstr "瓦숁삸訝�燁띷퐳�①쉪�뚦뜳�⑴쉪�띷뱧鵝쒏Æ凉뤵�� 若껈뇥�쇾틙�녶뤁竊뚦퐪鵝졾럴瀯뤷룕躍껂틙瓦쇾틳�녶뤁�띰펽瓦쇿뭉訝띷삸訝�訝ゅ��녶ㅄ�� �ㅹ씆鵝졽퍝瀯녽쁾瑥삡틙linkgit:git-rebase[1]竊뚦맔�숃��뚥툖誤곥�띴슴�②퓳訝ら�됮」��" #. type: Labeled list #: en/git-pull.txt:133 en/git-svn.txt:261 @@ -40244,73 +40232,73 @@ msgstr "--no-rebase" #: en/git-pull.txt:135 #, priority:220 msgid "This is shorthand for --rebase=false." -msgstr "" +msgstr "瓦숁삸野� --rebase=false �꾤��쇻��" #. type: Title ~ #: en/git-pull.txt:137 #, no-wrap, priority:220 msgid "Options related to fetching" -msgstr "" +msgstr "訝롨렩�뽪쐣�녕쉪�됮」" #. type: Title - #: en/git-pull.txt:148 #, no-wrap, priority:220 msgid "DEFAULT BEHAVIOUR" -msgstr "" +msgstr "容섋�烏뚥맏" #. type: Plain text #: en/git-pull.txt:155 #, priority:220 msgid "Often people use `git pull` without giving any parameter. Traditionally, this has been equivalent to saying `git pull origin`. However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`." -msgstr "" +msgstr "雅뷰뺄瀯뤷만鵝욜뵪 `git pull` �뚥툖瀯쇾뻣鵝뺝뢿�겹�� 鴉좂퍨訝딉펽瓦숂춬�뚥틢瑥� `git pull origin`�� �띈�뚳펽壤볣뀓營� `branch.<�녷뵱��>.remote` �ⓨ늽�� `< �녷뵱�� >` 訝듿눣�경뿶竊뚩��쇌폏熬ョ뵪�δ빰�� `origin`��" #. type: Plain text #: en/git-pull.txt:160 #, priority:220 msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used." -msgstr "" +msgstr "訝뷰틙簾�츣鵝욜뵪餓�阿� URL �θ렩�뽳펽弱녷윥瑥�뀓營� `remote.<瓦쒐쮮��>.url` �꾢�쇽펽倻귝옖亦→쐣瓦숁졆�꾢룜�륅펽弱녵슴�� `$GIT_DIR/remotes/< 瓦쒐쮮�� >` 訝� `URL:` 訝�烏뚨쉪�쇈��" #. type: Plain text #: en/git-pull.txt:169 #, priority:220 msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:" -msgstr "" +msgstr "壤볟뫝餓ㅸ죱訝딀깹�됦뻣鵝뺝폊�②쭊�껃뢿�경뿶竊뚥맏雅녺‘若싪쫨�룟룚�や틳瓦쒐쮮�녷뵱竊덂뭉���됪떓耶섇궓�②퓶葉뗨퇎甕ゅ늽��릎竊됵펽鴉싨윥瑥�뀓營�룜�� `remote.<瓦쒐쮮��>.fetch` �꾢�쇽펽倻귝옖亦→쐣竊뚥폏�θ� `$GIT_DIR/remotes/< 瓦쒐쮮�� >` 亮뜸슴�ⓨ끀 `Pull:` 烏뚣�� �ㅴ틙�ⓦ�롩�됮」�뤻깿�녷룒瓦곁쉪凉뺟뵪鰲꾥똽�쇔폀阿뗥쨼竊뚥퐷瓦섇룾餓ζ쐣訝�訝ょ쐦壅룡씎�뤺퓳�루쉪凉뺟뵪鰲꾥똽�싮뀓寧�폏" #. type: delimited block - #: en/git-pull.txt:172 #, no-wrap, priority:220 msgid "refs/heads/*:refs/remotes/origin/*\n" -msgstr "" +msgstr "refs/heads/*:refs/remotes/origin/*\n" #. type: Plain text #: en/git-pull.txt:179 #, priority:220 msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name." -msgstr "" +msgstr "訝�訝ゅ폊�②쭊�껈�싮뀓寧�퓚窈삥쐣訝�訝ら씆令븀쉪 RHS竊덂뜵恙낂』耶섇궓�②퓶葉뗨퇎甕ゅ늽��릎�룟룚�꾢냵若뱄펹竊뚦끀 LHS �� RHS 恙낂』餓� `/*` 瀯볟갼�� 餓δ툓鰲꾢츣雅녷��됭퓶葉뗥늽��꺗鵝욜뵪�뚦릫�� `refs/remotes/origin/` 掠귝А瀯볠엫訝�쉪瓦쒐쮮瓮잒릉�녷뵱瓦쏂죱瓮잒릉��" #. type: Plain text #: en/git-pull.txt:183 #, priority:220 msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility." -msgstr "" +msgstr "訝뷰틙訝띸졃�뤷릮�묈끉若방�㏆펽簾�츣�②렩�뽩릮�덂뭉�や릉瓦쒐쮮�녷뵱�꾥쭊�숁쐣�밧쨳�귙��" #. type: Plain text #: en/git-pull.txt:186 #, priority:220 msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged." -msgstr "" +msgstr "倻귝옖�� `git pull` �꾢뫝餓ㅸ죱訝�퍢�뷰틙�롧‘�꾢폊�②쭊�껓펽若껂뺄�썰폏熬ュ릦亮뜰��" #. type: Plain text #: en/git-pull.txt:191 #, priority:220 msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such cases, the following rules apply:" -msgstr "" +msgstr "壤볟뫝餓ㅸ죱亦→쐣瀯쇿눣凉뺟뵪鰲꾥똽�띰펽�d퉰 `git pull` 鵝욜뵪�띸쉰�� `$GIT_DIR/remotes/<瓦쒐쮮��>` 訝�쉪凉뺟뵪鰲꾥똽�� �②퓳燁띷깄�듕툔竊뚥빳訝뗨쭊�숅�귞뵪竊�" #. type: Plain text #: en/git-pull.txt:195 #, priority:220 msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged." -msgstr "" +msgstr "倻귝옖壤볟뎺�녷뵱 `<�녷뵱��>` �� `branch.< �녷뵱�� >.merge` �띸쉰耶섇쑉竊뚩퓳弱길삸熬ュ릦亮띄쉪瓦쒐쮮塋숂궧�꾢늽��릫燁겹��" #. type: Plain text #: en/git-pull.txt:197 @@ -40322,13 +40310,13 @@ msgstr "倻귝옖 refspec ��뀲掠��꾬펽 �쇾툖�덂뭉餓삡퐬岳→겘��" #: en/git-pull.txt:199 #, priority:220 msgid "Otherwise the remote branch of the first refspec is merged." -msgstr "" +msgstr "��닕弱녶릦亮띄К訝�訝ゅ폊�②쭊�껆쉪瓦쒐쮮�녷뵱��" #. type: Plain text #: en/git-pull.txt:207 #, priority:220 msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:" -msgstr "" +msgstr "�닸뼭鵝졿��뗩쉮�꾡퍜佯볡쉪瓦쒐쮮瓮잒릉�녷뵱竊뚨꽫�롥컛�뜸릎訝�訝ゅ늽��릦亮뜹댆鵝졾퐪�띸쉪�녷뵱竊�" #. type: delimited block - #: en/git-pull.txt:211 @@ -40344,13 +40332,13 @@ msgstr "" #: en/git-pull.txt:216 #, priority:220 msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details." -msgstr "" +msgstr "�싧만�끻넻訝뗰펽�덂뭉瓦쎿씎�꾢늽��삸瓦쒐쮮餓볟틩�� HEAD竊뚥퐜�됪떓�� branch.<�녷뵱��>.remote �� branch.< �녷뵱�� >.merge �됮」�녑츣竊쏂�鰲� linkgit:git-config[1] ��" #. type: Plain text #: en/git-pull.txt:218 #, priority:220 msgid "Merge into the current branch the remote branch `next`:" -msgstr "" +msgstr "弱녻퓶葉뗥늽�� `next` �덂뭉�겼퐪�띶늽��폏" #. type: delimited block - #: en/git-pull.txt:221 @@ -40362,7 +40350,7 @@ msgstr "$ git pull origin next\n" #: en/git-pull.txt:226 #, priority:220 msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`. The same can be done by invoking fetch and merge:" -msgstr "" +msgstr "瓦쇿컛�� FETCH_HEAD 訝�쉨�띄븰訝� `next` �꾢돬�э펽亮뜻쎍�계퓶葉뗨퇎甕ゅ늽�� `origin/next`�� �뚧졆��빳�싪퓝瘟껆뵪 fetch �� merge �ε츑�먲폏" #. type: delimited block - #: en/git-pull.txt:230 @@ -40378,13 +40366,13 @@ msgstr "" #: en/git-pull.txt:235 #, priority:220 msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'." -msgstr "" +msgstr "倻귝옖鵝졾컼瑥뺜틙訝�轝→땳�뽳펽野쇠눜雅녶쨳�귞쉪�꿰챳竊뚧꺍�띷뼭凉�冶뗰펽鵝졾룾餓η뵪 'git reset' �ζ걿鸚띲��" #. type: Plain text #: en/git-pull.txt:247 #, priority:220 msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version." -msgstr "" +msgstr "鵝욜뵪 --recurse-submodules �겼쑉�よ꺗�룟룚藥꿰퍘嶺얍눣�꾢춴與▼쓼�꾣뼭�먧벡�귚풃倻귨펽壤볞툓歷멨쑉�싧닖�룟룚�꾥텈瀛㏝」��쉪�먧벡訝�렌�졽틙訝�訝ゆ뼭�꾢춴與▼쓼�띰펽耶먩Æ�쀦쑍翁ヤ툖�썼˙�룟룚竊뚩퓳鵝욕풓餓ε릮訝띺�誤곩냽轝↑렩�뽩갚�썹��븃�耶먩Æ�쀣�귟퓳訝ら뿮窯섉쐣�쎾쑉�ゆ씎�� Git �덃쑍訝�˙岳�쨳��" #. type: Plain text #: en/git-pull.txt:251 @@ -40402,7 +40390,7 @@ msgstr "git-push(1)" #: en/git-push.txt:7 #, priority:220 msgid "git-push - Update remote refs along with associated objects" -msgstr "" +msgstr "git-push - 訝롧쎑�녑�穩▽�壅룡쎍�계퓶葉뗥늽��폊��" #. type: Plain text #: en/git-push.txt:18 @@ -40414,49 +40402,49 @@ msgid "" "\t [--[no-]signed|--signed=(true|false|if-asked)]\n" "\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n" "\t [--no-verify] [<repository> [<refspec>...]]\n" -msgstr "" +msgstr "'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n\t [--repo=<餓볟틩>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n\t [-u | --set-upstream] [-o <耶쀧Е訝�> | --push-option=<耶쀧Е訝�>]\n\t [--[no-]signed|--signed=(true|false|if-asked)]\n\t [--force-with-lease[=<凉뺟뵪��>[:<expect>]] [--force-if-includes]]\n\t [--no-verify] [<餓볟틩> [<凉뺟뵪鰲꾥똽>...]]\n" #. type: Plain text #: en/git-push.txt:24 #, priority:220 msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs." -msgstr "" +msgstr "鵝욜뵪�у쑑凉뺟뵪�닸뼭瓦쒐쮮餓볟틩凉뺟뵪竊뚦릪�뜹룕�곩츑�먪퍢若싧폊�①쉪恙낁쫨野배괌��" #. type: Plain text #: en/git-push.txt:28 #, priority:220 msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]." -msgstr "" +msgstr "�싪퓝溫양쉰 �쒒뮝耶먥�앾펽鵝졾룾餓ε쑉驪뤸А�③�곩댆訝�訝や퍜佯볠뿶竊뚩�若껃룕�잍쐣擁g쉪雅뗦깄�� 鰲� linkgit:git-receive-pack[1] �꾣뻼旅c��" #. type: Plain text #: en/git-push.txt:33 #, priority:220 msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to 'origin'." -msgstr "" +msgstr "壤볟뫝餓ㅸ죱亦→쐣�� `<餓볟틩>` �귝빊�뉐츣�③�곦퐤營�뿶竊뚥폏�귟�껃퐪�띶늽��쉪 `branch.*.remote` �띸쉰�ε넶若싨렓�곦퐤營��� 倻귝옖�띸쉰訝℡ㅁ竊뚦닕容섋�訝� \"origin\"��" #. type: Plain text #: en/git-push.txt:39 #, ignore-ellipsis, priority:220 msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)." -msgstr "" +msgstr "壤볟뫝餓ㅸ죱亦→쐣�� `<凉뺟뵪鰲꾥똽>...` �귝빊�� `--all`��`--mirror`��`--tags` �됮」�뉐츣�③�곩냵若방뿶竊뚦뫝餓ㅹ�싪퓝�ι쁾 `remote.*.push` �띸쉰�얍댆容섋��� `< 凉뺟뵪鰲꾥똽 >`竊뚦쫩�쒏깹�됪돻�곤펽�쇾빳 `push.default` �띸쉰�녑츣�③�곩냵若뱄펷�념틢 `push.default` �꾢맜阿됵펽鰲� linkgit竊쉍it-config[1] 竊됥��" #. type: Plain text #: en/git-push.txt:46 #, priority:220 msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one." -msgstr "" +msgstr "壤볟뫝餓ㅸ죱�뚪뀓營�꺗亦→쐣�뉐츣�③�곭쉪�끻��띰펽弱녵슴�③퍡溫ㅸ죱訝븝펽瓦쇾툗 `push.default` �� `simple` �쇘쎑野밧틪竊싧퐪�띶늽��˙�③�곩댆�멨틪�꾡툓歷멨늽��펽鵝녵퐳訝뷰�窈밧츎�ⓩ렕�쏙펽倻귝옖訝딀만�녷뵱�꾢릫燁겻툗�у쑑�녷뵱訝띴��댐펽�③�곩컛熬ヤ릎閭㏂��" #. type: Title - #: en/git-push.txt:49 #, no-wrap, priority:220 msgid "OPTIONS[[OPTIONS]]" -msgstr "" +msgstr "�됮」[[OPTIONS]]" #. type: Plain text #: en/git-push.txt:55 #, priority:220 msgid "The \"remote\" repository that is destination of a push operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)." -msgstr "" +msgstr "鵝쒍맏�③�곫뱧鵝쒐쉪��쉪�곁쉪�쒑퓶葉뗢�앬퍜佯볝�� 瓦쇾릉�귝빊��빳���訝� URL竊덅쭅訝뗩씊 <<URLS,GIT URLS>> 訝��귨펹竊뚥튋��빳���訝よ퓶葉뗥틩�꾢릫燁곤펷鰲곦툔�� <<瓦쒐쮮餓볟틩,REMOTES>> 訝��귨펹��" #. type: Labeled list #: en/git-push.txt:56 @@ -40468,37 +40456,37 @@ msgstr "<refspec>..." #: en/git-push.txt:61 #, priority:220 msgid "Specify what destination ref to update with what source object. The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>." -msgstr "" +msgstr "�뉐츣�ⓧ�阿덃틦野배괌�ζ쎍�겼벆訝ょ쎅�뉐뢿�껅뻼���� <凉뺟뵪鰲꾥똽> �귝빊�꾣졏凉뤸삸訝�訝ゅ룾�됬쉪�졾뤇 `+`竊뚦릮�€삸繹먨�穩� <src>竊뚦릮�€삸�믣뤇 `:`竊뚦릮�€삸��젃凉뺟뵪 <dst>��" #. type: Plain text #: en/git-push.txt:65 #, priority:220 msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])." -msgstr "" +msgstr "<src> �싧만��퐷�녔렓�곭쉪�녷뵱�꾢릫耶쀯펽鵝녶츆��빳��뻣鵝뺜뻣�뤹쉪�쏶HA-1 烏②씨凉뤴�앾펽驪붷쫩 `master~4` �� `HEAD`竊덅쭅 linkgit:gitrevisions [7]竊됥��" #. type: Plain text #: en/git-push.txt:75 #, priority:220 msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named. If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line. Otherwise, missing `:<dst>` means to update the same ref as the `<src>`." -msgstr "" +msgstr "<dst> 瓦쒐쮮餓볟틩�꾢벆訝ゅ폊�②˙瓦쇾릉�③�곫쎍�겹�귟퓳�뚥툖�썰슴�ⓧ뻣�뤹쉪烏②씨凉륅펽恙낂』�썲릫訝�訝ゅ츩�끿쉪凉뺟뵪�� 倻귝옖 `git push [< 餓볟틩 >]` 亦→쐣餓삡퐬 `< 凉뺟뵪鰲꾥똽 >` �귝빊熬ヨ�營�뵪 `remote.< 餓볟틩 >.push` �띸쉰�섌뇧�닸뼭��쉪�� `<src>` �꾣윇訝ゅ폊�⑨펽��`:<dst>` �ⓨ늽��빳�곭븼 �붴�� 瓦숁졆�꾣렓�곩컛�닸뼭 `<src>` �싧만�닸뼭�꾢폊�⑨펽�썰빱烏뚥툓亦→쐣餓삡퐬 `< 凉뺟뵪鰲꾥똽 >`�� ��닕竊뚨성弱� `:<dst>` �뤷뫑���닸뼭訝� `<src>` �멨릪�꾢폊�ⓦ��" #. type: Plain text #: en/git-push.txt:80 #, priority:220 msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous." -msgstr "" +msgstr "倻귝옖 <dst> 訝띷삸餓� `refs/` 凉�鸚댐펷堊뗥쫩 `refs/heads/master`竊됵펽�묇뺄弱녷졊��˙�③�곭쉪 <src> �꾤굳�뗥뭽 <dst> ��맔�ョ퀕訝띷툍竊뚦컼瑥뺞렓��츆�①쎅�꾢쑑 < 餓볟틩 > �� `refs/*` 訝�쉪鵝띸쉰��" #. type: Plain text #: en/git-push.txt:84 #, priority:220 msgid "If <dst> unambiguously refers to a ref on the <repository> remote, then push to that ref." -msgstr "" +msgstr "倻귝옖 <dst> �롧‘�경뙁�� < 餓볟틩 > 瓦쒐쮮�꾡�訝ゅ폊�⑨펽�d퉰弱길렓�곩댆瑥ε폊�ⓦ��" #. type: Plain text #: en/git-push.txt:87 #, priority:220 msgid "If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then prepend that to <dst>." -msgstr "" +msgstr "倻귝옖 <src> 鰲f옄訝뷰빳 refs/heads/ �� refs/tags/ 凉�鸚당쉪凉뺟뵪竊뚦닕弱녶끀�띸쉰�� <dst>��" #. type: Plain text #: en/git-push.txt:93 @@ -68253,7 +68241,7 @@ msgstr "--object-names" #: en/rev-list-options.txt:929 #, priority:260 msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior. Note that the \"name\" of each object is ambiguous, and mostly intended as a hint for packing objects. In particular: no distinction is made between the names of tags, trees, and blobs; path names may be modified to remove newlines; and if an object would appear multiple times with different names, only one name is shown." -msgstr "" +msgstr "�ゅ� `--objects` �됬뵪竊쎿돀�경돻�곁쉪野배괌ID�꾢릫燁겹�귟퓳��퍡溫ㅷ쉪烏뚥맏�귝낏�륅펽驪뤶릉野배괌�� \"�띶춻\" ��Æ楹딁쉪竊뚥말誤곫삸鵝쒍맏�볟똿野배괌�꾣룓鹽뷩�귞돶�ユ삸竊싨젃嶺얇�곫젒�뚥틠瓦쎾댍�뉏뻑�꾢릫耶쀤툖鵝쒎뙷�놅폑瓮�푶�띸㎞��빳熬ヤ엶�밥빳�좈솮��죱竊쎾쫩�쒍�訝ゅ�穩▽폏餓δ툖�뚨쉪�띶춻�븀렟鸚싨А竊뚦닕�ゆ샑鹽뷰�訝ゅ릫耶쀣��" #. type: Labeled list #: en/rev-list-options.txt:930