From c07bf4f043a6ed3391a3317b0f85e515ea152155 Mon Sep 17 00:00:00 2001 From: Dexter Morganov <dexter.morganov@gmail.com> Date: Thu, 12 Mar 2020 19:04:21 +0000 Subject: [PATCH] Translated using Weblate (Russian) Currently translated at 16.7% (1655 of 9866 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/ru/ Signed-off-by: Dexter Morganov <dexter.morganov@gmail.com> --- po/documentation.ru.po | 585 ++++++++++++++++++++++------------------- 1 file changed, 320 insertions(+), 265 deletions(-) diff --git a/po/documentation.ru.po b/po/documentation.ru.po index fa6d547..9c7b8e0 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -7,7 +7,7 @@ msgstr "" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-02-11 22:37+0100\n" "PO-Revision-Date: 2020-03-13 09:19+0000\n" -"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n" +"Last-Translator: Dexter Morganov <dexter.morganov@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -97,9 +97,9 @@ msgstr "-t" #. type: Plain text #: en/blame-options.txt:27 -#, fuzzy, priority:100 +#, priority:100 msgid "Show raw timestamp (Default: off)." -msgstr "�棘克逵鈞逵�� 戟筠棘閨�逵閨棘�逵戟戟�筠 勻�筠劇筠戟戟�筠 劇筠�克龜 (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)" +msgstr "�棘克逵鈞�勻逵�� 戟筠棘閨�逵閨棘�逵戟戟�筠 勻�筠劇筠戟戟�筠 劇筠�克龜 (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)." #. type: Labeled list #: en/blame-options.txt:28 @@ -141,7 +141,7 @@ msgstr "--porcelain" #: en/blame-options.txt:42 #, fuzzy, priority:100 msgid "Show in a format designed for machine consumption." -msgstr "�棘克逵鈞逵�� 勻 �棘�劇逵�筠 畇剋� 極�棘均�逵劇劇戟棘均棘 �逵鈞閨棘�逵" +msgstr "�棘克逵鈞逵�� 勻 �棘�劇逵�筠 畇剋� 極�棘均�逵劇劇戟棘均棘 �逵鈞閨棘�逵." #. type: Labeled list #: en/blame-options.txt:43 @@ -253,10 +253,9 @@ msgstr "" #. type: Labeled list #: en/blame-options.txt:113 -#, fuzzy, no-wrap, priority:100 -#| msgid "--ignore-removal" +#, no-wrap, priority:100 msgid "--ignore-rev <rev>" -msgstr "--ignore-removal" +msgstr "--ignore-rev <�筠勻龜鈞龜�>" #. type: Plain text #: en/blame-options.txt:124 @@ -321,9 +320,11 @@ msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 -#, fuzzy, priority:100 +#, priority:100 msgid "Count unpacked number of objects and their disk consumption." -msgstr "�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 龜� 極棘��筠閨剋筠戟龜� 畇龜�克逵" +msgstr "" +"�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 極棘��筠閨剋筠戟龜� 龜劇龜 畇龜�克棘勻棘均棘 " +"極�棘���逵戟��勻逵." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 @@ -357,9 +358,9 @@ msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 -#, fuzzy, priority:100 +#, priority:100 msgid "Display help information about Git." -msgstr "��棘閨�逵菌筠戟龜筠 �極�逵勻棘�戟棘橘 龜戟�棘�劇逵�龜龜 棘 Git" +msgstr "��棘閨�逵菌筠戟龜筠 �極�逵勻棘�戟棘橘 龜戟�棘�劇逵�龜龜 棘 Git." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 @@ -381,9 +382,9 @@ msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 -#, fuzzy, priority:100 +#, priority:100 msgid "Show three-way merge without touching index." -msgstr "��勻棘畇 �����棘畇棘勻棘均棘 �剋龜�戟龜筠 閨筠鈞 鈞逵��逵均龜勻逵戟龜� 龜戟畇筠克�逵" +msgstr "��棘閨�逵菌筠戟龜筠 ������棘�棘戟戟筠均棘 �剋龜�戟龜� 閨筠鈞 龜鈞劇筠戟筠戟龜� 龜戟畇筠克�逵." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 @@ -393,9 +394,9 @@ msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 -#, fuzzy, priority:100 +#, priority:100 msgid "Reuse recorded resolution of conflicted merges." -msgstr "�棘勻�棘�戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 鈞逵極龜�逵戟戟�� �逵鈞�筠�筠戟龜橘 克棘戟�剋龜克�棘勻 極�龜 �剋龜�戟龜��" +msgstr "�棘勻�棘�戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 鈞逵極龜�逵戟戟�� �逵鈞�筠�筠戟龜橘 克棘戟�剋龜克�棘勻 �剋龜�戟龜�." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 @@ -405,9 +406,9 @@ msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 -#, fuzzy, priority:100 +#, priority:100 msgid "Show branches and their commits." -msgstr "��勻棘畇 勻筠�棘克 龜 龜� 克棘劇劇龜�棘勻" +msgstr "��棘閨�逵菌筠戟龜筠 勻筠�棘克 龜 龜� 克棘劇劇龜�棘勻." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 @@ -417,9 +418,9 @@ msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 -#, fuzzy, priority:100 +#, priority:100 msgid "Check the GPG signature of commits." -msgstr "��棘勻筠�克逵 極棘畇極龜�龜 GPG 克棘劇劇龜�棘勻" +msgstr "��棘勻筠�克逵 GPG 極棘畇極龜�龜 克棘劇劇龜�棘勻." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 @@ -429,9 +430,9 @@ msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 -#, fuzzy, priority:100 +#, priority:100 msgid "Check the GPG signature of tags." -msgstr "��棘勻筠�克逵 極棘畇極龜�龜 GPG 劇筠�棘克" +msgstr "��棘勻筠�克逵 GPG 極棘畇極龜�龜 �筠均棘勻." #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 @@ -441,9 +442,9 @@ msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 -#, fuzzy, priority:100 +#, priority:100 msgid "Show logs with difference each commit introduces." -msgstr "��勻棘畇 菌��戟逵剋逵 � 龜鈞劇筠戟筠戟龜�劇龜, 克棘�棘��筠 勻勻棘畇龜剋 克逵菌畇�橘 龜鈞 克棘劇劇龜�棘勻" +msgstr "��勻棘畇 菌��戟逵剋逵 龜鈞劇筠戟筠戟龜橘, 勻戟筠��戟戟�� 克逵菌畇�劇 龜鈞 克棘劇劇龜�棘勻." #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91 @@ -453,9 +454,9 @@ msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 -#, fuzzy, priority:100 +#, priority:100 msgid "Git web interface (web frontend to Git repositories)." -msgstr "�筠閨 龜戟�筠��筠橘� Git (勻筠閨-龜戟�筠��筠橘� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻)" +msgstr "�筠閨 龜戟�筠��筠橘� Git (勻筠閨-龜戟�筠��筠橘� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻)." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:144 @@ -465,9 +466,9 @@ msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Get and set repository or global options." -msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘 龜剋龜 棘極�龜橘 �筠極棘鈞龜�棘�龜�" +msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 戟逵���棘筠克 龜剋龜 戟逵���棘筠克 �筠極棘鈞龜�棘�龜�." #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1543 @@ -477,9 +478,9 @@ msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 -#, fuzzy, priority:100 +#, priority:100 msgid "Git data exporter." -msgstr "葵克�極棘�� 畇逵戟戟�� Git" +msgstr "葵克�極棘�� 畇逵戟戟�� Git." #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252 @@ -501,9 +502,9 @@ msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "Rewrite branches." -msgstr "�筠�筠鈞逵極龜�� 勻筠�棘克" +msgstr "�筠�筠鈞逵極龜�� 勻筠�棘克." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:141 @@ -513,9 +514,9 @@ msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 -#, fuzzy, priority:100 +#, priority:100 msgid "Run merge conflict resolution tools to resolve merge conflicts." -msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" +msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 @@ -551,7 +552,7 @@ msgstr "linkgit:git-reflog[1]" #: en/cmds-ancillarymanipulators.txt:24 #, fuzzy, priority:100 msgid "Manage reflog information." -msgstr "叫極�逵勻剋筠戟龜筠 龜戟�棘�劇逵�龜筠橘 菌��戟逵剋逵 ���剋棘克" +msgstr "叫極�逵勻剋筠戟龜筠 龜戟�棘�劇逵�龜筠橘 菌��戟逵剋逵 ���剋棘克." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 @@ -561,9 +562,9 @@ msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 -#, fuzzy, priority:100 +#, priority:100 msgid "Manage set of tracked repositories." -msgstr "叫極�逵勻剋筠戟龜筠 戟逵閨棘�棘劇 棘��剋筠菌龜勻逵筠劇�� �筠極棘鈞龜�棘�龜筠勻" +msgstr "叫極�逵勻剋筠戟龜筠 棘��剋筠菌龜勻逵筠劇�劇龜 �筠極棘鈞龜�棘�龜�劇龜." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 @@ -573,9 +574,9 @@ msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 -#, fuzzy, priority:100 +#, priority:100 msgid "Pack unpacked objects in a repository." -msgstr "叫極逵克棘勻克逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 勻 �筠極棘鈞龜�棘�龜龜" +msgstr "叫極逵克棘勻克逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 勻 �筠極棘鈞龜�棘�龜龜." #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 @@ -597,9 +598,9 @@ msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Import a GNU Arch repository into Git." -msgstr "�劇極棘��龜�棘勻逵戟龜筠 GNU Arch �筠極棘鈞龜�棘�龜� 勻 Git" +msgstr "�劇極棘��龜�棘勻逵戟龜筠 GNU Arch �筠極棘鈞龜�棘�龜� 勻 Git." #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 @@ -633,9 +634,9 @@ msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "A CVS server emulator for Git." -msgstr "葵劇�剋��棘� �筠�勻筠�逵 CVS 畇剋� Git" +msgstr "葵劇�剋��棘� �筠�勻筠�逵 CVS 畇剋� Git." #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 @@ -645,9 +646,9 @@ msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 -#, fuzzy, priority:100 +#, priority:100 msgid "Send a collection of patches from stdin to an IMAP folder." -msgstr "��極�逵勻克逵 克棘剋剋筠克�龜龜 極逵��筠橘 龜鈞 ��逵戟畇逵��戟棘均棘 勻勻棘畇逵 勻 極逵極克� IMAP" +msgstr "��極�逵勻克逵 戟逵閨棘�逵 極逵��筠橘 龜鈞 ��逵戟畇逵��戟棘均棘 極棘�棘克逵 勻勻棘畇逵 勻 極逵極克� IMAP." #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 @@ -657,9 +658,9 @@ msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 -#, fuzzy, priority:100 +#, priority:100 msgid "Import from and submit to Perforce repositories." -msgstr "�劇極棘�� 龜 棘�極�逵勻克逵 勻 �筠極棘鈞龜�棘�龜龜 Perforce" +msgstr "�劇極棘�� 龜鈞 龜 棘�極�逵勻克逵 勻 �筠極棘鈞龜�棘�龜龜 Perforce." #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 @@ -693,9 +694,9 @@ msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 -#, fuzzy, priority:100 +#, priority:100 msgid "Send a collection of patches as emails." -msgstr "��極�逵勻克逵 克棘剋剋筠克�龜龜 極逵��筠橘 戟逵 �剋筠克��棘戟戟�� 極棘���" +msgstr "��極�逵勻克逵 戟逵閨棘�逵 極逵��筠橘 克逵克 極龜�筠劇." #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 @@ -705,9 +706,9 @@ msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 -#, fuzzy, priority:100 +#, priority:100 msgid "Bidirectional operation between a Subversion repository and Git." -msgstr "�勻����棘�棘戟戟龜筠 棘極筠�逵�龜龜 劇筠菌畇� �筠極棘鈞龜�棘�龜�劇龜 Subversion 龜 Git" +msgstr "�勻����棘�棘戟戟龜筠 棘極筠�逵�龜龜 劇筠菌畇� �筠極棘鈞龜�棘�龜�劇龜 Subversion 龜 Git." #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186 @@ -717,9 +718,9 @@ msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 -#, fuzzy, priority:100 +#, priority:100 msgid "Add file contents to the index." -msgstr "�棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋逵 勻 龜戟畇筠克�" +msgstr "�棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋逵 勻 龜戟畇筠克�." #. type: Labeled list #: en/cmds-mainporcelain.txt:4 @@ -729,9 +730,9 @@ msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 -#, fuzzy, priority:100 +#, priority:100 msgid "Apply a series of patches from a mailbox." -msgstr "��龜劇筠戟筠戟龜筠 �筠�龜龜 極逵��筠橘 龜鈞 極棘��棘勻棘均棘 �棘棘閨�筠戟龜�" +msgstr "��龜劇筠戟筠戟龜筠 戟逵閨棘�逵 極逵��筠橘 龜鈞 極棘��棘勻棘均棘 ��龜克逵." #. type: Labeled list #: en/cmds-mainporcelain.txt:7 @@ -753,9 +754,10 @@ msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 -#, fuzzy, priority:100 +#, priority:100 msgid "Use binary search to find the commit that introduced a bug." -msgstr "��極棘剋戟筠戟龜筠 畇勻棘龜�戟棘均棘 極棘龜�克逵 克棘劇劇龜�逵, 克棘�棘��橘 勻戟棘�龜� 棘�龜閨克�" +msgstr "" +"��極棘剋�鈞棘勻逵戟龜筠 閨龜戟逵�戟棘均棘 極棘龜�克逵 畇剋� 戟逵�棘菌畇筠戟龜� 克棘劇劇龜�逵, 克棘�棘��橘 勻戟�� 棘�龜閨克�." #. type: Labeled list #: en/cmds-mainporcelain.txt:13 @@ -765,9 +767,9 @@ msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 -#, fuzzy, priority:100 +#, priority:100 msgid "List, create, or delete branches." -msgstr "��勻棘畇 �極龜�克逵, �棘鈞畇逵戟龜筠 龜剋龜 �畇逵剋筠戟龜筠 勻筠�棘克" +msgstr "�筠�筠�龜�剋筠戟龜筠, �棘鈞畇逵戟龜筠 龜剋龜 �畇逵剋筠戟龜筠 勻筠�棘克." #. type: Labeled list #: en/cmds-mainporcelain.txt:16 @@ -789,9 +791,9 @@ msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 -#, fuzzy, priority:100 +#, priority:100 msgid "Switch branches or restore working tree files." -msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" +msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠橘 畇龜�筠克�棘�龜龜." #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:139 @@ -4587,7 +4589,7 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:492 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "-C[<n>]" msgstr "-C[<�龜�剋棘>]" @@ -5300,9 +5302,9 @@ msgstr "--keep" #. type: Plain text #: en/fetch-options.txt:85 -#, fuzzy, priority:220 +#, priority:220 msgid "Keep downloaded pack." -msgstr "棘��逵勻龜�� 鈞逵均��菌筠戟戟�橘 極逵克筠� 畇逵戟戟��" +msgstr "���逵勻龜�� 鈞逵均��菌筠戟戟�橘 極逵克筠� 畇逵戟戟��." #. type: Labeled list #: en/fetch-options.txt:87 @@ -5558,9 +5560,9 @@ msgstr "--verbose" #. type: Plain text #: en/fetch-options.txt:227 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150 -#, fuzzy, priority:300 +#, priority:300 msgid "Be verbose." -msgstr "閨��� 劇戟棘均棘�剋棘勻戟筠筠" +msgstr "���� 劇戟棘均棘�剋棘勻戟筠筠." #. type: Labeled list #: en/fetch-options.txt:229 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151 @@ -5678,7 +5680,7 @@ msgstr "�����" #. type: Plain text #: en/git-add.txt:16 -#, ignore-ellipsis, no-wrap, priority:300 +#, fuzzy, ignore-ellipsis, no-wrap, priority:300 msgid "" "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n" "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" @@ -5686,6 +5688,13 @@ msgid "" "\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [--] [<pathspec>...]\n" msgstr "" +"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | " +"-i] [--patch | -p]\n" +"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n" +"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] " +"[--renormalize]\n" +"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" +"\t [--] [<pathspec>...]\n" #. type: Title - #: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:14 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13 @@ -5849,7 +5858,7 @@ msgstr "" #: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418 #, no-wrap, priority:300 msgid "-A" -msgstr "" +msgstr "-A" #. type: Labeled list #: en/git-add.txt:125 @@ -5897,7 +5906,7 @@ msgstr "" #: en/git-add.txt:147 en/git-format-patch.txt:103 en/git-submodule.txt:351 #, no-wrap, priority:300 msgid "-N" -msgstr "" +msgstr "-N" #. type: Labeled list #: en/git-add.txt:148 en/git-apply.txt:77 @@ -6081,13 +6090,17 @@ msgstr "" #. type: delimited block - #: en/git-add.txt:250 -#, no-wrap, priority:300 +#, fuzzy, no-wrap, priority:300 msgid "" " *** Commands ***\n" " 1: status 2: update 3: revert 4: add untracked\n" " 5: patch 6: diff 7: quit 8: help\n" " What now> 1\n" msgstr "" +" *** Commands ***\n" +" 1: status 2: update 3: revert 4: add untracked\n" +" 5: patch 6: diff 7: quit 8: help\n" +" What now> 1\n" #. type: Plain text #: en/git-add.txt:254 @@ -6103,9 +6116,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:257 -#, fuzzy, no-wrap, priority:300 +#, no-wrap, priority:300 msgid "status" -msgstr "--status" +msgstr "status" #. type: Plain text #: en/git-add.txt:264 @@ -6115,12 +6128,15 @@ msgstr "" #. type: delimited block - #: en/git-add.txt:269 -#, no-wrap, priority:300 +#, fuzzy, no-wrap, priority:300 msgid "" " staged unstaged path\n" " 1: binary nothing foo.png\n" " 2: +403/-35 +1/-1 git-add--interactive.perl\n" msgstr "" +" staged unstaged path\n" +" 1: binary nothing foo.png\n" +" 2: +403/-35 +1/-1 git-add--interactive.perl\n" #. type: Plain text #: en/git-add.txt:280 @@ -6148,12 +6164,15 @@ msgstr "" #. type: delimited block - #: en/git-add.txt:298 -#, no-wrap, priority:300 +#, fuzzy, no-wrap, priority:300 msgid "" " staged unstaged path\n" " 1: binary nothing foo.png\n" "* 2: +403/-35 +1/-1 git-add--interactive.perl\n" msgstr "" +" staged unstaged path\n" +" 1: binary nothing foo.png\n" +"* 2: +403/-35 +1/-1 git-add--interactive.perl\n" #. type: Plain text #: en/git-add.txt:302 @@ -6252,6 +6271,8 @@ msgstr "diff" #, priority:300 msgid "This lets you review what will be committed (i.e. between HEAD and index)." msgstr "" +"葵�棘 極棘鈞勻棘剋�筠� 勻逵劇 �勻龜畇筠��, ��棘 閨�畇筠� 勻克剋��筠戟棘 勻 克棘劇劇龜� (�棘 筠��� �逵鈞戟龜�� " +"劇筠菌畇� HEAD 龜 龜戟畇筠克�棘劇)." #. type: Title - #: en/git-add.txt:357 @@ -9303,9 +9324,9 @@ msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:152 -#, fuzzy, priority:240 +#, priority:240 msgid "Sorting and filtering branches are case insensitive." -msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵" +msgstr "鬼棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 勻筠�棘克 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵." #. type: Labeled list #: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134 @@ -9345,9 +9366,11 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:170 -#, fuzzy, priority:240 +#, priority:240 msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)." -msgstr "極棘克逵鈞逵�� �極龜�棘克 龜 棘��剋筠菌龜勻逵筠劇�� 龜 剋棘克逵剋�戟�� 勻筠�棘克" +msgstr "" +"�棘克逵鈞逵�� �極龜�棘克 克逵克 棘��剋筠菌龜勻逵筠劇��, �逵克 龜 剋棘克逵剋�戟�� 勻筠�棘克. ��極棘剋�鈞棘勻逵戟龜筠 " +"`--list` 極棘鈞勻棘剋龜� �龜剋���棘勻逵�� �棘棘�勻筠���勻筠戟戟棘 �逵閨剋棘戟�(逵劇)." #. type: Plain text #: en/git-branch.txt:176 @@ -9573,9 +9596,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:277 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "<newbranch>" -msgstr "[戟棘勻逵� 勻筠�克逵]" +msgstr "<戟棘勻逵� 勻筠�克逵>" #. type: Plain text #: en/git-branch.txt:280 @@ -10126,9 +10149,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:325 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "<object>" -msgstr "棘閨�筠克�" +msgstr "<棘閨�筠克�>" #. type: Plain text #: en/git-cat-file.txt:35 @@ -11395,9 +11418,11 @@ msgstr "git-checkout(1)" #. type: Plain text #: en/git-checkout.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-checkout - Switch branches or restore working tree files" -msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" +msgstr "" +"git-checkout - �筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠橘 " +"畇龜�筠克�棘�龜龜" #. type: Plain text #: en/git-checkout.txt:18 @@ -11514,7 +11539,9 @@ msgstr "" #: en/git-checkout.txt:82 #, fuzzy, ignore-ellipsis, no-wrap, priority:240 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<�克逵鈞逵�筠剋�-畇筠�筠勻逵>] [--] <極��龜>��" +msgstr "" +"'git checkout' [-f|--ours|--theirs|-m|--conflict=<��龜剋�>] [<tree-ish>] [--] " +"<pathspec>..." #. type: Labeled list #: en/git-checkout.txt:83 @@ -11884,9 +11911,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:339 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "<new_branch>" -msgstr "戟棘勻逵�-勻筠�克逵" +msgstr "<戟棘勻逵�-勻筠�克逵>" #. type: Plain text #: en/git-checkout.txt:341 en/git-switch.txt:41 @@ -12163,9 +12190,9 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:526 -#, fuzzy, priority:240 +#, priority:240 msgid "restore `hello.c` from the index" -msgstr "鬼棘鈞畇逵戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��筠均棘 龜戟畇筠克�逵" +msgstr "勻棘��逵戟棘勻剋筠戟龜筠`hello.c` 龜鈞 龜戟畇筠克�逵" #. type: Plain text #: en/git-checkout.txt:529 @@ -13525,13 +13552,13 @@ msgstr "" #: en/git-clone.txt:173 #, no-wrap, priority:300 msgid "-o <name>" -msgstr "" +msgstr "-o <龜劇�>" #. type: Labeled list #: en/git-clone.txt:174 #, no-wrap, priority:300 msgid "--origin <name>" -msgstr "" +msgstr "--origin <龜劇�>" #. type: Plain text #: en/git-clone.txt:177 @@ -13543,13 +13570,13 @@ msgstr "" #: en/git-clone.txt:178 #, no-wrap, priority:300 msgid "-b <name>" -msgstr "" +msgstr "-b <龜劇�>" #. type: Labeled list #: en/git-clone.txt:179 #, no-wrap, priority:300 msgid "--branch <name>" -msgstr "" +msgstr "--branch <龜劇�>" #. type: Plain text #: en/git-clone.txt:186 @@ -13585,7 +13612,7 @@ msgstr "" #: en/git-clone.txt:197 #, no-wrap, priority:300 msgid "-c <key>=<value>" -msgstr "" +msgstr "-c <克剋��>=<鈞戟逵�筠戟龜筠>" #. type: Labeled list #: en/git-clone.txt:198 @@ -14536,9 +14563,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:205 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "scissors" -msgstr "--scissors" +msgstr "scissors" #. type: Plain text #: en/git-commit.txt:209 @@ -14671,9 +14698,9 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:298 en/git-status.txt:61 -#, fuzzy, priority:280 +#, priority:280 msgid "Show untracked files." -msgstr "�筠� 戟筠棘��剋筠菌龜勻逵筠劇�� �逵橘剋棘勻.\n" +msgstr "��棘閨�逵菌逵�� 戟筠棘��剋筠菌龜勻逵筠劇�筠 �逵橘剋�." #. type: Plain text #: en/git-commit.txt:303 @@ -18367,9 +18394,11 @@ msgstr "git-describe(1)" #. type: Plain text #: en/git-describe.txt:7 -#, fuzzy, priority:260 +#, priority:260 msgid "git-describe - Give an object a human readable name based on an available ref" -msgstr "��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘筠 龜劇� 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 ���剋克龜" +msgstr "" +"git-describe - ��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘均棘 龜劇筠戟龜 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 " +"���剋克龜" #. type: Plain text #: en/git-describe.txt:14 @@ -18502,9 +18531,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:96 -#, fuzzy, no-wrap, priority:260 +#, no-wrap, priority:260 msgid "--match <pattern>" -msgstr "極棘龜�克 �棘棘�勻筠���勻龜橘 � <�逵閨剋棘戟棘劇>" +msgstr "--match <�逵閨剋棘戟>" #. type: Plain text #: en/git-describe.txt:105 @@ -18516,7 +18545,7 @@ msgstr "" #: en/git-describe.txt:106 #, no-wrap, priority:260 msgid "--exclude <pattern>" -msgstr "" +msgstr "--exclude <�逵閨剋棘戟>" #. type: Plain text #: en/git-describe.txt:117 @@ -18561,6 +18590,8 @@ msgid "" "\t[torvalds@g5 git]$ git describe parent\n" "\tv1.0.4-14-g2414721\n" msgstr "" +"\t[torvalds@g5 git]$ git describe parent\n" +"\tv1.0.4-14-g2414721\n" #. type: Plain text #: en/git-describe.txt:139 @@ -18587,6 +18618,8 @@ msgid "" "\t[torvalds@g5 git]$ git describe v1.0.4\n" "\tv1.0.4\n" msgstr "" +"\t[torvalds@g5 git]$ git describe v1.0.4\n" +"\tv1.0.4\n" #. type: Plain text #: en/git-describe.txt:155 @@ -18601,6 +18634,8 @@ msgid "" "\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n" "\ttags/v1.0.0-21-g975b\n" msgstr "" +"\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n" +"\ttags/v1.0.0-21-g975b\n" #. type: Plain text #: en/git-describe.txt:161 @@ -18609,6 +18644,8 @@ msgid "" "\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n" "\theads/lt/describe-7-g975b\n" msgstr "" +"\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n" +"\theads/lt/describe-7-g975b\n" #. type: Plain text #: en/git-describe.txt:164 @@ -18623,6 +18660,8 @@ msgid "" "\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n" "\ttags/v1.0.0\n" msgstr "" +"\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n" +"\ttags/v1.0.0\n" #. type: Plain text #: en/git-describe.txt:173 @@ -18634,7 +18673,7 @@ msgstr "" #: en/git-describe.txt:176 #, no-wrap, priority:260 msgid "SEARCH STRATEGY" -msgstr "" +msgstr "鬼龜��龜���赳 ���鬼��" #. type: Plain text #: en/git-describe.txt:183 @@ -18670,13 +18709,15 @@ msgstr "git-diff-files(1)" #: en/git-diff-files.txt:7 #, priority:100 msgid "git-diff-files - Compares files in the working tree and the index" -msgstr "" +msgstr "git-diff-files - 鬼�逵勻戟龜�� �逵橘剋� 勻 �逵閨棘�筠橘 畇龜�筠克�棘�龜龜 � 龜戟畇筠克�棘劇" #. type: Plain text #: en/git-diff-files.txt:13 -#, ignore-ellipsis, no-wrap, priority:100 +#, fuzzy, ignore-ellipsis, no-wrap, priority:100 msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n" msgstr "" +"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] " +"[<極���>...]\n" #. type: Plain text #: en/git-diff-files.txt:20 @@ -19388,9 +19429,11 @@ 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 "��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �.畇." +msgstr "" +"git-diff - ��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �逵克 " +"畇逵剋筠筠" #. type: Plain text #: en/git-diff.txt:17 @@ -19435,9 +19478,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:41 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]" -msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" +msgstr "'git diff' [<棘極�龜龜>] --cached [<克棘劇劇龜�>] [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:50 @@ -19459,9 +19502,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:59 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]" -msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" +msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�> <克棘劇劇龜�> [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:63 @@ -19471,9 +19514,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:64 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" -msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" +msgstr "'git diff' [<棘極�龜龜>] <克棘劇劇龜�>..<克棘劇劇龜�> [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:69 @@ -19483,9 +19526,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:70 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" -msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" +msgstr "'git diff [<棘極�龜龜>] <克棘劇劇龜�>\\... <克棘劇劇龜�> [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:77 @@ -22563,9 +22606,9 @@ msgstr "git-fetch(1)" #. type: Plain text #: en/git-fetch.txt:7 -#, fuzzy, priority:220 +#, priority:220 msgid "git-fetch - Download objects and refs from another repository" -msgstr "�逵均��鈞克逵 棘閨�筠克�棘勻 龜 ���剋棘克 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜�" +msgstr "git-fetch - �逵均��鈞克逵 棘閨�筠克�棘勻 龜 ���剋棘克 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-fetch.txt:16 @@ -22870,7 +22913,7 @@ msgstr "" #: en/git-fetch.txt:217 en/git-push.txt:436 #, no-wrap, priority:220 msgid "`*`" -msgstr "" +msgstr "`*`" #. type: Plain text #: en/git-fetch.txt:218 @@ -22882,7 +22925,7 @@ msgstr "" #: en/git-fetch.txt:218 en/git-push.txt:437 #, no-wrap, priority:220 msgid "`!`" -msgstr "" +msgstr "`!`" #. type: Plain text #: en/git-fetch.txt:219 @@ -22894,7 +22937,7 @@ msgstr "" #: en/git-fetch.txt:219 en/git-push.txt:438 #, no-wrap, priority:220 msgid "`=`" -msgstr "" +msgstr "`=`" #. type: Plain text #: en/git-fetch.txt:220 @@ -22904,9 +22947,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch.txt:221 en/git-push.txt:440 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "summary" -msgstr "--summary" +msgstr "summary" #. type: Plain text #: en/git-fetch.txt:226 @@ -22952,15 +22995,15 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:245 -#, fuzzy, priority:220 +#, priority:220 msgid "Update the remote-tracking branches:" -msgstr "勻�極棘剋戟龜�� 畇筠橘��勻龜� 戟逵 棘��剋筠菌龜勻逵筠劇�� 勻戟筠�戟龜� 勻筠�克逵�" +msgstr "�閨戟棘勻龜�� �畇逵剋筠戟戟�筠 棘��剋筠菌龜勻逵筠劇�筠 勻筠�克龜:" #. type: delimited block - #: en/git-fetch.txt:248 #, no-wrap, priority:220 msgid "$ git fetch origin\n" -msgstr "" +msgstr "$ git fetch origin\n" #. type: Plain text #: en/git-fetch.txt:254 @@ -22978,7 +23021,7 @@ msgstr "" #: en/git-fetch.txt:259 #, no-wrap, priority:220 msgid "$ git fetch origin +pu:pu maint:tmp\n" -msgstr "" +msgstr "$ git fetch origin +pu:pu maint:tmp\n" #. type: Plain text #: en/git-fetch.txt:264 @@ -23005,6 +23048,8 @@ msgid "" "$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n" "$ git log FETCH_HEAD\n" msgstr "" +"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n" +"$ git log FETCH_HEAD\n" #. type: Plain text #: en/git-fetch.txt:281 @@ -23567,7 +23612,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:395 -#, fuzzy, no-wrap, priority:100 +#, no-wrap, priority:100 msgid "" " D--E--F--G--H\n" " / /\n" @@ -23597,7 +23642,7 @@ msgstr "" #. type: delimited block - #: en/git-filter-branch.txt:408 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "git filter-branch ... C..H --not D\n" "git filter-branch ... D..H --not C\n" @@ -29917,9 +29962,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "git log [<棘極�龜龜>] [<畇龜逵極逵鈞棘戟-�筠畇逵克�龜橘>] [[--] <極���>��]" +msgstr "'git log' [<棘極�龜龜>] [<畇龜逵極逵鈞棘戟 �筠勻龜鈞龜橘>] [[--] <極���>��]\n" #. type: Plain text #: en/git-log.txt:17 @@ -30301,9 +30346,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:222 -#, fuzzy, priority:260 +#, priority:260 msgid "See linkgit:git-shortlog[1]." -msgstr "linkgit:git-shortlog[1]" +msgstr "鬼劇棘��龜 linkgit:git-shortlog[1]." #. type: Labeled list #: en/git-log.txt:223 en/git-notes.txt:333 @@ -32375,9 +32420,11 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:110 -#, fuzzy, priority:240 +#, priority:240 msgid "Forget about the current merge in progress. Leave the index and the working tree as-is." -msgstr "��勻棘畇 龜戟�棘�劇逵�龜龜 棘 �逵橘剋逵� 勻 龜戟畇筠克�筠 龜 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" +msgstr "" +"�逵閨��� 棘 �筠克��筠劇 極�棘�筠��筠 �剋龜�戟龜�. ���逵勻龜�� 龜戟畇筠克� 龜 �逵閨棘�龜� 畇龜�筠克�棘�龜� 勻 " +"�筠克��筠劇 �棘��棘�戟龜龜." #. type: Plain text #: en/git-merge.txt:115 @@ -32848,9 +32895,11 @@ msgstr "git-mv(1)" #. type: Plain text #: en/git-mv.txt:7 -#, fuzzy, priority:280 +#, priority:280 msgid "git-mv - Move or rename a file, a directory, or a symlink" -msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋�戟棘橘 ���剋克龜" +msgstr "" +"git-mv - �筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 畇龜�筠克�棘�龜龜 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 " +"���剋克龜" #. type: Plain text #: en/git-mv.txt:13 @@ -32860,9 +32909,10 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:17 -#, fuzzy, priority:280 +#, priority:280 msgid "Move or rename a file, directory or symlink." -msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋�戟棘橘 ���剋克龜" +msgstr "" +"�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 畇龜�筠克�棘�龜龜 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 ���剋克龜." #. type: Plain text #: en/git-mv.txt:20 @@ -33180,7 +33230,7 @@ msgstr "" #: en/git-notes.txt:91 #, no-wrap, priority:100 msgid "edit" -msgstr "" +msgstr "edit" #. type: Plain text #: en/git-notes.txt:93 @@ -33192,7 +33242,7 @@ msgstr "" #: en/git-notes.txt:94 #, no-wrap, priority:100 msgid "show" -msgstr "" +msgstr "show" #. type: Plain text #: en/git-notes.txt:96 @@ -33202,9 +33252,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:97 en/git-submodule.txt:160 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "merge" -msgstr "emerge" +msgstr "merge" #. type: Plain text #: en/git-notes.txt:102 @@ -35993,7 +36043,7 @@ msgstr "極棘克逵鈞逵�� 極�棘均�筠�� 勻�極棘剋戟筠戟龜�" #: en/git-prune.txt:48 en/git-worktree.txt:192 #, no-wrap, priority:240 msgid "--expire <time>" -msgstr "" +msgstr "--expire <勻�筠劇�>" #. type: Plain text #: en/git-prune.txt:50 @@ -36023,7 +36073,7 @@ msgstr "" #: en/git-prune.txt:68 #, no-wrap, priority:100 msgid "$ git prune $(cd ../another && git rev-parse --all)\n" -msgstr "" +msgstr "$ git prune $(cd ../another && git rev-parse --all)\n" #. type: Plain text #: en/git-prune.txt:76 @@ -36051,15 +36101,17 @@ msgstr "git-pull(1)" #. type: Plain text #: en/git-pull.txt:7 -#, fuzzy, priority:220 +#, priority:220 msgid "git-pull - Fetch from and integrate with another repository or a local branch" -msgstr "�鈞勻剋筠�筠戟龜筠 龜鈞劇筠戟筠戟龜橘 龜 棘閨�筠畇龜戟筠戟龜筠 � 畇��均龜劇 �筠極棘鈞龜�棘�龜筠劇 龜剋龜 剋棘克逵剋�戟棘橘 勻筠�克棘橘" +msgstr "" +"git-pull - �棘剋��筠戟龜筠 龜 �剋龜�戟龜筠 龜鈞劇筠戟筠戟龜橘 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜� 龜剋龜 " +"剋棘克逵剋�戟棘橘 勻筠�克龜" #. type: Plain text #: en/git-pull.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:220 +#, ignore-ellipsis, no-wrap, priority:220 msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n" -msgstr "git pull [<棘極�龜龜>] [<�筠極棘鈞龜�棘�龜橘> [<�極筠�龜�龜克逵�棘�-���剋克龜>��]]" +msgstr "'git pull' [<棘極�龜龜>] [<�筠極棘鈞龜�棘�龜橘> [<�極筠�龜�龜克逵�棘�-���剋克龜>��]]\n" #. type: Plain text #: en/git-pull.txt:21 @@ -36095,6 +36147,11 @@ msgid "" "\t^\n" "\torigin/master in your repository\n" msgstr "" +"\t A---B---C master 勻 origin\n" +"\t /\n" +" D---E---F---G master\n" +"\t^\n" +"\torigin/master 勻 勻逵�筠劇 �筠極棘鈞龜�棘�龜龜\n" #. type: Plain text #: en/git-pull.txt:54 @@ -36110,6 +36167,9 @@ msgid "" "\t / \\\n" " D---E---F---G---H master\n" msgstr "" +"\t A---B---C origin/master\n" +"\t / \\\n" +" D---E---F---G---H master\n" #. type: Plain text #: en/git-pull.txt:63 @@ -36341,7 +36401,7 @@ msgstr "" #. type: delimited block - #: en/git-pull.txt:220 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "" "$ git pull\n" "$ git pull origin\n" @@ -36363,7 +36423,7 @@ msgstr "" #. type: delimited block - #: en/git-pull.txt:230 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "$ git pull origin next\n" msgstr "$ git pull origin next\n" @@ -36967,9 +37027,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:449 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "rejected" -msgstr "[棘�克剋棘戟筠戟棘]" +msgstr "rejected" #. type: Plain text #: en/git-push.txt:452 @@ -36981,7 +37041,7 @@ msgstr "" #: en/git-push.txt:453 #, no-wrap, priority:220 msgid "remote rejected" -msgstr "" +msgstr "remote rejected" #. type: Plain text #: en/git-push.txt:461 @@ -36993,7 +37053,7 @@ msgstr "" #: en/git-push.txt:462 #, no-wrap, priority:220 msgid "remote failure" -msgstr "" +msgstr "remote failure" #. type: Plain text #: en/git-push.txt:466 @@ -40653,7 +40713,7 @@ msgstr "git-remote(1)" #: en/git-remote.txt:7 #, priority:220 msgid "git-remote - Manage set of tracked repositories" -msgstr "" +msgstr "git-remote - 叫極�逵勻剋筠戟龜筠 棘��剋筠菌龜勻逵筠劇�劇龜 �筠極棘鈞龜�棘�龜�劇龜" #. type: Plain text #: en/git-remote.txt:25 @@ -40754,9 +40814,9 @@ msgstr "" #. type: Labeled list #: en/git-remote.txt:83 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "'rename'" -msgstr "極筠�筠龜劇筠戟棘勻逵戟龜筠" +msgstr "'rename'" #. type: Plain text #: en/git-remote.txt:87 @@ -40774,13 +40834,13 @@ msgstr "" #: en/git-remote.txt:92 #, no-wrap, priority:220 msgid "'remove'" -msgstr "" +msgstr "'remove'" #. type: Labeled list #: en/git-remote.txt:93 #, no-wrap, priority:220 msgid "'rm'" -msgstr "" +msgstr "'rm'" #. type: Plain text #: en/git-remote.txt:97 @@ -40906,7 +40966,7 @@ msgstr "" #: en/git-remote.txt:166 #, no-wrap, priority:220 msgid "'show'" -msgstr "" +msgstr "'show'" #. type: Plain text #: en/git-remote.txt:169 @@ -40924,7 +40984,7 @@ msgstr "" #: en/git-remote.txt:173 #, no-wrap, priority:220 msgid "'prune'" -msgstr "" +msgstr "'prune'" #. type: Plain text #: en/git-remote.txt:180 @@ -40948,7 +41008,7 @@ msgstr "" #: en/git-remote.txt:187 #, no-wrap, priority:220 msgid "'update'" -msgstr "" +msgstr "'update'" #. type: Plain text #: en/git-remote.txt:195 @@ -41900,9 +41960,9 @@ msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 -#, fuzzy, priority:280 +#, priority:280 msgid "git-reset - Reset current HEAD to the specified state" -msgstr "鬼閨�棘� �筠克��筠均棘 �棘��棘�戟龜� HEAD 戟逵 �克逵鈞逵戟戟棘筠 �棘��棘�戟龜筠" +msgstr "git-reset - 鬼閨�棘� �筠克��筠均棘 �棘��棘�戟龜� HEAD 戟逵 �克逵鈞逵戟戟棘筠 �棘��棘�戟龜筠" #. type: Plain text #: en/git-reset.txt:15 @@ -43996,9 +44056,9 @@ msgstr "git-rm(1)" #. type: Plain text #: en/git-rm.txt:7 -#, fuzzy, priority:280 +#, priority:280 msgid "git-rm - Remove files from the working tree and from the index" -msgstr "叫畇逵剋筠戟龜筠 �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 龜 龜戟畇筠克�逵" +msgstr "git-rm - 叫畇逵剋筠戟龜筠 �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 龜 龜戟畇筠克�逵" #. type: Plain text #: en/git-rm.txt:12 @@ -44026,9 +44086,9 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:42 -#, fuzzy, priority:280 +#, priority:280 msgid "Override the up-to-date check." -msgstr "極�棘極���龜�� 極�棘勻筠�克� 逵克��逵剋�戟棘��龜" +msgstr "��棘極���龜�� 極�棘勻筠�克� 逵克��逵剋�戟棘��龜." #. type: Plain text #: en/git-rm.txt:48 @@ -44056,9 +44116,9 @@ msgstr "--ignore-unmatch" #. type: Plain text #: en/git-rm.txt:65 -#, fuzzy, priority:280 +#, priority:280 msgid "Exit with a zero status even if no files matched." -msgstr "勻��棘畇 � 戟�剋筠勻�劇 克棘畇棘劇 勻棘鈞勻�逵�逵, 畇逵菌筠 筠�剋龜 戟龜�筠均棘 戟筠 戟逵橘畇筠戟棘" +msgstr "�逵勻�筠�龜�� �逵閨棘�� � 戟�剋筠勻�劇 克棘畇棘劇 勻棘鈞勻�逵�逵, 畇逵菌筠 筠�剋龜 �逵橘剋� 戟筠 戟逵橘畇筠戟�." #. type: Plain text #: en/git-rm.txt:70 @@ -44124,7 +44184,7 @@ msgstr "" #: en/git-rm.txt:112 #, no-wrap, priority:280 msgid "git ls-files -z | xargs -0 rm -f\n" -msgstr "" +msgstr "git ls-files -z | xargs -0 rm -f\n" #. type: Plain text #: en/git-rm.txt:116 @@ -44142,13 +44202,13 @@ msgstr "" #: en/git-rm.txt:122 #, no-wrap, priority:280 msgid "git add -A\n" -msgstr "" +msgstr "git add -A\n" #. type: Plain text #: en/git-rm.txt:125 -#, fuzzy, priority:280 +#, priority:280 msgid "See linkgit:git-add[1]." -msgstr "linkgit:git-add[1]" +msgstr "鬼劇棘��龜 linkgit:git-add[1]." #. type: Title ~ #: en/git-rm.txt:127 @@ -44166,7 +44226,7 @@ msgstr "" #: en/git-rm.txt:135 #, no-wrap, priority:280 msgid "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n" -msgstr "" +msgstr "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n" #. type: Plain text #: en/git-rm.txt:148 @@ -44188,9 +44248,9 @@ msgstr "" #. type: Labeled list #: en/git-rm.txt:161 -#, fuzzy, no-wrap, priority:280 +#, no-wrap, priority:280 msgid "`git rm Documentation/\\*.txt`" -msgstr "$ git add Documentation/\\*.txt\n" +msgstr "`git rm Documentation/\\*.txt`" #. type: Plain text #: en/git-rm.txt:164 @@ -44208,7 +44268,7 @@ msgstr "" #: en/git-rm.txt:169 #, no-wrap, priority:280 msgid "`git rm -f git-*.sh`" -msgstr "" +msgstr "`git rm -f git-*.sh`" #. type: Plain text #: en/git-rm.txt:173 @@ -44232,7 +44292,7 @@ msgstr "git-send-email(1)" #: en/git-send-email.txt:7 #, priority:100 msgid "git-send-email - Send a collection of patches as emails" -msgstr "" +msgstr "git-send-email - ��極�逵勻龜�� 戟逵閨棘� 極逵��筠橘 極棘 極棘��筠" #. type: Plain text #: en/git-send-email.txt:14 @@ -44264,7 +44324,7 @@ msgstr "" #: en/git-send-email.txt:31 #, priority:100 msgid "mbox format files" -msgstr "" +msgstr "�逵橘剋� 勻 �棘�劇逵�筠 mbox" #. type: Plain text #: en/git-send-email.txt:34 @@ -45682,9 +45742,9 @@ msgstr "--email" #. type: Plain text #: en/git-shortlog.txt:41 -#, fuzzy, priority:260 +#, priority:260 msgid "Show the email address of each author." -msgstr "�棘克逵鈞逵�� 極棘��� 克逵菌畇棘均棘 龜鈞 逵勻�棘�棘勻" +msgstr "��棘閨�逵菌逵�� email 逵畇�筠� 克逵菌畇棘均棘 逵勻�棘�逵." #. type: Labeled list #: en/git-shortlog.txt:42 @@ -46421,9 +46481,9 @@ msgstr "" #. type: Plain text #: en/git-show.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 +#, ignore-ellipsis, no-wrap, priority:260 msgid "'git show' [<options>] [<object>...]\n" -msgstr "git show [<棘極�龜龜>] <棘閨�筠克�>��" +msgstr "'git show' [<棘極�龜龜>] [<棘閨�筠克�>��]\n" #. type: Plain text #: en/git-show.txt:17 @@ -46747,9 +46807,9 @@ msgstr "git-stash(1)" #. type: Plain text #: en/git-stash.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-stash - Stash the changes in a dirty working directory away" -msgstr "鬼極���逵�� 龜鈞劇筠戟筠戟龜� 勻 龜鈞劇筠戟�戟戟棘劇 �逵閨棘�筠劇 克逵�逵剋棘均筠" +msgstr "git-stash - ��剋棘菌龜�� 勻 ��棘�棘戟� 勻�筠 龜鈞劇筠戟筠戟龜� 勻 �逵閨棘�筠橘 畇龜�筠克�棘�龜龜" #. type: Plain text #: en/git-stash.txt:22 @@ -46874,9 +46934,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:110 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "show [<options>] [<stash>]" -msgstr "git show [<棘極�龜龜>] <棘閨�筠克�>��" +msgstr "show [<棘極�龜龜>] [<stash>]" #. type: Plain text #: en/git-stash.txt:120 @@ -46888,7 +46948,7 @@ msgstr "" #: en/git-stash.txt:121 #, fuzzy, no-wrap, priority:240 msgid "pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]" +msgstr "pop [--index] [-q|--quiet] [<stash>]" #. type: Plain text #: en/git-stash.txt:127 @@ -46918,7 +46978,7 @@ msgstr "" #: en/git-stash.txt:140 #, fuzzy, no-wrap, priority:240 msgid "apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]" +msgstr "apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]" #. type: Plain text #: en/git-stash.txt:145 @@ -47150,9 +47210,9 @@ msgstr "" #. type: Plain text #: en/git-status.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 +#, ignore-ellipsis, no-wrap, priority:280 msgid "'git status' [<options>...] [--] [<pathspec>...]\n" -msgstr "git status [<棘極�龜龜>] [--] <�極筠�龜�龜克逵�棘�-極��龜>��" +msgstr "'git status' [<棘極�龜龜>...] [--] [<�極筠�龜�龜克逵�棘�-極��龜>��]\n" #. type: Plain text #: en/git-status.txt:23 @@ -47695,10 +47755,9 @@ msgstr "" #. type: Title ^ #: en/git-status.txt:375 -#, fuzzy, no-wrap, priority:280 -#| msgid "Other" +#, no-wrap, priority:280 msgid "Other Items" -msgstr "���均棘筠" +msgstr "���均龜筠 �剋筠劇筠戟��" #. type: Plain text #: en/git-status.txt:380 @@ -48125,7 +48184,7 @@ msgstr "" #: en/git-submodule.txt:149 #, fuzzy, no-wrap, priority:220 msgid "checkout" -msgstr "--checkout" +msgstr "checkout" #. type: Plain text #: en/git-submodule.txt:150 @@ -48149,7 +48208,7 @@ msgstr "" #: en/git-submodule.txt:157 #, fuzzy, no-wrap, priority:220 msgid "rebase" -msgstr "--rebase" +msgstr "rebase" #. type: Plain text #: en/git-submodule.txt:158 @@ -48361,10 +48420,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:280 -#, fuzzy, no-wrap, priority:220 -#| msgid "<branch>" +#, no-wrap, priority:220 msgid "-b <branch>" -msgstr "<勻筠�克逵>" +msgstr "-b <勻筠�克逵>" #. type: Plain text #: en/git-submodule.txt:288 @@ -48506,9 +48564,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:394 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "--reference <repository>" -msgstr "���剋逵筠劇�橘 �筠極棘鈞龜�棘�龜橘" +msgstr "--reference <�筠極棘鈞龜�棘�龜橘>" #. type: Plain text #: en/git-submodule.txt:398 en/git-submodule.txt:407 @@ -50933,9 +50991,11 @@ msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 -#, fuzzy, priority:240 +#, priority:240 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG" -msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 龜剋龜 極�棘勻筠�克逵 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 � 極棘劇棘��� GPG" +msgstr "" +"git-tag - 鬼棘鈞畇逵戟龜筠, 棘�棘閨�逵菌筠戟龜筠, �畇逵剋筠戟龜筠 龜剋龜 勻筠�龜�龜克逵�龜� 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 " +"� 極棘劇棘��� GPG" #. type: Plain text #: en/git-tag.txt:20 @@ -51109,9 +51169,9 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:133 -#, fuzzy, priority:240 +#, priority:240 msgid "Sorting and filtering tags are case insensitive." -msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵" +msgstr "鬼棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 劇筠�棘克 戟筠 ��龜��勻逵�� �筠均龜���." #. type: Plain text #: en/git-tag.txt:139 @@ -51193,9 +51253,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:203 -#, no-wrap, priority:240 +#, fuzzy, no-wrap, priority:240 msgid "<tagname>" -msgstr "" +msgstr "<�筠均>" #. type: Plain text #: en/git-tag.txt:208 @@ -51205,9 +51265,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:209 en/git.txt:334 -#, fuzzy, no-wrap, priority:240 +#, no-wrap, priority:240 msgid "<commit>" -msgstr "`commit`" +msgstr "<克棘劇劇龜�>" #. type: Plain text #: en/git-tag.txt:213 @@ -51228,6 +51288,8 @@ msgid "" "[user]\n" " signingKey = <gpg-keyid>\n" msgstr "" +"[user]\n" +" signingKey = <id-克剋��逵-gpg>\n" #. type: Plain text #: en/git-tag.txt:229 @@ -57945,6 +58007,9 @@ msgid "" "Author: <author>\n" "Commit: <committer>\n" msgstr "" +"commit <�筠�>\n" +"Author: <逵勻�棘�>\n" +"Commit: <克棘劇劇龜�筠�>\n" #. type: Plain text #: en/pretty-formats.txt:55 @@ -57962,13 +58027,17 @@ msgid "" "Commit: <committer>\n" "CommitDate: <committer date>\n" msgstr "" +"commit <�筠�>\n" +"Author: <逵勻�棘�>\n" +"AuthorDate: <畇逵�逵 �棘鈞畇逵戟龜�>\n" +"Commit: <克棘劇劇龜�筠�>\n" +"CommitDate: <畇逵�逵 克棘劇龜�逵>\n" #. type: Plain text #: en/pretty-formats.txt:67 -#, fuzzy, priority:260 -#| msgid "--dereference" +#, priority:260 msgid "'reference'" -msgstr "--dereference" +msgstr "'reference'" #. type: Plain text #: en/pretty-formats.txt:69 @@ -58056,10 +58125,9 @@ msgstr "'%n'" #. type: Plain text #: en/pretty-formats.txt:118 -#, fuzzy, priority:260 -#| msgid "--oneline" +#, priority:260 msgid "newline" -msgstr "--oneline" +msgstr "極筠�筠戟棘� ���棘克龜" #. type: Plain text #: en/pretty-formats.txt:119 @@ -58285,9 +58353,9 @@ msgstr "'%H'" #. type: Plain text #: en/pretty-formats.txt:166 -#, fuzzy, priority:260 +#, priority:260 msgid "commit hash" -msgstr "`commit`" +msgstr "�筠� 克棘劇劇龜�逵" #. type: Labeled list #: en/pretty-formats.txt:166 @@ -58297,10 +58365,9 @@ msgstr "'%h'" #. type: Plain text #: en/pretty-formats.txt:167 -#, fuzzy, priority:260 -#| msgid "--abbrev-commit" +#, priority:260 msgid "abbreviated commit hash" -msgstr "--abbrev-commit" +msgstr "�棘克�逵�筠戟戟�橘 �筠� 克棘劇劇龜�逵" #. type: Labeled list #: en/pretty-formats.txt:167 @@ -58310,9 +58377,9 @@ msgstr "'%T'" #. type: Plain text #: en/pretty-formats.txt:168 -#, fuzzy, priority:260 +#, priority:260 msgid "tree hash" -msgstr "�克逵鈞逵�筠剋�-畇筠�筠勻逵" +msgstr "�筠� 棘閨�筠克�逵 畇筠�筠勻逵 克逵�逵剋棘均棘勻" #. type: Labeled list #: en/pretty-formats.txt:168 @@ -58334,10 +58401,9 @@ msgstr "'%P'" #. type: Plain text #: en/pretty-formats.txt:170 -#, fuzzy, priority:260 -#| msgid "--parents" +#, priority:260 msgid "parent hashes" -msgstr "--parents" +msgstr "�筠�龜 �棘畇龜�筠剋筠橘" #. type: Labeled list #: en/pretty-formats.txt:170 @@ -58359,10 +58425,9 @@ msgstr "'%an'" #. type: Plain text #: en/pretty-formats.txt:172 -#, fuzzy, priority:260 -#| msgid "`author`" +#, priority:260 msgid "author name" -msgstr "`author`" +msgstr "龜劇� 逵勻�棘�逵" #. type: Labeled list #: en/pretty-formats.txt:172 @@ -58378,10 +58443,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:174 en/pretty-formats.txt:177 -#, fuzzy, priority:260 -#| msgid "linkgit:git-blame[1]" +#, priority:260 msgid "or linkgit:git-blame[1])" -msgstr "linkgit:git-blame[1]" +msgstr "龜剋龜 linkgit:git-blame[1]" #. type: Labeled list #: en/pretty-formats.txt:174 @@ -58391,10 +58455,9 @@ msgstr "'%ae'" #. type: Plain text #: en/pretty-formats.txt:175 -#, fuzzy, priority:260 -#| msgid "`author`" +#, priority:260 msgid "author email" -msgstr "`author`" +msgstr "email 逵勻�棘�逵" #. type: Labeled list #: en/pretty-formats.txt:175 @@ -58434,10 +58497,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:240 en/pretty-formats.txt:243 -#, fuzzy, priority:260 -#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]" +#, priority:260 msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])" -msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]" +msgstr "linkgit:git-shortlog[1] 龜剋龜 linkgit:git-blame[1])" #. type: Labeled list #: en/pretty-formats.txt:180 @@ -58471,10 +58533,9 @@ msgstr "'%ar'" #. type: Plain text #: en/pretty-formats.txt:183 -#, fuzzy, priority:260 -#| msgid "--author-date-order" +#, priority:260 msgid "author date, relative" -msgstr "--author-date-order" +msgstr "畇逵�逵 逵勻�棘�逵, 棘�戟棘�龜�筠剋�戟逵�" #. type: Labeled list #: en/pretty-formats.txt:183 @@ -58532,10 +58593,9 @@ msgstr "'%cn'" #. type: Plain text #: en/pretty-formats.txt:188 -#, fuzzy, priority:260 -#| msgid "`committer`" +#, priority:260 msgid "committer name" -msgstr "`committer`" +msgstr "龜劇� 克棘劇劇龜�筠�逵" #. type: Labeled list #: en/pretty-formats.txt:188 @@ -58557,10 +58617,9 @@ msgstr "'%ce'" #. type: Plain text #: en/pretty-formats.txt:191 -#, fuzzy, priority:260 -#| msgid "`committer`" +#, priority:260 msgid "committer email" -msgstr "`committer`" +msgstr "email 克棘劇劇龜�筠�逵" #. type: Labeled list #: en/pretty-formats.txt:191 @@ -58624,10 +58683,9 @@ msgstr "'%cr'" #. type: Plain text #: en/pretty-formats.txt:199 -#, fuzzy, priority:260 -#| msgid "--committer-date-is-author-date" +#, priority:260 msgid "committer date, relative" -msgstr "--committer-date-is-author-date" +msgstr "畇逵�逵 克棘劇劇龜�筠�逵, 棘�戟棘�龜�筠剋�戟逵�" #. type: Labeled list #: en/pretty-formats.txt:199 @@ -58727,10 +58785,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:209 -#, fuzzy, priority:260 -#| msgid "--keep-subject" +#, priority:260 msgid "subject" -msgstr "--keep-subject" +msgstr "�筠劇逵" #. type: Labeled list #: en/pretty-formats.txt:209 @@ -58776,10 +58833,9 @@ msgstr "'%N'" #. type: Plain text #: en/pretty-formats.txt:214 -#, fuzzy, priority:260 -#| msgid "`committer`" +#, priority:260 msgid "commit notes" -msgstr "`committer`" +msgstr "鈞逵劇筠�克龜 克棘劇劇龜�逵" #. type: Labeled list #: en/pretty-formats.txt:215 @@ -59147,9 +59203,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:45 -#, fuzzy, no-wrap, priority:260 +#, no-wrap, priority:260 msgid "--expand-tabs=<n>" -msgstr "--expand-tabs" +msgstr "--expand-tabs=<�龜�剋棘>" #. type: Labeled list #: en/pretty-options.txt:46 @@ -59207,10 +59263,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:88 -#, fuzzy, no-wrap, priority:260 -#| msgid "--show-signature" +#, no-wrap, priority:260 msgid "--show-notes[=<ref>]" -msgstr "--show-signature" +msgstr "--show-notes[=<���剋克逵>]" #. type: Labeled list #: en/pretty-options.txt:89 @@ -59256,9 +59311,9 @@ msgstr "" #. type: Labeled list #: en/pull-fetch-param.txt:14 -#, fuzzy, no-wrap, priority:220 +#, no-wrap, priority:220 msgid "<refspec>" -msgstr "�極筠�龜�龜克逵�棘� ���剋克龜" +msgstr "<�極筠�龜�龜克逵�棘� ���剋克龜>" #. type: Plain text #: en/pull-fetch-param.txt:18 @@ -61366,9 +61421,9 @@ msgstr "" #. type: Labeled list #: en/rev-list-options.txt:843 -#, fuzzy, no-wrap, priority:260 +#, no-wrap, priority:260 msgid "--date=<format>" -msgstr "--date <�棘�劇逵�>" +msgstr "--date=<�棘�劇逵�>" #. type: Plain text #: en/rev-list-options.txt:850 -- GitLab