Skip to content
Snippets Groups Projects
Unverified Commit 610cbb5b authored by n0tr00t's avatar n0tr00t Committed by Hosted Weblate
Browse files

Translated using Weblate (Chinese (Simplified)) 

Currently translated at 30.1% (3314 of 10990 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/


Signed-off-by: default avatarn0tr00t <hosted.weblate.org@n0tr00t.eu.org>
parent b362851f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
po/documentation.zh_HANS-CN.po
+ 113
− 252
View file @ 610cbb5b
...@@ -3,19 +3,7 @@ ...@@ -3,19 +3,7 @@
# This file is distributed under the same license as the Git package. # This file is distributed under the same license as the Git package.
# Matthias Aßhauer <mha1993@live.de>, 2019. # Matthias Aßhauer <mha1993@live.de>, 2019.
msgid "" msgid ""
msgstr "" msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-03-17 20:22+0000\nLast-Translator: n0tr00t <hosted.weblate.org@n0tr00t.eu.org>\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.2-dev\n"
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2023-02-26 14:06+0100\n"
"PO-Revision-Date: 2023-02-24 08:40+0000\n"
"Last-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_HANS-CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.16-dev\n"
   
#. type: Labeled list #. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31 #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
...@@ -1673,8 +1661,8 @@ msgstr "" ...@@ -1673,8 +1661,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]" msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]" msgstr "linkgit:git-name-rev[1]"
   
#. type: Plain text
# 查找给定版本的符号名称 # 查找给定版本的符号名称
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:39 #: en/cmds-plumbinginterrogators.txt:39
#, priority:100 #, priority:100
msgid "Find symbolic names for given revs." msgid "Find symbolic names for given revs."
...@@ -4067,10 +4055,9 @@ msgstr "生成补丁（参阅生成补丁的相关章节）。" ...@@ -4067,10 +4055,9 @@ msgstr "生成补丁（参阅生成补丁的相关章节）。"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:28 #: en/diff-options.txt:28
#, fuzzy, priority:280 #, priority:280
#| msgid "Generating patch text with -p"
msgid "<<generate_patch_text_with_p, \"Generating patch text with -p\">>)." msgid "<<generate_patch_text_with_p, \"Generating patch text with -p\">>)."
msgstr "使用选项 `-p` 生成补丁文本" msgstr "使用选项 `-p` 生成补丁文本。"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:31 #: en/diff-options.txt:31
...@@ -4220,7 +4207,7 @@ msgstr "--remerge-diff" ...@@ -4220,7 +4207,7 @@ msgstr "--remerge-diff"
#: en/diff-options.txt:80 #: en/diff-options.txt:80
#, priority:280 #, priority:280
msgid "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit." msgid "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit."
msgstr "" msgstr "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such. A diff is then shown between that temporary tree and the actual merge commit."
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:84 #: en/diff-options.txt:84
...@@ -4688,9 +4675,9 @@ msgstr "--cumulative" ...@@ -4688,9 +4675,9 @@ msgstr "--cumulative"
   
#. type: Plain text #. type: Plain text
#: en/diff-options.txt:289 #: en/diff-options.txt:289
#, fuzzy, priority:280 #, priority:280
msgid "Synonym for --dirstat=cumulative" msgid "Synonym for --dirstat=cumulative"
msgstr "--dirstat=cumulative 的同义词。" msgstr "--dirstat=cumulative 同义"
   
#. type: Labeled list #. type: Labeled list
#: en/diff-options.txt:290 #: en/diff-options.txt:290
...@@ -6758,7 +6745,7 @@ msgstr "此选项主要用于帮助那些习惯于较旧版本 Git 的用户。 ...@@ -6758,7 +6745,7 @@ msgstr "此选项主要用于帮助那些习惯于较旧版本 Git 的用户。
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:154 en/git-format-patch.txt:122 en/git-submodule.txt:355 #: en/git-add.txt:154 en/git-format-patch.txt:122 en/git-submodule.txt:355
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "-N" msgid "-N"
msgstr "-N" msgstr "-N"
   
...@@ -6873,7 +6860,7 @@ msgstr "只有在使用 `--pathspec-from-file` 时才有意义。指定路径元 ...@@ -6873,7 +6860,7 @@ msgstr "只有在使用 `--pathspec-from-file` 时才有意义。指定路径元
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:213 en/git-check-attr.txt:44 en/git-checkout-index.txt:77 en/git-checkout.txt:364 en/git-commit.txt:398 en/git-grep.txt:303 en/git-ls-files.txt:225 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:62 en/git-stash.txt:245 en/git-update-index.txt:226 en/git-verify-pack.txt:36 #: en/git-add.txt:213 en/git-check-attr.txt:44 en/git-checkout-index.txt:77 en/git-checkout.txt:364 en/git-commit.txt:398 en/git-grep.txt:303 en/git-ls-files.txt:225 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:128 en/git-restore.txt:141 en/git-rm.txt:62 en/git-stash.txt:245 en/git-update-index.txt:226 en/git-verify-pack.txt:36
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "\\--" msgid "\\--"
msgstr "\\--" msgstr "\\--"
   
...@@ -6885,7 +6872,7 @@ msgstr "此选项可用于分离命令行选项和文件列表（当文件名可 ...@@ -6885,7 +6872,7 @@ msgstr "此选项可用于分离命令行选项和文件列表（当文件名可
   
#. type: Title - #. type: Title -
#: en/git-add.txt:220 en/git-archive.txt:182 en/git-bisect.txt:380 en/git-branch.txt:348 en/git-bundle.txt:231 en/git-check-attr.txt:76 en/git-checkout-index.txt:149 en/git-checkout.txt:520 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:337 en/git-column.txt:50 en/git-commit.txt:410 en/git-config.txt:435 en/git-credential-cache.txt:58 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:259 en/git-describe.txt:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:65 en/git-for-each-ref.txt:301 en/git-format-patch.txt:714 en/git-grep.txt:315 en/git-http-backend.txt:69 en/git-imap-send.txt:62 en/git-init.txt:157 en/git-interpret-trailers.txt:272 en/git-log.txt:136 en/git-ls-remote.txt:100 en/git-merge-file.txt:84 en/git-merge.txt:352 en/git-name-rev.txt:91 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:202 en/git-push.txt:598 en/git-range-diff.txt:135 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:220 en/git-request-pull.txt:50 en/git-reset.txt:137 en/git-restore.txt:150 en/git-revert.txt:131 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:175 en/git-send-email.txt:473 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:286 en/git-stripspace.txt:49 en/git-switch.txt:193 en/git-update-index.txt:360 en/git-var.txt:28 en/git-worktree.txt:479 #: en/git-add.txt:220 en/git-archive.txt:182 en/git-bisect.txt:380 en/git-branch.txt:348 en/git-bundle.txt:231 en/git-check-attr.txt:76 en/git-checkout-index.txt:149 en/git-checkout.txt:520 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:166 en/git-cherry.txt:43 en/git-clone.txt:337 en/git-column.txt:50 en/git-commit.txt:410 en/git-config.txt:435 en/git-credential-cache.txt:58 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:259 en/git-describe.txt:128 en/git-diff.txt:147 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:65 en/git-for-each-ref.txt:301 en/git-format-patch.txt:714 en/git-grep.txt:315 en/git-http-backend.txt:69 en/git-imap-send.txt:62 en/git-init.txt:157 en/git-interpret-trailers.txt:272 en/git-log.txt:136 en/git-ls-remote.txt:100 en/git-merge-file.txt:84 en/git-merge.txt:352 en/git-name-rev.txt:91 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:202 en/git-push.txt:598 en/git-range-diff.txt:135 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:220 en/git-request-pull.txt:50 en/git-reset.txt:137 en/git-restore.txt:150 en/git-revert.txt:131 en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:175 en/git-send-email.txt:473 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:61 en/git-stash.txt:286 en/git-stripspace.txt:49 en/git-switch.txt:193 en/git-update-index.txt:360 en/git-var.txt:28 en/git-worktree.txt:479
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "EXAMPLES" msgid "EXAMPLES"
msgstr "实例" msgstr "实例"
   
