diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index 2421d0f93d723e9a1149acc3fb279fe55016b9c7..2633bcfc87a88c572447595ee9e4005cf9392736 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-02-24 08:40+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.16-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-03-25 18:56+0000\nLast-Translator: 凉졾ㄹ壅� <472546172@qq.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.17-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 @@ -1673,8 +1661,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." @@ -4067,10 +4055,9 @@ msgstr "�잍닇烏δ툈竊덂뢿�끿뵟�먫‥訝곭쉪�멨뀽塋좄뒄竊됥��" #. type: Plain text #: en/diff-options.txt:28 -#, fuzzy, priority:280 -#| msgid "Generating patch text with -p" +#, priority:280 msgid "<<generate_patch_text_with_p, \"Generating patch text with -p\">>)." -msgstr "鵝욜뵪�됮」 `-p` �잍닇烏δ툈�뉑쑍" +msgstr "鵝욜뵪�됮」 `-p` �잍닇烏δ툈�뉑쑍��" #. type: Plain text #: en/diff-options.txt:31 @@ -4220,7 +4207,7 @@ msgstr "--remerge-diff" #: en/diff-options.txt:80 #, priority:280 msgid "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." -msgstr "" +msgstr "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." #. type: Plain text #: en/diff-options.txt:84 @@ -4688,9 +4675,9 @@ msgstr "--cumulative" #. type: Plain text #: en/diff-options.txt:289 -#, fuzzy, priority:280 +#, priority:280 msgid "Synonym for --dirstat=cumulative" -msgstr "--dirstat=cumulative �꾢릪阿됭칾��" +msgstr "--dirstat=cumulative �뚥퉱" #. type: Labeled list #: en/diff-options.txt:290 @@ -5810,19 +5797,19 @@ msgstr "�①뵟�먨량凉귝뿶恙썹븼耶먩Æ�쀧쉪岳�뵻��<when> ��빳�� \"none\" #. type: Labeled list #: en/diff-options.txt:846 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--src-prefix=<prefix>" msgstr "--src-prefix=<prefix>" #. type: Plain text #: en/diff-options.txt:848 -#, fuzzy, priority:280 +#, priority:280 msgid "Show the given source prefix instead of \"a/\"." msgstr "�양ㅊ瀯쇿츣�꾣틦�띸��뚥툖�� \"a/\"��" #. type: Labeled list #: en/diff-options.txt:849 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--dst-prefix=<prefix>" msgstr "--dst-prefix=<prefix>" @@ -5846,7 +5833,7 @@ msgstr "訝띷샑鹽뷰뻣鵝뺞틦�뽫쎅�꾢뎺煐���" #. type: Labeled list #: en/diff-options.txt:855 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--line-prefix=<prefix>" msgstr "--line-prefix=<prefix>" @@ -6632,9 +6619,9 @@ msgstr "--sparse" #. type: Plain text #: en/git-add.txt:88 -#, fuzzy, priority:300 +#, priority:300 msgid "Allow updating index entries outside of the sparse-checkout cone. Normally, `git add` refuses to update index entries whose paths do not fit within the sparse-checkout cone, since those files might be removed from the working tree without warning. See linkgit:git-sparse-checkout[1] for more details." -msgstr "�곮��닸뼭葉��뤸��� cone 阿뗥쨼�꾤뇨凉뺞씉���귡�싧만竊�`git add` �믥퍦�닸뼭�띈러孃꾡툖�귛릦葉��뤸��� cone �꾤뇨凉뺞씉��펽�졽맏瓦쇾틳�뉏뻑��꺗鴉싧쑉亦→쐣鈺�몜�꾣깄�듕툔餓롥램鵝쒎뙷訝�닠�ㅳ�귝쐣�녔쎍鸚싪�瀯녵에��펽瑥룟뢿�낂벦�� git:git-sparse-checkout[1]��" +msgstr "�곮��닸뼭葉��뤸��� cone 阿뗥쨼�꾤뇨凉뺞씉���� �싧만竊�`git add` �믥퍦�닸뼭�띈러孃꾡툖�귛릦葉��뤸��� cone �꾤뇨凉뺞씉��펽�졽맏瓦쇾틳�뉏뻑��꺗鴉싧쑉亦→쐣鈺�몜�꾣깄�듕툔餓롥램鵝쒎뙷訝�닠�ㅳ�귝쐣�녔쎍鸚싪�瀯녵에��펽瑥룟뢿�낂벦�� git:git-sparse-checkout[1]��" #. type: Labeled list #: en/git-add.txt:89 en/git-am.txt:137 en/git-branch.txt:155 en/git-clean.txt:44 en/git-commit.txt:301 en/git-cvsimport.txt:88 en/git-grep.txt:82 en/git-help.txt:91 en/git-ls-files.txt:57 en/git-read-tree.txt:49 en/git-rebase.txt:518 en/git-repack.txt:184 en/git-tag.txt:130 en/rev-list-options.txt:78 @@ -6758,7 +6745,7 @@ msgstr "閭ㅹ�됮」訝삭쫨�ⓧ틢躍�뒰�d틳阿졿꺈雅롨푵�㎫뎵�� Git �꾤뵪�룔�� #. type: Labeled list #: en/git-add.txt:154 en/git-format-patch.txt:122 en/git-submodule.txt:355 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "-N" msgstr "-N" @@ -6873,7 +6860,7 @@ msgstr "�ゆ쐣�ⓧ슴�� `--pathspec-from-file` �뜻뎺�됪꼷阿됥�귝뙁若싪러孃꾢뀇 #. type: Labeled list #: en/git-add.txt:213 en/git-check-attr.txt:44 en/git-checkout-index.txt:77 en/git-checkout.txt:364 en/git-commit.txt:398 en/git-grep.txt:303 en/git-ls-files.txt:225 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:62 en/git-stash.txt:245 en/git-update-index.txt:226 en/git-verify-pack.txt:36 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "\\--" msgstr "\\--" @@ -6885,7 +6872,7 @@ msgstr "閭ㅹ�됮」��뵪雅롥늽獵삣뫝餓ㅸ죱�됮」�뚧뻼餓뜹닓烏⑨펷壤볠뻼餓뜹릫�� #. type: Title - #: en/git-add.txt:220 en/git-archive.txt:182 en/git-bisect.txt:380 en/git-branch.txt:348 en/git-bundle.txt:231 en/git-check-attr.txt:76 en/git-checkout-index.txt:149 en/git-checkout.txt:520 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:337 en/git-column.txt:50 en/git-commit.txt:410 en/git-config.txt:435 en/git-credential-cache.txt:58 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:259 en/git-describe.txt:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:65 en/git-for-each-ref.txt:301 en/git-format-patch.txt:714 en/git-grep.txt:315 en/git-http-backend.txt:69 en/git-imap-send.txt:62 en/git-init.txt:157 en/git-interpret-trailers.txt:272 en/git-log.txt:136 en/git-ls-remote.txt:100 en/git-merge-file.txt:84 en/git-merge.txt:352 en/git-name-rev.txt:91 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:202 en/git-push.txt:598 en/git-range-diff.txt:135 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:220 en/git-request-pull.txt:50 en/git-reset.txt:137 en/git-restore.txt:150 en/git-revert.txt:131 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:175 en/git-send-email.txt:473 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:286 en/git-stripspace.txt:49 en/git-switch.txt:193 en/git-update-index.txt:360 en/git-var.txt:28 en/git-worktree.txt:479 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "EXAMPLES" msgstr "若욂풃" @@ -6897,7 +6884,7 @@ msgstr "曆삣뒥 `Documentation` ��퐬�듿끀耶먪쎅壤뺜툔���� `*.txt` �뉏뻑�� #. type: delimited block - #: en/git-add.txt:227 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "$ git add Documentation/\\*.txt\n" msgstr "$ git add Documentation/\\*.txt\n" @@ -6915,7 +6902,7 @@ msgstr "餓롦��� git-*.sh �싨쑍訝�렌�졾냵若뱄폏" #. type: delimited block - #: en/git-add.txt:237 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "$ git add git-*.sh\n" msgstr "$ git add git-*.sh\n" @@ -6927,7 +6914,7 @@ msgstr "�졽맏瓦쇾릉鹽뷰풃�곮� shell �⒴콝�잌뤇竊덂뜵�얍폀�쀥눣�뉏뻑竊� #. type: Title - #: en/git-add.txt:244 en/git-rebase.txt:823 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "INTERACTIVE MODE" msgstr "雅ㅴ틨與▼폀" @@ -6971,7 +6958,7 @@ msgstr "訝삣뫝餓ㅵ쑵��쐣6訝ゅ춴�썰빱竊덂똿�у리�⒴뭽���븝펹��" #. type: Labeled list #: en/git-add.txt:266 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "status" msgstr "�뜻��" @@ -7049,7 +7036,7 @@ msgstr "瓦쏂죱�됪떓�롳펽渦볟뀯令븃죱竊뚥빳堊요맏榮℡폊訝��됧츣�꾥러孃꾣쉨耶� #. type: Labeled list #: en/git-add.txt:319 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "revert" msgstr "瓦섇렅" @@ -7061,7 +7048,7 @@ msgstr "若껅쐣訝�訝や툗 'update' �욃만�멧세�꾡벡雅믦퓝葉뗰펽���됭러孃꾤쉪 #. type: Labeled list #: en/git-add.txt:325 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "add untracked" msgstr "曆삣뒥�よ퇎甕ゆ뻼餓�" @@ -7073,7 +7060,7 @@ msgstr "若껅쐣訝�訝や툗 'update' �� 'revert' �욃만�멧세�꾡벡雅믦퓝葉뗰펽�� #. type: Labeled list #: en/git-add.txt:330 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "patch" msgstr "烏δ툈" @@ -7143,7 +7130,7 @@ msgstr "瓦쇾슴�ⓨ룾餓ζ윥�뗨쫨�먧벡�꾢냵若뱄펷�놂펽�쭴EAD�뚨뇨凉뺜퉳�� #. type: Title - #: en/git-add.txt:366 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "EDITING PATCHES" msgstr "煐뽬풌烏δ툈" @@ -7155,7 +7142,7 @@ msgstr "瘟껆뵪`git add -e`�뽨퍗雅ㅴ틨凉뤷쓼�됪떓�ⓧ릎�됪떓`e`�썰빱竊뚦컛�� #. type: Labeled list #: en/git-add.txt:378 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "added content" msgstr "曆삣뒥�꾢냵若�" @@ -7167,7 +7154,7 @@ msgstr "曆삣뒥�꾢냵若밥빳�� {plus}�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�좈솮若� #. type: Labeled list #: en/git-add.txt:383 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "removed content" msgstr "�좈솮�꾢냵若�" @@ -7177,10 +7164,10 @@ 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 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "modified content" msgstr "岳�뵻�꾢냵若�" @@ -7216,7 +7203,7 @@ msgstr "榮℡폊�뚦램鵝쒏젒阿뗩뿴亦→쐣�뷴닽�꾢냵若밧룾�썰폏�양ㅊ�ⓧ툓訝뗦뻼 #. type: Labeled list #: en/git-add.txt:414 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "modifying existing content" msgstr "岳�뵻�경쐣�꾢냵若�" @@ -7228,7 +7215,7 @@ msgstr "阿잌룾餓ι�싪퓝�귛춼訝듾툔�뉓죱竊덆�싪퓝弱녳�� �앲쉬�㏘맏��-�앾펹 #. type: Labeled list #: en/git-add.txt:422 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "new content" msgstr "�곁쉪�끻�" @@ -7637,13 +7624,13 @@ msgstr "" #. type: Labeled list #: en/git-am.txt:165 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 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-S[<keyid>]" msgstr "-S[<keyid>]" #. type: Labeled list #: en/git-am.txt:166 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:390 en/git-rebase.txt:399 en/git-revert.txt:92 en/merge-options.txt:85 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--gpg-sign[=<keyid>]" msgstr "--gpg-sign[=<keyid>]" @@ -7746,7 +7733,7 @@ msgstr "" #. type: Title - #: en/git-am.txt:212 en/git-commit.txt:541 en/git-format-patch.txt:431 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:231 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "DISCUSSION" msgstr "溫②�" @@ -10144,23 +10131,7 @@ msgstr "git-branch - �쀥눣�곩닗兩뷸닑�좈솮�녷뵱" #. type: Plain text #: en/git-branch.txt:27 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 -#| msgid "" -#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" -#| "\t[-v [--abbrev=<n> | --no-abbrev]]\n" -#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n" -#| "\t[--merged [<commit>]] [--no-merged [<commit>]]\n" -#| "\t[--contains [<commit>]] [--no-contains [<commit>]]\n" -#| "\t[--points-at <object>] [--format=<format>]\n" -#| "\t[(-r | --remotes) | (-a | --all)]\n" -#| "\t[--list] [<pattern>...]\n" -#| "'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n" -#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n" -#| "'git branch' --unset-upstream [<branchname>]\n" -#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-d | -D) [-r] <branchname>...\n" -#| "'git branch' --edit-description [<branchname>]\n" +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" "\t[-v [--abbrev=<n> | --no-abbrev]]\n" @@ -10178,22 +10149,7 @@ msgid "" "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" "'git branch' (-d | -D) [-r] <branchname>...\n" "'git branch' --edit-description [<branchname>]\n" -msgstr "" -"'git branch' [--color[=<when>] |--no-color] [--show-current]\n" -"\t[-v [--abbrev=<n> |--no-abbrev] ]\n" -"\t[--column[=<options>] | --no-column][--sort=<key>]\n" -"\t[--�덂뭉 [<commit>]][--no-merged [<commit>]]��\n" -"\t[--�끻맜[<commit>]][--no-contains [<commit>]] [--contains [<commit>]]\n" -"\t[--points-at <object>] [--format=<format>]��\n" -"\t[(-r | --remotes) | (-a | --all)\n" -"\t[--�쀨〃] [<pattern>...]\n" -"'git branch' [--track |-no-track] [-f] <branchname> [<start-point>]��\n" -"'git branch' (-set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n" -"'git branch' --unset-upstream [<branchname>]\n" -"'git branch' (-m | -M) [<oldbranch>] <newbranch>\n" -"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" -"'git branch' (-d | -D) [-r] <branchname>...\n" -"'git branch' --edit-description [<branchname>])\n" +msgstr "'git branch' [--color[=<when>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<options>] | --no-column] [--sort=<key>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <object>] [--format=<format>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<pattern>...]\n'git branch' [--track[=(direct|inherit)] | --no-track] [-f]\n\t[--recurse-submodules] <�녷뵱��> [<壅룟쭓��>]\n'git branch' (--set-upstream-to=<訝딀만> | -u <訝딀만>) [<�녷뵱��>]\n'git branch' --unset-upstream [<�녷뵱��>]\n'git branch' (-m | -M) [<�㎩늽��>] <�겼늽��>\n'git branch' (-c | -C) [<�㎩늽��>] <�겼늽��>\n'git branch' (-d | -D) [-r] <�녷뵱��>...\n'git branch' --edit-description [<�녷뵱��>]\n" #. type: Plain text #: en/git-branch.txt:37 @@ -11964,7 +11920,7 @@ msgstr "" #. type: Title - #: en/git-cat-file.txt:253 en/git-check-attr.txt:53 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194 en/git-ls-files.txt:233 en/git-merge-tree.txt:74 en/git-push.txt:437 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:29 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "OUTPUT" msgstr "渦볟눣" @@ -13067,7 +13023,7 @@ msgstr "" #: en/git-checkout.txt:26 #, no-wrap, priority:240 msgid "'git checkout' [<branch>]" -msgstr "" +msgstr "'git checkout' [<�녷뵱>]" #. type: Plain text #: en/git-checkout.txt:32 @@ -13131,13 +13087,13 @@ msgstr "" #: en/git-checkout.txt:66 #, no-wrap, priority:240 msgid "'git checkout' --detach [<branch>]" -msgstr "" +msgstr "'git checkout' --detach [<�녷뵱>]" #. type: Labeled list #: en/git-checkout.txt:67 #, no-wrap, priority:240 msgid "'git checkout' [--detach] <commit>" -msgstr "" +msgstr "'git checkout' [--detach] <�먧벡>" #. type: Plain text #: en/git-checkout.txt:75 @@ -13197,7 +13153,7 @@ msgstr "" #: en/git-checkout.txt:110 en/git-read-tree.txt:120 en/git-stash.txt:244 en/git-switch.txt:145 #, priority:240 msgid "Quiet, suppress feedback messages." -msgstr "" +msgstr "�숅퍡竊뚦럨�뜹룏腰덁에����" #. type: Labeled list #: en/git-checkout.txt:112 en/git-fetch-pack.txt:108 en/git-restore.txt:71 en/git-switch.txt:147 en/merge-options.txt:183 @@ -13417,7 +13373,7 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:267 en/git-restore.txt:91 en/git-switch.txt:136 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--conflict=<style>" msgstr "--conflict=<style>" @@ -14342,7 +14298,7 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:376 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:144 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--strategy=<strategy>" msgstr "--strategy=<strategy>" @@ -14983,9 +14939,9 @@ msgstr "git-clone(1)" #. type: Plain text #: en/git-clone.txt:7 -#, fuzzy, priority:300 +#, priority:300 msgid "git-clone - Clone a repository into a new directory" -msgstr "git-clone - Clone a repository into a new directory" +msgstr "git-clone - �뗩쉮訝�訝や퍜佯볟댆�곁쎅壤�" #. type: Plain text #: en/git-clone.txt:21 @@ -15215,7 +15171,7 @@ msgstr "�앭쭓�뽫��뤸��뷸뻼餓띰펽餓δ씩藥δ퐳��퐬餓끺퍗耶섇궓佯볠졊��퐬 #. type: Labeled list #: en/git-clone.txt:175 en/git-pack-objects.txt:300 en/rev-list-options.txt:930 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "--filter=<filter-spec>" msgstr "--filter=<瓦뉑빱�ⓨ츣阿�>" @@ -15251,13 +15207,13 @@ msgstr "兩븀쳦繹먨춼�ⓨ틩�꾦븳�뤵�귟퓳容섋��끻맜 `--bare` �됮」�귚툗 `--b #. type: Labeled list #: en/git-clone.txt:198 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "-o <name>" msgstr "-o <�띸㎞>" #. type: Labeled list #: en/git-clone.txt:199 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "--origin <name>" msgstr "--origin <�띸㎞>" @@ -15269,7 +15225,7 @@ msgstr "訝띴슴�②퓶葉뗥릫燁�`origin`�θ퇎甕よ퓶葉뗤퍜佯볩펽�뚥슴��`<name>` #. type: Labeled list #: en/git-clone.txt:204 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "-b <name>" msgstr "-b <�띸㎞>" @@ -15827,9 +15783,9 @@ msgstr "" #. type: Labeled list #: en/git-commit-tree.txt:57 en/git-commit.txt:167 en/git-fmt-merge-msg.txt:51 en/git-merge.txt:86 en/git-notes.txt:140 en/git-tag.txt:170 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-F <file>" -msgstr "-F <file>" +msgstr "-F <�뉏뻑>" #. type: Plain text #: en/git-commit-tree.txt:61 @@ -15887,7 +15843,7 @@ msgstr "溫②�" #. type: Title - #: en/git-commit-tree.txt:91 en/git-commit.txt:571 en/git-config.txt:298 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:447 en/git-svn.txt:1137 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "FILES" msgstr "�뉏뻑" @@ -15917,7 +15873,7 @@ msgstr "git-commit - 溫겼퐬餓볟틩�꾡엶��" #. type: Plain text #: en/git-commit.txt:19 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" "\t [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n" @@ -15927,14 +15883,7 @@ msgid "" "\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" "\t [--] [<pathspec>...]\n" -msgstr "" -"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<與▼폀>] [--amend]\n" -"\t [--dry-run] [(-c | -C | --fixup | --squash) <�먧벡>]\n" -"\t [-F <�뉏뻑> | -m <易덃겘>] [--reset-author] [--allow-empty]\n" -"\t [--allow-empty-message] [--no-verify] [-e] [--author=<鵝쒑��>]\n" -"\t [--date=<�ζ쐿>] [--cleanup=<與▼폀>] [--[no-]status]\n" -"\t [-i | -o] [--pathspec-from-file=<�뉏뻑> [--pathspec-file-nul]]\n" -"\t [-S[<keyid>]] [--] [<瓮�푶>...]\n" +msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<與▼폀>] [--amend]\n\t [--dry-run] [(-c | -C | --squash) <�먧벡> | --fixup [(amend|reword):]<�먧벡>)]\n\t [-F <�뉏뻑> | -m <易덃겘>] [--reset-author] [--allow-empty]\n\t [--allow-empty-message] [--no-verify] [-e] [--author=<�먧벡雅�>]\n\t [--date=<�ζ쐿>] [--cleanup=<與▼폀>] [--[no-]status]\n\t [-i | -o] [--pathspec-from-file=<�뉏뻑> [--pathspec-file-nul]]\n\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n\t [--] [<瓮�푶>...]\n" #. type: Plain text #: en/git-commit.txt:28 @@ -16005,15 +15954,15 @@ msgstr "鵝욜뵪雅ㅴ틨凉뤺‥訝곲�됪떓�뚪씊�ι�됪떓誤곫룓雅ㅷ쉪岳�뵻�귟��낁쭅 #. type: Labeled list #: en/git-commit.txt:79 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-C <commit>" -msgstr "-C <commit>" +msgstr "-C <�먧벡>" #. type: Labeled list #: en/git-commit.txt:80 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--reuse-message=<commit>" -msgstr "--reuse-message=<commit>" +msgstr "--reuse-message=<�먧벡>" #. type: Plain text #: en/git-commit.txt:84 @@ -16031,7 +15980,7 @@ msgstr "-c <commit>" #: en/git-commit.txt:86 #, no-wrap, priority:280 msgid "--reedit-message=<commit>" -msgstr "--reedit-message=<commit>��" +msgstr "--reedit-message=<commit>" #. type: Plain text #: en/git-commit.txt:89 @@ -16077,9 +16026,9 @@ msgstr "壤볢˙ `git rebase --autosquash` 佯붺뵪�띰펽\"fixup!\"�� \"amend!\"�� #. type: Labeled list #: en/git-commit.txt:129 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--squash=<commit>" -msgstr "--squash=<commit>" +msgstr "--squash=<�먧벡>" #. type: Plain text #: en/git-commit.txt:135 @@ -16155,9 +16104,9 @@ msgstr "壤볠샑鹽� \"short \"�� \"porcelain \"�뜻�곮풏�뷸뿶竊뚪�먨춻�볟뜲�� #. type: Labeled list #: en/git-commit.txt:168 en/git-merge.txt:87 en/git-notes.txt:141 en/git-tag.txt:171 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--file=<file>" -msgstr "--file=<file>" +msgstr "--file=<�뉏뻑>" #. type: Plain text #: en/git-commit.txt:171 @@ -16167,9 +16116,9 @@ msgstr "餓롧퍢若싨뻼餓뜸릎�룟룚�먧벡岳→겘�� 鵝욜뵪'-'��빳餓롦젃�녻풏�� #. type: Labeled list #: en/git-commit.txt:172 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--author=<author>" -msgstr "--author=<author>" +msgstr "--author=<�먧벡雅�>" #. type: Plain text #: en/git-commit.txt:178 @@ -16179,9 +16128,9 @@ msgstr "誤녺썣�먧벡�끹�귚슴�ⓩ젃�녺쉪`A U Thor <author@example.com>`�쇔폀 #. type: Labeled list #: en/git-commit.txt:179 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--date=<date>" -msgstr "--date=<date>" +msgstr "--date=<�ζ쐿>" #. type: Plain text #: en/git-commit.txt:181 @@ -16191,9 +16140,9 @@ msgstr "誤녺썣�먧벡訝�슴�①쉪鵝쒑�끾뿥�잆��" #. type: Labeled list #: en/git-commit.txt:182 en/git-merge.txt:70 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-m <msg>" -msgstr "-m <msg>" +msgstr "-m <易덃겘>" #. type: Labeled list #: en/git-commit.txt:183 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163 @@ -16215,15 +16164,15 @@ msgstr "m \"�됮」訝� \"c\"��\"C \"�� \"F \"�멧틨�믤뼢��" #. type: Labeled list #: en/git-commit.txt:190 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-t <file>" -msgstr "-t <file>" +msgstr "-t <�뉏뻑>" #. type: Labeled list #: en/git-commit.txt:191 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--template=<file>" -msgstr "--template=<file>" +msgstr "--template=<�뉏뻑>" #. type: Plain text #: en/git-commit.txt:200 @@ -16233,9 +16182,9 @@ msgstr "煐뽬풌�먧벡岳→겘�띰펽餓η퍢若싨뻼餓뜸릎�꾢냵若밧맦�①폋渦묈솳�� ` #. type: Labeled list #: en/git-commit.txt:203 en/git-interpret-trailers.txt:85 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--trailer <token>[(=|:)<value>]" -msgstr "--trailer <token>[(=|:)<value>]" +msgstr "--trailer <餓ㅷ뎹>[(=|:)<��>]" #. type: Plain text #: en/git-commit.txt:213 @@ -16287,7 +16236,7 @@ msgstr "�η┿�띺씊�뚦릮�®쉪令븃죱�곩릮�®쉪令븀쇋�곫낏�듿뭽�섇룧�꾥퓹 #. type: Labeled list #: en/git-commit.txt:241 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "whitespace" msgstr "令븀쇋耶쀧Е" @@ -16371,21 +16320,18 @@ msgstr "�싪퓝�쎾뻠訝�訝ゆ뼭�꾣룓雅ㅶ씎�욘뜟壤볟뎺�녷뵱�꾦《塋��귟�壤뺟쉪 #. type: Plain text #: en/git-commit.txt:285 -#, priority:280 +#, fuzzy, priority:280 msgid "It is a rough equivalent for:" -msgstr "若껅삸訝�訝ょ쿁�η쉪嶺됦뻔�⒲��" +msgstr "若껃ㄷ�당쎑壤볞틢竊�" #. type: delimited block - #: en/git-commit.txt:289 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "\t$ git reset --soft HEAD^\n" "\t$ ... do something else to come up with the right tree ...\n" "\t$ git commit -c ORIG_HEAD\n" -msgstr "" -"\t$ git reset --soft HEAD^\n" -"\t$ ... do something else to come up with the right tree ...\n" -"\t$ git commit -c ORIG_HEAD\n" +msgstr "\t$ git reset --soft HEAD^\n\t$ ... do something else to come up with the right tree ...\n\t$ git commit -c ORIG_HEAD\n" #. type: Plain text #: en/git-commit.txt:292 @@ -16409,7 +16355,7 @@ msgstr "--no-post-rewrite" #: en/git-commit.txt:300 #, priority:280 msgid "Bypass the post-rewrite hook." -msgstr "瀯뺠퓝post-rewrite�⒴춴" +msgstr "瀯뺠퓝post-rewrite�⒴춴��" #. type: Labeled list #: en/git-commit.txt:302 @@ -16437,19 +16383,19 @@ msgstr "�ⓩ룓雅ㅶ뿶竊뚦룵�뽩뫝餓ㅸ죱訝딀뙁若싩쉪藥δ퐳�묊쉪���겼냵若뱄펽�� #. type: Labeled list #: en/git-commit.txt:335 en/git-status.txt:58 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-u[<mode>]" -msgstr "-u[<mode>]" +msgstr "-u[<與▼폀>]" #. type: Labeled list #: en/git-commit.txt:336 en/git-status.txt:59 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--untracked-files[=<mode>]" -msgstr "--untracked-files[=<mode>]" +msgstr "--untracked-files[=<與▼폀>]" #. type: Plain text #: en/git-commit.txt:338 en/git-status.txt:61 -#, fuzzy, priority:280 +#, priority:280 msgid "Show untracked files." msgstr "�양ㅊ�よ옙甕ゆ뻼餓뜰��" @@ -16463,7 +16409,7 @@ msgstr "與▼폀�귝빊��룾�됬쉪竊덆퍡溫ㅴ맏 \"����\"竊됵펽�ⓧ틢�뉐츣野방쑋 #: en/git-commit.txt:345 en/git-status.txt:68 en/git-status.txt:110 #, priority:280 msgid "The possible options are:" -msgstr "��꺗�꾦�됪떓����" +msgstr "���됮」竊�" #. type: Plain text #: en/git-commit.txt:347 @@ -16545,23 +16491,19 @@ msgstr "壤볟뫝餓ㅸ죱訝�퍢�틄athspec�띰펽�먧벡寧�릦pathspec�꾣뻼餓뜹냵若� #. type: Plain text #: en/git-commit.txt:422 -#, priority:280 +#, fuzzy, priority:280 msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:" -msgstr "�②�壤뺠눎藥긺쉪藥δ퐳�띰펽藥δ퐳�묇릎岳�뵻瓦뉒쉪�뉏뻑�꾢냵若밥폏�싪퓝'git add'�귝뿶耶섇궓�겻�訝ゅ룶�� \"index \"�꾣쉨耶섇뙷�잆�� 訝�訝ゆ뻼餓뜹룾餓η뵪`git restore --staged <file>`�℡쨳�겻툓轝→룓雅ㅶ뿶�꾤듁�곻펽�ゆ삸�①뇨凉뺜릎竊뚩�뚥툖��쑉藥δ퐳�묇릎竊뚩퓳若욇솀訝딀삸�℡쨳雅�'git add'竊뚦뭉�삥�瓦쇾릉�뉏뻑�꾡엶�밧뢿訝롣툔訝�轝→룓雅ㅳ�� �①뵪瓦쇾틳�썰빱兩븀쳦雅녻쫨罌욇뇧�먧벡�꾤듁�곩릮竊�`git commit`竊덃깹�됦뻣鵝뺠러孃꾢릫�귝빊竊됭˙�ⓩ씎溫겼퐬�곁쎅�띴맏閭℡럴瀯뤷늽�뜻��먧벡�꾢냵若밤�� 瓦숁삸瑥ε뫝餓ㅶ��뷸쑍�꾢숱凉뤵�� 訝�訝や풃耶먦��" +msgstr "�②�壤뺠눎藥긺쉪藥δ퐳�띰펽藥δ퐳�묇릎岳�뵻瓦뉒쉪�뉏뻑�꾢냵若밥폏�싪퓝'git add'�귝뿶耶섇궓�겻�訝ゅ룶�� \"index \"�꾣쉨耶섇뙷�잆�� 訝�訝ゆ뻼餓뜹룾餓η뵪`git restore --staged <file>`�℡쨳�겻툓轝→룓雅ㅶ뿶�꾤듁�곻펽�ゆ삸�①뇨凉뺜릎竊뚩�뚥툖��쑉藥δ퐳�묇릎竊뚩퓳若욇솀訝딀삸�℡쨳雅�'git add'竊뚦뭉�삥�瓦쇾릉�뉏뻑�꾡엶�밧뢿訝롣툔訝�轝→룓雅ㅳ�� �①뵪瓦쇾틳�썰빱兩븀쳦雅녻쫨罌욇뇧�먧벡�꾤듁�곩릮竊�`git commit`竊덃깹�됦뻣鵝뺠러孃꾢릫�귝빊竊됭˙�ⓩ씎溫겼퐬�곁쎅�띴맏閭℡럴瀯뤷늽�뜻��먧벡�꾢냵若밤�� 瓦숁삸瑥ε뫝餓ㅶ��뷸쑍�꾢숱凉뤵�귚풃倻귨폏" #. type: delimited block - #: en/git-commit.txt:428 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "" "$ edit hello.c\n" "$ git rm goodbye.c\n" "$ git add hello.c\n" "$ git commit\n" -msgstr "" -"$ edit hello.c\n" -"$ git rm goodbye.c\n" -"$ git add hello.c\n" -"$ git commit\n" +msgstr "$ edit hello.c\n$ git rm goodbye.c\n$ git add hello.c\n$ git commit\n" #. type: Plain text #: en/git-commit.txt:436 @@ -16571,15 +16513,12 @@ msgstr "鵝졾룾餓ε몜瑥�`git commit`力ⓩ꼷�겼램鵝쒏젒訝�냵若배˙瓮잒릉�꾣뻼餓� #. type: delimited block - #: en/git-commit.txt:441 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "" "$ edit hello.c\n" "$ rm goodbye.c\n" "$ git commit -a\n" -msgstr "" -"$ edit hello.c\n" -"$ rm goodbye.c\n" -"$ git commit -a\n" +msgstr "$ edit hello.c\n$ rm goodbye.c\n$ git commit -a\n" #. type: Plain text #: en/git-commit.txt:446 @@ -16689,9 +16628,9 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:516 -#, fuzzy, priority:280 +#, priority:280 msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)" -msgstr "(nb \"<\", \">\" and \"\\n\"s are stripped)" +msgstr "竊덃낏��\"<\"��\">\" �� \"\\n\" 熬ュ돟獵삼펹" #. type: Plain text #: en/git-commit.txt:522 @@ -16790,23 +16729,7 @@ msgid "" "'git config' [<file-option>] --get-color <name> [<default>]\n" "'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n" "'git config' [<file-option>] -e | --edit\n" -msgstr "" -"'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n" -"'git config' [<file-option>] [--type=<type>] --add <name> <value>\n" -"'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n" -"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n" -"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n" -"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n" -"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n" -"'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n" -"'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n" -"'git config' [<file-option>] --rename-section <old-name> <new-name>\n" -"'git config' [<file-option>] --remove-section <name>\n" -"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n" -"'git config' [<file-option>] --get-color <name> [<default>]\n" -"'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n" -"'git config' [<file-option>] -e | --edit\n" -"# file-opon:�띸쉰�뉏뻑竊�\n" +msgstr "'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n'git config' [<file-option>] [--type=<type>] --add <name> <value>\n'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n'git config' [<file-option>] --rename-section <old-name> <new-name>\n'git config' [<file-option>] --remove-section <name>\n'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n'git config' [<file-option>] --get-color <name> [<default>]\n'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n'git config' [<file-option>] -e | --edit\n" #. type: Plain text #: en/git-config.txt:33 @@ -17533,9 +17456,9 @@ msgstr "" #. type: Title - #: en/git-config.txt:397 en/git-cvsserver.txt:308 en/git-daemon.txt:333 en/git-http-backend.txt:257 en/git-notes.txt:326 en/git-upload-pack.txt:51 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "ENVIRONMENT" -msgstr "��쥊" +msgstr "��쥊�섌뇧" #. type: Labeled list #: en/git-config.txt:399 @@ -17855,9 +17778,9 @@ msgstr "" #. type: Title - #: en/git-config.txt:570 en/git-describe.txt:202 en/git-fetch.txt:296 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:240 en/git-replace.txt:139 en/git-rm.txt:190 en/git-svn.txt:1150 en/git-worktree.txt:499 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "BUGS" -msgstr "�숃�" +msgstr "轢뤸킒" #. type: Plain text #: en/git-config.txt:575 @@ -18004,7 +17927,7 @@ msgstr "" #, fuzzy, no-wrap, priority:90 #| msgid "git-credential-cache--daemon(1)" msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n" -msgstr "git-credential-cache--daemon(1)" +msgstr "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n" #. type: Plain text #: en/git-credential-cache--daemon.txt:18 @@ -21444,9 +21367,9 @@ msgstr "git-diff(1)" #. type: Plain text #: en/git-diff.txt:7 -#, fuzzy, priority:280 +#, priority:280 msgid "git-diff - Show changes between commits, commit and working tree, etc" -msgstr "git-diff - Show changes between commits, commit and working tree, etc" +msgstr "git-diff - �양ㅊ�먧벡�뚦램鵝쒎뙷嶺됧룜��" #. type: Plain text #: en/git-diff.txt:18 @@ -21555,7 +21478,7 @@ msgstr "倻귝옖瀯쇿눣雅� --merge-base竊뚦닕鵝욜뵪訝ㅴ릉�먧벡�꾢릦亮뜹읃簾�鵝� #: en/git-diff.txt:78 #, fuzzy, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]" -msgstr "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]" +msgstr "'git diff' [<�됮」>] <�먧벡> <�먧벡>... <�먧벡> [--] [<瓮�푶>...]" #. type: Plain text #: en/git-diff.txt:86 @@ -21568,7 +21491,7 @@ msgstr "瓦쇾릉烏ⓨ뜒��뵪�ζ윥�뗥릦亮뜻룓雅ㅷ쉪瀯볠옖�� 寧т�訝ゅ닓�븀쉪< #: en/git-diff.txt:87 #, fuzzy, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" -msgstr "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" +msgstr "'git diff' [<�됮」>] <�먧벡>..<�먧벡> [--] [<瓮�푶>...]" #. type: Plain text #: en/git-diff.txt:93 @@ -21578,9 +21501,9 @@ msgstr "瓦쇾툗�⒵쐿�꾢숱凉륅펷亦→쐣`.`竊됪삸�뚥퉱�꾬펽�ⓧ틢�η쐦訝ㅴ릉餓� #. type: Labeled list #: en/git-diff.txt:94 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" -msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" +msgstr "'git diff' [<�됮」>] <�먧벡>\\...<�먧벡> [--] [<瓮�푶>...]" #. type: Plain text #: en/git-diff.txt:101 @@ -21602,9 +21525,9 @@ msgstr "�념틢<commit>�꾣쎍若뚧빐�꾣떬�숁뼶凉륅펽鰲걄inkgit:gitrevisions[7] #. type: Labeled list #: en/git-diff.txt:114 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "'git diff' [<options>] <blob> <blob>" -msgstr "'git diff' [<options>] <blob> <blob>" +msgstr "'git diff' [<�됮」>] <blob> <blob>" #. type: Plain text #: en/git-diff.txt:118 @@ -41643,16 +41566,12 @@ msgstr "git-read-tree - Reads tree information into the index" #. type: Plain text #: en/git-read-tree.txt:15 -#, fuzzy, no-wrap, priority:80 +#, no-wrap, priority:80 msgid "" "'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n" "\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" -msgstr "" -"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]\n" -"\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n" -"\t\t[--index-output=<file>] [--no-sparse-checkout]\n" -"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" +msgstr "'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" #. type: Plain text #: en/git-read-tree.txt:22 @@ -46705,9 +46624,9 @@ msgstr "�념틢瓦쇾툒訝ゅ뫝餓ㅷ쉪�뷴닽竊뚩쭅linkgit:git[1]訝�쉪 \"�띸쉰�곫걿 #. type: Plain text #: en/git-reset.txt:110 -#, priority:280 +#, fuzzy, priority:280 msgid "Be quiet, only report errors." -msgstr "" +msgstr "�숅퍡竊뚦룵�ε몜�숃���" #. type: Labeled list #: en/git-reset.txt:112 @@ -47197,7 +47116,7 @@ msgstr "���롥닗兩뷸��롧쉪�먧벡��" #: en/git-reset.txt:384 #, priority:280 msgid "The tables below show what happens when running:" -msgstr "訝뗩씊�꾥〃�쇗샑鹽뷰틙瓦먫죱�뜹룕�잏쉪�끻넻��" +msgstr "訝뗩씊�꾥〃�쇗샑鹽뷰틙瓦먫죱�뜹룕�잏쉪�끻넻竊�" #. type: delimited block - #: en/git-reset.txt:387 @@ -48327,7 +48246,7 @@ msgstr "壤볟틪�ⓧ틢\"--�녷뵱\"��\"--�뉒� \"��\"--瓦쒐쮮 \"�띰펽瀯쇿눣�� #: en/git-rev-parse.txt:200 en/rev-list-options.txt:198 #, no-wrap, priority:260 msgid "--exclude-hidden=[receive|uploadpack]" -msgstr "" +msgstr "--exclude-hidden=[receive|uploadpack]" #. type: Plain text #: en/git-rev-parse.txt:206 en/rev-list-options.txt:204 @@ -48939,7 +48858,7 @@ msgstr "git-rm(1)" #: en/git-rm.txt:7 #, fuzzy, priority:280 msgid "git-rm - Remove files from the working tree and from the index" -msgstr "git-rm - Remove files from the working tree and from the index" +msgstr "git-rm - 餓롥램鵝쒏젒�뚨뇨凉뺜릎�좈솮�뉏뻑" #. type: Plain text #: en/git-rm.txt:14 @@ -49033,9 +48952,9 @@ msgstr "�좈솮餓롦뻼餓띄내瀯잋릎易덂ㅁ�꾣뻼餓�" #. type: Plain text #: en/git-rm.txt:106 -#, fuzzy, priority:280 +#, priority:280 msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done." -msgstr "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done." +msgstr "`git rm`亦→쐣�됮」��빳餓롧뇨凉뺜릎�ゅ닠�ㅵ럴瀯뤶퍗�뉏뻑楹사퍨訝�텋鸚긺쉪瓮�푶�귞꽫�뚳펽�방뜮訝띶릪�꾡슴�ⓩ깄�듸펽�됧뇿燁띷뼶力뺝룾餓ε걳�계퓳訝��밤��" #. type: Title ~ #: en/git-rm.txt:108 @@ -50666,7 +50585,7 @@ msgstr "`trailer:<field>`竊�`<field>`熬ヨ㎗�듾맏訝띶뙷�녶ㄷ弱뤷넍�꾣룓雅ㅶ텋 #: en/git-shortlog.txt:70 #, priority:260 msgid "`format:<format>`, any string accepted by the `--format` option of 'git log'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)" -msgstr "`�쇔폀竊�<format>`��빳��뻣鵝뺠˙'git log'��`--format'�됮」�ε룛�꾢춻寧╊림竊뚧캈倻�'* [%h] %s'�� �귟쭅linkgit:git-log[1]�� \"PRETTY FORMATS \"�ⓨ늽竊됥��" +msgstr "`�쇔폀竊�<format>`��빳��뻣鵝뺠˙'git log'��`--format'�됮」�ε룛�꾢춻寧╊림竊뚧캈倻�'* [%h] %s'�� �귟쭅linkgit:git-log[1]�� \"PRETTY FORMATS \"�ⓨ늽竊됥��" #. type: Plain text #: en/git-shortlog.txt:75 @@ -52391,9 +52310,9 @@ msgstr "�ⓨ��얍룜�뽪뿶恙썹븼耶먩Æ�쀧쉪�섇뙑��<when>��빳�� \"none\"�� #. type: Labeled list #: en/git-status.txt:102 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "--ignored[=<mode>]" -msgstr "--ignored[=<mode>]" +msgstr "--ignored[=<與▼폀>]" #. type: Plain text #: en/git-status.txt:104 @@ -52653,33 +52572,7 @@ msgstr "'U'=�닸뼭鵝녷쑋�덂뭉" #. type: delimited block . #: en/git-status.txt:245 -#, fuzzy, no-wrap, priority:280 -#| msgid "" -#| "X Y Meaning\n" -#| "-------------------------------------------------\n" -#| "\t [AMD] not updated\n" -#| "M [ MD] updated in index\n" -#| "A [ MD] added to index\n" -#| "D deleted from index\n" -#| "R [ MD] renamed in index\n" -#| "C [ MD] copied in index\n" -#| "[MARC] index and work tree matches\n" -#| "[ MARC] M work tree changed since index\n" -#| "[ MARC] D deleted in work tree\n" -#| "[ D] R renamed in work tree\n" -#| "[ D] C copied in work tree\n" -#| "-------------------------------------------------\n" -#| "D D unmerged, both deleted\n" -#| "A U unmerged, added by us\n" -#| "U D unmerged, deleted by them\n" -#| "U A unmerged, added by them\n" -#| "D U unmerged, deleted by us\n" -#| "A A unmerged, both added\n" -#| "U U unmerged, both modified\n" -#| "-------------------------------------------------\n" -#| "? ? untracked\n" -#| "! ! ignored\n" -#| "-------------------------------------------------\n" +#, no-wrap, priority:280 msgid "" "X Y Meaning\n" "-------------------------------------------------\n" @@ -52708,32 +52601,7 @@ msgid "" "? ? untracked\n" "! ! ignored\n" "-------------------------------------------------\n" -msgstr "" -"X Y�꾢맜阿�\n" -"-------------------------------------------------\n" -"\t [AMD]�ゆ쎍��\n" -"M [MD] �①뇨凉뺜릎�닸뼭\n" -"A [MD] 曆삣뒥�곁뇨凉뺜릎\n" -"D 餓롧뇨凉뺜릎�좈솮\n" -"R [MD] �①뇨凉뺜릎�띷뼭�썲릫\n" -"C [MD] �①뇨凉뺜릎熬ュ쨳��\n" -"[MARC] 榮℡폊�뚦램鵝쒏젒�멨뙶��\n" -"[MARC] M藥δ퐳�묋눎榮℡폊餓ζ씎�묊뵟雅녶룜��\n" -"[MARC] D�ⓨ램鵝쒏젒訝�˙�좈솮\n" -"[D] R�ⓨ램鵝쒏젒訝�뇥�겼뫝��\n" -"[D] C�ⓨ램鵝쒏젒訝�˙鸚띶댍\n" -"-------------------------------------------------\n" -"D D�ゅ릦亮띰펽�뉐럴�좈솮\n" -"A U �ゅ릦亮띰펽�길닊餓ф렌��\n" -"U D �ゅ릦亮띰펽熬ヤ퍟餓у닠��\n" -"U A �ゅ릦亮띰펽�긴퍟餓ф렌��\n" -"D U�ゅ릦亮띰펽熬ユ닊餓у닠��\n" -"A A�ゅ릦亮띰펽�썼˙曆삣뒥\n" -"U U�ゅ릦亮띰펽�썼˙岳�뵻\n" -"-------------------------------------------------\n" -"? �よ˙瓦썼릉��\n" -"! 恙썹븼訝띹�\n" -"-------------------------------------------------\n" +msgstr "X Y�꾢맜阿�\n-------------------------------------------------\n\t [AMD]�ゆ쎍��\nM [MTD] �①뇨凉뺜릎�닸뼭\nT [MTD] 映삣엹�①뇨凉뺜릎�됪��밧룜\nA [MTD] 曆삣뒥�곁뇨凉뺜릎\nD 餓롧뇨凉뺜릎�좈솮\nR [MTD] �①뇨凉뺜릎�띷뼭�썲릫\nC [MTD] �①뇨凉뺜릎熬ュ쨳��\n[MTARC] 榮℡폊�뚦램鵝쒏젒�백뀓\n[MTARC] �ょ뇨凉뺜빳�ο펽M藥δ퐳�묈룕�잋틙�섇뙑\n[MTARC] 藥δ퐳�묇릎�껿映삣엹�ょ뇨凉뺜빳�ε룕�잋틙�섇뙑\n[MTARC] D�ⓨ램鵝쒏젒訝�˙�좈솮\n\t R�ⓨ램鵝쒏젒訝�뇥�겼뫝��\n\t C�ⓨ램鵝쒏젒訝�˙鸚띶댍\n-------------------------------------------------\nD D�ゅ릦亮띰펽�뉐럴�좈솮\nA U �ゅ릦亮띰펽�길닊餓ф렌��\nU D�ゅ릦亮띰펽熬ヤ퍟雅뷴닠��\nU A �ゅ릦亮띰펽�긴퍟雅뷸렌��\nD U�ゅ릦亮띰펽熬ユ닊餓у닠��\nA A�ゅ릦亮띰펽�썼˙曆삣뒥\nU U�ゅ릦亮띰펽�썼˙岳�뵻\n-------------------------------------------------\n? �よ˙瓦썼릉��\n! 恙썹븼訝띹�\n-------------------------------------------------\n" #. type: Plain text #: en/git-status.txt:254 @@ -53114,9 +52982,9 @@ msgstr "容섋��끻넻訝뗰펽`git status`鴉싪눎�ⓨ댎�곁뇨凉뺧펽�닸뼭藥δ퐳�묇툓 #. type: Title - #: en/git-status.txt:461 -#, no-wrap, priority:280 +#, fuzzy, no-wrap, priority:280 msgid "UNTRACKED FILES AND PERFORMANCE" -msgstr "" +msgstr "�よ퇎甕ょ쉪�뉏뻑�뚧�㎬꺗" #. type: Plain text #: en/git-status.txt:472 @@ -56920,20 +56788,14 @@ msgstr "git - �사뱶凉뤷냵若배옙甕ゅ솳" #. type: Plain text #: en/git.txt:17 -#, fuzzy, no-wrap, priority:100 +#, no-wrap, priority:100 msgid "" "'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " [--config-env=<name>=<envvar>] <command> [<args>]\n" -msgstr "" -"'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" -" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]\n" +msgstr "'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n [--config-env=<name>=<envvar>] <command> [<args>]\n" #. type: Plain text #: en/git.txt:23 @@ -61452,7 +61314,7 @@ msgstr "" #. type: delimited block - #: en/git-worktree.txt:419 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "" "$ git worktree list --verbose\n" "/path/to/linked-worktree abcd1234 [master]\n" @@ -61461,11 +61323,7 @@ msgid "" "\tlocked: worktree path is mounted on a portable device\n" "/path/to/prunable-worktree 5678abc1 (detached HEAD)\n" "\tprunable: gitdir file points to non-existent location\n" -msgstr "" -"$ git worktree list\n" -"/path/to/bare-source (bare)\n" -"/path/to/linked-worktree abcd1234 [master]\n" -"/path/to/other-linked-worktree 1234abc (detached HEAD)\n" +msgstr "$ git worktree list --verbose\n/path/to/linked-worktree abcd1234 [master]\n/path/to/locked-worktree-no-reason abcd5678 (�녺┿�� HEAD) locked\n/path/to/locked-worktree-with-reason 1234abcd (brancha)\n\t�곩츣竊싧램鵝쒎뙷瓮�푶熬ュ츎獒끻쑉訝�訝ゅ룾燁삣뒯溫얍쨭訝�\n/path/to/prunable-worktree 5678abc1 (�녺┿�� HEAD)\n\t��엶�わ폏gitdir �뉏뻑�뉐릲訝띶춼�①쉪鵝띸쉰\n" #. type: Plain text #: en/git-worktree.txt:424 @@ -62355,7 +62213,7 @@ msgstr "訝띶뙷�녶ㄷ弱뤷넍�꾢뙶�띲��" #: en/glossary-content.txt:382 #, no-wrap, priority:310 msgid "glob" -msgstr "�싮뀓寧�(glob)" +msgstr "�싮뀓寧�" #. type: Plain text #: en/glossary-content.txt:389 @@ -64305,7 +64163,7 @@ msgstr "'%an'" #: en/pretty-formats.txt:188 #, fuzzy, priority:260 msgid "author name" -msgstr "챔쩍짱챈혟혫챈혻쨌 챦쩌혳" +msgstr "�먧벡雅�" #. type: Labeled list #: en/pretty-formats.txt:188 @@ -69850,13 +69708,13 @@ msgstr "�ⓨ뎺�®쉪堊뗥춴訝�펽�묇뺄溫ㅴ맏 \"也� \"�꾣룓雅ㅶ삸 \"�� \"�꾣룓 #: en/git-bisect-lk2009.txt:769 #, priority:100 msgid "Of course the \"bad\" commit cannot be an ancestor of a \"good\" commit, because the ancestors of the good commits are supposed to be \"good\". And all the \"good\" commits must be related to the bad commit. They cannot be on a branch that has no link with the branch of the \"bad\" commit. But it is possible for a good commit to be related to a bad commit and yet not be neither one of its ancestor nor one of its descendants." -msgstr "" +msgstr "壤볡꽫竊�\"�� \"�먧벡訝띶룾�썸삸 \"也� \"�먧벡�꾤쪝�덌펽�졽맏也썸룓雅ㅷ쉪曄뽩뀍佯붻��� \"也� \"�꾠�귟�뚧��� \"也� \"�꾣룓雅ㅵ퓚窈삡툗�뤹쉪�먧벡�됧뀽�� 若껂뺄訝띶룾�썲쑉訝�訝や툗 \"�� \"�먧벡�꾢늽��깹�됭걫楹사쉪�녷뵱訝듽�귚퐜��펽訝�訝ゅ��꾣룓雅ㅶ쐣��꺗訝롣�訝ゅ쓯�꾣룓雅ㅶ쐣�녕내竊뚥퐜�㏘툖��츆�꾤쪝�덌펽阿잋툖��츆�꾢릮餓c��" #. type: Plain text #: en/git-bisect-lk2009.txt:772 #, priority:100 msgid "For example, there can be a \"main\" branch, and a \"dev\" branch that was forked of the main branch at a commit named \"D\" like this:" -msgstr "" +msgstr "堊뗥쫩竊뚦룾餓ζ쐣訝�訝� \"main\"�녷뵱�뚥�訝� \"dev\"�녷뵱竊뚦릮�끾삸餓럐ain�녷뵱訝�룓雅ㅵ릫訝� \"D\"�꾣룓雅ㅵ뀑�녶눣�η쉪竊뚦쫩訝뗦�鹽븝폏" #. type: delimited block - #: en/git-bisect-lk2009.txt:777 @@ -69865,31 +69723,31 @@ msgid "" "A-B-C-D-E-F-G <--main\n" " \\\n" " H-I-J <--dev\n" -msgstr "" +msgstr "A-B-C-D-E-F-G <--main\n \\\n H-I-J <--dev\n" #. type: Plain text #: en/git-bisect-lk2009.txt:781 #, priority:100 msgid "The commit \"D\" is called a \"merge base\" for branch \"main\" and \"dev\" because it's the best common ancestor for these branches for a merge." -msgstr "" +msgstr "�먧벡 \"D \"熬ョ㎞訝� \"main \"�� \"dev \"�녷뵱�� \"�덂뭉�븀�\"竊뚦썱訝뷴츆��퓳雅쎾늽��룾餓θ퓵烏뚦릦亮띄쉪��鵝녑뀻�뚨쪝�덀��" #. type: Plain text #: en/git-bisect-lk2009.txt:785 #, priority:100 msgid "Now let's suppose that commit J is bad and commit G is good and that we apply the bisection algorithm like it has been previously described." -msgstr "" +msgstr "�겼쑉�묇뺄�뉓��먧벡J��쓯�꾬펽�먧벡G����꾬펽亮뜸툝�묇뺄�뤶퉳�띷룒瓦곁쉪�f졆佯붺뵪雅뚦늽力뺛��" #. type: Plain text #: en/git-bisect-lk2009.txt:789 #, priority:100 msgid "As described in step 1) b) of the bisection algorithm, we remove all the ancestors of the good commits because they are supposed to be good too." -msgstr "" +msgstr "閭e쫩訝��녵맏雅뚨츞力뺟쉪閭ιい1竊뎏竊됪��뤺염�꾦궍�뤄펽�묇뺄燁삯솮���됧��먧벡�꾤쪝�덌펽�졽맏餓뽨뺄阿잌틪瑥ζ삸也썹쉪��" #. type: Plain text #: en/git-bisect-lk2009.txt:791 #, priority:100 msgid "So we would be left with only:" -msgstr "" +msgstr "�졿�竊뚧닊餓у컛�ゅ돥訝뗰폏" #. type: delimited block - #: en/git-bisect-lk2009.txt:794 @@ -69901,25 +69759,25 @@ msgstr "H-I-J\n" #: en/git-bisect-lk2009.txt:798 #, priority:100 msgid "But what happens if the first bad commit is \"B\" and if it has been fixed in the \"main\" branch by commit \"F\"?" -msgstr "" +msgstr "鵝녶쫩�쒐К訝�訝ゅ쓯�꾣룓雅ㅶ삸 \"B\"竊뚩�뚦쑉 \"main\"�녷뵱訝�럴瀯뤺˙�먧벡 \"F \"岳�쨳竊뚥폏�묊뵟餓�阿덌폕" #. type: Plain text #: en/git-bisect-lk2009.txt:801 #, priority:100 msgid "The result of such a bisection would be that we would find that H is the first bad commit, when in fact it's B. So that would be wrong!" -msgstr "" +msgstr "瓦숁졆訝��녵맏雅뚦릮竊뚧닊餓т폏�묊렟H��К訝�訝ゅ쓯�먧벡竊뚥퐜若욇솀訝딁К訝�訝ゅ쓯�먧벡�츭竊뚧�餓θ퓳弱녽�졿닇�숃��꾤퍜�쒙펯" #. type: Plain text #: en/git-bisect-lk2009.txt:807 #, priority:100 msgid "And yes it can happen in practice that people working on one branch are not aware that people working on another branch fixed a bug! It could also happen that F fixed more than one bug or that it is a revert of some big development effort that was not ready to be released." -msgstr "" +msgstr "�ⓨ츩瓮듕릎��꺗鴉싧룕�잒퓳�루쉪�끻넻竊싧쑉訝�訝ゅ늽��툓藥δ퐳�꾡볶訝띸윥�볟쑉�╊�訝ゅ늽��툓藥δ퐳�꾡볶岳�쨳雅녵�訝챐ug竊곦튋��꺗�묊뵟�꾣깄�득삸竊똅岳�쨳雅녵툖閭㏘�訝챐ug竊뚧닑�끾삸野밥�雅쎾컶�ゅ뇛鸚뉐��묈툋�꾢ㄷ�뗥��묈램鵝쒑퓵烏뚥틙�℡쨳��" #. type: Plain text #: en/git-bisect-lk2009.txt:813 #, priority:100 msgid "In fact development teams often maintain both a development branch and a maintenance branch, and it would be quite easy for them if \"git bisect\" just worked when they want to bisect a regression on the development branch that is not on the maintenance branch. They should be able to start bisecting using:" -msgstr "" +msgstr "雅뗥츩訝딉펽凉��묈썴�잏퍘躍멨릪�띄뺨�ㅴ�訝ゅ��묈늽��뭽訝�訝ょ뺨�ㅵ늽��펽倻귝옖 \"git bisect \"�ゆ삸�ⓧ퍟餓ф꺍野밧��묈늽��툓�꾢썮壤믦퓵烏뚦늽役곮�뚥툖�①뺨�ㅵ늽��툓�꾣뿶�쇿룕�δ퐳�⑨펽�e�餓뽨뺄�θ�鴉싧푽若방삌�귚퍟餓у틪瑥ε룾餓η뵪餓δ툔�방퀡凉�冶뗤틠�놅폏" #. type: delimited block - #: en/git-bisect-lk2009.txt:816 @@ -69931,13 +69789,13 @@ msgstr "$ git bisect start dev main\n" #: en/git-bisect-lk2009.txt:823 #, priority:100 msgid "To enable that additional nice feature, when a bisection is started and when some good commits are not ancestors of the bad commit, we first compute the merge bases between the bad and the good commits and we chose these merge bases as the first commits that will be checked out and tested." -msgstr "" +msgstr "訝뷰틙若욅렟瓦쇾릉窯앭쨼�꾢뒣�쏙펽壤볞�訝ゅ늽�뚦�冶뗰펽訝�雅쎾��꾣룓雅ㅴ툖��쓯�꾣룓雅ㅷ쉪曄뽩뀍�띰펽�묇뺄腰뽩뀍溫←츞�뤹쉪�먧벡�뚦��꾣룓雅ㅴ퉳�당쉪�덂뭉�뷸빊竊뚧닊餓ч�됪떓瓦쇾틳�덂뭉�뷸빊鵝쒍맏寧т�訝ゅ컛熬ユ��ε뭽役뗨캊�꾣룓雅ㅳ��" #. type: Plain text #: en/git-bisect-lk2009.txt:826 #, priority:100 msgid "If it happens that one merge base is bad, then the bisection process is stopped with a message like:" -msgstr "" +msgstr "倻귝옖�됦�訝ゅ릦亮뜹읃�경삸�뤹쉪竊뚪궍阿덁틠�녻퓝葉뗥갚鴉싧걶閭�펽亮뜹룕�븀굳鴉쇘쉪岳→겘竊�" #. type: delimited block - #: en/git-bisect-lk2009.txt:830 @@ -69945,19 +69803,19 @@ msgstr "" msgid "" "The merge base BBBBBB is bad.\n" "This means the bug has been fixed between BBBBBB and [GGGGGG,...].\n" -msgstr "" +msgstr "�덂뭉�븀�BBBBB��쓯�꾠��\n瓦숁꼷�녕�BBBBB��[GGGGG,...]阿뗩뿴�꾦뵗瑥�럴瀯뤺˙岳�쨳��\n" #. type: Plain text #: en/git-bisect-lk2009.txt:834 #, ignore-ellipsis, priority:100 msgid "where BBBBBB is the sha1 hash of the bad merge base and [GGGGGG,...] is a comma separated list of the sha1 of the good commits." -msgstr "" +msgstr "�뜸릎BBBBBB��쓯�덂뭉�븀��꼜ha1�덂툕�쇽펽[GGGGG,...]����먧벡�꼜ha1�꾦�쀥뤇�녽슂�쀨〃��" #. type: Plain text #: en/git-bisect-lk2009.txt:838 #, priority:100 msgid "If some of the merge bases are skipped, then the bisection process continues, but the following message is printed for each skipped merge base:" -msgstr "" +msgstr "倻귝옖訝�雅쎾릦亮뜹읃�배˙瓮녘퓝竊뚪궍阿덁틠�녻퓝葉뗥컛瀯㎫뺌瓦쏂죱竊뚥퐜野밥틢驪뤶�訝よ˙瓮녘퓝�꾢릦亮뜹읃�백꺗鴉싨돀�겼눣餓δ툔岳→겘竊�" #. type: delimited block - #: en/git-bisect-lk2009.txt:843 @@ -69966,73 +69824,73 @@ msgid "" "Warning: the merge base between BBBBBB and [GGGGGG,...] must be skipped.\n" "So we cannot be sure the first bad commit is between MMMMMM and BBBBBB.\n" "We continue anyway.\n" -msgstr "" +msgstr "鈺�몜竊숥BBBB��[GGGGG,...]阿뗩뿴�꾢릦亮뜹읃�겼퓚窈삭˙瓮녘퓝��\n��餓ζ닊餓т툖�썹‘若싩К訝�訝ゅ쓯�먧벡��쑉MMMMMM�똁BBBB阿뗩뿴��\n�묇뺄鴉싩빵瀯�뱧鵝쒌��\n" #. type: Plain text #: en/git-bisect-lk2009.txt:848 #, ignore-ellipsis, priority:100 msgid "where BBBBBB is the sha1 hash of the bad commit, MMMMMM is the sha1 hash of the merge base that is skipped and [GGGGGG,...] is a comma separated list of the sha1 of the good commits." -msgstr "" +msgstr "�뜸릎BBBBB��쓯�먧벡�꼜ha1�덂툕�쇽펽MMMMM��˙瓮녘퓝�꾢릦亮뜹읃簾��꼜ha1�덂툕�쇽펽[GGGGG,...]����먧벡�꼜ha1�꾦�쀥뤇�녽슂�쀨〃��" #. type: Plain text #: en/git-bisect-lk2009.txt:851 #, priority:100 msgid "So if there is no bad merge base, the bisection process continues as usual after this step." -msgstr "" +msgstr "�졿�竊뚦쫩�쒏깹�됧쓯�꾢릦亮뜹읃簾�竊뚦쑉瓦쇾�閭δ퉳�롳펽雅뚦늽瓦뉒쮮�㎩만瓦쏂죱��" #. type: Title - #: en/git-bisect-lk2009.txt:853 #, no-wrap, priority:100 msgid "Best bisecting practices" -msgstr "" +msgstr "��鵝녕쉪雅뚦늽�싨퀡" #. type: Title ~ #: en/git-bisect-lk2009.txt:856 #, no-wrap, priority:100 msgid "Using test suites and git bisect together" -msgstr "" +msgstr "役뗨캊也쀤뻑�똤it bisect訝�壅룝슴��" #. type: Plain text #: en/git-bisect-lk2009.txt:863 #, priority:100 msgid "If you both have a test suite and use git bisect, then it becomes less important to check that all tests pass after each commit. Though of course it is probably a good idea to have some checks to avoid breaking too many things because it could make bisecting other bugs more difficult." -msgstr "" +msgstr "倻귝옖鵝졿쐣訝�訝ゆ탩瑥뺝쪞餓뜹뭉鵝욜뵪git bisect竊뚪궍阿덂쑉驪뤸А�먧벡�롦��ζ��됪탩瑥뺞삸���싪퓝弱긷룜孃쀤툖�d퉰�띹쫨�귛퐪�띰펽訝뷰틙�욕뀓�닷쓯鸚ゅ쩀�꾡툥蜈울펽�됦�雅쎿��ε룾�썸삸訝ゅ��꾢걳力뺧펽�졽맏瓦쇿룾�썰폏鵝요틠�녶끀餓뻖ug�닷뒥�곈슻��" #. type: Plain text #: en/git-bisect-lk2009.txt:868 #, priority:100 msgid "You can focus your efforts to check at a few points (for example rc and beta releases) that all the T test cases pass for all the N configurations. And when some tests don't pass you can use \"git bisect\" (or better \"git bisect run\"). So you should perform roughly:" -msgstr "" +msgstr "鵝졾룾餓ι썓訝�꼐�쎾쑉�졽릉�밥툓汝��ο펷堊뗥쫩rc�똟eta�덃쑍竊됵펽���됬쉪T役뗨캊�ⓧ풃�ⓩ��됬쉪N訝ら뀓營�툔�썼꺗�싪퓝�귛퐪訝�雅쎿탩瑥뺞깹�됮�싪퓝�띰펽鵝졾룾餓δ슴�� \"git bisect\"竊덂퐪��\"git bisect run\"�닷�竊됥�귝�餓δ퐷佯붻�鸚㎬눜訝딀돢烏뚳폏" #. type: delimited block - #: en/git-bisect-lk2009.txt:871 #, no-wrap, priority:100 msgid "c * N * T + b * M * log2(M) tests\n" -msgstr "" +msgstr "c * N * T + b * M * log2(M) tests\n" #. type: Plain text #: en/git-bisect-lk2009.txt:875 #, priority:100 msgid "where c is the number of rounds of test (so a small constant) and b is the ratio of bug per commit (hopefully a small constant too)." -msgstr "" +msgstr "�뜸릎c��탩瑥뺟쉪饔�빊竊덃�餓ζ삸訝�訝ゅ컦躍멩빊竊됵펽b��캀轝→룓雅ㅷ쉪bug驪붶풃竊덂툕�쎽튋���訝ゅ컦躍멩빊竊됥��" #. type: Plain text #: en/git-bisect-lk2009.txt:878 #, priority:100 msgid "So of course it's much better as it's O(N * T) vs O(N * T * M) if you would test everything after each commit." -msgstr "" +msgstr "��餓ο펽倻귝옖鵝졾쑉驪뤸А�먧벡�롩꺗役뗨캊���됧냵若뱄펽O(N * T)壤볡꽫驪봑(N * T * M)誤곩�孃쀥쩀 ��" #. type: Plain text #: en/git-bisect-lk2009.txt:883 #, priority:100 msgid "This means that test suites are good to prevent some bugs from being committed and they are also quite good to tell you that you have some bugs. But they are not so good to tell you where some bugs have been introduced. To tell you that efficiently, git bisect is needed." -msgstr "" +msgstr "瓦숁꼷�녕�役뗨캊也쀤뻑野밥틢�꿩�訝�雅쌴ug熬ユ룓雅ㅶ삸孃덂��꾬펽若껂뺄野밥틢�딂칹鵝졿쐣訝�雅쌴ug阿잍삸孃덂��꾠�귚퐜若껂뺄亮뜸툖�썲푽也썲쑑�딂칹鵝졽�雅쏃뵗瑥�삸�ⓨ벆�뚩˙凉뺝뀯�꾠�귝�餓ι�誤갾it bisect�딂칹鵝좄퓳雅쎽에����" #. type: Plain text #: en/git-bisect-lk2009.txt:890 #, priority:100 msgid "The other nice thing with test suites, is that when you have one, you already know how to test for bad behavior. So you can use this knowledge to create a new test case for \"git bisect\" when it appears that there is a regression. So it will be easier to bisect the bug and fix it. And then you can add the test case you just created to your test suite." -msgstr "" +msgstr "役뗨캊也쀤뻑�꾢룱訝�訝ゅ�鸚꾣삸竊뚦퐪鵝졿쐣訝�訝ゆ탩瑥뺝쪞餓뜻뿶竊뚥퐷藥꿰퍘�ι걪倻귚퐬役뗨캊訝띹돬烏뚥맏�귛썱閭ㅿ펽壤볟눣�곁굳鴉쇤뿮窯섉뿶竊뚥퐷��빳鵝욜뵪瓦쇾틳�θ칳�ε닗兩뷰�訝ゆ뼭�� \"git bisect \"役뗨캊旅덁풃�귟퓳�룟갚�썸쎍若방삌�겼컛bug雅뚦늽亮뜸엶鸚띶츆�귞꽫�롣퐷弱긷룾餓ζ뒍鵝졾닖�쎾뻠�꾣탩瑥뺟뵪堊뗦렌�졾댆鵝좂쉪役뗨캊也쀤뻑訝���" #. type: Plain text #: en/git-bisect-lk2009.txt:893