Translated using Weblate (Chinese (Simplified))

Currently translated at 31.6% (3483 of 10990 strings)

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


Signed-off-by: 秃头灯笼鱼 <ttdlyu@163.com>

po/documentation.zh_HANS-CN.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-03-27 16: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.17-dev\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-04-27 02:33+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-dev\n"
 #. 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
@@ -3091,7 +3091,7 @@ msgstr "merge.<driver>.recursive"
 #: en/config/merge.txt:125
 #, priority:240
 msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors.  See linkgit:gitattributes[5] for details."
-msgstr ""
+msgstr "在执行共同祖先之间的内部合并时，命名一个低级别的合并驱动。  详情见 linkgit:gitattributes[5]。"
 #. type: Labeled list
 #: en/config/fmt-merge-msg.txt:1
@@ -3133,7 +3133,7 @@ msgstr "通过向这个多值配置变量添加一个匹配集成分支名称的
 #: en/config/fmt-merge-msg.txt:22
 #, priority:240
 msgid "An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries.  When there is no `merge.suppressDest` variable defined, the default value of `master` is used for backward compatibility."
-msgstr ""
+msgstr "一个空值的元素可以用来清除以前配置项积累的globs列表。  当没有定义`merge.suppressDest`变量时，为了向后兼容，会使用默认值`master`。"
 #. type: Title -
 #: en/date-formats.txt:2
@@ -4213,7 +4213,7 @@ msgstr "With this option, two-parent merge commits are remerged to create a temp
 #: en/diff-options.txt:84
 #, priority:280
 msgid "The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)."
-msgstr ""
+msgstr "使用该选项时发出的输出是可以改变的，它与其他选项的互动也是可以改变的（除非有明确的记录）。"
 #. type: Labeled list
 #: en/diff-options.txt:85
@@ -8626,7 +8626,7 @@ msgstr ""
 #: en/git-archive.txt:104 en/git-checkout.txt:356 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:397
 #, no-wrap, priority:240
 msgid "<tree-ish>"
-msgstr ""
+msgstr "<tree-ish>"
 #. type: Plain text
 #: en/git-archive.txt:106
@@ -10264,7 +10264,7 @@ msgstr "将 <branchname> 重置为 <startpoint>，即使 <branchname> 已经存
 #: en/git-branch.txt:130
 #, priority:260
 msgid "Note that 'git branch -f <branchname> [<start-point>]', even with '-f', refuses to change an existing branch `<branchname>` that is checked out in another worktree linked to the same repository."
-msgstr ""
+msgstr "请注意，\"git branch -f <branchname> [<start-point>]\"命令，即使添加\"-f\"选项，该命令也会拒绝改变一个在链接到同一仓库的另一个工作树中被检查出来的现有分支`<branchname>`。"
 #. type: Labeled list
 #: en/git-branch.txt:132
@@ -10459,13 +10459,13 @@ msgstr "根据可选参数选择确切的上游分支： `--track` 或 `--track
 #: en/git-branch.txt:231
 #, priority:260
 msgid "The branch.autoSetupMerge configuration variable specifies how `git switch`, `git checkout` and `git branch` should behave when neither `--track` nor `--no-track` are specified:"
-msgstr ""
+msgstr "branch.autoSetupMerge配置变量指定了当既不指定`--track`也不指定`--no-track`时，`git switch`、`git checkout`和`git branch`应如何运行："
 #. type: Plain text
 #: en/git-branch.txt:239
 #, priority:260
 msgid "The default option, `true`, behaves as though `--track=direct` were given whenever the start-point is a remote-tracking branch.  `false` behaves as if `--no-track` were given. `always` behaves as though `--track=direct` were given. `inherit` behaves as though `--track=inherit` were given. `simple` behaves as though `--track=direct` were given only when the start-point is a remote-tracking branch and the new branch has the same name as the remote branch."
-msgstr ""
+msgstr "默认选项 \"true\"，在起点是远程跟踪分支的情况下，就像给了 \"track=direct\"。  `false`的行为就像给了`--no-track`一样。`always`的行为就像给了`--track=direct`一样。继承(inherit)的行为就像给了`--track=inherit'一样。`simple`的行为就像给了`--track=direct`一样，只有当起点是远程跟踪的分支，并且新的分支与远程分支有相同的名字时，才会有这种行为。"
 #. type: Plain text
 #: en/git-branch.txt:242
@@ -10496,13 +10496,13 @@ msgstr "--recurse-submodules"
 #: en/git-branch.txt:253
 #, priority:260
 msgid "THIS OPTION IS EXPERIMENTAL! Causes the current command to recurse into submodules if `submodule.propagateBranches` is enabled. See `submodule.propagateBranches` in linkgit:git-config[1]. Currently, only branch creation is supported."
-msgstr ""
+msgstr "这个选项是实验性的！！！如果 `submodule.propagateBranches` 被启用，会导致当前命令递归到子模块。参见 linkgit:git-config[1] 中的 `submodule.propagateBranches`。目前，只支持创建分支。"
 #. type: Plain text
 #: en/git-branch.txt:262
 #, priority:260
 msgid "When used in branch creation, a new branch <branchname> will be created in the superproject and all of the submodules in the superproject's <start-point>. In submodules, the branch will point to the submodule commit in the superproject's <start-point> but the branch's tracking information will be set up based on the submodule's branches and remotes e.g. `git branch --recurse-submodules topic origin/main` will create the submodule branch \"topic\" that points to the submodule commit in the superproject's \"origin/main\", but tracks the submodule's \"origin/main\"."
-msgstr ""
+msgstr "当在分支创建中使用时，一个新的分支<branchname>将在父项目和父项目的<start-point>中的所有子模块中创建。在子模块中，该分支将指向超级项目的<start-point>中的子模块提交，但该分支的跟踪信息将根据子模块的分支和远程来设置，例如`git branch --recurse-submodules topic origin/main`将创建一个子模块分支 \"topic\"，指向父项目的 \"origin/main \"中的子模块提交，但跟踪子模块的 \"origin/main\"。"
 #. type: Plain text
 #: en/git-branch.txt:266