...@@ -6897,7 +6884,7 @@ msgstr "添加 `Documentation` 目录及其子目录下所有 `*.txt` 文件的 ...@@ -6897,7 +6884,7 @@ msgstr "添加 `Documentation` 目录及其子目录下所有 `*.txt` 文件的
   
#. type: delimited block - #. type: delimited block -
#: en/git-add.txt:227 #: en/git-add.txt:227
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "$ git add Documentation/\\*.txt\n" msgid "$ git add Documentation/\\*.txt\n"
msgstr "$ git add Documentation/\\*.txt\n" msgstr "$ git add Documentation/\\*.txt\n"
   
...@@ -6915,7 +6902,7 @@ msgstr "从所有 git-*.sh 脚本中添加内容：" ...@@ -6915,7 +6902,7 @@ msgstr "从所有 git-*.sh 脚本中添加内容："
   
#. type: delimited block - #. type: delimited block -
#: en/git-add.txt:237 #: en/git-add.txt:237
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "$ git add git-*.sh\n" msgid "$ git add git-*.sh\n"
msgstr "$ git add git-*.sh\n" msgstr "$ git add git-*.sh\n"
   
...@@ -6927,7 +6914,7 @@ msgstr "因为这个示例允许 shell 扩展星号（即显式列出文件） ...@@ -6927,7 +6914,7 @@ msgstr "因为这个示例允许 shell 扩展星号（即显式列出文件）
   
#. type: Title - #. type: Title -
#: en/git-add.txt:244 en/git-rebase.txt:823 #: en/git-add.txt:244 en/git-rebase.txt:823
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "INTERACTIVE MODE" msgid "INTERACTIVE MODE"
msgstr "交互模式" msgstr "交互模式"
   
...@@ -6971,7 +6958,7 @@ msgstr "主命令循环有6个子命令（包括帮助和退出）。" ...@@ -6971,7 +6958,7 @@ msgstr "主命令循环有6个子命令（包括帮助和退出）。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:266 #: en/git-add.txt:266
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "status" msgid "status"
msgstr "状态" msgstr "状态"
   
...@@ -7049,7 +7036,7 @@ msgstr "进行选择后，输入空行，以便为索引中选定的路径暂存 ...@@ -7049,7 +7036,7 @@ msgstr "进行选择后，输入空行，以便为索引中选定的路径暂存
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:319 #: en/git-add.txt:319
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "revert" msgid "revert"
msgstr "还原" msgstr "还原"
   
...@@ -7061,7 +7048,7 @@ msgstr "它有一个与 'update' 非常相似的交互过程，所选路径的 ...@@ -7061,7 +7048,7 @@ msgstr "它有一个与 'update' 非常相似的交互过程，所选路径的
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:325 #: en/git-add.txt:325
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "add untracked" msgid "add untracked"
msgstr "添加未跟踪文件" msgstr "添加未跟踪文件"
   
...@@ -7073,7 +7060,7 @@ msgstr "它有一个与 'update' 和 'revert' 非常相似的交互过程，允 ...@@ -7073,7 +7060,7 @@ msgstr "它有一个与 'update' 和 'revert' 非常相似的交互过程，允
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:330 #: en/git-add.txt:330
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "patch" msgid "patch"
msgstr "补丁" msgstr "补丁"
   
...@@ -7143,7 +7130,7 @@ msgstr "这使您可以查看要提交的内容（即，在HEAD和索引之间 ...@@ -7143,7 +7130,7 @@ msgstr "这使您可以查看要提交的内容（即，在HEAD和索引之间
   
#. type: Title - #. type: Title -
#: en/git-add.txt:366 #: en/git-add.txt:366
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "EDITING PATCHES" msgid "EDITING PATCHES"
msgstr "编辑补丁" msgstr "编辑补丁"
   
...@@ -7155,7 +7142,7 @@ msgstr "调用`git add -e`或从交互式块选择器中选择`e`命令，将在 ...@@ -7155,7 +7142,7 @@ msgstr "调用`git add -e`或从交互式块选择器中选择`e`命令，将在
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:378 #: en/git-add.txt:378
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "added content" msgid "added content"
msgstr "添加的内容" msgstr "添加的内容"
   
...@@ -7167,7 +7154,7 @@ msgstr "添加的内容以“ {plus}”开头的行表示。您可以删除它 ...@@ -7167,7 +7154,7 @@ msgstr "添加的内容以“ {plus}”开头的行表示。您可以删除它
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:383 #: en/git-add.txt:383
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "removed content" msgid "removed content"
msgstr "删除的内容" msgstr "删除的内容"
   
...@@ -7177,10 +7164,10 @@ msgstr "删除的内容" ...@@ -7177,10 +7164,10 @@ msgstr "删除的内容"
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)." msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。" msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
   
#. type: Labeled list
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
#. type: Labeled list
#: en/git-add.txt:388 #: en/git-add.txt:388
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "modified content" msgid "modified content"
msgstr "修改的内容" msgstr "修改的内容"
   
...@@ -7216,7 +7203,7 @@ msgstr "索引和工作树之间没有区别的内容可能会显示在上下文 ...@@ -7216,7 +7203,7 @@ msgstr "索引和工作树之间没有区别的内容可能会显示在上下文
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:414 #: en/git-add.txt:414
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "modifying existing content" msgid "modifying existing content"
msgstr "修改现有的内容" msgstr "修改现有的内容"
   
...@@ -7228,7 +7215,7 @@ msgstr "也可以通过暂存上下文行（通过将“ ”转换为“-”） ...@@ -7228,7 +7215,7 @@ msgstr "也可以通过暂存上下文行（通过将“ ”转换为“-”）
   
