Translated using Weblate (Chinese (Simplified))

Currently translated at 56.4% (6293 of 11142 strings)

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


Signed-off-by: 纪华裕 <8042833@qq.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-08-05 19:25+0200\nPO-Revision-Date: 2023-08-08 13:51+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 5.0-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-08-05 19:25+0200\nPO-Revision-Date: 2023-08-12 03:23+0000\nLast-Translator: 纪华裕 <8042833@qq.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 5.0-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:772 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
@@ -6653,7 +6653,7 @@ msgstr "交互地在索引和工作树之间选择补丁块并将它们添加到
 #. type: Plain text
 #: en/git-add.txt:106
-#, fuzzy, priority:300
+#, priority:300
 msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand.  See ``Interactive mode'' for details."
 msgstr "参见这可以有效地运行 `add --interactive`，但是会绕过初始命令菜单，而直接跳转到 `patch` 子命令。有关详细信息，请参见``交互模式''。"
@@ -33586,9 +33586,9 @@ msgstr "git-log - 显示提交日志"
 #. type: Plain text
 #: en/git-log.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:260
+#, ignore-ellipsis, no-wrap, priority:260
 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
-msgstr "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
+msgstr "'git log' [<options>] [<revision-range>] [[--] <path>...]\n"
 #. type: Plain text
 #: en/git-log.txt:17
@@ -33612,7 +33612,7 @@ msgstr "--follow"
 #: en/git-log.txt:33
 #, priority:260
 msgid "Continue listing the history of a file beyond renames (works only for a single file)."
-msgstr "继续列出一个文件的历史，超过重命名（只对单个文件有效）。"
+msgstr "继续列出文件的历史记录，包括重命名之后的情况（仅适用于单个文件）。"
 #. type: Labeled list
 #: en/git-log.txt:34
@@ -33624,14 +33624,13 @@ msgstr "--no-decorate"
 #: en/git-log.txt:35
 #, no-wrap, priority:260
 msgid "--decorate[=short|full|auto|no]"
-msgstr "--装饰[=短|全|自动|无]"
+msgstr "--decorate[=short|full|auto|no]"
 #. type: Plain text
 #: en/git-log.txt:45
-#, fuzzy, priority:260
-#| msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
+#, priority:260
 msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The option `--decorate` is short-hand for `--decorate=short`.  Default to configuration value of `log.decorate` if configured, otherwise, `auto`."
-msgstr "打印出显示的任何提交的参考名称。如果指定了'short'，将不打印 ref name 的前缀'refs/heads/'、'refs/tags/'和'refs/remotes/'。如果指定'full'，完整的参考文献名称（包括前缀）将被打印。如果指定了'auto'，那么如果输出到终端，参考文献的名称将被显示，就像给了'short'一样，否则不显示参考文献的名称。默认选项是'short'。"
+msgstr "打印显示的任何提交的引用名称。如果指定了 \"short\"，则不会打印引用名称的前缀 \"refs/heads/\"、\"refs/tags/\" 和 \"refs/remotes/\"。如果指定了 \"full\"，将打印完整的引用名称（包括前缀）。如果指定了 \"auto\"，则如果输出是发送到终端，则显示引用名称，就如同指定了\"short\"一样，否则不显示引用名称。选项 `--decorate` 是 `--decorate=short` 的简写。如果配置了 `log.decorate` 的配置值，默认为配置值，否则为 \"auto\"。"
 #. type: Labeled list
 #: en/git-log.txt:46
@@ -37513,9 +37512,9 @@ msgstr "git-mv - 移动或重命名一个文件、一个目录或一个符号链
 #. type: Plain text
 #: en/git-mv.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#, ignore-ellipsis, no-wrap, priority:280
 msgid "'git mv' [<options>] <source>... <destination>\n"
-msgstr "'git annotate' [<options>] <file> [<revision>]\n"
+msgstr "'git mv' [<options>] <source>... <destination>\n"
 #. type: Plain text
 #: en/git-mv.txt:17
