Translated using Weblate (Chinese (Simplified))

Currently translated at 71.0% (7946 of 11184 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-11-04 20:14+0100\nPO-Revision-Date: 2023-11-11 01:34+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.2-dev\n"
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-11-04 20:14+0100\nPO-Revision-Date: 2023-11-18 12:03+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.2\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:780 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:180 en/git-status.txt:31
@@ -23097,7 +23097,7 @@ msgstr "事件发生的时间由 `<时间>` 指定，是自 UNIX 纪元（世界
 #: en/git-fast-import.txt:288
 #, priority:90
 msgid "The local offset is specified by `<offutc>` as a positive or negative offset from UTC.  For example EST (which is 5 hours behind UTC)  would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''.  The local offset does not affect `<time>`; it is used only as an advisement to help formatting routines display the timestamp."
-msgstr ""
+msgstr "本地偏移量由 `<offutc>` 指定，与 UTC 的偏移量为正或负。  例如，东部标准时间（比协调世界时晚 5 小时）在 `<tz>` 中表示为 ''0500''，而协调世界时为 ''+0000''。  本地偏移并不影响 `<time>`；它只是作为一种提示，帮助格式化例程显示时间戳。"
 #. type: Plain text
 #: en/git-fast-import.txt:294
@@ -36159,19 +36159,19 @@ msgstr "\t<<<<<<< A\n\t文件 A 中的某几行\n\t=======\n\t文件 B 中的某
 #: en/git-merge-file.txt:42
 #, priority:90
 msgid "If there are conflicts, the user should edit the result and delete one of the alternatives.  When `--ours`, `--theirs`, or `--union` option is in effect, however, these conflicts are resolved favouring lines from `<current-file>`, lines from `<other-file>`, or lines from both respectively.  The length of the conflict markers can be given with the `--marker-size` option."
-msgstr ""
+msgstr "如果存在冲突，用户应编辑结果并删除其中一个备选行。  但是，如果使用了 `--ours`、`--theirs` 或 `--union`选项，这些冲突就会分别以 `<当前文件>`、`<其他文件>` 或两者的行为优先。  冲突标记的长度可以用 `--marker-size` 选项给出。"
 #. type: Plain text
 #: en/git-merge-file.txt:46
 #, priority:90
 msgid "The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0."
-msgstr ""
+msgstr "如果程序出错，则退出值为负数，否则退出值为冲突数（如果冲突数超过 127，则截断为 127）。如果合并无误，则退出值为 0。"
 #. type: Plain text
 #: en/git-merge-file.txt:50
 #, priority:90
 msgid "'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it implements all of RCS 'merge''s functionality which is needed by linkgit:git[1]."
-msgstr ""
+msgstr "'git merge-file' 被设计为 RCS 'merge' 的最小克隆；也就是说，它实现了 RCS 'merge' 的所有功能，而这正是 linkgit:git[1] 所需要的。"
 #. type: Labeled list
 #: en/git-merge-file.txt:55
@@ -36183,19 +36183,19 @@ msgstr "-L <label>"
 #: en/git-merge-file.txt:62
 #, priority:90
 msgid "This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, `git merge-file -L x -L y -L z a b c` generates output that looks like it came from files x, y and z instead of from files a, b and c."
-msgstr ""
+msgstr "这个选项最多可以给出三次，它指定了在冲突报告中用来代替相应文件名的标签。也就是说，`git merge-file -L x -L y -L z a b c` 产生的输出看起来像是来自文件 x、y 和 z，而不是文件 a、b 和 c。"
 #. type: Plain text
 #: en/git-merge-file.txt:66
 #, priority:90
 msgid "Send results to standard output instead of overwriting `<current-file>`."
-msgstr ""
+msgstr "将结果发送到标准输出，而不是覆盖 `<当前文件>`。"
 #. type: Plain text
 #: en/git-merge-file.txt:69
 #, priority:90
 msgid "Quiet; do not warn about conflicts."
-msgstr ""
+msgstr "安静；不警告冲突。"
 #. type: Labeled list
 #: en/git-merge-file.txt:70
@@ -36207,7 +36207,7 @@ msgstr "--diff3"
 #: en/git-merge-file.txt:72
 #, priority:90
 msgid "Show conflicts in \"diff3\" style."
-msgstr ""
+msgstr "以 \"diff3\" 样式显示冲突。"
 #. type: Labeled list
 #: en/git-merge-file.txt:73
@@ -36219,7 +36219,7 @@ msgstr "--zdiff3"
 #: en/git-merge-file.txt:75
 #, priority:90
 msgid "Show conflicts in \"zdiff3\" style."
-msgstr ""
+msgstr "以 \"zdiff3\" 样式显示冲突。"
 #. type: Labeled list
 #: en/git-merge-file.txt:78
@@ -36231,31 +36231,31 @@ msgstr "--union"
 #: en/git-merge-file.txt:81
 #, priority:90
 msgid "Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines."
-msgstr ""
+msgstr "与其在文件中留下冲突，不如解决冲突，使冲突有利于我们（或他们或双方）。"
 #. type: Labeled list
 #: en/git-merge-file.txt:86
 #, no-wrap, priority:90
 msgid "`git merge-file README.my README README.upstream`"
-msgstr ""
+msgstr "`git merge-file README.my README README.upstream`"
 #. type: Plain text
 #: en/git-merge-file.txt:90
 #, priority:90
 msgid "combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my."
-msgstr ""
+msgstr "合并 README.my 和 README.upstream 自 README 以来的改动，尝试合并它们，并将结果写入 README.my。"
 #. type: Labeled list
 #: en/git-merge-file.txt:91
 #, no-wrap, priority:90
 msgid "`git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`"
-msgstr ""
+msgstr "`git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`"
 #. type: Plain text
 #: en/git-merge-file.txt:95
 #, priority:90
 msgid "merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and `c` instead of `tmp/a123` and `tmp/c345`."
-msgstr ""
+msgstr "将 tmp/a123 和 tmp/c345 与基础 tmp/b234 合并，但使用标签 `a` 和 `c` 代替 `tmp/a123` 和 `tmp/c345`。"
 #. type: Title =
 #: en/git-merge-index.txt:2
@@ -36279,31 +36279,31 @@ msgstr "'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)\n"
 #: en/git-merge-index.txt:20
 #, priority:90
 msgid "This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4.  File modes for the three files are passed as arguments 5, 6 and 7."
-msgstr ""
+msgstr "它会查找索引中的 <文件> 文件，如果有合并条目，则将这些文件的 SHA-1 哈希值作为参数 1、2、3（如果没有文件则为空参数）和 <文件> 作为参数 4 传递。  三个文件的文件模式作为参数 5、6 和 7 传递。"
 #. type: Plain text
 #: en/git-merge-index.txt:28
 #, priority:90
 msgid "Run merge against all files in the index that need merging."
-msgstr ""
+msgstr "针对索引中需要合并的所有文件运行合并。"
 #. type: Plain text
 #: en/git-merge-index.txt:34
 #, priority:90
 msgid "Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned errors, and only return the error code after all the merges."
-msgstr ""
+msgstr "不要在第一次合并失败时就停止，而是一次性完成所有合并--即使之前的合并返回错误，也要继续合并，并且只在所有合并后返回错误代码。"
 #. type: Plain text
 #: en/git-merge-index.txt:39
 #, priority:90
 msgid "Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for porcelains which might want to emit custom messages."
-msgstr ""
+msgstr "不要抱怨合并程序失败（合并程序失败通常表示合并过程中发生冲突）。这适用于可能希望发出自定义信息的上层命令。"
 #. type: Plain text
 #: en/git-merge-index.txt:43
 #, priority:90
 msgid "If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code."
-msgstr ""
+msgstr "如果调用 'git merge-index' 时有多个 <文件>s （或 -a），那么只有在 merge 返回非零退出代码时，才会依次处理它们。"
 #. type: Plain text
 #: en/git-merge-index.txt:46
@@ -36315,13 +36315,13 @@ msgstr ""
 #: en/git-merge-index.txt:49
 #, priority:90
 msgid "A sample script called 'git merge-one-file' is included in the distribution."
-msgstr ""
+msgstr "发行版中包含一个名为 'git merge-one-file' 的示例脚本。"
 #. type: Plain text
 #: en/git-merge-index.txt:54
 #, priority:90
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
-msgstr ""
+msgstr "警报 警报Git 的 “合并对象顺序” 与 RCS 的 'merge' 程序合并对象顺序不同。在上述顺序中，原始文件在前。但三方合并程序 'merge' 的参数顺序是把原始文件放在中间。别问我为什么。"
 #. type: Plain text
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
@@ -36338,7 +36338,7 @@ msgid ""
 "This is modified MM in the branch A.\t\t# merge1\n"
 "This is modified MM in the branch B.\t\t# merge2\n"
 "This is modified MM in the branch B.\t\t# current contents\n"
-msgstr ""
+msgstr "torvalds@ppc970:~/merge-test> git merge-index cat MM\nThis is MM from the original tree.\t\t# 初分支\nThis is modified MM in the branch A.\t\t# 合并1\nThis is modified MM in the branch B.\t\t# 合并2\nThis is modified MM in the branch B.\t\t# 现在的内容\n"
 #. type: delimited block -
 #: en/git-merge-index.txt:74
@@ -36362,7 +36362,7 @@ msgstr ""
 #: en/git-merge-index.txt:80
 #, priority:90
 msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
-msgstr ""
+msgstr "后一个例子说明了 'git merge-index' 如何在出现错误时停止合并（即 `cat` 对 AA 文件返回错误，因为它在原始文件中并不存在，因此 'git merge-index' 甚至没有尝试合并 MM 文件）。"
 #. type: Title =
 #: en/git-merge-one-file.txt:2
@@ -38782,31 +38782,31 @@ msgstr ""
 #: en/git-p4.txt:22
 #, priority:90
 msgid "This command provides a way to interact with p4 repositories using Git."
-msgstr ""
+msgstr "该命令提供了一种使用 Git 与 p4 仓库交互的方法。"
 #. type: Plain text
 #: en/git-p4.txt:30
 #, priority:90
 msgid "Create a new Git repository from an existing p4 repository using 'git p4 clone', giving it one or more p4 depot paths.  Incorporate new commits from p4 changes with 'git p4 sync'.  The 'sync' command is also used to include new branches from other p4 depot paths.  Submit Git changes back to p4 using 'git p4 submit'.  The command 'git p4 rebase' does a sync plus rebases the current branch onto the updated p4 remote branch."
-msgstr ""
+msgstr "使用 'git p4 clone' 从现有的 p4 仓库创建一个新的 Git 仓库，并赋予它一个或多个 p4 仓库路径。  使用 'git p4 sync' 从 p4 变更中纳入新提交。  'sync' 命令也可用于纳入来自其他 p4 仓库路径的新分支。  使用 'git p4 submit' 将 Git 变动提交回 p4。  'git p4 rebase' 命令在同步的基础上，将当前分支重定向到更新后的 p4 远程分支上。"
 #. type: Plain text
 #: en/git-p4.txt:35
 #, priority:90
 msgid "Clone a repository:"
-msgstr ""
+msgstr "克隆仓库"
 #. type: delimited block -
 #: en/git-p4.txt:38 en/git-p4.txt:71
 #, no-wrap, priority:90
 msgid "$ git p4 clone //depot/path/project\n"
-msgstr ""
+msgstr "$ git p4 clone //depot/path/project\n"
 #. type: Plain text
 #: en/git-p4.txt:41
 #, priority:90
 msgid "Do some work in the newly created Git repository:"
-msgstr ""
+msgstr "在新创建的 Git 仓库中做一些工作："
 #. type: delimited block -
 #: en/git-p4.txt:46
@@ -38824,7 +38824,7 @@ msgstr ""
 #: en/git-p4.txt:50
 #, priority:90
 msgid "Update the Git repository with recent changes from p4, rebasing your work on top:"
-msgstr ""
+msgstr "用 p4 的最新改动更新 Git 仓库，并将你的工作重新加载到上面："
 #. type: delimited block -
 #: en/git-p4.txt:53 en/git-p4.txt:130
@@ -38836,7 +38836,7 @@ msgstr "$ git p4 rebase\n"
 #: en/git-p4.txt:56
 #, priority:90
 msgid "Submit your commits back to p4:"
-msgstr ""
+msgstr "将您的提交提交回 p4："
 #. type: delimited block -
 #: en/git-p4.txt:59 en/git-p4.txt:145
@@ -38854,7 +38854,7 @@ msgstr "克隆"
 #: en/git-p4.txt:69
 #, priority:90
 msgid "Generally, 'git p4 clone' is used to create a new Git directory from an existing p4 repository:"
-msgstr ""
+msgstr "一般来说，'git p4 clone' 用于从现有的 p4 仓库创建一个新的 Git 目录："
 #. type: Plain text
 #: en/git-p4.txt:73
@@ -38866,25 +38866,25 @@ msgstr ""
 #: en/git-p4.txt:75
 #, priority:90
 msgid "Creates an empty Git repository in a subdirectory called 'project'."
-msgstr ""
+msgstr "在名为 'project' 的子目录下创建一个空的 Git 仓库。"
 #. type: Plain text
 #: en/git-p4.txt:78
 #, priority:90
 msgid "Imports the full contents of the head revision from the given p4 depot path into a single commit in the Git branch 'refs/remotes/p4/master'."
-msgstr ""
+msgstr "从给定的 p4 仓库路径导入头修订版的全部内容到 Git 分支 'refs/remotes/p4/master' 中的一次提交。"
 #. type: Plain text
 #: en/git-p4.txt:80
 #, priority:90
 msgid "Creates a local branch, 'master' from this remote and checks it out."
-msgstr ""
+msgstr "从远程分支创建本地分支 'master'，并对其进行检查。"
 #. type: Plain text
 #: en/git-p4.txt:83
 #, priority:90
 msgid "To reproduce the entire p4 history in Git, use the '@all' modifier on the depot path:"
-msgstr ""
+msgstr "要在 Git 中重现整个 p4 历史，请在仓库路径上使用 '@all' 修饰符："
 #. type: delimited block -
 #: en/git-p4.txt:85
@@ -38902,7 +38902,7 @@ msgstr "同步"
 #: en/git-p4.txt:92
 #, priority:90
 msgid "As development continues in the p4 repository, those changes can be included in the Git repository using:"
-msgstr ""
+msgstr "随着 p4 仓库开发的继续，这些变更也会被纳入 Git 仓库："
 #. type: delimited block -
 #: en/git-p4.txt:94
@@ -38914,13 +38914,13 @@ msgstr "$ git p4 sync\n"
 #: en/git-p4.txt:96
 #, priority:90
 msgid "This command finds new changes in p4 and imports them as Git commits."
-msgstr ""
+msgstr "该命令在 p4 中查找新的改动，并将其导入 Git 提交。"
 #. type: Plain text
 #: en/git-p4.txt:99
 #, priority:90
 msgid "P4 repositories can be added to an existing Git repository using 'git p4 sync' too:"
-msgstr ""
+msgstr "也可以使用 'git p4 sync' 将 P4 仓库添加到现有的 Git 仓库中："
 #. type: delimited block -
 #: en/git-p4.txt:104
@@ -38940,19 +38940,19 @@ msgstr ""
 #: en/git-p4.txt:109
 #, priority:90
 msgid "This imports the specified depot into 'refs/remotes/p4/master' in an existing Git repository.  The `--branch` option can be used to specify a different branch to be used for the p4 content."
-msgstr ""
+msgstr "将指定的仓库导入现有 Git 仓库中的 'refs/remotes/p4/master'。  可以使用 `--branch` 选项为 p4 内容指定不同的分支。"
 #. type: Plain text
 #: en/git-p4.txt:114
 #, priority:90
 msgid "If a Git repository includes branches 'refs/remotes/origin/p4', these will be fetched and consulted first during a 'git p4 sync'.  Since importing directly from p4 is considerably slower than pulling changes from a Git remote, this can be useful in a multi-developer environment."
-msgstr ""
+msgstr "如果 Git 仓库包含分支 'refs/remotes/origin/p4'，那么在 'git p4 sync' 过程中，这些分支将首先被获取和查阅。  由于直接从 p4 导入要比从 Git 远端拉取更改慢得多，这在多开发人员环境中非常有用。"
 #. type: Plain text
 #: en/git-p4.txt:119
 #, priority:90
 msgid "If there are multiple branches, doing 'git p4 sync' will automatically use the \"BRANCH DETECTION\" algorithm to try to partition new changes into the right branch.  This can be overridden with the `--branch` option to specify just a single branch to update."
-msgstr ""
+msgstr "如果有多个分支，'git p4 sync' 会自动使用 “分支检测” 算法将新的改动分到正确的分支。  可以用 `--branch` 选项覆盖该算法，只指定更新一个分支。"
 #. type: Title ~
 #: en/git-p4.txt:122
@@ -38964,7 +38964,7 @@ msgstr "重写"
 #: en/git-p4.txt:128
 #, priority:90
 msgid "A common working pattern is to fetch the latest changes from the p4 depot and merge them with local uncommitted changes.  Often, the p4 repository is the ultimate location for all code, thus a rebase workflow makes sense.  This command does 'git p4 sync' followed by 'git rebase' to move local commits on top of updated p4 changes."
-msgstr ""
+msgstr "常见的工作模式是从 p4 仓库获取最新的修改，然后与本地未提交的修改合并。  通常情况下，p4 仓库是所有代码的最终位置，因此使用 rebase 工作流程是合理的。  该命令先执行 'git p4 sync'，然后再执行 'git rebase'，将本地提交移至 p4 更新的改动之上。"
 #. type: Title ~
 #: en/git-p4.txt:134
@@ -38976,19 +38976,19 @@ msgstr "提交"
 #: en/git-p4.txt:140
 #, priority:90
 msgid "Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace.  This should be specified using the `P4CLIENT` environment variable or the Git configuration variable 'git-p4.client'.  The p4 client must exist, but the client root will be created and populated if it does not already exist."
-msgstr ""
+msgstr "将 Git 仓库中的更改提交回 p4 仓库需要一个单独的 p4 客户端工作区。  这需要使用 `P4CLIENT` 环境变量或 Git 配置变量 'git-p4.client' 来指定。  p4 客户端必须存在，但如果客户端根目录不存在，则会创建并填充客户端根目录。"
 #. type: Plain text
 #: en/git-p4.txt:143
 #, priority:90
 msgid "To submit all changes that are in the current Git branch but not in the 'p4/master' branch, use:"
-msgstr ""
+msgstr "要提交当前 Git 分支中但不在 'p4/master' 分支中的所有更改，请使用："
 #. type: Plain text
 #: en/git-p4.txt:148
 #, priority:90
 msgid "To specify a branch other than the current one, use:"
-msgstr ""
+msgstr "要指定当前分支以外的分支，请使用："
 #. type: delimited block -
 #: en/git-p4.txt:150
@@ -39000,7 +39000,7 @@ msgstr "$ git p4 submit topicbranch\n"
 #: en/git-p4.txt:153
 #, priority:90
 msgid "To specify a single commit or a range of commits, use:"
-msgstr ""
+msgstr "要指定一次提交或一系列提交，请使用："
 #. type: delimited block -
 #: en/git-p4.txt:156
@@ -39016,19 +39016,19 @@ msgstr ""
 #: en/git-p4.txt:160
 #, priority:90
 msgid "The upstream reference is generally 'refs/remotes/p4/master', but can be overridden using the `--origin=` command-line option."
-msgstr ""
+msgstr "上游引用通常是 'refs/remotes/p4/master'，但可以使用 `--origin=` 命令行选项来覆盖。"
 #. type: Plain text
 #: en/git-p4.txt:165
 #, priority:90
 msgid "The p4 changes will be created as the user invoking 'git p4 submit'. The `--preserve-user` option will cause ownership to be modified according to the author of the Git commit.  This option requires admin privileges in p4, which can be granted using 'p4 protect'."
-msgstr ""
+msgstr "p4 变更将以调用 'git p4 submit' 的用户身份创建。`--preserver-user` 选项会根据 Git 提交的作者修改所有权。  该选项需要 p4 的管理员权限，可以使用 'p4 protect' 授予。"
 #. type: Plain text
 #: en/git-p4.txt:167
 #, priority:90
 msgid "To shelve changes instead of submitting, use `--shelve` and `--update-shelve`:"
-msgstr ""
+msgstr "要搁置更改而不是提交，请使用 `--shelve` 和 `--update-shelve`："
 #. type: delimited block -
 #: en/git-p4.txt:171
@@ -39050,25 +39050,25 @@ msgstr "Unshelve"
 #: en/git-p4.txt:178
 #, priority:90
 msgid "Unshelving will take a shelved P4 changelist, and produce the equivalent git commit in the branch refs/remotes/p4-unshelved/<changelist>."
-msgstr ""
+msgstr "取消上架会获取已上架的 P4 更新列表，并在 refs/remotes/p4-unshelved/<变更列表> 分支中产生等价的 git 提交。"
 #. type: Plain text
 #: en/git-p4.txt:182
 #, priority:90
 msgid "The git commit is created relative to the current origin revision (HEAD by default).  A parent commit is created based on the origin, and then the unshelve commit is created based on that."
-msgstr ""
+msgstr "git 提交是相对于当前的源版本（默认为 HEAD）创建的。  根据起源创建父提交，然后根据父提交创建解保存提交。"
 #. type: Plain text
 #: en/git-p4.txt:184
 #, priority:90
 msgid "The origin revision can be changed with the \"--origin\" option."
-msgstr ""
+msgstr "可以使用 \"--origin\" 选项更改原点版本。"
 #. type: Plain text
 #: en/git-p4.txt:187
 #, priority:90
 msgid "If the target branch in refs/remotes/p4-unshelved already exists, the old one will be renamed."
-msgstr ""
+msgstr "如果 refs/remotes/p4-unshelved 中的目标分支已经存在，旧分支将被重命名。"
 #. type: delimited block -
 #: en/git-p4.txt:195
@@ -39098,7 +39098,7 @@ msgstr "常规选项"
 #: en/git-p4.txt:204
 #, priority:90
 msgid "All commands except clone accept these options."
-msgstr ""
+msgstr "除克隆外，所有命令都接受这些选项。"
 #. type: Labeled list
 #: en/git-p4.txt:205
@@ -39110,13 +39110,13 @@ msgstr "--git-dir <dir>"
 #: en/git-p4.txt:207
 #, priority:90
 msgid "Set the `GIT_DIR` environment variable.  See linkgit:git[1]."
-msgstr ""
+msgstr "设置 `GIT_DIR` 环境变量。  参见 linkgit:git[1]。"
 #. type: Plain text
 #: en/git-p4.txt:211
 #, priority:90
 msgid "Provide more progress information."
-msgstr ""
+msgstr "提供更多进度信息。"
 #. type: Title ~
 #: en/git-p4.txt:213
@@ -39128,7 +39128,7 @@ msgstr "同步选项"
 #: en/git-p4.txt:216
 #, priority:90
 msgid "These options can be used in the initial 'clone' as well as in subsequent 'sync' operations."
-msgstr ""
+msgstr "这些选项可用于初始 'clone' 和后续 'sync' 操作。"
 #. type: Labeled list
 #: en/git-p4.txt:217
@@ -39140,25 +39140,25 @@ msgstr "--branch <ref>"
 #: en/git-p4.txt:221
 #, priority:90
 msgid "Import changes into <ref> instead of refs/remotes/p4/master.  If <ref> starts with refs/, it is used as is.  Otherwise, if it does not start with p4/, that prefix is added."
-msgstr ""
+msgstr "将更改导入 <引入> 而不是 refs/remotes/p4/master。  如果 <引用> 以 refs/ 开头，则按原样使用。  否则，如果不是以 p4/ 开头，则会添加该前缀。"
 #. type: Plain text
 #: en/git-p4.txt:225
 #, priority:90
 msgid "By default a <ref> not starting with refs/ is treated as the name of a remote-tracking branch (under refs/remotes/).  This behavior can be modified using the --import-local option."
-msgstr ""
+msgstr "默认情况下，不以 refs/ 开头的 <引用> 会被视为远程跟踪分支的名称（位于 refs/remotes/ 下）。  可以使用 --import-local 选项修改这一行为。"
 #. type: Plain text
 #: en/git-p4.txt:227
 #, priority:90
 msgid "The default <ref> is \"master\"."
-msgstr ""
+msgstr "默认 <引用> 为 \"master\"。"
 #. type: Plain text
 #: en/git-p4.txt:230
 #, priority:90
 msgid "This example imports a new remote \"p4/proj2\" into an existing Git repository:"
-msgstr ""
+msgstr "本示例将一个新的远程 \"p4/proj2\" 导入现有的 Git 仓库："
 #. type: delimited block -
 #: en/git-p4.txt:234
@@ -39180,19 +39180,19 @@ msgstr "--detect-branches"
 #: en/git-p4.txt:239
 #, priority:90
 msgid "Use the branch detection algorithm to find new paths in p4.  It is documented below in \"BRANCH DETECTION\"."
-msgstr ""
+msgstr "使用分支检测算法在 p4 中查找新路径。  下面的 “分支检测” 将介绍这种算法。"
 #. type: Labeled list
 #: en/git-p4.txt:240
 #, no-wrap, priority:90
 msgid "--changesfile <file>"
-msgstr ""
+msgstr "--changesfile <文件>"
 #. type: Plain text
 #: en/git-p4.txt:244
 #, priority:90
 msgid "Import exactly the p4 change numbers listed in 'file', one per line.  Normally, 'git p4' inspects the current p4 repository state and detects the changes it should import."
-msgstr ""
+msgstr "精确导入 'file' 中列出的 p4 变更编号，每行一个。  通常，’git p4‘ 会检查当前的 p4 仓库状态，并检测出它应该导入的变更。"
 #. type: Labeled list
 #: en/git-p4.txt:245
@@ -39204,7 +39204,7 @@ msgstr "--silent"
 #: en/git-p4.txt:247
 #, priority:90
 msgid "Do not print any progress information."
-msgstr ""
+msgstr "不要打印任何进度信息。"
 #. type: Labeled list
 #: en/git-p4.txt:248
@@ -39216,7 +39216,7 @@ msgstr "--detect-labels"
 #: en/git-p4.txt:252
 #, priority:90
 msgid "Query p4 for labels associated with the depot paths, and add them as tags in Git. Limited usefulness as only imports labels associated with new changelists. Deprecated."
-msgstr ""
+msgstr "查询 p4 中与仓库路径相关的标签，并在 Git 中将其添加为标签。作用有限，因为只能导入与新变更列表相关的标签所以弃用。"
 #. type: Labeled list
 #: en/git-p4.txt:253 en/git-p4.txt:430
@@ -39228,7 +39228,7 @@ msgstr "--import-labels"
 #: en/git-p4.txt:255
 #, priority:90
 msgid "Import labels from p4 into Git."
-msgstr ""
+msgstr "将标签从 p4 导入 Git。"
 #. type: Labeled list
 #: en/git-p4.txt:256
@@ -39240,7 +39240,7 @@ msgstr "--import-local"
 #: en/git-p4.txt:263
 #, priority:90
 msgid "By default, p4 branches are stored in 'refs/remotes/p4/', where they will be treated as remote-tracking branches by linkgit:git-branch[1] and other commands.  This option instead puts p4 branches in 'refs/heads/p4/'.  Note that future sync operations must specify `--import-local` as well so that they can find the p4 branches in refs/heads."
-msgstr ""
+msgstr "默认情况下，p4 分支存储在 'refs/remotes/p4/' 中，linkgit:git-branch[1] 和其他命令会将其视为远程跟踪分支。  该选项会把 p4 分支放到 'refs/heads/p4/' 中。  需要注意的是，今后的同步操作也必须指定 `--import-local`，这样才能在 refs/heads 中找到 p4 分支。"
 #. type: Labeled list
 #: en/git-p4.txt:264
@@ -39252,19 +39252,19 @@ msgstr "--max-changes <n>"
 #: en/git-p4.txt:270
 #, priority:90
 msgid "Import at most 'n' changes, rather than the entire range of changes included in the given revision specifier. A typical usage would be use '@all' as the revision specifier, but then to use '--max-changes 1000' to import only the last 1000 revisions rather than the entire revision history."
-msgstr ""
+msgstr "最多导入'n' 次修改，而不是导入给定版本说明符中包含的全部修改。一个典型的用法是使用 '@all' 作为版本说明符，然后使用 '--max-changes 1000' 只导入最后 1000 个版本，而不是整个修订历史。"
 #. type: Labeled list
 #: en/git-p4.txt:271
 #, no-wrap, priority:90
 msgid "--changes-block-size <n>"
-msgstr ""
+msgstr "--changes-block-size <n>"
 #. type: Plain text
 #: en/git-p4.txt:279
 #, priority:90
 msgid "The internal block size to use when converting a revision specifier such as '@all' into a list of specific change numbers. Instead of using a single call to 'p4 changes' to find the full list of changes for the conversion, there are a sequence of calls to 'p4 changes -m', each of which requests one block of changes of the given size. The default block size is 500, which should usually be suitable."
-msgstr ""
+msgstr "在将版本说明符（如 '@all'）转换为具体的变更编号列表时使用的内部块大小。在转换过程中，不需要调用一次 'p4 changes' 就能找到完整的修改列表，而是需要调用一系列 'p4 changes -m'，每次调用都会请求一个给定大小的修改块。默认的块大小是 500，这通常是合适的。"
 #. type: Labeled list
 #: en/git-p4.txt:280
@@ -39276,7 +39276,7 @@ msgstr "--keep-path"
 #: en/git-p4.txt:287
 #, priority:90
 msgid "The mapping of file names from the p4 depot path to Git, by default, involves removing the entire depot path.  With this option, the full p4 depot path is retained in Git.  For example, path '//depot/main/foo/bar.c', when imported from '//depot/main/', becomes 'foo/bar.c'.  With `--keep-path`, the Git path is instead 'depot/main/foo/bar.c'."
-msgstr ""
+msgstr "默认情况下，从 p4 仓库路径到 Git 的文件名映射涉及删除整个仓库路径。  有了这个选项，Git 会保留完整的 p4 仓库路径。  例如，路径 '//depot/main/foo/bar.c ' 从 '//depot/main/' 导入时，会变成 'foo/bar.c'。  如果使用 `--keep-path`，Git 路径就会变成 'depot/main/foo/bar.c'。"
 #. type: Labeled list
 #: en/git-p4.txt:288
@@ -39288,61 +39288,61 @@ msgstr "--use-client-spec"
 #: en/git-p4.txt:291
 #, priority:90
 msgid "Use a client spec to find the list of interesting files in p4.  See the \"CLIENT SPEC\" section below."
-msgstr ""
+msgstr "使用客户端规范在 p4 中查找感兴趣的文件列表。  请参阅下面的 “客户端规范” 部分。"
 #. type: Labeled list
 #: en/git-p4.txt:292
 #, no-wrap, priority:90
 msgid "-/ <path>"
-msgstr ""
+msgstr "-/ <路径>"
 #. type: Plain text
 #: en/git-p4.txt:294
 #, priority:90
 msgid "Exclude selected depot paths when cloning or syncing."
-msgstr ""
+msgstr "克隆或同步时排除选定的仓库路径。"
 #. type: Title ~
 #: en/git-p4.txt:296
 #, no-wrap, priority:90
 msgid "Clone options"
-msgstr ""
+msgstr "克隆选项"
 #. type: Plain text
 #: en/git-p4.txt:299
 #, priority:90
 msgid "These options can be used in an initial 'clone', along with the 'sync' options described above."
-msgstr ""
+msgstr "这些选项可与上述 'sync' 选项一起用于初始 'clone'。"
 #. type: Labeled list
 #: en/git-p4.txt:300
 #, no-wrap, priority:90
 msgid "--destination <directory>"
-msgstr ""
+msgstr "--destination <目录>"
 #. type: Plain text
 #: en/git-p4.txt:304
 #, priority:90
 msgid "Where to create the Git repository.  If not provided, the last component in the p4 depot path is used to create a new directory."
-msgstr ""
+msgstr "创建 Git 仓库的位置。  如果未提供，则使用 p4 仓库路径中的最后一个组件来创建新目录。"
 #. type: Plain text
 #: en/git-p4.txt:307
 #, priority:90
 msgid "Perform a bare clone.  See linkgit:git-clone[1]."
-msgstr ""
+msgstr "执行裸克隆。  参见 linkgit:git-clone[1]。"
 #. type: Title ~
 #: en/git-p4.txt:309
 #, no-wrap, priority:90
 msgid "Submit options"
-msgstr ""
+msgstr "提交选项"
 #. type: Plain text
 #: en/git-p4.txt:311
 #, priority:90
 msgid "These options can be used to modify 'git p4 submit' behavior."
-msgstr ""
+msgstr "这些选项可用于修改 'git p4 sumit' 行为。"
 #. type: Labeled list
 #: en/git-p4.txt:312
@@ -39354,13 +39354,13 @@ msgstr "--origin <commit>"
 #: en/git-p4.txt:316
 #, priority:90
 msgid "Upstream location from which commits are identified to submit to p4.  By default, this is the most recent p4 commit reachable from `HEAD`."
-msgstr ""
+msgstr "提交到 p4 的上游位置。  默认情况下，这是可以从 `HEAD` 到达的最新 p4 提交。"
 #. type: Plain text
 #: en/git-p4.txt:322
 #, priority:90
 msgid "Detect renames.  See linkgit:git-diff[1].  Renames will be represented in p4 using explicit 'move' operations.  There is no corresponding option to detect copies, but there are variables for both moves and copies."
-msgstr ""
+msgstr "检测重命名。  参见 linkgit:git-diff[1]。  重命名将在 p4 中使用明确的 'move' 操作来表示。  没有相应的选项来检测副本，但移动和副本都有变量。"
 #. type: Labeled list
 #: en/git-p4.txt:323
@@ -39372,7 +39372,7 @@ msgstr "--preserve-user"
 #: en/git-p4.txt:326
 #, priority:90
 msgid "Re-author p4 changes before submitting to p4.  This option requires p4 admin privileges."
-msgstr ""
+msgstr "在提交到 p4 之前重新授权 p4 更改。  此选项需要 p4 管理员权限。"
 #. type: Labeled list
 #: en/git-p4.txt:327
@@ -39384,13 +39384,13 @@ msgstr "--export-labels"
 #: en/git-p4.txt:330
 #, priority:90
 msgid "Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory."
-msgstr ""
+msgstr "将 Git 中的标签导出为 p4 标签。在 Git 中找到的标签会应用到 perforce 工作目录。"
 #. type: Plain text
 #: en/git-p4.txt:335
 #, priority:90
 msgid "Show just what commits would be submitted to p4; do not change state in Git or p4."
-msgstr ""
+msgstr "只显示将提交到 p4 的提交内容；不改变 Git 或 p4 的状态。"
 #. type: Labeled list
 #: en/git-p4.txt:336
@@ -39402,7 +39402,7 @@ msgstr "--prepare-p4-only"
 #: en/git-p4.txt:342
 #, priority:90
 msgid "Apply a commit to the p4 workspace, opening, adding and deleting files in p4 as for a normal submit operation.  Do not issue the final \"p4 submit\", but instead print a message about how to submit manually or revert.  This option always stops after the first (oldest) commit.  Git tags are not exported to p4."
-msgstr ""
+msgstr "将提交应用到 p4 工作区，像正常提交操作一样在 p4 中打开、添加和删除文件。  不发出最终的 \"p4 submit\"，而是打印一条关于如何手动提交或还原的信息。  该选项总是在第一次（最旧的）提交后停止。  Git 标签不会导出到 p4。"
 #. type: Labeled list
 #: en/git-p4.txt:343
@@ -39414,19 +39414,19 @@ msgstr "--shelve"
 #: en/git-p4.txt:347
 #, priority:90
 msgid "Instead of submitting create a series of shelved changelists.  After creating each shelve, the relevant files are reverted/deleted.  If you have multiple commits pending multiple shelves will be created."
-msgstr ""
+msgstr "不提交，而是创建一系列搁置的变更列表。  创建每个书架后，相关文件将被还原/删除。  如果有多个提交待处理，则会创建多个书架。"
 #. type: Labeled list
 #: en/git-p4.txt:348
 #, no-wrap, priority:90
 msgid "--update-shelve CHANGELIST"
-msgstr ""
+msgstr "--update-shelve CHANGELIST（变更列表）"
 #. type: Plain text
 #: en/git-p4.txt:351
 #, priority:90
 msgid "Update an existing shelved changelist with this commit. Implies --shelve. Repeat for multiple shelved changelists."
-msgstr ""
+msgstr "使用此提交更新现有的已上架更新列表。意味着 --shelve。对多个已上架更新列表重复此操作。"
 #. type: Labeled list
 #: en/git-p4.txt:352
@@ -39438,7 +39438,7 @@ msgstr "--conflict=(ask|skip|quit)"
 #: en/git-p4.txt:358
 #, priority:90
 msgid "Conflicts can occur when applying a commit to p4.  When this happens, the default behavior (\"ask\") is to prompt whether to skip this commit and continue, or quit.  This option can be used to bypass the prompt, causing conflicting commits to be automatically skipped, or to quit trying to apply commits, without prompting."
-msgstr ""
+msgstr "将提交应用到 p4 时可能会发生冲突。  当发生这种情况时，默认行为（\"ask\"）是提示是否跳过该提交并继续，或者退出。  该选项可用于绕过提示，自动跳过冲突提交，或在不提示的情况下放弃尝试应用提交。"
 #. type: Labeled list
 #: en/git-p4.txt:359 en/git-submodule.txt:292
@@ -39450,7 +39450,7 @@ msgstr "--branch <branch>"
 #: en/git-p4.txt:363
 #, priority:90
 msgid "After submitting, sync this named branch instead of the default p4/master.  See the \"Sync options\" section above for more information."
-msgstr ""
+msgstr "提交后，同步这个已命名的分支，而不是默认的 p4/master。  更多信息，请参阅上文 “同步选项” 部分。"
 #. type: Labeled list
 #: en/git-p4.txt:364
@@ -39462,7 +39462,7 @@ msgstr "--commit <sha1>|<sha1..sha1>"
 #: en/git-p4.txt:367
 #, priority:90
 msgid "Submit only the specified commit or range of commits, instead of the full list of changes that are in the current Git branch."
-msgstr ""
+msgstr "只提交指定的提交或提交范围，而不是当前 Git 分支中的全部变更列表。"
 #. type: Labeled list
 #: en/git-p4.txt:368
@@ -39474,7 +39474,7 @@ msgstr "--disable-rebase"
 #: en/git-p4.txt:371
 #, priority:90
 msgid "Disable the automatic rebase after all commits have been successfully submitted. Can also be set with git-p4.disableRebase."
-msgstr ""
+msgstr "在成功提交所有提交后禁用自动回溯。也可以用 git-p4.disableRebase 设置。"
 #. type: Labeled list
 #: en/git-p4.txt:372
@@ -39486,31 +39486,31 @@ msgstr "--disable-p4sync"
 #: en/git-p4.txt:376
 #, priority:90
 msgid "Disable the automatic sync of p4/master from Perforce after commits have been submitted. Implies --disable-rebase. Can also be set with git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible."
-msgstr ""
+msgstr "提交后，禁用从 Perforce 自动同步 p4/master 的功能。意味着 --disable-rebase。也可通过 git-p4.disableP4Sync 设置。如果可能的话，与 origin/master 的同步仍会继续。"
 #. type: Title -
 #: en/git-p4.txt:378
 #, no-wrap, priority:90
 msgid "Hooks for submit"
-msgstr ""
+msgstr "提交钩子"
 #. type: Title ~
 #: en/git-p4.txt:381
 #, no-wrap, priority:90
 msgid "p4-pre-submit"
-msgstr ""
+msgstr "p4-pre-submit"
 #. type: Plain text
 #: en/git-p4.txt:387
 #, priority:90
 msgid "The `p4-pre-submit` hook is executed if it exists and is executable.  The hook takes no parameters and nothing from standard input. Exiting with non-zero status from this script prevents `git-p4 submit` from launching.  It can be bypassed with the `--no-verify` command line option."
-msgstr ""
+msgstr "如果存在 `p4-pre-submit` 钩子且可执行，则执行该钩子。  钩子不需要参数，也不需要标准输入。以非零状态退出该脚本会阻止 `git-p4 submit` 启动。  可以使用 `--no-verify`命令行选项绕过它。"
 #. type: Plain text
 #: en/git-p4.txt:389
 #, priority:90
 msgid "One usage scenario is to run unit tests in the hook."
-msgstr ""
+msgstr "一种使用场景是在钩子中运行单元测试。"
 #. type: Title ~
 #: en/git-p4.txt:391
@@ -39523,13 +39523,13 @@ msgstr "p4-prepare-changelist"
 #: en/git-p4.txt:398
 #, priority:90
 msgid "The `p4-prepare-changelist` hook is executed right after preparing the default changelist message and before the editor is started.  It takes one parameter, the name of the file that contains the changelist text. Exiting with a non-zero status from the script will abort the process."
-msgstr ""
+msgstr "`p4-prepare-changelist` 钩子会在准备好默认更改列表信息后，编辑器启动前立即执行。  它需要一个参数，即包含更新列表文本的文件名。以非零状态退出脚本将中止进程。"
 #. type: Plain text
 #: en/git-p4.txt:402
 #, priority:90
 msgid "The purpose of the hook is to edit the message file in place, and it is not suppressed by the `--no-verify` option. This hook is called even if `--prepare-p4-only` is set."
-msgstr ""
+msgstr "该钩子的目的是就地编辑消息文件，它不会被 `--no-verify`（不验证）选项抑制。即使设置了 `--prepare-p4-only`，也会调用该钩子。"
 #. type: Title ~
 #: en/git-p4.txt:404
@@ -39542,49 +39542,49 @@ msgstr "p4-changelist"
 #: en/git-p4.txt:411
 #, priority:90
 msgid "The `p4-changelist` hook is executed after the changelist message has been edited by the user. It can be bypassed with the `--no-verify` option. It takes a single parameter, the name of the file that holds the proposed changelist text. Exiting with a non-zero status causes the command to abort."
-msgstr ""
+msgstr "`p4-changelist` 钩子会在用户编辑更新列表信息后执行。可以使用 `--no-verify` 选项绕过该钩子。该钩子只接受一个参数，即保存更改列表文本的文件名。以非零状态退出会导致命令中止。"
 #. type: Plain text
 #: en/git-p4.txt:415
 #, priority:90
 msgid "The hook is allowed to edit the changelist file and can be used to normalize the text into some project standard format. It can also be used to refuse the Submit after inspect the message file."
-msgstr ""
+msgstr "该钩子允许编辑更改列表文件，并可用于将文本规范化为某种项目标准格式。还可以在检查信息文件后拒绝提交。"
 #. type: Title ~
 #: en/git-p4.txt:417
 #, no-wrap, priority:90
 msgid "p4-post-changelist"
-msgstr ""
+msgstr "p4-post-changelist"
 #. type: Plain text
 #: en/git-p4.txt:423
 #, priority:90
 msgid "The `p4-post-changelist` hook is invoked after the submit has successfully occurred in P4. It takes no parameters and is meant primarily for notification and cannot affect the outcome of the git p4 submit action."
-msgstr ""
+msgstr "`p4-post-changelist` 钩子会在 P4 提交成功后被调用。它不需要参数，主要用于通知，不会影响 git p4 提交操作的结果。"
 #. type: Title ~
 #: en/git-p4.txt:427
 #, no-wrap, priority:90
 msgid "Rebase options"
-msgstr ""
+msgstr "重置选项"
 #. type: Plain text
 #: en/git-p4.txt:429
 #, priority:90
 msgid "These options can be used to modify 'git p4 rebase' behavior."
-msgstr ""
+msgstr "这些选项可用于修改 'git p4 rebase' 行为。"
 #. type: Plain text
 #: en/git-p4.txt:432
 #, priority:90
 msgid "Import p4 labels."
-msgstr ""
+msgstr "导入 p4 标签。"
 #. type: Title ~
 #: en/git-p4.txt:434
 #, no-wrap, priority:90
 msgid "Unshelve options"
-msgstr ""
+msgstr "卸载选项"
 #. type: Labeled list
 #: en/git-p4.txt:436
@@ -39596,67 +39596,67 @@ msgstr "--origin"
 #: en/git-p4.txt:439
 #, priority:90
 msgid "Sets the git refspec against which the shelved P4 changelist is compared.  Defaults to p4/master."
-msgstr ""
+msgstr "设置用于比较 P4 更新列表的 git refspec。  默认为 p4/master。"
 #. type: Title -
 #: en/git-p4.txt:441
 #, no-wrap, priority:90
 msgid "DEPOT PATH SYNTAX"
-msgstr ""
+msgstr "仓库路径语法"
 #. type: Plain text
 #: en/git-p4.txt:445
 #, priority:90
 msgid "The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or more space-separated p4 depot paths, with an optional p4 revision specifier on the end:"
-msgstr ""
+msgstr "'git p4 sync' 和 'git p4 clone' 的 p4 仓库路径参数可以是一个或多个空格分隔的 p4 仓库路径，末尾还可以加上一个可选的 p4 版本说明符："
 #. type: Labeled list
 #: en/git-p4.txt:446
 #, no-wrap, priority:90
 msgid "\"//depot/my/project\""
-msgstr ""
+msgstr "\"//depot/my/project\""
 #. type: Plain text
 #: en/git-p4.txt:448
 #, priority:90
 msgid "Import one commit with all files in the '#head' change under that tree."
-msgstr ""
+msgstr "导入一次提交，并在该树下导入 '#head' 变更中的所有文件。"
 #. type: Labeled list
 #: en/git-p4.txt:449
 #, no-wrap, priority:90
 msgid "\"//depot/my/project@all\""
-msgstr ""
+msgstr "\"//depot/my/project@all\""
 #. type: Plain text
 #: en/git-p4.txt:451
 #, priority:90
 msgid "Import one commit for each change in the history of that depot path."
-msgstr ""
+msgstr "为该仓库路径历史上的每次更改导入一个提交。"
 #. type: Labeled list
 #: en/git-p4.txt:452
 #, no-wrap, priority:90
 msgid "\"//depot/my/project@1,6\""
-msgstr ""
+msgstr "\"//depot/my/project@1,6\""
 #. type: Plain text
 #: en/git-p4.txt:454
 #, priority:90
 msgid "Import only changes 1 through 6."
-msgstr ""
+msgstr "只导入更改 1 至 6。"
 #. type: Labeled list
 #: en/git-p4.txt:455
 #, no-wrap, priority:90
 msgid "\"//depot/proj1@all //depot/proj2@all\""
-msgstr ""
+msgstr "\"//depot/proj1@all //depot/proj2@all\""
 #. type: Plain text
 #: en/git-p4.txt:464
 #, priority:90
 msgid "Import all changes from both named depot paths into a single repository.  Only files below these directories are included.  There is not a subdirectory in Git for each \"proj1\" and \"proj2\".  You must use the `--destination` option when specifying more than one depot path.  The revision specifier must be specified identically on each depot path.  If there are files in the depot paths with the same name, the path with the most recently updated version of the file is the one that appears in Git."
-msgstr ""
+msgstr "将两个已命名仓库路径中的所有更改导入一个版本库。  只包含这些目录下的文件。  在 Git 中，每个 \"proj1\" 和 \"proj2\" 都没有子目录。  指定多个仓库路径时，必须使用 `--destination` 选项。  每个仓库路径上的修订说明必须完全相同。  如果仓库路径中存在同名文件，则 Git 会显示该文件最新更新版本的路径。"
 #. type: Plain text
 #: en/git-p4.txt:466
@@ -39674,49 +39674,49 @@ msgstr "CLIENT SPEC"
 #: en/git-p4.txt:479
 #, priority:90
 msgid "The p4 client specification is maintained with the 'p4 client' command and contains among other fields, a View that specifies how the depot is mapped into the client repository.  The 'clone' and 'sync' commands can consult the client spec when given the `--use-client-spec` option or when the useClientSpec variable is true.  After 'git p4 clone', the useClientSpec variable is automatically set in the repository configuration file.  This allows future 'git p4 submit' commands to work properly; the submit command looks only at the variable and does not have a command-line option."
-msgstr ""
+msgstr "p4 客户端规范由 'p4 client' 命令维护，除其他字段外，它还包含一个 View，用于指定如何将仓库映射到客户端仓库。  如果给定 `--use-client-spec` 选项，或者 useClientSpec 变量为 true，'clone' 和 'sync' 命令就能查阅客户端规范。  'git p4 clone' 后，useClientSpec 变量会自动在版本库配置文件中设置。  这样，以后的 'git p4 submit' 命令就能正常工作了；提交命令只查看变量，而没有命令行选项。"
 #. type: Plain text
 #: en/git-p4.txt:486
 #, ignore-ellipsis, priority:90
 msgid "The full syntax for a p4 view is documented in 'p4 help views'.  'git p4' knows only a subset of the view syntax.  It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace.  Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path.  'git p4' will complain if it encounters an unhandled wildcard."
-msgstr ""
+msgstr "p4 视图的完整语法记录在 'p4 help views' 中。  'git p4' 只知道视图语法的一部分。  它能理解多行映射、用 '+' 覆盖、用 '-' 排除，以及在空白处加双引号。  在可能的通配符中，'git p4' 只处理 '...'，而且只在路径末尾才处理。  如果遇到未处理的通配符，'git p4' 会抱怨。"
 #. type: Plain text
 #: en/git-p4.txt:491
 #, priority:90
 msgid "Bugs in the implementation of overlap mappings exist.  If multiple depot paths map through overlays to the same location in the repository, 'git p4' can choose the wrong one.  This is hard to solve without dedicating a client spec just for 'git p4'."
-msgstr ""
+msgstr "重叠映射的实现存在错误。  如果多个仓库路径通过重叠映射到仓库中的同一位置，'git p4' 可能会选择错误的路径。  如果不专门为 'git p4' 制定客户端规范，这个问题很难解决。"
 #. type: Plain text
 #: en/git-p4.txt:496
 #, priority:90
 msgid "The name of the client can be given to 'git p4' in multiple ways.  The variable 'git-p4.client' takes precedence if it exists.  Otherwise, normal p4 mechanisms of determining the client are used: environment variable `P4CLIENT`, a file referenced by `P4CONFIG`, or the local host name."
-msgstr ""
+msgstr "'git p4' 可以通过多种方式指定客户端名称。  如果存在变量 'git-p4.client'，则优先使用。  否则，将使用正常的 p4 机制来确定客户端：环境变量 `P4CLIENT`、`P4CONFIG` 引用的文件或本地主机名。"
 #. type: Title -
 #: en/git-p4.txt:499
 #, no-wrap, priority:90
 msgid "BRANCH DETECTION"
-msgstr ""
+msgstr "分支检测"
 #. type: Plain text
 #: en/git-p4.txt:506
 #, priority:90
 msgid "P4 does not have the same concept of a branch as Git.  Instead, p4 organizes its content as a directory tree, where by convention different logical branches are in different locations in the tree.  The 'p4 branch' command is used to maintain mappings between different areas in the tree, and indicate related content.  'git p4' can use these mappings to determine branch relationships."
-msgstr ""
+msgstr "P4 并不像 Git 那样有分支的概念。  相反，P4 以目录树的形式组织内容，按照惯例，不同的逻辑分支位于目录树的不同位置。  'p4 branch' 命令用于维护目录树中不同区域之间的映射关系，并指示相关内容。  'git p4' 可以使用这些映射来确定分支关系。"
 #. type: Plain text
 #: en/git-p4.txt:511
 #, priority:90
 msgid "If you have a repository where all the branches of interest exist as subdirectories of a single depot path, you can use `--detect-branches` when cloning or syncing to have 'git p4' automatically find subdirectories in p4, and to generate these as branches in Git."
-msgstr ""
+msgstr "如果你有一个仓库，其中所有感兴趣的分支都作为单个仓库路径的子目录存在，你可以在克隆或同步时使用 `--detect-branches`，让 'git p4' 在 p4 中自动查找子目录，并在 Git 中生成这些分支。"
 #. type: Plain text
 #: en/git-p4.txt:513
 #, priority:90
 msgid "For example, if the P4 repository structure is:"
-msgstr ""
+msgstr "例如，如果 P4 仓库结构为"
 #. type: delimited block -
 #: en/git-p4.txt:516
@@ -39724,25 +39724,25 @@ msgstr ""
 msgid ""
 "//depot/main/...\n"
 "//depot/branch1/...\n"
-msgstr ""
+msgstr "//depot/main/...\n//depot/branch1/...\n"
 #. type: Plain text
 #: en/git-p4.txt:519
 #, priority:90
 msgid "And \"p4 branch -o branch1\" shows a View line that looks like:"
-msgstr ""
+msgstr "而 \"p4 branch -o branch1\" 显示的 View 行看起来就像这样："
 #. type: delimited block -
 #: en/git-p4.txt:521
 #, ignore-ellipsis, no-wrap, priority:90
 msgid "//depot/main/... //depot/branch1/...\n"
-msgstr ""
+msgstr "//depot/main/... //depot/branch1/...\n"
 #. type: Plain text
 #: en/git-p4.txt:524
 #, priority:90
 msgid "Then this 'git p4 clone' command:"
-msgstr ""
+msgstr "然后执行 'git p4 clone' 命令："
 #. type: delimited block -
 #: en/git-p4.txt:526
@@ -39754,13 +39754,13 @@ msgstr "git p4 clone --detect-branches //depot@all\n"
 #: en/git-p4.txt:529
 #, priority:90
 msgid "produces a separate branch in 'refs/remotes/p4/' for //depot/main, called 'master', and one for //depot/branch1 called 'depot/branch1'."
-msgstr ""
+msgstr "在 'refs/remotes/p4/' 中为 //depot/main 生成一个单独的分支，称为 'master'，为 //depot/branch1 生成一个分支，称为 'depot/branch1'。"
 #. type: Plain text
 #: en/git-p4.txt:539
 #, priority:90
 msgid "However, it is not necessary to create branches in p4 to be able to use them like branches.  Because it is difficult to infer branch relationships automatically, a Git configuration setting 'git-p4.branchList' can be used to explicitly identify branch relationships.  It is a list of \"source:destination\" pairs, like a simple p4 branch specification, where the \"source\" and \"destination\" are the path elements in the p4 repository.  The example above relied on the presence of the p4 branch.  Without p4 branches, the same result will occur with:"
-msgstr ""
+msgstr "不过，要像使用分支那样使用分支，并不需要在 p4 中创建分支。  因为很难自动推断分支关系，所以可以使用 Git 配置设置 'git-p4.branchList' 来明确标识分支关系。  这是一个 'source:destination' （源：目的）对列表，就像一个简单的 p4 分支规范，其中 “源” 和 “目的” 是 p4 仓库中的路径元素。  上面的例子依赖于 p4 分支的存在。  如果没有 p4 分支，也会出现同样的结果："
 #. type: delimited block -
 #: en/git-p4.txt:544
@@ -39786,7 +39786,7 @@ msgstr "The fast-import mechanism used by 'git p4' creates one pack file for eac
 #: en/git-p4.txt:559
 #, priority:90
 msgid "The following config settings can be used to modify 'git p4' behavior.  They all are in the 'git-p4' section."
-msgstr ""
+msgstr "以下配置设置可用于修改 'git p4' 行为。  它们都在 'git-p4' 部分。"
 #. type: Title ~
 #: en/git-p4.txt:561
@@ -39804,7 +39804,7 @@ msgstr "git-p4.user"
 #: en/git-p4.txt:565
 #, priority:90
 msgid "User specified as an option to all p4 commands, with '-u <user>'.  The environment variable `P4USER` can be used instead."
-msgstr ""
+msgstr "作为所有 p4 命令的一个选项，用 '-u <用户>' 指定用户。  可以使用环境变量 `P4USER` 代替。"
 #. type: Labeled list
 #: en/git-p4.txt:566
@@ -39816,7 +39816,7 @@ msgstr "git-p4.password"
 #: en/git-p4.txt:570
 #, priority:90
 msgid "Password specified as an option to all p4 commands, with '-P <password>'.  The environment variable `P4PASS` can be used instead."
-msgstr ""
+msgstr "作为所有 p4 命令的选项，用 '-P <密码>' 指定密码。  可以使用环境变量 `P4PASS` 代替。"
 #. type: Labeled list
 #: en/git-p4.txt:571
@@ -39828,7 +39828,7 @@ msgstr "git-p4.port"
 #: en/git-p4.txt:575
 #, priority:90
 msgid "Port specified as an option to all p4 commands, with '-p <port>'.  The environment variable `P4PORT` can be used instead."
-msgstr ""
+msgstr "作为所有 p4 命令的选项，用 '-p <端口>' 指定端口。  可以使用环境变量 `P4PORT` 代替。"
 #. type: Labeled list
 #: en/git-p4.txt:576
@@ -39840,7 +39840,7 @@ msgstr "git-p4.host"
 #: en/git-p4.txt:580
 #, priority:90
 msgid "Host specified as an option to all p4 commands, with '-h <host>'.  The environment variable `P4HOST` can be used instead."
-msgstr ""
+msgstr "主机作为所有 p4 命令的选项，用 '-h <主机>' 指定。  可以使用环境变量 `P4HOST` 代替。"
 #. type: Labeled list
 #: en/git-p4.txt:581
@@ -39852,7 +39852,7 @@ msgstr "git-p4.client"
 #: en/git-p4.txt:584
 #, priority:90
 msgid "Client specified as an option to all p4 commands, with '-c <client>', including the client spec."
-msgstr ""
+msgstr "作为所有 p4 命令的选项，用 '-c <客户端>' 指定客户端，包括客户端规范。"
 #. type: Labeled list
 #: en/git-p4.txt:585
@@ -39864,13 +39864,13 @@ msgstr "git-p4.retries"
 #: en/git-p4.txt:590
 #, priority:90
 msgid "Specifies the number of times to retry a p4 command (notably, 'p4 sync') if the network times out. The default value is 3.  Set the value to 0 to disable retries or if your p4 version does not support retries (pre 2012.2)."
-msgstr ""
+msgstr "指定网络超时时重试 p4 命令（特别是 'p4 sync' ）的次数，默认值为 3。默认值为 3，如果 p4 版本不支持重试（2012.2 之前），则将该值设为 0 以禁用重试。"
 #. type: Title ~
 #: en/git-p4.txt:592
 #, no-wrap, priority:90
 msgid "Clone and sync variables"
-msgstr ""
+msgstr "克隆和同步变量"
 #. type: Labeled list
 #: en/git-p4.txt:593
@@ -39882,7 +39882,7 @@ msgstr "git-p4.syncFromOrigin"
 #: en/git-p4.txt:599
 #, priority:90
 msgid "Because importing commits from other Git repositories is much faster than importing them from p4, a mechanism exists to find p4 changes first in Git remotes.  If branches exist under 'refs/remote/origin/p4', those will be fetched and used when syncing from p4.  This variable can be set to 'false' to disable this behavior."
-msgstr ""
+msgstr "由于从其他 Git 仓库导入提交比从 p4 导入要快得多，因此有一种机制可以在 Git 远端中首先找到 p4 的变更。  如果在 'refs/remote/origin/p4' 下存在分支，从 p4 同步时就会使用这些分支。  可以将此变量设为 'false' 以禁用此行为。"
 #. type: Labeled list
 #: en/git-p4.txt:600
@@ -39894,7 +39894,7 @@ msgstr "git-p4.branchUser"
 #: en/git-p4.txt:605
 #, priority:90
 msgid "One phase in branch detection involves looking at p4 branches to find new ones to import.  By default, all branches are inspected.  This option limits the search to just those owned by the single user named in the variable."
-msgstr ""
+msgstr "分支检测的一个阶段是查看 p4 分支，以找到要导入的新分支。  默认情况下，会检查所有分支。  该选项将搜索范围限制为变量中指定的单个用户所拥有的分支。"
 #. type: Labeled list
 #: en/git-p4.txt:606
@@ -39906,7 +39906,7 @@ msgstr "git-p4.branchList"
 #: en/git-p4.txt:611
 #, priority:90
 msgid "List of branches to be imported when branch detection is enabled.  Each entry should be a pair of branch names separated by a colon (:).  This example declares that both branchA and branchB were created from main:"
-msgstr ""
+msgstr "启用分支检测时要导入的分支列表。  每个条目都是一对分支名称，中间用冒号（:）隔开。  本示例声明 branchA 和 branchB 都是从 main 创建的："
 #. type: delimited block -
 #: en/git-p4.txt:615
@@ -39914,19 +39914,19 @@ msgstr ""
 msgid ""
 "git config       git-p4.branchList main:branchA\n"
 "git config --add git-p4.branchList main:branchB\n"
-msgstr ""
+msgstr "git config       git-p4.branchList main:branchA\ngit config --add git-p4.branchList main:branchB\n"
 #. type: Labeled list
 #: en/git-p4.txt:617
 #, no-wrap, priority:90
 msgid "git-p4.ignoredP4Labels"
-msgstr ""
+msgstr "git-p4.ignoredP4Labels"
 #. type: Plain text
 #: en/git-p4.txt:620
 #, priority:90
 msgid "List of p4 labels to ignore. This is built automatically as unimportable labels are discovered."
-msgstr ""
+msgstr "要忽略的 p4 标签列表。当发现不可导入的标签时，该列表会自动生成。"
 #. type: Labeled list
 #: en/git-p4.txt:621
@@ -39938,7 +39938,7 @@ msgstr "git-p4.importLabels"
 #: en/git-p4.txt:623
 #, priority:90
 msgid "Import p4 labels into git, as per --import-labels."
-msgstr ""
+msgstr "根据 --import-labels 将 p4 标签导入 git。"
 #. type: Labeled list
 #: en/git-p4.txt:624
@@ -39950,7 +39950,7 @@ msgstr "git-p4.labelImportRegexp"
 #: en/git-p4.txt:627
 #, priority:90
 msgid "Only p4 labels matching this regular expression will be imported. The default value is '[a-zA-Z0-9_\\-.]+$'."
-msgstr ""
+msgstr "只有匹配此正则表达式的 p4 标签才会被导入。默认值为 '[a-zA-Z0-9_\\-.]+$'。"
 #. type: Labeled list
 #: en/git-p4.txt:628
@@ -39962,7 +39962,7 @@ msgstr "git-p4.useClientSpec"
 #: en/git-p4.txt:633
 #, priority:90
 msgid "Specify that the p4 client spec should be used to identify p4 depot paths of interest.  This is equivalent to specifying the option `--use-client-spec`.  See the \"CLIENT SPEC\" section above.  This variable is a boolean, not the name of a p4 client."
-msgstr ""
+msgstr "指定使用 p4 客户端规范来识别感兴趣的 p4 仓库路径。  这等同于指定选项 `--use-client-spec`。  参见上文的 \"CLIENT SPEC\"（指定客户端） 章节。  此变量是一个布尔值，而不是 p4 客户端的名称。"
 #. type: Labeled list
 #: en/git-p4.txt:634
@@ -39974,7 +39974,7 @@ msgstr "git-p4.pathEncoding"
 #: en/git-p4.txt:642
 #, priority:90
 msgid "Perforce keeps the encoding of a path as given by the originating OS.  Git expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding Perforce had used for the paths. This encoding is used to transcode the paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to encode path names. If this option is passed into a p4 clone request, it is persisted in the resulting new git repo."
-msgstr ""
+msgstr "Perforce 会保留原始操作系统提供的路径编码。  Git 希望路径编码为 UTF-8。使用此配置，可以告诉 git-p4 Perforce 对路径使用的编码。该编码会被用于将路径转码为 UTF-8。例如，Windows 上的 Perforce 通常使用 \"cp1252 \"来编码路径名。如果在 p4 clone 请求中传递了这个选项，它就会在生成的新 Git 仓库中持续存在。"
 #. type: Labeled list
 #: en/git-p4.txt:643
@@ -39986,7 +39986,7 @@ msgstr "git-p4.metadataDecodingStrategy"
 #: en/git-p4.txt:667
 #, priority:90
 msgid "Perforce keeps the encoding of a changelist descriptions and user full names as stored by the client on a given OS. The p4v client uses the OS-local encoding, and so different users can end up storing different changelist descriptions or user full names in different encodings, in the same depot.  Git tolerates inconsistent/incorrect encodings in commit messages and author names, but expects them to be specified in utf-8.  git-p4 can use three different decoding strategies in handling the encoding uncertainty in Perforce: 'passthrough' simply passes the original bytes through from Perforce to git, creating usable but incorrectly-encoded data when the Perforce data is encoded as anything other than utf-8. 'strict' expects the Perforce data to be encoded as utf-8, and fails to import when this is not true.  'fallback' attempts to interpret the data as utf-8, and otherwise falls back to using a secondary encoding - by default the common windows encoding 'cp-1252' - with upper-range bytes escaped if decoding with the fallback encoding also fails.  Under python2 the default strategy is 'passthrough' for historical reasons, and under python3 the default is 'fallback'.  When 'strict' is selected and decoding fails, the error message will propose changing this config parameter as a workaround. If this option is passed into a p4 clone request, it is persisted into the resulting new git repo."
-msgstr ""
+msgstr "Perforce 会保留特定操作系统上客户端存储的更新列表描述和用户全名的编码。而 p4v 客户端使用的是操作系统本地编码，因此不同用户可能会在同一个仓库中以不同编码存储不同的更新列表描述或用户全名。 git-p4 可以使用三种不同的解码策略来处理 Perforce 编码的不确定性：'passthrough'（直通）只是将原始字节从 Perforce 传到 git，当 Perforce 数据的编码不是 utf-8 时，就会产生可用但编码不正确的数据。'strict' （严格）要求 Perforce 数据以 utf-8 编码，否则导入失败。 'fallback' （回退）会尝试将数据解释为 utf-8，否则会退回到使用二级编码（默认情况下是常用的 windows 编码 'cp-1252'），如果使用回退编码解码也失败，则会转义上层字节。 在 python2 下，由于历史原因，默认策略是 'passthrough'，而在 python3 下，默认策略是 'fallback'。 如果选择了 'strict'，但解码失败，则错误信息会建议更改此配置参数作为解决方法。如果在 p4 克隆请求中传递此选项，则会将其持久化到生成的新 Git 仓库中。"
 #. type: Labeled list
 #: en/git-p4.txt:668
@@ -66273,13 +66273,13 @@ msgstr "使用 xxdiff（需要图形会话）"
 #: en/object-format-disclaimer.txt:3
 #, priority:300
 msgid "Note: At present, there is no interoperability between SHA-256 repositories and SHA-1 repositories."
-msgstr ""
+msgstr "注：目前，SHA-256 仓库与 SHA-1 仓库之间不能相互操作。"
 #. type: Plain text
 #: en/object-format-disclaimer.txt:9
 #, priority:300
 msgid "Historically, we warned that SHA-256 repositories may later need backward incompatible changes when we introduce such interoperability features. Today, we only expect compatible changes. Furthermore, if such changes prove to be necessary, it can be expected that SHA-256 repositories created with today's Git will be usable by future versions of Git without data loss."
-msgstr ""
+msgstr "过去，我们曾警告说，当我们引入此类互操作性功能时，SHA-256 仓库以后可能需要进行向后不兼容的更改。如今，我们只期待兼容的更改。此外，如果事实证明有必要进行此类修改，可以预期的是，用现在的 Git 创建的 SHA-256 仓库将可用于未来版本的 Git，而不会丢失数据。"
 #. type: Title -
 #: en/pretty-formats.txt:2