Skip to content
Snippets Groups Projects
Unverified Commit e7a35d51 authored by 秃头灯笼鱼's avatar 秃头灯笼鱼 Committed by Hosted Weblate
Browse files

Translated using Weblate (Chinese (Simplified)) 

Currently translated at 54.2% (5991 of 11052 strings)

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


Signed-off-by: default avatar秃头灯笼鱼 <ttdlyu@163.com>
parent 167598df
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
po/documentation.zh_HANS-CN.po
+ 82
− 82
View file @ e7a35d51
...@@ -3,7 +3,7 @@ ...@@ -3,7 +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 "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-06-26 01:28+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18.1\n" msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-06-29 22:37+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18.1\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
...@@ -34390,7 +34390,7 @@ msgstr "<msg>" ...@@ -34390,7 +34390,7 @@ msgstr "<msg>"
#: en/git-mailinfo.txt:114 #: en/git-mailinfo.txt:114
#, priority:100 #, priority:100
msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject." msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
msgstr "" msgstr "从电子邮件中提取的提交日志信息，通常除了来自电子邮件主题的标题行。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailinfo.txt:115 #: en/git-mailinfo.txt:115
...@@ -34402,7 +34402,7 @@ msgstr "<patch>" ...@@ -34402,7 +34402,7 @@ msgstr "<patch>"
#: en/git-mailinfo.txt:117 #: en/git-mailinfo.txt:117
#, priority:100 #, priority:100
msgid "The patch extracted from e-mail." msgid "The patch extracted from e-mail."
msgstr "" msgstr "从电子邮件中提取的补丁。"
   
#. type: Title = #. type: Title =
#: en/git-mailsplit.txt:2 #: en/git-mailsplit.txt:2
...@@ -34414,7 +34414,7 @@ msgstr "git-mailsplit(1)" ...@@ -34414,7 +34414,7 @@ msgstr "git-mailsplit(1)"
#: en/git-mailsplit.txt:7 #: en/git-mailsplit.txt:7
#, priority:100 #, priority:100
msgid "git-mailsplit - Simple UNIX mbox splitter program" msgid "git-mailsplit - Simple UNIX mbox splitter program"
msgstr "" msgstr "git-mailsplit - 简单的UNIX mbox分割程序"
   
#. type: Plain text #. type: Plain text
#: en/git-mailsplit.txt:13 #: en/git-mailsplit.txt:13
...@@ -34422,19 +34422,19 @@ msgstr "" ...@@ -34422,19 +34422,19 @@ msgstr ""
msgid "" msgid ""
"'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n" "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n"
"\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n" "\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
msgstr "" msgstr "'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]\n\t\t-o<directory> [--] [(<mbox>|<Maildir>)...]\n"
   
#. type: Plain text #. type: Plain text
#: en/git-mailsplit.txt:18 #: en/git-mailsplit.txt:18
#, priority:100 #, priority:100
msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. in the specified directory so you can process them further from there." msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" .. in the specified directory so you can process them further from there."
msgstr "" msgstr "将一个 mbox 文件或一个 Maildir 分割成一个文件列表： \"0001\" \"0002\"...... 存放在指定的目录中，这样你就可以从那里进一步处理它们。"
   
#. type: Plain text #. type: Plain text
#: en/git-mailsplit.txt:21 #: en/git-mailsplit.txt:21
#, priority:100 #, priority:100
msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order." msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order."
msgstr "" msgstr "Maildir 分割依赖于文件名的排序，以便按照正确的顺序输出补丁。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:24 #: en/git-mailsplit.txt:24
...@@ -34446,7 +34446,7 @@ msgstr "<mbox>" ...@@ -34446,7 +34446,7 @@ msgstr "<mbox>"
#: en/git-mailsplit.txt:27 #: en/git-mailsplit.txt:27
#, priority:100 #, priority:100
msgid "Mbox file to split. If not given, the mbox is read from the standard input." msgid "Mbox file to split. If not given, the mbox is read from the standard input."
msgstr "" msgstr "要分割的 Mbox 文件。 如果没有给出，则从标准输入中读取 Mbox。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:28 #: en/git-mailsplit.txt:28
...@@ -34458,7 +34458,7 @@ msgstr "<Maildir>" ...@@ -34458,7 +34458,7 @@ msgstr "<Maildir>"
#: en/git-mailsplit.txt:31 #: en/git-mailsplit.txt:31
#, priority:100 #, priority:100
msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories." msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories."
msgstr "" msgstr "要分割的 Maildir 的根目录。这个目录应该包含 cur、tmp 和新的子目录。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:32 #: en/git-mailsplit.txt:32
...@@ -34470,13 +34470,13 @@ msgstr "-o<directory>" ...@@ -34470,13 +34470,13 @@ msgstr "-o<directory>"
#: en/git-mailsplit.txt:34 #: en/git-mailsplit.txt:34
#, priority:100 #, priority:100
msgid "Directory in which to place the individual messages." msgid "Directory in which to place the individual messages."
msgstr "" msgstr "放置各个信息的目录。"
   