@@ -11543,7 +11543,7 @@ msgstr ""
 #: en/git-cat-file.txt:37 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:385
 #, no-wrap, priority:240
 msgid "<object>"
-msgstr ""
+msgstr "<对象>"
 #. type: Plain text
 #: en/git-cat-file.txt:41
@@ -13011,13 +13011,13 @@ msgid ""
 "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...\n"
 "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
 "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
-msgstr ""
+msgstr "'git checkout' [-q] [-f] [-m] [<分支>]\n'git checkout' [-q] [-f] [-m] --detach [<分支>]\n'git checkout' [-q] [-f] [-m] [--detach] <提交>\n'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <新分支>] [<起点>]\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<样式>] [<树状对象>] [--] <修饰符>...\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<样式>] [<树状对象>] --pathspec-from-file=<文件> [--pathspec-file-nul]\n'git checkout' (-p|--patch) [<树状对象>] [--] [<修饰符>...]\n"
 #. type: Plain text
 #: en/git-checkout.txt:25
 #, priority:240
 msgid "Updates files in the working tree to match the version in the index or the specified tree.  If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
-msgstr ""
+msgstr "更新工作区中的文件，使其与索引或指定的树中的版本一致。  如果没有给出pathspec，'git checkout'也将更新`HEAD`，将指定的分支设为当前分支。"
 #. type: Labeled list
 #: en/git-checkout.txt:26
@@ -13029,13 +13029,13 @@ msgstr "'git checkout' [<分支>]"
 #: en/git-checkout.txt:32
 #, priority:240
 msgid "To prepare for working on `<branch>`, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the `<branch>`."
-msgstr ""
+msgstr "要准备在`<分支>`上工作，需要更新索引和工作区中的文件，以及将`HEAD`指向该分支来切换到该分支。对工作区中文件的本地修改会被保留，以便修改可以被提交到`<分支>`。"
 #. type: Plain text
 #: en/git-checkout.txt:36
 #, priority:240
 msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name and `--no-guess` is not specified, treat as equivalent to"
-msgstr ""
+msgstr "如果没有找到该`<分支>`，但正好一个远程（称其为`<远程仓库>`）中确实存在一个名称相匹配的已跟踪分支，并且没有指定`--no-guess`，则视为等同于"
 #. type: delimited block -
 #: en/git-checkout.txt:39 en/git-checkout.txt:187
@@ -13045,9 +13045,9 @@ msgstr "$ git checkout -b <branch> --track <remote>/<branch>\n"
 #. type: Plain text
 #: en/git-checkout.txt:45
-#, priority:240
+#, fuzzy, priority:240
 msgid "You could omit `<branch>`, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
-msgstr ""
+msgstr "你可以省略`<分支>`，在这种情况下，该命令会退化为 \"检查出当前分支\"，这是一个美化的无操作，具有非常大的副作用，如果存在当前分支的话，只显示当前分支的跟踪信息。"
 #. type: Labeled list
 #: en/git-checkout.txt:46
@@ -13059,13 +13059,13 @@ msgstr "'git checkout' -b|-B <new_branch> [<start point>]"
 #: en/git-checkout.txt:54
 #, priority:240
 msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out.  In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'.  As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below."
-msgstr ""
+msgstr "指定 `-b` 会导致一个新的分支被创建，就像调用 linkgit:git-branch[1] 然后签出一样。  在这种情况下，你可以使用 `--track` 或 `--no-track` 选项，它们将被传递给 'git branch'。  为方便起见，`--track`不加`-b`意味着创建分支；见下文对`--track`的描述。"
 #. type: Plain text
 #: en/git-checkout.txt:57
 #, priority:240
 msgid "If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
-msgstr ""
+msgstr "如果给定了`-B'，如果不存在`<新分支>`，就会创建；否则，就会重置。这在事务上等同于"
 #. type: delimited block -
 #: en/git-checkout.txt:61
@@ -13081,7 +13081,7 @@ msgstr ""
 #: en/git-checkout.txt:65
 #, priority:240
 msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
-msgstr ""
+msgstr "也就是说，除非 \"git checkout \"执行成功，否则该分支不会被重置/创建。"
 #. type: Labeled list
 #: en/git-checkout.txt:66
@@ -13099,19 +13099,19 @@ msgstr "'git checkout' [--detach] <提交>"
 #: en/git-checkout.txt:75
 #, priority:240
 msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree.  Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
-msgstr ""
+msgstr "准备在 `<提交>` 上工作，通过分离 `HEAD` 来实现（参见 \"DETACHED HEAD\" 部分），并更新工作区中的索引和文件。  对工作区中的文件的本地修改会被保留，所以最终的工作区将是提交时记录的状态加上本地的修改。"
 #. type: Plain text
 #: en/git-checkout.txt:79
 #, priority:240
 msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
-msgstr ""
+msgstr "当`<提交>`参数是一个分支名称时，`--detach`选项可以用来分离分支顶端的`HEAD`（`git checkout <分支>`会签出该分支而不分离`HEAD`）。"
 #. type: Plain text
 #: en/git-checkout.txt:81
 #, priority:240
 msgid "Omitting `<branch>` detaches `HEAD` at the tip of the current branch."
-msgstr ""
+msgstr "省略`<分支>`会在当前分支的顶端分离`HEAD`。"
 #. type: Labeled list
 #: en/git-checkout.txt:82
@@ -13123,31 +13123,31 @@ msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [
 #: en/git-checkout.txt:83
 #, no-wrap, priority:240
 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]"
-msgstr ""
+msgstr "'git checkout' [-f|--our|--theirs|-m|--conflict=<样式>] [<树状对象>] --pathspec-from-file=<文件> [--pathspec-file-nul]"
 #. type: Plain text
 #: en/git-checkout.txt:90
 #, priority:240
 msgid "Overwrite the contents of the files that match the pathspec.  When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index.  When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`."