#. type: Labeled list #. type: Labeled list
#: en/git-add.txt:422 #: en/git-add.txt:422
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "new content" msgid "new content"
msgstr "新的内容" msgstr "新的内容"
   
...@@ -10144,23 +10131,7 @@ msgstr "git-branch - 列出、创建或删除分支" ...@@ -10144,23 +10131,7 @@ msgstr "git-branch - 列出、创建或删除分支"
   
#. type: Plain text #. type: Plain text
#: en/git-branch.txt:27 #: en/git-branch.txt:27
#, fuzzy, ignore-ellipsis, no-wrap, priority:260 #, ignore-ellipsis, no-wrap, priority:260
#| msgid ""
#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
#| "\t[-v [--abbrev=<n> | --no-abbrev]]\n"
#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
#| "\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
#| "\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
#| "\t[--points-at <object>] [--format=<format>]\n"
#| "\t[(-r | --remotes) | (-a | --all)]\n"
#| "\t[--list] [<pattern>...]\n"
#| "'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n"
#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n"
#| "'git branch' --unset-upstream [<branchname>]\n"
#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n"
#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
#| "'git branch' (-d | -D) [-r] <branchname>...\n"
#| "'git branch' --edit-description [<branchname>]\n"
msgid "" msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n" "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> | --no-abbrev]]\n" "\t[-v [--abbrev=<n> | --no-abbrev]]\n"
...@@ -10178,22 +10149,7 @@ msgid "" ...@@ -10178,22 +10149,7 @@ msgid ""
"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
"'git branch' (-d | -D) [-r] <branchname>...\n" "'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>]\n" "'git branch' --edit-description [<branchname>]\n"
msgstr "" msgstr "'git branch' [--color[=<when>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<options>] | --no-column] [--sort=<key>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <object>] [--format=<format>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<pattern>...]\n'git branch' [--track[=(direct|inherit)] | --no-track] [-f]\n\t[--recurse-submodules] <分支名> [<起始点>]\n'git branch' (--set-upstream-to=<上游> | -u <上游>) [<分支名>]\n'git branch' --unset-upstream [<分支名>]\n'git branch' (-m | -M) [<旧分支>] <新分支>\n'git branch' (-c | -C) [<旧分支>] <新分支>\n'git branch' (-d | -D) [-r] <分支名>...\n'git branch' --edit-description [<分支名>]\n"
"'git branch' [--color[=<when>] |--no-color] [--show-current]\n"
"\t[-v [--abbrev=<n> |--no-abbrev] ]\n"
"\t[--column[=<options>] | --no-column][--sort=<key>]\n"
"\t[--合并 [<commit>]][--no-merged [<commit>]]。\n"
"\t[--包含[<commit>]][--no-contains [<commit>]] [--contains [<commit>]]\n"
"\t[--points-at <object>] [--format=<format>]。\n"
"\t[(-r | --remotes) | (-a | --all)\n"
"\t[--列表] [<pattern>...]\n"
"'git branch' [--track |-no-track] [-f] <branchname> [<start-point>]。\n"
"'git branch' (-set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n"
"'git branch' --unset-upstream [<branchname>]\n"
"'git branch' (-m | -M) [<oldbranch>] <newbranch>\n"
"'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
"'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>])\n"
   
#. type: Plain text #. type: Plain text
#: en/git-branch.txt:37 #: en/git-branch.txt:37
...@@ -13067,7 +13023,7 @@ msgstr "" ...@@ -13067,7 +13023,7 @@ msgstr ""
#: en/git-checkout.txt:26 #: en/git-checkout.txt:26
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "'git checkout' [<branch>]" msgid "'git checkout' [<branch>]"
msgstr "" msgstr "'git checkout' [<分支>]"
   
#. type: Plain text #. type: Plain text
#: en/git-checkout.txt:32 #: en/git-checkout.txt:32
...@@ -13131,13 +13087,13 @@ msgstr "" ...@@ -13131,13 +13087,13 @@ msgstr ""
#: en/git-checkout.txt:66 #: en/git-checkout.txt:66
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "'git checkout' --detach [<branch>]" msgid "'git checkout' --detach [<branch>]"
msgstr "" msgstr "'git checkout' --detach [<分支>]"
   
#. type: Labeled list #. type: Labeled list
#: en/git-checkout.txt:67 #: en/git-checkout.txt:67
#, no-wrap, priority:240 #, no-wrap, priority:240
msgid "'git checkout' [--detach] <commit>" msgid "'git checkout' [--detach] <commit>"
msgstr "" msgstr "'git checkout' [--detach] <提交>"
   
#. type: Plain text #. type: Plain text
#: en/git-checkout.txt:75 #: en/git-checkout.txt:75
...@@ -13197,7 +13153,7 @@ msgstr "" ...@@ -13197,7 +13153,7 @@ msgstr ""
#: en/git-checkout.txt:110 en/git-read-tree.txt:120 en/git-stash.txt:244 en/git-switch.txt:145 #: en/git-checkout.txt:110 en/git-read-tree.txt:120 en/git-stash.txt:244 en/git-switch.txt:145
#, priority:240 #, priority:240
msgid "Quiet, suppress feedback messages." msgid "Quiet, suppress feedback messages."
msgstr "" msgstr "静默，压制反馈信息。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-checkout.txt:112 en/git-fetch-pack.txt:108 en/git-restore.txt:71 en/git-switch.txt:147 en/merge-options.txt:183 #: en/git-checkout.txt:112 en/git-fetch-pack.txt:108 en/git-restore.txt:71 en/git-switch.txt:147 en/merge-options.txt:183
...@@ -14983,9 +14939,9 @@ msgstr "git-clone(1)" ...@@ -14983,9 +14939,9 @@ msgstr "git-clone(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:7 #: en/git-clone.txt:7
#, fuzzy, priority:300 #, priority:300
msgid "git-clone - Clone a repository into a new directory" msgid "git-clone - Clone a repository into a new directory"
msgstr "git-clone - Clone a repository into a new directory" msgstr "git-clone - 克隆一个仓库到新目录"
   
#. type: Plain text #. type: Plain text
#: en/git-clone.txt:21 #: en/git-clone.txt:21
...@@ -15215,7 +15171,7 @@ msgstr "初始化稀疏检出文件，以便工作目录仅从存储库根目录 ...@@ -15215,7 +15171,7 @@ msgstr "初始化稀疏检出文件，以便工作目录仅从存储库根目录
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:175 en/git-pack-objects.txt:300 en/rev-list-options.txt:930 #: en/git-clone.txt:175 en/git-pack-objects.txt:300 en/rev-list-options.txt:930
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "--filter=<filter-spec>" msgid "--filter=<filter-spec>"
msgstr "--filter=<过滤器定义>" msgstr "--filter=<过滤器定义>"
   