@@ -37529,58 +37528,55 @@ msgstr "移动或重命名一个文件、目录或符号链接。"
 msgid ""
 " git mv [-v] [-f] [-n] [-k] <source> <destination>\n"
 " git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>\n"
-msgstr ""
-" git mv [-v] [-f] [-n] [-k] <来源> <目的地>。\n"
-" git mv [-v] [-f] [-n] [-k] <source> ...<目的地>目录\n"
+msgstr " git mv [-v] [-f] [-n] [-k] <源文件> <目标文件>\n git mv [-v] [-f] [-n] [-k] <源文件> ...<目标目录>\n"
 #. type: Plain text
 #: en/git-mv.txt:25
 #, priority:280
 msgid "In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>.  In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory."
-msgstr "在第一种形式中，它将<source>重命名为<destination>，它必须存在并且是一个文件、符号链接或目录。  在第二种形式中，最后一个参数必须是一个现有的目录；给定的源将被移到这个目录中。"
+msgstr "在第一种形式中，它将 <源文件>（必须存在且可以是文件、符号链接或目录）重命名为 <目标文件>。在第二种形式中，最后一个参数必须是一个已存在的目录；给定的源文件将被移动到该目录中。"
 #. type: Plain text
 #: en/git-mv.txt:28
 #, priority:280
 msgid "The index is updated after successful completion, but the change must still be committed."
-msgstr "索引在成功完成后被更新，但变化仍必须被提交。"
+msgstr "在移动成功完成后，索引就会被更新，但更改仍需要进行提交才能生效。"
 #. type: Plain text
 #: en/git-mv.txt:34
-#, fuzzy, priority:280
-#| msgid "Force renaming or moving of a file even if the target exists"
+#, priority:280
 msgid "Force renaming or moving of a file even if the <destination> exists."
-msgstr "强制重命名或移动一个文件，即使目标存在。"
+msgstr "即使 <目标文件> 存在，也强制重命名或移动文件。"
 #. type: Plain text
 #: en/git-mv.txt:39
 #, priority:280
 msgid "Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given."
-msgstr "跳过会导致错误情况的移动或重命名操作。当一个源文件既不存在也不被Git控制，或者它将覆盖一个现有的文件时，就会发生错误，除非给出`-f`。"
+msgstr "跳过可能导致错误条件的移动或重命名操作。当源文件既不存在也不受Git控制，或者在没有提供 -f 选项的情况下覆盖现有文件时，该指令就会就会发生错误。"
 #. type: Plain text
 #: en/git-mv.txt:42
 #, priority:280
 msgid "Do nothing; only show what would happen"
-msgstr "什么都不做；只显示会发生什么"
+msgstr "什么都不做，仅显示将会发生的操作"
 #. type: Plain text
 #: en/git-mv.txt:46
 #, priority:280
 msgid "Report the names of files as they are moved."
-msgstr "当文件被移动时，报告它们的名称。"
+msgstr "报告文件在移动时的名称的变化。"
 #. type: Plain text
 #: en/git-mv.txt:54
 #, priority:280
 msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location.  It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
-msgstr "使用 gitfile 移动一个子模块（这意味着它们是用 1.7.8 或更新的 Git 版本克隆的）将更新 gitfile 和 core.worktree 设置以使子模块在新的位置工作。  它也会尝试更新linkgit:gitmodules[5]文件中的submodule.<name>.path设置，并将该文件放入舞台（除非使用-n）。"
+msgstr "使用 gitfile（意味着它们是使用 Git 1.7.8 或更新版本进行克隆的）来移动子模块将更新 gitfile 和 core.worktree 设置，以使子模块在新位置正常工作。它还将尝试更新 linkgit:gitmodules[5] 文件中的 submodule.<name>.path 设置，并将该文件暂存（除非使用了 -n 选项）。"
 #. type: Plain text
 #: en/git-mv.txt:66
 #, priority:280
 msgid "Each time a superproject update moves a populated submodule (e.g. when switching between commits before and after the move) a stale submodule checkout will remain in the old location and an empty directory will appear in the new location. To populate the submodule again in the new location the user will have to run \"git submodule update\" afterwards. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. Both steps will be obsolete when recursive submodule update has been implemented."