-msgstr ""
+msgstr "覆盖符合路径对范文件的内容。  当没有给出`<树状对象>`（最常见的是提交），用索引中的内容覆盖工作区。  当`<树状对象>`被给出时，用`<树状对象>`处的内容覆盖索引和工作区。"
 #. type: Plain text
 #: en/git-checkout.txt:98
 #, priority:240
 msgid "The index may contain unmerged entries because of a previous failed merge.  By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out.  Using `-f` will ignore these unmerged entries.  The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`.  With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result."
-msgstr ""
+msgstr "索引可能包含因之前合并失败导致的未合并条目。  默认情况下，如果你试图从索引中签出这样的条目，签出操作将失败，没有任何东西被签出。  使用`-f`将忽略这些未合并的条目。  通过使用`--ours\"或`--theirs\"选项，可以从索引中检出合并的特定一方的内容。  使用`-m`，对工作区文件的修改可以被丢弃，以重新创建原冲突合并的结果。"
 #. type: Labeled list
 #: en/git-checkout.txt:99
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
-msgstr ""
+msgstr "'git checkout' (-p|--patch) [<树状对象>] [--] [<路径规范>...]"
 #. type: Plain text
 #: en/git-checkout.txt:104
 #, priority:240
 msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result.  See below for the description of `--patch` option."
-msgstr ""
+msgstr "这与前面的模式类似，但让你使用交互式界面来显示 \"diff \"输出，并选择在结果中使用哪些代码块。  关于`--patch`选项的描述，见下文。"
 #. type: Plain text
 #: en/git-checkout.txt:110 en/git-read-tree.txt:120 en/git-stash.txt:244 en/git-switch.txt:145
@@ -13171,13 +13171,13 @@ msgstr "当它附加到终端时，除非指定 `--quiet`，否则默认情况
 #: en/git-checkout.txt:124
 #, priority:240
 msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`, and even if there are untracked files in the way.  This is used to throw away local changes and any untracked files or directories that are in the way."
-msgstr ""
+msgstr "当切换分支时，即使索引或工作区与`HEAD`不同，即使有未追踪的文件挡住去路，也要继续。  这是用来丢弃本地修改和任何碍事的未追踪文件或目录的。"
 #. type: Plain text
 #: en/git-checkout.txt:127
 #, priority:240
 msgid "When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored."
-msgstr ""
+msgstr "当从索引中检查出路径时，不将未合并条目视为失败；相反，忽略未合并条目。"
 #. type: Labeled list
 #: en/git-checkout.txt:128 en/git-merge-file.txt:76 en/git-restore.txt:77
@@ -13195,13 +13195,13 @@ msgstr "--theirs"
 #: en/git-checkout.txt:132
 #, priority:240
 msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
-msgstr ""
+msgstr "当从索引中检查出路径时，要检查第二阶段（'ours'）或第三阶段（'theirs'）的未合并路径。"
 #. type: Plain text
 #: en/git-checkout.txt:137
 #, priority:240
 msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
-msgstr ""
+msgstr "注意在 \"git rebase \"和 \"git pull --rebase \"过程中，\"ours\"和 \"theirs\"可能会互换；\"--ours \"给出了分支变基后的版本，而\"--theirs\"则给出你即将变基的分支版本。"
 #. type: Plain text
 #: en/git-checkout.txt:147
@@ -17907,7 +17907,7 @@ msgstr "--human-readable"
 #: en/git-count-objects.txt:51
 #, priority:80
 msgid "Print sizes in human readable format"
-msgstr ""
+msgstr "以人类可读的格式打印对象大小"
 #. type: Title =
 #: en/git-credential-cache--daemon.txt:2
@@ -32686,7 +32686,7 @@ msgstr "对于每个候选者，如果它与`--decorate-refs-exclude`给出的
 #: en/git-log.txt:58
 #, priority:260
 msgid "If none of these options or config settings are given, then references are used as decoration if they match `HEAD`, `refs/heads/`, `refs/remotes/`, `refs/stash/`, or `refs/tags/`."
-msgstr ""
+msgstr "如果没有给出这些选项或配置设置，那么如果引用与`HEAD`、`refs/heads/`、`refs/remotes/`、`refs/stash/`或`refs/tags/`相匹配，则被用作装饰引用。"
 #. type: Labeled list
 #: en/git-log.txt:59
@@ -32698,7 +32698,7 @@ msgstr "--clear-decorations"
 #: en/git-log.txt:65
 #, priority:260
 msgid "When specified, this option clears all previous `--decorate-refs` or `--decorate-refs-exclude` options and relaxes the default decoration filter to include all references. This option is assumed if the config value `log.initialDecorationSet` is set to `all`."
-msgstr ""
+msgstr "当指定时，这个选项会清除之前所有的`--decorate-refs`或`--decorate-refs-exclude`选项，并释放默认的装饰过滤器，包括所有的引用。该选项假设配置值`log.initialDecorationSet`被设置为`all`。"
 #. type: Labeled list
 #: en/git-log.txt:66
@@ -46638,7 +46638,7 @@ msgstr "--no-refresh"
 #: en/git-reset.txt:114
 #, priority:280
 msgid "Refresh the index after a mixed reset. Enabled by default."
-msgstr ""
+msgstr "在混合重置后刷新索引，默认启用。"
 #. type: Labeled list
 #: en/git-reset.txt:139
@@ -48252,7 +48252,7 @@ msgstr "--exclude-hidden=[receive|uploadpack]"
 #: en/git-rev-parse.txt:206 en/rev-list-options.txt:204
 #, priority:260
 msgid "Do not include refs that would be hidden by `git-receive-pack` or `git-upload-pack` by consulting the appropriate `receive.hideRefs` or `uploadpack.hideRefs` configuration along with `transfer.hideRefs` (see linkgit:git-config[1]). This option affects the next pseudo-ref option `--all` or `--glob` and is cleared after processing them."
-msgstr ""
+msgstr "想不包括那些会被`git-receive-pack`或`git-upload-pack`隐藏的引用，方法是进行适当的`receive.hideRefs`或`uploadpack.hideRefs`以及`transfer.hideRefs`配置（见linkgit:git-config[1]）。选项`--all`或`--glob项会影响到下一个伪引用，并在处理完它们之后清除。"
 #. type: Labeled list
 #: en/git-rev-parse.txt:207