...@@ -15251,13 +15207,13 @@ msgstr "建立源存储库的镜像。这默认包含 `--bare` 选项。与 `--b ...@@ -15251,13 +15207,13 @@ msgstr "建立源存储库的镜像。这默认包含 `--bare` 选项。与 `--b
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:198 #: en/git-clone.txt:198
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "-o <name>" msgid "-o <name>"
msgstr "-o <名称>" msgstr "-o <名称>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:199 #: en/git-clone.txt:199
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "--origin <name>" msgid "--origin <name>"
msgstr "--origin <名称>" msgstr "--origin <名称>"
   
...@@ -15269,7 +15225,7 @@ msgstr "不使用远程名称`origin`来跟踪远程仓库，而使用`<name>` ...@@ -15269,7 +15225,7 @@ msgstr "不使用远程名称`origin`来跟踪远程仓库，而使用`<name>`
   
#. type: Labeled list #. type: Labeled list
#: en/git-clone.txt:204 #: en/git-clone.txt:204
#, fuzzy, no-wrap, priority:300 #, no-wrap, priority:300
msgid "-b <name>" msgid "-b <name>"
msgstr "-b <名称>" msgstr "-b <名称>"
   
...@@ -15827,9 +15783,9 @@ msgstr "" ...@@ -15827,9 +15783,9 @@ msgstr ""
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit-tree.txt:57 en/git-commit.txt:167 en/git-fmt-merge-msg.txt:51 en/git-merge.txt:86 en/git-notes.txt:140 en/git-tag.txt:170 #: en/git-commit-tree.txt:57 en/git-commit.txt:167 en/git-fmt-merge-msg.txt:51 en/git-merge.txt:86 en/git-notes.txt:140 en/git-tag.txt:170
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-F <file>" msgid "-F <file>"
msgstr "-F <file>" msgstr "-F <文件>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit-tree.txt:61 #: en/git-commit-tree.txt:61
...@@ -15917,7 +15873,7 @@ msgstr "git-commit - 记录仓库的修改" ...@@ -15917,7 +15873,7 @@ msgstr "git-commit - 记录仓库的修改"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:19 #: en/git-commit.txt:19
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
msgid "" msgid ""
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n" "\t [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n"
...@@ -15927,14 +15883,7 @@ msgid "" ...@@ -15927,14 +15883,7 @@ msgid ""
"\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" "\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
"\t [--] [<pathspec>...]\n" "\t [--] [<pathspec>...]\n"
msgstr "" msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n\t [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|reword):]<提交>)]\n\t [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n\t [--allow-empty-message] [--no-verify] [-e] [--author=<提交人>]\n\t [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n\t [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n\t [--] [<路径>...]\n"
"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n"
"\t [--dry-run] [(-c | -C | --fixup | --squash) <提交>]\n"
"\t [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n"
"\t [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n"
"\t [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n"
"\t [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
"\t [-S[<keyid>]] [--] [<路径>...]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:28 #: en/git-commit.txt:28
...@@ -16005,15 +15954,15 @@ msgstr "使用交互式补丁选择界面来选择要提交的修改。详情见 ...@@ -16005,15 +15954,15 @@ msgstr "使用交互式补丁选择界面来选择要提交的修改。详情见
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:79 #: en/git-commit.txt:79
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-C <commit>" msgid "-C <commit>"
msgstr "-C <commit>" msgstr "-C <提交>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:80 #: en/git-commit.txt:80
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--reuse-message=<commit>" msgid "--reuse-message=<commit>"
msgstr "--reuse-message=<commit>" msgstr "--reuse-message=<提交>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:84 #: en/git-commit.txt:84
...@@ -16031,7 +15980,7 @@ msgstr "-c <commit>" ...@@ -16031,7 +15980,7 @@ msgstr "-c <commit>"
#: en/git-commit.txt:86 #: en/git-commit.txt:86
#, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--reedit-message=<commit>" msgid "--reedit-message=<commit>"
msgstr "--reedit-message=<commit>。" msgstr "--reedit-message=<commit>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:89 #: en/git-commit.txt:89
...@@ -16077,9 +16026,9 @@ msgstr "当被 `git rebase --autosquash` 应用时，\"fixup!\"和 \"amend!\"提 ...@@ -16077,9 +16026,9 @@ msgstr "当被 `git rebase --autosquash` 应用时，\"fixup!\"和 \"amend!\"提
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:129 #: en/git-commit.txt:129
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--squash=<commit>" msgid "--squash=<commit>"
msgstr "--squash=<commit>" msgstr "--squash=<提交>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:135 #: en/git-commit.txt:135
...@@ -16155,9 +16104,9 @@ msgstr "当显示 \"short \"或 \"porcelain \"状态输出时，逐字打印文 ...@@ -16155,9 +16104,9 @@ msgstr "当显示 \"short \"或 \"porcelain \"状态输出时，逐字打印文
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:168 en/git-merge.txt:87 en/git-notes.txt:141 en/git-tag.txt:171 #: en/git-commit.txt:168 en/git-merge.txt:87 en/git-notes.txt:141 en/git-tag.txt:171
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--file=<file>" msgid "--file=<file>"
msgstr "--file=<file>" msgstr "--file=<文件>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:171 #: en/git-commit.txt:171
...@@ -16167,9 +16116,9 @@ msgstr "从给定文件中获取提交信息。 使用'-'可以从标准输入 ...@@ -16167,9 +16116,9 @@ msgstr "从给定文件中获取提交信息。 使用'-'可以从标准输入
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:172 #: en/git-commit.txt:172
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--author=<author>" msgid "--author=<author>"
msgstr "--author=<author>" msgstr "--author=<提交人>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:178 #: en/git-commit.txt:178
...@@ -16179,9 +16128,9 @@ msgstr "覆盖提交者。使用标准的`A U Thor <author@example.com>`格式 ...@@ -16179,9 +16128,9 @@ msgstr "覆盖提交者。使用标准的`A U Thor <author@example.com>`格式
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:179 #: en/git-commit.txt:179
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--date=<date>" msgid "--date=<date>"
msgstr "--date=<date>" msgstr "--date=<日期>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:181 #: en/git-commit.txt:181
...@@ -16191,9 +16140,9 @@ msgstr "覆盖提交中使用的作者日期。" ...@@ -16191,9 +16140,9 @@ msgstr "覆盖提交中使用的作者日期。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:182 en/git-merge.txt:70 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162 #: en/git-commit.txt:182 en/git-merge.txt:70 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-m <msg>" msgid "-m <msg>"
msgstr "-m <msg>" msgstr "-m <消息>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:183 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163 #: en/git-commit.txt:183 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
...@@ -16215,15 +16164,15 @@ msgstr "m \"选项与 \"c\"、\"C \"和 \"F \"相互排斥。" ...@@ -16215,15 +16164,15 @@ msgstr "m \"选项与 \"c\"、\"C \"和 \"F \"相互排斥。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:190 #: en/git-commit.txt:190
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-t <file>" msgid "-t <file>"
msgstr "-t <file>" msgstr "-t <文件>"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:191 #: en/git-commit.txt:191
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--template=<file>" msgid "--template=<file>"
msgstr "--template=<file>" msgstr "--template=<文件>"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:200 #: en/git-commit.txt:200
...@@ -16233,9 +16182,9 @@ msgstr "编辑提交信息时，以给定文件中的内容启动编辑器。 ` ...@@ -16233,9 +16182,9 @@ msgstr "编辑提交信息时，以给定文件中的内容启动编辑器。 `
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:203 en/git-interpret-trailers.txt:85 #: en/git-commit.txt:203 en/git-interpret-trailers.txt:85
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--trailer <token>[(=|:)<value>]" msgid "--trailer <token>[(=|:)<value>]"
msgstr "--trailer <token>[(=|:)<value>]" msgstr "--trailer <令牌>[(=|:)<值>]"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:213 #: en/git-commit.txt:213
...@@ -16371,9 +16320,9 @@ msgstr "通过创建一个新的提交来替换当前分支的顶端。记录的 ...@@ -16371,9 +16320,9 @@ msgstr "通过创建一个新的提交来替换当前分支的顶端。记录的
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:285 #: en/git-commit.txt:285
#, priority:280 #, fuzzy, priority:280
msgid "It is a rough equivalent for:" msgid "It is a rough equivalent for:"
msgstr "它是一个粗略的等价物。" msgstr "它大致相当于："
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:289 #: en/git-commit.txt:289
...@@ -16409,7 +16358,7 @@ msgstr "--no-post-rewrite" ...@@ -16409,7 +16358,7 @@ msgstr "--no-post-rewrite"
#: en/git-commit.txt:300 #: en/git-commit.txt:300
#, priority:280 #, priority:280
msgid "Bypass the post-rewrite hook." msgid "Bypass the post-rewrite hook."
msgstr "绕过post-rewrite钩子" msgstr "绕过post-rewrite钩子。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:302 #: en/git-commit.txt:302
...@@ -16437,15 +16386,15 @@ msgstr "在提交时，只取命令行上指定的工作树的最新内容，而 ...@@ -16437,15 +16386,15 @@ msgstr "在提交时，只取命令行上指定的工作树的最新内容，而
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:335 en/git-status.txt:58 #: en/git-commit.txt:335 en/git-status.txt:58
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "-u[<mode>]" msgid "-u[<mode>]"
msgstr "-u[<mode>]" msgstr "-u[<模式>]"
   