#. type: Plain text #. type: Plain text
#: en/git-mailsplit.txt:38 #: en/git-mailsplit.txt:38
#, priority:100 #, priority:100
msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error." msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error."
msgstr "" msgstr "如果任何文件没有以发件人行开始，就假定它是一个单一的邮件信息，而不是说这是错误。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:39 #: en/git-mailsplit.txt:39
...@@ -34488,7 +34488,7 @@ msgstr "-d<prec>" ...@@ -34488,7 +34488,7 @@ msgstr "-d<prec>"
#: en/git-mailsplit.txt:43 #: en/git-mailsplit.txt:43
#, priority:100 #, priority:100
msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames." msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames."
msgstr "" msgstr "可以为生成的文件名指定不同的精度，而不是默认的带前导零的4位数。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:44 #: en/git-mailsplit.txt:44
...@@ -34500,7 +34500,7 @@ msgstr "-f<nn>" ...@@ -34500,7 +34500,7 @@ msgstr "-f<nn>"
#: en/git-mailsplit.txt:47 #: en/git-mailsplit.txt:47
#, priority:100 #, priority:100
msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004." msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004."
msgstr "" msgstr "跳过第一个 <nn>数字，例如如果指定了-f3，就从 0004 开始编号。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:48 #: en/git-mailsplit.txt:48
...@@ -34512,7 +34512,7 @@ msgstr "--keep-cr" ...@@ -34512,7 +34512,7 @@ msgstr "--keep-cr"
#: en/git-mailsplit.txt:50 #: en/git-mailsplit.txt:50
#, priority:100 #, priority:100
msgid "Do not remove `\\r` from lines ending with `\\r\\n`." msgid "Do not remove `\\r` from lines ending with `\\r\\n`."
msgstr "" msgstr "不要从以 `\\r\\n` 结尾的行中删除`\\r`。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mailsplit.txt:51 #: en/git-mailsplit.txt:51
...@@ -34524,7 +34524,7 @@ msgstr "--mboxrd" ...@@ -34524,7 +34524,7 @@ msgstr "--mboxrd"
#: en/git-mailsplit.txt:54 #: en/git-mailsplit.txt:54
#, priority:100 #, priority:100
msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed." msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
msgstr "" msgstr "输入是 \"mboxrd\" 格式，\"^>+From\" 行转义被颠倒。"
   
#. type: Title = #. type: Title =
#: en/git-merge-base.txt:2 #: en/git-merge-base.txt:2
...@@ -35173,7 +35173,7 @@ msgstr "git-merge-one-file(1)" ...@@ -35173,7 +35173,7 @@ msgstr "git-merge-one-file(1)"
#: en/git-merge-one-file.txt:7 #: en/git-merge-one-file.txt:7
#, priority:100 #, priority:100
msgid "git-merge-one-file - The standard helper program to use with git-merge-index" msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
msgstr "" msgstr "git-merge-one-file - 与 git-merge-index 一起使用的标准辅助程序。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-one-file.txt:13 #: en/git-merge-one-file.txt:13
...@@ -35185,19 +35185,19 @@ msgstr "'git merge-one-file'\n" ...@@ -35185,19 +35185,19 @@ msgstr "'git merge-one-file'\n"
#: en/git-merge-one-file.txt:18 #: en/git-merge-one-file.txt:18
#, priority:100 #, priority:100
msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'." msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'."
msgstr "" msgstr "这是标准的辅助程序，与 'git merge-index' 一起使用，以解决用 'git read-tree -m' 进行的琐碎合并后的合并问题。"
   
#. type: Title = #. type: Title =
#: en/git-mergetool--lib.txt:2 #: en/git-mergetool--lib.txt:2
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "git-mergetool{litdd}lib(1)" msgid "git-mergetool{litdd}lib(1)"
msgstr "" msgstr "git-mergetool{litdd}lib(1)"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:7 #: en/git-mergetool--lib.txt:7
#, priority:100 #, priority:100
msgid "git-mergetool--lib - Common Git merge tool shell scriptlets" msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
msgstr "" msgstr "git-mergetool--lib - 常见的 Git 合并工具壳 shell 脚本程序"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:12 #: en/git-mergetool--lib.txt:12
...@@ -35209,19 +35209,19 @@ msgstr "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\" ...@@ -35209,19 +35209,19 @@ msgstr "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"
#: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19 #: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
#, priority:100 #, priority:100
msgid "This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones." msgid "This is not a command the end user would want to run. Ever. This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones."
msgstr "" msgstr "这不是一个终端用户想要运行的命令。 永远不会。 这个文档是为研究 Porcelain-ish 脚本和/或正在编写新脚本的人准备的。"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:23 #: en/git-mergetool--lib.txt:23
#, priority:100 #, priority:100
msgid "The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working with Git merge tools." msgid "The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working with Git merge tools."
msgstr "" msgstr "'git-mergetool{litdd}lib' 脚本被设计成可以被其他 shell 脚本引用（使用 `.`），以设置与 Git 合并工具一起工作的功能。"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:27 #: en/git-mergetool--lib.txt:27
#, priority:100 #, priority:100
msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. 'diff' and 'merge' are valid values." msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. 'diff' and 'merge' are valid values."
msgstr "" msgstr "在链接到 'git-mergetool{litdd}lib' 之前，你的脚本必须设置 `TOOL_MODE` 来定义下列函数的操作模式。 'diff' 和 'merge'是有效值。"
   