@@ -50548,7 +50548,7 @@ msgstr "--date=<format>"
 #: en/git-shortlog.txt:54
 #, priority:260
 msgid "Show dates formatted according to the given date string. (See the `--date` option in the \"Commit Formatting\" section of linkgit:git-log[1]). Useful with `--group=format:<format>`."
-msgstr ""
+msgstr "显示根据给定日期字符串格式化的日期。(参见linkgit:git-log[1]中 \"提交格式化\"部分的`--date`选项）。与 `--group=format:<format>`一起使用会非常有用。"
 #. type: Labeled list
 #: en/git-shortlog.txt:55
@@ -52990,7 +52990,7 @@ msgstr "未跟踪的文件和性能"
 #: en/git-status.txt:472
 #, priority:280
 msgid "`git status` can be very slow in large worktrees if/when it needs to search for untracked files and directories. There are many configuration options available to speed this up by either avoiding the work or making use of cached results from previous Git commands. There is no single optimum set of settings right for everyone. We'll list a summary of the relevant options to help you, but before going into the list, you may want to run `git status` again, because your configuration may already be caching `git status` results, so it could be faster on subsequent runs."
-msgstr ""
+msgstr "`git status`在大型工作树中，如果/当它需要搜索未被追踪的文件和目录时，速度会非常慢。有许多配置选项可以通过避免这种操作或是利用以前的 Git 命令的缓存结果来加快速度。但是没有一套适合所有人的最佳设置。我们将列出相关选项的摘要以帮助你，但在进入列表之前，你可能想再次运行`git status`，因为你的配置可能已经缓存了`git status`的结果，所以在随后的运行中可能会更快。"
 #. type: Plain text
 #: en/git-status.txt:474
@@ -53002,19 +53002,19 @@ msgstr "--untracked-files[=<mode>]"
 #: en/git-status.txt:479
 #, priority:280
 msgid "`status.showUntrackedfiles=false` config (see above for both): indicate that `git status` should not report untracked files. This is the fastest option. `git status` will not list the untracked files, so you need to be careful to remember if you create any new files and manually `git add` them."
-msgstr ""
+msgstr "设置`status.showUntrackedfiles=false`：表示`git status`不应该报告未跟踪的文件。这是最快的选项。`git status`不会列出未跟踪的文件，所以你得注意，在创建任何新的文件后，需要手动`git add`它们。"
 #. type: Plain text
 #: en/git-status.txt:481
 #, priority:280
 msgid "`advice.statusUoption=false` (see linkgit:git-config[1]):"
-msgstr ""
+msgstr "`advice.statusUoption=false`（见linkgit:git-config[1]）："
 #. type: Plain text
 #: en/git-status.txt:488
 #, priority:280
 msgid "setting this variable to `false` disables the warning message given when enumerating untracked files takes more than 2 seconds.  In a large project, it may take longer and the user may have already accepted the trade off (e.g. using \"-uno\" may not be an acceptable option for the user), in which case, there is no point issuing the warning message, and in such a case, disabling the warning may be the best."
-msgstr ""
+msgstr "将此变量设置为 \"false\"，当列举未跟踪的文件需要超过2秒时，将禁用警告信息。  在一个大型项目中，可能需要更长的时间，而且用户可能已经接受了这种设置（例如，使用\"-uno\"可能不是用户可以接受的选项）。在这种情况下，发出警告信息没有意义，禁用警告可能是最好的。"
 #. type: Plain text
 #: en/git-status.txt:490
@@ -53027,25 +53027,25 @@ msgstr "linkgit:git-update-index[1]"
 #: en/git-status.txt:502
 #, priority:280
 msgid "enable the untracked cache feature and only search directories that have been modified since the previous `git status` command.  Git remembers the set of untracked files within each directory and assumes that if a directory has not been modified, then the set of untracked files within has not changed.  This is much faster than enumerating the contents of every directory, but still not without cost, because Git still has to search for the set of modified directories. The untracked cache is stored in the `.git/index` file. The reduced cost of searching for untracked files is offset slightly by the increased size of the index and the cost of keeping it up-to-date. That reduced search time is usually worth the additional size."
-msgstr ""
+msgstr "启用未跟踪缓存功能，只搜索自上一个 `git status` 命令以来修改过的目录。 Git 会记住每个目录中的未跟踪文件集，并假定如果目录未被修改，则其中的未跟踪文件集不会更改。这比枚举每个目录的内容要快得多，但这依然有代价，因为 Git 仍然需要搜索修改目录的集合。未跟踪的缓存存储在 .git/index 文件中。搜索未跟踪文件的成本降低被索引大小的增加和保持最新的成本所抵消。缩短的搜索时间通常值得新增额外的大小。"
 #. type: Plain text
 #: en/git-status.txt:504
 #, priority:280
 msgid "`core.untrackedCache=true` and `core.fsmonitor=true` or"
-msgstr ""
+msgstr "`core.untrackedCache=true`和`core.fsmonitor=true`或"
 #. type: Plain text
 #: en/git-status.txt:514
 #, priority:280
 msgid "`core.fsmonitor=<hook_command_pathname>` (see linkgit:git-update-index[1]): enable both the untracked cache and FSMonitor features and only search directories that have been modified since the previous `git status` command.  This is faster than using just the untracked cache alone because Git can also avoid searching for modified directories.  Git only has to enumerate the exact set of directories that have changed recently. While the FSMonitor feature can be enabled without the untracked cache, the benefits are greatly reduced in that case."