#. type: Labeled list #. type: Labeled list
#: en/git-commit.txt:336 en/git-status.txt:59 #: en/git-commit.txt:336 en/git-status.txt:59
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--untracked-files[=<mode>]" msgid "--untracked-files[=<mode>]"
msgstr "--untracked-files[=<mode>]" msgstr "--untracked-files[=<模式>]"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:338 en/git-status.txt:61 #: en/git-commit.txt:338 en/git-status.txt:61
...@@ -16463,7 +16412,7 @@ msgstr "模式参数是可选的（默认为 \"所有\"），用于指定对未 ...@@ -16463,7 +16412,7 @@ msgstr "模式参数是可选的（默认为 \"所有\"），用于指定对未
#: en/git-commit.txt:345 en/git-status.txt:68 en/git-status.txt:110 #: en/git-commit.txt:345 en/git-status.txt:68 en/git-status.txt:110
#, priority:280 #, priority:280
msgid "The possible options are:" msgid "The possible options are:"
msgstr "可能的选择是。" msgstr "可选项："
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:347 #: en/git-commit.txt:347
...@@ -16545,23 +16494,19 @@ msgstr "当命令行中给出pathspec时，提交符合pathspec的文件内容 ...@@ -16545,23 +16494,19 @@ msgstr "当命令行中给出pathspec时，提交符合pathspec的文件内容
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:422 #: en/git-commit.txt:422
#, priority:280 #, fuzzy, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:" msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
msgstr "在记录自己的工作时，工作树中修改过的文件的内容会通过'git add'暂时存储到一个叫做 \"index \"的暂存区域。 一个文件可以用`git restore --staged <file>`恢复到上次提交时的状态，只是在索引中，而不是在工作树中，这实际上是恢复了'git add'，并阻止这个文件的修改参与下一次提交。 在用这些命令建立了要增量提交的状态后，`git commit`（没有任何路径名参数）被用来记录到目前为止已经分阶段提交的内容。 这是该命令最基本的形式。 一个例子。" msgstr "在记录自己的工作时，工作树中修改过的文件的内容会通过'git add'暂时存储到一个叫做 \"index \"的暂存区域。 一个文件可以用`git restore --staged <file>`恢复到上次提交时的状态，只是在索引中，而不是在工作树中，这实际上是恢复了'git add'，并阻止这个文件的修改参与下一次提交。 在用这些命令建立了要增量提交的状态后，`git commit`（没有任何路径名参数）被用来记录到目前为止已经分阶段提交的内容。 这是该命令最基本的形式。例如："
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:428 #: en/git-commit.txt:428
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "" msgid ""
"$ edit hello.c\n" "$ edit hello.c\n"
"$ git rm goodbye.c\n" "$ git rm goodbye.c\n"
"$ git add hello.c\n" "$ git add hello.c\n"
"$ git commit\n" "$ git commit\n"
msgstr "" msgstr "$ edit hello.c\n$ git rm goodbye.c\n$ git add hello.c\n$ git commit\n"
"$ edit hello.c\n"
"$ git rm goodbye.c\n"
"$ git add hello.c\n"
"$ git commit\n"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:436 #: en/git-commit.txt:436
...@@ -16571,15 +16516,12 @@ msgstr "你可以告诉`git commit`注意到工作树中内容被跟踪的文件 ...@@ -16571,15 +16516,12 @@ msgstr "你可以告诉`git commit`注意到工作树中内容被跟踪的文件
   
#. type: delimited block - #. type: delimited block -
#: en/git-commit.txt:441 #: en/git-commit.txt:441
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "" msgid ""
"$ edit hello.c\n" "$ edit hello.c\n"
"$ rm goodbye.c\n" "$ rm goodbye.c\n"
"$ git commit -a\n" "$ git commit -a\n"
msgstr "" msgstr "$ edit hello.c\n$ rm goodbye.c\n$ git commit -a\n"
"$ edit hello.c\n"
"$ rm goodbye.c\n"
"$ git commit -a\n"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:446 #: en/git-commit.txt:446
...@@ -16689,9 +16631,9 @@ msgstr "" ...@@ -16689,9 +16631,9 @@ msgstr ""
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:516 #: en/git-commit.txt:516
#, fuzzy, priority:280 #, priority:280
msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)" msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
msgstr "(nb \"<\", \">\" and \"\\n\"s are stripped)" msgstr "（注意\"<\"、\">\" 和 \"\\n\" 被剥离）"
   