#. type: Title - #. type: Title -
#: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34 #: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34
...@@ -35233,37 +35233,37 @@ msgstr "功能" ...@@ -35233,37 +35233,37 @@ msgstr "功能"
#: en/git-mergetool--lib.txt:30 #: en/git-mergetool--lib.txt:30
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "get_merge_tool" msgid "get_merge_tool"
msgstr "" msgstr "get_merge_tool"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:34 #: en/git-mergetool--lib.txt:34
#, priority:100 #, priority:100
msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool." msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool."
msgstr "" msgstr "返回一个合并工具。如果我们返回一个被猜中的合并工具，返回代码为 1，否则为0。'$GIT_MERGETOOL_GUI' 可以被设置为 'true' 以搜索合适的 guitool。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mergetool--lib.txt:35 #: en/git-mergetool--lib.txt:35
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "get_merge_tool_cmd" msgid "get_merge_tool_cmd"
msgstr "" msgstr "get_merge_tool_cmd"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:37 #: en/git-mergetool--lib.txt:37
#, priority:100 #, priority:100
msgid "returns the custom command for a merge tool." msgid "returns the custom command for a merge tool."
msgstr "" msgstr "返回一个合并工具的自定义命令。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mergetool--lib.txt:38 #: en/git-mergetool--lib.txt:38
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "get_merge_tool_path" msgid "get_merge_tool_path"
msgstr "" msgstr "get_merge_tool_path"
   
#. type: Plain text #. type: Plain text
#: en/git-mergetool--lib.txt:40 #: en/git-mergetool--lib.txt:40
#, priority:100 #, priority:100
msgid "returns the custom path for a merge tool." msgid "returns the custom path for a merge tool."
msgstr "" msgstr "返回一个合并工具的自定义路径。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mergetool--lib.txt:41 #: en/git-mergetool--lib.txt:41
...@@ -35275,7 +35275,7 @@ msgstr "run_merge_tool" ...@@ -35275,7 +35275,7 @@ msgstr "run_merge_tool"
#: en/git-mergetool--lib.txt:44 #: en/git-mergetool--lib.txt:44
#, priority:100 #, priority:100
msgid "bring merge tool specific functions into scope so they can be used or overridden." msgid "bring merge tool specific functions into scope so they can be used or overridden."
msgstr "" msgstr "将合并工具的特定函数带入范围，以便它们可以被使用或重写。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-mergetool--lib.txt:45 #: en/git-mergetool--lib.txt:45
...@@ -35287,7 +35287,7 @@ msgstr "run_merge_tool" ...@@ -35287,7 +35287,7 @@ msgstr "run_merge_tool"
#: en/git-mergetool--lib.txt:50 #: en/git-mergetool--lib.txt:50
#, priority:100 #, priority:100
msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool." msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present. '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
msgstr "" msgstr "启动一个合并工具，给定工具名称和一个 true/false 标志，表示是否存在一个合并基础。 $MERGED'， '$LOCAL'，'$REMOTE' 和 '$BASE' 必须被定义，以便由合并工具使用。"
   
#. type: Title = #. type: Title =
#: en/git-mergetool.txt:2 #: en/git-mergetool.txt:2
...@@ -35453,11 +35453,11 @@ msgstr "git-merge-tree - Show three-way merge without touching index" ...@@ -35453,11 +35453,11 @@ msgstr "git-merge-tree - Show three-way merge without touching index"
msgid "" msgid ""
"'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n" "'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n"
"'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n" "'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n"
msgstr "" msgstr "'git merge-tree' [--write-tree] [<options>] <branch1> <branch2>\n'git merge-tree' [--trivial-merge] <base-tree> <branch1> <branch2> (deprecated)\n"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:23 #: en/git-merge-tree.txt:23
#, priority:100 #, fuzzy, priority:100
msgid "This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of this documentation describes modern `--write-tree` mode." msgid "This command has a modern `--write-tree` mode and a deprecated `--trivial-merge` mode. With the exception of the <<DEPMERGE,DEPRECATED DESCRIPTION>> section at the end, the rest of this documentation describes modern `--write-tree` mode."
msgstr " " msgstr " "
   