-msgstr ""
+msgstr "`core.fsmonitor=<hook_command_pathname>`（见linkgit:git-update-index[1]）：同时启用无痕缓存和FSMonitor功能，只搜索自上一条`git status'命令以来被修改的目录。  这比单独使用无痕缓存要快，因为Git也可以避免搜索被修改的目录。  Git只需要列举出最近有变化的确切目录集。虽然FSMonitor功能可以在没有无痕缓存的情况下启用，但在这种情况下好处会大大减少。"
 #. type: Plain text
 #: en/git-status.txt:519
 #, priority:280
 msgid "Note that after you turn on the untracked cache and/or FSMonitor features it may take a few `git status` commands for the various caches to warm up before you see improved command times.  This is normal."
-msgstr ""
+msgstr "请注意，在你打开无痕缓存和/或FSMonitor功能后，可能需要几个`git status'命令来让各种缓存活动起来，然后你才能看到命令耗时的改善，这很正常。"
 #. type: Title =
 #: en/git-stripspace.txt:2
@@ -67822,7 +67822,7 @@ msgstr "`--date=format:...` feeds the format `...` to your system `strftime`, ex
 #: en/rev-list-options.txt:1108
 #, priority:260
 msgid "`--date=default` is the default format, and is based on ctime(3)  output.  It shows a single line with three-letter day of the week, three-letter month, day-of-month, hour-minute-seconds in \"HH:MM:SS\" format, followed by 4-digit year, plus timezone information, unless the local time zone is used, e.g. `Thu Jan 1 00:00:00 1970 +0000`."
-msgstr ""
+msgstr "`--date=default`是默认格式，基于ctime(3)输出。  它仅仅在一行中显示缩写的星期、缩写的月份、一月中的第几天、\"HH:MM:SS \"格式的小时-分钟-秒，然后是年份，除非使用本地时区，在末尾都会加上时区信息，例如`Thu Jan 1 00:00:00 1970 +0000`。"
 #. type: Labeled list
 #: en/rev-list-options.txt:1111
@@ -70243,7 +70243,7 @@ msgstr "以下是Ingo Molnar对此的评价<<7>>："
 #: en/git-bisect-lk2009.txt:1101
 #, priority:100
 msgid "i have a fully automated bootup-hang bisection script. It is based on \"git-bisect run\". I run the script, it builds and boots kernels fully automatically, and when the bootup fails (the script notices that via the serial log, which it continuously watches - or via a timeout, if the system does not come up within 10 minutes it's a \"bad\" kernel), the script raises my attention via a beep and i power cycle the test box. (yeah, i should make use of a managed power outlet to 100% automate it)"
-msgstr ""
+msgstr "我有一个完全自动化启动并挂起的二分脚本。它是基于 \"git-bisect run \"的。我运行这个脚本，它完全自动地构建和启动内核，当启动失败时（脚本通过连续观察的串行日志注意到这一点或者是通过超时判断，如果系统在10分钟内没有启动，就是一个 \"坏 \"内核），脚本通过嘟嘟声引起我的注意，我就给测试机断电。(的确，我应该使用一个可管理的电源插座来实现100%的自动化）"
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1104
@@ -70255,19 +70255,19 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:1109
 #, priority:100
 msgid "We have seen that test suites and git bisect are very powerful when used together. It can be even more powerful if you can combine them with other systems."
-msgstr ""
+msgstr "我们已经看到，测试套件和git bisect一起使用时已经非常强大了。如果你能把它们和其他系统结合起来，那将更加强大。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1116
 #, priority:100
 msgid "For example some test suites could be run automatically at night with some unusual (or even random) configurations. And if a regression is found by a test suite, then \"git bisect\" can be automatically launched, and its result can be emailed to the author of the first bad commit found by \"git bisect\", and perhaps other people too. And a new entry in the bug tracking system could be automatically created too."
-msgstr ""
+msgstr "例如，一些测试套件可以在晚上以一些不寻常（甚至是随机）的配置自动运行。如果测试套件发现了一个回归问题，那么 \"git bisect \"可以自动启动，其结果可以通过电子邮件发给 \"git bisect\"发现的第一个坏提交的作者，也许还有其他人。并且在错误跟踪系统中自动创建一个新条目。"
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1119
 #, no-wrap, priority:100
 msgid "The future of bisecting"
-msgstr ""
+msgstr "未来的二分算法"
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1122
@@ -70280,31 +70280,31 @@ msgstr "\"git replace\""
 #: en/git-bisect-lk2009.txt:1128
 #, priority:100
 msgid "We saw earlier that \"git bisect skip\" is now using a PRNG to try to avoid areas in the commit graph where commits are untestable. The problem is that sometimes the first bad commit will be in an untestable area."
-msgstr ""
+msgstr "之前，我们发现，\"git bisect skip\"目前使用PRNG来试图避免提交图中不可测试的区域。但问题是，有时第一个坏的提交恰恰在一个无法测试的区域。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1134
 #, priority:100
 msgid "To simplify the discussion we will suppose that the untestable area is a simple string of commits and that it was created by a breakage introduced by one commit (let's call it BBC for bisect breaking commit) and later fixed by another one (let's call it BFC for bisect fixing commit)."
-msgstr ""
+msgstr "为了简化这个话题，我们将假设不可测试区是一串简单的提交，它是由一个提交（我们称它为BBC，意为双断裂提交）引起的断裂，后来被另一个提交修复（我们称它为BFC，意为双断裂修复提交）。"
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1139
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
-msgstr ""
+msgstr "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1143
 #, priority:100
 msgid "where we know that Y is good and BFC is bad, and where BBC and X1 to X6 are untestable."
