Kick off for Git 1.8.4 zh_CN l10n round 1
191 views
Skip to first unread message
Jiang Xin
Jul 26, 2013, 3:27:58 AM7/26/13
to GotGit, Jiang Xin
随着 Git 1.8.4-rc0 的发布，中文本地化工作已经启动。相比 1.8.3
zh_CN.po 文件大约有 99 处更新。以下是过滤之后的 diff 文件。
请指正。
commit 5ab3bf4b534d3dab3110e669f425f4dea891014d
Author: Jiang Xin <worldhe...@gmail.com>
Date: Fri Jul 26 14:00:02 2013 +0800
l10n: zh_CN.po: translate 99 messages (2133t0f0u)
Translate 99 new messages came from git.pot update in 28b3cff
(l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)).
Signed-off-by: Jiang Xin <worldhe...@gmail.com>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba757d9..5beedd5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <g...@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-04-30 08:25+0800\n"
-"PO-Revision-Date: 2013-04-12 09:23+0800\n"
+"POT-Creation-Date: 2013-07-26 14:19+0800\n"
+"PO-Revision-Date: 2013-07-26 14:34+0800\n"
"Last-Translator: Jiang Xin <worldhe...@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
@@ -387,6 +387,9 @@ msgstr[1] ""
"\n"
"您指的是这其中的某一个么？"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
msgid "failed to read the cache"
msgstr "无法读取缓存"
@@ -562,6 +565,18 @@ msgstr "不能解析对象 '%s'"
msgid "Unable to write index."
msgstr "不能写入索引。"
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
+
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
+
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
+
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
@@ -619,6 +634,12 @@ msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
+
+msgid "dup2(%d,%d) failed"
+msgstr "不能 dup2(%d,%d)"
+
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"
@@ -778,6 +799,26 @@ msgstr "不能作为初始提交还原"
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.object_name_warning false\""
+msgstr ""
+"Git 通常不会创建一个以40个十六进制字符命名的引用，因为当你提供40个\n"
+"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 空白时一个40个十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。也可以通过如下命令关闭本消息通知：\"git config \n"
+"advice.object_name_warning false\""
+
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
@@ -920,8 +961,8 @@ msgstr "您正处于一个 am 过程中。"
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
-msgid " (fix conflicts and then run \"git am --resolved\")"
-msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
@@ -973,8 +1014,14 @@ msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
msgid "You are currently cherry-picking."
msgstr "您正在做拣选操作。"
-msgid " (all conflicts fixed: run \"git commit\")"
-msgstr " （解决所有冲突后，执行 \"git commit\"）"
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
msgid "You are currently reverting commit %s."
msgstr "您正在反转提交 %s 。"
@@ -1000,6 +1047,9 @@ msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
msgid "On branch "
msgstr "位于分支 "
+msgid "rebase in progress; onto "
+msgstr "变基正在进行中；至 "
+
msgid "HEAD detached at "
msgstr "头指针分离于 "
@@ -1399,7 +1449,7 @@ msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-msgid "corrupt patch for subproject %s"
+msgid "corrupt patch for submodule %s"
msgstr "子项目 %s 损坏的补丁"
msgid "unable to stat newly created file '%s'"
@@ -1991,6 +2041,9 @@ msgstr "输入路径以null字符终止"
msgid "suppress progress reporting"
msgstr "不显示进度报告"
+msgid "show non-matching input paths"
+msgstr "显示未匹配的输入路径"
+
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时提供路径及 --stdin 参数"
@@ -2006,6 +2059,21 @@ msgstr "参数 --quiet 只在提供一个路径名时有效"
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching 选项只在使用 --verbose 时有效"
+
+msgid "git check-mailmap [options] <contact>..."
+msgstr "git check-mailmap [选项] <联系地址>..."
+
+msgid "also read contacts from stdin"
+msgstr "还从标准输入读取联系地址"
+
+msgid "unable to parse contact: %s"
+msgstr "不能解析联系地址：%s"
+
+msgid "no contacts specified"
+msgstr "未指定联系地址"
+
msgid "git checkout-index [options] [--] [<file>...]"
msgstr "git checkout-index [选项] [--] [<文件>...]"
@@ -2243,8 +2311,10 @@ msgid ""
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
msgid "Removing %s\n"
msgstr "正删除 %s\n"
@@ -2261,12 +2331,94 @@ msgstr "将忽略版本库 %s\n"
msgid "failed to remove %s"
msgstr "无法删除 %s"
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing"
+msgstr ""
+"关于提示符下如何选择的帮助：\n"
+"1 - 通过编号选择一个选项\n"
+"foo - 通过标题选择一个选项\n"
+" - （空）什么也不选择"
+
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting"
+msgstr ""
+"关于提示符下如何选择的帮助：\n"
+"1 - 选择一个选项\n"
+"3-5 - 选择一个范围内的所有选项\n"
+"2-3,6-9 - 选择多个范围内的所有选项\n"
+"foo - 通过标题选择一个选项\n"
+"-... - 反选特定的选项\n"
+"* - 选择所有选项\n"
+" - （空）结束选择"
+
+msgid "Huh (%s)?"
+msgstr "嗯（%s）？"
+
+msgid "Input ignore patterns>> "
+msgstr "输入模版以排除条目>> "
+
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：无法找到和 %s 匹配的条目"
+
+msgid "Select items to delete"
+msgstr "选择要删除的条目"
+
+msgid "remove %s? "
+msgstr "删除 %s？"
+
+msgid "Bye."
+msgstr "再见。"
+
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - 开始清理\n"
+"filter by pattern - 通过模版过滤要删除的条目\n"
+"select by numbers - 通过数字选择要删除的条目\n"
+"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
+"quit - 停止删除并退出\n"
+"help - 显示本帮助\n"
+"? - 显示提示符下如何选择的帮助"
+
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
+
+msgid "What now"
+msgstr "请选择"
+
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "将删除如下条目："
+msgstr[1] "将删除如下条目："
+
+msgid "No more files to clean, exiting."
+msgstr "没有要清理的文件，退出。"
+
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
msgid "force"
msgstr "强制"
+msgid "interactive cleaning"
+msgstr "交互式清除"
+
msgid "remove whole directories"
msgstr "删除整个目录"
@@ -2286,15 +2438,16 @@ msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
+"clean"
msgstr ""
-"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
+"clean.requireForce defaults to true and neither -i, -n nor -f given; "
+"refusing to clean"
msgstr ""
-"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [选项] [--] <版本库> [<路径>]"
@@ -2401,9 +2554,15 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
+msgid "Checking connectivity... "
+msgstr "检查连接... "
+
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
+msgid "done\n"
+msgstr "完成\n"
+
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
@@ -2428,6 +2587,9 @@ msgstr "版本库 '%s' 不存在"
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+msgid "--local is ignored"
+msgstr "--local 被忽略"
+
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
@@ -2650,6 +2812,9 @@ msgstr "没有找到匹配 '%s' 的作者"
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z 选项不兼容"
+
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
@@ -2692,9 +2857,6 @@ msgstr "无效的清理模式 %s"
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
-
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
@@ -2904,6 +3066,12 @@ msgstr "使用版本库级配置文件"
msgid "use given config file"
msgstr "使用指定的配置文件"
+msgid "blob-id"
+msgstr "数据对象ID"
+
+msgid "read config from given blob object"
+msgstr "从给定的数据对象读取配置"
+
msgid "Action"
msgstr "操作"
@@ -3048,6 +3216,9 @@ msgstr "使用任意 tag，即使未带注解"
msgid "always use long format"
msgstr "始终使用长提交号格式"
+msgid "only follow first parent"
+msgstr "只跟随第一个父提交"
+
msgid "only output exact matches"
msgstr "只输出精确匹配"
@@ -3087,9 +3258,6 @@ msgstr "不是一个 git 版本库"
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-msgid "more than %d trees given: '%s'"
-msgstr "提供了超过 %d 个树对象：'%s'"
-
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据（blob）对象：'%s'"
@@ -4098,6 +4266,12 @@ msgstr "添加收件人"
msgid "add Cc: header"
msgstr "添加抄送"
+msgid "ident"
+msgstr "ident"
+
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "设置 From 地址为 <ident>（或提交者ID如果不提供的话）"
+
msgid "message-id"
msgstr "message-id"
@@ -4125,6 +4299,9 @@ msgstr "添加一个签名"
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
+msgid "invalid ident line: %s"
+msgstr "无效的缩进行：%s"
+
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
@@ -4408,11 +4585,8 @@ msgstr "当前分支没有对应的远程版本库。"
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-msgid "No remote tracking branch for %s from %s"
-msgstr "%s 没有来自 %s 的远程跟踪分支"
-
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
@@ -4440,9 +4614,6 @@ msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-msgid "You cannot combine --no-ff with --ff-only."
-msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
-
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
@@ -4455,6 +4626,9 @@ msgstr "尚不支持到空分支的压缩提交"
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
+
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
@@ -4641,6 +4815,9 @@ msgstr "从标准输入读取"
msgid "allow to print `undefined` names"
msgstr "允许打印 `未定义` 的名称"
+msgid "dereference tags in the input (internal use)"
+msgstr "转换 tags 到对象ID（内部使用）"
+
msgid "git notes [--ref <notes_ref>] [list [<object>]]"
msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
@@ -4761,18 +4938,6 @@ msgstr "无法解析 '%s' 为一个有效引用。"
msgid "Failed to read object '%s'."
msgstr "无法读取对象 '%s'。"
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
-
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
-
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
-
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
@@ -5119,12 +5284,12 @@ msgstr "您没有为推送指定任何引用表达式，并且 push.default 为
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
-"before pushing again.\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
-"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
+"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid ""
@@ -5140,24 +5305,24 @@ msgstr ""
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge the remote changes\n"
-"(e.g. 'git pull') before pushing again.\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
-"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
+"检出该分支并与远程变更合并（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first merge the remote changes (e.g.,\n"
-"'git pull') before pushing again.\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
-"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n"
-"（如 'git pull'）。\n"
+"一个版本库已向该引用进行了推送。再次推送前，您可能需要先合并远程变更\n"
+"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid "Updates were rejected because the tag already exists in the remote."
@@ -5320,6 +5485,12 @@ msgstr "跳过应用稀疏检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
+msgid "%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' 不是一个有效的时间戳"
+
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -5861,32 +6032,53 @@ msgid "git rm [options] [--] <file>..."
msgstr "git rm [选项] [--] <文件>..."
msgid ""
-"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
+"the following submodule (or one of its nested submodules)\n"
+"uses a .git directory:"
+msgid_plural ""
+"the following submodules (or one of its nested submodules)\n"
+"use a .git directory:"
+msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+
+msgid ""
+"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n"
+"\n"
"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+
+msgid ""
+"\n"
"(use -f to force removal)"
msgstr ""
-"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
+"\n"
"（使用 -f 强制删除）"
-msgid ""
-"'%s' has changes staged in the index\n"
-"(use --cached to keep the file, or -f to force removal)"
-msgstr ""
-"'%s' 有变更已暂存至索引中\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "如下文件相对索引区的内容有修改"
+msgstr[1] "如下文件相对索引区的内容有修改"
msgid ""
-"'%s' has local modifications\n"
+"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-"'%s' 有本地修改\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+"\n"
+"（使用 --cached 保留本地文件，或用 -f 强制删除）"
+
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "如下文件有本地修改："
+msgstr[1] "如下文件有本地修改："
msgid "do not list removed files"
msgstr "不列出删除的文件"
@@ -5983,8 +6175,8 @@ msgstr "只显示不在第一个分支上的提交"
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-msgid "show commits where no parent comes before its children"
-msgstr "显示提交时以时间为序且父提交不能领先子提交"
+msgid "topologically sort, maintaining date order where possible"
+msgstr "拓扑方式排序，并尽可能地保持日期顺序"
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
@@ -6011,8 +6203,8 @@ msgstr "只显示头（可以和 tags 共用）"
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测，需要精确的引用路径"
-msgid "show the HEAD reference"
-msgstr "显示 HEAD 引用"
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "显示 HEAD 引用，即使被过滤掉"
msgid "dereference tags into object IDs"
msgstr "转换 tags 到对象ID"
@@ -6334,6 +6526,9 @@ msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
+msgid "expiry date"
+msgstr "逾期日期"
+
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
@@ -6385,7 +6580,7 @@ msgstr "合并两个或更多开发历史"
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
-msgid "Fetch from and merge with another repository or a local branch"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr "获取并合并另外的版本库或一个本地分支"
msgid "Update remote refs along with associated objects"
@@ -6418,11 +6613,11 @@ msgid ""
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
msgid ""
-"When you have resolved this problem, run \"$cmdline --resolved\".\n"
+"When you have resolved this problem, run \"$cmdline --continue\".\n"
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
-"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"
+"当您解决了此问题后，执行 \"$cmdline --continue\"。\n"
"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
@@ -6465,11 +6660,18 @@ msgstr ""
"请不要再使用它了。"
msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
+msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"
msgid "Please make up your mind. --skip or --abort?"
msgstr "请下决心。--skip 或是 --abort ？"
+msgid ""
+"Stray $dotest directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 $dotest 目录。\n"
+"使用 \"git am --abort\" 删除它。"
+
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
@@ -6676,6 +6878,21 @@ msgstr ""
"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
+msgid "Applied autostash."
+msgstr "成功应用 autostash。"
+
+msgid "Cannot store $stash_sha1"
+msgstr "无法保存 $stash_sha1"
+
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
+msgstr ""
+"正应用 autostash 由于冲突。\n"
+"您的修改在 stash 中很安全。\n"
+"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基。"
@@ -6736,6 +6953,12 @@ msgstr "没有指向一个有效的提交：$onto_name"
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
+msgid "Cannot autostash"
+msgstr "无法 autostash"
+
+msgid "Created autostash: $stash_abbrev"
+msgstr "创建了 autostash: $stash_abbrev"
+
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
@@ -6775,6 +6998,9 @@ msgstr "无法删除临时索引（不应发生）"
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "无法用 $w_commit 更新 $ref_stash"
+
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
@@ -6785,6 +7011,15 @@ msgstr ""
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
+msgid ""
+"The following untracked files would NOT be saved but need to be removed by "
+"stash save:"
+msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而被删除："
+
+msgid ""
+"Aborting. Consider using either the --force or --include-untracked option."
+msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
+
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
@@ -6851,6 +7086,9 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
+
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
@@ -6900,87 +7138,94 @@ msgstr "无法添加子模组 '$sm_path'"
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-msgid "Entering '$prefix$sm_path'"
-msgstr "正在进入 '$prefix$sm_path'"
+msgid "Entering '$prefix$displaypath'"
+msgstr "正在进入 '$prefix$displaypath'"
-msgid "Stopping at '$sm_path'; script returned non-zero status."
-msgstr "停止于 '$sm_path'，脚本返回非零值。"
+msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
-msgid "No url found for submodule path '$sm_path' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
+msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
-msgid "Failed to register url for submodule path '$sm_path'"
-msgstr "无法为子模组路径 '$sm_path' 注册 url"
+msgid "Failed to register url for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册 url"
-msgid "Submodule '$name' ($url) registered for path '$sm_path'"
-msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
+msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-msgid "Failed to register update mode for submodule path '$sm_path'"
-msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
+msgid "Failed to register update mode for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
-msgid "Submodule work tree '$sm_path' contains a .git directory"
-msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
+msgid "Submodule work tree '$displaypath' contains a .git directory"
+msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
msgid ""
-"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
-msgstr "子模组工作区 '$sm_path' 包含本地修改；使用 '-f' 丢弃它们"
+msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-msgid "Cleared directory '$sm_path'"
-msgstr "已清除目录 '$sm_path'"
+msgid "Cleared directory '$displaypath'"
+msgstr "已清除目录 '$displaypath'"
-msgid "Could not remove submodule work tree '$sm_path'"
-msgstr "无法移除子模组工作区 '$sm_path'"
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "无法移除子模组工作区 '$displaypath'"
-msgid "Could not create empty submodule directory '$sm_path'"
-msgstr "不能创建空的子模组目录 '$sm_path'"
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "不能创建空的子模组目录 '$displaypath'"
-msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
-msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
msgid ""
-"Submodule path '$prefix$sm_path' not initialized\n"
+"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-"子模组路径 '$prefix$sm_path' 没有初始化\n"
+"子模组路径 '$displaypath' 没有初始化\n"
"也许您想用 'update --init'？"
-msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中获取"
-msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：变基至 '$sha1'"
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：已合并入 '$sha1'"
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
+
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
+
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：检出 '$sha1'"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-msgstr "无法递归进子模组路径 '$prefix$sm_path'"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "无法递归进子模组路径 '$displaypath'"
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
@@ -6988,14 +7233,14 @@ msgstr "选项 --cached 不能和选项 --files 同时使用"
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
-msgid " Warn: $name doesn't contain commit $sha1_src"
-msgstr " 警告：$name 未包含提交 $sha1_src"
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " 警告：$display_name 未包含提交 $sha1_src"
-msgid " Warn: $name doesn't contain commit $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_dst"
-msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
msgid "blob"
msgstr "数据对象"
@@ -7009,8 +7254,32 @@ msgstr "要提交的子模组变更："
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-msgid "Synchronizing submodule url for '$prefix$sm_path'"
-msgstr "为 '$prefix$sm_path' 同步子模组 url"
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "为 '$displaypath' 同步子模组 url"
+
zh_CN.po 文件大约有 99 处更新。以下是过滤之后的 diff 文件。
请指正。
commit 5ab3bf4b534d3dab3110e669f425f4dea891014d
Author: Jiang Xin <worldhe...@gmail.com>
Date: Fri Jul 26 14:00:02 2013 +0800
l10n: zh_CN.po: translate 99 messages (2133t0f0u)
Translate 99 new messages came from git.pot update in 28b3cff
(l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)).
Signed-off-by: Jiang Xin <worldhe...@gmail.com>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba757d9..5beedd5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <g...@vger.kernel.org>\n"
-"POT-Creation-Date: 2013-04-30 08:25+0800\n"
-"PO-Revision-Date: 2013-04-12 09:23+0800\n"
+"POT-Creation-Date: 2013-07-26 14:19+0800\n"
+"PO-Revision-Date: 2013-07-26 14:34+0800\n"
"Last-Translator: Jiang Xin <worldhe...@gmail.com>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
@@ -387,6 +387,9 @@ msgstr[1] ""
"\n"
"您指的是这其中的某一个么？"
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
msgid "failed to read the cache"
msgstr "无法读取缓存"
@@ -562,6 +565,18 @@ msgstr "不能解析对象 '%s'"
msgid "Unable to write index."
msgstr "不能写入索引。"
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "不能提交未初始化/未引用的注解树"
+
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "坏的 notes.rewriteMode 值：'%s'"
+
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
+
+msgid "Bad %s value: '%s'"
+msgstr "坏的 %s 值：'%s'"
+
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
@@ -619,6 +634,12 @@ msgstr[1] ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
+msgid "open /dev/null failed"
+msgstr "不能打开 /dev/null"
+
+msgid "dup2(%d,%d) failed"
+msgstr "不能 dup2(%d,%d)"
+
msgid "Could not open '%s' for writing"
msgstr "不能为写入打开 '%s'"
@@ -778,6 +799,26 @@ msgstr "不能作为初始提交还原"
msgid "Can't cherry-pick into empty head"
msgstr "不能拣选到空分支"
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.object_name_warning false\""
+msgstr ""
+"Git 通常不会创建一个以40个十六进制字符命名的引用，因为当你提供40个\n"
+"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如：\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 空白时一个40个十六进制的引用将被创建。请检查这些引用，\n"
+"可能需要删除它们。也可以通过如下命令关闭本消息通知：\"git config \n"
+"advice.object_name_warning false\""
+
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
@@ -920,8 +961,8 @@ msgstr "您正处于一个 am 过程中。"
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
-msgid " (fix conflicts and then run \"git am --resolved\")"
-msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " （解决冲突，然后运行 \"git am --continue\"）"
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
@@ -973,8 +1014,14 @@ msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
msgid "You are currently cherry-picking."
msgstr "您正在做拣选操作。"
-msgid " (all conflicts fixed: run \"git commit\")"
-msgstr " （解决所有冲突后，执行 \"git commit\"）"
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
+
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
+
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
msgid "You are currently reverting commit %s."
msgstr "您正在反转提交 %s 。"
@@ -1000,6 +1047,9 @@ msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
msgid "On branch "
msgstr "位于分支 "
+msgid "rebase in progress; onto "
+msgstr "变基正在进行中；至 "
+
msgid "HEAD detached at "
msgstr "头指针分离于 "
@@ -1399,7 +1449,7 @@ msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-msgid "corrupt patch for subproject %s"
+msgid "corrupt patch for submodule %s"
msgstr "子项目 %s 损坏的补丁"
msgid "unable to stat newly created file '%s'"
@@ -1991,6 +2041,9 @@ msgstr "输入路径以null字符终止"
msgid "suppress progress reporting"
msgstr "不显示进度报告"
+msgid "show non-matching input paths"
+msgstr "显示未匹配的输入路径"
+
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时提供路径及 --stdin 参数"
@@ -2006,6 +2059,21 @@ msgstr "参数 --quiet 只在提供一个路径名时有效"
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching 选项只在使用 --verbose 时有效"
+
+msgid "git check-mailmap [options] <contact>..."
+msgstr "git check-mailmap [选项] <联系地址>..."
+
+msgid "also read contacts from stdin"
+msgstr "还从标准输入读取联系地址"
+
+msgid "unable to parse contact: %s"
+msgstr "不能解析联系地址：%s"
+
+msgid "no contacts specified"
+msgstr "未指定联系地址"
+
msgid "git checkout-index [options] [--] [<file>...]"
msgstr "git checkout-index [选项] [--] [<文件>...]"
@@ -2243,8 +2311,10 @@ msgid ""
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
-msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
msgid "Removing %s\n"
msgstr "正删除 %s\n"
@@ -2261,12 +2331,94 @@ msgstr "将忽略版本库 %s\n"
msgid "failed to remove %s"
msgstr "无法删除 %s"
+msgid ""
+"Prompt help:\n"
+"1 - select a numbered item\n"
+"foo - select item based on unique prefix\n"
+" - (empty) select nothing"
+msgstr ""
+"关于提示符下如何选择的帮助：\n"
+"1 - 通过编号选择一个选项\n"
+"foo - 通过标题选择一个选项\n"
+" - （空）什么也不选择"
+
+msgid ""
+"Prompt help:\n"
+"1 - select a single item\n"
+"3-5 - select a range of items\n"
+"2-3,6-9 - select multiple ranges\n"
+"foo - select item based on unique prefix\n"
+"-... - unselect specified items\n"
+"* - choose all items\n"
+" - (empty) finish selecting"
+msgstr ""
+"关于提示符下如何选择的帮助：\n"
+"1 - 选择一个选项\n"
+"3-5 - 选择一个范围内的所有选项\n"
+"2-3,6-9 - 选择多个范围内的所有选项\n"
+"foo - 通过标题选择一个选项\n"
+"-... - 反选特定的选项\n"
+"* - 选择所有选项\n"
+" - （空）结束选择"
+
+msgid "Huh (%s)?"
+msgstr "嗯（%s）？"
+
+msgid "Input ignore patterns>> "
+msgstr "输入模版以排除条目>> "
+
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：无法找到和 %s 匹配的条目"
+
+msgid "Select items to delete"
+msgstr "选择要删除的条目"
+
+msgid "remove %s? "
+msgstr "删除 %s？"
+
+msgid "Bye."
+msgstr "再见。"
+
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - 开始清理\n"
+"filter by pattern - 通过模版过滤要删除的条目\n"
+"select by numbers - 通过数字选择要删除的条目\n"
+"ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"
+"quit - 停止删除并退出\n"
+"help - 显示本帮助\n"
+"? - 显示提示符下如何选择的帮助"
+
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
+
+msgid "What now"
+msgstr "请选择"
+
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "将删除如下条目："
+msgstr[1] "将删除如下条目："
+
+msgid "No more files to clean, exiting."
+msgstr "没有要清理的文件，退出。"
+
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
msgid "force"
msgstr "强制"
+msgid "interactive cleaning"
+msgstr "交互式清除"
+
msgid "remove whole directories"
msgstr "删除整个目录"
@@ -2286,15 +2438,16 @@ msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
msgid ""
-"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
+"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
+"clean"
msgstr ""
-"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
msgid ""
-"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
-"clean"
+"clean.requireForce defaults to true and neither -i, -n nor -f given; "
+"refusing to clean"
msgstr ""
-"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"
+"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
msgid "git clone [options] [--] <repo> [<dir>]"
msgstr "git clone [选项] [--] <版本库> [<路径>]"
@@ -2401,9 +2554,15 @@ msgstr ""
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
+msgid "Checking connectivity... "
+msgstr "检查连接... "
+
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
+msgid "done\n"
+msgstr "完成\n"
+
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
@@ -2428,6 +2587,9 @@ msgstr "版本库 '%s' 不存在"
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
+msgid "--local is ignored"
+msgstr "--local 被忽略"
+
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
@@ -2650,6 +2812,9 @@ msgstr "没有找到匹配 '%s' 的作者"
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z 选项不兼容"
+
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
@@ -2692,9 +2857,6 @@ msgstr "无效的清理模式 %s"
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项不兼容"
-
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
@@ -2904,6 +3066,12 @@ msgstr "使用版本库级配置文件"
msgid "use given config file"
msgstr "使用指定的配置文件"
+msgid "blob-id"
+msgstr "数据对象ID"
+
+msgid "read config from given blob object"
+msgstr "从给定的数据对象读取配置"
+
msgid "Action"
msgstr "操作"
@@ -3048,6 +3216,9 @@ msgstr "使用任意 tag，即使未带注解"
msgid "always use long format"
msgstr "始终使用长提交号格式"
+msgid "only follow first parent"
+msgstr "只跟随第一个父提交"
+
msgid "only output exact matches"
msgstr "只输出精确匹配"
@@ -3087,9 +3258,6 @@ msgstr "不是一个 git 版本库"
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-msgid "more than %d trees given: '%s'"
-msgstr "提供了超过 %d 个树对象：'%s'"
-
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据（blob）对象：'%s'"
@@ -4098,6 +4266,12 @@ msgstr "添加收件人"
msgid "add Cc: header"
msgstr "添加抄送"
+msgid "ident"
+msgstr "ident"
+
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "设置 From 地址为 <ident>（或提交者ID如果不提供的话）"
+
msgid "message-id"
msgstr "message-id"
@@ -4125,6 +4299,9 @@ msgstr "添加一个签名"
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
+msgid "invalid ident line: %s"
+msgstr "无效的缩进行：%s"
+
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
@@ -4408,11 +4585,8 @@ msgstr "当前分支没有对应的远程版本库。"
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-msgid "No remote tracking branch for %s from %s"
-msgstr "%s 没有来自 %s 的远程跟踪分支"
-
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
@@ -4440,9 +4614,6 @@ msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-msgid "You cannot combine --no-ff with --ff-only."
-msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
-
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
@@ -4455,6 +4626,9 @@ msgstr "尚不支持到空分支的压缩提交"
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
+
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
@@ -4641,6 +4815,9 @@ msgstr "从标准输入读取"
msgid "allow to print `undefined` names"
msgstr "允许打印 `未定义` 的名称"
+msgid "dereference tags in the input (internal use)"
+msgstr "转换 tags 到对象ID（内部使用）"
+
msgid "git notes [--ref <notes_ref>] [list [<object>]]"
msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
@@ -4761,18 +4938,6 @@ msgstr "无法解析 '%s' 为一个有效引用。"
msgid "Failed to read object '%s'."
msgstr "无法读取对象 '%s'。"
-msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "不能提交未初始化/未引用的注解树"
-
-msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "坏的 notes.rewriteMode 值：'%s'"
-
-msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
-msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"
-
-msgid "Bad %s value: '%s'"
-msgstr "坏的 %s 值：'%s'"
-
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
@@ -5119,12 +5284,12 @@ msgstr "您没有为推送指定任何引用表达式，并且 push.default 为
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
-"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
-"before pushing again.\n"
+"its remote counterpart. Integrate the remote changes (e.g.\n"
+"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为您当前分支的最新提交落后于其对应的远程分支。\n"
-"再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
+"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid ""
@@ -5140,24 +5305,24 @@ msgstr ""
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
-"counterpart. Check out this branch and merge the remote changes\n"
-"(e.g. 'git pull') before pushing again.\n"
+"counterpart. Check out this branch and integrate the remote changes\n"
+"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
-"检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
+"检出该分支并与远程变更合并（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
-"to the same ref. You may want to first merge the remote changes (e.g.,\n"
-"'git pull') before pushing again.\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"
-"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n"
-"（如 'git pull'）。\n"
+"一个版本库已向该引用进行了推送。再次推送前，您可能需要先合并远程变更\n"
+"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
msgid "Updates were rejected because the tag already exists in the remote."
@@ -5320,6 +5485,12 @@ msgstr "跳过应用稀疏检出过滤器"
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
+msgid "%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' 不是一个有效的时间戳"
+
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
@@ -5861,32 +6032,53 @@ msgid "git rm [options] [--] <file>..."
msgstr "git rm [选项] [--] <文件>..."
msgid ""
-"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
+"the following submodule (or one of its nested submodules)\n"
+"uses a .git directory:"
+msgid_plural ""
+"the following submodules (or one of its nested submodules)\n"
+"use a .git directory:"
+msgstr[0] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+msgstr[1] "如下子模组（或一个其嵌套子模组）使用了一个 .git 目录："
+
+msgid ""
+"\n"
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr ""
-"子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n"
+"\n"
"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
msgid ""
-"'%s' has staged content different from both the file and the HEAD\n"
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样："
+
+msgid ""
+"\n"
"(use -f to force removal)"
msgstr ""
-"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
+"\n"
"（使用 -f 强制删除）"
-msgid ""
-"'%s' has changes staged in the index\n"
-"(use --cached to keep the file, or -f to force removal)"
-msgstr ""
-"'%s' 有变更已暂存至索引中\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "如下文件相对索引区的内容有修改"
+msgstr[1] "如下文件相对索引区的内容有修改"
msgid ""
-"'%s' has local modifications\n"
+"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
-"'%s' 有本地修改\n"
-"（使用 --cached 保存文件，或用 -f 强制删除）"
+"\n"
+"（使用 --cached 保留本地文件，或用 -f 强制删除）"
+
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "如下文件有本地修改："
+msgstr[1] "如下文件有本地修改："
msgid "do not list removed files"
msgstr "不列出删除的文件"
@@ -5983,8 +6175,8 @@ msgstr "只显示不在第一个分支上的提交"
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
-msgid "show commits where no parent comes before its children"
-msgstr "显示提交时以时间为序且父提交不能领先子提交"
+msgid "topologically sort, maintaining date order where possible"
+msgstr "拓扑方式排序，并尽可能地保持日期顺序"
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
@@ -6011,8 +6203,8 @@ msgstr "只显示头（可以和 tags 共用）"
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测，需要精确的引用路径"
-msgid "show the HEAD reference"
-msgstr "显示 HEAD 引用"
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "显示 HEAD 引用，即使被过滤掉"
msgid "dereference tags into object IDs"
msgstr "转换 tags 到对象ID"
@@ -6334,6 +6526,9 @@ msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"
"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"
+msgid "expiry date"
+msgstr "逾期日期"
+
msgid "no-op (backward compatibility)"
msgstr "空操作（向后兼容）"
@@ -6385,7 +6580,7 @@ msgstr "合并两个或更多开发历史"
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
-msgid "Fetch from and merge with another repository or a local branch"
+msgid "Fetch from and integrate with another repository or a local branch"
msgstr "获取并合并另外的版本库或一个本地分支"
msgid "Update remote refs along with associated objects"
@@ -6418,11 +6613,11 @@ msgid ""
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
msgid ""
-"When you have resolved this problem, run \"$cmdline --resolved\".\n"
+"When you have resolved this problem, run \"$cmdline --continue\".\n"
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
msgstr ""
-"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n"
+"当您解决了此问题后，执行 \"$cmdline --continue\"。\n"
"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n"
"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。"
@@ -6465,11 +6660,18 @@ msgstr ""
"请不要再使用它了。"
msgid "previous rebase directory $dotest still exists but mbox given."
-msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
+msgstr "之前的变基目录 $dotest 仍然存在，但却提供了 mbox。"
msgid "Please make up your mind. --skip or --abort?"
msgstr "请下决心。--skip 或是 --abort ？"
+msgid ""
+"Stray $dotest directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"发现了错误的 $dotest 目录。\n"
+"使用 \"git am --abort\" 删除它。"
+
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
@@ -6676,6 +6878,21 @@ msgstr ""
"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
+msgid "Applied autostash."
+msgstr "成功应用 autostash。"
+
+msgid "Cannot store $stash_sha1"
+msgstr "无法保存 $stash_sha1"
+
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" it at any time.\n"
+msgstr ""
+"正应用 autostash 由于冲突。\n"
+"您的修改在 stash 中很安全。\n"
+"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基。"
@@ -6736,6 +6953,12 @@ msgstr "没有指向一个有效的提交：$onto_name"
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
+msgid "Cannot autostash"
+msgstr "无法 autostash"
+
+msgid "Created autostash: $stash_abbrev"
+msgstr "创建了 autostash: $stash_abbrev"
+
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
@@ -6775,6 +6998,9 @@ msgstr "无法删除临时索引（不应发生）"
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "无法用 $w_commit 更新 $ref_stash"
+
msgid ""
"error: unknown option for 'stash save': $option\n"
" To provide a message, use git stash save -- '$option'"
@@ -6785,6 +7011,15 @@ msgstr ""
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
+msgid ""
+"The following untracked files would NOT be saved but need to be removed by "
+"stash save:"
+msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而被删除："
+
+msgid ""
+"Aborting. Consider using either the --force or --include-untracked option."
+msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
+
msgid "Cannot initialize stash"
msgstr "无法初始化 stash"
@@ -6851,6 +7086,9 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反"
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "只能在工作区的顶级目录中使用相对路径"
+
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
@@ -6900,87 +7138,94 @@ msgstr "无法添加子模组 '$sm_path'"
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-msgid "Entering '$prefix$sm_path'"
-msgstr "正在进入 '$prefix$sm_path'"
+msgid "Entering '$prefix$displaypath'"
+msgstr "正在进入 '$prefix$displaypath'"
-msgid "Stopping at '$sm_path'; script returned non-zero status."
-msgstr "停止于 '$sm_path'，脚本返回非零值。"
+msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
+msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"
-msgid "No url found for submodule path '$sm_path' in .gitmodules"
-msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
+msgid "No url found for submodule path '$displaypath' in .gitmodules"
+msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"
-msgid "Failed to register url for submodule path '$sm_path'"
-msgstr "无法为子模组路径 '$sm_path' 注册 url"
+msgid "Failed to register url for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册 url"
-msgid "Submodule '$name' ($url) registered for path '$sm_path'"
-msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
+msgid "Submodule '$name' ($url) registered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-msgid "Failed to register update mode for submodule path '$sm_path'"
-msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
+msgid "Failed to register update mode for submodule path '$displaypath'"
+msgstr "无法为子模组路径 '$displaypath' 注册更新模式"
msgid "Use '.' if you really want to deinitialize all submodules"
msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"
-msgid "Submodule work tree '$sm_path' contains a .git directory"
-msgstr "子模组工作区 '$sm_path' 包含一个 .git 目录"
+msgid "Submodule work tree '$displaypath' contains a .git directory"
+msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"
msgid ""
"(use 'rm -rf' if you really want to remove it including all of its history)"
msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
msgid ""
-"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
"discard them"
-msgstr "子模组工作区 '$sm_path' 包含本地修改；使用 '-f' 丢弃它们"
+msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"
-msgid "Cleared directory '$sm_path'"
-msgstr "已清除目录 '$sm_path'"
+msgid "Cleared directory '$displaypath'"
+msgstr "已清除目录 '$displaypath'"
-msgid "Could not remove submodule work tree '$sm_path'"
-msgstr "无法移除子模组工作区 '$sm_path'"
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "无法移除子模组工作区 '$displaypath'"
-msgid "Could not create empty submodule directory '$sm_path'"
-msgstr "不能创建空的子模组目录 '$sm_path'"
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "不能创建空的子模组目录 '$displaypath'"
-msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
-msgstr "子模组 '$name' ($url) 未对路径 '$sm_path' 注册"
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
msgid ""
-"Submodule path '$prefix$sm_path' not initialized\n"
+"Submodule path '$displaypath' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
-"子模组路径 '$prefix$sm_path' 没有初始化\n"
+"子模组路径 '$displaypath' 没有初始化\n"
"也许您想用 'update --init'？"
-msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中找到当前版本"
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中获取"
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中获取"
-msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中变基 '$sha1'"
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：变基至 '$sha1'"
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法合并 '$sha1' 到子模组路径 '$prefix$sm_path' 中"
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：已合并入 '$sha1'"
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
-msgstr "无法在子模组路径 '$prefix$sm_path' 中检出 '$sha1'"
+msgid ""
+"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
+msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"
+
+msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
+msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"
+
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
-msgstr "子模组路径 '$prefix$sm_path'：检出 '$sha1'"
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-msgstr "无法递归进子模组路径 '$prefix$sm_path'"
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "无法递归进子模组路径 '$displaypath'"
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
@@ -6988,14 +7233,14 @@ msgstr "选项 --cached 不能和选项 --files 同时使用"
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
-msgid " Warn: $name doesn't contain commit $sha1_src"
-msgstr " 警告：$name 未包含提交 $sha1_src"
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " 警告：$display_name 未包含提交 $sha1_src"
-msgid " Warn: $name doesn't contain commit $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_dst"
-msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
msgid "blob"
msgstr "数据对象"
@@ -7009,8 +7254,32 @@ msgstr "要提交的子模组变更："
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "无法递归进子模组路径 '$sm_path'"
-msgid "Synchronizing submodule url for '$prefix$sm_path'"
-msgstr "为 '$prefix$sm_path' 同步子模组 url"
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "为 '$displaypath' 同步子模组 url"
+
Reply all
Reply to author
Forward
0 new messages