...@@ -35465,19 +35465,19 @@ msgstr "" ...@@ -35465,19 +35465,19 @@ msgstr ""
#: en/git-merge-tree.txt:26 #: en/git-merge-tree.txt:26
#, priority:100 #, priority:100
msgid "Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index." msgid "Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index."
msgstr "" msgstr "执行合并，但不做任何新的提交，也不从工作区或索引中读取或写入。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:29 #: en/git-merge-tree.txt:29
#, priority:100 #, priority:100
msgid "The performed merge will use the same feature as the \"real\" linkgit:git-merge[1], including:" msgid "The performed merge will use the same feature as the \"real\" linkgit:git-merge[1], including:"
msgstr "" msgstr "执行的合并将使用与 “真正的” linkgit:git-merge[1] 相同的功能，包括："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:31 #: en/git-merge-tree.txt:31
#, priority:100 #, priority:100
msgid "three way content merges of individual files" msgid "three way content merges of individual files"
msgstr "" msgstr "单个文件的多路合并"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:32 #: en/git-merge-tree.txt:32
...@@ -35490,37 +35490,37 @@ msgstr "--rename-section" ...@@ -35490,37 +35490,37 @@ msgstr "--rename-section"
#: en/git-merge-tree.txt:33 #: en/git-merge-tree.txt:33
#, priority:100 #, priority:100
msgid "proper directory/file conflict handling" msgid "proper directory/file conflict handling"
msgstr "" msgstr "正确处理目录/文件冲突"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:35 #: en/git-merge-tree.txt:35
#, priority:100 #, priority:100
msgid "recursive ancestor consolidation (i.e. when there is more than one merge base, creating a virtual merge base by merging the merge bases)" msgid "recursive ancestor consolidation (i.e. when there is more than one merge base, creating a virtual merge base by merging the merge bases)"
msgstr "" msgstr "递归祖先合并（即当有一个以上的合并基数时，通过合并基数创建一个虚拟合并基数）。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:36 #: en/git-merge-tree.txt:36
#, priority:100 #, priority:100
msgid "etc." msgid "etc."
msgstr "" msgstr "等等。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:39 #: en/git-merge-tree.txt:39
#, priority:100 #, priority:100
msgid "After the merge completes, a new toplevel tree object is created. See `OUTPUT` below for details." msgid "After the merge completes, a new toplevel tree object is created. See `OUTPUT` below for details."
msgstr "" msgstr "合并完成后，会创建一个新的顶层树对象。 详见下面的 “输出”。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:48 #: en/git-merge-tree.txt:48
#, priority:100 #, priority:100
msgid "Do not quote filenames in the <Conflicted file info> section, and end each filename with a NUL character rather than newline. Also begin the messages section with a NUL character instead of a newline. See <<OUTPUT>> below for more information." msgid "Do not quote filenames in the <Conflicted file info> section, and end each filename with a NUL character rather than newline. Also begin the messages section with a NUL character instead of a newline. See <<OUTPUT>> below for more information."
msgstr "" msgstr "在 <冲突文件信息> 部分不要引用文件名，每个文件名用 NUL 字符而不是换行来结束。 在信息部分也要用 NUL 字符而不是换行来开始。 更多信息见下面的 <<OUTPUT>>。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:55 #: en/git-merge-tree.txt:55
#, priority:100 #, priority:100
msgid "In the Conflicted file info section, instead of writing a list of (mode, oid, stage, path) tuples to output for conflicted files, just provide a list of filenames with conflicts (and do not list filenames multiple times if they have multiple conflicting stages)." msgid "In the Conflicted file info section, instead of writing a list of (mode, oid, stage, path) tuples to output for conflicted files, just provide a list of filenames with conflicts (and do not list filenames multiple times if they have multiple conflicting stages)."
msgstr "" msgstr "在冲突的文件信息部分，不要为冲突的文件写一个（mode, oid, stage, path）图元列表来输出，只需提供一个有冲突的文件名列表（如果文件有多个冲突的阶段，不多次列出文件名）。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-merge-tree.txt:56 #: en/git-merge-tree.txt:56
...@@ -35532,7 +35532,7 @@ msgstr "--[no-]messages" ...@@ -35532,7 +35532,7 @@ msgstr "--[no-]messages"
#: en/git-merge-tree.txt:61 #: en/git-merge-tree.txt:61
#, priority:100 #, priority:100
msgid "Write any informational messages such as \"Auto-merging <path>\" or CONFLICT notices to the end of stdout. If unspecified, the default is to include these messages if there are merge conflicts, and to omit them otherwise." msgid "Write any informational messages such as \"Auto-merging <path>\" or CONFLICT notices to the end of stdout. If unspecified, the default is to include these messages if there are merge conflicts, and to omit them otherwise."
msgstr "" msgstr "将任何信息性的消息，如\"Auto-merging <path>\" 或冲突通知写到标准输出流的末尾。 如果没有指定，默认情况下，如果有合并冲突，就包括这些信息，否则就省略它们。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-merge-tree.txt:62 en/merge-options.txt:200 #: en/git-merge-tree.txt:62 en/merge-options.txt:200
...@@ -35544,7 +35544,7 @@ msgstr "--allow-unrelated-histories" ...@@ -35544,7 +35544,7 @@ msgstr "--allow-unrelated-histories"
#: en/git-merge-tree.txt:66 #: en/git-merge-tree.txt:66
#, priority:100 #, priority:100
msgid "merge-tree will by default error out if the two branches specified share no common history. This flag can be given to override that check and make the merge proceed anyway." msgid "merge-tree will by default error out if the two branches specified share no common history. This flag can be given to override that check and make the merge proceed anyway."
msgstr "" msgstr "如果指定的两个分支没有共同的历史，merge-tree 默认会出错。 这个标志可以用来覆盖这个检查，并使合并继续进行。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-merge-tree.txt:67 #: en/git-merge-tree.txt:67
...@@ -35556,25 +35556,25 @@ msgstr "--merged [<commit>]" ...@@ -35556,25 +35556,25 @@ msgstr "--merged [<commit>]"
#: en/git-merge-tree.txt:71 #: en/git-merge-tree.txt:71
#, priority:100 #, priority:100
msgid "Instead of finding the merge-bases for <branch1> and <branch2>, specify a merge-base for the merge, and specifying multiple bases is currently not supported. This option is incompatible with `--stdin`." msgid "Instead of finding the merge-bases for <branch1> and <branch2>, specify a merge-base for the merge, and specifying multiple bases is currently not supported. This option is incompatible with `--stdin`."
msgstr "" msgstr "不需要为 <branch1> 和 <branch2> 寻找合并基础，而是为合并指定一个合并基础，目前不支持指定多个合并基础。该选项与 `--stdin` 不兼容。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:78 #: en/git-merge-tree.txt:78
#, priority:100 #, priority:100
msgid "For a successful merge, the output from git-merge-tree is simply one line:" msgid "For a successful merge, the output from git-merge-tree is simply one line:"
msgstr "" msgstr "对于一个成功的合并，git-merge-tree 的输出仅仅是一行："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:80 #: en/git-merge-tree.txt:80
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "\t<OID of toplevel tree>\n" msgid "\t<OID of toplevel tree>\n"
msgstr "" msgstr "\t<OID of toplevel tree>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:82 #: en/git-merge-tree.txt:82
#, priority:100 #, priority:100
msgid "Whereas for a conflicted merge, the output is by default of the form:" msgid "Whereas for a conflicted merge, the output is by default of the form:"
msgstr "" msgstr "而对于有冲突的合并，默认的输出形式是："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:86 #: en/git-merge-tree.txt:86
...@@ -35583,19 +35583,19 @@ msgid "" ...@@ -35583,19 +35583,19 @@ msgid ""
"\t<OID of toplevel tree>\n" "\t<OID of toplevel tree>\n"
"\t<Conflicted file info>\n" "\t<Conflicted file info>\n"
"\t<Informational messages>\n" "\t<Informational messages>\n"
msgstr "" msgstr "\t<OID of toplevel tree>\n\t<Conflicted file info>\n\t<Informational messages>\n"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:88 #: en/git-merge-tree.txt:88
#, priority:100 #, priority:100
msgid "These are discussed individually below." msgid "These are discussed individually below."
msgstr "" msgstr "下面将分别讨论这些问题。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:93 #: en/git-merge-tree.txt:93
#, priority:100 #, priority:100
msgid "However, there is an exception. If `--stdin` is passed, then there is an extra section at the beginning, a NUL character at the end, and then all the sections repeat for each line of input. Thus, if the first merge is conflicted and the second is clean, the output would be of the form:" msgid "However, there is an exception. If `--stdin` is passed, then there is an extra section at the beginning, a NUL character at the end, and then all the sections repeat for each line of input. Thus, if the first merge is conflicted and the second is clean, the output would be of the form:"
msgstr "" msgstr "然而，有一个例外。 如果通过了 `--stdin`，那么在开头有一个额外的部分，在结尾有一个 NUL 字符，然后所有的部分在每行输入中都会重复。 因此，如果第一次合并是冲突的，而第二次是干净的，输出将是这样的形式："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:102 #: en/git-merge-tree.txt:102
...@@ -35609,7 +35609,7 @@ msgid "" ...@@ -35609,7 +35609,7 @@ msgid ""
"\t<Merge status>\n" "\t<Merge status>\n"
"\t<OID of toplevel tree>\n" "\t<OID of toplevel tree>\n"
"\tNUL\n" "\tNUL\n"
msgstr "" msgstr "\t<Merge status>\n\t<OID of toplevel tree>\n\t<Conflicted file info>\n\t<Informational messages>\n\tNUL\n\t<Merge status>\n\t<OID of toplevel tree>\n\tNUL\n"
   
