diff options
| -rw-r--r-- | po/zh_CN.po | 865 |
1 files changed, 436 insertions, 429 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 4c0c475..22d9961 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -135,8 +135,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2017-04-23 09:54+0800\n" -"PO-Revision-Date: 2017-05-02 22:07+0800\n" +"POT-Creation-Date: 2017-05-05 09:35+0800\n" +"PO-Revision-Date: 2017-05-09 21:54+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -704,7 +704,7 @@ msgstr[1] "修复空白错误后，应用了 %d 行。" msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280 +#: apply.c:4911 apply.c:4914 builtin/am.c:2276 builtin/am.c:2279 #: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180 #: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629 #: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973 @@ -721,7 +721,7 @@ msgstr "不要应用与给出路径向匹配的变更" msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4917 builtin/am.c:2286 +#: apply.c:4917 builtin/am.c:2285 msgid "num" msgstr "数字" @@ -773,7 +773,7 @@ msgstr "如果一个补丁不能应用则尝试三方合并" msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508 +#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" @@ -781,7 +781,7 @@ msgstr "路径以 NUL 字符分隔" msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:4949 builtin/am.c:2265 +#: apply.c:4949 builtin/am.c:2264 msgid "action" msgstr "动作" @@ -823,7 +823,7 @@ msgstr "允许不正确的文件末尾换行符" msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:4973 builtin/am.c:2274 +#: apply.c:4973 builtin/am.c:2273 msgid "root" msgstr "根目录" @@ -870,9 +870,9 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59 +#: archive.c:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:60 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061 -#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545 +#: builtin/hash-object.c:101 builtin/ls-files.c:549 builtin/ls-files.c:552 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129 #: parse-options.h:153 msgid "file" @@ -958,27 +958,27 @@ msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" -#: bisect.c:443 +#: bisect.c:444 #, c-format msgid "Could not open file '%s'" msgstr "不能打开文件 '%s'" -#: bisect.c:448 +#: bisect.c:449 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" -#: bisect.c:656 +#: bisect.c:657 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c:709 +#: bisect.c:710 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c:733 +#: bisect.c:734 #, c-format msgid "" "The merge base %s is bad.\n" @@ -987,7 +987,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c:738 +#: bisect.c:739 #, c-format msgid "" "The merge base %s is new.\n" @@ -996,7 +996,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c:743 +#: bisect.c:744 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1005,7 +1005,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1016,7 +1016,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1027,36 +1027,36 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c:799 +#: bisect.c:800 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255 +#: bisect.c:868 builtin/notes.c:174 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:918 +#: bisect.c:919 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c:948 +#: bisect.c:949 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c:968 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c:976 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" @@ -1065,7 +1065,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" -#: bisect.c:995 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1074,7 +1074,7 @@ msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with #. "(roughly %d steps)" translation -#: bisect.c:999 +#: bisect.c:1000 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1224,7 +1224,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1341 sequencer.c:1767 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -1233,7 +1233,7 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" -#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299 +#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2321 #: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353 #: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916 #: builtin/merge.c:359 builtin/shortlog.c:176 @@ -1298,8 +1298,8 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457 -#: builtin/am.c:1493 builtin/am.c:2127 +#: commit.c:40 sequencer.c:1579 builtin/am.c:419 builtin/am.c:455 +#: builtin/am.c:1489 builtin/am.c:2126 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -1327,148 +1327,148 @@ msgstr "内存耗尽" msgid "relative config include conditionals must come from files" msgstr "包含相对路径的条件引用必须来自于文件" -#: config.c:701 +#: config.c:711 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:705 +#: config.c:715 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" -#: config.c:709 +#: config.c:719 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" -#: config.c:713 +#: config.c:723 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" -#: config.c:717 +#: config.c:727 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" -#: config.c:721 +#: config.c:731 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" -#: config.c:840 +#: config.c:859 msgid "out of range" msgstr "超出范围" -#: config.c:840 +#: config.c:859 msgid "invalid unit" msgstr "无效的单位" -#: config.c:846 +#: config.c:865 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" -#: config.c:851 +#: config.c:870 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:854 +#: config.c:873 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:857 +#: config.c:876 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" -#: config.c:860 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:863 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:866 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" -#: config.c:953 +#: config.c:980 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展 '%s' 中的用户目录" -#: config.c:1048 config.c:1059 +#: config.c:1075 config.c:1086 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" -#: config.c:1176 +#: config.c:1203 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" -#: config.c:1332 +#: config.c:1359 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1522 +#: config.c:1557 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:1572 +#: config.c:1611 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:1931 +#: config.c:1970 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:1952 +#: config.c:1991 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'" -#: config.c:1978 +#: config.c:2017 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:1989 +#: config.c:2028 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:1991 +#: config.c:2030 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2050 +#: config.c:2089 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2384 config.c:2609 +#: config.c:2423 config.c:2648 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2502 +#: config.c:2541 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2504 builtin/remote.c:774 +#: config.c:2543 builtin/remote.c:774 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" @@ -1712,171 +1712,176 @@ msgstr "git fetch-pack：应为 shallow 列表" msgid "git fetch-pack: expected ACK/NAK, got EOF" msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF" -#: fetch-pack.c:279 +#: fetch-pack.c:280 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "远程错误：%s" + +#: fetch-pack.c:281 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:331 +#: fetch-pack.c:333 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:417 +#: fetch-pack.c:419 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:423 +#: fetch-pack.c:425 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:425 +#: fetch-pack.c:427 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:428 +#: fetch-pack.c:430 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:430 +#: fetch-pack.c:432 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:433 +#: fetch-pack.c:435 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:472 +#: fetch-pack.c:474 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:486 +#: fetch-pack.c:488 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:519 +#: fetch-pack.c:521 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:529 progress.c:235 +#: fetch-pack.c:531 progress.c:235 msgid "done" msgstr "完成" -#: fetch-pack.c:541 +#: fetch-pack.c:543 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:587 +#: fetch-pack.c:589 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:735 +#: fetch-pack.c:737 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:773 +#: fetch-pack.c:775 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:781 +#: fetch-pack.c:783 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:837 +#: fetch-pack.c:839 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:853 +#: fetch-pack.c:855 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:855 +#: fetch-pack.c:857 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:882 +#: fetch-pack.c:884 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:886 +#: fetch-pack.c:888 msgid "Server supports multi_ack_detailed" msgstr "服务器支持 multi_ack_detailed" -#: fetch-pack.c:889 +#: fetch-pack.c:891 msgid "Server supports no-done" msgstr "服务器支持 no-done" -#: fetch-pack.c:895 +#: fetch-pack.c:897 msgid "Server supports multi_ack" msgstr "服务器支持 multi_ack" -#: fetch-pack.c:899 +#: fetch-pack.c:901 msgid "Server supports side-band-64k" msgstr "服务器支持 side-band-64k" -#: fetch-pack.c:903 +#: fetch-pack.c:905 msgid "Server supports side-band" msgstr "服务器支持 side-band" -#: fetch-pack.c:907 +#: fetch-pack.c:909 msgid "Server supports allow-tip-sha1-in-want" msgstr "服务器支持 allow-tip-sha1-in-want" -#: fetch-pack.c:911 +#: fetch-pack.c:913 msgid "Server supports allow-reachable-sha1-in-want" msgstr "服务器支持 allow-reachable-sha1-in-want" -#: fetch-pack.c:921 +#: fetch-pack.c:923 msgid "Server supports ofs-delta" msgstr "服务器支持 ofs-delta" -#: fetch-pack.c:928 +#: fetch-pack.c:930 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:934 +#: fetch-pack.c:936 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:938 +#: fetch-pack.c:940 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:940 +#: fetch-pack.c:942 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:951 +#: fetch-pack.c:953 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:963 +#: fetch-pack.c:965 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1125 +#: fetch-pack.c:1127 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1147 +#: fetch-pack.c:1149 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1150 +#: fetch-pack.c:1152 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -2063,7 +2068,7 @@ msgstr "不能创建 '%s.lock'：%s" msgid "failed to read the cache" msgstr "无法读取缓存" -#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393 +#: merge.c:96 builtin/am.c:1999 builtin/am.c:2034 builtin/checkout.c:393 #: builtin/checkout.c:607 builtin/clone.c:749 msgid "unable to write new index file" msgstr "无法写新的索引文件" @@ -2397,7 +2402,7 @@ msgstr "-数字" msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: path.c:805 +#: path.c:810 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" @@ -2490,7 +2495,7 @@ msgstr "路径规格 '%s' 位于符号链接中" msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: read-cache.c:1307 +#: read-cache.c:1442 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2499,7 +2504,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1317 +#: read-cache.c:1452 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2508,37 +2513,41 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:2232 +#: read-cache.c:2375 sequencer.c:1350 sequencer.c:2048 #, c-format -msgid "could not stat '%s" +msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:2245 +#: read-cache.c:2388 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:2257 +#: read-cache.c:2400 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: refs.c:619 builtin/merge.c:844 +#: refs.c:620 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: refs/files-backend.c:2531 +#: refs.c:1667 +msgid "ref updates forbidden inside quarantine environment" +msgstr "在隔离环境中禁止更新引用" + +#: refs/files-backend.c:1631 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:2534 +#: refs/files-backend.c:1634 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" -#: refs/files-backend.c:2543 +#: refs/files-backend.c:1643 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" @@ -2977,12 +2986,12 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:294 sequencer.c:1675 +#: sequencer.c:294 sequencer.c:1682 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694 +#: sequencer.c:297 sequencer.c:1560 sequencer.c:1687 sequencer.c:1701 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" @@ -2992,12 +3001,12 @@ msgstr "不能写入 '%s'" msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:305 sequencer.c:1558 sequencer.c:1682 +#: sequencer.c:305 sequencer.c:1565 sequencer.c:1689 #, c-format msgid "failed to finalize '%s'." msgstr "无法完成 '%s'。" -#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259 +#: sequencer.c:329 sequencer.c:814 sequencer.c:1586 builtin/am.c:257 #: builtin/commit.c:749 builtin/merge.c:1018 #, c-format msgid "could not read '%s'" @@ -3171,7 +3180,7 @@ msgstr "不能得到 %s 的提交说明" msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1071 sequencer.c:1820 +#: sequencer.c:1071 sequencer.c:1827 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" @@ -3200,124 +3209,124 @@ msgstr "git %s：无法读取索引" msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:1302 +#: sequencer.c:1303 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:1310 +#: sequencer.c:1311 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:1342 +#: sequencer.c:1344 #, c-format msgid "could not read '%s'." msgstr "不能读取 '%s'。" -#: sequencer.c:1349 +#: sequencer.c:1356 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:1351 +#: sequencer.c:1358 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:1356 +#: sequencer.c:1363 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:1367 +#: sequencer.c:1374 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:1369 +#: sequencer.c:1376 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:1432 +#: sequencer.c:1439 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:1435 +#: sequencer.c:1442 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:1492 +#: sequencer.c:1499 #, c-format msgid "malformed options sheet: '%s'" msgstr "非法的选项清单：'%s'" -#: sequencer.c:1530 +#: sequencer.c:1537 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:1531 +#: sequencer.c:1538 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1534 +#: sequencer.c:1541 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:1548 +#: sequencer.c:1555 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:1604 sequencer.c:2159 +#: sequencer.c:1611 sequencer.c:2181 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:1606 +#: sequencer.c:1613 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1608 sequencer.c:1642 +#: sequencer.c:1615 sequencer.c:1649 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:1628 builtin/grep.c:910 +#: sequencer.c:1635 builtin/grep.c:910 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:1630 +#: sequencer.c:1637 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:1631 +#: sequencer.c:1638 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:1637 +#: sequencer.c:1644 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:1648 +#: sequencer.c:1655 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:1785 sequencer.c:2058 +#: sequencer.c:1792 sequencer.c:2080 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1825 builtin/difftool.c:616 +#: sequencer.c:1832 builtin/difftool.c:616 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:1841 +#: sequencer.c:1848 msgid "could not read index" msgstr "不能读取索引" # 译者：注意保持前导空格 -#: sequencer.c:1846 +#: sequencer.c:1853 #, c-format msgid "" "execution failed: %s\n" @@ -3332,11 +3341,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1852 +#: sequencer.c:1859 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:1858 +#: sequencer.c:1865 #, c-format msgid "" "execution succeeded: %s\n" @@ -3353,17 +3362,17 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:1913 git-rebase.sh:168 +#: sequencer.c:1920 git-rebase.sh:169 #, c-format msgid "Applied autostash." msgstr "成功应用 autostash。" -#: sequencer.c:1925 +#: sequencer.c:1932 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:1927 git-rebase.sh:172 +#: sequencer.c:1934 git-rebase.sh:173 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3374,57 +3383,57 @@ msgstr "" "您的修改安全地保存在 stash 中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:2009 +#: sequencer.c:2016 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:2036 +#: sequencer.c:2058 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:2066 +#: sequencer.c:2088 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:2070 +#: sequencer.c:2092 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:2077 +#: sequencer.c:2099 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:2084 +#: sequencer.c:2106 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:2168 +#: sequencer.c:2190 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:2173 +#: sequencer.c:2195 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:2182 +#: sequencer.c:2204 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:2184 +#: sequencer.c:2206 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:2186 +#: sequencer.c:2208 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:2189 +#: sequencer.c:2211 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3433,21 +3442,21 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:2199 +#: sequencer.c:2221 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:2279 +#: sequencer.c:2301 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:2283 +#: sequencer.c:2305 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:2316 +#: sequencer.c:2338 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" @@ -3643,24 +3652,24 @@ msgstr "无法在子模组 '%s' 中执行 'git status'" msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1679 +#: submodule.c:1678 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:1691 submodule.c:1747 +#: submodule.c:1690 submodule.c:1746 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:1695 builtin/submodule--helper.c:678 +#: submodule.c:1694 builtin/submodule--helper.c:678 #: builtin/submodule--helper.c:688 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: submodule.c:1698 +#: submodule.c:1697 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3671,20 +3680,20 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:1782 +#: submodule.c:1781 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:1826 +#: submodule.c:1825 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:1846 +#: submodule.c:1845 msgid "BUG: returned path string doesn't match cwd?" msgstr "BUG：返回的路径和当前路径不匹配？" -#: submodule.c:1865 +#: submodule.c:1864 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -4091,8 +4100,8 @@ msgstr "无法打开 '%s' 进行读写" msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:318 builtin/am.c:757 +#: builtin/am.c:849 builtin/commit.c:1700 builtin/merge.c:1015 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -4770,105 +4779,105 @@ msgstr "也许您想要执行 'git add .'？\n" msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/am.c:414 +#: builtin/am.c:412 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:491 +#: builtin/am.c:489 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:532 +#: builtin/am.c:530 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:569 +#: builtin/am.c:567 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:595 +#: builtin/am.c:593 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:775 +#: builtin/am.c:777 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:840 +#: builtin/am.c:842 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:887 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:890 builtin/am.c:898 +#: builtin/am.c:892 builtin/am.c:900 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:895 +#: builtin/am.c:897 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:984 +#: builtin/am.c:986 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:989 builtin/clone.c:397 +#: builtin/am.c:991 builtin/clone.c:397 #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/am.c:993 +#: builtin/am.c:995 msgid "Failed to split patches." msgstr "无法拆分补丁。" -#: builtin/am.c:1125 builtin/commit.c:376 +#: builtin/am.c:1127 builtin/commit.c:376 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1176 +#: builtin/am.c:1178 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1177 +#: builtin/am.c:1179 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1178 +#: builtin/am.c:1180 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1316 +#: builtin/am.c:1315 msgid "Patch is empty. Was it split wrong?" msgstr "补丁为空。是不是切分错误？" -#: builtin/am.c:1390 builtin/log.c:1557 +#: builtin/am.c:1386 builtin/log.c:1557 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/am.c:1417 +#: builtin/am.c:1413 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c:1610 +#: builtin/am.c:1606 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1612 +#: builtin/am.c:1608 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1631 +#: builtin/am.c:1627 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -4876,37 +4885,37 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1637 +#: builtin/am.c:1633 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1662 +#: builtin/am.c:1658 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1686 builtin/merge.c:631 +#: builtin/am.c:1682 builtin/merge.c:631 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/am.c:1693 +#: builtin/am.c:1689 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/am.c:1702 builtin/commit.c:1764 builtin/merge.c:802 #: builtin/merge.c:827 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/am.c:1739 builtin/am.c:1743 +#: builtin/am.c:1735 builtin/am.c:1739 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1759 +#: builtin/am.c:1755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" -#: builtin/am.c:1764 +#: builtin/am.c:1760 msgid "Commit Body is:" msgstr "提交内容为：" @@ -4915,35 +4924,35 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1774 +#: builtin/am.c:1770 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1824 +#: builtin/am.c:1820 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1861 builtin/am.c:1933 +#: builtin/am.c:1860 builtin/am.c:1932 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1877 +#: builtin/am.c:1876 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1885 +#: builtin/am.c:1884 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1891 +#: builtin/am.c:1890 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补丁文件副本位于：%s" -#: builtin/am.c:1936 +#: builtin/am.c:1935 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -4953,7 +4962,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1943 +#: builtin/am.c:1942 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" @@ -4961,91 +4970,91 @@ msgstr "" "您的索引中仍有未合并的路径。\n" "您是否忘了执行 'git add'？" -#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/am.c:2050 builtin/am.c:2054 builtin/am.c:2066 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:2103 +#: builtin/am.c:2102 msgid "failed to clean index" msgstr "无法清空索引" -#: builtin/am.c:2137 +#: builtin/am.c:2136 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2200 +#: builtin/am.c:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2233 +#: builtin/am.c:2232 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2234 +#: builtin/am.c:2233 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2242 +#: builtin/am.c:2241 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2244 +#: builtin/am.c:2243 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/am.c:2244 builtin/init-db.c:483 builtin/prune-packed.c:57 #: builtin/repack.c:178 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2247 +#: builtin/am.c:2246 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2252 +#: builtin/am.c:2251 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2254 +#: builtin/am.c:2253 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2261 +#: builtin/am.c:2260 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 -#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 -#: builtin/am.c:2293 +#: builtin/am.c:2265 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274 +#: builtin/am.c:2277 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286 +#: builtin/am.c:2292 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/am.c:2282 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 #: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135 #: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 #: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398 @@ -5053,57 +5062,57 @@ msgstr "传递给 git-apply" msgid "n" msgstr "n" -#: builtin/am.c:2289 builtin/branch.c:592 builtin/for-each-ref.c:37 -#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38 +#: builtin/am.c:2288 builtin/branch.c:592 builtin/for-each-ref.c:37 +#: builtin/replace.c:443 builtin/tag.c:433 builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2290 +#: builtin/am.c:2289 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2298 +#: builtin/am.c:2297 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2311 +#: builtin/am.c:2310 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:232 +#: builtin/am.c:2314 builtin/commit.c:1600 builtin/merge.c:232 #: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2316 +#: builtin/am.c:2315 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2334 +#: builtin/am.c:2333 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -5111,16 +5120,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2341 +#: builtin/am.c:2340 msgid "failed to read the index" msgstr "无法读取索引" -#: builtin/am.c:2356 +#: builtin/am.c:2355 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2380 +#: builtin/am.c:2379 #, c-format msgid "" "Stray %s directory found.\n" @@ -5129,7 +5138,7 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2386 +#: builtin/am.c:2385 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" @@ -5159,11 +5168,6 @@ msgstr "git archive：应为 ACK/NACK，却得到 EOF" msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "远程错误：%s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive：协议错误" @@ -5835,7 +5839,7 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:352 +#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:356 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -5927,7 +5931,7 @@ msgstr "将内容写入临时文件" #: builtin/checkout-index.c:174 builtin/column.c:30 #: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638 #: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980 -#: builtin/worktree.c:472 +#: builtin/worktree.c:477 msgid "string" msgstr "字符串" @@ -6142,8 +6146,8 @@ msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" #: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325 -#: builtin/worktree.c:327 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:329 +#: builtin/worktree.c:331 msgid "branch" msgstr "分支" @@ -6159,7 +6163,7 @@ msgstr "创建/重置并检出一个分支" msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1164 builtin/worktree.c:329 +#: builtin/checkout.c:1164 builtin/worktree.c:333 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" @@ -6407,7 +6411,7 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451 -#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348 +#: builtin/grep.c:1063 builtin/ls-files.c:546 builtin/name-rev.c:348 #: builtin/name-rev.c:350 builtin/show-ref.c:176 msgid "pattern" msgstr "模式" @@ -6660,7 +6664,7 @@ msgstr "无法执行 repack 来清理" msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:884 builtin/receive-pack.c:1901 +#: builtin/clone.c:884 builtin/receive-pack.c:1900 msgid "Too many arguments." msgstr "太多参数。" @@ -6698,7 +6702,7 @@ msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/worktree.c:221 builtin/worktree.c:251 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" @@ -7137,7 +7141,7 @@ msgid "version" msgstr "版本" #: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 -#: builtin/worktree.c:443 +#: builtin/worktree.c:448 msgid "machine-readable output" msgstr "机器可读的输出" @@ -7218,7 +7222,7 @@ msgstr "作者" msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1588 builtin/gc.c:353 +#: builtin/commit.c:1588 builtin/gc.c:357 msgid "date" msgstr "日期" @@ -7379,139 +7383,139 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c:55 +#: builtin/config.c:56 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:56 +#: builtin/config.c:57 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use repository config file" msgstr "使用仓库级配置文件" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "blob-id" msgstr "数据对象 ID" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "Action" msgstr "操作" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "list all" msgstr "列出所有" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "Type" msgstr "类型" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "Other" msgstr "其它" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" -#: builtin/config.c:83 +#: builtin/config.c:84 msgid "show variable names only" msgstr "只显示变量名" -#: builtin/config.c:84 +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/config.c:85 +#: builtin/config.c:86 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" -#: builtin/config.c:327 +#: builtin/config.c:328 msgid "unable to parse default color value" msgstr "不能解析默认颜色值" -#: builtin/config.c:471 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7526,12 +7530,12 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:615 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/config.c:623 +#: builtin/config.c:627 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8320,12 +8324,12 @@ msgstr "git gc [<选项>]" msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" -#: builtin/gc.c:306 +#: builtin/gc.c:310 #, c-format msgid "Can't stat %s" msgstr "不能对 %s 调用 stat" -#: builtin/gc.c:315 +#: builtin/gc.c:319 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8339,50 +8343,50 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:354 +#: builtin/gc.c:358 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:356 +#: builtin/gc.c:360 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:357 +#: builtin/gc.c:361 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:358 +#: builtin/gc.c:362 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:375 +#: builtin/gc.c:379 #, c-format msgid "Failed to parse gc.logexpiry value %s" msgstr "无法解析 gc.logexpiry 的值 %s" -#: builtin/gc.c:403 +#: builtin/gc.c:407 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:405 +#: builtin/gc.c:409 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:406 +#: builtin/gc.c:410 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:427 +#: builtin/gc.c:431 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" -#: builtin/gc.c:471 +#: builtin/gc.c:475 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" @@ -9575,103 +9579,103 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:512 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:514 +#: builtin/ls-files.c:521 msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:516 +#: builtin/ls-files.c:523 msgid "show deleted files in the output" msgstr "显示已删除的文件" -#: builtin/ls-files.c:518 +#: builtin/ls-files.c:525 msgid "show modified files in the output" msgstr "显示已修改的文件" -#: builtin/ls-files.c:520 +#: builtin/ls-files.c:527 msgid "show other files in the output" msgstr "显示其它文件" -#: builtin/ls-files.c:522 +#: builtin/ls-files.c:529 msgid "show ignored files in the output" msgstr "显示忽略的文件" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:532 msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:534 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:536 msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:538 msgid "show line endings of files" msgstr "显示文件换行符格式" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:540 msgid "don't show empty directories" msgstr "不显示空目录" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:543 msgid "show unmerged files in the output" msgstr "显示未合并的文件" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:545 msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:547 msgid "skip files matching pattern" msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:550 msgid "exclude patterns are read from <file>" msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:553 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:555 msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:558 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:561 msgid "recurse through submodules" msgstr "在子模组中递归" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:563 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:564 msgid "tree-ish" msgstr "树或提交" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:565 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:567 msgid "show debugging data" msgstr "显示调试数据" @@ -11102,7 +11106,7 @@ msgstr "详见 git-pull(1)。" msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:456 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" @@ -11554,7 +11558,7 @@ msgstr "中止变基" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:796 +#: builtin/receive-pack.c:795 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -11580,7 +11584,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:816 +#: builtin/receive-pack.c:815 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -11599,11 +11603,11 @@ msgstr "" "\n" "若要屏蔽此信息，您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:1889 +#: builtin/receive-pack.c:1888 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1903 +#: builtin/receive-pack.c:1902 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -12232,67 +12236,67 @@ msgstr "git replace -d <对象>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395 +#: builtin/replace.c:330 builtin/replace.c:368 builtin/replace.c:396 #, c-format msgid "Not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" -#: builtin/replace.c:359 +#: builtin/replace.c:360 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:361 +#: builtin/replace.c:362 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有非法的合并标签" -#: builtin/replace.c:372 +#: builtin/replace.c:373 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:405 +#: builtin/replace.c:406 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始提交 '%s' 中包含一个 GPG 签名" -#: builtin/replace.c:406 +#: builtin/replace.c:407 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:412 +#: builtin/replace.c:413 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:436 +#: builtin/replace.c:437 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:437 +#: builtin/replace.c:438 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:438 +#: builtin/replace.c:439 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:439 +#: builtin/replace.c:440 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:440 +#: builtin/replace.c:441 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:441 +#: builtin/replace.c:442 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:442 +#: builtin/replace.c:443 msgid "use this format" msgstr "使用此格式" @@ -12900,7 +12904,7 @@ msgstr "相对路径的替代锚记（anchor）" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:382 +#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" @@ -13208,30 +13212,6 @@ msgstr "无标签说明？" msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:312 -msgid "tag: tagging " -msgstr "tag: tagging " - -#: builtin/tag.c:320 -msgid "object of unknown type" -msgstr "未知类型的对象" - -#: builtin/tag.c:327 -msgid "commit object" -msgstr "提交对象" - -#: builtin/tag.c:335 -msgid "tree object" -msgstr "树对象" - -#: builtin/tag.c:338 -msgid "blob object" -msgstr "数据对象" - -#: builtin/tag.c:341 -msgid "other tag object" -msgstr "其它标签对象" - #: builtin/tag.c:397 msgid "list tag names" msgstr "列出标签名称" @@ -13660,27 +13640,27 @@ msgstr "git worktree prune [<选项>]" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:42 +#: builtin/worktree.c:43 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "删除工作区/%s：不是一个有效的目录" -#: builtin/worktree.c:48 +#: builtin/worktree.c:49 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "删除 worktrees/%s：gitdir 文件不存在" -#: builtin/worktree.c:53 +#: builtin/worktree.c:54 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" -#: builtin/worktree.c:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "删除 worktrees/%s：无效的 gitdir 文件" -#: builtin/worktree.c:80 +#: builtin/worktree.c:81 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" @@ -13698,60 +13678,64 @@ msgstr "将早于 <time> 的工作区过期" msgid "'%s' already exists" msgstr "'%s' 已经存在" -#: builtin/worktree.c:236 +#: builtin/worktree.c:235 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:272 +#: builtin/worktree.c:274 #, c-format msgid "Preparing %s (identifier %s)" msgstr "准备 %s（标识符 %s）" -#: builtin/worktree.c:324 +#: builtin/worktree.c:328 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出分支 <branch> 即使已经被检出到其它工作区" -#: builtin/worktree.c:326 +#: builtin/worktree.c:330 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:328 +#: builtin/worktree.c:332 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:330 +#: builtin/worktree.c:334 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:338 +#: builtin/worktree.c:335 +msgid "keep the new working tree locked" +msgstr "锁定新工作区" + +#: builtin/worktree.c:343 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:473 +#: builtin/worktree.c:478 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:485 builtin/worktree.c:518 +#: builtin/worktree.c:490 builtin/worktree.c:523 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:487 builtin/worktree.c:520 +#: builtin/worktree.c:492 builtin/worktree.c:525 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:492 +#: builtin/worktree.c:497 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:494 +#: builtin/worktree.c:499 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:522 +#: builtin/worktree.c:527 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" @@ -13819,15 +13803,20 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: http.c:355 +#: http.c:336 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "http.postbuffer 为负值，默认为 %d" + +#: http.c:357 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "当 cURL < 7.22.0 时，不支持委托控制" -#: http.c:364 +#: http.c:366 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0" -#: http.c:1755 +#: http.c:1766 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -14206,7 +14195,7 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效，尝试自动合并。" -#: git-rebase.sh:57 +#: git-rebase.sh:58 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -14217,37 +14206,37 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:157 git-rebase.sh:396 +#: git-rebase.sh:158 git-rebase.sh:397 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:172 #, sh-format msgid "Cannot store $stash_sha1" msgstr "无法保存 $stash_sha1" -#: git-rebase.sh:211 +#: git-rebase.sh:212 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基操作。" -#: git-rebase.sh:216 +#: git-rebase.sh:217 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:357 +#: git-rebase.sh:358 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:368 +#: git-rebase.sh:369 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: git-rebase.sh:375 +#: git-rebase.sh:376 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:379 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -14255,7 +14244,7 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:418 +#: git-rebase.sh:419 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14274,64 +14263,64 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:469 +#: git-rebase.sh:470 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:493 +#: git-rebase.sh:494 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:496 git-rebase.sh:500 +#: git-rebase.sh:497 git-rebase.sh:501 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:505 +#: git-rebase.sh:506 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:528 +#: git-rebase.sh:529 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:561 +#: git-rebase.sh:562 msgid "Cannot autostash" msgstr "无法 autostash" -#: git-rebase.sh:566 +#: git-rebase.sh:567 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" -#: git-rebase.sh:570 +#: git-rebase.sh:571 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:594 +#: git-rebase.sh:595 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:605 +#: git-rebase.sh:606 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" -#: git-rebase.sh:614 +#: git-rebase.sh:615 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，回退分支以便在上面重放您的工作..." -#: git-rebase.sh:624 +#: git-rebase.sh:625 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -16037,6 +16026,24 @@ msgstr "略过 %s 含备份后缀 '%s'。\n" msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s？[y|N]：" +#~ msgid "tag: tagging " +#~ msgstr "tag: tagging " + +#~ msgid "object of unknown type" +#~ msgstr "未知类型的对象" + +#~ msgid "commit object" +#~ msgstr "提交对象" + +#~ msgid "tree object" +#~ msgstr "树对象" + +#~ msgid "blob object" +#~ msgstr "数据对象" + +#~ msgid "other tag object" +#~ msgstr "其它标签对象" + #~ msgid "" #~ "There is nothing to exclude from by :(exclude) patterns.\n" #~ "Perhaps you forgot to add either ':/' or '.' ?" |