-msgstr "每次超级项目更新移动一个已填充的子模块（例如，当在移动前后的提交之间切换时），一个陈旧的子模块检出将保留在旧的位置，一个空目录将出现在新的位置。要在新的位置再次填充子模块，用户将不得不在之后运行 \"git submodule update\"。移除舊目錄只有在使用 gitfile 時才是安全的，否則子模塊的歷史也會被刪除。当递归子模块更新被实施后，这两个步骤将被淘汰。"
+msgstr "每当父工程更新导致子模块移动时（例如，在移动之前和之后的提交之间切换时），旧位置将保留一个陈旧的子模块检出，并在新位置出现一个空目录。要在新位置重新填充子模块，用户必须运行 \"git submodule update\"。只有在旧目录使用 gitfile 时，删除旧目录才是安全的，否则子模块的历史记录也将被删除。当实现递归子模块更新时，这两个步骤将变得不再需要。"
 #. type: Title =
 #: en/git-name-rev.txt:2
@@ -37772,26 +37768,13 @@ msgstr "git-notes(1)"
 #. type: Plain text
 #: en/git-notes.txt:7
-#, fuzzy, priority:280
+#, priority:280
 msgid "git-notes - Add or inspect object notes"
-msgstr "git-notes - Add or inspect object notes"
+msgstr "git-notes - 添加或查看对象注释"
 #. type: Plain text
 #: en/git-notes.txt:23
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid ""
-#| "'git notes' [list [<object>]]\n"
-#| "'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-#| "'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
-#| "'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-#| "'git notes' edit [--allow-empty] [<object>]\n"
-#| "'git notes' show [<object>]\n"
-#| "'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
-#| "'git notes' merge --commit [-v | -q]\n"
-#| "'git notes' merge --abort [-v | -q]\n"
-#| "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
-#| "'git notes' prune [-n] [-v]\n"
-#| "'git notes' get-ref\n"
+#, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git notes' [list [<object>]]\n"
 "'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
@@ -37805,31 +37788,19 @@ msgid ""
 "'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n"
 "'git notes' prune [-n] [-v]\n"
 "'git notes' get-ref\n"
-msgstr ""
-"'git notes' [list [<object>]]\n"
-"'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] 。\n"
-"'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n"
-"'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n"
-"'git notes' edit [--allow-empty] [<object>])\n"
-"'git notes' 显示 [<object>]\n"
-"'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n"
-"'git notes' merge --commit [-v | -q]\n"
-"'git notes' merge --abort [-v | -q]\n"
-"'git notes' remove [--ignore-missing] [--stdin] [<object>...]。\n"
-"'git notes' prune [-n] [-v]\n"
-"'git notes' get-ref\n"
+msgstr "'git notes' [list [<object>]]\n'git notes' add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )\n'git notes' append [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]\n'git notes' edit [--allow-empty] [<object>] [--[no-]stripspace]\n'git notes' show [<object>]\n'git notes' merge [-v | -q] [-s <strategy> ] <notes-ref>\n'git notes' merge --commit [-v | -q]\n'git notes' merge --abort [-v | -q]\n'git notes' remove [--ignore-missing] [--stdin] [<object>...]\n'git notes' prune [-n] [-v]\n'git notes' get-ref\n"
 #. type: Plain text
 #: en/git-notes.txt:29
 #, priority:280
 msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
-msgstr "添加、删除或读取附在物体上的注释，而不接触物体本身。"
+msgstr "添加、移除或读取附加在对象上的注释，而不影响对象本身。"
 #. type: Plain text
 #: en/git-notes.txt:34
 #, priority:280
 msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden.  See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below.  If this ref does not exist, it will be quietly created when it is first needed to store a note."