#. type: Title ~ #. type: Title ~
#: en/git-merge-tree.txt:105 #: en/git-merge-tree.txt:105
...@@ -35622,7 +35622,7 @@ msgstr "merge.stat" ...@@ -35622,7 +35622,7 @@ msgstr "merge.stat"
#: en/git-merge-tree.txt:108 #: en/git-merge-tree.txt:108
#, priority:100 #, priority:100
msgid "This is an integer status followed by a NUL character. The integer status is:" msgid "This is an integer status followed by a NUL character. The integer status is:"
msgstr "" msgstr "这是一个整数状态，后面有一个 NUL 字符。 整数状态是："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:113 #: en/git-merge-tree.txt:113
...@@ -35632,31 +35632,31 @@ msgid "" ...@@ -35632,31 +35632,31 @@ msgid ""
" 1: merge was clean\n" " 1: merge was clean\n"
" <0: something prevented the merge from running (e.g. access to repository\n" " <0: something prevented the merge from running (e.g. access to repository\n"
"\t objects denied by filesystem)\n" "\t objects denied by filesystem)\n"
msgstr "" msgstr " 0：合并后有冲突\n 1： 合并是干净的\n <0：有什么东西阻止了合并的运行（例如，文件系统拒绝对仓库对象的访问\n\t 对象的访问被文件系统拒绝)\n"
   