-msgstr ""
+msgstr "其中，我们知道Y是好的，BFC是坏的，而BBC和X1到X6不可测试。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1150
 #, priority:100
 msgid "In this case if you are bisecting manually, what you can do is create a special branch that starts just before the BBC. The first commit in this branch should be the BBC with the BFC squashed into it. And the other commits in the branch should be the commits between BBC and BFC rebased on the first commit of the branch and then the commit after BFC also rebased on."
-msgstr ""
+msgstr "在这种情况下，如果你是手动二分，你可以在BBC开始之前创建一个特殊的分支。这个分支的第一次提交应该是将 BFC 与BBC压缩到一起的。分支中的其他提交应该是在BBC和BFC之间的提交，以该分支的第一次提交为基础，然后再以BFC之后的提交为基础。"
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1157
@@ -70322,37 +70322,37 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:1160
 #, priority:100
 msgid "where commits quoted with ' have been rebased."
-msgstr ""
+msgstr "其中以引号 ' 括起来的的提交已被变基。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1162
 #, priority:100
 msgid "You can easily create such a branch with Git using interactive rebase."
-msgstr ""
+msgstr "你能够很轻松地用Git的交互式变基来创建这样的分支。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1164
 #, priority:100
 msgid "For example using:"
-msgstr ""
+msgstr "例如："
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1167
 #, no-wrap, priority:100
 msgid "$ git rebase -i Y Z\n"
-msgstr ""
+msgstr "$ git rebase -i Y Z\n"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1170
 #, priority:100
 msgid "and then moving BFC after BBC and squashing it."
-msgstr ""
+msgstr "然后BFC移动到BBC之后并压缩。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1173
 #, priority:100
 msgid "After that you can start bisecting as usual in the new branch and you should eventually find the first bad commit."
-msgstr ""
+msgstr "之后，你可以像往常一样在新的分支中开始二分，最终你应该能找到第一个坏的提交。"
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1178
@@ -70364,37 +70364,37 @@ msgstr "$ git bisect start Z' Y\n"
 #: en/git-bisect-lk2009.txt:1189
 #, priority:100
 msgid "If you are using \"git bisect run\", you can use the same manual fix up as above, and then start another \"git bisect run\" in the special branch. Or as the \"git bisect\" man page says, the script passed to \"git bisect run\" can apply a patch before it compiles and test the software <<8>>. The patch should turn a current untestable commits into a testable one. So the testing will result in \"good\" or \"bad\" and \"git bisect\" will be able to find the first bad commit. And the script should not forget to remove the patch once the testing is done before exiting from the script."
-msgstr ""
+msgstr "如果你使用命令 \"git bisect run\"，你可以使用与上述相同的手段进行修复，然后在特殊分支中启动另一个 \"git bisect run\"。或者如 \"git bisect\"手册所说，作为\"git bisect run\"的脚本可以在编译和测试软件之前添加一个补丁<<8>>。这个补丁需要把当前不可测试的提交变成可测试的。这样，\"git bisect \"将能够找到第一个坏提交，所以测试的结果是 \"好 \"或 \"坏\"。但脚本应当在测试完成后退出脚本前删除补丁。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1194
 #, priority:100
 msgid "(Note that instead of a patch you can use \"git cherry-pick BFC\" to apply the fix, and in this case you should use \"git reset --hard HEAD^\" to revert the cherry-pick after testing and before returning from the script.)"
-msgstr ""
+msgstr "(注意，你可以用 \"git cherry-pick BFC\"代替补丁来应用修复，在这种情况下，你应该用 \"git reset --hard HEAD^\"来在测试后和从脚本返回前恢复甄选（cherry-pick））"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1202
 #, priority:100
 msgid "But the above ways to work around untestable areas are a little bit clunky. Using special branches is nice because these branches can be shared by developers like usual branches, but the risk is that people will get many such branches. And it disrupts the normal \"git bisect\" work-flow. So, if you want to use \"git bisect run\" completely automatically, you have to add special code in your script to restart bisection in the special branches."
-msgstr ""
+msgstr "但上述绕过不可测试区域的方法有点笨拙。使用特殊分支是最好的，因为这些分支可以像普通分支一样被开发者共享，但风险是会创建很多这样的分支。并且它破坏了正常的 \"git bisect \"工作流程。因此，如果你想完全自动地使用 \"git bisect run\"，你必须在你的脚本中添加特殊的代码，以重新启动特殊分支的二分流程。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1207
 #, priority:100
 msgid "Anyway one can notice in the above special branch example that the Z' and Z commits should point to the same source code state (the same \"tree\" in git parlance). That's because Z' result from applying the same changes as Z just in a slightly different order."
-msgstr ""
+msgstr "总之，我们可以注意到，在上述特殊分支的例子中，Z'和Z的提交应该指向相同的源代码状态（用git术语说是相同的 \"树\"）。这是因为Z'的结果是应用了与Z相同的修改，只是顺序略有不同。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1211
 #, priority:100
 msgid "So if we could just \"replace\" Z by Z' when we bisect, then we would not need to add anything to a script. It would just work for anyone in the project sharing the special branches and the replacements."
-msgstr ""
+msgstr "因此，如果我们可以在二分时用Z'来 \"替换\"Z，那么我们就不需要在脚本中添加任何东西。它将对项目中任何共享特殊和替换分支的人起作用。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1213
 #, priority:100
 msgid "With the example above that would give:"
-msgstr ""
+msgstr "通过上面的例子，可以看出："
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1218
@@ -70412,67 +70412,67 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:1225
 #, priority:100
 msgid "That's why the \"git replace\" command was created. Technically it stores replacements \"refs\" in the \"refs/replace/\" hierarchy. These \"refs\" are like branches (that are stored in \"refs/heads/\") or tags (that are stored in \"refs/tags\"), and that means that they can automatically be shared like branches or tags among developers."
