]>
Commit | Line | Data |
---|---|---|
c04f5ac3 JX |
1 | # Chinese translations for Git package |
2 | # Git 软件包的简体中文翻译. | |
07432cef | 3 | # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> |
c04f5ac3 | 4 | # This file is distributed under the same license as the Git package. |
814ff314 | 5 | # Contributors: |
5b533632 | 6 | # - Fangyi Zhou <me AT fangyi.io> |
c04f5ac3 | 7 | # - Jiang Xin <worldhello.net AT gmail.com> |
bbdf0acc JX |
8 | # - Lian Cheng <rhythm.mail AT gmail.com> |
9 | # - Ray Chen <oldsharp AT gmail.com> | |
c04f5ac3 | 10 | # - Riku <lu.riku AT gmail.com> |
bbdf0acc JX |
11 | # - Thynson <lanxingcan AT gmail.com> |
12 | # - ws3389 <willsmith3389 AT gmail.com> | |
13 | # - Wang Sheng <wangsheng2008love AT 163.com> | |
554e8501 | 14 | # - 依云 <lilydjwg AT gmail.com> |
bbdf0acc | 15 | # - Yichao Yu <yyc1992 AT gmail.com> |
c04f5ac3 | 16 | # - Zhuang Ya <zhuangya AT me.com> |
c04f5ac3 | 17 | # |
160fb2b2 JX |
18 | # Git glossary for Chinese translators |
19 | # | |
20 | # English | Chinese | |
21 | # ---------------------------------+-------------------------------------- | |
22 | # 3-way merge | 三方合并 | |
23 | # abbreviate | 简写(的 SHA-1 值) | |
24 | # alternate object database | 备用对象库 | |
25 | # amend | 修补 | |
26 | # ancestor | 祖先,祖先提交 | |
27 | # annotated tag | 附注标签 | |
28 | # bare repository | 纯仓库 | |
29 | # bisect | 二分查找 | |
30 | # blob object | 数据对象 | |
31 | # branch | 分支 | |
32 | # bundle | 包 | |
33 | # bypass | 绕过 | |
34 | # cache | 索引(的别称) | |
35 | # chain | (提交)链 | |
36 | # changeset | 变更集 | |
37 | # checkout | 检出 | |
38 | # checksum | 校验,校验和 | |
39 | # cherry-picking | 拣选 | |
40 | # clean | 干净(的工作区) | |
41 | # clone | 克隆 | |
42 | # commit | 提交 | |
667599e8 | 43 | # commit message | 提交说明 |
160fb2b2 JX |
44 | # commit object | 提交对象 |
45 | # commit-ish (also committish) | 提交号 | |
46 | # conflict | 冲突 | |
47 | # core Git | 核心 Git 工具 | |
d46c5519 | 48 | # cover letter | 附函 |
160fb2b2 | 49 | # DAG | 有向无环图 |
e640d114 | 50 | # dangling object | 悬空对象 |
160fb2b2 JX |
51 | # detached HEAD | 分离头指针 |
52 | # directory | 目录 | |
53 | # dirty | 脏(的工作区) | |
755c831b | 54 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
55 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
56 | # fast-forward | 快进 | |
57 | # fetch | 获取 | |
58 | # file system | 文件系统 | |
e397e7e3 | 59 | # fork | 派生 |
160fb2b2 JX |
60 | # Git archive | 仓库(对于 arch 用户) |
61 | # gitfile | gitfile(仓库链接文件) | |
fd8cb379 | 62 | # grafts | (提交)移植 |
160fb2b2 JX |
63 | # hash | 哈希值 |
64 | # HEAD | HEAD(头指针,亦即当前分支) | |
65 | # head | 头、分支 | |
66 | # head ref | 分支 | |
67 | # header | 头信息 | |
68 | # hook | 钩子 | |
69 | # hunk | 补丁片段 | |
70 | # index | 索引 | |
71 | # index entry | 索引条目 | |
72 | # loose object | 松散对象 | |
73 | # loose refs | 松散引用 | |
74 | # master | master(默认分支名) | |
75 | # merge | 合并 | |
76 | # object | 对象 | |
77 | # object database | 对象库 | |
78 | # object identifier | 对象标识符 | |
79 | # object name | 对象名称 | |
80 | # object type | 对象类型 | |
81 | # octopus | 章鱼式合并(两分支以上的合并) | |
82 | # origin | origin(默认的远程名称) | |
83 | # pack | 包 | |
84 | # pack index | 包索引 | |
85 | # packfile | 包文件 | |
86 | # parent | 父提交 | |
87 | # patch | 补丁 | |
88 | # pathspec | 路径规格 | |
89 | # pattern | 模式 | |
12e59059 | 90 | # pickaxe | 挖掘 |
160fb2b2 JX |
91 | # plumbing | 管件(Git 底层核心命令的别称) |
92 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 93 | # precious-objects repo | 珍品仓库 |
160fb2b2 JX |
94 | # prune | 清除 |
95 | # pull | 拉,拉取 | |
96 | # push | 推,推送 | |
97 | # reachable | 可达 | |
98 | # rebase | 变基 | |
99 | # ref | 引用 | |
100 | # reflog | 引用日志 | |
101 | # refspec | 引用规格 | |
102 | # remote | 远程,远程仓库 | |
103 | # remote-tracking branch | 远程跟踪分支 | |
104 | # replay | 重放 | |
105 | # repo | 仓库 | |
106 | # repository | 仓库 | |
107 | # resolve | (冲突)解决 | |
108 | # revert | 还原 | |
109 | # revision | 版本 | |
110 | # rewind | 回退 | |
111 | # SCM | 源代码管理(工具) | |
ee7589bb | 112 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
113 | # shallow repository | 浅(克隆)仓库 |
114 | # signed tag | 签名标签 | |
755c831b | 115 | # smart HTTP protocol | 智能 HTTP 协议 |
160fb2b2 JX |
116 | # squash | 压缩 |
117 | # stage | n. 暂存区(即索引); v. 暂存 | |
a4f16749 | 118 | # stash | n. 贮藏区; v. 贮藏 |
160fb2b2 JX |
119 | # submodule | 子模组 |
120 | # symref | 符号引用 | |
933c015e | 121 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
122 | # tag object | 标签对象 |
123 | # tagger | 打标签者 | |
124 | # topic branch | 主题分支 | |
125 | # track | 跟踪 | |
6937cb4e | 126 | # trailer | 尾部署名 |
160fb2b2 JX |
127 | # tree | 树(工作区或树对象) |
128 | # tree object | 树对象 | |
129 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
130 | # unmerged index | 未合并索引 | |
131 | # unpack | 解包 | |
132 | # unreachable object | 不可达对象 | |
133 | # unstage | 取消暂存 | |
134 | # upstream | 上游 | |
135 | # upstream branch | 上游分支 | |
136 | # working tree | 工作区 | |
137 | # | |
c04f5ac3 JX |
138 | msgid "" |
139 | msgstr "" | |
140 | "Project-Id-Version: Git\n" | |
141 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
7157c2b5 JX |
142 | "POT-Creation-Date: 2020-07-10 09:53+0800\n" |
143 | "PO-Revision-Date: 2020-07-17 10:27+0800\n" | |
c04f5ac3 | 144 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 145 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
146 | "Language: zh_CN\n" |
147 | "MIME-Version: 1.0\n" | |
148 | "Content-Type: text/plain; charset=UTF-8\n" | |
149 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 150 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 151 | |
2b472aae | 152 | #: add-interactive.c:368 |
ddc12c42 JX |
153 | #, c-format |
154 | msgid "Huh (%s)?" | |
155 | msgstr "嗯(%s)?" | |
156 | ||
349ede6a JX |
157 | #: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 |
158 | #: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 | |
159 | #: builtin/rebase.c:1919 | |
ddc12c42 JX |
160 | msgid "could not read index" |
161 | msgstr "不能读取索引" | |
162 | ||
2b472aae | 163 | #: add-interactive.c:576 git-add--interactive.perl:269 |
ddc12c42 JX |
164 | #: git-add--interactive.perl:294 |
165 | msgid "binary" | |
166 | msgstr "二进制" | |
167 | ||
2b472aae | 168 | #: add-interactive.c:634 git-add--interactive.perl:278 |
ddc12c42 JX |
169 | #: git-add--interactive.perl:332 |
170 | msgid "nothing" | |
171 | msgstr "无" | |
172 | ||
2b472aae | 173 | #: add-interactive.c:635 git-add--interactive.perl:314 |
ddc12c42 JX |
174 | #: git-add--interactive.perl:329 |
175 | msgid "unchanged" | |
176 | msgstr "没有修改" | |
177 | ||
2b472aae | 178 | #: add-interactive.c:672 git-add--interactive.perl:643 |
ddc12c42 JX |
179 | msgid "Update" |
180 | msgstr "更新" | |
181 | ||
2b472aae | 182 | #: add-interactive.c:689 add-interactive.c:877 |
ddc12c42 JX |
183 | #, c-format |
184 | msgid "could not stage '%s'" | |
185 | msgstr "不能暂存 '%s'" | |
186 | ||
349ede6a | 187 | #: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 |
ddc12c42 JX |
188 | msgid "could not write index" |
189 | msgstr "不能写入索引" | |
190 | ||
2b472aae | 191 | #: add-interactive.c:698 git-add--interactive.perl:628 |
ddc12c42 JX |
192 | #, c-format, perl-format |
193 | msgid "updated %d path\n" | |
194 | msgid_plural "updated %d paths\n" | |
195 | msgstr[0] "更新了 %d 个路径\n" | |
196 | msgstr[1] "更新了 %d 个路径\n" | |
197 | ||
2b472aae | 198 | #: add-interactive.c:716 git-add--interactive.perl:678 |
ddc12c42 JX |
199 | #, c-format, perl-format |
200 | msgid "note: %s is untracked now.\n" | |
201 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
202 | ||
349ede6a JX |
203 | #: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 |
204 | #: builtin/reset.c:145 | |
ddc12c42 JX |
205 | #, c-format |
206 | msgid "make_cache_entry failed for path '%s'" | |
207 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
208 | ||
2b472aae | 209 | #: add-interactive.c:751 git-add--interactive.perl:655 |
ddc12c42 JX |
210 | msgid "Revert" |
211 | msgstr "还原" | |
212 | ||
2b472aae | 213 | #: add-interactive.c:767 |
ddc12c42 JX |
214 | msgid "Could not parse HEAD^{tree}" |
215 | msgstr "不能解析 HEAD^{tree}" | |
216 | ||
2b472aae | 217 | #: add-interactive.c:805 git-add--interactive.perl:631 |
ddc12c42 JX |
218 | #, c-format, perl-format |
219 | msgid "reverted %d path\n" | |
220 | msgid_plural "reverted %d paths\n" | |
221 | msgstr[0] "还原了 %d 个路径\n" | |
222 | msgstr[1] "还原了 %d 个路径\n" | |
223 | ||
2b472aae | 224 | #: add-interactive.c:856 git-add--interactive.perl:695 |
ddc12c42 JX |
225 | #, c-format |
226 | msgid "No untracked files.\n" | |
227 | msgstr "没有未跟踪的文件。\n" | |
228 | ||
2b472aae | 229 | #: add-interactive.c:860 git-add--interactive.perl:689 |
ddc12c42 JX |
230 | msgid "Add untracked" |
231 | msgstr "添加未跟踪的" | |
232 | ||
2b472aae | 233 | #: add-interactive.c:887 git-add--interactive.perl:625 |
ddc12c42 JX |
234 | #, c-format, perl-format |
235 | msgid "added %d path\n" | |
236 | msgid_plural "added %d paths\n" | |
237 | msgstr[0] "增加了 %d 个路径\n" | |
238 | msgstr[1] "增加了 %d 个路径\n" | |
239 | ||
2b472aae | 240 | #: add-interactive.c:917 |
ddc12c42 JX |
241 | #, c-format |
242 | msgid "ignoring unmerged: %s" | |
243 | msgstr "忽略未合入的:%s" | |
244 | ||
7157c2b5 | 245 | #: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 |
ddc12c42 JX |
246 | #, c-format |
247 | msgid "Only binary files changed.\n" | |
248 | msgstr "只有二进制文件被修改。\n" | |
249 | ||
7157c2b5 | 250 | #: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 |
ddc12c42 JX |
251 | #, c-format |
252 | msgid "No changes.\n" | |
253 | msgstr "没有修改。\n" | |
254 | ||
7157c2b5 | 255 | #: add-interactive.c:935 git-add--interactive.perl:1378 |
ddc12c42 JX |
256 | msgid "Patch update" |
257 | msgstr "补丁更新" | |
258 | ||
7157c2b5 | 259 | #: add-interactive.c:974 git-add--interactive.perl:1771 |
ddc12c42 JX |
260 | msgid "Review diff" |
261 | msgstr "检视 diff" | |
262 | ||
2b472aae | 263 | #: add-interactive.c:1002 |
ddc12c42 JX |
264 | msgid "show paths with changes" |
265 | msgstr "显示含变更的路径" | |
266 | ||
2b472aae | 267 | #: add-interactive.c:1004 |
ddc12c42 JX |
268 | msgid "add working tree state to the staged set of changes" |
269 | msgstr "将工作区状态添加到暂存区修改集中" | |
270 | ||
2b472aae | 271 | #: add-interactive.c:1006 |
ddc12c42 JX |
272 | msgid "revert staged set of changes back to the HEAD version" |
273 | msgstr "将暂存的修改集恢复为 HEAD 版本" | |
274 | ||
2b472aae | 275 | #: add-interactive.c:1008 |
ddc12c42 JX |
276 | msgid "pick hunks and update selectively" |
277 | msgstr "挑选数据块并有选择地更新" | |
278 | ||
2b472aae | 279 | #: add-interactive.c:1010 |
ddc12c42 JX |
280 | msgid "view diff between HEAD and index" |
281 | msgstr "显示 HEAD 和索引的差异" | |
282 | ||
2b472aae | 283 | #: add-interactive.c:1012 |
ddc12c42 JX |
284 | msgid "add contents of untracked files to the staged set of changes" |
285 | msgstr "将未跟踪文件的内容添加到暂存区修改集中" | |
286 | ||
2b472aae | 287 | #: add-interactive.c:1020 add-interactive.c:1069 |
ddc12c42 JX |
288 | msgid "Prompt help:" |
289 | msgstr "帮助:" | |
290 | ||
2b472aae | 291 | #: add-interactive.c:1022 |
ddc12c42 JX |
292 | msgid "select a single item" |
293 | msgstr "选择一个条目" | |
294 | ||
2b472aae | 295 | #: add-interactive.c:1024 |
ddc12c42 JX |
296 | msgid "select a range of items" |
297 | msgstr "选择一系列条目" | |
298 | ||
2b472aae | 299 | #: add-interactive.c:1026 |
ddc12c42 JX |
300 | msgid "select multiple ranges" |
301 | msgstr "选择多个范围" | |
302 | ||
2b472aae | 303 | #: add-interactive.c:1028 add-interactive.c:1073 |
ddc12c42 JX |
304 | msgid "select item based on unique prefix" |
305 | msgstr "基于唯一前缀选择条目" | |
306 | ||
2b472aae | 307 | #: add-interactive.c:1030 |
ddc12c42 JX |
308 | msgid "unselect specified items" |
309 | msgstr "反选指定的条目" | |
310 | ||
2b472aae | 311 | #: add-interactive.c:1032 |
ddc12c42 JX |
312 | msgid "choose all items" |
313 | msgstr "选择所有条目" | |
314 | ||
2b472aae | 315 | #: add-interactive.c:1034 |
ddc12c42 JX |
316 | msgid "(empty) finish selecting" |
317 | msgstr "(空)结束选择" | |
318 | ||
2b472aae | 319 | #: add-interactive.c:1071 |
ddc12c42 JX |
320 | msgid "select a numbered item" |
321 | msgstr "选择一个编号条目" | |
322 | ||
2b472aae | 323 | #: add-interactive.c:1075 |
ddc12c42 JX |
324 | msgid "(empty) select nothing" |
325 | msgstr "(空)不选择任何内容" | |
326 | ||
7157c2b5 | 327 | #: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 |
ddc12c42 JX |
328 | msgid "*** Commands ***" |
329 | msgstr "*** 命令 ***" | |
330 | ||
7157c2b5 | 331 | #: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 |
ddc12c42 JX |
332 | msgid "What now" |
333 | msgstr "请选择" | |
334 | ||
2b472aae | 335 | #: add-interactive.c:1136 git-add--interactive.perl:213 |
ddc12c42 JX |
336 | msgid "staged" |
337 | msgstr "缓存" | |
338 | ||
2b472aae | 339 | #: add-interactive.c:1136 git-add--interactive.perl:213 |
ddc12c42 JX |
340 | msgid "unstaged" |
341 | msgstr "未缓存" | |
342 | ||
349ede6a JX |
343 | #: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 |
344 | #: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 | |
345 | #: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 | |
2b472aae JX |
346 | #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 |
347 | #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 | |
7157c2b5 | 348 | #: builtin/submodule--helper.c:2148 bugreport.c:135 |
349ede6a | 349 | #: git-add--interactive.perl:213 |
ddc12c42 JX |
350 | msgid "path" |
351 | msgstr "路径" | |
352 | ||
2b472aae | 353 | #: add-interactive.c:1143 |
ddc12c42 JX |
354 | msgid "could not refresh index" |
355 | msgstr "不能刷新索引" | |
356 | ||
7157c2b5 | 357 | #: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 |
ddc12c42 JX |
358 | #, c-format |
359 | msgid "Bye.\n" | |
360 | msgstr "再见。\n" | |
361 | ||
7157c2b5 | 362 | #: add-patch.c:34 git-add--interactive.perl:1430 |
2b472aae JX |
363 | #, c-format, perl-format |
364 | msgid "Stage mode change [y,n,q,a,d%s,?]? " | |
365 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 366 | |
7157c2b5 | 367 | #: add-patch.c:35 git-add--interactive.perl:1431 |
2b472aae JX |
368 | #, c-format, perl-format |
369 | msgid "Stage deletion [y,n,q,a,d%s,?]? " | |
370 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 371 | |
7157c2b5 JX |
372 | #: add-patch.c:36 git-add--interactive.perl:1432 |
373 | #, c-format, perl-format | |
374 | msgid "Stage addition [y,n,q,a,d%s,?]? " | |
375 | msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " | |
376 | ||
377 | #: add-patch.c:37 git-add--interactive.perl:1433 | |
2b472aae JX |
378 | #, c-format, perl-format |
379 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " | |
380 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
381 | ||
7157c2b5 | 382 | #: add-patch.c:39 |
2b472aae JX |
383 | msgid "" |
384 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
385 | "staging." | |
386 | msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。" | |
387 | ||
7157c2b5 | 388 | #: add-patch.c:42 |
2b472aae JX |
389 | msgid "" |
390 | "y - stage this hunk\n" | |
391 | "n - do not stage this hunk\n" | |
392 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
393 | "a - stage this hunk and all later hunks in the file\n" | |
394 | "d - do not stage this hunk or any of the later hunks in the file\n" | |
395 | msgstr "" | |
396 | "y - 暂存该块\n" | |
397 | "n - 不要暂存该块\n" | |
398 | "q - 退出。不暂存该块及后面的全部块\n" | |
399 | "a - 暂存该块和本文件中后面的全部块\n" | |
400 | "d - 不暂存该块和本文件中后面的全部块\n" | |
401 | ||
7157c2b5 | 402 | #: add-patch.c:56 git-add--interactive.perl:1436 |
2b472aae JX |
403 | #, c-format, perl-format |
404 | msgid "Stash mode change [y,n,q,a,d%s,?]? " | |
405 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
406 | ||
7157c2b5 | 407 | #: add-patch.c:57 git-add--interactive.perl:1437 |
2b472aae JX |
408 | #, c-format, perl-format |
409 | msgid "Stash deletion [y,n,q,a,d%s,?]? " | |
410 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
411 | ||
7157c2b5 JX |
412 | #: add-patch.c:58 git-add--interactive.perl:1438 |
413 | #, c-format, perl-format | |
414 | msgid "Stash addition [y,n,q,a,d%s,?]? " | |
415 | msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " | |
416 | ||
417 | #: add-patch.c:59 git-add--interactive.perl:1439 | |
2b472aae JX |
418 | #, c-format, perl-format |
419 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " | |
420 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
421 | ||
7157c2b5 | 422 | #: add-patch.c:61 |
2b472aae JX |
423 | msgid "" |
424 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
425 | "stashing." | |
426 | msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。" | |
427 | ||
7157c2b5 | 428 | #: add-patch.c:64 |
2b472aae JX |
429 | msgid "" |
430 | "y - stash this hunk\n" | |
431 | "n - do not stash this hunk\n" | |
432 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
433 | "a - stash this hunk and all later hunks in the file\n" | |
434 | "d - do not stash this hunk or any of the later hunks in the file\n" | |
435 | msgstr "" | |
436 | "y - 贮藏该块\n" | |
437 | "n - 不要贮藏该块\n" | |
438 | "q - 退出。不贮藏该块及后面的全部块\n" | |
439 | "a - 贮藏该块和本文件中后面的全部块\n" | |
440 | "d - 不贮藏该块和本文件中后面的全部块\n" | |
441 | ||
7157c2b5 | 442 | #: add-patch.c:80 git-add--interactive.perl:1442 |
2b472aae JX |
443 | #, c-format, perl-format |
444 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " | |
445 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
446 | ||
7157c2b5 | 447 | #: add-patch.c:81 git-add--interactive.perl:1443 |
2b472aae JX |
448 | #, c-format, perl-format |
449 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " | |
450 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
451 | ||
7157c2b5 JX |
452 | #: add-patch.c:82 git-add--interactive.perl:1444 |
453 | #, c-format, perl-format | |
454 | msgid "Unstage addition [y,n,q,a,d%s,?]? " | |
455 | msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " | |
456 | ||
457 | #: add-patch.c:83 git-add--interactive.perl:1445 | |
2b472aae JX |
458 | #, c-format, perl-format |
459 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " | |
460 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
461 | ||
7157c2b5 | 462 | #: add-patch.c:85 |
2b472aae JX |
463 | msgid "" |
464 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
465 | "unstaging." | |
466 | msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。" | |
467 | ||
7157c2b5 | 468 | #: add-patch.c:88 |
2b472aae JX |
469 | msgid "" |
470 | "y - unstage this hunk\n" | |
471 | "n - do not unstage this hunk\n" | |
472 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
473 | "a - unstage this hunk and all later hunks in the file\n" | |
474 | "d - do not unstage this hunk or any of the later hunks in the file\n" | |
475 | msgstr "" | |
440e7442 FZ |
476 | "y - 取消暂存该块\n" |
477 | "n - 不要取消暂存该块\n" | |
478 | "q - 退出。不要取消暂存该块及后面的全部块\n" | |
479 | "a - 取消暂存该块和本文件中后面的全部块\n" | |
480 | "d - 不要取消暂存该块和本文件中后面的全部块\n" | |
2b472aae | 481 | |
7157c2b5 | 482 | #: add-patch.c:103 git-add--interactive.perl:1448 |
2b472aae JX |
483 | #, c-format, perl-format |
484 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " | |
485 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
486 | ||
7157c2b5 | 487 | #: add-patch.c:104 git-add--interactive.perl:1449 |
2b472aae JX |
488 | #, c-format, perl-format |
489 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " | |
490 | msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " | |
491 | ||
7157c2b5 JX |
492 | #: add-patch.c:105 git-add--interactive.perl:1450 |
493 | #, c-format, perl-format | |
494 | msgid "Apply addition to index [y,n,q,a,d%s,?]? " | |
495 | msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " | |
496 | ||
497 | #: add-patch.c:106 git-add--interactive.perl:1451 | |
2b472aae JX |
498 | #, c-format, perl-format |
499 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " | |
500 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " | |
501 | ||
7157c2b5 | 502 | #: add-patch.c:108 add-patch.c:176 add-patch.c:221 |
2b472aae JX |
503 | msgid "" |
504 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
505 | "applying." | |
506 | msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。" | |
507 | ||
7157c2b5 | 508 | #: add-patch.c:111 |
2b472aae JX |
509 | msgid "" |
510 | "y - apply this hunk to index\n" | |
511 | "n - do not apply this hunk to index\n" | |
512 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
513 | "a - apply this hunk and all later hunks in the file\n" | |
514 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
515 | msgstr "" | |
516 | "y - 在索引中应用该块\n" | |
517 | "n - 不要在索引中应用该块\n" | |
518 | "q - 退出。不要应用该块及后面的全部块\n" | |
519 | "a - 应用该块和本文件中后面的全部块\n" | |
520 | "d - 不要应用该块和本文件中后面的全部块\n" | |
521 | ||
7157c2b5 JX |
522 | #: add-patch.c:126 git-add--interactive.perl:1454 |
523 | #: git-add--interactive.perl:1472 | |
2b472aae JX |
524 | #, c-format, perl-format |
525 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " | |
526 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
527 | ||
7157c2b5 JX |
528 | #: add-patch.c:127 git-add--interactive.perl:1455 |
529 | #: git-add--interactive.perl:1473 | |
2b472aae JX |
530 | #, c-format, perl-format |
531 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " | |
532 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 533 | |
7157c2b5 JX |
534 | #: add-patch.c:128 git-add--interactive.perl:1456 |
535 | #: git-add--interactive.perl:1474 | |
536 | #, c-format, perl-format | |
537 | msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " | |
538 | msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " | |
539 | ||
540 | #: add-patch.c:129 git-add--interactive.perl:1457 | |
541 | #: git-add--interactive.perl:1475 | |
2b472aae JX |
542 | #, c-format, perl-format |
543 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " | |
544 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
545 | ||
7157c2b5 | 546 | #: add-patch.c:131 add-patch.c:154 add-patch.c:199 |
2b472aae JX |
547 | msgid "" |
548 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
549 | "discarding." | |
550 | msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。" | |
551 | ||
7157c2b5 | 552 | #: add-patch.c:134 add-patch.c:202 |
2b472aae JX |
553 | msgid "" |
554 | "y - discard this hunk from worktree\n" | |
555 | "n - do not discard this hunk from worktree\n" | |
556 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
557 | "a - discard this hunk and all later hunks in the file\n" | |
558 | "d - do not discard this hunk or any of the later hunks in the file\n" | |
559 | msgstr "" | |
560 | "y - 在工作区中丢弃该块\n" | |
561 | "n - 不要在工作区中丢弃该块\n" | |
562 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
563 | "a - 丢弃该块和本文件中后面的全部块\n" | |
564 | "d - 不要丢弃该块和本文件中后面的全部块\n" | |
565 | ||
7157c2b5 | 566 | #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 |
2b472aae JX |
567 | #, c-format, perl-format |
568 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " | |
569 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
570 | ||
7157c2b5 | 571 | #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 |
2b472aae JX |
572 | #, c-format, perl-format |
573 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " | |
7157c2b5 | 574 | msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " |
2b472aae | 575 | |
7157c2b5 JX |
576 | #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 |
577 | #, c-format, perl-format | |
578 | msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " | |
579 | msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " | |
580 | ||
581 | #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 | |
2b472aae JX |
582 | #, c-format, perl-format |
583 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " | |
584 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
585 | ||
7157c2b5 | 586 | #: add-patch.c:157 |
2b472aae JX |
587 | msgid "" |
588 | "y - discard this hunk from index and worktree\n" | |
589 | "n - do not discard this hunk from index and worktree\n" | |
590 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
591 | "a - discard this hunk and all later hunks in the file\n" | |
592 | "d - do not discard this hunk or any of the later hunks in the file\n" | |
593 | msgstr "" | |
594 | "y - 在索引和工作区中丢弃该块\n" | |
595 | "n - 不要在索引和工作区中丢弃该块\n" | |
596 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
597 | "a - 丢弃该块和本文件中后面的全部块\n" | |
598 | "d - 不要丢弃该块和本文件中后面的全部块\n" | |
599 | ||
7157c2b5 | 600 | #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 |
2b472aae JX |
601 | #, c-format, perl-format |
602 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " | |
603 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
604 | ||
7157c2b5 | 605 | #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 |
2b472aae JX |
606 | #, c-format, perl-format |
607 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " | |
608 | msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
609 | ||
7157c2b5 JX |
610 | #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 |
611 | #, c-format, perl-format | |
612 | msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " | |
613 | msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
614 | ||
615 | #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 | |
2b472aae JX |
616 | #, c-format, perl-format |
617 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " | |
618 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
619 | ||
7157c2b5 | 620 | #: add-patch.c:179 |
2b472aae JX |
621 | msgid "" |
622 | "y - apply this hunk to index and worktree\n" | |
623 | "n - do not apply this hunk to index and worktree\n" | |
624 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
625 | "a - apply this hunk and all later hunks in the file\n" | |
626 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
627 | msgstr "" | |
628 | "y - 在索引和工作区中应用该块\n" | |
629 | "n - 不要在索引和工作区中应用该块\n" | |
630 | "q - 退出。不要应用该块及后面的全部块\n" | |
631 | "a - 应用该块和本文件中后面的全部块\n" | |
632 | "d - 不要应用该块和本文件中后面的全部块\n" | |
633 | ||
7157c2b5 | 634 | #: add-patch.c:224 |
2b472aae JX |
635 | msgid "" |
636 | "y - apply this hunk to worktree\n" | |
637 | "n - do not apply this hunk to worktree\n" | |
638 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
639 | "a - apply this hunk and all later hunks in the file\n" | |
640 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
641 | msgstr "" | |
642 | "y - 在工作区中应用该块\n" | |
643 | "n - 不要在工作区中应用该块\n" | |
644 | "q - 退出。不要应用该块及后面的全部块\n" | |
645 | "a - 应用该块和本文件中后面的全部块\n" | |
646 | "d - 不要应用该块和本文件中后面的全部块\n" | |
647 | ||
7157c2b5 | 648 | #: add-patch.c:328 |
ddc12c42 JX |
649 | #, c-format |
650 | msgid "could not parse hunk header '%.*s'" | |
651 | msgstr "无法解析数据块头信息 '%.*s'" | |
652 | ||
7157c2b5 | 653 | #: add-patch.c:347 add-patch.c:351 |
ddc12c42 JX |
654 | #, c-format |
655 | msgid "could not parse colored hunk header '%.*s'" | |
656 | msgstr "无法解析彩色数据块头信息 '%.*s'" | |
657 | ||
7157c2b5 | 658 | #: add-patch.c:405 |
ddc12c42 JX |
659 | msgid "could not parse diff" |
660 | msgstr "不能解析差异信息" | |
661 | ||
7157c2b5 | 662 | #: add-patch.c:424 |
ddc12c42 JX |
663 | msgid "could not parse colored diff" |
664 | msgstr "不能解析彩色差异信息" | |
665 | ||
7157c2b5 | 666 | #: add-patch.c:438 |
2b472aae JX |
667 | #, c-format |
668 | msgid "failed to run '%s'" | |
669 | msgstr "运行 '%s' 失败" | |
670 | ||
7157c2b5 | 671 | #: add-patch.c:602 |
2b472aae JX |
672 | msgid "mismatched output from interactive.diffFilter" |
673 | msgstr "interactive.diffFilter 的输出不匹配" | |
674 | ||
7157c2b5 | 675 | #: add-patch.c:603 |
2b472aae JX |
676 | msgid "" |
677 | "Your filter must maintain a one-to-one correspondence\n" | |
678 | "between its input and output lines." | |
679 | msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" | |
680 | ||
7157c2b5 | 681 | #: add-patch.c:776 |
ddc12c42 JX |
682 | #, c-format |
683 | msgid "" | |
684 | "expected context line #%d in\n" | |
685 | "%.*s" | |
686 | msgstr "" | |
687 | "预期上下文行 #%d 于\n" | |
688 | "%.*s" | |
689 | ||
7157c2b5 | 690 | #: add-patch.c:791 |
ddc12c42 JX |
691 | #, c-format |
692 | msgid "" | |
693 | "hunks do not overlap:\n" | |
694 | "%.*s\n" | |
695 | "\tdoes not end with:\n" | |
696 | "%.*s" | |
697 | msgstr "" | |
698 | "块不重叠:\n" | |
699 | "%.*s\n" | |
700 | "\t不是结尾于:\n" | |
701 | "%.*s" | |
702 | ||
7157c2b5 | 703 | #: add-patch.c:1067 git-add--interactive.perl:1114 |
ddc12c42 JX |
704 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
705 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
706 | ||
7157c2b5 | 707 | #: add-patch.c:1071 |
ddc12c42 JX |
708 | #, c-format |
709 | msgid "" | |
710 | "---\n" | |
711 | "To remove '%c' lines, make them ' ' lines (context).\n" | |
712 | "To remove '%c' lines, delete them.\n" | |
713 | "Lines starting with %c will be removed.\n" | |
714 | msgstr "" | |
715 | "---\n" | |
716 | "要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
717 | "要删除 '%c' 开始的行,删除它们。\n" | |
718 | "以 %c 开始的行将被删除。\n" | |
719 | ||
ddc12c42 | 720 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. |
7157c2b5 | 721 | #: add-patch.c:1085 git-add--interactive.perl:1128 |
ddc12c42 JX |
722 | msgid "" |
723 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
724 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
725 | "aborted and the hunk is left unchanged.\n" | |
726 | msgstr "" | |
727 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
728 | "此次编辑被终止,该块不会被修改。\n" | |
729 | ||
7157c2b5 | 730 | #: add-patch.c:1118 |
ddc12c42 JX |
731 | msgid "could not parse hunk header" |
732 | msgstr "无法解析数据块头信息" | |
733 | ||
7157c2b5 | 734 | #: add-patch.c:1163 |
ddc12c42 JX |
735 | msgid "'git apply --cached' failed" |
736 | msgstr "'git apply --cached' 失败" | |
737 | ||
738 | #. TRANSLATORS: do not translate [y/n] | |
739 | #. The program will only accept that input at this point. | |
740 | #. Consider translating (saying "no" discards!) as | |
741 | #. (saying "n" for "no" discards!) if the translation | |
742 | #. of the word "no" does not start with n. | |
743 | #. | |
744 | #. TRANSLATORS: do not translate [y/n] | |
745 | #. The program will only accept that input | |
746 | #. at this point. | |
747 | #. Consider translating (saying "no" discards!) as | |
748 | #. (saying "n" for "no" discards!) if the translation | |
749 | #. of the word "no" does not start with n. | |
7157c2b5 | 750 | #: add-patch.c:1232 git-add--interactive.perl:1241 |
ddc12c42 JX |
751 | msgid "" |
752 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
753 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
754 | ||
7157c2b5 | 755 | #: add-patch.c:1275 |
2b472aae JX |
756 | msgid "The selected hunks do not apply to the index!" |
757 | msgstr "选中的块不能应用到索引!" | |
758 | ||
7157c2b5 | 759 | #: add-patch.c:1276 git-add--interactive.perl:1345 |
2b472aae JX |
760 | msgid "Apply them to the worktree anyway? " |
761 | msgstr "无论如何都要应用到工作区么?" | |
762 | ||
7157c2b5 | 763 | #: add-patch.c:1283 git-add--interactive.perl:1348 |
2b472aae JX |
764 | msgid "Nothing was applied.\n" |
765 | msgstr "未应用。\n" | |
ddc12c42 | 766 | |
7157c2b5 | 767 | #: add-patch.c:1340 |
ddc12c42 JX |
768 | msgid "" |
769 | "j - leave this hunk undecided, see next undecided hunk\n" | |
770 | "J - leave this hunk undecided, see next hunk\n" | |
771 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
772 | "K - leave this hunk undecided, see previous hunk\n" | |
773 | "g - select a hunk to go to\n" | |
774 | "/ - search for a hunk matching the given regex\n" | |
775 | "s - split the current hunk into smaller hunks\n" | |
776 | "e - manually edit the current hunk\n" | |
777 | "? - print help\n" | |
778 | msgstr "" | |
779 | "j - 维持该块未决状态,查看下一个未决块\n" | |
780 | "J - 维持该块未决状态,查看下一个块\n" | |
781 | "k - 维持该块未决状态,查看上一个未决块\n" | |
782 | "K - 维持该块未决状态,查看上一个块\n" | |
783 | "g - 选择跳转到一个块\n" | |
784 | "/ - 查找和给定正则表达式匹配的块\n" | |
785 | "s - 拆分当前块为更小的块\n" | |
786 | "e - 手动编辑当前块\n" | |
787 | "? - 显示帮助\n" | |
788 | ||
7157c2b5 | 789 | #: add-patch.c:1463 add-patch.c:1473 |
ddc12c42 JX |
790 | msgid "No previous hunk" |
791 | msgstr "没有前一个块" | |
792 | ||
7157c2b5 | 793 | #: add-patch.c:1468 add-patch.c:1478 |
ddc12c42 JX |
794 | msgid "No next hunk" |
795 | msgstr "没有下一个块" | |
796 | ||
7157c2b5 | 797 | #: add-patch.c:1484 |
ddc12c42 JX |
798 | msgid "No other hunks to goto" |
799 | msgstr "没有其它可供跳转的块" | |
800 | ||
7157c2b5 | 801 | #: add-patch.c:1495 git-add--interactive.perl:1594 |
ddc12c42 JX |
802 | msgid "go to which hunk (<ret> to see more)? " |
803 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
804 | ||
7157c2b5 | 805 | #: add-patch.c:1496 git-add--interactive.perl:1596 |
ddc12c42 JX |
806 | msgid "go to which hunk? " |
807 | msgstr "跳转到哪个块?" | |
808 | ||
7157c2b5 | 809 | #: add-patch.c:1507 |
ddc12c42 JX |
810 | #, c-format |
811 | msgid "Invalid number: '%s'" | |
812 | msgstr "无效数字:'%s'" | |
813 | ||
7157c2b5 | 814 | #: add-patch.c:1512 |
ddc12c42 JX |
815 | #, c-format |
816 | msgid "Sorry, only %d hunk available." | |
817 | msgid_plural "Sorry, only %d hunks available." | |
818 | msgstr[0] "对不起,只有 %d 个可用块。" | |
819 | msgstr[1] "对不起,只有 %d 个可用块。" | |
820 | ||
7157c2b5 | 821 | #: add-patch.c:1521 |
ddc12c42 JX |
822 | msgid "No other hunks to search" |
823 | msgstr "没有其它可供查找的块" | |
824 | ||
7157c2b5 | 825 | #: add-patch.c:1527 git-add--interactive.perl:1640 |
ddc12c42 JX |
826 | msgid "search for regex? " |
827 | msgstr "使用正则表达式搜索?" | |
828 | ||
7157c2b5 | 829 | #: add-patch.c:1542 |
ddc12c42 JX |
830 | #, c-format |
831 | msgid "Malformed search regexp %s: %s" | |
832 | msgstr "错误的正则表达式 %s:%s" | |
833 | ||
7157c2b5 | 834 | #: add-patch.c:1559 |
ddc12c42 JX |
835 | msgid "No hunk matches the given pattern" |
836 | msgstr "没有和给定模式相匹配的块" | |
837 | ||
7157c2b5 | 838 | #: add-patch.c:1566 |
ddc12c42 JX |
839 | msgid "Sorry, cannot split this hunk" |
840 | msgstr "对不起,不能拆分这个块" | |
841 | ||
7157c2b5 | 842 | #: add-patch.c:1570 |
ddc12c42 JX |
843 | #, c-format |
844 | msgid "Split into %d hunks." | |
845 | msgstr "拆分为 %d 块。" | |
846 | ||
7157c2b5 | 847 | #: add-patch.c:1574 |
ddc12c42 JX |
848 | msgid "Sorry, cannot edit this hunk" |
849 | msgstr "对不起,不能编辑这个块" | |
850 | ||
7157c2b5 | 851 | #: add-patch.c:1625 |
2b472aae JX |
852 | msgid "'git apply' failed" |
853 | msgstr "'git apply' 失败" | |
854 | ||
349ede6a JX |
855 | #: advice.c:140 |
856 | #, c-format | |
857 | msgid "" | |
858 | "\n" | |
859 | "Disable this message with \"git config advice.%s false\"" | |
860 | msgstr "" | |
861 | "\n" | |
862 | "使用 \"git config advice.%s false\" 来关闭此消息" | |
863 | ||
864 | #: advice.c:156 | |
c04f5ac3 | 865 | #, c-format |
fd8cb379 JX |
866 | msgid "%shint: %.*s%s\n" |
867 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 868 | |
349ede6a | 869 | #: advice.c:247 |
5c57d762 JX |
870 | msgid "Cherry-picking is not possible because you have unmerged files." |
871 | msgstr "无法拣选,因为您有未合并的文件。" | |
872 | ||
349ede6a | 873 | #: advice.c:249 |
5c57d762 JX |
874 | msgid "Committing is not possible because you have unmerged files." |
875 | msgstr "无法提交,因为您有未合并的文件。" | |
876 | ||
349ede6a | 877 | #: advice.c:251 |
5c57d762 JX |
878 | msgid "Merging is not possible because you have unmerged files." |
879 | msgstr "无法合并,因为您有未合并的文件。" | |
880 | ||
349ede6a | 881 | #: advice.c:253 |
5c57d762 JX |
882 | msgid "Pulling is not possible because you have unmerged files." |
883 | msgstr "无法拉取,因为您有未合并的文件。" | |
884 | ||
349ede6a | 885 | #: advice.c:255 |
5c57d762 JX |
886 | msgid "Reverting is not possible because you have unmerged files." |
887 | msgstr "无法回退,因为您有未合并的文件。" | |
888 | ||
349ede6a | 889 | #: advice.c:257 |
5c57d762 JX |
890 | #, c-format |
891 | msgid "It is not possible to %s because you have unmerged files." | |
892 | msgstr "无法 %s,因为您有未合并的文件。" | |
893 | ||
349ede6a | 894 | #: advice.c:265 |
c04f5ac3 | 895 | msgid "" |
6acbf033 | 896 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 897 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 898 | msgstr "" |
d9d56b23 | 899 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 900 | "解决方案并提交。" |
c04f5ac3 | 901 | |
349ede6a | 902 | #: advice.c:273 |
5c57d762 JX |
903 | msgid "Exiting because of an unresolved conflict." |
904 | msgstr "因为存在未解决的冲突而退出。" | |
905 | ||
349ede6a | 906 | #: advice.c:278 builtin/merge.c:1353 |
1b7f4a34 JX |
907 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
908 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
909 | ||
349ede6a | 910 | #: advice.c:280 |
94550ed3 | 911 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
912 | msgstr "请在合并前先提交您的修改。" |
913 | ||
349ede6a | 914 | #: advice.c:281 |
1b7f4a34 JX |
915 | msgid "Exiting because of unfinished merge." |
916 | msgstr "因为存在未完成的合并而退出。" | |
917 | ||
349ede6a | 918 | #: advice.c:287 |
5c57d762 JX |
919 | #, c-format |
920 | msgid "" | |
a6cd2cc4 | 921 | "Note: switching to '%s'.\n" |
5c57d762 JX |
922 | "\n" |
923 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
924 | "changes and commit them, and you can discard any commits you make in this\n" | |
a6cd2cc4 | 925 | "state without impacting any branches by switching back to a branch.\n" |
5c57d762 JX |
926 | "\n" |
927 | "If you want to create a new branch to retain commits you create, you may\n" | |
a6cd2cc4 | 928 | "do so (now or later) by using -c with the switch command. Example:\n" |
5c57d762 | 929 | "\n" |
a6cd2cc4 JX |
930 | " git switch -c <new-branch-name>\n" |
931 | "\n" | |
932 | "Or undo this operation with:\n" | |
933 | "\n" | |
934 | " git switch -\n" | |
935 | "\n" | |
936 | "Turn off this advice by setting config variable advice.detachedHead to " | |
937 | "false\n" | |
5c57d762 JX |
938 | "\n" |
939 | msgstr "" | |
a6cd2cc4 JX |
940 | "注意:正在切换到 '%s'。\n" |
941 | "\n" | |
942 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n" | |
943 | "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n" | |
5c57d762 | 944 | "\n" |
a6cd2cc4 JX |
945 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n" |
946 | "中添加参数 -c 来实现(现在或稍后)。例如:\n" | |
5c57d762 | 947 | "\n" |
a6cd2cc4 | 948 | " git switch -c <新分支名>\n" |
5c57d762 | 949 | "\n" |
a6cd2cc4 JX |
950 | "或者撤销此操作:\n" |
951 | "\n" | |
952 | " git switch -\n" | |
953 | "\n" | |
954 | "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" | |
5c57d762 JX |
955 | "\n" |
956 | ||
06991777 JX |
957 | #: alias.c:50 |
958 | msgid "cmdline ends with \\" | |
959 | msgstr "命令行以 \\ 结尾" | |
960 | ||
961 | #: alias.c:51 | |
962 | msgid "unclosed quote" | |
963 | msgstr "未关闭的引号" | |
964 | ||
a6cd2cc4 | 965 | #: apply.c:69 |
a0b6b246 JX |
966 | #, c-format |
967 | msgid "unrecognized whitespace option '%s'" | |
968 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 969 | |
a6cd2cc4 | 970 | #: apply.c:85 |
90314792 | 971 | #, c-format |
a0b6b246 JX |
972 | msgid "unrecognized whitespace ignore option '%s'" |
973 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 974 | |
a6cd2cc4 | 975 | #: apply.c:135 |
a0b6b246 | 976 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 977 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 978 | |
a6cd2cc4 | 979 | #: apply.c:137 |
a0b6b246 JX |
980 | msgid "--cached and --3way cannot be used together." |
981 | msgstr "--cached 和 --3way 不能同时使用。" | |
ef317cd5 | 982 | |
a6cd2cc4 | 983 | #: apply.c:140 |
a0b6b246 JX |
984 | msgid "--3way outside a repository" |
985 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 986 | |
a6cd2cc4 | 987 | #: apply.c:151 |
a0b6b246 JX |
988 | msgid "--index outside a repository" |
989 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 990 | |
a6cd2cc4 | 991 | #: apply.c:154 |
a0b6b246 JX |
992 | msgid "--cached outside a repository" |
993 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 994 | |
a6cd2cc4 | 995 | #: apply.c:801 |
a0b6b246 JX |
996 | #, c-format |
997 | msgid "Cannot prepare timestamp regexp %s" | |
998 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 999 | |
a6cd2cc4 | 1000 | #: apply.c:810 |
a0b6b246 JX |
1001 | #, c-format |
1002 | msgid "regexec returned %d for input: %s" | |
1003 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 1004 | |
a6cd2cc4 | 1005 | #: apply.c:884 |
a0b6b246 JX |
1006 | #, c-format |
1007 | msgid "unable to find filename in patch at line %d" | |
1008 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 1009 | |
a6cd2cc4 | 1010 | #: apply.c:922 |
a0b6b246 JX |
1011 | #, c-format |
1012 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
1013 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 1014 | |
a6cd2cc4 | 1015 | #: apply.c:928 |
a0b6b246 JX |
1016 | #, c-format |
1017 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
1018 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 1019 | |
a6cd2cc4 | 1020 | #: apply.c:929 |
a0b6b246 JX |
1021 | #, c-format |
1022 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
1023 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 1024 | |
a6cd2cc4 | 1025 | #: apply.c:934 |
a0b6b246 JX |
1026 | #, c-format |
1027 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
1028 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 1029 | |
a6cd2cc4 | 1030 | #: apply.c:963 |
a4f16749 JX |
1031 | #, c-format |
1032 | msgid "invalid mode on line %d: %s" | |
1033 | msgstr "第 %d 行包含无效文件模式:%s" | |
1034 | ||
a6cd2cc4 | 1035 | #: apply.c:1282 |
a4f16749 JX |
1036 | #, c-format |
1037 | msgid "inconsistent header lines %d and %d" | |
1038 | msgstr "不一致的文件头,%d 行和 %d 行" | |
1039 | ||
a5cd71ca | 1040 | #: apply.c:1372 |
a0b6b246 JX |
1041 | #, c-format |
1042 | msgid "" | |
1043 | "git diff header lacks filename information when removing %d leading pathname " | |
1044 | "component (line %d)" | |
1045 | msgid_plural "" | |
1046 | "git diff header lacks filename information when removing %d leading pathname " | |
1047 | "components (line %d)" | |
1048 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
1049 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 1050 | |
a5cd71ca | 1051 | #: apply.c:1385 |
a0b6b246 JX |
1052 | #, c-format |
1053 | msgid "git diff header lacks filename information (line %d)" | |
1054 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 1055 | |
a5cd71ca JX |
1056 | #: apply.c:1481 |
1057 | #, c-format | |
1058 | msgid "recount: unexpected line: %.*s" | |
1059 | msgstr "recount:意外的行:%.*s" | |
1060 | ||
1061 | #: apply.c:1550 | |
1062 | #, c-format | |
1063 | msgid "patch fragment without header at line %d: %.*s" | |
1064 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
1065 | ||
1066 | #: apply.c:1753 | |
a0b6b246 JX |
1067 | msgid "new file depends on old contents" |
1068 | msgstr "新文件依赖旧内容" | |
5c57d762 | 1069 | |
a5cd71ca | 1070 | #: apply.c:1755 |
a0b6b246 JX |
1071 | msgid "deleted file still has contents" |
1072 | msgstr "删除的文件仍有内容" | |
5c57d762 | 1073 | |
a5cd71ca | 1074 | #: apply.c:1789 |
a0b6b246 JX |
1075 | #, c-format |
1076 | msgid "corrupt patch at line %d" | |
1077 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 1078 | |
a5cd71ca | 1079 | #: apply.c:1826 |
5c57d762 | 1080 | #, c-format |
a0b6b246 JX |
1081 | msgid "new file %s depends on old contents" |
1082 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 1083 | |
a5cd71ca | 1084 | #: apply.c:1828 |
5c57d762 | 1085 | #, c-format |
a0b6b246 JX |
1086 | msgid "deleted file %s still has contents" |
1087 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 1088 | |
a5cd71ca | 1089 | #: apply.c:1831 |
a0b6b246 JX |
1090 | #, c-format |
1091 | msgid "** warning: file %s becomes empty but is not deleted" | |
1092 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 1093 | |
a5cd71ca | 1094 | #: apply.c:1978 |
5c57d762 | 1095 | #, c-format |
a0b6b246 JX |
1096 | msgid "corrupt binary patch at line %d: %.*s" |
1097 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 1098 | |
a5cd71ca | 1099 | #: apply.c:2015 |
5c57d762 | 1100 | #, c-format |
a0b6b246 JX |
1101 | msgid "unrecognized binary patch at line %d" |
1102 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 1103 | |
a5cd71ca | 1104 | #: apply.c:2177 |
5c57d762 | 1105 | #, c-format |
a0b6b246 JX |
1106 | msgid "patch with only garbage at line %d" |
1107 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 1108 | |
a5cd71ca | 1109 | #: apply.c:2263 |
5c57d762 | 1110 | #, c-format |
a0b6b246 JX |
1111 | msgid "unable to read symlink %s" |
1112 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 1113 | |
a5cd71ca | 1114 | #: apply.c:2267 |
5c57d762 | 1115 | #, c-format |
a0b6b246 JX |
1116 | msgid "unable to open or read %s" |
1117 | msgstr "不能打开或读取 %s" | |
5c57d762 | 1118 | |
ddc12c42 | 1119 | #: apply.c:2936 |
5c57d762 | 1120 | #, c-format |
a0b6b246 JX |
1121 | msgid "invalid start of line: '%c'" |
1122 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 1123 | |
ddc12c42 | 1124 | #: apply.c:3057 |
5c57d762 | 1125 | #, c-format |
a0b6b246 JX |
1126 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
1127 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
1128 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
1129 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 1130 | |
ddc12c42 | 1131 | #: apply.c:3069 |
5c57d762 | 1132 | #, c-format |
a0b6b246 JX |
1133 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
1134 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 1135 | |
ddc12c42 | 1136 | #: apply.c:3075 |
5c57d762 JX |
1137 | #, c-format |
1138 | msgid "" | |
a0b6b246 JX |
1139 | "while searching for:\n" |
1140 | "%.*s" | |
5c57d762 | 1141 | msgstr "" |
a0b6b246 JX |
1142 | "当查询:\n" |
1143 | "%.*s" | |
5c57d762 | 1144 | |
ddc12c42 | 1145 | #: apply.c:3097 |
5c57d762 | 1146 | #, c-format |
a0b6b246 JX |
1147 | msgid "missing binary patch data for '%s'" |
1148 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 1149 | |
ddc12c42 | 1150 | #: apply.c:3105 |
5c57d762 | 1151 | #, c-format |
a0b6b246 | 1152 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 1153 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 1154 | |
ddc12c42 | 1155 | #: apply.c:3152 |
5c57d762 | 1156 | #, c-format |
a0b6b246 JX |
1157 | msgid "cannot apply binary patch to '%s' without full index line" |
1158 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 1159 | |
2b472aae | 1160 | #: apply.c:3163 |
5c57d762 | 1161 | #, c-format |
a0b6b246 JX |
1162 | msgid "" |
1163 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 1164 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 1165 | |
2b472aae | 1166 | #: apply.c:3171 |
a0b6b246 JX |
1167 | #, c-format |
1168 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 1169 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 1170 | |
2b472aae | 1171 | #: apply.c:3189 |
5c57d762 | 1172 | #, c-format |
a0b6b246 | 1173 | msgid "the necessary postimage %s for '%s' cannot be read" |
e640d114 | 1174 | msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" |
5c57d762 | 1175 | |
2b472aae | 1176 | #: apply.c:3202 |
5c57d762 | 1177 | #, c-format |
a0b6b246 JX |
1178 | msgid "binary patch does not apply to '%s'" |
1179 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 1180 | |
2b472aae | 1181 | #: apply.c:3209 |
5c57d762 | 1182 | #, c-format |
a0b6b246 JX |
1183 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
1184 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 1185 | |
2b472aae | 1186 | #: apply.c:3230 |
276ceeaa | 1187 | #, c-format |
a0b6b246 JX |
1188 | msgid "patch failed: %s:%ld" |
1189 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 1190 | |
2b472aae | 1191 | #: apply.c:3353 |
4dcdc3d8 | 1192 | #, c-format |
a0b6b246 JX |
1193 | msgid "cannot checkout %s" |
1194 | msgstr "不能检出 %s" | |
4dcdc3d8 | 1195 | |
349ede6a | 1196 | #: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 |
4dcdc3d8 | 1197 | #, c-format |
a0b6b246 JX |
1198 | msgid "failed to read %s" |
1199 | msgstr "无法读取 %s" | |
4dcdc3d8 | 1200 | |
2b472aae | 1201 | #: apply.c:3413 |
4dcdc3d8 | 1202 | #, c-format |
a0b6b246 JX |
1203 | msgid "reading from '%s' beyond a symbolic link" |
1204 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 1205 | |
2b472aae | 1206 | #: apply.c:3442 apply.c:3685 |
4dcdc3d8 | 1207 | #, c-format |
a0b6b246 JX |
1208 | msgid "path %s has been renamed/deleted" |
1209 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 1210 | |
2b472aae | 1211 | #: apply.c:3528 apply.c:3700 |
4dcdc3d8 | 1212 | #, c-format |
a0b6b246 JX |
1213 | msgid "%s: does not exist in index" |
1214 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 1215 | |
2b472aae | 1216 | #: apply.c:3537 apply.c:3708 |
4dcdc3d8 | 1217 | #, c-format |
a0b6b246 JX |
1218 | msgid "%s: does not match index" |
1219 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 1220 | |
2b472aae | 1221 | #: apply.c:3572 |
a0b6b246 JX |
1222 | msgid "repository lacks the necessary blob to fall back on 3-way merge." |
1223 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
4dcdc3d8 | 1224 | |
2b472aae | 1225 | #: apply.c:3575 |
4dcdc3d8 | 1226 | #, c-format |
a0b6b246 JX |
1227 | msgid "Falling back to three-way merge...\n" |
1228 | msgstr "回落到三方合并...\n" | |
4dcdc3d8 | 1229 | |
2b472aae | 1230 | #: apply.c:3591 apply.c:3595 |
4dcdc3d8 | 1231 | #, c-format |
a0b6b246 JX |
1232 | msgid "cannot read the current contents of '%s'" |
1233 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 1234 | |
2b472aae | 1235 | #: apply.c:3607 |
4dcdc3d8 | 1236 | #, c-format |
a0b6b246 JX |
1237 | msgid "Failed to fall back on three-way merge...\n" |
1238 | msgstr "无法回落到三方合并...\n" | |
4dcdc3d8 | 1239 | |
2b472aae | 1240 | #: apply.c:3621 |
4dcdc3d8 | 1241 | #, c-format |
a0b6b246 JX |
1242 | msgid "Applied patch to '%s' with conflicts.\n" |
1243 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 1244 | |
2b472aae | 1245 | #: apply.c:3626 |
4dcdc3d8 | 1246 | #, c-format |
a0b6b246 JX |
1247 | msgid "Applied patch to '%s' cleanly.\n" |
1248 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 1249 | |
2b472aae | 1250 | #: apply.c:3652 |
a0b6b246 JX |
1251 | msgid "removal patch leaves file contents" |
1252 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 1253 | |
2b472aae | 1254 | #: apply.c:3725 |
1003b3a5 | 1255 | #, c-format |
a0b6b246 JX |
1256 | msgid "%s: wrong type" |
1257 | msgstr "%s:错误类型" | |
1003b3a5 | 1258 | |
2b472aae | 1259 | #: apply.c:3727 |
1003b3a5 | 1260 | #, c-format |
a0b6b246 JX |
1261 | msgid "%s has type %o, expected %o" |
1262 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 1263 | |
2b472aae JX |
1264 | #: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 |
1265 | #: read-cache.c:1325 | |
4dcdc3d8 | 1266 | #, c-format |
a0b6b246 JX |
1267 | msgid "invalid path '%s'" |
1268 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 1269 | |
2b472aae | 1270 | #: apply.c:3936 |
4dcdc3d8 | 1271 | #, c-format |
a0b6b246 JX |
1272 | msgid "%s: already exists in index" |
1273 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 1274 | |
2b472aae | 1275 | #: apply.c:3939 |
4dcdc3d8 | 1276 | #, c-format |
a0b6b246 JX |
1277 | msgid "%s: already exists in working directory" |
1278 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 1279 | |
2b472aae | 1280 | #: apply.c:3959 |
1b7f4a34 | 1281 | #, c-format |
a0b6b246 JX |
1282 | msgid "new mode (%o) of %s does not match old mode (%o)" |
1283 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 1284 | |
2b472aae | 1285 | #: apply.c:3964 |
5b04ee3b | 1286 | #, c-format |
a0b6b246 JX |
1287 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
1288 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 1289 | |
2b472aae | 1290 | #: apply.c:3984 |
8ada9598 | 1291 | #, c-format |
a0b6b246 JX |
1292 | msgid "affected file '%s' is beyond a symbolic link" |
1293 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 1294 | |
2b472aae | 1295 | #: apply.c:3988 |
81809b99 | 1296 | #, c-format |
a0b6b246 JX |
1297 | msgid "%s: patch does not apply" |
1298 | msgstr "%s:补丁未应用" | |
8ada9598 | 1299 | |
2b472aae | 1300 | #: apply.c:4003 |
8ada9598 | 1301 | #, c-format |
a0b6b246 | 1302 | msgid "Checking patch %s..." |
06991777 | 1303 | msgstr "正在检查补丁 %s..." |
8ada9598 | 1304 | |
2b472aae | 1305 | #: apply.c:4095 |
a0b6b246 JX |
1306 | #, c-format |
1307 | msgid "sha1 information is lacking or useless for submodule %s" | |
1308 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 1309 | |
2b472aae | 1310 | #: apply.c:4102 |
8ada9598 | 1311 | #, c-format |
a0b6b246 | 1312 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 1313 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 1314 | |
2b472aae | 1315 | #: apply.c:4105 |
a0b6b246 JX |
1316 | #, c-format |
1317 | msgid "sha1 information is lacking or useless (%s)." | |
1318 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 1319 | |
2b472aae | 1320 | #: apply.c:4114 |
a0b6b246 JX |
1321 | #, c-format |
1322 | msgid "could not add %s to temporary index" | |
1323 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 1324 | |
2b472aae | 1325 | #: apply.c:4124 |
a0b6b246 JX |
1326 | #, c-format |
1327 | msgid "could not write temporary index to %s" | |
1328 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 1329 | |
2b472aae | 1330 | #: apply.c:4262 |
a0b6b246 JX |
1331 | #, c-format |
1332 | msgid "unable to remove %s from index" | |
1333 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 1334 | |
2b472aae | 1335 | #: apply.c:4296 |
8ada9598 | 1336 | #, c-format |
a0b6b246 JX |
1337 | msgid "corrupt patch for submodule %s" |
1338 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 1339 | |
2b472aae | 1340 | #: apply.c:4302 |
9aeb4c2b | 1341 | #, c-format |
a0b6b246 | 1342 | msgid "unable to stat newly created file '%s'" |
65e2041e | 1343 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 1344 | |
2b472aae | 1345 | #: apply.c:4310 |
a0b6b246 JX |
1346 | #, c-format |
1347 | msgid "unable to create backing store for newly created file %s" | |
1348 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 1349 | |
2b472aae | 1350 | #: apply.c:4316 apply.c:4461 |
81809b99 | 1351 | #, c-format |
a0b6b246 JX |
1352 | msgid "unable to add cache entry for %s" |
1353 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 1354 | |
2b472aae | 1355 | #: apply.c:4359 |
a0b6b246 JX |
1356 | #, c-format |
1357 | msgid "failed to write to '%s'" | |
c1ac5258 | 1358 | msgstr "写入 '%s' 失败" |
8ada9598 | 1359 | |
2b472aae | 1360 | #: apply.c:4363 |
220c313c | 1361 | #, c-format |
a0b6b246 JX |
1362 | msgid "closing file '%s'" |
1363 | msgstr "关闭文件 '%s'" | |
220c313c | 1364 | |
2b472aae | 1365 | #: apply.c:4433 |
c04f5ac3 | 1366 | #, c-format |
a0b6b246 JX |
1367 | msgid "unable to write file '%s' mode %o" |
1368 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 1369 | |
2b472aae | 1370 | #: apply.c:4531 |
c04f5ac3 | 1371 | #, c-format |
a0b6b246 JX |
1372 | msgid "Applied patch %s cleanly." |
1373 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 1374 | |
2b472aae | 1375 | #: apply.c:4539 |
a0b6b246 JX |
1376 | msgid "internal error" |
1377 | msgstr "内部错误" | |
c04f5ac3 | 1378 | |
2b472aae | 1379 | #: apply.c:4542 |
5c57d762 | 1380 | #, c-format |
a0b6b246 JX |
1381 | msgid "Applying patch %%s with %d reject..." |
1382 | msgid_plural "Applying patch %%s with %d rejects..." | |
1383 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
1384 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 1385 | |
2b472aae | 1386 | #: apply.c:4553 |
5c57d762 | 1387 | #, c-format |
a0b6b246 JX |
1388 | msgid "truncating .rej filename to %.*s.rej" |
1389 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 1390 | |
349ede6a | 1391 | #: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 |
220c313c | 1392 | #, c-format |
a0b6b246 JX |
1393 | msgid "cannot open %s" |
1394 | msgstr "不能打开 %s" | |
220c313c | 1395 | |
2b472aae | 1396 | #: apply.c:4575 |
220c313c | 1397 | #, c-format |
a0b6b246 JX |
1398 | msgid "Hunk #%d applied cleanly." |
1399 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 1400 | |
2b472aae | 1401 | #: apply.c:4579 |
5c57d762 | 1402 | #, c-format |
a0b6b246 JX |
1403 | msgid "Rejected hunk #%d." |
1404 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 1405 | |
2b472aae | 1406 | #: apply.c:4698 |
5c57d762 | 1407 | #, c-format |
a0b6b246 JX |
1408 | msgid "Skipped patch '%s'." |
1409 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 1410 | |
2b472aae | 1411 | #: apply.c:4706 |
a0b6b246 JX |
1412 | msgid "unrecognized input" |
1413 | msgstr "未能识别的输入" | |
5c57d762 | 1414 | |
2b472aae | 1415 | #: apply.c:4726 |
a0b6b246 JX |
1416 | msgid "unable to read index file" |
1417 | msgstr "无法读取索引文件" | |
5c57d762 | 1418 | |
2b472aae | 1419 | #: apply.c:4883 |
220c313c | 1420 | #, c-format |
a0b6b246 JX |
1421 | msgid "can't open patch '%s': %s" |
1422 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 1423 | |
2b472aae | 1424 | #: apply.c:4910 |
5c57d762 | 1425 | #, c-format |
a0b6b246 JX |
1426 | msgid "squelched %d whitespace error" |
1427 | msgid_plural "squelched %d whitespace errors" | |
1428 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
1429 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 1430 | |
2b472aae | 1431 | #: apply.c:4916 apply.c:4931 |
5c57d762 | 1432 | #, c-format |
a0b6b246 JX |
1433 | msgid "%d line adds whitespace errors." |
1434 | msgid_plural "%d lines add whitespace errors." | |
a4f16749 JX |
1435 | msgstr[0] "%d 行新增了空白字符误用。" |
1436 | msgstr[1] "%d 行新增了空白字符误用。" | |
5c57d762 | 1437 | |
2b472aae | 1438 | #: apply.c:4924 |
5c57d762 | 1439 | #, c-format |
a0b6b246 JX |
1440 | msgid "%d line applied after fixing whitespace errors." |
1441 | msgid_plural "%d lines applied after fixing whitespace errors." | |
1442 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
1443 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 1444 | |
2b472aae | 1445 | #: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 |
a0b6b246 JX |
1446 | msgid "Unable to write new index file" |
1447 | msgstr "无法写入新索引文件" | |
5c57d762 | 1448 | |
2b472aae | 1449 | #: apply.c:4968 |
a0b6b246 JX |
1450 | msgid "don't apply changes matching the given path" |
1451 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 1452 | |
2b472aae | 1453 | #: apply.c:4971 |
a0b6b246 JX |
1454 | msgid "apply changes matching the given path" |
1455 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 1456 | |
349ede6a | 1457 | #: apply.c:4973 builtin/am.c:2259 |
a0b6b246 JX |
1458 | msgid "num" |
1459 | msgstr "数字" | |
220c313c | 1460 | |
2b472aae | 1461 | #: apply.c:4974 |
a0b6b246 JX |
1462 | msgid "remove <num> leading slashes from traditional diff paths" |
1463 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 1464 | |
2b472aae | 1465 | #: apply.c:4977 |
a0b6b246 JX |
1466 | msgid "ignore additions made by the patch" |
1467 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 1468 | |
2b472aae | 1469 | #: apply.c:4979 |
a0b6b246 JX |
1470 | msgid "instead of applying the patch, output diffstat for the input" |
1471 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 1472 | |
2b472aae | 1473 | #: apply.c:4983 |
a0b6b246 JX |
1474 | msgid "show number of added and deleted lines in decimal notation" |
1475 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 1476 | |
2b472aae | 1477 | #: apply.c:4985 |
a0b6b246 JX |
1478 | msgid "instead of applying the patch, output a summary for the input" |
1479 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 1480 | |
2b472aae | 1481 | #: apply.c:4987 |
a0b6b246 JX |
1482 | msgid "instead of applying the patch, see if the patch is applicable" |
1483 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 1484 | |
2b472aae | 1485 | #: apply.c:4989 |
a0b6b246 JX |
1486 | msgid "make sure the patch is applicable to the current index" |
1487 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 1488 | |
2b472aae | 1489 | #: apply.c:4991 |
c1ac5258 JX |
1490 | msgid "mark new files with `git add --intent-to-add`" |
1491 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
1492 | ||
2b472aae | 1493 | #: apply.c:4993 |
a0b6b246 JX |
1494 | msgid "apply a patch without touching the working tree" |
1495 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 1496 | |
2b472aae | 1497 | #: apply.c:4995 |
a0b6b246 JX |
1498 | msgid "accept a patch that touches outside the working area" |
1499 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 1500 | |
2b472aae | 1501 | #: apply.c:4998 |
a0b6b246 JX |
1502 | msgid "also apply the patch (use with --stat/--summary/--check)" |
1503 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 1504 | |
2b472aae | 1505 | #: apply.c:5000 |
a0b6b246 JX |
1506 | msgid "attempt three-way merge if a patch does not apply" |
1507 | msgstr "如果一个补丁不能应用则尝试三方合并" | |
c04f5ac3 | 1508 | |
2b472aae | 1509 | #: apply.c:5002 |
a0b6b246 JX |
1510 | msgid "build a temporary index based on embedded index information" |
1511 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 1512 | |
349ede6a | 1513 | #: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 |
a0b6b246 JX |
1514 | msgid "paths are separated with NUL character" |
1515 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 1516 | |
2b472aae | 1517 | #: apply.c:5007 |
a0b6b246 JX |
1518 | msgid "ensure at least <n> lines of context match" |
1519 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 1520 | |
349ede6a | 1521 | #: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 |
a6cd2cc4 | 1522 | #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 |
7157c2b5 | 1523 | #: builtin/pack-objects.c:3530 builtin/rebase.c:1332 |
a0b6b246 JX |
1524 | msgid "action" |
1525 | msgstr "动作" | |
8ada9598 | 1526 | |
2b472aae | 1527 | #: apply.c:5009 |
a0b6b246 JX |
1528 | msgid "detect new or modified lines that have whitespace errors" |
1529 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 1530 | |
2b472aae | 1531 | #: apply.c:5012 apply.c:5015 |
a0b6b246 JX |
1532 | msgid "ignore changes in whitespace when finding context" |
1533 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 1534 | |
2b472aae | 1535 | #: apply.c:5018 |
a0b6b246 JX |
1536 | msgid "apply the patch in reverse" |
1537 | msgstr "反向应用补丁" | |
8ada9598 | 1538 | |
2b472aae | 1539 | #: apply.c:5020 |
a0b6b246 JX |
1540 | msgid "don't expect at least one line of context" |
1541 | msgstr "无需至少一行上下文" | |
8ada9598 | 1542 | |
2b472aae | 1543 | #: apply.c:5022 |
a0b6b246 JX |
1544 | msgid "leave the rejected hunks in corresponding *.rej files" |
1545 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 1546 | |
2b472aae | 1547 | #: apply.c:5024 |
a0b6b246 JX |
1548 | msgid "allow overlapping hunks" |
1549 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 1550 | |
2b472aae | 1551 | #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 |
349ede6a JX |
1552 | #: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 |
1553 | #: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 | |
a0b6b246 JX |
1554 | msgid "be verbose" |
1555 | msgstr "冗长输出" | |
8ada9598 | 1556 | |
2b472aae | 1557 | #: apply.c:5027 |
a0b6b246 JX |
1558 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
1559 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 1560 | |
2b472aae | 1561 | #: apply.c:5030 |
a0b6b246 JX |
1562 | msgid "do not trust the line counts in the hunk headers" |
1563 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 1564 | |
349ede6a | 1565 | #: apply.c:5032 builtin/am.c:2247 |
a0b6b246 JX |
1566 | msgid "root" |
1567 | msgstr "根目录" | |
c04f5ac3 | 1568 | |
2b472aae | 1569 | #: apply.c:5033 |
a0b6b246 JX |
1570 | msgid "prepend <root> to all filenames" |
1571 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 1572 | |
349ede6a JX |
1573 | #: archive-tar.c:125 archive-zip.c:351 |
1574 | #, c-format | |
1575 | msgid "cannot stream blob %s" | |
1576 | msgstr "不能打开数据对象 %s" | |
1577 | ||
1578 | #: archive-tar.c:266 archive-zip.c:369 | |
1579 | #, c-format | |
1580 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
1581 | msgstr "不支持的文件模式:0%o (SHA1: %s)" | |
1582 | ||
1583 | #: archive-tar.c:293 archive-zip.c:359 | |
1584 | #, c-format | |
1585 | msgid "cannot read %s" | |
1586 | msgstr "不能读取 %s" | |
1587 | ||
1588 | #: archive-tar.c:465 | |
1589 | #, c-format | |
1590 | msgid "unable to start '%s' filter" | |
1591 | msgstr "无法启动 '%s' 过滤器" | |
1592 | ||
1593 | #: archive-tar.c:468 | |
1594 | msgid "unable to redirect descriptor" | |
1595 | msgstr "无法重定向描述符" | |
1596 | ||
1597 | #: archive-tar.c:475 | |
1598 | #, c-format | |
1599 | msgid "'%s' filter reported error" | |
1600 | msgstr "'%s' 过滤器报告了错误" | |
1601 | ||
1602 | #: archive-zip.c:319 | |
1603 | #, c-format | |
1604 | msgid "path is not valid UTF-8: %s" | |
1605 | msgstr "路径不是有效的 UTF-8:%s" | |
1606 | ||
1607 | #: archive-zip.c:323 | |
1608 | #, c-format | |
1609 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1610 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1611 | ||
7157c2b5 | 1612 | #: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 |
349ede6a JX |
1613 | #, c-format |
1614 | msgid "deflate error (%d)" | |
1615 | msgstr "压缩错误 (%d)" | |
1616 | ||
1617 | #: archive-zip.c:615 | |
1618 | #, c-format | |
1619 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
1620 | msgstr "对于本系统时间戳太大:%<PRIuMAX>" | |
1621 | ||
c1ac5258 | 1622 | #: archive.c:14 |
a0b6b246 | 1623 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
ddc12c42 | 1624 | msgstr "git archive [<选项>] <树对象> [<路径>...]" |
07432cef | 1625 | |
c1ac5258 | 1626 | #: archive.c:15 |
a0b6b246 JX |
1627 | msgid "git archive --list" |
1628 | msgstr "git archive --list" | |
1629 | ||
c1ac5258 | 1630 | #: archive.c:16 |
c04f5ac3 | 1631 | msgid "" |
a0b6b246 | 1632 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 1633 | msgstr "" |
ddc12c42 | 1634 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" |
6acbf033 | 1635 | |
c1ac5258 | 1636 | #: archive.c:17 |
a0b6b246 JX |
1637 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
1638 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 1639 | |
349ede6a | 1640 | #: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 |
c04f5ac3 | 1641 | #, c-format |
a0b6b246 JX |
1642 | msgid "pathspec '%s' did not match any files" |
1643 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 1644 | |
349ede6a | 1645 | #: archive.c:401 |
06991777 JX |
1646 | #, c-format |
1647 | msgid "no such ref: %.*s" | |
1648 | msgstr "无此引用:%.*s" | |
1649 | ||
349ede6a | 1650 | #: archive.c:407 |
06991777 JX |
1651 | #, c-format |
1652 | msgid "not a valid object name: %s" | |
1653 | msgstr "不是一个有效的对象名:%s" | |
1654 | ||
349ede6a | 1655 | #: archive.c:420 |
06991777 JX |
1656 | #, c-format |
1657 | msgid "not a tree object: %s" | |
1658 | msgstr "不是一个树对象:%s" | |
1659 | ||
349ede6a | 1660 | #: archive.c:432 |
06991777 JX |
1661 | msgid "current working directory is untracked" |
1662 | msgstr "当前工作目录未被跟踪" | |
1663 | ||
349ede6a | 1664 | #: archive.c:464 |
a0b6b246 JX |
1665 | msgid "fmt" |
1666 | msgstr "格式" | |
07432cef | 1667 | |
349ede6a | 1668 | #: archive.c:464 |
a0b6b246 JX |
1669 | msgid "archive format" |
1670 | msgstr "归档格式" | |
7aea43ff | 1671 | |
349ede6a | 1672 | #: archive.c:465 builtin/log.c:1674 |
a0b6b246 JX |
1673 | msgid "prefix" |
1674 | msgstr "前缀" | |
7aea43ff | 1675 | |
349ede6a | 1676 | #: archive.c:466 |
a0b6b246 JX |
1677 | msgid "prepend prefix to each pathname in the archive" |
1678 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 1679 | |
349ede6a | 1680 | #: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 |
7157c2b5 JX |
1681 | #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 |
1682 | #: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 | |
349ede6a | 1683 | #: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 |
a5cd71ca | 1684 | #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 |
ddc12c42 | 1685 | #: parse-options.h:190 |
a0b6b246 JX |
1686 | msgid "file" |
1687 | msgstr "文件" | |
a77c07d9 | 1688 | |
349ede6a | 1689 | #: archive.c:468 builtin/archive.c:90 |
a0b6b246 JX |
1690 | msgid "write the archive to this file" |
1691 | msgstr "归档写入此文件" | |
a77c07d9 | 1692 | |
349ede6a | 1693 | #: archive.c:470 |
a0b6b246 JX |
1694 | msgid "read .gitattributes in working directory" |
1695 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 1696 | |
349ede6a | 1697 | #: archive.c:471 |
a0b6b246 JX |
1698 | msgid "report archived files on stderr" |
1699 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 1700 | |
349ede6a | 1701 | #: archive.c:472 |
a0b6b246 JX |
1702 | msgid "store only" |
1703 | msgstr "只存储" | |
7ac1c0ad | 1704 | |
349ede6a | 1705 | #: archive.c:473 |
a0b6b246 JX |
1706 | msgid "compress faster" |
1707 | msgstr "压缩速度更快" | |
8ada9598 | 1708 | |
349ede6a | 1709 | #: archive.c:481 |
a0b6b246 JX |
1710 | msgid "compress better" |
1711 | msgstr "压缩效果更好" | |
8ada9598 | 1712 | |
349ede6a | 1713 | #: archive.c:484 |
a0b6b246 JX |
1714 | msgid "list supported archive formats" |
1715 | msgstr "列出支持的归档格式" | |
a77c07d9 | 1716 | |
349ede6a | 1717 | #: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 |
2b472aae | 1718 | #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 |
a0b6b246 JX |
1719 | msgid "repo" |
1720 | msgstr "仓库" | |
c04f5ac3 | 1721 | |
349ede6a | 1722 | #: archive.c:487 builtin/archive.c:92 |
a0b6b246 JX |
1723 | msgid "retrieve the archive from remote repository <repo>" |
1724 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 1725 | |
349ede6a | 1726 | #: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 |
06991777 | 1727 | #: builtin/notes.c:498 |
a0b6b246 JX |
1728 | msgid "command" |
1729 | msgstr "命令" | |
1730 | ||
349ede6a | 1731 | #: archive.c:489 builtin/archive.c:94 |
a0b6b246 JX |
1732 | msgid "path to the remote git-upload-archive command" |
1733 | msgstr "远程 git-upload-archive 命令的路径" | |
1734 | ||
349ede6a | 1735 | #: archive.c:496 |
a0b6b246 JX |
1736 | msgid "Unexpected option --remote" |
1737 | msgstr "未知参数 --remote" | |
1738 | ||
349ede6a | 1739 | #: archive.c:498 |
a0b6b246 JX |
1740 | msgid "Option --exec can only be used together with --remote" |
1741 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
1742 | ||
349ede6a | 1743 | #: archive.c:500 |
a0b6b246 JX |
1744 | msgid "Unexpected option --output" |
1745 | msgstr "未知参数 --output" | |
1746 | ||
349ede6a | 1747 | #: archive.c:522 |
a0b6b246 JX |
1748 | #, c-format |
1749 | msgid "Unknown archive format '%s'" | |
1750 | msgstr "未知归档格式 '%s'" | |
1751 | ||
349ede6a | 1752 | #: archive.c:529 |
8ada9598 | 1753 | #, c-format |
a0b6b246 JX |
1754 | msgid "Argument not supported for format '%s': -%d" |
1755 | msgstr "参数不支持此格式 '%s':-%d" | |
1756 | ||
ddc12c42 | 1757 | #: attr.c:212 |
87cb7997 JX |
1758 | #, c-format |
1759 | msgid "%.*s is not a valid attribute name" | |
1760 | msgstr "%.*s 不是一个有效的属性名" | |
1761 | ||
ddc12c42 | 1762 | #: attr.c:369 |
06991777 JX |
1763 | #, c-format |
1764 | msgid "%s not allowed: %s:%d" | |
5b533632 | 1765 | msgstr "不允许 %s:%s:%d" |
06991777 | 1766 | |
ddc12c42 | 1767 | #: attr.c:409 |
8ada9598 | 1768 | msgid "" |
a0b6b246 JX |
1769 | "Negative patterns are ignored in git attributes\n" |
1770 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1771 | msgstr "" |
a0b6b246 JX |
1772 | "负值模版在 git attributes 中被忽略\n" |
1773 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1774 | |
4c27fcb5 | 1775 | #: bisect.c:468 |
8ada9598 | 1776 | #, c-format |
a0b6b246 JX |
1777 | msgid "Badly quoted content in file '%s': %s" |
1778 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1779 | |
06991777 | 1780 | #: bisect.c:678 |
a0b6b246 JX |
1781 | #, c-format |
1782 | msgid "We cannot bisect more!\n" | |
1783 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1784 | |
2b472aae | 1785 | #: bisect.c:745 |
2e8451e8 | 1786 | #, c-format |
a0b6b246 JX |
1787 | msgid "Not a valid commit name %s" |
1788 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1789 | |
2b472aae | 1790 | #: bisect.c:770 |
5b04ee3b JX |
1791 | #, c-format |
1792 | msgid "" | |
a0b6b246 JX |
1793 | "The merge base %s is bad.\n" |
1794 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1795 | msgstr "" |
a0b6b246 JX |
1796 | "合并基线 %s 是坏的。\n" |
1797 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1798 | |
2b472aae | 1799 | #: bisect.c:775 |
5b04ee3b | 1800 | #, c-format |
a0b6b246 JX |
1801 | msgid "" |
1802 | "The merge base %s is new.\n" | |
1803 | "The property has changed between %s and [%s].\n" | |
1804 | msgstr "" | |
1805 | "合并基线 %s 是新的。\n" | |
1806 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1807 | |
2b472aae | 1808 | #: bisect.c:780 |
a0b6b246 JX |
1809 | #, c-format |
1810 | msgid "" | |
1811 | "The merge base %s is %s.\n" | |
1812 | "This means the first '%s' commit is between %s and [%s].\n" | |
1813 | msgstr "" | |
1814 | "合并基线 %s 是 %s。\n" | |
1815 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1816 | |
2b472aae | 1817 | #: bisect.c:788 |
a0b6b246 JX |
1818 | #, c-format |
1819 | msgid "" | |
1a79b2f1 | 1820 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1821 | "git bisect cannot work properly in this case.\n" |
1822 | "Maybe you mistook %s and %s revs?\n" | |
1823 | msgstr "" | |
1824 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1825 | "这种情况下 git 二分查找无法正常工作。\n" | |
1826 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1827 | |
2b472aae | 1828 | #: bisect.c:801 |
a0b6b246 JX |
1829 | #, c-format |
1830 | msgid "" | |
1831 | "the merge base between %s and [%s] must be skipped.\n" | |
1832 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1833 | "We continue anyway." | |
1834 | msgstr "" | |
1835 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1836 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1837 | "我们仍旧继续。" | |
649900bc | 1838 | |
2b472aae | 1839 | #: bisect.c:840 |
649900bc | 1840 | #, c-format |
a0b6b246 JX |
1841 | msgid "Bisecting: a merge base must be tested\n" |
1842 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1843 | |
2b472aae | 1844 | #: bisect.c:890 |
a0b6b246 JX |
1845 | #, c-format |
1846 | msgid "a %s revision is needed" | |
1847 | msgstr "需要一个 %s 版本" | |
649900bc | 1848 | |
349ede6a | 1849 | #: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 |
649900bc | 1850 | #, c-format |
a0b6b246 JX |
1851 | msgid "could not create file '%s'" |
1852 | msgstr "不能创建文件 '%s'" | |
649900bc | 1853 | |
349ede6a | 1854 | #: bisect.c:966 builtin/merge.c:151 |
649900bc | 1855 | #, c-format |
a0b6b246 JX |
1856 | msgid "could not read file '%s'" |
1857 | msgstr "不能读取文件 '%s'" | |
649900bc | 1858 | |
2b472aae | 1859 | #: bisect.c:997 |
a0b6b246 JX |
1860 | msgid "reading bisect refs failed" |
1861 | msgstr "读取二分查找引用失败" | |
649900bc | 1862 | |
2b472aae | 1863 | #: bisect.c:1019 |
649900bc | 1864 | #, c-format |
a0b6b246 JX |
1865 | msgid "%s was both %s and %s\n" |
1866 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1867 | |
2b472aae | 1868 | #: bisect.c:1028 |
649900bc | 1869 | #, c-format |
a0b6b246 JX |
1870 | msgid "" |
1871 | "No testable commit found.\n" | |
1872 | "Maybe you started with bad path parameters?\n" | |
1873 | msgstr "" | |
1874 | "没有发现可测试的提交。\n" | |
1875 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1876 | |
2b472aae | 1877 | #: bisect.c:1057 |
649900bc | 1878 | #, c-format |
a0b6b246 JX |
1879 | msgid "(roughly %d step)" |
1880 | msgid_plural "(roughly %d steps)" | |
1881 | msgstr[0] "(大概 %d 步)" | |
1882 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1883 | |
a4f16749 JX |
1884 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1885 | #. steps)" translation. | |
1886 | #. | |
2b472aae | 1887 | #: bisect.c:1063 |
649900bc | 1888 | #, c-format |
a0b6b246 JX |
1889 | msgid "Bisecting: %d revision left to test after this %s\n" |
1890 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1891 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1892 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1893 | |
349ede6a | 1894 | #: blame.c:2777 |
a4f16749 JX |
1895 | msgid "--contents and --reverse do not blend well." |
1896 | msgstr "--contents 和 --reverse 不能混用。" | |
1897 | ||
349ede6a | 1898 | #: blame.c:2791 |
a4f16749 JX |
1899 | msgid "cannot use --contents with final commit object name" |
1900 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1901 | ||
349ede6a | 1902 | #: blame.c:2812 |
a4f16749 JX |
1903 | msgid "--reverse and --first-parent together require specified latest commit" |
1904 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1905 | ||
7157c2b5 | 1906 | #: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 |
349ede6a JX |
1907 | #: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 |
1908 | #: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 | |
7157c2b5 | 1909 | #: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 |
fd8cb379 | 1910 | #: builtin/shortlog.c:192 |
a4f16749 JX |
1911 | msgid "revision walk setup failed" |
1912 | msgstr "版本遍历设置失败" | |
1913 | ||
349ede6a | 1914 | #: blame.c:2839 |
a4f16749 JX |
1915 | msgid "" |
1916 | "--reverse --first-parent together require range along first-parent chain" | |
1917 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1918 | ||
349ede6a | 1919 | #: blame.c:2850 |
a4f16749 JX |
1920 | #, c-format |
1921 | msgid "no such path %s in %s" | |
1922 | msgstr "在 %2$s 中无此路径 %1$s" | |
1923 | ||
349ede6a | 1924 | #: blame.c:2861 |
a4f16749 JX |
1925 | #, c-format |
1926 | msgid "cannot read blob %s for path %s" | |
1927 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1928 | ||
d46c5519 | 1929 | #: branch.c:53 |
649900bc | 1930 | #, c-format |
a0b6b246 JX |
1931 | msgid "" |
1932 | "\n" | |
1933 | "After fixing the error cause you may try to fix up\n" | |
1934 | "the remote tracking information by invoking\n" | |
1935 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1936 | msgstr "" | |
1937 | "\n" | |
1938 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1939 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1940 | |
d46c5519 | 1941 | #: branch.c:67 |
649900bc | 1942 | #, c-format |
a0b6b246 JX |
1943 | msgid "Not setting branch %s as its own upstream." |
1944 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1945 | |
d46c5519 | 1946 | #: branch.c:93 |
649900bc | 1947 | #, c-format |
6937cb4e JX |
1948 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1949 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1950 | |
d46c5519 | 1951 | #: branch.c:94 |
649900bc | 1952 | #, c-format |
6937cb4e JX |
1953 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1954 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1955 | |
d46c5519 | 1956 | #: branch.c:98 |
649900bc | 1957 | #, c-format |
6937cb4e JX |
1958 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1959 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1960 | |
d46c5519 | 1961 | #: branch.c:99 |
649900bc | 1962 | #, c-format |
6937cb4e | 1963 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 1964 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 1965 | |
d46c5519 | 1966 | #: branch.c:104 |
649900bc | 1967 | #, c-format |
6937cb4e JX |
1968 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
1969 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 1970 | |
d46c5519 | 1971 | #: branch.c:105 |
649900bc | 1972 | #, c-format |
6937cb4e JX |
1973 | msgid "Branch '%s' set up to track remote ref '%s'." |
1974 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 1975 | |
d46c5519 | 1976 | #: branch.c:109 |
649900bc | 1977 | #, c-format |
6937cb4e JX |
1978 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
1979 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 1980 | |
d46c5519 | 1981 | #: branch.c:110 |
649900bc | 1982 | #, c-format |
6937cb4e JX |
1983 | msgid "Branch '%s' set up to track local ref '%s'." |
1984 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 1985 | |
d46c5519 | 1986 | #: branch.c:119 |
a0b6b246 JX |
1987 | msgid "Unable to write upstream branch configuration" |
1988 | msgstr "无法写入上游分支配置" | |
649900bc | 1989 | |
d46c5519 | 1990 | #: branch.c:156 |
649900bc | 1991 | #, c-format |
a0b6b246 JX |
1992 | msgid "Not tracking: ambiguous information for ref %s" |
1993 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 1994 | |
d46c5519 | 1995 | #: branch.c:189 |
649900bc | 1996 | #, c-format |
a0b6b246 JX |
1997 | msgid "'%s' is not a valid branch name." |
1998 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 1999 | |
d46c5519 | 2000 | #: branch.c:208 |
649900bc | 2001 | #, c-format |
a0b6b246 JX |
2002 | msgid "A branch named '%s' already exists." |
2003 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 2004 | |
d46c5519 | 2005 | #: branch.c:213 |
a0b6b246 JX |
2006 | msgid "Cannot force update the current branch." |
2007 | msgstr "无法强制更新当前分支。" | |
649900bc | 2008 | |
d46c5519 | 2009 | #: branch.c:233 |
649900bc | 2010 | #, c-format |
a0b6b246 JX |
2011 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
2012 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 2013 | |
d46c5519 | 2014 | #: branch.c:235 |
649900bc | 2015 | #, c-format |
a0b6b246 JX |
2016 | msgid "the requested upstream branch '%s' does not exist" |
2017 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 2018 | |
d46c5519 | 2019 | #: branch.c:237 |
a0b6b246 JX |
2020 | msgid "" |
2021 | "\n" | |
2022 | "If you are planning on basing your work on an upstream\n" | |
2023 | "branch that already exists at the remote, you may need to\n" | |
2024 | "run \"git fetch\" to retrieve it.\n" | |
2025 | "\n" | |
2026 | "If you are planning to push out a new local branch that\n" | |
2027 | "will track its remote counterpart, you may want to use\n" | |
2028 | "\"git push -u\" to set the upstream config as you push." | |
2029 | msgstr "" | |
2030 | "\n" | |
2031 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
2032 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
2033 | "\n" | |
2034 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
2035 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 2036 | |
d46c5519 | 2037 | #: branch.c:281 |
649900bc | 2038 | #, c-format |
a0b6b246 JX |
2039 | msgid "Not a valid object name: '%s'." |
2040 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 2041 | |
d46c5519 | 2042 | #: branch.c:301 |
649900bc | 2043 | #, c-format |
a0b6b246 JX |
2044 | msgid "Ambiguous object name: '%s'." |
2045 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 2046 | |
d46c5519 | 2047 | #: branch.c:306 |
649900bc | 2048 | #, c-format |
a0b6b246 JX |
2049 | msgid "Not a valid branch point: '%s'." |
2050 | msgstr "无效的分支点:'%s'。" | |
649900bc | 2051 | |
349ede6a | 2052 | #: branch.c:365 |
649900bc | 2053 | #, c-format |
a0b6b246 JX |
2054 | msgid "'%s' is already checked out at '%s'" |
2055 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 2056 | |
349ede6a | 2057 | #: branch.c:388 |
a0b6b246 JX |
2058 | #, c-format |
2059 | msgid "HEAD of working tree %s is not updated" | |
2060 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 2061 | |
7157c2b5 | 2062 | #: bundle.c:47 |
649900bc | 2063 | #, c-format |
a0b6b246 JX |
2064 | msgid "'%s' does not look like a v2 bundle file" |
2065 | msgstr "'%s' 不像是一个 v2 版本的包文件" | |
649900bc | 2066 | |
7157c2b5 JX |
2067 | #: bundle.c:69 |
2068 | msgid "unknown hash algorithm length" | |
2069 | msgstr "未知的哈希算法长度" | |
2070 | ||
2071 | #: bundle.c:84 | |
a0b6b246 JX |
2072 | #, c-format |
2073 | msgid "unrecognized header: %s%s (%d)" | |
2074 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 2075 | |
7157c2b5 | 2076 | #: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 |
349ede6a | 2077 | #: builtin/commit.c:814 |
649900bc | 2078 | #, c-format |
a0b6b246 JX |
2079 | msgid "could not open '%s'" |
2080 | msgstr "不能打开 '%s'" | |
649900bc | 2081 | |
7157c2b5 | 2082 | #: bundle.c:163 |
a0b6b246 JX |
2083 | msgid "Repository lacks these prerequisite commits:" |
2084 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 2085 | |
7157c2b5 | 2086 | #: bundle.c:166 |
a6cd2cc4 JX |
2087 | msgid "need a repository to verify a bundle" |
2088 | msgstr "需要一个仓库来校验一个包" | |
2089 | ||
7157c2b5 | 2090 | #: bundle.c:217 |
2e8451e8 | 2091 | #, c-format |
a0b6b246 JX |
2092 | msgid "The bundle contains this ref:" |
2093 | msgid_plural "The bundle contains these %d refs:" | |
2094 | msgstr[0] "这个包中含有这个引用:" | |
2095 | msgstr[1] "这个包中含有 %d 个引用:" | |
2e8451e8 | 2096 | |
7157c2b5 | 2097 | #: bundle.c:224 |
a0b6b246 JX |
2098 | msgid "The bundle records a complete history." |
2099 | msgstr "这个包记录一个完整历史。" | |
2e8451e8 | 2100 | |
7157c2b5 | 2101 | #: bundle.c:226 |
2e8451e8 | 2102 | #, c-format |
a0b6b246 JX |
2103 | msgid "The bundle requires this ref:" |
2104 | msgid_plural "The bundle requires these %d refs:" | |
2105 | msgstr[0] "这个包需要这个引用:" | |
2106 | msgstr[1] "这个包需要 %d 个引用:" | |
2e8451e8 | 2107 | |
7157c2b5 | 2108 | #: bundle.c:293 |
4c27fcb5 JX |
2109 | msgid "unable to dup bundle descriptor" |
2110 | msgstr "无法复制 bundle 描述符" | |
2111 | ||
7157c2b5 | 2112 | #: bundle.c:300 |
a0b6b246 JX |
2113 | msgid "Could not spawn pack-objects" |
2114 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 2115 | |
7157c2b5 | 2116 | #: bundle.c:311 |
a0b6b246 JX |
2117 | msgid "pack-objects died" |
2118 | msgstr "pack-objects 终止" | |
8ada9598 | 2119 | |
7157c2b5 | 2120 | #: bundle.c:353 |
a0b6b246 JX |
2121 | msgid "rev-list died" |
2122 | msgstr "rev-list 终止" | |
2123 | ||
7157c2b5 | 2124 | #: bundle.c:402 |
81809b99 | 2125 | #, c-format |
a0b6b246 JX |
2126 | msgid "ref '%s' is excluded by the rev-list options" |
2127 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 2128 | |
7157c2b5 | 2129 | #: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 |
81809b99 | 2130 | #, c-format |
a0b6b246 JX |
2131 | msgid "unrecognized argument: %s" |
2132 | msgstr "未能识别的参数:%s" | |
8ada9598 | 2133 | |
7157c2b5 | 2134 | #: bundle.c:489 |
a0b6b246 JX |
2135 | msgid "Refusing to create empty bundle." |
2136 | msgstr "不能创建空包。" | |
2137 | ||
7157c2b5 | 2138 | #: bundle.c:499 |
81809b99 | 2139 | #, c-format |
a0b6b246 JX |
2140 | msgid "cannot create '%s'" |
2141 | msgstr "不能创建 '%s'" | |
8ada9598 | 2142 | |
7157c2b5 | 2143 | #: bundle.c:524 |
a0b6b246 JX |
2144 | msgid "index-pack died" |
2145 | msgstr "index-pack 终止" | |
63af42fe | 2146 | |
2b472aae | 2147 | #: color.c:329 |
94550ed3 | 2148 | #, c-format |
a0b6b246 JX |
2149 | msgid "invalid color value: %.*s" |
2150 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 2151 | |
7157c2b5 | 2152 | #: commit-graph.c:238 |
d46c5519 JX |
2153 | msgid "commit-graph file is too small" |
2154 | msgstr "提交图形文件太小" | |
c1ac5258 | 2155 | |
7157c2b5 | 2156 | #: commit-graph.c:303 |
c1ac5258 | 2157 | #, c-format |
d46c5519 JX |
2158 | msgid "commit-graph signature %X does not match signature %X" |
2159 | msgstr "提交图形签名 %X 和签名 %X 不匹配" | |
c1ac5258 | 2160 | |
7157c2b5 | 2161 | #: commit-graph.c:310 |
c1ac5258 | 2162 | #, c-format |
d46c5519 JX |
2163 | msgid "commit-graph version %X does not match version %X" |
2164 | msgstr "提交图形版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 2165 | |
7157c2b5 | 2166 | #: commit-graph.c:317 |
c1ac5258 | 2167 | #, c-format |
d46c5519 JX |
2168 | msgid "commit-graph hash version %X does not match version %X" |
2169 | msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 2170 | |
7157c2b5 | 2171 | #: commit-graph.c:339 |
d46c5519 JX |
2172 | msgid "commit-graph chunk lookup table entry missing; file may be incomplete" |
2173 | msgstr "提交图形块查找表条目丢失,文件可能不完整" | |
06991777 | 2174 | |
7157c2b5 | 2175 | #: commit-graph.c:349 |
c1ac5258 | 2176 | #, c-format |
d46c5519 JX |
2177 | msgid "commit-graph improper chunk offset %08x%08x" |
2178 | msgstr "提交图形不正确的块偏移 %08x%08x" | |
c1ac5258 | 2179 | |
7157c2b5 | 2180 | #: commit-graph.c:417 |
c1ac5258 | 2181 | #, c-format |
d46c5519 JX |
2182 | msgid "commit-graph chunk id %08x appears multiple times" |
2183 | msgstr "提交图形块 id %08x 出现了多次" | |
c1ac5258 | 2184 | |
7157c2b5 | 2185 | #: commit-graph.c:491 |
a6cd2cc4 JX |
2186 | msgid "commit-graph has no base graphs chunk" |
2187 | msgstr "提交图形没有基础图形块" | |
2188 | ||
7157c2b5 | 2189 | #: commit-graph.c:501 |
a6cd2cc4 JX |
2190 | msgid "commit-graph chain does not match" |
2191 | msgstr "提交图形链不匹配" | |
2192 | ||
7157c2b5 | 2193 | #: commit-graph.c:549 |
a6cd2cc4 JX |
2194 | #, c-format |
2195 | msgid "invalid commit-graph chain: line '%s' not a hash" | |
2196 | msgstr "无效的提交图形链:行 '%s' 不是一个哈希值" | |
2197 | ||
7157c2b5 | 2198 | #: commit-graph.c:573 |
a6cd2cc4 JX |
2199 | msgid "unable to find all commit-graph files" |
2200 | msgstr "无法找到所有提交图形文件" | |
2201 | ||
7157c2b5 | 2202 | #: commit-graph.c:706 commit-graph.c:770 |
a6cd2cc4 JX |
2203 | msgid "invalid commit position. commit-graph is likely corrupt" |
2204 | msgstr "无效的提交位置。提交图形可能已损坏" | |
2205 | ||
7157c2b5 | 2206 | #: commit-graph.c:727 |
c1ac5258 JX |
2207 | #, c-format |
2208 | msgid "could not find commit %s" | |
2209 | msgstr "无法找到提交 %s" | |
2210 | ||
7157c2b5 | 2211 | #: commit-graph.c:1009 builtin/am.c:1292 |
a5cd71ca JX |
2212 | #, c-format |
2213 | msgid "unable to parse commit %s" | |
2214 | msgstr "不能解析提交 %s" | |
2215 | ||
7157c2b5 | 2216 | #: commit-graph.c:1157 |
349ede6a JX |
2217 | msgid "Writing changed paths Bloom filters index" |
2218 | msgstr "编写变更路径的 Bloom 过滤器索引" | |
2219 | ||
7157c2b5 | 2220 | #: commit-graph.c:1182 |
349ede6a JX |
2221 | msgid "Writing changed paths Bloom filters data" |
2222 | msgstr "编写变更路径的 Bloom 过滤器数据" | |
2223 | ||
7157c2b5 | 2224 | #: commit-graph.c:1221 builtin/pack-objects.c:2832 |
c1ac5258 JX |
2225 | #, c-format |
2226 | msgid "unable to get type of object %s" | |
2227 | msgstr "无法获得对象 %s 类型" | |
2228 | ||
7157c2b5 | 2229 | #: commit-graph.c:1257 |
06991777 JX |
2230 | msgid "Loading known commits in commit graph" |
2231 | msgstr "正在加载提交图中的已知提交" | |
2232 | ||
7157c2b5 | 2233 | #: commit-graph.c:1274 |
06991777 JX |
2234 | msgid "Expanding reachable commits in commit graph" |
2235 | msgstr "正在扩展提交图中的可达提交" | |
2236 | ||
7157c2b5 | 2237 | #: commit-graph.c:1294 |
06991777 JX |
2238 | msgid "Clearing commit marks in commit graph" |
2239 | msgstr "正在清除提交图中的提交标记" | |
4c27fcb5 | 2240 | |
7157c2b5 | 2241 | #: commit-graph.c:1313 |
4c27fcb5 JX |
2242 | msgid "Computing commit graph generation numbers" |
2243 | msgstr "正在计算提交图世代数字" | |
2244 | ||
7157c2b5 | 2245 | #: commit-graph.c:1367 |
349ede6a JX |
2246 | msgid "Computing commit changed paths Bloom filters" |
2247 | msgstr "计算提交变更路径的 Bloom 过滤器" | |
2248 | ||
7157c2b5 JX |
2249 | #: commit-graph.c:1423 |
2250 | msgid "Collecting referenced commits" | |
2251 | msgstr "正在收集引用的提交" | |
2252 | ||
2253 | #: commit-graph.c:1447 | |
06991777 JX |
2254 | #, c-format |
2255 | msgid "Finding commits for commit graph in %d pack" | |
2256 | msgid_plural "Finding commits for commit graph in %d packs" | |
2257 | msgstr[0] "正在 %d 个包中查找提交图的提交" | |
2258 | msgstr[1] "正在 %d 个包中查找提交图的提交" | |
4c27fcb5 | 2259 | |
7157c2b5 | 2260 | #: commit-graph.c:1460 |
c1ac5258 JX |
2261 | #, c-format |
2262 | msgid "error adding pack %s" | |
2263 | msgstr "添加包 %s 出错" | |
2264 | ||
7157c2b5 | 2265 | #: commit-graph.c:1464 |
c1ac5258 JX |
2266 | #, c-format |
2267 | msgid "error opening index for %s" | |
2268 | msgstr "为 %s 打开索引出错" | |
2269 | ||
7157c2b5 | 2270 | #: commit-graph.c:1503 |
06991777 JX |
2271 | msgid "Finding commits for commit graph among packed objects" |
2272 | msgstr "正在打包对象中查找提交图的提交" | |
2273 | ||
7157c2b5 | 2274 | #: commit-graph.c:1518 |
06991777 | 2275 | msgid "Counting distinct commits in commit graph" |
8e4e0555 | 2276 | msgstr "正在计算提交图中不同的提交" |
06991777 | 2277 | |
7157c2b5 | 2278 | #: commit-graph.c:1550 |
06991777 | 2279 | msgid "Finding extra edges in commit graph" |
8e4e0555 | 2280 | msgstr "正在查找提交图中额外的边" |
06991777 | 2281 | |
7157c2b5 | 2282 | #: commit-graph.c:1599 |
a6cd2cc4 JX |
2283 | msgid "failed to write correct number of base graph ids" |
2284 | msgstr "无法写入正确数量的基础图形 ID" | |
fd8cb379 | 2285 | |
7157c2b5 | 2286 | #: commit-graph.c:1633 midx.c:812 |
fd8cb379 | 2287 | #, c-format |
c1ac5258 JX |
2288 | msgid "unable to create leading directories of %s" |
2289 | msgstr "不能为 %s 创建先导目录" | |
2290 | ||
7157c2b5 | 2291 | #: commit-graph.c:1646 |
349ede6a JX |
2292 | msgid "unable to create temporary graph layer" |
2293 | msgstr "无法创建临时图层" | |
2294 | ||
7157c2b5 | 2295 | #: commit-graph.c:1651 |
a6cd2cc4 | 2296 | #, c-format |
349ede6a JX |
2297 | msgid "unable to adjust shared permissions for '%s'" |
2298 | msgstr "无法为 '%s' 调整共享权限" | |
a6cd2cc4 | 2299 | |
7157c2b5 | 2300 | #: commit-graph.c:1728 |
06991777 JX |
2301 | #, c-format |
2302 | msgid "Writing out commit graph in %d pass" | |
2303 | msgid_plural "Writing out commit graph in %d passes" | |
8e4e0555 FZ |
2304 | msgstr[0] "正在用 %d 步写出提交图" |
2305 | msgstr[1] "正在用 %d 步写出提交图" | |
06991777 | 2306 | |
7157c2b5 | 2307 | #: commit-graph.c:1773 |
a6cd2cc4 JX |
2308 | msgid "unable to open commit-graph chain file" |
2309 | msgstr "无法打开提交图形链文件" | |
2310 | ||
7157c2b5 | 2311 | #: commit-graph.c:1789 |
a6cd2cc4 JX |
2312 | msgid "failed to rename base commit-graph file" |
2313 | msgstr "无法重命名基础提交图形文件" | |
2314 | ||
7157c2b5 | 2315 | #: commit-graph.c:1809 |
a6cd2cc4 JX |
2316 | msgid "failed to rename temporary commit-graph file" |
2317 | msgstr "无法重命名临时提交图形文件" | |
2318 | ||
7157c2b5 | 2319 | #: commit-graph.c:1935 |
a6cd2cc4 JX |
2320 | msgid "Scanning merged commits" |
2321 | msgstr "正在扫描合并提交" | |
2322 | ||
7157c2b5 | 2323 | #: commit-graph.c:1946 |
a6cd2cc4 JX |
2324 | #, c-format |
2325 | msgid "unexpected duplicate commit id %s" | |
2326 | msgstr "意外的重复提交 ID %s" | |
2327 | ||
7157c2b5 | 2328 | #: commit-graph.c:1969 |
a6cd2cc4 JX |
2329 | msgid "Merging commit-graph" |
2330 | msgstr "正在合并提交图形" | |
2331 | ||
7157c2b5 | 2332 | #: commit-graph.c:2156 |
a6cd2cc4 JX |
2333 | #, c-format |
2334 | msgid "the commit graph format cannot write %d commits" | |
2335 | msgstr "提交图格式不能写入 %d 个提交" | |
2336 | ||
7157c2b5 | 2337 | #: commit-graph.c:2167 |
a6cd2cc4 JX |
2338 | msgid "too many commits to write graph" |
2339 | msgstr "提交太多不能画图" | |
2340 | ||
7157c2b5 | 2341 | #: commit-graph.c:2260 |
c1ac5258 | 2342 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" |
4c27fcb5 JX |
2343 | msgstr "提交图文件的校验码错误,可能已经损坏" |
2344 | ||
7157c2b5 | 2345 | #: commit-graph.c:2270 |
d46c5519 JX |
2346 | #, c-format |
2347 | msgid "commit-graph has incorrect OID order: %s then %s" | |
5b533632 | 2348 | msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" |
d46c5519 | 2349 | |
7157c2b5 | 2350 | #: commit-graph.c:2280 commit-graph.c:2295 |
d46c5519 JX |
2351 | #, c-format |
2352 | msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" | |
2353 | msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" | |
2354 | ||
7157c2b5 | 2355 | #: commit-graph.c:2287 |
d46c5519 JX |
2356 | #, c-format |
2357 | msgid "failed to parse commit %s from commit-graph" | |
2358 | msgstr "无法从提交图形中解析提交 %s" | |
2359 | ||
7157c2b5 | 2360 | #: commit-graph.c:2305 |
4c27fcb5 | 2361 | msgid "Verifying commits in commit graph" |
8e4e0555 | 2362 | msgstr "正在校验提交图中的提交" |
fd8cb379 | 2363 | |
7157c2b5 | 2364 | #: commit-graph.c:2320 |
d46c5519 JX |
2365 | #, c-format |
2366 | msgid "failed to parse commit %s from object database for commit-graph" | |
2367 | msgstr "无法从提交图形的对象库中解析提交 %s" | |
2368 | ||
7157c2b5 | 2369 | #: commit-graph.c:2327 |
d46c5519 JX |
2370 | #, c-format |
2371 | msgid "root tree OID for commit %s in commit-graph is %s != %s" | |
5b533632 | 2372 | msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" |
d46c5519 | 2373 | |
7157c2b5 | 2374 | #: commit-graph.c:2337 |
d46c5519 JX |
2375 | #, c-format |
2376 | msgid "commit-graph parent list for commit %s is too long" | |
2377 | msgstr "提交 %s 的提交图形父提交列表太长了" | |
2378 | ||
7157c2b5 | 2379 | #: commit-graph.c:2346 |
d46c5519 JX |
2380 | #, c-format |
2381 | msgid "commit-graph parent for %s is %s != %s" | |
2382 | msgstr "%s 的提交图形父提交是 %s != %s" | |
2383 | ||
7157c2b5 | 2384 | #: commit-graph.c:2360 |
d46c5519 JX |
2385 | #, c-format |
2386 | msgid "commit-graph parent list for commit %s terminates early" | |
2387 | msgstr "提交 %s 的提交图形父提交列表过早终止" | |
2388 | ||
7157c2b5 | 2389 | #: commit-graph.c:2365 |
d46c5519 JX |
2390 | #, c-format |
2391 | msgid "" | |
2392 | "commit-graph has generation number zero for commit %s, but non-zero elsewhere" | |
2393 | msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" | |
2394 | ||
7157c2b5 | 2395 | #: commit-graph.c:2369 |
d46c5519 JX |
2396 | #, c-format |
2397 | msgid "" | |
2398 | "commit-graph has non-zero generation number for commit %s, but zero elsewhere" | |
2399 | msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" | |
2400 | ||
7157c2b5 | 2401 | #: commit-graph.c:2385 |
d46c5519 JX |
2402 | #, c-format |
2403 | msgid "commit-graph generation for commit %s is %u != %u" | |
2404 | msgstr "提交图形中的提交 %s 的世代号是 %u != %u" | |
2405 | ||
7157c2b5 | 2406 | #: commit-graph.c:2391 |
d46c5519 JX |
2407 | #, c-format |
2408 | msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" | |
2409 | msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" | |
2410 | ||
349ede6a JX |
2411 | #: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 |
2412 | #: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 | |
2413 | #, c-format | |
2414 | msgid "could not parse %s" | |
2415 | msgstr "不能解析 %s" | |
2416 | ||
2417 | #: commit.c:54 | |
2418 | #, c-format | |
2419 | msgid "%s %s is not a commit!" | |
2420 | msgstr "%s %s 不是一个提交!" | |
2421 | ||
2422 | #: commit.c:194 | |
2423 | msgid "" | |
2424 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
2425 | "and will be removed in a future Git version.\n" | |
2426 | "\n" | |
2427 | "Please use \"git replace --convert-graft-file\"\n" | |
2428 | "to convert the grafts into replace refs.\n" | |
2429 | "\n" | |
2430 | "Turn this message off by running\n" | |
2431 | "\"git config advice.graftFileDeprecated false\"" | |
2432 | msgstr "" | |
2433 | "对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n" | |
2434 | "未来的Git版本中被移除。\n" | |
2435 | "\n" | |
2436 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
2437 | "grafts 转换为替换引用。\n" | |
2438 | "\n" | |
2439 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
2440 | "可关闭本消息" | |
2441 | ||
7157c2b5 | 2442 | #: commit.c:1172 |
349ede6a JX |
2443 | #, c-format |
2444 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
2445 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
2446 | ||
7157c2b5 | 2447 | #: commit.c:1176 |
349ede6a JX |
2448 | #, c-format |
2449 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
2450 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
2451 | ||
7157c2b5 | 2452 | #: commit.c:1179 |
349ede6a JX |
2453 | #, c-format |
2454 | msgid "Commit %s does not have a GPG signature." | |
2455 | msgstr "提交 %s 没有 GPG 签名。" | |
2456 | ||
7157c2b5 | 2457 | #: commit.c:1182 |
349ede6a JX |
2458 | #, c-format |
2459 | msgid "Commit %s has a good GPG signature by %s\n" | |
2460 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
2461 | ||
7157c2b5 | 2462 | #: commit.c:1436 |
349ede6a JX |
2463 | msgid "" |
2464 | "Warning: commit message did not conform to UTF-8.\n" | |
2465 | "You may want to amend it after fixing the message, or set the config\n" | |
2466 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
2467 | msgstr "" | |
2468 | "警告:提交说明不符合 UTF-8 字符编码。\n" | |
2469 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" | |
2470 | "设置为您项目所用的字符编码。\n" | |
2471 | ||
06991777 | 2472 | #: compat/obstack.c:406 compat/obstack.c:408 |
a0b6b246 JX |
2473 | msgid "memory exhausted" |
2474 | msgstr "内存耗尽" | |
90314792 | 2475 | |
349ede6a | 2476 | #: config.c:125 |
c1ac5258 JX |
2477 | #, c-format |
2478 | msgid "" | |
2479 | "exceeded maximum include depth (%d) while including\n" | |
2480 | "\t%s\n" | |
2481 | "from\n" | |
2482 | "\t%s\n" | |
2483 | "This might be due to circular includes." | |
2484 | msgstr "" | |
e640d114 | 2485 | "超过了最大包含深度(%1$d),当从\n" |
c1ac5258 JX |
2486 | "\t%3$s\n" |
2487 | "包含\n" | |
2488 | "\t%2$s\n" | |
e640d114 | 2489 | "这可能是因为循环包含。" |
c1ac5258 | 2490 | |
349ede6a | 2491 | #: config.c:141 |
c1ac5258 JX |
2492 | #, c-format |
2493 | msgid "could not expand include path '%s'" | |
2494 | msgstr "无法扩展包含路径 '%s'" | |
2495 | ||
349ede6a | 2496 | #: config.c:152 |
c1ac5258 JX |
2497 | msgid "relative config includes must come from files" |
2498 | msgstr "相对路径的配置文件引用必须来自于文件" | |
2499 | ||
349ede6a | 2500 | #: config.c:198 |
87cb7997 | 2501 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
2502 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
2503 | ||
349ede6a | 2504 | #: config.c:378 |
c1ac5258 JX |
2505 | #, c-format |
2506 | msgid "key does not contain a section: %s" | |
2507 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 2508 | |
349ede6a | 2509 | #: config.c:384 |
c1ac5258 JX |
2510 | #, c-format |
2511 | msgid "key does not contain variable name: %s" | |
2512 | msgstr "键名没有包含变量名:%s" | |
2513 | ||
349ede6a | 2514 | #: config.c:408 sequencer.c:2456 |
c1ac5258 JX |
2515 | #, c-format |
2516 | msgid "invalid key: %s" | |
2517 | msgstr "无效键名:%s" | |
2518 | ||
349ede6a | 2519 | #: config.c:414 |
c1ac5258 JX |
2520 | #, c-format |
2521 | msgid "invalid key (newline): %s" | |
2522 | msgstr "无效键名(有换行符):%s" | |
2523 | ||
349ede6a | 2524 | #: config.c:450 config.c:462 |
c1ac5258 JX |
2525 | #, c-format |
2526 | msgid "bogus config parameter: %s" | |
2527 | msgstr "伪配置参数:%s" | |
2528 | ||
349ede6a | 2529 | #: config.c:497 |
c1ac5258 JX |
2530 | #, c-format |
2531 | msgid "bogus format in %s" | |
2532 | msgstr "%s 中格式错误" | |
2533 | ||
349ede6a | 2534 | #: config.c:836 |
90314792 | 2535 | #, c-format |
a0b6b246 JX |
2536 | msgid "bad config line %d in blob %s" |
2537 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 2538 | |
349ede6a | 2539 | #: config.c:840 |
a77c07d9 | 2540 | #, c-format |
a0b6b246 JX |
2541 | msgid "bad config line %d in file %s" |
2542 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 2543 | |
349ede6a | 2544 | #: config.c:844 |
a77c07d9 | 2545 | #, c-format |
a0b6b246 JX |
2546 | msgid "bad config line %d in standard input" |
2547 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 2548 | |
349ede6a | 2549 | #: config.c:848 |
90314792 | 2550 | #, c-format |
a0b6b246 JX |
2551 | msgid "bad config line %d in submodule-blob %s" |
2552 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 2553 | |
349ede6a | 2554 | #: config.c:852 |
90314792 | 2555 | #, c-format |
a0b6b246 JX |
2556 | msgid "bad config line %d in command line %s" |
2557 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 2558 | |
349ede6a | 2559 | #: config.c:856 |
90314792 | 2560 | #, c-format |
a0b6b246 JX |
2561 | msgid "bad config line %d in %s" |
2562 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 2563 | |
349ede6a | 2564 | #: config.c:993 |
a0b6b246 JX |
2565 | msgid "out of range" |
2566 | msgstr "超出范围" | |
6c94aba5 | 2567 | |
349ede6a | 2568 | #: config.c:993 |
a0b6b246 JX |
2569 | msgid "invalid unit" |
2570 | msgstr "无效的单位" | |
6c94aba5 | 2571 | |
349ede6a | 2572 | #: config.c:994 |
6c94aba5 | 2573 | #, c-format |
a0b6b246 JX |
2574 | msgid "bad numeric config value '%s' for '%s': %s" |
2575 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 2576 | |
349ede6a | 2577 | #: config.c:1013 |
1b7f4a34 | 2578 | #, c-format |
a0b6b246 JX |
2579 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
2580 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2581 | |
349ede6a | 2582 | #: config.c:1016 |
1b7f4a34 | 2583 | #, c-format |
a0b6b246 JX |
2584 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
2585 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2586 | |
349ede6a | 2587 | #: config.c:1019 |
1b7f4a34 | 2588 | #, c-format |
a0b6b246 JX |
2589 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
2590 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 2591 | |
349ede6a | 2592 | #: config.c:1022 |
1b7f4a34 | 2593 | #, c-format |
a0b6b246 JX |
2594 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
2595 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2596 | |
349ede6a | 2597 | #: config.c:1025 |
94550ed3 | 2598 | #, c-format |
a0b6b246 JX |
2599 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
2600 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 2601 | |
349ede6a | 2602 | #: config.c:1028 |
276ceeaa | 2603 | #, c-format |
a0b6b246 JX |
2604 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
2605 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 2606 | |
349ede6a | 2607 | #: config.c:1123 |
276ceeaa | 2608 | #, c-format |
a0b6b246 | 2609 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 2610 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 2611 | |
349ede6a | 2612 | #: config.c:1132 |
5809aa05 JX |
2613 | #, c-format |
2614 | msgid "'%s' for '%s' is not a valid timestamp" | |
2615 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
2616 | ||
349ede6a | 2617 | #: config.c:1223 |
c1ac5258 JX |
2618 | #, c-format |
2619 | msgid "abbrev length out of range: %d" | |
2620 | msgstr "缩写长度超出范围:%d" | |
2621 | ||
349ede6a | 2622 | #: config.c:1237 config.c:1248 |
3495628d | 2623 | #, c-format |
a0b6b246 JX |
2624 | msgid "bad zlib compression level %d" |
2625 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 2626 | |
349ede6a | 2627 | #: config.c:1340 |
c1ac5258 JX |
2628 | msgid "core.commentChar should only be one character" |
2629 | msgstr "core.commentChar 应该是一个字符" | |
2630 | ||
349ede6a | 2631 | #: config.c:1373 |
3495628d | 2632 | #, c-format |
a0b6b246 JX |
2633 | msgid "invalid mode for object creation: %s" |
2634 | msgstr "无效的对象创建模式:%s" | |
3495628d | 2635 | |
349ede6a | 2636 | #: config.c:1445 |
c1ac5258 JX |
2637 | #, c-format |
2638 | msgid "malformed value for %s" | |
2639 | msgstr "%s 的取值格式错误" | |
2640 | ||
349ede6a | 2641 | #: config.c:1471 |
c1ac5258 JX |
2642 | #, c-format |
2643 | msgid "malformed value for %s: %s" | |
2644 | msgstr "%s 的取值格式错误:%s" | |
2645 | ||
349ede6a | 2646 | #: config.c:1472 |
c1ac5258 JX |
2647 | msgid "must be one of nothing, matching, simple, upstream or current" |
2648 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
2649 | ||
7157c2b5 | 2650 | #: config.c:1533 builtin/pack-objects.c:3617 |
1a79b2f1 JX |
2651 | #, c-format |
2652 | msgid "bad pack compression level %d" | |
2653 | msgstr "错误的打包压缩级别 %d" | |
2654 | ||
349ede6a | 2655 | #: config.c:1655 |
c1ac5258 JX |
2656 | #, c-format |
2657 | msgid "unable to load config blob object '%s'" | |
2658 | msgstr "无法从数据对象 '%s' 加载配置" | |
2659 | ||
349ede6a | 2660 | #: config.c:1658 |
c1ac5258 JX |
2661 | #, c-format |
2662 | msgid "reference '%s' does not point to a blob" | |
2663 | msgstr "引用 '%s' 没有指向一个数据对象" | |
2664 | ||
349ede6a | 2665 | #: config.c:1675 |
c1ac5258 JX |
2666 | #, c-format |
2667 | msgid "unable to resolve config blob '%s'" | |
2668 | msgstr "不能解析配置对象 '%s'" | |
2669 | ||
349ede6a | 2670 | #: config.c:1705 |
c1ac5258 JX |
2671 | #, c-format |
2672 | msgid "failed to parse %s" | |
2673 | msgstr "解析 %s 失败" | |
2674 | ||
349ede6a | 2675 | #: config.c:1759 |
a0b6b246 JX |
2676 | msgid "unable to parse command-line config" |
2677 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 2678 | |
349ede6a | 2679 | #: config.c:2113 |
a0b6b246 JX |
2680 | msgid "unknown error occurred while reading the configuration files" |
2681 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 2682 | |
349ede6a | 2683 | #: config.c:2283 |
87cb7997 JX |
2684 | #, c-format |
2685 | msgid "Invalid %s: '%s'" | |
2686 | msgstr "无效 %s:'%s'" | |
2687 | ||
349ede6a | 2688 | #: config.c:2328 |
87cb7997 JX |
2689 | #, c-format |
2690 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
2691 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
2692 | ||
349ede6a | 2693 | #: config.c:2374 |
276ceeaa | 2694 | #, c-format |
a0b6b246 JX |
2695 | msgid "unable to parse '%s' from command-line config" |
2696 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 2697 | |
349ede6a | 2698 | #: config.c:2376 |
94550ed3 | 2699 | #, c-format |
a0b6b246 JX |
2700 | msgid "bad config variable '%s' in file '%s' at line %d" |
2701 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 2702 | |
349ede6a | 2703 | #: config.c:2457 |
c1ac5258 JX |
2704 | #, c-format |
2705 | msgid "invalid section name '%s'" | |
2706 | msgstr "无效的小节名称 '%s'" | |
2707 | ||
349ede6a | 2708 | #: config.c:2489 |
276ceeaa | 2709 | #, c-format |
a0b6b246 JX |
2710 | msgid "%s has multiple values" |
2711 | msgstr "%s 有多个取值" | |
276ceeaa | 2712 | |
349ede6a | 2713 | #: config.c:2518 |
c1ac5258 JX |
2714 | #, c-format |
2715 | msgid "failed to write new configuration file %s" | |
2716 | msgstr "写入新的配置文件 %s 失败" | |
2717 | ||
349ede6a | 2718 | #: config.c:2770 config.c:3094 |
c1ac5258 JX |
2719 | #, c-format |
2720 | msgid "could not lock config file %s" | |
2721 | msgstr "不能锁定配置文件 %s" | |
2722 | ||
349ede6a | 2723 | #: config.c:2781 |
c1ac5258 JX |
2724 | #, c-format |
2725 | msgid "opening %s" | |
2726 | msgstr "打开 %s" | |
2727 | ||
349ede6a | 2728 | #: config.c:2816 builtin/config.c:344 |
c1ac5258 JX |
2729 | #, c-format |
2730 | msgid "invalid pattern: %s" | |
2731 | msgstr "无效模式:%s" | |
2732 | ||
349ede6a | 2733 | #: config.c:2841 |
c1ac5258 JX |
2734 | #, c-format |
2735 | msgid "invalid config file %s" | |
2736 | msgstr "无效的配置文件 %s" | |
2737 | ||
349ede6a | 2738 | #: config.c:2854 config.c:3107 |
1a79b2f1 JX |
2739 | #, c-format |
2740 | msgid "fstat on %s failed" | |
65e2041e | 2741 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 2742 | |
349ede6a | 2743 | #: config.c:2865 |
c1ac5258 JX |
2744 | #, c-format |
2745 | msgid "unable to mmap '%s'" | |
2746 | msgstr "不能 mmap '%s'" | |
2747 | ||
349ede6a | 2748 | #: config.c:2874 config.c:3112 |
c1ac5258 JX |
2749 | #, c-format |
2750 | msgid "chmod on %s failed" | |
2751 | msgstr "对 %s 调用 chmod 失败" | |
2752 | ||
349ede6a | 2753 | #: config.c:2959 config.c:3209 |
c1ac5258 JX |
2754 | #, c-format |
2755 | msgid "could not write config file %s" | |
2756 | msgstr "不能写入配置文件 %s" | |
2757 | ||
349ede6a | 2758 | #: config.c:2993 |
94550ed3 | 2759 | #, c-format |
a0b6b246 JX |
2760 | msgid "could not set '%s' to '%s'" |
2761 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 2762 | |
349ede6a | 2763 | #: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 |
276ceeaa | 2764 | #, c-format |
a0b6b246 JX |
2765 | msgid "could not unset '%s'" |
2766 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 2767 | |
349ede6a | 2768 | #: config.c:3085 |
c1ac5258 JX |
2769 | #, c-format |
2770 | msgid "invalid section name: %s" | |
2771 | msgstr "无效的小节名称:%s" | |
2772 | ||
349ede6a | 2773 | #: config.c:3252 |
c1ac5258 JX |
2774 | #, c-format |
2775 | msgid "missing value for '%s'" | |
2776 | msgstr "%s 的取值缺失" | |
2777 | ||
fd8cb379 | 2778 | #: connect.c:61 |
c1ac5258 JX |
2779 | msgid "the remote end hung up upon initial contact" |
2780 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 2781 | |
fd8cb379 | 2782 | #: connect.c:63 |
a0b6b246 JX |
2783 | msgid "" |
2784 | "Could not read from remote repository.\n" | |
2785 | "\n" | |
2786 | "Please make sure you have the correct access rights\n" | |
2787 | "and the repository exists." | |
2788 | msgstr "" | |
2789 | "无法读取远程仓库。\n" | |
2790 | "\n" | |
2791 | "请确认您有正确的访问权限并且仓库存在。" | |
2792 | ||
c1ac5258 JX |
2793 | #: connect.c:81 |
2794 | #, c-format | |
2795 | msgid "server doesn't support '%s'" | |
2796 | msgstr "服务器不支持 '%s'" | |
2797 | ||
7157c2b5 | 2798 | #: connect.c:118 |
c1ac5258 JX |
2799 | #, c-format |
2800 | msgid "server doesn't support feature '%s'" | |
2801 | msgstr "服务器不支持特性 '%s'" | |
2802 | ||
7157c2b5 | 2803 | #: connect.c:129 |
c1ac5258 JX |
2804 | msgid "expected flush after capabilities" |
2805 | msgstr "在能力之后应为一个 flush 包" | |
2806 | ||
7157c2b5 | 2807 | #: connect.c:263 |
c1ac5258 JX |
2808 | #, c-format |
2809 | msgid "ignoring capabilities after first line '%s'" | |
e640d114 | 2810 | msgstr "忽略第一行 '%s' 之后的能力字段" |
c1ac5258 | 2811 | |
7157c2b5 | 2812 | #: connect.c:284 |
c1ac5258 JX |
2813 | msgid "protocol error: unexpected capabilities^{}" |
2814 | msgstr "协议错误:意外的 capabilities^{}" | |
2815 | ||
7157c2b5 | 2816 | #: connect.c:306 |
c1ac5258 JX |
2817 | #, c-format |
2818 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
2819 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
2820 | ||
7157c2b5 | 2821 | #: connect.c:308 |
c1ac5258 JX |
2822 | msgid "repository on the other end cannot be shallow" |
2823 | msgstr "另一端的仓库不能是浅克隆仓库" | |
2824 | ||
7157c2b5 | 2825 | #: connect.c:347 |
c1ac5258 JX |
2826 | msgid "invalid packet" |
2827 | msgstr "无效数据包" | |
2828 | ||
7157c2b5 | 2829 | #: connect.c:367 |
c1ac5258 JX |
2830 | #, c-format |
2831 | msgid "protocol error: unexpected '%s'" | |
2832 | msgstr "协议错误:意外的 '%s'" | |
2833 | ||
7157c2b5 JX |
2834 | #: connect.c:473 |
2835 | #, c-format | |
2836 | msgid "unknown object format '%s' specified by server" | |
2837 | msgstr "服务器给出未知的对象格式 '%s'" | |
2838 | ||
2839 | #: connect.c:500 | |
c1ac5258 JX |
2840 | #, c-format |
2841 | msgid "invalid ls-refs response: %s" | |
2842 | msgstr "无效的 ls-refs 响应:%s" | |
2843 | ||
7157c2b5 | 2844 | #: connect.c:504 |
c1ac5258 JX |
2845 | msgid "expected flush after ref listing" |
2846 | msgstr "在引用列表之后应该有一个 flush 包" | |
2847 | ||
7157c2b5 JX |
2848 | #: connect.c:507 |
2849 | msgid "expected response end packet after ref listing" | |
2850 | msgstr "在引用列表之后应该有响应结束包" | |
2851 | ||
2852 | #: connect.c:640 | |
c1ac5258 JX |
2853 | #, c-format |
2854 | msgid "protocol '%s' is not supported" | |
2855 | msgstr "不支持 '%s' 协议" | |
2856 | ||
7157c2b5 | 2857 | #: connect.c:691 |
c1ac5258 JX |
2858 | msgid "unable to set SO_KEEPALIVE on socket" |
2859 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
2860 | ||
7157c2b5 | 2861 | #: connect.c:731 connect.c:794 |
c1ac5258 JX |
2862 | #, c-format |
2863 | msgid "Looking up %s ... " | |
2864 | msgstr "查找 %s ..." | |
2865 | ||
7157c2b5 | 2866 | #: connect.c:735 |
c1ac5258 JX |
2867 | #, c-format |
2868 | msgid "unable to look up %s (port %s) (%s)" | |
2869 | msgstr "无法查找 %s(端口 %s)(%s)" | |
2870 | ||
2871 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
7157c2b5 | 2872 | #: connect.c:739 connect.c:810 |
c1ac5258 JX |
2873 | #, c-format |
2874 | msgid "" | |
2875 | "done.\n" | |
2876 | "Connecting to %s (port %s) ... " | |
2877 | msgstr "" | |
2878 | "完成。\n" | |
2879 | "连接到 %s(端口 %s)... " | |
2880 | ||
7157c2b5 | 2881 | #: connect.c:761 connect.c:838 |
c1ac5258 JX |
2882 | #, c-format |
2883 | msgid "" | |
2884 | "unable to connect to %s:\n" | |
2885 | "%s" | |
2886 | msgstr "" | |
2887 | "无法连接到 %s:\n" | |
2888 | "%s" | |
2889 | ||
2890 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
7157c2b5 | 2891 | #: connect.c:767 connect.c:844 |
c1ac5258 JX |
2892 | msgid "done." |
2893 | msgstr "完成。" | |
2894 | ||
7157c2b5 | 2895 | #: connect.c:798 |
c1ac5258 JX |
2896 | #, c-format |
2897 | msgid "unable to look up %s (%s)" | |
2898 | msgstr "无法查找 %s(%s)" | |
2899 | ||
7157c2b5 | 2900 | #: connect.c:804 |
c1ac5258 JX |
2901 | #, c-format |
2902 | msgid "unknown port %s" | |
2903 | msgstr "未知端口 %s" | |
2904 | ||
7157c2b5 | 2905 | #: connect.c:941 connect.c:1271 |
c1ac5258 JX |
2906 | #, c-format |
2907 | msgid "strange hostname '%s' blocked" | |
2908 | msgstr "已阻止奇怪的主机名 '%s'" | |
2909 | ||
7157c2b5 | 2910 | #: connect.c:943 |
c1ac5258 JX |
2911 | #, c-format |
2912 | msgid "strange port '%s' blocked" | |
2913 | msgstr "已阻止奇怪的端口号 '%s'" | |
2914 | ||
7157c2b5 | 2915 | #: connect.c:953 |
c1ac5258 JX |
2916 | #, c-format |
2917 | msgid "cannot start proxy %s" | |
2918 | msgstr "不能启动代理 %s" | |
2919 | ||
7157c2b5 | 2920 | #: connect.c:1024 |
c1ac5258 JX |
2921 | msgid "no path specified; see 'git help pull' for valid url syntax" |
2922 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
2923 | ||
7157c2b5 | 2924 | #: connect.c:1219 |
c1ac5258 JX |
2925 | msgid "ssh variant 'simple' does not support -4" |
2926 | msgstr "ssh 变体 'simple' 不支持 -4" | |
2927 | ||
7157c2b5 | 2928 | #: connect.c:1231 |
c1ac5258 JX |
2929 | msgid "ssh variant 'simple' does not support -6" |
2930 | msgstr "ssh 变体 'simple' 不支持 -6" | |
2931 | ||
7157c2b5 | 2932 | #: connect.c:1248 |
c1ac5258 | 2933 | msgid "ssh variant 'simple' does not support setting port" |
e640d114 | 2934 | msgstr "ssh 变体 'simple' 不支持设置端口" |
c1ac5258 | 2935 | |
7157c2b5 | 2936 | #: connect.c:1360 |
c1ac5258 JX |
2937 | #, c-format |
2938 | msgid "strange pathname '%s' blocked" | |
2939 | msgstr "已阻止奇怪的路径名 '%s'" | |
2940 | ||
7157c2b5 | 2941 | #: connect.c:1407 |
c1ac5258 JX |
2942 | msgid "unable to fork" |
2943 | msgstr "无法 fork" | |
2944 | ||
7157c2b5 | 2945 | #: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 |
a0b6b246 | 2946 | msgid "Checking connectivity" |
06991777 | 2947 | msgstr "正在检查连通性" |
a0b6b246 | 2948 | |
7157c2b5 | 2949 | #: connected.c:121 |
a0b6b246 JX |
2950 | msgid "Could not run 'git rev-list'" |
2951 | msgstr "不能执行 'git rev-list'" | |
2952 | ||
7157c2b5 | 2953 | #: connected.c:141 |
a0b6b246 | 2954 | msgid "failed write to rev-list" |
c1ac5258 | 2955 | msgstr "写入 rev-list 失败" |
a0b6b246 | 2956 | |
7157c2b5 | 2957 | #: connected.c:148 |
a0b6b246 | 2958 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
2959 | msgstr "关闭 rev-list 的标准输入失败" |
2960 | ||
a5cd71ca | 2961 | #: convert.c:194 |
c1ac5258 JX |
2962 | #, c-format |
2963 | msgid "illegal crlf_action %d" | |
2964 | msgstr "非法的 crlf 动作 %d" | |
a0b6b246 | 2965 | |
a5cd71ca | 2966 | #: convert.c:207 |
3495628d | 2967 | #, c-format |
c1ac5258 JX |
2968 | msgid "CRLF would be replaced by LF in %s" |
2969 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 2970 | |
a5cd71ca | 2971 | #: convert.c:209 |
31e5e17b | 2972 | #, c-format |
a0b6b246 JX |
2973 | msgid "" |
2974 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 2975 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2976 | msgstr "" |
c1ac5258 | 2977 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 2978 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 2979 | |
a5cd71ca | 2980 | #: convert.c:217 |
3495628d | 2981 | #, c-format |
31e5e17b JX |
2982 | msgid "LF would be replaced by CRLF in %s" |
2983 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 2984 | |
a5cd71ca | 2985 | #: convert.c:219 |
276ceeaa | 2986 | #, c-format |
a0b6b246 JX |
2987 | msgid "" |
2988 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 2989 | "The file will have its original line endings in your working directory" |
a0b6b246 | 2990 | msgstr "" |
c1ac5258 JX |
2991 | "%s 中的 LF 将被 CRLF 替换。\n" |
2992 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 2993 | |
ddc12c42 | 2994 | #: convert.c:284 |
fd8cb379 JX |
2995 | #, c-format |
2996 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
2997 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
2998 | ||
ddc12c42 | 2999 | #: convert.c:291 |
fd8cb379 JX |
3000 | #, c-format |
3001 | msgid "" | |
ddc12c42 JX |
3002 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " |
3003 | "working-tree-encoding." | |
2b472aae JX |
3004 | msgstr "" |
3005 | "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。" | |
fd8cb379 | 3006 | |
ddc12c42 | 3007 | #: convert.c:304 |
fd8cb379 JX |
3008 | #, c-format |
3009 | msgid "BOM is required in '%s' if encoded as %s" | |
3010 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
3011 | ||
ddc12c42 | 3012 | #: convert.c:306 |
fd8cb379 JX |
3013 | #, c-format |
3014 | msgid "" | |
3015 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
3016 | "%sLE (depending on the byte order) as working-tree-encoding." | |
3017 | msgstr "" | |
3018 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
3019 | "节序)作为工作区编码。" | |
3020 | ||
ddc12c42 | 3021 | #: convert.c:419 convert.c:490 |
fd8cb379 JX |
3022 | #, c-format |
3023 | msgid "failed to encode '%s' from %s to %s" | |
3024 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
3025 | ||
ddc12c42 | 3026 | #: convert.c:462 |
fd8cb379 JX |
3027 | #, c-format |
3028 | msgid "encoding '%s' from %s to %s and back is not the same" | |
3029 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
3030 | ||
ddc12c42 | 3031 | #: convert.c:668 |
c1ac5258 JX |
3032 | #, c-format |
3033 | msgid "cannot fork to run external filter '%s'" | |
e640d114 | 3034 | msgstr "不能 fork 以执行外部过滤器 '%s'" |
c1ac5258 | 3035 | |
ddc12c42 | 3036 | #: convert.c:688 |
c1ac5258 JX |
3037 | #, c-format |
3038 | msgid "cannot feed the input to external filter '%s'" | |
e640d114 | 3039 | msgstr "不能将输入传递给外部过滤器 '%s'" |
c1ac5258 | 3040 | |
ddc12c42 | 3041 | #: convert.c:695 |
c1ac5258 JX |
3042 | #, c-format |
3043 | msgid "external filter '%s' failed %d" | |
e640d114 | 3044 | msgstr "外部过滤器 '%s' 失败码 %d" |
c1ac5258 | 3045 | |
ddc12c42 | 3046 | #: convert.c:730 convert.c:733 |
c1ac5258 JX |
3047 | #, c-format |
3048 | msgid "read from external filter '%s' failed" | |
3049 | msgstr "从外部过滤器 '%s' 读取失败" | |
3050 | ||
ddc12c42 | 3051 | #: convert.c:736 convert.c:791 |
c1ac5258 JX |
3052 | #, c-format |
3053 | msgid "external filter '%s' failed" | |
3054 | msgstr "外部过滤器 '%s' 失败" | |
3055 | ||
349ede6a | 3056 | #: convert.c:840 |
c1ac5258 JX |
3057 | msgid "unexpected filter type" |
3058 | msgstr "意外的过滤类型" | |
3059 | ||
349ede6a | 3060 | #: convert.c:851 |
c1ac5258 JX |
3061 | msgid "path name too long for external filter" |
3062 | msgstr "外部过滤器的路径名太长" | |
3063 | ||
349ede6a | 3064 | #: convert.c:943 |
c1ac5258 JX |
3065 | #, c-format |
3066 | msgid "" | |
3067 | "external filter '%s' is not available anymore although not all paths have " | |
3068 | "been filtered" | |
3069 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
3070 | ||
349ede6a | 3071 | #: convert.c:1243 |
fd8cb379 JX |
3072 | msgid "true/false are no valid working-tree-encodings" |
3073 | msgstr "true/false 不是有效的工作区编码" | |
3074 | ||
349ede6a | 3075 | #: convert.c:1431 convert.c:1465 |
c1ac5258 JX |
3076 | #, c-format |
3077 | msgid "%s: clean filter '%s' failed" | |
3078 | msgstr "%s:clean 过滤器 '%s' 失败" | |
3079 | ||
349ede6a | 3080 | #: convert.c:1511 |
c1ac5258 JX |
3081 | #, c-format |
3082 | msgid "%s: smudge filter %s failed" | |
3083 | msgstr "%s:smudge 过滤器 %s 失败" | |
3084 | ||
349ede6a JX |
3085 | #: credential.c:96 |
3086 | #, c-format | |
3087 | msgid "skipping credential lookup for key: credential.%s" | |
3088 | msgstr "跳过凭据查询:credential.%s" | |
3089 | ||
3090 | #: credential.c:112 | |
3091 | msgid "refusing to work with credential missing host field" | |
3092 | msgstr "拒绝使用缺少主机字段的凭据" | |
3093 | ||
3094 | #: credential.c:114 | |
3095 | msgid "refusing to work with credential missing protocol field" | |
3096 | msgstr "拒绝使用缺少协议字段的凭据" | |
3097 | ||
3098 | #: credential.c:396 | |
3099 | #, c-format | |
3100 | msgid "url contains a newline in its %s component: %s" | |
3101 | msgstr "URL 的 %s 组件中包含换行符:%s" | |
3102 | ||
3103 | #: credential.c:440 | |
3104 | #, c-format | |
3105 | msgid "url has no scheme: %s" | |
3106 | msgstr "URL 没有 scheme:%s" | |
3107 | ||
3108 | #: credential.c:513 | |
3109 | #, c-format | |
3110 | msgid "credential url cannot be parsed: %s" | |
3111 | msgstr "不能解析凭据 URL:%s" | |
3112 | ||
a5cd71ca | 3113 | #: date.c:138 |
a0b6b246 JX |
3114 | msgid "in the future" |
3115 | msgstr "在将来" | |
3495628d | 3116 | |
a5cd71ca | 3117 | #: date.c:144 |
3495628d | 3118 | #, c-format |
a4f16749 JX |
3119 | msgid "%<PRIuMAX> second ago" |
3120 | msgid_plural "%<PRIuMAX> seconds ago" | |
3121 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
3122 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 3123 | |
a5cd71ca | 3124 | #: date.c:151 |
3495628d | 3125 | #, c-format |
a4f16749 JX |
3126 | msgid "%<PRIuMAX> minute ago" |
3127 | msgid_plural "%<PRIuMAX> minutes ago" | |
3128 | msgstr[0] "%<PRIuMAX> 分钟前" | |
3129 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 3130 | |
a5cd71ca | 3131 | #: date.c:158 |
3495628d | 3132 | #, c-format |
a4f16749 JX |
3133 | msgid "%<PRIuMAX> hour ago" |
3134 | msgid_plural "%<PRIuMAX> hours ago" | |
3135 | msgstr[0] "%<PRIuMAX> 小时前" | |
3136 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 3137 | |
a5cd71ca | 3138 | #: date.c:165 |
3495628d | 3139 | #, c-format |
a4f16749 JX |
3140 | msgid "%<PRIuMAX> day ago" |
3141 | msgid_plural "%<PRIuMAX> days ago" | |
3142 | msgstr[0] "%<PRIuMAX> 天前" | |
3143 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 3144 | |
a5cd71ca | 3145 | #: date.c:171 |
94550ed3 | 3146 | #, c-format |
a4f16749 JX |
3147 | msgid "%<PRIuMAX> week ago" |
3148 | msgid_plural "%<PRIuMAX> weeks ago" | |
3149 | msgstr[0] "%<PRIuMAX> 周前" | |
3150 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 3151 | |
a5cd71ca | 3152 | #: date.c:178 |
3495628d | 3153 | #, c-format |
a4f16749 JX |
3154 | msgid "%<PRIuMAX> month ago" |
3155 | msgid_plural "%<PRIuMAX> months ago" | |
3156 | msgstr[0] "%<PRIuMAX> 个月前" | |
3157 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 3158 | |
a5cd71ca | 3159 | #: date.c:189 |
3495628d | 3160 | #, c-format |
a4f16749 JX |
3161 | msgid "%<PRIuMAX> year" |
3162 | msgid_plural "%<PRIuMAX> years" | |
3163 | msgstr[0] "%<PRIuMAX> 年" | |
3164 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 3165 | |
a0b6b246 | 3166 | #. TRANSLATORS: "%s" is "<n> years" |
a5cd71ca | 3167 | #: date.c:192 |
94550ed3 | 3168 | #, c-format |
a4f16749 JX |
3169 | msgid "%s, %<PRIuMAX> month ago" |
3170 | msgid_plural "%s, %<PRIuMAX> months ago" | |
3171 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
3172 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 3173 | |
a5cd71ca | 3174 | #: date.c:197 date.c:202 |
94550ed3 | 3175 | #, c-format |
a4f16749 JX |
3176 | msgid "%<PRIuMAX> year ago" |
3177 | msgid_plural "%<PRIuMAX> years ago" | |
3178 | msgstr[0] "%<PRIuMAX> 年前" | |
3179 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 3180 | |
06991777 | 3181 | #: delta-islands.c:272 |
4c27fcb5 JX |
3182 | msgid "Propagating island marks" |
3183 | msgstr "正在传播数据岛标记" | |
3184 | ||
06991777 | 3185 | #: delta-islands.c:290 |
4c27fcb5 JX |
3186 | #, c-format |
3187 | msgid "bad tree object %s" | |
3188 | msgstr "坏的树对象 %s" | |
3189 | ||
06991777 | 3190 | #: delta-islands.c:334 |
4c27fcb5 JX |
3191 | #, c-format |
3192 | msgid "failed to load island regex for '%s': %s" | |
3193 | msgstr "未能加载 '%s' 的数据岛正则表达式:%s" | |
3194 | ||
06991777 | 3195 | #: delta-islands.c:390 |
4c27fcb5 JX |
3196 | #, c-format |
3197 | msgid "island regex from config has too many capture groups (max=%d)" | |
3198 | msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" | |
3199 | ||
a6cd2cc4 | 3200 | #: delta-islands.c:467 |
4c27fcb5 JX |
3201 | #, c-format |
3202 | msgid "Marked %d islands, done.\n" | |
3203 | msgstr "已标记 %d 个数据岛,结束。\n" | |
3204 | ||
d46c5519 JX |
3205 | #: diff-no-index.c:238 |
3206 | msgid "git diff --no-index [<options>] <path> <path>" | |
3207 | msgstr "git diff --no-index [<选项>] <路径> <路径>" | |
3208 | ||
3209 | #: diff-no-index.c:263 | |
3210 | msgid "" | |
3211 | "Not a git repository. Use --no-index to compare two paths outside a working " | |
3212 | "tree" | |
3213 | msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" | |
cfff71a9 | 3214 | |
a0b6b246 | 3215 | # 译者:注意保持前导空格 |
7157c2b5 | 3216 | #: diff.c:156 |
a0b6b246 JX |
3217 | #, c-format |
3218 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
3219 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 3220 | |
a0b6b246 | 3221 | # 译者:注意保持前导空格 |
7157c2b5 | 3222 | #: diff.c:161 |
a0b6b246 JX |
3223 | #, c-format |
3224 | msgid " Unknown dirstat parameter '%s'\n" | |
3225 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 3226 | |
7157c2b5 | 3227 | #: diff.c:297 |
6937cb4e | 3228 | msgid "" |
c1ac5258 JX |
3229 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
3230 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 3231 | msgstr "" |
c1ac5258 JX |
3232 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " |
3233 | "'plain'" | |
3234 | ||
7157c2b5 | 3235 | #: diff.c:325 |
c1ac5258 | 3236 | #, c-format |
06991777 JX |
3237 | msgid "" |
3238 | "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " | |
3239 | "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" | |
3240 | msgstr "" | |
3241 | "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" | |
3242 | "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" | |
c1ac5258 | 3243 | |
7157c2b5 | 3244 | #: diff.c:333 |
c1ac5258 | 3245 | msgid "" |
06991777 JX |
3246 | "color-moved-ws: allow-indentation-change cannot be combined with other " |
3247 | "whitespace modes" | |
c1ac5258 | 3248 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" |
6937cb4e | 3249 | |
7157c2b5 | 3250 | #: diff.c:410 |
7aea43ff | 3251 | #, c-format |
a0b6b246 JX |
3252 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
3253 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 3254 | |
7157c2b5 | 3255 | #: diff.c:470 |
7aea43ff | 3256 | #, c-format |
a0b6b246 JX |
3257 | msgid "" |
3258 | "Found errors in 'diff.dirstat' config variable:\n" | |
3259 | "%s" | |
3260 | msgstr "" | |
3261 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
3262 | "%s" | |
7aea43ff | 3263 | |
7157c2b5 | 3264 | #: diff.c:4243 |
7aea43ff | 3265 | #, c-format |
a0b6b246 JX |
3266 | msgid "external diff died, stopping at %s" |
3267 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 3268 | |
7157c2b5 | 3269 | #: diff.c:4589 |
a0b6b246 JX |
3270 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
3271 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
3272 | ||
7157c2b5 | 3273 | #: diff.c:4592 |
31e5e17b JX |
3274 | msgid "-G, -S and --find-object are mutually exclusive" |
3275 | msgstr "-G、-S 和 --find-object 是互斥的" | |
3276 | ||
7157c2b5 | 3277 | #: diff.c:4670 |
a0b6b246 JX |
3278 | msgid "--follow requires exactly one pathspec" |
3279 | msgstr "--follow 明确要求只跟一个路径规格" | |
3280 | ||
7157c2b5 | 3281 | #: diff.c:4718 |
d46c5519 JX |
3282 | #, c-format |
3283 | msgid "invalid --stat value: %s" | |
3284 | msgstr "无效的 --stat 值:%s" | |
3285 | ||
7157c2b5 | 3286 | #: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 |
2b472aae | 3287 | #: parse-options.c:197 parse-options.c:201 |
d46c5519 JX |
3288 | #, c-format |
3289 | msgid "%s expects a numerical value" | |
3290 | msgstr "%s 期望一个数字值" | |
3291 | ||
7157c2b5 | 3292 | #: diff.c:4755 |
7aea43ff | 3293 | #, c-format |
a0b6b246 JX |
3294 | msgid "" |
3295 | "Failed to parse --dirstat/-X option parameter:\n" | |
3296 | "%s" | |
3297 | msgstr "" | |
3298 | "无法解析 --dirstat/-X 选项的参数:\n" | |
3299 | "%s" | |
7aea43ff | 3300 | |
7157c2b5 | 3301 | #: diff.c:4840 |
d46c5519 JX |
3302 | #, c-format |
3303 | msgid "unknown change class '%c' in --diff-filter=%s" | |
3304 | msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" | |
3305 | ||
7157c2b5 | 3306 | #: diff.c:4864 |
d46c5519 JX |
3307 | #, c-format |
3308 | msgid "unknown value after ws-error-highlight=%.*s" | |
3309 | msgstr "ws-error-highlight=%.*s 之后未知的值" | |
3310 | ||
7157c2b5 | 3311 | #: diff.c:4878 |
7aea43ff | 3312 | #, c-format |
d46c5519 JX |
3313 | msgid "unable to resolve '%s'" |
3314 | msgstr "不能解析 '%s'" | |
3315 | ||
7157c2b5 | 3316 | #: diff.c:4928 diff.c:4934 |
d46c5519 JX |
3317 | #, c-format |
3318 | msgid "%s expects <n>/<m> form" | |
3319 | msgstr "%s 期望 <n>/<m> 格式" | |
3320 | ||
7157c2b5 | 3321 | #: diff.c:4946 |
d46c5519 JX |
3322 | #, c-format |
3323 | msgid "%s expects a character, got '%s'" | |
3324 | msgstr "%s 期望一个字符,得到 '%s'" | |
3325 | ||
7157c2b5 | 3326 | #: diff.c:4967 |
d46c5519 JX |
3327 | #, c-format |
3328 | msgid "bad --color-moved argument: %s" | |
3329 | msgstr "坏的 --color-moved 参数:%s" | |
3330 | ||
7157c2b5 | 3331 | #: diff.c:4986 |
d46c5519 JX |
3332 | #, c-format |
3333 | msgid "invalid mode '%s' in --color-moved-ws" | |
3334 | msgstr "--color-moved-ws 中的无效模式 '%s' " | |
3335 | ||
7157c2b5 | 3336 | #: diff.c:5026 |
d46c5519 JX |
3337 | msgid "" |
3338 | "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " | |
3339 | "\"histogram\"" | |
3340 | msgstr "" | |
3341 | "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" | |
3342 | ||
7157c2b5 | 3343 | #: diff.c:5062 diff.c:5082 |
d46c5519 JX |
3344 | #, c-format |
3345 | msgid "invalid argument to %s" | |
3346 | msgstr "%s 的参数无效" | |
3347 | ||
7157c2b5 | 3348 | #: diff.c:5219 |
d46c5519 JX |
3349 | #, c-format |
3350 | msgid "failed to parse --submodule option parameter: '%s'" | |
a0b6b246 | 3351 | msgstr "无法解析 --submodule 选项的参数:'%s'" |
7aea43ff | 3352 | |
7157c2b5 | 3353 | #: diff.c:5275 |
d46c5519 JX |
3354 | #, c-format |
3355 | msgid "bad --word-diff argument: %s" | |
3356 | msgstr "坏的 --word-diff 参数:%s" | |
3357 | ||
7157c2b5 | 3358 | #: diff.c:5298 |
d46c5519 JX |
3359 | msgid "Diff output format options" |
3360 | msgstr "差异输出格式化选项" | |
3361 | ||
7157c2b5 | 3362 | #: diff.c:5300 diff.c:5306 |
d46c5519 JX |
3363 | msgid "generate patch" |
3364 | msgstr "生成补丁" | |
3365 | ||
7157c2b5 | 3366 | #: diff.c:5303 builtin/log.c:177 |
d46c5519 JX |
3367 | msgid "suppress diff output" |
3368 | msgstr "不显示差异输出" | |
3369 | ||
7157c2b5 | 3370 | #: diff.c:5308 diff.c:5422 diff.c:5429 |
d46c5519 JX |
3371 | msgid "<n>" |
3372 | msgstr "<n>" | |
3373 | ||
7157c2b5 | 3374 | #: diff.c:5309 diff.c:5312 |
d46c5519 JX |
3375 | msgid "generate diffs with <n> lines context" |
3376 | msgstr "生成含 <n> 行上下文的差异" | |
3377 | ||
7157c2b5 | 3378 | #: diff.c:5314 |
d46c5519 JX |
3379 | msgid "generate the diff in raw format" |
3380 | msgstr "生成原始格式的差异" | |
3381 | ||
7157c2b5 | 3382 | #: diff.c:5317 |
d46c5519 JX |
3383 | msgid "synonym for '-p --raw'" |
3384 | msgstr "和 '-p --raw' 同义" | |
3385 | ||
7157c2b5 | 3386 | #: diff.c:5321 |
d46c5519 JX |
3387 | msgid "synonym for '-p --stat'" |
3388 | msgstr "和 '-p --stat' 同义" | |
3389 | ||
7157c2b5 | 3390 | #: diff.c:5325 |
d46c5519 JX |
3391 | msgid "machine friendly --stat" |
3392 | msgstr "机器友好的 --stat" | |
3393 | ||
7157c2b5 | 3394 | #: diff.c:5328 |
d46c5519 JX |
3395 | msgid "output only the last line of --stat" |
3396 | msgstr "只输出 --stat 的最后一行" | |
3397 | ||
7157c2b5 | 3398 | #: diff.c:5330 diff.c:5338 |
d46c5519 JX |
3399 | msgid "<param1,param2>..." |
3400 | msgstr "<参数1,参数2>..." | |
3401 | ||
7157c2b5 | 3402 | #: diff.c:5331 |
d46c5519 JX |
3403 | msgid "" |
3404 | "output the distribution of relative amount of changes for each sub-directory" | |
3405 | msgstr "输出每个子目录相对变更的分布" | |
3406 | ||
7157c2b5 | 3407 | #: diff.c:5335 |
d46c5519 JX |
3408 | msgid "synonym for --dirstat=cumulative" |
3409 | msgstr "和 --dirstat=cumulative 同义" | |
3410 | ||
7157c2b5 | 3411 | #: diff.c:5339 |
d46c5519 JX |
3412 | msgid "synonym for --dirstat=files,param1,param2..." |
3413 | msgstr "是 --dirstat=files,param1,param2... 的同义词" | |
3414 | ||
7157c2b5 | 3415 | #: diff.c:5343 |
d46c5519 JX |
3416 | msgid "warn if changes introduce conflict markers or whitespace errors" |
3417 | msgstr "如果变更中引入冲突定界符或空白错误,给出警告" | |
3418 | ||
7157c2b5 | 3419 | #: diff.c:5346 |
d46c5519 JX |
3420 | msgid "condensed summary such as creations, renames and mode changes" |
3421 | msgstr "精简摘要,例如创建、重命名和模式变更" | |
3422 | ||
7157c2b5 | 3423 | #: diff.c:5349 |
d46c5519 JX |
3424 | msgid "show only names of changed files" |
3425 | msgstr "只显示变更文件的文件名" | |
3426 | ||
7157c2b5 | 3427 | #: diff.c:5352 |
d46c5519 JX |
3428 | msgid "show only names and status of changed files" |
3429 | msgstr "只显示变更文件的文件名和状态" | |
3430 | ||
7157c2b5 | 3431 | #: diff.c:5354 |
d46c5519 JX |
3432 | msgid "<width>[,<name-width>[,<count>]]" |
3433 | msgstr "<宽度>[,<文件名宽度>[,<次数>]]" | |
3434 | ||
7157c2b5 | 3435 | #: diff.c:5355 |
d46c5519 | 3436 | msgid "generate diffstat" |
5b533632 | 3437 | msgstr "生成差异统计(diffstat)" |
d46c5519 | 3438 | |
7157c2b5 | 3439 | #: diff.c:5357 diff.c:5360 diff.c:5363 |
d46c5519 JX |
3440 | msgid "<width>" |
3441 | msgstr "<宽度>" | |
3442 | ||
7157c2b5 | 3443 | #: diff.c:5358 |
d46c5519 JX |
3444 | msgid "generate diffstat with a given width" |
3445 | msgstr "使用给定的长度生成差异统计" | |
3446 | ||
7157c2b5 | 3447 | #: diff.c:5361 |
d46c5519 JX |
3448 | msgid "generate diffstat with a given name width" |
3449 | msgstr "使用给定的文件名长度生成差异统计" | |
3450 | ||
7157c2b5 | 3451 | #: diff.c:5364 |
d46c5519 JX |
3452 | msgid "generate diffstat with a given graph width" |
3453 | msgstr "使用给定的图形长度生成差异统计" | |
3454 | ||
7157c2b5 | 3455 | #: diff.c:5366 |
d46c5519 JX |
3456 | msgid "<count>" |
3457 | msgstr "<次数>" | |
3458 | ||
7157c2b5 | 3459 | #: diff.c:5367 |
d46c5519 JX |
3460 | msgid "generate diffstat with limited lines" |
3461 | msgstr "生成有限行数的差异统计" | |
3462 | ||
7157c2b5 | 3463 | #: diff.c:5370 |
d46c5519 JX |
3464 | msgid "generate compact summary in diffstat" |
3465 | msgstr "生成差异统计的简洁摘要" | |
3466 | ||
7157c2b5 | 3467 | #: diff.c:5373 |
d46c5519 JX |
3468 | msgid "output a binary diff that can be applied" |
3469 | msgstr "输出一个可以应用的二进制差异" | |
3470 | ||
7157c2b5 | 3471 | #: diff.c:5376 |
d46c5519 JX |
3472 | msgid "show full pre- and post-image object names on the \"index\" lines" |
3473 | msgstr "在 \"index\" 行显示完整的前后对象名称" | |
3474 | ||
7157c2b5 | 3475 | #: diff.c:5378 |
d46c5519 JX |
3476 | msgid "show colored diff" |
3477 | msgstr "显示带颜色的差异" | |
3478 | ||
7157c2b5 | 3479 | #: diff.c:5379 |
d46c5519 JX |
3480 | msgid "<kind>" |
3481 | msgstr "<类型>" | |
3482 | ||
7157c2b5 | 3483 | #: diff.c:5380 |
d46c5519 JX |
3484 | msgid "" |
3485 | "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " | |
3486 | "diff" | |
3487 | msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" | |
3488 | ||
7157c2b5 | 3489 | #: diff.c:5383 |
d46c5519 JX |
3490 | msgid "" |
3491 | "do not munge pathnames and use NULs as output field terminators in --raw or " | |
3492 | "--numstat" | |
3493 | msgstr "" | |
3494 | "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" | |
3495 | "符" | |
3496 | ||
7157c2b5 | 3497 | #: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 |
d46c5519 JX |
3498 | msgid "<prefix>" |
3499 | msgstr "<前缀>" | |
3500 | ||
7157c2b5 | 3501 | #: diff.c:5387 |
d46c5519 JX |
3502 | msgid "show the given source prefix instead of \"a/\"" |
3503 | msgstr "显示给定的源前缀取代 \"a/\"" | |
3504 | ||
7157c2b5 | 3505 | #: diff.c:5390 |
d46c5519 JX |
3506 | msgid "show the given destination prefix instead of \"b/\"" |
3507 | msgstr "显示给定的目标前缀取代 \"b/\"" | |
3508 | ||
7157c2b5 | 3509 | #: diff.c:5393 |
d46c5519 JX |
3510 | msgid "prepend an additional prefix to every line of output" |
3511 | msgstr "输出的每一行附加前缀" | |
3512 | ||
7157c2b5 | 3513 | #: diff.c:5396 |
d46c5519 JX |
3514 | msgid "do not show any source or destination prefix" |
3515 | msgstr "不显示任何源和目标前缀" | |
3516 | ||
7157c2b5 | 3517 | #: diff.c:5399 |
d46c5519 JX |
3518 | msgid "show context between diff hunks up to the specified number of lines" |
3519 | msgstr "显示指定行数的差异块间的上下文" | |
3520 | ||
7157c2b5 | 3521 | #: diff.c:5403 diff.c:5408 diff.c:5413 |
d46c5519 JX |
3522 | msgid "<char>" |
3523 | msgstr "<字符>" | |
3524 | ||
7157c2b5 | 3525 | #: diff.c:5404 |
d46c5519 JX |
3526 | msgid "specify the character to indicate a new line instead of '+'" |
3527 | msgstr "指定一个字符取代 '+' 来表示新的一行" | |
3528 | ||
7157c2b5 | 3529 | #: diff.c:5409 |
d46c5519 JX |
3530 | msgid "specify the character to indicate an old line instead of '-'" |
3531 | msgstr "指定一个字符取代 '-' 来表示旧的一行" | |
3532 | ||
7157c2b5 | 3533 | #: diff.c:5414 |
d46c5519 JX |
3534 | msgid "specify the character to indicate a context instead of ' '" |
3535 | msgstr "指定一个字符取代 ' ' 来表示一行上下文" | |
3536 | ||
7157c2b5 | 3537 | #: diff.c:5417 |
d46c5519 JX |
3538 | msgid "Diff rename options" |
3539 | msgstr "差异重命名选项" | |
3540 | ||
7157c2b5 | 3541 | #: diff.c:5418 |
d46c5519 JX |
3542 | msgid "<n>[/<m>]" |
3543 | msgstr "<n>[/<m>]" | |
3544 | ||
7157c2b5 | 3545 | #: diff.c:5419 |
d46c5519 | 3546 | msgid "break complete rewrite changes into pairs of delete and create" |
5b533632 | 3547 | msgstr "将完全重写的变更打破为成对的删除和创建" |
d46c5519 | 3548 | |
7157c2b5 | 3549 | #: diff.c:5423 |
d46c5519 JX |
3550 | msgid "detect renames" |
3551 | msgstr "检测重命名" | |
3552 | ||
7157c2b5 | 3553 | #: diff.c:5427 |
d46c5519 JX |
3554 | msgid "omit the preimage for deletes" |
3555 | msgstr "省略删除操作的差异输出" | |
3556 | ||
7157c2b5 | 3557 | #: diff.c:5430 |
d46c5519 JX |
3558 | msgid "detect copies" |
3559 | msgstr "检测拷贝" | |
3560 | ||
7157c2b5 | 3561 | #: diff.c:5434 |
d46c5519 JX |
3562 | msgid "use unmodified files as source to find copies" |
3563 | msgstr "使用未修改的文件做为发现拷贝的源" | |
3564 | ||
7157c2b5 | 3565 | #: diff.c:5436 |
d46c5519 JX |
3566 | msgid "disable rename detection" |
3567 | msgstr "禁用重命名探测" | |
3568 | ||
7157c2b5 | 3569 | #: diff.c:5439 |
d46c5519 JX |
3570 | msgid "use empty blobs as rename source" |
3571 | msgstr "使用空的数据对象做为重命名的源" | |
3572 | ||
7157c2b5 | 3573 | #: diff.c:5441 |
d46c5519 JX |
3574 | msgid "continue listing the history of a file beyond renames" |
3575 | msgstr "继续列出文件重命名以外的历史记录" | |
3576 | ||
7157c2b5 | 3577 | #: diff.c:5444 |
d46c5519 JX |
3578 | msgid "" |
3579 | "prevent rename/copy detection if the number of rename/copy targets exceeds " | |
3580 | "given limit" | |
3581 | msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" | |
3582 | ||
7157c2b5 | 3583 | #: diff.c:5446 |
d46c5519 JX |
3584 | msgid "Diff algorithm options" |
3585 | msgstr "差异算法选项" | |
3586 | ||
7157c2b5 | 3587 | #: diff.c:5448 |
d46c5519 JX |
3588 | msgid "produce the smallest possible diff" |
3589 | msgstr "生成尽可能小的差异" | |
3590 | ||
7157c2b5 | 3591 | #: diff.c:5451 |
d46c5519 JX |
3592 | msgid "ignore whitespace when comparing lines" |
3593 | msgstr "行比较时忽略空白字符" | |
3594 | ||
7157c2b5 | 3595 | #: diff.c:5454 |
d46c5519 JX |
3596 | msgid "ignore changes in amount of whitespace" |
3597 | msgstr "忽略空白字符的变更" | |
3598 | ||
7157c2b5 | 3599 | #: diff.c:5457 |
d46c5519 JX |
3600 | msgid "ignore changes in whitespace at EOL" |
3601 | msgstr "忽略行尾的空白字符变更" | |
3602 | ||
7157c2b5 | 3603 | #: diff.c:5460 |
d46c5519 JX |
3604 | msgid "ignore carrier-return at the end of line" |
3605 | msgstr "忽略行尾的回车符(CR)" | |
3606 | ||
7157c2b5 | 3607 | #: diff.c:5463 |
d46c5519 JX |
3608 | msgid "ignore changes whose lines are all blank" |
3609 | msgstr "忽略整行都是空白的变更" | |
3610 | ||
7157c2b5 | 3611 | #: diff.c:5466 |
d46c5519 JX |
3612 | msgid "heuristic to shift diff hunk boundaries for easy reading" |
3613 | msgstr "启发式转换差异边界以便阅读" | |
3614 | ||
7157c2b5 | 3615 | #: diff.c:5469 |
d46c5519 JX |
3616 | msgid "generate diff using the \"patience diff\" algorithm" |
3617 | msgstr "使用 \"patience diff\" 算法生成差异" | |
3618 | ||
7157c2b5 | 3619 | #: diff.c:5473 |
d46c5519 JX |
3620 | msgid "generate diff using the \"histogram diff\" algorithm" |
3621 | msgstr "使用 \"histogram diff\" 算法生成差异" | |
3622 | ||
7157c2b5 | 3623 | #: diff.c:5475 |
d46c5519 JX |
3624 | msgid "<algorithm>" |
3625 | msgstr "<算法>" | |
3626 | ||
7157c2b5 | 3627 | #: diff.c:5476 |
d46c5519 JX |
3628 | msgid "choose a diff algorithm" |
3629 | msgstr "选择一个差异算法" | |
3630 | ||
7157c2b5 | 3631 | #: diff.c:5478 |
d46c5519 JX |
3632 | msgid "<text>" |
3633 | msgstr "<文本>" | |
3634 | ||
7157c2b5 | 3635 | #: diff.c:5479 |
d46c5519 | 3636 | msgid "generate diff using the \"anchored diff\" algorithm" |
5b533632 | 3637 | msgstr "使用 \"anchored diff\" 算法生成差异" |
d46c5519 | 3638 | |
7157c2b5 | 3639 | #: diff.c:5481 diff.c:5490 diff.c:5493 |
d46c5519 JX |
3640 | msgid "<mode>" |
3641 | msgstr "<模式>" | |
3642 | ||
7157c2b5 | 3643 | #: diff.c:5482 |
d46c5519 JX |
3644 | msgid "show word diff, using <mode> to delimit changed words" |
3645 | msgstr "显示单词差异,使用 <模式> 分隔变更的单词" | |
3646 | ||
7157c2b5 | 3647 | #: diff.c:5484 diff.c:5487 diff.c:5532 |
d46c5519 JX |
3648 | msgid "<regex>" |
3649 | msgstr "<正则>" | |
3650 | ||
7157c2b5 | 3651 | #: diff.c:5485 |
d46c5519 JX |
3652 | msgid "use <regex> to decide what a word is" |
3653 | msgstr "使用 <正则表达式> 确定何为一个词" | |
3654 | ||
7157c2b5 | 3655 | #: diff.c:5488 |
d46c5519 JX |
3656 | msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" |
3657 | msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" | |
3658 | ||
7157c2b5 | 3659 | #: diff.c:5491 |
d46c5519 JX |
3660 | msgid "moved lines of code are colored differently" |
3661 | msgstr "移动的代码行用不同方式着色" | |
3662 | ||
7157c2b5 | 3663 | #: diff.c:5494 |
d46c5519 JX |
3664 | msgid "how white spaces are ignored in --color-moved" |
3665 | msgstr "在 --color-moved 下如何忽略空白字符" | |
3666 | ||
7157c2b5 | 3667 | #: diff.c:5497 |
d46c5519 JX |
3668 | msgid "Other diff options" |
3669 | msgstr "其它差异选项" | |
3670 | ||
7157c2b5 | 3671 | #: diff.c:5499 |
d46c5519 JX |
3672 | msgid "when run from subdir, exclude changes outside and show relative paths" |
3673 | msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" | |
3674 | ||
7157c2b5 | 3675 | #: diff.c:5503 |
d46c5519 JX |
3676 | msgid "treat all files as text" |
3677 | msgstr "把所有文件当做文本处理" | |
3678 | ||
7157c2b5 | 3679 | #: diff.c:5505 |
d46c5519 JX |
3680 | msgid "swap two inputs, reverse the diff" |
3681 | msgstr "交换两个输入,反转差异" | |
3682 | ||
7157c2b5 | 3683 | #: diff.c:5507 |
d46c5519 JX |
3684 | msgid "exit with 1 if there were differences, 0 otherwise" |
3685 | msgstr "有差异时退出码为 1,否则为 0" | |
3686 | ||
7157c2b5 | 3687 | #: diff.c:5509 |
d46c5519 JX |
3688 | msgid "disable all output of the program" |
3689 | msgstr "禁用本程序的所有输出" | |
3690 | ||
7157c2b5 | 3691 | #: diff.c:5511 |
d46c5519 JX |
3692 | msgid "allow an external diff helper to be executed" |
3693 | msgstr "允许执行一个外置的差异助手" | |
3694 | ||
7157c2b5 | 3695 | #: diff.c:5513 |
d46c5519 JX |
3696 | msgid "run external text conversion filters when comparing binary files" |
3697 | msgstr "当比较二进制文件时,运行外部的文本转换过滤器" | |
3698 | ||
7157c2b5 | 3699 | #: diff.c:5515 |
d46c5519 JX |
3700 | msgid "<when>" |
3701 | msgstr "<何时>" | |
3702 | ||
7157c2b5 | 3703 | #: diff.c:5516 |
d46c5519 JX |
3704 | msgid "ignore changes to submodules in the diff generation" |
3705 | msgstr "在生成差异时,忽略子模组的更改" | |
3706 | ||
7157c2b5 | 3707 | #: diff.c:5519 |
d46c5519 JX |
3708 | msgid "<format>" |
3709 | msgstr "<格式>" | |
3710 | ||
7157c2b5 | 3711 | #: diff.c:5520 |
d46c5519 JX |
3712 | msgid "specify how differences in submodules are shown" |
3713 | msgstr "指定子模组的差异如何显示" | |
3714 | ||
7157c2b5 | 3715 | #: diff.c:5524 |
d46c5519 JX |
3716 | msgid "hide 'git add -N' entries from the index" |
3717 | msgstr "隐藏索引中 'git add -N' 条目" | |
3718 | ||
7157c2b5 | 3719 | #: diff.c:5527 |
d46c5519 JX |
3720 | msgid "treat 'git add -N' entries as real in the index" |
3721 | msgstr "将索引中 'git add -N' 条目当做真实的" | |
3722 | ||
7157c2b5 | 3723 | #: diff.c:5529 |
d46c5519 JX |
3724 | msgid "<string>" |
3725 | msgstr "<字符串>" | |
3726 | ||
7157c2b5 | 3727 | #: diff.c:5530 |
d46c5519 JX |
3728 | msgid "" |
3729 | "look for differences that change the number of occurrences of the specified " | |
3730 | "string" | |
3731 | msgstr "查找改变了指定字符串出现次数的差异" | |
3732 | ||
7157c2b5 | 3733 | #: diff.c:5533 |
d46c5519 JX |
3734 | msgid "" |
3735 | "look for differences that change the number of occurrences of the specified " | |
3736 | "regex" | |
3737 | msgstr "查找改变指定正则匹配出现次数的差异" | |
3738 | ||
7157c2b5 | 3739 | #: diff.c:5536 |
d46c5519 JX |
3740 | msgid "show all changes in the changeset with -S or -G" |
3741 | msgstr "显示使用 -S 或 -G 的变更集的所有变更" | |
3742 | ||
7157c2b5 | 3743 | #: diff.c:5539 |
d46c5519 JX |
3744 | msgid "treat <string> in -S as extended POSIX regular expression" |
3745 | msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" | |
3746 | ||
7157c2b5 | 3747 | #: diff.c:5542 |
d46c5519 JX |
3748 | msgid "control the order in which files appear in the output" |
3749 | msgstr "控制输出中的文件显示顺序" | |
3750 | ||
7157c2b5 | 3751 | #: diff.c:5543 |
d46c5519 | 3752 | msgid "<object-id>" |
5b533632 | 3753 | msgstr "<对象 ID>" |
d46c5519 | 3754 | |
7157c2b5 | 3755 | #: diff.c:5544 |
d46c5519 JX |
3756 | msgid "" |
3757 | "look for differences that change the number of occurrences of the specified " | |
3758 | "object" | |
3759 | msgstr "查找改变指定对象出现次数的差异" | |
3760 | ||
7157c2b5 | 3761 | #: diff.c:5546 |
d46c5519 JX |
3762 | msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" |
3763 | msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" | |
3764 | ||
7157c2b5 | 3765 | #: diff.c:5547 |
d46c5519 JX |
3766 | msgid "select files by diff type" |
3767 | msgstr "通过差异类型选择文件" | |
3768 | ||
7157c2b5 | 3769 | #: diff.c:5549 |
d46c5519 JX |
3770 | msgid "<file>" |
3771 | msgstr "<文件>" | |
3772 | ||
7157c2b5 | 3773 | #: diff.c:5550 |
d46c5519 JX |
3774 | msgid "Output to a specific file" |
3775 | msgstr "输出到一个指定的文件" | |
3776 | ||
7157c2b5 | 3777 | #: diff.c:6205 |
a0b6b246 JX |
3778 | msgid "inexact rename detection was skipped due to too many files." |
3779 | msgstr "因为文件太多,略过不严格的重命名检查。" | |
3780 | ||
7157c2b5 | 3781 | #: diff.c:6208 |
a0b6b246 JX |
3782 | msgid "only found copies from modified paths due to too many files." |
3783 | msgstr "因为文件太多,只在修改的路径中查找拷贝。" | |
3784 | ||
7157c2b5 | 3785 | #: diff.c:6211 |
7aea43ff | 3786 | #, c-format |
a0b6b246 JX |
3787 | msgid "" |
3788 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 3789 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 3790 | |
349ede6a JX |
3791 | #: diffcore-order.c:24 |
3792 | #, c-format | |
3793 | msgid "failed to read orderfile '%s'" | |
3794 | msgstr "读取排序文件 '%s' 失败" | |
3795 | ||
3796 | #: diffcore-rename.c:592 | |
3797 | msgid "Performing inexact rename detection" | |
3798 | msgstr "正在进行非精确的重命名探测" | |
3799 | ||
7157c2b5 | 3800 | #: dir.c:573 |
c1ac5258 JX |
3801 | #, c-format |
3802 | msgid "pathspec '%s' did not match any file(s) known to git" | |
3803 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
3804 | ||
7157c2b5 | 3805 | #: dir.c:713 dir.c:742 dir.c:755 |
ddc12c42 JX |
3806 | #, c-format |
3807 | msgid "unrecognized pattern: '%s'" | |
3808 | msgstr "未识别的模式:'%s'" | |
3809 | ||
7157c2b5 | 3810 | #: dir.c:772 dir.c:786 |
ddc12c42 JX |
3811 | #, c-format |
3812 | msgid "unrecognized negative pattern: '%s'" | |
3813 | msgstr "未识别的反向模式:'%s'" | |
3814 | ||
7157c2b5 | 3815 | #: dir.c:804 |
ddc12c42 JX |
3816 | #, c-format |
3817 | msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" | |
3818 | msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'" | |
3819 | ||
7157c2b5 | 3820 | #: dir.c:814 |
ddc12c42 JX |
3821 | msgid "disabling cone pattern matching" |
3822 | msgstr "禁止 cone 模式匹配" | |
3823 | ||
7157c2b5 | 3824 | #: dir.c:1191 |
c1ac5258 JX |
3825 | #, c-format |
3826 | msgid "cannot use %s as an exclude file" | |
3827 | msgstr "不能将 %s 用作排除文件" | |
3828 | ||
7157c2b5 | 3829 | #: dir.c:2296 |
31e5e17b JX |
3830 | #, c-format |
3831 | msgid "could not open directory '%s'" | |
3832 | msgstr "不能打开目录 '%s'" | |
3833 | ||
7157c2b5 | 3834 | #: dir.c:2596 |
a0b6b246 JX |
3835 | msgid "failed to get kernel name and information" |
3836 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 3837 | |
7157c2b5 | 3838 | #: dir.c:2720 |
c1ac5258 JX |
3839 | msgid "untracked cache is disabled on this system or location" |
3840 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
3841 | ||
7157c2b5 | 3842 | #: dir.c:3502 |
c1ac5258 JX |
3843 | #, c-format |
3844 | msgid "index file corrupt in repo %s" | |
3845 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 3846 | |
7157c2b5 | 3847 | #: dir.c:3547 dir.c:3552 |
87cb7997 JX |
3848 | #, c-format |
3849 | msgid "could not create directories for %s" | |
3850 | msgstr "不能为 %s 创建目录" | |
3851 | ||
7157c2b5 | 3852 | #: dir.c:3581 |
1a79b2f1 JX |
3853 | #, c-format |
3854 | msgid "could not migrate git directory from '%s' to '%s'" | |
3855 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
3856 | ||
349ede6a | 3857 | #: editor.c:74 |
5809aa05 JX |
3858 | #, c-format |
3859 | msgid "hint: Waiting for your editor to close the file...%c" | |
3860 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
3861 | ||
7157c2b5 | 3862 | #: entry.c:177 |
6937cb4e JX |
3863 | msgid "Filtering content" |
3864 | msgstr "过滤内容" | |
3865 | ||
7157c2b5 | 3866 | #: entry.c:478 |
87cb7997 JX |
3867 | #, c-format |
3868 | msgid "could not stat file '%s'" | |
65e2041e | 3869 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 3870 | |
349ede6a | 3871 | #: environment.c:150 |
c1ac5258 JX |
3872 | #, c-format |
3873 | msgid "bad git namespace path \"%s\"" | |
e640d114 | 3874 | msgstr "错误的 git 名字空间路径 \"%s\"" |
c1ac5258 | 3875 | |
349ede6a | 3876 | #: environment.c:337 |
c1ac5258 JX |
3877 | #, c-format |
3878 | msgid "could not set GIT_DIR to '%s'" | |
3879 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
3880 | ||
d46c5519 | 3881 | #: exec-cmd.c:363 |
c1ac5258 JX |
3882 | #, c-format |
3883 | msgid "too many args to run %s" | |
3884 | msgstr "执行 %s 的参数太多" | |
3885 | ||
7157c2b5 | 3886 | #: fetch-pack.c:152 |
a0b6b246 JX |
3887 | msgid "git fetch-pack: expected shallow list" |
3888 | msgstr "git fetch-pack:应为 shallow 列表" | |
3889 | ||
7157c2b5 | 3890 | #: fetch-pack.c:155 |
06991777 JX |
3891 | msgid "git fetch-pack: expected a flush packet after shallow list" |
3892 | msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包" | |
3893 | ||
7157c2b5 | 3894 | #: fetch-pack.c:166 |
31e5e17b JX |
3895 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
3896 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 3897 | |
7157c2b5 | 3898 | #: fetch-pack.c:186 |
90314792 | 3899 | #, c-format |
275588f9 | 3900 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 3901 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 3902 | |
7157c2b5 | 3903 | #: fetch-pack.c:197 |
d46c5519 JX |
3904 | msgid "unable to write to remote" |
3905 | msgstr "无法写到远程" | |
3906 | ||
7157c2b5 | 3907 | #: fetch-pack.c:259 |
a0b6b246 JX |
3908 | msgid "--stateless-rpc requires multi_ack_detailed" |
3909 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 3910 | |
7157c2b5 | 3911 | #: fetch-pack.c:358 fetch-pack.c:1408 |
90314792 | 3912 | #, c-format |
a0b6b246 JX |
3913 | msgid "invalid shallow line: %s" |
3914 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 3915 | |
7157c2b5 | 3916 | #: fetch-pack.c:364 fetch-pack.c:1414 |
c04f5ac3 | 3917 | #, c-format |
a0b6b246 JX |
3918 | msgid "invalid unshallow line: %s" |
3919 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 3920 | |
7157c2b5 | 3921 | #: fetch-pack.c:366 fetch-pack.c:1416 |
a0b6b246 JX |
3922 | #, c-format |
3923 | msgid "object not found: %s" | |
3924 | msgstr "对象未找到:%s" | |
07432cef | 3925 | |
7157c2b5 | 3926 | #: fetch-pack.c:369 fetch-pack.c:1419 |
c04f5ac3 | 3927 | #, c-format |
a0b6b246 JX |
3928 | msgid "error in object: %s" |
3929 | msgstr "对象中出错:%s" | |
07432cef | 3930 | |
7157c2b5 | 3931 | #: fetch-pack.c:371 fetch-pack.c:1421 |
c04f5ac3 | 3932 | #, c-format |
a0b6b246 JX |
3933 | msgid "no shallow found: %s" |
3934 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 3935 | |
7157c2b5 | 3936 | #: fetch-pack.c:374 fetch-pack.c:1425 |
a0b6b246 JX |
3937 | #, c-format |
3938 | msgid "expected shallow/unshallow, got %s" | |
3939 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 3940 | |
7157c2b5 | 3941 | #: fetch-pack.c:416 |
a0b6b246 JX |
3942 | #, c-format |
3943 | msgid "got %s %d %s" | |
3944 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 3945 | |
7157c2b5 | 3946 | #: fetch-pack.c:433 |
1b7f4a34 | 3947 | #, c-format |
a0b6b246 JX |
3948 | msgid "invalid commit %s" |
3949 | msgstr "无效提交 %s" | |
1b7f4a34 | 3950 | |
7157c2b5 | 3951 | #: fetch-pack.c:464 |
a0b6b246 JX |
3952 | msgid "giving up" |
3953 | msgstr "放弃" | |
814ff314 | 3954 | |
7157c2b5 | 3955 | #: fetch-pack.c:477 progress.c:336 |
a0b6b246 JX |
3956 | msgid "done" |
3957 | msgstr "完成" | |
2e8451e8 | 3958 | |
7157c2b5 | 3959 | #: fetch-pack.c:489 |
2e8451e8 | 3960 | #, c-format |
a0b6b246 JX |
3961 | msgid "got %s (%d) %s" |
3962 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 3963 | |
7157c2b5 | 3964 | #: fetch-pack.c:535 |
a0b6b246 JX |
3965 | #, c-format |
3966 | msgid "Marking %s as complete" | |
3967 | msgstr "标记 %s 为完成" | |
220c313c | 3968 | |
7157c2b5 | 3969 | #: fetch-pack.c:756 |
a0b6b246 JX |
3970 | #, c-format |
3971 | msgid "already have %s (%s)" | |
29004bbb | 3972 | msgstr "已经有 %s(%s)" |
220c313c | 3973 | |
7157c2b5 | 3974 | #: fetch-pack.c:821 |
a0b6b246 JX |
3975 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
3976 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 3977 | |
7157c2b5 | 3978 | #: fetch-pack.c:829 |
a0b6b246 JX |
3979 | msgid "protocol error: bad pack header" |
3980 | msgstr "协议错误:坏的包头" | |
814ff314 | 3981 | |
7157c2b5 | 3982 | #: fetch-pack.c:910 |
a0b6b246 JX |
3983 | #, c-format |
3984 | msgid "fetch-pack: unable to fork off %s" | |
3985 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 3986 | |
7157c2b5 | 3987 | #: fetch-pack.c:927 |
a0b6b246 JX |
3988 | #, c-format |
3989 | msgid "%s failed" | |
3990 | msgstr "%s 失败" | |
14c8bced | 3991 | |
7157c2b5 | 3992 | #: fetch-pack.c:929 |
a0b6b246 JX |
3993 | msgid "error in sideband demultiplexer" |
3994 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 3995 | |
7157c2b5 | 3996 | #: fetch-pack.c:976 |
81809b99 | 3997 | #, c-format |
a0b6b246 JX |
3998 | msgid "Server version is %.*s" |
3999 | msgstr "服务器版本 %.*s" | |
8ada9598 | 4000 | |
7157c2b5 JX |
4001 | #: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 |
4002 | #: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 | |
4003 | #: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 | |
4004 | #: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 | |
a6cd2cc4 JX |
4005 | #, c-format |
4006 | msgid "Server supports %s" | |
4007 | msgstr "服务器支持 %s" | |
4008 | ||
7157c2b5 | 4009 | #: fetch-pack.c:983 |
a6cd2cc4 JX |
4010 | msgid "Server does not support shallow clients" |
4011 | msgstr "服务器不支持 shalllow 客户端" | |
4012 | ||
7157c2b5 | 4013 | #: fetch-pack.c:1043 |
a0b6b246 JX |
4014 | msgid "Server does not support --shallow-since" |
4015 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 4016 | |
7157c2b5 | 4017 | #: fetch-pack.c:1048 |
a0b6b246 JX |
4018 | msgid "Server does not support --shallow-exclude" |
4019 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 4020 | |
7157c2b5 | 4021 | #: fetch-pack.c:1052 |
a0b6b246 JX |
4022 | msgid "Server does not support --deepen" |
4023 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 4024 | |
7157c2b5 JX |
4025 | #: fetch-pack.c:1054 |
4026 | msgid "Server does not support this repository's object format" | |
4027 | msgstr "服务器不支持这个仓库的对象格式" | |
4028 | ||
4029 | #: fetch-pack.c:1071 | |
a0b6b246 JX |
4030 | msgid "no common commits" |
4031 | msgstr "没有共同的提交" | |
c04f5ac3 | 4032 | |
7157c2b5 | 4033 | #: fetch-pack.c:1083 fetch-pack.c:1639 |
a0b6b246 JX |
4034 | msgid "git fetch-pack: fetch failed." |
4035 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 4036 | |
349ede6a | 4037 | #: fetch-pack.c:1211 |
7157c2b5 JX |
4038 | #, c-format |
4039 | msgid "mismatched algorithms: client %s; server %s" | |
4040 | msgstr "不匹配的算法:客户端 %s,服务端 %s" | |
4041 | ||
4042 | #: fetch-pack.c:1215 | |
4043 | #, c-format | |
4044 | msgid "the server does not support algorithm '%s'" | |
4045 | msgstr "服务器不支持算法 '%s'" | |
4046 | ||
4047 | #: fetch-pack.c:1235 | |
fd8cb379 JX |
4048 | msgid "Server does not support shallow requests" |
4049 | msgstr "服务器不支持 shalllow 请求" | |
4050 | ||
7157c2b5 | 4051 | #: fetch-pack.c:1242 |
a6cd2cc4 JX |
4052 | msgid "Server supports filter" |
4053 | msgstr "服务器支持 filter" | |
4054 | ||
7157c2b5 | 4055 | #: fetch-pack.c:1286 |
d46c5519 JX |
4056 | msgid "unable to write request to remote" |
4057 | msgstr "无法将请求写到远程" | |
4058 | ||
7157c2b5 | 4059 | #: fetch-pack.c:1304 |
c1ac5258 JX |
4060 | #, c-format |
4061 | msgid "error reading section header '%s'" | |
4062 | msgstr "读取节标题 '%s' 出错" | |
4063 | ||
7157c2b5 | 4064 | #: fetch-pack.c:1310 |
c1ac5258 JX |
4065 | #, c-format |
4066 | msgid "expected '%s', received '%s'" | |
4067 | msgstr "预期 '%s',得到 '%s'" | |
4068 | ||
7157c2b5 | 4069 | #: fetch-pack.c:1371 |
c1ac5258 JX |
4070 | #, c-format |
4071 | msgid "unexpected acknowledgment line: '%s'" | |
4072 | msgstr "意外的确认行:'%s'" | |
4073 | ||
7157c2b5 | 4074 | #: fetch-pack.c:1376 |
c1ac5258 JX |
4075 | #, c-format |
4076 | msgid "error processing acks: %d" | |
4077 | msgstr "处理 ack 出错:%d" | |
4078 | ||
7157c2b5 | 4079 | #: fetch-pack.c:1386 |
4c27fcb5 JX |
4080 | msgid "expected packfile to be sent after 'ready'" |
4081 | msgstr "预期在 'ready' 之后发送 packfile" | |
4082 | ||
7157c2b5 | 4083 | #: fetch-pack.c:1388 |
4c27fcb5 JX |
4084 | msgid "expected no other sections to be sent after no 'ready'" |
4085 | msgstr "在没有 'ready' 不应该发送其它小节" | |
4086 | ||
7157c2b5 | 4087 | #: fetch-pack.c:1430 |
c1ac5258 JX |
4088 | #, c-format |
4089 | msgid "error processing shallow info: %d" | |
4090 | msgstr "处理浅克隆信息出错:%d" | |
4091 | ||
7157c2b5 | 4092 | #: fetch-pack.c:1477 |
c1ac5258 JX |
4093 | #, c-format |
4094 | msgid "expected wanted-ref, got '%s'" | |
4095 | msgstr "预期 wanted-ref,得到 '%s'" | |
4096 | ||
7157c2b5 | 4097 | #: fetch-pack.c:1482 |
c1ac5258 JX |
4098 | #, c-format |
4099 | msgid "unexpected wanted-ref: '%s'" | |
4100 | msgstr "意外的 wanted-ref:'%s'" | |
4101 | ||
7157c2b5 | 4102 | #: fetch-pack.c:1487 |
c1ac5258 JX |
4103 | #, c-format |
4104 | msgid "error processing wanted refs: %d" | |
4105 | msgstr "处理要获取的引用出错:%d" | |
4106 | ||
7157c2b5 JX |
4107 | #: fetch-pack.c:1517 |
4108 | msgid "git fetch-pack: expected response end packet" | |
4109 | msgstr "git fetch-pack:预期响应结束包" | |
4110 | ||
4111 | #: fetch-pack.c:1921 | |
a0b6b246 JX |
4112 | msgid "no matching remote head" |
4113 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 4114 | |
7157c2b5 | 4115 | #: fetch-pack.c:1944 builtin/clone.c:692 |
c1ac5258 | 4116 | msgid "remote did not send all necessary objects" |
e640d114 | 4117 | msgstr "远程没有发送所有必需的对象" |
c1ac5258 | 4118 | |
7157c2b5 | 4119 | #: fetch-pack.c:1971 |
87cb7997 JX |
4120 | #, c-format |
4121 | msgid "no such remote ref %s" | |
4122 | msgstr "没有这样的远程引用 %s" | |
4123 | ||
7157c2b5 | 4124 | #: fetch-pack.c:1974 |
87cb7997 JX |
4125 | #, c-format |
4126 | msgid "Server does not allow request for unadvertised object %s" | |
4127 | msgstr "服务器不允许请求未公开的对象 %s" | |
4128 | ||
349ede6a | 4129 | #: gpg-interface.c:272 |
a0b6b246 JX |
4130 | msgid "could not create temporary file" |
4131 | msgstr "不能创建临时文件" | |
c04f5ac3 | 4132 | |
349ede6a | 4133 | #: gpg-interface.c:275 |
c04f5ac3 | 4134 | #, c-format |
a0b6b246 JX |
4135 | msgid "failed writing detached signature to '%s'" |
4136 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 4137 | |
349ede6a JX |
4138 | #: gpg-interface.c:457 |
4139 | msgid "gpg failed to sign the data" | |
4140 | msgstr "gpg 数据签名失败" | |
4141 | ||
ddc12c42 | 4142 | #: graph.c:98 |
1a79b2f1 JX |
4143 | #, c-format |
4144 | msgid "ignore invalid color '%.*s' in log.graphColors" | |
4145 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" | |
4146 | ||
a5cd71ca JX |
4147 | #: grep.c:668 |
4148 | msgid "" | |
4149 | "given pattern contains NULL byte (via -f <file>). This is only supported " | |
4150 | "with -P under PCRE v2" | |
4151 | msgstr "" | |
ddc12c42 JX |
4152 | "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此" |
4153 | "功能" | |
a5cd71ca | 4154 | |
2b472aae | 4155 | #: grep.c:2128 |
c04f5ac3 | 4156 | #, c-format |
a0b6b246 JX |
4157 | msgid "'%s': unable to read %s" |
4158 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 4159 | |
7157c2b5 | 4160 | #: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 |
06991777 | 4161 | #: builtin/rm.c:135 |
c04f5ac3 | 4162 | #, c-format |
a0b6b246 | 4163 | msgid "failed to stat '%s'" |
65e2041e | 4164 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 4165 | |
2b472aae | 4166 | #: grep.c:2156 |
a0b6b246 JX |
4167 | #, c-format |
4168 | msgid "'%s': short read" | |
4169 | msgstr "'%s':读取不完整" | |
5c57d762 | 4170 | |
fd8cb379 JX |
4171 | #: help.c:23 |
4172 | msgid "start a working area (see also: git help tutorial)" | |
4173 | msgstr "开始一个工作区(参见:git help tutorial)" | |
4174 | ||
4175 | #: help.c:24 | |
4176 | msgid "work on the current change (see also: git help everyday)" | |
4177 | msgstr "在当前变更上工作(参见:git help everyday)" | |
4178 | ||
4179 | #: help.c:25 | |
4180 | msgid "examine the history and state (see also: git help revisions)" | |
4181 | msgstr "检查历史和状态(参见:git help revisions)" | |
4182 | ||
4183 | #: help.c:26 | |
4184 | msgid "grow, mark and tweak your common history" | |
4185 | msgstr "扩展、标记和调校您的历史记录" | |
4186 | ||
4187 | #: help.c:27 | |
4188 | msgid "collaborate (see also: git help workflows)" | |
4189 | msgstr "协同(参见:git help workflows)" | |
4190 | ||
4191 | #: help.c:31 | |
4192 | msgid "Main Porcelain Commands" | |
4193 | msgstr "主要的上层命令" | |
4194 | ||
4195 | #: help.c:32 | |
4196 | msgid "Ancillary Commands / Manipulators" | |
4197 | msgstr "辅助命令/操作者" | |
4198 | ||
4199 | #: help.c:33 | |
4200 | msgid "Ancillary Commands / Interrogators" | |
4201 | msgstr "辅助命令/询问者" | |
4202 | ||
4203 | #: help.c:34 | |
4204 | msgid "Interacting with Others" | |
4205 | msgstr "与其它系统交互" | |
4206 | ||
4207 | #: help.c:35 | |
4208 | msgid "Low-level Commands / Manipulators" | |
4209 | msgstr "低级命令/操作者" | |
4210 | ||
4211 | #: help.c:36 | |
4212 | msgid "Low-level Commands / Interrogators" | |
4213 | msgstr "低级命令/询问者" | |
4214 | ||
4215 | #: help.c:37 | |
ddc12c42 | 4216 | msgid "Low-level Commands / Syncing Repositories" |
fd8cb379 JX |
4217 | msgstr "低级命令/同步仓库" |
4218 | ||
4219 | #: help.c:38 | |
4220 | msgid "Low-level Commands / Internal Helpers" | |
4221 | msgstr "低级命令/内部助手" | |
4222 | ||
06991777 | 4223 | #: help.c:298 |
a0b6b246 JX |
4224 | #, c-format |
4225 | msgid "available git commands in '%s'" | |
4226 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 4227 | |
06991777 | 4228 | #: help.c:305 |
a0b6b246 JX |
4229 | msgid "git commands available from elsewhere on your $PATH" |
4230 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 4231 | |
06991777 | 4232 | #: help.c:314 |
a0b6b246 JX |
4233 | msgid "These are common Git commands used in various situations:" |
4234 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 4235 | |
349ede6a | 4236 | #: help.c:363 git.c:99 |
fd8cb379 JX |
4237 | #, c-format |
4238 | msgid "unsupported command listing type '%s'" | |
4239 | msgstr "不支持的命令列表类型 '%s'" | |
4240 | ||
d46c5519 | 4241 | #: help.c:403 |
fd8cb379 JX |
4242 | msgid "The common Git guides are:" |
4243 | msgstr "最常用的 Git 向导有:" | |
4244 | ||
349ede6a | 4245 | #: help.c:427 |
4c27fcb5 JX |
4246 | msgid "See 'git help <command>' to read about a specific subcommand" |
4247 | msgstr "执行 'git help <command>' 来查看特定子命令" | |
4248 | ||
349ede6a | 4249 | #: help.c:432 |
4c27fcb5 JX |
4250 | msgid "External commands" |
4251 | msgstr "外部命令" | |
4252 | ||
349ede6a | 4253 | #: help.c:447 |
4c27fcb5 JX |
4254 | msgid "Command aliases" |
4255 | msgstr "命令别名" | |
4256 | ||
349ede6a | 4257 | #: help.c:511 |
c04f5ac3 | 4258 | #, c-format |
a0b6b246 JX |
4259 | msgid "" |
4260 | "'%s' appears to be a git command, but we were not\n" | |
4261 | "able to execute it. Maybe git-%s is broken?" | |
4262 | msgstr "" | |
4263 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
4264 | "可能是 git-%s 受损?" | |
c04f5ac3 | 4265 | |
349ede6a | 4266 | #: help.c:570 |
a0b6b246 JX |
4267 | msgid "Uh oh. Your system reports no Git commands at all." |
4268 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 4269 | |
349ede6a | 4270 | #: help.c:592 |
c04f5ac3 | 4271 | #, c-format |
a4f16749 | 4272 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 4273 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 4274 | |
349ede6a | 4275 | #: help.c:597 |
a4f16749 JX |
4276 | #, c-format |
4277 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 4278 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 4279 | |
349ede6a | 4280 | #: help.c:602 |
c04f5ac3 | 4281 | #, c-format |
a4f16749 | 4282 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 4283 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 4284 | |
349ede6a | 4285 | #: help.c:610 |
c04f5ac3 | 4286 | #, c-format |
a0b6b246 JX |
4287 | msgid "git: '%s' is not a git command. See 'git --help'." |
4288 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
c04f5ac3 | 4289 | |
349ede6a | 4290 | #: help.c:614 |
a4f16749 JX |
4291 | msgid "" |
4292 | "\n" | |
4293 | "The most similar command is" | |
4294 | msgid_plural "" | |
4295 | "\n" | |
4296 | "The most similar commands are" | |
6937cb4e JX |
4297 | msgstr[0] "" |
4298 | "\n" | |
4299 | "最相似的命令是" | |
4300 | msgstr[1] "" | |
4301 | "\n" | |
4302 | "最相似的命令是" | |
a4f16749 | 4303 | |
7157c2b5 | 4304 | #: help.c:654 |
a4f16749 JX |
4305 | msgid "git version [<options>]" |
4306 | msgstr "git version [<选项>]" | |
4307 | ||
7157c2b5 | 4308 | #: help.c:709 |
a4f16749 JX |
4309 | #, c-format |
4310 | msgid "%s: %s - %s" | |
4311 | msgstr "%s:%s - %s" | |
4312 | ||
7157c2b5 | 4313 | #: help.c:713 |
a0b6b246 JX |
4314 | msgid "" |
4315 | "\n" | |
4316 | "Did you mean this?" | |
4317 | msgid_plural "" | |
4318 | "\n" | |
4319 | "Did you mean one of these?" | |
4320 | msgstr[0] "" | |
4321 | "\n" | |
4322 | "您指的是这个么?" | |
4323 | msgstr[1] "" | |
4324 | "\n" | |
4325 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 4326 | |
d46c5519 | 4327 | #: ident.c:349 |
a0b6b246 JX |
4328 | msgid "" |
4329 | "\n" | |
4330 | "*** Please tell me who you are.\n" | |
4331 | "\n" | |
4332 | "Run\n" | |
4333 | "\n" | |
4334 | " git config --global user.email \"you@example.com\"\n" | |
4335 | " git config --global user.name \"Your Name\"\n" | |
4336 | "\n" | |
4337 | "to set your account's default identity.\n" | |
4338 | "Omit --global to set the identity only in this repository.\n" | |
4339 | "\n" | |
4340 | msgstr "" | |
4341 | "\n" | |
4342 | "*** 请告诉我你是谁。\n" | |
4343 | "\n" | |
4344 | "运行\n" | |
4345 | "\n" | |
4346 | " git config --global user.email \"you@example.com\"\n" | |
4347 | " git config --global user.name \"Your Name\"\n" | |
4348 | "\n" | |
4349 | "来设置您账号的缺省身份标识。\n" | |
4350 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 4351 | |
d46c5519 | 4352 | #: ident.c:379 |
87cb7997 | 4353 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 4354 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 4355 | |
d46c5519 | 4356 | #: ident.c:384 |
87cb7997 JX |
4357 | #, c-format |
4358 | msgid "unable to auto-detect email address (got '%s')" | |
4359 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
4360 | ||
d46c5519 | 4361 | #: ident.c:401 |
87cb7997 JX |
4362 | msgid "no name was given and auto-detection is disabled" |
4363 | msgstr "未提供姓名且自动探测被禁用" | |
4364 | ||
d46c5519 | 4365 | #: ident.c:407 |
87cb7997 JX |
4366 | #, c-format |
4367 | msgid "unable to auto-detect name (got '%s')" | |
4368 | msgstr "无法自动探测姓名(得到 '%s')" | |
4369 | ||
d46c5519 | 4370 | #: ident.c:415 |
87cb7997 JX |
4371 | #, c-format |
4372 | msgid "empty ident name (for <%s>) not allowed" | |
4373 | msgstr "不允许空的姓名(对于 <%s>)" | |
4374 | ||
d46c5519 | 4375 | #: ident.c:421 |
87cb7997 JX |
4376 | #, c-format |
4377 | msgid "name consists only of disallowed characters: %s" | |
4378 | msgstr "姓名中仅包含禁用字符:%s" | |
4379 | ||
349ede6a | 4380 | #: ident.c:436 builtin/commit.c:634 |
87cb7997 JX |
4381 | #, c-format |
4382 | msgid "invalid date format: %s" | |
4383 | msgstr "无效的日期格式:%s" | |
4384 | ||
4c27fcb5 | 4385 | #: list-objects-filter-options.c:58 |
06991777 JX |
4386 | msgid "expected 'tree:<depth>'" |
4387 | msgstr "期望 'tree:<深度>'" | |
4c27fcb5 | 4388 | |
a5cd71ca | 4389 | #: list-objects-filter-options.c:73 |
d46c5519 JX |
4390 | msgid "sparse:path filters support has been dropped" |
4391 | msgstr "sparse:path 过滤器支持已被删除" | |
4392 | ||
a5cd71ca | 4393 | #: list-objects-filter-options.c:86 |
a6cd2cc4 JX |
4394 | #, c-format |
4395 | msgid "invalid filter-spec '%s'" | |
4396 | msgstr "无效的过滤器表达式 '%s'" | |
4397 | ||
a5cd71ca JX |
4398 | #: list-objects-filter-options.c:102 |
4399 | #, c-format | |
4400 | msgid "must escape char in sub-filter-spec: '%c'" | |
4401 | msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'" | |
4402 | ||
4403 | #: list-objects-filter-options.c:144 | |
4404 | msgid "expected something after combine:" | |
4405 | msgstr "期望在组合后有一些东西:" | |
4406 | ||
4407 | #: list-objects-filter-options.c:226 | |
4408 | msgid "multiple filter-specs cannot be combined" | |
4409 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 4410 | |
7157c2b5 JX |
4411 | #: list-objects-filter-options.c:330 |
4412 | msgid "unable to upgrade repository format to support partial clone" | |
4413 | msgstr "无法升级仓库格式以支持部分克隆" | |
4414 | ||
349ede6a JX |
4415 | #: list-objects-filter.c:492 |
4416 | #, c-format | |
4417 | msgid "unable to access sparse blob in '%s'" | |
4418 | msgstr "不能访问 '%s' 中的稀疏数据对象" | |
4419 | ||
4420 | #: list-objects-filter.c:495 | |
4421 | #, c-format | |
4422 | msgid "unable to parse sparse filter data in %s" | |
4423 | msgstr "无法解析 %s 中的稀疏过滤器数据" | |
4424 | ||
4425 | #: list-objects.c:127 | |
4426 | #, c-format | |
4427 | msgid "entry '%s' in tree %s has tree mode, but is not a tree" | |
4428 | msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象" | |
4429 | ||
4430 | #: list-objects.c:140 | |
4431 | #, c-format | |
4432 | msgid "entry '%s' in tree %s has blob mode, but is not a blob" | |
4433 | msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象" | |
4434 | ||
4435 | #: list-objects.c:375 | |
4436 | #, c-format | |
4437 | msgid "unable to load root tree for commit %s" | |
4438 | msgstr "无法为提交 %s 加载根树" | |
4439 | ||
4440 | #: lockfile.c:152 | |
c04f5ac3 | 4441 | #, c-format |
a0b6b246 JX |
4442 | msgid "" |
4443 | "Unable to create '%s.lock': %s.\n" | |
4444 | "\n" | |
4445 | "Another git process seems to be running in this repository, e.g.\n" | |
4446 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
4447 | "are terminated then try again. If it still fails, a git process\n" | |
4448 | "may have crashed in this repository earlier:\n" | |
4449 | "remove the file manually to continue." | |
4450 | msgstr "" | |
4451 | "无法创建 '%s.lock':%s。\n" | |
4452 | "\n" | |
4453 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
4454 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
4455 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
4456 | "手动删除这个文件再继续。" | |
c04f5ac3 | 4457 | |
349ede6a | 4458 | #: lockfile.c:160 |
a0b6b246 JX |
4459 | #, c-format |
4460 | msgid "Unable to create '%s.lock': %s" | |
4461 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 4462 | |
349ede6a JX |
4463 | #: ls-refs.c:109 |
4464 | msgid "expected flush after ls-refs arguments" | |
4465 | msgstr "在 ls-refs 参数后应该有一个 flush 包" | |
c04f5ac3 | 4466 | |
2b472aae | 4467 | #: merge-recursive.c:356 |
a0b6b246 JX |
4468 | msgid "(bad commit)\n" |
4469 | msgstr "(坏提交)\n" | |
c04f5ac3 | 4470 | |
2b472aae | 4471 | #: merge-recursive.c:379 |
a0b6b246 | 4472 | #, c-format |
fd8cb379 | 4473 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 4474 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 4475 | |
2b472aae | 4476 | #: merge-recursive.c:388 |
fd8cb379 JX |
4477 | #, c-format |
4478 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 4479 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 4480 | |
2b472aae | 4481 | #: merge-recursive.c:874 |
c04f5ac3 | 4482 | #, c-format |
a0b6b246 | 4483 | msgid "failed to create path '%s'%s" |
c1ac5258 | 4484 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 4485 | |
2b472aae | 4486 | #: merge-recursive.c:885 |
c04f5ac3 | 4487 | #, c-format |
a0b6b246 JX |
4488 | msgid "Removing %s to make room for subdirectory\n" |
4489 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 4490 | |
2b472aae | 4491 | #: merge-recursive.c:899 merge-recursive.c:918 |
a0b6b246 JX |
4492 | msgid ": perhaps a D/F conflict?" |
4493 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 4494 | |
2b472aae | 4495 | #: merge-recursive.c:908 |
c04f5ac3 | 4496 | #, c-format |
a0b6b246 JX |
4497 | msgid "refusing to lose untracked file at '%s'" |
4498 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 4499 | |
2b472aae | 4500 | #: merge-recursive.c:949 builtin/cat-file.c:41 |
c04f5ac3 | 4501 | #, c-format |
a0b6b246 JX |
4502 | msgid "cannot read object %s '%s'" |
4503 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 4504 | |
2b472aae | 4505 | #: merge-recursive.c:954 |
4dcdc3d8 | 4506 | #, c-format |
a0b6b246 JX |
4507 | msgid "blob expected for %s '%s'" |
4508 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 4509 | |
2b472aae | 4510 | #: merge-recursive.c:979 |
4dcdc3d8 | 4511 | #, c-format |
a0b6b246 | 4512 | msgid "failed to open '%s': %s" |
c1ac5258 | 4513 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 4514 | |
2b472aae | 4515 | #: merge-recursive.c:990 |
a0b6b246 JX |
4516 | #, c-format |
4517 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 4518 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 4519 | |
2b472aae | 4520 | #: merge-recursive.c:995 |
5c57d762 | 4521 | #, c-format |
a0b6b246 JX |
4522 | msgid "do not know what to do with %06o %s '%s'" |
4523 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 4524 | |
2b472aae | 4525 | #: merge-recursive.c:1191 |
fd8cb379 JX |
4526 | #, c-format |
4527 | msgid "Failed to merge submodule %s (not checked out)" | |
4528 | msgstr "无法合并子模组 %s (没有检出)" | |
4529 | ||
2b472aae | 4530 | #: merge-recursive.c:1198 |
fd8cb379 JX |
4531 | #, c-format |
4532 | msgid "Failed to merge submodule %s (commits not present)" | |
4533 | msgstr "无法合并子模组 %s(提交不存在)" | |
4534 | ||
2b472aae | 4535 | #: merge-recursive.c:1205 |
fd8cb379 JX |
4536 | #, c-format |
4537 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
4538 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
4539 | ||
2b472aae | 4540 | #: merge-recursive.c:1213 merge-recursive.c:1225 |
fd8cb379 JX |
4541 | #, c-format |
4542 | msgid "Fast-forwarding submodule %s to the following commit:" | |
4543 | msgstr "子模组 %s 快进到如下提交:" | |
4544 | ||
2b472aae | 4545 | #: merge-recursive.c:1216 merge-recursive.c:1228 |
fd8cb379 JX |
4546 | #, c-format |
4547 | msgid "Fast-forwarding submodule %s" | |
4548 | msgstr "快进子模组 %s" | |
4549 | ||
2b472aae | 4550 | #: merge-recursive.c:1251 |
fd8cb379 JX |
4551 | #, c-format |
4552 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
4553 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
4554 | ||
2b472aae | 4555 | #: merge-recursive.c:1255 |
fd8cb379 JX |
4556 | #, c-format |
4557 | msgid "Failed to merge submodule %s (not fast-forward)" | |
4558 | msgstr "无法合并子模组 %s(非快进)" | |
4559 | ||
2b472aae | 4560 | #: merge-recursive.c:1256 |
fd8cb379 JX |
4561 | msgid "Found a possible merge resolution for the submodule:\n" |
4562 | msgstr "找到子模组的一个可能的合并方案:\n" | |
4563 | ||
2b472aae | 4564 | #: merge-recursive.c:1259 |
fd8cb379 JX |
4565 | #, c-format |
4566 | msgid "" | |
4567 | "If this is correct simply add it to the index for example\n" | |
4568 | "by using:\n" | |
4569 | "\n" | |
4570 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
4571 | "\n" | |
4572 | "which will accept this suggestion.\n" | |
4573 | msgstr "" | |
4574 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
4575 | "\n" | |
4576 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
4577 | "\n" | |
4578 | "以接受此建议。\n" | |
4579 | ||
2b472aae | 4580 | #: merge-recursive.c:1268 |
fd8cb379 JX |
4581 | #, c-format |
4582 | msgid "Failed to merge submodule %s (multiple merges found)" | |
4583 | msgstr "无法合并子模组 %s (发现多个合并)" | |
4584 | ||
2b472aae | 4585 | #: merge-recursive.c:1341 |
a0b6b246 JX |
4586 | msgid "Failed to execute internal merge" |
4587 | msgstr "无法执行内部合并" | |
4588 | ||
2b472aae | 4589 | #: merge-recursive.c:1346 |
5c57d762 | 4590 | #, c-format |
a0b6b246 JX |
4591 | msgid "Unable to add %s to database" |
4592 | msgstr "不能添加 %s 至对象库" | |
5c57d762 | 4593 | |
2b472aae | 4594 | #: merge-recursive.c:1378 |
fd8cb379 JX |
4595 | #, c-format |
4596 | msgid "Auto-merging %s" | |
4597 | msgstr "自动合并 %s" | |
4598 | ||
2b472aae | 4599 | #: merge-recursive.c:1402 |
fd8cb379 JX |
4600 | #, c-format |
4601 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
4602 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
4603 | ||
2b472aae | 4604 | #: merge-recursive.c:1474 |
5c57d762 JX |
4605 | #, c-format |
4606 | msgid "" | |
a0b6b246 JX |
4607 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
4608 | "in tree." | |
5c57d762 | 4609 | msgstr "" |
87cb7997 JX |
4610 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
4611 | "本被保留。" | |
4612 | ||
2b472aae | 4613 | #: merge-recursive.c:1479 |
87cb7997 JX |
4614 | #, c-format |
4615 | msgid "" | |
4616 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
4617 | "left in tree." | |
4618 | msgstr "" | |
4619 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
4620 | "%7$s 版本被保留。" | |
c04f5ac3 | 4621 | |
2b472aae | 4622 | #: merge-recursive.c:1486 |
7aea43ff | 4623 | #, c-format |
a0b6b246 JX |
4624 | msgid "" |
4625 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
4626 | "in tree at %s." | |
4627 | msgstr "" | |
87cb7997 JX |
4628 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
4629 | "本保留在 %8$s 中。" | |
7aea43ff | 4630 | |
2b472aae | 4631 | #: merge-recursive.c:1491 |
87cb7997 JX |
4632 | #, c-format |
4633 | msgid "" | |
4634 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
4635 | "left in tree at %s." | |
4636 | msgstr "" | |
4637 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
4638 | "%7$s 版本保留在 %9$s 中。" | |
4639 | ||
2b472aae | 4640 | #: merge-recursive.c:1526 |
a0b6b246 JX |
4641 | msgid "rename" |
4642 | msgstr "重命名" | |
5b04ee3b | 4643 | |
2b472aae | 4644 | #: merge-recursive.c:1526 |
a0b6b246 JX |
4645 | msgid "renamed" |
4646 | msgstr "重命名" | |
5b04ee3b | 4647 | |
349ede6a | 4648 | #: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 |
fd8cb379 JX |
4649 | #, c-format |
4650 | msgid "Refusing to lose dirty file at %s" | |
4651 | msgstr "拒绝丢失脏文件 '%s'" | |
4652 | ||
2b472aae | 4653 | #: merge-recursive.c:1587 |
06991777 JX |
4654 | #, c-format |
4655 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
4656 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" | |
4657 | ||
2b472aae | 4658 | #: merge-recursive.c:1645 |
06991777 JX |
4659 | #, c-format |
4660 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" | |
4661 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
4662 | ||
2b472aae | 4663 | #: merge-recursive.c:1676 |
5c57d762 | 4664 | #, c-format |
a0b6b246 JX |
4665 | msgid "%s is a directory in %s adding as %s instead" |
4666 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 4667 | |
2b472aae | 4668 | #: merge-recursive.c:1681 |
fd8cb379 JX |
4669 | #, c-format |
4670 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
4671 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
4672 | ||
2b472aae | 4673 | #: merge-recursive.c:1708 |
5c57d762 JX |
4674 | #, c-format |
4675 | msgid "" | |
a0b6b246 JX |
4676 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
4677 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 4678 | msgstr "" |
a0b6b246 JX |
4679 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
4680 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 4681 | |
2b472aae | 4682 | #: merge-recursive.c:1713 |
a0b6b246 JX |
4683 | msgid " (left unresolved)" |
4684 | msgstr "(留下未解决)" | |
5c57d762 | 4685 | |
349ede6a | 4686 | #: merge-recursive.c:1805 |
5c57d762 | 4687 | #, c-format |
a0b6b246 | 4688 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 4689 | msgstr "" |
a0b6b246 JX |
4690 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
4691 | "%5$s" | |
3495628d | 4692 | |
349ede6a | 4693 | #: merge-recursive.c:2068 |
fd8cb379 JX |
4694 | #, c-format |
4695 | msgid "" | |
4696 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
4697 | "directory %s was renamed to multiple other directories, with no destination " | |
4698 | "getting a majority of the files." | |
c1ac5258 JX |
4699 | msgstr "" |
4700 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
4701 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 4702 | |
349ede6a | 4703 | #: merge-recursive.c:2100 |
fd8cb379 JX |
4704 | #, c-format |
4705 | msgid "" | |
4706 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
4707 | "implicit directory rename(s) putting the following path(s) there: %s." | |
4708 | msgstr "" | |
4709 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
4710 | "在:%s。" | |
4711 | ||
349ede6a | 4712 | #: merge-recursive.c:2110 |
fd8cb379 JX |
4713 | #, c-format |
4714 | msgid "" | |
4715 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
4716 | "implicit directory renames tried to put these paths there: %s" | |
4717 | msgstr "" | |
4718 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
4719 | "径放置于此:%s" | |
4720 | ||
349ede6a | 4721 | #: merge-recursive.c:2202 |
fd8cb379 JX |
4722 | #, c-format |
4723 | msgid "" | |
4724 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
4725 | ">%s in %s" | |
4726 | msgstr "" | |
4727 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
4728 | "%4$s->%5$s" | |
4729 | ||
349ede6a | 4730 | #: merge-recursive.c:2447 |
fd8cb379 JX |
4731 | #, c-format |
4732 | msgid "" | |
4733 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
4734 | "renamed." | |
4735 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
4736 | ||
349ede6a | 4737 | #: merge-recursive.c:2973 |
90314792 | 4738 | #, c-format |
a0b6b246 JX |
4739 | msgid "cannot read object %s" |
4740 | msgstr "不能读取对象 %s" | |
90314792 | 4741 | |
349ede6a | 4742 | #: merge-recursive.c:2976 |
90314792 | 4743 | #, c-format |
a0b6b246 JX |
4744 | msgid "object %s is not a blob" |
4745 | msgstr "对象 %s 不是一个数据对象" | |
90314792 | 4746 | |
349ede6a | 4747 | #: merge-recursive.c:3040 |
a0b6b246 JX |
4748 | msgid "modify" |
4749 | msgstr "修改" | |
90314792 | 4750 | |
349ede6a | 4751 | #: merge-recursive.c:3040 |
a0b6b246 JX |
4752 | msgid "modified" |
4753 | msgstr "修改" | |
5b04ee3b | 4754 | |
349ede6a | 4755 | #: merge-recursive.c:3052 |
a0b6b246 JX |
4756 | msgid "content" |
4757 | msgstr "内容" | |
5b04ee3b | 4758 | |
349ede6a | 4759 | #: merge-recursive.c:3056 |
a0b6b246 JX |
4760 | msgid "add/add" |
4761 | msgstr "添加/添加" | |
3495628d | 4762 | |
349ede6a | 4763 | #: merge-recursive.c:3079 |
220c313c | 4764 | #, c-format |
a0b6b246 JX |
4765 | msgid "Skipped %s (merged same as existing)" |
4766 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 4767 | |
7157c2b5 | 4768 | #: merge-recursive.c:3101 git-submodule.sh:959 |
a0b6b246 JX |
4769 | msgid "submodule" |
4770 | msgstr "子模组" | |
4771 | ||
349ede6a | 4772 | #: merge-recursive.c:3102 |
220c313c | 4773 | #, c-format |
a0b6b246 JX |
4774 | msgid "CONFLICT (%s): Merge conflict in %s" |
4775 | msgstr "冲突(%s):合并冲突于 %s" | |
220c313c | 4776 | |
349ede6a | 4777 | #: merge-recursive.c:3132 |
220c313c | 4778 | #, c-format |
06991777 JX |
4779 | msgid "Adding as %s instead" |
4780 | msgstr "而是以 %s 为名添加" | |
4781 | ||
349ede6a | 4782 | #: merge-recursive.c:3215 |
06991777 | 4783 | #, c-format |
d46c5519 JX |
4784 | msgid "" |
4785 | "Path updated: %s added in %s inside a directory that was renamed in %s; " | |
4786 | "moving it to %s." | |
4787 | msgstr "" | |
5b533632 | 4788 | "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" |
220c313c | 4789 | |
349ede6a | 4790 | #: merge-recursive.c:3218 |
d46c5519 JX |
4791 | #, c-format |
4792 | msgid "" | |
4793 | "CONFLICT (file location): %s added in %s inside a directory that was renamed " | |
4794 | "in %s, suggesting it should perhaps be moved to %s." | |
4795 | msgstr "" | |
4796 | "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" | |
4797 | "到 %s。" | |
4798 | ||
349ede6a | 4799 | #: merge-recursive.c:3222 |
d46c5519 JX |
4800 | #, c-format |
4801 | msgid "" | |
4802 | "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " | |
4803 | "%s; moving it to %s." | |
4804 | msgstr "" | |
5b533632 FZ |
4805 | "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" |
4806 | "动到 %5$s。" | |
d46c5519 | 4807 | |
349ede6a | 4808 | #: merge-recursive.c:3225 |
d46c5519 JX |
4809 | #, c-format |
4810 | msgid "" | |
4811 | "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " | |
4812 | "was renamed in %s, suggesting it should perhaps be moved to %s." | |
4813 | msgstr "" | |
5b533632 | 4814 | "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," |
d46c5519 JX |
4815 | "建议将其移动到 %5$s。" |
4816 | ||
349ede6a | 4817 | #: merge-recursive.c:3339 |
d46c5519 JX |
4818 | #, c-format |
4819 | msgid "Removing %s" | |
4820 | msgstr "删除 %s" | |
4821 | ||
349ede6a | 4822 | #: merge-recursive.c:3362 |
d46c5519 JX |
4823 | msgid "file/directory" |
4824 | msgstr "文件/目录" | |
220c313c | 4825 | |
349ede6a | 4826 | #: merge-recursive.c:3367 |
a0b6b246 JX |
4827 | msgid "directory/file" |
4828 | msgstr "目录/文件" | |
276ceeaa | 4829 | |
349ede6a | 4830 | #: merge-recursive.c:3374 |
276ceeaa | 4831 | #, c-format |
a0b6b246 JX |
4832 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
4833 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 4834 | |
349ede6a | 4835 | #: merge-recursive.c:3383 |
276ceeaa | 4836 | #, c-format |
a0b6b246 JX |
4837 | msgid "Adding %s" |
4838 | msgstr "添加 %s" | |
276ceeaa | 4839 | |
349ede6a | 4840 | #: merge-recursive.c:3392 |
06991777 JX |
4841 | #, c-format |
4842 | msgid "CONFLICT (add/add): Merge conflict in %s" | |
4843 | msgstr "冲突(add/add):合并冲突于 %s" | |
4844 | ||
349ede6a | 4845 | #: merge-recursive.c:3436 |
6937cb4e | 4846 | msgid "Already up to date!" |
a0b6b246 | 4847 | msgstr "已经是最新的!" |
276ceeaa | 4848 | |
349ede6a | 4849 | #: merge-recursive.c:3445 |
276ceeaa | 4850 | #, c-format |
a0b6b246 JX |
4851 | msgid "merging of trees %s and %s failed" |
4852 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 4853 | |
349ede6a | 4854 | #: merge-recursive.c:3549 |
a0b6b246 JX |
4855 | msgid "Merging:" |
4856 | msgstr "合并:" | |
5c57d762 | 4857 | |
349ede6a | 4858 | #: merge-recursive.c:3562 |
5c57d762 | 4859 | #, c-format |
a0b6b246 JX |
4860 | msgid "found %u common ancestor:" |
4861 | msgid_plural "found %u common ancestors:" | |
4862 | msgstr[0] "发现 %u 个共同祖先:" | |
4863 | msgstr[1] "发现 %u 个共同祖先:" | |
4864 | ||
349ede6a | 4865 | #: merge-recursive.c:3612 |
a0b6b246 JX |
4866 | msgid "merge returned no commit" |
4867 | msgstr "合并未返回提交" | |
4868 | ||
349ede6a | 4869 | #: merge-recursive.c:3671 |
a5cd71ca JX |
4870 | #, c-format |
4871 | msgid "" | |
4872 | "Your local changes to the following files would be overwritten by merge:\n" | |
4873 | " %s" | |
4874 | msgstr "" | |
4875 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4876 | " %s" | |
4877 | ||
349ede6a | 4878 | #: merge-recursive.c:3768 |
5c57d762 | 4879 | #, c-format |
a0b6b246 JX |
4880 | msgid "Could not parse object '%s'" |
4881 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 4882 | |
349ede6a | 4883 | #: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 |
a0b6b246 JX |
4884 | msgid "Unable to write index." |
4885 | msgstr "不能写入索引。" | |
4886 | ||
349ede6a JX |
4887 | #: merge.c:41 |
4888 | msgid "failed to read the cache" | |
4889 | msgstr "读取缓存失败" | |
4890 | ||
4891 | #: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 | |
7157c2b5 | 4892 | #: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 |
349ede6a JX |
4893 | #: builtin/stash.c:265 |
4894 | msgid "unable to write new index file" | |
4895 | msgstr "无法写新的索引文件" | |
4896 | ||
a5cd71ca | 4897 | #: midx.c:68 |
4c27fcb5 JX |
4898 | #, c-format |
4899 | msgid "multi-pack-index file %s is too small" | |
4900 | msgstr "多包索引文件 %s 太小" | |
4901 | ||
a5cd71ca | 4902 | #: midx.c:84 |
4c27fcb5 JX |
4903 | #, c-format |
4904 | msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" | |
4905 | msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" | |
4906 | ||
a5cd71ca | 4907 | #: midx.c:89 |
4c27fcb5 JX |
4908 | #, c-format |
4909 | msgid "multi-pack-index version %d not recognized" | |
4910 | msgstr "multi-pack-index 版本 %d 不能被识别" | |
4911 | ||
a5cd71ca | 4912 | #: midx.c:94 |
4c27fcb5 JX |
4913 | #, c-format |
4914 | msgid "hash version %u does not match" | |
4915 | msgstr "散列版本 %u 不匹配" | |
4916 | ||
a5cd71ca | 4917 | #: midx.c:108 |
4c27fcb5 JX |
4918 | msgid "invalid chunk offset (too large)" |
4919 | msgstr "无效的块偏移(太大)" | |
4920 | ||
a5cd71ca | 4921 | #: midx.c:132 |
4c27fcb5 JX |
4922 | msgid "terminating multi-pack-index chunk id appears earlier than expected" |
4923 | msgstr "终止多包索引块 id 出现时间早于预期" | |
4924 | ||
a5cd71ca | 4925 | #: midx.c:145 |
4c27fcb5 JX |
4926 | msgid "multi-pack-index missing required pack-name chunk" |
4927 | msgstr "多包索引缺少必需的包名块" | |
4928 | ||
a5cd71ca | 4929 | #: midx.c:147 |
4c27fcb5 | 4930 | msgid "multi-pack-index missing required OID fanout chunk" |
5b533632 | 4931 | msgstr "多包索引缺少必需的对象 ID 扇出块" |
4c27fcb5 | 4932 | |
a5cd71ca | 4933 | #: midx.c:149 |
4c27fcb5 | 4934 | msgid "multi-pack-index missing required OID lookup chunk" |
5b533632 | 4935 | msgstr "多包索引缺少必需的对象 ID 查询块" |
4c27fcb5 | 4936 | |
a5cd71ca | 4937 | #: midx.c:151 |
4c27fcb5 JX |
4938 | msgid "multi-pack-index missing required object offsets chunk" |
4939 | msgstr "多包索引缺少必需的对象偏移块" | |
4940 | ||
a5cd71ca | 4941 | #: midx.c:165 |
4c27fcb5 JX |
4942 | #, c-format |
4943 | msgid "multi-pack-index pack names out of order: '%s' before '%s'" | |
4944 | msgstr "多包索引包名无序:'%s' 在 '%s' 之前" | |
4945 | ||
349ede6a | 4946 | #: midx.c:208 |
4c27fcb5 JX |
4947 | #, c-format |
4948 | msgid "bad pack-int-id: %u (%u total packs)" | |
4949 | msgstr "错的 pack-int-id:%u(共有 %u 个包)" | |
4950 | ||
349ede6a | 4951 | #: midx.c:258 |
4c27fcb5 JX |
4952 | msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" |
4953 | msgstr "多包索引存储一个64位偏移,但是 off_t 太小" | |
4954 | ||
349ede6a | 4955 | #: midx.c:286 |
4c27fcb5 JX |
4956 | msgid "error preparing packfile from multi-pack-index" |
4957 | msgstr "从多包索引准备 packfile 出错" | |
4958 | ||
349ede6a | 4959 | #: midx.c:470 |
4c27fcb5 JX |
4960 | #, c-format |
4961 | msgid "failed to add packfile '%s'" | |
4962 | msgstr "添加包文件 '%s' 失败" | |
4963 | ||
349ede6a | 4964 | #: midx.c:476 |
4c27fcb5 JX |
4965 | #, c-format |
4966 | msgid "failed to open pack-index '%s'" | |
4967 | msgstr "打开包索引 '%s' 失败" | |
4968 | ||
349ede6a | 4969 | #: midx.c:536 |
4c27fcb5 JX |
4970 | #, c-format |
4971 | msgid "failed to locate object %d in packfile" | |
4972 | msgstr "在包文件中定位对象 %d 失败" | |
4973 | ||
349ede6a | 4974 | #: midx.c:840 |
ddc12c42 JX |
4975 | msgid "Adding packfiles to multi-pack-index" |
4976 | msgstr "添加包文件到多包索引" | |
4977 | ||
349ede6a | 4978 | #: midx.c:873 |
a6cd2cc4 JX |
4979 | #, c-format |
4980 | msgid "did not see pack-file %s to drop" | |
4981 | msgstr "没有看到要丢弃的包文件 %s" | |
4982 | ||
349ede6a JX |
4983 | #: midx.c:925 |
4984 | msgid "no pack files to index." | |
4985 | msgstr "没有要索引的包文件。" | |
4986 | ||
4987 | #: midx.c:977 | |
ddc12c42 JX |
4988 | msgid "Writing chunks to multi-pack-index" |
4989 | msgstr "写入块到多包索引" | |
4990 | ||
349ede6a | 4991 | #: midx.c:1056 |
4c27fcb5 JX |
4992 | #, c-format |
4993 | msgid "failed to clear multi-pack-index at %s" | |
4994 | msgstr "清理位于 %s 的多包索引失败" | |
4995 | ||
349ede6a | 4996 | #: midx.c:1112 |
d46c5519 JX |
4997 | msgid "Looking for referenced packfiles" |
4998 | msgstr "正在查找引用的包文件" | |
4999 | ||
349ede6a | 5000 | #: midx.c:1127 |
4c27fcb5 JX |
5001 | #, c-format |
5002 | msgid "" | |
5003 | "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
5b533632 | 5004 | msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" |
4c27fcb5 | 5005 | |
349ede6a JX |
5006 | #: midx.c:1132 |
5007 | msgid "the midx contains no oid" | |
5008 | msgstr "midx 不包含 oid" | |
5009 | ||
5010 | #: midx.c:1141 | |
ddc12c42 JX |
5011 | msgid "Verifying OID order in multi-pack-index" |
5012 | msgstr "校验多包索引中的 OID 顺序" | |
d46c5519 | 5013 | |
349ede6a | 5014 | #: midx.c:1150 |
4c27fcb5 JX |
5015 | #, c-format |
5016 | msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" | |
5b533632 | 5017 | msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" |
4c27fcb5 | 5018 | |
349ede6a | 5019 | #: midx.c:1170 |
d46c5519 JX |
5020 | msgid "Sorting objects by packfile" |
5021 | msgstr "通过包文件为对象排序" | |
5022 | ||
349ede6a | 5023 | #: midx.c:1177 |
4c27fcb5 JX |
5024 | msgid "Verifying object offsets" |
5025 | msgstr "校验对象偏移" | |
5026 | ||
349ede6a | 5027 | #: midx.c:1193 |
4c27fcb5 JX |
5028 | #, c-format |
5029 | msgid "failed to load pack entry for oid[%d] = %s" | |
5030 | msgstr "为 oid[%d] = %s 加载包条目失败" | |
5031 | ||
349ede6a | 5032 | #: midx.c:1199 |
4c27fcb5 JX |
5033 | #, c-format |
5034 | msgid "failed to load pack-index for packfile %s" | |
5035 | msgstr "为包文件 %s 加载包索引失败" | |
5036 | ||
349ede6a | 5037 | #: midx.c:1208 |
4c27fcb5 JX |
5038 | #, c-format |
5039 | msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" | |
5040 | msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" | |
5041 | ||
349ede6a | 5042 | #: midx.c:1233 |
ddc12c42 JX |
5043 | msgid "Counting referenced objects" |
5044 | msgstr "正在对引用对象计数" | |
5045 | ||
349ede6a | 5046 | #: midx.c:1243 |
ddc12c42 JX |
5047 | msgid "Finding and deleting unreferenced packfiles" |
5048 | msgstr "正在查找和删除未引用的包文件" | |
5049 | ||
349ede6a | 5050 | #: midx.c:1433 |
a6cd2cc4 JX |
5051 | msgid "could not start pack-objects" |
5052 | msgstr "不能开始 pack-objects" | |
5053 | ||
349ede6a | 5054 | #: midx.c:1452 |
a6cd2cc4 JX |
5055 | msgid "could not finish pack-objects" |
5056 | msgstr "不能结束 pack-objects" | |
5057 | ||
a5cd71ca | 5058 | #: name-hash.c:537 |
4c27fcb5 JX |
5059 | #, c-format |
5060 | msgid "unable to create lazy_dir thread: %s" | |
5061 | msgstr "不能创建 lazy_dir 线程:%s" | |
5062 | ||
a5cd71ca | 5063 | #: name-hash.c:559 |
4c27fcb5 JX |
5064 | #, c-format |
5065 | msgid "unable to create lazy_name thread: %s" | |
5066 | msgstr "不能创建 lazy_name 线程:%s" | |
5067 | ||
a5cd71ca | 5068 | #: name-hash.c:565 |
4c27fcb5 JX |
5069 | #, c-format |
5070 | msgid "unable to join lazy_name thread: %s" | |
5071 | msgstr "不能加入 lasy_name 线程:%s" | |
5072 | ||
06991777 | 5073 | #: notes-merge.c:277 |
5c57d762 JX |
5074 | #, c-format |
5075 | msgid "" | |
a0b6b246 JX |
5076 | "You have not concluded your previous notes merge (%s exists).\n" |
5077 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
5078 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 5079 | msgstr "" |
29004bbb | 5080 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
5081 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
5082 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 5083 | |
06991777 | 5084 | #: notes-merge.c:284 |
a0b6b246 JX |
5085 | #, c-format |
5086 | msgid "You have not concluded your notes merge (%s exists)." | |
5087 | msgstr "您尚未结束注释合并(存在 %s)。" | |
5088 | ||
06991777 | 5089 | #: notes-utils.c:46 |
a0b6b246 JX |
5090 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
5091 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 5092 | |
06991777 | 5093 | #: notes-utils.c:105 |
1b7f4a34 | 5094 | #, c-format |
a0b6b246 JX |
5095 | msgid "Bad notes.rewriteMode value: '%s'" |
5096 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 5097 | |
06991777 | 5098 | #: notes-utils.c:115 |
5b04ee3b | 5099 | #, c-format |
a0b6b246 JX |
5100 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
5101 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 5102 | |
a4f16749 JX |
5103 | #. TRANSLATORS: The first %s is the name of |
5104 | #. the environment variable, the second %s is | |
5105 | #. its value. | |
5106 | #. | |
06991777 | 5107 | #: notes-utils.c:145 |
5b04ee3b | 5108 | #, c-format |
a0b6b246 JX |
5109 | msgid "Bad %s value: '%s'" |
5110 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 5111 | |
a5cd71ca | 5112 | #: object.c:53 |
c1ac5258 JX |
5113 | #, c-format |
5114 | msgid "invalid object type \"%s\"" | |
5115 | msgstr "无效的对象类型 \"%s\"" | |
5116 | ||
a5cd71ca | 5117 | #: object.c:173 |
c1ac5258 JX |
5118 | #, c-format |
5119 | msgid "object %s is a %s, not a %s" | |
5120 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
5121 | ||
a5cd71ca | 5122 | #: object.c:233 |
c1ac5258 JX |
5123 | #, c-format |
5124 | msgid "object %s has unknown type id %d" | |
5125 | msgstr "对象 %s 有未知的类型 id %d" | |
5126 | ||
a5cd71ca | 5127 | #: object.c:246 |
5b04ee3b | 5128 | #, c-format |
a0b6b246 JX |
5129 | msgid "unable to parse object: %s" |
5130 | msgstr "不能解析对象:%s" | |
5b04ee3b | 5131 | |
2b472aae | 5132 | #: object.c:266 object.c:278 |
c1ac5258 | 5133 | #, c-format |
06991777 JX |
5134 | msgid "hash mismatch %s" |
5135 | msgstr "哈希值与 %s 不匹配" | |
c1ac5258 | 5136 | |
7157c2b5 | 5137 | #: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 |
349ede6a JX |
5138 | #, c-format |
5139 | msgid "unable to get size of %s" | |
5140 | msgstr "无法得到 %s 的大小" | |
5141 | ||
7157c2b5 | 5142 | #: packfile.c:630 |
6937cb4e JX |
5143 | msgid "offset before end of packfile (broken .idx?)" |
5144 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
5145 | ||
7157c2b5 | 5146 | #: packfile.c:1900 |
6937cb4e JX |
5147 | #, c-format |
5148 | msgid "offset before start of pack index for %s (corrupt index?)" | |
5149 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
5150 | ||
7157c2b5 | 5151 | #: packfile.c:1904 |
6937cb4e JX |
5152 | #, c-format |
5153 | msgid "offset beyond end of pack index for %s (truncated index?)" | |
5154 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
5155 | ||
349ede6a | 5156 | #: parse-options-cb.c:20 parse-options-cb.c:24 |
2b472aae | 5157 | #, c-format |
349ede6a JX |
5158 | msgid "option `%s' expects a numerical value" |
5159 | msgstr "选项 `%s' 期望一个数字值" | |
5160 | ||
5161 | #: parse-options-cb.c:41 | |
5162 | #, c-format | |
5163 | msgid "malformed expiration date '%s'" | |
5164 | msgstr "格式错误的到期时间:'%s'" | |
5165 | ||
5166 | #: parse-options-cb.c:54 | |
5167 | #, c-format | |
5168 | msgid "option `%s' expects \"always\", \"auto\", or \"never\"" | |
5169 | msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" | |
5170 | ||
5171 | #: parse-options-cb.c:130 parse-options-cb.c:147 | |
5172 | #, c-format | |
5173 | msgid "malformed object name '%s'" | |
5174 | msgstr "格式错误的对象名 '%s'" | |
2b472aae | 5175 | |
d46c5519 | 5176 | #: parse-options.c:38 |
06991777 JX |
5177 | #, c-format |
5178 | msgid "%s requires a value" | |
8e4e0555 | 5179 | msgstr "%s 需要一个值" |
06991777 | 5180 | |
d46c5519 | 5181 | #: parse-options.c:73 |
06991777 JX |
5182 | #, c-format |
5183 | msgid "%s is incompatible with %s" | |
5184 | msgstr "%s 与 %s 不兼容" | |
5185 | ||
d46c5519 | 5186 | #: parse-options.c:78 |
06991777 JX |
5187 | #, c-format |
5188 | msgid "%s : incompatible with something else" | |
5189 | msgstr "%s:和其它的不兼容" | |
5190 | ||
2b472aae | 5191 | #: parse-options.c:92 parse-options.c:96 parse-options.c:317 |
06991777 JX |
5192 | #, c-format |
5193 | msgid "%s takes no value" | |
8e4e0555 | 5194 | msgstr "%s 不取值" |
06991777 | 5195 | |
d46c5519 | 5196 | #: parse-options.c:94 |
06991777 JX |
5197 | #, c-format |
5198 | msgid "%s isn't available" | |
5199 | msgstr "%s 不可用" | |
5200 | ||
2b472aae | 5201 | #: parse-options.c:217 |
06991777 JX |
5202 | #, c-format |
5203 | msgid "%s expects a non-negative integer value with an optional k/m/g suffix" | |
5204 | msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" | |
5205 | ||
2b472aae | 5206 | #: parse-options.c:386 |
06991777 JX |
5207 | #, c-format |
5208 | msgid "ambiguous option: %s (could be --%s%s or --%s%s)" | |
8e4e0555 | 5209 | msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" |
06991777 | 5210 | |
2b472aae | 5211 | #: parse-options.c:420 parse-options.c:428 |
06991777 | 5212 | #, c-format |
2b472aae JX |
5213 | msgid "did you mean `--%s` (with two dashes)?" |
5214 | msgstr "你的意思是 `--%s`(有两个短线)?" | |
06991777 | 5215 | |
349ede6a JX |
5216 | #: parse-options.c:663 parse-options.c:963 |
5217 | #, c-format | |
5218 | msgid "alias of --%s" | |
5219 | msgstr "--%s 的别名" | |
5220 | ||
5221 | #: parse-options.c:854 | |
06991777 JX |
5222 | #, c-format |
5223 | msgid "unknown option `%s'" | |
5224 | msgstr "未知选项 `%s'" | |
5225 | ||
349ede6a | 5226 | #: parse-options.c:856 |
06991777 JX |
5227 | #, c-format |
5228 | msgid "unknown switch `%c'" | |
5229 | msgstr "未知开关 `%c'" | |
5230 | ||
349ede6a | 5231 | #: parse-options.c:858 |
06991777 JX |
5232 | #, c-format |
5233 | msgid "unknown non-ascii option in string: `%s'" | |
5b533632 | 5234 | msgstr "字符串中未知的非 ascii 字符选项:`%s'" |
06991777 | 5235 | |
349ede6a | 5236 | #: parse-options.c:882 |
a0b6b246 JX |
5237 | msgid "..." |
5238 | msgstr "..." | |
5239 | ||
349ede6a | 5240 | #: parse-options.c:901 |
5b04ee3b | 5241 | #, c-format |
a0b6b246 JX |
5242 | msgid "usage: %s" |
5243 | msgstr "用法:%s" | |
5b04ee3b | 5244 | |
a0b6b246 | 5245 | #. TRANSLATORS: the colon here should align with the |
a4f16749 JX |
5246 | #. one in "usage: %s" translation. |
5247 | #. | |
349ede6a | 5248 | #: parse-options.c:907 |
5b04ee3b | 5249 | #, c-format |
a0b6b246 JX |
5250 | msgid " or: %s" |
5251 | msgstr " 或:%s" | |
5b04ee3b | 5252 | |
a0b6b246 | 5253 | # 译者:为保证在输出中对齐,注意调整句中空格! |
349ede6a | 5254 | #: parse-options.c:910 |
5b04ee3b | 5255 | #, c-format |
a0b6b246 JX |
5256 | msgid " %s" |
5257 | msgstr " %s" | |
5b04ee3b | 5258 | |
349ede6a | 5259 | #: parse-options.c:949 |
a0b6b246 JX |
5260 | msgid "-NUM" |
5261 | msgstr "-数字" | |
5262 | ||
ddc12c42 | 5263 | #: path.c:915 |
5b04ee3b | 5264 | #, c-format |
a0b6b246 JX |
5265 | msgid "Could not make %s writable by group" |
5266 | msgstr "不能设置 %s 为组可写" | |
5267 | ||
ddc12c42 | 5268 | #: pathspec.c:130 |
87cb7997 JX |
5269 | msgid "Escape character '\\' not allowed as last character in attr value" |
5270 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
5271 | ||
ddc12c42 | 5272 | #: pathspec.c:148 |
87cb7997 JX |
5273 | msgid "Only one 'attr:' specification is allowed." |
5274 | msgstr "只允许一个 'attr:' 规格。" | |
5275 | ||
ddc12c42 | 5276 | #: pathspec.c:151 |
87cb7997 JX |
5277 | msgid "attr spec must not be empty" |
5278 | msgstr "属性规格不能为空" | |
5279 | ||
ddc12c42 | 5280 | #: pathspec.c:194 |
87cb7997 JX |
5281 | #, c-format |
5282 | msgid "invalid attribute name %s" | |
5283 | msgstr "无效的属性名 %s" | |
5284 | ||
ddc12c42 | 5285 | #: pathspec.c:259 |
a0b6b246 JX |
5286 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
5287 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
5288 | ||
ddc12c42 | 5289 | #: pathspec.c:266 |
5b04ee3b | 5290 | msgid "" |
a0b6b246 JX |
5291 | "global 'literal' pathspec setting is incompatible with all other global " |
5292 | "pathspec settings" | |
5293 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
5b04ee3b | 5294 | |
ddc12c42 | 5295 | #: pathspec.c:306 |
a0b6b246 JX |
5296 | msgid "invalid parameter for pathspec magic 'prefix'" |
5297 | msgstr "路径规格包含无效的神奇前缀" | |
5298 | ||
ddc12c42 | 5299 | #: pathspec.c:327 |
5b04ee3b | 5300 | #, c-format |
a0b6b246 JX |
5301 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
5302 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
5b04ee3b | 5303 | |
ddc12c42 | 5304 | #: pathspec.c:332 |
5b04ee3b | 5305 | #, c-format |
a0b6b246 JX |
5306 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
5307 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
5b04ee3b | 5308 | |
ddc12c42 | 5309 | #: pathspec.c:370 |
5b04ee3b | 5310 | #, c-format |
a0b6b246 JX |
5311 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
5312 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
5b04ee3b | 5313 | |
ddc12c42 | 5314 | #: pathspec.c:429 |
5b04ee3b | 5315 | #, c-format |
a0b6b246 JX |
5316 | msgid "%s: 'literal' and 'glob' are incompatible" |
5317 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
5b04ee3b | 5318 | |
349ede6a | 5319 | #: pathspec.c:445 |
5b04ee3b | 5320 | #, c-format |
2b472aae | 5321 | msgid "%s: '%s' is outside repository at '%s'" |
440e7442 | 5322 | msgstr "%s:'%s' 在位于 '%s' 的仓库之外" |
5b04ee3b | 5323 | |
349ede6a | 5324 | #: pathspec.c:521 |
5b04ee3b | 5325 | #, c-format |
1a79b2f1 JX |
5326 | msgid "'%s' (mnemonic: '%c')" |
5327 | msgstr "'%s'(助记符:'%c')" | |
5b04ee3b | 5328 | |
349ede6a | 5329 | #: pathspec.c:531 |
5b04ee3b | 5330 | #, c-format |
a0b6b246 JX |
5331 | msgid "%s: pathspec magic not supported by this command: %s" |
5332 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
5333 | ||
349ede6a | 5334 | #: pathspec.c:598 |
5b04ee3b | 5335 | #, c-format |
a0b6b246 JX |
5336 | msgid "pathspec '%s' is beyond a symbolic link" |
5337 | msgstr "路径规格 '%s' 位于符号链接中" | |
5338 | ||
349ede6a | 5339 | #: pathspec.c:643 |
ddc12c42 JX |
5340 | #, c-format |
5341 | msgid "line is badly quoted: %s" | |
5342 | msgstr "行被错误地引用:%s" | |
5343 | ||
d46c5519 JX |
5344 | #: pkt-line.c:92 |
5345 | msgid "unable to write flush packet" | |
5346 | msgstr "无法写 flush 包" | |
5347 | ||
5348 | #: pkt-line.c:99 | |
5349 | msgid "unable to write delim packet" | |
5350 | msgstr "无法写 delim 包" | |
5351 | ||
5352 | #: pkt-line.c:106 | |
7157c2b5 JX |
5353 | msgid "unable to write stateless separator packet" |
5354 | msgstr "无法写入无状态分隔符数据包" | |
5355 | ||
5356 | #: pkt-line.c:113 | |
c1ac5258 JX |
5357 | msgid "flush packet write failed" |
5358 | msgstr "flush 包写错误" | |
5359 | ||
7157c2b5 | 5360 | #: pkt-line.c:153 pkt-line.c:239 |
c1ac5258 JX |
5361 | msgid "protocol error: impossibly long line" |
5362 | msgstr "协议错误:不可能的长行" | |
5363 | ||
7157c2b5 | 5364 | #: pkt-line.c:169 pkt-line.c:171 |
c1ac5258 JX |
5365 | msgid "packet write with format failed" |
5366 | msgstr "格式化包写入错误" | |
5367 | ||
7157c2b5 | 5368 | #: pkt-line.c:203 |
c1ac5258 JX |
5369 | msgid "packet write failed - data exceeds max packet size" |
5370 | msgstr "写数据包失败:数据超过了包的最大长度" | |
5371 | ||
7157c2b5 | 5372 | #: pkt-line.c:210 pkt-line.c:217 |
c1ac5258 JX |
5373 | msgid "packet write failed" |
5374 | msgstr "数据包写入失败" | |
5375 | ||
7157c2b5 | 5376 | #: pkt-line.c:302 |
c1ac5258 JX |
5377 | msgid "read error" |
5378 | msgstr "读取错误" | |
5379 | ||
7157c2b5 | 5380 | #: pkt-line.c:310 |
c1ac5258 JX |
5381 | msgid "the remote end hung up unexpectedly" |
5382 | msgstr "远端意外挂断了" | |
5383 | ||
7157c2b5 | 5384 | #: pkt-line.c:338 |
c1ac5258 JX |
5385 | #, c-format |
5386 | msgid "protocol error: bad line length character: %.4s" | |
5387 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
5388 | ||
7157c2b5 | 5389 | #: pkt-line.c:352 pkt-line.c:357 |
c1ac5258 JX |
5390 | #, c-format |
5391 | msgid "protocol error: bad line length %d" | |
5392 | msgstr "协议错误:错误的行长度 %d" | |
5393 | ||
7157c2b5 | 5394 | #: pkt-line.c:373 |
06991777 JX |
5395 | #, c-format |
5396 | msgid "remote error: %s" | |
5397 | msgstr "远程错误:%s" | |
5398 | ||
5399 | #: preload-index.c:119 | |
4c27fcb5 JX |
5400 | msgid "Refreshing index" |
5401 | msgstr "正在刷新索引" | |
5402 | ||
06991777 | 5403 | #: preload-index.c:138 |
4c27fcb5 JX |
5404 | #, c-format |
5405 | msgid "unable to create threaded lstat: %s" | |
5406 | msgstr "无法创建线程 lstat:%s" | |
5407 | ||
349ede6a | 5408 | #: pretty.c:982 |
a0b6b246 JX |
5409 | msgid "unable to parse --pretty format" |
5410 | msgstr "不能解析 --pretty 格式" | |
5411 | ||
ddc12c42 | 5412 | #: promisor-remote.c:23 |
a5cd71ca JX |
5413 | msgid "Remote with no URL" |
5414 | msgstr "远程未设置 URL" | |
5415 | ||
ddc12c42 | 5416 | #: promisor-remote.c:58 |
a5cd71ca JX |
5417 | #, c-format |
5418 | msgid "promisor remote name cannot begin with '/': %s" | |
5419 | msgstr "promisor 远程名称不能以 '/' 开始:%s" | |
5420 | ||
349ede6a JX |
5421 | #: prune-packed.c:35 |
5422 | msgid "Removing duplicate objects" | |
5423 | msgstr "正在删除重复对象" | |
5424 | ||
5425 | #: range-diff.c:77 | |
c1ac5258 JX |
5426 | msgid "could not start `log`" |
5427 | msgstr "不能启动 `log`" | |
5428 | ||
349ede6a | 5429 | #: range-diff.c:79 |
c1ac5258 JX |
5430 | msgid "could not read `log` output" |
5431 | msgstr "不能读取 `log` 的输出" | |
5432 | ||
349ede6a | 5433 | #: range-diff.c:98 sequencer.c:5143 |
c1ac5258 JX |
5434 | #, c-format |
5435 | msgid "could not parse commit '%s'" | |
5436 | msgstr "不能解析提交 '%s'" | |
5437 | ||
349ede6a JX |
5438 | #: range-diff.c:112 |
5439 | #, c-format | |
5440 | msgid "" | |
5441 | "could not parse first line of `log` output: did not start with 'commit ': " | |
5442 | "'%s'" | |
5443 | msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'" | |
5444 | ||
5445 | #: range-diff.c:137 | |
a6cd2cc4 JX |
5446 | #, c-format |
5447 | msgid "could not parse git header '%.*s'" | |
5448 | msgstr "无法解析 git 头 '%.*s'" | |
5449 | ||
349ede6a | 5450 | #: range-diff.c:301 |
c1ac5258 JX |
5451 | msgid "failed to generate diff" |
5452 | msgstr "生成 diff 失败" | |
5453 | ||
349ede6a | 5454 | #: range-diff.c:534 range-diff.c:536 |
c1ac5258 JX |
5455 | #, c-format |
5456 | msgid "could not parse log for '%s'" | |
5457 | msgstr "不能解析 '%s' 的日志" | |
5458 | ||
d46c5519 | 5459 | #: read-cache.c:680 |
06991777 JX |
5460 | #, c-format |
5461 | msgid "will not add file alias '%s' ('%s' already exists in index)" | |
5462 | msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" | |
5463 | ||
d46c5519 | 5464 | #: read-cache.c:696 |
06991777 JX |
5465 | msgid "cannot create an empty blob in the object database" |
5466 | msgstr "不能在对象数据库中创建空的数据对象" | |
5467 | ||
d46c5519 | 5468 | #: read-cache.c:718 |
06991777 JX |
5469 | #, c-format |
5470 | msgid "%s: can only add regular files, symbolic links or git-directories" | |
5471 | msgstr "%s:只能添加常规文件、符号链接或 git 目录" | |
5472 | ||
d46c5519 JX |
5473 | #: read-cache.c:723 |
5474 | #, c-format | |
5475 | msgid "'%s' does not have a commit checked out" | |
5476 | msgstr "'%s' 没有检出一个提交" | |
5477 | ||
5478 | #: read-cache.c:775 | |
06991777 JX |
5479 | #, c-format |
5480 | msgid "unable to index file '%s'" | |
5481 | msgstr "无法索引文件 '%s'" | |
5482 | ||
d46c5519 | 5483 | #: read-cache.c:794 |
06991777 JX |
5484 | #, c-format |
5485 | msgid "unable to add '%s' to index" | |
5486 | msgstr "无法在索引中添加 '%s'" | |
5487 | ||
d46c5519 | 5488 | #: read-cache.c:805 |
06991777 JX |
5489 | #, c-format |
5490 | msgid "unable to stat '%s'" | |
5491 | msgstr "无法对 %s 执行 stat" | |
5492 | ||
2b472aae | 5493 | #: read-cache.c:1330 |
06991777 JX |
5494 | #, c-format |
5495 | msgid "'%s' appears as both a file and as a directory" | |
5b533632 | 5496 | msgstr "'%s' 看起来既是文件又是目录" |
06991777 | 5497 | |
2b472aae | 5498 | #: read-cache.c:1536 |
4c27fcb5 JX |
5499 | msgid "Refresh index" |
5500 | msgstr "刷新索引" | |
5501 | ||
2b472aae | 5502 | #: read-cache.c:1651 |
5b04ee3b JX |
5503 | #, c-format |
5504 | msgid "" | |
a0b6b246 JX |
5505 | "index.version set, but the value is invalid.\n" |
5506 | "Using version %i" | |
5b04ee3b | 5507 | msgstr "" |
a0b6b246 JX |
5508 | "设置了 index.version,但是取值无效。\n" |
5509 | "使用版本 %i" | |
5b04ee3b | 5510 | |
2b472aae | 5511 | #: read-cache.c:1661 |
5b04ee3b JX |
5512 | #, c-format |
5513 | msgid "" | |
a0b6b246 JX |
5514 | "GIT_INDEX_VERSION set, but the value is invalid.\n" |
5515 | "Using version %i" | |
5b04ee3b | 5516 | msgstr "" |
a0b6b246 JX |
5517 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" |
5518 | "使用版本 %i" | |
5b04ee3b | 5519 | |
2b472aae | 5520 | #: read-cache.c:1717 |
06991777 JX |
5521 | #, c-format |
5522 | msgid "bad signature 0x%08x" | |
5523 | msgstr "坏的签名 0x%08x" | |
5524 | ||
2b472aae | 5525 | #: read-cache.c:1720 |
06991777 JX |
5526 | #, c-format |
5527 | msgid "bad index version %d" | |
5528 | msgstr "坏的索引版本 %d" | |
5529 | ||
2b472aae | 5530 | #: read-cache.c:1729 |
06991777 | 5531 | msgid "bad index file sha1 signature" |
5b533632 | 5532 | msgstr "坏的索引文件 sha1 签名" |
06991777 | 5533 | |
2b472aae | 5534 | #: read-cache.c:1759 |
06991777 JX |
5535 | #, c-format |
5536 | msgid "index uses %.4s extension, which we do not understand" | |
5537 | msgstr "索引使用不被支持的 %.4s 扩展" | |
5538 | ||
5539 | # | |
2b472aae | 5540 | #: read-cache.c:1761 |
06991777 JX |
5541 | #, c-format |
5542 | msgid "ignoring %.4s extension" | |
5543 | msgstr "忽略 %.4s 扩展" | |
5544 | ||
2b472aae | 5545 | #: read-cache.c:1798 |
06991777 JX |
5546 | #, c-format |
5547 | msgid "unknown index entry format 0x%08x" | |
5548 | msgstr "未知的索引条目格式 0x%08x" | |
5549 | ||
2b472aae | 5550 | #: read-cache.c:1814 |
4c27fcb5 JX |
5551 | #, c-format |
5552 | msgid "malformed name field in the index, near path '%s'" | |
5553 | msgstr "索引中靠近路径 '%s' 有错误的名称字段" | |
5554 | ||
2b472aae | 5555 | #: read-cache.c:1871 |
06991777 JX |
5556 | msgid "unordered stage entries in index" |
5557 | msgstr "索引中有未排序的暂存条目" | |
5558 | ||
2b472aae | 5559 | #: read-cache.c:1874 |
06991777 JX |
5560 | #, c-format |
5561 | msgid "multiple stage entries for merged file '%s'" | |
5562 | msgstr "合并文件 '%s' 有多个暂存条目" | |
5563 | ||
2b472aae | 5564 | #: read-cache.c:1877 |
06991777 JX |
5565 | #, c-format |
5566 | msgid "unordered stage entries for '%s'" | |
5567 | msgstr "'%s' 的未排序暂存条目" | |
5568 | ||
2b472aae JX |
5569 | #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 |
5570 | #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 | |
7157c2b5 | 5571 | #: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 |
349ede6a JX |
5572 | #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 |
5573 | #: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 | |
2b472aae | 5574 | #: builtin/submodule--helper.c:332 |
4c27fcb5 JX |
5575 | msgid "index file corrupt" |
5576 | msgstr "索引文件损坏" | |
5577 | ||
2b472aae | 5578 | #: read-cache.c:2124 |
4c27fcb5 JX |
5579 | #, c-format |
5580 | msgid "unable to create load_cache_entries thread: %s" | |
5581 | msgstr "无法创建 load_cache_entries 线程:%s" | |
5582 | ||
2b472aae | 5583 | #: read-cache.c:2137 |
4c27fcb5 JX |
5584 | #, c-format |
5585 | msgid "unable to join load_cache_entries thread: %s" | |
5586 | msgstr "无法加入 load_cache_entries 线程:%s" | |
5587 | ||
2b472aae | 5588 | #: read-cache.c:2170 |
06991777 JX |
5589 | #, c-format |
5590 | msgid "%s: index file open failed" | |
5591 | msgstr "%s:打开索引文件失败" | |
5592 | ||
2b472aae | 5593 | #: read-cache.c:2174 |
06991777 JX |
5594 | #, c-format |
5595 | msgid "%s: cannot stat the open index" | |
5596 | msgstr "%s:不能对打开的索引执行 stat 操作" | |
5597 | ||
2b472aae | 5598 | #: read-cache.c:2178 |
06991777 JX |
5599 | #, c-format |
5600 | msgid "%s: index file smaller than expected" | |
5601 | msgstr "%s:索引文件比预期的小" | |
5602 | ||
2b472aae | 5603 | #: read-cache.c:2182 |
06991777 JX |
5604 | #, c-format |
5605 | msgid "%s: unable to map index file" | |
5606 | msgstr "%s:无法对索引文件执行 map 操作" | |
5607 | ||
2b472aae | 5608 | #: read-cache.c:2224 |
4c27fcb5 JX |
5609 | #, c-format |
5610 | msgid "unable to create load_index_extensions thread: %s" | |
5611 | msgstr "无法创建 load_index_extensions 线程:%s" | |
5612 | ||
2b472aae | 5613 | #: read-cache.c:2251 |
4c27fcb5 JX |
5614 | #, c-format |
5615 | msgid "unable to join load_index_extensions thread: %s" | |
5616 | msgstr "无法加入 load_index_extensions 线程:%s" | |
5617 | ||
2b472aae | 5618 | #: read-cache.c:2283 |
06991777 JX |
5619 | #, c-format |
5620 | msgid "could not freshen shared index '%s'" | |
5621 | msgstr "无法刷新共享索引 '%s'" | |
5622 | ||
2b472aae | 5623 | #: read-cache.c:2330 |
06991777 JX |
5624 | #, c-format |
5625 | msgid "broken index, expect %s in %s, got %s" | |
5626 | msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" | |
5627 | ||
7157c2b5 | 5628 | #: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 |
a4f16749 JX |
5629 | #, c-format |
5630 | msgid "could not close '%s'" | |
5631 | msgstr "不能关闭 '%s'" | |
5632 | ||
349ede6a | 5633 | #: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 |
87cb7997 | 5634 | #, c-format |
60638e98 | 5635 | msgid "could not stat '%s'" |
65e2041e | 5636 | msgstr "不能对 '%s' 调用 stat" |
87cb7997 | 5637 | |
2b472aae | 5638 | #: read-cache.c:3142 |
87cb7997 JX |
5639 | #, c-format |
5640 | msgid "unable to open git dir: %s" | |
5641 | msgstr "不能打开 git 目录:%s" | |
5642 | ||
2b472aae | 5643 | #: read-cache.c:3154 |
87cb7997 JX |
5644 | #, c-format |
5645 | msgid "unable to unlink: %s" | |
5646 | msgstr "无法删除:%s" | |
5647 | ||
2b472aae | 5648 | #: read-cache.c:3179 |
06991777 JX |
5649 | #, c-format |
5650 | msgid "cannot fix permission bits on '%s'" | |
5651 | msgstr "不能修复 '%s' 的权限位" | |
5652 | ||
2b472aae | 5653 | #: read-cache.c:3328 |
06991777 JX |
5654 | #, c-format |
5655 | msgid "%s: cannot drop to stage #0" | |
5656 | msgstr "%s:不能落到暂存区 #0" | |
5657 | ||
2b472aae JX |
5658 | #: rebase-interactive.c:11 |
5659 | msgid "" | |
5660 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
5661 | "continue'.\n" | |
5662 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
5663 | msgstr "" | |
5664 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
5665 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
5666 | ||
5667 | #: rebase-interactive.c:33 | |
d46c5519 JX |
5668 | #, c-format |
5669 | msgid "" | |
5670 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." | |
5671 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
5672 | ||
2b472aae | 5673 | #: rebase-interactive.c:42 |
4c27fcb5 JX |
5674 | msgid "" |
5675 | "\n" | |
5676 | "Commands:\n" | |
5677 | "p, pick <commit> = use commit\n" | |
5678 | "r, reword <commit> = use commit, but edit the commit message\n" | |
5679 | "e, edit <commit> = use commit, but stop for amending\n" | |
5680 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
5681 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
5682 | "x, exec <command> = run command (the rest of the line) using shell\n" | |
5683 | "b, break = stop here (continue rebase later with 'git rebase --continue')\n" | |
5684 | "d, drop <commit> = remove commit\n" | |
5685 | "l, label <label> = label current HEAD with a name\n" | |
5686 | "t, reset <label> = reset HEAD to a label\n" | |
5687 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
5688 | ". create a merge commit using the original merge commit's\n" | |
5689 | ". message (or the oneline, if no original merge commit was\n" | |
5690 | ". specified). Use -c <commit> to reword the commit message.\n" | |
5691 | "\n" | |
5692 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
5693 | msgstr "" | |
5694 | "\n" | |
5695 | "命令:\n" | |
5696 | "p, pick <提交> = 使用提交\n" | |
5697 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
5698 | "e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n" | |
5699 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
5700 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
5701 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
5702 | "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n" | |
5703 | "d, drop <提交> = 删除提交\n" | |
5704 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
5705 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
5706 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
5707 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
5708 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
5709 | ". -c <提交> 可以编辑提交说明。\n" | |
5710 | "\n" | |
5711 | "可以对这些行重新排序,将从上至下执行。\n" | |
5712 | ||
2b472aae | 5713 | #: rebase-interactive.c:63 |
d46c5519 JX |
5714 | #, c-format |
5715 | msgid "Rebase %s onto %s (%d command)" | |
5716 | msgid_plural "Rebase %s onto %s (%d commands)" | |
5717 | msgstr[0] "变基 %s 到 %s(%d 个提交)" | |
5718 | msgstr[1] "变基 %s 到 %s(%d 个提交)" | |
5719 | ||
2b472aae | 5720 | #: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 |
4c27fcb5 JX |
5721 | msgid "" |
5722 | "\n" | |
5723 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
5724 | msgstr "" | |
5725 | "\n" | |
5726 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
5727 | ||
2b472aae | 5728 | #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 |
4c27fcb5 JX |
5729 | msgid "" |
5730 | "\n" | |
5731 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
5732 | msgstr "" | |
5733 | "\n" | |
5734 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
5735 | ||
2b472aae | 5736 | #: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 |
4c27fcb5 JX |
5737 | msgid "" |
5738 | "\n" | |
5739 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
5740 | "To continue rebase after editing, run:\n" | |
5741 | " git rebase --continue\n" | |
5742 | "\n" | |
5743 | msgstr "" | |
5744 | "\n" | |
5745 | "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
5746 | "请执行:\n" | |
5747 | " git rebase --continue\n" | |
5748 | "\n" | |
5749 | ||
2b472aae | 5750 | #: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 |
4c27fcb5 JX |
5751 | msgid "" |
5752 | "\n" | |
5753 | "However, if you remove everything, the rebase will be aborted.\n" | |
5754 | "\n" | |
5755 | msgstr "" | |
5756 | "\n" | |
5757 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
5758 | "\n" | |
5759 | ||
349ede6a JX |
5760 | #: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 |
5761 | #: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 | |
4c27fcb5 | 5762 | #, c-format |
d46c5519 JX |
5763 | msgid "could not write '%s'" |
5764 | msgstr "不能写入 '%s'" | |
5765 | ||
349ede6a JX |
5766 | #: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 |
5767 | #: builtin/rebase.c:240 | |
d46c5519 | 5768 | #, c-format |
2b472aae JX |
5769 | msgid "could not write '%s'." |
5770 | msgstr "不能写入 '%s'。" | |
d46c5519 | 5771 | |
2b472aae | 5772 | #: rebase-interactive.c:193 |
d46c5519 JX |
5773 | #, c-format |
5774 | msgid "" | |
5775 | "Warning: some commits may have been dropped accidentally.\n" | |
5776 | "Dropped commits (newer to older):\n" | |
5777 | msgstr "" | |
5778 | "警告:一些提交可能被意外丢弃。\n" | |
5779 | "丢弃的提交(从新到旧):\n" | |
5780 | ||
2b472aae | 5781 | #: rebase-interactive.c:200 |
d46c5519 JX |
5782 | #, c-format |
5783 | msgid "" | |
5784 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
5785 | "\n" | |
5786 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
5787 | "warnings.\n" | |
5788 | "The possible behaviours are: ignore, warn, error.\n" | |
5789 | "\n" | |
5790 | msgstr "" | |
5791 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
5792 | "\n" | |
5793 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
5794 | "可选值有:ignore、warn、error。\n" | |
5795 | "\n" | |
4c27fcb5 | 5796 | |
349ede6a JX |
5797 | #: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 |
5798 | #: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 | |
5799 | #: builtin/rebase.c:252 | |
2b472aae JX |
5800 | #, c-format |
5801 | msgid "could not read '%s'." | |
5802 | msgstr "不能读取 '%s'。" | |
5803 | ||
7157c2b5 | 5804 | #: ref-filter.c:42 wt-status.c:1977 |
349ede6a JX |
5805 | msgid "gone" |
5806 | msgstr "丢失" | |
c1ac5258 | 5807 | |
349ede6a | 5808 | #: ref-filter.c:43 |
c1ac5258 | 5809 | #, c-format |
349ede6a JX |
5810 | msgid "ahead %d" |
5811 | msgstr "领先 %d" | |
c1ac5258 | 5812 | |
349ede6a | 5813 | #: ref-filter.c:44 |
c1ac5258 | 5814 | #, c-format |
349ede6a JX |
5815 | msgid "behind %d" |
5816 | msgstr "落后 %d" | |
c1ac5258 | 5817 | |
349ede6a | 5818 | #: ref-filter.c:45 |
c1ac5258 | 5819 | #, c-format |
349ede6a JX |
5820 | msgid "ahead %d, behind %d" |
5821 | msgstr "领先 %d,落后 %d" | |
c1ac5258 | 5822 | |
349ede6a | 5823 | #: ref-filter.c:165 |
c1ac5258 | 5824 | #, c-format |
349ede6a JX |
5825 | msgid "expected format: %%(color:<color>)" |
5826 | msgstr "期望的格式:%%(color:<颜色>)" | |
c1ac5258 | 5827 | |
349ede6a | 5828 | #: ref-filter.c:167 |
c1ac5258 | 5829 | #, c-format |
349ede6a JX |
5830 | msgid "unrecognized color: %%(color:%s)" |
5831 | msgstr "未能识别的颜色:%%(color:%s)" | |
c1ac5258 | 5832 | |
349ede6a | 5833 | #: ref-filter.c:189 |
c1ac5258 | 5834 | #, c-format |
349ede6a JX |
5835 | msgid "Integer value expected refname:lstrip=%s" |
5836 | msgstr "期望整数值 refname:lstrip=%s" | |
c1ac5258 | 5837 | |
349ede6a | 5838 | #: ref-filter.c:193 |
c1ac5258 | 5839 | #, c-format |
349ede6a JX |
5840 | msgid "Integer value expected refname:rstrip=%s" |
5841 | msgstr "期望整数值 refname:rstrip=%s" | |
c1ac5258 | 5842 | |
349ede6a | 5843 | #: ref-filter.c:195 |
5b04ee3b | 5844 | #, c-format |
349ede6a JX |
5845 | msgid "unrecognized %%(%s) argument: %s" |
5846 | msgstr "未能识别的 %%(%s) 参数:%s" | |
5b04ee3b | 5847 | |
349ede6a | 5848 | #: ref-filter.c:250 |
c1ac5258 | 5849 | #, c-format |
349ede6a JX |
5850 | msgid "%%(objecttype) does not take arguments" |
5851 | msgstr "%%(objecttype) 不带参数" | |
c1ac5258 | 5852 | |
349ede6a | 5853 | #: ref-filter.c:272 |
c1ac5258 | 5854 | #, c-format |
349ede6a JX |
5855 | msgid "unrecognized %%(objectsize) argument: %s" |
5856 | msgstr "未能识别的 %%(objectsize) 参数:%s" | |
c1ac5258 | 5857 | |
349ede6a | 5858 | #: ref-filter.c:280 |
c1ac5258 | 5859 | #, c-format |
349ede6a JX |
5860 | msgid "%%(deltabase) does not take arguments" |
5861 | msgstr "%%(deltabase) 不带参数" | |
c1ac5258 | 5862 | |
349ede6a | 5863 | #: ref-filter.c:292 |
c1ac5258 | 5864 | #, c-format |
349ede6a JX |
5865 | msgid "%%(body) does not take arguments" |
5866 | msgstr "%%(body) 不带参数" | |
c1ac5258 | 5867 | |
349ede6a | 5868 | #: ref-filter.c:301 |
c1ac5258 | 5869 | #, c-format |
349ede6a JX |
5870 | msgid "%%(subject) does not take arguments" |
5871 | msgstr "%%(subject) 不带参数" | |
c1ac5258 | 5872 | |
349ede6a | 5873 | #: ref-filter.c:323 |
1a79b2f1 | 5874 | #, c-format |
6937cb4e JX |
5875 | msgid "unknown %%(trailers) argument: %s" |
5876 | msgstr "未知的 %%(trailers) 参数:%s" | |
1a79b2f1 | 5877 | |
a5cd71ca | 5878 | #: ref-filter.c:352 |
a0b6b246 JX |
5879 | #, c-format |
5880 | msgid "positive value expected contents:lines=%s" | |
87cb7997 | 5881 | msgstr "期望一个正数 contents:lines=%s" |
90314792 | 5882 | |
a5cd71ca | 5883 | #: ref-filter.c:354 |
a0b6b246 JX |
5884 | #, c-format |
5885 | msgid "unrecognized %%(contents) argument: %s" | |
5886 | msgstr "未能识别的 %%(contents) 参数:%s" | |
90314792 | 5887 | |
a5cd71ca | 5888 | #: ref-filter.c:369 |
87cb7997 JX |
5889 | #, c-format |
5890 | msgid "positive value expected objectname:short=%s" | |
5891 | msgstr "期望一个正数 objectname:short=%s" | |
5892 | ||
a5cd71ca | 5893 | #: ref-filter.c:373 |
a0b6b246 JX |
5894 | #, c-format |
5895 | msgid "unrecognized %%(objectname) argument: %s" | |
5896 | msgstr "未能识别的 %%(objectname) 参数:%s" | |
90314792 | 5897 | |
a5cd71ca | 5898 | #: ref-filter.c:403 |
a0b6b246 JX |
5899 | #, c-format |
5900 | msgid "expected format: %%(align:<width>,<position>)" | |
58b6f078 | 5901 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" |
90314792 | 5902 | |
a5cd71ca | 5903 | #: ref-filter.c:415 |
5c57d762 | 5904 | #, c-format |
a0b6b246 JX |
5905 | msgid "unrecognized position:%s" |
5906 | msgstr "未能识别的位置:%s" | |
5c57d762 | 5907 | |
a5cd71ca | 5908 | #: ref-filter.c:422 |
1b7f4a34 | 5909 | #, c-format |
a0b6b246 JX |
5910 | msgid "unrecognized width:%s" |
5911 | msgstr "未能识别的宽度:%s" | |
1b7f4a34 | 5912 | |
a5cd71ca | 5913 | #: ref-filter.c:431 |
1b7f4a34 | 5914 | #, c-format |
a0b6b246 JX |
5915 | msgid "unrecognized %%(align) argument: %s" |
5916 | msgstr "未能识别的 %%(align) 参数:%s" | |
1b7f4a34 | 5917 | |
a5cd71ca | 5918 | #: ref-filter.c:439 |
1b7f4a34 | 5919 | #, c-format |
a0b6b246 JX |
5920 | msgid "positive width expected with the %%(align) atom" |
5921 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
1b7f4a34 | 5922 | |
a5cd71ca | 5923 | #: ref-filter.c:457 |
87cb7997 JX |
5924 | #, c-format |
5925 | msgid "unrecognized %%(if) argument: %s" | |
5926 | msgstr "未能识别的 %%(if) 参数:%s" | |
5927 | ||
a5cd71ca | 5928 | #: ref-filter.c:559 |
07432cef | 5929 | #, c-format |
a0b6b246 | 5930 | msgid "malformed field name: %.*s" |
fd8cb379 | 5931 | msgstr "格式错误的字段名:%.*s" |
ef317cd5 | 5932 | |
a5cd71ca | 5933 | #: ref-filter.c:586 |
a0b6b246 JX |
5934 | #, c-format |
5935 | msgid "unknown field name: %.*s" | |
5936 | msgstr "未知的字段名:%.*s" | |
220c313c | 5937 | |
a5cd71ca | 5938 | #: ref-filter.c:590 |
4c27fcb5 JX |
5939 | #, c-format |
5940 | msgid "" | |
5941 | "not a git repository, but the field '%.*s' requires access to object data" | |
5942 | msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据" | |
5943 | ||
a5cd71ca | 5944 | #: ref-filter.c:714 |
87cb7997 JX |
5945 | #, c-format |
5946 | msgid "format: %%(if) atom used without a %%(then) atom" | |
5947 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
5948 | ||
a5cd71ca | 5949 | #: ref-filter.c:777 |
87cb7997 JX |
5950 | #, c-format |
5951 | msgid "format: %%(then) atom used without an %%(if) atom" | |
5952 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
5953 | ||
a5cd71ca | 5954 | #: ref-filter.c:779 |
87cb7997 JX |
5955 | #, c-format |
5956 | msgid "format: %%(then) atom used more than once" | |
5957 | msgstr "格式:%%(then) 元素用了多次" | |
5958 | ||
a5cd71ca | 5959 | #: ref-filter.c:781 |
87cb7997 JX |
5960 | #, c-format |
5961 | msgid "format: %%(then) atom used after %%(else)" | |
5962 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
5963 | ||
a5cd71ca | 5964 | #: ref-filter.c:809 |
87cb7997 JX |
5965 | #, c-format |
5966 | msgid "format: %%(else) atom used without an %%(if) atom" | |
5967 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
5968 | ||
a5cd71ca | 5969 | #: ref-filter.c:811 |
87cb7997 JX |
5970 | #, c-format |
5971 | msgid "format: %%(else) atom used without a %%(then) atom" | |
5972 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
5973 | ||
a5cd71ca | 5974 | #: ref-filter.c:813 |
87cb7997 JX |
5975 | #, c-format |
5976 | msgid "format: %%(else) atom used more than once" | |
5977 | msgstr "格式:%%(else) 元素用了多次" | |
5978 | ||
a5cd71ca | 5979 | #: ref-filter.c:828 |
7aea43ff | 5980 | #, c-format |
a0b6b246 JX |
5981 | msgid "format: %%(end) atom used without corresponding atom" |
5982 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
7aea43ff | 5983 | |
a5cd71ca | 5984 | #: ref-filter.c:885 |
7aea43ff | 5985 | #, c-format |
a0b6b246 | 5986 | msgid "malformed format string %s" |
fd8cb379 | 5987 | msgstr "错误的格式化字符串 %s" |
7aea43ff | 5988 | |
349ede6a | 5989 | #: ref-filter.c:1486 |
87cb7997 | 5990 | #, c-format |
a6cd2cc4 JX |
5991 | msgid "no branch, rebasing %s" |
5992 | msgstr "非分支,正变基 %s" | |
c04f5ac3 | 5993 | |
349ede6a | 5994 | #: ref-filter.c:1489 |
c04f5ac3 | 5995 | #, c-format |
a6cd2cc4 JX |
5996 | msgid "no branch, rebasing detached HEAD %s" |
5997 | msgstr "非分支,正变基分离头指针 %s" | |
c04f5ac3 | 5998 | |
349ede6a | 5999 | #: ref-filter.c:1492 |
a0b6b246 | 6000 | #, c-format |
a6cd2cc4 JX |
6001 | msgid "no branch, bisect started on %s" |
6002 | msgstr "非分支,二分查找开始于 %s" | |
6792b93b | 6003 | |
349ede6a | 6004 | #: ref-filter.c:1502 |
a6cd2cc4 JX |
6005 | msgid "no branch" |
6006 | msgstr "非分支" | |
87cb7997 | 6007 | |
349ede6a | 6008 | #: ref-filter.c:1538 ref-filter.c:1747 |
a0b6b246 JX |
6009 | #, c-format |
6010 | msgid "missing object %s for %s" | |
6011 | msgstr "缺失 %2$s 的对象 %1$s" | |
c04f5ac3 | 6012 | |
349ede6a | 6013 | #: ref-filter.c:1548 |
a0b6b246 JX |
6014 | #, c-format |
6015 | msgid "parse_object_buffer failed on %s for %s" | |
6016 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
6792b93b | 6017 | |
349ede6a | 6018 | #: ref-filter.c:2001 |
a0b6b246 JX |
6019 | #, c-format |
6020 | msgid "malformed object at '%s'" | |
fd8cb379 | 6021 | msgstr "格式错误的对象 '%s'" |
c04f5ac3 | 6022 | |
349ede6a | 6023 | #: ref-filter.c:2090 |
a0b6b246 JX |
6024 | #, c-format |
6025 | msgid "ignoring ref with broken name %s" | |
6026 | msgstr "忽略带有错误名称 %s 的引用" | |
c04f5ac3 | 6027 | |
7157c2b5 | 6028 | #: ref-filter.c:2095 refs.c:657 |
349ede6a JX |
6029 | #, c-format |
6030 | msgid "ignoring broken ref %s" | |
6031 | msgstr "忽略损坏的引用 %s" | |
6032 | ||
6033 | #: ref-filter.c:2395 | |
a0b6b246 JX |
6034 | #, c-format |
6035 | msgid "format: %%(end) atom missing" | |
6036 | msgstr "格式:缺少 %%(end) 元素" | |
c04f5ac3 | 6037 | |
349ede6a | 6038 | #: ref-filter.c:2495 |
06991777 JX |
6039 | #, c-format |
6040 | msgid "option `%s' is incompatible with --merged" | |
6041 | msgstr "选项 `%s' 和 --merged 不兼容" | |
6042 | ||
349ede6a | 6043 | #: ref-filter.c:2498 |
06991777 JX |
6044 | #, c-format |
6045 | msgid "option `%s' is incompatible with --no-merged" | |
6046 | msgstr "选项 `%s' 和 --no-merged 不兼容" | |
6047 | ||
349ede6a | 6048 | #: ref-filter.c:2508 |
a0b6b246 JX |
6049 | #, c-format |
6050 | msgid "malformed object name %s" | |
fd8cb379 | 6051 | msgstr "格式错误的对象名 %s" |
c04f5ac3 | 6052 | |
349ede6a | 6053 | #: ref-filter.c:2513 |
06991777 JX |
6054 | #, c-format |
6055 | msgid "option `%s' must point to a commit" | |
6056 | msgstr "选项 `%s' 必须指向一个提交" | |
6057 | ||
7157c2b5 | 6058 | #: refs.c:264 |
349ede6a JX |
6059 | #, c-format |
6060 | msgid "%s does not point to a valid object!" | |
6061 | msgstr "%s 没有指向一个有效的对象!" | |
6062 | ||
7157c2b5 JX |
6063 | #: refs.c:572 |
6064 | #, c-format | |
6065 | msgid "could not retrieve `%s`" | |
6066 | msgstr "无法获取 `%s`" | |
6067 | ||
6068 | #: refs.c:579 | |
6069 | #, c-format | |
6070 | msgid "invalid branch name: %s = %s" | |
6071 | msgstr "无效的分支名:%s = %s" | |
6072 | ||
6073 | #: refs.c:655 | |
349ede6a JX |
6074 | #, c-format |
6075 | msgid "ignoring dangling symref %s" | |
6076 | msgstr "忽略悬空符号引用 %s" | |
6077 | ||
7157c2b5 | 6078 | #: refs.c:792 |
349ede6a JX |
6079 | #, c-format |
6080 | msgid "could not open '%s' for writing: %s" | |
6081 | msgstr "无法为写入打开 '%s':%s" | |
6082 | ||
7157c2b5 | 6083 | #: refs.c:802 refs.c:853 |
349ede6a JX |
6084 | #, c-format |
6085 | msgid "could not read ref '%s'" | |
6086 | msgstr "无法读取引用 '%s'" | |
6087 | ||
7157c2b5 | 6088 | #: refs.c:808 |
349ede6a JX |
6089 | #, c-format |
6090 | msgid "ref '%s' already exists" | |
6091 | msgstr "引用 '%s' 已经存在" | |
6092 | ||
7157c2b5 | 6093 | #: refs.c:813 |
349ede6a JX |
6094 | #, c-format |
6095 | msgid "unexpected object ID when writing '%s'" | |
6096 | msgstr "写入 '%s' 时意外的对象 ID" | |
6097 | ||
7157c2b5 JX |
6098 | #: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 |
6099 | #: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 | |
6100 | #: wrapper.c:628 | |
349ede6a JX |
6101 | #, c-format |
6102 | msgid "could not write to '%s'" | |
6103 | msgstr "不能写入 '%s'" | |
6104 | ||
7157c2b5 | 6105 | #: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 |
349ede6a JX |
6106 | #: builtin/rebase.c:852 |
6107 | #, c-format | |
6108 | msgid "could not open '%s' for writing" | |
6109 | msgstr "无法打开 '%s' 进行写入" | |
6110 | ||
7157c2b5 | 6111 | #: refs.c:855 |
349ede6a JX |
6112 | #, c-format |
6113 | msgid "unexpected object ID when deleting '%s'" | |
6114 | msgstr "删除 '%s' 时意外的对象 ID" | |
6115 | ||
7157c2b5 | 6116 | #: refs.c:986 |
349ede6a JX |
6117 | #, c-format |
6118 | msgid "log for ref %s has gap after %s" | |
6119 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
6120 | ||
7157c2b5 | 6121 | #: refs.c:992 |
349ede6a JX |
6122 | #, c-format |
6123 | msgid "log for ref %s unexpectedly ended on %s" | |
6124 | msgstr "引用 %s 的日志意外终止于 %s " | |
6125 | ||
7157c2b5 | 6126 | #: refs.c:1051 |
349ede6a JX |
6127 | #, c-format |
6128 | msgid "log for %s is empty" | |
6129 | msgstr "%s 的日志为空" | |
6130 | ||
7157c2b5 | 6131 | #: refs.c:1143 |
349ede6a JX |
6132 | #, c-format |
6133 | msgid "refusing to update ref with bad name '%s'" | |
6134 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
6135 | ||
7157c2b5 | 6136 | #: refs.c:1219 |
349ede6a JX |
6137 | #, c-format |
6138 | msgid "update_ref failed for ref '%s': %s" | |
6139 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
6140 | ||
7157c2b5 | 6141 | #: refs.c:2011 |
349ede6a JX |
6142 | #, c-format |
6143 | msgid "multiple updates for ref '%s' not allowed" | |
6144 | msgstr "不允许对引用 '%s' 多次更新" | |
6145 | ||
7157c2b5 | 6146 | #: refs.c:2098 |
349ede6a JX |
6147 | msgid "ref updates forbidden inside quarantine environment" |
6148 | msgstr "在隔离环境中禁止更新引用" | |
6149 | ||
7157c2b5 JX |
6150 | #: refs.c:2109 |
6151 | msgid "ref updates aborted by hook" | |
6152 | msgstr "引用更新被钩子中止" | |
6153 | ||
6154 | #: refs.c:2209 refs.c:2239 | |
349ede6a JX |
6155 | #, c-format |
6156 | msgid "'%s' exists; cannot create '%s'" | |
6157 | msgstr "'%s' 已存在,无法创建 '%s'" | |
6158 | ||
7157c2b5 | 6159 | #: refs.c:2215 refs.c:2250 |
349ede6a JX |
6160 | #, c-format |
6161 | msgid "cannot process '%s' and '%s' at the same time" | |
6162 | msgstr "无法同时处理 '%s' 和 '%s'" | |
6163 | ||
6164 | #: refs/files-backend.c:1233 | |
6165 | #, c-format | |
6166 | msgid "could not remove reference %s" | |
6167 | msgstr "无法删除引用 %s" | |
6168 | ||
6169 | #: refs/files-backend.c:1247 refs/packed-backend.c:1541 | |
6170 | #: refs/packed-backend.c:1551 | |
6171 | #, c-format | |
6172 | msgid "could not delete reference %s: %s" | |
6173 | msgstr "无法删除引用 %s:%s" | |
6174 | ||
6175 | #: refs/files-backend.c:1250 refs/packed-backend.c:1554 | |
6176 | #, c-format | |
6177 | msgid "could not delete references: %s" | |
6178 | msgstr "无法删除引用:%s" | |
6179 | ||
6180 | #: refspec.c:137 | |
6181 | #, c-format | |
6182 | msgid "invalid refspec '%s'" | |
6183 | msgstr "无效的引用表达式:'%s'" | |
6184 | ||
6185 | #: remote.c:355 | |
06991777 JX |
6186 | #, c-format |
6187 | msgid "config remote shorthand cannot begin with '/': %s" | |
5b533632 | 6188 | msgstr "配置的远程短名称不能以 '/' 开始:%s" |
06991777 | 6189 | |
349ede6a | 6190 | #: remote.c:403 |
06991777 JX |
6191 | msgid "more than one receivepack given, using the first" |
6192 | msgstr "提供了一个以上的 receivepack,使用第一个" | |
6193 | ||
349ede6a | 6194 | #: remote.c:411 |
06991777 JX |
6195 | msgid "more than one uploadpack given, using the first" |
6196 | msgstr "提供了一个以上的 uploadpack,使用第一个" | |
6197 | ||
349ede6a | 6198 | #: remote.c:594 |
a0b6b246 JX |
6199 | #, c-format |
6200 | msgid "Cannot fetch both %s and %s to %s" | |
6201 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
c04f5ac3 | 6202 | |
349ede6a | 6203 | #: remote.c:598 |
c04f5ac3 | 6204 | #, c-format |
a0b6b246 JX |
6205 | msgid "%s usually tracks %s, not %s" |
6206 | msgstr "%s 通常跟踪 %s,而非 %s" | |
c04f5ac3 | 6207 | |
349ede6a | 6208 | #: remote.c:602 |
a0b6b246 JX |
6209 | #, c-format |
6210 | msgid "%s tracks both %s and %s" | |
6211 | msgstr "%s 同时跟踪 %s 和 %s" | |
c04f5ac3 | 6212 | |
349ede6a | 6213 | #: remote.c:670 |
06991777 JX |
6214 | #, c-format |
6215 | msgid "key '%s' of pattern had no '*'" | |
6216 | msgstr "模式的键 '%s' 没有 '*'" | |
6217 | ||
349ede6a | 6218 | #: remote.c:680 |
06991777 JX |
6219 | #, c-format |
6220 | msgid "value '%s' of pattern has no '*'" | |
6221 | msgstr "模式的值 '%s' 没有 '*'" | |
6222 | ||
349ede6a | 6223 | #: remote.c:986 |
06991777 JX |
6224 | #, c-format |
6225 | msgid "src refspec %s does not match any" | |
6226 | msgstr "源引用表达式 %s 没有匹配" | |
6227 | ||
349ede6a | 6228 | #: remote.c:991 |
06991777 JX |
6229 | #, c-format |
6230 | msgid "src refspec %s matches more than one" | |
6231 | msgstr "源引用表达式 %s 匹配超过一个" | |
6232 | ||
6233 | #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push | |
6234 | #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is | |
6235 | #. the <src>. | |
6236 | #. | |
349ede6a | 6237 | #: remote.c:1006 |
06991777 JX |
6238 | #, c-format |
6239 | msgid "" | |
6240 | "The destination you provided is not a full refname (i.e.,\n" | |
6241 | "starting with \"refs/\"). We tried to guess what you meant by:\n" | |
6242 | "\n" | |
6243 | "- Looking for a ref that matches '%s' on the remote side.\n" | |
6244 | "- Checking if the <src> being pushed ('%s')\n" | |
6245 | " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" | |
6246 | " refs/{heads,tags}/ prefix on the remote side.\n" | |
6247 | "\n" | |
6248 | "Neither worked, so we gave up. You must fully qualify the ref." | |
6249 | msgstr "" | |
6250 | "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n" | |
6251 | "试着猜测您的想法:\n" | |
6252 | "\n" | |
6253 | "- 在远端查询和 '%s' 匹配的引用。\n" | |
6254 | "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n" | |
6255 | " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n" | |
6256 | "\n" | |
6257 | "都不行,所以我们已放弃。您必须给出完整的引用。" | |
6258 | ||
349ede6a | 6259 | #: remote.c:1026 |
06991777 JX |
6260 | #, c-format |
6261 | msgid "" | |
6262 | "The <src> part of the refspec is a commit object.\n" | |
6263 | "Did you mean to create a new branch by pushing to\n" | |
6264 | "'%s:refs/heads/%s'?" | |
6265 | msgstr "" | |
6266 | "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" | |
6267 | "'%s:refs/heads/%s' 推送么?" | |
6268 | ||
349ede6a | 6269 | #: remote.c:1031 |
06991777 JX |
6270 | #, c-format |
6271 | msgid "" | |
6272 | "The <src> part of the refspec is a tag object.\n" | |
6273 | "Did you mean to create a new tag by pushing to\n" | |
6274 | "'%s:refs/tags/%s'?" | |
6275 | msgstr "" | |
6276 | "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" | |
6277 | "'%s:refs/tags/%s' 推送么?" | |
6278 | ||
349ede6a | 6279 | #: remote.c:1036 |
06991777 JX |
6280 | #, c-format |
6281 | msgid "" | |
6282 | "The <src> part of the refspec is a tree object.\n" | |
6283 | "Did you mean to tag a new tree by pushing to\n" | |
6284 | "'%s:refs/tags/%s'?" | |
6285 | msgstr "" | |
6286 | "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" | |
6287 | "'%s:refs/tags/%s' 推送么?" | |
6288 | ||
349ede6a | 6289 | #: remote.c:1041 |
06991777 JX |
6290 | #, c-format |
6291 | msgid "" | |
6292 | "The <src> part of the refspec is a blob object.\n" | |
6293 | "Did you mean to tag a new blob by pushing to\n" | |
6294 | "'%s:refs/tags/%s'?" | |
6295 | msgstr "" | |
6296 | "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" | |
6297 | "'%s:refs/tags/%s' 推送么?" | |
6298 | ||
349ede6a | 6299 | #: remote.c:1077 |
06991777 JX |
6300 | #, c-format |
6301 | msgid "%s cannot be resolved to branch" | |
6302 | msgstr "%s 无法被解析为分支" | |
6303 | ||
349ede6a | 6304 | #: remote.c:1088 |
06991777 JX |
6305 | #, c-format |
6306 | msgid "unable to delete '%s': remote ref does not exist" | |
8e4e0555 | 6307 | msgstr "无法删除 '%s':远程引用不存在" |
06991777 | 6308 | |
349ede6a | 6309 | #: remote.c:1100 |
06991777 JX |
6310 | #, c-format |
6311 | msgid "dst refspec %s matches more than one" | |
6312 | msgstr "目标引用表达式 %s 匹配超过一个" | |
6313 | ||
349ede6a | 6314 | #: remote.c:1107 |
06991777 JX |
6315 | #, c-format |
6316 | msgid "dst ref %s receives from more than one src" | |
6317 | msgstr "目标引用 %s 接收超过一个源" | |
c04f5ac3 | 6318 | |
349ede6a | 6319 | #: remote.c:1610 remote.c:1711 |
a0b6b246 JX |
6320 | msgid "HEAD does not point to a branch" |
6321 | msgstr "HEAD 没有指向一个分支" | |
c04f5ac3 | 6322 | |
349ede6a | 6323 | #: remote.c:1619 |
a0b6b246 JX |
6324 | #, c-format |
6325 | msgid "no such branch: '%s'" | |
6326 | msgstr "没有此分支:'%s'" | |
c04f5ac3 | 6327 | |
349ede6a | 6328 | #: remote.c:1622 |
a0b6b246 JX |
6329 | #, c-format |
6330 | msgid "no upstream configured for branch '%s'" | |
6331 | msgstr "尚未给分支 '%s' 设置上游" | |
c04f5ac3 | 6332 | |
349ede6a | 6333 | #: remote.c:1628 |
a0b6b246 JX |
6334 | #, c-format |
6335 | msgid "upstream branch '%s' not stored as a remote-tracking branch" | |
6336 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
c04f5ac3 | 6337 | |
349ede6a | 6338 | #: remote.c:1643 |
a0b6b246 JX |
6339 | #, c-format |
6340 | msgid "push destination '%s' on remote '%s' has no local tracking branch" | |
6341 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
c04f5ac3 | 6342 | |
349ede6a | 6343 | #: remote.c:1655 |
a0b6b246 JX |
6344 | #, c-format |
6345 | msgid "branch '%s' has no remote for pushing" | |
6346 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
cfff71a9 | 6347 | |
349ede6a | 6348 | #: remote.c:1665 |
a0b6b246 JX |
6349 | #, c-format |
6350 | msgid "push refspecs for '%s' do not include '%s'" | |
6351 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
cfff71a9 | 6352 | |
349ede6a | 6353 | #: remote.c:1678 |
a0b6b246 JX |
6354 | msgid "push has no destination (push.default is 'nothing')" |
6355 | msgstr "推送无目标(push.default 是 'nothing')" | |
cfff71a9 | 6356 | |
349ede6a | 6357 | #: remote.c:1700 |
a0b6b246 JX |
6358 | msgid "cannot resolve 'simple' push to a single destination" |
6359 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
6c94aba5 | 6360 | |
349ede6a | 6361 | #: remote.c:1826 |
06991777 JX |
6362 | #, c-format |
6363 | msgid "couldn't find remote ref %s" | |
8e4e0555 | 6364 | msgstr "无法找到远程引用 %s" |
06991777 | 6365 | |
349ede6a | 6366 | #: remote.c:1839 |
06991777 JX |
6367 | #, c-format |
6368 | msgid "* Ignoring funny ref '%s' locally" | |
6369 | msgstr "* 在本地忽略可笑的引用 '%s'" | |
6370 | ||
349ede6a | 6371 | #: remote.c:2002 |
a0b6b246 JX |
6372 | #, c-format |
6373 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
6374 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
6c94aba5 | 6375 | |
349ede6a | 6376 | #: remote.c:2006 |
a0b6b246 JX |
6377 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" |
6378 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
6c94aba5 | 6379 | |
349ede6a | 6380 | #: remote.c:2009 |
a0b6b246 | 6381 | #, c-format |
6937cb4e | 6382 | msgid "Your branch is up to date with '%s'.\n" |
a0b6b246 | 6383 | msgstr "您的分支与上游分支 '%s' 一致。\n" |
cfff71a9 | 6384 | |
349ede6a | 6385 | #: remote.c:2013 |
31e5e17b JX |
6386 | #, c-format |
6387 | msgid "Your branch and '%s' refer to different commits.\n" | |
6388 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
6389 | ||
349ede6a | 6390 | #: remote.c:2016 |
31e5e17b JX |
6391 | #, c-format |
6392 | msgid " (use \"%s\" for details)\n" | |
6393 | msgstr " (使用 \"%s\" 查看详情)\n" | |
6394 | ||
349ede6a | 6395 | #: remote.c:2020 |
a0b6b246 JX |
6396 | #, c-format |
6397 | msgid "Your branch is ahead of '%s' by %d commit.\n" | |
6398 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
6399 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
6400 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
cfff71a9 | 6401 | |
349ede6a | 6402 | #: remote.c:2026 |
a0b6b246 JX |
6403 | msgid " (use \"git push\" to publish your local commits)\n" |
6404 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
c04f5ac3 | 6405 | |
349ede6a | 6406 | #: remote.c:2029 |
a0b6b246 JX |
6407 | #, c-format |
6408 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
6409 | msgid_plural "" | |
6410 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
6411 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
6412 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
c04f5ac3 | 6413 | |
a0b6b246 | 6414 | # 译者:注意保持前导空格 |
349ede6a | 6415 | #: remote.c:2037 |
a0b6b246 JX |
6416 | msgid " (use \"git pull\" to update your local branch)\n" |
6417 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
c04f5ac3 | 6418 | |
349ede6a | 6419 | #: remote.c:2040 |
a0b6b246 JX |
6420 | #, c-format |
6421 | msgid "" | |
6422 | "Your branch and '%s' have diverged,\n" | |
6423 | "and have %d and %d different commit each, respectively.\n" | |
6424 | msgid_plural "" | |
6425 | "Your branch and '%s' have diverged,\n" | |
6426 | "and have %d and %d different commits each, respectively.\n" | |
6427 | msgstr[0] "" | |
6428 | "您的分支和 '%s' 出现了偏离,\n" | |
6429 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
6430 | msgstr[1] "" | |
6431 | "您的分支和 '%s' 出现了偏离,\n" | |
6432 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
90314792 | 6433 | |
a0b6b246 | 6434 | # 译者:注意保持前导空格 |
349ede6a | 6435 | #: remote.c:2050 |
a0b6b246 JX |
6436 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" |
6437 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
90314792 | 6438 | |
7157c2b5 | 6439 | #: remote.c:2241 |
06991777 JX |
6440 | #, c-format |
6441 | msgid "cannot parse expected object name '%s'" | |
6442 | msgstr "无法解析期望的对象名 '%s'" | |
6443 | ||
4c27fcb5 | 6444 | #: replace-object.c:21 |
c1ac5258 JX |
6445 | #, c-format |
6446 | msgid "bad replace ref name: %s" | |
6447 | msgstr "错误的替换引用名称:%s" | |
6448 | ||
4c27fcb5 | 6449 | #: replace-object.c:30 |
c1ac5258 JX |
6450 | #, c-format |
6451 | msgid "duplicate replace ref: %s" | |
6452 | msgstr "重复的替换引用:%s" | |
6453 | ||
2b472aae | 6454 | #: replace-object.c:82 |
c1ac5258 JX |
6455 | #, c-format |
6456 | msgid "replace depth too high for object %s" | |
6457 | msgstr "对象 %s 的替换层级太深" | |
6458 | ||
349ede6a JX |
6459 | #: repository.c:94 builtin/init-db.c:188 |
6460 | #, c-format | |
6461 | msgid "The hash algorithm %s is not supported in this build." | |
6462 | msgstr "这个版本不支持 %s 哈希算法。" | |
6463 | ||
4c27fcb5 JX |
6464 | #: rerere.c:217 rerere.c:226 rerere.c:229 |
6465 | msgid "corrupt MERGE_RR" | |
6466 | msgstr "损坏的 MERGE_RR" | |
6467 | ||
6468 | #: rerere.c:264 rerere.c:269 | |
6469 | msgid "unable to write rerere record" | |
6470 | msgstr "无法写入 rerere 记录" | |
cfff71a9 | 6471 | |
4c27fcb5 JX |
6472 | #: rerere.c:495 |
6473 | #, c-format | |
6474 | msgid "there were errors while writing '%s' (%s)" | |
6475 | msgstr "写入 '%s' (%s) 时出错" | |
6792b93b | 6476 | |
4c27fcb5 JX |
6477 | #: rerere.c:498 |
6478 | #, c-format | |
6479 | msgid "failed to flush '%s'" | |
6480 | msgstr "刷新 '%s' 失败" | |
5c57d762 | 6481 | |
4c27fcb5 | 6482 | #: rerere.c:503 rerere.c:1039 |
5809aa05 | 6483 | #, c-format |
4c27fcb5 JX |
6484 | msgid "could not parse conflict hunks in '%s'" |
6485 | msgstr "不能解析 '%s' 中的冲突块" | |
5809aa05 | 6486 | |
4c27fcb5 JX |
6487 | #: rerere.c:684 |
6488 | #, c-format | |
6489 | msgid "failed utime() on '%s'" | |
6490 | msgstr "在 '%s' 上调用 utime() 失败" | |
31e5e17b | 6491 | |
4c27fcb5 | 6492 | #: rerere.c:694 |
87cb7997 | 6493 | #, c-format |
4c27fcb5 JX |
6494 | msgid "writing '%s' failed" |
6495 | msgstr "写入 '%s' 失败" | |
87cb7997 | 6496 | |
4c27fcb5 | 6497 | #: rerere.c:714 |
87cb7997 | 6498 | #, c-format |
4c27fcb5 JX |
6499 | msgid "Staged '%s' using previous resolution." |
6500 | msgstr "使用之前的解决方案暂存 '%s'。" | |
87cb7997 | 6501 | |
4c27fcb5 JX |
6502 | #: rerere.c:753 |
6503 | #, c-format | |
6504 | msgid "Recorded resolution for '%s'." | |
6505 | msgstr "已记录 '%s' 的解决方案。" | |
6792b93b | 6506 | |
4c27fcb5 JX |
6507 | #: rerere.c:788 |
6508 | #, c-format | |
6509 | msgid "Resolved '%s' using previous resolution." | |
6510 | msgstr "使用之前的解决方案解决 '%s'。" | |
6511 | ||
6512 | #: rerere.c:803 | |
6513 | #, c-format | |
6514 | msgid "cannot unlink stray '%s'" | |
6515 | msgstr "不能删除 stray '%s'" | |
6516 | ||
6517 | #: rerere.c:807 | |
6518 | #, c-format | |
6519 | msgid "Recorded preimage for '%s'" | |
6520 | msgstr "为 '%s' 记录 preimage" | |
6521 | ||
349ede6a | 6522 | #: rerere.c:881 submodule.c:2078 builtin/log.c:1891 |
2b472aae | 6523 | #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 |
4c27fcb5 JX |
6524 | #, c-format |
6525 | msgid "could not create directory '%s'" | |
6526 | msgstr "不能创建目录 '%s'" | |
6527 | ||
6528 | #: rerere.c:1057 | |
6529 | #, c-format | |
6530 | msgid "failed to update conflicted state in '%s'" | |
6531 | msgstr "更新 '%s' 中的冲突状态失败" | |
6532 | ||
6533 | #: rerere.c:1068 rerere.c:1075 | |
6534 | #, c-format | |
6535 | msgid "no remembered resolution for '%s'" | |
6536 | msgstr "没有为 '%s' 记忆的解决方案" | |
6537 | ||
6538 | #: rerere.c:1077 | |
6539 | #, c-format | |
6540 | msgid "cannot unlink '%s'" | |
6541 | msgstr "不能删除 '%s'" | |
6542 | ||
6543 | #: rerere.c:1087 | |
6544 | #, c-format | |
6545 | msgid "Updated preimage for '%s'" | |
6546 | msgstr "已为 '%s' 更新 preimage" | |
6547 | ||
6548 | #: rerere.c:1096 | |
6549 | #, c-format | |
6550 | msgid "Forgot resolution for '%s'\n" | |
6551 | msgstr "忘记 '%s' 的解决方案\n" | |
6552 | ||
6553 | #: rerere.c:1199 | |
6554 | msgid "unable to open rr-cache directory" | |
6555 | msgstr "不能打开 rr-cache 目录" | |
6556 | ||
349ede6a JX |
6557 | #: reset.c:42 |
6558 | msgid "could not determine HEAD revision" | |
6559 | msgstr "不能确定 HEAD 版本" | |
6560 | ||
6561 | #: reset.c:70 reset.c:76 sequencer.c:3318 | |
6562 | #, c-format | |
6563 | msgid "failed to find tree of %s" | |
6564 | msgstr "无法找到 %s 指向的树。" | |
6565 | ||
7157c2b5 | 6566 | #: revision.c:2661 |
4c27fcb5 JX |
6567 | msgid "your current branch appears to be broken" |
6568 | msgstr "您的当前分支好像被损坏" | |
6569 | ||
7157c2b5 | 6570 | #: revision.c:2664 |
4c27fcb5 JX |
6571 | #, c-format |
6572 | msgid "your current branch '%s' does not have any commits yet" | |
6573 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
6574 | ||
7157c2b5 | 6575 | #: revision.c:2873 |
4c27fcb5 JX |
6576 | msgid "--first-parent is incompatible with --bisect" |
6577 | msgstr "--first-parent 与 --bisect 不兼容" | |
6578 | ||
7157c2b5 | 6579 | #: revision.c:2877 |
d46c5519 JX |
6580 | msgid "-L does not yet support diff formats besides -p and -s" |
6581 | msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" | |
6582 | ||
2b472aae | 6583 | #: run-command.c:763 |
4c27fcb5 JX |
6584 | msgid "open /dev/null failed" |
6585 | msgstr "不能打开 /dev/null" | |
6586 | ||
2b472aae | 6587 | #: run-command.c:1269 |
4c27fcb5 JX |
6588 | #, c-format |
6589 | msgid "cannot create async thread: %s" | |
6590 | msgstr "不能创建 async 线程:%s" | |
6591 | ||
2b472aae | 6592 | #: run-command.c:1333 |
4c27fcb5 JX |
6593 | #, c-format |
6594 | msgid "" | |
6595 | "The '%s' hook was ignored because it's not set as executable.\n" | |
6596 | "You can disable this warning with `git config advice.ignoredHook false`." | |
6597 | msgstr "" | |
6598 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
6599 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
6600 | ||
349ede6a | 6601 | #: send-pack.c:145 |
4c27fcb5 JX |
6602 | msgid "unexpected flush packet while reading remote unpack status" |
6603 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
6604 | ||
349ede6a | 6605 | #: send-pack.c:147 |
4c27fcb5 JX |
6606 | #, c-format |
6607 | msgid "unable to parse remote unpack status: %s" | |
6608 | msgstr "不能解析远程解包状态:%s" | |
6609 | ||
349ede6a | 6610 | #: send-pack.c:149 |
4c27fcb5 JX |
6611 | #, c-format |
6612 | msgid "remote unpack failed: %s" | |
6613 | msgstr "远程解包失败:%s" | |
6614 | ||
349ede6a | 6615 | #: send-pack.c:308 |
4c27fcb5 JX |
6616 | msgid "failed to sign the push certificate" |
6617 | msgstr "为推送证书签名失败" | |
6618 | ||
7157c2b5 JX |
6619 | #: send-pack.c:394 |
6620 | msgid "the receiving end does not support this repository's hash algorithm" | |
6621 | msgstr "接收端不支持这个仓库的哈希算法" | |
6622 | ||
6623 | #: send-pack.c:403 | |
a0b6b246 JX |
6624 | msgid "the receiving end does not support --signed push" |
6625 | msgstr "接收端不支持签名推送" | |
6792b93b | 6626 | |
7157c2b5 | 6627 | #: send-pack.c:405 |
a0b6b246 JX |
6628 | msgid "" |
6629 | "not sending a push certificate since the receiving end does not support --" | |
6630 | "signed push" | |
6631 | msgstr "未发送推送证书,因为接收端不支持签名推送" | |
6792b93b | 6632 | |
7157c2b5 | 6633 | #: send-pack.c:417 |
a0b6b246 JX |
6634 | msgid "the receiving end does not support --atomic push" |
6635 | msgstr "接收端不支持原子推送" | |
6792b93b | 6636 | |
7157c2b5 | 6637 | #: send-pack.c:422 |
a0b6b246 JX |
6638 | msgid "the receiving end does not support push options" |
6639 | msgstr "接收端不支持推送选项" | |
6792b93b | 6640 | |
349ede6a | 6641 | #: sequencer.c:192 |
31e5e17b JX |
6642 | #, c-format |
6643 | msgid "invalid commit message cleanup mode '%s'" | |
6644 | msgstr "无效的提交信息清理模式 '%s'" | |
6645 | ||
349ede6a | 6646 | #: sequencer.c:297 |
fd8cb379 JX |
6647 | #, c-format |
6648 | msgid "could not delete '%s'" | |
6649 | msgstr "无法删除 '%s'" | |
6650 | ||
349ede6a | 6651 | #: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 |
a6cd2cc4 JX |
6652 | #, c-format |
6653 | msgid "could not remove '%s'" | |
6654 | msgstr "无法删除 '%s'" | |
6655 | ||
349ede6a | 6656 | #: sequencer.c:326 |
a0b6b246 JX |
6657 | msgid "revert" |
6658 | msgstr "还原" | |
6792b93b | 6659 | |
349ede6a | 6660 | #: sequencer.c:328 |
a0b6b246 JX |
6661 | msgid "cherry-pick" |
6662 | msgstr "拣选" | |
6663 | ||
349ede6a | 6664 | #: sequencer.c:330 |
2b472aae JX |
6665 | msgid "rebase" |
6666 | msgstr "变基" | |
6667 | ||
349ede6a | 6668 | #: sequencer.c:332 |
1a79b2f1 | 6669 | #, c-format |
c1ac5258 | 6670 | msgid "unknown action: %d" |
1a79b2f1 JX |
6671 | msgstr "未知动作:%d" |
6672 | ||
349ede6a | 6673 | #: sequencer.c:390 |
a0b6b246 JX |
6674 | msgid "" |
6675 | "after resolving the conflicts, mark the corrected paths\n" | |
6676 | "with 'git add <paths>' or 'git rm <paths>'" | |
6677 | msgstr "" | |
6678 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
6679 | "命令标记修正后的文件" | |
6680 | ||
349ede6a | 6681 | #: sequencer.c:393 |
a0b6b246 JX |
6682 | msgid "" |
6683 | "after resolving the conflicts, mark the corrected paths\n" | |
6684 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
6685 | "and commit the result with 'git commit'" | |
6686 | msgstr "" | |
6687 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
6688 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
1b7f4a34 | 6689 | |
349ede6a | 6690 | #: sequencer.c:406 sequencer.c:2921 |
1b7f4a34 | 6691 | #, c-format |
a0b6b246 JX |
6692 | msgid "could not lock '%s'" |
6693 | msgstr "不能锁定 '%s'" | |
1b7f4a34 | 6694 | |
349ede6a | 6695 | #: sequencer.c:413 |
a0b6b246 | 6696 | #, c-format |
72351d7d | 6697 | msgid "could not write eol to '%s'" |
a0b6b246 | 6698 | msgstr "不能将换行符写入 '%s'" |
1b7f4a34 | 6699 | |
349ede6a JX |
6700 | #: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 |
6701 | #: sequencer.c:3203 | |
1b7f4a34 | 6702 | #, c-format |
31e5e17b JX |
6703 | msgid "failed to finalize '%s'" |
6704 | msgstr "无法完成 '%s'" | |
1b7f4a34 | 6705 | |
349ede6a JX |
6706 | #: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 |
6707 | #: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 | |
a0b6b246 JX |
6708 | #, c-format |
6709 | msgid "could not read '%s'" | |
6710 | msgstr "不能读取 '%s'" | |
1b7f4a34 | 6711 | |
349ede6a | 6712 | #: sequencer.c:457 |
63af42fe | 6713 | #, c-format |
a0b6b246 JX |
6714 | msgid "your local changes would be overwritten by %s." |
6715 | msgstr "您的本地修改将被%s覆盖。" | |
63af42fe | 6716 | |
349ede6a | 6717 | #: sequencer.c:461 |
a0b6b246 | 6718 | msgid "commit your changes or stash them to proceed." |
a4f16749 | 6719 | msgstr "提交您的修改或贮藏后再继续。" |
6792b93b | 6720 | |
349ede6a | 6721 | #: sequencer.c:493 |
a0b6b246 JX |
6722 | #, c-format |
6723 | msgid "%s: fast-forward" | |
6724 | msgstr "%s:快进" | |
6792b93b | 6725 | |
349ede6a | 6726 | #: sequencer.c:532 builtin/tag.c:566 |
d46c5519 JX |
6727 | #, c-format |
6728 | msgid "Invalid cleanup mode %s" | |
6729 | msgstr "无效的清理模式 %s" | |
6730 | ||
1a79b2f1 | 6731 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
2b472aae | 6732 | #. "rebase". |
1a79b2f1 | 6733 | #. |
349ede6a | 6734 | #: sequencer.c:626 |
a0b6b246 JX |
6735 | #, c-format |
6736 | msgid "%s: Unable to write new index file" | |
6737 | msgstr "%s:无法写入新索引文件" | |
6792b93b | 6738 | |
349ede6a | 6739 | #: sequencer.c:643 |
5809aa05 JX |
6740 | msgid "unable to update cache tree" |
6741 | msgstr "不能更新缓存树" | |
6792b93b | 6742 | |
349ede6a | 6743 | #: sequencer.c:657 |
fd8cb379 JX |
6744 | msgid "could not resolve HEAD commit" |
6745 | msgstr "不能解析 HEAD 提交" | |
6746 | ||
349ede6a | 6747 | #: sequencer.c:737 |
4c27fcb5 JX |
6748 | #, c-format |
6749 | msgid "no key present in '%.*s'" | |
6750 | msgstr "在 '%.*s' 中没有 key" | |
6751 | ||
349ede6a | 6752 | #: sequencer.c:748 |
c1ac5258 | 6753 | #, c-format |
4c27fcb5 JX |
6754 | msgid "unable to dequote value of '%s'" |
6755 | msgstr "无法为 '%s' 的值去引号" | |
c1ac5258 | 6756 | |
7157c2b5 | 6757 | #: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 |
349ede6a | 6758 | #: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 |
c1ac5258 | 6759 | #, c-format |
4c27fcb5 JX |
6760 | msgid "could not open '%s' for reading" |
6761 | msgstr "无法打开 '%s' 进行读取" | |
6762 | ||
349ede6a | 6763 | #: sequencer.c:795 |
4c27fcb5 JX |
6764 | msgid "'GIT_AUTHOR_NAME' already given" |
6765 | msgstr "已经给出 'GIT_AUTHOR_NAME'" | |
c1ac5258 | 6766 | |
349ede6a | 6767 | #: sequencer.c:800 |
4c27fcb5 JX |
6768 | msgid "'GIT_AUTHOR_EMAIL' already given" |
6769 | msgstr "已经给出 'GIT_AUTHOR_EMAIL'" | |
6770 | ||
349ede6a | 6771 | #: sequencer.c:805 |
4c27fcb5 JX |
6772 | msgid "'GIT_AUTHOR_DATE' already given" |
6773 | msgstr "已经给出 'GIT_AUTHOR_DATE'" | |
6774 | ||
349ede6a | 6775 | #: sequencer.c:809 |
4c27fcb5 JX |
6776 | #, c-format |
6777 | msgid "unknown variable '%s'" | |
6778 | msgstr "未知变量 '%s'" | |
6779 | ||
349ede6a | 6780 | #: sequencer.c:814 |
4c27fcb5 JX |
6781 | msgid "missing 'GIT_AUTHOR_NAME'" |
6782 | msgstr "缺少 'GIT_AUTHOR_NAME'" | |
6783 | ||
349ede6a | 6784 | #: sequencer.c:816 |
4c27fcb5 JX |
6785 | msgid "missing 'GIT_AUTHOR_EMAIL'" |
6786 | msgstr "缺少 'GIT_AUTHOR_EMAIL'" | |
6787 | ||
349ede6a | 6788 | #: sequencer.c:818 |
4c27fcb5 JX |
6789 | msgid "missing 'GIT_AUTHOR_DATE'" |
6790 | msgstr "缺少 'GIT_AUTHOR_DATE'" | |
6791 | ||
349ede6a | 6792 | #: sequencer.c:867 |
63af42fe JX |
6793 | #, c-format |
6794 | msgid "" | |
a0b6b246 JX |
6795 | "you have staged changes in your working tree\n" |
6796 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
6797 | "\n" | |
6798 | " git commit --amend %s\n" | |
6799 | "\n" | |
6800 | "If they are meant to go into a new commit, run:\n" | |
6801 | "\n" | |
6802 | " git commit %s\n" | |
6803 | "\n" | |
6804 | "In both cases, once you're done, continue with:\n" | |
6805 | "\n" | |
6806 | " git rebase --continue\n" | |
6807 | msgstr "" | |
1a79b2f1 JX |
6808 | "您的工作区中存在已暂存的修改\n" |
6809 | "如果这些修改需要被并入前一个提交,执行:\n" | |
a0b6b246 JX |
6810 | "\n" |
6811 | " git commit --amend %s\n" | |
6812 | "\n" | |
29004bbb | 6813 | "如果这些修改要形成一个新提交,执行:\n" |
a0b6b246 JX |
6814 | "\n" |
6815 | " git commit %s\n" | |
6816 | "\n" | |
6817 | "无论哪种情况,当您完成提交,继续执行:\n" | |
6818 | "\n" | |
6819 | " git rebase --continue\n" | |
6792b93b | 6820 | |
349ede6a | 6821 | #: sequencer.c:1141 |
31e5e17b JX |
6822 | msgid "'prepare-commit-msg' hook failed" |
6823 | msgstr "'prepare-commit-msg' 钩子失败" | |
6824 | ||
349ede6a | 6825 | #: sequencer.c:1147 |
31e5e17b JX |
6826 | msgid "" |
6827 | "Your name and email address were configured automatically based\n" | |
6828 | "on your username and hostname. Please check that they are accurate.\n" | |
6829 | "You can suppress this message by setting them explicitly. Run the\n" | |
6830 | "following command and follow the instructions in your editor to edit\n" | |
6831 | "your configuration file:\n" | |
6832 | "\n" | |
6833 | " git config --global --edit\n" | |
6834 | "\n" | |
6835 | "After doing this, you may fix the identity used for this commit with:\n" | |
6836 | "\n" | |
6837 | " git commit --amend --reset-author\n" | |
6838 | msgstr "" | |
6839 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
6840 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
6841 | "中编辑您的配置文件:\n" | |
6842 | "\n" | |
6843 | " git config --global --edit\n" | |
6844 | "\n" | |
6845 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
6846 | "\n" | |
6847 | " git commit --amend --reset-author\n" | |
6848 | ||
349ede6a | 6849 | #: sequencer.c:1160 |
31e5e17b JX |
6850 | msgid "" |
6851 | "Your name and email address were configured automatically based\n" | |
6852 | "on your username and hostname. Please check that they are accurate.\n" | |
6853 | "You can suppress this message by setting them explicitly:\n" | |
6854 | "\n" | |
6855 | " git config --global user.name \"Your Name\"\n" | |
6856 | " git config --global user.email you@example.com\n" | |
6857 | "\n" | |
6858 | "After doing this, you may fix the identity used for this commit with:\n" | |
6859 | "\n" | |
6860 | " git commit --amend --reset-author\n" | |
6861 | msgstr "" | |
6862 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
6863 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
6864 | "\n" | |
6865 | " git config --global user.name \"Your Name\"\n" | |
6866 | " git config --global user.email you@example.com\n" | |
6867 | "\n" | |
6868 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" | |
6869 | "\n" | |
6870 | " git commit --amend --reset-author\n" | |
6871 | ||
349ede6a | 6872 | #: sequencer.c:1202 |
31e5e17b JX |
6873 | msgid "couldn't look up newly created commit" |
6874 | msgstr "无法找到新创建的提交" | |
6875 | ||
349ede6a | 6876 | #: sequencer.c:1204 |
31e5e17b JX |
6877 | msgid "could not parse newly created commit" |
6878 | msgstr "不能解析新创建的提交" | |
6879 | ||
349ede6a | 6880 | #: sequencer.c:1250 |
31e5e17b JX |
6881 | msgid "unable to resolve HEAD after creating commit" |
6882 | msgstr "创建提交后,不能解析 HEAD" | |
6883 | ||
349ede6a | 6884 | #: sequencer.c:1252 |
31e5e17b JX |
6885 | msgid "detached HEAD" |
6886 | msgstr "分离头指针" | |
6887 | ||
6888 | # 译者:中文字符串拼接,可删除前导空格 | |
349ede6a | 6889 | #: sequencer.c:1256 |
31e5e17b JX |
6890 | msgid " (root-commit)" |
6891 | msgstr "(根提交)" | |
6892 | ||
349ede6a | 6893 | #: sequencer.c:1277 |
31e5e17b JX |
6894 | msgid "could not parse HEAD" |
6895 | msgstr "不能解析 HEAD" | |
6896 | ||
349ede6a | 6897 | #: sequencer.c:1279 |
31e5e17b JX |
6898 | #, c-format |
6899 | msgid "HEAD %s is not a commit!" | |
6900 | msgstr "HEAD %s 不是一个提交!" | |
6901 | ||
349ede6a | 6902 | #: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 |
31e5e17b JX |
6903 | msgid "could not parse HEAD commit" |
6904 | msgstr "不能解析 HEAD 提交" | |
6905 | ||
349ede6a | 6906 | #: sequencer.c:1335 sequencer.c:1980 |
31e5e17b JX |
6907 | msgid "unable to parse commit author" |
6908 | msgstr "不能解析提交作者" | |
6909 | ||
349ede6a | 6910 | #: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 |
31e5e17b JX |
6911 | msgid "git write-tree failed to write a tree" |
6912 | msgstr "git write-tree 无法写入树对象" | |
6913 | ||
349ede6a | 6914 | #: sequencer.c:1379 sequencer.c:1450 |
31e5e17b JX |
6915 | #, c-format |
6916 | msgid "unable to read commit message from '%s'" | |
6917 | msgstr "不能从 '%s' 读取提交说明" | |
6918 | ||
349ede6a JX |
6919 | #: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 |
6920 | #: builtin/merge.c:919 | |
31e5e17b | 6921 | msgid "failed to write commit object" |
c1ac5258 | 6922 | msgstr "写提交对象失败" |
31e5e17b | 6923 | |
349ede6a JX |
6924 | #: sequencer.c:1433 sequencer.c:4118 |
6925 | #, c-format | |
6926 | msgid "could not update %s" | |
6927 | msgstr "不能更新 %s" | |
6928 | ||
6929 | #: sequencer.c:1481 | |
a0b6b246 | 6930 | #, c-format |
5809aa05 JX |
6931 | msgid "could not parse commit %s" |
6932 | msgstr "不能解析提交 %s" | |
6792b93b | 6933 | |
349ede6a | 6934 | #: sequencer.c:1486 |
63af42fe | 6935 | #, c-format |
5809aa05 JX |
6936 | msgid "could not parse parent commit %s" |
6937 | msgstr "不能解析父提交 %s" | |
63af42fe | 6938 | |
349ede6a | 6939 | #: sequencer.c:1569 sequencer.c:1680 |
c1ac5258 JX |
6940 | #, c-format |
6941 | msgid "unknown command: %d" | |
6942 | msgstr "未知命令:%d" | |
6943 | ||
349ede6a | 6944 | #: sequencer.c:1627 sequencer.c:1652 |
1a79b2f1 JX |
6945 | #, c-format |
6946 | msgid "This is a combination of %d commits." | |
6947 | msgstr "这是一个 %d 个提交的组合。" | |
6948 | ||
349ede6a | 6949 | #: sequencer.c:1637 |
1a79b2f1 JX |
6950 | msgid "need a HEAD to fixup" |
6951 | msgstr "需要一个 HEAD 来修复" | |
6952 | ||
349ede6a | 6953 | #: sequencer.c:1639 sequencer.c:3230 |
1a79b2f1 JX |
6954 | msgid "could not read HEAD" |
6955 | msgstr "不能读取 HEAD" | |
6956 | ||
349ede6a | 6957 | #: sequencer.c:1641 |
1a79b2f1 JX |
6958 | msgid "could not read HEAD's commit message" |
6959 | msgstr "不能读取 HEAD 的提交说明" | |
6960 | ||
349ede6a | 6961 | #: sequencer.c:1647 |
1a79b2f1 JX |
6962 | #, c-format |
6963 | msgid "cannot write '%s'" | |
6964 | msgstr "不能写 '%s'" | |
6965 | ||
349ede6a | 6966 | #: sequencer.c:1654 git-rebase--preserve-merges.sh:496 |
1a79b2f1 JX |
6967 | msgid "This is the 1st commit message:" |
6968 | msgstr "这是第一个提交说明:" | |
6969 | ||
349ede6a | 6970 | #: sequencer.c:1662 |
1a79b2f1 JX |
6971 | #, c-format |
6972 | msgid "could not read commit message of %s" | |
6973 | msgstr "不能读取 %s 的提交说明" | |
6974 | ||
349ede6a | 6975 | #: sequencer.c:1669 |
1a79b2f1 JX |
6976 | #, c-format |
6977 | msgid "This is the commit message #%d:" | |
6978 | msgstr "这是提交说明 #%d:" | |
6979 | ||
349ede6a | 6980 | #: sequencer.c:1675 |
1a79b2f1 JX |
6981 | #, c-format |
6982 | msgid "The commit message #%d will be skipped:" | |
6983 | msgstr "提交说明 #%d 将被跳过:" | |
6984 | ||
349ede6a | 6985 | #: sequencer.c:1763 |
a0b6b246 JX |
6986 | msgid "your index file is unmerged." |
6987 | msgstr "您的索引文件未完成合并。" | |
6792b93b | 6988 | |
349ede6a | 6989 | #: sequencer.c:1770 |
fd8cb379 JX |
6990 | msgid "cannot fixup root commit" |
6991 | msgstr "不能修复根提交" | |
6992 | ||
349ede6a | 6993 | #: sequencer.c:1789 |
a0b6b246 JX |
6994 | #, c-format |
6995 | msgid "commit %s is a merge but no -m option was given." | |
6996 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
6792b93b | 6997 | |
349ede6a | 6998 | #: sequencer.c:1797 sequencer.c:1805 |
a0b6b246 JX |
6999 | #, c-format |
7000 | msgid "commit %s does not have parent %d" | |
7001 | msgstr "提交 %s 没有第 %d 个父提交" | |
7002 | ||
349ede6a | 7003 | #: sequencer.c:1811 |
1a79b2f1 JX |
7004 | #, c-format |
7005 | msgid "cannot get commit message for %s" | |
7006 | msgstr "不能得到 %s 的提交说明" | |
7007 | ||
a0b6b246 JX |
7008 | #. TRANSLATORS: The first %s will be a "todo" command like |
7009 | #. "revert" or "pick", the second %s a SHA1. | |
349ede6a | 7010 | #: sequencer.c:1830 |
a0b6b246 JX |
7011 | #, c-format |
7012 | msgid "%s: cannot parse parent commit %s" | |
7013 | msgstr "%s:不能解析父提交 %s" | |
7014 | ||
349ede6a | 7015 | #: sequencer.c:1895 |
a0b6b246 | 7016 | #, c-format |
1a79b2f1 JX |
7017 | msgid "could not rename '%s' to '%s'" |
7018 | msgstr "不能将 '%s' 重命名为 '%s'" | |
a0b6b246 | 7019 | |
349ede6a | 7020 | #: sequencer.c:1952 |
a0b6b246 JX |
7021 | #, c-format |
7022 | msgid "could not revert %s... %s" | |
7023 | msgstr "不能还原 %s... %s" | |
7024 | ||
349ede6a | 7025 | #: sequencer.c:1953 |
a0b6b246 JX |
7026 | #, c-format |
7027 | msgid "could not apply %s... %s" | |
7028 | msgstr "不能应用 %s... %s" | |
7029 | ||
349ede6a | 7030 | #: sequencer.c:1972 |
2b472aae JX |
7031 | #, c-format |
7032 | msgid "dropping %s %s -- patch contents already upstream\n" | |
7033 | msgstr "丢弃 %s %s -- 补丁内容已在上游\n" | |
7034 | ||
349ede6a | 7035 | #: sequencer.c:2030 |
a0b6b246 JX |
7036 | #, c-format |
7037 | msgid "git %s: failed to read the index" | |
7038 | msgstr "git %s:无法读取索引" | |
7039 | ||
349ede6a | 7040 | #: sequencer.c:2037 |
a0b6b246 JX |
7041 | #, c-format |
7042 | msgid "git %s: failed to refresh the index" | |
7043 | msgstr "git %s:无法刷新索引" | |
7044 | ||
349ede6a | 7045 | #: sequencer.c:2114 |
5809aa05 JX |
7046 | #, c-format |
7047 | msgid "%s does not accept arguments: '%s'" | |
7048 | msgstr "%s 不接受参数:'%s'" | |
7049 | ||
349ede6a | 7050 | #: sequencer.c:2123 |
5809aa05 JX |
7051 | #, c-format |
7052 | msgid "missing arguments for %s" | |
7053 | msgstr "缺少 %s 的参数" | |
7054 | ||
349ede6a | 7055 | #: sequencer.c:2154 |
d46c5519 | 7056 | #, c-format |
2b472aae JX |
7057 | msgid "could not parse '%s'" |
7058 | msgstr "无法解析 '%s'" | |
d46c5519 | 7059 | |
349ede6a | 7060 | #: sequencer.c:2215 |
a0b6b246 JX |
7061 | #, c-format |
7062 | msgid "invalid line %d: %.*s" | |
7063 | msgstr "无效行 %d:%.*s" | |
7064 | ||
349ede6a | 7065 | #: sequencer.c:2226 |
1a79b2f1 JX |
7066 | #, c-format |
7067 | msgid "cannot '%s' without a previous commit" | |
7068 | msgstr "没有父提交的情况下不能 '%s'" | |
a0b6b246 | 7069 | |
349ede6a | 7070 | #: sequencer.c:2310 |
a6cd2cc4 JX |
7071 | msgid "cancelling a cherry picking in progress" |
7072 | msgstr "正在取消一个进行中的拣选" | |
7073 | ||
349ede6a | 7074 | #: sequencer.c:2317 |
a6cd2cc4 JX |
7075 | msgid "cancelling a revert in progress" |
7076 | msgstr "正在取消一个进行中的还原" | |
7077 | ||
349ede6a | 7078 | #: sequencer.c:2361 |
1a79b2f1 JX |
7079 | msgid "please fix this using 'git rebase --edit-todo'." |
7080 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
7081 | ||
349ede6a | 7082 | #: sequencer.c:2363 |
a0b6b246 JX |
7083 | #, c-format |
7084 | msgid "unusable instruction sheet: '%s'" | |
29004bbb | 7085 | msgstr "不可用的指令清单:'%s'" |
a0b6b246 | 7086 | |
349ede6a | 7087 | #: sequencer.c:2368 |
1a79b2f1 JX |
7088 | msgid "no commits parsed." |
7089 | msgstr "没有解析提交。" | |
7090 | ||
349ede6a | 7091 | #: sequencer.c:2379 |
a0b6b246 JX |
7092 | msgid "cannot cherry-pick during a revert." |
7093 | msgstr "不能在回退中执行拣选。" | |
7094 | ||
349ede6a | 7095 | #: sequencer.c:2381 |
a0b6b246 JX |
7096 | msgid "cannot revert during a cherry-pick." |
7097 | msgstr "不能在拣选中执行回退。" | |
7098 | ||
349ede6a | 7099 | #: sequencer.c:2459 |
a0b6b246 JX |
7100 | #, c-format |
7101 | msgid "invalid value for %s: %s" | |
7102 | msgstr "%s 的值无效:%s" | |
7103 | ||
349ede6a | 7104 | #: sequencer.c:2556 |
fd8cb379 JX |
7105 | msgid "unusable squash-onto" |
7106 | msgstr "不可用的 squash-onto" | |
7107 | ||
349ede6a | 7108 | #: sequencer.c:2576 |
a0b6b246 JX |
7109 | #, c-format |
7110 | msgid "malformed options sheet: '%s'" | |
fd8cb379 | 7111 | msgstr "格式错误的选项清单:'%s'" |
a0b6b246 | 7112 | |
349ede6a | 7113 | #: sequencer.c:2664 sequencer.c:4469 |
c1ac5258 JX |
7114 | msgid "empty commit set passed" |
7115 | msgstr "提供了空的提交集" | |
7116 | ||
349ede6a | 7117 | #: sequencer.c:2680 |
a6cd2cc4 JX |
7118 | msgid "revert is already in progress" |
7119 | msgstr "一个还原操作已在进行" | |
a0b6b246 | 7120 | |
349ede6a | 7121 | #: sequencer.c:2682 |
a6cd2cc4 JX |
7122 | #, c-format |
7123 | msgid "try \"git revert (--continue | %s--abort | --quit)\"" | |
7124 | msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" | |
7125 | ||
349ede6a | 7126 | #: sequencer.c:2685 |
a6cd2cc4 JX |
7127 | msgid "cherry-pick is already in progress" |
7128 | msgstr "拣选操作已在进行" | |
7129 | ||
349ede6a | 7130 | #: sequencer.c:2687 |
a6cd2cc4 JX |
7131 | #, c-format |
7132 | msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
7133 | msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
a0b6b246 | 7134 | |
349ede6a | 7135 | #: sequencer.c:2701 |
a0b6b246 JX |
7136 | #, c-format |
7137 | msgid "could not create sequencer directory '%s'" | |
7138 | msgstr "不能创建序列目录 '%s'" | |
7139 | ||
349ede6a | 7140 | #: sequencer.c:2716 |
a0b6b246 JX |
7141 | msgid "could not lock HEAD" |
7142 | msgstr "不能锁定 HEAD" | |
7143 | ||
349ede6a | 7144 | #: sequencer.c:2776 sequencer.c:4206 |
a0b6b246 JX |
7145 | msgid "no cherry-pick or revert in progress" |
7146 | msgstr "拣选或还原操作并未进行" | |
7147 | ||
349ede6a | 7148 | #: sequencer.c:2778 sequencer.c:2789 |
a0b6b246 JX |
7149 | msgid "cannot resolve HEAD" |
7150 | msgstr "不能解析 HEAD" | |
7151 | ||
349ede6a | 7152 | #: sequencer.c:2780 sequencer.c:2824 |
a0b6b246 JX |
7153 | msgid "cannot abort from a branch yet to be born" |
7154 | msgstr "不能从尚未建立的分支终止" | |
7155 | ||
349ede6a | 7156 | #: sequencer.c:2810 builtin/grep.c:744 |
a0b6b246 JX |
7157 | #, c-format |
7158 | msgid "cannot open '%s'" | |
7159 | msgstr "不能打开 '%s'" | |
7160 | ||
349ede6a | 7161 | #: sequencer.c:2812 |
a0b6b246 JX |
7162 | #, c-format |
7163 | msgid "cannot read '%s': %s" | |
7164 | msgstr "不能读取 '%s':%s" | |
7165 | ||
349ede6a | 7166 | #: sequencer.c:2813 |
a0b6b246 JX |
7167 | msgid "unexpected end of file" |
7168 | msgstr "意外的文件结束" | |
7169 | ||
349ede6a | 7170 | #: sequencer.c:2819 |
a0b6b246 JX |
7171 | #, c-format |
7172 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" | |
7173 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
7174 | ||
349ede6a | 7175 | #: sequencer.c:2830 |
1a79b2f1 JX |
7176 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
7177 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
7178 | ||
349ede6a | 7179 | #: sequencer.c:2871 |
a6cd2cc4 JX |
7180 | msgid "no revert in progress" |
7181 | msgstr "没有正在进行的还原" | |
7182 | ||
349ede6a | 7183 | #: sequencer.c:2879 |
a6cd2cc4 JX |
7184 | msgid "no cherry-pick in progress" |
7185 | msgstr "没有正在进行的拣选" | |
7186 | ||
349ede6a | 7187 | #: sequencer.c:2889 |
a6cd2cc4 JX |
7188 | msgid "failed to skip the commit" |
7189 | msgstr "无法跳过这个提交" | |
7190 | ||
349ede6a | 7191 | #: sequencer.c:2896 |
a6cd2cc4 JX |
7192 | msgid "there is nothing to skip" |
7193 | msgstr "没有要跳过的" | |
7194 | ||
349ede6a | 7195 | #: sequencer.c:2899 |
a6cd2cc4 JX |
7196 | #, c-format |
7197 | msgid "" | |
7198 | "have you committed already?\n" | |
7199 | "try \"git %s --continue\"" | |
7200 | msgstr "" | |
7201 | "您已经提交了么?\n" | |
7202 | "试试 \"git %s --continue\"" | |
7203 | ||
349ede6a | 7204 | #: sequencer.c:3060 sequencer.c:4098 |
1a79b2f1 JX |
7205 | msgid "cannot read HEAD" |
7206 | msgstr "不能读取 HEAD" | |
7207 | ||
349ede6a | 7208 | #: sequencer.c:3077 |
c1ac5258 JX |
7209 | #, c-format |
7210 | msgid "unable to copy '%s' to '%s'" | |
7211 | msgstr "无法拷贝 '%s' 至 '%s'" | |
7212 | ||
349ede6a | 7213 | #: sequencer.c:3085 |
c1ac5258 JX |
7214 | #, c-format |
7215 | msgid "" | |
7216 | "You can amend the commit now, with\n" | |
7217 | "\n" | |
7218 | " git commit --amend %s\n" | |
7219 | "\n" | |
7220 | "Once you are satisfied with your changes, run\n" | |
7221 | "\n" | |
7222 | " git rebase --continue\n" | |
7223 | msgstr "" | |
7224 | "您现在可以修补这个提交,使用\n" | |
7225 | "\n" | |
7226 | " git commit --amend %s\n" | |
7227 | "\n" | |
7228 | "当您对变更感到满意,执行\n" | |
7229 | "\n" | |
7230 | " git rebase --continue\n" | |
7231 | ||
349ede6a | 7232 | #: sequencer.c:3095 |
c1ac5258 JX |
7233 | #, c-format |
7234 | msgid "Could not apply %s... %.*s" | |
7235 | msgstr "不能应用 %s... %.*s" | |
7236 | ||
349ede6a | 7237 | #: sequencer.c:3102 |
c1ac5258 JX |
7238 | #, c-format |
7239 | msgid "Could not merge %.*s" | |
7240 | msgstr "不能合并 %.*s" | |
7241 | ||
349ede6a | 7242 | #: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 |
1a79b2f1 JX |
7243 | #, c-format |
7244 | msgid "could not copy '%s' to '%s'" | |
7245 | msgstr "不能拷贝 '%s' 至 '%s'" | |
7246 | ||
349ede6a JX |
7247 | #: sequencer.c:3132 |
7248 | #, c-format | |
7249 | msgid "Executing: %s\n" | |
7250 | msgstr "正在执行:%s\n" | |
7251 | ||
1a79b2f1 | 7252 | # 译者:注意保持前导空格 |
349ede6a | 7253 | #: sequencer.c:3147 |
1a79b2f1 JX |
7254 | #, c-format |
7255 | msgid "" | |
7256 | "execution failed: %s\n" | |
7257 | "%sYou can fix the problem, and then run\n" | |
7258 | "\n" | |
7259 | " git rebase --continue\n" | |
7260 | "\n" | |
7261 | msgstr "" | |
7262 | "执行失败:%s\n" | |
7263 | "%s您可以改正该问题,然后运行\n" | |
7264 | "\n" | |
7265 | " git rebase --continue\n" | |
7266 | "\n" | |
7267 | ||
349ede6a | 7268 | #: sequencer.c:3153 |
1a79b2f1 JX |
7269 | msgid "and made changes to the index and/or the working tree\n" |
7270 | msgstr "并且修改索引和/或工作区\n" | |
7271 | ||
349ede6a | 7272 | #: sequencer.c:3159 |
1a79b2f1 JX |
7273 | #, c-format |
7274 | msgid "" | |
7275 | "execution succeeded: %s\n" | |
7276 | "but left changes to the index and/or the working tree\n" | |
7277 | "Commit or stash your changes, and then run\n" | |
7278 | "\n" | |
7279 | " git rebase --continue\n" | |
7280 | "\n" | |
7281 | msgstr "" | |
7282 | "执行成功:%s\n" | |
7283 | "但是在索引和/或工作区中存在变更\n" | |
a4f16749 | 7284 | "提交或贮藏修改,然后运行\n" |
1a79b2f1 JX |
7285 | "\n" |
7286 | " git rebase --continue\n" | |
7287 | "\n" | |
7288 | ||
349ede6a | 7289 | #: sequencer.c:3220 |
c1ac5258 JX |
7290 | #, c-format |
7291 | msgid "illegal label name: '%.*s'" | |
7292 | msgstr "非法的标签名称:'%.*s'" | |
7293 | ||
349ede6a | 7294 | #: sequencer.c:3274 |
fd8cb379 JX |
7295 | msgid "writing fake root commit" |
7296 | msgstr "写伪根提交" | |
7297 | ||
349ede6a | 7298 | #: sequencer.c:3279 |
fd8cb379 JX |
7299 | msgid "writing squash-onto" |
7300 | msgstr "写入 squash-onto" | |
7301 | ||
349ede6a | 7302 | #: sequencer.c:3363 |
c1ac5258 JX |
7303 | #, c-format |
7304 | msgid "could not resolve '%s'" | |
7305 | msgstr "无法解析 '%s'" | |
7306 | ||
349ede6a | 7307 | #: sequencer.c:3394 |
fd8cb379 JX |
7308 | msgid "cannot merge without a current revision" |
7309 | msgstr "没有当前版本不能合并" | |
7310 | ||
349ede6a | 7311 | #: sequencer.c:3416 |
fd8cb379 | 7312 | #, c-format |
c1ac5258 JX |
7313 | msgid "unable to parse '%.*s'" |
7314 | msgstr "无法解析 '%.*s'" | |
7315 | ||
349ede6a | 7316 | #: sequencer.c:3425 |
c1ac5258 JX |
7317 | #, c-format |
7318 | msgid "nothing to merge: '%.*s'" | |
7319 | msgstr "无可用合并:'%.*s'" | |
7320 | ||
349ede6a | 7321 | #: sequencer.c:3437 |
c1ac5258 JX |
7322 | msgid "octopus merge cannot be executed on top of a [new root]" |
7323 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
fd8cb379 | 7324 | |
349ede6a | 7325 | #: sequencer.c:3453 |
fd8cb379 JX |
7326 | #, c-format |
7327 | msgid "could not get commit message of '%s'" | |
7328 | msgstr "不能获取 '%s' 的提交说明" | |
7329 | ||
349ede6a | 7330 | #: sequencer.c:3613 |
fd8cb379 JX |
7331 | #, c-format |
7332 | msgid "could not even attempt to merge '%.*s'" | |
7333 | msgstr "甚至不能尝试合并 '%.*s'" | |
7334 | ||
349ede6a | 7335 | #: sequencer.c:3629 |
fd8cb379 JX |
7336 | msgid "merge: Unable to write new index file" |
7337 | msgstr "合并:无法写入新索引文件" | |
7338 | ||
349ede6a JX |
7339 | #: sequencer.c:3703 |
7340 | msgid "Cannot autostash" | |
7341 | msgstr "无法 autostash" | |
7342 | ||
7343 | #: sequencer.c:3706 | |
1a79b2f1 | 7344 | #, c-format |
349ede6a JX |
7345 | msgid "Unexpected stash response: '%s'" |
7346 | msgstr "意外的 stash 响应:'%s'" | |
1a79b2f1 | 7347 | |
349ede6a | 7348 | #: sequencer.c:3712 |
1a79b2f1 | 7349 | #, c-format |
349ede6a JX |
7350 | msgid "Could not create directory for '%s'" |
7351 | msgstr "不能为 '%s' 创建目录" | |
7352 | ||
7353 | #: sequencer.c:3715 | |
7354 | #, c-format | |
7355 | msgid "Created autostash: %s\n" | |
7356 | msgstr "创建了 autostash:%s\n" | |
7357 | ||
7358 | #: sequencer.c:3719 | |
7359 | msgid "could not reset --hard" | |
7360 | msgstr "无法 reset --hard" | |
7361 | ||
7362 | #: sequencer.c:3744 | |
7363 | #, c-format | |
7364 | msgid "Applied autostash.\n" | |
7365 | msgstr "已应用 autostash。\n" | |
7366 | ||
7367 | #: sequencer.c:3756 | |
7368 | #, c-format | |
7369 | msgid "cannot store %s" | |
1a79b2f1 JX |
7370 | msgstr "不能存储 %s" |
7371 | ||
349ede6a | 7372 | #: sequencer.c:3759 |
1a79b2f1 JX |
7373 | #, c-format |
7374 | msgid "" | |
349ede6a | 7375 | "%s\n" |
1a79b2f1 JX |
7376 | "Your changes are safe in the stash.\n" |
7377 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
7378 | msgstr "" | |
349ede6a JX |
7379 | "%s\n" |
7380 | "您的修改在贮藏区中很安全。\n" | |
1a79b2f1 JX |
7381 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" |
7382 | ||
349ede6a JX |
7383 | #: sequencer.c:3764 |
7384 | msgid "Applying autostash resulted in conflicts." | |
7385 | msgstr "应用自动贮藏导致冲突。" | |
7386 | ||
7387 | #: sequencer.c:3765 | |
7388 | msgid "Autostash exists; creating a new stash entry." | |
7389 | msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。" | |
7390 | ||
7391 | #: sequencer.c:3857 | |
4c27fcb5 JX |
7392 | #, c-format |
7393 | msgid "%s: not a valid OID" | |
5b533632 | 7394 | msgstr "%s:不是一个有效的对象 ID" |
4c27fcb5 | 7395 | |
349ede6a | 7396 | #: sequencer.c:3862 git-rebase--preserve-merges.sh:779 |
4c27fcb5 JX |
7397 | msgid "could not detach HEAD" |
7398 | msgstr "不能分离头指针" | |
7399 | ||
349ede6a | 7400 | #: sequencer.c:3877 |
4c27fcb5 JX |
7401 | #, c-format |
7402 | msgid "Stopped at HEAD\n" | |
7403 | msgstr "停止在 HEAD\n" | |
7404 | ||
349ede6a | 7405 | #: sequencer.c:3879 |
4c27fcb5 JX |
7406 | #, c-format |
7407 | msgid "Stopped at %s\n" | |
7408 | msgstr "停止在 %s\n" | |
7409 | ||
349ede6a | 7410 | #: sequencer.c:3887 |
fd8cb379 JX |
7411 | #, c-format |
7412 | msgid "" | |
7413 | "Could not execute the todo command\n" | |
7414 | "\n" | |
7415 | " %.*s\n" | |
7416 | "It has been rescheduled; To edit the command before continuing, please\n" | |
7417 | "edit the todo list first:\n" | |
7418 | "\n" | |
7419 | " git rebase --edit-todo\n" | |
7420 | " git rebase --continue\n" | |
7421 | msgstr "" | |
7422 | "无法执行待办命令\n" | |
7423 | "\n" | |
7424 | " %.*s\n" | |
7425 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
7426 | "\n" | |
7427 | " git rebase --edit-todo\n" | |
7428 | " git rebase --continue\n" | |
7429 | ||
349ede6a JX |
7430 | #: sequencer.c:3931 |
7431 | #, c-format | |
7432 | msgid "Rebasing (%d/%d)%s" | |
7433 | msgstr "正在变基(%d/%d)%s" | |
7434 | ||
7435 | #: sequencer.c:3976 | |
1a79b2f1 | 7436 | #, c-format |
87cb7997 JX |
7437 | msgid "Stopped at %s... %.*s\n" |
7438 | msgstr "停止在 %s... %.*s\n" | |
1a79b2f1 | 7439 | |
349ede6a | 7440 | #: sequencer.c:4047 |
1a79b2f1 JX |
7441 | #, c-format |
7442 | msgid "unknown command %d" | |
7443 | msgstr "未知命令 %d" | |
7444 | ||
349ede6a | 7445 | #: sequencer.c:4106 |
1a79b2f1 JX |
7446 | msgid "could not read orig-head" |
7447 | msgstr "不能读取 orig-head" | |
7448 | ||
349ede6a | 7449 | #: sequencer.c:4111 |
1a79b2f1 JX |
7450 | msgid "could not read 'onto'" |
7451 | msgstr "不能读取 'onto'" | |
7452 | ||
349ede6a | 7453 | #: sequencer.c:4125 |
1a79b2f1 JX |
7454 | #, c-format |
7455 | msgid "could not update HEAD to %s" | |
7456 | msgstr "不能更新 HEAD 为 %s" | |
7457 | ||
349ede6a JX |
7458 | #: sequencer.c:4185 |
7459 | #, c-format | |
7460 | msgid "Successfully rebased and updated %s.\n" | |
7461 | msgstr "成功变基并更新 %s。\n" | |
7462 | ||
7463 | #: sequencer.c:4218 | |
1a79b2f1 JX |
7464 | msgid "cannot rebase: You have unstaged changes." |
7465 | msgstr "不能变基:您有未暂存的变更。" | |
7466 | ||
349ede6a | 7467 | #: sequencer.c:4227 |
1a79b2f1 JX |
7468 | msgid "cannot amend non-existing commit" |
7469 | msgstr "不能修补不存在的提交" | |
7470 | ||
349ede6a | 7471 | #: sequencer.c:4229 |
1a79b2f1 JX |
7472 | #, c-format |
7473 | msgid "invalid file: '%s'" | |
7474 | msgstr "无效文件:'%s'" | |
7475 | ||
349ede6a | 7476 | #: sequencer.c:4231 |
1a79b2f1 JX |
7477 | #, c-format |
7478 | msgid "invalid contents: '%s'" | |
7479 | msgstr "无效内容:'%s'" | |
7480 | ||
349ede6a | 7481 | #: sequencer.c:4234 |
1a79b2f1 JX |
7482 | msgid "" |
7483 | "\n" | |
7484 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
7485 | "first and then run 'git rebase --continue' again." | |
87cb7997 JX |
7486 | msgstr "" |
7487 | "\n" | |
7488 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
1a79b2f1 | 7489 | |
349ede6a | 7490 | #: sequencer.c:4270 sequencer.c:4309 |
fd8cb379 JX |
7491 | #, c-format |
7492 | msgid "could not write file: '%s'" | |
7493 | msgstr "不能写入文件:'%s'" | |
7494 | ||
349ede6a | 7495 | #: sequencer.c:4324 |
fd8cb379 JX |
7496 | msgid "could not remove CHERRY_PICK_HEAD" |
7497 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
7498 | ||
349ede6a | 7499 | #: sequencer.c:4331 |
1a79b2f1 JX |
7500 | msgid "could not commit staged changes." |
7501 | msgstr "不能提交暂存的修改。" | |
7502 | ||
349ede6a | 7503 | #: sequencer.c:4446 |
a0b6b246 JX |
7504 | #, c-format |
7505 | msgid "%s: can't cherry-pick a %s" | |
7506 | msgstr "%s:不能拣选一个%s" | |
7507 | ||
349ede6a | 7508 | #: sequencer.c:4450 |
a0b6b246 JX |
7509 | #, c-format |
7510 | msgid "%s: bad revision" | |
7511 | msgstr "%s:错误的版本" | |
7512 | ||
349ede6a | 7513 | #: sequencer.c:4485 |
a0b6b246 JX |
7514 | msgid "can't revert as initial commit" |
7515 | msgstr "不能作为初始提交回退" | |
7516 | ||
349ede6a | 7517 | #: sequencer.c:4962 |
6937cb4e JX |
7518 | msgid "make_script: unhandled options" |
7519 | msgstr "make_script:有未能处理的选项" | |
7520 | ||
349ede6a | 7521 | #: sequencer.c:4965 |
6937cb4e JX |
7522 | msgid "make_script: error preparing revisions" |
7523 | msgstr "make_script:准备版本时错误" | |
7524 | ||
349ede6a | 7525 | #: sequencer.c:5206 sequencer.c:5223 |
4c27fcb5 JX |
7526 | msgid "nothing to do" |
7527 | msgstr "无事可做" | |
7528 | ||
349ede6a | 7529 | #: sequencer.c:5242 |
4c27fcb5 JX |
7530 | msgid "could not skip unnecessary pick commands" |
7531 | msgstr "无法跳过不必要的拣选" | |
7532 | ||
349ede6a | 7533 | #: sequencer.c:5336 |
6937cb4e JX |
7534 | msgid "the script was already rearranged." |
7535 | msgstr "脚本已经重新编排。" | |
7536 | ||
349ede6a | 7537 | #: setup.c:133 |
31e5e17b | 7538 | #, c-format |
2b472aae | 7539 | msgid "'%s' is outside repository at '%s'" |
440e7442 | 7540 | msgstr "'%s' 在位于 '%s' 的仓库之外" |
31e5e17b | 7541 | |
349ede6a | 7542 | #: setup.c:185 |
a0b6b246 | 7543 | #, c-format |
6792b93b | 7544 | msgid "" |
a0b6b246 JX |
7545 | "%s: no such path in the working tree.\n" |
7546 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
7547 | msgstr "" | |
7548 | "%s:工作区中无此路径。\n" | |
58b6f078 | 7549 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" |
6792b93b | 7550 | |
349ede6a | 7551 | #: setup.c:198 |
90314792 | 7552 | #, c-format |
a0b6b246 JX |
7553 | msgid "" |
7554 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
7555 | "Use '--' to separate paths from revisions, like this:\n" | |
7556 | "'git <command> [<revision>...] -- [<file>...]'" | |
7557 | msgstr "" | |
7558 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
7559 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 7560 | "'git <命令> [<版本>...] -- [<文件>...]'" |
6792b93b | 7561 | |
349ede6a | 7562 | #: setup.c:264 |
31e5e17b JX |
7563 | #, c-format |
7564 | msgid "option '%s' must come before non-option arguments" | |
7565 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
7566 | ||
349ede6a | 7567 | #: setup.c:283 |
a0b6b246 JX |
7568 | #, c-format |
7569 | msgid "" | |
7570 | "ambiguous argument '%s': both revision and filename\n" | |
7571 | "Use '--' to separate paths from revisions, like this:\n" | |
7572 | "'git <command> [<revision>...] -- [<file>...]'" | |
7573 | msgstr "" | |
7574 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
7575 | "使用 '--' 来分隔版本和路径,例如:\n" | |
58b6f078 | 7576 | "'git <命令> [<版本>...] -- [<文件>...]'" |
2e8451e8 | 7577 | |
349ede6a | 7578 | #: setup.c:419 |
31e5e17b JX |
7579 | msgid "unable to set up work tree using invalid config" |
7580 | msgstr "无法使用无效配置来创建工作区" | |
7581 | ||
349ede6a | 7582 | #: setup.c:423 |
31e5e17b | 7583 | msgid "this operation must be run in a work tree" |
610f8099 | 7584 | msgstr "该操作必须在一个工作区中运行" |
31e5e17b | 7585 | |
7157c2b5 | 7586 | #: setup.c:604 |
a0b6b246 JX |
7587 | #, c-format |
7588 | msgid "Expected git repo version <= %d, found %d" | |
7589 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
6792b93b | 7590 | |
7157c2b5 | 7591 | #: setup.c:612 |
a0b6b246 JX |
7592 | msgid "unknown repository extensions found:" |
7593 | msgstr "发现未知的仓库扩展:" | |
2e8451e8 | 7594 | |
7157c2b5 | 7595 | #: setup.c:631 |
1003b3a5 | 7596 | #, c-format |
31e5e17b | 7597 | msgid "error opening '%s'" |
c1ac5258 | 7598 | msgstr "打开 '%s' 出错" |
1003b3a5 | 7599 | |
7157c2b5 | 7600 | #: setup.c:633 |
31e5e17b JX |
7601 | #, c-format |
7602 | msgid "too large to be a .git file: '%s'" | |
610f8099 | 7603 | msgstr "文件太大,无法作为 .git 文件:'%s'" |
31e5e17b | 7604 | |
7157c2b5 | 7605 | #: setup.c:635 |
31e5e17b JX |
7606 | #, c-format |
7607 | msgid "error reading %s" | |
c1ac5258 | 7608 | msgstr "读取 %s 出错" |
31e5e17b | 7609 | |
7157c2b5 | 7610 | #: setup.c:637 |
31e5e17b JX |
7611 | #, c-format |
7612 | msgid "invalid gitfile format: %s" | |
7613 | msgstr "无效的 gitfile 格式:%s" | |
7614 | ||
7157c2b5 | 7615 | #: setup.c:639 |
31e5e17b JX |
7616 | #, c-format |
7617 | msgid "no path in gitfile: %s" | |
7618 | msgstr "在 gitfile 中没有路径:%s" | |
7619 | ||
7157c2b5 | 7620 | #: setup.c:641 |
31e5e17b JX |
7621 | #, c-format |
7622 | msgid "not a git repository: %s" | |
7623 | msgstr "不是一个 git 仓库:%s" | |
7624 | ||
7157c2b5 | 7625 | #: setup.c:743 |
31e5e17b JX |
7626 | #, c-format |
7627 | msgid "'$%s' too big" | |
7628 | msgstr "'$%s' 太大" | |
7629 | ||
7157c2b5 | 7630 | #: setup.c:757 |
31e5e17b JX |
7631 | #, c-format |
7632 | msgid "not a git repository: '%s'" | |
7633 | msgstr "不是一个 git 仓库:'%s'" | |
7634 | ||
7157c2b5 | 7635 | #: setup.c:786 setup.c:788 setup.c:819 |
31e5e17b JX |
7636 | #, c-format |
7637 | msgid "cannot chdir to '%s'" | |
7638 | msgstr "不能切换目录到 '%s'" | |
7639 | ||
7157c2b5 | 7640 | #: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 |
31e5e17b | 7641 | msgid "cannot come back to cwd" |
a0b6b246 | 7642 | msgstr "无法返回当前工作目录" |
1003b3a5 | 7643 | |
7157c2b5 | 7644 | #: setup.c:918 |
31e5e17b JX |
7645 | #, c-format |
7646 | msgid "failed to stat '%*s%s%s'" | |
c1ac5258 | 7647 | msgstr "获取 '%*s%s%s' 状态(stat)失败" |
31e5e17b | 7648 | |
7157c2b5 | 7649 | #: setup.c:1156 |
a0b6b246 JX |
7650 | msgid "Unable to read current working directory" |
7651 | msgstr "不能读取当前工作目录" | |
1003b3a5 | 7652 | |
7157c2b5 | 7653 | #: setup.c:1165 setup.c:1171 |
87cb7997 | 7654 | #, c-format |
31e5e17b | 7655 | msgid "cannot change to '%s'" |
87cb7997 JX |
7656 | msgstr "不能切换到 '%s'" |
7657 | ||
7157c2b5 | 7658 | #: setup.c:1176 |
06991777 JX |
7659 | #, c-format |
7660 | msgid "not a git repository (or any of the parent directories): %s" | |
7661 | msgstr "不是一个 git 仓库(或者任何父目录):%s" | |
7662 | ||
7157c2b5 | 7663 | #: setup.c:1182 |
a0b6b246 JX |
7664 | #, c-format |
7665 | msgid "" | |
31e5e17b | 7666 | "not a git repository (or any parent up to mount point %s)\n" |
a0b6b246 JX |
7667 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." |
7668 | msgstr "" | |
31e5e17b | 7669 | "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
a0b6b246 | 7670 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" |
1003b3a5 | 7671 | |
7157c2b5 | 7672 | #: setup.c:1293 |
a0b6b246 JX |
7673 | #, c-format |
7674 | msgid "" | |
31e5e17b | 7675 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
a0b6b246 JX |
7676 | "The owner of files must always have read and write permissions." |
7677 | msgstr "" | |
31e5e17b | 7678 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
a0b6b246 | 7679 | "文件属主必须始终拥有读写权限。" |
6792b93b | 7680 | |
7157c2b5 | 7681 | #: setup.c:1340 |
31e5e17b JX |
7682 | msgid "open /dev/null or dup failed" |
7683 | msgstr "不能打开或者复制 /dev/null" | |
7684 | ||
7157c2b5 | 7685 | #: setup.c:1355 |
31e5e17b JX |
7686 | msgid "fork failed" |
7687 | msgstr "fork 失败" | |
7688 | ||
7157c2b5 | 7689 | #: setup.c:1360 |
31e5e17b JX |
7690 | msgid "setsid failed" |
7691 | msgstr "setsid 失败" | |
7692 | ||
349ede6a | 7693 | #: sha1-file.c:470 |
c1ac5258 JX |
7694 | #, c-format |
7695 | msgid "object directory %s does not exist; check .git/objects/info/alternates" | |
7696 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
7697 | ||
349ede6a | 7698 | #: sha1-file.c:521 |
c1ac5258 JX |
7699 | #, c-format |
7700 | msgid "unable to normalize alternate object path: %s" | |
7701 | msgstr "无法规范化备用对象路径:%s" | |
7702 | ||
349ede6a | 7703 | #: sha1-file.c:593 |
c1ac5258 JX |
7704 | #, c-format |
7705 | msgid "%s: ignoring alternate object stores, nesting too deep" | |
7706 | msgstr "%s:忽略备用对象库,嵌套太深" | |
7707 | ||
349ede6a | 7708 | #: sha1-file.c:600 |
c1ac5258 JX |
7709 | #, c-format |
7710 | msgid "unable to normalize object directory: %s" | |
7711 | msgstr "无法规范化对象目录: %s" | |
7712 | ||
349ede6a | 7713 | #: sha1-file.c:643 |
c1ac5258 JX |
7714 | msgid "unable to fdopen alternates lockfile" |
7715 | msgstr "无法 fdopen 替换锁文件" | |
7716 | ||
349ede6a | 7717 | #: sha1-file.c:661 |
c1ac5258 JX |
7718 | msgid "unable to read alternates file" |
7719 | msgstr "无法读取替代文件" | |
7720 | ||
349ede6a | 7721 | #: sha1-file.c:668 |
c1ac5258 JX |
7722 | msgid "unable to move new alternates file into place" |
7723 | msgstr "无法将新的替代文件移动到位" | |
7724 | ||
349ede6a | 7725 | #: sha1-file.c:703 |
a0b6b246 JX |
7726 | #, c-format |
7727 | msgid "path '%s' does not exist" | |
7728 | msgstr "路径 '%s' 不存在" | |
7729 | ||
349ede6a | 7730 | #: sha1-file.c:724 |
a0b6b246 JX |
7731 | #, c-format |
7732 | msgid "reference repository '%s' as a linked checkout is not supported yet." | |
7733 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
7734 | ||
349ede6a | 7735 | #: sha1-file.c:730 |
a0b6b246 JX |
7736 | #, c-format |
7737 | msgid "reference repository '%s' is not a local repository." | |
7738 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
7739 | ||
349ede6a | 7740 | #: sha1-file.c:736 |
a0b6b246 JX |
7741 | #, c-format |
7742 | msgid "reference repository '%s' is shallow" | |
7743 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
7744 | ||
349ede6a | 7745 | #: sha1-file.c:744 |
a0b6b246 JX |
7746 | #, c-format |
7747 | msgid "reference repository '%s' is grafted" | |
fd8cb379 | 7748 | msgstr "参考仓库 '%s' 已被移植" |
a0b6b246 | 7749 | |
349ede6a | 7750 | #: sha1-file.c:804 |
a6cd2cc4 JX |
7751 | #, c-format |
7752 | msgid "invalid line while parsing alternate refs: %s" | |
7753 | msgstr "解析备用引用时无效的行:%s" | |
7754 | ||
349ede6a | 7755 | #: sha1-file.c:954 |
c1ac5258 JX |
7756 | #, c-format |
7757 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" | |
7758 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
7759 | ||
349ede6a | 7760 | #: sha1-file.c:975 |
c1ac5258 JX |
7761 | msgid "mmap failed" |
7762 | msgstr "mmap 失败" | |
7763 | ||
349ede6a | 7764 | #: sha1-file.c:1139 |
c1ac5258 JX |
7765 | #, c-format |
7766 | msgid "object file %s is empty" | |
7767 | msgstr "对象文件 %s 为空" | |
7768 | ||
349ede6a | 7769 | #: sha1-file.c:1274 sha1-file.c:2454 |
c1ac5258 JX |
7770 | #, c-format |
7771 | msgid "corrupt loose object '%s'" | |
7772 | msgstr "损坏的松散对象 '%s'" | |
7773 | ||
349ede6a | 7774 | #: sha1-file.c:1276 sha1-file.c:2458 |
c1ac5258 JX |
7775 | #, c-format |
7776 | msgid "garbage at end of loose object '%s'" | |
7777 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
7778 | ||
349ede6a | 7779 | #: sha1-file.c:1318 |
c1ac5258 JX |
7780 | msgid "invalid object type" |
7781 | msgstr "无效的对象类型" | |
7782 | ||
349ede6a | 7783 | #: sha1-file.c:1402 |
c1ac5258 JX |
7784 | #, c-format |
7785 | msgid "unable to unpack %s header with --allow-unknown-type" | |
7786 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
7787 | ||
349ede6a | 7788 | #: sha1-file.c:1405 |
c1ac5258 JX |
7789 | #, c-format |
7790 | msgid "unable to unpack %s header" | |
7791 | msgstr "无法解开 %s 头部" | |
7792 | ||
349ede6a | 7793 | #: sha1-file.c:1411 |
c1ac5258 JX |
7794 | #, c-format |
7795 | msgid "unable to parse %s header with --allow-unknown-type" | |
7796 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
7797 | ||
349ede6a | 7798 | #: sha1-file.c:1414 |
c1ac5258 JX |
7799 | #, c-format |
7800 | msgid "unable to parse %s header" | |
7801 | msgstr "无法解析 %s 头部" | |
7802 | ||
349ede6a | 7803 | #: sha1-file.c:1640 |
c1ac5258 JX |
7804 | #, c-format |
7805 | msgid "failed to read object %s" | |
7806 | msgstr "读取对象 %s 失败" | |
7807 | ||
349ede6a | 7808 | #: sha1-file.c:1644 |
c1ac5258 JX |
7809 | #, c-format |
7810 | msgid "replacement %s not found for %s" | |
7811 | msgstr "找不到 %2$s 的替代 %1$s" | |
7812 | ||
349ede6a | 7813 | #: sha1-file.c:1648 |
c1ac5258 JX |
7814 | #, c-format |
7815 | msgid "loose object %s (stored in %s) is corrupt" | |
7816 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
7817 | ||
349ede6a | 7818 | #: sha1-file.c:1652 |
c1ac5258 JX |
7819 | #, c-format |
7820 | msgid "packed object %s (stored in %s) is corrupt" | |
7821 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
7822 | ||
349ede6a | 7823 | #: sha1-file.c:1757 |
c1ac5258 | 7824 | #, c-format |
06991777 JX |
7825 | msgid "unable to write file %s" |
7826 | msgstr "无法写文件 %s" | |
c1ac5258 | 7827 | |
349ede6a | 7828 | #: sha1-file.c:1764 |
c1ac5258 JX |
7829 | #, c-format |
7830 | msgid "unable to set permission to '%s'" | |
7831 | msgstr "无法为 '%s' 设置权限" | |
7832 | ||
349ede6a | 7833 | #: sha1-file.c:1771 |
c1ac5258 JX |
7834 | msgid "file write error" |
7835 | msgstr "文件写错误" | |
7836 | ||
349ede6a | 7837 | #: sha1-file.c:1791 |
06991777 JX |
7838 | msgid "error when closing loose object file" |
7839 | msgstr "关闭松散对象文件时出错" | |
c1ac5258 | 7840 | |
349ede6a | 7841 | #: sha1-file.c:1856 |
c1ac5258 JX |
7842 | #, c-format |
7843 | msgid "insufficient permission for adding an object to repository database %s" | |
7844 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
7845 | ||
349ede6a | 7846 | #: sha1-file.c:1858 |
c1ac5258 JX |
7847 | msgid "unable to create temporary file" |
7848 | msgstr "无法创建临时文件" | |
7849 | ||
349ede6a | 7850 | #: sha1-file.c:1882 |
06991777 JX |
7851 | msgid "unable to write loose object file" |
7852 | msgstr "不能写松散对象文件" | |
c1ac5258 | 7853 | |
349ede6a | 7854 | #: sha1-file.c:1888 |
c1ac5258 JX |
7855 | #, c-format |
7856 | msgid "unable to deflate new object %s (%d)" | |
7857 | msgstr "不能压缩新对象 %s(%d)" | |
7858 | ||
349ede6a | 7859 | #: sha1-file.c:1892 |
c1ac5258 JX |
7860 | #, c-format |
7861 | msgid "deflateEnd on object %s failed (%d)" | |
7862 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
7863 | ||
349ede6a | 7864 | #: sha1-file.c:1896 |
c1ac5258 JX |
7865 | #, c-format |
7866 | msgid "confused by unstable object source data for %s" | |
7867 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
7868 | ||
7157c2b5 | 7869 | #: sha1-file.c:1906 builtin/pack-objects.c:1085 |
c1ac5258 JX |
7870 | #, c-format |
7871 | msgid "failed utime() on %s" | |
7872 | msgstr "在 %s 上调用 utime() 失败" | |
7873 | ||
349ede6a | 7874 | #: sha1-file.c:1983 |
c1ac5258 | 7875 | #, c-format |
06991777 JX |
7876 | msgid "cannot read object for %s" |
7877 | msgstr "不能读取对象 %s" | |
c1ac5258 | 7878 | |
349ede6a | 7879 | #: sha1-file.c:2022 |
c1ac5258 JX |
7880 | msgid "corrupt commit" |
7881 | msgstr "损坏的提交" | |
7882 | ||
349ede6a | 7883 | #: sha1-file.c:2030 |
c1ac5258 JX |
7884 | msgid "corrupt tag" |
7885 | msgstr "损坏的标签" | |
7886 | ||
349ede6a | 7887 | #: sha1-file.c:2130 |
c1ac5258 JX |
7888 | #, c-format |
7889 | msgid "read error while indexing %s" | |
7890 | msgstr "索引 %s 时读取错误" | |
7891 | ||
349ede6a | 7892 | #: sha1-file.c:2133 |
c1ac5258 JX |
7893 | #, c-format |
7894 | msgid "short read while indexing %s" | |
7895 | msgstr "索引 %s 时读入不完整" | |
7896 | ||
349ede6a | 7897 | #: sha1-file.c:2206 sha1-file.c:2216 |
c1ac5258 JX |
7898 | #, c-format |
7899 | msgid "%s: failed to insert into database" | |
7900 | msgstr "%s:插入数据库失败" | |
7901 | ||
349ede6a | 7902 | #: sha1-file.c:2222 |
c1ac5258 JX |
7903 | #, c-format |
7904 | msgid "%s: unsupported file type" | |
7905 | msgstr "%s:不支持的文件类型" | |
7906 | ||
349ede6a | 7907 | #: sha1-file.c:2246 |
c1ac5258 JX |
7908 | #, c-format |
7909 | msgid "%s is not a valid object" | |
7910 | msgstr "%s 不是一个有效的对象" | |
7911 | ||
349ede6a | 7912 | #: sha1-file.c:2248 |
c1ac5258 JX |
7913 | #, c-format |
7914 | msgid "%s is not a valid '%s' object" | |
7915 | msgstr "%s 不是一个有效的 '%s' 对象" | |
7916 | ||
349ede6a | 7917 | #: sha1-file.c:2275 builtin/index-pack.c:155 |
c1ac5258 JX |
7918 | #, c-format |
7919 | msgid "unable to open %s" | |
7920 | msgstr "不能打开 %s" | |
7921 | ||
349ede6a | 7922 | #: sha1-file.c:2465 sha1-file.c:2518 |
c1ac5258 | 7923 | #, c-format |
06991777 JX |
7924 | msgid "hash mismatch for %s (expected %s)" |
7925 | msgstr "%s 的哈希值不匹配(预期 %s)" | |
c1ac5258 | 7926 | |
349ede6a | 7927 | #: sha1-file.c:2489 |
c1ac5258 JX |
7928 | #, c-format |
7929 | msgid "unable to mmap %s" | |
7930 | msgstr "不能 mmap %s" | |
7931 | ||
349ede6a | 7932 | #: sha1-file.c:2494 |
c1ac5258 JX |
7933 | #, c-format |
7934 | msgid "unable to unpack header of %s" | |
7935 | msgstr "无法解压缩 %s 的头部" | |
7936 | ||
349ede6a | 7937 | #: sha1-file.c:2500 |
c1ac5258 JX |
7938 | #, c-format |
7939 | msgid "unable to parse header of %s" | |
7940 | msgstr "无法解析 %s 的头部" | |
7941 | ||
349ede6a | 7942 | #: sha1-file.c:2511 |
c1ac5258 JX |
7943 | #, c-format |
7944 | msgid "unable to unpack contents of %s" | |
7945 | msgstr "无法解压缩 %s 的内容" | |
7946 | ||
2b472aae | 7947 | #: sha1-name.c:486 |
a0b6b246 JX |
7948 | #, c-format |
7949 | msgid "short SHA1 %s is ambiguous" | |
29004bbb | 7950 | msgstr "短 SHA1 %s 存在歧义" |
a0b6b246 | 7951 | |
2b472aae | 7952 | #: sha1-name.c:497 |
a0b6b246 JX |
7953 | msgid "The candidates are:" |
7954 | msgstr "候选者有:" | |
7955 | ||
2b472aae | 7956 | #: sha1-name.c:796 |
a0b6b246 JX |
7957 | msgid "" |
7958 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
7959 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
7960 | "may be created by mistake. For example,\n" | |
7961 | "\n" | |
a6cd2cc4 | 7962 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 JX |
7963 | "\n" |
7964 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
7965 | "examine these refs and maybe delete them. Turn this message off by\n" | |
7966 | "running \"git config advice.objectNameWarning false\"" | |
7967 | msgstr "" | |
a6cd2cc4 JX |
7968 | "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n" |
7969 | "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n" | |
a0b6b246 | 7970 | "\n" |
a6cd2cc4 | 7971 | " git switch -c $br $(git rev-parse ...)\n" |
a0b6b246 | 7972 | "\n" |
a6cd2cc4 JX |
7973 | "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n" |
7974 | "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n" | |
7975 | "false\" 命令关闭本消息通知。" | |
7976 | ||
2b472aae JX |
7977 | #: sha1-name.c:916 |
7978 | #, c-format | |
7979 | msgid "log for '%.*s' only goes back to %s" | |
7980 | msgstr "'%.*s' 的日志仅能回到 %s" | |
7981 | ||
7982 | #: sha1-name.c:924 | |
7983 | #, c-format | |
7984 | msgid "log for '%.*s' only has %d entries" | |
7985 | msgstr "'%.*s' 的日志仅有 %d 个条目" | |
7986 | ||
7987 | #: sha1-name.c:1689 | |
7988 | #, c-format | |
7989 | msgid "path '%s' exists on disk, but not in '%.*s'" | |
7990 | msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中" | |
7991 | ||
7992 | #: sha1-name.c:1695 | |
7993 | #, c-format | |
7994 | msgid "" | |
7995 | "path '%s' exists, but not '%s'\n" | |
7996 | "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" | |
7997 | msgstr "" | |
440e7442 | 7998 | "路径 '%s' 存在,而 '%s' 不存在\n" |
2b472aae JX |
7999 | "提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?" |
8000 | ||
8001 | #: sha1-name.c:1704 | |
8002 | #, c-format | |
8003 | msgid "path '%s' does not exist in '%.*s'" | |
8004 | msgstr "路径 '%s' 不在 '%.*s' 中" | |
8005 | ||
8006 | #: sha1-name.c:1732 | |
8007 | #, c-format | |
8008 | msgid "" | |
8009 | "path '%s' is in the index, but not at stage %d\n" | |
8010 | "hint: Did you mean ':%d:%s'?" | |
8011 | msgstr "" | |
8012 | "路径 '%s' 在索引中,但不在暂存区 %d 中\n" | |
8013 | "提示:您的意思是 ':%d:%s'?" | |
8014 | ||
8015 | #: sha1-name.c:1748 | |
8016 | #, c-format | |
8017 | msgid "" | |
8018 | "path '%s' is in the index, but not '%s'\n" | |
8019 | "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" | |
8020 | msgstr "" | |
440e7442 | 8021 | "路径 '%s' 在索引中,但 '%s' 不在\n" |
2b472aae JX |
8022 | "提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?" |
8023 | ||
8024 | #: sha1-name.c:1756 | |
8025 | #, c-format | |
8026 | msgid "path '%s' exists on disk, but not in the index" | |
440e7442 | 8027 | msgstr "路径 '%s' 在磁盘上,但不在索引里" |
2b472aae JX |
8028 | |
8029 | #: sha1-name.c:1758 | |
8030 | #, c-format | |
8031 | msgid "path '%s' does not exist (neither on disk nor in the index)" | |
440e7442 | 8032 | msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)" |
2b472aae JX |
8033 | |
8034 | #: sha1-name.c:1771 | |
8035 | msgid "relative path syntax can't be used outside working tree" | |
8036 | msgstr "不能在工作区之外使用相对路径语法" | |
8037 | ||
8038 | #: sha1-name.c:1909 | |
8039 | #, c-format | |
8040 | msgid "invalid object name '%.*s'." | |
8041 | msgstr "无效的对象名 '%.*s'。" | |
8042 | ||
a6cd2cc4 | 8043 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte |
7157c2b5 | 8044 | #: strbuf.c:848 |
a6cd2cc4 JX |
8045 | #, c-format |
8046 | msgid "%u.%2.2u GiB" | |
8047 | msgstr "%u.%2.2u GiB" | |
8048 | ||
8049 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second | |
7157c2b5 | 8050 | #: strbuf.c:850 |
a6cd2cc4 JX |
8051 | #, c-format |
8052 | msgid "%u.%2.2u GiB/s" | |
8053 | msgstr "%u.%2.2u GiB/s" | |
8054 | ||
8055 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte | |
7157c2b5 | 8056 | #: strbuf.c:858 |
a6cd2cc4 JX |
8057 | #, c-format |
8058 | msgid "%u.%2.2u MiB" | |
8059 | msgstr "%u.%2.2u MiB" | |
8060 | ||
8061 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second | |
7157c2b5 | 8062 | #: strbuf.c:860 |
a6cd2cc4 JX |
8063 | #, c-format |
8064 | msgid "%u.%2.2u MiB/s" | |
8065 | msgstr "%u.%2.2u MiB/s" | |
8066 | ||
8067 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte | |
7157c2b5 | 8068 | #: strbuf.c:867 |
a6cd2cc4 JX |
8069 | #, c-format |
8070 | msgid "%u.%2.2u KiB" | |
8071 | msgstr "%u.%2.2u KiB" | |
8072 | ||
8073 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second | |
7157c2b5 | 8074 | #: strbuf.c:869 |
a6cd2cc4 JX |
8075 | #, c-format |
8076 | msgid "%u.%2.2u KiB/s" | |
8077 | msgstr "%u.%2.2u KiB/s" | |
8078 | ||
8079 | #. TRANSLATORS: IEC 80000-13:2008 byte | |
7157c2b5 | 8080 | #: strbuf.c:875 |
a6cd2cc4 JX |
8081 | #, c-format |
8082 | msgid "%u byte" | |
8083 | msgid_plural "%u bytes" | |
8084 | msgstr[0] "%u 字节" | |
8085 | msgstr[1] "%u 字节" | |
8086 | ||
8087 | #. TRANSLATORS: IEC 80000-13:2008 byte/second | |
7157c2b5 | 8088 | #: strbuf.c:877 |
a6cd2cc4 JX |
8089 | #, c-format |
8090 | msgid "%u byte/s" | |
8091 | msgid_plural "%u bytes/s" | |
8092 | msgstr[0] "%u 字节/秒" | |
8093 | msgstr[1] "%u 字节/秒" | |
a0b6b246 | 8094 | |
7157c2b5 | 8095 | #: strbuf.c:1175 |
ddc12c42 JX |
8096 | #, c-format |
8097 | msgid "could not edit '%s'" | |
8098 | msgstr "不能编辑 '%s'" | |
8099 | ||
349ede6a JX |
8100 | #: submodule-config.c:237 |
8101 | #, c-format | |
8102 | msgid "ignoring suspicious submodule name: %s" | |
8103 | msgstr "忽略可疑的子模组名称:%s" | |
8104 | ||
8105 | #: submodule-config.c:304 | |
8106 | msgid "negative values not allowed for submodule.fetchjobs" | |
8107 | msgstr "submodule.fetchjobs 不允许为负值" | |
8108 | ||
8109 | #: submodule-config.c:402 | |
8110 | #, c-format | |
8111 | msgid "ignoring '%s' which may be interpreted as a command-line option: %s" | |
8112 | msgstr "忽略可能被解析为命令行选项的 '%s':%s" | |
8113 | ||
8114 | #: submodule-config.c:499 | |
8115 | #, c-format | |
8116 | msgid "invalid value for %s" | |
8117 | msgstr "%s 的值无效" | |
8118 | ||
8119 | #: submodule-config.c:766 | |
8120 | #, c-format | |
8121 | msgid "Could not update .gitmodules entry %s" | |
8122 | msgstr "不能更新 .gitmodules 条目 %s" | |
8123 | ||
06991777 | 8124 | #: submodule.c:114 submodule.c:143 |
a0b6b246 JX |
8125 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
8126 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
8127 | ||
06991777 | 8128 | #: submodule.c:118 submodule.c:147 |
a0b6b246 JX |
8129 | #, c-format |
8130 | msgid "Could not find section in .gitmodules where path=%s" | |
8131 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
8132 | ||
06991777 | 8133 | #: submodule.c:154 |
a0b6b246 JX |
8134 | #, c-format |
8135 | msgid "Could not remove .gitmodules entry for %s" | |
8136 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
8137 | ||
06991777 | 8138 | #: submodule.c:165 |
a0b6b246 JX |
8139 | msgid "staging updated .gitmodules failed" |
8140 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
8141 | ||
06991777 | 8142 | #: submodule.c:327 |
a4f16749 JX |
8143 | #, c-format |
8144 | msgid "in unpopulated submodule '%s'" | |
8145 | msgstr "位于未检出的子模组 '%s'" | |
8146 | ||
06991777 | 8147 | #: submodule.c:358 |
a4f16749 JX |
8148 | #, c-format |
8149 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
8150 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
8151 | ||
2b472aae JX |
8152 | #: submodule.c:434 |
8153 | #, c-format | |
8154 | msgid "bad --ignore-submodules argument: %s" | |
8155 | msgstr "坏的 --ignore-submodules 参数:%s" | |
8156 | ||
8157 | #: submodule.c:815 | |
8158 | #, c-format | |
8159 | msgid "" | |
8160 | "Submodule in commit %s at path: '%s' collides with a submodule named the " | |
8161 | "same. Skipping it." | |
440e7442 | 8162 | msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。" |
2b472aae | 8163 | |
d46c5519 | 8164 | #: submodule.c:910 |
6937cb4e JX |
8165 | #, c-format |
8166 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 8167 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 8168 | |
2b472aae JX |
8169 | #: submodule.c:995 |
8170 | #, c-format | |
8171 | msgid "" | |
8172 | "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " | |
8173 | "submodule %s" | |
440e7442 | 8174 | msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" |
2b472aae JX |
8175 | |
8176 | #: submodule.c:1118 | |
8177 | #, c-format | |
8178 | msgid "process for submodule '%s' failed" | |
440e7442 | 8179 | msgstr "处理子模组 '%s' 失败" |
2b472aae | 8180 | |
349ede6a | 8181 | #: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 |
6937cb4e JX |
8182 | msgid "Failed to resolve HEAD as a valid ref." |
8183 | msgstr "无法将 HEAD 解析为有效引用。" | |
8184 | ||
2b472aae | 8185 | #: submodule.c:1158 |
06991777 | 8186 | #, c-format |
2b472aae JX |
8187 | msgid "Pushing submodule '%s'\n" |
8188 | msgstr "正在推送子模组 '%s'\n" | |
06991777 | 8189 | |
2b472aae JX |
8190 | #: submodule.c:1161 |
8191 | #, c-format | |
8192 | msgid "Unable to push submodule '%s'\n" | |
8193 | msgstr "无法推送子模组 '%s'\n" | |
8194 | ||
8195 | #: submodule.c:1453 | |
8196 | #, c-format | |
8197 | msgid "Fetching submodule %s%s\n" | |
8198 | msgstr "正在获取子模组 %s%s\n" | |
8199 | ||
8200 | #: submodule.c:1483 | |
8201 | #, c-format | |
8202 | msgid "Could not access submodule '%s'\n" | |
8203 | msgstr "无法访问子模组 '%s'\n" | |
8204 | ||
8205 | #: submodule.c:1637 | |
8206 | #, c-format | |
8207 | msgid "" | |
8208 | "Errors during submodule fetch:\n" | |
8209 | "%s" | |
8210 | msgstr "" | |
8211 | "获取子模组时的错误:\n" | |
8212 | "%s" | |
8213 | ||
8214 | #: submodule.c:1662 | |
1a79b2f1 | 8215 | #, c-format |
87cb7997 | 8216 | msgid "'%s' not recognized as a git repository" |
65e2041e | 8217 | msgstr "无法将 '%s' 识别为一个 git 仓库" |
1a79b2f1 | 8218 | |
2b472aae JX |
8219 | #: submodule.c:1679 |
8220 | #, c-format | |
8221 | msgid "Could not run 'git status --porcelain=2' in submodule %s" | |
8222 | msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" | |
8223 | ||
8224 | #: submodule.c:1720 | |
8225 | #, c-format | |
8226 | msgid "'git status --porcelain=2' failed in submodule %s" | |
8227 | msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" | |
8228 | ||
8229 | #: submodule.c:1800 | |
1a79b2f1 | 8230 | #, c-format |
87cb7997 JX |
8231 | msgid "could not start 'git status' in submodule '%s'" |
8232 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 8233 | |
2b472aae | 8234 | #: submodule.c:1813 |
87cb7997 JX |
8235 | #, c-format |
8236 | msgid "could not run 'git status' in submodule '%s'" | |
8237 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
8238 | ||
2b472aae | 8239 | #: submodule.c:1828 |
06991777 JX |
8240 | #, c-format |
8241 | msgid "Could not unset core.worktree setting in submodule '%s'" | |
8242 | msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" | |
8243 | ||
2b472aae JX |
8244 | #: submodule.c:1855 submodule.c:2165 |
8245 | #, c-format | |
8246 | msgid "could not recurse into submodule '%s'" | |
8247 | msgstr "无法递归进子模组路径 '%s'" | |
8248 | ||
8249 | #: submodule.c:1876 | |
8250 | msgid "could not reset submodule index" | |
8251 | msgstr "无法重置子模组索引" | |
8252 | ||
8253 | #: submodule.c:1918 | |
87cb7997 JX |
8254 | #, c-format |
8255 | msgid "submodule '%s' has dirty index" | |
8256 | msgstr "子模组 '%s' 中有脏索引" | |
8257 | ||
2b472aae | 8258 | #: submodule.c:1970 |
c1ac5258 JX |
8259 | #, c-format |
8260 | msgid "Submodule '%s' could not be updated." | |
8261 | msgstr "子模组 '%s' 无法被更新。" | |
8262 | ||
2b472aae | 8263 | #: submodule.c:2038 |
ddc12c42 JX |
8264 | #, c-format |
8265 | msgid "submodule git dir '%s' is inside git dir '%.*s'" | |
8266 | msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" | |
8267 | ||
2b472aae | 8268 | #: submodule.c:2059 |
1a79b2f1 JX |
8269 | #, c-format |
8270 | msgid "" | |
8271 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
8272 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
8273 | ||
2b472aae | 8274 | #: submodule.c:2071 submodule.c:2130 |
1a79b2f1 JX |
8275 | #, c-format |
8276 | msgid "could not lookup name for submodule '%s'" | |
8277 | msgstr "不能查询子模组 '%s' 的名称" | |
8278 | ||
2b472aae | 8279 | #: submodule.c:2075 |
ddc12c42 JX |
8280 | #, c-format |
8281 | msgid "refusing to move '%s' into an existing git dir" | |
8282 | msgstr "禁止移动 '%s' 到现存 git 目录中" | |
8283 | ||
2b472aae | 8284 | #: submodule.c:2082 |
1a79b2f1 JX |
8285 | #, c-format |
8286 | msgid "" | |
8287 | "Migrating git directory of '%s%s' from\n" | |
8288 | "'%s' to\n" | |
8289 | "'%s'\n" | |
8290 | msgstr "" | |
8291 | "将 '%s%s' 的 git 目录从\n" | |
8292 | "'%s' 迁移至\n" | |
8293 | "'%s'\n" | |
8294 | ||
349ede6a | 8295 | #: submodule.c:2210 |
87cb7997 JX |
8296 | msgid "could not start ls-files in .." |
8297 | msgstr "无法在 .. 中启动 ls-files" | |
8298 | ||
349ede6a | 8299 | #: submodule.c:2250 |
87cb7997 JX |
8300 | #, c-format |
8301 | msgid "ls-tree returned unexpected return code %d" | |
8302 | msgstr "ls-tree 返回未知返回值 %d" | |
8303 | ||
6937cb4e | 8304 | #: trailer.c:238 |
a0b6b246 JX |
8305 | #, c-format |
8306 | msgid "running trailer command '%s' failed" | |
8307 | msgstr "执行 trailer 命令 '%s' 失败" | |
8308 | ||
6937cb4e JX |
8309 | #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 |
8310 | #: trailer.c:557 | |
a0b6b246 JX |
8311 | #, c-format |
8312 | msgid "unknown value '%s' for key '%s'" | |
8313 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
8314 | ||
2b472aae | 8315 | #: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 |
a0b6b246 JX |
8316 | #, c-format |
8317 | msgid "more than one %s" | |
8318 | msgstr "多于一个 %s" | |
8319 | ||
6937cb4e | 8320 | #: trailer.c:730 |
a0b6b246 JX |
8321 | #, c-format |
8322 | msgid "empty trailer token in trailer '%.*s'" | |
8323 | msgstr "签名 '%.*s' 的键为空" | |
8324 | ||
6937cb4e | 8325 | #: trailer.c:750 |
a0b6b246 JX |
8326 | #, c-format |
8327 | msgid "could not read input file '%s'" | |
8328 | msgstr "不能读取输入文件 '%s'" | |
8329 | ||
6937cb4e | 8330 | #: trailer.c:753 |
a0b6b246 JX |
8331 | msgid "could not read from stdin" |
8332 | msgstr "不能自标准输入读取" | |
8333 | ||
7157c2b5 | 8334 | #: trailer.c:1011 wrapper.c:673 |
a0b6b246 JX |
8335 | #, c-format |
8336 | msgid "could not stat %s" | |
65e2041e | 8337 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 8338 | |
4c27fcb5 | 8339 | #: trailer.c:1013 |
a0b6b246 JX |
8340 | #, c-format |
8341 | msgid "file %s is not a regular file" | |
8342 | msgstr "文件 %s 不是一个正规文件" | |
8343 | ||
4c27fcb5 | 8344 | #: trailer.c:1015 |
a0b6b246 JX |
8345 | #, c-format |
8346 | msgid "file %s is not writable by user" | |
8347 | msgstr "文件 %s 用户不可写" | |
8348 | ||
4c27fcb5 | 8349 | #: trailer.c:1027 |
a0b6b246 JX |
8350 | msgid "could not open temporary file" |
8351 | msgstr "不能打开临时文件" | |
8352 | ||
4c27fcb5 | 8353 | #: trailer.c:1067 |
a0b6b246 JX |
8354 | #, c-format |
8355 | msgid "could not rename temporary file to %s" | |
8356 | msgstr "不能重命名临时文件为 %s" | |
8357 | ||
7157c2b5 | 8358 | #: transport-helper.c:62 transport-helper.c:91 |
c1ac5258 JX |
8359 | msgid "full write to remote helper failed" |
8360 | msgstr "完整写入远程助手失败" | |
8361 | ||
7157c2b5 | 8362 | #: transport-helper.c:145 |
c1ac5258 JX |
8363 | #, c-format |
8364 | msgid "unable to find remote helper for '%s'" | |
8365 | msgstr "无法为 '%s' 找到远程助手" | |
8366 | ||
7157c2b5 | 8367 | #: transport-helper.c:161 transport-helper.c:575 |
c1ac5258 JX |
8368 | msgid "can't dup helper output fd" |
8369 | msgstr "无法复制助手输出文件句柄" | |
8370 | ||
7157c2b5 | 8371 | #: transport-helper.c:214 |
c1ac5258 JX |
8372 | #, c-format |
8373 | msgid "" | |
8374 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
8375 | "version of Git" | |
8376 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
8377 | ||
7157c2b5 | 8378 | #: transport-helper.c:220 |
c1ac5258 JX |
8379 | msgid "this remote helper should implement refspec capability" |
8380 | msgstr "远程助手需要实现 refspec 能力" | |
8381 | ||
7157c2b5 | 8382 | #: transport-helper.c:287 transport-helper.c:429 |
c1ac5258 JX |
8383 | #, c-format |
8384 | msgid "%s unexpectedly said: '%s'" | |
8385 | msgstr "%s 意外地说:'%s'" | |
8386 | ||
7157c2b5 | 8387 | #: transport-helper.c:417 |
c1ac5258 JX |
8388 | #, c-format |
8389 | msgid "%s also locked %s" | |
8390 | msgstr "%s 也锁定了 %s" | |
8391 | ||
7157c2b5 | 8392 | #: transport-helper.c:497 |
c1ac5258 JX |
8393 | msgid "couldn't run fast-import" |
8394 | msgstr "不能执行 fast-import" | |
8395 | ||
7157c2b5 | 8396 | #: transport-helper.c:520 |
c1ac5258 JX |
8397 | msgid "error while running fast-import" |
8398 | msgstr "执行 fast-import 出错" | |
8399 | ||
7157c2b5 | 8400 | #: transport-helper.c:549 transport-helper.c:1156 |
c1ac5258 JX |
8401 | #, c-format |
8402 | msgid "could not read ref %s" | |
8403 | msgstr "无法读取引用 %s" | |
8404 | ||
7157c2b5 | 8405 | #: transport-helper.c:594 |
c1ac5258 JX |
8406 | #, c-format |
8407 | msgid "unknown response to connect: %s" | |
8408 | msgstr "连接时未知的响应:%s" | |
8409 | ||
7157c2b5 | 8410 | #: transport-helper.c:616 |
c1ac5258 JX |
8411 | msgid "setting remote service path not supported by protocol" |
8412 | msgstr "协议不支持设置远程服务路径" | |
8413 | ||
7157c2b5 | 8414 | #: transport-helper.c:618 |
c1ac5258 JX |
8415 | msgid "invalid remote service path" |
8416 | msgstr "无效的远程服务路径" | |
8417 | ||
7157c2b5 | 8418 | #: transport-helper.c:661 transport.c:1347 |
349ede6a JX |
8419 | msgid "operation not supported by protocol" |
8420 | msgstr "协议不支持该操作" | |
8421 | ||
7157c2b5 | 8422 | #: transport-helper.c:664 |
c1ac5258 JX |
8423 | #, c-format |
8424 | msgid "can't connect to subservice %s" | |
8425 | msgstr "不能连接到子服务 %s" | |
8426 | ||
7157c2b5 | 8427 | #: transport-helper.c:740 |
c1ac5258 JX |
8428 | #, c-format |
8429 | msgid "expected ok/error, helper said '%s'" | |
8430 | msgstr "预期 ok/error,助手说 '%s'" | |
8431 | ||
7157c2b5 | 8432 | #: transport-helper.c:793 |
c1ac5258 JX |
8433 | #, c-format |
8434 | msgid "helper reported unexpected status of %s" | |
8435 | msgstr "助手报告 %s 的意外状态" | |
8436 | ||
7157c2b5 | 8437 | #: transport-helper.c:854 |
a0b6b246 | 8438 | #, c-format |
c1ac5258 JX |
8439 | msgid "helper %s does not support dry-run" |
8440 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 8441 | |
7157c2b5 | 8442 | #: transport-helper.c:857 |
c1ac5258 JX |
8443 | #, c-format |
8444 | msgid "helper %s does not support --signed" | |
8445 | msgstr "助手 %s 不支持 --signed" | |
8446 | ||
7157c2b5 | 8447 | #: transport-helper.c:860 |
c1ac5258 JX |
8448 | #, c-format |
8449 | msgid "helper %s does not support --signed=if-asked" | |
8450 | msgstr "助手 %s 不支持 --signed=if-asked" | |
8451 | ||
7157c2b5 | 8452 | #: transport-helper.c:865 |
a5cd71ca JX |
8453 | #, c-format |
8454 | msgid "helper %s does not support --atomic" | |
8455 | msgstr "助手 %s 不支持 --atomic" | |
8456 | ||
7157c2b5 | 8457 | #: transport-helper.c:871 |
c1ac5258 JX |
8458 | #, c-format |
8459 | msgid "helper %s does not support 'push-option'" | |
8460 | msgstr "助手 %s 不支持 'push-option'" | |
8461 | ||
7157c2b5 | 8462 | #: transport-helper.c:970 |
c1ac5258 JX |
8463 | msgid "remote-helper doesn't support push; refspec needed" |
8464 | msgstr "remote-heper 不支持 push,需要引用表达式" | |
8465 | ||
7157c2b5 | 8466 | #: transport-helper.c:975 |
c1ac5258 JX |
8467 | #, c-format |
8468 | msgid "helper %s does not support 'force'" | |
8469 | msgstr "助手 %s 不支持 'force'" | |
8470 | ||
7157c2b5 | 8471 | #: transport-helper.c:1022 |
c1ac5258 JX |
8472 | msgid "couldn't run fast-export" |
8473 | msgstr "无法执行 fast-export" | |
8474 | ||
7157c2b5 | 8475 | #: transport-helper.c:1027 |
c1ac5258 JX |
8476 | msgid "error while running fast-export" |
8477 | msgstr "执行 fast-export 时出错" | |
8478 | ||
7157c2b5 | 8479 | #: transport-helper.c:1052 |
c1ac5258 JX |
8480 | #, c-format |
8481 | msgid "" | |
8482 | "No refs in common and none specified; doing nothing.\n" | |
7157c2b5 | 8483 | "Perhaps you should specify a branch.\n" |
c1ac5258 JX |
8484 | msgstr "" |
8485 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
7157c2b5 JX |
8486 | "也许您应该指定一个分支。\n" |
8487 | ||
8488 | #: transport-helper.c:1133 | |
8489 | #, c-format | |
8490 | msgid "unsupported object format '%s'" | |
8491 | msgstr "不支持的对象格式 '%s'" | |
c1ac5258 | 8492 | |
7157c2b5 | 8493 | #: transport-helper.c:1142 |
c1ac5258 JX |
8494 | #, c-format |
8495 | msgid "malformed response in ref list: %s" | |
8496 | msgstr "引用列表中格式错误的响应:%s" | |
8497 | ||
7157c2b5 | 8498 | #: transport-helper.c:1294 |
c1ac5258 JX |
8499 | #, c-format |
8500 | msgid "read(%s) failed" | |
8501 | msgstr "读取(%s)失败" | |
8502 | ||
7157c2b5 | 8503 | #: transport-helper.c:1321 |
c1ac5258 JX |
8504 | #, c-format |
8505 | msgid "write(%s) failed" | |
8506 | msgstr "写(%s)失败" | |
8507 | ||
7157c2b5 | 8508 | #: transport-helper.c:1370 |
c1ac5258 JX |
8509 | #, c-format |
8510 | msgid "%s thread failed" | |
8511 | msgstr "%s 线程失败" | |
8512 | ||
7157c2b5 | 8513 | #: transport-helper.c:1374 |
c1ac5258 JX |
8514 | #, c-format |
8515 | msgid "%s thread failed to join: %s" | |
e640d114 | 8516 | msgstr "%s 线程等待失败:%s" |
c1ac5258 | 8517 | |
7157c2b5 | 8518 | #: transport-helper.c:1393 transport-helper.c:1397 |
c1ac5258 JX |
8519 | #, c-format |
8520 | msgid "can't start thread for copying data: %s" | |
8521 | msgstr "不能启动线程来拷贝数据:%s" | |
8522 | ||
7157c2b5 | 8523 | #: transport-helper.c:1434 |
c1ac5258 JX |
8524 | #, c-format |
8525 | msgid "%s process failed to wait" | |
8526 | msgstr "%s 进程等待失败" | |
8527 | ||
7157c2b5 | 8528 | #: transport-helper.c:1438 |
c1ac5258 JX |
8529 | #, c-format |
8530 | msgid "%s process failed" | |
8531 | msgstr "%s 进程失败" | |
8532 | ||
7157c2b5 | 8533 | #: transport-helper.c:1456 transport-helper.c:1465 |
c1ac5258 JX |
8534 | msgid "can't start thread for copying data" |
8535 | msgstr "不能启动线程来拷贝数据" | |
8536 | ||
349ede6a JX |
8537 | #: transport.c:116 |
8538 | #, c-format | |
8539 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
8540 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
8541 | ||
8542 | #: transport.c:145 | |
8543 | #, c-format | |
8544 | msgid "could not read bundle '%s'" | |
8545 | msgstr "无法读取 bundle '%s'" | |
8546 | ||
7157c2b5 | 8547 | #: transport.c:220 |
349ede6a JX |
8548 | #, c-format |
8549 | msgid "transport: invalid depth option '%s'" | |
8550 | msgstr "传输:无效的深度选项 '%s'" | |
8551 | ||
7157c2b5 | 8552 | #: transport.c:272 |
349ede6a JX |
8553 | msgid "see protocol.version in 'git help config' for more details" |
8554 | msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" | |
8555 | ||
7157c2b5 | 8556 | #: transport.c:273 |
349ede6a JX |
8557 | msgid "server options require protocol version 2 or later" |
8558 | msgstr "服务端选项需要版本 2 协议或更高" | |
8559 | ||
7157c2b5 | 8560 | #: transport.c:631 |
349ede6a JX |
8561 | msgid "could not parse transport.color.* config" |
8562 | msgstr "不能解析 transport.color.* 配置" | |
8563 | ||
7157c2b5 | 8564 | #: transport.c:704 |
349ede6a JX |
8565 | msgid "support for protocol v2 not implemented yet" |
8566 | msgstr "协议 v2 的支持尚未实现" | |
8567 | ||
7157c2b5 | 8568 | #: transport.c:838 |
349ede6a JX |
8569 | #, c-format |
8570 | msgid "unknown value for config '%s': %s" | |
8571 | msgstr "配置 '%s' 的取值未知:%s" | |
8572 | ||
7157c2b5 | 8573 | #: transport.c:904 |
349ede6a JX |
8574 | #, c-format |
8575 | msgid "transport '%s' not allowed" | |
8576 | msgstr "传输 '%s' 不允许" | |
8577 | ||
8578 | #: transport.c:957 | |
8579 | msgid "git-over-rsync is no longer supported" | |
8580 | msgstr "不再支持 git-over-rsync" | |
8581 | ||
7157c2b5 | 8582 | #: transport.c:1059 |
349ede6a JX |
8583 | #, c-format |
8584 | msgid "" | |
8585 | "The following submodule paths contain changes that can\n" | |
8586 | "not be found on any remote:\n" | |
8587 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
8588 | ||
7157c2b5 | 8589 | #: transport.c:1063 |
349ede6a JX |
8590 | #, c-format |
8591 | msgid "" | |
8592 | "\n" | |
8593 | "Please try\n" | |
8594 | "\n" | |
8595 | "\tgit push --recurse-submodules=on-demand\n" | |
8596 | "\n" | |
8597 | "or cd to the path and use\n" | |
8598 | "\n" | |
8599 | "\tgit push\n" | |
8600 | "\n" | |
8601 | "to push them to a remote.\n" | |
8602 | "\n" | |
8603 | msgstr "" | |
8604 | "\n" | |
8605 | "请尝试\n" | |
8606 | "\n" | |
8607 | "\tgit push --recurse-submodules=on-demand\n" | |
8608 | "\n" | |
8609 | "或者进入到子目录执行\n" | |
8610 | "\n" | |
8611 | "\tgit push\n" | |
8612 | "\n" | |
8613 | "以推送至远程。\n" | |
8614 | "\n" | |
8615 | ||
7157c2b5 | 8616 | #: transport.c:1071 |
349ede6a JX |
8617 | msgid "Aborting." |
8618 | msgstr "正在终止。" | |
8619 | ||
7157c2b5 | 8620 | #: transport.c:1216 |
349ede6a JX |
8621 | msgid "failed to push all needed submodules" |
8622 | msgstr "不能推送全部需要的子模组" | |
8623 | ||
2b472aae | 8624 | #: tree-walk.c:32 |
a0b6b246 JX |
8625 | msgid "too-short tree object" |
8626 | msgstr "太短的树对象" | |
8627 | ||
2b472aae | 8628 | #: tree-walk.c:38 |
a0b6b246 | 8629 | msgid "malformed mode in tree entry" |
29004bbb | 8630 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 8631 | |
2b472aae | 8632 | #: tree-walk.c:42 |
a0b6b246 JX |
8633 | msgid "empty filename in tree entry" |
8634 | msgstr "树对象条目中空的文件名" | |
8635 | ||
2b472aae | 8636 | #: tree-walk.c:117 |
a0b6b246 JX |
8637 | msgid "too-short tree file" |
8638 | msgstr "太短的树文件" | |
8639 | ||
349ede6a | 8640 | #: unpack-trees.c:113 |
a0b6b246 JX |
8641 | #, c-format |
8642 | msgid "" | |
8643 | "Your local changes to the following files would be overwritten by checkout:\n" | |
8644 | "%%sPlease commit your changes or stash them before you switch branches." | |
8645 | msgstr "" | |
8646 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 8647 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 8648 | |
349ede6a | 8649 | #: unpack-trees.c:115 |
a0b6b246 JX |
8650 | #, c-format |
8651 | msgid "" | |
8652 | "Your local changes to the following files would be overwritten by checkout:\n" | |
8653 | "%%s" | |
8654 | msgstr "" | |
8655 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
8656 | "%%s" | |
8657 | ||
349ede6a | 8658 | #: unpack-trees.c:118 |
a0b6b246 JX |
8659 | #, c-format |
8660 | msgid "" | |
8661 | "Your local changes to the following files would be overwritten by merge:\n" | |
8662 | "%%sPlease commit your changes or stash them before you merge." | |
8663 | msgstr "" | |
8664 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 8665 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 8666 | |
349ede6a | 8667 | #: unpack-trees.c:120 |
a0b6b246 JX |
8668 | #, c-format |
8669 | msgid "" | |
8670 | "Your local changes to the following files would be overwritten by merge:\n" | |
8671 | "%%s" | |
8672 | msgstr "" | |
8673 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
8674 | "%%s" | |
8675 | ||
349ede6a | 8676 | #: unpack-trees.c:123 |
a0b6b246 JX |
8677 | #, c-format |
8678 | msgid "" | |
8679 | "Your local changes to the following files would be overwritten by %s:\n" | |
8680 | "%%sPlease commit your changes or stash them before you %s." | |
8681 | msgstr "" | |
8682 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 8683 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 8684 | |
349ede6a | 8685 | #: unpack-trees.c:125 |
a0b6b246 JX |
8686 | #, c-format |
8687 | msgid "" | |
8688 | "Your local changes to the following files would be overwritten by %s:\n" | |
8689 | "%%s" | |
8690 | msgstr "" | |
8691 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
8692 | "%%s" | |
c04f5ac3 | 8693 | |
349ede6a | 8694 | #: unpack-trees.c:130 |
a0b6b246 JX |
8695 | #, c-format |
8696 | msgid "" | |
1a79b2f1 | 8697 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
8698 | "%s" |
8699 | msgstr "" | |
8700 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
8701 | "%s" | |
1b7f4a34 | 8702 | |
349ede6a | 8703 | #: unpack-trees.c:134 |
a0b6b246 JX |
8704 | #, c-format |
8705 | msgid "" | |
8706 | "The following untracked working tree files would be removed by checkout:\n" | |
8707 | "%%sPlease move or remove them before you switch branches." | |
8708 | msgstr "" | |
8709 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
8710 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 8711 | |
349ede6a | 8712 | #: unpack-trees.c:136 |
a0b6b246 JX |
8713 | #, c-format |
8714 | msgid "" | |
8715 | "The following untracked working tree files would be removed by checkout:\n" | |
8716 | "%%s" | |
8717 | msgstr "" | |
8718 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
8719 | "%%s" | |
1003b3a5 | 8720 | |
349ede6a | 8721 | #: unpack-trees.c:139 |
a0b6b246 JX |
8722 | #, c-format |
8723 | msgid "" | |
8724 | "The following untracked working tree files would be removed by merge:\n" | |
8725 | "%%sPlease move or remove them before you merge." | |
8726 | msgstr "" | |
8727 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
8728 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 8729 | |
349ede6a | 8730 | #: unpack-trees.c:141 |
a0b6b246 JX |
8731 | #, c-format |
8732 | msgid "" | |
8733 | "The following untracked working tree files would be removed by merge:\n" | |
8734 | "%%s" | |
8735 | msgstr "" | |
8736 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
8737 | "%%s" | |
c04f5ac3 | 8738 | |
349ede6a | 8739 | #: unpack-trees.c:144 |
a0b6b246 JX |
8740 | #, c-format |
8741 | msgid "" | |
8742 | "The following untracked working tree files would be removed by %s:\n" | |
8743 | "%%sPlease move or remove them before you %s." | |
8744 | msgstr "" | |
8745 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
8746 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 8747 | |
349ede6a | 8748 | #: unpack-trees.c:146 |
a0b6b246 JX |
8749 | #, c-format |
8750 | msgid "" | |
8751 | "The following untracked working tree files would be removed by %s:\n" | |
8752 | "%%s" | |
8753 | msgstr "" | |
8754 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
8755 | "%%s" | |
c04f5ac3 | 8756 | |
349ede6a | 8757 | #: unpack-trees.c:152 |
a0b6b246 JX |
8758 | #, c-format |
8759 | msgid "" | |
8760 | "The following untracked working tree files would be overwritten by " | |
8761 | "checkout:\n" | |
8762 | "%%sPlease move or remove them before you switch branches." | |
8763 | msgstr "" | |
8764 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
8765 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 8766 | |
349ede6a | 8767 | #: unpack-trees.c:154 |
1003b3a5 | 8768 | #, c-format |
4dcdc3d8 | 8769 | msgid "" |
a0b6b246 JX |
8770 | "The following untracked working tree files would be overwritten by " |
8771 | "checkout:\n" | |
8772 | "%%s" | |
4dcdc3d8 | 8773 | msgstr "" |
a0b6b246 JX |
8774 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
8775 | "%%s" | |
1003b3a5 | 8776 | |
349ede6a | 8777 | #: unpack-trees.c:157 |
c04f5ac3 | 8778 | #, c-format |
a0b6b246 JX |
8779 | msgid "" |
8780 | "The following untracked working tree files would be overwritten by merge:\n" | |
8781 | "%%sPlease move or remove them before you merge." | |
8782 | msgstr "" | |
8783 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
8784 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 8785 | |
349ede6a | 8786 | #: unpack-trees.c:159 |
a0b6b246 JX |
8787 | #, c-format |
8788 | msgid "" | |
8789 | "The following untracked working tree files would be overwritten by merge:\n" | |
8790 | "%%s" | |
8791 | msgstr "" | |
8792 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
8793 | "%%s" | |
c04f5ac3 | 8794 | |
349ede6a | 8795 | #: unpack-trees.c:162 |
a0b6b246 JX |
8796 | #, c-format |
8797 | msgid "" | |
8798 | "The following untracked working tree files would be overwritten by %s:\n" | |
8799 | "%%sPlease move or remove them before you %s." | |
8800 | msgstr "" | |
8801 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
8802 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 8803 | |
349ede6a | 8804 | #: unpack-trees.c:164 |
07432cef | 8805 | #, c-format |
a0b6b246 JX |
8806 | msgid "" |
8807 | "The following untracked working tree files would be overwritten by %s:\n" | |
8808 | "%%s" | |
8809 | msgstr "" | |
8810 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
8811 | "%%s" | |
c04f5ac3 | 8812 | |
349ede6a | 8813 | #: unpack-trees.c:172 |
07432cef | 8814 | #, c-format |
a0b6b246 JX |
8815 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
8816 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 8817 | |
349ede6a | 8818 | #: unpack-trees.c:175 |
07432cef | 8819 | #, c-format |
ef317cd5 | 8820 | msgid "" |
349ede6a | 8821 | "Cannot update submodule:\n" |
a0b6b246 JX |
8822 | "%s" |
8823 | msgstr "" | |
349ede6a | 8824 | "无法更新子模组:\n" |
a0b6b246 | 8825 | "%s" |
c04f5ac3 | 8826 | |
349ede6a | 8827 | #: unpack-trees.c:178 |
07432cef | 8828 | #, c-format |
a0b6b246 | 8829 | msgid "" |
349ede6a JX |
8830 | "The following paths are not up to date and were left despite sparse " |
8831 | "patterns:\n" | |
a0b6b246 JX |
8832 | "%s" |
8833 | msgstr "" | |
349ede6a | 8834 | "尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n" |
a0b6b246 | 8835 | "%s" |
c04f5ac3 | 8836 | |
349ede6a | 8837 | #: unpack-trees.c:180 |
07432cef | 8838 | #, c-format |
a0b6b246 | 8839 | msgid "" |
349ede6a | 8840 | "The following paths are unmerged and were left despite sparse patterns:\n" |
a0b6b246 JX |
8841 | "%s" |
8842 | msgstr "" | |
349ede6a | 8843 | "尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n" |
a0b6b246 | 8844 | "%s" |
c04f5ac3 | 8845 | |
349ede6a | 8846 | #: unpack-trees.c:182 |
87cb7997 JX |
8847 | #, c-format |
8848 | msgid "" | |
349ede6a JX |
8849 | "The following paths were already present and thus not updated despite sparse " |
8850 | "patterns:\n" | |
87cb7997 JX |
8851 | "%s" |
8852 | msgstr "" | |
349ede6a | 8853 | "尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n" |
87cb7997 JX |
8854 | "%s" |
8855 | ||
349ede6a | 8856 | #: unpack-trees.c:262 |
07432cef | 8857 | #, c-format |
a0b6b246 | 8858 | msgid "Aborting\n" |
a6cd2cc4 | 8859 | msgstr "正在终止\n" |
ef317cd5 | 8860 | |
349ede6a JX |
8861 | #: unpack-trees.c:289 |
8862 | #, c-format | |
8863 | msgid "" | |
8864 | "After fixing the above paths, you may want to run `git sparse-checkout " | |
8865 | "reapply`.\n" | |
8866 | msgstr "在修复上述路径之后,你可能要执行 `git sparse-checkout reapply`。\n" | |
8867 | ||
8868 | #: unpack-trees.c:350 | |
a6cd2cc4 JX |
8869 | msgid "Updating files" |
8870 | msgstr "正在更新文件" | |
c04f5ac3 | 8871 | |
349ede6a | 8872 | #: unpack-trees.c:382 |
4c27fcb5 JX |
8873 | msgid "" |
8874 | "the following paths have collided (e.g. case-sensitive paths\n" | |
8875 | "on a case-insensitive filesystem) and only one from the same\n" | |
8876 | "colliding group is in the working tree:\n" | |
8877 | msgstr "" | |
8878 | "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n" | |
8879 | "并且碰撞组中只有一个文件存在工作区中:\n" | |
8880 | ||
349ede6a | 8881 | #: unpack-trees.c:1498 |
ddc12c42 JX |
8882 | msgid "Updating index flags" |
8883 | msgstr "正在更新索引标志" | |
8884 | ||
7157c2b5 | 8885 | #: upload-pack.c:1415 |
349ede6a JX |
8886 | msgid "expected flush after fetch arguments" |
8887 | msgstr "在 fetch 参数之后应该有一个 flush 包" | |
8888 | ||
87cb7997 | 8889 | #: urlmatch.c:163 |
a0b6b246 JX |
8890 | msgid "invalid URL scheme name or missing '://' suffix" |
8891 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
8892 | ||
87cb7997 | 8893 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 8894 | #, c-format |
a0b6b246 JX |
8895 | msgid "invalid %XX escape sequence" |
8896 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 8897 | |
87cb7997 | 8898 | #: urlmatch.c:215 |
a0b6b246 JX |
8899 | msgid "missing host and scheme is not 'file:'" |
8900 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 8901 | |
87cb7997 | 8902 | #: urlmatch.c:232 |
a0b6b246 JX |
8903 | msgid "a 'file:' URL may not have a port number" |
8904 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 8905 | |
87cb7997 | 8906 | #: urlmatch.c:247 |
a0b6b246 JX |
8907 | msgid "invalid characters in host name" |
8908 | msgstr "主机名中包含无效的字符" | |
90314792 | 8909 | |
87cb7997 | 8910 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
8911 | msgid "invalid port number" |
8912 | msgstr "无效的端口号" | |
c04f5ac3 | 8913 | |
87cb7997 | 8914 | #: urlmatch.c:371 |
a0b6b246 JX |
8915 | msgid "invalid '..' path segment" |
8916 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 8917 | |
2b472aae JX |
8918 | #: walker.c:170 |
8919 | msgid "Fetching objects" | |
8920 | msgstr "正在获取对象" | |
8921 | ||
7157c2b5 | 8922 | #: worktree.c:248 builtin/am.c:2098 |
a77c07d9 | 8923 | #, c-format |
a0b6b246 | 8924 | msgid "failed to read '%s'" |
c1ac5258 | 8925 | msgstr "读取 '%s' 失败" |
ef317cd5 | 8926 | |
7157c2b5 | 8927 | #: worktree.c:295 |
31e5e17b JX |
8928 | #, c-format |
8929 | msgid "'%s' at main working tree is not the repository directory" | |
8930 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
8931 | ||
7157c2b5 | 8932 | #: worktree.c:306 |
31e5e17b JX |
8933 | #, c-format |
8934 | msgid "'%s' file does not contain absolute path to the working tree location" | |
8935 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
8936 | ||
7157c2b5 | 8937 | #: worktree.c:318 |
31e5e17b JX |
8938 | #, c-format |
8939 | msgid "'%s' does not exist" | |
8940 | msgstr "'%s' 不存在" | |
8941 | ||
7157c2b5 | 8942 | #: worktree.c:324 |
31e5e17b JX |
8943 | #, c-format |
8944 | msgid "'%s' is not a .git file, error code %d" | |
8945 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
8946 | ||
7157c2b5 | 8947 | #: worktree.c:333 |
31e5e17b JX |
8948 | #, c-format |
8949 | msgid "'%s' does not point back to '%s'" | |
8950 | msgstr "'%s' 没有指回到 '%s'" | |
8951 | ||
7157c2b5 | 8952 | #: wrapper.c:194 wrapper.c:364 |
c04f5ac3 | 8953 | #, c-format |
a0b6b246 JX |
8954 | msgid "could not open '%s' for reading and writing" |
8955 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 8956 | |
7157c2b5 | 8957 | #: wrapper.c:395 wrapper.c:596 |
a0b6b246 JX |
8958 | #, c-format |
8959 | msgid "unable to access '%s'" | |
8960 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 8961 | |
7157c2b5 | 8962 | #: wrapper.c:604 |
a0b6b246 JX |
8963 | msgid "unable to get current working directory" |
8964 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 8965 | |
a6cd2cc4 | 8966 | #: wt-status.c:158 |
a0b6b246 JX |
8967 | msgid "Unmerged paths:" |
8968 | msgstr "未合并的路径:" | |
7aea43ff | 8969 | |
a0b6b246 | 8970 | # 译者:注意保持前导空格 |
a6cd2cc4 JX |
8971 | #: wt-status.c:187 wt-status.c:219 |
8972 | msgid " (use \"git restore --staged <file>...\" to unstage)" | |
8973 | msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)" | |
8974 | ||
8975 | # 译者:注意保持前导空格 | |
8976 | #: wt-status.c:190 wt-status.c:222 | |
c04f5ac3 | 8977 | #, c-format |
a6cd2cc4 JX |
8978 | msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" |
8979 | msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)" | |
c04f5ac3 | 8980 | |
a0b6b246 | 8981 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8982 | #: wt-status.c:193 wt-status.c:225 |
a0b6b246 JX |
8983 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
8984 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 8985 | |
a0b6b246 | 8986 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8987 | #: wt-status.c:197 |
a0b6b246 JX |
8988 | msgid " (use \"git add <file>...\" to mark resolution)" |
8989 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 8990 | |
a0b6b246 | 8991 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8992 | #: wt-status.c:199 wt-status.c:203 |
a0b6b246 JX |
8993 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
8994 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 8995 | |
a0b6b246 | 8996 | # 译者:注意保持前导空格 |
a6cd2cc4 | 8997 | #: wt-status.c:201 |
a0b6b246 JX |
8998 | msgid " (use \"git rm <file>...\" to mark resolution)" |
8999 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 9000 | |
349ede6a | 9001 | #: wt-status.c:211 wt-status.c:1072 |
a0b6b246 JX |
9002 | msgid "Changes to be committed:" |
9003 | msgstr "要提交的变更:" | |
ef317cd5 | 9004 | |
349ede6a | 9005 | #: wt-status.c:234 wt-status.c:1081 |
a0b6b246 JX |
9006 | msgid "Changes not staged for commit:" |
9007 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 9008 | |
a0b6b246 | 9009 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9010 | #: wt-status.c:238 |
a0b6b246 JX |
9011 | msgid " (use \"git add <file>...\" to update what will be committed)" |
9012 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 9013 | |
a0b6b246 | 9014 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9015 | #: wt-status.c:240 |
a0b6b246 JX |
9016 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
9017 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 9018 | |
a0b6b246 | 9019 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9020 | #: wt-status.c:241 |
a0b6b246 | 9021 | msgid "" |
a6cd2cc4 JX |
9022 | " (use \"git restore <file>...\" to discard changes in working directory)" |
9023 | msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 9024 | |
a0b6b246 | 9025 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9026 | #: wt-status.c:243 |
a0b6b246 JX |
9027 | msgid " (commit or discard the untracked or modified content in submodules)" |
9028 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 9029 | |
a0b6b246 | 9030 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9031 | #: wt-status.c:254 |
a0b6b246 JX |
9032 | #, c-format |
9033 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
9034 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 9035 | |
a6cd2cc4 | 9036 | #: wt-status.c:268 |
a0b6b246 JX |
9037 | msgid "both deleted:" |
9038 | msgstr "双方删除:" | |
ef317cd5 | 9039 | |
a6cd2cc4 | 9040 | #: wt-status.c:270 |
a0b6b246 JX |
9041 | msgid "added by us:" |
9042 | msgstr "由我们添加:" | |
4dcdc3d8 | 9043 | |
a6cd2cc4 | 9044 | #: wt-status.c:272 |
a0b6b246 JX |
9045 | msgid "deleted by them:" |
9046 | msgstr "由他们删除:" | |
ef317cd5 | 9047 | |
a6cd2cc4 | 9048 | #: wt-status.c:274 |
a0b6b246 JX |
9049 | msgid "added by them:" |
9050 | msgstr "由他们添加:" | |
ef317cd5 | 9051 | |
a6cd2cc4 | 9052 | #: wt-status.c:276 |
a0b6b246 JX |
9053 | msgid "deleted by us:" |
9054 | msgstr "由我们删除:" | |
ef317cd5 | 9055 | |
a6cd2cc4 | 9056 | #: wt-status.c:278 |
a0b6b246 JX |
9057 | msgid "both added:" |
9058 | msgstr "双方添加:" | |
5c57d762 | 9059 | |
a6cd2cc4 | 9060 | #: wt-status.c:280 |
a0b6b246 JX |
9061 | msgid "both modified:" |
9062 | msgstr "双方修改:" | |
5c57d762 | 9063 | |
a6cd2cc4 | 9064 | #: wt-status.c:290 |
a0b6b246 JX |
9065 | msgid "new file:" |
9066 | msgstr "新文件:" | |
8ada9598 | 9067 | |
a6cd2cc4 | 9068 | #: wt-status.c:292 |
a0b6b246 JX |
9069 | msgid "copied:" |
9070 | msgstr "拷贝:" | |
8ada9598 | 9071 | |
a6cd2cc4 | 9072 | #: wt-status.c:294 |
a0b6b246 JX |
9073 | msgid "deleted:" |
9074 | msgstr "删除:" | |
8ada9598 | 9075 | |
a6cd2cc4 | 9076 | #: wt-status.c:296 |
a0b6b246 JX |
9077 | msgid "modified:" |
9078 | msgstr "修改:" | |
8ada9598 | 9079 | |
a6cd2cc4 | 9080 | #: wt-status.c:298 |
a0b6b246 JX |
9081 | msgid "renamed:" |
9082 | msgstr "重命名:" | |
5c57d762 | 9083 | |
a6cd2cc4 | 9084 | #: wt-status.c:300 |
a0b6b246 JX |
9085 | msgid "typechange:" |
9086 | msgstr "类型变更:" | |
8ada9598 | 9087 | |
a6cd2cc4 | 9088 | #: wt-status.c:302 |
a0b6b246 JX |
9089 | msgid "unknown:" |
9090 | msgstr "未知:" | |
8ada9598 | 9091 | |
a6cd2cc4 | 9092 | #: wt-status.c:304 |
a0b6b246 JX |
9093 | msgid "unmerged:" |
9094 | msgstr "未合并:" | |
8ada9598 | 9095 | |
a0b6b246 | 9096 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 9097 | #: wt-status.c:384 |
a0b6b246 JX |
9098 | msgid "new commits, " |
9099 | msgstr "新提交, " | |
8ada9598 | 9100 | |
a0b6b246 | 9101 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 9102 | #: wt-status.c:386 |
a0b6b246 JX |
9103 | msgid "modified content, " |
9104 | msgstr "修改的内容, " | |
1b7f4a34 | 9105 | |
a0b6b246 | 9106 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
a6cd2cc4 | 9107 | #: wt-status.c:388 |
a0b6b246 JX |
9108 | msgid "untracked content, " |
9109 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 9110 | |
349ede6a | 9111 | #: wt-status.c:904 |
a4f16749 JX |
9112 | #, c-format |
9113 | msgid "Your stash currently has %d entry" | |
9114 | msgid_plural "Your stash currently has %d entries" | |
9115 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
9116 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
9117 | ||
349ede6a | 9118 | #: wt-status.c:936 |
a0b6b246 JX |
9119 | msgid "Submodules changed but not updated:" |
9120 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 9121 | |
349ede6a | 9122 | #: wt-status.c:938 |
a0b6b246 JX |
9123 | msgid "Submodule changes to be committed:" |
9124 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 9125 | |
349ede6a | 9126 | #: wt-status.c:1020 |
a0b6b246 | 9127 | msgid "" |
6937cb4e JX |
9128 | "Do not modify or remove the line above.\n" |
9129 | "Everything below it will be ignored." | |
a0b6b246 | 9130 | msgstr "" |
6937cb4e JX |
9131 | "不要改动或删除上面的一行。\n" |
9132 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 9133 | |
349ede6a | 9134 | #: wt-status.c:1112 |
a6cd2cc4 JX |
9135 | #, c-format |
9136 | msgid "" | |
9137 | "\n" | |
9138 | "It took %.2f seconds to compute the branch ahead/behind values.\n" | |
9139 | "You can use '--no-ahead-behind' to avoid this.\n" | |
9140 | msgstr "" | |
9141 | "\n" | |
9142 | "花了 %.2f 秒才计算出分支的领先/落后范围。\n" | |
9143 | "为避免,您可以使用 '--no-ahead-behind'。\n" | |
9144 | ||
349ede6a | 9145 | #: wt-status.c:1142 |
a0b6b246 JX |
9146 | msgid "You have unmerged paths." |
9147 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 9148 | |
a0b6b246 | 9149 | # 译者:注意保持前导空格 |
349ede6a | 9150 | #: wt-status.c:1145 |
a0b6b246 JX |
9151 | msgid " (fix conflicts and run \"git commit\")" |
9152 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 9153 | |
a0b6b246 | 9154 | # 译者:注意保持前导空格 |
349ede6a | 9155 | #: wt-status.c:1147 |
a0b6b246 JX |
9156 | msgid " (use \"git merge --abort\" to abort the merge)" |
9157 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 9158 | |
349ede6a | 9159 | #: wt-status.c:1151 |
a0b6b246 JX |
9160 | msgid "All conflicts fixed but you are still merging." |
9161 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 9162 | |
a0b6b246 | 9163 | # 译者:注意保持前导空格 |
349ede6a | 9164 | #: wt-status.c:1154 |
a0b6b246 JX |
9165 | msgid " (use \"git commit\" to conclude merge)" |
9166 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 9167 | |
349ede6a | 9168 | #: wt-status.c:1163 |
a0b6b246 JX |
9169 | msgid "You are in the middle of an am session." |
9170 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 9171 | |
349ede6a | 9172 | #: wt-status.c:1166 |
a0b6b246 JX |
9173 | msgid "The current patch is empty." |
9174 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 9175 | |
a0b6b246 | 9176 | # 译者:注意保持前导空格 |
349ede6a | 9177 | #: wt-status.c:1170 |
a0b6b246 JX |
9178 | msgid " (fix conflicts and then run \"git am --continue\")" |
9179 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 9180 | |
a0b6b246 | 9181 | # 译者:注意保持前导空格 |
349ede6a | 9182 | #: wt-status.c:1172 |
a0b6b246 JX |
9183 | msgid " (use \"git am --skip\" to skip this patch)" |
9184 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 9185 | |
a0b6b246 | 9186 | # 译者:注意保持前导空格 |
349ede6a | 9187 | #: wt-status.c:1174 |
a0b6b246 JX |
9188 | msgid " (use \"git am --abort\" to restore the original branch)" |
9189 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 9190 | |
349ede6a | 9191 | #: wt-status.c:1307 |
1a79b2f1 JX |
9192 | msgid "git-rebase-todo is missing." |
9193 | msgstr "git-rebase-todo 丢失。" | |
9194 | ||
349ede6a | 9195 | #: wt-status.c:1309 |
a0b6b246 JX |
9196 | msgid "No commands done." |
9197 | msgstr "没有命令被执行。" | |
9198 | ||
349ede6a | 9199 | #: wt-status.c:1312 |
1b7f4a34 | 9200 | #, c-format |
a0b6b246 JX |
9201 | msgid "Last command done (%d command done):" |
9202 | msgid_plural "Last commands done (%d commands done):" | |
9203 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
9204 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 9205 | |
349ede6a | 9206 | #: wt-status.c:1323 |
1b7f4a34 | 9207 | #, c-format |
a0b6b246 JX |
9208 | msgid " (see more in file %s)" |
9209 | msgstr " (更多参见文件 %s)" | |
9210 | ||
349ede6a | 9211 | #: wt-status.c:1328 |
a0b6b246 JX |
9212 | msgid "No commands remaining." |
9213 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 9214 | |
349ede6a | 9215 | #: wt-status.c:1331 |
1b7f4a34 | 9216 | #, c-format |
a0b6b246 JX |
9217 | msgid "Next command to do (%d remaining command):" |
9218 | msgid_plural "Next commands to do (%d remaining commands):" | |
9219 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
9220 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 9221 | |
a0b6b246 | 9222 | # 译者:注意保持前导空格 |
349ede6a | 9223 | #: wt-status.c:1339 |
a0b6b246 JX |
9224 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
9225 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 9226 | |
349ede6a | 9227 | #: wt-status.c:1351 |
1b7f4a34 | 9228 | #, c-format |
a0b6b246 JX |
9229 | msgid "You are currently rebasing branch '%s' on '%s'." |
9230 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 9231 | |
349ede6a | 9232 | #: wt-status.c:1356 |
a0b6b246 JX |
9233 | msgid "You are currently rebasing." |
9234 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 9235 | |
a0b6b246 | 9236 | # 译者:注意保持前导空格 |
349ede6a | 9237 | #: wt-status.c:1369 |
a0b6b246 JX |
9238 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
9239 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 9240 | |
a0b6b246 | 9241 | # 译者:注意保持前导空格 |
349ede6a | 9242 | #: wt-status.c:1371 |
a0b6b246 JX |
9243 | msgid " (use \"git rebase --skip\" to skip this patch)" |
9244 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
9245 | ||
9246 | # 译者:注意保持前导空格 | |
349ede6a | 9247 | #: wt-status.c:1373 |
a0b6b246 JX |
9248 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
9249 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
9250 | ||
9251 | # 译者:注意保持前导空格 | |
349ede6a | 9252 | #: wt-status.c:1380 |
a0b6b246 JX |
9253 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
9254 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 9255 | |
349ede6a | 9256 | #: wt-status.c:1384 |
a0b6b246 | 9257 | #, c-format |
1b7f4a34 | 9258 | msgid "" |
a0b6b246 JX |
9259 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
9260 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 9261 | |
349ede6a | 9262 | #: wt-status.c:1389 |
a0b6b246 JX |
9263 | msgid "You are currently splitting a commit during a rebase." |
9264 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 9265 | |
a0b6b246 | 9266 | # 译者:注意保持前导空格 |
349ede6a | 9267 | #: wt-status.c:1392 |
a0b6b246 JX |
9268 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
9269 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 9270 | |
349ede6a | 9271 | #: wt-status.c:1396 |
a0b6b246 JX |
9272 | #, c-format |
9273 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
9274 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 9275 | |
349ede6a | 9276 | #: wt-status.c:1401 |
a0b6b246 JX |
9277 | msgid "You are currently editing a commit during a rebase." |
9278 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 9279 | |
a0b6b246 | 9280 | # 译者:注意保持前导空格 |
349ede6a | 9281 | #: wt-status.c:1404 |
a0b6b246 JX |
9282 | msgid " (use \"git commit --amend\" to amend the current commit)" |
9283 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
9284 | ||
9285 | # 译者:注意保持前导空格 | |
349ede6a | 9286 | #: wt-status.c:1406 |
a0b6b246 JX |
9287 | msgid "" |
9288 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
9289 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 9290 | |
349ede6a | 9291 | #: wt-status.c:1417 |
d46c5519 JX |
9292 | msgid "Cherry-pick currently in progress." |
9293 | msgstr "拣选操作正在进行中。" | |
9294 | ||
349ede6a | 9295 | #: wt-status.c:1420 |
1b7f4a34 | 9296 | #, c-format |
a0b6b246 JX |
9297 | msgid "You are currently cherry-picking commit %s." |
9298 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 9299 | |
a0b6b246 | 9300 | # 译者:注意保持前导空格 |
349ede6a | 9301 | #: wt-status.c:1427 |
a0b6b246 JX |
9302 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
9303 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 9304 | |
a0b6b246 | 9305 | # 译者:注意保持前导空格 |
349ede6a | 9306 | #: wt-status.c:1430 |
d46c5519 JX |
9307 | msgid " (run \"git cherry-pick --continue\" to continue)" |
9308 | msgstr " (执行 \"git cherry-pick --continue\" 以继续)" | |
9309 | ||
9310 | # 译者:注意保持前导空格 | |
349ede6a | 9311 | #: wt-status.c:1433 |
a0b6b246 JX |
9312 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
9313 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 9314 | |
a0b6b246 | 9315 | # 译者:注意保持前导空格 |
349ede6a | 9316 | #: wt-status.c:1435 |
a5cd71ca JX |
9317 | msgid " (use \"git cherry-pick --skip\" to skip this patch)" |
9318 | msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)" | |
9319 | ||
9320 | # 译者:注意保持前导空格 | |
349ede6a | 9321 | #: wt-status.c:1437 |
a0b6b246 JX |
9322 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
9323 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 9324 | |
349ede6a | 9325 | #: wt-status.c:1447 |
d46c5519 JX |
9326 | msgid "Revert currently in progress." |
9327 | msgstr "还原操作正在行中。" | |
9328 | ||
349ede6a | 9329 | #: wt-status.c:1450 |
1b7f4a34 | 9330 | #, c-format |
a0b6b246 JX |
9331 | msgid "You are currently reverting commit %s." |
9332 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 9333 | |
a0b6b246 | 9334 | # 译者:注意保持前导空格 |
349ede6a | 9335 | #: wt-status.c:1456 |
a0b6b246 | 9336 | msgid " (fix conflicts and run \"git revert --continue\")" |
5b533632 | 9337 | msgstr " (解决冲突并执行 \"git revert --continue\")" |
1b7f4a34 | 9338 | |
a0b6b246 | 9339 | # 译者:注意保持前导空格 |
349ede6a | 9340 | #: wt-status.c:1459 |
d46c5519 | 9341 | msgid " (run \"git revert --continue\" to continue)" |
5b533632 | 9342 | msgstr " (执行 \"git revert --continue\" 以继续)" |
d46c5519 JX |
9343 | |
9344 | # 译者:注意保持前导空格 | |
349ede6a | 9345 | #: wt-status.c:1462 |
a0b6b246 | 9346 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
5b533632 | 9347 | msgstr " (所有冲突已解决:执行 \"git revert --continue\")" |
1b7f4a34 | 9348 | |
a0b6b246 | 9349 | # 译者:注意保持前导空格 |
349ede6a | 9350 | #: wt-status.c:1464 |
a5cd71ca JX |
9351 | msgid " (use \"git revert --skip\" to skip this patch)" |
9352 | msgstr " (使用 \"git revert --skip\" 跳过此补丁)" | |
9353 | ||
9354 | # 译者:注意保持前导空格 | |
349ede6a | 9355 | #: wt-status.c:1466 |
a0b6b246 JX |
9356 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
9357 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 9358 | |
349ede6a | 9359 | #: wt-status.c:1476 |
1b7f4a34 | 9360 | #, c-format |
a0b6b246 JX |
9361 | msgid "You are currently bisecting, started from branch '%s'." |
9362 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 9363 | |
349ede6a | 9364 | #: wt-status.c:1480 |
a0b6b246 JX |
9365 | msgid "You are currently bisecting." |
9366 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 9367 | |
a0b6b246 | 9368 | # 译者:注意保持前导空格 |
349ede6a | 9369 | #: wt-status.c:1483 |
a0b6b246 JX |
9370 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
9371 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 9372 | |
7157c2b5 JX |
9373 | #: wt-status.c:1494 |
9374 | #, c-format | |
9375 | msgid "You are in a sparse checkout with %d%% of tracked files present." | |
9376 | msgstr "您处于稀疏签出状态,包含 %d%% 的跟踪文件" | |
9377 | ||
9378 | #: wt-status.c:1733 | |
a0b6b246 JX |
9379 | msgid "On branch " |
9380 | msgstr "位于分支 " | |
1b7f4a34 | 9381 | |
7157c2b5 | 9382 | #: wt-status.c:1740 |
a0b6b246 JX |
9383 | msgid "interactive rebase in progress; onto " |
9384 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 9385 | |
7157c2b5 | 9386 | #: wt-status.c:1742 |
a0b6b246 JX |
9387 | msgid "rebase in progress; onto " |
9388 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 9389 | |
7157c2b5 | 9390 | #: wt-status.c:1752 |
a0b6b246 JX |
9391 | msgid "Not currently on any branch." |
9392 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 9393 | |
7157c2b5 | 9394 | #: wt-status.c:1769 |
a0b6b246 JX |
9395 | msgid "Initial commit" |
9396 | msgstr "初始提交" | |
1b7f4a34 | 9397 | |
7157c2b5 | 9398 | #: wt-status.c:1770 |
a4f16749 JX |
9399 | msgid "No commits yet" |
9400 | msgstr "尚无提交" | |
9401 | ||
7157c2b5 | 9402 | #: wt-status.c:1784 |
a0b6b246 JX |
9403 | msgid "Untracked files" |
9404 | msgstr "未跟踪的文件" | |
1b7f4a34 | 9405 | |
7157c2b5 | 9406 | #: wt-status.c:1786 |
a0b6b246 JX |
9407 | msgid "Ignored files" |
9408 | msgstr "忽略的文件" | |
1b7f4a34 | 9409 | |
7157c2b5 | 9410 | #: wt-status.c:1790 |
a0b6b246 JX |
9411 | #, c-format |
9412 | msgid "" | |
9413 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
9414 | "may speed it up, but you have to be careful not to forget to add\n" | |
9415 | "new files yourself (see 'git help status')." | |
9416 | msgstr "" | |
9417 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
9418 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 9419 | |
7157c2b5 | 9420 | #: wt-status.c:1796 |
a0b6b246 JX |
9421 | #, c-format |
9422 | msgid "Untracked files not listed%s" | |
9423 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 9424 | |
a0b6b246 | 9425 | # 译者:中文字符串拼接,可删除前导空格 |
7157c2b5 | 9426 | #: wt-status.c:1798 |
a0b6b246 JX |
9427 | msgid " (use -u option to show untracked files)" |
9428 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 9429 | |
7157c2b5 | 9430 | #: wt-status.c:1804 |
a0b6b246 JX |
9431 | msgid "No changes" |
9432 | msgstr "没有修改" | |
1b7f4a34 | 9433 | |
7157c2b5 | 9434 | #: wt-status.c:1809 |
a0b6b246 JX |
9435 | #, c-format |
9436 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
9437 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 9438 | |
7157c2b5 | 9439 | #: wt-status.c:1812 |
a0b6b246 JX |
9440 | #, c-format |
9441 | msgid "no changes added to commit\n" | |
9442 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 9443 | |
7157c2b5 | 9444 | #: wt-status.c:1815 |
a0b6b246 JX |
9445 | #, c-format |
9446 | msgid "" | |
9447 | "nothing added to commit but untracked files present (use \"git add\" to " | |
9448 | "track)\n" | |
9449 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 9450 | |
7157c2b5 | 9451 | #: wt-status.c:1818 |
a0b6b246 JX |
9452 | #, c-format |
9453 | msgid "nothing added to commit but untracked files present\n" | |
9454 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 9455 | |
a0b6b246 | 9456 | # 译者:中文字符串拼接,可删除前导空格 |
7157c2b5 | 9457 | #: wt-status.c:1821 |
a0b6b246 JX |
9458 | #, c-format |
9459 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
9460 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 9461 | |
7157c2b5 | 9462 | #: wt-status.c:1824 wt-status.c:1829 |
a0b6b246 JX |
9463 | #, c-format |
9464 | msgid "nothing to commit\n" | |
9465 | msgstr "无文件要提交\n" | |
1b7f4a34 | 9466 | |
a0b6b246 | 9467 | # 译者:中文字符串拼接,可删除前导空格 |
7157c2b5 | 9468 | #: wt-status.c:1827 |
a0b6b246 JX |
9469 | #, c-format |
9470 | msgid "nothing to commit (use -u to show untracked files)\n" | |
9471 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 9472 | |
a0b6b246 | 9473 | # 译者:中文字符串拼接,可删除前导空格 |
7157c2b5 | 9474 | #: wt-status.c:1831 |
a0b6b246 JX |
9475 | #, c-format |
9476 | msgid "nothing to commit, working tree clean\n" | |
9477 | msgstr "无文件要提交,干净的工作区\n" | |
9478 | ||
7157c2b5 | 9479 | #: wt-status.c:1944 |
a4f16749 JX |
9480 | msgid "No commits yet on " |
9481 | msgstr "尚无提交在 " | |
1b7f4a34 | 9482 | |
7157c2b5 | 9483 | #: wt-status.c:1948 |
a0b6b246 JX |
9484 | msgid "HEAD (no branch)" |
9485 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 9486 | |
7157c2b5 | 9487 | #: wt-status.c:1979 |
31e5e17b JX |
9488 | msgid "different" |
9489 | msgstr "不同" | |
9490 | ||
a0b6b246 | 9491 | # 译者:注意保持句尾空格 |
7157c2b5 | 9492 | #: wt-status.c:1981 wt-status.c:1989 |
a0b6b246 JX |
9493 | msgid "behind " |
9494 | msgstr "落后 " | |
1b7f4a34 | 9495 | |
7157c2b5 | 9496 | #: wt-status.c:1984 wt-status.c:1987 |
a0b6b246 JX |
9497 | msgid "ahead " |
9498 | msgstr "领先 " | |
1b7f4a34 | 9499 | |
a0b6b246 | 9500 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
7157c2b5 | 9501 | #: wt-status.c:2509 |
a0b6b246 JX |
9502 | #, c-format |
9503 | msgid "cannot %s: You have unstaged changes." | |
9504 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 9505 | |
7157c2b5 | 9506 | #: wt-status.c:2515 |
a0b6b246 | 9507 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 9508 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 9509 | |
7157c2b5 | 9510 | #: wt-status.c:2517 |
a0b6b246 JX |
9511 | #, c-format |
9512 | msgid "cannot %s: Your index contains uncommitted changes." | |
9513 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 9514 | |
349ede6a | 9515 | #: compat/precompose_utf8.c:58 builtin/clone.c:456 |
a5cd71ca JX |
9516 | #, c-format |
9517 | msgid "failed to unlink '%s'" | |
9518 | msgstr "删除 '%s' 失败" | |
9519 | ||
ddc12c42 | 9520 | #: builtin/add.c:26 |
a0b6b246 JX |
9521 | msgid "git add [<options>] [--] <pathspec>..." |
9522 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 9523 | |
2b472aae | 9524 | #: builtin/add.c:88 |
a0b6b246 JX |
9525 | #, c-format |
9526 | msgid "unexpected diff status %c" | |
9527 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 9528 | |
349ede6a | 9529 | #: builtin/add.c:93 builtin/commit.c:285 |
a0b6b246 JX |
9530 | msgid "updating files failed" |
9531 | msgstr "更新文件失败" | |
1b7f4a34 | 9532 | |
2b472aae | 9533 | #: builtin/add.c:103 |
a0b6b246 JX |
9534 | #, c-format |
9535 | msgid "remove '%s'\n" | |
9536 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 9537 | |
2b472aae | 9538 | #: builtin/add.c:178 |
a0b6b246 JX |
9539 | msgid "Unstaged changes after refreshing the index:" |
9540 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 9541 | |
349ede6a | 9542 | #: builtin/add.c:266 builtin/rev-parse.c:904 |
a0b6b246 JX |
9543 | msgid "Could not read the index" |
9544 | msgstr "不能读取索引" | |
1b7f4a34 | 9545 | |
2b472aae | 9546 | #: builtin/add.c:277 |
a0b6b246 JX |
9547 | #, c-format |
9548 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 9549 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 9550 | |
2b472aae | 9551 | #: builtin/add.c:281 |
a0b6b246 JX |
9552 | msgid "Could not write patch" |
9553 | msgstr "不能生成补丁" | |
1b7f4a34 | 9554 | |
2b472aae | 9555 | #: builtin/add.c:284 |
a0b6b246 JX |
9556 | msgid "editing patch failed" |
9557 | msgstr "编辑补丁失败" | |
1b7f4a34 | 9558 | |
2b472aae | 9559 | #: builtin/add.c:287 |
1b7f4a34 | 9560 | #, c-format |
a0b6b246 | 9561 | msgid "Could not stat '%s'" |
65e2041e | 9562 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 9563 | |
2b472aae | 9564 | #: builtin/add.c:289 |
a0b6b246 JX |
9565 | msgid "Empty patch. Aborted." |
9566 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 9567 | |
2b472aae | 9568 | #: builtin/add.c:294 |
a0b6b246 JX |
9569 | #, c-format |
9570 | msgid "Could not apply '%s'" | |
9571 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 9572 | |
2b472aae | 9573 | #: builtin/add.c:302 |
a0b6b246 JX |
9574 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
9575 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 9576 | |
349ede6a JX |
9577 | #: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 |
9578 | #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 | |
2b472aae | 9579 | #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 |
a0b6b246 JX |
9580 | msgid "dry run" |
9581 | msgstr "演习" | |
8ada9598 | 9582 | |
2b472aae | 9583 | #: builtin/add.c:325 |
a0b6b246 JX |
9584 | msgid "interactive picking" |
9585 | msgstr "交互式拣选" | |
8ada9598 | 9586 | |
7157c2b5 | 9587 | #: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 |
a0b6b246 JX |
9588 | msgid "select hunks interactively" |
9589 | msgstr "交互式挑选数据块" | |
8ada9598 | 9590 | |
2b472aae | 9591 | #: builtin/add.c:327 |
a0b6b246 JX |
9592 | msgid "edit current diff and apply" |
9593 | msgstr "编辑当前差异并应用" | |
8ada9598 | 9594 | |
2b472aae | 9595 | #: builtin/add.c:328 |
a0b6b246 JX |
9596 | msgid "allow adding otherwise ignored files" |
9597 | msgstr "允许添加忽略的文件" | |
8ada9598 | 9598 | |
2b472aae | 9599 | #: builtin/add.c:329 |
a0b6b246 JX |
9600 | msgid "update tracked files" |
9601 | msgstr "更新已跟踪的文件" | |
8ada9598 | 9602 | |
2b472aae | 9603 | #: builtin/add.c:330 |
5809aa05 JX |
9604 | msgid "renormalize EOL of tracked files (implies -u)" |
9605 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
9606 | ||
2b472aae | 9607 | #: builtin/add.c:331 |
a0b6b246 JX |
9608 | msgid "record only the fact that the path will be added later" |
9609 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 9610 | |
2b472aae | 9611 | #: builtin/add.c:332 |
a0b6b246 JX |
9612 | msgid "add changes from all tracked and untracked files" |
9613 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 9614 | |
2b472aae | 9615 | #: builtin/add.c:335 |
a0b6b246 JX |
9616 | msgid "ignore paths removed in the working tree (same as --no-all)" |
9617 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 9618 | |
2b472aae | 9619 | #: builtin/add.c:337 |
a0b6b246 JX |
9620 | msgid "don't add, only refresh the index" |
9621 | msgstr "不添加,只刷新索引" | |
8ada9598 | 9622 | |
2b472aae | 9623 | #: builtin/add.c:338 |
a0b6b246 JX |
9624 | msgid "just skip files which cannot be added because of errors" |
9625 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 9626 | |
2b472aae | 9627 | #: builtin/add.c:339 |
a0b6b246 JX |
9628 | msgid "check if - even missing - files are ignored in dry run" |
9629 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 9630 | |
2b472aae | 9631 | #: builtin/add.c:341 builtin/update-index.c:1004 |
a0b6b246 JX |
9632 | msgid "override the executable bit of the listed files" |
9633 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 9634 | |
2b472aae | 9635 | #: builtin/add.c:343 |
a4f16749 JX |
9636 | msgid "warn when adding an embedded repository" |
9637 | msgstr "创建一个嵌入式仓库时给予警告" | |
9638 | ||
2b472aae JX |
9639 | #: builtin/add.c:345 |
9640 | msgid "backend for `git stash -p`" | |
9641 | msgstr "`git stash -p` 的后端" | |
9642 | ||
9643 | #: builtin/add.c:363 | |
a4f16749 JX |
9644 | #, c-format |
9645 | msgid "" | |
9646 | "You've added another git repository inside your current repository.\n" | |
9647 | "Clones of the outer repository will not contain the contents of\n" | |
9648 | "the embedded repository and will not know how to obtain it.\n" | |
9649 | "If you meant to add a submodule, use:\n" | |
9650 | "\n" | |
9651 | "\tgit submodule add <url> %s\n" | |
9652 | "\n" | |
9653 | "If you added this path by mistake, you can remove it from the\n" | |
9654 | "index with:\n" | |
9655 | "\n" | |
9656 | "\tgit rm --cached %s\n" | |
9657 | "\n" | |
9658 | "See \"git help submodule\" for more information." | |
9659 | msgstr "" | |
ddc12c42 JX |
9660 | "您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" |
9661 | "内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n" | |
a4f16749 JX |
9662 | "\n" |
9663 | "\tgit submodule add <url> %s\n" | |
9664 | "\n" | |
9665 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
9666 | "\n" | |
9667 | "\tgit rm --cached %s\n" | |
9668 | "\n" | |
9669 | "参见 \"git help submodule\" 获取更多信息。" | |
9670 | ||
2b472aae | 9671 | #: builtin/add.c:391 |
a4f16749 JX |
9672 | #, c-format |
9673 | msgid "adding embedded git repository: %s" | |
9674 | msgstr "正在添加嵌入式 git 仓库:%s" | |
9675 | ||
2b472aae JX |
9676 | #: builtin/add.c:410 |
9677 | msgid "" | |
9678 | "Use -f if you really want to add them.\n" | |
9679 | "Turn this message off by running\n" | |
9680 | "\"git config advice.addIgnoredFile false\"" | |
9681 | msgstr "" | |
440e7442 | 9682 | "如果您确实要添加它们,使用 -f 参数。\n" |
2b472aae JX |
9683 | "运行下面的命令来关闭本消息\n" |
9684 | "\"git config advice.addIgnoredFile false\"" | |
8ada9598 | 9685 | |
2b472aae | 9686 | #: builtin/add.c:419 |
a0b6b246 JX |
9687 | msgid "adding files failed" |
9688 | msgstr "添加文件失败" | |
8ada9598 | 9689 | |
349ede6a | 9690 | #: builtin/add.c:447 builtin/commit.c:345 |
ddc12c42 JX |
9691 | msgid "--pathspec-from-file is incompatible with --interactive/--patch" |
9692 | msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" | |
9693 | ||
2b472aae | 9694 | #: builtin/add.c:464 |
ddc12c42 JX |
9695 | msgid "--pathspec-from-file is incompatible with --edit" |
9696 | msgstr "--pathspec-from-file 与 --edit 不兼容" | |
9697 | ||
2b472aae | 9698 | #: builtin/add.c:476 |
a0b6b246 JX |
9699 | msgid "-A and -u are mutually incompatible" |
9700 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 9701 | |
2b472aae | 9702 | #: builtin/add.c:479 |
a0b6b246 JX |
9703 | msgid "Option --ignore-missing can only be used together with --dry-run" |
9704 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 9705 | |
2b472aae | 9706 | #: builtin/add.c:483 |
8ada9598 | 9707 | #, c-format |
a0b6b246 JX |
9708 | msgid "--chmod param '%s' must be either -x or +x" |
9709 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 9710 | |
7157c2b5 | 9711 | #: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 |
349ede6a | 9712 | #: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 |
ddc12c42 JX |
9713 | msgid "--pathspec-from-file is incompatible with pathspec arguments" |
9714 | msgstr "--pathspec-from-file 与路径表达式参数不兼容" | |
9715 | ||
7157c2b5 | 9716 | #: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357 |
349ede6a | 9717 | #: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 |
ddc12c42 JX |
9718 | msgid "--pathspec-file-nul requires --pathspec-from-file" |
9719 | msgstr "--pathspec-file-nul 需要 --pathspec-from-file" | |
9720 | ||
2b472aae | 9721 | #: builtin/add.c:512 |
8ada9598 | 9722 | #, c-format |
a0b6b246 JX |
9723 | msgid "Nothing specified, nothing added.\n" |
9724 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 9725 | |
2b472aae JX |
9726 | #: builtin/add.c:514 |
9727 | msgid "" | |
9728 | "Maybe you wanted to say 'git add .'?\n" | |
9729 | "Turn this message off by running\n" | |
9730 | "\"git config advice.addEmptyPathspec false\"" | |
9731 | msgstr "" | |
9732 | "也许您想要执行 'git add .'?\n" | |
9733 | "运行下面的命令来关闭本消息\n" | |
9734 | "\"git config advice.addEmptyPathspec false\"" | |
8ada9598 | 9735 | |
2b472aae | 9736 | #: builtin/am.c:352 |
a0b6b246 JX |
9737 | msgid "could not parse author script" |
9738 | msgstr "不能解析作者脚本" | |
8ada9598 | 9739 | |
2b472aae | 9740 | #: builtin/am.c:436 |
81809b99 | 9741 | #, c-format |
a0b6b246 JX |
9742 | msgid "'%s' was deleted by the applypatch-msg hook" |
9743 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 9744 | |
2b472aae | 9745 | #: builtin/am.c:478 |
8ada9598 | 9746 | #, c-format |
a0b6b246 JX |
9747 | msgid "Malformed input line: '%s'." |
9748 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 9749 | |
2b472aae | 9750 | #: builtin/am.c:516 |
8ada9598 | 9751 | #, c-format |
a0b6b246 JX |
9752 | msgid "Failed to copy notes from '%s' to '%s'" |
9753 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 9754 | |
2b472aae | 9755 | #: builtin/am.c:542 |
a0b6b246 JX |
9756 | msgid "fseek failed" |
9757 | msgstr "fseek 失败" | |
8ada9598 | 9758 | |
2b472aae | 9759 | #: builtin/am.c:730 |
8ada9598 | 9760 | #, c-format |
a0b6b246 JX |
9761 | msgid "could not parse patch '%s'" |
9762 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 9763 | |
2b472aae | 9764 | #: builtin/am.c:795 |
a0b6b246 JX |
9765 | msgid "Only one StGIT patch series can be applied at once" |
9766 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
9767 | ||
2b472aae | 9768 | #: builtin/am.c:843 |
a0b6b246 JX |
9769 | msgid "invalid timestamp" |
9770 | msgstr "无效的时间戳" | |
9771 | ||
2b472aae | 9772 | #: builtin/am.c:848 builtin/am.c:860 |
a0b6b246 JX |
9773 | msgid "invalid Date line" |
9774 | msgstr "无效的日期行" | |
8ada9598 | 9775 | |
2b472aae | 9776 | #: builtin/am.c:855 |
a0b6b246 JX |
9777 | msgid "invalid timezone offset" |
9778 | msgstr "无效的时区偏移值" | |
8ada9598 | 9779 | |
2b472aae | 9780 | #: builtin/am.c:948 |
a0b6b246 | 9781 | msgid "Patch format detection failed." |
87cb7997 | 9782 | msgstr "补丁格式探测失败。" |
8ada9598 | 9783 | |
2b472aae | 9784 | #: builtin/am.c:953 builtin/clone.c:409 |
8ada9598 | 9785 | #, c-format |
a0b6b246 | 9786 | msgid "failed to create directory '%s'" |
c1ac5258 | 9787 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 9788 | |
2b472aae | 9789 | #: builtin/am.c:958 |
a0b6b246 | 9790 | msgid "Failed to split patches." |
c1ac5258 | 9791 | msgstr "拆分补丁失败。" |
814ff314 | 9792 | |
2b472aae | 9793 | #: builtin/am.c:1089 |
8ada9598 | 9794 | #, c-format |
a0b6b246 JX |
9795 | msgid "When you have resolved this problem, run \"%s --continue\"." |
9796 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 9797 | |
2b472aae | 9798 | #: builtin/am.c:1090 |
81809b99 | 9799 | #, c-format |
a0b6b246 JX |
9800 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
9801 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 9802 | |
2b472aae | 9803 | #: builtin/am.c:1091 |
81809b99 | 9804 | #, c-format |
a0b6b246 JX |
9805 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
9806 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 9807 | |
2b472aae | 9808 | #: builtin/am.c:1174 |
4c27fcb5 JX |
9809 | msgid "Patch sent with format=flowed; space at the end of lines might be lost." |
9810 | msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" | |
9811 | ||
2b472aae | 9812 | #: builtin/am.c:1202 |
a4f16749 JX |
9813 | msgid "Patch is empty." |
9814 | msgstr "补丁为空。" | |
23ff3338 | 9815 | |
2b472aae | 9816 | #: builtin/am.c:1267 |
a5cd71ca JX |
9817 | #, c-format |
9818 | msgid "missing author line in commit %s" | |
9819 | msgstr "在提交 %s 中缺失作者行" | |
9820 | ||
2b472aae | 9821 | #: builtin/am.c:1270 |
8ada9598 | 9822 | #, c-format |
a4f16749 JX |
9823 | msgid "invalid ident line: %.*s" |
9824 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 9825 | |
2b472aae | 9826 | #: builtin/am.c:1489 |
a0b6b246 JX |
9827 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
9828 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 9829 | |
2b472aae | 9830 | #: builtin/am.c:1491 |
a0b6b246 JX |
9831 | msgid "Using index info to reconstruct a base tree..." |
9832 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 9833 | |
2b472aae | 9834 | #: builtin/am.c:1510 |
a0b6b246 JX |
9835 | msgid "" |
9836 | "Did you hand edit your patch?\n" | |
9837 | "It does not apply to blobs recorded in its index." | |
9838 | msgstr "" | |
9839 | "您是否曾手动编辑过您的补丁?\n" | |
9840 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 9841 | |
2b472aae | 9842 | #: builtin/am.c:1516 |
a0b6b246 JX |
9843 | msgid "Falling back to patching base and 3-way merge..." |
9844 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 9845 | |
2b472aae | 9846 | #: builtin/am.c:1542 |
a0b6b246 JX |
9847 | msgid "Failed to merge in the changes." |
9848 | msgstr "无法合并变更。" | |
d691f479 | 9849 | |
2b472aae | 9850 | #: builtin/am.c:1574 |
a0b6b246 JX |
9851 | msgid "applying to an empty history" |
9852 | msgstr "正应用到一个空历史上" | |
8ada9598 | 9853 | |
2b472aae | 9854 | #: builtin/am.c:1621 builtin/am.c:1625 |
8ada9598 | 9855 | #, c-format |
a0b6b246 JX |
9856 | msgid "cannot resume: %s does not exist." |
9857 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 9858 | |
2b472aae | 9859 | #: builtin/am.c:1643 |
a0b6b246 JX |
9860 | msgid "Commit Body is:" |
9861 | msgstr "提交内容为:" | |
8ada9598 | 9862 | |
a0b6b246 JX |
9863 | # 译者:注意保持句尾空格 |
9864 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] | |
9865 | #. in your translation. The program will only accept English | |
9866 | #. input at this point. | |
9867 | #. | |
2b472aae | 9868 | #: builtin/am.c:1653 |
a6cd2cc4 | 9869 | #, c-format |
a0b6b246 JX |
9870 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
9871 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 9872 | |
349ede6a | 9873 | #: builtin/am.c:1699 builtin/commit.c:395 |
a5cd71ca JX |
9874 | msgid "unable to write index file" |
9875 | msgstr "无法写入索引文件" | |
9876 | ||
349ede6a | 9877 | #: builtin/am.c:1703 |
8ada9598 | 9878 | #, c-format |
a0b6b246 JX |
9879 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
9880 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 9881 | |
349ede6a | 9882 | #: builtin/am.c:1743 builtin/am.c:1811 |
81809b99 | 9883 | #, c-format |
a0b6b246 JX |
9884 | msgid "Applying: %.*s" |
9885 | msgstr "应用:%.*s" | |
8ada9598 | 9886 | |
349ede6a | 9887 | #: builtin/am.c:1760 |
a0b6b246 JX |
9888 | msgid "No changes -- Patch already applied." |
9889 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 9890 | |
349ede6a | 9891 | #: builtin/am.c:1766 |
81809b99 | 9892 | #, c-format |
a0b6b246 JX |
9893 | msgid "Patch failed at %s %.*s" |
9894 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 9895 | |
349ede6a | 9896 | #: builtin/am.c:1770 |
2b472aae JX |
9897 | msgid "Use 'git am --show-current-patch=diff' to see the failed patch" |
9898 | msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" | |
8ada9598 | 9899 | |
349ede6a | 9900 | #: builtin/am.c:1814 |
a0b6b246 JX |
9901 | msgid "" |
9902 | "No changes - did you forget to use 'git add'?\n" | |
9903 | "If there is nothing left to stage, chances are that something else\n" | |
9904 | "already introduced the same changes; you might want to skip this patch." | |
9905 | msgstr "" | |
9906 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
9907 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
9908 | "您也许想要跳过这个补丁。" | |
8ada9598 | 9909 | |
349ede6a | 9910 | #: builtin/am.c:1821 |
a0b6b246 JX |
9911 | msgid "" |
9912 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
9913 | "You should 'git add' each file with resolved conflicts to mark them as " |
9914 | "such.\n" | |
9915 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 9916 | msgstr "" |
a4f16749 JX |
9917 | "在您的索引中仍存在未合并的路径。\n" |
9918 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
9919 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 9920 | |
349ede6a JX |
9921 | #: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 |
9922 | #: builtin/reset.c:355 | |
8ada9598 | 9923 | #, c-format |
a0b6b246 JX |
9924 | msgid "Could not parse object '%s'." |
9925 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 9926 | |
349ede6a | 9927 | #: builtin/am.c:1980 |
a0b6b246 | 9928 | msgid "failed to clean index" |
c1ac5258 | 9929 | msgstr "清空索引失败" |
5b04ee3b | 9930 | |
349ede6a | 9931 | #: builtin/am.c:2024 |
a0b6b246 JX |
9932 | msgid "" |
9933 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
9934 | "Not rewinding to ORIG_HEAD" | |
9935 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 9936 | |
349ede6a | 9937 | #: builtin/am.c:2131 |
8ada9598 | 9938 | #, c-format |
a0b6b246 JX |
9939 | msgid "Invalid value for --patch-format: %s" |
9940 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 9941 | |
349ede6a | 9942 | #: builtin/am.c:2171 |
2b472aae JX |
9943 | #, c-format |
9944 | msgid "Invalid value for --show-current-patch: %s" | |
9945 | msgstr "无效的 --show-current-patch 值:%s" | |
9946 | ||
349ede6a | 9947 | #: builtin/am.c:2175 |
2b472aae JX |
9948 | #, c-format |
9949 | msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" | |
9950 | msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" | |
9951 | ||
349ede6a | 9952 | #: builtin/am.c:2206 |
a0b6b246 JX |
9953 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
9954 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 9955 | |
349ede6a | 9956 | #: builtin/am.c:2207 |
a0b6b246 JX |
9957 | msgid "git am [<options>] (--continue | --skip | --abort)" |
9958 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 9959 | |
349ede6a | 9960 | #: builtin/am.c:2213 |
a0b6b246 JX |
9961 | msgid "run interactively" |
9962 | msgstr "以交互式方式运行" | |
8ada9598 | 9963 | |
349ede6a | 9964 | #: builtin/am.c:2215 |
a0b6b246 JX |
9965 | msgid "historical option -- no-op" |
9966 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 9967 | |
349ede6a | 9968 | #: builtin/am.c:2217 |
a0b6b246 JX |
9969 | msgid "allow fall back on 3way merging if needed" |
9970 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 9971 | |
7157c2b5 | 9972 | #: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 |
349ede6a | 9973 | #: builtin/repack.c:306 builtin/stash.c:816 |
a0b6b246 JX |
9974 | msgid "be quiet" |
9975 | msgstr "静默模式" | |
8ada9598 | 9976 | |
349ede6a | 9977 | #: builtin/am.c:2220 |
a0b6b246 JX |
9978 | msgid "add a Signed-off-by line to the commit message" |
9979 | msgstr "在提交说明中添加一个 Signed-off-by 签名" | |
5c57d762 | 9980 | |
349ede6a | 9981 | #: builtin/am.c:2223 |
a0b6b246 JX |
9982 | msgid "recode into utf8 (default)" |
9983 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 9984 | |
349ede6a | 9985 | #: builtin/am.c:2225 |
a0b6b246 JX |
9986 | msgid "pass -k flag to git-mailinfo" |
9987 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 9988 | |
349ede6a | 9989 | #: builtin/am.c:2227 |
a0b6b246 JX |
9990 | msgid "pass -b flag to git-mailinfo" |
9991 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 9992 | |
349ede6a | 9993 | #: builtin/am.c:2229 |
a0b6b246 JX |
9994 | msgid "pass -m flag to git-mailinfo" |
9995 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 9996 | |
349ede6a | 9997 | #: builtin/am.c:2231 |
a0b6b246 JX |
9998 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
9999 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 10000 | |
349ede6a | 10001 | #: builtin/am.c:2234 |
a0b6b246 JX |
10002 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
10003 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 10004 | |
349ede6a | 10005 | #: builtin/am.c:2237 |
a0b6b246 JX |
10006 | msgid "strip everything before a scissors line" |
10007 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 10008 | |
349ede6a JX |
10009 | #: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 |
10010 | #: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 | |
10011 | #: builtin/am.c:2266 | |
a0b6b246 JX |
10012 | msgid "pass it through git-apply" |
10013 | msgstr "传递给 git-apply" | |
8ada9598 | 10014 | |
349ede6a JX |
10015 | #: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 |
10016 | #: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 | |
10017 | #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 | |
10018 | #: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 | |
10019 | #: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 | |
10020 | #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 | |
10021 | #: parse-options.h:316 | |
a0b6b246 JX |
10022 | msgid "n" |
10023 | msgstr "n" | |
8ada9598 | 10024 | |
349ede6a JX |
10025 | #: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 |
10026 | #: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 | |
7157c2b5 | 10027 | #: bugreport.c:137 |
a0b6b246 JX |
10028 | msgid "format" |
10029 | msgstr "格式" | |
8ada9598 | 10030 | |
349ede6a | 10031 | #: builtin/am.c:2263 |
a0b6b246 JX |
10032 | msgid "format the patch(es) are in" |
10033 | msgstr "补丁的格式" | |
8ada9598 | 10034 | |
349ede6a | 10035 | #: builtin/am.c:2269 |
a0b6b246 JX |
10036 | msgid "override error message when patch failure occurs" |
10037 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 10038 | |
349ede6a | 10039 | #: builtin/am.c:2271 |
a0b6b246 JX |
10040 | msgid "continue applying patches after resolving a conflict" |
10041 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 10042 | |
349ede6a | 10043 | #: builtin/am.c:2274 |
a0b6b246 JX |
10044 | msgid "synonyms for --continue" |
10045 | msgstr "和 --continue 同义" | |
8ada9598 | 10046 | |
349ede6a | 10047 | #: builtin/am.c:2277 |
a0b6b246 JX |
10048 | msgid "skip the current patch" |
10049 | msgstr "跳过当前补丁" | |
23ff3338 | 10050 | |
349ede6a | 10051 | #: builtin/am.c:2280 |
a0b6b246 JX |
10052 | msgid "restore the original branch and abort the patching operation." |
10053 | msgstr "恢复原始分支并终止打补丁操作。" | |
8ada9598 | 10054 | |
349ede6a | 10055 | #: builtin/am.c:2283 |
31e5e17b JX |
10056 | msgid "abort the patching operation but keep HEAD where it is." |
10057 | msgstr "终止补丁操作但保持 HEAD 不变。" | |
10058 | ||
349ede6a | 10059 | #: builtin/am.c:2287 |
2b472aae JX |
10060 | msgid "show the patch being applied" |
10061 | msgstr "显示正在应用的补丁" | |
31e5e17b | 10062 | |
349ede6a | 10063 | #: builtin/am.c:2292 |
a0b6b246 JX |
10064 | msgid "lie about committer date" |
10065 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 10066 | |
349ede6a | 10067 | #: builtin/am.c:2294 |
a0b6b246 JX |
10068 | msgid "use current timestamp for author date" |
10069 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 10070 | |
349ede6a JX |
10071 | #: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 |
10072 | #: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 | |
10073 | #: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 | |
a0b6b246 JX |
10074 | msgid "key-id" |
10075 | msgstr "key-id" | |
8ada9598 | 10076 | |
349ede6a | 10077 | #: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 |
a0b6b246 JX |
10078 | msgid "GPG-sign commits" |
10079 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 10080 | |
349ede6a | 10081 | #: builtin/am.c:2300 |
a0b6b246 JX |
10082 | msgid "(internal use for git-rebase)" |
10083 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 10084 | |
349ede6a | 10085 | #: builtin/am.c:2318 |
a0b6b246 JX |
10086 | msgid "" |
10087 | "The -b/--binary option has been a no-op for long time, and\n" | |
10088 | "it will be removed. Please do not use it anymore." | |
10089 | msgstr "" | |
10090 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
10091 | "请不要再使用它了。" | |
8ada9598 | 10092 | |
349ede6a | 10093 | #: builtin/am.c:2325 |
a0b6b246 | 10094 | msgid "failed to read the index" |
c1ac5258 | 10095 | msgstr "读取索引失败" |
8ada9598 | 10096 | |
349ede6a | 10097 | #: builtin/am.c:2340 |
a0b6b246 JX |
10098 | #, c-format |
10099 | msgid "previous rebase directory %s still exists but mbox given." | |
10100 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 10101 | |
349ede6a | 10102 | #: builtin/am.c:2364 |
a0b6b246 JX |
10103 | #, c-format |
10104 | msgid "" | |
10105 | "Stray %s directory found.\n" | |
10106 | "Use \"git am --abort\" to remove it." | |
10107 | msgstr "" | |
10108 | "发现了错误的 %s 目录。\n" | |
10109 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 10110 | |
349ede6a | 10111 | #: builtin/am.c:2370 |
a0b6b246 JX |
10112 | msgid "Resolve operation not in progress, we are not resuming." |
10113 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 10114 | |
349ede6a | 10115 | #: builtin/am.c:2380 |
a6cd2cc4 JX |
10116 | msgid "interactive mode requires patches on the command line" |
10117 | msgstr "交互式模式需要命令行上提供补丁" | |
10118 | ||
a0b6b246 JX |
10119 | #: builtin/apply.c:8 |
10120 | msgid "git apply [<options>] [<patch>...]" | |
10121 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 10122 | |
c04f5ac3 JX |
10123 | #: builtin/archive.c:17 |
10124 | #, c-format | |
10125 | msgid "could not create archive file '%s'" | |
90e6ef53 | 10126 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
10127 | |
10128 | #: builtin/archive.c:20 | |
10129 | msgid "could not redirect output" | |
195febda | 10130 | msgstr "不能重定向输出" |
c04f5ac3 JX |
10131 | |
10132 | #: builtin/archive.c:37 | |
10133 | msgid "git archive: Remote with no URL" | |
4375c10e | 10134 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 | 10135 | |
06991777 | 10136 | #: builtin/archive.c:61 |
31e5e17b JX |
10137 | msgid "git archive: expected ACK/NAK, got a flush packet" |
10138 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 10139 | |
06991777 | 10140 | #: builtin/archive.c:64 |
c04f5ac3 JX |
10141 | #, c-format |
10142 | msgid "git archive: NACK %s" | |
90e6ef53 | 10143 | msgstr "git archive:NACK %s" |
c04f5ac3 | 10144 | |
06991777 | 10145 | #: builtin/archive.c:65 |
c04f5ac3 | 10146 | msgid "git archive: protocol error" |
90e6ef53 | 10147 | msgstr "git archive:协议错误" |
c04f5ac3 | 10148 | |
06991777 | 10149 | #: builtin/archive.c:69 |
c04f5ac3 | 10150 | msgid "git archive: expected a flush" |
31e5e17b | 10151 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 10152 | |
06991777 | 10153 | #: builtin/bisect--helper.c:22 |
ef317cd5 | 10154 | msgid "git bisect--helper --next-all [--no-checkout]" |
07432cef | 10155 | msgstr "git bisect--helper --next-all [--no-checkout]" |
ef317cd5 | 10156 | |
06991777 | 10157 | #: builtin/bisect--helper.c:23 |
5809aa05 JX |
10158 | msgid "git bisect--helper --write-terms <bad_term> <good_term>" |
10159 | msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>" | |
10160 | ||
06991777 | 10161 | #: builtin/bisect--helper.c:24 |
5809aa05 JX |
10162 | msgid "git bisect--helper --bisect-clean-state" |
10163 | msgstr "git bisect--helper --bisect-clean-state" | |
10164 | ||
06991777 JX |
10165 | #: builtin/bisect--helper.c:25 |
10166 | msgid "git bisect--helper --bisect-reset [<commit>]" | |
10167 | msgstr "git bisect--helper --bisect-reset [<提交>]" | |
10168 | ||
10169 | #: builtin/bisect--helper.c:26 | |
10170 | msgid "" | |
10171 | "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " | |
10172 | "<bad_term>" | |
10173 | msgstr "" | |
10174 | "git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语" | |
10175 | ">" | |
10176 | ||
10177 | #: builtin/bisect--helper.c:27 | |
10178 | msgid "" | |
10179 | "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " | |
10180 | "<bad_term>" | |
10181 | msgstr "" | |
10182 | "git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>" | |
10183 | ||
10184 | #: builtin/bisect--helper.c:28 | |
10185 | msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" | |
10186 | msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" | |
10187 | ||
10188 | #: builtin/bisect--helper.c:29 | |
10189 | msgid "" | |
10190 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
10191 | "term-new]" | |
10192 | msgstr "" | |
10193 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
10194 | "term-new]" | |
10195 | ||
10196 | #: builtin/bisect--helper.c:30 | |
10197 | msgid "" | |
10198 | "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" | |
10199 | "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" | |
10200 | msgstr "" | |
10201 | "git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}" | |
10202 | "=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]" | |
10203 | ||
10204 | #: builtin/bisect--helper.c:86 | |
5809aa05 JX |
10205 | #, c-format |
10206 | msgid "'%s' is not a valid term" | |
10207 | msgstr "'%s' 不是一个有效的术语" | |
10208 | ||
06991777 | 10209 | #: builtin/bisect--helper.c:90 |
5809aa05 JX |
10210 | #, c-format |
10211 | msgid "can't use the builtin command '%s' as a term" | |
10212 | msgstr "不能使用内置命令 '%s' 作为术语" | |
10213 | ||
06991777 | 10214 | #: builtin/bisect--helper.c:100 |
5809aa05 JX |
10215 | #, c-format |
10216 | msgid "can't change the meaning of the term '%s'" | |
10217 | msgstr "不能修改术语 '%s' 的含义" | |
10218 | ||
06991777 | 10219 | #: builtin/bisect--helper.c:111 |
5809aa05 JX |
10220 | msgid "please use two different terms" |
10221 | msgstr "请使用两个不同的术语" | |
10222 | ||
06991777 | 10223 | #: builtin/bisect--helper.c:118 |
5809aa05 JX |
10224 | msgid "could not open the file BISECT_TERMS" |
10225 | msgstr "不能打开文件 BISECT_TERMS" | |
10226 | ||
06991777 JX |
10227 | #: builtin/bisect--helper.c:155 |
10228 | #, c-format | |
10229 | msgid "We are not bisecting.\n" | |
10230 | msgstr "我们没有在二分查找。\n" | |
10231 | ||
10232 | #: builtin/bisect--helper.c:163 | |
10233 | #, c-format | |
10234 | msgid "'%s' is not a valid commit" | |
10235 | msgstr "'%s' 不是一个有效的提交" | |
10236 | ||
ddc12c42 | 10237 | #: builtin/bisect--helper.c:172 |
06991777 JX |
10238 | #, c-format |
10239 | msgid "" | |
10240 | "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." | |
10241 | msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" | |
10242 | ||
ddc12c42 | 10243 | #: builtin/bisect--helper.c:216 |
06991777 JX |
10244 | #, c-format |
10245 | msgid "Bad bisect_write argument: %s" | |
10246 | msgstr "坏的 bisect_write 参数:%s" | |
10247 | ||
ddc12c42 | 10248 | #: builtin/bisect--helper.c:221 |
06991777 JX |
10249 | #, c-format |
10250 | msgid "couldn't get the oid of the rev '%s'" | |
5b533632 | 10251 | msgstr "无法获取版本 '%s' 的对象 ID" |
06991777 | 10252 | |
ddc12c42 | 10253 | #: builtin/bisect--helper.c:233 |
06991777 JX |
10254 | #, c-format |
10255 | msgid "couldn't open the file '%s'" | |
10256 | msgstr "无法打开文件 '%s'" | |
10257 | ||
ddc12c42 | 10258 | #: builtin/bisect--helper.c:259 |
06991777 JX |
10259 | #, c-format |
10260 | msgid "Invalid command: you're currently in a %s/%s bisect" | |
10261 | msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中" | |
10262 | ||
ddc12c42 | 10263 | #: builtin/bisect--helper.c:286 |
06991777 JX |
10264 | #, c-format |
10265 | msgid "" | |
10266 | "You need to give me at least one %s and %s revision.\n" | |
10267 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
10268 | msgstr "" | |
10269 | "您需要给我至少一个 %s 和一个 %s 版本。\n" | |
10270 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" | |
10271 | ||
ddc12c42 | 10272 | #: builtin/bisect--helper.c:290 |
06991777 JX |
10273 | #, c-format |
10274 | msgid "" | |
10275 | "You need to start by \"git bisect start\".\n" | |
10276 | "You then need to give me at least one %s and %s revision.\n" | |
10277 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
10278 | msgstr "" | |
10279 | "您需要执行 \"git bisect start\" 来开始。\n" | |
10280 | "然后需要提供我至少一个 %s 和一个 %s 版本。\n" | |
10281 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" | |
10282 | ||
2b472aae | 10283 | #: builtin/bisect--helper.c:310 |
06991777 JX |
10284 | #, c-format |
10285 | msgid "bisecting only with a %s commit" | |
5b533632 | 10286 | msgstr "在只有一个 %s 提交的情况下二分查找" |
06991777 JX |
10287 | |
10288 | # 译者:注意保持句尾空格 | |
10289 | #. TRANSLATORS: Make sure to include [Y] and [n] in your | |
10290 | #. translation. The program will only accept English input | |
10291 | #. at this point. | |
10292 | #. | |
2b472aae | 10293 | #: builtin/bisect--helper.c:318 |
06991777 JX |
10294 | msgid "Are you sure [Y/n]? " |
10295 | msgstr "您确认么[Y/n]? " | |
10296 | ||
2b472aae | 10297 | #: builtin/bisect--helper.c:379 |
06991777 JX |
10298 | msgid "no terms defined" |
10299 | msgstr "未定义术语" | |
10300 | ||
2b472aae | 10301 | #: builtin/bisect--helper.c:382 |
06991777 JX |
10302 | #, c-format |
10303 | msgid "" | |
10304 | "Your current terms are %s for the old state\n" | |
10305 | "and %s for the new state.\n" | |
10306 | msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n" | |
10307 | ||
2b472aae | 10308 | #: builtin/bisect--helper.c:392 |
06991777 JX |
10309 | #, c-format |
10310 | msgid "" | |
10311 | "invalid argument %s for 'git bisect terms'.\n" | |
10312 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
10313 | msgstr "" | |
10314 | "命令 'git bisect terms' 的参数 %s 无效。\n" | |
10315 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
10316 | ||
7157c2b5 JX |
10317 | #: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 |
10318 | msgid "'' is not a valid term" | |
10319 | msgstr "'' 不是一个有效的术语" | |
10320 | ||
10321 | #: builtin/bisect--helper.c:483 | |
06991777 JX |
10322 | #, c-format |
10323 | msgid "unrecognized option: '%s'" | |
10324 | msgstr "未识别的选项:'%s'" | |
10325 | ||
7157c2b5 | 10326 | #: builtin/bisect--helper.c:487 |
06991777 JX |
10327 | #, c-format |
10328 | msgid "'%s' does not appear to be a valid revision" | |
8e4e0555 | 10329 | msgstr "'%s' 看起来不是一个有效的版本" |
06991777 | 10330 | |
7157c2b5 | 10331 | #: builtin/bisect--helper.c:519 |
06991777 JX |
10332 | msgid "bad HEAD - I need a HEAD" |
10333 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
10334 | ||
7157c2b5 | 10335 | #: builtin/bisect--helper.c:534 |
06991777 JX |
10336 | #, c-format |
10337 | msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." | |
10338 | msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" | |
10339 | ||
7157c2b5 | 10340 | #: builtin/bisect--helper.c:555 |
06991777 JX |
10341 | msgid "won't bisect on cg-seek'ed tree" |
10342 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
10343 | ||
7157c2b5 | 10344 | #: builtin/bisect--helper.c:558 |
06991777 JX |
10345 | msgid "bad HEAD - strange symbolic ref" |
10346 | msgstr "坏的 HEAD - 奇怪的符号引用" | |
10347 | ||
7157c2b5 | 10348 | #: builtin/bisect--helper.c:582 |
a6cd2cc4 JX |
10349 | #, c-format |
10350 | msgid "invalid ref: '%s'" | |
10351 | msgstr "无效的引用:'%s'" | |
10352 | ||
7157c2b5 | 10353 | #: builtin/bisect--helper.c:638 |
ef317cd5 | 10354 | msgid "perform 'git bisect next'" |
07432cef | 10355 | msgstr "执行 'git bisect next'" |
ef317cd5 | 10356 | |
7157c2b5 | 10357 | #: builtin/bisect--helper.c:640 |
5809aa05 JX |
10358 | msgid "write the terms to .git/BISECT_TERMS" |
10359 | msgstr "将术语写入 .git/BISECT_TERMS" | |
10360 | ||
7157c2b5 | 10361 | #: builtin/bisect--helper.c:642 |
5809aa05 JX |
10362 | msgid "cleanup the bisection state" |
10363 | msgstr "清除二分查找状态" | |
10364 | ||
7157c2b5 | 10365 | #: builtin/bisect--helper.c:644 |
5809aa05 JX |
10366 | msgid "check for expected revs" |
10367 | msgstr "检查预期的版本" | |
10368 | ||
7157c2b5 | 10369 | #: builtin/bisect--helper.c:646 |
06991777 JX |
10370 | msgid "reset the bisection state" |
10371 | msgstr "清除二分查找状态" | |
10372 | ||
7157c2b5 | 10373 | #: builtin/bisect--helper.c:648 |
06991777 JX |
10374 | msgid "write out the bisection state in BISECT_LOG" |
10375 | msgstr "将二分查找的状态写入 BISECT_LOG" | |
10376 | ||
7157c2b5 | 10377 | #: builtin/bisect--helper.c:650 |
06991777 JX |
10378 | msgid "check and set terms in a bisection state" |
10379 | msgstr "在一个二分查找状态中检查和设置术语" | |
10380 | ||
7157c2b5 | 10381 | #: builtin/bisect--helper.c:652 |
06991777 JX |
10382 | msgid "check whether bad or good terms exist" |
10383 | msgstr "检查坏的或好的术语是否存在" | |
10384 | ||
7157c2b5 | 10385 | #: builtin/bisect--helper.c:654 |
06991777 JX |
10386 | msgid "print out the bisect terms" |
10387 | msgstr "打印二分查找术语" | |
10388 | ||
7157c2b5 | 10389 | #: builtin/bisect--helper.c:656 |
06991777 | 10390 | msgid "start the bisect session" |
5b533632 | 10391 | msgstr "启动二分查找过程" |
06991777 | 10392 | |
7157c2b5 | 10393 | #: builtin/bisect--helper.c:658 |
ef317cd5 | 10394 | msgid "update BISECT_HEAD instead of checking out the current commit" |
07432cef | 10395 | msgstr "更新 BISECT_HEAD 而非检出当前提交" |
ef317cd5 | 10396 | |
7157c2b5 | 10397 | #: builtin/bisect--helper.c:660 |
06991777 JX |
10398 | msgid "no log for BISECT_WRITE" |
10399 | msgstr "BISECT_WRITE 无日志" | |
10400 | ||
7157c2b5 | 10401 | #: builtin/bisect--helper.c:678 |
5809aa05 JX |
10402 | msgid "--write-terms requires two arguments" |
10403 | msgstr "--write-terms 需要两个参数" | |
10404 | ||
7157c2b5 | 10405 | #: builtin/bisect--helper.c:682 |
5809aa05 | 10406 | msgid "--bisect-clean-state requires no arguments" |
8e4e0555 | 10407 | msgstr "--bisect-clean-state 不带参数" |
5809aa05 | 10408 | |
7157c2b5 | 10409 | #: builtin/bisect--helper.c:689 |
06991777 JX |
10410 | msgid "--bisect-reset requires either no argument or a commit" |
10411 | msgstr "--bisect-reset 无需参数或者需要一个提交" | |
10412 | ||
7157c2b5 | 10413 | #: builtin/bisect--helper.c:693 |
06991777 JX |
10414 | msgid "--bisect-write requires either 4 or 5 arguments" |
10415 | msgstr "--bisect-write 需要 4 或 5 个参数" | |
10416 | ||
7157c2b5 | 10417 | #: builtin/bisect--helper.c:699 |
06991777 JX |
10418 | msgid "--check-and-set-terms requires 3 arguments" |
10419 | msgstr "--check-and-set-terms 需要 3 个参数" | |
10420 | ||
7157c2b5 | 10421 | #: builtin/bisect--helper.c:705 |
06991777 JX |
10422 | msgid "--bisect-next-check requires 2 or 3 arguments" |
10423 | msgstr "--bisect-next-check 需要 2 或 3 个参数" | |
10424 | ||
7157c2b5 | 10425 | #: builtin/bisect--helper.c:711 |
06991777 JX |
10426 | msgid "--bisect-terms requires 0 or 1 argument" |
10427 | msgstr "--bisect-terms 需要 0 或 1 个参数" | |
10428 | ||
a5cd71ca | 10429 | #: builtin/blame.c:31 |
7aea43ff JX |
10430 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
10431 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 10432 | |
a5cd71ca | 10433 | #: builtin/blame.c:36 |
814ff314 JX |
10434 | msgid "<rev-opts> are documented in git-rev-list(1)" |
10435 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 10436 | |
a5cd71ca | 10437 | #: builtin/blame.c:409 |
fd8cb379 JX |
10438 | #, c-format |
10439 | msgid "expecting a color: %s" | |
10440 | msgstr "期望一个颜色:%s" | |
10441 | ||
a5cd71ca | 10442 | #: builtin/blame.c:416 |
fd8cb379 JX |
10443 | msgid "must end with a color" |
10444 | msgstr "必须以一个颜色结尾" | |
10445 | ||
a5cd71ca | 10446 | #: builtin/blame.c:729 |
fd8cb379 JX |
10447 | #, c-format |
10448 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
10449 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
10450 | ||
a5cd71ca | 10451 | #: builtin/blame.c:747 |
fd8cb379 JX |
10452 | msgid "invalid value for blame.coloring" |
10453 | msgstr "设置 blame.coloring 中的无效取值" | |
10454 | ||
a5cd71ca | 10455 | #: builtin/blame.c:822 |
a6cd2cc4 JX |
10456 | #, c-format |
10457 | msgid "cannot find revision %s to ignore" | |
10458 | msgstr "不能找到要忽略的版本 %s" | |
10459 | ||
a5cd71ca | 10460 | #: builtin/blame.c:844 |
ef317cd5 | 10461 | msgid "Show blame entries as we find them, incrementally" |
07432cef | 10462 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 10463 | |
a5cd71ca | 10464 | #: builtin/blame.c:845 |
ef317cd5 | 10465 | msgid "Show blank SHA-1 for boundary commits (Default: off)" |
07432cef | 10466 | msgstr "边界提交显示空的 SHA-1(默认:关闭)" |
ef317cd5 | 10467 | |
a5cd71ca | 10468 | #: builtin/blame.c:846 |
ef317cd5 | 10469 | msgid "Do not treat root commits as boundaries (Default: off)" |
07432cef | 10470 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 10471 | |
a5cd71ca | 10472 | #: builtin/blame.c:847 |
ef317cd5 | 10473 | msgid "Show work cost statistics" |
07432cef | 10474 | msgstr "显示命令消耗统计" |
ef317cd5 | 10475 | |
a5cd71ca | 10476 | #: builtin/blame.c:848 |
276ceeaa JX |
10477 | msgid "Force progress reporting" |
10478 | msgstr "强制进度显示" | |
10479 | ||
a5cd71ca | 10480 | #: builtin/blame.c:849 |
ef317cd5 | 10481 | msgid "Show output score for blame entries" |
07432cef | 10482 | msgstr "显示判断 blame 条目位移的得分诊断信息" |
ef317cd5 | 10483 | |
a5cd71ca | 10484 | #: builtin/blame.c:850 |
ef317cd5 | 10485 | msgid "Show original filename (Default: auto)" |
07432cef | 10486 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 10487 | |
a5cd71ca | 10488 | #: builtin/blame.c:851 |
ef317cd5 | 10489 | msgid "Show original linenumber (Default: off)" |
07432cef | 10490 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 10491 | |
a5cd71ca | 10492 | #: builtin/blame.c:852 |
ef317cd5 | 10493 | msgid "Show in a format designed for machine consumption" |
07432cef | 10494 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 10495 | |
a5cd71ca | 10496 | #: builtin/blame.c:853 |
ef317cd5 | 10497 | msgid "Show porcelain format with per-line commit information" |
07432cef | 10498 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 10499 | |
a5cd71ca | 10500 | #: builtin/blame.c:854 |
ef317cd5 | 10501 | msgid "Use the same output mode as git-annotate (Default: off)" |
07432cef | 10502 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 10503 | |
a5cd71ca | 10504 | #: builtin/blame.c:855 |
ef317cd5 | 10505 | msgid "Show raw timestamp (Default: off)" |
07432cef | 10506 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 10507 | |
a5cd71ca | 10508 | #: builtin/blame.c:856 |
ef317cd5 | 10509 | msgid "Show long commit SHA1 (Default: off)" |
4375c10e | 10510 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 10511 | |
a5cd71ca | 10512 | #: builtin/blame.c:857 |
ef317cd5 | 10513 | msgid "Suppress author name and timestamp (Default: off)" |
07432cef | 10514 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 10515 | |
a5cd71ca | 10516 | #: builtin/blame.c:858 |
ef317cd5 | 10517 | msgid "Show author email instead of name (Default: off)" |
07432cef | 10518 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 10519 | |
a5cd71ca | 10520 | #: builtin/blame.c:859 |
ef317cd5 | 10521 | msgid "Ignore whitespace differences" |
07432cef | 10522 | msgstr "忽略空白差异" |
ef317cd5 | 10523 | |
349ede6a | 10524 | #: builtin/blame.c:860 builtin/log.c:1721 |
a6cd2cc4 JX |
10525 | msgid "rev" |
10526 | msgstr "版本" | |
10527 | ||
a5cd71ca | 10528 | #: builtin/blame.c:860 |
a6cd2cc4 JX |
10529 | msgid "Ignore <rev> when blaming" |
10530 | msgstr "在执行 blame 操作时忽略 <版本>" | |
10531 | ||
a5cd71ca | 10532 | #: builtin/blame.c:861 |
a6cd2cc4 JX |
10533 | msgid "Ignore revisions from <file>" |
10534 | msgstr "忽略来自 <文件> 中的版本" | |
10535 | ||
a5cd71ca | 10536 | #: builtin/blame.c:862 |
fd8cb379 JX |
10537 | msgid "color redundant metadata from previous line differently" |
10538 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
10539 | ||
a5cd71ca | 10540 | #: builtin/blame.c:863 |
fd8cb379 JX |
10541 | msgid "color lines by age" |
10542 | msgstr "依据时间着色" | |
10543 | ||
ddc12c42 | 10544 | #: builtin/blame.c:864 |
ef317cd5 | 10545 | msgid "Spend extra cycles to find better match" |
07432cef | 10546 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 10547 | |
ddc12c42 | 10548 | #: builtin/blame.c:865 |
ef317cd5 | 10549 | msgid "Use revisions from <file> instead of calling git-rev-list" |
d9d56b23 | 10550 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 10551 | |
ddc12c42 | 10552 | #: builtin/blame.c:866 |
ef317cd5 | 10553 | msgid "Use <file>'s contents as the final image" |
d9d56b23 | 10554 | msgstr "使用 <文件> 的内容作为最终的图片" |
ef317cd5 | 10555 | |
ddc12c42 | 10556 | #: builtin/blame.c:867 builtin/blame.c:868 |
ef317cd5 | 10557 | msgid "score" |
07432cef | 10558 | msgstr "得分" |
ef317cd5 | 10559 | |
ddc12c42 | 10560 | #: builtin/blame.c:867 |
ef317cd5 | 10561 | msgid "Find line copies within and across files" |
07432cef | 10562 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 10563 | |
ddc12c42 | 10564 | #: builtin/blame.c:868 |
ef317cd5 | 10565 | msgid "Find line movements within and across files" |
07432cef | 10566 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 10567 | |
ddc12c42 | 10568 | #: builtin/blame.c:869 |
ef317cd5 | 10569 | msgid "n,m" |
07432cef | 10570 | msgstr "n,m" |
ef317cd5 | 10571 | |
ddc12c42 | 10572 | #: builtin/blame.c:869 |
ef317cd5 | 10573 | msgid "Process only line range n,m, counting from 1" |
07432cef | 10574 | msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" |
ef317cd5 | 10575 | |
ddc12c42 | 10576 | #: builtin/blame.c:921 |
a0b6b246 JX |
10577 | msgid "--progress can't be used with --incremental or porcelain formats" |
10578 | msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" | |
10579 | ||
a4f16749 JX |
10580 | #. TRANSLATORS: This string is used to tell us the |
10581 | #. maximum display width for a relative timestamp in | |
10582 | #. "git blame" output. For C locale, "4 years, 11 | |
10583 | #. months ago", which takes 22 places, is the longest | |
10584 | #. among various forms of relative timestamps, but | |
10585 | #. your language may need more or fewer display | |
10586 | #. columns. | |
10587 | #. | |
ddc12c42 | 10588 | #: builtin/blame.c:972 |
6c94aba5 JX |
10589 | msgid "4 years, 11 months ago" |
10590 | msgstr "4 年 11 个月前" | |
10591 | ||
349ede6a | 10592 | #: builtin/blame.c:1087 |
a0b6b246 JX |
10593 | #, c-format |
10594 | msgid "file %s has only %lu line" | |
10595 | msgid_plural "file %s has only %lu lines" | |
10596 | msgstr[0] "文件 %s 只有 %lu 行" | |
10597 | msgstr[1] "文件 %s 只有 %lu 行" | |
10598 | ||
349ede6a | 10599 | #: builtin/blame.c:1133 |
a4f16749 JX |
10600 | msgid "Blaming lines" |
10601 | msgstr "追踪代码行" | |
10602 | ||
4c27fcb5 | 10603 | #: builtin/branch.c:29 |
814ff314 JX |
10604 | msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" |
10605 | msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" | |
ef317cd5 | 10606 | |
4c27fcb5 | 10607 | #: builtin/branch.c:30 |
814ff314 JX |
10608 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
10609 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 10610 | |
4c27fcb5 | 10611 | #: builtin/branch.c:31 |
814ff314 JX |
10612 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
10613 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 10614 | |
4c27fcb5 | 10615 | #: builtin/branch.c:32 |
814ff314 JX |
10616 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
10617 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 10618 | |
4c27fcb5 | 10619 | #: builtin/branch.c:33 |
6937cb4e JX |
10620 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
10621 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
10622 | ||
4c27fcb5 | 10623 | #: builtin/branch.c:34 |
94550ed3 JX |
10624 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
10625 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
10626 | ||
4c27fcb5 | 10627 | #: builtin/branch.c:35 |
87cb7997 JX |
10628 | msgid "git branch [<options>] [-r | -a] [--format]" |
10629 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
10630 | ||
90e6ef53 | 10631 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 10632 | #: builtin/branch.c:154 |
c04f5ac3 JX |
10633 | #, c-format |
10634 | msgid "" | |
10635 | "deleting branch '%s' that has been merged to\n" | |
10636 | " '%s', but not yet merged to HEAD." | |
10637 | msgstr "" | |
70fc47bf | 10638 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
10639 | " '%s',但未合并到 HEAD。" |
10640 | ||
90e6ef53 | 10641 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 10642 | #: builtin/branch.c:158 |
c04f5ac3 JX |
10643 | #, c-format |
10644 | msgid "" | |
10645 | "not deleting branch '%s' that is not yet merged to\n" | |
10646 | " '%s', even though it is merged to HEAD." | |
10647 | msgstr "" | |
70fc47bf T |
10648 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
10649 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 10650 | |
a6cd2cc4 | 10651 | #: builtin/branch.c:172 |
07432cef WS |
10652 | #, c-format |
10653 | msgid "Couldn't look up commit object for '%s'" | |
10654 | msgstr "无法查询 '%s' 指向的提交对象" | |
10655 | ||
a6cd2cc4 | 10656 | #: builtin/branch.c:176 |
07432cef WS |
10657 | #, c-format |
10658 | msgid "" | |
10659 | "The branch '%s' is not fully merged.\n" | |
10660 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
10661 | msgstr "" | |
10662 | "分支 '%s' 没有完全合并。\n" | |
10663 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
10664 | ||
a6cd2cc4 | 10665 | #: builtin/branch.c:189 |
07432cef | 10666 | msgid "Update of config-file failed" |
6937cb4e | 10667 | msgstr "更新配置文件失败" |
07432cef | 10668 | |
a6cd2cc4 | 10669 | #: builtin/branch.c:220 |
c04f5ac3 | 10670 | msgid "cannot use -a with -d" |
649900bc | 10671 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 10672 | |
a6cd2cc4 | 10673 | #: builtin/branch.c:226 |
c04f5ac3 JX |
10674 | msgid "Couldn't look up commit object for HEAD" |
10675 | msgstr "无法查询 HEAD 指向的提交对象" | |
10676 | ||
a6cd2cc4 | 10677 | #: builtin/branch.c:240 |
c04f5ac3 | 10678 | #, c-format |
5b04ee3b JX |
10679 | msgid "Cannot delete branch '%s' checked out at '%s'" |
10680 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 10681 | |
a6cd2cc4 | 10682 | #: builtin/branch.c:255 |
5ae481e0 | 10683 | #, c-format |
7aea43ff JX |
10684 | msgid "remote-tracking branch '%s' not found." |
10685 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 10686 | |
a6cd2cc4 | 10687 | #: builtin/branch.c:256 |
81809b99 | 10688 | #, c-format |
8ada9598 | 10689 | msgid "branch '%s' not found." |
81809b99 | 10690 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 10691 | |
a6cd2cc4 | 10692 | #: builtin/branch.c:271 |
81809b99 | 10693 | #, c-format |
7aea43ff JX |
10694 | msgid "Error deleting remote-tracking branch '%s'" |
10695 | msgstr "无法删除远程跟踪分支 '%s'" | |
c04f5ac3 | 10696 | |
a6cd2cc4 | 10697 | #: builtin/branch.c:272 |
81809b99 | 10698 | #, c-format |
8ada9598 | 10699 | msgid "Error deleting branch '%s'" |
7aea43ff | 10700 | msgstr "无法删除分支 '%s'" |
8ada9598 | 10701 | |
a6cd2cc4 | 10702 | #: builtin/branch.c:279 |
81809b99 | 10703 | #, c-format |
7aea43ff JX |
10704 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
10705 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 10706 | |
a6cd2cc4 | 10707 | #: builtin/branch.c:280 |
81809b99 | 10708 | #, c-format |
8ada9598 | 10709 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 10710 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 10711 | |
a6cd2cc4 | 10712 | #: builtin/branch.c:429 builtin/tag.c:61 |
6937cb4e JX |
10713 | msgid "unable to parse format string" |
10714 | msgstr "不能解析格式化字符串" | |
10715 | ||
a6cd2cc4 | 10716 | #: builtin/branch.c:460 |
d46c5519 JX |
10717 | msgid "could not resolve HEAD" |
10718 | msgstr "不能解析 HEAD 提交" | |
10719 | ||
a6cd2cc4 | 10720 | #: builtin/branch.c:466 |
5b04ee3b | 10721 | #, c-format |
d46c5519 JX |
10722 | msgid "HEAD (%s) points outside of refs/heads/" |
10723 | msgstr "HEAD (%s) 指向 refs/heads/ 之外" | |
10724 | ||
a6cd2cc4 | 10725 | #: builtin/branch.c:481 |
d46c5519 | 10726 | #, c-format |
5b04ee3b JX |
10727 | msgid "Branch %s is being rebased at %s" |
10728 | msgstr "分支 %s 正被变基到 %s" | |
10729 | ||
a6cd2cc4 | 10730 | #: builtin/branch.c:485 |
5b04ee3b JX |
10731 | #, c-format |
10732 | msgid "Branch %s is being bisected at %s" | |
10733 | msgstr "分支 %s 正被二分查找于 %s" | |
10734 | ||
a6cd2cc4 | 10735 | #: builtin/branch.c:502 |
6937cb4e JX |
10736 | msgid "cannot copy the current branch while not on any." |
10737 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
10738 | ||
a6cd2cc4 | 10739 | #: builtin/branch.c:504 |
c04f5ac3 | 10740 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 10741 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 10742 | |
a6cd2cc4 | 10743 | #: builtin/branch.c:515 |
c04f5ac3 JX |
10744 | #, c-format |
10745 | msgid "Invalid branch name: '%s'" | |
10746 | msgstr "无效的分支名:'%s'" | |
10747 | ||
a6cd2cc4 | 10748 | #: builtin/branch.c:542 |
c04f5ac3 JX |
10749 | msgid "Branch rename failed" |
10750 | msgstr "分支重命名失败" | |
10751 | ||
a6cd2cc4 | 10752 | #: builtin/branch.c:544 |
6937cb4e JX |
10753 | msgid "Branch copy failed" |
10754 | msgstr "分支拷贝失败" | |
10755 | ||
a6cd2cc4 | 10756 | #: builtin/branch.c:548 |
6937cb4e | 10757 | #, c-format |
5809aa05 JX |
10758 | msgid "Created a copy of a misnamed branch '%s'" |
10759 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 10760 | |
a6cd2cc4 | 10761 | #: builtin/branch.c:551 |
c04f5ac3 JX |
10762 | #, c-format |
10763 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 10764 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 10765 | |
a6cd2cc4 | 10766 | #: builtin/branch.c:557 |
c04f5ac3 JX |
10767 | #, c-format |
10768 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
10769 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
10770 | ||
a6cd2cc4 | 10771 | #: builtin/branch.c:566 |
c04f5ac3 | 10772 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
10773 | msgstr "分支被重命名,但更新配置文件失败" |
10774 | ||
a6cd2cc4 | 10775 | #: builtin/branch.c:568 |
6937cb4e JX |
10776 | msgid "Branch is copied, but update of config-file failed" |
10777 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 10778 | |
a6cd2cc4 | 10779 | #: builtin/branch.c:584 |
5c57d762 JX |
10780 | #, c-format |
10781 | msgid "" | |
10782 | "Please edit the description for the branch\n" | |
10783 | " %s\n" | |
10784 | "Lines starting with '%c' will be stripped.\n" | |
10785 | msgstr "" | |
10786 | "请编辑分支的描述\n" | |
10787 | " %s\n" | |
10788 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 10789 | |
a6cd2cc4 | 10790 | #: builtin/branch.c:618 |
ef317cd5 | 10791 | msgid "Generic options" |
07432cef | 10792 | msgstr "通用选项" |
c04f5ac3 | 10793 | |
a6cd2cc4 | 10794 | #: builtin/branch.c:620 |
ef317cd5 | 10795 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 10796 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 10797 | |
a6cd2cc4 | 10798 | #: builtin/branch.c:621 |
ef317cd5 | 10799 | msgid "suppress informational messages" |
07432cef | 10800 | msgstr "不显示信息" |
8ada9598 | 10801 | |
a6cd2cc4 | 10802 | #: builtin/branch.c:622 |
ef317cd5 | 10803 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 10804 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 10805 | |
a6cd2cc4 | 10806 | #: builtin/branch.c:624 |
6937cb4e JX |
10807 | msgid "do not use" |
10808 | msgstr "不要使用" | |
c04f5ac3 | 10809 | |
349ede6a | 10810 | #: builtin/branch.c:626 builtin/rebase.c:520 |
5b04ee3b JX |
10811 | msgid "upstream" |
10812 | msgstr "上游" | |
10813 | ||
a6cd2cc4 | 10814 | #: builtin/branch.c:626 |
5b04ee3b JX |
10815 | msgid "change the upstream info" |
10816 | msgstr "改变上游信息" | |
10817 | ||
a6cd2cc4 | 10818 | #: builtin/branch.c:627 |
ddc12c42 | 10819 | msgid "unset the upstream info" |
a0b6b246 JX |
10820 | msgstr "取消上游信息的设置" |
10821 | ||
a6cd2cc4 | 10822 | #: builtin/branch.c:628 |
ef317cd5 | 10823 | msgid "use colored output" |
07432cef | 10824 | msgstr "使用彩色输出" |
c04f5ac3 | 10825 | |
a6cd2cc4 | 10826 | #: builtin/branch.c:629 |
ef317cd5 | 10827 | msgid "act on remote-tracking branches" |
07432cef | 10828 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 10829 | |
a6cd2cc4 | 10830 | #: builtin/branch.c:631 builtin/branch.c:633 |
ef317cd5 | 10831 | msgid "print only branches that contain the commit" |
07432cef | 10832 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 10833 | |
a6cd2cc4 | 10834 | #: builtin/branch.c:632 builtin/branch.c:634 |
87cb7997 JX |
10835 | msgid "print only branches that don't contain the commit" |
10836 | msgstr "只打印不包含该提交的分支" | |
10837 | ||
a6cd2cc4 | 10838 | #: builtin/branch.c:637 |
ef317cd5 | 10839 | msgid "Specific git-branch actions:" |
07432cef | 10840 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 10841 | |
a6cd2cc4 | 10842 | #: builtin/branch.c:638 |
ef317cd5 | 10843 | msgid "list both remote-tracking and local branches" |
07432cef | 10844 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 10845 | |
a6cd2cc4 | 10846 | #: builtin/branch.c:640 |
ef317cd5 | 10847 | msgid "delete fully merged branch" |
07432cef | 10848 | msgstr "删除完全合并的分支" |
c04f5ac3 | 10849 | |
a6cd2cc4 | 10850 | #: builtin/branch.c:641 |
ef317cd5 | 10851 | msgid "delete branch (even if not merged)" |
07432cef | 10852 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 10853 | |
a6cd2cc4 | 10854 | #: builtin/branch.c:642 |
ef317cd5 | 10855 | msgid "move/rename a branch and its reflog" |
07432cef | 10856 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 10857 | |
a6cd2cc4 | 10858 | #: builtin/branch.c:643 |
ef317cd5 | 10859 | msgid "move/rename a branch, even if target exists" |
07432cef | 10860 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 10861 | |
a6cd2cc4 | 10862 | #: builtin/branch.c:644 |
6937cb4e JX |
10863 | msgid "copy a branch and its reflog" |
10864 | msgstr "拷贝一个分支和它的引用日志" | |
10865 | ||
a6cd2cc4 | 10866 | #: builtin/branch.c:645 |
6937cb4e JX |
10867 | msgid "copy a branch, even if target exists" |
10868 | msgstr "拷贝一个分支,即使目标已存在" | |
10869 | ||
a6cd2cc4 | 10870 | #: builtin/branch.c:646 |
ef317cd5 | 10871 | msgid "list branch names" |
07432cef | 10872 | msgstr "列出分支名" |
c04f5ac3 | 10873 | |
a6cd2cc4 | 10874 | #: builtin/branch.c:647 |
d46c5519 JX |
10875 | msgid "show current branch name" |
10876 | msgstr "显示当前分支名" | |
10877 | ||
a6cd2cc4 | 10878 | #: builtin/branch.c:648 |
ef317cd5 | 10879 | msgid "create the branch's reflog" |
07432cef | 10880 | msgstr "创建分支的引用日志" |
ef317cd5 | 10881 | |
a6cd2cc4 | 10882 | #: builtin/branch.c:650 |
ef317cd5 | 10883 | msgid "edit the description for the branch" |
07432cef | 10884 | msgstr "标记分支的描述" |
ef317cd5 | 10885 | |
a6cd2cc4 | 10886 | #: builtin/branch.c:651 |
04cb2f28 JX |
10887 | msgid "force creation, move/rename, deletion" |
10888 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 10889 | |
a6cd2cc4 | 10890 | #: builtin/branch.c:652 |
94550ed3 JX |
10891 | msgid "print only branches that are merged" |
10892 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 10893 | |
a6cd2cc4 | 10894 | #: builtin/branch.c:653 |
94550ed3 JX |
10895 | msgid "print only branches that are not merged" |
10896 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 10897 | |
a6cd2cc4 | 10898 | #: builtin/branch.c:654 |
ef317cd5 | 10899 | msgid "list branches in columns" |
07432cef | 10900 | msgstr "以列的方式显示分支" |
ef317cd5 | 10901 | |
349ede6a | 10902 | #: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 |
06991777 | 10903 | #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 |
349ede6a | 10904 | #: builtin/tag.c:434 |
94550ed3 JX |
10905 | msgid "object" |
10906 | msgstr "对象" | |
10907 | ||
349ede6a | 10908 | #: builtin/branch.c:657 |
94550ed3 JX |
10909 | msgid "print only branches of the object" |
10910 | msgstr "只打印指向该对象的分支" | |
10911 | ||
349ede6a | 10912 | #: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 |
1a79b2f1 JX |
10913 | msgid "sorting and filtering are case insensitive" |
10914 | msgstr "排序和过滤属于大小写不敏感" | |
10915 | ||
349ede6a | 10916 | #: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 |
a6cd2cc4 | 10917 | #: builtin/verify-tag.c:38 |
87cb7997 JX |
10918 | msgid "format to use for the output" |
10919 | msgstr "输出格式" | |
10920 | ||
349ede6a | 10921 | #: builtin/branch.c:682 builtin/clone.c:789 |
c04f5ac3 | 10922 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 10923 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 10924 | |
349ede6a | 10925 | #: builtin/branch.c:706 |
8ada9598 | 10926 | msgid "--column and --verbose are incompatible" |
81809b99 | 10927 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 10928 | |
349ede6a | 10929 | #: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 |
a77c07d9 JX |
10930 | msgid "branch name required" |
10931 | msgstr "必须提供分支名" | |
10932 | ||
349ede6a | 10933 | #: builtin/branch.c:751 |
a77c07d9 JX |
10934 | msgid "Cannot give description to detached HEAD" |
10935 | msgstr "不能向分离头指针提供描述" | |
10936 | ||
349ede6a | 10937 | #: builtin/branch.c:756 |
a77c07d9 JX |
10938 | msgid "cannot edit description of more than one branch" |
10939 | msgstr "不能为一个以上的分支编辑描述" | |
10940 | ||
349ede6a | 10941 | #: builtin/branch.c:763 |
a77c07d9 JX |
10942 | #, c-format |
10943 | msgid "No commit on branch '%s' yet." | |
10944 | msgstr "分支 '%s' 尚无提交。" | |
10945 | ||
349ede6a | 10946 | #: builtin/branch.c:766 |
a77c07d9 JX |
10947 | #, c-format |
10948 | msgid "No branch named '%s'." | |
10949 | msgstr "没有分支 '%s'。" | |
10950 | ||
349ede6a | 10951 | #: builtin/branch.c:781 |
6937cb4e JX |
10952 | msgid "too many branches for a copy operation" |
10953 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 10954 | |
349ede6a | 10955 | #: builtin/branch.c:790 |
6937cb4e JX |
10956 | msgid "too many arguments for a rename operation" |
10957 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 10958 | |
349ede6a | 10959 | #: builtin/branch.c:795 |
6937cb4e JX |
10960 | msgid "too many arguments to set new upstream" |
10961 | msgstr "为设置新上游提供了太多的参数" | |
10962 | ||
349ede6a | 10963 | #: builtin/branch.c:799 |
1003b3a5 JX |
10964 | #, c-format |
10965 | msgid "" | |
10966 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
10967 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
10968 | ||
349ede6a | 10969 | #: builtin/branch.c:802 builtin/branch.c:825 |
1003b3a5 JX |
10970 | #, c-format |
10971 | msgid "no such branch '%s'" | |
10972 | msgstr "没有此分支 '%s'" | |
10973 | ||
349ede6a | 10974 | #: builtin/branch.c:806 |
07432cef | 10975 | #, c-format |
ef317cd5 | 10976 | msgid "branch '%s' does not exist" |
07432cef | 10977 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 10978 | |
349ede6a | 10979 | #: builtin/branch.c:819 |
6937cb4e JX |
10980 | msgid "too many arguments to unset upstream" |
10981 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 10982 | |
349ede6a | 10983 | #: builtin/branch.c:823 |
1003b3a5 JX |
10984 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
10985 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
10986 | ||
349ede6a | 10987 | #: builtin/branch.c:829 |
ef317cd5 JX |
10988 | #, c-format |
10989 | msgid "Branch '%s' has no upstream information" | |
07432cef | 10990 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 10991 | |
349ede6a | 10992 | #: builtin/branch.c:839 |
a6cd2cc4 JX |
10993 | msgid "" |
10994 | "The -a, and -r, options to 'git branch' do not take a branch name.\n" | |
10995 | "Did you mean to use: -a|-r --list <pattern>?" | |
10996 | msgstr "" | |
10997 | "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" | |
10998 | "您是否想要使用:-a|-r --list <模式>?" | |
c04f5ac3 | 10999 | |
349ede6a | 11000 | #: builtin/branch.c:843 |
ddc12c42 JX |
11001 | msgid "" |
11002 | "the '--set-upstream' option is no longer supported. Please use '--track' or " | |
11003 | "'--set-upstream-to' instead." | |
11004 | msgstr "" | |
11005 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" | |
11006 | ||
11007 | #: builtin/bundle.c:15 builtin/bundle.c:23 | |
11008 | msgid "git bundle create [<options>] <file> <git-rev-list args>" | |
11009 | msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" | |
11010 | ||
11011 | #: builtin/bundle.c:16 builtin/bundle.c:28 | |
11012 | msgid "git bundle verify [<options>] <file>" | |
11013 | msgstr "git bundle verify [<选项>] <文件>" | |
11014 | ||
11015 | #: builtin/bundle.c:17 builtin/bundle.c:33 | |
11016 | msgid "git bundle list-heads <file> [<refname>...]" | |
11017 | msgstr "git bundle list-heads <文件> [<引用名>...]" | |
11018 | ||
11019 | #: builtin/bundle.c:18 builtin/bundle.c:38 | |
11020 | msgid "git bundle unbundle <file> [<refname>...]" | |
11021 | msgstr "git bundle unbundle <文件> [<引用名>...]" | |
11022 | ||
7157c2b5 | 11023 | #: builtin/bundle.c:66 builtin/pack-objects.c:3448 |
ddc12c42 JX |
11024 | msgid "do not show progress meter" |
11025 | msgstr "不显示进度表" | |
11026 | ||
7157c2b5 | 11027 | #: builtin/bundle.c:68 builtin/pack-objects.c:3450 |
ddc12c42 JX |
11028 | msgid "show progress meter" |
11029 | msgstr "显示进度表" | |
11030 | ||
7157c2b5 | 11031 | #: builtin/bundle.c:70 builtin/pack-objects.c:3452 |
ddc12c42 JX |
11032 | msgid "show progress meter during object writing phase" |
11033 | msgstr "在对象写入阶段显示进度表" | |
11034 | ||
7157c2b5 | 11035 | #: builtin/bundle.c:73 builtin/pack-objects.c:3455 |
ddc12c42 JX |
11036 | msgid "similar to --all-progress when progress meter is shown" |
11037 | msgstr "当进度表显示时类似于 --all-progress" | |
ef317cd5 | 11038 | |
ddc12c42 JX |
11039 | #: builtin/bundle.c:93 |
11040 | msgid "Need a repository to create a bundle." | |
11041 | msgstr "需要一个仓库来创建包。" | |
11042 | ||
11043 | #: builtin/bundle.c:104 | |
11044 | msgid "do not show bundle details" | |
11045 | msgstr "不显示 bundle 细节" | |
11046 | ||
11047 | #: builtin/bundle.c:119 | |
c04f5ac3 JX |
11048 | #, c-format |
11049 | msgid "%s is okay\n" | |
11050 | msgstr "%s 可以\n" | |
11051 | ||
ddc12c42 | 11052 | #: builtin/bundle.c:160 |
c04f5ac3 | 11053 | msgid "Need a repository to unbundle." |
160fb2b2 | 11054 | msgstr "需要一个仓库来解包。" |
c04f5ac3 | 11055 | |
2b472aae | 11056 | #: builtin/bundle.c:168 builtin/remote.c:1686 |
ddc12c42 JX |
11057 | msgid "be verbose; must be placed before a subcommand" |
11058 | msgstr "冗长输出;必须置于子命令之前" | |
11059 | ||
2b472aae | 11060 | #: builtin/bundle.c:190 builtin/remote.c:1717 |
ddc12c42 JX |
11061 | #, c-format |
11062 | msgid "Unknown subcommand: %s" | |
11063 | msgstr "未知子命令:%s" | |
11064 | ||
349ede6a | 11065 | #: builtin/cat-file.c:598 |
7aea43ff | 11066 | msgid "" |
a0b6b246 JX |
11067 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
11068 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
11069 | msgstr "" |
11070 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
11071 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 11072 | |
349ede6a | 11073 | #: builtin/cat-file.c:599 |
a0b6b246 | 11074 | msgid "" |
7157c2b5 JX |
11075 | "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" |
11076 | "symlinks] [--textconv | --filters]" | |
11077 | msgstr "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] [--textconv | --filters]" | |
ef317cd5 | 11078 | |
349ede6a | 11079 | #: builtin/cat-file.c:620 |
4c27fcb5 JX |
11080 | msgid "only one batch option may be specified" |
11081 | msgstr "只能指定一个批处理选项" | |
11082 | ||
349ede6a | 11083 | #: builtin/cat-file.c:638 |
ef317cd5 | 11084 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 11085 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 11086 | |
349ede6a | 11087 | #: builtin/cat-file.c:639 |
ef317cd5 | 11088 | msgid "show object type" |
07432cef | 11089 | msgstr "显示对象类型" |
ef317cd5 | 11090 | |
349ede6a | 11091 | #: builtin/cat-file.c:640 |
ef317cd5 | 11092 | msgid "show object size" |
07432cef | 11093 | msgstr "显示对象大小" |
ef317cd5 | 11094 | |
349ede6a | 11095 | #: builtin/cat-file.c:642 |
ef317cd5 | 11096 | msgid "exit with zero when there's no error" |
07432cef | 11097 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 11098 | |
349ede6a | 11099 | #: builtin/cat-file.c:643 |
ef317cd5 | 11100 | msgid "pretty-print object's content" |
07432cef | 11101 | msgstr "美观地打印对象的内容" |
ef317cd5 | 11102 | |
349ede6a | 11103 | #: builtin/cat-file.c:645 |
ef317cd5 | 11104 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
11105 | msgstr "对于数据对象,对其内容做文本转换" |
11106 | ||
349ede6a | 11107 | #: builtin/cat-file.c:647 |
a0b6b246 JX |
11108 | msgid "for blob objects, run filters on object's content" |
11109 | msgstr "对于数据对象,对其内容做过滤" | |
11110 | ||
7157c2b5 | 11111 | #: builtin/cat-file.c:648 git-submodule.sh:958 |
a0b6b246 JX |
11112 | msgid "blob" |
11113 | msgstr "数据对象" | |
11114 | ||
349ede6a | 11115 | #: builtin/cat-file.c:649 |
a0b6b246 JX |
11116 | msgid "use a specific path for --textconv/--filters" |
11117 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 11118 | |
349ede6a | 11119 | #: builtin/cat-file.c:651 |
7aea43ff JX |
11120 | msgid "allow -s and -t to work with broken/corrupt objects" |
11121 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
11122 | ||
349ede6a | 11123 | #: builtin/cat-file.c:652 |
1b7f4a34 JX |
11124 | msgid "buffer --batch output" |
11125 | msgstr "缓冲 --batch 的输出" | |
11126 | ||
349ede6a | 11127 | #: builtin/cat-file.c:654 |
ef317cd5 | 11128 | msgid "show info and content of objects fed from the standard input" |
07432cef | 11129 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 11130 | |
349ede6a | 11131 | #: builtin/cat-file.c:658 |
ef317cd5 | 11132 | msgid "show info about objects fed from the standard input" |
07432cef | 11133 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 11134 | |
349ede6a | 11135 | #: builtin/cat-file.c:662 |
7aea43ff JX |
11136 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
11137 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
11138 | ||
349ede6a | 11139 | #: builtin/cat-file.c:664 |
1b7f4a34 JX |
11140 | msgid "show all objects with --batch or --batch-check" |
11141 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
11142 | ||
349ede6a | 11143 | #: builtin/cat-file.c:666 |
c1ac5258 JX |
11144 | msgid "do not order --batch-all-objects output" |
11145 | msgstr "不要对 --batch-all-objects 的输出排序" | |
11146 | ||
06991777 | 11147 | #: builtin/check-attr.c:13 |
814ff314 JX |
11148 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
11149 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 11150 | |
06991777 | 11151 | #: builtin/check-attr.c:14 |
94550ed3 JX |
11152 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
11153 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 11154 | |
06991777 | 11155 | #: builtin/check-attr.c:21 |
ef317cd5 | 11156 | msgid "report all attributes set on file" |
07432cef | 11157 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 11158 | |
06991777 | 11159 | #: builtin/check-attr.c:22 |
ef317cd5 | 11160 | msgid "use .gitattributes only from the index" |
07432cef | 11161 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 11162 | |
06991777 | 11163 | #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 |
ef317cd5 | 11164 | msgid "read file names from stdin" |
07432cef | 11165 | msgstr "从标准输入读出文件名" |
ef317cd5 | 11166 | |
06991777 | 11167 | #: builtin/check-attr.c:25 builtin/check-ignore.c:27 |
90314792 JX |
11168 | msgid "terminate input and output records by a NUL character" |
11169 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 11170 | |
7157c2b5 JX |
11171 | #: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 |
11172 | #: builtin/worktree.c:561 | |
a77c07d9 JX |
11173 | msgid "suppress progress reporting" |
11174 | msgstr "不显示进度报告" | |
11175 | ||
06991777 | 11176 | #: builtin/check-ignore.c:29 |
2e8451e8 JX |
11177 | msgid "show non-matching input paths" |
11178 | msgstr "显示未匹配的输入路径" | |
11179 | ||
06991777 | 11180 | #: builtin/check-ignore.c:31 |
90314792 JX |
11181 | msgid "ignore index when checking" |
11182 | msgstr "检查时忽略索引" | |
11183 | ||
2b472aae | 11184 | #: builtin/check-ignore.c:163 |
a77c07d9 | 11185 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 11186 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 11187 | |
2b472aae | 11188 | #: builtin/check-ignore.c:166 |
a77c07d9 JX |
11189 | msgid "-z only makes sense with --stdin" |
11190 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
11191 | ||
2b472aae | 11192 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
11193 | msgid "no path specified" |
11194 | msgstr "未指定路径" | |
11195 | ||
2b472aae | 11196 | #: builtin/check-ignore.c:172 |
a77c07d9 JX |
11197 | msgid "--quiet is only valid with a single pathname" |
11198 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
11199 | ||
2b472aae | 11200 | #: builtin/check-ignore.c:174 |
a77c07d9 JX |
11201 | msgid "cannot have both --quiet and --verbose" |
11202 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
11203 | ||
2b472aae | 11204 | #: builtin/check-ignore.c:177 |
2e8451e8 JX |
11205 | msgid "--non-matching is only valid with --verbose" |
11206 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
11207 | ||
a4f16749 | 11208 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
11209 | msgid "git check-mailmap [<options>] <contact>..." |
11210 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 11211 | |
a4f16749 | 11212 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
11213 | msgid "also read contacts from stdin" |
11214 | msgstr "还从标准输入读取联系地址" | |
11215 | ||
a4f16749 | 11216 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
11217 | #, c-format |
11218 | msgid "unable to parse contact: %s" | |
11219 | msgstr "不能解析联系地址:%s" | |
11220 | ||
a4f16749 | 11221 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
11222 | msgid "no contacts specified" |
11223 | msgstr "未指定联系地址" | |
11224 | ||
06991777 | 11225 | #: builtin/checkout-index.c:131 |
814ff314 JX |
11226 | msgid "git checkout-index [<options>] [--] [<file>...]" |
11227 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 11228 | |
06991777 | 11229 | #: builtin/checkout-index.c:148 |
276ceeaa JX |
11230 | msgid "stage should be between 1 and 3 or all" |
11231 | msgstr "索引值应该取值 1 到 3 或者 all" | |
11232 | ||
06991777 | 11233 | #: builtin/checkout-index.c:164 |
ef317cd5 | 11234 | msgid "check out all files in the index" |
07432cef | 11235 | msgstr "检出索引区的所有文件" |
ef317cd5 | 11236 | |
06991777 | 11237 | #: builtin/checkout-index.c:165 |
ef317cd5 | 11238 | msgid "force overwrite of existing files" |
07432cef | 11239 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 11240 | |
06991777 | 11241 | #: builtin/checkout-index.c:167 |
ef317cd5 | 11242 | msgid "no warning for existing files and files not in index" |
07432cef | 11243 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 11244 | |
06991777 | 11245 | #: builtin/checkout-index.c:169 |
ef317cd5 | 11246 | msgid "don't checkout new files" |
07432cef | 11247 | msgstr "不检出新文件" |
ef317cd5 | 11248 | |
06991777 | 11249 | #: builtin/checkout-index.c:171 |
ef317cd5 | 11250 | msgid "update stat information in the index file" |
07432cef | 11251 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 11252 | |
06991777 | 11253 | #: builtin/checkout-index.c:175 |
ef317cd5 | 11254 | msgid "read list of paths from the standard input" |
07432cef | 11255 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 11256 | |
06991777 | 11257 | #: builtin/checkout-index.c:177 |
ef317cd5 | 11258 | msgid "write the content to temporary files" |
07432cef | 11259 | msgstr "将内容写入临时文件" |
ef317cd5 | 11260 | |
06991777 | 11261 | #: builtin/checkout-index.c:178 builtin/column.c:31 |
2b472aae JX |
11262 | #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 |
11263 | #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 | |
7157c2b5 | 11264 | #: builtin/worktree.c:754 |
ef317cd5 | 11265 | msgid "string" |
07432cef | 11266 | msgstr "字符串" |
ef317cd5 | 11267 | |
06991777 | 11268 | #: builtin/checkout-index.c:179 |
ef317cd5 | 11269 | msgid "when creating files, prepend <string>" |
4375c10e | 11270 | msgstr "在创建文件时,在前面加上 <字符串>" |
ef317cd5 | 11271 | |
06991777 | 11272 | #: builtin/checkout-index.c:181 |
ef317cd5 | 11273 | msgid "copy out the files from named stage" |
07432cef | 11274 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 11275 | |
a6cd2cc4 | 11276 | #: builtin/checkout.c:31 |
814ff314 JX |
11277 | msgid "git checkout [<options>] <branch>" |
11278 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 11279 | |
a6cd2cc4 | 11280 | #: builtin/checkout.c:32 |
814ff314 JX |
11281 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
11282 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 11283 | |
a6cd2cc4 JX |
11284 | #: builtin/checkout.c:37 |
11285 | msgid "git switch [<options>] [<branch>]" | |
11286 | msgstr "git switch [<选项>] [<分支>]" | |
11287 | ||
11288 | #: builtin/checkout.c:42 | |
11289 | msgid "git restore [<options>] [--source=<branch>] <file>..." | |
11290 | msgstr "git restore [<选项>] [--source=<分支>] <文件>..." | |
11291 | ||
349ede6a | 11292 | #: builtin/checkout.c:188 builtin/checkout.c:227 |
c04f5ac3 JX |
11293 | #, c-format |
11294 | msgid "path '%s' does not have our version" | |
11295 | msgstr "路径 '%s' 没有我们的版本" | |
11296 | ||
349ede6a | 11297 | #: builtin/checkout.c:190 builtin/checkout.c:229 |
c04f5ac3 JX |
11298 | #, c-format |
11299 | msgid "path '%s' does not have their version" | |
11300 | msgstr "路径 '%s' 没有他们的版本" | |
11301 | ||
349ede6a | 11302 | #: builtin/checkout.c:206 |
c04f5ac3 JX |
11303 | #, c-format |
11304 | msgid "path '%s' does not have all necessary versions" | |
e640d114 | 11305 | msgstr "路径 '%s' 没有全部必需的版本" |
c04f5ac3 | 11306 | |
349ede6a | 11307 | #: builtin/checkout.c:256 |
c04f5ac3 JX |
11308 | #, c-format |
11309 | msgid "path '%s' does not have necessary versions" | |
e640d114 | 11310 | msgstr "路径 '%s' 没有必需的版本" |
c04f5ac3 | 11311 | |
349ede6a | 11312 | #: builtin/checkout.c:274 |
c04f5ac3 JX |
11313 | #, c-format |
11314 | msgid "path '%s': cannot merge" | |
90e6ef53 | 11315 | msgstr "path '%s':无法合并" |
c04f5ac3 | 11316 | |
349ede6a | 11317 | #: builtin/checkout.c:290 |
c04f5ac3 JX |
11318 | #, c-format |
11319 | msgid "Unable to add merge result for '%s'" | |
11320 | msgstr "无法为 '%s' 添加合并结果" | |
11321 | ||
349ede6a | 11322 | #: builtin/checkout.c:395 |
a6cd2cc4 JX |
11323 | #, c-format |
11324 | msgid "Recreated %d merge conflict" | |
11325 | msgid_plural "Recreated %d merge conflicts" | |
11326 | msgstr[0] "重新创建了 %d 个合并冲突" | |
11327 | msgstr[1] "重新创建了 %d 个合并冲突" | |
11328 | ||
349ede6a | 11329 | #: builtin/checkout.c:400 |
a6cd2cc4 JX |
11330 | #, c-format |
11331 | msgid "Updated %d path from %s" | |
11332 | msgid_plural "Updated %d paths from %s" | |
11333 | msgstr[0] "从 %2$s 更新了 %1$d 个路径" | |
11334 | msgstr[1] "从 %2$s 更新了 %1$d 个路径" | |
11335 | ||
349ede6a | 11336 | #: builtin/checkout.c:407 |
a6cd2cc4 JX |
11337 | #, c-format |
11338 | msgid "Updated %d path from the index" | |
11339 | msgid_plural "Updated %d paths from the index" | |
11340 | msgstr[0] "从索引区更新了 %d 个路径" | |
11341 | msgstr[1] "从索引区更新了 %d 个路径" | |
11342 | ||
349ede6a JX |
11343 | #: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 |
11344 | #: builtin/checkout.c:440 | |
07432cef | 11345 | #, c-format |
ef317cd5 | 11346 | msgid "'%s' cannot be used with updating paths" |
07432cef | 11347 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 11348 | |
349ede6a | 11349 | #: builtin/checkout.c:443 builtin/checkout.c:446 |
07432cef | 11350 | #, c-format |
ef317cd5 | 11351 | msgid "'%s' cannot be used with %s" |
07432cef | 11352 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 11353 | |
349ede6a | 11354 | #: builtin/checkout.c:450 |
ef317cd5 JX |
11355 | #, c-format |
11356 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 11357 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 11358 | |
349ede6a | 11359 | #: builtin/checkout.c:454 |
c04f5ac3 | 11360 | #, c-format |
a6cd2cc4 JX |
11361 | msgid "neither '%s' or '%s' is specified" |
11362 | msgstr "'%s' 或 '%s' 都没有指定" | |
c04f5ac3 | 11363 | |
349ede6a | 11364 | #: builtin/checkout.c:458 |
06991777 | 11365 | #, c-format |
a6cd2cc4 JX |
11366 | msgid "'%s' must be used when '%s' is not specified" |
11367 | msgstr "未指定 '%2$s' 时,必须使用 '%1$s'" | |
06991777 | 11368 | |
349ede6a | 11369 | #: builtin/checkout.c:463 builtin/checkout.c:468 |
06991777 | 11370 | #, c-format |
a6cd2cc4 JX |
11371 | msgid "'%s' or '%s' cannot be used with %s" |
11372 | msgstr "'%s' 或 '%s' 不能和 %s 一起使用" | |
06991777 | 11373 | |
349ede6a | 11374 | #: builtin/checkout.c:527 builtin/checkout.c:534 |
06991777 | 11375 | #, c-format |
a6cd2cc4 JX |
11376 | msgid "path '%s' is unmerged" |
11377 | msgstr "路径 '%s' 未合并" | |
06991777 | 11378 | |
7157c2b5 | 11379 | #: builtin/checkout.c:702 |
c04f5ac3 | 11380 | msgid "you need to resolve your current index first" |
90e6ef53 | 11381 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 11382 | |
7157c2b5 | 11383 | #: builtin/checkout.c:756 |
d46c5519 JX |
11384 | #, c-format |
11385 | msgid "" | |
11386 | "cannot continue with staged changes in the following files:\n" | |
11387 | "%s" | |
11388 | msgstr "" | |
11389 | "不能继续,下列文件有暂存的修改:\n" | |
11390 | "%s" | |
11391 | ||
7157c2b5 | 11392 | #: builtin/checkout.c:859 |
c04f5ac3 | 11393 | #, c-format |
1b7f4a34 JX |
11394 | msgid "Can not do reflog for '%s': %s\n" |
11395 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 11396 | |
7157c2b5 | 11397 | #: builtin/checkout.c:901 |
c04f5ac3 JX |
11398 | msgid "HEAD is now at" |
11399 | msgstr "HEAD 目前位于" | |
11400 | ||
7157c2b5 | 11401 | #: builtin/checkout.c:905 builtin/clone.c:720 |
3495628d JX |
11402 | msgid "unable to update HEAD" |
11403 | msgstr "不能更新 HEAD" | |
11404 | ||
7157c2b5 | 11405 | #: builtin/checkout.c:909 |
c04f5ac3 JX |
11406 | #, c-format |
11407 | msgid "Reset branch '%s'\n" | |
11408 | msgstr "重置分支 '%s'\n" | |
11409 | ||
7157c2b5 | 11410 | #: builtin/checkout.c:912 |
c04f5ac3 JX |
11411 | #, c-format |
11412 | msgid "Already on '%s'\n" | |
11413 | msgstr "已经位于 '%s'\n" | |
11414 | ||
7157c2b5 | 11415 | #: builtin/checkout.c:916 |
c04f5ac3 JX |
11416 | #, c-format |
11417 | msgid "Switched to and reset branch '%s'\n" | |
11418 | msgstr "切换并重置分支 '%s'\n" | |
11419 | ||
7157c2b5 | 11420 | #: builtin/checkout.c:918 builtin/checkout.c:1342 |
c04f5ac3 JX |
11421 | #, c-format |
11422 | msgid "Switched to a new branch '%s'\n" | |
11423 | msgstr "切换到一个新分支 '%s'\n" | |
11424 | ||
7157c2b5 | 11425 | #: builtin/checkout.c:920 |
c04f5ac3 JX |
11426 | #, c-format |
11427 | msgid "Switched to branch '%s'\n" | |
11428 | msgstr "切换到分支 '%s'\n" | |
11429 | ||
90e6ef53 | 11430 | # 译者:注意保持前导空格 |
7157c2b5 | 11431 | #: builtin/checkout.c:971 |
c04f5ac3 JX |
11432 | #, c-format |
11433 | msgid " ... and %d more.\n" | |
90e6ef53 | 11434 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 11435 | |
7157c2b5 | 11436 | #: builtin/checkout.c:977 |
c04f5ac3 JX |
11437 | #, c-format |
11438 | msgid "" | |
11439 | "Warning: you are leaving %d commit behind, not connected to\n" | |
11440 | "any of your branches:\n" | |
11441 | "\n" | |
11442 | "%s\n" | |
11443 | msgid_plural "" | |
11444 | "Warning: you are leaving %d commits behind, not connected to\n" | |
11445 | "any of your branches:\n" | |
11446 | "\n" | |
11447 | "%s\n" | |
11448 | msgstr[0] "" | |
11449 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
11450 | "\n" | |
11451 | "%s\n" | |
5ae481e0 JX |
11452 | msgstr[1] "" |
11453 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
11454 | "\n" | |
11455 | "%s\n" | |
c04f5ac3 | 11456 | |
7157c2b5 | 11457 | #: builtin/checkout.c:996 |
c04f5ac3 JX |
11458 | #, c-format |
11459 | msgid "" | |
7aea43ff JX |
11460 | "If you want to keep it by creating a new branch, this may be a good time\n" |
11461 | "to do so with:\n" | |
11462 | "\n" | |
11463 | " git branch <new-branch-name> %s\n" | |
11464 | "\n" | |
11465 | msgid_plural "" | |
c04f5ac3 JX |
11466 | "If you want to keep them by creating a new branch, this may be a good time\n" |
11467 | "to do so with:\n" | |
11468 | "\n" | |
814ff314 | 11469 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 11470 | "\n" |
7aea43ff JX |
11471 | msgstr[0] "" |
11472 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
11473 | "如下操作:\n" | |
11474 | "\n" | |
11475 | " git branch <新分支名> %s\n" | |
11476 | "\n" | |
11477 | msgstr[1] "" | |
11478 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
11479 | "如下操作:\n" |
11480 | "\n" | |
814ff314 | 11481 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
11482 | "\n" |
11483 | ||
7157c2b5 | 11484 | #: builtin/checkout.c:1031 |
c04f5ac3 JX |
11485 | msgid "internal error in revision walk" |
11486 | msgstr "在版本遍历时遇到内部错误" | |
11487 | ||
7157c2b5 | 11488 | #: builtin/checkout.c:1035 |
c04f5ac3 JX |
11489 | msgid "Previous HEAD position was" |
11490 | msgstr "之前的 HEAD 位置是" | |
11491 | ||
7157c2b5 | 11492 | #: builtin/checkout.c:1075 builtin/checkout.c:1337 |
c04f5ac3 | 11493 | msgid "You are on a branch yet to be born" |
90e6ef53 | 11494 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 11495 | |
7157c2b5 | 11496 | #: builtin/checkout.c:1150 |
06991777 JX |
11497 | #, c-format |
11498 | msgid "" | |
11499 | "'%s' could be both a local file and a tracking branch.\n" | |
11500 | "Please use -- (and optionally --no-guess) to disambiguate" | |
11501 | msgstr "" | |
11502 | "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n" | |
11503 | "请使用 --(和可选的 --no-guess)来消除歧义" | |
11504 | ||
7157c2b5 | 11505 | #: builtin/checkout.c:1157 |
2b472aae JX |
11506 | msgid "" |
11507 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
11508 | "you can do so by fully qualifying the name with the --track option:\n" | |
11509 | "\n" | |
11510 | " git checkout --track origin/<name>\n" | |
11511 | "\n" | |
11512 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
11513 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
11514 | "checkout.defaultRemote=origin in your config." | |
11515 | msgstr "" | |
11516 | "如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n" | |
11517 | "全名和 --track 选项:\n" | |
11518 | "\n" | |
440e7442 | 11519 | " git checkout --track origin/<名称>\n" |
2b472aae | 11520 | "\n" |
440e7442 | 11521 | "如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n" |
2b472aae JX |
11522 | "名称,可以在配置中设置 checkout.defaultRemote=origin。" |
11523 | ||
7157c2b5 | 11524 | #: builtin/checkout.c:1167 |
2b472aae JX |
11525 | #, c-format |
11526 | msgid "'%s' matched multiple (%d) remote tracking branches" | |
440e7442 | 11527 | msgstr "'%s' 匹配多个(%d 个)远程跟踪分支" |
2b472aae | 11528 | |
7157c2b5 | 11529 | #: builtin/checkout.c:1233 |
2b472aae | 11530 | msgid "only one reference expected" |
440e7442 | 11531 | msgstr "只期望一个引用" |
2b472aae | 11532 | |
7157c2b5 | 11533 | #: builtin/checkout.c:1250 |
2b472aae JX |
11534 | #, c-format |
11535 | msgid "only one reference expected, %d given." | |
11536 | msgstr "应只有一个引用,却给出了 %d 个" | |
11537 | ||
7157c2b5 | 11538 | #: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 |
c04f5ac3 JX |
11539 | #, c-format |
11540 | msgid "invalid reference: %s" | |
11541 | msgstr "无效引用:%s" | |
11542 | ||
7157c2b5 | 11543 | #: builtin/checkout.c:1309 builtin/checkout.c:1675 |
c04f5ac3 JX |
11544 | #, c-format |
11545 | msgid "reference is not a tree: %s" | |
11546 | msgstr "引用不是一个树:%s" | |
11547 | ||
7157c2b5 | 11548 | #: builtin/checkout.c:1356 |
a6cd2cc4 JX |
11549 | #, c-format |
11550 | msgid "a branch is expected, got tag '%s'" | |
11551 | msgstr "期望一个分支,得到标签 '%s'" | |
11552 | ||
7157c2b5 | 11553 | #: builtin/checkout.c:1358 |
a6cd2cc4 JX |
11554 | #, c-format |
11555 | msgid "a branch is expected, got remote branch '%s'" | |
11556 | msgstr "期望一个分支,得到远程分支 '%s'" | |
11557 | ||
7157c2b5 | 11558 | #: builtin/checkout.c:1359 builtin/checkout.c:1367 |
a6cd2cc4 JX |
11559 | #, c-format |
11560 | msgid "a branch is expected, got '%s'" | |
11561 | msgstr "期望一个分支,得到 '%s'" | |
11562 | ||
7157c2b5 | 11563 | #: builtin/checkout.c:1362 |
a6cd2cc4 JX |
11564 | #, c-format |
11565 | msgid "a branch is expected, got commit '%s'" | |
11566 | msgstr "期望一个分支,得到提交 '%s'" | |
11567 | ||
7157c2b5 | 11568 | #: builtin/checkout.c:1378 |
a6cd2cc4 JX |
11569 | msgid "" |
11570 | "cannot switch branch while merging\n" | |
11571 | "Consider \"git merge --quit\" or \"git worktree add\"." | |
11572 | msgstr "" | |
11573 | "不能在合并时切换分支\n" | |
11574 | "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" | |
11575 | ||
7157c2b5 | 11576 | #: builtin/checkout.c:1382 |
a6cd2cc4 JX |
11577 | msgid "" |
11578 | "cannot switch branch in the middle of an am session\n" | |
11579 | "Consider \"git am --quit\" or \"git worktree add\"." | |
11580 | msgstr "" | |
11581 | "不能在一个 am 会话期间切换分支\n" | |
11582 | "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" | |
11583 | ||
7157c2b5 | 11584 | #: builtin/checkout.c:1386 |
a6cd2cc4 JX |
11585 | msgid "" |
11586 | "cannot switch branch while rebasing\n" | |
11587 | "Consider \"git rebase --quit\" or \"git worktree add\"." | |
11588 | msgstr "" | |
11589 | "不能在变基时切换分支\n" | |
11590 | "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" | |
11591 | ||
7157c2b5 | 11592 | #: builtin/checkout.c:1390 |
a6cd2cc4 JX |
11593 | msgid "" |
11594 | "cannot switch branch while cherry-picking\n" | |
11595 | "Consider \"git cherry-pick --quit\" or \"git worktree add\"." | |
11596 | msgstr "" | |
11597 | "不能在拣选时切换分支\n" | |
11598 | "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" | |
11599 | ||
7157c2b5 | 11600 | #: builtin/checkout.c:1394 |
a6cd2cc4 JX |
11601 | msgid "" |
11602 | "cannot switch branch while reverting\n" | |
11603 | "Consider \"git revert --quit\" or \"git worktree add\"." | |
11604 | msgstr "" | |
11605 | "不能在还原时切换分支\n" | |
11606 | "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" | |
11607 | ||
7157c2b5 | 11608 | #: builtin/checkout.c:1398 |
a6cd2cc4 JX |
11609 | msgid "you are switching branch while bisecting" |
11610 | msgstr "您在执行二分查找时切换分支" | |
11611 | ||
7157c2b5 | 11612 | #: builtin/checkout.c:1405 |
ef317cd5 | 11613 | msgid "paths cannot be used with switching branches" |
07432cef | 11614 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 11615 | |
7157c2b5 | 11616 | #: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 |
07432cef | 11617 | #, c-format |
ef317cd5 | 11618 | msgid "'%s' cannot be used with switching branches" |
07432cef | 11619 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 11620 | |
7157c2b5 JX |
11621 | #: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 |
11622 | #: builtin/checkout.c:1431 builtin/checkout.c:1436 | |
07432cef | 11623 | #, c-format |
ef317cd5 | 11624 | msgid "'%s' cannot be used with '%s'" |
07432cef | 11625 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 11626 | |
7157c2b5 | 11627 | #: builtin/checkout.c:1433 |
a6cd2cc4 JX |
11628 | #, c-format |
11629 | msgid "'%s' cannot take <start-point>" | |
11630 | msgstr "'%s' 不带 <起始点>" | |
11631 | ||
7157c2b5 | 11632 | #: builtin/checkout.c:1441 |
07432cef | 11633 | #, c-format |
ef317cd5 | 11634 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 11635 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 11636 | |
7157c2b5 | 11637 | #: builtin/checkout.c:1448 |
a6cd2cc4 JX |
11638 | msgid "missing branch or commit argument" |
11639 | msgstr "缺少分支或提交参数" | |
c04f5ac3 | 11640 | |
7157c2b5 JX |
11641 | #: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 |
11642 | #: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 | |
349ede6a JX |
11643 | #: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 |
11644 | #: builtin/send-pack.c:173 | |
a6cd2cc4 JX |
11645 | msgid "force progress reporting" |
11646 | msgstr "强制显示进度报告" | |
c04f5ac3 | 11647 | |
7157c2b5 | 11648 | #: builtin/checkout.c:1491 |
a6cd2cc4 JX |
11649 | msgid "perform a 3-way merge with the new branch" |
11650 | msgstr "和新的分支执行三方合并" | |
c04f5ac3 | 11651 | |
7157c2b5 | 11652 | #: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 |
a6cd2cc4 JX |
11653 | msgid "style" |
11654 | msgstr "风格" | |
ef317cd5 | 11655 | |
7157c2b5 | 11656 | #: builtin/checkout.c:1493 |
a6cd2cc4 JX |
11657 | msgid "conflict style (merge or diff3)" |
11658 | msgstr "冲突输出风格(merge 或 diff3)" | |
11659 | ||
7157c2b5 | 11660 | #: builtin/checkout.c:1505 builtin/worktree.c:558 |
5c57d762 JX |
11661 | msgid "detach HEAD at named commit" |
11662 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 11663 | |
7157c2b5 | 11664 | #: builtin/checkout.c:1506 |
ef317cd5 | 11665 | msgid "set upstream info for new branch" |
07432cef | 11666 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 11667 | |
7157c2b5 | 11668 | #: builtin/checkout.c:1508 |
a6cd2cc4 JX |
11669 | msgid "force checkout (throw away local modifications)" |
11670 | msgstr "强制检出(丢弃本地修改)" | |
11671 | ||
7157c2b5 | 11672 | #: builtin/checkout.c:1510 |
6c94aba5 | 11673 | msgid "new-branch" |
07432cef | 11674 | msgstr "新分支" |
ef317cd5 | 11675 | |
7157c2b5 | 11676 | #: builtin/checkout.c:1510 |
ef317cd5 | 11677 | msgid "new unparented branch" |
07432cef | 11678 | msgstr "新的没有父提交的分支" |
ef317cd5 | 11679 | |
7157c2b5 | 11680 | #: builtin/checkout.c:1512 builtin/merge.c:292 |
a6cd2cc4 JX |
11681 | msgid "update ignored files (default)" |
11682 | msgstr "更新忽略的文件(默认)" | |
11683 | ||
7157c2b5 | 11684 | #: builtin/checkout.c:1515 |
a6cd2cc4 JX |
11685 | msgid "do not check if another worktree is holding the given ref" |
11686 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
11687 | ||
7157c2b5 | 11688 | #: builtin/checkout.c:1528 |
ef317cd5 | 11689 | msgid "checkout our version for unmerged files" |
07432cef | 11690 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 11691 | |
7157c2b5 | 11692 | #: builtin/checkout.c:1531 |
ef317cd5 | 11693 | msgid "checkout their version for unmerged files" |
07432cef | 11694 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 11695 | |
7157c2b5 | 11696 | #: builtin/checkout.c:1535 |
4dcdc3d8 JX |
11697 | msgid "do not limit pathspecs to sparse entries only" |
11698 | msgstr "对路径不做稀疏检出的限制" | |
11699 | ||
7157c2b5 | 11700 | #: builtin/checkout.c:1590 |
349ede6a JX |
11701 | #, c-format |
11702 | msgid "-%c, -%c and --orphan are mutually exclusive" | |
11703 | msgstr "-%c、-%c 和 --orphan 是互斥的" | |
ef317cd5 | 11704 | |
7157c2b5 | 11705 | #: builtin/checkout.c:1594 |
d46c5519 JX |
11706 | msgid "-p and --overlay are mutually exclusive" |
11707 | msgstr "-p 和 --overlay 互斥" | |
11708 | ||
7157c2b5 | 11709 | #: builtin/checkout.c:1631 |
ef317cd5 JX |
11710 | msgid "--track needs a branch name" |
11711 | msgstr "--track 需要一个分支名" | |
11712 | ||
7157c2b5 | 11713 | #: builtin/checkout.c:1636 |
349ede6a JX |
11714 | #, c-format |
11715 | msgid "missing branch name; try -%c" | |
11716 | msgstr "缺少分支名,尝试 -%c" | |
ef317cd5 | 11717 | |
7157c2b5 | 11718 | #: builtin/checkout.c:1668 |
a6cd2cc4 JX |
11719 | #, c-format |
11720 | msgid "could not resolve %s" | |
11721 | msgstr "无法解析 %s" | |
11722 | ||
7157c2b5 | 11723 | #: builtin/checkout.c:1684 |
c04f5ac3 | 11724 | msgid "invalid path specification" |
90e6ef53 | 11725 | msgstr "无效的路径规格" |
c04f5ac3 | 11726 | |
7157c2b5 | 11727 | #: builtin/checkout.c:1691 |
07432cef | 11728 | #, c-format |
a4f16749 JX |
11729 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
11730 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 11731 | |
7157c2b5 | 11732 | #: builtin/checkout.c:1695 |
07432cef | 11733 | #, c-format |
ef317cd5 | 11734 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 11735 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 11736 | |
7157c2b5 | 11737 | #: builtin/checkout.c:1704 |
ddc12c42 JX |
11738 | msgid "--pathspec-from-file is incompatible with --detach" |
11739 | msgstr "--pathspec-from-file 与 --detach 不兼容" | |
11740 | ||
7157c2b5 | 11741 | #: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 |
ddc12c42 JX |
11742 | msgid "--pathspec-from-file is incompatible with --patch" |
11743 | msgstr "--pathspec-from-file 与 --patch 不兼容" | |
11744 | ||
7157c2b5 | 11745 | #: builtin/checkout.c:1718 |
c04f5ac3 JX |
11746 | msgid "" |
11747 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
11748 | "checking out of the index." | |
11749 | msgstr "" | |
90e6ef53 | 11750 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 11751 | |
7157c2b5 | 11752 | #: builtin/checkout.c:1723 |
ddc12c42 JX |
11753 | msgid "you must specify path(s) to restore" |
11754 | msgstr "您必须指定一个要恢复的路径" | |
11755 | ||
7157c2b5 JX |
11756 | #: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 |
11757 | #: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 | |
11758 | #: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 | |
11759 | #: builtin/worktree.c:556 | |
a6cd2cc4 JX |
11760 | msgid "branch" |
11761 | msgstr "分支" | |
11762 | ||
7157c2b5 | 11763 | #: builtin/checkout.c:1750 |
a6cd2cc4 JX |
11764 | msgid "create and checkout a new branch" |
11765 | msgstr "创建并检出一个新的分支" | |
11766 | ||
7157c2b5 | 11767 | #: builtin/checkout.c:1752 |
a6cd2cc4 JX |
11768 | msgid "create/reset and checkout a branch" |
11769 | msgstr "创建/重置并检出一个分支" | |
11770 | ||
7157c2b5 | 11771 | #: builtin/checkout.c:1753 |
a6cd2cc4 JX |
11772 | msgid "create reflog for new branch" |
11773 | msgstr "为新的分支创建引用日志" | |
11774 | ||
7157c2b5 | 11775 | #: builtin/checkout.c:1755 |
a6cd2cc4 JX |
11776 | msgid "second guess 'git checkout <no-such-branch>' (default)" |
11777 | msgstr "二次猜测 'git checkout <无此分支>'(默认)" | |
11778 | ||
7157c2b5 | 11779 | #: builtin/checkout.c:1756 |
a6cd2cc4 JX |
11780 | msgid "use overlay mode (default)" |
11781 | msgstr "使用叠加模式(默认)" | |
11782 | ||
7157c2b5 | 11783 | #: builtin/checkout.c:1801 |
a6cd2cc4 JX |
11784 | msgid "create and switch to a new branch" |
11785 | msgstr "创建并切换一个新分支" | |
11786 | ||
7157c2b5 | 11787 | #: builtin/checkout.c:1803 |
a6cd2cc4 JX |
11788 | msgid "create/reset and switch to a branch" |
11789 | msgstr "创建/重置并切换一个分支" | |
11790 | ||
7157c2b5 | 11791 | #: builtin/checkout.c:1805 |
a6cd2cc4 JX |
11792 | msgid "second guess 'git switch <no-such-branch>'" |
11793 | msgstr "二次猜测 'git switch <无此分支>'" | |
11794 | ||
7157c2b5 | 11795 | #: builtin/checkout.c:1807 |
a6cd2cc4 JX |
11796 | msgid "throw away local modifications" |
11797 | msgstr "丢弃本地修改" | |
11798 | ||
7157c2b5 | 11799 | #: builtin/checkout.c:1841 |
a6cd2cc4 JX |
11800 | msgid "which tree-ish to checkout from" |
11801 | msgstr "要检出哪一个树" | |
11802 | ||
7157c2b5 | 11803 | #: builtin/checkout.c:1843 |
a6cd2cc4 JX |
11804 | msgid "restore the index" |
11805 | msgstr "恢复索引" | |
11806 | ||
7157c2b5 | 11807 | #: builtin/checkout.c:1845 |
a6cd2cc4 JX |
11808 | msgid "restore the working tree (default)" |
11809 | msgstr "恢复工作区(默认)" | |
11810 | ||
7157c2b5 | 11811 | #: builtin/checkout.c:1847 |
a6cd2cc4 JX |
11812 | msgid "ignore unmerged entries" |
11813 | msgstr "忽略未合并条目" | |
11814 | ||
7157c2b5 | 11815 | #: builtin/checkout.c:1848 |
a6cd2cc4 JX |
11816 | msgid "use overlay mode" |
11817 | msgstr "使用叠加模式" | |
11818 | ||
349ede6a | 11819 | #: builtin/clean.c:29 |
2e8451e8 JX |
11820 | msgid "" |
11821 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
11822 | msgstr "" | |
11823 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 11824 | |
349ede6a | 11825 | #: builtin/clean.c:33 |
07432cef WS |
11826 | #, c-format |
11827 | msgid "Removing %s\n" | |
11828 | msgstr "正删除 %s\n" | |
11829 | ||
349ede6a | 11830 | #: builtin/clean.c:34 |
07432cef WS |
11831 | #, c-format |
11832 | msgid "Would remove %s\n" | |
11833 | msgstr "将删除 %s\n" | |
11834 | ||
349ede6a | 11835 | #: builtin/clean.c:35 |
07432cef WS |
11836 | #, c-format |
11837 | msgid "Skipping repository %s\n" | |
160fb2b2 | 11838 | msgstr "忽略仓库 %s\n" |
07432cef | 11839 | |
349ede6a | 11840 | #: builtin/clean.c:36 |
07432cef WS |
11841 | #, c-format |
11842 | msgid "Would skip repository %s\n" | |
160fb2b2 | 11843 | msgstr "将忽略仓库 %s\n" |
07432cef | 11844 | |
349ede6a | 11845 | #: builtin/clean.c:37 |
07432cef WS |
11846 | #, c-format |
11847 | msgid "failed to remove %s" | |
c1ac5258 | 11848 | msgstr "删除 %s 失败" |
07432cef | 11849 | |
349ede6a | 11850 | #: builtin/clean.c:38 |
a6cd2cc4 JX |
11851 | #, c-format |
11852 | msgid "could not lstat %s\n" | |
11853 | msgstr "不能对 %s 调用 lstat\n" | |
11854 | ||
349ede6a | 11855 | #: builtin/clean.c:302 git-add--interactive.perl:595 |
1a79b2f1 | 11856 | #, c-format |
2e8451e8 JX |
11857 | msgid "" |
11858 | "Prompt help:\n" | |
11859 | "1 - select a numbered item\n" | |
11860 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 11861 | " - (empty) select nothing\n" |
2e8451e8 JX |
11862 | msgstr "" |
11863 | "帮助:\n" | |
11864 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
11865 | "foo - 通过唯一前缀选择一个选项\n" |
11866 | " - (空)什么也不选择\n" | |
2e8451e8 | 11867 | |
349ede6a | 11868 | #: builtin/clean.c:306 git-add--interactive.perl:604 |
1a79b2f1 | 11869 | #, c-format |
2e8451e8 JX |
11870 | msgid "" |
11871 | "Prompt help:\n" | |
11872 | "1 - select a single item\n" | |
11873 | "3-5 - select a range of items\n" | |
11874 | "2-3,6-9 - select multiple ranges\n" | |
11875 | "foo - select item based on unique prefix\n" | |
11876 | "-... - unselect specified items\n" | |
11877 | "* - choose all items\n" | |
1a79b2f1 | 11878 | " - (empty) finish selecting\n" |
2e8451e8 JX |
11879 | msgstr "" |
11880 | "帮助:\n" | |
11881 | "1 - 选择一个选项\n" | |
11882 | "3-5 - 选择一个范围内的所有选项\n" | |
11883 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 11884 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
11885 | "-... - 反选特定的选项\n" |
11886 | "* - 选择所有选项\n" | |
1a79b2f1 | 11887 | " - (空)结束选择\n" |
2e8451e8 | 11888 | |
ddc12c42 JX |
11889 | #: builtin/clean.c:521 git-add--interactive.perl:570 |
11890 | #: git-add--interactive.perl:575 | |
1a79b2f1 JX |
11891 | #, c-format, perl-format |
11892 | msgid "Huh (%s)?\n" | |
11893 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 11894 | |
349ede6a | 11895 | #: builtin/clean.c:661 |
2e8451e8 JX |
11896 | #, c-format |
11897 | msgid "Input ignore patterns>> " | |
11898 | msgstr "输入模版以排除条目>> " | |
11899 | ||
349ede6a | 11900 | #: builtin/clean.c:696 |
2e8451e8 JX |
11901 | #, c-format |
11902 | msgid "WARNING: Cannot find items matched by: %s" | |
11903 | msgstr "警告:无法找到和 %s 匹配的条目" | |
11904 | ||
349ede6a | 11905 | #: builtin/clean.c:717 |
2e8451e8 JX |
11906 | msgid "Select items to delete" |
11907 | msgstr "选择要删除的条目" | |
11908 | ||
814ff314 | 11909 | #. TRANSLATORS: Make sure to keep [y/N] as is |
349ede6a | 11910 | #: builtin/clean.c:758 |
2e8451e8 | 11911 | #, c-format |
814ff314 JX |
11912 | msgid "Remove %s [y/N]? " |
11913 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 11914 | |
349ede6a | 11915 | #: builtin/clean.c:789 |
2e8451e8 JX |
11916 | msgid "" |
11917 | "clean - start cleaning\n" | |
11918 | "filter by pattern - exclude items from deletion\n" | |
11919 | "select by numbers - select items to be deleted by numbers\n" | |
11920 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
11921 | "quit - stop cleaning\n" | |
11922 | "help - this screen\n" | |
11923 | "? - help for prompt selection" | |
11924 | msgstr "" | |
11925 | "clean - 开始清理\n" | |
11926 | "filter by pattern - 通过模版排除要删除的条目\n" | |
11927 | "select by numbers - 通过数字选择要删除的条目\n" | |
11928 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
11929 | "quit - 停止删除并退出\n" | |
11930 | "help - 显示本帮助\n" | |
11931 | "? - 显示如何在提示符下选择的帮助" | |
11932 | ||
349ede6a | 11933 | #: builtin/clean.c:825 |
2e8451e8 JX |
11934 | msgid "Would remove the following item:" |
11935 | msgid_plural "Would remove the following items:" | |
11936 | msgstr[0] "将删除如下条目:" | |
11937 | msgstr[1] "将删除如下条目:" | |
11938 | ||
349ede6a | 11939 | #: builtin/clean.c:841 |
2e8451e8 JX |
11940 | msgid "No more files to clean, exiting." |
11941 | msgstr "没有要清理的文件,退出。" | |
11942 | ||
349ede6a | 11943 | #: builtin/clean.c:903 |
ef317cd5 | 11944 | msgid "do not print names of files removed" |
07432cef | 11945 | msgstr "不打印删除文件的名称" |
ef317cd5 | 11946 | |
349ede6a | 11947 | #: builtin/clean.c:905 |
ef317cd5 | 11948 | msgid "force" |
07432cef | 11949 | msgstr "强制" |
ef317cd5 | 11950 | |
349ede6a | 11951 | #: builtin/clean.c:906 |
2e8451e8 JX |
11952 | msgid "interactive cleaning" |
11953 | msgstr "交互式清除" | |
11954 | ||
349ede6a | 11955 | #: builtin/clean.c:908 |
ef317cd5 | 11956 | msgid "remove whole directories" |
07432cef | 11957 | msgstr "删除整个目录" |
ef317cd5 | 11958 | |
349ede6a JX |
11959 | #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 |
11960 | #: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 | |
11961 | #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 | |
d46c5519 | 11962 | #: builtin/show-ref.c:179 |
ef317cd5 | 11963 | msgid "pattern" |
07432cef | 11964 | msgstr "模式" |
ef317cd5 | 11965 | |
349ede6a | 11966 | #: builtin/clean.c:910 |
ef317cd5 | 11967 | msgid "add <pattern> to ignore rules" |
4375c10e | 11968 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 11969 | |
349ede6a | 11970 | #: builtin/clean.c:911 |
ef317cd5 | 11971 | msgid "remove ignored files, too" |
07432cef | 11972 | msgstr "也删除忽略的文件" |
ef317cd5 | 11973 | |
349ede6a | 11974 | #: builtin/clean.c:913 |
ef317cd5 | 11975 | msgid "remove only ignored files" |
07432cef | 11976 | msgstr "只删除忽略的文件" |
c04f5ac3 | 11977 | |
7157c2b5 | 11978 | #: builtin/clean.c:929 |
c04f5ac3 | 11979 | msgid "" |
6c94aba5 | 11980 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 11981 | "clean" |
c04f5ac3 | 11982 | msgstr "" |
2e8451e8 | 11983 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 11984 | |
7157c2b5 | 11985 | #: builtin/clean.c:932 |
c04f5ac3 | 11986 | msgid "" |
6c94aba5 | 11987 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 11988 | "refusing to clean" |
c04f5ac3 | 11989 | msgstr "" |
2e8451e8 | 11990 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 11991 | |
7157c2b5 JX |
11992 | #: builtin/clean.c:944 |
11993 | msgid "-x and -X cannot be used together" | |
11994 | msgstr "-x 和 -X 不能同时使用" | |
11995 | ||
a5cd71ca | 11996 | #: builtin/clone.c:45 |
814ff314 | 11997 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 11998 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 11999 | |
ddc12c42 | 12000 | #: builtin/clone.c:93 |
ef317cd5 | 12001 | msgid "don't create a checkout" |
07432cef | 12002 | msgstr "不创建一个检出" |
ef317cd5 | 12003 | |
7157c2b5 | 12004 | #: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 |
ef317cd5 | 12005 | msgid "create a bare repository" |
160fb2b2 | 12006 | msgstr "创建一个纯仓库" |
ef317cd5 | 12007 | |
ddc12c42 | 12008 | #: builtin/clone.c:98 |
ef317cd5 | 12009 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 12010 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 12011 | |
ddc12c42 | 12012 | #: builtin/clone.c:100 |
ef317cd5 | 12013 | msgid "to clone from a local repository" |
160fb2b2 | 12014 | msgstr "从本地仓库克隆" |
ef317cd5 | 12015 | |
ddc12c42 | 12016 | #: builtin/clone.c:102 |
ef317cd5 | 12017 | msgid "don't use local hardlinks, always copy" |
07432cef | 12018 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 12019 | |
ddc12c42 | 12020 | #: builtin/clone.c:104 |
ef317cd5 | 12021 | msgid "setup as shared repository" |
160fb2b2 | 12022 | msgstr "设置为共享仓库" |
ef317cd5 | 12023 | |
349ede6a | 12024 | #: builtin/clone.c:106 |
87cb7997 | 12025 | msgid "pathspec" |
65e2041e | 12026 | msgstr "路径规格" |
87cb7997 | 12027 | |
349ede6a | 12028 | #: builtin/clone.c:106 |
ef317cd5 | 12029 | msgid "initialize submodules in the clone" |
07432cef | 12030 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 12031 | |
ddc12c42 | 12032 | #: builtin/clone.c:110 |
5b04ee3b JX |
12033 | msgid "number of submodules cloned in parallel" |
12034 | msgstr "并发克隆的子模组的数量" | |
12035 | ||
7157c2b5 | 12036 | #: builtin/clone.c:111 builtin/init-db.c:551 |
ef317cd5 | 12037 | msgid "template-directory" |
07432cef | 12038 | msgstr "模板目录" |
ef317cd5 | 12039 | |
7157c2b5 | 12040 | #: builtin/clone.c:112 builtin/init-db.c:552 |
ef317cd5 | 12041 | msgid "directory from which templates will be used" |
07432cef | 12042 | msgstr "模板目录将被使用" |
ef317cd5 | 12043 | |
2b472aae JX |
12044 | #: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 |
12045 | #: builtin/submodule--helper.c:1912 | |
ef317cd5 | 12046 | msgid "reference repository" |
160fb2b2 | 12047 | msgstr "参考仓库" |
ef317cd5 | 12048 | |
2b472aae JX |
12049 | #: builtin/clone.c:118 builtin/submodule--helper.c:1409 |
12050 | #: builtin/submodule--helper.c:1914 | |
7aea43ff | 12051 | msgid "use --reference only while cloning" |
160fb2b2 | 12052 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 12053 | |
7157c2b5 JX |
12054 | #: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 |
12055 | #: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 | |
ef317cd5 | 12056 | msgid "name" |
07432cef | 12057 | msgstr "名称" |
ef317cd5 | 12058 | |
ddc12c42 | 12059 | #: builtin/clone.c:120 |
ef317cd5 | 12060 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 12061 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 12062 | |
ddc12c42 | 12063 | #: builtin/clone.c:122 |
ef317cd5 | 12064 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 12065 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 12066 | |
ddc12c42 | 12067 | #: builtin/clone.c:124 |
ef317cd5 | 12068 | msgid "path to git-upload-pack on the remote" |
07432cef | 12069 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 12070 | |
349ede6a JX |
12071 | #: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 |
12072 | #: builtin/pull.c:208 | |
ef317cd5 | 12073 | msgid "depth" |
07432cef | 12074 | msgstr "深度" |
ef317cd5 | 12075 | |
ddc12c42 | 12076 | #: builtin/clone.c:126 |
ef317cd5 | 12077 | msgid "create a shallow clone of that depth" |
07432cef | 12078 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 12079 | |
7157c2b5 | 12080 | #: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 |
349ede6a | 12081 | #: builtin/pull.c:211 |
a0b6b246 JX |
12082 | msgid "time" |
12083 | msgstr "时间" | |
12084 | ||
ddc12c42 | 12085 | #: builtin/clone.c:128 |
a0b6b246 JX |
12086 | msgid "create a shallow clone since a specific time" |
12087 | msgstr "从一个特定时间创建一个浅克隆" | |
12088 | ||
349ede6a JX |
12089 | #: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 |
12090 | #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 | |
a0b6b246 JX |
12091 | msgid "revision" |
12092 | msgstr "版本" | |
12093 | ||
349ede6a | 12094 | #: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 |
1a79b2f1 JX |
12095 | msgid "deepen history of shallow clone, excluding rev" |
12096 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 12097 | |
2b472aae JX |
12098 | #: builtin/clone.c:132 builtin/submodule--helper.c:1419 |
12099 | #: builtin/submodule--helper.c:1928 | |
ef317cd5 | 12100 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 12101 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 12102 | |
ddc12c42 | 12103 | #: builtin/clone.c:134 |
a4f16749 JX |
12104 | msgid "don't clone any tags, and make later fetches not to follow them" |
12105 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
12106 | ||
ddc12c42 | 12107 | #: builtin/clone.c:136 |
5b04ee3b JX |
12108 | msgid "any cloned submodules will be shallow" |
12109 | msgstr "子模组将以浅下载模式克隆" | |
12110 | ||
7157c2b5 | 12111 | #: builtin/clone.c:137 builtin/init-db.c:560 |
ef317cd5 | 12112 | msgid "gitdir" |
07432cef | 12113 | msgstr "git目录" |
ef317cd5 | 12114 | |
7157c2b5 | 12115 | #: builtin/clone.c:138 builtin/init-db.c:561 |
ef317cd5 | 12116 | msgid "separate git dir from working tree" |
07432cef | 12117 | msgstr "git目录和工作区分离" |
ef317cd5 | 12118 | |
ddc12c42 | 12119 | #: builtin/clone.c:139 |
ef317cd5 | 12120 | msgid "key=value" |
07432cef | 12121 | msgstr "key=value" |
ef317cd5 | 12122 | |
ddc12c42 | 12123 | #: builtin/clone.c:140 |
ef317cd5 | 12124 | msgid "set config inside the new repository" |
160fb2b2 | 12125 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 12126 | |
349ede6a JX |
12127 | #: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 |
12128 | #: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 | |
d46c5519 JX |
12129 | msgid "server-specific" |
12130 | msgstr "server-specific" | |
12131 | ||
349ede6a JX |
12132 | #: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 |
12133 | #: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 | |
d46c5519 JX |
12134 | msgid "option to transmit" |
12135 | msgstr "传输选项" | |
12136 | ||
349ede6a JX |
12137 | #: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 |
12138 | #: builtin/push.c:571 | |
276ceeaa JX |
12139 | msgid "use IPv4 addresses only" |
12140 | msgstr "只使用 IPv4 地址" | |
12141 | ||
349ede6a JX |
12142 | #: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 |
12143 | #: builtin/push.c:573 | |
276ceeaa JX |
12144 | msgid "use IPv6 addresses only" |
12145 | msgstr "只使用 IPv6 地址" | |
12146 | ||
ddc12c42 | 12147 | #: builtin/clone.c:149 |
a6cd2cc4 JX |
12148 | msgid "any cloned submodules will use their remote-tracking branch" |
12149 | msgstr "任何克隆的子模组将使用它们的远程跟踪分支" | |
12150 | ||
ddc12c42 JX |
12151 | #: builtin/clone.c:151 |
12152 | msgid "initialize sparse-checkout file to include only files at root" | |
12153 | msgstr "初始化稀疏检出文件,只包含根目录文件" | |
12154 | ||
12155 | #: builtin/clone.c:287 | |
3495628d JX |
12156 | msgid "" |
12157 | "No directory name could be guessed.\n" | |
12158 | "Please specify a directory on the command line" | |
12159 | msgstr "" | |
12160 | "无法猜到目录名。\n" | |
26e4cbec | 12161 | "请在命令行指定一个目录" |
3495628d | 12162 | |
ddc12c42 | 12163 | #: builtin/clone.c:340 |
cfff71a9 | 12164 | #, c-format |
a0b6b246 JX |
12165 | msgid "info: Could not add alternate for '%s': %s\n" |
12166 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 12167 | |
ddc12c42 | 12168 | #: builtin/clone.c:413 |
c04f5ac3 JX |
12169 | #, c-format |
12170 | msgid "%s exists and is not a directory" | |
12171 | msgstr "%s 存在且不是一个目录" | |
12172 | ||
349ede6a | 12173 | #: builtin/clone.c:431 |
c04f5ac3 | 12174 | #, c-format |
a6cd2cc4 JX |
12175 | msgid "failed to start iterator over '%s'" |
12176 | msgstr "无法在 '%s' 上启动迭代器" | |
c04f5ac3 | 12177 | |
349ede6a | 12178 | #: builtin/clone.c:462 |
c04f5ac3 JX |
12179 | #, c-format |
12180 | msgid "failed to create link '%s'" | |
c1ac5258 | 12181 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 12182 | |
349ede6a | 12183 | #: builtin/clone.c:466 |
c04f5ac3 JX |
12184 | #, c-format |
12185 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 12186 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 12187 | |
349ede6a | 12188 | #: builtin/clone.c:471 |
a6cd2cc4 JX |
12189 | #, c-format |
12190 | msgid "failed to iterate over '%s'" | |
12191 | msgstr "无法在 '%s' 上迭代" | |
12192 | ||
349ede6a | 12193 | #: builtin/clone.c:498 |
c04f5ac3 JX |
12194 | #, c-format |
12195 | msgid "done.\n" | |
12196 | msgstr "完成。\n" | |
12197 | ||
349ede6a | 12198 | #: builtin/clone.c:512 |
1003b3a5 JX |
12199 | msgid "" |
12200 | "Clone succeeded, but checkout failed.\n" | |
12201 | "You can inspect what was checked out with 'git status'\n" | |
a6cd2cc4 | 12202 | "and retry with 'git restore --source=HEAD :/'\n" |
1003b3a5 JX |
12203 | msgstr "" |
12204 | "克隆成功,但是检出失败。\n" | |
12205 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
a6cd2cc4 | 12206 | "'git restore --source=HEAD :/' 重试\n" |
1003b3a5 | 12207 | |
349ede6a | 12208 | #: builtin/clone.c:589 |
c04f5ac3 JX |
12209 | #, c-format |
12210 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 12211 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 12212 | |
349ede6a | 12213 | #: builtin/clone.c:708 |
3495628d JX |
12214 | #, c-format |
12215 | msgid "unable to update %s" | |
12216 | msgstr "不能更新 %s" | |
12217 | ||
349ede6a | 12218 | #: builtin/clone.c:756 |
ddc12c42 JX |
12219 | msgid "failed to initialize sparse-checkout" |
12220 | msgstr "无法初始化稀疏检出" | |
12221 | ||
349ede6a | 12222 | #: builtin/clone.c:779 |
c04f5ac3 JX |
12223 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
12224 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
12225 | ||
349ede6a | 12226 | #: builtin/clone.c:811 |
1003b3a5 JX |
12227 | msgid "unable to checkout working tree" |
12228 | msgstr "不能检出工作区" | |
12229 | ||
349ede6a | 12230 | #: builtin/clone.c:868 |
3495628d JX |
12231 | msgid "unable to write parameters to config file" |
12232 | msgstr "无法将参数写入配置文件" | |
12233 | ||
349ede6a | 12234 | #: builtin/clone.c:931 |
04cb2f28 JX |
12235 | msgid "cannot repack to clean up" |
12236 | msgstr "无法执行 repack 来清理" | |
12237 | ||
349ede6a | 12238 | #: builtin/clone.c:933 |
04cb2f28 JX |
12239 | msgid "cannot unlink temporary alternates file" |
12240 | msgstr "无法删除临时的 alternates 文件" | |
12241 | ||
7157c2b5 | 12242 | #: builtin/clone.c:971 builtin/receive-pack.c:1982 |
c04f5ac3 JX |
12243 | msgid "Too many arguments." |
12244 | msgstr "太多参数。" | |
12245 | ||
349ede6a | 12246 | #: builtin/clone.c:975 |
c04f5ac3 | 12247 | msgid "You must specify a repository to clone." |
160fb2b2 | 12248 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 12249 | |
349ede6a | 12250 | #: builtin/clone.c:988 |
c04f5ac3 JX |
12251 | #, c-format |
12252 | msgid "--bare and --origin %s options are incompatible." | |
12253 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
12254 | ||
349ede6a | 12255 | #: builtin/clone.c:991 |
07432cef WS |
12256 | msgid "--bare and --separate-git-dir are incompatible." |
12257 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
12258 | ||
7157c2b5 | 12259 | #: builtin/clone.c:1007 |
c04f5ac3 JX |
12260 | #, c-format |
12261 | msgid "repository '%s' does not exist" | |
160fb2b2 | 12262 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 12263 | |
7157c2b5 | 12264 | #: builtin/clone.c:1011 builtin/fetch.c:1794 |
cfff71a9 JX |
12265 | #, c-format |
12266 | msgid "depth %s is not a positive number" | |
12267 | msgstr "深度 %s 不是一个正数" | |
12268 | ||
7157c2b5 | 12269 | #: builtin/clone.c:1021 |
c04f5ac3 JX |
12270 | #, c-format |
12271 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 12272 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 12273 | |
7157c2b5 | 12274 | #: builtin/clone.c:1033 |
c04f5ac3 JX |
12275 | #, c-format |
12276 | msgid "working tree '%s' already exists." | |
12277 | msgstr "工作区 '%s' 已经存在。" | |
12278 | ||
7157c2b5 JX |
12279 | #: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 |
12280 | #: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 | |
5bb01d4f JX |
12281 | #, c-format |
12282 | msgid "could not create leading directories of '%s'" | |
12283 | msgstr "不能为 '%s' 创建先导目录" | |
12284 | ||
7157c2b5 | 12285 | #: builtin/clone.c:1053 |
c04f5ac3 | 12286 | #, c-format |
814ff314 JX |
12287 | msgid "could not create work tree dir '%s'" |
12288 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 12289 | |
7157c2b5 | 12290 | #: builtin/clone.c:1073 |
c04f5ac3 JX |
12291 | #, c-format |
12292 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 12293 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 12294 | |
7157c2b5 | 12295 | #: builtin/clone.c:1075 |
c04f5ac3 JX |
12296 | #, c-format |
12297 | msgid "Cloning into '%s'...\n" | |
12298 | msgstr "正克隆到 '%s'...\n" | |
12299 | ||
7157c2b5 | 12300 | #: builtin/clone.c:1099 |
a0b6b246 JX |
12301 | msgid "" |
12302 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
12303 | "able" | |
12304 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
12305 | ||
7157c2b5 | 12306 | #: builtin/clone.c:1164 |
6acbf033 | 12307 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
12308 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
12309 | ||
7157c2b5 | 12310 | #: builtin/clone.c:1166 |
a0b6b246 JX |
12311 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
12312 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 12313 | |
7157c2b5 | 12314 | #: builtin/clone.c:1168 |
a0b6b246 JX |
12315 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
12316 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
12317 | ||
7157c2b5 | 12318 | #: builtin/clone.c:1170 |
31e5e17b JX |
12319 | msgid "--filter is ignored in local clones; use file:// instead." |
12320 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
12321 | ||
7157c2b5 | 12322 | #: builtin/clone.c:1173 |
6acbf033 | 12323 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 12324 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 12325 | |
7157c2b5 | 12326 | #: builtin/clone.c:1178 |
6acbf033 JX |
12327 | msgid "--local is ignored" |
12328 | msgstr "--local 被忽略" | |
12329 | ||
7157c2b5 | 12330 | #: builtin/clone.c:1262 builtin/clone.c:1270 |
c04f5ac3 JX |
12331 | #, c-format |
12332 | msgid "Remote branch %s not found in upstream %s" | |
12333 | msgstr "远程分支 %s 在上游 %s 未发现" | |
12334 | ||
7157c2b5 | 12335 | #: builtin/clone.c:1273 |
c04f5ac3 | 12336 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 12337 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 12338 | |
a4f16749 | 12339 | #: builtin/column.c:10 |
814ff314 JX |
12340 | msgid "git column [<options>]" |
12341 | msgstr "git column [<选项>]" | |
ef317cd5 | 12342 | |
a4f16749 | 12343 | #: builtin/column.c:27 |
ef317cd5 | 12344 | msgid "lookup config vars" |
07432cef | 12345 | msgstr "查找配置变量" |
ef317cd5 | 12346 | |
a4f16749 | 12347 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 12348 | msgid "layout to use" |
07432cef | 12349 | msgstr "要使用的布局" |
ef317cd5 | 12350 | |
a4f16749 | 12351 | #: builtin/column.c:30 |
ef317cd5 | 12352 | msgid "Maximum width" |
07432cef | 12353 | msgstr "最大宽度" |
ef317cd5 | 12354 | |
a4f16749 | 12355 | #: builtin/column.c:31 |
ef317cd5 | 12356 | msgid "Padding space on left border" |
07432cef | 12357 | msgstr "左边框的填充空间" |
ef317cd5 | 12358 | |
a4f16749 | 12359 | #: builtin/column.c:32 |
ef317cd5 | 12360 | msgid "Padding space on right border" |
07432cef | 12361 | msgstr "右边框的填充空间" |
ef317cd5 | 12362 | |
a4f16749 | 12363 | #: builtin/column.c:33 |
ef317cd5 | 12364 | msgid "Padding space between columns" |
07432cef | 12365 | msgstr "两列之间的填充空间" |
ef317cd5 | 12366 | |
fd8cb379 | 12367 | #: builtin/column.c:51 |
8ada9598 | 12368 | msgid "--command must be the first argument" |
81809b99 | 12369 | msgstr "--command 必须是第一个参数" |
8ada9598 | 12370 | |
7157c2b5 | 12371 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:21 |
349ede6a JX |
12372 | msgid "" |
12373 | "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" | |
12374 | msgstr "" | |
12375 | "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" | |
12376 | "[no-]progress]" | |
12377 | ||
7157c2b5 | 12378 | #: builtin/commit-graph.c:14 builtin/commit-graph.c:26 |
349ede6a JX |
12379 | msgid "" |
12380 | "git commit-graph write [--object-dir <objdir>] [--append] [--" | |
12381 | "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" | |
12382 | "paths] [--[no-]progress] <split options>" | |
12383 | msgstr "" | |
12384 | "git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" | |
12385 | ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" | |
12386 | "[no-]progress] <切分选项>" | |
12387 | ||
7157c2b5 | 12388 | #: builtin/commit-graph.c:62 |
349ede6a JX |
12389 | #, c-format |
12390 | msgid "could not find object directory matching %s" | |
12391 | msgstr "无法找到和 %s 匹配的对象目录" | |
12392 | ||
7157c2b5 JX |
12393 | #: builtin/commit-graph.c:78 builtin/commit-graph.c:177 |
12394 | #: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 | |
349ede6a JX |
12395 | msgid "dir" |
12396 | msgstr "目录" | |
12397 | ||
7157c2b5 JX |
12398 | #: builtin/commit-graph.c:79 builtin/commit-graph.c:178 |
12399 | #: builtin/commit-graph.c:277 | |
349ede6a JX |
12400 | msgid "The object directory to store the graph" |
12401 | msgstr "保存图形的对象目录" | |
12402 | ||
7157c2b5 | 12403 | #: builtin/commit-graph.c:81 |
349ede6a JX |
12404 | msgid "if the commit-graph is split, only verify the tip file" |
12405 | msgstr "如果提交图形被拆分,只验证头一个文件" | |
12406 | ||
7157c2b5 | 12407 | #: builtin/commit-graph.c:104 |
349ede6a JX |
12408 | #, c-format |
12409 | msgid "Could not open commit-graph '%s'" | |
12410 | msgstr "无法打开提交图形 '%s'" | |
12411 | ||
7157c2b5 | 12412 | #: builtin/commit-graph.c:138 |
349ede6a JX |
12413 | #, c-format |
12414 | msgid "unrecognized --split argument, %s" | |
12415 | msgstr "未能识别的 --split 参数,%s" | |
12416 | ||
7157c2b5 JX |
12417 | #: builtin/commit-graph.c:151 |
12418 | #, c-format | |
12419 | msgid "unexpected non-hex object ID: %s" | |
12420 | msgstr "意外的非十六进制对象 ID:%s" | |
12421 | ||
12422 | #: builtin/commit-graph.c:156 | |
12423 | #, c-format | |
12424 | msgid "invalid object: %s" | |
12425 | msgstr "无效对象:%s" | |
12426 | ||
12427 | #: builtin/commit-graph.c:180 | |
349ede6a JX |
12428 | msgid "start walk at all refs" |
12429 | msgstr "开始遍历所有引用" | |
12430 | ||
7157c2b5 | 12431 | #: builtin/commit-graph.c:182 |
349ede6a JX |
12432 | msgid "scan pack-indexes listed by stdin for commits" |
12433 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
12434 | ||
7157c2b5 | 12435 | #: builtin/commit-graph.c:184 |
349ede6a JX |
12436 | msgid "start walk at commits listed by stdin" |
12437 | msgstr "从标准输入中的提交开始扫描" | |
12438 | ||
7157c2b5 | 12439 | #: builtin/commit-graph.c:186 |
349ede6a JX |
12440 | msgid "include all commits already in the commit-graph file" |
12441 | msgstr "包含 commit-graph 文件中已有所有提交" | |
12442 | ||
7157c2b5 | 12443 | #: builtin/commit-graph.c:188 |
349ede6a JX |
12444 | msgid "enable computation for changed paths" |
12445 | msgstr "启用变更路径的计算" | |
12446 | ||
7157c2b5 | 12447 | #: builtin/commit-graph.c:191 |
349ede6a JX |
12448 | msgid "allow writing an incremental commit-graph file" |
12449 | msgstr "允许写一个增量提交图形文件" | |
12450 | ||
7157c2b5 | 12451 | #: builtin/commit-graph.c:195 |
349ede6a JX |
12452 | msgid "maximum number of commits in a non-base split commit-graph" |
12453 | msgstr "在非基本拆分提交图形中的最大提交数" | |
12454 | ||
7157c2b5 | 12455 | #: builtin/commit-graph.c:197 |
349ede6a JX |
12456 | msgid "maximum ratio between two levels of a split commit-graph" |
12457 | msgstr "一个拆分提交图形的两个级别之间的最大比率" | |
12458 | ||
7157c2b5 | 12459 | #: builtin/commit-graph.c:199 |
349ede6a JX |
12460 | msgid "only expire files older than a given date-time" |
12461 | msgstr "只让早于给定时间的文件过期" | |
12462 | ||
7157c2b5 | 12463 | #: builtin/commit-graph.c:215 |
349ede6a JX |
12464 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" |
12465 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
12466 | ||
7157c2b5 JX |
12467 | #: builtin/commit-graph.c:245 |
12468 | msgid "Collecting commits from input" | |
12469 | msgstr "正从标准输入收集提交" | |
349ede6a | 12470 | |
d46c5519 JX |
12471 | #: builtin/commit-tree.c:18 |
12472 | msgid "" | |
12473 | "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " | |
12474 | "<file>)...] <tree>" | |
12475 | msgstr "" | |
12476 | "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" | |
12477 | ">)...] <树>" | |
12478 | ||
12479 | #: builtin/commit-tree.c:31 | |
12480 | #, c-format | |
12481 | msgid "duplicate parent %s ignored" | |
12482 | msgstr "忽略重复的父提交 %s" | |
12483 | ||
349ede6a | 12484 | #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 |
d46c5519 JX |
12485 | #, c-format |
12486 | msgid "not a valid object name %s" | |
12487 | msgstr "不是一个有效的对象名 %s" | |
12488 | ||
12489 | #: builtin/commit-tree.c:93 | |
12490 | #, c-format | |
12491 | msgid "git commit-tree: failed to open '%s'" | |
12492 | msgstr "git commit-tree:无法打开 '%s'" | |
12493 | ||
12494 | #: builtin/commit-tree.c:96 | |
12495 | #, c-format | |
12496 | msgid "git commit-tree: failed to read '%s'" | |
12497 | msgstr "git commit-tree:无法读取 '%s'" | |
12498 | ||
12499 | #: builtin/commit-tree.c:98 | |
12500 | #, c-format | |
12501 | msgid "git commit-tree: failed to close '%s'" | |
12502 | msgstr "git commit-tree:无法关闭 '%s'" | |
12503 | ||
12504 | #: builtin/commit-tree.c:111 | |
12505 | msgid "parent" | |
12506 | msgstr "父提交" | |
12507 | ||
12508 | #: builtin/commit-tree.c:112 | |
12509 | msgid "id of a parent commit object" | |
5b533632 | 12510 | msgstr "父提交对象 ID" |
d46c5519 | 12511 | |
349ede6a JX |
12512 | #: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 |
12513 | #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 | |
12514 | #: builtin/tag.c:413 | |
d46c5519 JX |
12515 | msgid "message" |
12516 | msgstr "说明" | |
12517 | ||
349ede6a | 12518 | #: builtin/commit-tree.c:115 builtin/commit.c:1506 |
d46c5519 JX |
12519 | msgid "commit message" |
12520 | msgstr "提交说明" | |
12521 | ||
12522 | #: builtin/commit-tree.c:118 | |
12523 | msgid "read commit log message from file" | |
12524 | msgstr "从文件中读取提交说明" | |
12525 | ||
349ede6a JX |
12526 | #: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 |
12527 | #: builtin/pull.c:176 builtin/revert.c:118 | |
d46c5519 JX |
12528 | msgid "GPG sign commit" |
12529 | msgstr "GPG 提交签名" | |
12530 | ||
12531 | #: builtin/commit-tree.c:133 | |
12532 | msgid "must give exactly one tree" | |
12533 | msgstr "必须精确地提供一个树" | |
12534 | ||
12535 | #: builtin/commit-tree.c:140 | |
12536 | msgid "git commit-tree: failed to read" | |
12537 | msgstr "git commit-tree:读取失败" | |
12538 | ||
06991777 | 12539 | #: builtin/commit.c:41 |
814ff314 | 12540 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 12541 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 12542 | |
06991777 | 12543 | #: builtin/commit.c:46 |
814ff314 | 12544 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 12545 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 12546 | |
06991777 | 12547 | #: builtin/commit.c:51 |
c04f5ac3 JX |
12548 | msgid "" |
12549 | "You asked to amend the most recent commit, but doing so would make\n" | |
12550 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
12551 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
12552 | msgstr "" | |
1b150dc9 T |
12553 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
12554 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 12555 | |
06991777 | 12556 | #: builtin/commit.c:56 |
c04f5ac3 JX |
12557 | msgid "" |
12558 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
12559 | "If you wish to commit it anyway, use:\n" | |
12560 | "\n" | |
12561 | " git commit --allow-empty\n" | |
12562 | "\n" | |
c04f5ac3 | 12563 | msgstr "" |
a9ce4543 T |
12564 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
12565 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
12566 | "\n" |
12567 | " git commit --allow-empty\n" | |
12568 | "\n" | |
c04f5ac3 | 12569 | |
06991777 | 12570 | #: builtin/commit.c:63 |
349ede6a JX |
12571 | msgid "Otherwise, please use 'git rebase --skip'\n" |
12572 | msgstr "否则,请使用 'git rebase --skip'\n" | |
12573 | ||
12574 | #: builtin/commit.c:66 | |
a6cd2cc4 JX |
12575 | msgid "Otherwise, please use 'git cherry-pick --skip'\n" |
12576 | msgstr "否则,请使用 'git cherry-pick --skip'\n" | |
b1894384 | 12577 | |
349ede6a | 12578 | #: builtin/commit.c:69 |
b1894384 | 12579 | msgid "" |
a6cd2cc4 JX |
12580 | "and then use:\n" |
12581 | "\n" | |
12582 | " git cherry-pick --continue\n" | |
12583 | "\n" | |
12584 | "to resume cherry-picking the remaining commits.\n" | |
b1894384 JX |
12585 | "If you wish to skip this commit, use:\n" |
12586 | "\n" | |
a6cd2cc4 | 12587 | " git cherry-pick --skip\n" |
b1894384 | 12588 | "\n" |
b1894384 | 12589 | msgstr "" |
a6cd2cc4 JX |
12590 | "然后使用:\n" |
12591 | "\n" | |
12592 | " git cherry-pick --continue\n" | |
b1894384 | 12593 | "\n" |
a6cd2cc4 JX |
12594 | "来继续拣选剩余提交。如果您想跳过此提交,使用:\n" |
12595 | "\n" | |
12596 | " git cherry-pick --skip\n" | |
b1894384 | 12597 | "\n" |
b1894384 | 12598 | |
349ede6a | 12599 | #: builtin/commit.c:312 |
c04f5ac3 | 12600 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 12601 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 12602 | |
349ede6a | 12603 | #: builtin/commit.c:348 |
ddc12c42 JX |
12604 | msgid "--pathspec-from-file with -a does not make sense" |
12605 | msgstr "--pathspec-from-file 和 -a 在一起没有意义" | |
12606 | ||
349ede6a | 12607 | #: builtin/commit.c:361 |
ddc12c42 JX |
12608 | msgid "No paths with --include/--only does not make sense." |
12609 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
12610 | ||
349ede6a | 12611 | #: builtin/commit.c:373 |
c04f5ac3 | 12612 | msgid "unable to create temporary index" |
90e6ef53 | 12613 | msgstr "不能创建临时索引" |
c04f5ac3 | 12614 | |
349ede6a | 12615 | #: builtin/commit.c:382 |
c04f5ac3 JX |
12616 | msgid "interactive add failed" |
12617 | msgstr "交互式添加失败" | |
12618 | ||
349ede6a | 12619 | #: builtin/commit.c:397 |
220c313c JX |
12620 | msgid "unable to update temporary index" |
12621 | msgstr "无法更新临时索引" | |
12622 | ||
349ede6a | 12623 | #: builtin/commit.c:399 |
220c313c JX |
12624 | msgid "Failed to update main cache tree" |
12625 | msgstr "不能更新树的主缓存" | |
12626 | ||
349ede6a | 12627 | #: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 |
c04f5ac3 | 12628 | msgid "unable to write new_index file" |
90e6ef53 | 12629 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 12630 | |
349ede6a | 12631 | #: builtin/commit.c:476 |
8ada9598 | 12632 | msgid "cannot do a partial commit during a merge." |
81809b99 | 12633 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 12634 | |
349ede6a | 12635 | #: builtin/commit.c:478 |
8ada9598 | 12636 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 12637 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 12638 | |
349ede6a JX |
12639 | #: builtin/commit.c:480 |
12640 | msgid "cannot do a partial commit during a rebase." | |
12641 | msgstr "在变基过程中不能做部分提交。" | |
12642 | ||
12643 | #: builtin/commit.c:488 | |
c04f5ac3 | 12644 | msgid "cannot read the index" |
90e6ef53 | 12645 | msgstr "无法读取索引" |
c04f5ac3 | 12646 | |
349ede6a | 12647 | #: builtin/commit.c:507 |
c04f5ac3 | 12648 | msgid "unable to write temporary index file" |
90e6ef53 | 12649 | msgstr "无法写临时索引文件" |
c04f5ac3 | 12650 | |
349ede6a | 12651 | #: builtin/commit.c:605 |
220c313c JX |
12652 | #, c-format |
12653 | msgid "commit '%s' lacks author header" | |
12654 | msgstr "提交 '%s' 缺少作者信息" | |
12655 | ||
349ede6a | 12656 | #: builtin/commit.c:607 |
c04f5ac3 | 12657 | #, c-format |
220c313c | 12658 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 12659 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 12660 | |
349ede6a | 12661 | #: builtin/commit.c:626 |
c04f5ac3 | 12662 | msgid "malformed --author parameter" |
fd8cb379 | 12663 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 12664 | |
349ede6a | 12665 | #: builtin/commit.c:679 |
6acbf033 JX |
12666 | msgid "" |
12667 | "unable to select a comment character that is not used\n" | |
12668 | "in the current commit message" | |
12669 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
12670 | ||
349ede6a | 12671 | #: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 |
c04f5ac3 JX |
12672 | #, c-format |
12673 | msgid "could not lookup commit %s" | |
12674 | msgstr "不能查询提交 %s" | |
12675 | ||
349ede6a | 12676 | #: builtin/commit.c:729 builtin/shortlog.c:319 |
c04f5ac3 JX |
12677 | #, c-format |
12678 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 12679 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 12680 | |
349ede6a | 12681 | #: builtin/commit.c:731 |
c04f5ac3 | 12682 | msgid "could not read log from standard input" |
90e6ef53 | 12683 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 12684 | |
349ede6a | 12685 | #: builtin/commit.c:735 |
c04f5ac3 JX |
12686 | #, c-format |
12687 | msgid "could not read log file '%s'" | |
90e6ef53 | 12688 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 12689 | |
349ede6a | 12690 | #: builtin/commit.c:766 builtin/commit.c:782 |
c04f5ac3 | 12691 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 12692 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 12693 | |
349ede6a | 12694 | #: builtin/commit.c:773 |
5b04ee3b JX |
12695 | msgid "could not read MERGE_MSG" |
12696 | msgstr "不能读取 MERGE_MSG" | |
12697 | ||
349ede6a | 12698 | #: builtin/commit.c:833 |
c04f5ac3 | 12699 | msgid "could not write commit template" |
90e6ef53 | 12700 | msgstr "不能写提交模版" |
c04f5ac3 | 12701 | |
349ede6a | 12702 | #: builtin/commit.c:852 |
81809b99 | 12703 | #, c-format |
c04f5ac3 JX |
12704 | msgid "" |
12705 | "\n" | |
8ada9598 | 12706 | "It looks like you may be committing a merge.\n" |
c04f5ac3 JX |
12707 | "If this is not correct, please remove the file\n" |
12708 | "\t%s\n" | |
12709 | "and try again.\n" | |
12710 | msgstr "" | |
12711 | "\n" | |
649900bc | 12712 | "似乎您正在做一个合并提交。如果不对,请删除文件\n" |
c04f5ac3 JX |
12713 | "\t%s\n" |
12714 | "然后重试。\n" | |
12715 | ||
349ede6a | 12716 | #: builtin/commit.c:857 |
81809b99 | 12717 | #, c-format |
8ada9598 JX |
12718 | msgid "" |
12719 | "\n" | |
12720 | "It looks like you may be committing a cherry-pick.\n" | |
12721 | "If this is not correct, please remove the file\n" | |
12722 | "\t%s\n" | |
12723 | "and try again.\n" | |
12724 | msgstr "" | |
12725 | "\n" | |
649900bc | 12726 | "似乎您正在做一个拣选提交。如果不对,请删除文件\n" |
8ada9598 JX |
12727 | "\t%s\n" |
12728 | "然后重试。\n" | |
c04f5ac3 | 12729 | |
349ede6a | 12730 | #: builtin/commit.c:870 |
a77c07d9 | 12731 | #, c-format |
c04f5ac3 | 12732 | msgid "" |
8ada9598 | 12733 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 12734 | "with '%c' will be ignored, and an empty message aborts the commit.\n" |
c04f5ac3 | 12735 | msgstr "" |
a77c07d9 | 12736 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" |
81809b99 | 12737 | "说明将会终止提交。\n" |
c04f5ac3 | 12738 | |
349ede6a | 12739 | #: builtin/commit.c:878 |
a77c07d9 | 12740 | #, c-format |
c04f5ac3 | 12741 | msgid "" |
8ada9598 | 12742 | "Please enter the commit message for your changes. Lines starting\n" |
a77c07d9 | 12743 | "with '%c' will be kept; you may remove them yourself if you want to.\n" |
c04f5ac3 JX |
12744 | "An empty message aborts the commit.\n" |
12745 | msgstr "" | |
a77c07d9 JX |
12746 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n" |
12747 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
c04f5ac3 | 12748 | |
90e6ef53 | 12749 | # 译者:为保证在输出中对齐,注意调整句中空格! |
349ede6a | 12750 | #: builtin/commit.c:895 |
6acbf033 JX |
12751 | #, c-format |
12752 | msgid "%sAuthor: %.*s <%.*s>" | |
12753 | msgstr "%s作者: %.*s <%.*s>" | |
12754 | ||
12755 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
349ede6a | 12756 | #: builtin/commit.c:903 |
c04f5ac3 | 12757 | #, c-format |
6acbf033 JX |
12758 | msgid "%sDate: %s" |
12759 | msgstr "%s日期: %s" | |
c04f5ac3 | 12760 | |
90e6ef53 | 12761 | # 译者:为保证在输出中对齐,注意调整句中空格! |
349ede6a | 12762 | #: builtin/commit.c:910 |
c04f5ac3 | 12763 | #, c-format |
6acbf033 JX |
12764 | msgid "%sCommitter: %.*s <%.*s>" |
12765 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 12766 | |
349ede6a | 12767 | #: builtin/commit.c:928 |
c04f5ac3 | 12768 | msgid "Cannot read index" |
90e6ef53 | 12769 | msgstr "无法读取索引" |
c04f5ac3 | 12770 | |
349ede6a | 12771 | #: builtin/commit.c:999 |
c04f5ac3 JX |
12772 | msgid "Error building trees" |
12773 | msgstr "无法创建树对象" | |
12774 | ||
349ede6a | 12775 | #: builtin/commit.c:1013 builtin/tag.c:276 |
c04f5ac3 JX |
12776 | #, c-format |
12777 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 12778 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 12779 | |
349ede6a | 12780 | #: builtin/commit.c:1057 |
c04f5ac3 | 12781 | #, c-format |
814ff314 | 12782 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 12783 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 12784 | |
349ede6a | 12785 | #: builtin/commit.c:1071 |
5809aa05 JX |
12786 | #, c-format |
12787 | msgid "Invalid ignored mode '%s'" | |
12788 | msgstr "无效的忽略模式 '%s'" | |
12789 | ||
349ede6a | 12790 | #: builtin/commit.c:1089 builtin/commit.c:1333 |
c04f5ac3 JX |
12791 | #, c-format |
12792 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 12793 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 12794 | |
349ede6a | 12795 | #: builtin/commit.c:1129 |
2e8451e8 JX |
12796 | msgid "--long and -z are incompatible" |
12797 | msgstr "--long 和 -z 选项不兼容" | |
12798 | ||
349ede6a | 12799 | #: builtin/commit.c:1173 |
c04f5ac3 JX |
12800 | msgid "Using both --reset-author and --author does not make sense" |
12801 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
12802 | ||
349ede6a | 12803 | #: builtin/commit.c:1182 |
c04f5ac3 | 12804 | msgid "You have nothing to amend." |
90e6ef53 | 12805 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 12806 | |
349ede6a | 12807 | #: builtin/commit.c:1185 |
8ada9598 | 12808 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 12809 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 12810 | |
349ede6a | 12811 | #: builtin/commit.c:1187 |
8ada9598 | 12812 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 12813 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 12814 | |
349ede6a JX |
12815 | #: builtin/commit.c:1189 |
12816 | msgid "You are in the middle of a rebase -- cannot amend." | |
12817 | msgstr "您正处于一个变基过程中 -- 无法修补提交。" | |
12818 | ||
12819 | #: builtin/commit.c:1192 | |
c04f5ac3 | 12820 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 12821 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 12822 | |
349ede6a | 12823 | #: builtin/commit.c:1202 |
c04f5ac3 JX |
12824 | msgid "Only one of -c/-C/-F/--fixup can be used." |
12825 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
12826 | ||
349ede6a | 12827 | #: builtin/commit.c:1204 |
31e5e17b JX |
12828 | msgid "Option -m cannot be combined with -c/-C/-F." |
12829 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 12830 | |
349ede6a | 12831 | #: builtin/commit.c:1213 |
c04f5ac3 | 12832 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 12833 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 12834 | |
349ede6a | 12835 | #: builtin/commit.c:1231 |
c04f5ac3 JX |
12836 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
12837 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
12838 | ||
349ede6a | 12839 | #: builtin/commit.c:1237 |
c04f5ac3 | 12840 | #, c-format |
d46c5519 JX |
12841 | msgid "paths '%s ...' with -a does not make sense" |
12842 | msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" | |
c04f5ac3 | 12843 | |
349ede6a | 12844 | #: builtin/commit.c:1368 builtin/commit.c:1529 |
ef317cd5 | 12845 | msgid "show status concisely" |
07432cef | 12846 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 12847 | |
349ede6a | 12848 | #: builtin/commit.c:1370 builtin/commit.c:1531 |
ef317cd5 | 12849 | msgid "show branch information" |
07432cef | 12850 | msgstr "显示分支信息" |
ef317cd5 | 12851 | |
349ede6a | 12852 | #: builtin/commit.c:1372 |
a4f16749 JX |
12853 | msgid "show stash information" |
12854 | msgstr "显示贮藏区信息" | |
12855 | ||
349ede6a | 12856 | #: builtin/commit.c:1374 builtin/commit.c:1533 |
31e5e17b JX |
12857 | msgid "compute full ahead/behind values" |
12858 | msgstr "计算完整的领先/落后值" | |
12859 | ||
349ede6a | 12860 | #: builtin/commit.c:1376 |
a0b6b246 JX |
12861 | msgid "version" |
12862 | msgstr "版本" | |
12863 | ||
349ede6a | 12864 | #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 |
7157c2b5 | 12865 | #: builtin/worktree.c:722 |
ef317cd5 | 12866 | msgid "machine-readable output" |
07432cef WS |
12867 | msgstr "机器可读的输出" |
12868 | ||
349ede6a | 12869 | #: builtin/commit.c:1379 builtin/commit.c:1537 |
07432cef WS |
12870 | msgid "show status in long format (default)" |
12871 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 12872 | |
349ede6a | 12873 | #: builtin/commit.c:1382 builtin/commit.c:1540 |
ef317cd5 | 12874 | msgid "terminate entries with NUL" |
4375c10e | 12875 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 12876 | |
349ede6a | 12877 | #: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 |
7157c2b5 JX |
12878 | #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 |
12879 | #: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 | |
ef317cd5 | 12880 | msgid "mode" |
07432cef | 12881 | msgstr "模式" |
ef317cd5 | 12882 | |
349ede6a | 12883 | #: builtin/commit.c:1385 builtin/commit.c:1543 |
ef317cd5 | 12884 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 12885 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 12886 | |
349ede6a | 12887 | #: builtin/commit.c:1389 |
5809aa05 JX |
12888 | msgid "" |
12889 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
12890 | "traditional)" | |
31e5e17b JX |
12891 | msgstr "" |
12892 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 12893 | |
349ede6a | 12894 | #: builtin/commit.c:1391 parse-options.h:192 |
ef317cd5 JX |
12895 | msgid "when" |
12896 | msgstr "何时" | |
12897 | ||
349ede6a | 12898 | #: builtin/commit.c:1392 |
ef317cd5 JX |
12899 | msgid "" |
12900 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
12901 | "(Default: all)" | |
12902 | msgstr "" | |
07432cef | 12903 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 12904 | |
349ede6a | 12905 | #: builtin/commit.c:1394 |
ef317cd5 | 12906 | msgid "list untracked files in columns" |
07432cef | 12907 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 12908 | |
349ede6a | 12909 | #: builtin/commit.c:1395 |
fd8cb379 JX |
12910 | msgid "do not detect renames" |
12911 | msgstr "不检测重命名" | |
12912 | ||
349ede6a | 12913 | #: builtin/commit.c:1397 |
fd8cb379 JX |
12914 | msgid "detect renames, optionally set similarity index" |
12915 | msgstr "检测重命名,可以设置索引相似度" | |
12916 | ||
349ede6a | 12917 | #: builtin/commit.c:1417 |
5809aa05 JX |
12918 | msgid "Unsupported combination of ignored and untracked-files arguments" |
12919 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
12920 | ||
349ede6a | 12921 | #: builtin/commit.c:1499 |
ef317cd5 | 12922 | msgid "suppress summary after successful commit" |
07432cef | 12923 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 12924 | |
349ede6a | 12925 | #: builtin/commit.c:1500 |
ef317cd5 | 12926 | msgid "show diff in commit message template" |
07432cef | 12927 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 12928 | |
349ede6a | 12929 | #: builtin/commit.c:1502 |
ef317cd5 | 12930 | msgid "Commit message options" |
07432cef | 12931 | msgstr "提交说明选项" |
c04f5ac3 | 12932 | |
349ede6a | 12933 | #: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 |
ef317cd5 | 12934 | msgid "read message from file" |
07432cef | 12935 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 12936 | |
349ede6a | 12937 | #: builtin/commit.c:1504 |
ef317cd5 | 12938 | msgid "author" |
07432cef | 12939 | msgstr "作者" |
c04f5ac3 | 12940 | |
349ede6a | 12941 | #: builtin/commit.c:1504 |
ef317cd5 | 12942 | msgid "override author for commit" |
07432cef | 12943 | msgstr "提交时覆盖作者" |
73a60cd2 | 12944 | |
349ede6a | 12945 | #: builtin/commit.c:1505 builtin/gc.c:538 |
ef317cd5 | 12946 | msgid "date" |
07432cef | 12947 | msgstr "日期" |
c04f5ac3 | 12948 | |
349ede6a | 12949 | #: builtin/commit.c:1505 |
ef317cd5 | 12950 | msgid "override date for commit" |
07432cef | 12951 | msgstr "提交时覆盖日期" |
c04f5ac3 | 12952 | |
349ede6a JX |
12953 | #: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 |
12954 | #: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 | |
94550ed3 JX |
12955 | msgid "commit" |
12956 | msgstr "提交" | |
12957 | ||
349ede6a | 12958 | #: builtin/commit.c:1507 |
ef317cd5 | 12959 | msgid "reuse and edit message from specified commit" |
07432cef | 12960 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 12961 | |
349ede6a | 12962 | #: builtin/commit.c:1508 |
ef317cd5 | 12963 | msgid "reuse message from specified commit" |
07432cef | 12964 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 12965 | |
349ede6a | 12966 | #: builtin/commit.c:1509 |
ef317cd5 | 12967 | msgid "use autosquash formatted message to fixup specified commit" |
07432cef | 12968 | msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" |
ef317cd5 | 12969 | |
349ede6a | 12970 | #: builtin/commit.c:1510 |
ef317cd5 | 12971 | msgid "use autosquash formatted message to squash specified commit" |
07432cef | 12972 | msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" |
ef317cd5 | 12973 | |
349ede6a | 12974 | #: builtin/commit.c:1511 |
ef317cd5 | 12975 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 12976 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 12977 | |
349ede6a JX |
12978 | #: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 |
12979 | #: builtin/pull.c:145 builtin/revert.c:110 | |
ef317cd5 | 12980 | msgid "add Signed-off-by:" |
07432cef | 12981 | msgstr "添加 Signed-off-by: 签名" |
ef317cd5 | 12982 | |
349ede6a | 12983 | #: builtin/commit.c:1513 |
ef317cd5 | 12984 | msgid "use specified template file" |
07432cef | 12985 | msgstr "使用指定的模板文件" |
ef317cd5 | 12986 | |
349ede6a | 12987 | #: builtin/commit.c:1514 |
ef317cd5 | 12988 | msgid "force edit of commit" |
07432cef | 12989 | msgstr "强制编辑提交" |
ef317cd5 | 12990 | |
349ede6a | 12991 | #: builtin/commit.c:1516 |
ef317cd5 | 12992 | msgid "include status in commit message template" |
07432cef | 12993 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 12994 | |
349ede6a | 12995 | #: builtin/commit.c:1521 |
ef317cd5 | 12996 | msgid "Commit contents options" |
07432cef | 12997 | msgstr "提交内容选项" |
ef317cd5 | 12998 | |
349ede6a | 12999 | #: builtin/commit.c:1522 |
ef317cd5 | 13000 | msgid "commit all changed files" |
07432cef | 13001 | msgstr "提交所有改动的文件" |
ef317cd5 | 13002 | |
349ede6a | 13003 | #: builtin/commit.c:1523 |
ef317cd5 | 13004 | msgid "add specified files to index for commit" |
07432cef | 13005 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 13006 | |
349ede6a | 13007 | #: builtin/commit.c:1524 |
ef317cd5 | 13008 | msgid "interactively add files" |
07432cef | 13009 | msgstr "交互式添加文件" |
ef317cd5 | 13010 | |
349ede6a | 13011 | #: builtin/commit.c:1525 |
ef317cd5 | 13012 | msgid "interactively add changes" |
07432cef | 13013 | msgstr "交互式添加变更" |
ef317cd5 | 13014 | |
349ede6a | 13015 | #: builtin/commit.c:1526 |
ef317cd5 | 13016 | msgid "commit only specified files" |
07432cef | 13017 | msgstr "只提交指定的文件" |
ef317cd5 | 13018 | |
349ede6a | 13019 | #: builtin/commit.c:1527 |
5c57d762 JX |
13020 | msgid "bypass pre-commit and commit-msg hooks" |
13021 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
13022 | ||
349ede6a | 13023 | #: builtin/commit.c:1528 |
ef317cd5 | 13024 | msgid "show what would be committed" |
07432cef | 13025 | msgstr "显示将要提交的内容" |
ef317cd5 | 13026 | |
349ede6a | 13027 | #: builtin/commit.c:1541 |
ef317cd5 | 13028 | msgid "amend previous commit" |
07432cef | 13029 | msgstr "修改先前的提交" |
ef317cd5 | 13030 | |
349ede6a | 13031 | #: builtin/commit.c:1542 |
ef317cd5 | 13032 | msgid "bypass post-rewrite hook" |
07432cef | 13033 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 13034 | |
349ede6a | 13035 | #: builtin/commit.c:1549 |
ef317cd5 | 13036 | msgid "ok to record an empty change" |
07432cef | 13037 | msgstr "允许一个空提交" |
ef317cd5 | 13038 | |
349ede6a | 13039 | #: builtin/commit.c:1551 |
ef317cd5 | 13040 | msgid "ok to record a change with an empty message" |
07432cef | 13041 | msgstr "允许空的提交说明" |
ef317cd5 | 13042 | |
349ede6a | 13043 | #: builtin/commit.c:1624 |
c04f5ac3 JX |
13044 | #, c-format |
13045 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 13046 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 13047 | |
349ede6a | 13048 | #: builtin/commit.c:1631 |
c04f5ac3 | 13049 | msgid "could not read MERGE_MODE" |
90e6ef53 | 13050 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 13051 | |
349ede6a | 13052 | #: builtin/commit.c:1652 |
c04f5ac3 JX |
13053 | #, c-format |
13054 | msgid "could not read commit message: %s" | |
90e6ef53 | 13055 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 13056 | |
349ede6a | 13057 | #: builtin/commit.c:1659 |
c04f5ac3 JX |
13058 | #, c-format |
13059 | msgid "Aborting commit due to empty commit message.\n" | |
13060 | msgstr "终止提交因为提交说明为空。\n" | |
13061 | ||
349ede6a | 13062 | #: builtin/commit.c:1664 |
6937cb4e JX |
13063 | #, c-format |
13064 | msgid "Aborting commit; you did not edit the message.\n" | |
13065 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
13066 | ||
349ede6a | 13067 | #: builtin/commit.c:1698 |
c04f5ac3 | 13068 | msgid "" |
c1ac5258 | 13069 | "repository has been updated, but unable to write\n" |
220c313c | 13070 | "new_index file. Check that disk is not full and quota is\n" |
a6cd2cc4 | 13071 | "not exceeded, and then \"git restore --staged :/\" to recover." |
c04f5ac3 | 13072 | msgstr "" |
a6cd2cc4 JX |
13073 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n" |
13074 | "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。" | |
c04f5ac3 | 13075 | |
4c27fcb5 | 13076 | #: builtin/config.c:11 |
814ff314 JX |
13077 | msgid "git config [<options>]" |
13078 | msgstr "git config [<选项>]" | |
ef317cd5 | 13079 | |
2b472aae | 13080 | #: builtin/config.c:104 builtin/env--helper.c:23 |
fd8cb379 JX |
13081 | #, c-format |
13082 | msgid "unrecognized --type argument, %s" | |
13083 | msgstr "未能识别的 --type 参数,%s" | |
13084 | ||
2b472aae | 13085 | #: builtin/config.c:116 |
c1ac5258 JX |
13086 | msgid "only one type at a time" |
13087 | msgstr "一次只能一个类型" | |
13088 | ||
2b472aae | 13089 | #: builtin/config.c:125 |
ef317cd5 | 13090 | msgid "Config file location" |
07432cef | 13091 | msgstr "配置文件位置" |
ef317cd5 | 13092 | |
2b472aae | 13093 | #: builtin/config.c:126 |
ef317cd5 | 13094 | msgid "use global config file" |
07432cef | 13095 | msgstr "使用全局配置文件" |
ef317cd5 | 13096 | |
2b472aae | 13097 | #: builtin/config.c:127 |
ef317cd5 | 13098 | msgid "use system config file" |
07432cef | 13099 | msgstr "使用系统级配置文件" |
ef317cd5 | 13100 | |
2b472aae | 13101 | #: builtin/config.c:128 |
ef317cd5 | 13102 | msgid "use repository config file" |
160fb2b2 | 13103 | msgstr "使用仓库级配置文件" |
ef317cd5 | 13104 | |
2b472aae | 13105 | #: builtin/config.c:129 |
4c27fcb5 JX |
13106 | msgid "use per-worktree config file" |
13107 | msgstr "使用工作区级别的配置文件" | |
13108 | ||
2b472aae | 13109 | #: builtin/config.c:130 |
ef317cd5 | 13110 | msgid "use given config file" |
07432cef | 13111 | msgstr "使用指定的配置文件" |
ef317cd5 | 13112 | |
2b472aae | 13113 | #: builtin/config.c:131 |
2e8451e8 | 13114 | msgid "blob-id" |
4375c10e | 13115 | msgstr "数据对象 ID" |
2e8451e8 | 13116 | |
2b472aae | 13117 | #: builtin/config.c:131 |
2e8451e8 JX |
13118 | msgid "read config from given blob object" |
13119 | msgstr "从给定的数据对象读取配置" | |
13120 | ||
2b472aae | 13121 | #: builtin/config.c:132 |
ef317cd5 | 13122 | msgid "Action" |
07432cef | 13123 | msgstr "操作" |
ef317cd5 | 13124 | |
2b472aae | 13125 | #: builtin/config.c:133 |
ef317cd5 | 13126 | msgid "get value: name [value-regex]" |
07432cef | 13127 | msgstr "获取值:name [value-regex]" |
ef317cd5 | 13128 | |
2b472aae | 13129 | #: builtin/config.c:134 |
ef317cd5 | 13130 | msgid "get all values: key [value-regex]" |
07432cef | 13131 | msgstr "获得所有的值:key [value-regex]" |
ef317cd5 | 13132 | |
2b472aae | 13133 | #: builtin/config.c:135 |
ef317cd5 | 13134 | msgid "get values for regexp: name-regex [value-regex]" |
07432cef | 13135 | msgstr "根据正则表达式获得值:name-regex [value-regex]" |
ef317cd5 | 13136 | |
2b472aae | 13137 | #: builtin/config.c:136 |
90314792 JX |
13138 | msgid "get value specific for the URL: section[.var] URL" |
13139 | msgstr "获得 URL 取值:section[.var] URL" | |
13140 | ||
2b472aae | 13141 | #: builtin/config.c:137 |
ef317cd5 | 13142 | msgid "replace all matching variables: name value [value_regex]" |
07432cef | 13143 | msgstr "替换所有匹配的变量:name value [value_regex]" |
ef317cd5 | 13144 | |
2b472aae | 13145 | #: builtin/config.c:138 |
ef317cd5 | 13146 | msgid "add a new variable: name value" |
07432cef | 13147 | msgstr "添加一个新的变量:name value" |
ef317cd5 | 13148 | |
2b472aae | 13149 | #: builtin/config.c:139 |
ef317cd5 | 13150 | msgid "remove a variable: name [value-regex]" |
07432cef | 13151 | msgstr "删除一个变量:name [value-regex]" |
ef317cd5 | 13152 | |
2b472aae | 13153 | #: builtin/config.c:140 |
ef317cd5 | 13154 | msgid "remove all matches: name [value-regex]" |
07432cef | 13155 | msgstr "删除所有匹配项:name [value-regex]" |
ef317cd5 | 13156 | |
2b472aae | 13157 | #: builtin/config.c:141 |
ef317cd5 | 13158 | msgid "rename section: old-name new-name" |
07432cef | 13159 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 13160 | |
2b472aae | 13161 | #: builtin/config.c:142 |
ef317cd5 | 13162 | msgid "remove a section: name" |
07432cef | 13163 | msgstr "删除一个小节:name" |
ef317cd5 | 13164 | |
2b472aae | 13165 | #: builtin/config.c:143 |
ef317cd5 | 13166 | msgid "list all" |
07432cef | 13167 | msgstr "列出所有" |
ef317cd5 | 13168 | |
2b472aae | 13169 | #: builtin/config.c:144 |
ef317cd5 | 13170 | msgid "open an editor" |
07432cef | 13171 | msgstr "打开一个编辑器" |
ef317cd5 | 13172 | |
2b472aae | 13173 | #: builtin/config.c:145 |
04cb2f28 JX |
13174 | msgid "find the color configured: slot [default]" |
13175 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 13176 | |
2b472aae | 13177 | #: builtin/config.c:146 |
04cb2f28 JX |
13178 | msgid "find the color setting: slot [stdout-is-tty]" |
13179 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 13180 | |
2b472aae | 13181 | #: builtin/config.c:147 |
ef317cd5 | 13182 | msgid "Type" |
07432cef | 13183 | msgstr "类型" |
ef317cd5 | 13184 | |
2b472aae | 13185 | #: builtin/config.c:148 builtin/env--helper.c:38 |
fd8cb379 JX |
13186 | msgid "value is given this type" |
13187 | msgstr "取值为该类型" | |
13188 | ||
2b472aae | 13189 | #: builtin/config.c:149 |
ef317cd5 | 13190 | msgid "value is \"true\" or \"false\"" |
07432cef | 13191 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 13192 | |
2b472aae | 13193 | #: builtin/config.c:150 |
ef317cd5 | 13194 | msgid "value is decimal number" |
07432cef | 13195 | msgstr "值是十进制数" |
ef317cd5 | 13196 | |
2b472aae | 13197 | #: builtin/config.c:151 |
ef317cd5 | 13198 | msgid "value is --bool or --int" |
07432cef | 13199 | msgstr "值是 --bool or --int" |
ef317cd5 | 13200 | |
2b472aae | 13201 | #: builtin/config.c:152 |
ef317cd5 | 13202 | msgid "value is a path (file or directory name)" |
07432cef | 13203 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 13204 | |
2b472aae | 13205 | #: builtin/config.c:153 |
5809aa05 JX |
13206 | msgid "value is an expiry date" |
13207 | msgstr "值是一个到期日期" | |
13208 | ||
2b472aae | 13209 | #: builtin/config.c:154 |
ef317cd5 | 13210 | msgid "Other" |
07432cef | 13211 | msgstr "其它" |
ef317cd5 | 13212 | |
2b472aae | 13213 | #: builtin/config.c:155 |
ef317cd5 | 13214 | msgid "terminate values with NUL byte" |
4375c10e | 13215 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 13216 | |
2b472aae | 13217 | #: builtin/config.c:156 |
1b7f4a34 JX |
13218 | msgid "show variable names only" |
13219 | msgstr "只显示变量名" | |
13220 | ||
2b472aae | 13221 | #: builtin/config.c:157 |
ef317cd5 | 13222 | msgid "respect include directives on lookup" |
07432cef | 13223 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 13224 | |
2b472aae | 13225 | #: builtin/config.c:158 |
276ceeaa JX |
13226 | msgid "show origin of config (file, standard input, blob, command line)" |
13227 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
13228 | ||
2b472aae JX |
13229 | #: builtin/config.c:159 |
13230 | msgid "show scope of config (worktree, local, global, system, command)" | |
440e7442 | 13231 | msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)" |
2b472aae JX |
13232 | |
13233 | #: builtin/config.c:160 builtin/env--helper.c:40 | |
fd8cb379 JX |
13234 | msgid "value" |
13235 | msgstr "取值" | |
13236 | ||
2b472aae | 13237 | #: builtin/config.c:160 |
fd8cb379 JX |
13238 | msgid "with --get, use default value when missing entry" |
13239 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
13240 | ||
2b472aae | 13241 | #: builtin/config.c:174 |
c1ac5258 JX |
13242 | #, c-format |
13243 | msgid "wrong number of arguments, should be %d" | |
13244 | msgstr "错误的参数个数,应该为 %d 个" | |
13245 | ||
2b472aae | 13246 | #: builtin/config.c:176 |
c1ac5258 JX |
13247 | #, c-format |
13248 | msgid "wrong number of arguments, should be from %d to %d" | |
13249 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
13250 | ||
2b472aae | 13251 | #: builtin/config.c:324 |
c1ac5258 JX |
13252 | #, c-format |
13253 | msgid "invalid key pattern: %s" | |
13254 | msgstr "无效键名模式:%s" | |
13255 | ||
2b472aae | 13256 | #: builtin/config.c:360 |
fd8cb379 JX |
13257 | #, c-format |
13258 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
13259 | msgstr "格式化默认配置值失败:%s" |
13260 | ||
2b472aae | 13261 | #: builtin/config.c:417 |
c1ac5258 JX |
13262 | #, c-format |
13263 | msgid "cannot parse color '%s'" | |
13264 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 13265 | |
2b472aae | 13266 | #: builtin/config.c:459 |
220c313c | 13267 | msgid "unable to parse default color value" |
c1ac5258 JX |
13268 | msgstr "无法解析默认颜色值" |
13269 | ||
2b472aae | 13270 | #: builtin/config.c:512 builtin/config.c:768 |
c1ac5258 JX |
13271 | msgid "not in a git directory" |
13272 | msgstr "不在 git 仓库中" | |
13273 | ||
2b472aae | 13274 | #: builtin/config.c:515 |
c1ac5258 JX |
13275 | msgid "writing to stdin is not supported" |
13276 | msgstr "不支持写到标准输入" | |
13277 | ||
2b472aae | 13278 | #: builtin/config.c:518 |
c1ac5258 JX |
13279 | msgid "writing config blobs is not supported" |
13280 | msgstr "不支持写到配置数据对象" | |
220c313c | 13281 | |
2b472aae | 13282 | #: builtin/config.c:603 |
220c313c JX |
13283 | #, c-format |
13284 | msgid "" | |
13285 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 13286 | "[user]\n" |
220c313c | 13287 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 13288 | "#\tname = %s\n" |
220c313c JX |
13289 | "#\temail = %s\n" |
13290 | msgstr "" | |
13291 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 13292 | "[user]\n" |
220c313c | 13293 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 13294 | "#\tname = %s\n" |
220c313c JX |
13295 | "#\temail = %s\n" |
13296 | ||
2b472aae | 13297 | #: builtin/config.c:627 |
c1ac5258 JX |
13298 | msgid "only one config file at a time" |
13299 | msgstr "一次只能有一个配置文件" | |
13300 | ||
2b472aae | 13301 | #: builtin/config.c:632 |
a4f16749 JX |
13302 | msgid "--local can only be used inside a git repository" |
13303 | msgstr "--local 只能在一个仓库内使用" | |
13304 | ||
2b472aae | 13305 | #: builtin/config.c:635 |
fd8cb379 JX |
13306 | msgid "--blob can only be used inside a git repository" |
13307 | msgstr "--blob 只能在一个仓库内使用" | |
13308 | ||
2b472aae | 13309 | #: builtin/config.c:655 |
c1ac5258 JX |
13310 | msgid "$HOME not set" |
13311 | msgstr "$HOME 未设置" | |
13312 | ||
2b472aae | 13313 | #: builtin/config.c:679 |
4c27fcb5 JX |
13314 | msgid "" |
13315 | "--worktree cannot be used with multiple working trees unless the config\n" | |
13316 | "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" | |
13317 | "section in \"git help worktree\" for details" | |
13318 | msgstr "" | |
13319 | "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n" | |
13320 | "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" | |
13321 | ||
2b472aae | 13322 | #: builtin/config.c:714 |
c1ac5258 JX |
13323 | msgid "--get-color and variable type are incoherent" |
13324 | msgstr "--get-color 和变量类型不兼容" | |
13325 | ||
2b472aae | 13326 | #: builtin/config.c:719 |
c1ac5258 JX |
13327 | msgid "only one action at a time" |
13328 | msgstr "一次只能有一个动作" | |
13329 | ||
2b472aae | 13330 | #: builtin/config.c:732 |
c1ac5258 JX |
13331 | msgid "--name-only is only applicable to --list or --get-regexp" |
13332 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
13333 | ||
2b472aae | 13334 | #: builtin/config.c:738 |
c1ac5258 JX |
13335 | msgid "" |
13336 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
13337 | "list" | |
13338 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
13339 | ||
2b472aae | 13340 | #: builtin/config.c:744 |
c1ac5258 JX |
13341 | msgid "--default is only applicable to --get" |
13342 | msgstr "--default 仅适用于 --get" | |
13343 | ||
2b472aae | 13344 | #: builtin/config.c:757 |
c1ac5258 JX |
13345 | #, c-format |
13346 | msgid "unable to read config file '%s'" | |
13347 | msgstr "无法读取配置文件 '%s'" | |
13348 | ||
2b472aae | 13349 | #: builtin/config.c:760 |
c1ac5258 JX |
13350 | msgid "error processing config file(s)" |
13351 | msgstr "处理配置文件出错" | |
13352 | ||
2b472aae | 13353 | #: builtin/config.c:770 |
c1ac5258 JX |
13354 | msgid "editing stdin is not supported" |
13355 | msgstr "不支持编辑标准输入" | |
13356 | ||
2b472aae | 13357 | #: builtin/config.c:772 |
c1ac5258 JX |
13358 | msgid "editing blobs is not supported" |
13359 | msgstr "不支持编辑数据对象" | |
13360 | ||
2b472aae | 13361 | #: builtin/config.c:786 |
220c313c JX |
13362 | #, c-format |
13363 | msgid "cannot create configuration file %s" | |
13364 | msgstr "不能创建配置文件 %s" | |
13365 | ||
2b472aae | 13366 | #: builtin/config.c:799 |
a0b6b246 JX |
13367 | #, c-format |
13368 | msgid "" | |
13369 | "cannot overwrite multiple values with a single value\n" | |
13370 | " Use a regexp, --add or --replace-all to change %s." | |
13371 | msgstr "" | |
13372 | "无法用一个值覆盖多个值\n" | |
13373 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
13374 | ||
2b472aae | 13375 | #: builtin/config.c:873 builtin/config.c:884 |
c1ac5258 JX |
13376 | #, c-format |
13377 | msgid "no such section: %s" | |
13378 | msgstr "无此小节:%s" | |
13379 | ||
fd8cb379 | 13380 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
13381 | msgid "git count-objects [-v] [-H | --human-readable]" |
13382 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
13383 | ||
fd8cb379 | 13384 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
13385 | msgid "print sizes in human readable format" |
13386 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 13387 | |
a5cd71ca | 13388 | #: builtin/describe.c:26 |
814ff314 JX |
13389 | msgid "git describe [<options>] [<commit-ish>...]" |
13390 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 13391 | |
a5cd71ca | 13392 | #: builtin/describe.c:27 |
814ff314 JX |
13393 | msgid "git describe [<options>] --dirty" |
13394 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 13395 | |
349ede6a | 13396 | #: builtin/describe.c:63 |
87cb7997 JX |
13397 | msgid "head" |
13398 | msgstr "头" | |
13399 | ||
349ede6a | 13400 | #: builtin/describe.c:63 |
87cb7997 JX |
13401 | msgid "lightweight" |
13402 | msgstr "轻量级的" | |
13403 | ||
349ede6a | 13404 | #: builtin/describe.c:63 |
87cb7997 JX |
13405 | msgid "annotated" |
13406 | msgstr "附注的" | |
13407 | ||
349ede6a | 13408 | #: builtin/describe.c:277 |
c04f5ac3 JX |
13409 | #, c-format |
13410 | msgid "annotated tag %s not available" | |
55a16ee4 | 13411 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 13412 | |
a5cd71ca | 13413 | #: builtin/describe.c:281 |
c04f5ac3 | 13414 | #, c-format |
349ede6a JX |
13415 | msgid "tag '%s' is externally known as '%s'" |
13416 | msgstr "标签 '%s' 在外部被认为是 '%s'" | |
c04f5ac3 | 13417 | |
349ede6a | 13418 | #: builtin/describe.c:328 |
c04f5ac3 JX |
13419 | #, c-format |
13420 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 13421 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 13422 | |
349ede6a | 13423 | #: builtin/describe.c:330 |
c04f5ac3 | 13424 | #, c-format |
5809aa05 JX |
13425 | msgid "No exact match on refs or tags, searching to describe\n" |
13426 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 13427 | |
349ede6a | 13428 | #: builtin/describe.c:397 |
c04f5ac3 JX |
13429 | #, c-format |
13430 | msgid "finished search at %s\n" | |
13431 | msgstr "完成搜索 %s\n" | |
13432 | ||
349ede6a | 13433 | #: builtin/describe.c:424 |
c04f5ac3 JX |
13434 | #, c-format |
13435 | msgid "" | |
13436 | "No annotated tags can describe '%s'.\n" | |
13437 | "However, there were unannotated tags: try --tags." | |
13438 | msgstr "" | |
55a16ee4 RC |
13439 | "没有附注标签能描述 '%s'。\n" |
13440 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 13441 | |
349ede6a | 13442 | #: builtin/describe.c:428 |
c04f5ac3 JX |
13443 | #, c-format |
13444 | msgid "" | |
13445 | "No tags can describe '%s'.\n" | |
13446 | "Try --always, or create some tags." | |
13447 | msgstr "" | |
55a16ee4 RC |
13448 | "没有标签能描述 '%s'。\n" |
13449 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 13450 | |
349ede6a | 13451 | #: builtin/describe.c:458 |
c04f5ac3 JX |
13452 | #, c-format |
13453 | msgid "traversed %lu commits\n" | |
13454 | msgstr "已遍历 %lu 个提交\n" | |
13455 | ||
349ede6a | 13456 | #: builtin/describe.c:461 |
c04f5ac3 JX |
13457 | #, c-format |
13458 | msgid "" | |
13459 | "more than %i tags found; listed %i most recent\n" | |
13460 | "gave up search at %s\n" | |
13461 | msgstr "" | |
55a16ee4 | 13462 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 13463 | "在 %s 放弃搜索\n" |
c04f5ac3 | 13464 | |
349ede6a | 13465 | #: builtin/describe.c:529 |
5809aa05 JX |
13466 | #, c-format |
13467 | msgid "describe %s\n" | |
13468 | msgstr "描述 %s\n" | |
13469 | ||
349ede6a | 13470 | #: builtin/describe.c:532 |
5809aa05 JX |
13471 | #, c-format |
13472 | msgid "Not a valid object name %s" | |
13473 | msgstr "不是一个有效的对象名 %s" | |
13474 | ||
349ede6a | 13475 | #: builtin/describe.c:540 |
5809aa05 JX |
13476 | #, c-format |
13477 | msgid "%s is neither a commit nor blob" | |
13478 | msgstr "%s 既不是提交也不是数据对象" | |
13479 | ||
349ede6a | 13480 | #: builtin/describe.c:554 |
ef317cd5 | 13481 | msgid "find the tag that comes after the commit" |
55a16ee4 | 13482 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 13483 | |
349ede6a | 13484 | #: builtin/describe.c:555 |
ef317cd5 | 13485 | msgid "debug search strategy on stderr" |
07432cef | 13486 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 13487 | |
349ede6a | 13488 | #: builtin/describe.c:556 |
1003b3a5 JX |
13489 | msgid "use any ref" |
13490 | msgstr "使用任意引用" | |
13491 | ||
349ede6a | 13492 | #: builtin/describe.c:557 |
1003b3a5 | 13493 | msgid "use any tag, even unannotated" |
55a16ee4 | 13494 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 13495 | |
349ede6a | 13496 | #: builtin/describe.c:558 |
ef317cd5 | 13497 | msgid "always use long format" |
07432cef | 13498 | msgstr "始终使用长提交号格式" |
ef317cd5 | 13499 | |
349ede6a | 13500 | #: builtin/describe.c:559 |
2e8451e8 JX |
13501 | msgid "only follow first parent" |
13502 | msgstr "只跟随第一个父提交" | |
13503 | ||
349ede6a | 13504 | #: builtin/describe.c:562 |
ef317cd5 | 13505 | msgid "only output exact matches" |
07432cef | 13506 | msgstr "只输出精确匹配" |
ef317cd5 | 13507 | |
349ede6a | 13508 | #: builtin/describe.c:564 |
ef317cd5 | 13509 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 13510 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 13511 | |
349ede6a | 13512 | #: builtin/describe.c:566 |
ef317cd5 | 13513 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 13514 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 13515 | |
349ede6a | 13516 | #: builtin/describe.c:568 |
87cb7997 JX |
13517 | msgid "do not consider tags matching <pattern>" |
13518 | msgstr "不考虑匹配 <模式> 的标签" | |
13519 | ||
349ede6a | 13520 | #: builtin/describe.c:570 builtin/name-rev.c:535 |
ef317cd5 | 13521 | msgid "show abbreviated commit object as fallback" |
07432cef | 13522 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 13523 | |
349ede6a | 13524 | #: builtin/describe.c:571 builtin/describe.c:574 |
ef317cd5 | 13525 | msgid "mark" |
07432cef | 13526 | msgstr "标记" |
ef317cd5 | 13527 | |
349ede6a | 13528 | #: builtin/describe.c:572 |
ef317cd5 | 13529 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 13530 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 13531 | |
349ede6a | 13532 | #: builtin/describe.c:575 |
87cb7997 JX |
13533 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
13534 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
13535 | ||
349ede6a | 13536 | #: builtin/describe.c:593 |
c04f5ac3 JX |
13537 | msgid "--long is incompatible with --abbrev=0" |
13538 | msgstr "--long 与 --abbrev=0 不兼容" | |
13539 | ||
349ede6a | 13540 | #: builtin/describe.c:622 |
c04f5ac3 | 13541 | msgid "No names found, cannot describe anything." |
90e6ef53 | 13542 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 13543 | |
349ede6a | 13544 | #: builtin/describe.c:673 |
a8a5406a | 13545 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
13546 | msgstr "--dirty 与提交号不兼容" |
13547 | ||
349ede6a | 13548 | #: builtin/describe.c:675 |
87cb7997 JX |
13549 | msgid "--broken is incompatible with commit-ishes" |
13550 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 13551 | |
7157c2b5 | 13552 | #: builtin/diff.c:91 |
c04f5ac3 JX |
13553 | #, c-format |
13554 | msgid "'%s': not a regular file or symlink" | |
13555 | msgstr "'%s':不是一个正规文件或符号链接" | |
13556 | ||
7157c2b5 | 13557 | #: builtin/diff.c:242 |
c04f5ac3 JX |
13558 | #, c-format |
13559 | msgid "invalid option: %s" | |
13560 | msgstr "无效选项:%s" | |
13561 | ||
7157c2b5 JX |
13562 | #: builtin/diff.c:359 |
13563 | #, c-format | |
13564 | msgid "%s...%s: no merge base" | |
13565 | msgstr "%s...%s:无合并基线" | |
13566 | ||
13567 | #: builtin/diff.c:469 | |
c04f5ac3 | 13568 | msgid "Not a git repository" |
160fb2b2 | 13569 | msgstr "不是一个 git 仓库" |
c04f5ac3 | 13570 | |
7157c2b5 | 13571 | #: builtin/diff.c:514 |
c04f5ac3 JX |
13572 | #, c-format |
13573 | msgid "invalid object '%s' given." | |
13574 | msgstr "提供了无效对象 '%s'。" | |
13575 | ||
7157c2b5 | 13576 | #: builtin/diff.c:525 |
c04f5ac3 JX |
13577 | #, c-format |
13578 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 13579 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 13580 | |
7157c2b5 | 13581 | #: builtin/diff.c:530 |
c04f5ac3 JX |
13582 | #, c-format |
13583 | msgid "unhandled object '%s' given." | |
6c94aba5 | 13584 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 13585 | |
7157c2b5 JX |
13586 | #: builtin/diff.c:564 |
13587 | #, c-format | |
13588 | msgid "%s...%s: multiple merge bases, using %s" | |
13589 | msgstr "%s...%s:多条合并基线,使用 %s" | |
13590 | ||
d46c5519 | 13591 | #: builtin/difftool.c:30 |
1a79b2f1 JX |
13592 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
13593 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
13594 | ||
a5cd71ca | 13595 | #: builtin/difftool.c:260 |
1a79b2f1 JX |
13596 | #, c-format |
13597 | msgid "failed: %d" | |
13598 | msgstr "失败:%d" | |
13599 | ||
a5cd71ca | 13600 | #: builtin/difftool.c:302 |
87cb7997 JX |
13601 | #, c-format |
13602 | msgid "could not read symlink %s" | |
13603 | msgstr "无法读取符号链接 %s" | |
13604 | ||
a5cd71ca | 13605 | #: builtin/difftool.c:304 |
87cb7997 JX |
13606 | #, c-format |
13607 | msgid "could not read symlink file %s" | |
13608 | msgstr "无法读取符号链接文件 %s" | |
13609 | ||
a5cd71ca | 13610 | #: builtin/difftool.c:312 |
87cb7997 JX |
13611 | #, c-format |
13612 | msgid "could not read object %s for symlink %s" | |
13613 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
13614 | ||
a5cd71ca | 13615 | #: builtin/difftool.c:413 |
1a79b2f1 JX |
13616 | msgid "" |
13617 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
13618 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
13619 | msgstr "" |
13620 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
13621 | "cc')。" | |
1a79b2f1 | 13622 | |
a5cd71ca | 13623 | #: builtin/difftool.c:634 |
1a79b2f1 JX |
13624 | #, c-format |
13625 | msgid "both files modified: '%s' and '%s'." | |
13626 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
13627 | ||
a5cd71ca | 13628 | #: builtin/difftool.c:636 |
1a79b2f1 JX |
13629 | msgid "working tree file has been left." |
13630 | msgstr "工作区文件被留了下来。" | |
13631 | ||
a5cd71ca | 13632 | #: builtin/difftool.c:647 |
1a79b2f1 JX |
13633 | #, c-format |
13634 | msgid "temporary files exist in '%s'." | |
13635 | msgstr "临时文件存在于 '%s'。" | |
13636 | ||
a5cd71ca | 13637 | #: builtin/difftool.c:648 |
1a79b2f1 JX |
13638 | msgid "you may want to cleanup or recover these." |
13639 | msgstr "您可能想要清理或者恢复它们。" | |
13640 | ||
a5cd71ca | 13641 | #: builtin/difftool.c:697 |
1a79b2f1 JX |
13642 | msgid "use `diff.guitool` instead of `diff.tool`" |
13643 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
13644 | ||
a5cd71ca | 13645 | #: builtin/difftool.c:699 |
1a79b2f1 JX |
13646 | msgid "perform a full-directory diff" |
13647 | msgstr "执行一个全目录差异比较" | |
13648 | ||
a5cd71ca | 13649 | #: builtin/difftool.c:701 |
1a79b2f1 JX |
13650 | msgid "do not prompt before launching a diff tool" |
13651 | msgstr "启动差异比较工具之前不提示" | |
13652 | ||
a5cd71ca | 13653 | #: builtin/difftool.c:706 |
1a79b2f1 JX |
13654 | msgid "use symlinks in dir-diff mode" |
13655 | msgstr "在 dir-diff 模式中使用符号链接" | |
13656 | ||
a5cd71ca | 13657 | #: builtin/difftool.c:707 |
c1ac5258 JX |
13658 | msgid "tool" |
13659 | msgstr "工具" | |
13660 | ||
a5cd71ca | 13661 | #: builtin/difftool.c:708 |
1a79b2f1 JX |
13662 | msgid "use the specified diff tool" |
13663 | msgstr "使用指定的差异比较工具" | |
13664 | ||
a5cd71ca | 13665 | #: builtin/difftool.c:710 |
1a79b2f1 JX |
13666 | msgid "print a list of diff tools that may be used with `--tool`" |
13667 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
13668 | ||
a5cd71ca | 13669 | #: builtin/difftool.c:713 |
1a79b2f1 JX |
13670 | msgid "" |
13671 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
13672 | "code" | |
13673 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
13674 | ||
a5cd71ca | 13675 | #: builtin/difftool.c:716 |
1a79b2f1 JX |
13676 | msgid "specify a custom command for viewing diffs" |
13677 | msgstr "指定一个用于查看差异的自定义命令" | |
13678 | ||
a5cd71ca | 13679 | #: builtin/difftool.c:717 |
d46c5519 JX |
13680 | msgid "passed to `diff`" |
13681 | msgstr "传递给 `diff`" | |
13682 | ||
a5cd71ca | 13683 | #: builtin/difftool.c:732 |
d46c5519 JX |
13684 | msgid "difftool requires worktree or --no-index" |
13685 | msgstr "difftool 要求工作区或者 --no-index" | |
13686 | ||
a5cd71ca | 13687 | #: builtin/difftool.c:739 |
d46c5519 JX |
13688 | msgid "--dir-diff is incompatible with --no-index" |
13689 | msgstr "--dir-diff 和 --no-index 不兼容" | |
13690 | ||
a5cd71ca | 13691 | #: builtin/difftool.c:742 |
d46c5519 JX |
13692 | msgid "--gui, --tool and --extcmd are mutually exclusive" |
13693 | msgstr "--gui、--tool 和 --extcmd 互斥" | |
13694 | ||
a5cd71ca | 13695 | #: builtin/difftool.c:750 |
1a79b2f1 JX |
13696 | msgid "no <tool> given for --tool=<tool>" |
13697 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
13698 | ||
a5cd71ca | 13699 | #: builtin/difftool.c:757 |
1a79b2f1 JX |
13700 | msgid "no <cmd> given for --extcmd=<cmd>" |
13701 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
13702 | ||
a6cd2cc4 JX |
13703 | #: builtin/env--helper.c:6 |
13704 | msgid "git env--helper --type=[bool|ulong] <options> <env-var>" | |
13705 | msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" | |
13706 | ||
13707 | #: builtin/env--helper.c:37 builtin/hash-object.c:98 | |
13708 | msgid "type" | |
13709 | msgstr "类型" | |
13710 | ||
13711 | #: builtin/env--helper.c:41 | |
13712 | msgid "default for git_env_*(...) to fall back on" | |
13713 | msgstr "git_env_*(...) 的默认值" | |
13714 | ||
13715 | #: builtin/env--helper.c:43 | |
13716 | msgid "be quiet only use git_env_*() value as exit code" | |
13717 | msgstr "安静模式,只使用 git_env_*() 的值作为退出码" | |
13718 | ||
13719 | #: builtin/env--helper.c:62 | |
13720 | #, c-format | |
13721 | msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" | |
13722 | msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`" | |
13723 | ||
13724 | #: builtin/env--helper.c:77 | |
13725 | #, c-format | |
13726 | msgid "" | |
13727 | "option `--default' expects an unsigned long value with `--type=ulong`, not `" | |
13728 | "%s`" | |
13729 | msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`" | |
13730 | ||
c1ac5258 | 13731 | #: builtin/fast-export.c:29 |
ef317cd5 | 13732 | msgid "git fast-export [rev-list-opts]" |
07432cef | 13733 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 13734 | |
7157c2b5 | 13735 | #: builtin/fast-export.c:868 |
a5cd71ca JX |
13736 | msgid "Error: Cannot export nested tags unless --mark-tags is specified." |
13737 | msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。" | |
13738 | ||
7157c2b5 JX |
13739 | #: builtin/fast-export.c:1178 |
13740 | msgid "--anonymize-map token cannot be empty" | |
13741 | msgstr "--anonymize-map 取值不能为空" | |
13742 | ||
13743 | #: builtin/fast-export.c:1198 | |
ef317cd5 | 13744 | msgid "show progress after <n> objects" |
07432cef | 13745 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 13746 | |
7157c2b5 | 13747 | #: builtin/fast-export.c:1200 |
ef317cd5 | 13748 | msgid "select handling of signed tags" |
55a16ee4 | 13749 | msgstr "选择如何处理签名标签" |
ef317cd5 | 13750 | |
7157c2b5 | 13751 | #: builtin/fast-export.c:1203 |
ef317cd5 | 13752 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 13753 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 13754 | |
7157c2b5 | 13755 | #: builtin/fast-export.c:1206 |
a6cd2cc4 JX |
13756 | msgid "select handling of commit messages in an alternate encoding" |
13757 | msgstr "选择使用备用编码处理提交说明" | |
13758 | ||
7157c2b5 | 13759 | #: builtin/fast-export.c:1209 |
ef317cd5 | 13760 | msgid "Dump marks to this file" |
07432cef | 13761 | msgstr "把标记存储到这个文件" |
ef317cd5 | 13762 | |
7157c2b5 | 13763 | #: builtin/fast-export.c:1211 |
ef317cd5 | 13764 | msgid "Import marks from this file" |
07432cef | 13765 | msgstr "从这个文件导入标记" |
ef317cd5 | 13766 | |
7157c2b5 | 13767 | #: builtin/fast-export.c:1215 |
a5cd71ca JX |
13768 | msgid "Import marks from this file if it exists" |
13769 | msgstr "从该文件导入标记(如果存在的话)" | |
13770 | ||
7157c2b5 | 13771 | #: builtin/fast-export.c:1217 |
ef317cd5 | 13772 | msgid "Fake a tagger when tags lack one" |
55a16ee4 | 13773 | msgstr "当标签缺少标记者字段时,假装提供一个" |
ef317cd5 | 13774 | |
7157c2b5 | 13775 | #: builtin/fast-export.c:1219 |
ef317cd5 | 13776 | msgid "Output full tree for each commit" |
07432cef | 13777 | msgstr "每次提交都输出整个树" |
ef317cd5 | 13778 | |
7157c2b5 | 13779 | #: builtin/fast-export.c:1221 |
ef317cd5 | 13780 | msgid "Use the done feature to terminate the stream" |
07432cef | 13781 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 13782 | |
7157c2b5 | 13783 | #: builtin/fast-export.c:1222 |
ef317cd5 | 13784 | msgid "Skip output of blob data" |
07432cef | 13785 | msgstr "跳过数据对象的输出" |
ef317cd5 | 13786 | |
7157c2b5 | 13787 | #: builtin/fast-export.c:1223 builtin/log.c:1724 |
6acbf033 | 13788 | msgid "refspec" |
160fb2b2 | 13789 | msgstr "引用规格" |
6acbf033 | 13790 | |
7157c2b5 | 13791 | #: builtin/fast-export.c:1224 |
6acbf033 | 13792 | msgid "Apply refspec to exported refs" |
160fb2b2 | 13793 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 13794 | |
7157c2b5 | 13795 | #: builtin/fast-export.c:1225 |
220c313c JX |
13796 | msgid "anonymize output" |
13797 | msgstr "匿名输出" | |
13798 | ||
7157c2b5 JX |
13799 | #: builtin/fast-export.c:1226 |
13800 | msgid "from:to" | |
13801 | msgstr "from:to" | |
13802 | ||
13803 | #: builtin/fast-export.c:1227 | |
13804 | msgid "convert <from> to <to> in anonymized output" | |
13805 | msgstr "在匿名输出中将 <from> 转换为 <to>" | |
13806 | ||
13807 | #: builtin/fast-export.c:1230 | |
06991777 | 13808 | msgid "Reference parents which are not in fast-export stream by object id" |
5b533632 | 13809 | msgstr "引用父对象 ID 不在 fast-export 流中" |
06991777 | 13810 | |
7157c2b5 | 13811 | #: builtin/fast-export.c:1232 |
06991777 | 13812 | msgid "Show original object ids of blobs/commits" |
5b533632 | 13813 | msgstr "显示数据对象/提交的原始对象 ID" |
06991777 | 13814 | |
7157c2b5 | 13815 | #: builtin/fast-export.c:1234 |
a5cd71ca JX |
13816 | msgid "Label tags with mark ids" |
13817 | msgstr "对带有标记 ID 的标签做标记" | |
13818 | ||
7157c2b5 JX |
13819 | #: builtin/fast-export.c:1257 |
13820 | msgid "--anonymize-map without --anonymize does not make sense" | |
13821 | msgstr "--anonymize-map 而没有 --anonymize 没有意义" | |
13822 | ||
13823 | #: builtin/fast-export.c:1272 | |
a5cd71ca JX |
13824 | msgid "Cannot pass both --import-marks and --import-marks-if-exists" |
13825 | msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" | |
13826 | ||
7157c2b5 JX |
13827 | #: builtin/fetch-pack.c:245 |
13828 | #, c-format | |
13829 | msgid "Lockfile created but not reported: %s" | |
13830 | msgstr "Lockfile 已创建但未报告:%s" | |
13831 | ||
349ede6a | 13832 | #: builtin/fetch.c:35 |
ef317cd5 | 13833 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 13834 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 13835 | |
349ede6a | 13836 | #: builtin/fetch.c:36 |
ef317cd5 | 13837 | msgid "git fetch [<options>] <group>" |
07432cef | 13838 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 13839 | |
349ede6a | 13840 | #: builtin/fetch.c:37 |
ef317cd5 | 13841 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 13842 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 13843 | |
349ede6a | 13844 | #: builtin/fetch.c:38 |
ef317cd5 | 13845 | msgid "git fetch --all [<options>]" |
07432cef | 13846 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 13847 | |
349ede6a | 13848 | #: builtin/fetch.c:117 |
a5cd71ca JX |
13849 | msgid "fetch.parallel cannot be negative" |
13850 | msgstr "fetch.parallel 不能为负数" | |
13851 | ||
349ede6a | 13852 | #: builtin/fetch.c:140 builtin/pull.c:185 |
ef317cd5 | 13853 | msgid "fetch from all remotes" |
07432cef | 13854 | msgstr "从所有的远程抓取" |
ef317cd5 | 13855 | |
349ede6a | 13856 | #: builtin/fetch.c:142 builtin/pull.c:245 |
a5cd71ca JX |
13857 | msgid "set upstream for git pull/fetch" |
13858 | msgstr "为 git pull/fetch 设置上游" | |
13859 | ||
349ede6a | 13860 | #: builtin/fetch.c:144 builtin/pull.c:188 |
ef317cd5 | 13861 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 13862 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 13863 | |
349ede6a | 13864 | #: builtin/fetch.c:146 builtin/pull.c:191 |
ef317cd5 | 13865 | msgid "path to upload pack on remote end" |
07432cef | 13866 | msgstr "上传包到远程的路径" |
ef317cd5 | 13867 | |
349ede6a | 13868 | #: builtin/fetch.c:147 |
4c27fcb5 JX |
13869 | msgid "force overwrite of local reference" |
13870 | msgstr "强制覆盖本地引用" | |
ef317cd5 | 13871 | |
349ede6a | 13872 | #: builtin/fetch.c:149 |
ef317cd5 | 13873 | msgid "fetch from multiple remotes" |
07432cef | 13874 | msgstr "从多个远程抓取" |
ef317cd5 | 13875 | |
349ede6a | 13876 | #: builtin/fetch.c:151 builtin/pull.c:195 |
ef317cd5 | 13877 | msgid "fetch all tags and associated objects" |
55a16ee4 | 13878 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 13879 | |
349ede6a | 13880 | #: builtin/fetch.c:153 |
ef317cd5 | 13881 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 13882 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 13883 | |
349ede6a | 13884 | #: builtin/fetch.c:155 |
276ceeaa JX |
13885 | msgid "number of submodules fetched in parallel" |
13886 | msgstr "子模组获取的并发数" | |
13887 | ||
349ede6a | 13888 | #: builtin/fetch.c:157 builtin/pull.c:198 |
ef317cd5 | 13889 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 13890 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 13891 | |
349ede6a | 13892 | #: builtin/fetch.c:159 |
31e5e17b JX |
13893 | msgid "prune local tags no longer on remote and clobber changed tags" |
13894 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
13895 | ||
07432cef | 13896 | # 译者:可选值,不能翻译 |
349ede6a | 13897 | #: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 |
ef317cd5 | 13898 | msgid "on-demand" |
07432cef | 13899 | msgstr "on-demand" |
ef317cd5 | 13900 | |
349ede6a | 13901 | #: builtin/fetch.c:161 |
ef317cd5 | 13902 | msgid "control recursive fetching of submodules" |
07432cef | 13903 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 13904 | |
349ede6a | 13905 | #: builtin/fetch.c:165 builtin/pull.c:206 |
ef317cd5 | 13906 | msgid "keep downloaded pack" |
07432cef | 13907 | msgstr "保持下载包" |
ef317cd5 | 13908 | |
349ede6a | 13909 | #: builtin/fetch.c:167 |
ef317cd5 | 13910 | msgid "allow updating of HEAD ref" |
07432cef | 13911 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 13912 | |
349ede6a JX |
13913 | #: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 |
13914 | #: builtin/pull.c:218 | |
ef317cd5 | 13915 | msgid "deepen history of shallow clone" |
07432cef | 13916 | msgstr "深化浅克隆的历史" |
ef317cd5 | 13917 | |
349ede6a | 13918 | #: builtin/fetch.c:172 builtin/pull.c:212 |
a0b6b246 JX |
13919 | msgid "deepen history of shallow repository based on time" |
13920 | msgstr "基于时间来深化浅克隆的历史" | |
13921 | ||
349ede6a | 13922 | #: builtin/fetch.c:178 builtin/pull.c:221 |
a77c07d9 | 13923 | msgid "convert to a complete repository" |
160fb2b2 | 13924 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 13925 | |
349ede6a | 13926 | #: builtin/fetch.c:181 |
ef317cd5 | 13927 | msgid "prepend this to submodule path output" |
07432cef | 13928 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 13929 | |
349ede6a | 13930 | #: builtin/fetch.c:184 |
a4f16749 JX |
13931 | msgid "" |
13932 | "default for recursive fetching of submodules (lower priority than config " | |
13933 | "files)" | |
13934 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 13935 | |
349ede6a | 13936 | #: builtin/fetch.c:188 builtin/pull.c:224 |
cfff71a9 JX |
13937 | msgid "accept refs that update .git/shallow" |
13938 | msgstr "接受更新 .git/shallow 的引用" | |
13939 | ||
349ede6a | 13940 | #: builtin/fetch.c:189 builtin/pull.c:226 |
6acbf033 JX |
13941 | msgid "refmap" |
13942 | msgstr "引用映射" | |
13943 | ||
349ede6a | 13944 | #: builtin/fetch.c:190 builtin/pull.c:227 |
6acbf033 JX |
13945 | msgid "specify fetch refmap" |
13946 | msgstr "指定获取操作的引用映射" | |
13947 | ||
349ede6a | 13948 | #: builtin/fetch.c:197 builtin/pull.c:240 |
c1ac5258 JX |
13949 | msgid "report that we have only objects reachable from this object" |
13950 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
13951 | ||
349ede6a | 13952 | #: builtin/fetch.c:200 |
a6cd2cc4 JX |
13953 | msgid "run 'gc --auto' after fetching" |
13954 | msgstr "获取后执行 'gc --auto'" | |
13955 | ||
349ede6a | 13956 | #: builtin/fetch.c:202 builtin/pull.c:243 |
a6cd2cc4 JX |
13957 | msgid "check for forced-updates on all updated branches" |
13958 | msgstr "在所有更新分支上检查强制更新" | |
13959 | ||
349ede6a | 13960 | #: builtin/fetch.c:204 |
ddc12c42 JX |
13961 | msgid "write the commit-graph after fetching" |
13962 | msgstr "抓取后写提交图" | |
13963 | ||
349ede6a | 13964 | #: builtin/fetch.c:514 |
c04f5ac3 JX |
13965 | msgid "Couldn't find remote ref HEAD" |
13966 | msgstr "无法发现远程 HEAD 引用" | |
13967 | ||
349ede6a | 13968 | #: builtin/fetch.c:654 |
5c57d762 JX |
13969 | #, c-format |
13970 | msgid "configuration fetch.output contains invalid value %s" | |
13971 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
13972 | ||
349ede6a | 13973 | #: builtin/fetch.c:752 |
c04f5ac3 JX |
13974 | #, c-format |
13975 | msgid "object %s not found" | |
13976 | msgstr "对象 %s 未发现" | |
13977 | ||
349ede6a | 13978 | #: builtin/fetch.c:756 |
c04f5ac3 JX |
13979 | msgid "[up to date]" |
13980 | msgstr "[最新]" | |
13981 | ||
349ede6a | 13982 | #: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 |
c04f5ac3 JX |
13983 | msgid "[rejected]" |
13984 | msgstr "[已拒绝]" | |
13985 | ||
349ede6a | 13986 | #: builtin/fetch.c:770 |
5c57d762 | 13987 | msgid "can't fetch in current branch" |
9a4b694c | 13988 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 13989 | |
349ede6a | 13990 | #: builtin/fetch.c:780 |
c04f5ac3 | 13991 | msgid "[tag update]" |
55a16ee4 | 13992 | msgstr "[标签更新]" |
c04f5ac3 | 13993 | |
349ede6a JX |
13994 | #: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 |
13995 | #: builtin/fetch.c:852 | |
5c57d762 JX |
13996 | msgid "unable to update local ref" |
13997 | msgstr "不能更新本地引用" | |
c04f5ac3 | 13998 | |
349ede6a | 13999 | #: builtin/fetch.c:785 |
4c27fcb5 JX |
14000 | msgid "would clobber existing tag" |
14001 | msgstr "会破坏现有的标签" | |
14002 | ||
349ede6a | 14003 | #: builtin/fetch.c:807 |
c04f5ac3 | 14004 | msgid "[new tag]" |
55a16ee4 | 14005 | msgstr "[新标签]" |
c04f5ac3 | 14006 | |
349ede6a | 14007 | #: builtin/fetch.c:810 |
c04f5ac3 JX |
14008 | msgid "[new branch]" |
14009 | msgstr "[新分支]" | |
14010 | ||
349ede6a | 14011 | #: builtin/fetch.c:813 |
170e9899 JX |
14012 | msgid "[new ref]" |
14013 | msgstr "[新引用]" | |
14014 | ||
349ede6a | 14015 | #: builtin/fetch.c:852 |
c04f5ac3 JX |
14016 | msgid "forced update" |
14017 | msgstr "强制更新" | |
14018 | ||
349ede6a | 14019 | #: builtin/fetch.c:857 |
5c57d762 JX |
14020 | msgid "non-fast-forward" |
14021 | msgstr "非快进" | |
c04f5ac3 | 14022 | |
349ede6a | 14023 | #: builtin/fetch.c:878 |
a6cd2cc4 JX |
14024 | msgid "" |
14025 | "Fetch normally indicates which branches had a forced update,\n" | |
14026 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" | |
14027 | "flag or run 'git config fetch.showForcedUpdates true'." | |
14028 | msgstr "" | |
14029 | "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n" | |
14030 | "要重新启用,请使用 '--show-forced-updates' 选项或运行\n" | |
14031 | "'git config fetch.showForcedUpdates true'。" | |
14032 | ||
349ede6a | 14033 | #: builtin/fetch.c:882 |
a6cd2cc4 JX |
14034 | #, c-format |
14035 | msgid "" | |
14036 | "It took %.2f seconds to check forced updates. You can use\n" | |
14037 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " | |
14038 | "false'\n" | |
14039 | " to avoid this check.\n" | |
14040 | msgstr "" | |
14041 | "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" | |
14042 | "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" | |
14043 | ||
349ede6a | 14044 | #: builtin/fetch.c:914 |
c04f5ac3 JX |
14045 | #, c-format |
14046 | msgid "%s did not send all necessary objects\n" | |
e640d114 | 14047 | msgstr "%s 未发送所有必需的对象\n" |
c04f5ac3 | 14048 | |
349ede6a | 14049 | #: builtin/fetch.c:935 |
cfff71a9 JX |
14050 | #, c-format |
14051 | msgid "reject %s because shallow roots are not allowed to be updated" | |
14052 | msgstr "拒绝 %s 因为浅克隆不允许被更新" | |
14053 | ||
349ede6a | 14054 | #: builtin/fetch.c:1020 builtin/fetch.c:1158 |
c04f5ac3 JX |
14055 | #, c-format |
14056 | msgid "From %.*s\n" | |
14057 | msgstr "来自 %.*s\n" | |
14058 | ||
349ede6a | 14059 | #: builtin/fetch.c:1031 |
c04f5ac3 JX |
14060 | #, c-format |
14061 | msgid "" | |
14062 | "some local refs could not be updated; try running\n" | |
14063 | " 'git remote prune %s' to remove any old, conflicting branches" | |
14064 | msgstr "" | |
14065 | "一些本地引用不能被更新;尝试运行\n" | |
14066 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
14067 | ||
90e6ef53 | 14068 | # 译者:注意保持前导空格 |
349ede6a | 14069 | #: builtin/fetch.c:1128 |
81809b99 | 14070 | #, c-format |
8ada9598 | 14071 | msgid " (%s will become dangling)" |
e640d114 | 14072 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 14073 | |
90e6ef53 | 14074 | # 译者:注意保持前导空格 |
349ede6a | 14075 | #: builtin/fetch.c:1129 |
81809b99 | 14076 | #, c-format |
8ada9598 | 14077 | msgid " (%s has become dangling)" |
e640d114 | 14078 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 14079 | |
349ede6a | 14080 | #: builtin/fetch.c:1161 |
c04f5ac3 JX |
14081 | msgid "[deleted]" |
14082 | msgstr "[已删除]" | |
14083 | ||
349ede6a | 14084 | #: builtin/fetch.c:1162 builtin/remote.c:1112 |
c04f5ac3 JX |
14085 | msgid "(none)" |
14086 | msgstr "(无)" | |
14087 | ||
349ede6a | 14088 | #: builtin/fetch.c:1185 |
c04f5ac3 JX |
14089 | #, c-format |
14090 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 14091 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 14092 | |
349ede6a | 14093 | #: builtin/fetch.c:1204 |
c04f5ac3 JX |
14094 | #, c-format |
14095 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
14096 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
14097 | ||
349ede6a | 14098 | #: builtin/fetch.c:1207 |
c04f5ac3 JX |
14099 | #, c-format |
14100 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 14101 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 14102 | |
349ede6a | 14103 | #: builtin/fetch.c:1415 |
ddc12c42 | 14104 | msgid "multiple branches detected, incompatible with --set-upstream" |
a5cd71ca JX |
14105 | msgstr "检测到多分支,和 --set-upstream 不兼容" |
14106 | ||
349ede6a | 14107 | #: builtin/fetch.c:1430 |
a5cd71ca JX |
14108 | msgid "not setting upstream for a remote remote-tracking branch" |
14109 | msgstr "没有为一个远程跟踪分支设置上游" | |
14110 | ||
349ede6a | 14111 | #: builtin/fetch.c:1432 |
a5cd71ca JX |
14112 | msgid "not setting upstream for a remote tag" |
14113 | msgstr "没有为一个远程标签设置上游" | |
14114 | ||
349ede6a | 14115 | #: builtin/fetch.c:1434 |
a5cd71ca JX |
14116 | msgid "unknown branch type" |
14117 | msgstr "未知的分支类型" | |
14118 | ||
349ede6a | 14119 | #: builtin/fetch.c:1436 |
a5cd71ca JX |
14120 | msgid "" |
14121 | "no source branch found.\n" | |
14122 | "you need to specify exactly one branch with the --set-upstream option." | |
14123 | msgstr "" | |
14124 | "未发现源分支。\n" | |
14125 | "您需要使用 --set-upstream 选项指定一个分支。" | |
14126 | ||
349ede6a | 14127 | #: builtin/fetch.c:1562 builtin/fetch.c:1625 |
c04f5ac3 JX |
14128 | #, c-format |
14129 | msgid "Fetching %s\n" | |
d4a8e00b | 14130 | msgstr "正在获取 %s\n" |
c04f5ac3 | 14131 | |
349ede6a | 14132 | #: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 |
c04f5ac3 JX |
14133 | #, c-format |
14134 | msgid "Could not fetch %s" | |
14135 | msgstr "不能获取 %s" | |
14136 | ||
349ede6a | 14137 | #: builtin/fetch.c:1584 |
a5cd71ca JX |
14138 | #, c-format |
14139 | msgid "could not fetch '%s' (exit code: %d)\n" | |
14140 | msgstr "无法获取 '%s'(退出码:%d)\n" | |
31e5e17b | 14141 | |
349ede6a | 14142 | #: builtin/fetch.c:1687 |
c04f5ac3 JX |
14143 | msgid "" |
14144 | "No remote repository specified. Please, specify either a URL or a\n" | |
14145 | "remote name from which new revisions should be fetched." | |
4375c10e | 14146 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 14147 | |
349ede6a | 14148 | #: builtin/fetch.c:1724 |
c04f5ac3 | 14149 | msgid "You need to specify a tag name." |
55a16ee4 | 14150 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 14151 | |
7157c2b5 | 14152 | #: builtin/fetch.c:1778 |
a0b6b246 JX |
14153 | msgid "Negative depth in --deepen is not supported" |
14154 | msgstr "--deepen 不支持负数深度" | |
14155 | ||
7157c2b5 | 14156 | #: builtin/fetch.c:1780 |
a0b6b246 JX |
14157 | msgid "--deepen and --depth are mutually exclusive" |
14158 | msgstr "--deepen 和 --depth 是互斥的" | |
14159 | ||
7157c2b5 | 14160 | #: builtin/fetch.c:1785 |
a77c07d9 JX |
14161 | msgid "--depth and --unshallow cannot be used together" |
14162 | msgstr "--depth 和 --unshallow 不能同时使用" | |
14163 | ||
7157c2b5 | 14164 | #: builtin/fetch.c:1787 |
a77c07d9 | 14165 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 14166 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 14167 | |
7157c2b5 | 14168 | #: builtin/fetch.c:1800 |
c04f5ac3 | 14169 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 14170 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 14171 | |
7157c2b5 | 14172 | #: builtin/fetch.c:1802 |
c04f5ac3 | 14173 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 14174 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 14175 | |
7157c2b5 | 14176 | #: builtin/fetch.c:1811 |
c04f5ac3 JX |
14177 | #, c-format |
14178 | msgid "No such remote or remote group: %s" | |
14179 | msgstr "没有这样的远程或远程组:%s" | |
14180 | ||
7157c2b5 | 14181 | #: builtin/fetch.c:1818 |
c04f5ac3 | 14182 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 14183 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 14184 | |
7157c2b5 | 14185 | #: builtin/fetch.c:1836 |
06991777 JX |
14186 | msgid "" |
14187 | "--filter can only be used with the remote configured in extensions." | |
14188 | "partialclone" | |
14189 | msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" | |
14190 | ||
349ede6a | 14191 | #: builtin/fmt-merge-msg.c:7 |
814ff314 JX |
14192 | msgid "" |
14193 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
14194 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 14195 | |
349ede6a | 14196 | #: builtin/fmt-merge-msg.c:18 |
ef317cd5 | 14197 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 14198 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 14199 | |
349ede6a | 14200 | #: builtin/fmt-merge-msg.c:21 |
ef317cd5 | 14201 | msgid "alias for --log (deprecated)" |
07432cef | 14202 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 14203 | |
349ede6a | 14204 | #: builtin/fmt-merge-msg.c:24 |
ef317cd5 | 14205 | msgid "text" |
07432cef | 14206 | msgstr "文本" |
ef317cd5 | 14207 | |
349ede6a | 14208 | #: builtin/fmt-merge-msg.c:25 |
ef317cd5 | 14209 | msgid "use <text> as start of message" |
07432cef | 14210 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 14211 | |
349ede6a | 14212 | #: builtin/fmt-merge-msg.c:26 |
ef317cd5 | 14213 | msgid "file to read from" |
07432cef | 14214 | msgstr "从文件中读取" |
ef317cd5 | 14215 | |
a4f16749 | 14216 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
14217 | msgid "git for-each-ref [<options>] [<pattern>]" |
14218 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 14219 | |
a4f16749 | 14220 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
14221 | msgid "git for-each-ref [--points-at <object>]" |
14222 | msgstr "git for-each-ref [--points-at <对象>]" | |
14223 | ||
a4f16749 | 14224 | #: builtin/for-each-ref.c:12 |
87cb7997 JX |
14225 | msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" |
14226 | msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" | |
94550ed3 | 14227 | |
a4f16749 | 14228 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
14229 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
14230 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 14231 | |
a4f16749 | 14232 | #: builtin/for-each-ref.c:28 |
ef317cd5 | 14233 | msgid "quote placeholders suitably for shells" |
07432cef | 14234 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 14235 | |
a4f16749 | 14236 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 14237 | msgid "quote placeholders suitably for perl" |
07432cef | 14238 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 14239 | |
a4f16749 | 14240 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 14241 | msgid "quote placeholders suitably for python" |
07432cef | 14242 | msgstr "引用占位符适用于 python" |
ef317cd5 | 14243 | |
a4f16749 | 14244 | #: builtin/for-each-ref.c:34 |
04cb2f28 JX |
14245 | msgid "quote placeholders suitably for Tcl" |
14246 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 14247 | |
a4f16749 | 14248 | #: builtin/for-each-ref.c:37 |
ef317cd5 | 14249 | msgid "show only <n> matched refs" |
07432cef | 14250 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 14251 | |
349ede6a | 14252 | #: builtin/for-each-ref.c:39 builtin/tag.c:440 |
6937cb4e JX |
14253 | msgid "respect format colors" |
14254 | msgstr "遵照格式中的颜色输出" | |
14255 | ||
d46c5519 | 14256 | #: builtin/for-each-ref.c:42 |
94550ed3 JX |
14257 | msgid "print only refs which points at the given object" |
14258 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 14259 | |
d46c5519 | 14260 | #: builtin/for-each-ref.c:44 |
94550ed3 JX |
14261 | msgid "print only refs that are merged" |
14262 | msgstr "只打印已经合并的引用" | |
14263 | ||
d46c5519 | 14264 | #: builtin/for-each-ref.c:45 |
94550ed3 JX |
14265 | msgid "print only refs that are not merged" |
14266 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 14267 | |
d46c5519 | 14268 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
14269 | msgid "print only refs which contain the commit" |
14270 | msgstr "只打印包含该提交的引用" | |
14271 | ||
d46c5519 | 14272 | #: builtin/for-each-ref.c:47 |
87cb7997 JX |
14273 | msgid "print only refs which don't contain the commit" |
14274 | msgstr "只打印不包含该提交的引用" | |
14275 | ||
349ede6a | 14276 | #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 |
06991777 JX |
14277 | msgid "unknown" |
14278 | msgstr "未知" | |
14279 | ||
14280 | #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> | |
349ede6a | 14281 | #: builtin/fsck.c:101 builtin/fsck.c:121 |
06991777 JX |
14282 | #, c-format |
14283 | msgid "error in %s %s: %s" | |
14284 | msgstr "%s %s 错误:%s" | |
14285 | ||
14286 | #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> | |
349ede6a | 14287 | #: builtin/fsck.c:115 |
06991777 JX |
14288 | #, c-format |
14289 | msgid "warning in %s %s: %s" | |
14290 | msgstr "%s %s 警告:%s" | |
14291 | ||
349ede6a | 14292 | #: builtin/fsck.c:144 builtin/fsck.c:147 |
06991777 JX |
14293 | #, c-format |
14294 | msgid "broken link from %7s %s" | |
14295 | msgstr "来自 %7s %s 的损坏的链接" | |
14296 | ||
349ede6a | 14297 | #: builtin/fsck.c:156 |
06991777 JX |
14298 | msgid "wrong object type in link" |
14299 | msgstr "链接中错误的对象类型" | |
14300 | ||
349ede6a | 14301 | #: builtin/fsck.c:172 |
06991777 JX |
14302 | #, c-format |
14303 | msgid "" | |
14304 | "broken link from %7s %s\n" | |
14305 | " to %7s %s" | |
14306 | msgstr "" | |
14307 | "损坏的链接来自于 %7s %s\n" | |
14308 | " 到 %7s %s" | |
14309 | ||
349ede6a | 14310 | #: builtin/fsck.c:283 |
06991777 JX |
14311 | #, c-format |
14312 | msgid "missing %s %s" | |
14313 | msgstr "缺失 %s %s" | |
14314 | ||
349ede6a | 14315 | #: builtin/fsck.c:310 |
06991777 JX |
14316 | #, c-format |
14317 | msgid "unreachable %s %s" | |
5b533632 | 14318 | msgstr "不可达 %s %s" |
06991777 | 14319 | |
349ede6a | 14320 | #: builtin/fsck.c:330 |
06991777 JX |
14321 | #, c-format |
14322 | msgid "dangling %s %s" | |
14323 | msgstr "悬空 %s %s" | |
14324 | ||
349ede6a | 14325 | #: builtin/fsck.c:340 |
06991777 JX |
14326 | msgid "could not create lost-found" |
14327 | msgstr "不能创建 lost-found" | |
14328 | ||
349ede6a | 14329 | #: builtin/fsck.c:351 |
06991777 JX |
14330 | #, c-format |
14331 | msgid "could not finish '%s'" | |
14332 | msgstr "不能完成 '%s'" | |
14333 | ||
349ede6a | 14334 | #: builtin/fsck.c:368 |
06991777 JX |
14335 | #, c-format |
14336 | msgid "Checking %s" | |
14337 | msgstr "正在检查 %s" | |
14338 | ||
349ede6a | 14339 | #: builtin/fsck.c:406 |
06991777 JX |
14340 | #, c-format |
14341 | msgid "Checking connectivity (%d objects)" | |
14342 | msgstr "正在检查连通性(%d 个对象)" | |
14343 | ||
349ede6a | 14344 | #: builtin/fsck.c:425 |
06991777 JX |
14345 | #, c-format |
14346 | msgid "Checking %s %s" | |
14347 | msgstr "正在检查 %s %s" | |
14348 | ||
349ede6a | 14349 | #: builtin/fsck.c:430 |
06991777 JX |
14350 | msgid "broken links" |
14351 | msgstr "损坏的链接" | |
14352 | ||
349ede6a | 14353 | #: builtin/fsck.c:439 |
06991777 JX |
14354 | #, c-format |
14355 | msgid "root %s" | |
14356 | msgstr "根 %s" | |
14357 | ||
349ede6a | 14358 | #: builtin/fsck.c:447 |
06991777 JX |
14359 | #, c-format |
14360 | msgid "tagged %s %s (%s) in %s" | |
14361 | msgstr "标记 %s %s (%s) 于 %s" | |
14362 | ||
349ede6a | 14363 | #: builtin/fsck.c:476 |
06991777 JX |
14364 | #, c-format |
14365 | msgid "%s: object corrupt or missing" | |
14366 | msgstr "%s:对象损坏或丢失" | |
14367 | ||
349ede6a | 14368 | #: builtin/fsck.c:501 |
06991777 JX |
14369 | #, c-format |
14370 | msgid "%s: invalid reflog entry %s" | |
14371 | msgstr "%s:无效的引用日志条目 %s" | |
14372 | ||
349ede6a | 14373 | #: builtin/fsck.c:515 |
06991777 JX |
14374 | #, c-format |
14375 | msgid "Checking reflog %s->%s" | |
14376 | msgstr "正在检查引用日志 %s->%s" | |
14377 | ||
349ede6a | 14378 | #: builtin/fsck.c:549 |
06991777 JX |
14379 | #, c-format |
14380 | msgid "%s: invalid sha1 pointer %s" | |
14381 | msgstr "%s:无效的 sha1 指针 %s" | |
14382 | ||
349ede6a | 14383 | #: builtin/fsck.c:556 |
06991777 JX |
14384 | #, c-format |
14385 | msgid "%s: not a commit" | |
14386 | msgstr "%s:不是一个提交" | |
14387 | ||
349ede6a | 14388 | #: builtin/fsck.c:610 |
06991777 JX |
14389 | msgid "notice: No default references" |
14390 | msgstr "注意:无默认引用" | |
14391 | ||
349ede6a | 14392 | #: builtin/fsck.c:625 |
06991777 JX |
14393 | #, c-format |
14394 | msgid "%s: object corrupt or missing: %s" | |
14395 | msgstr "%s:对象损坏或丢失:%s" | |
14396 | ||
349ede6a | 14397 | #: builtin/fsck.c:638 |
06991777 JX |
14398 | #, c-format |
14399 | msgid "%s: object could not be parsed: %s" | |
14400 | msgstr "%s:不能解析对象:%s" | |
14401 | ||
349ede6a | 14402 | #: builtin/fsck.c:658 |
06991777 JX |
14403 | #, c-format |
14404 | msgid "bad sha1 file: %s" | |
14405 | msgstr "坏的 sha1 文件:%s" | |
14406 | ||
349ede6a | 14407 | #: builtin/fsck.c:673 |
06991777 JX |
14408 | msgid "Checking object directory" |
14409 | msgstr "正在检查对象目录" | |
14410 | ||
349ede6a | 14411 | #: builtin/fsck.c:676 |
6c94aba5 | 14412 | msgid "Checking object directories" |
06991777 JX |
14413 | msgstr "正在检查对象目录" |
14414 | ||
349ede6a | 14415 | #: builtin/fsck.c:691 |
06991777 JX |
14416 | #, c-format |
14417 | msgid "Checking %s link" | |
14418 | msgstr "正在检查 %s 链接" | |
14419 | ||
349ede6a | 14420 | #: builtin/fsck.c:696 builtin/index-pack.c:843 |
06991777 JX |
14421 | #, c-format |
14422 | msgid "invalid %s" | |
14423 | msgstr "无效的 %s" | |
14424 | ||
349ede6a | 14425 | #: builtin/fsck.c:703 |
06991777 JX |
14426 | #, c-format |
14427 | msgid "%s points to something strange (%s)" | |
14428 | msgstr "%s 指向奇怪的东西(%s)" | |
14429 | ||
349ede6a | 14430 | #: builtin/fsck.c:709 |
06991777 JX |
14431 | #, c-format |
14432 | msgid "%s: detached HEAD points at nothing" | |
14433 | msgstr "%s:分离头指针的指向不存在" | |
14434 | ||
349ede6a | 14435 | #: builtin/fsck.c:713 |
06991777 JX |
14436 | #, c-format |
14437 | msgid "notice: %s points to an unborn branch (%s)" | |
14438 | msgstr "注意:%s 指向一个尚未诞生的分支(%s)" | |
14439 | ||
349ede6a | 14440 | #: builtin/fsck.c:725 |
06991777 JX |
14441 | msgid "Checking cache tree" |
14442 | msgstr "正在检查缓存树" | |
14443 | ||
349ede6a | 14444 | #: builtin/fsck.c:730 |
06991777 JX |
14445 | #, c-format |
14446 | msgid "%s: invalid sha1 pointer in cache-tree" | |
14447 | msgstr "%s:cache-tree 中无效的 sha1 指针" | |
6c94aba5 | 14448 | |
349ede6a | 14449 | #: builtin/fsck.c:739 |
06991777 JX |
14450 | msgid "non-tree in cache-tree" |
14451 | msgstr "cache-tree 中非树对象" | |
14452 | ||
349ede6a | 14453 | #: builtin/fsck.c:770 |
814ff314 JX |
14454 | msgid "git fsck [<options>] [<object>...]" |
14455 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 14456 | |
349ede6a | 14457 | #: builtin/fsck.c:776 |
ef317cd5 | 14458 | msgid "show unreachable objects" |
07432cef | 14459 | msgstr "显示不可达的对象" |
ef317cd5 | 14460 | |
349ede6a | 14461 | #: builtin/fsck.c:777 |
ef317cd5 | 14462 | msgid "show dangling objects" |
e640d114 | 14463 | msgstr "显示悬空的对象" |
ef317cd5 | 14464 | |
349ede6a | 14465 | #: builtin/fsck.c:778 |
ef317cd5 | 14466 | msgid "report tags" |
55a16ee4 | 14467 | msgstr "报告标签" |
ef317cd5 | 14468 | |
349ede6a | 14469 | #: builtin/fsck.c:779 |
ef317cd5 | 14470 | msgid "report root nodes" |
07432cef | 14471 | msgstr "报告根节点" |
ef317cd5 | 14472 | |
349ede6a | 14473 | #: builtin/fsck.c:780 |
ef317cd5 | 14474 | msgid "make index objects head nodes" |
07432cef | 14475 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 14476 | |
349ede6a | 14477 | #: builtin/fsck.c:781 |
ef317cd5 | 14478 | msgid "make reflogs head nodes (default)" |
07432cef | 14479 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 14480 | |
349ede6a | 14481 | #: builtin/fsck.c:782 |
ef317cd5 | 14482 | msgid "also consider packs and alternate objects" |
07432cef | 14483 | msgstr "也考虑包和备用对象" |
ef317cd5 | 14484 | |
349ede6a | 14485 | #: builtin/fsck.c:783 |
1b7f4a34 JX |
14486 | msgid "check only connectivity" |
14487 | msgstr "仅检查连通性" | |
14488 | ||
349ede6a | 14489 | #: builtin/fsck.c:784 |
ef317cd5 | 14490 | msgid "enable more strict checking" |
07432cef | 14491 | msgstr "启用更严格的检查" |
ef317cd5 | 14492 | |
349ede6a | 14493 | #: builtin/fsck.c:786 |
ef317cd5 | 14494 | msgid "write dangling objects in .git/lost-found" |
e640d114 | 14495 | msgstr "将悬空对象写入 .git/lost-found 中" |
ef317cd5 | 14496 | |
349ede6a | 14497 | #: builtin/fsck.c:787 builtin/prune.c:134 |
ef317cd5 | 14498 | msgid "show progress" |
07432cef | 14499 | msgstr "显示进度" |
ef317cd5 | 14500 | |
349ede6a | 14501 | #: builtin/fsck.c:788 |
5c57d762 JX |
14502 | msgid "show verbose names for reachable objects" |
14503 | msgstr "显示可达对象的详细名称" | |
14504 | ||
349ede6a | 14505 | #: builtin/fsck.c:847 builtin/index-pack.c:225 |
6c94aba5 | 14506 | msgid "Checking objects" |
06991777 JX |
14507 | msgstr "正在检查对象" |
14508 | ||
349ede6a | 14509 | #: builtin/fsck.c:875 |
06991777 JX |
14510 | #, c-format |
14511 | msgid "%s: object missing" | |
14512 | msgstr "%s:对象缺失" | |
14513 | ||
349ede6a | 14514 | #: builtin/fsck.c:886 |
06991777 JX |
14515 | #, c-format |
14516 | msgid "invalid parameter: expected sha1, got '%s'" | |
14517 | msgstr "无效的参数:期望 sha1,得到 '%s'" | |
6c94aba5 | 14518 | |
a5cd71ca | 14519 | #: builtin/gc.c:35 |
814ff314 JX |
14520 | msgid "git gc [<options>]" |
14521 | msgstr "git gc [<选项>]" | |
ef317cd5 | 14522 | |
c1ac5258 | 14523 | #: builtin/gc.c:90 |
c04f5ac3 | 14524 | #, c-format |
87cb7997 | 14525 | msgid "Failed to fstat %s: %s" |
65e2041e | 14526 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 14527 | |
d46c5519 JX |
14528 | #: builtin/gc.c:126 |
14529 | #, c-format | |
14530 | msgid "failed to parse '%s' value '%s'" | |
14531 | msgstr "无法解析 '%s' 值 '%s'" | |
14532 | ||
349ede6a | 14533 | #: builtin/gc.c:475 builtin/init-db.c:57 |
c04f5ac3 | 14534 | #, c-format |
4c27fcb5 JX |
14535 | msgid "cannot stat '%s'" |
14536 | msgstr "不能对 '%s' 调用 stat" | |
14537 | ||
349ede6a | 14538 | #: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 |
4c27fcb5 JX |
14539 | #, c-format |
14540 | msgid "cannot read '%s'" | |
14541 | msgstr "不能读取 '%s'" | |
c04f5ac3 | 14542 | |
a5cd71ca | 14543 | #: builtin/gc.c:491 |
94550ed3 JX |
14544 | #, c-format |
14545 | msgid "" | |
14546 | "The last gc run reported the following. Please correct the root cause\n" | |
14547 | "and remove %s.\n" | |
14548 | "Automatic cleanup will not be performed until the file is removed.\n" | |
14549 | "\n" | |
14550 | "%s" | |
14551 | msgstr "" | |
14552 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
14553 | "在该文件被删除之前,自动清理将不会执行。\n" | |
14554 | "\n" | |
14555 | "%s" | |
14556 | ||
a5cd71ca | 14557 | #: builtin/gc.c:539 |
ef317cd5 | 14558 | msgid "prune unreferenced objects" |
07432cef | 14559 | msgstr "清除未引用的对象" |
ef317cd5 | 14560 | |
a5cd71ca | 14561 | #: builtin/gc.c:541 |
ef317cd5 | 14562 | msgid "be more thorough (increased runtime)" |
07432cef | 14563 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 14564 | |
a5cd71ca | 14565 | #: builtin/gc.c:542 |
ef317cd5 | 14566 | msgid "enable auto-gc mode" |
07432cef | 14567 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 14568 | |
a5cd71ca | 14569 | #: builtin/gc.c:545 |
90314792 JX |
14570 | msgid "force running gc even if there may be another gc running" |
14571 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
14572 | ||
a5cd71ca | 14573 | #: builtin/gc.c:548 |
fd8cb379 JX |
14574 | msgid "repack all other packs except the largest pack" |
14575 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
14576 | ||
a5cd71ca | 14577 | #: builtin/gc.c:565 |
fd8cb379 JX |
14578 | #, c-format |
14579 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 14580 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 14581 | |
a5cd71ca | 14582 | #: builtin/gc.c:576 |
87cb7997 | 14583 | #, c-format |
fd8cb379 | 14584 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 14585 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 14586 | |
a5cd71ca | 14587 | #: builtin/gc.c:596 |
c04f5ac3 | 14588 | #, c-format |
6c94aba5 | 14589 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 14590 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 14591 | |
a5cd71ca | 14592 | #: builtin/gc.c:598 |
6c94aba5 JX |
14593 | #, c-format |
14594 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 14595 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 14596 | |
a5cd71ca | 14597 | #: builtin/gc.c:599 |
6c94aba5 JX |
14598 | #, c-format |
14599 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
14600 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 14601 | |
a5cd71ca | 14602 | #: builtin/gc.c:639 |
90314792 JX |
14603 | #, c-format |
14604 | msgid "" | |
14605 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
14606 | msgstr "" | |
29004bbb | 14607 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 14608 | |
a5cd71ca | 14609 | #: builtin/gc.c:694 |
c04f5ac3 JX |
14610 | msgid "" |
14611 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 14612 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 14613 | |
2b472aae | 14614 | #: builtin/grep.c:30 |
814ff314 JX |
14615 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
14616 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 14617 | |
06991777 | 14618 | #: builtin/grep.c:225 |
c04f5ac3 JX |
14619 | #, c-format |
14620 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 14621 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 14622 | |
06991777 | 14623 | #: builtin/grep.c:279 |
276ceeaa JX |
14624 | #, c-format |
14625 | msgid "invalid number of threads specified (%d) for %s" | |
14626 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
14627 | ||
a4f16749 JX |
14628 | #. TRANSLATORS: %s is the configuration |
14629 | #. variable for tweaking threads, currently | |
14630 | #. grep.threads | |
14631 | #. | |
7157c2b5 JX |
14632 | #: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 |
14633 | #: builtin/pack-objects.c:2904 | |
a4f16749 JX |
14634 | #, c-format |
14635 | msgid "no threads support, ignoring %s" | |
14636 | msgstr "没有线程支持,忽略 %s" | |
14637 | ||
349ede6a | 14638 | #: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 |
c04f5ac3 JX |
14639 | #, c-format |
14640 | msgid "unable to read tree (%s)" | |
90e6ef53 | 14641 | msgstr "无法读取树(%s)" |
c04f5ac3 | 14642 | |
349ede6a | 14643 | #: builtin/grep.c:655 |
c04f5ac3 JX |
14644 | #, c-format |
14645 | msgid "unable to grep from object of type %s" | |
14646 | msgstr "无法抓取来自于 %s 类型的对象" | |
14647 | ||
349ede6a | 14648 | #: builtin/grep.c:724 |
c04f5ac3 JX |
14649 | #, c-format |
14650 | msgid "switch `%c' expects a numerical value" | |
14651 | msgstr "开关 `%c' 期望一个数字值" | |
14652 | ||
349ede6a | 14653 | #: builtin/grep.c:823 |
ef317cd5 | 14654 | msgid "search in index instead of in the work tree" |
07432cef | 14655 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 14656 | |
349ede6a | 14657 | #: builtin/grep.c:825 |
ef317cd5 | 14658 | msgid "find in contents not managed by git" |
07432cef | 14659 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 JX |
14660 | |
14661 | # 译者:中文字符串拼接,可删除前导空格 | |
349ede6a | 14662 | #: builtin/grep.c:827 |
ef317cd5 | 14663 | msgid "search in both tracked and untracked files" |
07432cef | 14664 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 14665 | |
349ede6a | 14666 | #: builtin/grep.c:829 |
814ff314 JX |
14667 | msgid "ignore files specified via '.gitignore'" |
14668 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 14669 | |
349ede6a | 14670 | #: builtin/grep.c:831 |
87cb7997 | 14671 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
14672 | msgstr "在每一个子模组中递归搜索" |
14673 | ||
349ede6a | 14674 | #: builtin/grep.c:834 |
ef317cd5 | 14675 | msgid "show non-matching lines" |
07432cef | 14676 | msgstr "显示未匹配的行" |
ef317cd5 | 14677 | |
349ede6a | 14678 | #: builtin/grep.c:836 |
ef317cd5 | 14679 | msgid "case insensitive matching" |
07432cef | 14680 | msgstr "不区分大小写匹配" |
ef317cd5 | 14681 | |
349ede6a | 14682 | #: builtin/grep.c:838 |
ef317cd5 | 14683 | msgid "match patterns only at word boundaries" |
07432cef | 14684 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 14685 | |
349ede6a | 14686 | #: builtin/grep.c:840 |
ef317cd5 | 14687 | msgid "process binary files as text" |
07432cef | 14688 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 14689 | |
349ede6a | 14690 | #: builtin/grep.c:842 |
ef317cd5 | 14691 | msgid "don't match patterns in binary files" |
07432cef | 14692 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 14693 | |
349ede6a | 14694 | #: builtin/grep.c:845 |
90314792 JX |
14695 | msgid "process binary files with textconv filters" |
14696 | msgstr "用 textconv 过滤器处理二进制文件" | |
14697 | ||
349ede6a | 14698 | #: builtin/grep.c:847 |
4c27fcb5 JX |
14699 | msgid "search in subdirectories (default)" |
14700 | msgstr "在子目录中寻找(默认)" | |
14701 | ||
349ede6a | 14702 | #: builtin/grep.c:849 |
ef317cd5 | 14703 | msgid "descend at most <depth> levels" |
07432cef | 14704 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 14705 | |
349ede6a | 14706 | #: builtin/grep.c:853 |
ef317cd5 | 14707 | msgid "use extended POSIX regular expressions" |
07432cef | 14708 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 14709 | |
349ede6a | 14710 | #: builtin/grep.c:856 |
ef317cd5 | 14711 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 14712 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 14713 | |
349ede6a | 14714 | #: builtin/grep.c:859 |
ef317cd5 | 14715 | msgid "interpret patterns as fixed strings" |
07432cef | 14716 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 14717 | |
349ede6a | 14718 | #: builtin/grep.c:862 |
ef317cd5 | 14719 | msgid "use Perl-compatible regular expressions" |
07432cef | 14720 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 14721 | |
349ede6a | 14722 | #: builtin/grep.c:865 |
ef317cd5 | 14723 | msgid "show line numbers" |
07432cef | 14724 | msgstr "显示行号" |
ef317cd5 | 14725 | |
349ede6a | 14726 | #: builtin/grep.c:866 |
c1ac5258 JX |
14727 | msgid "show column number of first match" |
14728 | msgstr "显示第一个匹配的列号" | |
14729 | ||
349ede6a | 14730 | #: builtin/grep.c:867 |
ef317cd5 | 14731 | msgid "don't show filenames" |
07432cef | 14732 | msgstr "不显示文件名" |
ef317cd5 | 14733 | |
349ede6a | 14734 | #: builtin/grep.c:868 |
ef317cd5 | 14735 | msgid "show filenames" |
07432cef | 14736 | msgstr "显示文件名" |
ef317cd5 | 14737 | |
349ede6a | 14738 | #: builtin/grep.c:870 |
ef317cd5 | 14739 | msgid "show filenames relative to top directory" |
07432cef | 14740 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 14741 | |
349ede6a | 14742 | #: builtin/grep.c:872 |
ef317cd5 | 14743 | msgid "show only filenames instead of matching lines" |
07432cef | 14744 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 14745 | |
349ede6a | 14746 | #: builtin/grep.c:874 |
ef317cd5 | 14747 | msgid "synonym for --files-with-matches" |
07432cef | 14748 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 14749 | |
349ede6a | 14750 | #: builtin/grep.c:877 |
ef317cd5 | 14751 | msgid "show only the names of files without match" |
07432cef | 14752 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 14753 | |
349ede6a | 14754 | #: builtin/grep.c:879 |
ef317cd5 | 14755 | msgid "print NUL after filenames" |
07432cef | 14756 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 14757 | |
349ede6a | 14758 | #: builtin/grep.c:882 |
c1ac5258 JX |
14759 | msgid "show only matching parts of a line" |
14760 | msgstr "只显示行中的匹配的部分" | |
14761 | ||
349ede6a | 14762 | #: builtin/grep.c:884 |
ef317cd5 | 14763 | msgid "show the number of matches instead of matching lines" |
07432cef | 14764 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 14765 | |
349ede6a | 14766 | #: builtin/grep.c:885 |
ef317cd5 | 14767 | msgid "highlight matches" |
07432cef | 14768 | msgstr "高亮显示匹配项" |
ef317cd5 | 14769 | |
349ede6a | 14770 | #: builtin/grep.c:887 |
ef317cd5 | 14771 | msgid "print empty line between matches from different files" |
07432cef | 14772 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 14773 | |
349ede6a | 14774 | #: builtin/grep.c:889 |
ef317cd5 | 14775 | msgid "show filename only once above matches from same file" |
07432cef | 14776 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 14777 | |
349ede6a | 14778 | #: builtin/grep.c:892 |
ef317cd5 | 14779 | msgid "show <n> context lines before and after matches" |
07432cef | 14780 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 14781 | |
349ede6a | 14782 | #: builtin/grep.c:895 |
ef317cd5 | 14783 | msgid "show <n> context lines before matches" |
07432cef | 14784 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 14785 | |
349ede6a | 14786 | #: builtin/grep.c:897 |
ef317cd5 | 14787 | msgid "show <n> context lines after matches" |
07432cef | 14788 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 14789 | |
349ede6a | 14790 | #: builtin/grep.c:899 |
276ceeaa JX |
14791 | msgid "use <n> worker threads" |
14792 | msgstr "使用 <n> 个工作线程" | |
14793 | ||
349ede6a | 14794 | #: builtin/grep.c:900 |
ef317cd5 | 14795 | msgid "shortcut for -C NUM" |
07432cef | 14796 | msgstr "快捷键 -C 数字" |
ef317cd5 | 14797 | |
349ede6a | 14798 | #: builtin/grep.c:903 |
ef317cd5 | 14799 | msgid "show a line with the function name before matches" |
07432cef | 14800 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 14801 | |
349ede6a | 14802 | #: builtin/grep.c:905 |
ef317cd5 | 14803 | msgid "show the surrounding function" |
07432cef | 14804 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 14805 | |
349ede6a | 14806 | #: builtin/grep.c:908 |
ef317cd5 | 14807 | msgid "read patterns from file" |
07432cef | 14808 | msgstr "从文件读取模式" |
ef317cd5 | 14809 | |
349ede6a | 14810 | #: builtin/grep.c:910 |
ef317cd5 | 14811 | msgid "match <pattern>" |
07432cef | 14812 | msgstr "匹配 <模式>" |
ef317cd5 | 14813 | |
349ede6a | 14814 | #: builtin/grep.c:912 |
ef317cd5 | 14815 | msgid "combine patterns specified with -e" |
07432cef | 14816 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 14817 | |
349ede6a | 14818 | #: builtin/grep.c:924 |
ef317cd5 | 14819 | msgid "indicate hit with exit status without output" |
07432cef | 14820 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 14821 | |
349ede6a | 14822 | #: builtin/grep.c:926 |
ef317cd5 | 14823 | msgid "show only matches from files that match all patterns" |
07432cef | 14824 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 14825 | |
349ede6a | 14826 | #: builtin/grep.c:928 |
07432cef WS |
14827 | msgid "show parse tree for grep expression" |
14828 | msgstr "显示 grep 表达式的解析树" | |
14829 | ||
349ede6a | 14830 | #: builtin/grep.c:932 |
ef317cd5 | 14831 | msgid "pager" |
07432cef | 14832 | msgstr "分页" |
ef317cd5 | 14833 | |
349ede6a | 14834 | #: builtin/grep.c:932 |
ef317cd5 | 14835 | msgid "show matching files in the pager" |
07432cef | 14836 | msgstr "分页显示匹配的文件" |
ef317cd5 | 14837 | |
349ede6a | 14838 | #: builtin/grep.c:936 |
ef317cd5 | 14839 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 14840 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 14841 | |
349ede6a | 14842 | #: builtin/grep.c:1003 |
c1ac5258 JX |
14843 | msgid "no pattern given" |
14844 | msgstr "未提供匹配模式" | |
c04f5ac3 | 14845 | |
349ede6a | 14846 | #: builtin/grep.c:1039 |
87cb7997 JX |
14847 | msgid "--no-index or --untracked cannot be used with revs" |
14848 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
14849 | ||
349ede6a | 14850 | #: builtin/grep.c:1047 |
87cb7997 JX |
14851 | #, c-format |
14852 | msgid "unable to resolve revision: %s" | |
14853 | msgstr "不能解析版本:%s" | |
14854 | ||
349ede6a | 14855 | #: builtin/grep.c:1077 |
2b472aae JX |
14856 | msgid "--untracked not supported with --recurse-submodules" |
14857 | msgstr "--untracked 不支持和 --recurse-submodules 共用" | |
14858 | ||
349ede6a | 14859 | #: builtin/grep.c:1081 |
4c27fcb5 JX |
14860 | msgid "invalid option combination, ignoring --threads" |
14861 | msgstr "无效的选项组合,忽略 --threads" | |
276ceeaa | 14862 | |
7157c2b5 | 14863 | #: builtin/grep.c:1084 builtin/pack-objects.c:3623 |
a4f16749 JX |
14864 | msgid "no threads support, ignoring --threads" |
14865 | msgstr "没有线程支持,忽略 --threads" | |
14866 | ||
7157c2b5 | 14867 | #: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 |
4c27fcb5 JX |
14868 | #, c-format |
14869 | msgid "invalid number of threads specified (%d)" | |
14870 | msgstr "指定的线程数无效(%d)" | |
14871 | ||
349ede6a | 14872 | #: builtin/grep.c:1121 |
c04f5ac3 JX |
14873 | msgid "--open-files-in-pager only works on the worktree" |
14874 | msgstr "--open-files-in-pager 仅用于工作区" | |
14875 | ||
349ede6a | 14876 | #: builtin/grep.c:1147 |
c1ac5258 JX |
14877 | msgid "--cached or --untracked cannot be used with --no-index" |
14878 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 14879 | |
349ede6a | 14880 | #: builtin/grep.c:1153 |
c1ac5258 JX |
14881 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
14882 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 14883 | |
349ede6a | 14884 | #: builtin/grep.c:1161 |
c1ac5258 JX |
14885 | msgid "both --cached and trees are given" |
14886 | msgstr "同时给出了 --cached 和树对象" | |
14887 | ||
06991777 | 14888 | #: builtin/hash-object.c:85 |
ef317cd5 | 14889 | msgid "" |
814ff314 JX |
14890 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
14891 | "[--] <file>..." | |
ef317cd5 | 14892 | msgstr "" |
814ff314 JX |
14893 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
14894 | "[--] <文件>..." | |
ef317cd5 | 14895 | |
06991777 | 14896 | #: builtin/hash-object.c:86 |
94550ed3 JX |
14897 | msgid "git hash-object --stdin-paths" |
14898 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 14899 | |
06991777 | 14900 | #: builtin/hash-object.c:98 |
ef317cd5 | 14901 | msgid "object type" |
07432cef | 14902 | msgstr "对象类型" |
ef317cd5 | 14903 | |
06991777 | 14904 | #: builtin/hash-object.c:99 |
ef317cd5 | 14905 | msgid "write the object into the object database" |
07432cef | 14906 | msgstr "将对象写入对象数据库" |
ef317cd5 | 14907 | |
06991777 | 14908 | #: builtin/hash-object.c:101 |
ef317cd5 | 14909 | msgid "read the object from stdin" |
07432cef | 14910 | msgstr "从标准输入读取对象" |
ef317cd5 | 14911 | |
06991777 | 14912 | #: builtin/hash-object.c:103 |
ef317cd5 | 14913 | msgid "store file as is without filters" |
07432cef | 14914 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 14915 | |
06991777 | 14916 | #: builtin/hash-object.c:104 |
220c313c JX |
14917 | msgid "" |
14918 | "just hash any random garbage to create corrupt objects for debugging Git" | |
14919 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
14920 | ||
06991777 | 14921 | #: builtin/hash-object.c:105 |
ef317cd5 | 14922 | msgid "process file as it were from this path" |
07432cef | 14923 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 14924 | |
349ede6a | 14925 | #: builtin/help.c:47 |
ef317cd5 | 14926 | msgid "print all available commands" |
07432cef | 14927 | msgstr "打印所有可用的命令" |
ef317cd5 | 14928 | |
349ede6a | 14929 | #: builtin/help.c:48 |
a0b6b246 JX |
14930 | msgid "exclude guides" |
14931 | msgstr "排除向导" | |
14932 | ||
349ede6a | 14933 | #: builtin/help.c:49 |
4dcdc3d8 JX |
14934 | msgid "print list of useful guides" |
14935 | msgstr "显示有用的指南列表" | |
14936 | ||
349ede6a | 14937 | #: builtin/help.c:50 |
c1ac5258 JX |
14938 | msgid "print all configuration variable names" |
14939 | msgstr "打印所有配置变量名称" | |
14940 | ||
349ede6a | 14941 | #: builtin/help.c:52 |
ef317cd5 | 14942 | msgid "show man page" |
07432cef | 14943 | msgstr "显示 man 手册" |
ef317cd5 | 14944 | |
349ede6a | 14945 | #: builtin/help.c:53 |
ef317cd5 | 14946 | msgid "show manual in web browser" |
07432cef | 14947 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 14948 | |
349ede6a | 14949 | #: builtin/help.c:55 |
ef317cd5 | 14950 | msgid "show info page" |
07432cef | 14951 | msgstr "显示 info 手册" |
ef317cd5 | 14952 | |
349ede6a | 14953 | #: builtin/help.c:57 |
fd8cb379 JX |
14954 | msgid "print command description" |
14955 | msgstr "打印命令描述" | |
14956 | ||
349ede6a | 14957 | #: builtin/help.c:62 |
814ff314 JX |
14958 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
14959 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 14960 | |
349ede6a | 14961 | #: builtin/help.c:163 |
81809b99 | 14962 | #, c-format |
8ada9598 | 14963 | msgid "unrecognized help format '%s'" |
81809b99 | 14964 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 14965 | |
349ede6a | 14966 | #: builtin/help.c:190 |
8ada9598 | 14967 | msgid "Failed to start emacsclient." |
81809b99 | 14968 | msgstr "无法启动 emacsclient。" |
8ada9598 | 14969 | |
349ede6a | 14970 | #: builtin/help.c:203 |
8ada9598 | 14971 | msgid "Failed to parse emacsclient version." |
81809b99 | 14972 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 14973 | |
349ede6a | 14974 | #: builtin/help.c:211 |
8ada9598 JX |
14975 | #, c-format |
14976 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 14977 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 14978 | |
349ede6a | 14979 | #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 |
81809b99 | 14980 | #, c-format |
5b04ee3b | 14981 | msgid "failed to exec '%s'" |
c1ac5258 | 14982 | msgstr "执行 '%s' 失败" |
8ada9598 | 14983 | |
349ede6a | 14984 | #: builtin/help.c:307 |
8ada9598 JX |
14985 | #, c-format |
14986 | msgid "" | |
14987 | "'%s': path for unsupported man viewer.\n" | |
14988 | "Please consider using 'man.<tool>.cmd' instead." | |
14989 | msgstr "" | |
81809b99 | 14990 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 14991 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 14992 | |
349ede6a | 14993 | #: builtin/help.c:319 |
8ada9598 JX |
14994 | #, c-format |
14995 | msgid "" | |
14996 | "'%s': cmd for supported man viewer.\n" | |
14997 | "Please consider using 'man.<tool>.path' instead." | |
14998 | msgstr "" | |
81809b99 | 14999 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 15000 | "请使用 'man.<工具>.path'。" |
8ada9598 | 15001 | |
349ede6a | 15002 | #: builtin/help.c:436 |
8ada9598 JX |
15003 | #, c-format |
15004 | msgid "'%s': unknown man viewer." | |
81809b99 | 15005 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 15006 | |
349ede6a | 15007 | #: builtin/help.c:453 |
8ada9598 | 15008 | msgid "no man viewer handled the request" |
81809b99 | 15009 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 15010 | |
349ede6a | 15011 | #: builtin/help.c:461 |
8ada9598 | 15012 | msgid "no info viewer handled the request" |
81809b99 | 15013 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 15014 | |
349ede6a | 15015 | #: builtin/help.c:520 builtin/help.c:531 git.c:337 |
fd8cb379 JX |
15016 | #, c-format |
15017 | msgid "'%s' is aliased to '%s'" | |
15018 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 15019 | |
349ede6a | 15020 | #: builtin/help.c:534 git.c:367 |
4c27fcb5 JX |
15021 | #, c-format |
15022 | msgid "bad alias.%s string: %s" | |
15023 | msgstr "坏的 alias.%s 字符串:%s" | |
15024 | ||
349ede6a | 15025 | #: builtin/help.c:563 builtin/help.c:593 |
fd8cb379 JX |
15026 | #, c-format |
15027 | msgid "usage: %s%s" | |
15028 | msgstr "用法:%s%s" | |
4dcdc3d8 | 15029 | |
349ede6a | 15030 | #: builtin/help.c:577 |
c1ac5258 JX |
15031 | msgid "'git help config' for more information" |
15032 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 15033 | |
a6cd2cc4 | 15034 | #: builtin/index-pack.c:185 |
8ada9598 JX |
15035 | #, c-format |
15036 | msgid "object type mismatch at %s" | |
81809b99 | 15037 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 15038 | |
a6cd2cc4 | 15039 | #: builtin/index-pack.c:205 |
6acbf033 JX |
15040 | #, c-format |
15041 | msgid "did not receive expected object %s" | |
a0b6b246 | 15042 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 15043 | |
a6cd2cc4 | 15044 | #: builtin/index-pack.c:208 |
6acbf033 JX |
15045 | #, c-format |
15046 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 15047 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 15048 | |
a6cd2cc4 | 15049 | #: builtin/index-pack.c:258 |
81809b99 | 15050 | #, c-format |
8ada9598 JX |
15051 | msgid "cannot fill %d byte" |
15052 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 15053 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 15054 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 15055 | |
a6cd2cc4 | 15056 | #: builtin/index-pack.c:268 |
8ada9598 | 15057 | msgid "early EOF" |
81809b99 | 15058 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 15059 | |
a6cd2cc4 | 15060 | #: builtin/index-pack.c:269 |
8ada9598 | 15061 | msgid "read error on input" |
81809b99 | 15062 | msgstr "输入上的读错误" |
8ada9598 | 15063 | |
a6cd2cc4 | 15064 | #: builtin/index-pack.c:281 |
8ada9598 | 15065 | msgid "used more bytes than were available" |
81809b99 | 15066 | msgstr "用掉了超过可用的字节" |
8ada9598 | 15067 | |
7157c2b5 | 15068 | #: builtin/index-pack.c:288 builtin/pack-objects.c:618 |
8ada9598 | 15069 | msgid "pack too large for current definition of off_t" |
81809b99 | 15070 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 15071 | |
ddc12c42 | 15072 | #: builtin/index-pack.c:291 builtin/unpack-objects.c:95 |
a0b6b246 JX |
15073 | msgid "pack exceeds maximum allowed size" |
15074 | msgstr "包超过了最大允许值" | |
15075 | ||
349ede6a JX |
15076 | #: builtin/index-pack.c:306 builtin/repack.c:250 |
15077 | #, c-format | |
15078 | msgid "unable to create '%s'" | |
15079 | msgstr "不能创建 '%s'" | |
15080 | ||
a6cd2cc4 | 15081 | #: builtin/index-pack.c:312 |
81809b99 | 15082 | #, c-format |
8ada9598 | 15083 | msgid "cannot open packfile '%s'" |
81809b99 | 15084 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 15085 | |
a6cd2cc4 | 15086 | #: builtin/index-pack.c:326 |
8ada9598 | 15087 | msgid "pack signature mismatch" |
81809b99 | 15088 | msgstr "包签名不匹配" |
8ada9598 | 15089 | |
a6cd2cc4 | 15090 | #: builtin/index-pack.c:328 |
ef317cd5 JX |
15091 | #, c-format |
15092 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 15093 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 15094 | |
a6cd2cc4 | 15095 | #: builtin/index-pack.c:346 |
8ada9598 | 15096 | #, c-format |
5c57d762 JX |
15097 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
15098 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 15099 | |
a6cd2cc4 | 15100 | #: builtin/index-pack.c:466 |
8ada9598 JX |
15101 | #, c-format |
15102 | msgid "inflate returned %d" | |
81809b99 | 15103 | msgstr "解压缩返回 %d" |
8ada9598 | 15104 | |
a6cd2cc4 | 15105 | #: builtin/index-pack.c:515 |
8ada9598 | 15106 | msgid "offset value overflow for delta base object" |
81809b99 | 15107 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 15108 | |
a6cd2cc4 | 15109 | #: builtin/index-pack.c:523 |
8ada9598 | 15110 | msgid "delta base offset is out of bound" |
81809b99 | 15111 | msgstr "delta 基准偏移越界" |
8ada9598 | 15112 | |
a6cd2cc4 | 15113 | #: builtin/index-pack.c:531 |
81809b99 | 15114 | #, c-format |
8ada9598 | 15115 | msgid "unknown object type %d" |
81809b99 | 15116 | msgstr "未知对象类型 %d" |
8ada9598 | 15117 | |
a6cd2cc4 | 15118 | #: builtin/index-pack.c:562 |
8ada9598 | 15119 | msgid "cannot pread pack file" |
81809b99 | 15120 | msgstr "无法读取包文件" |
8ada9598 | 15121 | |
a6cd2cc4 | 15122 | #: builtin/index-pack.c:564 |
8ada9598 | 15123 | #, c-format |
5c57d762 JX |
15124 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
15125 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
15126 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
15127 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 15128 | |
a6cd2cc4 | 15129 | #: builtin/index-pack.c:590 |
8ada9598 | 15130 | msgid "serious inflate inconsistency" |
81809b99 | 15131 | msgstr "解压缩严重的不一致" |
8ada9598 | 15132 | |
2b472aae JX |
15133 | #: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 |
15134 | #: builtin/index-pack.c:804 builtin/index-pack.c:813 | |
8ada9598 JX |
15135 | #, c-format |
15136 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 15137 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 15138 | |
7157c2b5 JX |
15139 | #: builtin/index-pack.c:738 builtin/pack-objects.c:170 |
15140 | #: builtin/pack-objects.c:230 builtin/pack-objects.c:325 | |
6792b93b JX |
15141 | #, c-format |
15142 | msgid "unable to read %s" | |
15143 | msgstr "不能读 %s" | |
15144 | ||
2b472aae | 15145 | #: builtin/index-pack.c:802 |
87cb7997 JX |
15146 | #, c-format |
15147 | msgid "cannot read existing object info %s" | |
15148 | msgstr "不能读取现存对象信息 %s" | |
15149 | ||
2b472aae | 15150 | #: builtin/index-pack.c:810 |
6792b93b JX |
15151 | #, c-format |
15152 | msgid "cannot read existing object %s" | |
15153 | msgstr "不能读取现存对象 %s" | |
15154 | ||
2b472aae | 15155 | #: builtin/index-pack.c:824 |
81809b99 | 15156 | #, c-format |
8ada9598 | 15157 | msgid "invalid blob object %s" |
160fb2b2 | 15158 | msgstr "无效的数据对象 %s" |
8ada9598 | 15159 | |
2b472aae | 15160 | #: builtin/index-pack.c:827 builtin/index-pack.c:846 |
fd8cb379 JX |
15161 | msgid "fsck error in packed object" |
15162 | msgstr "对打包对象 fsck 检查出错" | |
15163 | ||
2b472aae | 15164 | #: builtin/index-pack.c:848 |
8ada9598 JX |
15165 | #, c-format |
15166 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 15167 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 15168 | |
2b472aae | 15169 | #: builtin/index-pack.c:920 builtin/index-pack.c:951 |
8ada9598 | 15170 | msgid "failed to apply delta" |
c1ac5258 | 15171 | msgstr "应用 delta 失败" |
8ada9598 | 15172 | |
2b472aae | 15173 | #: builtin/index-pack.c:1121 |
8ada9598 | 15174 | msgid "Receiving objects" |
81809b99 | 15175 | msgstr "接收对象中" |
8ada9598 | 15176 | |
2b472aae | 15177 | #: builtin/index-pack.c:1121 |
8ada9598 | 15178 | msgid "Indexing objects" |
81809b99 | 15179 | msgstr "索引对象中" |
8ada9598 | 15180 | |
2b472aae | 15181 | #: builtin/index-pack.c:1155 |
8ada9598 | 15182 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 15183 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 15184 | |
2b472aae | 15185 | #: builtin/index-pack.c:1160 |
8ada9598 | 15186 | msgid "cannot fstat packfile" |
65e2041e | 15187 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 15188 | |
2b472aae | 15189 | #: builtin/index-pack.c:1163 |
8ada9598 | 15190 | msgid "pack has junk at the end" |
81809b99 | 15191 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 15192 | |
2b472aae | 15193 | #: builtin/index-pack.c:1175 |
6792b93b JX |
15194 | msgid "confusion beyond insanity in parse_pack_objects()" |
15195 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
15196 | ||
2b472aae | 15197 | #: builtin/index-pack.c:1198 |
8ada9598 | 15198 | msgid "Resolving deltas" |
81809b99 | 15199 | msgstr "处理 delta 中" |
8ada9598 | 15200 | |
7157c2b5 | 15201 | #: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 |
07432cef | 15202 | #, c-format |
ef317cd5 | 15203 | msgid "unable to create thread: %s" |
07432cef | 15204 | msgstr "不能创建线程:%s" |
ef317cd5 | 15205 | |
2b472aae | 15206 | #: builtin/index-pack.c:1249 |
8ada9598 | 15207 | msgid "confusion beyond insanity" |
81809b99 | 15208 | msgstr "不可理喻" |
8ada9598 | 15209 | |
2b472aae | 15210 | #: builtin/index-pack.c:1255 |
ef317cd5 | 15211 | #, c-format |
5b04ee3b JX |
15212 | msgid "completed with %d local object" |
15213 | msgid_plural "completed with %d local objects" | |
15214 | msgstr[0] "完成 %d 个本地对象" | |
15215 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 15216 | |
2b472aae | 15217 | #: builtin/index-pack.c:1267 |
ef317cd5 JX |
15218 | #, c-format |
15219 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 15220 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 15221 | |
2b472aae | 15222 | #: builtin/index-pack.c:1271 |
8ada9598 JX |
15223 | #, c-format |
15224 | msgid "pack has %d unresolved delta" | |
15225 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 15226 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 15227 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 15228 | |
2b472aae | 15229 | #: builtin/index-pack.c:1295 |
81809b99 | 15230 | #, c-format |
8ada9598 | 15231 | msgid "unable to deflate appended object (%d)" |
07432cef | 15232 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 15233 | |
349ede6a | 15234 | #: builtin/index-pack.c:1391 |
8ada9598 JX |
15235 | #, c-format |
15236 | msgid "local object %s is corrupt" | |
81809b99 | 15237 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 15238 | |
349ede6a | 15239 | #: builtin/index-pack.c:1405 |
31e5e17b JX |
15240 | #, c-format |
15241 | msgid "packfile name '%s' does not end with '.pack'" | |
15242 | msgstr "包文件名 '%s' 没有以 '.pack' 结尾" | |
8ada9598 | 15243 | |
349ede6a | 15244 | #: builtin/index-pack.c:1430 |
81809b99 | 15245 | #, c-format |
31e5e17b JX |
15246 | msgid "cannot write %s file '%s'" |
15247 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 15248 | |
349ede6a | 15249 | #: builtin/index-pack.c:1438 |
81809b99 | 15250 | #, c-format |
31e5e17b JX |
15251 | msgid "cannot close written %s file '%s'" |
15252 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
15253 | ||
349ede6a | 15254 | #: builtin/index-pack.c:1462 |
31e5e17b JX |
15255 | msgid "error while closing pack file" |
15256 | msgstr "关闭包文件时出错" | |
8ada9598 | 15257 | |
349ede6a | 15258 | #: builtin/index-pack.c:1476 |
8ada9598 | 15259 | msgid "cannot store pack file" |
81809b99 | 15260 | msgstr "无法存储包文件" |
8ada9598 | 15261 | |
349ede6a | 15262 | #: builtin/index-pack.c:1484 |
8ada9598 | 15263 | msgid "cannot store index file" |
81809b99 | 15264 | msgstr "无法存储索引文件" |
8ada9598 | 15265 | |
7157c2b5 | 15266 | #: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 |
07432cef | 15267 | #, c-format |
ef317cd5 | 15268 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 15269 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 15270 | |
7157c2b5 | 15271 | #: builtin/index-pack.c:1592 |
81809b99 | 15272 | #, c-format |
8ada9598 | 15273 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 15274 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 15275 | |
7157c2b5 | 15276 | #: builtin/index-pack.c:1594 |
81809b99 | 15277 | #, c-format |
8ada9598 | 15278 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 15279 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 15280 | |
7157c2b5 | 15281 | #: builtin/index-pack.c:1642 |
81809b99 | 15282 | #, c-format |
8ada9598 JX |
15283 | msgid "non delta: %d object" |
15284 | msgid_plural "non delta: %d objects" | |
81809b99 | 15285 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 15286 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 15287 | |
7157c2b5 | 15288 | #: builtin/index-pack.c:1649 |
8ada9598 JX |
15289 | #, c-format |
15290 | msgid "chain length = %d: %lu object" | |
15291 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 15292 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 15293 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 15294 | |
7157c2b5 | 15295 | #: builtin/index-pack.c:1689 |
31e5e17b JX |
15296 | msgid "Cannot come back to cwd" |
15297 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 15298 | |
7157c2b5 JX |
15299 | #: builtin/index-pack.c:1738 builtin/index-pack.c:1741 |
15300 | #: builtin/index-pack.c:1757 builtin/index-pack.c:1761 | |
81809b99 | 15301 | #, c-format |
8ada9598 | 15302 | msgid "bad %s" |
81809b99 | 15303 | msgstr "错误选项 %s" |
8ada9598 | 15304 | |
7157c2b5 JX |
15305 | #: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 |
15306 | #, c-format | |
15307 | msgid "unknown hash algorithm '%s'" | |
15308 | msgstr "未知的哈希算法 '%s'" | |
15309 | ||
15310 | #: builtin/index-pack.c:1782 | |
8ada9598 | 15311 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 15312 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 15313 | |
7157c2b5 | 15314 | #: builtin/index-pack.c:1784 |
1a79b2f1 JX |
15315 | msgid "--stdin requires a git repository" |
15316 | msgstr "--stdin 需要一个 git 仓库" | |
15317 | ||
7157c2b5 JX |
15318 | #: builtin/index-pack.c:1786 |
15319 | msgid "--object-format cannot be used with --stdin" | |
15320 | msgstr "--object-format 不能和 --stdin 同时使用" | |
15321 | ||
15322 | #: builtin/index-pack.c:1792 | |
8ada9598 | 15323 | msgid "--verify with no packfile name given" |
dbd6cced | 15324 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 15325 | |
7157c2b5 | 15326 | #: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 |
fd8cb379 JX |
15327 | msgid "fsck error in pack objects" |
15328 | msgstr "在打包对象中 fsck 检查出错" | |
15329 | ||
349ede6a | 15330 | #: builtin/init-db.c:63 |
c04f5ac3 JX |
15331 | #, c-format |
15332 | msgid "cannot stat template '%s'" | |
65e2041e | 15333 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 15334 | |
349ede6a | 15335 | #: builtin/init-db.c:68 |
c04f5ac3 JX |
15336 | #, c-format |
15337 | msgid "cannot opendir '%s'" | |
15338 | msgstr "不能打开目录 '%s'" | |
15339 | ||
349ede6a | 15340 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
15341 | #, c-format |
15342 | msgid "cannot readlink '%s'" | |
15343 | msgstr "不能读取链接 '%s'" | |
15344 | ||
349ede6a | 15345 | #: builtin/init-db.c:82 |
c04f5ac3 JX |
15346 | #, c-format |
15347 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 15348 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 15349 | |
349ede6a | 15350 | #: builtin/init-db.c:88 |
c04f5ac3 JX |
15351 | #, c-format |
15352 | msgid "cannot copy '%s' to '%s'" | |
15353 | msgstr "不能拷贝 '%s' 至 '%s'" | |
15354 | ||
349ede6a | 15355 | #: builtin/init-db.c:92 |
c04f5ac3 JX |
15356 | #, c-format |
15357 | msgid "ignoring template %s" | |
15358 | msgstr "忽略模版 %s" | |
15359 | ||
349ede6a | 15360 | #: builtin/init-db.c:123 |
c04f5ac3 | 15361 | #, c-format |
fd8cb379 JX |
15362 | msgid "templates not found in %s" |
15363 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 15364 | |
349ede6a | 15365 | #: builtin/init-db.c:138 |
c04f5ac3 | 15366 | #, c-format |
5b04ee3b JX |
15367 | msgid "not copying templates from '%s': %s" |
15368 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 15369 | |
7157c2b5 JX |
15370 | #: builtin/init-db.c:276 |
15371 | #, c-format | |
15372 | msgid "invalid initial branch name: '%s'" | |
15373 | msgstr "无效的初始分支名:'%s'" | |
15374 | ||
15375 | #: builtin/init-db.c:368 | |
c04f5ac3 JX |
15376 | #, c-format |
15377 | msgid "unable to handle file type %d" | |
15378 | msgstr "不能处理 %d 类型的文件" | |
15379 | ||
7157c2b5 | 15380 | #: builtin/init-db.c:371 |
c04f5ac3 JX |
15381 | #, c-format |
15382 | msgid "unable to move %s to %s" | |
15383 | msgstr "不能移动 %s 至 %s" | |
15384 | ||
7157c2b5 | 15385 | #: builtin/init-db.c:386 |
349ede6a JX |
15386 | msgid "attempt to reinitialize repository with different hash" |
15387 | msgstr "尝试用不同的哈希算法重新初始化仓库" | |
15388 | ||
7157c2b5 | 15389 | #: builtin/init-db.c:410 builtin/init-db.c:413 |
a0b6b246 JX |
15390 | #, c-format |
15391 | msgid "%s already exists" | |
15392 | msgstr "%s 已经存在" | |
15393 | ||
7157c2b5 JX |
15394 | #: builtin/init-db.c:444 |
15395 | #, c-format | |
15396 | msgid "re-init: ignored --initial-branch=%s" | |
15397 | msgstr "re-init:已忽略 --initial-branch=%s" | |
15398 | ||
15399 | #: builtin/init-db.c:475 | |
c04f5ac3 | 15400 | #, c-format |
5c57d762 JX |
15401 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
15402 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 15403 | |
7157c2b5 | 15404 | #: builtin/init-db.c:476 |
5c57d762 JX |
15405 | #, c-format |
15406 | msgid "Reinitialized existing Git repository in %s%s\n" | |
15407 | msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" | |
c04f5ac3 | 15408 | |
7157c2b5 | 15409 | #: builtin/init-db.c:480 |
5c57d762 JX |
15410 | #, c-format |
15411 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 15412 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 15413 | |
7157c2b5 | 15414 | #: builtin/init-db.c:481 |
5c57d762 JX |
15415 | #, c-format |
15416 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 15417 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 15418 | |
7157c2b5 | 15419 | #: builtin/init-db.c:530 |
ef317cd5 | 15420 | msgid "" |
a77c07d9 | 15421 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 15422 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 15423 | msgstr "" |
07432cef | 15424 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 15425 | "[<目录>]" |
ef317cd5 | 15426 | |
7157c2b5 | 15427 | #: builtin/init-db.c:556 |
ef317cd5 | 15428 | msgid "permissions" |
07432cef | 15429 | msgstr "权限" |
ef317cd5 | 15430 | |
7157c2b5 | 15431 | #: builtin/init-db.c:557 |
ef317cd5 | 15432 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 15433 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 15434 | |
7157c2b5 JX |
15435 | #: builtin/init-db.c:563 |
15436 | msgid "override the name of the initial branch" | |
15437 | msgstr "覆盖初始分支名称" | |
15438 | ||
15439 | #: builtin/init-db.c:564 | |
349ede6a JX |
15440 | msgid "hash" |
15441 | msgstr "hash" | |
15442 | ||
7157c2b5 | 15443 | #: builtin/init-db.c:565 builtin/show-index.c:22 |
349ede6a JX |
15444 | msgid "specify the hash algorithm to use" |
15445 | msgstr "指定要使用的哈希算法" | |
15446 | ||
7157c2b5 | 15447 | #: builtin/init-db.c:598 builtin/init-db.c:603 |
c1ac5258 JX |
15448 | #, c-format |
15449 | msgid "cannot mkdir %s" | |
15450 | msgstr "不能创建目录 %s" | |
15451 | ||
7157c2b5 | 15452 | #: builtin/init-db.c:607 |
c04f5ac3 JX |
15453 | #, c-format |
15454 | msgid "cannot chdir to %s" | |
15455 | msgstr "不能切换目录到 %s" | |
15456 | ||
7157c2b5 | 15457 | #: builtin/init-db.c:634 |
c04f5ac3 JX |
15458 | #, c-format |
15459 | msgid "" | |
15460 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
15461 | "dir=<directory>)" | |
1e607449 | 15462 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 15463 | |
7157c2b5 | 15464 | #: builtin/init-db.c:662 |
c04f5ac3 JX |
15465 | #, c-format |
15466 | msgid "Cannot access work tree '%s'" | |
15467 | msgstr "不能访问工作区 '%s'" | |
15468 | ||
a6cd2cc4 | 15469 | #: builtin/interpret-trailers.c:16 |
220c313c | 15470 | msgid "" |
276ceeaa JX |
15471 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
15472 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
15473 | msgstr "" |
15474 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
15475 | ">])...] [<文件>...]" | |
276ceeaa | 15476 | |
a6cd2cc4 | 15477 | #: builtin/interpret-trailers.c:95 |
276ceeaa JX |
15478 | msgid "edit files in place" |
15479 | msgstr "在原位编辑文件" | |
220c313c | 15480 | |
a6cd2cc4 | 15481 | #: builtin/interpret-trailers.c:96 |
220c313c | 15482 | msgid "trim empty trailers" |
6937cb4e JX |
15483 | msgstr "删除空的尾部署名" |
15484 | ||
a6cd2cc4 | 15485 | #: builtin/interpret-trailers.c:99 |
6937cb4e JX |
15486 | msgid "where to place the new trailer" |
15487 | msgstr "在哪里放置新的尾部署名" | |
220c313c | 15488 | |
a6cd2cc4 | 15489 | #: builtin/interpret-trailers.c:101 |
6937cb4e JX |
15490 | msgid "action if trailer already exists" |
15491 | msgstr "当尾部署名已经存在时所采取的动作" | |
15492 | ||
a6cd2cc4 | 15493 | #: builtin/interpret-trailers.c:103 |
6937cb4e JX |
15494 | msgid "action if trailer is missing" |
15495 | msgstr "当尾部署名缺失时所采取的动作" | |
15496 | ||
a6cd2cc4 | 15497 | #: builtin/interpret-trailers.c:105 |
6937cb4e JX |
15498 | msgid "output only the trailers" |
15499 | msgstr "只输出尾部署名" | |
15500 | ||
a6cd2cc4 | 15501 | #: builtin/interpret-trailers.c:106 |
6937cb4e JX |
15502 | msgid "do not apply config rules" |
15503 | msgstr "不要应用配置规则" | |
15504 | ||
a6cd2cc4 | 15505 | #: builtin/interpret-trailers.c:107 |
6937cb4e JX |
15506 | msgid "join whitespace-continued values" |
15507 | msgstr "连接空白折行的值" | |
15508 | ||
a6cd2cc4 | 15509 | #: builtin/interpret-trailers.c:108 |
6937cb4e JX |
15510 | msgid "set parsing options" |
15511 | msgstr "设置解析选项" | |
15512 | ||
a6cd2cc4 | 15513 | #: builtin/interpret-trailers.c:110 |
4c27fcb5 JX |
15514 | msgid "do not treat --- specially" |
15515 | msgstr "不要对 --- 特殊处理" | |
15516 | ||
a6cd2cc4 | 15517 | #: builtin/interpret-trailers.c:111 |
220c313c | 15518 | msgid "trailer" |
6937cb4e | 15519 | msgstr "尾部署名" |
220c313c | 15520 | |
a6cd2cc4 | 15521 | #: builtin/interpret-trailers.c:112 |
220c313c | 15522 | msgid "trailer(s) to add" |
6937cb4e | 15523 | msgstr "要添加的尾部署名" |
220c313c | 15524 | |
a6cd2cc4 | 15525 | #: builtin/interpret-trailers.c:123 |
6937cb4e JX |
15526 | msgid "--trailer with --only-input does not make sense" |
15527 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
15528 | ||
a6cd2cc4 | 15529 | #: builtin/interpret-trailers.c:133 |
276ceeaa JX |
15530 | msgid "no input file given for in-place editing" |
15531 | msgstr "没有给出要原位编辑的文件" | |
15532 | ||
349ede6a | 15533 | #: builtin/log.c:57 |
7aea43ff | 15534 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 15535 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 15536 | |
349ede6a | 15537 | #: builtin/log.c:58 |
814ff314 JX |
15538 | msgid "git show [<options>] <object>..." |
15539 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 15540 | |
349ede6a | 15541 | #: builtin/log.c:111 |
220c313c JX |
15542 | #, c-format |
15543 | msgid "invalid --decorate option: %s" | |
15544 | msgstr "无效的 --decorate 选项:%s" | |
15545 | ||
349ede6a | 15546 | #: builtin/log.c:178 |
ef317cd5 | 15547 | msgid "show source" |
07432cef | 15548 | msgstr "显示源" |
ef317cd5 | 15549 | |
349ede6a | 15550 | #: builtin/log.c:179 |
07432cef WS |
15551 | msgid "Use mail map file" |
15552 | msgstr "使用邮件映射文件" | |
15553 | ||
349ede6a | 15554 | #: builtin/log.c:182 |
5809aa05 JX |
15555 | msgid "only decorate refs that match <pattern>" |
15556 | msgstr "只修饰与 <模式> 匹配的引用" | |
15557 | ||
349ede6a | 15558 | #: builtin/log.c:184 |
5809aa05 JX |
15559 | msgid "do not decorate refs that match <pattern>" |
15560 | msgstr "不修饰和 <模式> 匹配的引用" | |
15561 | ||
349ede6a | 15562 | #: builtin/log.c:185 |
ef317cd5 | 15563 | msgid "decorate options" |
07432cef | 15564 | msgstr "修饰选项" |
ef317cd5 | 15565 | |
349ede6a | 15566 | #: builtin/log.c:188 |
220c313c JX |
15567 | msgid "Process line range n,m in file, counting from 1" |
15568 | msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" | |
15569 | ||
349ede6a | 15570 | #: builtin/log.c:298 |
c04f5ac3 JX |
15571 | #, c-format |
15572 | msgid "Final output: %d %s\n" | |
15573 | msgstr "最终输出:%d %s\n" | |
15574 | ||
349ede6a | 15575 | #: builtin/log.c:556 |
220c313c JX |
15576 | #, c-format |
15577 | msgid "git show %s: bad file" | |
15578 | msgstr "git show %s: 损坏的文件" | |
15579 | ||
349ede6a | 15580 | #: builtin/log.c:571 builtin/log.c:666 |
c04f5ac3 | 15581 | #, c-format |
d46c5519 | 15582 | msgid "could not read object %s" |
90e6ef53 | 15583 | msgstr "不能读取对象 %s" |
c04f5ac3 | 15584 | |
349ede6a | 15585 | #: builtin/log.c:691 |
c04f5ac3 | 15586 | #, c-format |
d46c5519 | 15587 | msgid "unknown type: %d" |
c04f5ac3 JX |
15588 | msgstr "未知类型:%d" |
15589 | ||
349ede6a | 15590 | #: builtin/log.c:835 |
ddc12c42 JX |
15591 | #, c-format |
15592 | msgid "%s: invalid cover from description mode" | |
15593 | msgstr "%s:从描述生成附函的模式无效" | |
15594 | ||
349ede6a | 15595 | #: builtin/log.c:842 |
c04f5ac3 JX |
15596 | msgid "format.headers without value" |
15597 | msgstr "format.headers 没有值" | |
15598 | ||
349ede6a | 15599 | #: builtin/log.c:957 |
c04f5ac3 JX |
15600 | msgid "name of output directory is too long" |
15601 | msgstr "输出目录名太长" | |
15602 | ||
349ede6a | 15603 | #: builtin/log.c:973 |
c04f5ac3 | 15604 | #, c-format |
d46c5519 | 15605 | msgid "cannot open patch file %s" |
c04f5ac3 JX |
15606 | msgstr "无法打开补丁文件 %s" |
15607 | ||
349ede6a | 15608 | #: builtin/log.c:990 |
d46c5519 JX |
15609 | msgid "need exactly one range" |
15610 | msgstr "只需要一个范围" | |
c04f5ac3 | 15611 | |
349ede6a | 15612 | #: builtin/log.c:1000 |
d46c5519 JX |
15613 | msgid "not a range" |
15614 | msgstr "不是一个范围" | |
c04f5ac3 | 15615 | |
349ede6a | 15616 | #: builtin/log.c:1164 |
d46c5519 JX |
15617 | msgid "cover letter needs email format" |
15618 | msgstr "附函需要邮件地址格式" | |
c04f5ac3 | 15619 | |
349ede6a | 15620 | #: builtin/log.c:1170 |
d46c5519 JX |
15621 | msgid "failed to create cover-letter file" |
15622 | msgstr "无法创建附函文件" | |
15623 | ||
349ede6a | 15624 | #: builtin/log.c:1249 |
c04f5ac3 JX |
15625 | #, c-format |
15626 | msgid "insane in-reply-to: %s" | |
15627 | msgstr "不正常的 in-reply-to:%s" | |
15628 | ||
349ede6a | 15629 | #: builtin/log.c:1276 |
814ff314 JX |
15630 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
15631 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 15632 | |
349ede6a | 15633 | #: builtin/log.c:1334 |
d46c5519 | 15634 | msgid "two output directories?" |
c04f5ac3 JX |
15635 | msgstr "两个输出目录?" |
15636 | ||
349ede6a | 15637 | #: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 |
5b04ee3b | 15638 | #, c-format |
d46c5519 | 15639 | msgid "unknown commit %s" |
5b04ee3b JX |
15640 | msgstr "未知提交 %s" |
15641 | ||
349ede6a | 15642 | #: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 |
d46c5519 | 15643 | #: builtin/replace.c:210 |
5b04ee3b | 15644 | #, c-format |
d46c5519 JX |
15645 | msgid "failed to resolve '%s' as a valid ref" |
15646 | msgstr "无法将 '%s' 解析为一个有效引用" | |
5b04ee3b | 15647 | |
349ede6a | 15648 | #: builtin/log.c:1460 |
d46c5519 JX |
15649 | msgid "could not find exact merge base" |
15650 | msgstr "不能找到准确的合并基线" | |
5b04ee3b | 15651 | |
349ede6a | 15652 | #: builtin/log.c:1464 |
5b04ee3b | 15653 | msgid "" |
d46c5519 | 15654 | "failed to get upstream, if you want to record base commit automatically,\n" |
5b04ee3b | 15655 | "please use git branch --set-upstream-to to track a remote branch.\n" |
d46c5519 | 15656 | "Or you could specify base commit by --base=<base-commit-id> manually" |
5b04ee3b JX |
15657 | msgstr "" |
15658 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 15659 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
d46c5519 | 15660 | "参数 --base=<基线提交> 手动指定一个基线提交" |
5b04ee3b | 15661 | |
349ede6a | 15662 | #: builtin/log.c:1484 |
d46c5519 | 15663 | msgid "failed to find exact merge base" |
5b04ee3b JX |
15664 | msgstr "无法找到准确的合并基线" |
15665 | ||
349ede6a | 15666 | #: builtin/log.c:1495 |
5b04ee3b JX |
15667 | msgid "base commit should be the ancestor of revision list" |
15668 | msgstr "基线提交应该是版本列表的祖先" | |
15669 | ||
349ede6a | 15670 | #: builtin/log.c:1499 |
5b04ee3b JX |
15671 | msgid "base commit shouldn't be in revision list" |
15672 | msgstr "基线提交不应该出现在版本列表中" | |
15673 | ||
349ede6a | 15674 | #: builtin/log.c:1552 |
5b04ee3b | 15675 | msgid "cannot get patch id" |
aef18cc6 | 15676 | msgstr "无法得到补丁 id" |
5b04ee3b | 15677 | |
349ede6a | 15678 | #: builtin/log.c:1604 |
4c27fcb5 JX |
15679 | msgid "failed to infer range-diff ranges" |
15680 | msgstr "无法推断 range-diff 范围" | |
15681 | ||
349ede6a | 15682 | #: builtin/log.c:1650 |
ef317cd5 | 15683 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 15684 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 15685 | |
349ede6a | 15686 | #: builtin/log.c:1653 |
ef317cd5 | 15687 | msgid "use [PATCH] even with multiple patches" |
07432cef | 15688 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 15689 | |
349ede6a | 15690 | #: builtin/log.c:1657 |
ef317cd5 | 15691 | msgid "print patches to standard out" |
07432cef | 15692 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 15693 | |
349ede6a | 15694 | #: builtin/log.c:1659 |
ef317cd5 | 15695 | msgid "generate a cover letter" |
d46c5519 | 15696 | msgstr "生成一封附函" |
c04f5ac3 | 15697 | |
349ede6a | 15698 | #: builtin/log.c:1661 |
ef317cd5 | 15699 | msgid "use simple number sequence for output file names" |
07432cef | 15700 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 15701 | |
349ede6a | 15702 | #: builtin/log.c:1662 |
ef317cd5 | 15703 | msgid "sfx" |
07432cef | 15704 | msgstr "后缀" |
ef317cd5 | 15705 | |
349ede6a | 15706 | #: builtin/log.c:1663 |
ef317cd5 | 15707 | msgid "use <sfx> instead of '.patch'" |
07432cef | 15708 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 15709 | |
349ede6a | 15710 | #: builtin/log.c:1665 |
ef317cd5 | 15711 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
15712 | msgstr "补丁以 <n> 开始编号,而不是1" |
15713 | ||
349ede6a | 15714 | #: builtin/log.c:1667 |
07432cef WS |
15715 | msgid "mark the series as Nth re-roll" |
15716 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 15717 | |
349ede6a | 15718 | #: builtin/log.c:1669 |
a0b6b246 JX |
15719 | msgid "Use [RFC PATCH] instead of [PATCH]" |
15720 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" | |
15721 | ||
349ede6a | 15722 | #: builtin/log.c:1672 |
ddc12c42 JX |
15723 | msgid "cover-from-description-mode" |
15724 | msgstr "从分支描述获取附函的模式" | |
15725 | ||
349ede6a | 15726 | #: builtin/log.c:1673 |
ddc12c42 JX |
15727 | msgid "generate parts of a cover letter based on a branch's description" |
15728 | msgstr "基于一个分支描述生成部分附函" | |
15729 | ||
349ede6a | 15730 | #: builtin/log.c:1675 |
ef317cd5 | 15731 | msgid "Use [<prefix>] instead of [PATCH]" |
07432cef | 15732 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 15733 | |
349ede6a | 15734 | #: builtin/log.c:1678 |
ef317cd5 | 15735 | msgid "store resulting files in <dir>" |
d9d56b23 | 15736 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 15737 | |
349ede6a | 15738 | #: builtin/log.c:1681 |
ef317cd5 | 15739 | msgid "don't strip/add [PATCH]" |
07432cef | 15740 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 15741 | |
349ede6a | 15742 | #: builtin/log.c:1684 |
ef317cd5 | 15743 | msgid "don't output binary diffs" |
07432cef | 15744 | msgstr "不输出二进制差异" |
ef317cd5 | 15745 | |
349ede6a | 15746 | #: builtin/log.c:1686 |
89f80d72 JX |
15747 | msgid "output all-zero hash in From header" |
15748 | msgstr "在 From 头信息中输出全为零的哈希值" | |
15749 | ||
349ede6a | 15750 | #: builtin/log.c:1688 |
ef317cd5 | 15751 | msgid "don't include a patch matching a commit upstream" |
07432cef | 15752 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 15753 | |
349ede6a | 15754 | #: builtin/log.c:1690 |
ef317cd5 | 15755 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 15756 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 15757 | |
349ede6a | 15758 | #: builtin/log.c:1692 |
ef317cd5 | 15759 | msgid "Messaging" |
07432cef | 15760 | msgstr "邮件发送" |
ef317cd5 | 15761 | |
349ede6a | 15762 | #: builtin/log.c:1693 |
ef317cd5 | 15763 | msgid "header" |
07432cef | 15764 | msgstr "header" |
ef317cd5 | 15765 | |
349ede6a | 15766 | #: builtin/log.c:1694 |
ef317cd5 | 15767 | msgid "add email header" |
07432cef | 15768 | msgstr "添加邮件头" |
ef317cd5 | 15769 | |
349ede6a | 15770 | #: builtin/log.c:1695 builtin/log.c:1696 |
ef317cd5 | 15771 | msgid "email" |
07432cef | 15772 | msgstr "邮件地址" |
ef317cd5 | 15773 | |
349ede6a | 15774 | #: builtin/log.c:1695 |
ef317cd5 | 15775 | msgid "add To: header" |
07432cef | 15776 | msgstr "添加收件人" |
ef317cd5 | 15777 | |
349ede6a | 15778 | #: builtin/log.c:1696 |
ef317cd5 | 15779 | msgid "add Cc: header" |
07432cef | 15780 | msgstr "添加抄送" |
ef317cd5 | 15781 | |
349ede6a | 15782 | #: builtin/log.c:1697 |
2e8451e8 | 15783 | msgid "ident" |
d9d56b23 | 15784 | msgstr "标识" |
2e8451e8 | 15785 | |
349ede6a | 15786 | #: builtin/log.c:1698 |
2e8451e8 | 15787 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 15788 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 15789 | |
349ede6a | 15790 | #: builtin/log.c:1700 |
ef317cd5 | 15791 | msgid "message-id" |
d9d56b23 | 15792 | msgstr "邮件标识" |
ef317cd5 | 15793 | |
349ede6a | 15794 | #: builtin/log.c:1701 |
ef317cd5 | 15795 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 15796 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 15797 | |
349ede6a | 15798 | #: builtin/log.c:1702 builtin/log.c:1705 |
ef317cd5 | 15799 | msgid "boundary" |
07432cef | 15800 | msgstr "边界" |
ef317cd5 | 15801 | |
349ede6a | 15802 | #: builtin/log.c:1703 |
ef317cd5 | 15803 | msgid "attach the patch" |
07432cef | 15804 | msgstr "附件方式添加补丁" |
ef317cd5 | 15805 | |
349ede6a | 15806 | #: builtin/log.c:1706 |
ef317cd5 | 15807 | msgid "inline the patch" |
07432cef | 15808 | msgstr "内联显示补丁" |
ef317cd5 | 15809 | |
349ede6a | 15810 | #: builtin/log.c:1710 |
ef317cd5 | 15811 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 15812 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 15813 | |
349ede6a | 15814 | #: builtin/log.c:1712 |
ef317cd5 | 15815 | msgid "signature" |
07432cef | 15816 | msgstr "签名" |
ef317cd5 | 15817 | |
349ede6a | 15818 | #: builtin/log.c:1713 |
ef317cd5 | 15819 | msgid "add a signature" |
07432cef | 15820 | msgstr "添加一个签名" |
ef317cd5 | 15821 | |
349ede6a | 15822 | #: builtin/log.c:1714 |
5b04ee3b JX |
15823 | msgid "base-commit" |
15824 | msgstr "基线提交" | |
15825 | ||
349ede6a | 15826 | #: builtin/log.c:1715 |
5b04ee3b JX |
15827 | msgid "add prerequisite tree info to the patch series" |
15828 | msgstr "为补丁列表添加前置树信息" | |
15829 | ||
349ede6a | 15830 | #: builtin/log.c:1717 |
6acbf033 JX |
15831 | msgid "add a signature from a file" |
15832 | msgstr "从文件添加一个签名" | |
15833 | ||
349ede6a | 15834 | #: builtin/log.c:1718 |
ef317cd5 | 15835 | msgid "don't print the patch filenames" |
07432cef | 15836 | msgstr "不要打印补丁文件名" |
ef317cd5 | 15837 | |
349ede6a | 15838 | #: builtin/log.c:1720 |
6937cb4e JX |
15839 | msgid "show progress while generating patches" |
15840 | msgstr "在生成补丁时显示进度" | |
15841 | ||
349ede6a | 15842 | #: builtin/log.c:1722 |
4c27fcb5 JX |
15843 | msgid "show changes against <rev> in cover letter or single patch" |
15844 | msgstr "在附函或单个补丁中显示和 <rev> 的差异" | |
15845 | ||
349ede6a | 15846 | #: builtin/log.c:1725 |
4c27fcb5 JX |
15847 | msgid "show changes against <refspec> in cover letter or single patch" |
15848 | msgstr "在附函或单个补丁中显示和 <refspec> 的差异" | |
15849 | ||
349ede6a | 15850 | #: builtin/log.c:1727 |
4c27fcb5 JX |
15851 | msgid "percentage by which creation is weighted" |
15852 | msgstr "创建权重的百分比" | |
15853 | ||
349ede6a | 15854 | #: builtin/log.c:1812 |
a4f16749 JX |
15855 | #, c-format |
15856 | msgid "invalid ident line: %s" | |
15857 | msgstr "包含无效的身份标识:%s" | |
15858 | ||
349ede6a | 15859 | #: builtin/log.c:1827 |
c1ac5258 JX |
15860 | msgid "-n and -k are mutually exclusive" |
15861 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 15862 | |
349ede6a | 15863 | #: builtin/log.c:1829 |
c1ac5258 JX |
15864 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" |
15865 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 15866 | |
349ede6a | 15867 | #: builtin/log.c:1837 |
c04f5ac3 JX |
15868 | msgid "--name-only does not make sense" |
15869 | msgstr "--name-only 无意义" | |
15870 | ||
349ede6a | 15871 | #: builtin/log.c:1839 |
c04f5ac3 JX |
15872 | msgid "--name-status does not make sense" |
15873 | msgstr "--name-status 无意义" | |
15874 | ||
349ede6a | 15875 | #: builtin/log.c:1841 |
c04f5ac3 JX |
15876 | msgid "--check does not make sense" |
15877 | msgstr "--check 无意义" | |
15878 | ||
349ede6a | 15879 | #: builtin/log.c:1874 |
c04f5ac3 JX |
15880 | msgid "standard output, or directory, which one?" |
15881 | msgstr "标准输出或目录,哪一个?" | |
15882 | ||
349ede6a | 15883 | #: builtin/log.c:1978 |
4c27fcb5 JX |
15884 | msgid "--interdiff requires --cover-letter or single patch" |
15885 | msgstr "--interdiff 需要 --cover-letter 或单一补丁" | |
15886 | ||
349ede6a | 15887 | #: builtin/log.c:1982 |
4c27fcb5 JX |
15888 | msgid "Interdiff:" |
15889 | msgstr "版本间差异:" | |
15890 | ||
349ede6a | 15891 | #: builtin/log.c:1983 |
4c27fcb5 JX |
15892 | #, c-format |
15893 | msgid "Interdiff against v%d:" | |
15894 | msgstr "对 v%d 的版本差异:" | |
15895 | ||
349ede6a | 15896 | #: builtin/log.c:1989 |
4c27fcb5 JX |
15897 | msgid "--creation-factor requires --range-diff" |
15898 | msgstr "--creation-factor 需要 --range-diff" | |
15899 | ||
349ede6a | 15900 | #: builtin/log.c:1993 |
4c27fcb5 JX |
15901 | msgid "--range-diff requires --cover-letter or single patch" |
15902 | msgstr "--range-diff 需要 --cover-letter 或单一补丁" | |
15903 | ||
349ede6a | 15904 | #: builtin/log.c:2001 |
4c27fcb5 JX |
15905 | msgid "Range-diff:" |
15906 | msgstr "范围差异:" | |
15907 | ||
349ede6a | 15908 | #: builtin/log.c:2002 |
4c27fcb5 JX |
15909 | #, c-format |
15910 | msgid "Range-diff against v%d:" | |
15911 | msgstr "对 v%d 的范围差异:" | |
15912 | ||
349ede6a | 15913 | #: builtin/log.c:2013 |
6acbf033 JX |
15914 | #, c-format |
15915 | msgid "unable to read signature file '%s'" | |
15916 | msgstr "无法读取签名文件 '%s'" | |
15917 | ||
349ede6a | 15918 | #: builtin/log.c:2049 |
6937cb4e JX |
15919 | msgid "Generating patches" |
15920 | msgstr "生成补丁" | |
15921 | ||
349ede6a | 15922 | #: builtin/log.c:2093 |
d46c5519 | 15923 | msgid "failed to create output files" |
c04f5ac3 JX |
15924 | msgstr "无法创建输出文件" |
15925 | ||
349ede6a | 15926 | #: builtin/log.c:2152 |
ef317cd5 | 15927 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 15928 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 15929 | |
349ede6a | 15930 | #: builtin/log.c:2206 |
c04f5ac3 JX |
15931 | #, c-format |
15932 | msgid "" | |
15933 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 15934 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 15935 | |
349ede6a | 15936 | #: builtin/ls-files.c:471 |
814ff314 JX |
15937 | msgid "git ls-files [<options>] [<file>...]" |
15938 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 15939 | |
349ede6a | 15940 | #: builtin/ls-files.c:527 |
ef317cd5 | 15941 | msgid "identify the file status with tags" |
07432cef | 15942 | msgstr "用标签标识文件的状态" |
ef317cd5 | 15943 | |
349ede6a | 15944 | #: builtin/ls-files.c:529 |
ef317cd5 | 15945 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 15946 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 15947 | |
349ede6a | 15948 | #: builtin/ls-files.c:531 |
5809aa05 JX |
15949 | msgid "use lowercase letters for 'fsmonitor clean' files" |
15950 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
15951 | ||
349ede6a | 15952 | #: builtin/ls-files.c:533 |
ef317cd5 | 15953 | msgid "show cached files in the output (default)" |
07432cef | 15954 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 15955 | |
349ede6a | 15956 | #: builtin/ls-files.c:535 |
ef317cd5 | 15957 | msgid "show deleted files in the output" |
07432cef | 15958 | msgstr "显示已删除的文件" |
ef317cd5 | 15959 | |
349ede6a | 15960 | #: builtin/ls-files.c:537 |
ef317cd5 | 15961 | msgid "show modified files in the output" |
07432cef | 15962 | msgstr "显示已修改的文件" |
ef317cd5 | 15963 | |
349ede6a | 15964 | #: builtin/ls-files.c:539 |
ef317cd5 | 15965 | msgid "show other files in the output" |
07432cef | 15966 | msgstr "显示其它文件" |
ef317cd5 | 15967 | |
349ede6a | 15968 | #: builtin/ls-files.c:541 |
ef317cd5 | 15969 | msgid "show ignored files in the output" |
07432cef | 15970 | msgstr "显示忽略的文件" |
ef317cd5 | 15971 | |
349ede6a | 15972 | #: builtin/ls-files.c:544 |
ef317cd5 | 15973 | msgid "show staged contents' object name in the output" |
07432cef | 15974 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 15975 | |
349ede6a | 15976 | #: builtin/ls-files.c:546 |
ef317cd5 | 15977 | msgid "show files on the filesystem that need to be removed" |
07432cef | 15978 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 15979 | |
349ede6a | 15980 | #: builtin/ls-files.c:548 |
220c313c | 15981 | msgid "show 'other' directories' names only" |
07432cef | 15982 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 15983 | |
349ede6a | 15984 | #: builtin/ls-files.c:550 |
276ceeaa JX |
15985 | msgid "show line endings of files" |
15986 | msgstr "显示文件换行符格式" | |
15987 | ||
349ede6a | 15988 | #: builtin/ls-files.c:552 |
ef317cd5 | 15989 | msgid "don't show empty directories" |
07432cef | 15990 | msgstr "不显示空目录" |
ef317cd5 | 15991 | |
349ede6a | 15992 | #: builtin/ls-files.c:555 |
ef317cd5 | 15993 | msgid "show unmerged files in the output" |
07432cef | 15994 | msgstr "显示未合并的文件" |
ef317cd5 | 15995 | |
349ede6a | 15996 | #: builtin/ls-files.c:557 |
ef317cd5 | 15997 | msgid "show resolve-undo information" |
07432cef | 15998 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 15999 | |
349ede6a | 16000 | #: builtin/ls-files.c:559 |
ef317cd5 | 16001 | msgid "skip files matching pattern" |
07432cef | 16002 | msgstr "匹配排除文件的模式" |
ef317cd5 | 16003 | |
349ede6a | 16004 | #: builtin/ls-files.c:562 |
ef317cd5 | 16005 | msgid "exclude patterns are read from <file>" |
07432cef | 16006 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 16007 | |
349ede6a | 16008 | #: builtin/ls-files.c:565 |
ef317cd5 | 16009 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 16010 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 16011 | |
349ede6a | 16012 | #: builtin/ls-files.c:567 |
ef317cd5 | 16013 | msgid "add the standard git exclusions" |
07432cef | 16014 | msgstr "添加标准的 git 排除" |
ef317cd5 | 16015 | |
349ede6a | 16016 | #: builtin/ls-files.c:571 |
ef317cd5 | 16017 | msgid "make the output relative to the project top directory" |
07432cef | 16018 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 16019 | |
349ede6a | 16020 | #: builtin/ls-files.c:574 |
a0b6b246 JX |
16021 | msgid "recurse through submodules" |
16022 | msgstr "在子模组中递归" | |
16023 | ||
349ede6a | 16024 | #: builtin/ls-files.c:576 |
ef317cd5 | 16025 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 16026 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 16027 | |
349ede6a | 16028 | #: builtin/ls-files.c:577 |
ef317cd5 | 16029 | msgid "tree-ish" |
ddc12c42 | 16030 | msgstr "树对象" |
ef317cd5 | 16031 | |
349ede6a | 16032 | #: builtin/ls-files.c:578 |
ef317cd5 | 16033 | msgid "pretend that paths removed since <tree-ish> are still present" |
ddc12c42 | 16034 | msgstr "假装自从 <树对象> 之后删除的路径仍然存在" |
ef317cd5 | 16035 | |
349ede6a | 16036 | #: builtin/ls-files.c:580 |
ef317cd5 | 16037 | msgid "show debugging data" |
07432cef | 16038 | msgstr "显示调试数据" |
ef317cd5 | 16039 | |
fd8cb379 | 16040 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
16041 | msgid "" |
16042 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
16043 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
16044 | " [--symref] [<repository> [<refs>...]]" | |
16045 | msgstr "" | |
16046 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
16047 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
16048 | " [--symref] [<仓库> [<引用>...]]" | |
16049 | ||
fd8cb379 | 16050 | #: builtin/ls-remote.c:59 |
276ceeaa JX |
16051 | msgid "do not print remote URL" |
16052 | msgstr "不打印远程 URL" | |
16053 | ||
349ede6a | 16054 | #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 |
276ceeaa JX |
16055 | msgid "exec" |
16056 | msgstr "exec" | |
16057 | ||
fd8cb379 | 16058 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 |
276ceeaa JX |
16059 | msgid "path of git-upload-pack on the remote host" |
16060 | msgstr "远程主机上的 git-upload-pack 路径" | |
16061 | ||
fd8cb379 | 16062 | #: builtin/ls-remote.c:65 |
276ceeaa JX |
16063 | msgid "limit to tags" |
16064 | msgstr "仅限于标签" | |
16065 | ||
fd8cb379 | 16066 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
16067 | msgid "limit to heads" |
16068 | msgstr "仅限于分支" | |
16069 | ||
fd8cb379 | 16070 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
16071 | msgid "do not show peeled tags" |
16072 | msgstr "不显示已解析的标签" | |
16073 | ||
fd8cb379 | 16074 | #: builtin/ls-remote.c:69 |
276ceeaa JX |
16075 | msgid "take url.<base>.insteadOf into account" |
16076 | msgstr "参考 url.<base>.insteadOf 设置" | |
16077 | ||
d46c5519 | 16078 | #: builtin/ls-remote.c:72 |
276ceeaa JX |
16079 | msgid "exit with exit code 2 if no matching refs are found" |
16080 | msgstr "若未找到匹配的引用则以退出码2退出" | |
16081 | ||
d46c5519 | 16082 | #: builtin/ls-remote.c:75 |
276ceeaa JX |
16083 | msgid "show underlying ref in addition to the object pointed by it" |
16084 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
16085 | ||
c1ac5258 | 16086 | #: builtin/ls-tree.c:30 |
ef317cd5 | 16087 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
ddc12c42 | 16088 | msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" |
ef317cd5 | 16089 | |
c1ac5258 | 16090 | #: builtin/ls-tree.c:128 |
ef317cd5 | 16091 | msgid "only show trees" |
07432cef | 16092 | msgstr "只显示树" |
ef317cd5 | 16093 | |
c1ac5258 | 16094 | #: builtin/ls-tree.c:130 |
ef317cd5 | 16095 | msgid "recurse into subtrees" |
07432cef | 16096 | msgstr "递归到子树" |
ef317cd5 | 16097 | |
c1ac5258 | 16098 | #: builtin/ls-tree.c:132 |
ef317cd5 | 16099 | msgid "show trees when recursing" |
07432cef | 16100 | msgstr "当递归时显示树" |
ef317cd5 | 16101 | |
c1ac5258 | 16102 | #: builtin/ls-tree.c:135 |
ef317cd5 | 16103 | msgid "terminate entries with NUL byte" |
4375c10e | 16104 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 16105 | |
c1ac5258 | 16106 | #: builtin/ls-tree.c:136 |
ef317cd5 | 16107 | msgid "include object size" |
07432cef | 16108 | msgstr "包括对象大小" |
ef317cd5 | 16109 | |
c1ac5258 | 16110 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 16111 | msgid "list only filenames" |
07432cef | 16112 | msgstr "只列出文件名" |
ef317cd5 | 16113 | |
c1ac5258 | 16114 | #: builtin/ls-tree.c:143 |
ef317cd5 | 16115 | msgid "use full path names" |
07432cef | 16116 | msgstr "使用文件的全路径" |
ef317cd5 | 16117 | |
c1ac5258 | 16118 | #: builtin/ls-tree.c:145 |
ef317cd5 | 16119 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 16120 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 16121 | |
a4f16749 JX |
16122 | #: builtin/mailsplit.c:241 |
16123 | #, c-format | |
16124 | msgid "empty mbox: '%s'" | |
16125 | msgstr "空的 mbox:'%s'" | |
16126 | ||
349ede6a JX |
16127 | #: builtin/merge-base.c:32 |
16128 | msgid "git merge-base [-a | --all] <commit> <commit>..." | |
16129 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
16130 | ||
16131 | #: builtin/merge-base.c:33 | |
16132 | msgid "git merge-base [-a | --all] --octopus <commit>..." | |
16133 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
16134 | ||
16135 | #: builtin/merge-base.c:34 | |
16136 | msgid "git merge-base --independent <commit>..." | |
16137 | msgstr "git merge-base --independent <提交>..." | |
16138 | ||
16139 | #: builtin/merge-base.c:35 | |
16140 | msgid "git merge-base --is-ancestor <commit> <commit>" | |
16141 | msgstr "git merge-base --is-ancestor <提交> <提交>" | |
16142 | ||
16143 | #: builtin/merge-base.c:36 | |
16144 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
16145 | msgstr "git merge-base --fork-point <引用> [<提交>]" | |
16146 | ||
16147 | #: builtin/merge-base.c:143 | |
16148 | msgid "output all common ancestors" | |
16149 | msgstr "输出所有共同的祖先" | |
16150 | ||
16151 | #: builtin/merge-base.c:145 | |
16152 | msgid "find ancestors for a single n-way merge" | |
16153 | msgstr "查找一个多路合并的祖先提交" | |
16154 | ||
16155 | #: builtin/merge-base.c:147 | |
16156 | msgid "list revs not reachable from others" | |
16157 | msgstr "显示不能被其他访问到的版本" | |
16158 | ||
16159 | #: builtin/merge-base.c:149 | |
16160 | msgid "is the first one ancestor of the other?" | |
16161 | msgstr "第一个是其他的祖先提交么?" | |
16162 | ||
16163 | #: builtin/merge-base.c:151 | |
16164 | msgid "find where <commit> forked from reflog of <ref>" | |
16165 | msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点" | |
16166 | ||
16167 | #: builtin/merge-file.c:9 | |
16168 | msgid "" | |
16169 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " | |
16170 | "<orig-file> <file2>" | |
16171 | msgstr "" | |
16172 | "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" | |
16173 | "始文件> <文件2>" | |
16174 | ||
16175 | #: builtin/merge-file.c:35 | |
16176 | msgid "send results to standard output" | |
16177 | msgstr "将结果发送到标准输出" | |
16178 | ||
16179 | #: builtin/merge-file.c:36 | |
16180 | msgid "use a diff3 based merge" | |
16181 | msgstr "使用基于 diff3 的合并" | |
16182 | ||
16183 | #: builtin/merge-file.c:37 | |
16184 | msgid "for conflicts, use our version" | |
16185 | msgstr "如果冲突,使用我们的版本" | |
16186 | ||
16187 | #: builtin/merge-file.c:39 | |
16188 | msgid "for conflicts, use their version" | |
16189 | msgstr "如果冲突,使用他们的版本" | |
16190 | ||
16191 | #: builtin/merge-file.c:41 | |
16192 | msgid "for conflicts, use a union version" | |
16193 | msgstr "如果冲突,使用联合版本" | |
16194 | ||
16195 | #: builtin/merge-file.c:44 | |
16196 | msgid "for conflicts, use this marker size" | |
16197 | msgstr "如果冲突,使用指定长度的标记" | |
16198 | ||
16199 | #: builtin/merge-file.c:45 | |
16200 | msgid "do not warn about conflicts" | |
16201 | msgstr "不要警告冲突" | |
16202 | ||
16203 | #: builtin/merge-file.c:47 | |
16204 | msgid "set labels for file1/orig-file/file2" | |
16205 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
16206 | ||
16207 | #: builtin/merge-recursive.c:47 | |
16208 | #, c-format | |
16209 | msgid "unknown option %s" | |
16210 | msgstr "未知选项 %s" | |
16211 | ||
16212 | #: builtin/merge-recursive.c:53 | |
16213 | #, c-format | |
16214 | msgid "could not parse object '%s'" | |
16215 | msgstr "不能解析对象 '%s'" | |
16216 | ||
16217 | #: builtin/merge-recursive.c:57 | |
16218 | #, c-format | |
16219 | msgid "cannot handle more than %d base. Ignoring %s." | |
16220 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
16221 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
16222 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
16223 | ||
16224 | #: builtin/merge-recursive.c:65 | |
16225 | msgid "not handling anything other than two heads merge." | |
16226 | msgstr "不能处理两个头合并之外的任何操作。" | |
16227 | ||
16228 | #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 | |
16229 | #, c-format | |
16230 | msgid "could not resolve ref '%s'" | |
16231 | msgstr "无法解析引用 '%s'" | |
16232 | ||
16233 | #: builtin/merge-recursive.c:82 | |
16234 | #, c-format | |
16235 | msgid "Merging %s with %s\n" | |
16236 | msgstr "合并 %s 和 %s\n" | |
16237 | ||
16238 | #: builtin/merge.c:56 | |
814ff314 JX |
16239 | msgid "git merge [<options>] [<commit>...]" |
16240 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 16241 | |
349ede6a | 16242 | #: builtin/merge.c:57 |
ef317cd5 | 16243 | msgid "git merge --abort" |
07432cef | 16244 | msgstr "git merge --abort" |
ef317cd5 | 16245 | |
349ede6a | 16246 | #: builtin/merge.c:58 |
1a79b2f1 JX |
16247 | msgid "git merge --continue" |
16248 | msgstr "git merge --continue" | |
16249 | ||
349ede6a | 16250 | #: builtin/merge.c:121 |
c04f5ac3 JX |
16251 | msgid "switch `m' requires a value" |
16252 | msgstr "开关 `m' 需要一个值" | |
16253 | ||
349ede6a | 16254 | #: builtin/merge.c:144 |
06991777 JX |
16255 | #, c-format |
16256 | msgid "option `%s' requires a value" | |
16257 | msgstr "选项 `%s' 需要一个值" | |
16258 | ||
349ede6a | 16259 | #: builtin/merge.c:190 |
c04f5ac3 JX |
16260 | #, c-format |
16261 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 16262 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 16263 | |
349ede6a | 16264 | #: builtin/merge.c:191 |
c04f5ac3 JX |
16265 | #, c-format |
16266 | msgid "Available strategies are:" | |
16267 | msgstr "可用的策略有:" | |
16268 | ||
349ede6a | 16269 | #: builtin/merge.c:196 |
c04f5ac3 JX |
16270 | #, c-format |
16271 | msgid "Available custom strategies are:" | |
16272 | msgstr "可用的自定义策略有:" | |
16273 | ||
349ede6a | 16274 | #: builtin/merge.c:247 builtin/pull.c:133 |
ef317cd5 | 16275 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 16276 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 16277 | |
349ede6a | 16278 | #: builtin/merge.c:250 builtin/pull.c:136 |
ef317cd5 | 16279 | msgid "show a diffstat at the end of the merge" |
07432cef | 16280 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 16281 | |
349ede6a | 16282 | #: builtin/merge.c:251 builtin/pull.c:139 |
ef317cd5 | 16283 | msgid "(synonym to --stat)" |
07432cef | 16284 | msgstr "(和 --stat 同义)" |
ef317cd5 | 16285 | |
349ede6a | 16286 | #: builtin/merge.c:253 builtin/pull.c:142 |
ef317cd5 | 16287 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 16288 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 16289 | |
349ede6a | 16290 | #: builtin/merge.c:256 builtin/pull.c:148 |
ef317cd5 | 16291 | msgid "create a single commit instead of doing a merge" |
07432cef | 16292 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 16293 | |
349ede6a | 16294 | #: builtin/merge.c:258 builtin/pull.c:151 |
ef317cd5 | 16295 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 16296 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 16297 | |
349ede6a | 16298 | #: builtin/merge.c:260 builtin/pull.c:154 |
ef317cd5 | 16299 | msgid "edit message before committing" |
07432cef | 16300 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 16301 | |
349ede6a | 16302 | #: builtin/merge.c:262 |
ef317cd5 | 16303 | msgid "allow fast-forward (default)" |
07432cef | 16304 | msgstr "允许快进(默认)" |
ef317cd5 | 16305 | |
349ede6a | 16306 | #: builtin/merge.c:264 builtin/pull.c:161 |
ef317cd5 | 16307 | msgid "abort if fast-forward is not possible" |
07432cef | 16308 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 16309 | |
349ede6a | 16310 | #: builtin/merge.c:268 builtin/pull.c:164 |
5c57d762 | 16311 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
16312 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
16313 | ||
349ede6a JX |
16314 | #: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 |
16315 | #: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 | |
ef317cd5 | 16316 | msgid "strategy" |
07432cef | 16317 | msgstr "策略" |
ef317cd5 | 16318 | |
349ede6a | 16319 | #: builtin/merge.c:270 builtin/pull.c:169 |
ef317cd5 | 16320 | msgid "merge strategy to use" |
07432cef | 16321 | msgstr "要使用的合并策略" |
ef317cd5 | 16322 | |
349ede6a | 16323 | #: builtin/merge.c:271 builtin/pull.c:172 |
ef317cd5 | 16324 | msgid "option=value" |
07432cef | 16325 | msgstr "option=value" |
ef317cd5 | 16326 | |
349ede6a | 16327 | #: builtin/merge.c:272 builtin/pull.c:173 |
ef317cd5 | 16328 | msgid "option for selected merge strategy" |
07432cef | 16329 | msgstr "所选的合并策略的选项" |
ef317cd5 | 16330 | |
349ede6a | 16331 | #: builtin/merge.c:274 |
ef317cd5 | 16332 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 16333 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 16334 | |
349ede6a | 16335 | #: builtin/merge.c:281 |
ef317cd5 | 16336 | msgid "abort the current in-progress merge" |
07432cef | 16337 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 16338 | |
a6cd2cc4 | 16339 | # |
349ede6a | 16340 | #: builtin/merge.c:283 |
a6cd2cc4 JX |
16341 | msgid "--abort but leave index and working tree alone" |
16342 | msgstr "--abort,但是保留索引和工作区" | |
16343 | ||
349ede6a | 16344 | #: builtin/merge.c:285 |
1a79b2f1 JX |
16345 | msgid "continue the current in-progress merge" |
16346 | msgstr "继续当前正在进行的合并" | |
16347 | ||
349ede6a | 16348 | #: builtin/merge.c:287 builtin/pull.c:180 |
5b04ee3b JX |
16349 | msgid "allow merging unrelated histories" |
16350 | msgstr "允许合并不相关的历史" | |
16351 | ||
349ede6a | 16352 | #: builtin/merge.c:294 |
a5cd71ca JX |
16353 | msgid "bypass pre-merge-commit and commit-msg hooks" |
16354 | msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" | |
6937cb4e | 16355 | |
349ede6a | 16356 | #: builtin/merge.c:311 |
c04f5ac3 | 16357 | msgid "could not run stash." |
a4f16749 | 16358 | msgstr "不能运行贮藏。" |
c04f5ac3 | 16359 | |
349ede6a | 16360 | #: builtin/merge.c:316 |
c04f5ac3 | 16361 | msgid "stash failed" |
a4f16749 | 16362 | msgstr "贮藏失败" |
c04f5ac3 | 16363 | |
349ede6a | 16364 | #: builtin/merge.c:321 |
c04f5ac3 JX |
16365 | #, c-format |
16366 | msgid "not a valid object: %s" | |
16367 | msgstr "不是一个有效对象:%s" | |
16368 | ||
349ede6a | 16369 | #: builtin/merge.c:343 builtin/merge.c:360 |
c04f5ac3 JX |
16370 | msgid "read-tree failed" |
16371 | msgstr "读取树失败" | |
16372 | ||
90e6ef53 | 16373 | # 译者:注意保持前导空格 |
349ede6a | 16374 | #: builtin/merge.c:390 |
c04f5ac3 JX |
16375 | msgid " (nothing to squash)" |
16376 | msgstr " (无可压缩)" | |
16377 | ||
349ede6a | 16378 | #: builtin/merge.c:401 |
c04f5ac3 JX |
16379 | #, c-format |
16380 | msgid "Squash commit -- not updating HEAD\n" | |
16381 | msgstr "压缩提交 -- 未更新 HEAD\n" | |
16382 | ||
349ede6a | 16383 | #: builtin/merge.c:451 |
c04f5ac3 JX |
16384 | #, c-format |
16385 | msgid "No merge message -- not updating HEAD\n" | |
16386 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
16387 | ||
349ede6a | 16388 | #: builtin/merge.c:502 |
c04f5ac3 JX |
16389 | #, c-format |
16390 | msgid "'%s' does not point to a commit" | |
16391 | msgstr "'%s' 没有指向一个提交" | |
16392 | ||
349ede6a | 16393 | #: builtin/merge.c:589 |
c04f5ac3 JX |
16394 | #, c-format |
16395 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 16396 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 16397 | |
349ede6a | 16398 | #: builtin/merge.c:716 |
c04f5ac3 | 16399 | msgid "Not handling anything other than two heads merge." |
29004bbb | 16400 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 16401 | |
349ede6a | 16402 | #: builtin/merge.c:730 |
c04f5ac3 JX |
16403 | #, c-format |
16404 | msgid "Unknown option for merge-recursive: -X%s" | |
16405 | msgstr "merge-recursive 的未知选项:-X%s" | |
16406 | ||
349ede6a | 16407 | #: builtin/merge.c:745 |
c04f5ac3 JX |
16408 | #, c-format |
16409 | msgid "unable to write %s" | |
16410 | msgstr "不能写 %s" | |
16411 | ||
349ede6a | 16412 | #: builtin/merge.c:797 |
c04f5ac3 JX |
16413 | #, c-format |
16414 | msgid "Could not read from '%s'" | |
16415 | msgstr "不能从 '%s' 读取" | |
16416 | ||
349ede6a | 16417 | #: builtin/merge.c:806 |
c04f5ac3 JX |
16418 | #, c-format |
16419 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
16420 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
16421 | ||
349ede6a | 16422 | #: builtin/merge.c:812 |
c04f5ac3 JX |
16423 | msgid "" |
16424 | "Please enter a commit message to explain why this merge is necessary,\n" | |
16425 | "especially if it merges an updated upstream into a topic branch.\n" | |
16426 | "\n" | |
c04f5ac3 JX |
16427 | msgstr "" |
16428 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
16429 | "合并到主题分支。\n" | |
16430 | "\n" | |
c04f5ac3 | 16431 | |
349ede6a | 16432 | #: builtin/merge.c:817 |
d46c5519 | 16433 | msgid "An empty message aborts the commit.\n" |
5b533632 | 16434 | msgstr "空的提交说明会终止提交。\n" |
d46c5519 | 16435 | |
349ede6a | 16436 | #: builtin/merge.c:820 |
d46c5519 JX |
16437 | #, c-format |
16438 | msgid "" | |
16439 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" | |
16440 | "the commit.\n" | |
5b533632 | 16441 | msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n" |
d46c5519 | 16442 | |
349ede6a | 16443 | #: builtin/merge.c:873 |
c04f5ac3 JX |
16444 | msgid "Empty commit message." |
16445 | msgstr "空提交信息。" | |
16446 | ||
349ede6a | 16447 | #: builtin/merge.c:888 |
c04f5ac3 JX |
16448 | #, c-format |
16449 | msgid "Wonderful.\n" | |
16450 | msgstr "太棒了。\n" | |
16451 | ||
349ede6a | 16452 | #: builtin/merge.c:949 |
c04f5ac3 JX |
16453 | #, c-format |
16454 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
16455 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
16456 | ||
349ede6a | 16457 | #: builtin/merge.c:988 |
c04f5ac3 | 16458 | msgid "No current branch." |
90e6ef53 | 16459 | msgstr "没有当前分支。" |
c04f5ac3 | 16460 | |
349ede6a | 16461 | #: builtin/merge.c:990 |
c04f5ac3 | 16462 | msgid "No remote for the current branch." |
160fb2b2 | 16463 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 16464 | |
349ede6a | 16465 | #: builtin/merge.c:992 |
c04f5ac3 | 16466 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 16467 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 16468 | |
349ede6a | 16469 | #: builtin/merge.c:997 |
170e9899 | 16470 | #, c-format |
2e8451e8 JX |
16471 | msgid "No remote-tracking branch for %s from %s" |
16472 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 16473 | |
349ede6a | 16474 | #: builtin/merge.c:1054 |
5c57d762 JX |
16475 | #, c-format |
16476 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 16477 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 16478 | |
349ede6a | 16479 | #: builtin/merge.c:1157 |
5c57d762 JX |
16480 | #, c-format |
16481 | msgid "not something we can merge in %s: %s" | |
16482 | msgstr "不能在 %s 中合并:%s" | |
16483 | ||
349ede6a | 16484 | #: builtin/merge.c:1191 |
5c57d762 JX |
16485 | msgid "not something we can merge" |
16486 | msgstr "不能合并" | |
16487 | ||
349ede6a | 16488 | #: builtin/merge.c:1295 |
1a79b2f1 JX |
16489 | msgid "--abort expects no arguments" |
16490 | msgstr "--abort 不带参数" | |
16491 | ||
349ede6a | 16492 | #: builtin/merge.c:1299 |
c04f5ac3 | 16493 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 16494 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 16495 | |
349ede6a | 16496 | #: builtin/merge.c:1317 |
a6cd2cc4 JX |
16497 | msgid "--quit expects no arguments" |
16498 | msgstr "--quit 不带参数" | |
16499 | ||
349ede6a | 16500 | #: builtin/merge.c:1330 |
1a79b2f1 JX |
16501 | msgid "--continue expects no arguments" |
16502 | msgstr "--continue 不带参数" | |
16503 | ||
349ede6a | 16504 | #: builtin/merge.c:1334 |
1a79b2f1 JX |
16505 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
16506 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
16507 | ||
349ede6a | 16508 | #: builtin/merge.c:1350 |
c04f5ac3 JX |
16509 | msgid "" |
16510 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 16511 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
16512 | msgstr "" |
16513 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 16514 | "请在合并前先提交您的修改。" |
c04f5ac3 | 16515 | |
349ede6a | 16516 | #: builtin/merge.c:1357 |
c04f5ac3 JX |
16517 | msgid "" |
16518 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 16519 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
16520 | msgstr "" |
16521 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 16522 | "请在合并前先提交您的修改。" |
c04f5ac3 | 16523 | |
349ede6a | 16524 | #: builtin/merge.c:1360 |
c04f5ac3 JX |
16525 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
16526 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
16527 | ||
349ede6a | 16528 | #: builtin/merge.c:1374 |
c04f5ac3 | 16529 | msgid "You cannot combine --squash with --no-ff." |
a6cd2cc4 | 16530 | msgstr "您不能将 --squash 和 --no-ff 组合使用。" |
c04f5ac3 | 16531 | |
349ede6a | 16532 | #: builtin/merge.c:1376 |
a6cd2cc4 JX |
16533 | msgid "You cannot combine --squash with --commit." |
16534 | msgstr "您不能将 --squash 和 --commit 组合使用。" | |
16535 | ||
349ede6a | 16536 | #: builtin/merge.c:1392 |
c04f5ac3 | 16537 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 16538 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 16539 | |
349ede6a | 16540 | #: builtin/merge.c:1409 |
c04f5ac3 JX |
16541 | msgid "Squash commit into empty head not supported yet" |
16542 | msgstr "尚不支持到空分支的压缩提交" | |
16543 | ||
349ede6a | 16544 | #: builtin/merge.c:1411 |
c04f5ac3 JX |
16545 | msgid "Non-fast-forward commit does not make sense into an empty head" |
16546 | msgstr "到空分支的非快进式提交没有意义" | |
16547 | ||
349ede6a | 16548 | #: builtin/merge.c:1416 |
2e8451e8 JX |
16549 | #, c-format |
16550 | msgid "%s - not something we can merge" | |
16551 | msgstr "%s - 不能被合并" | |
16552 | ||
349ede6a | 16553 | #: builtin/merge.c:1418 |
7aea43ff JX |
16554 | msgid "Can merge only exactly one commit into empty head" |
16555 | msgstr "只能将一个提交合并到空分支上" | |
16556 | ||
349ede6a | 16557 | #: builtin/merge.c:1499 |
5b04ee3b JX |
16558 | msgid "refusing to merge unrelated histories" |
16559 | msgstr "拒绝合并无关的历史" | |
16560 | ||
349ede6a | 16561 | #: builtin/merge.c:1508 |
6937cb4e | 16562 | msgid "Already up to date." |
5c57d762 JX |
16563 | msgstr "已经是最新的。" |
16564 | ||
349ede6a | 16565 | #: builtin/merge.c:1518 |
c04f5ac3 JX |
16566 | #, c-format |
16567 | msgid "Updating %s..%s\n" | |
16568 | msgstr "更新 %s..%s\n" | |
16569 | ||
349ede6a | 16570 | #: builtin/merge.c:1564 |
c04f5ac3 JX |
16571 | #, c-format |
16572 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 16573 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 16574 | |
349ede6a | 16575 | #: builtin/merge.c:1571 |
c04f5ac3 JX |
16576 | #, c-format |
16577 | msgid "Nope.\n" | |
16578 | msgstr "无。\n" | |
16579 | ||
349ede6a | 16580 | #: builtin/merge.c:1596 |
6937cb4e | 16581 | msgid "Already up to date. Yeeah!" |
5c57d762 JX |
16582 | msgstr "已经是最新的。耶!" |
16583 | ||
349ede6a | 16584 | #: builtin/merge.c:1602 |
c04f5ac3 | 16585 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 16586 | msgstr "无法快进,终止。" |
c04f5ac3 | 16587 | |
349ede6a | 16588 | #: builtin/merge.c:1630 builtin/merge.c:1695 |
c04f5ac3 JX |
16589 | #, c-format |
16590 | msgid "Rewinding the tree to pristine...\n" | |
16591 | msgstr "将树回滚至原始状态...\n" | |
16592 | ||
349ede6a | 16593 | #: builtin/merge.c:1634 |
c04f5ac3 JX |
16594 | #, c-format |
16595 | msgid "Trying merge strategy %s...\n" | |
16596 | msgstr "尝试合并策略 %s...\n" | |
16597 | ||
349ede6a | 16598 | #: builtin/merge.c:1686 |
c04f5ac3 JX |
16599 | #, c-format |
16600 | msgid "No merge strategy handled the merge.\n" | |
16601 | msgstr "没有合并策略处理此合并。\n" | |
16602 | ||
349ede6a | 16603 | #: builtin/merge.c:1688 |
c04f5ac3 JX |
16604 | #, c-format |
16605 | msgid "Merge with strategy %s failed.\n" | |
16606 | msgstr "使用策略 %s 合并失败。\n" | |
16607 | ||
349ede6a | 16608 | #: builtin/merge.c:1697 |
c04f5ac3 JX |
16609 | #, c-format |
16610 | msgid "Using the %s to prepare resolving by hand.\n" | |
16611 | msgstr "使用 %s 以准备手工解决。\n" | |
16612 | ||
349ede6a | 16613 | #: builtin/merge.c:1711 |
c04f5ac3 JX |
16614 | #, c-format |
16615 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
16616 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
16617 | ||
349ede6a JX |
16618 | #: builtin/mktree.c:66 |
16619 | msgid "git mktree [-z] [--missing] [--batch]" | |
16620 | msgstr "git mktree [-z] [--missing] [--batch]" | |
c04f5ac3 | 16621 | |
c1ac5258 | 16622 | #: builtin/mktree.c:154 |
ef317cd5 | 16623 | msgid "input is NUL terminated" |
07432cef | 16624 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 16625 | |
06991777 | 16626 | #: builtin/mktree.c:155 builtin/write-tree.c:26 |
ef317cd5 | 16627 | msgid "allow missing objects" |
07432cef | 16628 | msgstr "允许丢失的对象" |
c04f5ac3 | 16629 | |
c1ac5258 | 16630 | #: builtin/mktree.c:156 |
ef317cd5 | 16631 | msgid "allow creation of more than one tree" |
07432cef | 16632 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 16633 | |
d46c5519 | 16634 | #: builtin/multi-pack-index.c:9 |
a6cd2cc4 | 16635 | msgid "" |
ddc12c42 JX |
16636 | "git multi-pack-index [<options>] (write|verify|expire|repack --batch-" |
16637 | "size=<size>)" | |
2b472aae JX |
16638 | msgstr "" |
16639 | "git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小" | |
16640 | ">)" | |
4c27fcb5 | 16641 | |
ddc12c42 | 16642 | #: builtin/multi-pack-index.c:26 |
4c27fcb5 JX |
16643 | msgid "object directory containing set of packfile and pack-index pairs" |
16644 | msgstr "包含成对包文件和包索引的对象目录" | |
16645 | ||
ddc12c42 | 16646 | #: builtin/multi-pack-index.c:29 |
a6cd2cc4 JX |
16647 | msgid "" |
16648 | "during repack, collect pack-files of smaller size into a batch that is " | |
16649 | "larger than this size" | |
16650 | msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中" | |
16651 | ||
349ede6a | 16652 | #: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 |
4c27fcb5 JX |
16653 | msgid "too many arguments" |
16654 | msgstr "太多参数" | |
16655 | ||
ddc12c42 | 16656 | #: builtin/multi-pack-index.c:60 |
a6cd2cc4 JX |
16657 | msgid "--batch-size option is only for 'repack' subcommand" |
16658 | msgstr "--batch-size 选项仅用于 'repack' 子命令" | |
16659 | ||
ddc12c42 | 16660 | #: builtin/multi-pack-index.c:69 |
4c27fcb5 | 16661 | #, c-format |
a6cd2cc4 JX |
16662 | msgid "unrecognized subcommand: %s" |
16663 | msgstr "未识别的子命令:%s" | |
4c27fcb5 | 16664 | |
06991777 | 16665 | #: builtin/mv.c:18 |
814ff314 JX |
16666 | msgid "git mv [<options>] <source>... <destination>" |
16667 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 16668 | |
06991777 | 16669 | #: builtin/mv.c:83 |
220c313c JX |
16670 | #, c-format |
16671 | msgid "Directory %s is in index and no submodule?" | |
16672 | msgstr "目录 %s 在索引中并且不是子模组?" | |
16673 | ||
06991777 | 16674 | #: builtin/mv.c:85 |
220c313c | 16675 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 16676 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 16677 | |
06991777 | 16678 | #: builtin/mv.c:103 |
220c313c JX |
16679 | #, c-format |
16680 | msgid "%.*s is in index" | |
16681 | msgstr "%.*s 在索引中" | |
16682 | ||
06991777 | 16683 | #: builtin/mv.c:125 |
ef317cd5 | 16684 | msgid "force move/rename even if target exists" |
07432cef | 16685 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 16686 | |
06991777 | 16687 | #: builtin/mv.c:127 |
ef317cd5 | 16688 | msgid "skip move/rename errors" |
07432cef | 16689 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 16690 | |
06991777 | 16691 | #: builtin/mv.c:169 |
220c313c JX |
16692 | #, c-format |
16693 | msgid "destination '%s' is not a directory" | |
16694 | msgstr "目标 '%s' 不是一个目录" | |
16695 | ||
06991777 | 16696 | #: builtin/mv.c:180 |
c04f5ac3 JX |
16697 | #, c-format |
16698 | msgid "Checking rename of '%s' to '%s'\n" | |
16699 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
16700 | ||
06991777 | 16701 | #: builtin/mv.c:184 |
c04f5ac3 JX |
16702 | msgid "bad source" |
16703 | msgstr "坏的源" | |
16704 | ||
06991777 | 16705 | #: builtin/mv.c:187 |
c04f5ac3 JX |
16706 | msgid "can not move directory into itself" |
16707 | msgstr "不能将目录移动到自身" | |
16708 | ||
06991777 | 16709 | #: builtin/mv.c:190 |
c04f5ac3 JX |
16710 | msgid "cannot move directory over file" |
16711 | msgstr "不能将目录移动到文件" | |
16712 | ||
06991777 | 16713 | #: builtin/mv.c:199 |
c04f5ac3 JX |
16714 | msgid "source directory is empty" |
16715 | msgstr "源目录为空" | |
16716 | ||
06991777 | 16717 | #: builtin/mv.c:224 |
c04f5ac3 JX |
16718 | msgid "not under version control" |
16719 | msgstr "不在版本控制之下" | |
16720 | ||
06991777 | 16721 | #: builtin/mv.c:227 |
c04f5ac3 JX |
16722 | msgid "destination exists" |
16723 | msgstr "目标已存在" | |
16724 | ||
06991777 | 16725 | #: builtin/mv.c:235 |
c04f5ac3 JX |
16726 | #, c-format |
16727 | msgid "overwriting '%s'" | |
16728 | msgstr "覆盖 '%s'" | |
16729 | ||
06991777 | 16730 | #: builtin/mv.c:238 |
c04f5ac3 JX |
16731 | msgid "Cannot overwrite" |
16732 | msgstr "不能覆盖" | |
16733 | ||
06991777 | 16734 | #: builtin/mv.c:241 |
c04f5ac3 JX |
16735 | msgid "multiple sources for the same target" |
16736 | msgstr "同一目标具有多个源" | |
16737 | ||
06991777 | 16738 | #: builtin/mv.c:243 |
cfff71a9 JX |
16739 | msgid "destination directory does not exist" |
16740 | msgstr "目标目录不存在" | |
16741 | ||
06991777 | 16742 | #: builtin/mv.c:250 |
c04f5ac3 JX |
16743 | #, c-format |
16744 | msgid "%s, source=%s, destination=%s" | |
16745 | msgstr "%s,源=%s,目标=%s" | |
16746 | ||
06991777 | 16747 | #: builtin/mv.c:271 |
c04f5ac3 JX |
16748 | #, c-format |
16749 | msgid "Renaming %s to %s\n" | |
16750 | msgstr "重命名 %s 至 %s\n" | |
16751 | ||
349ede6a | 16752 | #: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 |
c04f5ac3 JX |
16753 | #, c-format |
16754 | msgid "renaming '%s' failed" | |
16755 | msgstr "重命名 '%s' 失败" | |
16756 | ||
2b472aae | 16757 | #: builtin/name-rev.c:465 |
814ff314 JX |
16758 | msgid "git name-rev [<options>] <commit>..." |
16759 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 16760 | |
2b472aae | 16761 | #: builtin/name-rev.c:466 |
814ff314 JX |
16762 | msgid "git name-rev [<options>] --all" |
16763 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 16764 | |
2b472aae | 16765 | #: builtin/name-rev.c:467 |
814ff314 JX |
16766 | msgid "git name-rev [<options>] --stdin" |
16767 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 16768 | |
2b472aae | 16769 | #: builtin/name-rev.c:524 |
ef317cd5 | 16770 | msgid "print only names (no SHA-1)" |
07432cef | 16771 | msgstr "只打印名称(无 SHA-1)" |
ef317cd5 | 16772 | |
2b472aae | 16773 | #: builtin/name-rev.c:525 |
ef317cd5 | 16774 | msgid "only use tags to name the commits" |
55a16ee4 | 16775 | msgstr "只使用标签来命名提交" |
ef317cd5 | 16776 | |
2b472aae | 16777 | #: builtin/name-rev.c:527 |
ef317cd5 | 16778 | msgid "only use refs matching <pattern>" |
07432cef | 16779 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 16780 | |
2b472aae | 16781 | #: builtin/name-rev.c:529 |
87cb7997 JX |
16782 | msgid "ignore refs matching <pattern>" |
16783 | msgstr "忽略和 <模式> 相匹配的引用" | |
16784 | ||
2b472aae | 16785 | #: builtin/name-rev.c:531 |
ef317cd5 | 16786 | msgid "list all commits reachable from all refs" |
07432cef | 16787 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 16788 | |
2b472aae | 16789 | #: builtin/name-rev.c:532 |
ef317cd5 | 16790 | msgid "read from stdin" |
07432cef | 16791 | msgstr "从标准输入读取" |
ef317cd5 | 16792 | |
2b472aae | 16793 | #: builtin/name-rev.c:533 |
90314792 JX |
16794 | msgid "allow to print `undefined` names (default)" |
16795 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 16796 | |
2b472aae | 16797 | #: builtin/name-rev.c:539 |
2e8451e8 | 16798 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 16799 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 16800 | |
c1ac5258 | 16801 | #: builtin/notes.c:28 |
814ff314 | 16802 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 16803 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 16804 | |
c1ac5258 | 16805 | #: builtin/notes.c:29 |
ef317cd5 | 16806 | msgid "" |
814ff314 | 16807 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 16808 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 16809 | msgstr "" |
04cb2f28 JX |
16810 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
16811 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 16812 | |
c1ac5258 | 16813 | #: builtin/notes.c:30 |
814ff314 | 16814 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 16815 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 16816 | |
c1ac5258 | 16817 | #: builtin/notes.c:31 |
ef317cd5 | 16818 | msgid "" |
814ff314 | 16819 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 16820 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 16821 | msgstr "" |
04cb2f28 JX |
16822 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
16823 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 16824 | |
c1ac5258 | 16825 | #: builtin/notes.c:32 |
814ff314 | 16826 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 16827 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 16828 | |
c1ac5258 | 16829 | #: builtin/notes.c:33 |
814ff314 | 16830 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 16831 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 16832 | |
c1ac5258 | 16833 | #: builtin/notes.c:34 |
ef317cd5 | 16834 | msgid "" |
814ff314 | 16835 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 16836 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 16837 | |
c1ac5258 | 16838 | #: builtin/notes.c:35 |
ef317cd5 | 16839 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 16840 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 16841 | |
c1ac5258 | 16842 | #: builtin/notes.c:36 |
ef317cd5 | 16843 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 16844 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 16845 | |
c1ac5258 | 16846 | #: builtin/notes.c:37 |
814ff314 | 16847 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 16848 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 16849 | |
c1ac5258 | 16850 | #: builtin/notes.c:38 |
5809aa05 JX |
16851 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
16852 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 16853 | |
c1ac5258 | 16854 | #: builtin/notes.c:39 |
814ff314 | 16855 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 16856 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 16857 | |
c1ac5258 | 16858 | #: builtin/notes.c:44 |
ef317cd5 | 16859 | msgid "git notes [list [<object>]]" |
07432cef | 16860 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 16861 | |
c1ac5258 | 16862 | #: builtin/notes.c:49 |
ef317cd5 | 16863 | msgid "git notes add [<options>] [<object>]" |
07432cef | 16864 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 16865 | |
c1ac5258 | 16866 | #: builtin/notes.c:54 |
ef317cd5 | 16867 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 16868 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 16869 | |
c1ac5258 | 16870 | #: builtin/notes.c:55 |
ef317cd5 | 16871 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 16872 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 16873 | |
c1ac5258 | 16874 | #: builtin/notes.c:60 |
ef317cd5 | 16875 | msgid "git notes append [<options>] [<object>]" |
07432cef | 16876 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 16877 | |
c1ac5258 | 16878 | #: builtin/notes.c:65 |
ef317cd5 | 16879 | msgid "git notes edit [<object>]" |
07432cef | 16880 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 16881 | |
c1ac5258 | 16882 | #: builtin/notes.c:70 |
ef317cd5 | 16883 | msgid "git notes show [<object>]" |
07432cef | 16884 | msgstr "git notes show [<对象>]" |
ef317cd5 | 16885 | |
c1ac5258 | 16886 | #: builtin/notes.c:75 |
814ff314 | 16887 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 16888 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 16889 | |
c1ac5258 | 16890 | #: builtin/notes.c:76 |
ef317cd5 | 16891 | msgid "git notes merge --commit [<options>]" |
07432cef | 16892 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 16893 | |
c1ac5258 | 16894 | #: builtin/notes.c:77 |
ef317cd5 | 16895 | msgid "git notes merge --abort [<options>]" |
07432cef | 16896 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 16897 | |
c1ac5258 | 16898 | #: builtin/notes.c:82 |
ef317cd5 | 16899 | msgid "git notes remove [<object>]" |
07432cef | 16900 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 16901 | |
c1ac5258 | 16902 | #: builtin/notes.c:87 |
ef317cd5 | 16903 | msgid "git notes prune [<options>]" |
07432cef | 16904 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 16905 | |
c1ac5258 | 16906 | #: builtin/notes.c:92 |
ef317cd5 | 16907 | msgid "git notes get-ref" |
07432cef | 16908 | msgstr "git notes get-ref" |
ef317cd5 | 16909 | |
c1ac5258 | 16910 | #: builtin/notes.c:97 |
5c57d762 JX |
16911 | msgid "Write/edit the notes for the following object:" |
16912 | msgstr "为下面的对象写/编辑说明:" | |
16913 | ||
c1ac5258 | 16914 | #: builtin/notes.c:150 |
c04f5ac3 JX |
16915 | #, c-format |
16916 | msgid "unable to start 'show' for object '%s'" | |
16917 | msgstr "不能为对象 '%s' 开始 'show'" | |
16918 | ||
c1ac5258 | 16919 | #: builtin/notes.c:154 |
a77c07d9 JX |
16920 | msgid "could not read 'show' output" |
16921 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 16922 | |
c1ac5258 | 16923 | #: builtin/notes.c:162 |
c04f5ac3 JX |
16924 | #, c-format |
16925 | msgid "failed to finish 'show' for object '%s'" | |
16926 | msgstr "无法为对象 '%s' 完成 'show'" | |
16927 | ||
c1ac5258 | 16928 | #: builtin/notes.c:197 |
a0b6b246 | 16929 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
16930 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
16931 | ||
c1ac5258 | 16932 | #: builtin/notes.c:206 |
c04f5ac3 JX |
16933 | msgid "unable to write note object" |
16934 | msgstr "不能写注解对象" | |
16935 | ||
c1ac5258 | 16936 | #: builtin/notes.c:208 |
c04f5ac3 | 16937 | #, c-format |
a0b6b246 | 16938 | msgid "the note contents have been left in %s" |
220c313c | 16939 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 16940 | |
349ede6a | 16941 | #: builtin/notes.c:242 builtin/tag.c:533 |
c04f5ac3 JX |
16942 | #, c-format |
16943 | msgid "could not open or read '%s'" | |
16944 | msgstr "不能打开或读取 '%s'" | |
16945 | ||
4c27fcb5 | 16946 | #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 |
06991777 JX |
16947 | #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 |
16948 | #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 | |
a0b6b246 JX |
16949 | #, c-format |
16950 | msgid "failed to resolve '%s' as a valid ref." | |
16951 | msgstr "无法解析 '%s' 为一个有效引用。" | |
16952 | ||
4c27fcb5 | 16953 | #: builtin/notes.c:265 |
c04f5ac3 | 16954 | #, c-format |
a0b6b246 | 16955 | msgid "failed to read object '%s'." |
c1ac5258 | 16956 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 16957 | |
4c27fcb5 | 16958 | #: builtin/notes.c:268 |
6c94aba5 | 16959 | #, c-format |
a0b6b246 JX |
16960 | msgid "cannot read note data from non-blob object '%s'." |
16961 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
16962 | ||
4c27fcb5 | 16963 | #: builtin/notes.c:309 |
a0b6b246 JX |
16964 | #, c-format |
16965 | msgid "malformed input line: '%s'." | |
fd8cb379 | 16966 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 16967 | |
4c27fcb5 | 16968 | #: builtin/notes.c:324 |
a0b6b246 JX |
16969 | #, c-format |
16970 | msgid "failed to copy notes from '%s' to '%s'" | |
16971 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 16972 | |
a4f16749 JX |
16973 | #. TRANSLATORS: the first %s will be replaced by a git |
16974 | #. notes command: 'add', 'merge', 'remove', etc. | |
16975 | #. | |
4c27fcb5 | 16976 | #: builtin/notes.c:356 |
a0b6b246 JX |
16977 | #, c-format |
16978 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
16979 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
16980 | ||
06991777 JX |
16981 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 |
16982 | #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 | |
16983 | #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 | |
c04f5ac3 JX |
16984 | msgid "too many parameters" |
16985 | msgstr "参数太多" | |
16986 | ||
06991777 | 16987 | #: builtin/notes.c:389 builtin/notes.c:678 |
c04f5ac3 | 16988 | #, c-format |
a0b6b246 | 16989 | msgid "no note found for object %s." |
c04f5ac3 JX |
16990 | msgstr "未发现对象 %s 的注解。" |
16991 | ||
06991777 | 16992 | #: builtin/notes.c:410 builtin/notes.c:576 |
ef317cd5 | 16993 | msgid "note contents as a string" |
07432cef | 16994 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 16995 | |
06991777 | 16996 | #: builtin/notes.c:413 builtin/notes.c:579 |
ef317cd5 | 16997 | msgid "note contents in a file" |
07432cef | 16998 | msgstr "注解内容到一个文件中" |
ef317cd5 | 16999 | |
06991777 | 17000 | #: builtin/notes.c:416 builtin/notes.c:582 |
ef317cd5 | 17001 | msgid "reuse and edit specified note object" |
07432cef | 17002 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 17003 | |
06991777 | 17004 | #: builtin/notes.c:419 builtin/notes.c:585 |
ef317cd5 | 17005 | msgid "reuse specified note object" |
07432cef | 17006 | msgstr "重用指定的注解对象" |
ef317cd5 | 17007 | |
06991777 | 17008 | #: builtin/notes.c:422 builtin/notes.c:588 |
04cb2f28 JX |
17009 | msgid "allow storing empty note" |
17010 | msgstr "允许保存空白注释" | |
17011 | ||
06991777 | 17012 | #: builtin/notes.c:423 builtin/notes.c:496 |
ef317cd5 | 17013 | msgid "replace existing notes" |
07432cef | 17014 | msgstr "替换已存在的注解" |
ef317cd5 | 17015 | |
4c27fcb5 | 17016 | #: builtin/notes.c:448 |
c04f5ac3 JX |
17017 | #, c-format |
17018 | msgid "" | |
17019 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
17020 | "existing notes" | |
17021 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
17022 | ||
06991777 | 17023 | #: builtin/notes.c:463 builtin/notes.c:544 |
c04f5ac3 JX |
17024 | #, c-format |
17025 | msgid "Overwriting existing notes for object %s\n" | |
17026 | msgstr "覆盖对象 %s 现存注解\n" | |
17027 | ||
06991777 | 17028 | #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 |
04cb2f28 JX |
17029 | #, c-format |
17030 | msgid "Removing note for object %s\n" | |
17031 | msgstr "删除对象 %s 的注解\n" | |
17032 | ||
06991777 | 17033 | #: builtin/notes.c:497 |
ef317cd5 | 17034 | msgid "read objects from stdin" |
07432cef | 17035 | msgstr "从标准输入读取对象" |
ef317cd5 | 17036 | |
06991777 | 17037 | #: builtin/notes.c:499 |
ef317cd5 | 17038 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 17039 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 17040 | |
06991777 | 17041 | #: builtin/notes.c:517 |
c04f5ac3 JX |
17042 | msgid "too few parameters" |
17043 | msgstr "参数太少" | |
17044 | ||
06991777 | 17045 | #: builtin/notes.c:538 |
c04f5ac3 JX |
17046 | #, c-format |
17047 | msgid "" | |
17048 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
17049 | "existing notes" | |
17050 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
17051 | ||
06991777 | 17052 | #: builtin/notes.c:550 |
c04f5ac3 | 17053 | #, c-format |
a0b6b246 | 17054 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
17055 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
17056 | ||
06991777 | 17057 | #: builtin/notes.c:603 |
ef317cd5 JX |
17058 | #, c-format |
17059 | msgid "" | |
17060 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
17061 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
17062 | msgstr "" | |
17063 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
17064 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
17065 | ||
06991777 | 17066 | #: builtin/notes.c:698 |
a0b6b246 | 17067 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 17068 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 17069 | |
06991777 | 17070 | #: builtin/notes.c:700 |
a0b6b246 | 17071 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 17072 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 17073 | |
06991777 | 17074 | #: builtin/notes.c:702 |
a0b6b246 | 17075 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 17076 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 17077 | |
06991777 | 17078 | #: builtin/notes.c:722 |
a0b6b246 | 17079 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 17080 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 17081 | |
06991777 | 17082 | #: builtin/notes.c:724 |
a0b6b246 JX |
17083 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
17084 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
17085 | ||
06991777 | 17086 | #: builtin/notes.c:726 |
a0b6b246 JX |
17087 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
17088 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
17089 | ||
06991777 | 17090 | #: builtin/notes.c:739 |
a0b6b246 | 17091 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 17092 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 17093 | |
06991777 | 17094 | #: builtin/notes.c:742 |
a0b6b246 JX |
17095 | msgid "failed to finalize notes merge" |
17096 | msgstr "无法完成注解合并" | |
17097 | ||
06991777 | 17098 | #: builtin/notes.c:768 |
5c57d762 JX |
17099 | #, c-format |
17100 | msgid "unknown notes merge strategy %s" | |
17101 | msgstr "未知的注解合并策略 %s" | |
17102 | ||
06991777 | 17103 | #: builtin/notes.c:784 |
ef317cd5 | 17104 | msgid "General options" |
07432cef | 17105 | msgstr "通用选项" |
ef317cd5 | 17106 | |
06991777 | 17107 | #: builtin/notes.c:786 |
ef317cd5 | 17108 | msgid "Merge options" |
07432cef | 17109 | msgstr "合并选项" |
ef317cd5 | 17110 | |
06991777 | 17111 | #: builtin/notes.c:788 |
ef317cd5 JX |
17112 | msgid "" |
17113 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
17114 | "cat_sort_uniq)" | |
07432cef | 17115 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 17116 | |
06991777 | 17117 | #: builtin/notes.c:790 |
ef317cd5 | 17118 | msgid "Committing unmerged notes" |
07432cef | 17119 | msgstr "提交未合并的注解" |
ef317cd5 | 17120 | |
06991777 | 17121 | #: builtin/notes.c:792 |
ef317cd5 | 17122 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 17123 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 17124 | |
06991777 | 17125 | #: builtin/notes.c:794 |
ef317cd5 | 17126 | msgid "Aborting notes merge resolution" |
07432cef | 17127 | msgstr "中止注解合并的方案" |
ef317cd5 | 17128 | |
06991777 | 17129 | #: builtin/notes.c:796 |
ef317cd5 | 17130 | msgid "abort notes merge" |
07432cef | 17131 | msgstr "中止注解合并" |
ef317cd5 | 17132 | |
06991777 | 17133 | #: builtin/notes.c:807 |
5c57d762 JX |
17134 | msgid "cannot mix --commit, --abort or -s/--strategy" |
17135 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
17136 | ||
06991777 | 17137 | #: builtin/notes.c:812 |
a0b6b246 | 17138 | msgid "must specify a notes ref to merge" |
9a4b694c | 17139 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 17140 | |
06991777 | 17141 | #: builtin/notes.c:836 |
5c57d762 | 17142 | #, c-format |
a0b6b246 | 17143 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
17144 | msgstr "未知的 -s/--strategy:%s" |
17145 | ||
06991777 | 17146 | #: builtin/notes.c:873 |
1b7f4a34 | 17147 | #, c-format |
a0b6b246 JX |
17148 | msgid "a notes merge into %s is already in-progress at %s" |
17149 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 17150 | |
06991777 | 17151 | #: builtin/notes.c:876 |
5c57d762 | 17152 | #, c-format |
a0b6b246 JX |
17153 | msgid "failed to store link to current notes ref (%s)" |
17154 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 17155 | |
06991777 | 17156 | #: builtin/notes.c:878 |
5c57d762 JX |
17157 | #, c-format |
17158 | msgid "" | |
17159 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
17160 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
17161 | "abort'.\n" | |
a0b6b246 JX |
17162 | msgstr "" |
17163 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
17164 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 17165 | |
349ede6a | 17166 | #: builtin/notes.c:897 builtin/tag.c:546 |
d46c5519 JX |
17167 | #, c-format |
17168 | msgid "Failed to resolve '%s' as a valid ref." | |
17169 | msgstr "无法解析 '%s' 为一个有效引用。" | |
17170 | ||
06991777 | 17171 | #: builtin/notes.c:900 |
ef317cd5 JX |
17172 | #, c-format |
17173 | msgid "Object %s has no note\n" | |
17174 | msgstr "对象 %s 没有注解\n" | |
17175 | ||
06991777 | 17176 | #: builtin/notes.c:912 |
ef317cd5 | 17177 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 17178 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 17179 | |
06991777 | 17180 | #: builtin/notes.c:915 |
ef317cd5 | 17181 | msgid "read object names from the standard input" |
07432cef | 17182 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 17183 | |
7157c2b5 | 17184 | #: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 |
5c57d762 JX |
17185 | msgid "do not remove, show only" |
17186 | msgstr "不删除,只显示" | |
17187 | ||
06991777 | 17188 | #: builtin/notes.c:955 |
5c57d762 JX |
17189 | msgid "report pruned notes" |
17190 | msgstr "报告清除的注解" | |
17191 | ||
06991777 | 17192 | #: builtin/notes.c:998 |
6c94aba5 | 17193 | msgid "notes-ref" |
07432cef | 17194 | msgstr "注解引用" |
ef317cd5 | 17195 | |
06991777 | 17196 | #: builtin/notes.c:999 |
814ff314 | 17197 | msgid "use notes from <notes-ref>" |
07432cef | 17198 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 17199 | |
349ede6a | 17200 | #: builtin/notes.c:1034 builtin/stash.c:1608 |
ef317cd5 | 17201 | #, c-format |
a0b6b246 | 17202 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
17203 | msgstr "未知子命令:%s" |
17204 | ||
349ede6a | 17205 | #: builtin/pack-objects.c:53 |
1b7f4a34 JX |
17206 | msgid "" |
17207 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
17208 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 17209 | |
349ede6a | 17210 | #: builtin/pack-objects.c:54 |
1b7f4a34 JX |
17211 | msgid "" |
17212 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 17213 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 17214 | |
7157c2b5 | 17215 | #: builtin/pack-objects.c:442 |
ef317cd5 | 17216 | #, c-format |
c1ac5258 JX |
17217 | msgid "bad packed object CRC for %s" |
17218 | msgstr "%s 错的包对象 CRC" | |
17219 | ||
7157c2b5 | 17220 | #: builtin/pack-objects.c:453 |
c1ac5258 JX |
17221 | #, c-format |
17222 | msgid "corrupt packed object for %s" | |
17223 | msgstr "%s 损坏的包对象" | |
17224 | ||
7157c2b5 | 17225 | #: builtin/pack-objects.c:584 |
c1ac5258 JX |
17226 | #, c-format |
17227 | msgid "recursive delta detected for object %s" | |
17228 | msgstr "发现对象 %s 递归 delta" | |
17229 | ||
7157c2b5 | 17230 | #: builtin/pack-objects.c:795 |
c1ac5258 JX |
17231 | #, c-format |
17232 | msgid "ordered %u objects, expected %<PRIu32>" | |
17233 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
17234 | ||
7157c2b5 | 17235 | #: builtin/pack-objects.c:1003 |
5b04ee3b JX |
17236 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
17237 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
17238 | ||
7157c2b5 | 17239 | #: builtin/pack-objects.c:1016 |
6c94aba5 JX |
17240 | msgid "Writing objects" |
17241 | msgstr "写入对象中" | |
17242 | ||
7157c2b5 | 17243 | #: builtin/pack-objects.c:1077 builtin/update-index.c:90 |
c1ac5258 JX |
17244 | #, c-format |
17245 | msgid "failed to stat %s" | |
17246 | msgstr "对 %s 调用 stat 失败" | |
17247 | ||
7157c2b5 | 17248 | #: builtin/pack-objects.c:1130 |
c1ac5258 JX |
17249 | #, c-format |
17250 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
17251 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
17252 | ||
7157c2b5 | 17253 | #: builtin/pack-objects.c:1347 |
6c94aba5 JX |
17254 | msgid "disabling bitmap writing, as some objects are not being packed" |
17255 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
17256 | ||
7157c2b5 | 17257 | #: builtin/pack-objects.c:1774 |
c1ac5258 JX |
17258 | #, c-format |
17259 | msgid "delta base offset overflow in pack for %s" | |
17260 | msgstr "%s 压缩中 delta 基准偏移越界" | |
17261 | ||
7157c2b5 | 17262 | #: builtin/pack-objects.c:1783 |
c1ac5258 JX |
17263 | #, c-format |
17264 | msgid "delta base offset out of bound for %s" | |
17265 | msgstr "%s 的 delta 基准偏移越界" | |
17266 | ||
7157c2b5 | 17267 | #: builtin/pack-objects.c:2054 |
fd8cb379 JX |
17268 | msgid "Counting objects" |
17269 | msgstr "对象计数中" | |
17270 | ||
7157c2b5 | 17271 | #: builtin/pack-objects.c:2199 |
fd8cb379 JX |
17272 | #, c-format |
17273 | msgid "unable to parse object header of %s" | |
17274 | msgstr "无法解析对象 %s 头信息" | |
17275 | ||
7157c2b5 JX |
17276 | #: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 |
17277 | #: builtin/pack-objects.c:2295 | |
c1ac5258 JX |
17278 | #, c-format |
17279 | msgid "object %s cannot be read" | |
17280 | msgstr "对象 %s 无法读取" | |
17281 | ||
7157c2b5 | 17282 | #: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 |
c1ac5258 | 17283 | #, c-format |
4c27fcb5 JX |
17284 | msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" |
17285 | msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" | |
c1ac5258 | 17286 | |
7157c2b5 | 17287 | #: builtin/pack-objects.c:2309 |
c1ac5258 JX |
17288 | msgid "suboptimal pack - out of memory" |
17289 | msgstr "次优(suboptimal)打包 - 内存不足" | |
17290 | ||
7157c2b5 | 17291 | #: builtin/pack-objects.c:2624 |
c1ac5258 JX |
17292 | #, c-format |
17293 | msgid "Delta compression using up to %d threads" | |
17294 | msgstr "使用 %d 个线程进行压缩" | |
17295 | ||
7157c2b5 | 17296 | #: builtin/pack-objects.c:2763 |
c1ac5258 JX |
17297 | #, c-format |
17298 | msgid "unable to pack objects reachable from tag %s" | |
17299 | msgstr "无法为标签 %s 压缩对象" | |
17300 | ||
7157c2b5 | 17301 | #: builtin/pack-objects.c:2851 |
6c94aba5 JX |
17302 | msgid "Compressing objects" |
17303 | msgstr "压缩对象中" | |
17304 | ||
7157c2b5 | 17305 | #: builtin/pack-objects.c:2857 |
c1ac5258 JX |
17306 | msgid "inconsistency with delta count" |
17307 | msgstr "不一致的差异计数" | |
17308 | ||
7157c2b5 JX |
17309 | #: builtin/pack-objects.c:2929 |
17310 | #, c-format | |
17311 | msgid "" | |
17312 | "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" | |
17313 | "hash> <uri>' (got '%s')" | |
17314 | msgstr "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格式(得到 '%s')" | |
17315 | ||
17316 | #: builtin/pack-objects.c:2932 | |
17317 | #, c-format | |
17318 | msgid "" | |
17319 | "object already configured in another uploadpack.blobpackfileuri (got '%s')" | |
17320 | msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')" | |
17321 | ||
17322 | #: builtin/pack-objects.c:2961 | |
c1ac5258 JX |
17323 | #, c-format |
17324 | msgid "" | |
17325 | "expected edge object ID, got garbage:\n" | |
17326 | " %s" | |
17327 | msgstr "" | |
17328 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
17329 | " %s" | |
17330 | ||
7157c2b5 | 17331 | #: builtin/pack-objects.c:2967 |
c1ac5258 JX |
17332 | #, c-format |
17333 | msgid "" | |
17334 | "expected object ID, got garbage:\n" | |
17335 | " %s" | |
17336 | msgstr "" | |
17337 | "预期对象 ID,却得到垃圾数据:\n" | |
17338 | " %s" | |
17339 | ||
7157c2b5 | 17340 | #: builtin/pack-objects.c:3065 |
5809aa05 JX |
17341 | msgid "invalid value for --missing" |
17342 | msgstr "选项 --missing 的值无效" | |
17343 | ||
7157c2b5 | 17344 | #: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 |
c1ac5258 JX |
17345 | msgid "cannot open pack index" |
17346 | msgstr "无法打开包文件索引" | |
17347 | ||
7157c2b5 | 17348 | #: builtin/pack-objects.c:3155 |
c1ac5258 JX |
17349 | #, c-format |
17350 | msgid "loose object at %s could not be examined" | |
17351 | msgstr "无法检查 %s 处的松散对象" | |
17352 | ||
7157c2b5 | 17353 | #: builtin/pack-objects.c:3240 |
c1ac5258 JX |
17354 | msgid "unable to force loose object" |
17355 | msgstr "无法强制松散对象" | |
17356 | ||
7157c2b5 | 17357 | #: builtin/pack-objects.c:3333 |
c1ac5258 JX |
17358 | #, c-format |
17359 | msgid "not a rev '%s'" | |
17360 | msgstr "不是一个版本 '%s'" | |
17361 | ||
7157c2b5 | 17362 | #: builtin/pack-objects.c:3336 |
c1ac5258 JX |
17363 | #, c-format |
17364 | msgid "bad revision '%s'" | |
17365 | msgstr "坏的版本 '%s'" | |
17366 | ||
7157c2b5 | 17367 | #: builtin/pack-objects.c:3361 |
c1ac5258 JX |
17368 | msgid "unable to add recent objects" |
17369 | msgstr "无法添加最近的对象" | |
17370 | ||
7157c2b5 | 17371 | #: builtin/pack-objects.c:3414 |
ef317cd5 JX |
17372 | #, c-format |
17373 | msgid "unsupported index version %s" | |
17374 | msgstr "不支持的索引版本 %s" | |
17375 | ||
7157c2b5 | 17376 | #: builtin/pack-objects.c:3418 |
ef317cd5 JX |
17377 | #, c-format |
17378 | msgid "bad index version '%s'" | |
17379 | msgstr "坏的索引版本 '%s'" | |
17380 | ||
7157c2b5 | 17381 | #: builtin/pack-objects.c:3456 |
c1ac5258 JX |
17382 | msgid "<version>[,<offset>]" |
17383 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 17384 | |
7157c2b5 | 17385 | #: builtin/pack-objects.c:3457 |
ef317cd5 | 17386 | msgid "write the pack index file in the specified idx format version" |
07432cef | 17387 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 17388 | |
7157c2b5 | 17389 | #: builtin/pack-objects.c:3460 |
ef317cd5 | 17390 | msgid "maximum size of each output pack file" |
07432cef | 17391 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 17392 | |
7157c2b5 | 17393 | #: builtin/pack-objects.c:3462 |
ef317cd5 | 17394 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 17395 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 17396 | |
7157c2b5 | 17397 | #: builtin/pack-objects.c:3464 |
ef317cd5 | 17398 | msgid "ignore packed objects" |
07432cef | 17399 | msgstr "忽略包对象" |
ef317cd5 | 17400 | |
7157c2b5 | 17401 | #: builtin/pack-objects.c:3466 |
ef317cd5 | 17402 | msgid "limit pack window by objects" |
07432cef | 17403 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 17404 | |
7157c2b5 | 17405 | #: builtin/pack-objects.c:3468 |
ef317cd5 | 17406 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 17407 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 17408 | |
7157c2b5 | 17409 | #: builtin/pack-objects.c:3470 |
ef317cd5 | 17410 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 17411 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 17412 | |
7157c2b5 | 17413 | #: builtin/pack-objects.c:3472 |
ef317cd5 | 17414 | msgid "reuse existing deltas" |
07432cef | 17415 | msgstr "重用已存在的 deltas" |
ef317cd5 | 17416 | |
7157c2b5 | 17417 | #: builtin/pack-objects.c:3474 |
ef317cd5 | 17418 | msgid "reuse existing objects" |
07432cef | 17419 | msgstr "重用已存在的对象" |
ef317cd5 | 17420 | |
7157c2b5 | 17421 | #: builtin/pack-objects.c:3476 |
ef317cd5 | 17422 | msgid "use OFS_DELTA objects" |
07432cef | 17423 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 17424 | |
7157c2b5 | 17425 | #: builtin/pack-objects.c:3478 |
ef317cd5 | 17426 | msgid "use threads when searching for best delta matches" |
07432cef | 17427 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 17428 | |
7157c2b5 | 17429 | #: builtin/pack-objects.c:3480 |
ef317cd5 | 17430 | msgid "do not create an empty pack output" |
07432cef | 17431 | msgstr "不创建空的包输出" |
ef317cd5 | 17432 | |
7157c2b5 | 17433 | #: builtin/pack-objects.c:3482 |
ef317cd5 | 17434 | msgid "read revision arguments from standard input" |
d9d56b23 | 17435 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 17436 | |
7157c2b5 | 17437 | #: builtin/pack-objects.c:3484 |
ef317cd5 | 17438 | msgid "limit the objects to those that are not yet packed" |
07432cef | 17439 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 17440 | |
7157c2b5 | 17441 | #: builtin/pack-objects.c:3487 |
ef317cd5 | 17442 | msgid "include objects reachable from any reference" |
07432cef | 17443 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 17444 | |
7157c2b5 | 17445 | #: builtin/pack-objects.c:3490 |
ef317cd5 | 17446 | msgid "include objects referred by reflog entries" |
07432cef | 17447 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 17448 | |
7157c2b5 | 17449 | #: builtin/pack-objects.c:3493 |
220c313c JX |
17450 | msgid "include objects referred to by the index" |
17451 | msgstr "包括被索引引用到的对象" | |
17452 | ||
7157c2b5 | 17453 | #: builtin/pack-objects.c:3496 |
ef317cd5 | 17454 | msgid "output pack to stdout" |
07432cef | 17455 | msgstr "输出包到标准输出" |
ef317cd5 | 17456 | |
7157c2b5 | 17457 | #: builtin/pack-objects.c:3498 |
ef317cd5 | 17458 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 17459 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 17460 | |
7157c2b5 | 17461 | #: builtin/pack-objects.c:3500 |
ef317cd5 | 17462 | msgid "keep unreachable objects" |
07432cef | 17463 | msgstr "维持不可达的对象" |
ef317cd5 | 17464 | |
7157c2b5 | 17465 | #: builtin/pack-objects.c:3502 |
5c57d762 JX |
17466 | msgid "pack loose unreachable objects" |
17467 | msgstr "打包松散的不可达对象" | |
17468 | ||
7157c2b5 | 17469 | #: builtin/pack-objects.c:3504 |
ef317cd5 | 17470 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 17471 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 17472 | |
7157c2b5 | 17473 | #: builtin/pack-objects.c:3507 |
06991777 JX |
17474 | msgid "use the sparse reachability algorithm" |
17475 | msgstr "使用稀疏可达性算法" | |
17476 | ||
7157c2b5 | 17477 | #: builtin/pack-objects.c:3509 |
ef317cd5 | 17478 | msgid "create thin packs" |
07432cef | 17479 | msgstr "创建精简包" |
ef317cd5 | 17480 | |
7157c2b5 | 17481 | #: builtin/pack-objects.c:3511 |
04cb2f28 | 17482 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 17483 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 17484 | |
7157c2b5 | 17485 | #: builtin/pack-objects.c:3513 |
ef317cd5 | 17486 | msgid "ignore packs that have companion .keep file" |
07432cef | 17487 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 17488 | |
7157c2b5 | 17489 | #: builtin/pack-objects.c:3515 |
fd8cb379 JX |
17490 | msgid "ignore this pack" |
17491 | msgstr "忽略该 pack" | |
17492 | ||
7157c2b5 | 17493 | #: builtin/pack-objects.c:3517 |
ef317cd5 | 17494 | msgid "pack compression level" |
07432cef | 17495 | msgstr "打包压缩级别" |
ef317cd5 | 17496 | |
7157c2b5 | 17497 | #: builtin/pack-objects.c:3519 |
ef317cd5 | 17498 | msgid "do not hide commits by grafts" |
fd8cb379 | 17499 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 17500 | |
7157c2b5 | 17501 | #: builtin/pack-objects.c:3521 |
6c94aba5 JX |
17502 | msgid "use a bitmap index if available to speed up counting objects" |
17503 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
17504 | ||
7157c2b5 | 17505 | #: builtin/pack-objects.c:3523 |
6c94aba5 JX |
17506 | msgid "write a bitmap index together with the pack index" |
17507 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
17508 | ||
7157c2b5 | 17509 | #: builtin/pack-objects.c:3527 |
a6cd2cc4 JX |
17510 | msgid "write a bitmap index if possible" |
17511 | msgstr "如果可能,写 bitmap 索引" | |
17512 | ||
7157c2b5 | 17513 | #: builtin/pack-objects.c:3531 |
5809aa05 JX |
17514 | msgid "handling for missing objects" |
17515 | msgstr "处理丢失的对象" | |
17516 | ||
7157c2b5 | 17517 | #: builtin/pack-objects.c:3534 |
31e5e17b JX |
17518 | msgid "do not pack objects in promisor packfiles" |
17519 | msgstr "不要打包 promisor 包文件中的对象" | |
17520 | ||
7157c2b5 | 17521 | #: builtin/pack-objects.c:3536 |
4c27fcb5 JX |
17522 | msgid "respect islands during delta compression" |
17523 | msgstr "在增量压缩时参考数据岛" | |
17524 | ||
7157c2b5 JX |
17525 | #: builtin/pack-objects.c:3538 |
17526 | msgid "protocol" | |
17527 | msgstr "协议" | |
17528 | ||
17529 | #: builtin/pack-objects.c:3539 | |
17530 | msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" | |
17531 | msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri" | |
17532 | ||
17533 | #: builtin/pack-objects.c:3568 | |
fd8cb379 JX |
17534 | #, c-format |
17535 | msgid "delta chain depth %d is too deep, forcing %d" | |
17536 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
17537 | ||
7157c2b5 | 17538 | #: builtin/pack-objects.c:3573 |
fd8cb379 JX |
17539 | #, c-format |
17540 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
17541 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 17542 | |
7157c2b5 | 17543 | #: builtin/pack-objects.c:3627 |
c1ac5258 JX |
17544 | msgid "--max-pack-size cannot be used to build a pack for transfer" |
17545 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
17546 | ||
7157c2b5 | 17547 | #: builtin/pack-objects.c:3629 |
c1ac5258 | 17548 | msgid "minimum pack size limit is 1 MiB" |
e640d114 | 17549 | msgstr "最小的包文件大小是 1 MiB" |
c1ac5258 | 17550 | |
7157c2b5 | 17551 | #: builtin/pack-objects.c:3634 |
c1ac5258 JX |
17552 | msgid "--thin cannot be used to build an indexable pack" |
17553 | msgstr "--thin 不能用于创建一个可索引包" | |
17554 | ||
7157c2b5 | 17555 | #: builtin/pack-objects.c:3637 |
c1ac5258 JX |
17556 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" |
17557 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
17558 | ||
7157c2b5 | 17559 | #: builtin/pack-objects.c:3643 |
c1ac5258 | 17560 | msgid "cannot use --filter without --stdout" |
e640d114 | 17561 | msgstr "不能在没有 --stdout 的情况下使用 --filter" |
c1ac5258 | 17562 | |
7157c2b5 | 17563 | #: builtin/pack-objects.c:3703 |
fd8cb379 JX |
17564 | msgid "Enumerating objects" |
17565 | msgstr "枚举对象" | |
17566 | ||
7157c2b5 | 17567 | #: builtin/pack-objects.c:3734 |
c1ac5258 | 17568 | #, c-format |
2b472aae JX |
17569 | msgid "" |
17570 | "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" | |
17571 | "reused %<PRIu32>" | |
17572 | msgstr "" | |
17573 | "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 " | |
17574 | "%<PRIu32>" | |
c1ac5258 | 17575 | |
d46c5519 | 17576 | #: builtin/pack-refs.c:8 |
814ff314 JX |
17577 | msgid "git pack-refs [<options>]" |
17578 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 17579 | |
d46c5519 | 17580 | #: builtin/pack-refs.c:16 |
ef317cd5 | 17581 | msgid "pack everything" |
07432cef | 17582 | msgstr "打包一切" |
c04f5ac3 | 17583 | |
d46c5519 | 17584 | #: builtin/pack-refs.c:17 |
ef317cd5 | 17585 | msgid "prune loose refs (default)" |
07432cef | 17586 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 17587 | |
349ede6a | 17588 | #: builtin/prune-packed.c:6 |
814ff314 JX |
17589 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
17590 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 17591 | |
349ede6a | 17592 | #: builtin/prune.c:14 |
5809aa05 JX |
17593 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
17594 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 17595 | |
349ede6a | 17596 | #: builtin/prune.c:133 |
1b7f4a34 JX |
17597 | msgid "report pruned objects" |
17598 | msgstr "报告清除的对象" | |
17599 | ||
349ede6a | 17600 | #: builtin/prune.c:136 |
1b7f4a34 JX |
17601 | msgid "expire objects older than <time>" |
17602 | msgstr "使早于给定时间的对象过期" | |
17603 | ||
349ede6a | 17604 | #: builtin/prune.c:138 |
31e5e17b JX |
17605 | msgid "limit traversal to objects outside promisor packfiles" |
17606 | msgstr "限制遍历 promisor 包以外的对象" | |
17607 | ||
349ede6a | 17608 | #: builtin/prune.c:152 |
94550ed3 JX |
17609 | msgid "cannot prune in a precious-objects repo" |
17610 | msgstr "不能在珍品仓库中执行清理操作" | |
17611 | ||
2b472aae | 17612 | #: builtin/pull.c:45 builtin/pull.c:47 |
a0b6b246 JX |
17613 | #, c-format |
17614 | msgid "Invalid value for %s: %s" | |
17615 | msgstr "%s 的值无效:%s" | |
17616 | ||
2b472aae | 17617 | #: builtin/pull.c:67 |
94550ed3 | 17618 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
17619 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
17620 | ||
349ede6a | 17621 | #: builtin/pull.c:123 |
a4f16749 JX |
17622 | msgid "control for recursive fetching of submodules" |
17623 | msgstr "控制子模组的递归获取" | |
17624 | ||
349ede6a | 17625 | #: builtin/pull.c:127 |
1b7f4a34 JX |
17626 | msgid "Options related to merging" |
17627 | msgstr "和合并相关的选项" | |
17628 | ||
349ede6a | 17629 | #: builtin/pull.c:130 |
1b7f4a34 JX |
17630 | msgid "incorporate changes by rebasing rather than merging" |
17631 | msgstr "使用变基操作取代合并操作以合入修改" | |
17632 | ||
349ede6a | 17633 | #: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 |
1b7f4a34 JX |
17634 | msgid "allow fast-forward" |
17635 | msgstr "允许快进式" | |
17636 | ||
349ede6a JX |
17637 | #: builtin/pull.c:167 parse-options.h:339 |
17638 | msgid "automatically stash/stash pop before and after" | |
17639 | msgstr "在操作前后执行自动贮藏和弹出贮藏" | |
5b04ee3b | 17640 | |
349ede6a | 17641 | #: builtin/pull.c:183 |
1b7f4a34 JX |
17642 | msgid "Options related to fetching" |
17643 | msgstr "和获取相关的参数" | |
17644 | ||
349ede6a | 17645 | #: builtin/pull.c:193 |
4c27fcb5 JX |
17646 | msgid "force overwrite of local branch" |
17647 | msgstr "强制覆盖本地分支" | |
17648 | ||
349ede6a | 17649 | #: builtin/pull.c:201 |
276ceeaa JX |
17650 | msgid "number of submodules pulled in parallel" |
17651 | msgstr "并发拉取的子模组的数量" | |
17652 | ||
349ede6a | 17653 | #: builtin/pull.c:317 |
1b7f4a34 JX |
17654 | #, c-format |
17655 | msgid "Invalid value for pull.ff: %s" | |
17656 | msgstr "pull.ff 的取值无效:%s" | |
17657 | ||
349ede6a JX |
17658 | #: builtin/pull.c:349 |
17659 | msgid "" | |
17660 | "Pulling without specifying how to reconcile divergent branches is\n" | |
17661 | "discouraged. You can squelch this message by running one of the following\n" | |
17662 | "commands sometime before your next pull:\n" | |
17663 | "\n" | |
17664 | " git config pull.rebase false # merge (the default strategy)\n" | |
17665 | " git config pull.rebase true # rebase\n" | |
17666 | " git config pull.ff only # fast-forward only\n" | |
17667 | "\n" | |
17668 | "You can replace \"git config\" with \"git config --global\" to set a " | |
17669 | "default\n" | |
17670 | "preference for all repositories. You can also pass --rebase, --no-rebase,\n" | |
17671 | "or --ff-only on the command line to override the configured default per\n" | |
17672 | "invocation.\n" | |
17673 | msgstr "" | |
17674 | "不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n" | |
17675 | "pull 操作之前执行下面一条命令来抑制本消息:\n" | |
17676 | "\n" | |
17677 | " git config pull.rebase false # 合并(缺省策略)\n" | |
17678 | " git config pull.rebase true # 变基\n" | |
17679 | " git config pull.ff only # 仅快进\n" | |
17680 | "\n" | |
17681 | "您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n" | |
17682 | "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n" | |
17683 | "或者 --ff-only 参数覆盖缺省设置。\n" | |
17684 | ||
17685 | #: builtin/pull.c:459 | |
1b7f4a34 JX |
17686 | msgid "" |
17687 | "There is no candidate for rebasing against among the refs that you just " | |
17688 | "fetched." | |
17689 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
17690 | ||
349ede6a | 17691 | #: builtin/pull.c:461 |
1b7f4a34 JX |
17692 | msgid "" |
17693 | "There are no candidates for merging among the refs that you just fetched." | |
17694 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
17695 | ||
349ede6a | 17696 | #: builtin/pull.c:462 |
1b7f4a34 JX |
17697 | msgid "" |
17698 | "Generally this means that you provided a wildcard refspec which had no\n" | |
17699 | "matches on the remote end." | |
17700 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
17701 | ||
349ede6a | 17702 | #: builtin/pull.c:465 |
1b7f4a34 JX |
17703 | #, c-format |
17704 | msgid "" | |
17705 | "You asked to pull from the remote '%s', but did not specify\n" | |
17706 | "a branch. Because this is not the default configured remote\n" | |
17707 | "for your current branch, you must specify a branch on the command line." | |
17708 | msgstr "" | |
17709 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
17710 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
17711 | ||
349ede6a | 17712 | #: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 |
1b7f4a34 JX |
17713 | msgid "You are not currently on a branch." |
17714 | msgstr "您当前不在一个分支上。" | |
17715 | ||
349ede6a | 17716 | #: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 |
1b7f4a34 JX |
17717 | msgid "Please specify which branch you want to rebase against." |
17718 | msgstr "请指定您要变基到哪一个分支。" | |
17719 | ||
349ede6a | 17720 | #: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 |
1b7f4a34 JX |
17721 | msgid "Please specify which branch you want to merge with." |
17722 | msgstr "请指定您要合并哪一个分支。" | |
17723 | ||
349ede6a | 17724 | #: builtin/pull.c:475 builtin/pull.c:490 |
1b7f4a34 JX |
17725 | msgid "See git-pull(1) for details." |
17726 | msgstr "详见 git-pull(1)。" | |
17727 | ||
349ede6a JX |
17728 | #: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 |
17729 | #: builtin/rebase.c:1240 git-parse-remote.sh:64 | |
5b04ee3b JX |
17730 | msgid "<remote>" |
17731 | msgstr "<远程>" | |
17732 | ||
349ede6a | 17733 | #: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 |
d46c5519 | 17734 | #: git-parse-remote.sh:65 |
5b04ee3b JX |
17735 | msgid "<branch>" |
17736 | msgstr "<分支>" | |
17737 | ||
349ede6a | 17738 | #: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 |
1b7f4a34 JX |
17739 | msgid "There is no tracking information for the current branch." |
17740 | msgstr "当前分支没有跟踪信息。" | |
17741 | ||
349ede6a | 17742 | #: builtin/pull.c:494 git-parse-remote.sh:95 |
1b7f4a34 | 17743 | msgid "" |
5b04ee3b JX |
17744 | "If you wish to set tracking information for this branch you can do so with:" |
17745 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 17746 | |
349ede6a | 17747 | #: builtin/pull.c:499 |
1b7f4a34 JX |
17748 | #, c-format |
17749 | msgid "" | |
17750 | "Your configuration specifies to merge with the ref '%s'\n" | |
17751 | "from the remote, but no such ref was fetched." | |
17752 | msgstr "" | |
17753 | "您的配置中指定要合并远程的引用 '%s',\n" | |
17754 | "但是没有获取到这个引用。" | |
7ac1c0ad | 17755 | |
349ede6a | 17756 | #: builtin/pull.c:610 |
4c27fcb5 JX |
17757 | #, c-format |
17758 | msgid "unable to access commit %s" | |
17759 | msgstr "无法访问提交 %s" | |
17760 | ||
349ede6a | 17761 | #: builtin/pull.c:895 |
5c57d762 JX |
17762 | msgid "ignoring --verify-signatures for rebase" |
17763 | msgstr "为变基操作忽略 --verify-signatures" | |
17764 | ||
349ede6a | 17765 | #: builtin/pull.c:955 |
1b7f4a34 JX |
17766 | msgid "Updating an unborn branch with changes added to the index." |
17767 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
17768 | ||
349ede6a | 17769 | #: builtin/pull.c:959 |
a0b6b246 JX |
17770 | msgid "pull with rebase" |
17771 | msgstr "变基式拉取" | |
17772 | ||
349ede6a | 17773 | #: builtin/pull.c:960 |
a0b6b246 | 17774 | msgid "please commit or stash them." |
554e8501 | 17775 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 17776 | |
349ede6a | 17777 | #: builtin/pull.c:985 |
1b7f4a34 JX |
17778 | #, c-format |
17779 | msgid "" | |
17780 | "fetch updated the current branch head.\n" | |
17781 | "fast-forwarding your working tree from\n" | |
17782 | "commit %s." | |
17783 | msgstr "" | |
17784 | "fetch 更新了当前的分支。快进您的工作区\n" | |
17785 | "至提交 %s。" | |
ef317cd5 | 17786 | |
349ede6a | 17787 | #: builtin/pull.c:991 |
1b7f4a34 JX |
17788 | #, c-format |
17789 | msgid "" | |
17790 | "Cannot fast-forward your working tree.\n" | |
17791 | "After making sure that you saved anything precious from\n" | |
17792 | "$ git diff %s\n" | |
17793 | "output, run\n" | |
17794 | "$ git reset --hard\n" | |
17795 | "to recover." | |
17796 | msgstr "" | |
17797 | "您当前的工作区无法执行快进操作。\n" | |
17798 | "首先执行如下命令:\n" | |
17799 | "$ git diff %s\n" | |
17800 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
17801 | "$ git reset --hard\n" | |
17802 | "恢复之前的状态。" | |
17803 | ||
349ede6a | 17804 | #: builtin/pull.c:1006 |
1b7f4a34 JX |
17805 | msgid "Cannot merge multiple branches into empty head." |
17806 | msgstr "无法将多个分支合并到空分支。" | |
17807 | ||
349ede6a | 17808 | #: builtin/pull.c:1010 |
1b7f4a34 JX |
17809 | msgid "Cannot rebase onto multiple branches." |
17810 | msgstr "无法变基到多个分支。" | |
17811 | ||
349ede6a | 17812 | #: builtin/pull.c:1018 |
a4f16749 JX |
17813 | msgid "cannot rebase with locally recorded submodule modifications" |
17814 | msgstr "本地子模组中有修改,无法变基" | |
17815 | ||
fd8cb379 | 17816 | #: builtin/push.c:19 |
ef317cd5 | 17817 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 17818 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 17819 | |
ddc12c42 | 17820 | #: builtin/push.c:112 |
c04f5ac3 | 17821 | msgid "tag shorthand without <tag>" |
55a16ee4 | 17822 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 17823 | |
ddc12c42 | 17824 | #: builtin/push.c:122 |
c04f5ac3 | 17825 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 17826 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 17827 | |
ddc12c42 | 17828 | #: builtin/push.c:168 |
8ada9598 JX |
17829 | msgid "" |
17830 | "\n" | |
17831 | "To choose either option permanently, see push.default in 'git help config'." | |
17832 | msgstr "" | |
81809b99 JX |
17833 | "\n" |
17834 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 17835 | |
ddc12c42 | 17836 | #: builtin/push.c:171 |
8ada9598 JX |
17837 | #, c-format |
17838 | msgid "" | |
17839 | "The upstream branch of your current branch does not match\n" | |
17840 | "the name of your current branch. To push to the upstream branch\n" | |
17841 | "on the remote, use\n" | |
17842 | "\n" | |
17843 | " git push %s HEAD:%s\n" | |
17844 | "\n" | |
17845 | "To push to the branch of the same name on the remote, use\n" | |
17846 | "\n" | |
4c27fcb5 | 17847 | " git push %s HEAD\n" |
8ada9598 JX |
17848 | "%s" |
17849 | msgstr "" | |
4c27fcb5 JX |
17850 | "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n" |
17851 | "使用\n" | |
81809b99 JX |
17852 | "\n" |
17853 | " git push %s HEAD:%s\n" | |
17854 | "\n" | |
17855 | "为推送至远程同名分支,使用\n" | |
17856 | "\n" | |
4c27fcb5 | 17857 | " git push %s HEAD\n" |
81809b99 | 17858 | "%s" |
8ada9598 | 17859 | |
ddc12c42 | 17860 | #: builtin/push.c:186 |
c04f5ac3 JX |
17861 | #, c-format |
17862 | msgid "" | |
17863 | "You are not currently on a branch.\n" | |
17864 | "To push the history leading to the current (detached HEAD)\n" | |
17865 | "state now, use\n" | |
17866 | "\n" | |
17867 | " git push %s HEAD:<name-of-remote-branch>\n" | |
17868 | msgstr "" | |
17869 | "您当前不在一个分支上。\n" | |
90e6ef53 | 17870 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 17871 | "\n" |
d9d56b23 | 17872 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 17873 | |
ddc12c42 | 17874 | #: builtin/push.c:200 |
c04f5ac3 JX |
17875 | #, c-format |
17876 | msgid "" | |
17877 | "The current branch %s has no upstream branch.\n" | |
17878 | "To push the current branch and set the remote as upstream, use\n" | |
17879 | "\n" | |
17880 | " git push --set-upstream %s %s\n" | |
17881 | msgstr "" | |
17882 | "当前分支 %s 没有对应的上游分支。\n" | |
17883 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
17884 | "\n" | |
17885 | " git push --set-upstream %s %s\n" | |
17886 | ||
ddc12c42 | 17887 | #: builtin/push.c:208 |
c04f5ac3 JX |
17888 | #, c-format |
17889 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
17890 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
17891 | ||
ddc12c42 | 17892 | #: builtin/push.c:211 |
73a60cd2 JX |
17893 | #, c-format |
17894 | msgid "" | |
17895 | "You are pushing to remote '%s', which is not the upstream of\n" | |
17896 | "your current branch '%s', without telling me what to push\n" | |
17897 | "to update which remote branch." | |
17898 | msgstr "" | |
17899 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
17900 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
17901 | ||
ddc12c42 | 17902 | #: builtin/push.c:270 |
c04f5ac3 JX |
17903 | msgid "" |
17904 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
160fb2b2 | 17905 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" |
c04f5ac3 | 17906 | |
ddc12c42 | 17907 | #: builtin/push.c:277 |
170e9899 JX |
17908 | msgid "" |
17909 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
17910 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
17911 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
17912 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
17913 | msgstr "" | |
eff6d3a9 | 17914 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 17915 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 17916 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 17917 | |
ddc12c42 | 17918 | #: builtin/push.c:283 |
170e9899 JX |
17919 | msgid "" |
17920 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
17921 | "counterpart. Check out this branch and integrate the remote changes\n" |
17922 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
17923 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
17924 | msgstr "" | |
eff6d3a9 | 17925 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 17926 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 17927 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 17928 | |
ddc12c42 | 17929 | #: builtin/push.c:289 |
07432cef | 17930 | msgid "" |
a77c07d9 JX |
17931 | "Updates were rejected because the remote contains work that you do\n" |
17932 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
17933 | "to the same ref. You may want to first integrate the remote changes\n" |
17934 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
17935 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
17936 | msgstr "" | |
160fb2b2 JX |
17937 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
17938 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 17939 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
17940 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
17941 | ||
ddc12c42 | 17942 | #: builtin/push.c:296 |
a77c07d9 | 17943 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 17944 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 17945 | |
ddc12c42 | 17946 | #: builtin/push.c:299 |
a77c07d9 JX |
17947 | msgid "" |
17948 | "You cannot update a remote ref that points at a non-commit object,\n" | |
17949 | "or update a remote ref to make it point at a non-commit object,\n" | |
17950 | "without using the '--force' option.\n" | |
17951 | msgstr "" | |
17952 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
17953 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 17954 | |
349ede6a | 17955 | #: builtin/push.c:361 |
c04f5ac3 JX |
17956 | #, c-format |
17957 | msgid "Pushing to %s\n" | |
17958 | msgstr "推送到 %s\n" | |
17959 | ||
349ede6a | 17960 | #: builtin/push.c:368 |
c04f5ac3 JX |
17961 | #, c-format |
17962 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 17963 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 17964 | |
ddc12c42 | 17965 | #: builtin/push.c:542 |
ef317cd5 | 17966 | msgid "repository" |
160fb2b2 | 17967 | msgstr "仓库" |
ef317cd5 | 17968 | |
ddc12c42 | 17969 | #: builtin/push.c:543 builtin/send-pack.c:164 |
ef317cd5 | 17970 | msgid "push all refs" |
07432cef | 17971 | msgstr "推送所有引用" |
ef317cd5 | 17972 | |
ddc12c42 | 17973 | #: builtin/push.c:544 builtin/send-pack.c:166 |
ef317cd5 | 17974 | msgid "mirror all refs" |
07432cef | 17975 | msgstr "镜像所有引用" |
ef317cd5 | 17976 | |
ddc12c42 | 17977 | #: builtin/push.c:546 |
ef317cd5 | 17978 | msgid "delete refs" |
07432cef | 17979 | msgstr "删除引用" |
ef317cd5 | 17980 | |
ddc12c42 | 17981 | #: builtin/push.c:547 |
ef317cd5 | 17982 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 17983 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 17984 | |
ddc12c42 | 17985 | #: builtin/push.c:550 builtin/send-pack.c:167 |
ef317cd5 JX |
17986 | msgid "force updates" |
17987 | msgstr "强制更新" | |
17988 | ||
349ede6a | 17989 | #: builtin/push.c:551 builtin/send-pack.c:179 |
c1ac5258 JX |
17990 | msgid "<refname>:<expect>" |
17991 | msgstr "<引用名>:<期望值>" | |
90314792 | 17992 | |
349ede6a | 17993 | #: builtin/push.c:552 builtin/send-pack.c:180 |
90314792 JX |
17994 | msgid "require old value of ref to be at this value" |
17995 | msgstr "要求引用旧的取值为设定值" | |
17996 | ||
349ede6a | 17997 | #: builtin/push.c:555 |
ef317cd5 | 17998 | msgid "control recursive pushing of submodules" |
07432cef | 17999 | msgstr "控制子模组的递归推送" |
ef317cd5 | 18000 | |
349ede6a | 18001 | #: builtin/push.c:556 builtin/send-pack.c:174 |
ef317cd5 | 18002 | msgid "use thin pack" |
07432cef | 18003 | msgstr "使用精简打包" |
ef317cd5 | 18004 | |
349ede6a | 18005 | #: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 |
fd8cb379 | 18006 | #: builtin/send-pack.c:162 |
ef317cd5 | 18007 | msgid "receive pack program" |
07432cef | 18008 | msgstr "接收包程序" |
ef317cd5 | 18009 | |
349ede6a | 18010 | #: builtin/push.c:559 |
ef317cd5 | 18011 | msgid "set upstream for git pull/status" |
07432cef | 18012 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 18013 | |
349ede6a | 18014 | #: builtin/push.c:562 |
ef317cd5 | 18015 | msgid "prune locally removed refs" |
07432cef | 18016 | msgstr "清除本地删除的引用" |
ef317cd5 | 18017 | |
349ede6a | 18018 | #: builtin/push.c:564 |
a77c07d9 JX |
18019 | msgid "bypass pre-push hook" |
18020 | msgstr "绕过 pre-push 钩子" | |
18021 | ||
349ede6a | 18022 | #: builtin/push.c:565 |
1003b3a5 | 18023 | msgid "push missing but relevant tags" |
55a16ee4 | 18024 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 18025 | |
349ede6a | 18026 | #: builtin/push.c:567 builtin/send-pack.c:168 |
220c313c JX |
18027 | msgid "GPG sign the push" |
18028 | msgstr "用 GPG 为推送签名" | |
18029 | ||
349ede6a | 18030 | #: builtin/push.c:569 builtin/send-pack.c:175 |
814ff314 JX |
18031 | msgid "request atomic transaction on remote side" |
18032 | msgstr "需要远端支持原子事务" | |
18033 | ||
349ede6a | 18034 | #: builtin/push.c:587 |
c04f5ac3 JX |
18035 | msgid "--delete is incompatible with --all, --mirror and --tags" |
18036 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
18037 | ||
349ede6a | 18038 | #: builtin/push.c:589 |
c04f5ac3 JX |
18039 | msgid "--delete doesn't make sense without any refs" |
18040 | msgstr "--delete 未接任何引用没有意义" | |
18041 | ||
349ede6a | 18042 | #: builtin/push.c:609 |
a5cd71ca JX |
18043 | #, c-format |
18044 | msgid "bad repository '%s'" | |
18045 | msgstr "坏的仓库 '%s'" | |
18046 | ||
349ede6a | 18047 | #: builtin/push.c:610 |
a5cd71ca JX |
18048 | msgid "" |
18049 | "No configured push destination.\n" | |
18050 | "Either specify the URL from the command-line or configure a remote " | |
18051 | "repository using\n" | |
18052 | "\n" | |
18053 | " git remote add <name> <url>\n" | |
18054 | "\n" | |
18055 | "and then push using the remote name\n" | |
18056 | "\n" | |
18057 | " git push <name>\n" | |
18058 | msgstr "" | |
18059 | "没有配置推送目标。\n" | |
18060 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" | |
18061 | "\n" | |
18062 | " git remote add <名称> <地址>\n" | |
18063 | "\n" | |
18064 | "然后使用该远程仓库名执行推送\n" | |
18065 | "\n" | |
18066 | " git push <名称>\n" | |
18067 | ||
349ede6a | 18068 | #: builtin/push.c:625 |
fd8cb379 JX |
18069 | msgid "--all and --tags are incompatible" |
18070 | msgstr "--all 和 --tags 不兼容" | |
18071 | ||
349ede6a | 18072 | #: builtin/push.c:627 |
fd8cb379 JX |
18073 | msgid "--all can't be combined with refspecs" |
18074 | msgstr "--all 不能和引用规格同时使用" | |
18075 | ||
349ede6a | 18076 | #: builtin/push.c:631 |
fd8cb379 JX |
18077 | msgid "--mirror and --tags are incompatible" |
18078 | msgstr "--mirror 和 --tags 不兼容" | |
18079 | ||
349ede6a | 18080 | #: builtin/push.c:633 |
fd8cb379 JX |
18081 | msgid "--mirror can't be combined with refspecs" |
18082 | msgstr "--mirror 不能和引用规格同时使用" | |
18083 | ||
349ede6a | 18084 | #: builtin/push.c:636 |
fd8cb379 JX |
18085 | msgid "--all and --mirror are incompatible" |
18086 | msgstr "--all 和 --mirror 不兼容" | |
18087 | ||
349ede6a | 18088 | #: builtin/push.c:640 |
5c57d762 JX |
18089 | msgid "push options must not have new line characters" |
18090 | msgstr "推送选项不能有换行符" | |
18091 | ||
c1ac5258 JX |
18092 | #: builtin/range-diff.c:8 |
18093 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
18094 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
18095 | ||
18096 | #: builtin/range-diff.c:9 | |
18097 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" | |
18098 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
18099 | ||
18100 | #: builtin/range-diff.c:10 | |
18101 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" | |
18102 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
18103 | ||
ddc12c42 | 18104 | #: builtin/range-diff.c:22 |
c1ac5258 JX |
18105 | msgid "Percentage by which creation is weighted" |
18106 | msgstr "创建权重的百分比" | |
18107 | ||
ddc12c42 | 18108 | #: builtin/range-diff.c:24 |
c1ac5258 JX |
18109 | msgid "use simple diff colors" |
18110 | msgstr "使用简单差异颜色" | |
18111 | ||
ddc12c42 JX |
18112 | #: builtin/range-diff.c:26 |
18113 | msgid "notes" | |
18114 | msgstr "注解" | |
18115 | ||
18116 | #: builtin/range-diff.c:26 | |
18117 | msgid "passed to 'git log'" | |
18118 | msgstr "传递给 'git log'" | |
18119 | ||
18120 | #: builtin/range-diff.c:50 builtin/range-diff.c:54 | |
c1ac5258 JX |
18121 | #, c-format |
18122 | msgid "no .. in range: '%s'" | |
18123 | msgstr "没有在范围中使用 ..:'%s'" | |
18124 | ||
ddc12c42 | 18125 | #: builtin/range-diff.c:64 |
c1ac5258 JX |
18126 | msgid "single arg format must be symmetric range" |
18127 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
18128 | ||
ddc12c42 | 18129 | #: builtin/range-diff.c:79 |
c1ac5258 JX |
18130 | msgid "need two commit ranges" |
18131 | msgstr "需要两个提交范围" | |
18132 | ||
06991777 | 18133 | #: builtin/read-tree.c:41 |
ef317cd5 | 18134 | msgid "" |
1b7f4a34 | 18135 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
18136 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
18137 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
18138 | msgstr "" | |
1b7f4a34 | 18139 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 18140 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 18141 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 18142 | |
06991777 | 18143 | #: builtin/read-tree.c:124 |
ef317cd5 | 18144 | msgid "write resulting index to <file>" |
d9d56b23 | 18145 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 18146 | |
06991777 | 18147 | #: builtin/read-tree.c:127 |
ef317cd5 | 18148 | msgid "only empty the index" |
07432cef | 18149 | msgstr "只是清空索引" |
ef317cd5 | 18150 | |
06991777 | 18151 | #: builtin/read-tree.c:129 |
ef317cd5 | 18152 | msgid "Merging" |
07432cef | 18153 | msgstr "合并" |
ef317cd5 | 18154 | |
06991777 | 18155 | #: builtin/read-tree.c:131 |
ef317cd5 | 18156 | msgid "perform a merge in addition to a read" |
07432cef | 18157 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 18158 | |
06991777 | 18159 | #: builtin/read-tree.c:133 |
ef317cd5 | 18160 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 18161 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 18162 | |
06991777 | 18163 | #: builtin/read-tree.c:135 |
ef317cd5 | 18164 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 18165 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 18166 | |
06991777 | 18167 | #: builtin/read-tree.c:137 |
ef317cd5 | 18168 | msgid "same as -m, but discard unmerged entries" |
07432cef | 18169 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 18170 | |
06991777 | 18171 | #: builtin/read-tree.c:138 |
ef317cd5 | 18172 | msgid "<subdirectory>/" |
07432cef | 18173 | msgstr "<子目录>/" |
ef317cd5 | 18174 | |
06991777 | 18175 | #: builtin/read-tree.c:139 |
ef317cd5 | 18176 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 18177 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 18178 | |
06991777 | 18179 | #: builtin/read-tree.c:142 |
ef317cd5 | 18180 | msgid "update working tree with merge result" |
07432cef | 18181 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 18182 | |
06991777 | 18183 | #: builtin/read-tree.c:144 |
ef317cd5 | 18184 | msgid "gitignore" |
07432cef | 18185 | msgstr "gitignore" |
ef317cd5 | 18186 | |
06991777 | 18187 | #: builtin/read-tree.c:145 |
ef317cd5 | 18188 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 18189 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 18190 | |
06991777 | 18191 | #: builtin/read-tree.c:148 |
ef317cd5 | 18192 | msgid "don't check the working tree after merging" |
07432cef | 18193 | msgstr "合并后不检查工作区" |
ef317cd5 | 18194 | |
06991777 | 18195 | #: builtin/read-tree.c:149 |
ef317cd5 | 18196 | msgid "don't update the index or the work tree" |
07432cef | 18197 | msgstr "不更新索引区和工作区" |
ef317cd5 | 18198 | |
06991777 | 18199 | #: builtin/read-tree.c:151 |
ef317cd5 | 18200 | msgid "skip applying sparse checkout filter" |
07432cef | 18201 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 18202 | |
06991777 | 18203 | #: builtin/read-tree.c:153 |
ef317cd5 | 18204 | msgid "debug unpack-trees" |
07432cef | 18205 | msgstr "调试 unpack-trees" |
ef317cd5 | 18206 | |
d46c5519 JX |
18207 | #: builtin/read-tree.c:157 |
18208 | msgid "suppress feedback messages" | |
18209 | msgstr "抑制反馈信息" | |
18210 | ||
ddc12c42 JX |
18211 | #: builtin/read-tree.c:188 |
18212 | msgid "You need to resolve your current index first" | |
18213 | msgstr "您需要先解决当前索引的冲突" | |
18214 | ||
349ede6a | 18215 | #: builtin/rebase.c:35 |
4c27fcb5 | 18216 | msgid "" |
a5cd71ca JX |
18217 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " |
18218 | "[<upstream> [<branch>]]" | |
ddc12c42 JX |
18219 | msgstr "" |
18220 | "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<" | |
18221 | "上游> [<分支>]]" | |
4c27fcb5 | 18222 | |
349ede6a | 18223 | #: builtin/rebase.c:37 |
4c27fcb5 JX |
18224 | msgid "" |
18225 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" | |
18226 | msgstr "" | |
18227 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" | |
18228 | ||
349ede6a | 18229 | #: builtin/rebase.c:39 |
4c27fcb5 JX |
18230 | msgid "git rebase --continue | --abort | --skip | --edit-todo" |
18231 | msgstr "git rebase --continue | --abort | --skip | --edit-todo" | |
18232 | ||
349ede6a | 18233 | #: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 |
d46c5519 JX |
18234 | #, c-format |
18235 | msgid "unusable todo list: '%s'" | |
18236 | msgstr "不可用的待办列表:'%s'" | |
18237 | ||
349ede6a | 18238 | #: builtin/rebase.c:298 |
d46c5519 JX |
18239 | #, c-format |
18240 | msgid "could not create temporary %s" | |
18241 | msgstr "无法创建临时的 %s" | |
18242 | ||
349ede6a | 18243 | #: builtin/rebase.c:304 |
d46c5519 JX |
18244 | msgid "could not mark as interactive" |
18245 | msgstr "无法标记为交互式" | |
18246 | ||
349ede6a | 18247 | #: builtin/rebase.c:358 |
d46c5519 JX |
18248 | msgid "could not generate todo list" |
18249 | msgstr "无法生成待办列表" | |
18250 | ||
349ede6a | 18251 | #: builtin/rebase.c:399 |
d46c5519 JX |
18252 | msgid "a base commit must be provided with --upstream or --onto" |
18253 | msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" | |
18254 | ||
349ede6a | 18255 | #: builtin/rebase.c:468 |
d46c5519 JX |
18256 | msgid "git rebase--interactive [<options>]" |
18257 | msgstr "git rebase--interactive [<选项>]" | |
18258 | ||
349ede6a JX |
18259 | #: builtin/rebase.c:481 builtin/rebase.c:1374 |
18260 | msgid "keep commits which start empty" | |
18261 | msgstr "保留初始为空的提交" | |
d46c5519 | 18262 | |
349ede6a | 18263 | #: builtin/rebase.c:485 builtin/revert.c:128 |
d46c5519 JX |
18264 | msgid "allow commits with empty messages" |
18265 | msgstr "允许提交说明为空" | |
18266 | ||
349ede6a | 18267 | #: builtin/rebase.c:487 |
d46c5519 JX |
18268 | msgid "rebase merge commits" |
18269 | msgstr "对合并提交变基" | |
18270 | ||
349ede6a | 18271 | #: builtin/rebase.c:489 |
d46c5519 JX |
18272 | msgid "keep original branch points of cousins" |
18273 | msgstr "保持兄弟提交的原始分支点" | |
18274 | ||
349ede6a | 18275 | #: builtin/rebase.c:491 |
d46c5519 JX |
18276 | msgid "move commits that begin with squash!/fixup!" |
18277 | msgstr "移动以 squash!/fixup! 开头的提交" | |
18278 | ||
349ede6a | 18279 | #: builtin/rebase.c:492 |
d46c5519 JX |
18280 | msgid "sign commits" |
18281 | msgstr "签名提交" | |
18282 | ||
349ede6a | 18283 | #: builtin/rebase.c:494 builtin/rebase.c:1314 |
d46c5519 | 18284 | msgid "display a diffstat of what changed upstream" |
5b533632 | 18285 | msgstr "显示上游变化的差异统计" |
d46c5519 | 18286 | |
349ede6a | 18287 | #: builtin/rebase.c:496 |
d46c5519 JX |
18288 | msgid "continue rebase" |
18289 | msgstr "继续变基" | |
18290 | ||
349ede6a | 18291 | #: builtin/rebase.c:498 |
d46c5519 JX |
18292 | msgid "skip commit" |
18293 | msgstr "跳过提交" | |
18294 | ||
349ede6a | 18295 | #: builtin/rebase.c:499 |
d46c5519 JX |
18296 | msgid "edit the todo list" |
18297 | msgstr "变基待办列表" | |
18298 | ||
349ede6a | 18299 | #: builtin/rebase.c:501 |
d46c5519 JX |
18300 | msgid "show the current patch" |
18301 | msgstr "显示当前补丁" | |
18302 | ||
349ede6a | 18303 | #: builtin/rebase.c:504 |
d46c5519 JX |
18304 | msgid "shorten commit ids in the todo list" |
18305 | msgstr "缩短待办列表中的提交号" | |
18306 | ||
349ede6a | 18307 | #: builtin/rebase.c:506 |
d46c5519 JX |
18308 | msgid "expand commit ids in the todo list" |
18309 | msgstr "扩展待办列表中的提交号" | |
18310 | ||
349ede6a | 18311 | #: builtin/rebase.c:508 |
d46c5519 JX |
18312 | msgid "check the todo list" |
18313 | msgstr "检查待办列表" | |
18314 | ||
349ede6a | 18315 | #: builtin/rebase.c:510 |
d46c5519 JX |
18316 | msgid "rearrange fixup/squash lines" |
18317 | msgstr "重新排列 fixup/squash 行" | |
18318 | ||
349ede6a | 18319 | #: builtin/rebase.c:512 |
d46c5519 JX |
18320 | msgid "insert exec commands in todo list" |
18321 | msgstr "在待办列表中插入 exec 执行命令" | |
18322 | ||
349ede6a | 18323 | #: builtin/rebase.c:513 |
d46c5519 JX |
18324 | msgid "onto" |
18325 | msgstr "onto" | |
18326 | ||
349ede6a | 18327 | #: builtin/rebase.c:516 |
d46c5519 JX |
18328 | msgid "restrict-revision" |
18329 | msgstr "restrict-revision" | |
18330 | ||
349ede6a | 18331 | #: builtin/rebase.c:516 |
d46c5519 JX |
18332 | msgid "restrict revision" |
18333 | msgstr "限制版本" | |
18334 | ||
349ede6a | 18335 | #: builtin/rebase.c:518 |
d46c5519 JX |
18336 | msgid "squash-onto" |
18337 | msgstr "squash-onto" | |
18338 | ||
349ede6a | 18339 | #: builtin/rebase.c:519 |
d46c5519 JX |
18340 | msgid "squash onto" |
18341 | msgstr "squash onto" | |
18342 | ||
349ede6a | 18343 | #: builtin/rebase.c:521 |
d46c5519 JX |
18344 | msgid "the upstream commit" |
18345 | msgstr "上游提交" | |
18346 | ||
349ede6a | 18347 | #: builtin/rebase.c:523 |
d46c5519 JX |
18348 | msgid "head-name" |
18349 | msgstr "head-name" | |
18350 | ||
349ede6a | 18351 | #: builtin/rebase.c:523 |
d46c5519 JX |
18352 | msgid "head name" |
18353 | msgstr "head 名称" | |
18354 | ||
349ede6a | 18355 | #: builtin/rebase.c:528 |
d46c5519 JX |
18356 | msgid "rebase strategy" |
18357 | msgstr "变基策略" | |
18358 | ||
349ede6a | 18359 | #: builtin/rebase.c:529 |
d46c5519 JX |
18360 | msgid "strategy-opts" |
18361 | msgstr "strategy-opts" | |
18362 | ||
349ede6a | 18363 | #: builtin/rebase.c:530 |
d46c5519 JX |
18364 | msgid "strategy options" |
18365 | msgstr "策略选项" | |
18366 | ||
349ede6a | 18367 | #: builtin/rebase.c:531 |
d46c5519 JX |
18368 | msgid "switch-to" |
18369 | msgstr "切换到" | |
18370 | ||
349ede6a | 18371 | #: builtin/rebase.c:532 |
d46c5519 JX |
18372 | msgid "the branch or commit to checkout" |
18373 | msgstr "要检出的分支或提交" | |
18374 | ||
349ede6a | 18375 | #: builtin/rebase.c:533 |
d46c5519 JX |
18376 | msgid "onto-name" |
18377 | msgstr "onto-name" | |
18378 | ||
349ede6a | 18379 | #: builtin/rebase.c:533 |
d46c5519 JX |
18380 | msgid "onto name" |
18381 | msgstr "onto name" | |
18382 | ||
349ede6a | 18383 | #: builtin/rebase.c:534 |
d46c5519 JX |
18384 | msgid "cmd" |
18385 | msgstr "cmd" | |
18386 | ||
349ede6a | 18387 | #: builtin/rebase.c:534 |
d46c5519 JX |
18388 | msgid "the command to run" |
18389 | msgstr "要执行的命令" | |
18390 | ||
349ede6a | 18391 | #: builtin/rebase.c:537 builtin/rebase.c:1407 |
d46c5519 JX |
18392 | msgid "automatically re-schedule any `exec` that fails" |
18393 | msgstr "自动重新安排任何失败的 `exec`" | |
18394 | ||
349ede6a | 18395 | #: builtin/rebase.c:553 |
d46c5519 JX |
18396 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" |
18397 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
18398 | ||
349ede6a | 18399 | #: builtin/rebase.c:569 |
4c27fcb5 | 18400 | #, c-format |
349ede6a JX |
18401 | msgid "%s requires the merge backend" |
18402 | msgstr "%s 需要合并后端" | |
4c27fcb5 | 18403 | |
2b472aae | 18404 | #: builtin/rebase.c:612 |
4c27fcb5 JX |
18405 | #, c-format |
18406 | msgid "could not get 'onto': '%s'" | |
18407 | msgstr "无法获取 'onto':'%s'" | |
18408 | ||
349ede6a | 18409 | #: builtin/rebase.c:629 |
4c27fcb5 JX |
18410 | #, c-format |
18411 | msgid "invalid orig-head: '%s'" | |
18412 | msgstr "无效的原始 head:'%s'" | |
18413 | ||
349ede6a | 18414 | #: builtin/rebase.c:654 |
4c27fcb5 JX |
18415 | #, c-format |
18416 | msgid "ignoring invalid allow_rerere_autoupdate: '%s'" | |
18417 | msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" | |
18418 | ||
349ede6a | 18419 | #: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 |
4c27fcb5 JX |
18420 | msgid "" |
18421 | "Resolve all conflicts manually, mark them as resolved with\n" | |
18422 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
18423 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
18424 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
18425 | "abort\"." | |
18426 | msgstr "" | |
18427 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" | |
18428 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" | |
18429 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
18430 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
18431 | ||
349ede6a | 18432 | #: builtin/rebase.c:882 |
06991777 JX |
18433 | #, c-format |
18434 | msgid "" | |
18435 | "\n" | |
18436 | "git encountered an error while preparing the patches to replay\n" | |
18437 | "these revisions:\n" | |
18438 | "\n" | |
18439 | " %s\n" | |
18440 | "\n" | |
18441 | "As a result, git cannot rebase them." | |
18442 | msgstr "" | |
18443 | "\n" | |
18444 | "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n" | |
18445 | "\n" | |
18446 | " %s\n" | |
18447 | "\n" | |
18448 | "因此 git 无法对其变基。" | |
4c27fcb5 | 18449 | |
349ede6a | 18450 | #: builtin/rebase.c:1208 |
2b472aae JX |
18451 | #, c-format |
18452 | msgid "" | |
18453 | "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" | |
18454 | "\"." | |
440e7442 | 18455 | msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。" |
2b472aae | 18456 | |
349ede6a | 18457 | #: builtin/rebase.c:1226 |
4c27fcb5 JX |
18458 | #, c-format |
18459 | msgid "" | |
18460 | "%s\n" | |
18461 | "Please specify which branch you want to rebase against.\n" | |
18462 | "See git-rebase(1) for details.\n" | |
18463 | "\n" | |
18464 | " git rebase '<branch>'\n" | |
18465 | "\n" | |
18466 | msgstr "" | |
18467 | "%s\n" | |
18468 | "请指定您要变基到哪个分支。\n" | |
18469 | "详见 git-rebase(1)。\n" | |
18470 | "\n" | |
18471 | " git rebase '<branch>'\n" | |
18472 | "\n" | |
18473 | ||
349ede6a | 18474 | #: builtin/rebase.c:1242 |
4c27fcb5 JX |
18475 | #, c-format |
18476 | msgid "" | |
18477 | "If you wish to set tracking information for this branch you can do so with:\n" | |
18478 | "\n" | |
18479 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
18480 | "\n" | |
18481 | msgstr "" | |
18482 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
18483 | "\n" | |
18484 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
18485 | "\n" | |
18486 | ||
349ede6a | 18487 | #: builtin/rebase.c:1272 |
06991777 JX |
18488 | msgid "exec commands cannot contain newlines" |
18489 | msgstr "exec 命令不能包含换行符" | |
18490 | ||
349ede6a | 18491 | #: builtin/rebase.c:1276 |
06991777 JX |
18492 | msgid "empty exec command" |
18493 | msgstr "空的 exec 命令" | |
18494 | ||
349ede6a | 18495 | #: builtin/rebase.c:1305 |
4c27fcb5 JX |
18496 | msgid "rebase onto given branch instead of upstream" |
18497 | msgstr "变基到给定的分支而非上游" | |
18498 | ||
349ede6a | 18499 | #: builtin/rebase.c:1307 |
a5cd71ca JX |
18500 | msgid "use the merge-base of upstream and branch as the current base" |
18501 | msgstr "使用上游和分支的合并基线做为当前基线" | |
18502 | ||
349ede6a | 18503 | #: builtin/rebase.c:1309 |
4c27fcb5 JX |
18504 | msgid "allow pre-rebase hook to run" |
18505 | msgstr "允许执行 pre-rebase 钩子" | |
18506 | ||
349ede6a | 18507 | #: builtin/rebase.c:1311 |
4c27fcb5 JX |
18508 | msgid "be quiet. implies --no-stat" |
18509 | msgstr "安静。暗示 --no-stat" | |
18510 | ||
349ede6a | 18511 | #: builtin/rebase.c:1317 |
4c27fcb5 | 18512 | msgid "do not show diffstat of what changed upstream" |
5b533632 | 18513 | msgstr "不显示上游变化的差异统计" |
4c27fcb5 | 18514 | |
349ede6a | 18515 | #: builtin/rebase.c:1320 |
4c27fcb5 JX |
18516 | msgid "add a Signed-off-by: line to each commit" |
18517 | msgstr "为每一个提交添加一个 Signed-off-by: 签名" | |
18518 | ||
349ede6a | 18519 | #: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 |
2b472aae JX |
18520 | msgid "passed to 'git am'" |
18521 | msgstr "传递给 'git am" | |
4c27fcb5 | 18522 | |
349ede6a | 18523 | #: builtin/rebase.c:1330 builtin/rebase.c:1332 |
4c27fcb5 JX |
18524 | msgid "passed to 'git apply'" |
18525 | msgstr "传递给 'git apply'" | |
18526 | ||
349ede6a | 18527 | #: builtin/rebase.c:1334 builtin/rebase.c:1337 |
4c27fcb5 JX |
18528 | msgid "cherry-pick all commits, even if unchanged" |
18529 | msgstr "拣选所有提交,即使未修改" | |
18530 | ||
349ede6a | 18531 | #: builtin/rebase.c:1339 |
4c27fcb5 JX |
18532 | msgid "continue" |
18533 | msgstr "继续" | |
18534 | ||
349ede6a | 18535 | #: builtin/rebase.c:1342 |
4c27fcb5 JX |
18536 | msgid "skip current patch and continue" |
18537 | msgstr "跳过当前补丁并继续" | |
18538 | ||
18539 | # 译者:注意保持前导空格 | |
349ede6a | 18540 | #: builtin/rebase.c:1344 |
4c27fcb5 JX |
18541 | msgid "abort and check out the original branch" |
18542 | msgstr "终止并检出原有分支" | |
18543 | ||
349ede6a | 18544 | #: builtin/rebase.c:1347 |
4c27fcb5 JX |
18545 | msgid "abort but keep HEAD where it is" |
18546 | msgstr "终止但保持 HEAD 不变" | |
18547 | ||
349ede6a | 18548 | #: builtin/rebase.c:1348 |
4c27fcb5 JX |
18549 | msgid "edit the todo list during an interactive rebase" |
18550 | msgstr "在交互式变基中编辑待办列表" | |
18551 | ||
349ede6a | 18552 | #: builtin/rebase.c:1351 |
4c27fcb5 JX |
18553 | msgid "show the patch file being applied or merged" |
18554 | msgstr "显示正在应用或合并的补丁文件" | |
18555 | ||
349ede6a | 18556 | #: builtin/rebase.c:1354 |
2b472aae JX |
18557 | msgid "use apply strategies to rebase" |
18558 | msgstr "使用应用策略进行变基" | |
18559 | ||
349ede6a | 18560 | #: builtin/rebase.c:1358 |
4c27fcb5 JX |
18561 | msgid "use merging strategies to rebase" |
18562 | msgstr "使用合并策略进行变基" | |
18563 | ||
349ede6a | 18564 | #: builtin/rebase.c:1362 |
4c27fcb5 JX |
18565 | msgid "let the user edit the list of commits to rebase" |
18566 | msgstr "让用户编辑要变基的提交列表" | |
18567 | ||
349ede6a | 18568 | #: builtin/rebase.c:1366 |
d46c5519 JX |
18569 | msgid "(DEPRECATED) try to recreate merges instead of ignoring them" |
18570 | msgstr "(已弃用)尝试重建合并提交而非忽略它们" | |
4c27fcb5 | 18571 | |
349ede6a | 18572 | #: builtin/rebase.c:1371 |
2b472aae | 18573 | msgid "how to handle commits that become empty" |
440e7442 | 18574 | msgstr "如何处理成为空提交的提交" |
4c27fcb5 | 18575 | |
349ede6a | 18576 | #: builtin/rebase.c:1378 |
4c27fcb5 JX |
18577 | msgid "move commits that begin with squash!/fixup! under -i" |
18578 | msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" | |
18579 | ||
349ede6a | 18580 | #: builtin/rebase.c:1385 |
4c27fcb5 JX |
18581 | msgid "add exec lines after each commit of the editable list" |
18582 | msgstr "可编辑列表的每一个提交下面增加一行 exec" | |
18583 | ||
349ede6a | 18584 | #: builtin/rebase.c:1389 |
4c27fcb5 JX |
18585 | msgid "allow rebasing commits with empty messages" |
18586 | msgstr "允许针对空提交说明的提交变基" | |
18587 | ||
349ede6a | 18588 | #: builtin/rebase.c:1393 |
4c27fcb5 JX |
18589 | msgid "try to rebase merges instead of skipping them" |
18590 | msgstr "尝试对合并提交变基而不是忽略它们" | |
18591 | ||
349ede6a | 18592 | #: builtin/rebase.c:1396 |
4c27fcb5 JX |
18593 | msgid "use 'merge-base --fork-point' to refine upstream" |
18594 | msgstr "使用 'merge-base --fork-point' 来优化上游" | |
18595 | ||
349ede6a | 18596 | #: builtin/rebase.c:1398 |
4c27fcb5 JX |
18597 | msgid "use the given merge strategy" |
18598 | msgstr "使用给定的合并策略" | |
18599 | ||
349ede6a | 18600 | #: builtin/rebase.c:1400 builtin/revert.c:115 |
4c27fcb5 JX |
18601 | msgid "option" |
18602 | msgstr "选项" | |
18603 | ||
349ede6a | 18604 | #: builtin/rebase.c:1401 |
4c27fcb5 JX |
18605 | msgid "pass the argument through to the merge strategy" |
18606 | msgstr "将参数传递给合并策略" | |
18607 | ||
349ede6a | 18608 | #: builtin/rebase.c:1404 |
4c27fcb5 JX |
18609 | msgid "rebase all reachable commits up to the root(s)" |
18610 | msgstr "将所有可达的提交变基到根提交" | |
18611 | ||
349ede6a JX |
18612 | #: builtin/rebase.c:1409 |
18613 | msgid "apply all changes, even those already present upstream" | |
18614 | msgstr "应用所有更改,甚至那些已在上游存在的" | |
18615 | ||
18616 | #: builtin/rebase.c:1426 | |
d46c5519 JX |
18617 | msgid "" |
18618 | "the rebase.useBuiltin support has been removed!\n" | |
18619 | "See its entry in 'git help config' for details." | |
18620 | msgstr "" | |
18621 | "对 rebase.useBuiltin 的支持已被删除!\n" | |
18622 | "详见 'git help config' 中的条目。" | |
4c27fcb5 | 18623 | |
349ede6a | 18624 | #: builtin/rebase.c:1432 |
4c27fcb5 JX |
18625 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
18626 | msgstr "看起来 'git-am' 正在执行中。无法变基。" | |
18627 | ||
349ede6a | 18628 | #: builtin/rebase.c:1473 |
d46c5519 JX |
18629 | msgid "" |
18630 | "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." | |
18631 | msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" | |
18632 | ||
349ede6a | 18633 | #: builtin/rebase.c:1478 |
a5cd71ca JX |
18634 | msgid "cannot combine '--keep-base' with '--onto'" |
18635 | msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" | |
18636 | ||
349ede6a | 18637 | #: builtin/rebase.c:1480 |
a5cd71ca JX |
18638 | msgid "cannot combine '--keep-base' with '--root'" |
18639 | msgstr "不能将 '--keep-base' 和 '--root' 组合使用" | |
18640 | ||
349ede6a JX |
18641 | #: builtin/rebase.c:1484 |
18642 | msgid "cannot combine '--root' with '--fork-point'" | |
18643 | msgstr "不能将 '--root' 和 '--fork-point' 组合使用" | |
18644 | ||
18645 | #: builtin/rebase.c:1487 | |
4c27fcb5 JX |
18646 | msgid "No rebase in progress?" |
18647 | msgstr "没有正在进行的变基?" | |
18648 | ||
349ede6a | 18649 | #: builtin/rebase.c:1491 |
4c27fcb5 JX |
18650 | msgid "The --edit-todo action can only be used during interactive rebase." |
18651 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
18652 | ||
349ede6a | 18653 | #: builtin/rebase.c:1514 |
4c27fcb5 JX |
18654 | msgid "Cannot read HEAD" |
18655 | msgstr "不能读取 HEAD" | |
18656 | ||
349ede6a | 18657 | #: builtin/rebase.c:1526 |
4c27fcb5 JX |
18658 | msgid "" |
18659 | "You must edit all merge conflicts and then\n" | |
18660 | "mark them as resolved using git add" | |
18661 | msgstr "" | |
18662 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
18663 | "命令将它们标记为已解决" | |
18664 | ||
349ede6a | 18665 | #: builtin/rebase.c:1545 |
4c27fcb5 JX |
18666 | msgid "could not discard worktree changes" |
18667 | msgstr "无法丢弃工作区变更" | |
18668 | ||
349ede6a | 18669 | #: builtin/rebase.c:1564 |
4c27fcb5 JX |
18670 | #, c-format |
18671 | msgid "could not move back to %s" | |
18672 | msgstr "无法移回 %s" | |
18673 | ||
349ede6a | 18674 | #: builtin/rebase.c:1610 |
4c27fcb5 JX |
18675 | #, c-format |
18676 | msgid "" | |
18677 | "It seems that there is already a %s directory, and\n" | |
18678 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
18679 | "case, please try\n" | |
18680 | "\t%s\n" | |
18681 | "If that is not the case, please\n" | |
18682 | "\t%s\n" | |
18683 | "and run me again. I am stopping in case you still have something\n" | |
18684 | "valuable there.\n" | |
18685 | msgstr "" | |
18686 | "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n" | |
18687 | "如果是这样,请执行\n" | |
18688 | "\t%s\n" | |
18689 | "如果不是这样,请执行\n" | |
18690 | "\t%s\n" | |
18691 | "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" | |
18692 | ||
349ede6a | 18693 | #: builtin/rebase.c:1638 |
4c27fcb5 JX |
18694 | msgid "switch `C' expects a numerical value" |
18695 | msgstr "开关 `C' 期望一个数字值" | |
18696 | ||
349ede6a | 18697 | #: builtin/rebase.c:1680 |
4c27fcb5 JX |
18698 | #, c-format |
18699 | msgid "Unknown mode: %s" | |
18700 | msgstr "未知模式:%s" | |
18701 | ||
349ede6a | 18702 | #: builtin/rebase.c:1702 |
4c27fcb5 JX |
18703 | msgid "--strategy requires --merge or --interactive" |
18704 | msgstr "--strategy 需要 --merge 或 --interactive" | |
18705 | ||
349ede6a | 18706 | #: builtin/rebase.c:1732 |
2b472aae JX |
18707 | msgid "cannot combine apply options with merge options" |
18708 | msgstr "不能组合使用应用选项和合并选项" | |
18709 | ||
349ede6a | 18710 | #: builtin/rebase.c:1745 |
2b472aae JX |
18711 | #, c-format |
18712 | msgid "Unknown rebase backend: %s" | |
18713 | msgstr "未知的变基后端:%s" | |
18714 | ||
349ede6a | 18715 | #: builtin/rebase.c:1770 |
a6cd2cc4 JX |
18716 | msgid "--reschedule-failed-exec requires --exec or --interactive" |
18717 | msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" | |
18718 | ||
349ede6a | 18719 | #: builtin/rebase.c:1790 |
06991777 | 18720 | msgid "cannot combine '--preserve-merges' with '--rebase-merges'" |
5b533632 | 18721 | msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" |
4c27fcb5 | 18722 | |
349ede6a | 18723 | #: builtin/rebase.c:1794 |
06991777 JX |
18724 | msgid "" |
18725 | "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" | |
18726 | msgstr "" | |
5b533632 | 18727 | "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" |
4c27fcb5 | 18728 | |
349ede6a | 18729 | #: builtin/rebase.c:1818 |
4c27fcb5 JX |
18730 | #, c-format |
18731 | msgid "invalid upstream '%s'" | |
18732 | msgstr "无效的上游 '%s'" | |
18733 | ||
349ede6a | 18734 | #: builtin/rebase.c:1824 |
4c27fcb5 JX |
18735 | msgid "Could not create new root commit" |
18736 | msgstr "不能创建新的根提交" | |
18737 | ||
349ede6a | 18738 | #: builtin/rebase.c:1850 |
a5cd71ca JX |
18739 | #, c-format |
18740 | msgid "'%s': need exactly one merge base with branch" | |
18741 | msgstr "'%s':只需要与分支的一个合并基线" | |
18742 | ||
349ede6a | 18743 | #: builtin/rebase.c:1853 |
4c27fcb5 JX |
18744 | #, c-format |
18745 | msgid "'%s': need exactly one merge base" | |
18746 | msgstr "'%s':只需要一个合并基线" | |
18747 | ||
349ede6a | 18748 | #: builtin/rebase.c:1861 |
4c27fcb5 JX |
18749 | #, c-format |
18750 | msgid "Does not point to a valid commit '%s'" | |
18751 | msgstr "没有指向一个有效的提交 '%s'" | |
18752 | ||
349ede6a | 18753 | #: builtin/rebase.c:1887 |
4c27fcb5 JX |
18754 | #, c-format |
18755 | msgid "fatal: no such branch/commit '%s'" | |
06991777 | 18756 | msgstr "致命错误:无此分支/提交 '%s'" |
4c27fcb5 | 18757 | |
349ede6a | 18758 | #: builtin/rebase.c:1895 builtin/submodule--helper.c:40 |
2b472aae | 18759 | #: builtin/submodule--helper.c:1990 |
4c27fcb5 JX |
18760 | #, c-format |
18761 | msgid "No such ref: %s" | |
18762 | msgstr "没有这样的引用:%s" | |
18763 | ||
349ede6a | 18764 | #: builtin/rebase.c:1906 |
4c27fcb5 JX |
18765 | msgid "Could not resolve HEAD to a revision" |
18766 | msgstr "无法将 HEAD 解析为一个版本" | |
18767 | ||
349ede6a | 18768 | #: builtin/rebase.c:1927 |
4c27fcb5 JX |
18769 | msgid "Please commit or stash them." |
18770 | msgstr "请提交或贮藏修改。" | |
18771 | ||
349ede6a | 18772 | #: builtin/rebase.c:1963 |
4c27fcb5 JX |
18773 | #, c-format |
18774 | msgid "could not switch to %s" | |
18775 | msgstr "无法切换到 %s" | |
18776 | ||
349ede6a | 18777 | #: builtin/rebase.c:1974 |
4c27fcb5 JX |
18778 | msgid "HEAD is up to date." |
18779 | msgstr "HEAD 是最新的。" | |
18780 | ||
349ede6a | 18781 | #: builtin/rebase.c:1976 |
4c27fcb5 JX |
18782 | #, c-format |
18783 | msgid "Current branch %s is up to date.\n" | |
18784 | msgstr "当前分支 %s 是最新的。\n" | |
18785 | ||
349ede6a | 18786 | #: builtin/rebase.c:1984 |
4c27fcb5 JX |
18787 | msgid "HEAD is up to date, rebase forced." |
18788 | msgstr "HEAD 是最新的,强制变基。" | |
18789 | ||
349ede6a | 18790 | #: builtin/rebase.c:1986 |
4c27fcb5 JX |
18791 | #, c-format |
18792 | msgid "Current branch %s is up to date, rebase forced.\n" | |
18793 | msgstr "当前分支 %s 是最新的,强制变基。\n" | |
18794 | ||
349ede6a | 18795 | #: builtin/rebase.c:1994 |
4c27fcb5 JX |
18796 | msgid "The pre-rebase hook refused to rebase." |
18797 | msgstr "pre-rebase 钩子拒绝了变基操作。" | |
18798 | ||
349ede6a | 18799 | #: builtin/rebase.c:2001 |
4c27fcb5 JX |
18800 | #, c-format |
18801 | msgid "Changes to %s:\n" | |
18802 | msgstr "到 %s 的变更:\n" | |
18803 | ||
349ede6a | 18804 | #: builtin/rebase.c:2004 |
4c27fcb5 JX |
18805 | #, c-format |
18806 | msgid "Changes from %s to %s:\n" | |
18807 | msgstr "从 %s 到 %s 的变更:\n" | |
18808 | ||
349ede6a | 18809 | #: builtin/rebase.c:2029 |
4c27fcb5 JX |
18810 | #, c-format |
18811 | msgid "First, rewinding head to replay your work on top of it...\n" | |
18812 | msgstr "首先,回退头指针以便在其上重放您的工作...\n" | |
18813 | ||
349ede6a | 18814 | #: builtin/rebase.c:2038 |
4c27fcb5 JX |
18815 | msgid "Could not detach HEAD" |
18816 | msgstr "无法分离头指针" | |
18817 | ||
349ede6a | 18818 | #: builtin/rebase.c:2047 |
4c27fcb5 JX |
18819 | #, c-format |
18820 | msgid "Fast-forwarded %s to %s.\n" | |
18821 | msgstr "快进 %s 到 %s。\n" | |
18822 | ||
349ede6a | 18823 | #: builtin/receive-pack.c:34 |
5b04ee3b | 18824 | msgid "git receive-pack <git-dir>" |
58b6f078 | 18825 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 18826 | |
7157c2b5 | 18827 | #: builtin/receive-pack.c:844 |
a0b6b246 JX |
18828 | msgid "" |
18829 | "By default, updating the current branch in a non-bare repository\n" | |
18830 | "is denied, because it will make the index and work tree inconsistent\n" | |
18831 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
18832 | "the work tree to HEAD.\n" | |
18833 | "\n" | |
1a79b2f1 JX |
18834 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
18835 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
18836 | "its current branch; however, this is not recommended unless you\n" |
18837 | "arranged to update its work tree to match what you pushed in some\n" | |
18838 | "other way.\n" | |
18839 | "\n" | |
18840 | "To squelch this message and still keep the default behaviour, set\n" | |
18841 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
18842 | msgstr "" | |
18843 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
18844 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
18845 | "\n" | |
18846 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
18847 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
18848 | "用某种方式将其工作区更新至您推送的状态。\n" | |
18849 | "\n" | |
18850 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
18851 | "配置变量为 'refuse'。" | |
18852 | ||
7157c2b5 | 18853 | #: builtin/receive-pack.c:864 |
a0b6b246 JX |
18854 | msgid "" |
18855 | "By default, deleting the current branch is denied, because the next\n" | |
18856 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
18857 | "\n" | |
18858 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
18859 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
18860 | "current branch, with or without a warning message.\n" | |
18861 | "\n" | |
18862 | "To squelch this message, you can set it to 'refuse'." | |
18863 | msgstr "" | |
18864 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 18865 | "导致困惑。\n" |
a0b6b246 JX |
18866 | "\n" |
18867 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 18868 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
18869 | "\n" |
18870 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
18871 | ||
7157c2b5 | 18872 | #: builtin/receive-pack.c:1970 |
5b04ee3b JX |
18873 | msgid "quiet" |
18874 | msgstr "静默模式" | |
18875 | ||
7157c2b5 | 18876 | #: builtin/receive-pack.c:1984 |
5b04ee3b JX |
18877 | msgid "You must specify a directory." |
18878 | msgstr "您必须指定一个目录。" | |
18879 | ||
06991777 JX |
18880 | #: builtin/reflog.c:17 |
18881 | msgid "" | |
18882 | "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" | |
18883 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " | |
18884 | "<refs>..." | |
18885 | msgstr "" | |
18886 | "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--" | |
18887 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" | |
18888 | "用>..." | |
18889 | ||
18890 | #: builtin/reflog.c:22 | |
18891 | msgid "" | |
18892 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " | |
18893 | "<refs>..." | |
18894 | msgstr "" | |
18895 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" | |
18896 | "用>..." | |
18897 | ||
18898 | #: builtin/reflog.c:25 | |
18899 | msgid "git reflog exists <ref>" | |
18900 | msgstr "git reflog exists <引用>" | |
18901 | ||
2b472aae | 18902 | #: builtin/reflog.c:568 builtin/reflog.c:573 |
2e8451e8 JX |
18903 | #, c-format |
18904 | msgid "'%s' is not a valid timestamp" | |
18905 | msgstr "'%s' 不是一个有效的时间戳" | |
18906 | ||
2b472aae | 18907 | #: builtin/reflog.c:606 |
06991777 JX |
18908 | #, c-format |
18909 | msgid "Marking reachable objects..." | |
18910 | msgstr "正在标记可达对象..." | |
18911 | ||
2b472aae | 18912 | #: builtin/reflog.c:644 |
06991777 JX |
18913 | #, c-format |
18914 | msgid "%s points nowhere!" | |
18915 | msgstr "%s 指向不存在!" | |
18916 | ||
2b472aae | 18917 | #: builtin/reflog.c:696 |
06991777 JX |
18918 | msgid "no reflog specified to delete" |
18919 | msgstr "未指定要删除的引用日志" | |
18920 | ||
2b472aae | 18921 | #: builtin/reflog.c:705 |
06991777 JX |
18922 | #, c-format |
18923 | msgid "not a reflog: %s" | |
18924 | msgstr "不是一个引用日志:%s" | |
18925 | ||
2b472aae | 18926 | #: builtin/reflog.c:710 |
06991777 JX |
18927 | #, c-format |
18928 | msgid "no reflog for '%s'" | |
18929 | msgstr "没有 '%s' 的引用日志" | |
18930 | ||
2b472aae | 18931 | #: builtin/reflog.c:756 |
06991777 JX |
18932 | #, c-format |
18933 | msgid "invalid ref format: %s" | |
18934 | msgstr "无效的引用格式:%s" | |
18935 | ||
2b472aae | 18936 | #: builtin/reflog.c:765 |
06991777 JX |
18937 | msgid "git reflog [ show | expire | delete | exists ]" |
18938 | msgstr "git reflog [ show | expire | delete | exists ]" | |
18939 | ||
2b472aae | 18940 | #: builtin/remote.c:17 |
ef317cd5 | 18941 | msgid "git remote [-v | --verbose]" |
07432cef | 18942 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 18943 | |
2b472aae | 18944 | #: builtin/remote.c:18 |
ef317cd5 | 18945 | msgid "" |
814ff314 | 18946 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
18947 | "mirror=<fetch|push>] <name> <url>" |
18948 | msgstr "" | |
814ff314 | 18949 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 18950 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 18951 | |
2b472aae | 18952 | #: builtin/remote.c:19 builtin/remote.c:39 |
ef317cd5 | 18953 | msgid "git remote rename <old> <new>" |
07432cef | 18954 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 18955 | |
2b472aae | 18956 | #: builtin/remote.c:20 builtin/remote.c:44 |
ef317cd5 | 18957 | msgid "git remote remove <name>" |
07432cef | 18958 | msgstr "git remote remove <名称>" |
ef317cd5 | 18959 | |
2b472aae | 18960 | #: builtin/remote.c:21 builtin/remote.c:49 |
814ff314 JX |
18961 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
18962 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 18963 | |
2b472aae | 18964 | #: builtin/remote.c:22 |
ef317cd5 | 18965 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 18966 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 18967 | |
2b472aae | 18968 | #: builtin/remote.c:23 |
ef317cd5 | 18969 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 18970 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 18971 | |
2b472aae | 18972 | #: builtin/remote.c:24 |
ef317cd5 JX |
18973 | msgid "" |
18974 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 18975 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 18976 | |
2b472aae | 18977 | #: builtin/remote.c:25 |
ef317cd5 | 18978 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 18979 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 18980 | |
2b472aae | 18981 | #: builtin/remote.c:26 builtin/remote.c:75 |
94550ed3 JX |
18982 | msgid "git remote get-url [--push] [--all] <name>" |
18983 | msgstr "git remote get-url [--push] [--all] <名称>" | |
18984 | ||
2b472aae | 18985 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 18986 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 18987 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 18988 | |
2b472aae | 18989 | #: builtin/remote.c:28 builtin/remote.c:81 |
ef317cd5 | 18990 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 18991 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 18992 | |
2b472aae | 18993 | #: builtin/remote.c:29 builtin/remote.c:82 |
ef317cd5 | 18994 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 18995 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 18996 | |
2b472aae | 18997 | #: builtin/remote.c:34 |
ef317cd5 | 18998 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 18999 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 19000 | |
2b472aae | 19001 | #: builtin/remote.c:54 |
ef317cd5 | 19002 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 19003 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 19004 | |
2b472aae | 19005 | #: builtin/remote.c:55 |
ef317cd5 | 19006 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 19007 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 19008 | |
2b472aae | 19009 | #: builtin/remote.c:60 |
ef317cd5 | 19010 | msgid "git remote show [<options>] <name>" |
07432cef | 19011 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 19012 | |
2b472aae | 19013 | #: builtin/remote.c:65 |
ef317cd5 | 19014 | msgid "git remote prune [<options>] <name>" |
07432cef | 19015 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 19016 | |
2b472aae | 19017 | #: builtin/remote.c:70 |
ef317cd5 | 19018 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 19019 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 19020 | |
2b472aae | 19021 | #: builtin/remote.c:99 |
81809b99 | 19022 | #, c-format |
8ada9598 | 19023 | msgid "Updating %s" |
81809b99 | 19024 | msgstr "更新 %s 中" |
8ada9598 | 19025 | |
2b472aae | 19026 | #: builtin/remote.c:131 |
8ada9598 JX |
19027 | msgid "" |
19028 | "--mirror is dangerous and deprecated; please\n" | |
19029 | "\t use --mirror=fetch or --mirror=push instead" | |
19030 | msgstr "" | |
81809b99 JX |
19031 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
19032 | "\t 或 --mirror=push" | |
8ada9598 | 19033 | |
2b472aae | 19034 | #: builtin/remote.c:148 |
81809b99 | 19035 | #, c-format |
8ada9598 | 19036 | msgid "unknown mirror argument: %s" |
81809b99 | 19037 | msgstr "未知的镜像参数:%s" |
8ada9598 | 19038 | |
2b472aae | 19039 | #: builtin/remote.c:164 |
ef317cd5 | 19040 | msgid "fetch the remote branches" |
07432cef | 19041 | msgstr "抓取远程的分支" |
ef317cd5 | 19042 | |
2b472aae | 19043 | #: builtin/remote.c:166 |
ef317cd5 | 19044 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 19045 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 19046 | |
2b472aae | 19047 | #: builtin/remote.c:169 |
ef317cd5 | 19048 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 19049 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 19050 | |
2b472aae | 19051 | #: builtin/remote.c:171 |
ef317cd5 | 19052 | msgid "branch(es) to track" |
07432cef | 19053 | msgstr "跟踪的分支" |
ef317cd5 | 19054 | |
2b472aae | 19055 | #: builtin/remote.c:172 |
ef317cd5 | 19056 | msgid "master branch" |
07432cef | 19057 | msgstr "主线分支" |
ef317cd5 | 19058 | |
2b472aae | 19059 | #: builtin/remote.c:174 |
ef317cd5 | 19060 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 19061 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 19062 | |
2b472aae | 19063 | #: builtin/remote.c:186 |
8ada9598 | 19064 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 19065 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 19066 | |
2b472aae | 19067 | #: builtin/remote.c:188 |
8ada9598 | 19068 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 19069 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 19070 | |
2b472aae | 19071 | #: builtin/remote.c:195 builtin/remote.c:696 |
81809b99 | 19072 | #, c-format |
8ada9598 | 19073 | msgid "remote %s already exists." |
81809b99 | 19074 | msgstr "远程 %s 已经存在。" |
8ada9598 | 19075 | |
2b472aae | 19076 | #: builtin/remote.c:199 builtin/remote.c:700 |
81809b99 | 19077 | #, c-format |
8ada9598 | 19078 | msgid "'%s' is not a valid remote name" |
81809b99 | 19079 | msgstr "'%s' 不是一个有效的远程名称" |
8ada9598 | 19080 | |
2b472aae | 19081 | #: builtin/remote.c:239 |
81809b99 | 19082 | #, c-format |
8ada9598 | 19083 | msgid "Could not setup master '%s'" |
81809b99 | 19084 | msgstr "无法设置 master '%s'" |
8ada9598 | 19085 | |
2b472aae | 19086 | #: builtin/remote.c:354 |
81809b99 | 19087 | #, c-format |
8ada9598 | 19088 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 19089 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 19090 | |
2b472aae | 19091 | #: builtin/remote.c:453 builtin/remote.c:461 |
8ada9598 | 19092 | msgid "(matching)" |
81809b99 | 19093 | msgstr "(匹配)" |
8ada9598 | 19094 | |
2b472aae | 19095 | #: builtin/remote.c:465 |
8ada9598 | 19096 | msgid "(delete)" |
81809b99 | 19097 | msgstr "(删除)" |
8ada9598 | 19098 | |
2b472aae JX |
19099 | #: builtin/remote.c:653 |
19100 | #, c-format | |
19101 | msgid "could not set '%s'" | |
19102 | msgstr "不能设置 '%s'" | |
19103 | ||
19104 | #: builtin/remote.c:658 | |
19105 | #, c-format | |
19106 | msgid "" | |
19107 | "The %s configuration remote.pushDefault in:\n" | |
19108 | "\t%s:%d\n" | |
19109 | "now names the non-existent remote '%s'" | |
19110 | msgstr "" | |
19111 | "配置(%s)remote.pushDefault 位于:\n" | |
19112 | "\t%s:%d\n" | |
19113 | "现在在为不存在的远程名 '%s' 命名" | |
19114 | ||
19115 | #: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 | |
81809b99 | 19116 | #, c-format |
4c27fcb5 JX |
19117 | msgid "No such remote: '%s'" |
19118 | msgstr "没有此远程仓库:'%s'" | |
8ada9598 | 19119 | |
2b472aae | 19120 | #: builtin/remote.c:706 |
81809b99 | 19121 | #, c-format |
8ada9598 | 19122 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 19123 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 19124 | |
2b472aae | 19125 | #: builtin/remote.c:726 |
8ada9598 JX |
19126 | #, c-format |
19127 | msgid "" | |
d691f479 | 19128 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
19129 | "\t%s\n" |
19130 | "\tPlease update the configuration manually if necessary." | |
19131 | msgstr "" | |
160fb2b2 | 19132 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
19133 | "\t%s\n" |
19134 | "\t如果必要请手动更新配置。" | |
8ada9598 | 19135 | |
2b472aae | 19136 | #: builtin/remote.c:766 |
81809b99 | 19137 | #, c-format |
8ada9598 | 19138 | msgid "deleting '%s' failed" |
81809b99 | 19139 | msgstr "删除 '%s' 失败" |
8ada9598 | 19140 | |
2b472aae | 19141 | #: builtin/remote.c:800 |
81809b99 | 19142 | #, c-format |
8ada9598 | 19143 | msgid "creating '%s' failed" |
81809b99 | 19144 | msgstr "创建 '%s' 失败" |
8ada9598 | 19145 | |
2b472aae | 19146 | #: builtin/remote.c:876 |
8ada9598 JX |
19147 | msgid "" |
19148 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
19149 | "to delete it, use:" | |
19150 | msgid_plural "" | |
19151 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
19152 | "to delete them, use:" | |
5ae481e0 JX |
19153 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
19154 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 19155 | |
2b472aae | 19156 | #: builtin/remote.c:890 |
276ceeaa JX |
19157 | #, c-format |
19158 | msgid "Could not remove config section '%s'" | |
19159 | msgstr "不能移除配置小节 '%s'" | |
19160 | ||
2b472aae | 19161 | #: builtin/remote.c:993 |
8ada9598 JX |
19162 | #, c-format |
19163 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 19164 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 19165 | |
2b472aae | 19166 | #: builtin/remote.c:996 |
8ada9598 | 19167 | msgid " tracked" |
81809b99 | 19168 | msgstr " 已跟踪" |
8ada9598 | 19169 | |
2b472aae | 19170 | #: builtin/remote.c:998 |
8ada9598 | 19171 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 19172 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 19173 | |
2b472aae | 19174 | #: builtin/remote.c:1000 |
8ada9598 | 19175 | msgid " ???" |
81809b99 | 19176 | msgstr " ???" |
8ada9598 | 19177 | |
2b472aae | 19178 | #: builtin/remote.c:1041 |
8ada9598 JX |
19179 | #, c-format |
19180 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 19181 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 19182 | |
2b472aae | 19183 | #: builtin/remote.c:1050 |
81809b99 | 19184 | #, c-format |
276ceeaa JX |
19185 | msgid "rebases interactively onto remote %s" |
19186 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 19187 | |
2b472aae | 19188 | #: builtin/remote.c:1052 |
fd8cb379 JX |
19189 | #, c-format |
19190 | msgid "rebases interactively (with merges) onto remote %s" | |
19191 | msgstr "交互式变基(含合并提交)到远程 %s" | |
19192 | ||
2b472aae | 19193 | #: builtin/remote.c:1055 |
5c57d762 JX |
19194 | #, c-format |
19195 | msgid "rebases onto remote %s" | |
19196 | msgstr "变基到远程 %s" | |
19197 | ||
2b472aae | 19198 | #: builtin/remote.c:1059 |
81809b99 | 19199 | #, c-format |
8ada9598 | 19200 | msgid " merges with remote %s" |
81809b99 | 19201 | msgstr " 与远程 %s 合并" |
8ada9598 | 19202 | |
2b472aae | 19203 | #: builtin/remote.c:1062 |
81809b99 | 19204 | #, c-format |
8ada9598 | 19205 | msgid "merges with remote %s" |
81809b99 | 19206 | msgstr "与远程 %s 合并" |
8ada9598 | 19207 | |
2b472aae | 19208 | #: builtin/remote.c:1065 |
5c57d762 JX |
19209 | #, c-format |
19210 | msgid "%-*s and with remote %s\n" | |
19211 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 19212 | |
2b472aae | 19213 | #: builtin/remote.c:1108 |
8ada9598 | 19214 | msgid "create" |
81809b99 | 19215 | msgstr "创建" |
8ada9598 | 19216 | |
2b472aae | 19217 | #: builtin/remote.c:1111 |
8ada9598 | 19218 | msgid "delete" |
81809b99 | 19219 | msgstr "删除" |
8ada9598 | 19220 | |
2b472aae | 19221 | #: builtin/remote.c:1115 |
8ada9598 | 19222 | msgid "up to date" |
81809b99 | 19223 | msgstr "最新" |
8ada9598 | 19224 | |
2b472aae | 19225 | #: builtin/remote.c:1118 |
8ada9598 | 19226 | msgid "fast-forwardable" |
81809b99 | 19227 | msgstr "可快进" |
8ada9598 | 19228 | |
2b472aae | 19229 | #: builtin/remote.c:1121 |
8ada9598 | 19230 | msgid "local out of date" |
81809b99 | 19231 | msgstr "本地已过时" |
8ada9598 | 19232 | |
2b472aae | 19233 | #: builtin/remote.c:1128 |
8ada9598 JX |
19234 | #, c-format |
19235 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 19236 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 19237 | |
2b472aae | 19238 | #: builtin/remote.c:1131 |
8ada9598 JX |
19239 | #, c-format |
19240 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 19241 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 19242 | |
2b472aae | 19243 | #: builtin/remote.c:1135 |
8ada9598 JX |
19244 | #, c-format |
19245 | msgid " %-*s forces to %s" | |
81809b99 | 19246 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 19247 | |
2b472aae | 19248 | #: builtin/remote.c:1138 |
8ada9598 JX |
19249 | #, c-format |
19250 | msgid " %-*s pushes to %s" | |
81809b99 | 19251 | msgstr " %-*s 推送至 %s" |
8ada9598 | 19252 | |
2b472aae | 19253 | #: builtin/remote.c:1206 |
ef317cd5 | 19254 | msgid "do not query remotes" |
07432cef | 19255 | msgstr "不查询远程" |
ef317cd5 | 19256 | |
2b472aae | 19257 | #: builtin/remote.c:1233 |
81809b99 | 19258 | #, c-format |
8ada9598 | 19259 | msgid "* remote %s" |
81809b99 | 19260 | msgstr "* 远程 %s" |
8ada9598 | 19261 | |
2b472aae | 19262 | #: builtin/remote.c:1234 |
8ada9598 JX |
19263 | #, c-format |
19264 | msgid " Fetch URL: %s" | |
81809b99 | 19265 | msgstr " 获取地址:%s" |
8ada9598 | 19266 | |
2b472aae | 19267 | #: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 |
8ada9598 | 19268 | msgid "(no URL)" |
81809b99 | 19269 | msgstr "(无 URL)" |
8ada9598 | 19270 | |
a4f16749 JX |
19271 | #. TRANSLATORS: the colon ':' should align |
19272 | #. with the one in " Fetch URL: %s" | |
19273 | #. translation. | |
19274 | #. | |
2b472aae | 19275 | #: builtin/remote.c:1249 builtin/remote.c:1251 |
8ada9598 JX |
19276 | #, c-format |
19277 | msgid " Push URL: %s" | |
81809b99 | 19278 | msgstr " 推送地址:%s" |
8ada9598 | 19279 | |
2b472aae | 19280 | #: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 |
81809b99 | 19281 | #, c-format |
8ada9598 | 19282 | msgid " HEAD branch: %s" |
4375c10e | 19283 | msgstr " HEAD 分支:%s" |
8ada9598 | 19284 | |
5c57d762 | 19285 | # 译者:中文字符串拼接,可删除前导空格 |
2b472aae | 19286 | #: builtin/remote.c:1253 |
5c57d762 JX |
19287 | msgid "(not queried)" |
19288 | msgstr "(未查询)" | |
19289 | ||
2b472aae | 19290 | #: builtin/remote.c:1255 |
5c57d762 JX |
19291 | msgid "(unknown)" |
19292 | msgstr "(未知)" | |
19293 | ||
2b472aae | 19294 | #: builtin/remote.c:1259 |
8ada9598 JX |
19295 | #, c-format |
19296 | msgid "" | |
19297 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 19298 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 19299 | |
2b472aae | 19300 | #: builtin/remote.c:1271 |
81809b99 | 19301 | #, c-format |
8ada9598 JX |
19302 | msgid " Remote branch:%s" |
19303 | msgid_plural " Remote branches:%s" | |
81809b99 | 19304 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 19305 | msgstr[1] " 远程分支:%s" |
8ada9598 | 19306 | |
81809b99 | 19307 | # 译者:中文字符串拼接,可删除前导空格 |
2b472aae | 19308 | #: builtin/remote.c:1274 builtin/remote.c:1300 |
8ada9598 | 19309 | msgid " (status not queried)" |
81809b99 | 19310 | msgstr "(状态未查询)" |
8ada9598 | 19311 | |
2b472aae | 19312 | #: builtin/remote.c:1283 |
8ada9598 JX |
19313 | msgid " Local branch configured for 'git pull':" |
19314 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 19315 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 19316 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 19317 | |
2b472aae | 19318 | #: builtin/remote.c:1291 |
8ada9598 | 19319 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 19320 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 19321 | |
2b472aae | 19322 | #: builtin/remote.c:1297 |
81809b99 | 19323 | #, c-format |
8ada9598 JX |
19324 | msgid " Local ref configured for 'git push'%s:" |
19325 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 19326 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 19327 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 19328 | |
2b472aae | 19329 | #: builtin/remote.c:1318 |
ef317cd5 | 19330 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 19331 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 19332 | |
2b472aae | 19333 | #: builtin/remote.c:1320 |
ef317cd5 | 19334 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 19335 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 19336 | |
2b472aae | 19337 | #: builtin/remote.c:1335 |
8ada9598 | 19338 | msgid "Cannot determine remote HEAD" |
81809b99 | 19339 | msgstr "无法确定远程 HEAD" |
8ada9598 | 19340 | |
2b472aae | 19341 | #: builtin/remote.c:1337 |
8ada9598 | 19342 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 19343 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 19344 | |
2b472aae | 19345 | #: builtin/remote.c:1347 |
81809b99 | 19346 | #, c-format |
8ada9598 | 19347 | msgid "Could not delete %s" |
81809b99 | 19348 | msgstr "无法删除 %s" |
8ada9598 | 19349 | |
2b472aae | 19350 | #: builtin/remote.c:1355 |
81809b99 | 19351 | #, c-format |
8ada9598 | 19352 | msgid "Not a valid ref: %s" |
81809b99 | 19353 | msgstr "不是一个有效引用:%s" |
8ada9598 | 19354 | |
2b472aae | 19355 | #: builtin/remote.c:1357 |
81809b99 | 19356 | #, c-format |
8ada9598 | 19357 | msgid "Could not setup %s" |
81809b99 | 19358 | msgstr "不能设置 %s" |
8ada9598 JX |
19359 | |
19360 | # 译者:注意保持前导空格 | |
2b472aae | 19361 | #: builtin/remote.c:1375 |
81809b99 | 19362 | #, c-format |
8ada9598 | 19363 | msgid " %s will become dangling!" |
e640d114 | 19364 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
19365 | |
19366 | # 译者:注意保持前导空格 | |
2b472aae | 19367 | #: builtin/remote.c:1376 |
81809b99 | 19368 | #, c-format |
8ada9598 | 19369 | msgid " %s has become dangling!" |
e640d114 | 19370 | msgstr " %s 已成为悬空状态!" |
8ada9598 | 19371 | |
2b472aae | 19372 | #: builtin/remote.c:1386 |
81809b99 | 19373 | #, c-format |
8ada9598 | 19374 | msgid "Pruning %s" |
81809b99 | 19375 | msgstr "修剪 %s" |
8ada9598 | 19376 | |
2b472aae | 19377 | #: builtin/remote.c:1387 |
8ada9598 JX |
19378 | #, c-format |
19379 | msgid "URL: %s" | |
81809b99 | 19380 | msgstr "URL:%s" |
8ada9598 | 19381 | |
2b472aae | 19382 | #: builtin/remote.c:1403 |
8ada9598 JX |
19383 | #, c-format |
19384 | msgid " * [would prune] %s" | |
81809b99 | 19385 | msgstr " * [将删除] %s" |
8ada9598 | 19386 | |
2b472aae | 19387 | #: builtin/remote.c:1406 |
8ada9598 JX |
19388 | #, c-format |
19389 | msgid " * [pruned] %s" | |
81809b99 | 19390 | msgstr " * [已删除] %s" |
8ada9598 | 19391 | |
2b472aae | 19392 | #: builtin/remote.c:1451 |
ef317cd5 | 19393 | msgid "prune remotes after fetching" |
07432cef | 19394 | msgstr "抓取后清除远程" |
ef317cd5 | 19395 | |
2b472aae | 19396 | #: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 |
81809b99 | 19397 | #, c-format |
8ada9598 | 19398 | msgid "No such remote '%s'" |
81809b99 | 19399 | msgstr "没有此远程 '%s'" |
8ada9598 | 19400 | |
2b472aae | 19401 | #: builtin/remote.c:1530 |
ef317cd5 | 19402 | msgid "add branch" |
07432cef | 19403 | msgstr "添加分支" |
ef317cd5 | 19404 | |
2b472aae | 19405 | #: builtin/remote.c:1537 |
8ada9598 | 19406 | msgid "no remote specified" |
81809b99 | 19407 | msgstr "未指定远程" |
8ada9598 | 19408 | |
2b472aae | 19409 | #: builtin/remote.c:1554 |
94550ed3 JX |
19410 | msgid "query push URLs rather than fetch URLs" |
19411 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
19412 | ||
2b472aae | 19413 | #: builtin/remote.c:1556 |
94550ed3 JX |
19414 | msgid "return all URLs" |
19415 | msgstr "返回所有 URL 地址" | |
19416 | ||
2b472aae | 19417 | #: builtin/remote.c:1584 |
94550ed3 JX |
19418 | #, c-format |
19419 | msgid "no URLs configured for remote '%s'" | |
19420 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
19421 | ||
2b472aae | 19422 | #: builtin/remote.c:1610 |
ef317cd5 | 19423 | msgid "manipulate push URLs" |
07432cef | 19424 | msgstr "操作推送 URLS" |
ef317cd5 | 19425 | |
2b472aae | 19426 | #: builtin/remote.c:1612 |
ef317cd5 | 19427 | msgid "add URL" |
07432cef | 19428 | msgstr "添加 URL" |
ef317cd5 | 19429 | |
2b472aae | 19430 | #: builtin/remote.c:1614 |
ef317cd5 | 19431 | msgid "delete URLs" |
07432cef | 19432 | msgstr "删除 URLS" |
ef317cd5 | 19433 | |
2b472aae | 19434 | #: builtin/remote.c:1621 |
8ada9598 | 19435 | msgid "--add --delete doesn't make sense" |
81809b99 | 19436 | msgstr "--add --delete 无意义" |
8ada9598 | 19437 | |
2b472aae | 19438 | #: builtin/remote.c:1660 |
81809b99 | 19439 | #, c-format |
8ada9598 | 19440 | msgid "Invalid old URL pattern: %s" |
4375c10e | 19441 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 19442 | |
2b472aae | 19443 | #: builtin/remote.c:1668 |
81809b99 | 19444 | #, c-format |
8ada9598 | 19445 | msgid "No such URL found: %s" |
4375c10e | 19446 | msgstr "未找到此 URL:%s" |
8ada9598 | 19447 | |
2b472aae | 19448 | #: builtin/remote.c:1670 |
8ada9598 | 19449 | msgid "Will not delete all non-push URLs" |
4375c10e | 19450 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 19451 | |
349ede6a | 19452 | #: builtin/repack.c:25 |
814ff314 JX |
19453 | msgid "git repack [<options>]" |
19454 | msgstr "git repack [<选项>]" | |
90314792 | 19455 | |
349ede6a | 19456 | #: builtin/repack.c:30 |
1a79b2f1 JX |
19457 | msgid "" |
19458 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
19459 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
19460 | msgstr "" | |
19461 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
19462 | "或禁用 pack.writebitmaps 配置。" | |
19463 | ||
349ede6a | 19464 | #: builtin/repack.c:193 |
06991777 | 19465 | msgid "could not start pack-objects to repack promisor objects" |
5b533632 | 19466 | msgstr "无法开始 pack-objects 来重新打包 promisor 对象" |
06991777 | 19467 | |
349ede6a | 19468 | #: builtin/repack.c:232 builtin/repack.c:418 |
06991777 | 19469 | msgid "repack: Expecting full hex object ID lines only from pack-objects." |
5b533632 | 19470 | msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。" |
06991777 | 19471 | |
349ede6a | 19472 | #: builtin/repack.c:256 |
06991777 | 19473 | msgid "could not finish pack-objects to repack promisor objects" |
5b533632 | 19474 | msgstr "无法完成 pack-objects 来重新打包 promisor 对象" |
06991777 | 19475 | |
349ede6a | 19476 | #: builtin/repack.c:294 |
90314792 JX |
19477 | msgid "pack everything in a single pack" |
19478 | msgstr "所有内容打包到一个包文件中" | |
19479 | ||
349ede6a | 19480 | #: builtin/repack.c:296 |
90314792 JX |
19481 | msgid "same as -a, and turn unreachable objects loose" |
19482 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
19483 | ||
349ede6a | 19484 | #: builtin/repack.c:299 |
90314792 JX |
19485 | msgid "remove redundant packs, and run git-prune-packed" |
19486 | msgstr "删除多余的包,运行 git-prune-packed" | |
19487 | ||
349ede6a | 19488 | #: builtin/repack.c:301 |
90314792 JX |
19489 | msgid "pass --no-reuse-delta to git-pack-objects" |
19490 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
19491 | ||
349ede6a | 19492 | #: builtin/repack.c:303 |
90314792 JX |
19493 | msgid "pass --no-reuse-object to git-pack-objects" |
19494 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
19495 | ||
349ede6a | 19496 | #: builtin/repack.c:305 |
90314792 JX |
19497 | msgid "do not run git-update-server-info" |
19498 | msgstr "不运行 git-update-server-info" | |
19499 | ||
349ede6a | 19500 | #: builtin/repack.c:308 |
90314792 JX |
19501 | msgid "pass --local to git-pack-objects" |
19502 | msgstr "向 git-pack-objects 传递参数 --local" | |
19503 | ||
349ede6a | 19504 | #: builtin/repack.c:310 |
6c94aba5 JX |
19505 | msgid "write bitmap index" |
19506 | msgstr "写 bitmap 索引" | |
19507 | ||
349ede6a | 19508 | #: builtin/repack.c:312 |
4c27fcb5 JX |
19509 | msgid "pass --delta-islands to git-pack-objects" |
19510 | msgstr "向 git-pack-objects 传递参数 --delta-islands" | |
19511 | ||
349ede6a | 19512 | #: builtin/repack.c:313 |
90314792 JX |
19513 | msgid "approxidate" |
19514 | msgstr "近似日期" | |
19515 | ||
349ede6a | 19516 | #: builtin/repack.c:314 |
90314792 JX |
19517 | msgid "with -A, do not loosen objects older than this" |
19518 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
19519 | ||
349ede6a | 19520 | #: builtin/repack.c:316 |
5c57d762 JX |
19521 | msgid "with -a, repack unreachable objects" |
19522 | msgstr "使用 -a ,重新对不可达对象打包" | |
19523 | ||
349ede6a | 19524 | #: builtin/repack.c:318 |
90314792 JX |
19525 | msgid "size of the window used for delta compression" |
19526 | msgstr "用于增量压缩的窗口值" | |
19527 | ||
349ede6a | 19528 | #: builtin/repack.c:319 builtin/repack.c:325 |
8376b58d JX |
19529 | msgid "bytes" |
19530 | msgstr "字节" | |
19531 | ||
349ede6a | 19532 | #: builtin/repack.c:320 |
90314792 JX |
19533 | msgid "same as the above, but limit memory size instead of entries count" |
19534 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
19535 | ||
349ede6a | 19536 | #: builtin/repack.c:322 |
90314792 JX |
19537 | msgid "limits the maximum delta depth" |
19538 | msgstr "限制最大增量深度" | |
19539 | ||
349ede6a | 19540 | #: builtin/repack.c:324 |
a4f16749 JX |
19541 | msgid "limits the maximum number of threads" |
19542 | msgstr "限制最大线程数" | |
19543 | ||
349ede6a | 19544 | #: builtin/repack.c:326 |
90314792 | 19545 | msgid "maximum size of each packfile" |
dbd6cced | 19546 | msgstr "每个包文件的最大尺寸" |
90314792 | 19547 | |
349ede6a | 19548 | #: builtin/repack.c:328 |
6c94aba5 JX |
19549 | msgid "repack objects in packs marked with .keep" |
19550 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
19551 | ||
349ede6a | 19552 | #: builtin/repack.c:330 |
fd8cb379 JX |
19553 | msgid "do not repack this pack" |
19554 | msgstr "不要对该包文件重新打包" | |
19555 | ||
349ede6a | 19556 | #: builtin/repack.c:340 |
94550ed3 JX |
19557 | msgid "cannot delete packs in a precious-objects repo" |
19558 | msgstr "不能删除珍品仓库中的打包文件" | |
19559 | ||
349ede6a | 19560 | #: builtin/repack.c:344 |
5c57d762 JX |
19561 | msgid "--keep-unreachable and -A are incompatible" |
19562 | msgstr "--keep-unreachable 和 -A 不兼容" | |
19563 | ||
349ede6a | 19564 | #: builtin/repack.c:427 |
06991777 JX |
19565 | msgid "Nothing new to pack." |
19566 | msgstr "没有新的要打包。" | |
19567 | ||
349ede6a | 19568 | #: builtin/repack.c:488 |
06991777 JX |
19569 | #, c-format |
19570 | msgid "" | |
19571 | "WARNING: Some packs in use have been renamed by\n" | |
19572 | "WARNING: prefixing old- to their name, in order to\n" | |
19573 | "WARNING: replace them with the new version of the\n" | |
19574 | "WARNING: file. But the operation failed, and the\n" | |
19575 | "WARNING: attempt to rename them back to their\n" | |
19576 | "WARNING: original names also failed.\n" | |
19577 | "WARNING: Please rename them in %s manually:\n" | |
19578 | msgstr "" | |
19579 | "警告:为了将包文件替换为新版本,一些使用中的包已经\n" | |
19580 | "警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n" | |
19581 | "警告:并且尝试重命名改回原有文件名的操作也失败。\n" | |
19582 | "警告:请手动将 %s 下的这些文件重命名:\n" | |
19583 | ||
349ede6a | 19584 | #: builtin/repack.c:536 |
90314792 | 19585 | #, c-format |
5c57d762 | 19586 | msgid "failed to remove '%s'" |
c1ac5258 | 19587 | msgstr "删除 '%s' 失败" |
90314792 | 19588 | |
fd8cb379 | 19589 | #: builtin/replace.c:22 |
ef317cd5 | 19590 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 19591 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 19592 | |
fd8cb379 | 19593 | #: builtin/replace.c:23 |
6acbf033 JX |
19594 | msgid "git replace [-f] --edit <object>" |
19595 | msgstr "git replace [-f] --edit <对象>" | |
19596 | ||
fd8cb379 | 19597 | #: builtin/replace.c:24 |
6acbf033 JX |
19598 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
19599 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
19600 | ||
fd8cb379 JX |
19601 | #: builtin/replace.c:25 |
19602 | msgid "git replace [-f] --convert-graft-file" | |
19603 | msgstr "git replace [-f] --convert-graft-file" | |
19604 | ||
19605 | #: builtin/replace.c:26 | |
ef317cd5 | 19606 | msgid "git replace -d <object>..." |
07432cef | 19607 | msgstr "git replace -d <对象>..." |
ef317cd5 | 19608 | |
fd8cb379 | 19609 | #: builtin/replace.c:27 |
cfff71a9 JX |
19610 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
19611 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 19612 | |
d46c5519 | 19613 | #: builtin/replace.c:90 |
c1ac5258 JX |
19614 | #, c-format |
19615 | msgid "" | |
19616 | "invalid replace format '%s'\n" | |
19617 | "valid formats are 'short', 'medium' and 'long'" | |
19618 | msgstr "" | |
19619 | "无效的替换格式 '%s'\n" | |
19620 | "有效的格式有 'short'、'medium' 和 'long'" | |
19621 | ||
d46c5519 | 19622 | #: builtin/replace.c:125 |
c1ac5258 JX |
19623 | #, c-format |
19624 | msgid "replace ref '%s' not found" | |
19625 | msgstr "未发现替换引用 '%s'" | |
19626 | ||
d46c5519 | 19627 | #: builtin/replace.c:141 |
c1ac5258 JX |
19628 | #, c-format |
19629 | msgid "Deleted replace ref '%s'" | |
e640d114 | 19630 | msgstr "已删除替换引用 '%s'" |
c1ac5258 | 19631 | |
d46c5519 | 19632 | #: builtin/replace.c:153 |
c1ac5258 JX |
19633 | #, c-format |
19634 | msgid "'%s' is not a valid ref name" | |
19635 | msgstr "'%s' 不是一个有效的引用名" | |
19636 | ||
d46c5519 | 19637 | #: builtin/replace.c:158 |
c1ac5258 JX |
19638 | #, c-format |
19639 | msgid "replace ref '%s' already exists" | |
19640 | msgstr "替换引用 '%s' 已经存在" | |
19641 | ||
d46c5519 | 19642 | #: builtin/replace.c:178 |
c1ac5258 JX |
19643 | #, c-format |
19644 | msgid "" | |
19645 | "Objects must be of the same type.\n" | |
19646 | "'%s' points to a replaced object of type '%s'\n" | |
19647 | "while '%s' points to a replacement object of type '%s'." | |
19648 | msgstr "" | |
19649 | "对象必须属于同一类型。\n" | |
19650 | "'%s' 指向 '%s' 类型的替换对象\n" | |
19651 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
19652 | ||
d46c5519 | 19653 | #: builtin/replace.c:229 |
c1ac5258 JX |
19654 | #, c-format |
19655 | msgid "unable to open %s for writing" | |
19656 | msgstr "无法为写入打开 %s" | |
19657 | ||
d46c5519 | 19658 | #: builtin/replace.c:242 |
c1ac5258 JX |
19659 | msgid "cat-file reported failure" |
19660 | msgstr "cat-file 报告失败" | |
19661 | ||
d46c5519 | 19662 | #: builtin/replace.c:258 |
c1ac5258 JX |
19663 | #, c-format |
19664 | msgid "unable to open %s for reading" | |
19665 | msgstr "无法为读取打开 %s" | |
19666 | ||
d46c5519 | 19667 | #: builtin/replace.c:272 |
c1ac5258 JX |
19668 | msgid "unable to spawn mktree" |
19669 | msgstr "无法启动 mktree" | |
19670 | ||
d46c5519 | 19671 | #: builtin/replace.c:276 |
c1ac5258 JX |
19672 | msgid "unable to read from mktree" |
19673 | msgstr "无法从 mktree 读取" | |
19674 | ||
d46c5519 | 19675 | #: builtin/replace.c:285 |
c1ac5258 JX |
19676 | msgid "mktree reported failure" |
19677 | msgstr "mktree 报告失败" | |
19678 | ||
d46c5519 | 19679 | #: builtin/replace.c:289 |
c1ac5258 JX |
19680 | msgid "mktree did not return an object name" |
19681 | msgstr "mktree 没有返回一个对象名" | |
19682 | ||
d46c5519 | 19683 | #: builtin/replace.c:298 |
c1ac5258 JX |
19684 | #, c-format |
19685 | msgid "unable to fstat %s" | |
19686 | msgstr "无法对 %s 执行 fstat" | |
19687 | ||
d46c5519 | 19688 | #: builtin/replace.c:303 |
c1ac5258 JX |
19689 | msgid "unable to write object to database" |
19690 | msgstr "无法向数据库写入对象" | |
19691 | ||
2b472aae JX |
19692 | #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 |
19693 | #: builtin/replace.c:454 | |
c1ac5258 JX |
19694 | #, c-format |
19695 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
19696 | msgstr "不是一个有效的对象名:'%s'" |
19697 | ||
d46c5519 | 19698 | #: builtin/replace.c:326 |
c1ac5258 JX |
19699 | #, c-format |
19700 | msgid "unable to get object type for %s" | |
19701 | msgstr "无法得到 %s 的对象类型" | |
19702 | ||
d46c5519 | 19703 | #: builtin/replace.c:342 |
c1ac5258 JX |
19704 | msgid "editing object file failed" |
19705 | msgstr "编辑对象文件失败" | |
19706 | ||
d46c5519 | 19707 | #: builtin/replace.c:351 |
c1ac5258 JX |
19708 | #, c-format |
19709 | msgid "new object is the same as the old one: '%s'" | |
19710 | msgstr "新对象和旧对象相同:'%s'" | |
19711 | ||
a5cd71ca | 19712 | #: builtin/replace.c:384 |
d46c5519 JX |
19713 | #, c-format |
19714 | msgid "could not parse %s as a commit" | |
19715 | msgstr "无法将 %s 解析为一个提交" | |
19716 | ||
2b472aae | 19717 | #: builtin/replace.c:416 |
6acbf033 JX |
19718 | #, c-format |
19719 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 19720 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 19721 | |
2b472aae | 19722 | #: builtin/replace.c:418 |
6acbf033 JX |
19723 | #, c-format |
19724 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 19725 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 19726 | |
2b472aae | 19727 | #: builtin/replace.c:430 |
6acbf033 JX |
19728 | #, c-format |
19729 | msgid "" | |
19730 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
19731 | "instead of --graft" | |
55a16ee4 | 19732 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 19733 | |
2b472aae | 19734 | #: builtin/replace.c:469 |
6acbf033 | 19735 | #, c-format |
c1ac5258 JX |
19736 | msgid "the original commit '%s' has a gpg signature" |
19737 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 19738 | |
2b472aae | 19739 | #: builtin/replace.c:470 |
6acbf033 JX |
19740 | msgid "the signature will be removed in the replacement commit!" |
19741 | msgstr "在替换的提交中签名将被移除!" | |
19742 | ||
2b472aae | 19743 | #: builtin/replace.c:480 |
6acbf033 JX |
19744 | #, c-format |
19745 | msgid "could not write replacement commit for: '%s'" | |
19746 | msgstr "不能为 '%s' 写替换提交" | |
19747 | ||
2b472aae | 19748 | #: builtin/replace.c:488 |
c1ac5258 JX |
19749 | #, c-format |
19750 | msgid "graft for '%s' unnecessary" | |
19751 | msgstr "对 '%s' 移植没有必要" | |
19752 | ||
2b472aae | 19753 | #: builtin/replace.c:492 |
c1ac5258 JX |
19754 | #, c-format |
19755 | msgid "new commit is the same as the old one: '%s'" | |
19756 | msgstr "新提交和旧的一样:'%s'" | |
19757 | ||
2b472aae | 19758 | #: builtin/replace.c:527 |
fd8cb379 JX |
19759 | #, c-format |
19760 | msgid "" | |
19761 | "could not convert the following graft(s):\n" | |
19762 | "%s" | |
19763 | msgstr "" | |
19764 | "不能转换下列移植:\n" | |
19765 | "%s" | |
19766 | ||
2b472aae | 19767 | #: builtin/replace.c:548 |
ef317cd5 | 19768 | msgid "list replace refs" |
07432cef | 19769 | msgstr "列出替换的引用" |
ef317cd5 | 19770 | |
2b472aae | 19771 | #: builtin/replace.c:549 |
ef317cd5 | 19772 | msgid "delete replace refs" |
07432cef | 19773 | msgstr "删除替换的引用" |
ef317cd5 | 19774 | |
2b472aae | 19775 | #: builtin/replace.c:550 |
6acbf033 JX |
19776 | msgid "edit existing object" |
19777 | msgstr "编辑现存的对象" | |
19778 | ||
2b472aae | 19779 | #: builtin/replace.c:551 |
6acbf033 JX |
19780 | msgid "change a commit's parents" |
19781 | msgstr "修改一个提交的父提交" | |
19782 | ||
2b472aae | 19783 | #: builtin/replace.c:552 |
fd8cb379 JX |
19784 | msgid "convert existing graft file" |
19785 | msgstr "转换现存的移植文件" | |
19786 | ||
2b472aae | 19787 | #: builtin/replace.c:553 |
ef317cd5 | 19788 | msgid "replace the ref if it exists" |
07432cef | 19789 | msgstr "如果存在则替换引用" |
ef317cd5 | 19790 | |
2b472aae | 19791 | #: builtin/replace.c:555 |
6acbf033 JX |
19792 | msgid "do not pretty-print contents for --edit" |
19793 | msgstr "不要为 --edit 操作美观显示内容" | |
19794 | ||
2b472aae | 19795 | #: builtin/replace.c:556 |
cfff71a9 JX |
19796 | msgid "use this format" |
19797 | msgstr "使用此格式" | |
19798 | ||
2b472aae | 19799 | #: builtin/replace.c:569 |
c1ac5258 | 19800 | msgid "--format cannot be used when not listing" |
e640d114 | 19801 | msgstr "不列出时不能使用 --format" |
c1ac5258 | 19802 | |
2b472aae | 19803 | #: builtin/replace.c:577 |
c1ac5258 JX |
19804 | msgid "-f only makes sense when writing a replacement" |
19805 | msgstr "只有写一个替换时 -f 才有意义" | |
19806 | ||
2b472aae | 19807 | #: builtin/replace.c:581 |
c1ac5258 JX |
19808 | msgid "--raw only makes sense with --edit" |
19809 | msgstr "--raw 只有和 --edit 共用才有意义" | |
19810 | ||
2b472aae | 19811 | #: builtin/replace.c:587 |
c1ac5258 JX |
19812 | msgid "-d needs at least one argument" |
19813 | msgstr "-d 需要至少一个参数" | |
19814 | ||
2b472aae | 19815 | #: builtin/replace.c:593 |
c1ac5258 JX |
19816 | msgid "bad number of arguments" |
19817 | msgstr "错误的参数个数" | |
19818 | ||
2b472aae | 19819 | #: builtin/replace.c:599 |
c1ac5258 | 19820 | msgid "-e needs exactly one argument" |
e640d114 | 19821 | msgstr "-e 需要且仅需要一个参数" |
c1ac5258 | 19822 | |
2b472aae | 19823 | #: builtin/replace.c:605 |
c1ac5258 JX |
19824 | msgid "-g needs at least one argument" |
19825 | msgstr "-g 需要至少一个参数" | |
19826 | ||
2b472aae | 19827 | #: builtin/replace.c:611 |
c1ac5258 JX |
19828 | msgid "--convert-graft-file takes no argument" |
19829 | msgstr "--convert-graft-file 不带参数" | |
19830 | ||
2b472aae | 19831 | #: builtin/replace.c:617 |
c1ac5258 JX |
19832 | msgid "only one pattern can be given with -l" |
19833 | msgstr "只能为 -l 提供一个模式" | |
19834 | ||
a4f16749 | 19835 | #: builtin/rerere.c:13 |
814ff314 JX |
19836 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
19837 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 19838 | |
4c27fcb5 | 19839 | #: builtin/rerere.c:60 |
ef317cd5 | 19840 | msgid "register clean resolutions in index" |
07432cef | 19841 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 19842 | |
4c27fcb5 JX |
19843 | #: builtin/rerere.c:79 |
19844 | msgid "'git rerere forget' without paths is deprecated" | |
19845 | msgstr "没有路径的 'git rerere forget' 已经过时" | |
19846 | ||
06991777 | 19847 | #: builtin/rerere.c:113 |
4c27fcb5 JX |
19848 | #, c-format |
19849 | msgid "unable to generate diff for '%s'" | |
19850 | msgstr "无法为 '%s' 生成差异" | |
19851 | ||
06991777 | 19852 | #: builtin/reset.c:32 |
ef317cd5 JX |
19853 | msgid "" |
19854 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 19855 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 19856 | |
06991777 | 19857 | #: builtin/reset.c:33 |
ddc12c42 JX |
19858 | msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." |
19859 | msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." | |
ef317cd5 | 19860 | |
06991777 | 19861 | #: builtin/reset.c:34 |
ddc12c42 JX |
19862 | msgid "" |
19863 | "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" | |
2b472aae | 19864 | msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]" |
ef317cd5 | 19865 | |
ddc12c42 JX |
19866 | #: builtin/reset.c:35 |
19867 | msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" | |
19868 | msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" | |
19869 | ||
19870 | #: builtin/reset.c:41 | |
c04f5ac3 JX |
19871 | msgid "mixed" |
19872 | msgstr "混杂" | |
19873 | ||
ddc12c42 | 19874 | #: builtin/reset.c:41 |
c04f5ac3 JX |
19875 | msgid "soft" |
19876 | msgstr "软性" | |
19877 | ||
ddc12c42 | 19878 | #: builtin/reset.c:41 |
c04f5ac3 JX |
19879 | msgid "hard" |
19880 | msgstr "硬性" | |
19881 | ||
ddc12c42 | 19882 | #: builtin/reset.c:41 |
8ada9598 JX |
19883 | msgid "merge" |
19884 | msgstr "合并" | |
19885 | ||
ddc12c42 | 19886 | #: builtin/reset.c:41 |
c04f5ac3 JX |
19887 | msgid "keep" |
19888 | msgstr "保持" | |
19889 | ||
349ede6a | 19890 | #: builtin/reset.c:83 |
c04f5ac3 JX |
19891 | msgid "You do not have a valid HEAD." |
19892 | msgstr "您没有一个有效的 HEAD。" | |
19893 | ||
349ede6a | 19894 | #: builtin/reset.c:85 |
c04f5ac3 JX |
19895 | msgid "Failed to find tree of HEAD." |
19896 | msgstr "无法找到 HEAD 指向的树。" | |
19897 | ||
349ede6a | 19898 | #: builtin/reset.c:91 |
c04f5ac3 JX |
19899 | #, c-format |
19900 | msgid "Failed to find tree of %s." | |
19901 | msgstr "无法找到 %s 指向的树。" | |
19902 | ||
349ede6a | 19903 | #: builtin/reset.c:116 |
a5cd71ca JX |
19904 | #, c-format |
19905 | msgid "HEAD is now at %s" | |
19906 | msgstr "HEAD 现在位于 %s" | |
19907 | ||
90e6ef53 | 19908 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 19909 | #: builtin/reset.c:195 |
c04f5ac3 JX |
19910 | #, c-format |
19911 | msgid "Cannot do a %s reset in the middle of a merge." | |
19912 | msgstr "在合并过程中不能做%s重置操作。" | |
19913 | ||
349ede6a | 19914 | #: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 |
2b472aae | 19915 | #: builtin/stash.c:619 |
ef317cd5 | 19916 | msgid "be quiet, only report errors" |
07432cef | 19917 | msgstr "安静模式,只报告错误" |
ef317cd5 | 19918 | |
349ede6a | 19919 | #: builtin/reset.c:297 |
ef317cd5 | 19920 | msgid "reset HEAD and index" |
07432cef | 19921 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 19922 | |
349ede6a | 19923 | #: builtin/reset.c:298 |
ef317cd5 | 19924 | msgid "reset only HEAD" |
07432cef | 19925 | msgstr "只重置 HEAD" |
ef317cd5 | 19926 | |
349ede6a | 19927 | #: builtin/reset.c:300 builtin/reset.c:302 |
ef317cd5 | 19928 | msgid "reset HEAD, index and working tree" |
07432cef | 19929 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 19930 | |
349ede6a | 19931 | #: builtin/reset.c:304 |
ef317cd5 | 19932 | msgid "reset HEAD but keep local changes" |
07432cef | 19933 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 19934 | |
349ede6a | 19935 | #: builtin/reset.c:310 |
6c94aba5 JX |
19936 | msgid "record only the fact that removed paths will be added later" |
19937 | msgstr "将删除的路径标记为稍后添加" | |
19938 | ||
349ede6a | 19939 | #: builtin/reset.c:344 |
07432cef WS |
19940 | #, c-format |
19941 | msgid "Failed to resolve '%s' as a valid revision." | |
19942 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
19943 | ||
349ede6a | 19944 | #: builtin/reset.c:352 |
07432cef WS |
19945 | #, c-format |
19946 | msgid "Failed to resolve '%s' as a valid tree." | |
19947 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
19948 | ||
349ede6a | 19949 | #: builtin/reset.c:361 |
c04f5ac3 | 19950 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 19951 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 19952 | |
349ede6a | 19953 | #: builtin/reset.c:371 |
c04f5ac3 | 19954 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 19955 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 19956 | |
90e6ef53 | 19957 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 19958 | #: builtin/reset.c:373 |
c04f5ac3 JX |
19959 | #, c-format |
19960 | msgid "Cannot do %s reset with paths." | |
19961 | msgstr "不能带路径进行%s重置。" | |
19962 | ||
90e6ef53 | 19963 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 19964 | #: builtin/reset.c:388 |
c04f5ac3 JX |
19965 | #, c-format |
19966 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 19967 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 19968 | |
349ede6a | 19969 | #: builtin/reset.c:392 |
6c94aba5 JX |
19970 | msgid "-N can only be used with --mixed" |
19971 | msgstr "-N 只能和 --mixed 同时使用" | |
19972 | ||
349ede6a | 19973 | #: builtin/reset.c:413 |
90314792 | 19974 | msgid "Unstaged changes after reset:" |
160fb2b2 | 19975 | msgstr "重置后取消暂存的变更:" |
90314792 | 19976 | |
349ede6a | 19977 | #: builtin/reset.c:416 |
4c27fcb5 JX |
19978 | #, c-format |
19979 | msgid "" | |
19980 | "\n" | |
19981 | "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" | |
19982 | "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" | |
19983 | "to make this the default.\n" | |
19984 | msgstr "" | |
19985 | "\n" | |
19986 | "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" | |
19987 | "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" | |
19988 | ||
349ede6a | 19989 | #: builtin/reset.c:434 |
ef317cd5 JX |
19990 | #, c-format |
19991 | msgid "Could not reset index file to revision '%s'." | |
19992 | msgstr "不能重置索引文件至版本 '%s'。" | |
19993 | ||
349ede6a | 19994 | #: builtin/reset.c:439 |
07432cef WS |
19995 | msgid "Could not write new index file." |
19996 | msgstr "不能写入新的索引文件。" | |
19997 | ||
2b472aae | 19998 | #: builtin/rev-list.c:499 |
31e5e17b JX |
19999 | msgid "cannot combine --exclude-promisor-objects and --missing" |
20000 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
20001 | ||
2b472aae | 20002 | #: builtin/rev-list.c:560 |
5809aa05 JX |
20003 | msgid "object filtering requires --objects" |
20004 | msgstr "对象过滤需要 --objects" | |
20005 | ||
2b472aae | 20006 | #: builtin/rev-list.c:610 |
1b7f4a34 JX |
20007 | msgid "rev-list does not support display of notes" |
20008 | msgstr "rev-list 不支持显示注解" | |
20009 | ||
2b472aae JX |
20010 | #: builtin/rev-list.c:615 |
20011 | msgid "marked counting is incompatible with --objects" | |
20012 | msgstr "标记计数和 --objects 不兼容" | |
5809aa05 | 20013 | |
349ede6a | 20014 | #: builtin/rev-parse.c:409 |
814ff314 JX |
20015 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
20016 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 20017 | |
349ede6a | 20018 | #: builtin/rev-parse.c:414 |
ef317cd5 | 20019 | msgid "keep the `--` passed as an arg" |
07432cef | 20020 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 20021 | |
349ede6a | 20022 | #: builtin/rev-parse.c:416 |
ef317cd5 | 20023 | msgid "stop parsing after the first non-option argument" |
07432cef | 20024 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 20025 | |
349ede6a | 20026 | #: builtin/rev-parse.c:419 |
cfff71a9 JX |
20027 | msgid "output in stuck long form" |
20028 | msgstr "以固定长格式输出" | |
20029 | ||
349ede6a | 20030 | #: builtin/rev-parse.c:552 |
ef317cd5 | 20031 | msgid "" |
814ff314 | 20032 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 20033 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 20034 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
20035 | "\n" |
20036 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
20037 | msgstr "" | |
814ff314 | 20038 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 20039 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 20040 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
20041 | "\n" |
20042 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 20043 | |
c1ac5258 | 20044 | #: builtin/revert.c:24 |
814ff314 JX |
20045 | msgid "git revert [<options>] <commit-ish>..." |
20046 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 20047 | |
c1ac5258 | 20048 | #: builtin/revert.c:25 |
ef317cd5 | 20049 | msgid "git revert <subcommand>" |
07432cef | 20050 | msgstr "git revert <子命令>" |
ef317cd5 | 20051 | |
c1ac5258 | 20052 | #: builtin/revert.c:30 |
814ff314 JX |
20053 | msgid "git cherry-pick [<options>] <commit-ish>..." |
20054 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 20055 | |
c1ac5258 | 20056 | #: builtin/revert.c:31 |
ef317cd5 | 20057 | msgid "git cherry-pick <subcommand>" |
07432cef | 20058 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 20059 | |
06991777 JX |
20060 | #: builtin/revert.c:72 |
20061 | #, c-format | |
20062 | msgid "option `%s' expects a number greater than zero" | |
20063 | msgstr "选项 `%s' 期望一个大于零的数字" | |
20064 | ||
20065 | #: builtin/revert.c:92 | |
ef317cd5 JX |
20066 | #, c-format |
20067 | msgid "%s: %s cannot be used with %s" | |
20068 | msgstr "%s:%s 不能和 %s 同时使用" | |
20069 | ||
d46c5519 | 20070 | #: builtin/revert.c:102 |
ef317cd5 | 20071 | msgid "end revert or cherry-pick sequence" |
07432cef | 20072 | msgstr "终止反转或拣选操作" |
ef317cd5 | 20073 | |
d46c5519 | 20074 | #: builtin/revert.c:103 |
ef317cd5 | 20075 | msgid "resume revert or cherry-pick sequence" |
07432cef | 20076 | msgstr "继续反转或拣选操作" |
ef317cd5 | 20077 | |
d46c5519 | 20078 | #: builtin/revert.c:104 |
ef317cd5 | 20079 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 20080 | msgstr "取消反转或拣选操作" |
ef317cd5 | 20081 | |
a6cd2cc4 JX |
20082 | #: builtin/revert.c:105 |
20083 | msgid "skip current commit and continue" | |
20084 | msgstr "跳过当前提交并继续" | |
20085 | ||
20086 | #: builtin/revert.c:107 | |
ef317cd5 | 20087 | msgid "don't automatically commit" |
07432cef | 20088 | msgstr "不要自动提交" |
ef317cd5 | 20089 | |
a6cd2cc4 | 20090 | #: builtin/revert.c:108 |
ef317cd5 | 20091 | msgid "edit the commit message" |
07432cef | 20092 | msgstr "编辑提交说明" |
ef317cd5 | 20093 | |
a6cd2cc4 | 20094 | #: builtin/revert.c:111 |
87cb7997 | 20095 | msgid "parent-number" |
07432cef | 20096 | msgstr "父编号" |
ef317cd5 | 20097 | |
a6cd2cc4 | 20098 | #: builtin/revert.c:112 |
87cb7997 JX |
20099 | msgid "select mainline parent" |
20100 | msgstr "选择主干父提交编号" | |
20101 | ||
a6cd2cc4 | 20102 | #: builtin/revert.c:114 |
ef317cd5 | 20103 | msgid "merge strategy" |
07432cef | 20104 | msgstr "合并策略" |
ef317cd5 | 20105 | |
a6cd2cc4 | 20106 | #: builtin/revert.c:116 |
ef317cd5 | 20107 | msgid "option for merge strategy" |
07432cef | 20108 | msgstr "合并策略的选项" |
ef317cd5 | 20109 | |
a6cd2cc4 | 20110 | #: builtin/revert.c:125 |
ef317cd5 | 20111 | msgid "append commit name" |
07432cef | 20112 | msgstr "追加提交名称" |
ef317cd5 | 20113 | |
a6cd2cc4 | 20114 | #: builtin/revert.c:127 |
ef317cd5 | 20115 | msgid "preserve initially empty commits" |
07432cef | 20116 | msgstr "保留初始化的空提交" |
ef317cd5 | 20117 | |
a6cd2cc4 | 20118 | #: builtin/revert.c:129 |
ef317cd5 | 20119 | msgid "keep redundant, empty commits" |
07432cef | 20120 | msgstr "保持多余的、空的提交" |
ef317cd5 | 20121 | |
a6cd2cc4 | 20122 | #: builtin/revert.c:232 |
c04f5ac3 JX |
20123 | msgid "revert failed" |
20124 | msgstr "还原失败" | |
20125 | ||
a6cd2cc4 | 20126 | #: builtin/revert.c:245 |
c04f5ac3 JX |
20127 | msgid "cherry-pick failed" |
20128 | msgstr "拣选失败" | |
20129 | ||
06991777 | 20130 | #: builtin/rm.c:19 |
814ff314 JX |
20131 | msgid "git rm [<options>] [--] <file>..." |
20132 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 20133 | |
06991777 | 20134 | #: builtin/rm.c:207 |
c04f5ac3 | 20135 | msgid "" |
2e8451e8 JX |
20136 | "the following file has staged content different from both the\n" |
20137 | "file and the HEAD:" | |
20138 | msgid_plural "" | |
20139 | "the following files have staged content different from both the\n" | |
20140 | "file and the HEAD:" | |
20141 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
20142 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
20143 | ||
06991777 | 20144 | #: builtin/rm.c:212 |
2e8451e8 JX |
20145 | msgid "" |
20146 | "\n" | |
c04f5ac3 JX |
20147 | "(use -f to force removal)" |
20148 | msgstr "" | |
2e8451e8 | 20149 | "\n" |
c04f5ac3 JX |
20150 | "(使用 -f 强制删除)" |
20151 | ||
06991777 | 20152 | #: builtin/rm.c:216 |
2e8451e8 JX |
20153 | msgid "the following file has changes staged in the index:" |
20154 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
20155 | msgstr[0] "下列文件索引中有变更" |
20156 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 20157 | |
06991777 | 20158 | #: builtin/rm.c:220 builtin/rm.c:229 |
c04f5ac3 | 20159 | msgid "" |
2e8451e8 | 20160 | "\n" |
c04f5ac3 JX |
20161 | "(use --cached to keep the file, or -f to force removal)" |
20162 | msgstr "" | |
2e8451e8 JX |
20163 | "\n" |
20164 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
20165 | ||
06991777 | 20166 | #: builtin/rm.c:226 |
2e8451e8 JX |
20167 | msgid "the following file has local modifications:" |
20168 | msgid_plural "the following files have local modifications:" | |
20169 | msgstr[0] "如下文件有本地修改:" | |
20170 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 20171 | |
2b472aae | 20172 | #: builtin/rm.c:243 |
ef317cd5 | 20173 | msgid "do not list removed files" |
07432cef | 20174 | msgstr "不列出删除的文件" |
ef317cd5 | 20175 | |
2b472aae | 20176 | #: builtin/rm.c:244 |
ef317cd5 | 20177 | msgid "only remove from the index" |
07432cef | 20178 | msgstr "只从索引区删除" |
ef317cd5 | 20179 | |
2b472aae | 20180 | #: builtin/rm.c:245 |
ef317cd5 | 20181 | msgid "override the up-to-date check" |
07432cef | 20182 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 20183 | |
2b472aae | 20184 | #: builtin/rm.c:246 |
ef317cd5 | 20185 | msgid "allow recursive removal" |
07432cef | 20186 | msgstr "允许递归删除" |
ef317cd5 | 20187 | |
2b472aae | 20188 | #: builtin/rm.c:248 |
ef317cd5 | 20189 | msgid "exit with a zero status even if nothing matched" |
07432cef | 20190 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 20191 | |
2b472aae JX |
20192 | #: builtin/rm.c:282 |
20193 | msgid "No pathspec was given. Which files should I remove?" | |
440e7442 | 20194 | msgstr "没有提供路径规格。我应该删除哪些文件?" |
2b472aae JX |
20195 | |
20196 | #: builtin/rm.c:305 | |
c1ac5258 JX |
20197 | msgid "please stage your changes to .gitmodules or stash them to proceed" |
20198 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
20199 | ||
2b472aae | 20200 | #: builtin/rm.c:323 |
c04f5ac3 JX |
20201 | #, c-format |
20202 | msgid "not removing '%s' recursively without -r" | |
20203 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
20204 | ||
2b472aae | 20205 | #: builtin/rm.c:362 |
c04f5ac3 JX |
20206 | #, c-format |
20207 | msgid "git rm: unable to remove %s" | |
20208 | msgstr "git rm:不能删除 %s" | |
20209 | ||
fd8cb379 | 20210 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
20211 | msgid "" |
20212 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
20213 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
20214 | "[<ref>...]\n" | |
20215 | " --all and explicit <ref> specification are mutually exclusive." | |
20216 | msgstr "" | |
20217 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
20218 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
20219 | " --all 和明确的 <引用> 互斥。" | |
20220 | ||
fd8cb379 | 20221 | #: builtin/send-pack.c:163 |
1b7f4a34 JX |
20222 | msgid "remote name" |
20223 | msgstr "远程名称" | |
20224 | ||
349ede6a | 20225 | #: builtin/send-pack.c:176 |
1b7f4a34 JX |
20226 | msgid "use stateless RPC protocol" |
20227 | msgstr "使用无状态的 RPC 协议" | |
20228 | ||
349ede6a | 20229 | #: builtin/send-pack.c:177 |
1b7f4a34 JX |
20230 | msgid "read refs from stdin" |
20231 | msgstr "从标准输入读取引用" | |
20232 | ||
349ede6a | 20233 | #: builtin/send-pack.c:178 |
1b7f4a34 JX |
20234 | msgid "print status from remote helper" |
20235 | msgstr "打印来自远程 helper 的状态" | |
20236 | ||
a4f16749 | 20237 | #: builtin/shortlog.c:14 |
fd8cb379 JX |
20238 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
20239 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
20240 | ||
20241 | #: builtin/shortlog.c:15 | |
20242 | msgid "git log --pretty=short | git shortlog [<options>]" | |
20243 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 20244 | |
fd8cb379 | 20245 | #: builtin/shortlog.c:264 |
1a79b2f1 JX |
20246 | msgid "Group by committer rather than author" |
20247 | msgstr "按照提交者分组而不是作者" | |
20248 | ||
fd8cb379 | 20249 | #: builtin/shortlog.c:266 |
ef317cd5 | 20250 | msgid "sort output according to the number of commits per author" |
07432cef | 20251 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 20252 | |
fd8cb379 | 20253 | #: builtin/shortlog.c:268 |
ef317cd5 | 20254 | msgid "Suppress commit descriptions, only provides commit count" |
07432cef | 20255 | msgstr "隐藏提交说明,只提供提交数量" |
ef317cd5 | 20256 | |
fd8cb379 | 20257 | #: builtin/shortlog.c:270 |
ef317cd5 | 20258 | msgid "Show the email address of each author" |
07432cef | 20259 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 20260 | |
fd8cb379 | 20261 | #: builtin/shortlog.c:271 |
c1ac5258 JX |
20262 | msgid "<w>[,<i1>[,<i2>]]" |
20263 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 20264 | |
fd8cb379 | 20265 | #: builtin/shortlog.c:272 |
ef317cd5 | 20266 | msgid "Linewrap output" |
07432cef | 20267 | msgstr "折行输出" |
ef317cd5 | 20268 | |
06991777 | 20269 | #: builtin/shortlog.c:301 |
fd8cb379 JX |
20270 | msgid "too many arguments given outside repository" |
20271 | msgstr "仓库外执行提供了太多的参数" | |
20272 | ||
c1ac5258 | 20273 | #: builtin/show-branch.c:13 |
ef317cd5 | 20274 | msgid "" |
814ff314 | 20275 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
20276 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
20277 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
20278 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 20279 | msgstr "" |
814ff314 | 20280 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
20281 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
20282 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
20283 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 20284 | |
c1ac5258 | 20285 | #: builtin/show-branch.c:17 |
814ff314 | 20286 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 20287 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 20288 | |
c1ac5258 | 20289 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
20290 | #, c-format |
20291 | msgid "ignoring %s; cannot handle more than %d ref" | |
20292 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
20293 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
20294 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
20295 | ||
a6cd2cc4 | 20296 | #: builtin/show-branch.c:548 |
a0b6b246 JX |
20297 | #, c-format |
20298 | msgid "no matching refs with %s" | |
20299 | msgstr "没有和 %s 匹配的引用" | |
20300 | ||
a6cd2cc4 | 20301 | #: builtin/show-branch.c:645 |
ef317cd5 | 20302 | msgid "show remote-tracking and local branches" |
07432cef | 20303 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 20304 | |
a6cd2cc4 | 20305 | #: builtin/show-branch.c:647 |
ef317cd5 | 20306 | msgid "show remote-tracking branches" |
07432cef | 20307 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 20308 | |
a6cd2cc4 | 20309 | #: builtin/show-branch.c:649 |
ef317cd5 | 20310 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 20311 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 20312 | |
a6cd2cc4 | 20313 | #: builtin/show-branch.c:651 |
ef317cd5 | 20314 | msgid "show <n> more commits after the common ancestor" |
07432cef | 20315 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 20316 | |
a6cd2cc4 | 20317 | #: builtin/show-branch.c:653 |
ef317cd5 | 20318 | msgid "synonym to more=-1" |
07432cef | 20319 | msgstr "和 more=-1 同义" |
ef317cd5 | 20320 | |
a6cd2cc4 | 20321 | #: builtin/show-branch.c:654 |
ef317cd5 | 20322 | msgid "suppress naming strings" |
07432cef | 20323 | msgstr "不显示字符串命名" |
ef317cd5 | 20324 | |
a6cd2cc4 | 20325 | #: builtin/show-branch.c:656 |
ef317cd5 | 20326 | msgid "include the current branch" |
07432cef | 20327 | msgstr "包括当前分支" |
ef317cd5 | 20328 | |
a6cd2cc4 | 20329 | #: builtin/show-branch.c:658 |
ef317cd5 | 20330 | msgid "name commits with their object names" |
07432cef | 20331 | msgstr "以对象名字命名提交" |
ef317cd5 | 20332 | |
a6cd2cc4 | 20333 | #: builtin/show-branch.c:660 |
ef317cd5 | 20334 | msgid "show possible merge bases" |
07432cef | 20335 | msgstr "显示可能合并的基线" |
ef317cd5 | 20336 | |
a6cd2cc4 | 20337 | #: builtin/show-branch.c:662 |
ef317cd5 | 20338 | msgid "show refs unreachable from any other ref" |
07432cef | 20339 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 20340 | |
a6cd2cc4 | 20341 | #: builtin/show-branch.c:664 |
ef317cd5 | 20342 | msgid "show commits in topological order" |
07432cef | 20343 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 20344 | |
a6cd2cc4 | 20345 | #: builtin/show-branch.c:667 |
ef317cd5 | 20346 | msgid "show only commits not on the first branch" |
07432cef | 20347 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 20348 | |
a6cd2cc4 | 20349 | #: builtin/show-branch.c:669 |
ef317cd5 | 20350 | msgid "show merges reachable from only one tip" |
07432cef | 20351 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 20352 | |
a6cd2cc4 | 20353 | #: builtin/show-branch.c:671 |
2e8451e8 JX |
20354 | msgid "topologically sort, maintaining date order where possible" |
20355 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 20356 | |
a6cd2cc4 | 20357 | #: builtin/show-branch.c:674 |
ef317cd5 | 20358 | msgid "<n>[,<base>]" |
07432cef | 20359 | msgstr "<n>[,<base>]" |
ef317cd5 | 20360 | |
a6cd2cc4 | 20361 | #: builtin/show-branch.c:675 |
ef317cd5 | 20362 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 20363 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 20364 | |
a6cd2cc4 | 20365 | #: builtin/show-branch.c:711 |
a0b6b246 JX |
20366 | msgid "" |
20367 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
20368 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
20369 | ||
a6cd2cc4 | 20370 | #: builtin/show-branch.c:735 |
a0b6b246 JX |
20371 | msgid "no branches given, and HEAD is not valid" |
20372 | msgstr "未提供分支,且 HEAD 无效" | |
20373 | ||
a6cd2cc4 | 20374 | #: builtin/show-branch.c:738 |
a0b6b246 JX |
20375 | msgid "--reflog option needs one branch name" |
20376 | msgstr "选项 --reflog 需要一个分支名" | |
20377 | ||
a6cd2cc4 | 20378 | #: builtin/show-branch.c:741 |
a0b6b246 JX |
20379 | #, c-format |
20380 | msgid "only %d entry can be shown at one time." | |
20381 | msgid_plural "only %d entries can be shown at one time." | |
20382 | msgstr[0] "一次只能显示 %d 个条目。" | |
20383 | msgstr[1] "一次只能显示 %d 个条目。" | |
20384 | ||
a6cd2cc4 | 20385 | #: builtin/show-branch.c:745 |
a0b6b246 JX |
20386 | #, c-format |
20387 | msgid "no such ref %s" | |
20388 | msgstr "无此引用 %s" | |
20389 | ||
a6cd2cc4 | 20390 | #: builtin/show-branch.c:831 |
a0b6b246 JX |
20391 | #, c-format |
20392 | msgid "cannot handle more than %d rev." | |
20393 | msgid_plural "cannot handle more than %d revs." | |
20394 | msgstr[0] "不能处理 %d 个以上的版本。" | |
20395 | msgstr[1] "不能处理 %d 个以上的版本。" | |
20396 | ||
a6cd2cc4 | 20397 | #: builtin/show-branch.c:835 |
a0b6b246 JX |
20398 | #, c-format |
20399 | msgid "'%s' is not a valid ref." | |
20400 | msgstr "'%s' 不是一个有效的引用。" | |
20401 | ||
a6cd2cc4 | 20402 | #: builtin/show-branch.c:838 |
a0b6b246 JX |
20403 | #, c-format |
20404 | msgid "cannot find commit %s (%s)" | |
29004bbb | 20405 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 20406 | |
7157c2b5 JX |
20407 | #: builtin/show-index.c:21 |
20408 | msgid "hash-algorithm" | |
20409 | msgstr "哈希算法" | |
20410 | ||
20411 | #: builtin/show-index.c:31 | |
20412 | msgid "Unknown hash algorithm" | |
20413 | msgstr "未知的哈希算法" | |
20414 | ||
d46c5519 | 20415 | #: builtin/show-ref.c:12 |
ef317cd5 | 20416 | msgid "" |
814ff314 JX |
20417 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
20418 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 20419 | msgstr "" |
814ff314 JX |
20420 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
20421 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 20422 | |
d46c5519 | 20423 | #: builtin/show-ref.c:13 |
94550ed3 JX |
20424 | msgid "git show-ref --exclude-existing[=<pattern>]" |
20425 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 20426 | |
d46c5519 | 20427 | #: builtin/show-ref.c:162 |
ef317cd5 | 20428 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 20429 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 20430 | |
d46c5519 | 20431 | #: builtin/show-ref.c:163 |
ef317cd5 | 20432 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 20433 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 20434 | |
d46c5519 | 20435 | #: builtin/show-ref.c:164 |
ef317cd5 | 20436 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 20437 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 20438 | |
d46c5519 | 20439 | #: builtin/show-ref.c:167 builtin/show-ref.c:169 |
2e8451e8 JX |
20440 | msgid "show the HEAD reference, even if it would be filtered out" |
20441 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 20442 | |
d46c5519 | 20443 | #: builtin/show-ref.c:171 |
ef317cd5 | 20444 | msgid "dereference tags into object IDs" |
4375c10e | 20445 | msgstr "转换标签到对象 ID" |
ef317cd5 | 20446 | |
d46c5519 JX |
20447 | #: builtin/show-ref.c:173 |
20448 | msgid "only show SHA1 hash using <n> digits" | |
20449 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" | |
20450 | ||
20451 | #: builtin/show-ref.c:177 | |
20452 | msgid "do not print results to stdout (useful with --verify)" | |
20453 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" | |
20454 | ||
20455 | #: builtin/show-ref.c:179 | |
20456 | msgid "show refs from stdin that aren't in local repository" | |
20457 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" | |
20458 | ||
2b472aae | 20459 | #: builtin/sparse-checkout.c:21 |
349ede6a JX |
20460 | msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" |
20461 | msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" | |
ddc12c42 | 20462 | |
2b472aae | 20463 | #: builtin/sparse-checkout.c:64 |
ddc12c42 JX |
20464 | msgid "this worktree is not sparse (sparse-checkout file may not exist)" |
20465 | msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)" | |
20466 | ||
7157c2b5 | 20467 | #: builtin/sparse-checkout.c:216 |
2b472aae JX |
20468 | msgid "failed to create directory for sparse-checkout file" |
20469 | msgstr "无法为稀疏检出文件创建目录" | |
20470 | ||
7157c2b5 JX |
20471 | #: builtin/sparse-checkout.c:257 |
20472 | msgid "unable to upgrade repository format to enable worktreeConfig" | |
20473 | msgstr "无法升级仓库格式以启用 worktreeConfig" | |
20474 | ||
20475 | #: builtin/sparse-checkout.c:259 | |
ddc12c42 JX |
20476 | msgid "failed to set extensions.worktreeConfig setting" |
20477 | msgstr "无法设置 extensions.worktreeConfig" | |
20478 | ||
7157c2b5 | 20479 | #: builtin/sparse-checkout.c:276 |
ddc12c42 JX |
20480 | msgid "git sparse-checkout init [--cone]" |
20481 | msgstr "git sparse-checkout init [--cone]" | |
20482 | ||
7157c2b5 | 20483 | #: builtin/sparse-checkout.c:295 |
ddc12c42 JX |
20484 | msgid "initialize the sparse-checkout in cone mode" |
20485 | msgstr "初始化稀疏检出为 cone 模式" | |
20486 | ||
7157c2b5 | 20487 | #: builtin/sparse-checkout.c:332 |
ddc12c42 JX |
20488 | #, c-format |
20489 | msgid "failed to open '%s'" | |
20490 | msgstr "无法打开 '%s'" | |
20491 | ||
7157c2b5 | 20492 | #: builtin/sparse-checkout.c:389 |
2b472aae JX |
20493 | #, c-format |
20494 | msgid "could not normalize path %s" | |
20495 | msgstr "无法规范化路径 %s" | |
20496 | ||
7157c2b5 | 20497 | #: builtin/sparse-checkout.c:401 |
2b472aae JX |
20498 | msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" |
20499 | msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" | |
20500 | ||
7157c2b5 | 20501 | #: builtin/sparse-checkout.c:426 |
2b472aae JX |
20502 | #, c-format |
20503 | msgid "unable to unquote C-style string '%s'" | |
440e7442 | 20504 | msgstr "无法为 C 语言风格的字符串 '%s' 去引号" |
2b472aae | 20505 | |
7157c2b5 | 20506 | #: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 |
2b472aae JX |
20507 | msgid "unable to load existing sparse-checkout patterns" |
20508 | msgstr "无法加载现存的稀疏检出模式" | |
ddc12c42 | 20509 | |
7157c2b5 | 20510 | #: builtin/sparse-checkout.c:549 |
ddc12c42 JX |
20511 | msgid "read patterns from standard in" |
20512 | msgstr "从标准输入读取模式" | |
20513 | ||
7157c2b5 | 20514 | #: builtin/sparse-checkout.c:586 |
ddc12c42 JX |
20515 | msgid "error while refreshing working directory" |
20516 | msgstr "刷新工作目录时出错" | |
20517 | ||
2b472aae | 20518 | #: builtin/stash.c:22 builtin/stash.c:38 |
d46c5519 JX |
20519 | msgid "git stash list [<options>]" |
20520 | msgstr "git stash list [<选项>]" | |
20521 | ||
2b472aae | 20522 | #: builtin/stash.c:23 builtin/stash.c:43 |
d46c5519 JX |
20523 | msgid "git stash show [<options>] [<stash>]" |
20524 | msgstr "git stash show [<选项>] [<stash>]" | |
20525 | ||
2b472aae | 20526 | #: builtin/stash.c:24 builtin/stash.c:48 |
d46c5519 JX |
20527 | msgid "git stash drop [-q|--quiet] [<stash>]" |
20528 | msgstr "git stash drop [-q|--quiet] [<stash>]" | |
20529 | ||
20530 | #: builtin/stash.c:25 | |
20531 | msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
20532 | msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
20533 | ||
2b472aae | 20534 | #: builtin/stash.c:26 builtin/stash.c:63 |
d46c5519 JX |
20535 | msgid "git stash branch <branchname> [<stash>]" |
20536 | msgstr "git stash branch <分支名> [<stash>]" | |
20537 | ||
2b472aae | 20538 | #: builtin/stash.c:27 builtin/stash.c:68 |
d46c5519 JX |
20539 | msgid "git stash clear" |
20540 | msgstr "git stash clear" | |
20541 | ||
2b472aae | 20542 | #: builtin/stash.c:28 |
d46c5519 JX |
20543 | msgid "" |
20544 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20545 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
2b472aae | 20546 | " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" |
d46c5519 JX |
20547 | " [--] [<pathspec>...]]" |
20548 | msgstr "" | |
20549 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20550 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
2b472aae | 20551 | " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" |
d46c5519 JX |
20552 | " [--] [<路径规格>...]]" |
20553 | ||
2b472aae | 20554 | #: builtin/stash.c:32 builtin/stash.c:85 |
d46c5519 JX |
20555 | msgid "" |
20556 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20557 | " [-u|--include-untracked] [-a|--all] [<message>]" | |
20558 | msgstr "" | |
20559 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20560 | " [-u|--include-untracked] [-a|--all] [<消息>]" | |
20561 | ||
2b472aae | 20562 | #: builtin/stash.c:53 |
d46c5519 JX |
20563 | msgid "git stash pop [--index] [-q|--quiet] [<stash>]" |
20564 | msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" | |
20565 | ||
2b472aae | 20566 | #: builtin/stash.c:58 |
d46c5519 JX |
20567 | msgid "git stash apply [--index] [-q|--quiet] [<stash>]" |
20568 | msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" | |
20569 | ||
2b472aae | 20570 | #: builtin/stash.c:73 |
d46c5519 JX |
20571 | msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" |
20572 | msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" | |
20573 | ||
2b472aae JX |
20574 | #: builtin/stash.c:78 |
20575 | msgid "" | |
20576 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20577 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
20578 | " [--] [<pathspec>...]]" | |
20579 | msgstr "" | |
20580 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
20581 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
20582 | " [--] [<路径规格>...]]" | |
20583 | ||
20584 | #: builtin/stash.c:128 | |
d46c5519 JX |
20585 | #, c-format |
20586 | msgid "'%s' is not a stash-like commit" | |
20587 | msgstr "'%s' 不像是一个贮藏提交" | |
20588 | ||
2b472aae | 20589 | #: builtin/stash.c:148 |
d46c5519 JX |
20590 | #, c-format |
20591 | msgid "Too many revisions specified:%s" | |
20592 | msgstr "指定了太多的版本:%s" | |
20593 | ||
349ede6a | 20594 | #: builtin/stash.c:162 |
d46c5519 JX |
20595 | msgid "No stash entries found." |
20596 | msgstr "未发现贮藏条目。" | |
20597 | ||
2b472aae | 20598 | #: builtin/stash.c:176 |
d46c5519 JX |
20599 | #, c-format |
20600 | msgid "%s is not a valid reference" | |
20601 | msgstr "%s 不是一个有效的引用名" | |
20602 | ||
349ede6a | 20603 | #: builtin/stash.c:225 |
d46c5519 JX |
20604 | msgid "git stash clear with parameters is unimplemented" |
20605 | msgstr "git stash clear 不支持参数" | |
20606 | ||
2b472aae | 20607 | #: builtin/stash.c:404 |
d46c5519 | 20608 | msgid "cannot apply a stash in the middle of a merge" |
349ede6a | 20609 | msgstr "无法在合并过程中应用贮藏" |
d46c5519 | 20610 | |
2b472aae | 20611 | #: builtin/stash.c:415 |
d46c5519 JX |
20612 | #, c-format |
20613 | msgid "could not generate diff %s^!." | |
20614 | msgstr "无法生成差异 %s^!." | |
20615 | ||
2b472aae | 20616 | #: builtin/stash.c:422 |
d46c5519 JX |
20617 | msgid "conflicts in index.Try without --index." |
20618 | msgstr "索引中有冲突。尝试不用 --index。" | |
20619 | ||
2b472aae | 20620 | #: builtin/stash.c:428 |
d46c5519 JX |
20621 | msgid "could not save index tree" |
20622 | msgstr "不能保存索引树" | |
20623 | ||
2b472aae | 20624 | #: builtin/stash.c:437 |
d46c5519 JX |
20625 | msgid "could not restore untracked files from stash" |
20626 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
20627 | ||
2b472aae | 20628 | #: builtin/stash.c:451 |
d46c5519 JX |
20629 | #, c-format |
20630 | msgid "Merging %s with %s" | |
20631 | msgstr "正在合并 %s 和 %s" | |
20632 | ||
349ede6a | 20633 | #: builtin/stash.c:461 |
d46c5519 JX |
20634 | msgid "Index was not unstashed." |
20635 | msgstr "索引未从贮藏中恢复。" | |
20636 | ||
2b472aae | 20637 | #: builtin/stash.c:522 builtin/stash.c:621 |
d46c5519 JX |
20638 | msgid "attempt to recreate the index" |
20639 | msgstr "尝试重建索引" | |
20640 | ||
2b472aae | 20641 | #: builtin/stash.c:555 |
d46c5519 JX |
20642 | #, c-format |
20643 | msgid "Dropped %s (%s)" | |
20644 | msgstr "丢弃了 %s(%s)" | |
20645 | ||
2b472aae | 20646 | #: builtin/stash.c:558 |
d46c5519 JX |
20647 | #, c-format |
20648 | msgid "%s: Could not drop stash entry" | |
20649 | msgstr "%s:无法丢弃贮藏条目" | |
20650 | ||
2b472aae | 20651 | #: builtin/stash.c:583 |
d46c5519 JX |
20652 | #, c-format |
20653 | msgid "'%s' is not a stash reference" | |
20654 | msgstr "'%s' 不是一个贮藏引用" | |
20655 | ||
349ede6a | 20656 | #: builtin/stash.c:633 |
d46c5519 JX |
20657 | msgid "The stash entry is kept in case you need it again." |
20658 | msgstr "贮藏条目被保留以备您再次需要。" | |
20659 | ||
349ede6a | 20660 | #: builtin/stash.c:656 |
d46c5519 JX |
20661 | msgid "No branch name specified" |
20662 | msgstr "未指定分支名" | |
20663 | ||
349ede6a | 20664 | #: builtin/stash.c:800 builtin/stash.c:837 |
d46c5519 JX |
20665 | #, c-format |
20666 | msgid "Cannot update %s with %s" | |
20667 | msgstr "无法用 %2$s 更新 %1$s" | |
20668 | ||
349ede6a | 20669 | #: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 |
d46c5519 JX |
20670 | msgid "stash message" |
20671 | msgstr "贮藏说明" | |
20672 | ||
349ede6a | 20673 | #: builtin/stash.c:828 |
d46c5519 JX |
20674 | msgid "\"git stash store\" requires one <commit> argument" |
20675 | msgstr "\"git stash store\" 需要一个 <提交> 参数" | |
20676 | ||
349ede6a | 20677 | #: builtin/stash.c:1046 |
d46c5519 JX |
20678 | msgid "No changes selected" |
20679 | msgstr "没有选择变更" | |
20680 | ||
349ede6a | 20681 | #: builtin/stash.c:1146 |
d46c5519 JX |
20682 | msgid "You do not have the initial commit yet" |
20683 | msgstr "您尚未建立初始提交" | |
20684 | ||
349ede6a | 20685 | #: builtin/stash.c:1173 |
d46c5519 JX |
20686 | msgid "Cannot save the current index state" |
20687 | msgstr "无法保存当前索引状态" | |
20688 | ||
349ede6a | 20689 | #: builtin/stash.c:1182 |
d46c5519 JX |
20690 | msgid "Cannot save the untracked files" |
20691 | msgstr "无法保存未跟踪文件" | |
20692 | ||
349ede6a | 20693 | #: builtin/stash.c:1193 builtin/stash.c:1202 |
d46c5519 JX |
20694 | msgid "Cannot save the current worktree state" |
20695 | msgstr "无法保存当前工作区状态" | |
20696 | ||
349ede6a | 20697 | #: builtin/stash.c:1230 |
d46c5519 JX |
20698 | msgid "Cannot record working tree state" |
20699 | msgstr "不能记录工作区状态" | |
20700 | ||
349ede6a | 20701 | #: builtin/stash.c:1279 |
d46c5519 JX |
20702 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
20703 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
20704 | ||
349ede6a | 20705 | #: builtin/stash.c:1295 |
d46c5519 JX |
20706 | msgid "Did you forget to 'git add'?" |
20707 | msgstr "您是否忘了执行 'git add'?" | |
20708 | ||
349ede6a | 20709 | #: builtin/stash.c:1310 |
d46c5519 JX |
20710 | msgid "No local changes to save" |
20711 | msgstr "没有要保存的本地修改" | |
20712 | ||
349ede6a | 20713 | #: builtin/stash.c:1317 |
d46c5519 JX |
20714 | msgid "Cannot initialize stash" |
20715 | msgstr "无法初始化贮藏" | |
20716 | ||
349ede6a | 20717 | #: builtin/stash.c:1332 |
d46c5519 JX |
20718 | msgid "Cannot save the current status" |
20719 | msgstr "无法保存当前状态" | |
20720 | ||
349ede6a | 20721 | #: builtin/stash.c:1337 |
d46c5519 JX |
20722 | #, c-format |
20723 | msgid "Saved working directory and index state %s" | |
20724 | msgstr "保存工作目录和索引状态 %s" | |
20725 | ||
349ede6a | 20726 | #: builtin/stash.c:1427 |
d46c5519 JX |
20727 | msgid "Cannot remove worktree changes" |
20728 | msgstr "无法删除工作区变更" | |
20729 | ||
349ede6a | 20730 | #: builtin/stash.c:1466 builtin/stash.c:1531 |
d46c5519 JX |
20731 | msgid "keep index" |
20732 | msgstr "保持索引" | |
20733 | ||
349ede6a | 20734 | #: builtin/stash.c:1468 builtin/stash.c:1533 |
d46c5519 JX |
20735 | msgid "stash in patch mode" |
20736 | msgstr "以补丁模式贮藏" | |
20737 | ||
349ede6a | 20738 | #: builtin/stash.c:1469 builtin/stash.c:1534 |
d46c5519 JX |
20739 | msgid "quiet mode" |
20740 | msgstr "静默模式" | |
20741 | ||
349ede6a | 20742 | #: builtin/stash.c:1471 builtin/stash.c:1536 |
d46c5519 JX |
20743 | msgid "include untracked files in stash" |
20744 | msgstr "贮藏中包含未跟踪文件" | |
ef317cd5 | 20745 | |
349ede6a | 20746 | #: builtin/stash.c:1473 builtin/stash.c:1538 |
d46c5519 JX |
20747 | msgid "include ignore files" |
20748 | msgstr "包含忽略的文件" | |
ef317cd5 | 20749 | |
349ede6a JX |
20750 | #: builtin/stash.c:1573 |
20751 | msgid "" | |
20752 | "the stash.useBuiltin support has been removed!\n" | |
20753 | "See its entry in 'git help config' for details." | |
20754 | msgstr "" | |
20755 | "对 stash.useBuiltin 的支持已被删除!\n" | |
20756 | "详见 'git help config' 中的条目。" | |
ef317cd5 | 20757 | |
a4f16749 | 20758 | #: builtin/stripspace.c:18 |
94550ed3 JX |
20759 | msgid "git stripspace [-s | --strip-comments]" |
20760 | msgstr "git stripspace [-s | --strip-comments]" | |
20761 | ||
a4f16749 | 20762 | #: builtin/stripspace.c:19 |
94550ed3 JX |
20763 | msgid "git stripspace [-c | --comment-lines]" |
20764 | msgstr "git stripspace [-c | --comment-lines]" | |
20765 | ||
06991777 | 20766 | #: builtin/stripspace.c:37 |
94550ed3 JX |
20767 | msgid "skip and remove all lines starting with comment character" |
20768 | msgstr "跳过和移除所有的注释行" | |
20769 | ||
06991777 | 20770 | #: builtin/stripspace.c:40 |
276ceeaa | 20771 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
20772 | msgstr "为每一行的行首添加注释符和空格" |
20773 | ||
2b472aae | 20774 | #: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 |
5b04ee3b JX |
20775 | #, c-format |
20776 | msgid "Expecting a full ref name, got %s" | |
20777 | msgstr "期望一个完整的引用名称,却得到 %s" | |
20778 | ||
ddc12c42 | 20779 | #: builtin/submodule--helper.c:64 |
31e5e17b JX |
20780 | msgid "submodule--helper print-default-remote takes no arguments" |
20781 | msgstr "submodule--helper print-default-remote 不带参数" | |
20782 | ||
ddc12c42 | 20783 | #: builtin/submodule--helper.c:102 |
5b04ee3b JX |
20784 | #, c-format |
20785 | msgid "cannot strip one component off url '%s'" | |
20786 | msgstr "无法从 url '%s' 剥离一个组件" | |
20787 | ||
2b472aae | 20788 | #: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 |
94550ed3 JX |
20789 | msgid "alternative anchor for relative paths" |
20790 | msgstr "相对路径的替代锚记(anchor)" | |
20791 | ||
ddc12c42 | 20792 | #: builtin/submodule--helper.c:415 |
94550ed3 JX |
20793 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
20794 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
20795 | ||
ddc12c42 JX |
20796 | #: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 |
20797 | #: builtin/submodule--helper.c:653 | |
5b04ee3b JX |
20798 | #, c-format |
20799 | msgid "No url found for submodule path '%s' in .gitmodules" | |
20800 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
20801 | ||
ddc12c42 | 20802 | #: builtin/submodule--helper.c:524 |
c1ac5258 JX |
20803 | #, c-format |
20804 | msgid "Entering '%s'\n" | |
20805 | msgstr "进入 '%s'\n" | |
20806 | ||
ddc12c42 | 20807 | #: builtin/submodule--helper.c:527 |
c1ac5258 JX |
20808 | #, c-format |
20809 | msgid "" | |
20810 | "run_command returned non-zero status for %s\n" | |
20811 | "." | |
4c27fcb5 JX |
20812 | msgstr "" |
20813 | "对 %s 执行 run_command 返回非零值。\n" | |
20814 | "." | |
c1ac5258 | 20815 | |
ddc12c42 | 20816 | #: builtin/submodule--helper.c:549 |
c1ac5258 JX |
20817 | #, c-format |
20818 | msgid "" | |
20819 | "run_command returned non-zero status while recursing in the nested " | |
20820 | "submodules of %s\n" | |
20821 | "." | |
4c27fcb5 JX |
20822 | msgstr "" |
20823 | "在递归 %s 的子模组执行 run_command 时返回非零值。\n" | |
20824 | "." | |
c1ac5258 | 20825 | |
ddc12c42 | 20826 | #: builtin/submodule--helper.c:565 |
c1ac5258 JX |
20827 | msgid "Suppress output of entering each submodule command" |
20828 | msgstr "阻止进入每一个子模组命令的输出" | |
20829 | ||
2b472aae | 20830 | #: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 |
c1ac5258 JX |
20831 | msgid "Recurse into nested submodules" |
20832 | msgstr "递归进入嵌套子模组中" | |
20833 | ||
ddc12c42 | 20834 | #: builtin/submodule--helper.c:572 |
d46c5519 JX |
20835 | msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" |
20836 | msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" | |
c1ac5258 | 20837 | |
ddc12c42 | 20838 | #: builtin/submodule--helper.c:599 |
87cb7997 JX |
20839 | #, c-format |
20840 | msgid "" | |
4c27fcb5 | 20841 | "could not look up configuration '%s'. Assuming this repository is its own " |
87cb7997 JX |
20842 | "authoritative upstream." |
20843 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
20844 | ||
ddc12c42 | 20845 | #: builtin/submodule--helper.c:667 |
5b04ee3b JX |
20846 | #, c-format |
20847 | msgid "Failed to register url for submodule path '%s'" | |
20848 | msgstr "无法为子模组 '%s' 注册 url" | |
20849 | ||
ddc12c42 | 20850 | #: builtin/submodule--helper.c:671 |
5b04ee3b JX |
20851 | #, c-format |
20852 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
25c75902 | 20853 | msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" |
5b04ee3b | 20854 | |
ddc12c42 | 20855 | #: builtin/submodule--helper.c:681 |
aef18cc6 | 20856 | #, c-format |
5b04ee3b | 20857 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 20858 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 20859 | |
ddc12c42 | 20860 | #: builtin/submodule--helper.c:688 |
5b04ee3b JX |
20861 | #, c-format |
20862 | msgid "Failed to register update mode for submodule path '%s'" | |
20863 | msgstr "无法为子模组 '%s' 注册更新模式" | |
20864 | ||
ddc12c42 | 20865 | #: builtin/submodule--helper.c:710 |
5b04ee3b | 20866 | msgid "Suppress output for initializing a submodule" |
31e5e17b | 20867 | msgstr "阻止子模组初始化的输出" |
5b04ee3b | 20868 | |
ddc12c42 | 20869 | #: builtin/submodule--helper.c:715 |
d46c5519 JX |
20870 | msgid "git submodule--helper init [<options>] [<path>]" |
20871 | msgstr "git submodule--helper init [<选项>] [<路径>]" | |
5b04ee3b | 20872 | |
2b472aae | 20873 | #: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 |
94550ed3 JX |
20874 | #, c-format |
20875 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
20876 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
20877 | ||
2b472aae | 20878 | #: builtin/submodule--helper.c:837 |
5809aa05 JX |
20879 | #, c-format |
20880 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
20881 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
20882 | ||
2b472aae | 20883 | #: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 |
5809aa05 JX |
20884 | #, c-format |
20885 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 20886 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 20887 | |
2b472aae | 20888 | #: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 |
5809aa05 | 20889 | msgid "Suppress submodule status output" |
31e5e17b | 20890 | msgstr "阻止子模组状态输出" |
5809aa05 | 20891 | |
2b472aae | 20892 | #: builtin/submodule--helper.c:889 |
5809aa05 JX |
20893 | msgid "" |
20894 | "Use commit stored in the index instead of the one stored in the submodule " | |
20895 | "HEAD" | |
20896 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
20897 | ||
2b472aae | 20898 | #: builtin/submodule--helper.c:890 |
5809aa05 | 20899 | msgid "recurse into nested submodules" |
31e5e17b | 20900 | msgstr "递归进入嵌套子模组中" |
5809aa05 | 20901 | |
2b472aae | 20902 | #: builtin/submodule--helper.c:895 |
5809aa05 JX |
20903 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
20904 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
20905 | ||
2b472aae | 20906 | #: builtin/submodule--helper.c:919 |
5809aa05 JX |
20907 | msgid "git submodule--helper name <path>" |
20908 | msgstr "git submodule--helper name <路径>" | |
20909 | ||
2b472aae | 20910 | #: builtin/submodule--helper.c:983 |
31e5e17b JX |
20911 | #, c-format |
20912 | msgid "Synchronizing submodule url for '%s'\n" | |
20913 | msgstr "为 '%s' 同步子模组 url\n" | |
20914 | ||
2b472aae | 20915 | #: builtin/submodule--helper.c:989 |
31e5e17b JX |
20916 | #, c-format |
20917 | msgid "failed to register url for submodule path '%s'" | |
20918 | msgstr "无法为子模组路径 '%s' 注册 url" | |
20919 | ||
2b472aae | 20920 | #: builtin/submodule--helper.c:1003 |
31e5e17b JX |
20921 | #, c-format |
20922 | msgid "failed to get the default remote for submodule '%s'" | |
20923 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
20924 | ||
2b472aae | 20925 | #: builtin/submodule--helper.c:1014 |
31e5e17b JX |
20926 | #, c-format |
20927 | msgid "failed to update remote for submodule '%s'" | |
20928 | msgstr "无法为子模组 '%s' 更新远程关联" | |
20929 | ||
2b472aae | 20930 | #: builtin/submodule--helper.c:1061 |
31e5e17b JX |
20931 | msgid "Suppress output of synchronizing submodule url" |
20932 | msgstr "阻止子模组 url 同步的输出" | |
20933 | ||
2b472aae | 20934 | #: builtin/submodule--helper.c:1068 |
31e5e17b JX |
20935 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
20936 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
20937 | ||
2b472aae | 20938 | #: builtin/submodule--helper.c:1122 |
31e5e17b JX |
20939 | #, c-format |
20940 | msgid "" | |
20941 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
20942 | "really want to remove it including all of its history)" | |
20943 | msgstr "" | |
fd8cb379 JX |
20944 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
20945 | "-rf' 命令)" | |
31e5e17b | 20946 | |
2b472aae | 20947 | #: builtin/submodule--helper.c:1134 |
31e5e17b JX |
20948 | #, c-format |
20949 | msgid "" | |
20950 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
20951 | "them" | |
20952 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
20953 | ||
2b472aae | 20954 | #: builtin/submodule--helper.c:1142 |
31e5e17b JX |
20955 | #, c-format |
20956 | msgid "Cleared directory '%s'\n" | |
20957 | msgstr "已清除目录 '%s'\n" | |
20958 | ||
2b472aae | 20959 | #: builtin/submodule--helper.c:1144 |
31e5e17b JX |
20960 | #, c-format |
20961 | msgid "Could not remove submodule work tree '%s'\n" | |
20962 | msgstr "无法移除子模组工作区 '%s'\n" | |
20963 | ||
2b472aae | 20964 | #: builtin/submodule--helper.c:1155 |
31e5e17b JX |
20965 | #, c-format |
20966 | msgid "could not create empty submodule directory %s" | |
20967 | msgstr "不能创建空的子模组目录 %s" | |
20968 | ||
2b472aae | 20969 | #: builtin/submodule--helper.c:1171 |
31e5e17b JX |
20970 | #, c-format |
20971 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
20972 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
20973 | ||
2b472aae | 20974 | #: builtin/submodule--helper.c:1200 |
31e5e17b JX |
20975 | msgid "Remove submodule working trees even if they contain local changes" |
20976 | msgstr "删除子模组工作区,即使包含本地修改" | |
20977 | ||
2b472aae | 20978 | #: builtin/submodule--helper.c:1201 |
31e5e17b JX |
20979 | msgid "Unregister all submodules" |
20980 | msgstr "将所有子模组取消注册" | |
20981 | ||
2b472aae | 20982 | #: builtin/submodule--helper.c:1206 |
31e5e17b JX |
20983 | msgid "" |
20984 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
20985 | msgstr "" | |
20986 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
20987 | ||
2b472aae | 20988 | #: builtin/submodule--helper.c:1220 |
31e5e17b JX |
20989 | msgid "Use '--all' if you really want to deinitialize all submodules" |
20990 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
20991 | ||
2b472aae | 20992 | #: builtin/submodule--helper.c:1289 |
ddc12c42 JX |
20993 | msgid "" |
20994 | "An alternate computed from a superproject's alternate is invalid.\n" | |
20995 | "To allow Git to clone without an alternate in such a case, set\n" | |
20996 | "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" | |
20997 | "'--reference-if-able' instead of '--reference'." | |
20998 | msgstr "" | |
20999 | "从一个父项目的备用仓库中计算出的备用仓库无效。\n" | |
21000 | "此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n" | |
21001 | "Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n" | |
21002 | "'--reference' 来克隆。" | |
21003 | ||
2b472aae | 21004 | #: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 |
a0b6b246 JX |
21005 | #, c-format |
21006 | msgid "submodule '%s' cannot add alternate: %s" | |
21007 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
21008 | ||
2b472aae | 21009 | #: builtin/submodule--helper.c:1367 |
a0b6b246 JX |
21010 | #, c-format |
21011 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
21012 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
21013 | ||
2b472aae | 21014 | #: builtin/submodule--helper.c:1374 |
a0b6b246 JX |
21015 | #, c-format |
21016 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
21017 | msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" | |
21018 | ||
2b472aae | 21019 | #: builtin/submodule--helper.c:1398 |
94550ed3 JX |
21020 | msgid "where the new submodule will be cloned to" |
21021 | msgstr "新的子模组将要克隆的路径" | |
21022 | ||
2b472aae | 21023 | #: builtin/submodule--helper.c:1401 |
94550ed3 JX |
21024 | msgid "name of the new submodule" |
21025 | msgstr "新子模组的名称" | |
21026 | ||
2b472aae | 21027 | #: builtin/submodule--helper.c:1404 |
94550ed3 JX |
21028 | msgid "url where to clone the submodule from" |
21029 | msgstr "克隆子模组的 url 地址" | |
21030 | ||
2b472aae | 21031 | #: builtin/submodule--helper.c:1412 |
94550ed3 JX |
21032 | msgid "depth for shallow clones" |
21033 | msgstr "浅克隆的深度" | |
21034 | ||
2b472aae | 21035 | #: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 |
a0b6b246 | 21036 | msgid "force cloning progress" |
29004bbb | 21037 | msgstr "强制显示克隆进度" |
a0b6b246 | 21038 | |
2b472aae | 21039 | #: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 |
ddc12c42 JX |
21040 | msgid "disallow cloning into non-empty directory" |
21041 | msgstr "不允许克隆到一个非空目录" | |
21042 | ||
2b472aae | 21043 | #: builtin/submodule--helper.c:1424 |
94550ed3 JX |
21044 | msgid "" |
21045 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
2b472aae JX |
21046 | "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " |
21047 | "<url> --path <path>" | |
5c57d762 JX |
21048 | msgstr "" |
21049 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
2b472aae | 21050 | "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" |
94550ed3 | 21051 | |
2b472aae | 21052 | #: builtin/submodule--helper.c:1449 |
ddc12c42 JX |
21053 | #, c-format |
21054 | msgid "refusing to create/use '%s' in another submodule's git dir" | |
21055 | msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'" | |
21056 | ||
2b472aae | 21057 | #: builtin/submodule--helper.c:1460 |
94550ed3 JX |
21058 | #, c-format |
21059 | msgid "clone of '%s' into submodule path '%s' failed" | |
21060 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
21061 | ||
2b472aae | 21062 | #: builtin/submodule--helper.c:1464 |
ddc12c42 JX |
21063 | #, c-format |
21064 | msgid "directory not empty: '%s'" | |
21065 | msgstr "目录非空:'%s'" | |
21066 | ||
2b472aae | 21067 | #: builtin/submodule--helper.c:1476 |
94550ed3 JX |
21068 | #, c-format |
21069 | msgid "could not get submodule directory for '%s'" | |
21070 | msgstr "无法得到 '%s' 的子模组目录" | |
21071 | ||
2b472aae | 21072 | #: builtin/submodule--helper.c:1512 |
4c27fcb5 JX |
21073 | #, c-format |
21074 | msgid "Invalid update mode '%s' for submodule path '%s'" | |
21075 | msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" | |
21076 | ||
2b472aae | 21077 | #: builtin/submodule--helper.c:1516 |
4c27fcb5 JX |
21078 | #, c-format |
21079 | msgid "Invalid update mode '%s' configured for submodule path '%s'" | |
21080 | msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" | |
21081 | ||
2b472aae | 21082 | #: builtin/submodule--helper.c:1617 |
5b04ee3b JX |
21083 | #, c-format |
21084 | msgid "Submodule path '%s' not initialized" | |
21085 | msgstr "子模组 '%s' 尚未初始化" | |
21086 | ||
2b472aae | 21087 | #: builtin/submodule--helper.c:1621 |
5b04ee3b JX |
21088 | msgid "Maybe you want to use 'update --init'?" |
21089 | msgstr "也许您想要执行 'update --init'?" | |
21090 | ||
2b472aae | 21091 | #: builtin/submodule--helper.c:1651 |
5b04ee3b JX |
21092 | #, c-format |
21093 | msgid "Skipping unmerged submodule %s" | |
21094 | msgstr "略过未合并的子模组 %s" | |
21095 | ||
2b472aae | 21096 | #: builtin/submodule--helper.c:1680 |
5b04ee3b JX |
21097 | #, c-format |
21098 | msgid "Skipping submodule '%s'" | |
21099 | msgstr "略过子模组 '%s'" | |
21100 | ||
2b472aae | 21101 | #: builtin/submodule--helper.c:1830 |
5c57d762 JX |
21102 | #, c-format |
21103 | msgid "Failed to clone '%s'. Retry scheduled" | |
21104 | msgstr "克隆 '%s' 失败。按计划重试" | |
21105 | ||
2b472aae | 21106 | #: builtin/submodule--helper.c:1841 |
5c57d762 JX |
21107 | #, c-format |
21108 | msgid "Failed to clone '%s' a second time, aborting" | |
21109 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
21110 | ||
2b472aae | 21111 | #: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 |
5b04ee3b JX |
21112 | msgid "path into the working tree" |
21113 | msgstr "到工作区的路径" | |
21114 | ||
2b472aae | 21115 | #: builtin/submodule--helper.c:1906 |
5b04ee3b JX |
21116 | msgid "path into the working tree, across nested submodule boundaries" |
21117 | msgstr "工作区中的路径,递归嵌套子模组" | |
21118 | ||
2b472aae | 21119 | #: builtin/submodule--helper.c:1910 |
5b04ee3b JX |
21120 | msgid "rebase, merge, checkout or none" |
21121 | msgstr "rebase、merge、checkout 或 none" | |
21122 | ||
2b472aae | 21123 | #: builtin/submodule--helper.c:1916 |
5b04ee3b JX |
21124 | msgid "Create a shallow clone truncated to the specified number of revisions" |
21125 | msgstr "创建一个指定深度的浅克隆" | |
21126 | ||
2b472aae | 21127 | #: builtin/submodule--helper.c:1919 |
5b04ee3b JX |
21128 | msgid "parallel jobs" |
21129 | msgstr "并发任务" | |
21130 | ||
2b472aae | 21131 | #: builtin/submodule--helper.c:1921 |
5c57d762 | 21132 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 21133 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 21134 | |
2b472aae | 21135 | #: builtin/submodule--helper.c:1922 |
5b04ee3b JX |
21136 | msgid "don't print cloning progress" |
21137 | msgstr "不要输出克隆进度" | |
94550ed3 | 21138 | |
2b472aae | 21139 | #: builtin/submodule--helper.c:1933 |
a5cd71ca JX |
21140 | msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" |
21141 | msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" | |
5b04ee3b | 21142 | |
2b472aae | 21143 | #: builtin/submodule--helper.c:1946 |
5b04ee3b JX |
21144 | msgid "bad value for update parameter" |
21145 | msgstr "update 参数取值错误" | |
21146 | ||
2b472aae | 21147 | #: builtin/submodule--helper.c:1994 |
5c57d762 JX |
21148 | #, c-format |
21149 | msgid "" | |
21150 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
21151 | "the superproject is not on any branch" | |
21152 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
21153 | ||
2b472aae | 21154 | #: builtin/submodule--helper.c:2117 |
4c27fcb5 JX |
21155 | #, c-format |
21156 | msgid "could not get a repository handle for submodule '%s'" | |
21157 | msgstr "无法获得子模组 '%s' 的仓库句柄" | |
21158 | ||
2b472aae | 21159 | #: builtin/submodule--helper.c:2150 |
1a79b2f1 JX |
21160 | msgid "recurse into submodules" |
21161 | msgstr "在子模组中递归" | |
21162 | ||
2b472aae | 21163 | #: builtin/submodule--helper.c:2156 |
d46c5519 JX |
21164 | msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" |
21165 | msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" | |
1a79b2f1 | 21166 | |
2b472aae | 21167 | #: builtin/submodule--helper.c:2212 |
4c27fcb5 JX |
21168 | msgid "check if it is safe to write to the .gitmodules file" |
21169 | msgstr "检查写入 .gitmodules 文件是否安全" | |
21170 | ||
2b472aae | 21171 | #: builtin/submodule--helper.c:2215 |
d46c5519 JX |
21172 | msgid "unset the config in the .gitmodules file" |
21173 | msgstr "取消 .gitmodules 文件中的设置" | |
21174 | ||
2b472aae | 21175 | #: builtin/submodule--helper.c:2220 |
d46c5519 JX |
21176 | msgid "git submodule--helper config <name> [<value>]" |
21177 | msgstr "git submodule--helper config <名称> [<值>]" | |
4c27fcb5 | 21178 | |
2b472aae | 21179 | #: builtin/submodule--helper.c:2221 |
d46c5519 JX |
21180 | msgid "git submodule--helper config --unset <name>" |
21181 | msgstr "git submodule--helper config --unset <名称>" | |
21182 | ||
2b472aae | 21183 | #: builtin/submodule--helper.c:2222 |
4c27fcb5 JX |
21184 | msgid "git submodule--helper config --check-writeable" |
21185 | msgstr "git submodule--helper config --check-writeable" | |
21186 | ||
349ede6a | 21187 | #: builtin/submodule--helper.c:2241 git-submodule.sh:176 |
4c27fcb5 JX |
21188 | #, sh-format |
21189 | msgid "please make sure that the .gitmodules file is in the working tree" | |
21190 | msgstr "请确认 .gitmodules 文件在工作区里" | |
21191 | ||
349ede6a JX |
21192 | #: builtin/submodule--helper.c:2257 |
21193 | msgid "Suppress output for setting url of a submodule" | |
21194 | msgstr "阻止设置子模组 URL 的输出" | |
21195 | ||
21196 | #: builtin/submodule--helper.c:2261 | |
21197 | msgid "git submodule--helper set-url [--quiet] <path> <newurl>" | |
21198 | msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" | |
21199 | ||
7157c2b5 JX |
21200 | #: builtin/submodule--helper.c:2294 |
21201 | msgid "set the default tracking branch to master" | |
21202 | msgstr "设置默认跟踪分支为 master" | |
21203 | ||
21204 | #: builtin/submodule--helper.c:2296 | |
21205 | msgid "set the default tracking branch" | |
21206 | msgstr "设置默认跟踪分支" | |
21207 | ||
21208 | #: builtin/submodule--helper.c:2300 | |
21209 | msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" | |
21210 | msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" | |
21211 | ||
21212 | #: builtin/submodule--helper.c:2301 | |
21213 | msgid "" | |
21214 | "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" | |
21215 | msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" | |
21216 | ||
21217 | #: builtin/submodule--helper.c:2308 | |
21218 | msgid "--branch or --default required" | |
21219 | msgstr "需要 --branch 或 --default" | |
21220 | ||
21221 | #: builtin/submodule--helper.c:2311 | |
21222 | msgid "--branch and --default are mutually exclusive" | |
21223 | msgstr "--branch 和 --default 是互斥的" | |
21224 | ||
21225 | #: builtin/submodule--helper.c:2367 git.c:436 git.c:683 | |
1a79b2f1 JX |
21226 | #, c-format |
21227 | msgid "%s doesn't support --super-prefix" | |
21228 | msgstr "%s 不支持 --super-prefix" | |
21229 | ||
7157c2b5 | 21230 | #: builtin/submodule--helper.c:2373 |
94550ed3 | 21231 | #, c-format |
5b04ee3b JX |
21232 | msgid "'%s' is not a valid submodule--helper subcommand" |
21233 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 21234 | |
a4f16749 | 21235 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
21236 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
21237 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 21238 | |
a4f16749 | 21239 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
21240 | msgid "git symbolic-ref -d [-q] <name>" |
21241 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 21242 | |
6937cb4e | 21243 | #: builtin/symbolic-ref.c:40 |
ef317cd5 | 21244 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
21245 | msgstr "不显示非符号(分离的)引用的错误信息" |
21246 | ||
6937cb4e | 21247 | #: builtin/symbolic-ref.c:41 |
07432cef WS |
21248 | msgid "delete symbolic ref" |
21249 | msgstr "删除符号引用" | |
ef317cd5 | 21250 | |
6937cb4e | 21251 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 21252 | msgid "shorten ref output" |
6937cb4e | 21253 | msgstr "缩短引用输出" |
ef317cd5 | 21254 | |
349ede6a | 21255 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 |
ef317cd5 | 21256 | msgid "reason" |
07432cef | 21257 | msgstr "原因" |
ef317cd5 | 21258 | |
349ede6a | 21259 | #: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 |
ef317cd5 | 21260 | msgid "reason of the update" |
07432cef | 21261 | msgstr "更新的原因" |
ef317cd5 | 21262 | |
c1ac5258 | 21263 | #: builtin/tag.c:25 |
ef317cd5 | 21264 | msgid "" |
d46c5519 JX |
21265 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" |
21266 | "\t\t<tagname> [<head>]" | |
814ff314 | 21267 | msgstr "" |
d46c5519 JX |
21268 | "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" |
21269 | "\t\t<标签名> [<头>]" | |
ef317cd5 | 21270 | |
d46c5519 | 21271 | #: builtin/tag.c:27 |
ef317cd5 | 21272 | msgid "git tag -d <tagname>..." |
07432cef | 21273 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 21274 | |
d46c5519 | 21275 | #: builtin/tag.c:28 |
ef317cd5 | 21276 | msgid "" |
87cb7997 JX |
21277 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
21278 | "points-at <object>]\n" | |
94550ed3 | 21279 | "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" |
ef317cd5 | 21280 | msgstr "" |
87cb7997 JX |
21281 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
21282 | "at <对象>]\n" | |
94550ed3 | 21283 | "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" |
ef317cd5 | 21284 | |
d46c5519 | 21285 | #: builtin/tag.c:30 |
1a79b2f1 JX |
21286 | msgid "git tag -v [--format=<format>] <tagname>..." |
21287 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 21288 | |
a6cd2cc4 | 21289 | #: builtin/tag.c:89 |
c04f5ac3 JX |
21290 | #, c-format |
21291 | msgid "tag '%s' not found." | |
55a16ee4 | 21292 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 21293 | |
a6cd2cc4 | 21294 | #: builtin/tag.c:105 |
c04f5ac3 JX |
21295 | #, c-format |
21296 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 21297 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 21298 | |
a6cd2cc4 | 21299 | #: builtin/tag.c:135 |
a77c07d9 | 21300 | #, c-format |
c04f5ac3 JX |
21301 | msgid "" |
21302 | "\n" | |
6acbf033 JX |
21303 | "Write a message for tag:\n" |
21304 | " %s\n" | |
a77c07d9 | 21305 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
21306 | msgstr "" |
21307 | "\n" | |
55a16ee4 | 21308 | "输入一个标签说明:\n" |
6acbf033 | 21309 | " %s\n" |
a77c07d9 | 21310 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 21311 | |
a6cd2cc4 | 21312 | #: builtin/tag.c:139 |
a77c07d9 | 21313 | #, c-format |
c04f5ac3 JX |
21314 | msgid "" |
21315 | "\n" | |
6acbf033 JX |
21316 | "Write a message for tag:\n" |
21317 | " %s\n" | |
a77c07d9 | 21318 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 21319 | "want to.\n" |
c04f5ac3 JX |
21320 | msgstr "" |
21321 | "\n" | |
55a16ee4 | 21322 | "输入一个标签说明:\n" |
6acbf033 | 21323 | " %s\n" |
a77c07d9 | 21324 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 21325 | |
a6cd2cc4 | 21326 | #: builtin/tag.c:198 |
c04f5ac3 | 21327 | msgid "unable to sign the tag" |
55a16ee4 | 21328 | msgstr "无法签署标签" |
c04f5ac3 | 21329 | |
a6cd2cc4 | 21330 | #: builtin/tag.c:200 |
c04f5ac3 | 21331 | msgid "unable to write tag file" |
55a16ee4 | 21332 | msgstr "无法写标签文件" |
c04f5ac3 | 21333 | |
a6cd2cc4 | 21334 | #: builtin/tag.c:216 |
d46c5519 JX |
21335 | #, c-format |
21336 | msgid "" | |
21337 | "You have created a nested tag. The object referred to by your new tag is\n" | |
21338 | "already a tag. If you meant to tag the object that it points to, use:\n" | |
21339 | "\n" | |
21340 | "\tgit tag -f %s %s^{}" | |
21341 | msgstr "" | |
21342 | "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" | |
21343 | "对其指向的目标创建标签,使用:\n" | |
21344 | "\n" | |
21345 | "\tgit tag -f %s %s^{}" | |
21346 | ||
a6cd2cc4 | 21347 | #: builtin/tag.c:232 |
c04f5ac3 | 21348 | msgid "bad object type." |
90e6ef53 | 21349 | msgstr "坏的对象类型。" |
c04f5ac3 | 21350 | |
349ede6a | 21351 | #: builtin/tag.c:285 |
c04f5ac3 | 21352 | msgid "no tag message?" |
55a16ee4 | 21353 | msgstr "无标签说明?" |
c04f5ac3 | 21354 | |
349ede6a | 21355 | #: builtin/tag.c:292 |
c04f5ac3 JX |
21356 | #, c-format |
21357 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 21358 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 21359 | |
349ede6a | 21360 | #: builtin/tag.c:403 |
ef317cd5 | 21361 | msgid "list tag names" |
55a16ee4 | 21362 | msgstr "列出标签名称" |
ef317cd5 | 21363 | |
349ede6a | 21364 | #: builtin/tag.c:405 |
ef317cd5 | 21365 | msgid "print <n> lines of each tag message" |
55a16ee4 | 21366 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 21367 | |
349ede6a | 21368 | #: builtin/tag.c:407 |
ef317cd5 | 21369 | msgid "delete tags" |
55a16ee4 | 21370 | msgstr "删除标签" |
ef317cd5 | 21371 | |
349ede6a | 21372 | #: builtin/tag.c:408 |
ef317cd5 | 21373 | msgid "verify tags" |
55a16ee4 | 21374 | msgstr "验证标签" |
ef317cd5 | 21375 | |
349ede6a | 21376 | #: builtin/tag.c:410 |
ef317cd5 | 21377 | msgid "Tag creation options" |
55a16ee4 | 21378 | msgstr "标签创建选项" |
ef317cd5 | 21379 | |
349ede6a | 21380 | #: builtin/tag.c:412 |
ef317cd5 | 21381 | msgid "annotated tag, needs a message" |
55a16ee4 | 21382 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 21383 | |
349ede6a | 21384 | #: builtin/tag.c:414 |
ef317cd5 | 21385 | msgid "tag message" |
55a16ee4 | 21386 | msgstr "标签说明" |
ef317cd5 | 21387 | |
349ede6a | 21388 | #: builtin/tag.c:416 |
31e5e17b JX |
21389 | msgid "force edit of tag message" |
21390 | msgstr "强制编辑标签说明" | |
21391 | ||
349ede6a | 21392 | #: builtin/tag.c:417 |
ef317cd5 | 21393 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 21394 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 21395 | |
349ede6a | 21396 | #: builtin/tag.c:420 |
ef317cd5 | 21397 | msgid "use another key to sign the tag" |
55a16ee4 | 21398 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 21399 | |
349ede6a | 21400 | #: builtin/tag.c:421 |
ef317cd5 | 21401 | msgid "replace the tag if exists" |
55a16ee4 | 21402 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 21403 | |
349ede6a | 21404 | #: builtin/tag.c:422 builtin/update-ref.c:492 |
03ea3327 | 21405 | msgid "create a reflog" |
1b7f4a34 JX |
21406 | msgstr "创建引用日志" |
21407 | ||
349ede6a | 21408 | #: builtin/tag.c:424 |
814ff314 | 21409 | msgid "Tag listing options" |
55a16ee4 | 21410 | msgstr "标签列表选项" |
814ff314 | 21411 | |
349ede6a | 21412 | #: builtin/tag.c:425 |
ef317cd5 | 21413 | msgid "show tag list in columns" |
55a16ee4 | 21414 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 21415 | |
349ede6a | 21416 | #: builtin/tag.c:426 builtin/tag.c:428 |
ef317cd5 | 21417 | msgid "print only tags that contain the commit" |
87cb7997 | 21418 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 21419 | |
349ede6a | 21420 | #: builtin/tag.c:427 builtin/tag.c:429 |
87cb7997 JX |
21421 | msgid "print only tags that don't contain the commit" |
21422 | msgstr "只打印不包含该提交的标签" | |
21423 | ||
349ede6a | 21424 | #: builtin/tag.c:430 |
94550ed3 JX |
21425 | msgid "print only tags that are merged" |
21426 | msgstr "只打印已经合并的标签" | |
21427 | ||
349ede6a | 21428 | #: builtin/tag.c:431 |
94550ed3 JX |
21429 | msgid "print only tags that are not merged" |
21430 | msgstr "只打印尚未合并的标签" | |
21431 | ||
349ede6a | 21432 | #: builtin/tag.c:435 |
ef317cd5 | 21433 | msgid "print only tags of the object" |
87cb7997 | 21434 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 21435 | |
349ede6a | 21436 | #: builtin/tag.c:483 |
8ada9598 | 21437 | msgid "--column and -n are incompatible" |
81809b99 | 21438 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 21439 | |
349ede6a | 21440 | #: builtin/tag.c:505 |
87cb7997 JX |
21441 | msgid "-n option is only allowed in list mode" |
21442 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 21443 | |
349ede6a | 21444 | #: builtin/tag.c:507 |
87cb7997 JX |
21445 | msgid "--contains option is only allowed in list mode" |
21446 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 21447 | |
349ede6a | 21448 | #: builtin/tag.c:509 |
87cb7997 JX |
21449 | msgid "--no-contains option is only allowed in list mode" |
21450 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 21451 | |
349ede6a | 21452 | #: builtin/tag.c:511 |
87cb7997 JX |
21453 | msgid "--points-at option is only allowed in list mode" |
21454 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 21455 | |
349ede6a | 21456 | #: builtin/tag.c:513 |
87cb7997 JX |
21457 | msgid "--merged and --no-merged options are only allowed in list mode" |
21458 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
21459 | ||
349ede6a | 21460 | #: builtin/tag.c:524 |
c04f5ac3 JX |
21461 | msgid "only one -F or -m option is allowed." |
21462 | msgstr "只允许一个 -F 或 -m 选项。" | |
21463 | ||
349ede6a | 21464 | #: builtin/tag.c:543 |
c04f5ac3 JX |
21465 | msgid "too many params" |
21466 | msgstr "太多参数" | |
21467 | ||
349ede6a | 21468 | #: builtin/tag.c:549 |
c04f5ac3 JX |
21469 | #, c-format |
21470 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 21471 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 21472 | |
349ede6a | 21473 | #: builtin/tag.c:554 |
c04f5ac3 JX |
21474 | #, c-format |
21475 | msgid "tag '%s' already exists" | |
55a16ee4 | 21476 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 21477 | |
349ede6a | 21478 | #: builtin/tag.c:585 |
c04f5ac3 JX |
21479 | #, c-format |
21480 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 21481 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 21482 | |
2b472aae | 21483 | #: builtin/unpack-objects.c:502 |
6c94aba5 JX |
21484 | msgid "Unpacking objects" |
21485 | msgstr "展开对象中" | |
21486 | ||
ddc12c42 | 21487 | #: builtin/update-index.c:84 |
7aea43ff JX |
21488 | #, c-format |
21489 | msgid "failed to create directory %s" | |
c1ac5258 | 21490 | msgstr "创建目录 %s 失败" |
7aea43ff | 21491 | |
ddc12c42 | 21492 | #: builtin/update-index.c:100 |
7aea43ff JX |
21493 | #, c-format |
21494 | msgid "failed to create file %s" | |
c1ac5258 | 21495 | msgstr "创建文件 %s 失败" |
7aea43ff | 21496 | |
ddc12c42 | 21497 | #: builtin/update-index.c:108 |
7aea43ff JX |
21498 | #, c-format |
21499 | msgid "failed to delete file %s" | |
c1ac5258 | 21500 | msgstr "删除文件 %s 失败" |
7aea43ff | 21501 | |
ddc12c42 | 21502 | #: builtin/update-index.c:115 builtin/update-index.c:221 |
7aea43ff JX |
21503 | #, c-format |
21504 | msgid "failed to delete directory %s" | |
c1ac5258 | 21505 | msgstr "删除目录 %s 失败" |
7aea43ff | 21506 | |
ddc12c42 | 21507 | #: builtin/update-index.c:140 |
7aea43ff | 21508 | #, c-format |
276ceeaa JX |
21509 | msgid "Testing mtime in '%s' " |
21510 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 21511 | |
ddc12c42 | 21512 | #: builtin/update-index.c:154 |
7aea43ff JX |
21513 | msgid "directory stat info does not change after adding a new file" |
21514 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
21515 | ||
ddc12c42 | 21516 | #: builtin/update-index.c:167 |
7aea43ff JX |
21517 | msgid "directory stat info does not change after adding a new directory" |
21518 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
21519 | ||
ddc12c42 | 21520 | #: builtin/update-index.c:180 |
7aea43ff JX |
21521 | msgid "directory stat info changes after updating a file" |
21522 | msgstr "更新一个文件后,目录的状态信息被修改" | |
21523 | ||
ddc12c42 | 21524 | #: builtin/update-index.c:191 |
7aea43ff JX |
21525 | msgid "directory stat info changes after adding a file inside subdirectory" |
21526 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
21527 | ||
ddc12c42 | 21528 | #: builtin/update-index.c:202 |
7aea43ff JX |
21529 | msgid "directory stat info does not change after deleting a file" |
21530 | msgstr "删除一个文件后,目录的状态信息未改变" | |
21531 | ||
ddc12c42 | 21532 | #: builtin/update-index.c:215 |
7aea43ff JX |
21533 | msgid "directory stat info does not change after deleting a directory" |
21534 | msgstr "删除一个目录后,目录的状态信息未改变" | |
21535 | ||
ddc12c42 | 21536 | #: builtin/update-index.c:222 |
7aea43ff JX |
21537 | msgid " OK" |
21538 | msgstr " OK" | |
21539 | ||
ddc12c42 | 21540 | #: builtin/update-index.c:591 |
814ff314 JX |
21541 | msgid "git update-index [<options>] [--] [<file>...]" |
21542 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 21543 | |
ddc12c42 | 21544 | #: builtin/update-index.c:974 |
ef317cd5 | 21545 | msgid "continue refresh even when index needs update" |
07432cef | 21546 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 21547 | |
ddc12c42 | 21548 | #: builtin/update-index.c:977 |
ef317cd5 | 21549 | msgid "refresh: ignore submodules" |
07432cef | 21550 | msgstr "刷新:忽略子模组" |
8ada9598 | 21551 | |
ddc12c42 | 21552 | #: builtin/update-index.c:980 |
ef317cd5 | 21553 | msgid "do not ignore new files" |
07432cef | 21554 | msgstr "不忽略新的文件" |
8ada9598 | 21555 | |
ddc12c42 | 21556 | #: builtin/update-index.c:982 |
ef317cd5 | 21557 | msgid "let files replace directories and vice-versa" |
07432cef | 21558 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 21559 | |
ddc12c42 | 21560 | #: builtin/update-index.c:984 |
ef317cd5 | 21561 | msgid "notice files missing from worktree" |
07432cef | 21562 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 21563 | |
ddc12c42 | 21564 | #: builtin/update-index.c:986 |
ef317cd5 | 21565 | msgid "refresh even if index contains unmerged entries" |
07432cef | 21566 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 21567 | |
ddc12c42 | 21568 | #: builtin/update-index.c:989 |
ef317cd5 | 21569 | msgid "refresh stat information" |
07432cef | 21570 | msgstr "刷新统计信息" |
ef317cd5 | 21571 | |
ddc12c42 | 21572 | #: builtin/update-index.c:993 |
ef317cd5 | 21573 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 21574 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 21575 | |
ddc12c42 | 21576 | #: builtin/update-index.c:997 |
6c94aba5 | 21577 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 21578 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 21579 | |
ddc12c42 | 21580 | #: builtin/update-index.c:998 |
ef317cd5 | 21581 | msgid "add the specified entry to the index" |
07432cef | 21582 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 21583 | |
ddc12c42 | 21584 | #: builtin/update-index.c:1008 |
ef317cd5 | 21585 | msgid "mark files as \"not changing\"" |
07432cef | 21586 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 21587 | |
ddc12c42 | 21588 | #: builtin/update-index.c:1011 |
ef317cd5 | 21589 | msgid "clear assumed-unchanged bit" |
07432cef | 21590 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 21591 | |
ddc12c42 | 21592 | #: builtin/update-index.c:1014 |
ef317cd5 | 21593 | msgid "mark files as \"index-only\"" |
07432cef | 21594 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 21595 | |
ddc12c42 | 21596 | #: builtin/update-index.c:1017 |
ef317cd5 | 21597 | msgid "clear skip-worktree bit" |
07432cef | 21598 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 21599 | |
ddc12c42 JX |
21600 | #: builtin/update-index.c:1020 |
21601 | msgid "do not touch index-only entries" | |
21602 | msgstr "不要触碰仅索引条目" | |
21603 | ||
21604 | #: builtin/update-index.c:1022 | |
ef317cd5 | 21605 | msgid "add to index only; do not add content to object database" |
07432cef | 21606 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 21607 | |
ddc12c42 | 21608 | #: builtin/update-index.c:1024 |
ef317cd5 | 21609 | msgid "remove named paths even if present in worktree" |
07432cef | 21610 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 21611 | |
ddc12c42 | 21612 | #: builtin/update-index.c:1026 |
ef317cd5 | 21613 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 21614 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 21615 | |
ddc12c42 | 21616 | #: builtin/update-index.c:1028 |
ef317cd5 | 21617 | msgid "read list of paths to be updated from standard input" |
07432cef | 21618 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 21619 | |
ddc12c42 | 21620 | #: builtin/update-index.c:1032 |
ef317cd5 | 21621 | msgid "add entries from standard input to the index" |
07432cef | 21622 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 21623 | |
ddc12c42 | 21624 | #: builtin/update-index.c:1036 |
ef317cd5 | 21625 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 21626 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 21627 | |
ddc12c42 | 21628 | #: builtin/update-index.c:1040 |
ef317cd5 | 21629 | msgid "only update entries that differ from HEAD" |
07432cef | 21630 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 21631 | |
ddc12c42 | 21632 | #: builtin/update-index.c:1044 |
ef317cd5 | 21633 | msgid "ignore files missing from worktree" |
07432cef | 21634 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 21635 | |
ddc12c42 | 21636 | #: builtin/update-index.c:1047 |
ef317cd5 | 21637 | msgid "report actions to standard output" |
07432cef | 21638 | msgstr "在标准输出显示操作" |
ef317cd5 | 21639 | |
ddc12c42 | 21640 | #: builtin/update-index.c:1049 |
ef317cd5 | 21641 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 21642 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 21643 | |
ddc12c42 | 21644 | #: builtin/update-index.c:1053 |
ef317cd5 | 21645 | msgid "write index in this format" |
07432cef | 21646 | msgstr "以这种格式写入索引区" |
ef317cd5 | 21647 | |
ddc12c42 | 21648 | #: builtin/update-index.c:1055 |
6acbf033 JX |
21649 | msgid "enable or disable split index" |
21650 | msgstr "启用或禁用索引拆分" | |
21651 | ||
ddc12c42 | 21652 | #: builtin/update-index.c:1057 |
7aea43ff JX |
21653 | msgid "enable/disable untracked cache" |
21654 | msgstr "启用/禁用对未跟踪文件的缓存" | |
21655 | ||
ddc12c42 | 21656 | #: builtin/update-index.c:1059 |
276ceeaa JX |
21657 | msgid "test if the filesystem supports untracked cache" |
21658 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
21659 | ||
ddc12c42 | 21660 | #: builtin/update-index.c:1061 |
7aea43ff JX |
21661 | msgid "enable untracked cache without testing the filesystem" |
21662 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
21663 | ||
ddc12c42 | 21664 | #: builtin/update-index.c:1063 |
5809aa05 JX |
21665 | msgid "write out the index even if is not flagged as changed" |
21666 | msgstr "即使没有被标记为已更改,也要写出索引" | |
21667 | ||
ddc12c42 | 21668 | #: builtin/update-index.c:1065 |
5809aa05 JX |
21669 | msgid "enable or disable file system monitor" |
21670 | msgstr "启用或禁用文件系统监控" | |
21671 | ||
ddc12c42 | 21672 | #: builtin/update-index.c:1067 |
5809aa05 JX |
21673 | msgid "mark files as fsmonitor valid" |
21674 | msgstr "标记文件为 fsmonitor 有效" | |
21675 | ||
ddc12c42 | 21676 | #: builtin/update-index.c:1070 |
5809aa05 JX |
21677 | msgid "clear fsmonitor valid bit" |
21678 | msgstr "清除 fsmonitor 有效位" | |
21679 | ||
ddc12c42 | 21680 | #: builtin/update-index.c:1173 |
87cb7997 JX |
21681 | msgid "" |
21682 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
21683 | "enable split index" | |
21684 | msgstr "" | |
21685 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
21686 | ||
ddc12c42 | 21687 | #: builtin/update-index.c:1182 |
87cb7997 JX |
21688 | msgid "" |
21689 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
21690 | "disable split index" | |
21691 | msgstr "" | |
21692 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
21693 | ||
ddc12c42 | 21694 | #: builtin/update-index.c:1194 |
a0b6b246 JX |
21695 | msgid "" |
21696 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
21697 | "to disable the untracked cache" | |
275588f9 JX |
21698 | msgstr "" |
21699 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
21700 | "改它。" | |
a0b6b246 | 21701 | |
ddc12c42 | 21702 | #: builtin/update-index.c:1198 |
276ceeaa JX |
21703 | msgid "Untracked cache disabled" |
21704 | msgstr "缓存未跟踪文件被禁用" | |
21705 | ||
ddc12c42 | 21706 | #: builtin/update-index.c:1206 |
a0b6b246 JX |
21707 | msgid "" |
21708 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
21709 | "to enable the untracked cache" | |
275588f9 JX |
21710 | msgstr "" |
21711 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
21712 | "修改它。" | |
a0b6b246 | 21713 | |
ddc12c42 | 21714 | #: builtin/update-index.c:1210 |
276ceeaa JX |
21715 | #, c-format |
21716 | msgid "Untracked cache enabled for '%s'" | |
21717 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
21718 | ||
ddc12c42 | 21719 | #: builtin/update-index.c:1218 |
5809aa05 | 21720 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 21721 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 21722 | |
ddc12c42 | 21723 | #: builtin/update-index.c:1222 |
5809aa05 JX |
21724 | msgid "fsmonitor enabled" |
21725 | msgstr "fsmonitor 被启用" | |
21726 | ||
ddc12c42 | 21727 | #: builtin/update-index.c:1225 |
5809aa05 JX |
21728 | msgid "" |
21729 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 21730 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 21731 | |
ddc12c42 | 21732 | #: builtin/update-index.c:1229 |
5809aa05 JX |
21733 | msgid "fsmonitor disabled" |
21734 | msgstr "fsmonitor 被禁用" | |
21735 | ||
a4f16749 | 21736 | #: builtin/update-ref.c:10 |
814ff314 JX |
21737 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
21738 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 21739 | |
a4f16749 | 21740 | #: builtin/update-ref.c:11 |
814ff314 JX |
21741 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
21742 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 21743 | |
a4f16749 | 21744 | #: builtin/update-ref.c:12 |
814ff314 JX |
21745 | msgid "git update-ref [<options>] --stdin [-z]" |
21746 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 21747 | |
349ede6a | 21748 | #: builtin/update-ref.c:487 |
ef317cd5 | 21749 | msgid "delete the reference" |
07432cef | 21750 | msgstr "删除引用" |
ef317cd5 | 21751 | |
349ede6a | 21752 | #: builtin/update-ref.c:489 |
ef317cd5 | 21753 | msgid "update <refname> not the one it points to" |
07432cef | 21754 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 21755 | |
349ede6a | 21756 | #: builtin/update-ref.c:490 |
90314792 JX |
21757 | msgid "stdin has NUL-terminated arguments" |
21758 | msgstr "标准输入有以 NUL 字符终止的参数" | |
21759 | ||
349ede6a | 21760 | #: builtin/update-ref.c:491 |
90314792 JX |
21761 | msgid "read updates from stdin" |
21762 | msgstr "从标准输入读取更新" | |
21763 | ||
a4f16749 | 21764 | #: builtin/update-server-info.c:7 |
ef317cd5 | 21765 | msgid "git update-server-info [--force]" |
07432cef | 21766 | msgstr "git update-server-info [--force]" |
ef317cd5 | 21767 | |
a4f16749 | 21768 | #: builtin/update-server-info.c:15 |
ef317cd5 | 21769 | msgid "update the info files from scratch" |
07432cef | 21770 | msgstr "从头开始更新文件信息" |
ef317cd5 | 21771 | |
fd8cb379 JX |
21772 | #: builtin/upload-pack.c:11 |
21773 | msgid "git upload-pack [<options>] <dir>" | |
21774 | msgstr "git upload-pack [<选项>] <目录>" | |
21775 | ||
d46c5519 JX |
21776 | #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 |
21777 | msgid "quit after a single request/response exchange" | |
21778 | msgstr "在一次单独的请求/响应之后退出" | |
21779 | ||
fd8cb379 JX |
21780 | #: builtin/upload-pack.c:25 |
21781 | msgid "exit immediately after initial ref advertisement" | |
21782 | msgstr "在初始的引用广告后立即退出" | |
21783 | ||
21784 | #: builtin/upload-pack.c:27 | |
21785 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
21786 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
21787 | ||
21788 | #: builtin/upload-pack.c:29 | |
21789 | msgid "interrupt transfer after <n> seconds of inactivity" | |
21790 | msgstr "不活动 <n> 秒钟后终止传输" | |
21791 | ||
a6cd2cc4 | 21792 | #: builtin/verify-commit.c:19 |
814ff314 JX |
21793 | msgid "git verify-commit [-v | --verbose] <commit>..." |
21794 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 21795 | |
a6cd2cc4 | 21796 | #: builtin/verify-commit.c:68 |
6acbf033 JX |
21797 | msgid "print commit contents" |
21798 | msgstr "打印提交内容" | |
21799 | ||
a6cd2cc4 | 21800 | #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 |
1b7f4a34 JX |
21801 | msgid "print raw gpg status output" |
21802 | msgstr "打印原始 gpg 状态输出" | |
21803 | ||
a4f16749 | 21804 | #: builtin/verify-pack.c:55 |
814ff314 JX |
21805 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
21806 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 21807 | |
a4f16749 | 21808 | #: builtin/verify-pack.c:65 |
ef317cd5 JX |
21809 | msgid "verbose" |
21810 | msgstr "冗长输出" | |
21811 | ||
a4f16749 | 21812 | #: builtin/verify-pack.c:67 |
ef317cd5 | 21813 | msgid "show statistics only" |
07432cef | 21814 | msgstr "只显示统计" |
ef317cd5 | 21815 | |
a6cd2cc4 | 21816 | #: builtin/verify-tag.c:18 |
1a79b2f1 JX |
21817 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
21818 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 21819 | |
a6cd2cc4 | 21820 | #: builtin/verify-tag.c:36 |
ef317cd5 | 21821 | msgid "print tag contents" |
55a16ee4 | 21822 | msgstr "打印标签内容" |
ef317cd5 | 21823 | |
a5cd71ca | 21824 | #: builtin/worktree.c:17 |
31e5e17b JX |
21825 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
21826 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 21827 | |
a5cd71ca | 21828 | #: builtin/worktree.c:18 |
5c57d762 JX |
21829 | msgid "git worktree list [<options>]" |
21830 | msgstr "git worktree list [<选项>]" | |
21831 | ||
a5cd71ca | 21832 | #: builtin/worktree.c:19 |
5c57d762 JX |
21833 | msgid "git worktree lock [<options>] <path>" |
21834 | msgstr "git worktree lock [<选项>] <路径>" | |
21835 | ||
a5cd71ca | 21836 | #: builtin/worktree.c:20 |
31e5e17b JX |
21837 | msgid "git worktree move <worktree> <new-path>" |
21838 | msgstr "git worktree move <工作区> <新路径>" | |
21839 | ||
a5cd71ca | 21840 | #: builtin/worktree.c:21 |
5bb01d4f JX |
21841 | msgid "git worktree prune [<options>]" |
21842 | msgstr "git worktree prune [<选项>]" | |
21843 | ||
a5cd71ca | 21844 | #: builtin/worktree.c:22 |
31e5e17b JX |
21845 | msgid "git worktree remove [<options>] <worktree>" |
21846 | msgstr "git worktree remove [<选项>] <工作区>" | |
21847 | ||
a5cd71ca | 21848 | #: builtin/worktree.c:23 |
5c57d762 JX |
21849 | msgid "git worktree unlock <path>" |
21850 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 21851 | |
7157c2b5 | 21852 | #: builtin/worktree.c:60 builtin/worktree.c:972 |
4c27fcb5 JX |
21853 | #, c-format |
21854 | msgid "failed to delete '%s'" | |
21855 | msgstr "删除 '%s' 失败" | |
21856 | ||
a5cd71ca | 21857 | #: builtin/worktree.c:85 |
7157c2b5 JX |
21858 | msgid "not a valid directory" |
21859 | msgstr "不是一个有效的目录" | |
5bb01d4f | 21860 | |
7157c2b5 JX |
21861 | #: builtin/worktree.c:91 |
21862 | msgid "gitdir file does not exist" | |
21863 | msgstr "gitdir 文件不存在" | |
5bb01d4f | 21864 | |
7157c2b5 | 21865 | #: builtin/worktree.c:96 builtin/worktree.c:105 |
6937cb4e | 21866 | #, c-format |
7157c2b5 JX |
21867 | msgid "unable to read gitdir file (%s)" |
21868 | msgstr "无法读取 gitdir 文件(%s)" | |
6937cb4e | 21869 | |
7157c2b5 | 21870 | #: builtin/worktree.c:115 |
5bb01d4f | 21871 | #, c-format |
7157c2b5 JX |
21872 | msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" |
21873 | msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
21874 | ||
21875 | #: builtin/worktree.c:123 | |
21876 | msgid "invalid gitdir file" | |
21877 | msgstr "无效的 gitdir 文件" | |
5bb01d4f | 21878 | |
7157c2b5 JX |
21879 | #: builtin/worktree.c:131 |
21880 | msgid "gitdir file points to non-existent location" | |
21881 | msgstr "gitdir 文件指向一个不存在的位置" | |
21882 | ||
21883 | #: builtin/worktree.c:146 | |
5bb01d4f | 21884 | #, c-format |
7157c2b5 JX |
21885 | msgid "Removing %s/%s: %s" |
21886 | msgstr "删除 %s/%s: %s" | |
5bb01d4f | 21887 | |
7157c2b5 | 21888 | #: builtin/worktree.c:221 |
1a79b2f1 JX |
21889 | msgid "report pruned working trees" |
21890 | msgstr "报告清除的工作区" | |
21891 | ||
7157c2b5 | 21892 | #: builtin/worktree.c:223 |
1a79b2f1 | 21893 | msgid "expire working trees older than <time>" |
58b6f078 | 21894 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 21895 | |
7157c2b5 | 21896 | #: builtin/worktree.c:293 |
5bb01d4f JX |
21897 | #, c-format |
21898 | msgid "'%s' already exists" | |
21899 | msgstr "'%s' 已经存在" | |
21900 | ||
7157c2b5 | 21901 | #: builtin/worktree.c:302 |
4c27fcb5 | 21902 | #, c-format |
7157c2b5 JX |
21903 | msgid "unusable worktree destination '%s'" |
21904 | msgstr "无法使用的工作区目标 '%s'" | |
4c27fcb5 | 21905 | |
7157c2b5 | 21906 | #: builtin/worktree.c:307 |
4c27fcb5 JX |
21907 | #, c-format |
21908 | msgid "" | |
21909 | "'%s' is a missing but locked worktree;\n" | |
7157c2b5 | 21910 | "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" |
4c27fcb5 | 21911 | msgstr "" |
7157c2b5 JX |
21912 | "'%s' 是一个丢失但锁定的工作区,\n" |
21913 | "使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除" | |
4c27fcb5 | 21914 | |
7157c2b5 | 21915 | #: builtin/worktree.c:309 |
4c27fcb5 JX |
21916 | #, c-format |
21917 | msgid "" | |
21918 | "'%s' is a missing but already registered worktree;\n" | |
7157c2b5 | 21919 | "use '%s -f' to override, or 'prune' or 'remove' to clear" |
4c27fcb5 | 21920 | msgstr "" |
7157c2b5 JX |
21921 | "'%s' 是一个丢失但已经注册的工作区,\n" |
21922 | "使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除" | |
4c27fcb5 | 21923 | |
7157c2b5 | 21924 | #: builtin/worktree.c:360 |
5bb01d4f JX |
21925 | #, c-format |
21926 | msgid "could not create directory of '%s'" | |
21927 | msgstr "不能创建目录 '%s'" | |
21928 | ||
7157c2b5 | 21929 | #: builtin/worktree.c:494 builtin/worktree.c:500 |
fd8cb379 JX |
21930 | #, c-format |
21931 | msgid "Preparing worktree (new branch '%s')" | |
21932 | msgstr "准备工作区(新分支 '%s')" | |
21933 | ||
7157c2b5 | 21934 | #: builtin/worktree.c:496 |
fd8cb379 JX |
21935 | #, c-format |
21936 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
21937 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
21938 | ||
7157c2b5 | 21939 | #: builtin/worktree.c:505 |
fd8cb379 JX |
21940 | #, c-format |
21941 | msgid "Preparing worktree (checking out '%s')" | |
21942 | msgstr "准备工作区(检出 '%s')" | |
21943 | ||
7157c2b5 | 21944 | #: builtin/worktree.c:511 |
5bb01d4f | 21945 | #, c-format |
fd8cb379 JX |
21946 | msgid "Preparing worktree (detached HEAD %s)" |
21947 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 21948 | |
7157c2b5 | 21949 | #: builtin/worktree.c:552 |
5bb01d4f | 21950 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 21951 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 21952 | |
7157c2b5 | 21953 | #: builtin/worktree.c:555 |
5bb01d4f JX |
21954 | msgid "create a new branch" |
21955 | msgstr "创建一个新分支" | |
21956 | ||
7157c2b5 | 21957 | #: builtin/worktree.c:557 |
5bb01d4f JX |
21958 | msgid "create or reset a branch" |
21959 | msgstr "创建或重置一个分支" | |
21960 | ||
7157c2b5 | 21961 | #: builtin/worktree.c:559 |
5b04ee3b JX |
21962 | msgid "populate the new working tree" |
21963 | msgstr "生成新的工作区" | |
21964 | ||
7157c2b5 | 21965 | #: builtin/worktree.c:560 |
60638e98 JX |
21966 | msgid "keep the new working tree locked" |
21967 | msgstr "锁定新工作区" | |
21968 | ||
7157c2b5 | 21969 | #: builtin/worktree.c:563 |
5809aa05 JX |
21970 | msgid "set up tracking mode (see git-branch(1))" |
21971 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
21972 | ||
7157c2b5 | 21973 | #: builtin/worktree.c:566 |
5809aa05 JX |
21974 | msgid "try to match the new branch name with a remote-tracking branch" |
21975 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
21976 | ||
7157c2b5 | 21977 | #: builtin/worktree.c:574 |
1b7f4a34 JX |
21978 | msgid "-b, -B, and --detach are mutually exclusive" |
21979 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 21980 | |
7157c2b5 | 21981 | #: builtin/worktree.c:635 |
5809aa05 JX |
21982 | msgid "--[no-]track can only be used if a new branch is created" |
21983 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
21984 | ||
7157c2b5 | 21985 | #: builtin/worktree.c:755 |
5c57d762 JX |
21986 | msgid "reason for locking" |
21987 | msgstr "锁定原因" | |
21988 | ||
7157c2b5 JX |
21989 | #: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 |
21990 | #: builtin/worktree.c:1000 | |
5c57d762 JX |
21991 | #, c-format |
21992 | msgid "'%s' is not a working tree" | |
21993 | msgstr "'%s' 不是一个工作区" | |
21994 | ||
7157c2b5 | 21995 | #: builtin/worktree.c:769 builtin/worktree.c:802 |
5c57d762 JX |
21996 | msgid "The main working tree cannot be locked or unlocked" |
21997 | msgstr "主工作区无法被加锁或解锁" | |
21998 | ||
7157c2b5 | 21999 | #: builtin/worktree.c:774 |
5c57d762 JX |
22000 | #, c-format |
22001 | msgid "'%s' is already locked, reason: %s" | |
22002 | msgstr "'%s' 已被锁定,原因:%s" | |
22003 | ||
7157c2b5 | 22004 | #: builtin/worktree.c:776 |
5c57d762 JX |
22005 | #, c-format |
22006 | msgid "'%s' is already locked" | |
22007 | msgstr "'%s' 已被锁定" | |
22008 | ||
7157c2b5 | 22009 | #: builtin/worktree.c:804 |
5c57d762 JX |
22010 | #, c-format |
22011 | msgid "'%s' is not locked" | |
22012 | msgstr "'%s' 未被锁定" | |
22013 | ||
7157c2b5 | 22014 | #: builtin/worktree.c:845 |
31e5e17b | 22015 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 22016 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 22017 | |
7157c2b5 | 22018 | #: builtin/worktree.c:853 |
4c27fcb5 JX |
22019 | msgid "force move even if worktree is dirty or locked" |
22020 | msgstr "强制移动,即使工作区是脏的或已锁定" | |
22021 | ||
7157c2b5 | 22022 | #: builtin/worktree.c:876 builtin/worktree.c:1002 |
31e5e17b JX |
22023 | #, c-format |
22024 | msgid "'%s' is a main working tree" | |
22025 | msgstr "'%s' 是一个主工作区" | |
22026 | ||
7157c2b5 | 22027 | #: builtin/worktree.c:881 |
31e5e17b JX |
22028 | #, c-format |
22029 | msgid "could not figure out destination name from '%s'" | |
22030 | msgstr "无法从 '%s' 算出目标名称" | |
22031 | ||
7157c2b5 | 22032 | #: builtin/worktree.c:894 |
31e5e17b | 22033 | #, c-format |
4c27fcb5 JX |
22034 | msgid "" |
22035 | "cannot move a locked working tree, lock reason: %s\n" | |
22036 | "use 'move -f -f' to override or unlock first" | |
22037 | msgstr "" | |
22038 | "无法移动一个锁定的工作区,锁定原因:%s\n" | |
22039 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 22040 | |
7157c2b5 | 22041 | #: builtin/worktree.c:896 |
4c27fcb5 JX |
22042 | msgid "" |
22043 | "cannot move a locked working tree;\n" | |
22044 | "use 'move -f -f' to override or unlock first" | |
22045 | msgstr "" | |
22046 | "无法移动一个锁定的工作区,\n" | |
22047 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 22048 | |
7157c2b5 | 22049 | #: builtin/worktree.c:899 |
31e5e17b JX |
22050 | #, c-format |
22051 | msgid "validation failed, cannot move working tree: %s" | |
22052 | msgstr "验证失败,无法移动工作区:%s" | |
22053 | ||
7157c2b5 | 22054 | #: builtin/worktree.c:904 |
31e5e17b JX |
22055 | #, c-format |
22056 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 22057 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 22058 | |
7157c2b5 | 22059 | #: builtin/worktree.c:952 |
31e5e17b JX |
22060 | #, c-format |
22061 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 22062 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 22063 | |
7157c2b5 | 22064 | #: builtin/worktree.c:956 |
31e5e17b | 22065 | #, c-format |
a5cd71ca JX |
22066 | msgid "'%s' contains modified or untracked files, use --force to delete it" |
22067 | msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除" | |
31e5e17b | 22068 | |
7157c2b5 | 22069 | #: builtin/worktree.c:961 |
31e5e17b JX |
22070 | #, c-format |
22071 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 22072 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 22073 | |
7157c2b5 | 22074 | #: builtin/worktree.c:984 |
4c27fcb5 JX |
22075 | msgid "force removal even if worktree is dirty or locked" |
22076 | msgstr "强制删除,即使工作区是脏的或已锁定" | |
31e5e17b | 22077 | |
7157c2b5 | 22078 | #: builtin/worktree.c:1007 |
31e5e17b | 22079 | #, c-format |
4c27fcb5 JX |
22080 | msgid "" |
22081 | "cannot remove a locked working tree, lock reason: %s\n" | |
22082 | "use 'remove -f -f' to override or unlock first" | |
22083 | msgstr "" | |
22084 | "无法删除一个锁定的工作区,锁定原因:%s\n" | |
22085 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 22086 | |
7157c2b5 | 22087 | #: builtin/worktree.c:1009 |
4c27fcb5 JX |
22088 | msgid "" |
22089 | "cannot remove a locked working tree;\n" | |
22090 | "use 'remove -f -f' to override or unlock first" | |
22091 | msgstr "" | |
22092 | "无法删除一个锁定的工作区,\n" | |
22093 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 22094 | |
7157c2b5 | 22095 | #: builtin/worktree.c:1012 |
31e5e17b JX |
22096 | #, c-format |
22097 | msgid "validation failed, cannot remove working tree: %s" | |
22098 | msgstr "验证失败,无法删除工作区:%s" | |
22099 | ||
06991777 | 22100 | #: builtin/write-tree.c:15 |
ef317cd5 | 22101 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 22102 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 22103 | |
06991777 | 22104 | #: builtin/write-tree.c:28 |
ef317cd5 | 22105 | msgid "<prefix>/" |
07432cef | 22106 | msgstr "<前缀>/" |
ef317cd5 | 22107 | |
06991777 | 22108 | #: builtin/write-tree.c:29 |
ef317cd5 | 22109 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 22110 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 22111 | |
06991777 | 22112 | #: builtin/write-tree.c:31 |
ef317cd5 | 22113 | msgid "only useful for debugging" |
07432cef | 22114 | msgstr "只对调试有用" |
ef317cd5 | 22115 | |
7157c2b5 | 22116 | #: bugreport.c:15 |
349ede6a JX |
22117 | msgid "git version:\n" |
22118 | msgstr "git 版本:\n" | |
22119 | ||
7157c2b5 | 22120 | #: bugreport.c:21 |
349ede6a JX |
22121 | #, c-format |
22122 | msgid "uname() failed with error '%s' (%d)\n" | |
22123 | msgstr "uname() 失败,错误为 '%s'(%d)\n" | |
22124 | ||
7157c2b5 | 22125 | #: bugreport.c:31 |
349ede6a JX |
22126 | msgid "compiler info: " |
22127 | msgstr "编译器信息:" | |
22128 | ||
7157c2b5 | 22129 | #: bugreport.c:34 |
349ede6a JX |
22130 | msgid "libc info: " |
22131 | msgstr "libc 信息:" | |
22132 | ||
7157c2b5 | 22133 | #: bugreport.c:80 |
349ede6a JX |
22134 | msgid "not run from a git repository - no hooks to show\n" |
22135 | msgstr "不是在 git 仓库中执行 - 没有要显示的钩子\n" | |
22136 | ||
7157c2b5 | 22137 | #: bugreport.c:90 |
349ede6a JX |
22138 | msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" |
22139 | msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" | |
22140 | ||
7157c2b5 | 22141 | #: bugreport.c:97 |
349ede6a JX |
22142 | msgid "" |
22143 | "Thank you for filling out a Git bug report!\n" | |
22144 | "Please answer the following questions to help us understand your issue.\n" | |
22145 | "\n" | |
22146 | "What did you do before the bug happened? (Steps to reproduce your issue)\n" | |
22147 | "\n" | |
22148 | "What did you expect to happen? (Expected behavior)\n" | |
22149 | "\n" | |
22150 | "What happened instead? (Actual behavior)\n" | |
22151 | "\n" | |
22152 | "What's different between what you expected and what actually happened?\n" | |
22153 | "\n" | |
22154 | "Anything else you want to add:\n" | |
22155 | "\n" | |
22156 | "Please review the rest of the bug report below.\n" | |
22157 | "You can delete any lines you don't wish to share.\n" | |
22158 | msgstr "" | |
22159 | "感谢您填写 Git 错误报告!\n" | |
22160 | "请填写以下问卷,以帮助我们了解您的问题。\n" | |
22161 | "\n" | |
22162 | "在错误发生之前,您做了什么?(重现问题的步骤)\n" | |
22163 | "\n" | |
22164 | "您期望发生什么?(预期行为)\n" | |
22165 | "\n" | |
22166 | "实际发生了什么?(实际行为)\n" | |
22167 | "\n" | |
22168 | "您所期望的与实际发生的有什么不同?\n" | |
22169 | "\n" | |
22170 | "您想要补充的其它内容:\n" | |
22171 | "\n" | |
22172 | "请检查错误报告下面的内容。\n" | |
22173 | "您可以删除任何您不想共享的内容。\n" | |
22174 | ||
7157c2b5 | 22175 | #: bugreport.c:136 |
349ede6a JX |
22176 | msgid "specify a destination for the bugreport file" |
22177 | msgstr "指定错误报告文件的目标位置" | |
22178 | ||
7157c2b5 | 22179 | #: bugreport.c:138 |
349ede6a JX |
22180 | msgid "specify a strftime format suffix for the filename" |
22181 | msgstr "指定文件的 strftime 格式后缀" | |
22182 | ||
7157c2b5 | 22183 | #: bugreport.c:162 |
349ede6a JX |
22184 | #, c-format |
22185 | msgid "could not create leading directories for '%s'" | |
22186 | msgstr "不能为 '%s' 创建先导目录" | |
22187 | ||
7157c2b5 | 22188 | #: bugreport.c:169 |
349ede6a JX |
22189 | msgid "System Info" |
22190 | msgstr "系统信息" | |
22191 | ||
7157c2b5 | 22192 | #: bugreport.c:172 |
349ede6a JX |
22193 | msgid "Enabled Hooks" |
22194 | msgstr "启用的钩子" | |
22195 | ||
7157c2b5 | 22196 | #: bugreport.c:180 |
349ede6a JX |
22197 | #, c-format |
22198 | msgid "couldn't create a new file at '%s'" | |
22199 | msgstr "不能创建新文件 '%s'" | |
22200 | ||
7157c2b5 JX |
22201 | #: bugreport.c:184 |
22202 | #, c-format | |
22203 | msgid "unable to write to %s" | |
22204 | msgstr "无法写入 %s" | |
22205 | ||
22206 | #: bugreport.c:194 | |
349ede6a JX |
22207 | #, c-format |
22208 | msgid "Created new report at '%s'.\n" | |
22209 | msgstr "在 '%s' 创建了新报告。\n" | |
22210 | ||
7157c2b5 | 22211 | #: fast-import.c:3100 |
349ede6a JX |
22212 | #, c-format |
22213 | msgid "Missing from marks for submodule '%s'" | |
22214 | msgstr "子模组 '%s' 缺少 from 标记" | |
22215 | ||
7157c2b5 | 22216 | #: fast-import.c:3102 |
349ede6a JX |
22217 | #, c-format |
22218 | msgid "Missing to marks for submodule '%s'" | |
22219 | msgstr "子模组 '%s' 缺少 to 标记" | |
22220 | ||
7157c2b5 | 22221 | #: fast-import.c:3237 |
a5cd71ca JX |
22222 | #, c-format |
22223 | msgid "Expected 'mark' command, got %s" | |
22224 | msgstr "预期 'mark' 命令,得到 %s" | |
22225 | ||
7157c2b5 | 22226 | #: fast-import.c:3242 |
a5cd71ca JX |
22227 | #, c-format |
22228 | msgid "Expected 'to' command, got %s" | |
22229 | msgstr "预期 'to' 命令,得到 %s" | |
22230 | ||
7157c2b5 | 22231 | #: fast-import.c:3334 |
349ede6a JX |
22232 | msgid "Expected format name:filename for submodule rewrite option" |
22233 | msgstr "子模组重写选项的预期格式为 name:filename" | |
22234 | ||
7157c2b5 | 22235 | #: fast-import.c:3388 |
ddc12c42 JX |
22236 | #, c-format |
22237 | msgid "feature '%s' forbidden in input without --allow-unsafe-features" | |
22238 | msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" | |
22239 | ||
7157c2b5 JX |
22240 | #: http-fetch.c:111 |
22241 | #, c-format | |
22242 | msgid "argument to --packfile must be a valid hash (got '%s')" | |
22243 | msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')" | |
22244 | ||
06991777 | 22245 | #: credential-cache--daemon.c:223 |
a0b6b246 JX |
22246 | #, c-format |
22247 | msgid "" | |
22248 | "The permissions on your socket directory are too loose; other\n" | |
22249 | "users may be able to read your cached credentials. Consider running:\n" | |
22250 | "\n" | |
22251 | "\tchmod 0700 %s" | |
22252 | msgstr "" | |
1a79b2f1 JX |
22253 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" |
22254 | "行:\n" | |
a0b6b246 JX |
22255 | "\n" |
22256 | "\tchmod 0700 %s" | |
22257 | ||
06991777 | 22258 | #: credential-cache--daemon.c:272 |
220c313c JX |
22259 | msgid "print debugging messages to stderr" |
22260 | msgstr "调试信息输出到标准错误" | |
22261 | ||
4c27fcb5 JX |
22262 | #: t/helper/test-reach.c:152 |
22263 | #, c-format | |
22264 | msgid "commit %s is not marked reachable" | |
22265 | msgstr "提交 %s 没有标记为可达" | |
22266 | ||
22267 | #: t/helper/test-reach.c:162 | |
22268 | msgid "too many commits marked reachable" | |
22269 | msgstr "太多提交标记为可达" | |
22270 | ||
d46c5519 JX |
22271 | #: t/helper/test-serve-v2.c:7 |
22272 | msgid "test-tool serve-v2 [<options>]" | |
22273 | msgstr "test-tool serve-v2 [<选项>]" | |
22274 | ||
22275 | #: t/helper/test-serve-v2.c:19 | |
22276 | msgid "exit immediately after advertising capabilities" | |
22277 | msgstr "对能力广告之后立即退出" | |
22278 | ||
349ede6a | 22279 | #: git.c:28 |
31e5e17b JX |
22280 | msgid "" |
22281 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
22282 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
22283 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
22284 | "bare]\n" | |
31e5e17b JX |
22285 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
22286 | " <command> [<args>]" | |
22287 | msgstr "" | |
fd8cb379 | 22288 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 22289 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
fd8cb379 JX |
22290 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
22291 | "bare]\n" | |
31e5e17b JX |
22292 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
22293 | " <命令> [<参数>]" | |
22294 | ||
349ede6a | 22295 | #: git.c:35 |
4dcdc3d8 | 22296 | msgid "" |
220c313c | 22297 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 | 22298 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
a6cd2cc4 JX |
22299 | "to read about a specific subcommand or concept.\n" |
22300 | "See 'git help git' for an overview of the system." | |
4dcdc3d8 | 22301 | msgstr "" |
220c313c JX |
22302 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
22303 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
a6cd2cc4 JX |
22304 | "帮助。\n" |
22305 | "有关系统的概述,查看 'git help git'。" | |
8ada9598 | 22306 | |
349ede6a | 22307 | #: git.c:187 |
31e5e17b JX |
22308 | #, c-format |
22309 | msgid "no directory given for --git-dir\n" | |
22310 | msgstr "没有为 --git-dir 提供目录\n" | |
22311 | ||
349ede6a | 22312 | #: git.c:201 |
31e5e17b JX |
22313 | #, c-format |
22314 | msgid "no namespace given for --namespace\n" | |
22315 | msgstr "没有为 --namespace 提供命名空间\n" | |
22316 | ||
349ede6a | 22317 | #: git.c:215 |
31e5e17b JX |
22318 | #, c-format |
22319 | msgid "no directory given for --work-tree\n" | |
22320 | msgstr "没有为 --work-tree 提供目录\n" | |
22321 | ||
349ede6a | 22322 | #: git.c:229 |
31e5e17b JX |
22323 | #, c-format |
22324 | msgid "no prefix given for --super-prefix\n" | |
22325 | msgstr "没有为 --super-prefix 提供前缀\n" | |
22326 | ||
349ede6a | 22327 | #: git.c:251 |
31e5e17b JX |
22328 | #, c-format |
22329 | msgid "-c expects a configuration string\n" | |
22330 | msgstr "应为 -c 提供一个配置字符串\n" | |
22331 | ||
349ede6a | 22332 | #: git.c:289 |
31e5e17b JX |
22333 | #, c-format |
22334 | msgid "no directory given for -C\n" | |
22335 | msgstr "没有为 -C 提供目录\n" | |
22336 | ||
349ede6a | 22337 | #: git.c:315 |
31e5e17b JX |
22338 | #, c-format |
22339 | msgid "unknown option: %s\n" | |
22340 | msgstr "未知选项:%s\n" | |
22341 | ||
349ede6a | 22342 | #: git.c:362 |
06991777 JX |
22343 | #, c-format |
22344 | msgid "while expanding alias '%s': '%s'" | |
5b533632 | 22345 | msgstr "在扩展别名 '%s' 时:'%s'" |
06991777 | 22346 | |
349ede6a | 22347 | #: git.c:371 |
06991777 JX |
22348 | #, c-format |
22349 | msgid "" | |
22350 | "alias '%s' changes environment variables.\n" | |
22351 | "You can use '!git' in the alias to do this" | |
22352 | msgstr "" | |
22353 | "别名 '%s' 修改环境变量。您可以使用在别名中\n" | |
22354 | "使用 '!git'" | |
22355 | ||
349ede6a | 22356 | #: git.c:378 |
06991777 JX |
22357 | #, c-format |
22358 | msgid "empty alias for %s" | |
22359 | msgstr "%s 的空别名" | |
22360 | ||
349ede6a | 22361 | #: git.c:381 |
06991777 JX |
22362 | #, c-format |
22363 | msgid "recursive alias: %s" | |
5b533632 | 22364 | msgstr "递归的别名:%s" |
06991777 | 22365 | |
349ede6a | 22366 | #: git.c:463 |
06991777 JX |
22367 | msgid "write failure on standard output" |
22368 | msgstr "在标准输出写入失败" | |
22369 | ||
349ede6a | 22370 | #: git.c:465 |
06991777 JX |
22371 | msgid "unknown write failure on standard output" |
22372 | msgstr "到标准输出的未知写入错误" | |
22373 | ||
349ede6a | 22374 | #: git.c:467 |
06991777 JX |
22375 | msgid "close failed on standard output" |
22376 | msgstr "标准输出关闭失败" | |
22377 | ||
349ede6a | 22378 | #: git.c:792 |
4c27fcb5 JX |
22379 | #, c-format |
22380 | msgid "alias loop detected: expansion of '%s' does not terminate:%s" | |
22381 | msgstr "检测到别名循环:'%s'的扩展未终止:%s" | |
22382 | ||
349ede6a | 22383 | #: git.c:842 |
06991777 JX |
22384 | #, c-format |
22385 | msgid "cannot handle %s as a builtin" | |
22386 | msgstr "不能作为内置命令处理 %s" | |
22387 | ||
349ede6a | 22388 | #: git.c:855 |
06991777 JX |
22389 | #, c-format |
22390 | msgid "" | |
22391 | "usage: %s\n" | |
22392 | "\n" | |
22393 | msgstr "" | |
22394 | "用法:%s\n" | |
22395 | "\n" | |
22396 | ||
349ede6a | 22397 | #: git.c:875 |
31e5e17b JX |
22398 | #, c-format |
22399 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
22400 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
22401 | ||
349ede6a | 22402 | #: git.c:887 |
31e5e17b JX |
22403 | #, c-format |
22404 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 22405 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 22406 | |
349ede6a | 22407 | #: http.c:399 |
60638e98 JX |
22408 | #, c-format |
22409 | msgid "negative value for http.postbuffer; defaulting to %d" | |
22410 | msgstr "http.postbuffer 为负值,默认为 %d" | |
22411 | ||
349ede6a | 22412 | #: http.c:420 |
a0b6b246 | 22413 | msgid "Delegation control is not supported with cURL < 7.22.0" |
4c27fcb5 | 22414 | msgstr "不支持委托控制,因为 cURL < 7.22.0" |
a0b6b246 | 22415 | |
349ede6a | 22416 | #: http.c:429 |
276ceeaa JX |
22417 | msgid "Public key pinning not supported with cURL < 7.44.0" |
22418 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
22419 | ||
7157c2b5 | 22420 | #: http.c:910 |
4c27fcb5 JX |
22421 | msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" |
22422 | msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0" | |
22423 | ||
7157c2b5 | 22424 | #: http.c:989 |
4c27fcb5 JX |
22425 | msgid "Protocol restrictions not supported with cURL < 7.19.4" |
22426 | msgstr "不支持协议限制,因为 cURL < 7.19.4" | |
22427 | ||
7157c2b5 | 22428 | #: http.c:1132 |
4c27fcb5 JX |
22429 | #, c-format |
22430 | msgid "Unsupported SSL backend '%s'. Supported SSL backends:" | |
22431 | msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:" | |
22432 | ||
7157c2b5 | 22433 | #: http.c:1139 |
4c27fcb5 JX |
22434 | #, c-format |
22435 | msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" | |
22436 | msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建" | |
22437 | ||
7157c2b5 | 22438 | #: http.c:1143 |
4c27fcb5 JX |
22439 | #, c-format |
22440 | msgid "Could not set SSL backend to '%s': already set" | |
22441 | msgstr "无法将 SSL 后端设置为 '%s':已经设置" | |
22442 | ||
7157c2b5 | 22443 | #: http.c:2025 |
1a79b2f1 JX |
22444 | #, c-format |
22445 | msgid "" | |
22446 | "unable to update url base from redirection:\n" | |
22447 | " asked for: %s\n" | |
22448 | " redirect: %s" | |
22449 | msgstr "" | |
22450 | "不能更新重定向的 url base:\n" | |
22451 | " 请求:%s\n" | |
22452 | " 重定向:%s" | |
22453 | ||
7157c2b5 | 22454 | #: remote-curl.c:168 |
d46c5519 JX |
22455 | #, c-format |
22456 | msgid "invalid quoting in push-option value: '%s'" | |
5b533632 | 22457 | msgstr "在 push-option 取值中无效的引号:'%s'" |
d46c5519 | 22458 | |
7157c2b5 | 22459 | #: remote-curl.c:295 |
d46c5519 JX |
22460 | #, c-format |
22461 | msgid "%sinfo/refs not valid: is this a git repository?" | |
22462 | msgstr "%sinfo/refs 无效:这是一个 git 仓库么?" | |
22463 | ||
7157c2b5 | 22464 | #: remote-curl.c:396 |
d46c5519 JX |
22465 | msgid "invalid server response; expected service, got flush packet" |
22466 | msgstr "无效的服务端响应。预期服务,得到 flush 包" | |
22467 | ||
7157c2b5 | 22468 | #: remote-curl.c:427 |
d46c5519 JX |
22469 | #, c-format |
22470 | msgid "invalid server response; got '%s'" | |
22471 | msgstr "无效的服务端响应,得到 '%s'" | |
22472 | ||
7157c2b5 | 22473 | #: remote-curl.c:487 |
d46c5519 JX |
22474 | #, c-format |
22475 | msgid "repository '%s' not found" | |
22476 | msgstr "仓库 '%s' 未找到" | |
22477 | ||
7157c2b5 | 22478 | #: remote-curl.c:491 |
d46c5519 JX |
22479 | #, c-format |
22480 | msgid "Authentication failed for '%s'" | |
22481 | msgstr "'%s' 鉴权失败" | |
22482 | ||
7157c2b5 | 22483 | #: remote-curl.c:495 |
d46c5519 JX |
22484 | #, c-format |
22485 | msgid "unable to access '%s': %s" | |
22486 | msgstr "无法访问 '%s':%s" | |
22487 | ||
7157c2b5 | 22488 | #: remote-curl.c:501 |
1a79b2f1 JX |
22489 | #, c-format |
22490 | msgid "redirecting to %s" | |
22491 | msgstr "重定向到 %s" | |
22492 | ||
7157c2b5 | 22493 | #: remote-curl.c:630 |
d46c5519 | 22494 | msgid "shouldn't have EOF when not gentle on EOF" |
5b533632 | 22495 | msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符" |
d46c5519 | 22496 | |
7157c2b5 JX |
22497 | #: remote-curl.c:642 |
22498 | msgid "remote server sent stateless separator" | |
22499 | msgstr "远程服务器发送了无状态分隔符" | |
22500 | ||
22501 | #: remote-curl.c:712 | |
d46c5519 JX |
22502 | msgid "unable to rewind rpc post data - try increasing http.postBuffer" |
22503 | msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" | |
22504 | ||
7157c2b5 JX |
22505 | #: remote-curl.c:742 |
22506 | #, c-format | |
22507 | msgid "remote-curl: bad line length character: %.4s" | |
22508 | msgstr "remote-curl:错误的行宽字符:%.4s" | |
22509 | ||
22510 | #: remote-curl.c:744 | |
22511 | msgid "remote-curl: unexpected response end packet" | |
22512 | msgstr "remote-curl:意外响应结束包" | |
22513 | ||
22514 | #: remote-curl.c:820 | |
d46c5519 JX |
22515 | #, c-format |
22516 | msgid "RPC failed; %s" | |
22517 | msgstr "RPC 失败。%s" | |
22518 | ||
7157c2b5 | 22519 | #: remote-curl.c:860 |
d46c5519 JX |
22520 | msgid "cannot handle pushes this big" |
22521 | msgstr "不能处理这么大的推送" | |
22522 | ||
7157c2b5 | 22523 | #: remote-curl.c:975 |
d46c5519 JX |
22524 | #, c-format |
22525 | msgid "cannot deflate request; zlib deflate error %d" | |
22526 | msgstr "不能压缩请求,zlib 压缩错误 %d" | |
22527 | ||
7157c2b5 | 22528 | #: remote-curl.c:979 |
d46c5519 JX |
22529 | #, c-format |
22530 | msgid "cannot deflate request; zlib end error %d" | |
22531 | msgstr "不能压缩请求,zlib 结束错误 %d" | |
22532 | ||
7157c2b5 JX |
22533 | #: remote-curl.c:1029 |
22534 | #, c-format | |
22535 | msgid "%d bytes of length header were received" | |
22536 | msgstr "收到了 %d 字节长度的头信息" | |
22537 | ||
22538 | #: remote-curl.c:1031 | |
22539 | #, c-format | |
22540 | msgid "%d bytes of body are still expected" | |
22541 | msgstr "预期仍然需要 %d 个字节的正文" | |
22542 | ||
22543 | #: remote-curl.c:1120 | |
d46c5519 JX |
22544 | msgid "dumb http transport does not support shallow capabilities" |
22545 | msgstr "哑 http 传输不支持 shalllow 能力" | |
22546 | ||
7157c2b5 | 22547 | #: remote-curl.c:1135 |
d46c5519 JX |
22548 | msgid "fetch failed." |
22549 | msgstr "获取失败。" | |
22550 | ||
7157c2b5 | 22551 | #: remote-curl.c:1183 |
d46c5519 JX |
22552 | msgid "cannot fetch by sha1 over smart http" |
22553 | msgstr "无法通过智能 HTTP 获取 sha1" | |
22554 | ||
7157c2b5 | 22555 | #: remote-curl.c:1227 remote-curl.c:1233 |
d46c5519 JX |
22556 | #, c-format |
22557 | msgid "protocol error: expected sha/ref, got '%s'" | |
22558 | msgstr "协议错误:期望 sha/ref,却得到 '%s'" | |
22559 | ||
7157c2b5 | 22560 | #: remote-curl.c:1245 remote-curl.c:1360 |
d46c5519 JX |
22561 | #, c-format |
22562 | msgid "http transport does not support %s" | |
22563 | msgstr "http 传输协议不支持 %s" | |
22564 | ||
7157c2b5 | 22565 | #: remote-curl.c:1281 |
d46c5519 JX |
22566 | msgid "git-http-push failed" |
22567 | msgstr "git-http-push 失败" | |
22568 | ||
7157c2b5 | 22569 | #: remote-curl.c:1466 |
d46c5519 JX |
22570 | msgid "remote-curl: usage: git remote-curl <remote> [<url>]" |
22571 | msgstr "remote-curl:用法:git remote-curl <远程> [<url>]" | |
22572 | ||
7157c2b5 | 22573 | #: remote-curl.c:1498 |
d46c5519 JX |
22574 | msgid "remote-curl: error reading command stream from git" |
22575 | msgstr "remote-curl:错误读取来自 git 的命令流" | |
22576 | ||
7157c2b5 | 22577 | #: remote-curl.c:1505 |
d46c5519 JX |
22578 | msgid "remote-curl: fetch attempted without a local repo" |
22579 | msgstr "remote-curl:尝试没有本地仓库下获取" | |
22580 | ||
7157c2b5 | 22581 | #: remote-curl.c:1546 |
d46c5519 JX |
22582 | #, c-format |
22583 | msgid "remote-curl: unknown command '%s' from git" | |
22584 | msgstr "remote-curl:未知的来自 git 的命令 '%s'" | |
22585 | ||
349ede6a JX |
22586 | #: compat/compiler.h:26 |
22587 | msgid "no compiler information available\n" | |
22588 | msgstr "编译器信息不可用\n" | |
22589 | ||
22590 | #: compat/compiler.h:38 | |
22591 | msgid "no libc information available\n" | |
22592 | msgstr "libc 信息不可用\n" | |
22593 | ||
a5cd71ca | 22594 | #: list-objects-filter-options.h:85 |
d46c5519 JX |
22595 | msgid "args" |
22596 | msgstr "参数" | |
22597 | ||
a5cd71ca | 22598 | #: list-objects-filter-options.h:86 |
d46c5519 JX |
22599 | msgid "object filtering" |
22600 | msgstr "对象过滤" | |
22601 | ||
ddc12c42 | 22602 | #: parse-options.h:183 |
fd8cb379 JX |
22603 | msgid "expiry-date" |
22604 | msgstr "到期时间" | |
7aea43ff | 22605 | |
ddc12c42 | 22606 | #: parse-options.h:197 |
fd8cb379 JX |
22607 | msgid "no-op (backward compatibility)" |
22608 | msgstr "空操作(向后兼容)" | |
7aea43ff | 22609 | |
ddc12c42 | 22610 | #: parse-options.h:309 |
fd8cb379 JX |
22611 | msgid "be more verbose" |
22612 | msgstr "更加详细" | |
7aea43ff | 22613 | |
ddc12c42 | 22614 | #: parse-options.h:311 |
fd8cb379 JX |
22615 | msgid "be more quiet" |
22616 | msgstr "更加安静" | |
7aea43ff | 22617 | |
ddc12c42 | 22618 | #: parse-options.h:317 |
fd8cb379 JX |
22619 | msgid "use <n> digits to display SHA-1s" |
22620 | msgstr "用 <n> 位数字显示 SHA-1 哈希值" | |
7aea43ff | 22621 | |
ddc12c42 | 22622 | #: parse-options.h:336 |
d46c5519 JX |
22623 | msgid "how to strip spaces and #comments from message" |
22624 | msgstr "设置如何删除提交说明里的空格和#注释" | |
22625 | ||
ddc12c42 JX |
22626 | #: parse-options.h:337 |
22627 | msgid "read pathspec from file" | |
22628 | msgstr "从文件读取路径表达式" | |
22629 | ||
22630 | #: parse-options.h:338 | |
22631 | msgid "" | |
22632 | "with --pathspec-from-file, pathspec elements are separated with NUL character" | |
22633 | msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔" | |
22634 | ||
d46c5519 JX |
22635 | #: ref-filter.h:101 |
22636 | msgid "key" | |
22637 | msgstr "key" | |
22638 | ||
22639 | #: ref-filter.h:101 | |
22640 | msgid "field name to sort on" | |
22641 | msgstr "排序的字段名" | |
22642 | ||
22643 | #: rerere.h:44 | |
22644 | msgid "update the index with reused conflict resolution if possible" | |
22645 | msgstr "如果可能,重用冲突解决更新索引" | |
22646 | ||
349ede6a | 22647 | #: wt-status.h:80 |
a6cd2cc4 JX |
22648 | msgid "HEAD detached at " |
22649 | msgstr "头指针分离于 " | |
22650 | ||
349ede6a | 22651 | #: wt-status.h:81 |
a6cd2cc4 JX |
22652 | msgid "HEAD detached from " |
22653 | msgstr "头指针分离自 " | |
22654 | ||
fd8cb379 | 22655 | #: command-list.h:50 |
8ada9598 | 22656 | msgid "Add file contents to the index" |
81809b99 | 22657 | msgstr "添加文件内容至索引" |
8ada9598 | 22658 | |
fd8cb379 JX |
22659 | #: command-list.h:51 |
22660 | msgid "Apply a series of patches from a mailbox" | |
22661 | msgstr "应用邮箱格式的系列补丁" | |
22662 | ||
22663 | #: command-list.h:52 | |
22664 | msgid "Annotate file lines with commit information" | |
22665 | msgstr "使用提交信息注释文件行" | |
22666 | ||
22667 | #: command-list.h:53 | |
22668 | msgid "Apply a patch to files and/or to the index" | |
22669 | msgstr "应用一个补丁到文件和/或索引区" | |
22670 | ||
22671 | #: command-list.h:54 | |
4c27fcb5 JX |
22672 | msgid "Import a GNU Arch repository into Git" |
22673 | msgstr "将一个 GNU Arch 仓库导入到 Git" | |
fd8cb379 JX |
22674 | |
22675 | #: command-list.h:55 | |
22676 | msgid "Create an archive of files from a named tree" | |
22677 | msgstr "基于一个指定的树创建文件存档" | |
22678 | ||
22679 | #: command-list.h:56 | |
1b7f4a34 JX |
22680 | msgid "Use binary search to find the commit that introduced a bug" |
22681 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 22682 | |
fd8cb379 JX |
22683 | #: command-list.h:57 |
22684 | msgid "Show what revision and author last modified each line of a file" | |
22685 | msgstr "显示文件每一行最后修改的版本和修改者" | |
22686 | ||
22687 | #: command-list.h:58 | |
8ada9598 | 22688 | msgid "List, create, or delete branches" |
81809b99 | 22689 | msgstr "列出、创建或删除分支" |
8ada9598 | 22690 | |
fd8cb379 | 22691 | #: command-list.h:59 |
349ede6a JX |
22692 | msgid "Collect information for user to file a bug report" |
22693 | msgstr "收集信息以供用户提交错误报告" | |
22694 | ||
22695 | #: command-list.h:60 | |
fd8cb379 JX |
22696 | msgid "Move objects and refs by archive" |
22697 | msgstr "通过归档移动对象和引用" | |
22698 | ||
349ede6a | 22699 | #: command-list.h:61 |
fd8cb379 JX |
22700 | msgid "Provide content or type and size information for repository objects" |
22701 | msgstr "提供仓库对象的内容、类型或大小" | |
22702 | ||
349ede6a | 22703 | #: command-list.h:62 |
fd8cb379 JX |
22704 | msgid "Display gitattributes information" |
22705 | msgstr "显示 gitattributes 信息" | |
22706 | ||
349ede6a | 22707 | #: command-list.h:63 |
fd8cb379 JX |
22708 | msgid "Debug gitignore / exclude files" |
22709 | msgstr "调试 gitignore / exclude 文件" | |
22710 | ||
349ede6a | 22711 | #: command-list.h:64 |
fd8cb379 JX |
22712 | msgid "Show canonical names and email addresses of contacts" |
22713 | msgstr "显示联系人的规范名称和电子邮件" | |
22714 | ||
349ede6a | 22715 | #: command-list.h:65 |
5bb01d4f JX |
22716 | msgid "Switch branches or restore working tree files" |
22717 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 22718 | |
349ede6a | 22719 | #: command-list.h:66 |
fd8cb379 JX |
22720 | msgid "Copy files from the index to the working tree" |
22721 | msgstr "从索引拷贝文件到工作区" | |
22722 | ||
349ede6a | 22723 | #: command-list.h:67 |
fd8cb379 JX |
22724 | msgid "Ensures that a reference name is well formed" |
22725 | msgstr "确保引用名称格式正确" | |
22726 | ||
349ede6a | 22727 | #: command-list.h:68 |
fd8cb379 JX |
22728 | msgid "Find commits yet to be applied to upstream" |
22729 | msgstr "查找尚未应用到上游的提交" | |
22730 | ||
349ede6a | 22731 | #: command-list.h:69 |
fd8cb379 JX |
22732 | msgid "Apply the changes introduced by some existing commits" |
22733 | msgstr "应用一些现存提交引入的修改" | |
22734 | ||
349ede6a | 22735 | #: command-list.h:70 |
fd8cb379 JX |
22736 | msgid "Graphical alternative to git-commit" |
22737 | msgstr "git-commit 的图形替代界面" | |
22738 | ||
349ede6a | 22739 | #: command-list.h:71 |
fd8cb379 JX |
22740 | msgid "Remove untracked files from the working tree" |
22741 | msgstr "从工作区中删除未跟踪文件" | |
22742 | ||
349ede6a | 22743 | #: command-list.h:72 |
8ada9598 | 22744 | msgid "Clone a repository into a new directory" |
06991777 | 22745 | msgstr "克隆仓库到一个新目录" |
8ada9598 | 22746 | |
349ede6a | 22747 | #: command-list.h:73 |
fd8cb379 JX |
22748 | msgid "Display data in columns" |
22749 | msgstr "以列的方式显示数据" | |
22750 | ||
349ede6a | 22751 | #: command-list.h:74 |
8ada9598 | 22752 | msgid "Record changes to the repository" |
160fb2b2 | 22753 | msgstr "记录变更到仓库" |
8ada9598 | 22754 | |
349ede6a | 22755 | #: command-list.h:75 |
4c27fcb5 JX |
22756 | msgid "Write and verify Git commit-graph files" |
22757 | msgstr "写入和校验 Git 提交图文件" | |
fd8cb379 | 22758 | |
349ede6a | 22759 | #: command-list.h:76 |
fd8cb379 JX |
22760 | msgid "Create a new commit object" |
22761 | msgstr "创建一个新的提交对象" | |
22762 | ||
349ede6a | 22763 | #: command-list.h:77 |
fd8cb379 JX |
22764 | msgid "Get and set repository or global options" |
22765 | msgstr "获取和设置仓库或者全局选项" | |
22766 | ||
349ede6a | 22767 | #: command-list.h:78 |
fd8cb379 JX |
22768 | msgid "Count unpacked number of objects and their disk consumption" |
22769 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
22770 | ||
349ede6a | 22771 | #: command-list.h:79 |
fd8cb379 JX |
22772 | msgid "Retrieve and store user credentials" |
22773 | msgstr "检索和存储用户密码" | |
22774 | ||
349ede6a | 22775 | #: command-list.h:80 |
fd8cb379 JX |
22776 | msgid "Helper to temporarily store passwords in memory" |
22777 | msgstr "在内存中临时存储密码的助手" | |
22778 | ||
349ede6a | 22779 | #: command-list.h:81 |
fd8cb379 JX |
22780 | msgid "Helper to store credentials on disk" |
22781 | msgstr "在磁盘存储密码的助手" | |
22782 | ||
349ede6a | 22783 | #: command-list.h:82 |
fd8cb379 JX |
22784 | msgid "Export a single commit to a CVS checkout" |
22785 | msgstr "将一个提交导出到 CVS 检出中" | |
22786 | ||
349ede6a | 22787 | #: command-list.h:83 |
fd8cb379 JX |
22788 | msgid "Salvage your data out of another SCM people love to hate" |
22789 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
22790 | ||
349ede6a | 22791 | #: command-list.h:84 |
fd8cb379 JX |
22792 | msgid "A CVS server emulator for Git" |
22793 | msgstr "Git 的一个 CVS 服务模拟器" | |
22794 | ||
349ede6a | 22795 | #: command-list.h:85 |
fd8cb379 JX |
22796 | msgid "A really simple server for Git repositories" |
22797 | msgstr "一个非常简单的 Git 仓库服务器" | |
22798 | ||
349ede6a | 22799 | #: command-list.h:86 |
fd8cb379 JX |
22800 | msgid "Give an object a human readable name based on an available ref" |
22801 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
22802 | ||
349ede6a | 22803 | #: command-list.h:87 |
8ada9598 | 22804 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 22805 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 22806 | |
349ede6a | 22807 | #: command-list.h:88 |
fd8cb379 JX |
22808 | msgid "Compares files in the working tree and the index" |
22809 | msgstr "比较工作区和索引区中的文件" | |
22810 | ||
349ede6a | 22811 | #: command-list.h:89 |
fd8cb379 JX |
22812 | msgid "Compare a tree to the working tree or index" |
22813 | msgstr "将一个树和工作区或索引做比较" | |
22814 | ||
349ede6a | 22815 | #: command-list.h:90 |
fd8cb379 JX |
22816 | msgid "Compares the content and mode of blobs found via two tree objects" |
22817 | msgstr "比较两个树对象的文件内容和模式" | |
22818 | ||
349ede6a | 22819 | #: command-list.h:91 |
fd8cb379 JX |
22820 | msgid "Show changes using common diff tools" |
22821 | msgstr "使用常见的差异工具显示更改" | |
22822 | ||
349ede6a | 22823 | #: command-list.h:92 |
fd8cb379 JX |
22824 | msgid "Git data exporter" |
22825 | msgstr "Git 数据导出器" | |
22826 | ||
349ede6a | 22827 | #: command-list.h:93 |
fd8cb379 JX |
22828 | msgid "Backend for fast Git data importers" |
22829 | msgstr "Git 快速数据导入器后端" | |
22830 | ||
349ede6a | 22831 | #: command-list.h:94 |
8ada9598 | 22832 | msgid "Download objects and refs from another repository" |
160fb2b2 | 22833 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 22834 | |
349ede6a | 22835 | #: command-list.h:95 |
fd8cb379 JX |
22836 | msgid "Receive missing objects from another repository" |
22837 | msgstr "从另一个仓库获取缺失的对象" | |
22838 | ||
349ede6a | 22839 | #: command-list.h:96 |
fd8cb379 JX |
22840 | msgid "Rewrite branches" |
22841 | msgstr "重写分支" | |
22842 | ||
349ede6a | 22843 | #: command-list.h:97 |
fd8cb379 JX |
22844 | msgid "Produce a merge commit message" |
22845 | msgstr "生成一个合并提交信息" | |
22846 | ||
349ede6a | 22847 | #: command-list.h:98 |
fd8cb379 JX |
22848 | msgid "Output information on each ref" |
22849 | msgstr "对每一个引用输出信息 " | |
22850 | ||
349ede6a | 22851 | #: command-list.h:99 |
fd8cb379 JX |
22852 | msgid "Prepare patches for e-mail submission" |
22853 | msgstr "准备电子邮件提交的补丁" | |
22854 | ||
349ede6a | 22855 | #: command-list.h:100 |
fd8cb379 JX |
22856 | msgid "Verifies the connectivity and validity of the objects in the database" |
22857 | msgstr "验证仓库中对象的连通性和有效性" | |
22858 | ||
349ede6a | 22859 | #: command-list.h:101 |
fd8cb379 JX |
22860 | msgid "Cleanup unnecessary files and optimize the local repository" |
22861 | msgstr "清除不必要的文件和优化本地仓库" | |
22862 | ||
349ede6a | 22863 | #: command-list.h:102 |
fd8cb379 | 22864 | msgid "Extract commit ID from an archive created using git-archive" |
5b533632 | 22865 | msgstr "从 git-archive 创建的归档文件中提取提交 ID" |
fd8cb379 | 22866 | |
349ede6a | 22867 | #: command-list.h:103 |
8ada9598 | 22868 | msgid "Print lines matching a pattern" |
81809b99 | 22869 | msgstr "输出和模式匹配的行" |
8ada9598 | 22870 | |
349ede6a | 22871 | #: command-list.h:104 |
fd8cb379 JX |
22872 | msgid "A portable graphical interface to Git" |
22873 | msgstr "一个便携的 Git 图形客户端" | |
22874 | ||
349ede6a | 22875 | #: command-list.h:105 |
fd8cb379 | 22876 | msgid "Compute object ID and optionally creates a blob from a file" |
5b533632 | 22877 | msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象" |
fd8cb379 | 22878 | |
349ede6a | 22879 | #: command-list.h:106 |
fd8cb379 JX |
22880 | msgid "Display help information about Git" |
22881 | msgstr "显示 Git 的帮助信息" | |
22882 | ||
349ede6a | 22883 | #: command-list.h:107 |
fd8cb379 JX |
22884 | msgid "Server side implementation of Git over HTTP" |
22885 | msgstr "Git HTTP 协议的服务端实现" | |
22886 | ||
349ede6a | 22887 | #: command-list.h:108 |
fd8cb379 JX |
22888 | msgid "Download from a remote Git repository via HTTP" |
22889 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
22890 | ||
349ede6a | 22891 | #: command-list.h:109 |
fd8cb379 JX |
22892 | msgid "Push objects over HTTP/DAV to another repository" |
22893 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
22894 | ||
349ede6a | 22895 | #: command-list.h:110 |
fd8cb379 JX |
22896 | msgid "Send a collection of patches from stdin to an IMAP folder" |
22897 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
22898 | ||
349ede6a | 22899 | #: command-list.h:111 |
fd8cb379 JX |
22900 | msgid "Build pack index file for an existing packed archive" |
22901 | msgstr "从一个现存的包存档文件创建包索引" | |
22902 | ||
349ede6a | 22903 | #: command-list.h:112 |
a77c07d9 | 22904 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 22905 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 22906 | |
349ede6a | 22907 | #: command-list.h:113 |
fd8cb379 JX |
22908 | msgid "Instantly browse your working repository in gitweb" |
22909 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
22910 | ||
349ede6a | 22911 | #: command-list.h:114 |
d46c5519 | 22912 | msgid "Add or parse structured information in commit messages" |
fd8cb379 JX |
22913 | msgstr "添加或解析提交说明中的结构化信息" |
22914 | ||
349ede6a | 22915 | #: command-list.h:115 |
fd8cb379 JX |
22916 | msgid "The Git repository browser" |
22917 | msgstr "Git 仓库浏览器" | |
22918 | ||
349ede6a | 22919 | #: command-list.h:116 |
8ada9598 | 22920 | msgid "Show commit logs" |
81809b99 | 22921 | msgstr "显示提交日志" |
8ada9598 | 22922 | |
349ede6a | 22923 | #: command-list.h:117 |
fd8cb379 JX |
22924 | msgid "Show information about files in the index and the working tree" |
22925 | msgstr "显示索引和工作区中文件的信息" | |
22926 | ||
349ede6a | 22927 | #: command-list.h:118 |
fd8cb379 JX |
22928 | msgid "List references in a remote repository" |
22929 | msgstr "显示一个远程仓库的引用" | |
22930 | ||
349ede6a | 22931 | #: command-list.h:119 |
fd8cb379 JX |
22932 | msgid "List the contents of a tree object" |
22933 | msgstr "显示一个树对象的内容" | |
22934 | ||
349ede6a | 22935 | #: command-list.h:120 |
fd8cb379 JX |
22936 | msgid "Extracts patch and authorship from a single e-mail message" |
22937 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
22938 | ||
349ede6a | 22939 | #: command-list.h:121 |
fd8cb379 JX |
22940 | msgid "Simple UNIX mbox splitter program" |
22941 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
22942 | ||
349ede6a | 22943 | #: command-list.h:122 |
8ada9598 | 22944 | msgid "Join two or more development histories together" |
81809b99 | 22945 | msgstr "合并两个或更多开发历史" |
8ada9598 | 22946 | |
349ede6a | 22947 | #: command-list.h:123 |
fd8cb379 JX |
22948 | msgid "Find as good common ancestors as possible for a merge" |
22949 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
22950 | ||
349ede6a | 22951 | #: command-list.h:124 |
fd8cb379 JX |
22952 | msgid "Run a three-way file merge" |
22953 | msgstr "运行一个三路文件合并" | |
22954 | ||
349ede6a | 22955 | #: command-list.h:125 |
fd8cb379 JX |
22956 | msgid "Run a merge for files needing merging" |
22957 | msgstr "对于需要合并的文件执行合并" | |
22958 | ||
349ede6a | 22959 | #: command-list.h:126 |
fd8cb379 JX |
22960 | msgid "The standard helper program to use with git-merge-index" |
22961 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
22962 | ||
349ede6a | 22963 | #: command-list.h:127 |
fd8cb379 JX |
22964 | msgid "Run merge conflict resolution tools to resolve merge conflicts" |
22965 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
22966 | ||
349ede6a | 22967 | #: command-list.h:128 |
fd8cb379 JX |
22968 | msgid "Show three-way merge without touching index" |
22969 | msgstr "显示三路合并而不动索引" | |
22970 | ||
349ede6a | 22971 | #: command-list.h:129 |
4c27fcb5 JX |
22972 | msgid "Write and verify multi-pack-indexes" |
22973 | msgstr "写入和校验多包索引" | |
22974 | ||
349ede6a | 22975 | #: command-list.h:130 |
fd8cb379 JX |
22976 | msgid "Creates a tag object" |
22977 | msgstr "创建一个标签对象" | |
22978 | ||
349ede6a | 22979 | #: command-list.h:131 |
fd8cb379 JX |
22980 | msgid "Build a tree-object from ls-tree formatted text" |
22981 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
22982 | ||
349ede6a | 22983 | #: command-list.h:132 |
8ada9598 | 22984 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 22985 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 22986 | |
fd8cb379 | 22987 | # 查找给定版本的符号名称 |
349ede6a | 22988 | #: command-list.h:133 |
fd8cb379 JX |
22989 | msgid "Find symbolic names for given revs" |
22990 | msgstr "查找给定版本的符号名称" | |
22991 | ||
349ede6a | 22992 | #: command-list.h:134 |
fd8cb379 JX |
22993 | msgid "Add or inspect object notes" |
22994 | msgstr "添加或检查对象注释" | |
22995 | ||
349ede6a | 22996 | #: command-list.h:135 |
fd8cb379 JX |
22997 | msgid "Import from and submit to Perforce repositories" |
22998 | msgstr "导入和提交到 Perforce 仓库中" | |
22999 | ||
349ede6a | 23000 | #: command-list.h:136 |
fd8cb379 JX |
23001 | msgid "Create a packed archive of objects" |
23002 | msgstr "创建对象的存档包" | |
23003 | ||
349ede6a | 23004 | #: command-list.h:137 |
fd8cb379 JX |
23005 | msgid "Find redundant pack files" |
23006 | msgstr "查找冗余的包文件" | |
23007 | ||
349ede6a | 23008 | #: command-list.h:138 |
fd8cb379 JX |
23009 | msgid "Pack heads and tags for efficient repository access" |
23010 | msgstr "打包头和标签以实现高效的仓库访问" | |
23011 | ||
349ede6a | 23012 | #: command-list.h:139 |
fd8cb379 JX |
23013 | msgid "Routines to help parsing remote repository access parameters" |
23014 | msgstr "帮助解析远程仓库访问参数的例程" | |
23015 | ||
349ede6a | 23016 | #: command-list.h:140 |
fd8cb379 | 23017 | msgid "Compute unique ID for a patch" |
5b533632 | 23018 | msgstr "计算一个补丁的唯一 ID" |
fd8cb379 | 23019 | |
349ede6a | 23020 | #: command-list.h:141 |
fd8cb379 JX |
23021 | msgid "Prune all unreachable objects from the object database" |
23022 | msgstr "删除对象库中所有不可达对象" | |
23023 | ||
349ede6a | 23024 | #: command-list.h:142 |
fd8cb379 JX |
23025 | msgid "Remove extra objects that are already in pack files" |
23026 | msgstr "删除已经在包文件中的多余对象" | |
23027 | ||
349ede6a | 23028 | #: command-list.h:143 |
2e8451e8 | 23029 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 23030 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 23031 | |
349ede6a | 23032 | #: command-list.h:144 |
8ada9598 | 23033 | msgid "Update remote refs along with associated objects" |
81809b99 | 23034 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 23035 | |
349ede6a | 23036 | #: command-list.h:145 |
fd8cb379 JX |
23037 | msgid "Applies a quilt patchset onto the current branch" |
23038 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
23039 | ||
349ede6a | 23040 | #: command-list.h:146 |
c1ac5258 JX |
23041 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
23042 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
23043 | ||
349ede6a | 23044 | #: command-list.h:147 |
fd8cb379 JX |
23045 | msgid "Reads tree information into the index" |
23046 | msgstr "将树信息读取到索引" | |
23047 | ||
349ede6a | 23048 | #: command-list.h:148 |
3495628d JX |
23049 | msgid "Reapply commits on top of another base tip" |
23050 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 23051 | |
349ede6a | 23052 | #: command-list.h:149 |
fd8cb379 JX |
23053 | msgid "Receive what is pushed into the repository" |
23054 | msgstr "接收推送到仓库中的对象" | |
23055 | ||
349ede6a | 23056 | #: command-list.h:150 |
fd8cb379 JX |
23057 | msgid "Manage reflog information" |
23058 | msgstr "管理 reflog 信息" | |
23059 | ||
349ede6a | 23060 | #: command-list.h:151 |
fd8cb379 JX |
23061 | msgid "Manage set of tracked repositories" |
23062 | msgstr "管理已跟踪仓库" | |
23063 | ||
349ede6a | 23064 | #: command-list.h:152 |
fd8cb379 JX |
23065 | msgid "Pack unpacked objects in a repository" |
23066 | msgstr "打包仓库中未打包对象" | |
23067 | ||
349ede6a | 23068 | #: command-list.h:153 |
fd8cb379 JX |
23069 | msgid "Create, list, delete refs to replace objects" |
23070 | msgstr "创建、列出、删除对象替换引用" | |
23071 | ||
349ede6a | 23072 | #: command-list.h:154 |
fd8cb379 JX |
23073 | msgid "Generates a summary of pending changes" |
23074 | msgstr "生成待定更改的摘要" | |
23075 | ||
349ede6a | 23076 | #: command-list.h:155 |
fd8cb379 JX |
23077 | msgid "Reuse recorded resolution of conflicted merges" |
23078 | msgstr "重用冲突合并的解决方案记录" | |
23079 | ||
349ede6a | 23080 | #: command-list.h:156 |
8ada9598 | 23081 | msgid "Reset current HEAD to the specified state" |
4375c10e | 23082 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 23083 | |
349ede6a | 23084 | #: command-list.h:157 |
a6cd2cc4 JX |
23085 | msgid "Restore working tree files" |
23086 | msgstr "恢复工作区文件" | |
23087 | ||
349ede6a | 23088 | #: command-list.h:158 |
fd8cb379 JX |
23089 | msgid "Revert some existing commits" |
23090 | msgstr "回退一些现存提交" | |
23091 | ||
349ede6a | 23092 | #: command-list.h:159 |
fd8cb379 JX |
23093 | msgid "Lists commit objects in reverse chronological order" |
23094 | msgstr "按时间顺序列出提交对象" | |
23095 | ||
349ede6a | 23096 | #: command-list.h:160 |
fd8cb379 JX |
23097 | msgid "Pick out and massage parameters" |
23098 | msgstr "选出并处理参数" | |
23099 | ||
349ede6a | 23100 | #: command-list.h:161 |
8ada9598 | 23101 | msgid "Remove files from the working tree and from the index" |
81809b99 | 23102 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 23103 | |
349ede6a | 23104 | #: command-list.h:162 |
fd8cb379 JX |
23105 | msgid "Send a collection of patches as emails" |
23106 | msgstr "通过电子邮件发送一组补丁" | |
23107 | ||
349ede6a | 23108 | #: command-list.h:163 |
fd8cb379 JX |
23109 | msgid "Push objects over Git protocol to another repository" |
23110 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
23111 | ||
349ede6a | 23112 | #: command-list.h:164 |
fd8cb379 JX |
23113 | msgid "Restricted login shell for Git-only SSH access" |
23114 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
23115 | ||
349ede6a | 23116 | #: command-list.h:165 |
fd8cb379 JX |
23117 | msgid "Summarize 'git log' output" |
23118 | msgstr "'git log' 输出摘要" | |
23119 | ||
349ede6a | 23120 | #: command-list.h:166 |
8ada9598 | 23121 | msgid "Show various types of objects" |
81809b99 | 23122 | msgstr "显示各种类型的对象" |
8ada9598 | 23123 | |
349ede6a | 23124 | #: command-list.h:167 |
fd8cb379 JX |
23125 | msgid "Show branches and their commits" |
23126 | msgstr "显示分支和提交" | |
23127 | ||
349ede6a | 23128 | #: command-list.h:168 |
fd8cb379 JX |
23129 | msgid "Show packed archive index" |
23130 | msgstr "显示打包归档索引" | |
23131 | ||
349ede6a | 23132 | #: command-list.h:169 |
fd8cb379 JX |
23133 | msgid "List references in a local repository" |
23134 | msgstr "显示本地仓库中的引用" | |
23135 | ||
349ede6a | 23136 | #: command-list.h:170 |
fd8cb379 JX |
23137 | msgid "Git's i18n setup code for shell scripts" |
23138 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
23139 | ||
349ede6a | 23140 | #: command-list.h:171 |
fd8cb379 JX |
23141 | msgid "Common Git shell script setup code" |
23142 | msgstr "常用的 Git shell 脚本设置代码" | |
23143 | ||
349ede6a | 23144 | #: command-list.h:172 |
ddc12c42 JX |
23145 | msgid "Initialize and modify the sparse-checkout" |
23146 | msgstr "初始化及修改稀疏检出" | |
23147 | ||
349ede6a | 23148 | #: command-list.h:173 |
fd8cb379 JX |
23149 | msgid "Stash the changes in a dirty working directory away" |
23150 | msgstr "贮藏脏工作区中的修改" | |
23151 | ||
349ede6a | 23152 | #: command-list.h:174 |
fd8cb379 JX |
23153 | msgid "Add file contents to the staging area" |
23154 | msgstr "将文件内容添加到索引" | |
23155 | ||
349ede6a | 23156 | #: command-list.h:175 |
8ada9598 | 23157 | msgid "Show the working tree status" |
81809b99 | 23158 | msgstr "显示工作区状态" |
8ada9598 | 23159 | |
349ede6a | 23160 | #: command-list.h:176 |
fd8cb379 JX |
23161 | msgid "Remove unnecessary whitespace" |
23162 | msgstr "删除不必要的空白字符" | |
23163 | ||
349ede6a | 23164 | #: command-list.h:177 |
fd8cb379 JX |
23165 | msgid "Initialize, update or inspect submodules" |
23166 | msgstr "初始化、更新或检查子模组" | |
23167 | ||
349ede6a | 23168 | #: command-list.h:178 |
fd8cb379 JX |
23169 | msgid "Bidirectional operation between a Subversion repository and Git" |
23170 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
23171 | ||
349ede6a | 23172 | #: command-list.h:179 |
a6cd2cc4 JX |
23173 | msgid "Switch branches" |
23174 | msgstr "切换分支" | |
23175 | ||
349ede6a | 23176 | #: command-list.h:180 |
fd8cb379 JX |
23177 | msgid "Read, modify and delete symbolic refs" |
23178 | msgstr "读取、修改和删除符号引用" | |
23179 | ||
349ede6a | 23180 | #: command-list.h:181 |
8ada9598 | 23181 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 23182 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 23183 | |
349ede6a | 23184 | #: command-list.h:182 |
fd8cb379 JX |
23185 | msgid "Creates a temporary file with a blob's contents" |
23186 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 23187 | |
349ede6a | 23188 | #: command-list.h:183 |
fd8cb379 JX |
23189 | msgid "Unpack objects from a packed archive" |
23190 | msgstr "从打包文件中解压缩对象" | |
220c313c | 23191 | |
349ede6a | 23192 | #: command-list.h:184 |
fd8cb379 JX |
23193 | msgid "Register file contents in the working tree to the index" |
23194 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 23195 | |
349ede6a | 23196 | #: command-list.h:185 |
fd8cb379 JX |
23197 | msgid "Update the object name stored in a ref safely" |
23198 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 23199 | |
349ede6a | 23200 | #: command-list.h:186 |
fd8cb379 JX |
23201 | msgid "Update auxiliary info file to help dumb servers" |
23202 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
23203 | ||
349ede6a | 23204 | #: command-list.h:187 |
fd8cb379 JX |
23205 | msgid "Send archive back to git-archive" |
23206 | msgstr "将存档发送回 git-archive" | |
23207 | ||
349ede6a | 23208 | #: command-list.h:188 |
fd8cb379 JX |
23209 | msgid "Send objects packed back to git-fetch-pack" |
23210 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
23211 | ||
349ede6a | 23212 | #: command-list.h:189 |
fd8cb379 JX |
23213 | msgid "Show a Git logical variable" |
23214 | msgstr "显示一个Git逻辑变量" | |
23215 | ||
349ede6a | 23216 | #: command-list.h:190 |
fd8cb379 JX |
23217 | msgid "Check the GPG signature of commits" |
23218 | msgstr "检查 GPG 提交签名" | |
23219 | ||
349ede6a | 23220 | #: command-list.h:191 |
fd8cb379 JX |
23221 | msgid "Validate packed Git archive files" |
23222 | msgstr "校验打包的Git存仓文件" | |
23223 | ||
349ede6a | 23224 | #: command-list.h:192 |
fd8cb379 JX |
23225 | msgid "Check the GPG signature of tags" |
23226 | msgstr "检查标签的 GPG 签名" | |
23227 | ||
349ede6a | 23228 | #: command-list.h:193 |
fd8cb379 JX |
23229 | msgid "Git web interface (web frontend to Git repositories)" |
23230 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
23231 | ||
349ede6a | 23232 | #: command-list.h:194 |
fd8cb379 JX |
23233 | msgid "Show logs with difference each commit introduces" |
23234 | msgstr "显示每一个提交引入的差异日志" | |
23235 | ||
349ede6a | 23236 | #: command-list.h:195 |
fd8cb379 JX |
23237 | msgid "Manage multiple working trees" |
23238 | msgstr "管理多个工作区" | |
23239 | ||
349ede6a | 23240 | #: command-list.h:196 |
fd8cb379 JX |
23241 | msgid "Create a tree object from the current index" |
23242 | msgstr "从当前索引创建一个树对象" | |
23243 | ||
349ede6a | 23244 | #: command-list.h:197 |
fd8cb379 JX |
23245 | msgid "Defining attributes per path" |
23246 | msgstr "定义路径的属性" | |
23247 | ||
349ede6a | 23248 | #: command-list.h:198 |
fd8cb379 JX |
23249 | msgid "Git command-line interface and conventions" |
23250 | msgstr "Git 命令行界面和约定" | |
23251 | ||
349ede6a | 23252 | #: command-list.h:199 |
fd8cb379 JX |
23253 | msgid "A Git core tutorial for developers" |
23254 | msgstr "面向开发人员的 Git 核心教程" | |
23255 | ||
349ede6a | 23256 | #: command-list.h:200 |
fd8cb379 JX |
23257 | msgid "Git for CVS users" |
23258 | msgstr "适合 CVS 用户的 Git 帮助" | |
23259 | ||
349ede6a | 23260 | #: command-list.h:201 |
fd8cb379 JX |
23261 | msgid "Tweaking diff output" |
23262 | msgstr "调整差异输出" | |
23263 | ||
349ede6a | 23264 | #: command-list.h:202 |
fd8cb379 JX |
23265 | msgid "A useful minimum set of commands for Everyday Git" |
23266 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
23267 | ||
349ede6a JX |
23268 | #: command-list.h:203 |
23269 | msgid "Frequently asked questions about using Git" | |
23270 | msgstr "关于使用 Git 的常见问题" | |
23271 | ||
23272 | #: command-list.h:204 | |
fd8cb379 JX |
23273 | msgid "A Git Glossary" |
23274 | msgstr "Git 词汇表" | |
23275 | ||
349ede6a | 23276 | #: command-list.h:205 |
fd8cb379 JX |
23277 | msgid "Hooks used by Git" |
23278 | msgstr "Git 使用的钩子" | |
23279 | ||
349ede6a | 23280 | #: command-list.h:206 |
fd8cb379 JX |
23281 | msgid "Specifies intentionally untracked files to ignore" |
23282 | msgstr "忽略指定的未跟踪文件" | |
23283 | ||
349ede6a | 23284 | #: command-list.h:207 |
fd8cb379 JX |
23285 | msgid "Defining submodule properties" |
23286 | msgstr "定义子模组属性" | |
23287 | ||
349ede6a | 23288 | #: command-list.h:208 |
fd8cb379 JX |
23289 | msgid "Git namespaces" |
23290 | msgstr "Git 名字空间" | |
23291 | ||
349ede6a | 23292 | #: command-list.h:209 |
fd8cb379 JX |
23293 | msgid "Git Repository Layout" |
23294 | msgstr "Git 仓库布局" | |
23295 | ||
349ede6a | 23296 | #: command-list.h:210 |
fd8cb379 JX |
23297 | msgid "Specifying revisions and ranges for Git" |
23298 | msgstr "指定 Git 的版本和版本范围" | |
23299 | ||
349ede6a | 23300 | #: command-list.h:211 |
ddc12c42 JX |
23301 | msgid "Mounting one repository inside another" |
23302 | msgstr "将一个仓库安装到另外一个仓库中" | |
23303 | ||
349ede6a | 23304 | #: command-list.h:212 |
fd8cb379 JX |
23305 | msgid "A tutorial introduction to Git: part two" |
23306 | msgstr "一个 Git 教程:第二部分" | |
23307 | ||
349ede6a | 23308 | #: command-list.h:213 |
fd8cb379 JX |
23309 | msgid "A tutorial introduction to Git" |
23310 | msgstr "一个 Git 教程" | |
23311 | ||
349ede6a | 23312 | #: command-list.h:214 |
fd8cb379 JX |
23313 | msgid "An overview of recommended workflows with Git" |
23314 | msgstr "Git 推荐的工作流概览" | |
220c313c | 23315 | |
5c57d762 | 23316 | #: git-bisect.sh:54 |
b694fbb1 JX |
23317 | msgid "You need to start by \"git bisect start\"" |
23318 | msgstr "您需要执行 \"git bisect start\" 来开始" | |
23319 | ||
90e6ef53 | 23320 | # 译者:注意保持句尾空格 |
c04f5ac3 JX |
23321 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
23322 | #. translation. The program will only accept English input | |
23323 | #. at this point. | |
5c57d762 | 23324 | #: git-bisect.sh:60 |
c04f5ac3 JX |
23325 | msgid "Do you want me to do it for you [Y/n]? " |
23326 | msgstr "您想让我为您这样做么[Y/n]? " | |
23327 | ||
06991777 | 23328 | #: git-bisect.sh:101 |
c04f5ac3 JX |
23329 | #, sh-format |
23330 | msgid "Bad rev input: $arg" | |
9a4b694c | 23331 | msgstr "坏的输入版本:$arg" |
c04f5ac3 | 23332 | |
06991777 | 23333 | #: git-bisect.sh:121 |
5c57d762 JX |
23334 | #, sh-format |
23335 | msgid "Bad rev input: $bisected_head" | |
9a4b694c | 23336 | msgstr "坏的输入版本:$bisected_head" |
c04f5ac3 | 23337 | |
06991777 | 23338 | #: git-bisect.sh:130 |
c04f5ac3 JX |
23339 | #, sh-format |
23340 | msgid "Bad rev input: $rev" | |
9a4b694c | 23341 | msgstr "坏的输入版本:$rev" |
c04f5ac3 | 23342 | |
06991777 | 23343 | #: git-bisect.sh:139 |
1b7f4a34 JX |
23344 | #, sh-format |
23345 | msgid "'git bisect $TERM_BAD' can take only one argument." | |
23346 | msgstr "'git bisect $TERM_BAD' 只能带一个参数。" | |
23347 | ||
06991777 | 23348 | #: git-bisect.sh:209 |
c04f5ac3 JX |
23349 | msgid "No logfile given" |
23350 | msgstr "未提供日志文件" | |
23351 | ||
06991777 | 23352 | #: git-bisect.sh:210 |
c04f5ac3 JX |
23353 | #, sh-format |
23354 | msgid "cannot read $file for replaying" | |
23355 | msgstr "不能读取 $file 来重放" | |
23356 | ||
349ede6a | 23357 | #: git-bisect.sh:233 |
c04f5ac3 JX |
23358 | msgid "?? what are you talking about?" |
23359 | msgstr "?? 您在说什么?" | |
23360 | ||
349ede6a | 23361 | #: git-bisect.sh:243 |
5809aa05 JX |
23362 | msgid "bisect run failed: no command provided." |
23363 | msgstr "二分查找运行失败:没有提供命令。" | |
23364 | ||
349ede6a | 23365 | #: git-bisect.sh:248 |
b694fbb1 JX |
23366 | #, sh-format |
23367 | msgid "running $command" | |
23368 | msgstr "运行 $command" | |
23369 | ||
349ede6a | 23370 | #: git-bisect.sh:255 |
b694fbb1 JX |
23371 | #, sh-format |
23372 | msgid "" | |
23373 | "bisect run failed:\n" | |
23374 | "exit code $res from '$command' is < 0 or >= 128" | |
23375 | msgstr "" | |
23376 | "二分查找运行失败:\n" | |
07432cef | 23377 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 23378 | |
349ede6a | 23379 | #: git-bisect.sh:281 |
b694fbb1 JX |
23380 | msgid "bisect run cannot continue any more" |
23381 | msgstr "二分查找不能继续运行" | |
23382 | ||
349ede6a | 23383 | #: git-bisect.sh:287 |
b694fbb1 JX |
23384 | #, sh-format |
23385 | msgid "" | |
23386 | "bisect run failed:\n" | |
23387 | "'bisect_state $state' exited with error code $res" | |
23388 | msgstr "" | |
23389 | "二分查找运行失败:\n" | |
23390 | "'bisect_state $state' 退出码为 $res" | |
23391 | ||
349ede6a | 23392 | #: git-bisect.sh:294 |
b694fbb1 JX |
23393 | msgid "bisect run success" |
23394 | msgstr "二分查找运行成功" | |
c04f5ac3 | 23395 | |
349ede6a | 23396 | #: git-bisect.sh:302 |
06991777 JX |
23397 | msgid "We are not bisecting." |
23398 | msgstr "我们没有在二分查找。" | |
94550ed3 | 23399 | |
5c57d762 JX |
23400 | #: git-merge-octopus.sh:46 |
23401 | msgid "" | |
23402 | "Error: Your local changes to the following files would be overwritten by " | |
23403 | "merge" | |
23404 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
23405 | ||
23406 | #: git-merge-octopus.sh:61 | |
23407 | msgid "Automated merge did not work." | |
9a4b694c | 23408 | msgstr "自动合并未生效。" |
5c57d762 JX |
23409 | |
23410 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 23411 | msgid "Should not be doing an octopus." |
5c57d762 JX |
23412 | msgstr "不应该执行章鱼式合并。" |
23413 | ||
23414 | #: git-merge-octopus.sh:73 | |
23415 | #, sh-format | |
23416 | msgid "Unable to find common commit with $pretty_name" | |
23417 | msgstr "无法找到和 $pretty_name 的基线提交" | |
23418 | ||
23419 | #: git-merge-octopus.sh:77 | |
23420 | #, sh-format | |
6937cb4e | 23421 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
23422 | msgstr "已经和 $pretty_name 保持一致" |
23423 | ||
23424 | #: git-merge-octopus.sh:89 | |
23425 | #, sh-format | |
23426 | msgid "Fast-forwarding to: $pretty_name" | |
23427 | msgstr "快进至:$pretty_name" | |
23428 | ||
23429 | #: git-merge-octopus.sh:97 | |
23430 | #, sh-format | |
23431 | msgid "Trying simple merge with $pretty_name" | |
23432 | msgstr "尝试和 $pretty_name 的简单合并" | |
23433 | ||
23434 | #: git-merge-octopus.sh:102 | |
23435 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 23436 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 23437 | |
349ede6a | 23438 | #: git-submodule.sh:205 |
2e8451e8 JX |
23439 | msgid "Relative path can only be used from the toplevel of the working tree" |
23440 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
23441 | ||
349ede6a | 23442 | #: git-submodule.sh:215 |
c04f5ac3 JX |
23443 | #, sh-format |
23444 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 23445 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 23446 | |
349ede6a | 23447 | #: git-submodule.sh:234 |
c04f5ac3 | 23448 | #, sh-format |
170e9899 JX |
23449 | msgid "'$sm_path' already exists in the index" |
23450 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 23451 | |
349ede6a | 23452 | #: git-submodule.sh:237 |
1a79b2f1 JX |
23453 | #, sh-format |
23454 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
23455 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
23456 | ||
349ede6a | 23457 | #: git-submodule.sh:244 |
d46c5519 JX |
23458 | #, sh-format |
23459 | msgid "'$sm_path' does not have a commit checked out" | |
5b533632 | 23460 | msgstr "'$sm_path' 没有检出的提交" |
d46c5519 | 23461 | |
349ede6a | 23462 | #: git-submodule.sh:275 |
b694fbb1 JX |
23463 | #, sh-format |
23464 | msgid "Adding existing repo at '$sm_path' to the index" | |
160fb2b2 | 23465 | msgstr "添加位于 '$sm_path' 的现存仓库到索引" |
b694fbb1 | 23466 | |
349ede6a | 23467 | #: git-submodule.sh:277 |
c04f5ac3 | 23468 | #, sh-format |
170e9899 | 23469 | msgid "'$sm_path' already exists and is not a valid git repo" |
160fb2b2 | 23470 | msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" |
c04f5ac3 | 23471 | |
349ede6a | 23472 | #: git-submodule.sh:285 |
07432cef WS |
23473 | #, sh-format |
23474 | msgid "A git directory for '$sm_name' is found locally with remote(s):" | |
160fb2b2 | 23475 | msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" |
07432cef | 23476 | |
349ede6a | 23477 | #: git-submodule.sh:287 |
07432cef WS |
23478 | #, sh-format |
23479 | msgid "" | |
5c57d762 JX |
23480 | "If you want to reuse this local git directory instead of cloning again from\n" |
23481 | " $realrepo\n" | |
23482 | "use the '--force' option. If the local git directory is not the correct " | |
23483 | "repo\n" | |
07432cef WS |
23484 | "or you are unsure what this means choose another name with the '--name' " |
23485 | "option." | |
5c57d762 JX |
23486 | msgstr "" |
23487 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
23488 | " $realrepo\n" | |
23489 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" | |
23490 | "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" | |
07432cef | 23491 | |
349ede6a | 23492 | #: git-submodule.sh:293 |
07432cef WS |
23493 | #, sh-format |
23494 | msgid "Reactivating local git directory for submodule '$sm_name'." | |
23495 | msgstr "激活本地 git 目录到子模组 '$sm_name'。" | |
23496 | ||
349ede6a | 23497 | #: git-submodule.sh:305 |
c04f5ac3 | 23498 | #, sh-format |
170e9899 JX |
23499 | msgid "Unable to checkout submodule '$sm_path'" |
23500 | msgstr "不能检出子模组 '$sm_path'" | |
c04f5ac3 | 23501 | |
349ede6a | 23502 | #: git-submodule.sh:310 |
c04f5ac3 | 23503 | #, sh-format |
170e9899 JX |
23504 | msgid "Failed to add submodule '$sm_path'" |
23505 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 23506 | |
349ede6a | 23507 | #: git-submodule.sh:319 |
c04f5ac3 | 23508 | #, sh-format |
170e9899 JX |
23509 | msgid "Failed to register submodule '$sm_path'" |
23510 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 23511 | |
349ede6a | 23512 | #: git-submodule.sh:592 |
c04f5ac3 | 23513 | #, sh-format |
2e8451e8 JX |
23514 | msgid "Unable to find current revision in submodule path '$displaypath'" |
23515 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 23516 | |
349ede6a | 23517 | #: git-submodule.sh:602 |
c04f5ac3 | 23518 | #, sh-format |
170e9899 JX |
23519 | msgid "Unable to fetch in submodule path '$sm_path'" |
23520 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 23521 | |
349ede6a | 23522 | #: git-submodule.sh:607 |
5c57d762 JX |
23523 | #, sh-format |
23524 | msgid "" | |
23525 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
23526 | "'$sm_path'" | |
9a4b694c | 23527 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 23528 | |
349ede6a | 23529 | #: git-submodule.sh:625 |
2e8451e8 | 23530 | #, sh-format |
d46c5519 JX |
23531 | msgid "" |
23532 | "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " | |
23533 | "$sha1:" | |
23534 | msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:" | |
2e8451e8 | 23535 | |
349ede6a | 23536 | #: git-submodule.sh:631 |
5c57d762 JX |
23537 | #, sh-format |
23538 | msgid "" | |
23539 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
23540 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
23541 | msgstr "" |
23542 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 23543 | |
349ede6a | 23544 | #: git-submodule.sh:638 |
6c94aba5 JX |
23545 | #, sh-format |
23546 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
23547 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
23548 | ||
349ede6a | 23549 | #: git-submodule.sh:639 |
c04f5ac3 | 23550 | #, sh-format |
6c94aba5 JX |
23551 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
23552 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
23553 | ||
349ede6a | 23554 | #: git-submodule.sh:643 |
6c94aba5 | 23555 | #, sh-format |
2e8451e8 JX |
23556 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
23557 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 23558 | |
349ede6a | 23559 | #: git-submodule.sh:644 |
c04f5ac3 | 23560 | #, sh-format |
2e8451e8 JX |
23561 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
23562 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 23563 | |
349ede6a | 23564 | #: git-submodule.sh:649 |
c04f5ac3 | 23565 | #, sh-format |
2e8451e8 JX |
23566 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
23567 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 23568 | |
349ede6a | 23569 | #: git-submodule.sh:650 |
c04f5ac3 | 23570 | #, sh-format |
2e8451e8 JX |
23571 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
23572 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 23573 | |
349ede6a | 23574 | #: git-submodule.sh:655 |
c04f5ac3 | 23575 | #, sh-format |
5b04ee3b JX |
23576 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
23577 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 23578 | |
349ede6a | 23579 | #: git-submodule.sh:656 |
c04f5ac3 | 23580 | #, sh-format |
5b04ee3b | 23581 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 23582 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 23583 | |
349ede6a | 23584 | #: git-submodule.sh:687 |
2e8451e8 JX |
23585 | #, sh-format |
23586 | msgid "Failed to recurse into submodule path '$displaypath'" | |
23587 | msgstr "无法递归进子模组路径 '$displaypath'" | |
23588 | ||
7157c2b5 | 23589 | #: git-submodule.sh:852 |
649900bc JX |
23590 | msgid "The --cached option cannot be used with the --files option" |
23591 | msgstr "选项 --cached 不能和选项 --files 同时使用" | |
b694fbb1 | 23592 | |
7157c2b5 | 23593 | #: git-submodule.sh:904 |
b694fbb1 JX |
23594 | #, sh-format |
23595 | msgid "unexpected mode $mod_dst" | |
23596 | msgstr "意外的模式 $mod_dst" | |
c04f5ac3 | 23597 | |
90e6ef53 | 23598 | # 译者:注意保持前导空格 |
7157c2b5 | 23599 | #: git-submodule.sh:924 |
c04f5ac3 | 23600 | #, sh-format |
2e8451e8 JX |
23601 | msgid " Warn: $display_name doesn't contain commit $sha1_src" |
23602 | msgstr " 警告:$display_name 未包含提交 $sha1_src" | |
c04f5ac3 | 23603 | |
90e6ef53 | 23604 | # 译者:注意保持前导空格 |
7157c2b5 | 23605 | #: git-submodule.sh:927 |
c04f5ac3 | 23606 | #, sh-format |
2e8451e8 JX |
23607 | msgid " Warn: $display_name doesn't contain commit $sha1_dst" |
23608 | msgstr " 警告:$display_name 未包含提交 $sha1_dst" | |
c04f5ac3 | 23609 | |
90e6ef53 | 23610 | # 译者:注意保持前导空格 |
7157c2b5 | 23611 | #: git-submodule.sh:930 |
c04f5ac3 | 23612 | #, sh-format |
2e8451e8 JX |
23613 | msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" |
23614 | msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst" | |
c04f5ac3 | 23615 | |
5b04ee3b JX |
23616 | #: git-parse-remote.sh:89 |
23617 | #, sh-format | |
23618 | msgid "See git-${cmd}(1) for details." | |
23619 | msgstr "详见 git-${cmd}(1)。" | |
5c57d762 | 23620 | |
a6cd2cc4 JX |
23621 | #: git-rebase--preserve-merges.sh:109 |
23622 | msgid "Applied autostash." | |
23623 | msgstr "已应用 autostash。" | |
23624 | ||
23625 | #: git-rebase--preserve-merges.sh:112 | |
23626 | #, sh-format | |
23627 | msgid "Cannot store $stash_sha1" | |
23628 | msgstr "不能存储 $stash_sha1" | |
23629 | ||
349ede6a JX |
23630 | #: git-rebase--preserve-merges.sh:113 |
23631 | msgid "" | |
23632 | "Applying autostash resulted in conflicts.\n" | |
23633 | "Your changes are safe in the stash.\n" | |
23634 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
23635 | msgstr "" | |
23636 | "应用 autostash 导致了冲突。\n" | |
23637 | "您的修改安全地保存在贮藏区中。\n" | |
23638 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
23639 | ||
a6cd2cc4 | 23640 | #: git-rebase--preserve-merges.sh:191 |
c1ac5258 JX |
23641 | #, sh-format |
23642 | msgid "Rebasing ($new_count/$total)" | |
23643 | msgstr "变基中($new_count/$total)" | |
23644 | ||
a6cd2cc4 | 23645 | #: git-rebase--preserve-merges.sh:207 |
c1ac5258 JX |
23646 | msgid "" |
23647 | "\n" | |
23648 | "Commands:\n" | |
23649 | "p, pick <commit> = use commit\n" | |
23650 | "r, reword <commit> = use commit, but edit the commit message\n" | |
23651 | "e, edit <commit> = use commit, but stop for amending\n" | |
23652 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
23653 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
23654 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
23655 | "d, drop <commit> = remove commit\n" | |
23656 | "l, label <label> = label current HEAD with a name\n" | |
23657 | "t, reset <label> = reset HEAD to a label\n" | |
23658 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
23659 | ". create a merge commit using the original merge commit's\n" | |
23660 | ". message (or the oneline, if no original merge commit was\n" | |
23661 | ". specified). Use -c <commit> to reword the commit message.\n" | |
23662 | "\n" | |
23663 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
23664 | msgstr "" | |
23665 | "\n" | |
23666 | "命令:\n" | |
23667 | "p, pick <提交> = 使用提交\n" | |
23668 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
23669 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
23670 | "s, squash <提交> = 使用提交,但融合到前一个提交\n" | |
23671 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" | |
23672 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
23673 | "d, drop <提交> = 删除提交\n" | |
23674 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
23675 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
23676 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
23677 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
23678 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
23679 | ". -c <提交> 可以编辑提交说明。\n" | |
23680 | "\n" | |
23681 | "可以对这些行重新排序,将从上至下执行。\n" | |
23682 | ||
a6cd2cc4 | 23683 | #: git-rebase--preserve-merges.sh:270 |
5c57d762 JX |
23684 | #, sh-format |
23685 | msgid "" | |
23686 | "You can amend the commit now, with\n" | |
23687 | "\n" | |
23688 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
23689 | "\n" | |
23690 | "Once you are satisfied with your changes, run\n" | |
23691 | "\n" | |
23692 | "\tgit rebase --continue" | |
23693 | msgstr "" | |
23694 | "您现在可以修补这个提交,使用\n" | |
23695 | "\n" | |
23696 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
23697 | "\n" | |
9a4b694c | 23698 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
23699 | "\n" |
23700 | "\tgit rebase --continue" | |
23701 | ||
a6cd2cc4 | 23702 | #: git-rebase--preserve-merges.sh:295 |
5c57d762 JX |
23703 | #, sh-format |
23704 | msgid "$sha1: not a commit that can be picked" | |
23705 | msgstr "$sha1:不是一个可以被拣选的提交" | |
23706 | ||
a6cd2cc4 | 23707 | #: git-rebase--preserve-merges.sh:334 |
5c57d762 JX |
23708 | #, sh-format |
23709 | msgid "Invalid commit name: $sha1" | |
23710 | msgstr "无效的提交名:$sha1" | |
23711 | ||
a6cd2cc4 | 23712 | #: git-rebase--preserve-merges.sh:364 |
5c57d762 JX |
23713 | msgid "Cannot write current commit's replacement sha1" |
23714 | msgstr "不能写入当前提交的替代 sha1" | |
23715 | ||
a6cd2cc4 | 23716 | #: git-rebase--preserve-merges.sh:415 |
5c57d762 JX |
23717 | #, sh-format |
23718 | msgid "Fast-forward to $sha1" | |
23719 | msgstr "快进到 $sha1" | |
23720 | ||
a6cd2cc4 | 23721 | #: git-rebase--preserve-merges.sh:417 |
5c57d762 JX |
23722 | #, sh-format |
23723 | msgid "Cannot fast-forward to $sha1" | |
23724 | msgstr "不能快进到 $sha1" | |
23725 | ||
a6cd2cc4 | 23726 | #: git-rebase--preserve-merges.sh:426 |
5c57d762 JX |
23727 | #, sh-format |
23728 | msgid "Cannot move HEAD to $first_parent" | |
23729 | msgstr "不能移动 HEAD 到 $first_parent" | |
23730 | ||
a6cd2cc4 | 23731 | #: git-rebase--preserve-merges.sh:431 |
5c57d762 JX |
23732 | #, sh-format |
23733 | msgid "Refusing to squash a merge: $sha1" | |
23734 | msgstr "拒绝压缩一个合并:$sha1" | |
23735 | ||
a6cd2cc4 | 23736 | #: git-rebase--preserve-merges.sh:449 |
5c57d762 JX |
23737 | #, sh-format |
23738 | msgid "Error redoing merge $sha1" | |
23739 | msgstr "无法重做合并 $sha1" | |
23740 | ||
a6cd2cc4 | 23741 | #: git-rebase--preserve-merges.sh:458 |
5c57d762 JX |
23742 | #, sh-format |
23743 | msgid "Could not pick $sha1" | |
23744 | msgstr "不能拣选 $sha1" | |
23745 | ||
a6cd2cc4 | 23746 | #: git-rebase--preserve-merges.sh:467 |
5c57d762 JX |
23747 | #, sh-format |
23748 | msgid "This is the commit message #${n}:" | |
9a4b694c | 23749 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 23750 | |
a6cd2cc4 | 23751 | #: git-rebase--preserve-merges.sh:472 |
5c57d762 JX |
23752 | #, sh-format |
23753 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 23754 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 23755 | |
a6cd2cc4 | 23756 | #: git-rebase--preserve-merges.sh:483 |
5c57d762 JX |
23757 | #, sh-format |
23758 | msgid "This is a combination of $count commit." | |
23759 | msgid_plural "This is a combination of $count commits." | |
23760 | msgstr[0] "这是一个 $count 个提交的组合。" | |
23761 | msgstr[1] "这是一个 $count 个提交的组合。" | |
23762 | ||
a6cd2cc4 | 23763 | #: git-rebase--preserve-merges.sh:492 |
5c57d762 JX |
23764 | #, sh-format |
23765 | msgid "Cannot write $fixup_msg" | |
23766 | msgstr "不能写入 $fixup_msg" | |
23767 | ||
a6cd2cc4 | 23768 | #: git-rebase--preserve-merges.sh:495 |
5c57d762 JX |
23769 | msgid "This is a combination of 2 commits." |
23770 | msgstr "这是一个 2 个提交的组合。" | |
23771 | ||
a6cd2cc4 JX |
23772 | #: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 |
23773 | #: git-rebase--preserve-merges.sh:582 | |
5c57d762 JX |
23774 | #, sh-format |
23775 | msgid "Could not apply $sha1... $rest" | |
23776 | msgstr "不能应用 $sha1... $rest" | |
23777 | ||
a6cd2cc4 | 23778 | #: git-rebase--preserve-merges.sh:611 |
5c57d762 JX |
23779 | #, sh-format |
23780 | msgid "" | |
23781 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
23782 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
23783 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
23784 | "before\n" | |
23785 | "you are able to reword the commit." | |
23786 | msgstr "" | |
23787 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
23788 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
23789 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
23790 | ||
a6cd2cc4 | 23791 | #: git-rebase--preserve-merges.sh:626 |
5c57d762 JX |
23792 | #, sh-format |
23793 | msgid "Stopped at $sha1_abbrev... $rest" | |
23794 | msgstr "停止在 $sha1_abbrev... $rest" | |
23795 | ||
a6cd2cc4 | 23796 | #: git-rebase--preserve-merges.sh:641 |
5c57d762 JX |
23797 | #, sh-format |
23798 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 23799 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 23800 | |
a6cd2cc4 | 23801 | #: git-rebase--preserve-merges.sh:683 |
5c57d762 JX |
23802 | #, sh-format |
23803 | msgid "Executing: $rest" | |
23804 | msgstr "执行:$rest" | |
23805 | ||
a6cd2cc4 | 23806 | #: git-rebase--preserve-merges.sh:691 |
5c57d762 JX |
23807 | #, sh-format |
23808 | msgid "Execution failed: $rest" | |
23809 | msgstr "执行失败:$rest" | |
23810 | ||
a6cd2cc4 | 23811 | #: git-rebase--preserve-merges.sh:693 |
5c57d762 JX |
23812 | msgid "and made changes to the index and/or the working tree" |
23813 | msgstr "并且修改索引和/或工作区" | |
23814 | ||
23815 | # 译者:注意保持前导空格 | |
a6cd2cc4 | 23816 | #: git-rebase--preserve-merges.sh:695 |
5c57d762 JX |
23817 | msgid "" |
23818 | "You can fix the problem, and then run\n" | |
23819 | "\n" | |
23820 | "\tgit rebase --continue" | |
23821 | msgstr "" | |
23822 | "您可以解决这个问题,然后运行\n" | |
23823 | "\n" | |
23824 | "\tgit rebase --continue" | |
23825 | ||
23826 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
a6cd2cc4 | 23827 | #: git-rebase--preserve-merges.sh:708 |
5c57d762 JX |
23828 | #, sh-format |
23829 | msgid "" | |
23830 | "Execution succeeded: $rest\n" | |
23831 | "but left changes to the index and/or the working tree\n" | |
23832 | "Commit or stash your changes, and then run\n" | |
23833 | "\n" | |
23834 | "\tgit rebase --continue" | |
23835 | msgstr "" | |
23836 | "执行成功:$rest\n" | |
a4f16749 | 23837 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
23838 | "\n" |
23839 | "\tgit rebase --continue" | |
23840 | ||
a6cd2cc4 | 23841 | #: git-rebase--preserve-merges.sh:719 |
5c57d762 JX |
23842 | #, sh-format |
23843 | msgid "Unknown command: $command $sha1 $rest" | |
23844 | msgstr "未知命令:$command $sha1 $rest" | |
23845 | ||
a6cd2cc4 | 23846 | #: git-rebase--preserve-merges.sh:720 |
5c57d762 JX |
23847 | msgid "Please fix this using 'git rebase --edit-todo'." |
23848 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
23849 | ||
a6cd2cc4 | 23850 | #: git-rebase--preserve-merges.sh:755 |
5c57d762 JX |
23851 | #, sh-format |
23852 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 23853 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 23854 | |
a6cd2cc4 | 23855 | #: git-rebase--preserve-merges.sh:812 |
5c57d762 JX |
23856 | msgid "Could not remove CHERRY_PICK_HEAD" |
23857 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
23858 | ||
a6cd2cc4 | 23859 | #: git-rebase--preserve-merges.sh:817 |
5c57d762 JX |
23860 | #, sh-format |
23861 | msgid "" | |
23862 | "You have staged changes in your working tree.\n" | |
23863 | "If these changes are meant to be\n" | |
23864 | "squashed into the previous commit, run:\n" | |
23865 | "\n" | |
23866 | " git commit --amend $gpg_sign_opt_quoted\n" | |
23867 | "\n" | |
23868 | "If they are meant to go into a new commit, run:\n" | |
23869 | "\n" | |
23870 | " git commit $gpg_sign_opt_quoted\n" | |
23871 | "\n" | |
a0b6b246 | 23872 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
23873 | "\n" |
23874 | " git rebase --continue\n" | |
23875 | msgstr "" | |
23876 | "您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n" | |
23877 | "\n" | |
23878 | " git commit --amend $gpg_sign_opt_quoted\n" | |
23879 | "\n" | |
23880 | "如果这些变更要形成一个新提交,执行:\n" | |
23881 | "\n" | |
23882 | " git commit $gpg_sign_opt_quoted\n" | |
23883 | "\n" | |
9a4b694c | 23884 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
23885 | "\n" |
23886 | " git rebase --continue\n" | |
23887 | ||
a6cd2cc4 | 23888 | #: git-rebase--preserve-merges.sh:834 |
5c57d762 | 23889 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 23890 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 23891 | |
a6cd2cc4 | 23892 | #: git-rebase--preserve-merges.sh:839 |
5c57d762 JX |
23893 | msgid "" |
23894 | "You have uncommitted changes in your working tree. Please commit them\n" | |
23895 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
23896 | msgstr "" |
23897 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 23898 | |
a6cd2cc4 | 23899 | #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 |
5c57d762 JX |
23900 | msgid "Could not commit staged changes." |
23901 | msgstr "不能提交暂存的修改。" | |
23902 | ||
a6cd2cc4 | 23903 | #: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 |
4c27fcb5 JX |
23904 | msgid "Could not execute editor" |
23905 | msgstr "无法运行编辑器" | |
23906 | ||
a6cd2cc4 | 23907 | #: git-rebase--preserve-merges.sh:900 |
4c27fcb5 JX |
23908 | #, sh-format |
23909 | msgid "Could not checkout $switch_to" | |
23910 | msgstr "不能检出 $switch_to" | |
23911 | ||
a6cd2cc4 | 23912 | #: git-rebase--preserve-merges.sh:907 |
4c27fcb5 JX |
23913 | msgid "No HEAD?" |
23914 | msgstr "没有 HEAD?" | |
23915 | ||
a6cd2cc4 | 23916 | #: git-rebase--preserve-merges.sh:908 |
4c27fcb5 JX |
23917 | #, sh-format |
23918 | msgid "Could not create temporary $state_dir" | |
23919 | msgstr "不能创建临时 $state_dir" | |
23920 | ||
a6cd2cc4 | 23921 | #: git-rebase--preserve-merges.sh:911 |
4c27fcb5 JX |
23922 | msgid "Could not mark as interactive" |
23923 | msgstr "不能标记为交互式" | |
23924 | ||
a6cd2cc4 | 23925 | #: git-rebase--preserve-merges.sh:943 |
4c27fcb5 JX |
23926 | #, sh-format |
23927 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
23928 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
23929 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
23930 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
5c57d762 | 23931 | |
2b472aae JX |
23932 | #: git-rebase--preserve-merges.sh:955 |
23933 | msgid "Note that empty commits are commented out" | |
23934 | msgstr "注意空提交已被注释掉" | |
23935 | ||
a6cd2cc4 | 23936 | #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 |
fd8cb379 JX |
23937 | msgid "Could not init rewritten commits" |
23938 | msgstr "不能对重写提交进行初始化" | |
23939 | ||
5c57d762 JX |
23940 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
23941 | #, sh-format | |
23942 | msgid "usage: $dashless $USAGE" | |
23943 | msgstr "用法:$dashless $USAGE" | |
23944 | ||
d46c5519 | 23945 | #: git-sh-setup.sh:191 |
5c57d762 JX |
23946 | #, sh-format |
23947 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 23948 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 | 23949 | |
d46c5519 | 23950 | #: git-sh-setup.sh:200 git-sh-setup.sh:207 |
5c57d762 JX |
23951 | #, sh-format |
23952 | msgid "fatal: $program_name cannot be used without a working tree." | |
06991777 | 23953 | msgstr "致命错误:$program_name 不能在没有工作区的情况下使用" |
5c57d762 | 23954 | |
d46c5519 | 23955 | #: git-sh-setup.sh:221 |
5c57d762 JX |
23956 | msgid "Cannot rebase: You have unstaged changes." |
23957 | msgstr "不能变基:您有未暂存的变更。" | |
23958 | ||
d46c5519 | 23959 | #: git-sh-setup.sh:224 |
5c57d762 JX |
23960 | msgid "Cannot rewrite branches: You have unstaged changes." |
23961 | msgstr "不能重写分支:您有未暂存的变更。" | |
23962 | ||
d46c5519 | 23963 | #: git-sh-setup.sh:227 |
a0b6b246 JX |
23964 | msgid "Cannot pull with rebase: You have unstaged changes." |
23965 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
23966 | ||
d46c5519 | 23967 | #: git-sh-setup.sh:230 |
5c57d762 JX |
23968 | #, sh-format |
23969 | msgid "Cannot $action: You have unstaged changes." | |
23970 | msgstr "不能 $action:您有未暂存的变更。" | |
23971 | ||
d46c5519 | 23972 | #: git-sh-setup.sh:243 |
5c57d762 JX |
23973 | msgid "Cannot rebase: Your index contains uncommitted changes." |
23974 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
23975 | ||
d46c5519 | 23976 | #: git-sh-setup.sh:246 |
a0b6b246 JX |
23977 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
23978 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
23979 | ||
d46c5519 | 23980 | #: git-sh-setup.sh:249 |
5c57d762 JX |
23981 | #, sh-format |
23982 | msgid "Cannot $action: Your index contains uncommitted changes." | |
23983 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
23984 | ||
d46c5519 | 23985 | #: git-sh-setup.sh:253 |
a0b6b246 JX |
23986 | msgid "Additionally, your index contains uncommitted changes." |
23987 | msgstr "而且您的索引中包含未提交的变更。" | |
23988 | ||
d46c5519 | 23989 | #: git-sh-setup.sh:373 |
5c57d762 JX |
23990 | msgid "You need to run this command from the toplevel of the working tree." |
23991 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
23992 | ||
d46c5519 | 23993 | #: git-sh-setup.sh:378 |
5c57d762 JX |
23994 | msgid "Unable to determine absolute path of git directory" |
23995 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 23996 | |
1a79b2f1 | 23997 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
ddc12c42 | 23998 | #: git-add--interactive.perl:212 |
1a79b2f1 JX |
23999 | #, perl-format |
24000 | msgid "%12s %12s %s" | |
24001 | msgstr "%12s %12s %s" | |
24002 | ||
ddc12c42 | 24003 | #: git-add--interactive.perl:634 |
1a79b2f1 JX |
24004 | #, perl-format |
24005 | msgid "touched %d path\n" | |
24006 | msgid_plural "touched %d paths\n" | |
24007 | msgstr[0] "触碰了 %d 个路径\n" | |
24008 | msgstr[1] "触碰了 %d 个路径\n" | |
24009 | ||
7157c2b5 | 24010 | #: git-add--interactive.perl:1055 |
1a79b2f1 JX |
24011 | msgid "" |
24012 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
24013 | "marked for staging." | |
24014 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
24015 | ||
7157c2b5 | 24016 | #: git-add--interactive.perl:1058 |
1a79b2f1 JX |
24017 | msgid "" |
24018 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
24019 | "marked for stashing." | |
a4f16749 | 24020 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 24021 | |
7157c2b5 | 24022 | #: git-add--interactive.perl:1061 |
1a79b2f1 JX |
24023 | msgid "" |
24024 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
24025 | "marked for unstaging." | |
24026 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
24027 | ||
7157c2b5 JX |
24028 | #: git-add--interactive.perl:1064 git-add--interactive.perl:1073 |
24029 | #: git-add--interactive.perl:1079 | |
1a79b2f1 JX |
24030 | msgid "" |
24031 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
24032 | "marked for applying." | |
24033 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
24034 | ||
7157c2b5 JX |
24035 | #: git-add--interactive.perl:1067 git-add--interactive.perl:1070 |
24036 | #: git-add--interactive.perl:1076 | |
1a79b2f1 JX |
24037 | msgid "" |
24038 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
24039 | "marked for discarding." | |
24040 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
24041 | ||
7157c2b5 | 24042 | #: git-add--interactive.perl:1113 |
1a79b2f1 JX |
24043 | #, perl-format |
24044 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 24045 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 24046 | |
7157c2b5 | 24047 | #: git-add--interactive.perl:1120 |
1a79b2f1 JX |
24048 | #, perl-format |
24049 | msgid "" | |
24050 | "---\n" | |
24051 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
24052 | "To remove '%s' lines, delete them.\n" | |
24053 | "Lines starting with %s will be removed.\n" | |
24054 | msgstr "" | |
24055 | "---\n" | |
24056 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
24057 | "要删除 '%s' 开始的行,删除它们。\n" | |
24058 | "以 %s 开始的行将被删除。\n" | |
24059 | ||
7157c2b5 | 24060 | #: git-add--interactive.perl:1142 |
1a79b2f1 JX |
24061 | #, perl-format |
24062 | msgid "failed to open hunk edit file for reading: %s" | |
24063 | msgstr "无法读取块编辑文件:%s" | |
24064 | ||
7157c2b5 | 24065 | #: git-add--interactive.perl:1250 |
1a79b2f1 JX |
24066 | msgid "" |
24067 | "y - stage this hunk\n" | |
24068 | "n - do not stage this hunk\n" | |
24069 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
24070 | "a - stage this hunk and all later hunks in the file\n" | |
24071 | "d - do not stage this hunk or any of the later hunks in the file" | |
24072 | msgstr "" | |
24073 | "y - 暂存该块\n" | |
24074 | "n - 不要暂存该块\n" | |
24075 | "q - 退出。不暂存该块及后面的全部块\n" | |
24076 | "a - 暂存该块和本文件中后面的全部块\n" | |
24077 | "d - 不暂存该块和本文件中后面的全部块" | |
24078 | ||
7157c2b5 | 24079 | #: git-add--interactive.perl:1256 |
1a79b2f1 JX |
24080 | msgid "" |
24081 | "y - stash this hunk\n" | |
24082 | "n - do not stash this hunk\n" | |
24083 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
24084 | "a - stash this hunk and all later hunks in the file\n" | |
24085 | "d - do not stash this hunk or any of the later hunks in the file" | |
24086 | msgstr "" | |
24087 | "y - 贮藏该块\n" | |
24088 | "n - 不要贮藏该块\n" | |
24089 | "q - 退出。不贮藏该块及后面的全部块\n" | |
24090 | "a - 贮藏该块和本文件中后面的全部块\n" | |
24091 | "d - 不贮藏该块和本文件中后面的全部块" | |
24092 | ||
7157c2b5 | 24093 | #: git-add--interactive.perl:1262 |
1a79b2f1 JX |
24094 | msgid "" |
24095 | "y - unstage this hunk\n" | |
24096 | "n - do not unstage this hunk\n" | |
24097 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
24098 | "a - unstage this hunk and all later hunks in the file\n" | |
24099 | "d - do not unstage this hunk or any of the later hunks in the file" | |
24100 | msgstr "" | |
24101 | "y - 不暂存该块\n" | |
24102 | "n - 不要不暂存该块\n" | |
24103 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
24104 | "a - 不暂存该块和本文件中后面的全部块\n" | |
24105 | "d - 不要不暂存该块和本文件中后面的全部块" | |
24106 | ||
7157c2b5 | 24107 | #: git-add--interactive.perl:1268 |
1a79b2f1 JX |
24108 | msgid "" |
24109 | "y - apply this hunk to index\n" | |
24110 | "n - do not apply this hunk to index\n" | |
24111 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
24112 | "a - apply this hunk and all later hunks in the file\n" | |
24113 | "d - do not apply this hunk or any of the later hunks in the file" | |
24114 | msgstr "" | |
24115 | "y - 在索引中应用该块\n" | |
24116 | "n - 不要在索引中应用该块\n" | |
24117 | "q - 退出。不要应用该块及后面的全部块\n" | |
24118 | "a - 应用该块和本文件中后面的全部块\n" | |
24119 | "d - 不要应用该块和本文件中后面的全部块" | |
24120 | ||
7157c2b5 | 24121 | #: git-add--interactive.perl:1274 git-add--interactive.perl:1292 |
1a79b2f1 JX |
24122 | msgid "" |
24123 | "y - discard this hunk from worktree\n" | |
24124 | "n - do not discard this hunk from worktree\n" | |
24125 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
24126 | "a - discard this hunk and all later hunks in the file\n" | |
24127 | "d - do not discard this hunk or any of the later hunks in the file" | |
24128 | msgstr "" | |
24129 | "y - 在工作区中丢弃该块\n" | |
24130 | "n - 不要在工作区中丢弃该块\n" | |
24131 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
24132 | "a - 丢弃该块和本文件中后面的全部块\n" | |
24133 | "d - 不要丢弃该块和本文件中后面的全部块" | |
24134 | ||
7157c2b5 | 24135 | #: git-add--interactive.perl:1280 |
1a79b2f1 JX |
24136 | msgid "" |
24137 | "y - discard this hunk from index and worktree\n" | |
24138 | "n - do not discard this hunk from index and worktree\n" | |
24139 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
24140 | "a - discard this hunk and all later hunks in the file\n" | |
24141 | "d - do not discard this hunk or any of the later hunks in the file" | |
24142 | msgstr "" | |
24143 | "y - 在索引和工作区中丢弃该块\n" | |
24144 | "n - 不要在索引和工作区中丢弃该块\n" | |
24145 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
24146 | "a - 丢弃该块和本文件中后面的全部块\n" | |
24147 | "d - 不要丢弃该块和本文件中后面的全部块" | |
24148 | ||
7157c2b5 | 24149 | #: git-add--interactive.perl:1286 |
1a79b2f1 JX |
24150 | msgid "" |
24151 | "y - apply this hunk to index and worktree\n" | |
24152 | "n - do not apply this hunk to index and worktree\n" | |
24153 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
24154 | "a - apply this hunk and all later hunks in the file\n" | |
24155 | "d - do not apply this hunk or any of the later hunks in the file" | |
24156 | msgstr "" | |
24157 | "y - 在索引和工作区中应用该块\n" | |
24158 | "n - 不要在索引和工作区中应用该块\n" | |
24159 | "q - 退出。不要应用该块及后面的全部块\n" | |
24160 | "a - 应用该块和本文件中后面的全部块\n" | |
24161 | "d - 不要应用该块和本文件中后面的全部块" | |
24162 | ||
7157c2b5 | 24163 | #: git-add--interactive.perl:1298 |
a6cd2cc4 JX |
24164 | msgid "" |
24165 | "y - apply this hunk to worktree\n" | |
24166 | "n - do not apply this hunk to worktree\n" | |
24167 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
24168 | "a - apply this hunk and all later hunks in the file\n" | |
24169 | "d - do not apply this hunk or any of the later hunks in the file" | |
24170 | msgstr "" | |
24171 | "y - 在工作区中应用该块\n" | |
24172 | "n - 不要在工作区中应用该块\n" | |
24173 | "q - 退出。不要应用该块及后面的全部块\n" | |
24174 | "a - 应用该块和本文件中后面的全部块\n" | |
24175 | "d - 不要应用该块和本文件中后面的全部块" | |
24176 | ||
7157c2b5 | 24177 | #: git-add--interactive.perl:1313 |
1a79b2f1 JX |
24178 | msgid "" |
24179 | "g - select a hunk to go to\n" | |
24180 | "/ - search for a hunk matching the given regex\n" | |
24181 | "j - leave this hunk undecided, see next undecided hunk\n" | |
24182 | "J - leave this hunk undecided, see next hunk\n" | |
24183 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
24184 | "K - leave this hunk undecided, see previous hunk\n" | |
24185 | "s - split the current hunk into smaller hunks\n" | |
24186 | "e - manually edit the current hunk\n" | |
24187 | "? - print help\n" | |
24188 | msgstr "" | |
24189 | "g - 选择跳转到一个块\n" | |
24190 | "/ - 查找和给定正则表达式匹配的块\n" | |
24191 | "j - 维持该块未决状态,查看下一个未决块\n" | |
24192 | "J - 维持该块未决状态,查看下一个块\n" | |
24193 | "k - 维持该块未决状态,查看上一个未决块\n" | |
24194 | "K - 维持该块未决状态,查看上一个块\n" | |
24195 | "s - 拆分当前块为更小的块\n" | |
24196 | "e - 手动编辑当前块\n" | |
24197 | "? - 显示帮助\n" | |
24198 | ||
7157c2b5 | 24199 | #: git-add--interactive.perl:1344 |
1a79b2f1 JX |
24200 | msgid "The selected hunks do not apply to the index!\n" |
24201 | msgstr "选中的块不能应用到索引!\n" | |
24202 | ||
7157c2b5 | 24203 | #: git-add--interactive.perl:1359 |
1a79b2f1 JX |
24204 | #, perl-format |
24205 | msgid "ignoring unmerged: %s\n" | |
24206 | msgstr "忽略未合入的:%s\n" | |
24207 | ||
7157c2b5 | 24208 | #: git-add--interactive.perl:1478 |
a6cd2cc4 JX |
24209 | #, perl-format |
24210 | msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " | |
24211 | msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " | |
24212 | ||
7157c2b5 | 24213 | #: git-add--interactive.perl:1479 |
a6cd2cc4 JX |
24214 | #, perl-format |
24215 | msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " | |
24216 | msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " | |
24217 | ||
7157c2b5 JX |
24218 | #: git-add--interactive.perl:1480 |
24219 | #, perl-format | |
24220 | msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " | |
24221 | msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " | |
24222 | ||
24223 | #: git-add--interactive.perl:1481 | |
a6cd2cc4 JX |
24224 | #, perl-format |
24225 | msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " | |
24226 | msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " | |
24227 | ||
7157c2b5 | 24228 | #: git-add--interactive.perl:1587 |
31e5e17b JX |
24229 | msgid "No other hunks to goto\n" |
24230 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 24231 | |
7157c2b5 | 24232 | #: git-add--interactive.perl:1605 |
1a79b2f1 JX |
24233 | #, perl-format |
24234 | msgid "Invalid number: '%s'\n" | |
24235 | msgstr "无效数字:'%s'\n" | |
24236 | ||
7157c2b5 | 24237 | #: git-add--interactive.perl:1610 |
1a79b2f1 JX |
24238 | #, perl-format |
24239 | msgid "Sorry, only %d hunk available.\n" | |
24240 | msgid_plural "Sorry, only %d hunks available.\n" | |
24241 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
24242 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
24243 | ||
7157c2b5 | 24244 | #: git-add--interactive.perl:1636 |
31e5e17b JX |
24245 | msgid "No other hunks to search\n" |
24246 | msgstr "没有其它可供查找的块\n" | |
24247 | ||
7157c2b5 | 24248 | #: git-add--interactive.perl:1653 |
1a79b2f1 JX |
24249 | #, perl-format |
24250 | msgid "Malformed search regexp %s: %s\n" | |
24251 | msgstr "错误的正则表达式 %s:%s\n" | |
24252 | ||
7157c2b5 | 24253 | #: git-add--interactive.perl:1663 |
1a79b2f1 | 24254 | msgid "No hunk matches the given pattern\n" |
ddc12c42 | 24255 | msgstr "没有和给定模式相匹配的块\n" |
1a79b2f1 | 24256 | |
7157c2b5 | 24257 | #: git-add--interactive.perl:1675 git-add--interactive.perl:1697 |
1a79b2f1 JX |
24258 | msgid "No previous hunk\n" |
24259 | msgstr "没有前一个块\n" | |
24260 | ||
7157c2b5 | 24261 | #: git-add--interactive.perl:1684 git-add--interactive.perl:1703 |
1a79b2f1 JX |
24262 | msgid "No next hunk\n" |
24263 | msgstr "没有下一个块\n" | |
24264 | ||
7157c2b5 | 24265 | #: git-add--interactive.perl:1709 |
31e5e17b JX |
24266 | msgid "Sorry, cannot split this hunk\n" |
24267 | msgstr "对不起,不能拆分这个块\n" | |
24268 | ||
7157c2b5 | 24269 | #: git-add--interactive.perl:1715 |
1a79b2f1 JX |
24270 | #, perl-format |
24271 | msgid "Split into %d hunk.\n" | |
24272 | msgid_plural "Split into %d hunks.\n" | |
24273 | msgstr[0] "拆分为 %d 块。\n" | |
24274 | msgstr[1] "拆分为 %d 块。\n" | |
24275 | ||
7157c2b5 | 24276 | #: git-add--interactive.perl:1725 |
31e5e17b JX |
24277 | msgid "Sorry, cannot edit this hunk\n" |
24278 | msgstr "对不起,不能编辑这个块\n" | |
24279 | ||
1a79b2f1 JX |
24280 | #. TRANSLATORS: please do not translate the command names |
24281 | #. 'status', 'update', 'revert', etc. | |
7157c2b5 | 24282 | #: git-add--interactive.perl:1790 |
1a79b2f1 JX |
24283 | msgid "" |
24284 | "status - show paths with changes\n" | |
24285 | "update - add working tree state to the staged set of changes\n" | |
24286 | "revert - revert staged set of changes back to the HEAD version\n" | |
24287 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 24288 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
24289 | "add untracked - add contents of untracked files to the staged set of " |
24290 | "changes\n" | |
24291 | msgstr "" | |
24292 | "status - 显示含变更的路径\n" | |
24293 | "update - 添加工作区状态至暂存列表\n" | |
24294 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
24295 | "patch - 挑选块并且有选择地更新\n" | |
24296 | "diff - 显示 HEAD 和索引间差异\n" | |
24297 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
24298 | ||
7157c2b5 JX |
24299 | #: git-add--interactive.perl:1807 git-add--interactive.perl:1812 |
24300 | #: git-add--interactive.perl:1815 git-add--interactive.perl:1822 | |
24301 | #: git-add--interactive.perl:1825 git-add--interactive.perl:1832 | |
24302 | #: git-add--interactive.perl:1836 git-add--interactive.perl:1842 | |
1a79b2f1 JX |
24303 | msgid "missing --" |
24304 | msgstr "缺失 --" | |
24305 | ||
7157c2b5 | 24306 | #: git-add--interactive.perl:1838 |
1a79b2f1 JX |
24307 | #, perl-format |
24308 | msgid "unknown --patch mode: %s" | |
24309 | msgstr "未知的 --patch 模式:%s" | |
24310 | ||
7157c2b5 | 24311 | #: git-add--interactive.perl:1844 git-add--interactive.perl:1850 |
1a79b2f1 JX |
24312 | #, perl-format |
24313 | msgid "invalid argument %s, expecting --" | |
24314 | msgstr "无效的参数 %s,期望是 --" | |
24315 | ||
4c27fcb5 | 24316 | #: git-send-email.perl:138 |
1a79b2f1 JX |
24317 | msgid "local zone differs from GMT by a non-minute interval\n" |
24318 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
24319 | ||
4c27fcb5 | 24320 | #: git-send-email.perl:145 git-send-email.perl:151 |
1a79b2f1 JX |
24321 | msgid "local time offset greater than or equal to 24 hours\n" |
24322 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
24323 | ||
a6cd2cc4 | 24324 | #: git-send-email.perl:223 git-send-email.perl:229 |
1a79b2f1 JX |
24325 | msgid "the editor exited uncleanly, aborting everything" |
24326 | msgstr "编辑器非正常退出,终止所有操作" | |
24327 | ||
a6cd2cc4 | 24328 | #: git-send-email.perl:310 |
1a79b2f1 JX |
24329 | #, perl-format |
24330 | msgid "" | |
24331 | "'%s' contains an intermediate version of the email you were composing.\n" | |
24332 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
24333 | ||
a6cd2cc4 | 24334 | #: git-send-email.perl:315 |
1a79b2f1 JX |
24335 | #, perl-format |
24336 | msgid "'%s.final' contains the composed email.\n" | |
24337 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
24338 | ||
a6cd2cc4 | 24339 | #: git-send-email.perl:408 |
1a79b2f1 JX |
24340 | msgid "--dump-aliases incompatible with other options\n" |
24341 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
24342 | ||
a6cd2cc4 | 24343 | #: git-send-email.perl:481 git-send-email.perl:683 |
1a79b2f1 JX |
24344 | msgid "Cannot run git format-patch from outside a repository\n" |
24345 | msgstr "不能在仓库之外运行 git format-patch\n" | |
24346 | ||
a6cd2cc4 | 24347 | #: git-send-email.perl:484 |
31e5e17b JX |
24348 | msgid "" |
24349 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
24350 | "configuration option)\n" | |
24351 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
24352 | ||
a6cd2cc4 | 24353 | #: git-send-email.perl:497 |
1a79b2f1 JX |
24354 | #, perl-format |
24355 | msgid "Unknown --suppress-cc field: '%s'\n" | |
24356 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
24357 | ||
a6cd2cc4 | 24358 | #: git-send-email.perl:528 |
1a79b2f1 JX |
24359 | #, perl-format |
24360 | msgid "Unknown --confirm setting: '%s'\n" | |
24361 | msgstr "未知的 --confirm 设置:'%s'\n" | |
24362 | ||
a6cd2cc4 | 24363 | #: git-send-email.perl:556 |
1a79b2f1 JX |
24364 | #, perl-format |
24365 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
24366 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
24367 | ||
a6cd2cc4 | 24368 | #: git-send-email.perl:558 |
1a79b2f1 JX |
24369 | #, perl-format |
24370 | msgid "warning: `:include:` not supported: %s\n" | |
24371 | msgstr "警告:不支持 `:include:`:%s\n" | |
24372 | ||
a6cd2cc4 | 24373 | #: git-send-email.perl:560 |
1a79b2f1 JX |
24374 | #, perl-format |
24375 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
24376 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
24377 | ||
a6cd2cc4 | 24378 | #: git-send-email.perl:565 |
1a79b2f1 JX |
24379 | #, perl-format |
24380 | msgid "warning: sendmail line is not recognized: %s\n" | |
24381 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
24382 | ||
a6cd2cc4 | 24383 | #: git-send-email.perl:649 |
1a79b2f1 JX |
24384 | #, perl-format |
24385 | msgid "" | |
24386 | "File '%s' exists but it could also be the range of commits\n" | |
24387 | "to produce patches for. Please disambiguate by...\n" | |
24388 | "\n" | |
24389 | " * Saying \"./%s\" if you mean a file; or\n" | |
24390 | " * Giving --format-patch option if you mean a range.\n" | |
24391 | msgstr "" | |
87cb7997 JX |
24392 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
24393 | "歧义:\n" | |
1a79b2f1 JX |
24394 | "\n" |
24395 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
24396 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
24397 | ||
a6cd2cc4 | 24398 | #: git-send-email.perl:670 |
1a79b2f1 JX |
24399 | #, perl-format |
24400 | msgid "Failed to opendir %s: %s" | |
24401 | msgstr "无法打开目录 %s: %s" | |
24402 | ||
a6cd2cc4 | 24403 | #: git-send-email.perl:694 |
1a79b2f1 JX |
24404 | #, perl-format |
24405 | msgid "" | |
24406 | "fatal: %s: %s\n" | |
24407 | "warning: no patches were sent\n" | |
24408 | msgstr "" | |
06991777 | 24409 | "致命错误:%s:%s\n" |
1a79b2f1 JX |
24410 | "警告:补丁未能发送\n" |
24411 | ||
a6cd2cc4 | 24412 | #: git-send-email.perl:705 |
1a79b2f1 JX |
24413 | msgid "" |
24414 | "\n" | |
24415 | "No patch files specified!\n" | |
24416 | "\n" | |
87cb7997 JX |
24417 | msgstr "" |
24418 | "\n" | |
24419 | "未指定补丁文件!\n" | |
24420 | "\n" | |
1a79b2f1 | 24421 | |
a6cd2cc4 | 24422 | #: git-send-email.perl:718 |
1a79b2f1 JX |
24423 | #, perl-format |
24424 | msgid "No subject line in %s?" | |
24425 | msgstr "在 %s 中没有标题行?" | |
24426 | ||
a6cd2cc4 | 24427 | #: git-send-email.perl:728 |
1a79b2f1 JX |
24428 | #, perl-format |
24429 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 24430 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 24431 | |
a6cd2cc4 | 24432 | #: git-send-email.perl:739 |
1a79b2f1 JX |
24433 | msgid "" |
24434 | "Lines beginning in \"GIT:\" will be removed.\n" | |
24435 | "Consider including an overall diffstat or table of contents\n" | |
24436 | "for the patch you are writing.\n" | |
24437 | "\n" | |
24438 | "Clear the body content if you don't wish to send a summary.\n" | |
24439 | msgstr "" | |
24440 | "以 \"GIT:\" 开头的行将被删除。\n" | |
5b533632 | 24441 | "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" |
1a79b2f1 JX |
24442 | "\n" |
24443 | "如果您不想发送摘要,清除内容。\n" | |
24444 | ||
a6cd2cc4 | 24445 | #: git-send-email.perl:763 |
1a79b2f1 JX |
24446 | #, perl-format |
24447 | msgid "Failed to open %s: %s" | |
24448 | msgstr "无法打开 %s: %s" | |
24449 | ||
a6cd2cc4 | 24450 | #: git-send-email.perl:780 |
31e5e17b JX |
24451 | #, perl-format |
24452 | msgid "Failed to open %s.final: %s" | |
24453 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 24454 | |
a6cd2cc4 | 24455 | #: git-send-email.perl:823 |
1a79b2f1 JX |
24456 | msgid "Summary email is empty, skipping it\n" |
24457 | msgstr "摘要邮件为空,跳过\n" | |
24458 | ||
24459 | #. TRANSLATORS: please keep [y/N] as is. | |
a6cd2cc4 | 24460 | #: git-send-email.perl:858 |
1a79b2f1 JX |
24461 | #, perl-format |
24462 | msgid "Are you sure you want to use <%s> [y/N]? " | |
24463 | msgstr "您确认要使用 <%s> [y/N]?" | |
24464 | ||
a6cd2cc4 | 24465 | #: git-send-email.perl:913 |
1a79b2f1 JX |
24466 | msgid "" |
24467 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
24468 | "Encoding.\n" | |
24469 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
24470 | ||
a6cd2cc4 | 24471 | #: git-send-email.perl:918 |
1a79b2f1 JX |
24472 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
24473 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
24474 | ||
a6cd2cc4 | 24475 | #: git-send-email.perl:926 |
1a79b2f1 JX |
24476 | #, perl-format |
24477 | msgid "" | |
24478 | "Refusing to send because the patch\n" | |
24479 | "\t%s\n" | |
24480 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
24481 | "want to send.\n" | |
24482 | msgstr "" | |
24483 | "拒绝发送,因为补丁\n" | |
24484 | "\t%s\n" | |
24485 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
24486 | ||
a6cd2cc4 | 24487 | #: git-send-email.perl:945 |
1a79b2f1 JX |
24488 | msgid "To whom should the emails be sent (if anyone)?" |
24489 | msgstr "邮件将要发送给谁?" | |
24490 | ||
a6cd2cc4 | 24491 | #: git-send-email.perl:963 |
1a79b2f1 JX |
24492 | #, perl-format |
24493 | msgid "fatal: alias '%s' expands to itself\n" | |
06991777 | 24494 | msgstr "致命错误:别名 '%s' 扩展为它自己\n" |
1a79b2f1 | 24495 | |
a6cd2cc4 | 24496 | #: git-send-email.perl:975 |
1a79b2f1 JX |
24497 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
24498 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
24499 | ||
a6cd2cc4 | 24500 | #: git-send-email.perl:1033 git-send-email.perl:1041 |
1a79b2f1 JX |
24501 | #, perl-format |
24502 | msgid "error: unable to extract a valid address from: %s\n" | |
24503 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
24504 | ||
24505 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
24506 | #. translation. The program will only accept English input | |
24507 | #. at this point. | |
a6cd2cc4 | 24508 | #: git-send-email.perl:1045 |
1a79b2f1 JX |
24509 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
24510 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
24511 | ||
a6cd2cc4 | 24512 | #: git-send-email.perl:1362 |
1a79b2f1 JX |
24513 | #, perl-format |
24514 | msgid "CA path \"%s\" does not exist" | |
24515 | msgstr "CA 路径 \"%s\" 不存在" | |
24516 | ||
a6cd2cc4 | 24517 | #: git-send-email.perl:1445 |
1a79b2f1 JX |
24518 | msgid "" |
24519 | " The Cc list above has been expanded by additional\n" | |
24520 | " addresses found in the patch commit message. By default\n" | |
24521 | " send-email prompts before sending whenever this occurs.\n" | |
24522 | " This behavior is controlled by the sendemail.confirm\n" | |
24523 | " configuration setting.\n" | |
24524 | "\n" | |
24525 | " For additional information, run 'git send-email --help'.\n" | |
24526 | " To retain the current behavior, but squelch this message,\n" | |
24527 | " run 'git config --global sendemail.confirm auto'.\n" | |
24528 | "\n" | |
24529 | msgstr "" | |
24530 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
24531 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
24532 | " sendemail.confirm 配置设置。\n" | |
24533 | "\n" | |
24534 | " 更多信息,执行 'git send-email --help'。\n" | |
24535 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
24536 | " sendemail.confirm auto'。\n" | |
24537 | "\n" | |
24538 | ||
fd8cb379 | 24539 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
24540 | #. translation. The program will only accept English input |
24541 | #. at this point. | |
a6cd2cc4 | 24542 | #: git-send-email.perl:1460 |
fd8cb379 JX |
24543 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " |
24544 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 24545 | |
a6cd2cc4 | 24546 | #: git-send-email.perl:1463 |
1a79b2f1 JX |
24547 | msgid "Send this email reply required" |
24548 | msgstr "发送要求的邮件回复" | |
24549 | ||
a6cd2cc4 | 24550 | #: git-send-email.perl:1491 |
1a79b2f1 JX |
24551 | msgid "The required SMTP server is not properly defined." |
24552 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
24553 | ||
a6cd2cc4 | 24554 | #: git-send-email.perl:1538 |
1a79b2f1 JX |
24555 | #, perl-format |
24556 | msgid "Server does not support STARTTLS! %s" | |
24557 | msgstr "服务器不支持 STARTTLS!%s" | |
24558 | ||
a6cd2cc4 | 24559 | #: git-send-email.perl:1543 git-send-email.perl:1547 |
a4f16749 JX |
24560 | #, perl-format |
24561 | msgid "STARTTLS failed! %s" | |
24562 | msgstr "STARTTLS 失败!%s" | |
24563 | ||
a6cd2cc4 | 24564 | #: git-send-email.perl:1556 |
1a79b2f1 JX |
24565 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
24566 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
24567 | ||
a6cd2cc4 | 24568 | #: git-send-email.perl:1574 |
1a79b2f1 JX |
24569 | #, perl-format |
24570 | msgid "Failed to send %s\n" | |
24571 | msgstr "无法发送 %s\n" | |
24572 | ||
a6cd2cc4 | 24573 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
24574 | #, perl-format |
24575 | msgid "Dry-Sent %s\n" | |
24576 | msgstr "演习发送 %s\n" | |
24577 | ||
a6cd2cc4 | 24578 | #: git-send-email.perl:1577 |
1a79b2f1 JX |
24579 | #, perl-format |
24580 | msgid "Sent %s\n" | |
24581 | msgstr "正发送 %s\n" | |
24582 | ||
a6cd2cc4 | 24583 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
24584 | msgid "Dry-OK. Log says:\n" |
24585 | msgstr "演习成功。日志说:\n" | |
24586 | ||
a6cd2cc4 | 24587 | #: git-send-email.perl:1579 |
1a79b2f1 JX |
24588 | msgid "OK. Log says:\n" |
24589 | msgstr "OK。日志说:\n" | |
24590 | ||
a6cd2cc4 | 24591 | #: git-send-email.perl:1591 |
1a79b2f1 JX |
24592 | msgid "Result: " |
24593 | msgstr "结果:" | |
24594 | ||
a6cd2cc4 | 24595 | #: git-send-email.perl:1594 |
1a79b2f1 JX |
24596 | msgid "Result: OK\n" |
24597 | msgstr "结果:OK\n" | |
24598 | ||
a6cd2cc4 | 24599 | #: git-send-email.perl:1612 |
1a79b2f1 JX |
24600 | #, perl-format |
24601 | msgid "can't open file %s" | |
24602 | msgstr "无法打开文件 %s" | |
24603 | ||
a6cd2cc4 | 24604 | #: git-send-email.perl:1659 git-send-email.perl:1679 |
1a79b2f1 JX |
24605 | #, perl-format |
24606 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
24607 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
24608 | ||
a6cd2cc4 | 24609 | #: git-send-email.perl:1665 |
1a79b2f1 JX |
24610 | #, perl-format |
24611 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
24612 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
24613 | ||
7157c2b5 | 24614 | #: git-send-email.perl:1722 |
1a79b2f1 JX |
24615 | #, perl-format |
24616 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
24617 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
24618 | ||
7157c2b5 | 24619 | #: git-send-email.perl:1757 |
1a79b2f1 JX |
24620 | #, perl-format |
24621 | msgid "(body) Adding cc: %s from line '%s'\n" | |
24622 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
24623 | ||
7157c2b5 | 24624 | #: git-send-email.perl:1868 |
1a79b2f1 JX |
24625 | #, perl-format |
24626 | msgid "(%s) Could not execute '%s'" | |
24627 | msgstr "(%s) 不能执行 '%s'" | |
24628 | ||
7157c2b5 | 24629 | #: git-send-email.perl:1875 |
1a79b2f1 JX |
24630 | #, perl-format |
24631 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
24632 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
24633 | ||
7157c2b5 | 24634 | #: git-send-email.perl:1879 |
1a79b2f1 JX |
24635 | #, perl-format |
24636 | msgid "(%s) failed to close pipe to '%s'" | |
24637 | msgstr "(%s) 无法关闭管道至 '%s'" | |
24638 | ||
7157c2b5 | 24639 | #: git-send-email.perl:1909 |
1a79b2f1 JX |
24640 | msgid "cannot send message as 7bit" |
24641 | msgstr "不能以 7bit 形式发送信息" | |
24642 | ||
7157c2b5 | 24643 | #: git-send-email.perl:1917 |
1a79b2f1 JX |
24644 | msgid "invalid transfer encoding" |
24645 | msgstr "无效的传送编码" | |
24646 | ||
7157c2b5 | 24647 | #: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 |
1a79b2f1 JX |
24648 | #, perl-format |
24649 | msgid "unable to open %s: %s\n" | |
24650 | msgstr "不能打开 %s:%s\n" | |
24651 | ||
7157c2b5 | 24652 | #: git-send-email.perl:1961 |
1a79b2f1 JX |
24653 | #, perl-format |
24654 | msgid "%s: patch contains a line longer than 998 characters" | |
24655 | msgstr "%s:补丁包含一个超过 998 字符的行" | |
24656 | ||
7157c2b5 | 24657 | #: git-send-email.perl:1978 |
1a79b2f1 JX |
24658 | #, perl-format |
24659 | msgid "Skipping %s with backup suffix '%s'.\n" | |
24660 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
24661 | ||
24662 | #. TRANSLATORS: please keep "[y|N]" as is. | |
7157c2b5 | 24663 | #: git-send-email.perl:1982 |
1a79b2f1 JX |
24664 | #, perl-format |
24665 | msgid "Do you really want to send %s? [y|N]: " | |
24666 | msgstr "您真的要发送 %s?[y|N]:" |