#. type: Title ~ #. type: Title ~
#: en/git-merge-tree.txt:116 #: en/git-merge-tree.txt:116
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "OID of toplevel tree" msgid "OID of toplevel tree"
msgstr "" msgstr "顶层目录树的 OID"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:122 #: en/git-merge-tree.txt:122
#, priority:100 #, priority:100
msgid "This is a tree object that represents what would be checked out in the working tree at the end of `git merge`. If there were conflicts, then files within this tree may have embedded conflict markers. This section is always followed by a newline (or NUL if `-z` is passed)." msgid "This is a tree object that represents what would be checked out in the working tree at the end of `git merge`. If there were conflicts, then files within this tree may have embedded conflict markers. This section is always followed by a newline (or NUL if `-z` is passed)."
msgstr "" msgstr "这是一个树状对象，代表在`git merge` 结束时工作区上检查出来的东西。 如果有冲突，那么这个目录树中的文件可能会有嵌入式冲突标记。 这一部分的后面总是有一个换行符（如果传递了 `-z` 则为 NUL）。"
   
#. type: Title ~ #. type: Title ~
#: en/git-merge-tree.txt:125 #: en/git-merge-tree.txt:125
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "Conflicted file info" msgid "Conflicted file info"
msgstr "" msgstr "冲突的文件信息"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:128 #: en/git-merge-tree.txt:128
#, priority:100 #, priority:100
msgid "This is a sequence of lines with the format" msgid "This is a sequence of lines with the format"
msgstr "" msgstr "这是一连串的行，格式为"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:130 #: en/git-merge-tree.txt:130
...@@ -35680,43 +35680,43 @@ msgstr "信息" ...@@ -35680,43 +35680,43 @@ msgstr "信息"
#: en/git-merge-tree.txt:144 #: en/git-merge-tree.txt:144
#, priority:100 #, priority:100
msgid "This section provides informational messages, typically about conflicts. The format of the section varies significantly depending on whether `-z` is passed." msgid "This section provides informational messages, typically about conflicts. The format of the section varies significantly depending on whether `-z` is passed."
msgstr "" msgstr "这一部分提供信息，通常是关于冲突的信息。 该部分的格式因是否传递了 `-z` 而有很大不同。"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:146 #: en/git-merge-tree.txt:146
#, priority:100 #, priority:100
msgid "If `-z` is passed:" msgid "If `-z` is passed:"
msgstr "" msgstr "如果 `-z`被传递："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:149 #: en/git-merge-tree.txt:149
#, priority:100 #, priority:100
msgid "The output format is zero or more conflict informational records, each of the form:" msgid "The output format is zero or more conflict informational records, each of the form:"
msgstr "" msgstr "输出格式是零条或更多的冲突信息记录，每条记录的形式都是："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:151 #: en/git-merge-tree.txt:151
#, no-wrap, priority:100 #, no-wrap, priority:100
msgid "\t<list-of-paths><conflict-type>NUL<conflict-message>NUL\n" msgid "\t<list-of-paths><conflict-type>NUL<conflict-message>NUL\n"
msgstr "" msgstr "\t<list-of-paths><conflict-type>NUL<conflict-message>NUL\n"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:153 #: en/git-merge-tree.txt:153
#, priority:100 #, priority:100
msgid "where <list-of-paths> is of the form" msgid "where <list-of-paths> is of the form"
msgstr "" msgstr "其中 <list-of-paths> 的形式为"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:155 #: en/git-merge-tree.txt:155
#, ignore-ellipsis, no-wrap, priority:100 #, ignore-ellipsis, no-wrap, priority:100
msgid "\t<number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL\n" msgid "\t<number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL\n"
msgstr "" msgstr "\t<number-of-paths>NUL<path1>NUL<path2>NUL...<pathN>NUL\n"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:159 #: en/git-merge-tree.txt:159
#, priority:100 #, priority:100
msgid "and includes paths (or branch names) affected by the conflict or informational message in <conflict-message>. Also, <conflict-type> is a stable string explaining the type of conflict, such as" msgid "and includes paths (or branch names) affected by the conflict or informational message in <conflict-message>. Also, <conflict-type> is a stable string explaining the type of conflict, such as"
msgstr "" msgstr "并包括受冲突影响的路径（或分支名称）或 <conflict-message> 中的信息消息。 另外，<conflict-type> 是一个稳定的字符串，解释了冲突的类型，比如说"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:161 #: en/git-merge-tree.txt:161
...@@ -35728,25 +35728,25 @@ msgstr "--series <file>" ...@@ -35728,25 +35728,25 @@ msgstr "--series <file>"
#: en/git-merge-tree.txt:162 #: en/git-merge-tree.txt:162
#, priority:100 #, priority:100
msgid "\"CONFLICT (rename/delete)\"" msgid "\"CONFLICT (rename/delete)\""
msgstr "" msgstr "\"CONFLICT (rename/delete)\""
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:163 #: en/git-merge-tree.txt:163
#, priority:100 #, priority:100
msgid "\"CONFLICT (submodule lacks merge base)\"" msgid "\"CONFLICT (submodule lacks merge base)\""
msgstr "" msgstr "\"CONFLICT (submodule lacks merge base)\""
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:164 #: en/git-merge-tree.txt:164
#, priority:100 #, priority:100
msgid "\"CONFLICT (binary)\"" msgid "\"CONFLICT (binary)\""
msgstr "" msgstr "\"CONFLICT (binary)\""
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:168 #: en/git-merge-tree.txt:168
#, priority:100 #, priority:100
msgid "and <conflict-message> is a more detailed message about the conflict which often (but not always) embeds the <stable-short-type-description> within it. These strings may change in future Git versions. Some examples:" msgid "and <conflict-message> is a more detailed message about the conflict which often (but not always) embeds the <stable-short-type-description> within it. These strings may change in future Git versions. Some examples:"
msgstr "" msgstr "和 <conflict-message> 是关于冲突的更详细的信息，通常（但不一定）会嵌入 <stable-short-type-description> 中。 这些字符串在未来的Git版本中可能会改变。 一些例子："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:170 #: en/git-merge-tree.txt:170
...@@ -35758,25 +35758,25 @@ msgstr "--series <file>" ...@@ -35758,25 +35758,25 @@ msgstr "--series <file>"
#: en/git-merge-tree.txt:171 #: en/git-merge-tree.txt:171
#, ignore-ellipsis, priority:100 #, ignore-ellipsis, priority:100
msgid "\"CONFLICT (rename/delete): <oldfile> renamed...but deleted in...\"" msgid "\"CONFLICT (rename/delete): <oldfile> renamed...but deleted in...\""
msgstr "" msgstr "\"CONFLICT (rename/delete): <oldfile> 被重命名... 但在... 被删除。\""
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:172 #: en/git-merge-tree.txt:172
#, priority:100 #, priority:100
msgid "\"Failed to merge submodule <submodule> (no merge base)\"" msgid "\"Failed to merge submodule <submodule> (no merge base)\""
msgstr "" msgstr "“合并子模块 <submodule> 失败（没有合并基础）”"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:173 #: en/git-merge-tree.txt:173
#, priority:100 #, priority:100
msgid "\"Warning: cannot merge binary files: <filename>\"" msgid "\"Warning: cannot merge binary files: <filename>\""
msgstr "" msgstr "“警告：不能合并二进制文件： <filename>”"
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:175 #: en/git-merge-tree.txt:175
#, priority:100 #, priority:100
msgid "If `-z` is NOT passed:" msgid "If `-z` is NOT passed:"
msgstr "" msgstr "如果没有传递 `-z`："
   
