diff --git a/po/documentation.ru.po b/po/documentation.ru.po index a31c4ee8e9625fba740e0dbeae887463efcef21d..b38a11216d6b03380b480d2735aca8e423c4ff39 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Git Documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-02-11 22:37+0100\n" -"PO-Revision-Date: 2020-02-25 02:33+0000\n" +"PO-Revision-Date: 2020-03-05 09:33+0000\n" "Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: ru\n" @@ -297,9 +297,9 @@ msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Annotate file lines with commit information." -msgstr "�戟戟棘�龜�棘勻逵戟龜筠 ���棘克 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 棘 克棘劇劇龜�逵�" +msgstr "�戟戟棘�龜�棘勻逵戟龜筠 ���棘克 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 棘 克棘劇劇龜�逵�." #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 @@ -945,9 +945,9 @@ msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 -#, fuzzy, priority:100 +#, priority:100 msgid "Create an empty Git repository or reinitialize an existing one." -msgstr "鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘" +msgstr "鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘." #. type: Labeled list #: en/cmds-mainporcelain.txt:61 @@ -1197,9 +1197,9 @@ msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:123 -#, fuzzy, priority:100 +#, priority:100 msgid "The Git repository browser." -msgstr "��逵�鈞筠� �筠極棘鈞龜�棘�龜� Git" +msgstr "��逵�鈞筠� �筠極棘鈞龜�棘�龜� Git." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 @@ -1821,9 +1821,10 @@ msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 -#, fuzzy, priority:100 +#, priority:100 msgid "The standard helper program to use with git-merge-index." -msgstr "鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index" +msgstr "" +"鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index." #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 @@ -1881,9 +1882,9 @@ msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Download from a remote Git repository via HTTP." -msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP" +msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP." #. type: Labeled list #: en/cmds-synchelpers.txt:4 @@ -5523,7 +5524,7 @@ msgstr "" #: en/fetch-options.txt:211 en/git-clone.txt:188 #, no-wrap, priority:300 msgid "--upload-pack <upload-pack>" -msgstr "--upload-pack <upload-pack>" +msgstr "--upload-pack <極���>" #. type: Plain text #: en/fetch-options.txt:216 @@ -6186,9 +6187,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:316 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "add untracked" -msgstr "�棘閨逵勻龜�� 戟筠棘��剋筠菌龜勻逵筠劇�橘" +msgstr "畇棘閨逵勻龜�� 戟筠棘��剋筠菌龜勻逵筠劇�橘" #. type: Plain text #: en/git-add.txt:320 @@ -6394,7 +6395,7 @@ msgstr "GIT" #: en/git-add.txt:438 en/git-am.txt:245 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:120 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:243 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:343 en/git-column.txt:79 en/git-commit-tree.txt:123 en/git-commit.txt:513 en/git-config.txt:495 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:106 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1546 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:711 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:352 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:239 en/git-ls-files.txt:250 en/git-ls-remote.txt:119 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:372 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:263 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1076 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:497 en/git-restore.txt:207 en/git-revert.txt:142 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:189 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:302 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:452 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:951 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:560 en/git-update-ref.txt:152 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27 #, priority:300 msgid "Part of the linkgit:git[1] suite" -msgstr "" +msgstr "赳勻剋�筠��� �逵���� 極逵克筠�逵 linkgit:git[1]" #. type: Title = #: en/git-am.txt:2 @@ -6940,25 +6941,33 @@ msgstr "git-annotate(1)" #: en/git-annotate.txt:7 #, priority:100 msgid "git-annotate - Annotate file lines with commit information" -msgstr "" +msgstr "git-annotate - �戟戟棘�龜�棘勻逵戟龜筠 ���棘克 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 棘 克棘劇劇龜�逵�" #. type: Plain text #: en/git-annotate.txt:12 #, no-wrap, priority:100 msgid "'git annotate' [<options>] <file> [<revision>]\n" -msgstr "" +msgstr "'git annotate' [<棘極�龜龜>] <�逵橘剋> [<�筠勻龜鈞龜�>]\n" #. type: Plain text #: en/git-annotate.txt:17 #, priority:100 msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision." msgstr "" +"�戟戟棘�龜��筠� 克逵菌畇�� ���棘克� 鈞逵畇逵戟戟棘均棘 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 龜鈞 克棘劇劇龜�逵, 克棘�棘��橘 " +"畇棘閨逵勻龜剋 畇逵戟戟�� ���棘克�. �棘 菌筠剋逵戟龜�, 劇棘菌戟棘 逵戟戟棘�龜�棘勻逵�� 戟逵 棘�戟棘勻筠 鈞逵畇逵戟戟棘橘 " +"�筠勻龜鈞龜龜." #. type: Plain text #: en/git-annotate.txt:22 #, priority:100 msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems." msgstr "" +"�畇龜戟��勻筠戟戟逵� �逵鈞戟龜�逵 劇筠菌畇� 畇逵戟戟棘橘 克棘劇逵戟畇棘橘 龜 linkgit:git-blame[1] 勻 �棘劇, ��棘 " +"龜� �棘�劇逵� 勻�勻棘畇逵 戟筠�克棘剋�克棘 棘�剋龜�逵筠���. �逵戟戟逵� 克棘劇逵戟畇逵 ���筠��勻�筠� �棘剋�克棘 �逵畇龜 " +"棘閨�逵�戟棘橘 �棘勻劇筠��龜劇棘��龜 龜 畇剋� 極棘畇畇筠�菌克龜 �菌筠 ���筠��勻���龜� ��筠戟逵�龜筠勻, 逵 �逵克菌筠 " +"畇逵閨� 極�筠畇棘��逵勻龜�� 克棘劇逵戟畇� �棘 鈞戟逵克棘劇�劇 龜劇筠戟筠劇 剋�畇�劇 鈞戟逵克棘劇�劇 � 畇��均龜劇龜 " +"�龜��筠劇逵 �極�逵勻剋筠戟龜� 勻筠��龜橘." #. type: Title = #: en/git-apply.txt:2 @@ -9745,6 +9754,10 @@ msgstr "" #, priority:240 msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual." msgstr "" +"linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1]" +", 均剋逵勻逵 link:user-manual.html#what-is-a-branch[Understanding history: What " +"is a branch?쨩] (짬�棘戟龜劇逵戟龜筠 龜��棘�龜龜: 槻�棘 �逵克棘筠 勻筠�克逵?쨩) 勻 極棘剋�鈞棘勻逵�筠剋��克棘劇 " +"��克棘勻棘畇��勻筠 Git." #. type: Title = #: en/git-bundle.txt:2 @@ -13319,6 +13332,15 @@ msgid "" "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n" "\t [<directory>]\n" msgstr "" +"'git clone' [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>]\n" +"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" +"\t [-o <龜劇�>] [-b <勻筠�克逵>] [-u <極���>] [--reference <�筠極棘鈞龜�棘�龜橘>]\n" +"\t [--dissociate] [--separate-git-dir <克逵�逵剋棘均_git>]\n" +"\t [--depth <均剋�閨龜戟逵>] [--[no-]single-branch] [--no-tags]\n" +"\t [--recurse-submodules[=<�極筠�龜�龜克逵�棘�_極��龜>]]\n" +"\t [--[no-]shallow-submodules] [--[no-]remote-submodules]\n" +"\t [--jobs <xb>] [--sparse] [--] <�筠極棘鈞龜�棘�龜橘>\n" +"\t [<克逵�逵剋棘均>]\n" #. type: Plain text #: en/git-clone.txt:29 @@ -13551,7 +13573,7 @@ msgstr "" #: en/git-clone.txt:193 en/git-init.txt:51 en/git-svn.txt:578 #, no-wrap, priority:300 msgid "--template=<template_directory>" -msgstr "" +msgstr "--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>" #. type: Plain text #: en/git-clone.txt:196 @@ -14490,9 +14512,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:201 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "whitespace" -msgstr "--whitespace" +msgstr "whitespace" #. type: Plain text #: en/git-commit.txt:203 @@ -14607,9 +14629,9 @@ msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:260 -#, fuzzy, priority:280 +#, priority:280 msgid "Bypass the post-rewrite hook." -msgstr "極�棘極���龜�� 極筠�筠�勻逵��龜克 post-rewrite" +msgstr "��棘極���龜�� 極筠�筠�勻逵��龜克 post-rewrite." #. type: Labeled list #: en/git-commit.txt:262 @@ -25750,21 +25772,24 @@ msgstr "git-fsck-objects(1)" #. type: Plain text #: en/git-fsck-objects.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database" -msgstr "��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��" +msgstr "" +"git-fsck-objects - ��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��" #. type: Plain text #: en/git-fsck-objects.txt:13 #, ignore-ellipsis, no-wrap, priority:100 msgid "'git fsck-objects' ...\n" -msgstr "" +msgstr "'git fsck-objects' ...\n" #. type: Plain text #: en/git-fsck-objects.txt:19 #, priority:100 msgid "This is a synonym for linkgit:git-fsck[1]. Please refer to the documentation of that command." msgstr "" +"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-fsck[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� " +"棘戟棘橘." #. type: Title = #: en/git-fsck.txt:2 @@ -28171,9 +28196,9 @@ msgstr "" #. type: Plain text #: en/git-http-fetch.txt:17 -#, fuzzy, priority:100 +#, priority:100 msgid "Downloads a remote Git repository via HTTP." -msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP" +msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP." #. type: Plain text #: en/git-http-fetch.txt:21 @@ -28761,19 +28786,23 @@ msgstr "git-init-db(1)" #: en/git-init-db.txt:7 #, priority:100 msgid "git-init-db - Creates an empty Git repository" -msgstr "" +msgstr "git-init-db - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git" #. type: Plain text #: en/git-init-db.txt:13 #, no-wrap, priority:100 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n" msgstr "" +"'git init-db' [-q | --quiet] [--bare] [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>] " +"[--separate-git-dir <克逵�逵剋棘均_git>] [--shared[=<極�逵勻逵_畇棘���極逵>]]\n" #. type: Plain text #: en/git-init-db.txt:20 #, priority:100 msgid "This is a synonym for linkgit:git-init[1]. Please refer to the documentation of that command." msgstr "" +"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-init[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� " +"棘戟棘橘." #. type: Title = #: en/git-init.txt:2 @@ -28783,9 +28812,11 @@ msgstr "git-init(1)" #. type: Plain text #: en/git-init.txt:7 -#, fuzzy, priority:300 +#, priority:300 msgid "git-init - Create an empty Git repository or reinitialize an existing one" -msgstr "鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘" +msgstr "" +"git-init - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� " +"���筠��勻���筠均棘" #. type: Plain text #: en/git-init.txt:15 @@ -28795,6 +28826,9 @@ msgid "" "\t [--separate-git-dir <git dir>]\n" "\t [--shared[=<permissions>]] [directory]\n" msgstr "" +"'git init' [-q | --quiet] [--bare] [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>]\n" +"\t [--separate-git-dir <克逵�逵剋棘均_git>]\n" +"\t [--shared[=<極�逵勻逵_畇棘���極逵>]] [克逵�逵剋棘均]\n" #. type: Plain text #: en/git-init.txt:24 @@ -31922,24 +31956,29 @@ msgstr "git-merge-one-file(1)" #, priority:100 msgid "git-merge-one-file - The standard helper program to use with git-merge-index" msgstr "" +"git-merge-one-file - 鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� " +"�棘勻劇筠��戟棘 � git-merge-index" #. type: Plain text #: en/git-merge-one-file.txt:13 -#, fuzzy, no-wrap, priority:100 +#, no-wrap, priority:100 msgid "'git merge-one-file'\n" -msgstr "git-merge-one-file(1)" +msgstr "'git merge-one-file'\n" #. type: Plain text #: en/git-merge-one-file.txt:18 #, priority:100 msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'." msgstr "" +"葵�棘 ��逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克, 龜�極棘剋�鈞�筠劇逵� �棘勻劇筠��戟棘 � 'git-merge-" +"index', ��棘閨� 鈞逵勻筠��龜�� �剋龜�戟龜筠 極棘�剋筠 �棘均棘 克逵克 ��龜勻龜逵剋�戟逵� �逵��� �剋龜�戟龜� �菌筠 " +"勻�極棘剋戟筠戟逵 'git read-tree -m'." #. type: Title = #: en/git-mergetool--lib.txt:2 #, no-wrap, priority:100 msgid "git-mergetool{litdd}lib(1)" -msgstr "" +msgstr "git-mergetool{litdd}lib(1)" #. type: Plain text #: en/git-mergetool--lib.txt:7 @@ -32033,9 +32072,9 @@ msgstr "git-mergetool(1)" #. type: Plain text #: en/git-mergetool.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts" -msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" +msgstr "git-mergetool - �逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" #. type: Plain text #: en/git-mergetool.txt:12 @@ -32093,9 +32132,10 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:69 -#, fuzzy, priority:240 +#, priority:240 msgid "Print a list of merge tools that may be used with `--tool`." -msgstr "勻�勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 짬--tool쨩" +msgstr "" +"��勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 `--tool`." #. type: Plain text #: en/git-mergetool.txt:77 @@ -32195,9 +32235,9 @@ msgstr "git-merge(1)" #. type: Plain text #: en/git-merge.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-merge - Join two or more development histories together" -msgstr "�閨�筠畇龜戟筠戟龜筠 棘畇戟棘橘 龜剋龜 戟筠�克棘剋�克龜� 龜��棘�龜橘 �逵鈞�逵閨棘�克龜 勻劇筠��筠" +msgstr "git-merge - �閨�筠畇龜戟筠戟龜筠 棘畇戟棘橘 龜剋龜 戟筠�克棘剋�克龜� 龜��棘�龜橘 �逵鈞�逵閨棘�克龜 勻劇筠��筠" #. type: Plain text #: en/git-merge.txt:17 @@ -32740,9 +32780,9 @@ msgstr "git-mktree(1)" #. type: Plain text #: en/git-mktree.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-mktree - Build a tree-object from ls-tree formatted text" -msgstr "�棘���棘筠戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��逵 �棘�劇逵�逵 ls-tree" +msgstr "git-mktree - �棘���棘筠戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��逵 勻 �棘�劇逵�筠 ls-tree" #. type: Plain text #: en/git-mktree.txt:13 @@ -32761,6 +32801,8 @@ msgstr "" #, priority:100 msgid "Read the NUL-terminated `ls-tree -z` output instead." msgstr "" +"槻龜�逵�� 鈞逵極龜�龜 �逵鈞畇筠剋�戟戟�筠 �叫���竅�� �龜劇勻棘剋逵劇龜 (克逵克 勻 勻�勻棘畇筠 `ls-tree -z`), " +"勻劇筠��棘 克棘戟�棘勻 ���棘克." #. type: Labeled list #: en/git-mktree.txt:26 @@ -35703,21 +35745,27 @@ msgstr "git-parse-remote(1)" #. type: Plain text #: en/git-parse-remote.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-parse-remote - Routines to help parsing remote repository access parameters" -msgstr "�棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�" +msgstr "" +"git-parse-remote - �棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 " +"勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-parse-remote.txt:13 #, no-wrap, priority:100 msgid "'. \"$(git --exec-path)/git-parse-remote\"'\n" -msgstr "" +msgstr "'. \"$(git --exec-path)/git-parse-remote\"'\n" #. type: Plain text #: en/git-parse-remote.txt:20 #, priority:100 msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing." msgstr "" +"葵�棘� ��筠戟逵�龜橘 畇棘閨逵勻剋筠戟 勻 克棘剋剋筠克�龜� ��筠戟逵�龜筠勻, 畇逵閨� 極�筠畇棘��逵勻龜�� 極棘畇極�棘均�逵劇劇� " +"畇剋� �逵鈞閨棘�逵 �逵橘剋棘勻, ��逵戟��龜��� 勻 克逵�逵剋棘均逵� $GIT_DIR/remotes/ 龜 $GIT_DIR/" +"branches/, 逵 �逵克菌筠 戟筠克棘�棘��� 戟逵���棘筠�戟�� 極筠�筠劇筠戟戟�� �勻�鈞逵戟戟�� � 龜鈞勻剋筠�筠戟龜筠劇 " +"(fetch), 極棘剋��筠戟龜筠劇 (pull) 龜 棘�極�逵勻克棘橘 (push) 龜鈞劇筠戟筠戟龜橘." #. type: Title = #: en/git-patch-id.txt:2 @@ -46651,21 +46699,23 @@ msgstr "git-stage(1)" #. type: Plain text #: en/git-stage.txt:7 -#, fuzzy, priority:100 +#, priority:100 msgid "git-stage - Add file contents to the staging area" -msgstr "�棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋棘勻 勻 龜戟畇筠克�" +msgstr "git-stage - �棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋棘勻 勻 龜戟畇筠克�" #. type: Plain text #: en/git-stage.txt:13 #, ignore-ellipsis, no-wrap, priority:100 msgid "'git stage' args...\n" -msgstr "" +msgstr "'git stage' 逵�均�劇筠戟��...\n" #. type: Plain text #: en/git-stage.txt:20 #, priority:100 msgid "This is a synonym for linkgit:git-add[1]. Please refer to the documentation of that command." msgstr "" +"葵�逵 克棘劇逵戟畇逵 �勻剋�筠��� �龜戟棘戟龜劇棘劇 linkgit:git-add[1]. 鬼劇棘��龜�筠 畇棘克�劇筠戟�逵�龜� " +"棘戟棘橘." #. type: Title = #: en/git-stash.txt:2 @@ -53039,6 +53089,10 @@ msgstr "" #, priority:100 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]" msgstr "" +"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], " +"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-" +"tutorial[7], linkgit:gitcli[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 " +"��克棘勻棘畇��勻棘 Git], linkgit:gitworkflows[7]" #. type: Title = #: en/git-unpack-file.txt:2 @@ -55653,20 +55707,22 @@ msgstr "gitglossary(7)" #: en/gitglossary.txt:7 #, priority:100 msgid "gitglossary - A Git Glossary" -msgstr "" +msgstr "gitglossary - �剋棘��逵�龜橘 Git" #. type: Plain text #: en/gitglossary.txt:11 #, no-wrap, priority:100 msgid "*\n" -msgstr "" +msgstr "*\n" #. type: Plain text #: en/gitglossary.txt:24 -#, fuzzy, priority:100 -#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +#, priority:100 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]" -msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]" +msgstr "" +"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]" +", linkgit:giteveryday[7], link:user-manual.html[�棘剋�鈞棘勻逵�筠剋��克棘筠 ��克棘勻棘畇��勻棘 " +"Git]" #. type: Labeled list #: en/glossary-content.txt:1