-msgstr "默认情况下，笔记被保存到`refs/notes/commits`并从那里读取，但这个默认值可以被覆盖。  参见下面的OPTIONS, CONFIGURATION和ENVIRONMENT部分。  如果这个参考文献不存在，当它第一次需要存储笔记时，它将被悄悄地创建。"
+msgstr "默认情况下，注释被保存在 `refs/notes/commits` 中，并且可以覆盖此默认设置。请参阅下面的 OPTIONS、CONFIGURATION 和 ENVIRONMENT 部分。如果该引用不存在，当首次需要存储注释时，它将被静默地创建。"
 #. type: Plain text
 #: en/git-notes.txt:41
@@ -44198,50 +44169,49 @@ msgstr ""
 #: en/git-rebase.txt:466
 #, priority:100
 msgid "If `<upstream>` or `--keep-base` is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`. See also `rebase.forkpoint` in linkgit:git-config[1]."
-msgstr ""
+msgstr "如果在命令行中提供了 `<上游仓库> ` 或 `--keep-base ` 参数，则默认为 `--no-fork-point`，否则默认为 `--fork-point`。另请参阅 linkgit:git-config[1] 中的 `rebase.forkpoint`。"
 #. type: Plain text
 #: en/git-rebase.txt:470
 #, priority:100
 msgid "If your branch was based on `<upstream>` but `<upstream>` was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
-msgstr ""
+msgstr "如果你的分支基于 `<上游仓库>`，但 `<上游仓库>` 被回退了，而你的分支包含了被删除的提交，那么可以使用 `--keep-base` 选项来从你的分支中删除那些提交。"
 #. type: Plain text
 #: en/git-rebase.txt:477
 #, priority:100
 msgid "Ignore whitespace differences when trying to reconcile differences. Currently, each backend implements an approximation of this behavior:"
-msgstr ""
+msgstr "在尝试协调差异时空格的差异。目前，每个后端都实现了对此行为的近似处理："
 #. type: Labeled list
 #: en/git-rebase.txt:478
 #, no-wrap, priority:100
 msgid "apply backend"
-msgstr ""
+msgstr "应用后端"
 #. type: Plain text
 #: en/git-rebase.txt:484
 #, priority:100
 msgid "When applying a patch, ignore changes in whitespace in context lines. Unfortunately, this means that if the \"old\" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application."
-msgstr ""
+msgstr "在应用补丁时，忽略上下文行中的空格更改。不幸的是，这意味着如果补丁中要替换的“旧”行与现有文件中的行仅在空格方面有差异，你将得到一个合并冲突而不是成功的补丁应用。"
 #. type: Labeled list
 #: en/git-rebase.txt:485
-#, fuzzy, no-wrap, priority:100
-#| msgid "--merge-base"
+#, no-wrap, priority:100
 msgid "merge backend"
-msgstr "--merge-base"
+msgstr "合并后端"
 #. type: Plain text
 #: en/git-rebase.txt:490
 #, priority:100
 msgid "Treat lines with only whitespace changes as unchanged when merging.  Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted."
-msgstr ""
+msgstr "在合并时，将仅包含空格更改的行视为未更改。不幸的是，这意味着任何旨在修改空格而不涉及其他更改的补丁块将被丢弃，即使另一方没有发生冲突的更改。"
 #. type: Plain text
 #: en/git-rebase.txt:495
 #, priority:100
 msgid "This flag is passed to the `git apply` program (see linkgit:git-apply[1]) that applies the patch.  Implies `--apply`."
-msgstr ""
+msgstr "这个标志被传递给应用补丁的 `git apply` 程序（参阅 linkgit:git-apply[1]）。它隐含了 `--apply`。"
 #. type: Plain text
 #: en/git-rebase.txt:502