#. type: Plain text #. type: Plain text
#: en/git-commit.txt:522 #: en/git-commit.txt:522
...@@ -16790,23 +16732,7 @@ msgid "" ...@@ -16790,23 +16732,7 @@ msgid ""
"'git config' [<file-option>] --get-color <name> [<default>]\n" "'git config' [<file-option>] --get-color <name> [<default>]\n"
"'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n" "'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n"
"'git config' [<file-option>] -e | --edit\n" "'git config' [<file-option>] -e | --edit\n"
msgstr "" msgstr "'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n'git config' [<file-option>] [--type=<type>] --add <name> <value>\n'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n'git config' [<file-option>] --rename-section <old-name> <new-name>\n'git config' [<file-option>] --remove-section <name>\n'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n'git config' [<file-option>] --get-color <name> [<default>]\n'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n'git config' [<file-option>] -e | --edit\n"
"'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]\n"
"'git config' [<file-option>] [--type=<type>] --add <name> <value>\n"
"'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]\n"
"'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>\n"
"'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]\n"
"'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]\n"
"'git config' [<file-option>] --rename-section <old-name> <new-name>\n"
"'git config' [<file-option>] --remove-section <name>\n"
"'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list\n"
"'git config' [<file-option>] --get-color <name> [<default>]\n"
"'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]\n"
"'git config' [<file-option>] -e | --edit\n"
"# file-opon:配置文件；\n"
   
#. type: Plain text #. type: Plain text
#: en/git-config.txt:33 #: en/git-config.txt:33
...@@ -17533,9 +17459,9 @@ msgstr "" ...@@ -17533,9 +17459,9 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-config.txt:397 en/git-cvsserver.txt:308 en/git-daemon.txt:333 en/git-http-backend.txt:257 en/git-notes.txt:326 en/git-upload-pack.txt:51 #: en/git-config.txt:397 en/git-cvsserver.txt:308 en/git-daemon.txt:333 en/git-http-backend.txt:257 en/git-notes.txt:326 en/git-upload-pack.txt:51
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "ENVIRONMENT" msgid "ENVIRONMENT"
msgstr "环境" msgstr "环境变量"
   
#. type: Labeled list #. type: Labeled list
#: en/git-config.txt:399 #: en/git-config.txt:399
...@@ -17855,9 +17781,9 @@ msgstr "" ...@@ -17855,9 +17781,9 @@ msgstr ""
   
#. type: Title - #. type: Title -
#: en/git-config.txt:570 en/git-describe.txt:202 en/git-fetch.txt:296 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:240 en/git-replace.txt:139 en/git-rm.txt:190 en/git-svn.txt:1150 en/git-worktree.txt:499 #: en/git-config.txt:570 en/git-describe.txt:202 en/git-fetch.txt:296 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:240 en/git-replace.txt:139 en/git-rm.txt:190 en/git-svn.txt:1150 en/git-worktree.txt:499
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "BUGS" msgid "BUGS"
msgstr "错误" msgstr "漏洞"
   
#. type: Plain text #. type: Plain text
#: en/git-config.txt:575 #: en/git-config.txt:575
...@@ -18004,7 +17930,7 @@ msgstr "" ...@@ -18004,7 +17930,7 @@ msgstr ""
#, fuzzy, no-wrap, priority:90 #, fuzzy, no-wrap, priority:90
#| msgid "git-credential-cache--daemon(1)" #| msgid "git-credential-cache--daemon(1)"
msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n" msgid "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
msgstr "git-credential-cache--daemon(1)" msgstr "'git credential-cache{litdd}daemon' [--debug] <socket-path>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-credential-cache--daemon.txt:18 #: en/git-credential-cache--daemon.txt:18
...@@ -21444,9 +21370,9 @@ msgstr "git-diff(1)" ...@@ -21444,9 +21370,9 @@ msgstr "git-diff(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:7 #: en/git-diff.txt:7
#, fuzzy, priority:280 #, priority:280
msgid "git-diff - Show changes between commits, commit and working tree, etc" msgid "git-diff - Show changes between commits, commit and working tree, etc"
msgstr "git-diff - Show changes between commits, commit and working tree, etc" msgstr "git-diff - 显示提交和工作区等变化"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:18 #: en/git-diff.txt:18
...@@ -21555,7 +21481,7 @@ msgstr "如果给出了 --merge-base，则使用两个提交的合并基础作 ...@@ -21555,7 +21481,7 @@ msgstr "如果给出了 --merge-base，则使用两个提交的合并基础作
#: en/git-diff.txt:78 #: en/git-diff.txt:78
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]" msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
msgstr "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]" msgstr "'git diff' [<选项>] <提交> <提交>... <提交> [--] [<路径>...]"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:86 #: en/git-diff.txt:86
...@@ -21568,7 +21494,7 @@ msgstr "这个表单是用来查看合并提交的结果。 第一个列出的< ...@@ -21568,7 +21494,7 @@ msgstr "这个表单是用来查看合并提交的结果。 第一个列出的<
#: en/git-diff.txt:87 #: en/git-diff.txt:87
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" msgstr "'git diff' [<选项>] <提交>..<提交> [--] [<路径>...]"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:93 #: en/git-diff.txt:93
...@@ -21578,9 +21504,9 @@ msgstr "这与早期的形式（没有`.`）是同义的，用于查看两个任 ...@@ -21578,9 +21504,9 @@ msgstr "这与早期的形式（没有`.`）是同义的，用于查看两个任
   
#. type: Labeled list #. type: Labeled list
#: en/git-diff.txt:94 #: en/git-diff.txt:94
#, fuzzy, ignore-ellipsis, no-wrap, priority:280 #, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" msgstr "'git diff' [<选项>] <提交>\\...<提交> [--] [<路径>...]"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:101 #: en/git-diff.txt:101
...@@ -21602,9 +21528,9 @@ msgstr "关于<commit>的更完整的拼写方式，见linkgit:gitrevisions[7] ...@@ -21602,9 +21528,9 @@ msgstr "关于<commit>的更完整的拼写方式，见linkgit:gitrevisions[7]
   
#. type: Labeled list #. type: Labeled list
#: en/git-diff.txt:114 #: en/git-diff.txt:114
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>" msgid "'git diff' [<options>] <blob> <blob>"
msgstr "'git diff' [<options>] <blob> <blob>" msgstr "'git diff' [<选项>] <blob> <blob>"
   
#. type: Plain text #. type: Plain text
#: en/git-diff.txt:118 #: en/git-diff.txt:118
...@@ -41643,16 +41569,12 @@ msgstr "git-read-tree - Reads tree information into the index" ...@@ -41643,16 +41569,12 @@ msgstr "git-read-tree - Reads tree information into the index"
   
#. type: Plain text #. type: Plain text
#: en/git-read-tree.txt:15 #: en/git-read-tree.txt:15
#, fuzzy, no-wrap, priority:80 #, no-wrap, priority:80
msgid "" msgid ""
"'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n" "'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n"
"\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n" "\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
msgstr "" msgstr "'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)\n\t\t[-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]\n"
"\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n"
"\t\t[--index-output=<file>] [--no-sparse-checkout]\n"
"\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
   