-msgstr ""
+msgstr "这就是\"git replace\"命令出现的原因。技术层面，它在 \"refs/replace/\"目录中存储替换的 \"refs\"。这些 \"ref \"就像分支（存储在 \"refs/heads/\"中）或标签（存储在 \"refs/tags \"中），所以它们可以像分支或标签一样自动地在开发者之间共享。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1230
 #, priority:100
 msgid "\"git replace\" is a very powerful mechanism. It can be used to fix commits in already released history, for example to change the commit message or the author. And it can also be used instead of git \"grafts\" to link a repository with another old repository."
-msgstr ""
+msgstr "\"git replace\"拥有非常强大的机制。它可以用来修复发布历史中的提交，例如改变提交的信息或作者。它也可以用来代替git \"grafts\"，将一个仓库与另一个旧仓库连接起来。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1234
 #, priority:100
 msgid "In fact it's this last feature that \"sold\" it to the Git community, so it is now in the \"master\" branch of Git's Git repository and it should be released in Git 1.6.5 in October or November 2009."
-msgstr ""
+msgstr "事实上，正是这最后一个功能把它\"卖\"给了Git社区，所以它目前在Git仓库的\"master\"分支中，应该是在2009年10月或11月的Git 1.6.5版本中发布的。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1241
 #, priority:100
 msgid "One problem with \"git replace\" is that currently it stores all the replacements refs in \"refs/replace/\", but it would be perhaps better if the replacement refs that are useful only for bisecting would be in \"refs/replace/bisect/\". This way the replacement refs could be used only for bisecting, while other refs directly in \"refs/replace/\" would be used nearly all the time."
-msgstr ""
+msgstr "\"git replace\"存在的一个问题是，目前它把所有替换的引用都存放在 \"refs/replace/\"中，但如果把只对二分有用的替换引用放在 \"refs/replace/bisect/\"中，也许会更好。这样一来，替换的引用就可以只用于二分，而直接存储在 \"refs/replace/\"中的其他引用则几乎一直在使用。"
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1243
 #, no-wrap, priority:100
 msgid "Bisecting sporadic bugs"
-msgstr ""
+msgstr "查找零星的漏洞"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1248
 #, priority:100
 msgid "Another possible improvement to \"git bisect\" would be to optionally add some redundancy to the tests performed so that it would be more reliable when tracking sporadic bugs."
-msgstr ""
+msgstr "对 \"git bisect\"的另一个可能的改进是，在所进行的测试中选择性地增加一些冗余，这样在跟踪零星的bug时就会更可靠。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1252
 #, priority:100
 msgid "This has been requested by some kernel developers because some bugs called sporadic bugs do not appear in all the kernel builds because they are very dependent on the compiler output."
-msgstr ""
+msgstr "这是由一些内核开发者提出的要求，因为一些被称为零星漏洞的漏洞不会出现在所有的内核构建过程中，因为发现它们非常依赖于编译器输出。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1261
 #, priority:100
 msgid "The idea is that every 3 test for example, \"git bisect\" could ask the user to test a commit that has already been found to be \"good\" or \"bad\" (because one of its descendants or one of its ancestors has been found to be \"good\" or \"bad\" respectively). If it happens that a commit has been previously incorrectly classified then the bisection can be aborted early, hopefully before too many mistakes have been made. Then the user will have to look at what happened and then restart the bisection using a fixed bisect log."
-msgstr ""
+msgstr "我们的想法是，每3次测试，\"git bisect\"可以要求用户测试一个已经被标记为 \"好 \"或 \"坏 \"的提交（因为它的一个后代或一个祖先已经被视为 \"好 \"或 \"坏\"提交）。如果错误地分类了一个提交，那么可以在酿成大祸之前中止这个过程。接着，用户将不得不查看发生了什么，最后使用固定的日志重新启动二分操作。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1265
 #, priority:100
 msgid "There is already a project called BBChop created by Ealdwulf Wuffinga on Github that does something like that using Bayesian Search Theory <<9>>:"
-msgstr ""
+msgstr "目前，Github上已经有一个由Ealdwulf Wuffinga创建的名为BBChop的项目，其使用贝叶斯搜索理论做了类似的事情<<9>>："
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1272
 #, priority:100
 msgid "BBChop is like 'git bisect' (or equivalent), but works when your bug is intermittent. That is, it works in the presence of false negatives (when a version happens to work this time even though it contains the bug). It assumes that there are no false positives (in principle, the same approach would work, but adding it may be non-trivial)."
-msgstr ""
+msgstr "BBChop就像'git bisect'（或就是），但当存在间歇性漏洞的时候，它就会起作用。也就是说，它在存在假阴性的情况下也能工作（尽管这个版本包含了这个漏洞，但也可以运行）。它假定不存在假阳性（原则上，同样的方法也可以，但这可能不容易）。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1276
 #, priority:100
 msgid "But BBChop is independent of any VCS and it would be easier for Git users to have something integrated in Git."
-msgstr ""
+msgstr "但BBChop是独立于任何VCS的，并且对于Git用户来说，在Git中集成一些东西非常容易。"
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1278
@@ -70484,13 +70484,13 @@ msgstr "结论"
 #: en/git-bisect-lk2009.txt:1285
 #, priority:100
 msgid "We have seen that regressions are an important problem, and that \"git bisect\" has nice features that complement very well practices and other tools, especially test suites, that are generally used to fight regressions. But it might be needed to change some work-flows and (bad) habits to get the most out of it."
-msgstr ""
+msgstr "我们已经了解到，回归是一个重要的问题，\"git bisect\"有强大的功能，同时也可以很好地补充和应用到其他工具中，尤其是通常被用来解决回归问题测试套件。但也需要改变一些工作流程和改正坏习惯，以获得它的最大效益。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1292
 #, priority:100
 msgid "Some improvements to the algorithms inside \"git bisect\" are possible and some new features could help in some cases, but overall \"git bisect\" works already very well, is used a lot, and is already very useful. To back up that last claim, let's give the final word to Ingo Molnar when he was asked by the author how much time does he think \"git bisect\" saves him when he uses it:"