#. type: Plain text #. type: Plain text
#: en/git-merge-tree.txt:185 #: en/git-merge-tree.txt:185
...@@ -39088,13 +39088,13 @@ msgstr "" ...@@ -39088,13 +39088,13 @@ msgstr ""
#: en/git-pack-objects.txt:59 #: en/git-pack-objects.txt:59
#, priority:100 #, priority:100
msgid "Write into pairs of files (.pack and .idx), using <base-name> to determine the name of the created file. When this option is used, the two files in a pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on the pack content and is written to the standard output of the command." msgid "Write into pairs of files (.pack and .idx), using <base-name> to determine the name of the created file. When this option is used, the two files in a pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash based on the pack content and is written to the standard output of the command."
msgstr "" msgstr "写入成对的文件（.pack 和 .idx），使用 <base-name> 来确定创建的文件名。 当使用该选项时，一对中的两个文件被写入 <base-name>-<SHA-1>.{pack,idx} 文件。 <SHA-1> 是一个基于 pack 内容的哈希值，会写入命令的标准输出中。"
   
#. type: Plain text #. type: Plain text
#: en/git-pack-objects.txt:63 #: en/git-pack-objects.txt:63
#, priority:100 #, priority:100
msgid "Write the pack contents (what would have been written to .pack file) out to the standard output." msgid "Write the pack contents (what would have been written to .pack file) out to the standard output."
msgstr "" msgstr "将包的内容（本来要写到 .pack 文件中的内容）写到标准输出中。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-pack-objects.txt:64 #: en/git-pack-objects.txt:64
...@@ -39106,7 +39106,7 @@ msgstr "--revs" ...@@ -39106,7 +39106,7 @@ msgstr "--revs"
#: en/git-pack-objects.txt:72 #: en/git-pack-objects.txt:72
#, priority:100 #, priority:100
msgid "Read the revision arguments from the standard input, instead of individual object names. The revision arguments are processed the same way as 'git rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs. The objects on the resulting list are packed. Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted." msgid "Read the revision arguments from the standard input, instead of individual object names. The revision arguments are processed the same way as 'git rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs. The objects on the resulting list are packed. Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
msgstr "" msgstr "从标准输入读取修订参数，而不是单个对象名称。 修订版参数的处理方式与带有 `--object` 标志的 'git rev-list' 使用其 `commit` 参数来建立其输出的对象列表相同。 结果列表上的对象被打包。 除了修订，还接受 `--not` 或 `--shallow <SHA-1>` 行。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-pack-objects.txt:73 en/rev-list-options.txt:917 #: en/git-pack-objects.txt:73 en/rev-list-options.txt:917
...@@ -39118,19 +39118,19 @@ msgstr "--unpacked" ...@@ -39118,19 +39118,19 @@ msgstr "--unpacked"
#: en/git-pack-objects.txt:77 #: en/git-pack-objects.txt:77
#, priority:100 #, priority:100
msgid "This implies `--revs`. When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed." msgid "This implies `--revs`. When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed."
msgstr "" msgstr "这暗指 `--revs`。 当处理从标准输入读取的修订参数列表时，将打包的对象限制在那些尚未打包的对象。"
   
