diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 99083c99e1f13808ae18911395df322e264b4b49..117785d1080e6b49d4a76f11f066bd1db871d17e 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-10-09 18:58+0200\n" -"PO-Revision-Date: 2020-08-05 11:32+0000\n" -"Last-Translator: �� <ranto2012@163.com>\n" +"PO-Revision-Date: 2020-10-16 19:26+0000\n" +"Last-Translator: Alex Zhao <zhao.zhiyuan115@gmail.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.2-dev\n" +"X-Generator: Weblate 4.3.1-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -1385,8 +1385,8 @@ msgstr "" msgid "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]" -#. type: Plain text # �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁� +#. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 #, priority:100 msgid "Find symbolic names for given revs." @@ -6449,8 +6449,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:379 #, no-wrap, priority:300 msgid "modified content" @@ -6554,9 +6554,9 @@ msgstr "GIT" #. type: Plain text #: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:603 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:216 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:179 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:420 en/git-write-tree.txt:42 en/gitglossary.txt:27 -#, fuzzy, priority:300 +#, priority:300 msgid "Part of the linkgit:git[1] suite" -msgstr "linkgit:git[1] �ⓨ늽" +msgstr "linkgit:git[1] 瀯꾡뻑�꾡��ⓨ늽" #. type: Title = #: en/git-am.txt:2 @@ -13676,7 +13676,8 @@ msgstr "" "\t [--dissociate] [--separate-git-dir <git dir>]\n" "\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n" "\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n" -"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n" +"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse]\n" +"\t [--filter=<filter>] [--] <repository>\n" "\t [<directory>]\n" #. type: Plain text @@ -13687,9 +13688,11 @@ msgstr "弱녶춼�ⓨ틩�뗩쉮�경뼭�쎾뻠�꾤쎅壤뺜릎竊뚥맏�뗩쉮耶섇궓佯볞릎�꾣캀 #. type: Plain text #: en/git-clone.txt:36 -#, fuzzy, priority:300 +#, priority:300 msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)." -msgstr "�뗩쉮�롳펽鴉싨돢烏뚥툖躍�뢿�곁쉪`git fetch`�썰빱竊뚦끀弱녷쎍�경��됭퓶葉뗨퇎甕ょ쉪�녷뵱竊쏁꽫�롦돢烏뚥툖躍�뢿�곁쉪`git pull`�썰빱竊뚦끀弱녷뒍瓦쒐쮮訝삣늽��릦亮뜹댆壤볟뎺訝삣늽��펷倻귝옖耶섇쑉竊됵펷倻귝옖瀯쇿츣��--single branch�앭뢿�곤펽�쇾툖�㎬죱竊쏂��귡쁾訝뗦뻼竊됥��" +msgstr "" +"�뗩쉮�롳펽�㎬죱訝띶를�귝빊��`git fetch`�썰빱弱녷쎍�경��됭퓶葉뗨퇎甕ょ쉪�녷뵱竊뚧돢烏뚥툖躍�뢿�곁쉪`git " +"pull`�썰빱弱녶룱�딂퓶葉땘aster�녷뵱�덂뭉�겼퐪�뛪aster�녷뵱竊덂쫩�쒎춼�⑨펹竊덂쫩�쒒셿�졻��--single-branch�앭뢿�곤펽�숁깄�듕툖�뚳폑瑥룟뢿�끺툔�뉛펹��" #. type: Plain text #: en/git-clone.txt:41 @@ -13741,17 +13744,7 @@ msgstr "壤볢쫨�뗩쉮�꾢춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓�띰펽訝띴슴�①\�얏렏 #. type: Plain text #: en/git-clone.txt:84 -#, fuzzy, no-wrap, priority:300 -#| msgid "" -#| "*NOTE*: this is a possibly dangerous operation; do *not* use\n" -#| "it unless you understand what it does. If you clone your\n" -#| "repository using this option and then delete branches (or use any\n" -#| "other Git command that makes any existing commit unreferenced) in the\n" -#| "source repository, some objects may become unreferenced (or dangling).\n" -#| "These objects may be removed by normal Git operations (such as `git commit`)\n" -#| "which automatically call `git gc --auto`. (See linkgit:git-gc[1].)\n" -#| "If these objects are removed and were referenced by the cloned repository,\n" -#| "then the cloned repository will become corrupt.\n" +#, no-wrap, priority:300 msgid "" "*NOTE*: this is a possibly dangerous operation; do *not* use\n" "it unless you understand what it does. If you clone your\n" @@ -13768,8 +13761,8 @@ msgstr "" "�뜹릮�ⓩ틦耶섇궓佯볞릎�좈솮�녷뵱\n" "竊덃닑鵝욜뵪餓삡퐬�뜸퍟鵝욜렟�됪룓雅ㅸ㎗�ㅵ폊�①쉪 Git �썰빱竊됵펽\n" "�먧틳野배괌��꺗鴉싧룜孃쀦쑋凉뺟뵪竊덃닑�х㈉竊됥��\n" -"瓦쇾틳野배괌��빳�싪퓝躍멱쭊�� Git �띴퐳竊덁풃倻� `git commit`竊됧닠�ㅳ��\n" -"若껂폏�ゅ뒯瘟껆뵪 `git gc --auto`�귨펷瑥룟뢿�꿯inkgit:git-gc [1]�귨펹\n" +"瓦쇾틳野배괌��꺗熬ュ만鰲꾤쉪 Git �띴퐳竊덁풃倻� `git commit`竊됧닠�ㅳ��\n" +"若껂폏�ゅ뒯瘟껆뵪 `git maintenance run --auto`�귨펷瑥룟뢿�꿯inkgit:git-maintenance[1]�귨펹\n" "倻귝옖瓦쇾틳野배괌藥꿨닠�ㅵ뭉熬ュ뀑�녺쉪耶섇궓佯볟폊�⑨펽\n" "�d퉰�뗩쉮�꾢춼�ⓨ틩弱녷뜜�뤵��\n" @@ -13821,9 +13814,9 @@ msgstr "餓롧뵪 `--reference` �됮」�뉐츣�꾢뢿�껃춼�ⓨ틩訝��잏뵪野배괌餓끾삸 #. type: Plain text #: en/git-clone.txt:124 -#, fuzzy, priority:300 +#, priority:300 msgid "Operate quietly. Progress is not reported to the standard error stream." -msgstr "若됮쓾�띴퐳�귟퓵佯╊툖鴉싨뒫�딁퍢�뉐뇛�숃�役곥��" +msgstr "�숅퍡�띴퐳�귟퓵佯╊툖鴉싨뒫�딁퍢�뉐뇛�숃�役곥��" #. type: Plain text #: en/git-clone.txt:129 @@ -13839,7 +13832,7 @@ msgstr "容섋��끻넻訝뗰펽�꾢뒥�곁퍑塋�뿶竊뚥폏弱녻퓵佯�듁�곫뒫�딁퍢�뉐뇛 #. type: Plain text #: en/git-clone.txt:147 -#, fuzzy, priority:300 +#, priority:300 msgid "No checkout of HEAD is performed after the clone is complete." msgstr "�뗩쉮若뚧닇�롳펽訝띷돢烏똇EAD汝��뷸뱧鵝쒌��" @@ -13851,9 +13844,13 @@ msgstr "--bare" #. type: Plain text #: en/git-clone.txt:159 -#, fuzzy, priority:300 +#, priority:300 msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created." -msgstr "�쎾뻠訝�訝も�쒑8�쒰it耶섇궓佯볝�귚튋弱길삸瑥댐펽訝띹쫨�쎾뻠 `<directory>` 亮뜹컛嶸←릤�뉏뻑�얍쑉 `<directory>/.git`竊뚩�뚧삸弱� `<directory>` �ц벴溫얌맏`$git_DIR`�귟퓳�양꽫�쀥맜�� `--no-checkout` �됮」竊뚦썱訝뷸깹�됧쑑�방��뷴램鵝쒏젒�귝�鸚뽳펽瓦쒐쮮�꾢늽��ㅄ�닸렏鸚띶댍�곁쎑佯붺쉪�у쑑�녷뵱鸚댐펽�뚥툖弱녶츆餓ф삝弱꾢댆 `refs/remotes/origin/`�귚슴�ⓩ��됮」�띰펽訝띴폏�쎾뻠瓦쒐쮮瓮잒릉�녷뵱�뽫쎑�녜뀓營�룜�뤵��" +msgstr "" +"�쎾뻠訝�訝も�쒐변�쒰it耶섇궓佯볝�귚튋弱길삸瑥댐펽訝띹쫨�쎾뻠 `<directory>` 亮뜹컛嶸←릤�뉏뻑�얍쑉 `<directory>/.git`竊뚩�뚧삸弱� " +"`<directory>` �ц벴溫얌맏`$GIT_DIR`�귟퓳�양꽫�쀥맜�� `--no-checkout` " +"�됮」竊뚦썱訝뷸깹�됧쑑�밧룾餓ζ��뷴램鵝쒏젒�귝�鸚뽳펽瓦쒐쮮�꾢늽��ㅄ�닸렏鸚띶댍�곁쎑佯붺쉪�у쑑�녷뵱鸚댐펽�뚥툖弱녶츆餓ф삝弱꾢댆 `refs/remotes/origin/" +"`�귚슴�ⓩ��됮」�띰펽訝띴폏�쎾뻠瓦쒐쮮瓮잒릉�녷뵱�뽫쎑�녜뀓營�룜�뤵��" #. type: Labeled list #: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490 @@ -13875,9 +13872,13 @@ msgstr "--filter=<瓦뉑빱�ⓨ츣阿�>" #. type: Plain text #: en/git-clone.txt:175 -#, fuzzy, priority:300 +#, priority:300 msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]." -msgstr "鵝욜뵪�ⓨ늽�뗩쉮�잒꺗竊뚩쫨黎귝쐨�▼솳�방뜮瀯쇿츣�꾢�穩↑퓝譯ㅵ솳�묌�곦�訝ゅ룾�계씨�꾢�穩←쉪耶먬썓�귛퐪鵝욜뵪 `--filter` �됮」�띰펽�먧풘�� `<瓦뉑빱�ⓨ츣阿�>` 弱녻˙�ⓧ틢�ⓨ늽�뗩쉮�귚풃倻귨펽`--filter=blob:none` 弱녻퓝譯ㅶ럦���됬쉪�경뜮野배괌竊덃뻼餓뜹냵若뱄펹竊뚨쎍�� Git ��誤곭쎑佯붺쉪�경뜮�귛룱鸚뽳펽`--filter=blob:limit=<鸚㎩컦>` 弱녻퓝譯ㅶ럦���됪뻼餓뜹ㄷ弱뤺눛弱묇맏 `<鸚㎩컦>` �꾣빊���穩▲�귛뀽雅롨퓝譯ㅵ솳若싦퉱�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:git-rev-list[1] 訝�쉪 `--filter` �됮」��" +msgstr "" +"鵝욜뵪�ⓨ늽�뗩쉮�잒꺗竊뚩쫨黎귝쐨�▼솳�방뜮瀯쇿츣�꾢�穩↑퓝譯ㅵ솳�묌�곦�訝ゅ룾�계씨�꾢�穩←쉪耶먬썓�귛퐪鵝욜뵪 `--filter` �됮」�띰펽�먧풘�� `<filter-spec>` " +"弱녻˙�ⓧ틢�ⓨ늽�뗩쉮瓦뉑빱�ⓦ�귚풃倻귨펽`--filter=blob:none` 弱녻퓝譯ㅶ럦���됬쉪�경뜮野배괌竊덃뻼餓뜹냵若뱄펹竊뚨쎍�� Git " +"��誤곭쎑佯붺쉪�경뜮�귛룱鸚뽳펽`--filter=blob:limit=<size>` 弱녻퓝譯ㅶ럦���됪뻼餓뜹ㄷ弱뤺눛弱묇맏 `<size>` " +"�꾣빊���穩▲�귛뀽雅롨퓝譯ㅵ솳若싦퉱�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:git-rev-list[1] 訝�쉪 `--filter` �됮」��" #. type: Labeled list #: en/git-clone.txt:176 en/git-push.txt:161