Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
l10n: zh_CN: for git v2.13.0 l10n round 2
author
Jiang Xin
<worldhello.net@gmail.com>
Tue, 9 May 2017 13:55:38 +0000
(21:55 +0800)
committer
Jiang Xin
<worldhello.net@gmail.com>
Tue, 9 May 2017 13:55:38 +0000
(21:55 +0800)
Translate 4 messages (3195t0f0u) for git v2.13.0-rc2.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
po/zh_CN.po
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
65e2041
)
diff --git
a/po/zh_CN.po
b/po/zh_CN.po
index 4c0c4756e0dcc6a5eed52ef85ef83d8156a85995..22d99619482845f27d9f1d57be0c4d101200acf1 100644
(file)
--- 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"
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-0
4-23 09:54
+0800\n"
-"PO-Revision-Date: 2017-05-0
2 22:07
+0800\n"
+"POT-Creation-Date: 2017-0
5-05 09:35
+0800\n"
+"PO-Revision-Date: 2017-05-0
9 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"
"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 "无法写入新索引文件"
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4911 apply.c:4914 builtin/am.c:227
7 builtin/am.c:2280
+#: apply.c:4911 apply.c:4914 builtin/am.c:227
6 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
#: 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 "应用与给出路径向匹配的变更"
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4917 builtin/am.c:228
6
+#: apply.c:4917 builtin/am.c:228
5
msgid "num"
msgstr "数字"
msgid "num"
msgstr "数字"
@@
-773,7
+773,7
@@
msgstr "如果一个补丁不能应用则尝试三方合并"
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:5
08
+#: apply.c:4946 builtin/checkout-index.c:169 builtin/ls-files.c:5
15
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
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> 行上下文"
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4949 builtin/am.c:226
5
+#: apply.c:4949 builtin/am.c:226
4
msgid "action"
msgstr "动作"
msgid "action"
msgstr "动作"
@@
-823,7
+823,7
@@
msgstr "允许不正确的文件末尾换行符"
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:4973 builtin/am.c:227
4
+#: apply.c:4973 builtin/am.c:227
3
msgid "root"
msgstr "根目录"
msgid "root"
msgstr "根目录"
@@
-870,9
+870,9
@@
msgstr "前缀"
msgid "prepend prefix to each pathname in the archive"
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/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:54
2 builtin/ls-files.c:545
+#: builtin/hash-object.c:101 builtin/ls-files.c:54
9 builtin/ls-files.c:552
#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
#: parse-options.h:153
msgid "file"
#: 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"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:44
3
+#: bisect.c:44
4
#, c-format
msgid "Could not open file '%s'"
msgstr "不能打开文件 '%s'"
#, c-format
msgid "Could not open file '%s'"
msgstr "不能打开文件 '%s'"
-#: bisect.c:44
8
+#: bisect.c:44
9
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:65
6
+#: bisect.c:65
7
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:7
09
+#: bisect.c:7
10
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:73
3
+#: bisect.c:73
4
#, c-format
msgid ""
"The merge base %s is bad.\n"
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@
-987,7
+987,7
@@
msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:73
8
+#: bisect.c:73
9
#, c-format
msgid ""
"The merge base %s is new.\n"
#, c-format
msgid ""
"The merge base %s is new.\n"
@@
-996,7
+996,7
@@
msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:74
3
+#: bisect.c:74
4
#, c-format
msgid ""
"The merge base %s is %s.\n"
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@
-1005,7
+1005,7
@@
msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:75
1
+#: bisect.c:75
2
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@
-1016,7
+1016,7
@@
msgstr ""
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:76
4
+#: bisect.c:76
5
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@
-1027,36
+1027,36
@@
msgstr ""
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:
799
+#: bisect.c:
800
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:85
0
+#: bisect.c:85
1
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:86
7
builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:86
8
builtin/notes.c:174 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:91
8
+#: bisect.c:91
9
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:94
8
+#: bisect.c:94
9
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:96
8
+#: bisect.c:96
9
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:97
6
+#: bisect.c:97
7
#, c-format
msgid ""
"No testable commit found.\n"
#, c-format
msgid ""
"No testable commit found.\n"
@@
-1065,7
+1065,7
@@
msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:99
5
+#: bisect.c:99
6
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
#, 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
#. 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"
#, 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)"
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:87 sequencer.c:13
39 sequencer.c:1760
builtin/commit.c:777
+#: bundle.c:87 sequencer.c:13
41 sequencer.c:1767
builtin/commit.c:777
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@
-1233,7
+1233,7
@@
msgstr "不能打开 '%s'"
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2
299
+#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2
321
#: 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
#: 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"
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:40 sequencer.c:157
2 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:14
93 builtin/am.c:2127
+#: commit.c:40 sequencer.c:157
9 builtin/am.c:419 builtin/am.c:455
+#: builtin/am.c:14
89 builtin/am.c:2126
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@
-1327,148
+1327,148
@@
msgstr "内存耗尽"
msgid "relative config include conditionals must come from files"
msgstr "包含相对路径的条件引用必须来自于文件"
msgid "relative config include conditionals must come from files"
msgstr "包含相对路径的条件引用必须来自于文件"
-#: config.c:7
0
1
+#: config.c:7
1
1
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:7
0
5
+#: config.c:7
1
5
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:7
0
9
+#: config.c:7
1
9
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:7
1
3
+#: config.c:7
2
3
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:7
1
7
+#: config.c:7
2
7
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:7
2
1
+#: config.c:7
3
1
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:8
40
+#: config.c:8
59
msgid "out of range"
msgstr "超出范围"
msgid "out of range"
msgstr "超出范围"
-#: config.c:8
40
+#: config.c:8
59
msgid "invalid unit"
msgstr "无效的单位"
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:8
46
+#: config.c:8
65
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:8
51
+#: config.c:8
70
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
#, 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:8
54
+#: config.c:8
73
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
#, 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:8
57
+#: config.c:8
76
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
-#: config.c:8
60
+#: config.c:8
79
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
#, 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:8
63
+#: config.c:8
82
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
#, 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:8
66
+#: config.c:8
85
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
-#: config.c:9
53
+#: config.c:9
80
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:10
48 config.c:1059
+#: config.c:10
75 config.c:1086
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1
176
+#: config.c:1
203
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:13
32
+#: config.c:13
59
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:15
22
+#: config.c:15
57
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1
572
+#: config.c:1
611
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:19
31
+#: config.c:19
70
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:19
52
+#: config.c:19
91
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
#, 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 之间"
#, 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'"
#, 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'"
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:20
50
+#: config.c:20
89
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2
384 config.c:2609
+#: config.c:2
423 config.c:2648
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:25
02
+#: config.c:25
41
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:25
04
builtin/remote.c:774
+#: config.c:25
43
builtin/remote.c:774
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
#, 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"
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'"
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:33
1
+#: fetch-pack.c:33
3
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:41
7
+#: fetch-pack.c:41
9
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:42
3
+#: fetch-pack.c:42
5
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:42
5
+#: fetch-pack.c:42
7
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:4
28
+#: fetch-pack.c:4
30
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:43
0
+#: fetch-pack.c:43
2
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:43
3
+#: fetch-pack.c:43
5
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:47
2
+#: fetch-pack.c:47
4
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:48
6
+#: fetch-pack.c:48
8
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:5
19
+#: fetch-pack.c:5
21
msgid "giving up"
msgstr "放弃"
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:5
29
progress.c:235
+#: fetch-pack.c:5
31
progress.c:235
msgid "done"
msgstr "完成"
msgid "done"
msgstr "完成"
-#: fetch-pack.c:54
1
+#: fetch-pack.c:54
3
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:58
7
+#: fetch-pack.c:58
9
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:73
5
+#: fetch-pack.c:73
7
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:77
3
+#: fetch-pack.c:77
5
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:78
1
+#: fetch-pack.c:78
3
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:83
7
+#: fetch-pack.c:83
9
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:85
3
+#: fetch-pack.c:85
5
#, c-format
msgid "%s failed"
msgstr "%s 失败"
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:85
5
+#: fetch-pack.c:85
7
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:88
2
+#: fetch-pack.c:88
4
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:88
6
+#: fetch-pack.c:88
8
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
-#: fetch-pack.c:8
89
+#: fetch-pack.c:8
91
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
-#: fetch-pack.c:89
5
+#: fetch-pack.c:89
7
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
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"
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
-#: fetch-pack.c:90
3
+#: fetch-pack.c:90
5
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
-#: fetch-pack.c:90
7
+#: fetch-pack.c:90
9
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
-#: fetch-pack.c:91
1
+#: fetch-pack.c:91
3
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: fetch-pack.c:92
1
+#: fetch-pack.c:92
3
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
-#: fetch-pack.c:9
28
+#: fetch-pack.c:9
30
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:93
4
+#: fetch-pack.c:93
6
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:9
38
+#: fetch-pack.c:9
40
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:94
0
+#: fetch-pack.c:94
2
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:95
1
+#: fetch-pack.c:95
3
msgid "no common commits"
msgstr "没有共同的提交"
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:96
3
+#: fetch-pack.c:96
5
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:112
5
+#: fetch-pack.c:112
7
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:114
7
+#: fetch-pack.c:114
9
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:115
0
+#: fetch-pack.c:115
2
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
#, 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 "无法读取缓存"
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 "无法写新的索引文件"
#: 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'"
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: path.c:8
05
+#: path.c:8
10
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
#, 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 格式"
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: read-cache.c:1
307
+#: read-cache.c:1
442
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@
-2499,7
+2504,7
@@
msgstr ""
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1
317
+#: read-cache.c:1
452
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@
-2508,37
+2513,41
@@
msgstr ""
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:2
232
+#: read-cache.c:2
375 sequencer.c:1350 sequencer.c:2048
#, c-format
#, c-format
-msgid "could not stat '%s"
+msgid "could not stat '%s
'
"
msgstr "不能对 '%s' 调用 stat"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:2
245
+#: read-cache.c:2
388
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:2
257
+#: read-cache.c:2
400
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: refs.c:6
19
builtin/merge.c:844
+#: refs.c:6
20
builtin/merge.c:844
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
#, 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"
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s：%s"
-#: refs/files-backend.c:
25
34
+#: refs/files-backend.c:
16
34
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用：%s"
-#: refs/files-backend.c:
25
43
+#: refs/files-backend.c:
16
43
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
@@
-2977,12
+2986,12
@@
msgstr ""
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:294 sequencer.c:16
75
+#: sequencer.c:294 sequencer.c:16
82
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:297 sequencer.c:15
53 sequencer.c:1680 sequencer.c:1694
+#: sequencer.c:297 sequencer.c:15
60 sequencer.c:1687 sequencer.c:1701
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
#, 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'"
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:305 sequencer.c:15
58 sequencer.c:1682
+#: sequencer.c:305 sequencer.c:15
65 sequencer.c:1689
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
-#: sequencer.c:329 sequencer.c:814 sequencer.c:15
79 builtin/am.c:259
+#: sequencer.c:329 sequencer.c:814 sequencer.c:15
86 builtin/am.c:257
#: builtin/commit.c:749 builtin/merge.c:1018
#, c-format
msgid "could not read '%s'"
#: 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"
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1071 sequencer.c:182
0
+#: sequencer.c:1071 sequencer.c:182
7
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
#, 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：无法刷新索引"
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:130
2
+#: sequencer.c:130
3
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:131
0
+#: sequencer.c:131
1
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:134
2
+#: sequencer.c:134
4
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:13
49
+#: sequencer.c:13
56
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:135
1
+#: sequencer.c:135
8
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:13
56
+#: sequencer.c:13
63
msgid "no commits parsed."
msgstr "没有解析提交。"
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:13
67
+#: sequencer.c:13
74
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:13
69
+#: sequencer.c:13
76
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:143
2
+#: sequencer.c:143
9
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: sequencer.c:14
35
+#: sequencer.c:14
42
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:149
2
+#: sequencer.c:149
9
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单：'%s'"
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单：'%s'"
-#: sequencer.c:153
0
+#: sequencer.c:153
7
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:153
1
+#: sequencer.c:153
8
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:15
34
+#: sequencer.c:15
41
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:15
48
+#: sequencer.c:15
55
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:16
04 sequencer.c:2159
+#: sequencer.c:16
11 sequencer.c:2181
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:16
06
+#: sequencer.c:16
13
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:16
08 sequencer.c:1642
+#: sequencer.c:16
15 sequencer.c:1649
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:16
28
builtin/grep.c:910
+#: sequencer.c:16
35
builtin/grep.c:910
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:163
0
+#: sequencer.c:163
7
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:163
1
+#: sequencer.c:163
8
msgid "unexpected end of file"
msgstr "意外的文件结束"
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:16
37
+#: sequencer.c:16
44
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:16
48
+#: sequencer.c:16
55
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:17
85 sequencer.c:2058
+#: sequencer.c:17
92 sequencer.c:2080
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:18
25
builtin/difftool.c:616
+#: sequencer.c:18
32
builtin/difftool.c:616
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:184
1
+#: sequencer.c:184
8
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:18
46
+#: sequencer.c:18
53
#, c-format
msgid ""
"execution failed: %s\n"
#, c-format
msgid ""
"execution failed: %s\n"
@@
-3332,11
+3341,11
@@
msgstr ""
" git rebase --continue\n"
"\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:185
2
+#: sequencer.c:185
9
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:18
58
+#: sequencer.c:18
65
#, c-format
msgid ""
"execution succeeded: %s\n"
#, c-format
msgid ""
"execution succeeded: %s\n"
@@
-3353,17
+3362,17
@@
msgstr ""
" git rebase --continue\n"
"\n"
" git rebase --continue\n"
"\n"
-#: sequencer.c:19
13 git-rebase.sh:168
+#: sequencer.c:19
20 git-rebase.sh:169
#, c-format
msgid "Applied autostash."
msgstr "成功应用 autostash。"
#, c-format
msgid "Applied autostash."
msgstr "成功应用 autostash。"
-#: sequencer.c:19
25
+#: sequencer.c:19
32
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:19
27 git-rebase.sh:172
+#: sequencer.c:19
34 git-rebase.sh:173
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@
-3374,57
+3383,57
@@
msgstr ""
"您的修改安全地保存在 stash 中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
"您的修改安全地保存在 stash 中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:20
09
+#: sequencer.c:20
16
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:20
36
+#: sequencer.c:20
58
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:20
66
+#: sequencer.c:20
88
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:20
70
+#: sequencer.c:20
92
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:20
77
+#: sequencer.c:20
99
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2
084
+#: sequencer.c:2
106
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:21
68
+#: sequencer.c:21
90
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:21
73
+#: sequencer.c:21
95
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:2
182
+#: sequencer.c:2
204
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:2
184
+#: sequencer.c:2
206
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:2
186
+#: sequencer.c:2
208
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:2
189
+#: sequencer.c:2
211
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@
-3433,21
+3442,21
@@
msgstr ""
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:2
199
+#: sequencer.c:2
221
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:2
279
+#: sequencer.c:2
301
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:2
283
+#: sequencer.c:2
305
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:23
16
+#: sequencer.c:23
38
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
@@
-3643,24
+3652,24
@@
msgstr "无法在子模组 '%s' 中执行 'git status'"
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:167
9
+#: submodule.c:167
8
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:169
1 submodule.c:1747
+#: submodule.c:169
0 submodule.c:1746
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:169
5
builtin/submodule--helper.c:678
+#: submodule.c:169
4
builtin/submodule--helper.c:678
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
#: builtin/submodule--helper.c:688
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: submodule.c:169
8
+#: submodule.c:169
7
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@
-3671,20
+3680,20
@@
msgstr ""
"'%s' 迁移至\n"
"'%s'\n"
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:178
2
+#: submodule.c:178
1
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:182
6
+#: submodule.c:182
5
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:184
6
+#: submodule.c:184
5
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG：返回的路径和当前路径不匹配？"
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG：返回的路径和当前路径不匹配？"
-#: submodule.c:186
5
+#: submodule.c:186
4
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
#, 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' 进行写入"
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:3
20 builtin/am.c:759
-#: builtin/am.c:84
7
builtin/commit.c:1700 builtin/merge.c:1015
+#: wrapper.c:226 wrapper.c:396 builtin/am.c:3
18 builtin/am.c:757
+#: builtin/am.c:84
9
builtin/commit.c:1700 builtin/merge.c:1015
#: builtin/pull.c:341
#, c-format
msgid "could not open '%s' for reading"
#: 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 "索引文件损坏"
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/am.c:41
4
+#: builtin/am.c:41
2
msgid "could not parse author script"
msgstr "不能解析作者脚本"
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:4
91
+#: builtin/am.c:4
89
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:53
2
+#: builtin/am.c:53
0
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:56
9
+#: builtin/am.c:56
7
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:59
5
+#: builtin/am.c:59
3
msgid "fseek failed"
msgstr "fseek 失败"
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:77
5
+#: builtin/am.c:77
7
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:84
0
+#: builtin/am.c:84
2
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:88
7
+#: builtin/am.c:88
9
msgid "invalid timestamp"
msgstr "无效的时间戳"
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:89
0 builtin/am.c:898
+#: builtin/am.c:89
2 builtin/am.c:900
msgid "invalid Date line"
msgstr "无效的日期行"
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:89
5
+#: builtin/am.c:89
7
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:98
4
+#: builtin/am.c:98
6
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:9
89
builtin/clone.c:397
+#: builtin/am.c:9
91
builtin/clone.c:397
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:99
3
+#: builtin/am.c:99
5
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:112
5
builtin/commit.c:376
+#: builtin/am.c:112
7
builtin/commit.c:376
msgid "unable to write index file"
msgstr "无法写入索引文件"
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:117
6
+#: builtin/am.c:117
8
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:117
7
+#: builtin/am.c:117
9
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:11
78
+#: builtin/am.c:11
80
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:131
6
+#: builtin/am.c:131
5
msgid "Patch is empty. Was it split wrong?"
msgstr "补丁为空。是不是切分错误？"
msgid "Patch is empty. Was it split wrong?"
msgstr "补丁为空。是不是切分错误？"
-#: builtin/am.c:13
90
builtin/log.c:1557
+#: builtin/am.c:13
86
builtin/log.c:1557
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/am.c:141
7
+#: builtin/am.c:141
3
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:16
10
+#: builtin/am.c:16
06
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:16
12
+#: builtin/am.c:16
08
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:16
31
+#: builtin/am.c:16
27
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@
-4876,37
+4885,37
@@
msgstr ""
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:163
7
+#: builtin/am.c:163
3
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:16
62
+#: builtin/am.c:16
58
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:168
6
builtin/merge.c:631
+#: builtin/am.c:168
2
builtin/merge.c:631
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:16
93
+#: builtin/am.c:16
89
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:170
6
builtin/commit.c:1764 builtin/merge.c:802
+#: builtin/am.c:170
2
builtin/commit.c:1764 builtin/merge.c:802
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "无法写提交对象"
#: builtin/merge.c:827
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:173
9 builtin/am.c:1743
+#: builtin/am.c:173
5 builtin/am.c:1739
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:175
9
+#: builtin/am.c:175
5
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-#: builtin/am.c:176
4
+#: builtin/am.c:176
0
msgid "Commit Body is:"
msgstr "提交内容为："
msgid "Commit Body is:"
msgstr "提交内容为："
@@
-4915,35
+4924,35
@@
msgstr "提交内容为："
#. in your translation. The program will only accept English
#. input at this point.
#.
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:177
4
+#: builtin/am.c:177
0
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:182
4
+#: builtin/am.c:182
0
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:186
1 builtin/am.c:1933
+#: builtin/am.c:186
0 builtin/am.c:1932
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:187
7
+#: builtin/am.c:187
6
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:188
5
+#: builtin/am.c:188
4
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:189
1
+#: builtin/am.c:189
0
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于：%s"
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于：%s"
-#: builtin/am.c:193
6
+#: builtin/am.c:193
5
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
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"
"您也许想要跳过这个补丁。"
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:194
3
+#: builtin/am.c:194
2
msgid ""
"You still have unmerged paths in your index.\n"
"Did you forget to use 'git add'?"
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'？"
"您的索引中仍有未合并的路径。\n"
"您是否忘了执行 'git add'？"
-#: builtin/am.c:205
1 builtin/am.c:2055 builtin/am.c:2067
builtin/reset.c:308
+#: builtin/am.c:205
0 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/reset.c:316
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:210
3
+#: builtin/am.c:210
2
msgid "failed to clean index"
msgstr "无法清空索引"
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:213
7
+#: builtin/am.c:213
6
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
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:2
200
+#: builtin/am.c:2
199
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:223
3
+#: builtin/am.c:223
2
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:223
4
+#: builtin/am.c:223
3
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:22
40
+#: builtin/am.c:22
39
msgid "run interactively"
msgstr "以交互式方式运行"
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:224
2
+#: builtin/am.c:224
1
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:224
4
+#: builtin/am.c:224
3
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:224
5
builtin/init-db.c:483 builtin/prune-packed.c:57
+#: builtin/am.c:224
4
builtin/init-db.c:483 builtin/prune-packed.c:57
#: builtin/repack.c:178
msgid "be quiet"
msgstr "静默模式"
#: builtin/repack.c:178
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:224
7
+#: builtin/am.c:224
6
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:22
50
+#: builtin/am.c:22
49
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:225
2
+#: builtin/am.c:225
1
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:225
4
+#: builtin/am.c:225
3
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:225
6
+#: builtin/am.c:225
5
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:225
8
+#: builtin/am.c:225
7
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:226
1
+#: builtin/am.c:226
0
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:226
4
+#: builtin/am.c:226
3
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:226
6 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:227
8 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:229
3
+#: builtin/am.c:226
5 builtin/am.c:2268 builtin/am.c:2271 builtin/am.c:2274
+#: builtin/am.c:227
7 builtin/am.c:2280 builtin/am.c:2283 builtin/am.c:2286
+#: builtin/am.c:229
2
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:228
3
builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
+#: builtin/am.c:228
2
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
#: 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"
msgid "n"
msgstr "n"
-#: builtin/am.c:228
9
builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:44
2
builtin/tag.c:433 builtin/verify-tag.c:38
+#: builtin/am.c:228
8
builtin/branch.c:592 builtin/for-each-ref.c:37
+#: builtin/replace.c:44
3
builtin/tag.c:433 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
msgid "format"
msgstr "格式"
-#: builtin/am.c:22
90
+#: builtin/am.c:22
89
msgid "format the patch(es) are in"
msgstr "补丁的格式"
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:229
6
+#: builtin/am.c:229
5
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:229
8
+#: builtin/am.c:229
7
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:230
1
+#: builtin/am.c:230
0
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:230
4
+#: builtin/am.c:230
3
msgid "skip the current patch"
msgstr "跳过当前补丁"
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:230
7
+#: builtin/am.c:230
6
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:231
1
+#: builtin/am.c:231
0
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:231
3
+#: builtin/am.c:231
2
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:231
5
builtin/commit.c:1600 builtin/merge.c:232
+#: builtin/am.c:231
4
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/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:231
6
+#: builtin/am.c:231
5
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:231
9
+#: builtin/am.c:231
8
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:233
4
+#: builtin/am.c:233
3
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."
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"
"请不要再使用它了。"
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:234
1
+#: builtin/am.c:234
0
msgid "failed to read the index"
msgstr "无法读取索引"
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:235
6
+#: builtin/am.c:235
5
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:23
80
+#: builtin/am.c:23
79
#, c-format
msgid ""
"Stray %s directory found.\n"
#, c-format
msgid ""
"Stray %s directory found.\n"
@@
-5129,7
+5138,7
@@
msgstr ""
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:238
6
+#: builtin/am.c:238
5
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
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"
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：协议错误"
#: 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 字符终结"
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:35
2
+#: builtin/check-ignore.c:18 builtin/checkout.c:1158 builtin/gc.c:35
6
msgid "suppress progress reporting"
msgstr "不显示进度报告"
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/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:47
2
+#: builtin/worktree.c:47
7
msgid "string"
msgstr "字符串"
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
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:32
5
-#: builtin/worktree.c:3
27
+#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:32
9
+#: builtin/worktree.c:3
31
msgid "branch"
msgstr "分支"
msgid "branch"
msgstr "分支"
@@
-6159,7
+6163,7
@@
msgstr "创建/重置并检出一个分支"
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1164 builtin/worktree.c:3
29
+#: builtin/checkout.c:1164 builtin/worktree.c:3
33
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
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
msgstr "删除整个目录"
#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:5
39
builtin/name-rev.c:348
+#: builtin/grep.c:1063 builtin/ls-files.c:5
46
builtin/name-rev.c:348
#: builtin/name-rev.c:350 builtin/show-ref.c:176
msgid "pattern"
msgstr "模式"
#: 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 文件"
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:884 builtin/receive-pack.c:190
1
+#: builtin/clone.c:884 builtin/receive-pack.c:190
0
msgid "Too many arguments."
msgstr "太多参数。"
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
msgstr "工作区 '%s' 已经存在。"
#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:22
2 builtin/worktree.c:249
+#: builtin/worktree.c:22
1 builtin/worktree.c:251
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
#, 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
msgstr "版本"
#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:44
3
+#: builtin/worktree.c:44
8
msgid "machine-readable output"
msgstr "机器可读的输出"
msgid "machine-readable output"
msgstr "机器可读的输出"
@@
-7218,7
+7222,7
@@
msgstr "作者"
msgid "override author for commit"
msgstr "提交时覆盖作者"
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1588 builtin/gc.c:35
3
+#: builtin/commit.c:1588 builtin/gc.c:35
7
msgid "date"
msgstr "日期"
msgid "date"
msgstr "日期"
@@
-7379,139
+7383,139
@@
msgstr ""
msgid "git config [<options>]"
msgstr "git config [<选项>]"
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:5
5
+#: builtin/config.c:5
6
msgid "Config file location"
msgstr "配置文件位置"
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:5
6
+#: builtin/config.c:5
7
msgid "use global config file"
msgstr "使用全局配置文件"
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:5
7
+#: builtin/config.c:5
8
msgid "use system config file"
msgstr "使用系统级配置文件"
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:5
8
+#: builtin/config.c:5
9
msgid "use repository config file"
msgstr "使用仓库级配置文件"
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:
59
+#: builtin/config.c:
60
msgid "use given config file"
msgstr "使用指定的配置文件"
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:6
0
+#: builtin/config.c:6
1
msgid "blob-id"
msgstr "数据对象 ID"
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:6
0
+#: builtin/config.c:6
1
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:6
1
+#: builtin/config.c:6
2
msgid "Action"
msgstr "操作"
msgid "Action"
msgstr "操作"
-#: builtin/config.c:6
2
+#: builtin/config.c:6
3
msgid "get value: name [value-regex]"
msgstr "获取值：name [value-regex]"
msgid "get value: name [value-regex]"
msgstr "获取值：name [value-regex]"
-#: builtin/config.c:6
3
+#: builtin/config.c:6
4
msgid "get all values: key [value-regex]"
msgstr "获得所有的值：key [value-regex]"
msgid "get all values: key [value-regex]"
msgstr "获得所有的值：key [value-regex]"
-#: builtin/config.c:6
4
+#: builtin/config.c:6
5
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值：name-regex [value-regex]"
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值：name-regex [value-regex]"
-#: builtin/config.c:6
5
+#: builtin/config.c:6
6
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值：section[.var] URL"
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/config.c:6
6
+#: builtin/config.c:6
7
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量：name value [value_regex]"
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/config.c:6
7
+#: builtin/config.c:6
8
msgid "add a new variable: name value"
msgstr "添加一个新的变量：name value"
msgid "add a new variable: name value"
msgstr "添加一个新的变量：name value"
-#: builtin/config.c:6
8
+#: builtin/config.c:6
9
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量：name [value-regex]"
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]"
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/config.c:7
0
+#: builtin/config.c:7
1
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:7
1
+#: builtin/config.c:7
2
msgid "remove a section: name"
msgstr "删除一个小节：name"
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:7
2
+#: builtin/config.c:7
3
msgid "list all"
msgstr "列出所有"
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:7
3
+#: builtin/config.c:7
4
msgid "open an editor"
msgstr "打开一个编辑器"
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:7
4
+#: builtin/config.c:7
5
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/config.c:7
5
+#: builtin/config.c:7
6
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/config.c:7
6
+#: builtin/config.c:7
7
msgid "Type"
msgstr "类型"
msgid "Type"
msgstr "类型"
-#: builtin/config.c:7
7
+#: builtin/config.c:7
8
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:7
8
+#: builtin/config.c:7
9
msgid "value is decimal number"
msgstr "值是十进制数"
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:
79
+#: builtin/config.c:
80
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:8
0
+#: builtin/config.c:8
1
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:8
1
+#: builtin/config.c:8
2
msgid "Other"
msgstr "其它"
msgid "Other"
msgstr "其它"
-#: builtin/config.c:8
2
+#: builtin/config.c:8
3
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:8
3
+#: builtin/config.c:8
4
msgid "show variable names only"
msgstr "只显示变量名"
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:8
4
+#: builtin/config.c:8
5
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:8
5
+#: builtin/config.c:8
6
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:32
7
+#: builtin/config.c:32
8
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
-#: builtin/config.c:47
1
+#: builtin/config.c:47
2
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@
-7526,12
+7530,12
@@
msgstr ""
"#\tname = %s\n"
"#\temail = %s\n"
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:61
1
+#: builtin/config.c:61
5
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:62
3
+#: builtin/config.c:62
7
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
#, 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"
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:3
06
+#: builtin/gc.c:3
10
#, c-format
msgid "Can't stat %s"
msgstr "不能对 %s 调用 stat"
#, c-format
msgid "Can't stat %s"
msgstr "不能对 %s 调用 stat"
-#: builtin/gc.c:31
5
+#: builtin/gc.c:31
9
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@
-8339,50
+8343,50
@@
msgstr ""
"\n"
"%s"
"\n"
"%s"
-#: builtin/gc.c:35
4
+#: builtin/gc.c:35
8
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:3
56
+#: builtin/gc.c:3
60
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:3
57
+#: builtin/gc.c:3
61
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:3
58
+#: builtin/gc.c:3
62
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:37
5
+#: builtin/gc.c:37
9
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "无法解析 gc.logexpiry 的值 %s"
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/gc.c:40
3
+#: builtin/gc.c:40
7
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:40
5
+#: builtin/gc.c:40
9
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:4
06
+#: builtin/gc.c:4
10
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:4
27
+#: builtin/gc.c:4
31
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
#, 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:47
1
+#: builtin/gc.c:47
5
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
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"
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
-#: builtin/ls-files.c:46
1
+#: builtin/ls-files.c:46
8
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:51
0
+#: builtin/ls-files.c:51
7
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:51
2
+#: builtin/ls-files.c:51
9
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:5
14
+#: builtin/ls-files.c:5
21
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:5
16
+#: builtin/ls-files.c:5
23
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:5
18
+#: builtin/ls-files.c:5
25
msgid "show modified files in the output"
msgstr "显示已修改的文件"
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:52
0
+#: builtin/ls-files.c:52
7
msgid "show other files in the output"
msgstr "显示其它文件"
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:52
2
+#: builtin/ls-files.c:52
9
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:5
25
+#: builtin/ls-files.c:5
32
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:5
27
+#: builtin/ls-files.c:5
34
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:5
29
+#: builtin/ls-files.c:5
36
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:53
1
+#: builtin/ls-files.c:53
8
msgid "show line endings of files"
msgstr "显示文件换行符格式"
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:5
33
+#: builtin/ls-files.c:5
40
msgid "don't show empty directories"
msgstr "不显示空目录"
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:5
36
+#: builtin/ls-files.c:5
43
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:5
38
+#: builtin/ls-files.c:5
45
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:54
0
+#: builtin/ls-files.c:54
7
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:5
43
+#: builtin/ls-files.c:5
50
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:5
46
+#: builtin/ls-files.c:5
53
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:5
48
+#: builtin/ls-files.c:5
55
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:55
1
+#: builtin/ls-files.c:55
8
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:5
54
+#: builtin/ls-files.c:5
61
msgid "recurse through submodules"
msgstr "在子模组中递归"
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:5
56
+#: builtin/ls-files.c:5
63
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:5
57
+#: builtin/ls-files.c:5
64
msgid "tree-ish"
msgstr "树或提交"
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:5
58
+#: builtin/ls-files.c:5
65
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:56
0
+#: builtin/ls-files.c:56
7
msgid "show debugging data"
msgstr "显示调试数据"
msgid "show debugging data"
msgstr "显示调试数据"
@@
-11102,7
+11106,7
@@
msgstr "详见 git-pull(1)。"
msgid "<remote>"
msgstr "<远程>"
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:45
5
+#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:45
6
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
#: 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>"
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:79
6
+#: builtin/receive-pack.c:79
5
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"
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'。"
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:81
6
+#: builtin/receive-pack.c:81
5
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"
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'。"
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:188
9
+#: builtin/receive-pack.c:188
8
msgid "quiet"
msgstr "静默模式"
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:190
3
+#: builtin/receive-pack.c:190
2
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
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 [<模式>]]"
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
-#: builtin/replace.c:3
29 builtin/replace.c:367 builtin/replace.c:395
+#: builtin/replace.c:3
30 builtin/replace.c:368 builtin/replace.c:396
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
#, c-format
msgid "Not a valid object name: '%s'"
msgstr "不是一个有效的对象名：'%s'"
-#: builtin/replace.c:3
59
+#: builtin/replace.c:3
60
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
-#: builtin/replace.c:36
1
+#: builtin/replace.c:36
2
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有非法的合并标签"
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有非法的合并标签"
-#: builtin/replace.c:37
2
+#: builtin/replace.c:37
3
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
#, 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:40
5
+#: builtin/replace.c:40
6
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "原始提交 '%s' 中包含一个 GPG 签名"
#, c-format
msgid "the original commit '%s' has a gpg signature."
msgstr "原始提交 '%s' 中包含一个 GPG 签名"
-#: builtin/replace.c:40
6
+#: builtin/replace.c:40
7
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除！"
-#: builtin/replace.c:41
2
+#: builtin/replace.c:41
3
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
-#: builtin/replace.c:43
6
+#: builtin/replace.c:43
7
msgid "list replace refs"
msgstr "列出替换的引用"
msgid "list replace refs"
msgstr "列出替换的引用"
-#: builtin/replace.c:43
7
+#: builtin/replace.c:43
8
msgid "delete replace refs"
msgstr "删除替换的引用"
msgid "delete replace refs"
msgstr "删除替换的引用"
-#: builtin/replace.c:43
8
+#: builtin/replace.c:43
9
msgid "edit existing object"
msgstr "编辑现存的对象"
msgid "edit existing object"
msgstr "编辑现存的对象"
-#: builtin/replace.c:4
39
+#: builtin/replace.c:4
40
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
-#: builtin/replace.c:44
0
+#: builtin/replace.c:44
1
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
-#: builtin/replace.c:44
1
+#: builtin/replace.c:44
2
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
-#: builtin/replace.c:44
2
+#: builtin/replace.c:44
3
msgid "use this format"
msgstr "使用此格式"
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=<路径>] [<路径>...]"
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:38
2
+#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:38
0
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
#, 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"
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 "列出标签名称"
#: 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 <路径>"
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:4
2
+#: builtin/worktree.c:4
3
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:4
8
+#: builtin/worktree.c:4
9
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:5
3
+#: builtin/worktree.c:5
4
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:6
4
+#: builtin/worktree.c:6
5
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:8
0
+#: builtin/worktree.c:8
1
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
#, 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' 已经存在"
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:23
6
+#: builtin/worktree.c:23
5
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:27
2
+#: builtin/worktree.c:27
4
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s（标识符 %s）"
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s（标识符 %s）"
-#: builtin/worktree.c:32
4
+#: builtin/worktree.c:32
8
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
-#: builtin/worktree.c:3
26
+#: builtin/worktree.c:3
30
msgid "create a new branch"
msgstr "创建一个新分支"
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:3
28
+#: builtin/worktree.c:3
32
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:33
0
+#: builtin/worktree.c:33
4
msgid "populate the new working tree"
msgstr "生成新的工作区"
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 是互斥的"
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:47
3
+#: builtin/worktree.c:47
8
msgid "reason for locking"
msgstr "锁定原因"
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:4
85 builtin/worktree.c:518
+#: builtin/worktree.c:4
90 builtin/worktree.c:523
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:4
87 builtin/worktree.c:520
+#: builtin/worktree.c:4
92 builtin/worktree.c:525
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:49
2
+#: builtin/worktree.c:49
7
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:49
4
+#: builtin/worktree.c:49
9
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:52
2
+#: builtin/worktree.c:52
7
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
@@
-13819,15
+13803,20
@@
msgstr ""
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
"查看 '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 时，不支持委托控制"
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "当 cURL < 7.22.0 时，不支持委托控制"
-#: http.c:36
4
+#: http.c:36
6
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:17
55
+#: http.c:17
66
#, c-format
msgid ""
"unable to update url base from redirection:\n"
#, 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 "简单合并未生效，尝试自动合并。"
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-rebase.sh:5
7
+#: git-rebase.sh:5
8
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"
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 --skip\"。\n"
"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
-#: git-rebase.sh:15
7 git-rebase.sh:396
+#: git-rebase.sh:15
8 git-rebase.sh:397
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:17
1
+#: git-rebase.sh:17
2
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
-#: git-rebase.sh:21
1
+#: git-rebase.sh:21
2
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: git-rebase.sh:21
6
+#: git-rebase.sh:21
7
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
-#: git-rebase.sh:35
7
+#: git-rebase.sh:35
8
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: git-rebase.sh:36
8
+#: git-rebase.sh:36
9
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:37
5
+#: git-rebase.sh:37
6
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:37
8
+#: git-rebase.sh:37
9
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
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 add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:41
8
+#: git-rebase.sh:41
9
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
#, 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"
"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-#: git-rebase.sh:4
69
+#: git-rebase.sh:4
70
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "无效的上游 $upstream_name"
-#: git-rebase.sh:49
3
+#: git-rebase.sh:49
4
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:49
6 git-rebase.sh:500
+#: git-rebase.sh:49
7 git-rebase.sh:501
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:50
5
+#: git-rebase.sh:50
6
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
-#: git-rebase.sh:52
8
+#: git-rebase.sh:52
9
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "严重错误：无此分支：$branch_name"
-#: git-rebase.sh:56
1
+#: git-rebase.sh:56
2
msgid "Cannot autostash"
msgstr "无法 autostash"
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:56
6
+#: git-rebase.sh:56
7
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:57
0
+#: git-rebase.sh:57
1
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
msgid "Please commit or stash them."
msgstr "请提交或为它们保存进度。"
-#: git-rebase.sh:59
0
+#: git-rebase.sh:59
1
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:59
4
+#: git-rebase.sh:59
5
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: git-rebase.sh:60
5
+#: git-rebase.sh:60
6
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
-#: git-rebase.sh:61
4
+#: git-rebase.sh:61
5
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，回退分支以便在上面重放您的工作..."
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:62
4
+#: git-rebase.sh:62
5
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
#, 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 "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 '.' ?"
#~ msgid ""
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
#~ "Perhaps you forgot to add either ':/' or '.' ?"