#. type: Plain text #. type: Plain text
#: en/git-pack-objects.txt:83 #: en/git-pack-objects.txt:83
#, priority:100 #, priority:100
msgid "This implies `--revs`. In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included." msgid "This implies `--revs`. In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included."
msgstr "" msgstr "这暗指 `--revs`。 除了从标准输入中读取的修订参数列表外，还假设指定要包括 `refs/`下的所有引用。"
   
#. type: Plain text #. type: Plain text
#: en/git-pack-objects.txt:88 #: en/git-pack-objects.txt:88
#, priority:100 #, priority:100
msgid "Include unasked-for annotated tags if the object they reference was included in the resulting packfile. This can be useful to send new tags to native Git clients." msgid "Include unasked-for annotated tags if the object they reference was included in the resulting packfile. This can be useful to send new tags to native Git clients."
msgstr "" msgstr "包括未被要求的注释标签，如果它们引用的对象被包含在结果的打包文件中。 这对于向本地 Git 客户端发送新的标签很有用。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-pack-objects.txt:89 #: en/git-pack-objects.txt:89
...@@ -39142,13 +39142,13 @@ msgstr "--stdin-packs" ...@@ -39142,13 +39142,13 @@ msgstr "--stdin-packs"
#: en/git-pack-objects.txt:95 #: en/git-pack-objects.txt:95
#, priority:100 #, priority:100
msgid "Read the basenames of packfiles (e.g., `pack-1234abcd.pack`) from the standard input, instead of object names or revision arguments. The resulting pack contains all objects listed in the included packs (those not beginning with `^`), excluding any objects listed in the excluded packs (beginning with `^`)." msgid "Read the basenames of packfiles (e.g., `pack-1234abcd.pack`) from the standard input, instead of object names or revision arguments. The resulting pack contains all objects listed in the included packs (those not beginning with `^`), excluding any objects listed in the excluded packs (beginning with `^`)."
msgstr "" msgstr "从标准输入中读取 packfiles（例如：`pack-1234abcd.pack`）的基本名称，而不是对象名称或修订参数。产生的数据包包含所有在包含的数据包中列出的对象（那些不是以 `^` 开头的），排除在排除的数据包中列出的任何对象（以 `^` 开头）。"
   
#. type: Plain text #. type: Plain text
#: en/git-pack-objects.txt:98 #: en/git-pack-objects.txt:98
#, priority:100 #, priority:100
msgid "Incompatible with `--revs`, or options that imply `--revs` (such as `--all`), with the exception of `--unpacked`, which is compatible." msgid "Incompatible with `--revs`, or options that imply `--revs` (such as `--all`), with the exception of `--unpacked`, which is compatible."
msgstr "" msgstr "与 `--revs` 或暗指 `--revs` 的选项（如 `--all`）不兼容，但 `--unpacked` 除外，它是兼容的。"
   
#. type: Labeled list #. type: Labeled list
#: en/git-pack-objects.txt:99 en/git-repack.txt:66 #: en/git-pack-objects.txt:99 en/git-repack.txt:66
...@@ -39160,7 +39160,7 @@ msgstr "--cruft" ...@@ -39160,7 +39160,7 @@ msgstr "--cruft"
#: en/git-pack-objects.txt:109 #: en/git-pack-objects.txt:109
#, priority:100 #, priority:100
msgid "Packs unreachable objects into a separate \"cruft\" pack, denoted by the existence of a `.mtimes` file. Typically used by `git repack --cruft`. Callers provide a list of pack names and indicate which packs will remain in the repository, along with which packs will be deleted (indicated by the `-` prefix). The contents of the cruft pack are all objects not contained in the surviving packs which have not exceeded the grace period (see `--cruft-expiration` below), or which have exceeded the grace period, but are reachable from an other object which hasn't." msgid "Packs unreachable objects into a separate \"cruft\" pack, denoted by the existence of a `.mtimes` file. Typically used by `git repack --cruft`. Callers provide a list of pack names and indicate which packs will remain in the repository, along with which packs will be deleted (indicated by the `-` prefix). The contents of the cruft pack are all objects not contained in the surviving packs which have not exceeded the grace period (see `--cruft-expiration` below), or which have exceeded the grace period, but are reachable from an other object which hasn't."
msgstr "" msgstr "将无法到达的对象打包到一个单独的 \"cruft\" 包中，以 `.mtimes` 文件的存在为标志。通常由`git repack --cruft`使用。调用者提供一个包的名称列表，并指出哪些包将保留在版本库中，以及哪些包将被删除（用 `-` 前缀表示）。cruft 包的内容是所有不包含在幸存的包中的对象，它们没有超过宽限期（见下面的 `--cruft-expiration`），或者它们已经超过了宽限期，但可以从其他没有超过宽限期的对象中到达。"
   
#. type: Plain text #. type: Plain text
#: en/git-pack-objects.txt:116 #: en/git-pack-objects.txt:116
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

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