diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po index b4fbfe28a1939e69b9a025d06bdc68433c5bbf2d..ada48b85eb647df4a87d264078fa52d83b58073f 100644 --- a/po/documentation.zh_HANS-CN.po +++ b/po/documentation.zh_HANS-CN.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Matthias A횩hauer <mha1993@live.de>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-13 00:11+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.16-dev\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-11-26 21:11+0100\nPO-Revision-Date: 2023-02-16 02:48+0000\nLast-Translator: 燁껃ㅄ��Ъ浴� <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.16-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:763 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 @@ -4031,9 +4031,9 @@ msgstr "--no-stat" #. type: Plain text #: en/diff-options.txt:19 -#, fuzzy, priority:280 +#, priority:280 msgid "Generate plain patches without any diffstats." -msgstr "�잍닇���싩쉪烏δ툈竊뚥툖�양ㅊ藥�펰�뜻�곻펷diffstats竊됥��" +msgstr "�잍닇亦→쐣餓삡퐬藥�펰�뜻��(diffstats)�꾣솹�싪‥訝곥��" #. type: Labeled list #: en/diff-options.txt:23 en/fetch-options.txt:257 en/git-add.txt:119 en/git-am.txt:90 en/git-checkout-index.txt:26 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:54 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:166 @@ -17364,10 +17364,9 @@ msgstr "--local" #. type: Labeled list #: en/git-config.txt:362 -#, fuzzy, no-wrap, priority:100 -#| msgid "--worktree" +#, no-wrap, priority:100 msgid "worktree" -msgstr "--worktree" +msgstr "藥δ퐳��" #. type: Labeled list #: en/git-config.txt:365 @@ -21409,9 +21408,9 @@ msgstr "倻귝옖瀯쇿눣雅� --merge-base竊뚦닕訝띴슴��<commit>竊뚩�뚥슴��<commit> #. type: Labeled list #: en/git-diff.txt:57 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]" -msgstr "'git diff' [<options>] <commit> <commit> [--] [<path>...]" +msgstr "'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]" #. type: Plain text #: en/git-diff.txt:64 @@ -32647,10 +32646,9 @@ msgstr "--decorate-refs-exclude=<pattern>" #. type: Plain text #: en/git-log.txt:54 -#, fuzzy, priority:260 -#| msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`." +#, priority:260 msgid "For each candidate reference, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`." -msgstr "倻귝옖亦→쐣瀯쇿츣`--decorate-refs`竊뚦갚�뉓즳���됬쉪�귟�껅뻼��꺗熬ュ똿�у쑉�끹�� 野밥틢驪뤶릉�숅�됭�낉펽倻귝옖若껂툗`--decorate-refs-exclude`瀯쇿눣�꾡뻣鵝뺞Æ凉뤹쎑�백뀓竊뚧닑�끻츆訝�`--decorate-refs`瀯쇿눣�꾡뻣鵝뺞Æ凉뤶툖�백뀓竊뚦갚訝띹쫨弱녶끀�ⓧ틢獒낂Ⅰ��`log.excludeDecoration`�띸쉰�됮」�곮�餓롨즳耀겻릎�믧솮�귟�껅뻼��펽鵝녷삇簾�쉪`--decorate-refs`與▼폀弱녻쫮��`log.excludeDecoration`�꾢뙶�띲��" +msgstr "野밥틢驪뤶릉�숅�됭�낉펽倻귝옖若껂툗`--decorate-refs-exclude`瀯쇿눣�꾡뻣鵝뺞Æ凉뤹쎑�백뀓竊뚧닑�끻츆訝�`--decorate-refs`瀯쇿눣�꾡뻣鵝뺞Æ凉뤶툖�백뀓竊뚦갚訝띹쫨弱녶끀�ⓧ틢獒낂Ⅰ��`log.excludeDecoration`�띸쉰�됮」�곮�餓롨즳耀겻릎�믧솮�귟�껅뻼��펽鵝녷삇簾�쉪`--decorate-refs`與▼폀弱녻쫮��`log.excludeDecoration`�꾢뙶�띲��" #. type: Plain text #: en/git-log.txt:58 @@ -35351,9 +35349,9 @@ msgstr "" #. type: Plain text #: en/git-merge-tree.txt:125 -#, fuzzy, no-wrap, priority:100 +#, no-wrap, priority:100 msgid "\t<mode> <object> <stage> <filename>\n" -msgstr " [<tag> ]<mode> <object> <stage> <file>\n" +msgstr "\t<mode> <object> <stage> <filename>\n" #. type: Plain text #: en/git-merge-tree.txt:131 @@ -47484,14 +47482,11 @@ msgstr "" #. type: Plain text #: en/git-revert.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n" "'git revert' (--continue | --skip | --abort | --quit)\n" -msgstr "" -"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n" -"\t\t [-S[<keyid>]] <commit>...\n" -"'git cherry-pick' (--continue | --skip | --abort | --quit)\n" +msgstr "'git revert' [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] <commit>...\n'git revert' (--continue | --skip | --abort | --quit)\n" #. type: Plain text #: en/git-revert.txt:21 @@ -50468,10 +50463,9 @@ msgstr "`trailer:<field>`竊�`<field>`熬ヨ㎗�듾맏訝띶뙷�녶ㄷ弱뤷넍�꾣룓雅ㅶ텋 #. type: Plain text #: en/git-shortlog.txt:70 -#, fuzzy, priority:260 -#| msgid "Instead of the commit subject, use some other information to describe each commit. '<format>' can be any string accepted by the `--format` option of 'git log', such as '* [%h] %s'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)" +#, 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 "餓f쎘�먧벡訝삯쥦竊뚥슴�ⓧ�雅쎾끀餓뽨에��씎�뤺염驪뤶릉�먧벡�� <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 @@ -57395,25 +57389,25 @@ msgstr "瑥룟뢿�꿯inkgit:gitglossary[7]��" #: en/git.txt:465 #, priority:100 msgid "Various Git commands pay attention to environment variables and change their behavior. The environment variables marked as \"Boolean\" take their values the same way as Boolean valued configuration variables, e.g. \"true\", \"yes\", \"on\" and positive numbers are taken as \"yes\"." -msgstr "" +msgstr "�꾤쭕 Git �썰빱�썰폏�녔낏��쥊�섌뇧亮뜻뵻�섇츆餓х쉪烏뚥맏�� 餓�\"躍껃컮 ��\"訝뷸젃溫곁쉪��쥊�섌뇧竊뚦끀�뽩�쇗뼶凉뤶툗躍껃컮�쇤뀓營�룜�뤹쎑�뚳펽堊뗥쫩竊�\"true\"��\"yes\"��\"on \"�뚧��계˙鰲녵맏 \"yes\"��" #. type: Plain text #: en/git.txt:467 -#, fuzzy, priority:100 +#, priority:100 msgid "Here are the variables:" -msgstr "躍멱쭊�섌뇧" +msgstr "躍멱쭊�섌뇧竊�" #. type: Title ~ #: en/git.txt:469 -#, fuzzy, no-wrap, priority:100 +#, no-wrap, priority:100 msgid "The Git Repository" -msgstr "The Git Repository" +msgstr "Git餓볟틩" #. type: Plain text #: en/git.txt:473 #, priority:100 msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end." -msgstr "" +msgstr "瓦쇾틳��쥊�섌뇧�귞뵪雅� \"���� \"�멨퓘�� Git �썰빱�귝낏竊싧�쇔풓力ⓩ꼷�꾣삸竊뚦츆餓у룾�썼˙鵝띴틢Git阿뗤툓�껾CMS鵝욜뵪/誤녺썣竊뚧�餓ε쫩�쒍퉳�띴슴�②퓝�뜸퍟�꾣틦餓g쟻嶸←릤藥ε끁��" #. type: Labeled list #: en/git.txt:474 @@ -57425,7 +57419,7 @@ msgstr "`GIT_INDEX_FILE`" #: en/git.txt:478 #, priority:100 msgid "This environment variable specifies an alternate index file. If not specified, the default of `$GIT_DIR/index` is used." -msgstr "" +msgstr "瓦쇾릉��쥊�섌뇧�뉐츣雅녵�訝ゅ쨭�①쉪榮℡폊�뉏뻑�귛쫩�쒏깹�됪뙁若싷펽�숅퍡溫ㅴ슴��`$GIT_DIR/index`��" #. type: Labeled list #: en/git.txt:479 @@ -57437,7 +57431,7 @@ msgstr "`GIT_INDEX_VERSION`" #: en/git.txt:484 #, priority:100 msgid "This environment variable specifies what index version is used when writing the index file out. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information." -msgstr "" +msgstr "瓦쇾릉��쥊�섌뇧�뉐츣�ⓨ넍�븀뇨凉뺞뻼餓뜻뿶鵝욜뵪餓�阿덄뎵�с�� 若껂툖鴉싧쉽�띸렟�됬쉪榮℡폊�뉏뻑�� 容섋��끻넻訝뗰펽榮℡폊�뉏뻑�꾤뎵�т맏 2 �� 3�귛뢿鰲� linkgit:git-update-index[1] �룟룚�닷쩀岳→겘��" #. type: Labeled list #: en/git.txt:485 @@ -57449,7 +57443,7 @@ msgstr "`GIT_OBJECT_DIRECTORY`" #: en/git.txt:490 #, priority:100 msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used." -msgstr "" +msgstr "倻귝옖野배괌耶섇궓��퐬���싪퓝瓦쇾릉��쥊�섌뇧�뉐츣�꾬펽�d퉰sha1��퐬弱녶쑉瑥η쎅壤뺜툔�쎾뻠 - ��닕弱녵슴�③퍡溫ㅷ쉪`$GIT_DIR/objects`��퐬��" #. type: Labeled list #: en/git.txt:491 @@ -57461,13 +57455,13 @@ msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`" #: en/git.txt:497 #, priority:100 msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories." -msgstr "" +msgstr "�긴틢Git野배괌�꾡툖��뵻�섉�㏆펽�㎫쉪野배괌��빳熬ュ퐩旅e댆�긴벴�꾢룵瑥사쎅壤뺜릎�귟퓳訝ゅ룜�뤸뙁若싦틙訝�訝ょ뵳\": \"�녽슂竊덂쑉Windows訝뗤맏\"; \"�녽슂竊됬쉪Git野배괌��퐬�쀨〃竊뚦룾餓η뵪�ζ맂榮줗it野배괌�귝뼭�꾢�穩▼컛訝띴폏�쇿뀯瓦쇾틳��퐬訝���" #. type: Plain text #: en/git.txt:503 #, priority:100 msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`." -msgstr "" +msgstr "餓�`\"`竊덂룎凉뺝뤇竊됧�鸚당쉪�←쎅弱녻˙鰲i뇢訝튏瑥��繇롦졏耶쀧Е訝꿱러孃꾬펽�삥럦�띶��뚦릮野쇘쉪�뚦폊�뤄펽亮뜻뵱�곩룏�쒏씈饔т퉱�귚풃倻귨펽`\"path-with-\\\"-and-:-in-it\":vanilla-path`�됦륵訝よ러孃꾬폏`path-with-\"-and-:-in-it`��`vanilla-path`��" #. type: Labeled list #: en/git.txt:504 @@ -57479,7 +57473,7 @@ msgstr "`GIT_DIR`" #: en/git.txt:509 #, priority:100 msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository. The `--git-dir` command-line option also sets this value." -msgstr "" +msgstr "倻귝옖溫양쉰雅�`GIT_DIR`��쥊�섌뇧竊뚪궍阿덂츆�뉐츣雅녵�訝よ러孃꾣씎餓f쎘容섋���`.git`鵝쒍맏餓볟틩佯볡쉪�븀��� `--git-dir`�썰빱烏뚪�됮」阿잒꺗鸚잒�營�퓳訝ゅ�쇈��" #. type: Labeled list #: en/git.txt:510 @@ -57491,7 +57485,7 @@ msgstr "`GIT_WORK_TREE`" #: en/git.txt:514 #, priority:100 msgid "Set the path to the root of the working tree. This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable." -msgstr "" +msgstr "溫양쉰�겼램鵝쒎뙷�꾣졊�②러孃꾠�� 瓦쇾튋��빳��`--work-tree`�썰빱烏뚪�됮」�똠ore.worktree�띸쉰�섌뇧溫양쉰��" #. type: Labeled list #: en/git.txt:515 @@ -57503,7 +57497,7 @@ msgstr "`GIT_NAMESPACE`" #: en/git.txt:518 #, priority:100 msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value." -msgstr "" +msgstr "溫양쉰 Git �썲릫令븅뿴竊쏂�鰲� linkgit:gitnamespaces[7]�� `--namespace`�썰빱烏뚪�됮」阿잌룾餓θ�營�퓳訝ゅ�쇈��" #. type: Labeled list #: en/git.txt:519 @@ -57515,7 +57509,7 @@ msgstr "`GIT_CEILING_DIRECTORIES`" #: en/git.txt:533 #, priority:100 msgid "This should be a colon-separated list of absolute paths. If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories). It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment. Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory. However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`." -msgstr "" +msgstr "瓦쇿틪瑥ζ삸訝�訝ょ뵪�믣뤇�녽슂�꾤퍦野배러孃꾢닓烏ⓦ�� 倻귝옖溫양쉰雅놅펽若껅삸訝�訝ょ쎅壤뺝닓烏⑨펽�ⓨ��얌퍜佯볡쎅壤뺞뿶竊똆it訝띶틪瑥ε릲訝딀뵻�섊쎅壤�(chidir)竊덂�雅롦럲�ㅷ폆�℡뒥饔썹쉪營묊퍥��퐬孃덃쐣�⑨펹�� 若껂툖鴉싨럲�ㅵ퐪�띶램鵝쒐쎅壤뺞닑�ⓨ뫝餓ㅸ죱�뽫렞罌껂릎溫양쉰�껯IT_DIR�� �싧만�끻넻訝뗰펽Git ��誤곮��뽬퓳訝ゅ닓烏ⓧ릎�꾣씉��펽亮띈㎗�먧뻣鵝뺝룾�썲춼�①쉪寧�뤇�얏렏竊뚥빳堊욕컛若껂뺄訝롥퐪�띸쎅壤뺠퓵烏뚧캈渦껁�� �띈�뚳펽倻귝옖瓦욆퓳訝よ���꺗孃덃뀬竊뚥퐷��빳�ⓨ닓烏ⓧ릎曆삣뒥訝�訝ょ㈉�←쎅竊뚦몜瑥덲it�롩씊�꾣씉��툖��Е�룬벦�ο펽訝띺�誤곮㎗�먲폑堊뗥쫩竊�`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`��" #. type: Labeled list #: en/git.txt:534 @@ -57527,7 +57521,7 @@ msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`" #: en/git.txt:543 #, priority:100 msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This Boolean environment variable can be set to true to tell Git not to stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line." -msgstr "" +msgstr "壤볟쑉訝�訝ゆ깹��\".git \"餓볟틩��퐬�꾤쎅壤뺜툔瓦먫죱�띰펽Git 鴉싧컼瑥뺝쑉�띄쎅壤뺜릎�얍댆瓦숁졆�꾤쎅壤뺞씎野삥돻藥δ퐳�븀쉪窈띄ク竊뚥퐜容섋��끻넻訝뗥츆訝띴폏瓮②텏�뉏뻑楹사퍨�꾥씁�뚣�� 瓦쇾릉躍껃컮��쥊�섌뇧��빳熬ヨ�營�맏 \"true\"竊뚥빳�딂칹Git訝띹쫨�ⓩ뻼餓띄내瀯잒씁�뚦쨪�쒏��� ��`GIT_CEILING_DIRECTORIES`訝��뤄펽瓦쇾툖鴉싧쉽�띺�싪퓝`GIT_DIR`�뽩쑉�썰빱烏뚥릎溫양쉰�꾣삇簾�쉪餓볟틩��퐬��" #. type: Labeled list #: en/git.txt:544 @@ -57539,7 +57533,7 @@ msgstr "`GIT_COMMON_DIR`" #: en/git.txt:552 #, ignore-ellipsis, priority:100 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..." -msgstr "" +msgstr "倻귝옖瓦쇾릉�섌뇧熬ヨ�營�맏訝�訝よ러孃꾬펽�싧만��$GIT_DIR訝�쉪�욃램鵝쒏젒�뉏뻑弱녻˙餓롨퓳訝よ러孃꾡릎�뽩눣�귛램鵝쒏젒訝�돶若싩쉪�뉏뻑竊뚦쫩 HEAD �� index竊뚦닕餓� $GIT_DIR �뽩눣�귟��낁쭅 linkgit:gitrepository-layout[5] �� linkgit:git-worktree[1]�귟퓳訝ゅ룜�뤹쉪鴉섇뀍瀛㏛퐥雅롥끀餓뽬러孃꾢룜�륅펽倻� GIT_INDEX_FILE�갍IT_OBJECT_DIRECTORY..." #. type: Labeled list #: en/git.txt:553 @@ -57551,13 +57545,13 @@ msgstr "`GIT_DEFAULT_HASH`" #: en/git.txt:559 #, priority:100 msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\". THIS VARIABLE IS EXPERIMENTAL! See `--object-format` in linkgit:git-init[1]." -msgstr "" +msgstr "倻귝옖瓦쇾릉�섌뇧熬ヨ�營�펽�곁뎵�у틩�꾦퍡溫ㅵ뱢躍뚨츞力뺝컛熬ヨ�營�맏瓦쇾릉�쇈�귞쎅�띹퓳訝ゅ�쇔쑉�뗩쉮�띈˙恙썹븼竊뚩�뚧삸鵝욜뵪瓦쒐쮮�덃쑍佯볡쉪溫양쉰�귡퍡溫ㅶ삸 \"sha1\"�귟퓳 訝� �� �� �� 若� 謠� �� �� 竊곻펯竊곩뢿鰲� linkgit:git-init[1] 訝�쉪 `--object-format`��" #. type: Title ~ #: en/git.txt:561 #, no-wrap, priority:100 msgid "Git Commits" -msgstr "" +msgstr "Git�먧벡" #. type: Labeled list #: en/git.txt:562 @@ -57569,7 +57563,7 @@ msgstr "`GIT_AUTHOR_NAME`" #: en/git.txt:566 #, priority:100 msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�숁뿥恙쀦뿶竊뚥퐳�낁벴餓썰릎鵝욜뵪�꾢룾瑥삣릫燁겹�귟퓳鴉싪쫮��`user.name`��`author.name`�띸쉰�꾢�쇈��" #. type: Labeled list #: en/git.txt:567 @@ -57581,7 +57575,7 @@ msgstr "`GIT_AUTHOR_EMAIL`" #: en/git.txt:571 #, priority:100 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�쇿폊�ⓩ뿥恙쀦뿶竊뚨뵪餓θ〃�롣퐳�낁벴餓썸�鵝욜뵪�꾤뵷耶먬궙餓뜹쑑���귟퓳鴉싪쫮��`user.email`��`author.email`�꾦뀓營��쇈��" #. type: Labeled list #: en/git.txt:572 @@ -57593,7 +57587,7 @@ msgstr "`GIT_AUTHOR_DATE`" #: en/git.txt:575 #, priority:100 msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�쇿폊�ⓩ뿥恙쀦뿶竊뚨뵪雅롦젃力ⓧ퐳�끺엶�밭쉪�ζ쐿�귝쐣�덃졏凉뤺쭅 linkgit:git-commit[1]��" #. type: Labeled list #: en/git.txt:576 @@ -57605,7 +57599,7 @@ msgstr "`GIT_COMMITTER_NAME`" #: en/git.txt:580 #, priority:100 msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�쇿폊�ⓩ뿥恙쀦뿶竊뚧룓雅ㅸ�낁벴餓썰릎鵝욜뵪�꾢룾瑥삣릫燁겹�귟퓳鴉싪쫮��`user.name`��`committer.name`�꾦뀓營��쇈��" #. type: Labeled list #: en/git.txt:581 @@ -57617,7 +57611,7 @@ msgstr "`GIT_COMMITTER_EMAIL`" #: en/git.txt:585 #, priority:100 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�쇿폊�ⓩ뿥恙쀦뿶竊뚨뵪餓θ〃�롦룓雅ㅸ�끾�鵝욜뵪�꾤뵷耶먬궙餓뜹쑑���귟퓳鴉싪쫮��`user.email`��`author.email`�꾦뀓營��쇈��" #. type: Labeled list #: en/git.txt:586 @@ -57629,7 +57623,7 @@ msgstr "`GIT_COMMITTER_DATE`" #: en/git.txt:589 #, priority:100 msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats." -msgstr "" +msgstr "�ⓨ닗兩뷸룓雅ㅳ�곫젃嶺얍�穩→닑�①폋�� reflogs �띰펽�ⓧ틢�뉑낏�먧벡�끾�鵝쒍엶�밭쉪�ζ쐿�귝쐣�덃졏凉뤺쭅 linkgit:git-commit[1]��" #. type: Labeled list #: en/git.txt:590 @@ -57641,13 +57635,13 @@ msgstr "`EMAIL`" #: en/git.txt:593 #, priority:100 msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set." -msgstr "" +msgstr "倻귝옖亦→쐣溫양쉰�뜸퍟�멨뀽�꾤렞罌껃룜�뤸닑�띸쉰溫양쉰竊뚥퐳�끻뭽�먧벡�끿쉪�드춴��뻑�겼�鴉싧뢿�껇��쇈��" #. type: Title ~ #: en/git.txt:595 #, no-wrap, priority:100 msgid "Git Diffs" -msgstr "" +msgstr "Git藥�펰驪붻푵(Diffs)" #. type: Labeled list #: en/git.txt:596 @@ -57659,7 +57653,7 @@ msgstr "`GIT_DIFF_OPTS`" #: en/git.txt:601 #, priority:100 msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created. This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line." -msgstr "" +msgstr "����됪븞�꾥�營�삸\"--unified=?? \"��\"-u??\"竊뚨뵪雅롨�營�닗兩븀퍨訝��꾢량凉귝뿶�양ㅊ�꾣뻼�ц죱�겹�� 瓦쇾폍�덁틢 Git diff �썰빱烏뚥릎鴉좈�믥쉪餓삡퐬 \"-U\" �� \"--unified\" �됮」�쇈��" #. type: Labeled list #: en/git.txt:602 @@ -57671,13 +57665,13 @@ msgstr "`GIT_EXTERNAL_DIFF`" #: en/git.txt:608 #, priority:100 msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called to generate diffs, and Git does not use its builtin diff machinery. For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:" -msgstr "" +msgstr "壤볡렞罌껃룜��`GIT_EXTERNAL_DIFF`熬ヨ�營�뿶竊뚨뵳若껃뫝�띸쉪葉뗥틣熬ヨ컘�ⓩ씎�잍닇藥�펰�뽪뻼�э펽�뚥툖鵝욜뵪Git�끿쉰�꼋iff藥ε끁�� 野밥틢訝�訝よ˙曆삣뒥�곩닠�ㅶ닑岳�뵻�꾣뱧鵝쒙펽`GIT_EXTERNAL_DIFF`鴉싪˙瘟껆뵪竊뚥��길렏��7訝ゅ뢿�곤폏" #. type: Plain text #: en/git.txt:610 #, priority:100 msgid "path old-file old-hex old-mode new-file new-hex new-mode" -msgstr "" +msgstr "path old-file old-hex old-mode new-file new-hex new-mode" #. type: Plain text #: en/git.txt:612 @@ -61704,21 +61698,21 @@ msgstr "Linus Torvalds 竊덃옑瀛녔뼬쨌�х볐寧у뀑�뮤룡돇��끃竊쌚it�꾡퐳�� #. type: Labeled list #: en/glossary-content.txt:181 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_git_archive]]Git archive" -msgstr "[[def_git_archive]]Git耶섉。" +msgstr "[[def_git_archive]]餓볟틩竊덂�雅럂rch�ⓩ댎竊�(Git archive)" #. type: Plain text #: en/glossary-content.txt:183 #, priority:310 msgid "Synonym for <<def_repository,repository>> (for arch people)." -msgstr "Synonym for <<def_repository,餓볟틩>> (for arch people)." +msgstr "訝�<<def_repository,餓볟틩>> �뚥퉱(野밥틢arch�ⓩ댎)��" #. type: Labeled list #: en/glossary-content.txt:184 #, no-wrap, priority:310 msgid "[[def_gitfile]]gitfile" -msgstr "[[def_gitfile]]git �뉏뻑" +msgstr "[[def_gitfile]]gitfile竊덁퍜佯볣벦�ζ뻼餓띰펹" #. type: Plain text #: en/glossary-content.txt:187 @@ -61730,13 +61724,13 @@ msgstr "�ⓨ램鵝쒎뙷�백깿�꾣솹�싨뻼餓� `.git`竊뚧뙁�묊쐿閭g쉪�덃쑍佯볡쎅 #: en/glossary-content.txt:188 #, no-wrap, priority:310 msgid "[[def_grafts]]grafts" -msgstr "[[def_grafts]]燁삥쨳" +msgstr "[[def_grafts]]竊덃룓雅ㅿ펹燁삥쨳(grafts)" #. type: Plain text #: en/glossary-content.txt:194 -#, fuzzy, priority:310 +#, priority:310 msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file." -msgstr "燁삥쨳竊뉷rafts竊됮�싪퓝溫겼퐬�먧벡�꾥솞�뉒쪝�덁에��펽鵝요륵�▼렅�т툖�뚨쉪凉��묊봇瓦욄렏�ⓧ�壅룔�귟퓳�룝퐷弱긷룾餓θ� Git �뉓즳<<def_commit,�먧벡>>�꾡�瀯�<<def_parent,�뜻룓雅�>>訝롥닗兩뷸룓雅ㅶ뿶�꾥�壤뺜툖�뚣�귡�싪퓝 `.git/info/grafts` �뉏뻑瓦쏂죱�띸쉰��" +msgstr "燁삥쨳竊뉷rafts竊됮�싪퓝溫겼퐬�먧벡�꾥솞�뉒쪝�덁에��펽鵝요륵�▼렅�т툖�뚨쉪凉��묊봇瓦욄렏�ⓧ�壅룔�귟퓳�룝퐷弱긷룾餓θ� Git �뉓즳<<def_commit,�먧벡>>�꾡�瀯�<<def_parent,�뜻룓雅�>>訝롥닗兩뷸룓雅�(commit)�띄쉪溫겼퐬訝띶릪�귡�싪퓝 `.git/info/grafts` �뉏뻑瓦쏂죱�띸쉰��" #. type: Plain text #: en/glossary-content.txt:198 @@ -61760,7 +61754,7 @@ msgstr "�� Git �꾡툓訝뗦뻼訝�펽��<<def_object_name,野배괌�띸㎞>>�꾢릪阿� #: en/glossary-content.txt:202 #, no-wrap, priority:310 msgid "[[def_head]]head" -msgstr "[[def_head]]鸚�" +msgstr "[[def_head]]鸚�/�녷뵱(head)" #. type: Plain text #: en/glossary-content.txt:207 @@ -61770,9 +61764,9 @@ msgstr "訝�訝�<<def_ref,�썲릫凉뺟뵪>>��<<def_commit,�먧벡>>��<<def_branch, #. type: Labeled list #: en/glossary-content.txt:208 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_HEAD]]HEAD" -msgstr "[[def_HEAD]]HEAD" +msgstr "[[def_HEAD]]HEAD竊덂ㅄ�뉔뭹竊뚥벧�녑퐪�띶늽��펹" #. type: Plain text #: en/glossary-content.txt:215 @@ -61832,7 +61826,7 @@ msgstr "�념틢�먧릉�밧츣�뉏뻑�꾡에��펽耶섇궓��<<def_index,榮℡폊/�귛춼 #: en/glossary-content.txt:242 #, no-wrap, priority:310 msgid "[[def_master]]master" -msgstr "[[def_master]]master" +msgstr "[[def_master]]master竊덆퍡溫ㅵ늽��릫竊�" #. type: Plain text #: en/glossary-content.txt:248 @@ -61884,10 +61878,9 @@ msgstr "耶섇궓訝�瀯�\"野배괌\"竊뚥�訝ゅ뜒�х쉪<<def_object,野배괌>>�긷끀<<def #. type: Labeled list #: en/glossary-content.txt:280 -#, fuzzy, no-wrap, priority:310 -#| msgid "[[def_object_identifier]]object identifier" +#, no-wrap, priority:310 msgid "[[def_object_identifier]]object identifier (oid)" -msgstr "[[def_object_identifier]]野배괌�뉓칳寧�" +msgstr "[[def_object_identifier]]野배괌�뉓칳寧�[object identifier (oid)]" #. type: Plain text #: en/glossary-content.txt:282 @@ -61921,9 +61914,9 @@ msgstr "�뜸릎訝�訝ゆ젃瑥녺Е\"<<def_commit_object,�먧벡>>\", \"<<def_tree_obje #. type: Labeled list #: en/glossary-content.txt:294 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_octopus]]octopus" -msgstr "[[def_octopus]]octopus" +msgstr "[[def_octopus]]塋좈굴凉뤷릦亮띰펷訝ㅵ늽��빳訝딁쉪�덂뭉竊�(octopus)" #. type: Plain text #: en/glossary-content.txt:296 @@ -61933,9 +61926,9 @@ msgstr "<<def_merge,�덂뭉>>訝ㅴ릉餓δ툓��<<def_branch,�녷뵱>>��" #. type: Labeled list #: en/glossary-content.txt:297 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_origin]]origin" -msgstr "[[def_origin]]origin" +msgstr "[[def_origin]]origin竊덆퍡溫ㅷ쉪瓦쒐쮮�띸㎞竊�" #. type: Plain text #: en/glossary-content.txt:304 @@ -61945,15 +61938,15 @@ msgstr "容섋��꾡툓歷�<<def_repository,餓볟틩>>�귛ㄷ鸚싨빊窈밭쎅�녑컩�됦� #. type: Labeled list #: en/glossary-content.txt:305 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_overlay]]overlay" -msgstr "[[def_overlay]]overlay" +msgstr "[[def_overlay]]誤녺썣(overlay)" #. type: Plain text #: en/glossary-content.txt:313 -#, fuzzy, priority:310 +#, priority:310 msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory. This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>. In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'." -msgstr "�ゆ쎍�겼뭽曆삣뒥�뉏뻑�겼램鵝쒐쎅壤뺧펽鵝녵툖�좈솮若껂뺄竊뚨굳鴉쇌틢'cp -R'鴉싨쎍�곁쎅�뉒쎅壤뺜릎�꾢냵若밤�귟퓳��<<def_checkout,汝���>>訝�쉪容섋�與▼폀竊뚦퐪餓�<<def_index,�귛춼��>>��<<def_tree-ish,tree-ish>>訝���뷸뻼餓뜻뿶�귞쎑�랃펽�욆쫮�뽪Æ凉뤶튋鴉싧닠�ㅶ틦�뉏뻑訝�툖耶섇쑉�꾥퇎甕ゆ뻼餓띰펽映삡세雅�'rsync --delete'��" +msgstr "�ゆ쎍�겼뭽曆삣뒥�뉏뻑�겼램鵝쒐쎅壤뺧펽鵝녵툖�좈솮若껂뺄竊뚨굳鴉쇌틢'cp -R'鴉싨쎍�곁쎅�뉒쎅壤뺜릎�꾢냵若밤�귟퓳��<<def_checkout,汝���>>訝�쉪容섋�與▼폀竊뚦퐪餓�<<def_index,�귛춼��>>��<<def_tree-ish,�묈�穩�(tree-ish)>>訝���뷸뻼餓뜻뿶�귞쎑�랃펽�욆쫮�뽪Æ凉뤶튋鴉싧닠�ㅶ틦�뉏뻑訝�툖耶섇쑉�꾥퇎甕ゆ뻼餓띰펽映삡세雅�'rsync --delete'��" #. type: Labeled list #: en/glossary-content.txt:314 @@ -61977,7 +61970,7 @@ msgstr "[[def_pack_index]]�끿뇨凉�(pack index)" #: en/glossary-content.txt:322 #, priority:310 msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack." -msgstr "" +msgstr "<<def_pack,��>>訝�쉪野배괌�꾣젃瑥녺Е�뚦끀餓뽨에��쉪�쀨〃竊뚥빳�뤷뒰�됪븞�계����訝ゅ똿�꾢냵若밤��" #. type: Labeled list #: en/glossary-content.txt:323 @@ -61989,200 +61982,199 @@ msgstr "[[def_pathspec]]瓮�푶鰲꾥똽(pathspec)" #: en/glossary-content.txt:325 #, priority:310 msgid "Pattern used to limit paths in Git commands." -msgstr "" +msgstr "�ⓩ씎�먨댍Git�썰빱訝�쉪瓮�푶�꾣Æ凉뤵��" #. type: Plain text #: en/glossary-content.txt:333 #, priority:310 msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or working tree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:" -msgstr "" +msgstr "�� \"git ls-files\"��\"git ls-tree\"��\"git add\"��\"git grep\"��\"git diff\"��\"git checkout \"�뚩�鸚싧끀餓뽩뫝餓ㅷ쉪�썰빱烏뚥릎竊뚩러孃꾥쭊�쇠˙�ⓩ씎弱녷뱧鵝쒑똽�닻솏�뜹쑉�묉닑藥δ퐳�븀쉪�먧릉耶먬썓�� �념틢瓮�푶��쎑野밥틢壤볟뎺��퐬瓦섉삸窈뜹콆竊뚩��귡쁾驪뤶릉�썰빱�꾣뻼旅c�� pathspec�꾥�力뺝쫩訝뗰폏" #. type: Plain text #: en/glossary-content.txt:337 #, priority:310 msgid "any path matches itself" -msgstr "" +msgstr "餓삡퐬瓮�푶�썰툗�ゅ런�백뀓" #. type: Plain text #: en/glossary-content.txt:340 #, priority:310 msgid "the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree." -msgstr "" +msgstr "�경��롣�訝ゆ뼔瀛욜쉪瓮�푶鰲꾥똽餓h〃訝�訝ょ쎅壤뺝뎺煐��� 瑥θ러孃꾥쭊�껆쉪�껃쎍�ら솏雅롨�耶먩젒��" #. type: Plain text #: en/glossary-content.txt:344 #, priority:310 msgid "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators." -msgstr "" +msgstr "瓮�푶鰲꾥똽�꾢끀鵝숅깿�녷삸瓮�푶�띶끀鵝숅깿�녺쉪與▼폀�� �멨�雅롧쎅壤뺝뎺煐��꾥러孃꾢컛鵝욜뵪fnmatch(3)竊덂뙶�띶눦�곤펹訝롨�與▼폀瓦쏂죱�백뀓竊쏁돶�ユ삸竊뚢��*�쇿뭽��?��_��빳_�백뀓��퐬�녽슂寧╉��" #. type: Plain text #: en/glossary-content.txt:350 #, priority:310 msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg." -msgstr "" +msgstr "堊뗥쫩竊똃ocumentation/*.jpg弱녶뙶�뛆ocumentation耶먩젒訝�쉪����.jpg�뉏뻑竊뚦똿�촂ocumentation/chapter_1/figure_1.jpg��" #. type: Plain text #: en/glossary-content.txt:360 #, priority:310 msgid "A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path. The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon. The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon." -msgstr "" +msgstr "餓ε넂��`:`凉�鸚당쉪瓮�푶鰲꾥똽�됬돶餘듿맜阿됥�� �①���쉪壤℡폀訝�펽�띺씊�꾢넂��`:`�롩씊��0訝ゆ닑�닷쩀�� �쒒춸�����(magic signature)�앾펷��빳�됪떓餓ε룱訝�訝ゅ넂��`:`瀯볠씇竊됵펽�⒳툔�꾦깿�녷삸訝롨러孃꾢뙶�띸쉪與▼폀�� �쒒춸����띯�앯뵳ASCII寧�뤇瀯꾣닇竊뚩퓳雅쏁Е�룡뿢訝띷삸耶쀦칾�겼춻�갾lob�걊egex�방츏耶쀧Е阿잋툖��넂�룔�� 倻귝옖與▼폀餓δ툖掠욂틢�쒒춸����띯�앯Е�룬썓�꾢춻寧��冶뗰펽亮뜸툝訝띷삸�믣뤇竊뚪궍阿덄퍜�잂�쒒춸����띯�앯쉪���됧넂�룟갚��빳�곭븼��" #. type: Plain text #: en/glossary-content.txt:365 #, priority:310 msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path." -msgstr "" +msgstr "�②푵�욤쭊�껂릎竊뚦뎺�®쉪�믣뤇`:`�롩씊���訝ゅ��양쉪弱뤸떖��`(`竊뚥�訝ょ뵪�쀥뤇�녽슂��0訝ゆ닑鸚싦릉 �쒒춸��뜒瑥띯�앭닓烏⑨펽餓ε룋訝�訝ゅ컖��쉪弱뤸떖��`)`竊뚦끀鵝숅깿�녷삸誤곦툗瓮�푶�백뀓�꾣Æ凉뤵��" #. type: Plain text #: en/glossary-content.txt:368 #, priority:310 msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec." -msgstr "" +msgstr "訝�訝ゅ룵�됧넂�루쉪瓮�푶鰲꾥똽�뤷뫑�� �쒍툖鵝욜뵪瓮�푶鰲꾥똽�앫�귟퓳燁띶숱凉뤶툖佯붻�訝롥끀餓뽬러孃꾥쭊�껆퍜�덀��" #. type: Labeled list #: en/glossary-content.txt:370 -#, fuzzy, no-wrap, priority:310 -#| msgid "--stop" +#, no-wrap, priority:310 msgid "top" -msgstr "窈띌깿" +msgstr "窈띌깿(top)" #. type: Plain text #: en/glossary-content.txt:374 #, priority:310 msgid "The magic word `top` (magic signature: `/`) makes the pattern match from the root of the working tree, even when you are running the command from inside a subdirectory." -msgstr "" +msgstr "邀붹쑐瑥�`top`竊덆춸����랃폏`/`竊됦슴與▼폀餓롥램鵝쒎뙷�꾣졊��퐬凉�冶뗥뙶�랃펽�념슴鵝졽퍗耶먪쎅壤뺝냵瓦먫죱�썰빱��" #. type: Labeled list #: en/glossary-content.txt:375 #, no-wrap, priority:310 msgid "literal" -msgstr "literal" +msgstr "耶쀩씊��(literal)" #. type: Plain text #: en/glossary-content.txt:378 #, priority:310 msgid "Wildcards in the pattern such as `*` or `?` are treated as literal characters." -msgstr "" +msgstr "與▼폀訝�쉪�싮뀓寧�펽倻�`*`��`?`熬ヨ쭍訝뷴춻��뇧耶쀧Е��" #. type: Labeled list #: en/glossary-content.txt:379 #, no-wrap, priority:310 msgid "icase" -msgstr "icase" +msgstr "訝띷븦�잌뙶��(icase)" #. type: Plain text #: en/glossary-content.txt:381 #, priority:310 msgid "Case insensitive match." -msgstr "" +msgstr "訝띶뙷�녶ㄷ弱뤷넍�꾢뙶�띲��" #. type: Labeled list #: en/glossary-content.txt:382 #, no-wrap, priority:310 msgid "glob" -msgstr "glob" +msgstr "�싮뀓寧�(glob)" #. type: Plain text #: en/glossary-content.txt:389 #, priority:310 msgid "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, \"Documentation/{asterisk}.html\" matches \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\" or \"tools/perf/Documentation/perf.html\"." -msgstr "" +msgstr "Git弱녷Æ凉뤺쭍訝븅�귛릦fnmatch(3)竊덂뙶�띶눦�곤펹鵝욜뵪shell�꼏lob與▼폀竊늮hell ��鵝욜뵪�꾤��뽨틙�꾣��숃〃渦얍폀竊됵펽躍�쐣FNM_PATHNAME�뉐퓱:與▼폀訝�쉪�싮뀓寧�컛訝띶뙶�띹러孃꾢릫訝�쉪/竊덂뜵訝띶�耶먪쎅壤뺞닑訝딁벨��퐬瓦쏂죱�백뀓竊됥�귚풃倻귨펽\"Documentation/{asterisk}.html\"�백뀓\"Documentation/git.html\"竊뚩�뚥툖��\"Documentation/ppc/ppc.html\"��\"tools/perf/Documentation/perff.html\"��" #. type: Plain text #: en/glossary-content.txt:392 #, priority:310 msgid "Two consecutive asterisks (\"`**`\") in patterns matched against full pathname may have special meaning:" -msgstr "" +msgstr "�ⓧ툗�②러孃꾢릫�백뀓�꾣Æ凉뤶릎竊뚥륵訝よ퓹瀯�쉪�잌뤇竊�\"`**`\"竊됧룾�썸쐣�방츏�ヤ퉱竊�" #. type: Plain text #: en/glossary-content.txt:398 #, priority:310 msgid "A leading \"`**`\" followed by a slash means match in all directories. For example, \"`**/foo`\" matches file or directory \"`foo`\" anywhere, the same as pattern \"`foo`\". \"`**/foo/bar`\" matches file or directory \"`bar`\" anywhere that is directly under directory \"`foo`\"." -msgstr "" +msgstr "\"`**`\"�ⓨ를�쒏씈��퐬阿뗥뎺竊뚩〃鹽뷴쑉���됬쎅壤뺜릎�백뀓�귚풃倻귨펽\"`**/foo`\"�백뀓餓삡퐬�뉏뻑�뽫쎅壤뺟쉪\"`foo`\"竊뚥툗與▼폀\"`foo`\"�멨릪��\"`**/foo/bar`\"�백뀓餓삡퐬�뉏뻑�뽫쎅壤뺜릎�닸렏鵝띴틢��퐬\"`foo`\"阿뗤툔��\"`bar`\"��" #. type: Plain text #: en/glossary-content.txt:402 #, priority:310 msgid "A trailing \"`/**`\" matches everything inside. For example, \"`abc/**`\" matches all files inside directory \"abc\", relative to the location of the `.gitignore` file, with infinite depth." -msgstr "" +msgstr "瓮�푶�롨퇎��\"`/**`\"烏①ㅊ�백뀓瓦쇾릉��퐬�뚪씊�꾣��됪뻼餓뜰�귚풃倻귨펽\"`abc/**`\"�백뀓�멨�雅�`.gitignore`�뉏뻑�꾡퐤營�릎��퐬 \"abc \"�끿쉪���됪뻼餓띰펽曆긷벧�좈솏��" #. type: Plain text #: en/glossary-content.txt:406 #, priority:310 msgid "A slash followed by two consecutive asterisks then a slash matches zero or more directories. For example, \"`a/**/b`\" matches \"`a/b`\", \"`a/x/b`\", \"`a/x/y/b`\" and so on." -msgstr "" +msgstr "訝�訝ゆ뼔�졾릮�€삸訝ㅴ릉瓦욅뺌�꾣삜�룟냽�δ툓訝�訝ゆ뼔�좑펽�백뀓�뜸릉�뽩쩀訝ょ쎅壤뺛�귚풃倻귨펽\"`a/**/b`\" �백뀓 \"`a/b`\"��\"`a/x/b`\"��\"`a/x/y/b`\"竊뚨춬嶺됵펽堊앮�映삥렓��" #. type: Plain text #: en/glossary-content.txt:408 #, priority:310 msgid "Other consecutive asterisks are considered invalid." -msgstr "" +msgstr "�뜸퍟瓦욅뺌�꾣삜�룡삸�졿븞�꾠��" #. type: Plain text #: en/glossary-content.txt:410 #, priority:310 msgid "Glob magic is incompatible with literal magic." -msgstr "" +msgstr "�싮뀓寧�춸��칾(glob)訝롥춻��뇧邀붹쑐瑥�(literal)��툖�멨��꾠��" #. type: Labeled list #: en/glossary-content.txt:411 #, no-wrap, priority:310 msgid "attr" -msgstr "attr" +msgstr "掠욄�㎩뙶��" #. type: Plain text #: en/glossary-content.txt:417 #, priority:310 msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]." -msgstr "" +msgstr "��`attr:` 阿뗥릮���訝ょ㈉�쇔늽�붺쉪�쒎콪�㎬쫨黎귘�앭닓烏⑨펽���됭퓳雅쏃꺗恙낂』譯↑떨�띹꺗熬ヨ�訝뷸삸�백뀓�꾥러孃�;瓦숁삸�③�싧만�꾦씆邀붹퀡瓮�푶鰲꾥똽與▼폀�백뀓阿뗥쨼�꾠�귛뢿鰲걄inkgit:gitattributes[5]��" #. type: Plain text #: en/glossary-content.txt:420 #, priority:310 msgid "Each of the attribute requirements for the path takes one of these forms:" -msgstr "" +msgstr "餓δ툔�끻맜雅녻러孃꾤쉪驪뤶릉掠욄�㎬쫨黎귨폏" #. type: Plain text #: en/glossary-content.txt:422 #, priority:310 msgid "\"`ATTR`\" requires that the attribute `ATTR` be set." -msgstr "" +msgstr "\"`ATTR`\"烏①ㅊ誤곫콆溫양쉰`ATTR`掠욄�㎯��" #. type: Plain text #: en/glossary-content.txt:424 #, priority:310 msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset." -msgstr "" +msgstr "\"`-ATTR`\"誤곫콆掠욄��`ATTR`亦→쐣溫양쉰��" #. type: Plain text #: en/glossary-content.txt:427 #, priority:310 msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`." -msgstr "" +msgstr "\"`ATTR=VALUE`\"誤곫콆弱녶콪��`ATTR`溫양쉰訝뷴춻寧╊림`VALUE`��" #. type: Plain text #: en/glossary-content.txt:430 #, priority:310 msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified." -msgstr "" +msgstr "\"`!ATTR`\"誤곫콆掠욄��`ATTR`��쑋�뉐츣�꾠��" #. type: Plain text #: en/glossary-content.txt:433 #, priority:310 msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object." -msgstr "" +msgstr "力ⓩ꼷竊뚦퐪訝롦젒野배괌瓦쏂죱�백뀓�띰펽掠욄�㏛퍖�뜻삸餓롥램鵝쒎뙷訝�렩孃쀧쉪竊뚩�뚥툖��퍗瀯쇿츣�꾣젒野배괌訝�렩孃쀣��" #. type: Labeled list #: en/glossary-content.txt:434 #, no-wrap, priority:310 msgid "exclude" -msgstr "exclude" +msgstr "�믧솮�백뀓(exclude)" #. type: Plain text #: en/glossary-content.txt:440 #, priority:310 msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec." -msgstr "" +msgstr "壤볞�訝よ러孃꾢뙶�띴틙餓삡퐬鰲꾢닕阿뗥쨼��(non-exclude)瓮�푶鰲꾥똽�롳펽若껃컛�띶럣���됬쉪�믧솮�㎬러孃꾥쭊�껓펷邀붹쑐嶺얍릫竊�`竊�`�뽩끀�뚥퉱瑥�`^`竊됥�귛쫩�쒎뙶�랃펽瑥θ러孃꾢컛熬ュ옙�γ�� 壤볠깹�됭쭊�쇾퉳鸚뽬러孃꾥쭊�껅뿶竊뚧럲�ㅶ퀡弱녶틪�ⓧ틢瀯볠옖�놅펽弱긷깗�ⓩ깹�됦뻣鵝뺠러孃꾥쭊�껆쉪�끻넻訝뗨컘�ⓦ��" #. type: Labeled list #: en/glossary-content.txt:442 @@ -62194,67 +62186,67 @@ msgstr "[[def_parent]]�뜻룓雅�(parent)" #: en/glossary-content.txt:446 #, priority:310 msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents." -msgstr "" +msgstr "訝�訝�<<def_commit_object,�먧벡野배괌>>�끻맜訝�訝ゅ��묇릎�꾦�삭풌�띺㈀�쀨〃竊덂룾�썸삸令븀쉪竊됵펽�녑끀�뜻룓雅ㅳ��" #. type: Labeled list #: en/glossary-content.txt:447 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_pickaxe]]pickaxe" -msgstr "[[def_pickaxe]]pickaxe" +msgstr "[[def_pickaxe]]�뽪럹(pickaxe)" #. type: Plain text #: en/glossary-content.txt:453 #, priority:310 msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]." -msgstr "" +msgstr "���<<def_pickaxe,�뽪럹>>�뉒쉪�칍iff�멨퓘堊뗧쮮(diffcore)�꾡�訝ら�됮」竊뚩푷�⑶�됪떓罌욃뒥�뽩닠�ㅷ돶若싨뻼�у춻寧╊림�꾢룜�뽧�귡�싪퓝`--pickaxe-all`�됮」竊뚦츆��빳�ⓩ씎�η쐦凉뺝뀯�뽩닠�ㅷ쉪�③깿<<def_changeset,�섉쎍��>>竊뚥풃倻귝윇訝�烏뚧뻼耶쀣�귛뢿鰲걄inkgit:git-diff[1]��" #. type: Labeled list #: en/glossary-content.txt:454 #, no-wrap, priority:310 msgid "[[def_plumbing]]plumbing" -msgstr "" +msgstr "[[def_plumbing]]嶸▽뻑(plumbing)" #. type: Plain text #: en/glossary-content.txt:456 #, priority:310 msgid "Cute name for <<def_core_git,core Git>>." -msgstr "" +msgstr "<<def_core_git,Git�멨퓘>>�꾣샃燁겹��" #. type: Labeled list #: en/glossary-content.txt:457 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_porcelain]]porcelain" -msgstr "[[def_porcelain]]porcelain" +msgstr "[[def_porcelain]]�룝뻑(porcelain)" #. type: Plain text #: en/glossary-content.txt:462 #, priority:310 msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>." -msgstr "" +msgstr "堊앶씈<<def_core_git,Git�멨퓘>>�꾤쮮佯뤷뭽葉뗥틣也쀤뻑�꾣샃燁곤펽���Git�멨퓘訝듿콆弱곮즳�귚툗<<def_plumbing,嶸▽뻑>>�멩캈竊뚨벜餓뜻슫�꿜틙�닷쩀<<def_SCM,SCM>>�ε룭��" #. type: Labeled list #: en/glossary-content.txt:463 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_per_worktree_ref]]per-worktree ref" -msgstr "[[def_per_worktree_ref]]per-worktree ref" +msgstr "[[def_per_worktree_ref]]藥δ퐳�뷴폊��(per-worktree ref)" #. type: Plain text #: en/glossary-content.txt:468 #, priority:310 msgid "Refs that are per-<<def_worktree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs." -msgstr "" +msgstr "�멩캈雅롥뀲掠�凉뺟뵪竊뚦츆���驪뤶릉<<def_worktree,藥δ퐳��>>�꾢폊�ⓦ�� ��뎺�ゆ쐣<<def_HEAD,HEAD>>�뚥뻣鵝뺜빳`refs/bisect/`凉�鸚당쉪凉뺟뵪竊뚥퐜餓ε릮��꺗�끾떖�뜸퍟訝띶�躍며쉪凉뺟뵪��" #. type: Labeled list #: en/glossary-content.txt:469 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_pseudoref]]pseudoref" -msgstr "[[def_pseudoref]]pseudoref" +msgstr "[[def_pseudoref]]鴉ゅ폊��(pseudoref)" #. type: Plain text #: en/glossary-content.txt:484 #, priority:310 msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work." -msgstr "" +msgstr "鴉ゅ폊�ⓩ삸`$GIT_DIR`訝뗧쉪訝�映삥뻼餓띰펽�띈죱訝뷰툗岳��-�뽪옄(rev-parse)訝�쉪凉뺟뵪訝��뤄펽鵝녻˙Git�뷴늽野밧푷�� 鴉ゅ폊�①쉪�띶춻訝��ф삸�긺뵳訝�烏�<<def_SHA1,SHA-1>>凉�冶뗰펽�뜹릮��㈉�쇈�� ��餓ο펽HEAD亮뜸툖���訝や섈凉뺟뵪竊뚦썱訝뷴츆�됪뿶���訝ょЕ�룡�㎩폊�ⓦ�� 若껃룾�썽�됪떓�㎩쑑�끻맜訝�雅쏃쥫鸚뽫쉪�경뜮�� 驪붷쫩`MERGE_HEAD`��`CHERRY_PICK_HEAD`�� 訝�<<def_per_worktree_ref,藥δ퐳�뷴폊��>>訝띶릪竊뚩퓳雅쎿뻼餓뜸툖�썸삸寧�뤇凉뺟뵪竊뚥튋亦→쐣凉뺟뵪�ε퓱�� 若껂뺄阿잋툖�썽�싪퓝閭e만�꾢폊�ⓩ쎍�경쑛�띈퓵烏뚧쎍�겹�� �멨룏竊뚦츆餓ф삸�싪퓝�닸렏�쇿뀯�뉏뻑�ζ쎍�곁쉪�� 訝띹퓝竊뚦츆餓у룾餓θ˙壤볞퐳凉뺟뵪瑥삣룚竊뚧�餓� `git rev-parse MERGE_HEAD` 餓띶룾餓θ퓧烏뚣��" #. type: Labeled list #: en/glossary-content.txt:485 @@ -62266,44 +62258,43 @@ msgstr "[[def_pull]]�됧룚(pull)" #: en/glossary-content.txt:488 #, priority:310 msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]." -msgstr "" +msgstr "�됧룚訝�訝�<<def_branch,�녷뵱>>�뤷뫑��<<def_fetch,�룟룚>>訝�訝ゅ늽��뭉訝�<<def_merge,�덂뭉>>瓦쇾릉�녷뵱�� ��쭅 linkgit:git-pull[1]��" #. type: Labeled list #: en/glossary-content.txt:489 #, no-wrap, priority:310 msgid "[[def_push]]push" -msgstr "" +msgstr "[[def_push]]�③��(push)" #. type: Plain text #: en/glossary-content.txt:500 #, priority:310 msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails." -msgstr "" +msgstr "�③�곦�訝�<<def_branch,�녷뵱>>�뤷뫑��餓롨퓶葉뗧쉪<<def_repository,餓볟틩>>�룟룚瑥ε늽��쉪<<def_head_ref,鸚닷폊��>>竊뚧돻�뷴츆��맔����녷뵱�꾣쑍�겼늽��폊�①쉪訝�訝ょ쪝�덀�귛쑉瓦숂쭕�끻넻訝뗰펽弱녷��됦퍗�у쑑�녷뵱凉뺟뵪<<def_reachable,��씨>>�꾢�穩∽펽餓ε룋餓롨퓶葉뗤퍜佯볞릎訝℡ㅁ�꾢�穩∽펽�얍뀯瓦쒐쮮<<def_object_database,野배괌佯�>>竊뚦뭉�닸뼭瓦쒐쮮�녷뵱凉뺟뵪�귛쫩�쒑퓶葉�<<def_head,鸚�/�녷뵱>>訝띷삸�у쑑�녷뵱�꾤쪝�덌펽�숁렓�곩ㅁ兀γ��" #. type: Labeled list #: en/glossary-content.txt:501 #, no-wrap, priority:310 msgid "[[def_reachable]]reachable" -msgstr "[[def_reachable]]��댆渦양쉪" +msgstr "[[def_reachable]]��씨�꾬펷reachable竊�" #. type: Plain text #: en/glossary-content.txt:510 #, priority:310 msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain." -msgstr "" +msgstr "訝�訝ょ퍢若싩쉪<<def_commit,�먧벡>>�꾣��됬쪝�덆꺗熬ョ㎞訝뷴룾餓δ퍗瑥ζ룓雅� �쒎댆渦얄�앫�귝쎍訝��у쑑瑥댐펽倻귝옖訝�訝�<<def_object,野배괌>>��빳�싪퓝<<def_chain,野배괌��>>餓롣�訝�<<def_tag,�뉒�>>�계씨餓삥꼷訝�訝ゅ�穩↓벦�뉓���<<def_tag,�뉒�>>竊뚪궍阿덅�野배괌弱길삸��씨�꾬펽<<def_commit_object,�먧벡>>�겼츆餓х쉪�뜻룓雅ㅶ닑�묕펽餓ε룋<<def_tree_object,��>>�겼츆餓ф��끻맜�꾣젒��<<def_blob_object,雅뚩퓵�뜹�穩�>>��" #. type: Labeled list #: en/glossary-content.txt:511 -#, fuzzy, no-wrap, priority:310 -#| msgid "[[def_reachable]]reachable" +#, no-wrap, priority:310 msgid "[[def_reachability_bitmap]]reachability bitmaps" -msgstr "[[def_reachable]]��댆渦양쉪" +msgstr "[[def_reachability_bitmap]]��씨�㏛퐤��" #. type: Plain text #: en/glossary-content.txt:518 #, priority:310 msgid "Reachability bitmaps store information about the <<def_reachable,reachability>> of a selected set of commits in a packfile, or a multi-pack index (MIDX), to speed up object search. The bitmaps are stored in a \".bitmap\" file. A repository may have at most one bitmap file in use. The bitmap file may belong to either one pack, or the repository's multi-pack index (if it exists)." -msgstr "" +msgstr "��씨�㏛퐤�얍춼�ⓧ틙�끾뻼餓뜻닑鸚싧똿榮℡폊竊뉾IDX竊됦릎�됧츣�꾡�瀯꾣룓雅ㅷ쉪<<def_reachable,��씨��>>�꾡에��펽餓ε뒥恙ュ�穩→맂榮㏂�� 鵝띶쎗熬ュ춼�ⓨ쑉\".bitmap \"�뉏뻑訝��귚�訝ょ뎵�у틩��鸚싧룾餓ζ쐣訝�訝や퐤�얏뻼餓뜹쑉鵝욜뵪�귟퓳訝や퐤�얏뻼餓뜹룾餓ε콪雅롣�訝ゅ똿竊뚥튋��빳掠욂틢�덃쑍佯볡쉪鸚싧똿榮℡폊竊덂쫩�쒏쐣�꾥캕竊됥��" #. type: Labeled list #: en/glossary-content.txt:519 @@ -62315,31 +62306,31 @@ msgstr "[[def_rebase]]�섇읃(rebase)" #: en/glossary-content.txt:523 #, priority:310 msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result." -msgstr "" +msgstr "弱�<<def_branch,�녷뵱>>�꾡�楹삣닓岳�뵻�띷뼭佯붺뵪雅롣툖�뚨쉪�녷뵱訝딉펽亮뜹컛<<def_head,鸚�>>�뉔뭹�띸쉰訝븃��녷뵱��" #. type: Labeled list #: en/glossary-content.txt:524 #, no-wrap, priority:310 msgid "[[def_ref]]ref" -msgstr "" +msgstr "[[def_ref]]凉뺟뵪(ref)" #. type: Plain text #: en/glossary-content.txt:532 #, priority:310 msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>." -msgstr "" +msgstr "訝�訝や빳`refs/`凉�鸚당쉪�띶춻竊덁풃倻�`refs/heads/master`竊됵펽若껅뙁�묇�訝�<<def_object_name,野배괌�띸㎞>>�뽩룱訝�訝ゅ폊�⑨펷�롨�낁˙燁겻맏<<def_symref,寧�뤇凉뺟뵪>>竊됥�� 訝뷸뼶堊욤돈鰲곻펽壤볞퐳訝� Git �썰빱�꾢뢿�경뿶竊뚦폊�ⓨ룾餓δ슴�①섄�숋폑�귟쭅 linkgit:gitrevisions[7] �� 凉뺟뵪岳앭춼��<<def_repository,餓볟틩>>訝���" #. type: Plain text #: en/glossary-content.txt:536 #, priority:310 msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)." -msgstr "" +msgstr "凉뺟뵪�꾢뫝�띸㈉�닸삸�녶콆轝←쉪�� 訝띶릪�꾢춴掠귝А烏①ㅊ訝띶릪�꾣깄�듸펷堊뗥쫩竊�`refs/heads/`掠귝А�ⓧ틢餓h〃�у쑑�녷뵱竊됥��" #. type: Plain text #: en/glossary-content.txt:539 #, priority:310 msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`." -msgstr "" +msgstr "�됦�雅쏁돶餘딀꼷阿됬쉪凉뺟뵪訝띴빳`refs/`凉�鸚담�� ��瀯뤷끂�꾡풃耶먨갚��`HEAD`��" #. type: Labeled list #: en/glossary-content.txt:540 @@ -62351,7 +62342,7 @@ msgstr "[[def_reflog]]凉뺟뵪�ε퓱(reflog)" #: en/glossary-content.txt:545 #, priority:310 msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details." -msgstr "" +msgstr "凉뺟뵪�ε퓱�양ㅊ訝�訝ゅ폊�①쉪�у쑑 \"�녶뤁\"�� �℡룯瑥앲�竊뚦츆��빳�딂칹鵝좑펽�ⓩ삩鸚⒳툔��9:14竊�_瓦쇾릉_�덃쑍佯볡쉪���롣툒轝▽엶溫€삸餓�阿덌펽餓ε룋_瓦쇾릉_�덃쑍佯볡쉪壤볟뎺�뜻�곫삸餓�阿덀�� 瑥�깄鰲� linkgit:git-reflog[1]��" #. type: Labeled list #: en/glossary-content.txt:546 @@ -62363,31 +62354,31 @@ msgstr "[[def_refspec]]凉뺟뵪鰲꾥똽(refspec)" #: en/glossary-content.txt:550 #, priority:310 msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref." -msgstr "" +msgstr "�쒎폊�②쭊�꺿�앮삸<<def_fetch,�룟룚>>��<<def_push,�③��>>�ⓧ빳�뤺염瓦쒐쮮<<def_ref,凉뺟뵪>>�뚧쑍�겼폊�ⓧ퉳�당쉪�졾컙�녕내��" #. type: Labeled list #: en/glossary-content.txt:551 #, no-wrap, priority:310 msgid "[[def_remote]]remote repository" -msgstr "" +msgstr "[[def_remote]]瓦쒐쮮餓볟틩" #. type: Plain text #: en/glossary-content.txt:555 #, priority:310 msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>." -msgstr "" +msgstr "訝�訝ら깿營꿨쑉�뜸퍟�경뼶鵝녺뵪雅롨퇎甕ゅ릪訝�訝ら」��쉪<<def_repository,餓볟틩>>�귟쫨訝롨퓶葉뗩�싦에竊뚩��귡쁾<<def_fetch,�룟룚>>��<<def_push,�③��>>��" #. type: Labeled list #: en/glossary-content.txt:556 #, no-wrap, priority:310 msgid "[[def_remote_tracking_branch]]remote-tracking branch" -msgstr "" +msgstr "[[def_remote_tracking_branch]]瓦쒐쮮瓮잒릉�녷뵱(remote-tracking branch)" #. type: Plain text #: en/glossary-content.txt:564 #, priority:310 msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it." -msgstr "" +msgstr "訝�訝ょ뵪�θ퇎甕ゅ룱訝�訝�<<def_repository,餓볟틩>>�섇뙑��<<def_ref,凉뺟뵪>>�귛츆�싧만�뗨돈�ε깗'refs/remotes/foo/bar'竊덅〃鹽뷴츆瓮잒릉訝�訝ゅ릫訝�'foo'�꾥퓶葉뗤릎�띴맏'bar'�꾢늽��펹竊뚦뭉野백뀓營���꼎etch<<def_refspec,凉뺟뵪鰲꾥똽>>�념쑨瓦쏂죱�백뀓�귚�訝よ퓶葉뗨퇎甕ゅ늽��툖佯붻��긺쎍�η쉪岳�뵻�뽪삸�у쑑�꾣룓雅ㅶ엫�먦��" #. type: Labeled list #: en/glossary-content.txt:565 @@ -62399,7 +62390,7 @@ msgstr "[[def_repository]餓볟틩" #: en/glossary-content.txt:572 #, priority:310 msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>." -msgstr "" +msgstr "訝�訝�<<def_ref,凉뺟뵪>>�꾦썓�덂뭽訝�訝�<<def_object_database,野배괌佯�>>�꾦썓�덌펽�끻맜雅녶폊�ⓧ릎���됬쉪<<def_reachable,��씨��>>野배괌竊뚦룾�썼퓲�됦�訝ゆ닑鸚싦릉<<def_porcelain,�룝뻑>>�껅빊���귚�訝や퍜佯볟룾餓ι�싪퓝<<def_alternate_object_database,饔�쎘野배괌佯�>>訝롥끀餓뽩춼�ⓨ틩�긴벴野배괌�경뜮佯볝��" #. type: Labeled list #: en/glossary-content.txt:573 @@ -62411,7 +62402,7 @@ msgstr "[[def_resolve]]鰲e넶" #: en/glossary-content.txt:576 #, priority:310 msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind." -msgstr "" +msgstr "�뗥뒯岳�쨳�김눎��<<def_merge,�덂뭉>>雅㎫뵟�꾦걮�숅뵗瑥���" #. type: Labeled list #: en/glossary-content.txt:577 @@ -62423,7 +62414,7 @@ msgstr "[[def_revision]]�덃쑍" #: en/glossary-content.txt:579 #, priority:310 msgid "Synonym for <<def_commit,commit>> (the noun)." -msgstr "" +msgstr "訝�<<def_commit,�먧벡>>竊덂릫瑥띶숱凉륅펹�뚥퉱��" #. type: Labeled list #: en/glossary-content.txt:580 @@ -62435,19 +62426,19 @@ msgstr "[[def_rewind]]�욇��" #: en/glossary-content.txt:583 #, priority:310 msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>." -msgstr "" +msgstr "�좈솮訝��ⓨ늽�경뜮竊뚦뜵��<<def_head,鸚�>>�뉔뭹�뉐릲渦껅뿩��<<def_revision,�덃쑍>>��" #. type: Labeled list #: en/glossary-content.txt:584 #, no-wrap, priority:310 msgid "[[def_SCM]]SCM" -msgstr "" +msgstr "[[def_SCM]]SCM竊덃틦餓g쟻嶸←릤藥ε끁竊�" #. type: Plain text #: en/glossary-content.txt:586 #, priority:310 msgid "Source code management (tool)." -msgstr "" +msgstr "繹먧빰�곭��놅펷藥ε끁竊됥��" #. type: Labeled list #: en/glossary-content.txt:587 @@ -62459,7 +62450,7 @@ msgstr "[[def_SHA1]]SHA-1" #: en/glossary-content.txt:590 #, priority:310 msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>." -msgstr "" +msgstr "\"若됧뀲�덂툕嶸쀦퀡1\"竊쎽�訝ゅ뒥野녶뱢躍뚦눦�겹�� �쭳it�꾡툓訝뗦뻼訝�삸<<def_object_name,野배괌��>>�꾢릪阿됭칾��" #. type: Labeled list #: en/glossary-content.txt:591 @@ -62471,7 +62462,7 @@ msgstr "[[def_shallow_clone]]役끻뀑��(shallow clone)" #: en/glossary-content.txt:595 #, ignore-ellipsis, priority:310 msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command." -msgstr "" +msgstr "鸚㏝깿�녷삸��<<def_shallow_repository,役끺퍜佯�>>竊뚥퐜若껅쎍�롧‘�계〃�롥끀���싪퓝瓦먫죱`git clone --depth=...`�썰빱�쎾뻠�꾠��" #. type: Labeled list #: en/glossary-content.txt:596 @@ -62483,7 +62474,7 @@ msgstr "[[def_shallow_repository]役끺퍜佯�(shallow repository)" #: en/glossary-content.txt:606 #, priority:310 msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]." -msgstr "" +msgstr "訝�訝ゆ탢<<def_repository,餓볟틩>>訝띴폏溫겼퐬若뚧빐�꾣룓雅ㅵ럣�뀐펽�뜸릎訝�雅�<<def_commit,�먧벡>>��<<def_parent,��>>�먧벡熬ラ�驪곦틙竊덃뜟�θ캕瑥댐펽Git熬ュ몜�ε걞獒낁퓳雅쎿룓雅ㅶ깹�됬댍�먧벡竊뚦갹嶸▼쑉<<def_commit_object,�먧벡野배괌>>訝�쐣溫겼퐬竊됥�귛퐪鵝졾룵野밥�訝ら」��쉪瓦묉쐿�녶뤁�잌뀾擁f뿶竊뚩퓳��푽�됬뵪�꾬펽弱썹�訝딀만溫겼퐬�꾤쐿若욃럣�꿱쫨鸚㎩풓鸚싥�귡�싪퓝瀯� linkgit:git-clone[1]�먧풘 `--depth` �됮」竊뚦룾餓ε닗兩뷰�訝ゆ탢掠귞쉪餓볟틩竊뚥퉳�롥룾餓η뵪 linkgit:git-fetch[1] 曆길럹若껆쉪�녶뤁��" #. type: Labeled list #: en/glossary-content.txt:607 @@ -62495,7 +62486,7 @@ msgstr "[[def_stash]]兀�뿈窈�" #: en/glossary-content.txt:610 #, priority:310 msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse." -msgstr "" +msgstr "訝�訝�<<def_object,野배괌>>竊뚨뵪雅롣릿�뜹춼��<<def_dirty,��>>藥δ퐳��퐬�꾢냵若밧뭽榮℡폊竊뚥빳堊욕컛�ι뇥�겻슴�ⓦ��" #. type: Labeled list #: en/glossary-content.txt:611 @@ -62507,19 +62498,19 @@ msgstr "[[def_submodule]]耶먩Æ��(submodule)" #: en/glossary-content.txt:615 #, priority:310 msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)." -msgstr "" +msgstr "訝�訝�<<def_repository,餓볟틩>>岳앭춼���╊�訝ゅ틩�끿쉪�х쳦窈밭쎅�꾢럣�뀐펷�롨�낁˙燁겻맏<<def_superproject, �뜹램葉�>>竊됥��" #. type: Labeled list #: en/glossary-content.txt:616 #, no-wrap, priority:310 msgid "[[def_superproject]]superproject" -msgstr "" +msgstr "[[def_superproject]]�뜹램葉�(superproject)" #. type: Plain text #: en/glossary-content.txt:621 #, priority:310 msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules." -msgstr "" +msgstr "訝�訝�<<def_repository,餓볟틩>>�ⓨ끀藥δ퐳�뷰릎凉뺟뵪�뜸퍟窈밭쎅�꾡퍜佯볩펽鵝쒍맏<<def_submodule,耶먩Æ��>>�� �뜹램葉뗥똿�ュ춴與▼쓼�꾣룓雅ㅵ�穩←쉪�띸㎞竊덁퐜訝띷똻�됧끀��쑍竊됥��" #. type: Labeled list #: en/glossary-content.txt:622 @@ -62531,19 +62522,19 @@ msgstr "[[def_symref]]寧�뤇凉뺟뵪" #: en/glossary-content.txt:629 #, priority:310 msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command." -msgstr "" +msgstr "寧�뤇凉뺟뵪竊싧츆訝띶똿��<<def_SHA1,SHA-1>>id竊뚩�뚧삸�뉒뵪'ref: refs/some/thing'�꾣졏凉륅펽壤볢˙凉뺟뵪�띰펽若껂폏�믣퐩�계퓳訝ゅ폊�ⓦ��'<<def_HEAD,HEAD>>'���訝ょЕ�룟폊�①쉪�멨엹堊뗥춴�귞Е�룟폊�ⓨ룾�싪퓝linkgit:git-symbolic-ref[1]�썰빱野밧끀瓦쏂죱�띴퐳��" #. type: Labeled list #: en/glossary-content.txt:630 #, no-wrap, priority:310 msgid "[[def_tag]]tag" -msgstr "" +msgstr "[[def_tag]]�뉒�(tag)" #. type: Plain text #: en/glossary-content.txt:639 #, priority:310 msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>." -msgstr "" +msgstr "��`refs/tags/`�썲릫令븅뿴訝뗧쉪訝�訝�<<def_ref,凉뺟뵪>>竊뚧뙁�묇�訝や뻣�뤹굳�뗧쉪野배괌竊덆�싧만訝�訝ゆ젃嶺얏뙁�묇�訝�<<def_tag_object,�뉒�>>野배괌�뽬�끺�訝�<<def_commit_object,�먧벡野배괌>>竊됥�� 訝�<<def_head,head>>�뉓��멩캈竊뚧젃嶺얌툖鴉싪˙`commit`�썰빱�닸뼭�괛it�꾣젃嶺얌툗Lisp�꾣젃嶺억펷�쭳it�꾡툓訝뗦뻼訝�㎞訝�<<def_object_type,野배괌映삣엹>>竊됪��졾뀽楹삠�귝젃嶺얏�躍며뵪�꾣삸�뉓�曄뽩뀍�먧벡訝�쉪訝�訝ょ돶若�<<def_chain,野배괌��>>��" #. type: Labeled list #: en/glossary-content.txt:640 @@ -62555,7 +62546,7 @@ msgstr "[[def_tag_object]]�뉒�野배괌" #: en/glossary-content.txt:645 #, priority:310 msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"." -msgstr "" +msgstr "訝�訝�<<def_object,野배괌>>�끻맜訝�訝ゆ뙁�묈룱訝�訝ゅ�穩←쉪<<def_ref,凉뺟뵪>>竊뚦츆��빳��<<def_commit_object,�먧벡野배괌>>�f졆�끻맜訝�訝ゆ텋���귛츆阿잌룾餓ε똿�ヤ�訝わ펷PGP竊됬��랃펽瓦숂쭕�끻넻訝딶GP熬ョ㎞訝븝폏 \"�됬��띸쉪�뉒�野배괌\"(signed tag object)��" #. type: Labeled list #: en/glossary-content.txt:646 @@ -62567,19 +62558,19 @@ msgstr "[[def_topic_branch]]訝삯쥦�녷뵱" #: en/glossary-content.txt:652 #, priority:310 msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes." -msgstr "" +msgstr "訝�訝ゅ만鰲꾤쉪 Git <<def_branch,�녷뵱>>竊뚩˙凉��묋�끿뵪�η‘若싦�訝ゆ쫩恙득�㎫쉪凉��묋러瀛욍�귞뵳雅롦뼭兩뷰�訝ゅ늽���싧만��誤곩푽弱뤹쉪餓d뻔竊뚧�餓ι�싧만凉��묇릎鴉싧똿�ュ뇿訝ゅ컦�꾢늽��펽驪뤶릉�녷뵱�썸쐣���욃만�롧‘�꾣쫩恙득닑弱뤹쉪罌욇뇧鵝녺쎑�녕쉪�섇뙑��" #. type: Labeled list #: en/glossary-content.txt:653 #, no-wrap, priority:310 msgid "[[def_tree]]tree" -msgstr "" +msgstr "[[def_tree]]��/��퐬��(tree)" #. type: Plain text #: en/glossary-content.txt:657 #, priority:310 msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)." -msgstr "" +msgstr "誤곦퉰���訝�<<def_working_tree,藥δ퐳��>>竊뚩쫨阿덃삸訝�訝�<<def_tree_object,�묈�穩�>>瓦욃릪�꾢콪��<<def_blob_object,雅뚩퓵�뜻뻼餓�>>野밧�穩▼뭽野배괌�묕펷�념�訝ゅ램鵝쒎뙷�꾢춼�②〃鹽븝펹��" #. type: Labeled list #: en/glossary-content.txt:658 @@ -62591,19 +62582,19 @@ msgstr "[[def_tree_object]]�묈�穩�" #: en/glossary-content.txt:662 #, priority:310 msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>." -msgstr "" +msgstr "訝�訝�<<def_object,野배괌>>�끻맜訝�訝ゆ뻼餓뜹릫�뚧Æ凉뤹쉪�쀨〃竊뚥빳�딁쎑�녕쉪雅뚩퓵�뜻뻼餓뜹뭽/�뽩�穩→젒�꾢폊�ⓦ�귚�訝�<<def_tree,��>>嶺됧릪雅롣�訝�<<def_directory,��퐬>>��" #. type: Labeled list #: en/glossary-content.txt:663 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_tree-ish]]tree-ish (also treeish)" -msgstr "[[def_tree-ish]]tree-ish (also treeish)" +msgstr "[[def_tree-ish]]�묊듁野배괌[tree-ish (also treeish)]" #. type: Plain text #: en/glossary-content.txt:676 #, priority:310 msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc." -msgstr "" +msgstr "訝�訝�<<def_tree_object,�묈�穩�>>�뽬�끺�訝�<<def_object,野배괌>>��빳�믣퐩�ⓩ뼪�뷰�訝ゆ젒�뜹�穩▲�� �믣퐩訝�訝�<<def_commit_object,�먧벡野배괌>>��빳孃쀥댆野밧틪雅�<<def_revision,�덃쑍>>�꾦《掠�<<def_directory,��퐬>>�묆�� 餓δ툔�썸삸�묊듁野배괌竊�<<def_commit-ish,�먧벡��>>�곫젒野배괌�곫뙁�묉젒野배괌��<<def_tag_object,�뉒�野배괌>>�곫뙁�묉젒野배괌�뉒�野배괌�꾣젃嶺얍�穩∽펽嶺됬춬��" #. type: Labeled list #: en/glossary-content.txt:677 @@ -62615,19 +62606,19 @@ msgstr "[[def_unmerged_index]�ゅ릦亮뜻쉨耶섇뙷" #: en/glossary-content.txt:680 #, priority:310 msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>." -msgstr "" +msgstr "訝�訝�<<def_index,�귛춼��>>竊뚦똿�ユ쑋�덂뭉��<<def_index_entry,榮℡폊窈�>>��" #. type: Labeled list #: en/glossary-content.txt:681 #, no-wrap, priority:310 msgid "[[def_unreachable_object]]unreachable object" -msgstr "" +msgstr "[[def_unreachable_object]]訝띶룾渦얍�穩�(unreachable object)" #. type: Plain text #: en/glossary-content.txt:684 #, priority:310 msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference." -msgstr "" +msgstr "訝�訝や퍗<<def_branch,�녷뵱>>��<<def_tag,�뉒�>>�뽨뻣鵝뺝끀餓뽩폊�ⓧ릎�썰툖<<def_reachable,��씨��>><<def_object,野배괌>>��" #. type: Labeled list #: en/glossary-content.txt:685 @@ -62639,31 +62630,31 @@ msgstr "[[def_upstream_branch]]訝딀만�녷뵱" #: en/glossary-content.txt:690 #, priority:310 msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"." -msgstr "" +msgstr "容섋��� <<def_branch,�녷뵱>> 鴉싪˙�덂뭉�곁쎑�녕쉪�녷뵱訝�펷�뽫쎑�녕쉪�섇읃(rebase)�녷뵱竊됥�귛츆���싪퓝 `branch.<name>.remote` �� `branch.<name>.merge` �띸쉰�꾠�귛쫩��'A'�꾡툓歷멨늽��삸'origin/B'竊뚩퓳�됪뿶鴉싩㎞鵝쒋��'A'閭e쑉瓮잒릉'origin/B'�앫��" #. type: Labeled list #: en/glossary-content.txt:691 #, no-wrap, priority:310 msgid "[[def_working_tree]]working tree" -msgstr "" +msgstr "[[def_working_tree]]藥δ퐳��(working tree)" #. type: Plain text #: en/glossary-content.txt:695 #, priority:310 msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed." -msgstr "" +msgstr "若욇솀汝��ε눣�η쉪�뉏뻑�묆�� 藥δ퐳�븅�싧만�끻맜<<def_HEAD,HEAD>>�먧벡�묊쉪�끻�竊뚦뭽訝�雅쎽퐷藥꿰퍘�싦틙鵝녻퓲亦→쐣�먧벡�꾣쑍�겻엶�밤��" #. type: Labeled list #: en/glossary-content.txt:696 -#, fuzzy, no-wrap, priority:310 +#, no-wrap, priority:310 msgid "[[def_worktree]]worktree" -msgstr "[[def_per_worktree_ref]]per-worktree ref" +msgstr "[[def_worktree]]藥δ퐳��(worktree)" #. type: Plain text #: en/glossary-content.txt:703 #, priority:310 msgid "A repository can have zero (i.e. bare repository) or one or more worktrees attached to it. One \"worktree\" consists of a \"working tree\" and repository metadata, most of which are shared among other worktrees of a single repository, and some of which are maintained separately per worktree (e.g. the index, HEAD and pseudorefs like MERGE_HEAD, per-worktree refs and per-worktree configuration file)." -msgstr "" +msgstr "訝�訝や퍜佯볟룾餓ζ깹�됵펷�녘8餓볟틩竊됵펽阿잌룾餓ζ쐣訝�訝ゆ닑鸚싦릉藥δ퐳�묌셿掠욂틢若껁�귚�訝� �쒎램鵝쒏젒 �앯뵳 �쒎램鵝쒎뙷�앭뭽�덃쑍佯볟뀇�경뜮瀯꾣닇竊뚦끀訝�ㄷ�ⓨ늽�껅빊��쑉�뺜릉餓볟틩�꾢끀餓뽩램鵝쒏젒訝�뀻雅ワ펽�됦틳�껅빊��쑉驪뤶릉藥δ퐳�묇릎�뺟떖瀯닸뒪竊덁풃倻귨폏榮℡폊�갎EAD �뚦깗MERGE_HEAD瓦숁졆�꾡섈凉뺟뵪 �곫캀訝ゅ램鵝쒏젒榮℡폊餓뜹뭽驪뤶릉藥δ퐳�묕펹��" #. type: Plain text #: en/i18n.txt:2 @@ -63285,7 +63276,7 @@ msgstr "" #: en/merge-strategies.txt:125 #, ignore-same, no-wrap, priority:240 msgid "octopus" -msgstr "octopus" +msgstr "鸚싪러�덂뭉" #. type: Plain text #: en/merge-strategies.txt:131