#. type: Plain text #. type: Plain text
#: en/git-read-tree.txt:22 #: en/git-read-tree.txt:22
...@@ -46705,9 +46627,9 @@ msgstr "关于这三个命令的区别，见linkgit:git[1]中的 \"重置、恢 ...@@ -46705,9 +46627,9 @@ msgstr "关于这三个命令的区别，见linkgit:git[1]中的 \"重置、恢
   
#. type: Plain text #. type: Plain text
#: en/git-reset.txt:110 #: en/git-reset.txt:110
#, priority:280 #, fuzzy, priority:280
msgid "Be quiet, only report errors." msgid "Be quiet, only report errors."
msgstr "" msgstr "静默，只报告错误。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-reset.txt:112 #: en/git-reset.txt:112
...@@ -47197,7 +47119,7 @@ msgstr "最后创建最后的提交。" ...@@ -47197,7 +47119,7 @@ msgstr "最后创建最后的提交。"
#: en/git-reset.txt:384 #: en/git-reset.txt:384
#, priority:280 #, priority:280
msgid "The tables below show what happens when running:" msgid "The tables below show what happens when running:"
msgstr "下面的表格显示了运行时发生的情况。" msgstr "下面的表格显示了运行时发生的情况："
   
#. type: delimited block - #. type: delimited block -
#: en/git-reset.txt:387 #: en/git-reset.txt:387
...@@ -48327,7 +48249,7 @@ msgstr "当应用于\"--分支\"、\"--标签 \"或\"--远程 \"时，给出的 ...@@ -48327,7 +48249,7 @@ msgstr "当应用于\"--分支\"、\"--标签 \"或\"--远程 \"时，给出的
#: en/git-rev-parse.txt:200 en/rev-list-options.txt:198 #: en/git-rev-parse.txt:200 en/rev-list-options.txt:198
#, no-wrap, priority:260 #, no-wrap, priority:260
msgid "--exclude-hidden=[receive|uploadpack]" msgid "--exclude-hidden=[receive|uploadpack]"
msgstr "" msgstr "--exclude-hidden=[receive|uploadpack]"
   
#. type: Plain text #. type: Plain text
#: en/git-rev-parse.txt:206 en/rev-list-options.txt:204 #: en/git-rev-parse.txt:206 en/rev-list-options.txt:204
...@@ -48939,7 +48861,7 @@ msgstr "git-rm(1)" ...@@ -48939,7 +48861,7 @@ msgstr "git-rm(1)"
#: en/git-rm.txt:7 #: en/git-rm.txt:7
#, fuzzy, priority:280 #, fuzzy, priority:280
msgid "git-rm - Remove files from the working tree and from the index" msgid "git-rm - Remove files from the working tree and from the index"
msgstr "git-rm - Remove files from the working tree and from the index" msgstr "git-rm - 从工作树和索引中删除文件"
   
#. type: Plain text #. type: Plain text
#: en/git-rm.txt:14 #: en/git-rm.txt:14
...@@ -49033,9 +48955,9 @@ msgstr "删除从文件系统中消失的文件" ...@@ -49033,9 +48955,9 @@ msgstr "删除从文件系统中消失的文件"
   
#. type: Plain text #. type: Plain text
#: en/git-rm.txt:106 #: en/git-rm.txt:106
#, fuzzy, priority:280 #, priority:280
msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done." msgid "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done."
msgstr "There is no option for `git rm` to remove from the index only the paths that have disappeared from the filesystem. However, depending on the use case, there are several ways that can be done." msgstr "`git rm`没有选项可以从索引中只删除已经从文件系统中消失的路径。然而，根据不同的使用情况，有几种方法可以做到这一点。"
   
#. type: Title ~ #. type: Title ~
#: en/git-rm.txt:108 #: en/git-rm.txt:108
...@@ -50666,7 +50588,7 @@ msgstr "`trailer:<field>`，`<field>`被解释为不区分大小写的提交消 ...@@ -50666,7 +50588,7 @@ msgstr "`trailer:<field>`，`<field>`被解释为不区分大小写的提交消
#: en/git-shortlog.txt:70 #: en/git-shortlog.txt:70
#, priority:260 #, 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].)" msgid "`format:<format>`, any string accepted by the `--format` option of 'git log'. (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
msgstr "`格式：<format>`可以是任何被'git log'的`--format'选项接受的字符串，比如'* [%h] %s'。 参见linkgit:git-log[1]的 \"PRETTY FORMATS \"部分）。" msgstr "`格式：<format>`可以是任何被'git log'的`--format'选项接受的字符串，比如'* [%h] %s'。 参见linkgit:git-log[1]的 \"PRETTY FORMATS \"部分）。"
   
#. type: Plain text #. type: Plain text
#: en/git-shortlog.txt:75 #: en/git-shortlog.txt:75
...@@ -52391,9 +52313,9 @@ msgstr "在寻找变化时忽略子模块的变化。<when>可以是 \"none\"、 ...@@ -52391,9 +52313,9 @@ msgstr "在寻找变化时忽略子模块的变化。<when>可以是 \"none\"、
   
#. type: Labeled list #. type: Labeled list
#: en/git-status.txt:102 #: en/git-status.txt:102
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
msgid "--ignored[=<mode>]" msgid "--ignored[=<mode>]"
msgstr "--ignored[=<mode>]" msgstr "--ignored[=<模式>]"
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:104 #: en/git-status.txt:104
...@@ -52653,33 +52575,7 @@ msgstr "'U'=更新但未合并" ...@@ -52653,33 +52575,7 @@ msgstr "'U'=更新但未合并"
   