-msgstr ""
+msgstr "\"git bisect\"内部的算法可以进行改进，并且新的功能在特殊情况下也会有帮助，但总的来说，\"git bisect \"已经被大量使用并且非常优秀。Ingo Molnar的发言是最后一个说法的有力支撑，作者问他认为使用 \"git bisect\"能够节省他多少时间："
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1295
@@ -70502,37 +70502,37 @@ msgstr "a _lot_."
 #: en/git-bisect-lk2009.txt:1300
 #, priority:100
 msgid "About ten years ago did i do my first 'bisection' of a Linux patch queue. That was prior the Git (and even prior the BitKeeper) days. I literally days spent sorting out patches, creating what in essence were standalone commits that i guessed to be related to that bug."
-msgstr ""
+msgstr "大约十年前，我第一次对Linux补丁队列进行了 \"二分算法\"。那是在Git（甚至在BitKeeper）出现之前。我真的花了好几天时间来整理补丁，创建了一些我猜测与该错误有关的独立提交。"
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1303
 #, priority:100
 msgid "It was a tool of absolute last resort. I'd rather spend days looking at printk output than do a manual 'patch bisection'."
-msgstr ""
+msgstr "这是一个万不得已的情况下使用的工具。我宁愿花几天时间看printk输出，也不愿意进行手动 的\"补丁分割\"。"
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1308
 #, priority:100
 msgid "With Git bisect it's a breeze: in the best case i can get a ~15 step kernel bisection done in 20-30 minutes, in an automated way. Even with manual help or when bisecting multiple, overlapping bugs, it's rarely more than an hour."
-msgstr ""
+msgstr "使用Git bisect很容易：在最好的情况下，我可以在20-30分钟内以自动化的方式完成约15个步骤的内核分割。即使需要人工帮助，或者在对多个重叠的bug进行分割时，也很少超过一个小时。"
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1314
 #, priority:100
 msgid "In fact it's invaluable because there are bugs i would never even _try_ to debug if it wasn't for git bisect. In the past there were bug patterns that were immediately hopeless for me to debug - at best i could send the crash/bug signature to lkml and hope that someone else can think of something."
-msgstr ""
+msgstr "事实上，它是非常有价值的，因为如果没有git bisect，有些漏洞我甚至不会尝试去调试。在过去，有些漏洞对我来说基本就没有希望进行调试——我最多只能把崩溃/漏洞签名发给lkml，希望别人能想到一些东西。"
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1318
 #, priority:100
 msgid "And even if a bisection fails today it tells us something valuable about the bug: that it's non-deterministic - timing or kernel image layout dependent."
-msgstr ""
+msgstr "即使是在运行失败的情况下，它也会告诉我们关于这个漏洞一些有价值的东西：它是非决定性的——与时间或内核图像布局有关。"
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1321
 #, priority:100
 msgid "So git bisect is unconditional goodness - and feel free to quote that ;-)"
-msgstr ""
+msgstr "因此，git bisect的善良不求回报——请随意引用这句话;-)"
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1324
@@ -70544,31 +70544,31 @@ msgstr "致谢"
 #: en/git-bisect-lk2009.txt:1330
 #, priority:100
 msgid "Many thanks to Junio Hamano for his help in reviewing this paper, for reviewing the patches I sent to the Git mailing list, for discussing some ideas and helping me improve them, for improving \"git bisect\" a lot and for his awesome work in maintaining and developing Git."
-msgstr ""
+msgstr "非常感谢Junio Hamano在审阅本文时提供的帮助，感谢他审阅我发给Git邮件列表的补丁，感谢他讨论一些想法并帮助我改进，感谢他对 \"git bisect\"的大量改进，感谢他在维护和开发Git方面的出色工作。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1335
 #, priority:100
 msgid "Many thanks to Ingo Molnar for giving me very useful information that appears in this paper, for commenting on this paper, for his suggestions to improve \"git bisect\" and for evangelizing \"git bisect\" on the linux kernel mailing lists."
-msgstr ""
+msgstr "非常感谢Ingo Molnar给本文提供非常有用的信息，感谢他对本文的评论，感谢他对 \"git bisect\"的改进建议，感谢他在linux内核邮件列表中对\"git bisect\"的宣传。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1338
 #, priority:100
 msgid "Many thanks to Linus Torvalds for inventing, developing and evangelizing \"git bisect\", Git and Linux."
-msgstr ""
+msgstr "非常感谢Linus Torvalds对 \"git bisect\"、Git和Linux的发明、开发和宣传。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1343
 #, priority:100
 msgid "Many thanks to the many other great people who helped one way or another when I worked on Git, especially to Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
-msgstr ""
+msgstr "非常感谢其他许多在我从事Git工作时以这种或那种方式提供帮助的伟大人物，特别是Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour。"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1346
 #, priority:100
 msgid "Many thanks to the Linux-Kongress program committee for choosing the author to given a talk and for publishing this paper."
-msgstr ""
+msgstr "非常感谢Linux-Kongress计划委员会选择作者进行演讲并发表这篇论文。"
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1348
@@ -70579,9 +70579,9 @@ msgstr "位号"
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1351
-#, fuzzy, priority:100
+#, priority:100
 msgid "[[[1]]] https://web.archive.org/web/20091206032101/http://www.nist.gov/public_affairs/releases/n02-10.htm['Software Errors Cost U.S. Economy $59.5 Billion Annually'. Nist News Release.] See also https://www.nist.gov/system/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], Executive Summary and Chapter 8."
-msgstr "[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], see Executive Summary and Chapter 8."
+msgstr "[[[1]]] https://web.archive.org/web/20091206032101/http://www.nist.gov/public_affairs/releases/n02-10.htm['Software Errors Cost U.S. Economy $59.5 Billion Annually'. Nist News Release.] See also https://www.nist.gov/system/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], Executive Summary and Chapter 8."
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1352