#. type: delimited block . #. type: delimited block .
#: en/git-status.txt:245 #: en/git-status.txt:245
#, fuzzy, no-wrap, priority:280 #, no-wrap, priority:280
#| msgid ""
#| "X Y Meaning\n"
#| "-------------------------------------------------\n"
#| "\t [AMD] not updated\n"
#| "M [ MD] updated in index\n"
#| "A [ MD] added to index\n"
#| "D deleted from index\n"
#| "R [ MD] renamed in index\n"
#| "C [ MD] copied in index\n"
#| "[MARC] index and work tree matches\n"
#| "[ MARC] M work tree changed since index\n"
#| "[ MARC] D deleted in work tree\n"
#| "[ D] R renamed in work tree\n"
#| "[ D] C copied in work tree\n"
#| "-------------------------------------------------\n"
#| "D D unmerged, both deleted\n"
#| "A U unmerged, added by us\n"
#| "U D unmerged, deleted by them\n"
#| "U A unmerged, added by them\n"
#| "D U unmerged, deleted by us\n"
#| "A A unmerged, both added\n"
#| "U U unmerged, both modified\n"
#| "-------------------------------------------------\n"
#| "? ? untracked\n"
#| "! ! ignored\n"
#| "-------------------------------------------------\n"
msgid "" msgid ""
"X Y Meaning\n" "X Y Meaning\n"
"-------------------------------------------------\n" "-------------------------------------------------\n"
...@@ -52708,32 +52604,7 @@ msgid "" ...@@ -52708,32 +52604,7 @@ msgid ""
"? ? untracked\n" "? ? untracked\n"
"! ! ignored\n" "! ! ignored\n"
"-------------------------------------------------\n" "-------------------------------------------------\n"
msgstr "" msgstr "X Y的含义\n-------------------------------------------------\n\t [AMD]未更新\nM [MTD] 在索引中更新\nT [MTD] 类型在索引中有所改变\nA [MTD] 添加到索引中\nD 从索引中删除\nR [MTD] 在索引中重新命名\nC [MTD] 在索引中被复制\n[MTARC] 索引和工作树匹配\n[MTARC] 自索引以来，M工作树发生了变化\n[MTARC] 工作树中的T类型自索引以来发生了变化\n[MTARC] D在工作树中被删除\n\t R在工作树中重新命名\n\t C在工作树中被复制\n-------------------------------------------------\nD D未合并，均已删除\nA U 未合并，由我们添加\nU D未合并，被他人删除\nU A 未合并，由他人添加\nD U未合并，被我们删除\nA A未合并，都被添加\nU U未合并，都被修改\n-------------------------------------------------\n? 未被追踪的\n! 忽略不计\n-------------------------------------------------\n"
"X Y的含义\n"
"-------------------------------------------------\n"
"\t [AMD]未更新\n"
"M [MD] 在索引中更新\n"
"A [MD] 添加到索引中\n"
"D 从索引中删除\n"
"R [MD] 在索引中重新命名\n"
"C [MD] 在索引中被复制\n"
"[MARC] 索引和工作树相匹配\n"
"[MARC] M工作树自索引以来发生了变化\n"
"[MARC] D在工作树中被删除\n"
"[D] R在工作树中重新命名\n"
"[D] C在工作树中被复制\n"
"-------------------------------------------------\n"
"D D未合并，均已删除\n"
"A U 未合并，由我们添加\n"
"U D 未合并，被他们删除\n"
"U A 未合并，由他们添加\n"
"D U未合并，被我们删除\n"
"A A未合并，都被添加\n"
"U U未合并，都被修改\n"
"-------------------------------------------------\n"
"? 未被追踪的\n"
"! 忽略不计\n"
"-------------------------------------------------\n"
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:254 #: en/git-status.txt:254
...@@ -53114,9 +52985,9 @@ msgstr "默认情况下，`git status`会自动刷新索引，更新工作树上 ...@@ -53114,9 +52985,9 @@ msgstr "默认情况下，`git status`会自动刷新索引，更新工作树上
   
#. type: Title - #. type: Title -
#: en/git-status.txt:461 #: en/git-status.txt:461
#, no-wrap, priority:280 #, fuzzy, no-wrap, priority:280
msgid "UNTRACKED FILES AND PERFORMANCE" msgid "UNTRACKED FILES AND PERFORMANCE"
msgstr "" msgstr "未跟踪的文件和性能"
   
#. type: Plain text #. type: Plain text
#: en/git-status.txt:472 #: en/git-status.txt:472
...@@ -56920,20 +56791,14 @@ msgstr "git - 傻瓜式内容追踪器" ...@@ -56920,20 +56791,14 @@ msgstr "git - 傻瓜式内容追踪器"
   
#. type: Plain text #. type: Plain text
#: en/git.txt:17 #: en/git.txt:17
#, fuzzy, no-wrap, priority:100 #, no-wrap, priority:100
msgid "" msgid ""
"'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" "'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" " [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--config-env=<name>=<envvar>] <command> [<args>]\n" " [--config-env=<name>=<envvar>] <command> [<args>]\n"
msgstr "" msgstr "'git' [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n [--config-env=<name>=<envvar>] <command> [<args>]\n"
"'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]\n"
   
#. type: Plain text #. type: Plain text
#: en/git.txt:23 #: en/git.txt:23
...@@ -61452,7 +61317,7 @@ msgstr "" ...@@ -61452,7 +61317,7 @@ msgstr ""
   
#. type: delimited block - #. type: delimited block -
#: en/git-worktree.txt:419 #: en/git-worktree.txt:419
#, fuzzy, no-wrap, priority:240 #, no-wrap, priority:240
msgid "" msgid ""
"$ git worktree list --verbose\n" "$ git worktree list --verbose\n"
"/path/to/linked-worktree abcd1234 [master]\n" "/path/to/linked-worktree abcd1234 [master]\n"
...@@ -61461,11 +61326,7 @@ msgid "" ...@@ -61461,11 +61326,7 @@ msgid ""
"\tlocked: worktree path is mounted on a portable device\n" "\tlocked: worktree path is mounted on a portable device\n"
"/path/to/prunable-worktree 5678abc1 (detached HEAD)\n" "/path/to/prunable-worktree 5678abc1 (detached HEAD)\n"
"\tprunable: gitdir file points to non-existent location\n" "\tprunable: gitdir file points to non-existent location\n"
msgstr "" msgstr "$ git worktree list --verbose\n/path/to/linked-worktree abcd1234 [master]\n/path/to/locked-worktree-no-reason abcd5678 (分离的 HEAD) locked\n/path/to/locked-worktree-with-reason 1234abcd (brancha)\n\t锁定：工作区路径被安装在一个可移动设备上\n/path/to/prunable-worktree 5678abc1 (分离的 HEAD)\n\t可修剪：gitdir 文件指向不存在的位置\n"
"$ git worktree list\n"
"/path/to/bare-source (bare)\n"
"/path/to/linked-worktree abcd1234 [master]\n"
"/path/to/other-linked-worktree 1234abc (detached HEAD)\n"
   
#. type: Plain text #. type: Plain text
#: en/git-worktree.txt:424 #: en/git-worktree.txt:424
...@@ -62355,7 +62216,7 @@ msgstr "不区分大小写的匹配。" ...@@ -62355,7 +62216,7 @@ msgstr "不区分大小写的匹配。"
#: en/glossary-content.txt:382 #: en/glossary-content.txt:382
#, no-wrap, priority:310 #, no-wrap, priority:310
msgid "glob" msgid "glob"
msgstr "通配符(glob)" msgstr "通配符"
   
#. type: Plain text #. type: Plain text
#: en/glossary-content.txt:389 #: en/glossary-content.txt:389
...@@ -64305,7 +64166,7 @@ msgstr "'%an'" ...@@ -64305,7 +64166,7 @@ msgstr "'%an'"
#: en/pretty-formats.txt:188 #: en/pretty-formats.txt:188
#, fuzzy, priority:260 #, fuzzy, priority:260
msgid "author name" msgid "author name"
msgstr "è½¯æ‰“æ · ：" msgstr "提交人"
   
#. type: Labeled list #. type: Labeled list
#: en/pretty-formats.txt:188 #: en/pretty-formats.txt:188
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr