]>
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 | 数据对象 | |
d9488fea | 31 | # bloom filter | 布隆过滤器 |
160fb2b2 | 32 | # branch | 分支 |
d9488fea | 33 | # bundle | 归档包 |
160fb2b2 JX |
34 | # bypass | 绕过 |
35 | # cache | 索引(的别称) | |
36 | # chain | (提交)链 | |
37 | # changeset | 变更集 | |
38 | # checkout | 检出 | |
39 | # checksum | 校验,校验和 | |
40 | # cherry-picking | 拣选 | |
41 | # clean | 干净(的工作区) | |
42 | # clone | 克隆 | |
43 | # commit | 提交 | |
667599e8 | 44 | # commit message | 提交说明 |
160fb2b2 JX |
45 | # commit object | 提交对象 |
46 | # commit-ish (also committish) | 提交号 | |
47 | # conflict | 冲突 | |
48 | # core Git | 核心 Git 工具 | |
d46c5519 | 49 | # cover letter | 附函 |
160fb2b2 | 50 | # DAG | 有向无环图 |
e640d114 | 51 | # dangling object | 悬空对象 |
160fb2b2 JX |
52 | # detached HEAD | 分离头指针 |
53 | # directory | 目录 | |
54 | # dirty | 脏(的工作区) | |
755c831b | 55 | # dumb HTTP protocol | 哑 HTTP 协议 |
160fb2b2 JX |
56 | # evil merge | 坏合并(合并引入了父提交没有的修改) |
57 | # fast-forward | 快进 | |
58 | # fetch | 获取 | |
59 | # file system | 文件系统 | |
e397e7e3 | 60 | # fork | 派生 |
160fb2b2 JX |
61 | # Git archive | 仓库(对于 arch 用户) |
62 | # gitfile | gitfile(仓库链接文件) | |
fd8cb379 | 63 | # grafts | (提交)移植 |
160fb2b2 JX |
64 | # hash | 哈希值 |
65 | # HEAD | HEAD(头指针,亦即当前分支) | |
66 | # head | 头、分支 | |
67 | # head ref | 分支 | |
68 | # header | 头信息 | |
69 | # hook | 钩子 | |
70 | # hunk | 补丁片段 | |
71 | # index | 索引 | |
72 | # index entry | 索引条目 | |
73 | # loose object | 松散对象 | |
74 | # loose refs | 松散引用 | |
75 | # master | master(默认分支名) | |
76 | # merge | 合并 | |
77 | # object | 对象 | |
78 | # object database | 对象库 | |
79 | # object identifier | 对象标识符 | |
80 | # object name | 对象名称 | |
81 | # object type | 对象类型 | |
82 | # octopus | 章鱼式合并(两分支以上的合并) | |
83 | # origin | origin(默认的远程名称) | |
84 | # pack | 包 | |
85 | # pack index | 包索引 | |
86 | # packfile | 包文件 | |
87 | # parent | 父提交 | |
88 | # patch | 补丁 | |
89 | # pathspec | 路径规格 | |
90 | # pattern | 模式 | |
12e59059 | 91 | # pickaxe | 挖掘 |
160fb2b2 JX |
92 | # plumbing | 管件(Git 底层核心命令的别称) |
93 | # porcelain | 瓷件(Git 上层封装命令的别称) | |
94550ed3 | 94 | # precious-objects repo | 珍品仓库 |
473eb541 | 95 | # promisor | 承诺者 |
160fb2b2 JX |
96 | # prune | 清除 |
97 | # pull | 拉,拉取 | |
98 | # push | 推,推送 | |
99 | # reachable | 可达 | |
100 | # rebase | 变基 | |
101 | # ref | 引用 | |
102 | # reflog | 引用日志 | |
103 | # refspec | 引用规格 | |
104 | # remote | 远程,远程仓库 | |
105 | # remote-tracking branch | 远程跟踪分支 | |
106 | # replay | 重放 | |
107 | # repo | 仓库 | |
108 | # repository | 仓库 | |
109 | # resolve | (冲突)解决 | |
110 | # revert | 还原 | |
111 | # revision | 版本 | |
112 | # rewind | 回退 | |
113 | # SCM | 源代码管理(工具) | |
ee7589bb | 114 | # SHA-1 | SHA-1(安全哈希算法1) |
160fb2b2 JX |
115 | # shallow repository | 浅(克隆)仓库 |
116 | # signed tag | 签名标签 | |
755c831b | 117 | # smart HTTP protocol | 智能 HTTP 协议 |
33b62fba | 118 | # squash | 挤压 |
160fb2b2 | 119 | # stage | n. 暂存区(即索引); v. 暂存 |
a4f16749 | 120 | # stash | n. 贮藏区; v. 贮藏 |
160fb2b2 JX |
121 | # submodule | 子模组 |
122 | # symref | 符号引用 | |
933c015e | 123 | # tag | n. 标签; v. 打标签 |
160fb2b2 JX |
124 | # tag object | 标签对象 |
125 | # tagger | 打标签者 | |
126 | # topic branch | 主题分支 | |
127 | # track | 跟踪 | |
d13389bf | 128 | # trailer | 尾注 |
160fb2b2 JX |
129 | # tree | 树(工作区或树对象) |
130 | # tree object | 树对象 | |
131 | # tree-ish (also treeish) | 树对象(或可以解析为一树对象) | |
132 | # unmerged index | 未合并索引 | |
133 | # unpack | 解包 | |
134 | # unreachable object | 不可达对象 | |
135 | # unstage | 取消暂存 | |
136 | # upstream | 上游 | |
137 | # upstream branch | 上游分支 | |
138 | # working tree | 工作区 | |
139 | # | |
c04f5ac3 JX |
140 | msgid "" |
141 | msgstr "" | |
142 | "Project-Id-Version: Git\n" | |
143 | "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" | |
ec3d4607 JX |
144 | "POT-Creation-Date: 2021-08-14 07:56+0800\n" |
145 | "PO-Revision-Date: 2021-08-14 17:27+0800\n" | |
c04f5ac3 | 146 | "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" |
7aea43ff | 147 | "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" |
c04f5ac3 JX |
148 | "Language: zh_CN\n" |
149 | "MIME-Version: 1.0\n" | |
150 | "Content-Type: text/plain; charset=UTF-8\n" | |
151 | "Content-Transfer-Encoding: 8bit\n" | |
5ae481e0 | 152 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
c04f5ac3 | 153 | |
d13389bf | 154 | #: add-interactive.c:376 |
ddc12c42 JX |
155 | #, c-format |
156 | msgid "Huh (%s)?" | |
157 | msgstr "嗯(%s)?" | |
158 | ||
ec3d4607 JX |
159 | #: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493 |
160 | #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528 | |
33b62fba | 161 | #: builtin/rebase.c:1953 |
ddc12c42 JX |
162 | msgid "could not read index" |
163 | msgstr "不能读取索引" | |
164 | ||
d13389bf | 165 | #: add-interactive.c:584 git-add--interactive.perl:269 |
ddc12c42 JX |
166 | #: git-add--interactive.perl:294 |
167 | msgid "binary" | |
168 | msgstr "二进制" | |
169 | ||
d13389bf | 170 | #: add-interactive.c:642 git-add--interactive.perl:278 |
ddc12c42 JX |
171 | #: git-add--interactive.perl:332 |
172 | msgid "nothing" | |
173 | msgstr "无" | |
174 | ||
d13389bf | 175 | #: add-interactive.c:643 git-add--interactive.perl:314 |
ddc12c42 JX |
176 | #: git-add--interactive.perl:329 |
177 | msgid "unchanged" | |
178 | msgstr "没有修改" | |
179 | ||
d13389bf | 180 | #: add-interactive.c:680 git-add--interactive.perl:641 |
ddc12c42 JX |
181 | msgid "Update" |
182 | msgstr "更新" | |
183 | ||
d13389bf | 184 | #: add-interactive.c:697 add-interactive.c:885 |
ddc12c42 JX |
185 | #, c-format |
186 | msgid "could not stage '%s'" | |
187 | msgstr "不能暂存 '%s'" | |
188 | ||
ec3d4607 | 189 | #: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707 |
ddc12c42 JX |
190 | msgid "could not write index" |
191 | msgstr "不能写入索引" | |
192 | ||
d13389bf | 193 | #: add-interactive.c:706 git-add--interactive.perl:626 |
ddc12c42 JX |
194 | #, c-format, perl-format |
195 | msgid "updated %d path\n" | |
196 | msgid_plural "updated %d paths\n" | |
197 | msgstr[0] "更新了 %d 个路径\n" | |
198 | msgstr[1] "更新了 %d 个路径\n" | |
199 | ||
d13389bf | 200 | #: add-interactive.c:724 git-add--interactive.perl:676 |
ddc12c42 JX |
201 | #, c-format, perl-format |
202 | msgid "note: %s is untracked now.\n" | |
203 | msgstr "说明:%s 现已成为未跟踪的。\n" | |
204 | ||
33b62fba | 205 | #: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 |
349ede6a | 206 | #: builtin/reset.c:145 |
ddc12c42 JX |
207 | #, c-format |
208 | msgid "make_cache_entry failed for path '%s'" | |
209 | msgstr "对路径 '%s' 的 make_cache_entry 操作失败" | |
210 | ||
d13389bf | 211 | #: add-interactive.c:759 git-add--interactive.perl:653 |
ddc12c42 JX |
212 | msgid "Revert" |
213 | msgstr "还原" | |
214 | ||
d13389bf | 215 | #: add-interactive.c:775 |
ddc12c42 JX |
216 | msgid "Could not parse HEAD^{tree}" |
217 | msgstr "不能解析 HEAD^{tree}" | |
218 | ||
d13389bf | 219 | #: add-interactive.c:813 git-add--interactive.perl:629 |
ddc12c42 JX |
220 | #, c-format, perl-format |
221 | msgid "reverted %d path\n" | |
222 | msgid_plural "reverted %d paths\n" | |
223 | msgstr[0] "还原了 %d 个路径\n" | |
224 | msgstr[1] "还原了 %d 个路径\n" | |
225 | ||
d13389bf | 226 | #: add-interactive.c:864 git-add--interactive.perl:693 |
ddc12c42 JX |
227 | #, c-format |
228 | msgid "No untracked files.\n" | |
229 | msgstr "没有未跟踪的文件。\n" | |
230 | ||
d13389bf | 231 | #: add-interactive.c:868 git-add--interactive.perl:687 |
ddc12c42 JX |
232 | msgid "Add untracked" |
233 | msgstr "添加未跟踪的" | |
234 | ||
d13389bf | 235 | #: add-interactive.c:895 git-add--interactive.perl:623 |
ddc12c42 JX |
236 | #, c-format, perl-format |
237 | msgid "added %d path\n" | |
238 | msgid_plural "added %d paths\n" | |
239 | msgstr[0] "增加了 %d 个路径\n" | |
240 | msgstr[1] "增加了 %d 个路径\n" | |
241 | ||
d13389bf | 242 | #: add-interactive.c:925 |
ddc12c42 JX |
243 | #, c-format |
244 | msgid "ignoring unmerged: %s" | |
245 | msgstr "忽略未合入的:%s" | |
246 | ||
ec3d4607 | 247 | #: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369 |
ddc12c42 JX |
248 | #, c-format |
249 | msgid "Only binary files changed.\n" | |
250 | msgstr "只有二进制文件被修改。\n" | |
251 | ||
ec3d4607 | 252 | #: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371 |
ddc12c42 JX |
253 | #, c-format |
254 | msgid "No changes.\n" | |
255 | msgstr "没有修改。\n" | |
256 | ||
d13389bf | 257 | #: add-interactive.c:943 git-add--interactive.perl:1379 |
ddc12c42 JX |
258 | msgid "Patch update" |
259 | msgstr "补丁更新" | |
260 | ||
d13389bf | 261 | #: add-interactive.c:982 git-add--interactive.perl:1792 |
ddc12c42 JX |
262 | msgid "Review diff" |
263 | msgstr "检视 diff" | |
264 | ||
d13389bf | 265 | #: add-interactive.c:1010 |
ddc12c42 JX |
266 | msgid "show paths with changes" |
267 | msgstr "显示含变更的路径" | |
268 | ||
d13389bf | 269 | #: add-interactive.c:1012 |
ddc12c42 JX |
270 | msgid "add working tree state to the staged set of changes" |
271 | msgstr "将工作区状态添加到暂存区修改集中" | |
272 | ||
d13389bf | 273 | #: add-interactive.c:1014 |
ddc12c42 JX |
274 | msgid "revert staged set of changes back to the HEAD version" |
275 | msgstr "将暂存的修改集恢复为 HEAD 版本" | |
276 | ||
d13389bf | 277 | #: add-interactive.c:1016 |
ddc12c42 JX |
278 | msgid "pick hunks and update selectively" |
279 | msgstr "挑选数据块并有选择地更新" | |
280 | ||
d13389bf | 281 | #: add-interactive.c:1018 |
ddc12c42 JX |
282 | msgid "view diff between HEAD and index" |
283 | msgstr "显示 HEAD 和索引的差异" | |
284 | ||
d13389bf | 285 | #: add-interactive.c:1020 |
ddc12c42 JX |
286 | msgid "add contents of untracked files to the staged set of changes" |
287 | msgstr "将未跟踪文件的内容添加到暂存区修改集中" | |
288 | ||
d13389bf | 289 | #: add-interactive.c:1028 add-interactive.c:1077 |
ddc12c42 JX |
290 | msgid "Prompt help:" |
291 | msgstr "帮助:" | |
292 | ||
d13389bf | 293 | #: add-interactive.c:1030 |
ddc12c42 JX |
294 | msgid "select a single item" |
295 | msgstr "选择一个条目" | |
296 | ||
d13389bf | 297 | #: add-interactive.c:1032 |
ddc12c42 JX |
298 | msgid "select a range of items" |
299 | msgstr "选择一系列条目" | |
300 | ||
d13389bf | 301 | #: add-interactive.c:1034 |
ddc12c42 JX |
302 | msgid "select multiple ranges" |
303 | msgstr "选择多个范围" | |
304 | ||
d13389bf | 305 | #: add-interactive.c:1036 add-interactive.c:1081 |
ddc12c42 JX |
306 | msgid "select item based on unique prefix" |
307 | msgstr "基于唯一前缀选择条目" | |
308 | ||
d13389bf | 309 | #: add-interactive.c:1038 |
ddc12c42 JX |
310 | msgid "unselect specified items" |
311 | msgstr "反选指定的条目" | |
312 | ||
d13389bf | 313 | #: add-interactive.c:1040 |
ddc12c42 JX |
314 | msgid "choose all items" |
315 | msgstr "选择所有条目" | |
316 | ||
d13389bf | 317 | #: add-interactive.c:1042 |
ddc12c42 JX |
318 | msgid "(empty) finish selecting" |
319 | msgstr "(空)结束选择" | |
320 | ||
d13389bf | 321 | #: add-interactive.c:1079 |
ddc12c42 JX |
322 | msgid "select a numbered item" |
323 | msgstr "选择一个编号条目" | |
324 | ||
d13389bf | 325 | #: add-interactive.c:1083 |
ddc12c42 JX |
326 | msgid "(empty) select nothing" |
327 | msgstr "(空)不选择任何内容" | |
328 | ||
ec3d4607 | 329 | #: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896 |
ddc12c42 JX |
330 | msgid "*** Commands ***" |
331 | msgstr "*** 命令 ***" | |
332 | ||
ec3d4607 | 333 | #: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893 |
ddc12c42 JX |
334 | msgid "What now" |
335 | msgstr "请选择" | |
336 | ||
d13389bf | 337 | #: add-interactive.c:1144 git-add--interactive.perl:213 |
ddc12c42 JX |
338 | msgid "staged" |
339 | msgstr "缓存" | |
340 | ||
d13389bf | 341 | #: add-interactive.c:1144 git-add--interactive.perl:213 |
ddc12c42 JX |
342 | msgid "unstaged" |
343 | msgstr "未缓存" | |
344 | ||
ec3d4607 JX |
345 | #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309 |
346 | #: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128 | |
33b62fba | 347 | #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 |
ec3d4607 JX |
348 | #: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886 |
349 | #: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343 | |
350 | #: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589 | |
351 | #: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893 | |
349ede6a | 352 | #: git-add--interactive.perl:213 |
ddc12c42 JX |
353 | msgid "path" |
354 | msgstr "路径" | |
355 | ||
d13389bf | 356 | #: add-interactive.c:1151 |
ddc12c42 JX |
357 | msgid "could not refresh index" |
358 | msgstr "不能刷新索引" | |
359 | ||
ec3d4607 | 360 | #: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803 |
ddc12c42 JX |
361 | #, c-format |
362 | msgid "Bye.\n" | |
363 | msgstr "再见。\n" | |
364 | ||
d13389bf | 365 | #: add-patch.c:34 git-add--interactive.perl:1431 |
2b472aae JX |
366 | #, c-format, perl-format |
367 | msgid "Stage mode change [y,n,q,a,d%s,?]? " | |
368 | msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 369 | |
d13389bf | 370 | #: add-patch.c:35 git-add--interactive.perl:1432 |
2b472aae JX |
371 | #, c-format, perl-format |
372 | msgid "Stage deletion [y,n,q,a,d%s,?]? " | |
373 | msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 374 | |
d13389bf | 375 | #: add-patch.c:36 git-add--interactive.perl:1433 |
7157c2b5 JX |
376 | #, c-format, perl-format |
377 | msgid "Stage addition [y,n,q,a,d%s,?]? " | |
378 | msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " | |
379 | ||
d13389bf | 380 | #: add-patch.c:37 git-add--interactive.perl:1434 |
2b472aae JX |
381 | #, c-format, perl-format |
382 | msgid "Stage this hunk [y,n,q,a,d%s,?]? " | |
383 | msgstr "暂存该块 [y,n,q,a,d%s,?]? " | |
384 | ||
7157c2b5 | 385 | #: add-patch.c:39 |
2b472aae JX |
386 | msgid "" |
387 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
388 | "staging." | |
389 | msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。" | |
390 | ||
7157c2b5 | 391 | #: add-patch.c:42 |
2b472aae JX |
392 | msgid "" |
393 | "y - stage this hunk\n" | |
394 | "n - do not stage this hunk\n" | |
395 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
396 | "a - stage this hunk and all later hunks in the file\n" | |
397 | "d - do not stage this hunk or any of the later hunks in the file\n" | |
398 | msgstr "" | |
399 | "y - 暂存该块\n" | |
400 | "n - 不要暂存该块\n" | |
401 | "q - 退出。不暂存该块及后面的全部块\n" | |
402 | "a - 暂存该块和本文件中后面的全部块\n" | |
403 | "d - 不暂存该块和本文件中后面的全部块\n" | |
404 | ||
d13389bf | 405 | #: add-patch.c:56 git-add--interactive.perl:1437 |
2b472aae JX |
406 | #, c-format, perl-format |
407 | msgid "Stash mode change [y,n,q,a,d%s,?]? " | |
408 | msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " | |
409 | ||
d13389bf | 410 | #: add-patch.c:57 git-add--interactive.perl:1438 |
2b472aae JX |
411 | #, c-format, perl-format |
412 | msgid "Stash deletion [y,n,q,a,d%s,?]? " | |
413 | msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " | |
414 | ||
d13389bf | 415 | #: add-patch.c:58 git-add--interactive.perl:1439 |
7157c2b5 JX |
416 | #, c-format, perl-format |
417 | msgid "Stash addition [y,n,q,a,d%s,?]? " | |
418 | msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " | |
419 | ||
d13389bf | 420 | #: add-patch.c:59 git-add--interactive.perl:1440 |
2b472aae JX |
421 | #, c-format, perl-format |
422 | msgid "Stash this hunk [y,n,q,a,d%s,?]? " | |
423 | msgstr "贮藏该块 [y,n,q,a,d%s,?]? " | |
424 | ||
7157c2b5 | 425 | #: add-patch.c:61 |
2b472aae JX |
426 | msgid "" |
427 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
428 | "stashing." | |
429 | msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。" | |
430 | ||
7157c2b5 | 431 | #: add-patch.c:64 |
2b472aae JX |
432 | msgid "" |
433 | "y - stash this hunk\n" | |
434 | "n - do not stash this hunk\n" | |
435 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
436 | "a - stash this hunk and all later hunks in the file\n" | |
437 | "d - do not stash this hunk or any of the later hunks in the file\n" | |
438 | msgstr "" | |
439 | "y - 贮藏该块\n" | |
440 | "n - 不要贮藏该块\n" | |
441 | "q - 退出。不贮藏该块及后面的全部块\n" | |
442 | "a - 贮藏该块和本文件中后面的全部块\n" | |
443 | "d - 不贮藏该块和本文件中后面的全部块\n" | |
444 | ||
d13389bf | 445 | #: add-patch.c:80 git-add--interactive.perl:1443 |
2b472aae JX |
446 | #, c-format, perl-format |
447 | msgid "Unstage mode change [y,n,q,a,d%s,?]? " | |
448 | msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " | |
449 | ||
d13389bf | 450 | #: add-patch.c:81 git-add--interactive.perl:1444 |
2b472aae JX |
451 | #, c-format, perl-format |
452 | msgid "Unstage deletion [y,n,q,a,d%s,?]? " | |
453 | msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " | |
454 | ||
d13389bf | 455 | #: add-patch.c:82 git-add--interactive.perl:1445 |
7157c2b5 JX |
456 | #, c-format, perl-format |
457 | msgid "Unstage addition [y,n,q,a,d%s,?]? " | |
458 | msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " | |
459 | ||
d13389bf | 460 | #: add-patch.c:83 git-add--interactive.perl:1446 |
2b472aae JX |
461 | #, c-format, perl-format |
462 | msgid "Unstage this hunk [y,n,q,a,d%s,?]? " | |
463 | msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " | |
464 | ||
7157c2b5 | 465 | #: add-patch.c:85 |
2b472aae JX |
466 | msgid "" |
467 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
468 | "unstaging." | |
469 | msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。" | |
470 | ||
7157c2b5 | 471 | #: add-patch.c:88 |
2b472aae JX |
472 | msgid "" |
473 | "y - unstage this hunk\n" | |
474 | "n - do not unstage this hunk\n" | |
475 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
476 | "a - unstage this hunk and all later hunks in the file\n" | |
477 | "d - do not unstage this hunk or any of the later hunks in the file\n" | |
478 | msgstr "" | |
440e7442 FZ |
479 | "y - 取消暂存该块\n" |
480 | "n - 不要取消暂存该块\n" | |
481 | "q - 退出。不要取消暂存该块及后面的全部块\n" | |
482 | "a - 取消暂存该块和本文件中后面的全部块\n" | |
483 | "d - 不要取消暂存该块和本文件中后面的全部块\n" | |
2b472aae | 484 | |
d13389bf | 485 | #: add-patch.c:103 git-add--interactive.perl:1449 |
2b472aae JX |
486 | #, c-format, perl-format |
487 | msgid "Apply mode change to index [y,n,q,a,d%s,?]? " | |
488 | msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " | |
489 | ||
d13389bf | 490 | #: add-patch.c:104 git-add--interactive.perl:1450 |
2b472aae JX |
491 | #, c-format, perl-format |
492 | msgid "Apply deletion to index [y,n,q,a,d%s,?]? " | |
493 | msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " | |
494 | ||
d13389bf | 495 | #: add-patch.c:105 git-add--interactive.perl:1451 |
7157c2b5 JX |
496 | #, c-format, perl-format |
497 | msgid "Apply addition to index [y,n,q,a,d%s,?]? " | |
498 | msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " | |
499 | ||
d13389bf | 500 | #: add-patch.c:106 git-add--interactive.perl:1452 |
2b472aae JX |
501 | #, c-format, perl-format |
502 | msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " | |
503 | msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " | |
504 | ||
7157c2b5 | 505 | #: add-patch.c:108 add-patch.c:176 add-patch.c:221 |
2b472aae JX |
506 | msgid "" |
507 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
508 | "applying." | |
509 | msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。" | |
510 | ||
7157c2b5 | 511 | #: add-patch.c:111 |
2b472aae JX |
512 | msgid "" |
513 | "y - apply this hunk to index\n" | |
514 | "n - do not apply this hunk to index\n" | |
515 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
516 | "a - apply this hunk and all later hunks in the file\n" | |
517 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
518 | msgstr "" | |
519 | "y - 在索引中应用该块\n" | |
520 | "n - 不要在索引中应用该块\n" | |
521 | "q - 退出。不要应用该块及后面的全部块\n" | |
522 | "a - 应用该块和本文件中后面的全部块\n" | |
523 | "d - 不要应用该块和本文件中后面的全部块\n" | |
524 | ||
d13389bf JX |
525 | #: add-patch.c:126 git-add--interactive.perl:1455 |
526 | #: git-add--interactive.perl:1473 | |
2b472aae JX |
527 | #, c-format, perl-format |
528 | msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " | |
529 | msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
530 | ||
d13389bf JX |
531 | #: add-patch.c:127 git-add--interactive.perl:1456 |
532 | #: git-add--interactive.perl:1474 | |
2b472aae JX |
533 | #, c-format, perl-format |
534 | msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " | |
535 | msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " | |
ddc12c42 | 536 | |
d13389bf JX |
537 | #: add-patch.c:128 git-add--interactive.perl:1457 |
538 | #: git-add--interactive.perl:1475 | |
7157c2b5 JX |
539 | #, c-format, perl-format |
540 | msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " | |
541 | msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " | |
542 | ||
d13389bf JX |
543 | #: add-patch.c:129 git-add--interactive.perl:1458 |
544 | #: git-add--interactive.perl:1476 | |
2b472aae JX |
545 | #, c-format, perl-format |
546 | msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " | |
547 | msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
548 | ||
7157c2b5 | 549 | #: add-patch.c:131 add-patch.c:154 add-patch.c:199 |
2b472aae JX |
550 | msgid "" |
551 | "If the patch applies cleanly, the edited hunk will immediately be marked for " | |
552 | "discarding." | |
553 | msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。" | |
554 | ||
7157c2b5 | 555 | #: add-patch.c:134 add-patch.c:202 |
2b472aae JX |
556 | msgid "" |
557 | "y - discard this hunk from worktree\n" | |
558 | "n - do not discard this hunk from worktree\n" | |
559 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
560 | "a - discard this hunk and all later hunks in the file\n" | |
561 | "d - do not discard this hunk or any of the later hunks in the file\n" | |
562 | msgstr "" | |
563 | "y - 在工作区中丢弃该块\n" | |
564 | "n - 不要在工作区中丢弃该块\n" | |
565 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
566 | "a - 丢弃该块和本文件中后面的全部块\n" | |
567 | "d - 不要丢弃该块和本文件中后面的全部块\n" | |
568 | ||
d13389bf | 569 | #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 |
2b472aae JX |
570 | #, c-format, perl-format |
571 | msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " | |
572 | msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " | |
573 | ||
d13389bf | 574 | #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 |
2b472aae JX |
575 | #, c-format, perl-format |
576 | msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " | |
7157c2b5 | 577 | msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " |
2b472aae | 578 | |
d13389bf | 579 | #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 |
7157c2b5 JX |
580 | #, c-format, perl-format |
581 | msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " | |
582 | msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " | |
583 | ||
d13389bf | 584 | #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 |
2b472aae JX |
585 | #, c-format, perl-format |
586 | msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " | |
587 | msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " | |
588 | ||
7157c2b5 | 589 | #: add-patch.c:157 |
2b472aae JX |
590 | msgid "" |
591 | "y - discard this hunk from index and worktree\n" | |
592 | "n - do not discard this hunk from index and worktree\n" | |
593 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
594 | "a - discard this hunk and all later hunks in the file\n" | |
595 | "d - do not discard this hunk or any of the later hunks in the file\n" | |
596 | msgstr "" | |
597 | "y - 在索引和工作区中丢弃该块\n" | |
598 | "n - 不要在索引和工作区中丢弃该块\n" | |
599 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
600 | "a - 丢弃该块和本文件中后面的全部块\n" | |
601 | "d - 不要丢弃该块和本文件中后面的全部块\n" | |
602 | ||
d13389bf | 603 | #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 |
2b472aae JX |
604 | #, c-format, perl-format |
605 | msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " | |
606 | msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
607 | ||
d13389bf | 608 | #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 |
2b472aae JX |
609 | #, c-format, perl-format |
610 | msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " | |
611 | msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
612 | ||
d13389bf | 613 | #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 |
7157c2b5 JX |
614 | #, c-format, perl-format |
615 | msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " | |
616 | msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
617 | ||
d13389bf | 618 | #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 |
2b472aae JX |
619 | #, c-format, perl-format |
620 | msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " | |
621 | msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " | |
622 | ||
7157c2b5 | 623 | #: add-patch.c:179 |
2b472aae JX |
624 | msgid "" |
625 | "y - apply this hunk to index and worktree\n" | |
626 | "n - do not apply this hunk to index and worktree\n" | |
627 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
628 | "a - apply this hunk and all later hunks in the file\n" | |
629 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
630 | msgstr "" | |
631 | "y - 在索引和工作区中应用该块\n" | |
632 | "n - 不要在索引和工作区中应用该块\n" | |
633 | "q - 退出。不要应用该块及后面的全部块\n" | |
634 | "a - 应用该块和本文件中后面的全部块\n" | |
635 | "d - 不要应用该块和本文件中后面的全部块\n" | |
636 | ||
7157c2b5 | 637 | #: add-patch.c:224 |
2b472aae JX |
638 | msgid "" |
639 | "y - apply this hunk to worktree\n" | |
640 | "n - do not apply this hunk to worktree\n" | |
641 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
642 | "a - apply this hunk and all later hunks in the file\n" | |
643 | "d - do not apply this hunk or any of the later hunks in the file\n" | |
644 | msgstr "" | |
645 | "y - 在工作区中应用该块\n" | |
646 | "n - 不要在工作区中应用该块\n" | |
647 | "q - 退出。不要应用该块及后面的全部块\n" | |
648 | "a - 应用该块和本文件中后面的全部块\n" | |
649 | "d - 不要应用该块和本文件中后面的全部块\n" | |
650 | ||
ec3d4607 | 651 | #: add-patch.c:343 |
ddc12c42 JX |
652 | #, c-format |
653 | msgid "could not parse hunk header '%.*s'" | |
654 | msgstr "无法解析数据块头信息 '%.*s'" | |
655 | ||
ec3d4607 | 656 | #: add-patch.c:362 add-patch.c:366 |
ddc12c42 JX |
657 | #, c-format |
658 | msgid "could not parse colored hunk header '%.*s'" | |
659 | msgstr "无法解析彩色数据块头信息 '%.*s'" | |
660 | ||
ec3d4607 | 661 | #: add-patch.c:420 |
ddc12c42 JX |
662 | msgid "could not parse diff" |
663 | msgstr "不能解析差异信息" | |
664 | ||
ec3d4607 | 665 | #: add-patch.c:439 |
ddc12c42 JX |
666 | msgid "could not parse colored diff" |
667 | msgstr "不能解析彩色差异信息" | |
668 | ||
ec3d4607 | 669 | #: add-patch.c:453 |
2b472aae JX |
670 | #, c-format |
671 | msgid "failed to run '%s'" | |
672 | msgstr "运行 '%s' 失败" | |
673 | ||
ec3d4607 | 674 | #: add-patch.c:612 |
2b472aae JX |
675 | msgid "mismatched output from interactive.diffFilter" |
676 | msgstr "interactive.diffFilter 的输出不匹配" | |
677 | ||
ec3d4607 | 678 | #: add-patch.c:613 |
2b472aae JX |
679 | msgid "" |
680 | "Your filter must maintain a one-to-one correspondence\n" | |
681 | "between its input and output lines." | |
682 | msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" | |
683 | ||
ec3d4607 | 684 | #: add-patch.c:791 |
ddc12c42 JX |
685 | #, c-format |
686 | msgid "" | |
687 | "expected context line #%d in\n" | |
688 | "%.*s" | |
689 | msgstr "" | |
690 | "预期上下文行 #%d 于\n" | |
691 | "%.*s" | |
692 | ||
ec3d4607 | 693 | #: add-patch.c:806 |
ddc12c42 JX |
694 | #, c-format |
695 | msgid "" | |
696 | "hunks do not overlap:\n" | |
697 | "%.*s\n" | |
698 | "\tdoes not end with:\n" | |
699 | "%.*s" | |
700 | msgstr "" | |
701 | "块不重叠:\n" | |
702 | "%.*s\n" | |
703 | "\t不是结尾于:\n" | |
704 | "%.*s" | |
705 | ||
ec3d4607 | 706 | #: add-patch.c:1082 git-add--interactive.perl:1115 |
ddc12c42 JX |
707 | msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" |
708 | msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" | |
709 | ||
ec3d4607 | 710 | #: add-patch.c:1086 |
ddc12c42 JX |
711 | #, c-format |
712 | msgid "" | |
713 | "---\n" | |
714 | "To remove '%c' lines, make them ' ' lines (context).\n" | |
715 | "To remove '%c' lines, delete them.\n" | |
716 | "Lines starting with %c will be removed.\n" | |
717 | msgstr "" | |
718 | "---\n" | |
719 | "要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
720 | "要删除 '%c' 开始的行,删除它们。\n" | |
721 | "以 %c 开始的行将被删除。\n" | |
722 | ||
ddc12c42 | 723 | #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. |
ec3d4607 | 724 | #: add-patch.c:1100 git-add--interactive.perl:1129 |
ddc12c42 JX |
725 | msgid "" |
726 | "If it does not apply cleanly, you will be given an opportunity to\n" | |
727 | "edit again. If all lines of the hunk are removed, then the edit is\n" | |
728 | "aborted and the hunk is left unchanged.\n" | |
729 | msgstr "" | |
730 | "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" | |
731 | "此次编辑被终止,该块不会被修改。\n" | |
732 | ||
ec3d4607 | 733 | #: add-patch.c:1133 |
ddc12c42 JX |
734 | msgid "could not parse hunk header" |
735 | msgstr "无法解析数据块头信息" | |
736 | ||
ec3d4607 | 737 | #: add-patch.c:1178 |
ddc12c42 JX |
738 | msgid "'git apply --cached' failed" |
739 | msgstr "'git apply --cached' 失败" | |
740 | ||
741 | #. TRANSLATORS: do not translate [y/n] | |
742 | #. The program will only accept that input at this point. | |
743 | #. Consider translating (saying "no" discards!) as | |
744 | #. (saying "n" for "no" discards!) if the translation | |
745 | #. of the word "no" does not start with n. | |
746 | #. | |
747 | #. TRANSLATORS: do not translate [y/n] | |
748 | #. The program will only accept that input | |
749 | #. at this point. | |
750 | #. Consider translating (saying "no" discards!) as | |
751 | #. (saying "n" for "no" discards!) if the translation | |
752 | #. of the word "no" does not start with n. | |
ec3d4607 | 753 | #: add-patch.c:1247 git-add--interactive.perl:1242 |
ddc12c42 JX |
754 | msgid "" |
755 | "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " | |
756 | msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " | |
757 | ||
ec3d4607 | 758 | #: add-patch.c:1290 |
2b472aae JX |
759 | msgid "The selected hunks do not apply to the index!" |
760 | msgstr "选中的块不能应用到索引!" | |
761 | ||
ec3d4607 | 762 | #: add-patch.c:1291 git-add--interactive.perl:1346 |
2b472aae JX |
763 | msgid "Apply them to the worktree anyway? " |
764 | msgstr "无论如何都要应用到工作区么?" | |
765 | ||
ec3d4607 | 766 | #: add-patch.c:1298 git-add--interactive.perl:1349 |
2b472aae JX |
767 | msgid "Nothing was applied.\n" |
768 | msgstr "未应用。\n" | |
ddc12c42 | 769 | |
ec3d4607 | 770 | #: add-patch.c:1355 |
ddc12c42 JX |
771 | msgid "" |
772 | "j - leave this hunk undecided, see next undecided hunk\n" | |
773 | "J - leave this hunk undecided, see next hunk\n" | |
774 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
775 | "K - leave this hunk undecided, see previous hunk\n" | |
776 | "g - select a hunk to go to\n" | |
777 | "/ - search for a hunk matching the given regex\n" | |
778 | "s - split the current hunk into smaller hunks\n" | |
779 | "e - manually edit the current hunk\n" | |
780 | "? - print help\n" | |
781 | msgstr "" | |
782 | "j - 维持该块未决状态,查看下一个未决块\n" | |
783 | "J - 维持该块未决状态,查看下一个块\n" | |
784 | "k - 维持该块未决状态,查看上一个未决块\n" | |
785 | "K - 维持该块未决状态,查看上一个块\n" | |
786 | "g - 选择跳转到一个块\n" | |
787 | "/ - 查找和给定正则表达式匹配的块\n" | |
788 | "s - 拆分当前块为更小的块\n" | |
789 | "e - 手动编辑当前块\n" | |
790 | "? - 显示帮助\n" | |
791 | ||
ec3d4607 | 792 | #: add-patch.c:1517 add-patch.c:1527 |
ddc12c42 JX |
793 | msgid "No previous hunk" |
794 | msgstr "没有前一个块" | |
795 | ||
ec3d4607 | 796 | #: add-patch.c:1522 add-patch.c:1532 |
ddc12c42 JX |
797 | msgid "No next hunk" |
798 | msgstr "没有下一个块" | |
799 | ||
ec3d4607 | 800 | #: add-patch.c:1538 |
ddc12c42 JX |
801 | msgid "No other hunks to goto" |
802 | msgstr "没有其它可供跳转的块" | |
803 | ||
ec3d4607 | 804 | #: add-patch.c:1549 git-add--interactive.perl:1606 |
ddc12c42 JX |
805 | msgid "go to which hunk (<ret> to see more)? " |
806 | msgstr "跳转到哪个块(<回车> 查看更多)? " | |
807 | ||
ec3d4607 | 808 | #: add-patch.c:1550 git-add--interactive.perl:1608 |
ddc12c42 JX |
809 | msgid "go to which hunk? " |
810 | msgstr "跳转到哪个块?" | |
811 | ||
ec3d4607 | 812 | #: add-patch.c:1561 |
ddc12c42 JX |
813 | #, c-format |
814 | msgid "Invalid number: '%s'" | |
815 | msgstr "无效数字:'%s'" | |
816 | ||
ec3d4607 | 817 | #: add-patch.c:1566 |
ddc12c42 JX |
818 | #, c-format |
819 | msgid "Sorry, only %d hunk available." | |
820 | msgid_plural "Sorry, only %d hunks available." | |
821 | msgstr[0] "对不起,只有 %d 个可用块。" | |
822 | msgstr[1] "对不起,只有 %d 个可用块。" | |
823 | ||
ec3d4607 | 824 | #: add-patch.c:1575 |
ddc12c42 JX |
825 | msgid "No other hunks to search" |
826 | msgstr "没有其它可供查找的块" | |
827 | ||
ec3d4607 | 828 | #: add-patch.c:1581 git-add--interactive.perl:1661 |
ddc12c42 JX |
829 | msgid "search for regex? " |
830 | msgstr "使用正则表达式搜索?" | |
831 | ||
ec3d4607 | 832 | #: add-patch.c:1596 |
ddc12c42 JX |
833 | #, c-format |
834 | msgid "Malformed search regexp %s: %s" | |
835 | msgstr "错误的正则表达式 %s:%s" | |
836 | ||
ec3d4607 | 837 | #: add-patch.c:1613 |
ddc12c42 JX |
838 | msgid "No hunk matches the given pattern" |
839 | msgstr "没有和给定模式相匹配的块" | |
840 | ||
ec3d4607 | 841 | #: add-patch.c:1620 |
ddc12c42 JX |
842 | msgid "Sorry, cannot split this hunk" |
843 | msgstr "对不起,不能拆分这个块" | |
844 | ||
ec3d4607 | 845 | #: add-patch.c:1624 |
ddc12c42 JX |
846 | #, c-format |
847 | msgid "Split into %d hunks." | |
848 | msgstr "拆分为 %d 块。" | |
849 | ||
ec3d4607 | 850 | #: add-patch.c:1628 |
ddc12c42 JX |
851 | msgid "Sorry, cannot edit this hunk" |
852 | msgstr "对不起,不能编辑这个块" | |
853 | ||
ec3d4607 | 854 | #: add-patch.c:1680 |
2b472aae JX |
855 | msgid "'git apply' failed" |
856 | msgstr "'git apply' 失败" | |
857 | ||
33b62fba | 858 | #: advice.c:145 |
349ede6a JX |
859 | #, c-format |
860 | msgid "" | |
861 | "\n" | |
862 | "Disable this message with \"git config advice.%s false\"" | |
863 | msgstr "" | |
864 | "\n" | |
865 | "使用 \"git config advice.%s false\" 来关闭此消息" | |
866 | ||
33b62fba | 867 | #: advice.c:161 |
c04f5ac3 | 868 | #, c-format |
fd8cb379 JX |
869 | msgid "%shint: %.*s%s\n" |
870 | msgstr "%s提示:%.*s%s\n" | |
c04f5ac3 | 871 | |
33b62fba | 872 | #: advice.c:252 |
5c57d762 JX |
873 | msgid "Cherry-picking is not possible because you have unmerged files." |
874 | msgstr "无法拣选,因为您有未合并的文件。" | |
875 | ||
33b62fba | 876 | #: advice.c:254 |
5c57d762 JX |
877 | msgid "Committing is not possible because you have unmerged files." |
878 | msgstr "无法提交,因为您有未合并的文件。" | |
879 | ||
33b62fba | 880 | #: advice.c:256 |
5c57d762 JX |
881 | msgid "Merging is not possible because you have unmerged files." |
882 | msgstr "无法合并,因为您有未合并的文件。" | |
883 | ||
33b62fba | 884 | #: advice.c:258 |
5c57d762 JX |
885 | msgid "Pulling is not possible because you have unmerged files." |
886 | msgstr "无法拉取,因为您有未合并的文件。" | |
887 | ||
33b62fba | 888 | #: advice.c:260 |
5c57d762 JX |
889 | msgid "Reverting is not possible because you have unmerged files." |
890 | msgstr "无法回退,因为您有未合并的文件。" | |
891 | ||
33b62fba | 892 | #: advice.c:262 |
5c57d762 JX |
893 | #, c-format |
894 | msgid "It is not possible to %s because you have unmerged files." | |
895 | msgstr "无法 %s,因为您有未合并的文件。" | |
896 | ||
33b62fba | 897 | #: advice.c:270 |
c04f5ac3 | 898 | msgid "" |
6acbf033 | 899 | "Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
220c313c | 900 | "as appropriate to mark resolution and make a commit." |
c04f5ac3 | 901 | msgstr "" |
d9d56b23 | 902 | "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" |
220c313c | 903 | "解决方案并提交。" |
c04f5ac3 | 904 | |
33b62fba | 905 | #: advice.c:278 |
5c57d762 JX |
906 | msgid "Exiting because of an unresolved conflict." |
907 | msgstr "因为存在未解决的冲突而退出。" | |
908 | ||
ec3d4607 | 909 | #: advice.c:283 builtin/merge.c:1375 |
1b7f4a34 JX |
910 | msgid "You have not concluded your merge (MERGE_HEAD exists)." |
911 | msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" | |
912 | ||
33b62fba | 913 | #: advice.c:285 |
94550ed3 | 914 | msgid "Please, commit your changes before merging." |
1b7f4a34 JX |
915 | msgstr "请在合并前先提交您的修改。" |
916 | ||
33b62fba | 917 | #: advice.c:286 |
1b7f4a34 JX |
918 | msgid "Exiting because of unfinished merge." |
919 | msgstr "因为存在未完成的合并而退出。" | |
920 | ||
33b62fba JX |
921 | #: advice.c:296 |
922 | #, c-format | |
923 | msgid "" | |
924 | "The following pathspecs didn't match any eligible path, but they do match " | |
925 | "index\n" | |
926 | "entries outside the current sparse checkout:\n" | |
ec3d4607 JX |
927 | msgstr "" |
928 | "以下路径规格不匹配任何适合的路径,但它们和当前稀疏检出之外的索引条目匹配:\n" | |
33b62fba JX |
929 | |
930 | #: advice.c:303 | |
931 | msgid "" | |
932 | "Disable or modify the sparsity rules if you intend to update such entries." | |
933 | msgstr "如果您打算更新此类条目,请禁用或修改稀疏规则。" | |
934 | ||
935 | #: advice.c:310 | |
5c57d762 JX |
936 | #, c-format |
937 | msgid "" | |
a6cd2cc4 | 938 | "Note: switching to '%s'.\n" |
5c57d762 JX |
939 | "\n" |
940 | "You are in 'detached HEAD' state. You can look around, make experimental\n" | |
941 | "changes and commit them, and you can discard any commits you make in this\n" | |
a6cd2cc4 | 942 | "state without impacting any branches by switching back to a branch.\n" |
5c57d762 JX |
943 | "\n" |
944 | "If you want to create a new branch to retain commits you create, you may\n" | |
a6cd2cc4 | 945 | "do so (now or later) by using -c with the switch command. Example:\n" |
5c57d762 | 946 | "\n" |
a6cd2cc4 JX |
947 | " git switch -c <new-branch-name>\n" |
948 | "\n" | |
949 | "Or undo this operation with:\n" | |
950 | "\n" | |
951 | " git switch -\n" | |
952 | "\n" | |
953 | "Turn off this advice by setting config variable advice.detachedHead to " | |
954 | "false\n" | |
5c57d762 JX |
955 | "\n" |
956 | msgstr "" | |
a6cd2cc4 JX |
957 | "注意:正在切换到 '%s'。\n" |
958 | "\n" | |
959 | "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n" | |
960 | "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n" | |
5c57d762 | 961 | "\n" |
a6cd2cc4 JX |
962 | "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n" |
963 | "中添加参数 -c 来实现(现在或稍后)。例如:\n" | |
5c57d762 | 964 | "\n" |
a6cd2cc4 | 965 | " git switch -c <新分支名>\n" |
5c57d762 | 966 | "\n" |
a6cd2cc4 JX |
967 | "或者撤销此操作:\n" |
968 | "\n" | |
969 | " git switch -\n" | |
970 | "\n" | |
971 | "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" | |
5c57d762 JX |
972 | "\n" |
973 | ||
06991777 JX |
974 | #: alias.c:50 |
975 | msgid "cmdline ends with \\" | |
976 | msgstr "命令行以 \\ 结尾" | |
977 | ||
978 | #: alias.c:51 | |
979 | msgid "unclosed quote" | |
980 | msgstr "未关闭的引号" | |
981 | ||
33b62fba | 982 | #: apply.c:70 |
a0b6b246 JX |
983 | #, c-format |
984 | msgid "unrecognized whitespace option '%s'" | |
985 | msgstr "未能识别的空白字符选项 '%s'" | |
ef317cd5 | 986 | |
33b62fba | 987 | #: apply.c:86 |
90314792 | 988 | #, c-format |
a0b6b246 JX |
989 | msgid "unrecognized whitespace ignore option '%s'" |
990 | msgstr "未能识别的空白字符忽略选项 '%s'" | |
90314792 | 991 | |
33b62fba | 992 | #: apply.c:136 |
a0b6b246 | 993 | msgid "--reject and --3way cannot be used together." |
2090d5b4 | 994 | msgstr "--reject 和 --3way 不能同时使用。" |
ef317cd5 | 995 | |
33b62fba | 996 | #: apply.c:139 |
a0b6b246 JX |
997 | msgid "--3way outside a repository" |
998 | msgstr "--3way 在一个仓库之外" | |
ef317cd5 | 999 | |
33b62fba | 1000 | #: apply.c:150 |
a0b6b246 JX |
1001 | msgid "--index outside a repository" |
1002 | msgstr "--index 在一个仓库之外" | |
ef317cd5 | 1003 | |
33b62fba | 1004 | #: apply.c:153 |
a0b6b246 JX |
1005 | msgid "--cached outside a repository" |
1006 | msgstr "--cached 在一个仓库之外" | |
ef317cd5 | 1007 | |
33b62fba | 1008 | #: apply.c:800 |
a0b6b246 JX |
1009 | #, c-format |
1010 | msgid "Cannot prepare timestamp regexp %s" | |
1011 | msgstr "无法准备时间戳正则表达式 %s" | |
ef317cd5 | 1012 | |
33b62fba | 1013 | #: apply.c:809 |
a0b6b246 JX |
1014 | #, c-format |
1015 | msgid "regexec returned %d for input: %s" | |
1016 | msgstr "regexec 返回 %d,输入为:%s" | |
ef317cd5 | 1017 | |
33b62fba | 1018 | #: apply.c:883 |
a0b6b246 JX |
1019 | #, c-format |
1020 | msgid "unable to find filename in patch at line %d" | |
1021 | msgstr "不能在补丁的第 %d 行找到文件名" | |
ef317cd5 | 1022 | |
33b62fba | 1023 | #: apply.c:921 |
a0b6b246 JX |
1024 | #, c-format |
1025 | msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" | |
1026 | msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" | |
ef317cd5 | 1027 | |
33b62fba | 1028 | #: apply.c:927 |
a0b6b246 JX |
1029 | #, c-format |
1030 | msgid "git apply: bad git-diff - inconsistent new filename on line %d" | |
1031 | msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" | |
ef317cd5 | 1032 | |
33b62fba | 1033 | #: apply.c:928 |
a0b6b246 JX |
1034 | #, c-format |
1035 | msgid "git apply: bad git-diff - inconsistent old filename on line %d" | |
1036 | msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" | |
ef317cd5 | 1037 | |
33b62fba | 1038 | #: apply.c:933 |
a0b6b246 JX |
1039 | #, c-format |
1040 | msgid "git apply: bad git-diff - expected /dev/null on line %d" | |
1041 | msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" | |
ef317cd5 | 1042 | |
33b62fba | 1043 | #: apply.c:962 |
a4f16749 JX |
1044 | #, c-format |
1045 | msgid "invalid mode on line %d: %s" | |
1046 | msgstr "第 %d 行包含无效文件模式:%s" | |
1047 | ||
33b62fba | 1048 | #: apply.c:1281 |
a4f16749 JX |
1049 | #, c-format |
1050 | msgid "inconsistent header lines %d and %d" | |
1051 | msgstr "不一致的文件头,%d 行和 %d 行" | |
1052 | ||
33b62fba | 1053 | #: apply.c:1371 |
a0b6b246 JX |
1054 | #, c-format |
1055 | msgid "" | |
1056 | "git diff header lacks filename information when removing %d leading pathname " | |
1057 | "component (line %d)" | |
1058 | msgid_plural "" | |
1059 | "git diff header lacks filename information when removing %d leading pathname " | |
1060 | "components (line %d)" | |
1061 | msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
1062 | msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" | |
ef317cd5 | 1063 | |
33b62fba | 1064 | #: apply.c:1384 |
a0b6b246 JX |
1065 | #, c-format |
1066 | msgid "git diff header lacks filename information (line %d)" | |
1067 | msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" | |
07432cef | 1068 | |
33b62fba | 1069 | #: apply.c:1480 |
a5cd71ca JX |
1070 | #, c-format |
1071 | msgid "recount: unexpected line: %.*s" | |
1072 | msgstr "recount:意外的行:%.*s" | |
1073 | ||
33b62fba | 1074 | #: apply.c:1549 |
a5cd71ca JX |
1075 | #, c-format |
1076 | msgid "patch fragment without header at line %d: %.*s" | |
1077 | msgstr "第 %d 行的补丁片段没有头信息:%.*s" | |
1078 | ||
33b62fba | 1079 | #: apply.c:1752 |
a0b6b246 JX |
1080 | msgid "new file depends on old contents" |
1081 | msgstr "新文件依赖旧内容" | |
5c57d762 | 1082 | |
33b62fba | 1083 | #: apply.c:1754 |
a0b6b246 JX |
1084 | msgid "deleted file still has contents" |
1085 | msgstr "删除的文件仍有内容" | |
5c57d762 | 1086 | |
33b62fba | 1087 | #: apply.c:1788 |
a0b6b246 JX |
1088 | #, c-format |
1089 | msgid "corrupt patch at line %d" | |
1090 | msgstr "补丁在第 %d 行损坏" | |
5c57d762 | 1091 | |
33b62fba | 1092 | #: apply.c:1825 |
5c57d762 | 1093 | #, c-format |
a0b6b246 JX |
1094 | msgid "new file %s depends on old contents" |
1095 | msgstr "新文件 %s 依赖旧内容" | |
5c57d762 | 1096 | |
33b62fba | 1097 | #: apply.c:1827 |
5c57d762 | 1098 | #, c-format |
a0b6b246 JX |
1099 | msgid "deleted file %s still has contents" |
1100 | msgstr "删除的文件 %s 仍有内容" | |
5c57d762 | 1101 | |
33b62fba | 1102 | #: apply.c:1830 |
a0b6b246 JX |
1103 | #, c-format |
1104 | msgid "** warning: file %s becomes empty but is not deleted" | |
1105 | msgstr "** 警告:文件 %s 成为空文件但并未删除" | |
ef317cd5 | 1106 | |
33b62fba | 1107 | #: apply.c:1977 |
5c57d762 | 1108 | #, c-format |
a0b6b246 JX |
1109 | msgid "corrupt binary patch at line %d: %.*s" |
1110 | msgstr "二进制补丁在第 %d 行损坏:%.*s" | |
5c57d762 | 1111 | |
33b62fba | 1112 | #: apply.c:2014 |
5c57d762 | 1113 | #, c-format |
a0b6b246 JX |
1114 | msgid "unrecognized binary patch at line %d" |
1115 | msgstr "未能识别的二进制补丁位于第 %d 行" | |
5c57d762 | 1116 | |
33b62fba | 1117 | #: apply.c:2176 |
5c57d762 | 1118 | #, c-format |
a0b6b246 JX |
1119 | msgid "patch with only garbage at line %d" |
1120 | msgstr "补丁文件的第 %d 行只有垃圾数据" | |
5c57d762 | 1121 | |
33b62fba | 1122 | #: apply.c:2262 |
5c57d762 | 1123 | #, c-format |
a0b6b246 JX |
1124 | msgid "unable to read symlink %s" |
1125 | msgstr "无法读取符号链接 %s" | |
5c57d762 | 1126 | |
33b62fba | 1127 | #: apply.c:2266 |
5c57d762 | 1128 | #, c-format |
a0b6b246 JX |
1129 | msgid "unable to open or read %s" |
1130 | msgstr "不能打开或读取 %s" | |
5c57d762 | 1131 | |
33b62fba | 1132 | #: apply.c:2935 |
5c57d762 | 1133 | #, c-format |
a0b6b246 JX |
1134 | msgid "invalid start of line: '%c'" |
1135 | msgstr "无效的行首字符:'%c'" | |
5c57d762 | 1136 | |
33b62fba | 1137 | #: apply.c:3056 |
5c57d762 | 1138 | #, c-format |
a0b6b246 JX |
1139 | msgid "Hunk #%d succeeded at %d (offset %d line)." |
1140 | msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." | |
1141 | msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
1142 | msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" | |
5c57d762 | 1143 | |
33b62fba | 1144 | #: apply.c:3068 |
5c57d762 | 1145 | #, c-format |
a0b6b246 JX |
1146 | msgid "Context reduced to (%ld/%ld) to apply fragment at %d" |
1147 | msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" | |
5c57d762 | 1148 | |
33b62fba | 1149 | #: apply.c:3074 |
5c57d762 JX |
1150 | #, c-format |
1151 | msgid "" | |
a0b6b246 JX |
1152 | "while searching for:\n" |
1153 | "%.*s" | |
5c57d762 | 1154 | msgstr "" |
a0b6b246 JX |
1155 | "当查询:\n" |
1156 | "%.*s" | |
5c57d762 | 1157 | |
33b62fba | 1158 | #: apply.c:3096 |
5c57d762 | 1159 | #, c-format |
a0b6b246 JX |
1160 | msgid "missing binary patch data for '%s'" |
1161 | msgstr "缺失 '%s' 的二进制补丁数据" | |
5c57d762 | 1162 | |
33b62fba | 1163 | #: apply.c:3104 |
5c57d762 | 1164 | #, c-format |
a0b6b246 | 1165 | msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" |
29004bbb | 1166 | msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" |
5c57d762 | 1167 | |
33b62fba | 1168 | #: apply.c:3151 |
5c57d762 | 1169 | #, c-format |
a0b6b246 JX |
1170 | msgid "cannot apply binary patch to '%s' without full index line" |
1171 | msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" | |
5c57d762 | 1172 | |
33b62fba | 1173 | #: apply.c:3162 |
5c57d762 | 1174 | #, c-format |
a0b6b246 JX |
1175 | msgid "" |
1176 | "the patch applies to '%s' (%s), which does not match the current contents." | |
29004bbb | 1177 | msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" |
5c57d762 | 1178 | |
33b62fba | 1179 | #: apply.c:3170 |
a0b6b246 JX |
1180 | #, c-format |
1181 | msgid "the patch applies to an empty '%s' but it is not empty" | |
29004bbb | 1182 | msgstr "补丁应用到空文件 '%s',但其并非空文件" |
5c57d762 | 1183 | |
33b62fba | 1184 | #: apply.c:3188 |
5c57d762 | 1185 | #, c-format |
a0b6b246 | 1186 | msgid "the necessary postimage %s for '%s' cannot be read" |
e640d114 | 1187 | msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" |
5c57d762 | 1188 | |
33b62fba | 1189 | #: apply.c:3201 |
5c57d762 | 1190 | #, c-format |
a0b6b246 JX |
1191 | msgid "binary patch does not apply to '%s'" |
1192 | msgstr "二进制补丁未应用到 '%s'" | |
5c57d762 | 1193 | |
33b62fba | 1194 | #: apply.c:3208 |
5c57d762 | 1195 | #, c-format |
a0b6b246 JX |
1196 | msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" |
1197 | msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" | |
5c57d762 | 1198 | |
33b62fba | 1199 | #: apply.c:3229 |
276ceeaa | 1200 | #, c-format |
a0b6b246 JX |
1201 | msgid "patch failed: %s:%ld" |
1202 | msgstr "打补丁失败:%s:%ld" | |
276ceeaa | 1203 | |
33b62fba | 1204 | #: apply.c:3352 |
4dcdc3d8 | 1205 | #, c-format |
a0b6b246 JX |
1206 | msgid "cannot checkout %s" |
1207 | msgstr "不能检出 %s" | |
4dcdc3d8 | 1208 | |
33b62fba | 1209 | #: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 |
473eb541 | 1210 | #: setup.c:308 |
4dcdc3d8 | 1211 | #, c-format |
a0b6b246 JX |
1212 | msgid "failed to read %s" |
1213 | msgstr "无法读取 %s" | |
4dcdc3d8 | 1214 | |
33b62fba | 1215 | #: apply.c:3412 |
4dcdc3d8 | 1216 | #, c-format |
a0b6b246 JX |
1217 | msgid "reading from '%s' beyond a symbolic link" |
1218 | msgstr "读取位于符号链接中的 '%s'" | |
4dcdc3d8 | 1219 | |
33b62fba | 1220 | #: apply.c:3441 apply.c:3687 |
4dcdc3d8 | 1221 | #, c-format |
a0b6b246 JX |
1222 | msgid "path %s has been renamed/deleted" |
1223 | msgstr "路径 %s 已经被重命名/删除" | |
4dcdc3d8 | 1224 | |
33b62fba | 1225 | #: apply.c:3527 apply.c:3702 |
4dcdc3d8 | 1226 | #, c-format |
a0b6b246 JX |
1227 | msgid "%s: does not exist in index" |
1228 | msgstr "%s:不存在于索引中" | |
4dcdc3d8 | 1229 | |
33b62fba | 1230 | #: apply.c:3536 apply.c:3710 apply.c:3954 |
4dcdc3d8 | 1231 | #, c-format |
a0b6b246 JX |
1232 | msgid "%s: does not match index" |
1233 | msgstr "%s:和索引不匹配" | |
4dcdc3d8 | 1234 | |
33b62fba JX |
1235 | #: apply.c:3571 |
1236 | msgid "repository lacks the necessary blob to perform 3-way merge." | |
1237 | msgstr "仓库缺乏执行三方合并所必需的数据对象。" | |
4dcdc3d8 | 1238 | |
33b62fba | 1239 | #: apply.c:3574 |
4dcdc3d8 | 1240 | #, c-format |
33b62fba JX |
1241 | msgid "Performing three-way merge...\n" |
1242 | msgstr "执行三方合并...\n" | |
4dcdc3d8 | 1243 | |
33b62fba | 1244 | #: apply.c:3590 apply.c:3594 |
4dcdc3d8 | 1245 | #, c-format |
a0b6b246 JX |
1246 | msgid "cannot read the current contents of '%s'" |
1247 | msgstr "无法读取 '%s' 的当前内容" | |
276ceeaa | 1248 | |
33b62fba | 1249 | #: apply.c:3606 |
4dcdc3d8 | 1250 | #, c-format |
33b62fba JX |
1251 | msgid "Failed to perform three-way merge...\n" |
1252 | msgstr "无法执行三方合并...\n" | |
4dcdc3d8 | 1253 | |
33b62fba | 1254 | #: apply.c:3620 |
4dcdc3d8 | 1255 | #, c-format |
a0b6b246 JX |
1256 | msgid "Applied patch to '%s' with conflicts.\n" |
1257 | msgstr "应用补丁到 '%s' 存在冲突。\n" | |
4dcdc3d8 | 1258 | |
33b62fba | 1259 | #: apply.c:3625 |
4dcdc3d8 | 1260 | #, c-format |
a0b6b246 JX |
1261 | msgid "Applied patch to '%s' cleanly.\n" |
1262 | msgstr "成功应用补丁到 '%s'。\n" | |
4dcdc3d8 | 1263 | |
33b62fba JX |
1264 | #: apply.c:3642 |
1265 | #, c-format | |
1266 | msgid "Falling back to direct application...\n" | |
1267 | msgstr "回落到直接应用...\n" | |
1268 | ||
1269 | #: apply.c:3654 | |
a0b6b246 JX |
1270 | msgid "removal patch leaves file contents" |
1271 | msgstr "移除补丁仍留下了文件内容" | |
4dcdc3d8 | 1272 | |
33b62fba | 1273 | #: apply.c:3727 |
1003b3a5 | 1274 | #, c-format |
a0b6b246 JX |
1275 | msgid "%s: wrong type" |
1276 | msgstr "%s:错误类型" | |
1003b3a5 | 1277 | |
33b62fba | 1278 | #: apply.c:3729 |
1003b3a5 | 1279 | #, c-format |
a0b6b246 JX |
1280 | msgid "%s has type %o, expected %o" |
1281 | msgstr "%s 的类型是 %o,应为 %o" | |
1003b3a5 | 1282 | |
ec3d4607 JX |
1283 | #: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892 |
1284 | #: read-cache.c:1353 | |
4dcdc3d8 | 1285 | #, c-format |
a0b6b246 JX |
1286 | msgid "invalid path '%s'" |
1287 | msgstr "无效路径 '%s'" | |
4dcdc3d8 | 1288 | |
33b62fba | 1289 | #: apply.c:3952 |
4dcdc3d8 | 1290 | #, c-format |
a0b6b246 JX |
1291 | msgid "%s: already exists in index" |
1292 | msgstr "%s:已经存在于索引中" | |
4dcdc3d8 | 1293 | |
33b62fba | 1294 | #: apply.c:3956 |
4dcdc3d8 | 1295 | #, c-format |
a0b6b246 JX |
1296 | msgid "%s: already exists in working directory" |
1297 | msgstr "%s:已经存在于工作区中" | |
4dcdc3d8 | 1298 | |
33b62fba | 1299 | #: apply.c:3976 |
1b7f4a34 | 1300 | #, c-format |
a0b6b246 JX |
1301 | msgid "new mode (%o) of %s does not match old mode (%o)" |
1302 | msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" | |
1b7f4a34 | 1303 | |
33b62fba | 1304 | #: apply.c:3981 |
5b04ee3b | 1305 | #, c-format |
a0b6b246 JX |
1306 | msgid "new mode (%o) of %s does not match old mode (%o) of %s" |
1307 | msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" | |
5b04ee3b | 1308 | |
33b62fba | 1309 | #: apply.c:4001 |
8ada9598 | 1310 | #, c-format |
a0b6b246 JX |
1311 | msgid "affected file '%s' is beyond a symbolic link" |
1312 | msgstr "受影响的文件 '%s' 位于符号链接中" | |
8ada9598 | 1313 | |
33b62fba | 1314 | #: apply.c:4005 |
81809b99 | 1315 | #, c-format |
a0b6b246 JX |
1316 | msgid "%s: patch does not apply" |
1317 | msgstr "%s:补丁未应用" | |
8ada9598 | 1318 | |
33b62fba | 1319 | #: apply.c:4020 |
8ada9598 | 1320 | #, c-format |
a0b6b246 | 1321 | msgid "Checking patch %s..." |
06991777 | 1322 | msgstr "正在检查补丁 %s..." |
8ada9598 | 1323 | |
33b62fba | 1324 | #: apply.c:4112 |
a0b6b246 JX |
1325 | #, c-format |
1326 | msgid "sha1 information is lacking or useless for submodule %s" | |
1327 | msgstr "子模组 %s 的 sha1 信息缺失或无效" | |
8ada9598 | 1328 | |
33b62fba | 1329 | #: apply.c:4119 |
8ada9598 | 1330 | #, c-format |
a0b6b246 | 1331 | msgid "mode change for %s, which is not in current HEAD" |
31e5e17b | 1332 | msgstr "%s 的模式变更,但它不在当前 HEAD 中" |
8ada9598 | 1333 | |
33b62fba | 1334 | #: apply.c:4122 |
a0b6b246 JX |
1335 | #, c-format |
1336 | msgid "sha1 information is lacking or useless (%s)." | |
1337 | msgstr "sha1 信息缺失或无效(%s)。" | |
6792b93b | 1338 | |
33b62fba | 1339 | #: apply.c:4131 |
a0b6b246 JX |
1340 | #, c-format |
1341 | msgid "could not add %s to temporary index" | |
1342 | msgstr "不能在临时索引中添加 %s" | |
9aeb4c2b | 1343 | |
33b62fba | 1344 | #: apply.c:4141 |
a0b6b246 JX |
1345 | #, c-format |
1346 | msgid "could not write temporary index to %s" | |
1347 | msgstr "不能把临时索引写入到 %s" | |
9aeb4c2b | 1348 | |
33b62fba | 1349 | #: apply.c:4279 |
a0b6b246 JX |
1350 | #, c-format |
1351 | msgid "unable to remove %s from index" | |
1352 | msgstr "不能从索引中移除 %s" | |
8ada9598 | 1353 | |
33b62fba | 1354 | #: apply.c:4313 |
8ada9598 | 1355 | #, c-format |
a0b6b246 JX |
1356 | msgid "corrupt patch for submodule %s" |
1357 | msgstr "子模组 %s 损坏的补丁" | |
8ada9598 | 1358 | |
33b62fba | 1359 | #: apply.c:4319 |
9aeb4c2b | 1360 | #, c-format |
a0b6b246 | 1361 | msgid "unable to stat newly created file '%s'" |
65e2041e | 1362 | msgstr "不能对新建文件 '%s' 调用 stat" |
9aeb4c2b | 1363 | |
33b62fba | 1364 | #: apply.c:4327 |
a0b6b246 JX |
1365 | #, c-format |
1366 | msgid "unable to create backing store for newly created file %s" | |
1367 | msgstr "不能为新建文件 %s 创建后端存储" | |
8ada9598 | 1368 | |
33b62fba | 1369 | #: apply.c:4333 apply.c:4478 |
81809b99 | 1370 | #, c-format |
a0b6b246 JX |
1371 | msgid "unable to add cache entry for %s" |
1372 | msgstr "无法为 %s 添加缓存条目" | |
8ada9598 | 1373 | |
ec3d4607 | 1374 | #: apply.c:4376 builtin/bisect--helper.c:525 |
a0b6b246 JX |
1375 | #, c-format |
1376 | msgid "failed to write to '%s'" | |
c1ac5258 | 1377 | msgstr "写入 '%s' 失败" |
8ada9598 | 1378 | |
33b62fba | 1379 | #: apply.c:4380 |
220c313c | 1380 | #, c-format |
a0b6b246 JX |
1381 | msgid "closing file '%s'" |
1382 | msgstr "关闭文件 '%s'" | |
220c313c | 1383 | |
33b62fba | 1384 | #: apply.c:4450 |
c04f5ac3 | 1385 | #, c-format |
a0b6b246 JX |
1386 | msgid "unable to write file '%s' mode %o" |
1387 | msgstr "不能写文件 '%s' 权限 %o" | |
c04f5ac3 | 1388 | |
33b62fba | 1389 | #: apply.c:4548 |
c04f5ac3 | 1390 | #, c-format |
a0b6b246 JX |
1391 | msgid "Applied patch %s cleanly." |
1392 | msgstr "成功应用补丁 %s。" | |
c04f5ac3 | 1393 | |
33b62fba | 1394 | #: apply.c:4556 |
a0b6b246 JX |
1395 | msgid "internal error" |
1396 | msgstr "内部错误" | |
c04f5ac3 | 1397 | |
33b62fba | 1398 | #: apply.c:4559 |
5c57d762 | 1399 | #, c-format |
a0b6b246 JX |
1400 | msgid "Applying patch %%s with %d reject..." |
1401 | msgid_plural "Applying patch %%s with %d rejects..." | |
1402 | msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
1403 | msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." | |
5c57d762 | 1404 | |
33b62fba | 1405 | #: apply.c:4570 |
5c57d762 | 1406 | #, c-format |
a0b6b246 JX |
1407 | msgid "truncating .rej filename to %.*s.rej" |
1408 | msgstr "截短 .rej 文件名为 %.*s.rej" | |
5c57d762 | 1409 | |
33b62fba | 1410 | #: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 |
220c313c | 1411 | #, c-format |
a0b6b246 JX |
1412 | msgid "cannot open %s" |
1413 | msgstr "不能打开 %s" | |
220c313c | 1414 | |
33b62fba | 1415 | #: apply.c:4592 |
220c313c | 1416 | #, c-format |
a0b6b246 JX |
1417 | msgid "Hunk #%d applied cleanly." |
1418 | msgstr "第 #%d 个片段成功应用。" | |
220c313c | 1419 | |
33b62fba | 1420 | #: apply.c:4596 |
5c57d762 | 1421 | #, c-format |
a0b6b246 JX |
1422 | msgid "Rejected hunk #%d." |
1423 | msgstr "拒绝第 #%d 个片段。" | |
5c57d762 | 1424 | |
33b62fba | 1425 | #: apply.c:4725 |
5c57d762 | 1426 | #, c-format |
a0b6b246 JX |
1427 | msgid "Skipped patch '%s'." |
1428 | msgstr "略过补丁 '%s'。" | |
5c57d762 | 1429 | |
33b62fba | 1430 | #: apply.c:4733 |
a0b6b246 JX |
1431 | msgid "unrecognized input" |
1432 | msgstr "未能识别的输入" | |
5c57d762 | 1433 | |
33b62fba | 1434 | #: apply.c:4753 |
a0b6b246 JX |
1435 | msgid "unable to read index file" |
1436 | msgstr "无法读取索引文件" | |
5c57d762 | 1437 | |
33b62fba | 1438 | #: apply.c:4910 |
220c313c | 1439 | #, c-format |
a0b6b246 JX |
1440 | msgid "can't open patch '%s': %s" |
1441 | msgstr "不能打开补丁 '%s':%s" | |
220c313c | 1442 | |
33b62fba | 1443 | #: apply.c:4937 |
5c57d762 | 1444 | #, c-format |
a0b6b246 JX |
1445 | msgid "squelched %d whitespace error" |
1446 | msgid_plural "squelched %d whitespace errors" | |
1447 | msgstr[0] "抑制下仍有 %d 个空白字符误用" | |
1448 | msgstr[1] "抑制下仍有 %d 个空白字符误用" | |
5c57d762 | 1449 | |
33b62fba | 1450 | #: apply.c:4943 apply.c:4958 |
5c57d762 | 1451 | #, c-format |
a0b6b246 JX |
1452 | msgid "%d line adds whitespace errors." |
1453 | msgid_plural "%d lines add whitespace errors." | |
a4f16749 JX |
1454 | msgstr[0] "%d 行新增了空白字符误用。" |
1455 | msgstr[1] "%d 行新增了空白字符误用。" | |
5c57d762 | 1456 | |
33b62fba | 1457 | #: apply.c:4951 |
5c57d762 | 1458 | #, c-format |
a0b6b246 JX |
1459 | msgid "%d line applied after fixing whitespace errors." |
1460 | msgid_plural "%d lines applied after fixing whitespace errors." | |
1461 | msgstr[0] "修复空白错误后,应用了 %d 行。" | |
1462 | msgstr[1] "修复空白错误后,应用了 %d 行。" | |
5c57d762 | 1463 | |
ec3d4607 | 1464 | #: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423 |
a0b6b246 JX |
1465 | msgid "Unable to write new index file" |
1466 | msgstr "无法写入新索引文件" | |
5c57d762 | 1467 | |
33b62fba | 1468 | #: apply.c:4995 |
a0b6b246 JX |
1469 | msgid "don't apply changes matching the given path" |
1470 | msgstr "不要应用与给出路径向匹配的变更" | |
5c57d762 | 1471 | |
33b62fba | 1472 | #: apply.c:4998 |
a0b6b246 JX |
1473 | msgid "apply changes matching the given path" |
1474 | msgstr "应用与给出路径向匹配的变更" | |
220c313c | 1475 | |
ec3d4607 | 1476 | #: apply.c:5000 builtin/am.c:2318 |
a0b6b246 JX |
1477 | msgid "num" |
1478 | msgstr "数字" | |
220c313c | 1479 | |
33b62fba | 1480 | #: apply.c:5001 |
a0b6b246 JX |
1481 | msgid "remove <num> leading slashes from traditional diff paths" |
1482 | msgstr "从传统的 diff 路径中移除指定数量的前导斜线" | |
220c313c | 1483 | |
33b62fba | 1484 | #: apply.c:5004 |
a0b6b246 JX |
1485 | msgid "ignore additions made by the patch" |
1486 | msgstr "忽略补丁中的添加的文件" | |
220c313c | 1487 | |
33b62fba | 1488 | #: apply.c:5006 |
a0b6b246 JX |
1489 | msgid "instead of applying the patch, output diffstat for the input" |
1490 | msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" | |
220c313c | 1491 | |
33b62fba | 1492 | #: apply.c:5010 |
a0b6b246 JX |
1493 | msgid "show number of added and deleted lines in decimal notation" |
1494 | msgstr "以十进制数显示添加和删除的行数" | |
220c313c | 1495 | |
33b62fba | 1496 | #: apply.c:5012 |
a0b6b246 JX |
1497 | msgid "instead of applying the patch, output a summary for the input" |
1498 | msgstr "不应用补丁,而是显示输入的概要" | |
220c313c | 1499 | |
33b62fba | 1500 | #: apply.c:5014 |
a0b6b246 JX |
1501 | msgid "instead of applying the patch, see if the patch is applicable" |
1502 | msgstr "不应用补丁,而是查看补丁是否可应用" | |
220c313c | 1503 | |
33b62fba | 1504 | #: apply.c:5016 |
a0b6b246 JX |
1505 | msgid "make sure the patch is applicable to the current index" |
1506 | msgstr "确认补丁可以应用到当前索引" | |
276ceeaa | 1507 | |
33b62fba | 1508 | #: apply.c:5018 |
c1ac5258 JX |
1509 | msgid "mark new files with `git add --intent-to-add`" |
1510 | msgstr "使用命令 `git add --intent-to-add` 标记新增文件" | |
1511 | ||
33b62fba | 1512 | #: apply.c:5020 |
a0b6b246 JX |
1513 | msgid "apply a patch without touching the working tree" |
1514 | msgstr "应用补丁而不修改工作区" | |
5b04ee3b | 1515 | |
33b62fba | 1516 | #: apply.c:5022 |
a0b6b246 JX |
1517 | msgid "accept a patch that touches outside the working area" |
1518 | msgstr "接受修改工作区之外文件的补丁" | |
5c57d762 | 1519 | |
33b62fba | 1520 | #: apply.c:5025 |
a0b6b246 JX |
1521 | msgid "also apply the patch (use with --stat/--summary/--check)" |
1522 | msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" | |
c04f5ac3 | 1523 | |
33b62fba JX |
1524 | #: apply.c:5027 |
1525 | msgid "attempt three-way merge, fall back on normal patch if that fails" | |
523ccf5d | 1526 | msgstr "尝试三路合并,如果失败则回落至正常补丁模式" |
c04f5ac3 | 1527 | |
33b62fba | 1528 | #: apply.c:5029 |
a0b6b246 JX |
1529 | msgid "build a temporary index based on embedded index information" |
1530 | msgstr "创建一个临时索引基于嵌入的索引信息" | |
c04f5ac3 | 1531 | |
33b62fba | 1532 | #: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 |
a0b6b246 JX |
1533 | msgid "paths are separated with NUL character" |
1534 | msgstr "路径以 NUL 字符分隔" | |
8ada9598 | 1535 | |
33b62fba | 1536 | #: apply.c:5034 |
a0b6b246 JX |
1537 | msgid "ensure at least <n> lines of context match" |
1538 | msgstr "确保至少匹配 <n> 行上下文" | |
8ada9598 | 1539 | |
ec3d4607 | 1540 | #: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297 |
33b62fba | 1541 | #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 |
ec3d4607 | 1542 | #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991 |
33b62fba | 1543 | #: builtin/rebase.c:1347 |
a0b6b246 JX |
1544 | msgid "action" |
1545 | msgstr "动作" | |
8ada9598 | 1546 | |
33b62fba | 1547 | #: apply.c:5036 |
a0b6b246 JX |
1548 | msgid "detect new or modified lines that have whitespace errors" |
1549 | msgstr "检查新增和修改的行中间的空白字符滥用" | |
8ada9598 | 1550 | |
33b62fba | 1551 | #: apply.c:5039 apply.c:5042 |
a0b6b246 JX |
1552 | msgid "ignore changes in whitespace when finding context" |
1553 | msgstr "查找上下文时忽略空白字符的变更" | |
8ada9598 | 1554 | |
33b62fba | 1555 | #: apply.c:5045 |
a0b6b246 JX |
1556 | msgid "apply the patch in reverse" |
1557 | msgstr "反向应用补丁" | |
8ada9598 | 1558 | |
33b62fba | 1559 | #: apply.c:5047 |
a0b6b246 JX |
1560 | msgid "don't expect at least one line of context" |
1561 | msgstr "无需至少一行上下文" | |
8ada9598 | 1562 | |
33b62fba | 1563 | #: apply.c:5049 |
a0b6b246 JX |
1564 | msgid "leave the rejected hunks in corresponding *.rej files" |
1565 | msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" | |
8ada9598 | 1566 | |
33b62fba | 1567 | #: apply.c:5051 |
a0b6b246 JX |
1568 | msgid "allow overlapping hunks" |
1569 | msgstr "允许重叠的补丁片段" | |
8ada9598 | 1570 | |
33b62fba | 1571 | #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 |
ec3d4607 JX |
1572 | #: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756 |
1573 | #: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128 | |
a0b6b246 JX |
1574 | msgid "be verbose" |
1575 | msgstr "冗长输出" | |
8ada9598 | 1576 | |
33b62fba | 1577 | #: apply.c:5054 |
a0b6b246 JX |
1578 | msgid "tolerate incorrectly detected missing new-line at the end of file" |
1579 | msgstr "允许不正确的文件末尾换行符" | |
cfff71a9 | 1580 | |
33b62fba | 1581 | #: apply.c:5057 |
a0b6b246 JX |
1582 | msgid "do not trust the line counts in the hunk headers" |
1583 | msgstr "不信任补丁片段的头信息中的行号" | |
6c94aba5 | 1584 | |
ec3d4607 | 1585 | #: apply.c:5059 builtin/am.c:2306 |
a0b6b246 JX |
1586 | msgid "root" |
1587 | msgstr "根目录" | |
c04f5ac3 | 1588 | |
33b62fba | 1589 | #: apply.c:5060 |
a0b6b246 JX |
1590 | msgid "prepend <root> to all filenames" |
1591 | msgstr "为所有文件名前添加 <根目录>" | |
c04f5ac3 | 1592 | |
d9488fea | 1593 | #: archive-tar.c:125 archive-zip.c:345 |
349ede6a JX |
1594 | #, c-format |
1595 | msgid "cannot stream blob %s" | |
1596 | msgstr "不能打开数据对象 %s" | |
1597 | ||
d9488fea | 1598 | #: archive-tar.c:265 archive-zip.c:358 |
349ede6a JX |
1599 | #, c-format |
1600 | msgid "unsupported file mode: 0%o (SHA1: %s)" | |
1601 | msgstr "不支持的文件模式:0%o (SHA1: %s)" | |
1602 | ||
d13389bf | 1603 | #: archive-tar.c:450 |
349ede6a JX |
1604 | #, c-format |
1605 | msgid "unable to start '%s' filter" | |
1606 | msgstr "无法启动 '%s' 过滤器" | |
1607 | ||
d13389bf | 1608 | #: archive-tar.c:453 |
349ede6a JX |
1609 | msgid "unable to redirect descriptor" |
1610 | msgstr "无法重定向描述符" | |
1611 | ||
d13389bf | 1612 | #: archive-tar.c:460 |
349ede6a JX |
1613 | #, c-format |
1614 | msgid "'%s' filter reported error" | |
1615 | msgstr "'%s' 过滤器报告了错误" | |
1616 | ||
d9488fea | 1617 | #: archive-zip.c:318 |
349ede6a JX |
1618 | #, c-format |
1619 | msgid "path is not valid UTF-8: %s" | |
1620 | msgstr "路径不是有效的 UTF-8:%s" | |
1621 | ||
d9488fea | 1622 | #: archive-zip.c:322 |
349ede6a JX |
1623 | #, c-format |
1624 | msgid "path too long (%d chars, SHA1: %s): %s" | |
1625 | msgstr "路径太长(%d 字符,SHA1:%s):%s" | |
1626 | ||
ec3d4607 | 1627 | #: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 |
349ede6a JX |
1628 | #, c-format |
1629 | msgid "deflate error (%d)" | |
1630 | msgstr "压缩错误 (%d)" | |
1631 | ||
d9488fea | 1632 | #: archive-zip.c:603 |
349ede6a JX |
1633 | #, c-format |
1634 | msgid "timestamp too large for this system: %<PRIuMAX>" | |
1635 | msgstr "对于本系统时间戳太大:%<PRIuMAX>" | |
1636 | ||
c1ac5258 | 1637 | #: archive.c:14 |
a0b6b246 | 1638 | msgid "git archive [<options>] <tree-ish> [<path>...]" |
ddc12c42 | 1639 | msgstr "git archive [<选项>] <树对象> [<路径>...]" |
07432cef | 1640 | |
c1ac5258 | 1641 | #: archive.c:15 |
a0b6b246 JX |
1642 | msgid "git archive --list" |
1643 | msgstr "git archive --list" | |
1644 | ||
c1ac5258 | 1645 | #: archive.c:16 |
c04f5ac3 | 1646 | msgid "" |
a0b6b246 | 1647 | "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" |
c04f5ac3 | 1648 | msgstr "" |
ddc12c42 | 1649 | "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" |
6acbf033 | 1650 | |
c1ac5258 | 1651 | #: archive.c:17 |
a0b6b246 JX |
1652 | msgid "git archive --remote <repo> [--exec <cmd>] --list" |
1653 | msgstr "git archive --remote <仓库> [--exec <命令>] --list" | |
6acbf033 | 1654 | |
33b62fba | 1655 | #: archive.c:188 |
d9488fea JX |
1656 | #, c-format |
1657 | msgid "cannot read %s" | |
1658 | msgstr "不能读取 %s" | |
1659 | ||
33b62fba | 1660 | #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 |
ec3d4607 JX |
1661 | #: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833 |
1662 | #: builtin/merge.c:1144 | |
d9488fea JX |
1663 | #, c-format |
1664 | msgid "could not read '%s'" | |
1665 | msgstr "不能读取 '%s'" | |
1666 | ||
ec3d4607 | 1667 | #: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328 |
c04f5ac3 | 1668 | #, c-format |
a0b6b246 JX |
1669 | msgid "pathspec '%s' did not match any files" |
1670 | msgstr "路径规格 '%s' 未匹配任何文件" | |
c04f5ac3 | 1671 | |
33b62fba | 1672 | #: archive.c:451 |
06991777 JX |
1673 | #, c-format |
1674 | msgid "no such ref: %.*s" | |
1675 | msgstr "无此引用:%.*s" | |
1676 | ||
33b62fba | 1677 | #: archive.c:457 |
06991777 JX |
1678 | #, c-format |
1679 | msgid "not a valid object name: %s" | |
1680 | msgstr "不是一个有效的对象名:%s" | |
1681 | ||
33b62fba | 1682 | #: archive.c:470 |
06991777 JX |
1683 | #, c-format |
1684 | msgid "not a tree object: %s" | |
1685 | msgstr "不是一个树对象:%s" | |
1686 | ||
33b62fba | 1687 | #: archive.c:482 |
06991777 JX |
1688 | msgid "current working directory is untracked" |
1689 | msgstr "当前工作目录未被跟踪" | |
1690 | ||
33b62fba | 1691 | #: archive.c:523 |
d9488fea JX |
1692 | #, c-format |
1693 | msgid "File not found: %s" | |
1694 | msgstr "文件未找到:%s" | |
1695 | ||
33b62fba | 1696 | #: archive.c:525 |
d9488fea JX |
1697 | #, c-format |
1698 | msgid "Not a regular file: %s" | |
1699 | msgstr "不是一个常规文件:%s" | |
1700 | ||
33b62fba | 1701 | #: archive.c:552 |
a0b6b246 JX |
1702 | msgid "fmt" |
1703 | msgstr "格式" | |
07432cef | 1704 | |
33b62fba | 1705 | #: archive.c:552 |
a0b6b246 JX |
1706 | msgid "archive format" |
1707 | msgstr "归档格式" | |
7aea43ff | 1708 | |
ec3d4607 | 1709 | #: archive.c:553 builtin/log.c:1775 |
a0b6b246 JX |
1710 | msgid "prefix" |
1711 | msgstr "前缀" | |
7aea43ff | 1712 | |
33b62fba | 1713 | #: archive.c:554 |
a0b6b246 JX |
1714 | msgid "prepend prefix to each pathname in the archive" |
1715 | msgstr "为归档中每个路径名加上前缀" | |
c04f5ac3 | 1716 | |
33b62fba | 1717 | #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 |
473eb541 | 1718 | #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 |
d13389bf | 1719 | #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 |
ec3d4607 | 1720 | #: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105 |
33b62fba JX |
1721 | #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 |
1722 | #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 | |
a0b6b246 JX |
1723 | msgid "file" |
1724 | msgstr "文件" | |
a77c07d9 | 1725 | |
33b62fba | 1726 | #: archive.c:556 |
d9488fea JX |
1727 | msgid "add untracked file to archive" |
1728 | msgstr "将未跟踪文件添加到归档" | |
1729 | ||
33b62fba | 1730 | #: archive.c:559 builtin/archive.c:90 |
a0b6b246 JX |
1731 | msgid "write the archive to this file" |
1732 | msgstr "归档写入此文件" | |
a77c07d9 | 1733 | |
33b62fba | 1734 | #: archive.c:561 |
a0b6b246 JX |
1735 | msgid "read .gitattributes in working directory" |
1736 | msgstr "读取工作区中的 .gitattributes" | |
7ac1c0ad | 1737 | |
33b62fba | 1738 | #: archive.c:562 |
a0b6b246 JX |
1739 | msgid "report archived files on stderr" |
1740 | msgstr "在标准错误上报告归档文件" | |
7ac1c0ad | 1741 | |
33b62fba | 1742 | #: archive.c:564 |
d13389bf JX |
1743 | msgid "set compression level" |
1744 | msgstr "设置压缩级别" | |
8ada9598 | 1745 | |
33b62fba | 1746 | #: archive.c:567 |
a0b6b246 JX |
1747 | msgid "list supported archive formats" |
1748 | msgstr "列出支持的归档格式" | |
a77c07d9 | 1749 | |
33b62fba | 1750 | #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 |
ec3d4607 JX |
1751 | #: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352 |
1752 | #: builtin/submodule--helper.c:2902 | |
a0b6b246 JX |
1753 | msgid "repo" |
1754 | msgstr "仓库" | |
c04f5ac3 | 1755 | |
33b62fba | 1756 | #: archive.c:570 builtin/archive.c:92 |
a0b6b246 JX |
1757 | msgid "retrieve the archive from remote repository <repo>" |
1758 | msgstr "从远程仓库(<仓库>)提取归档文件" | |
8ada9598 | 1759 | |
ec3d4607 | 1760 | #: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717 |
06991777 | 1761 | #: builtin/notes.c:498 |
a0b6b246 JX |
1762 | msgid "command" |
1763 | msgstr "命令" | |
1764 | ||
33b62fba | 1765 | #: archive.c:572 builtin/archive.c:94 |
a0b6b246 JX |
1766 | msgid "path to the remote git-upload-archive command" |
1767 | msgstr "远程 git-upload-archive 命令的路径" | |
1768 | ||
33b62fba | 1769 | #: archive.c:579 |
a0b6b246 JX |
1770 | msgid "Unexpected option --remote" |
1771 | msgstr "未知参数 --remote" | |
1772 | ||
33b62fba | 1773 | #: archive.c:581 |
a0b6b246 JX |
1774 | msgid "Option --exec can only be used together with --remote" |
1775 | msgstr "选项 --exec 只能和 --remote 同时使用" | |
1776 | ||
33b62fba | 1777 | #: archive.c:583 |
a0b6b246 JX |
1778 | msgid "Unexpected option --output" |
1779 | msgstr "未知参数 --output" | |
1780 | ||
33b62fba | 1781 | #: archive.c:585 |
d9488fea JX |
1782 | msgid "Options --add-file and --remote cannot be used together" |
1783 | msgstr "选项 --add-file 和 --remote 不能同时使用" | |
1784 | ||
33b62fba | 1785 | #: archive.c:607 |
a0b6b246 JX |
1786 | #, c-format |
1787 | msgid "Unknown archive format '%s'" | |
1788 | msgstr "未知归档格式 '%s'" | |
1789 | ||
33b62fba | 1790 | #: archive.c:616 |
8ada9598 | 1791 | #, c-format |
a0b6b246 JX |
1792 | msgid "Argument not supported for format '%s': -%d" |
1793 | msgstr "参数不支持此格式 '%s':-%d" | |
1794 | ||
d13389bf | 1795 | #: attr.c:202 |
87cb7997 JX |
1796 | #, c-format |
1797 | msgid "%.*s is not a valid attribute name" | |
1798 | msgstr "%.*s 不是一个有效的属性名" | |
1799 | ||
33b62fba | 1800 | #: attr.c:363 |
06991777 JX |
1801 | #, c-format |
1802 | msgid "%s not allowed: %s:%d" | |
5b533632 | 1803 | msgstr "不允许 %s:%s:%d" |
06991777 | 1804 | |
33b62fba | 1805 | #: attr.c:403 |
8ada9598 | 1806 | msgid "" |
a0b6b246 JX |
1807 | "Negative patterns are ignored in git attributes\n" |
1808 | "Use '\\!' for literal leading exclamation." | |
8ada9598 | 1809 | msgstr "" |
a0b6b246 JX |
1810 | "负值模版在 git attributes 中被忽略\n" |
1811 | "当字符串确实要以感叹号开始时,使用 '\\!'。" | |
8ada9598 | 1812 | |
d13389bf | 1813 | #: bisect.c:489 |
8ada9598 | 1814 | #, c-format |
a0b6b246 JX |
1815 | msgid "Badly quoted content in file '%s': %s" |
1816 | msgstr "文件 '%s' 包含错误的引用格式:%s" | |
8ada9598 | 1817 | |
d13389bf | 1818 | #: bisect.c:699 |
a0b6b246 JX |
1819 | #, c-format |
1820 | msgid "We cannot bisect more!\n" | |
1821 | msgstr "我们无法进行更多的二分查找!\n" | |
8ada9598 | 1822 | |
d13389bf | 1823 | #: bisect.c:766 |
2e8451e8 | 1824 | #, c-format |
a0b6b246 JX |
1825 | msgid "Not a valid commit name %s" |
1826 | msgstr "不是一个有效的提交名 %s" | |
2e8451e8 | 1827 | |
d13389bf | 1828 | #: bisect.c:791 |
5b04ee3b JX |
1829 | #, c-format |
1830 | msgid "" | |
a0b6b246 JX |
1831 | "The merge base %s is bad.\n" |
1832 | "This means the bug has been fixed between %s and [%s].\n" | |
5b04ee3b | 1833 | msgstr "" |
a0b6b246 JX |
1834 | "合并基线 %s 是坏的。\n" |
1835 | "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" | |
5b04ee3b | 1836 | |
d13389bf | 1837 | #: bisect.c:796 |
5b04ee3b | 1838 | #, c-format |
a0b6b246 JX |
1839 | msgid "" |
1840 | "The merge base %s is new.\n" | |
1841 | "The property has changed between %s and [%s].\n" | |
1842 | msgstr "" | |
1843 | "合并基线 %s 是新的。\n" | |
1844 | "介于 %s 和 [%s] 之间的属性已经被修改。\n" | |
5b04ee3b | 1845 | |
d13389bf | 1846 | #: bisect.c:801 |
a0b6b246 JX |
1847 | #, c-format |
1848 | msgid "" | |
1849 | "The merge base %s is %s.\n" | |
1850 | "This means the first '%s' commit is between %s and [%s].\n" | |
1851 | msgstr "" | |
1852 | "合并基线 %s 是 %s。\n" | |
1853 | "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" | |
07432cef | 1854 | |
d13389bf | 1855 | #: bisect.c:809 |
a0b6b246 JX |
1856 | #, c-format |
1857 | msgid "" | |
1a79b2f1 | 1858 | "Some %s revs are not ancestors of the %s rev.\n" |
a0b6b246 JX |
1859 | "git bisect cannot work properly in this case.\n" |
1860 | "Maybe you mistook %s and %s revs?\n" | |
1861 | msgstr "" | |
1862 | "一些 %s 版本不是 %s 版本的祖先。\n" | |
1863 | "这种情况下 git 二分查找无法正常工作。\n" | |
1864 | "您可能弄错了 %s 和 %s 版本?\n" | |
07432cef | 1865 | |
d13389bf | 1866 | #: bisect.c:822 |
a0b6b246 JX |
1867 | #, c-format |
1868 | msgid "" | |
1869 | "the merge base between %s and [%s] must be skipped.\n" | |
1870 | "So we cannot be sure the first %s commit is between %s and %s.\n" | |
1871 | "We continue anyway." | |
1872 | msgstr "" | |
1873 | "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" | |
1874 | "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" | |
1875 | "我们仍旧继续。" | |
649900bc | 1876 | |
d13389bf | 1877 | #: bisect.c:861 |
649900bc | 1878 | #, c-format |
a0b6b246 JX |
1879 | msgid "Bisecting: a merge base must be tested\n" |
1880 | msgstr "二分查找中:合并基线必须是经过测试的\n" | |
649900bc | 1881 | |
d13389bf | 1882 | #: bisect.c:911 |
a0b6b246 JX |
1883 | #, c-format |
1884 | msgid "a %s revision is needed" | |
1885 | msgstr "需要一个 %s 版本" | |
649900bc | 1886 | |
33b62fba | 1887 | #: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 |
649900bc | 1888 | #, c-format |
a0b6b246 JX |
1889 | msgid "could not create file '%s'" |
1890 | msgstr "不能创建文件 '%s'" | |
649900bc | 1891 | |
473eb541 | 1892 | #: bisect.c:987 builtin/merge.c:153 |
649900bc | 1893 | #, c-format |
a0b6b246 JX |
1894 | msgid "could not read file '%s'" |
1895 | msgstr "不能读取文件 '%s'" | |
649900bc | 1896 | |
d13389bf | 1897 | #: bisect.c:1027 |
a0b6b246 JX |
1898 | msgid "reading bisect refs failed" |
1899 | msgstr "读取二分查找引用失败" | |
649900bc | 1900 | |
d13389bf | 1901 | #: bisect.c:1057 |
649900bc | 1902 | #, c-format |
a0b6b246 JX |
1903 | msgid "%s was both %s and %s\n" |
1904 | msgstr "%s 同时为 %s 和 %s\n" | |
649900bc | 1905 | |
d13389bf | 1906 | #: bisect.c:1066 |
649900bc | 1907 | #, c-format |
a0b6b246 JX |
1908 | msgid "" |
1909 | "No testable commit found.\n" | |
473eb541 | 1910 | "Maybe you started with bad path arguments?\n" |
a0b6b246 JX |
1911 | msgstr "" |
1912 | "没有发现可测试的提交。\n" | |
1913 | "可能您在运行时使用了错误的路径参数?\n" | |
649900bc | 1914 | |
d13389bf | 1915 | #: bisect.c:1095 |
649900bc | 1916 | #, c-format |
a0b6b246 JX |
1917 | msgid "(roughly %d step)" |
1918 | msgid_plural "(roughly %d steps)" | |
1919 | msgstr[0] "(大概 %d 步)" | |
1920 | msgstr[1] "(大概 %d 步)" | |
649900bc | 1921 | |
a4f16749 JX |
1922 | #. TRANSLATORS: the last %s will be replaced with "(roughly %d |
1923 | #. steps)" translation. | |
1924 | #. | |
d13389bf | 1925 | #: bisect.c:1101 |
649900bc | 1926 | #, c-format |
a0b6b246 JX |
1927 | msgid "Bisecting: %d revision left to test after this %s\n" |
1928 | msgid_plural "Bisecting: %d revisions left to test after this %s\n" | |
1929 | msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
1930 | msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" | |
649900bc | 1931 | |
33b62fba | 1932 | #: blame.c:2776 |
a4f16749 JX |
1933 | msgid "--contents and --reverse do not blend well." |
1934 | msgstr "--contents 和 --reverse 不能混用。" | |
1935 | ||
33b62fba | 1936 | #: blame.c:2790 |
a4f16749 JX |
1937 | msgid "cannot use --contents with final commit object name" |
1938 | msgstr "不能将 --contents 和最终的提交对象名共用" | |
1939 | ||
33b62fba | 1940 | #: blame.c:2811 |
a4f16749 JX |
1941 | msgid "--reverse and --first-parent together require specified latest commit" |
1942 | msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" | |
1943 | ||
ec3d4607 JX |
1944 | #: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333 |
1945 | #: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414 | |
1946 | #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346 | |
1947 | #: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806 | |
1948 | #: builtin/pack-objects.c:3821 builtin/shortlog.c:255 | |
a4f16749 JX |
1949 | msgid "revision walk setup failed" |
1950 | msgstr "版本遍历设置失败" | |
1951 | ||
33b62fba | 1952 | #: blame.c:2838 |
a4f16749 JX |
1953 | msgid "" |
1954 | "--reverse --first-parent together require range along first-parent chain" | |
1955 | msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" | |
1956 | ||
33b62fba | 1957 | #: blame.c:2849 |
a4f16749 JX |
1958 | #, c-format |
1959 | msgid "no such path %s in %s" | |
1960 | msgstr "在 %2$s 中无此路径 %1$s" | |
1961 | ||
33b62fba | 1962 | #: blame.c:2860 |
a4f16749 JX |
1963 | #, c-format |
1964 | msgid "cannot read blob %s for path %s" | |
1965 | msgstr "不能为路径 %2$s 读取数据对象 %1$s" | |
1966 | ||
d46c5519 | 1967 | #: branch.c:53 |
649900bc | 1968 | #, c-format |
a0b6b246 JX |
1969 | msgid "" |
1970 | "\n" | |
1971 | "After fixing the error cause you may try to fix up\n" | |
1972 | "the remote tracking information by invoking\n" | |
1973 | "\"git branch --set-upstream-to=%s%s%s\"." | |
1974 | msgstr "" | |
1975 | "\n" | |
1976 | "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" | |
1977 | "\"git branch --set-upstream-to=%s%s%s\" 。" | |
649900bc | 1978 | |
d46c5519 | 1979 | #: branch.c:67 |
649900bc | 1980 | #, c-format |
a0b6b246 JX |
1981 | msgid "Not setting branch %s as its own upstream." |
1982 | msgstr "未设置分支 %s 作为它自己的上游。" | |
649900bc | 1983 | |
d46c5519 | 1984 | #: branch.c:93 |
649900bc | 1985 | #, c-format |
6937cb4e JX |
1986 | msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." |
1987 | msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1988 | |
d46c5519 | 1989 | #: branch.c:94 |
649900bc | 1990 | #, c-format |
6937cb4e JX |
1991 | msgid "Branch '%s' set up to track remote branch '%s' from '%s'." |
1992 | msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" | |
649900bc | 1993 | |
d46c5519 | 1994 | #: branch.c:98 |
649900bc | 1995 | #, c-format |
6937cb4e JX |
1996 | msgid "Branch '%s' set up to track local branch '%s' by rebasing." |
1997 | msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" | |
649900bc | 1998 | |
d46c5519 | 1999 | #: branch.c:99 |
649900bc | 2000 | #, c-format |
6937cb4e | 2001 | msgid "Branch '%s' set up to track local branch '%s'." |
493a9322 | 2002 | msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" |
649900bc | 2003 | |
d46c5519 | 2004 | #: branch.c:104 |
649900bc | 2005 | #, c-format |
6937cb4e JX |
2006 | msgid "Branch '%s' set up to track remote ref '%s' by rebasing." |
2007 | msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" | |
649900bc | 2008 | |
d46c5519 | 2009 | #: branch.c:105 |
649900bc | 2010 | #, c-format |
6937cb4e JX |
2011 | msgid "Branch '%s' set up to track remote ref '%s'." |
2012 | msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" | |
649900bc | 2013 | |
d46c5519 | 2014 | #: branch.c:109 |
649900bc | 2015 | #, c-format |
6937cb4e JX |
2016 | msgid "Branch '%s' set up to track local ref '%s' by rebasing." |
2017 | msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" | |
649900bc | 2018 | |
d46c5519 | 2019 | #: branch.c:110 |
649900bc | 2020 | #, c-format |
6937cb4e JX |
2021 | msgid "Branch '%s' set up to track local ref '%s'." |
2022 | msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" | |
649900bc | 2023 | |
d46c5519 | 2024 | #: branch.c:119 |
a0b6b246 JX |
2025 | msgid "Unable to write upstream branch configuration" |
2026 | msgstr "无法写入上游分支配置" | |
649900bc | 2027 | |
d46c5519 | 2028 | #: branch.c:156 |
649900bc | 2029 | #, c-format |
a0b6b246 JX |
2030 | msgid "Not tracking: ambiguous information for ref %s" |
2031 | msgstr "未跟踪:引用 %s 有歧义" | |
649900bc | 2032 | |
d46c5519 | 2033 | #: branch.c:189 |
649900bc | 2034 | #, c-format |
a0b6b246 JX |
2035 | msgid "'%s' is not a valid branch name." |
2036 | msgstr "'%s' 不是一个有效的分支名称。" | |
649900bc | 2037 | |
d46c5519 | 2038 | #: branch.c:208 |
649900bc | 2039 | #, c-format |
a0b6b246 JX |
2040 | msgid "A branch named '%s' already exists." |
2041 | msgstr "一个分支名 '%s' 已经存在。" | |
649900bc | 2042 | |
d46c5519 | 2043 | #: branch.c:213 |
a0b6b246 JX |
2044 | msgid "Cannot force update the current branch." |
2045 | msgstr "无法强制更新当前分支。" | |
649900bc | 2046 | |
d46c5519 | 2047 | #: branch.c:233 |
649900bc | 2048 | #, c-format |
a0b6b246 JX |
2049 | msgid "Cannot setup tracking information; starting point '%s' is not a branch." |
2050 | msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" | |
649900bc | 2051 | |
d46c5519 | 2052 | #: branch.c:235 |
649900bc | 2053 | #, c-format |
a0b6b246 JX |
2054 | msgid "the requested upstream branch '%s' does not exist" |
2055 | msgstr "请求的上游分支 '%s' 不存在" | |
649900bc | 2056 | |
d46c5519 | 2057 | #: branch.c:237 |
a0b6b246 JX |
2058 | msgid "" |
2059 | "\n" | |
2060 | "If you are planning on basing your work on an upstream\n" | |
2061 | "branch that already exists at the remote, you may need to\n" | |
2062 | "run \"git fetch\" to retrieve it.\n" | |
2063 | "\n" | |
2064 | "If you are planning to push out a new local branch that\n" | |
2065 | "will track its remote counterpart, you may want to use\n" | |
2066 | "\"git push -u\" to set the upstream config as you push." | |
2067 | msgstr "" | |
2068 | "\n" | |
2069 | "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" | |
2070 | "您可能需要执行 \"git fetch\" 来获取分支。\n" | |
2071 | "\n" | |
2072 | "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" | |
2073 | "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" | |
649900bc | 2074 | |
d46c5519 | 2075 | #: branch.c:281 |
649900bc | 2076 | #, c-format |
a0b6b246 JX |
2077 | msgid "Not a valid object name: '%s'." |
2078 | msgstr "不是一个有效的对象名:'%s'。" | |
649900bc | 2079 | |
d46c5519 | 2080 | #: branch.c:301 |
649900bc | 2081 | #, c-format |
a0b6b246 JX |
2082 | msgid "Ambiguous object name: '%s'." |
2083 | msgstr "歧义的对象名:'%s'。" | |
649900bc | 2084 | |
d46c5519 | 2085 | #: branch.c:306 |
649900bc | 2086 | #, c-format |
a0b6b246 JX |
2087 | msgid "Not a valid branch point: '%s'." |
2088 | msgstr "无效的分支点:'%s'。" | |
649900bc | 2089 | |
33b62fba | 2090 | #: branch.c:366 |
649900bc | 2091 | #, c-format |
a0b6b246 JX |
2092 | msgid "'%s' is already checked out at '%s'" |
2093 | msgstr "'%s' 已经检出到 '%s'" | |
649900bc | 2094 | |
33b62fba | 2095 | #: branch.c:389 |
a0b6b246 JX |
2096 | #, c-format |
2097 | msgid "HEAD of working tree %s is not updated" | |
2098 | msgstr "工作区 %s 的 HEAD 指向没有被更新" | |
649900bc | 2099 | |
ec3d4607 | 2100 | #: bundle.c:44 |
d9488fea JX |
2101 | #, c-format |
2102 | msgid "unrecognized bundle hash algorithm: %s" | |
2103 | msgstr "未能识别的归档包哈希算法:%s" | |
2104 | ||
ec3d4607 | 2105 | #: bundle.c:48 |
649900bc | 2106 | #, c-format |
d9488fea JX |
2107 | msgid "unknown capability '%s'" |
2108 | msgstr "未知能力 '%s'" | |
649900bc | 2109 | |
ec3d4607 | 2110 | #: bundle.c:74 |
d9488fea JX |
2111 | #, c-format |
2112 | msgid "'%s' does not look like a v2 or v3 bundle file" | |
2113 | msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" | |
7157c2b5 | 2114 | |
ec3d4607 | 2115 | #: bundle.c:113 |
a0b6b246 JX |
2116 | #, c-format |
2117 | msgid "unrecognized header: %s%s (%d)" | |
2118 | msgstr "未能识别的包头:%s%s (%d)" | |
649900bc | 2119 | |
ec3d4607 | 2120 | #: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385 |
33b62fba | 2121 | #: builtin/commit.c:861 |
649900bc | 2122 | #, c-format |
a0b6b246 JX |
2123 | msgid "could not open '%s'" |
2124 | msgstr "不能打开 '%s'" | |
649900bc | 2125 | |
ec3d4607 | 2126 | #: bundle.c:198 |
a0b6b246 JX |
2127 | msgid "Repository lacks these prerequisite commits:" |
2128 | msgstr "仓库中缺少这些必备的提交:" | |
649900bc | 2129 | |
ec3d4607 | 2130 | #: bundle.c:201 |
a6cd2cc4 | 2131 | msgid "need a repository to verify a bundle" |
d9488fea | 2132 | msgstr "需要一个仓库来校验一个归档包" |
a6cd2cc4 | 2133 | |
ec3d4607 | 2134 | #: bundle.c:257 |
2e8451e8 | 2135 | #, c-format |
a0b6b246 JX |
2136 | msgid "The bundle contains this ref:" |
2137 | msgid_plural "The bundle contains these %d refs:" | |
d9488fea JX |
2138 | msgstr[0] "这个归档包中含有这个引用:" |
2139 | msgstr[1] "这个归档包中含有 %d 个引用:" | |
2e8451e8 | 2140 | |
ec3d4607 | 2141 | #: bundle.c:264 |
a0b6b246 | 2142 | msgid "The bundle records a complete history." |
d9488fea | 2143 | msgstr "这个归档包记录一个完整历史。" |
2e8451e8 | 2144 | |
ec3d4607 | 2145 | #: bundle.c:266 |
2e8451e8 | 2146 | #, c-format |
a0b6b246 JX |
2147 | msgid "The bundle requires this ref:" |
2148 | msgid_plural "The bundle requires these %d refs:" | |
d9488fea JX |
2149 | msgstr[0] "这个归档包需要这个引用:" |
2150 | msgstr[1] "这个归档包需要 %d 个引用:" | |
2e8451e8 | 2151 | |
ec3d4607 | 2152 | #: bundle.c:333 |
4c27fcb5 | 2153 | msgid "unable to dup bundle descriptor" |
d9488fea | 2154 | msgstr "无法复制归档包描述符" |
4c27fcb5 | 2155 | |
ec3d4607 | 2156 | #: bundle.c:340 |
a0b6b246 JX |
2157 | msgid "Could not spawn pack-objects" |
2158 | msgstr "不能生成 pack-objects 进程" | |
1003b3a5 | 2159 | |
ec3d4607 | 2160 | #: bundle.c:351 |
a0b6b246 JX |
2161 | msgid "pack-objects died" |
2162 | msgstr "pack-objects 终止" | |
8ada9598 | 2163 | |
ec3d4607 | 2164 | #: bundle.c:400 |
81809b99 | 2165 | #, c-format |
a0b6b246 JX |
2166 | msgid "ref '%s' is excluded by the rev-list options" |
2167 | msgstr "引用 '%s' 被 rev-list 选项排除" | |
8ada9598 | 2168 | |
ec3d4607 | 2169 | #: bundle.c:504 |
d9488fea JX |
2170 | #, c-format |
2171 | msgid "unsupported bundle version %d" | |
2172 | msgstr "不支持的归档包版本 %d" | |
2173 | ||
ec3d4607 | 2174 | #: bundle.c:506 |
d9488fea JX |
2175 | #, c-format |
2176 | msgid "cannot write bundle version %d with algorithm %s" | |
2177 | msgstr "不能写入,归档包版本 %d 不支持算法 %s" | |
2178 | ||
ec3d4607 | 2179 | #: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396 |
81809b99 | 2180 | #, c-format |
a0b6b246 JX |
2181 | msgid "unrecognized argument: %s" |
2182 | msgstr "未能识别的参数:%s" | |
8ada9598 | 2183 | |
ec3d4607 | 2184 | #: bundle.c:553 |
a0b6b246 | 2185 | msgid "Refusing to create empty bundle." |
d9488fea | 2186 | msgstr "不能创建空的归档包。" |
a0b6b246 | 2187 | |
ec3d4607 | 2188 | #: bundle.c:563 |
81809b99 | 2189 | #, c-format |
a0b6b246 JX |
2190 | msgid "cannot create '%s'" |
2191 | msgstr "不能创建 '%s'" | |
8ada9598 | 2192 | |
ec3d4607 | 2193 | #: bundle.c:588 |
a0b6b246 JX |
2194 | msgid "index-pack died" |
2195 | msgstr "index-pack 终止" | |
63af42fe | 2196 | |
ec3d4607 | 2197 | #: chunk-format.c:117 |
473eb541 JX |
2198 | msgid "terminating chunk id appears earlier than expected" |
2199 | msgstr "终止块 ID 比预期更早出现" | |
2200 | ||
ec3d4607 | 2201 | #: chunk-format.c:126 |
473eb541 JX |
2202 | #, c-format |
2203 | msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" | |
2204 | msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>" | |
2205 | ||
ec3d4607 | 2206 | #: chunk-format.c:133 |
473eb541 JX |
2207 | #, c-format |
2208 | msgid "duplicate chunk ID %<PRIx32> found" | |
2209 | msgstr "发现重复的块ID %<PRIx32>" | |
2210 | ||
ec3d4607 | 2211 | #: chunk-format.c:147 |
473eb541 JX |
2212 | #, c-format |
2213 | msgid "final chunk has non-zero id %<PRIx32>" | |
2214 | msgstr "最终块有非零 ID %<PRIx32>" | |
2215 | ||
2b472aae | 2216 | #: color.c:329 |
94550ed3 | 2217 | #, c-format |
a0b6b246 JX |
2218 | msgid "invalid color value: %.*s" |
2219 | msgstr "无效的颜色值:%.*s" | |
94550ed3 | 2220 | |
33b62fba | 2221 | #: commit-graph.c:204 midx.c:47 |
d9488fea JX |
2222 | msgid "invalid hash version" |
2223 | msgstr "无效的哈希版本" | |
2224 | ||
33b62fba | 2225 | #: commit-graph.c:262 |
d46c5519 JX |
2226 | msgid "commit-graph file is too small" |
2227 | msgstr "提交图形文件太小" | |
c1ac5258 | 2228 | |
33b62fba | 2229 | #: commit-graph.c:355 |
c1ac5258 | 2230 | #, c-format |
d46c5519 JX |
2231 | msgid "commit-graph signature %X does not match signature %X" |
2232 | msgstr "提交图形签名 %X 和签名 %X 不匹配" | |
c1ac5258 | 2233 | |
33b62fba | 2234 | #: commit-graph.c:362 |
c1ac5258 | 2235 | #, c-format |
d46c5519 JX |
2236 | msgid "commit-graph version %X does not match version %X" |
2237 | msgstr "提交图形版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 2238 | |
33b62fba | 2239 | #: commit-graph.c:369 |
c1ac5258 | 2240 | #, c-format |
d46c5519 JX |
2241 | msgid "commit-graph hash version %X does not match version %X" |
2242 | msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" | |
c1ac5258 | 2243 | |
33b62fba | 2244 | #: commit-graph.c:386 |
d9488fea JX |
2245 | #, c-format |
2246 | msgid "commit-graph file is too small to hold %u chunks" | |
2247 | msgstr "提交图形文件太小,容不下 %u 个块" | |
06991777 | 2248 | |
33b62fba | 2249 | #: commit-graph.c:482 |
a6cd2cc4 JX |
2250 | msgid "commit-graph has no base graphs chunk" |
2251 | msgstr "提交图形没有基础图形块" | |
2252 | ||
33b62fba | 2253 | #: commit-graph.c:492 |
a6cd2cc4 JX |
2254 | msgid "commit-graph chain does not match" |
2255 | msgstr "提交图形链不匹配" | |
2256 | ||
33b62fba | 2257 | #: commit-graph.c:540 |
a6cd2cc4 JX |
2258 | #, c-format |
2259 | msgid "invalid commit-graph chain: line '%s' not a hash" | |
2260 | msgstr "无效的提交图形链:行 '%s' 不是一个哈希值" | |
2261 | ||
33b62fba | 2262 | #: commit-graph.c:564 |
a6cd2cc4 JX |
2263 | msgid "unable to find all commit-graph files" |
2264 | msgstr "无法找到所有提交图形文件" | |
2265 | ||
33b62fba | 2266 | #: commit-graph.c:745 commit-graph.c:782 |
a6cd2cc4 JX |
2267 | msgid "invalid commit position. commit-graph is likely corrupt" |
2268 | msgstr "无效的提交位置。提交图形可能已损坏" | |
2269 | ||
33b62fba | 2270 | #: commit-graph.c:766 |
c1ac5258 JX |
2271 | #, c-format |
2272 | msgid "could not find commit %s" | |
2273 | msgstr "无法找到提交 %s" | |
2274 | ||
33b62fba | 2275 | #: commit-graph.c:799 |
473eb541 JX |
2276 | msgid "commit-graph requires overflow generation data but has none" |
2277 | msgstr "提交图需要溢出世代数据,但是没有" | |
2278 | ||
ec3d4607 | 2279 | #: commit-graph.c:1075 builtin/am.c:1341 |
a5cd71ca JX |
2280 | #, c-format |
2281 | msgid "unable to parse commit %s" | |
2282 | msgstr "不能解析提交 %s" | |
2283 | ||
ec3d4607 | 2284 | #: commit-graph.c:1337 builtin/pack-objects.c:3057 |
c1ac5258 JX |
2285 | #, c-format |
2286 | msgid "unable to get type of object %s" | |
2287 | msgstr "无法获得对象 %s 类型" | |
2288 | ||
33b62fba | 2289 | #: commit-graph.c:1368 |
06991777 JX |
2290 | msgid "Loading known commits in commit graph" |
2291 | msgstr "正在加载提交图中的已知提交" | |
2292 | ||
33b62fba | 2293 | #: commit-graph.c:1385 |
06991777 JX |
2294 | msgid "Expanding reachable commits in commit graph" |
2295 | msgstr "正在扩展提交图中的可达提交" | |
2296 | ||
33b62fba | 2297 | #: commit-graph.c:1405 |
06991777 JX |
2298 | msgid "Clearing commit marks in commit graph" |
2299 | msgstr "正在清除提交图中的提交标记" | |
4c27fcb5 | 2300 | |
33b62fba | 2301 | #: commit-graph.c:1424 |
473eb541 JX |
2302 | msgid "Computing commit graph topological levels" |
2303 | msgstr "正在计算提交图拓扑级别" | |
2304 | ||
33b62fba | 2305 | #: commit-graph.c:1477 |
4c27fcb5 JX |
2306 | msgid "Computing commit graph generation numbers" |
2307 | msgstr "正在计算提交图世代数字" | |
2308 | ||
33b62fba | 2309 | #: commit-graph.c:1558 |
349ede6a | 2310 | msgid "Computing commit changed paths Bloom filters" |
d9488fea | 2311 | msgstr "计算提交变更路径的布隆过滤器" |
349ede6a | 2312 | |
33b62fba | 2313 | #: commit-graph.c:1635 |
7157c2b5 JX |
2314 | msgid "Collecting referenced commits" |
2315 | msgstr "正在收集引用的提交" | |
2316 | ||
33b62fba | 2317 | #: commit-graph.c:1660 |
06991777 JX |
2318 | #, c-format |
2319 | msgid "Finding commits for commit graph in %d pack" | |
2320 | msgid_plural "Finding commits for commit graph in %d packs" | |
2321 | msgstr[0] "正在 %d 个包中查找提交图的提交" | |
2322 | msgstr[1] "正在 %d 个包中查找提交图的提交" | |
4c27fcb5 | 2323 | |
33b62fba | 2324 | #: commit-graph.c:1673 |
c1ac5258 JX |
2325 | #, c-format |
2326 | msgid "error adding pack %s" | |
2327 | msgstr "添加包 %s 出错" | |
2328 | ||
33b62fba | 2329 | #: commit-graph.c:1677 |
c1ac5258 JX |
2330 | #, c-format |
2331 | msgid "error opening index for %s" | |
2332 | msgstr "为 %s 打开索引出错" | |
2333 | ||
33b62fba | 2334 | #: commit-graph.c:1714 |
06991777 JX |
2335 | msgid "Finding commits for commit graph among packed objects" |
2336 | msgstr "正在打包对象中查找提交图的提交" | |
2337 | ||
33b62fba | 2338 | #: commit-graph.c:1732 |
06991777 | 2339 | msgid "Finding extra edges in commit graph" |
8e4e0555 | 2340 | msgstr "正在查找提交图中额外的边" |
06991777 | 2341 | |
33b62fba | 2342 | #: commit-graph.c:1781 |
a6cd2cc4 JX |
2343 | msgid "failed to write correct number of base graph ids" |
2344 | msgstr "无法写入正确数量的基础图形 ID" | |
fd8cb379 | 2345 | |
ec3d4607 | 2346 | #: commit-graph.c:1812 midx.c:911 |
fd8cb379 | 2347 | #, c-format |
c1ac5258 JX |
2348 | msgid "unable to create leading directories of %s" |
2349 | msgstr "不能为 %s 创建先导目录" | |
2350 | ||
33b62fba | 2351 | #: commit-graph.c:1825 |
349ede6a JX |
2352 | msgid "unable to create temporary graph layer" |
2353 | msgstr "无法创建临时图层" | |
2354 | ||
33b62fba | 2355 | #: commit-graph.c:1830 |
a6cd2cc4 | 2356 | #, c-format |
349ede6a JX |
2357 | msgid "unable to adjust shared permissions for '%s'" |
2358 | msgstr "无法为 '%s' 调整共享权限" | |
a6cd2cc4 | 2359 | |
33b62fba | 2360 | #: commit-graph.c:1887 |
06991777 JX |
2361 | #, c-format |
2362 | msgid "Writing out commit graph in %d pass" | |
2363 | msgid_plural "Writing out commit graph in %d passes" | |
8e4e0555 FZ |
2364 | msgstr[0] "正在用 %d 步写出提交图" |
2365 | msgstr[1] "正在用 %d 步写出提交图" | |
06991777 | 2366 | |
33b62fba | 2367 | #: commit-graph.c:1923 |
a6cd2cc4 JX |
2368 | msgid "unable to open commit-graph chain file" |
2369 | msgstr "无法打开提交图形链文件" | |
2370 | ||
33b62fba | 2371 | #: commit-graph.c:1939 |
a6cd2cc4 JX |
2372 | msgid "failed to rename base commit-graph file" |
2373 | msgstr "无法重命名基础提交图形文件" | |
2374 | ||
33b62fba | 2375 | #: commit-graph.c:1959 |
a6cd2cc4 JX |
2376 | msgid "failed to rename temporary commit-graph file" |
2377 | msgstr "无法重命名临时提交图形文件" | |
2378 | ||
33b62fba | 2379 | #: commit-graph.c:2092 |
a6cd2cc4 JX |
2380 | msgid "Scanning merged commits" |
2381 | msgstr "正在扫描合并提交" | |
2382 | ||
33b62fba | 2383 | #: commit-graph.c:2136 |
a6cd2cc4 JX |
2384 | msgid "Merging commit-graph" |
2385 | msgstr "正在合并提交图形" | |
2386 | ||
33b62fba | 2387 | #: commit-graph.c:2244 |
d13389bf JX |
2388 | msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" |
2389 | msgstr "正尝试写提交图,但是 'core.commitGraph' 被禁用" | |
a6cd2cc4 | 2390 | |
33b62fba | 2391 | #: commit-graph.c:2351 |
a6cd2cc4 JX |
2392 | msgid "too many commits to write graph" |
2393 | msgstr "提交太多不能画图" | |
2394 | ||
ec3d4607 | 2395 | #: commit-graph.c:2449 |
c1ac5258 | 2396 | msgid "the commit-graph file has incorrect checksum and is likely corrupt" |
4c27fcb5 JX |
2397 | msgstr "提交图文件的校验码错误,可能已经损坏" |
2398 | ||
ec3d4607 | 2399 | #: commit-graph.c:2459 |
d46c5519 JX |
2400 | #, c-format |
2401 | msgid "commit-graph has incorrect OID order: %s then %s" | |
5b533632 | 2402 | msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" |
d46c5519 | 2403 | |
ec3d4607 | 2404 | #: commit-graph.c:2469 commit-graph.c:2484 |
d46c5519 JX |
2405 | #, c-format |
2406 | msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" | |
2407 | msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" | |
2408 | ||
ec3d4607 | 2409 | #: commit-graph.c:2476 |
d46c5519 JX |
2410 | #, c-format |
2411 | msgid "failed to parse commit %s from commit-graph" | |
2412 | msgstr "无法从提交图形中解析提交 %s" | |
2413 | ||
ec3d4607 | 2414 | #: commit-graph.c:2494 |
4c27fcb5 | 2415 | msgid "Verifying commits in commit graph" |
8e4e0555 | 2416 | msgstr "正在校验提交图中的提交" |
fd8cb379 | 2417 | |
ec3d4607 | 2418 | #: commit-graph.c:2509 |
d46c5519 JX |
2419 | #, c-format |
2420 | msgid "failed to parse commit %s from object database for commit-graph" | |
2421 | msgstr "无法从提交图形的对象库中解析提交 %s" | |
2422 | ||
ec3d4607 | 2423 | #: commit-graph.c:2516 |
d46c5519 JX |
2424 | #, c-format |
2425 | msgid "root tree OID for commit %s in commit-graph is %s != %s" | |
5b533632 | 2426 | msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" |
d46c5519 | 2427 | |
ec3d4607 | 2428 | #: commit-graph.c:2526 |
d46c5519 JX |
2429 | #, c-format |
2430 | msgid "commit-graph parent list for commit %s is too long" | |
2431 | msgstr "提交 %s 的提交图形父提交列表太长了" | |
2432 | ||
ec3d4607 | 2433 | #: commit-graph.c:2535 |
d46c5519 JX |
2434 | #, c-format |
2435 | msgid "commit-graph parent for %s is %s != %s" | |
2436 | msgstr "%s 的提交图形父提交是 %s != %s" | |
2437 | ||
ec3d4607 | 2438 | #: commit-graph.c:2549 |
d46c5519 JX |
2439 | #, c-format |
2440 | msgid "commit-graph parent list for commit %s terminates early" | |
2441 | msgstr "提交 %s 的提交图形父提交列表过早终止" | |
2442 | ||
ec3d4607 | 2443 | #: commit-graph.c:2554 |
d46c5519 JX |
2444 | #, c-format |
2445 | msgid "" | |
2446 | "commit-graph has generation number zero for commit %s, but non-zero elsewhere" | |
2447 | msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" | |
2448 | ||
ec3d4607 | 2449 | #: commit-graph.c:2558 |
d46c5519 JX |
2450 | #, c-format |
2451 | msgid "" | |
2452 | "commit-graph has non-zero generation number for commit %s, but zero elsewhere" | |
2453 | msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" | |
2454 | ||
ec3d4607 | 2455 | #: commit-graph.c:2575 |
d46c5519 | 2456 | #, c-format |
473eb541 JX |
2457 | msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" |
2458 | msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>" | |
d46c5519 | 2459 | |
ec3d4607 | 2460 | #: commit-graph.c:2581 |
d46c5519 JX |
2461 | #, c-format |
2462 | msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" | |
2463 | msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" | |
2464 | ||
ec3d4607 JX |
2465 | #: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417 |
2466 | #: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457 | |
349ede6a JX |
2467 | #, c-format |
2468 | msgid "could not parse %s" | |
2469 | msgstr "不能解析 %s" | |
2470 | ||
2471 | #: commit.c:54 | |
2472 | #, c-format | |
2473 | msgid "%s %s is not a commit!" | |
2474 | msgstr "%s %s 不是一个提交!" | |
2475 | ||
2476 | #: commit.c:194 | |
2477 | msgid "" | |
2478 | "Support for <GIT_DIR>/info/grafts is deprecated\n" | |
2479 | "and will be removed in a future Git version.\n" | |
2480 | "\n" | |
2481 | "Please use \"git replace --convert-graft-file\"\n" | |
2482 | "to convert the grafts into replace refs.\n" | |
2483 | "\n" | |
2484 | "Turn this message off by running\n" | |
2485 | "\"git config advice.graftFileDeprecated false\"" | |
2486 | msgstr "" | |
2487 | "对 <GIT_DIR>/info/grafts 的支持已过时,并将在\n" | |
2488 | "未来的Git版本中被移除。\n" | |
2489 | "\n" | |
2490 | "请使用 \"git replace --convert-graft-file\" 将\n" | |
2491 | "grafts 转换为替换引用。\n" | |
2492 | "\n" | |
2493 | "设置 \"git config advice.graftFileDeprecated false\"\n" | |
2494 | "可关闭本消息" | |
2495 | ||
33b62fba | 2496 | #: commit.c:1237 |
349ede6a JX |
2497 | #, c-format |
2498 | msgid "Commit %s has an untrusted GPG signature, allegedly by %s." | |
2499 | msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" | |
2500 | ||
33b62fba | 2501 | #: commit.c:1241 |
349ede6a JX |
2502 | #, c-format |
2503 | msgid "Commit %s has a bad GPG signature allegedly by %s." | |
2504 | msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" | |
2505 | ||
33b62fba | 2506 | #: commit.c:1244 |
349ede6a JX |
2507 | #, c-format |
2508 | msgid "Commit %s does not have a GPG signature." | |
2509 | msgstr "提交 %s 没有 GPG 签名。" | |
2510 | ||
33b62fba | 2511 | #: commit.c:1247 |
349ede6a JX |
2512 | #, c-format |
2513 | msgid "Commit %s has a good GPG signature by %s\n" | |
2514 | msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" | |
2515 | ||
33b62fba | 2516 | #: commit.c:1501 |
349ede6a JX |
2517 | msgid "" |
2518 | "Warning: commit message did not conform to UTF-8.\n" | |
2519 | "You may want to amend it after fixing the message, or set the config\n" | |
2520 | "variable i18n.commitencoding to the encoding your project uses.\n" | |
2521 | msgstr "" | |
2522 | "警告:提交说明不符合 UTF-8 字符编码。\n" | |
2523 | "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" | |
2524 | "设置为您项目所用的字符编码。\n" | |
2525 | ||
06991777 | 2526 | #: compat/obstack.c:406 compat/obstack.c:408 |
a0b6b246 JX |
2527 | msgid "memory exhausted" |
2528 | msgstr "内存耗尽" | |
90314792 | 2529 | |
473eb541 | 2530 | #: config.c:126 |
c1ac5258 JX |
2531 | #, c-format |
2532 | msgid "" | |
2533 | "exceeded maximum include depth (%d) while including\n" | |
2534 | "\t%s\n" | |
2535 | "from\n" | |
2536 | "\t%s\n" | |
2537 | "This might be due to circular includes." | |
2538 | msgstr "" | |
e640d114 | 2539 | "超过了最大包含深度(%1$d),当从\n" |
c1ac5258 JX |
2540 | "\t%3$s\n" |
2541 | "包含\n" | |
2542 | "\t%2$s\n" | |
e640d114 | 2543 | "这可能是因为循环包含。" |
c1ac5258 | 2544 | |
473eb541 | 2545 | #: config.c:142 |
c1ac5258 JX |
2546 | #, c-format |
2547 | msgid "could not expand include path '%s'" | |
2548 | msgstr "无法扩展包含路径 '%s'" | |
2549 | ||
473eb541 | 2550 | #: config.c:153 |
c1ac5258 JX |
2551 | msgid "relative config includes must come from files" |
2552 | msgstr "相对路径的配置文件引用必须来自于文件" | |
2553 | ||
473eb541 | 2554 | #: config.c:199 |
87cb7997 | 2555 | msgid "relative config include conditionals must come from files" |
c1ac5258 JX |
2556 | msgstr "相对路径的配置文件条件引用必须来自于文件" |
2557 | ||
473eb541 JX |
2558 | #: config.c:396 |
2559 | #, c-format | |
2560 | msgid "invalid config format: %s" | |
2561 | msgstr "无效的配置格式:%s" | |
2562 | ||
2563 | #: config.c:400 | |
2564 | #, c-format | |
2565 | msgid "missing environment variable name for configuration '%.*s'" | |
2566 | msgstr "配置 '%.*s' 缺少环境变量名称" | |
2567 | ||
2568 | #: config.c:405 | |
2569 | #, c-format | |
2570 | msgid "missing environment variable '%s' for configuration '%.*s'" | |
2571 | msgstr "缺少环境变量 '%s' 于配置 '%.*s' " | |
2572 | ||
2573 | #: config.c:442 | |
c1ac5258 JX |
2574 | #, c-format |
2575 | msgid "key does not contain a section: %s" | |
2576 | msgstr "键名没有包含一个小节名称:%s" | |
87cb7997 | 2577 | |
473eb541 | 2578 | #: config.c:448 |
c1ac5258 JX |
2579 | #, c-format |
2580 | msgid "key does not contain variable name: %s" | |
2581 | msgstr "键名没有包含变量名:%s" | |
2582 | ||
33b62fba | 2583 | #: config.c:472 sequencer.c:2785 |
c1ac5258 JX |
2584 | #, c-format |
2585 | msgid "invalid key: %s" | |
2586 | msgstr "无效键名:%s" | |
2587 | ||
473eb541 | 2588 | #: config.c:478 |
c1ac5258 JX |
2589 | #, c-format |
2590 | msgid "invalid key (newline): %s" | |
2591 | msgstr "无效键名(有换行符):%s" | |
2592 | ||
473eb541 JX |
2593 | #: config.c:511 |
2594 | msgid "empty config key" | |
2595 | msgstr "空的配置键名" | |
2596 | ||
2597 | #: config.c:529 config.c:541 | |
c1ac5258 JX |
2598 | #, c-format |
2599 | msgid "bogus config parameter: %s" | |
2600 | msgstr "伪配置参数:%s" | |
2601 | ||
473eb541 | 2602 | #: config.c:555 config.c:572 config.c:579 config.c:588 |
c1ac5258 JX |
2603 | #, c-format |
2604 | msgid "bogus format in %s" | |
2605 | msgstr "%s 中格式错误" | |
2606 | ||
473eb541 JX |
2607 | #: config.c:622 |
2608 | #, c-format | |
2609 | msgid "bogus count in %s" | |
2610 | msgstr "%s 中错误计数" | |
2611 | ||
2612 | #: config.c:626 | |
2613 | #, c-format | |
2614 | msgid "too many entries in %s" | |
2615 | msgstr "%s 中太多的条目" | |
2616 | ||
2617 | #: config.c:636 | |
2618 | #, c-format | |
2619 | msgid "missing config key %s" | |
2620 | msgstr "缺失配置键名 %s" | |
2621 | ||
2622 | #: config.c:644 | |
2623 | #, c-format | |
2624 | msgid "missing config value %s" | |
2625 | msgstr "缺失配置取值 %s" | |
2626 | ||
2627 | #: config.c:995 | |
90314792 | 2628 | #, c-format |
a0b6b246 JX |
2629 | msgid "bad config line %d in blob %s" |
2630 | msgstr "数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 2631 | |
473eb541 | 2632 | #: config.c:999 |
a77c07d9 | 2633 | #, c-format |
a0b6b246 JX |
2634 | msgid "bad config line %d in file %s" |
2635 | msgstr "文件 %2$s 中错误的配置行 %1$d" | |
a77c07d9 | 2636 | |
473eb541 | 2637 | #: config.c:1003 |
a77c07d9 | 2638 | #, c-format |
a0b6b246 JX |
2639 | msgid "bad config line %d in standard input" |
2640 | msgstr "标准输入中错误的配置行 %d" | |
a77c07d9 | 2641 | |
473eb541 | 2642 | #: config.c:1007 |
90314792 | 2643 | #, c-format |
a0b6b246 JX |
2644 | msgid "bad config line %d in submodule-blob %s" |
2645 | msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" | |
90314792 | 2646 | |
473eb541 | 2647 | #: config.c:1011 |
90314792 | 2648 | #, c-format |
a0b6b246 JX |
2649 | msgid "bad config line %d in command line %s" |
2650 | msgstr "命令行 %2$s 中错误的配置行 %1$d" | |
90314792 | 2651 | |
473eb541 | 2652 | #: config.c:1015 |
90314792 | 2653 | #, c-format |
a0b6b246 JX |
2654 | msgid "bad config line %d in %s" |
2655 | msgstr "在 %2$s 中错误的配置行 %1$d" | |
220c313c | 2656 | |
473eb541 | 2657 | #: config.c:1152 |
a0b6b246 JX |
2658 | msgid "out of range" |
2659 | msgstr "超出范围" | |
6c94aba5 | 2660 | |
473eb541 | 2661 | #: config.c:1152 |
a0b6b246 JX |
2662 | msgid "invalid unit" |
2663 | msgstr "无效的单位" | |
6c94aba5 | 2664 | |
473eb541 | 2665 | #: config.c:1153 |
6c94aba5 | 2666 | #, c-format |
a0b6b246 JX |
2667 | msgid "bad numeric config value '%s' for '%s': %s" |
2668 | msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s" | |
6c94aba5 | 2669 | |
473eb541 | 2670 | #: config.c:1163 |
1b7f4a34 | 2671 | #, c-format |
a0b6b246 JX |
2672 | msgid "bad numeric config value '%s' for '%s' in blob %s: %s" |
2673 | msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2674 | |
473eb541 | 2675 | #: config.c:1166 |
1b7f4a34 | 2676 | #, c-format |
a0b6b246 JX |
2677 | msgid "bad numeric config value '%s' for '%s' in file %s: %s" |
2678 | msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2679 | |
473eb541 | 2680 | #: config.c:1169 |
1b7f4a34 | 2681 | #, c-format |
a0b6b246 JX |
2682 | msgid "bad numeric config value '%s' for '%s' in standard input: %s" |
2683 | msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s" | |
1b7f4a34 | 2684 | |
473eb541 | 2685 | #: config.c:1172 |
1b7f4a34 | 2686 | #, c-format |
a0b6b246 JX |
2687 | msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" |
2688 | msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
1b7f4a34 | 2689 | |
473eb541 | 2690 | #: config.c:1175 |
94550ed3 | 2691 | #, c-format |
a0b6b246 JX |
2692 | msgid "bad numeric config value '%s' for '%s' in command line %s: %s" |
2693 | msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 2694 | |
473eb541 | 2695 | #: config.c:1178 |
276ceeaa | 2696 | #, c-format |
a0b6b246 JX |
2697 | msgid "bad numeric config value '%s' for '%s' in %s: %s" |
2698 | msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s" | |
276ceeaa | 2699 | |
33b62fba | 2700 | #: config.c:1257 |
473eb541 JX |
2701 | #, c-format |
2702 | msgid "bad boolean config value '%s' for '%s'" | |
2703 | msgstr "'%2$s' 的错误的布尔取值 '%1$s'" | |
2704 | ||
33b62fba | 2705 | #: config.c:1275 |
276ceeaa | 2706 | #, c-format |
a0b6b246 | 2707 | msgid "failed to expand user dir in: '%s'" |
c1ac5258 | 2708 | msgstr "无法扩展用户目录:'%s'" |
94550ed3 | 2709 | |
33b62fba | 2710 | #: config.c:1284 |
5809aa05 JX |
2711 | #, c-format |
2712 | msgid "'%s' for '%s' is not a valid timestamp" | |
2713 | msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" | |
2714 | ||
33b62fba | 2715 | #: config.c:1377 |
c1ac5258 JX |
2716 | #, c-format |
2717 | msgid "abbrev length out of range: %d" | |
2718 | msgstr "缩写长度超出范围:%d" | |
2719 | ||
33b62fba | 2720 | #: config.c:1391 config.c:1402 |
3495628d | 2721 | #, c-format |
a0b6b246 JX |
2722 | msgid "bad zlib compression level %d" |
2723 | msgstr "错误的 zlib 压缩级别 %d" | |
3495628d | 2724 | |
33b62fba | 2725 | #: config.c:1494 |
c1ac5258 JX |
2726 | msgid "core.commentChar should only be one character" |
2727 | msgstr "core.commentChar 应该是一个字符" | |
2728 | ||
33b62fba | 2729 | #: config.c:1527 |
3495628d | 2730 | #, c-format |
a0b6b246 JX |
2731 | msgid "invalid mode for object creation: %s" |
2732 | msgstr "无效的对象创建模式:%s" | |
3495628d | 2733 | |
33b62fba | 2734 | #: config.c:1599 |
c1ac5258 JX |
2735 | #, c-format |
2736 | msgid "malformed value for %s" | |
2737 | msgstr "%s 的取值格式错误" | |
2738 | ||
33b62fba | 2739 | #: config.c:1625 |
c1ac5258 JX |
2740 | #, c-format |
2741 | msgid "malformed value for %s: %s" | |
2742 | msgstr "%s 的取值格式错误:%s" | |
2743 | ||
33b62fba | 2744 | #: config.c:1626 |
c1ac5258 JX |
2745 | msgid "must be one of nothing, matching, simple, upstream or current" |
2746 | msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" | |
2747 | ||
ec3d4607 | 2748 | #: config.c:1687 builtin/pack-objects.c:4084 |
1a79b2f1 JX |
2749 | #, c-format |
2750 | msgid "bad pack compression level %d" | |
2751 | msgstr "错误的打包压缩级别 %d" | |
2752 | ||
33b62fba | 2753 | #: config.c:1809 |
c1ac5258 JX |
2754 | #, c-format |
2755 | msgid "unable to load config blob object '%s'" | |
2756 | msgstr "无法从数据对象 '%s' 加载配置" | |
2757 | ||
33b62fba | 2758 | #: config.c:1812 |
c1ac5258 JX |
2759 | #, c-format |
2760 | msgid "reference '%s' does not point to a blob" | |
2761 | msgstr "引用 '%s' 没有指向一个数据对象" | |
2762 | ||
33b62fba | 2763 | #: config.c:1829 |
c1ac5258 JX |
2764 | #, c-format |
2765 | msgid "unable to resolve config blob '%s'" | |
2766 | msgstr "不能解析配置对象 '%s'" | |
2767 | ||
ec3d4607 | 2768 | #: config.c:1874 |
c1ac5258 JX |
2769 | #, c-format |
2770 | msgid "failed to parse %s" | |
2771 | msgstr "解析 %s 失败" | |
2772 | ||
ec3d4607 | 2773 | #: config.c:1930 |
a0b6b246 JX |
2774 | msgid "unable to parse command-line config" |
2775 | msgstr "无法解析命令行中的配置" | |
94550ed3 | 2776 | |
ec3d4607 | 2777 | #: config.c:2294 |
a0b6b246 JX |
2778 | msgid "unknown error occurred while reading the configuration files" |
2779 | msgstr "在读取配置文件时遇到未知错误" | |
94550ed3 | 2780 | |
ec3d4607 | 2781 | #: config.c:2468 |
87cb7997 JX |
2782 | #, c-format |
2783 | msgid "Invalid %s: '%s'" | |
2784 | msgstr "无效 %s:'%s'" | |
2785 | ||
ec3d4607 | 2786 | #: config.c:2513 |
87cb7997 JX |
2787 | #, c-format |
2788 | msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" | |
2789 | msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" | |
2790 | ||
ec3d4607 | 2791 | #: config.c:2559 |
276ceeaa | 2792 | #, c-format |
a0b6b246 JX |
2793 | msgid "unable to parse '%s' from command-line config" |
2794 | msgstr "无法解析命令行配置中的 '%s'" | |
1b7f4a34 | 2795 | |
ec3d4607 | 2796 | #: config.c:2561 |
94550ed3 | 2797 | #, c-format |
a0b6b246 JX |
2798 | msgid "bad config variable '%s' in file '%s' at line %d" |
2799 | msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" | |
94550ed3 | 2800 | |
ec3d4607 | 2801 | #: config.c:2645 |
c1ac5258 JX |
2802 | #, c-format |
2803 | msgid "invalid section name '%s'" | |
2804 | msgstr "无效的小节名称 '%s'" | |
2805 | ||
ec3d4607 | 2806 | #: config.c:2677 |
276ceeaa | 2807 | #, c-format |
a0b6b246 JX |
2808 | msgid "%s has multiple values" |
2809 | msgstr "%s 有多个取值" | |
276ceeaa | 2810 | |
ec3d4607 | 2811 | #: config.c:2706 |
c1ac5258 JX |
2812 | #, c-format |
2813 | msgid "failed to write new configuration file %s" | |
2814 | msgstr "写入新的配置文件 %s 失败" | |
2815 | ||
ec3d4607 | 2816 | #: config.c:2958 config.c:3285 |
c1ac5258 JX |
2817 | #, c-format |
2818 | msgid "could not lock config file %s" | |
2819 | msgstr "不能锁定配置文件 %s" | |
2820 | ||
ec3d4607 | 2821 | #: config.c:2969 |
c1ac5258 JX |
2822 | #, c-format |
2823 | msgid "opening %s" | |
2824 | msgstr "打开 %s" | |
2825 | ||
ec3d4607 | 2826 | #: config.c:3006 builtin/config.c:361 |
c1ac5258 JX |
2827 | #, c-format |
2828 | msgid "invalid pattern: %s" | |
2829 | msgstr "无效模式:%s" | |
2830 | ||
ec3d4607 | 2831 | #: config.c:3031 |
c1ac5258 JX |
2832 | #, c-format |
2833 | msgid "invalid config file %s" | |
2834 | msgstr "无效的配置文件 %s" | |
2835 | ||
ec3d4607 | 2836 | #: config.c:3044 config.c:3298 |
1a79b2f1 JX |
2837 | #, c-format |
2838 | msgid "fstat on %s failed" | |
65e2041e | 2839 | msgstr "对 %s 调用 fstat 失败" |
1a79b2f1 | 2840 | |
ec3d4607 | 2841 | #: config.c:3055 |
c1ac5258 | 2842 | #, c-format |
ec3d4607 JX |
2843 | msgid "unable to mmap '%s'%s" |
2844 | msgstr "不能 mmap '%s'%s" | |
c1ac5258 | 2845 | |
ec3d4607 | 2846 | #: config.c:3065 config.c:3303 |
c1ac5258 JX |
2847 | #, c-format |
2848 | msgid "chmod on %s failed" | |
2849 | msgstr "对 %s 调用 chmod 失败" | |
2850 | ||
ec3d4607 | 2851 | #: config.c:3150 config.c:3400 |
c1ac5258 JX |
2852 | #, c-format |
2853 | msgid "could not write config file %s" | |
2854 | msgstr "不能写入配置文件 %s" | |
2855 | ||
ec3d4607 | 2856 | #: config.c:3184 |
94550ed3 | 2857 | #, c-format |
a0b6b246 JX |
2858 | msgid "could not set '%s' to '%s'" |
2859 | msgstr "不能设置 '%s' 为 '%s'" | |
94550ed3 | 2860 | |
ec3d4607 | 2861 | #: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 |
276ceeaa | 2862 | #, c-format |
a0b6b246 JX |
2863 | msgid "could not unset '%s'" |
2864 | msgstr "不能取消设置 '%s'" | |
276ceeaa | 2865 | |
ec3d4607 | 2866 | #: config.c:3276 |
c1ac5258 JX |
2867 | #, c-format |
2868 | msgid "invalid section name: %s" | |
2869 | msgstr "无效的小节名称:%s" | |
2870 | ||
ec3d4607 | 2871 | #: config.c:3443 |
c1ac5258 JX |
2872 | #, c-format |
2873 | msgid "missing value for '%s'" | |
2874 | msgstr "%s 的取值缺失" | |
2875 | ||
fd8cb379 | 2876 | #: connect.c:61 |
c1ac5258 JX |
2877 | msgid "the remote end hung up upon initial contact" |
2878 | msgstr "远端在初始连接时即挂断" | |
94550ed3 | 2879 | |
fd8cb379 | 2880 | #: connect.c:63 |
a0b6b246 JX |
2881 | msgid "" |
2882 | "Could not read from remote repository.\n" | |
2883 | "\n" | |
2884 | "Please make sure you have the correct access rights\n" | |
2885 | "and the repository exists." | |
2886 | msgstr "" | |
2887 | "无法读取远程仓库。\n" | |
2888 | "\n" | |
2889 | "请确认您有正确的访问权限并且仓库存在。" | |
2890 | ||
c1ac5258 JX |
2891 | #: connect.c:81 |
2892 | #, c-format | |
2893 | msgid "server doesn't support '%s'" | |
2894 | msgstr "服务器不支持 '%s'" | |
2895 | ||
7157c2b5 | 2896 | #: connect.c:118 |
c1ac5258 JX |
2897 | #, c-format |
2898 | msgid "server doesn't support feature '%s'" | |
2899 | msgstr "服务器不支持特性 '%s'" | |
2900 | ||
7157c2b5 | 2901 | #: connect.c:129 |
c1ac5258 JX |
2902 | msgid "expected flush after capabilities" |
2903 | msgstr "在能力之后应为一个 flush 包" | |
2904 | ||
7157c2b5 | 2905 | #: connect.c:263 |
c1ac5258 JX |
2906 | #, c-format |
2907 | msgid "ignoring capabilities after first line '%s'" | |
e640d114 | 2908 | msgstr "忽略第一行 '%s' 之后的能力字段" |
c1ac5258 | 2909 | |
7157c2b5 | 2910 | #: connect.c:284 |
c1ac5258 JX |
2911 | msgid "protocol error: unexpected capabilities^{}" |
2912 | msgstr "协议错误:意外的 capabilities^{}" | |
2913 | ||
7157c2b5 | 2914 | #: connect.c:306 |
c1ac5258 JX |
2915 | #, c-format |
2916 | msgid "protocol error: expected shallow sha-1, got '%s'" | |
2917 | msgstr "协议错误:预期浅克隆 sha-1,却得到 '%s'" | |
2918 | ||
7157c2b5 | 2919 | #: connect.c:308 |
c1ac5258 JX |
2920 | msgid "repository on the other end cannot be shallow" |
2921 | msgstr "另一端的仓库不能是浅克隆仓库" | |
2922 | ||
7157c2b5 | 2923 | #: connect.c:347 |
c1ac5258 JX |
2924 | msgid "invalid packet" |
2925 | msgstr "无效数据包" | |
2926 | ||
7157c2b5 | 2927 | #: connect.c:367 |
c1ac5258 JX |
2928 | #, c-format |
2929 | msgid "protocol error: unexpected '%s'" | |
2930 | msgstr "协议错误:意外的 '%s'" | |
2931 | ||
473eb541 | 2932 | #: connect.c:497 |
7157c2b5 JX |
2933 | #, c-format |
2934 | msgid "unknown object format '%s' specified by server" | |
2935 | msgstr "服务器给出未知的对象格式 '%s'" | |
2936 | ||
473eb541 | 2937 | #: connect.c:526 |
c1ac5258 JX |
2938 | #, c-format |
2939 | msgid "invalid ls-refs response: %s" | |
2940 | msgstr "无效的 ls-refs 响应:%s" | |
2941 | ||
473eb541 | 2942 | #: connect.c:530 |
c1ac5258 JX |
2943 | msgid "expected flush after ref listing" |
2944 | msgstr "在引用列表之后应该有一个 flush 包" | |
2945 | ||
473eb541 | 2946 | #: connect.c:533 |
7157c2b5 JX |
2947 | msgid "expected response end packet after ref listing" |
2948 | msgstr "在引用列表之后应该有响应结束包" | |
2949 | ||
473eb541 | 2950 | #: connect.c:666 |
c1ac5258 JX |
2951 | #, c-format |
2952 | msgid "protocol '%s' is not supported" | |
2953 | msgstr "不支持 '%s' 协议" | |
2954 | ||
473eb541 | 2955 | #: connect.c:717 |
c1ac5258 JX |
2956 | msgid "unable to set SO_KEEPALIVE on socket" |
2957 | msgstr "无法为 socket 设置 SO_KEEPALIVE" | |
2958 | ||
473eb541 | 2959 | #: connect.c:757 connect.c:820 |
c1ac5258 JX |
2960 | #, c-format |
2961 | msgid "Looking up %s ... " | |
2962 | msgstr "查找 %s ..." | |
2963 | ||
473eb541 | 2964 | #: connect.c:761 |
c1ac5258 JX |
2965 | #, c-format |
2966 | msgid "unable to look up %s (port %s) (%s)" | |
2967 | msgstr "无法查找 %s(端口 %s)(%s)" | |
2968 | ||
2969 | #. TRANSLATORS: this is the end of "Looking up %s ... " | |
473eb541 | 2970 | #: connect.c:765 connect.c:836 |
c1ac5258 JX |
2971 | #, c-format |
2972 | msgid "" | |
2973 | "done.\n" | |
2974 | "Connecting to %s (port %s) ... " | |
2975 | msgstr "" | |
2976 | "完成。\n" | |
2977 | "连接到 %s(端口 %s)... " | |
2978 | ||
473eb541 | 2979 | #: connect.c:787 connect.c:864 |
c1ac5258 JX |
2980 | #, c-format |
2981 | msgid "" | |
2982 | "unable to connect to %s:\n" | |
2983 | "%s" | |
2984 | msgstr "" | |
2985 | "无法连接到 %s:\n" | |
2986 | "%s" | |
2987 | ||
2988 | #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " | |
473eb541 | 2989 | #: connect.c:793 connect.c:870 |
c1ac5258 JX |
2990 | msgid "done." |
2991 | msgstr "完成。" | |
2992 | ||
473eb541 | 2993 | #: connect.c:824 |
c1ac5258 JX |
2994 | #, c-format |
2995 | msgid "unable to look up %s (%s)" | |
2996 | msgstr "无法查找 %s(%s)" | |
2997 | ||
473eb541 | 2998 | #: connect.c:830 |
c1ac5258 JX |
2999 | #, c-format |
3000 | msgid "unknown port %s" | |
3001 | msgstr "未知端口 %s" | |
3002 | ||
473eb541 | 3003 | #: connect.c:967 connect.c:1299 |
c1ac5258 JX |
3004 | #, c-format |
3005 | msgid "strange hostname '%s' blocked" | |
3006 | msgstr "已阻止奇怪的主机名 '%s'" | |
3007 | ||
473eb541 | 3008 | #: connect.c:969 |
c1ac5258 JX |
3009 | #, c-format |
3010 | msgid "strange port '%s' blocked" | |
3011 | msgstr "已阻止奇怪的端口号 '%s'" | |
3012 | ||
473eb541 | 3013 | #: connect.c:979 |
c1ac5258 JX |
3014 | #, c-format |
3015 | msgid "cannot start proxy %s" | |
3016 | msgstr "不能启动代理 %s" | |
3017 | ||
473eb541 | 3018 | #: connect.c:1050 |
c1ac5258 JX |
3019 | msgid "no path specified; see 'git help pull' for valid url syntax" |
3020 | msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法" | |
3021 | ||
473eb541 JX |
3022 | #: connect.c:1190 |
3023 | msgid "newline is forbidden in git:// hosts and repo paths" | |
3024 | msgstr "在 git:// 主机和仓库路径中禁止使用换行符" | |
3025 | ||
3026 | #: connect.c:1247 | |
c1ac5258 JX |
3027 | msgid "ssh variant 'simple' does not support -4" |
3028 | msgstr "ssh 变体 'simple' 不支持 -4" | |
3029 | ||
473eb541 | 3030 | #: connect.c:1259 |
c1ac5258 JX |
3031 | msgid "ssh variant 'simple' does not support -6" |
3032 | msgstr "ssh 变体 'simple' 不支持 -6" | |
3033 | ||
473eb541 | 3034 | #: connect.c:1276 |
c1ac5258 | 3035 | msgid "ssh variant 'simple' does not support setting port" |
e640d114 | 3036 | msgstr "ssh 变体 'simple' 不支持设置端口" |
c1ac5258 | 3037 | |
473eb541 | 3038 | #: connect.c:1388 |
c1ac5258 JX |
3039 | #, c-format |
3040 | msgid "strange pathname '%s' blocked" | |
3041 | msgstr "已阻止奇怪的路径名 '%s'" | |
3042 | ||
473eb541 | 3043 | #: connect.c:1436 |
c1ac5258 JX |
3044 | msgid "unable to fork" |
3045 | msgstr "无法 fork" | |
3046 | ||
ec3d4607 | 3047 | #: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45 |
a0b6b246 | 3048 | msgid "Checking connectivity" |
06991777 | 3049 | msgstr "正在检查连通性" |
a0b6b246 | 3050 | |
d9488fea | 3051 | #: connected.c:120 |
a0b6b246 JX |
3052 | msgid "Could not run 'git rev-list'" |
3053 | msgstr "不能执行 'git rev-list'" | |
3054 | ||
d9488fea | 3055 | #: connected.c:144 |
a0b6b246 | 3056 | msgid "failed write to rev-list" |
c1ac5258 | 3057 | msgstr "写入 rev-list 失败" |
a0b6b246 | 3058 | |
d9488fea | 3059 | #: connected.c:149 |
a0b6b246 | 3060 | msgid "failed to close rev-list's stdin" |
c1ac5258 JX |
3061 | msgstr "关闭 rev-list 的标准输入失败" |
3062 | ||
33b62fba | 3063 | #: convert.c:183 |
c1ac5258 JX |
3064 | #, c-format |
3065 | msgid "illegal crlf_action %d" | |
ae4e099e | 3066 | msgstr "非法的 crlf_action %d" |
a0b6b246 | 3067 | |
33b62fba | 3068 | #: convert.c:196 |
3495628d | 3069 | #, c-format |
c1ac5258 JX |
3070 | msgid "CRLF would be replaced by LF in %s" |
3071 | msgstr "%s 中的 CRLF 将被 LF 替换" | |
31e5e17b | 3072 | |
33b62fba | 3073 | #: convert.c:198 |
31e5e17b | 3074 | #, c-format |
a0b6b246 JX |
3075 | msgid "" |
3076 | "CRLF will be replaced by LF in %s.\n" | |
c1ac5258 | 3077 | "The file will have its original line endings in your working directory" |
a0b6b246 | 3078 | msgstr "" |
c1ac5258 | 3079 | "%s 中的 CRLF 将被 LF 替换。<\n" |
a0b6b246 | 3080 | "在工作区中该文件仍保持原有的换行符。" |
3495628d | 3081 | |
33b62fba | 3082 | #: convert.c:206 |
3495628d | 3083 | #, c-format |
31e5e17b JX |
3084 | msgid "LF would be replaced by CRLF in %s" |
3085 | msgstr "文件 %s 中的 LF 将被 CRLF 替换" | |
3495628d | 3086 | |
33b62fba | 3087 | #: convert.c:208 |
276ceeaa | 3088 | #, c-format |
a0b6b246 JX |
3089 | msgid "" |
3090 | "LF will be replaced by CRLF in %s.\n" | |
c1ac5258 | 3091 | "The file will have its original line endings in your working directory" |
a0b6b246 | 3092 | msgstr "" |
c1ac5258 JX |
3093 | "%s 中的 LF 将被 CRLF 替换。\n" |
3094 | "在工作区中该文件仍保持原有的换行符" | |
276ceeaa | 3095 | |
33b62fba | 3096 | #: convert.c:273 |
fd8cb379 JX |
3097 | #, c-format |
3098 | msgid "BOM is prohibited in '%s' if encoded as %s" | |
3099 | msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM" | |
3100 | ||
33b62fba | 3101 | #: convert.c:280 |
fd8cb379 JX |
3102 | #, c-format |
3103 | msgid "" | |
ddc12c42 JX |
3104 | "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " |
3105 | "working-tree-encoding." | |
2b472aae JX |
3106 | msgstr "" |
3107 | "文件 '%s' 包含一个字节顺序标记(BOM)。请使用 UTF-%.*s 作为工作区编码。" | |
fd8cb379 | 3108 | |
33b62fba | 3109 | #: convert.c:293 |
fd8cb379 JX |
3110 | #, c-format |
3111 | msgid "BOM is required in '%s' if encoded as %s" | |
3112 | msgstr "如果编码为 %2$s,需要在 '%1$s' 中使用 BOM" | |
3113 | ||
33b62fba | 3114 | #: convert.c:295 |
fd8cb379 JX |
3115 | #, c-format |
3116 | msgid "" | |
3117 | "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" | |
3118 | "%sLE (depending on the byte order) as working-tree-encoding." | |
3119 | msgstr "" | |
3120 | "文件 '%s' 缺失一个字节顺序标记(BOM)。请使用 UTF-%sBE or UTF-%sLE(取决于字" | |
3121 | "节序)作为工作区编码。" | |
3122 | ||
33b62fba | 3123 | #: convert.c:408 convert.c:479 |
fd8cb379 JX |
3124 | #, c-format |
3125 | msgid "failed to encode '%s' from %s to %s" | |
3126 | msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" | |
3127 | ||
33b62fba | 3128 | #: convert.c:451 |
fd8cb379 JX |
3129 | #, c-format |
3130 | msgid "encoding '%s' from %s to %s and back is not the same" | |
3131 | msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" | |
3132 | ||
33b62fba | 3133 | #: convert.c:654 |
c1ac5258 JX |
3134 | #, c-format |
3135 | msgid "cannot fork to run external filter '%s'" | |
e640d114 | 3136 | msgstr "不能 fork 以执行外部过滤器 '%s'" |
c1ac5258 | 3137 | |
33b62fba | 3138 | #: convert.c:674 |
c1ac5258 JX |
3139 | #, c-format |
3140 | msgid "cannot feed the input to external filter '%s'" | |
e640d114 | 3141 | msgstr "不能将输入传递给外部过滤器 '%s'" |
c1ac5258 | 3142 | |
33b62fba | 3143 | #: convert.c:681 |
c1ac5258 JX |
3144 | #, c-format |
3145 | msgid "external filter '%s' failed %d" | |
e640d114 | 3146 | msgstr "外部过滤器 '%s' 失败码 %d" |
c1ac5258 | 3147 | |
33b62fba | 3148 | #: convert.c:716 convert.c:719 |
c1ac5258 JX |
3149 | #, c-format |
3150 | msgid "read from external filter '%s' failed" | |
3151 | msgstr "从外部过滤器 '%s' 读取失败" | |
3152 | ||
33b62fba | 3153 | #: convert.c:722 convert.c:777 |
c1ac5258 JX |
3154 | #, c-format |
3155 | msgid "external filter '%s' failed" | |
3156 | msgstr "外部过滤器 '%s' 失败" | |
3157 | ||
33b62fba | 3158 | #: convert.c:826 |
c1ac5258 JX |
3159 | msgid "unexpected filter type" |
3160 | msgstr "意外的过滤类型" | |
3161 | ||
33b62fba | 3162 | #: convert.c:837 |
c1ac5258 JX |
3163 | msgid "path name too long for external filter" |
3164 | msgstr "外部过滤器的路径名太长" | |
3165 | ||
ec3d4607 | 3166 | #: convert.c:935 |
c1ac5258 JX |
3167 | #, c-format |
3168 | msgid "" | |
3169 | "external filter '%s' is not available anymore although not all paths have " | |
3170 | "been filtered" | |
3171 | msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤" | |
3172 | ||
ec3d4607 | 3173 | #: convert.c:1236 |
fd8cb379 JX |
3174 | msgid "true/false are no valid working-tree-encodings" |
3175 | msgstr "true/false 不是有效的工作区编码" | |
3176 | ||
ec3d4607 | 3177 | #: convert.c:1416 convert.c:1449 |
c1ac5258 JX |
3178 | #, c-format |
3179 | msgid "%s: clean filter '%s' failed" | |
3180 | msgstr "%s:clean 过滤器 '%s' 失败" | |
3181 | ||
ec3d4607 | 3182 | #: convert.c:1492 |
c1ac5258 JX |
3183 | #, c-format |
3184 | msgid "%s: smudge filter %s failed" | |
3185 | msgstr "%s:smudge 过滤器 %s 失败" | |
3186 | ||
349ede6a JX |
3187 | #: credential.c:96 |
3188 | #, c-format | |
3189 | msgid "skipping credential lookup for key: credential.%s" | |
3190 | msgstr "跳过凭据查询:credential.%s" | |
3191 | ||
3192 | #: credential.c:112 | |
3193 | msgid "refusing to work with credential missing host field" | |
3194 | msgstr "拒绝使用缺少主机字段的凭据" | |
3195 | ||
3196 | #: credential.c:114 | |
3197 | msgid "refusing to work with credential missing protocol field" | |
3198 | msgstr "拒绝使用缺少协议字段的凭据" | |
3199 | ||
d9488fea | 3200 | #: credential.c:394 |
349ede6a JX |
3201 | #, c-format |
3202 | msgid "url contains a newline in its %s component: %s" | |
3203 | msgstr "URL 的 %s 组件中包含换行符:%s" | |
3204 | ||
d9488fea | 3205 | #: credential.c:438 |
349ede6a JX |
3206 | #, c-format |
3207 | msgid "url has no scheme: %s" | |
3208 | msgstr "URL 没有 scheme:%s" | |
3209 | ||
d9488fea | 3210 | #: credential.c:511 |
349ede6a JX |
3211 | #, c-format |
3212 | msgid "credential url cannot be parsed: %s" | |
3213 | msgstr "不能解析凭据 URL:%s" | |
3214 | ||
a5cd71ca | 3215 | #: date.c:138 |
a0b6b246 JX |
3216 | msgid "in the future" |
3217 | msgstr "在将来" | |
3495628d | 3218 | |
a5cd71ca | 3219 | #: date.c:144 |
3495628d | 3220 | #, c-format |
a4f16749 JX |
3221 | msgid "%<PRIuMAX> second ago" |
3222 | msgid_plural "%<PRIuMAX> seconds ago" | |
3223 | msgstr[0] "%<PRIuMAX> 秒钟前" | |
3224 | msgstr[1] "%<PRIuMAX> 秒钟前" | |
3495628d | 3225 | |
a5cd71ca | 3226 | #: date.c:151 |
3495628d | 3227 | #, c-format |
a4f16749 JX |
3228 | msgid "%<PRIuMAX> minute ago" |
3229 | msgid_plural "%<PRIuMAX> minutes ago" | |
3230 | msgstr[0] "%<PRIuMAX> 分钟前" | |
3231 | msgstr[1] "%<PRIuMAX> 分钟前" | |
3495628d | 3232 | |
a5cd71ca | 3233 | #: date.c:158 |
3495628d | 3234 | #, c-format |
a4f16749 JX |
3235 | msgid "%<PRIuMAX> hour ago" |
3236 | msgid_plural "%<PRIuMAX> hours ago" | |
3237 | msgstr[0] "%<PRIuMAX> 小时前" | |
3238 | msgstr[1] "%<PRIuMAX> 小时前" | |
3495628d | 3239 | |
a5cd71ca | 3240 | #: date.c:165 |
3495628d | 3241 | #, c-format |
a4f16749 JX |
3242 | msgid "%<PRIuMAX> day ago" |
3243 | msgid_plural "%<PRIuMAX> days ago" | |
3244 | msgstr[0] "%<PRIuMAX> 天前" | |
3245 | msgstr[1] "%<PRIuMAX> 天前" | |
3495628d | 3246 | |
a5cd71ca | 3247 | #: date.c:171 |
94550ed3 | 3248 | #, c-format |
a4f16749 JX |
3249 | msgid "%<PRIuMAX> week ago" |
3250 | msgid_plural "%<PRIuMAX> weeks ago" | |
3251 | msgstr[0] "%<PRIuMAX> 周前" | |
3252 | msgstr[1] "%<PRIuMAX> 周前" | |
94550ed3 | 3253 | |
a5cd71ca | 3254 | #: date.c:178 |
3495628d | 3255 | #, c-format |
a4f16749 JX |
3256 | msgid "%<PRIuMAX> month ago" |
3257 | msgid_plural "%<PRIuMAX> months ago" | |
3258 | msgstr[0] "%<PRIuMAX> 个月前" | |
3259 | msgstr[1] "%<PRIuMAX> 个月前" | |
3495628d | 3260 | |
a5cd71ca | 3261 | #: date.c:189 |
3495628d | 3262 | #, c-format |
a4f16749 JX |
3263 | msgid "%<PRIuMAX> year" |
3264 | msgid_plural "%<PRIuMAX> years" | |
3265 | msgstr[0] "%<PRIuMAX> 年" | |
3266 | msgstr[1] "%<PRIuMAX> 年" | |
3495628d | 3267 | |
a0b6b246 | 3268 | #. TRANSLATORS: "%s" is "<n> years" |
a5cd71ca | 3269 | #: date.c:192 |
94550ed3 | 3270 | #, c-format |
a4f16749 JX |
3271 | msgid "%s, %<PRIuMAX> month ago" |
3272 | msgid_plural "%s, %<PRIuMAX> months ago" | |
3273 | msgstr[0] "%s %<PRIuMAX> 个月前" | |
3274 | msgstr[1] "%s %<PRIuMAX> 个月前" | |
94550ed3 | 3275 | |
a5cd71ca | 3276 | #: date.c:197 date.c:202 |
94550ed3 | 3277 | #, c-format |
a4f16749 JX |
3278 | msgid "%<PRIuMAX> year ago" |
3279 | msgid_plural "%<PRIuMAX> years ago" | |
3280 | msgstr[0] "%<PRIuMAX> 年前" | |
3281 | msgstr[1] "%<PRIuMAX> 年前" | |
94550ed3 | 3282 | |
06991777 | 3283 | #: delta-islands.c:272 |
4c27fcb5 JX |
3284 | msgid "Propagating island marks" |
3285 | msgstr "正在传播数据岛标记" | |
3286 | ||
06991777 | 3287 | #: delta-islands.c:290 |
4c27fcb5 JX |
3288 | #, c-format |
3289 | msgid "bad tree object %s" | |
3290 | msgstr "坏的树对象 %s" | |
3291 | ||
06991777 | 3292 | #: delta-islands.c:334 |
4c27fcb5 JX |
3293 | #, c-format |
3294 | msgid "failed to load island regex for '%s': %s" | |
3295 | msgstr "未能加载 '%s' 的数据岛正则表达式:%s" | |
3296 | ||
06991777 | 3297 | #: delta-islands.c:390 |
4c27fcb5 JX |
3298 | #, c-format |
3299 | msgid "island regex from config has too many capture groups (max=%d)" | |
3300 | msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)" | |
3301 | ||
a6cd2cc4 | 3302 | #: delta-islands.c:467 |
4c27fcb5 JX |
3303 | #, c-format |
3304 | msgid "Marked %d islands, done.\n" | |
3305 | msgstr "已标记 %d 个数据岛,结束。\n" | |
3306 | ||
ec3d4607 | 3307 | #: diff-merges.c:70 |
473eb541 JX |
3308 | #, c-format |
3309 | msgid "unknown value for --diff-merges: %s" | |
3310 | msgstr "未知的 --diff-merges 取值:%s" | |
3311 | ||
ec3d4607 | 3312 | #: diff-lib.c:557 |
d13389bf JX |
3313 | msgid "--merge-base does not work with ranges" |
3314 | msgstr "--merge-base 不适用于范围" | |
3315 | ||
ec3d4607 | 3316 | #: diff-lib.c:559 |
d13389bf JX |
3317 | msgid "--merge-base only works with commits" |
3318 | msgstr "--merge-base 仅适用于提交" | |
3319 | ||
ec3d4607 | 3320 | #: diff-lib.c:576 |
d13389bf JX |
3321 | msgid "unable to get HEAD" |
3322 | msgstr "不能解析 HEAD" | |
3323 | ||
ec3d4607 | 3324 | #: diff-lib.c:583 |
d13389bf JX |
3325 | msgid "no merge base found" |
3326 | msgstr "未找到合并基线" | |
3327 | ||
ec3d4607 | 3328 | #: diff-lib.c:585 |
d13389bf JX |
3329 | msgid "multiple merge bases found" |
3330 | msgstr "找到了多条合并基线" | |
3331 | ||
ec3d4607 | 3332 | #: diff-no-index.c:237 |
d46c5519 JX |
3333 | msgid "git diff --no-index [<options>] <path> <path>" |
3334 | msgstr "git diff --no-index [<选项>] <路径> <路径>" | |
3335 | ||
ec3d4607 | 3336 | #: diff-no-index.c:262 |
d46c5519 JX |
3337 | msgid "" |
3338 | "Not a git repository. Use --no-index to compare two paths outside a working " | |
3339 | "tree" | |
d9488fea | 3340 | msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" |
cfff71a9 | 3341 | |
a0b6b246 | 3342 | # 译者:注意保持前导空格 |
7157c2b5 | 3343 | #: diff.c:156 |
a0b6b246 JX |
3344 | #, c-format |
3345 | msgid " Failed to parse dirstat cut-off percentage '%s'\n" | |
3346 | msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" | |
cfff71a9 | 3347 | |
a0b6b246 | 3348 | # 译者:注意保持前导空格 |
7157c2b5 | 3349 | #: diff.c:161 |
a0b6b246 JX |
3350 | #, c-format |
3351 | msgid " Unknown dirstat parameter '%s'\n" | |
3352 | msgstr " 未知的 dirstat 参数 '%s'\n" | |
7aea43ff | 3353 | |
7157c2b5 | 3354 | #: diff.c:297 |
6937cb4e | 3355 | msgid "" |
c1ac5258 JX |
3356 | "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " |
3357 | "'dimmed-zebra', 'plain'" | |
5809aa05 | 3358 | msgstr "" |
ec3d4607 | 3359 | "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " |
c1ac5258 JX |
3360 | "'plain'" |
3361 | ||
7157c2b5 | 3362 | #: diff.c:325 |
c1ac5258 | 3363 | #, c-format |
06991777 JX |
3364 | msgid "" |
3365 | "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " | |
3366 | "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" | |
3367 | msgstr "" | |
3368 | "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" | |
3369 | "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" | |
c1ac5258 | 3370 | |
7157c2b5 | 3371 | #: diff.c:333 |
c1ac5258 | 3372 | msgid "" |
06991777 JX |
3373 | "color-moved-ws: allow-indentation-change cannot be combined with other " |
3374 | "whitespace modes" | |
c1ac5258 | 3375 | msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" |
6937cb4e | 3376 | |
7157c2b5 | 3377 | #: diff.c:410 |
7aea43ff | 3378 | #, c-format |
a0b6b246 JX |
3379 | msgid "Unknown value for 'diff.submodule' config variable: '%s'" |
3380 | msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" | |
7aea43ff | 3381 | |
7157c2b5 | 3382 | #: diff.c:470 |
7aea43ff | 3383 | #, c-format |
a0b6b246 JX |
3384 | msgid "" |
3385 | "Found errors in 'diff.dirstat' config variable:\n" | |
3386 | "%s" | |
3387 | msgstr "" | |
3388 | "发现配置变量 'diff.dirstat' 中的错误:\n" | |
3389 | "%s" | |
7aea43ff | 3390 | |
ec3d4607 | 3391 | #: diff.c:4282 |
7aea43ff | 3392 | #, c-format |
a0b6b246 JX |
3393 | msgid "external diff died, stopping at %s" |
3394 | msgstr "外部 diff 退出,停止在 %s" | |
7aea43ff | 3395 | |
ec3d4607 | 3396 | #: diff.c:4634 |
a0b6b246 JX |
3397 | msgid "--name-only, --name-status, --check and -s are mutually exclusive" |
3398 | msgstr "--name-only、--name-status、--check 和 -s 是互斥的" | |
3399 | ||
ec3d4607 | 3400 | #: diff.c:4637 |
31e5e17b JX |
3401 | msgid "-G, -S and --find-object are mutually exclusive" |
3402 | msgstr "-G、-S 和 --find-object 是互斥的" | |
3403 | ||
ec3d4607 JX |
3404 | #: diff.c:4640 |
3405 | msgid "" | |
3406 | "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" | |
3407 | msgstr "-G 和 --pickaxe-regex 互斥,使用 --pickaxe-regex 和 -S" | |
3408 | ||
3409 | #: diff.c:4643 | |
3410 | msgid "" | |
3411 | "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " | |
3412 | "with -G and -S" | |
3413 | msgstr "---pickaxe-all 和 --find-object 互斥,使用 --pickaxe-all 与 -G 和 -S" | |
3414 | ||
3415 | #: diff.c:4722 | |
a0b6b246 JX |
3416 | msgid "--follow requires exactly one pathspec" |
3417 | msgstr "--follow 明确要求只跟一个路径规格" | |
3418 | ||
ec3d4607 | 3419 | #: diff.c:4770 |
d46c5519 JX |
3420 | #, c-format |
3421 | msgid "invalid --stat value: %s" | |
3422 | msgstr "无效的 --stat 值:%s" | |
3423 | ||
ec3d4607 | 3424 | #: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318 |
d9488fea | 3425 | #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 |
d46c5519 JX |
3426 | #, c-format |
3427 | msgid "%s expects a numerical value" | |
3428 | msgstr "%s 期望一个数字值" | |
3429 | ||
ec3d4607 | 3430 | #: diff.c:4807 |
7aea43ff | 3431 | #, c-format |
a0b6b246 JX |
3432 | msgid "" |
3433 | "Failed to parse --dirstat/-X option parameter:\n" | |
3434 | "%s" | |
3435 | msgstr "" | |
3436 | "无法解析 --dirstat/-X 选项的参数:\n" | |
3437 | "%s" | |
7aea43ff | 3438 | |
ec3d4607 | 3439 | #: diff.c:4892 |
d46c5519 JX |
3440 | #, c-format |
3441 | msgid "unknown change class '%c' in --diff-filter=%s" | |
3442 | msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" | |
3443 | ||
ec3d4607 | 3444 | #: diff.c:4916 |
d46c5519 JX |
3445 | #, c-format |
3446 | msgid "unknown value after ws-error-highlight=%.*s" | |
3447 | msgstr "ws-error-highlight=%.*s 之后未知的值" | |
3448 | ||
ec3d4607 | 3449 | #: diff.c:4930 |
7aea43ff | 3450 | #, c-format |
d46c5519 JX |
3451 | msgid "unable to resolve '%s'" |
3452 | msgstr "不能解析 '%s'" | |
3453 | ||
ec3d4607 | 3454 | #: diff.c:4980 diff.c:4986 |
d46c5519 JX |
3455 | #, c-format |
3456 | msgid "%s expects <n>/<m> form" | |
3457 | msgstr "%s 期望 <n>/<m> 格式" | |
3458 | ||
ec3d4607 | 3459 | #: diff.c:4998 |
d46c5519 JX |
3460 | #, c-format |
3461 | msgid "%s expects a character, got '%s'" | |
3462 | msgstr "%s 期望一个字符,得到 '%s'" | |
3463 | ||
ec3d4607 | 3464 | #: diff.c:5019 |
d46c5519 JX |
3465 | #, c-format |
3466 | msgid "bad --color-moved argument: %s" | |
3467 | msgstr "坏的 --color-moved 参数:%s" | |
3468 | ||
ec3d4607 | 3469 | #: diff.c:5038 |
d46c5519 JX |
3470 | #, c-format |
3471 | msgid "invalid mode '%s' in --color-moved-ws" | |
3472 | msgstr "--color-moved-ws 中的无效模式 '%s' " | |
3473 | ||
ec3d4607 | 3474 | #: diff.c:5078 |
d46c5519 JX |
3475 | msgid "" |
3476 | "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " | |
3477 | "\"histogram\"" | |
3478 | msgstr "" | |
3479 | "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" | |
3480 | ||
ec3d4607 | 3481 | #: diff.c:5114 diff.c:5134 |
d46c5519 JX |
3482 | #, c-format |
3483 | msgid "invalid argument to %s" | |
3484 | msgstr "%s 的参数无效" | |
3485 | ||
ec3d4607 | 3486 | #: diff.c:5238 |
d13389bf JX |
3487 | #, c-format |
3488 | msgid "invalid regex given to -I: '%s'" | |
3489 | msgstr "选项 -I 的正则表达式无效:'%s'" | |
3490 | ||
ec3d4607 | 3491 | #: diff.c:5287 |
d46c5519 JX |
3492 | #, c-format |
3493 | msgid "failed to parse --submodule option parameter: '%s'" | |
a0b6b246 | 3494 | msgstr "无法解析 --submodule 选项的参数:'%s'" |
7aea43ff | 3495 | |
ec3d4607 | 3496 | #: diff.c:5343 |
d46c5519 JX |
3497 | #, c-format |
3498 | msgid "bad --word-diff argument: %s" | |
3499 | msgstr "坏的 --word-diff 参数:%s" | |
3500 | ||
ec3d4607 | 3501 | #: diff.c:5379 |
d46c5519 JX |
3502 | msgid "Diff output format options" |
3503 | msgstr "差异输出格式化选项" | |
3504 | ||
ec3d4607 | 3505 | #: diff.c:5381 diff.c:5387 |
d46c5519 JX |
3506 | msgid "generate patch" |
3507 | msgstr "生成补丁" | |
3508 | ||
ec3d4607 | 3509 | #: diff.c:5384 builtin/log.c:179 |
d46c5519 JX |
3510 | msgid "suppress diff output" |
3511 | msgstr "不显示差异输出" | |
3512 | ||
ec3d4607 | 3513 | #: diff.c:5389 diff.c:5503 diff.c:5510 |
d46c5519 JX |
3514 | msgid "<n>" |
3515 | msgstr "<n>" | |
3516 | ||
ec3d4607 | 3517 | #: diff.c:5390 diff.c:5393 |
d46c5519 JX |
3518 | msgid "generate diffs with <n> lines context" |
3519 | msgstr "生成含 <n> 行上下文的差异" | |
3520 | ||
ec3d4607 | 3521 | #: diff.c:5395 |
d46c5519 JX |
3522 | msgid "generate the diff in raw format" |
3523 | msgstr "生成原始格式的差异" | |
3524 | ||
ec3d4607 | 3525 | #: diff.c:5398 |
d46c5519 JX |
3526 | msgid "synonym for '-p --raw'" |
3527 | msgstr "和 '-p --raw' 同义" | |
3528 | ||
ec3d4607 | 3529 | #: diff.c:5402 |
d46c5519 JX |
3530 | msgid "synonym for '-p --stat'" |
3531 | msgstr "和 '-p --stat' 同义" | |
3532 | ||
ec3d4607 | 3533 | #: diff.c:5406 |
d46c5519 JX |
3534 | msgid "machine friendly --stat" |
3535 | msgstr "机器友好的 --stat" | |
3536 | ||
ec3d4607 | 3537 | #: diff.c:5409 |
d46c5519 JX |
3538 | msgid "output only the last line of --stat" |
3539 | msgstr "只输出 --stat 的最后一行" | |
3540 | ||
ec3d4607 | 3541 | #: diff.c:5411 diff.c:5419 |
d46c5519 JX |
3542 | msgid "<param1,param2>..." |
3543 | msgstr "<参数1,参数2>..." | |
3544 | ||
ec3d4607 | 3545 | #: diff.c:5412 |
d46c5519 JX |
3546 | msgid "" |
3547 | "output the distribution of relative amount of changes for each sub-directory" | |
3548 | msgstr "输出每个子目录相对变更的分布" | |
3549 | ||
ec3d4607 | 3550 | #: diff.c:5416 |
d46c5519 JX |
3551 | msgid "synonym for --dirstat=cumulative" |
3552 | msgstr "和 --dirstat=cumulative 同义" | |
3553 | ||
ec3d4607 | 3554 | #: diff.c:5420 |
d46c5519 JX |
3555 | msgid "synonym for --dirstat=files,param1,param2..." |
3556 | msgstr "是 --dirstat=files,param1,param2... 的同义词" | |
3557 | ||
ec3d4607 | 3558 | #: diff.c:5424 |
d46c5519 JX |
3559 | msgid "warn if changes introduce conflict markers or whitespace errors" |
3560 | msgstr "如果变更中引入冲突定界符或空白错误,给出警告" | |
3561 | ||
ec3d4607 | 3562 | #: diff.c:5427 |
d46c5519 JX |
3563 | msgid "condensed summary such as creations, renames and mode changes" |
3564 | msgstr "精简摘要,例如创建、重命名和模式变更" | |
3565 | ||
ec3d4607 | 3566 | #: diff.c:5430 |
d46c5519 JX |
3567 | msgid "show only names of changed files" |
3568 | msgstr "只显示变更文件的文件名" | |
3569 | ||
ec3d4607 | 3570 | #: diff.c:5433 |
d46c5519 JX |
3571 | msgid "show only names and status of changed files" |
3572 | msgstr "只显示变更文件的文件名和状态" | |
3573 | ||
ec3d4607 | 3574 | #: diff.c:5435 |
d46c5519 JX |
3575 | msgid "<width>[,<name-width>[,<count>]]" |
3576 | msgstr "<宽度>[,<文件名宽度>[,<次数>]]" | |
3577 | ||
ec3d4607 | 3578 | #: diff.c:5436 |
d46c5519 | 3579 | msgid "generate diffstat" |
5b533632 | 3580 | msgstr "生成差异统计(diffstat)" |
d46c5519 | 3581 | |
ec3d4607 | 3582 | #: diff.c:5438 diff.c:5441 diff.c:5444 |
d46c5519 JX |
3583 | msgid "<width>" |
3584 | msgstr "<宽度>" | |
3585 | ||
ec3d4607 | 3586 | #: diff.c:5439 |
d46c5519 JX |
3587 | msgid "generate diffstat with a given width" |
3588 | msgstr "使用给定的长度生成差异统计" | |
3589 | ||
ec3d4607 | 3590 | #: diff.c:5442 |
d46c5519 JX |
3591 | msgid "generate diffstat with a given name width" |
3592 | msgstr "使用给定的文件名长度生成差异统计" | |
3593 | ||
ec3d4607 | 3594 | #: diff.c:5445 |
d46c5519 JX |
3595 | msgid "generate diffstat with a given graph width" |
3596 | msgstr "使用给定的图形长度生成差异统计" | |
3597 | ||
ec3d4607 | 3598 | #: diff.c:5447 |
d46c5519 JX |
3599 | msgid "<count>" |
3600 | msgstr "<次数>" | |
3601 | ||
ec3d4607 | 3602 | #: diff.c:5448 |
d46c5519 JX |
3603 | msgid "generate diffstat with limited lines" |
3604 | msgstr "生成有限行数的差异统计" | |
3605 | ||
ec3d4607 | 3606 | #: diff.c:5451 |
d46c5519 JX |
3607 | msgid "generate compact summary in diffstat" |
3608 | msgstr "生成差异统计的简洁摘要" | |
3609 | ||
ec3d4607 | 3610 | #: diff.c:5454 |
d46c5519 JX |
3611 | msgid "output a binary diff that can be applied" |
3612 | msgstr "输出一个可以应用的二进制差异" | |
3613 | ||
ec3d4607 | 3614 | #: diff.c:5457 |
d46c5519 JX |
3615 | msgid "show full pre- and post-image object names on the \"index\" lines" |
3616 | msgstr "在 \"index\" 行显示完整的前后对象名称" | |
3617 | ||
ec3d4607 | 3618 | #: diff.c:5459 |
d46c5519 JX |
3619 | msgid "show colored diff" |
3620 | msgstr "显示带颜色的差异" | |
3621 | ||
ec3d4607 | 3622 | #: diff.c:5460 |
d46c5519 JX |
3623 | msgid "<kind>" |
3624 | msgstr "<类型>" | |
3625 | ||
ec3d4607 | 3626 | #: diff.c:5461 |
d46c5519 JX |
3627 | msgid "" |
3628 | "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " | |
3629 | "diff" | |
3630 | msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" | |
3631 | ||
ec3d4607 | 3632 | #: diff.c:5464 |
d46c5519 JX |
3633 | msgid "" |
3634 | "do not munge pathnames and use NULs as output field terminators in --raw or " | |
3635 | "--numstat" | |
3636 | msgstr "" | |
3637 | "在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" | |
3638 | "符" | |
3639 | ||
ec3d4607 | 3640 | #: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582 |
d46c5519 JX |
3641 | msgid "<prefix>" |
3642 | msgstr "<前缀>" | |
3643 | ||
ec3d4607 | 3644 | #: diff.c:5468 |
d46c5519 JX |
3645 | msgid "show the given source prefix instead of \"a/\"" |
3646 | msgstr "显示给定的源前缀取代 \"a/\"" | |
3647 | ||
ec3d4607 | 3648 | #: diff.c:5471 |
d46c5519 JX |
3649 | msgid "show the given destination prefix instead of \"b/\"" |
3650 | msgstr "显示给定的目标前缀取代 \"b/\"" | |
3651 | ||
ec3d4607 | 3652 | #: diff.c:5474 |
d46c5519 JX |
3653 | msgid "prepend an additional prefix to every line of output" |
3654 | msgstr "输出的每一行附加前缀" | |
3655 | ||
ec3d4607 | 3656 | #: diff.c:5477 |
d46c5519 JX |
3657 | msgid "do not show any source or destination prefix" |
3658 | msgstr "不显示任何源和目标前缀" | |
3659 | ||
ec3d4607 | 3660 | #: diff.c:5480 |
d46c5519 JX |
3661 | msgid "show context between diff hunks up to the specified number of lines" |
3662 | msgstr "显示指定行数的差异块间的上下文" | |
3663 | ||
ec3d4607 | 3664 | #: diff.c:5484 diff.c:5489 diff.c:5494 |
d46c5519 JX |
3665 | msgid "<char>" |
3666 | msgstr "<字符>" | |
3667 | ||
ec3d4607 | 3668 | #: diff.c:5485 |
d46c5519 JX |
3669 | msgid "specify the character to indicate a new line instead of '+'" |
3670 | msgstr "指定一个字符取代 '+' 来表示新的一行" | |
3671 | ||
ec3d4607 | 3672 | #: diff.c:5490 |
d46c5519 JX |
3673 | msgid "specify the character to indicate an old line instead of '-'" |
3674 | msgstr "指定一个字符取代 '-' 来表示旧的一行" | |
3675 | ||
ec3d4607 | 3676 | #: diff.c:5495 |
d46c5519 JX |
3677 | msgid "specify the character to indicate a context instead of ' '" |
3678 | msgstr "指定一个字符取代 ' ' 来表示一行上下文" | |
3679 | ||
ec3d4607 | 3680 | #: diff.c:5498 |
d46c5519 JX |
3681 | msgid "Diff rename options" |
3682 | msgstr "差异重命名选项" | |
3683 | ||
ec3d4607 | 3684 | #: diff.c:5499 |
d46c5519 JX |
3685 | msgid "<n>[/<m>]" |
3686 | msgstr "<n>[/<m>]" | |
3687 | ||
ec3d4607 | 3688 | #: diff.c:5500 |
d46c5519 | 3689 | msgid "break complete rewrite changes into pairs of delete and create" |
5b533632 | 3690 | msgstr "将完全重写的变更打破为成对的删除和创建" |
d46c5519 | 3691 | |
ec3d4607 | 3692 | #: diff.c:5504 |
d46c5519 JX |
3693 | msgid "detect renames" |
3694 | msgstr "检测重命名" | |
3695 | ||
ec3d4607 | 3696 | #: diff.c:5508 |
d46c5519 JX |
3697 | msgid "omit the preimage for deletes" |
3698 | msgstr "省略删除操作的差异输出" | |
3699 | ||
ec3d4607 | 3700 | #: diff.c:5511 |
d46c5519 JX |
3701 | msgid "detect copies" |
3702 | msgstr "检测拷贝" | |
3703 | ||
ec3d4607 | 3704 | #: diff.c:5515 |
d46c5519 JX |
3705 | msgid "use unmodified files as source to find copies" |
3706 | msgstr "使用未修改的文件做为发现拷贝的源" | |
3707 | ||
ec3d4607 | 3708 | #: diff.c:5517 |
d46c5519 JX |
3709 | msgid "disable rename detection" |
3710 | msgstr "禁用重命名探测" | |
3711 | ||
ec3d4607 | 3712 | #: diff.c:5520 |
d46c5519 JX |
3713 | msgid "use empty blobs as rename source" |
3714 | msgstr "使用空的数据对象做为重命名的源" | |
3715 | ||
ec3d4607 | 3716 | #: diff.c:5522 |
d46c5519 JX |
3717 | msgid "continue listing the history of a file beyond renames" |
3718 | msgstr "继续列出文件重命名以外的历史记录" | |
3719 | ||
ec3d4607 | 3720 | #: diff.c:5525 |
d46c5519 JX |
3721 | msgid "" |
3722 | "prevent rename/copy detection if the number of rename/copy targets exceeds " | |
3723 | "given limit" | |
3724 | msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" | |
3725 | ||
ec3d4607 | 3726 | #: diff.c:5527 |
d46c5519 JX |
3727 | msgid "Diff algorithm options" |
3728 | msgstr "差异算法选项" | |
3729 | ||
ec3d4607 | 3730 | #: diff.c:5529 |
d46c5519 JX |
3731 | msgid "produce the smallest possible diff" |
3732 | msgstr "生成尽可能小的差异" | |
3733 | ||
ec3d4607 | 3734 | #: diff.c:5532 |
d46c5519 JX |
3735 | msgid "ignore whitespace when comparing lines" |
3736 | msgstr "行比较时忽略空白字符" | |
3737 | ||
ec3d4607 | 3738 | #: diff.c:5535 |
d46c5519 JX |
3739 | msgid "ignore changes in amount of whitespace" |
3740 | msgstr "忽略空白字符的变更" | |
3741 | ||
ec3d4607 | 3742 | #: diff.c:5538 |
d46c5519 JX |
3743 | msgid "ignore changes in whitespace at EOL" |
3744 | msgstr "忽略行尾的空白字符变更" | |
3745 | ||
ec3d4607 | 3746 | #: diff.c:5541 |
d46c5519 JX |
3747 | msgid "ignore carrier-return at the end of line" |
3748 | msgstr "忽略行尾的回车符(CR)" | |
3749 | ||
ec3d4607 | 3750 | #: diff.c:5544 |
d46c5519 JX |
3751 | msgid "ignore changes whose lines are all blank" |
3752 | msgstr "忽略整行都是空白的变更" | |
3753 | ||
ec3d4607 | 3754 | #: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616 |
d13389bf JX |
3755 | msgid "<regex>" |
3756 | msgstr "<正则>" | |
3757 | ||
ec3d4607 | 3758 | #: diff.c:5547 |
d13389bf JX |
3759 | msgid "ignore changes whose all lines match <regex>" |
3760 | msgstr "忽略所有行都和正则表达式匹配的变更" | |
3761 | ||
ec3d4607 | 3762 | #: diff.c:5550 |
d46c5519 JX |
3763 | msgid "heuristic to shift diff hunk boundaries for easy reading" |
3764 | msgstr "启发式转换差异边界以便阅读" | |
3765 | ||
ec3d4607 | 3766 | #: diff.c:5553 |
d46c5519 JX |
3767 | msgid "generate diff using the \"patience diff\" algorithm" |
3768 | msgstr "使用 \"patience diff\" 算法生成差异" | |
3769 | ||
ec3d4607 | 3770 | #: diff.c:5557 |
d46c5519 JX |
3771 | msgid "generate diff using the \"histogram diff\" algorithm" |
3772 | msgstr "使用 \"histogram diff\" 算法生成差异" | |
3773 | ||
ec3d4607 | 3774 | #: diff.c:5559 |
d46c5519 JX |
3775 | msgid "<algorithm>" |
3776 | msgstr "<算法>" | |
3777 | ||
ec3d4607 | 3778 | #: diff.c:5560 |
d46c5519 JX |
3779 | msgid "choose a diff algorithm" |
3780 | msgstr "选择一个差异算法" | |
3781 | ||
ec3d4607 | 3782 | #: diff.c:5562 |
d46c5519 JX |
3783 | msgid "<text>" |
3784 | msgstr "<文本>" | |
3785 | ||
ec3d4607 | 3786 | #: diff.c:5563 |
d46c5519 | 3787 | msgid "generate diff using the \"anchored diff\" algorithm" |
5b533632 | 3788 | msgstr "使用 \"anchored diff\" 算法生成差异" |
d46c5519 | 3789 | |
ec3d4607 | 3790 | #: diff.c:5565 diff.c:5574 diff.c:5577 |
d46c5519 JX |
3791 | msgid "<mode>" |
3792 | msgstr "<模式>" | |
3793 | ||
ec3d4607 | 3794 | #: diff.c:5566 |
d46c5519 JX |
3795 | msgid "show word diff, using <mode> to delimit changed words" |
3796 | msgstr "显示单词差异,使用 <模式> 分隔变更的单词" | |
3797 | ||
ec3d4607 | 3798 | #: diff.c:5569 |
d46c5519 JX |
3799 | msgid "use <regex> to decide what a word is" |
3800 | msgstr "使用 <正则表达式> 确定何为一个词" | |
3801 | ||
ec3d4607 | 3802 | #: diff.c:5572 |
d46c5519 JX |
3803 | msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" |
3804 | msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" | |
3805 | ||
ec3d4607 | 3806 | #: diff.c:5575 |
d46c5519 JX |
3807 | msgid "moved lines of code are colored differently" |
3808 | msgstr "移动的代码行用不同方式着色" | |
3809 | ||
ec3d4607 | 3810 | #: diff.c:5578 |
d46c5519 JX |
3811 | msgid "how white spaces are ignored in --color-moved" |
3812 | msgstr "在 --color-moved 下如何忽略空白字符" | |
3813 | ||
ec3d4607 | 3814 | #: diff.c:5581 |
d46c5519 JX |
3815 | msgid "Other diff options" |
3816 | msgstr "其它差异选项" | |
3817 | ||
ec3d4607 | 3818 | #: diff.c:5583 |
d46c5519 JX |
3819 | msgid "when run from subdir, exclude changes outside and show relative paths" |
3820 | msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" | |
3821 | ||
ec3d4607 | 3822 | #: diff.c:5587 |
d46c5519 JX |
3823 | msgid "treat all files as text" |
3824 | msgstr "把所有文件当做文本处理" | |
3825 | ||
ec3d4607 | 3826 | #: diff.c:5589 |
d46c5519 JX |
3827 | msgid "swap two inputs, reverse the diff" |
3828 | msgstr "交换两个输入,反转差异" | |
3829 | ||
ec3d4607 | 3830 | #: diff.c:5591 |
d46c5519 JX |
3831 | msgid "exit with 1 if there were differences, 0 otherwise" |
3832 | msgstr "有差异时退出码为 1,否则为 0" | |
3833 | ||
ec3d4607 | 3834 | #: diff.c:5593 |
d46c5519 JX |
3835 | msgid "disable all output of the program" |
3836 | msgstr "禁用本程序的所有输出" | |
3837 | ||
ec3d4607 | 3838 | #: diff.c:5595 |
d46c5519 JX |
3839 | msgid "allow an external diff helper to be executed" |
3840 | msgstr "允许执行一个外置的差异助手" | |
3841 | ||
ec3d4607 | 3842 | #: diff.c:5597 |
d46c5519 JX |
3843 | msgid "run external text conversion filters when comparing binary files" |
3844 | msgstr "当比较二进制文件时,运行外部的文本转换过滤器" | |
3845 | ||
ec3d4607 | 3846 | #: diff.c:5599 |
d46c5519 JX |
3847 | msgid "<when>" |
3848 | msgstr "<何时>" | |
3849 | ||
ec3d4607 | 3850 | #: diff.c:5600 |
d46c5519 JX |
3851 | msgid "ignore changes to submodules in the diff generation" |
3852 | msgstr "在生成差异时,忽略子模组的更改" | |
3853 | ||
ec3d4607 | 3854 | #: diff.c:5603 |
d46c5519 JX |
3855 | msgid "<format>" |
3856 | msgstr "<格式>" | |
3857 | ||
ec3d4607 | 3858 | #: diff.c:5604 |
d46c5519 JX |
3859 | msgid "specify how differences in submodules are shown" |
3860 | msgstr "指定子模组的差异如何显示" | |
3861 | ||
ec3d4607 | 3862 | #: diff.c:5608 |
d46c5519 JX |
3863 | msgid "hide 'git add -N' entries from the index" |
3864 | msgstr "隐藏索引中 'git add -N' 条目" | |
3865 | ||
ec3d4607 | 3866 | #: diff.c:5611 |
d46c5519 JX |
3867 | msgid "treat 'git add -N' entries as real in the index" |
3868 | msgstr "将索引中 'git add -N' 条目当做真实的" | |
3869 | ||
ec3d4607 | 3870 | #: diff.c:5613 |
d46c5519 JX |
3871 | msgid "<string>" |
3872 | msgstr "<字符串>" | |
3873 | ||
ec3d4607 | 3874 | #: diff.c:5614 |
d46c5519 JX |
3875 | msgid "" |
3876 | "look for differences that change the number of occurrences of the specified " | |
3877 | "string" | |
3878 | msgstr "查找改变了指定字符串出现次数的差异" | |
3879 | ||
ec3d4607 | 3880 | #: diff.c:5617 |
d46c5519 JX |
3881 | msgid "" |
3882 | "look for differences that change the number of occurrences of the specified " | |
3883 | "regex" | |
3884 | msgstr "查找改变指定正则匹配出现次数的差异" | |
3885 | ||
ec3d4607 | 3886 | #: diff.c:5620 |
d46c5519 JX |
3887 | msgid "show all changes in the changeset with -S or -G" |
3888 | msgstr "显示使用 -S 或 -G 的变更集的所有变更" | |
3889 | ||
ec3d4607 | 3890 | #: diff.c:5623 |
d46c5519 JX |
3891 | msgid "treat <string> in -S as extended POSIX regular expression" |
3892 | msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" | |
3893 | ||
ec3d4607 | 3894 | #: diff.c:5626 |
d46c5519 JX |
3895 | msgid "control the order in which files appear in the output" |
3896 | msgstr "控制输出中的文件显示顺序" | |
3897 | ||
ec3d4607 | 3898 | #: diff.c:5627 diff.c:5630 |
473eb541 JX |
3899 | msgid "<path>" |
3900 | msgstr "<路径>" | |
3901 | ||
ec3d4607 | 3902 | #: diff.c:5628 |
473eb541 JX |
3903 | msgid "show the change in the specified path first" |
3904 | msgstr "先显示指定路径的变更" | |
3905 | ||
ec3d4607 | 3906 | #: diff.c:5631 |
473eb541 JX |
3907 | msgid "skip the output to the specified path" |
3908 | msgstr "跳过指定路径的输出" | |
3909 | ||
ec3d4607 | 3910 | #: diff.c:5633 |
d46c5519 | 3911 | msgid "<object-id>" |
5b533632 | 3912 | msgstr "<对象 ID>" |
d46c5519 | 3913 | |
ec3d4607 | 3914 | #: diff.c:5634 |
d46c5519 JX |
3915 | msgid "" |
3916 | "look for differences that change the number of occurrences of the specified " | |
3917 | "object" | |
3918 | msgstr "查找改变指定对象出现次数的差异" | |
3919 | ||
ec3d4607 | 3920 | #: diff.c:5636 |
d46c5519 JX |
3921 | msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" |
3922 | msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" | |
3923 | ||
ec3d4607 | 3924 | #: diff.c:5637 |
d46c5519 JX |
3925 | msgid "select files by diff type" |
3926 | msgstr "通过差异类型选择文件" | |
3927 | ||
ec3d4607 | 3928 | #: diff.c:5639 |
d46c5519 JX |
3929 | msgid "<file>" |
3930 | msgstr "<文件>" | |
3931 | ||
ec3d4607 | 3932 | #: diff.c:5640 |
d46c5519 JX |
3933 | msgid "Output to a specific file" |
3934 | msgstr "输出到一个指定的文件" | |
3935 | ||
ec3d4607 JX |
3936 | #: diff.c:6298 |
3937 | msgid "exhaustive rename detection was skipped due to too many files." | |
3938 | msgstr "由于文件太多,跳过详尽的重命名检查。" | |
a0b6b246 | 3939 | |
ec3d4607 | 3940 | #: diff.c:6301 |
a0b6b246 | 3941 | msgid "only found copies from modified paths due to too many files." |
ec3d4607 | 3942 | msgstr "由于文件太多,只在修改的路径中找到了拷贝。" |
a0b6b246 | 3943 | |
ec3d4607 | 3944 | #: diff.c:6304 |
7aea43ff | 3945 | #, c-format |
a0b6b246 JX |
3946 | msgid "" |
3947 | "you may want to set your %s variable to at least %d and retry the command." | |
29004bbb | 3948 | msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" |
7aea43ff | 3949 | |
349ede6a JX |
3950 | #: diffcore-order.c:24 |
3951 | #, c-format | |
3952 | msgid "failed to read orderfile '%s'" | |
3953 | msgstr "读取排序文件 '%s' 失败" | |
3954 | ||
ec3d4607 | 3955 | #: diffcore-rename.c:1514 |
349ede6a JX |
3956 | msgid "Performing inexact rename detection" |
3957 | msgstr "正在进行非精确的重命名探测" | |
3958 | ||
473eb541 JX |
3959 | #: diffcore-rotate.c:29 |
3960 | #, c-format | |
3961 | msgid "No such path '%s' in the diff" | |
3962 | msgstr "在差异中无此路径 '%s'" | |
3963 | ||
ec3d4607 | 3964 | #: dir.c:593 |
c1ac5258 JX |
3965 | #, c-format |
3966 | msgid "pathspec '%s' did not match any file(s) known to git" | |
3967 | msgstr "路径规格 '%s' 未匹配任何 git 已知文件" | |
3968 | ||
ec3d4607 | 3969 | #: dir.c:733 dir.c:762 dir.c:775 |
ddc12c42 JX |
3970 | #, c-format |
3971 | msgid "unrecognized pattern: '%s'" | |
3972 | msgstr "未识别的模式:'%s'" | |
3973 | ||
ec3d4607 | 3974 | #: dir.c:790 dir.c:804 |
ddc12c42 JX |
3975 | #, c-format |
3976 | msgid "unrecognized negative pattern: '%s'" | |
3977 | msgstr "未识别的反向模式:'%s'" | |
3978 | ||
ec3d4607 | 3979 | #: dir.c:820 |
ddc12c42 JX |
3980 | #, c-format |
3981 | msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" | |
3982 | msgstr "您的 sparse-checkout 文件可能有问题:重复的模式 '%s'" | |
3983 | ||
ec3d4607 | 3984 | #: dir.c:830 |
ddc12c42 JX |
3985 | msgid "disabling cone pattern matching" |
3986 | msgstr "禁止 cone 模式匹配" | |
3987 | ||
ec3d4607 | 3988 | #: dir.c:1214 |
c1ac5258 JX |
3989 | #, c-format |
3990 | msgid "cannot use %s as an exclude file" | |
3991 | msgstr "不能将 %s 用作排除文件" | |
3992 | ||
ec3d4607 | 3993 | #: dir.c:2351 |
31e5e17b JX |
3994 | #, c-format |
3995 | msgid "could not open directory '%s'" | |
3996 | msgstr "不能打开目录 '%s'" | |
3997 | ||
ec3d4607 | 3998 | #: dir.c:2653 |
a0b6b246 JX |
3999 | msgid "failed to get kernel name and information" |
4000 | msgstr "无法获得内核名称和信息" | |
7aea43ff | 4001 | |
ec3d4607 | 4002 | #: dir.c:2777 |
c1ac5258 JX |
4003 | msgid "untracked cache is disabled on this system or location" |
4004 | msgstr "缓存未跟踪文件在本系统或位置中被禁用" | |
4005 | ||
ec3d4607 | 4006 | #: dir.c:3610 |
c1ac5258 JX |
4007 | #, c-format |
4008 | msgid "index file corrupt in repo %s" | |
4009 | msgstr "仓库 %s 中的索引文件损坏" | |
7aea43ff | 4010 | |
ec3d4607 | 4011 | #: dir.c:3657 dir.c:3662 |
87cb7997 JX |
4012 | #, c-format |
4013 | msgid "could not create directories for %s" | |
4014 | msgstr "不能为 %s 创建目录" | |
4015 | ||
ec3d4607 | 4016 | #: dir.c:3691 |
1a79b2f1 JX |
4017 | #, c-format |
4018 | msgid "could not migrate git directory from '%s' to '%s'" | |
4019 | msgstr "不能从 '%s' 迁移 git 目录到 '%s'" | |
4020 | ||
349ede6a | 4021 | #: editor.c:74 |
5809aa05 JX |
4022 | #, c-format |
4023 | msgid "hint: Waiting for your editor to close the file...%c" | |
4024 | msgstr "提示:等待您的编辑器关闭文件...%c" | |
4025 | ||
ec3d4607 | 4026 | #: entry.c:176 |
6937cb4e JX |
4027 | msgid "Filtering content" |
4028 | msgstr "过滤内容" | |
4029 | ||
ec3d4607 | 4030 | #: entry.c:497 |
87cb7997 JX |
4031 | #, c-format |
4032 | msgid "could not stat file '%s'" | |
65e2041e | 4033 | msgstr "不能对文件 '%s' 调用 stat" |
87cb7997 | 4034 | |
473eb541 | 4035 | #: environment.c:152 |
c1ac5258 JX |
4036 | #, c-format |
4037 | msgid "bad git namespace path \"%s\"" | |
e640d114 | 4038 | msgstr "错误的 git 名字空间路径 \"%s\"" |
c1ac5258 | 4039 | |
ec3d4607 | 4040 | #: environment.c:334 |
c1ac5258 JX |
4041 | #, c-format |
4042 | msgid "could not set GIT_DIR to '%s'" | |
4043 | msgstr "不能设置 GIT_DIR 为 '%s'" | |
4044 | ||
d46c5519 | 4045 | #: exec-cmd.c:363 |
c1ac5258 JX |
4046 | #, c-format |
4047 | msgid "too many args to run %s" | |
4048 | msgstr "执行 %s 的参数太多" | |
4049 | ||
33b62fba | 4050 | #: fetch-pack.c:182 |
a0b6b246 JX |
4051 | msgid "git fetch-pack: expected shallow list" |
4052 | msgstr "git fetch-pack:应为 shallow 列表" | |
4053 | ||
33b62fba | 4054 | #: fetch-pack.c:185 |
06991777 JX |
4055 | msgid "git fetch-pack: expected a flush packet after shallow list" |
4056 | msgstr "git fetch-pack:在浅克隆列表之后期望一个 flush 包" | |
4057 | ||
33b62fba | 4058 | #: fetch-pack.c:196 |
31e5e17b JX |
4059 | msgid "git fetch-pack: expected ACK/NAK, got a flush packet" |
4060 | msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" | |
a0b6b246 | 4061 | |
33b62fba | 4062 | #: fetch-pack.c:216 |
90314792 | 4063 | #, c-format |
275588f9 | 4064 | msgid "git fetch-pack: expected ACK/NAK, got '%s'" |
a0b6b246 | 4065 | msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" |
90314792 | 4066 | |
33b62fba | 4067 | #: fetch-pack.c:227 |
d46c5519 JX |
4068 | msgid "unable to write to remote" |
4069 | msgstr "无法写到远程" | |
4070 | ||
33b62fba | 4071 | #: fetch-pack.c:288 |
a0b6b246 JX |
4072 | msgid "--stateless-rpc requires multi_ack_detailed" |
4073 | msgstr "--stateless-rpc 需要 multi_ack_detailed" | |
90314792 | 4074 | |
33b62fba | 4075 | #: fetch-pack.c:383 fetch-pack.c:1423 |
90314792 | 4076 | #, c-format |
a0b6b246 JX |
4077 | msgid "invalid shallow line: %s" |
4078 | msgstr "无效的 shallow 信息:%s" | |
90314792 | 4079 | |
33b62fba | 4080 | #: fetch-pack.c:389 fetch-pack.c:1429 |
c04f5ac3 | 4081 | #, c-format |
a0b6b246 JX |
4082 | msgid "invalid unshallow line: %s" |
4083 | msgstr "无效的 unshallow 信息:%s" | |
c04f5ac3 | 4084 | |
33b62fba | 4085 | #: fetch-pack.c:391 fetch-pack.c:1431 |
a0b6b246 JX |
4086 | #, c-format |
4087 | msgid "object not found: %s" | |
4088 | msgstr "对象未找到:%s" | |
07432cef | 4089 | |
33b62fba | 4090 | #: fetch-pack.c:394 fetch-pack.c:1434 |
c04f5ac3 | 4091 | #, c-format |
a0b6b246 JX |
4092 | msgid "error in object: %s" |
4093 | msgstr "对象中出错:%s" | |
07432cef | 4094 | |
33b62fba | 4095 | #: fetch-pack.c:396 fetch-pack.c:1436 |
c04f5ac3 | 4096 | #, c-format |
a0b6b246 JX |
4097 | msgid "no shallow found: %s" |
4098 | msgstr "未发现 shallow:%s" | |
c04f5ac3 | 4099 | |
33b62fba | 4100 | #: fetch-pack.c:399 fetch-pack.c:1440 |
a0b6b246 JX |
4101 | #, c-format |
4102 | msgid "expected shallow/unshallow, got %s" | |
4103 | msgstr "应为 shallow/unshallow,却得到 %s" | |
07432cef | 4104 | |
33b62fba | 4105 | #: fetch-pack.c:439 |
a0b6b246 JX |
4106 | #, c-format |
4107 | msgid "got %s %d %s" | |
4108 | msgstr "得到 %s %d %s" | |
1b7f4a34 | 4109 | |
33b62fba | 4110 | #: fetch-pack.c:456 |
1b7f4a34 | 4111 | #, c-format |
a0b6b246 JX |
4112 | msgid "invalid commit %s" |
4113 | msgstr "无效提交 %s" | |
1b7f4a34 | 4114 | |
33b62fba | 4115 | #: fetch-pack.c:487 |
a0b6b246 JX |
4116 | msgid "giving up" |
4117 | msgstr "放弃" | |
814ff314 | 4118 | |
33b62fba | 4119 | #: fetch-pack.c:500 progress.c:339 |
a0b6b246 JX |
4120 | msgid "done" |
4121 | msgstr "完成" | |
2e8451e8 | 4122 | |
33b62fba | 4123 | #: fetch-pack.c:512 |
2e8451e8 | 4124 | #, c-format |
a0b6b246 JX |
4125 | msgid "got %s (%d) %s" |
4126 | msgstr "得到 %s (%d) %s" | |
2e8451e8 | 4127 | |
33b62fba | 4128 | #: fetch-pack.c:548 |
a0b6b246 JX |
4129 | #, c-format |
4130 | msgid "Marking %s as complete" | |
4131 | msgstr "标记 %s 为完成" | |
220c313c | 4132 | |
33b62fba | 4133 | #: fetch-pack.c:763 |
a0b6b246 JX |
4134 | #, c-format |
4135 | msgid "already have %s (%s)" | |
29004bbb | 4136 | msgstr "已经有 %s(%s)" |
220c313c | 4137 | |
33b62fba | 4138 | #: fetch-pack.c:849 |
a0b6b246 JX |
4139 | msgid "fetch-pack: unable to fork off sideband demultiplexer" |
4140 | msgstr "fetch-pack:无法派生 sideband 多路输出" | |
1b7f4a34 | 4141 | |
33b62fba | 4142 | #: fetch-pack.c:857 |
a0b6b246 JX |
4143 | msgid "protocol error: bad pack header" |
4144 | msgstr "协议错误:坏的包头" | |
814ff314 | 4145 | |
33b62fba | 4146 | #: fetch-pack.c:951 |
a0b6b246 JX |
4147 | #, c-format |
4148 | msgid "fetch-pack: unable to fork off %s" | |
4149 | msgstr "fetch-pack:无法派生进程 %s" | |
5c57d762 | 4150 | |
33b62fba | 4151 | #: fetch-pack.c:957 |
473eb541 JX |
4152 | msgid "fetch-pack: invalid index-pack output" |
4153 | msgstr "fetch-pack:无效的 index-pack 输出" | |
4154 | ||
33b62fba | 4155 | #: fetch-pack.c:974 |
a0b6b246 JX |
4156 | #, c-format |
4157 | msgid "%s failed" | |
4158 | msgstr "%s 失败" | |
14c8bced | 4159 | |
33b62fba | 4160 | #: fetch-pack.c:976 |
a0b6b246 JX |
4161 | msgid "error in sideband demultiplexer" |
4162 | msgstr "sideband 多路输出出错" | |
c04f5ac3 | 4163 | |
33b62fba | 4164 | #: fetch-pack.c:1019 |
81809b99 | 4165 | #, c-format |
a0b6b246 JX |
4166 | msgid "Server version is %.*s" |
4167 | msgstr "服务器版本 %.*s" | |
8ada9598 | 4168 | |
33b62fba JX |
4169 | #: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 |
4170 | #: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 | |
4171 | #: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 | |
4172 | #: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 | |
a6cd2cc4 JX |
4173 | #, c-format |
4174 | msgid "Server supports %s" | |
4175 | msgstr "服务器支持 %s" | |
4176 | ||
33b62fba | 4177 | #: fetch-pack.c:1029 |
a6cd2cc4 | 4178 | msgid "Server does not support shallow clients" |
9146ef75 | 4179 | msgstr "服务器不支持浅客户端" |
a6cd2cc4 | 4180 | |
33b62fba | 4181 | #: fetch-pack.c:1089 |
a0b6b246 JX |
4182 | msgid "Server does not support --shallow-since" |
4183 | msgstr "服务器不支持 --shallow-since" | |
8ada9598 | 4184 | |
33b62fba | 4185 | #: fetch-pack.c:1094 |
a0b6b246 JX |
4186 | msgid "Server does not support --shallow-exclude" |
4187 | msgstr "服务器不支持 --shallow-exclude" | |
c04f5ac3 | 4188 | |
33b62fba | 4189 | #: fetch-pack.c:1098 |
a0b6b246 JX |
4190 | msgid "Server does not support --deepen" |
4191 | msgstr "服务器不支持 --deepen" | |
c04f5ac3 | 4192 | |
33b62fba | 4193 | #: fetch-pack.c:1100 |
7157c2b5 JX |
4194 | msgid "Server does not support this repository's object format" |
4195 | msgstr "服务器不支持这个仓库的对象格式" | |
4196 | ||
33b62fba | 4197 | #: fetch-pack.c:1113 |
a0b6b246 JX |
4198 | msgid "no common commits" |
4199 | msgstr "没有共同的提交" | |
c04f5ac3 | 4200 | |
33b62fba JX |
4201 | #: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 |
4202 | msgid "source repository is shallow, reject to clone." | |
4203 | msgstr "源仓库是浅克隆,拒绝克隆。" | |
4204 | ||
ec3d4607 | 4205 | #: fetch-pack.c:1128 fetch-pack.c:1660 |
a0b6b246 JX |
4206 | msgid "git fetch-pack: fetch failed." |
4207 | msgstr "git fetch-pack:获取失败。" | |
c04f5ac3 | 4208 | |
33b62fba | 4209 | #: fetch-pack.c:1242 |
7157c2b5 JX |
4210 | #, c-format |
4211 | msgid "mismatched algorithms: client %s; server %s" | |
4212 | msgstr "不匹配的算法:客户端 %s,服务端 %s" | |
4213 | ||
33b62fba | 4214 | #: fetch-pack.c:1246 |
7157c2b5 JX |
4215 | #, c-format |
4216 | msgid "the server does not support algorithm '%s'" | |
4217 | msgstr "服务器不支持算法 '%s'" | |
4218 | ||
33b62fba | 4219 | #: fetch-pack.c:1279 |
fd8cb379 | 4220 | msgid "Server does not support shallow requests" |
9146ef75 | 4221 | msgstr "服务器不支持浅克隆请求" |
fd8cb379 | 4222 | |
33b62fba | 4223 | #: fetch-pack.c:1286 |
a6cd2cc4 JX |
4224 | msgid "Server supports filter" |
4225 | msgstr "服务器支持 filter" | |
4226 | ||
ec3d4607 | 4227 | #: fetch-pack.c:1329 fetch-pack.c:2043 |
d46c5519 JX |
4228 | msgid "unable to write request to remote" |
4229 | msgstr "无法将请求写到远程" | |
4230 | ||
33b62fba | 4231 | #: fetch-pack.c:1347 |
c1ac5258 JX |
4232 | #, c-format |
4233 | msgid "error reading section header '%s'" | |
4234 | msgstr "读取节标题 '%s' 出错" | |
4235 | ||
33b62fba | 4236 | #: fetch-pack.c:1353 |
c1ac5258 JX |
4237 | #, c-format |
4238 | msgid "expected '%s', received '%s'" | |
4239 | msgstr "预期 '%s',得到 '%s'" | |
4240 | ||
33b62fba | 4241 | #: fetch-pack.c:1387 |
c1ac5258 JX |
4242 | #, c-format |
4243 | msgid "unexpected acknowledgment line: '%s'" | |
4244 | msgstr "意外的确认行:'%s'" | |
4245 | ||
33b62fba | 4246 | #: fetch-pack.c:1392 |
c1ac5258 JX |
4247 | #, c-format |
4248 | msgid "error processing acks: %d" | |
4249 | msgstr "处理 ack 出错:%d" | |
4250 | ||
33b62fba | 4251 | #: fetch-pack.c:1402 |
4c27fcb5 JX |
4252 | msgid "expected packfile to be sent after 'ready'" |
4253 | msgstr "预期在 'ready' 之后发送 packfile" | |
4254 | ||
33b62fba | 4255 | #: fetch-pack.c:1404 |
4c27fcb5 JX |
4256 | msgid "expected no other sections to be sent after no 'ready'" |
4257 | msgstr "在没有 'ready' 不应该发送其它小节" | |
4258 | ||
33b62fba | 4259 | #: fetch-pack.c:1445 |
c1ac5258 JX |
4260 | #, c-format |
4261 | msgid "error processing shallow info: %d" | |
4262 | msgstr "处理浅克隆信息出错:%d" | |
4263 | ||
33b62fba | 4264 | #: fetch-pack.c:1494 |
c1ac5258 JX |
4265 | #, c-format |
4266 | msgid "expected wanted-ref, got '%s'" | |
4267 | msgstr "预期 wanted-ref,得到 '%s'" | |
4268 | ||
33b62fba | 4269 | #: fetch-pack.c:1499 |
c1ac5258 JX |
4270 | #, c-format |
4271 | msgid "unexpected wanted-ref: '%s'" | |
4272 | msgstr "意外的 wanted-ref:'%s'" | |
4273 | ||
33b62fba | 4274 | #: fetch-pack.c:1504 |
c1ac5258 JX |
4275 | #, c-format |
4276 | msgid "error processing wanted refs: %d" | |
4277 | msgstr "处理要获取的引用出错:%d" | |
4278 | ||
33b62fba | 4279 | #: fetch-pack.c:1534 |
7157c2b5 JX |
4280 | msgid "git fetch-pack: expected response end packet" |
4281 | msgstr "git fetch-pack:预期响应结束包" | |
4282 | ||
ec3d4607 | 4283 | #: fetch-pack.c:1939 |
a0b6b246 JX |
4284 | msgid "no matching remote head" |
4285 | msgstr "没有匹配的远程分支" | |
c04f5ac3 | 4286 | |
ec3d4607 | 4287 | #: fetch-pack.c:1962 builtin/clone.c:697 |
c1ac5258 | 4288 | msgid "remote did not send all necessary objects" |
e640d114 | 4289 | msgstr "远程没有发送所有必需的对象" |
c1ac5258 | 4290 | |
ec3d4607 | 4291 | #: fetch-pack.c:2065 |
33b62fba JX |
4292 | msgid "unexpected 'ready' from remote" |
4293 | msgstr "来自远程的意外的 'ready'" | |
4294 | ||
ec3d4607 | 4295 | #: fetch-pack.c:2088 |
87cb7997 JX |
4296 | #, c-format |
4297 | msgid "no such remote ref %s" | |
4298 | msgstr "没有这样的远程引用 %s" | |
4299 | ||
ec3d4607 | 4300 | #: fetch-pack.c:2091 |
87cb7997 JX |
4301 | #, c-format |
4302 | msgid "Server does not allow request for unadvertised object %s" | |
4303 | msgstr "服务器不允许请求未公开的对象 %s" | |
4304 | ||
473eb541 | 4305 | #: gpg-interface.c:273 |
a0b6b246 JX |
4306 | msgid "could not create temporary file" |
4307 | msgstr "不能创建临时文件" | |
c04f5ac3 | 4308 | |
473eb541 | 4309 | #: gpg-interface.c:276 |
c04f5ac3 | 4310 | #, c-format |
a0b6b246 JX |
4311 | msgid "failed writing detached signature to '%s'" |
4312 | msgstr "无法将分离式签名写入 '%s'" | |
c04f5ac3 | 4313 | |
473eb541 | 4314 | #: gpg-interface.c:470 |
349ede6a JX |
4315 | msgid "gpg failed to sign the data" |
4316 | msgstr "gpg 数据签名失败" | |
4317 | ||
ddc12c42 | 4318 | #: graph.c:98 |
1a79b2f1 | 4319 | #, c-format |
ec3d4607 | 4320 | msgid "ignored invalid color '%.*s' in log.graphColors" |
1a79b2f1 JX |
4321 | msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" |
4322 | ||
33b62fba | 4323 | #: grep.c:531 |
a5cd71ca JX |
4324 | msgid "" |
4325 | "given pattern contains NULL byte (via -f <file>). This is only supported " | |
4326 | "with -P under PCRE v2" | |
4327 | msgstr "" | |
ddc12c42 JX |
4328 | "给定的模式包含 NULL 字符(通过 -f <文件> 参数)。只有 PCRE v2 下的 -P 支持此" |
4329 | "功能" | |
a5cd71ca | 4330 | |
ec3d4607 | 4331 | #: grep.c:1895 |
c04f5ac3 | 4332 | #, c-format |
a0b6b246 JX |
4333 | msgid "'%s': unable to read %s" |
4334 | msgstr "'%s':无法读取 %s" | |
c04f5ac3 | 4335 | |
ec3d4607 | 4336 | #: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90 |
33b62fba | 4337 | #: builtin/rm.c:136 |
c04f5ac3 | 4338 | #, c-format |
a0b6b246 | 4339 | msgid "failed to stat '%s'" |
65e2041e | 4340 | msgstr "对 '%s' 调用 stat 失败" |
c04f5ac3 | 4341 | |
ec3d4607 | 4342 | #: grep.c:1923 |
a0b6b246 JX |
4343 | #, c-format |
4344 | msgid "'%s': short read" | |
4345 | msgstr "'%s':读取不完整" | |
5c57d762 | 4346 | |
fd8cb379 JX |
4347 | #: help.c:23 |
4348 | msgid "start a working area (see also: git help tutorial)" | |
4349 | msgstr "开始一个工作区(参见:git help tutorial)" | |
4350 | ||
4351 | #: help.c:24 | |
4352 | msgid "work on the current change (see also: git help everyday)" | |
4353 | msgstr "在当前变更上工作(参见:git help everyday)" | |
4354 | ||
4355 | #: help.c:25 | |
4356 | msgid "examine the history and state (see also: git help revisions)" | |
4357 | msgstr "检查历史和状态(参见:git help revisions)" | |
4358 | ||
4359 | #: help.c:26 | |
4360 | msgid "grow, mark and tweak your common history" | |
4361 | msgstr "扩展、标记和调校您的历史记录" | |
4362 | ||
4363 | #: help.c:27 | |
4364 | msgid "collaborate (see also: git help workflows)" | |
4365 | msgstr "协同(参见:git help workflows)" | |
4366 | ||
4367 | #: help.c:31 | |
4368 | msgid "Main Porcelain Commands" | |
4369 | msgstr "主要的上层命令" | |
4370 | ||
4371 | #: help.c:32 | |
4372 | msgid "Ancillary Commands / Manipulators" | |
4373 | msgstr "辅助命令/操作者" | |
4374 | ||
4375 | #: help.c:33 | |
4376 | msgid "Ancillary Commands / Interrogators" | |
4377 | msgstr "辅助命令/询问者" | |
4378 | ||
4379 | #: help.c:34 | |
4380 | msgid "Interacting with Others" | |
4381 | msgstr "与其它系统交互" | |
4382 | ||
4383 | #: help.c:35 | |
4384 | msgid "Low-level Commands / Manipulators" | |
4385 | msgstr "低级命令/操作者" | |
4386 | ||
4387 | #: help.c:36 | |
4388 | msgid "Low-level Commands / Interrogators" | |
4389 | msgstr "低级命令/询问者" | |
4390 | ||
4391 | #: help.c:37 | |
ddc12c42 | 4392 | msgid "Low-level Commands / Syncing Repositories" |
fd8cb379 JX |
4393 | msgstr "低级命令/同步仓库" |
4394 | ||
4395 | #: help.c:38 | |
4396 | msgid "Low-level Commands / Internal Helpers" | |
4397 | msgstr "低级命令/内部助手" | |
4398 | ||
d9488fea | 4399 | #: help.c:300 |
a0b6b246 JX |
4400 | #, c-format |
4401 | msgid "available git commands in '%s'" | |
4402 | msgstr "在 '%s' 下可用的 git 命令" | |
c04f5ac3 | 4403 | |
d9488fea | 4404 | #: help.c:307 |
a0b6b246 JX |
4405 | msgid "git commands available from elsewhere on your $PATH" |
4406 | msgstr "在 $PATH 路径中的其他地方可用的 git 命令" | |
5c57d762 | 4407 | |
d9488fea | 4408 | #: help.c:316 |
a0b6b246 JX |
4409 | msgid "These are common Git commands used in various situations:" |
4410 | msgstr "这些是各种场合常见的 Git 命令:" | |
5c57d762 | 4411 | |
473eb541 | 4412 | #: help.c:365 git.c:100 |
fd8cb379 JX |
4413 | #, c-format |
4414 | msgid "unsupported command listing type '%s'" | |
4415 | msgstr "不支持的命令列表类型 '%s'" | |
4416 | ||
d9488fea JX |
4417 | #: help.c:405 |
4418 | msgid "The Git concept guides are:" | |
4419 | msgstr "Git 概念向导有:" | |
fd8cb379 | 4420 | |
d9488fea | 4421 | #: help.c:429 |
4c27fcb5 JX |
4422 | msgid "See 'git help <command>' to read about a specific subcommand" |
4423 | msgstr "执行 'git help <command>' 来查看特定子命令" | |
4424 | ||
d9488fea | 4425 | #: help.c:434 |
4c27fcb5 JX |
4426 | msgid "External commands" |
4427 | msgstr "外部命令" | |
4428 | ||
d9488fea | 4429 | #: help.c:449 |
4c27fcb5 JX |
4430 | msgid "Command aliases" |
4431 | msgstr "命令别名" | |
4432 | ||
d13389bf | 4433 | #: help.c:527 |
c04f5ac3 | 4434 | #, c-format |
a0b6b246 JX |
4435 | msgid "" |
4436 | "'%s' appears to be a git command, but we were not\n" | |
4437 | "able to execute it. Maybe git-%s is broken?" | |
4438 | msgstr "" | |
4439 | "'%s' 像是一个 git 命令,但却无法运行。\n" | |
4440 | "可能是 git-%s 受损?" | |
c04f5ac3 | 4441 | |
d13389bf JX |
4442 | #: help.c:543 help.c:631 |
4443 | #, c-format | |
4444 | msgid "git: '%s' is not a git command. See 'git --help'." | |
4445 | msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" | |
4446 | ||
4447 | #: help.c:591 | |
a0b6b246 JX |
4448 | msgid "Uh oh. Your system reports no Git commands at all." |
4449 | msgstr "唉呀,您的系统中未发现 Git 命令。" | |
c04f5ac3 | 4450 | |
d13389bf | 4451 | #: help.c:613 |
c04f5ac3 | 4452 | #, c-format |
a4f16749 | 4453 | msgid "WARNING: You called a Git command named '%s', which does not exist." |
554e8501 | 4454 | msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" |
a4f16749 | 4455 | |
d13389bf | 4456 | #: help.c:618 |
a4f16749 JX |
4457 | #, c-format |
4458 | msgid "Continuing under the assumption that you meant '%s'." | |
554e8501 | 4459 | msgstr "假定你想要的是 '%s' 并继续。" |
c04f5ac3 | 4460 | |
d13389bf | 4461 | #: help.c:623 |
c04f5ac3 | 4462 | #, c-format |
a4f16749 | 4463 | msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." |
554e8501 | 4464 | msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" |
c04f5ac3 | 4465 | |
d13389bf | 4466 | #: help.c:635 |
a4f16749 JX |
4467 | msgid "" |
4468 | "\n" | |
4469 | "The most similar command is" | |
4470 | msgid_plural "" | |
4471 | "\n" | |
4472 | "The most similar commands are" | |
6937cb4e JX |
4473 | msgstr[0] "" |
4474 | "\n" | |
4475 | "最相似的命令是" | |
4476 | msgstr[1] "" | |
4477 | "\n" | |
4478 | "最相似的命令是" | |
a4f16749 | 4479 | |
d13389bf | 4480 | #: help.c:675 |
a4f16749 JX |
4481 | msgid "git version [<options>]" |
4482 | msgstr "git version [<选项>]" | |
4483 | ||
d13389bf | 4484 | #: help.c:730 |
a4f16749 JX |
4485 | #, c-format |
4486 | msgid "%s: %s - %s" | |
4487 | msgstr "%s:%s - %s" | |
4488 | ||
d13389bf | 4489 | #: help.c:734 |
a0b6b246 JX |
4490 | msgid "" |
4491 | "\n" | |
4492 | "Did you mean this?" | |
4493 | msgid_plural "" | |
4494 | "\n" | |
4495 | "Did you mean one of these?" | |
4496 | msgstr[0] "" | |
4497 | "\n" | |
4498 | "您指的是这个么?" | |
4499 | msgstr[1] "" | |
4500 | "\n" | |
4501 | "您指的是这其中的某一个么?" | |
c04f5ac3 | 4502 | |
d9488fea JX |
4503 | #: ident.c:353 |
4504 | msgid "Author identity unknown\n" | |
4505 | msgstr "作者身份未知\n" | |
4506 | ||
4507 | #: ident.c:356 | |
4508 | msgid "Committer identity unknown\n" | |
4509 | msgstr "提交者身份未知\n" | |
4510 | ||
4511 | #: ident.c:362 | |
a0b6b246 JX |
4512 | msgid "" |
4513 | "\n" | |
4514 | "*** Please tell me who you are.\n" | |
4515 | "\n" | |
4516 | "Run\n" | |
4517 | "\n" | |
4518 | " git config --global user.email \"you@example.com\"\n" | |
4519 | " git config --global user.name \"Your Name\"\n" | |
4520 | "\n" | |
4521 | "to set your account's default identity.\n" | |
4522 | "Omit --global to set the identity only in this repository.\n" | |
4523 | "\n" | |
4524 | msgstr "" | |
4525 | "\n" | |
4526 | "*** 请告诉我你是谁。\n" | |
4527 | "\n" | |
4528 | "运行\n" | |
4529 | "\n" | |
4530 | " git config --global user.email \"you@example.com\"\n" | |
4531 | " git config --global user.name \"Your Name\"\n" | |
4532 | "\n" | |
4533 | "来设置您账号的缺省身份标识。\n" | |
4534 | "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" | |
c04f5ac3 | 4535 | |
d9488fea | 4536 | #: ident.c:397 |
87cb7997 | 4537 | msgid "no email was given and auto-detection is disabled" |
65e2041e | 4538 | msgstr "未提供邮件地址且自动探测被禁用" |
87cb7997 | 4539 | |
d9488fea | 4540 | #: ident.c:402 |
87cb7997 JX |
4541 | #, c-format |
4542 | msgid "unable to auto-detect email address (got '%s')" | |
4543 | msgstr "无法自动探测邮件地址(得到 '%s')" | |
4544 | ||
d9488fea | 4545 | #: ident.c:419 |
87cb7997 JX |
4546 | msgid "no name was given and auto-detection is disabled" |
4547 | msgstr "未提供姓名且自动探测被禁用" | |
4548 | ||
d9488fea | 4549 | #: ident.c:425 |
87cb7997 JX |
4550 | #, c-format |
4551 | msgid "unable to auto-detect name (got '%s')" | |
4552 | msgstr "无法自动探测姓名(得到 '%s')" | |
4553 | ||
d9488fea | 4554 | #: ident.c:433 |
87cb7997 JX |
4555 | #, c-format |
4556 | msgid "empty ident name (for <%s>) not allowed" | |
4557 | msgstr "不允许空的姓名(对于 <%s>)" | |
4558 | ||
d9488fea | 4559 | #: ident.c:439 |
87cb7997 JX |
4560 | #, c-format |
4561 | msgid "name consists only of disallowed characters: %s" | |
4562 | msgstr "姓名中仅包含禁用字符:%s" | |
4563 | ||
33b62fba | 4564 | #: ident.c:454 builtin/commit.c:647 |
87cb7997 JX |
4565 | #, c-format |
4566 | msgid "invalid date format: %s" | |
4567 | msgstr "无效的日期格式:%s" | |
4568 | ||
33b62fba | 4569 | #: list-objects-filter-options.c:83 |
06991777 JX |
4570 | msgid "expected 'tree:<depth>'" |
4571 | msgstr "期望 'tree:<深度>'" | |
4c27fcb5 | 4572 | |
33b62fba | 4573 | #: list-objects-filter-options.c:98 |
d46c5519 JX |
4574 | msgid "sparse:path filters support has been dropped" |
4575 | msgstr "sparse:path 过滤器支持已被删除" | |
4576 | ||
33b62fba JX |
4577 | #: list-objects-filter-options.c:105 |
4578 | #, c-format | |
ec3d4607 | 4579 | msgid "'%s' for 'object:type=<type>' is not a valid object type" |
33b62fba JX |
4580 | msgstr "'object:type=<type>' 的值 '%s' 不是有效的对象类型" |
4581 | ||
4582 | #: list-objects-filter-options.c:124 | |
a6cd2cc4 JX |
4583 | #, c-format |
4584 | msgid "invalid filter-spec '%s'" | |
4585 | msgstr "无效的过滤器表达式 '%s'" | |
4586 | ||
33b62fba | 4587 | #: list-objects-filter-options.c:140 |
a5cd71ca JX |
4588 | #, c-format |
4589 | msgid "must escape char in sub-filter-spec: '%c'" | |
4590 | msgstr "必须对 sub-filter-spec 中的字符进行转义:'%c'" | |
4591 | ||
33b62fba | 4592 | #: list-objects-filter-options.c:182 |
a5cd71ca JX |
4593 | msgid "expected something after combine:" |
4594 | msgstr "期望在组合后有一些东西:" | |
4595 | ||
33b62fba | 4596 | #: list-objects-filter-options.c:264 |
a5cd71ca JX |
4597 | msgid "multiple filter-specs cannot be combined" |
4598 | msgstr "不能混用多种过滤规格" | |
5809aa05 | 4599 | |
33b62fba | 4600 | #: list-objects-filter-options.c:376 |
7157c2b5 JX |
4601 | msgid "unable to upgrade repository format to support partial clone" |
4602 | msgstr "无法升级仓库格式以支持部分克隆" | |
4603 | ||
33b62fba | 4604 | #: list-objects-filter.c:532 |
349ede6a JX |
4605 | #, c-format |
4606 | msgid "unable to access sparse blob in '%s'" | |
4607 | msgstr "不能访问 '%s' 中的稀疏数据对象" | |
4608 | ||
33b62fba | 4609 | #: list-objects-filter.c:535 |
349ede6a JX |
4610 | #, c-format |
4611 | msgid "unable to parse sparse filter data in %s" | |
4612 | msgstr "无法解析 %s 中的稀疏过滤器数据" | |
4613 | ||
4614 | #: list-objects.c:127 | |
4615 | #, c-format | |
4616 | msgid "entry '%s' in tree %s has tree mode, but is not a tree" | |
4617 | msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式,但不是一个树对象" | |
4618 | ||
4619 | #: list-objects.c:140 | |
4620 | #, c-format | |
4621 | msgid "entry '%s' in tree %s has blob mode, but is not a blob" | |
4622 | msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式,但不是一个数据对象" | |
4623 | ||
ec3d4607 | 4624 | #: list-objects.c:398 |
349ede6a JX |
4625 | #, c-format |
4626 | msgid "unable to load root tree for commit %s" | |
4627 | msgstr "无法为提交 %s 加载根树" | |
4628 | ||
4629 | #: lockfile.c:152 | |
c04f5ac3 | 4630 | #, c-format |
a0b6b246 JX |
4631 | msgid "" |
4632 | "Unable to create '%s.lock': %s.\n" | |
4633 | "\n" | |
4634 | "Another git process seems to be running in this repository, e.g.\n" | |
4635 | "an editor opened by 'git commit'. Please make sure all processes\n" | |
4636 | "are terminated then try again. If it still fails, a git process\n" | |
4637 | "may have crashed in this repository earlier:\n" | |
4638 | "remove the file manually to continue." | |
4639 | msgstr "" | |
4640 | "无法创建 '%s.lock':%s。\n" | |
4641 | "\n" | |
4642 | "似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n" | |
4643 | "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n" | |
4644 | "可能之前有一个 git 进程在这个仓库中异常退出:\n" | |
4645 | "手动删除这个文件再继续。" | |
c04f5ac3 | 4646 | |
349ede6a | 4647 | #: lockfile.c:160 |
a0b6b246 JX |
4648 | #, c-format |
4649 | msgid "Unable to create '%s.lock': %s" | |
4650 | msgstr "不能创建 '%s.lock':%s" | |
c04f5ac3 | 4651 | |
473eb541 JX |
4652 | #: ls-refs.c:37 |
4653 | #, c-format | |
4654 | msgid "invalid value '%s' for lsrefs.unborn" | |
4655 | msgstr "lsrefs.unborn 的取值 '%s' 无效" | |
4656 | ||
4657 | #: ls-refs.c:167 | |
349ede6a JX |
4658 | msgid "expected flush after ls-refs arguments" |
4659 | msgstr "在 ls-refs 参数后应该有一个 flush 包" | |
c04f5ac3 | 4660 | |
33b62fba JX |
4661 | #: mailinfo.c:1050 |
4662 | msgid "quoted CRLF detected" | |
7b4d4954 | 4663 | msgstr "检测到被引用的 CRLF" |
33b62fba JX |
4664 | |
4665 | #: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 | |
4666 | #, c-format | |
4667 | msgid "bad action '%s' for '%s'" | |
4668 | msgstr "'%2$s' 的错误动作 '%1$s'" | |
4669 | ||
ec3d4607 | 4670 | #: merge-ort.c:1569 merge-recursive.c:1201 |
473eb541 JX |
4671 | #, c-format |
4672 | msgid "Failed to merge submodule %s (not checked out)" | |
4673 | msgstr "无法合并子模组 %s (没有检出)" | |
4674 | ||
ec3d4607 | 4675 | #: merge-ort.c:1578 merge-recursive.c:1208 |
473eb541 JX |
4676 | #, c-format |
4677 | msgid "Failed to merge submodule %s (commits not present)" | |
4678 | msgstr "无法合并子模组 %s(提交不存在)" | |
4679 | ||
ec3d4607 | 4680 | #: merge-ort.c:1587 merge-recursive.c:1215 |
473eb541 JX |
4681 | #, c-format |
4682 | msgid "Failed to merge submodule %s (commits don't follow merge-base)" | |
4683 | msgstr "无法合并子模组 %s (提交未跟随合并基线)" | |
4684 | ||
ec3d4607 | 4685 | #: merge-ort.c:1597 merge-ort.c:1604 |
473eb541 JX |
4686 | #, c-format |
4687 | msgid "Note: Fast-forwarding submodule %s to %s" | |
4688 | msgstr "注意:快进子模组 %s 到 %s" | |
4689 | ||
ec3d4607 | 4690 | #: merge-ort.c:1625 |
473eb541 JX |
4691 | #, c-format |
4692 | msgid "Failed to merge submodule %s" | |
4693 | msgstr "无法合并子模组 %s" | |
4694 | ||
ec3d4607 | 4695 | #: merge-ort.c:1632 |
473eb541 JX |
4696 | #, c-format |
4697 | msgid "" | |
4698 | "Failed to merge submodule %s, but a possible merge resolution exists:\n" | |
4699 | "%s\n" | |
4700 | msgstr "" | |
4701 | "无法合并子模组 %s,但是存在一个可能的合并方案:\n" | |
4702 | "%s\n" | |
4703 | ||
ec3d4607 | 4704 | #: merge-ort.c:1636 merge-recursive.c:1269 |
473eb541 JX |
4705 | #, c-format |
4706 | msgid "" | |
4707 | "If this is correct simply add it to the index for example\n" | |
4708 | "by using:\n" | |
4709 | "\n" | |
4710 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
4711 | "\n" | |
4712 | "which will accept this suggestion.\n" | |
4713 | msgstr "" | |
4714 | "如果这个正确,将其添加到索引,例如使用命令:\n" | |
4715 | "\n" | |
4716 | " git update-index --cacheinfo 160000 %s \"%s\"\n" | |
4717 | "\n" | |
4718 | "以接受此建议。\n" | |
4719 | ||
ec3d4607 | 4720 | #: merge-ort.c:1649 |
473eb541 JX |
4721 | #, c-format |
4722 | msgid "" | |
4723 | "Failed to merge submodule %s, but multiple possible merges exist:\n" | |
4724 | "%s" | |
4725 | msgstr "" | |
4726 | "无法合并子模组 %s,但是存在多个可能的合并:\n" | |
4727 | "%s" | |
4728 | ||
ec3d4607 | 4729 | #: merge-ort.c:1868 merge-recursive.c:1358 |
473eb541 JX |
4730 | msgid "Failed to execute internal merge" |
4731 | msgstr "无法执行内部合并" | |
4732 | ||
ec3d4607 | 4733 | #: merge-ort.c:1873 merge-recursive.c:1363 |
473eb541 JX |
4734 | #, c-format |
4735 | msgid "Unable to add %s to database" | |
4736 | msgstr "不能添加 %s 至对象库" | |
4737 | ||
ec3d4607 | 4738 | #: merge-ort.c:1880 merge-recursive.c:1396 |
473eb541 JX |
4739 | #, c-format |
4740 | msgid "Auto-merging %s" | |
4741 | msgstr "自动合并 %s" | |
4742 | ||
ec3d4607 | 4743 | #: merge-ort.c:2019 merge-recursive.c:2118 |
473eb541 JX |
4744 | #, c-format |
4745 | msgid "" | |
4746 | "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " | |
4747 | "implicit directory rename(s) putting the following path(s) there: %s." | |
4748 | msgstr "" | |
4749 | "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" | |
4750 | "在:%s。" | |
4751 | ||
ec3d4607 | 4752 | #: merge-ort.c:2029 merge-recursive.c:2128 |
473eb541 JX |
4753 | #, c-format |
4754 | msgid "" | |
4755 | "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " | |
4756 | "implicit directory renames tried to put these paths there: %s" | |
4757 | msgstr "" | |
4758 | "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" | |
4759 | "径放置于此:%s" | |
4760 | ||
ec3d4607 | 4761 | #: merge-ort.c:2087 |
473eb541 JX |
4762 | #, c-format |
4763 | msgid "" | |
4764 | "CONFLICT (directory rename split): Unclear where to rename %s to; it was " | |
4765 | "renamed to multiple other directories, with no destination getting a " | |
4766 | "majority of the files." | |
33b62fba JX |
4767 | msgstr "" |
4768 | "冲突(分割的目录重命名):不清楚重命名 %s 到哪里,因为它被重命名到多个其他目" | |
4769 | "录中,没有一个目标目录中包含多数文件。" | |
473eb541 | 4770 | |
ec3d4607 | 4771 | #: merge-ort.c:2241 merge-recursive.c:2464 |
473eb541 JX |
4772 | #, c-format |
4773 | msgid "" | |
4774 | "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " | |
4775 | "renamed." | |
4776 | msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" | |
4777 | ||
ec3d4607 | 4778 | #: merge-ort.c:2385 merge-recursive.c:3247 |
473eb541 JX |
4779 | #, c-format |
4780 | msgid "" | |
4781 | "Path updated: %s added in %s inside a directory that was renamed in %s; " | |
4782 | "moving it to %s." | |
4783 | msgstr "" | |
4784 | "路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" | |
4785 | ||
ec3d4607 | 4786 | #: merge-ort.c:2392 merge-recursive.c:3254 |
473eb541 JX |
4787 | #, c-format |
4788 | msgid "" | |
4789 | "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " | |
4790 | "%s; moving it to %s." | |
4791 | msgstr "" | |
4792 | "路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" | |
4793 | "动到 %5$s。" | |
4794 | ||
ec3d4607 | 4795 | #: merge-ort.c:2405 merge-recursive.c:3250 |
473eb541 JX |
4796 | #, c-format |
4797 | msgid "" | |
4798 | "CONFLICT (file location): %s added in %s inside a directory that was renamed " | |
4799 | "in %s, suggesting it should perhaps be moved to %s." | |
4800 | msgstr "" | |
4801 | "冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" | |
4802 | "到 %s。" | |
4803 | ||
ec3d4607 | 4804 | #: merge-ort.c:2413 merge-recursive.c:3257 |
473eb541 JX |
4805 | #, c-format |
4806 | msgid "" | |
4807 | "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " | |
4808 | "was renamed in %s, suggesting it should perhaps be moved to %s." | |
4809 | msgstr "" | |
4810 | "冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," | |
4811 | "建议将其移动到 %5$s。" | |
4812 | ||
ec3d4607 | 4813 | #: merge-ort.c:2569 |
473eb541 JX |
4814 | #, c-format |
4815 | msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." | |
33b62fba JX |
4816 | msgstr "" |
4817 | "冲突(重命名/重命名):%1$s 重命名为 %3$s 中的 %2$s,以及在 %5$s 中的 %4$s。" | |
473eb541 | 4818 | |
ec3d4607 | 4819 | #: merge-ort.c:2664 |
473eb541 JX |
4820 | #, c-format |
4821 | msgid "" | |
4822 | "CONFLICT (rename involved in collision): rename of %s -> %s has content " | |
4823 | "conflicts AND collides with another path; this may result in nested conflict " | |
4824 | "markers." | |
33b62fba JX |
4825 | msgstr "" |
4826 | "冲突(重命名卷入冲突):重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞,这" | |
4827 | "可能导致嵌套的冲突标签。" | |
473eb541 | 4828 | |
ec3d4607 | 4829 | #: merge-ort.c:2683 merge-ort.c:2707 |
473eb541 JX |
4830 | #, c-format |
4831 | msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." | |
4832 | msgstr "冲突(重命名/删除):%1$s 在 %3$s 中重命名为 %2$s,但在 %4$s 中删除。" | |
4833 | ||
ec3d4607 | 4834 | #: merge-ort.c:3182 merge-recursive.c:3008 |
33b62fba JX |
4835 | #, c-format |
4836 | msgid "cannot read object %s" | |
4837 | msgstr "不能读取对象 %s" | |
4838 | ||
ec3d4607 | 4839 | #: merge-ort.c:3185 merge-recursive.c:3011 |
33b62fba JX |
4840 | #, c-format |
4841 | msgid "object %s is not a blob" | |
4842 | msgstr "对象 %s 不是一个数据对象" | |
4843 | ||
ec3d4607 | 4844 | #: merge-ort.c:3613 |
473eb541 JX |
4845 | #, c-format |
4846 | msgid "" | |
4847 | "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " | |
4848 | "%s instead." | |
4849 | msgstr "冲突(文件/目录):目录已存在于 %2$s 中的 %1$s,将其移动到 %3$s。" | |
4850 | ||
ec3d4607 | 4851 | #: merge-ort.c:3689 |
473eb541 JX |
4852 | #, c-format |
4853 | msgid "" | |
33b62fba | 4854 | "CONFLICT (distinct types): %s had different types on each side; renamed both " |
473eb541 | 4855 | "of them so each can be recorded somewhere." |
ec3d4607 JX |
4856 | msgstr "" |
4857 | "冲突(不同类型):%s 在两侧有不同的类型,将两者都重命名以便它们能记录在不同位" | |
4858 | "置。" | |
473eb541 | 4859 | |
ec3d4607 | 4860 | #: merge-ort.c:3696 |
33b62fba JX |
4861 | #, c-format |
4862 | msgid "" | |
4863 | "CONFLICT (distinct types): %s had different types on each side; renamed one " | |
4864 | "of them so each can be recorded somewhere." | |
ec3d4607 JX |
4865 | msgstr "" |
4866 | "冲突(不同类型):%s 在两侧有不同的类型,将其中之一重命名以便它们能记录在不同" | |
4867 | "位置。" | |
473eb541 | 4868 | |
ec3d4607 | 4869 | #: merge-ort.c:3796 merge-recursive.c:3087 |
473eb541 JX |
4870 | msgid "content" |
4871 | msgstr "内容" | |
4872 | ||
ec3d4607 | 4873 | #: merge-ort.c:3798 merge-recursive.c:3091 |
473eb541 JX |
4874 | msgid "add/add" |
4875 | msgstr "添加/添加" | |
4876 | ||
ec3d4607 | 4877 | #: merge-ort.c:3800 merge-recursive.c:3136 |
473eb541 JX |
4878 | msgid "submodule" |
4879 | msgstr "子模组" | |
4880 | ||
ec3d4607 | 4881 | #: merge-ort.c:3802 merge-recursive.c:3137 |
473eb541 JX |
4882 | #, c-format |
4883 | msgid "CONFLICT (%s): Merge conflict in %s" | |
4884 | msgstr "冲突(%s):合并冲突于 %s" | |
4885 | ||
ec3d4607 | 4886 | #: merge-ort.c:3833 |
473eb541 JX |
4887 | #, c-format |
4888 | msgid "" | |
4889 | "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " | |
4890 | "of %s left in tree." | |
33b62fba JX |
4891 | msgstr "" |
4892 | "冲突(修改/删除):%1$s 在 %2$s 中被删除,在 %3$s 中被修改。%5$s 的 %4$s 版本" | |
4893 | "在树中被保留。" | |
4894 | ||
ec3d4607 | 4895 | #: merge-ort.c:4120 |
33b62fba JX |
4896 | #, c-format |
4897 | msgid "" | |
4898 | "Note: %s not up to date and in way of checking out conflicted version; old " | |
4899 | "copy renamed to %s" | |
7b4d4954 | 4900 | msgstr "注意:%s 不是最新的,并且与要检出的版本冲突。旧副本重命名为 %s" |
473eb541 JX |
4901 | |
4902 | #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge | |
4903 | #. base, and 2-3) the trees for the two trees we're merging. | |
4904 | #. | |
ec3d4607 | 4905 | #: merge-ort.c:4487 |
473eb541 JX |
4906 | #, c-format |
4907 | msgid "collecting merge info failed for trees %s, %s, %s" | |
4908 | msgstr "无法收集树 %s、%s、%s 的合并信息" | |
4909 | ||
ec3d4607 | 4910 | #: merge-ort-wrappers.c:13 merge-recursive.c:3702 |
d13389bf JX |
4911 | #, c-format |
4912 | msgid "" | |
4913 | "Your local changes to the following files would be overwritten by merge:\n" | |
4914 | " %s" | |
4915 | msgstr "" | |
4916 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
4917 | " %s" | |
4918 | ||
ec3d4607 | 4919 | #: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402 |
33b62fba JX |
4920 | msgid "Already up to date." |
4921 | msgstr "已经是最新的。" | |
d13389bf | 4922 | |
ec3d4607 | 4923 | #: merge-recursive.c:352 |
a0b6b246 JX |
4924 | msgid "(bad commit)\n" |
4925 | msgstr "(坏提交)\n" | |
c04f5ac3 | 4926 | |
ec3d4607 | 4927 | #: merge-recursive.c:375 |
a0b6b246 | 4928 | #, c-format |
fd8cb379 | 4929 | msgid "add_cacheinfo failed for path '%s'; merge aborting." |
0fcd668f | 4930 | msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" |
c04f5ac3 | 4931 | |
ec3d4607 | 4932 | #: merge-recursive.c:384 |
fd8cb379 JX |
4933 | #, c-format |
4934 | msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." | |
0fcd668f | 4935 | msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" |
fd8cb379 | 4936 | |
ec3d4607 | 4937 | #: merge-recursive.c:872 |
c04f5ac3 | 4938 | #, c-format |
a0b6b246 | 4939 | msgid "failed to create path '%s'%s" |
c1ac5258 | 4940 | msgstr "创建路径 '%s'%s 失败" |
c04f5ac3 | 4941 | |
ec3d4607 | 4942 | #: merge-recursive.c:883 |
c04f5ac3 | 4943 | #, c-format |
a0b6b246 JX |
4944 | msgid "Removing %s to make room for subdirectory\n" |
4945 | msgstr "删除 %s 以便为子目录留出空间\n" | |
c04f5ac3 | 4946 | |
ec3d4607 | 4947 | #: merge-recursive.c:897 merge-recursive.c:916 |
a0b6b246 JX |
4948 | msgid ": perhaps a D/F conflict?" |
4949 | msgstr ":可能是一个目录/文件冲突?" | |
c04f5ac3 | 4950 | |
ec3d4607 | 4951 | #: merge-recursive.c:906 |
c04f5ac3 | 4952 | #, c-format |
a0b6b246 JX |
4953 | msgid "refusing to lose untracked file at '%s'" |
4954 | msgstr "拒绝丢弃 '%s' 中的未跟踪文件" | |
c04f5ac3 | 4955 | |
ec3d4607 | 4956 | #: merge-recursive.c:947 builtin/cat-file.c:41 |
c04f5ac3 | 4957 | #, c-format |
a0b6b246 JX |
4958 | msgid "cannot read object %s '%s'" |
4959 | msgstr "不能读取对象 %s '%s'" | |
c04f5ac3 | 4960 | |
ec3d4607 | 4961 | #: merge-recursive.c:952 |
4dcdc3d8 | 4962 | #, c-format |
a0b6b246 JX |
4963 | msgid "blob expected for %s '%s'" |
4964 | msgstr "%s '%s' 应为数据对象" | |
4dcdc3d8 | 4965 | |
ec3d4607 | 4966 | #: merge-recursive.c:977 |
4dcdc3d8 | 4967 | #, c-format |
a0b6b246 | 4968 | msgid "failed to open '%s': %s" |
c1ac5258 | 4969 | msgstr "打开 '%s' 失败:%s" |
4dcdc3d8 | 4970 | |
ec3d4607 | 4971 | #: merge-recursive.c:988 |
a0b6b246 JX |
4972 | #, c-format |
4973 | msgid "failed to symlink '%s': %s" | |
c1ac5258 | 4974 | msgstr "创建符号链接 '%s' 失败:%s" |
c04f5ac3 | 4975 | |
ec3d4607 | 4976 | #: merge-recursive.c:993 |
5c57d762 | 4977 | #, c-format |
a0b6b246 JX |
4978 | msgid "do not know what to do with %06o %s '%s'" |
4979 | msgstr "不知道如何处理 %06o %s '%s'" | |
5c57d762 | 4980 | |
ec3d4607 | 4981 | #: merge-recursive.c:1223 merge-recursive.c:1235 |
fd8cb379 JX |
4982 | #, c-format |
4983 | msgid "Fast-forwarding submodule %s to the following commit:" | |
4984 | msgstr "子模组 %s 快进到如下提交:" | |
4985 | ||
ec3d4607 | 4986 | #: merge-recursive.c:1226 merge-recursive.c:1238 |
fd8cb379 JX |
4987 | #, c-format |
4988 | msgid "Fast-forwarding submodule %s" | |
4989 | msgstr "快进子模组 %s" | |
4990 | ||
ec3d4607 | 4991 | #: merge-recursive.c:1261 |
fd8cb379 JX |
4992 | #, c-format |
4993 | msgid "Failed to merge submodule %s (merge following commits not found)" | |
4994 | msgstr "无法合并子模组 %s (没发现合并跟随的提交)" | |
4995 | ||
ec3d4607 | 4996 | #: merge-recursive.c:1265 |
fd8cb379 JX |
4997 | #, c-format |
4998 | msgid "Failed to merge submodule %s (not fast-forward)" | |
4999 | msgstr "无法合并子模组 %s(非快进)" | |
5000 | ||
ec3d4607 | 5001 | #: merge-recursive.c:1266 |
fd8cb379 JX |
5002 | msgid "Found a possible merge resolution for the submodule:\n" |
5003 | msgstr "找到子模组的一个可能的合并方案:\n" | |
5004 | ||
ec3d4607 | 5005 | #: merge-recursive.c:1278 |
fd8cb379 JX |
5006 | #, c-format |
5007 | msgid "Failed to merge submodule %s (multiple merges found)" | |
5008 | msgstr "无法合并子模组 %s (发现多个合并)" | |
5009 | ||
ec3d4607 | 5010 | #: merge-recursive.c:1420 |
fd8cb379 JX |
5011 | #, c-format |
5012 | msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." | |
5013 | msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" | |
5014 | ||
ec3d4607 | 5015 | #: merge-recursive.c:1492 |
5c57d762 JX |
5016 | #, c-format |
5017 | msgid "" | |
a0b6b246 JX |
5018 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " |
5019 | "in tree." | |
5c57d762 | 5020 | msgstr "" |
87cb7997 JX |
5021 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
5022 | "本被保留。" | |
5023 | ||
ec3d4607 | 5024 | #: merge-recursive.c:1497 |
87cb7997 JX |
5025 | #, c-format |
5026 | msgid "" | |
5027 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
5028 | "left in tree." | |
5029 | msgstr "" | |
5030 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
5031 | "%7$s 版本被保留。" | |
c04f5ac3 | 5032 | |
ec3d4607 | 5033 | #: merge-recursive.c:1504 |
7aea43ff | 5034 | #, c-format |
a0b6b246 JX |
5035 | msgid "" |
5036 | "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " | |
5037 | "in tree at %s." | |
5038 | msgstr "" | |
87cb7997 JX |
5039 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" |
5040 | "本保留在 %8$s 中。" | |
7aea43ff | 5041 | |
ec3d4607 | 5042 | #: merge-recursive.c:1509 |
87cb7997 JX |
5043 | #, c-format |
5044 | msgid "" | |
5045 | "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " | |
5046 | "left in tree at %s." | |
5047 | msgstr "" | |
5048 | "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " | |
5049 | "%7$s 版本保留在 %9$s 中。" | |
5050 | ||
ec3d4607 | 5051 | #: merge-recursive.c:1544 |
a0b6b246 JX |
5052 | msgid "rename" |
5053 | msgstr "重命名" | |
5b04ee3b | 5054 | |
ec3d4607 | 5055 | #: merge-recursive.c:1544 |
a0b6b246 JX |
5056 | msgid "renamed" |
5057 | msgstr "重命名" | |
5b04ee3b | 5058 | |
ec3d4607 | 5059 | #: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164 |
fd8cb379 JX |
5060 | #, c-format |
5061 | msgid "Refusing to lose dirty file at %s" | |
5062 | msgstr "拒绝丢失脏文件 '%s'" | |
5063 | ||
ec3d4607 | 5064 | #: merge-recursive.c:1605 |
06991777 JX |
5065 | #, c-format |
5066 | msgid "Refusing to lose untracked file at %s, even though it's in the way." | |
5067 | msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" | |
5068 | ||
ec3d4607 | 5069 | #: merge-recursive.c:1663 |
06991777 JX |
5070 | #, c-format |
5071 | msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" | |
5072 | msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" | |
5073 | ||
ec3d4607 | 5074 | #: merge-recursive.c:1694 |
5c57d762 | 5075 | #, c-format |
a0b6b246 JX |
5076 | msgid "%s is a directory in %s adding as %s instead" |
5077 | msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" | |
5c57d762 | 5078 | |
ec3d4607 | 5079 | #: merge-recursive.c:1699 |
fd8cb379 JX |
5080 | #, c-format |
5081 | msgid "Refusing to lose untracked file at %s; adding as %s instead" | |
5082 | msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" | |
5083 | ||
ec3d4607 | 5084 | #: merge-recursive.c:1726 |
5c57d762 JX |
5085 | #, c-format |
5086 | msgid "" | |
a0b6b246 JX |
5087 | "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" |
5088 | "\"->\"%s\" in \"%s\"%s" | |
5c57d762 | 5089 | msgstr "" |
a0b6b246 JX |
5090 | "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " |
5091 | "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" | |
5c57d762 | 5092 | |
ec3d4607 | 5093 | #: merge-recursive.c:1731 |
a0b6b246 JX |
5094 | msgid " (left unresolved)" |
5095 | msgstr "(留下未解决)" | |
5c57d762 | 5096 | |
ec3d4607 | 5097 | #: merge-recursive.c:1823 |
5c57d762 | 5098 | #, c-format |
a0b6b246 | 5099 | msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" |
5c57d762 | 5100 | msgstr "" |
a0b6b246 JX |
5101 | "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" |
5102 | "%5$s" | |
3495628d | 5103 | |
ec3d4607 | 5104 | #: merge-recursive.c:2086 |
fd8cb379 JX |
5105 | #, c-format |
5106 | msgid "" | |
5107 | "CONFLICT (directory rename split): Unclear where to place %s because " | |
5108 | "directory %s was renamed to multiple other directories, with no destination " | |
5109 | "getting a majority of the files." | |
c1ac5258 JX |
5110 | msgstr "" |
5111 | "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" | |
5112 | "其它目录,没有目录包含大部分文件。" | |
fd8cb379 | 5113 | |
ec3d4607 | 5114 | #: merge-recursive.c:2220 |
fd8cb379 JX |
5115 | #, c-format |
5116 | msgid "" | |
5117 | "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" | |
5118 | ">%s in %s" | |
5119 | msgstr "" | |
5120 | "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " | |
5121 | "%4$s->%5$s" | |
5122 | ||
ec3d4607 | 5123 | #: merge-recursive.c:3075 |
a0b6b246 JX |
5124 | msgid "modify" |
5125 | msgstr "修改" | |
90314792 | 5126 | |
ec3d4607 | 5127 | #: merge-recursive.c:3075 |
a0b6b246 JX |
5128 | msgid "modified" |
5129 | msgstr "修改" | |
5b04ee3b | 5130 | |
ec3d4607 | 5131 | #: merge-recursive.c:3114 |
220c313c | 5132 | #, c-format |
a0b6b246 JX |
5133 | msgid "Skipped %s (merged same as existing)" |
5134 | msgstr "略过 %s(已经做过相同合并)" | |
220c313c | 5135 | |
ec3d4607 | 5136 | #: merge-recursive.c:3167 |
220c313c | 5137 | #, c-format |
06991777 JX |
5138 | msgid "Adding as %s instead" |
5139 | msgstr "而是以 %s 为名添加" | |
5140 | ||
ec3d4607 | 5141 | #: merge-recursive.c:3371 |
d46c5519 JX |
5142 | #, c-format |
5143 | msgid "Removing %s" | |
5144 | msgstr "删除 %s" | |
5145 | ||
ec3d4607 | 5146 | #: merge-recursive.c:3394 |
d46c5519 JX |
5147 | msgid "file/directory" |
5148 | msgstr "文件/目录" | |
220c313c | 5149 | |
ec3d4607 | 5150 | #: merge-recursive.c:3399 |
a0b6b246 JX |
5151 | msgid "directory/file" |
5152 | msgstr "目录/文件" | |
276ceeaa | 5153 | |
ec3d4607 | 5154 | #: merge-recursive.c:3406 |
276ceeaa | 5155 | #, c-format |
a0b6b246 JX |
5156 | msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" |
5157 | msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" | |
276ceeaa | 5158 | |
ec3d4607 | 5159 | #: merge-recursive.c:3415 |
276ceeaa | 5160 | #, c-format |
a0b6b246 JX |
5161 | msgid "Adding %s" |
5162 | msgstr "添加 %s" | |
276ceeaa | 5163 | |
ec3d4607 | 5164 | #: merge-recursive.c:3424 |
06991777 JX |
5165 | #, c-format |
5166 | msgid "CONFLICT (add/add): Merge conflict in %s" | |
5167 | msgstr "冲突(add/add):合并冲突于 %s" | |
5168 | ||
ec3d4607 | 5169 | #: merge-recursive.c:3477 |
276ceeaa | 5170 | #, c-format |
a0b6b246 JX |
5171 | msgid "merging of trees %s and %s failed" |
5172 | msgstr "无法合并树 %s 和 %s" | |
276ceeaa | 5173 | |
ec3d4607 | 5174 | #: merge-recursive.c:3571 |
a0b6b246 JX |
5175 | msgid "Merging:" |
5176 | msgstr "合并:" | |
5c57d762 | 5177 | |
ec3d4607 | 5178 | #: merge-recursive.c:3584 |
5c57d762 | 5179 | #, c-format |
a0b6b246 JX |
5180 | msgid "found %u common ancestor:" |
5181 | msgid_plural "found %u common ancestors:" | |
5182 | msgstr[0] "发现 %u 个共同祖先:" | |
5183 | msgstr[1] "发现 %u 个共同祖先:" | |
5184 | ||
ec3d4607 | 5185 | #: merge-recursive.c:3634 |
a0b6b246 JX |
5186 | msgid "merge returned no commit" |
5187 | msgstr "合并未返回提交" | |
5188 | ||
ec3d4607 | 5189 | #: merge-recursive.c:3799 |
5c57d762 | 5190 | #, c-format |
a0b6b246 JX |
5191 | msgid "Could not parse object '%s'" |
5192 | msgstr "不能解析对象 '%s'" | |
5c57d762 | 5193 | |
ec3d4607 | 5194 | #: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901 |
33b62fba | 5195 | #: builtin/stash.c:473 |
a0b6b246 JX |
5196 | msgid "Unable to write index." |
5197 | msgstr "不能写入索引。" | |
5198 | ||
349ede6a JX |
5199 | #: merge.c:41 |
5200 | msgid "failed to read the cache" | |
5201 | msgstr "读取缓存失败" | |
5202 | ||
ec3d4607 JX |
5203 | #: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966 |
5204 | #: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821 | |
33b62fba | 5205 | #: builtin/stash.c:267 |
349ede6a JX |
5206 | msgid "unable to write new index file" |
5207 | msgstr "无法写新的索引文件" | |
5208 | ||
33b62fba | 5209 | #: midx.c:74 |
473eb541 JX |
5210 | msgid "multi-pack-index OID fanout is of the wrong size" |
5211 | msgstr "多包索引的对象ID扇出表大小错误" | |
5212 | ||
33b62fba | 5213 | #: midx.c:105 |
4c27fcb5 JX |
5214 | #, c-format |
5215 | msgid "multi-pack-index file %s is too small" | |
5216 | msgstr "多包索引文件 %s 太小" | |
5217 | ||
33b62fba | 5218 | #: midx.c:121 |
4c27fcb5 JX |
5219 | #, c-format |
5220 | msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" | |
5221 | msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" | |
5222 | ||
33b62fba | 5223 | #: midx.c:126 |
4c27fcb5 JX |
5224 | #, c-format |
5225 | msgid "multi-pack-index version %d not recognized" | |
5226 | msgstr "multi-pack-index 版本 %d 不能被识别" | |
5227 | ||
33b62fba | 5228 | #: midx.c:131 |
4c27fcb5 | 5229 | #, c-format |
d9488fea JX |
5230 | msgid "multi-pack-index hash version %u does not match version %u" |
5231 | msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" | |
4c27fcb5 | 5232 | |
33b62fba | 5233 | #: midx.c:148 |
4c27fcb5 JX |
5234 | msgid "multi-pack-index missing required pack-name chunk" |
5235 | msgstr "多包索引缺少必需的包名块" | |
5236 | ||
33b62fba | 5237 | #: midx.c:150 |
4c27fcb5 | 5238 | msgid "multi-pack-index missing required OID fanout chunk" |
5b533632 | 5239 | msgstr "多包索引缺少必需的对象 ID 扇出块" |
4c27fcb5 | 5240 | |
33b62fba | 5241 | #: midx.c:152 |
4c27fcb5 | 5242 | msgid "multi-pack-index missing required OID lookup chunk" |
5b533632 | 5243 | msgstr "多包索引缺少必需的对象 ID 查询块" |
4c27fcb5 | 5244 | |
33b62fba | 5245 | #: midx.c:154 |
4c27fcb5 JX |
5246 | msgid "multi-pack-index missing required object offsets chunk" |
5247 | msgstr "多包索引缺少必需的对象偏移块" | |
5248 | ||
33b62fba | 5249 | #: midx.c:170 |
4c27fcb5 JX |
5250 | #, c-format |
5251 | msgid "multi-pack-index pack names out of order: '%s' before '%s'" | |
5252 | msgstr "多包索引包名无序:'%s' 在 '%s' 之前" | |
5253 | ||
33b62fba | 5254 | #: midx.c:214 |
4c27fcb5 JX |
5255 | #, c-format |
5256 | msgid "bad pack-int-id: %u (%u total packs)" | |
5257 | msgstr "错的 pack-int-id:%u(共有 %u 个包)" | |
5258 | ||
33b62fba | 5259 | #: midx.c:264 |
4c27fcb5 JX |
5260 | msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" |
5261 | msgstr "多包索引存储一个64位偏移,但是 off_t 太小" | |
5262 | ||
33b62fba | 5263 | #: midx.c:490 |
4c27fcb5 JX |
5264 | #, c-format |
5265 | msgid "failed to add packfile '%s'" | |
5266 | msgstr "添加包文件 '%s' 失败" | |
5267 | ||
33b62fba | 5268 | #: midx.c:496 |
4c27fcb5 JX |
5269 | #, c-format |
5270 | msgid "failed to open pack-index '%s'" | |
5271 | msgstr "打开包索引 '%s' 失败" | |
5272 | ||
33b62fba | 5273 | #: midx.c:564 |
4c27fcb5 JX |
5274 | #, c-format |
5275 | msgid "failed to locate object %d in packfile" | |
5276 | msgstr "在包文件中定位对象 %d 失败" | |
5277 | ||
ec3d4607 | 5278 | #: midx.c:880 builtin/index-pack.c:1533 |
33b62fba JX |
5279 | msgid "cannot store reverse index file" |
5280 | msgstr "无法存储反向索引文件" | |
5281 | ||
ec3d4607 JX |
5282 | #: midx.c:920 |
5283 | msgid "ignoring existing multi-pack-index; checksum mismatch" | |
5284 | msgstr "忽略已存在的多包索引,校验码不匹配" | |
5285 | ||
5286 | #: midx.c:943 | |
ddc12c42 JX |
5287 | msgid "Adding packfiles to multi-pack-index" |
5288 | msgstr "添加包文件到多包索引" | |
5289 | ||
ec3d4607 | 5290 | #: midx.c:989 |
a6cd2cc4 JX |
5291 | #, c-format |
5292 | msgid "did not see pack-file %s to drop" | |
5293 | msgstr "没有看到要丢弃的包文件 %s" | |
5294 | ||
ec3d4607 | 5295 | #: midx.c:1034 |
33b62fba JX |
5296 | #, c-format |
5297 | msgid "unknown preferred pack: '%s'" | |
5298 | msgstr "未知的首选包:'%s'" | |
5299 | ||
ec3d4607 | 5300 | #: midx.c:1039 |
33b62fba JX |
5301 | #, c-format |
5302 | msgid "preferred pack '%s' is expired" | |
5303 | msgstr "首选包 '%s' 已过期" | |
5304 | ||
ec3d4607 | 5305 | #: midx.c:1055 |
349ede6a JX |
5306 | msgid "no pack files to index." |
5307 | msgstr "没有要索引的包文件。" | |
5308 | ||
ec3d4607 | 5309 | #: midx.c:1135 builtin/clean.c:37 |
33b62fba JX |
5310 | #, c-format |
5311 | msgid "failed to remove %s" | |
5312 | msgstr "删除 %s 失败" | |
5313 | ||
ec3d4607 | 5314 | #: midx.c:1166 |
4c27fcb5 JX |
5315 | #, c-format |
5316 | msgid "failed to clear multi-pack-index at %s" | |
5317 | msgstr "清理位于 %s 的多包索引失败" | |
5318 | ||
ec3d4607 | 5319 | #: midx.c:1225 |
d9488fea JX |
5320 | msgid "multi-pack-index file exists, but failed to parse" |
5321 | msgstr "多包索引文件存在,但无法解析" | |
5322 | ||
ec3d4607 JX |
5323 | #: midx.c:1233 |
5324 | msgid "incorrect checksum" | |
5325 | msgstr "不正确的校验码" | |
5326 | ||
5327 | #: midx.c:1236 | |
d46c5519 JX |
5328 | msgid "Looking for referenced packfiles" |
5329 | msgstr "正在查找引用的包文件" | |
5330 | ||
ec3d4607 | 5331 | #: midx.c:1251 |
4c27fcb5 JX |
5332 | #, c-format |
5333 | msgid "" | |
5334 | "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" | |
5b533632 | 5335 | msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" |
4c27fcb5 | 5336 | |
ec3d4607 | 5337 | #: midx.c:1256 |
349ede6a JX |
5338 | msgid "the midx contains no oid" |
5339 | msgstr "midx 不包含 oid" | |
5340 | ||
ec3d4607 | 5341 | #: midx.c:1265 |
ddc12c42 JX |
5342 | msgid "Verifying OID order in multi-pack-index" |
5343 | msgstr "校验多包索引中的 OID 顺序" | |
d46c5519 | 5344 | |
ec3d4607 | 5345 | #: midx.c:1274 |
4c27fcb5 JX |
5346 | #, c-format |
5347 | msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" | |
5b533632 | 5348 | msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" |
4c27fcb5 | 5349 | |
ec3d4607 | 5350 | #: midx.c:1294 |
d46c5519 JX |
5351 | msgid "Sorting objects by packfile" |
5352 | msgstr "通过包文件为对象排序" | |
5353 | ||
ec3d4607 | 5354 | #: midx.c:1301 |
4c27fcb5 JX |
5355 | msgid "Verifying object offsets" |
5356 | msgstr "校验对象偏移" | |
5357 | ||
ec3d4607 | 5358 | #: midx.c:1317 |
4c27fcb5 JX |
5359 | #, c-format |
5360 | msgid "failed to load pack entry for oid[%d] = %s" | |
5361 | msgstr "为 oid[%d] = %s 加载包条目失败" | |
5362 | ||
ec3d4607 | 5363 | #: midx.c:1323 |
4c27fcb5 JX |
5364 | #, c-format |
5365 | msgid "failed to load pack-index for packfile %s" | |
5366 | msgstr "为包文件 %s 加载包索引失败" | |
5367 | ||
ec3d4607 | 5368 | #: midx.c:1332 |
4c27fcb5 JX |
5369 | #, c-format |
5370 | msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" | |
5371 | msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" | |
5372 | ||
ec3d4607 | 5373 | #: midx.c:1357 |
ddc12c42 JX |
5374 | msgid "Counting referenced objects" |
5375 | msgstr "正在对引用对象计数" | |
5376 | ||
ec3d4607 | 5377 | #: midx.c:1367 |
ddc12c42 JX |
5378 | msgid "Finding and deleting unreferenced packfiles" |
5379 | msgstr "正在查找和删除未引用的包文件" | |
5380 | ||
ec3d4607 | 5381 | #: midx.c:1558 |
a6cd2cc4 JX |
5382 | msgid "could not start pack-objects" |
5383 | msgstr "不能开始 pack-objects" | |
5384 | ||
ec3d4607 | 5385 | #: midx.c:1578 |
a6cd2cc4 JX |
5386 | msgid "could not finish pack-objects" |
5387 | msgstr "不能结束 pack-objects" | |
5388 | ||
33b62fba | 5389 | #: name-hash.c:542 |
4c27fcb5 JX |
5390 | #, c-format |
5391 | msgid "unable to create lazy_dir thread: %s" | |
5392 | msgstr "不能创建 lazy_dir 线程:%s" | |
5393 | ||
33b62fba | 5394 | #: name-hash.c:564 |
4c27fcb5 JX |
5395 | #, c-format |
5396 | msgid "unable to create lazy_name thread: %s" | |
5397 | msgstr "不能创建 lazy_name 线程:%s" | |
5398 | ||
33b62fba | 5399 | #: name-hash.c:570 |
4c27fcb5 JX |
5400 | #, c-format |
5401 | msgid "unable to join lazy_name thread: %s" | |
ae4e099e | 5402 | msgstr "不能加入 lazy_name 线程:%s" |
4c27fcb5 | 5403 | |
06991777 | 5404 | #: notes-merge.c:277 |
5c57d762 JX |
5405 | #, c-format |
5406 | msgid "" | |
a0b6b246 JX |
5407 | "You have not concluded your previous notes merge (%s exists).\n" |
5408 | "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " | |
5409 | "commit/abort the previous merge before you start a new notes merge." | |
5c57d762 | 5410 | msgstr "" |
29004bbb | 5411 | "您的前一次注释合并尚未结束(存在 %s)。\n" |
1a79b2f1 JX |
5412 | "在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git " |
5413 | "notes merge --abort' 来提交/终止前一次合并。" | |
5c57d762 | 5414 | |
06991777 | 5415 | #: notes-merge.c:284 |
a0b6b246 JX |
5416 | #, c-format |
5417 | msgid "You have not concluded your notes merge (%s exists)." | |
5418 | msgstr "您尚未结束注释合并(存在 %s)。" | |
5419 | ||
06991777 | 5420 | #: notes-utils.c:46 |
a0b6b246 JX |
5421 | msgid "Cannot commit uninitialized/unreferenced notes tree" |
5422 | msgstr "不能提交未初始化/未引用的注解树" | |
5c57d762 | 5423 | |
06991777 | 5424 | #: notes-utils.c:105 |
1b7f4a34 | 5425 | #, c-format |
a0b6b246 JX |
5426 | msgid "Bad notes.rewriteMode value: '%s'" |
5427 | msgstr "坏的 notes.rewriteMode 值:'%s'" | |
1b7f4a34 | 5428 | |
06991777 | 5429 | #: notes-utils.c:115 |
5b04ee3b | 5430 | #, c-format |
a0b6b246 JX |
5431 | msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" |
5432 | msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解" | |
5b04ee3b | 5433 | |
a4f16749 JX |
5434 | #. TRANSLATORS: The first %s is the name of |
5435 | #. the environment variable, the second %s is | |
5436 | #. its value. | |
5437 | #. | |
06991777 | 5438 | #: notes-utils.c:145 |
5b04ee3b | 5439 | #, c-format |
a0b6b246 JX |
5440 | msgid "Bad %s value: '%s'" |
5441 | msgstr "坏的 %s 值:'%s'" | |
5b04ee3b | 5442 | |
33b62fba | 5443 | #: object-file.c:526 |
c1ac5258 | 5444 | #, c-format |
473eb541 JX |
5445 | msgid "object directory %s does not exist; check .git/objects/info/alternates" |
5446 | msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" | |
c1ac5258 | 5447 | |
ec3d4607 | 5448 | #: object-file.c:584 |
c1ac5258 | 5449 | #, c-format |
473eb541 JX |
5450 | msgid "unable to normalize alternate object path: %s" |
5451 | msgstr "无法规范化备用对象路径:%s" | |
c1ac5258 | 5452 | |
ec3d4607 | 5453 | #: object-file.c:658 |
c1ac5258 | 5454 | #, c-format |
473eb541 JX |
5455 | msgid "%s: ignoring alternate object stores, nesting too deep" |
5456 | msgstr "%s:忽略备用对象库,嵌套太深" | |
c1ac5258 | 5457 | |
ec3d4607 | 5458 | #: object-file.c:665 |
5b04ee3b | 5459 | #, c-format |
473eb541 JX |
5460 | msgid "unable to normalize object directory: %s" |
5461 | msgstr "无法规范化对象目录: %s" | |
5b04ee3b | 5462 | |
ec3d4607 | 5463 | #: object-file.c:708 |
473eb541 JX |
5464 | msgid "unable to fdopen alternates lockfile" |
5465 | msgstr "无法 fdopen 替换锁文件" | |
c1ac5258 | 5466 | |
ec3d4607 | 5467 | #: object-file.c:726 |
473eb541 JX |
5468 | msgid "unable to read alternates file" |
5469 | msgstr "无法读取替代文件" | |
349ede6a | 5470 | |
ec3d4607 | 5471 | #: object-file.c:733 |
473eb541 JX |
5472 | msgid "unable to move new alternates file into place" |
5473 | msgstr "无法将新的替代文件移动到位" | |
6937cb4e | 5474 | |
ec3d4607 | 5475 | #: object-file.c:768 |
6937cb4e | 5476 | #, c-format |
473eb541 JX |
5477 | msgid "path '%s' does not exist" |
5478 | msgstr "路径 '%s' 不存在" | |
6937cb4e | 5479 | |
ec3d4607 | 5480 | #: object-file.c:789 |
6937cb4e | 5481 | #, c-format |
473eb541 JX |
5482 | msgid "reference repository '%s' as a linked checkout is not supported yet." |
5483 | msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" | |
6937cb4e | 5484 | |
ec3d4607 | 5485 | #: object-file.c:795 |
2b472aae | 5486 | #, c-format |
473eb541 JX |
5487 | msgid "reference repository '%s' is not a local repository." |
5488 | msgstr "参考仓库 '%s' 不是一个本地仓库。" | |
349ede6a | 5489 | |
ec3d4607 | 5490 | #: object-file.c:801 |
349ede6a | 5491 | #, c-format |
473eb541 JX |
5492 | msgid "reference repository '%s' is shallow" |
5493 | msgstr "参考仓库 '%s' 是一个浅克隆" | |
349ede6a | 5494 | |
ec3d4607 | 5495 | #: object-file.c:809 |
349ede6a | 5496 | #, c-format |
473eb541 JX |
5497 | msgid "reference repository '%s' is grafted" |
5498 | msgstr "参考仓库 '%s' 已被移植" | |
349ede6a | 5499 | |
ec3d4607 | 5500 | #: object-file.c:869 |
349ede6a | 5501 | #, c-format |
473eb541 JX |
5502 | msgid "invalid line while parsing alternate refs: %s" |
5503 | msgstr "解析备用引用时无效的行:%s" | |
2b472aae | 5504 | |
ec3d4607 | 5505 | #: object-file.c:1019 |
06991777 | 5506 | #, c-format |
473eb541 JX |
5507 | msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" |
5508 | msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" | |
06991777 | 5509 | |
ec3d4607 JX |
5510 | #: object-file.c:1054 |
5511 | #, c-format | |
5512 | msgid "mmap failed%s" | |
5513 | msgstr "mmap 失败%s" | |
06991777 | 5514 | |
ec3d4607 | 5515 | #: object-file.c:1218 |
06991777 | 5516 | #, c-format |
473eb541 JX |
5517 | msgid "object file %s is empty" |
5518 | msgstr "对象文件 %s 为空" | |
06991777 | 5519 | |
ec3d4607 | 5520 | #: object-file.c:1353 object-file.c:2548 |
06991777 | 5521 | #, c-format |
473eb541 JX |
5522 | msgid "corrupt loose object '%s'" |
5523 | msgstr "损坏的松散对象 '%s'" | |
06991777 | 5524 | |
ec3d4607 | 5525 | #: object-file.c:1355 object-file.c:2552 |
06991777 | 5526 | #, c-format |
473eb541 JX |
5527 | msgid "garbage at end of loose object '%s'" |
5528 | msgstr "松散对象 '%s' 后面有垃圾数据" | |
06991777 | 5529 | |
ec3d4607 | 5530 | #: object-file.c:1397 |
473eb541 JX |
5531 | msgid "invalid object type" |
5532 | msgstr "无效的对象类型" | |
06991777 | 5533 | |
ec3d4607 | 5534 | #: object-file.c:1481 |
06991777 | 5535 | #, c-format |
473eb541 JX |
5536 | msgid "unable to unpack %s header with --allow-unknown-type" |
5537 | msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" | |
06991777 | 5538 | |
ec3d4607 | 5539 | #: object-file.c:1484 |
06991777 | 5540 | #, c-format |
473eb541 JX |
5541 | msgid "unable to unpack %s header" |
5542 | msgstr "无法解开 %s 头部" | |
06991777 | 5543 | |
ec3d4607 | 5544 | #: object-file.c:1490 |
349ede6a | 5545 | #, c-format |
473eb541 JX |
5546 | msgid "unable to parse %s header with --allow-unknown-type" |
5547 | msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" | |
349ede6a | 5548 | |
ec3d4607 | 5549 | #: object-file.c:1493 |
06991777 | 5550 | #, c-format |
473eb541 JX |
5551 | msgid "unable to parse %s header" |
5552 | msgstr "无法解析 %s 头部" | |
06991777 | 5553 | |
ec3d4607 | 5554 | #: object-file.c:1717 |
06991777 | 5555 | #, c-format |
473eb541 JX |
5556 | msgid "failed to read object %s" |
5557 | msgstr "读取对象 %s 失败" | |
06991777 | 5558 | |
ec3d4607 | 5559 | #: object-file.c:1721 |
06991777 | 5560 | #, c-format |
473eb541 JX |
5561 | msgid "replacement %s not found for %s" |
5562 | msgstr "找不到 %2$s 的替代 %1$s" | |
06991777 | 5563 | |
ec3d4607 | 5564 | #: object-file.c:1725 |
473eb541 JX |
5565 | #, c-format |
5566 | msgid "loose object %s (stored in %s) is corrupt" | |
5567 | msgstr "松散对象 %s(保存在 %s)已损坏" | |
a0b6b246 | 5568 | |
ec3d4607 | 5569 | #: object-file.c:1729 |
5b04ee3b | 5570 | #, c-format |
473eb541 JX |
5571 | msgid "packed object %s (stored in %s) is corrupt" |
5572 | msgstr "打包对象 %s(保存在 %s)已损坏" | |
5b04ee3b | 5573 | |
ec3d4607 | 5574 | #: object-file.c:1834 |
5b04ee3b | 5575 | #, c-format |
473eb541 JX |
5576 | msgid "unable to write file %s" |
5577 | msgstr "无法写文件 %s" | |
5b04ee3b | 5578 | |
ec3d4607 | 5579 | #: object-file.c:1841 |
5b04ee3b | 5580 | #, c-format |
473eb541 JX |
5581 | msgid "unable to set permission to '%s'" |
5582 | msgstr "无法为 '%s' 设置权限" | |
5b04ee3b | 5583 | |
ec3d4607 | 5584 | #: object-file.c:1848 |
473eb541 JX |
5585 | msgid "file write error" |
5586 | msgstr "文件写错误" | |
a0b6b246 | 5587 | |
ec3d4607 | 5588 | #: object-file.c:1868 |
473eb541 JX |
5589 | msgid "error when closing loose object file" |
5590 | msgstr "关闭松散对象文件时出错" | |
5591 | ||
ec3d4607 | 5592 | #: object-file.c:1933 |
5b04ee3b | 5593 | #, c-format |
473eb541 JX |
5594 | msgid "insufficient permission for adding an object to repository database %s" |
5595 | msgstr "权限不足,无法在仓库对象库 %s 中添加对象" | |
a0b6b246 | 5596 | |
ec3d4607 | 5597 | #: object-file.c:1935 |
473eb541 JX |
5598 | msgid "unable to create temporary file" |
5599 | msgstr "无法创建临时文件" | |
87cb7997 | 5600 | |
ec3d4607 | 5601 | #: object-file.c:1959 |
473eb541 JX |
5602 | msgid "unable to write loose object file" |
5603 | msgstr "不能写松散对象文件" | |
87cb7997 | 5604 | |
ec3d4607 | 5605 | #: object-file.c:1965 |
473eb541 JX |
5606 | #, c-format |
5607 | msgid "unable to deflate new object %s (%d)" | |
5608 | msgstr "不能压缩新对象 %s(%d)" | |
87cb7997 | 5609 | |
ec3d4607 | 5610 | #: object-file.c:1969 |
87cb7997 | 5611 | #, c-format |
473eb541 JX |
5612 | msgid "deflateEnd on object %s failed (%d)" |
5613 | msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" | |
87cb7997 | 5614 | |
ec3d4607 | 5615 | #: object-file.c:1973 |
473eb541 JX |
5616 | #, c-format |
5617 | msgid "confused by unstable object source data for %s" | |
5618 | msgstr "被 %s 的不稳定对象源数据搞糊涂了" | |
a0b6b246 | 5619 | |
ec3d4607 | 5620 | #: object-file.c:1983 builtin/pack-objects.c:1237 |
473eb541 JX |
5621 | #, c-format |
5622 | msgid "failed utime() on %s" | |
5623 | msgstr "在 %s 上调用 utime() 失败" | |
5b04ee3b | 5624 | |
ec3d4607 | 5625 | #: object-file.c:2060 |
473eb541 JX |
5626 | #, c-format |
5627 | msgid "cannot read object for %s" | |
5628 | msgstr "不能读取对象 %s" | |
a0b6b246 | 5629 | |
ec3d4607 | 5630 | #: object-file.c:2111 |
473eb541 JX |
5631 | msgid "corrupt commit" |
5632 | msgstr "损坏的提交" | |
5633 | ||
ec3d4607 | 5634 | #: object-file.c:2119 |
473eb541 JX |
5635 | msgid "corrupt tag" |
5636 | msgstr "损坏的标签" | |
5637 | ||
ec3d4607 | 5638 | #: object-file.c:2219 |
5b04ee3b | 5639 | #, c-format |
473eb541 JX |
5640 | msgid "read error while indexing %s" |
5641 | msgstr "索引 %s 时读取错误" | |
5b04ee3b | 5642 | |
ec3d4607 | 5643 | #: object-file.c:2222 |
5b04ee3b | 5644 | #, c-format |
473eb541 JX |
5645 | msgid "short read while indexing %s" |
5646 | msgstr "索引 %s 时读入不完整" | |
5b04ee3b | 5647 | |
ec3d4607 | 5648 | #: object-file.c:2295 object-file.c:2305 |
5b04ee3b | 5649 | #, c-format |
473eb541 JX |
5650 | msgid "%s: failed to insert into database" |
5651 | msgstr "%s:插入数据库失败" | |
5b04ee3b | 5652 | |
ec3d4607 | 5653 | #: object-file.c:2311 |
5b04ee3b | 5654 | #, c-format |
473eb541 JX |
5655 | msgid "%s: unsupported file type" |
5656 | msgstr "%s:不支持的文件类型" | |
5b04ee3b | 5657 | |
ec3d4607 | 5658 | #: object-file.c:2335 |
5b04ee3b | 5659 | #, c-format |
473eb541 JX |
5660 | msgid "%s is not a valid object" |
5661 | msgstr "%s 不是一个有效的对象" | |
5b04ee3b | 5662 | |
ec3d4607 | 5663 | #: object-file.c:2337 |
5b04ee3b | 5664 | #, c-format |
473eb541 JX |
5665 | msgid "%s is not a valid '%s' object" |
5666 | msgstr "%s 不是一个有效的 '%s' 对象" | |
5b04ee3b | 5667 | |
ec3d4607 | 5668 | #: object-file.c:2364 builtin/index-pack.c:192 |
5b04ee3b | 5669 | #, c-format |
473eb541 JX |
5670 | msgid "unable to open %s" |
5671 | msgstr "不能打开 %s" | |
a0b6b246 | 5672 | |
ec3d4607 | 5673 | #: object-file.c:2559 object-file.c:2612 |
5b04ee3b | 5674 | #, c-format |
473eb541 JX |
5675 | msgid "hash mismatch for %s (expected %s)" |
5676 | msgstr "%s 的哈希值不匹配(预期 %s)" | |
a0b6b246 | 5677 | |
ec3d4607 | 5678 | #: object-file.c:2583 |
ddc12c42 | 5679 | #, c-format |
473eb541 JX |
5680 | msgid "unable to mmap %s" |
5681 | msgstr "不能 mmap %s" | |
ddc12c42 | 5682 | |
ec3d4607 | 5683 | #: object-file.c:2588 |
473eb541 JX |
5684 | #, c-format |
5685 | msgid "unable to unpack header of %s" | |
5686 | msgstr "无法解压缩 %s 的头部" | |
d46c5519 | 5687 | |
ec3d4607 | 5688 | #: object-file.c:2594 |
473eb541 JX |
5689 | #, c-format |
5690 | msgid "unable to parse header of %s" | |
5691 | msgstr "无法解析 %s 的头部" | |
d46c5519 | 5692 | |
ec3d4607 | 5693 | #: object-file.c:2605 |
473eb541 JX |
5694 | #, c-format |
5695 | msgid "unable to unpack contents of %s" | |
5696 | msgstr "无法解压缩 %s 的内容" | |
7157c2b5 | 5697 | |
ec3d4607 | 5698 | #: object-name.c:480 |
473eb541 JX |
5699 | #, c-format |
5700 | msgid "short object ID %s is ambiguous" | |
5701 | msgstr "短对象ID %s 存在歧义" | |
c1ac5258 | 5702 | |
ec3d4607 | 5703 | #: object-name.c:491 |
473eb541 JX |
5704 | msgid "The candidates are:" |
5705 | msgstr "候选者有:" | |
c1ac5258 | 5706 | |
ec3d4607 | 5707 | #: object-name.c:790 |
473eb541 JX |
5708 | msgid "" |
5709 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
5710 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
5711 | "may be created by mistake. For example,\n" | |
5712 | "\n" | |
5713 | " git switch -c $br $(git rev-parse ...)\n" | |
5714 | "\n" | |
5715 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
5716 | "examine these refs and maybe delete them. Turn this message off by\n" | |
5717 | "running \"git config advice.objectNameWarning false\"" | |
5718 | msgstr "" | |
5719 | "Git 通常不会创建一个以40个十六进制字符结尾的引用,因为当您只提供40\n" | |
5720 | "个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n" | |
5721 | "\n" | |
5722 | " git switch -c $br $(git rev-parse ...)\n" | |
5723 | "\n" | |
5724 | "当 \"$br\" 某种原因空白时,一个40位十六进制的引用将被创建。请检查这些\n" | |
5725 | "引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n" | |
5726 | "false\" 命令关闭本消息通知。" | |
c1ac5258 | 5727 | |
ec3d4607 | 5728 | #: object-name.c:910 |
473eb541 JX |
5729 | #, c-format |
5730 | msgid "log for '%.*s' only goes back to %s" | |
5731 | msgstr "'%.*s' 的日志仅能回到 %s" | |
c1ac5258 | 5732 | |
ec3d4607 | 5733 | #: object-name.c:918 |
473eb541 JX |
5734 | #, c-format |
5735 | msgid "log for '%.*s' only has %d entries" | |
5736 | msgstr "'%.*s' 的日志仅有 %d 个条目" | |
c1ac5258 | 5737 | |
ec3d4607 | 5738 | #: object-name.c:1696 |
473eb541 JX |
5739 | #, c-format |
5740 | msgid "path '%s' exists on disk, but not in '%.*s'" | |
5741 | msgstr "路径 '%s' 在磁盘上,但是不在 '%.*s' 中" | |
c1ac5258 | 5742 | |
ec3d4607 | 5743 | #: object-name.c:1702 |
473eb541 JX |
5744 | #, c-format |
5745 | msgid "" | |
5746 | "path '%s' exists, but not '%s'\n" | |
5747 | "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" | |
5748 | msgstr "" | |
5749 | "路径 '%s' 存在,而 '%s' 不存在\n" | |
5750 | "提示:您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'?" | |
c1ac5258 | 5751 | |
ec3d4607 | 5752 | #: object-name.c:1711 |
c1ac5258 | 5753 | #, c-format |
473eb541 JX |
5754 | msgid "path '%s' does not exist in '%.*s'" |
5755 | msgstr "路径 '%s' 不在 '%.*s' 中" | |
c1ac5258 | 5756 | |
ec3d4607 | 5757 | #: object-name.c:1739 |
c1ac5258 | 5758 | #, c-format |
473eb541 JX |
5759 | msgid "" |
5760 | "path '%s' is in the index, but not at stage %d\n" | |
5761 | "hint: Did you mean ':%d:%s'?" | |
5762 | msgstr "" | |
5763 | "路径 '%s' 在索引中,但不在暂存区 %d 中\n" | |
5764 | "提示:您的意思是 ':%d:%s'?" | |
c1ac5258 | 5765 | |
ec3d4607 | 5766 | #: object-name.c:1755 |
06991777 | 5767 | #, c-format |
473eb541 JX |
5768 | msgid "" |
5769 | "path '%s' is in the index, but not '%s'\n" | |
5770 | "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" | |
5771 | msgstr "" | |
5772 | "路径 '%s' 在索引中,但 '%s' 不在\n" | |
5773 | "提示:您的意思是 ':%d:%s' 亦即 ':%d:./%s'?" | |
06991777 | 5774 | |
ec3d4607 | 5775 | #: object-name.c:1763 |
473eb541 JX |
5776 | #, c-format |
5777 | msgid "path '%s' exists on disk, but not in the index" | |
5778 | msgstr "路径 '%s' 在磁盘上,但不在索引里" | |
4c27fcb5 | 5779 | |
ec3d4607 | 5780 | #: object-name.c:1765 |
4c27fcb5 | 5781 | #, c-format |
473eb541 JX |
5782 | msgid "path '%s' does not exist (neither on disk nor in the index)" |
5783 | msgstr "路径 '%s' 不存在(既不在磁盘上,也不在索引中)" | |
4c27fcb5 | 5784 | |
ec3d4607 | 5785 | #: object-name.c:1778 |
473eb541 JX |
5786 | msgid "relative path syntax can't be used outside working tree" |
5787 | msgstr "不能在工作区之外使用相对路径语法" | |
a0b6b246 | 5788 | |
ec3d4607 | 5789 | #: object-name.c:1916 |
473eb541 JX |
5790 | #, c-format |
5791 | msgid "invalid object name '%.*s'." | |
5792 | msgstr "无效的对象名 '%.*s'。" | |
d9488fea | 5793 | |
473eb541 JX |
5794 | #: object.c:53 |
5795 | #, c-format | |
5796 | msgid "invalid object type \"%s\"" | |
5797 | msgstr "无效的对象类型 \"%s\"" | |
a5cd71ca | 5798 | |
473eb541 JX |
5799 | #: object.c:173 |
5800 | #, c-format | |
5801 | msgid "object %s is a %s, not a %s" | |
5802 | msgstr "对象 %s 是一个 %s,不是一个 %s" | |
d9488fea | 5803 | |
ec3d4607 | 5804 | #: object.c:250 |
a5cd71ca | 5805 | #, c-format |
473eb541 JX |
5806 | msgid "object %s has unknown type id %d" |
5807 | msgstr "对象 %s 有未知的类型 id %d" | |
a5cd71ca | 5808 | |
ec3d4607 | 5809 | #: object.c:263 |
473eb541 JX |
5810 | #, c-format |
5811 | msgid "unable to parse object: %s" | |
5812 | msgstr "不能解析对象:%s" | |
349ede6a | 5813 | |
ec3d4607 | 5814 | #: object.c:283 object.c:295 |
473eb541 JX |
5815 | #, c-format |
5816 | msgid "hash mismatch %s" | |
5817 | msgstr "哈希值与 %s 不匹配" | |
c1ac5258 | 5818 | |
ec3d4607 | 5819 | #: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411 |
473eb541 JX |
5820 | #, c-format |
5821 | msgid "unable to get size of %s" | |
5822 | msgstr "无法得到 %s 的大小" | |
c1ac5258 | 5823 | |
ec3d4607 | 5824 | #: pack-bitmap.c:1571 builtin/rev-list.c:92 |
c1ac5258 | 5825 | #, c-format |
473eb541 JX |
5826 | msgid "unable to get disk usage of %s" |
5827 | msgstr "无法得到 %s 的磁盘使用量" | |
c1ac5258 | 5828 | |
33b62fba | 5829 | #: pack-revindex.c:221 |
349ede6a | 5830 | #, c-format |
473eb541 JX |
5831 | msgid "reverse-index file %s is too small" |
5832 | msgstr "反向索引文件 %s 太小" | |
349ede6a | 5833 | |
33b62fba | 5834 | #: pack-revindex.c:226 |
a6cd2cc4 | 5835 | #, c-format |
473eb541 JX |
5836 | msgid "reverse-index file %s is corrupt" |
5837 | msgstr "反向索引文件 %s 损坏" | |
a6cd2cc4 | 5838 | |
33b62fba | 5839 | #: pack-revindex.c:234 |
473eb541 JX |
5840 | #, c-format |
5841 | msgid "reverse-index file %s has unknown signature" | |
5842 | msgstr "反向索引文件 %s 有错误的签名" | |
c1ac5258 | 5843 | |
33b62fba | 5844 | #: pack-revindex.c:238 |
c1ac5258 | 5845 | #, c-format |
473eb541 JX |
5846 | msgid "reverse-index file %s has unsupported version %<PRIu32>" |
5847 | msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>" | |
c1ac5258 | 5848 | |
33b62fba | 5849 | #: pack-revindex.c:243 |
06991777 | 5850 | #, c-format |
473eb541 JX |
5851 | msgid "reverse-index file %s has unsupported hash id %<PRIu32>" |
5852 | msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>" | |
06991777 | 5853 | |
33b62fba | 5854 | #: pack-write.c:250 |
473eb541 JX |
5855 | msgid "cannot both write and verify reverse index" |
5856 | msgstr "无法同时写入和校验反向索引" | |
06991777 | 5857 | |
33b62fba | 5858 | #: pack-write.c:271 |
06991777 | 5859 | #, c-format |
473eb541 JX |
5860 | msgid "could not stat: %s" |
5861 | msgstr "不能调用 stat:%s" | |
06991777 | 5862 | |
33b62fba | 5863 | #: pack-write.c:283 |
d46c5519 | 5864 | #, c-format |
473eb541 JX |
5865 | msgid "failed to make %s readable" |
5866 | msgstr "无法设置 %s 为可读" | |
d46c5519 | 5867 | |
33b62fba | 5868 | #: pack-write.c:522 |
06991777 | 5869 | #, c-format |
473eb541 JX |
5870 | msgid "could not write '%s' promisor file" |
5871 | msgstr "无法写入 '%s' 承诺者文件" | |
06991777 | 5872 | |
473eb541 JX |
5873 | #: packfile.c:625 |
5874 | msgid "offset before end of packfile (broken .idx?)" | |
5875 | msgstr "偏移量在包文件结束之前(损坏的 .idx?)" | |
06991777 | 5876 | |
ec3d4607 JX |
5877 | #: packfile.c:655 |
5878 | #, c-format | |
5879 | msgid "packfile %s cannot be mapped%s" | |
5880 | msgstr "包文件 %s 不能被映射%s" | |
5881 | ||
5882 | #: packfile.c:1934 | |
06991777 | 5883 | #, c-format |
473eb541 JX |
5884 | msgid "offset before start of pack index for %s (corrupt index?)" |
5885 | msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" | |
06991777 | 5886 | |
ec3d4607 | 5887 | #: packfile.c:1938 |
06991777 | 5888 | #, c-format |
473eb541 JX |
5889 | msgid "offset beyond end of pack index for %s (truncated index?)" |
5890 | msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" | |
06991777 | 5891 | |
473eb541 JX |
5892 | #: parse-options-cb.c:20 parse-options-cb.c:24 |
5893 | #, c-format | |
5894 | msgid "option `%s' expects a numerical value" | |
5895 | msgstr "选项 `%s' 期望一个数字值" | |
4c27fcb5 | 5896 | |
473eb541 | 5897 | #: parse-options-cb.c:41 |
5b04ee3b | 5898 | #, c-format |
473eb541 JX |
5899 | msgid "malformed expiration date '%s'" |
5900 | msgstr "格式错误的到期时间:'%s'" | |
5b04ee3b | 5901 | |
473eb541 | 5902 | #: parse-options-cb.c:54 |
5b04ee3b | 5903 | #, c-format |
473eb541 JX |
5904 | msgid "option `%s' expects \"always\", \"auto\", or \"never\"" |
5905 | msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" | |
5b04ee3b | 5906 | |
473eb541 | 5907 | #: parse-options-cb.c:132 parse-options-cb.c:149 |
06991777 | 5908 | #, c-format |
473eb541 JX |
5909 | msgid "malformed object name '%s'" |
5910 | msgstr "格式错误的对象名 '%s'" | |
06991777 | 5911 | |
473eb541 | 5912 | #: parse-options.c:38 |
06991777 | 5913 | #, c-format |
473eb541 JX |
5914 | msgid "%s requires a value" |
5915 | msgstr "%s 需要一个值" | |
06991777 | 5916 | |
473eb541 JX |
5917 | #: parse-options.c:73 |
5918 | #, c-format | |
5919 | msgid "%s is incompatible with %s" | |
5920 | msgstr "%s 与 %s 不兼容" | |
06991777 | 5921 | |
473eb541 | 5922 | #: parse-options.c:78 |
06991777 | 5923 | #, c-format |
473eb541 JX |
5924 | msgid "%s : incompatible with something else" |
5925 | msgstr "%s:和其它的不兼容" | |
06991777 | 5926 | |
473eb541 | 5927 | #: parse-options.c:92 parse-options.c:96 parse-options.c:317 |
06991777 | 5928 | #, c-format |
473eb541 JX |
5929 | msgid "%s takes no value" |
5930 | msgstr "%s 不取值" | |
06991777 | 5931 | |
473eb541 | 5932 | #: parse-options.c:94 |
06991777 | 5933 | #, c-format |
473eb541 JX |
5934 | msgid "%s isn't available" |
5935 | msgstr "%s 不可用" | |
06991777 | 5936 | |
473eb541 | 5937 | #: parse-options.c:217 |
4c27fcb5 | 5938 | #, c-format |
473eb541 JX |
5939 | msgid "%s expects a non-negative integer value with an optional k/m/g suffix" |
5940 | msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" | |
4c27fcb5 | 5941 | |
473eb541 JX |
5942 | #: parse-options.c:386 |
5943 | #, c-format | |
5944 | msgid "ambiguous option: %s (could be --%s%s or --%s%s)" | |
5945 | msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" | |
06991777 | 5946 | |
473eb541 | 5947 | #: parse-options.c:420 parse-options.c:428 |
06991777 | 5948 | #, c-format |
473eb541 JX |
5949 | msgid "did you mean `--%s` (with two dashes)?" |
5950 | msgstr "你的意思是 `--%s`(有两个短线)?" | |
06991777 | 5951 | |
33b62fba | 5952 | #: parse-options.c:668 parse-options.c:988 |
06991777 | 5953 | #, c-format |
473eb541 JX |
5954 | msgid "alias of --%s" |
5955 | msgstr "--%s 的别名" | |
06991777 | 5956 | |
33b62fba | 5957 | #: parse-options.c:879 |
473eb541 JX |
5958 | #, c-format |
5959 | msgid "unknown option `%s'" | |
5960 | msgstr "未知选项 `%s'" | |
4c27fcb5 | 5961 | |
33b62fba | 5962 | #: parse-options.c:881 |
4c27fcb5 | 5963 | #, c-format |
473eb541 JX |
5964 | msgid "unknown switch `%c'" |
5965 | msgstr "未知开关 `%c'" | |
4c27fcb5 | 5966 | |
33b62fba | 5967 | #: parse-options.c:883 |
4c27fcb5 | 5968 | #, c-format |
473eb541 JX |
5969 | msgid "unknown non-ascii option in string: `%s'" |
5970 | msgstr "字符串中未知的非 ascii 字符选项:`%s'" | |
5971 | ||
33b62fba | 5972 | #: parse-options.c:907 |
473eb541 JX |
5973 | msgid "..." |
5974 | msgstr "..." | |
4c27fcb5 | 5975 | |
33b62fba | 5976 | #: parse-options.c:926 |
06991777 | 5977 | #, c-format |
473eb541 JX |
5978 | msgid "usage: %s" |
5979 | msgstr "用法:%s" | |
06991777 | 5980 | |
473eb541 JX |
5981 | #. TRANSLATORS: the colon here should align with the |
5982 | #. one in "usage: %s" translation. | |
5983 | #. | |
33b62fba | 5984 | #: parse-options.c:932 |
06991777 | 5985 | #, c-format |
473eb541 JX |
5986 | msgid " or: %s" |
5987 | msgstr " 或:%s" | |
06991777 | 5988 | |
473eb541 | 5989 | # 译者:为保证在输出中对齐,注意调整句中空格! |
33b62fba | 5990 | #: parse-options.c:935 |
06991777 | 5991 | #, c-format |
473eb541 JX |
5992 | msgid " %s" |
5993 | msgstr " %s" | |
5994 | ||
33b62fba | 5995 | #: parse-options.c:974 |
473eb541 JX |
5996 | msgid "-NUM" |
5997 | msgstr "-数字" | |
06991777 | 5998 | |
473eb541 | 5999 | #: path.c:915 |
06991777 | 6000 | #, c-format |
473eb541 JX |
6001 | msgid "Could not make %s writable by group" |
6002 | msgstr "不能设置 %s 为组可写" | |
6003 | ||
33b62fba | 6004 | #: pathspec.c:151 |
473eb541 JX |
6005 | msgid "Escape character '\\' not allowed as last character in attr value" |
6006 | msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" | |
6007 | ||
33b62fba | 6008 | #: pathspec.c:169 |
473eb541 JX |
6009 | msgid "Only one 'attr:' specification is allowed." |
6010 | msgstr "只允许一个 'attr:' 规格。" | |
6011 | ||
33b62fba | 6012 | #: pathspec.c:172 |
473eb541 JX |
6013 | msgid "attr spec must not be empty" |
6014 | msgstr "属性规格不能为空" | |
06991777 | 6015 | |
33b62fba | 6016 | #: pathspec.c:215 |
4c27fcb5 | 6017 | #, c-format |
473eb541 JX |
6018 | msgid "invalid attribute name %s" |
6019 | msgstr "无效的属性名 %s" | |
6020 | ||
33b62fba | 6021 | #: pathspec.c:280 |
473eb541 JX |
6022 | msgid "global 'glob' and 'noglob' pathspec settings are incompatible" |
6023 | msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" | |
6024 | ||
33b62fba | 6025 | #: pathspec.c:287 |
473eb541 JX |
6026 | msgid "" |
6027 | "global 'literal' pathspec setting is incompatible with all other global " | |
6028 | "pathspec settings" | |
6029 | msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" | |
6030 | ||
33b62fba | 6031 | #: pathspec.c:327 |
473eb541 JX |
6032 | msgid "invalid parameter for pathspec magic 'prefix'" |
6033 | msgstr "路径规格包含无效的神奇前缀" | |
4c27fcb5 | 6034 | |
33b62fba | 6035 | #: pathspec.c:348 |
4c27fcb5 | 6036 | #, c-format |
473eb541 JX |
6037 | msgid "Invalid pathspec magic '%.*s' in '%s'" |
6038 | msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" | |
4c27fcb5 | 6039 | |
33b62fba | 6040 | #: pathspec.c:353 |
06991777 | 6041 | #, c-format |
473eb541 JX |
6042 | msgid "Missing ')' at the end of pathspec magic in '%s'" |
6043 | msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" | |
06991777 | 6044 | |
33b62fba | 6045 | #: pathspec.c:391 |
06991777 | 6046 | #, c-format |
473eb541 JX |
6047 | msgid "Unimplemented pathspec magic '%c' in '%s'" |
6048 | msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" | |
06991777 | 6049 | |
33b62fba | 6050 | #: pathspec.c:450 |
a4f16749 | 6051 | #, c-format |
473eb541 JX |
6052 | msgid "%s: 'literal' and 'glob' are incompatible" |
6053 | msgstr "%s:'literal' 和 'glob' 不兼容" | |
a4f16749 | 6054 | |
33b62fba | 6055 | #: pathspec.c:466 |
87cb7997 | 6056 | #, c-format |
473eb541 JX |
6057 | msgid "%s: '%s' is outside repository at '%s'" |
6058 | msgstr "%s:'%s' 在位于 '%s' 的仓库之外" | |
87cb7997 | 6059 | |
33b62fba | 6060 | #: pathspec.c:542 |
87cb7997 | 6061 | #, c-format |
473eb541 JX |
6062 | msgid "'%s' (mnemonic: '%c')" |
6063 | msgstr "'%s'(助记符:'%c')" | |
87cb7997 | 6064 | |
33b62fba | 6065 | #: pathspec.c:552 |
87cb7997 | 6066 | #, c-format |
473eb541 JX |
6067 | msgid "%s: pathspec magic not supported by this command: %s" |
6068 | msgstr "%s:路径规格神奇前缀不被此命令支持:%s" | |
87cb7997 | 6069 | |
33b62fba | 6070 | #: pathspec.c:619 |
06991777 | 6071 | #, c-format |
473eb541 JX |
6072 | msgid "pathspec '%s' is beyond a symbolic link" |
6073 | msgstr "路径规格 '%s' 位于符号链接中" | |
06991777 | 6074 | |
33b62fba | 6075 | #: pathspec.c:664 |
06991777 | 6076 | #, c-format |
473eb541 JX |
6077 | msgid "line is badly quoted: %s" |
6078 | msgstr "行被错误地引用:%s" | |
06991777 | 6079 | |
473eb541 JX |
6080 | #: pkt-line.c:92 |
6081 | msgid "unable to write flush packet" | |
6082 | msgstr "无法写 flush 包" | |
2b472aae | 6083 | |
473eb541 JX |
6084 | #: pkt-line.c:99 |
6085 | msgid "unable to write delim packet" | |
6086 | msgstr "无法写 delim 包" | |
d46c5519 | 6087 | |
473eb541 | 6088 | #: pkt-line.c:106 |
ec3d4607 JX |
6089 | msgid "unable to write response end packet" |
6090 | msgstr "无法写入响应结束数据包" | |
4c27fcb5 | 6091 | |
473eb541 JX |
6092 | #: pkt-line.c:113 |
6093 | msgid "flush packet write failed" | |
6094 | msgstr "flush 包写错误" | |
d46c5519 | 6095 | |
33b62fba | 6096 | #: pkt-line.c:153 pkt-line.c:265 |
473eb541 JX |
6097 | msgid "protocol error: impossibly long line" |
6098 | msgstr "协议错误:不可能的长行" | |
4c27fcb5 | 6099 | |
473eb541 JX |
6100 | #: pkt-line.c:169 pkt-line.c:171 |
6101 | msgid "packet write with format failed" | |
6102 | msgstr "格式化包写入错误" | |
4c27fcb5 | 6103 | |
33b62fba | 6104 | #: pkt-line.c:204 |
473eb541 JX |
6105 | msgid "packet write failed - data exceeds max packet size" |
6106 | msgstr "写数据包失败:数据超过了包的最大长度" | |
4c27fcb5 | 6107 | |
33b62fba JX |
6108 | #: pkt-line.c:222 |
6109 | #, c-format | |
6110 | msgid "packet write failed: %s" | |
6111 | msgstr "数据包写入失败:%s" | |
4c27fcb5 | 6112 | |
33b62fba | 6113 | #: pkt-line.c:328 pkt-line.c:329 |
473eb541 JX |
6114 | msgid "read error" |
6115 | msgstr "读取错误" | |
d46c5519 | 6116 | |
33b62fba | 6117 | #: pkt-line.c:339 pkt-line.c:340 |
473eb541 JX |
6118 | msgid "the remote end hung up unexpectedly" |
6119 | msgstr "远端意外挂断了" | |
d46c5519 | 6120 | |
33b62fba | 6121 | #: pkt-line.c:369 pkt-line.c:371 |
d46c5519 | 6122 | #, c-format |
473eb541 JX |
6123 | msgid "protocol error: bad line length character: %.4s" |
6124 | msgstr "协议错误:错误的行长度字符串:%.4s" | |
d46c5519 | 6125 | |
33b62fba | 6126 | #: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 |
d46c5519 | 6127 | #, c-format |
473eb541 JX |
6128 | msgid "protocol error: bad line length %d" |
6129 | msgstr "协议错误:错误的行长度 %d" | |
4c27fcb5 | 6130 | |
33b62fba | 6131 | #: pkt-line.c:413 sideband.c:165 |
2b472aae | 6132 | #, c-format |
473eb541 JX |
6133 | msgid "remote error: %s" |
6134 | msgstr "远程错误:%s" | |
2b472aae | 6135 | |
473eb541 JX |
6136 | #: preload-index.c:125 |
6137 | msgid "Refreshing index" | |
6138 | msgstr "正在刷新索引" | |
c1ac5258 | 6139 | |
473eb541 | 6140 | #: preload-index.c:144 |
c1ac5258 | 6141 | #, c-format |
473eb541 JX |
6142 | msgid "unable to create threaded lstat: %s" |
6143 | msgstr "无法创建线程 lstat:%s" | |
c1ac5258 | 6144 | |
33b62fba | 6145 | #: pretty.c:988 |
473eb541 JX |
6146 | msgid "unable to parse --pretty format" |
6147 | msgstr "不能解析 --pretty 格式" | |
c1ac5258 | 6148 | |
ec3d4607 | 6149 | #: promisor-remote.c:31 |
473eb541 JX |
6150 | msgid "promisor-remote: unable to fork off fetch subprocess" |
6151 | msgstr "promisor-remote:无法派生 fetch 子进程" | |
c1ac5258 | 6152 | |
ec3d4607 | 6153 | #: promisor-remote.c:38 promisor-remote.c:40 |
473eb541 JX |
6154 | msgid "promisor-remote: could not write to fetch subprocess" |
6155 | msgstr "promisor-remote:无法向 fetch 子进程写入" | |
c1ac5258 | 6156 | |
ec3d4607 | 6157 | #: promisor-remote.c:44 |
473eb541 JX |
6158 | msgid "promisor-remote: could not close stdin to fetch subprocess" |
6159 | msgstr "promisor-remote:无法关闭至 fetch 子进程的标准输入" | |
c1ac5258 | 6160 | |
ec3d4607 | 6161 | #: promisor-remote.c:54 |
c1ac5258 | 6162 | #, c-format |
473eb541 JX |
6163 | msgid "promisor remote name cannot begin with '/': %s" |
6164 | msgstr "promisor 远程名称不能以 '/' 开始:%s" | |
c1ac5258 | 6165 | |
33b62fba JX |
6166 | #: protocol-caps.c:103 |
6167 | msgid "object-info: expected flush after arguments" | |
6168 | msgstr "object-info:在参数之后应有一个 flush" | |
6169 | ||
473eb541 JX |
6170 | #: prune-packed.c:35 |
6171 | msgid "Removing duplicate objects" | |
6172 | msgstr "正在删除重复对象" | |
c1ac5258 | 6173 | |
473eb541 JX |
6174 | #: range-diff.c:78 |
6175 | msgid "could not start `log`" | |
6176 | msgstr "不能启动 `log`" | |
5b04ee3b | 6177 | |
473eb541 JX |
6178 | #: range-diff.c:80 |
6179 | msgid "could not read `log` output" | |
6180 | msgstr "不能读取 `log` 的输出" | |
c1ac5258 | 6181 | |
ec3d4607 | 6182 | #: range-diff.c:101 sequencer.c:5550 |
c1ac5258 | 6183 | #, c-format |
473eb541 JX |
6184 | msgid "could not parse commit '%s'" |
6185 | msgstr "不能解析提交 '%s'" | |
c1ac5258 | 6186 | |
473eb541 | 6187 | #: range-diff.c:115 |
c1ac5258 | 6188 | #, c-format |
473eb541 JX |
6189 | msgid "" |
6190 | "could not parse first line of `log` output: did not start with 'commit ': " | |
6191 | "'%s'" | |
6192 | msgstr "无法解析 `log` 输出的首行:不是以 'commit ' 开头:'%s'" | |
c1ac5258 | 6193 | |
473eb541 | 6194 | #: range-diff.c:140 |
c1ac5258 | 6195 | #, c-format |
473eb541 JX |
6196 | msgid "could not parse git header '%.*s'" |
6197 | msgstr "无法解析 git 头 '%.*s'" | |
c1ac5258 | 6198 | |
ec3d4607 | 6199 | #: range-diff.c:307 |
473eb541 JX |
6200 | msgid "failed to generate diff" |
6201 | msgstr "生成 diff 失败" | |
c1ac5258 | 6202 | |
ec3d4607 | 6203 | #: range-diff.c:559 |
473eb541 JX |
6204 | msgid "--left-only and --right-only are mutually exclusive" |
6205 | msgstr "--left-only 和 --right-only 互斥" | |
1a79b2f1 | 6206 | |
ec3d4607 | 6207 | #: range-diff.c:562 range-diff.c:564 |
a0b6b246 | 6208 | #, c-format |
473eb541 JX |
6209 | msgid "could not parse log for '%s'" |
6210 | msgstr "不能解析 '%s' 的日志" | |
90314792 | 6211 | |
ec3d4607 | 6212 | #: read-cache.c:710 |
a0b6b246 | 6213 | #, c-format |
473eb541 JX |
6214 | msgid "will not add file alias '%s' ('%s' already exists in index)" |
6215 | msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" | |
6216 | ||
ec3d4607 | 6217 | #: read-cache.c:726 |
473eb541 JX |
6218 | msgid "cannot create an empty blob in the object database" |
6219 | msgstr "不能在对象数据库中创建空的数据对象" | |
90314792 | 6220 | |
ec3d4607 | 6221 | #: read-cache.c:748 |
d9488fea | 6222 | #, c-format |
473eb541 JX |
6223 | msgid "%s: can only add regular files, symbolic links or git-directories" |
6224 | msgstr "%s:只能添加常规文件、符号链接或 git 目录" | |
d9488fea | 6225 | |
ec3d4607 | 6226 | #: read-cache.c:753 |
87cb7997 | 6227 | #, c-format |
473eb541 JX |
6228 | msgid "'%s' does not have a commit checked out" |
6229 | msgstr "'%s' 没有检出一个提交" | |
87cb7997 | 6230 | |
ec3d4607 | 6231 | #: read-cache.c:805 |
a0b6b246 | 6232 | #, c-format |
473eb541 JX |
6233 | msgid "unable to index file '%s'" |
6234 | msgstr "无法索引文件 '%s'" | |
90314792 | 6235 | |
ec3d4607 | 6236 | #: read-cache.c:824 |
a0b6b246 | 6237 | #, c-format |
473eb541 JX |
6238 | msgid "unable to add '%s' to index" |
6239 | msgstr "无法在索引中添加 '%s'" | |
90314792 | 6240 | |
ec3d4607 | 6241 | #: read-cache.c:835 |
5c57d762 | 6242 | #, c-format |
473eb541 JX |
6243 | msgid "unable to stat '%s'" |
6244 | msgstr "无法对 %s 执行 stat" | |
5c57d762 | 6245 | |
ec3d4607 | 6246 | #: read-cache.c:1358 |
1b7f4a34 | 6247 | #, c-format |
473eb541 JX |
6248 | msgid "'%s' appears as both a file and as a directory" |
6249 | msgstr "'%s' 看起来既是文件又是目录" | |
1b7f4a34 | 6250 | |
ec3d4607 | 6251 | #: read-cache.c:1573 |
473eb541 JX |
6252 | msgid "Refresh index" |
6253 | msgstr "刷新索引" | |
1b7f4a34 | 6254 | |
ec3d4607 | 6255 | #: read-cache.c:1705 |
1b7f4a34 | 6256 | #, c-format |
473eb541 JX |
6257 | msgid "" |
6258 | "index.version set, but the value is invalid.\n" | |
6259 | "Using version %i" | |
6260 | msgstr "" | |
6261 | "设置了 index.version,但是取值无效。\n" | |
6262 | "使用版本 %i" | |
1b7f4a34 | 6263 | |
ec3d4607 | 6264 | #: read-cache.c:1715 |
87cb7997 | 6265 | #, c-format |
473eb541 JX |
6266 | msgid "" |
6267 | "GIT_INDEX_VERSION set, but the value is invalid.\n" | |
6268 | "Using version %i" | |
6269 | msgstr "" | |
6270 | "设置了 GIT_INDEX_VERSION,但是取值无效。\n" | |
6271 | "使用版本 %i" | |
87cb7997 | 6272 | |
ec3d4607 | 6273 | #: read-cache.c:1771 |
07432cef | 6274 | #, c-format |
473eb541 JX |
6275 | msgid "bad signature 0x%08x" |
6276 | msgstr "坏的签名 0x%08x" | |
ef317cd5 | 6277 | |
ec3d4607 | 6278 | #: read-cache.c:1774 |
a0b6b246 | 6279 | #, c-format |
473eb541 JX |
6280 | msgid "bad index version %d" |
6281 | msgstr "坏的索引版本 %d" | |
220c313c | 6282 | |
ec3d4607 | 6283 | #: read-cache.c:1783 |
473eb541 JX |
6284 | msgid "bad index file sha1 signature" |
6285 | msgstr "坏的索引文件 sha1 签名" | |
4c27fcb5 | 6286 | |
ec3d4607 | 6287 | #: read-cache.c:1817 |
87cb7997 | 6288 | #, c-format |
473eb541 JX |
6289 | msgid "index uses %.4s extension, which we do not understand" |
6290 | msgstr "索引使用不被支持的 %.4s 扩展" | |
87cb7997 | 6291 | |
473eb541 | 6292 | # |
ec3d4607 | 6293 | #: read-cache.c:1819 |
87cb7997 | 6294 | #, c-format |
473eb541 JX |
6295 | msgid "ignoring %.4s extension" |
6296 | msgstr "忽略 %.4s 扩展" | |
87cb7997 | 6297 | |
ec3d4607 | 6298 | #: read-cache.c:1856 |
87cb7997 | 6299 | #, c-format |
473eb541 JX |
6300 | msgid "unknown index entry format 0x%08x" |
6301 | msgstr "未知的索引条目格式 0x%08x" | |
87cb7997 | 6302 | |
ec3d4607 | 6303 | #: read-cache.c:1872 |
87cb7997 | 6304 | #, c-format |
473eb541 JX |
6305 | msgid "malformed name field in the index, near path '%s'" |
6306 | msgstr "索引中靠近路径 '%s' 有错误的名称字段" | |
6307 | ||
ec3d4607 | 6308 | #: read-cache.c:1929 |
473eb541 JX |
6309 | msgid "unordered stage entries in index" |
6310 | msgstr "索引中有未排序的暂存条目" | |
87cb7997 | 6311 | |
ec3d4607 | 6312 | #: read-cache.c:1932 |
87cb7997 | 6313 | #, c-format |
473eb541 JX |
6314 | msgid "multiple stage entries for merged file '%s'" |
6315 | msgstr "合并文件 '%s' 有多个暂存条目" | |
87cb7997 | 6316 | |
ec3d4607 | 6317 | #: read-cache.c:1935 |
87cb7997 | 6318 | #, c-format |
473eb541 JX |
6319 | msgid "unordered stage entries for '%s'" |
6320 | msgstr "'%s' 的未排序暂存条目" | |
87cb7997 | 6321 | |
ec3d4607 JX |
6322 | #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095 |
6323 | #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183 | |
6324 | #: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987 | |
33b62fba JX |
6325 | #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505 |
6326 | #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291 | |
ec3d4607 | 6327 | #: builtin/submodule--helper.c:333 |
473eb541 JX |
6328 | msgid "index file corrupt" |
6329 | msgstr "索引文件损坏" | |
6330 | ||
ec3d4607 | 6331 | #: read-cache.c:2185 |
87cb7997 | 6332 | #, c-format |
473eb541 JX |
6333 | msgid "unable to create load_cache_entries thread: %s" |
6334 | msgstr "无法创建 load_cache_entries 线程:%s" | |
87cb7997 | 6335 | |
ec3d4607 | 6336 | #: read-cache.c:2198 |
7aea43ff | 6337 | #, c-format |
473eb541 JX |
6338 | msgid "unable to join load_cache_entries thread: %s" |
6339 | msgstr "无法加入 load_cache_entries 线程:%s" | |
7aea43ff | 6340 | |
ec3d4607 | 6341 | #: read-cache.c:2231 |
7aea43ff | 6342 | #, c-format |
473eb541 JX |
6343 | msgid "%s: index file open failed" |
6344 | msgstr "%s:打开索引文件失败" | |
7aea43ff | 6345 | |
ec3d4607 | 6346 | #: read-cache.c:2235 |
87cb7997 | 6347 | #, c-format |
473eb541 JX |
6348 | msgid "%s: cannot stat the open index" |
6349 | msgstr "%s:不能对打开的索引执行 stat 操作" | |
c04f5ac3 | 6350 | |
ec3d4607 | 6351 | #: read-cache.c:2239 |
c04f5ac3 | 6352 | #, c-format |
473eb541 JX |
6353 | msgid "%s: index file smaller than expected" |
6354 | msgstr "%s:索引文件比预期的小" | |
c04f5ac3 | 6355 | |
ec3d4607 | 6356 | #: read-cache.c:2243 |
a0b6b246 | 6357 | #, c-format |
ec3d4607 JX |
6358 | msgid "%s: unable to map index file%s" |
6359 | msgstr "%s:无法映射索引文件%s" | |
6792b93b | 6360 | |
ec3d4607 | 6361 | #: read-cache.c:2286 |
473eb541 JX |
6362 | #, c-format |
6363 | msgid "unable to create load_index_extensions thread: %s" | |
6364 | msgstr "无法创建 load_index_extensions 线程:%s" | |
87cb7997 | 6365 | |
ec3d4607 | 6366 | #: read-cache.c:2313 |
a0b6b246 | 6367 | #, c-format |
473eb541 JX |
6368 | msgid "unable to join load_index_extensions thread: %s" |
6369 | msgstr "无法加入 load_index_extensions 线程:%s" | |
c04f5ac3 | 6370 | |
ec3d4607 | 6371 | #: read-cache.c:2351 |
a0b6b246 | 6372 | #, c-format |
473eb541 JX |
6373 | msgid "could not freshen shared index '%s'" |
6374 | msgstr "无法刷新共享索引 '%s'" | |
6792b93b | 6375 | |
ec3d4607 | 6376 | #: read-cache.c:2398 |
a0b6b246 | 6377 | #, c-format |
473eb541 JX |
6378 | msgid "broken index, expect %s in %s, got %s" |
6379 | msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" | |
c04f5ac3 | 6380 | |
ec3d4607 | 6381 | #: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146 |
a0b6b246 | 6382 | #, c-format |
473eb541 JX |
6383 | msgid "could not close '%s'" |
6384 | msgstr "不能关闭 '%s'" | |
c04f5ac3 | 6385 | |
ec3d4607 | 6386 | #: read-cache.c:3075 |
33b62fba JX |
6387 | msgid "failed to convert to a sparse-index" |
6388 | msgstr "无法转换为稀疏索引" | |
6389 | ||
ec3d4607 | 6390 | #: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440 |
349ede6a | 6391 | #, c-format |
473eb541 JX |
6392 | msgid "could not stat '%s'" |
6393 | msgstr "不能对 '%s' 调用 stat" | |
349ede6a | 6394 | |
ec3d4607 | 6395 | #: read-cache.c:3159 |
a0b6b246 | 6396 | #, c-format |
473eb541 JX |
6397 | msgid "unable to open git dir: %s" |
6398 | msgstr "不能打开 git 目录:%s" | |
c04f5ac3 | 6399 | |
ec3d4607 | 6400 | #: read-cache.c:3171 |
a0b6b246 | 6401 | #, c-format |
473eb541 JX |
6402 | msgid "unable to unlink: %s" |
6403 | msgstr "无法删除:%s" | |
c04f5ac3 | 6404 | |
ec3d4607 | 6405 | #: read-cache.c:3200 |
06991777 | 6406 | #, c-format |
473eb541 JX |
6407 | msgid "cannot fix permission bits on '%s'" |
6408 | msgstr "不能修复 '%s' 的权限位" | |
06991777 | 6409 | |
ec3d4607 | 6410 | #: read-cache.c:3349 |
349ede6a | 6411 | #, c-format |
473eb541 JX |
6412 | msgid "%s: cannot drop to stage #0" |
6413 | msgstr "%s:不能落到暂存区 #0" | |
349ede6a | 6414 | |
473eb541 JX |
6415 | #: rebase-interactive.c:11 |
6416 | msgid "" | |
6417 | "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" | |
6418 | "continue'.\n" | |
6419 | "Or you can abort the rebase with 'git rebase --abort'.\n" | |
6420 | msgstr "" | |
6421 | "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" | |
6422 | "或者您可以用 'git rebase --abort' 终止变基。\n" | |
6423 | ||
6424 | #: rebase-interactive.c:33 | |
d13389bf JX |
6425 | #, c-format |
6426 | msgid "" | |
473eb541 JX |
6427 | "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." |
6428 | msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" | |
6429 | ||
6430 | #: rebase-interactive.c:42 | |
6431 | msgid "" | |
d13389bf | 6432 | "\n" |
473eb541 JX |
6433 | "Commands:\n" |
6434 | "p, pick <commit> = use commit\n" | |
6435 | "r, reword <commit> = use commit, but edit the commit message\n" | |
6436 | "e, edit <commit> = use commit, but stop for amending\n" | |
6437 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
33b62fba JX |
6438 | "f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" |
6439 | " commit's log message, unless -C is used, in which case\n" | |
6440 | " keep only this commit's message; -c is same as -C but\n" | |
6441 | " opens the editor\n" | |
473eb541 JX |
6442 | "x, exec <command> = run command (the rest of the line) using shell\n" |
6443 | "b, break = stop here (continue rebase later with 'git rebase --continue')\n" | |
6444 | "d, drop <commit> = remove commit\n" | |
6445 | "l, label <label> = label current HEAD with a name\n" | |
6446 | "t, reset <label> = reset HEAD to a label\n" | |
6447 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
6448 | ". create a merge commit using the original merge commit's\n" | |
6449 | ". message (or the oneline, if no original merge commit was\n" | |
33b62fba | 6450 | ". specified); use -c <commit> to reword the commit message\n" |
d13389bf | 6451 | "\n" |
473eb541 | 6452 | "These lines can be re-ordered; they are executed from top to bottom.\n" |
d13389bf | 6453 | msgstr "" |
d13389bf | 6454 | "\n" |
473eb541 JX |
6455 | "命令:\n" |
6456 | "p, pick <提交> = 使用提交\n" | |
33b62fba JX |
6457 | "r, reword <提交> = 使用提交,但编辑提交说明\n" |
6458 | "e, edit <提交> = 使用提交,但停止以便在 shell 中修补提交\n" | |
6459 | "s, squash <提交> = 使用提交,但挤压到前一个提交\n" | |
6460 | "f, fixup [-C | -c] <提交> = 类似于 \"squash\",但只保留前一个提交\n" | |
6461 | " 的提交说明,除非使用了 -C 参数,此情况下则只\n" | |
6462 | " 保留本提交说明。使用 -c 和 -C 类似,但会打开\n" | |
6463 | " 编辑器修改提交说明\n" | |
473eb541 JX |
6464 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" |
6465 | "b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n" | |
6466 | "d, drop <提交> = 删除提交\n" | |
6467 | "l, label <label> = 为当前 HEAD 打上标记\n" | |
6468 | "t, reset <label> = 重置 HEAD 到该标记\n" | |
6469 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
6470 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
6471 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
6472 | ". -c <提交> 可以编辑提交说明。\n" | |
d13389bf | 6473 | "\n" |
473eb541 | 6474 | "可以对这些行重新排序,将从上至下执行。\n" |
7157c2b5 | 6475 | |
33b62fba | 6476 | #: rebase-interactive.c:66 |
7157c2b5 | 6477 | #, c-format |
473eb541 JX |
6478 | msgid "Rebase %s onto %s (%d command)" |
6479 | msgid_plural "Rebase %s onto %s (%d commands)" | |
6480 | msgstr[0] "变基 %s 到 %s(%d 个提交)" | |
6481 | msgstr[1] "变基 %s 到 %s(%d 个提交)" | |
7157c2b5 | 6482 | |
33b62fba | 6483 | #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218 |
473eb541 JX |
6484 | msgid "" |
6485 | "\n" | |
6486 | "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" | |
6487 | msgstr "" | |
6488 | "\n" | |
6489 | "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" | |
349ede6a | 6490 | |
33b62fba | 6491 | #: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222 |
473eb541 JX |
6492 | msgid "" |
6493 | "\n" | |
6494 | "If you remove a line here THAT COMMIT WILL BE LOST.\n" | |
6495 | msgstr "" | |
6496 | "\n" | |
6497 | "如果您在这里删除一行,对应的提交将会丢失。\n" | |
349ede6a | 6498 | |
33b62fba | 6499 | #: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861 |
473eb541 JX |
6500 | msgid "" |
6501 | "\n" | |
6502 | "You are editing the todo file of an ongoing interactive rebase.\n" | |
6503 | "To continue rebase after editing, run:\n" | |
6504 | " git rebase --continue\n" | |
6505 | "\n" | |
6506 | msgstr "" | |
6507 | "\n" | |
6508 | "您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n" | |
6509 | "请执行:\n" | |
6510 | " git rebase --continue\n" | |
6511 | "\n" | |
349ede6a | 6512 | |
33b62fba | 6513 | #: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938 |
473eb541 JX |
6514 | msgid "" |
6515 | "\n" | |
6516 | "However, if you remove everything, the rebase will be aborted.\n" | |
6517 | "\n" | |
6518 | msgstr "" | |
6519 | "\n" | |
6520 | "然而,如果您删除全部内容,变基操作将会终止。\n" | |
6521 | "\n" | |
349ede6a | 6522 | |
ec3d4607 JX |
6523 | #: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836 |
6524 | #: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271 | |
349ede6a | 6525 | #, c-format |
473eb541 JX |
6526 | msgid "could not write '%s'" |
6527 | msgstr "不能写入 '%s'" | |
349ede6a | 6528 | |
33b62fba JX |
6529 | #: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 |
6530 | #: builtin/rebase.c:253 | |
349ede6a | 6531 | #, c-format |
473eb541 JX |
6532 | msgid "could not write '%s'." |
6533 | msgstr "不能写入 '%s'。" | |
349ede6a | 6534 | |
33b62fba | 6535 | #: rebase-interactive.c:196 |
349ede6a | 6536 | #, c-format |
473eb541 JX |
6537 | msgid "" |
6538 | "Warning: some commits may have been dropped accidentally.\n" | |
6539 | "Dropped commits (newer to older):\n" | |
6540 | msgstr "" | |
6541 | "警告:一些提交可能被意外丢弃。\n" | |
6542 | "丢弃的提交(从新到旧):\n" | |
7157c2b5 | 6543 | |
33b62fba | 6544 | #: rebase-interactive.c:203 |
349ede6a | 6545 | #, c-format |
473eb541 JX |
6546 | msgid "" |
6547 | "To avoid this message, use \"drop\" to explicitly remove a commit.\n" | |
6548 | "\n" | |
6549 | "Use 'git config rebase.missingCommitsCheck' to change the level of " | |
6550 | "warnings.\n" | |
6551 | "The possible behaviours are: ignore, warn, error.\n" | |
6552 | "\n" | |
6553 | msgstr "" | |
6554 | "为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" | |
6555 | "\n" | |
6556 | "使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" | |
6557 | "可选值有:ignore、warn、error。\n" | |
6558 | "\n" | |
349ede6a | 6559 | |
33b62fba JX |
6560 | #: rebase-interactive.c:236 rebase-interactive.c:241 sequencer.c:2597 |
6561 | #: builtin/rebase.c:189 builtin/rebase.c:214 builtin/rebase.c:240 | |
6562 | #: builtin/rebase.c:265 | |
349ede6a | 6563 | #, c-format |
473eb541 JX |
6564 | msgid "could not read '%s'." |
6565 | msgstr "不能读取 '%s'。" | |
349ede6a | 6566 | |
ec3d4607 | 6567 | #: ref-filter.c:42 wt-status.c:2036 |
473eb541 JX |
6568 | msgid "gone" |
6569 | msgstr "丢失" | |
349ede6a | 6570 | |
473eb541 | 6571 | #: ref-filter.c:43 |
349ede6a | 6572 | #, c-format |
473eb541 JX |
6573 | msgid "ahead %d" |
6574 | msgstr "领先 %d" | |
349ede6a | 6575 | |
473eb541 | 6576 | #: ref-filter.c:44 |
349ede6a | 6577 | #, c-format |
473eb541 JX |
6578 | msgid "behind %d" |
6579 | msgstr "落后 %d" | |
349ede6a | 6580 | |
473eb541 | 6581 | #: ref-filter.c:45 |
349ede6a | 6582 | #, c-format |
473eb541 JX |
6583 | msgid "ahead %d, behind %d" |
6584 | msgstr "领先 %d,落后 %d" | |
349ede6a | 6585 | |
ec3d4607 | 6586 | #: ref-filter.c:230 |
06991777 | 6587 | #, c-format |
473eb541 JX |
6588 | msgid "expected format: %%(color:<color>)" |
6589 | msgstr "期望的格式:%%(color:<颜色>)" | |
06991777 | 6590 | |
ec3d4607 | 6591 | #: ref-filter.c:232 |
a0b6b246 | 6592 | #, c-format |
473eb541 JX |
6593 | msgid "unrecognized color: %%(color:%s)" |
6594 | msgstr "未能识别的颜色:%%(color:%s)" | |
c04f5ac3 | 6595 | |
ec3d4607 | 6596 | #: ref-filter.c:254 |
c04f5ac3 | 6597 | #, c-format |
473eb541 JX |
6598 | msgid "Integer value expected refname:lstrip=%s" |
6599 | msgstr "期望整数值 refname:lstrip=%s" | |
c04f5ac3 | 6600 | |
ec3d4607 | 6601 | #: ref-filter.c:258 |
a0b6b246 | 6602 | #, c-format |
473eb541 JX |
6603 | msgid "Integer value expected refname:rstrip=%s" |
6604 | msgstr "期望整数值 refname:rstrip=%s" | |
c04f5ac3 | 6605 | |
ec3d4607 | 6606 | #: ref-filter.c:260 |
06991777 | 6607 | #, c-format |
473eb541 JX |
6608 | msgid "unrecognized %%(%s) argument: %s" |
6609 | msgstr "未能识别的 %%(%s) 参数:%s" | |
06991777 | 6610 | |
ec3d4607 | 6611 | #: ref-filter.c:315 |
06991777 | 6612 | #, c-format |
473eb541 JX |
6613 | msgid "%%(objecttype) does not take arguments" |
6614 | msgstr "%%(objecttype) 不带参数" | |
06991777 | 6615 | |
ec3d4607 | 6616 | #: ref-filter.c:339 |
06991777 | 6617 | #, c-format |
473eb541 JX |
6618 | msgid "unrecognized %%(objectsize) argument: %s" |
6619 | msgstr "未能识别的 %%(objectsize) 参数:%s" | |
06991777 | 6620 | |
ec3d4607 | 6621 | #: ref-filter.c:347 |
06991777 | 6622 | #, c-format |
473eb541 JX |
6623 | msgid "%%(deltabase) does not take arguments" |
6624 | msgstr "%%(deltabase) 不带参数" | |
06991777 | 6625 | |
ec3d4607 | 6626 | #: ref-filter.c:359 |
06991777 | 6627 | #, c-format |
473eb541 JX |
6628 | msgid "%%(body) does not take arguments" |
6629 | msgstr "%%(body) 不带参数" | |
06991777 | 6630 | |
ec3d4607 | 6631 | #: ref-filter.c:372 |
06991777 | 6632 | #, c-format |
473eb541 JX |
6633 | msgid "unrecognized %%(subject) argument: %s" |
6634 | msgstr "未能识别的 %%(subject) 参数:%s" | |
06991777 | 6635 | |
ec3d4607 | 6636 | #: ref-filter.c:391 |
06991777 | 6637 | #, c-format |
473eb541 JX |
6638 | msgid "expected %%(trailers:key=<value>)" |
6639 | msgstr "预期 %%(trailers:key=<值>)" | |
06991777 | 6640 | |
ec3d4607 | 6641 | #: ref-filter.c:393 |
06991777 | 6642 | #, c-format |
473eb541 JX |
6643 | msgid "unknown %%(trailers) argument: %s" |
6644 | msgstr "未知的 %%(trailers) 参数:%s" | |
06991777 | 6645 | |
ec3d4607 | 6646 | #: ref-filter.c:424 |
06991777 | 6647 | #, c-format |
473eb541 JX |
6648 | msgid "positive value expected contents:lines=%s" |
6649 | msgstr "期望一个正数 contents:lines=%s" | |
06991777 | 6650 | |
ec3d4607 | 6651 | #: ref-filter.c:426 |
06991777 | 6652 | #, c-format |
473eb541 JX |
6653 | msgid "unrecognized %%(contents) argument: %s" |
6654 | msgstr "未能识别的 %%(contents) 参数:%s" | |
06991777 | 6655 | |
ec3d4607 | 6656 | #: ref-filter.c:441 |
06991777 | 6657 | #, c-format |
473eb541 JX |
6658 | msgid "positive value expected '%s' in %%(%s)" |
6659 | msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数" | |
06991777 | 6660 | |
ec3d4607 | 6661 | #: ref-filter.c:445 |
06991777 | 6662 | #, c-format |
473eb541 JX |
6663 | msgid "unrecognized argument '%s' in %%(%s)" |
6664 | msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'" | |
06991777 | 6665 | |
ec3d4607 | 6666 | #: ref-filter.c:459 |
06991777 | 6667 | #, c-format |
473eb541 JX |
6668 | msgid "unrecognized email option: %s" |
6669 | msgstr "未识别的邮件选项:%s" | |
c04f5ac3 | 6670 | |
ec3d4607 | 6671 | #: ref-filter.c:489 |
a0b6b246 | 6672 | #, c-format |
473eb541 JX |
6673 | msgid "expected format: %%(align:<width>,<position>)" |
6674 | msgstr "期望的格式:%%(align:<宽度>,<位置>)" | |
c04f5ac3 | 6675 | |
ec3d4607 | 6676 | #: ref-filter.c:501 |
a0b6b246 | 6677 | #, c-format |
473eb541 JX |
6678 | msgid "unrecognized position:%s" |
6679 | msgstr "未能识别的位置:%s" | |
c04f5ac3 | 6680 | |
ec3d4607 | 6681 | #: ref-filter.c:508 |
a0b6b246 | 6682 | #, c-format |
473eb541 JX |
6683 | msgid "unrecognized width:%s" |
6684 | msgstr "未能识别的宽度:%s" | |
c04f5ac3 | 6685 | |
ec3d4607 | 6686 | #: ref-filter.c:517 |
a0b6b246 | 6687 | #, c-format |
473eb541 JX |
6688 | msgid "unrecognized %%(align) argument: %s" |
6689 | msgstr "未能识别的 %%(align) 参数:%s" | |
c04f5ac3 | 6690 | |
ec3d4607 | 6691 | #: ref-filter.c:525 |
a0b6b246 | 6692 | #, c-format |
473eb541 JX |
6693 | msgid "positive width expected with the %%(align) atom" |
6694 | msgstr "元素 %%(align) 需要一个正数的宽度" | |
cfff71a9 | 6695 | |
ec3d4607 | 6696 | #: ref-filter.c:543 |
a0b6b246 | 6697 | #, c-format |
473eb541 JX |
6698 | msgid "unrecognized %%(if) argument: %s" |
6699 | msgstr "未能识别的 %%(if) 参数:%s" | |
6c94aba5 | 6700 | |
ec3d4607 | 6701 | #: ref-filter.c:645 |
06991777 | 6702 | #, c-format |
473eb541 JX |
6703 | msgid "malformed field name: %.*s" |
6704 | msgstr "格式错误的字段名:%.*s" | |
06991777 | 6705 | |
ec3d4607 | 6706 | #: ref-filter.c:672 |
06991777 | 6707 | #, c-format |
473eb541 JX |
6708 | msgid "unknown field name: %.*s" |
6709 | msgstr "未知的字段名:%.*s" | |
06991777 | 6710 | |
ec3d4607 | 6711 | #: ref-filter.c:676 |
a0b6b246 | 6712 | #, c-format |
473eb541 JX |
6713 | msgid "" |
6714 | "not a git repository, but the field '%.*s' requires access to object data" | |
6715 | msgstr "不是 git 仓库,但是字段 '%.*s' 需要访问对象数据" | |
6c94aba5 | 6716 | |
ec3d4607 | 6717 | #: ref-filter.c:801 |
a0b6b246 | 6718 | #, c-format |
473eb541 JX |
6719 | msgid "format: %%(if) atom used without a %%(then) atom" |
6720 | msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" | |
cfff71a9 | 6721 | |
ec3d4607 | 6722 | #: ref-filter.c:865 |
31e5e17b | 6723 | #, c-format |
473eb541 JX |
6724 | msgid "format: %%(then) atom used without an %%(if) atom" |
6725 | msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" | |
31e5e17b | 6726 | |
ec3d4607 | 6727 | #: ref-filter.c:867 |
31e5e17b | 6728 | #, c-format |
473eb541 JX |
6729 | msgid "format: %%(then) atom used more than once" |
6730 | msgstr "格式:%%(then) 元素用了多次" | |
31e5e17b | 6731 | |
ec3d4607 | 6732 | #: ref-filter.c:869 |
a0b6b246 | 6733 | #, c-format |
473eb541 JX |
6734 | msgid "format: %%(then) atom used after %%(else)" |
6735 | msgstr "格式:%%(then) 元素用在了 %%(else) 之后" | |
cfff71a9 | 6736 | |
ec3d4607 | 6737 | #: ref-filter.c:897 |
473eb541 JX |
6738 | #, c-format |
6739 | msgid "format: %%(else) atom used without an %%(if) atom" | |
6740 | msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" | |
c04f5ac3 | 6741 | |
ec3d4607 | 6742 | #: ref-filter.c:899 |
a0b6b246 | 6743 | #, c-format |
473eb541 JX |
6744 | msgid "format: %%(else) atom used without a %%(then) atom" |
6745 | msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" | |
c04f5ac3 | 6746 | |
ec3d4607 | 6747 | #: ref-filter.c:901 |
473eb541 JX |
6748 | #, c-format |
6749 | msgid "format: %%(else) atom used more than once" | |
6750 | msgstr "格式:%%(else) 元素用了多次" | |
c04f5ac3 | 6751 | |
ec3d4607 | 6752 | #: ref-filter.c:916 |
a0b6b246 | 6753 | #, c-format |
473eb541 JX |
6754 | msgid "format: %%(end) atom used without corresponding atom" |
6755 | msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" | |
90314792 | 6756 | |
ec3d4607 | 6757 | #: ref-filter.c:973 |
473eb541 JX |
6758 | #, c-format |
6759 | msgid "malformed format string %s" | |
6760 | msgstr "错误的格式化字符串 %s" | |
90314792 | 6761 | |
ec3d4607 | 6762 | #: ref-filter.c:1621 |
06991777 | 6763 | #, c-format |
473eb541 JX |
6764 | msgid "(no branch, rebasing %s)" |
6765 | msgstr "(非分支,正变基 %s)" | |
06991777 | 6766 | |
ec3d4607 | 6767 | #: ref-filter.c:1624 |
c1ac5258 | 6768 | #, c-format |
473eb541 JX |
6769 | msgid "(no branch, rebasing detached HEAD %s)" |
6770 | msgstr "(非分支,正变基分离头指针 %s)" | |
c1ac5258 | 6771 | |
ec3d4607 | 6772 | #: ref-filter.c:1627 |
c1ac5258 | 6773 | #, c-format |
473eb541 JX |
6774 | msgid "(no branch, bisect started on %s)" |
6775 | msgstr "(非分支,二分查找开始于 %s)" | |
c1ac5258 | 6776 | |
ec3d4607 | 6777 | #: ref-filter.c:1631 |
c1ac5258 | 6778 | #, c-format |
473eb541 JX |
6779 | msgid "(HEAD detached at %s)" |
6780 | msgstr "(头指针在 %s 分离)" | |
c1ac5258 | 6781 | |
ec3d4607 | 6782 | #: ref-filter.c:1634 |
473eb541 JX |
6783 | #, c-format |
6784 | msgid "(HEAD detached from %s)" | |
6785 | msgstr "(头指针自 %s 分离)" | |
4c27fcb5 | 6786 | |
ec3d4607 | 6787 | #: ref-filter.c:1637 |
473eb541 JX |
6788 | msgid "(no branch)" |
6789 | msgstr "(非分支)" | |
cfff71a9 | 6790 | |
ec3d4607 | 6791 | #: ref-filter.c:1669 ref-filter.c:1880 |
4c27fcb5 | 6792 | #, c-format |
473eb541 JX |
6793 | msgid "missing object %s for %s" |
6794 | msgstr "缺失 %2$s 的对象 %1$s" | |
6792b93b | 6795 | |
ec3d4607 | 6796 | #: ref-filter.c:1679 |
4c27fcb5 | 6797 | #, c-format |
473eb541 JX |
6798 | msgid "parse_object_buffer failed on %s for %s" |
6799 | msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" | |
5c57d762 | 6800 | |
ec3d4607 | 6801 | #: ref-filter.c:2064 |
5809aa05 | 6802 | #, c-format |
473eb541 JX |
6803 | msgid "malformed object at '%s'" |
6804 | msgstr "格式错误的对象 '%s'" | |
5809aa05 | 6805 | |
ec3d4607 | 6806 | #: ref-filter.c:2153 |
4c27fcb5 | 6807 | #, c-format |
473eb541 JX |
6808 | msgid "ignoring ref with broken name %s" |
6809 | msgstr "忽略带有错误名称 %s 的引用" | |
31e5e17b | 6810 | |
ec3d4607 | 6811 | #: ref-filter.c:2158 refs.c:676 |
87cb7997 | 6812 | #, c-format |
473eb541 JX |
6813 | msgid "ignoring broken ref %s" |
6814 | msgstr "忽略损坏的引用 %s" | |
87cb7997 | 6815 | |
ec3d4607 | 6816 | #: ref-filter.c:2502 |
87cb7997 | 6817 | #, c-format |
473eb541 JX |
6818 | msgid "format: %%(end) atom missing" |
6819 | msgstr "格式:缺少 %%(end) 元素" | |
87cb7997 | 6820 | |
ec3d4607 | 6821 | #: ref-filter.c:2596 |
4c27fcb5 | 6822 | #, c-format |
473eb541 JX |
6823 | msgid "malformed object name %s" |
6824 | msgstr "格式错误的对象名 %s" | |
6792b93b | 6825 | |
ec3d4607 | 6826 | #: ref-filter.c:2601 |
4c27fcb5 | 6827 | #, c-format |
473eb541 JX |
6828 | msgid "option `%s' must point to a commit" |
6829 | msgstr "选项 `%s' 必须指向一个提交" | |
4c27fcb5 | 6830 | |
473eb541 | 6831 | #: refs.c:264 |
4c27fcb5 | 6832 | #, c-format |
473eb541 JX |
6833 | msgid "%s does not point to a valid object!" |
6834 | msgstr "%s 没有指向一个有效的对象!" | |
4c27fcb5 | 6835 | |
473eb541 | 6836 | #: refs.c:566 |
4c27fcb5 | 6837 | #, c-format |
473eb541 JX |
6838 | msgid "" |
6839 | "Using '%s' as the name for the initial branch. This default branch name\n" | |
6840 | "is subject to change. To configure the initial branch name to use in all\n" | |
6841 | "of your new repositories, which will suppress this warning, call:\n" | |
6842 | "\n" | |
6843 | "\tgit config --global init.defaultBranch <name>\n" | |
6844 | "\n" | |
6845 | "Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" | |
6846 | "'development'. The just-created branch can be renamed via this command:\n" | |
6847 | "\n" | |
6848 | "\tgit branch -m <name>\n" | |
6849 | msgstr "" | |
6850 | "使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n" | |
6851 | "配置使用初始分支名,并消除这条警告,请执行:\n" | |
6852 | "\n" | |
6853 | "\tgit config --global init.defaultBranch <名称>\n" | |
6854 | "\n" | |
6855 | "除了 'master' 之外,通常选定的名字有 'main'、'trunk' 和 'development'。\n" | |
6856 | "可以通过以下命令重命名刚创建的分支:\n" | |
6857 | "\n" | |
6858 | "\tgit branch -m <name>\n" | |
4c27fcb5 | 6859 | |
473eb541 | 6860 | #: refs.c:588 |
4c27fcb5 | 6861 | #, c-format |
473eb541 JX |
6862 | msgid "could not retrieve `%s`" |
6863 | msgstr "无法获取 `%s`" | |
4c27fcb5 | 6864 | |
473eb541 | 6865 | #: refs.c:598 |
4c27fcb5 | 6866 | #, c-format |
473eb541 JX |
6867 | msgid "invalid branch name: %s = %s" |
6868 | msgstr "无效的分支名:%s = %s" | |
4c27fcb5 | 6869 | |
473eb541 | 6870 | #: refs.c:674 |
4c27fcb5 | 6871 | #, c-format |
473eb541 JX |
6872 | msgid "ignoring dangling symref %s" |
6873 | msgstr "忽略悬空符号引用 %s" | |
4c27fcb5 | 6874 | |
473eb541 | 6875 | #: refs.c:922 |
4c27fcb5 | 6876 | #, c-format |
473eb541 JX |
6877 | msgid "log for ref %s has gap after %s" |
6878 | msgstr "引用 %s 的日志在 %s 之后有缺口" | |
4c27fcb5 | 6879 | |
473eb541 | 6880 | #: refs.c:929 |
4c27fcb5 | 6881 | #, c-format |
473eb541 JX |
6882 | msgid "log for ref %s unexpectedly ended on %s" |
6883 | msgstr "引用 %s 的日志意外终止于 %s " | |
4c27fcb5 | 6884 | |
473eb541 | 6885 | #: refs.c:994 |
4c27fcb5 | 6886 | #, c-format |
473eb541 JX |
6887 | msgid "log for %s is empty" |
6888 | msgstr "%s 的日志为空" | |
349ede6a | 6889 | |
473eb541 | 6890 | #: refs.c:1086 |
349ede6a | 6891 | #, c-format |
473eb541 JX |
6892 | msgid "refusing to update ref with bad name '%s'" |
6893 | msgstr "拒绝更新有错误名称 '%s' 的引用" | |
d9488fea | 6894 | |
473eb541 | 6895 | #: refs.c:1157 |
d9488fea | 6896 | #, c-format |
473eb541 JX |
6897 | msgid "update_ref failed for ref '%s': %s" |
6898 | msgstr "对引用 '%s' 执行 update_ref 失败:%s" | |
4c27fcb5 | 6899 | |
473eb541 | 6900 | #: refs.c:2051 |
4c27fcb5 | 6901 | #, c-format |
473eb541 JX |
6902 | msgid "multiple updates for ref '%s' not allowed" |
6903 | msgstr "不允许对引用 '%s' 多次更新" | |
4c27fcb5 | 6904 | |
473eb541 JX |
6905 | #: refs.c:2131 |
6906 | msgid "ref updates forbidden inside quarantine environment" | |
6907 | msgstr "在隔离环境中禁止更新引用" | |
d46c5519 | 6908 | |
473eb541 JX |
6909 | #: refs.c:2142 |
6910 | msgid "ref updates aborted by hook" | |
6911 | msgstr "引用更新被钩子中止" | |
4c27fcb5 | 6912 | |
473eb541 | 6913 | #: refs.c:2242 refs.c:2272 |
4c27fcb5 | 6914 | #, c-format |
473eb541 JX |
6915 | msgid "'%s' exists; cannot create '%s'" |
6916 | msgstr "'%s' 已存在,无法创建 '%s'" | |
4c27fcb5 | 6917 | |
473eb541 | 6918 | #: refs.c:2248 refs.c:2283 |
4c27fcb5 | 6919 | #, c-format |
473eb541 JX |
6920 | msgid "cannot process '%s' and '%s' at the same time" |
6921 | msgstr "无法同时处理 '%s' 和 '%s'" | |
4c27fcb5 | 6922 | |
473eb541 | 6923 | #: refs/files-backend.c:1228 |
4c27fcb5 | 6924 | #, c-format |
473eb541 JX |
6925 | msgid "could not remove reference %s" |
6926 | msgstr "无法删除引用 %s" | |
4c27fcb5 | 6927 | |
473eb541 JX |
6928 | #: refs/files-backend.c:1242 refs/packed-backend.c:1542 |
6929 | #: refs/packed-backend.c:1552 | |
4c27fcb5 | 6930 | #, c-format |
473eb541 JX |
6931 | msgid "could not delete reference %s: %s" |
6932 | msgstr "无法删除引用 %s:%s" | |
4c27fcb5 | 6933 | |
473eb541 JX |
6934 | #: refs/files-backend.c:1245 refs/packed-backend.c:1555 |
6935 | #, c-format | |
6936 | msgid "could not delete references: %s" | |
6937 | msgstr "无法删除引用:%s" | |
7157c2b5 | 6938 | |
473eb541 JX |
6939 | #: refspec.c:170 |
6940 | #, c-format | |
6941 | msgid "invalid refspec '%s'" | |
33b62fba | 6942 | msgstr "无效的引用规格:'%s'" |
6792b93b | 6943 | |
473eb541 JX |
6944 | #: remote.c:351 |
6945 | #, c-format | |
6946 | msgid "config remote shorthand cannot begin with '/': %s" | |
6947 | msgstr "配置的远程短名称不能以 '/' 开始:%s" | |
6792b93b | 6948 | |
473eb541 JX |
6949 | #: remote.c:399 |
6950 | msgid "more than one receivepack given, using the first" | |
6951 | msgstr "提供了一个以上的 receivepack,使用第一个" | |
6792b93b | 6952 | |
473eb541 JX |
6953 | #: remote.c:407 |
6954 | msgid "more than one uploadpack given, using the first" | |
6955 | msgstr "提供了一个以上的 uploadpack,使用第一个" | |
6792b93b | 6956 | |
473eb541 | 6957 | #: remote.c:590 |
31e5e17b | 6958 | #, c-format |
473eb541 JX |
6959 | msgid "Cannot fetch both %s and %s to %s" |
6960 | msgstr "不能同时获取 %s 和 %s 至 %s" | |
31e5e17b | 6961 | |
473eb541 | 6962 | #: remote.c:594 |
fd8cb379 | 6963 | #, c-format |
473eb541 JX |
6964 | msgid "%s usually tracks %s, not %s" |
6965 | msgstr "%s 通常跟踪 %s,而非 %s" | |
fd8cb379 | 6966 | |
473eb541 | 6967 | #: remote.c:598 |
a6cd2cc4 | 6968 | #, c-format |
473eb541 JX |
6969 | msgid "%s tracks both %s and %s" |
6970 | msgstr "%s 同时跟踪 %s 和 %s" | |
a6cd2cc4 | 6971 | |
473eb541 JX |
6972 | #: remote.c:666 |
6973 | #, c-format | |
6974 | msgid "key '%s' of pattern had no '*'" | |
6975 | msgstr "模式的键 '%s' 没有 '*'" | |
6792b93b | 6976 | |
473eb541 JX |
6977 | #: remote.c:676 |
6978 | #, c-format | |
6979 | msgid "value '%s' of pattern has no '*'" | |
6980 | msgstr "模式的值 '%s' 没有 '*'" | |
a0b6b246 | 6981 | |
473eb541 JX |
6982 | #: remote.c:1083 |
6983 | #, c-format | |
6984 | msgid "src refspec %s does not match any" | |
33b62fba | 6985 | msgstr "源引用规格 %s 没有匹配" |
2b472aae | 6986 | |
473eb541 | 6987 | #: remote.c:1088 |
1a79b2f1 | 6988 | #, c-format |
473eb541 | 6989 | msgid "src refspec %s matches more than one" |
33b62fba | 6990 | msgstr "源引用规格 %s 匹配超过一个" |
1a79b2f1 | 6991 | |
473eb541 JX |
6992 | #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push |
6993 | #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is | |
6994 | #. the <src>. | |
6995 | #. | |
6996 | #: remote.c:1103 | |
6997 | #, c-format | |
a0b6b246 | 6998 | msgid "" |
473eb541 JX |
6999 | "The destination you provided is not a full refname (i.e.,\n" |
7000 | "starting with \"refs/\"). We tried to guess what you meant by:\n" | |
7001 | "\n" | |
7002 | "- Looking for a ref that matches '%s' on the remote side.\n" | |
7003 | "- Checking if the <src> being pushed ('%s')\n" | |
7004 | " is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" | |
7005 | " refs/{heads,tags}/ prefix on the remote side.\n" | |
7006 | "\n" | |
7007 | "Neither worked, so we gave up. You must fully qualify the ref." | |
a0b6b246 | 7008 | msgstr "" |
473eb541 JX |
7009 | "您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n" |
7010 | "试着猜测您的想法:\n" | |
7011 | "\n" | |
7012 | "- 在远端查询和 '%s' 匹配的引用。\n" | |
7013 | "- 检查要推送的 <src>('%s')是不是在 \"refs/{heads,tags}/\" 中的\n" | |
7014 | " 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n" | |
7015 | "\n" | |
7016 | "都不行,所以我们已放弃。您必须给出完整的引用。" | |
a0b6b246 | 7017 | |
473eb541 JX |
7018 | #: remote.c:1123 |
7019 | #, c-format | |
a0b6b246 | 7020 | msgid "" |
473eb541 JX |
7021 | "The <src> part of the refspec is a commit object.\n" |
7022 | "Did you mean to create a new branch by pushing to\n" | |
7023 | "'%s:refs/heads/%s'?" | |
a0b6b246 | 7024 | msgstr "" |
33b62fba | 7025 | "引用规格的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" |
473eb541 | 7026 | "'%s:refs/heads/%s' 推送么?" |
1b7f4a34 | 7027 | |
473eb541 | 7028 | #: remote.c:1128 |
d9488fea | 7029 | #, c-format |
473eb541 JX |
7030 | msgid "" |
7031 | "The <src> part of the refspec is a tag object.\n" | |
7032 | "Did you mean to create a new tag by pushing to\n" | |
7033 | "'%s:refs/tags/%s'?" | |
7034 | msgstr "" | |
33b62fba | 7035 | "引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" |
473eb541 | 7036 | "'%s:refs/tags/%s' 推送么?" |
d9488fea | 7037 | |
473eb541 | 7038 | #: remote.c:1133 |
a0b6b246 | 7039 | #, c-format |
473eb541 JX |
7040 | msgid "" |
7041 | "The <src> part of the refspec is a tree object.\n" | |
7042 | "Did you mean to tag a new tree by pushing to\n" | |
7043 | "'%s:refs/tags/%s'?" | |
7044 | msgstr "" | |
33b62fba | 7045 | "引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" |
473eb541 | 7046 | "'%s:refs/tags/%s' 推送么?" |
1b7f4a34 | 7047 | |
473eb541 | 7048 | #: remote.c:1138 |
1b7f4a34 | 7049 | #, c-format |
473eb541 JX |
7050 | msgid "" |
7051 | "The <src> part of the refspec is a blob object.\n" | |
7052 | "Did you mean to tag a new blob by pushing to\n" | |
7053 | "'%s:refs/tags/%s'?" | |
7054 | msgstr "" | |
33b62fba | 7055 | "引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" |
473eb541 | 7056 | "'%s:refs/tags/%s' 推送么?" |
1b7f4a34 | 7057 | |
473eb541 | 7058 | #: remote.c:1174 |
63af42fe | 7059 | #, c-format |
473eb541 JX |
7060 | msgid "%s cannot be resolved to branch" |
7061 | msgstr "%s 无法被解析为分支" | |
6792b93b | 7062 | |
473eb541 | 7063 | #: remote.c:1185 |
a0b6b246 | 7064 | #, c-format |
473eb541 JX |
7065 | msgid "unable to delete '%s': remote ref does not exist" |
7066 | msgstr "无法删除 '%s':远程引用不存在" | |
6792b93b | 7067 | |
473eb541 | 7068 | #: remote.c:1197 |
d46c5519 | 7069 | #, c-format |
473eb541 | 7070 | msgid "dst refspec %s matches more than one" |
33b62fba | 7071 | msgstr "目标引用规格 %s 匹配超过一个" |
d46c5519 | 7072 | |
473eb541 | 7073 | #: remote.c:1204 |
a0b6b246 | 7074 | #, c-format |
473eb541 JX |
7075 | msgid "dst ref %s receives from more than one src" |
7076 | msgstr "目标引用 %s 接收超过一个源" | |
6792b93b | 7077 | |
473eb541 JX |
7078 | #: remote.c:1724 remote.c:1825 |
7079 | msgid "HEAD does not point to a branch" | |
7080 | msgstr "HEAD 没有指向一个分支" | |
fd8cb379 | 7081 | |
473eb541 | 7082 | #: remote.c:1733 |
4c27fcb5 | 7083 | #, c-format |
473eb541 JX |
7084 | msgid "no such branch: '%s'" |
7085 | msgstr "没有此分支:'%s'" | |
4c27fcb5 | 7086 | |
473eb541 | 7087 | #: remote.c:1736 |
c1ac5258 | 7088 | #, c-format |
473eb541 JX |
7089 | msgid "no upstream configured for branch '%s'" |
7090 | msgstr "尚未给分支 '%s' 设置上游" | |
c1ac5258 | 7091 | |
473eb541 | 7092 | #: remote.c:1742 |
c1ac5258 | 7093 | #, c-format |
473eb541 JX |
7094 | msgid "upstream branch '%s' not stored as a remote-tracking branch" |
7095 | msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" | |
4c27fcb5 | 7096 | |
473eb541 | 7097 | #: remote.c:1757 |
4c27fcb5 | 7098 | #, c-format |
473eb541 JX |
7099 | msgid "push destination '%s' on remote '%s' has no local tracking branch" |
7100 | msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" | |
4c27fcb5 | 7101 | |
473eb541 JX |
7102 | #: remote.c:1769 |
7103 | #, c-format | |
7104 | msgid "branch '%s' has no remote for pushing" | |
7105 | msgstr "分支 '%s' 没有设置要推送的远程服务器" | |
4c27fcb5 | 7106 | |
473eb541 | 7107 | #: remote.c:1779 |
63af42fe | 7108 | #, c-format |
473eb541 JX |
7109 | msgid "push refspecs for '%s' do not include '%s'" |
7110 | msgstr "向 '%s' 推送引用规格未包含 '%s'" | |
6792b93b | 7111 | |
473eb541 JX |
7112 | #: remote.c:1792 |
7113 | msgid "push has no destination (push.default is 'nothing')" | |
7114 | msgstr "推送无目标(push.default 是 'nothing')" | |
31e5e17b | 7115 | |
473eb541 JX |
7116 | #: remote.c:1814 |
7117 | msgid "cannot resolve 'simple' push to a single destination" | |
7118 | msgstr "无法解析 'simple' 推送至一个单独的目标" | |
31e5e17b | 7119 | |
473eb541 JX |
7120 | #: remote.c:1943 |
7121 | #, c-format | |
7122 | msgid "couldn't find remote ref %s" | |
7123 | msgstr "无法找到远程引用 %s" | |
31e5e17b | 7124 | |
473eb541 JX |
7125 | #: remote.c:1956 |
7126 | #, c-format | |
7127 | msgid "* Ignoring funny ref '%s' locally" | |
7128 | msgstr "* 在本地忽略可笑的引用 '%s'" | |
31e5e17b | 7129 | |
473eb541 JX |
7130 | #: remote.c:2119 |
7131 | #, c-format | |
7132 | msgid "Your branch is based on '%s', but the upstream is gone.\n" | |
7133 | msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" | |
31e5e17b | 7134 | |
473eb541 JX |
7135 | #: remote.c:2123 |
7136 | msgid " (use \"git branch --unset-upstream\" to fixup)\n" | |
7137 | msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" | |
31e5e17b | 7138 | |
473eb541 JX |
7139 | #: remote.c:2126 |
7140 | #, c-format | |
7141 | msgid "Your branch is up to date with '%s'.\n" | |
7142 | msgstr "您的分支与上游分支 '%s' 一致。\n" | |
31e5e17b | 7143 | |
473eb541 JX |
7144 | #: remote.c:2130 |
7145 | #, c-format | |
7146 | msgid "Your branch and '%s' refer to different commits.\n" | |
7147 | msgstr "您的分支和 '%s' 指向不同的提交。\n" | |
31e5e17b | 7148 | |
473eb541 JX |
7149 | #: remote.c:2133 |
7150 | #, c-format | |
7151 | msgid " (use \"%s\" for details)\n" | |
7152 | msgstr " (使用 \"%s\" 查看详情)\n" | |
31e5e17b | 7153 | |
473eb541 | 7154 | #: remote.c:2137 |
31e5e17b | 7155 | #, c-format |
473eb541 JX |
7156 | msgid "Your branch is ahead of '%s' by %d commit.\n" |
7157 | msgid_plural "Your branch is ahead of '%s' by %d commits.\n" | |
7158 | msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" | |
7159 | msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" | |
31e5e17b | 7160 | |
473eb541 JX |
7161 | #: remote.c:2143 |
7162 | msgid " (use \"git push\" to publish your local commits)\n" | |
7163 | msgstr " (使用 \"git push\" 来发布您的本地提交)\n" | |
31e5e17b | 7164 | |
473eb541 JX |
7165 | #: remote.c:2146 |
7166 | #, c-format | |
7167 | msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" | |
7168 | msgid_plural "" | |
7169 | "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" | |
7170 | msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
7171 | msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" | |
31e5e17b | 7172 | |
473eb541 JX |
7173 | # 译者:注意保持前导空格 |
7174 | #: remote.c:2154 | |
7175 | msgid " (use \"git pull\" to update your local branch)\n" | |
7176 | msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" | |
31e5e17b | 7177 | |
473eb541 | 7178 | #: remote.c:2157 |
31e5e17b | 7179 | #, c-format |
473eb541 JX |
7180 | msgid "" |
7181 | "Your branch and '%s' have diverged,\n" | |
7182 | "and have %d and %d different commit each, respectively.\n" | |
7183 | msgid_plural "" | |
7184 | "Your branch and '%s' have diverged,\n" | |
7185 | "and have %d and %d different commits each, respectively.\n" | |
7186 | msgstr[0] "" | |
7187 | "您的分支和 '%s' 出现了偏离,\n" | |
7188 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
7189 | msgstr[1] "" | |
7190 | "您的分支和 '%s' 出现了偏离,\n" | |
7191 | "并且分别有 %d 和 %d 处不同的提交。\n" | |
7192 | ||
7193 | # 译者:注意保持前导空格 | |
7194 | #: remote.c:2167 | |
7195 | msgid " (use \"git pull\" to merge the remote branch into yours)\n" | |
7196 | msgstr " (使用 \"git pull\" 来合并远程分支)\n" | |
31e5e17b | 7197 | |
473eb541 | 7198 | #: remote.c:2359 |
d9488fea | 7199 | #, c-format |
473eb541 JX |
7200 | msgid "cannot parse expected object name '%s'" |
7201 | msgstr "无法解析期望的对象名 '%s'" | |
d9488fea | 7202 | |
473eb541 JX |
7203 | #: replace-object.c:21 |
7204 | #, c-format | |
7205 | msgid "bad replace ref name: %s" | |
7206 | msgstr "错误的替换引用名称:%s" | |
d9488fea | 7207 | |
473eb541 JX |
7208 | #: replace-object.c:30 |
7209 | #, c-format | |
7210 | msgid "duplicate replace ref: %s" | |
7211 | msgstr "重复的替换引用:%s" | |
31e5e17b | 7212 | |
473eb541 | 7213 | #: replace-object.c:82 |
349ede6a | 7214 | #, c-format |
473eb541 JX |
7215 | msgid "replace depth too high for object %s" |
7216 | msgstr "对象 %s 的替换层级太深" | |
349ede6a | 7217 | |
473eb541 JX |
7218 | #: rerere.c:201 rerere.c:210 rerere.c:213 |
7219 | msgid "corrupt MERGE_RR" | |
7220 | msgstr "损坏的 MERGE_RR" | |
7221 | ||
7222 | #: rerere.c:248 rerere.c:253 | |
7223 | msgid "unable to write rerere record" | |
7224 | msgstr "无法写入 rerere 记录" | |
7225 | ||
7226 | #: rerere.c:479 | |
a0b6b246 | 7227 | #, c-format |
473eb541 JX |
7228 | msgid "there were errors while writing '%s' (%s)" |
7229 | msgstr "写入 '%s' (%s) 时出错" | |
6792b93b | 7230 | |
473eb541 | 7231 | #: rerere.c:482 |
63af42fe | 7232 | #, c-format |
473eb541 JX |
7233 | msgid "failed to flush '%s'" |
7234 | msgstr "刷新 '%s' 失败" | |
63af42fe | 7235 | |
473eb541 | 7236 | #: rerere.c:487 rerere.c:1023 |
c1ac5258 | 7237 | #, c-format |
473eb541 JX |
7238 | msgid "could not parse conflict hunks in '%s'" |
7239 | msgstr "不能解析 '%s' 中的冲突块" | |
c1ac5258 | 7240 | |
473eb541 | 7241 | #: rerere.c:668 |
1a79b2f1 | 7242 | #, c-format |
473eb541 JX |
7243 | msgid "failed utime() on '%s'" |
7244 | msgstr "在 '%s' 上调用 utime() 失败" | |
1a79b2f1 | 7245 | |
473eb541 JX |
7246 | #: rerere.c:678 |
7247 | #, c-format | |
7248 | msgid "writing '%s' failed" | |
7249 | msgstr "写入 '%s' 失败" | |
1a79b2f1 | 7250 | |
473eb541 JX |
7251 | #: rerere.c:698 |
7252 | #, c-format | |
7253 | msgid "Staged '%s' using previous resolution." | |
7254 | msgstr "使用之前的解决方案暂存 '%s'。" | |
1a79b2f1 | 7255 | |
473eb541 JX |
7256 | #: rerere.c:737 |
7257 | #, c-format | |
7258 | msgid "Recorded resolution for '%s'." | |
7259 | msgstr "已记录 '%s' 的解决方案。" | |
1a79b2f1 | 7260 | |
473eb541 | 7261 | #: rerere.c:772 |
1a79b2f1 | 7262 | #, c-format |
473eb541 JX |
7263 | msgid "Resolved '%s' using previous resolution." |
7264 | msgstr "使用之前的解决方案解决 '%s'。" | |
1a79b2f1 | 7265 | |
473eb541 JX |
7266 | #: rerere.c:787 |
7267 | #, c-format | |
7268 | msgid "cannot unlink stray '%s'" | |
7269 | msgstr "不能删除 stray '%s'" | |
1a79b2f1 | 7270 | |
473eb541 | 7271 | #: rerere.c:791 |
1a79b2f1 | 7272 | #, c-format |
473eb541 JX |
7273 | msgid "Recorded preimage for '%s'" |
7274 | msgstr "为 '%s' 记录 preimage" | |
1a79b2f1 | 7275 | |
ec3d4607 JX |
7276 | #: rerere.c:865 submodule.c:2076 builtin/log.c:2002 |
7277 | #: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848 | |
1a79b2f1 | 7278 | #, c-format |
473eb541 JX |
7279 | msgid "could not create directory '%s'" |
7280 | msgstr "不能创建目录 '%s'" | |
1a79b2f1 | 7281 | |
473eb541 | 7282 | #: rerere.c:1041 |
1a79b2f1 | 7283 | #, c-format |
473eb541 JX |
7284 | msgid "failed to update conflicted state in '%s'" |
7285 | msgstr "更新 '%s' 中的冲突状态失败" | |
1a79b2f1 | 7286 | |
473eb541 JX |
7287 | #: rerere.c:1052 rerere.c:1059 |
7288 | #, c-format | |
7289 | msgid "no remembered resolution for '%s'" | |
7290 | msgstr "没有为 '%s' 记忆的解决方案" | |
6792b93b | 7291 | |
473eb541 JX |
7292 | #: rerere.c:1061 |
7293 | #, c-format | |
7294 | msgid "cannot unlink '%s'" | |
7295 | msgstr "不能删除 '%s'" | |
fd8cb379 | 7296 | |
473eb541 | 7297 | #: rerere.c:1071 |
a0b6b246 | 7298 | #, c-format |
473eb541 JX |
7299 | msgid "Updated preimage for '%s'" |
7300 | msgstr "已为 '%s' 更新 preimage" | |
6792b93b | 7301 | |
473eb541 | 7302 | #: rerere.c:1080 |
a0b6b246 | 7303 | #, c-format |
473eb541 JX |
7304 | msgid "Forgot resolution for '%s'\n" |
7305 | msgstr "忘记 '%s' 的解决方案\n" | |
7306 | ||
7307 | #: rerere.c:1191 | |
7308 | msgid "unable to open rr-cache directory" | |
7309 | msgstr "不能打开 rr-cache 目录" | |
a0b6b246 | 7310 | |
473eb541 JX |
7311 | #: reset.c:42 |
7312 | msgid "could not determine HEAD revision" | |
7313 | msgstr "不能确定 HEAD 版本" | |
7314 | ||
ec3d4607 | 7315 | #: reset.c:69 reset.c:75 sequencer.c:3689 |
1a79b2f1 | 7316 | #, c-format |
473eb541 JX |
7317 | msgid "failed to find tree of %s" |
7318 | msgstr "无法找到 %s 指向的树。" | |
1a79b2f1 | 7319 | |
ec3d4607 | 7320 | #: revision.c:2344 |
473eb541 JX |
7321 | msgid "--unpacked=<packfile> no longer supported" |
7322 | msgstr "不再支持 --unpacked=<packfile>" | |
7323 | ||
ec3d4607 | 7324 | #: revision.c:2684 |
473eb541 JX |
7325 | msgid "your current branch appears to be broken" |
7326 | msgstr "您的当前分支好像被损坏" | |
7327 | ||
ec3d4607 | 7328 | #: revision.c:2687 |
a0b6b246 | 7329 | #, c-format |
473eb541 JX |
7330 | msgid "your current branch '%s' does not have any commits yet" |
7331 | msgstr "您的当前分支 '%s' 尚无任何提交" | |
7332 | ||
ec3d4607 | 7333 | #: revision.c:2893 |
473eb541 JX |
7334 | msgid "-L does not yet support diff formats besides -p and -s" |
7335 | msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" | |
7336 | ||
ec3d4607 | 7337 | #: run-command.c:766 |
473eb541 JX |
7338 | msgid "open /dev/null failed" |
7339 | msgstr "不能打开 /dev/null" | |
a0b6b246 | 7340 | |
ec3d4607 | 7341 | #: run-command.c:1274 |
a0b6b246 | 7342 | #, c-format |
473eb541 JX |
7343 | msgid "cannot create async thread: %s" |
7344 | msgstr "不能创建 async 线程:%s" | |
a0b6b246 | 7345 | |
ec3d4607 | 7346 | #: run-command.c:1344 |
a0b6b246 | 7347 | #, c-format |
473eb541 JX |
7348 | msgid "" |
7349 | "The '%s' hook was ignored because it's not set as executable.\n" | |
7350 | "You can disable this warning with `git config advice.ignoredHook false`." | |
7351 | msgstr "" | |
7352 | "因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n" | |
7353 | "配置 `git config advice.ignoredHook false` 来关闭这条警告。" | |
7354 | ||
33b62fba | 7355 | #: send-pack.c:150 |
473eb541 JX |
7356 | msgid "unexpected flush packet while reading remote unpack status" |
7357 | msgstr "读取远程解包状态时收到意外的 flush 包" | |
a0b6b246 | 7358 | |
33b62fba | 7359 | #: send-pack.c:152 |
a0b6b246 | 7360 | #, c-format |
473eb541 JX |
7361 | msgid "unable to parse remote unpack status: %s" |
7362 | msgstr "不能解析远程解包状态:%s" | |
7363 | ||
33b62fba | 7364 | #: send-pack.c:154 |
473eb541 JX |
7365 | #, c-format |
7366 | msgid "remote unpack failed: %s" | |
7367 | msgstr "远程解包失败:%s" | |
7368 | ||
33b62fba | 7369 | #: send-pack.c:378 |
473eb541 JX |
7370 | msgid "failed to sign the push certificate" |
7371 | msgstr "为推送证书签名失败" | |
a0b6b246 | 7372 | |
33b62fba JX |
7373 | #: send-pack.c:433 |
7374 | msgid "send-pack: unable to fork off fetch subprocess" | |
7375 | msgstr "send-pack:无法派生 fetch 子进程" | |
7376 | ||
7377 | #: send-pack.c:455 | |
7378 | msgid "push negotiation failed; proceeding anyway with push" | |
7b4d4954 | 7379 | msgstr "推送协商失败,但还是继续推送" |
33b62fba | 7380 | |
ec3d4607 | 7381 | #: send-pack.c:526 |
473eb541 JX |
7382 | msgid "the receiving end does not support this repository's hash algorithm" |
7383 | msgstr "接收端不支持这个仓库的哈希算法" | |
2b472aae | 7384 | |
ec3d4607 | 7385 | #: send-pack.c:535 |
473eb541 | 7386 | msgid "the receiving end does not support --signed push" |
ec3d4607 | 7387 | msgstr "接收端不支持签名推送(--signed)" |
a0b6b246 | 7388 | |
ec3d4607 | 7389 | #: send-pack.c:537 |
473eb541 JX |
7390 | msgid "" |
7391 | "not sending a push certificate since the receiving end does not support --" | |
7392 | "signed push" | |
ec3d4607 | 7393 | msgstr "未发送推送证书,因为接收端不支持签名推送(--signed)" |
a0b6b246 | 7394 | |
ec3d4607 | 7395 | #: send-pack.c:544 |
473eb541 | 7396 | msgid "the receiving end does not support --atomic push" |
ec3d4607 | 7397 | msgstr "接收端不支持原子推送(--atomic)" |
5809aa05 | 7398 | |
ec3d4607 | 7399 | #: send-pack.c:549 |
473eb541 JX |
7400 | msgid "the receiving end does not support push options" |
7401 | msgstr "接收端不支持推送选项" | |
5809aa05 | 7402 | |
33b62fba | 7403 | #: sequencer.c:196 |
d46c5519 | 7404 | #, c-format |
473eb541 JX |
7405 | msgid "invalid commit message cleanup mode '%s'" |
7406 | msgstr "无效的提交信息清理模式 '%s'" | |
d46c5519 | 7407 | |
33b62fba | 7408 | #: sequencer.c:324 |
a0b6b246 | 7409 | #, c-format |
473eb541 JX |
7410 | msgid "could not delete '%s'" |
7411 | msgstr "无法删除 '%s'" | |
a0b6b246 | 7412 | |
33b62fba | 7413 | #: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402 |
1a79b2f1 | 7414 | #, c-format |
473eb541 JX |
7415 | msgid "could not remove '%s'" |
7416 | msgstr "无法删除 '%s'" | |
a0b6b246 | 7417 | |
33b62fba | 7418 | #: sequencer.c:354 |
473eb541 JX |
7419 | msgid "revert" |
7420 | msgstr "还原" | |
a6cd2cc4 | 7421 | |
33b62fba | 7422 | #: sequencer.c:356 |
473eb541 JX |
7423 | msgid "cherry-pick" |
7424 | msgstr "拣选" | |
a6cd2cc4 | 7425 | |
33b62fba | 7426 | #: sequencer.c:358 |
473eb541 JX |
7427 | msgid "rebase" |
7428 | msgstr "变基" | |
1a79b2f1 | 7429 | |
33b62fba | 7430 | #: sequencer.c:360 |
a0b6b246 | 7431 | #, c-format |
473eb541 JX |
7432 | msgid "unknown action: %d" |
7433 | msgstr "未知动作:%d" | |
1a79b2f1 | 7434 | |
33b62fba | 7435 | #: sequencer.c:419 |
473eb541 JX |
7436 | msgid "" |
7437 | "after resolving the conflicts, mark the corrected paths\n" | |
7438 | "with 'git add <paths>' or 'git rm <paths>'" | |
7439 | msgstr "" | |
7440 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
7441 | "命令标记修正后的文件" | |
a0b6b246 | 7442 | |
33b62fba | 7443 | #: sequencer.c:422 |
473eb541 JX |
7444 | msgid "" |
7445 | "after resolving the conflicts, mark the corrected paths\n" | |
7446 | "with 'git add <paths>' or 'git rm <paths>'\n" | |
7447 | "and commit the result with 'git commit'" | |
7448 | msgstr "" | |
7449 | "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" | |
7450 | "对修正后的文件做标记,然后用 'git commit' 提交" | |
a0b6b246 | 7451 | |
33b62fba | 7452 | #: sequencer.c:435 sequencer.c:3271 |
a0b6b246 | 7453 | #, c-format |
473eb541 JX |
7454 | msgid "could not lock '%s'" |
7455 | msgstr "不能锁定 '%s'" | |
fd8cb379 | 7456 | |
33b62fba | 7457 | #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289 |
ec3d4607 | 7458 | #: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631 |
a0b6b246 | 7459 | #, c-format |
473eb541 JX |
7460 | msgid "could not write to '%s'" |
7461 | msgstr "不能写入 '%s'" | |
a0b6b246 | 7462 | |
33b62fba | 7463 | #: sequencer.c:442 |
473eb541 JX |
7464 | #, c-format |
7465 | msgid "could not write eol to '%s'" | |
7466 | msgstr "不能将换行符写入 '%s'" | |
c1ac5258 | 7467 | |
33b62fba | 7468 | #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291 |
ec3d4607 | 7469 | #: sequencer.c:3555 |
473eb541 JX |
7470 | #, c-format |
7471 | msgid "failed to finalize '%s'" | |
7472 | msgstr "无法完成 '%s'" | |
a0b6b246 | 7473 | |
33b62fba | 7474 | #: sequencer.c:486 |
a6cd2cc4 | 7475 | #, c-format |
473eb541 JX |
7476 | msgid "your local changes would be overwritten by %s." |
7477 | msgstr "您的本地修改将被%s覆盖。" | |
a6cd2cc4 | 7478 | |
33b62fba | 7479 | #: sequencer.c:490 |
473eb541 JX |
7480 | msgid "commit your changes or stash them to proceed." |
7481 | msgstr "提交您的修改或贮藏后再继续。" | |
a6cd2cc4 | 7482 | |
33b62fba | 7483 | #: sequencer.c:522 |
a6cd2cc4 | 7484 | #, c-format |
473eb541 JX |
7485 | msgid "%s: fast-forward" |
7486 | msgstr "%s:快进" | |
a0b6b246 | 7487 | |
33b62fba | 7488 | #: sequencer.c:561 builtin/tag.c:609 |
a0b6b246 | 7489 | #, c-format |
473eb541 JX |
7490 | msgid "Invalid cleanup mode %s" |
7491 | msgstr "无效的清理模式 %s" | |
a0b6b246 | 7492 | |
473eb541 JX |
7493 | #. TRANSLATORS: %s will be "revert", "cherry-pick" or |
7494 | #. "rebase". | |
7495 | #. | |
33b62fba | 7496 | #: sequencer.c:671 |
473eb541 JX |
7497 | #, c-format |
7498 | msgid "%s: Unable to write new index file" | |
7499 | msgstr "%s:无法写入新索引文件" | |
a0b6b246 | 7500 | |
33b62fba | 7501 | #: sequencer.c:685 |
473eb541 JX |
7502 | msgid "unable to update cache tree" |
7503 | msgstr "不能更新缓存树" | |
a0b6b246 | 7504 | |
33b62fba | 7505 | #: sequencer.c:699 |
473eb541 JX |
7506 | msgid "could not resolve HEAD commit" |
7507 | msgstr "不能解析 HEAD 提交" | |
a0b6b246 | 7508 | |
33b62fba | 7509 | #: sequencer.c:779 |
a0b6b246 | 7510 | #, c-format |
473eb541 JX |
7511 | msgid "no key present in '%.*s'" |
7512 | msgstr "在 '%.*s' 中没有 key" | |
a0b6b246 | 7513 | |
33b62fba | 7514 | #: sequencer.c:790 |
a0b6b246 | 7515 | #, c-format |
473eb541 JX |
7516 | msgid "unable to dequote value of '%s'" |
7517 | msgstr "无法为 '%s' 的值去引号" | |
a0b6b246 | 7518 | |
ec3d4607 JX |
7519 | #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729 |
7520 | #: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910 | |
a0b6b246 | 7521 | #, c-format |
473eb541 JX |
7522 | msgid "could not open '%s' for reading" |
7523 | msgstr "无法打开 '%s' 进行读取" | |
a6cd2cc4 | 7524 | |
33b62fba | 7525 | #: sequencer.c:837 |
473eb541 JX |
7526 | msgid "'GIT_AUTHOR_NAME' already given" |
7527 | msgstr "已经给出 'GIT_AUTHOR_NAME'" | |
a6cd2cc4 | 7528 | |
33b62fba | 7529 | #: sequencer.c:842 |
473eb541 JX |
7530 | msgid "'GIT_AUTHOR_EMAIL' already given" |
7531 | msgstr "已经给出 'GIT_AUTHOR_EMAIL'" | |
a6cd2cc4 | 7532 | |
33b62fba | 7533 | #: sequencer.c:847 |
473eb541 JX |
7534 | msgid "'GIT_AUTHOR_DATE' already given" |
7535 | msgstr "已经给出 'GIT_AUTHOR_DATE'" | |
a6cd2cc4 | 7536 | |
33b62fba | 7537 | #: sequencer.c:851 |
a6cd2cc4 | 7538 | #, c-format |
473eb541 JX |
7539 | msgid "unknown variable '%s'" |
7540 | msgstr "未知变量 '%s'" | |
a6cd2cc4 | 7541 | |
33b62fba | 7542 | #: sequencer.c:856 |
473eb541 JX |
7543 | msgid "missing 'GIT_AUTHOR_NAME'" |
7544 | msgstr "缺少 'GIT_AUTHOR_NAME'" | |
1a79b2f1 | 7545 | |
33b62fba | 7546 | #: sequencer.c:858 |
473eb541 JX |
7547 | msgid "missing 'GIT_AUTHOR_EMAIL'" |
7548 | msgstr "缺少 'GIT_AUTHOR_EMAIL'" | |
c1ac5258 | 7549 | |
33b62fba | 7550 | #: sequencer.c:860 |
473eb541 JX |
7551 | msgid "missing 'GIT_AUTHOR_DATE'" |
7552 | msgstr "缺少 'GIT_AUTHOR_DATE'" | |
7553 | ||
33b62fba | 7554 | #: sequencer.c:925 |
c1ac5258 JX |
7555 | #, c-format |
7556 | msgid "" | |
473eb541 JX |
7557 | "you have staged changes in your working tree\n" |
7558 | "If these changes are meant to be squashed into the previous commit, run:\n" | |
c1ac5258 JX |
7559 | "\n" |
7560 | " git commit --amend %s\n" | |
7561 | "\n" | |
473eb541 JX |
7562 | "If they are meant to go into a new commit, run:\n" |
7563 | "\n" | |
7564 | " git commit %s\n" | |
7565 | "\n" | |
7566 | "In both cases, once you're done, continue with:\n" | |
c1ac5258 JX |
7567 | "\n" |
7568 | " git rebase --continue\n" | |
7569 | msgstr "" | |
473eb541 | 7570 | "您的工作区中存在已暂存的修改\n" |
33b62fba | 7571 | "如果这些修改需要被挤压到前一个提交,执行:\n" |
c1ac5258 JX |
7572 | "\n" |
7573 | " git commit --amend %s\n" | |
7574 | "\n" | |
473eb541 JX |
7575 | "如果这些修改要形成一个新提交,执行:\n" |
7576 | "\n" | |
7577 | " git commit %s\n" | |
7578 | "\n" | |
7579 | "无论哪种情况,当您完成提交,继续执行:\n" | |
c1ac5258 JX |
7580 | "\n" |
7581 | " git rebase --continue\n" | |
7582 | ||
33b62fba | 7583 | #: sequencer.c:1212 |
473eb541 JX |
7584 | msgid "'prepare-commit-msg' hook failed" |
7585 | msgstr "'prepare-commit-msg' 钩子失败" | |
349ede6a | 7586 | |
33b62fba | 7587 | #: sequencer.c:1218 |
1a79b2f1 | 7588 | msgid "" |
473eb541 JX |
7589 | "Your name and email address were configured automatically based\n" |
7590 | "on your username and hostname. Please check that they are accurate.\n" | |
7591 | "You can suppress this message by setting them explicitly. Run the\n" | |
7592 | "following command and follow the instructions in your editor to edit\n" | |
7593 | "your configuration file:\n" | |
1a79b2f1 | 7594 | "\n" |
473eb541 JX |
7595 | " git config --global --edit\n" |
7596 | "\n" | |
7597 | "After doing this, you may fix the identity used for this commit with:\n" | |
7598 | "\n" | |
7599 | " git commit --amend --reset-author\n" | |
7600 | msgstr "" | |
7601 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" | |
7602 | "与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n" | |
7603 | "中编辑您的配置文件:\n" | |
1a79b2f1 | 7604 | "\n" |
473eb541 | 7605 | " git config --global --edit\n" |
1a79b2f1 | 7606 | "\n" |
473eb541 | 7607 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
1a79b2f1 | 7608 | "\n" |
473eb541 | 7609 | " git commit --amend --reset-author\n" |
1a79b2f1 | 7610 | |
33b62fba | 7611 | #: sequencer.c:1231 |
1a79b2f1 | 7612 | msgid "" |
473eb541 JX |
7613 | "Your name and email address were configured automatically based\n" |
7614 | "on your username and hostname. Please check that they are accurate.\n" | |
7615 | "You can suppress this message by setting them explicitly:\n" | |
1a79b2f1 | 7616 | "\n" |
473eb541 JX |
7617 | " git config --global user.name \"Your Name\"\n" |
7618 | " git config --global user.email you@example.com\n" | |
7619 | "\n" | |
7620 | "After doing this, you may fix the identity used for this commit with:\n" | |
1a79b2f1 | 7621 | "\n" |
473eb541 | 7622 | " git commit --amend --reset-author\n" |
1a79b2f1 | 7623 | msgstr "" |
473eb541 JX |
7624 | "您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n" |
7625 | "与否。您可以对其进行设置以免再出现本提示信息:\n" | |
1a79b2f1 | 7626 | "\n" |
473eb541 JX |
7627 | " git config --global user.name \"Your Name\"\n" |
7628 | " git config --global user.email you@example.com\n" | |
1a79b2f1 | 7629 | "\n" |
473eb541 JX |
7630 | "设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n" |
7631 | "\n" | |
7632 | " git commit --amend --reset-author\n" | |
1a79b2f1 | 7633 | |
33b62fba | 7634 | #: sequencer.c:1273 |
473eb541 JX |
7635 | msgid "couldn't look up newly created commit" |
7636 | msgstr "无法找到新创建的提交" | |
c1ac5258 | 7637 | |
33b62fba | 7638 | #: sequencer.c:1275 |
473eb541 JX |
7639 | msgid "could not parse newly created commit" |
7640 | msgstr "不能解析新创建的提交" | |
fd8cb379 | 7641 | |
33b62fba | 7642 | #: sequencer.c:1321 |
473eb541 JX |
7643 | msgid "unable to resolve HEAD after creating commit" |
7644 | msgstr "创建提交后,不能解析 HEAD" | |
fd8cb379 | 7645 | |
33b62fba | 7646 | #: sequencer.c:1323 |
473eb541 JX |
7647 | msgid "detached HEAD" |
7648 | msgstr "分离头指针" | |
c1ac5258 | 7649 | |
473eb541 | 7650 | # 译者:中文字符串拼接,可删除前导空格 |
33b62fba | 7651 | #: sequencer.c:1327 |
473eb541 JX |
7652 | msgid " (root-commit)" |
7653 | msgstr "(根提交)" | |
fd8cb379 | 7654 | |
33b62fba | 7655 | #: sequencer.c:1348 |
473eb541 JX |
7656 | msgid "could not parse HEAD" |
7657 | msgstr "不能解析 HEAD" | |
c1ac5258 | 7658 | |
33b62fba | 7659 | #: sequencer.c:1350 |
c1ac5258 | 7660 | #, c-format |
473eb541 JX |
7661 | msgid "HEAD %s is not a commit!" |
7662 | msgstr "HEAD %s 不是一个提交!" | |
c1ac5258 | 7663 | |
ec3d4607 | 7664 | #: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705 |
473eb541 JX |
7665 | msgid "could not parse HEAD commit" |
7666 | msgstr "不能解析 HEAD 提交" | |
7667 | ||
33b62fba | 7668 | #: sequencer.c:1410 sequencer.c:2295 |
473eb541 JX |
7669 | msgid "unable to parse commit author" |
7670 | msgstr "不能解析提交作者" | |
7671 | ||
ec3d4607 | 7672 | #: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707 |
473eb541 JX |
7673 | msgid "git write-tree failed to write a tree" |
7674 | msgstr "git write-tree 无法写入树对象" | |
fd8cb379 | 7675 | |
33b62fba | 7676 | #: sequencer.c:1454 sequencer.c:1574 |
fd8cb379 | 7677 | #, c-format |
473eb541 JX |
7678 | msgid "unable to read commit message from '%s'" |
7679 | msgstr "不能从 '%s' 读取提交说明" | |
fd8cb379 | 7680 | |
33b62fba | 7681 | #: sequencer.c:1485 sequencer.c:1517 |
fd8cb379 | 7682 | #, c-format |
473eb541 JX |
7683 | msgid "invalid author identity '%s'" |
7684 | msgstr "无效的作者身份 '%s'" | |
fd8cb379 | 7685 | |
33b62fba | 7686 | #: sequencer.c:1491 |
473eb541 JX |
7687 | msgid "corrupt author: missing date information" |
7688 | msgstr "损坏的作者:缺失日期信息" | |
fd8cb379 | 7689 | |
ec3d4607 JX |
7690 | #: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910 |
7691 | #: builtin/merge.c:935 t/helper/test-fast-rebase.c:78 | |
473eb541 JX |
7692 | msgid "failed to write commit object" |
7693 | msgstr "写提交对象失败" | |
349ede6a | 7694 | |
ec3d4607 JX |
7695 | #: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199 |
7696 | #: t/helper/test-fast-rebase.c:217 | |
1a79b2f1 | 7697 | #, c-format |
473eb541 JX |
7698 | msgid "could not update %s" |
7699 | msgstr "不能更新 %s" | |
1a79b2f1 | 7700 | |
33b62fba | 7701 | #: sequencer.c:1606 |
1a79b2f1 | 7702 | #, c-format |
473eb541 JX |
7703 | msgid "could not parse commit %s" |
7704 | msgstr "不能解析提交 %s" | |
349ede6a | 7705 | |
33b62fba | 7706 | #: sequencer.c:1611 |
349ede6a | 7707 | #, c-format |
473eb541 JX |
7708 | msgid "could not parse parent commit %s" |
7709 | msgstr "不能解析父提交 %s" | |
349ede6a | 7710 | |
33b62fba | 7711 | #: sequencer.c:1694 sequencer.c:1975 |
349ede6a | 7712 | #, c-format |
473eb541 JX |
7713 | msgid "unknown command: %d" |
7714 | msgstr "未知命令:%d" | |
349ede6a | 7715 | |
33b62fba JX |
7716 | #: sequencer.c:1736 git-rebase--preserve-merges.sh:486 |
7717 | msgid "This is the 1st commit message:" | |
7718 | msgstr "这是第一个提交说明:" | |
7719 | ||
7720 | #: sequencer.c:1737 | |
7721 | #, c-format | |
7722 | msgid "This is the commit message #%d:" | |
7723 | msgstr "这是提交说明 #%d:" | |
7724 | ||
7725 | #: sequencer.c:1738 | |
7726 | msgid "The 1st commit message will be skipped:" | |
7727 | msgstr "第一个提交说明将被跳过:" | |
7728 | ||
7729 | #: sequencer.c:1739 | |
7730 | #, c-format | |
7731 | msgid "The commit message #%d will be skipped:" | |
7732 | msgstr "提交说明 #%d 将被跳过:" | |
7733 | ||
7734 | #: sequencer.c:1740 | |
349ede6a | 7735 | #, c-format |
473eb541 JX |
7736 | msgid "This is a combination of %d commits." |
7737 | msgstr "这是一个 %d 个提交的组合。" | |
7738 | ||
33b62fba JX |
7739 | #: sequencer.c:1887 sequencer.c:1944 |
7740 | #, c-format | |
7741 | msgid "cannot write '%s'" | |
7742 | msgstr "不能写 '%s'" | |
7743 | ||
7744 | #: sequencer.c:1934 | |
473eb541 JX |
7745 | msgid "need a HEAD to fixup" |
7746 | msgstr "需要一个 HEAD 来修复" | |
7747 | ||
ec3d4607 | 7748 | #: sequencer.c:1936 sequencer.c:3582 |
473eb541 JX |
7749 | msgid "could not read HEAD" |
7750 | msgstr "不能读取 HEAD" | |
7751 | ||
33b62fba | 7752 | #: sequencer.c:1938 |
473eb541 JX |
7753 | msgid "could not read HEAD's commit message" |
7754 | msgstr "不能读取 HEAD 的提交说明" | |
1a79b2f1 | 7755 | |
33b62fba | 7756 | #: sequencer.c:1962 |
473eb541 JX |
7757 | #, c-format |
7758 | msgid "could not read commit message of %s" | |
7759 | msgstr "不能读取 %s 的提交说明" | |
349ede6a | 7760 | |
33b62fba | 7761 | #: sequencer.c:2072 |
473eb541 JX |
7762 | msgid "your index file is unmerged." |
7763 | msgstr "您的索引文件未完成合并。" | |
7764 | ||
33b62fba | 7765 | #: sequencer.c:2079 |
473eb541 JX |
7766 | msgid "cannot fixup root commit" |
7767 | msgstr "不能修复根提交" | |
4c27fcb5 | 7768 | |
33b62fba | 7769 | #: sequencer.c:2098 |
4c27fcb5 | 7770 | #, c-format |
473eb541 JX |
7771 | msgid "commit %s is a merge but no -m option was given." |
7772 | msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" | |
4c27fcb5 | 7773 | |
33b62fba | 7774 | #: sequencer.c:2106 sequencer.c:2114 |
fd8cb379 | 7775 | #, c-format |
473eb541 JX |
7776 | msgid "commit %s does not have parent %d" |
7777 | msgstr "提交 %s 没有第 %d 个父提交" | |
fd8cb379 | 7778 | |
33b62fba | 7779 | #: sequencer.c:2120 |
349ede6a | 7780 | #, c-format |
473eb541 JX |
7781 | msgid "cannot get commit message for %s" |
7782 | msgstr "不能得到 %s 的提交说明" | |
349ede6a | 7783 | |
473eb541 JX |
7784 | #. TRANSLATORS: The first %s will be a "todo" command like |
7785 | #. "revert" or "pick", the second %s a SHA1. | |
33b62fba | 7786 | #: sequencer.c:2139 |
1a79b2f1 | 7787 | #, c-format |
473eb541 JX |
7788 | msgid "%s: cannot parse parent commit %s" |
7789 | msgstr "%s:不能解析父提交 %s" | |
1a79b2f1 | 7790 | |
33b62fba | 7791 | #: sequencer.c:2205 |
1a79b2f1 | 7792 | #, c-format |
473eb541 JX |
7793 | msgid "could not rename '%s' to '%s'" |
7794 | msgstr "不能将 '%s' 重命名为 '%s'" | |
1a79b2f1 | 7795 | |
33b62fba | 7796 | #: sequencer.c:2265 |
473eb541 JX |
7797 | #, c-format |
7798 | msgid "could not revert %s... %s" | |
7799 | msgstr "不能还原 %s... %s" | |
1a79b2f1 | 7800 | |
33b62fba | 7801 | #: sequencer.c:2266 |
473eb541 JX |
7802 | #, c-format |
7803 | msgid "could not apply %s... %s" | |
7804 | msgstr "不能应用 %s... %s" | |
1a79b2f1 | 7805 | |
33b62fba | 7806 | #: sequencer.c:2287 |
1a79b2f1 | 7807 | #, c-format |
473eb541 JX |
7808 | msgid "dropping %s %s -- patch contents already upstream\n" |
7809 | msgstr "丢弃 %s %s -- 补丁内容已在上游\n" | |
1a79b2f1 | 7810 | |
33b62fba | 7811 | #: sequencer.c:2345 |
349ede6a | 7812 | #, c-format |
473eb541 JX |
7813 | msgid "git %s: failed to read the index" |
7814 | msgstr "git %s:无法读取索引" | |
349ede6a | 7815 | |
33b62fba | 7816 | #: sequencer.c:2352 |
473eb541 JX |
7817 | #, c-format |
7818 | msgid "git %s: failed to refresh the index" | |
7819 | msgstr "git %s:无法刷新索引" | |
1a79b2f1 | 7820 | |
33b62fba | 7821 | #: sequencer.c:2425 |
473eb541 JX |
7822 | #, c-format |
7823 | msgid "%s does not accept arguments: '%s'" | |
7824 | msgstr "%s 不接受参数:'%s'" | |
1a79b2f1 | 7825 | |
33b62fba | 7826 | #: sequencer.c:2434 |
1a79b2f1 | 7827 | #, c-format |
473eb541 JX |
7828 | msgid "missing arguments for %s" |
7829 | msgstr "缺少 %s 的参数" | |
1a79b2f1 | 7830 | |
33b62fba | 7831 | #: sequencer.c:2477 |
1a79b2f1 | 7832 | #, c-format |
473eb541 JX |
7833 | msgid "could not parse '%s'" |
7834 | msgstr "无法解析 '%s'" | |
1a79b2f1 | 7835 | |
33b62fba | 7836 | #: sequencer.c:2538 |
473eb541 JX |
7837 | #, c-format |
7838 | msgid "invalid line %d: %.*s" | |
7839 | msgstr "无效行 %d:%.*s" | |
1a79b2f1 | 7840 | |
33b62fba | 7841 | #: sequencer.c:2549 |
fd8cb379 | 7842 | #, c-format |
473eb541 JX |
7843 | msgid "cannot '%s' without a previous commit" |
7844 | msgstr "没有父提交的情况下不能 '%s'" | |
fd8cb379 | 7845 | |
33b62fba | 7846 | #: sequencer.c:2635 |
473eb541 JX |
7847 | msgid "cancelling a cherry picking in progress" |
7848 | msgstr "正在取消一个进行中的拣选" | |
fd8cb379 | 7849 | |
33b62fba | 7850 | #: sequencer.c:2644 |
473eb541 JX |
7851 | msgid "cancelling a revert in progress" |
7852 | msgstr "正在取消一个进行中的还原" | |
1a79b2f1 | 7853 | |
33b62fba | 7854 | #: sequencer.c:2690 |
473eb541 JX |
7855 | msgid "please fix this using 'git rebase --edit-todo'." |
7856 | msgstr "请用 'git rebase --edit-todo' 来修改。" | |
a0b6b246 | 7857 | |
33b62fba | 7858 | #: sequencer.c:2692 |
a0b6b246 | 7859 | #, c-format |
473eb541 JX |
7860 | msgid "unusable instruction sheet: '%s'" |
7861 | msgstr "不可用的指令清单:'%s'" | |
a0b6b246 | 7862 | |
33b62fba | 7863 | #: sequencer.c:2697 |
473eb541 JX |
7864 | msgid "no commits parsed." |
7865 | msgstr "没有解析提交。" | |
6937cb4e | 7866 | |
33b62fba | 7867 | #: sequencer.c:2708 |
473eb541 JX |
7868 | msgid "cannot cherry-pick during a revert." |
7869 | msgstr "不能在回退中执行拣选。" | |
6937cb4e | 7870 | |
33b62fba | 7871 | #: sequencer.c:2710 |
473eb541 JX |
7872 | msgid "cannot revert during a cherry-pick." |
7873 | msgstr "不能在拣选中执行回退。" | |
4c27fcb5 | 7874 | |
33b62fba | 7875 | #: sequencer.c:2788 |
473eb541 JX |
7876 | #, c-format |
7877 | msgid "invalid value for %s: %s" | |
7878 | msgstr "%s 的值无效:%s" | |
4c27fcb5 | 7879 | |
33b62fba | 7880 | #: sequencer.c:2897 |
473eb541 JX |
7881 | msgid "unusable squash-onto" |
7882 | msgstr "不可用的 squash-onto" | |
6937cb4e | 7883 | |
33b62fba | 7884 | #: sequencer.c:2917 |
31e5e17b | 7885 | #, c-format |
473eb541 JX |
7886 | msgid "malformed options sheet: '%s'" |
7887 | msgstr "格式错误的选项清单:'%s'" | |
31e5e17b | 7888 | |
ec3d4607 | 7889 | #: sequencer.c:3012 sequencer.c:4868 |
473eb541 JX |
7890 | msgid "empty commit set passed" |
7891 | msgstr "提供了空的提交集" | |
6792b93b | 7892 | |
33b62fba | 7893 | #: sequencer.c:3029 |
473eb541 JX |
7894 | msgid "revert is already in progress" |
7895 | msgstr "一个还原操作已在进行" | |
6792b93b | 7896 | |
33b62fba | 7897 | #: sequencer.c:3031 |
31e5e17b | 7898 | #, c-format |
473eb541 JX |
7899 | msgid "try \"git revert (--continue | %s--abort | --quit)\"" |
7900 | msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" | |
31e5e17b | 7901 | |
33b62fba | 7902 | #: sequencer.c:3034 |
473eb541 JX |
7903 | msgid "cherry-pick is already in progress" |
7904 | msgstr "拣选操作已在进行" | |
7905 | ||
33b62fba | 7906 | #: sequencer.c:3036 |
a0b6b246 | 7907 | #, c-format |
473eb541 JX |
7908 | msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" |
7909 | msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" | |
2e8451e8 | 7910 | |
33b62fba | 7911 | #: sequencer.c:3050 |
473eb541 JX |
7912 | #, c-format |
7913 | msgid "could not create sequencer directory '%s'" | |
7914 | msgstr "不能创建序列目录 '%s'" | |
31e5e17b | 7915 | |
33b62fba | 7916 | #: sequencer.c:3065 |
473eb541 JX |
7917 | msgid "could not lock HEAD" |
7918 | msgstr "不能锁定 HEAD" | |
31e5e17b | 7919 | |
ec3d4607 | 7920 | #: sequencer.c:3125 sequencer.c:4581 |
473eb541 JX |
7921 | msgid "no cherry-pick or revert in progress" |
7922 | msgstr "拣选或还原操作并未进行" | |
6792b93b | 7923 | |
33b62fba | 7924 | #: sequencer.c:3127 sequencer.c:3138 |
473eb541 JX |
7925 | msgid "cannot resolve HEAD" |
7926 | msgstr "不能解析 HEAD" | |
2e8451e8 | 7927 | |
33b62fba | 7928 | #: sequencer.c:3129 sequencer.c:3173 |
473eb541 JX |
7929 | msgid "cannot abort from a branch yet to be born" |
7930 | msgstr "不能从尚未建立的分支终止" | |
d9488fea | 7931 | |
ec3d4607 | 7932 | #: sequencer.c:3159 builtin/grep.c:758 |
1003b3a5 | 7933 | #, c-format |
473eb541 JX |
7934 | msgid "cannot open '%s'" |
7935 | msgstr "不能打开 '%s'" | |
1003b3a5 | 7936 | |
33b62fba | 7937 | #: sequencer.c:3161 |
31e5e17b | 7938 | #, c-format |
473eb541 JX |
7939 | msgid "cannot read '%s': %s" |
7940 | msgstr "不能读取 '%s':%s" | |
31e5e17b | 7941 | |
33b62fba | 7942 | #: sequencer.c:3162 |
473eb541 JX |
7943 | msgid "unexpected end of file" |
7944 | msgstr "意外的文件结束" | |
31e5e17b | 7945 | |
33b62fba | 7946 | #: sequencer.c:3168 |
31e5e17b | 7947 | #, c-format |
473eb541 JX |
7948 | msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" |
7949 | msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" | |
31e5e17b | 7950 | |
33b62fba | 7951 | #: sequencer.c:3179 |
473eb541 JX |
7952 | msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" |
7953 | msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" | |
31e5e17b | 7954 | |
33b62fba | 7955 | #: sequencer.c:3220 |
473eb541 JX |
7956 | msgid "no revert in progress" |
7957 | msgstr "没有正在进行的还原" | |
31e5e17b | 7958 | |
33b62fba | 7959 | #: sequencer.c:3229 |
473eb541 JX |
7960 | msgid "no cherry-pick in progress" |
7961 | msgstr "没有正在进行的拣选" | |
31e5e17b | 7962 | |
33b62fba | 7963 | #: sequencer.c:3239 |
473eb541 JX |
7964 | msgid "failed to skip the commit" |
7965 | msgstr "无法跳过这个提交" | |
7966 | ||
33b62fba | 7967 | #: sequencer.c:3246 |
473eb541 JX |
7968 | msgid "there is nothing to skip" |
7969 | msgstr "没有要跳过的" | |
7970 | ||
33b62fba | 7971 | #: sequencer.c:3249 |
31e5e17b | 7972 | #, c-format |
473eb541 JX |
7973 | msgid "" |
7974 | "have you committed already?\n" | |
7975 | "try \"git %s --continue\"" | |
7976 | msgstr "" | |
7977 | "您已经提交了么?\n" | |
7978 | "试试 \"git %s --continue\"" | |
31e5e17b | 7979 | |
ec3d4607 | 7980 | #: sequencer.c:3411 sequencer.c:4472 |
473eb541 JX |
7981 | msgid "cannot read HEAD" |
7982 | msgstr "不能读取 HEAD" | |
7983 | ||
33b62fba | 7984 | #: sequencer.c:3428 |
31e5e17b | 7985 | #, c-format |
473eb541 JX |
7986 | msgid "unable to copy '%s' to '%s'" |
7987 | msgstr "无法拷贝 '%s' 至 '%s'" | |
31e5e17b | 7988 | |
33b62fba | 7989 | #: sequencer.c:3436 |
473eb541 JX |
7990 | #, c-format |
7991 | msgid "" | |
7992 | "You can amend the commit now, with\n" | |
7993 | "\n" | |
7994 | " git commit --amend %s\n" | |
7995 | "\n" | |
7996 | "Once you are satisfied with your changes, run\n" | |
7997 | "\n" | |
7998 | " git rebase --continue\n" | |
7999 | msgstr "" | |
8000 | "您现在可以修补这个提交,使用\n" | |
8001 | "\n" | |
8002 | " git commit --amend %s\n" | |
8003 | "\n" | |
8004 | "当您对变更感到满意,执行\n" | |
8005 | "\n" | |
8006 | " git rebase --continue\n" | |
1003b3a5 | 8007 | |
33b62fba | 8008 | #: sequencer.c:3446 |
31e5e17b | 8009 | #, c-format |
473eb541 JX |
8010 | msgid "Could not apply %s... %.*s" |
8011 | msgstr "不能应用 %s... %.*s" | |
31e5e17b | 8012 | |
33b62fba | 8013 | #: sequencer.c:3453 |
473eb541 JX |
8014 | #, c-format |
8015 | msgid "Could not merge %.*s" | |
8016 | msgstr "不能合并 %.*s" | |
1003b3a5 | 8017 | |
33b62fba | 8018 | #: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644 |
87cb7997 | 8019 | #, c-format |
473eb541 JX |
8020 | msgid "could not copy '%s' to '%s'" |
8021 | msgstr "不能拷贝 '%s' 至 '%s'" | |
87cb7997 | 8022 | |
33b62fba | 8023 | #: sequencer.c:3483 |
06991777 | 8024 | #, c-format |
473eb541 JX |
8025 | msgid "Executing: %s\n" |
8026 | msgstr "正在执行:%s\n" | |
06991777 | 8027 | |
33b62fba | 8028 | #: sequencer.c:3498 |
a0b6b246 JX |
8029 | #, c-format |
8030 | msgid "" | |
473eb541 JX |
8031 | "execution failed: %s\n" |
8032 | "%sYou can fix the problem, and then run\n" | |
8033 | "\n" | |
8034 | " git rebase --continue\n" | |
8035 | "\n" | |
a0b6b246 | 8036 | msgstr "" |
473eb541 JX |
8037 | "执行失败:%s\n" |
8038 | "%s您可以改正该问题,然后运行\n" | |
8039 | "\n" | |
8040 | " git rebase --continue\n" | |
8041 | "\n" | |
1003b3a5 | 8042 | |
33b62fba | 8043 | #: sequencer.c:3504 |
473eb541 JX |
8044 | msgid "and made changes to the index and/or the working tree\n" |
8045 | msgstr "并且修改索引和/或工作区\n" | |
8046 | ||
33b62fba | 8047 | #: sequencer.c:3510 |
a0b6b246 JX |
8048 | #, c-format |
8049 | msgid "" | |
473eb541 JX |
8050 | "execution succeeded: %s\n" |
8051 | "but left changes to the index and/or the working tree\n" | |
8052 | "Commit or stash your changes, and then run\n" | |
8053 | "\n" | |
8054 | " git rebase --continue\n" | |
8055 | "\n" | |
a0b6b246 | 8056 | msgstr "" |
473eb541 JX |
8057 | "执行成功:%s\n" |
8058 | "但是在索引和/或工作区中存在变更\n" | |
8059 | "提交或贮藏修改,然后运行\n" | |
8060 | "\n" | |
8061 | " git rebase --continue\n" | |
8062 | "\n" | |
6792b93b | 8063 | |
ec3d4607 | 8064 | #: sequencer.c:3572 |
473eb541 JX |
8065 | #, c-format |
8066 | msgid "illegal label name: '%.*s'" | |
8067 | msgstr "非法的标签名称:'%.*s'" | |
31e5e17b | 8068 | |
ec3d4607 | 8069 | #: sequencer.c:3645 |
473eb541 JX |
8070 | msgid "writing fake root commit" |
8071 | msgstr "写伪根提交" | |
31e5e17b | 8072 | |
ec3d4607 | 8073 | #: sequencer.c:3650 |
473eb541 JX |
8074 | msgid "writing squash-onto" |
8075 | msgstr "写入 squash-onto" | |
31e5e17b | 8076 | |
ec3d4607 | 8077 | #: sequencer.c:3734 |
c1ac5258 | 8078 | #, c-format |
473eb541 JX |
8079 | msgid "could not resolve '%s'" |
8080 | msgstr "无法解析 '%s'" | |
8081 | ||
ec3d4607 | 8082 | #: sequencer.c:3767 |
473eb541 JX |
8083 | msgid "cannot merge without a current revision" |
8084 | msgstr "没有当前版本不能合并" | |
c1ac5258 | 8085 | |
ec3d4607 | 8086 | #: sequencer.c:3789 |
c1ac5258 | 8087 | #, c-format |
473eb541 JX |
8088 | msgid "unable to parse '%.*s'" |
8089 | msgstr "无法解析 '%.*s'" | |
c1ac5258 | 8090 | |
ec3d4607 | 8091 | #: sequencer.c:3798 |
c1ac5258 | 8092 | #, c-format |
473eb541 JX |
8093 | msgid "nothing to merge: '%.*s'" |
8094 | msgstr "无可用合并:'%.*s'" | |
8095 | ||
ec3d4607 | 8096 | #: sequencer.c:3810 |
473eb541 JX |
8097 | msgid "octopus merge cannot be executed on top of a [new root]" |
8098 | msgstr "章鱼合并不能在一个新的根提交上执行" | |
c1ac5258 | 8099 | |
ec3d4607 | 8100 | #: sequencer.c:3826 |
c1ac5258 | 8101 | #, c-format |
473eb541 JX |
8102 | msgid "could not get commit message of '%s'" |
8103 | msgstr "不能获取 '%s' 的提交说明" | |
c1ac5258 | 8104 | |
ec3d4607 | 8105 | #: sequencer.c:4009 |
473eb541 JX |
8106 | #, c-format |
8107 | msgid "could not even attempt to merge '%.*s'" | |
8108 | msgstr "甚至不能尝试合并 '%.*s'" | |
c1ac5258 | 8109 | |
ec3d4607 | 8110 | #: sequencer.c:4025 |
473eb541 JX |
8111 | msgid "merge: Unable to write new index file" |
8112 | msgstr "合并:无法写入新索引文件" | |
c1ac5258 | 8113 | |
ec3d4607 | 8114 | #: sequencer.c:4099 |
473eb541 | 8115 | msgid "Cannot autostash" |
ec3d4607 | 8116 | msgstr "无法自动贮藏" |
c1ac5258 | 8117 | |
ec3d4607 | 8118 | #: sequencer.c:4102 |
a0b6b246 | 8119 | #, c-format |
473eb541 | 8120 | msgid "Unexpected stash response: '%s'" |
ec3d4607 | 8121 | msgstr "意外的贮藏响应:'%s'" |
a0b6b246 | 8122 | |
ec3d4607 | 8123 | #: sequencer.c:4108 |
a0b6b246 | 8124 | #, c-format |
473eb541 JX |
8125 | msgid "Could not create directory for '%s'" |
8126 | msgstr "不能为 '%s' 创建目录" | |
a0b6b246 | 8127 | |
ec3d4607 | 8128 | #: sequencer.c:4111 |
a0b6b246 | 8129 | #, c-format |
473eb541 | 8130 | msgid "Created autostash: %s\n" |
ec3d4607 | 8131 | msgstr "创建了自动贮藏:%s\n" |
a0b6b246 | 8132 | |
ec3d4607 | 8133 | #: sequencer.c:4115 |
473eb541 | 8134 | msgid "could not reset --hard" |
ec3d4607 | 8135 | msgstr "无法硬性重置(reset --hard)" |
a0b6b246 | 8136 | |
ec3d4607 | 8137 | #: sequencer.c:4140 |
a0b6b246 | 8138 | #, c-format |
473eb541 | 8139 | msgid "Applied autostash.\n" |
ec3d4607 | 8140 | msgstr "已应用自动贮藏。\n" |
a0b6b246 | 8141 | |
ec3d4607 | 8142 | #: sequencer.c:4152 |
a6cd2cc4 | 8143 | #, c-format |
473eb541 JX |
8144 | msgid "cannot store %s" |
8145 | msgstr "不能存储 %s" | |
a6cd2cc4 | 8146 | |
ec3d4607 | 8147 | #: sequencer.c:4155 |
c1ac5258 | 8148 | #, c-format |
473eb541 JX |
8149 | msgid "" |
8150 | "%s\n" | |
8151 | "Your changes are safe in the stash.\n" | |
8152 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
8153 | msgstr "" | |
8154 | "%s\n" | |
8155 | "您的修改在贮藏区中很安全。\n" | |
8156 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
c1ac5258 | 8157 | |
ec3d4607 | 8158 | #: sequencer.c:4160 |
473eb541 JX |
8159 | msgid "Applying autostash resulted in conflicts." |
8160 | msgstr "应用自动贮藏导致冲突。" | |
c1ac5258 | 8161 | |
ec3d4607 | 8162 | #: sequencer.c:4161 |
473eb541 JX |
8163 | msgid "Autostash exists; creating a new stash entry." |
8164 | msgstr "自动贮藏已经存在;正在创建一个新的贮藏条目。" | |
8165 | ||
ec3d4607 | 8166 | #: sequencer.c:4233 git-rebase--preserve-merges.sh:769 |
473eb541 JX |
8167 | msgid "could not detach HEAD" |
8168 | msgstr "不能分离头指针" | |
c1ac5258 | 8169 | |
ec3d4607 | 8170 | #: sequencer.c:4248 |
c1ac5258 | 8171 | #, c-format |
473eb541 JX |
8172 | msgid "Stopped at HEAD\n" |
8173 | msgstr "停止在 HEAD\n" | |
c1ac5258 | 8174 | |
ec3d4607 | 8175 | #: sequencer.c:4250 |
c1ac5258 | 8176 | #, c-format |
473eb541 JX |
8177 | msgid "Stopped at %s\n" |
8178 | msgstr "停止在 %s\n" | |
c1ac5258 | 8179 | |
ec3d4607 | 8180 | #: sequencer.c:4258 |
473eb541 JX |
8181 | #, c-format |
8182 | msgid "" | |
8183 | "Could not execute the todo command\n" | |
8184 | "\n" | |
8185 | " %.*s\n" | |
8186 | "It has been rescheduled; To edit the command before continuing, please\n" | |
8187 | "edit the todo list first:\n" | |
8188 | "\n" | |
8189 | " git rebase --edit-todo\n" | |
8190 | " git rebase --continue\n" | |
8191 | msgstr "" | |
8192 | "无法执行待办命令\n" | |
8193 | "\n" | |
8194 | " %.*s\n" | |
8195 | "已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n" | |
8196 | "\n" | |
8197 | " git rebase --edit-todo\n" | |
8198 | " git rebase --continue\n" | |
c1ac5258 | 8199 | |
ec3d4607 | 8200 | #: sequencer.c:4304 |
c1ac5258 | 8201 | #, c-format |
473eb541 JX |
8202 | msgid "Rebasing (%d/%d)%s" |
8203 | msgstr "正在变基(%d/%d)%s" | |
c1ac5258 | 8204 | |
ec3d4607 | 8205 | #: sequencer.c:4350 |
c1ac5258 | 8206 | #, c-format |
473eb541 JX |
8207 | msgid "Stopped at %s... %.*s\n" |
8208 | msgstr "停止在 %s... %.*s\n" | |
c1ac5258 | 8209 | |
ec3d4607 | 8210 | #: sequencer.c:4421 |
c1ac5258 | 8211 | #, c-format |
473eb541 JX |
8212 | msgid "unknown command %d" |
8213 | msgstr "未知命令 %d" | |
8214 | ||
ec3d4607 | 8215 | #: sequencer.c:4480 |
473eb541 JX |
8216 | msgid "could not read orig-head" |
8217 | msgstr "不能读取 orig-head" | |
8218 | ||
ec3d4607 | 8219 | #: sequencer.c:4485 |
473eb541 JX |
8220 | msgid "could not read 'onto'" |
8221 | msgstr "不能读取 'onto'" | |
c1ac5258 | 8222 | |
ec3d4607 | 8223 | #: sequencer.c:4499 |
c1ac5258 | 8224 | #, c-format |
473eb541 JX |
8225 | msgid "could not update HEAD to %s" |
8226 | msgstr "不能更新 HEAD 为 %s" | |
c1ac5258 | 8227 | |
ec3d4607 | 8228 | #: sequencer.c:4559 |
c1ac5258 | 8229 | #, c-format |
473eb541 JX |
8230 | msgid "Successfully rebased and updated %s.\n" |
8231 | msgstr "成功变基并更新 %s。\n" | |
c1ac5258 | 8232 | |
ec3d4607 | 8233 | #: sequencer.c:4611 |
473eb541 JX |
8234 | msgid "cannot rebase: You have unstaged changes." |
8235 | msgstr "不能变基:您有未暂存的变更。" | |
8236 | ||
ec3d4607 | 8237 | #: sequencer.c:4620 |
473eb541 JX |
8238 | msgid "cannot amend non-existing commit" |
8239 | msgstr "不能修补不存在的提交" | |
8240 | ||
ec3d4607 | 8241 | #: sequencer.c:4622 |
c1ac5258 | 8242 | #, c-format |
473eb541 JX |
8243 | msgid "invalid file: '%s'" |
8244 | msgstr "无效文件:'%s'" | |
c1ac5258 | 8245 | |
ec3d4607 | 8246 | #: sequencer.c:4624 |
c1ac5258 | 8247 | #, c-format |
473eb541 JX |
8248 | msgid "invalid contents: '%s'" |
8249 | msgstr "无效内容:'%s'" | |
8250 | ||
ec3d4607 | 8251 | #: sequencer.c:4627 |
473eb541 JX |
8252 | msgid "" |
8253 | "\n" | |
8254 | "You have uncommitted changes in your working tree. Please, commit them\n" | |
8255 | "first and then run 'git rebase --continue' again." | |
8256 | msgstr "" | |
8257 | "\n" | |
8258 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
c1ac5258 | 8259 | |
ec3d4607 | 8260 | #: sequencer.c:4663 sequencer.c:4702 |
c1ac5258 | 8261 | #, c-format |
473eb541 JX |
8262 | msgid "could not write file: '%s'" |
8263 | msgstr "不能写入文件:'%s'" | |
8264 | ||
ec3d4607 | 8265 | #: sequencer.c:4718 |
473eb541 JX |
8266 | msgid "could not remove CHERRY_PICK_HEAD" |
8267 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
8268 | ||
ec3d4607 | 8269 | #: sequencer.c:4725 |
473eb541 JX |
8270 | msgid "could not commit staged changes." |
8271 | msgstr "不能提交暂存的修改。" | |
c1ac5258 | 8272 | |
ec3d4607 | 8273 | #: sequencer.c:4845 |
c1ac5258 | 8274 | #, c-format |
473eb541 JX |
8275 | msgid "%s: can't cherry-pick a %s" |
8276 | msgstr "%s:不能拣选一个%s" | |
c1ac5258 | 8277 | |
ec3d4607 | 8278 | #: sequencer.c:4849 |
c1ac5258 | 8279 | #, c-format |
473eb541 JX |
8280 | msgid "%s: bad revision" |
8281 | msgstr "%s:错误的版本" | |
c1ac5258 | 8282 | |
ec3d4607 | 8283 | #: sequencer.c:4884 |
473eb541 JX |
8284 | msgid "can't revert as initial commit" |
8285 | msgstr "不能作为初始提交回退" | |
c1ac5258 | 8286 | |
ec3d4607 | 8287 | #: sequencer.c:5361 |
473eb541 JX |
8288 | msgid "make_script: unhandled options" |
8289 | msgstr "make_script:有未能处理的选项" | |
c1ac5258 | 8290 | |
ec3d4607 | 8291 | #: sequencer.c:5364 |
473eb541 JX |
8292 | msgid "make_script: error preparing revisions" |
8293 | msgstr "make_script:准备版本时错误" | |
c1ac5258 | 8294 | |
ec3d4607 | 8295 | #: sequencer.c:5614 sequencer.c:5631 |
473eb541 JX |
8296 | msgid "nothing to do" |
8297 | msgstr "无事可做" | |
c1ac5258 | 8298 | |
ec3d4607 | 8299 | #: sequencer.c:5650 |
473eb541 JX |
8300 | msgid "could not skip unnecessary pick commands" |
8301 | msgstr "无法跳过不必要的拣选" | |
c1ac5258 | 8302 | |
ec3d4607 | 8303 | #: sequencer.c:5750 |
473eb541 JX |
8304 | msgid "the script was already rearranged." |
8305 | msgstr "脚本已经重新编排。" | |
c1ac5258 | 8306 | |
473eb541 | 8307 | #: setup.c:133 |
c1ac5258 | 8308 | #, c-format |
473eb541 JX |
8309 | msgid "'%s' is outside repository at '%s'" |
8310 | msgstr "'%s' 在位于 '%s' 的仓库之外" | |
c1ac5258 | 8311 | |
473eb541 | 8312 | #: setup.c:185 |
c1ac5258 | 8313 | #, c-format |
473eb541 JX |
8314 | msgid "" |
8315 | "%s: no such path in the working tree.\n" | |
8316 | "Use 'git <command> -- <path>...' to specify paths that do not exist locally." | |
8317 | msgstr "" | |
8318 | "%s:工作区中无此路径。\n" | |
8319 | "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" | |
c1ac5258 | 8320 | |
473eb541 | 8321 | #: setup.c:198 |
c1ac5258 | 8322 | #, c-format |
473eb541 JX |
8323 | msgid "" |
8324 | "ambiguous argument '%s': unknown revision or path not in the working tree.\n" | |
8325 | "Use '--' to separate paths from revisions, like this:\n" | |
8326 | "'git <command> [<revision>...] -- [<file>...]'" | |
8327 | msgstr "" | |
8328 | "有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n" | |
8329 | "使用 '--' 来分隔版本和路径,例如:\n" | |
8330 | "'git <命令> [<版本>...] -- [<文件>...]'" | |
c1ac5258 | 8331 | |
473eb541 | 8332 | #: setup.c:264 |
c1ac5258 | 8333 | #, c-format |
473eb541 JX |
8334 | msgid "option '%s' must come before non-option arguments" |
8335 | msgstr "选项 '%s' 必须在其他非选项参数之前" | |
c1ac5258 | 8336 | |
473eb541 JX |
8337 | #: setup.c:283 |
8338 | #, c-format | |
8339 | msgid "" | |
8340 | "ambiguous argument '%s': both revision and filename\n" | |
8341 | "Use '--' to separate paths from revisions, like this:\n" | |
8342 | "'git <command> [<revision>...] -- [<file>...]'" | |
8343 | msgstr "" | |
8344 | "有歧义的参数 '%s':可同时是版本和文件\n" | |
8345 | "使用 '--' 来分隔版本和路径,例如:\n" | |
8346 | "'git <命令> [<版本>...] -- [<文件>...]'" | |
c1ac5258 | 8347 | |
473eb541 JX |
8348 | #: setup.c:419 |
8349 | msgid "unable to set up work tree using invalid config" | |
8350 | msgstr "无法使用无效配置来创建工作区" | |
c1ac5258 | 8351 | |
ec3d4607 | 8352 | #: setup.c:423 builtin/rev-parse.c:895 |
473eb541 JX |
8353 | msgid "this operation must be run in a work tree" |
8354 | msgstr "该操作必须在一个工作区中运行" | |
c1ac5258 | 8355 | |
ec3d4607 | 8356 | #: setup.c:658 |
c1ac5258 | 8357 | #, c-format |
473eb541 JX |
8358 | msgid "Expected git repo version <= %d, found %d" |
8359 | msgstr "期望 git 仓库版本 <= %d,却得到 %d" | |
c1ac5258 | 8360 | |
ec3d4607 JX |
8361 | #: setup.c:666 |
8362 | msgid "unknown repository extension found:" | |
8363 | msgid_plural "unknown repository extensions found:" | |
8364 | msgstr[0] "发现未知的仓库扩展:" | |
8365 | msgstr[1] "发现未知的仓库扩展:" | |
c1ac5258 | 8366 | |
ec3d4607 JX |
8367 | #: setup.c:680 |
8368 | msgid "repo version is 0, but v1-only extension found:" | |
8369 | msgid_plural "repo version is 0, but v1-only extensions found:" | |
8370 | msgstr[0] "仓库的版本是 0,但是发现仅用于 v1 的扩展:" | |
8371 | msgstr[1] "仓库的版本是 0,但是发现仅用于 v1 的扩展:" | |
c1ac5258 | 8372 | |
ec3d4607 | 8373 | #: setup.c:701 |
c1ac5258 | 8374 | #, c-format |
473eb541 JX |
8375 | msgid "error opening '%s'" |
8376 | msgstr "打开 '%s' 出错" | |
c1ac5258 | 8377 | |
ec3d4607 | 8378 | #: setup.c:703 |
c1ac5258 | 8379 | #, c-format |
473eb541 JX |
8380 | msgid "too large to be a .git file: '%s'" |
8381 | msgstr "文件太大,无法作为 .git 文件:'%s'" | |
c1ac5258 | 8382 | |
ec3d4607 | 8383 | #: setup.c:705 |
c1ac5258 | 8384 | #, c-format |
473eb541 JX |
8385 | msgid "error reading %s" |
8386 | msgstr "读取 %s 出错" | |
c1ac5258 | 8387 | |
ec3d4607 | 8388 | #: setup.c:707 |
c1ac5258 | 8389 | #, c-format |
473eb541 JX |
8390 | msgid "invalid gitfile format: %s" |
8391 | msgstr "无效的 gitfile 格式:%s" | |
c1ac5258 | 8392 | |
ec3d4607 | 8393 | #: setup.c:709 |
c1ac5258 | 8394 | #, c-format |
473eb541 JX |
8395 | msgid "no path in gitfile: %s" |
8396 | msgstr "在 gitfile 中没有路径:%s" | |
c1ac5258 | 8397 | |
ec3d4607 | 8398 | #: setup.c:711 |
c1ac5258 | 8399 | #, c-format |
473eb541 JX |
8400 | msgid "not a git repository: %s" |
8401 | msgstr "不是 git 仓库:%s" | |
c1ac5258 | 8402 | |
ec3d4607 | 8403 | #: setup.c:813 |
c1ac5258 | 8404 | #, c-format |
473eb541 JX |
8405 | msgid "'$%s' too big" |
8406 | msgstr "'$%s' 太大" | |
c1ac5258 | 8407 | |
ec3d4607 | 8408 | #: setup.c:827 |
c1ac5258 | 8409 | #, c-format |
473eb541 JX |
8410 | msgid "not a git repository: '%s'" |
8411 | msgstr "不是 git 仓库:'%s'" | |
c1ac5258 | 8412 | |
ec3d4607 | 8413 | #: setup.c:856 setup.c:858 setup.c:889 |
a0b6b246 | 8414 | #, c-format |
473eb541 JX |
8415 | msgid "cannot chdir to '%s'" |
8416 | msgstr "不能切换目录到 '%s'" | |
a6cd2cc4 | 8417 | |
ec3d4607 | 8418 | #: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 |
473eb541 JX |
8419 | msgid "cannot come back to cwd" |
8420 | msgstr "无法返回当前工作目录" | |
2b472aae | 8421 | |
ec3d4607 | 8422 | #: setup.c:988 |
2b472aae | 8423 | #, c-format |
473eb541 JX |
8424 | msgid "failed to stat '%*s%s%s'" |
8425 | msgstr "获取 '%*s%s%s' 状态(stat)失败" | |
2b472aae | 8426 | |
ec3d4607 | 8427 | #: setup.c:1231 |
473eb541 JX |
8428 | msgid "Unable to read current working directory" |
8429 | msgstr "不能读取当前工作目录" | |
2b472aae | 8430 | |
ec3d4607 | 8431 | #: setup.c:1240 setup.c:1246 |
2b472aae | 8432 | #, c-format |
473eb541 JX |
8433 | msgid "cannot change to '%s'" |
8434 | msgstr "不能切换到 '%s'" | |
2b472aae | 8435 | |
ec3d4607 | 8436 | #: setup.c:1251 |
2b472aae | 8437 | #, c-format |
473eb541 JX |
8438 | msgid "not a git repository (or any of the parent directories): %s" |
8439 | msgstr "不是 git 仓库(或者任何父目录):%s" | |
2b472aae | 8440 | |
ec3d4607 | 8441 | #: setup.c:1257 |
2b472aae JX |
8442 | #, c-format |
8443 | msgid "" | |
473eb541 JX |
8444 | "not a git repository (or any parent up to mount point %s)\n" |
8445 | "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." | |
2b472aae | 8446 | msgstr "" |
473eb541 JX |
8447 | "不是 git 仓库(或者直至挂载点 %s 的任何父目录)\n" |
8448 | "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" | |
2b472aae | 8449 | |
ec3d4607 | 8450 | #: setup.c:1381 |
2b472aae JX |
8451 | #, c-format |
8452 | msgid "" | |
473eb541 JX |
8453 | "problem with core.sharedRepository filemode value (0%.3o).\n" |
8454 | "The owner of files must always have read and write permissions." | |
2b472aae | 8455 | msgstr "" |
473eb541 JX |
8456 | "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" |
8457 | "文件属主必须始终拥有读写权限。" | |
2b472aae | 8458 | |
ec3d4607 | 8459 | #: setup.c:1430 |
473eb541 JX |
8460 | msgid "open /dev/null or dup failed" |
8461 | msgstr "不能打开或者复制 /dev/null" | |
2b472aae | 8462 | |
ec3d4607 | 8463 | #: setup.c:1445 |
473eb541 JX |
8464 | msgid "fork failed" |
8465 | msgstr "fork 失败" | |
2b472aae | 8466 | |
ec3d4607 | 8467 | #: setup.c:1450 t/helper/test-simple-ipc.c:285 |
473eb541 JX |
8468 | msgid "setsid failed" |
8469 | msgstr "setsid 失败" | |
2b472aae | 8470 | |
ec3d4607 | 8471 | #: sparse-index.c:162 |
33b62fba JX |
8472 | msgid "attempting to use sparse-index without cone mode" |
8473 | msgstr "尝试在没有 cone 模式下使用稀疏索引" | |
8474 | ||
ec3d4607 | 8475 | #: sparse-index.c:176 |
33b62fba JX |
8476 | msgid "unable to update cache-tree, staying full" |
8477 | msgstr "不能更新缓存树,保持完整" | |
8478 | ||
ec3d4607 | 8479 | #: sparse-index.c:263 |
33b62fba JX |
8480 | #, c-format |
8481 | msgid "index entry is a directory, but not sparse (%08x)" | |
8482 | msgstr "索引条目是一个目录,但不是稀疏的 (%08x)" | |
8483 | ||
a6cd2cc4 | 8484 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte |
33b62fba | 8485 | #: strbuf.c:850 |
a6cd2cc4 JX |
8486 | #, c-format |
8487 | msgid "%u.%2.2u GiB" | |
8488 | msgstr "%u.%2.2u GiB" | |
8489 | ||
8490 | #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second | |
33b62fba | 8491 | #: strbuf.c:852 |
a6cd2cc4 JX |
8492 | #, c-format |
8493 | msgid "%u.%2.2u GiB/s" | |
8494 | msgstr "%u.%2.2u GiB/s" | |
8495 | ||
8496 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte | |
33b62fba | 8497 | #: strbuf.c:860 |
a6cd2cc4 JX |
8498 | #, c-format |
8499 | msgid "%u.%2.2u MiB" | |
8500 | msgstr "%u.%2.2u MiB" | |
8501 | ||
8502 | #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second | |
33b62fba | 8503 | #: strbuf.c:862 |
a6cd2cc4 JX |
8504 | #, c-format |
8505 | msgid "%u.%2.2u MiB/s" | |
8506 | msgstr "%u.%2.2u MiB/s" | |
8507 | ||
8508 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte | |
33b62fba | 8509 | #: strbuf.c:869 |
a6cd2cc4 JX |
8510 | #, c-format |
8511 | msgid "%u.%2.2u KiB" | |
8512 | msgstr "%u.%2.2u KiB" | |
8513 | ||
8514 | #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second | |
33b62fba | 8515 | #: strbuf.c:871 |
a6cd2cc4 JX |
8516 | #, c-format |
8517 | msgid "%u.%2.2u KiB/s" | |
8518 | msgstr "%u.%2.2u KiB/s" | |
8519 | ||
8520 | #. TRANSLATORS: IEC 80000-13:2008 byte | |
33b62fba | 8521 | #: strbuf.c:877 |
a6cd2cc4 JX |
8522 | #, c-format |
8523 | msgid "%u byte" | |
8524 | msgid_plural "%u bytes" | |
8525 | msgstr[0] "%u 字节" | |
8526 | msgstr[1] "%u 字节" | |
8527 | ||
8528 | #. TRANSLATORS: IEC 80000-13:2008 byte/second | |
33b62fba | 8529 | #: strbuf.c:879 |
a6cd2cc4 JX |
8530 | #, c-format |
8531 | msgid "%u byte/s" | |
8532 | msgid_plural "%u bytes/s" | |
8533 | msgstr[0] "%u 字节/秒" | |
8534 | msgstr[1] "%u 字节/秒" | |
a0b6b246 | 8535 | |
ec3d4607 | 8536 | #: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738 |
473eb541 | 8537 | #: builtin/rebase.c:866 |
d9488fea JX |
8538 | #, c-format |
8539 | msgid "could not open '%s' for writing" | |
8540 | msgstr "无法打开 '%s' 进行写入" | |
8541 | ||
33b62fba | 8542 | #: strbuf.c:1177 |
ddc12c42 JX |
8543 | #, c-format |
8544 | msgid "could not edit '%s'" | |
8545 | msgstr "不能编辑 '%s'" | |
8546 | ||
349ede6a JX |
8547 | #: submodule-config.c:237 |
8548 | #, c-format | |
8549 | msgid "ignoring suspicious submodule name: %s" | |
8550 | msgstr "忽略可疑的子模组名称:%s" | |
8551 | ||
8552 | #: submodule-config.c:304 | |
8553 | msgid "negative values not allowed for submodule.fetchjobs" | |
8554 | msgstr "submodule.fetchjobs 不允许为负值" | |
8555 | ||
8556 | #: submodule-config.c:402 | |
8557 | #, c-format | |
8558 | msgid "ignoring '%s' which may be interpreted as a command-line option: %s" | |
8559 | msgstr "忽略可能被解析为命令行选项的 '%s':%s" | |
8560 | ||
8561 | #: submodule-config.c:499 | |
8562 | #, c-format | |
8563 | msgid "invalid value for %s" | |
8564 | msgstr "%s 的值无效" | |
8565 | ||
8566 | #: submodule-config.c:766 | |
8567 | #, c-format | |
8568 | msgid "Could not update .gitmodules entry %s" | |
8569 | msgstr "不能更新 .gitmodules 条目 %s" | |
8570 | ||
06991777 | 8571 | #: submodule.c:114 submodule.c:143 |
a0b6b246 JX |
8572 | msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" |
8573 | msgstr "无法修改未合并的 .gitmodules,先解决合并冲突" | |
8574 | ||
06991777 | 8575 | #: submodule.c:118 submodule.c:147 |
a0b6b246 JX |
8576 | #, c-format |
8577 | msgid "Could not find section in .gitmodules where path=%s" | |
8578 | msgstr "无法在 .gitmodules 中找到 path=%s 的小节" | |
8579 | ||
06991777 | 8580 | #: submodule.c:154 |
a0b6b246 JX |
8581 | #, c-format |
8582 | msgid "Could not remove .gitmodules entry for %s" | |
8583 | msgstr "无法移除 %s 的 .gitmodules 条目" | |
8584 | ||
06991777 | 8585 | #: submodule.c:165 |
a0b6b246 JX |
8586 | msgid "staging updated .gitmodules failed" |
8587 | msgstr "将更新后 .gitmodules 添加暂存区失败" | |
8588 | ||
33b62fba | 8589 | #: submodule.c:328 |
a4f16749 JX |
8590 | #, c-format |
8591 | msgid "in unpopulated submodule '%s'" | |
8592 | msgstr "位于未检出的子模组 '%s'" | |
8593 | ||
33b62fba | 8594 | #: submodule.c:359 |
a4f16749 JX |
8595 | #, c-format |
8596 | msgid "Pathspec '%s' is in submodule '%.*s'" | |
8597 | msgstr "路径规格 '%s' 在子模组 '%.*s' 中" | |
8598 | ||
33b62fba | 8599 | #: submodule.c:436 |
2b472aae JX |
8600 | #, c-format |
8601 | msgid "bad --ignore-submodules argument: %s" | |
8602 | msgstr "坏的 --ignore-submodules 参数:%s" | |
8603 | ||
ec3d4607 | 8604 | #: submodule.c:805 |
2b472aae JX |
8605 | #, c-format |
8606 | msgid "" | |
8607 | "Submodule in commit %s at path: '%s' collides with a submodule named the " | |
8608 | "same. Skipping it." | |
440e7442 | 8609 | msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。" |
2b472aae | 8610 | |
ec3d4607 | 8611 | #: submodule.c:908 |
6937cb4e JX |
8612 | #, c-format |
8613 | msgid "submodule entry '%s' (%s) is a %s, not a commit" | |
493a9322 | 8614 | msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" |
6937cb4e | 8615 | |
ec3d4607 | 8616 | #: submodule.c:993 |
2b472aae JX |
8617 | #, c-format |
8618 | msgid "" | |
8619 | "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " | |
8620 | "submodule %s" | |
440e7442 | 8621 | msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" |
2b472aae | 8622 | |
ec3d4607 | 8623 | #: submodule.c:1116 |
2b472aae JX |
8624 | #, c-format |
8625 | msgid "process for submodule '%s' failed" | |
440e7442 | 8626 | msgstr "处理子模组 '%s' 失败" |
2b472aae | 8627 | |
ec3d4607 | 8628 | #: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486 |
6937cb4e JX |
8629 | msgid "Failed to resolve HEAD as a valid ref." |
8630 | msgstr "无法将 HEAD 解析为有效引用。" | |
8631 | ||
ec3d4607 | 8632 | #: submodule.c:1156 |
06991777 | 8633 | #, c-format |
2b472aae JX |
8634 | msgid "Pushing submodule '%s'\n" |
8635 | msgstr "正在推送子模组 '%s'\n" | |
06991777 | 8636 | |
ec3d4607 | 8637 | #: submodule.c:1159 |
2b472aae JX |
8638 | #, c-format |
8639 | msgid "Unable to push submodule '%s'\n" | |
8640 | msgstr "无法推送子模组 '%s'\n" | |
8641 | ||
ec3d4607 | 8642 | #: submodule.c:1451 |
2b472aae JX |
8643 | #, c-format |
8644 | msgid "Fetching submodule %s%s\n" | |
8645 | msgstr "正在获取子模组 %s%s\n" | |
8646 | ||
ec3d4607 | 8647 | #: submodule.c:1485 |
2b472aae JX |
8648 | #, c-format |
8649 | msgid "Could not access submodule '%s'\n" | |
8650 | msgstr "无法访问子模组 '%s'\n" | |
8651 | ||
ec3d4607 | 8652 | #: submodule.c:1640 |
2b472aae JX |
8653 | #, c-format |
8654 | msgid "" | |
8655 | "Errors during submodule fetch:\n" | |
8656 | "%s" | |
8657 | msgstr "" | |
8658 | "获取子模组时的错误:\n" | |
8659 | "%s" | |
8660 | ||
ec3d4607 | 8661 | #: submodule.c:1665 |
1a79b2f1 | 8662 | #, c-format |
87cb7997 | 8663 | msgid "'%s' not recognized as a git repository" |
d9488fea | 8664 | msgstr "无法将 '%s' 识别为 git 仓库" |
1a79b2f1 | 8665 | |
ec3d4607 | 8666 | #: submodule.c:1682 |
2b472aae JX |
8667 | #, c-format |
8668 | msgid "Could not run 'git status --porcelain=2' in submodule %s" | |
8669 | msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" | |
8670 | ||
ec3d4607 | 8671 | #: submodule.c:1723 |
2b472aae JX |
8672 | #, c-format |
8673 | msgid "'git status --porcelain=2' failed in submodule %s" | |
8674 | msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" | |
8675 | ||
ec3d4607 | 8676 | #: submodule.c:1798 |
1a79b2f1 | 8677 | #, c-format |
87cb7997 JX |
8678 | msgid "could not start 'git status' in submodule '%s'" |
8679 | msgstr "无法在子模组 '%s' 中启动 'git status'" | |
1a79b2f1 | 8680 | |
ec3d4607 | 8681 | #: submodule.c:1811 |
87cb7997 JX |
8682 | #, c-format |
8683 | msgid "could not run 'git status' in submodule '%s'" | |
8684 | msgstr "无法在子模组 '%s' 中执行 'git status'" | |
8685 | ||
ec3d4607 | 8686 | #: submodule.c:1826 |
06991777 JX |
8687 | #, c-format |
8688 | msgid "Could not unset core.worktree setting in submodule '%s'" | |
8689 | msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" | |
8690 | ||
ec3d4607 | 8691 | #: submodule.c:1853 submodule.c:2163 |
2b472aae JX |
8692 | #, c-format |
8693 | msgid "could not recurse into submodule '%s'" | |
8694 | msgstr "无法递归进子模组路径 '%s'" | |
8695 | ||
ec3d4607 | 8696 | #: submodule.c:1874 |
2b472aae JX |
8697 | msgid "could not reset submodule index" |
8698 | msgstr "无法重置子模组索引" | |
8699 | ||
ec3d4607 | 8700 | #: submodule.c:1916 |
87cb7997 JX |
8701 | #, c-format |
8702 | msgid "submodule '%s' has dirty index" | |
8703 | msgstr "子模组 '%s' 中有脏索引" | |
8704 | ||
ec3d4607 | 8705 | #: submodule.c:1968 |
c1ac5258 JX |
8706 | #, c-format |
8707 | msgid "Submodule '%s' could not be updated." | |
8708 | msgstr "子模组 '%s' 无法被更新。" | |
8709 | ||
ec3d4607 | 8710 | #: submodule.c:2036 |
ddc12c42 JX |
8711 | #, c-format |
8712 | msgid "submodule git dir '%s' is inside git dir '%.*s'" | |
8713 | msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" | |
8714 | ||
ec3d4607 | 8715 | #: submodule.c:2057 |
1a79b2f1 JX |
8716 | #, c-format |
8717 | msgid "" | |
8718 | "relocate_gitdir for submodule '%s' with more than one worktree not supported" | |
8719 | msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" | |
8720 | ||
ec3d4607 | 8721 | #: submodule.c:2069 submodule.c:2128 |
1a79b2f1 JX |
8722 | #, c-format |
8723 | msgid "could not lookup name for submodule '%s'" | |
8724 | msgstr "不能查询子模组 '%s' 的名称" | |
8725 | ||
ec3d4607 | 8726 | #: submodule.c:2073 |
ddc12c42 JX |
8727 | #, c-format |
8728 | msgid "refusing to move '%s' into an existing git dir" | |
8729 | msgstr "禁止移动 '%s' 到现存 git 目录中" | |
8730 | ||
ec3d4607 | 8731 | #: submodule.c:2080 |
1a79b2f1 JX |
8732 | #, c-format |
8733 | msgid "" | |
8734 | "Migrating git directory of '%s%s' from\n" | |
8735 | "'%s' to\n" | |
8736 | "'%s'\n" | |
8737 | msgstr "" | |
8738 | "将 '%s%s' 的 git 目录从\n" | |
8739 | "'%s' 迁移至\n" | |
8740 | "'%s'\n" | |
8741 | ||
ec3d4607 | 8742 | #: submodule.c:2208 |
87cb7997 JX |
8743 | msgid "could not start ls-files in .." |
8744 | msgstr "无法在 .. 中启动 ls-files" | |
8745 | ||
ec3d4607 | 8746 | #: submodule.c:2248 |
87cb7997 JX |
8747 | #, c-format |
8748 | msgid "ls-tree returned unexpected return code %d" | |
8749 | msgstr "ls-tree 返回未知返回值 %d" | |
8750 | ||
33b62fba JX |
8751 | #: symlinks.c:244 |
8752 | #, c-format | |
8753 | msgid "failed to lstat '%s'" | |
8754 | msgstr "无法执行 lstat '%s'" | |
8755 | ||
8756 | #: trailer.c:244 | |
a0b6b246 JX |
8757 | #, c-format |
8758 | msgid "running trailer command '%s' failed" | |
8759 | msgstr "执行 trailer 命令 '%s' 失败" | |
8760 | ||
33b62fba JX |
8761 | #: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 |
8762 | #: trailer.c:570 | |
a0b6b246 JX |
8763 | #, c-format |
8764 | msgid "unknown value '%s' for key '%s'" | |
8765 | msgstr "键 '%2$s' 的未知取值 '%1$s'" | |
8766 | ||
33b62fba JX |
8767 | #: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 |
8768 | #: builtin/remote.c:324 | |
a0b6b246 JX |
8769 | #, c-format |
8770 | msgid "more than one %s" | |
8771 | msgstr "多于一个 %s" | |
8772 | ||
33b62fba | 8773 | #: trailer.c:743 |
a0b6b246 JX |
8774 | #, c-format |
8775 | msgid "empty trailer token in trailer '%.*s'" | |
d13389bf | 8776 | msgstr "尾注 '%.*s' 的键为空" |
a0b6b246 | 8777 | |
33b62fba | 8778 | #: trailer.c:763 |
a0b6b246 JX |
8779 | #, c-format |
8780 | msgid "could not read input file '%s'" | |
8781 | msgstr "不能读取输入文件 '%s'" | |
8782 | ||
ec3d4607 | 8783 | #: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577 |
a0b6b246 JX |
8784 | msgid "could not read from stdin" |
8785 | msgstr "不能自标准输入读取" | |
8786 | ||
33b62fba | 8787 | #: trailer.c:1024 wrapper.c:676 |
a0b6b246 JX |
8788 | #, c-format |
8789 | msgid "could not stat %s" | |
65e2041e | 8790 | msgstr "不能对 %s 调用 stat" |
a0b6b246 | 8791 | |
33b62fba | 8792 | #: trailer.c:1026 |
a0b6b246 JX |
8793 | #, c-format |
8794 | msgid "file %s is not a regular file" | |
8795 | msgstr "文件 %s 不是一个正规文件" | |
8796 | ||
33b62fba | 8797 | #: trailer.c:1028 |
a0b6b246 JX |
8798 | #, c-format |
8799 | msgid "file %s is not writable by user" | |
8800 | msgstr "文件 %s 用户不可写" | |
8801 | ||
33b62fba | 8802 | #: trailer.c:1040 |
a0b6b246 JX |
8803 | msgid "could not open temporary file" |
8804 | msgstr "不能打开临时文件" | |
8805 | ||
33b62fba | 8806 | #: trailer.c:1080 |
a0b6b246 JX |
8807 | #, c-format |
8808 | msgid "could not rename temporary file to %s" | |
8809 | msgstr "不能重命名临时文件为 %s" | |
8810 | ||
7157c2b5 | 8811 | #: transport-helper.c:62 transport-helper.c:91 |
c1ac5258 JX |
8812 | msgid "full write to remote helper failed" |
8813 | msgstr "完整写入远程助手失败" | |
8814 | ||
7157c2b5 | 8815 | #: transport-helper.c:145 |
c1ac5258 JX |
8816 | #, c-format |
8817 | msgid "unable to find remote helper for '%s'" | |
8818 | msgstr "无法为 '%s' 找到远程助手" | |
8819 | ||
7157c2b5 | 8820 | #: transport-helper.c:161 transport-helper.c:575 |
c1ac5258 JX |
8821 | msgid "can't dup helper output fd" |
8822 | msgstr "无法复制助手输出文件句柄" | |
8823 | ||
7157c2b5 | 8824 | #: transport-helper.c:214 |
c1ac5258 JX |
8825 | #, c-format |
8826 | msgid "" | |
8827 | "unknown mandatory capability %s; this remote helper probably needs newer " | |
8828 | "version of Git" | |
8829 | msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" | |
8830 | ||
7157c2b5 | 8831 | #: transport-helper.c:220 |
c1ac5258 JX |
8832 | msgid "this remote helper should implement refspec capability" |
8833 | msgstr "远程助手需要实现 refspec 能力" | |
8834 | ||
7157c2b5 | 8835 | #: transport-helper.c:287 transport-helper.c:429 |
c1ac5258 JX |
8836 | #, c-format |
8837 | msgid "%s unexpectedly said: '%s'" | |
8838 | msgstr "%s 意外地说:'%s'" | |
8839 | ||
7157c2b5 | 8840 | #: transport-helper.c:417 |
c1ac5258 JX |
8841 | #, c-format |
8842 | msgid "%s also locked %s" | |
8843 | msgstr "%s 也锁定了 %s" | |
8844 | ||
7157c2b5 | 8845 | #: transport-helper.c:497 |
c1ac5258 JX |
8846 | msgid "couldn't run fast-import" |
8847 | msgstr "不能执行 fast-import" | |
8848 | ||
7157c2b5 | 8849 | #: transport-helper.c:520 |
c1ac5258 JX |
8850 | msgid "error while running fast-import" |
8851 | msgstr "执行 fast-import 出错" | |
8852 | ||
33b62fba | 8853 | #: transport-helper.c:549 transport-helper.c:1247 |
c1ac5258 JX |
8854 | #, c-format |
8855 | msgid "could not read ref %s" | |
8856 | msgstr "无法读取引用 %s" | |
8857 | ||
7157c2b5 | 8858 | #: transport-helper.c:594 |
c1ac5258 JX |
8859 | #, c-format |
8860 | msgid "unknown response to connect: %s" | |
8861 | msgstr "连接时未知的响应:%s" | |
8862 | ||
7157c2b5 | 8863 | #: transport-helper.c:616 |
c1ac5258 JX |
8864 | msgid "setting remote service path not supported by protocol" |
8865 | msgstr "协议不支持设置远程服务路径" | |
8866 | ||
7157c2b5 | 8867 | #: transport-helper.c:618 |
c1ac5258 JX |
8868 | msgid "invalid remote service path" |
8869 | msgstr "无效的远程服务路径" | |
8870 | ||
ec3d4607 | 8871 | #: transport-helper.c:661 transport.c:1477 |
349ede6a JX |
8872 | msgid "operation not supported by protocol" |
8873 | msgstr "协议不支持该操作" | |
8874 | ||
7157c2b5 | 8875 | #: transport-helper.c:664 |
c1ac5258 JX |
8876 | #, c-format |
8877 | msgid "can't connect to subservice %s" | |
8878 | msgstr "不能连接到子服务 %s" | |
8879 | ||
ec3d4607 | 8880 | #: transport-helper.c:693 transport.c:400 |
33b62fba JX |
8881 | msgid "--negotiate-only requires protocol v2" |
8882 | msgstr "--negotiate-only 需要协议 v2" | |
8883 | ||
8884 | #: transport-helper.c:755 | |
d9488fea JX |
8885 | msgid "'option' without a matching 'ok/error' directive" |
8886 | msgstr "'option' 缺乏一个匹配的 'ok/error' 指令" | |
8887 | ||
33b62fba | 8888 | #: transport-helper.c:798 |
c1ac5258 JX |
8889 | #, c-format |
8890 | msgid "expected ok/error, helper said '%s'" | |
8891 | msgstr "预期 ok/error,助手说 '%s'" | |
8892 | ||
33b62fba | 8893 | #: transport-helper.c:855 |
c1ac5258 JX |
8894 | #, c-format |
8895 | msgid "helper reported unexpected status of %s" | |
8896 | msgstr "助手报告 %s 的意外状态" | |
8897 | ||
33b62fba | 8898 | #: transport-helper.c:938 |
a0b6b246 | 8899 | #, c-format |
c1ac5258 JX |
8900 | msgid "helper %s does not support dry-run" |
8901 | msgstr "助手 %s 不支持 dry-run" | |
a0b6b246 | 8902 | |
33b62fba | 8903 | #: transport-helper.c:941 |
c1ac5258 JX |
8904 | #, c-format |
8905 | msgid "helper %s does not support --signed" | |
8906 | msgstr "助手 %s 不支持 --signed" | |
8907 | ||
33b62fba | 8908 | #: transport-helper.c:944 |
c1ac5258 JX |
8909 | #, c-format |
8910 | msgid "helper %s does not support --signed=if-asked" | |
8911 | msgstr "助手 %s 不支持 --signed=if-asked" | |
8912 | ||
33b62fba | 8913 | #: transport-helper.c:949 |
a5cd71ca JX |
8914 | #, c-format |
8915 | msgid "helper %s does not support --atomic" | |
8916 | msgstr "助手 %s 不支持 --atomic" | |
8917 | ||
33b62fba | 8918 | #: transport-helper.c:953 |
d13389bf JX |
8919 | #, c-format |
8920 | msgid "helper %s does not support --%s" | |
8921 | msgstr "助手 %s 不支持 --%s" | |
8922 | ||
33b62fba | 8923 | #: transport-helper.c:960 |
c1ac5258 JX |
8924 | #, c-format |
8925 | msgid "helper %s does not support 'push-option'" | |
8926 | msgstr "助手 %s 不支持 'push-option'" | |
8927 | ||
33b62fba | 8928 | #: transport-helper.c:1060 |
c1ac5258 | 8929 | msgid "remote-helper doesn't support push; refspec needed" |
33b62fba | 8930 | msgstr "remote-heper 不支持推送,需要引用规格" |
c1ac5258 | 8931 | |
33b62fba | 8932 | #: transport-helper.c:1065 |
c1ac5258 JX |
8933 | #, c-format |
8934 | msgid "helper %s does not support 'force'" | |
8935 | msgstr "助手 %s 不支持 'force'" | |
8936 | ||
33b62fba | 8937 | #: transport-helper.c:1112 |
c1ac5258 JX |
8938 | msgid "couldn't run fast-export" |
8939 | msgstr "无法执行 fast-export" | |
8940 | ||
33b62fba | 8941 | #: transport-helper.c:1117 |
c1ac5258 JX |
8942 | msgid "error while running fast-export" |
8943 | msgstr "执行 fast-export 时出错" | |
8944 | ||
33b62fba | 8945 | #: transport-helper.c:1142 |
c1ac5258 JX |
8946 | #, c-format |
8947 | msgid "" | |
8948 | "No refs in common and none specified; doing nothing.\n" | |
7157c2b5 | 8949 | "Perhaps you should specify a branch.\n" |
c1ac5258 JX |
8950 | msgstr "" |
8951 | "没有共同的引用并且也没有指定,什么也不会做。\n" | |
7157c2b5 JX |
8952 | "也许您应该指定一个分支。\n" |
8953 | ||
33b62fba | 8954 | #: transport-helper.c:1224 |
7157c2b5 JX |
8955 | #, c-format |
8956 | msgid "unsupported object format '%s'" | |
8957 | msgstr "不支持的对象格式 '%s'" | |
c1ac5258 | 8958 | |
33b62fba | 8959 | #: transport-helper.c:1233 |
c1ac5258 JX |
8960 | #, c-format |
8961 | msgid "malformed response in ref list: %s" | |
8962 | msgstr "引用列表中格式错误的响应:%s" | |
8963 | ||
33b62fba | 8964 | #: transport-helper.c:1385 |
c1ac5258 JX |
8965 | #, c-format |
8966 | msgid "read(%s) failed" | |
8967 | msgstr "读取(%s)失败" | |
8968 | ||
33b62fba | 8969 | #: transport-helper.c:1412 |
c1ac5258 JX |
8970 | #, c-format |
8971 | msgid "write(%s) failed" | |
8972 | msgstr "写(%s)失败" | |
8973 | ||
33b62fba | 8974 | #: transport-helper.c:1461 |
c1ac5258 JX |
8975 | #, c-format |
8976 | msgid "%s thread failed" | |
8977 | msgstr "%s 线程失败" | |
8978 | ||
33b62fba | 8979 | #: transport-helper.c:1465 |
c1ac5258 JX |
8980 | #, c-format |
8981 | msgid "%s thread failed to join: %s" | |
e640d114 | 8982 | msgstr "%s 线程等待失败:%s" |
c1ac5258 | 8983 | |
33b62fba | 8984 | #: transport-helper.c:1484 transport-helper.c:1488 |
c1ac5258 JX |
8985 | #, c-format |
8986 | msgid "can't start thread for copying data: %s" | |
8987 | msgstr "不能启动线程来拷贝数据:%s" | |
8988 | ||
33b62fba | 8989 | #: transport-helper.c:1525 |
c1ac5258 JX |
8990 | #, c-format |
8991 | msgid "%s process failed to wait" | |
8992 | msgstr "%s 进程等待失败" | |
8993 | ||
33b62fba | 8994 | #: transport-helper.c:1529 |
c1ac5258 JX |
8995 | #, c-format |
8996 | msgid "%s process failed" | |
8997 | msgstr "%s 进程失败" | |
8998 | ||
33b62fba | 8999 | #: transport-helper.c:1547 transport-helper.c:1556 |
c1ac5258 JX |
9000 | msgid "can't start thread for copying data" |
9001 | msgstr "不能启动线程来拷贝数据" | |
9002 | ||
349ede6a JX |
9003 | #: transport.c:116 |
9004 | #, c-format | |
9005 | msgid "Would set upstream of '%s' to '%s' of '%s'\n" | |
9006 | msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" | |
9007 | ||
9008 | #: transport.c:145 | |
9009 | #, c-format | |
9010 | msgid "could not read bundle '%s'" | |
d9488fea | 9011 | msgstr "无法读取归档包 '%s'" |
349ede6a | 9012 | |
ec3d4607 | 9013 | #: transport.c:223 |
349ede6a JX |
9014 | #, c-format |
9015 | msgid "transport: invalid depth option '%s'" | |
9016 | msgstr "传输:无效的深度选项 '%s'" | |
9017 | ||
ec3d4607 | 9018 | #: transport.c:275 |
349ede6a JX |
9019 | msgid "see protocol.version in 'git help config' for more details" |
9020 | msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" | |
9021 | ||
ec3d4607 | 9022 | #: transport.c:276 |
349ede6a JX |
9023 | msgid "server options require protocol version 2 or later" |
9024 | msgstr "服务端选项需要版本 2 协议或更高" | |
9025 | ||
ec3d4607 | 9026 | #: transport.c:403 |
33b62fba JX |
9027 | msgid "server does not support wait-for-done" |
9028 | msgstr "服务器不支持 wait-for-done" | |
9029 | ||
ec3d4607 | 9030 | #: transport.c:755 |
349ede6a JX |
9031 | msgid "could not parse transport.color.* config" |
9032 | msgstr "不能解析 transport.color.* 配置" | |
9033 | ||
ec3d4607 | 9034 | #: transport.c:830 |
349ede6a JX |
9035 | msgid "support for protocol v2 not implemented yet" |
9036 | msgstr "协议 v2 的支持尚未实现" | |
9037 | ||
ec3d4607 | 9038 | #: transport.c:965 |
349ede6a JX |
9039 | #, c-format |
9040 | msgid "unknown value for config '%s': %s" | |
9041 | msgstr "配置 '%s' 的取值未知:%s" | |
9042 | ||
ec3d4607 | 9043 | #: transport.c:1031 |
349ede6a JX |
9044 | #, c-format |
9045 | msgid "transport '%s' not allowed" | |
9046 | msgstr "传输 '%s' 不允许" | |
9047 | ||
ec3d4607 | 9048 | #: transport.c:1084 |
349ede6a JX |
9049 | msgid "git-over-rsync is no longer supported" |
9050 | msgstr "不再支持 git-over-rsync" | |
9051 | ||
ec3d4607 | 9052 | #: transport.c:1187 |
349ede6a JX |
9053 | #, c-format |
9054 | msgid "" | |
9055 | "The following submodule paths contain changes that can\n" | |
9056 | "not be found on any remote:\n" | |
9057 | msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n" | |
9058 | ||
ec3d4607 | 9059 | #: transport.c:1191 |
349ede6a JX |
9060 | #, c-format |
9061 | msgid "" | |
9062 | "\n" | |
9063 | "Please try\n" | |
9064 | "\n" | |
9065 | "\tgit push --recurse-submodules=on-demand\n" | |
9066 | "\n" | |
9067 | "or cd to the path and use\n" | |
9068 | "\n" | |
9069 | "\tgit push\n" | |
9070 | "\n" | |
9071 | "to push them to a remote.\n" | |
9072 | "\n" | |
9073 | msgstr "" | |
9074 | "\n" | |
9075 | "请尝试\n" | |
9076 | "\n" | |
9077 | "\tgit push --recurse-submodules=on-demand\n" | |
9078 | "\n" | |
9079 | "或者进入到子目录执行\n" | |
9080 | "\n" | |
9081 | "\tgit push\n" | |
9082 | "\n" | |
9083 | "以推送至远程。\n" | |
9084 | "\n" | |
9085 | ||
ec3d4607 | 9086 | #: transport.c:1199 |
349ede6a JX |
9087 | msgid "Aborting." |
9088 | msgstr "正在终止。" | |
9089 | ||
ec3d4607 | 9090 | #: transport.c:1346 |
349ede6a JX |
9091 | msgid "failed to push all needed submodules" |
9092 | msgstr "不能推送全部需要的子模组" | |
9093 | ||
473eb541 | 9094 | #: tree-walk.c:33 |
a0b6b246 JX |
9095 | msgid "too-short tree object" |
9096 | msgstr "太短的树对象" | |
9097 | ||
473eb541 | 9098 | #: tree-walk.c:39 |
a0b6b246 | 9099 | msgid "malformed mode in tree entry" |
29004bbb | 9100 | msgstr "树对象中的条目模式错误" |
a0b6b246 | 9101 | |
473eb541 | 9102 | #: tree-walk.c:43 |
a0b6b246 JX |
9103 | msgid "empty filename in tree entry" |
9104 | msgstr "树对象条目中空的文件名" | |
9105 | ||
473eb541 | 9106 | #: tree-walk.c:118 |
a0b6b246 JX |
9107 | msgid "too-short tree file" |
9108 | msgstr "太短的树文件" | |
9109 | ||
33b62fba | 9110 | #: unpack-trees.c:115 |
a0b6b246 JX |
9111 | #, c-format |
9112 | msgid "" | |
9113 | "Your local changes to the following files would be overwritten by checkout:\n" | |
9114 | "%%sPlease commit your changes or stash them before you switch branches." | |
9115 | msgstr "" | |
9116 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
a4f16749 | 9117 | "%%s请在切换分支前提交或贮藏您的修改。" |
a0b6b246 | 9118 | |
33b62fba | 9119 | #: unpack-trees.c:117 |
a0b6b246 JX |
9120 | #, c-format |
9121 | msgid "" | |
9122 | "Your local changes to the following files would be overwritten by checkout:\n" | |
9123 | "%%s" | |
9124 | msgstr "" | |
9125 | "您对下列文件的本地修改将被检出操作覆盖:\n" | |
9126 | "%%s" | |
9127 | ||
33b62fba | 9128 | #: unpack-trees.c:120 |
a0b6b246 JX |
9129 | #, c-format |
9130 | msgid "" | |
9131 | "Your local changes to the following files would be overwritten by merge:\n" | |
9132 | "%%sPlease commit your changes or stash them before you merge." | |
9133 | msgstr "" | |
9134 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
a4f16749 | 9135 | "%%s请在合并前提交或贮藏您的修改。" |
a0b6b246 | 9136 | |
33b62fba | 9137 | #: unpack-trees.c:122 |
a0b6b246 JX |
9138 | #, c-format |
9139 | msgid "" | |
9140 | "Your local changes to the following files would be overwritten by merge:\n" | |
9141 | "%%s" | |
9142 | msgstr "" | |
9143 | "您对下列文件的本地修改将被合并操作覆盖:\n" | |
9144 | "%%s" | |
9145 | ||
33b62fba | 9146 | #: unpack-trees.c:125 |
a0b6b246 JX |
9147 | #, c-format |
9148 | msgid "" | |
9149 | "Your local changes to the following files would be overwritten by %s:\n" | |
9150 | "%%sPlease commit your changes or stash them before you %s." | |
9151 | msgstr "" | |
9152 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
a4f16749 | 9153 | "%%s请在 %s 之前提交或贮藏您的修改。" |
6792b93b | 9154 | |
33b62fba | 9155 | #: unpack-trees.c:127 |
a0b6b246 JX |
9156 | #, c-format |
9157 | msgid "" | |
9158 | "Your local changes to the following files would be overwritten by %s:\n" | |
9159 | "%%s" | |
9160 | msgstr "" | |
9161 | "您对下列文件的本地修改将被 %s 覆盖:\n" | |
9162 | "%%s" | |
c04f5ac3 | 9163 | |
33b62fba | 9164 | #: unpack-trees.c:132 |
a0b6b246 JX |
9165 | #, c-format |
9166 | msgid "" | |
1a79b2f1 | 9167 | "Updating the following directories would lose untracked files in them:\n" |
a0b6b246 JX |
9168 | "%s" |
9169 | msgstr "" | |
9170 | "更新如下目录将会丢失其中未跟踪的文件:\n" | |
9171 | "%s" | |
1b7f4a34 | 9172 | |
33b62fba | 9173 | #: unpack-trees.c:136 |
a0b6b246 JX |
9174 | #, c-format |
9175 | msgid "" | |
9176 | "The following untracked working tree files would be removed by checkout:\n" | |
9177 | "%%sPlease move or remove them before you switch branches." | |
9178 | msgstr "" | |
9179 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
9180 | "%%s请在切换分支之前移动或删除。" | |
2e8451e8 | 9181 | |
33b62fba | 9182 | #: unpack-trees.c:138 |
a0b6b246 JX |
9183 | #, c-format |
9184 | msgid "" | |
9185 | "The following untracked working tree files would be removed by checkout:\n" | |
9186 | "%%s" | |
9187 | msgstr "" | |
9188 | "工作区中下列未跟踪的文件将会因为检出操作而被删除:\n" | |
9189 | "%%s" | |
1003b3a5 | 9190 | |
33b62fba | 9191 | #: unpack-trees.c:141 |
a0b6b246 JX |
9192 | #, c-format |
9193 | msgid "" | |
9194 | "The following untracked working tree files would be removed by merge:\n" | |
9195 | "%%sPlease move or remove them before you merge." | |
9196 | msgstr "" | |
9197 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
9198 | "%%s请在合并前移动或删除。" | |
1003b3a5 | 9199 | |
33b62fba | 9200 | #: unpack-trees.c:143 |
a0b6b246 JX |
9201 | #, c-format |
9202 | msgid "" | |
9203 | "The following untracked working tree files would be removed by merge:\n" | |
9204 | "%%s" | |
9205 | msgstr "" | |
9206 | "工作区中下列未跟踪的文件将会因为合并操作而被删除:\n" | |
9207 | "%%s" | |
c04f5ac3 | 9208 | |
33b62fba | 9209 | #: unpack-trees.c:146 |
a0b6b246 JX |
9210 | #, c-format |
9211 | msgid "" | |
9212 | "The following untracked working tree files would be removed by %s:\n" | |
9213 | "%%sPlease move or remove them before you %s." | |
9214 | msgstr "" | |
9215 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
9216 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 9217 | |
33b62fba | 9218 | #: unpack-trees.c:148 |
a0b6b246 JX |
9219 | #, c-format |
9220 | msgid "" | |
9221 | "The following untracked working tree files would be removed by %s:\n" | |
9222 | "%%s" | |
9223 | msgstr "" | |
9224 | "工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n" | |
9225 | "%%s" | |
c04f5ac3 | 9226 | |
33b62fba | 9227 | #: unpack-trees.c:154 |
a0b6b246 JX |
9228 | #, c-format |
9229 | msgid "" | |
9230 | "The following untracked working tree files would be overwritten by " | |
9231 | "checkout:\n" | |
9232 | "%%sPlease move or remove them before you switch branches." | |
9233 | msgstr "" | |
9234 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" | |
9235 | "%%s请在切换分支前移动或删除。" | |
c04f5ac3 | 9236 | |
33b62fba | 9237 | #: unpack-trees.c:156 |
1003b3a5 | 9238 | #, c-format |
4dcdc3d8 | 9239 | msgid "" |
a0b6b246 JX |
9240 | "The following untracked working tree files would be overwritten by " |
9241 | "checkout:\n" | |
9242 | "%%s" | |
4dcdc3d8 | 9243 | msgstr "" |
a0b6b246 JX |
9244 | "工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n" |
9245 | "%%s" | |
1003b3a5 | 9246 | |
33b62fba | 9247 | #: unpack-trees.c:159 |
c04f5ac3 | 9248 | #, c-format |
a0b6b246 JX |
9249 | msgid "" |
9250 | "The following untracked working tree files would be overwritten by merge:\n" | |
9251 | "%%sPlease move or remove them before you merge." | |
9252 | msgstr "" | |
9253 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
9254 | "%%s请在合并前移动或删除。" | |
c04f5ac3 | 9255 | |
33b62fba | 9256 | #: unpack-trees.c:161 |
a0b6b246 JX |
9257 | #, c-format |
9258 | msgid "" | |
9259 | "The following untracked working tree files would be overwritten by merge:\n" | |
9260 | "%%s" | |
9261 | msgstr "" | |
9262 | "工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n" | |
9263 | "%%s" | |
c04f5ac3 | 9264 | |
33b62fba | 9265 | #: unpack-trees.c:164 |
a0b6b246 JX |
9266 | #, c-format |
9267 | msgid "" | |
9268 | "The following untracked working tree files would be overwritten by %s:\n" | |
9269 | "%%sPlease move or remove them before you %s." | |
9270 | msgstr "" | |
9271 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
9272 | "%%s请在 %s 前移动或删除。" | |
c04f5ac3 | 9273 | |
33b62fba | 9274 | #: unpack-trees.c:166 |
07432cef | 9275 | #, c-format |
a0b6b246 JX |
9276 | msgid "" |
9277 | "The following untracked working tree files would be overwritten by %s:\n" | |
9278 | "%%s" | |
9279 | msgstr "" | |
9280 | "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n" | |
9281 | "%%s" | |
c04f5ac3 | 9282 | |
33b62fba | 9283 | #: unpack-trees.c:174 |
07432cef | 9284 | #, c-format |
a0b6b246 JX |
9285 | msgid "Entry '%s' overlaps with '%s'. Cannot bind." |
9286 | msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" | |
c04f5ac3 | 9287 | |
33b62fba | 9288 | #: unpack-trees.c:177 |
07432cef | 9289 | #, c-format |
ef317cd5 | 9290 | msgid "" |
349ede6a | 9291 | "Cannot update submodule:\n" |
a0b6b246 JX |
9292 | "%s" |
9293 | msgstr "" | |
349ede6a | 9294 | "无法更新子模组:\n" |
a0b6b246 | 9295 | "%s" |
c04f5ac3 | 9296 | |
33b62fba | 9297 | #: unpack-trees.c:180 |
07432cef | 9298 | #, c-format |
a0b6b246 | 9299 | msgid "" |
349ede6a JX |
9300 | "The following paths are not up to date and were left despite sparse " |
9301 | "patterns:\n" | |
a0b6b246 JX |
9302 | "%s" |
9303 | msgstr "" | |
349ede6a | 9304 | "尽管存在稀疏检出模板,以下路径不是最新,因而保留:\n" |
a0b6b246 | 9305 | "%s" |
c04f5ac3 | 9306 | |
33b62fba | 9307 | #: unpack-trees.c:182 |
07432cef | 9308 | #, c-format |
a0b6b246 | 9309 | msgid "" |
349ede6a | 9310 | "The following paths are unmerged and were left despite sparse patterns:\n" |
a0b6b246 JX |
9311 | "%s" |
9312 | msgstr "" | |
349ede6a | 9313 | "尽管存在稀疏检出模板,以下路径处于未合并状态,因而保留:\n" |
a0b6b246 | 9314 | "%s" |
c04f5ac3 | 9315 | |
33b62fba | 9316 | #: unpack-trees.c:184 |
87cb7997 JX |
9317 | #, c-format |
9318 | msgid "" | |
349ede6a JX |
9319 | "The following paths were already present and thus not updated despite sparse " |
9320 | "patterns:\n" | |
87cb7997 JX |
9321 | "%s" |
9322 | msgstr "" | |
349ede6a | 9323 | "尽管存在稀疏检出模板,以下路径已经存在,因而未更新:\n" |
87cb7997 JX |
9324 | "%s" |
9325 | ||
33b62fba | 9326 | #: unpack-trees.c:264 |
07432cef | 9327 | #, c-format |
a0b6b246 | 9328 | msgid "Aborting\n" |
a6cd2cc4 | 9329 | msgstr "正在终止\n" |
ef317cd5 | 9330 | |
33b62fba | 9331 | #: unpack-trees.c:291 |
349ede6a JX |
9332 | #, c-format |
9333 | msgid "" | |
9334 | "After fixing the above paths, you may want to run `git sparse-checkout " | |
9335 | "reapply`.\n" | |
9336 | msgstr "在修复上述路径之后,你可能要执行 `git sparse-checkout reapply`。\n" | |
9337 | ||
33b62fba | 9338 | #: unpack-trees.c:352 |
a6cd2cc4 JX |
9339 | msgid "Updating files" |
9340 | msgstr "正在更新文件" | |
c04f5ac3 | 9341 | |
33b62fba | 9342 | #: unpack-trees.c:384 |
4c27fcb5 JX |
9343 | msgid "" |
9344 | "the following paths have collided (e.g. case-sensitive paths\n" | |
9345 | "on a case-insensitive filesystem) and only one from the same\n" | |
9346 | "colliding group is in the working tree:\n" | |
9347 | msgstr "" | |
9348 | "以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n" | |
9349 | "并且碰撞组中只有一个文件存在工作区中:\n" | |
9350 | ||
ec3d4607 | 9351 | #: unpack-trees.c:1618 |
ddc12c42 JX |
9352 | msgid "Updating index flags" |
9353 | msgstr "正在更新索引标志" | |
9354 | ||
ec3d4607 | 9355 | #: unpack-trees.c:2718 |
33b62fba JX |
9356 | #, c-format |
9357 | msgid "worktree and untracked commit have duplicate entries: %s" | |
9358 | msgstr "工作树和未跟踪提交具有重复条目:%s" | |
9359 | ||
9360 | #: upload-pack.c:1548 | |
349ede6a JX |
9361 | msgid "expected flush after fetch arguments" |
9362 | msgstr "在 fetch 参数之后应该有一个 flush 包" | |
9363 | ||
87cb7997 | 9364 | #: urlmatch.c:163 |
a0b6b246 JX |
9365 | msgid "invalid URL scheme name or missing '://' suffix" |
9366 | msgstr "无效的 URL 方案名称或丢失 '://' 后缀" | |
9367 | ||
87cb7997 | 9368 | #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 |
07432cef | 9369 | #, c-format |
a0b6b246 JX |
9370 | msgid "invalid %XX escape sequence" |
9371 | msgstr "无效的 %XX 转义序列" | |
c04f5ac3 | 9372 | |
87cb7997 | 9373 | #: urlmatch.c:215 |
a0b6b246 JX |
9374 | msgid "missing host and scheme is not 'file:'" |
9375 | msgstr "缺失主机名且 URL 方案不是 'file:'" | |
c04f5ac3 | 9376 | |
87cb7997 | 9377 | #: urlmatch.c:232 |
a0b6b246 JX |
9378 | msgid "a 'file:' URL may not have a port number" |
9379 | msgstr "一个 'file:' URL 不应该包含端口号" | |
94550ed3 | 9380 | |
87cb7997 | 9381 | #: urlmatch.c:247 |
a0b6b246 JX |
9382 | msgid "invalid characters in host name" |
9383 | msgstr "主机名中包含无效的字符" | |
90314792 | 9384 | |
87cb7997 | 9385 | #: urlmatch.c:292 urlmatch.c:303 |
a0b6b246 JX |
9386 | msgid "invalid port number" |
9387 | msgstr "无效的端口号" | |
c04f5ac3 | 9388 | |
87cb7997 | 9389 | #: urlmatch.c:371 |
a0b6b246 JX |
9390 | msgid "invalid '..' path segment" |
9391 | msgstr "无效的 '..' 路径片段" | |
5c0c220c | 9392 | |
2b472aae JX |
9393 | #: walker.c:170 |
9394 | msgid "Fetching objects" | |
9395 | msgstr "正在获取对象" | |
9396 | ||
ec3d4607 | 9397 | #: worktree.c:236 builtin/am.c:2152 |
a77c07d9 | 9398 | #, c-format |
a0b6b246 | 9399 | msgid "failed to read '%s'" |
c1ac5258 | 9400 | msgstr "读取 '%s' 失败" |
ef317cd5 | 9401 | |
ec3d4607 | 9402 | #: worktree.c:303 |
31e5e17b JX |
9403 | #, c-format |
9404 | msgid "'%s' at main working tree is not the repository directory" | |
9405 | msgstr "在主工作区的 '%s' 不是仓库目录" | |
9406 | ||
ec3d4607 | 9407 | #: worktree.c:314 |
31e5e17b JX |
9408 | #, c-format |
9409 | msgid "'%s' file does not contain absolute path to the working tree location" | |
9410 | msgstr "文件 '%s' 不包含工作区的绝对路径" | |
9411 | ||
ec3d4607 | 9412 | #: worktree.c:326 |
31e5e17b JX |
9413 | #, c-format |
9414 | msgid "'%s' does not exist" | |
9415 | msgstr "'%s' 不存在" | |
9416 | ||
ec3d4607 | 9417 | #: worktree.c:332 |
31e5e17b JX |
9418 | #, c-format |
9419 | msgid "'%s' is not a .git file, error code %d" | |
9420 | msgstr "'%s' 不是一个 .git 文件,错误码 %d" | |
9421 | ||
ec3d4607 | 9422 | #: worktree.c:341 |
31e5e17b JX |
9423 | #, c-format |
9424 | msgid "'%s' does not point back to '%s'" | |
9425 | msgstr "'%s' 没有指回到 '%s'" | |
9426 | ||
ec3d4607 | 9427 | #: worktree.c:603 |
d9488fea JX |
9428 | msgid "not a directory" |
9429 | msgstr "不是一个目录" | |
9430 | ||
ec3d4607 | 9431 | #: worktree.c:612 |
d9488fea JX |
9432 | msgid ".git is not a file" |
9433 | msgstr ".git 不是一个文件" | |
9434 | ||
ec3d4607 | 9435 | #: worktree.c:614 |
d9488fea JX |
9436 | msgid ".git file broken" |
9437 | msgstr ".git 文件损坏" | |
9438 | ||
ec3d4607 | 9439 | #: worktree.c:616 |
d9488fea JX |
9440 | msgid ".git file incorrect" |
9441 | msgstr ".git 文件不正确" | |
9442 | ||
ec3d4607 | 9443 | #: worktree.c:722 |
d9488fea JX |
9444 | msgid "not a valid path" |
9445 | msgstr "不是一个有效的路径" | |
9446 | ||
ec3d4607 | 9447 | #: worktree.c:728 |
d9488fea JX |
9448 | msgid "unable to locate repository; .git is not a file" |
9449 | msgstr "无法定位仓库,.git 不是一个文件" | |
9450 | ||
ec3d4607 | 9451 | #: worktree.c:732 |
473eb541 JX |
9452 | msgid "unable to locate repository; .git file does not reference a repository" |
9453 | msgstr "无法定位仓库,.git 文件没有指向一个仓库" | |
9454 | ||
ec3d4607 | 9455 | #: worktree.c:736 |
d9488fea JX |
9456 | msgid "unable to locate repository; .git file broken" |
9457 | msgstr "无法定位仓库,.git 文件损坏" | |
9458 | ||
ec3d4607 | 9459 | #: worktree.c:742 |
d9488fea JX |
9460 | msgid "gitdir unreadable" |
9461 | msgstr "gitdir 不可读" | |
9462 | ||
ec3d4607 | 9463 | #: worktree.c:746 |
d9488fea JX |
9464 | msgid "gitdir incorrect" |
9465 | msgstr "gitdir 不正确" | |
9466 | ||
ec3d4607 | 9467 | #: worktree.c:771 |
473eb541 JX |
9468 | msgid "not a valid directory" |
9469 | msgstr "不是一个有效的目录" | |
9470 | ||
ec3d4607 | 9471 | #: worktree.c:777 |
473eb541 JX |
9472 | msgid "gitdir file does not exist" |
9473 | msgstr "gitdir 文件不存在" | |
9474 | ||
ec3d4607 | 9475 | #: worktree.c:782 worktree.c:791 |
473eb541 JX |
9476 | #, c-format |
9477 | msgid "unable to read gitdir file (%s)" | |
9478 | msgstr "无法读取 gitdir 文件(%s)" | |
9479 | ||
ec3d4607 | 9480 | #: worktree.c:801 |
473eb541 JX |
9481 | #, c-format |
9482 | msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" | |
9483 | msgstr "读取过短(期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>)" | |
9484 | ||
ec3d4607 | 9485 | #: worktree.c:809 |
473eb541 JX |
9486 | msgid "invalid gitdir file" |
9487 | msgstr "无效的 gitdir 文件" | |
9488 | ||
ec3d4607 | 9489 | #: worktree.c:817 |
473eb541 JX |
9490 | msgid "gitdir file points to non-existent location" |
9491 | msgstr "gitdir 文件指向一个不存在的位置" | |
9492 | ||
d9488fea | 9493 | #: wrapper.c:197 wrapper.c:367 |
c04f5ac3 | 9494 | #, c-format |
a0b6b246 JX |
9495 | msgid "could not open '%s' for reading and writing" |
9496 | msgstr "无法打开 '%s' 进行读写" | |
c04f5ac3 | 9497 | |
d9488fea | 9498 | #: wrapper.c:398 wrapper.c:599 |
a0b6b246 JX |
9499 | #, c-format |
9500 | msgid "unable to access '%s'" | |
9501 | msgstr "不能访问 '%s'" | |
c04f5ac3 | 9502 | |
d9488fea | 9503 | #: wrapper.c:607 |
a0b6b246 JX |
9504 | msgid "unable to get current working directory" |
9505 | msgstr "不能获取当前工作目录" | |
c04f5ac3 | 9506 | |
a6cd2cc4 | 9507 | #: wt-status.c:158 |
a0b6b246 JX |
9508 | msgid "Unmerged paths:" |
9509 | msgstr "未合并的路径:" | |
7aea43ff | 9510 | |
a0b6b246 | 9511 | # 译者:注意保持前导空格 |
a6cd2cc4 JX |
9512 | #: wt-status.c:187 wt-status.c:219 |
9513 | msgid " (use \"git restore --staged <file>...\" to unstage)" | |
9514 | msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)" | |
9515 | ||
9516 | # 译者:注意保持前导空格 | |
9517 | #: wt-status.c:190 wt-status.c:222 | |
c04f5ac3 | 9518 | #, c-format |
a6cd2cc4 JX |
9519 | msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" |
9520 | msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)" | |
c04f5ac3 | 9521 | |
a0b6b246 | 9522 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9523 | #: wt-status.c:193 wt-status.c:225 |
a0b6b246 JX |
9524 | msgid " (use \"git rm --cached <file>...\" to unstage)" |
9525 | msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" | |
c04f5ac3 | 9526 | |
a0b6b246 | 9527 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9528 | #: wt-status.c:197 |
a0b6b246 JX |
9529 | msgid " (use \"git add <file>...\" to mark resolution)" |
9530 | msgstr " (使用 \"git add <文件>...\" 标记解决方案)" | |
8ada9598 | 9531 | |
a0b6b246 | 9532 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9533 | #: wt-status.c:199 wt-status.c:203 |
a0b6b246 JX |
9534 | msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" |
9535 | msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" | |
8ada9598 | 9536 | |
a0b6b246 | 9537 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9538 | #: wt-status.c:201 |
a0b6b246 JX |
9539 | msgid " (use \"git rm <file>...\" to mark resolution)" |
9540 | msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" | |
ef317cd5 | 9541 | |
ec3d4607 | 9542 | #: wt-status.c:211 wt-status.c:1125 |
a0b6b246 JX |
9543 | msgid "Changes to be committed:" |
9544 | msgstr "要提交的变更:" | |
ef317cd5 | 9545 | |
ec3d4607 | 9546 | #: wt-status.c:234 wt-status.c:1134 |
a0b6b246 JX |
9547 | msgid "Changes not staged for commit:" |
9548 | msgstr "尚未暂存以备提交的变更:" | |
ef317cd5 | 9549 | |
a0b6b246 | 9550 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9551 | #: wt-status.c:238 |
a0b6b246 JX |
9552 | msgid " (use \"git add <file>...\" to update what will be committed)" |
9553 | msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 9554 | |
a0b6b246 | 9555 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9556 | #: wt-status.c:240 |
a0b6b246 JX |
9557 | msgid " (use \"git add/rm <file>...\" to update what will be committed)" |
9558 | msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" | |
ef317cd5 | 9559 | |
a0b6b246 | 9560 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9561 | #: wt-status.c:241 |
a0b6b246 | 9562 | msgid "" |
a6cd2cc4 JX |
9563 | " (use \"git restore <file>...\" to discard changes in working directory)" |
9564 | msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)" | |
ef317cd5 | 9565 | |
a0b6b246 | 9566 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9567 | #: wt-status.c:243 |
a0b6b246 JX |
9568 | msgid " (commit or discard the untracked or modified content in submodules)" |
9569 | msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" | |
ef317cd5 | 9570 | |
a0b6b246 | 9571 | # 译者:注意保持前导空格 |
a6cd2cc4 | 9572 | #: wt-status.c:254 |
a0b6b246 JX |
9573 | #, c-format |
9574 | msgid " (use \"git %s <file>...\" to include in what will be committed)" | |
9575 | msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" | |
ef317cd5 | 9576 | |
d9488fea | 9577 | #: wt-status.c:266 |
a0b6b246 JX |
9578 | msgid "both deleted:" |
9579 | msgstr "双方删除:" | |
ef317cd5 | 9580 | |
d9488fea | 9581 | #: wt-status.c:268 |
a0b6b246 JX |
9582 | msgid "added by us:" |
9583 | msgstr "由我们添加:" | |
4dcdc3d8 | 9584 | |
d9488fea | 9585 | #: wt-status.c:270 |
a0b6b246 JX |
9586 | msgid "deleted by them:" |
9587 | msgstr "由他们删除:" | |
ef317cd5 | 9588 | |
d9488fea | 9589 | #: wt-status.c:272 |
a0b6b246 JX |
9590 | msgid "added by them:" |
9591 | msgstr "由他们添加:" | |
ef317cd5 | 9592 | |
d9488fea | 9593 | #: wt-status.c:274 |
a0b6b246 JX |
9594 | msgid "deleted by us:" |
9595 | msgstr "由我们删除:" | |
ef317cd5 | 9596 | |
d9488fea | 9597 | #: wt-status.c:276 |
a0b6b246 JX |
9598 | msgid "both added:" |
9599 | msgstr "双方添加:" | |
5c57d762 | 9600 | |
d9488fea | 9601 | #: wt-status.c:278 |
a0b6b246 JX |
9602 | msgid "both modified:" |
9603 | msgstr "双方修改:" | |
5c57d762 | 9604 | |
d9488fea | 9605 | #: wt-status.c:288 |
a0b6b246 JX |
9606 | msgid "new file:" |
9607 | msgstr "新文件:" | |
8ada9598 | 9608 | |
d9488fea | 9609 | #: wt-status.c:290 |
a0b6b246 JX |
9610 | msgid "copied:" |
9611 | msgstr "拷贝:" | |
8ada9598 | 9612 | |
d9488fea | 9613 | #: wt-status.c:292 |
a0b6b246 JX |
9614 | msgid "deleted:" |
9615 | msgstr "删除:" | |
8ada9598 | 9616 | |
d9488fea | 9617 | #: wt-status.c:294 |
a0b6b246 JX |
9618 | msgid "modified:" |
9619 | msgstr "修改:" | |
8ada9598 | 9620 | |
d9488fea | 9621 | #: wt-status.c:296 |
a0b6b246 JX |
9622 | msgid "renamed:" |
9623 | msgstr "重命名:" | |
5c57d762 | 9624 | |
d9488fea | 9625 | #: wt-status.c:298 |
a0b6b246 JX |
9626 | msgid "typechange:" |
9627 | msgstr "类型变更:" | |
8ada9598 | 9628 | |
d9488fea | 9629 | #: wt-status.c:300 |
a0b6b246 JX |
9630 | msgid "unknown:" |
9631 | msgstr "未知:" | |
8ada9598 | 9632 | |
d9488fea | 9633 | #: wt-status.c:302 |
a0b6b246 JX |
9634 | msgid "unmerged:" |
9635 | msgstr "未合并:" | |
8ada9598 | 9636 | |
a0b6b246 | 9637 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
d9488fea | 9638 | #: wt-status.c:382 |
a0b6b246 JX |
9639 | msgid "new commits, " |
9640 | msgstr "新提交, " | |
8ada9598 | 9641 | |
a0b6b246 | 9642 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
d9488fea | 9643 | #: wt-status.c:384 |
a0b6b246 JX |
9644 | msgid "modified content, " |
9645 | msgstr "修改的内容, " | |
1b7f4a34 | 9646 | |
a0b6b246 | 9647 | # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 |
d9488fea | 9648 | #: wt-status.c:386 |
a0b6b246 JX |
9649 | msgid "untracked content, " |
9650 | msgstr "未跟踪的内容, " | |
1b7f4a34 | 9651 | |
ec3d4607 | 9652 | #: wt-status.c:958 |
a4f16749 JX |
9653 | #, c-format |
9654 | msgid "Your stash currently has %d entry" | |
9655 | msgid_plural "Your stash currently has %d entries" | |
9656 | msgstr[0] "您的贮藏区当前有 %d 条记录" | |
9657 | msgstr[1] "您的贮藏区当前有 %d 条记录" | |
9658 | ||
ec3d4607 | 9659 | #: wt-status.c:989 |
a0b6b246 JX |
9660 | msgid "Submodules changed but not updated:" |
9661 | msgstr "子模组已修改但尚未更新:" | |
1b7f4a34 | 9662 | |
ec3d4607 | 9663 | #: wt-status.c:991 |
a0b6b246 JX |
9664 | msgid "Submodule changes to be committed:" |
9665 | msgstr "要提交的子模组变更:" | |
1b7f4a34 | 9666 | |
ec3d4607 | 9667 | #: wt-status.c:1073 |
a0b6b246 | 9668 | msgid "" |
6937cb4e JX |
9669 | "Do not modify or remove the line above.\n" |
9670 | "Everything below it will be ignored." | |
a0b6b246 | 9671 | msgstr "" |
6937cb4e JX |
9672 | "不要改动或删除上面的一行。\n" |
9673 | "其下所有内容都将被忽略。" | |
1b7f4a34 | 9674 | |
ec3d4607 | 9675 | #: wt-status.c:1165 |
a6cd2cc4 JX |
9676 | #, c-format |
9677 | msgid "" | |
9678 | "\n" | |
9679 | "It took %.2f seconds to compute the branch ahead/behind values.\n" | |
9680 | "You can use '--no-ahead-behind' to avoid this.\n" | |
9681 | msgstr "" | |
9682 | "\n" | |
9683 | "花了 %.2f 秒才计算出分支的领先/落后范围。\n" | |
9684 | "为避免,您可以使用 '--no-ahead-behind'。\n" | |
9685 | ||
ec3d4607 | 9686 | #: wt-status.c:1195 |
a0b6b246 JX |
9687 | msgid "You have unmerged paths." |
9688 | msgstr "您有尚未合并的路径。" | |
1b7f4a34 | 9689 | |
a0b6b246 | 9690 | # 译者:注意保持前导空格 |
ec3d4607 | 9691 | #: wt-status.c:1198 |
a0b6b246 JX |
9692 | msgid " (fix conflicts and run \"git commit\")" |
9693 | msgstr " (解决冲突并运行 \"git commit\")" | |
1b7f4a34 | 9694 | |
a0b6b246 | 9695 | # 译者:注意保持前导空格 |
ec3d4607 | 9696 | #: wt-status.c:1200 |
a0b6b246 JX |
9697 | msgid " (use \"git merge --abort\" to abort the merge)" |
9698 | msgstr " (使用 \"git merge --abort\" 终止合并)" | |
1b7f4a34 | 9699 | |
ec3d4607 | 9700 | #: wt-status.c:1204 |
a0b6b246 JX |
9701 | msgid "All conflicts fixed but you are still merging." |
9702 | msgstr "所有冲突已解决但您仍处于合并中。" | |
1b7f4a34 | 9703 | |
a0b6b246 | 9704 | # 译者:注意保持前导空格 |
ec3d4607 | 9705 | #: wt-status.c:1207 |
a0b6b246 JX |
9706 | msgid " (use \"git commit\" to conclude merge)" |
9707 | msgstr " (使用 \"git commit\" 结束合并)" | |
1b7f4a34 | 9708 | |
ec3d4607 | 9709 | #: wt-status.c:1216 |
a0b6b246 JX |
9710 | msgid "You are in the middle of an am session." |
9711 | msgstr "您正处于 am 操作过程中。" | |
1b7f4a34 | 9712 | |
ec3d4607 | 9713 | #: wt-status.c:1219 |
a0b6b246 JX |
9714 | msgid "The current patch is empty." |
9715 | msgstr "当前的补丁为空。" | |
1b7f4a34 | 9716 | |
a0b6b246 | 9717 | # 译者:注意保持前导空格 |
ec3d4607 | 9718 | #: wt-status.c:1223 |
a0b6b246 JX |
9719 | msgid " (fix conflicts and then run \"git am --continue\")" |
9720 | msgstr " (解决冲突,然后运行 \"git am --continue\")" | |
1b7f4a34 | 9721 | |
a0b6b246 | 9722 | # 译者:注意保持前导空格 |
ec3d4607 | 9723 | #: wt-status.c:1225 |
a0b6b246 JX |
9724 | msgid " (use \"git am --skip\" to skip this patch)" |
9725 | msgstr " (使用 \"git am --skip\" 跳过此补丁)" | |
1b7f4a34 | 9726 | |
a0b6b246 | 9727 | # 译者:注意保持前导空格 |
ec3d4607 | 9728 | #: wt-status.c:1227 |
a0b6b246 JX |
9729 | msgid " (use \"git am --abort\" to restore the original branch)" |
9730 | msgstr " (使用 \"git am --abort\" 恢复原有分支)" | |
1b7f4a34 | 9731 | |
ec3d4607 | 9732 | #: wt-status.c:1360 |
1a79b2f1 JX |
9733 | msgid "git-rebase-todo is missing." |
9734 | msgstr "git-rebase-todo 丢失。" | |
9735 | ||
ec3d4607 | 9736 | #: wt-status.c:1362 |
a0b6b246 JX |
9737 | msgid "No commands done." |
9738 | msgstr "没有命令被执行。" | |
9739 | ||
ec3d4607 | 9740 | #: wt-status.c:1365 |
1b7f4a34 | 9741 | #, c-format |
a0b6b246 JX |
9742 | msgid "Last command done (%d command done):" |
9743 | msgid_plural "Last commands done (%d commands done):" | |
9744 | msgstr[0] "最后一条命令已完成(%d 条命令被执行):" | |
9745 | msgstr[1] "最后的命令已完成(%d 条命令被执行):" | |
1b7f4a34 | 9746 | |
ec3d4607 | 9747 | #: wt-status.c:1376 |
1b7f4a34 | 9748 | #, c-format |
a0b6b246 JX |
9749 | msgid " (see more in file %s)" |
9750 | msgstr " (更多参见文件 %s)" | |
9751 | ||
ec3d4607 | 9752 | #: wt-status.c:1381 |
a0b6b246 JX |
9753 | msgid "No commands remaining." |
9754 | msgstr "未剩下任何命令。" | |
1b7f4a34 | 9755 | |
ec3d4607 | 9756 | #: wt-status.c:1384 |
1b7f4a34 | 9757 | #, c-format |
a0b6b246 JX |
9758 | msgid "Next command to do (%d remaining command):" |
9759 | msgid_plural "Next commands to do (%d remaining commands):" | |
9760 | msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" | |
9761 | msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" | |
1b7f4a34 | 9762 | |
a0b6b246 | 9763 | # 译者:注意保持前导空格 |
ec3d4607 | 9764 | #: wt-status.c:1392 |
a0b6b246 JX |
9765 | msgid " (use \"git rebase --edit-todo\" to view and edit)" |
9766 | msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" | |
1b7f4a34 | 9767 | |
ec3d4607 | 9768 | #: wt-status.c:1404 |
1b7f4a34 | 9769 | #, c-format |
a0b6b246 JX |
9770 | msgid "You are currently rebasing branch '%s' on '%s'." |
9771 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" | |
1b7f4a34 | 9772 | |
ec3d4607 | 9773 | #: wt-status.c:1409 |
a0b6b246 JX |
9774 | msgid "You are currently rebasing." |
9775 | msgstr "您在执行变基操作。" | |
1b7f4a34 | 9776 | |
a0b6b246 | 9777 | # 译者:注意保持前导空格 |
ec3d4607 | 9778 | #: wt-status.c:1422 |
a0b6b246 JX |
9779 | msgid " (fix conflicts and then run \"git rebase --continue\")" |
9780 | msgstr " (解决冲突,然后运行 \"git rebase --continue\")" | |
1b7f4a34 | 9781 | |
a0b6b246 | 9782 | # 译者:注意保持前导空格 |
ec3d4607 | 9783 | #: wt-status.c:1424 |
a0b6b246 JX |
9784 | msgid " (use \"git rebase --skip\" to skip this patch)" |
9785 | msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" | |
9786 | ||
9787 | # 译者:注意保持前导空格 | |
ec3d4607 | 9788 | #: wt-status.c:1426 |
a0b6b246 JX |
9789 | msgid " (use \"git rebase --abort\" to check out the original branch)" |
9790 | msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" | |
9791 | ||
9792 | # 译者:注意保持前导空格 | |
ec3d4607 | 9793 | #: wt-status.c:1433 |
a0b6b246 JX |
9794 | msgid " (all conflicts fixed: run \"git rebase --continue\")" |
9795 | msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" | |
1b7f4a34 | 9796 | |
ec3d4607 | 9797 | #: wt-status.c:1437 |
a0b6b246 | 9798 | #, c-format |
1b7f4a34 | 9799 | msgid "" |
a0b6b246 JX |
9800 | "You are currently splitting a commit while rebasing branch '%s' on '%s'." |
9801 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" | |
1b7f4a34 | 9802 | |
ec3d4607 | 9803 | #: wt-status.c:1442 |
a0b6b246 JX |
9804 | msgid "You are currently splitting a commit during a rebase." |
9805 | msgstr "您在执行变基操作时拆分提交。" | |
1b7f4a34 | 9806 | |
a0b6b246 | 9807 | # 译者:注意保持前导空格 |
ec3d4607 | 9808 | #: wt-status.c:1445 |
a0b6b246 JX |
9809 | msgid " (Once your working directory is clean, run \"git rebase --continue\")" |
9810 | msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" | |
1b7f4a34 | 9811 | |
ec3d4607 | 9812 | #: wt-status.c:1449 |
a0b6b246 JX |
9813 | #, c-format |
9814 | msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." | |
9815 | msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" | |
1b7f4a34 | 9816 | |
ec3d4607 | 9817 | #: wt-status.c:1454 |
a0b6b246 JX |
9818 | msgid "You are currently editing a commit during a rebase." |
9819 | msgstr "您在执行变基操作时编辑提交。" | |
1b7f4a34 | 9820 | |
a0b6b246 | 9821 | # 译者:注意保持前导空格 |
ec3d4607 | 9822 | #: wt-status.c:1457 |
a0b6b246 JX |
9823 | msgid " (use \"git commit --amend\" to amend the current commit)" |
9824 | msgstr " (使用 \"git commit --amend\" 修补当前提交)" | |
9825 | ||
9826 | # 译者:注意保持前导空格 | |
ec3d4607 | 9827 | #: wt-status.c:1459 |
a0b6b246 JX |
9828 | msgid "" |
9829 | " (use \"git rebase --continue\" once you are satisfied with your changes)" | |
9830 | msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" | |
1b7f4a34 | 9831 | |
ec3d4607 | 9832 | #: wt-status.c:1470 |
d46c5519 JX |
9833 | msgid "Cherry-pick currently in progress." |
9834 | msgstr "拣选操作正在进行中。" | |
9835 | ||
ec3d4607 | 9836 | #: wt-status.c:1473 |
1b7f4a34 | 9837 | #, c-format |
a0b6b246 JX |
9838 | msgid "You are currently cherry-picking commit %s." |
9839 | msgstr "您在执行拣选提交 %s 的操作。" | |
1b7f4a34 | 9840 | |
a0b6b246 | 9841 | # 译者:注意保持前导空格 |
ec3d4607 | 9842 | #: wt-status.c:1480 |
a0b6b246 JX |
9843 | msgid " (fix conflicts and run \"git cherry-pick --continue\")" |
9844 | msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 9845 | |
a0b6b246 | 9846 | # 译者:注意保持前导空格 |
ec3d4607 | 9847 | #: wt-status.c:1483 |
d46c5519 JX |
9848 | msgid " (run \"git cherry-pick --continue\" to continue)" |
9849 | msgstr " (执行 \"git cherry-pick --continue\" 以继续)" | |
9850 | ||
9851 | # 译者:注意保持前导空格 | |
ec3d4607 | 9852 | #: wt-status.c:1486 |
a0b6b246 JX |
9853 | msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" |
9854 | msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" | |
1b7f4a34 | 9855 | |
a0b6b246 | 9856 | # 译者:注意保持前导空格 |
ec3d4607 | 9857 | #: wt-status.c:1488 |
a5cd71ca JX |
9858 | msgid " (use \"git cherry-pick --skip\" to skip this patch)" |
9859 | msgstr " (使用 \"git cherry-pick --skip\" 跳过此补丁)" | |
9860 | ||
9861 | # 译者:注意保持前导空格 | |
ec3d4607 | 9862 | #: wt-status.c:1490 |
a0b6b246 JX |
9863 | msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" |
9864 | msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" | |
1b7f4a34 | 9865 | |
ec3d4607 | 9866 | #: wt-status.c:1500 |
d46c5519 JX |
9867 | msgid "Revert currently in progress." |
9868 | msgstr "还原操作正在行中。" | |
9869 | ||
ec3d4607 | 9870 | #: wt-status.c:1503 |
1b7f4a34 | 9871 | #, c-format |
a0b6b246 JX |
9872 | msgid "You are currently reverting commit %s." |
9873 | msgstr "您在执行反转提交 %s 的操作。" | |
1b7f4a34 | 9874 | |
a0b6b246 | 9875 | # 译者:注意保持前导空格 |
ec3d4607 | 9876 | #: wt-status.c:1509 |
a0b6b246 | 9877 | msgid " (fix conflicts and run \"git revert --continue\")" |
5b533632 | 9878 | msgstr " (解决冲突并执行 \"git revert --continue\")" |
1b7f4a34 | 9879 | |
a0b6b246 | 9880 | # 译者:注意保持前导空格 |
ec3d4607 | 9881 | #: wt-status.c:1512 |
d46c5519 | 9882 | msgid " (run \"git revert --continue\" to continue)" |
5b533632 | 9883 | msgstr " (执行 \"git revert --continue\" 以继续)" |
d46c5519 JX |
9884 | |
9885 | # 译者:注意保持前导空格 | |
ec3d4607 | 9886 | #: wt-status.c:1515 |
a0b6b246 | 9887 | msgid " (all conflicts fixed: run \"git revert --continue\")" |
5b533632 | 9888 | msgstr " (所有冲突已解决:执行 \"git revert --continue\")" |
1b7f4a34 | 9889 | |
a0b6b246 | 9890 | # 译者:注意保持前导空格 |
ec3d4607 | 9891 | #: wt-status.c:1517 |
a5cd71ca JX |
9892 | msgid " (use \"git revert --skip\" to skip this patch)" |
9893 | msgstr " (使用 \"git revert --skip\" 跳过此补丁)" | |
9894 | ||
9895 | # 译者:注意保持前导空格 | |
ec3d4607 | 9896 | #: wt-status.c:1519 |
a0b6b246 JX |
9897 | msgid " (use \"git revert --abort\" to cancel the revert operation)" |
9898 | msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" | |
1b7f4a34 | 9899 | |
ec3d4607 | 9900 | #: wt-status.c:1529 |
1b7f4a34 | 9901 | #, c-format |
a0b6b246 JX |
9902 | msgid "You are currently bisecting, started from branch '%s'." |
9903 | msgstr "您在执行从分支 '%s' 开始的二分查找操作。" | |
1b7f4a34 | 9904 | |
ec3d4607 | 9905 | #: wt-status.c:1533 |
a0b6b246 JX |
9906 | msgid "You are currently bisecting." |
9907 | msgstr "您在执行二分查找操作。" | |
1b7f4a34 | 9908 | |
a0b6b246 | 9909 | # 译者:注意保持前导空格 |
ec3d4607 | 9910 | #: wt-status.c:1536 |
a0b6b246 JX |
9911 | msgid " (use \"git bisect reset\" to get back to the original branch)" |
9912 | msgstr " (使用 \"git bisect reset\" 以回到原有分支)" | |
1b7f4a34 | 9913 | |
ec3d4607 JX |
9914 | #: wt-status.c:1547 |
9915 | msgid "You are in a sparse checkout." | |
9916 | msgstr "您处于一个稀疏检出中。" | |
9917 | ||
9918 | #: wt-status.c:1550 | |
7157c2b5 JX |
9919 | #, c-format |
9920 | msgid "You are in a sparse checkout with %d%% of tracked files present." | |
ec3d4607 | 9921 | msgstr "您处于稀疏检出状态,包含 %d%% 的跟踪文件" |
7157c2b5 | 9922 | |
ec3d4607 | 9923 | #: wt-status.c:1794 |
a0b6b246 JX |
9924 | msgid "On branch " |
9925 | msgstr "位于分支 " | |
1b7f4a34 | 9926 | |
ec3d4607 | 9927 | #: wt-status.c:1801 |
a0b6b246 JX |
9928 | msgid "interactive rebase in progress; onto " |
9929 | msgstr "交互式变基操作正在进行中;至 " | |
1b7f4a34 | 9930 | |
ec3d4607 | 9931 | #: wt-status.c:1803 |
a0b6b246 JX |
9932 | msgid "rebase in progress; onto " |
9933 | msgstr "变基操作正在进行中;至 " | |
1b7f4a34 | 9934 | |
ec3d4607 | 9935 | #: wt-status.c:1808 |
473eb541 JX |
9936 | msgid "HEAD detached at " |
9937 | msgstr "头指针分离于 " | |
9938 | ||
ec3d4607 | 9939 | #: wt-status.c:1810 |
473eb541 JX |
9940 | msgid "HEAD detached from " |
9941 | msgstr "头指针分离自 " | |
9942 | ||
ec3d4607 | 9943 | #: wt-status.c:1813 |
a0b6b246 JX |
9944 | msgid "Not currently on any branch." |
9945 | msgstr "当前不在任何分支上。" | |
1b7f4a34 | 9946 | |
ec3d4607 | 9947 | #: wt-status.c:1830 |
a0b6b246 JX |
9948 | msgid "Initial commit" |
9949 | msgstr "初始提交" | |
1b7f4a34 | 9950 | |
ec3d4607 | 9951 | #: wt-status.c:1831 |
a4f16749 JX |
9952 | msgid "No commits yet" |
9953 | msgstr "尚无提交" | |
9954 | ||
ec3d4607 | 9955 | #: wt-status.c:1845 |
a0b6b246 JX |
9956 | msgid "Untracked files" |
9957 | msgstr "未跟踪的文件" | |
1b7f4a34 | 9958 | |
ec3d4607 | 9959 | #: wt-status.c:1847 |
a0b6b246 JX |
9960 | msgid "Ignored files" |
9961 | msgstr "忽略的文件" | |
1b7f4a34 | 9962 | |
ec3d4607 | 9963 | #: wt-status.c:1851 |
a0b6b246 JX |
9964 | #, c-format |
9965 | msgid "" | |
9966 | "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" | |
9967 | "may speed it up, but you have to be careful not to forget to add\n" | |
9968 | "new files yourself (see 'git help status')." | |
9969 | msgstr "" | |
9970 | "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" | |
9971 | "但您需要小心不要忘了添加新文件(参见 'git help status')。" | |
1b7f4a34 | 9972 | |
ec3d4607 | 9973 | #: wt-status.c:1857 |
a0b6b246 JX |
9974 | #, c-format |
9975 | msgid "Untracked files not listed%s" | |
9976 | msgstr "未跟踪的文件没有列出%s" | |
1b7f4a34 | 9977 | |
a0b6b246 | 9978 | # 译者:中文字符串拼接,可删除前导空格 |
ec3d4607 | 9979 | #: wt-status.c:1859 |
a0b6b246 JX |
9980 | msgid " (use -u option to show untracked files)" |
9981 | msgstr "(使用 -u 参数显示未跟踪的文件)" | |
1b7f4a34 | 9982 | |
ec3d4607 | 9983 | #: wt-status.c:1865 |
a0b6b246 JX |
9984 | msgid "No changes" |
9985 | msgstr "没有修改" | |
1b7f4a34 | 9986 | |
ec3d4607 | 9987 | #: wt-status.c:1870 |
a0b6b246 JX |
9988 | #, c-format |
9989 | msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" | |
9990 | msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" | |
1b7f4a34 | 9991 | |
ec3d4607 | 9992 | #: wt-status.c:1874 |
a0b6b246 JX |
9993 | #, c-format |
9994 | msgid "no changes added to commit\n" | |
9995 | msgstr "修改尚未加入提交\n" | |
1b7f4a34 | 9996 | |
ec3d4607 | 9997 | #: wt-status.c:1878 |
a0b6b246 JX |
9998 | #, c-format |
9999 | msgid "" | |
10000 | "nothing added to commit but untracked files present (use \"git add\" to " | |
10001 | "track)\n" | |
10002 | msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 10003 | |
ec3d4607 | 10004 | #: wt-status.c:1882 |
a0b6b246 JX |
10005 | #, c-format |
10006 | msgid "nothing added to commit but untracked files present\n" | |
10007 | msgstr "提交为空,但是存在尚未跟踪的文件\n" | |
1b7f4a34 | 10008 | |
ec3d4607 | 10009 | #: wt-status.c:1886 |
a0b6b246 JX |
10010 | #, c-format |
10011 | msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" | |
10012 | msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" | |
1b7f4a34 | 10013 | |
ec3d4607 | 10014 | #: wt-status.c:1890 wt-status.c:1896 |
a0b6b246 JX |
10015 | #, c-format |
10016 | msgid "nothing to commit\n" | |
10017 | msgstr "无文件要提交\n" | |
1b7f4a34 | 10018 | |
ec3d4607 | 10019 | #: wt-status.c:1893 |
a0b6b246 JX |
10020 | #, c-format |
10021 | msgid "nothing to commit (use -u to show untracked files)\n" | |
10022 | msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" | |
1b7f4a34 | 10023 | |
ec3d4607 | 10024 | #: wt-status.c:1898 |
a0b6b246 JX |
10025 | #, c-format |
10026 | msgid "nothing to commit, working tree clean\n" | |
10027 | msgstr "无文件要提交,干净的工作区\n" | |
10028 | ||
ec3d4607 | 10029 | #: wt-status.c:2003 |
a4f16749 JX |
10030 | msgid "No commits yet on " |
10031 | msgstr "尚无提交在 " | |
1b7f4a34 | 10032 | |
ec3d4607 | 10033 | #: wt-status.c:2007 |
a0b6b246 JX |
10034 | msgid "HEAD (no branch)" |
10035 | msgstr "HEAD(非分支)" | |
1b7f4a34 | 10036 | |
ec3d4607 | 10037 | #: wt-status.c:2038 |
31e5e17b JX |
10038 | msgid "different" |
10039 | msgstr "不同" | |
10040 | ||
a0b6b246 | 10041 | # 译者:注意保持句尾空格 |
ec3d4607 | 10042 | #: wt-status.c:2040 wt-status.c:2048 |
a0b6b246 JX |
10043 | msgid "behind " |
10044 | msgstr "落后 " | |
1b7f4a34 | 10045 | |
ec3d4607 | 10046 | #: wt-status.c:2043 wt-status.c:2046 |
a0b6b246 JX |
10047 | msgid "ahead " |
10048 | msgstr "领先 " | |
1b7f4a34 | 10049 | |
a0b6b246 | 10050 | #. TRANSLATORS: the action is e.g. "pull with rebase" |
ec3d4607 | 10051 | #: wt-status.c:2569 |
a0b6b246 JX |
10052 | #, c-format |
10053 | msgid "cannot %s: You have unstaged changes." | |
10054 | msgstr "不能%s:您有未暂存的变更。" | |
1b7f4a34 | 10055 | |
ec3d4607 | 10056 | #: wt-status.c:2575 |
a0b6b246 | 10057 | msgid "additionally, your index contains uncommitted changes." |
29004bbb | 10058 | msgstr "另外,您的索引中包含未提交的变更。" |
1b7f4a34 | 10059 | |
ec3d4607 | 10060 | #: wt-status.c:2577 |
a0b6b246 JX |
10061 | #, c-format |
10062 | msgid "cannot %s: Your index contains uncommitted changes." | |
10063 | msgstr "不能%s:您的索引中包含未提交的变更。" | |
1b7f4a34 | 10064 | |
ec3d4607 | 10065 | #: compat/simple-ipc/ipc-unix-socket.c:182 |
33b62fba JX |
10066 | msgid "could not send IPC command" |
10067 | msgstr "无法发送 IPC 命令" | |
10068 | ||
ec3d4607 | 10069 | #: compat/simple-ipc/ipc-unix-socket.c:189 |
33b62fba JX |
10070 | msgid "could not read IPC response" |
10071 | msgstr "无法读取 IPC 响应" | |
10072 | ||
ec3d4607 | 10073 | #: compat/simple-ipc/ipc-unix-socket.c:866 |
33b62fba JX |
10074 | #, c-format |
10075 | msgid "could not start accept_thread '%s'" | |
7b4d4954 | 10076 | msgstr "无法启动 accept_thread '%s'" |
33b62fba | 10077 | |
ec3d4607 | 10078 | #: compat/simple-ipc/ipc-unix-socket.c:878 |
33b62fba JX |
10079 | #, c-format |
10080 | msgid "could not start worker[0] for '%s'" | |
10081 | msgstr "无法启动 '%s' 的 worker[0]" | |
10082 | ||
10083 | #: compat/precompose_utf8.c:58 builtin/clone.c:461 | |
a5cd71ca JX |
10084 | #, c-format |
10085 | msgid "failed to unlink '%s'" | |
10086 | msgstr "删除 '%s' 失败" | |
10087 | ||
ddc12c42 | 10088 | #: builtin/add.c:26 |
a0b6b246 JX |
10089 | msgid "git add [<options>] [--] <pathspec>..." |
10090 | msgstr "git add [<选项>] [--] <路径规格>..." | |
1b7f4a34 | 10091 | |
33b62fba | 10092 | #: builtin/add.c:61 |
473eb541 JX |
10093 | #, c-format |
10094 | msgid "cannot chmod %cx '%s'" | |
10095 | msgstr "不能 chmod %cx '%s'" | |
10096 | ||
33b62fba | 10097 | #: builtin/add.c:99 |
a0b6b246 JX |
10098 | #, c-format |
10099 | msgid "unexpected diff status %c" | |
10100 | msgstr "意外的差异状态 %c" | |
1b7f4a34 | 10101 | |
33b62fba | 10102 | #: builtin/add.c:104 builtin/commit.c:297 |
a0b6b246 JX |
10103 | msgid "updating files failed" |
10104 | msgstr "更新文件失败" | |
1b7f4a34 | 10105 | |
33b62fba | 10106 | #: builtin/add.c:114 |
a0b6b246 JX |
10107 | #, c-format |
10108 | msgid "remove '%s'\n" | |
10109 | msgstr "删除 '%s'\n" | |
1b7f4a34 | 10110 | |
33b62fba | 10111 | #: builtin/add.c:198 |
a0b6b246 JX |
10112 | msgid "Unstaged changes after refreshing the index:" |
10113 | msgstr "刷新索引之后尚未被暂存的变更:" | |
1b7f4a34 | 10114 | |
ec3d4607 | 10115 | #: builtin/add.c:307 builtin/rev-parse.c:993 |
a0b6b246 JX |
10116 | msgid "Could not read the index" |
10117 | msgstr "不能读取索引" | |
1b7f4a34 | 10118 | |
33b62fba | 10119 | #: builtin/add.c:318 |
a0b6b246 JX |
10120 | #, c-format |
10121 | msgid "Could not open '%s' for writing." | |
c1ac5258 | 10122 | msgstr "无法为写入打开 '%s'。" |
1b7f4a34 | 10123 | |
33b62fba | 10124 | #: builtin/add.c:322 |
a0b6b246 JX |
10125 | msgid "Could not write patch" |
10126 | msgstr "不能生成补丁" | |
1b7f4a34 | 10127 | |
33b62fba | 10128 | #: builtin/add.c:325 |
a0b6b246 JX |
10129 | msgid "editing patch failed" |
10130 | msgstr "编辑补丁失败" | |
1b7f4a34 | 10131 | |
33b62fba | 10132 | #: builtin/add.c:328 |
1b7f4a34 | 10133 | #, c-format |
a0b6b246 | 10134 | msgid "Could not stat '%s'" |
65e2041e | 10135 | msgstr "不能对 '%s' 调用 stat" |
1b7f4a34 | 10136 | |
33b62fba | 10137 | #: builtin/add.c:330 |
a0b6b246 JX |
10138 | msgid "Empty patch. Aborted." |
10139 | msgstr "空补丁。异常终止。" | |
1b7f4a34 | 10140 | |
33b62fba | 10141 | #: builtin/add.c:335 |
a0b6b246 JX |
10142 | #, c-format |
10143 | msgid "Could not apply '%s'" | |
10144 | msgstr "不能应用 '%s'" | |
1b7f4a34 | 10145 | |
33b62fba | 10146 | #: builtin/add.c:343 |
a0b6b246 JX |
10147 | msgid "The following paths are ignored by one of your .gitignore files:\n" |
10148 | msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n" | |
8ada9598 | 10149 | |
ec3d4607 JX |
10150 | #: builtin/add.c:363 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 |
10151 | #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 | |
33b62fba | 10152 | #: builtin/remote.c:1427 builtin/rm.c:243 builtin/send-pack.c:190 |
a0b6b246 JX |
10153 | msgid "dry run" |
10154 | msgstr "演习" | |
8ada9598 | 10155 | |
33b62fba | 10156 | #: builtin/add.c:366 |
a0b6b246 JX |
10157 | msgid "interactive picking" |
10158 | msgstr "交互式拣选" | |
8ada9598 | 10159 | |
ec3d4607 | 10160 | #: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308 |
a0b6b246 JX |
10161 | msgid "select hunks interactively" |
10162 | msgstr "交互式挑选数据块" | |
8ada9598 | 10163 | |
33b62fba | 10164 | #: builtin/add.c:368 |
a0b6b246 JX |
10165 | msgid "edit current diff and apply" |
10166 | msgstr "编辑当前差异并应用" | |
8ada9598 | 10167 | |
33b62fba | 10168 | #: builtin/add.c:369 |
a0b6b246 JX |
10169 | msgid "allow adding otherwise ignored files" |
10170 | msgstr "允许添加忽略的文件" | |
8ada9598 | 10171 | |
33b62fba | 10172 | #: builtin/add.c:370 |
a0b6b246 JX |
10173 | msgid "update tracked files" |
10174 | msgstr "更新已跟踪的文件" | |
8ada9598 | 10175 | |
33b62fba | 10176 | #: builtin/add.c:371 |
5809aa05 JX |
10177 | msgid "renormalize EOL of tracked files (implies -u)" |
10178 | msgstr "对已跟踪文件(暗含 -u)重新归一换行符" | |
10179 | ||
33b62fba | 10180 | #: builtin/add.c:372 |
a0b6b246 JX |
10181 | msgid "record only the fact that the path will be added later" |
10182 | msgstr "只记录,该路径稍后再添加" | |
8ada9598 | 10183 | |
33b62fba | 10184 | #: builtin/add.c:373 |
a0b6b246 JX |
10185 | msgid "add changes from all tracked and untracked files" |
10186 | msgstr "添加所有改变的已跟踪文件和未跟踪文件" | |
8ada9598 | 10187 | |
33b62fba | 10188 | #: builtin/add.c:376 |
a0b6b246 JX |
10189 | msgid "ignore paths removed in the working tree (same as --no-all)" |
10190 | msgstr "忽略工作区中移除的路径(和 --no-all 相同)" | |
8ada9598 | 10191 | |
33b62fba | 10192 | #: builtin/add.c:378 |
a0b6b246 JX |
10193 | msgid "don't add, only refresh the index" |
10194 | msgstr "不添加,只刷新索引" | |
8ada9598 | 10195 | |
33b62fba | 10196 | #: builtin/add.c:379 |
a0b6b246 JX |
10197 | msgid "just skip files which cannot be added because of errors" |
10198 | msgstr "跳过因出错不能添加的文件" | |
8ada9598 | 10199 | |
33b62fba | 10200 | #: builtin/add.c:380 |
a0b6b246 JX |
10201 | msgid "check if - even missing - files are ignored in dry run" |
10202 | msgstr "检查在演习模式下文件(即使不存在)是否被忽略" | |
8ada9598 | 10203 | |
33b62fba | 10204 | #: builtin/add.c:382 builtin/update-index.c:1006 |
a0b6b246 JX |
10205 | msgid "override the executable bit of the listed files" |
10206 | msgstr "覆盖列表里文件的可执行位" | |
8ada9598 | 10207 | |
33b62fba | 10208 | #: builtin/add.c:384 |
a4f16749 JX |
10209 | msgid "warn when adding an embedded repository" |
10210 | msgstr "创建一个嵌入式仓库时给予警告" | |
10211 | ||
33b62fba | 10212 | #: builtin/add.c:386 |
2b472aae JX |
10213 | msgid "backend for `git stash -p`" |
10214 | msgstr "`git stash -p` 的后端" | |
10215 | ||
33b62fba | 10216 | #: builtin/add.c:404 |
a4f16749 JX |
10217 | #, c-format |
10218 | msgid "" | |
10219 | "You've added another git repository inside your current repository.\n" | |
10220 | "Clones of the outer repository will not contain the contents of\n" | |
10221 | "the embedded repository and will not know how to obtain it.\n" | |
10222 | "If you meant to add a submodule, use:\n" | |
10223 | "\n" | |
10224 | "\tgit submodule add <url> %s\n" | |
10225 | "\n" | |
10226 | "If you added this path by mistake, you can remove it from the\n" | |
10227 | "index with:\n" | |
10228 | "\n" | |
10229 | "\tgit rm --cached %s\n" | |
10230 | "\n" | |
10231 | "See \"git help submodule\" for more information." | |
10232 | msgstr "" | |
ddc12c42 JX |
10233 | "您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" |
10234 | "内容,并且不知道该如何获取它。如果您要添加一个子模组,使用:\n" | |
a4f16749 JX |
10235 | "\n" |
10236 | "\tgit submodule add <url> %s\n" | |
10237 | "\n" | |
10238 | "如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n" | |
10239 | "\n" | |
10240 | "\tgit rm --cached %s\n" | |
10241 | "\n" | |
10242 | "参见 \"git help submodule\" 获取更多信息。" | |
10243 | ||
33b62fba | 10244 | #: builtin/add.c:432 |
a4f16749 JX |
10245 | #, c-format |
10246 | msgid "adding embedded git repository: %s" | |
10247 | msgstr "正在添加嵌入式 git 仓库:%s" | |
10248 | ||
33b62fba | 10249 | #: builtin/add.c:451 |
2b472aae JX |
10250 | msgid "" |
10251 | "Use -f if you really want to add them.\n" | |
10252 | "Turn this message off by running\n" | |
10253 | "\"git config advice.addIgnoredFile false\"" | |
10254 | msgstr "" | |
440e7442 | 10255 | "如果您确实要添加它们,使用 -f 参数。\n" |
2b472aae JX |
10256 | "运行下面的命令来关闭本消息\n" |
10257 | "\"git config advice.addIgnoredFile false\"" | |
8ada9598 | 10258 | |
33b62fba | 10259 | #: builtin/add.c:460 |
a0b6b246 JX |
10260 | msgid "adding files failed" |
10261 | msgstr "添加文件失败" | |
8ada9598 | 10262 | |
33b62fba JX |
10263 | #: builtin/add.c:488 |
10264 | msgid "--dry-run is incompatible with --interactive/--patch" | |
10265 | msgstr "--dry-run 与 --interactive/--patch 不兼容" | |
10266 | ||
10267 | #: builtin/add.c:490 builtin/commit.c:357 | |
ddc12c42 JX |
10268 | msgid "--pathspec-from-file is incompatible with --interactive/--patch" |
10269 | msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" | |
10270 | ||
33b62fba | 10271 | #: builtin/add.c:507 |
ddc12c42 JX |
10272 | msgid "--pathspec-from-file is incompatible with --edit" |
10273 | msgstr "--pathspec-from-file 与 --edit 不兼容" | |
10274 | ||
33b62fba | 10275 | #: builtin/add.c:519 |
a0b6b246 JX |
10276 | msgid "-A and -u are mutually incompatible" |
10277 | msgstr "-A 和 -u 选项互斥" | |
8ada9598 | 10278 | |
33b62fba | 10279 | #: builtin/add.c:522 |
a0b6b246 JX |
10280 | msgid "Option --ignore-missing can only be used together with --dry-run" |
10281 | msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" | |
8ada9598 | 10282 | |
33b62fba | 10283 | #: builtin/add.c:526 |
8ada9598 | 10284 | #, c-format |
a0b6b246 JX |
10285 | msgid "--chmod param '%s' must be either -x or +x" |
10286 | msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" | |
8ada9598 | 10287 | |
ec3d4607 JX |
10288 | #: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363 |
10289 | #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633 | |
ddc12c42 JX |
10290 | msgid "--pathspec-from-file is incompatible with pathspec arguments" |
10291 | msgstr "--pathspec-from-file 与路径表达式参数不兼容" | |
10292 | ||
ec3d4607 JX |
10293 | #: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369 |
10294 | #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639 | |
ddc12c42 JX |
10295 | msgid "--pathspec-file-nul requires --pathspec-from-file" |
10296 | msgstr "--pathspec-file-nul 需要 --pathspec-from-file" | |
10297 | ||
33b62fba | 10298 | #: builtin/add.c:555 |
8ada9598 | 10299 | #, c-format |
a0b6b246 JX |
10300 | msgid "Nothing specified, nothing added.\n" |
10301 | msgstr "没有指定文件,也没有文件被添加。\n" | |
8ada9598 | 10302 | |
33b62fba | 10303 | #: builtin/add.c:557 |
2b472aae JX |
10304 | msgid "" |
10305 | "Maybe you wanted to say 'git add .'?\n" | |
10306 | "Turn this message off by running\n" | |
10307 | "\"git config advice.addEmptyPathspec false\"" | |
10308 | msgstr "" | |
10309 | "也许您想要执行 'git add .'?\n" | |
10310 | "运行下面的命令来关闭本消息\n" | |
10311 | "\"git config advice.addEmptyPathspec false\"" | |
8ada9598 | 10312 | |
ec3d4607 | 10313 | #: builtin/am.c:365 |
a0b6b246 JX |
10314 | msgid "could not parse author script" |
10315 | msgstr "不能解析作者脚本" | |
8ada9598 | 10316 | |
ec3d4607 | 10317 | #: builtin/am.c:455 |
81809b99 | 10318 | #, c-format |
a0b6b246 JX |
10319 | msgid "'%s' was deleted by the applypatch-msg hook" |
10320 | msgstr "'%s' 被 applypatch-msg 钩子删除" | |
8ada9598 | 10321 | |
ec3d4607 | 10322 | #: builtin/am.c:497 |
8ada9598 | 10323 | #, c-format |
a0b6b246 JX |
10324 | msgid "Malformed input line: '%s'." |
10325 | msgstr "非法的输入行:'%s'。" | |
8ada9598 | 10326 | |
ec3d4607 | 10327 | #: builtin/am.c:535 |
8ada9598 | 10328 | #, c-format |
a0b6b246 JX |
10329 | msgid "Failed to copy notes from '%s' to '%s'" |
10330 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
8ada9598 | 10331 | |
ec3d4607 | 10332 | #: builtin/am.c:561 |
a0b6b246 JX |
10333 | msgid "fseek failed" |
10334 | msgstr "fseek 失败" | |
8ada9598 | 10335 | |
ec3d4607 | 10336 | #: builtin/am.c:749 |
8ada9598 | 10337 | #, c-format |
a0b6b246 JX |
10338 | msgid "could not parse patch '%s'" |
10339 | msgstr "无法解析补丁 '%s'" | |
8ada9598 | 10340 | |
ec3d4607 | 10341 | #: builtin/am.c:814 |
a0b6b246 JX |
10342 | msgid "Only one StGIT patch series can be applied at once" |
10343 | msgstr "一次只能有一个 StGIT 补丁队列被应用" | |
10344 | ||
ec3d4607 | 10345 | #: builtin/am.c:862 |
a0b6b246 JX |
10346 | msgid "invalid timestamp" |
10347 | msgstr "无效的时间戳" | |
10348 | ||
ec3d4607 | 10349 | #: builtin/am.c:867 builtin/am.c:879 |
a0b6b246 JX |
10350 | msgid "invalid Date line" |
10351 | msgstr "无效的日期行" | |
8ada9598 | 10352 | |
ec3d4607 | 10353 | #: builtin/am.c:874 |
a0b6b246 JX |
10354 | msgid "invalid timezone offset" |
10355 | msgstr "无效的时区偏移值" | |
8ada9598 | 10356 | |
ec3d4607 | 10357 | #: builtin/am.c:967 |
a0b6b246 | 10358 | msgid "Patch format detection failed." |
87cb7997 | 10359 | msgstr "补丁格式探测失败。" |
8ada9598 | 10360 | |
ec3d4607 | 10361 | #: builtin/am.c:972 builtin/clone.c:414 |
8ada9598 | 10362 | #, c-format |
a0b6b246 | 10363 | msgid "failed to create directory '%s'" |
c1ac5258 | 10364 | msgstr "创建目录 '%s' 失败" |
8ada9598 | 10365 | |
ec3d4607 | 10366 | #: builtin/am.c:977 |
a0b6b246 | 10367 | msgid "Failed to split patches." |
c1ac5258 | 10368 | msgstr "拆分补丁失败。" |
814ff314 | 10369 | |
ec3d4607 | 10370 | #: builtin/am.c:1126 |
8ada9598 | 10371 | #, c-format |
a0b6b246 JX |
10372 | msgid "When you have resolved this problem, run \"%s --continue\"." |
10373 | msgstr "当您解决这一问题,执行 \"%s --continue\"。" | |
8ada9598 | 10374 | |
ec3d4607 | 10375 | #: builtin/am.c:1127 |
81809b99 | 10376 | #, c-format |
a0b6b246 JX |
10377 | msgid "If you prefer to skip this patch, run \"%s --skip\" instead." |
10378 | msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" | |
8ada9598 | 10379 | |
ec3d4607 | 10380 | #: builtin/am.c:1128 |
81809b99 | 10381 | #, c-format |
a0b6b246 JX |
10382 | msgid "To restore the original branch and stop patching, run \"%s --abort\"." |
10383 | msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" | |
8ada9598 | 10384 | |
ec3d4607 | 10385 | #: builtin/am.c:1223 |
4c27fcb5 JX |
10386 | msgid "Patch sent with format=flowed; space at the end of lines might be lost." |
10387 | msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" | |
10388 | ||
ec3d4607 | 10389 | #: builtin/am.c:1251 |
a4f16749 JX |
10390 | msgid "Patch is empty." |
10391 | msgstr "补丁为空。" | |
23ff3338 | 10392 | |
ec3d4607 | 10393 | #: builtin/am.c:1316 |
a5cd71ca JX |
10394 | #, c-format |
10395 | msgid "missing author line in commit %s" | |
10396 | msgstr "在提交 %s 中缺失作者行" | |
10397 | ||
ec3d4607 | 10398 | #: builtin/am.c:1319 |
8ada9598 | 10399 | #, c-format |
a4f16749 JX |
10400 | msgid "invalid ident line: %.*s" |
10401 | msgstr "无效的身份标识:%.*s" | |
8ada9598 | 10402 | |
ec3d4607 | 10403 | #: builtin/am.c:1538 |
a0b6b246 JX |
10404 | msgid "Repository lacks necessary blobs to fall back on 3-way merge." |
10405 | msgstr "仓库缺乏必要的数据对象以进行三方合并。" | |
814ff314 | 10406 | |
ec3d4607 | 10407 | #: builtin/am.c:1540 |
a0b6b246 JX |
10408 | msgid "Using index info to reconstruct a base tree..." |
10409 | msgstr "使用索引来重建一个(三方合并的)基础目录树..." | |
8ada9598 | 10410 | |
ec3d4607 | 10411 | #: builtin/am.c:1559 |
a0b6b246 JX |
10412 | msgid "" |
10413 | "Did you hand edit your patch?\n" | |
10414 | "It does not apply to blobs recorded in its index." | |
10415 | msgstr "" | |
10416 | "您是否曾手动编辑过您的补丁?\n" | |
10417 | "无法应用补丁到索引中的数据对象上。" | |
23ff3338 | 10418 | |
ec3d4607 | 10419 | #: builtin/am.c:1565 |
a0b6b246 JX |
10420 | msgid "Falling back to patching base and 3-way merge..." |
10421 | msgstr "回落到基础版本上打补丁及进行三方合并..." | |
8ada9598 | 10422 | |
ec3d4607 | 10423 | #: builtin/am.c:1591 |
a0b6b246 JX |
10424 | msgid "Failed to merge in the changes." |
10425 | msgstr "无法合并变更。" | |
d691f479 | 10426 | |
ec3d4607 | 10427 | #: builtin/am.c:1623 |
a0b6b246 JX |
10428 | msgid "applying to an empty history" |
10429 | msgstr "正应用到一个空历史上" | |
8ada9598 | 10430 | |
ec3d4607 | 10431 | #: builtin/am.c:1675 builtin/am.c:1679 |
8ada9598 | 10432 | #, c-format |
a0b6b246 JX |
10433 | msgid "cannot resume: %s does not exist." |
10434 | msgstr "无法继续:%s 不存在。" | |
8ada9598 | 10435 | |
ec3d4607 | 10436 | #: builtin/am.c:1697 |
a0b6b246 JX |
10437 | msgid "Commit Body is:" |
10438 | msgstr "提交内容为:" | |
8ada9598 | 10439 | |
a0b6b246 JX |
10440 | #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] |
10441 | #. in your translation. The program will only accept English | |
10442 | #. input at this point. | |
10443 | #. | |
ec3d4607 | 10444 | #: builtin/am.c:1707 |
a6cd2cc4 | 10445 | #, c-format |
a0b6b246 JX |
10446 | msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " |
10447 | msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" | |
8ada9598 | 10448 | |
ec3d4607 | 10449 | #: builtin/am.c:1753 builtin/commit.c:408 |
a5cd71ca JX |
10450 | msgid "unable to write index file" |
10451 | msgstr "无法写入索引文件" | |
10452 | ||
ec3d4607 | 10453 | #: builtin/am.c:1757 |
8ada9598 | 10454 | #, c-format |
a0b6b246 JX |
10455 | msgid "Dirty index: cannot apply patches (dirty: %s)" |
10456 | msgstr "脏索引:不能应用补丁(脏文件:%s)" | |
8ada9598 | 10457 | |
ec3d4607 | 10458 | #: builtin/am.c:1797 builtin/am.c:1865 |
81809b99 | 10459 | #, c-format |
a0b6b246 JX |
10460 | msgid "Applying: %.*s" |
10461 | msgstr "应用:%.*s" | |
8ada9598 | 10462 | |
ec3d4607 | 10463 | #: builtin/am.c:1814 |
a0b6b246 JX |
10464 | msgid "No changes -- Patch already applied." |
10465 | msgstr "没有变更 —— 补丁已经应用过。" | |
8ada9598 | 10466 | |
ec3d4607 | 10467 | #: builtin/am.c:1820 |
81809b99 | 10468 | #, c-format |
a0b6b246 JX |
10469 | msgid "Patch failed at %s %.*s" |
10470 | msgstr "打补丁失败于 %s %.*s" | |
8ada9598 | 10471 | |
ec3d4607 | 10472 | #: builtin/am.c:1824 |
2b472aae JX |
10473 | msgid "Use 'git am --show-current-patch=diff' to see the failed patch" |
10474 | msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" | |
8ada9598 | 10475 | |
ec3d4607 | 10476 | #: builtin/am.c:1868 |
a0b6b246 JX |
10477 | msgid "" |
10478 | "No changes - did you forget to use 'git add'?\n" | |
10479 | "If there is nothing left to stage, chances are that something else\n" | |
10480 | "already introduced the same changes; you might want to skip this patch." | |
10481 | msgstr "" | |
10482 | "没有变更 —— 您是不是忘了执行 'git add'?\n" | |
10483 | "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" | |
10484 | "您也许想要跳过这个补丁。" | |
8ada9598 | 10485 | |
ec3d4607 | 10486 | #: builtin/am.c:1875 |
a0b6b246 JX |
10487 | msgid "" |
10488 | "You still have unmerged paths in your index.\n" | |
a4f16749 JX |
10489 | "You should 'git add' each file with resolved conflicts to mark them as " |
10490 | "such.\n" | |
10491 | "You might run `git rm` on a file to accept \"deleted by them\" for it." | |
a0b6b246 | 10492 | msgstr "" |
a4f16749 JX |
10493 | "在您的索引中仍存在未合并的路径。\n" |
10494 | "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" | |
10495 | "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" | |
8ada9598 | 10496 | |
ec3d4607 | 10497 | #: builtin/am.c:1982 builtin/am.c:1986 builtin/am.c:1998 builtin/reset.c:347 |
349ede6a | 10498 | #: builtin/reset.c:355 |
8ada9598 | 10499 | #, c-format |
a0b6b246 JX |
10500 | msgid "Could not parse object '%s'." |
10501 | msgstr "不能解析对象 '%s'。" | |
8ada9598 | 10502 | |
ec3d4607 | 10503 | #: builtin/am.c:2034 |
a0b6b246 | 10504 | msgid "failed to clean index" |
c1ac5258 | 10505 | msgstr "清空索引失败" |
5b04ee3b | 10506 | |
ec3d4607 | 10507 | #: builtin/am.c:2078 |
a0b6b246 JX |
10508 | msgid "" |
10509 | "You seem to have moved HEAD since the last 'am' failure.\n" | |
10510 | "Not rewinding to ORIG_HEAD" | |
10511 | msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" | |
8ada9598 | 10512 | |
ec3d4607 | 10513 | #: builtin/am.c:2185 |
8ada9598 | 10514 | #, c-format |
a0b6b246 JX |
10515 | msgid "Invalid value for --patch-format: %s" |
10516 | msgstr "无效的 --patch-format 值:%s" | |
8ada9598 | 10517 | |
ec3d4607 | 10518 | #: builtin/am.c:2227 |
2b472aae JX |
10519 | #, c-format |
10520 | msgid "Invalid value for --show-current-patch: %s" | |
10521 | msgstr "无效的 --show-current-patch 值:%s" | |
10522 | ||
ec3d4607 | 10523 | #: builtin/am.c:2231 |
2b472aae JX |
10524 | #, c-format |
10525 | msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" | |
10526 | msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" | |
10527 | ||
ec3d4607 | 10528 | #: builtin/am.c:2262 |
a0b6b246 JX |
10529 | msgid "git am [<options>] [(<mbox> | <Maildir>)...]" |
10530 | msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" | |
5b04ee3b | 10531 | |
ec3d4607 | 10532 | #: builtin/am.c:2263 |
a0b6b246 JX |
10533 | msgid "git am [<options>] (--continue | --skip | --abort)" |
10534 | msgstr "git am [<选项>] (--continue | --skip | --abort)" | |
8ada9598 | 10535 | |
ec3d4607 | 10536 | #: builtin/am.c:2269 |
a0b6b246 JX |
10537 | msgid "run interactively" |
10538 | msgstr "以交互式方式运行" | |
8ada9598 | 10539 | |
ec3d4607 | 10540 | #: builtin/am.c:2271 |
a0b6b246 JX |
10541 | msgid "historical option -- no-op" |
10542 | msgstr "老的参数 —— 无作用" | |
8ada9598 | 10543 | |
ec3d4607 | 10544 | #: builtin/am.c:2273 |
a0b6b246 JX |
10545 | msgid "allow fall back on 3way merging if needed" |
10546 | msgstr "如果必要,允许使用三方合并。" | |
8ada9598 | 10547 | |
ec3d4607 JX |
10548 | #: builtin/am.c:2274 builtin/init-db.c:547 builtin/prune-packed.c:16 |
10549 | #: builtin/repack.c:472 builtin/stash.c:945 | |
a0b6b246 JX |
10550 | msgid "be quiet" |
10551 | msgstr "静默模式" | |
8ada9598 | 10552 | |
ec3d4607 | 10553 | #: builtin/am.c:2276 |
d13389bf JX |
10554 | msgid "add a Signed-off-by trailer to the commit message" |
10555 | msgstr "在提交说明中添加 Signed-off-by 尾注" | |
5c57d762 | 10556 | |
ec3d4607 | 10557 | #: builtin/am.c:2279 |
a0b6b246 JX |
10558 | msgid "recode into utf8 (default)" |
10559 | msgstr "使用 utf8 字符集(默认)" | |
5c57d762 | 10560 | |
ec3d4607 | 10561 | #: builtin/am.c:2281 |
a0b6b246 JX |
10562 | msgid "pass -k flag to git-mailinfo" |
10563 | msgstr "向 git-mailinfo 传递 -k 参数" | |
5c57d762 | 10564 | |
ec3d4607 | 10565 | #: builtin/am.c:2283 |
a0b6b246 JX |
10566 | msgid "pass -b flag to git-mailinfo" |
10567 | msgstr "向 git-mailinfo 传递 -b 参数" | |
5c57d762 | 10568 | |
ec3d4607 | 10569 | #: builtin/am.c:2285 |
a0b6b246 JX |
10570 | msgid "pass -m flag to git-mailinfo" |
10571 | msgstr "向 git-mailinfo 传递 -m 参数" | |
5c57d762 | 10572 | |
ec3d4607 | 10573 | #: builtin/am.c:2287 |
a0b6b246 JX |
10574 | msgid "pass --keep-cr flag to git-mailsplit for mbox format" |
10575 | msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" | |
5c57d762 | 10576 | |
ec3d4607 | 10577 | #: builtin/am.c:2290 |
a0b6b246 JX |
10578 | msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" |
10579 | msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" | |
8ada9598 | 10580 | |
ec3d4607 | 10581 | #: builtin/am.c:2293 |
a0b6b246 JX |
10582 | msgid "strip everything before a scissors line" |
10583 | msgstr "丢弃裁切线前的所有内容" | |
8ada9598 | 10584 | |
ec3d4607 | 10585 | #: builtin/am.c:2295 |
33b62fba JX |
10586 | msgid "pass it through git-mailinfo" |
10587 | msgstr "传递给 git-mailinfo" | |
10588 | ||
ec3d4607 JX |
10589 | #: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307 |
10590 | #: builtin/am.c:2310 builtin/am.c:2313 builtin/am.c:2316 builtin/am.c:2319 | |
10591 | #: builtin/am.c:2325 | |
a0b6b246 JX |
10592 | msgid "pass it through git-apply" |
10593 | msgstr "传递给 git-apply" | |
8ada9598 | 10594 | |
ec3d4607 JX |
10595 | #: builtin/am.c:2315 builtin/commit.c:1512 builtin/fmt-merge-msg.c:17 |
10596 | #: builtin/fmt-merge-msg.c:20 builtin/grep.c:905 builtin/merge.c:261 | |
349ede6a | 10597 | #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 |
33b62fba JX |
10598 | #: builtin/rebase.c:1342 builtin/repack.c:483 builtin/repack.c:487 |
10599 | #: builtin/repack.c:489 builtin/show-branch.c:650 builtin/show-ref.c:172 | |
10600 | #: builtin/tag.c:447 parse-options.h:155 parse-options.h:176 | |
10601 | #: parse-options.h:317 | |
a0b6b246 JX |
10602 | msgid "n" |
10603 | msgstr "n" | |
8ada9598 | 10604 | |
ec3d4607 | 10605 | #: builtin/am.c:2321 builtin/branch.c:672 builtin/bugreport.c:137 |
33b62fba | 10606 | #: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:481 |
d9488fea | 10607 | #: builtin/verify-tag.c:38 |
a0b6b246 JX |
10608 | msgid "format" |
10609 | msgstr "格式" | |
8ada9598 | 10610 | |
ec3d4607 | 10611 | #: builtin/am.c:2322 |
a0b6b246 JX |
10612 | msgid "format the patch(es) are in" |
10613 | msgstr "补丁的格式" | |
8ada9598 | 10614 | |
ec3d4607 | 10615 | #: builtin/am.c:2328 |
a0b6b246 JX |
10616 | msgid "override error message when patch failure occurs" |
10617 | msgstr "打补丁失败时显示的错误信息" | |
8ada9598 | 10618 | |
ec3d4607 | 10619 | #: builtin/am.c:2330 |
a0b6b246 JX |
10620 | msgid "continue applying patches after resolving a conflict" |
10621 | msgstr "冲突解决后继续应用补丁" | |
814ff314 | 10622 | |
ec3d4607 | 10623 | #: builtin/am.c:2333 |
a0b6b246 JX |
10624 | msgid "synonyms for --continue" |
10625 | msgstr "和 --continue 同义" | |
8ada9598 | 10626 | |
ec3d4607 | 10627 | #: builtin/am.c:2336 |
a0b6b246 JX |
10628 | msgid "skip the current patch" |
10629 | msgstr "跳过当前补丁" | |
23ff3338 | 10630 | |
ec3d4607 | 10631 | #: builtin/am.c:2339 |
473eb541 JX |
10632 | msgid "restore the original branch and abort the patching operation" |
10633 | msgstr "恢复原始分支并终止打补丁操作" | |
8ada9598 | 10634 | |
ec3d4607 | 10635 | #: builtin/am.c:2342 |
473eb541 JX |
10636 | msgid "abort the patching operation but keep HEAD where it is" |
10637 | msgstr "终止补丁操作但保持 HEAD 不变" | |
31e5e17b | 10638 | |
ec3d4607 | 10639 | #: builtin/am.c:2346 |
2b472aae JX |
10640 | msgid "show the patch being applied" |
10641 | msgstr "显示正在应用的补丁" | |
31e5e17b | 10642 | |
ec3d4607 | 10643 | #: builtin/am.c:2351 |
a0b6b246 JX |
10644 | msgid "lie about committer date" |
10645 | msgstr "将作者日期作为提交日期" | |
8ada9598 | 10646 | |
ec3d4607 | 10647 | #: builtin/am.c:2353 |
a0b6b246 JX |
10648 | msgid "use current timestamp for author date" |
10649 | msgstr "用当前时间作为作者日期" | |
8ada9598 | 10650 | |
ec3d4607 | 10651 | #: builtin/am.c:2355 builtin/commit-tree.c:120 builtin/commit.c:1640 |
33b62fba JX |
10652 | #: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:537 |
10653 | #: builtin/rebase.c:1395 builtin/revert.c:117 builtin/tag.c:462 | |
a0b6b246 JX |
10654 | msgid "key-id" |
10655 | msgstr "key-id" | |
8ada9598 | 10656 | |
ec3d4607 | 10657 | #: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396 |
a0b6b246 JX |
10658 | msgid "GPG-sign commits" |
10659 | msgstr "使用 GPG 签名提交" | |
8ada9598 | 10660 | |
ec3d4607 | 10661 | #: builtin/am.c:2359 |
a0b6b246 JX |
10662 | msgid "(internal use for git-rebase)" |
10663 | msgstr "(内部使用,用于 git-rebase)" | |
8ada9598 | 10664 | |
ec3d4607 | 10665 | #: builtin/am.c:2377 |
a0b6b246 JX |
10666 | msgid "" |
10667 | "The -b/--binary option has been a no-op for long time, and\n" | |
10668 | "it will be removed. Please do not use it anymore." | |
10669 | msgstr "" | |
10670 | "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" | |
10671 | "请不要再使用它了。" | |
8ada9598 | 10672 | |
ec3d4607 | 10673 | #: builtin/am.c:2384 |
a0b6b246 | 10674 | msgid "failed to read the index" |
c1ac5258 | 10675 | msgstr "读取索引失败" |
8ada9598 | 10676 | |
ec3d4607 | 10677 | #: builtin/am.c:2399 |
a0b6b246 JX |
10678 | #, c-format |
10679 | msgid "previous rebase directory %s still exists but mbox given." | |
10680 | msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" | |
8ada9598 | 10681 | |
ec3d4607 | 10682 | #: builtin/am.c:2423 |
a0b6b246 JX |
10683 | #, c-format |
10684 | msgid "" | |
10685 | "Stray %s directory found.\n" | |
10686 | "Use \"git am --abort\" to remove it." | |
10687 | msgstr "" | |
10688 | "发现了错误的 %s 目录。\n" | |
10689 | "使用 \"git am --abort\" 删除它。" | |
c04f5ac3 | 10690 | |
ec3d4607 | 10691 | #: builtin/am.c:2429 |
a0b6b246 JX |
10692 | msgid "Resolve operation not in progress, we are not resuming." |
10693 | msgstr "解决操作未进行,我们不会继续。" | |
c04f5ac3 | 10694 | |
ec3d4607 | 10695 | #: builtin/am.c:2439 |
a6cd2cc4 JX |
10696 | msgid "interactive mode requires patches on the command line" |
10697 | msgstr "交互式模式需要命令行上提供补丁" | |
10698 | ||
a0b6b246 JX |
10699 | #: builtin/apply.c:8 |
10700 | msgid "git apply [<options>] [<patch>...]" | |
10701 | msgstr "git apply [<选项>] [<补丁>...]" | |
c04f5ac3 | 10702 | |
c04f5ac3 JX |
10703 | #: builtin/archive.c:17 |
10704 | #, c-format | |
10705 | msgid "could not create archive file '%s'" | |
90e6ef53 | 10706 | msgstr "不能创建归档文件 '%s'" |
c04f5ac3 JX |
10707 | |
10708 | #: builtin/archive.c:20 | |
10709 | msgid "could not redirect output" | |
195febda | 10710 | msgstr "不能重定向输出" |
c04f5ac3 JX |
10711 | |
10712 | #: builtin/archive.c:37 | |
10713 | msgid "git archive: Remote with no URL" | |
4375c10e | 10714 | msgstr "git archive:未提供远程 URL" |
c04f5ac3 | 10715 | |
06991777 | 10716 | #: builtin/archive.c:61 |
31e5e17b JX |
10717 | msgid "git archive: expected ACK/NAK, got a flush packet" |
10718 | msgstr "git archive:期望是 ACK/NAK,却得到 flush 包" | |
c04f5ac3 | 10719 | |
06991777 | 10720 | #: builtin/archive.c:64 |
c04f5ac3 JX |
10721 | #, c-format |
10722 | msgid "git archive: NACK %s" | |
90e6ef53 | 10723 | msgstr "git archive:NACK %s" |
c04f5ac3 | 10724 | |
06991777 | 10725 | #: builtin/archive.c:65 |
c04f5ac3 | 10726 | msgid "git archive: protocol error" |
90e6ef53 | 10727 | msgstr "git archive:协议错误" |
c04f5ac3 | 10728 | |
06991777 | 10729 | #: builtin/archive.c:69 |
c04f5ac3 | 10730 | msgid "git archive: expected a flush" |
31e5e17b | 10731 | msgstr "git archive:应有一个 flush 包" |
c04f5ac3 | 10732 | |
06991777 | 10733 | #: builtin/bisect--helper.c:23 |
06991777 JX |
10734 | msgid "git bisect--helper --bisect-reset [<commit>]" |
10735 | msgstr "git bisect--helper --bisect-reset [<提交>]" | |
10736 | ||
d13389bf | 10737 | #: builtin/bisect--helper.c:24 |
06991777 JX |
10738 | msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" |
10739 | msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]" | |
10740 | ||
473eb541 | 10741 | #: builtin/bisect--helper.c:25 |
06991777 JX |
10742 | msgid "" |
10743 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
10744 | "term-new]" | |
10745 | msgstr "" | |
10746 | "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" | |
10747 | "term-new]" | |
10748 | ||
473eb541 | 10749 | #: builtin/bisect--helper.c:26 |
06991777 | 10750 | msgid "" |
d9488fea JX |
10751 | "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" |
10752 | "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " | |
10753 | "[<paths>...]" | |
06991777 | 10754 | msgstr "" |
d9488fea JX |
10755 | "git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}" |
10756 | "=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]" | |
10757 | ||
473eb541 | 10758 | #: builtin/bisect--helper.c:28 |
d9488fea JX |
10759 | msgid "git bisect--helper --bisect-next" |
10760 | msgstr "git bisect--helper --bisect-next" | |
10761 | ||
473eb541 | 10762 | #: builtin/bisect--helper.c:29 |
d13389bf JX |
10763 | msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" |
10764 | msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]" | |
10765 | ||
473eb541 | 10766 | #: builtin/bisect--helper.c:30 |
d13389bf JX |
10767 | msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" |
10768 | msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]" | |
d9488fea | 10769 | |
473eb541 JX |
10770 | #: builtin/bisect--helper.c:31 |
10771 | msgid "git bisect--helper --bisect-replay <filename>" | |
10772 | msgstr "git bisect--helper --bisect-replay <文件>" | |
10773 | ||
10774 | #: builtin/bisect--helper.c:32 | |
10775 | msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" | |
10776 | msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]" | |
10777 | ||
10778 | #: builtin/bisect--helper.c:107 | |
d9488fea JX |
10779 | #, c-format |
10780 | msgid "cannot open file '%s' in mode '%s'" | |
10781 | msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" | |
10782 | ||
473eb541 | 10783 | #: builtin/bisect--helper.c:114 |
d9488fea JX |
10784 | #, c-format |
10785 | msgid "could not write to file '%s'" | |
10786 | msgstr "不能写入文件 '%s'" | |
10787 | ||
ec3d4607 | 10788 | #: builtin/bisect--helper.c:155 |
5809aa05 JX |
10789 | #, c-format |
10790 | msgid "'%s' is not a valid term" | |
10791 | msgstr "'%s' 不是一个有效的术语" | |
10792 | ||
ec3d4607 | 10793 | #: builtin/bisect--helper.c:159 |
5809aa05 JX |
10794 | #, c-format |
10795 | msgid "can't use the builtin command '%s' as a term" | |
10796 | msgstr "不能使用内置命令 '%s' 作为术语" | |
10797 | ||
ec3d4607 | 10798 | #: builtin/bisect--helper.c:169 |
5809aa05 JX |
10799 | #, c-format |
10800 | msgid "can't change the meaning of the term '%s'" | |
10801 | msgstr "不能修改术语 '%s' 的含义" | |
10802 | ||
ec3d4607 | 10803 | #: builtin/bisect--helper.c:179 |
5809aa05 JX |
10804 | msgid "please use two different terms" |
10805 | msgstr "请使用两个不同的术语" | |
10806 | ||
ec3d4607 | 10807 | #: builtin/bisect--helper.c:195 |
06991777 JX |
10808 | #, c-format |
10809 | msgid "We are not bisecting.\n" | |
10810 | msgstr "我们没有在二分查找。\n" | |
10811 | ||
ec3d4607 | 10812 | #: builtin/bisect--helper.c:203 |
06991777 JX |
10813 | #, c-format |
10814 | msgid "'%s' is not a valid commit" | |
10815 | msgstr "'%s' 不是一个有效的提交" | |
10816 | ||
ec3d4607 | 10817 | #: builtin/bisect--helper.c:212 |
06991777 JX |
10818 | #, c-format |
10819 | msgid "" | |
10820 | "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." | |
10821 | msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" | |
10822 | ||
ec3d4607 | 10823 | #: builtin/bisect--helper.c:256 |
06991777 JX |
10824 | #, c-format |
10825 | msgid "Bad bisect_write argument: %s" | |
10826 | msgstr "坏的 bisect_write 参数:%s" | |
10827 | ||
ec3d4607 | 10828 | #: builtin/bisect--helper.c:261 |
06991777 JX |
10829 | #, c-format |
10830 | msgid "couldn't get the oid of the rev '%s'" | |
5b533632 | 10831 | msgstr "无法获取版本 '%s' 的对象 ID" |
06991777 | 10832 | |
ec3d4607 | 10833 | #: builtin/bisect--helper.c:273 |
06991777 JX |
10834 | #, c-format |
10835 | msgid "couldn't open the file '%s'" | |
10836 | msgstr "无法打开文件 '%s'" | |
10837 | ||
ec3d4607 | 10838 | #: builtin/bisect--helper.c:299 |
06991777 JX |
10839 | #, c-format |
10840 | msgid "Invalid command: you're currently in a %s/%s bisect" | |
10841 | msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中" | |
10842 | ||
ec3d4607 | 10843 | #: builtin/bisect--helper.c:326 |
06991777 JX |
10844 | #, c-format |
10845 | msgid "" | |
10846 | "You need to give me at least one %s and %s revision.\n" | |
10847 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
10848 | msgstr "" | |
10849 | "您需要给我至少一个 %s 和一个 %s 版本。\n" | |
10850 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" | |
10851 | ||
ec3d4607 | 10852 | #: builtin/bisect--helper.c:330 |
06991777 JX |
10853 | #, c-format |
10854 | msgid "" | |
10855 | "You need to start by \"git bisect start\".\n" | |
10856 | "You then need to give me at least one %s and %s revision.\n" | |
10857 | "You can use \"git bisect %s\" and \"git bisect %s\" for that." | |
10858 | msgstr "" | |
10859 | "您需要执行 \"git bisect start\" 来开始。\n" | |
10860 | "然后需要提供我至少一个 %s 和一个 %s 版本。\n" | |
10861 | "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" | |
10862 | ||
ec3d4607 | 10863 | #: builtin/bisect--helper.c:350 |
06991777 JX |
10864 | #, c-format |
10865 | msgid "bisecting only with a %s commit" | |
5b533632 | 10866 | msgstr "在只有一个 %s 提交的情况下二分查找" |
06991777 | 10867 | |
06991777 JX |
10868 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10869 | #. translation. The program will only accept English input | |
10870 | #. at this point. | |
10871 | #. | |
ec3d4607 | 10872 | #: builtin/bisect--helper.c:358 |
06991777 JX |
10873 | msgid "Are you sure [Y/n]? " |
10874 | msgstr "您确认么[Y/n]? " | |
10875 | ||
ec3d4607 | 10876 | #: builtin/bisect--helper.c:419 |
06991777 JX |
10877 | msgid "no terms defined" |
10878 | msgstr "未定义术语" | |
10879 | ||
ec3d4607 | 10880 | #: builtin/bisect--helper.c:422 |
06991777 JX |
10881 | #, c-format |
10882 | msgid "" | |
10883 | "Your current terms are %s for the old state\n" | |
10884 | "and %s for the new state.\n" | |
10885 | msgstr "您当前针对旧状态的术语是 %s,对新状态的术语是 %s。\n" | |
10886 | ||
ec3d4607 | 10887 | #: builtin/bisect--helper.c:432 |
06991777 JX |
10888 | #, c-format |
10889 | msgid "" | |
10890 | "invalid argument %s for 'git bisect terms'.\n" | |
10891 | "Supported options are: --term-good|--term-old and --term-bad|--term-new." | |
10892 | msgstr "" | |
10893 | "命令 'git bisect terms' 的参数 %s 无效。\n" | |
10894 | "支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。" | |
10895 | ||
ec3d4607 | 10896 | #: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023 |
d9488fea JX |
10897 | msgid "revision walk setup failed\n" |
10898 | msgstr "版本遍历设置失败\n" | |
10899 | ||
ec3d4607 | 10900 | #: builtin/bisect--helper.c:521 |
d9488fea JX |
10901 | #, c-format |
10902 | msgid "could not open '%s' for appending" | |
10903 | msgstr "无法打开 '%s' 进行追加" | |
10904 | ||
ec3d4607 | 10905 | #: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653 |
7157c2b5 JX |
10906 | msgid "'' is not a valid term" |
10907 | msgstr "'' 不是一个有效的术语" | |
10908 | ||
ec3d4607 | 10909 | #: builtin/bisect--helper.c:663 |
06991777 JX |
10910 | #, c-format |
10911 | msgid "unrecognized option: '%s'" | |
10912 | msgstr "未识别的选项:'%s'" | |
10913 | ||
ec3d4607 | 10914 | #: builtin/bisect--helper.c:667 |
06991777 JX |
10915 | #, c-format |
10916 | msgid "'%s' does not appear to be a valid revision" | |
8e4e0555 | 10917 | msgstr "'%s' 看起来不是一个有效的版本" |
06991777 | 10918 | |
ec3d4607 | 10919 | #: builtin/bisect--helper.c:698 |
06991777 JX |
10920 | msgid "bad HEAD - I need a HEAD" |
10921 | msgstr "坏的 HEAD - 我需要一个 HEAD" | |
10922 | ||
ec3d4607 | 10923 | #: builtin/bisect--helper.c:713 |
06991777 JX |
10924 | #, c-format |
10925 | msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." | |
10926 | msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" | |
10927 | ||
ec3d4607 | 10928 | #: builtin/bisect--helper.c:734 |
06991777 JX |
10929 | msgid "won't bisect on cg-seek'ed tree" |
10930 | msgstr "不会在做了 cg-seek 的树上做二分查找" | |
10931 | ||
ec3d4607 | 10932 | #: builtin/bisect--helper.c:737 |
06991777 JX |
10933 | msgid "bad HEAD - strange symbolic ref" |
10934 | msgstr "坏的 HEAD - 奇怪的符号引用" | |
10935 | ||
ec3d4607 | 10936 | #: builtin/bisect--helper.c:757 |
a6cd2cc4 JX |
10937 | #, c-format |
10938 | msgid "invalid ref: '%s'" | |
10939 | msgstr "无效的引用:'%s'" | |
10940 | ||
ec3d4607 | 10941 | #: builtin/bisect--helper.c:815 |
d9488fea JX |
10942 | msgid "You need to start by \"git bisect start\"\n" |
10943 | msgstr "您需要执行 \"git bisect start\" 来开始\n" | |
10944 | ||
d9488fea JX |
10945 | #. TRANSLATORS: Make sure to include [Y] and [n] in your |
10946 | #. translation. The program will only accept English input | |
10947 | #. at this point. | |
10948 | #. | |
ec3d4607 | 10949 | #: builtin/bisect--helper.c:826 |
d9488fea JX |
10950 | msgid "Do you want me to do it for you [Y/n]? " |
10951 | msgstr "您想让我为您这样做么[Y/n]? " | |
10952 | ||
ec3d4607 | 10953 | #: builtin/bisect--helper.c:844 |
d13389bf JX |
10954 | msgid "Please call `--bisect-state` with at least one argument" |
10955 | msgstr "请使用至少一个参数调用 `--bisect-state`" | |
ef317cd5 | 10956 | |
ec3d4607 | 10957 | #: builtin/bisect--helper.c:857 |
d13389bf JX |
10958 | #, c-format |
10959 | msgid "'git bisect %s' can take only one argument." | |
10960 | msgstr "'git bisect %s' 只能带一个参数。" | |
5809aa05 | 10961 | |
ec3d4607 | 10962 | #: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882 |
d13389bf JX |
10963 | #, c-format |
10964 | msgid "Bad rev input: %s" | |
10965 | msgstr "坏的版本输入:%s" | |
5809aa05 | 10966 | |
ec3d4607 | 10967 | #: builtin/bisect--helper.c:889 |
33b62fba JX |
10968 | #, c-format |
10969 | msgid "Bad rev input (not a commit): %s" | |
10970 | msgstr "坏的版本输入(不是提交):%s" | |
10971 | ||
ec3d4607 | 10972 | #: builtin/bisect--helper.c:921 |
473eb541 JX |
10973 | msgid "We are not bisecting." |
10974 | msgstr "我们没有在二分查找。" | |
10975 | ||
ec3d4607 | 10976 | #: builtin/bisect--helper.c:971 |
473eb541 JX |
10977 | #, c-format |
10978 | msgid "'%s'?? what are you talking about?" | |
10979 | msgstr "'%s'?? 您在说什么?" | |
06991777 | 10980 | |
ec3d4607 | 10981 | #: builtin/bisect--helper.c:983 |
473eb541 JX |
10982 | #, c-format |
10983 | msgid "cannot read file '%s' for replaying" | |
10984 | msgstr "不能读取文件 '%s' 来重放" | |
06991777 | 10985 | |
ec3d4607 | 10986 | #: builtin/bisect--helper.c:1056 |
473eb541 JX |
10987 | msgid "reset the bisection state" |
10988 | msgstr "清除二分查找状态" | |
06991777 | 10989 | |
ec3d4607 | 10990 | #: builtin/bisect--helper.c:1058 |
06991777 JX |
10991 | msgid "check whether bad or good terms exist" |
10992 | msgstr "检查坏的或好的术语是否存在" | |
10993 | ||
ec3d4607 | 10994 | #: builtin/bisect--helper.c:1060 |
06991777 JX |
10995 | msgid "print out the bisect terms" |
10996 | msgstr "打印二分查找术语" | |
10997 | ||
ec3d4607 | 10998 | #: builtin/bisect--helper.c:1062 |
06991777 | 10999 | msgid "start the bisect session" |
5b533632 | 11000 | msgstr "启动二分查找过程" |
06991777 | 11001 | |
ec3d4607 | 11002 | #: builtin/bisect--helper.c:1064 |
d9488fea JX |
11003 | msgid "find the next bisection commit" |
11004 | msgstr "查询下一个二分查找提交" | |
11005 | ||
ec3d4607 | 11006 | #: builtin/bisect--helper.c:1066 |
d13389bf JX |
11007 | msgid "mark the state of ref (or refs)" |
11008 | msgstr "标记引用的状态" | |
d9488fea | 11009 | |
ec3d4607 | 11010 | #: builtin/bisect--helper.c:1068 |
473eb541 JX |
11011 | msgid "list the bisection steps so far" |
11012 | msgstr "列出到目前为止的二分查找步骤" | |
11013 | ||
ec3d4607 | 11014 | #: builtin/bisect--helper.c:1070 |
473eb541 JX |
11015 | msgid "replay the bisection process from the given file" |
11016 | msgstr "从给定文件重放二分查找进程" | |
11017 | ||
ec3d4607 | 11018 | #: builtin/bisect--helper.c:1072 |
473eb541 JX |
11019 | msgid "skip some commits for checkout" |
11020 | msgstr "跳过要检出的一些提交" | |
11021 | ||
ec3d4607 | 11022 | #: builtin/bisect--helper.c:1074 |
06991777 JX |
11023 | msgid "no log for BISECT_WRITE" |
11024 | msgstr "BISECT_WRITE 无日志" | |
11025 | ||
ec3d4607 | 11026 | #: builtin/bisect--helper.c:1089 |
06991777 JX |
11027 | msgid "--bisect-reset requires either no argument or a commit" |
11028 | msgstr "--bisect-reset 无需参数或者需要一个提交" | |
11029 | ||
ec3d4607 | 11030 | #: builtin/bisect--helper.c:1094 |
06991777 JX |
11031 | msgid "--bisect-next-check requires 2 or 3 arguments" |
11032 | msgstr "--bisect-next-check 需要 2 或 3 个参数" | |
11033 | ||
ec3d4607 | 11034 | #: builtin/bisect--helper.c:1100 |
06991777 JX |
11035 | msgid "--bisect-terms requires 0 or 1 argument" |
11036 | msgstr "--bisect-terms 需要 0 或 1 个参数" | |
11037 | ||
ec3d4607 | 11038 | #: builtin/bisect--helper.c:1109 |
d9488fea JX |
11039 | msgid "--bisect-next requires 0 arguments" |
11040 | msgstr "--bisect-next 需要 0 个参数" | |
11041 | ||
ec3d4607 | 11042 | #: builtin/bisect--helper.c:1120 |
473eb541 JX |
11043 | msgid "--bisect-log requires 0 arguments" |
11044 | msgstr "--bisect-log 需要 0 个参数" | |
11045 | ||
ec3d4607 | 11046 | #: builtin/bisect--helper.c:1125 |
473eb541 JX |
11047 | msgid "no logfile given" |
11048 | msgstr "未提供日志文件" | |
d9488fea | 11049 | |
d9488fea | 11050 | #: builtin/blame.c:32 |
7aea43ff JX |
11051 | msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" |
11052 | msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" | |
ef317cd5 | 11053 | |
d9488fea | 11054 | #: builtin/blame.c:37 |
814ff314 JX |
11055 | msgid "<rev-opts> are documented in git-rev-list(1)" |
11056 | msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" | |
ef317cd5 | 11057 | |
d9488fea | 11058 | #: builtin/blame.c:410 |
fd8cb379 JX |
11059 | #, c-format |
11060 | msgid "expecting a color: %s" | |
11061 | msgstr "期望一个颜色:%s" | |
11062 | ||
d9488fea | 11063 | #: builtin/blame.c:417 |
fd8cb379 JX |
11064 | msgid "must end with a color" |
11065 | msgstr "必须以一个颜色结尾" | |
11066 | ||
473eb541 | 11067 | #: builtin/blame.c:728 |
fd8cb379 JX |
11068 | #, c-format |
11069 | msgid "invalid color '%s' in color.blame.repeatedLines" | |
11070 | msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" | |
11071 | ||
473eb541 | 11072 | #: builtin/blame.c:746 |
fd8cb379 JX |
11073 | msgid "invalid value for blame.coloring" |
11074 | msgstr "设置 blame.coloring 中的无效取值" | |
11075 | ||
473eb541 | 11076 | #: builtin/blame.c:845 |
a6cd2cc4 JX |
11077 | #, c-format |
11078 | msgid "cannot find revision %s to ignore" | |
11079 | msgstr "不能找到要忽略的版本 %s" | |
11080 | ||
473eb541 JX |
11081 | #: builtin/blame.c:867 |
11082 | msgid "show blame entries as we find them, incrementally" | |
07432cef | 11083 | msgstr "增量式地显示发现的 blame 条目" |
ef317cd5 | 11084 | |
473eb541 JX |
11085 | #: builtin/blame.c:868 |
11086 | msgid "do not show object names of boundary commits (Default: off)" | |
d9488fea | 11087 | msgstr "不显示边界提交的对象名(默认:关闭)" |
ef317cd5 | 11088 | |
473eb541 JX |
11089 | #: builtin/blame.c:869 |
11090 | msgid "do not treat root commits as boundaries (Default: off)" | |
07432cef | 11091 | msgstr "不把根提交作为边界(默认:关闭)" |
ef317cd5 | 11092 | |
473eb541 JX |
11093 | #: builtin/blame.c:870 |
11094 | msgid "show work cost statistics" | |
11095 | msgstr "显示工作消耗统计" | |
ef317cd5 | 11096 | |
ec3d4607 | 11097 | #: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94 |
33b62fba JX |
11098 | #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179 |
11099 | #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119 | |
ec3d4607 | 11100 | #: builtin/push.c:566 builtin/send-pack.c:198 |
473eb541 JX |
11101 | msgid "force progress reporting" |
11102 | msgstr "强制显示进度报告" | |
276ceeaa | 11103 | |
473eb541 JX |
11104 | #: builtin/blame.c:872 |
11105 | msgid "show output score for blame entries" | |
11106 | msgstr "显示 blame 条目的输出得分" | |
ef317cd5 | 11107 | |
473eb541 JX |
11108 | #: builtin/blame.c:873 |
11109 | msgid "show original filename (Default: auto)" | |
07432cef | 11110 | msgstr "显示原始文件名(默认:自动)" |
ef317cd5 | 11111 | |
473eb541 JX |
11112 | #: builtin/blame.c:874 |
11113 | msgid "show original linenumber (Default: off)" | |
07432cef | 11114 | msgstr "显示原始的行号(默认:关闭)" |
ef317cd5 | 11115 | |
473eb541 JX |
11116 | #: builtin/blame.c:875 |
11117 | msgid "show in a format designed for machine consumption" | |
07432cef | 11118 | msgstr "显示为一个适合机器读取的格式" |
ef317cd5 | 11119 | |
473eb541 JX |
11120 | #: builtin/blame.c:876 |
11121 | msgid "show porcelain format with per-line commit information" | |
07432cef | 11122 | msgstr "为每一行显示机器适用的提交信息" |
ef317cd5 | 11123 | |
473eb541 JX |
11124 | #: builtin/blame.c:877 |
11125 | msgid "use the same output mode as git-annotate (Default: off)" | |
07432cef | 11126 | msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" |
ef317cd5 | 11127 | |
473eb541 JX |
11128 | #: builtin/blame.c:878 |
11129 | msgid "show raw timestamp (Default: off)" | |
07432cef | 11130 | msgstr "显示原始时间戳(默认:关闭)" |
ef317cd5 | 11131 | |
473eb541 JX |
11132 | #: builtin/blame.c:879 |
11133 | msgid "show long commit SHA1 (Default: off)" | |
4375c10e | 11134 | msgstr "显示长的 SHA1 提交号(默认:关闭)" |
ef317cd5 | 11135 | |
473eb541 JX |
11136 | #: builtin/blame.c:880 |
11137 | msgid "suppress author name and timestamp (Default: off)" | |
07432cef | 11138 | msgstr "隐藏作者名字和时间戳(默认:关闭)" |
ef317cd5 | 11139 | |
473eb541 JX |
11140 | #: builtin/blame.c:881 |
11141 | msgid "show author email instead of name (Default: off)" | |
07432cef | 11142 | msgstr "显示作者的邮箱而不是名字(默认:关闭)" |
ef317cd5 | 11143 | |
473eb541 JX |
11144 | #: builtin/blame.c:882 |
11145 | msgid "ignore whitespace differences" | |
07432cef | 11146 | msgstr "忽略空白差异" |
ef317cd5 | 11147 | |
ec3d4607 | 11148 | #: builtin/blame.c:883 builtin/log.c:1823 |
a6cd2cc4 JX |
11149 | msgid "rev" |
11150 | msgstr "版本" | |
11151 | ||
473eb541 JX |
11152 | #: builtin/blame.c:883 |
11153 | msgid "ignore <rev> when blaming" | |
a6cd2cc4 JX |
11154 | msgstr "在执行 blame 操作时忽略 <版本>" |
11155 | ||
473eb541 JX |
11156 | #: builtin/blame.c:884 |
11157 | msgid "ignore revisions from <file>" | |
a6cd2cc4 JX |
11158 | msgstr "忽略来自 <文件> 中的版本" |
11159 | ||
473eb541 | 11160 | #: builtin/blame.c:885 |
fd8cb379 JX |
11161 | msgid "color redundant metadata from previous line differently" |
11162 | msgstr "使用颜色间隔输出与前一行不同的重复元信息" | |
11163 | ||
473eb541 | 11164 | #: builtin/blame.c:886 |
fd8cb379 JX |
11165 | msgid "color lines by age" |
11166 | msgstr "依据时间着色" | |
11167 | ||
473eb541 JX |
11168 | #: builtin/blame.c:887 |
11169 | msgid "spend extra cycles to find better match" | |
07432cef | 11170 | msgstr "花费额外的循环来找到更好的匹配" |
ef317cd5 | 11171 | |
473eb541 JX |
11172 | #: builtin/blame.c:888 |
11173 | msgid "use revisions from <file> instead of calling git-rev-list" | |
d9d56b23 | 11174 | msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" |
ef317cd5 | 11175 | |
473eb541 JX |
11176 | #: builtin/blame.c:889 |
11177 | msgid "use <file>'s contents as the final image" | |
11178 | msgstr "使用 <文件> 的内容作为最终的镜像" | |
ef317cd5 | 11179 | |
473eb541 | 11180 | #: builtin/blame.c:890 builtin/blame.c:891 |
ef317cd5 | 11181 | msgid "score" |
07432cef | 11182 | msgstr "得分" |
ef317cd5 | 11183 | |
473eb541 JX |
11184 | #: builtin/blame.c:890 |
11185 | msgid "find line copies within and across files" | |
07432cef | 11186 | msgstr "找到文件内及跨文件的行拷贝" |
ef317cd5 | 11187 | |
473eb541 JX |
11188 | #: builtin/blame.c:891 |
11189 | msgid "find line movements within and across files" | |
07432cef | 11190 | msgstr "找到文件内及跨文件的行移动" |
ef317cd5 | 11191 | |
473eb541 | 11192 | #: builtin/blame.c:892 |
d13389bf JX |
11193 | msgid "range" |
11194 | msgstr "范围" | |
ef317cd5 | 11195 | |
473eb541 JX |
11196 | #: builtin/blame.c:893 |
11197 | msgid "process only line range <start>,<end> or function :<funcname>" | |
d13389bf | 11198 | msgstr "只处理在 <开始>,<结束> 范围内的行,或者函数:<函数名>" |
ef317cd5 | 11199 | |
473eb541 | 11200 | #: builtin/blame.c:945 |
a0b6b246 | 11201 | msgid "--progress can't be used with --incremental or porcelain formats" |
ec3d4607 | 11202 | msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" |
a0b6b246 | 11203 | |
a4f16749 JX |
11204 | #. TRANSLATORS: This string is used to tell us the |
11205 | #. maximum display width for a relative timestamp in | |
11206 | #. "git blame" output. For C locale, "4 years, 11 | |
11207 | #. months ago", which takes 22 places, is the longest | |
11208 | #. among various forms of relative timestamps, but | |
11209 | #. your language may need more or fewer display | |
11210 | #. columns. | |
11211 | #. | |
473eb541 | 11212 | #: builtin/blame.c:996 |
6c94aba5 JX |
11213 | msgid "4 years, 11 months ago" |
11214 | msgstr "4 年 11 个月前" | |
11215 | ||
473eb541 | 11216 | #: builtin/blame.c:1112 |
a0b6b246 JX |
11217 | #, c-format |
11218 | msgid "file %s has only %lu line" | |
11219 | msgid_plural "file %s has only %lu lines" | |
11220 | msgstr[0] "文件 %s 只有 %lu 行" | |
11221 | msgstr[1] "文件 %s 只有 %lu 行" | |
11222 | ||
473eb541 | 11223 | #: builtin/blame.c:1157 |
a4f16749 JX |
11224 | msgid "Blaming lines" |
11225 | msgstr "追踪代码行" | |
11226 | ||
4c27fcb5 | 11227 | #: builtin/branch.c:29 |
d9488fea JX |
11228 | msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" |
11229 | msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]" | |
ef317cd5 | 11230 | |
4c27fcb5 | 11231 | #: builtin/branch.c:30 |
814ff314 JX |
11232 | msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" |
11233 | msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]" | |
ef317cd5 | 11234 | |
4c27fcb5 | 11235 | #: builtin/branch.c:31 |
814ff314 JX |
11236 | msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." |
11237 | msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." | |
ef317cd5 | 11238 | |
4c27fcb5 | 11239 | #: builtin/branch.c:32 |
814ff314 JX |
11240 | msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" |
11241 | msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" | |
ef317cd5 | 11242 | |
4c27fcb5 | 11243 | #: builtin/branch.c:33 |
6937cb4e JX |
11244 | msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" |
11245 | msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" | |
11246 | ||
4c27fcb5 | 11247 | #: builtin/branch.c:34 |
94550ed3 JX |
11248 | msgid "git branch [<options>] [-r | -a] [--points-at]" |
11249 | msgstr "git branch [<选项>] [-r | -a] [--points-at]" | |
11250 | ||
4c27fcb5 | 11251 | #: builtin/branch.c:35 |
87cb7997 JX |
11252 | msgid "git branch [<options>] [-r | -a] [--format]" |
11253 | msgstr "git branch [<选项>] [-r | -a] [--format]" | |
11254 | ||
90e6ef53 | 11255 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 11256 | #: builtin/branch.c:154 |
c04f5ac3 JX |
11257 | #, c-format |
11258 | msgid "" | |
11259 | "deleting branch '%s' that has been merged to\n" | |
11260 | " '%s', but not yet merged to HEAD." | |
11261 | msgstr "" | |
70fc47bf | 11262 | "将要删除的分支 '%s' 已经被合并到\n" |
c04f5ac3 JX |
11263 | " '%s',但未合并到 HEAD。" |
11264 | ||
90e6ef53 | 11265 | # 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长 |
a6cd2cc4 | 11266 | #: builtin/branch.c:158 |
c04f5ac3 JX |
11267 | #, c-format |
11268 | msgid "" | |
11269 | "not deleting branch '%s' that is not yet merged to\n" | |
11270 | " '%s', even though it is merged to HEAD." | |
11271 | msgstr "" | |
70fc47bf T |
11272 | "并未删除分支 '%s', 虽然它已经合并到 HEAD,\n" |
11273 | " 然而却尚未被合并到分支 '%s' 。" | |
c04f5ac3 | 11274 | |
a6cd2cc4 | 11275 | #: builtin/branch.c:172 |
07432cef WS |
11276 | #, c-format |
11277 | msgid "Couldn't look up commit object for '%s'" | |
11278 | msgstr "无法查询 '%s' 指向的提交对象" | |
11279 | ||
a6cd2cc4 | 11280 | #: builtin/branch.c:176 |
07432cef WS |
11281 | #, c-format |
11282 | msgid "" | |
11283 | "The branch '%s' is not fully merged.\n" | |
11284 | "If you are sure you want to delete it, run 'git branch -D %s'." | |
11285 | msgstr "" | |
11286 | "分支 '%s' 没有完全合并。\n" | |
11287 | "如果您确认要删除它,执行 'git branch -D %s'。" | |
11288 | ||
a6cd2cc4 | 11289 | #: builtin/branch.c:189 |
07432cef | 11290 | msgid "Update of config-file failed" |
6937cb4e | 11291 | msgstr "更新配置文件失败" |
07432cef | 11292 | |
473eb541 | 11293 | #: builtin/branch.c:223 |
c04f5ac3 | 11294 | msgid "cannot use -a with -d" |
649900bc | 11295 | msgstr "不能将 -a 和 -d 同时使用" |
c04f5ac3 | 11296 | |
473eb541 | 11297 | #: builtin/branch.c:230 |
c04f5ac3 JX |
11298 | msgid "Couldn't look up commit object for HEAD" |
11299 | msgstr "无法查询 HEAD 指向的提交对象" | |
11300 | ||
473eb541 | 11301 | #: builtin/branch.c:244 |
c04f5ac3 | 11302 | #, c-format |
5b04ee3b JX |
11303 | msgid "Cannot delete branch '%s' checked out at '%s'" |
11304 | msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" | |
c04f5ac3 | 11305 | |
473eb541 | 11306 | #: builtin/branch.c:259 |
5ae481e0 | 11307 | #, c-format |
7aea43ff JX |
11308 | msgid "remote-tracking branch '%s' not found." |
11309 | msgstr "未能找到远程跟踪分支 '%s'。" | |
c04f5ac3 | 11310 | |
473eb541 | 11311 | #: builtin/branch.c:260 |
81809b99 | 11312 | #, c-format |
8ada9598 | 11313 | msgid "branch '%s' not found." |
81809b99 | 11314 | msgstr "分支 '%s' 未发现。" |
8ada9598 | 11315 | |
473eb541 | 11316 | #: builtin/branch.c:291 |
81809b99 | 11317 | #, c-format |
7aea43ff JX |
11318 | msgid "Deleted remote-tracking branch %s (was %s).\n" |
11319 | msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" | |
c04f5ac3 | 11320 | |
473eb541 | 11321 | #: builtin/branch.c:292 |
81809b99 | 11322 | #, c-format |
8ada9598 | 11323 | msgid "Deleted branch %s (was %s).\n" |
81809b99 | 11324 | msgstr "已删除分支 %s(曾为 %s)。\n" |
8ada9598 | 11325 | |
33b62fba | 11326 | #: builtin/branch.c:440 builtin/tag.c:63 |
6937cb4e JX |
11327 | msgid "unable to parse format string" |
11328 | msgstr "不能解析格式化字符串" | |
11329 | ||
33b62fba | 11330 | #: builtin/branch.c:471 |
d46c5519 JX |
11331 | msgid "could not resolve HEAD" |
11332 | msgstr "不能解析 HEAD 提交" | |
11333 | ||
33b62fba | 11334 | #: builtin/branch.c:477 |
5b04ee3b | 11335 | #, c-format |
d46c5519 JX |
11336 | msgid "HEAD (%s) points outside of refs/heads/" |
11337 | msgstr "HEAD (%s) 指向 refs/heads/ 之外" | |
11338 | ||
33b62fba | 11339 | #: builtin/branch.c:492 |
d46c5519 | 11340 | #, c-format |
5b04ee3b JX |
11341 | msgid "Branch %s is being rebased at %s" |
11342 | msgstr "分支 %s 正被变基到 %s" | |
11343 | ||
33b62fba | 11344 | #: builtin/branch.c:496 |
5b04ee3b JX |
11345 | #, c-format |
11346 | msgid "Branch %s is being bisected at %s" | |
11347 | msgstr "分支 %s 正被二分查找于 %s" | |
11348 | ||
33b62fba | 11349 | #: builtin/branch.c:513 |
6937cb4e JX |
11350 | msgid "cannot copy the current branch while not on any." |
11351 | msgstr "无法拷贝当前分支因为不处于任何分支上。" | |
11352 | ||
33b62fba | 11353 | #: builtin/branch.c:515 |
c04f5ac3 | 11354 | msgid "cannot rename the current branch while not on any." |
90e6ef53 | 11355 | msgstr "无法重命名当前分支因为不处于任何分支上。" |
c04f5ac3 | 11356 | |
33b62fba | 11357 | #: builtin/branch.c:526 |
c04f5ac3 JX |
11358 | #, c-format |
11359 | msgid "Invalid branch name: '%s'" | |
11360 | msgstr "无效的分支名:'%s'" | |
11361 | ||
33b62fba | 11362 | #: builtin/branch.c:555 |
c04f5ac3 JX |
11363 | msgid "Branch rename failed" |
11364 | msgstr "分支重命名失败" | |
11365 | ||
33b62fba | 11366 | #: builtin/branch.c:557 |
6937cb4e JX |
11367 | msgid "Branch copy failed" |
11368 | msgstr "分支拷贝失败" | |
11369 | ||
33b62fba | 11370 | #: builtin/branch.c:561 |
6937cb4e | 11371 | #, c-format |
5809aa05 JX |
11372 | msgid "Created a copy of a misnamed branch '%s'" |
11373 | msgstr "已为错误命名的分支 '%s' 创建了一个副本" | |
6937cb4e | 11374 | |
33b62fba | 11375 | #: builtin/branch.c:564 |
c04f5ac3 JX |
11376 | #, c-format |
11377 | msgid "Renamed a misnamed branch '%s' away" | |
6937cb4e | 11378 | msgstr "已将错误命名的分支 '%s' 重命名" |
c04f5ac3 | 11379 | |
33b62fba | 11380 | #: builtin/branch.c:570 |
c04f5ac3 JX |
11381 | #, c-format |
11382 | msgid "Branch renamed to %s, but HEAD is not updated!" | |
11383 | msgstr "分支重命名为 %s,但 HEAD 没有更新!" | |
11384 | ||
33b62fba | 11385 | #: builtin/branch.c:579 |
c04f5ac3 | 11386 | msgid "Branch is renamed, but update of config-file failed" |
6937cb4e JX |
11387 | msgstr "分支被重命名,但更新配置文件失败" |
11388 | ||
33b62fba | 11389 | #: builtin/branch.c:581 |
6937cb4e JX |
11390 | msgid "Branch is copied, but update of config-file failed" |
11391 | msgstr "分支已拷贝,但更新配置文件失败" | |
c04f5ac3 | 11392 | |
33b62fba | 11393 | #: builtin/branch.c:597 |
5c57d762 JX |
11394 | #, c-format |
11395 | msgid "" | |
11396 | "Please edit the description for the branch\n" | |
11397 | " %s\n" | |
11398 | "Lines starting with '%c' will be stripped.\n" | |
11399 | msgstr "" | |
11400 | "请编辑分支的描述\n" | |
11401 | " %s\n" | |
11402 | "以 '%c' 开头的行将被过滤。\n" | |
c04f5ac3 | 11403 | |
33b62fba | 11404 | #: builtin/branch.c:631 |
ef317cd5 | 11405 | msgid "Generic options" |
07432cef | 11406 | msgstr "通用选项" |
c04f5ac3 | 11407 | |
33b62fba | 11408 | #: builtin/branch.c:633 |
ef317cd5 | 11409 | msgid "show hash and subject, give twice for upstream branch" |
07432cef | 11410 | msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" |
c04f5ac3 | 11411 | |
33b62fba | 11412 | #: builtin/branch.c:634 |
ef317cd5 | 11413 | msgid "suppress informational messages" |
07432cef | 11414 | msgstr "不显示信息" |
8ada9598 | 11415 | |
33b62fba | 11416 | #: builtin/branch.c:635 |
ef317cd5 | 11417 | msgid "set up tracking mode (see git-pull(1))" |
07432cef | 11418 | msgstr "设置跟踪模式(参见 git-pull(1))" |
c04f5ac3 | 11419 | |
33b62fba | 11420 | #: builtin/branch.c:637 |
6937cb4e JX |
11421 | msgid "do not use" |
11422 | msgstr "不要使用" | |
c04f5ac3 | 11423 | |
33b62fba | 11424 | #: builtin/branch.c:639 builtin/rebase.c:533 |
5b04ee3b JX |
11425 | msgid "upstream" |
11426 | msgstr "上游" | |
11427 | ||
33b62fba | 11428 | #: builtin/branch.c:639 |
5b04ee3b JX |
11429 | msgid "change the upstream info" |
11430 | msgstr "改变上游信息" | |
11431 | ||
33b62fba | 11432 | #: builtin/branch.c:640 |
ddc12c42 | 11433 | msgid "unset the upstream info" |
a0b6b246 JX |
11434 | msgstr "取消上游信息的设置" |
11435 | ||
33b62fba | 11436 | #: builtin/branch.c:641 |
ef317cd5 | 11437 | msgid "use colored output" |
07432cef | 11438 | msgstr "使用彩色输出" |
c04f5ac3 | 11439 | |
33b62fba | 11440 | #: builtin/branch.c:642 |
ef317cd5 | 11441 | msgid "act on remote-tracking branches" |
07432cef | 11442 | msgstr "作用于远程跟踪分支" |
c04f5ac3 | 11443 | |
33b62fba | 11444 | #: builtin/branch.c:644 builtin/branch.c:646 |
ef317cd5 | 11445 | msgid "print only branches that contain the commit" |
07432cef | 11446 | msgstr "只打印包含该提交的分支" |
c04f5ac3 | 11447 | |
33b62fba | 11448 | #: builtin/branch.c:645 builtin/branch.c:647 |
87cb7997 JX |
11449 | msgid "print only branches that don't contain the commit" |
11450 | msgstr "只打印不包含该提交的分支" | |
11451 | ||
33b62fba | 11452 | #: builtin/branch.c:650 |
ef317cd5 | 11453 | msgid "Specific git-branch actions:" |
07432cef | 11454 | msgstr "具体的 git-branch 动作:" |
c04f5ac3 | 11455 | |
33b62fba | 11456 | #: builtin/branch.c:651 |
ef317cd5 | 11457 | msgid "list both remote-tracking and local branches" |
07432cef | 11458 | msgstr "列出远程跟踪及本地分支" |
c04f5ac3 | 11459 | |
33b62fba | 11460 | #: builtin/branch.c:653 |
ef317cd5 | 11461 | msgid "delete fully merged branch" |
07432cef | 11462 | msgstr "删除完全合并的分支" |
c04f5ac3 | 11463 | |
33b62fba | 11464 | #: builtin/branch.c:654 |
ef317cd5 | 11465 | msgid "delete branch (even if not merged)" |
07432cef | 11466 | msgstr "删除分支(即使没有合并)" |
c04f5ac3 | 11467 | |
33b62fba | 11468 | #: builtin/branch.c:655 |
ef317cd5 | 11469 | msgid "move/rename a branch and its reflog" |
07432cef | 11470 | msgstr "移动/重命名一个分支,以及它的引用日志" |
c04f5ac3 | 11471 | |
33b62fba | 11472 | #: builtin/branch.c:656 |
ef317cd5 | 11473 | msgid "move/rename a branch, even if target exists" |
07432cef | 11474 | msgstr "移动/重命名一个分支,即使目标已存在" |
c04f5ac3 | 11475 | |
33b62fba | 11476 | #: builtin/branch.c:657 |
6937cb4e JX |
11477 | msgid "copy a branch and its reflog" |
11478 | msgstr "拷贝一个分支和它的引用日志" | |
11479 | ||
33b62fba | 11480 | #: builtin/branch.c:658 |
6937cb4e JX |
11481 | msgid "copy a branch, even if target exists" |
11482 | msgstr "拷贝一个分支,即使目标已存在" | |
11483 | ||
33b62fba | 11484 | #: builtin/branch.c:659 |
ef317cd5 | 11485 | msgid "list branch names" |
07432cef | 11486 | msgstr "列出分支名" |
c04f5ac3 | 11487 | |
33b62fba | 11488 | #: builtin/branch.c:660 |
d46c5519 JX |
11489 | msgid "show current branch name" |
11490 | msgstr "显示当前分支名" | |
11491 | ||
33b62fba | 11492 | #: builtin/branch.c:661 |
ef317cd5 | 11493 | msgid "create the branch's reflog" |
07432cef | 11494 | msgstr "创建分支的引用日志" |
ef317cd5 | 11495 | |
33b62fba | 11496 | #: builtin/branch.c:663 |
ef317cd5 | 11497 | msgid "edit the description for the branch" |
07432cef | 11498 | msgstr "标记分支的描述" |
ef317cd5 | 11499 | |
33b62fba | 11500 | #: builtin/branch.c:664 |
04cb2f28 JX |
11501 | msgid "force creation, move/rename, deletion" |
11502 | msgstr "强制创建、移动/重命名、删除" | |
ef317cd5 | 11503 | |
33b62fba | 11504 | #: builtin/branch.c:665 |
94550ed3 JX |
11505 | msgid "print only branches that are merged" |
11506 | msgstr "只打印已经合并的分支" | |
ef317cd5 | 11507 | |
33b62fba | 11508 | #: builtin/branch.c:666 |
94550ed3 JX |
11509 | msgid "print only branches that are not merged" |
11510 | msgstr "只打印尚未合并的分支" | |
ef317cd5 | 11511 | |
33b62fba | 11512 | #: builtin/branch.c:667 |
ef317cd5 | 11513 | msgid "list branches in columns" |
07432cef | 11514 | msgstr "以列的方式显示分支" |
ef317cd5 | 11515 | |
33b62fba | 11516 | #: builtin/branch.c:669 builtin/for-each-ref.c:44 builtin/notes.c:415 |
06991777 | 11517 | #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 |
33b62fba | 11518 | #: builtin/tag.c:477 |
94550ed3 JX |
11519 | msgid "object" |
11520 | msgstr "对象" | |
11521 | ||
33b62fba | 11522 | #: builtin/branch.c:670 |
94550ed3 JX |
11523 | msgid "print only branches of the object" |
11524 | msgstr "只打印指向该对象的分支" | |
11525 | ||
33b62fba | 11526 | #: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484 |
1a79b2f1 JX |
11527 | msgid "sorting and filtering are case insensitive" |
11528 | msgstr "排序和过滤属于大小写不敏感" | |
11529 | ||
33b62fba | 11530 | #: builtin/branch.c:672 builtin/for-each-ref.c:40 builtin/tag.c:482 |
a6cd2cc4 | 11531 | #: builtin/verify-tag.c:38 |
87cb7997 JX |
11532 | msgid "format to use for the output" |
11533 | msgstr "输出格式" | |
11534 | ||
33b62fba | 11535 | #: builtin/branch.c:695 builtin/clone.c:794 |
c04f5ac3 | 11536 | msgid "HEAD not found below refs/heads!" |
90e6ef53 | 11537 | msgstr "HEAD 没有位于 /refs/heads 之下!" |
c04f5ac3 | 11538 | |
33b62fba | 11539 | #: builtin/branch.c:719 |
8ada9598 | 11540 | msgid "--column and --verbose are incompatible" |
81809b99 | 11541 | msgstr "--column 和 --verbose 不兼容" |
8ada9598 | 11542 | |
33b62fba | 11543 | #: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799 |
a77c07d9 JX |
11544 | msgid "branch name required" |
11545 | msgstr "必须提供分支名" | |
11546 | ||
33b62fba | 11547 | #: builtin/branch.c:766 |
a77c07d9 JX |
11548 | msgid "Cannot give description to detached HEAD" |
11549 | msgstr "不能向分离头指针提供描述" | |
11550 | ||
33b62fba | 11551 | #: builtin/branch.c:771 |
a77c07d9 JX |
11552 | msgid "cannot edit description of more than one branch" |
11553 | msgstr "不能为一个以上的分支编辑描述" | |
11554 | ||
33b62fba | 11555 | #: builtin/branch.c:778 |
a77c07d9 JX |
11556 | #, c-format |
11557 | msgid "No commit on branch '%s' yet." | |
11558 | msgstr "分支 '%s' 尚无提交。" | |
11559 | ||
33b62fba | 11560 | #: builtin/branch.c:781 |
a77c07d9 JX |
11561 | #, c-format |
11562 | msgid "No branch named '%s'." | |
11563 | msgstr "没有分支 '%s'。" | |
11564 | ||
33b62fba | 11565 | #: builtin/branch.c:796 |
6937cb4e JX |
11566 | msgid "too many branches for a copy operation" |
11567 | msgstr "为拷贝操作提供了太多的分支名" | |
a77c07d9 | 11568 | |
33b62fba | 11569 | #: builtin/branch.c:805 |
6937cb4e JX |
11570 | msgid "too many arguments for a rename operation" |
11571 | msgstr "为重命名操作提供了太多的参数" | |
1003b3a5 | 11572 | |
33b62fba | 11573 | #: builtin/branch.c:810 |
6937cb4e JX |
11574 | msgid "too many arguments to set new upstream" |
11575 | msgstr "为设置新上游提供了太多的参数" | |
11576 | ||
33b62fba | 11577 | #: builtin/branch.c:814 |
1003b3a5 JX |
11578 | #, c-format |
11579 | msgid "" | |
11580 | "could not set upstream of HEAD to %s when it does not point to any branch." | |
11581 | msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" | |
11582 | ||
33b62fba | 11583 | #: builtin/branch.c:817 builtin/branch.c:840 |
1003b3a5 JX |
11584 | #, c-format |
11585 | msgid "no such branch '%s'" | |
11586 | msgstr "没有此分支 '%s'" | |
11587 | ||
33b62fba | 11588 | #: builtin/branch.c:821 |
07432cef | 11589 | #, c-format |
ef317cd5 | 11590 | msgid "branch '%s' does not exist" |
07432cef | 11591 | msgstr "分支 '%s' 不存在" |
ef317cd5 | 11592 | |
33b62fba | 11593 | #: builtin/branch.c:834 |
6937cb4e JX |
11594 | msgid "too many arguments to unset upstream" |
11595 | msgstr "为取消上游设置操作提供了太多的参数" | |
1003b3a5 | 11596 | |
33b62fba | 11597 | #: builtin/branch.c:838 |
1003b3a5 JX |
11598 | msgid "could not unset upstream of HEAD when it does not point to any branch." |
11599 | msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" | |
11600 | ||
33b62fba | 11601 | #: builtin/branch.c:844 |
ef317cd5 JX |
11602 | #, c-format |
11603 | msgid "Branch '%s' has no upstream information" | |
07432cef | 11604 | msgstr "分支 '%s' 没有上游信息" |
ef317cd5 | 11605 | |
33b62fba | 11606 | #: builtin/branch.c:854 |
a6cd2cc4 JX |
11607 | msgid "" |
11608 | "The -a, and -r, options to 'git branch' do not take a branch name.\n" | |
11609 | "Did you mean to use: -a|-r --list <pattern>?" | |
11610 | msgstr "" | |
11611 | "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" | |
11612 | "您是否想要使用:-a|-r --list <模式>?" | |
c04f5ac3 | 11613 | |
33b62fba | 11614 | #: builtin/branch.c:858 |
ddc12c42 JX |
11615 | msgid "" |
11616 | "the '--set-upstream' option is no longer supported. Please use '--track' or " | |
11617 | "'--set-upstream-to' instead." | |
11618 | msgstr "" | |
11619 | "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" | |
11620 | ||
d9488fea JX |
11621 | #: builtin/bugreport.c:15 |
11622 | msgid "git version:\n" | |
11623 | msgstr "git 版本:\n" | |
11624 | ||
11625 | #: builtin/bugreport.c:21 | |
11626 | #, c-format | |
11627 | msgid "uname() failed with error '%s' (%d)\n" | |
11628 | msgstr "uname() 失败,错误为 '%s'(%d)\n" | |
11629 | ||
11630 | #: builtin/bugreport.c:31 | |
11631 | msgid "compiler info: " | |
11632 | msgstr "编译器信息:" | |
11633 | ||
11634 | #: builtin/bugreport.c:34 | |
11635 | msgid "libc info: " | |
11636 | msgstr "libc 信息:" | |
11637 | ||
11638 | #: builtin/bugreport.c:80 | |
11639 | msgid "not run from a git repository - no hooks to show\n" | |
11640 | msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" | |
11641 | ||
11642 | #: builtin/bugreport.c:90 | |
11643 | msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" | |
11644 | msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>]" | |
11645 | ||
11646 | #: builtin/bugreport.c:97 | |
11647 | msgid "" | |
11648 | "Thank you for filling out a Git bug report!\n" | |
11649 | "Please answer the following questions to help us understand your issue.\n" | |
11650 | "\n" | |
11651 | "What did you do before the bug happened? (Steps to reproduce your issue)\n" | |
11652 | "\n" | |
11653 | "What did you expect to happen? (Expected behavior)\n" | |
11654 | "\n" | |
11655 | "What happened instead? (Actual behavior)\n" | |
11656 | "\n" | |
11657 | "What's different between what you expected and what actually happened?\n" | |
11658 | "\n" | |
11659 | "Anything else you want to add:\n" | |
11660 | "\n" | |
11661 | "Please review the rest of the bug report below.\n" | |
11662 | "You can delete any lines you don't wish to share.\n" | |
11663 | msgstr "" | |
11664 | "感谢您填写 Git 错误报告!\n" | |
11665 | "请填写以下问卷,以帮助我们了解您的问题。\n" | |
11666 | "\n" | |
11667 | "在错误发生之前,您做了什么?(重现问题的步骤)\n" | |
11668 | "\n" | |
11669 | "您期望发生什么?(预期行为)\n" | |
11670 | "\n" | |
11671 | "实际发生了什么?(实际行为)\n" | |
11672 | "\n" | |
11673 | "您所期望的与实际发生的有什么不同?\n" | |
11674 | "\n" | |
11675 | "您想要补充的其它内容:\n" | |
11676 | "\n" | |
11677 | "请检查下面错误报告中余下的内容。\n" | |
11678 | "您可以删除任何您不想共享的内容。\n" | |
11679 | ||
33b62fba | 11680 | #: builtin/bugreport.c:136 |
d9488fea JX |
11681 | msgid "specify a destination for the bugreport file" |
11682 | msgstr "指定错误报告文件的目标位置" | |
11683 | ||
33b62fba | 11684 | #: builtin/bugreport.c:138 |
d9488fea JX |
11685 | msgid "specify a strftime format suffix for the filename" |
11686 | msgstr "指定文件的 strftime 格式后缀" | |
11687 | ||
33b62fba | 11688 | #: builtin/bugreport.c:160 |
d9488fea JX |
11689 | #, c-format |
11690 | msgid "could not create leading directories for '%s'" | |
11691 | msgstr "不能为 '%s' 创建先导目录" | |
11692 | ||
33b62fba | 11693 | #: builtin/bugreport.c:167 |
d9488fea JX |
11694 | msgid "System Info" |
11695 | msgstr "系统信息" | |
11696 | ||
33b62fba | 11697 | #: builtin/bugreport.c:170 |
d9488fea JX |
11698 | msgid "Enabled Hooks" |
11699 | msgstr "启用的钩子" | |
11700 | ||
33b62fba | 11701 | #: builtin/bugreport.c:177 |
d9488fea JX |
11702 | #, c-format |
11703 | msgid "couldn't create a new file at '%s'" | |
11704 | msgstr "不能在 '%s' 创建新文件" | |
11705 | ||
33b62fba | 11706 | #: builtin/bugreport.c:180 |
d9488fea JX |
11707 | #, c-format |
11708 | msgid "unable to write to %s" | |
11709 | msgstr "无法写入 %s" | |
11710 | ||
33b62fba | 11711 | #: builtin/bugreport.c:190 |
d9488fea JX |
11712 | #, c-format |
11713 | msgid "Created new report at '%s'.\n" | |
11714 | msgstr "在 '%s' 创建了新报告。\n" | |
11715 | ||
ddc12c42 JX |
11716 | #: builtin/bundle.c:15 builtin/bundle.c:23 |
11717 | msgid "git bundle create [<options>] <file> <git-rev-list args>" | |
11718 | msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" | |
11719 | ||
11720 | #: builtin/bundle.c:16 builtin/bundle.c:28 | |
11721 | msgid "git bundle verify [<options>] <file>" | |
11722 | msgstr "git bundle verify [<选项>] <文件>" | |
11723 | ||
11724 | #: builtin/bundle.c:17 builtin/bundle.c:33 | |
11725 | msgid "git bundle list-heads <file> [<refname>...]" | |
11726 | msgstr "git bundle list-heads <文件> [<引用名>...]" | |
11727 | ||
11728 | #: builtin/bundle.c:18 builtin/bundle.c:38 | |
11729 | msgid "git bundle unbundle <file> [<refname>...]" | |
11730 | msgstr "git bundle unbundle <文件> [<引用名>...]" | |
11731 | ||
ec3d4607 | 11732 | #: builtin/bundle.c:67 builtin/pack-objects.c:3907 |
ddc12c42 JX |
11733 | msgid "do not show progress meter" |
11734 | msgstr "不显示进度表" | |
11735 | ||
ec3d4607 | 11736 | #: builtin/bundle.c:69 builtin/pack-objects.c:3909 |
ddc12c42 JX |
11737 | msgid "show progress meter" |
11738 | msgstr "显示进度表" | |
11739 | ||
ec3d4607 | 11740 | #: builtin/bundle.c:71 builtin/pack-objects.c:3911 |
ddc12c42 JX |
11741 | msgid "show progress meter during object writing phase" |
11742 | msgstr "在对象写入阶段显示进度表" | |
11743 | ||
ec3d4607 | 11744 | #: builtin/bundle.c:74 builtin/pack-objects.c:3914 |
ddc12c42 JX |
11745 | msgid "similar to --all-progress when progress meter is shown" |
11746 | msgstr "当进度表显示时类似于 --all-progress" | |
ef317cd5 | 11747 | |
d9488fea JX |
11748 | #: builtin/bundle.c:76 |
11749 | msgid "specify bundle format version" | |
11750 | msgstr "指定归档包的格式版本" | |
11751 | ||
11752 | #: builtin/bundle.c:96 | |
ddc12c42 | 11753 | msgid "Need a repository to create a bundle." |
d9488fea | 11754 | msgstr "需要一个仓库来创建归档包。" |
ddc12c42 | 11755 | |
ec3d4607 | 11756 | #: builtin/bundle.c:109 |
ddc12c42 | 11757 | msgid "do not show bundle details" |
d9488fea | 11758 | msgstr "不显示归档包的细节" |
ddc12c42 | 11759 | |
ec3d4607 | 11760 | #: builtin/bundle.c:128 |
c04f5ac3 JX |
11761 | #, c-format |
11762 | msgid "%s is okay\n" | |
11763 | msgstr "%s 可以\n" | |
11764 | ||
ec3d4607 | 11765 | #: builtin/bundle.c:179 |
c04f5ac3 | 11766 | msgid "Need a repository to unbundle." |
d9488fea | 11767 | msgstr "需要一个仓库来解开归档包。" |
c04f5ac3 | 11768 | |
ec3d4607 | 11769 | #: builtin/bundle.c:191 builtin/remote.c:1700 |
ddc12c42 JX |
11770 | msgid "be verbose; must be placed before a subcommand" |
11771 | msgstr "冗长输出;必须置于子命令之前" | |
11772 | ||
ec3d4607 | 11773 | #: builtin/bundle.c:213 builtin/remote.c:1731 |
ddc12c42 JX |
11774 | #, c-format |
11775 | msgid "Unknown subcommand: %s" | |
11776 | msgstr "未知子命令:%s" | |
11777 | ||
ec3d4607 | 11778 | #: builtin/cat-file.c:596 |
7aea43ff | 11779 | msgid "" |
a0b6b246 JX |
11780 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" |
11781 | "p | <type> | --textconv | --filters) [--path=<path>] <object>" | |
275588f9 JX |
11782 | msgstr "" |
11783 | "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" | |
11784 | "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" | |
ef317cd5 | 11785 | |
ec3d4607 | 11786 | #: builtin/cat-file.c:597 |
a0b6b246 | 11787 | msgid "" |
7157c2b5 JX |
11788 | "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" |
11789 | "symlinks] [--textconv | --filters]" | |
d9488fea JX |
11790 | msgstr "" |
11791 | "git cat-file (--batch[=<格式>] | --batch-check[=<格式>]) [--follow-symlinks] " | |
11792 | "[--textconv | --filters]" | |
ef317cd5 | 11793 | |
ec3d4607 | 11794 | #: builtin/cat-file.c:618 |
4c27fcb5 JX |
11795 | msgid "only one batch option may be specified" |
11796 | msgstr "只能指定一个批处理选项" | |
11797 | ||
ec3d4607 | 11798 | #: builtin/cat-file.c:636 |
ef317cd5 | 11799 | msgid "<type> can be one of: blob, tree, commit, tag" |
07432cef | 11800 | msgstr "<类型> 可以是其中之一:blob、tree、commit、tag" |
ef317cd5 | 11801 | |
ec3d4607 | 11802 | #: builtin/cat-file.c:637 |
ef317cd5 | 11803 | msgid "show object type" |
07432cef | 11804 | msgstr "显示对象类型" |
ef317cd5 | 11805 | |
ec3d4607 | 11806 | #: builtin/cat-file.c:638 |
ef317cd5 | 11807 | msgid "show object size" |
07432cef | 11808 | msgstr "显示对象大小" |
ef317cd5 | 11809 | |
ec3d4607 | 11810 | #: builtin/cat-file.c:640 |
ef317cd5 | 11811 | msgid "exit with zero when there's no error" |
07432cef | 11812 | msgstr "当没有错误时退出并返回零" |
ef317cd5 | 11813 | |
ec3d4607 | 11814 | #: builtin/cat-file.c:641 |
ef317cd5 | 11815 | msgid "pretty-print object's content" |
07432cef | 11816 | msgstr "美观地打印对象的内容" |
ef317cd5 | 11817 | |
ec3d4607 | 11818 | #: builtin/cat-file.c:643 |
ef317cd5 | 11819 | msgid "for blob objects, run textconv on object's content" |
a0b6b246 JX |
11820 | msgstr "对于数据对象,对其内容做文本转换" |
11821 | ||
ec3d4607 | 11822 | #: builtin/cat-file.c:645 |
a0b6b246 JX |
11823 | msgid "for blob objects, run filters on object's content" |
11824 | msgstr "对于数据对象,对其内容做过滤" | |
11825 | ||
ec3d4607 | 11826 | #: builtin/cat-file.c:646 |
a0b6b246 JX |
11827 | msgid "blob" |
11828 | msgstr "数据对象" | |
11829 | ||
ec3d4607 | 11830 | #: builtin/cat-file.c:647 |
a0b6b246 JX |
11831 | msgid "use a specific path for --textconv/--filters" |
11832 | msgstr "对于 --textconv/--filters 使用一个特定的路径" | |
ef317cd5 | 11833 | |
ec3d4607 | 11834 | #: builtin/cat-file.c:649 |
7aea43ff JX |
11835 | msgid "allow -s and -t to work with broken/corrupt objects" |
11836 | msgstr "允许 -s 和 -t 对损坏的对象生效" | |
11837 | ||
ec3d4607 | 11838 | #: builtin/cat-file.c:650 |
1b7f4a34 JX |
11839 | msgid "buffer --batch output" |
11840 | msgstr "缓冲 --batch 的输出" | |
11841 | ||
ec3d4607 | 11842 | #: builtin/cat-file.c:652 |
ef317cd5 | 11843 | msgid "show info and content of objects fed from the standard input" |
07432cef | 11844 | msgstr "显示从标准输入提供的对象的信息和内容" |
ef317cd5 | 11845 | |
ec3d4607 | 11846 | #: builtin/cat-file.c:656 |
ef317cd5 | 11847 | msgid "show info about objects fed from the standard input" |
07432cef | 11848 | msgstr "显示从标准输入提供的对象的信息" |
ef317cd5 | 11849 | |
ec3d4607 | 11850 | #: builtin/cat-file.c:660 |
7aea43ff JX |
11851 | msgid "follow in-tree symlinks (used with --batch or --batch-check)" |
11852 | msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)" | |
11853 | ||
ec3d4607 | 11854 | #: builtin/cat-file.c:662 |
1b7f4a34 JX |
11855 | msgid "show all objects with --batch or --batch-check" |
11856 | msgstr "使用 --batch 或 --batch-check 参数显示所有对象" | |
11857 | ||
ec3d4607 | 11858 | #: builtin/cat-file.c:664 |
c1ac5258 JX |
11859 | msgid "do not order --batch-all-objects output" |
11860 | msgstr "不要对 --batch-all-objects 的输出排序" | |
11861 | ||
06991777 | 11862 | #: builtin/check-attr.c:13 |
814ff314 JX |
11863 | msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." |
11864 | msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." | |
ef317cd5 | 11865 | |
06991777 | 11866 | #: builtin/check-attr.c:14 |
94550ed3 JX |
11867 | msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" |
11868 | msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" | |
ef317cd5 | 11869 | |
06991777 | 11870 | #: builtin/check-attr.c:21 |
ef317cd5 | 11871 | msgid "report all attributes set on file" |
07432cef | 11872 | msgstr "报告设置在文件上的所有属性" |
ef317cd5 | 11873 | |
06991777 | 11874 | #: builtin/check-attr.c:22 |
ef317cd5 | 11875 | msgid "use .gitattributes only from the index" |
07432cef | 11876 | msgstr "只使用索引中的 .gitattributes" |
ef317cd5 | 11877 | |
06991777 | 11878 | #: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 |
ef317cd5 | 11879 | msgid "read file names from stdin" |
07432cef | 11880 | msgstr "从标准输入读出文件名" |
ef317cd5 | 11881 | |
06991777 | 11882 | #: builtin/check-attr.c:25 builtin/check-ignore.c:27 |
90314792 JX |
11883 | msgid "terminate input and output records by a NUL character" |
11884 | msgstr "输入和输出的记录使用 NUL 字符终结" | |
ef317cd5 | 11885 | |
ec3d4607 JX |
11886 | #: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549 |
11887 | #: builtin/worktree.c:493 | |
a77c07d9 JX |
11888 | msgid "suppress progress reporting" |
11889 | msgstr "不显示进度报告" | |
11890 | ||
06991777 | 11891 | #: builtin/check-ignore.c:29 |
2e8451e8 JX |
11892 | msgid "show non-matching input paths" |
11893 | msgstr "显示未匹配的输入路径" | |
11894 | ||
06991777 | 11895 | #: builtin/check-ignore.c:31 |
90314792 JX |
11896 | msgid "ignore index when checking" |
11897 | msgstr "检查时忽略索引" | |
11898 | ||
33b62fba | 11899 | #: builtin/check-ignore.c:165 |
a77c07d9 | 11900 | msgid "cannot specify pathnames with --stdin" |
1b7f4a34 | 11901 | msgstr "不能同时指定路径及 --stdin 参数" |
a77c07d9 | 11902 | |
33b62fba | 11903 | #: builtin/check-ignore.c:168 |
a77c07d9 JX |
11904 | msgid "-z only makes sense with --stdin" |
11905 | msgstr "-z 需要和 --stdin 参数共用才有意义" | |
11906 | ||
33b62fba | 11907 | #: builtin/check-ignore.c:170 |
a77c07d9 JX |
11908 | msgid "no path specified" |
11909 | msgstr "未指定路径" | |
11910 | ||
33b62fba | 11911 | #: builtin/check-ignore.c:174 |
a77c07d9 JX |
11912 | msgid "--quiet is only valid with a single pathname" |
11913 | msgstr "参数 --quiet 只在提供一个路径名时有效" | |
11914 | ||
33b62fba | 11915 | #: builtin/check-ignore.c:176 |
a77c07d9 JX |
11916 | msgid "cannot have both --quiet and --verbose" |
11917 | msgstr "不能同时提供 --quiet 和 --verbose 参数" | |
11918 | ||
33b62fba | 11919 | #: builtin/check-ignore.c:179 |
2e8451e8 JX |
11920 | msgid "--non-matching is only valid with --verbose" |
11921 | msgstr "--non-matching 选项只在使用 --verbose 时有效" | |
11922 | ||
a4f16749 | 11923 | #: builtin/check-mailmap.c:9 |
814ff314 JX |
11924 | msgid "git check-mailmap [<options>] <contact>..." |
11925 | msgstr "git check-mailmap [<选项>] <联系地址>..." | |
2e8451e8 | 11926 | |
a4f16749 | 11927 | #: builtin/check-mailmap.c:14 |
2e8451e8 JX |
11928 | msgid "also read contacts from stdin" |
11929 | msgstr "还从标准输入读取联系地址" | |
11930 | ||
a4f16749 | 11931 | #: builtin/check-mailmap.c:25 |
2e8451e8 JX |
11932 | #, c-format |
11933 | msgid "unable to parse contact: %s" | |
11934 | msgstr "不能解析联系地址:%s" | |
11935 | ||
a4f16749 | 11936 | #: builtin/check-mailmap.c:48 |
2e8451e8 JX |
11937 | msgid "no contacts specified" |
11938 | msgstr "未指定联系地址" | |
11939 | ||
33b62fba JX |
11940 | #: builtin/checkout--worker.c:110 |
11941 | msgid "git checkout--worker [<options>]" | |
11942 | msgstr "git checkout--worker [<选项>]" | |
11943 | ||
11944 | #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 | |
ec3d4607 JX |
11945 | #: builtin/column.c:31 builtin/submodule--helper.c:1892 |
11946 | #: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903 | |
11947 | #: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896 | |
11948 | #: builtin/submodule--helper.c:2899 builtin/worktree.c:491 | |
11949 | #: builtin/worktree.c:728 | |
33b62fba JX |
11950 | msgid "string" |
11951 | msgstr "字符串" | |
11952 | ||
11953 | #: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 | |
11954 | msgid "when creating files, prepend <string>" | |
11955 | msgstr "在创建文件时,在前面加上 <字符串>" | |
11956 | ||
473eb541 | 11957 | #: builtin/checkout-index.c:152 |
814ff314 JX |
11958 | msgid "git checkout-index [<options>] [--] [<file>...]" |
11959 | msgstr "git checkout-index [<选项>] [--] [<文件>...]" | |
ef317cd5 | 11960 | |
473eb541 | 11961 | #: builtin/checkout-index.c:169 |
276ceeaa JX |
11962 | msgid "stage should be between 1 and 3 or all" |
11963 | msgstr "索引值应该取值 1 到 3 或者 all" | |
11964 | ||
33b62fba | 11965 | #: builtin/checkout-index.c:187 |
ef317cd5 | 11966 | msgid "check out all files in the index" |
07432cef | 11967 | msgstr "检出索引区的所有文件" |
ef317cd5 | 11968 | |
33b62fba | 11969 | #: builtin/checkout-index.c:188 |
ef317cd5 | 11970 | msgid "force overwrite of existing files" |
07432cef | 11971 | msgstr "强制覆盖现有的文件" |
ef317cd5 | 11972 | |
33b62fba | 11973 | #: builtin/checkout-index.c:190 |
ef317cd5 | 11974 | msgid "no warning for existing files and files not in index" |
07432cef | 11975 | msgstr "存在或不在索引中的文件都没有警告" |
ef317cd5 | 11976 | |
33b62fba | 11977 | #: builtin/checkout-index.c:192 |
ef317cd5 | 11978 | msgid "don't checkout new files" |
07432cef | 11979 | msgstr "不检出新文件" |
ef317cd5 | 11980 | |
33b62fba | 11981 | #: builtin/checkout-index.c:194 |
ef317cd5 | 11982 | msgid "update stat information in the index file" |
07432cef | 11983 | msgstr "更新索引中文件的状态信息" |
ef317cd5 | 11984 | |
33b62fba | 11985 | #: builtin/checkout-index.c:198 |
ef317cd5 | 11986 | msgid "read list of paths from the standard input" |
07432cef | 11987 | msgstr "从标准输入读取路径列表" |
ef317cd5 | 11988 | |
33b62fba | 11989 | #: builtin/checkout-index.c:200 |
ef317cd5 | 11990 | msgid "write the content to temporary files" |
07432cef | 11991 | msgstr "将内容写入临时文件" |
ef317cd5 | 11992 | |
33b62fba | 11993 | #: builtin/checkout-index.c:204 |
ef317cd5 | 11994 | msgid "copy out the files from named stage" |
07432cef | 11995 | msgstr "从指定暂存区中拷出文件" |
ef317cd5 | 11996 | |
33b62fba | 11997 | #: builtin/checkout.c:33 |
814ff314 JX |
11998 | msgid "git checkout [<options>] <branch>" |
11999 | msgstr "git checkout [<选项>] <分支>" | |
ef317cd5 | 12000 | |
33b62fba | 12001 | #: builtin/checkout.c:34 |
814ff314 JX |
12002 | msgid "git checkout [<options>] [<branch>] -- <file>..." |
12003 | msgstr "git checkout [<选项>] [<分支>] -- <文件>..." | |
ef317cd5 | 12004 | |
33b62fba | 12005 | #: builtin/checkout.c:39 |
a6cd2cc4 JX |
12006 | msgid "git switch [<options>] [<branch>]" |
12007 | msgstr "git switch [<选项>] [<分支>]" | |
12008 | ||
33b62fba | 12009 | #: builtin/checkout.c:44 |
a6cd2cc4 JX |
12010 | msgid "git restore [<options>] [--source=<branch>] <file>..." |
12011 | msgstr "git restore [<选项>] [--source=<分支>] <文件>..." | |
12012 | ||
33b62fba | 12013 | #: builtin/checkout.c:190 builtin/checkout.c:229 |
c04f5ac3 JX |
12014 | #, c-format |
12015 | msgid "path '%s' does not have our version" | |
12016 | msgstr "路径 '%s' 没有我们的版本" | |
12017 | ||
33b62fba | 12018 | #: builtin/checkout.c:192 builtin/checkout.c:231 |
c04f5ac3 JX |
12019 | #, c-format |
12020 | msgid "path '%s' does not have their version" | |
12021 | msgstr "路径 '%s' 没有他们的版本" | |
12022 | ||
33b62fba | 12023 | #: builtin/checkout.c:208 |
c04f5ac3 JX |
12024 | #, c-format |
12025 | msgid "path '%s' does not have all necessary versions" | |
e640d114 | 12026 | msgstr "路径 '%s' 没有全部必需的版本" |
c04f5ac3 | 12027 | |
33b62fba | 12028 | #: builtin/checkout.c:261 |
c04f5ac3 JX |
12029 | #, c-format |
12030 | msgid "path '%s' does not have necessary versions" | |
e640d114 | 12031 | msgstr "路径 '%s' 没有必需的版本" |
c04f5ac3 | 12032 | |
33b62fba | 12033 | #: builtin/checkout.c:278 |
c04f5ac3 JX |
12034 | #, c-format |
12035 | msgid "path '%s': cannot merge" | |
90e6ef53 | 12036 | msgstr "path '%s':无法合并" |
c04f5ac3 | 12037 | |
33b62fba | 12038 | #: builtin/checkout.c:294 |
c04f5ac3 JX |
12039 | #, c-format |
12040 | msgid "Unable to add merge result for '%s'" | |
12041 | msgstr "无法为 '%s' 添加合并结果" | |
12042 | ||
ec3d4607 | 12043 | #: builtin/checkout.c:411 |
a6cd2cc4 JX |
12044 | #, c-format |
12045 | msgid "Recreated %d merge conflict" | |
12046 | msgid_plural "Recreated %d merge conflicts" | |
12047 | msgstr[0] "重新创建了 %d 个合并冲突" | |
12048 | msgstr[1] "重新创建了 %d 个合并冲突" | |
12049 | ||
ec3d4607 | 12050 | #: builtin/checkout.c:416 |
a6cd2cc4 JX |
12051 | #, c-format |
12052 | msgid "Updated %d path from %s" | |
12053 | msgid_plural "Updated %d paths from %s" | |
12054 | msgstr[0] "从 %2$s 更新了 %1$d 个路径" | |
12055 | msgstr[1] "从 %2$s 更新了 %1$d 个路径" | |
12056 | ||
ec3d4607 | 12057 | #: builtin/checkout.c:423 |
a6cd2cc4 JX |
12058 | #, c-format |
12059 | msgid "Updated %d path from the index" | |
12060 | msgid_plural "Updated %d paths from the index" | |
12061 | msgstr[0] "从索引区更新了 %d 个路径" | |
12062 | msgstr[1] "从索引区更新了 %d 个路径" | |
12063 | ||
ec3d4607 JX |
12064 | #: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 |
12065 | #: builtin/checkout.c:456 | |
07432cef | 12066 | #, c-format |
ef317cd5 | 12067 | msgid "'%s' cannot be used with updating paths" |
07432cef | 12068 | msgstr "'%s' 不能在更新路径时使用" |
ef317cd5 | 12069 | |
ec3d4607 | 12070 | #: builtin/checkout.c:459 builtin/checkout.c:462 |
07432cef | 12071 | #, c-format |
ef317cd5 | 12072 | msgid "'%s' cannot be used with %s" |
07432cef | 12073 | msgstr "'%s' 不能和 %s 同时使用" |
ef317cd5 | 12074 | |
ec3d4607 | 12075 | #: builtin/checkout.c:466 |
ef317cd5 JX |
12076 | #, c-format |
12077 | msgid "Cannot update paths and switch to branch '%s' at the same time." | |
07432cef | 12078 | msgstr "不能同时更新路径并切换到分支'%s'。" |
ef317cd5 | 12079 | |
ec3d4607 | 12080 | #: builtin/checkout.c:470 |
c04f5ac3 | 12081 | #, c-format |
a6cd2cc4 JX |
12082 | msgid "neither '%s' or '%s' is specified" |
12083 | msgstr "'%s' 或 '%s' 都没有指定" | |
c04f5ac3 | 12084 | |
ec3d4607 | 12085 | #: builtin/checkout.c:474 |
06991777 | 12086 | #, c-format |
a6cd2cc4 JX |
12087 | msgid "'%s' must be used when '%s' is not specified" |
12088 | msgstr "未指定 '%2$s' 时,必须使用 '%1$s'" | |
06991777 | 12089 | |
ec3d4607 | 12090 | #: builtin/checkout.c:479 builtin/checkout.c:484 |
06991777 | 12091 | #, c-format |
a6cd2cc4 JX |
12092 | msgid "'%s' or '%s' cannot be used with %s" |
12093 | msgstr "'%s' 或 '%s' 不能和 %s 一起使用" | |
06991777 | 12094 | |
ec3d4607 | 12095 | #: builtin/checkout.c:558 builtin/checkout.c:565 |
06991777 | 12096 | #, c-format |
a6cd2cc4 JX |
12097 | msgid "path '%s' is unmerged" |
12098 | msgstr "路径 '%s' 未合并" | |
06991777 | 12099 | |
ec3d4607 | 12100 | #: builtin/checkout.c:734 |
c04f5ac3 | 12101 | msgid "you need to resolve your current index first" |
90e6ef53 | 12102 | msgstr "您需要先解决当前索引的冲突" |
c04f5ac3 | 12103 | |
ec3d4607 | 12104 | #: builtin/checkout.c:788 |
d46c5519 JX |
12105 | #, c-format |
12106 | msgid "" | |
12107 | "cannot continue with staged changes in the following files:\n" | |
12108 | "%s" | |
12109 | msgstr "" | |
12110 | "不能继续,下列文件有暂存的修改:\n" | |
12111 | "%s" | |
12112 | ||
ec3d4607 | 12113 | #: builtin/checkout.c:881 |
c04f5ac3 | 12114 | #, c-format |
1b7f4a34 JX |
12115 | msgid "Can not do reflog for '%s': %s\n" |
12116 | msgstr "不能对 '%s' 执行 reflog 操作:%s\n" | |
c04f5ac3 | 12117 | |
ec3d4607 | 12118 | #: builtin/checkout.c:923 |
c04f5ac3 JX |
12119 | msgid "HEAD is now at" |
12120 | msgstr "HEAD 目前位于" | |
12121 | ||
ec3d4607 | 12122 | #: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203 |
3495628d JX |
12123 | msgid "unable to update HEAD" |
12124 | msgstr "不能更新 HEAD" | |
12125 | ||
ec3d4607 | 12126 | #: builtin/checkout.c:931 |
c04f5ac3 JX |
12127 | #, c-format |
12128 | msgid "Reset branch '%s'\n" | |
12129 | msgstr "重置分支 '%s'\n" | |
12130 | ||
ec3d4607 | 12131 | #: builtin/checkout.c:934 |
c04f5ac3 JX |
12132 | #, c-format |
12133 | msgid "Already on '%s'\n" | |
12134 | msgstr "已经位于 '%s'\n" | |
12135 | ||
ec3d4607 | 12136 | #: builtin/checkout.c:938 |
c04f5ac3 JX |
12137 | #, c-format |
12138 | msgid "Switched to and reset branch '%s'\n" | |
12139 | msgstr "切换并重置分支 '%s'\n" | |
12140 | ||
ec3d4607 | 12141 | #: builtin/checkout.c:940 builtin/checkout.c:1371 |
c04f5ac3 JX |
12142 | #, c-format |
12143 | msgid "Switched to a new branch '%s'\n" | |
12144 | msgstr "切换到一个新分支 '%s'\n" | |
12145 | ||
ec3d4607 | 12146 | #: builtin/checkout.c:942 |
c04f5ac3 JX |
12147 | #, c-format |
12148 | msgid "Switched to branch '%s'\n" | |
12149 | msgstr "切换到分支 '%s'\n" | |
12150 | ||
90e6ef53 | 12151 | # 译者:注意保持前导空格 |
ec3d4607 | 12152 | #: builtin/checkout.c:993 |
c04f5ac3 JX |
12153 | #, c-format |
12154 | msgid " ... and %d more.\n" | |
90e6ef53 | 12155 | msgstr " ... 及其它 %d 个。\n" |
c04f5ac3 | 12156 | |
ec3d4607 | 12157 | #: builtin/checkout.c:999 |
c04f5ac3 JX |
12158 | #, c-format |
12159 | msgid "" | |
12160 | "Warning: you are leaving %d commit behind, not connected to\n" | |
12161 | "any of your branches:\n" | |
12162 | "\n" | |
12163 | "%s\n" | |
12164 | msgid_plural "" | |
12165 | "Warning: you are leaving %d commits behind, not connected to\n" | |
12166 | "any of your branches:\n" | |
12167 | "\n" | |
12168 | "%s\n" | |
12169 | msgstr[0] "" | |
12170 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
12171 | "\n" | |
12172 | "%s\n" | |
5ae481e0 JX |
12173 | msgstr[1] "" |
12174 | "警告:您正丢下 %d 个提交,未和任何分支关联:\n" | |
12175 | "\n" | |
12176 | "%s\n" | |
c04f5ac3 | 12177 | |
ec3d4607 | 12178 | #: builtin/checkout.c:1018 |
c04f5ac3 JX |
12179 | #, c-format |
12180 | msgid "" | |
7aea43ff JX |
12181 | "If you want to keep it by creating a new branch, this may be a good time\n" |
12182 | "to do so with:\n" | |
12183 | "\n" | |
12184 | " git branch <new-branch-name> %s\n" | |
12185 | "\n" | |
12186 | msgid_plural "" | |
c04f5ac3 JX |
12187 | "If you want to keep them by creating a new branch, this may be a good time\n" |
12188 | "to do so with:\n" | |
12189 | "\n" | |
814ff314 | 12190 | " git branch <new-branch-name> %s\n" |
c04f5ac3 | 12191 | "\n" |
7aea43ff JX |
12192 | msgstr[0] "" |
12193 | "如果您想要通过创建新分支保存它,这可能是一个好时候。\n" | |
12194 | "如下操作:\n" | |
12195 | "\n" | |
12196 | " git branch <新分支名> %s\n" | |
12197 | "\n" | |
12198 | msgstr[1] "" | |
12199 | "如果您想要通过创建新分支保存它们,这可能是一个好时候。\n" | |
c04f5ac3 JX |
12200 | "如下操作:\n" |
12201 | "\n" | |
814ff314 | 12202 | " git branch <新分支名> %s\n" |
c04f5ac3 JX |
12203 | "\n" |
12204 | ||
ec3d4607 | 12205 | #: builtin/checkout.c:1053 |
c04f5ac3 JX |
12206 | msgid "internal error in revision walk" |
12207 | msgstr "在版本遍历时遇到内部错误" | |
12208 | ||
ec3d4607 | 12209 | #: builtin/checkout.c:1057 |
c04f5ac3 JX |
12210 | msgid "Previous HEAD position was" |
12211 | msgstr "之前的 HEAD 位置是" | |
12212 | ||
ec3d4607 | 12213 | #: builtin/checkout.c:1097 builtin/checkout.c:1366 |
c04f5ac3 | 12214 | msgid "You are on a branch yet to be born" |
90e6ef53 | 12215 | msgstr "您位于一个尚未初始化的分支" |
c04f5ac3 | 12216 | |
ec3d4607 | 12217 | #: builtin/checkout.c:1179 |
06991777 JX |
12218 | #, c-format |
12219 | msgid "" | |
12220 | "'%s' could be both a local file and a tracking branch.\n" | |
12221 | "Please use -- (and optionally --no-guess) to disambiguate" | |
12222 | msgstr "" | |
12223 | "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n" | |
12224 | "请使用 --(和可选的 --no-guess)来消除歧义" | |
12225 | ||
ec3d4607 | 12226 | #: builtin/checkout.c:1186 |
2b472aae JX |
12227 | msgid "" |
12228 | "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" | |
12229 | "you can do so by fully qualifying the name with the --track option:\n" | |
12230 | "\n" | |
12231 | " git checkout --track origin/<name>\n" | |
12232 | "\n" | |
12233 | "If you'd like to always have checkouts of an ambiguous <name> prefer\n" | |
12234 | "one remote, e.g. the 'origin' remote, consider setting\n" | |
12235 | "checkout.defaultRemote=origin in your config." | |
12236 | msgstr "" | |
12237 | "如果您想要检出一个远程跟踪分支,例如在 'origin' 上的,您可以使用分支\n" | |
12238 | "全名和 --track 选项:\n" | |
12239 | "\n" | |
440e7442 | 12240 | " git checkout --track origin/<名称>\n" |
2b472aae | 12241 | "\n" |
440e7442 | 12242 | "如果您总是喜欢使用模糊的简短分支名 <名称>,而不喜欢如 'origin' 的远程\n" |
2b472aae JX |
12243 | "名称,可以在配置中设置 checkout.defaultRemote=origin。" |
12244 | ||
ec3d4607 | 12245 | #: builtin/checkout.c:1196 |
2b472aae JX |
12246 | #, c-format |
12247 | msgid "'%s' matched multiple (%d) remote tracking branches" | |
440e7442 | 12248 | msgstr "'%s' 匹配多个(%d 个)远程跟踪分支" |
2b472aae | 12249 | |
ec3d4607 | 12250 | #: builtin/checkout.c:1262 |
2b472aae | 12251 | msgid "only one reference expected" |
440e7442 | 12252 | msgstr "只期望一个引用" |
2b472aae | 12253 | |
ec3d4607 | 12254 | #: builtin/checkout.c:1279 |
2b472aae JX |
12255 | #, c-format |
12256 | msgid "only one reference expected, %d given." | |
12257 | msgstr "应只有一个引用,却给出了 %d 个" | |
12258 | ||
ec3d4607 | 12259 | #: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436 |
c04f5ac3 JX |
12260 | #, c-format |
12261 | msgid "invalid reference: %s" | |
12262 | msgstr "无效引用:%s" | |
12263 | ||
ec3d4607 | 12264 | #: builtin/checkout.c:1338 builtin/checkout.c:1707 |
c04f5ac3 JX |
12265 | #, c-format |
12266 | msgid "reference is not a tree: %s" | |
12267 | msgstr "引用不是一个树:%s" | |
12268 | ||
ec3d4607 | 12269 | #: builtin/checkout.c:1385 |
a6cd2cc4 JX |
12270 | #, c-format |
12271 | msgid "a branch is expected, got tag '%s'" | |
12272 | msgstr "期望一个分支,得到标签 '%s'" | |
12273 | ||
ec3d4607 | 12274 | #: builtin/checkout.c:1387 |
a6cd2cc4 JX |
12275 | #, c-format |
12276 | msgid "a branch is expected, got remote branch '%s'" | |
12277 | msgstr "期望一个分支,得到远程分支 '%s'" | |
12278 | ||
ec3d4607 | 12279 | #: builtin/checkout.c:1388 builtin/checkout.c:1396 |
a6cd2cc4 JX |
12280 | #, c-format |
12281 | msgid "a branch is expected, got '%s'" | |
12282 | msgstr "期望一个分支,得到 '%s'" | |
12283 | ||
ec3d4607 | 12284 | #: builtin/checkout.c:1391 |
a6cd2cc4 JX |
12285 | #, c-format |
12286 | msgid "a branch is expected, got commit '%s'" | |
12287 | msgstr "期望一个分支,得到提交 '%s'" | |
12288 | ||
ec3d4607 | 12289 | #: builtin/checkout.c:1407 |
a6cd2cc4 JX |
12290 | msgid "" |
12291 | "cannot switch branch while merging\n" | |
12292 | "Consider \"git merge --quit\" or \"git worktree add\"." | |
12293 | msgstr "" | |
12294 | "不能在合并时切换分支\n" | |
12295 | "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" | |
12296 | ||
ec3d4607 | 12297 | #: builtin/checkout.c:1411 |
a6cd2cc4 JX |
12298 | msgid "" |
12299 | "cannot switch branch in the middle of an am session\n" | |
12300 | "Consider \"git am --quit\" or \"git worktree add\"." | |
12301 | msgstr "" | |
12302 | "不能在一个 am 会话期间切换分支\n" | |
12303 | "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" | |
12304 | ||
ec3d4607 | 12305 | #: builtin/checkout.c:1415 |
a6cd2cc4 JX |
12306 | msgid "" |
12307 | "cannot switch branch while rebasing\n" | |
12308 | "Consider \"git rebase --quit\" or \"git worktree add\"." | |
12309 | msgstr "" | |
12310 | "不能在变基时切换分支\n" | |
12311 | "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" | |
12312 | ||
ec3d4607 | 12313 | #: builtin/checkout.c:1419 |
a6cd2cc4 JX |
12314 | msgid "" |
12315 | "cannot switch branch while cherry-picking\n" | |
12316 | "Consider \"git cherry-pick --quit\" or \"git worktree add\"." | |
12317 | msgstr "" | |
12318 | "不能在拣选时切换分支\n" | |
12319 | "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" | |
12320 | ||
ec3d4607 | 12321 | #: builtin/checkout.c:1423 |
a6cd2cc4 JX |
12322 | msgid "" |
12323 | "cannot switch branch while reverting\n" | |
12324 | "Consider \"git revert --quit\" or \"git worktree add\"." | |
12325 | msgstr "" | |
12326 | "不能在还原时切换分支\n" | |
12327 | "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" | |
12328 | ||
ec3d4607 | 12329 | #: builtin/checkout.c:1427 |
a6cd2cc4 JX |
12330 | msgid "you are switching branch while bisecting" |
12331 | msgstr "您在执行二分查找时切换分支" | |
12332 | ||
ec3d4607 | 12333 | #: builtin/checkout.c:1434 |
ef317cd5 | 12334 | msgid "paths cannot be used with switching branches" |
07432cef | 12335 | msgstr "路径不能和切换分支同时使用" |
c04f5ac3 | 12336 | |
ec3d4607 | 12337 | #: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445 |
07432cef | 12338 | #, c-format |
ef317cd5 | 12339 | msgid "'%s' cannot be used with switching branches" |
07432cef | 12340 | msgstr "'%s' 不能和切换分支同时使用" |
c04f5ac3 | 12341 | |
ec3d4607 JX |
12342 | #: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455 |
12343 | #: builtin/checkout.c:1460 builtin/checkout.c:1465 | |
07432cef | 12344 | #, c-format |
ef317cd5 | 12345 | msgid "'%s' cannot be used with '%s'" |
07432cef | 12346 | msgstr "'%s' 不能和 '%s' 同时使用" |
c04f5ac3 | 12347 | |
ec3d4607 | 12348 | #: builtin/checkout.c:1462 |
a6cd2cc4 JX |
12349 | #, c-format |
12350 | msgid "'%s' cannot take <start-point>" | |
12351 | msgstr "'%s' 不带 <起始点>" | |
12352 | ||
ec3d4607 | 12353 | #: builtin/checkout.c:1470 |
07432cef | 12354 | #, c-format |
ef317cd5 | 12355 | msgid "Cannot switch branch to a non-commit '%s'" |
07432cef | 12356 | msgstr "不能切换分支到一个非提交 '%s'" |
c04f5ac3 | 12357 | |
ec3d4607 | 12358 | #: builtin/checkout.c:1477 |
a6cd2cc4 JX |
12359 | msgid "missing branch or commit argument" |
12360 | msgstr "缺少分支或提交参数" | |
c04f5ac3 | 12361 | |
ec3d4607 | 12362 | #: builtin/checkout.c:1520 |
a6cd2cc4 JX |
12363 | msgid "perform a 3-way merge with the new branch" |
12364 | msgstr "和新的分支执行三方合并" | |
c04f5ac3 | 12365 | |
ec3d4607 | 12366 | #: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323 |
a6cd2cc4 JX |
12367 | msgid "style" |
12368 | msgstr "风格" | |
ef317cd5 | 12369 | |
ec3d4607 | 12370 | #: builtin/checkout.c:1522 |
a6cd2cc4 JX |
12371 | msgid "conflict style (merge or diff3)" |
12372 | msgstr "冲突输出风格(merge 或 diff3)" | |
12373 | ||
ec3d4607 | 12374 | #: builtin/checkout.c:1534 builtin/worktree.c:488 |
5c57d762 JX |
12375 | msgid "detach HEAD at named commit" |
12376 | msgstr "HEAD 从指定的提交分离" | |
ef317cd5 | 12377 | |
ec3d4607 | 12378 | #: builtin/checkout.c:1535 |
ef317cd5 | 12379 | msgid "set upstream info for new branch" |
07432cef | 12380 | msgstr "为新的分支设置上游信息" |
ef317cd5 | 12381 | |
ec3d4607 | 12382 | #: builtin/checkout.c:1537 |
a6cd2cc4 JX |
12383 | msgid "force checkout (throw away local modifications)" |
12384 | msgstr "强制检出(丢弃本地修改)" | |
12385 | ||
ec3d4607 | 12386 | #: builtin/checkout.c:1539 |
6c94aba5 | 12387 | msgid "new-branch" |
07432cef | 12388 | msgstr "新分支" |
ef317cd5 | 12389 | |
ec3d4607 | 12390 | #: builtin/checkout.c:1539 |
ef317cd5 | 12391 | msgid "new unparented branch" |
07432cef | 12392 | msgstr "新的没有父提交的分支" |
ef317cd5 | 12393 | |
ec3d4607 | 12394 | #: builtin/checkout.c:1541 builtin/merge.c:301 |
a6cd2cc4 JX |
12395 | msgid "update ignored files (default)" |
12396 | msgstr "更新忽略的文件(默认)" | |
12397 | ||
ec3d4607 | 12398 | #: builtin/checkout.c:1544 |
a6cd2cc4 JX |
12399 | msgid "do not check if another worktree is holding the given ref" |
12400 | msgstr "不检查指定的引用是否被其他工作区所占用" | |
12401 | ||
ec3d4607 | 12402 | #: builtin/checkout.c:1557 |
ef317cd5 | 12403 | msgid "checkout our version for unmerged files" |
07432cef | 12404 | msgstr "对尚未合并的文件检出我们的版本" |
c04f5ac3 | 12405 | |
ec3d4607 | 12406 | #: builtin/checkout.c:1560 |
ef317cd5 | 12407 | msgid "checkout their version for unmerged files" |
07432cef | 12408 | msgstr "对尚未合并的文件检出他们的版本" |
ef317cd5 | 12409 | |
ec3d4607 | 12410 | #: builtin/checkout.c:1564 |
4dcdc3d8 JX |
12411 | msgid "do not limit pathspecs to sparse entries only" |
12412 | msgstr "对路径不做稀疏检出的限制" | |
12413 | ||
ec3d4607 | 12414 | #: builtin/checkout.c:1622 |
349ede6a JX |
12415 | #, c-format |
12416 | msgid "-%c, -%c and --orphan are mutually exclusive" | |
12417 | msgstr "-%c、-%c 和 --orphan 是互斥的" | |
ef317cd5 | 12418 | |
ec3d4607 | 12419 | #: builtin/checkout.c:1626 |
d46c5519 JX |
12420 | msgid "-p and --overlay are mutually exclusive" |
12421 | msgstr "-p 和 --overlay 互斥" | |
12422 | ||
ec3d4607 | 12423 | #: builtin/checkout.c:1663 |
ef317cd5 JX |
12424 | msgid "--track needs a branch name" |
12425 | msgstr "--track 需要一个分支名" | |
12426 | ||
ec3d4607 | 12427 | #: builtin/checkout.c:1668 |
349ede6a JX |
12428 | #, c-format |
12429 | msgid "missing branch name; try -%c" | |
12430 | msgstr "缺少分支名,尝试 -%c" | |
ef317cd5 | 12431 | |
ec3d4607 | 12432 | #: builtin/checkout.c:1700 |
a6cd2cc4 JX |
12433 | #, c-format |
12434 | msgid "could not resolve %s" | |
12435 | msgstr "无法解析 %s" | |
12436 | ||
ec3d4607 | 12437 | #: builtin/checkout.c:1716 |
c04f5ac3 | 12438 | msgid "invalid path specification" |
90e6ef53 | 12439 | msgstr "无效的路径规格" |
c04f5ac3 | 12440 | |
ec3d4607 | 12441 | #: builtin/checkout.c:1723 |
07432cef | 12442 | #, c-format |
a4f16749 JX |
12443 | msgid "'%s' is not a commit and a branch '%s' cannot be created from it" |
12444 | msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" | |
c04f5ac3 | 12445 | |
ec3d4607 | 12446 | #: builtin/checkout.c:1727 |
07432cef | 12447 | #, c-format |
ef317cd5 | 12448 | msgid "git checkout: --detach does not take a path argument '%s'" |
07432cef | 12449 | msgstr "git checkout:--detach 不能接收路径参数 '%s'" |
c04f5ac3 | 12450 | |
ec3d4607 | 12451 | #: builtin/checkout.c:1736 |
ddc12c42 JX |
12452 | msgid "--pathspec-from-file is incompatible with --detach" |
12453 | msgstr "--pathspec-from-file 与 --detach 不兼容" | |
12454 | ||
ec3d4607 | 12455 | #: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630 |
ddc12c42 JX |
12456 | msgid "--pathspec-from-file is incompatible with --patch" |
12457 | msgstr "--pathspec-from-file 与 --patch 不兼容" | |
12458 | ||
ec3d4607 | 12459 | #: builtin/checkout.c:1752 |
c04f5ac3 JX |
12460 | msgid "" |
12461 | "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" | |
12462 | "checking out of the index." | |
12463 | msgstr "" | |
90e6ef53 | 12464 | "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" |
c04f5ac3 | 12465 | |
ec3d4607 | 12466 | #: builtin/checkout.c:1757 |
ddc12c42 JX |
12467 | msgid "you must specify path(s) to restore" |
12468 | msgstr "您必须指定一个要恢复的路径" | |
12469 | ||
ec3d4607 JX |
12470 | #: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834 |
12471 | #: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170 | |
12472 | #: builtin/remote.c:172 builtin/submodule--helper.c:2736 | |
12473 | #: builtin/submodule--helper.c:2887 builtin/worktree.c:484 | |
33b62fba | 12474 | #: builtin/worktree.c:486 |
a6cd2cc4 JX |
12475 | msgid "branch" |
12476 | msgstr "分支" | |
12477 | ||
ec3d4607 | 12478 | #: builtin/checkout.c:1784 |
a6cd2cc4 JX |
12479 | msgid "create and checkout a new branch" |
12480 | msgstr "创建并检出一个新的分支" | |
12481 | ||
ec3d4607 | 12482 | #: builtin/checkout.c:1786 |
a6cd2cc4 JX |
12483 | msgid "create/reset and checkout a branch" |
12484 | msgstr "创建/重置并检出一个分支" | |
12485 | ||
ec3d4607 | 12486 | #: builtin/checkout.c:1787 |
a6cd2cc4 JX |
12487 | msgid "create reflog for new branch" |
12488 | msgstr "为新的分支创建引用日志" | |
12489 | ||
ec3d4607 | 12490 | #: builtin/checkout.c:1789 |
a6cd2cc4 JX |
12491 | msgid "second guess 'git checkout <no-such-branch>' (default)" |
12492 | msgstr "二次猜测 'git checkout <无此分支>'(默认)" | |
12493 | ||
ec3d4607 | 12494 | #: builtin/checkout.c:1790 |
a6cd2cc4 JX |
12495 | msgid "use overlay mode (default)" |
12496 | msgstr "使用叠加模式(默认)" | |
12497 | ||
ec3d4607 | 12498 | #: builtin/checkout.c:1835 |
a6cd2cc4 JX |
12499 | msgid "create and switch to a new branch" |
12500 | msgstr "创建并切换一个新分支" | |
12501 | ||
ec3d4607 | 12502 | #: builtin/checkout.c:1837 |
a6cd2cc4 JX |
12503 | msgid "create/reset and switch to a branch" |
12504 | msgstr "创建/重置并切换一个分支" | |
12505 | ||
ec3d4607 | 12506 | #: builtin/checkout.c:1839 |
a6cd2cc4 JX |
12507 | msgid "second guess 'git switch <no-such-branch>'" |
12508 | msgstr "二次猜测 'git switch <无此分支>'" | |
12509 | ||
ec3d4607 | 12510 | #: builtin/checkout.c:1841 |
a6cd2cc4 JX |
12511 | msgid "throw away local modifications" |
12512 | msgstr "丢弃本地修改" | |
12513 | ||
ec3d4607 | 12514 | #: builtin/checkout.c:1875 |
a6cd2cc4 JX |
12515 | msgid "which tree-ish to checkout from" |
12516 | msgstr "要检出哪一个树" | |
12517 | ||
ec3d4607 | 12518 | #: builtin/checkout.c:1877 |
a6cd2cc4 JX |
12519 | msgid "restore the index" |
12520 | msgstr "恢复索引" | |
12521 | ||
ec3d4607 | 12522 | #: builtin/checkout.c:1879 |
a6cd2cc4 JX |
12523 | msgid "restore the working tree (default)" |
12524 | msgstr "恢复工作区(默认)" | |
12525 | ||
ec3d4607 | 12526 | #: builtin/checkout.c:1881 |
a6cd2cc4 JX |
12527 | msgid "ignore unmerged entries" |
12528 | msgstr "忽略未合并条目" | |
12529 | ||
ec3d4607 | 12530 | #: builtin/checkout.c:1882 |
a6cd2cc4 JX |
12531 | msgid "use overlay mode" |
12532 | msgstr "使用叠加模式" | |
12533 | ||
349ede6a | 12534 | #: builtin/clean.c:29 |
2e8451e8 JX |
12535 | msgid "" |
12536 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." | |
12537 | msgstr "" | |
12538 | "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." | |
c04f5ac3 | 12539 | |
349ede6a | 12540 | #: builtin/clean.c:33 |
07432cef WS |
12541 | #, c-format |
12542 | msgid "Removing %s\n" | |
12543 | msgstr "正删除 %s\n" | |
12544 | ||
349ede6a | 12545 | #: builtin/clean.c:34 |
07432cef WS |
12546 | #, c-format |
12547 | msgid "Would remove %s\n" | |
12548 | msgstr "将删除 %s\n" | |
12549 | ||
349ede6a | 12550 | #: builtin/clean.c:35 |
07432cef WS |
12551 | #, c-format |
12552 | msgid "Skipping repository %s\n" | |
160fb2b2 | 12553 | msgstr "忽略仓库 %s\n" |
07432cef | 12554 | |
349ede6a | 12555 | #: builtin/clean.c:36 |
07432cef WS |
12556 | #, c-format |
12557 | msgid "Would skip repository %s\n" | |
160fb2b2 | 12558 | msgstr "将忽略仓库 %s\n" |
07432cef | 12559 | |
349ede6a | 12560 | #: builtin/clean.c:38 |
a6cd2cc4 JX |
12561 | #, c-format |
12562 | msgid "could not lstat %s\n" | |
12563 | msgstr "不能对 %s 调用 lstat\n" | |
12564 | ||
ec3d4607 | 12565 | #: builtin/clean.c:300 git-add--interactive.perl:593 |
1a79b2f1 | 12566 | #, c-format |
2e8451e8 JX |
12567 | msgid "" |
12568 | "Prompt help:\n" | |
12569 | "1 - select a numbered item\n" | |
12570 | "foo - select item based on unique prefix\n" | |
1a79b2f1 | 12571 | " - (empty) select nothing\n" |
2e8451e8 JX |
12572 | msgstr "" |
12573 | "帮助:\n" | |
12574 | "1 - 通过编号选择一个选项\n" | |
1a79b2f1 JX |
12575 | "foo - 通过唯一前缀选择一个选项\n" |
12576 | " - (空)什么也不选择\n" | |
2e8451e8 | 12577 | |
ec3d4607 | 12578 | #: builtin/clean.c:304 git-add--interactive.perl:602 |
1a79b2f1 | 12579 | #, c-format |
2e8451e8 JX |
12580 | msgid "" |
12581 | "Prompt help:\n" | |
12582 | "1 - select a single item\n" | |
12583 | "3-5 - select a range of items\n" | |
12584 | "2-3,6-9 - select multiple ranges\n" | |
12585 | "foo - select item based on unique prefix\n" | |
12586 | "-... - unselect specified items\n" | |
12587 | "* - choose all items\n" | |
1a79b2f1 | 12588 | " - (empty) finish selecting\n" |
2e8451e8 JX |
12589 | msgstr "" |
12590 | "帮助:\n" | |
12591 | "1 - 选择一个选项\n" | |
12592 | "3-5 - 选择一个范围内的所有选项\n" | |
12593 | "2-3,6-9 - 选择多个范围内的所有选项\n" | |
1a79b2f1 | 12594 | "foo - 通过唯一前缀选择一个选项\n" |
2e8451e8 JX |
12595 | "-... - 反选特定的选项\n" |
12596 | "* - 选择所有选项\n" | |
1a79b2f1 | 12597 | " - (空)结束选择\n" |
2e8451e8 | 12598 | |
ec3d4607 | 12599 | #: builtin/clean.c:519 git-add--interactive.perl:568 |
d13389bf | 12600 | #: git-add--interactive.perl:573 |
1a79b2f1 JX |
12601 | #, c-format, perl-format |
12602 | msgid "Huh (%s)?\n" | |
12603 | msgstr "嗯(%s)?\n" | |
2e8451e8 | 12604 | |
ec3d4607 | 12605 | #: builtin/clean.c:659 |
2e8451e8 JX |
12606 | #, c-format |
12607 | msgid "Input ignore patterns>> " | |
12608 | msgstr "输入模版以排除条目>> " | |
12609 | ||
ec3d4607 | 12610 | #: builtin/clean.c:693 |
2e8451e8 JX |
12611 | #, c-format |
12612 | msgid "WARNING: Cannot find items matched by: %s" | |
12613 | msgstr "警告:无法找到和 %s 匹配的条目" | |
12614 | ||
ec3d4607 | 12615 | #: builtin/clean.c:714 |
2e8451e8 JX |
12616 | msgid "Select items to delete" |
12617 | msgstr "选择要删除的条目" | |
12618 | ||
814ff314 | 12619 | #. TRANSLATORS: Make sure to keep [y/N] as is |
ec3d4607 | 12620 | #: builtin/clean.c:755 |
2e8451e8 | 12621 | #, c-format |
814ff314 JX |
12622 | msgid "Remove %s [y/N]? " |
12623 | msgstr "删除 %s [y/N]?" | |
2e8451e8 | 12624 | |
ec3d4607 | 12625 | #: builtin/clean.c:786 |
2e8451e8 JX |
12626 | msgid "" |
12627 | "clean - start cleaning\n" | |
12628 | "filter by pattern - exclude items from deletion\n" | |
12629 | "select by numbers - select items to be deleted by numbers\n" | |
12630 | "ask each - confirm each deletion (like \"rm -i\")\n" | |
12631 | "quit - stop cleaning\n" | |
12632 | "help - this screen\n" | |
12633 | "? - help for prompt selection" | |
12634 | msgstr "" | |
12635 | "clean - 开始清理\n" | |
12636 | "filter by pattern - 通过模版排除要删除的条目\n" | |
12637 | "select by numbers - 通过数字选择要删除的条目\n" | |
12638 | "ask each - 针对删除逐一询问(就像 \"rm -i\")\n" | |
12639 | "quit - 停止删除并退出\n" | |
12640 | "help - 显示本帮助\n" | |
12641 | "? - 显示如何在提示符下选择的帮助" | |
12642 | ||
ec3d4607 | 12643 | #: builtin/clean.c:822 |
2e8451e8 JX |
12644 | msgid "Would remove the following item:" |
12645 | msgid_plural "Would remove the following items:" | |
12646 | msgstr[0] "将删除如下条目:" | |
12647 | msgstr[1] "将删除如下条目:" | |
12648 | ||
ec3d4607 | 12649 | #: builtin/clean.c:838 |
2e8451e8 JX |
12650 | msgid "No more files to clean, exiting." |
12651 | msgstr "没有要清理的文件,退出。" | |
12652 | ||
ec3d4607 | 12653 | #: builtin/clean.c:900 |
ef317cd5 | 12654 | msgid "do not print names of files removed" |
07432cef | 12655 | msgstr "不打印删除文件的名称" |
ef317cd5 | 12656 | |
ec3d4607 | 12657 | #: builtin/clean.c:902 |
ef317cd5 | 12658 | msgid "force" |
07432cef | 12659 | msgstr "强制" |
ef317cd5 | 12660 | |
ec3d4607 | 12661 | #: builtin/clean.c:903 |
2e8451e8 JX |
12662 | msgid "interactive cleaning" |
12663 | msgstr "交互式清除" | |
12664 | ||
ec3d4607 | 12665 | #: builtin/clean.c:905 |
ef317cd5 | 12666 | msgid "remove whole directories" |
07432cef | 12667 | msgstr "删除整个目录" |
ef317cd5 | 12668 | |
ec3d4607 JX |
12669 | #: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 |
12670 | #: builtin/grep.c:923 builtin/log.c:184 builtin/log.c:186 | |
33b62fba | 12671 | #: builtin/ls-files.c:650 builtin/name-rev.c:526 builtin/name-rev.c:528 |
d46c5519 | 12672 | #: builtin/show-ref.c:179 |
ef317cd5 | 12673 | msgid "pattern" |
07432cef | 12674 | msgstr "模式" |
ef317cd5 | 12675 | |
ec3d4607 | 12676 | #: builtin/clean.c:907 |
ef317cd5 | 12677 | msgid "add <pattern> to ignore rules" |
4375c10e | 12678 | msgstr "添加 <模式> 到忽略规则" |
ef317cd5 | 12679 | |
ec3d4607 | 12680 | #: builtin/clean.c:908 |
ef317cd5 | 12681 | msgid "remove ignored files, too" |
07432cef | 12682 | msgstr "也删除忽略的文件" |
ef317cd5 | 12683 | |
ec3d4607 | 12684 | #: builtin/clean.c:910 |
ef317cd5 | 12685 | msgid "remove only ignored files" |
07432cef | 12686 | msgstr "只删除忽略的文件" |
c04f5ac3 | 12687 | |
ec3d4607 | 12688 | #: builtin/clean.c:925 |
c04f5ac3 | 12689 | msgid "" |
6c94aba5 | 12690 | "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " |
2e8451e8 | 12691 | "clean" |
c04f5ac3 | 12692 | msgstr "" |
2e8451e8 | 12693 | "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 12694 | |
ec3d4607 | 12695 | #: builtin/clean.c:928 |
c04f5ac3 | 12696 | msgid "" |
6c94aba5 | 12697 | "clean.requireForce defaults to true and neither -i, -n, nor -f given; " |
2e8451e8 | 12698 | "refusing to clean" |
c04f5ac3 | 12699 | msgstr "" |
2e8451e8 | 12700 | "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作" |
c04f5ac3 | 12701 | |
ec3d4607 | 12702 | #: builtin/clean.c:940 |
7157c2b5 JX |
12703 | msgid "-x and -X cannot be used together" |
12704 | msgstr "-x 和 -X 不能同时使用" | |
12705 | ||
a5cd71ca | 12706 | #: builtin/clone.c:45 |
814ff314 | 12707 | msgid "git clone [<options>] [--] <repo> [<dir>]" |
160fb2b2 | 12708 | msgstr "git clone [<选项>] [--] <仓库> [<路径>]" |
ef317cd5 | 12709 | |
33b62fba JX |
12710 | #: builtin/clone.c:96 |
12711 | msgid "don't clone shallow repository" | |
12712 | msgstr "不克隆浅仓库" | |
12713 | ||
12714 | #: builtin/clone.c:98 | |
ef317cd5 | 12715 | msgid "don't create a checkout" |
07432cef | 12716 | msgstr "不创建一个检出" |
ef317cd5 | 12717 | |
ec3d4607 | 12718 | #: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 |
ef317cd5 | 12719 | msgid "create a bare repository" |
160fb2b2 | 12720 | msgstr "创建一个纯仓库" |
ef317cd5 | 12721 | |
33b62fba | 12722 | #: builtin/clone.c:103 |
ef317cd5 | 12723 | msgid "create a mirror repository (implies bare)" |
160fb2b2 | 12724 | msgstr "创建一个镜像仓库(也是纯仓库)" |
ef317cd5 | 12725 | |
33b62fba | 12726 | #: builtin/clone.c:105 |
ef317cd5 | 12727 | msgid "to clone from a local repository" |
160fb2b2 | 12728 | msgstr "从本地仓库克隆" |
ef317cd5 | 12729 | |
33b62fba | 12730 | #: builtin/clone.c:107 |
ef317cd5 | 12731 | msgid "don't use local hardlinks, always copy" |
07432cef | 12732 | msgstr "不使用本地硬链接,始终复制" |
ef317cd5 | 12733 | |
33b62fba | 12734 | #: builtin/clone.c:109 |
ef317cd5 | 12735 | msgid "setup as shared repository" |
160fb2b2 | 12736 | msgstr "设置为共享仓库" |
ef317cd5 | 12737 | |
33b62fba | 12738 | #: builtin/clone.c:111 |
87cb7997 | 12739 | msgid "pathspec" |
65e2041e | 12740 | msgstr "路径规格" |
87cb7997 | 12741 | |
33b62fba | 12742 | #: builtin/clone.c:111 |
ef317cd5 | 12743 | msgid "initialize submodules in the clone" |
07432cef | 12744 | msgstr "在克隆时初始化子模组" |
ef317cd5 | 12745 | |
33b62fba | 12746 | #: builtin/clone.c:115 |
5b04ee3b JX |
12747 | msgid "number of submodules cloned in parallel" |
12748 | msgstr "并发克隆的子模组的数量" | |
12749 | ||
ec3d4607 | 12750 | #: builtin/clone.c:116 builtin/init-db.c:539 |
ef317cd5 | 12751 | msgid "template-directory" |
07432cef | 12752 | msgstr "模板目录" |
ef317cd5 | 12753 | |
ec3d4607 | 12754 | #: builtin/clone.c:117 builtin/init-db.c:540 |
ef317cd5 | 12755 | msgid "directory from which templates will be used" |
07432cef | 12756 | msgstr "模板目录将被使用" |
ef317cd5 | 12757 | |
ec3d4607 JX |
12758 | #: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899 |
12759 | #: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903 | |
ef317cd5 | 12760 | msgid "reference repository" |
160fb2b2 | 12761 | msgstr "参考仓库" |
ef317cd5 | 12762 | |
ec3d4607 JX |
12763 | #: builtin/clone.c:123 builtin/submodule--helper.c:1901 |
12764 | #: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905 | |
7aea43ff | 12765 | msgid "use --reference only while cloning" |
160fb2b2 | 12766 | msgstr "仅在克隆时参考 --reference 指向的本地仓库" |
7aea43ff | 12767 | |
ec3d4607 JX |
12768 | #: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 |
12769 | #: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495 | |
33b62fba | 12770 | #: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698 |
ef317cd5 | 12771 | msgid "name" |
07432cef | 12772 | msgstr "名称" |
ef317cd5 | 12773 | |
33b62fba | 12774 | #: builtin/clone.c:125 |
ef317cd5 | 12775 | msgid "use <name> instead of 'origin' to track upstream" |
4375c10e | 12776 | msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" |
ef317cd5 | 12777 | |
33b62fba | 12778 | #: builtin/clone.c:127 |
ef317cd5 | 12779 | msgid "checkout <branch> instead of the remote's HEAD" |
4375c10e | 12780 | msgstr "检出 <分支> 而不是远程 HEAD" |
ef317cd5 | 12781 | |
33b62fba | 12782 | #: builtin/clone.c:129 |
ef317cd5 | 12783 | msgid "path to git-upload-pack on the remote" |
07432cef | 12784 | msgstr "远程 git-upload-pack 路径" |
ef317cd5 | 12785 | |
ec3d4607 | 12786 | #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862 |
349ede6a | 12787 | #: builtin/pull.c:208 |
ef317cd5 | 12788 | msgid "depth" |
07432cef | 12789 | msgstr "深度" |
ef317cd5 | 12790 | |
33b62fba | 12791 | #: builtin/clone.c:131 |
ef317cd5 | 12792 | msgid "create a shallow clone of that depth" |
07432cef | 12793 | msgstr "创建一个指定深度的浅克隆" |
ef317cd5 | 12794 | |
ec3d4607 | 12795 | #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964 |
349ede6a | 12796 | #: builtin/pull.c:211 |
a0b6b246 JX |
12797 | msgid "time" |
12798 | msgstr "时间" | |
12799 | ||
33b62fba | 12800 | #: builtin/clone.c:133 |
a0b6b246 JX |
12801 | msgid "create a shallow clone since a specific time" |
12802 | msgstr "从一个特定时间创建一个浅克隆" | |
12803 | ||
33b62fba JX |
12804 | #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 |
12805 | #: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1318 | |
a0b6b246 JX |
12806 | msgid "revision" |
12807 | msgstr "版本" | |
12808 | ||
33b62fba | 12809 | #: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 |
1a79b2f1 JX |
12810 | msgid "deepen history of shallow clone, excluding rev" |
12811 | msgstr "深化浅克隆的历史,除了特定版本" | |
a0b6b246 | 12812 | |
ec3d4607 JX |
12813 | #: builtin/clone.c:137 builtin/submodule--helper.c:1911 |
12814 | #: builtin/submodule--helper.c:2369 | |
ef317cd5 | 12815 | msgid "clone only one branch, HEAD or --branch" |
07432cef | 12816 | msgstr "只克隆一个分支、HEAD 或 --branch" |
ef317cd5 | 12817 | |
33b62fba | 12818 | #: builtin/clone.c:139 |
a4f16749 JX |
12819 | msgid "don't clone any tags, and make later fetches not to follow them" |
12820 | msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" | |
12821 | ||
33b62fba | 12822 | #: builtin/clone.c:141 |
5b04ee3b JX |
12823 | msgid "any cloned submodules will be shallow" |
12824 | msgstr "子模组将以浅下载模式克隆" | |
12825 | ||
ec3d4607 | 12826 | #: builtin/clone.c:142 builtin/init-db.c:548 |
ef317cd5 | 12827 | msgid "gitdir" |
07432cef | 12828 | msgstr "git目录" |
ef317cd5 | 12829 | |
ec3d4607 | 12830 | #: builtin/clone.c:143 builtin/init-db.c:549 |
ef317cd5 | 12831 | msgid "separate git dir from working tree" |
07432cef | 12832 | msgstr "git目录和工作区分离" |
ef317cd5 | 12833 | |
33b62fba | 12834 | #: builtin/clone.c:144 |
ef317cd5 | 12835 | msgid "key=value" |
07432cef | 12836 | msgstr "key=value" |
ef317cd5 | 12837 | |
33b62fba | 12838 | #: builtin/clone.c:145 |
ef317cd5 | 12839 | msgid "set config inside the new repository" |
160fb2b2 | 12840 | msgstr "在新仓库中设置配置信息" |
ef317cd5 | 12841 | |
33b62fba | 12842 | #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 |
ec3d4607 | 12843 | #: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:196 |
d46c5519 JX |
12844 | msgid "server-specific" |
12845 | msgstr "server-specific" | |
12846 | ||
33b62fba | 12847 | #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 |
ec3d4607 | 12848 | #: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:197 |
d46c5519 JX |
12849 | msgid "option to transmit" |
12850 | msgstr "传输选项" | |
12851 | ||
33b62fba | 12852 | #: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 |
ec3d4607 | 12853 | #: builtin/push.c:576 |
276ceeaa JX |
12854 | msgid "use IPv4 addresses only" |
12855 | msgstr "只使用 IPv4 地址" | |
12856 | ||
33b62fba | 12857 | #: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 |
ec3d4607 | 12858 | #: builtin/push.c:578 |
276ceeaa JX |
12859 | msgid "use IPv6 addresses only" |
12860 | msgstr "只使用 IPv6 地址" | |
12861 | ||
33b62fba | 12862 | #: builtin/clone.c:154 |
a6cd2cc4 JX |
12863 | msgid "any cloned submodules will use their remote-tracking branch" |
12864 | msgstr "任何克隆的子模组将使用它们的远程跟踪分支" | |
12865 | ||
33b62fba | 12866 | #: builtin/clone.c:156 |
ddc12c42 JX |
12867 | msgid "initialize sparse-checkout file to include only files at root" |
12868 | msgstr "初始化稀疏检出文件,只包含根目录文件" | |
12869 | ||
33b62fba | 12870 | #: builtin/clone.c:292 |
3495628d JX |
12871 | msgid "" |
12872 | "No directory name could be guessed.\n" | |
12873 | "Please specify a directory on the command line" | |
12874 | msgstr "" | |
12875 | "无法猜到目录名。\n" | |
26e4cbec | 12876 | "请在命令行指定一个目录" |
3495628d | 12877 | |
33b62fba | 12878 | #: builtin/clone.c:345 |
cfff71a9 | 12879 | #, c-format |
a0b6b246 JX |
12880 | msgid "info: Could not add alternate for '%s': %s\n" |
12881 | msgstr "info: 不能为 '%s' 添加一个备用:%s\n" | |
cfff71a9 | 12882 | |
33b62fba | 12883 | #: builtin/clone.c:418 |
c04f5ac3 JX |
12884 | #, c-format |
12885 | msgid "%s exists and is not a directory" | |
12886 | msgstr "%s 存在且不是一个目录" | |
12887 | ||
33b62fba | 12888 | #: builtin/clone.c:436 |
c04f5ac3 | 12889 | #, c-format |
a6cd2cc4 JX |
12890 | msgid "failed to start iterator over '%s'" |
12891 | msgstr "无法在 '%s' 上启动迭代器" | |
c04f5ac3 | 12892 | |
33b62fba | 12893 | #: builtin/clone.c:467 |
c04f5ac3 JX |
12894 | #, c-format |
12895 | msgid "failed to create link '%s'" | |
c1ac5258 | 12896 | msgstr "创建链接 '%s' 失败" |
c04f5ac3 | 12897 | |
33b62fba | 12898 | #: builtin/clone.c:471 |
c04f5ac3 JX |
12899 | #, c-format |
12900 | msgid "failed to copy file to '%s'" | |
c1ac5258 | 12901 | msgstr "拷贝文件至 '%s' 失败" |
c04f5ac3 | 12902 | |
33b62fba | 12903 | #: builtin/clone.c:476 |
a6cd2cc4 JX |
12904 | #, c-format |
12905 | msgid "failed to iterate over '%s'" | |
12906 | msgstr "无法在 '%s' 上迭代" | |
12907 | ||
33b62fba | 12908 | #: builtin/clone.c:503 |
c04f5ac3 JX |
12909 | #, c-format |
12910 | msgid "done.\n" | |
12911 | msgstr "完成。\n" | |
12912 | ||
33b62fba | 12913 | #: builtin/clone.c:517 |
1003b3a5 JX |
12914 | msgid "" |
12915 | "Clone succeeded, but checkout failed.\n" | |
12916 | "You can inspect what was checked out with 'git status'\n" | |
a6cd2cc4 | 12917 | "and retry with 'git restore --source=HEAD :/'\n" |
1003b3a5 JX |
12918 | msgstr "" |
12919 | "克隆成功,但是检出失败。\n" | |
12920 | "您可以通过 'git status' 检查哪些已被检出,然后使用命令\n" | |
a6cd2cc4 | 12921 | "'git restore --source=HEAD :/' 重试\n" |
1003b3a5 | 12922 | |
33b62fba | 12923 | #: builtin/clone.c:594 |
c04f5ac3 JX |
12924 | #, c-format |
12925 | msgid "Could not find remote branch %s to clone." | |
90e6ef53 | 12926 | msgstr "不能发现要克隆的远程分支 %s。" |
c04f5ac3 | 12927 | |
33b62fba | 12928 | #: builtin/clone.c:713 |
3495628d JX |
12929 | #, c-format |
12930 | msgid "unable to update %s" | |
12931 | msgstr "不能更新 %s" | |
12932 | ||
33b62fba | 12933 | #: builtin/clone.c:761 |
ddc12c42 JX |
12934 | msgid "failed to initialize sparse-checkout" |
12935 | msgstr "无法初始化稀疏检出" | |
12936 | ||
33b62fba | 12937 | #: builtin/clone.c:784 |
c04f5ac3 JX |
12938 | msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" |
12939 | msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" | |
12940 | ||
33b62fba | 12941 | #: builtin/clone.c:816 |
1003b3a5 JX |
12942 | msgid "unable to checkout working tree" |
12943 | msgstr "不能检出工作区" | |
12944 | ||
33b62fba | 12945 | #: builtin/clone.c:894 |
3495628d JX |
12946 | msgid "unable to write parameters to config file" |
12947 | msgstr "无法将参数写入配置文件" | |
12948 | ||
33b62fba | 12949 | #: builtin/clone.c:957 |
04cb2f28 JX |
12950 | msgid "cannot repack to clean up" |
12951 | msgstr "无法执行 repack 来清理" | |
12952 | ||
33b62fba | 12953 | #: builtin/clone.c:959 |
04cb2f28 JX |
12954 | msgid "cannot unlink temporary alternates file" |
12955 | msgstr "无法删除临时的 alternates 文件" | |
12956 | ||
ec3d4607 | 12957 | #: builtin/clone.c:1001 builtin/receive-pack.c:2490 |
c04f5ac3 JX |
12958 | msgid "Too many arguments." |
12959 | msgstr "太多参数。" | |
12960 | ||
33b62fba | 12961 | #: builtin/clone.c:1005 |
c04f5ac3 | 12962 | msgid "You must specify a repository to clone." |
160fb2b2 | 12963 | msgstr "您必须指定一个仓库来克隆。" |
c04f5ac3 | 12964 | |
33b62fba | 12965 | #: builtin/clone.c:1018 |
c04f5ac3 JX |
12966 | #, c-format |
12967 | msgid "--bare and --origin %s options are incompatible." | |
12968 | msgstr "--bare 和 --origin %s 选项不兼容。" | |
12969 | ||
33b62fba | 12970 | #: builtin/clone.c:1021 |
07432cef WS |
12971 | msgid "--bare and --separate-git-dir are incompatible." |
12972 | msgstr "--bare 和 --separate-git-dir 选项不兼容。" | |
12973 | ||
33b62fba | 12974 | #: builtin/clone.c:1035 |
c04f5ac3 JX |
12975 | #, c-format |
12976 | msgid "repository '%s' does not exist" | |
160fb2b2 | 12977 | msgstr "仓库 '%s' 不存在" |
c04f5ac3 | 12978 | |
ec3d4607 | 12979 | #: builtin/clone.c:1039 builtin/fetch.c:2014 |
cfff71a9 JX |
12980 | #, c-format |
12981 | msgid "depth %s is not a positive number" | |
12982 | msgstr "深度 %s 不是一个正数" | |
12983 | ||
33b62fba | 12984 | #: builtin/clone.c:1049 |
c04f5ac3 JX |
12985 | #, c-format |
12986 | msgid "destination path '%s' already exists and is not an empty directory." | |
90e6ef53 | 12987 | msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" |
c04f5ac3 | 12988 | |
33b62fba | 12989 | #: builtin/clone.c:1055 |
d9488fea JX |
12990 | #, c-format |
12991 | msgid "repository path '%s' already exists and is not an empty directory." | |
12992 | msgstr "仓库路径 '%s' 已经存在,并且不是一个空目录。" | |
12993 | ||
33b62fba | 12994 | #: builtin/clone.c:1069 |
c04f5ac3 JX |
12995 | #, c-format |
12996 | msgid "working tree '%s' already exists." | |
12997 | msgstr "工作区 '%s' 已经存在。" | |
12998 | ||
33b62fba | 12999 | #: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272 |
ec3d4607 | 13000 | #: builtin/log.c:1997 builtin/worktree.c:280 builtin/worktree.c:312 |
5bb01d4f JX |
13001 | #, c-format |
13002 | msgid "could not create leading directories of '%s'" | |
13003 | msgstr "不能为 '%s' 创建先导目录" | |
13004 | ||
33b62fba | 13005 | #: builtin/clone.c:1089 |
c04f5ac3 | 13006 | #, c-format |
814ff314 JX |
13007 | msgid "could not create work tree dir '%s'" |
13008 | msgstr "不能创建工作区目录 '%s'" | |
c04f5ac3 | 13009 | |
33b62fba | 13010 | #: builtin/clone.c:1109 |
c04f5ac3 JX |
13011 | #, c-format |
13012 | msgid "Cloning into bare repository '%s'...\n" | |
160fb2b2 | 13013 | msgstr "克隆到纯仓库 '%s'...\n" |
c04f5ac3 | 13014 | |
33b62fba | 13015 | #: builtin/clone.c:1111 |
c04f5ac3 JX |
13016 | #, c-format |
13017 | msgid "Cloning into '%s'...\n" | |
13018 | msgstr "正克隆到 '%s'...\n" | |
13019 | ||
33b62fba | 13020 | #: builtin/clone.c:1135 |
a0b6b246 JX |
13021 | msgid "" |
13022 | "clone --recursive is not compatible with both --reference and --reference-if-" | |
13023 | "able" | |
13024 | msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" | |
13025 | ||
33b62fba | 13026 | #: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705 |
d13389bf JX |
13027 | #, c-format |
13028 | msgid "'%s' is not a valid remote name" | |
13029 | msgstr "'%s' 不是一个有效的远程名称" | |
13030 | ||
33b62fba | 13031 | #: builtin/clone.c:1229 |
6acbf033 | 13032 | msgid "--depth is ignored in local clones; use file:// instead." |
a0b6b246 JX |
13033 | msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" |
13034 | ||
33b62fba | 13035 | #: builtin/clone.c:1231 |
a0b6b246 JX |
13036 | msgid "--shallow-since is ignored in local clones; use file:// instead." |
13037 | msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" | |
6acbf033 | 13038 | |
33b62fba | 13039 | #: builtin/clone.c:1233 |
a0b6b246 JX |
13040 | msgid "--shallow-exclude is ignored in local clones; use file:// instead." |
13041 | msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" | |
13042 | ||
33b62fba | 13043 | #: builtin/clone.c:1235 |
31e5e17b JX |
13044 | msgid "--filter is ignored in local clones; use file:// instead." |
13045 | msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" | |
13046 | ||
33b62fba | 13047 | #: builtin/clone.c:1240 |
6acbf033 | 13048 | msgid "source repository is shallow, ignoring --local" |
160fb2b2 | 13049 | msgstr "源仓库是浅克隆,忽略 --local" |
6acbf033 | 13050 | |
33b62fba | 13051 | #: builtin/clone.c:1245 |
6acbf033 JX |
13052 | msgid "--local is ignored" |
13053 | msgstr "--local 被忽略" | |
13054 | ||
ec3d4607 JX |
13055 | #: builtin/clone.c:1324 builtin/clone.c:1383 |
13056 | msgid "remote transport reported error" | |
13057 | msgstr "远程传输报告错误" | |
13058 | ||
13059 | #: builtin/clone.c:1336 builtin/clone.c:1344 | |
c04f5ac3 JX |
13060 | #, c-format |
13061 | msgid "Remote branch %s not found in upstream %s" | |
13062 | msgstr "远程分支 %s 在上游 %s 未发现" | |
13063 | ||
ec3d4607 | 13064 | #: builtin/clone.c:1347 |
c04f5ac3 | 13065 | msgid "You appear to have cloned an empty repository." |
160fb2b2 | 13066 | msgstr "您似乎克隆了一个空仓库。" |
c04f5ac3 | 13067 | |
a4f16749 | 13068 | #: builtin/column.c:10 |
814ff314 JX |
13069 | msgid "git column [<options>]" |
13070 | msgstr "git column [<选项>]" | |
ef317cd5 | 13071 | |
a4f16749 | 13072 | #: builtin/column.c:27 |
ef317cd5 | 13073 | msgid "lookup config vars" |
07432cef | 13074 | msgstr "查找配置变量" |
ef317cd5 | 13075 | |
a4f16749 | 13076 | #: builtin/column.c:28 builtin/column.c:29 |
ef317cd5 | 13077 | msgid "layout to use" |
07432cef | 13078 | msgstr "要使用的布局" |
ef317cd5 | 13079 | |
a4f16749 | 13080 | #: builtin/column.c:30 |
33b62fba | 13081 | msgid "maximum width" |
07432cef | 13082 | msgstr "最大宽度" |
ef317cd5 | 13083 | |
a4f16749 | 13084 | #: builtin/column.c:31 |
33b62fba | 13085 | msgid "padding space on left border" |
07432cef | 13086 | msgstr "左边框的填充空间" |
ef317cd5 | 13087 | |
a4f16749 | 13088 | #: builtin/column.c:32 |
33b62fba | 13089 | msgid "padding space on right border" |
07432cef | 13090 | msgstr "右边框的填充空间" |
ef317cd5 | 13091 | |
a4f16749 | 13092 | #: builtin/column.c:33 |
33b62fba | 13093 | msgid "padding space between columns" |
07432cef | 13094 | msgstr "两列之间的填充空间" |
ef317cd5 | 13095 | |
fd8cb379 | 13096 | #: builtin/column.c:51 |
8ada9598 | 13097 | msgid "--command must be the first argument" |
81809b99 | 13098 | msgstr "--command 必须是第一个参数" |
8ada9598 | 13099 | |
d9488fea | 13100 | #: builtin/commit-graph.c:13 builtin/commit-graph.c:22 |
349ede6a JX |
13101 | msgid "" |
13102 | "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" | |
13103 | msgstr "" | |
13104 | "git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" | |
13105 | "[no-]progress]" | |
13106 | ||
d9488fea | 13107 | #: builtin/commit-graph.c:14 builtin/commit-graph.c:27 |
349ede6a JX |
13108 | msgid "" |
13109 | "git commit-graph write [--object-dir <objdir>] [--append] [--" | |
13110 | "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" | |
d9488fea | 13111 | "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" |
349ede6a JX |
13112 | msgstr "" |
13113 | "git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略" | |
13114 | ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--" | |
d9488fea | 13115 | "[no-]max-new-filters <n>] [--[no-]progress] <切分选项>" |
349ede6a | 13116 | |
d9488fea | 13117 | #: builtin/commit-graph.c:64 |
349ede6a JX |
13118 | #, c-format |
13119 | msgid "could not find object directory matching %s" | |
13120 | msgstr "无法找到和 %s 匹配的对象目录" | |
13121 | ||
d9488fea | 13122 | #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 |
ec3d4607 | 13123 | #: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779 |
349ede6a JX |
13124 | msgid "dir" |
13125 | msgstr "目录" | |
13126 | ||
d9488fea JX |
13127 | #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 |
13128 | #: builtin/commit-graph.c:317 | |
473eb541 | 13129 | msgid "the object directory to store the graph" |
349ede6a JX |
13130 | msgstr "保存图形的对象目录" |
13131 | ||
d9488fea | 13132 | #: builtin/commit-graph.c:83 |
349ede6a JX |
13133 | msgid "if the commit-graph is split, only verify the tip file" |
13134 | msgstr "如果提交图形被拆分,只验证头一个文件" | |
13135 | ||
d9488fea | 13136 | #: builtin/commit-graph.c:106 |
349ede6a JX |
13137 | #, c-format |
13138 | msgid "Could not open commit-graph '%s'" | |
13139 | msgstr "无法打开提交图形 '%s'" | |
13140 | ||
d9488fea | 13141 | #: builtin/commit-graph.c:142 |
349ede6a JX |
13142 | #, c-format |
13143 | msgid "unrecognized --split argument, %s" | |
13144 | msgstr "未能识别的 --split 参数,%s" | |
13145 | ||
d9488fea | 13146 | #: builtin/commit-graph.c:155 |
7157c2b5 JX |
13147 | #, c-format |
13148 | msgid "unexpected non-hex object ID: %s" | |
13149 | msgstr "意外的非十六进制对象 ID:%s" | |
13150 | ||
d9488fea | 13151 | #: builtin/commit-graph.c:160 |
7157c2b5 JX |
13152 | #, c-format |
13153 | msgid "invalid object: %s" | |
13154 | msgstr "无效对象:%s" | |
13155 | ||
d9488fea | 13156 | #: builtin/commit-graph.c:213 |
349ede6a JX |
13157 | msgid "start walk at all refs" |
13158 | msgstr "开始遍历所有引用" | |
13159 | ||
d9488fea | 13160 | #: builtin/commit-graph.c:215 |
349ede6a JX |
13161 | msgid "scan pack-indexes listed by stdin for commits" |
13162 | msgstr "从标准输入中的包索引文件列表中扫描提交" | |
13163 | ||
d9488fea | 13164 | #: builtin/commit-graph.c:217 |
349ede6a JX |
13165 | msgid "start walk at commits listed by stdin" |
13166 | msgstr "从标准输入中的提交开始扫描" | |
13167 | ||
d9488fea | 13168 | #: builtin/commit-graph.c:219 |
349ede6a JX |
13169 | msgid "include all commits already in the commit-graph file" |
13170 | msgstr "包含 commit-graph 文件中已有所有提交" | |
13171 | ||
d9488fea | 13172 | #: builtin/commit-graph.c:221 |
349ede6a JX |
13173 | msgid "enable computation for changed paths" |
13174 | msgstr "启用变更路径的计算" | |
13175 | ||
d9488fea | 13176 | #: builtin/commit-graph.c:224 |
349ede6a JX |
13177 | msgid "allow writing an incremental commit-graph file" |
13178 | msgstr "允许写一个增量提交图形文件" | |
13179 | ||
d9488fea | 13180 | #: builtin/commit-graph.c:228 |
349ede6a JX |
13181 | msgid "maximum number of commits in a non-base split commit-graph" |
13182 | msgstr "在非基本拆分提交图形中的最大提交数" | |
13183 | ||
d9488fea | 13184 | #: builtin/commit-graph.c:230 |
349ede6a JX |
13185 | msgid "maximum ratio between two levels of a split commit-graph" |
13186 | msgstr "一个拆分提交图形的两个级别之间的最大比率" | |
13187 | ||
d9488fea | 13188 | #: builtin/commit-graph.c:232 |
349ede6a JX |
13189 | msgid "only expire files older than a given date-time" |
13190 | msgstr "只让早于给定时间的文件过期" | |
13191 | ||
d9488fea JX |
13192 | #: builtin/commit-graph.c:234 |
13193 | msgid "maximum number of changed-path Bloom filters to compute" | |
13194 | msgstr "要计算的变更路径布隆过滤器的最大数" | |
13195 | ||
13196 | #: builtin/commit-graph.c:255 | |
349ede6a JX |
13197 | msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" |
13198 | msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" | |
13199 | ||
d9488fea | 13200 | #: builtin/commit-graph.c:287 |
7157c2b5 JX |
13201 | msgid "Collecting commits from input" |
13202 | msgstr "正从标准输入收集提交" | |
349ede6a | 13203 | |
d46c5519 JX |
13204 | #: builtin/commit-tree.c:18 |
13205 | msgid "" | |
13206 | "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " | |
13207 | "<file>)...] <tree>" | |
13208 | msgstr "" | |
13209 | "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" | |
13210 | ">)...] <树>" | |
13211 | ||
13212 | #: builtin/commit-tree.c:31 | |
13213 | #, c-format | |
13214 | msgid "duplicate parent %s ignored" | |
13215 | msgstr "忽略重复的父提交 %s" | |
13216 | ||
ec3d4607 | 13217 | #: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562 |
d46c5519 JX |
13218 | #, c-format |
13219 | msgid "not a valid object name %s" | |
13220 | msgstr "不是一个有效的对象名 %s" | |
13221 | ||
13222 | #: builtin/commit-tree.c:93 | |
13223 | #, c-format | |
13224 | msgid "git commit-tree: failed to open '%s'" | |
13225 | msgstr "git commit-tree:无法打开 '%s'" | |
13226 | ||
13227 | #: builtin/commit-tree.c:96 | |
13228 | #, c-format | |
13229 | msgid "git commit-tree: failed to read '%s'" | |
13230 | msgstr "git commit-tree:无法读取 '%s'" | |
13231 | ||
13232 | #: builtin/commit-tree.c:98 | |
13233 | #, c-format | |
13234 | msgid "git commit-tree: failed to close '%s'" | |
13235 | msgstr "git commit-tree:无法关闭 '%s'" | |
13236 | ||
13237 | #: builtin/commit-tree.c:111 | |
13238 | msgid "parent" | |
13239 | msgstr "父提交" | |
13240 | ||
13241 | #: builtin/commit-tree.c:112 | |
13242 | msgid "id of a parent commit object" | |
5b533632 | 13243 | msgstr "父提交对象 ID" |
d46c5519 | 13244 | |
ec3d4607 JX |
13245 | #: builtin/commit-tree.c:114 builtin/commit.c:1624 builtin/merge.c:282 |
13246 | #: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1601 | |
33b62fba | 13247 | #: builtin/tag.c:456 |
d46c5519 JX |
13248 | msgid "message" |
13249 | msgstr "说明" | |
13250 | ||
ec3d4607 | 13251 | #: builtin/commit-tree.c:115 builtin/commit.c:1624 |
d46c5519 JX |
13252 | msgid "commit message" |
13253 | msgstr "提交说明" | |
13254 | ||
13255 | #: builtin/commit-tree.c:118 | |
13256 | msgid "read commit log message from file" | |
13257 | msgstr "从文件中读取提交说明" | |
13258 | ||
ec3d4607 | 13259 | #: builtin/commit-tree.c:121 builtin/commit.c:1641 builtin/merge.c:299 |
349ede6a | 13260 | #: builtin/pull.c:176 builtin/revert.c:118 |
d46c5519 JX |
13261 | msgid "GPG sign commit" |
13262 | msgstr "GPG 提交签名" | |
13263 | ||
13264 | #: builtin/commit-tree.c:133 | |
13265 | msgid "must give exactly one tree" | |
13266 | msgstr "必须精确地提供一个树" | |
13267 | ||
13268 | #: builtin/commit-tree.c:140 | |
13269 | msgid "git commit-tree: failed to read" | |
13270 | msgstr "git commit-tree:读取失败" | |
13271 | ||
06991777 | 13272 | #: builtin/commit.c:41 |
814ff314 | 13273 | msgid "git commit [<options>] [--] <pathspec>..." |
160fb2b2 | 13274 | msgstr "git commit [<选项>] [--] <路径规格>..." |
ef317cd5 | 13275 | |
06991777 | 13276 | #: builtin/commit.c:46 |
814ff314 | 13277 | msgid "git status [<options>] [--] <pathspec>..." |
160fb2b2 | 13278 | msgstr "git status [<选项>] [--] <路径规格>..." |
ef317cd5 | 13279 | |
06991777 | 13280 | #: builtin/commit.c:51 |
c04f5ac3 JX |
13281 | msgid "" |
13282 | "You asked to amend the most recent commit, but doing so would make\n" | |
13283 | "it empty. You can repeat your command with --allow-empty, or you can\n" | |
13284 | "remove the commit entirely with \"git reset HEAD^\".\n" | |
13285 | msgstr "" | |
1b150dc9 T |
13286 | "您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n" |
13287 | "--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" | |
c04f5ac3 | 13288 | |
06991777 | 13289 | #: builtin/commit.c:56 |
c04f5ac3 JX |
13290 | msgid "" |
13291 | "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" | |
13292 | "If you wish to commit it anyway, use:\n" | |
13293 | "\n" | |
13294 | " git commit --allow-empty\n" | |
13295 | "\n" | |
c04f5ac3 | 13296 | msgstr "" |
a9ce4543 T |
13297 | "之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n" |
13298 | "也要提交,使用命令:\n" | |
c04f5ac3 JX |
13299 | "\n" |
13300 | " git commit --allow-empty\n" | |
13301 | "\n" | |
c04f5ac3 | 13302 | |
06991777 | 13303 | #: builtin/commit.c:63 |
349ede6a JX |
13304 | msgid "Otherwise, please use 'git rebase --skip'\n" |
13305 | msgstr "否则,请使用 'git rebase --skip'\n" | |
13306 | ||
13307 | #: builtin/commit.c:66 | |
a6cd2cc4 JX |
13308 | msgid "Otherwise, please use 'git cherry-pick --skip'\n" |
13309 | msgstr "否则,请使用 'git cherry-pick --skip'\n" | |
b1894384 | 13310 | |
349ede6a | 13311 | #: builtin/commit.c:69 |
b1894384 | 13312 | msgid "" |
a6cd2cc4 JX |
13313 | "and then use:\n" |
13314 | "\n" | |
13315 | " git cherry-pick --continue\n" | |
13316 | "\n" | |
13317 | "to resume cherry-picking the remaining commits.\n" | |
b1894384 JX |
13318 | "If you wish to skip this commit, use:\n" |
13319 | "\n" | |
a6cd2cc4 | 13320 | " git cherry-pick --skip\n" |
b1894384 | 13321 | "\n" |
b1894384 | 13322 | msgstr "" |
a6cd2cc4 JX |
13323 | "然后使用:\n" |
13324 | "\n" | |
13325 | " git cherry-pick --continue\n" | |
b1894384 | 13326 | "\n" |
a6cd2cc4 JX |
13327 | "来继续拣选剩余提交。如果您想跳过此提交,使用:\n" |
13328 | "\n" | |
13329 | " git cherry-pick --skip\n" | |
b1894384 | 13330 | "\n" |
b1894384 | 13331 | |
33b62fba | 13332 | #: builtin/commit.c:324 |
c04f5ac3 | 13333 | msgid "failed to unpack HEAD tree object" |
c1ac5258 | 13334 | msgstr "解包 HEAD 树对象失败" |
c04f5ac3 | 13335 | |
33b62fba | 13336 | #: builtin/commit.c:360 |
ddc12c42 JX |
13337 | msgid "--pathspec-from-file with -a does not make sense" |
13338 | msgstr "--pathspec-from-file 和 -a 在一起没有意义" | |
13339 | ||
33b62fba | 13340 | #: builtin/commit.c:374 |
ddc12c42 JX |
13341 | msgid "No paths with --include/--only does not make sense." |
13342 | msgstr "参数 --include/--only 不跟路径没有意义。" | |
13343 | ||
33b62fba | 13344 | #: builtin/commit.c:386 |
c04f5ac3 | 13345 | msgid "unable to create temporary index" |
90e6ef53 | 13346 | msgstr "不能创建临时索引" |
c04f5ac3 | 13347 | |
33b62fba | 13348 | #: builtin/commit.c:395 |
c04f5ac3 JX |
13349 | msgid "interactive add failed" |
13350 | msgstr "交互式添加失败" | |
13351 | ||
33b62fba | 13352 | #: builtin/commit.c:410 |
220c313c JX |
13353 | msgid "unable to update temporary index" |
13354 | msgstr "无法更新临时索引" | |
13355 | ||
33b62fba | 13356 | #: builtin/commit.c:412 |
220c313c JX |
13357 | msgid "Failed to update main cache tree" |
13358 | msgstr "不能更新树的主缓存" | |
13359 | ||
33b62fba | 13360 | #: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508 |
c04f5ac3 | 13361 | msgid "unable to write new_index file" |
90e6ef53 | 13362 | msgstr "无法写 new_index 文件" |
c04f5ac3 | 13363 | |
33b62fba | 13364 | #: builtin/commit.c:489 |
8ada9598 | 13365 | msgid "cannot do a partial commit during a merge." |
81809b99 | 13366 | msgstr "在合并过程中不能做部分提交。" |
c04f5ac3 | 13367 | |
33b62fba | 13368 | #: builtin/commit.c:491 |
8ada9598 | 13369 | msgid "cannot do a partial commit during a cherry-pick." |
81809b99 | 13370 | msgstr "在拣选过程中不能做部分提交。" |
8ada9598 | 13371 | |
33b62fba | 13372 | #: builtin/commit.c:493 |
349ede6a JX |
13373 | msgid "cannot do a partial commit during a rebase." |
13374 | msgstr "在变基过程中不能做部分提交。" | |
13375 | ||
33b62fba | 13376 | #: builtin/commit.c:501 |
c04f5ac3 | 13377 | msgid "cannot read the index" |
90e6ef53 | 13378 | msgstr "无法读取索引" |
c04f5ac3 | 13379 | |
33b62fba | 13380 | #: builtin/commit.c:520 |
c04f5ac3 | 13381 | msgid "unable to write temporary index file" |
90e6ef53 | 13382 | msgstr "无法写临时索引文件" |
c04f5ac3 | 13383 | |
33b62fba | 13384 | #: builtin/commit.c:618 |
220c313c JX |
13385 | #, c-format |
13386 | msgid "commit '%s' lacks author header" | |
13387 | msgstr "提交 '%s' 缺少作者信息" | |
13388 | ||
33b62fba | 13389 | #: builtin/commit.c:620 |
c04f5ac3 | 13390 | #, c-format |
220c313c | 13391 | msgid "commit '%s' has malformed author line" |
fd8cb379 | 13392 | msgstr "提交 '%s' 有格式错误的作者信息" |
c04f5ac3 | 13393 | |
33b62fba | 13394 | #: builtin/commit.c:639 |
c04f5ac3 | 13395 | msgid "malformed --author parameter" |
fd8cb379 | 13396 | msgstr "格式错误的 --author 参数" |
c04f5ac3 | 13397 | |
33b62fba | 13398 | #: builtin/commit.c:692 |
6acbf033 JX |
13399 | msgid "" |
13400 | "unable to select a comment character that is not used\n" | |
13401 | "in the current commit message" | |
13402 | msgstr "无法选择一个未被当前提交说明使用的注释字符" | |
13403 | ||
ec3d4607 | 13404 | #: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165 |
c04f5ac3 JX |
13405 | #, c-format |
13406 | msgid "could not lookup commit %s" | |
13407 | msgstr "不能查询提交 %s" | |
13408 | ||
33b62fba | 13409 | #: builtin/commit.c:758 builtin/shortlog.c:413 |
c04f5ac3 JX |
13410 | #, c-format |
13411 | msgid "(reading log message from standard input)\n" | |
90e6ef53 | 13412 | msgstr "(正从标准输入中读取日志信息)\n" |
c04f5ac3 | 13413 | |
33b62fba | 13414 | #: builtin/commit.c:760 |
c04f5ac3 | 13415 | msgid "could not read log from standard input" |
90e6ef53 | 13416 | msgstr "不能从标准输入中读取日志信息" |
c04f5ac3 | 13417 | |
33b62fba | 13418 | #: builtin/commit.c:764 |
c04f5ac3 JX |
13419 | #, c-format |
13420 | msgid "could not read log file '%s'" | |
90e6ef53 | 13421 | msgstr "不能读取日志文件 '%s'" |
c04f5ac3 | 13422 | |
33b62fba JX |
13423 | #: builtin/commit.c:801 |
13424 | #, c-format | |
13425 | msgid "cannot combine -m with --fixup:%s" | |
13426 | msgstr "不能将 -m 和 --fixup 组合使用:%s" | |
13427 | ||
13428 | #: builtin/commit.c:813 builtin/commit.c:829 | |
c04f5ac3 | 13429 | msgid "could not read SQUASH_MSG" |
90e6ef53 | 13430 | msgstr "不能读取 SQUASH_MSG" |
c04f5ac3 | 13431 | |
33b62fba | 13432 | #: builtin/commit.c:820 |
5b04ee3b JX |
13433 | msgid "could not read MERGE_MSG" |
13434 | msgstr "不能读取 MERGE_MSG" | |
13435 | ||
33b62fba | 13436 | #: builtin/commit.c:880 |
c04f5ac3 | 13437 | msgid "could not write commit template" |
90e6ef53 | 13438 | msgstr "不能写提交模版" |
c04f5ac3 | 13439 | |
ec3d4607 JX |
13440 | #: builtin/commit.c:893 |
13441 | #, c-format | |
13442 | msgid "" | |
13443 | "Please enter the commit message for your changes. Lines starting\n" | |
13444 | "with '%c' will be ignored.\n" | |
13445 | msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" | |
13446 | ||
13447 | #: builtin/commit.c:895 | |
13448 | #, c-format | |
13449 | msgid "" | |
13450 | "Please enter the commit message for your changes. Lines starting\n" | |
13451 | "with '%c' will be ignored, and an empty message aborts the commit.\n" | |
13452 | msgstr "" | |
13453 | "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" | |
13454 | "说明将会终止提交。\n" | |
13455 | ||
13456 | #: builtin/commit.c:899 | |
13457 | #, c-format | |
13458 | msgid "" | |
13459 | "Please enter the commit message for your changes. Lines starting\n" | |
13460 | "with '%c' will be kept; you may remove them yourself if you want to.\n" | |
13461 | msgstr "" | |
13462 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n" | |
13463 | "也可以删除它们。\n" | |
13464 | ||
13465 | #: builtin/commit.c:903 | |
13466 | #, c-format | |
13467 | msgid "" | |
13468 | "Please enter the commit message for your changes. Lines starting\n" | |
13469 | "with '%c' will be kept; you may remove them yourself if you want to.\n" | |
13470 | "An empty message aborts the commit.\n" | |
13471 | msgstr "" | |
13472 | "请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您愿意\n" | |
13473 | "也可以删除它们。一个空的提交说明将会终止提交。\n" | |
13474 | ||
13475 | #: builtin/commit.c:915 | |
c04f5ac3 JX |
13476 | msgid "" |
13477 | "\n" | |
8ada9598 | 13478 | "It looks like you may be committing a merge.\n" |
d9488fea JX |
13479 | "If this is not correct, please run\n" |
13480 | "\tgit update-ref -d MERGE_HEAD\n" | |
c04f5ac3 JX |
13481 | "and try again.\n" |
13482 | msgstr "" | |
13483 | "\n" | |
d9488fea JX |
13484 | "似乎您正在做一个合并提交。如果不对,请运行\n" |
13485 | "\tgit update-ref -d MERGE_HEAD\n" | |
c04f5ac3 JX |
13486 | "然后重试。\n" |
13487 | ||
ec3d4607 | 13488 | #: builtin/commit.c:920 |
8ada9598 JX |
13489 | msgid "" |
13490 | "\n" | |
13491 | "It looks like you may be committing a cherry-pick.\n" | |
d9488fea JX |
13492 | "If this is not correct, please run\n" |
13493 | "\tgit update-ref -d CHERRY_PICK_HEAD\n" | |
8ada9598 JX |
13494 | "and try again.\n" |
13495 | msgstr "" | |
13496 | "\n" | |
d9488fea JX |
13497 | "似乎您正在做一个拣选提交。如果不对,请运行\n" |
13498 | "\tgit update-ref -d CHERRY_PICK_HEAD\n" | |
8ada9598 | 13499 | "然后重试。\n" |
c04f5ac3 | 13500 | |
90e6ef53 | 13501 | # 译者:为保证在输出中对齐,注意调整句中空格! |
ec3d4607 | 13502 | #: builtin/commit.c:947 |
6acbf033 JX |
13503 | #, c-format |
13504 | msgid "%sAuthor: %.*s <%.*s>" | |
13505 | msgstr "%s作者: %.*s <%.*s>" | |
13506 | ||
13507 | # 译者:为保证在输出中对齐,注意调整句中空格! | |
ec3d4607 | 13508 | #: builtin/commit.c:955 |
c04f5ac3 | 13509 | #, c-format |
6acbf033 JX |
13510 | msgid "%sDate: %s" |
13511 | msgstr "%s日期: %s" | |
c04f5ac3 | 13512 | |
90e6ef53 | 13513 | # 译者:为保证在输出中对齐,注意调整句中空格! |
ec3d4607 | 13514 | #: builtin/commit.c:962 |
c04f5ac3 | 13515 | #, c-format |
6acbf033 JX |
13516 | msgid "%sCommitter: %.*s <%.*s>" |
13517 | msgstr "%s提交者:%.*s <%.*s>" | |
c04f5ac3 | 13518 | |
ec3d4607 | 13519 | #: builtin/commit.c:980 |
c04f5ac3 | 13520 | msgid "Cannot read index" |
90e6ef53 | 13521 | msgstr "无法读取索引" |
c04f5ac3 | 13522 | |
ec3d4607 | 13523 | #: builtin/commit.c:1025 |
33b62fba JX |
13524 | msgid "unable to pass trailers to --trailers" |
13525 | msgstr "无法将尾注传递给 --trailers" | |
13526 | ||
ec3d4607 | 13527 | #: builtin/commit.c:1065 |
c04f5ac3 JX |
13528 | msgid "Error building trees" |
13529 | msgstr "无法创建树对象" | |
13530 | ||
ec3d4607 | 13531 | #: builtin/commit.c:1079 builtin/tag.c:319 |
c04f5ac3 JX |
13532 | #, c-format |
13533 | msgid "Please supply the message using either -m or -F option.\n" | |
07432cef | 13534 | msgstr "请使用 -m 或 -F 选项提供提交说明。\n" |
c04f5ac3 | 13535 | |
ec3d4607 | 13536 | #: builtin/commit.c:1123 |
c04f5ac3 | 13537 | #, c-format |
814ff314 | 13538 | msgid "--author '%s' is not 'Name <email>' and matches no existing author" |
58b6f078 | 13539 | msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" |
c04f5ac3 | 13540 | |
ec3d4607 | 13541 | #: builtin/commit.c:1137 |
5809aa05 JX |
13542 | #, c-format |
13543 | msgid "Invalid ignored mode '%s'" | |
13544 | msgstr "无效的忽略模式 '%s'" | |
13545 | ||
ec3d4607 | 13546 | #: builtin/commit.c:1155 builtin/commit.c:1448 |
c04f5ac3 JX |
13547 | #, c-format |
13548 | msgid "Invalid untracked files mode '%s'" | |
90e6ef53 | 13549 | msgstr "无效的未追踪文件参数 '%s'" |
c04f5ac3 | 13550 | |
ec3d4607 | 13551 | #: builtin/commit.c:1195 |
2e8451e8 JX |
13552 | msgid "--long and -z are incompatible" |
13553 | msgstr "--long 和 -z 选项不兼容" | |
13554 | ||
ec3d4607 | 13555 | #: builtin/commit.c:1226 |
33b62fba JX |
13556 | msgid "You are in the middle of a merge -- cannot reword." |
13557 | msgstr "您正处于一个合并过程中 -- 无法改写说明。" | |
13558 | ||
ec3d4607 | 13559 | #: builtin/commit.c:1228 |
33b62fba JX |
13560 | msgid "You are in the middle of a cherry-pick -- cannot reword." |
13561 | msgstr "您正处于一个拣选过程中 -- 无法改写说明。" | |
13562 | ||
ec3d4607 | 13563 | #: builtin/commit.c:1231 |
33b62fba JX |
13564 | #, c-format |
13565 | msgid "cannot combine reword option of --fixup with path '%s'" | |
523ccf5d | 13566 | msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用" |
33b62fba | 13567 | |
ec3d4607 | 13568 | #: builtin/commit.c:1233 |
33b62fba JX |
13569 | msgid "" |
13570 | "reword option of --fixup is mutually exclusive with --patch/--interactive/--" | |
13571 | "all/--include/--only" | |
ec3d4607 JX |
13572 | msgstr "" |
13573 | "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥" | |
33b62fba | 13574 | |
ec3d4607 | 13575 | #: builtin/commit.c:1252 |
c04f5ac3 JX |
13576 | msgid "Using both --reset-author and --author does not make sense" |
13577 | msgstr "同时使用 --reset-author 和 --author 没有意义" | |
13578 | ||
ec3d4607 | 13579 | #: builtin/commit.c:1261 |
c04f5ac3 | 13580 | msgid "You have nothing to amend." |
90e6ef53 | 13581 | msgstr "您没有可修补的提交。" |
c04f5ac3 | 13582 | |
ec3d4607 | 13583 | #: builtin/commit.c:1264 |
8ada9598 | 13584 | msgid "You are in the middle of a merge -- cannot amend." |
81809b99 | 13585 | msgstr "您正处于一个合并过程中 -- 无法修补提交。" |
8ada9598 | 13586 | |
ec3d4607 | 13587 | #: builtin/commit.c:1266 |
8ada9598 | 13588 | msgid "You are in the middle of a cherry-pick -- cannot amend." |
81809b99 | 13589 | msgstr "您正处于一个拣选过程中 -- 无法修补提交。" |
c04f5ac3 | 13590 | |
ec3d4607 | 13591 | #: builtin/commit.c:1268 |
349ede6a JX |
13592 | msgid "You are in the middle of a rebase -- cannot amend." |
13593 | msgstr "您正处于一个变基过程中 -- 无法修补提交。" | |
13594 | ||
ec3d4607 | 13595 | #: builtin/commit.c:1271 |
c04f5ac3 | 13596 | msgid "Options --squash and --fixup cannot be used together" |
649900bc | 13597 | msgstr "选项 --squash 和 --fixup 不能同时使用" |
c04f5ac3 | 13598 | |
ec3d4607 | 13599 | #: builtin/commit.c:1281 |
c04f5ac3 JX |
13600 | msgid "Only one of -c/-C/-F/--fixup can be used." |
13601 | msgstr "只能用一个 -c/-C/-F/--fixup 选项。" | |
13602 | ||
ec3d4607 | 13603 | #: builtin/commit.c:1283 |
31e5e17b JX |
13604 | msgid "Option -m cannot be combined with -c/-C/-F." |
13605 | msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" | |
c04f5ac3 | 13606 | |
ec3d4607 | 13607 | #: builtin/commit.c:1292 |
c04f5ac3 | 13608 | msgid "--reset-author can be used only with -C, -c or --amend." |
649900bc | 13609 | msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" |
c04f5ac3 | 13610 | |
ec3d4607 | 13611 | #: builtin/commit.c:1310 |
c04f5ac3 JX |
13612 | msgid "Only one of --include/--only/--all/--interactive/--patch can be used." |
13613 | msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" | |
13614 | ||
ec3d4607 | 13615 | #: builtin/commit.c:1338 |
33b62fba JX |
13616 | #, c-format |
13617 | msgid "unknown option: --fixup=%s:%s" | |
13618 | msgstr "未知选项:--fixup=%s:%s" | |
13619 | ||
ec3d4607 | 13620 | #: builtin/commit.c:1352 |
c04f5ac3 | 13621 | #, c-format |
d46c5519 JX |
13622 | msgid "paths '%s ...' with -a does not make sense" |
13623 | msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" | |
c04f5ac3 | 13624 | |
ec3d4607 | 13625 | #: builtin/commit.c:1483 builtin/commit.c:1652 |
ef317cd5 | 13626 | msgid "show status concisely" |
07432cef | 13627 | msgstr "以简洁的格式显示状态" |
ef317cd5 | 13628 | |
ec3d4607 | 13629 | #: builtin/commit.c:1485 builtin/commit.c:1654 |
ef317cd5 | 13630 | msgid "show branch information" |
07432cef | 13631 | msgstr "显示分支信息" |
ef317cd5 | 13632 | |
ec3d4607 | 13633 | #: builtin/commit.c:1487 |
a4f16749 JX |
13634 | msgid "show stash information" |
13635 | msgstr "显示贮藏区信息" | |
13636 | ||
ec3d4607 | 13637 | #: builtin/commit.c:1489 builtin/commit.c:1656 |
31e5e17b JX |
13638 | msgid "compute full ahead/behind values" |
13639 | msgstr "计算完整的领先/落后值" | |
13640 | ||
ec3d4607 | 13641 | #: builtin/commit.c:1491 |
a0b6b246 JX |
13642 | msgid "version" |
13643 | msgstr "版本" | |
13644 | ||
ec3d4607 JX |
13645 | #: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551 |
13646 | #: builtin/worktree.c:690 | |
ef317cd5 | 13647 | msgid "machine-readable output" |
07432cef WS |
13648 | msgstr "机器可读的输出" |
13649 | ||
ec3d4607 | 13650 | #: builtin/commit.c:1494 builtin/commit.c:1660 |
07432cef WS |
13651 | msgid "show status in long format (default)" |
13652 | msgstr "以长格式显示状态(默认)" | |
ef317cd5 | 13653 | |
ec3d4607 | 13654 | #: builtin/commit.c:1497 builtin/commit.c:1663 |
ef317cd5 | 13655 | msgid "terminate entries with NUL" |
4375c10e | 13656 | msgstr "条目以 NUL 字符结尾" |
ef317cd5 | 13657 | |
ec3d4607 | 13658 | #: builtin/commit.c:1499 builtin/commit.c:1503 builtin/commit.c:1666 |
d13389bf | 13659 | #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 |
33b62fba | 13660 | #: builtin/fast-export.c:1204 builtin/rebase.c:1407 parse-options.h:337 |
ef317cd5 | 13661 | msgid "mode" |
07432cef | 13662 | msgstr "模式" |
ef317cd5 | 13663 | |
ec3d4607 | 13664 | #: builtin/commit.c:1500 builtin/commit.c:1666 |
ef317cd5 | 13665 | msgid "show untracked files, optional modes: all, normal, no. (Default: all)" |
07432cef | 13666 | msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" |
ef317cd5 | 13667 | |
ec3d4607 | 13668 | #: builtin/commit.c:1504 |
5809aa05 JX |
13669 | msgid "" |
13670 | "show ignored files, optional modes: traditional, matching, no. (Default: " | |
13671 | "traditional)" | |
31e5e17b JX |
13672 | msgstr "" |
13673 | "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" | |
ef317cd5 | 13674 | |
ec3d4607 | 13675 | #: builtin/commit.c:1506 parse-options.h:193 |
ef317cd5 JX |
13676 | msgid "when" |
13677 | msgstr "何时" | |
13678 | ||
ec3d4607 | 13679 | #: builtin/commit.c:1507 |
ef317cd5 JX |
13680 | msgid "" |
13681 | "ignore changes to submodules, optional when: all, dirty, untracked. " | |
13682 | "(Default: all)" | |
13683 | msgstr "" | |
07432cef | 13684 | "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" |
ef317cd5 | 13685 | |
ec3d4607 | 13686 | #: builtin/commit.c:1509 |
ef317cd5 | 13687 | msgid "list untracked files in columns" |
07432cef | 13688 | msgstr "以列的方式显示未跟踪的文件" |
ef317cd5 | 13689 | |
ec3d4607 | 13690 | #: builtin/commit.c:1510 |
fd8cb379 JX |
13691 | msgid "do not detect renames" |
13692 | msgstr "不检测重命名" | |
13693 | ||
ec3d4607 | 13694 | #: builtin/commit.c:1512 |
fd8cb379 JX |
13695 | msgid "detect renames, optionally set similarity index" |
13696 | msgstr "检测重命名,可以设置索引相似度" | |
13697 | ||
ec3d4607 | 13698 | #: builtin/commit.c:1535 |
5809aa05 JX |
13699 | msgid "Unsupported combination of ignored and untracked-files arguments" |
13700 | msgstr "不支持已忽略和未跟踪文件参数的组合" | |
13701 | ||
ec3d4607 | 13702 | #: builtin/commit.c:1617 |
ef317cd5 | 13703 | msgid "suppress summary after successful commit" |
07432cef | 13704 | msgstr "提交成功后不显示概述信息" |
c04f5ac3 | 13705 | |
ec3d4607 | 13706 | #: builtin/commit.c:1618 |
ef317cd5 | 13707 | msgid "show diff in commit message template" |
07432cef | 13708 | msgstr "在提交说明模板里显示差异" |
c04f5ac3 | 13709 | |
ec3d4607 | 13710 | #: builtin/commit.c:1620 |
ef317cd5 | 13711 | msgid "Commit message options" |
07432cef | 13712 | msgstr "提交说明选项" |
c04f5ac3 | 13713 | |
ec3d4607 | 13714 | #: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458 |
ef317cd5 | 13715 | msgid "read message from file" |
07432cef | 13716 | msgstr "从文件中读取提交说明" |
c04f5ac3 | 13717 | |
ec3d4607 | 13718 | #: builtin/commit.c:1622 |
ef317cd5 | 13719 | msgid "author" |
07432cef | 13720 | msgstr "作者" |
c04f5ac3 | 13721 | |
ec3d4607 | 13722 | #: builtin/commit.c:1622 |
ef317cd5 | 13723 | msgid "override author for commit" |
07432cef | 13724 | msgstr "提交时覆盖作者" |
73a60cd2 | 13725 | |
ec3d4607 | 13726 | #: builtin/commit.c:1623 builtin/gc.c:550 |
ef317cd5 | 13727 | msgid "date" |
07432cef | 13728 | msgstr "日期" |
c04f5ac3 | 13729 | |
ec3d4607 | 13730 | #: builtin/commit.c:1623 |
ef317cd5 | 13731 | msgid "override date for commit" |
07432cef | 13732 | msgstr "提交时覆盖日期" |
c04f5ac3 | 13733 | |
ec3d4607 | 13734 | #: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632 |
33b62fba | 13735 | #: parse-options.h:329 ref-filter.h:90 |
94550ed3 JX |
13736 | msgid "commit" |
13737 | msgstr "提交" | |
13738 | ||
ec3d4607 | 13739 | #: builtin/commit.c:1625 |
ef317cd5 | 13740 | msgid "reuse and edit message from specified commit" |
07432cef | 13741 | msgstr "重用并编辑指定提交的提交说明" |
ef317cd5 | 13742 | |
ec3d4607 | 13743 | #: builtin/commit.c:1626 |
ef317cd5 | 13744 | msgid "reuse message from specified commit" |
07432cef | 13745 | msgstr "重用指定提交的提交说明" |
ef317cd5 | 13746 | |
33b62fba JX |
13747 | #. TRANSLATORS: Leave "[(amend|reword):]" as-is, |
13748 | #. and only translate <commit>. | |
13749 | #. | |
ec3d4607 | 13750 | #: builtin/commit.c:1631 |
33b62fba JX |
13751 | msgid "[(amend|reword):]commit" |
13752 | msgstr "[(amend|reword):]提交" | |
13753 | ||
ec3d4607 | 13754 | #: builtin/commit.c:1631 |
33b62fba JX |
13755 | msgid "" |
13756 | "use autosquash formatted message to fixup or amend/reword specified commit" | |
13757 | msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" | |
ef317cd5 | 13758 | |
ec3d4607 | 13759 | #: builtin/commit.c:1632 |
ef317cd5 | 13760 | msgid "use autosquash formatted message to squash specified commit" |
33b62fba | 13761 | msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" |
ef317cd5 | 13762 | |
ec3d4607 | 13763 | #: builtin/commit.c:1633 |
ef317cd5 | 13764 | msgid "the commit is authored by me now (used with -C/-c/--amend)" |
07432cef | 13765 | msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" |
ef317cd5 | 13766 | |
ec3d4607 | 13767 | #: builtin/commit.c:1634 builtin/interpret-trailers.c:111 |
33b62fba JX |
13768 | msgid "trailer" |
13769 | msgstr "尾注" | |
13770 | ||
ec3d4607 | 13771 | #: builtin/commit.c:1634 |
33b62fba JX |
13772 | msgid "add custom trailer(s)" |
13773 | msgstr "添加自定义尾注" | |
13774 | ||
ec3d4607 | 13775 | #: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302 |
349ede6a | 13776 | #: builtin/pull.c:145 builtin/revert.c:110 |
d13389bf JX |
13777 | msgid "add a Signed-off-by trailer" |
13778 | msgstr "添加 Signed-off-by 尾注" | |
ef317cd5 | 13779 | |
ec3d4607 | 13780 | #: builtin/commit.c:1636 |
ef317cd5 | 13781 | msgid "use specified template file" |
07432cef | 13782 | msgstr "使用指定的模板文件" |
ef317cd5 | 13783 | |
ec3d4607 | 13784 | #: builtin/commit.c:1637 |
ef317cd5 | 13785 | msgid "force edit of commit" |
07432cef | 13786 | msgstr "强制编辑提交" |
ef317cd5 | 13787 | |
ec3d4607 | 13788 | #: builtin/commit.c:1639 |
ef317cd5 | 13789 | msgid "include status in commit message template" |
07432cef | 13790 | msgstr "在提交说明模板里包含状态信息" |
ef317cd5 | 13791 | |
ec3d4607 | 13792 | #: builtin/commit.c:1644 |
ef317cd5 | 13793 | msgid "Commit contents options" |
07432cef | 13794 | msgstr "提交内容选项" |
ef317cd5 | 13795 | |
ec3d4607 | 13796 | #: builtin/commit.c:1645 |
ef317cd5 | 13797 | msgid "commit all changed files" |
07432cef | 13798 | msgstr "提交所有改动的文件" |
ef317cd5 | 13799 | |
ec3d4607 | 13800 | #: builtin/commit.c:1646 |
ef317cd5 | 13801 | msgid "add specified files to index for commit" |
07432cef | 13802 | msgstr "添加指定的文件到索引区等待提交" |
ef317cd5 | 13803 | |
ec3d4607 | 13804 | #: builtin/commit.c:1647 |
ef317cd5 | 13805 | msgid "interactively add files" |
07432cef | 13806 | msgstr "交互式添加文件" |
ef317cd5 | 13807 | |
ec3d4607 | 13808 | #: builtin/commit.c:1648 |
ef317cd5 | 13809 | msgid "interactively add changes" |
07432cef | 13810 | msgstr "交互式添加变更" |
ef317cd5 | 13811 | |
ec3d4607 | 13812 | #: builtin/commit.c:1649 |
ef317cd5 | 13813 | msgid "commit only specified files" |
07432cef | 13814 | msgstr "只提交指定的文件" |
ef317cd5 | 13815 | |
ec3d4607 | 13816 | #: builtin/commit.c:1650 |
5c57d762 JX |
13817 | msgid "bypass pre-commit and commit-msg hooks" |
13818 | msgstr "绕过 pre-commit 和 commit-msg 钩子" | |
13819 | ||
ec3d4607 | 13820 | #: builtin/commit.c:1651 |
ef317cd5 | 13821 | msgid "show what would be committed" |
07432cef | 13822 | msgstr "显示将要提交的内容" |
ef317cd5 | 13823 | |
ec3d4607 | 13824 | #: builtin/commit.c:1664 |
ef317cd5 | 13825 | msgid "amend previous commit" |
07432cef | 13826 | msgstr "修改先前的提交" |
ef317cd5 | 13827 | |
ec3d4607 | 13828 | #: builtin/commit.c:1665 |
ef317cd5 | 13829 | msgid "bypass post-rewrite hook" |
07432cef | 13830 | msgstr "绕过 post-rewrite 钩子" |
ef317cd5 | 13831 | |
ec3d4607 | 13832 | #: builtin/commit.c:1672 |
ef317cd5 | 13833 | msgid "ok to record an empty change" |
07432cef | 13834 | msgstr "允许一个空提交" |
ef317cd5 | 13835 | |
ec3d4607 | 13836 | #: builtin/commit.c:1674 |
ef317cd5 | 13837 | msgid "ok to record a change with an empty message" |
07432cef | 13838 | msgstr "允许空的提交说明" |
ef317cd5 | 13839 | |
ec3d4607 | 13840 | #: builtin/commit.c:1750 |
c04f5ac3 JX |
13841 | #, c-format |
13842 | msgid "Corrupt MERGE_HEAD file (%s)" | |
90e6ef53 | 13843 | msgstr "损坏的 MERGE_HEAD 文件(%s)" |
c04f5ac3 | 13844 | |
ec3d4607 | 13845 | #: builtin/commit.c:1757 |
c04f5ac3 | 13846 | msgid "could not read MERGE_MODE" |
90e6ef53 | 13847 | msgstr "不能读取 MERGE_MODE" |
c04f5ac3 | 13848 | |
ec3d4607 | 13849 | #: builtin/commit.c:1778 |
c04f5ac3 JX |
13850 | #, c-format |
13851 | msgid "could not read commit message: %s" | |
90e6ef53 | 13852 | msgstr "不能读取提交说明:%s" |
c04f5ac3 | 13853 | |
ec3d4607 | 13854 | #: builtin/commit.c:1785 |
c04f5ac3 JX |
13855 | #, c-format |
13856 | msgid "Aborting commit due to empty commit message.\n" | |
13857 | msgstr "终止提交因为提交说明为空。\n" | |
13858 | ||
ec3d4607 | 13859 | #: builtin/commit.c:1790 |
6937cb4e JX |
13860 | #, c-format |
13861 | msgid "Aborting commit; you did not edit the message.\n" | |
13862 | msgstr "终止提交;您未更改来自模版的提交说明。\n" | |
13863 | ||
ec3d4607 | 13864 | #: builtin/commit.c:1801 |
33b62fba JX |
13865 | #, c-format |
13866 | msgid "Aborting commit due to empty commit message body.\n" | |
7b4d4954 | 13867 | msgstr "因提交说明的正文为空而终止提交。\n" |
33b62fba | 13868 | |
ec3d4607 | 13869 | #: builtin/commit.c:1837 |
c04f5ac3 | 13870 | msgid "" |
c1ac5258 | 13871 | "repository has been updated, but unable to write\n" |
220c313c | 13872 | "new_index file. Check that disk is not full and quota is\n" |
a6cd2cc4 | 13873 | "not exceeded, and then \"git restore --staged :/\" to recover." |
c04f5ac3 | 13874 | msgstr "" |
a6cd2cc4 JX |
13875 | "仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n" |
13876 | "磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。" | |
c04f5ac3 | 13877 | |
4c27fcb5 | 13878 | #: builtin/config.c:11 |
814ff314 JX |
13879 | msgid "git config [<options>]" |
13880 | msgstr "git config [<选项>]" | |
ef317cd5 | 13881 | |
d13389bf | 13882 | #: builtin/config.c:109 builtin/env--helper.c:27 |
fd8cb379 JX |
13883 | #, c-format |
13884 | msgid "unrecognized --type argument, %s" | |
13885 | msgstr "未能识别的 --type 参数,%s" | |
13886 | ||
d13389bf | 13887 | #: builtin/config.c:121 |
c1ac5258 JX |
13888 | msgid "only one type at a time" |
13889 | msgstr "一次只能一个类型" | |
13890 | ||
d13389bf | 13891 | #: builtin/config.c:130 |
ef317cd5 | 13892 | msgid "Config file location" |
07432cef | 13893 | msgstr "配置文件位置" |
ef317cd5 | 13894 | |
d13389bf | 13895 | #: builtin/config.c:131 |
ef317cd5 | 13896 | msgid "use global config file" |
07432cef | 13897 | msgstr "使用全局配置文件" |
ef317cd5 | 13898 | |
d13389bf | 13899 | #: builtin/config.c:132 |
ef317cd5 | 13900 | msgid "use system config file" |
07432cef | 13901 | msgstr "使用系统级配置文件" |
ef317cd5 | 13902 | |
d13389bf | 13903 | #: builtin/config.c:133 |
ef317cd5 | 13904 | msgid "use repository config file" |
160fb2b2 | 13905 | msgstr "使用仓库级配置文件" |
ef317cd5 | 13906 | |
d13389bf | 13907 | #: builtin/config.c:134 |
4c27fcb5 JX |
13908 | msgid "use per-worktree config file" |
13909 | msgstr "使用工作区级别的配置文件" | |
13910 | ||
d13389bf | 13911 | #: builtin/config.c:135 |
ef317cd5 | 13912 | msgid "use given config file" |
07432cef | 13913 | msgstr "使用指定的配置文件" |
ef317cd5 | 13914 | |
d13389bf | 13915 | #: builtin/config.c:136 |
2e8451e8 | 13916 | msgid "blob-id" |
4375c10e | 13917 | msgstr "数据对象 ID" |
2e8451e8 | 13918 | |
d13389bf | 13919 | #: builtin/config.c:136 |
2e8451e8 JX |
13920 | msgid "read config from given blob object" |
13921 | msgstr "从给定的数据对象读取配置" | |
13922 | ||
d13389bf | 13923 | #: builtin/config.c:137 |
ef317cd5 | 13924 | msgid "Action" |
07432cef | 13925 | msgstr "操作" |
ef317cd5 | 13926 | |
d9488fea | 13927 | #: builtin/config.c:138 |
d13389bf JX |
13928 | msgid "get value: name [value-pattern]" |
13929 | msgstr "获取值:名称 [值模式]" | |
ef317cd5 | 13930 | |
d9488fea | 13931 | #: builtin/config.c:139 |
d13389bf JX |
13932 | msgid "get all values: key [value-pattern]" |
13933 | msgstr "获得所有的值:键 [值模式]" | |
90314792 | 13934 | |
d9488fea | 13935 | #: builtin/config.c:140 |
d13389bf JX |
13936 | msgid "get values for regexp: name-regex [value-pattern]" |
13937 | msgstr "根据正则表达式获得值:名称正则 [值模式]" | |
ef317cd5 | 13938 | |
d9488fea | 13939 | #: builtin/config.c:141 |
d13389bf JX |
13940 | msgid "get value specific for the URL: section[.var] URL" |
13941 | msgstr "获得 URL 取值:section[.var] URL" | |
ef317cd5 | 13942 | |
d9488fea | 13943 | #: builtin/config.c:142 |
d13389bf JX |
13944 | msgid "replace all matching variables: name value [value-pattern]" |
13945 | msgstr "替换所有匹配的变量:名称 值 [值模式]" | |
ef317cd5 | 13946 | |
d9488fea | 13947 | #: builtin/config.c:143 |
d13389bf JX |
13948 | msgid "add a new variable: name value" |
13949 | msgstr "添加一个新的变量:名称 值" | |
ef317cd5 | 13950 | |
d9488fea | 13951 | #: builtin/config.c:144 |
d13389bf JX |
13952 | msgid "remove a variable: name [value-pattern]" |
13953 | msgstr "删除一个变量:名称 [值模式]" | |
13954 | ||
13955 | #: builtin/config.c:145 | |
13956 | msgid "remove all matches: name [value-pattern]" | |
13957 | msgstr "删除所有匹配项:名称 [值模式]" | |
13958 | ||
13959 | #: builtin/config.c:146 | |
ef317cd5 | 13960 | msgid "rename section: old-name new-name" |
07432cef | 13961 | msgstr "重命名小节:old-name new-name" |
ef317cd5 | 13962 | |
d13389bf | 13963 | #: builtin/config.c:147 |
ef317cd5 | 13964 | msgid "remove a section: name" |
07432cef | 13965 | msgstr "删除一个小节:name" |
ef317cd5 | 13966 | |
d13389bf | 13967 | #: builtin/config.c:148 |
ef317cd5 | 13968 | msgid "list all" |
07432cef | 13969 | msgstr "列出所有" |
ef317cd5 | 13970 | |
d13389bf JX |
13971 | #: builtin/config.c:149 |
13972 | msgid "use string equality when comparing values to 'value-pattern'" | |
13973 | msgstr "在比较值与 '值模式' 时,使用字符串字面比较" | |
13974 | ||
13975 | #: builtin/config.c:150 | |
ef317cd5 | 13976 | msgid "open an editor" |
07432cef | 13977 | msgstr "打开一个编辑器" |
ef317cd5 | 13978 | |
d13389bf | 13979 | #: builtin/config.c:151 |
04cb2f28 JX |
13980 | msgid "find the color configured: slot [default]" |
13981 | msgstr "获得配置的颜色:配置 [默认]" | |
ef317cd5 | 13982 | |
d13389bf | 13983 | #: builtin/config.c:152 |
04cb2f28 JX |
13984 | msgid "find the color setting: slot [stdout-is-tty]" |
13985 | msgstr "获得颜色设置:配置 [stdout-is-tty]" | |
ef317cd5 | 13986 | |
d13389bf | 13987 | #: builtin/config.c:153 |
ef317cd5 | 13988 | msgid "Type" |
07432cef | 13989 | msgstr "类型" |
ef317cd5 | 13990 | |
d13389bf | 13991 | #: builtin/config.c:154 builtin/env--helper.c:43 |
fd8cb379 JX |
13992 | msgid "value is given this type" |
13993 | msgstr "取值为该类型" | |
13994 | ||
d13389bf | 13995 | #: builtin/config.c:155 |
ef317cd5 | 13996 | msgid "value is \"true\" or \"false\"" |
07432cef | 13997 | msgstr "值是 \"true\" 或 \"false\"" |
ef317cd5 | 13998 | |
d13389bf | 13999 | #: builtin/config.c:156 |
ef317cd5 | 14000 | msgid "value is decimal number" |
07432cef | 14001 | msgstr "值是十进制数" |
ef317cd5 | 14002 | |
d13389bf | 14003 | #: builtin/config.c:157 |
ef317cd5 | 14004 | msgid "value is --bool or --int" |
d9488fea | 14005 | msgstr "值是 --bool 或 --int" |
ef317cd5 | 14006 | |
d13389bf | 14007 | #: builtin/config.c:158 |
d9488fea JX |
14008 | msgid "value is --bool or string" |
14009 | msgstr "值是 --bool 或字符串" | |
14010 | ||
d13389bf | 14011 | #: builtin/config.c:159 |
ef317cd5 | 14012 | msgid "value is a path (file or directory name)" |
07432cef | 14013 | msgstr "值是一个路径(文件或目录名)" |
ef317cd5 | 14014 | |
d13389bf | 14015 | #: builtin/config.c:160 |
5809aa05 JX |
14016 | msgid "value is an expiry date" |
14017 | msgstr "值是一个到期日期" | |
14018 | ||
d13389bf | 14019 | #: builtin/config.c:161 |
ef317cd5 | 14020 | msgid "Other" |
07432cef | 14021 | msgstr "其它" |
ef317cd5 | 14022 | |
d13389bf | 14023 | #: builtin/config.c:162 |
ef317cd5 | 14024 | msgid "terminate values with NUL byte" |
4375c10e | 14025 | msgstr "终止值是 NUL 字节" |
ef317cd5 | 14026 | |
d13389bf | 14027 | #: builtin/config.c:163 |
1b7f4a34 JX |
14028 | msgid "show variable names only" |
14029 | msgstr "只显示变量名" | |
14030 | ||
d13389bf | 14031 | #: builtin/config.c:164 |
ef317cd5 | 14032 | msgid "respect include directives on lookup" |
07432cef | 14033 | msgstr "查询时参照 include 指令递归查找" |
ef317cd5 | 14034 | |
d13389bf | 14035 | #: builtin/config.c:165 |
276ceeaa JX |
14036 | msgid "show origin of config (file, standard input, blob, command line)" |
14037 | msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)" | |
14038 | ||
d13389bf | 14039 | #: builtin/config.c:166 |
2b472aae | 14040 | msgid "show scope of config (worktree, local, global, system, command)" |
440e7442 | 14041 | msgstr "显示配置的作用域(工作区、本地、全局、系统、命令)" |
2b472aae | 14042 | |
d13389bf | 14043 | #: builtin/config.c:167 builtin/env--helper.c:45 |
fd8cb379 JX |
14044 | msgid "value" |
14045 | msgstr "取值" | |
14046 | ||
d13389bf | 14047 | #: builtin/config.c:167 |
fd8cb379 JX |
14048 | msgid "with --get, use default value when missing entry" |
14049 | msgstr "使用 --get 参数,当缺少设置时使用默认值" | |
14050 | ||
d13389bf | 14051 | #: builtin/config.c:181 |
c1ac5258 JX |
14052 | #, c-format |
14053 | msgid "wrong number of arguments, should be %d" | |
14054 | msgstr "错误的参数个数,应该为 %d 个" | |
14055 | ||
d13389bf | 14056 | #: builtin/config.c:183 |
c1ac5258 JX |
14057 | #, c-format |
14058 | msgid "wrong number of arguments, should be from %d to %d" | |
14059 | msgstr "错误的参数个数,应该为从 %d 个到 %d 个" | |
14060 | ||
d13389bf | 14061 | #: builtin/config.c:339 |
c1ac5258 JX |
14062 | #, c-format |
14063 | msgid "invalid key pattern: %s" | |
14064 | msgstr "无效键名模式:%s" | |
14065 | ||
d13389bf | 14066 | #: builtin/config.c:377 |
fd8cb379 JX |
14067 | #, c-format |
14068 | msgid "failed to format default config value: %s" | |
c1ac5258 JX |
14069 | msgstr "格式化默认配置值失败:%s" |
14070 | ||
d13389bf | 14071 | #: builtin/config.c:441 |
c1ac5258 JX |
14072 | #, c-format |
14073 | msgid "cannot parse color '%s'" | |
14074 | msgstr "无法解析颜色 '%s'" | |
fd8cb379 | 14075 | |
d13389bf | 14076 | #: builtin/config.c:483 |
220c313c | 14077 | msgid "unable to parse default color value" |
c1ac5258 JX |
14078 | msgstr "无法解析默认颜色值" |
14079 | ||
d13389bf | 14080 | #: builtin/config.c:536 builtin/config.c:833 |
c1ac5258 JX |
14081 | msgid "not in a git directory" |
14082 | msgstr "不在 git 仓库中" | |
14083 | ||
d13389bf | 14084 | #: builtin/config.c:539 |
c1ac5258 JX |
14085 | msgid "writing to stdin is not supported" |
14086 | msgstr "不支持写到标准输入" | |
14087 | ||
d13389bf | 14088 | #: builtin/config.c:542 |
c1ac5258 JX |
14089 | msgid "writing config blobs is not supported" |
14090 | msgstr "不支持写到配置数据对象" | |
220c313c | 14091 | |
d13389bf | 14092 | #: builtin/config.c:627 |
220c313c JX |
14093 | #, c-format |
14094 | msgid "" | |
14095 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 14096 | "[user]\n" |
220c313c | 14097 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 14098 | "#\tname = %s\n" |
220c313c JX |
14099 | "#\temail = %s\n" |
14100 | msgstr "" | |
14101 | "# This is Git's per-user configuration file.\n" | |
7aea43ff | 14102 | "[user]\n" |
220c313c | 14103 | "# Please adapt and uncomment the following lines:\n" |
7aea43ff | 14104 | "#\tname = %s\n" |
220c313c JX |
14105 | "#\temail = %s\n" |
14106 | ||
d13389bf | 14107 | #: builtin/config.c:652 |
c1ac5258 JX |
14108 | msgid "only one config file at a time" |
14109 | msgstr "一次只能有一个配置文件" | |
14110 | ||
d13389bf | 14111 | #: builtin/config.c:658 |
a4f16749 | 14112 | msgid "--local can only be used inside a git repository" |
d9488fea | 14113 | msgstr "--local 只能在 git 仓库内使用" |
a4f16749 | 14114 | |
d13389bf | 14115 | #: builtin/config.c:660 |
fd8cb379 | 14116 | msgid "--blob can only be used inside a git repository" |
d9488fea JX |
14117 | msgstr "--blob 只能在 git 仓库内使用" |
14118 | ||
d13389bf | 14119 | #: builtin/config.c:662 |
d9488fea JX |
14120 | msgid "--worktree can only be used inside a git repository" |
14121 | msgstr "--worktree 只能在 git 仓库内使用" | |
fd8cb379 | 14122 | |
d13389bf | 14123 | #: builtin/config.c:684 |
c1ac5258 JX |
14124 | msgid "$HOME not set" |
14125 | msgstr "$HOME 未设置" | |
14126 | ||
d13389bf | 14127 | #: builtin/config.c:708 |
4c27fcb5 JX |
14128 | msgid "" |
14129 | "--worktree cannot be used with multiple working trees unless the config\n" | |
14130 | "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" | |
14131 | "section in \"git help worktree\" for details" | |
14132 | msgstr "" | |
14133 | "不能和多个工作区一起使用 --worktree,除非启用 worktreeConfig 配置扩展。\n" | |
14134 | "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" | |
14135 | ||
d13389bf | 14136 | #: builtin/config.c:743 |
c1ac5258 JX |
14137 | msgid "--get-color and variable type are incoherent" |
14138 | msgstr "--get-color 和变量类型不兼容" | |
14139 | ||
d13389bf | 14140 | #: builtin/config.c:748 |
c1ac5258 JX |
14141 | msgid "only one action at a time" |
14142 | msgstr "一次只能有一个动作" | |
14143 | ||
d13389bf | 14144 | #: builtin/config.c:761 |
c1ac5258 JX |
14145 | msgid "--name-only is only applicable to --list or --get-regexp" |
14146 | msgstr "--name-only 仅适用于 --list 或 --get-regexp" | |
14147 | ||
d13389bf | 14148 | #: builtin/config.c:767 |
c1ac5258 JX |
14149 | msgid "" |
14150 | "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" | |
14151 | "list" | |
14152 | msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" | |
14153 | ||
d13389bf | 14154 | #: builtin/config.c:773 |
c1ac5258 JX |
14155 | msgid "--default is only applicable to --get" |
14156 | msgstr "--default 仅适用于 --get" | |
14157 | ||
d13389bf JX |
14158 | #: builtin/config.c:806 |
14159 | msgid "--fixed-value only applies with 'value-pattern'" | |
14160 | msgstr "--fixed-value 仅适用于有 '值模式'" | |
14161 | ||
14162 | #: builtin/config.c:822 | |
c1ac5258 JX |
14163 | #, c-format |
14164 | msgid "unable to read config file '%s'" | |
14165 | msgstr "无法读取配置文件 '%s'" | |
14166 | ||
d13389bf | 14167 | #: builtin/config.c:825 |
c1ac5258 JX |
14168 | msgid "error processing config file(s)" |
14169 | msgstr "处理配置文件出错" | |
14170 | ||
d13389bf | 14171 | #: builtin/config.c:835 |
c1ac5258 JX |
14172 | msgid "editing stdin is not supported" |
14173 | msgstr "不支持编辑标准输入" | |
14174 | ||
d13389bf | 14175 | #: builtin/config.c:837 |
c1ac5258 JX |
14176 | msgid "editing blobs is not supported" |
14177 | msgstr "不支持编辑数据对象" | |
14178 | ||
d13389bf | 14179 | #: builtin/config.c:851 |
220c313c JX |
14180 | #, c-format |
14181 | msgid "cannot create configuration file %s" | |
14182 | msgstr "不能创建配置文件 %s" | |
14183 | ||
d13389bf | 14184 | #: builtin/config.c:864 |
a0b6b246 JX |
14185 | #, c-format |
14186 | msgid "" | |
14187 | "cannot overwrite multiple values with a single value\n" | |
14188 | " Use a regexp, --add or --replace-all to change %s." | |
14189 | msgstr "" | |
14190 | "无法用一个值覆盖多个值\n" | |
14191 | " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" | |
14192 | ||
d13389bf | 14193 | #: builtin/config.c:943 builtin/config.c:954 |
c1ac5258 JX |
14194 | #, c-format |
14195 | msgid "no such section: %s" | |
14196 | msgstr "无此小节:%s" | |
14197 | ||
fd8cb379 | 14198 | #: builtin/count-objects.c:90 |
4dcdc3d8 JX |
14199 | msgid "git count-objects [-v] [-H | --human-readable]" |
14200 | msgstr "git count-objects [-v] [-H | --human-readable]" | |
14201 | ||
fd8cb379 | 14202 | #: builtin/count-objects.c:100 |
4dcdc3d8 JX |
14203 | msgid "print sizes in human readable format" |
14204 | msgstr "以用户可读的格式显示大小" | |
ef317cd5 | 14205 | |
33b62fba | 14206 | #: builtin/credential-cache--daemon.c:227 |
d9488fea JX |
14207 | #, c-format |
14208 | msgid "" | |
14209 | "The permissions on your socket directory are too loose; other\n" | |
14210 | "users may be able to read your cached credentials. Consider running:\n" | |
14211 | "\n" | |
14212 | "\tchmod 0700 %s" | |
14213 | msgstr "" | |
14214 | "您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执" | |
14215 | "行:\n" | |
14216 | "\n" | |
14217 | "\tchmod 0700 %s" | |
14218 | ||
33b62fba | 14219 | #: builtin/credential-cache--daemon.c:276 |
d9488fea JX |
14220 | msgid "print debugging messages to stderr" |
14221 | msgstr "输出调试信息到标准错误" | |
14222 | ||
33b62fba | 14223 | #: builtin/credential-cache--daemon.c:316 |
d9488fea JX |
14224 | msgid "credential-cache--daemon unavailable; no unix socket support" |
14225 | msgstr "credential-cache--daemon 不可用,不支持 unix 套接字" | |
14226 | ||
14227 | #: builtin/credential-cache.c:154 | |
14228 | msgid "credential-cache unavailable; no unix socket support" | |
14229 | msgstr "credential-cache 不可用,不支持 unix 套接字" | |
14230 | ||
d13389bf JX |
14231 | #: builtin/credential-store.c:66 |
14232 | #, c-format | |
14233 | msgid "unable to get credential storage lock in %d ms" | |
14234 | msgstr "无法在 %d ms 获得凭证存储锁" | |
14235 | ||
a5cd71ca | 14236 | #: builtin/describe.c:26 |
814ff314 JX |
14237 | msgid "git describe [<options>] [<commit-ish>...]" |
14238 | msgstr "git describe [<选项>] [<提交号>...]" | |
ef317cd5 | 14239 | |
a5cd71ca | 14240 | #: builtin/describe.c:27 |
814ff314 JX |
14241 | msgid "git describe [<options>] --dirty" |
14242 | msgstr "git describe [<选项>] --dirty" | |
ef317cd5 | 14243 | |
349ede6a | 14244 | #: builtin/describe.c:63 |
87cb7997 JX |
14245 | msgid "head" |
14246 | msgstr "头" | |
14247 | ||
349ede6a | 14248 | #: builtin/describe.c:63 |
87cb7997 JX |
14249 | msgid "lightweight" |
14250 | msgstr "轻量级的" | |
14251 | ||
349ede6a | 14252 | #: builtin/describe.c:63 |
87cb7997 JX |
14253 | msgid "annotated" |
14254 | msgstr "附注的" | |
14255 | ||
349ede6a | 14256 | #: builtin/describe.c:277 |
c04f5ac3 JX |
14257 | #, c-format |
14258 | msgid "annotated tag %s not available" | |
55a16ee4 | 14259 | msgstr "附注标签 %s 无效" |
c04f5ac3 | 14260 | |
a5cd71ca | 14261 | #: builtin/describe.c:281 |
c04f5ac3 | 14262 | #, c-format |
349ede6a JX |
14263 | msgid "tag '%s' is externally known as '%s'" |
14264 | msgstr "标签 '%s' 在外部被认为是 '%s'" | |
c04f5ac3 | 14265 | |
349ede6a | 14266 | #: builtin/describe.c:328 |
c04f5ac3 JX |
14267 | #, c-format |
14268 | msgid "no tag exactly matches '%s'" | |
55a16ee4 | 14269 | msgstr "没有标签准确匹配 '%s'" |
c04f5ac3 | 14270 | |
349ede6a | 14271 | #: builtin/describe.c:330 |
c04f5ac3 | 14272 | #, c-format |
5809aa05 JX |
14273 | msgid "No exact match on refs or tags, searching to describe\n" |
14274 | msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n" | |
c04f5ac3 | 14275 | |
349ede6a | 14276 | #: builtin/describe.c:397 |
c04f5ac3 JX |
14277 | #, c-format |
14278 | msgid "finished search at %s\n" | |
14279 | msgstr "完成搜索 %s\n" | |
14280 | ||
349ede6a | 14281 | #: builtin/describe.c:424 |
c04f5ac3 JX |
14282 | #, c-format |
14283 | msgid "" | |
14284 | "No annotated tags can describe '%s'.\n" | |
14285 | "However, there were unannotated tags: try --tags." | |
14286 | msgstr "" | |
55a16ee4 RC |
14287 | "没有附注标签能描述 '%s'。\n" |
14288 | "然而,存在未附注标签:尝试 --tags。" | |
c04f5ac3 | 14289 | |
349ede6a | 14290 | #: builtin/describe.c:428 |
c04f5ac3 JX |
14291 | #, c-format |
14292 | msgid "" | |
14293 | "No tags can describe '%s'.\n" | |
14294 | "Try --always, or create some tags." | |
14295 | msgstr "" | |
55a16ee4 RC |
14296 | "没有标签能描述 '%s'。\n" |
14297 | "尝试 --always,或者创建一些标签。" | |
c04f5ac3 | 14298 | |
349ede6a | 14299 | #: builtin/describe.c:458 |
c04f5ac3 JX |
14300 | #, c-format |
14301 | msgid "traversed %lu commits\n" | |
14302 | msgstr "已遍历 %lu 个提交\n" | |
14303 | ||
349ede6a | 14304 | #: builtin/describe.c:461 |
c04f5ac3 JX |
14305 | #, c-format |
14306 | msgid "" | |
14307 | "more than %i tags found; listed %i most recent\n" | |
14308 | "gave up search at %s\n" | |
14309 | msgstr "" | |
55a16ee4 | 14310 | "发现多于 %i 个标签,列出最近的 %i 个\n" |
90e6ef53 | 14311 | "在 %s 放弃搜索\n" |
c04f5ac3 | 14312 | |
349ede6a | 14313 | #: builtin/describe.c:529 |
5809aa05 JX |
14314 | #, c-format |
14315 | msgid "describe %s\n" | |
14316 | msgstr "描述 %s\n" | |
14317 | ||
349ede6a | 14318 | #: builtin/describe.c:532 |
5809aa05 JX |
14319 | #, c-format |
14320 | msgid "Not a valid object name %s" | |
14321 | msgstr "不是一个有效的对象名 %s" | |
14322 | ||
349ede6a | 14323 | #: builtin/describe.c:540 |
5809aa05 JX |
14324 | #, c-format |
14325 | msgid "%s is neither a commit nor blob" | |
14326 | msgstr "%s 既不是提交也不是数据对象" | |
14327 | ||
349ede6a | 14328 | #: builtin/describe.c:554 |
ef317cd5 | 14329 | msgid "find the tag that comes after the commit" |
55a16ee4 | 14330 | msgstr "寻找该提交之后的标签" |
ef317cd5 | 14331 | |
349ede6a | 14332 | #: builtin/describe.c:555 |
ef317cd5 | 14333 | msgid "debug search strategy on stderr" |
07432cef | 14334 | msgstr "在标准错误上调试搜索策略" |
ef317cd5 | 14335 | |
349ede6a | 14336 | #: builtin/describe.c:556 |
1003b3a5 JX |
14337 | msgid "use any ref" |
14338 | msgstr "使用任意引用" | |
14339 | ||
349ede6a | 14340 | #: builtin/describe.c:557 |
1003b3a5 | 14341 | msgid "use any tag, even unannotated" |
55a16ee4 | 14342 | msgstr "使用任意标签,即使未附带注释" |
ef317cd5 | 14343 | |
349ede6a | 14344 | #: builtin/describe.c:558 |
ef317cd5 | 14345 | msgid "always use long format" |
07432cef | 14346 | msgstr "始终使用长提交号格式" |
ef317cd5 | 14347 | |
349ede6a | 14348 | #: builtin/describe.c:559 |
2e8451e8 JX |
14349 | msgid "only follow first parent" |
14350 | msgstr "只跟随第一个父提交" | |
14351 | ||
349ede6a | 14352 | #: builtin/describe.c:562 |
ef317cd5 | 14353 | msgid "only output exact matches" |
07432cef | 14354 | msgstr "只输出精确匹配" |
ef317cd5 | 14355 | |
349ede6a | 14356 | #: builtin/describe.c:564 |
ef317cd5 | 14357 | msgid "consider <n> most recent tags (default: 10)" |
55a16ee4 | 14358 | msgstr "考虑最近 <n> 个标签(默认:10)" |
ef317cd5 | 14359 | |
349ede6a | 14360 | #: builtin/describe.c:566 |
ef317cd5 | 14361 | msgid "only consider tags matching <pattern>" |
55a16ee4 | 14362 | msgstr "只考虑匹配 <模式> 的标签" |
ef317cd5 | 14363 | |
349ede6a | 14364 | #: builtin/describe.c:568 |
87cb7997 JX |
14365 | msgid "do not consider tags matching <pattern>" |
14366 | msgstr "不考虑匹配 <模式> 的标签" | |
14367 | ||
349ede6a | 14368 | #: builtin/describe.c:570 builtin/name-rev.c:535 |
ef317cd5 | 14369 | msgid "show abbreviated commit object as fallback" |
07432cef | 14370 | msgstr "显示简写的提交号作为后备" |
ef317cd5 | 14371 | |
349ede6a | 14372 | #: builtin/describe.c:571 builtin/describe.c:574 |
ef317cd5 | 14373 | msgid "mark" |
07432cef | 14374 | msgstr "标记" |
ef317cd5 | 14375 | |
349ede6a | 14376 | #: builtin/describe.c:572 |
ef317cd5 | 14377 | msgid "append <mark> on dirty working tree (default: \"-dirty\")" |
160fb2b2 | 14378 | msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")" |
ef317cd5 | 14379 | |
349ede6a | 14380 | #: builtin/describe.c:575 |
87cb7997 JX |
14381 | msgid "append <mark> on broken working tree (default: \"-broken\")" |
14382 | msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\")" | |
14383 | ||
349ede6a | 14384 | #: builtin/describe.c:593 |
c04f5ac3 JX |
14385 | msgid "--long is incompatible with --abbrev=0" |
14386 | msgstr "--long 与 --abbrev=0 不兼容" | |
14387 | ||
349ede6a | 14388 | #: builtin/describe.c:622 |
c04f5ac3 | 14389 | msgid "No names found, cannot describe anything." |
90e6ef53 | 14390 | msgstr "没有发现名称,无法描述任何东西。" |
c04f5ac3 | 14391 | |
349ede6a | 14392 | #: builtin/describe.c:673 |
a8a5406a | 14393 | msgid "--dirty is incompatible with commit-ishes" |
87cb7997 JX |
14394 | msgstr "--dirty 与提交号不兼容" |
14395 | ||
349ede6a | 14396 | #: builtin/describe.c:675 |
87cb7997 JX |
14397 | msgid "--broken is incompatible with commit-ishes" |
14398 | msgstr "--broken 与提交号不兼容" | |
c04f5ac3 | 14399 | |
d13389bf JX |
14400 | #: builtin/diff-tree.c:155 |
14401 | msgid "--stdin and --merge-base are mutually exclusive" | |
14402 | msgstr "--stdin 和 --merge-base 是互斥的" | |
14403 | ||
14404 | #: builtin/diff-tree.c:157 | |
14405 | msgid "--merge-base only works with two commits" | |
14406 | msgstr "--merge-base 仅适用于两个提交" | |
14407 | ||
473eb541 | 14408 | #: builtin/diff.c:92 |
c04f5ac3 JX |
14409 | #, c-format |
14410 | msgid "'%s': not a regular file or symlink" | |
14411 | msgstr "'%s':不是一个正规文件或符号链接" | |
14412 | ||
473eb541 | 14413 | #: builtin/diff.c:259 |
c04f5ac3 JX |
14414 | #, c-format |
14415 | msgid "invalid option: %s" | |
14416 | msgstr "无效选项:%s" | |
14417 | ||
473eb541 | 14418 | #: builtin/diff.c:376 |
7157c2b5 JX |
14419 | #, c-format |
14420 | msgid "%s...%s: no merge base" | |
14421 | msgstr "%s...%s:无合并基线" | |
14422 | ||
473eb541 | 14423 | #: builtin/diff.c:486 |
c04f5ac3 | 14424 | msgid "Not a git repository" |
d9488fea | 14425 | msgstr "不是 git 仓库" |
c04f5ac3 | 14426 | |
33b62fba | 14427 | #: builtin/diff.c:532 builtin/grep.c:684 |
c04f5ac3 JX |
14428 | #, c-format |
14429 | msgid "invalid object '%s' given." | |
14430 | msgstr "提供了无效对象 '%s'。" | |
14431 | ||
473eb541 | 14432 | #: builtin/diff.c:543 |
c04f5ac3 JX |
14433 | #, c-format |
14434 | msgid "more than two blobs given: '%s'" | |
160fb2b2 | 14435 | msgstr "提供了超过两个数据对象:'%s'" |
c04f5ac3 | 14436 | |
473eb541 | 14437 | #: builtin/diff.c:548 |
c04f5ac3 JX |
14438 | #, c-format |
14439 | msgid "unhandled object '%s' given." | |
6c94aba5 | 14440 | msgstr "无法处理的对象 '%s'。" |
c04f5ac3 | 14441 | |
473eb541 | 14442 | #: builtin/diff.c:582 |
7157c2b5 JX |
14443 | #, c-format |
14444 | msgid "%s...%s: multiple merge bases, using %s" | |
14445 | msgstr "%s...%s:多条合并基线,使用 %s" | |
14446 | ||
33b62fba | 14447 | #: builtin/difftool.c:31 |
1a79b2f1 JX |
14448 | msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" |
14449 | msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" | |
14450 | ||
33b62fba | 14451 | #: builtin/difftool.c:261 |
1a79b2f1 JX |
14452 | #, c-format |
14453 | msgid "failed: %d" | |
14454 | msgstr "失败:%d" | |
14455 | ||
33b62fba | 14456 | #: builtin/difftool.c:303 |
87cb7997 JX |
14457 | #, c-format |
14458 | msgid "could not read symlink %s" | |
14459 | msgstr "无法读取符号链接 %s" | |
14460 | ||
33b62fba | 14461 | #: builtin/difftool.c:305 |
87cb7997 JX |
14462 | #, c-format |
14463 | msgid "could not read symlink file %s" | |
14464 | msgstr "无法读取符号链接文件 %s" | |
14465 | ||
33b62fba | 14466 | #: builtin/difftool.c:313 |
87cb7997 JX |
14467 | #, c-format |
14468 | msgid "could not read object %s for symlink %s" | |
14469 | msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" | |
14470 | ||
33b62fba | 14471 | #: builtin/difftool.c:413 |
1a79b2f1 JX |
14472 | msgid "" |
14473 | "combined diff formats('-c' and '--cc') are not supported in\n" | |
14474 | "directory diff mode('-d' and '--dir-diff')." | |
87cb7997 JX |
14475 | msgstr "" |
14476 | "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" | |
14477 | "cc')。" | |
1a79b2f1 | 14478 | |
33b62fba | 14479 | #: builtin/difftool.c:637 |
1a79b2f1 JX |
14480 | #, c-format |
14481 | msgid "both files modified: '%s' and '%s'." | |
14482 | msgstr "两个文件都被修改:'%s' 和 '%s'。" | |
14483 | ||
33b62fba | 14484 | #: builtin/difftool.c:639 |
1a79b2f1 JX |
14485 | msgid "working tree file has been left." |
14486 | msgstr "工作区文件被留了下来。" | |
14487 | ||
33b62fba | 14488 | #: builtin/difftool.c:650 |
1a79b2f1 JX |
14489 | #, c-format |
14490 | msgid "temporary files exist in '%s'." | |
14491 | msgstr "临时文件存在于 '%s'。" | |
14492 | ||
33b62fba | 14493 | #: builtin/difftool.c:651 |
1a79b2f1 JX |
14494 | msgid "you may want to cleanup or recover these." |
14495 | msgstr "您可能想要清理或者恢复它们。" | |
14496 | ||
ec3d4607 | 14497 | #: builtin/difftool.c:699 |
1a79b2f1 JX |
14498 | msgid "use `diff.guitool` instead of `diff.tool`" |
14499 | msgstr "使用 `diff.guitool` 代替 `diff.tool`" | |
14500 | ||
ec3d4607 | 14501 | #: builtin/difftool.c:701 |
1a79b2f1 JX |
14502 | msgid "perform a full-directory diff" |
14503 | msgstr "执行一个全目录差异比较" | |
14504 | ||
ec3d4607 | 14505 | #: builtin/difftool.c:703 |
1a79b2f1 JX |
14506 | msgid "do not prompt before launching a diff tool" |
14507 | msgstr "启动差异比较工具之前不提示" | |
14508 | ||
ec3d4607 | 14509 | #: builtin/difftool.c:708 |
1a79b2f1 JX |
14510 | msgid "use symlinks in dir-diff mode" |
14511 | msgstr "在 dir-diff 模式中使用符号链接" | |
14512 | ||
ec3d4607 | 14513 | #: builtin/difftool.c:709 |
c1ac5258 JX |
14514 | msgid "tool" |
14515 | msgstr "工具" | |
14516 | ||
ec3d4607 | 14517 | #: builtin/difftool.c:710 |
1a79b2f1 JX |
14518 | msgid "use the specified diff tool" |
14519 | msgstr "使用指定的差异比较工具" | |
14520 | ||
ec3d4607 | 14521 | #: builtin/difftool.c:712 |
1a79b2f1 JX |
14522 | msgid "print a list of diff tools that may be used with `--tool`" |
14523 | msgstr "显示可以用在 `--tool` 参数后的差异工具列表" | |
14524 | ||
ec3d4607 | 14525 | #: builtin/difftool.c:715 |
1a79b2f1 JX |
14526 | msgid "" |
14527 | "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " | |
14528 | "code" | |
14529 | msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" | |
14530 | ||
ec3d4607 | 14531 | #: builtin/difftool.c:718 |
1a79b2f1 JX |
14532 | msgid "specify a custom command for viewing diffs" |
14533 | msgstr "指定一个用于查看差异的自定义命令" | |
14534 | ||
ec3d4607 | 14535 | #: builtin/difftool.c:719 |
d46c5519 JX |
14536 | msgid "passed to `diff`" |
14537 | msgstr "传递给 `diff`" | |
14538 | ||
ec3d4607 | 14539 | #: builtin/difftool.c:734 |
d46c5519 JX |
14540 | msgid "difftool requires worktree or --no-index" |
14541 | msgstr "difftool 要求工作区或者 --no-index" | |
14542 | ||
ec3d4607 | 14543 | #: builtin/difftool.c:741 |
d46c5519 JX |
14544 | msgid "--dir-diff is incompatible with --no-index" |
14545 | msgstr "--dir-diff 和 --no-index 不兼容" | |
14546 | ||
ec3d4607 | 14547 | #: builtin/difftool.c:744 |
d46c5519 JX |
14548 | msgid "--gui, --tool and --extcmd are mutually exclusive" |
14549 | msgstr "--gui、--tool 和 --extcmd 互斥" | |
14550 | ||
ec3d4607 | 14551 | #: builtin/difftool.c:752 |
1a79b2f1 JX |
14552 | msgid "no <tool> given for --tool=<tool>" |
14553 | msgstr "没有为 --tool=<工具> 参数提供 <工具>" | |
14554 | ||
ec3d4607 | 14555 | #: builtin/difftool.c:759 |
1a79b2f1 JX |
14556 | msgid "no <cmd> given for --extcmd=<cmd>" |
14557 | msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" | |
14558 | ||
a6cd2cc4 JX |
14559 | #: builtin/env--helper.c:6 |
14560 | msgid "git env--helper --type=[bool|ulong] <options> <env-var>" | |
14561 | msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" | |
14562 | ||
d9488fea | 14563 | #: builtin/env--helper.c:42 builtin/hash-object.c:98 |
a6cd2cc4 JX |
14564 | msgid "type" |
14565 | msgstr "类型" | |
14566 | ||
d9488fea | 14567 | #: builtin/env--helper.c:46 |
a6cd2cc4 JX |
14568 | msgid "default for git_env_*(...) to fall back on" |
14569 | msgstr "git_env_*(...) 的默认值" | |
14570 | ||
d9488fea | 14571 | #: builtin/env--helper.c:48 |
a6cd2cc4 JX |
14572 | msgid "be quiet only use git_env_*() value as exit code" |
14573 | msgstr "安静模式,只使用 git_env_*() 的值作为退出码" | |
14574 | ||
d9488fea | 14575 | #: builtin/env--helper.c:67 |
a6cd2cc4 JX |
14576 | #, c-format |
14577 | msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" | |
ec3d4607 | 14578 | msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值,不是 `%s`" |
a6cd2cc4 | 14579 | |
d9488fea | 14580 | #: builtin/env--helper.c:82 |
a6cd2cc4 JX |
14581 | #, c-format |
14582 | msgid "" | |
14583 | "option `--default' expects an unsigned long value with `--type=ulong`, not `" | |
14584 | "%s`" | |
ec3d4607 | 14585 | msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型,不是 `%s`" |
a6cd2cc4 | 14586 | |
c1ac5258 | 14587 | #: builtin/fast-export.c:29 |
ef317cd5 | 14588 | msgid "git fast-export [rev-list-opts]" |
07432cef | 14589 | msgstr "git fast-export [rev-list-opts]" |
ef317cd5 | 14590 | |
7157c2b5 | 14591 | #: builtin/fast-export.c:868 |
a5cd71ca JX |
14592 | msgid "Error: Cannot export nested tags unless --mark-tags is specified." |
14593 | msgstr "错误:除非指定 --mark-tags,否则无法导出嵌套标签。" | |
14594 | ||
d13389bf | 14595 | #: builtin/fast-export.c:1177 |
7157c2b5 JX |
14596 | msgid "--anonymize-map token cannot be empty" |
14597 | msgstr "--anonymize-map 取值不能为空" | |
14598 | ||
d13389bf | 14599 | #: builtin/fast-export.c:1197 |
ef317cd5 | 14600 | msgid "show progress after <n> objects" |
07432cef | 14601 | msgstr "在 <n> 个对象之后显示进度" |
ef317cd5 | 14602 | |
d13389bf | 14603 | #: builtin/fast-export.c:1199 |
ef317cd5 | 14604 | msgid "select handling of signed tags" |
55a16ee4 | 14605 | msgstr "选择如何处理签名标签" |
ef317cd5 | 14606 | |
d13389bf | 14607 | #: builtin/fast-export.c:1202 |
ef317cd5 | 14608 | msgid "select handling of tags that tag filtered objects" |
55a16ee4 | 14609 | msgstr "选择当标签指向被过滤对象时该标签的处理方式" |
ef317cd5 | 14610 | |
d13389bf | 14611 | #: builtin/fast-export.c:1205 |
a6cd2cc4 JX |
14612 | msgid "select handling of commit messages in an alternate encoding" |
14613 | msgstr "选择使用备用编码处理提交说明" | |
14614 | ||
d13389bf | 14615 | #: builtin/fast-export.c:1208 |
473eb541 | 14616 | msgid "dump marks to this file" |
07432cef | 14617 | msgstr "把标记存储到这个文件" |
ef317cd5 | 14618 | |
d13389bf | 14619 | #: builtin/fast-export.c:1210 |
473eb541 | 14620 | msgid "import marks from this file" |
07432cef | 14621 | msgstr "从这个文件导入标记" |
ef317cd5 | 14622 | |
d13389bf | 14623 | #: builtin/fast-export.c:1214 |
473eb541 JX |
14624 | msgid "import marks from this file if it exists" |
14625 | msgstr "如果文件存在,从该文件导入标记" | |
a5cd71ca | 14626 | |
d13389bf | 14627 | #: builtin/fast-export.c:1216 |
473eb541 JX |
14628 | msgid "fake a tagger when tags lack one" |
14629 | msgstr "当标签缺少标记人字段时,假装提供一个" | |
ef317cd5 | 14630 | |
d13389bf | 14631 | #: builtin/fast-export.c:1218 |
473eb541 | 14632 | msgid "output full tree for each commit" |
07432cef | 14633 | msgstr "每次提交都输出整个树" |
ef317cd5 | 14634 | |
d13389bf | 14635 | #: builtin/fast-export.c:1220 |
473eb541 | 14636 | msgid "use the done feature to terminate the stream" |
07432cef | 14637 | msgstr "使用 done 功能来终止流" |
ef317cd5 | 14638 | |
d13389bf | 14639 | #: builtin/fast-export.c:1221 |
473eb541 | 14640 | msgid "skip output of blob data" |
07432cef | 14641 | msgstr "跳过数据对象的输出" |
ef317cd5 | 14642 | |
ec3d4607 | 14643 | #: builtin/fast-export.c:1222 builtin/log.c:1826 |
6acbf033 | 14644 | msgid "refspec" |
160fb2b2 | 14645 | msgstr "引用规格" |
6acbf033 | 14646 | |
d13389bf | 14647 | #: builtin/fast-export.c:1223 |
473eb541 | 14648 | msgid "apply refspec to exported refs" |
160fb2b2 | 14649 | msgstr "对导出的引用应用引用规格" |
6acbf033 | 14650 | |
d13389bf | 14651 | #: builtin/fast-export.c:1224 |
220c313c JX |
14652 | msgid "anonymize output" |
14653 | msgstr "匿名输出" | |
14654 | ||
d13389bf | 14655 | #: builtin/fast-export.c:1225 |
7157c2b5 JX |
14656 | msgid "from:to" |
14657 | msgstr "from:to" | |
14658 | ||
d13389bf | 14659 | #: builtin/fast-export.c:1226 |
7157c2b5 JX |
14660 | msgid "convert <from> to <to> in anonymized output" |
14661 | msgstr "在匿名输出中将 <from> 转换为 <to>" | |
14662 | ||
d13389bf | 14663 | #: builtin/fast-export.c:1229 |
473eb541 | 14664 | msgid "reference parents which are not in fast-export stream by object id" |
5b533632 | 14665 | msgstr "引用父对象 ID 不在 fast-export 流中" |
06991777 | 14666 | |
d13389bf | 14667 | #: builtin/fast-export.c:1231 |
473eb541 | 14668 | msgid "show original object ids of blobs/commits" |
5b533632 | 14669 | msgstr "显示数据对象/提交的原始对象 ID" |
06991777 | 14670 | |
d13389bf | 14671 | #: builtin/fast-export.c:1233 |
473eb541 | 14672 | msgid "label tags with mark ids" |
a5cd71ca JX |
14673 | msgstr "对带有标记 ID 的标签做标记" |
14674 | ||
d13389bf | 14675 | #: builtin/fast-export.c:1256 |
7157c2b5 JX |
14676 | msgid "--anonymize-map without --anonymize does not make sense" |
14677 | msgstr "--anonymize-map 而没有 --anonymize 没有意义" | |
14678 | ||
d13389bf | 14679 | #: builtin/fast-export.c:1271 |
a5cd71ca JX |
14680 | msgid "Cannot pass both --import-marks and --import-marks-if-exists" |
14681 | msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" | |
14682 | ||
d13389bf | 14683 | #: builtin/fast-import.c:3088 |
d9488fea JX |
14684 | #, c-format |
14685 | msgid "Missing from marks for submodule '%s'" | |
14686 | msgstr "子模组 '%s' 缺少 from 标记" | |
14687 | ||
d13389bf | 14688 | #: builtin/fast-import.c:3090 |
d9488fea JX |
14689 | #, c-format |
14690 | msgid "Missing to marks for submodule '%s'" | |
14691 | msgstr "子模组 '%s' 缺少 to 标记" | |
14692 | ||
d13389bf | 14693 | #: builtin/fast-import.c:3225 |
d9488fea JX |
14694 | #, c-format |
14695 | msgid "Expected 'mark' command, got %s" | |
14696 | msgstr "预期 'mark' 命令,得到 %s" | |
14697 | ||
d13389bf | 14698 | #: builtin/fast-import.c:3230 |
d9488fea JX |
14699 | #, c-format |
14700 | msgid "Expected 'to' command, got %s" | |
14701 | msgstr "预期 'to' 命令,得到 %s" | |
14702 | ||
d13389bf | 14703 | #: builtin/fast-import.c:3322 |
d9488fea JX |
14704 | msgid "Expected format name:filename for submodule rewrite option" |
14705 | msgstr "子模组重写选项的预期格式为 name:filename" | |
14706 | ||
d13389bf | 14707 | #: builtin/fast-import.c:3377 |
d9488fea JX |
14708 | #, c-format |
14709 | msgid "feature '%s' forbidden in input without --allow-unsafe-features" | |
14710 | msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" | |
14711 | ||
473eb541 | 14712 | #: builtin/fetch-pack.c:242 |
7157c2b5 JX |
14713 | #, c-format |
14714 | msgid "Lockfile created but not reported: %s" | |
14715 | msgstr "Lockfile 已创建但未报告:%s" | |
14716 | ||
349ede6a | 14717 | #: builtin/fetch.c:35 |
ef317cd5 | 14718 | msgid "git fetch [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 14719 | msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" |
ef317cd5 | 14720 | |
349ede6a | 14721 | #: builtin/fetch.c:36 |
ef317cd5 | 14722 | msgid "git fetch [<options>] <group>" |
07432cef | 14723 | msgstr "git fetch [<选项>] <组>" |
ef317cd5 | 14724 | |
349ede6a | 14725 | #: builtin/fetch.c:37 |
ef317cd5 | 14726 | msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" |
160fb2b2 | 14727 | msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" |
ef317cd5 | 14728 | |
349ede6a | 14729 | #: builtin/fetch.c:38 |
ef317cd5 | 14730 | msgid "git fetch --all [<options>]" |
07432cef | 14731 | msgstr "git fetch --all [<选项>]" |
ef317cd5 | 14732 | |
33b62fba | 14733 | #: builtin/fetch.c:122 |
a5cd71ca JX |
14734 | msgid "fetch.parallel cannot be negative" |
14735 | msgstr "fetch.parallel 不能为负数" | |
14736 | ||
33b62fba | 14737 | #: builtin/fetch.c:145 builtin/pull.c:185 |
ef317cd5 | 14738 | msgid "fetch from all remotes" |
07432cef | 14739 | msgstr "从所有的远程抓取" |
ef317cd5 | 14740 | |
33b62fba | 14741 | #: builtin/fetch.c:147 builtin/pull.c:245 |
a5cd71ca JX |
14742 | msgid "set upstream for git pull/fetch" |
14743 | msgstr "为 git pull/fetch 设置上游" | |
14744 | ||
33b62fba | 14745 | #: builtin/fetch.c:149 builtin/pull.c:188 |
ef317cd5 | 14746 | msgid "append to .git/FETCH_HEAD instead of overwriting" |
07432cef | 14747 | msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" |
ef317cd5 | 14748 | |
33b62fba | 14749 | #: builtin/fetch.c:151 |
473eb541 JX |
14750 | msgid "use atomic transaction to update references" |
14751 | msgstr "使用原子事务更新引用" | |
14752 | ||
33b62fba | 14753 | #: builtin/fetch.c:153 builtin/pull.c:191 |
ef317cd5 | 14754 | msgid "path to upload pack on remote end" |
07432cef | 14755 | msgstr "上传包到远程的路径" |
ef317cd5 | 14756 | |
33b62fba | 14757 | #: builtin/fetch.c:154 |
4c27fcb5 JX |
14758 | msgid "force overwrite of local reference" |
14759 | msgstr "强制覆盖本地引用" | |
ef317cd5 | 14760 | |
33b62fba | 14761 | #: builtin/fetch.c:156 |
ef317cd5 | 14762 | msgid "fetch from multiple remotes" |
07432cef | 14763 | msgstr "从多个远程抓取" |
ef317cd5 | 14764 | |
33b62fba | 14765 | #: builtin/fetch.c:158 builtin/pull.c:195 |
ef317cd5 | 14766 | msgid "fetch all tags and associated objects" |
55a16ee4 | 14767 | msgstr "抓取所有的标签和关联对象" |
ef317cd5 | 14768 | |
33b62fba | 14769 | #: builtin/fetch.c:160 |
ef317cd5 | 14770 | msgid "do not fetch all tags (--no-tags)" |
55a16ee4 | 14771 | msgstr "不抓取任何标签(--no-tags)" |
ef317cd5 | 14772 | |
33b62fba | 14773 | #: builtin/fetch.c:162 |
276ceeaa JX |
14774 | msgid "number of submodules fetched in parallel" |
14775 | msgstr "子模组获取的并发数" | |
14776 | ||
33b62fba JX |
14777 | #: builtin/fetch.c:164 |
14778 | msgid "modify the refspec to place all refs within refs/prefetch/" | |
14779 | msgstr "修改引用规格以将所有引用放入 refs/prefetch/" | |
14780 | ||
14781 | #: builtin/fetch.c:166 builtin/pull.c:198 | |
ef317cd5 | 14782 | msgid "prune remote-tracking branches no longer on remote" |
07432cef | 14783 | msgstr "清除远程已经不存在的分支的跟踪分支" |
ef317cd5 | 14784 | |
33b62fba | 14785 | #: builtin/fetch.c:168 |
31e5e17b JX |
14786 | msgid "prune local tags no longer on remote and clobber changed tags" |
14787 | msgstr "清除远程不存在的本地标签,并且替换变更标签" | |
14788 | ||
07432cef | 14789 | # 译者:可选值,不能翻译 |
33b62fba | 14790 | #: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 |
ef317cd5 | 14791 | msgid "on-demand" |
07432cef | 14792 | msgstr "on-demand" |
ef317cd5 | 14793 | |
33b62fba | 14794 | #: builtin/fetch.c:170 |
ef317cd5 | 14795 | msgid "control recursive fetching of submodules" |
07432cef | 14796 | msgstr "控制子模组的递归抓取" |
ef317cd5 | 14797 | |
33b62fba | 14798 | #: builtin/fetch.c:175 |
d9488fea JX |
14799 | msgid "write fetched references to the FETCH_HEAD file" |
14800 | msgstr "将获取到的引用写入 FETCH_HEAD 文件" | |
14801 | ||
33b62fba | 14802 | #: builtin/fetch.c:176 builtin/pull.c:206 |
ef317cd5 | 14803 | msgid "keep downloaded pack" |
07432cef | 14804 | msgstr "保持下载包" |
ef317cd5 | 14805 | |
33b62fba | 14806 | #: builtin/fetch.c:178 |
ef317cd5 | 14807 | msgid "allow updating of HEAD ref" |
07432cef | 14808 | msgstr "允许更新 HEAD 引用" |
ef317cd5 | 14809 | |
33b62fba | 14810 | #: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 |
349ede6a | 14811 | #: builtin/pull.c:218 |
ef317cd5 | 14812 | msgid "deepen history of shallow clone" |
07432cef | 14813 | msgstr "深化浅克隆的历史" |
ef317cd5 | 14814 | |
33b62fba | 14815 | #: builtin/fetch.c:183 builtin/pull.c:212 |
a0b6b246 JX |
14816 | msgid "deepen history of shallow repository based on time" |
14817 | msgstr "基于时间来深化浅克隆的历史" | |
14818 | ||
33b62fba | 14819 | #: builtin/fetch.c:189 builtin/pull.c:221 |
a77c07d9 | 14820 | msgid "convert to a complete repository" |
160fb2b2 | 14821 | msgstr "转换为一个完整的仓库" |
a77c07d9 | 14822 | |
33b62fba | 14823 | #: builtin/fetch.c:192 |
ef317cd5 | 14824 | msgid "prepend this to submodule path output" |
07432cef | 14825 | msgstr "在子模组路径输出的前面加上此目录" |
ef317cd5 | 14826 | |
33b62fba | 14827 | #: builtin/fetch.c:195 |
a4f16749 JX |
14828 | msgid "" |
14829 | "default for recursive fetching of submodules (lower priority than config " | |
14830 | "files)" | |
14831 | msgstr "递归获取子模组的缺省值(比配置文件优先级低)" | |
ef317cd5 | 14832 | |
33b62fba | 14833 | #: builtin/fetch.c:199 builtin/pull.c:224 |
cfff71a9 JX |
14834 | msgid "accept refs that update .git/shallow" |
14835 | msgstr "接受更新 .git/shallow 的引用" | |
14836 | ||
33b62fba | 14837 | #: builtin/fetch.c:200 builtin/pull.c:226 |
6acbf033 JX |
14838 | msgid "refmap" |
14839 | msgstr "引用映射" | |
14840 | ||
33b62fba | 14841 | #: builtin/fetch.c:201 builtin/pull.c:227 |
6acbf033 JX |
14842 | msgid "specify fetch refmap" |
14843 | msgstr "指定获取操作的引用映射" | |
14844 | ||
33b62fba | 14845 | #: builtin/fetch.c:208 builtin/pull.c:240 |
c1ac5258 JX |
14846 | msgid "report that we have only objects reachable from this object" |
14847 | msgstr "报告我们只拥有从该对象开始可达的对象" | |
14848 | ||
33b62fba JX |
14849 | #: builtin/fetch.c:210 |
14850 | msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" | |
14851 | msgstr "不获取包文件;而是打印协商的祖先提交" | |
14852 | ||
14853 | #: builtin/fetch.c:213 builtin/fetch.c:215 | |
d9488fea JX |
14854 | msgid "run 'maintenance --auto' after fetching" |
14855 | msgstr "获取后执行 'maintenance --auto'" | |
a6cd2cc4 | 14856 | |
33b62fba | 14857 | #: builtin/fetch.c:217 builtin/pull.c:243 |
a6cd2cc4 JX |
14858 | msgid "check for forced-updates on all updated branches" |
14859 | msgstr "在所有更新分支上检查强制更新" | |
14860 | ||
33b62fba | 14861 | #: builtin/fetch.c:219 |
ddc12c42 JX |
14862 | msgid "write the commit-graph after fetching" |
14863 | msgstr "抓取后写提交图" | |
14864 | ||
33b62fba | 14865 | #: builtin/fetch.c:221 |
d9488fea | 14866 | msgid "accept refspecs from stdin" |
33b62fba | 14867 | msgstr "从标准输入获取引用规格" |
d9488fea | 14868 | |
33b62fba | 14869 | #: builtin/fetch.c:586 |
c04f5ac3 JX |
14870 | msgid "Couldn't find remote ref HEAD" |
14871 | msgstr "无法发现远程 HEAD 引用" | |
14872 | ||
33b62fba | 14873 | #: builtin/fetch.c:757 |
5c57d762 JX |
14874 | #, c-format |
14875 | msgid "configuration fetch.output contains invalid value %s" | |
14876 | msgstr "配置变量 fetch.output 包含无效值 %s" | |
14877 | ||
33b62fba | 14878 | #: builtin/fetch.c:856 |
c04f5ac3 JX |
14879 | #, c-format |
14880 | msgid "object %s not found" | |
14881 | msgstr "对象 %s 未发现" | |
14882 | ||
33b62fba | 14883 | #: builtin/fetch.c:860 |
c04f5ac3 JX |
14884 | msgid "[up to date]" |
14885 | msgstr "[最新]" | |
14886 | ||
33b62fba | 14887 | #: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961 |
c04f5ac3 JX |
14888 | msgid "[rejected]" |
14889 | msgstr "[已拒绝]" | |
14890 | ||
33b62fba | 14891 | #: builtin/fetch.c:874 |
5c57d762 | 14892 | msgid "can't fetch in current branch" |
9a4b694c | 14893 | msgstr "当前分支下不能执行获取操作" |
5c57d762 | 14894 | |
33b62fba | 14895 | #: builtin/fetch.c:884 |
c04f5ac3 | 14896 | msgid "[tag update]" |
55a16ee4 | 14897 | msgstr "[标签更新]" |
c04f5ac3 | 14898 | |
33b62fba JX |
14899 | #: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944 |
14900 | #: builtin/fetch.c:956 | |
5c57d762 JX |
14901 | msgid "unable to update local ref" |
14902 | msgstr "不能更新本地引用" | |
c04f5ac3 | 14903 | |
33b62fba | 14904 | #: builtin/fetch.c:889 |
4c27fcb5 JX |
14905 | msgid "would clobber existing tag" |
14906 | msgstr "会破坏现有的标签" | |
14907 | ||
33b62fba | 14908 | #: builtin/fetch.c:911 |
c04f5ac3 | 14909 | msgid "[new tag]" |
55a16ee4 | 14910 | msgstr "[新标签]" |
c04f5ac3 | 14911 | |
33b62fba | 14912 | #: builtin/fetch.c:914 |
c04f5ac3 JX |
14913 | msgid "[new branch]" |
14914 | msgstr "[新分支]" | |
14915 | ||
33b62fba | 14916 | #: builtin/fetch.c:917 |
170e9899 JX |
14917 | msgid "[new ref]" |
14918 | msgstr "[新引用]" | |
14919 | ||
33b62fba | 14920 | #: builtin/fetch.c:956 |
c04f5ac3 JX |
14921 | msgid "forced update" |
14922 | msgstr "强制更新" | |
14923 | ||
33b62fba | 14924 | #: builtin/fetch.c:961 |
5c57d762 JX |
14925 | msgid "non-fast-forward" |
14926 | msgstr "非快进" | |
c04f5ac3 | 14927 | |
33b62fba | 14928 | #: builtin/fetch.c:1065 |
a6cd2cc4 JX |
14929 | msgid "" |
14930 | "Fetch normally indicates which branches had a forced update,\n" | |
14931 | "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" | |
14932 | "flag or run 'git config fetch.showForcedUpdates true'." | |
14933 | msgstr "" | |
14934 | "获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n" | |
14935 | "要重新启用,请使用 '--show-forced-updates' 选项或运行\n" | |
14936 | "'git config fetch.showForcedUpdates true'。" | |
14937 | ||
33b62fba | 14938 | #: builtin/fetch.c:1069 |
a6cd2cc4 JX |
14939 | #, c-format |
14940 | msgid "" | |
14941 | "It took %.2f seconds to check forced updates. You can use\n" | |
14942 | "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " | |
14943 | "false'\n" | |
14944 | " to avoid this check.\n" | |
14945 | msgstr "" | |
14946 | "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" | |
14947 | "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" | |
14948 | ||
33b62fba | 14949 | #: builtin/fetch.c:1101 |
c04f5ac3 JX |
14950 | #, c-format |
14951 | msgid "%s did not send all necessary objects\n" | |
e640d114 | 14952 | msgstr "%s 未发送所有必需的对象\n" |
c04f5ac3 | 14953 | |
33b62fba | 14954 | #: builtin/fetch.c:1129 |
cfff71a9 | 14955 | #, c-format |
ec3d4607 JX |
14956 | msgid "rejected %s because shallow roots are not allowed to be updated" |
14957 | msgstr "拒绝 %s 因为浅克隆的根不允许被更新" | |
cfff71a9 | 14958 | |
33b62fba | 14959 | #: builtin/fetch.c:1206 builtin/fetch.c:1357 |
c04f5ac3 JX |
14960 | #, c-format |
14961 | msgid "From %.*s\n" | |
14962 | msgstr "来自 %.*s\n" | |
14963 | ||
33b62fba | 14964 | #: builtin/fetch.c:1228 |
c04f5ac3 JX |
14965 | #, c-format |
14966 | msgid "" | |
14967 | "some local refs could not be updated; try running\n" | |
14968 | " 'git remote prune %s' to remove any old, conflicting branches" | |
14969 | msgstr "" | |
14970 | "一些本地引用不能被更新;尝试运行\n" | |
14971 | " 'git remote prune %s' 来删除旧的、有冲突的分支" | |
14972 | ||
90e6ef53 | 14973 | # 译者:注意保持前导空格 |
33b62fba | 14974 | #: builtin/fetch.c:1327 |
81809b99 | 14975 | #, c-format |
8ada9598 | 14976 | msgid " (%s will become dangling)" |
e640d114 | 14977 | msgstr " (%s 将成为悬空状态)" |
c04f5ac3 | 14978 | |
90e6ef53 | 14979 | # 译者:注意保持前导空格 |
33b62fba | 14980 | #: builtin/fetch.c:1328 |
81809b99 | 14981 | #, c-format |
8ada9598 | 14982 | msgid " (%s has become dangling)" |
e640d114 | 14983 | msgstr " (%s 已成为悬空状态)" |
c04f5ac3 | 14984 | |
33b62fba | 14985 | #: builtin/fetch.c:1360 |
c04f5ac3 JX |
14986 | msgid "[deleted]" |
14987 | msgstr "[已删除]" | |
14988 | ||
33b62fba | 14989 | #: builtin/fetch.c:1361 builtin/remote.c:1118 |
c04f5ac3 JX |
14990 | msgid "(none)" |
14991 | msgstr "(无)" | |
14992 | ||
33b62fba | 14993 | #: builtin/fetch.c:1384 |
c04f5ac3 JX |
14994 | #, c-format |
14995 | msgid "Refusing to fetch into current branch %s of non-bare repository" | |
160fb2b2 | 14996 | msgstr "拒绝获取到非纯仓库的当前分支 %s" |
c04f5ac3 | 14997 | |
33b62fba | 14998 | #: builtin/fetch.c:1403 |
c04f5ac3 JX |
14999 | #, c-format |
15000 | msgid "Option \"%s\" value \"%s\" is not valid for %s" | |
15001 | msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" | |
15002 | ||
33b62fba | 15003 | #: builtin/fetch.c:1406 |
c04f5ac3 JX |
15004 | #, c-format |
15005 | msgid "Option \"%s\" is ignored for %s\n" | |
81809b99 | 15006 | msgstr "选项 \"%s\" 为 %s 所忽略\n" |
c04f5ac3 | 15007 | |
33b62fba | 15008 | #: builtin/fetch.c:1618 |
ddc12c42 | 15009 | msgid "multiple branches detected, incompatible with --set-upstream" |
a5cd71ca JX |
15010 | msgstr "检测到多分支,和 --set-upstream 不兼容" |
15011 | ||
33b62fba | 15012 | #: builtin/fetch.c:1633 |
a5cd71ca JX |
15013 | msgid "not setting upstream for a remote remote-tracking branch" |
15014 | msgstr "没有为一个远程跟踪分支设置上游" | |
15015 | ||
33b62fba | 15016 | #: builtin/fetch.c:1635 |
a5cd71ca JX |
15017 | msgid "not setting upstream for a remote tag" |
15018 | msgstr "没有为一个远程标签设置上游" | |
15019 | ||
33b62fba | 15020 | #: builtin/fetch.c:1637 |
a5cd71ca JX |
15021 | msgid "unknown branch type" |
15022 | msgstr "未知的分支类型" | |
15023 | ||
33b62fba | 15024 | #: builtin/fetch.c:1639 |
a5cd71ca JX |
15025 | msgid "" |
15026 | "no source branch found.\n" | |
15027 | "you need to specify exactly one branch with the --set-upstream option." | |
15028 | msgstr "" | |
15029 | "未发现源分支。\n" | |
15030 | "您需要使用 --set-upstream 选项指定一个分支。" | |
15031 | ||
33b62fba | 15032 | #: builtin/fetch.c:1768 builtin/fetch.c:1831 |
c04f5ac3 JX |
15033 | #, c-format |
15034 | msgid "Fetching %s\n" | |
d4a8e00b | 15035 | msgstr "正在获取 %s\n" |
c04f5ac3 | 15036 | |
33b62fba | 15037 | #: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101 |
c04f5ac3 JX |
15038 | #, c-format |
15039 | msgid "Could not fetch %s" | |
15040 | msgstr "不能获取 %s" | |
15041 | ||
33b62fba | 15042 | #: builtin/fetch.c:1790 |
a5cd71ca JX |
15043 | #, c-format |
15044 | msgid "could not fetch '%s' (exit code: %d)\n" | |
15045 | msgstr "无法获取 '%s'(退出码:%d)\n" | |
31e5e17b | 15046 | |
33b62fba | 15047 | #: builtin/fetch.c:1894 |
c04f5ac3 JX |
15048 | msgid "" |
15049 | "No remote repository specified. Please, specify either a URL or a\n" | |
15050 | "remote name from which new revisions should be fetched." | |
4375c10e | 15051 | msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。" |
c04f5ac3 | 15052 | |
33b62fba | 15053 | #: builtin/fetch.c:1930 |
c04f5ac3 | 15054 | msgid "You need to specify a tag name." |
55a16ee4 | 15055 | msgstr "您需要指定一个标签名称。" |
c04f5ac3 | 15056 | |
ec3d4607 JX |
15057 | #: builtin/fetch.c:1994 |
15058 | msgid "--negotiate-only needs one or more --negotiate-tip=*" | |
15059 | msgstr "--negotiate-only 需要一个或多个 --negotiate-tip=*" | |
15060 | ||
15061 | #: builtin/fetch.c:1998 | |
a0b6b246 JX |
15062 | msgid "Negative depth in --deepen is not supported" |
15063 | msgstr "--deepen 不支持负数深度" | |
15064 | ||
ec3d4607 | 15065 | #: builtin/fetch.c:2000 |
a0b6b246 JX |
15066 | msgid "--deepen and --depth are mutually exclusive" |
15067 | msgstr "--deepen 和 --depth 是互斥的" | |
15068 | ||
ec3d4607 | 15069 | #: builtin/fetch.c:2005 |
a77c07d9 JX |
15070 | msgid "--depth and --unshallow cannot be used together" |
15071 | msgstr "--depth 和 --unshallow 不能同时使用" | |
15072 | ||
ec3d4607 | 15073 | #: builtin/fetch.c:2007 |
a77c07d9 | 15074 | msgid "--unshallow on a complete repository does not make sense" |
160fb2b2 | 15075 | msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" |
a77c07d9 | 15076 | |
ec3d4607 | 15077 | #: builtin/fetch.c:2024 |
c04f5ac3 | 15078 | msgid "fetch --all does not take a repository argument" |
160fb2b2 | 15079 | msgstr "fetch --all 不能带一个仓库参数" |
c04f5ac3 | 15080 | |
ec3d4607 | 15081 | #: builtin/fetch.c:2026 |
c04f5ac3 | 15082 | msgid "fetch --all does not make sense with refspecs" |
160fb2b2 | 15083 | msgstr "fetch --all 带引用规格没有任何意义" |
c04f5ac3 | 15084 | |
ec3d4607 | 15085 | #: builtin/fetch.c:2035 |
c04f5ac3 JX |
15086 | #, c-format |
15087 | msgid "No such remote or remote group: %s" | |
15088 | msgstr "没有这样的远程或远程组:%s" | |
15089 | ||
ec3d4607 | 15090 | #: builtin/fetch.c:2042 |
c04f5ac3 | 15091 | msgid "Fetching a group and specifying refspecs does not make sense" |
160fb2b2 | 15092 | msgstr "获取组并指定引用规格没有意义" |
c04f5ac3 | 15093 | |
ec3d4607 | 15094 | #: builtin/fetch.c:2058 |
33b62fba JX |
15095 | msgid "must supply remote when using --negotiate-only" |
15096 | msgstr "在使用 --negotiate-only 时必须提供远程仓库" | |
15097 | ||
ec3d4607 | 15098 | #: builtin/fetch.c:2063 |
33b62fba JX |
15099 | msgid "Protocol does not support --negotiate-only, exiting." |
15100 | msgstr "协议不支持 --negotiate-only,退出。" | |
15101 | ||
ec3d4607 | 15102 | #: builtin/fetch.c:2082 |
06991777 JX |
15103 | msgid "" |
15104 | "--filter can only be used with the remote configured in extensions." | |
15105 | "partialclone" | |
ae4e099e | 15106 | msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" |
06991777 | 15107 | |
ec3d4607 | 15108 | #: builtin/fetch.c:2086 |
473eb541 JX |
15109 | msgid "--atomic can only be used when fetching from one remote" |
15110 | msgstr "--atomic 仅在从一个远程仓库获取的时候可用" | |
15111 | ||
ec3d4607 | 15112 | #: builtin/fetch.c:2090 |
d9488fea JX |
15113 | msgid "--stdin can only be used when fetching from one remote" |
15114 | msgstr "--stdin 仅在从一个远程仓库获取的时候可用" | |
15115 | ||
349ede6a | 15116 | #: builtin/fmt-merge-msg.c:7 |
814ff314 JX |
15117 | msgid "" |
15118 | "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" | |
15119 | msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" | |
c04f5ac3 | 15120 | |
349ede6a | 15121 | #: builtin/fmt-merge-msg.c:18 |
ef317cd5 | 15122 | msgid "populate log with at most <n> entries from shortlog" |
07432cef | 15123 | msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明" |
c04f5ac3 | 15124 | |
349ede6a | 15125 | #: builtin/fmt-merge-msg.c:21 |
ef317cd5 | 15126 | msgid "alias for --log (deprecated)" |
07432cef | 15127 | msgstr "参数 --log 的别名(已弃用)" |
ef317cd5 | 15128 | |
349ede6a | 15129 | #: builtin/fmt-merge-msg.c:24 |
ef317cd5 | 15130 | msgid "text" |
07432cef | 15131 | msgstr "文本" |
ef317cd5 | 15132 | |
349ede6a | 15133 | #: builtin/fmt-merge-msg.c:25 |
ef317cd5 | 15134 | msgid "use <text> as start of message" |
07432cef | 15135 | msgstr "使用 <文本> 作为提交说明的开始" |
ef317cd5 | 15136 | |
349ede6a | 15137 | #: builtin/fmt-merge-msg.c:26 |
ef317cd5 | 15138 | msgid "file to read from" |
07432cef | 15139 | msgstr "从文件中读取" |
ef317cd5 | 15140 | |
a4f16749 | 15141 | #: builtin/for-each-ref.c:10 |
814ff314 JX |
15142 | msgid "git for-each-ref [<options>] [<pattern>]" |
15143 | msgstr "git for-each-ref [<选项>] [<模式>]" | |
ef317cd5 | 15144 | |
a4f16749 | 15145 | #: builtin/for-each-ref.c:11 |
94550ed3 JX |
15146 | msgid "git for-each-ref [--points-at <object>]" |
15147 | msgstr "git for-each-ref [--points-at <对象>]" | |
15148 | ||
a4f16749 | 15149 | #: builtin/for-each-ref.c:12 |
d9488fea JX |
15150 | msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" |
15151 | msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" | |
94550ed3 | 15152 | |
a4f16749 | 15153 | #: builtin/for-each-ref.c:13 |
87cb7997 JX |
15154 | msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" |
15155 | msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" | |
94550ed3 | 15156 | |
33b62fba | 15157 | #: builtin/for-each-ref.c:30 |
ef317cd5 | 15158 | msgid "quote placeholders suitably for shells" |
07432cef | 15159 | msgstr "引用占位符适用于 shells" |
ef317cd5 | 15160 | |
33b62fba | 15161 | #: builtin/for-each-ref.c:32 |
ef317cd5 | 15162 | msgid "quote placeholders suitably for perl" |
07432cef | 15163 | msgstr "引用占位符适用于 perl" |
ef317cd5 | 15164 | |
33b62fba | 15165 | #: builtin/for-each-ref.c:34 |
ef317cd5 | 15166 | msgid "quote placeholders suitably for python" |
07432cef | 15167 | msgstr "引用占位符适用于 python" |
ef317cd5 | 15168 | |
33b62fba | 15169 | #: builtin/for-each-ref.c:36 |
04cb2f28 JX |
15170 | msgid "quote placeholders suitably for Tcl" |
15171 | msgstr "引用占位符适用于 Tcl" | |
ef317cd5 | 15172 | |
33b62fba | 15173 | #: builtin/for-each-ref.c:39 |
ef317cd5 | 15174 | msgid "show only <n> matched refs" |
07432cef | 15175 | msgstr "只显示 <n> 个匹配的引用" |
ef317cd5 | 15176 | |
33b62fba | 15177 | #: builtin/for-each-ref.c:41 builtin/tag.c:483 |
6937cb4e JX |
15178 | msgid "respect format colors" |
15179 | msgstr "遵照格式中的颜色输出" | |
15180 | ||
33b62fba | 15181 | #: builtin/for-each-ref.c:44 |
94550ed3 JX |
15182 | msgid "print only refs which points at the given object" |
15183 | msgstr "只打印指向给定对象的引用" | |
ef317cd5 | 15184 | |
33b62fba | 15185 | #: builtin/for-each-ref.c:46 |
94550ed3 JX |
15186 | msgid "print only refs that are merged" |
15187 | msgstr "只打印已经合并的引用" | |
15188 | ||
33b62fba | 15189 | #: builtin/for-each-ref.c:47 |
94550ed3 JX |
15190 | msgid "print only refs that are not merged" |
15191 | msgstr "只打印没有合并的引用" | |
ef317cd5 | 15192 | |
33b62fba | 15193 | #: builtin/for-each-ref.c:48 |
94550ed3 JX |
15194 | msgid "print only refs which contain the commit" |
15195 | msgstr "只打印包含该提交的引用" | |
15196 | ||
33b62fba | 15197 | #: builtin/for-each-ref.c:49 |
87cb7997 JX |
15198 | msgid "print only refs which don't contain the commit" |
15199 | msgstr "只打印不包含该提交的引用" | |
15200 | ||
d13389bf JX |
15201 | #: builtin/for-each-repo.c:9 |
15202 | msgid "git for-each-repo --config=<config> <command-args>" | |
15203 | msgstr "git for-each-repo --config=<配置> <命令参数>" | |
15204 | ||
ec3d4607 | 15205 | #: builtin/for-each-repo.c:34 |
d13389bf JX |
15206 | msgid "config" |
15207 | msgstr "配置" | |
15208 | ||
ec3d4607 | 15209 | #: builtin/for-each-repo.c:35 |
d13389bf JX |
15210 | msgid "config key storing a list of repository paths" |
15211 | msgstr "存储着仓库路径列表的配置项键名" | |
15212 | ||
ec3d4607 | 15213 | #: builtin/for-each-repo.c:43 |
d13389bf JX |
15214 | msgid "missing --config=<config>" |
15215 | msgstr "缺少 --config=<配置>" | |
15216 | ||
ec3d4607 | 15217 | #: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 |
06991777 JX |
15218 | msgid "unknown" |
15219 | msgstr "未知" | |
15220 | ||
15221 | #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> | |
33b62fba | 15222 | #: builtin/fsck.c:78 builtin/fsck.c:100 |
06991777 JX |
15223 | #, c-format |
15224 | msgid "error in %s %s: %s" | |
15225 | msgstr "%s %s 错误:%s" | |
15226 | ||
15227 | #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> | |
33b62fba | 15228 | #: builtin/fsck.c:94 |
06991777 JX |
15229 | #, c-format |
15230 | msgid "warning in %s %s: %s" | |
15231 | msgstr "%s %s 警告:%s" | |
15232 | ||
ec3d4607 | 15233 | #: builtin/fsck.c:124 builtin/fsck.c:127 |
06991777 JX |
15234 | #, c-format |
15235 | msgid "broken link from %7s %s" | |
15236 | msgstr "来自 %7s %s 的损坏的链接" | |
15237 | ||
ec3d4607 | 15238 | #: builtin/fsck.c:136 |
06991777 JX |
15239 | msgid "wrong object type in link" |
15240 | msgstr "链接中错误的对象类型" | |
15241 | ||
ec3d4607 | 15242 | #: builtin/fsck.c:152 |
06991777 JX |
15243 | #, c-format |
15244 | msgid "" | |
15245 | "broken link from %7s %s\n" | |
15246 | " to %7s %s" | |
15247 | msgstr "" | |
15248 | "损坏的链接来自于 %7s %s\n" | |
15249 | " 到 %7s %s" | |
15250 | ||
ec3d4607 | 15251 | #: builtin/fsck.c:264 |
06991777 JX |
15252 | #, c-format |
15253 | msgid "missing %s %s" | |
15254 | msgstr "缺失 %s %s" | |
15255 | ||
ec3d4607 | 15256 | #: builtin/fsck.c:291 |
06991777 JX |
15257 | #, c-format |
15258 | msgid "unreachable %s %s" | |
5b533632 | 15259 | msgstr "不可达 %s %s" |
06991777 | 15260 | |
ec3d4607 | 15261 | #: builtin/fsck.c:311 |
06991777 JX |
15262 | #, c-format |
15263 | msgid "dangling %s %s" | |
15264 | msgstr "悬空 %s %s" | |
15265 | ||
ec3d4607 | 15266 | #: builtin/fsck.c:321 |
06991777 JX |
15267 | msgid "could not create lost-found" |
15268 | msgstr "不能创建 lost-found" | |
15269 | ||
ec3d4607 | 15270 | #: builtin/fsck.c:332 |
06991777 JX |
15271 | #, c-format |
15272 | msgid "could not finish '%s'" | |
15273 | msgstr "不能完成 '%s'" | |
15274 | ||
ec3d4607 | 15275 | #: builtin/fsck.c:349 |
06991777 JX |
15276 | #, c-format |
15277 | msgid "Checking %s" | |
15278 | msgstr "正在检查 %s" | |
15279 | ||
ec3d4607 | 15280 | #: builtin/fsck.c:387 |
06991777 JX |
15281 | #, c-format |
15282 | msgid "Checking connectivity (%d objects)" | |
15283 | msgstr "正在检查连通性(%d 个对象)" | |
15284 | ||
ec3d4607 | 15285 | #: builtin/fsck.c:406 |
06991777 JX |
15286 | #, c-format |
15287 | msgid "Checking %s %s" | |
15288 | msgstr "正在检查 %s %s" | |
15289 | ||
ec3d4607 | 15290 | #: builtin/fsck.c:411 |
06991777 JX |
15291 | msgid "broken links" |
15292 | msgstr "损坏的链接" | |
15293 | ||
ec3d4607 | 15294 | #: builtin/fsck.c:420 |
06991777 JX |
15295 | #, c-format |
15296 | msgid "root %s" | |
15297 | msgstr "根 %s" | |
15298 | ||
ec3d4607 | 15299 | #: builtin/fsck.c:428 |
06991777 JX |
15300 | #, c-format |
15301 | msgid "tagged %s %s (%s) in %s" | |
15302 | msgstr "标记 %s %s (%s) 于 %s" | |
15303 | ||
ec3d4607 | 15304 | #: builtin/fsck.c:457 |
06991777 JX |
15305 | #, c-format |
15306 | msgid "%s: object corrupt or missing" | |
15307 | msgstr "%s:对象损坏或丢失" | |
15308 | ||
ec3d4607 | 15309 | #: builtin/fsck.c:482 |
06991777 JX |
15310 | #, c-format |
15311 | msgid "%s: invalid reflog entry %s" | |
15312 | msgstr "%s:无效的引用日志条目 %s" | |
15313 | ||
ec3d4607 | 15314 | #: builtin/fsck.c:496 |
06991777 JX |
15315 | #, c-format |
15316 | msgid "Checking reflog %s->%s" | |
15317 | msgstr "正在检查引用日志 %s->%s" | |
15318 | ||
ec3d4607 | 15319 | #: builtin/fsck.c:530 |
06991777 JX |
15320 | #, c-format |
15321 | msgid "%s: invalid sha1 pointer %s" | |
15322 | msgstr "%s:无效的 sha1 指针 %s" | |
15323 | ||
ec3d4607 | 15324 | #: builtin/fsck.c:537 |
06991777 JX |
15325 | #, c-format |
15326 | msgid "%s: not a commit" | |
15327 | msgstr "%s:不是一个提交" | |
15328 | ||
ec3d4607 | 15329 | #: builtin/fsck.c:591 |
06991777 JX |
15330 | msgid "notice: No default references" |
15331 | msgstr "注意:无默认引用" | |
15332 | ||
ec3d4607 | 15333 | #: builtin/fsck.c:606 |
06991777 JX |
15334 | #, c-format |
15335 | msgid "%s: object corrupt or missing: %s" | |
15336 | msgstr "%s:对象损坏或丢失:%s" | |
15337 | ||
ec3d4607 | 15338 | #: builtin/fsck.c:619 |
06991777 JX |
15339 | #, c-format |
15340 | msgid "%s: object could not be parsed: %s" | |
15341 | msgstr "%s:不能解析对象:%s" | |
15342 | ||
ec3d4607 | 15343 | #: builtin/fsck.c:639 |
06991777 JX |
15344 | #, c-format |
15345 | msgid "bad sha1 file: %s" | |
15346 | msgstr "坏的 sha1 文件:%s" | |
15347 | ||
ec3d4607 | 15348 | #: builtin/fsck.c:654 |
06991777 JX |
15349 | msgid "Checking object directory" |
15350 | msgstr "正在检查对象目录" | |
15351 | ||
ec3d4607 | 15352 | #: builtin/fsck.c:657 |
6c94aba5 | 15353 | msgid "Checking object directories" |
06991777 JX |
15354 | msgstr "正在检查对象目录" |
15355 | ||
ec3d4607 | 15356 | #: builtin/fsck.c:672 |
06991777 JX |
15357 | #, c-format |
15358 | msgid "Checking %s link" | |
15359 | msgstr "正在检查 %s 链接" | |
15360 | ||
ec3d4607 | 15361 | #: builtin/fsck.c:677 builtin/index-pack.c:864 |
06991777 JX |
15362 | #, c-format |
15363 | msgid "invalid %s" | |
15364 | msgstr "无效的 %s" | |
15365 | ||
ec3d4607 | 15366 | #: builtin/fsck.c:684 |
06991777 JX |
15367 | #, c-format |
15368 | msgid "%s points to something strange (%s)" | |
15369 | msgstr "%s 指向奇怪的东西(%s)" | |
15370 | ||
ec3d4607 | 15371 | #: builtin/fsck.c:690 |
06991777 JX |
15372 | #, c-format |
15373 | msgid "%s: detached HEAD points at nothing" | |
15374 | msgstr "%s:分离头指针的指向不存在" | |
15375 | ||
ec3d4607 | 15376 | #: builtin/fsck.c:694 |
06991777 JX |
15377 | #, c-format |
15378 | msgid "notice: %s points to an unborn branch (%s)" | |
15379 | msgstr "注意:%s 指向一个尚未诞生的分支(%s)" | |
15380 | ||
ec3d4607 | 15381 | #: builtin/fsck.c:706 |
06991777 JX |
15382 | msgid "Checking cache tree" |
15383 | msgstr "正在检查缓存树" | |
15384 | ||
ec3d4607 | 15385 | #: builtin/fsck.c:711 |
06991777 JX |
15386 | #, c-format |
15387 | msgid "%s: invalid sha1 pointer in cache-tree" | |
15388 | msgstr "%s:cache-tree 中无效的 sha1 指针" | |
6c94aba5 | 15389 | |
ec3d4607 | 15390 | #: builtin/fsck.c:720 |
06991777 JX |
15391 | msgid "non-tree in cache-tree" |
15392 | msgstr "cache-tree 中非树对象" | |
15393 | ||
ec3d4607 | 15394 | #: builtin/fsck.c:751 |
814ff314 JX |
15395 | msgid "git fsck [<options>] [<object>...]" |
15396 | msgstr "git fsck [<选项>] [<对象>...]" | |
ef317cd5 | 15397 | |
ec3d4607 | 15398 | #: builtin/fsck.c:757 |
ef317cd5 | 15399 | msgid "show unreachable objects" |
07432cef | 15400 | msgstr "显示不可达的对象" |
ef317cd5 | 15401 | |
ec3d4607 | 15402 | #: builtin/fsck.c:758 |
ef317cd5 | 15403 | msgid "show dangling objects" |
e640d114 | 15404 | msgstr "显示悬空的对象" |
ef317cd5 | 15405 | |
ec3d4607 | 15406 | #: builtin/fsck.c:759 |
ef317cd5 | 15407 | msgid "report tags" |
55a16ee4 | 15408 | msgstr "报告标签" |
ef317cd5 | 15409 | |
ec3d4607 | 15410 | #: builtin/fsck.c:760 |
ef317cd5 | 15411 | msgid "report root nodes" |
07432cef | 15412 | msgstr "报告根节点" |
ef317cd5 | 15413 | |
ec3d4607 | 15414 | #: builtin/fsck.c:761 |
ef317cd5 | 15415 | msgid "make index objects head nodes" |
07432cef | 15416 | msgstr "将索引亦作为检查的头节点" |
ef317cd5 | 15417 | |
ec3d4607 | 15418 | #: builtin/fsck.c:762 |
ef317cd5 | 15419 | msgid "make reflogs head nodes (default)" |
07432cef | 15420 | msgstr "将引用日志作为检查的头节点(默认)" |
ef317cd5 | 15421 | |
ec3d4607 | 15422 | #: builtin/fsck.c:763 |
ef317cd5 | 15423 | msgid "also consider packs and alternate objects" |
07432cef | 15424 | msgstr "也考虑包和备用对象" |
ef317cd5 | 15425 | |
ec3d4607 | 15426 | #: builtin/fsck.c:764 |
1b7f4a34 JX |
15427 | msgid "check only connectivity" |
15428 | msgstr "仅检查连通性" | |
15429 | ||
ec3d4607 | 15430 | #: builtin/fsck.c:765 builtin/mktag.c:75 |
ef317cd5 | 15431 | msgid "enable more strict checking" |
07432cef | 15432 | msgstr "启用更严格的检查" |
ef317cd5 | 15433 | |
ec3d4607 | 15434 | #: builtin/fsck.c:767 |
ef317cd5 | 15435 | msgid "write dangling objects in .git/lost-found" |
e640d114 | 15436 | msgstr "将悬空对象写入 .git/lost-found 中" |
ef317cd5 | 15437 | |
ec3d4607 | 15438 | #: builtin/fsck.c:768 builtin/prune.c:134 |
ef317cd5 | 15439 | msgid "show progress" |
07432cef | 15440 | msgstr "显示进度" |
ef317cd5 | 15441 | |
ec3d4607 | 15442 | #: builtin/fsck.c:769 |
5c57d762 JX |
15443 | msgid "show verbose names for reachable objects" |
15444 | msgstr "显示可达对象的详细名称" | |
15445 | ||
ec3d4607 | 15446 | #: builtin/fsck.c:828 builtin/index-pack.c:262 |
6c94aba5 | 15447 | msgid "Checking objects" |
06991777 JX |
15448 | msgstr "正在检查对象" |
15449 | ||
ec3d4607 | 15450 | #: builtin/fsck.c:856 |
06991777 JX |
15451 | #, c-format |
15452 | msgid "%s: object missing" | |
15453 | msgstr "%s:对象缺失" | |
15454 | ||
ec3d4607 | 15455 | #: builtin/fsck.c:867 |
06991777 JX |
15456 | #, c-format |
15457 | msgid "invalid parameter: expected sha1, got '%s'" | |
15458 | msgstr "无效的参数:期望 sha1,得到 '%s'" | |
6c94aba5 | 15459 | |
d13389bf | 15460 | #: builtin/gc.c:39 |
814ff314 JX |
15461 | msgid "git gc [<options>]" |
15462 | msgstr "git gc [<选项>]" | |
ef317cd5 | 15463 | |
473eb541 | 15464 | #: builtin/gc.c:93 |
c04f5ac3 | 15465 | #, c-format |
87cb7997 | 15466 | msgid "Failed to fstat %s: %s" |
65e2041e | 15467 | msgstr "对 %s 调用 fstat 失败:%s" |
c04f5ac3 | 15468 | |
473eb541 | 15469 | #: builtin/gc.c:129 |
d46c5519 JX |
15470 | #, c-format |
15471 | msgid "failed to parse '%s' value '%s'" | |
15472 | msgstr "无法解析 '%s' 值 '%s'" | |
15473 | ||
33b62fba | 15474 | #: builtin/gc.c:487 builtin/init-db.c:57 |
c04f5ac3 | 15475 | #, c-format |
4c27fcb5 JX |
15476 | msgid "cannot stat '%s'" |
15477 | msgstr "不能对 '%s' 调用 stat" | |
15478 | ||
33b62fba | 15479 | #: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573 |
4c27fcb5 JX |
15480 | #, c-format |
15481 | msgid "cannot read '%s'" | |
15482 | msgstr "不能读取 '%s'" | |
c04f5ac3 | 15483 | |
473eb541 | 15484 | #: builtin/gc.c:503 |
94550ed3 JX |
15485 | #, c-format |
15486 | msgid "" | |
15487 | "The last gc run reported the following. Please correct the root cause\n" | |
15488 | "and remove %s.\n" | |
15489 | "Automatic cleanup will not be performed until the file is removed.\n" | |
15490 | "\n" | |
15491 | "%s" | |
15492 | msgstr "" | |
15493 | "最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n" | |
15494 | "在该文件被删除之前,自动清理将不会执行。\n" | |
15495 | "\n" | |
15496 | "%s" | |
15497 | ||
473eb541 | 15498 | #: builtin/gc.c:551 |
ef317cd5 | 15499 | msgid "prune unreferenced objects" |
07432cef | 15500 | msgstr "清除未引用的对象" |
ef317cd5 | 15501 | |
473eb541 | 15502 | #: builtin/gc.c:553 |
ef317cd5 | 15503 | msgid "be more thorough (increased runtime)" |
07432cef | 15504 | msgstr "更彻底(增加运行时间)" |
ef317cd5 | 15505 | |
473eb541 | 15506 | #: builtin/gc.c:554 |
ef317cd5 | 15507 | msgid "enable auto-gc mode" |
07432cef | 15508 | msgstr "启用自动垃圾回收模式" |
ef317cd5 | 15509 | |
473eb541 | 15510 | #: builtin/gc.c:557 |
90314792 JX |
15511 | msgid "force running gc even if there may be another gc running" |
15512 | msgstr "强制执行 gc 即使另外一个 gc 正在执行" | |
15513 | ||
473eb541 | 15514 | #: builtin/gc.c:560 |
fd8cb379 JX |
15515 | msgid "repack all other packs except the largest pack" |
15516 | msgstr "除了最大的包之外,对所有其它包文件重新打包" | |
15517 | ||
473eb541 | 15518 | #: builtin/gc.c:576 |
fd8cb379 JX |
15519 | #, c-format |
15520 | msgid "failed to parse gc.logexpiry value %s" | |
c1ac5258 | 15521 | msgstr "解析 gc.logexpiry 的值 %s 失败" |
fd8cb379 | 15522 | |
473eb541 | 15523 | #: builtin/gc.c:587 |
87cb7997 | 15524 | #, c-format |
fd8cb379 | 15525 | msgid "failed to parse prune expiry value %s" |
c1ac5258 | 15526 | msgstr "解析清除期限值 %s 失败" |
87cb7997 | 15527 | |
473eb541 | 15528 | #: builtin/gc.c:607 |
c04f5ac3 | 15529 | #, c-format |
6c94aba5 | 15530 | msgid "Auto packing the repository in background for optimum performance.\n" |
160fb2b2 | 15531 | msgstr "自动在后台执行仓库打包以求最佳性能。\n" |
6c94aba5 | 15532 | |
473eb541 | 15533 | #: builtin/gc.c:609 |
6c94aba5 JX |
15534 | #, c-format |
15535 | msgid "Auto packing the repository for optimum performance.\n" | |
160fb2b2 | 15536 | msgstr "自动打包仓库以求最佳性能。\n" |
6c94aba5 | 15537 | |
473eb541 | 15538 | #: builtin/gc.c:610 |
6c94aba5 JX |
15539 | #, c-format |
15540 | msgid "See \"git help gc\" for manual housekeeping.\n" | |
15541 | msgstr "手工维护参见 \"git help gc\"。\n" | |
c04f5ac3 | 15542 | |
473eb541 | 15543 | #: builtin/gc.c:650 |
90314792 JX |
15544 | #, c-format |
15545 | msgid "" | |
15546 | "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" | |
15547 | msgstr "" | |
29004bbb | 15548 | "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force)" |
90314792 | 15549 | |
473eb541 | 15550 | #: builtin/gc.c:705 |
c04f5ac3 JX |
15551 | msgid "" |
15552 | "There are too many unreachable loose objects; run 'git prune' to remove them." | |
90e6ef53 | 15553 | msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" |
c04f5ac3 | 15554 | |
473eb541 | 15555 | #: builtin/gc.c:715 |
d13389bf JX |
15556 | msgid "" |
15557 | "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" | |
15558 | msgstr "" | |
15559 | "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]" | |
15560 | ||
473eb541 | 15561 | #: builtin/gc.c:745 |
d13389bf JX |
15562 | msgid "--no-schedule is not allowed" |
15563 | msgstr "--no-schedule 不被允许" | |
15564 | ||
473eb541 | 15565 | #: builtin/gc.c:750 |
d13389bf JX |
15566 | #, c-format |
15567 | msgid "unrecognized --schedule argument '%s'" | |
15568 | msgstr "无法识别的 --schedule 参数 '%s'" | |
d9488fea | 15569 | |
473eb541 | 15570 | #: builtin/gc.c:869 |
d9488fea JX |
15571 | msgid "failed to write commit-graph" |
15572 | msgstr "无法写入提交图" | |
15573 | ||
33b62fba JX |
15574 | #: builtin/gc.c:905 |
15575 | msgid "failed to prefetch remotes" | |
15576 | msgstr "无法预先获取远程仓库" | |
d13389bf | 15577 | |
33b62fba | 15578 | #: builtin/gc.c:1022 |
d13389bf JX |
15579 | msgid "failed to start 'git pack-objects' process" |
15580 | msgstr "无法启动 'git pack-objects' 进程" | |
15581 | ||
33b62fba | 15582 | #: builtin/gc.c:1039 |
d13389bf JX |
15583 | msgid "failed to finish 'git pack-objects' process" |
15584 | msgstr "无法完成 'git pack-objects' 进程" | |
15585 | ||
33b62fba | 15586 | #: builtin/gc.c:1091 |
d13389bf JX |
15587 | msgid "failed to write multi-pack-index" |
15588 | msgstr "无法写入多包索引" | |
15589 | ||
33b62fba | 15590 | #: builtin/gc.c:1109 |
d13389bf JX |
15591 | msgid "'git multi-pack-index expire' failed" |
15592 | msgstr "'git multi-pack-index expire' 失败" | |
15593 | ||
33b62fba | 15594 | #: builtin/gc.c:1170 |
d13389bf JX |
15595 | msgid "'git multi-pack-index repack' failed" |
15596 | msgstr "'git multi-pack-index repack' 失败" | |
15597 | ||
33b62fba | 15598 | #: builtin/gc.c:1179 |
d13389bf JX |
15599 | msgid "" |
15600 | "skipping incremental-repack task because core.multiPackIndex is disabled" | |
15601 | msgstr "跳过增量重新打包任务,因为 core.multiPackIndex 被禁用" | |
15602 | ||
33b62fba | 15603 | #: builtin/gc.c:1283 |
d9488fea JX |
15604 | #, c-format |
15605 | msgid "lock file '%s' exists, skipping maintenance" | |
15606 | msgstr "锁文件 '%s' 已存在,跳过维护" | |
15607 | ||
33b62fba | 15608 | #: builtin/gc.c:1313 |
d9488fea JX |
15609 | #, c-format |
15610 | msgid "task '%s' failed" | |
15611 | msgstr "任务 '%s' 失败" | |
15612 | ||
33b62fba | 15613 | #: builtin/gc.c:1395 |
d9488fea JX |
15614 | #, c-format |
15615 | msgid "'%s' is not a valid task" | |
15616 | msgstr "'%s' 不是一个有效的任务" | |
15617 | ||
33b62fba | 15618 | #: builtin/gc.c:1400 |
d9488fea JX |
15619 | #, c-format |
15620 | msgid "task '%s' cannot be selected multiple times" | |
15621 | msgstr "任务 '%s' 不能被多次选择" | |
15622 | ||
33b62fba | 15623 | #: builtin/gc.c:1415 |
d9488fea JX |
15624 | msgid "run tasks based on the state of the repository" |
15625 | msgstr "基于仓库状态来运行任务" | |
15626 | ||
33b62fba | 15627 | #: builtin/gc.c:1416 |
d13389bf JX |
15628 | msgid "frequency" |
15629 | msgstr "频率" | |
15630 | ||
33b62fba | 15631 | #: builtin/gc.c:1417 |
d13389bf JX |
15632 | msgid "run tasks based on frequency" |
15633 | msgstr "基于频率运行任务" | |
15634 | ||
33b62fba | 15635 | #: builtin/gc.c:1420 |
d9488fea JX |
15636 | msgid "do not report progress or other information over stderr" |
15637 | msgstr "不通过标准错误报告进度或其它信息" | |
15638 | ||
33b62fba | 15639 | #: builtin/gc.c:1421 |
d9488fea JX |
15640 | msgid "task" |
15641 | msgstr "任务" | |
15642 | ||
33b62fba | 15643 | #: builtin/gc.c:1422 |
d9488fea JX |
15644 | msgid "run a specific task" |
15645 | msgstr "运行一个特定的任务" | |
15646 | ||
33b62fba | 15647 | #: builtin/gc.c:1439 |
d13389bf JX |
15648 | msgid "use at most one of --auto and --schedule=<frequency>" |
15649 | msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" | |
15650 | ||
33b62fba | 15651 | #: builtin/gc.c:1482 |
d13389bf JX |
15652 | msgid "failed to run 'git config'" |
15653 | msgstr "无法运行 'git config'" | |
15654 | ||
33b62fba | 15655 | #: builtin/gc.c:1547 |
473eb541 JX |
15656 | #, c-format |
15657 | msgid "failed to expand path '%s'" | |
15658 | msgstr "无法扩展路径 '%s'" | |
15659 | ||
33b62fba | 15660 | #: builtin/gc.c:1576 |
473eb541 JX |
15661 | msgid "failed to start launchctl" |
15662 | msgstr "无法启动 launchctl" | |
d9488fea | 15663 | |
33b62fba | 15664 | #: builtin/gc.c:1613 |
473eb541 JX |
15665 | #, c-format |
15666 | msgid "failed to create directories for '%s'" | |
15667 | msgstr "无法为 '%s' 创建目录" | |
15668 | ||
33b62fba | 15669 | #: builtin/gc.c:1674 |
473eb541 JX |
15670 | #, c-format |
15671 | msgid "failed to bootstrap service %s" | |
15672 | msgstr "无法引导服务 %s" | |
15673 | ||
33b62fba | 15674 | #: builtin/gc.c:1745 |
473eb541 JX |
15675 | msgid "failed to create temp xml file" |
15676 | msgstr "无法创建临时 XML 文件" | |
15677 | ||
33b62fba | 15678 | #: builtin/gc.c:1835 |
473eb541 JX |
15679 | msgid "failed to start schtasks" |
15680 | msgstr "无法启动计划任务" | |
15681 | ||
33b62fba | 15682 | #: builtin/gc.c:1879 |
d13389bf JX |
15683 | msgid "failed to run 'crontab -l'; your system might not support 'cron'" |
15684 | msgstr "无法执行 'crontab -l',您的系统可能不支持 'cron'" | |
15685 | ||
33b62fba | 15686 | #: builtin/gc.c:1896 |
d13389bf JX |
15687 | msgid "failed to run 'crontab'; your system might not support 'cron'" |
15688 | msgstr "无法运行 'crontab',您的系统可能不支持 'cron'" | |
15689 | ||
33b62fba | 15690 | #: builtin/gc.c:1900 |
d13389bf JX |
15691 | msgid "failed to open stdin of 'crontab'" |
15692 | msgstr "无法打开 'crontab' 的标准输入" | |
15693 | ||
33b62fba | 15694 | #: builtin/gc.c:1942 |
d13389bf JX |
15695 | msgid "'crontab' died" |
15696 | msgstr "'crontab' 终止" | |
15697 | ||
33b62fba | 15698 | #: builtin/gc.c:1976 |
473eb541 JX |
15699 | msgid "another process is scheduling background maintenance" |
15700 | msgstr "另外一个进程正运行于后台维护" | |
15701 | ||
33b62fba | 15702 | #: builtin/gc.c:2000 |
d13389bf JX |
15703 | msgid "failed to add repo to global config" |
15704 | msgstr "无法将仓库添加到全局配置" | |
15705 | ||
33b62fba | 15706 | #: builtin/gc.c:2010 |
d13389bf JX |
15707 | msgid "git maintenance <subcommand> [<options>]" |
15708 | msgstr "git maintenance <子命令> [<选项>]" | |
15709 | ||
33b62fba | 15710 | #: builtin/gc.c:2029 |
d9488fea JX |
15711 | #, c-format |
15712 | msgid "invalid subcommand: %s" | |
15713 | msgstr "无效子命令:%s" | |
15714 | ||
2b472aae | 15715 | #: builtin/grep.c:30 |
814ff314 JX |
15716 | msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" |
15717 | msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" | |
ef317cd5 | 15718 | |
473eb541 | 15719 | #: builtin/grep.c:223 |
c04f5ac3 JX |
15720 | #, c-format |
15721 | msgid "grep: failed to create thread: %s" | |
90e6ef53 | 15722 | msgstr "grep:无法创建线程:%s" |
c04f5ac3 | 15723 | |
473eb541 | 15724 | #: builtin/grep.c:277 |
276ceeaa JX |
15725 | #, c-format |
15726 | msgid "invalid number of threads specified (%d) for %s" | |
15727 | msgstr "为 %2$s 设定的线程数 (%1$d) 无效" | |
15728 | ||
a4f16749 JX |
15729 | #. TRANSLATORS: %s is the configuration |
15730 | #. variable for tweaking threads, currently | |
15731 | #. grep.threads | |
15732 | #. | |
ec3d4607 JX |
15733 | #: builtin/grep.c:285 builtin/index-pack.c:1588 builtin/index-pack.c:1791 |
15734 | #: builtin/pack-objects.c:3129 | |
a4f16749 JX |
15735 | #, c-format |
15736 | msgid "no threads support, ignoring %s" | |
15737 | msgstr "没有线程支持,忽略 %s" | |
15738 | ||
33b62fba | 15739 | #: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643 |
c04f5ac3 JX |
15740 | #, c-format |
15741 | msgid "unable to read tree (%s)" | |
90e6ef53 | 15742 | msgstr "无法读取树(%s)" |
c04f5ac3 | 15743 | |
33b62fba | 15744 | #: builtin/grep.c:658 |
c04f5ac3 JX |
15745 | #, c-format |
15746 | msgid "unable to grep from object of type %s" | |
15747 | msgstr "无法抓取来自于 %s 类型的对象" | |
15748 | ||
ec3d4607 | 15749 | #: builtin/grep.c:738 |
c04f5ac3 JX |
15750 | #, c-format |
15751 | msgid "switch `%c' expects a numerical value" | |
15752 | msgstr "开关 `%c' 期望一个数字值" | |
15753 | ||
ec3d4607 | 15754 | #: builtin/grep.c:837 |
ef317cd5 | 15755 | msgid "search in index instead of in the work tree" |
07432cef | 15756 | msgstr "在索引区搜索而不是在工作区" |
ef317cd5 | 15757 | |
ec3d4607 | 15758 | #: builtin/grep.c:839 |
ef317cd5 | 15759 | msgid "find in contents not managed by git" |
07432cef | 15760 | msgstr "在未被 git 管理的内容中查找" |
ef317cd5 | 15761 | |
ec3d4607 | 15762 | #: builtin/grep.c:841 |
ef317cd5 | 15763 | msgid "search in both tracked and untracked files" |
07432cef | 15764 | msgstr "在跟踪和未跟踪的文件中搜索" |
ef317cd5 | 15765 | |
ec3d4607 | 15766 | #: builtin/grep.c:843 |
814ff314 JX |
15767 | msgid "ignore files specified via '.gitignore'" |
15768 | msgstr "忽略 '.gitignore' 包含的文件" | |
ef317cd5 | 15769 | |
ec3d4607 | 15770 | #: builtin/grep.c:845 |
87cb7997 | 15771 | msgid "recursively search in each submodule" |
1a79b2f1 JX |
15772 | msgstr "在每一个子模组中递归搜索" |
15773 | ||
ec3d4607 | 15774 | #: builtin/grep.c:848 |
ef317cd5 | 15775 | msgid "show non-matching lines" |
07432cef | 15776 | msgstr "显示未匹配的行" |
ef317cd5 | 15777 | |
ec3d4607 | 15778 | #: builtin/grep.c:850 |
ef317cd5 | 15779 | msgid "case insensitive matching" |
07432cef | 15780 | msgstr "不区分大小写匹配" |
ef317cd5 | 15781 | |
ec3d4607 | 15782 | #: builtin/grep.c:852 |
ef317cd5 | 15783 | msgid "match patterns only at word boundaries" |
07432cef | 15784 | msgstr "只在单词边界匹配模式" |
ef317cd5 | 15785 | |
ec3d4607 | 15786 | #: builtin/grep.c:854 |
ef317cd5 | 15787 | msgid "process binary files as text" |
07432cef | 15788 | msgstr "把二进制文件当做文本处理" |
ef317cd5 | 15789 | |
ec3d4607 | 15790 | #: builtin/grep.c:856 |
ef317cd5 | 15791 | msgid "don't match patterns in binary files" |
07432cef | 15792 | msgstr "不在二进制文件中匹配模式" |
ef317cd5 | 15793 | |
ec3d4607 | 15794 | #: builtin/grep.c:859 |
90314792 JX |
15795 | msgid "process binary files with textconv filters" |
15796 | msgstr "用 textconv 过滤器处理二进制文件" | |
15797 | ||
ec3d4607 | 15798 | #: builtin/grep.c:861 |
4c27fcb5 JX |
15799 | msgid "search in subdirectories (default)" |
15800 | msgstr "在子目录中寻找(默认)" | |
15801 | ||
ec3d4607 | 15802 | #: builtin/grep.c:863 |
ef317cd5 | 15803 | msgid "descend at most <depth> levels" |
07432cef | 15804 | msgstr "最多以指定的深度向下寻找" |
ef317cd5 | 15805 | |
ec3d4607 | 15806 | #: builtin/grep.c:867 |
ef317cd5 | 15807 | msgid "use extended POSIX regular expressions" |
07432cef | 15808 | msgstr "使用扩展的 POSIX 正则表达式" |
ef317cd5 | 15809 | |
ec3d4607 | 15810 | #: builtin/grep.c:870 |
ef317cd5 | 15811 | msgid "use basic POSIX regular expressions (default)" |
07432cef | 15812 | msgstr "使用基本的 POSIX 正则表达式(默认)" |
ef317cd5 | 15813 | |
ec3d4607 | 15814 | #: builtin/grep.c:873 |
ef317cd5 | 15815 | msgid "interpret patterns as fixed strings" |
07432cef | 15816 | msgstr "把模式解析为固定的字符串" |
ef317cd5 | 15817 | |
ec3d4607 | 15818 | #: builtin/grep.c:876 |
ef317cd5 | 15819 | msgid "use Perl-compatible regular expressions" |
07432cef | 15820 | msgstr "使用 Perl 兼容的正则表达式" |
ef317cd5 | 15821 | |
ec3d4607 | 15822 | #: builtin/grep.c:879 |
ef317cd5 | 15823 | msgid "show line numbers" |
07432cef | 15824 | msgstr "显示行号" |
ef317cd5 | 15825 | |
ec3d4607 | 15826 | #: builtin/grep.c:880 |
c1ac5258 JX |
15827 | msgid "show column number of first match" |
15828 | msgstr "显示第一个匹配的列号" | |
15829 | ||
ec3d4607 | 15830 | #: builtin/grep.c:881 |
ef317cd5 | 15831 | msgid "don't show filenames" |
07432cef | 15832 | msgstr "不显示文件名" |
ef317cd5 | 15833 | |
ec3d4607 | 15834 | #: builtin/grep.c:882 |
ef317cd5 | 15835 | msgid "show filenames" |
07432cef | 15836 | msgstr "显示文件名" |
ef317cd5 | 15837 | |
ec3d4607 | 15838 | #: builtin/grep.c:884 |
ef317cd5 | 15839 | msgid "show filenames relative to top directory" |
07432cef | 15840 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 15841 | |
ec3d4607 | 15842 | #: builtin/grep.c:886 |
ef317cd5 | 15843 | msgid "show only filenames instead of matching lines" |
07432cef | 15844 | msgstr "只显示文件名而不显示匹配的行" |
ef317cd5 | 15845 | |
ec3d4607 | 15846 | #: builtin/grep.c:888 |
ef317cd5 | 15847 | msgid "synonym for --files-with-matches" |
07432cef | 15848 | msgstr "和 --files-with-matches 同义" |
ef317cd5 | 15849 | |
ec3d4607 | 15850 | #: builtin/grep.c:891 |
ef317cd5 | 15851 | msgid "show only the names of files without match" |
07432cef | 15852 | msgstr "只显示未匹配的文件名" |
ef317cd5 | 15853 | |
ec3d4607 | 15854 | #: builtin/grep.c:893 |
ef317cd5 | 15855 | msgid "print NUL after filenames" |
07432cef | 15856 | msgstr "在文件名后输出 NUL 字符" |
ef317cd5 | 15857 | |
ec3d4607 | 15858 | #: builtin/grep.c:896 |
c1ac5258 JX |
15859 | msgid "show only matching parts of a line" |
15860 | msgstr "只显示行中的匹配的部分" | |
15861 | ||
ec3d4607 | 15862 | #: builtin/grep.c:898 |
ef317cd5 | 15863 | msgid "show the number of matches instead of matching lines" |
07432cef | 15864 | msgstr "显示总匹配行数,而不显示匹配的行" |
ef317cd5 | 15865 | |
ec3d4607 | 15866 | #: builtin/grep.c:899 |
ef317cd5 | 15867 | msgid "highlight matches" |
07432cef | 15868 | msgstr "高亮显示匹配项" |
ef317cd5 | 15869 | |
ec3d4607 | 15870 | #: builtin/grep.c:901 |
ef317cd5 | 15871 | msgid "print empty line between matches from different files" |
07432cef | 15872 | msgstr "在不同文件的匹配项之间打印空行" |
ef317cd5 | 15873 | |
ec3d4607 | 15874 | #: builtin/grep.c:903 |
ef317cd5 | 15875 | msgid "show filename only once above matches from same file" |
07432cef | 15876 | msgstr "只在同一文件的匹配项的上面显示一次文件名" |
ef317cd5 | 15877 | |
ec3d4607 | 15878 | #: builtin/grep.c:906 |
ef317cd5 | 15879 | msgid "show <n> context lines before and after matches" |
07432cef | 15880 | msgstr "显示匹配项前后的 <n> 行上下文" |
ef317cd5 | 15881 | |
ec3d4607 | 15882 | #: builtin/grep.c:909 |
ef317cd5 | 15883 | msgid "show <n> context lines before matches" |
07432cef | 15884 | msgstr "显示匹配项前 <n> 行上下文" |
ef317cd5 | 15885 | |
ec3d4607 | 15886 | #: builtin/grep.c:911 |
ef317cd5 | 15887 | msgid "show <n> context lines after matches" |
07432cef | 15888 | msgstr "显示匹配项后 <n> 行上下文" |
ef317cd5 | 15889 | |
ec3d4607 | 15890 | #: builtin/grep.c:913 |
276ceeaa JX |
15891 | msgid "use <n> worker threads" |
15892 | msgstr "使用 <n> 个工作线程" | |
15893 | ||
ec3d4607 | 15894 | #: builtin/grep.c:914 |
ef317cd5 | 15895 | msgid "shortcut for -C NUM" |
07432cef | 15896 | msgstr "快捷键 -C 数字" |
ef317cd5 | 15897 | |
ec3d4607 | 15898 | #: builtin/grep.c:917 |
ef317cd5 | 15899 | msgid "show a line with the function name before matches" |
07432cef | 15900 | msgstr "在匹配的前面显示一行函数名" |
ef317cd5 | 15901 | |
ec3d4607 | 15902 | #: builtin/grep.c:919 |
ef317cd5 | 15903 | msgid "show the surrounding function" |
07432cef | 15904 | msgstr "显示所在函数的前后内容" |
ef317cd5 | 15905 | |
ec3d4607 | 15906 | #: builtin/grep.c:922 |
ef317cd5 | 15907 | msgid "read patterns from file" |
07432cef | 15908 | msgstr "从文件读取模式" |
ef317cd5 | 15909 | |
ec3d4607 | 15910 | #: builtin/grep.c:924 |
ef317cd5 | 15911 | msgid "match <pattern>" |
07432cef | 15912 | msgstr "匹配 <模式>" |
ef317cd5 | 15913 | |
ec3d4607 | 15914 | #: builtin/grep.c:926 |
ef317cd5 | 15915 | msgid "combine patterns specified with -e" |
07432cef | 15916 | msgstr "组合用 -e 参数设定的模式" |
ef317cd5 | 15917 | |
ec3d4607 | 15918 | #: builtin/grep.c:938 |
ef317cd5 | 15919 | msgid "indicate hit with exit status without output" |
07432cef | 15920 | msgstr "不输出,而用退出码标识命中状态" |
ef317cd5 | 15921 | |
ec3d4607 | 15922 | #: builtin/grep.c:940 |
ef317cd5 | 15923 | msgid "show only matches from files that match all patterns" |
07432cef | 15924 | msgstr "只显示匹配所有模式的文件中的匹配" |
ef317cd5 | 15925 | |
ec3d4607 | 15926 | #: builtin/grep.c:943 |
ef317cd5 | 15927 | msgid "pager" |
07432cef | 15928 | msgstr "分页" |
ef317cd5 | 15929 | |
ec3d4607 | 15930 | #: builtin/grep.c:943 |
ef317cd5 | 15931 | msgid "show matching files in the pager" |
07432cef | 15932 | msgstr "分页显示匹配的文件" |
ef317cd5 | 15933 | |
ec3d4607 | 15934 | #: builtin/grep.c:947 |
ef317cd5 | 15935 | msgid "allow calling of grep(1) (ignored by this build)" |
07432cef | 15936 | msgstr "允许调用 grep(1)(本次构建忽略)" |
ef317cd5 | 15937 | |
ec3d4607 | 15938 | #: builtin/grep.c:1013 |
c1ac5258 JX |
15939 | msgid "no pattern given" |
15940 | msgstr "未提供匹配模式" | |
c04f5ac3 | 15941 | |
ec3d4607 | 15942 | #: builtin/grep.c:1049 |
87cb7997 JX |
15943 | msgid "--no-index or --untracked cannot be used with revs" |
15944 | msgstr "--no-index 或 --untracked 不能和版本同时使用" | |
15945 | ||
ec3d4607 | 15946 | #: builtin/grep.c:1057 |
87cb7997 JX |
15947 | #, c-format |
15948 | msgid "unable to resolve revision: %s" | |
15949 | msgstr "不能解析版本:%s" | |
15950 | ||
ec3d4607 | 15951 | #: builtin/grep.c:1087 |
2b472aae JX |
15952 | msgid "--untracked not supported with --recurse-submodules" |
15953 | msgstr "--untracked 不支持和 --recurse-submodules 共用" | |
15954 | ||
ec3d4607 | 15955 | #: builtin/grep.c:1091 |
4c27fcb5 JX |
15956 | msgid "invalid option combination, ignoring --threads" |
15957 | msgstr "无效的选项组合,忽略 --threads" | |
276ceeaa | 15958 | |
ec3d4607 | 15959 | #: builtin/grep.c:1094 builtin/pack-objects.c:4090 |
a4f16749 JX |
15960 | msgid "no threads support, ignoring --threads" |
15961 | msgstr "没有线程支持,忽略 --threads" | |
15962 | ||
ec3d4607 | 15963 | #: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126 |
4c27fcb5 JX |
15964 | #, c-format |
15965 | msgid "invalid number of threads specified (%d)" | |
15966 | msgstr "指定的线程数无效(%d)" | |
15967 | ||
ec3d4607 | 15968 | #: builtin/grep.c:1131 |
c04f5ac3 JX |
15969 | msgid "--open-files-in-pager only works on the worktree" |
15970 | msgstr "--open-files-in-pager 仅用于工作区" | |
15971 | ||
ec3d4607 | 15972 | #: builtin/grep.c:1157 |
c1ac5258 JX |
15973 | msgid "--cached or --untracked cannot be used with --no-index" |
15974 | msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" | |
c04f5ac3 | 15975 | |
ec3d4607 | 15976 | #: builtin/grep.c:1160 |
473eb541 JX |
15977 | msgid "--untracked cannot be used with --cached" |
15978 | msgstr "--untracked 不能与 --cached 同时使用" | |
15979 | ||
ec3d4607 | 15980 | #: builtin/grep.c:1166 |
c1ac5258 JX |
15981 | msgid "--[no-]exclude-standard cannot be used for tracked contents" |
15982 | msgstr "--[no-]exclude-standard 不能用于已跟踪内容" | |
c04f5ac3 | 15983 | |
ec3d4607 | 15984 | #: builtin/grep.c:1174 |
c1ac5258 JX |
15985 | msgid "both --cached and trees are given" |
15986 | msgstr "同时给出了 --cached 和树对象" | |
15987 | ||
06991777 | 15988 | #: builtin/hash-object.c:85 |
ef317cd5 | 15989 | msgid "" |
814ff314 JX |
15990 | "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " |
15991 | "[--] <file>..." | |
ef317cd5 | 15992 | msgstr "" |
814ff314 JX |
15993 | "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] " |
15994 | "[--] <文件>..." | |
ef317cd5 | 15995 | |
06991777 | 15996 | #: builtin/hash-object.c:86 |
94550ed3 JX |
15997 | msgid "git hash-object --stdin-paths" |
15998 | msgstr "git hash-object --stdin-paths" | |
ef317cd5 | 15999 | |
06991777 | 16000 | #: builtin/hash-object.c:98 |
ef317cd5 | 16001 | msgid "object type" |
07432cef | 16002 | msgstr "对象类型" |
ef317cd5 | 16003 | |
06991777 | 16004 | #: builtin/hash-object.c:99 |
ef317cd5 | 16005 | msgid "write the object into the object database" |
07432cef | 16006 | msgstr "将对象写入对象数据库" |
ef317cd5 | 16007 | |
06991777 | 16008 | #: builtin/hash-object.c:101 |
ef317cd5 | 16009 | msgid "read the object from stdin" |
07432cef | 16010 | msgstr "从标准输入读取对象" |
ef317cd5 | 16011 | |
06991777 | 16012 | #: builtin/hash-object.c:103 |
ef317cd5 | 16013 | msgid "store file as is without filters" |
07432cef | 16014 | msgstr "原样存储文件不使用过滤器" |
ef317cd5 | 16015 | |
06991777 | 16016 | #: builtin/hash-object.c:104 |
220c313c JX |
16017 | msgid "" |
16018 | "just hash any random garbage to create corrupt objects for debugging Git" | |
16019 | msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" | |
16020 | ||
06991777 | 16021 | #: builtin/hash-object.c:105 |
ef317cd5 | 16022 | msgid "process file as it were from this path" |
07432cef | 16023 | msgstr "处理文件并假设其来自于此路径" |
ef317cd5 | 16024 | |
349ede6a | 16025 | #: builtin/help.c:47 |
ef317cd5 | 16026 | msgid "print all available commands" |
07432cef | 16027 | msgstr "打印所有可用的命令" |
ef317cd5 | 16028 | |
349ede6a | 16029 | #: builtin/help.c:48 |
a0b6b246 JX |
16030 | msgid "exclude guides" |
16031 | msgstr "排除向导" | |
16032 | ||
349ede6a | 16033 | #: builtin/help.c:49 |
4dcdc3d8 JX |
16034 | msgid "print list of useful guides" |
16035 | msgstr "显示有用的指南列表" | |
16036 | ||
349ede6a | 16037 | #: builtin/help.c:50 |
c1ac5258 JX |
16038 | msgid "print all configuration variable names" |
16039 | msgstr "打印所有配置变量名称" | |
16040 | ||
349ede6a | 16041 | #: builtin/help.c:52 |
ef317cd5 | 16042 | msgid "show man page" |
07432cef | 16043 | msgstr "显示 man 手册" |
ef317cd5 | 16044 | |
349ede6a | 16045 | #: builtin/help.c:53 |
ef317cd5 | 16046 | msgid "show manual in web browser" |
07432cef | 16047 | msgstr "在 web 浏览器中显示手册" |
ef317cd5 | 16048 | |
349ede6a | 16049 | #: builtin/help.c:55 |
ef317cd5 | 16050 | msgid "show info page" |
07432cef | 16051 | msgstr "显示 info 手册" |
ef317cd5 | 16052 | |
349ede6a | 16053 | #: builtin/help.c:57 |
fd8cb379 JX |
16054 | msgid "print command description" |
16055 | msgstr "打印命令描述" | |
16056 | ||
349ede6a | 16057 | #: builtin/help.c:62 |
814ff314 JX |
16058 | msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" |
16059 | msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" | |
ef317cd5 | 16060 | |
349ede6a | 16061 | #: builtin/help.c:163 |
81809b99 | 16062 | #, c-format |
8ada9598 | 16063 | msgid "unrecognized help format '%s'" |
81809b99 | 16064 | msgstr "未能识别的帮助格式 '%s'" |
8ada9598 | 16065 | |
349ede6a | 16066 | #: builtin/help.c:190 |
8ada9598 | 16067 | msgid "Failed to start emacsclient." |
81809b99 | 16068 | msgstr "无法启动 emacsclient。" |
8ada9598 | 16069 | |
349ede6a | 16070 | #: builtin/help.c:203 |
8ada9598 | 16071 | msgid "Failed to parse emacsclient version." |
81809b99 | 16072 | msgstr "无法解析 emacsclient 版本。" |
8ada9598 | 16073 | |
349ede6a | 16074 | #: builtin/help.c:211 |
8ada9598 JX |
16075 | #, c-format |
16076 | msgid "emacsclient version '%d' too old (< 22)." | |
07432cef | 16077 | msgstr "emacsclient 版本 '%d' 太老(< 22)。" |
8ada9598 | 16078 | |
349ede6a | 16079 | #: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 |
81809b99 | 16080 | #, c-format |
5b04ee3b | 16081 | msgid "failed to exec '%s'" |
c1ac5258 | 16082 | msgstr "执行 '%s' 失败" |
8ada9598 | 16083 | |
349ede6a | 16084 | #: builtin/help.c:307 |
8ada9598 JX |
16085 | #, c-format |
16086 | msgid "" | |
16087 | "'%s': path for unsupported man viewer.\n" | |
16088 | "Please consider using 'man.<tool>.cmd' instead." | |
16089 | msgstr "" | |
81809b99 | 16090 | "'%s':不支持的 man 手册查看器的路径。\n" |
d9d56b23 | 16091 | "请使用 'man.<工具>.cmd'。" |
8ada9598 | 16092 | |
349ede6a | 16093 | #: builtin/help.c:319 |
8ada9598 JX |
16094 | #, c-format |
16095 | msgid "" | |
16096 | "'%s': cmd for supported man viewer.\n" | |
16097 | "Please consider using 'man.<tool>.path' instead." | |
16098 | msgstr "" | |
81809b99 | 16099 | "'%s': 支持的 man 手册查看器命令。\n" |
d9d56b23 | 16100 | "请使用 'man.<工具>.path'。" |
8ada9598 | 16101 | |
349ede6a | 16102 | #: builtin/help.c:436 |
8ada9598 JX |
16103 | #, c-format |
16104 | msgid "'%s': unknown man viewer." | |
81809b99 | 16105 | msgstr "'%s':未知的 man 查看器。" |
8ada9598 | 16106 | |
ec3d4607 | 16107 | #: builtin/help.c:452 |
8ada9598 | 16108 | msgid "no man viewer handled the request" |
81809b99 | 16109 | msgstr "没有 man 查看器处理此请求" |
8ada9598 | 16110 | |
ec3d4607 | 16111 | #: builtin/help.c:459 |
8ada9598 | 16112 | msgid "no info viewer handled the request" |
81809b99 | 16113 | msgstr "没有 info 查看器处理此请求" |
8ada9598 | 16114 | |
ec3d4607 | 16115 | #: builtin/help.c:517 builtin/help.c:528 git.c:348 |
fd8cb379 JX |
16116 | #, c-format |
16117 | msgid "'%s' is aliased to '%s'" | |
16118 | msgstr "'%s' 是 '%s' 的别名" | |
220c313c | 16119 | |
ec3d4607 | 16120 | #: builtin/help.c:531 git.c:380 |
4c27fcb5 JX |
16121 | #, c-format |
16122 | msgid "bad alias.%s string: %s" | |
16123 | msgstr "坏的 alias.%s 字符串:%s" | |
16124 | ||
ec3d4607 | 16125 | #: builtin/help.c:561 builtin/help.c:591 |
fd8cb379 JX |
16126 | #, c-format |
16127 | msgid "usage: %s%s" | |
16128 | msgstr "用法:%s%s" | |
4dcdc3d8 | 16129 | |
ec3d4607 | 16130 | #: builtin/help.c:575 |
c1ac5258 JX |
16131 | msgid "'git help config' for more information" |
16132 | msgstr "'git help config' 获取更多信息" | |
4dcdc3d8 | 16133 | |
33b62fba | 16134 | #: builtin/index-pack.c:222 |
8ada9598 JX |
16135 | #, c-format |
16136 | msgid "object type mismatch at %s" | |
81809b99 | 16137 | msgstr "%s 的对象类型不匹配" |
8ada9598 | 16138 | |
33b62fba | 16139 | #: builtin/index-pack.c:242 |
6acbf033 JX |
16140 | #, c-format |
16141 | msgid "did not receive expected object %s" | |
a0b6b246 | 16142 | msgstr "未能获取预期的对象 %s" |
8ada9598 | 16143 | |
33b62fba | 16144 | #: builtin/index-pack.c:245 |
6acbf033 JX |
16145 | #, c-format |
16146 | msgid "object %s: expected type %s, found %s" | |
a0b6b246 | 16147 | msgstr "对象 %s:应为类型 %s,却是 %s" |
6acbf033 | 16148 | |
33b62fba | 16149 | #: builtin/index-pack.c:295 |
81809b99 | 16150 | #, c-format |
8ada9598 JX |
16151 | msgid "cannot fill %d byte" |
16152 | msgid_plural "cannot fill %d bytes" | |
81809b99 | 16153 | msgstr[0] "无法填充 %d 字节" |
5ae481e0 | 16154 | msgstr[1] "无法填充 %d 字节" |
8ada9598 | 16155 | |
33b62fba | 16156 | #: builtin/index-pack.c:305 |
8ada9598 | 16157 | msgid "early EOF" |
81809b99 | 16158 | msgstr "过早的文件结束符(EOF)" |
8ada9598 | 16159 | |
33b62fba | 16160 | #: builtin/index-pack.c:306 |
8ada9598 | 16161 | msgid "read error on input" |
81809b99 | 16162 | msgstr "输入上的读错误" |
8ada9598 | 16163 | |
33b62fba | 16164 | #: builtin/index-pack.c:318 |
8ada9598 | 16165 | msgid "used more bytes than were available" |
81809b99 | 16166 | msgstr "用掉了超过可用的字节" |
8ada9598 | 16167 | |
ec3d4607 | 16168 | #: builtin/index-pack.c:325 builtin/pack-objects.c:756 |
8ada9598 | 16169 | msgid "pack too large for current definition of off_t" |
81809b99 | 16170 | msgstr "包太大超过了当前 off_t 的定义" |
8ada9598 | 16171 | |
33b62fba | 16172 | #: builtin/index-pack.c:328 builtin/unpack-objects.c:95 |
a0b6b246 JX |
16173 | msgid "pack exceeds maximum allowed size" |
16174 | msgstr "包超过了最大允许值" | |
16175 | ||
33b62fba | 16176 | #: builtin/index-pack.c:343 |
349ede6a JX |
16177 | #, c-format |
16178 | msgid "unable to create '%s'" | |
16179 | msgstr "不能创建 '%s'" | |
16180 | ||
33b62fba | 16181 | #: builtin/index-pack.c:349 |
81809b99 | 16182 | #, c-format |
8ada9598 | 16183 | msgid "cannot open packfile '%s'" |
81809b99 | 16184 | msgstr "无法打开包文件 '%s'" |
8ada9598 | 16185 | |
33b62fba | 16186 | #: builtin/index-pack.c:363 |
8ada9598 | 16187 | msgid "pack signature mismatch" |
81809b99 | 16188 | msgstr "包签名不匹配" |
8ada9598 | 16189 | |
33b62fba | 16190 | #: builtin/index-pack.c:365 |
ef317cd5 JX |
16191 | #, c-format |
16192 | msgid "pack version %<PRIu32> unsupported" | |
07432cef | 16193 | msgstr "不支持包版本 %<PRIu32>" |
ef317cd5 | 16194 | |
ec3d4607 | 16195 | #: builtin/index-pack.c:381 |
8ada9598 | 16196 | #, c-format |
5c57d762 JX |
16197 | msgid "pack has bad object at offset %<PRIuMAX>: %s" |
16198 | msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" | |
8ada9598 | 16199 | |
ec3d4607 | 16200 | #: builtin/index-pack.c:487 |
8ada9598 JX |
16201 | #, c-format |
16202 | msgid "inflate returned %d" | |
81809b99 | 16203 | msgstr "解压缩返回 %d" |
8ada9598 | 16204 | |
ec3d4607 | 16205 | #: builtin/index-pack.c:536 |
8ada9598 | 16206 | msgid "offset value overflow for delta base object" |
81809b99 | 16207 | msgstr "偏移值覆盖了 delta 基准对象" |
8ada9598 | 16208 | |
ec3d4607 | 16209 | #: builtin/index-pack.c:544 |
8ada9598 | 16210 | msgid "delta base offset is out of bound" |
81809b99 | 16211 | msgstr "delta 基准偏移越界" |
8ada9598 | 16212 | |
ec3d4607 | 16213 | #: builtin/index-pack.c:552 |
81809b99 | 16214 | #, c-format |
8ada9598 | 16215 | msgid "unknown object type %d" |
81809b99 | 16216 | msgstr "未知对象类型 %d" |
8ada9598 | 16217 | |
ec3d4607 | 16218 | #: builtin/index-pack.c:583 |
8ada9598 | 16219 | msgid "cannot pread pack file" |
81809b99 | 16220 | msgstr "无法读取包文件" |
8ada9598 | 16221 | |
ec3d4607 | 16222 | #: builtin/index-pack.c:585 |
8ada9598 | 16223 | #, c-format |
5c57d762 JX |
16224 | msgid "premature end of pack file, %<PRIuMAX> byte missing" |
16225 | msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" | |
16226 | msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
16227 | msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" | |
8ada9598 | 16228 | |
ec3d4607 | 16229 | #: builtin/index-pack.c:611 |
8ada9598 | 16230 | msgid "serious inflate inconsistency" |
81809b99 | 16231 | msgstr "解压缩严重的不一致" |
8ada9598 | 16232 | |
ec3d4607 JX |
16233 | #: builtin/index-pack.c:756 builtin/index-pack.c:762 builtin/index-pack.c:786 |
16234 | #: builtin/index-pack.c:825 builtin/index-pack.c:834 | |
8ada9598 JX |
16235 | #, c-format |
16236 | msgid "SHA1 COLLISION FOUND WITH %s !" | |
81809b99 | 16237 | msgstr "发现 %s 出现 SHA1 冲突!" |
8ada9598 | 16238 | |
ec3d4607 JX |
16239 | #: builtin/index-pack.c:759 builtin/pack-objects.c:292 |
16240 | #: builtin/pack-objects.c:352 builtin/pack-objects.c:458 | |
6792b93b JX |
16241 | #, c-format |
16242 | msgid "unable to read %s" | |
16243 | msgstr "不能读 %s" | |
16244 | ||
ec3d4607 | 16245 | #: builtin/index-pack.c:823 |
87cb7997 JX |
16246 | #, c-format |
16247 | msgid "cannot read existing object info %s" | |
16248 | msgstr "不能读取现存对象信息 %s" | |
16249 | ||
ec3d4607 | 16250 | #: builtin/index-pack.c:831 |
6792b93b JX |
16251 | #, c-format |
16252 | msgid "cannot read existing object %s" | |
16253 | msgstr "不能读取现存对象 %s" | |
16254 | ||
ec3d4607 | 16255 | #: builtin/index-pack.c:845 |
81809b99 | 16256 | #, c-format |
8ada9598 | 16257 | msgid "invalid blob object %s" |
160fb2b2 | 16258 | msgstr "无效的数据对象 %s" |
8ada9598 | 16259 | |
ec3d4607 | 16260 | #: builtin/index-pack.c:848 builtin/index-pack.c:867 |
fd8cb379 JX |
16261 | msgid "fsck error in packed object" |
16262 | msgstr "对打包对象 fsck 检查出错" | |
16263 | ||
ec3d4607 | 16264 | #: builtin/index-pack.c:869 |
8ada9598 JX |
16265 | #, c-format |
16266 | msgid "Not all child objects of %s are reachable" | |
81809b99 | 16267 | msgstr "%s 的所有子对象并非都可达" |
8ada9598 | 16268 | |
ec3d4607 | 16269 | #: builtin/index-pack.c:930 builtin/index-pack.c:977 |
8ada9598 | 16270 | msgid "failed to apply delta" |
c1ac5258 | 16271 | msgstr "应用 delta 失败" |
8ada9598 | 16272 | |
ec3d4607 | 16273 | #: builtin/index-pack.c:1160 |
8ada9598 | 16274 | msgid "Receiving objects" |
81809b99 | 16275 | msgstr "接收对象中" |
8ada9598 | 16276 | |
ec3d4607 | 16277 | #: builtin/index-pack.c:1160 |
8ada9598 | 16278 | msgid "Indexing objects" |
81809b99 | 16279 | msgstr "索引对象中" |
8ada9598 | 16280 | |
ec3d4607 | 16281 | #: builtin/index-pack.c:1194 |
8ada9598 | 16282 | msgid "pack is corrupted (SHA1 mismatch)" |
81809b99 | 16283 | msgstr "包冲突(SHA1 不匹配)" |
8ada9598 | 16284 | |
ec3d4607 | 16285 | #: builtin/index-pack.c:1199 |
8ada9598 | 16286 | msgid "cannot fstat packfile" |
65e2041e | 16287 | msgstr "不能对包文件调用 fstat" |
8ada9598 | 16288 | |
ec3d4607 | 16289 | #: builtin/index-pack.c:1202 |
8ada9598 | 16290 | msgid "pack has junk at the end" |
81809b99 | 16291 | msgstr "包的结尾有垃圾数据" |
8ada9598 | 16292 | |
ec3d4607 | 16293 | #: builtin/index-pack.c:1214 |
6792b93b JX |
16294 | msgid "confusion beyond insanity in parse_pack_objects()" |
16295 | msgstr "parse_pack_objects() 中遇到不可理喻的问题" | |
16296 | ||
ec3d4607 | 16297 | #: builtin/index-pack.c:1237 |
8ada9598 | 16298 | msgid "Resolving deltas" |
81809b99 | 16299 | msgstr "处理 delta 中" |
8ada9598 | 16300 | |
ec3d4607 | 16301 | #: builtin/index-pack.c:1248 builtin/pack-objects.c:2892 |
07432cef | 16302 | #, c-format |
ef317cd5 | 16303 | msgid "unable to create thread: %s" |
07432cef | 16304 | msgstr "不能创建线程:%s" |
ef317cd5 | 16305 | |
ec3d4607 | 16306 | #: builtin/index-pack.c:1281 |
8ada9598 | 16307 | msgid "confusion beyond insanity" |
81809b99 | 16308 | msgstr "不可理喻" |
8ada9598 | 16309 | |
ec3d4607 | 16310 | #: builtin/index-pack.c:1287 |
ef317cd5 | 16311 | #, c-format |
5b04ee3b JX |
16312 | msgid "completed with %d local object" |
16313 | msgid_plural "completed with %d local objects" | |
16314 | msgstr[0] "完成 %d 个本地对象" | |
16315 | msgstr[1] "完成 %d 个本地对象" | |
ef317cd5 | 16316 | |
ec3d4607 | 16317 | #: builtin/index-pack.c:1299 |
ef317cd5 JX |
16318 | #, c-format |
16319 | msgid "Unexpected tail checksum for %s (disk corruption?)" | |
07432cef | 16320 | msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" |
ef317cd5 | 16321 | |
ec3d4607 | 16322 | #: builtin/index-pack.c:1303 |
8ada9598 JX |
16323 | #, c-format |
16324 | msgid "pack has %d unresolved delta" | |
16325 | msgid_plural "pack has %d unresolved deltas" | |
81809b99 | 16326 | msgstr[0] "包有 %d 个未解决的 delta" |
5ae481e0 | 16327 | msgstr[1] "包有 %d 个未解决的 delta" |
8ada9598 | 16328 | |
ec3d4607 | 16329 | #: builtin/index-pack.c:1327 |
81809b99 | 16330 | #, c-format |
8ada9598 | 16331 | msgid "unable to deflate appended object (%d)" |
07432cef | 16332 | msgstr "不能压缩附加对象(%d)" |
8ada9598 | 16333 | |
ec3d4607 | 16334 | #: builtin/index-pack.c:1423 |
8ada9598 JX |
16335 | #, c-format |
16336 | msgid "local object %s is corrupt" | |
81809b99 | 16337 | msgstr "本地对象 %s 已损坏" |
8ada9598 | 16338 | |
ec3d4607 | 16339 | #: builtin/index-pack.c:1444 |
31e5e17b | 16340 | #, c-format |
473eb541 JX |
16341 | msgid "packfile name '%s' does not end with '.%s'" |
16342 | msgstr "包文件名 '%s' 没有以 '.%s' 结尾" | |
8ada9598 | 16343 | |
ec3d4607 | 16344 | #: builtin/index-pack.c:1468 |
81809b99 | 16345 | #, c-format |
31e5e17b JX |
16346 | msgid "cannot write %s file '%s'" |
16347 | msgstr "无法写入 %s 文件 '%s'" | |
8ada9598 | 16348 | |
ec3d4607 | 16349 | #: builtin/index-pack.c:1476 |
81809b99 | 16350 | #, c-format |
31e5e17b JX |
16351 | msgid "cannot close written %s file '%s'" |
16352 | msgstr "无法关闭已写入的 %s 文件 '%s'" | |
16353 | ||
ec3d4607 | 16354 | #: builtin/index-pack.c:1502 |
31e5e17b JX |
16355 | msgid "error while closing pack file" |
16356 | msgstr "关闭包文件时出错" | |
8ada9598 | 16357 | |
ec3d4607 | 16358 | #: builtin/index-pack.c:1516 |
8ada9598 | 16359 | msgid "cannot store pack file" |
81809b99 | 16360 | msgstr "无法存储包文件" |
8ada9598 | 16361 | |
ec3d4607 | 16362 | #: builtin/index-pack.c:1524 |
8ada9598 | 16363 | msgid "cannot store index file" |
81809b99 | 16364 | msgstr "无法存储索引文件" |
8ada9598 | 16365 | |
ec3d4607 | 16366 | #: builtin/index-pack.c:1579 builtin/pack-objects.c:3137 |
07432cef | 16367 | #, c-format |
ef317cd5 | 16368 | msgid "bad pack.indexversion=%<PRIu32>" |
07432cef | 16369 | msgstr "坏的 pack.indexversion=%<PRIu32>" |
ef317cd5 | 16370 | |
ec3d4607 | 16371 | #: builtin/index-pack.c:1649 |
81809b99 | 16372 | #, c-format |
8ada9598 | 16373 | msgid "Cannot open existing pack file '%s'" |
81809b99 | 16374 | msgstr "无法打开现存包文件 '%s'" |
8ada9598 | 16375 | |
ec3d4607 | 16376 | #: builtin/index-pack.c:1651 |
81809b99 | 16377 | #, c-format |
8ada9598 | 16378 | msgid "Cannot open existing pack idx file for '%s'" |
81809b99 | 16379 | msgstr "无法为 %s 打开包索引文件" |
8ada9598 | 16380 | |
ec3d4607 | 16381 | #: builtin/index-pack.c:1699 |
81809b99 | 16382 | #, c-format |
8ada9598 JX |
16383 | msgid "non delta: %d object" |
16384 | msgid_plural "non delta: %d objects" | |
81809b99 | 16385 | msgstr[0] "非 delta:%d 个对象" |
5ae481e0 | 16386 | msgstr[1] "非 delta:%d 个对象" |
8ada9598 | 16387 | |
ec3d4607 | 16388 | #: builtin/index-pack.c:1706 |
8ada9598 JX |
16389 | #, c-format |
16390 | msgid "chain length = %d: %lu object" | |
16391 | msgid_plural "chain length = %d: %lu objects" | |
81809b99 | 16392 | msgstr[0] "链长 = %d: %lu 对象" |
5ae481e0 | 16393 | msgstr[1] "链长 = %d: %lu 对象" |
8ada9598 | 16394 | |
ec3d4607 | 16395 | #: builtin/index-pack.c:1748 |
31e5e17b JX |
16396 | msgid "Cannot come back to cwd" |
16397 | msgstr "无法返回当前工作目录" | |
5b04ee3b | 16398 | |
ec3d4607 JX |
16399 | #: builtin/index-pack.c:1802 builtin/index-pack.c:1805 |
16400 | #: builtin/index-pack.c:1821 builtin/index-pack.c:1825 | |
81809b99 | 16401 | #, c-format |
8ada9598 | 16402 | msgid "bad %s" |
81809b99 | 16403 | msgstr "错误选项 %s" |
8ada9598 | 16404 | |
ec3d4607 | 16405 | #: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614 |
7157c2b5 JX |
16406 | #, c-format |
16407 | msgid "unknown hash algorithm '%s'" | |
16408 | msgstr "未知的哈希算法 '%s'" | |
16409 | ||
ec3d4607 | 16410 | #: builtin/index-pack.c:1850 |
8ada9598 | 16411 | msgid "--fix-thin cannot be used without --stdin" |
649900bc | 16412 | msgstr "--fix-thin 不能和 --stdin 同时使用" |
8ada9598 | 16413 | |
ec3d4607 | 16414 | #: builtin/index-pack.c:1852 |
1a79b2f1 | 16415 | msgid "--stdin requires a git repository" |
d9488fea | 16416 | msgstr "--stdin 需要 git 仓库" |
1a79b2f1 | 16417 | |
ec3d4607 | 16418 | #: builtin/index-pack.c:1854 |
7157c2b5 JX |
16419 | msgid "--object-format cannot be used with --stdin" |
16420 | msgstr "--object-format 不能和 --stdin 同时使用" | |
16421 | ||
ec3d4607 | 16422 | #: builtin/index-pack.c:1869 |
8ada9598 | 16423 | msgid "--verify with no packfile name given" |
dbd6cced | 16424 | msgstr "--verify 没有提供包文件名参数" |
8ada9598 | 16425 | |
ec3d4607 | 16426 | #: builtin/index-pack.c:1935 builtin/unpack-objects.c:584 |
fd8cb379 JX |
16427 | msgid "fsck error in pack objects" |
16428 | msgstr "在打包对象中 fsck 检查出错" | |
16429 | ||
33b62fba | 16430 | #: builtin/init-db.c:63 |
c04f5ac3 JX |
16431 | #, c-format |
16432 | msgid "cannot stat template '%s'" | |
65e2041e | 16433 | msgstr "不能对模版 '%s' 调用 stat" |
c04f5ac3 | 16434 | |
33b62fba | 16435 | #: builtin/init-db.c:68 |
c04f5ac3 JX |
16436 | #, c-format |
16437 | msgid "cannot opendir '%s'" | |
16438 | msgstr "不能打开目录 '%s'" | |
16439 | ||
33b62fba | 16440 | #: builtin/init-db.c:80 |
c04f5ac3 JX |
16441 | #, c-format |
16442 | msgid "cannot readlink '%s'" | |
16443 | msgstr "不能读取链接 '%s'" | |
16444 | ||
33b62fba | 16445 | #: builtin/init-db.c:82 |
c04f5ac3 JX |
16446 | #, c-format |
16447 | msgid "cannot symlink '%s' '%s'" | |
90e6ef53 | 16448 | msgstr "不能自 '%s' 到 '%s' 创建符号链接" |
c04f5ac3 | 16449 | |
33b62fba | 16450 | #: builtin/init-db.c:88 |
c04f5ac3 JX |
16451 | #, c-format |
16452 | msgid "cannot copy '%s' to '%s'" | |
16453 | msgstr "不能拷贝 '%s' 至 '%s'" | |
16454 | ||
33b62fba | 16455 | #: builtin/init-db.c:92 |
c04f5ac3 JX |
16456 | #, c-format |
16457 | msgid "ignoring template %s" | |
16458 | msgstr "忽略模版 %s" | |
16459 | ||
33b62fba | 16460 | #: builtin/init-db.c:123 |
c04f5ac3 | 16461 | #, c-format |
fd8cb379 JX |
16462 | msgid "templates not found in %s" |
16463 | msgstr "没有在 %s 中找到模版" | |
c04f5ac3 | 16464 | |
33b62fba | 16465 | #: builtin/init-db.c:138 |
c04f5ac3 | 16466 | #, c-format |
5b04ee3b JX |
16467 | msgid "not copying templates from '%s': %s" |
16468 | msgstr "没有从 '%s' 复制模版:%s" | |
c04f5ac3 | 16469 | |
ec3d4607 | 16470 | #: builtin/init-db.c:263 |
7157c2b5 JX |
16471 | #, c-format |
16472 | msgid "invalid initial branch name: '%s'" | |
16473 | msgstr "无效的初始分支名:'%s'" | |
16474 | ||
ec3d4607 | 16475 | #: builtin/init-db.c:354 |
c04f5ac3 JX |
16476 | #, c-format |
16477 | msgid "unable to handle file type %d" | |
16478 | msgstr "不能处理 %d 类型的文件" | |
16479 | ||
ec3d4607 | 16480 | #: builtin/init-db.c:357 |
c04f5ac3 JX |
16481 | #, c-format |
16482 | msgid "unable to move %s to %s" | |
16483 | msgstr "不能移动 %s 至 %s" | |
16484 | ||
ec3d4607 | 16485 | #: builtin/init-db.c:373 |
349ede6a JX |
16486 | msgid "attempt to reinitialize repository with different hash" |
16487 | msgstr "尝试用不同的哈希算法重新初始化仓库" | |
16488 | ||
ec3d4607 | 16489 | #: builtin/init-db.c:397 builtin/init-db.c:400 |
a0b6b246 JX |
16490 | #, c-format |
16491 | msgid "%s already exists" | |
16492 | msgstr "%s 已经存在" | |
16493 | ||
ec3d4607 | 16494 | #: builtin/init-db.c:432 |
7157c2b5 JX |
16495 | #, c-format |
16496 | msgid "re-init: ignored --initial-branch=%s" | |
16497 | msgstr "re-init:已忽略 --initial-branch=%s" | |
16498 | ||
ec3d4607 | 16499 | #: builtin/init-db.c:463 |
c04f5ac3 | 16500 | #, c-format |
5c57d762 JX |
16501 | msgid "Reinitialized existing shared Git repository in %s%s\n" |
16502 | msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" | |
c04f5ac3 | 16503 | |
ec3d4607 | 16504 | #: builtin/init-db.c:464 |
5c57d762 JX |
16505 | #, c-format |
16506 | msgid "Reinitialized existing Git repository in %s%s\n" | |
ec3d4607 | 16507 | msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" |
c04f5ac3 | 16508 | |
ec3d4607 | 16509 | #: builtin/init-db.c:468 |
5c57d762 JX |
16510 | #, c-format |
16511 | msgid "Initialized empty shared Git repository in %s%s\n" | |
9a4b694c | 16512 | msgstr "已初始化空的共享 Git 仓库于 %s%s\n" |
c04f5ac3 | 16513 | |
ec3d4607 | 16514 | #: builtin/init-db.c:469 |
5c57d762 JX |
16515 | #, c-format |
16516 | msgid "Initialized empty Git repository in %s%s\n" | |
9a4b694c | 16517 | msgstr "已初始化空的 Git 仓库于 %s%s\n" |
c04f5ac3 | 16518 | |
ec3d4607 | 16519 | #: builtin/init-db.c:518 |
ef317cd5 | 16520 | msgid "" |
a77c07d9 | 16521 | "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" |
814ff314 | 16522 | "shared[=<permissions>]] [<directory>]" |
ef317cd5 | 16523 | msgstr "" |
07432cef | 16524 | "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " |
814ff314 | 16525 | "[<目录>]" |
ef317cd5 | 16526 | |
ec3d4607 | 16527 | #: builtin/init-db.c:544 |
ef317cd5 | 16528 | msgid "permissions" |
07432cef | 16529 | msgstr "权限" |
ef317cd5 | 16530 | |
ec3d4607 | 16531 | #: builtin/init-db.c:545 |
ef317cd5 | 16532 | msgid "specify that the git repository is to be shared amongst several users" |
160fb2b2 | 16533 | msgstr "指定 git 仓库是多个用户之间共享的" |
ef317cd5 | 16534 | |
ec3d4607 | 16535 | #: builtin/init-db.c:551 |
7157c2b5 JX |
16536 | msgid "override the name of the initial branch" |
16537 | msgstr "覆盖初始分支名称" | |
16538 | ||
ec3d4607 | 16539 | #: builtin/init-db.c:552 builtin/verify-pack.c:74 |
349ede6a JX |
16540 | msgid "hash" |
16541 | msgstr "hash" | |
16542 | ||
ec3d4607 | 16543 | #: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 |
349ede6a JX |
16544 | msgid "specify the hash algorithm to use" |
16545 | msgstr "指定要使用的哈希算法" | |
16546 | ||
ec3d4607 | 16547 | #: builtin/init-db.c:560 |
d9488fea JX |
16548 | msgid "--separate-git-dir and --bare are mutually exclusive" |
16549 | msgstr "--separate-git-dir 和 --bare 是互斥的" | |
16550 | ||
ec3d4607 | 16551 | #: builtin/init-db.c:591 builtin/init-db.c:596 |
c1ac5258 JX |
16552 | #, c-format |
16553 | msgid "cannot mkdir %s" | |
16554 | msgstr "不能创建目录 %s" | |
16555 | ||
ec3d4607 | 16556 | #: builtin/init-db.c:600 builtin/init-db.c:655 |
c04f5ac3 JX |
16557 | #, c-format |
16558 | msgid "cannot chdir to %s" | |
16559 | msgstr "不能切换目录到 %s" | |
16560 | ||
ec3d4607 | 16561 | #: builtin/init-db.c:627 |
c04f5ac3 JX |
16562 | #, c-format |
16563 | msgid "" | |
16564 | "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" | |
16565 | "dir=<directory>)" | |
1e607449 | 16566 | msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" |
c04f5ac3 | 16567 | |
ec3d4607 | 16568 | #: builtin/init-db.c:679 |
c04f5ac3 JX |
16569 | #, c-format |
16570 | msgid "Cannot access work tree '%s'" | |
16571 | msgstr "不能访问工作区 '%s'" | |
16572 | ||
ec3d4607 | 16573 | #: builtin/init-db.c:684 |
d9488fea JX |
16574 | msgid "--separate-git-dir incompatible with bare repository" |
16575 | msgstr "--separate-git-dir 不能用于纯仓库" | |
16576 | ||
a6cd2cc4 | 16577 | #: builtin/interpret-trailers.c:16 |
220c313c | 16578 | msgid "" |
276ceeaa JX |
16579 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " |
16580 | "<token>[(=|:)<value>])...] [<file>...]" | |
3495628d JX |
16581 | msgstr "" |
16582 | "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值" | |
16583 | ">])...] [<文件>...]" | |
276ceeaa | 16584 | |
a6cd2cc4 | 16585 | #: builtin/interpret-trailers.c:95 |
276ceeaa JX |
16586 | msgid "edit files in place" |
16587 | msgstr "在原位编辑文件" | |
220c313c | 16588 | |
a6cd2cc4 | 16589 | #: builtin/interpret-trailers.c:96 |
220c313c | 16590 | msgid "trim empty trailers" |
d13389bf | 16591 | msgstr "删除空的尾注" |
6937cb4e | 16592 | |
a6cd2cc4 | 16593 | #: builtin/interpret-trailers.c:99 |
6937cb4e | 16594 | msgid "where to place the new trailer" |
d13389bf | 16595 | msgstr "在哪里放置新的尾注" |
220c313c | 16596 | |
a6cd2cc4 | 16597 | #: builtin/interpret-trailers.c:101 |
6937cb4e | 16598 | msgid "action if trailer already exists" |
d13389bf | 16599 | msgstr "当尾注已经存在时所采取的动作" |
6937cb4e | 16600 | |
a6cd2cc4 | 16601 | #: builtin/interpret-trailers.c:103 |
6937cb4e | 16602 | msgid "action if trailer is missing" |
d13389bf | 16603 | msgstr "当尾注缺失时所采取的动作" |
6937cb4e | 16604 | |
a6cd2cc4 | 16605 | #: builtin/interpret-trailers.c:105 |
6937cb4e | 16606 | msgid "output only the trailers" |
d13389bf | 16607 | msgstr "只输出尾注" |
6937cb4e | 16608 | |
a6cd2cc4 | 16609 | #: builtin/interpret-trailers.c:106 |
6937cb4e JX |
16610 | msgid "do not apply config rules" |
16611 | msgstr "不要应用配置规则" | |
16612 | ||
a6cd2cc4 | 16613 | #: builtin/interpret-trailers.c:107 |
6937cb4e JX |
16614 | msgid "join whitespace-continued values" |
16615 | msgstr "连接空白折行的值" | |
16616 | ||
a6cd2cc4 | 16617 | #: builtin/interpret-trailers.c:108 |
6937cb4e JX |
16618 | msgid "set parsing options" |
16619 | msgstr "设置解析选项" | |
16620 | ||
a6cd2cc4 | 16621 | #: builtin/interpret-trailers.c:110 |
4c27fcb5 JX |
16622 | msgid "do not treat --- specially" |
16623 | msgstr "不要对 --- 特殊处理" | |
16624 | ||
a6cd2cc4 | 16625 | #: builtin/interpret-trailers.c:112 |
220c313c | 16626 | msgid "trailer(s) to add" |
d13389bf | 16627 | msgstr "要添加的尾注" |
220c313c | 16628 | |
a6cd2cc4 | 16629 | #: builtin/interpret-trailers.c:123 |
6937cb4e JX |
16630 | msgid "--trailer with --only-input does not make sense" |
16631 | msgstr "--trailer 和 --only-input 同时使用没有意义" | |
16632 | ||
a6cd2cc4 | 16633 | #: builtin/interpret-trailers.c:133 |
276ceeaa JX |
16634 | msgid "no input file given for in-place editing" |
16635 | msgstr "没有给出要原位编辑的文件" | |
16636 | ||
473eb541 | 16637 | #: builtin/log.c:59 |
7aea43ff | 16638 | msgid "git log [<options>] [<revision-range>] [[--] <path>...]" |
d9d56b23 | 16639 | msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" |
ef317cd5 | 16640 | |
473eb541 | 16641 | #: builtin/log.c:60 |
814ff314 JX |
16642 | msgid "git show [<options>] <object>..." |
16643 | msgstr "git show [<选项>] <对象>..." | |
ef317cd5 | 16644 | |
473eb541 | 16645 | #: builtin/log.c:113 |
220c313c JX |
16646 | #, c-format |
16647 | msgid "invalid --decorate option: %s" | |
16648 | msgstr "无效的 --decorate 选项:%s" | |
16649 | ||
473eb541 | 16650 | #: builtin/log.c:180 |
ef317cd5 | 16651 | msgid "show source" |
07432cef | 16652 | msgstr "显示源" |
ef317cd5 | 16653 | |
473eb541 JX |
16654 | #: builtin/log.c:181 |
16655 | msgid "use mail map file" | |
07432cef WS |
16656 | msgstr "使用邮件映射文件" |
16657 | ||
473eb541 | 16658 | #: builtin/log.c:184 |
5809aa05 JX |
16659 | msgid "only decorate refs that match <pattern>" |
16660 | msgstr "只修饰与 <模式> 匹配的引用" | |
16661 | ||
473eb541 | 16662 | #: builtin/log.c:186 |
5809aa05 JX |
16663 | msgid "do not decorate refs that match <pattern>" |
16664 | msgstr "不修饰和 <模式> 匹配的引用" | |
16665 | ||
473eb541 | 16666 | #: builtin/log.c:187 |
ef317cd5 | 16667 | msgid "decorate options" |
07432cef | 16668 | msgstr "修饰选项" |
ef317cd5 | 16669 | |
473eb541 | 16670 | #: builtin/log.c:190 |
d13389bf | 16671 | msgid "" |
473eb541 | 16672 | "trace the evolution of line range <start>,<end> or function :<funcname> in " |
d13389bf JX |
16673 | "<file>" |
16674 | msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" | |
16675 | ||
473eb541 | 16676 | #: builtin/log.c:213 |
d13389bf JX |
16677 | msgid "-L<range>:<file> cannot be used with pathspec" |
16678 | msgstr "-L<范围>:<文件> 不能和路径表达式共用" | |
220c313c | 16679 | |
ec3d4607 | 16680 | #: builtin/log.c:306 |
c04f5ac3 JX |
16681 | #, c-format |
16682 | msgid "Final output: %d %s\n" | |
16683 | msgstr "最终输出:%d %s\n" | |
16684 | ||
ec3d4607 | 16685 | #: builtin/log.c:571 |
220c313c JX |
16686 | #, c-format |
16687 | msgid "git show %s: bad file" | |
16688 | msgstr "git show %s: 损坏的文件" | |
16689 | ||
ec3d4607 | 16690 | #: builtin/log.c:586 builtin/log.c:676 |
c04f5ac3 | 16691 | #, c-format |
d46c5519 | 16692 | msgid "could not read object %s" |
90e6ef53 | 16693 | msgstr "不能读取对象 %s" |
c04f5ac3 | 16694 | |
ec3d4607 | 16695 | #: builtin/log.c:701 |
c04f5ac3 | 16696 | #, c-format |
d46c5519 | 16697 | msgid "unknown type: %d" |
c04f5ac3 JX |
16698 | msgstr "未知类型:%d" |
16699 | ||
ec3d4607 | 16700 | #: builtin/log.c:846 |
ddc12c42 JX |
16701 | #, c-format |
16702 | msgid "%s: invalid cover from description mode" | |
16703 | msgstr "%s:从描述生成附函的模式无效" | |
16704 | ||
ec3d4607 | 16705 | #: builtin/log.c:853 |
c04f5ac3 JX |
16706 | msgid "format.headers without value" |
16707 | msgstr "format.headers 没有值" | |
16708 | ||
ec3d4607 | 16709 | #: builtin/log.c:982 |
c04f5ac3 | 16710 | #, c-format |
d46c5519 | 16711 | msgid "cannot open patch file %s" |
c04f5ac3 JX |
16712 | msgstr "无法打开补丁文件 %s" |
16713 | ||
ec3d4607 | 16714 | #: builtin/log.c:999 |
d46c5519 JX |
16715 | msgid "need exactly one range" |
16716 | msgstr "只需要一个范围" | |
c04f5ac3 | 16717 | |
ec3d4607 | 16718 | #: builtin/log.c:1009 |
d46c5519 JX |
16719 | msgid "not a range" |
16720 | msgstr "不是一个范围" | |
c04f5ac3 | 16721 | |
ec3d4607 | 16722 | #: builtin/log.c:1173 |
d46c5519 JX |
16723 | msgid "cover letter needs email format" |
16724 | msgstr "附函需要邮件地址格式" | |
c04f5ac3 | 16725 | |
ec3d4607 | 16726 | #: builtin/log.c:1179 |
d46c5519 JX |
16727 | msgid "failed to create cover-letter file" |
16728 | msgstr "无法创建附函文件" | |
16729 | ||
ec3d4607 | 16730 | #: builtin/log.c:1266 |
c04f5ac3 JX |
16731 | #, c-format |
16732 | msgid "insane in-reply-to: %s" | |
16733 | msgstr "不正常的 in-reply-to:%s" | |
16734 | ||
ec3d4607 | 16735 | #: builtin/log.c:1293 |
814ff314 JX |
16736 | msgid "git format-patch [<options>] [<since> | <revision-range>]" |
16737 | msgstr "git format-patch [<选项>] [<从> | <版本范围>]" | |
ef317cd5 | 16738 | |
ec3d4607 | 16739 | #: builtin/log.c:1351 |
d46c5519 | 16740 | msgid "two output directories?" |
c04f5ac3 JX |
16741 | msgstr "两个输出目录?" |
16742 | ||
ec3d4607 | 16743 | #: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 |
5b04ee3b | 16744 | #, c-format |
d46c5519 | 16745 | msgid "unknown commit %s" |
5b04ee3b JX |
16746 | msgstr "未知提交 %s" |
16747 | ||
ec3d4607 | 16748 | #: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 |
d46c5519 | 16749 | #: builtin/replace.c:210 |
5b04ee3b | 16750 | #, c-format |
d46c5519 JX |
16751 | msgid "failed to resolve '%s' as a valid ref" |
16752 | msgstr "无法将 '%s' 解析为一个有效引用" | |
5b04ee3b | 16753 | |
ec3d4607 | 16754 | #: builtin/log.c:1522 |
d46c5519 JX |
16755 | msgid "could not find exact merge base" |
16756 | msgstr "不能找到准确的合并基线" | |
5b04ee3b | 16757 | |
ec3d4607 | 16758 | #: builtin/log.c:1532 |
5b04ee3b | 16759 | msgid "" |
d46c5519 | 16760 | "failed to get upstream, if you want to record base commit automatically,\n" |
5b04ee3b | 16761 | "please use git branch --set-upstream-to to track a remote branch.\n" |
d46c5519 | 16762 | "Or you could specify base commit by --base=<base-commit-id> manually" |
5b04ee3b JX |
16763 | msgstr "" |
16764 | "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" | |
aef18cc6 | 16765 | "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" |
d46c5519 | 16766 | "参数 --base=<基线提交> 手动指定一个基线提交" |
5b04ee3b | 16767 | |
ec3d4607 | 16768 | #: builtin/log.c:1555 |
d46c5519 | 16769 | msgid "failed to find exact merge base" |
5b04ee3b JX |
16770 | msgstr "无法找到准确的合并基线" |
16771 | ||
ec3d4607 | 16772 | #: builtin/log.c:1572 |
5b04ee3b JX |
16773 | msgid "base commit should be the ancestor of revision list" |
16774 | msgstr "基线提交应该是版本列表的祖先" | |
16775 | ||
ec3d4607 | 16776 | #: builtin/log.c:1582 |
5b04ee3b JX |
16777 | msgid "base commit shouldn't be in revision list" |
16778 | msgstr "基线提交不应该出现在版本列表中" | |
16779 | ||
ec3d4607 | 16780 | #: builtin/log.c:1640 |
5b04ee3b | 16781 | msgid "cannot get patch id" |
aef18cc6 | 16782 | msgstr "无法得到补丁 id" |
5b04ee3b | 16783 | |
ec3d4607 | 16784 | #: builtin/log.c:1703 |
d9488fea JX |
16785 | msgid "failed to infer range-diff origin of current series" |
16786 | msgstr "无法推断当前系列的 range-diff 起始" | |
16787 | ||
ec3d4607 | 16788 | #: builtin/log.c:1705 |
d9488fea JX |
16789 | #, c-format |
16790 | msgid "using '%s' as range-diff origin of current series" | |
16791 | msgstr "使用 '%s' 作为当前系列的 range-diff 源" | |
4c27fcb5 | 16792 | |
ec3d4607 | 16793 | #: builtin/log.c:1749 |
ef317cd5 | 16794 | msgid "use [PATCH n/m] even with a single patch" |
07432cef | 16795 | msgstr "使用 [PATCH n/m],即使只有一个补丁" |
c04f5ac3 | 16796 | |
ec3d4607 | 16797 | #: builtin/log.c:1752 |
ef317cd5 | 16798 | msgid "use [PATCH] even with multiple patches" |
07432cef | 16799 | msgstr "使用 [PATCH],即使有多个补丁" |
c04f5ac3 | 16800 | |
ec3d4607 | 16801 | #: builtin/log.c:1756 |
ef317cd5 | 16802 | msgid "print patches to standard out" |
07432cef | 16803 | msgstr "打印补丁到标准输出" |
c04f5ac3 | 16804 | |
ec3d4607 | 16805 | #: builtin/log.c:1758 |
ef317cd5 | 16806 | msgid "generate a cover letter" |
d46c5519 | 16807 | msgstr "生成一封附函" |
c04f5ac3 | 16808 | |
ec3d4607 | 16809 | #: builtin/log.c:1760 |
ef317cd5 | 16810 | msgid "use simple number sequence for output file names" |
07432cef | 16811 | msgstr "使用简单的数字序列作为输出文件名" |
c04f5ac3 | 16812 | |
ec3d4607 | 16813 | #: builtin/log.c:1761 |
ef317cd5 | 16814 | msgid "sfx" |
07432cef | 16815 | msgstr "后缀" |
ef317cd5 | 16816 | |
ec3d4607 | 16817 | #: builtin/log.c:1762 |
ef317cd5 | 16818 | msgid "use <sfx> instead of '.patch'" |
07432cef | 16819 | msgstr "使用 <后缀> 代替 '.patch'" |
ef317cd5 | 16820 | |
ec3d4607 | 16821 | #: builtin/log.c:1764 |
ef317cd5 | 16822 | msgid "start numbering patches at <n> instead of 1" |
07432cef WS |
16823 | msgstr "补丁以 <n> 开始编号,而不是1" |
16824 | ||
ec3d4607 | 16825 | #: builtin/log.c:1765 |
33b62fba JX |
16826 | msgid "reroll-count" |
16827 | msgstr "重制-计数" | |
16828 | ||
ec3d4607 | 16829 | #: builtin/log.c:1766 |
07432cef WS |
16830 | msgid "mark the series as Nth re-roll" |
16831 | msgstr "标记补丁系列是第几次重制" | |
ef317cd5 | 16832 | |
ec3d4607 | 16833 | #: builtin/log.c:1768 |
d13389bf JX |
16834 | msgid "max length of output filename" |
16835 | msgstr "输出文件名的最大长度" | |
16836 | ||
ec3d4607 | 16837 | #: builtin/log.c:1770 |
473eb541 | 16838 | msgid "use [RFC PATCH] instead of [PATCH]" |
a0b6b246 JX |
16839 | msgstr "使用 [RFC PATCH] 代替 [PATCH]" |
16840 | ||
ec3d4607 | 16841 | #: builtin/log.c:1773 |
ddc12c42 JX |
16842 | msgid "cover-from-description-mode" |
16843 | msgstr "从分支描述获取附函的模式" | |
16844 | ||
ec3d4607 | 16845 | #: builtin/log.c:1774 |
ddc12c42 JX |
16846 | msgid "generate parts of a cover letter based on a branch's description" |
16847 | msgstr "基于一个分支描述生成部分附函" | |
16848 | ||
ec3d4607 | 16849 | #: builtin/log.c:1776 |
473eb541 | 16850 | msgid "use [<prefix>] instead of [PATCH]" |
07432cef | 16851 | msgstr "使用 [<前缀>] 代替 [PATCH]" |
ef317cd5 | 16852 | |
ec3d4607 | 16853 | #: builtin/log.c:1779 |
ef317cd5 | 16854 | msgid "store resulting files in <dir>" |
d9d56b23 | 16855 | msgstr "把结果文件存储在 <目录>" |
ef317cd5 | 16856 | |
ec3d4607 | 16857 | #: builtin/log.c:1782 |
ef317cd5 | 16858 | msgid "don't strip/add [PATCH]" |
07432cef | 16859 | msgstr "不删除/添加 [PATCH]" |
ef317cd5 | 16860 | |
ec3d4607 | 16861 | #: builtin/log.c:1785 |
ef317cd5 | 16862 | msgid "don't output binary diffs" |
07432cef | 16863 | msgstr "不输出二进制差异" |
ef317cd5 | 16864 | |
ec3d4607 | 16865 | #: builtin/log.c:1787 |
89f80d72 JX |
16866 | msgid "output all-zero hash in From header" |
16867 | msgstr "在 From 头信息中输出全为零的哈希值" | |
16868 | ||
ec3d4607 | 16869 | #: builtin/log.c:1789 |
ef317cd5 | 16870 | msgid "don't include a patch matching a commit upstream" |
07432cef | 16871 | msgstr "不包含已在上游提交中的补丁" |
ef317cd5 | 16872 | |
ec3d4607 | 16873 | #: builtin/log.c:1791 |
ef317cd5 | 16874 | msgid "show patch format instead of default (patch + stat)" |
07432cef | 16875 | msgstr "显示纯补丁格式而非默认的(补丁+状态)" |
ef317cd5 | 16876 | |
ec3d4607 | 16877 | #: builtin/log.c:1793 |
ef317cd5 | 16878 | msgid "Messaging" |
07432cef | 16879 | msgstr "邮件发送" |
ef317cd5 | 16880 | |
ec3d4607 | 16881 | #: builtin/log.c:1794 |
ef317cd5 | 16882 | msgid "header" |
07432cef | 16883 | msgstr "header" |
ef317cd5 | 16884 | |
ec3d4607 | 16885 | #: builtin/log.c:1795 |
ef317cd5 | 16886 | msgid "add email header" |
07432cef | 16887 | msgstr "添加邮件头" |
ef317cd5 | 16888 | |
ec3d4607 | 16889 | #: builtin/log.c:1796 builtin/log.c:1797 |
ef317cd5 | 16890 | msgid "email" |
07432cef | 16891 | msgstr "邮件地址" |
ef317cd5 | 16892 | |
ec3d4607 | 16893 | #: builtin/log.c:1796 |
ef317cd5 | 16894 | msgid "add To: header" |
07432cef | 16895 | msgstr "添加收件人" |
ef317cd5 | 16896 | |
ec3d4607 | 16897 | #: builtin/log.c:1797 |
ef317cd5 | 16898 | msgid "add Cc: header" |
07432cef | 16899 | msgstr "添加抄送" |
ef317cd5 | 16900 | |
ec3d4607 | 16901 | #: builtin/log.c:1798 |
2e8451e8 | 16902 | msgid "ident" |
d9d56b23 | 16903 | msgstr "标识" |
2e8451e8 | 16904 | |
ec3d4607 | 16905 | #: builtin/log.c:1799 |
2e8451e8 | 16906 | msgid "set From address to <ident> (or committer ident if absent)" |
4375c10e | 16907 | msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" |
2e8451e8 | 16908 | |
ec3d4607 | 16909 | #: builtin/log.c:1801 |
ef317cd5 | 16910 | msgid "message-id" |
d9d56b23 | 16911 | msgstr "邮件标识" |
ef317cd5 | 16912 | |
ec3d4607 | 16913 | #: builtin/log.c:1802 |
ef317cd5 | 16914 | msgid "make first mail a reply to <message-id>" |
d9d56b23 | 16915 | msgstr "使第一封邮件作为对 <邮件标识> 的回复" |
ef317cd5 | 16916 | |
ec3d4607 | 16917 | #: builtin/log.c:1803 builtin/log.c:1806 |
ef317cd5 | 16918 | msgid "boundary" |
07432cef | 16919 | msgstr "边界" |
ef317cd5 | 16920 | |
ec3d4607 | 16921 | #: builtin/log.c:1804 |
ef317cd5 | 16922 | msgid "attach the patch" |
07432cef | 16923 | msgstr "附件方式添加补丁" |
ef317cd5 | 16924 | |
ec3d4607 | 16925 | #: builtin/log.c:1807 |
ef317cd5 | 16926 | msgid "inline the patch" |
07432cef | 16927 | msgstr "内联显示补丁" |
ef317cd5 | 16928 | |
ec3d4607 | 16929 | #: builtin/log.c:1811 |
ef317cd5 | 16930 | msgid "enable message threading, styles: shallow, deep" |
07432cef | 16931 | msgstr "启用邮件线索,风格:浅,深" |
ef317cd5 | 16932 | |
ec3d4607 | 16933 | #: builtin/log.c:1813 |
ef317cd5 | 16934 | msgid "signature" |
07432cef | 16935 | msgstr "签名" |
ef317cd5 | 16936 | |
ec3d4607 | 16937 | #: builtin/log.c:1814 |
ef317cd5 | 16938 | msgid "add a signature" |
07432cef | 16939 | msgstr "添加一个签名" |
ef317cd5 | 16940 | |
ec3d4607 | 16941 | #: builtin/log.c:1815 |
5b04ee3b JX |
16942 | msgid "base-commit" |
16943 | msgstr "基线提交" | |
16944 | ||
ec3d4607 | 16945 | #: builtin/log.c:1816 |
5b04ee3b JX |
16946 | msgid "add prerequisite tree info to the patch series" |
16947 | msgstr "为补丁列表添加前置树信息" | |
16948 | ||
ec3d4607 | 16949 | #: builtin/log.c:1819 |
6acbf033 JX |
16950 | msgid "add a signature from a file" |
16951 | msgstr "从文件添加一个签名" | |
16952 | ||
ec3d4607 | 16953 | #: builtin/log.c:1820 |
ef317cd5 | 16954 | msgid "don't print the patch filenames" |
07432cef | 16955 | msgstr "不要打印补丁文件名" |
ef317cd5 | 16956 | |
ec3d4607 | 16957 | #: builtin/log.c:1822 |
6937cb4e JX |
16958 | msgid "show progress while generating patches" |
16959 | msgstr "在生成补丁时显示进度" | |
16960 | ||
ec3d4607 | 16961 | #: builtin/log.c:1824 |
4c27fcb5 | 16962 | msgid "show changes against <rev> in cover letter or single patch" |
ec3d4607 | 16963 | msgstr "在附函或单个补丁中显示和 <版本> 的差异" |
4c27fcb5 | 16964 | |
ec3d4607 | 16965 | #: builtin/log.c:1827 |
4c27fcb5 | 16966 | msgid "show changes against <refspec> in cover letter or single patch" |
ec3d4607 | 16967 | msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" |
4c27fcb5 | 16968 | |
ec3d4607 | 16969 | #: builtin/log.c:1829 builtin/range-diff.c:28 |
4c27fcb5 JX |
16970 | msgid "percentage by which creation is weighted" |
16971 | msgstr "创建权重的百分比" | |
16972 | ||
ec3d4607 | 16973 | #: builtin/log.c:1916 |
a4f16749 JX |
16974 | #, c-format |
16975 | msgid "invalid ident line: %s" | |
16976 | msgstr "包含无效的身份标识:%s" | |
16977 | ||
ec3d4607 | 16978 | #: builtin/log.c:1931 |
c1ac5258 JX |
16979 | msgid "-n and -k are mutually exclusive" |
16980 | msgstr "-n 和 -k 互斥" | |
c04f5ac3 | 16981 | |
ec3d4607 | 16982 | #: builtin/log.c:1933 |
c1ac5258 JX |
16983 | msgid "--subject-prefix/--rfc and -k are mutually exclusive" |
16984 | msgstr "--subject-prefix/--rfc 和 -k 互斥" | |
c04f5ac3 | 16985 | |
ec3d4607 | 16986 | #: builtin/log.c:1941 |
c04f5ac3 JX |
16987 | msgid "--name-only does not make sense" |
16988 | msgstr "--name-only 无意义" | |
16989 | ||
ec3d4607 | 16990 | #: builtin/log.c:1943 |
c04f5ac3 JX |
16991 | msgid "--name-status does not make sense" |
16992 | msgstr "--name-status 无意义" | |
16993 | ||
ec3d4607 | 16994 | #: builtin/log.c:1945 |
c04f5ac3 JX |
16995 | msgid "--check does not make sense" |
16996 | msgstr "--check 无意义" | |
16997 | ||
ec3d4607 | 16998 | #: builtin/log.c:1967 |
d13389bf JX |
16999 | msgid "--stdout, --output, and --output-directory are mutually exclusive" |
17000 | msgstr "--stdout、--output 和 --output-directory 是互斥的" | |
c04f5ac3 | 17001 | |
ec3d4607 | 17002 | #: builtin/log.c:2089 |
4c27fcb5 JX |
17003 | msgid "--interdiff requires --cover-letter or single patch" |
17004 | msgstr "--interdiff 需要 --cover-letter 或单一补丁" | |
17005 | ||
ec3d4607 | 17006 | #: builtin/log.c:2093 |
4c27fcb5 JX |
17007 | msgid "Interdiff:" |
17008 | msgstr "版本间差异:" | |
17009 | ||
ec3d4607 | 17010 | #: builtin/log.c:2094 |
4c27fcb5 JX |
17011 | #, c-format |
17012 | msgid "Interdiff against v%d:" | |
17013 | msgstr "对 v%d 的版本差异:" | |
17014 | ||
ec3d4607 | 17015 | #: builtin/log.c:2100 |
4c27fcb5 JX |
17016 | msgid "--creation-factor requires --range-diff" |
17017 | msgstr "--creation-factor 需要 --range-diff" | |
17018 | ||
ec3d4607 | 17019 | #: builtin/log.c:2104 |
4c27fcb5 JX |
17020 | msgid "--range-diff requires --cover-letter or single patch" |
17021 | msgstr "--range-diff 需要 --cover-letter 或单一补丁" | |
17022 | ||
ec3d4607 | 17023 | #: builtin/log.c:2112 |
4c27fcb5 JX |
17024 | msgid "Range-diff:" |
17025 | msgstr "范围差异:" | |
17026 | ||
ec3d4607 | 17027 | #: builtin/log.c:2113 |
4c27fcb5 JX |
17028 | #, c-format |
17029 | msgid "Range-diff against v%d:" | |
17030 | msgstr "对 v%d 的范围差异:" | |
17031 | ||
ec3d4607 | 17032 | #: builtin/log.c:2124 |
6acbf033 JX |
17033 | #, c-format |
17034 | msgid "unable to read signature file '%s'" | |
17035 | msgstr "无法读取签名文件 '%s'" | |
17036 | ||
ec3d4607 | 17037 | #: builtin/log.c:2160 |
6937cb4e JX |
17038 | msgid "Generating patches" |
17039 | msgstr "生成补丁" | |
17040 | ||
ec3d4607 | 17041 | #: builtin/log.c:2204 |
d46c5519 | 17042 | msgid "failed to create output files" |
c04f5ac3 JX |
17043 | msgstr "无法创建输出文件" |
17044 | ||
ec3d4607 | 17045 | #: builtin/log.c:2263 |
ef317cd5 | 17046 | msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" |
07432cef | 17047 | msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" |
ef317cd5 | 17048 | |
ec3d4607 | 17049 | #: builtin/log.c:2317 |
c04f5ac3 JX |
17050 | #, c-format |
17051 | msgid "" | |
17052 | "Could not find a tracked remote branch, please specify <upstream> manually.\n" | |
d9d56b23 | 17053 | msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n" |
c04f5ac3 | 17054 | |
33b62fba | 17055 | #: builtin/ls-files.c:563 |
814ff314 JX |
17056 | msgid "git ls-files [<options>] [<file>...]" |
17057 | msgstr "git ls-files [<选项>] [<文件>...]" | |
ef317cd5 | 17058 | |
33b62fba | 17059 | #: builtin/ls-files.c:619 |
ef317cd5 | 17060 | msgid "identify the file status with tags" |
07432cef | 17061 | msgstr "用标签标识文件的状态" |
ef317cd5 | 17062 | |
33b62fba | 17063 | #: builtin/ls-files.c:621 |
ef317cd5 | 17064 | msgid "use lowercase letters for 'assume unchanged' files" |
07432cef | 17065 | msgstr "使用小写字母表示 '假设未改变的' 文件" |
ef317cd5 | 17066 | |
33b62fba | 17067 | #: builtin/ls-files.c:623 |
5809aa05 JX |
17068 | msgid "use lowercase letters for 'fsmonitor clean' files" |
17069 | msgstr "使用小写字母表示 'fsmonitor clean' 文件" | |
17070 | ||
33b62fba | 17071 | #: builtin/ls-files.c:625 |
ef317cd5 | 17072 | msgid "show cached files in the output (default)" |
07432cef | 17073 | msgstr "显示缓存的文件(默认)" |
ef317cd5 | 17074 | |
33b62fba | 17075 | #: builtin/ls-files.c:627 |
ef317cd5 | 17076 | msgid "show deleted files in the output" |
07432cef | 17077 | msgstr "显示已删除的文件" |
ef317cd5 | 17078 | |
33b62fba | 17079 | #: builtin/ls-files.c:629 |
ef317cd5 | 17080 | msgid "show modified files in the output" |
07432cef | 17081 | msgstr "显示已修改的文件" |
ef317cd5 | 17082 | |
33b62fba | 17083 | #: builtin/ls-files.c:631 |
ef317cd5 | 17084 | msgid "show other files in the output" |
07432cef | 17085 | msgstr "显示其它文件" |
ef317cd5 | 17086 | |
33b62fba | 17087 | #: builtin/ls-files.c:633 |
ef317cd5 | 17088 | msgid "show ignored files in the output" |
07432cef | 17089 | msgstr "显示忽略的文件" |
ef317cd5 | 17090 | |
33b62fba | 17091 | #: builtin/ls-files.c:636 |
ef317cd5 | 17092 | msgid "show staged contents' object name in the output" |
07432cef | 17093 | msgstr "显示暂存区内容的对象名称" |
ef317cd5 | 17094 | |
33b62fba | 17095 | #: builtin/ls-files.c:638 |
ef317cd5 | 17096 | msgid "show files on the filesystem that need to be removed" |
07432cef | 17097 | msgstr "显示文件系统需要删除的文件" |
ef317cd5 | 17098 | |
33b62fba | 17099 | #: builtin/ls-files.c:640 |
220c313c | 17100 | msgid "show 'other' directories' names only" |
07432cef | 17101 | msgstr "只显示“其他”目录的名称" |
ef317cd5 | 17102 | |
33b62fba | 17103 | #: builtin/ls-files.c:642 |
276ceeaa JX |
17104 | msgid "show line endings of files" |
17105 | msgstr "显示文件换行符格式" | |
17106 | ||
33b62fba | 17107 | #: builtin/ls-files.c:644 |
ef317cd5 | 17108 | msgid "don't show empty directories" |
07432cef | 17109 | msgstr "不显示空目录" |
ef317cd5 | 17110 | |
33b62fba | 17111 | #: builtin/ls-files.c:647 |
ef317cd5 | 17112 | msgid "show unmerged files in the output" |
07432cef | 17113 | msgstr "显示未合并的文件" |
ef317cd5 | 17114 | |
33b62fba | 17115 | #: builtin/ls-files.c:649 |
ef317cd5 | 17116 | msgid "show resolve-undo information" |
07432cef | 17117 | msgstr "显示 resolve-undo 信息" |
ef317cd5 | 17118 | |
33b62fba | 17119 | #: builtin/ls-files.c:651 |
ef317cd5 | 17120 | msgid "skip files matching pattern" |
d9488fea | 17121 | msgstr "跳过和模式匹配的文件" |
ef317cd5 | 17122 | |
33b62fba | 17123 | #: builtin/ls-files.c:654 |
ef317cd5 | 17124 | msgid "exclude patterns are read from <file>" |
07432cef | 17125 | msgstr "从 <文件> 中读取排除模式" |
ef317cd5 | 17126 | |
33b62fba | 17127 | #: builtin/ls-files.c:657 |
ef317cd5 | 17128 | msgid "read additional per-directory exclude patterns in <file>" |
07432cef | 17129 | msgstr "从 <文件> 读取额外的每个目录的排除模式" |
ef317cd5 | 17130 | |
33b62fba | 17131 | #: builtin/ls-files.c:659 |
ef317cd5 | 17132 | msgid "add the standard git exclusions" |
07432cef | 17133 | msgstr "添加标准的 git 排除" |
ef317cd5 | 17134 | |
33b62fba | 17135 | #: builtin/ls-files.c:663 |
ef317cd5 | 17136 | msgid "make the output relative to the project top directory" |
07432cef | 17137 | msgstr "显示相对于顶级目录的文件名" |
ef317cd5 | 17138 | |
33b62fba | 17139 | #: builtin/ls-files.c:666 |
a0b6b246 JX |
17140 | msgid "recurse through submodules" |
17141 | msgstr "在子模组中递归" | |
17142 | ||
33b62fba | 17143 | #: builtin/ls-files.c:668 |
ef317cd5 | 17144 | msgid "if any <file> is not in the index, treat this as an error" |
07432cef | 17145 | msgstr "如果任何 <文件> 都不在索引区,视为错误" |
ef317cd5 | 17146 | |
33b62fba | 17147 | #: builtin/ls-files.c:669 |
ef317cd5 | 17148 | msgid "tree-ish" |
ddc12c42 | 17149 | msgstr "树对象" |
ef317cd5 | 17150 | |
33b62fba | 17151 | #: builtin/ls-files.c:670 |
ef317cd5 | 17152 | msgid "pretend that paths removed since <tree-ish> are still present" |
ddc12c42 | 17153 | msgstr "假装自从 <树对象> 之后删除的路径仍然存在" |
ef317cd5 | 17154 | |
33b62fba | 17155 | #: builtin/ls-files.c:672 |
ef317cd5 | 17156 | msgid "show debugging data" |
07432cef | 17157 | msgstr "显示调试数据" |
ef317cd5 | 17158 | |
33b62fba | 17159 | #: builtin/ls-files.c:674 |
473eb541 JX |
17160 | msgid "suppress duplicate entries" |
17161 | msgstr "抑制重复条目" | |
17162 | ||
fd8cb379 | 17163 | #: builtin/ls-remote.c:9 |
276ceeaa JX |
17164 | msgid "" |
17165 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
17166 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
17167 | " [--symref] [<repository> [<refs>...]]" | |
17168 | msgstr "" | |
17169 | "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" | |
17170 | " [-q | --quiet] [--exit-code] [--get-url]\n" | |
17171 | " [--symref] [<仓库> [<引用>...]]" | |
17172 | ||
473eb541 | 17173 | #: builtin/ls-remote.c:60 |
276ceeaa JX |
17174 | msgid "do not print remote URL" |
17175 | msgstr "不打印远程 URL" | |
17176 | ||
33b62fba | 17177 | #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399 |
276ceeaa JX |
17178 | msgid "exec" |
17179 | msgstr "exec" | |
17180 | ||
473eb541 | 17181 | #: builtin/ls-remote.c:62 builtin/ls-remote.c:64 |
276ceeaa JX |
17182 | msgid "path of git-upload-pack on the remote host" |
17183 | msgstr "远程主机上的 git-upload-pack 路径" | |
17184 | ||
473eb541 | 17185 | #: builtin/ls-remote.c:66 |
276ceeaa JX |
17186 | msgid "limit to tags" |
17187 | msgstr "仅限于标签" | |
17188 | ||
473eb541 | 17189 | #: builtin/ls-remote.c:67 |
276ceeaa JX |
17190 | msgid "limit to heads" |
17191 | msgstr "仅限于分支" | |
17192 | ||
473eb541 | 17193 | #: builtin/ls-remote.c:68 |
276ceeaa JX |
17194 | msgid "do not show peeled tags" |
17195 | msgstr "不显示已解析的标签" | |
17196 | ||
473eb541 | 17197 | #: builtin/ls-remote.c:70 |
276ceeaa JX |
17198 | msgid "take url.<base>.insteadOf into account" |
17199 | msgstr "参考 url.<base>.insteadOf 设置" | |
17200 | ||
473eb541 | 17201 | #: builtin/ls-remote.c:73 |
276ceeaa JX |
17202 | msgid "exit with exit code 2 if no matching refs are found" |
17203 | msgstr "若未找到匹配的引用则以退出码2退出" | |
17204 | ||
473eb541 | 17205 | #: builtin/ls-remote.c:76 |
276ceeaa JX |
17206 | msgid "show underlying ref in addition to the object pointed by it" |
17207 | msgstr "除了显示指向的对象外,显示指向的引用名" | |
17208 | ||
c1ac5258 | 17209 | #: builtin/ls-tree.c:30 |
ef317cd5 | 17210 | msgid "git ls-tree [<options>] <tree-ish> [<path>...]" |
ddc12c42 | 17211 | msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" |
ef317cd5 | 17212 | |
c1ac5258 | 17213 | #: builtin/ls-tree.c:128 |
ef317cd5 | 17214 | msgid "only show trees" |
07432cef | 17215 | msgstr "只显示树" |
ef317cd5 | 17216 | |
c1ac5258 | 17217 | #: builtin/ls-tree.c:130 |
ef317cd5 | 17218 | msgid "recurse into subtrees" |
07432cef | 17219 | msgstr "递归到子树" |
ef317cd5 | 17220 | |
c1ac5258 | 17221 | #: builtin/ls-tree.c:132 |
ef317cd5 | 17222 | msgid "show trees when recursing" |
07432cef | 17223 | msgstr "当递归时显示树" |
ef317cd5 | 17224 | |
c1ac5258 | 17225 | #: builtin/ls-tree.c:135 |
ef317cd5 | 17226 | msgid "terminate entries with NUL byte" |
4375c10e | 17227 | msgstr "条目以 NUL 字符终止" |
ef317cd5 | 17228 | |
c1ac5258 | 17229 | #: builtin/ls-tree.c:136 |
ef317cd5 | 17230 | msgid "include object size" |
07432cef | 17231 | msgstr "包括对象大小" |
ef317cd5 | 17232 | |
c1ac5258 | 17233 | #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 |
ef317cd5 | 17234 | msgid "list only filenames" |
07432cef | 17235 | msgstr "只列出文件名" |
ef317cd5 | 17236 | |
c1ac5258 | 17237 | #: builtin/ls-tree.c:143 |
ef317cd5 | 17238 | msgid "use full path names" |
07432cef | 17239 | msgstr "使用文件的全路径" |
ef317cd5 | 17240 | |
c1ac5258 | 17241 | #: builtin/ls-tree.c:145 |
ef317cd5 | 17242 | msgid "list entire tree; not just current directory (implies --full-name)" |
07432cef | 17243 | msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" |
ef317cd5 | 17244 | |
33b62fba JX |
17245 | #. TRANSLATORS: keep <> in "<" mail ">" info. |
17246 | #: builtin/mailinfo.c:14 | |
17247 | msgid "git mailinfo [<options>] <msg> <patch> < mail >info" | |
17248 | msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info" | |
17249 | ||
17250 | #: builtin/mailinfo.c:58 | |
17251 | msgid "keep subject" | |
17252 | msgstr "保持主题" | |
17253 | ||
17254 | #: builtin/mailinfo.c:60 | |
17255 | msgid "keep non patch brackets in subject" | |
7b4d4954 | 17256 | msgstr "在主题中保持无补丁括号标注" |
33b62fba JX |
17257 | |
17258 | #: builtin/mailinfo.c:62 | |
17259 | msgid "copy Message-ID to the end of commit message" | |
17260 | msgstr "拷贝 Message-ID 至提交说明结尾" | |
17261 | ||
17262 | #: builtin/mailinfo.c:64 | |
17263 | msgid "re-code metadata to i18n.commitEncoding" | |
17264 | msgstr "将元数据重新编码为 i18n.commitEncoding" | |
17265 | ||
17266 | #: builtin/mailinfo.c:67 | |
17267 | msgid "disable charset re-coding of metadata" | |
17268 | msgstr "禁用元数据的字符集重新编码" | |
17269 | ||
17270 | #: builtin/mailinfo.c:69 | |
17271 | msgid "encoding" | |
17272 | msgstr "编码" | |
17273 | ||
17274 | #: builtin/mailinfo.c:70 | |
17275 | msgid "re-code metadata to this encoding" | |
17276 | msgstr "将元数据用此编码重新编码" | |
17277 | ||
17278 | #: builtin/mailinfo.c:72 | |
17279 | msgid "use scissors" | |
17280 | msgstr "使用剪刀标记" | |
17281 | ||
17282 | #: builtin/mailinfo.c:73 | |
17283 | msgid "<action>" | |
17284 | msgstr "<动作>" | |
17285 | ||
17286 | #: builtin/mailinfo.c:74 | |
17287 | msgid "action when quoted CR is found" | |
523ccf5d | 17288 | msgstr "找到引号中的 CR 时的操作" |
33b62fba JX |
17289 | |
17290 | #: builtin/mailinfo.c:77 | |
17291 | msgid "use headers in message's body" | |
7b4d4954 | 17292 | msgstr "在消息正文中使用标头" |
33b62fba | 17293 | |
a4f16749 JX |
17294 | #: builtin/mailsplit.c:241 |
17295 | #, c-format | |
17296 | msgid "empty mbox: '%s'" | |
17297 | msgstr "空的 mbox:'%s'" | |
17298 | ||
349ede6a JX |
17299 | #: builtin/merge-base.c:32 |
17300 | msgid "git merge-base [-a | --all] <commit> <commit>..." | |
17301 | msgstr "git merge-base [-a | --all] <提交> <提交>..." | |
17302 | ||
17303 | #: builtin/merge-base.c:33 | |
17304 | msgid "git merge-base [-a | --all] --octopus <commit>..." | |
17305 | msgstr "git merge-base [-a | --all] --octopus <提交>..." | |
17306 | ||
17307 | #: builtin/merge-base.c:34 | |
17308 | msgid "git merge-base --independent <commit>..." | |
17309 | msgstr "git merge-base --independent <提交>..." | |
17310 | ||
17311 | #: builtin/merge-base.c:35 | |
17312 | msgid "git merge-base --is-ancestor <commit> <commit>" | |
17313 | msgstr "git merge-base --is-ancestor <提交> <提交>" | |
17314 | ||
17315 | #: builtin/merge-base.c:36 | |
17316 | msgid "git merge-base --fork-point <ref> [<commit>]" | |
17317 | msgstr "git merge-base --fork-point <引用> [<提交>]" | |
17318 | ||
17319 | #: builtin/merge-base.c:143 | |
17320 | msgid "output all common ancestors" | |
17321 | msgstr "输出所有共同的祖先" | |
17322 | ||
17323 | #: builtin/merge-base.c:145 | |
17324 | msgid "find ancestors for a single n-way merge" | |
17325 | msgstr "查找一个多路合并的祖先提交" | |
17326 | ||
17327 | #: builtin/merge-base.c:147 | |
17328 | msgid "list revs not reachable from others" | |
17329 | msgstr "显示不能被其他访问到的版本" | |
17330 | ||
17331 | #: builtin/merge-base.c:149 | |
17332 | msgid "is the first one ancestor of the other?" | |
17333 | msgstr "第一个是其他的祖先提交么?" | |
17334 | ||
17335 | #: builtin/merge-base.c:151 | |
17336 | msgid "find where <commit> forked from reflog of <ref>" | |
17337 | msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点" | |
17338 | ||
17339 | #: builtin/merge-file.c:9 | |
17340 | msgid "" | |
17341 | "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " | |
17342 | "<orig-file> <file2>" | |
17343 | msgstr "" | |
17344 | "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" | |
17345 | "始文件> <文件2>" | |
17346 | ||
17347 | #: builtin/merge-file.c:35 | |
17348 | msgid "send results to standard output" | |
17349 | msgstr "将结果发送到标准输出" | |
17350 | ||
17351 | #: builtin/merge-file.c:36 | |
17352 | msgid "use a diff3 based merge" | |
17353 | msgstr "使用基于 diff3 的合并" | |
17354 | ||
17355 | #: builtin/merge-file.c:37 | |
17356 | msgid "for conflicts, use our version" | |
17357 | msgstr "如果冲突,使用我们的版本" | |
17358 | ||
17359 | #: builtin/merge-file.c:39 | |
17360 | msgid "for conflicts, use their version" | |
17361 | msgstr "如果冲突,使用他们的版本" | |
17362 | ||
17363 | #: builtin/merge-file.c:41 | |
17364 | msgid "for conflicts, use a union version" | |
17365 | msgstr "如果冲突,使用联合版本" | |
17366 | ||
17367 | #: builtin/merge-file.c:44 | |
17368 | msgid "for conflicts, use this marker size" | |
17369 | msgstr "如果冲突,使用指定长度的标记" | |
17370 | ||
17371 | #: builtin/merge-file.c:45 | |
17372 | msgid "do not warn about conflicts" | |
17373 | msgstr "不要警告冲突" | |
17374 | ||
17375 | #: builtin/merge-file.c:47 | |
17376 | msgid "set labels for file1/orig-file/file2" | |
17377 | msgstr "为 文件1/初始文件/文件2 设置标签" | |
17378 | ||
17379 | #: builtin/merge-recursive.c:47 | |
17380 | #, c-format | |
17381 | msgid "unknown option %s" | |
17382 | msgstr "未知选项 %s" | |
17383 | ||
17384 | #: builtin/merge-recursive.c:53 | |
17385 | #, c-format | |
17386 | msgid "could not parse object '%s'" | |
17387 | msgstr "不能解析对象 '%s'" | |
17388 | ||
17389 | #: builtin/merge-recursive.c:57 | |
17390 | #, c-format | |
17391 | msgid "cannot handle more than %d base. Ignoring %s." | |
17392 | msgid_plural "cannot handle more than %d bases. Ignoring %s." | |
17393 | msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" | |
17394 | msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" | |
17395 | ||
17396 | #: builtin/merge-recursive.c:65 | |
17397 | msgid "not handling anything other than two heads merge." | |
17398 | msgstr "不能处理两个头合并之外的任何操作。" | |
17399 | ||
17400 | #: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 | |
17401 | #, c-format | |
17402 | msgid "could not resolve ref '%s'" | |
17403 | msgstr "无法解析引用 '%s'" | |
17404 | ||
17405 | #: builtin/merge-recursive.c:82 | |
17406 | #, c-format | |
17407 | msgid "Merging %s with %s\n" | |
17408 | msgstr "合并 %s 和 %s\n" | |
17409 | ||
473eb541 | 17410 | #: builtin/merge.c:58 |
814ff314 JX |
17411 | msgid "git merge [<options>] [<commit>...]" |
17412 | msgstr "git merge [<选项>] [<提交>...]" | |
ef317cd5 | 17413 | |
473eb541 | 17414 | #: builtin/merge.c:123 |
c04f5ac3 JX |
17415 | msgid "switch `m' requires a value" |
17416 | msgstr "开关 `m' 需要一个值" | |
17417 | ||
473eb541 | 17418 | #: builtin/merge.c:146 |
06991777 JX |
17419 | #, c-format |
17420 | msgid "option `%s' requires a value" | |
17421 | msgstr "选项 `%s' 需要一个值" | |
17422 | ||
473eb541 | 17423 | #: builtin/merge.c:199 |
c04f5ac3 JX |
17424 | #, c-format |
17425 | msgid "Could not find merge strategy '%s'.\n" | |
90e6ef53 | 17426 | msgstr "不能找到合并策略 '%s'。\n" |
c04f5ac3 | 17427 | |
473eb541 | 17428 | #: builtin/merge.c:200 |
c04f5ac3 JX |
17429 | #, c-format |
17430 | msgid "Available strategies are:" | |
17431 | msgstr "可用的策略有:" | |
17432 | ||
473eb541 | 17433 | #: builtin/merge.c:205 |
c04f5ac3 JX |
17434 | #, c-format |
17435 | msgid "Available custom strategies are:" | |
17436 | msgstr "可用的自定义策略有:" | |
17437 | ||
473eb541 | 17438 | #: builtin/merge.c:256 builtin/pull.c:133 |
ef317cd5 | 17439 | msgid "do not show a diffstat at the end of the merge" |
07432cef | 17440 | msgstr "在合并的最后不显示差异统计" |
ef317cd5 | 17441 | |
473eb541 | 17442 | #: builtin/merge.c:259 builtin/pull.c:136 |
ef317cd5 | 17443 | msgid "show a diffstat at the end of the merge" |
07432cef | 17444 | msgstr "在合并的最后显示差异统计" |
ef317cd5 | 17445 | |
473eb541 | 17446 | #: builtin/merge.c:260 builtin/pull.c:139 |
ef317cd5 | 17447 | msgid "(synonym to --stat)" |
07432cef | 17448 | msgstr "(和 --stat 同义)" |
ef317cd5 | 17449 | |
473eb541 | 17450 | #: builtin/merge.c:262 builtin/pull.c:142 |
ef317cd5 | 17451 | msgid "add (at most <n>) entries from shortlog to merge commit message" |
07432cef | 17452 | msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" |
ef317cd5 | 17453 | |
473eb541 | 17454 | #: builtin/merge.c:265 builtin/pull.c:148 |
ef317cd5 | 17455 | msgid "create a single commit instead of doing a merge" |
07432cef | 17456 | msgstr "创建一个单独的提交而不是做一次合并" |
ef317cd5 | 17457 | |
473eb541 | 17458 | #: builtin/merge.c:267 builtin/pull.c:151 |
ef317cd5 | 17459 | msgid "perform a commit if the merge succeeds (default)" |
07432cef | 17460 | msgstr "如果合并成功,执行一次提交(默认)" |
ef317cd5 | 17461 | |
473eb541 | 17462 | #: builtin/merge.c:269 builtin/pull.c:154 |
ef317cd5 | 17463 | msgid "edit message before committing" |
07432cef | 17464 | msgstr "在提交前编辑提交说明" |
ef317cd5 | 17465 | |
473eb541 | 17466 | #: builtin/merge.c:271 |
ef317cd5 | 17467 | msgid "allow fast-forward (default)" |
07432cef | 17468 | msgstr "允许快进(默认)" |
ef317cd5 | 17469 | |
473eb541 | 17470 | #: builtin/merge.c:273 builtin/pull.c:161 |
ef317cd5 | 17471 | msgid "abort if fast-forward is not possible" |
07432cef | 17472 | msgstr "如果不能快进就放弃合并" |
ef317cd5 | 17473 | |
473eb541 | 17474 | #: builtin/merge.c:277 builtin/pull.c:164 |
5c57d762 | 17475 | msgid "verify that the named commit has a valid GPG signature" |
1003b3a5 JX |
17476 | msgstr "验证指定的提交是否包含一个有效的 GPG 签名" |
17477 | ||
473eb541 | 17478 | #: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 |
33b62fba | 17479 | #: builtin/rebase.c:540 builtin/rebase.c:1413 builtin/revert.c:114 |
ef317cd5 | 17480 | msgid "strategy" |
07432cef | 17481 | msgstr "策略" |
ef317cd5 | 17482 | |
473eb541 | 17483 | #: builtin/merge.c:279 builtin/pull.c:169 |
ef317cd5 | 17484 | msgid "merge strategy to use" |
07432cef | 17485 | msgstr "要使用的合并策略" |
ef317cd5 | 17486 | |
473eb541 | 17487 | #: builtin/merge.c:280 builtin/pull.c:172 |
ef317cd5 | 17488 | msgid "option=value" |
07432cef | 17489 | msgstr "option=value" |
ef317cd5 | 17490 | |
473eb541 | 17491 | #: builtin/merge.c:281 builtin/pull.c:173 |
ef317cd5 | 17492 | msgid "option for selected merge strategy" |
07432cef | 17493 | msgstr "所选的合并策略的选项" |
ef317cd5 | 17494 | |
473eb541 | 17495 | #: builtin/merge.c:283 |
ef317cd5 | 17496 | msgid "merge commit message (for a non-fast-forward merge)" |
07432cef | 17497 | msgstr "合并的提交说明(针对非快进式合并)" |
ef317cd5 | 17498 | |
473eb541 | 17499 | #: builtin/merge.c:290 |
ef317cd5 | 17500 | msgid "abort the current in-progress merge" |
07432cef | 17501 | msgstr "放弃当前正在进行的合并" |
ef317cd5 | 17502 | |
a6cd2cc4 | 17503 | # |
473eb541 | 17504 | #: builtin/merge.c:292 |
a6cd2cc4 JX |
17505 | msgid "--abort but leave index and working tree alone" |
17506 | msgstr "--abort,但是保留索引和工作区" | |
17507 | ||
473eb541 | 17508 | #: builtin/merge.c:294 |
1a79b2f1 JX |
17509 | msgid "continue the current in-progress merge" |
17510 | msgstr "继续当前正在进行的合并" | |
17511 | ||
473eb541 | 17512 | #: builtin/merge.c:296 builtin/pull.c:180 |
5b04ee3b JX |
17513 | msgid "allow merging unrelated histories" |
17514 | msgstr "允许合并不相关的历史" | |
17515 | ||
473eb541 | 17516 | #: builtin/merge.c:303 |
a5cd71ca JX |
17517 | msgid "bypass pre-merge-commit and commit-msg hooks" |
17518 | msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" | |
6937cb4e | 17519 | |
473eb541 | 17520 | #: builtin/merge.c:320 |
c04f5ac3 | 17521 | msgid "could not run stash." |
a4f16749 | 17522 | msgstr "不能运行贮藏。" |
c04f5ac3 | 17523 | |
473eb541 | 17524 | #: builtin/merge.c:325 |
c04f5ac3 | 17525 | msgid "stash failed" |
a4f16749 | 17526 | msgstr "贮藏失败" |
c04f5ac3 | 17527 | |
473eb541 | 17528 | #: builtin/merge.c:330 |
c04f5ac3 JX |
17529 | #, c-format |
17530 | msgid "not a valid object: %s" | |
17531 | msgstr "不是一个有效对象:%s" | |
17532 | ||
473eb541 | 17533 | #: builtin/merge.c:352 builtin/merge.c:369 |
c04f5ac3 JX |
17534 | msgid "read-tree failed" |
17535 | msgstr "读取树失败" | |
17536 | ||
33b62fba JX |
17537 | #: builtin/merge.c:400 |
17538 | msgid "Already up to date. (nothing to squash)" | |
17539 | msgstr "已经是最新的。(无可挤压)" | |
c04f5ac3 | 17540 | |
33b62fba | 17541 | #: builtin/merge.c:414 |
c04f5ac3 JX |
17542 | #, c-format |
17543 | msgid "Squash commit -- not updating HEAD\n" | |
33b62fba | 17544 | msgstr "挤压提交 -- 未更新 HEAD\n" |
c04f5ac3 | 17545 | |
33b62fba | 17546 | #: builtin/merge.c:464 |
c04f5ac3 JX |
17547 | #, c-format |
17548 | msgid "No merge message -- not updating HEAD\n" | |
17549 | msgstr "无合并信息 -- 未更新 HEAD\n" | |
17550 | ||
33b62fba | 17551 | #: builtin/merge.c:515 |
c04f5ac3 JX |
17552 | #, c-format |
17553 | msgid "'%s' does not point to a commit" | |
17554 | msgstr "'%s' 没有指向一个提交" | |
17555 | ||
ec3d4607 | 17556 | #: builtin/merge.c:603 |
c04f5ac3 JX |
17557 | #, c-format |
17558 | msgid "Bad branch.%s.mergeoptions string: %s" | |
90e6ef53 | 17559 | msgstr "坏的 branch.%s.mergeoptions 字符串:%s" |
c04f5ac3 | 17560 | |
ec3d4607 | 17561 | #: builtin/merge.c:729 |
c04f5ac3 | 17562 | msgid "Not handling anything other than two heads merge." |
29004bbb | 17563 | msgstr "未处理两个头合并之外的任何操作。" |
c04f5ac3 | 17564 | |
ec3d4607 | 17565 | #: builtin/merge.c:742 |
c04f5ac3 JX |
17566 | #, c-format |
17567 | msgid "Unknown option for merge-recursive: -X%s" | |
17568 | msgstr "merge-recursive 的未知选项:-X%s" | |
17569 | ||
ec3d4607 | 17570 | #: builtin/merge.c:761 t/helper/test-fast-rebase.c:223 |
c04f5ac3 JX |
17571 | #, c-format |
17572 | msgid "unable to write %s" | |
17573 | msgstr "不能写 %s" | |
17574 | ||
ec3d4607 | 17575 | #: builtin/merge.c:813 |
c04f5ac3 JX |
17576 | #, c-format |
17577 | msgid "Could not read from '%s'" | |
17578 | msgstr "不能从 '%s' 读取" | |
17579 | ||
ec3d4607 | 17580 | #: builtin/merge.c:822 |
c04f5ac3 JX |
17581 | #, c-format |
17582 | msgid "Not committing merge; use 'git commit' to complete the merge.\n" | |
17583 | msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" | |
17584 | ||
ec3d4607 | 17585 | #: builtin/merge.c:828 |
c04f5ac3 JX |
17586 | msgid "" |
17587 | "Please enter a commit message to explain why this merge is necessary,\n" | |
17588 | "especially if it merges an updated upstream into a topic branch.\n" | |
17589 | "\n" | |
c04f5ac3 JX |
17590 | msgstr "" |
17591 | "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" | |
17592 | "合并到主题分支。\n" | |
17593 | "\n" | |
c04f5ac3 | 17594 | |
ec3d4607 | 17595 | #: builtin/merge.c:833 |
d46c5519 | 17596 | msgid "An empty message aborts the commit.\n" |
5b533632 | 17597 | msgstr "空的提交说明会终止提交。\n" |
d46c5519 | 17598 | |
ec3d4607 | 17599 | #: builtin/merge.c:836 |
d46c5519 JX |
17600 | #, c-format |
17601 | msgid "" | |
17602 | "Lines starting with '%c' will be ignored, and an empty message aborts\n" | |
17603 | "the commit.\n" | |
5b533632 | 17604 | msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n" |
d46c5519 | 17605 | |
ec3d4607 | 17606 | #: builtin/merge.c:889 |
c04f5ac3 JX |
17607 | msgid "Empty commit message." |
17608 | msgstr "空提交信息。" | |
17609 | ||
ec3d4607 | 17610 | #: builtin/merge.c:904 |
c04f5ac3 JX |
17611 | #, c-format |
17612 | msgid "Wonderful.\n" | |
17613 | msgstr "太棒了。\n" | |
17614 | ||
ec3d4607 | 17615 | #: builtin/merge.c:965 |
c04f5ac3 JX |
17616 | #, c-format |
17617 | msgid "Automatic merge failed; fix conflicts and then commit the result.\n" | |
17618 | msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" | |
17619 | ||
ec3d4607 | 17620 | #: builtin/merge.c:1004 |
c04f5ac3 | 17621 | msgid "No current branch." |
90e6ef53 | 17622 | msgstr "没有当前分支。" |
c04f5ac3 | 17623 | |
ec3d4607 | 17624 | #: builtin/merge.c:1006 |
c04f5ac3 | 17625 | msgid "No remote for the current branch." |
160fb2b2 | 17626 | msgstr "当前分支没有对应的远程仓库。" |
c04f5ac3 | 17627 | |
ec3d4607 | 17628 | #: builtin/merge.c:1008 |
c04f5ac3 | 17629 | msgid "No default upstream defined for the current branch." |
90e6ef53 | 17630 | msgstr "当前分支没有定义默认的上游分支。" |
c04f5ac3 | 17631 | |
ec3d4607 | 17632 | #: builtin/merge.c:1013 |
170e9899 | 17633 | #, c-format |
2e8451e8 JX |
17634 | msgid "No remote-tracking branch for %s from %s" |
17635 | msgstr "对于 %s 没有来自 %s 的远程跟踪分支" | |
170e9899 | 17636 | |
ec3d4607 | 17637 | #: builtin/merge.c:1070 |
5c57d762 JX |
17638 | #, c-format |
17639 | msgid "Bad value '%s' in environment '%s'" | |
9a4b694c | 17640 | msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" |
5c57d762 | 17641 | |
ec3d4607 | 17642 | #: builtin/merge.c:1173 |
5c57d762 JX |
17643 | #, c-format |
17644 | msgid "not something we can merge in %s: %s" | |
17645 | msgstr "不能在 %s 中合并:%s" | |
17646 | ||
ec3d4607 | 17647 | #: builtin/merge.c:1207 |
5c57d762 JX |
17648 | msgid "not something we can merge" |
17649 | msgstr "不能合并" | |
17650 | ||
ec3d4607 | 17651 | #: builtin/merge.c:1317 |
1a79b2f1 JX |
17652 | msgid "--abort expects no arguments" |
17653 | msgstr "--abort 不带参数" | |
17654 | ||
ec3d4607 | 17655 | #: builtin/merge.c:1321 |
c04f5ac3 | 17656 | msgid "There is no merge to abort (MERGE_HEAD missing)." |
90e6ef53 | 17657 | msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" |
c04f5ac3 | 17658 | |
ec3d4607 | 17659 | #: builtin/merge.c:1339 |
a6cd2cc4 JX |
17660 | msgid "--quit expects no arguments" |
17661 | msgstr "--quit 不带参数" | |
17662 | ||
ec3d4607 | 17663 | #: builtin/merge.c:1352 |
1a79b2f1 JX |
17664 | msgid "--continue expects no arguments" |
17665 | msgstr "--continue 不带参数" | |
17666 | ||
ec3d4607 | 17667 | #: builtin/merge.c:1356 |
1a79b2f1 JX |
17668 | msgid "There is no merge in progress (MERGE_HEAD missing)." |
17669 | msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" | |
17670 | ||
ec3d4607 | 17671 | #: builtin/merge.c:1372 |
c04f5ac3 JX |
17672 | msgid "" |
17673 | "You have not concluded your merge (MERGE_HEAD exists).\n" | |
220c313c | 17674 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
17675 | msgstr "" |
17676 | "您尚未结束您的合并(存在 MERGE_HEAD)。\n" | |
90e6ef53 | 17677 | "请在合并前先提交您的修改。" |
c04f5ac3 | 17678 | |
ec3d4607 | 17679 | #: builtin/merge.c:1379 |
c04f5ac3 JX |
17680 | msgid "" |
17681 | "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" | |
220c313c | 17682 | "Please, commit your changes before you merge." |
c04f5ac3 JX |
17683 | msgstr "" |
17684 | "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" | |
90e6ef53 | 17685 | "请在合并前先提交您的修改。" |
c04f5ac3 | 17686 | |
ec3d4607 | 17687 | #: builtin/merge.c:1382 |
c04f5ac3 JX |
17688 | msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." |
17689 | msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" | |
17690 | ||
ec3d4607 | 17691 | #: builtin/merge.c:1396 |
c04f5ac3 | 17692 | msgid "You cannot combine --squash with --no-ff." |
a6cd2cc4 | 17693 | msgstr "您不能将 --squash 和 --no-ff 组合使用。" |
c04f5ac3 | 17694 | |
ec3d4607 | 17695 | #: builtin/merge.c:1398 |
a6cd2cc4 JX |
17696 | msgid "You cannot combine --squash with --commit." |
17697 | msgstr "您不能将 --squash 和 --commit 组合使用。" | |
17698 | ||
ec3d4607 | 17699 | #: builtin/merge.c:1414 |
c04f5ac3 | 17700 | msgid "No commit specified and merge.defaultToUpstream not set." |
90e6ef53 | 17701 | msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" |
c04f5ac3 | 17702 | |
ec3d4607 | 17703 | #: builtin/merge.c:1431 |
c04f5ac3 JX |
17704 | msgid "Squash commit into empty head not supported yet" |
17705 | msgstr "尚不支持到空分支的压缩提交" | |
17706 | ||
ec3d4607 | 17707 | #: builtin/merge.c:1433 |
c04f5ac3 JX |
17708 | msgid "Non-fast-forward commit does not make sense into an empty head" |
17709 | msgstr "到空分支的非快进式提交没有意义" | |
17710 | ||
ec3d4607 | 17711 | #: builtin/merge.c:1438 |
2e8451e8 JX |
17712 | #, c-format |
17713 | msgid "%s - not something we can merge" | |
17714 | msgstr "%s - 不能被合并" | |
17715 | ||
ec3d4607 | 17716 | #: builtin/merge.c:1440 |
7aea43ff JX |
17717 | msgid "Can merge only exactly one commit into empty head" |
17718 | msgstr "只能将一个提交合并到空分支上" | |
17719 | ||
ec3d4607 | 17720 | #: builtin/merge.c:1521 |
5b04ee3b JX |
17721 | msgid "refusing to merge unrelated histories" |
17722 | msgstr "拒绝合并无关的历史" | |
17723 | ||
ec3d4607 | 17724 | #: builtin/merge.c:1540 |
c04f5ac3 JX |
17725 | #, c-format |
17726 | msgid "Updating %s..%s\n" | |
17727 | msgstr "更新 %s..%s\n" | |
17728 | ||
ec3d4607 | 17729 | #: builtin/merge.c:1587 |
c04f5ac3 JX |
17730 | #, c-format |
17731 | msgid "Trying really trivial in-index merge...\n" | |
90e6ef53 | 17732 | msgstr "尝试非常小的索引内合并...\n" |
c04f5ac3 | 17733 | |
ec3d4607 | 17734 | #: builtin/merge.c:1594 |
c04f5ac3 JX |
17735 | #, c-format |
17736 | msgid "Nope.\n" | |
17737 | msgstr "无。\n" | |
17738 | ||
ec3d4607 | 17739 | #: builtin/merge.c:1625 |
c04f5ac3 | 17740 | msgid "Not possible to fast-forward, aborting." |
1aabac65 | 17741 | msgstr "无法快进,终止。" |
c04f5ac3 | 17742 | |
ec3d4607 | 17743 | #: builtin/merge.c:1653 builtin/merge.c:1719 |
c04f5ac3 JX |
17744 | #, c-format |
17745 | msgid "Rewinding the tree to pristine...\n" | |
17746 | msgstr "将树回滚至原始状态...\n" | |
17747 | ||
ec3d4607 | 17748 | #: builtin/merge.c:1657 |
c04f5ac3 JX |
17749 | #, c-format |
17750 | msgid "Trying merge strategy %s...\n" | |
17751 | msgstr "尝试合并策略 %s...\n" | |
17752 | ||
ec3d4607 | 17753 | #: builtin/merge.c:1709 |
c04f5ac3 JX |
17754 | #, c-format |
17755 | msgid "No merge strategy handled the merge.\n" | |
17756 | msgstr "没有合并策略处理此合并。\n" | |
17757 | ||
ec3d4607 | 17758 | #: builtin/merge.c:1711 |
c04f5ac3 JX |
17759 | #, c-format |
17760 | msgid "Merge with strategy %s failed.\n" | |
17761 | msgstr "使用策略 %s 合并失败。\n" | |
17762 | ||
ec3d4607 | 17763 | #: builtin/merge.c:1721 |
c04f5ac3 | 17764 | #, c-format |
ec3d4607 JX |
17765 | msgid "Using the %s strategy to prepare resolving by hand.\n" |
17766 | msgstr "使用 %s 策略以准备手工解决。\n" | |
c04f5ac3 | 17767 | |
ec3d4607 | 17768 | #: builtin/merge.c:1735 |
c04f5ac3 JX |
17769 | #, c-format |
17770 | msgid "Automatic merge went well; stopped before committing as requested\n" | |
17771 | msgstr "自动合并进展顺利,按要求在提交前停止\n" | |
17772 | ||
473eb541 JX |
17773 | #: builtin/mktag.c:10 |
17774 | msgid "git mktag" | |
17775 | msgstr "git mktag" | |
17776 | ||
33b62fba | 17777 | #: builtin/mktag.c:27 |
473eb541 JX |
17778 | #, c-format |
17779 | msgid "warning: tag input does not pass fsck: %s" | |
17780 | msgstr "警告:标签输入未通过 fsck:%s" | |
17781 | ||
33b62fba | 17782 | #: builtin/mktag.c:38 |
473eb541 JX |
17783 | #, c-format |
17784 | msgid "error: tag input does not pass fsck: %s" | |
17785 | msgstr "错误:标签输入未通过 fsck:%s" | |
17786 | ||
33b62fba | 17787 | #: builtin/mktag.c:41 |
473eb541 JX |
17788 | #, c-format |
17789 | msgid "%d (FSCK_IGNORE?) should never trigger this callback" | |
ae4e099e | 17790 | msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" |
473eb541 | 17791 | |
33b62fba | 17792 | #: builtin/mktag.c:56 |
473eb541 JX |
17793 | #, c-format |
17794 | msgid "could not read tagged object '%s'" | |
17795 | msgstr "不能读取被标记的对象 '%s'" | |
17796 | ||
33b62fba | 17797 | #: builtin/mktag.c:59 |
473eb541 JX |
17798 | #, c-format |
17799 | msgid "object '%s' tagged as '%s', but is a '%s' type" | |
17800 | msgstr "对象 '%s' 被标记为 '%s',然而是一个 '%s' 类型" | |
17801 | ||
33b62fba | 17802 | #: builtin/mktag.c:97 |
473eb541 JX |
17803 | msgid "tag on stdin did not pass our strict fsck check" |
17804 | msgstr "标准输入上的标签未通过我们严格的 fsck 检查" | |
17805 | ||
33b62fba | 17806 | #: builtin/mktag.c:100 |
473eb541 JX |
17807 | msgid "tag on stdin did not refer to a valid object" |
17808 | msgstr "标准输入上的标签未指向一个有效的对象" | |
17809 | ||
33b62fba | 17810 | #: builtin/mktag.c:103 builtin/tag.c:243 |
473eb541 JX |
17811 | msgid "unable to write tag file" |
17812 | msgstr "无法写标签文件" | |
17813 | ||
349ede6a JX |
17814 | #: builtin/mktree.c:66 |
17815 | msgid "git mktree [-z] [--missing] [--batch]" | |
17816 | msgstr "git mktree [-z] [--missing] [--batch]" | |
c04f5ac3 | 17817 | |
c1ac5258 | 17818 | #: builtin/mktree.c:154 |
ef317cd5 | 17819 | msgid "input is NUL terminated" |
07432cef | 17820 | msgstr "输入以 NUL 字符终止" |
c04f5ac3 | 17821 | |
06991777 | 17822 | #: builtin/mktree.c:155 builtin/write-tree.c:26 |
ef317cd5 | 17823 | msgid "allow missing objects" |
07432cef | 17824 | msgstr "允许丢失的对象" |
c04f5ac3 | 17825 | |
c1ac5258 | 17826 | #: builtin/mktree.c:156 |
ef317cd5 | 17827 | msgid "allow creation of more than one tree" |
07432cef | 17828 | msgstr "允许创建一个以上的树" |
c04f5ac3 | 17829 | |
33b62fba JX |
17830 | #: builtin/multi-pack-index.c:10 |
17831 | msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]" | |
17832 | msgstr "git multi-pack-index [<选项>] write [--preferred-pack=<包>]" | |
17833 | ||
17834 | #: builtin/multi-pack-index.c:13 | |
17835 | msgid "git multi-pack-index [<options>] verify" | |
17836 | msgstr "git multi-pack-index [<选项>] verify" | |
17837 | ||
17838 | #: builtin/multi-pack-index.c:16 | |
17839 | msgid "git multi-pack-index [<options>] expire" | |
17840 | msgstr "git multi-pack-index [<选项>] expire" | |
4c27fcb5 | 17841 | |
33b62fba JX |
17842 | #: builtin/multi-pack-index.c:19 |
17843 | msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" | |
17844 | msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]" | |
17845 | ||
17846 | #: builtin/multi-pack-index.c:54 | |
4c27fcb5 JX |
17847 | msgid "object directory containing set of packfile and pack-index pairs" |
17848 | msgstr "包含成对包文件和包索引的对象目录" | |
17849 | ||
33b62fba JX |
17850 | #: builtin/multi-pack-index.c:69 |
17851 | msgid "preferred-pack" | |
17852 | msgstr "首选包" | |
17853 | ||
17854 | #: builtin/multi-pack-index.c:70 | |
17855 | msgid "pack for reuse when computing a multi-pack bitmap" | |
17856 | msgstr "在计算多包位图时打包以供重用" | |
17857 | ||
17858 | #: builtin/multi-pack-index.c:128 | |
a6cd2cc4 JX |
17859 | msgid "" |
17860 | "during repack, collect pack-files of smaller size into a batch that is " | |
17861 | "larger than this size" | |
17862 | msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中" | |
17863 | ||
ec3d4607 | 17864 | #: builtin/multi-pack-index.c:179 |
4c27fcb5 | 17865 | #, c-format |
a6cd2cc4 JX |
17866 | msgid "unrecognized subcommand: %s" |
17867 | msgstr "未识别的子命令:%s" | |
4c27fcb5 | 17868 | |
06991777 | 17869 | #: builtin/mv.c:18 |
814ff314 JX |
17870 | msgid "git mv [<options>] <source>... <destination>" |
17871 | msgstr "git mv [<选项>] <源>... <目标>" | |
c04f5ac3 | 17872 | |
06991777 | 17873 | #: builtin/mv.c:83 |
220c313c JX |
17874 | #, c-format |
17875 | msgid "Directory %s is in index and no submodule?" | |
17876 | msgstr "目录 %s 在索引中并且不是子模组?" | |
17877 | ||
06991777 | 17878 | #: builtin/mv.c:85 |
220c313c | 17879 | msgid "Please stage your changes to .gitmodules or stash them to proceed" |
a4f16749 | 17880 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" |
220c313c | 17881 | |
06991777 | 17882 | #: builtin/mv.c:103 |
220c313c JX |
17883 | #, c-format |
17884 | msgid "%.*s is in index" | |
17885 | msgstr "%.*s 在索引中" | |
17886 | ||
06991777 | 17887 | #: builtin/mv.c:125 |
ef317cd5 | 17888 | msgid "force move/rename even if target exists" |
07432cef | 17889 | msgstr "强制移动/重命令,即使目标存在" |
c04f5ac3 | 17890 | |
06991777 | 17891 | #: builtin/mv.c:127 |
ef317cd5 | 17892 | msgid "skip move/rename errors" |
07432cef | 17893 | msgstr "跳过移动/重命名错误" |
c04f5ac3 | 17894 | |
d9488fea | 17895 | #: builtin/mv.c:170 |
220c313c JX |
17896 | #, c-format |
17897 | msgid "destination '%s' is not a directory" | |
17898 | msgstr "目标 '%s' 不是一个目录" | |
17899 | ||
d9488fea | 17900 | #: builtin/mv.c:181 |
c04f5ac3 JX |
17901 | #, c-format |
17902 | msgid "Checking rename of '%s' to '%s'\n" | |
17903 | msgstr "检查 '%s' 到 '%s' 的重命名\n" | |
17904 | ||
d9488fea | 17905 | #: builtin/mv.c:185 |
c04f5ac3 JX |
17906 | msgid "bad source" |
17907 | msgstr "坏的源" | |
17908 | ||
d9488fea | 17909 | #: builtin/mv.c:188 |
c04f5ac3 JX |
17910 | msgid "can not move directory into itself" |
17911 | msgstr "不能将目录移动到自身" | |
17912 | ||
d9488fea | 17913 | #: builtin/mv.c:191 |
c04f5ac3 JX |
17914 | msgid "cannot move directory over file" |
17915 | msgstr "不能将目录移动到文件" | |
17916 | ||
d9488fea | 17917 | #: builtin/mv.c:200 |
c04f5ac3 JX |
17918 | msgid "source directory is empty" |
17919 | msgstr "源目录为空" | |
17920 | ||
d9488fea | 17921 | #: builtin/mv.c:225 |
c04f5ac3 JX |
17922 | msgid "not under version control" |
17923 | msgstr "不在版本控制之下" | |
17924 | ||
06991777 | 17925 | #: builtin/mv.c:227 |
d9488fea JX |
17926 | msgid "conflicted" |
17927 | msgstr "冲突" | |
17928 | ||
17929 | #: builtin/mv.c:230 | |
c04f5ac3 JX |
17930 | msgid "destination exists" |
17931 | msgstr "目标已存在" | |
17932 | ||
d9488fea | 17933 | #: builtin/mv.c:238 |
c04f5ac3 JX |
17934 | #, c-format |
17935 | msgid "overwriting '%s'" | |
17936 | msgstr "覆盖 '%s'" | |
17937 | ||
d9488fea | 17938 | #: builtin/mv.c:241 |
c04f5ac3 JX |
17939 | msgid "Cannot overwrite" |
17940 | msgstr "不能覆盖" | |
17941 | ||
d9488fea | 17942 | #: builtin/mv.c:244 |
c04f5ac3 JX |
17943 | msgid "multiple sources for the same target" |
17944 | msgstr "同一目标具有多个源" | |
17945 | ||
d9488fea | 17946 | #: builtin/mv.c:246 |
cfff71a9 JX |
17947 | msgid "destination directory does not exist" |
17948 | msgstr "目标目录不存在" | |
17949 | ||
d9488fea | 17950 | #: builtin/mv.c:253 |
c04f5ac3 JX |
17951 | #, c-format |
17952 | msgid "%s, source=%s, destination=%s" | |
17953 | msgstr "%s,源=%s,目标=%s" | |
17954 | ||
d9488fea | 17955 | #: builtin/mv.c:274 |
c04f5ac3 JX |
17956 | #, c-format |
17957 | msgid "Renaming %s to %s\n" | |
17958 | msgstr "重命名 %s 至 %s\n" | |
17959 | ||
33b62fba | 17960 | #: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667 |
c04f5ac3 JX |
17961 | #, c-format |
17962 | msgid "renaming '%s' failed" | |
17963 | msgstr "重命名 '%s' 失败" | |
17964 | ||
2b472aae | 17965 | #: builtin/name-rev.c:465 |
814ff314 JX |
17966 | msgid "git name-rev [<options>] <commit>..." |
17967 | msgstr "git name-rev [<选项>] <提交>..." | |
ef317cd5 | 17968 | |
2b472aae | 17969 | #: builtin/name-rev.c:466 |
814ff314 JX |
17970 | msgid "git name-rev [<options>] --all" |
17971 | msgstr "git name-rev [<选项>] --all" | |
ef317cd5 | 17972 | |
2b472aae | 17973 | #: builtin/name-rev.c:467 |
814ff314 JX |
17974 | msgid "git name-rev [<options>] --stdin" |
17975 | msgstr "git name-rev [<选项>] --stdin" | |
ef317cd5 | 17976 | |
2b472aae | 17977 | #: builtin/name-rev.c:524 |
d9488fea JX |
17978 | msgid "print only ref-based names (no object names)" |
17979 | msgstr "只打印基于引用的名称(非对象名)" | |
ef317cd5 | 17980 | |
2b472aae | 17981 | #: builtin/name-rev.c:525 |
ef317cd5 | 17982 | msgid "only use tags to name the commits" |
55a16ee4 | 17983 | msgstr "只使用标签来命名提交" |
ef317cd5 | 17984 | |
2b472aae | 17985 | #: builtin/name-rev.c:527 |
ef317cd5 | 17986 | msgid "only use refs matching <pattern>" |
07432cef | 17987 | msgstr "只使用和 <模式> 相匹配的引用" |
ef317cd5 | 17988 | |
2b472aae | 17989 | #: builtin/name-rev.c:529 |
87cb7997 JX |
17990 | msgid "ignore refs matching <pattern>" |
17991 | msgstr "忽略和 <模式> 相匹配的引用" | |
17992 | ||
2b472aae | 17993 | #: builtin/name-rev.c:531 |
ef317cd5 | 17994 | msgid "list all commits reachable from all refs" |
07432cef | 17995 | msgstr "列出可以从所有引用访问的提交" |
ef317cd5 | 17996 | |
2b472aae | 17997 | #: builtin/name-rev.c:532 |
ef317cd5 | 17998 | msgid "read from stdin" |
07432cef | 17999 | msgstr "从标准输入读取" |
ef317cd5 | 18000 | |
2b472aae | 18001 | #: builtin/name-rev.c:533 |
90314792 JX |
18002 | msgid "allow to print `undefined` names (default)" |
18003 | msgstr "允许打印 `未定义` 的名称(默认)" | |
ef317cd5 | 18004 | |
2b472aae | 18005 | #: builtin/name-rev.c:539 |
2e8451e8 | 18006 | msgid "dereference tags in the input (internal use)" |
55a16ee4 | 18007 | msgstr "反向解析输入中的标签(内部使用)" |
2e8451e8 | 18008 | |
c1ac5258 | 18009 | #: builtin/notes.c:28 |
814ff314 | 18010 | msgid "git notes [--ref <notes-ref>] [list [<object>]]" |
07432cef | 18011 | msgstr "git notes [--ref <注解引用>] [list [<对象>]]" |
ef317cd5 | 18012 | |
c1ac5258 | 18013 | #: builtin/notes.c:29 |
ef317cd5 | 18014 | msgid "" |
814ff314 | 18015 | "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " |
04cb2f28 | 18016 | "| (-c | -C) <object>] [<object>]" |
ef317cd5 | 18017 | msgstr "" |
04cb2f28 JX |
18018 | "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " |
18019 | "| (-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 18020 | |
c1ac5258 | 18021 | #: builtin/notes.c:30 |
814ff314 | 18022 | msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" |
07432cef | 18023 | msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" |
ef317cd5 | 18024 | |
c1ac5258 | 18025 | #: builtin/notes.c:31 |
ef317cd5 | 18026 | msgid "" |
814ff314 | 18027 | "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " |
04cb2f28 | 18028 | "(-c | -C) <object>] [<object>]" |
ef317cd5 | 18029 | msgstr "" |
04cb2f28 JX |
18030 | "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " |
18031 | "(-c | -C) <对象>] [<对象>]" | |
ef317cd5 | 18032 | |
c1ac5258 | 18033 | #: builtin/notes.c:32 |
814ff314 | 18034 | msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" |
04cb2f28 | 18035 | msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" |
ef317cd5 | 18036 | |
c1ac5258 | 18037 | #: builtin/notes.c:33 |
814ff314 | 18038 | msgid "git notes [--ref <notes-ref>] show [<object>]" |
07432cef | 18039 | msgstr "git notes [--ref <注解引用>] show [<对象>]" |
ef317cd5 | 18040 | |
c1ac5258 | 18041 | #: builtin/notes.c:34 |
ef317cd5 | 18042 | msgid "" |
814ff314 | 18043 | "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" |
07432cef | 18044 | msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" |
ef317cd5 | 18045 | |
c1ac5258 | 18046 | #: builtin/notes.c:35 |
ef317cd5 | 18047 | msgid "git notes merge --commit [-v | -q]" |
07432cef | 18048 | msgstr "git notes merge --commit [-v | -q]" |
ef317cd5 | 18049 | |
c1ac5258 | 18050 | #: builtin/notes.c:36 |
ef317cd5 | 18051 | msgid "git notes merge --abort [-v | -q]" |
07432cef | 18052 | msgstr "git notes merge --abort [-v | -q]" |
ef317cd5 | 18053 | |
c1ac5258 | 18054 | #: builtin/notes.c:37 |
814ff314 | 18055 | msgid "git notes [--ref <notes-ref>] remove [<object>...]" |
07432cef | 18056 | msgstr "git notes [--ref <注解引用>] remove [<对象>...]" |
ef317cd5 | 18057 | |
c1ac5258 | 18058 | #: builtin/notes.c:38 |
5809aa05 JX |
18059 | msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" |
18060 | msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" | |
ef317cd5 | 18061 | |
c1ac5258 | 18062 | #: builtin/notes.c:39 |
814ff314 | 18063 | msgid "git notes [--ref <notes-ref>] get-ref" |
07432cef | 18064 | msgstr "git notes [--ref <注解引用>] get-ref" |
ef317cd5 | 18065 | |
c1ac5258 | 18066 | #: builtin/notes.c:44 |
ef317cd5 | 18067 | msgid "git notes [list [<object>]]" |
07432cef | 18068 | msgstr "git notes [list [<对象>]]" |
ef317cd5 | 18069 | |
c1ac5258 | 18070 | #: builtin/notes.c:49 |
ef317cd5 | 18071 | msgid "git notes add [<options>] [<object>]" |
07432cef | 18072 | msgstr "git notes add [<选项>] [<对象>]" |
ef317cd5 | 18073 | |
c1ac5258 | 18074 | #: builtin/notes.c:54 |
ef317cd5 | 18075 | msgid "git notes copy [<options>] <from-object> <to-object>" |
07432cef | 18076 | msgstr "git notes copy [<选项>] <源对象> <目标对象>" |
ef317cd5 | 18077 | |
c1ac5258 | 18078 | #: builtin/notes.c:55 |
ef317cd5 | 18079 | msgid "git notes copy --stdin [<from-object> <to-object>]..." |
07432cef | 18080 | msgstr "git notes copy --stdin [<源对象> <目标对象>]..." |
ef317cd5 | 18081 | |
c1ac5258 | 18082 | #: builtin/notes.c:60 |
ef317cd5 | 18083 | msgid "git notes append [<options>] [<object>]" |
07432cef | 18084 | msgstr "git notes append [<选项>] [<对象>]" |
ef317cd5 | 18085 | |
c1ac5258 | 18086 | #: builtin/notes.c:65 |
ef317cd5 | 18087 | msgid "git notes edit [<object>]" |
07432cef | 18088 | msgstr "git notes edit [<对象>]" |
ef317cd5 | 18089 | |
c1ac5258 | 18090 | #: builtin/notes.c:70 |
ef317cd5 | 18091 | msgid "git notes show [<object>]" |
07432cef | 18092 | msgstr "git notes show [<对象>]" |
ef317cd5 | 18093 | |
c1ac5258 | 18094 | #: builtin/notes.c:75 |
814ff314 | 18095 | msgid "git notes merge [<options>] <notes-ref>" |
07432cef | 18096 | msgstr "git notes merge [<选项>] <注解引用>" |
ef317cd5 | 18097 | |
c1ac5258 | 18098 | #: builtin/notes.c:76 |
ef317cd5 | 18099 | msgid "git notes merge --commit [<options>]" |
07432cef | 18100 | msgstr "git notes merge --commit [<选项>]" |
ef317cd5 | 18101 | |
c1ac5258 | 18102 | #: builtin/notes.c:77 |
ef317cd5 | 18103 | msgid "git notes merge --abort [<options>]" |
07432cef | 18104 | msgstr "git notes merge --abort [<选项>]" |
ef317cd5 | 18105 | |
c1ac5258 | 18106 | #: builtin/notes.c:82 |
ef317cd5 | 18107 | msgid "git notes remove [<object>]" |
07432cef | 18108 | msgstr "git notes remove [<对象>]" |
ef317cd5 | 18109 | |
c1ac5258 | 18110 | #: builtin/notes.c:87 |
ef317cd5 | 18111 | msgid "git notes prune [<options>]" |
07432cef | 18112 | msgstr "git notes prune [<选项>]" |
ef317cd5 | 18113 | |
c1ac5258 | 18114 | #: builtin/notes.c:92 |
ef317cd5 | 18115 | msgid "git notes get-ref" |
07432cef | 18116 | msgstr "git notes get-ref" |
ef317cd5 | 18117 | |
c1ac5258 | 18118 | #: builtin/notes.c:97 |
5c57d762 JX |
18119 | msgid "Write/edit the notes for the following object:" |
18120 | msgstr "为下面的对象写/编辑说明:" | |
18121 | ||
c1ac5258 | 18122 | #: builtin/notes.c:150 |
c04f5ac3 JX |
18123 | #, c-format |
18124 | msgid "unable to start 'show' for object '%s'" | |
18125 | msgstr "不能为对象 '%s' 开始 'show'" | |
18126 | ||
c1ac5258 | 18127 | #: builtin/notes.c:154 |
a77c07d9 JX |
18128 | msgid "could not read 'show' output" |
18129 | msgstr "不能读取 'show' 的输出" | |
c04f5ac3 | 18130 | |
c1ac5258 | 18131 | #: builtin/notes.c:162 |
c04f5ac3 JX |
18132 | #, c-format |
18133 | msgid "failed to finish 'show' for object '%s'" | |
18134 | msgstr "无法为对象 '%s' 完成 'show'" | |
18135 | ||
c1ac5258 | 18136 | #: builtin/notes.c:197 |
a0b6b246 | 18137 | msgid "please supply the note contents using either -m or -F option" |
c04f5ac3 JX |
18138 | msgstr "请通过 -m 或 -F 选项为注解提供内容" |
18139 | ||
c1ac5258 | 18140 | #: builtin/notes.c:206 |
c04f5ac3 JX |
18141 | msgid "unable to write note object" |
18142 | msgstr "不能写注解对象" | |
18143 | ||
c1ac5258 | 18144 | #: builtin/notes.c:208 |
c04f5ac3 | 18145 | #, c-format |
a0b6b246 | 18146 | msgid "the note contents have been left in %s" |
220c313c | 18147 | msgstr "注解内容被留在 %s 中" |
c04f5ac3 | 18148 | |
33b62fba | 18149 | #: builtin/notes.c:242 builtin/tag.c:576 |
c04f5ac3 JX |
18150 | #, c-format |
18151 | msgid "could not open or read '%s'" | |
18152 | msgstr "不能打开或读取 '%s'" | |
18153 | ||
4c27fcb5 | 18154 | #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 |
06991777 JX |
18155 | #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 |
18156 | #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 | |
a0b6b246 JX |
18157 | #, c-format |
18158 | msgid "failed to resolve '%s' as a valid ref." | |
18159 | msgstr "无法解析 '%s' 为一个有效引用。" | |
18160 | ||
4c27fcb5 | 18161 | #: builtin/notes.c:265 |
c04f5ac3 | 18162 | #, c-format |
a0b6b246 | 18163 | msgid "failed to read object '%s'." |
c1ac5258 | 18164 | msgstr "读取对象 '%s' 失败。" |
c04f5ac3 | 18165 | |
4c27fcb5 | 18166 | #: builtin/notes.c:268 |
6c94aba5 | 18167 | #, c-format |
a0b6b246 JX |
18168 | msgid "cannot read note data from non-blob object '%s'." |
18169 | msgstr "不能从非数据对象 '%s' 中读取注解数据。" | |
18170 | ||
4c27fcb5 | 18171 | #: builtin/notes.c:309 |
a0b6b246 JX |
18172 | #, c-format |
18173 | msgid "malformed input line: '%s'." | |
fd8cb379 | 18174 | msgstr "格式错误的输入行:'%s'。" |
a0b6b246 | 18175 | |
4c27fcb5 | 18176 | #: builtin/notes.c:324 |
a0b6b246 JX |
18177 | #, c-format |
18178 | msgid "failed to copy notes from '%s' to '%s'" | |
18179 | msgstr "从 '%s' 拷贝注解到 '%s' 时失败" | |
6c94aba5 | 18180 | |
a4f16749 JX |
18181 | #. TRANSLATORS: the first %s will be replaced by a git |
18182 | #. notes command: 'add', 'merge', 'remove', etc. | |
18183 | #. | |
4c27fcb5 | 18184 | #: builtin/notes.c:356 |
a0b6b246 JX |
18185 | #, c-format |
18186 | msgid "refusing to %s notes in %s (outside of refs/notes/)" | |
18187 | msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解" | |
18188 | ||
33b62fba JX |
18189 | #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 |
18190 | #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 | |
18191 | #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 | |
18192 | #: builtin/prune-packed.c:25 builtin/tag.c:586 | |
18193 | msgid "too many arguments" | |
18194 | msgstr "太多参数" | |
18195 | ||
06991777 | 18196 | #: builtin/notes.c:389 builtin/notes.c:678 |
c04f5ac3 | 18197 | #, c-format |
a0b6b246 | 18198 | msgid "no note found for object %s." |
c04f5ac3 JX |
18199 | msgstr "未发现对象 %s 的注解。" |
18200 | ||
06991777 | 18201 | #: builtin/notes.c:410 builtin/notes.c:576 |
ef317cd5 | 18202 | msgid "note contents as a string" |
07432cef | 18203 | msgstr "注解内容作为一个字符串" |
ef317cd5 | 18204 | |
06991777 | 18205 | #: builtin/notes.c:413 builtin/notes.c:579 |
ef317cd5 | 18206 | msgid "note contents in a file" |
07432cef | 18207 | msgstr "注解内容到一个文件中" |
ef317cd5 | 18208 | |
06991777 | 18209 | #: builtin/notes.c:416 builtin/notes.c:582 |
ef317cd5 | 18210 | msgid "reuse and edit specified note object" |
07432cef | 18211 | msgstr "重用和编辑指定的注解对象" |
ef317cd5 | 18212 | |
06991777 | 18213 | #: builtin/notes.c:419 builtin/notes.c:585 |
ef317cd5 | 18214 | msgid "reuse specified note object" |
07432cef | 18215 | msgstr "重用指定的注解对象" |
ef317cd5 | 18216 | |
06991777 | 18217 | #: builtin/notes.c:422 builtin/notes.c:588 |
04cb2f28 JX |
18218 | msgid "allow storing empty note" |
18219 | msgstr "允许保存空白注释" | |
18220 | ||
06991777 | 18221 | #: builtin/notes.c:423 builtin/notes.c:496 |
ef317cd5 | 18222 | msgid "replace existing notes" |
07432cef | 18223 | msgstr "替换已存在的注解" |
ef317cd5 | 18224 | |
4c27fcb5 | 18225 | #: builtin/notes.c:448 |
c04f5ac3 JX |
18226 | #, c-format |
18227 | msgid "" | |
18228 | "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " | |
18229 | "existing notes" | |
18230 | msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
18231 | ||
06991777 | 18232 | #: builtin/notes.c:463 builtin/notes.c:544 |
c04f5ac3 JX |
18233 | #, c-format |
18234 | msgid "Overwriting existing notes for object %s\n" | |
18235 | msgstr "覆盖对象 %s 现存注解\n" | |
18236 | ||
06991777 | 18237 | #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 |
04cb2f28 JX |
18238 | #, c-format |
18239 | msgid "Removing note for object %s\n" | |
18240 | msgstr "删除对象 %s 的注解\n" | |
18241 | ||
06991777 | 18242 | #: builtin/notes.c:497 |
ef317cd5 | 18243 | msgid "read objects from stdin" |
07432cef | 18244 | msgstr "从标准输入读取对象" |
ef317cd5 | 18245 | |
06991777 | 18246 | #: builtin/notes.c:499 |
ef317cd5 | 18247 | msgid "load rewriting config for <command> (implies --stdin)" |
07432cef | 18248 | msgstr "重新加载 <命令> 的配置(隐含 --stdin)" |
ef317cd5 | 18249 | |
06991777 | 18250 | #: builtin/notes.c:517 |
473eb541 | 18251 | msgid "too few arguments" |
c04f5ac3 JX |
18252 | msgstr "参数太少" |
18253 | ||
06991777 | 18254 | #: builtin/notes.c:538 |
c04f5ac3 JX |
18255 | #, c-format |
18256 | msgid "" | |
18257 | "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " | |
18258 | "existing notes" | |
18259 | msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" | |
18260 | ||
06991777 | 18261 | #: builtin/notes.c:550 |
c04f5ac3 | 18262 | #, c-format |
a0b6b246 | 18263 | msgid "missing notes on source object %s. Cannot copy." |
c04f5ac3 JX |
18264 | msgstr "源对象 %s 缺少注解。不能拷贝。" |
18265 | ||
06991777 | 18266 | #: builtin/notes.c:603 |
ef317cd5 JX |
18267 | #, c-format |
18268 | msgid "" | |
18269 | "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" | |
18270 | "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" | |
18271 | msgstr "" | |
18272 | "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" | |
18273 | "请换用 'git notes add -f -m/-F/-c/-C'。\n" | |
18274 | ||
06991777 | 18275 | #: builtin/notes.c:698 |
a0b6b246 | 18276 | msgid "failed to delete ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 18277 | msgstr "删除引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 18278 | |
06991777 | 18279 | #: builtin/notes.c:700 |
a0b6b246 | 18280 | msgid "failed to delete ref NOTES_MERGE_REF" |
c1ac5258 | 18281 | msgstr "删除引用 NOTES_MERGE_REF 失败" |
a0b6b246 | 18282 | |
06991777 | 18283 | #: builtin/notes.c:702 |
a0b6b246 | 18284 | msgid "failed to remove 'git notes merge' worktree" |
c1ac5258 | 18285 | msgstr "删除 'git notes merge' 工作区失败" |
a0b6b246 | 18286 | |
06991777 | 18287 | #: builtin/notes.c:722 |
a0b6b246 | 18288 | msgid "failed to read ref NOTES_MERGE_PARTIAL" |
c1ac5258 | 18289 | msgstr "读取引用 NOTES_MERGE_PARTIAL 失败" |
a0b6b246 | 18290 | |
06991777 | 18291 | #: builtin/notes.c:724 |
a0b6b246 JX |
18292 | msgid "could not find commit from NOTES_MERGE_PARTIAL." |
18293 | msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" | |
18294 | ||
06991777 | 18295 | #: builtin/notes.c:726 |
a0b6b246 JX |
18296 | msgid "could not parse commit from NOTES_MERGE_PARTIAL." |
18297 | msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" | |
18298 | ||
06991777 | 18299 | #: builtin/notes.c:739 |
a0b6b246 | 18300 | msgid "failed to resolve NOTES_MERGE_REF" |
c1ac5258 | 18301 | msgstr "解析 NOTES_MERGE_REF 失败" |
a0b6b246 | 18302 | |
06991777 | 18303 | #: builtin/notes.c:742 |
a0b6b246 JX |
18304 | msgid "failed to finalize notes merge" |
18305 | msgstr "无法完成注解合并" | |
18306 | ||
06991777 | 18307 | #: builtin/notes.c:768 |
5c57d762 JX |
18308 | #, c-format |
18309 | msgid "unknown notes merge strategy %s" | |
18310 | msgstr "未知的注解合并策略 %s" | |
18311 | ||
06991777 | 18312 | #: builtin/notes.c:784 |
ef317cd5 | 18313 | msgid "General options" |
07432cef | 18314 | msgstr "通用选项" |
ef317cd5 | 18315 | |
06991777 | 18316 | #: builtin/notes.c:786 |
ef317cd5 | 18317 | msgid "Merge options" |
07432cef | 18318 | msgstr "合并选项" |
ef317cd5 | 18319 | |
06991777 | 18320 | #: builtin/notes.c:788 |
ef317cd5 JX |
18321 | msgid "" |
18322 | "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" | |
18323 | "cat_sort_uniq)" | |
07432cef | 18324 | msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" |
ef317cd5 | 18325 | |
06991777 | 18326 | #: builtin/notes.c:790 |
ef317cd5 | 18327 | msgid "Committing unmerged notes" |
07432cef | 18328 | msgstr "提交未合并的注解" |
ef317cd5 | 18329 | |
06991777 | 18330 | #: builtin/notes.c:792 |
ef317cd5 | 18331 | msgid "finalize notes merge by committing unmerged notes" |
07432cef | 18332 | msgstr "通过提交未合并的注解来完成注解合并" |
ef317cd5 | 18333 | |
06991777 | 18334 | #: builtin/notes.c:794 |
ef317cd5 | 18335 | msgid "Aborting notes merge resolution" |
07432cef | 18336 | msgstr "中止注解合并的方案" |
ef317cd5 | 18337 | |
06991777 | 18338 | #: builtin/notes.c:796 |
ef317cd5 | 18339 | msgid "abort notes merge" |
07432cef | 18340 | msgstr "中止注解合并" |
ef317cd5 | 18341 | |
06991777 | 18342 | #: builtin/notes.c:807 |
5c57d762 JX |
18343 | msgid "cannot mix --commit, --abort or -s/--strategy" |
18344 | msgstr "不能混用 --commit、--abort 或 -s/--strategy" | |
18345 | ||
06991777 | 18346 | #: builtin/notes.c:812 |
a0b6b246 | 18347 | msgid "must specify a notes ref to merge" |
9a4b694c | 18348 | msgstr "必须指定一个注解引用来合并" |
5c57d762 | 18349 | |
06991777 | 18350 | #: builtin/notes.c:836 |
5c57d762 | 18351 | #, c-format |
a0b6b246 | 18352 | msgid "unknown -s/--strategy: %s" |
5c57d762 JX |
18353 | msgstr "未知的 -s/--strategy:%s" |
18354 | ||
06991777 | 18355 | #: builtin/notes.c:873 |
1b7f4a34 | 18356 | #, c-format |
a0b6b246 JX |
18357 | msgid "a notes merge into %s is already in-progress at %s" |
18358 | msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" | |
1b7f4a34 | 18359 | |
06991777 | 18360 | #: builtin/notes.c:876 |
5c57d762 | 18361 | #, c-format |
a0b6b246 JX |
18362 | msgid "failed to store link to current notes ref (%s)" |
18363 | msgstr "无法存储链接到当前的注解引用(%s)" | |
5c57d762 | 18364 | |
06991777 | 18365 | #: builtin/notes.c:878 |
5c57d762 JX |
18366 | #, c-format |
18367 | msgid "" | |
18368 | "Automatic notes merge failed. Fix conflicts in %s and commit the result with " | |
18369 | "'git notes merge --commit', or abort the merge with 'git notes merge --" | |
18370 | "abort'.\n" | |
a0b6b246 JX |
18371 | msgstr "" |
18372 | "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" | |
18373 | "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" | |
5c57d762 | 18374 | |
33b62fba | 18375 | #: builtin/notes.c:897 builtin/tag.c:589 |
d46c5519 JX |
18376 | #, c-format |
18377 | msgid "Failed to resolve '%s' as a valid ref." | |
18378 | msgstr "无法解析 '%s' 为一个有效引用。" | |
18379 | ||
06991777 | 18380 | #: builtin/notes.c:900 |
ef317cd5 JX |
18381 | #, c-format |
18382 | msgid "Object %s has no note\n" | |
18383 | msgstr "对象 %s 没有注解\n" | |
18384 | ||
06991777 | 18385 | #: builtin/notes.c:912 |
ef317cd5 | 18386 | msgid "attempt to remove non-existent note is not an error" |
07432cef | 18387 | msgstr "尝试删除不存在的注解不是一个错误" |
ef317cd5 | 18388 | |
06991777 | 18389 | #: builtin/notes.c:915 |
ef317cd5 | 18390 | msgid "read object names from the standard input" |
07432cef | 18391 | msgstr "从标准输入读取对象名称" |
ef317cd5 | 18392 | |
ec3d4607 | 18393 | #: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146 |
5c57d762 JX |
18394 | msgid "do not remove, show only" |
18395 | msgstr "不删除,只显示" | |
18396 | ||
06991777 | 18397 | #: builtin/notes.c:955 |
5c57d762 JX |
18398 | msgid "report pruned notes" |
18399 | msgstr "报告清除的注解" | |
18400 | ||
06991777 | 18401 | #: builtin/notes.c:998 |
6c94aba5 | 18402 | msgid "notes-ref" |
07432cef | 18403 | msgstr "注解引用" |
ef317cd5 | 18404 | |
06991777 | 18405 | #: builtin/notes.c:999 |
814ff314 | 18406 | msgid "use notes from <notes-ref>" |
07432cef | 18407 | msgstr "从 <注解引用> 使用注解" |
ef317cd5 | 18408 | |
ec3d4607 | 18409 | #: builtin/notes.c:1034 builtin/stash.c:1735 |
ef317cd5 | 18410 | #, c-format |
a0b6b246 | 18411 | msgid "unknown subcommand: %s" |
ef317cd5 JX |
18412 | msgstr "未知子命令:%s" |
18413 | ||
ec3d4607 | 18414 | #: builtin/pack-objects.c:182 |
1b7f4a34 JX |
18415 | msgid "" |
18416 | "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" | |
18417 | msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" | |
ef317cd5 | 18418 | |
ec3d4607 | 18419 | #: builtin/pack-objects.c:183 |
1b7f4a34 JX |
18420 | msgid "" |
18421 | "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" | |
58b6f078 | 18422 | msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" |
ef317cd5 | 18423 | |
ec3d4607 | 18424 | #: builtin/pack-objects.c:572 |
473eb541 JX |
18425 | #, c-format |
18426 | msgid "" | |
18427 | "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " | |
18428 | "pack %s" | |
33b62fba JX |
18429 | msgstr "" |
18430 | "write_reuse_object:无法定位 %1$s,预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上" | |
473eb541 | 18431 | |
ec3d4607 | 18432 | #: builtin/pack-objects.c:580 |
ef317cd5 | 18433 | #, c-format |
c1ac5258 JX |
18434 | msgid "bad packed object CRC for %s" |
18435 | msgstr "%s 错的包对象 CRC" | |
18436 | ||
ec3d4607 | 18437 | #: builtin/pack-objects.c:591 |
c1ac5258 JX |
18438 | #, c-format |
18439 | msgid "corrupt packed object for %s" | |
18440 | msgstr "%s 损坏的包对象" | |
18441 | ||
ec3d4607 | 18442 | #: builtin/pack-objects.c:722 |
c1ac5258 JX |
18443 | #, c-format |
18444 | msgid "recursive delta detected for object %s" | |
18445 | msgstr "发现对象 %s 递归 delta" | |
18446 | ||
ec3d4607 | 18447 | #: builtin/pack-objects.c:941 |
c1ac5258 JX |
18448 | #, c-format |
18449 | msgid "ordered %u objects, expected %<PRIu32>" | |
18450 | msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" | |
18451 | ||
ec3d4607 | 18452 | #: builtin/pack-objects.c:1036 |
473eb541 JX |
18453 | #, c-format |
18454 | msgid "expected object at offset %<PRIuMAX> in pack %s" | |
18455 | msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上" | |
18456 | ||
ec3d4607 | 18457 | #: builtin/pack-objects.c:1155 |
5b04ee3b JX |
18458 | msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" |
18459 | msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" | |
18460 | ||
ec3d4607 | 18461 | #: builtin/pack-objects.c:1168 |
6c94aba5 JX |
18462 | msgid "Writing objects" |
18463 | msgstr "写入对象中" | |
18464 | ||
ec3d4607 | 18465 | #: builtin/pack-objects.c:1229 builtin/update-index.c:90 |
c1ac5258 JX |
18466 | #, c-format |
18467 | msgid "failed to stat %s" | |
18468 | msgstr "对 %s 调用 stat 失败" | |
18469 | ||
ec3d4607 | 18470 | #: builtin/pack-objects.c:1281 |
c1ac5258 JX |
18471 | #, c-format |
18472 | msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" | |
18473 | msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" | |
18474 | ||
ec3d4607 | 18475 | #: builtin/pack-objects.c:1523 |
6c94aba5 JX |
18476 | msgid "disabling bitmap writing, as some objects are not being packed" |
18477 | msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" | |
18478 | ||
ec3d4607 | 18479 | #: builtin/pack-objects.c:1971 |
c1ac5258 JX |
18480 | #, c-format |
18481 | msgid "delta base offset overflow in pack for %s" | |
18482 | msgstr "%s 压缩中 delta 基准偏移越界" | |
18483 | ||
ec3d4607 | 18484 | #: builtin/pack-objects.c:1980 |
c1ac5258 JX |
18485 | #, c-format |
18486 | msgid "delta base offset out of bound for %s" | |
18487 | msgstr "%s 的 delta 基准偏移越界" | |
18488 | ||
ec3d4607 | 18489 | #: builtin/pack-objects.c:2261 |
fd8cb379 JX |
18490 | msgid "Counting objects" |
18491 | msgstr "对象计数中" | |
18492 | ||
ec3d4607 | 18493 | #: builtin/pack-objects.c:2426 |
fd8cb379 JX |
18494 | #, c-format |
18495 | msgid "unable to parse object header of %s" | |
18496 | msgstr "无法解析对象 %s 头信息" | |
18497 | ||
ec3d4607 JX |
18498 | #: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512 |
18499 | #: builtin/pack-objects.c:2522 | |
c1ac5258 JX |
18500 | #, c-format |
18501 | msgid "object %s cannot be read" | |
18502 | msgstr "对象 %s 无法读取" | |
18503 | ||
ec3d4607 | 18504 | #: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526 |
c1ac5258 | 18505 | #, c-format |
4c27fcb5 JX |
18506 | msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" |
18507 | msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" | |
c1ac5258 | 18508 | |
ec3d4607 | 18509 | #: builtin/pack-objects.c:2536 |
c1ac5258 JX |
18510 | msgid "suboptimal pack - out of memory" |
18511 | msgstr "次优(suboptimal)打包 - 内存不足" | |
18512 | ||
ec3d4607 | 18513 | #: builtin/pack-objects.c:2851 |
c1ac5258 JX |
18514 | #, c-format |
18515 | msgid "Delta compression using up to %d threads" | |
18516 | msgstr "使用 %d 个线程进行压缩" | |
18517 | ||
ec3d4607 | 18518 | #: builtin/pack-objects.c:2990 |
c1ac5258 JX |
18519 | #, c-format |
18520 | msgid "unable to pack objects reachable from tag %s" | |
18521 | msgstr "无法为标签 %s 压缩对象" | |
18522 | ||
ec3d4607 | 18523 | #: builtin/pack-objects.c:3076 |
6c94aba5 JX |
18524 | msgid "Compressing objects" |
18525 | msgstr "压缩对象中" | |
18526 | ||
ec3d4607 | 18527 | #: builtin/pack-objects.c:3082 |
c1ac5258 JX |
18528 | msgid "inconsistency with delta count" |
18529 | msgstr "不一致的差异计数" | |
18530 | ||
ec3d4607 | 18531 | #: builtin/pack-objects.c:3161 |
7157c2b5 JX |
18532 | #, c-format |
18533 | msgid "" | |
18534 | "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" | |
18535 | "hash> <uri>' (got '%s')" | |
d9488fea JX |
18536 | msgstr "" |
18537 | "uploadpack.blobpackfileuri 的取值必须是 '<object-hash> <pack-hash> <uri>' 格" | |
18538 | "式(得到 '%s')" | |
7157c2b5 | 18539 | |
ec3d4607 | 18540 | #: builtin/pack-objects.c:3164 |
7157c2b5 JX |
18541 | #, c-format |
18542 | msgid "" | |
18543 | "object already configured in another uploadpack.blobpackfileuri (got '%s')" | |
18544 | msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置(得到 '%s')" | |
18545 | ||
ec3d4607 | 18546 | #: builtin/pack-objects.c:3199 |
33b62fba JX |
18547 | #, c-format |
18548 | msgid "could not get type of object %s in pack %s" | |
18549 | msgstr "无法获得包 %2$s 中对象 %1$s 的类型" | |
18550 | ||
ec3d4607 | 18551 | #: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335 |
33b62fba JX |
18552 | #, c-format |
18553 | msgid "could not find pack '%s'" | |
18554 | msgstr "不能找到包 '%s'" | |
18555 | ||
ec3d4607 | 18556 | #: builtin/pack-objects.c:3378 |
c1ac5258 JX |
18557 | #, c-format |
18558 | msgid "" | |
18559 | "expected edge object ID, got garbage:\n" | |
18560 | " %s" | |
18561 | msgstr "" | |
18562 | "预期边界对象(edge object)ID,却得到垃圾数据:\n" | |
18563 | " %s" | |
18564 | ||
ec3d4607 | 18565 | #: builtin/pack-objects.c:3384 |
c1ac5258 JX |
18566 | #, c-format |
18567 | msgid "" | |
18568 | "expected object ID, got garbage:\n" | |
18569 | " %s" | |
18570 | msgstr "" | |
18571 | "预期对象 ID,却得到垃圾数据:\n" | |
18572 | " %s" | |
18573 | ||
ec3d4607 | 18574 | #: builtin/pack-objects.c:3482 |
5809aa05 JX |
18575 | msgid "invalid value for --missing" |
18576 | msgstr "选项 --missing 的值无效" | |
18577 | ||
ec3d4607 | 18578 | #: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650 |
c1ac5258 JX |
18579 | msgid "cannot open pack index" |
18580 | msgstr "无法打开包文件索引" | |
18581 | ||
ec3d4607 | 18582 | #: builtin/pack-objects.c:3572 |
c1ac5258 JX |
18583 | #, c-format |
18584 | msgid "loose object at %s could not be examined" | |
18585 | msgstr "无法检查 %s 处的松散对象" | |
18586 | ||
ec3d4607 | 18587 | #: builtin/pack-objects.c:3658 |
c1ac5258 JX |
18588 | msgid "unable to force loose object" |
18589 | msgstr "无法强制松散对象" | |
18590 | ||
ec3d4607 | 18591 | #: builtin/pack-objects.c:3788 |
c1ac5258 JX |
18592 | #, c-format |
18593 | msgid "not a rev '%s'" | |
18594 | msgstr "不是一个版本 '%s'" | |
18595 | ||
ec3d4607 | 18596 | #: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061 |
c1ac5258 JX |
18597 | #, c-format |
18598 | msgid "bad revision '%s'" | |
18599 | msgstr "坏的版本 '%s'" | |
18600 | ||
ec3d4607 | 18601 | #: builtin/pack-objects.c:3819 |
c1ac5258 JX |
18602 | msgid "unable to add recent objects" |
18603 | msgstr "无法添加最近的对象" | |
18604 | ||
ec3d4607 | 18605 | #: builtin/pack-objects.c:3872 |
ef317cd5 JX |
18606 | #, c-format |
18607 | msgid "unsupported index version %s" | |
18608 | msgstr "不支持的索引版本 %s" | |
18609 | ||
ec3d4607 | 18610 | #: builtin/pack-objects.c:3876 |
ef317cd5 JX |
18611 | #, c-format |
18612 | msgid "bad index version '%s'" | |
18613 | msgstr "坏的索引版本 '%s'" | |
18614 | ||
ec3d4607 | 18615 | #: builtin/pack-objects.c:3915 |
c1ac5258 JX |
18616 | msgid "<version>[,<offset>]" |
18617 | msgstr "<版本>[,<偏移>]" | |
ef317cd5 | 18618 | |
ec3d4607 | 18619 | #: builtin/pack-objects.c:3916 |
ef317cd5 | 18620 | msgid "write the pack index file in the specified idx format version" |
07432cef | 18621 | msgstr "用指定的 idx 格式版本来写包索引文件" |
ef317cd5 | 18622 | |
ec3d4607 | 18623 | #: builtin/pack-objects.c:3919 |
ef317cd5 | 18624 | msgid "maximum size of each output pack file" |
07432cef | 18625 | msgstr "每个输出包的最大尺寸" |
ef317cd5 | 18626 | |
ec3d4607 | 18627 | #: builtin/pack-objects.c:3921 |
ef317cd5 | 18628 | msgid "ignore borrowed objects from alternate object store" |
160fb2b2 | 18629 | msgstr "忽略从备用对象存储里借用对象" |
ef317cd5 | 18630 | |
ec3d4607 | 18631 | #: builtin/pack-objects.c:3923 |
ef317cd5 | 18632 | msgid "ignore packed objects" |
07432cef | 18633 | msgstr "忽略包对象" |
ef317cd5 | 18634 | |
ec3d4607 | 18635 | #: builtin/pack-objects.c:3925 |
ef317cd5 | 18636 | msgid "limit pack window by objects" |
07432cef | 18637 | msgstr "限制打包窗口的对象数" |
ef317cd5 | 18638 | |
ec3d4607 | 18639 | #: builtin/pack-objects.c:3927 |
ef317cd5 | 18640 | msgid "limit pack window by memory in addition to object limit" |
07432cef | 18641 | msgstr "除对象数量限制外设置打包窗口的内存限制" |
ef317cd5 | 18642 | |
ec3d4607 | 18643 | #: builtin/pack-objects.c:3929 |
ef317cd5 | 18644 | msgid "maximum length of delta chain allowed in the resulting pack" |
07432cef | 18645 | msgstr "打包允许的 delta 链的最大长度" |
ef317cd5 | 18646 | |
ec3d4607 | 18647 | #: builtin/pack-objects.c:3931 |
ef317cd5 | 18648 | msgid "reuse existing deltas" |
07432cef | 18649 | msgstr "重用已存在的 deltas" |
ef317cd5 | 18650 | |
ec3d4607 | 18651 | #: builtin/pack-objects.c:3933 |
ef317cd5 | 18652 | msgid "reuse existing objects" |
07432cef | 18653 | msgstr "重用已存在的对象" |
ef317cd5 | 18654 | |
ec3d4607 | 18655 | #: builtin/pack-objects.c:3935 |
ef317cd5 | 18656 | msgid "use OFS_DELTA objects" |
07432cef | 18657 | msgstr "使用 OFS_DELTA 对象" |
ef317cd5 | 18658 | |
ec3d4607 | 18659 | #: builtin/pack-objects.c:3937 |
ef317cd5 | 18660 | msgid "use threads when searching for best delta matches" |
07432cef | 18661 | msgstr "使用线程查询最佳 delta 匹配" |
ef317cd5 | 18662 | |
ec3d4607 | 18663 | #: builtin/pack-objects.c:3939 |
ef317cd5 | 18664 | msgid "do not create an empty pack output" |
07432cef | 18665 | msgstr "不创建空的包输出" |
ef317cd5 | 18666 | |
ec3d4607 | 18667 | #: builtin/pack-objects.c:3941 |
ef317cd5 | 18668 | msgid "read revision arguments from standard input" |
d9d56b23 | 18669 | msgstr "从标准输入读取版本号参数" |
ef317cd5 | 18670 | |
ec3d4607 | 18671 | #: builtin/pack-objects.c:3943 |
ef317cd5 | 18672 | msgid "limit the objects to those that are not yet packed" |
07432cef | 18673 | msgstr "限制那些尚未打包的对象" |
ef317cd5 | 18674 | |
ec3d4607 | 18675 | #: builtin/pack-objects.c:3946 |
ef317cd5 | 18676 | msgid "include objects reachable from any reference" |
07432cef | 18677 | msgstr "包括可以从任何引用访问到的对象" |
ef317cd5 | 18678 | |
ec3d4607 | 18679 | #: builtin/pack-objects.c:3949 |
ef317cd5 | 18680 | msgid "include objects referred by reflog entries" |
07432cef | 18681 | msgstr "包括被引用日志引用到的对象" |
ef317cd5 | 18682 | |
ec3d4607 | 18683 | #: builtin/pack-objects.c:3952 |
220c313c JX |
18684 | msgid "include objects referred to by the index" |
18685 | msgstr "包括被索引引用到的对象" | |
18686 | ||
ec3d4607 | 18687 | #: builtin/pack-objects.c:3955 |
33b62fba JX |
18688 | msgid "read packs from stdin" |
18689 | msgstr "从标准输入读取包" | |
18690 | ||
ec3d4607 | 18691 | #: builtin/pack-objects.c:3957 |
ef317cd5 | 18692 | msgid "output pack to stdout" |
07432cef | 18693 | msgstr "输出包到标准输出" |
ef317cd5 | 18694 | |
ec3d4607 | 18695 | #: builtin/pack-objects.c:3959 |
ef317cd5 | 18696 | msgid "include tag objects that refer to objects to be packed" |
53438e8f | 18697 | msgstr "包括那些引用了待打包对象的标签对象" |
ef317cd5 | 18698 | |
ec3d4607 | 18699 | #: builtin/pack-objects.c:3961 |
ef317cd5 | 18700 | msgid "keep unreachable objects" |
07432cef | 18701 | msgstr "维持不可达的对象" |
ef317cd5 | 18702 | |
ec3d4607 | 18703 | #: builtin/pack-objects.c:3963 |
5c57d762 JX |
18704 | msgid "pack loose unreachable objects" |
18705 | msgstr "打包松散的不可达对象" | |
18706 | ||
ec3d4607 | 18707 | #: builtin/pack-objects.c:3965 |
ef317cd5 | 18708 | msgid "unpack unreachable objects newer than <time>" |
07432cef | 18709 | msgstr "将比给定 <时间> 新的无法访问的对象解包" |
ef317cd5 | 18710 | |
ec3d4607 | 18711 | #: builtin/pack-objects.c:3968 |
06991777 JX |
18712 | msgid "use the sparse reachability algorithm" |
18713 | msgstr "使用稀疏可达性算法" | |
18714 | ||
ec3d4607 | 18715 | #: builtin/pack-objects.c:3970 |
ef317cd5 | 18716 | msgid "create thin packs" |
07432cef | 18717 | msgstr "创建精简包" |
ef317cd5 | 18718 | |
ec3d4607 | 18719 | #: builtin/pack-objects.c:3972 |
04cb2f28 | 18720 | msgid "create packs suitable for shallow fetches" |
160fb2b2 | 18721 | msgstr "创建适合浅克隆仓库获取的包" |
04cb2f28 | 18722 | |
ec3d4607 | 18723 | #: builtin/pack-objects.c:3974 |
ef317cd5 | 18724 | msgid "ignore packs that have companion .keep file" |
07432cef | 18725 | msgstr "忽略配有 .keep 文件的包" |
ef317cd5 | 18726 | |
ec3d4607 | 18727 | #: builtin/pack-objects.c:3976 |
fd8cb379 JX |
18728 | msgid "ignore this pack" |
18729 | msgstr "忽略该 pack" | |
18730 | ||
ec3d4607 | 18731 | #: builtin/pack-objects.c:3978 |
ef317cd5 | 18732 | msgid "pack compression level" |
07432cef | 18733 | msgstr "打包压缩级别" |
ef317cd5 | 18734 | |
ec3d4607 | 18735 | #: builtin/pack-objects.c:3980 |
ef317cd5 | 18736 | msgid "do not hide commits by grafts" |
fd8cb379 | 18737 | msgstr "显示被移植隐藏的提交" |
ef317cd5 | 18738 | |
ec3d4607 | 18739 | #: builtin/pack-objects.c:3982 |
6c94aba5 JX |
18740 | msgid "use a bitmap index if available to speed up counting objects" |
18741 | msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" | |
18742 | ||
ec3d4607 | 18743 | #: builtin/pack-objects.c:3984 |
6c94aba5 JX |
18744 | msgid "write a bitmap index together with the pack index" |
18745 | msgstr "在建立包索引的同时创建 bitmap 索引" | |
18746 | ||
ec3d4607 | 18747 | #: builtin/pack-objects.c:3988 |
a6cd2cc4 JX |
18748 | msgid "write a bitmap index if possible" |
18749 | msgstr "如果可能,写 bitmap 索引" | |
18750 | ||
ec3d4607 | 18751 | #: builtin/pack-objects.c:3992 |
5809aa05 JX |
18752 | msgid "handling for missing objects" |
18753 | msgstr "处理丢失的对象" | |
18754 | ||
ec3d4607 | 18755 | #: builtin/pack-objects.c:3995 |
31e5e17b JX |
18756 | msgid "do not pack objects in promisor packfiles" |
18757 | msgstr "不要打包 promisor 包文件中的对象" | |
18758 | ||
ec3d4607 | 18759 | #: builtin/pack-objects.c:3997 |
4c27fcb5 JX |
18760 | msgid "respect islands during delta compression" |
18761 | msgstr "在增量压缩时参考数据岛" | |
18762 | ||
ec3d4607 | 18763 | #: builtin/pack-objects.c:3999 |
7157c2b5 JX |
18764 | msgid "protocol" |
18765 | msgstr "协议" | |
18766 | ||
ec3d4607 | 18767 | #: builtin/pack-objects.c:4000 |
7157c2b5 JX |
18768 | msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" |
18769 | msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri" | |
18770 | ||
ec3d4607 | 18771 | #: builtin/pack-objects.c:4033 |
fd8cb379 JX |
18772 | #, c-format |
18773 | msgid "delta chain depth %d is too deep, forcing %d" | |
18774 | msgstr "增量链深度 %d 太深了,强制为 %d" | |
18775 | ||
ec3d4607 | 18776 | #: builtin/pack-objects.c:4038 |
fd8cb379 JX |
18777 | #, c-format |
18778 | msgid "pack.deltaCacheLimit is too high, forcing %d" | |
18779 | msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" | |
6c94aba5 | 18780 | |
ec3d4607 | 18781 | #: builtin/pack-objects.c:4094 |
c1ac5258 JX |
18782 | msgid "--max-pack-size cannot be used to build a pack for transfer" |
18783 | msgstr "不能使用 --max-pack-size 来构建传输用的包文件" | |
18784 | ||
ec3d4607 | 18785 | #: builtin/pack-objects.c:4096 |
c1ac5258 | 18786 | msgid "minimum pack size limit is 1 MiB" |
e640d114 | 18787 | msgstr "最小的包文件大小是 1 MiB" |
c1ac5258 | 18788 | |
ec3d4607 | 18789 | #: builtin/pack-objects.c:4101 |
c1ac5258 JX |
18790 | msgid "--thin cannot be used to build an indexable pack" |
18791 | msgstr "--thin 不能用于创建一个可索引包" | |
18792 | ||
ec3d4607 | 18793 | #: builtin/pack-objects.c:4104 |
c1ac5258 JX |
18794 | msgid "--keep-unreachable and --unpack-unreachable are incompatible" |
18795 | msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" | |
18796 | ||
ec3d4607 | 18797 | #: builtin/pack-objects.c:4110 |
c1ac5258 | 18798 | msgid "cannot use --filter without --stdout" |
e640d114 | 18799 | msgstr "不能在没有 --stdout 的情况下使用 --filter" |
c1ac5258 | 18800 | |
ec3d4607 | 18801 | #: builtin/pack-objects.c:4112 |
33b62fba JX |
18802 | msgid "cannot use --filter with --stdin-packs" |
18803 | msgstr "不能同时使用 --filter 和 --stdin-packs" | |
18804 | ||
ec3d4607 | 18805 | #: builtin/pack-objects.c:4116 |
33b62fba JX |
18806 | msgid "cannot use internal rev list with --stdin-packs" |
18807 | msgstr "不能同时使用内部版本列表和 --stdin-packs" | |
18808 | ||
ec3d4607 | 18809 | #: builtin/pack-objects.c:4175 |
fd8cb379 | 18810 | msgid "Enumerating objects" |
d9488fea | 18811 | msgstr "枚举对象中" |
fd8cb379 | 18812 | |
ec3d4607 | 18813 | #: builtin/pack-objects.c:4212 |
c1ac5258 | 18814 | #, c-format |
2b472aae JX |
18815 | msgid "" |
18816 | "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" | |
18817 | "reused %<PRIu32>" | |
18818 | msgstr "" | |
18819 | "总共 %<PRIu32>(差异 %<PRIu32>),复用 %<PRIu32>(差异 %<PRIu32>),包复用 " | |
18820 | "%<PRIu32>" | |
c1ac5258 | 18821 | |
473eb541 JX |
18822 | #: builtin/pack-redundant.c:601 |
18823 | msgid "" | |
18824 | "'git pack-redundant' is nominated for removal.\n" | |
18825 | "If you still use this command, please add an extra\n" | |
18826 | "option, '--i-still-use-this', on the command line\n" | |
18827 | "and let us know you still use it by sending an e-mail\n" | |
18828 | "to <git@vger.kernel.org>. Thanks.\n" | |
18829 | msgstr "" | |
18830 | "准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n" | |
18831 | "命令,请在命令行中添加额外参数:'--i-still-use-this',\n" | |
18832 | "并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n" | |
18833 | "使用它。 谢谢。\n" | |
18834 | ||
d46c5519 | 18835 | #: builtin/pack-refs.c:8 |
814ff314 JX |
18836 | msgid "git pack-refs [<options>]" |
18837 | msgstr "git pack-refs [<选项>]" | |
c04f5ac3 | 18838 | |
d46c5519 | 18839 | #: builtin/pack-refs.c:16 |
ef317cd5 | 18840 | msgid "pack everything" |
07432cef | 18841 | msgstr "打包一切" |
c04f5ac3 | 18842 | |
d46c5519 | 18843 | #: builtin/pack-refs.c:17 |
ef317cd5 | 18844 | msgid "prune loose refs (default)" |
07432cef | 18845 | msgstr "清除松散的引用(默认)" |
c04f5ac3 | 18846 | |
349ede6a | 18847 | #: builtin/prune-packed.c:6 |
814ff314 JX |
18848 | msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" |
18849 | msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" | |
6792b93b | 18850 | |
349ede6a | 18851 | #: builtin/prune.c:14 |
5809aa05 JX |
18852 | msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" |
18853 | msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" | |
7ac1c0ad | 18854 | |
349ede6a | 18855 | #: builtin/prune.c:133 |
1b7f4a34 JX |
18856 | msgid "report pruned objects" |
18857 | msgstr "报告清除的对象" | |
18858 | ||
349ede6a | 18859 | #: builtin/prune.c:136 |
1b7f4a34 JX |
18860 | msgid "expire objects older than <time>" |
18861 | msgstr "使早于给定时间的对象过期" | |
18862 | ||
349ede6a | 18863 | #: builtin/prune.c:138 |
31e5e17b JX |
18864 | msgid "limit traversal to objects outside promisor packfiles" |
18865 | msgstr "限制遍历 promisor 包以外的对象" | |
18866 | ||
349ede6a | 18867 | #: builtin/prune.c:152 |
94550ed3 JX |
18868 | msgid "cannot prune in a precious-objects repo" |
18869 | msgstr "不能在珍品仓库中执行清理操作" | |
18870 | ||
2b472aae | 18871 | #: builtin/pull.c:45 builtin/pull.c:47 |
a0b6b246 JX |
18872 | #, c-format |
18873 | msgid "Invalid value for %s: %s" | |
18874 | msgstr "%s 的值无效:%s" | |
18875 | ||
2b472aae | 18876 | #: builtin/pull.c:67 |
94550ed3 | 18877 | msgid "git pull [<options>] [<repository> [<refspec>...]]" |
1b7f4a34 JX |
18878 | msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" |
18879 | ||
349ede6a | 18880 | #: builtin/pull.c:123 |
a4f16749 JX |
18881 | msgid "control for recursive fetching of submodules" |
18882 | msgstr "控制子模组的递归获取" | |
18883 | ||
349ede6a | 18884 | #: builtin/pull.c:127 |
1b7f4a34 JX |
18885 | msgid "Options related to merging" |
18886 | msgstr "和合并相关的选项" | |
18887 | ||
349ede6a | 18888 | #: builtin/pull.c:130 |
1b7f4a34 JX |
18889 | msgid "incorporate changes by rebasing rather than merging" |
18890 | msgstr "使用变基操作取代合并操作以合入修改" | |
18891 | ||
33b62fba | 18892 | #: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126 |
1b7f4a34 JX |
18893 | msgid "allow fast-forward" |
18894 | msgstr "允许快进式" | |
18895 | ||
33b62fba | 18896 | #: builtin/pull.c:167 parse-options.h:340 |
349ede6a JX |
18897 | msgid "automatically stash/stash pop before and after" |
18898 | msgstr "在操作前后执行自动贮藏和弹出贮藏" | |
5b04ee3b | 18899 | |
349ede6a | 18900 | #: builtin/pull.c:183 |
1b7f4a34 JX |
18901 | msgid "Options related to fetching" |
18902 | msgstr "和获取相关的参数" | |
18903 | ||
349ede6a | 18904 | #: builtin/pull.c:193 |
4c27fcb5 JX |
18905 | msgid "force overwrite of local branch" |
18906 | msgstr "强制覆盖本地分支" | |
18907 | ||
349ede6a | 18908 | #: builtin/pull.c:201 |
276ceeaa JX |
18909 | msgid "number of submodules pulled in parallel" |
18910 | msgstr "并发拉取的子模组的数量" | |
18911 | ||
349ede6a | 18912 | #: builtin/pull.c:317 |
1b7f4a34 JX |
18913 | #, c-format |
18914 | msgid "Invalid value for pull.ff: %s" | |
18915 | msgstr "pull.ff 的取值无效:%s" | |
18916 | ||
473eb541 | 18917 | #: builtin/pull.c:445 |
1b7f4a34 JX |
18918 | msgid "" |
18919 | "There is no candidate for rebasing against among the refs that you just " | |
18920 | "fetched." | |
18921 | msgstr "在您刚刚获取到的引用中没有变基操作的候选。" | |
18922 | ||
473eb541 | 18923 | #: builtin/pull.c:447 |
1b7f4a34 JX |
18924 | msgid "" |
18925 | "There are no candidates for merging among the refs that you just fetched." | |
18926 | msgstr "在您刚刚获取到的引用中没有合并操作的候选。" | |
18927 | ||
473eb541 | 18928 | #: builtin/pull.c:448 |
1b7f4a34 JX |
18929 | msgid "" |
18930 | "Generally this means that you provided a wildcard refspec which had no\n" | |
18931 | "matches on the remote end." | |
18932 | msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" | |
18933 | ||
473eb541 | 18934 | #: builtin/pull.c:451 |
1b7f4a34 JX |
18935 | #, c-format |
18936 | msgid "" | |
18937 | "You asked to pull from the remote '%s', but did not specify\n" | |
18938 | "a branch. Because this is not the default configured remote\n" | |
18939 | "for your current branch, you must specify a branch on the command line." | |
18940 | msgstr "" | |
18941 | "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" | |
18942 | "分支默认的远程仓库,您必须在命令行中指定一个分支名。" | |
18943 | ||
33b62fba | 18944 | #: builtin/pull.c:456 builtin/rebase.c:1248 |
1b7f4a34 JX |
18945 | msgid "You are not currently on a branch." |
18946 | msgstr "您当前不在一个分支上。" | |
18947 | ||
473eb541 | 18948 | #: builtin/pull.c:458 builtin/pull.c:473 |
1b7f4a34 JX |
18949 | msgid "Please specify which branch you want to rebase against." |
18950 | msgstr "请指定您要变基到哪一个分支。" | |
18951 | ||
473eb541 | 18952 | #: builtin/pull.c:460 builtin/pull.c:475 |
1b7f4a34 JX |
18953 | msgid "Please specify which branch you want to merge with." |
18954 | msgstr "请指定您要合并哪一个分支。" | |
18955 | ||
473eb541 | 18956 | #: builtin/pull.c:461 builtin/pull.c:476 |
1b7f4a34 JX |
18957 | msgid "See git-pull(1) for details." |
18958 | msgstr "详见 git-pull(1)。" | |
18959 | ||
473eb541 | 18960 | #: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 |
33b62fba | 18961 | #: builtin/rebase.c:1254 |
5b04ee3b JX |
18962 | msgid "<remote>" |
18963 | msgstr "<远程>" | |
18964 | ||
473eb541 | 18965 | #: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 |
5b04ee3b JX |
18966 | msgid "<branch>" |
18967 | msgstr "<分支>" | |
18968 | ||
33b62fba | 18969 | #: builtin/pull.c:471 builtin/rebase.c:1246 |
1b7f4a34 JX |
18970 | msgid "There is no tracking information for the current branch." |
18971 | msgstr "当前分支没有跟踪信息。" | |
18972 | ||
473eb541 | 18973 | #: builtin/pull.c:480 |
1b7f4a34 | 18974 | msgid "" |
5b04ee3b JX |
18975 | "If you wish to set tracking information for this branch you can do so with:" |
18976 | msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" | |
7ac1c0ad | 18977 | |
473eb541 | 18978 | #: builtin/pull.c:485 |
1b7f4a34 JX |
18979 | #, c-format |
18980 | msgid "" | |
18981 | "Your configuration specifies to merge with the ref '%s'\n" | |
18982 | "from the remote, but no such ref was fetched." | |
18983 | msgstr "" | |
18984 | "您的配置中指定要合并远程的引用 '%s',\n" | |
18985 | "但是没有获取到这个引用。" | |
7ac1c0ad | 18986 | |
473eb541 | 18987 | #: builtin/pull.c:596 |
4c27fcb5 JX |
18988 | #, c-format |
18989 | msgid "unable to access commit %s" | |
18990 | msgstr "无法访问提交 %s" | |
18991 | ||
473eb541 | 18992 | #: builtin/pull.c:902 |
5c57d762 JX |
18993 | msgid "ignoring --verify-signatures for rebase" |
18994 | msgstr "为变基操作忽略 --verify-signatures" | |
18995 | ||
473eb541 JX |
18996 | #: builtin/pull.c:930 |
18997 | msgid "" | |
18998 | "Pulling without specifying how to reconcile divergent branches is\n" | |
18999 | "discouraged. You can squelch this message by running one of the following\n" | |
19000 | "commands sometime before your next pull:\n" | |
19001 | "\n" | |
19002 | " git config pull.rebase false # merge (the default strategy)\n" | |
19003 | " git config pull.rebase true # rebase\n" | |
19004 | " git config pull.ff only # fast-forward only\n" | |
19005 | "\n" | |
19006 | "You can replace \"git config\" with \"git config --global\" to set a " | |
19007 | "default\n" | |
19008 | "preference for all repositories. You can also pass --rebase, --no-rebase,\n" | |
19009 | "or --ff-only on the command line to override the configured default per\n" | |
19010 | "invocation.\n" | |
19011 | msgstr "" | |
19012 | "不建议在没有为偏离分支指定合并策略时执行 pull 操作。 您可以在执行下一次\n" | |
19013 | "pull 操作之前执行下面一条命令来抑制本消息:\n" | |
19014 | "\n" | |
19015 | " git config pull.rebase false # 合并(缺省策略)\n" | |
19016 | " git config pull.rebase true # 变基\n" | |
19017 | " git config pull.ff only # 仅快进\n" | |
19018 | "\n" | |
19019 | "您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n" | |
19020 | "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase,\n" | |
19021 | "或者 --ff-only 参数覆盖缺省设置。\n" | |
19022 | ||
ec3d4607 | 19023 | #: builtin/pull.c:990 |
1b7f4a34 JX |
19024 | msgid "Updating an unborn branch with changes added to the index." |
19025 | msgstr "更新尚未诞生的分支,变更添加至索引。" | |
19026 | ||
ec3d4607 | 19027 | #: builtin/pull.c:994 |
a0b6b246 JX |
19028 | msgid "pull with rebase" |
19029 | msgstr "变基式拉取" | |
19030 | ||
ec3d4607 | 19031 | #: builtin/pull.c:995 |
a0b6b246 | 19032 | msgid "please commit or stash them." |
554e8501 | 19033 | msgstr "请提交或贮藏它们。" |
a0b6b246 | 19034 | |
ec3d4607 | 19035 | #: builtin/pull.c:1020 |
1b7f4a34 JX |
19036 | #, c-format |
19037 | msgid "" | |
19038 | "fetch updated the current branch head.\n" | |
19039 | "fast-forwarding your working tree from\n" | |
19040 | "commit %s." | |
19041 | msgstr "" | |
19042 | "fetch 更新了当前的分支。快进您的工作区\n" | |
19043 | "至提交 %s。" | |
ef317cd5 | 19044 | |
ec3d4607 | 19045 | #: builtin/pull.c:1026 |
1b7f4a34 JX |
19046 | #, c-format |
19047 | msgid "" | |
19048 | "Cannot fast-forward your working tree.\n" | |
19049 | "After making sure that you saved anything precious from\n" | |
19050 | "$ git diff %s\n" | |
19051 | "output, run\n" | |
19052 | "$ git reset --hard\n" | |
19053 | "to recover." | |
19054 | msgstr "" | |
19055 | "您当前的工作区无法执行快进操作。\n" | |
19056 | "首先执行如下命令:\n" | |
19057 | "$ git diff %s\n" | |
19058 | "以确认所有有用的数据均已保存。然后执行下面的命令\n" | |
19059 | "$ git reset --hard\n" | |
19060 | "恢复之前的状态。" | |
19061 | ||
ec3d4607 | 19062 | #: builtin/pull.c:1041 |
1b7f4a34 JX |
19063 | msgid "Cannot merge multiple branches into empty head." |
19064 | msgstr "无法将多个分支合并到空分支。" | |
19065 | ||
ec3d4607 | 19066 | #: builtin/pull.c:1045 |
1b7f4a34 JX |
19067 | msgid "Cannot rebase onto multiple branches." |
19068 | msgstr "无法变基到多个分支。" | |
19069 | ||
ec3d4607 | 19070 | #: builtin/pull.c:1065 |
a4f16749 JX |
19071 | msgid "cannot rebase with locally recorded submodule modifications" |
19072 | msgstr "本地子模组中有修改,无法变基" | |
19073 | ||
fd8cb379 | 19074 | #: builtin/push.c:19 |
ef317cd5 | 19075 | msgid "git push [<options>] [<repository> [<refspec>...]]" |
160fb2b2 | 19076 | msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" |
7ac1c0ad | 19077 | |
d9488fea | 19078 | #: builtin/push.c:111 |
c04f5ac3 | 19079 | msgid "tag shorthand without <tag>" |
55a16ee4 | 19080 | msgstr "标签后面未提供 <标签> 参数" |
c04f5ac3 | 19081 | |
d9488fea | 19082 | #: builtin/push.c:119 |
c04f5ac3 | 19083 | msgid "--delete only accepts plain target ref names" |
90e6ef53 | 19084 | msgstr "--delete 只接受简单的目标引用名" |
c04f5ac3 | 19085 | |
d9488fea | 19086 | #: builtin/push.c:164 |
8ada9598 JX |
19087 | msgid "" |
19088 | "\n" | |
19089 | "To choose either option permanently, see push.default in 'git help config'." | |
19090 | msgstr "" | |
81809b99 JX |
19091 | "\n" |
19092 | "为了永久地选择任一选项,参见 'git help config' 中的 push.default。" | |
8ada9598 | 19093 | |
d9488fea | 19094 | #: builtin/push.c:167 |
8ada9598 JX |
19095 | #, c-format |
19096 | msgid "" | |
19097 | "The upstream branch of your current branch does not match\n" | |
19098 | "the name of your current branch. To push to the upstream branch\n" | |
19099 | "on the remote, use\n" | |
19100 | "\n" | |
19101 | " git push %s HEAD:%s\n" | |
19102 | "\n" | |
19103 | "To push to the branch of the same name on the remote, use\n" | |
19104 | "\n" | |
4c27fcb5 | 19105 | " git push %s HEAD\n" |
8ada9598 JX |
19106 | "%s" |
19107 | msgstr "" | |
4c27fcb5 JX |
19108 | "您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n" |
19109 | "使用\n" | |
81809b99 JX |
19110 | "\n" |
19111 | " git push %s HEAD:%s\n" | |
19112 | "\n" | |
19113 | "为推送至远程同名分支,使用\n" | |
19114 | "\n" | |
4c27fcb5 | 19115 | " git push %s HEAD\n" |
81809b99 | 19116 | "%s" |
8ada9598 | 19117 | |
d9488fea | 19118 | #: builtin/push.c:182 |
c04f5ac3 JX |
19119 | #, c-format |
19120 | msgid "" | |
19121 | "You are not currently on a branch.\n" | |
19122 | "To push the history leading to the current (detached HEAD)\n" | |
19123 | "state now, use\n" | |
19124 | "\n" | |
19125 | " git push %s HEAD:<name-of-remote-branch>\n" | |
19126 | msgstr "" | |
19127 | "您当前不在一个分支上。\n" | |
90e6ef53 | 19128 | "现在为推送当前(分离头指针)的历史,使用\n" |
c04f5ac3 | 19129 | "\n" |
d9d56b23 | 19130 | " git push %s HEAD:<远程分支名字>\n" |
c04f5ac3 | 19131 | |
ec3d4607 | 19132 | #: builtin/push.c:191 |
c04f5ac3 JX |
19133 | #, c-format |
19134 | msgid "" | |
19135 | "The current branch %s has no upstream branch.\n" | |
19136 | "To push the current branch and set the remote as upstream, use\n" | |
19137 | "\n" | |
19138 | " git push --set-upstream %s %s\n" | |
19139 | msgstr "" | |
19140 | "当前分支 %s 没有对应的上游分支。\n" | |
19141 | "为推送当前分支并建立与远程上游的跟踪,使用\n" | |
19142 | "\n" | |
19143 | " git push --set-upstream %s %s\n" | |
19144 | ||
ec3d4607 | 19145 | #: builtin/push.c:199 |
c04f5ac3 JX |
19146 | #, c-format |
19147 | msgid "The current branch %s has multiple upstream branches, refusing to push." | |
19148 | msgstr "当前分支 %s 有多个上游分支,拒绝推送。" | |
19149 | ||
ec3d4607 JX |
19150 | #: builtin/push.c:217 |
19151 | msgid "" | |
19152 | "You didn't specify any refspecs to push, and push.default is \"nothing\"." | |
19153 | msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。" | |
19154 | ||
19155 | #: builtin/push.c:243 | |
73a60cd2 JX |
19156 | #, c-format |
19157 | msgid "" | |
19158 | "You are pushing to remote '%s', which is not the upstream of\n" | |
19159 | "your current branch '%s', without telling me what to push\n" | |
19160 | "to update which remote branch." | |
19161 | msgstr "" | |
19162 | "您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n" | |
19163 | "而没有告诉我要推送什么、更新哪个远程分支。" | |
19164 | ||
ec3d4607 | 19165 | #: builtin/push.c:258 |
170e9899 JX |
19166 | msgid "" |
19167 | "Updates were rejected because the tip of your current branch is behind\n" | |
2e8451e8 JX |
19168 | "its remote counterpart. Integrate the remote changes (e.g.\n" |
19169 | "'git pull ...') before pushing again.\n" | |
170e9899 JX |
19170 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
19171 | msgstr "" | |
eff6d3a9 | 19172 | "更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 19173 | "再次推送前,先与远程变更合并(如 'git pull ...')。详见\n" |
eff6d3a9 | 19174 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 19175 | |
ec3d4607 | 19176 | #: builtin/push.c:264 |
170e9899 JX |
19177 | msgid "" |
19178 | "Updates were rejected because a pushed branch tip is behind its remote\n" | |
2e8451e8 JX |
19179 | "counterpart. Check out this branch and integrate the remote changes\n" |
19180 | "(e.g. 'git pull ...') before pushing again.\n" | |
170e9899 JX |
19181 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
19182 | msgstr "" | |
eff6d3a9 | 19183 | "更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n" |
2e8451e8 | 19184 | "检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n" |
eff6d3a9 | 19185 | "'git push --help' 中的 'Note about fast-forwards' 小节。" |
170e9899 | 19186 | |
ec3d4607 | 19187 | #: builtin/push.c:270 |
07432cef | 19188 | msgid "" |
a77c07d9 JX |
19189 | "Updates were rejected because the remote contains work that you do\n" |
19190 | "not have locally. This is usually caused by another repository pushing\n" | |
2e8451e8 JX |
19191 | "to the same ref. You may want to first integrate the remote changes\n" |
19192 | "(e.g., 'git pull ...') before pushing again.\n" | |
a77c07d9 JX |
19193 | "See the 'Note about fast-forwards' in 'git push --help' for details." |
19194 | msgstr "" | |
160fb2b2 JX |
19195 | "更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n" |
19196 | "一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n" | |
2e8451e8 | 19197 | "(如 'git pull ...')。\n" |
a77c07d9 JX |
19198 | "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" |
19199 | ||
ec3d4607 | 19200 | #: builtin/push.c:277 |
a77c07d9 | 19201 | msgid "Updates were rejected because the tag already exists in the remote." |
55a16ee4 | 19202 | msgstr "更新被拒绝,因为该标签在远程已经存在。" |
a77c07d9 | 19203 | |
ec3d4607 | 19204 | #: builtin/push.c:280 |
a77c07d9 JX |
19205 | msgid "" |
19206 | "You cannot update a remote ref that points at a non-commit object,\n" | |
19207 | "or update a remote ref to make it point at a non-commit object,\n" | |
19208 | "without using the '--force' option.\n" | |
19209 | msgstr "" | |
19210 | "如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n" | |
19211 | "也不能更新远程引用让其指向一个非提交对象。\n" | |
07432cef | 19212 | |
ec3d4607 | 19213 | #: builtin/push.c:285 |
d13389bf JX |
19214 | msgid "" |
19215 | "Updates were rejected because the tip of the remote-tracking\n" | |
19216 | "branch has been updated since the last checkout. You may want\n" | |
19217 | "to integrate those changes locally (e.g., 'git pull ...')\n" | |
19218 | "before forcing an update.\n" | |
19219 | msgstr "" | |
19220 | "更新被拒绝,因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n" | |
19221 | "在强制更新前,您可能想将这些变更整合到本地(如 'git pull ...')。\n" | |
19222 | ||
ec3d4607 | 19223 | #: builtin/push.c:355 |
c04f5ac3 JX |
19224 | #, c-format |
19225 | msgid "Pushing to %s\n" | |
19226 | msgstr "推送到 %s\n" | |
19227 | ||
ec3d4607 | 19228 | #: builtin/push.c:362 |
c04f5ac3 JX |
19229 | #, c-format |
19230 | msgid "failed to push some refs to '%s'" | |
c1ac5258 | 19231 | msgstr "推送一些引用到 '%s' 失败" |
c04f5ac3 | 19232 | |
ec3d4607 | 19233 | #: builtin/push.c:544 |
ef317cd5 | 19234 | msgid "repository" |
160fb2b2 | 19235 | msgstr "仓库" |
ef317cd5 | 19236 | |
ec3d4607 | 19237 | #: builtin/push.c:545 builtin/send-pack.c:189 |
ef317cd5 | 19238 | msgid "push all refs" |
07432cef | 19239 | msgstr "推送所有引用" |
ef317cd5 | 19240 | |
ec3d4607 | 19241 | #: builtin/push.c:546 builtin/send-pack.c:191 |
ef317cd5 | 19242 | msgid "mirror all refs" |
07432cef | 19243 | msgstr "镜像所有引用" |
ef317cd5 | 19244 | |
ec3d4607 | 19245 | #: builtin/push.c:548 |
ef317cd5 | 19246 | msgid "delete refs" |
07432cef | 19247 | msgstr "删除引用" |
ef317cd5 | 19248 | |
ec3d4607 | 19249 | #: builtin/push.c:549 |
ef317cd5 | 19250 | msgid "push tags (can't be used with --all or --mirror)" |
55a16ee4 | 19251 | msgstr "推送标签(不能使用 --all or --mirror)" |
ef317cd5 | 19252 | |
ec3d4607 | 19253 | #: builtin/push.c:552 builtin/send-pack.c:192 |
ef317cd5 JX |
19254 | msgid "force updates" |
19255 | msgstr "强制更新" | |
19256 | ||
ec3d4607 | 19257 | #: builtin/push.c:553 builtin/send-pack.c:204 |
c1ac5258 JX |
19258 | msgid "<refname>:<expect>" |
19259 | msgstr "<引用名>:<期望值>" | |
90314792 | 19260 | |
ec3d4607 | 19261 | #: builtin/push.c:554 builtin/send-pack.c:205 |
90314792 JX |
19262 | msgid "require old value of ref to be at this value" |
19263 | msgstr "要求引用旧的取值为设定值" | |
19264 | ||
ec3d4607 | 19265 | #: builtin/push.c:557 builtin/send-pack.c:208 |
d13389bf JX |
19266 | msgid "require remote updates to be integrated locally" |
19267 | msgstr "要求远程更新在本地被整合" | |
19268 | ||
ec3d4607 | 19269 | #: builtin/push.c:560 |
ef317cd5 | 19270 | msgid "control recursive pushing of submodules" |
07432cef | 19271 | msgstr "控制子模组的递归推送" |
ef317cd5 | 19272 | |
ec3d4607 | 19273 | #: builtin/push.c:561 builtin/send-pack.c:199 |
ef317cd5 | 19274 | msgid "use thin pack" |
07432cef | 19275 | msgstr "使用精简打包" |
ef317cd5 | 19276 | |
ec3d4607 | 19277 | #: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186 |
d13389bf | 19278 | #: builtin/send-pack.c:187 |
ef317cd5 | 19279 | msgid "receive pack program" |
07432cef | 19280 | msgstr "接收包程序" |
ef317cd5 | 19281 | |
ec3d4607 | 19282 | #: builtin/push.c:564 |
ef317cd5 | 19283 | msgid "set upstream for git pull/status" |
07432cef | 19284 | msgstr "设置 git pull/status 的上游" |
ef317cd5 | 19285 | |
ec3d4607 | 19286 | #: builtin/push.c:567 |
ef317cd5 | 19287 | msgid "prune locally removed refs" |
07432cef | 19288 | msgstr "清除本地删除的引用" |
ef317cd5 | 19289 | |
ec3d4607 | 19290 | #: builtin/push.c:569 |
a77c07d9 JX |
19291 | msgid "bypass pre-push hook" |
19292 | msgstr "绕过 pre-push 钩子" | |
19293 | ||
ec3d4607 | 19294 | #: builtin/push.c:570 |
1003b3a5 | 19295 | msgid "push missing but relevant tags" |
55a16ee4 | 19296 | msgstr "推送缺失但有关的标签" |
1003b3a5 | 19297 | |
ec3d4607 | 19298 | #: builtin/push.c:572 builtin/send-pack.c:193 |
220c313c JX |
19299 | msgid "GPG sign the push" |
19300 | msgstr "用 GPG 为推送签名" | |
19301 | ||
ec3d4607 | 19302 | #: builtin/push.c:574 builtin/send-pack.c:200 |
814ff314 JX |
19303 | msgid "request atomic transaction on remote side" |
19304 | msgstr "需要远端支持原子事务" | |
19305 | ||
ec3d4607 | 19306 | #: builtin/push.c:592 |
c04f5ac3 JX |
19307 | msgid "--delete is incompatible with --all, --mirror and --tags" |
19308 | msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" | |
19309 | ||
ec3d4607 | 19310 | #: builtin/push.c:594 |
c04f5ac3 JX |
19311 | msgid "--delete doesn't make sense without any refs" |
19312 | msgstr "--delete 未接任何引用没有意义" | |
19313 | ||
ec3d4607 | 19314 | #: builtin/push.c:614 |
a5cd71ca JX |
19315 | #, c-format |
19316 | msgid "bad repository '%s'" | |
19317 | msgstr "坏的仓库 '%s'" | |
19318 | ||
ec3d4607 | 19319 | #: builtin/push.c:615 |
a5cd71ca JX |
19320 | msgid "" |
19321 | "No configured push destination.\n" | |
19322 | "Either specify the URL from the command-line or configure a remote " | |
19323 | "repository using\n" | |
19324 | "\n" | |
19325 | " git remote add <name> <url>\n" | |
19326 | "\n" | |
19327 | "and then push using the remote name\n" | |
19328 | "\n" | |
19329 | " git push <name>\n" | |
19330 | msgstr "" | |
19331 | "没有配置推送目标。\n" | |
19332 | "或通过命令行指定 URL,或用下面命令配置一个远程仓库\n" | |
19333 | "\n" | |
19334 | " git remote add <名称> <地址>\n" | |
19335 | "\n" | |
19336 | "然后使用该远程仓库名执行推送\n" | |
19337 | "\n" | |
19338 | " git push <名称>\n" | |
19339 | ||
ec3d4607 | 19340 | #: builtin/push.c:630 |
fd8cb379 JX |
19341 | msgid "--all and --tags are incompatible" |
19342 | msgstr "--all 和 --tags 不兼容" | |
19343 | ||
ec3d4607 | 19344 | #: builtin/push.c:632 |
fd8cb379 JX |
19345 | msgid "--all can't be combined with refspecs" |
19346 | msgstr "--all 不能和引用规格同时使用" | |
19347 | ||
ec3d4607 | 19348 | #: builtin/push.c:636 |
fd8cb379 JX |
19349 | msgid "--mirror and --tags are incompatible" |
19350 | msgstr "--mirror 和 --tags 不兼容" | |
19351 | ||
ec3d4607 | 19352 | #: builtin/push.c:638 |
fd8cb379 JX |
19353 | msgid "--mirror can't be combined with refspecs" |
19354 | msgstr "--mirror 不能和引用规格同时使用" | |
19355 | ||
ec3d4607 | 19356 | #: builtin/push.c:641 |
fd8cb379 JX |
19357 | msgid "--all and --mirror are incompatible" |
19358 | msgstr "--all 和 --mirror 不兼容" | |
19359 | ||
ec3d4607 | 19360 | #: builtin/push.c:648 |
5c57d762 JX |
19361 | msgid "push options must not have new line characters" |
19362 | msgstr "推送选项不能有换行符" | |
19363 | ||
473eb541 | 19364 | #: builtin/range-diff.c:9 |
c1ac5258 JX |
19365 | msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" |
19366 | msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>" | |
19367 | ||
473eb541 | 19368 | #: builtin/range-diff.c:10 |
c1ac5258 JX |
19369 | msgid "git range-diff [<options>] <old-tip>...<new-tip>" |
19370 | msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" | |
19371 | ||
473eb541 | 19372 | #: builtin/range-diff.c:11 |
c1ac5258 JX |
19373 | msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" |
19374 | msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" | |
19375 | ||
473eb541 | 19376 | #: builtin/range-diff.c:30 |
c1ac5258 JX |
19377 | msgid "use simple diff colors" |
19378 | msgstr "使用简单差异颜色" | |
19379 | ||
473eb541 | 19380 | #: builtin/range-diff.c:32 |
ddc12c42 JX |
19381 | msgid "notes" |
19382 | msgstr "注解" | |
19383 | ||
473eb541 | 19384 | #: builtin/range-diff.c:32 |
ddc12c42 JX |
19385 | msgid "passed to 'git log'" |
19386 | msgstr "传递给 'git log'" | |
19387 | ||
473eb541 JX |
19388 | #: builtin/range-diff.c:35 |
19389 | msgid "only emit output related to the first range" | |
19390 | msgstr "仅显示与第一个范围有关的输出" | |
19391 | ||
19392 | #: builtin/range-diff.c:37 | |
19393 | msgid "only emit output related to the second range" | |
19394 | msgstr "仅显示与第二个范围有关的输出" | |
19395 | ||
19396 | #: builtin/range-diff.c:60 builtin/range-diff.c:64 | |
c1ac5258 | 19397 | #, c-format |
473eb541 JX |
19398 | msgid "not a commit range: '%s'" |
19399 | msgstr "不是一个提交范围:'%s'" | |
c1ac5258 | 19400 | |
473eb541 | 19401 | #: builtin/range-diff.c:74 |
c1ac5258 JX |
19402 | msgid "single arg format must be symmetric range" |
19403 | msgstr "单个参数格式必须是对称范围(即包含...)" | |
19404 | ||
473eb541 | 19405 | #: builtin/range-diff.c:89 |
c1ac5258 JX |
19406 | msgid "need two commit ranges" |
19407 | msgstr "需要两个提交范围" | |
19408 | ||
06991777 | 19409 | #: builtin/read-tree.c:41 |
ef317cd5 | 19410 | msgid "" |
1b7f4a34 | 19411 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " |
ef317cd5 JX |
19412 | "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
19413 | "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" | |
19414 | msgstr "" | |
1b7f4a34 | 19415 | "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-" |
07432cef | 19416 | "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" |
1b7f4a34 | 19417 | "index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])" |
ef317cd5 | 19418 | |
06991777 | 19419 | #: builtin/read-tree.c:124 |
ef317cd5 | 19420 | msgid "write resulting index to <file>" |
d9d56b23 | 19421 | msgstr "将索引结果写入 <文件>" |
ef317cd5 | 19422 | |
06991777 | 19423 | #: builtin/read-tree.c:127 |
ef317cd5 | 19424 | msgid "only empty the index" |
07432cef | 19425 | msgstr "只是清空索引" |
ef317cd5 | 19426 | |
06991777 | 19427 | #: builtin/read-tree.c:129 |
ef317cd5 | 19428 | msgid "Merging" |
07432cef | 19429 | msgstr "合并" |
ef317cd5 | 19430 | |
06991777 | 19431 | #: builtin/read-tree.c:131 |
ef317cd5 | 19432 | msgid "perform a merge in addition to a read" |
07432cef | 19433 | msgstr "读取之余再执行一个合并" |
ef317cd5 | 19434 | |
06991777 | 19435 | #: builtin/read-tree.c:133 |
ef317cd5 | 19436 | msgid "3-way merge if no file level merging required" |
160fb2b2 | 19437 | msgstr "如果没有文件级合并需要,执行三方合并" |
ef317cd5 | 19438 | |
06991777 | 19439 | #: builtin/read-tree.c:135 |
ef317cd5 | 19440 | msgid "3-way merge in presence of adds and removes" |
160fb2b2 | 19441 | msgstr "存在添加和删除时,也执行三方合并" |
ef317cd5 | 19442 | |
06991777 | 19443 | #: builtin/read-tree.c:137 |
ef317cd5 | 19444 | msgid "same as -m, but discard unmerged entries" |
07432cef | 19445 | msgstr "类似于 -m,但丢弃未合并的条目" |
ef317cd5 | 19446 | |
06991777 | 19447 | #: builtin/read-tree.c:138 |
ef317cd5 | 19448 | msgid "<subdirectory>/" |
07432cef | 19449 | msgstr "<子目录>/" |
ef317cd5 | 19450 | |
06991777 | 19451 | #: builtin/read-tree.c:139 |
ef317cd5 | 19452 | msgid "read the tree into the index under <subdirectory>/" |
07432cef | 19453 | msgstr "读取树对象到索引的 <子目录>/ 下" |
ef317cd5 | 19454 | |
06991777 | 19455 | #: builtin/read-tree.c:142 |
ef317cd5 | 19456 | msgid "update working tree with merge result" |
07432cef | 19457 | msgstr "用合并的结果更新工作区" |
ef317cd5 | 19458 | |
06991777 | 19459 | #: builtin/read-tree.c:144 |
ef317cd5 | 19460 | msgid "gitignore" |
07432cef | 19461 | msgstr "gitignore" |
ef317cd5 | 19462 | |
06991777 | 19463 | #: builtin/read-tree.c:145 |
ef317cd5 | 19464 | msgid "allow explicitly ignored files to be overwritten" |
07432cef | 19465 | msgstr "允许忽略文件中设定的文件可以被覆盖" |
ef317cd5 | 19466 | |
06991777 | 19467 | #: builtin/read-tree.c:148 |
ef317cd5 | 19468 | msgid "don't check the working tree after merging" |
07432cef | 19469 | msgstr "合并后不检查工作区" |
ef317cd5 | 19470 | |
06991777 | 19471 | #: builtin/read-tree.c:149 |
ef317cd5 | 19472 | msgid "don't update the index or the work tree" |
07432cef | 19473 | msgstr "不更新索引区和工作区" |
ef317cd5 | 19474 | |
06991777 | 19475 | #: builtin/read-tree.c:151 |
ef317cd5 | 19476 | msgid "skip applying sparse checkout filter" |
07432cef | 19477 | msgstr "跳过应用稀疏检出过滤器" |
ef317cd5 | 19478 | |
06991777 | 19479 | #: builtin/read-tree.c:153 |
ef317cd5 | 19480 | msgid "debug unpack-trees" |
07432cef | 19481 | msgstr "调试 unpack-trees" |
ef317cd5 | 19482 | |
d46c5519 JX |
19483 | #: builtin/read-tree.c:157 |
19484 | msgid "suppress feedback messages" | |
19485 | msgstr "抑制反馈信息" | |
19486 | ||
ddc12c42 JX |
19487 | #: builtin/read-tree.c:188 |
19488 | msgid "You need to resolve your current index first" | |
19489 | msgstr "您需要先解决当前索引的冲突" | |
19490 | ||
349ede6a | 19491 | #: builtin/rebase.c:35 |
4c27fcb5 | 19492 | msgid "" |
a5cd71ca JX |
19493 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " |
19494 | "[<upstream> [<branch>]]" | |
ddc12c42 JX |
19495 | msgstr "" |
19496 | "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<" | |
19497 | "上游> [<分支>]]" | |
4c27fcb5 | 19498 | |
349ede6a | 19499 | #: builtin/rebase.c:37 |
4c27fcb5 JX |
19500 | msgid "" |
19501 | "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" | |
19502 | msgstr "" | |
19503 | "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" | |
19504 | ||
349ede6a | 19505 | #: builtin/rebase.c:39 |
4c27fcb5 JX |
19506 | msgid "git rebase --continue | --abort | --skip | --edit-todo" |
19507 | msgstr "git rebase --continue | --abort | --skip | --edit-todo" | |
19508 | ||
33b62fba | 19509 | #: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245 |
d46c5519 JX |
19510 | #, c-format |
19511 | msgid "unusable todo list: '%s'" | |
19512 | msgstr "不可用的待办列表:'%s'" | |
19513 | ||
33b62fba | 19514 | #: builtin/rebase.c:311 |
d46c5519 JX |
19515 | #, c-format |
19516 | msgid "could not create temporary %s" | |
19517 | msgstr "无法创建临时的 %s" | |
19518 | ||
33b62fba | 19519 | #: builtin/rebase.c:317 |
d46c5519 JX |
19520 | msgid "could not mark as interactive" |
19521 | msgstr "无法标记为交互式" | |
19522 | ||
33b62fba | 19523 | #: builtin/rebase.c:370 |
d46c5519 JX |
19524 | msgid "could not generate todo list" |
19525 | msgstr "无法生成待办列表" | |
19526 | ||
33b62fba | 19527 | #: builtin/rebase.c:412 |
d46c5519 JX |
19528 | msgid "a base commit must be provided with --upstream or --onto" |
19529 | msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" | |
19530 | ||
33b62fba | 19531 | #: builtin/rebase.c:481 |
d46c5519 JX |
19532 | msgid "git rebase--interactive [<options>]" |
19533 | msgstr "git rebase--interactive [<选项>]" | |
19534 | ||
33b62fba | 19535 | #: builtin/rebase.c:494 builtin/rebase.c:1389 |
349ede6a JX |
19536 | msgid "keep commits which start empty" |
19537 | msgstr "保留初始为空的提交" | |
d46c5519 | 19538 | |
33b62fba | 19539 | #: builtin/rebase.c:498 builtin/revert.c:128 |
d46c5519 JX |
19540 | msgid "allow commits with empty messages" |
19541 | msgstr "允许提交说明为空" | |
19542 | ||
33b62fba | 19543 | #: builtin/rebase.c:500 |
d46c5519 JX |
19544 | msgid "rebase merge commits" |
19545 | msgstr "对合并提交变基" | |
19546 | ||
33b62fba | 19547 | #: builtin/rebase.c:502 |
d46c5519 JX |
19548 | msgid "keep original branch points of cousins" |
19549 | msgstr "保持兄弟提交的原始分支点" | |
19550 | ||
33b62fba | 19551 | #: builtin/rebase.c:504 |
d46c5519 JX |
19552 | msgid "move commits that begin with squash!/fixup!" |
19553 | msgstr "移动以 squash!/fixup! 开头的提交" | |
19554 | ||
33b62fba | 19555 | #: builtin/rebase.c:505 |
d46c5519 JX |
19556 | msgid "sign commits" |
19557 | msgstr "签名提交" | |
19558 | ||
33b62fba | 19559 | #: builtin/rebase.c:507 builtin/rebase.c:1328 |
d46c5519 | 19560 | msgid "display a diffstat of what changed upstream" |
5b533632 | 19561 | msgstr "显示上游变化的差异统计" |
d46c5519 | 19562 | |
33b62fba | 19563 | #: builtin/rebase.c:509 |
d46c5519 JX |
19564 | msgid "continue rebase" |
19565 | msgstr "继续变基" | |
19566 | ||
33b62fba | 19567 | #: builtin/rebase.c:511 |
d46c5519 JX |
19568 | msgid "skip commit" |
19569 | msgstr "跳过提交" | |
19570 | ||
33b62fba | 19571 | #: builtin/rebase.c:512 |
d46c5519 JX |
19572 | msgid "edit the todo list" |
19573 | msgstr "变基待办列表" | |
19574 | ||
33b62fba | 19575 | #: builtin/rebase.c:514 |
d46c5519 JX |
19576 | msgid "show the current patch" |
19577 | msgstr "显示当前补丁" | |
19578 | ||
33b62fba | 19579 | #: builtin/rebase.c:517 |
d46c5519 JX |
19580 | msgid "shorten commit ids in the todo list" |
19581 | msgstr "缩短待办列表中的提交号" | |
19582 | ||
33b62fba | 19583 | #: builtin/rebase.c:519 |
d46c5519 JX |
19584 | msgid "expand commit ids in the todo list" |
19585 | msgstr "扩展待办列表中的提交号" | |
19586 | ||
33b62fba | 19587 | #: builtin/rebase.c:521 |
d46c5519 JX |
19588 | msgid "check the todo list" |
19589 | msgstr "检查待办列表" | |
19590 | ||
33b62fba | 19591 | #: builtin/rebase.c:523 |
d46c5519 JX |
19592 | msgid "rearrange fixup/squash lines" |
19593 | msgstr "重新排列 fixup/squash 行" | |
19594 | ||
33b62fba | 19595 | #: builtin/rebase.c:525 |
d46c5519 JX |
19596 | msgid "insert exec commands in todo list" |
19597 | msgstr "在待办列表中插入 exec 执行命令" | |
19598 | ||
33b62fba | 19599 | #: builtin/rebase.c:526 |
d46c5519 JX |
19600 | msgid "onto" |
19601 | msgstr "onto" | |
19602 | ||
33b62fba | 19603 | #: builtin/rebase.c:529 |
d46c5519 JX |
19604 | msgid "restrict-revision" |
19605 | msgstr "restrict-revision" | |
19606 | ||
33b62fba | 19607 | #: builtin/rebase.c:529 |
d46c5519 JX |
19608 | msgid "restrict revision" |
19609 | msgstr "限制版本" | |
19610 | ||
33b62fba | 19611 | #: builtin/rebase.c:531 |
d46c5519 JX |
19612 | msgid "squash-onto" |
19613 | msgstr "squash-onto" | |
19614 | ||
33b62fba | 19615 | #: builtin/rebase.c:532 |
d46c5519 JX |
19616 | msgid "squash onto" |
19617 | msgstr "squash onto" | |
19618 | ||
33b62fba | 19619 | #: builtin/rebase.c:534 |
d46c5519 JX |
19620 | msgid "the upstream commit" |
19621 | msgstr "上游提交" | |
19622 | ||
33b62fba | 19623 | #: builtin/rebase.c:536 |
d46c5519 JX |
19624 | msgid "head-name" |
19625 | msgstr "head-name" | |
19626 | ||
33b62fba | 19627 | #: builtin/rebase.c:536 |
d46c5519 JX |
19628 | msgid "head name" |
19629 | msgstr "head 名称" | |
19630 | ||
33b62fba | 19631 | #: builtin/rebase.c:541 |
d46c5519 JX |
19632 | msgid "rebase strategy" |
19633 | msgstr "变基策略" | |
19634 | ||
33b62fba | 19635 | #: builtin/rebase.c:542 |
d46c5519 JX |
19636 | msgid "strategy-opts" |
19637 | msgstr "strategy-opts" | |
19638 | ||
33b62fba | 19639 | #: builtin/rebase.c:543 |
d46c5519 JX |
19640 | msgid "strategy options" |
19641 | msgstr "策略选项" | |
19642 | ||
33b62fba | 19643 | #: builtin/rebase.c:544 |
d46c5519 JX |
19644 | msgid "switch-to" |
19645 | msgstr "切换到" | |
19646 | ||
33b62fba | 19647 | #: builtin/rebase.c:545 |
d46c5519 JX |
19648 | msgid "the branch or commit to checkout" |
19649 | msgstr "要检出的分支或提交" | |
19650 | ||
33b62fba | 19651 | #: builtin/rebase.c:546 |
d46c5519 JX |
19652 | msgid "onto-name" |
19653 | msgstr "onto-name" | |
19654 | ||
33b62fba | 19655 | #: builtin/rebase.c:546 |
d46c5519 JX |
19656 | msgid "onto name" |
19657 | msgstr "onto name" | |
19658 | ||
33b62fba | 19659 | #: builtin/rebase.c:547 |
d46c5519 JX |
19660 | msgid "cmd" |
19661 | msgstr "cmd" | |
19662 | ||
33b62fba | 19663 | #: builtin/rebase.c:547 |
d46c5519 JX |
19664 | msgid "the command to run" |
19665 | msgstr "要执行的命令" | |
19666 | ||
33b62fba | 19667 | #: builtin/rebase.c:550 builtin/rebase.c:1422 |
d46c5519 JX |
19668 | msgid "automatically re-schedule any `exec` that fails" |
19669 | msgstr "自动重新安排任何失败的 `exec`" | |
19670 | ||
33b62fba | 19671 | #: builtin/rebase.c:566 |
d46c5519 JX |
19672 | msgid "--[no-]rebase-cousins has no effect without --rebase-merges" |
19673 | msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" | |
19674 | ||
33b62fba | 19675 | #: builtin/rebase.c:582 |
4c27fcb5 | 19676 | #, c-format |
349ede6a JX |
19677 | msgid "%s requires the merge backend" |
19678 | msgstr "%s 需要合并后端" | |
4c27fcb5 | 19679 | |
33b62fba | 19680 | #: builtin/rebase.c:625 |
4c27fcb5 JX |
19681 | #, c-format |
19682 | msgid "could not get 'onto': '%s'" | |
19683 | msgstr "无法获取 'onto':'%s'" | |
19684 | ||
33b62fba | 19685 | #: builtin/rebase.c:642 |
4c27fcb5 JX |
19686 | #, c-format |
19687 | msgid "invalid orig-head: '%s'" | |
19688 | msgstr "无效的原始 head:'%s'" | |
19689 | ||
33b62fba | 19690 | #: builtin/rebase.c:667 |
4c27fcb5 JX |
19691 | #, c-format |
19692 | msgid "ignoring invalid allow_rerere_autoupdate: '%s'" | |
19693 | msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" | |
19694 | ||
473eb541 | 19695 | #: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 |
4c27fcb5 JX |
19696 | msgid "" |
19697 | "Resolve all conflicts manually, mark them as resolved with\n" | |
19698 | "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" | |
19699 | "You can instead skip this commit: run \"git rebase --skip\".\n" | |
19700 | "To abort and get back to the state before \"git rebase\", run \"git rebase --" | |
19701 | "abort\"." | |
19702 | msgstr "" | |
19703 | "手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n" | |
19704 | "冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n" | |
19705 | "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" | |
19706 | "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" | |
19707 | ||
473eb541 | 19708 | #: builtin/rebase.c:896 |
06991777 JX |
19709 | #, c-format |
19710 | msgid "" | |
19711 | "\n" | |
19712 | "git encountered an error while preparing the patches to replay\n" | |
19713 | "these revisions:\n" | |
19714 | "\n" | |
19715 | " %s\n" | |
19716 | "\n" | |
19717 | "As a result, git cannot rebase them." | |
19718 | msgstr "" | |
19719 | "\n" | |
19720 | "在为重放这些版本而准备补丁时,git 遇到了一个错误:\n" | |
19721 | "\n" | |
19722 | " %s\n" | |
19723 | "\n" | |
19724 | "因此 git 无法对其变基。" | |
4c27fcb5 | 19725 | |
33b62fba | 19726 | #: builtin/rebase.c:1222 |
2b472aae JX |
19727 | #, c-format |
19728 | msgid "" | |
19729 | "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" | |
19730 | "\"." | |
440e7442 | 19731 | msgstr "无法识别的空类型 '%s';有效值有 \"drop\"、\"keep\" 和 \"ask\"。" |
2b472aae | 19732 | |
33b62fba | 19733 | #: builtin/rebase.c:1240 |
4c27fcb5 JX |
19734 | #, c-format |
19735 | msgid "" | |
19736 | "%s\n" | |
19737 | "Please specify which branch you want to rebase against.\n" | |
19738 | "See git-rebase(1) for details.\n" | |
19739 | "\n" | |
19740 | " git rebase '<branch>'\n" | |
19741 | "\n" | |
19742 | msgstr "" | |
19743 | "%s\n" | |
19744 | "请指定您要变基到哪个分支。\n" | |
19745 | "详见 git-rebase(1)。\n" | |
19746 | "\n" | |
19747 | " git rebase '<branch>'\n" | |
19748 | "\n" | |
19749 | ||
33b62fba | 19750 | #: builtin/rebase.c:1256 |
4c27fcb5 JX |
19751 | #, c-format |
19752 | msgid "" | |
19753 | "If you wish to set tracking information for this branch you can do so with:\n" | |
19754 | "\n" | |
19755 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
19756 | "\n" | |
19757 | msgstr "" | |
19758 | "如果您想要为此分支创建跟踪信息,您可以执行:\n" | |
19759 | "\n" | |
19760 | " git branch --set-upstream-to=%s/<branch> %s\n" | |
19761 | "\n" | |
19762 | ||
33b62fba | 19763 | #: builtin/rebase.c:1286 |
06991777 JX |
19764 | msgid "exec commands cannot contain newlines" |
19765 | msgstr "exec 命令不能包含换行符" | |
19766 | ||
33b62fba | 19767 | #: builtin/rebase.c:1290 |
06991777 JX |
19768 | msgid "empty exec command" |
19769 | msgstr "空的 exec 命令" | |
19770 | ||
33b62fba | 19771 | #: builtin/rebase.c:1319 |
4c27fcb5 JX |
19772 | msgid "rebase onto given branch instead of upstream" |
19773 | msgstr "变基到给定的分支而非上游" | |
19774 | ||
33b62fba | 19775 | #: builtin/rebase.c:1321 |
a5cd71ca JX |
19776 | msgid "use the merge-base of upstream and branch as the current base" |
19777 | msgstr "使用上游和分支的合并基线做为当前基线" | |
19778 | ||
33b62fba | 19779 | #: builtin/rebase.c:1323 |
4c27fcb5 JX |
19780 | msgid "allow pre-rebase hook to run" |
19781 | msgstr "允许执行 pre-rebase 钩子" | |
19782 | ||
33b62fba | 19783 | #: builtin/rebase.c:1325 |
4c27fcb5 JX |
19784 | msgid "be quiet. implies --no-stat" |
19785 | msgstr "安静。暗示 --no-stat" | |
19786 | ||
33b62fba | 19787 | #: builtin/rebase.c:1331 |
4c27fcb5 | 19788 | msgid "do not show diffstat of what changed upstream" |
5b533632 | 19789 | msgstr "不显示上游变化的差异统计" |
4c27fcb5 | 19790 | |
33b62fba | 19791 | #: builtin/rebase.c:1334 |
d13389bf JX |
19792 | msgid "add a Signed-off-by trailer to each commit" |
19793 | msgstr "为每一个提交添加 Signed-off-by 尾注" | |
4c27fcb5 | 19794 | |
33b62fba | 19795 | #: builtin/rebase.c:1337 |
d9488fea JX |
19796 | msgid "make committer date match author date" |
19797 | msgstr "使提交者日期和作者日期一致" | |
19798 | ||
33b62fba | 19799 | #: builtin/rebase.c:1339 |
d9488fea JX |
19800 | msgid "ignore author date and use current date" |
19801 | msgstr "忽略作者日期,使用当前日期" | |
19802 | ||
33b62fba | 19803 | #: builtin/rebase.c:1341 |
d9488fea JX |
19804 | msgid "synonym of --reset-author-date" |
19805 | msgstr "--reset-author-date 的同义词" | |
4c27fcb5 | 19806 | |
33b62fba | 19807 | #: builtin/rebase.c:1343 builtin/rebase.c:1347 |
4c27fcb5 JX |
19808 | msgid "passed to 'git apply'" |
19809 | msgstr "传递给 'git apply'" | |
19810 | ||
33b62fba | 19811 | #: builtin/rebase.c:1345 |
d9488fea JX |
19812 | msgid "ignore changes in whitespace" |
19813 | msgstr "忽略空白字符的变更" | |
19814 | ||
33b62fba | 19815 | #: builtin/rebase.c:1349 builtin/rebase.c:1352 |
4c27fcb5 JX |
19816 | msgid "cherry-pick all commits, even if unchanged" |
19817 | msgstr "拣选所有提交,即使未修改" | |
19818 | ||
33b62fba | 19819 | #: builtin/rebase.c:1354 |
4c27fcb5 JX |
19820 | msgid "continue" |
19821 | msgstr "继续" | |
19822 | ||
33b62fba | 19823 | #: builtin/rebase.c:1357 |
4c27fcb5 JX |
19824 | msgid "skip current patch and continue" |
19825 | msgstr "跳过当前补丁并继续" | |
19826 | ||
33b62fba | 19827 | #: builtin/rebase.c:1359 |
4c27fcb5 JX |
19828 | msgid "abort and check out the original branch" |
19829 | msgstr "终止并检出原有分支" | |
19830 | ||
33b62fba | 19831 | #: builtin/rebase.c:1362 |
4c27fcb5 JX |
19832 | msgid "abort but keep HEAD where it is" |
19833 | msgstr "终止但保持 HEAD 不变" | |
19834 | ||
33b62fba | 19835 | #: builtin/rebase.c:1363 |
4c27fcb5 JX |
19836 | msgid "edit the todo list during an interactive rebase" |
19837 | msgstr "在交互式变基中编辑待办列表" | |
19838 | ||
33b62fba | 19839 | #: builtin/rebase.c:1366 |
4c27fcb5 JX |
19840 | msgid "show the patch file being applied or merged" |
19841 | msgstr "显示正在应用或合并的补丁文件" | |
19842 | ||
33b62fba | 19843 | #: builtin/rebase.c:1369 |
2b472aae JX |
19844 | msgid "use apply strategies to rebase" |
19845 | msgstr "使用应用策略进行变基" | |
19846 | ||
33b62fba | 19847 | #: builtin/rebase.c:1373 |
4c27fcb5 JX |
19848 | msgid "use merging strategies to rebase" |
19849 | msgstr "使用合并策略进行变基" | |
19850 | ||
33b62fba | 19851 | #: builtin/rebase.c:1377 |
4c27fcb5 JX |
19852 | msgid "let the user edit the list of commits to rebase" |
19853 | msgstr "让用户编辑要变基的提交列表" | |
19854 | ||
33b62fba | 19855 | #: builtin/rebase.c:1381 |
d46c5519 JX |
19856 | msgid "(DEPRECATED) try to recreate merges instead of ignoring them" |
19857 | msgstr "(已弃用)尝试重建合并提交而非忽略它们" | |
4c27fcb5 | 19858 | |
33b62fba | 19859 | #: builtin/rebase.c:1386 |
2b472aae | 19860 | msgid "how to handle commits that become empty" |
440e7442 | 19861 | msgstr "如何处理成为空提交的提交" |
4c27fcb5 | 19862 | |
33b62fba | 19863 | #: builtin/rebase.c:1393 |
4c27fcb5 JX |
19864 | msgid "move commits that begin with squash!/fixup! under -i" |
19865 | msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" | |
19866 | ||
33b62fba | 19867 | #: builtin/rebase.c:1400 |
4c27fcb5 JX |
19868 | msgid "add exec lines after each commit of the editable list" |
19869 | msgstr "可编辑列表的每一个提交下面增加一行 exec" | |
19870 | ||
33b62fba | 19871 | #: builtin/rebase.c:1404 |
4c27fcb5 JX |
19872 | msgid "allow rebasing commits with empty messages" |
19873 | msgstr "允许针对空提交说明的提交变基" | |
19874 | ||
33b62fba | 19875 | #: builtin/rebase.c:1408 |
4c27fcb5 JX |
19876 | msgid "try to rebase merges instead of skipping them" |
19877 | msgstr "尝试对合并提交变基而不是忽略它们" | |
19878 | ||
33b62fba | 19879 | #: builtin/rebase.c:1411 |
4c27fcb5 JX |
19880 | msgid "use 'merge-base --fork-point' to refine upstream" |
19881 | msgstr "使用 'merge-base --fork-point' 来优化上游" | |
19882 | ||
33b62fba | 19883 | #: builtin/rebase.c:1413 |
4c27fcb5 JX |
19884 | msgid "use the given merge strategy" |
19885 | msgstr "使用给定的合并策略" | |
19886 | ||
33b62fba | 19887 | #: builtin/rebase.c:1415 builtin/revert.c:115 |
4c27fcb5 JX |
19888 | msgid "option" |
19889 | msgstr "选项" | |
19890 | ||
33b62fba | 19891 | #: builtin/rebase.c:1416 |
4c27fcb5 JX |
19892 | msgid "pass the argument through to the merge strategy" |
19893 | msgstr "将参数传递给合并策略" | |
19894 | ||
33b62fba | 19895 | #: builtin/rebase.c:1419 |
4c27fcb5 JX |
19896 | msgid "rebase all reachable commits up to the root(s)" |
19897 | msgstr "将所有可达的提交变基到根提交" | |
19898 | ||
33b62fba | 19899 | #: builtin/rebase.c:1424 |
349ede6a JX |
19900 | msgid "apply all changes, even those already present upstream" |
19901 | msgstr "应用所有更改,甚至那些已在上游存在的" | |
19902 | ||
33b62fba | 19903 | #: builtin/rebase.c:1442 |
4c27fcb5 | 19904 | msgid "It looks like 'git am' is in progress. Cannot rebase." |
ec3d4607 | 19905 | msgstr "看起来 'git am' 正在执行中。无法变基。" |
4c27fcb5 | 19906 | |
33b62fba | 19907 | #: builtin/rebase.c:1483 |
d46c5519 JX |
19908 | msgid "" |
19909 | "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." | |
19910 | msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" | |
19911 | ||
33b62fba | 19912 | #: builtin/rebase.c:1488 |
a5cd71ca JX |
19913 | msgid "cannot combine '--keep-base' with '--onto'" |
19914 | msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" | |
19915 | ||
33b62fba | 19916 | #: builtin/rebase.c:1490 |
a5cd71ca JX |
19917 | msgid "cannot combine '--keep-base' with '--root'" |
19918 | msgstr "不能将 '--keep-base' 和 '--root' 组合使用" | |
19919 | ||
33b62fba | 19920 | #: builtin/rebase.c:1494 |
349ede6a JX |
19921 | msgid "cannot combine '--root' with '--fork-point'" |
19922 | msgstr "不能将 '--root' 和 '--fork-point' 组合使用" | |
19923 | ||
33b62fba | 19924 | #: builtin/rebase.c:1497 |
4c27fcb5 JX |
19925 | msgid "No rebase in progress?" |
19926 | msgstr "没有正在进行的变基?" | |
19927 | ||
33b62fba | 19928 | #: builtin/rebase.c:1501 |
4c27fcb5 JX |
19929 | msgid "The --edit-todo action can only be used during interactive rebase." |
19930 | msgstr "动作 --edit-todo 只能用在交互式变基过程中。" | |
19931 | ||
ec3d4607 | 19932 | #: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122 |
4c27fcb5 JX |
19933 | msgid "Cannot read HEAD" |
19934 | msgstr "不能读取 HEAD" | |
19935 | ||
33b62fba | 19936 | #: builtin/rebase.c:1536 |
4c27fcb5 JX |
19937 | msgid "" |
19938 | "You must edit all merge conflicts and then\n" | |
19939 | "mark them as resolved using git add" | |
19940 | msgstr "" | |
19941 | "您必须编辑所有的合并冲突,然后通过 git add\n" | |
19942 | "命令将它们标记为已解决" | |
19943 | ||
33b62fba | 19944 | #: builtin/rebase.c:1555 |
4c27fcb5 JX |
19945 | msgid "could not discard worktree changes" |
19946 | msgstr "无法丢弃工作区变更" | |
19947 | ||
33b62fba | 19948 | #: builtin/rebase.c:1574 |
4c27fcb5 JX |
19949 | #, c-format |
19950 | msgid "could not move back to %s" | |
19951 | msgstr "无法移回 %s" | |
19952 | ||
33b62fba | 19953 | #: builtin/rebase.c:1620 |
4c27fcb5 JX |
19954 | #, c-format |
19955 | msgid "" | |
19956 | "It seems that there is already a %s directory, and\n" | |
19957 | "I wonder if you are in the middle of another rebase. If that is the\n" | |
19958 | "case, please try\n" | |
19959 | "\t%s\n" | |
19960 | "If that is not the case, please\n" | |
19961 | "\t%s\n" | |
19962 | "and run me again. I am stopping in case you still have something\n" | |
19963 | "valuable there.\n" | |
19964 | msgstr "" | |
19965 | "似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n" | |
19966 | "如果是这样,请执行\n" | |
19967 | "\t%s\n" | |
19968 | "如果不是这样,请执行\n" | |
19969 | "\t%s\n" | |
19970 | "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" | |
19971 | ||
33b62fba | 19972 | #: builtin/rebase.c:1648 |
4c27fcb5 JX |
19973 | msgid "switch `C' expects a numerical value" |
19974 | msgstr "开关 `C' 期望一个数字值" | |
19975 | ||
33b62fba | 19976 | #: builtin/rebase.c:1690 |
4c27fcb5 JX |
19977 | #, c-format |
19978 | msgid "Unknown mode: %s" | |
19979 | msgstr "未知模式:%s" | |
19980 | ||
33b62fba | 19981 | #: builtin/rebase.c:1729 |
4c27fcb5 JX |
19982 | msgid "--strategy requires --merge or --interactive" |
19983 | msgstr "--strategy 需要 --merge 或 --interactive" | |
19984 | ||
33b62fba | 19985 | #: builtin/rebase.c:1759 |
2b472aae JX |
19986 | msgid "cannot combine apply options with merge options" |
19987 | msgstr "不能组合使用应用选项和合并选项" | |
19988 | ||
33b62fba | 19989 | #: builtin/rebase.c:1772 |
2b472aae JX |
19990 | #, c-format |
19991 | msgid "Unknown rebase backend: %s" | |
19992 | msgstr "未知的变基后端:%s" | |
19993 | ||
33b62fba | 19994 | #: builtin/rebase.c:1802 |
a6cd2cc4 JX |
19995 | msgid "--reschedule-failed-exec requires --exec or --interactive" |
19996 | msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" | |
19997 | ||
33b62fba | 19998 | #: builtin/rebase.c:1822 |
06991777 | 19999 | msgid "cannot combine '--preserve-merges' with '--rebase-merges'" |
5b533632 | 20000 | msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" |
4c27fcb5 | 20001 | |
33b62fba | 20002 | #: builtin/rebase.c:1826 |
06991777 JX |
20003 | msgid "" |
20004 | "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" | |
20005 | msgstr "" | |
5b533632 | 20006 | "错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" |
4c27fcb5 | 20007 | |
33b62fba | 20008 | #: builtin/rebase.c:1850 |
4c27fcb5 JX |
20009 | #, c-format |
20010 | msgid "invalid upstream '%s'" | |
20011 | msgstr "无效的上游 '%s'" | |
20012 | ||
33b62fba | 20013 | #: builtin/rebase.c:1856 |
4c27fcb5 JX |
20014 | msgid "Could not create new root commit" |
20015 | msgstr "不能创建新的根提交" | |
20016 | ||
33b62fba | 20017 | #: builtin/rebase.c:1882 |
a5cd71ca JX |
20018 | #, c-format |
20019 | msgid "'%s': need exactly one merge base with branch" | |
20020 | msgstr "'%s':只需要与分支的一个合并基线" | |
20021 | ||
33b62fba | 20022 | #: builtin/rebase.c:1885 |
4c27fcb5 JX |
20023 | #, c-format |
20024 | msgid "'%s': need exactly one merge base" | |
20025 | msgstr "'%s':只需要一个合并基线" | |
20026 | ||
33b62fba | 20027 | #: builtin/rebase.c:1893 |
4c27fcb5 JX |
20028 | #, c-format |
20029 | msgid "Does not point to a valid commit '%s'" | |
20030 | msgstr "没有指向一个有效的提交 '%s'" | |
20031 | ||
33b62fba | 20032 | #: builtin/rebase.c:1921 |
4c27fcb5 JX |
20033 | #, c-format |
20034 | msgid "fatal: no such branch/commit '%s'" | |
06991777 | 20035 | msgstr "致命错误:无此分支/提交 '%s'" |
4c27fcb5 | 20036 | |
ec3d4607 JX |
20037 | #: builtin/rebase.c:1929 builtin/submodule--helper.c:39 |
20038 | #: builtin/submodule--helper.c:2431 | |
4c27fcb5 JX |
20039 | #, c-format |
20040 | msgid "No such ref: %s" | |
20041 | msgstr "没有这样的引用:%s" | |
20042 | ||
33b62fba | 20043 | #: builtin/rebase.c:1940 |
4c27fcb5 JX |
20044 | msgid "Could not resolve HEAD to a revision" |
20045 | msgstr "无法将 HEAD 解析为一个版本" | |
20046 | ||
33b62fba | 20047 | #: builtin/rebase.c:1961 |
4c27fcb5 JX |
20048 | msgid "Please commit or stash them." |
20049 | msgstr "请提交或贮藏修改。" | |
20050 | ||
33b62fba | 20051 | #: builtin/rebase.c:1997 |
4c27fcb5 JX |
20052 | #, c-format |
20053 | msgid "could not switch to %s" | |
20054 | msgstr "无法切换到 %s" | |
20055 | ||
33b62fba | 20056 | #: builtin/rebase.c:2008 |
4c27fcb5 JX |
20057 | msgid "HEAD is up to date." |
20058 | msgstr "HEAD 是最新的。" | |
20059 | ||
33b62fba | 20060 | #: builtin/rebase.c:2010 |
4c27fcb5 JX |
20061 | #, c-format |
20062 | msgid "Current branch %s is up to date.\n" | |
20063 | msgstr "当前分支 %s 是最新的。\n" | |
20064 | ||
33b62fba | 20065 | #: builtin/rebase.c:2018 |
4c27fcb5 JX |
20066 | msgid "HEAD is up to date, rebase forced." |
20067 | msgstr "HEAD 是最新的,强制变基。" | |
20068 | ||
33b62fba | 20069 | #: builtin/rebase.c:2020 |
4c27fcb5 JX |
20070 | #, c-format |
20071 | msgid "Current branch %s is up to date, rebase forced.\n" | |
20072 | msgstr "当前分支 %s 是最新的,强制变基。\n" | |
20073 | ||
33b62fba | 20074 | #: builtin/rebase.c:2028 |
4c27fcb5 JX |
20075 | msgid "The pre-rebase hook refused to rebase." |
20076 | msgstr "pre-rebase 钩子拒绝了变基操作。" | |
20077 | ||
33b62fba | 20078 | #: builtin/rebase.c:2035 |
4c27fcb5 JX |
20079 | #, c-format |
20080 | msgid "Changes to %s:\n" | |
20081 | msgstr "到 %s 的变更:\n" | |
20082 | ||
33b62fba | 20083 | #: builtin/rebase.c:2038 |
4c27fcb5 JX |
20084 | #, c-format |
20085 | msgid "Changes from %s to %s:\n" | |
20086 | msgstr "从 %s 到 %s 的变更:\n" | |
20087 | ||
33b62fba | 20088 | #: builtin/rebase.c:2063 |
4c27fcb5 JX |
20089 | #, c-format |
20090 | msgid "First, rewinding head to replay your work on top of it...\n" | |
20091 | msgstr "首先,回退头指针以便在其上重放您的工作...\n" | |
20092 | ||
33b62fba | 20093 | #: builtin/rebase.c:2072 |
4c27fcb5 JX |
20094 | msgid "Could not detach HEAD" |
20095 | msgstr "无法分离头指针" | |
20096 | ||
33b62fba | 20097 | #: builtin/rebase.c:2081 |
4c27fcb5 JX |
20098 | #, c-format |
20099 | msgid "Fast-forwarded %s to %s.\n" | |
20100 | msgstr "快进 %s 到 %s。\n" | |
20101 | ||
349ede6a | 20102 | #: builtin/receive-pack.c:34 |
5b04ee3b | 20103 | msgid "git receive-pack <git-dir>" |
58b6f078 | 20104 | msgstr "git receive-pack <仓库目录>" |
5b04ee3b | 20105 | |
ec3d4607 | 20106 | #: builtin/receive-pack.c:1275 |
a0b6b246 JX |
20107 | msgid "" |
20108 | "By default, updating the current branch in a non-bare repository\n" | |
20109 | "is denied, because it will make the index and work tree inconsistent\n" | |
20110 | "with what you pushed, and will require 'git reset --hard' to match\n" | |
20111 | "the work tree to HEAD.\n" | |
20112 | "\n" | |
1a79b2f1 JX |
20113 | "You can set the 'receive.denyCurrentBranch' configuration variable\n" |
20114 | "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" | |
a0b6b246 JX |
20115 | "its current branch; however, this is not recommended unless you\n" |
20116 | "arranged to update its work tree to match what you pushed in some\n" | |
20117 | "other way.\n" | |
20118 | "\n" | |
20119 | "To squelch this message and still keep the default behaviour, set\n" | |
20120 | "'receive.denyCurrentBranch' configuration variable to 'refuse'." | |
20121 | msgstr "" | |
20122 | "默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n" | |
20123 | "不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n" | |
20124 | "\n" | |
20125 | "您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n" | |
20126 | "'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n" | |
20127 | "用某种方式将其工作区更新至您推送的状态。\n" | |
20128 | "\n" | |
20129 | "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" | |
20130 | "配置变量为 'refuse'。" | |
20131 | ||
ec3d4607 | 20132 | #: builtin/receive-pack.c:1295 |
a0b6b246 JX |
20133 | msgid "" |
20134 | "By default, deleting the current branch is denied, because the next\n" | |
20135 | "'git clone' won't result in any file checked out, causing confusion.\n" | |
20136 | "\n" | |
20137 | "You can set 'receive.denyDeleteCurrent' configuration variable to\n" | |
20138 | "'warn' or 'ignore' in the remote repository to allow deleting the\n" | |
20139 | "current branch, with or without a warning message.\n" | |
20140 | "\n" | |
20141 | "To squelch this message, you can set it to 'refuse'." | |
20142 | msgstr "" | |
20143 | "默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n" | |
29004bbb | 20144 | "导致困惑。\n" |
a0b6b246 JX |
20145 | "\n" |
20146 | "您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n" | |
29004bbb | 20147 | "'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n" |
a0b6b246 JX |
20148 | "\n" |
20149 | "若要屏蔽此信息,您可以设置它为 'refuse'。" | |
20150 | ||
ec3d4607 | 20151 | #: builtin/receive-pack.c:2478 |
5b04ee3b JX |
20152 | msgid "quiet" |
20153 | msgstr "静默模式" | |
20154 | ||
ec3d4607 | 20155 | #: builtin/receive-pack.c:2492 |
5b04ee3b JX |
20156 | msgid "You must specify a directory." |
20157 | msgstr "您必须指定一个目录。" | |
20158 | ||
06991777 JX |
20159 | #: builtin/reflog.c:17 |
20160 | msgid "" | |
20161 | "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" | |
20162 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " | |
20163 | "<refs>..." | |
20164 | msgstr "" | |
20165 | "git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--" | |
20166 | "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" | |
20167 | "用>..." | |
20168 | ||
20169 | #: builtin/reflog.c:22 | |
20170 | msgid "" | |
20171 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " | |
20172 | "<refs>..." | |
20173 | msgstr "" | |
20174 | "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" | |
20175 | "用>..." | |
20176 | ||
20177 | #: builtin/reflog.c:25 | |
20178 | msgid "git reflog exists <ref>" | |
20179 | msgstr "git reflog exists <引用>" | |
20180 | ||
2b472aae | 20181 | #: builtin/reflog.c:568 builtin/reflog.c:573 |
2e8451e8 JX |
20182 | #, c-format |
20183 | msgid "'%s' is not a valid timestamp" | |
20184 | msgstr "'%s' 不是一个有效的时间戳" | |
20185 | ||
473eb541 | 20186 | #: builtin/reflog.c:609 |
06991777 JX |
20187 | #, c-format |
20188 | msgid "Marking reachable objects..." | |
20189 | msgstr "正在标记可达对象..." | |
20190 | ||
473eb541 | 20191 | #: builtin/reflog.c:647 |
06991777 JX |
20192 | #, c-format |
20193 | msgid "%s points nowhere!" | |
20194 | msgstr "%s 指向不存在!" | |
20195 | ||
473eb541 | 20196 | #: builtin/reflog.c:699 |
06991777 JX |
20197 | msgid "no reflog specified to delete" |
20198 | msgstr "未指定要删除的引用日志" | |
20199 | ||
473eb541 | 20200 | #: builtin/reflog.c:708 |
06991777 JX |
20201 | #, c-format |
20202 | msgid "not a reflog: %s" | |
20203 | msgstr "不是一个引用日志:%s" | |
20204 | ||
473eb541 | 20205 | #: builtin/reflog.c:713 |
06991777 JX |
20206 | #, c-format |
20207 | msgid "no reflog for '%s'" | |
20208 | msgstr "没有 '%s' 的引用日志" | |
20209 | ||
473eb541 | 20210 | #: builtin/reflog.c:759 |
06991777 JX |
20211 | #, c-format |
20212 | msgid "invalid ref format: %s" | |
20213 | msgstr "无效的引用格式:%s" | |
20214 | ||
473eb541 | 20215 | #: builtin/reflog.c:768 |
06991777 JX |
20216 | msgid "git reflog [ show | expire | delete | exists ]" |
20217 | msgstr "git reflog [ show | expire | delete | exists ]" | |
20218 | ||
2b472aae | 20219 | #: builtin/remote.c:17 |
ef317cd5 | 20220 | msgid "git remote [-v | --verbose]" |
07432cef | 20221 | msgstr "git remote [-v | --verbose]" |
ef317cd5 | 20222 | |
2b472aae | 20223 | #: builtin/remote.c:18 |
ef317cd5 | 20224 | msgid "" |
814ff314 | 20225 | "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" |
ef317cd5 JX |
20226 | "mirror=<fetch|push>] <name> <url>" |
20227 | msgstr "" | |
814ff314 | 20228 | "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" |
d9d56b23 | 20229 | "mirror=<fetch|push>] <名称> <地址>" |
ef317cd5 | 20230 | |
2b472aae | 20231 | #: builtin/remote.c:19 builtin/remote.c:39 |
ef317cd5 | 20232 | msgid "git remote rename <old> <new>" |
07432cef | 20233 | msgstr "git remote rename <旧名称> <新名称>" |
ef317cd5 | 20234 | |
2b472aae | 20235 | #: builtin/remote.c:20 builtin/remote.c:44 |
ef317cd5 | 20236 | msgid "git remote remove <name>" |
07432cef | 20237 | msgstr "git remote remove <名称>" |
ef317cd5 | 20238 | |
2b472aae | 20239 | #: builtin/remote.c:21 builtin/remote.c:49 |
814ff314 JX |
20240 | msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" |
20241 | msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" | |
ef317cd5 | 20242 | |
2b472aae | 20243 | #: builtin/remote.c:22 |
ef317cd5 | 20244 | msgid "git remote [-v | --verbose] show [-n] <name>" |
07432cef | 20245 | msgstr "git remote [-v | --verbose] show [-n] <名称>" |
ef317cd5 | 20246 | |
2b472aae | 20247 | #: builtin/remote.c:23 |
ef317cd5 | 20248 | msgid "git remote prune [-n | --dry-run] <name>" |
07432cef | 20249 | msgstr "git remote prune [-n | --dry-run] <名称>" |
ef317cd5 | 20250 | |
2b472aae | 20251 | #: builtin/remote.c:24 |
ef317cd5 JX |
20252 | msgid "" |
20253 | "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" | |
07432cef | 20254 | msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" |
ef317cd5 | 20255 | |
2b472aae | 20256 | #: builtin/remote.c:25 |
ef317cd5 | 20257 | msgid "git remote set-branches [--add] <name> <branch>..." |
07432cef | 20258 | msgstr "git remote set-branches [--add] <名称> <分支>..." |
ef317cd5 | 20259 | |
2b472aae | 20260 | #: builtin/remote.c:26 builtin/remote.c:75 |
94550ed3 JX |
20261 | msgid "git remote get-url [--push] [--all] <name>" |
20262 | msgstr "git remote get-url [--push] [--all] <名称>" | |
20263 | ||
2b472aae | 20264 | #: builtin/remote.c:27 builtin/remote.c:80 |
ef317cd5 | 20265 | msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" |
07432cef | 20266 | msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" |
ef317cd5 | 20267 | |
2b472aae | 20268 | #: builtin/remote.c:28 builtin/remote.c:81 |
ef317cd5 | 20269 | msgid "git remote set-url --add <name> <newurl>" |
07432cef | 20270 | msgstr "git remote set-url --add <名称> <新的地址>" |
ef317cd5 | 20271 | |
2b472aae | 20272 | #: builtin/remote.c:29 builtin/remote.c:82 |
ef317cd5 | 20273 | msgid "git remote set-url --delete <name> <url>" |
07432cef | 20274 | msgstr "git remote set-url --delete <名称> <地址>" |
ef317cd5 | 20275 | |
2b472aae | 20276 | #: builtin/remote.c:34 |
ef317cd5 | 20277 | msgid "git remote add [<options>] <name> <url>" |
07432cef | 20278 | msgstr "git remote add [<选项>] <名称> <地址>" |
ef317cd5 | 20279 | |
2b472aae | 20280 | #: builtin/remote.c:54 |
ef317cd5 | 20281 | msgid "git remote set-branches <name> <branch>..." |
07432cef | 20282 | msgstr "git remote set-branches <名称> <分支>..." |
ef317cd5 | 20283 | |
2b472aae | 20284 | #: builtin/remote.c:55 |
ef317cd5 | 20285 | msgid "git remote set-branches --add <name> <branch>..." |
07432cef | 20286 | msgstr "git remote set-branches --add <名称> <分支>..." |
ef317cd5 | 20287 | |
2b472aae | 20288 | #: builtin/remote.c:60 |
ef317cd5 | 20289 | msgid "git remote show [<options>] <name>" |
07432cef | 20290 | msgstr "git remote show [<选项>] <名称>" |
ef317cd5 | 20291 | |
2b472aae | 20292 | #: builtin/remote.c:65 |
ef317cd5 | 20293 | msgid "git remote prune [<options>] <name>" |
07432cef | 20294 | msgstr "git remote prune [<选项>] <名称>" |
ef317cd5 | 20295 | |
2b472aae | 20296 | #: builtin/remote.c:70 |
ef317cd5 | 20297 | msgid "git remote update [<options>] [<group> | <remote>]..." |
07432cef | 20298 | msgstr "git remote update [<选项>] [<组> | <远程>]..." |
ef317cd5 | 20299 | |
2b472aae | 20300 | #: builtin/remote.c:99 |
81809b99 | 20301 | #, c-format |
8ada9598 | 20302 | msgid "Updating %s" |
81809b99 | 20303 | msgstr "更新 %s 中" |
8ada9598 | 20304 | |
2b472aae | 20305 | #: builtin/remote.c:131 |
8ada9598 JX |
20306 | msgid "" |
20307 | "--mirror is dangerous and deprecated; please\n" | |
20308 | "\t use --mirror=fetch or --mirror=push instead" | |
20309 | msgstr "" | |
81809b99 JX |
20310 | "--mirror 选项危险且过时,请使用 --mirror=fetch\n" |
20311 | "\t 或 --mirror=push" | |
8ada9598 | 20312 | |
2b472aae | 20313 | #: builtin/remote.c:148 |
81809b99 | 20314 | #, c-format |
8ada9598 | 20315 | msgid "unknown mirror argument: %s" |
81809b99 | 20316 | msgstr "未知的镜像参数:%s" |
8ada9598 | 20317 | |
2b472aae | 20318 | #: builtin/remote.c:164 |
ef317cd5 | 20319 | msgid "fetch the remote branches" |
07432cef | 20320 | msgstr "抓取远程的分支" |
ef317cd5 | 20321 | |
2b472aae | 20322 | #: builtin/remote.c:166 |
ef317cd5 | 20323 | msgid "import all tags and associated objects when fetching" |
55a16ee4 | 20324 | msgstr "抓取时导入所有的标签和关联对象" |
ef317cd5 | 20325 | |
2b472aae | 20326 | #: builtin/remote.c:169 |
ef317cd5 | 20327 | msgid "or do not fetch any tag at all (--no-tags)" |
55a16ee4 | 20328 | msgstr "或不抓取任何标签(--no-tags)" |
ef317cd5 | 20329 | |
2b472aae | 20330 | #: builtin/remote.c:171 |
ef317cd5 | 20331 | msgid "branch(es) to track" |
07432cef | 20332 | msgstr "跟踪的分支" |
ef317cd5 | 20333 | |
2b472aae | 20334 | #: builtin/remote.c:172 |
ef317cd5 | 20335 | msgid "master branch" |
07432cef | 20336 | msgstr "主线分支" |
ef317cd5 | 20337 | |
2b472aae | 20338 | #: builtin/remote.c:174 |
ef317cd5 | 20339 | msgid "set up remote as a mirror to push to or fetch from" |
07432cef | 20340 | msgstr "把远程设置为用以推送或抓取的镜像" |
ef317cd5 | 20341 | |
2b472aae | 20342 | #: builtin/remote.c:186 |
8ada9598 | 20343 | msgid "specifying a master branch makes no sense with --mirror" |
81809b99 | 20344 | msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" |
8ada9598 | 20345 | |
2b472aae | 20346 | #: builtin/remote.c:188 |
8ada9598 | 20347 | msgid "specifying branches to track makes sense only with fetch mirrors" |
649900bc | 20348 | msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" |
8ada9598 | 20349 | |
d13389bf | 20350 | #: builtin/remote.c:195 builtin/remote.c:700 |
81809b99 | 20351 | #, c-format |
8ada9598 | 20352 | msgid "remote %s already exists." |
81809b99 | 20353 | msgstr "远程 %s 已经存在。" |
8ada9598 | 20354 | |
d13389bf | 20355 | #: builtin/remote.c:240 |
81809b99 | 20356 | #, c-format |
8ada9598 | 20357 | msgid "Could not setup master '%s'" |
81809b99 | 20358 | msgstr "无法设置 master '%s'" |
8ada9598 | 20359 | |
d13389bf | 20360 | #: builtin/remote.c:355 |
81809b99 | 20361 | #, c-format |
8ada9598 | 20362 | msgid "Could not get fetch map for refspec %s" |
160fb2b2 | 20363 | msgstr "无法得到引用规格 %s 的获取列表" |
8ada9598 | 20364 | |
d13389bf | 20365 | #: builtin/remote.c:454 builtin/remote.c:462 |
8ada9598 | 20366 | msgid "(matching)" |
81809b99 | 20367 | msgstr "(匹配)" |
8ada9598 | 20368 | |
d13389bf | 20369 | #: builtin/remote.c:466 |
8ada9598 | 20370 | msgid "(delete)" |
81809b99 | 20371 | msgstr "(删除)" |
8ada9598 | 20372 | |
d13389bf | 20373 | #: builtin/remote.c:655 |
2b472aae JX |
20374 | #, c-format |
20375 | msgid "could not set '%s'" | |
20376 | msgstr "不能设置 '%s'" | |
20377 | ||
d13389bf | 20378 | #: builtin/remote.c:660 |
2b472aae JX |
20379 | #, c-format |
20380 | msgid "" | |
20381 | "The %s configuration remote.pushDefault in:\n" | |
20382 | "\t%s:%d\n" | |
20383 | "now names the non-existent remote '%s'" | |
20384 | msgstr "" | |
20385 | "配置(%s)remote.pushDefault 位于:\n" | |
20386 | "\t%s:%d\n" | |
20387 | "现在在为不存在的远程名 '%s' 命名" | |
20388 | ||
33b62fba | 20389 | #: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943 |
81809b99 | 20390 | #, c-format |
4c27fcb5 JX |
20391 | msgid "No such remote: '%s'" |
20392 | msgstr "没有此远程仓库:'%s'" | |
8ada9598 | 20393 | |
d13389bf | 20394 | #: builtin/remote.c:710 |
81809b99 | 20395 | #, c-format |
8ada9598 | 20396 | msgid "Could not rename config section '%s' to '%s'" |
81809b99 | 20397 | msgstr "不能重命名配置小节 '%s' 到 '%s'" |
8ada9598 | 20398 | |
d13389bf | 20399 | #: builtin/remote.c:730 |
8ada9598 JX |
20400 | #, c-format |
20401 | msgid "" | |
d691f479 | 20402 | "Not updating non-default fetch refspec\n" |
8ada9598 JX |
20403 | "\t%s\n" |
20404 | "\tPlease update the configuration manually if necessary." | |
20405 | msgstr "" | |
160fb2b2 | 20406 | "没有更新非默认的获取引用规格\n" |
81809b99 JX |
20407 | "\t%s\n" |
20408 | "\t如果必要请手动更新配置。" | |
8ada9598 | 20409 | |
d13389bf | 20410 | #: builtin/remote.c:770 |
81809b99 | 20411 | #, c-format |
8ada9598 | 20412 | msgid "deleting '%s' failed" |
81809b99 | 20413 | msgstr "删除 '%s' 失败" |
8ada9598 | 20414 | |
d13389bf | 20415 | #: builtin/remote.c:804 |
81809b99 | 20416 | #, c-format |
8ada9598 | 20417 | msgid "creating '%s' failed" |
81809b99 | 20418 | msgstr "创建 '%s' 失败" |
8ada9598 | 20419 | |
d13389bf | 20420 | #: builtin/remote.c:882 |
8ada9598 JX |
20421 | msgid "" |
20422 | "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" | |
20423 | "to delete it, use:" | |
20424 | msgid_plural "" | |
20425 | "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" | |
20426 | "to delete them, use:" | |
5ae481e0 JX |
20427 | msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:" |
20428 | msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:" | |
8ada9598 | 20429 | |
d13389bf | 20430 | #: builtin/remote.c:896 |
276ceeaa JX |
20431 | #, c-format |
20432 | msgid "Could not remove config section '%s'" | |
20433 | msgstr "不能移除配置小节 '%s'" | |
20434 | ||
d13389bf | 20435 | #: builtin/remote.c:999 |
8ada9598 JX |
20436 | #, c-format |
20437 | msgid " new (next fetch will store in remotes/%s)" | |
81809b99 | 20438 | msgstr " 新的(下一次获取将存储于 remotes/%s)" |
8ada9598 | 20439 | |
d13389bf | 20440 | #: builtin/remote.c:1002 |
8ada9598 | 20441 | msgid " tracked" |
81809b99 | 20442 | msgstr " 已跟踪" |
8ada9598 | 20443 | |
d13389bf | 20444 | #: builtin/remote.c:1004 |
8ada9598 | 20445 | msgid " stale (use 'git remote prune' to remove)" |
81809b99 | 20446 | msgstr " 过时(使用 'git remote prune' 来移除)" |
8ada9598 | 20447 | |
d13389bf | 20448 | #: builtin/remote.c:1006 |
8ada9598 | 20449 | msgid " ???" |
81809b99 | 20450 | msgstr " ???" |
8ada9598 | 20451 | |
d13389bf | 20452 | #: builtin/remote.c:1047 |
8ada9598 JX |
20453 | #, c-format |
20454 | msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" | |
81809b99 | 20455 | msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支" |
8ada9598 | 20456 | |
d13389bf | 20457 | #: builtin/remote.c:1056 |
81809b99 | 20458 | #, c-format |
276ceeaa JX |
20459 | msgid "rebases interactively onto remote %s" |
20460 | msgstr "交互式变基到远程 %s" | |
8ada9598 | 20461 | |
d13389bf | 20462 | #: builtin/remote.c:1058 |
fd8cb379 JX |
20463 | #, c-format |
20464 | msgid "rebases interactively (with merges) onto remote %s" | |
20465 | msgstr "交互式变基(含合并提交)到远程 %s" | |
20466 | ||
d13389bf | 20467 | #: builtin/remote.c:1061 |
5c57d762 JX |
20468 | #, c-format |
20469 | msgid "rebases onto remote %s" | |
20470 | msgstr "变基到远程 %s" | |
20471 | ||
d13389bf | 20472 | #: builtin/remote.c:1065 |
81809b99 | 20473 | #, c-format |
8ada9598 | 20474 | msgid " merges with remote %s" |
81809b99 | 20475 | msgstr " 与远程 %s 合并" |
8ada9598 | 20476 | |
d13389bf | 20477 | #: builtin/remote.c:1068 |
81809b99 | 20478 | #, c-format |
8ada9598 | 20479 | msgid "merges with remote %s" |
81809b99 | 20480 | msgstr "与远程 %s 合并" |
8ada9598 | 20481 | |
d13389bf | 20482 | #: builtin/remote.c:1071 |
5c57d762 JX |
20483 | #, c-format |
20484 | msgid "%-*s and with remote %s\n" | |
20485 | msgstr "%-*s 以及和远程 %s\n" | |
8ada9598 | 20486 | |
d13389bf | 20487 | #: builtin/remote.c:1114 |
8ada9598 | 20488 | msgid "create" |
81809b99 | 20489 | msgstr "创建" |
8ada9598 | 20490 | |
d13389bf | 20491 | #: builtin/remote.c:1117 |
8ada9598 | 20492 | msgid "delete" |
81809b99 | 20493 | msgstr "删除" |
8ada9598 | 20494 | |
d13389bf | 20495 | #: builtin/remote.c:1121 |
8ada9598 | 20496 | msgid "up to date" |
81809b99 | 20497 | msgstr "最新" |
8ada9598 | 20498 | |
d13389bf | 20499 | #: builtin/remote.c:1124 |
8ada9598 | 20500 | msgid "fast-forwardable" |
81809b99 | 20501 | msgstr "可快进" |
8ada9598 | 20502 | |
d13389bf | 20503 | #: builtin/remote.c:1127 |
8ada9598 | 20504 | msgid "local out of date" |
81809b99 | 20505 | msgstr "本地已过时" |
8ada9598 | 20506 | |
d13389bf | 20507 | #: builtin/remote.c:1134 |
8ada9598 JX |
20508 | #, c-format |
20509 | msgid " %-*s forces to %-*s (%s)" | |
81809b99 | 20510 | msgstr " %-*s 强制推送至 %-*s (%s)" |
8ada9598 | 20511 | |
d13389bf | 20512 | #: builtin/remote.c:1137 |
8ada9598 JX |
20513 | #, c-format |
20514 | msgid " %-*s pushes to %-*s (%s)" | |
81809b99 | 20515 | msgstr " %-*s 推送至 %-*s (%s)" |
8ada9598 | 20516 | |
d13389bf | 20517 | #: builtin/remote.c:1141 |
8ada9598 JX |
20518 | #, c-format |
20519 | msgid " %-*s forces to %s" | |
81809b99 | 20520 | msgstr " %-*s 强制推送至 %s" |
8ada9598 | 20521 | |
d13389bf | 20522 | #: builtin/remote.c:1144 |
8ada9598 JX |
20523 | #, c-format |
20524 | msgid " %-*s pushes to %s" | |
81809b99 | 20525 | msgstr " %-*s 推送至 %s" |
8ada9598 | 20526 | |
d13389bf | 20527 | #: builtin/remote.c:1212 |
ef317cd5 | 20528 | msgid "do not query remotes" |
07432cef | 20529 | msgstr "不查询远程" |
ef317cd5 | 20530 | |
d13389bf | 20531 | #: builtin/remote.c:1239 |
81809b99 | 20532 | #, c-format |
8ada9598 | 20533 | msgid "* remote %s" |
81809b99 | 20534 | msgstr "* 远程 %s" |
8ada9598 | 20535 | |
d13389bf | 20536 | #: builtin/remote.c:1240 |
8ada9598 JX |
20537 | #, c-format |
20538 | msgid " Fetch URL: %s" | |
81809b99 | 20539 | msgstr " 获取地址:%s" |
8ada9598 | 20540 | |
d13389bf | 20541 | #: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 |
8ada9598 | 20542 | msgid "(no URL)" |
81809b99 | 20543 | msgstr "(无 URL)" |
8ada9598 | 20544 | |
a4f16749 JX |
20545 | #. TRANSLATORS: the colon ':' should align |
20546 | #. with the one in " Fetch URL: %s" | |
20547 | #. translation. | |
20548 | #. | |
d13389bf | 20549 | #: builtin/remote.c:1255 builtin/remote.c:1257 |
8ada9598 JX |
20550 | #, c-format |
20551 | msgid " Push URL: %s" | |
81809b99 | 20552 | msgstr " 推送地址:%s" |
8ada9598 | 20553 | |
d13389bf | 20554 | #: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 |
81809b99 | 20555 | #, c-format |
8ada9598 | 20556 | msgid " HEAD branch: %s" |
4375c10e | 20557 | msgstr " HEAD 分支:%s" |
8ada9598 | 20558 | |
d13389bf | 20559 | #: builtin/remote.c:1259 |
5c57d762 JX |
20560 | msgid "(not queried)" |
20561 | msgstr "(未查询)" | |
20562 | ||
d13389bf | 20563 | #: builtin/remote.c:1261 |
5c57d762 JX |
20564 | msgid "(unknown)" |
20565 | msgstr "(未知)" | |
20566 | ||
d13389bf | 20567 | #: builtin/remote.c:1265 |
8ada9598 JX |
20568 | #, c-format |
20569 | msgid "" | |
20570 | " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" | |
5ae481e0 | 20571 | msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n" |
8ada9598 | 20572 | |
d13389bf | 20573 | #: builtin/remote.c:1277 |
81809b99 | 20574 | #, c-format |
8ada9598 JX |
20575 | msgid " Remote branch:%s" |
20576 | msgid_plural " Remote branches:%s" | |
81809b99 | 20577 | msgstr[0] " 远程分支:%s" |
5ae481e0 | 20578 | msgstr[1] " 远程分支:%s" |
8ada9598 | 20579 | |
81809b99 | 20580 | # 译者:中文字符串拼接,可删除前导空格 |
d13389bf | 20581 | #: builtin/remote.c:1280 builtin/remote.c:1306 |
8ada9598 | 20582 | msgid " (status not queried)" |
81809b99 | 20583 | msgstr "(状态未查询)" |
8ada9598 | 20584 | |
d13389bf | 20585 | #: builtin/remote.c:1289 |
8ada9598 JX |
20586 | msgid " Local branch configured for 'git pull':" |
20587 | msgid_plural " Local branches configured for 'git pull':" | |
81809b99 | 20588 | msgstr[0] " 为 'git pull' 配置的本地分支:" |
5ae481e0 | 20589 | msgstr[1] " 为 'git pull' 配置的本地分支:" |
8ada9598 | 20590 | |
d13389bf | 20591 | #: builtin/remote.c:1297 |
8ada9598 | 20592 | msgid " Local refs will be mirrored by 'git push'" |
81809b99 | 20593 | msgstr " 本地引用将在 'git push' 时被镜像" |
8ada9598 | 20594 | |
d13389bf | 20595 | #: builtin/remote.c:1303 |
81809b99 | 20596 | #, c-format |
8ada9598 JX |
20597 | msgid " Local ref configured for 'git push'%s:" |
20598 | msgid_plural " Local refs configured for 'git push'%s:" | |
81809b99 | 20599 | msgstr[0] " 为 'git push' 配置的本地引用%s:" |
5ae481e0 | 20600 | msgstr[1] " 为 'git push' 配置的本地引用%s:" |
8ada9598 | 20601 | |
d13389bf | 20602 | #: builtin/remote.c:1324 |
ef317cd5 | 20603 | msgid "set refs/remotes/<name>/HEAD according to remote" |
07432cef | 20604 | msgstr "根据远程设置 refs/remotes/<名称>/HEAD" |
ef317cd5 | 20605 | |
d13389bf | 20606 | #: builtin/remote.c:1326 |
ef317cd5 | 20607 | msgid "delete refs/remotes/<name>/HEAD" |
07432cef | 20608 | msgstr "删除 refs/remotes/<名称>/HEAD" |
ef317cd5 | 20609 | |
d13389bf | 20610 | #: builtin/remote.c:1341 |
8ada9598 | 20611 | msgid "Cannot determine remote HEAD" |
81809b99 | 20612 | msgstr "无法确定远程 HEAD" |
8ada9598 | 20613 | |
d13389bf | 20614 | #: builtin/remote.c:1343 |
8ada9598 | 20615 | msgid "Multiple remote HEAD branches. Please choose one explicitly with:" |
81809b99 | 20616 | msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" |
8ada9598 | 20617 | |
d13389bf | 20618 | #: builtin/remote.c:1353 |
81809b99 | 20619 | #, c-format |
8ada9598 | 20620 | msgid "Could not delete %s" |
81809b99 | 20621 | msgstr "无法删除 %s" |
8ada9598 | 20622 | |
d13389bf | 20623 | #: builtin/remote.c:1361 |
81809b99 | 20624 | #, c-format |
8ada9598 | 20625 | msgid "Not a valid ref: %s" |
81809b99 | 20626 | msgstr "不是一个有效引用:%s" |
8ada9598 | 20627 | |
d13389bf | 20628 | #: builtin/remote.c:1363 |
81809b99 | 20629 | #, c-format |
8ada9598 | 20630 | msgid "Could not setup %s" |
81809b99 | 20631 | msgstr "不能设置 %s" |
8ada9598 JX |
20632 | |
20633 | # 译者:注意保持前导空格 | |
d13389bf | 20634 | #: builtin/remote.c:1381 |
81809b99 | 20635 | #, c-format |
8ada9598 | 20636 | msgid " %s will become dangling!" |
e640d114 | 20637 | msgstr " %s 将成为悬空状态!" |
8ada9598 JX |
20638 | |
20639 | # 译者:注意保持前导空格 | |
d13389bf | 20640 | #: builtin/remote.c:1382 |
81809b99 | 20641 | #, c-format |
8ada9598 | 20642 | msgid " %s has become dangling!" |
e640d114 | 20643 | msgstr " %s 已成为悬空状态!" |
8ada9598 | 20644 | |
d13389bf | 20645 | #: builtin/remote.c:1392 |
81809b99 | 20646 | #, c-format |
8ada9598 | 20647 | msgid "Pruning %s" |
81809b99 | 20648 | msgstr "修剪 %s" |
8ada9598 | 20649 | |
d13389bf | 20650 | #: builtin/remote.c:1393 |
8ada9598 JX |
20651 | #, c-format |
20652 | msgid "URL: %s" | |
81809b99 | 20653 | msgstr "URL:%s" |
8ada9598 | 20654 | |
d13389bf | 20655 | #: builtin/remote.c:1409 |
8ada9598 JX |
20656 | #, c-format |
20657 | msgid " * [would prune] %s" | |
81809b99 | 20658 | msgstr " * [将删除] %s" |
8ada9598 | 20659 | |
d13389bf | 20660 | #: builtin/remote.c:1412 |
8ada9598 JX |
20661 | #, c-format |
20662 | msgid " * [pruned] %s" | |
81809b99 | 20663 | msgstr " * [已删除] %s" |
8ada9598 | 20664 | |
d13389bf | 20665 | #: builtin/remote.c:1457 |
ef317cd5 | 20666 | msgid "prune remotes after fetching" |
07432cef | 20667 | msgstr "抓取后清除远程" |
ef317cd5 | 20668 | |
d13389bf | 20669 | #: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 |
81809b99 | 20670 | #, c-format |
8ada9598 | 20671 | msgid "No such remote '%s'" |
81809b99 | 20672 | msgstr "没有此远程 '%s'" |
8ada9598 | 20673 | |
d13389bf | 20674 | #: builtin/remote.c:1539 |
ef317cd5 | 20675 | msgid "add branch" |
07432cef | 20676 | msgstr "添加分支" |
ef317cd5 | 20677 | |
d13389bf | 20678 | #: builtin/remote.c:1546 |
8ada9598 | 20679 | msgid "no remote specified" |
81809b99 | 20680 | msgstr "未指定远程" |
8ada9598 | 20681 | |
d13389bf | 20682 | #: builtin/remote.c:1563 |
94550ed3 JX |
20683 | msgid "query push URLs rather than fetch URLs" |
20684 | msgstr "查询推送 URL 地址,而非获取 URL 地址" | |
20685 | ||
d13389bf | 20686 | #: builtin/remote.c:1565 |
94550ed3 JX |
20687 | msgid "return all URLs" |
20688 | msgstr "返回所有 URL 地址" | |
20689 | ||
d13389bf | 20690 | #: builtin/remote.c:1595 |
94550ed3 JX |
20691 | #, c-format |
20692 | msgid "no URLs configured for remote '%s'" | |
20693 | msgstr "没有给远程仓库 '%s' 设定 URL" | |
20694 | ||
d13389bf | 20695 | #: builtin/remote.c:1621 |
ef317cd5 | 20696 | msgid "manipulate push URLs" |
07432cef | 20697 | msgstr "操作推送 URLS" |
ef317cd5 | 20698 | |
d13389bf | 20699 | #: builtin/remote.c:1623 |
ef317cd5 | 20700 | msgid "add URL" |
07432cef | 20701 | msgstr "添加 URL" |
ef317cd5 | 20702 | |
d13389bf | 20703 | #: builtin/remote.c:1625 |
ef317cd5 | 20704 | msgid "delete URLs" |
07432cef | 20705 | msgstr "删除 URLS" |
ef317cd5 | 20706 | |
d13389bf | 20707 | #: builtin/remote.c:1632 |
8ada9598 | 20708 | msgid "--add --delete doesn't make sense" |
81809b99 | 20709 | msgstr "--add --delete 无意义" |
8ada9598 | 20710 | |
d13389bf | 20711 | #: builtin/remote.c:1673 |
81809b99 | 20712 | #, c-format |
8ada9598 | 20713 | msgid "Invalid old URL pattern: %s" |
4375c10e | 20714 | msgstr "无效的旧 URL 匹配模版:%s" |
8ada9598 | 20715 | |
d13389bf | 20716 | #: builtin/remote.c:1681 |
81809b99 | 20717 | #, c-format |
8ada9598 | 20718 | msgid "No such URL found: %s" |
4375c10e | 20719 | msgstr "未找到此 URL:%s" |
8ada9598 | 20720 | |
d13389bf | 20721 | #: builtin/remote.c:1683 |
8ada9598 | 20722 | msgid "Will not delete all non-push URLs" |
4375c10e | 20723 | msgstr "将不会删除所有非推送 URL 地址" |
8ada9598 | 20724 | |
473eb541 | 20725 | #: builtin/repack.c:26 |
814ff314 JX |
20726 | msgid "git repack [<options>]" |
20727 | msgstr "git repack [<选项>]" | |
90314792 | 20728 | |
473eb541 | 20729 | #: builtin/repack.c:31 |
1a79b2f1 JX |
20730 | msgid "" |
20731 | "Incremental repacks are incompatible with bitmap indexes. Use\n" | |
20732 | "--no-write-bitmap-index or disable the pack.writebitmaps configuration." | |
20733 | msgstr "" | |
20734 | "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" | |
20735 | "或禁用 pack.writebitmaps 配置。" | |
20736 | ||
473eb541 | 20737 | #: builtin/repack.c:198 |
06991777 | 20738 | msgid "could not start pack-objects to repack promisor objects" |
5b533632 | 20739 | msgstr "无法开始 pack-objects 来重新打包 promisor 对象" |
06991777 | 20740 | |
33b62fba | 20741 | #: builtin/repack.c:270 builtin/repack.c:630 |
06991777 | 20742 | msgid "repack: Expecting full hex object ID lines only from pack-objects." |
5b533632 | 20743 | msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。" |
06991777 | 20744 | |
473eb541 | 20745 | #: builtin/repack.c:294 |
06991777 | 20746 | msgid "could not finish pack-objects to repack promisor objects" |
5b533632 | 20747 | msgstr "无法完成 pack-objects 来重新打包 promisor 对象" |
06991777 | 20748 | |
33b62fba JX |
20749 | #: builtin/repack.c:309 |
20750 | #, c-format | |
20751 | msgid "cannot open index for %s" | |
20752 | msgstr "不能打开 %s 的索引" | |
20753 | ||
20754 | #: builtin/repack.c:368 | |
20755 | #, c-format | |
20756 | msgid "pack %s too large to consider in geometric progression" | |
20757 | msgstr "包 %s 太大,不在几何级数中考虑" | |
20758 | ||
20759 | #: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413 | |
20760 | #, c-format | |
20761 | msgid "pack %s too large to roll up" | |
20762 | msgstr "包 %s 太大导致数字溢出" | |
20763 | ||
20764 | #: builtin/repack.c:460 | |
90314792 JX |
20765 | msgid "pack everything in a single pack" |
20766 | msgstr "所有内容打包到一个包文件中" | |
20767 | ||
33b62fba | 20768 | #: builtin/repack.c:462 |
90314792 JX |
20769 | msgid "same as -a, and turn unreachable objects loose" |
20770 | msgstr "和 -a 相同,并将不可达的对象设为松散对象" | |
20771 | ||
33b62fba | 20772 | #: builtin/repack.c:465 |
90314792 JX |
20773 | msgid "remove redundant packs, and run git-prune-packed" |
20774 | msgstr "删除多余的包,运行 git-prune-packed" | |
20775 | ||
33b62fba | 20776 | #: builtin/repack.c:467 |
90314792 JX |
20777 | msgid "pass --no-reuse-delta to git-pack-objects" |
20778 | msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" | |
20779 | ||
33b62fba | 20780 | #: builtin/repack.c:469 |
90314792 JX |
20781 | msgid "pass --no-reuse-object to git-pack-objects" |
20782 | msgstr "向 git-pack-objects 传递参数 --no-reuse-object" | |
20783 | ||
33b62fba | 20784 | #: builtin/repack.c:471 |
90314792 JX |
20785 | msgid "do not run git-update-server-info" |
20786 | msgstr "不运行 git-update-server-info" | |
20787 | ||
33b62fba | 20788 | #: builtin/repack.c:474 |
90314792 JX |
20789 | msgid "pass --local to git-pack-objects" |
20790 | msgstr "向 git-pack-objects 传递参数 --local" | |
20791 | ||
33b62fba | 20792 | #: builtin/repack.c:476 |
6c94aba5 JX |
20793 | msgid "write bitmap index" |
20794 | msgstr "写 bitmap 索引" | |
20795 | ||
33b62fba | 20796 | #: builtin/repack.c:478 |
4c27fcb5 JX |
20797 | msgid "pass --delta-islands to git-pack-objects" |
20798 | msgstr "向 git-pack-objects 传递参数 --delta-islands" | |
20799 | ||
33b62fba | 20800 | #: builtin/repack.c:479 |
90314792 JX |
20801 | msgid "approxidate" |
20802 | msgstr "近似日期" | |
20803 | ||
33b62fba | 20804 | #: builtin/repack.c:480 |
90314792 JX |
20805 | msgid "with -A, do not loosen objects older than this" |
20806 | msgstr "使用 -A,不要将早于给定时间的对象过期" | |
20807 | ||
33b62fba | 20808 | #: builtin/repack.c:482 |
5c57d762 JX |
20809 | msgid "with -a, repack unreachable objects" |
20810 | msgstr "使用 -a ,重新对不可达对象打包" | |
20811 | ||
33b62fba | 20812 | #: builtin/repack.c:484 |
90314792 JX |
20813 | msgid "size of the window used for delta compression" |
20814 | msgstr "用于增量压缩的窗口值" | |
20815 | ||
33b62fba | 20816 | #: builtin/repack.c:485 builtin/repack.c:491 |
8376b58d JX |
20817 | msgid "bytes" |
20818 | msgstr "字节" | |
20819 | ||
33b62fba | 20820 | #: builtin/repack.c:486 |
90314792 JX |
20821 | msgid "same as the above, but limit memory size instead of entries count" |
20822 | msgstr "和上面的相似,但限制内存大小而非条目数" | |
20823 | ||
33b62fba | 20824 | #: builtin/repack.c:488 |
90314792 JX |
20825 | msgid "limits the maximum delta depth" |
20826 | msgstr "限制最大增量深度" | |
20827 | ||
33b62fba | 20828 | #: builtin/repack.c:490 |
a4f16749 JX |
20829 | msgid "limits the maximum number of threads" |
20830 | msgstr "限制最大线程数" | |
20831 | ||
33b62fba | 20832 | #: builtin/repack.c:492 |
90314792 | 20833 | msgid "maximum size of each packfile" |
dbd6cced | 20834 | msgstr "每个包文件的最大尺寸" |
90314792 | 20835 | |
33b62fba | 20836 | #: builtin/repack.c:494 |
6c94aba5 JX |
20837 | msgid "repack objects in packs marked with .keep" |
20838 | msgstr "对标记为 .keep 的包中的对象重新打包" | |
20839 | ||
33b62fba | 20840 | #: builtin/repack.c:496 |
fd8cb379 JX |
20841 | msgid "do not repack this pack" |
20842 | msgstr "不要对该包文件重新打包" | |
20843 | ||
33b62fba JX |
20844 | #: builtin/repack.c:498 |
20845 | msgid "find a geometric progression with factor <N>" | |
20846 | msgstr "使用因子 <n> 查找几何级数" | |
20847 | ||
20848 | #: builtin/repack.c:508 | |
94550ed3 JX |
20849 | msgid "cannot delete packs in a precious-objects repo" |
20850 | msgstr "不能删除珍品仓库中的打包文件" | |
20851 | ||
33b62fba | 20852 | #: builtin/repack.c:512 |
5c57d762 JX |
20853 | msgid "--keep-unreachable and -A are incompatible" |
20854 | msgstr "--keep-unreachable 和 -A 不兼容" | |
20855 | ||
33b62fba JX |
20856 | #: builtin/repack.c:527 |
20857 | msgid "--geometric is incompatible with -A, -a" | |
20858 | msgstr "--geometric 和 -A、-a 不兼容" | |
20859 | ||
20860 | #: builtin/repack.c:639 | |
06991777 JX |
20861 | msgid "Nothing new to pack." |
20862 | msgstr "没有新的要打包。" | |
20863 | ||
33b62fba | 20864 | #: builtin/repack.c:669 |
06991777 | 20865 | #, c-format |
d13389bf JX |
20866 | msgid "missing required file: %s" |
20867 | msgstr "缺少需要的文件:%s" | |
06991777 | 20868 | |
33b62fba | 20869 | #: builtin/repack.c:671 |
90314792 | 20870 | #, c-format |
d13389bf JX |
20871 | msgid "could not unlink: %s" |
20872 | msgstr "不能删除:%s" | |
90314792 | 20873 | |
fd8cb379 | 20874 | #: builtin/replace.c:22 |
ef317cd5 | 20875 | msgid "git replace [-f] <object> <replacement>" |
07432cef | 20876 | msgstr "git replace [-f] <对象> <替换物>" |
ef317cd5 | 20877 | |
fd8cb379 | 20878 | #: builtin/replace.c:23 |
6acbf033 JX |
20879 | msgid "git replace [-f] --edit <object>" |
20880 | msgstr "git replace [-f] --edit <对象>" | |
20881 | ||
fd8cb379 | 20882 | #: builtin/replace.c:24 |
6acbf033 JX |
20883 | msgid "git replace [-f] --graft <commit> [<parent>...]" |
20884 | msgstr "git replace [-f] --graft <提交> [<父提交>...]" | |
20885 | ||
fd8cb379 JX |
20886 | #: builtin/replace.c:25 |
20887 | msgid "git replace [-f] --convert-graft-file" | |
20888 | msgstr "git replace [-f] --convert-graft-file" | |
20889 | ||
20890 | #: builtin/replace.c:26 | |
ef317cd5 | 20891 | msgid "git replace -d <object>..." |
07432cef | 20892 | msgstr "git replace -d <对象>..." |
ef317cd5 | 20893 | |
fd8cb379 | 20894 | #: builtin/replace.c:27 |
cfff71a9 JX |
20895 | msgid "git replace [--format=<format>] [-l [<pattern>]]" |
20896 | msgstr "git replace [--format=<格式>] [-l [<模式>]]" | |
ef317cd5 | 20897 | |
d46c5519 | 20898 | #: builtin/replace.c:90 |
c1ac5258 JX |
20899 | #, c-format |
20900 | msgid "" | |
20901 | "invalid replace format '%s'\n" | |
20902 | "valid formats are 'short', 'medium' and 'long'" | |
20903 | msgstr "" | |
20904 | "无效的替换格式 '%s'\n" | |
20905 | "有效的格式有 'short'、'medium' 和 'long'" | |
20906 | ||
d46c5519 | 20907 | #: builtin/replace.c:125 |
c1ac5258 JX |
20908 | #, c-format |
20909 | msgid "replace ref '%s' not found" | |
20910 | msgstr "未发现替换引用 '%s'" | |
20911 | ||
d46c5519 | 20912 | #: builtin/replace.c:141 |
c1ac5258 JX |
20913 | #, c-format |
20914 | msgid "Deleted replace ref '%s'" | |
e640d114 | 20915 | msgstr "已删除替换引用 '%s'" |
c1ac5258 | 20916 | |
d46c5519 | 20917 | #: builtin/replace.c:153 |
c1ac5258 JX |
20918 | #, c-format |
20919 | msgid "'%s' is not a valid ref name" | |
20920 | msgstr "'%s' 不是一个有效的引用名" | |
20921 | ||
d46c5519 | 20922 | #: builtin/replace.c:158 |
c1ac5258 JX |
20923 | #, c-format |
20924 | msgid "replace ref '%s' already exists" | |
20925 | msgstr "替换引用 '%s' 已经存在" | |
20926 | ||
d46c5519 | 20927 | #: builtin/replace.c:178 |
c1ac5258 JX |
20928 | #, c-format |
20929 | msgid "" | |
20930 | "Objects must be of the same type.\n" | |
20931 | "'%s' points to a replaced object of type '%s'\n" | |
20932 | "while '%s' points to a replacement object of type '%s'." | |
20933 | msgstr "" | |
20934 | "对象必须属于同一类型。\n" | |
20935 | "'%s' 指向 '%s' 类型的替换对象\n" | |
20936 | "而 '%s' 指向 '%s' 类型的替换对象。" | |
20937 | ||
d46c5519 | 20938 | #: builtin/replace.c:229 |
c1ac5258 JX |
20939 | #, c-format |
20940 | msgid "unable to open %s for writing" | |
20941 | msgstr "无法为写入打开 %s" | |
20942 | ||
d46c5519 | 20943 | #: builtin/replace.c:242 |
c1ac5258 JX |
20944 | msgid "cat-file reported failure" |
20945 | msgstr "cat-file 报告失败" | |
20946 | ||
d46c5519 | 20947 | #: builtin/replace.c:258 |
c1ac5258 JX |
20948 | #, c-format |
20949 | msgid "unable to open %s for reading" | |
20950 | msgstr "无法为读取打开 %s" | |
20951 | ||
d46c5519 | 20952 | #: builtin/replace.c:272 |
c1ac5258 JX |
20953 | msgid "unable to spawn mktree" |
20954 | msgstr "无法启动 mktree" | |
20955 | ||
d46c5519 | 20956 | #: builtin/replace.c:276 |
c1ac5258 JX |
20957 | msgid "unable to read from mktree" |
20958 | msgstr "无法从 mktree 读取" | |
20959 | ||
d46c5519 | 20960 | #: builtin/replace.c:285 |
c1ac5258 JX |
20961 | msgid "mktree reported failure" |
20962 | msgstr "mktree 报告失败" | |
20963 | ||
d46c5519 | 20964 | #: builtin/replace.c:289 |
c1ac5258 JX |
20965 | msgid "mktree did not return an object name" |
20966 | msgstr "mktree 没有返回一个对象名" | |
20967 | ||
d46c5519 | 20968 | #: builtin/replace.c:298 |
c1ac5258 JX |
20969 | #, c-format |
20970 | msgid "unable to fstat %s" | |
20971 | msgstr "无法对 %s 执行 fstat" | |
20972 | ||
d46c5519 | 20973 | #: builtin/replace.c:303 |
c1ac5258 JX |
20974 | msgid "unable to write object to database" |
20975 | msgstr "无法向数据库写入对象" | |
20976 | ||
2b472aae JX |
20977 | #: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 |
20978 | #: builtin/replace.c:454 | |
c1ac5258 JX |
20979 | #, c-format |
20980 | msgid "not a valid object name: '%s'" | |
6acbf033 JX |
20981 | msgstr "不是一个有效的对象名:'%s'" |
20982 | ||
d46c5519 | 20983 | #: builtin/replace.c:326 |
c1ac5258 JX |
20984 | #, c-format |
20985 | msgid "unable to get object type for %s" | |
20986 | msgstr "无法得到 %s 的对象类型" | |
20987 | ||
d46c5519 | 20988 | #: builtin/replace.c:342 |
c1ac5258 JX |
20989 | msgid "editing object file failed" |
20990 | msgstr "编辑对象文件失败" | |
20991 | ||
d46c5519 | 20992 | #: builtin/replace.c:351 |
c1ac5258 JX |
20993 | #, c-format |
20994 | msgid "new object is the same as the old one: '%s'" | |
20995 | msgstr "新对象和旧对象相同:'%s'" | |
20996 | ||
a5cd71ca | 20997 | #: builtin/replace.c:384 |
d46c5519 JX |
20998 | #, c-format |
20999 | msgid "could not parse %s as a commit" | |
21000 | msgstr "无法将 %s 解析为一个提交" | |
21001 | ||
2b472aae | 21002 | #: builtin/replace.c:416 |
6acbf033 JX |
21003 | #, c-format |
21004 | msgid "bad mergetag in commit '%s'" | |
55a16ee4 | 21005 | msgstr "提交 '%s' 中含有损坏的合并标签" |
6acbf033 | 21006 | |
2b472aae | 21007 | #: builtin/replace.c:418 |
6acbf033 JX |
21008 | #, c-format |
21009 | msgid "malformed mergetag in commit '%s'" | |
fd8cb379 | 21010 | msgstr "提交 '%s' 中含有格式错误的合并标签" |
6acbf033 | 21011 | |
2b472aae | 21012 | #: builtin/replace.c:430 |
6acbf033 JX |
21013 | #, c-format |
21014 | msgid "" | |
21015 | "original commit '%s' contains mergetag '%s' that is discarded; use --edit " | |
21016 | "instead of --graft" | |
55a16ee4 | 21017 | msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft" |
6acbf033 | 21018 | |
2b472aae | 21019 | #: builtin/replace.c:469 |
6acbf033 | 21020 | #, c-format |
c1ac5258 JX |
21021 | msgid "the original commit '%s' has a gpg signature" |
21022 | msgstr "原始提交 '%s' 中有一个 gpg 签名" | |
6acbf033 | 21023 | |
2b472aae | 21024 | #: builtin/replace.c:470 |
6acbf033 JX |
21025 | msgid "the signature will be removed in the replacement commit!" |
21026 | msgstr "在替换的提交中签名将被移除!" | |
21027 | ||
2b472aae | 21028 | #: builtin/replace.c:480 |
6acbf033 JX |
21029 | #, c-format |
21030 | msgid "could not write replacement commit for: '%s'" | |
21031 | msgstr "不能为 '%s' 写替换提交" | |
21032 | ||
2b472aae | 21033 | #: builtin/replace.c:488 |
c1ac5258 JX |
21034 | #, c-format |
21035 | msgid "graft for '%s' unnecessary" | |
21036 | msgstr "对 '%s' 移植没有必要" | |
21037 | ||
2b472aae | 21038 | #: builtin/replace.c:492 |
c1ac5258 JX |
21039 | #, c-format |
21040 | msgid "new commit is the same as the old one: '%s'" | |
21041 | msgstr "新提交和旧的一样:'%s'" | |
21042 | ||
2b472aae | 21043 | #: builtin/replace.c:527 |
fd8cb379 JX |
21044 | #, c-format |
21045 | msgid "" | |
21046 | "could not convert the following graft(s):\n" | |
21047 | "%s" | |
21048 | msgstr "" | |
21049 | "不能转换下列移植:\n" | |
21050 | "%s" | |
21051 | ||
2b472aae | 21052 | #: builtin/replace.c:548 |
ef317cd5 | 21053 | msgid "list replace refs" |
07432cef | 21054 | msgstr "列出替换的引用" |
ef317cd5 | 21055 | |
2b472aae | 21056 | #: builtin/replace.c:549 |
ef317cd5 | 21057 | msgid "delete replace refs" |
07432cef | 21058 | msgstr "删除替换的引用" |
ef317cd5 | 21059 | |
2b472aae | 21060 | #: builtin/replace.c:550 |
6acbf033 JX |
21061 | msgid "edit existing object" |
21062 | msgstr "编辑现存的对象" | |
21063 | ||
2b472aae | 21064 | #: builtin/replace.c:551 |
6acbf033 JX |
21065 | msgid "change a commit's parents" |
21066 | msgstr "修改一个提交的父提交" | |
21067 | ||
2b472aae | 21068 | #: builtin/replace.c:552 |
fd8cb379 JX |
21069 | msgid "convert existing graft file" |
21070 | msgstr "转换现存的移植文件" | |
21071 | ||
2b472aae | 21072 | #: builtin/replace.c:553 |
ef317cd5 | 21073 | msgid "replace the ref if it exists" |
07432cef | 21074 | msgstr "如果存在则替换引用" |
ef317cd5 | 21075 | |
2b472aae | 21076 | #: builtin/replace.c:555 |
6acbf033 JX |
21077 | msgid "do not pretty-print contents for --edit" |
21078 | msgstr "不要为 --edit 操作美观显示内容" | |
21079 | ||
2b472aae | 21080 | #: builtin/replace.c:556 |
cfff71a9 JX |
21081 | msgid "use this format" |
21082 | msgstr "使用此格式" | |
21083 | ||
2b472aae | 21084 | #: builtin/replace.c:569 |
c1ac5258 | 21085 | msgid "--format cannot be used when not listing" |
e640d114 | 21086 | msgstr "不列出时不能使用 --format" |
c1ac5258 | 21087 | |
2b472aae | 21088 | #: builtin/replace.c:577 |
c1ac5258 JX |
21089 | msgid "-f only makes sense when writing a replacement" |
21090 | msgstr "只有写一个替换时 -f 才有意义" | |
21091 | ||
2b472aae | 21092 | #: builtin/replace.c:581 |
c1ac5258 JX |
21093 | msgid "--raw only makes sense with --edit" |
21094 | msgstr "--raw 只有和 --edit 共用才有意义" | |
21095 | ||
2b472aae | 21096 | #: builtin/replace.c:587 |
c1ac5258 JX |
21097 | msgid "-d needs at least one argument" |
21098 | msgstr "-d 需要至少一个参数" | |
21099 | ||
2b472aae | 21100 | #: builtin/replace.c:593 |
c1ac5258 JX |
21101 | msgid "bad number of arguments" |
21102 | msgstr "错误的参数个数" | |
21103 | ||
2b472aae | 21104 | #: builtin/replace.c:599 |
c1ac5258 | 21105 | msgid "-e needs exactly one argument" |
e640d114 | 21106 | msgstr "-e 需要且仅需要一个参数" |
c1ac5258 | 21107 | |
2b472aae | 21108 | #: builtin/replace.c:605 |
c1ac5258 JX |
21109 | msgid "-g needs at least one argument" |
21110 | msgstr "-g 需要至少一个参数" | |
21111 | ||
2b472aae | 21112 | #: builtin/replace.c:611 |
c1ac5258 JX |
21113 | msgid "--convert-graft-file takes no argument" |
21114 | msgstr "--convert-graft-file 不带参数" | |
21115 | ||
2b472aae | 21116 | #: builtin/replace.c:617 |
c1ac5258 JX |
21117 | msgid "only one pattern can be given with -l" |
21118 | msgstr "只能为 -l 提供一个模式" | |
21119 | ||
a4f16749 | 21120 | #: builtin/rerere.c:13 |
814ff314 JX |
21121 | msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" |
21122 | msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" | |
ef317cd5 | 21123 | |
ec3d4607 | 21124 | #: builtin/rerere.c:58 |
ef317cd5 | 21125 | msgid "register clean resolutions in index" |
07432cef | 21126 | msgstr "在索引中注册干净的解决方案" |
ef317cd5 | 21127 | |
ec3d4607 | 21128 | #: builtin/rerere.c:77 |
4c27fcb5 JX |
21129 | msgid "'git rerere forget' without paths is deprecated" |
21130 | msgstr "没有路径的 'git rerere forget' 已经过时" | |
21131 | ||
ec3d4607 | 21132 | #: builtin/rerere.c:111 |
4c27fcb5 JX |
21133 | #, c-format |
21134 | msgid "unable to generate diff for '%s'" | |
21135 | msgstr "无法为 '%s' 生成差异" | |
21136 | ||
06991777 | 21137 | #: builtin/reset.c:32 |
ef317cd5 JX |
21138 | msgid "" |
21139 | "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" | |
07432cef | 21140 | msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" |
ef317cd5 | 21141 | |
06991777 | 21142 | #: builtin/reset.c:33 |
ddc12c42 JX |
21143 | msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." |
21144 | msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." | |
ef317cd5 | 21145 | |
06991777 | 21146 | #: builtin/reset.c:34 |
ddc12c42 JX |
21147 | msgid "" |
21148 | "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" | |
2b472aae | 21149 | msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]" |
ef317cd5 | 21150 | |
ddc12c42 JX |
21151 | #: builtin/reset.c:35 |
21152 | msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" | |
21153 | msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" | |
21154 | ||
21155 | #: builtin/reset.c:41 | |
c04f5ac3 JX |
21156 | msgid "mixed" |
21157 | msgstr "混杂" | |
21158 | ||
ddc12c42 | 21159 | #: builtin/reset.c:41 |
c04f5ac3 JX |
21160 | msgid "soft" |
21161 | msgstr "软性" | |
21162 | ||
ddc12c42 | 21163 | #: builtin/reset.c:41 |
c04f5ac3 JX |
21164 | msgid "hard" |
21165 | msgstr "硬性" | |
21166 | ||
ddc12c42 | 21167 | #: builtin/reset.c:41 |
8ada9598 JX |
21168 | msgid "merge" |
21169 | msgstr "合并" | |
21170 | ||
ddc12c42 | 21171 | #: builtin/reset.c:41 |
c04f5ac3 JX |
21172 | msgid "keep" |
21173 | msgstr "保持" | |
21174 | ||
349ede6a | 21175 | #: builtin/reset.c:83 |
c04f5ac3 JX |
21176 | msgid "You do not have a valid HEAD." |
21177 | msgstr "您没有一个有效的 HEAD。" | |
21178 | ||
349ede6a | 21179 | #: builtin/reset.c:85 |
c04f5ac3 JX |
21180 | msgid "Failed to find tree of HEAD." |
21181 | msgstr "无法找到 HEAD 指向的树。" | |
21182 | ||
349ede6a | 21183 | #: builtin/reset.c:91 |
c04f5ac3 JX |
21184 | #, c-format |
21185 | msgid "Failed to find tree of %s." | |
21186 | msgstr "无法找到 %s 指向的树。" | |
21187 | ||
349ede6a | 21188 | #: builtin/reset.c:116 |
a5cd71ca JX |
21189 | #, c-format |
21190 | msgid "HEAD is now at %s" | |
21191 | msgstr "HEAD 现在位于 %s" | |
21192 | ||
90e6ef53 | 21193 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 21194 | #: builtin/reset.c:195 |
c04f5ac3 JX |
21195 | #, c-format |
21196 | msgid "Cannot do a %s reset in the middle of a merge." | |
21197 | msgstr "在合并过程中不能做%s重置操作。" | |
21198 | ||
33b62fba JX |
21199 | #: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663 |
21200 | #: builtin/stash.c:687 | |
ef317cd5 | 21201 | msgid "be quiet, only report errors" |
07432cef | 21202 | msgstr "安静模式,只报告错误" |
ef317cd5 | 21203 | |
349ede6a | 21204 | #: builtin/reset.c:297 |
ef317cd5 | 21205 | msgid "reset HEAD and index" |
07432cef | 21206 | msgstr "重置 HEAD 和索引" |
ef317cd5 | 21207 | |
349ede6a | 21208 | #: builtin/reset.c:298 |
ef317cd5 | 21209 | msgid "reset only HEAD" |
07432cef | 21210 | msgstr "只重置 HEAD" |
ef317cd5 | 21211 | |
349ede6a | 21212 | #: builtin/reset.c:300 builtin/reset.c:302 |
ef317cd5 | 21213 | msgid "reset HEAD, index and working tree" |
07432cef | 21214 | msgstr "重置 HEAD、索引和工作区" |
ef317cd5 | 21215 | |
349ede6a | 21216 | #: builtin/reset.c:304 |
ef317cd5 | 21217 | msgid "reset HEAD but keep local changes" |
07432cef | 21218 | msgstr "重置 HEAD 但保存本地变更" |
ef317cd5 | 21219 | |
349ede6a | 21220 | #: builtin/reset.c:310 |
6c94aba5 JX |
21221 | msgid "record only the fact that removed paths will be added later" |
21222 | msgstr "将删除的路径标记为稍后添加" | |
21223 | ||
349ede6a | 21224 | #: builtin/reset.c:344 |
07432cef WS |
21225 | #, c-format |
21226 | msgid "Failed to resolve '%s' as a valid revision." | |
21227 | msgstr "无法将 '%s' 解析为一个有效的版本。" | |
21228 | ||
349ede6a | 21229 | #: builtin/reset.c:352 |
07432cef WS |
21230 | #, c-format |
21231 | msgid "Failed to resolve '%s' as a valid tree." | |
21232 | msgstr "无法将 '%s' 解析为一个有效的树对象。" | |
21233 | ||
349ede6a | 21234 | #: builtin/reset.c:361 |
c04f5ac3 | 21235 | msgid "--patch is incompatible with --{hard,mixed,soft}" |
07432cef | 21236 | msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" |
c04f5ac3 | 21237 | |
349ede6a | 21238 | #: builtin/reset.c:371 |
c04f5ac3 | 21239 | msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." |
d9d56b23 | 21240 | msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" |
c04f5ac3 | 21241 | |
90e6ef53 | 21242 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 21243 | #: builtin/reset.c:373 |
c04f5ac3 JX |
21244 | #, c-format |
21245 | msgid "Cannot do %s reset with paths." | |
21246 | msgstr "不能带路径进行%s重置。" | |
21247 | ||
90e6ef53 | 21248 | # 译者:汉字之间无空格,故删除%s前后空格 |
349ede6a | 21249 | #: builtin/reset.c:388 |
c04f5ac3 JX |
21250 | #, c-format |
21251 | msgid "%s reset is not allowed in a bare repository" | |
160fb2b2 | 21252 | msgstr "不能对纯仓库进行%s重置" |
c04f5ac3 | 21253 | |
349ede6a | 21254 | #: builtin/reset.c:392 |
6c94aba5 JX |
21255 | msgid "-N can only be used with --mixed" |
21256 | msgstr "-N 只能和 --mixed 同时使用" | |
21257 | ||
349ede6a | 21258 | #: builtin/reset.c:413 |
90314792 | 21259 | msgid "Unstaged changes after reset:" |
160fb2b2 | 21260 | msgstr "重置后取消暂存的变更:" |
90314792 | 21261 | |
349ede6a | 21262 | #: builtin/reset.c:416 |
4c27fcb5 JX |
21263 | #, c-format |
21264 | msgid "" | |
21265 | "\n" | |
21266 | "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" | |
21267 | "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" | |
21268 | "to make this the default.\n" | |
21269 | msgstr "" | |
21270 | "\n" | |
21271 | "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" | |
21272 | "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" | |
21273 | ||
349ede6a | 21274 | #: builtin/reset.c:434 |
ef317cd5 JX |
21275 | #, c-format |
21276 | msgid "Could not reset index file to revision '%s'." | |
21277 | msgstr "不能重置索引文件至版本 '%s'。" | |
21278 | ||
349ede6a | 21279 | #: builtin/reset.c:439 |
07432cef WS |
21280 | msgid "Could not write new index file." |
21281 | msgstr "不能写入新的索引文件。" | |
21282 | ||
ec3d4607 | 21283 | #: builtin/rev-list.c:541 |
31e5e17b JX |
21284 | msgid "cannot combine --exclude-promisor-objects and --missing" |
21285 | msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" | |
21286 | ||
ec3d4607 | 21287 | #: builtin/rev-list.c:602 |
5809aa05 JX |
21288 | msgid "object filtering requires --objects" |
21289 | msgstr "对象过滤需要 --objects" | |
21290 | ||
ec3d4607 | 21291 | #: builtin/rev-list.c:674 |
1b7f4a34 JX |
21292 | msgid "rev-list does not support display of notes" |
21293 | msgstr "rev-list 不支持显示注解" | |
21294 | ||
ec3d4607 | 21295 | #: builtin/rev-list.c:679 |
2b472aae JX |
21296 | msgid "marked counting is incompatible with --objects" |
21297 | msgstr "标记计数和 --objects 不兼容" | |
5809aa05 | 21298 | |
349ede6a | 21299 | #: builtin/rev-parse.c:409 |
814ff314 JX |
21300 | msgid "git rev-parse --parseopt [<options>] -- [<args>...]" |
21301 | msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]" | |
ef317cd5 | 21302 | |
349ede6a | 21303 | #: builtin/rev-parse.c:414 |
ef317cd5 | 21304 | msgid "keep the `--` passed as an arg" |
07432cef | 21305 | msgstr "保持 `--` 作为一个参数传递" |
ef317cd5 | 21306 | |
349ede6a | 21307 | #: builtin/rev-parse.c:416 |
ef317cd5 | 21308 | msgid "stop parsing after the first non-option argument" |
07432cef | 21309 | msgstr "遇到第一个非选项参数后停止解析" |
ef317cd5 | 21310 | |
349ede6a | 21311 | #: builtin/rev-parse.c:419 |
cfff71a9 JX |
21312 | msgid "output in stuck long form" |
21313 | msgstr "以固定长格式输出" | |
21314 | ||
ec3d4607 JX |
21315 | #: builtin/rev-parse.c:438 |
21316 | msgid "premature end of input" | |
21317 | msgstr "输入过早结束" | |
21318 | ||
21319 | #: builtin/rev-parse.c:442 | |
21320 | msgid "no usage string given before the `--' separator" | |
21321 | msgstr "在 `--' 分隔符之前没有给出使用方法字符串" | |
21322 | ||
21323 | #: builtin/rev-parse.c:548 | |
21324 | msgid "Needed a single revision" | |
21325 | msgstr "需要一个单独的版本" | |
21326 | ||
349ede6a | 21327 | #: builtin/rev-parse.c:552 |
ef317cd5 | 21328 | msgid "" |
814ff314 | 21329 | "git rev-parse --parseopt [<options>] -- [<args>...]\n" |
ef317cd5 | 21330 | " or: git rev-parse --sq-quote [<arg>...]\n" |
814ff314 | 21331 | " or: git rev-parse [<options>] [<arg>...]\n" |
ef317cd5 JX |
21332 | "\n" |
21333 | "Run \"git rev-parse --parseopt -h\" for more information on the first usage." | |
21334 | msgstr "" | |
814ff314 | 21335 | "git rev-parse --parseopt [<选项>] -- [<参数>...]\n" |
90314792 | 21336 | " 或者:git rev-parse --sq-quote [<参数>...]\n" |
814ff314 | 21337 | " 或者:git rev-parse [<选项>] [<参数>...]\n" |
07432cef WS |
21338 | "\n" |
21339 | "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" | |
ef317cd5 | 21340 | |
ec3d4607 JX |
21341 | #: builtin/rev-parse.c:712 |
21342 | msgid "--resolve-git-dir requires an argument" | |
21343 | msgstr "--resolve-git-dir 需要一个参数" | |
21344 | ||
21345 | #: builtin/rev-parse.c:715 | |
21346 | #, c-format | |
21347 | msgid "not a gitdir '%s'" | |
21348 | msgstr "不是一个git目录 '%s'" | |
21349 | ||
21350 | #: builtin/rev-parse.c:739 | |
21351 | msgid "--git-path requires an argument" | |
21352 | msgstr "--git-path 需要一个参数" | |
21353 | ||
21354 | #: builtin/rev-parse.c:749 | |
21355 | msgid "-n requires an argument" | |
21356 | msgstr "-n 需要一个参数" | |
21357 | ||
21358 | #: builtin/rev-parse.c:763 | |
21359 | msgid "--path-format requires an argument" | |
21360 | msgstr "--path-format 需要一个参数" | |
21361 | ||
21362 | #: builtin/rev-parse.c:769 | |
21363 | #, c-format | |
21364 | msgid "unknown argument to --path-format: %s" | |
21365 | msgstr "未知的 --path-format 参数:%s" | |
21366 | ||
21367 | #: builtin/rev-parse.c:776 | |
21368 | msgid "--default requires an argument" | |
21369 | msgstr "--default 需要一个参数" | |
21370 | ||
21371 | #: builtin/rev-parse.c:782 | |
21372 | msgid "--prefix requires an argument" | |
21373 | msgstr "--prefix 需要一个参数" | |
21374 | ||
21375 | #: builtin/rev-parse.c:851 | |
21376 | #, c-format | |
21377 | msgid "unknown mode for --abbrev-ref: %s" | |
21378 | msgstr "未知的 --abbrev-ref 模式:%s" | |
21379 | ||
21380 | #: builtin/rev-parse.c:1023 | |
21381 | #, c-format | |
21382 | msgid "unknown mode for --show-object-format: %s" | |
21383 | msgstr "未知的 --show-object-format 模式:%s" | |
21384 | ||
c1ac5258 | 21385 | #: builtin/revert.c:24 |
814ff314 JX |
21386 | msgid "git revert [<options>] <commit-ish>..." |
21387 | msgstr "git revert [<选项>] <提交号>..." | |
ef317cd5 | 21388 | |
c1ac5258 | 21389 | #: builtin/revert.c:25 |
ef317cd5 | 21390 | msgid "git revert <subcommand>" |
07432cef | 21391 | msgstr "git revert <子命令>" |
ef317cd5 | 21392 | |
c1ac5258 | 21393 | #: builtin/revert.c:30 |
814ff314 JX |
21394 | msgid "git cherry-pick [<options>] <commit-ish>..." |
21395 | msgstr "git cherry-pick [<选项>] <提交号>..." | |
ef317cd5 | 21396 | |
c1ac5258 | 21397 | #: builtin/revert.c:31 |
ef317cd5 | 21398 | msgid "git cherry-pick <subcommand>" |
07432cef | 21399 | msgstr "git cherry-pick <子命令>" |
ef317cd5 | 21400 | |
06991777 JX |
21401 | #: builtin/revert.c:72 |
21402 | #, c-format | |
21403 | msgid "option `%s' expects a number greater than zero" | |
21404 | msgstr "选项 `%s' 期望一个大于零的数字" | |
21405 | ||
21406 | #: builtin/revert.c:92 | |
ef317cd5 JX |
21407 | #, c-format |
21408 | msgid "%s: %s cannot be used with %s" | |
21409 | msgstr "%s:%s 不能和 %s 同时使用" | |
21410 | ||
d46c5519 | 21411 | #: builtin/revert.c:102 |
ef317cd5 | 21412 | msgid "end revert or cherry-pick sequence" |
07432cef | 21413 | msgstr "终止反转或拣选操作" |
ef317cd5 | 21414 | |
d46c5519 | 21415 | #: builtin/revert.c:103 |
ef317cd5 | 21416 | msgid "resume revert or cherry-pick sequence" |
07432cef | 21417 | msgstr "继续反转或拣选操作" |
ef317cd5 | 21418 | |
d46c5519 | 21419 | #: builtin/revert.c:104 |
ef317cd5 | 21420 | msgid "cancel revert or cherry-pick sequence" |
07432cef | 21421 | msgstr "取消反转或拣选操作" |
ef317cd5 | 21422 | |
a6cd2cc4 JX |
21423 | #: builtin/revert.c:105 |
21424 | msgid "skip current commit and continue" | |
21425 | msgstr "跳过当前提交并继续" | |
21426 | ||
21427 | #: builtin/revert.c:107 | |
ef317cd5 | 21428 | msgid "don't automatically commit" |
07432cef | 21429 | msgstr "不要自动提交" |
ef317cd5 | 21430 | |
a6cd2cc4 | 21431 | #: builtin/revert.c:108 |
ef317cd5 | 21432 | msgid "edit the commit message" |
07432cef | 21433 | msgstr "编辑提交说明" |
ef317cd5 | 21434 | |
a6cd2cc4 | 21435 | #: builtin/revert.c:111 |
87cb7997 | 21436 | msgid "parent-number" |
07432cef | 21437 | msgstr "父编号" |
ef317cd5 | 21438 | |
a6cd2cc4 | 21439 | #: builtin/revert.c:112 |
87cb7997 JX |
21440 | msgid "select mainline parent" |
21441 | msgstr "选择主干父提交编号" | |
21442 | ||
a6cd2cc4 | 21443 | #: builtin/revert.c:114 |
ef317cd5 | 21444 | msgid "merge strategy" |
07432cef | 21445 | msgstr "合并策略" |
ef317cd5 | 21446 | |
a6cd2cc4 | 21447 | #: builtin/revert.c:116 |
ef317cd5 | 21448 | msgid "option for merge strategy" |
07432cef | 21449 | msgstr "合并策略的选项" |
ef317cd5 | 21450 | |
a6cd2cc4 | 21451 | #: builtin/revert.c:125 |
ef317cd5 | 21452 | msgid "append commit name" |
07432cef | 21453 | msgstr "追加提交名称" |
ef317cd5 | 21454 | |
a6cd2cc4 | 21455 | #: builtin/revert.c:127 |
ef317cd5 | 21456 | msgid "preserve initially empty commits" |
07432cef | 21457 | msgstr "保留初始化的空提交" |
ef317cd5 | 21458 | |
a6cd2cc4 | 21459 | #: builtin/revert.c:129 |
ef317cd5 | 21460 | msgid "keep redundant, empty commits" |
07432cef | 21461 | msgstr "保持多余的、空的提交" |
ef317cd5 | 21462 | |
33b62fba | 21463 | #: builtin/revert.c:237 |
c04f5ac3 JX |
21464 | msgid "revert failed" |
21465 | msgstr "还原失败" | |
21466 | ||
33b62fba | 21467 | #: builtin/revert.c:250 |
c04f5ac3 JX |
21468 | msgid "cherry-pick failed" |
21469 | msgstr "拣选失败" | |
21470 | ||
33b62fba | 21471 | #: builtin/rm.c:20 |
814ff314 JX |
21472 | msgid "git rm [<options>] [--] <file>..." |
21473 | msgstr "git rm [<选项>] [--] <文件>..." | |
07432cef | 21474 | |
33b62fba | 21475 | #: builtin/rm.c:208 |
c04f5ac3 | 21476 | msgid "" |
2e8451e8 JX |
21477 | "the following file has staged content different from both the\n" |
21478 | "file and the HEAD:" | |
21479 | msgid_plural "" | |
21480 | "the following files have staged content different from both the\n" | |
21481 | "file and the HEAD:" | |
21482 | msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
21483 | msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:" | |
21484 | ||
33b62fba | 21485 | #: builtin/rm.c:213 |
2e8451e8 JX |
21486 | msgid "" |
21487 | "\n" | |
c04f5ac3 JX |
21488 | "(use -f to force removal)" |
21489 | msgstr "" | |
2e8451e8 | 21490 | "\n" |
c04f5ac3 JX |
21491 | "(使用 -f 强制删除)" |
21492 | ||
33b62fba | 21493 | #: builtin/rm.c:217 |
2e8451e8 JX |
21494 | msgid "the following file has changes staged in the index:" |
21495 | msgid_plural "the following files have changes staged in the index:" | |
160fb2b2 JX |
21496 | msgstr[0] "下列文件索引中有变更" |
21497 | msgstr[1] "下列文件索引中有变更" | |
c04f5ac3 | 21498 | |
33b62fba | 21499 | #: builtin/rm.c:221 builtin/rm.c:230 |
c04f5ac3 | 21500 | msgid "" |
2e8451e8 | 21501 | "\n" |
c04f5ac3 JX |
21502 | "(use --cached to keep the file, or -f to force removal)" |
21503 | msgstr "" | |
2e8451e8 JX |
21504 | "\n" |
21505 | "(使用 --cached 保留本地文件,或用 -f 强制删除)" | |
21506 | ||
33b62fba | 21507 | #: builtin/rm.c:227 |
2e8451e8 JX |
21508 | msgid "the following file has local modifications:" |
21509 | msgid_plural "the following files have local modifications:" | |
21510 | msgstr[0] "如下文件有本地修改:" | |
21511 | msgstr[1] "如下文件有本地修改:" | |
c04f5ac3 | 21512 | |
33b62fba | 21513 | #: builtin/rm.c:244 |
ef317cd5 | 21514 | msgid "do not list removed files" |
07432cef | 21515 | msgstr "不列出删除的文件" |
ef317cd5 | 21516 | |
33b62fba | 21517 | #: builtin/rm.c:245 |
ef317cd5 | 21518 | msgid "only remove from the index" |
07432cef | 21519 | msgstr "只从索引区删除" |
ef317cd5 | 21520 | |
33b62fba | 21521 | #: builtin/rm.c:246 |
ef317cd5 | 21522 | msgid "override the up-to-date check" |
07432cef | 21523 | msgstr "忽略文件更新状态检查" |
ef317cd5 | 21524 | |
33b62fba | 21525 | #: builtin/rm.c:247 |
ef317cd5 | 21526 | msgid "allow recursive removal" |
07432cef | 21527 | msgstr "允许递归删除" |
ef317cd5 | 21528 | |
33b62fba | 21529 | #: builtin/rm.c:249 |
ef317cd5 | 21530 | msgid "exit with a zero status even if nothing matched" |
07432cef | 21531 | msgstr "即使没有匹配,也以零状态退出" |
ef317cd5 | 21532 | |
33b62fba | 21533 | #: builtin/rm.c:283 |
2b472aae | 21534 | msgid "No pathspec was given. Which files should I remove?" |
440e7442 | 21535 | msgstr "没有提供路径规格。我应该删除哪些文件?" |
2b472aae | 21536 | |
33b62fba | 21537 | #: builtin/rm.c:310 |
c1ac5258 JX |
21538 | msgid "please stage your changes to .gitmodules or stash them to proceed" |
21539 | msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" | |
21540 | ||
33b62fba | 21541 | #: builtin/rm.c:331 |
c04f5ac3 JX |
21542 | #, c-format |
21543 | msgid "not removing '%s' recursively without -r" | |
21544 | msgstr "未提供 -r 选项不会递归删除 '%s'" | |
21545 | ||
33b62fba | 21546 | #: builtin/rm.c:379 |
c04f5ac3 JX |
21547 | #, c-format |
21548 | msgid "git rm: unable to remove %s" | |
21549 | msgstr "git rm:不能删除 %s" | |
21550 | ||
fd8cb379 | 21551 | #: builtin/send-pack.c:20 |
1b7f4a34 JX |
21552 | msgid "" |
21553 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
21554 | "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " | |
21555 | "[<ref>...]\n" | |
21556 | " --all and explicit <ref> specification are mutually exclusive." | |
21557 | msgstr "" | |
21558 | "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" | |
21559 | "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" | |
21560 | " --all 和明确的 <引用> 互斥。" | |
21561 | ||
d13389bf | 21562 | #: builtin/send-pack.c:188 |
1b7f4a34 JX |
21563 | msgid "remote name" |
21564 | msgstr "远程名称" | |
21565 | ||
d13389bf | 21566 | #: builtin/send-pack.c:201 |
1b7f4a34 JX |
21567 | msgid "use stateless RPC protocol" |
21568 | msgstr "使用无状态的 RPC 协议" | |
21569 | ||
d13389bf | 21570 | #: builtin/send-pack.c:202 |
1b7f4a34 JX |
21571 | msgid "read refs from stdin" |
21572 | msgstr "从标准输入读取引用" | |
21573 | ||
d13389bf | 21574 | #: builtin/send-pack.c:203 |
1b7f4a34 JX |
21575 | msgid "print status from remote helper" |
21576 | msgstr "打印来自远程 helper 的状态" | |
21577 | ||
d13389bf | 21578 | #: builtin/shortlog.c:16 |
fd8cb379 JX |
21579 | msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |
21580 | msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" | |
21581 | ||
d13389bf | 21582 | #: builtin/shortlog.c:17 |
fd8cb379 JX |
21583 | msgid "git log --pretty=short | git shortlog [<options>]" |
21584 | msgstr "git log --pretty=short | git shortlog [<选项>]" | |
ef317cd5 | 21585 | |
473eb541 | 21586 | #: builtin/shortlog.c:123 |
d9488fea JX |
21587 | msgid "using multiple --group options with stdin is not supported" |
21588 | msgstr "不支持和标准输入一起使用多个 --group 选项" | |
21589 | ||
473eb541 | 21590 | #: builtin/shortlog.c:133 |
d9488fea JX |
21591 | msgid "using --group=trailer with stdin is not supported" |
21592 | msgstr "不支持和标准输入一起使用 --group=trailer" | |
21593 | ||
473eb541 | 21594 | #: builtin/shortlog.c:323 |
d9488fea JX |
21595 | #, c-format |
21596 | msgid "unknown group type: %s" | |
21597 | msgstr "未知分组类型:%s" | |
21598 | ||
473eb541 JX |
21599 | #: builtin/shortlog.c:351 |
21600 | msgid "group by committer rather than author" | |
21601 | msgstr "按照提交者而不是作者分组" | |
1a79b2f1 | 21602 | |
473eb541 | 21603 | #: builtin/shortlog.c:354 |
ef317cd5 | 21604 | msgid "sort output according to the number of commits per author" |
07432cef | 21605 | msgstr "根据每个作者的提交数量排序" |
ef317cd5 | 21606 | |
473eb541 JX |
21607 | #: builtin/shortlog.c:356 |
21608 | msgid "suppress commit descriptions, only provides commit count" | |
21609 | msgstr "抑制提交描述,只提供提交数量" | |
ef317cd5 | 21610 | |
473eb541 JX |
21611 | #: builtin/shortlog.c:358 |
21612 | msgid "show the email address of each author" | |
07432cef | 21613 | msgstr "显示每个作者的电子邮件地址" |
ef317cd5 | 21614 | |
473eb541 | 21615 | #: builtin/shortlog.c:359 |
c1ac5258 JX |
21616 | msgid "<w>[,<i1>[,<i2>]]" |
21617 | msgstr "<w>[,<i1>[,<i2>]]" | |
ef317cd5 | 21618 | |
473eb541 JX |
21619 | #: builtin/shortlog.c:360 |
21620 | msgid "linewrap output" | |
07432cef | 21621 | msgstr "折行输出" |
ef317cd5 | 21622 | |
473eb541 | 21623 | #: builtin/shortlog.c:362 |
d9488fea JX |
21624 | msgid "field" |
21625 | msgstr "字段" | |
21626 | ||
473eb541 JX |
21627 | #: builtin/shortlog.c:363 |
21628 | msgid "group by field" | |
d9488fea JX |
21629 | msgstr "按字段分组" |
21630 | ||
473eb541 | 21631 | #: builtin/shortlog.c:391 |
fd8cb379 JX |
21632 | msgid "too many arguments given outside repository" |
21633 | msgstr "仓库外执行提供了太多的参数" | |
21634 | ||
c1ac5258 | 21635 | #: builtin/show-branch.c:13 |
ef317cd5 | 21636 | msgid "" |
814ff314 | 21637 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
21638 | "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" |
21639 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
21640 | "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" | |
ef317cd5 | 21641 | msgstr "" |
814ff314 | 21642 | "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" |
1e607449 JX |
21643 | "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" |
21644 | "\t\t[--more=<n> | --list | --independent | --merge-base]\n" | |
21645 | "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" | |
ef317cd5 | 21646 | |
c1ac5258 | 21647 | #: builtin/show-branch.c:17 |
814ff314 | 21648 | msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" |
58b6f078 | 21649 | msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" |
ef317cd5 | 21650 | |
c1ac5258 | 21651 | #: builtin/show-branch.c:395 |
a0b6b246 JX |
21652 | #, c-format |
21653 | msgid "ignoring %s; cannot handle more than %d ref" | |
21654 | msgid_plural "ignoring %s; cannot handle more than %d refs" | |
21655 | msgstr[0] "忽略 %s,无法处理 %d 个以上的引用" | |
21656 | msgstr[1] "忽略 %s,无法处理 %d 个以上的引用" | |
21657 | ||
a6cd2cc4 | 21658 | #: builtin/show-branch.c:548 |
a0b6b246 JX |
21659 | #, c-format |
21660 | msgid "no matching refs with %s" | |
21661 | msgstr "没有和 %s 匹配的引用" | |
21662 | ||
a6cd2cc4 | 21663 | #: builtin/show-branch.c:645 |
ef317cd5 | 21664 | msgid "show remote-tracking and local branches" |
07432cef | 21665 | msgstr "显示远程跟踪的和本地的分支" |
ef317cd5 | 21666 | |
a6cd2cc4 | 21667 | #: builtin/show-branch.c:647 |
ef317cd5 | 21668 | msgid "show remote-tracking branches" |
07432cef | 21669 | msgstr "显示远程跟踪的分支" |
ef317cd5 | 21670 | |
a6cd2cc4 | 21671 | #: builtin/show-branch.c:649 |
ef317cd5 | 21672 | msgid "color '*!+-' corresponding to the branch" |
07432cef | 21673 | msgstr "着色 '*!+-' 到相应的分支" |
ef317cd5 | 21674 | |
a6cd2cc4 | 21675 | #: builtin/show-branch.c:651 |
ef317cd5 | 21676 | msgid "show <n> more commits after the common ancestor" |
07432cef | 21677 | msgstr "显示共同祖先后的 <n> 个提交" |
ef317cd5 | 21678 | |
a6cd2cc4 | 21679 | #: builtin/show-branch.c:653 |
ef317cd5 | 21680 | msgid "synonym to more=-1" |
07432cef | 21681 | msgstr "和 more=-1 同义" |
ef317cd5 | 21682 | |
a6cd2cc4 | 21683 | #: builtin/show-branch.c:654 |
ef317cd5 | 21684 | msgid "suppress naming strings" |
07432cef | 21685 | msgstr "不显示字符串命名" |
ef317cd5 | 21686 | |
a6cd2cc4 | 21687 | #: builtin/show-branch.c:656 |
ef317cd5 | 21688 | msgid "include the current branch" |
07432cef | 21689 | msgstr "包括当前分支" |
ef317cd5 | 21690 | |
a6cd2cc4 | 21691 | #: builtin/show-branch.c:658 |
ef317cd5 | 21692 | msgid "name commits with their object names" |
07432cef | 21693 | msgstr "以对象名字命名提交" |
ef317cd5 | 21694 | |
a6cd2cc4 | 21695 | #: builtin/show-branch.c:660 |
ef317cd5 | 21696 | msgid "show possible merge bases" |
07432cef | 21697 | msgstr "显示可能合并的基线" |
ef317cd5 | 21698 | |
a6cd2cc4 | 21699 | #: builtin/show-branch.c:662 |
ef317cd5 | 21700 | msgid "show refs unreachable from any other ref" |
07432cef | 21701 | msgstr "显示没有任何引用的的引用" |
ef317cd5 | 21702 | |
a6cd2cc4 | 21703 | #: builtin/show-branch.c:664 |
ef317cd5 | 21704 | msgid "show commits in topological order" |
07432cef | 21705 | msgstr "以拓扑顺序显示提交" |
ef317cd5 | 21706 | |
a6cd2cc4 | 21707 | #: builtin/show-branch.c:667 |
ef317cd5 | 21708 | msgid "show only commits not on the first branch" |
07432cef | 21709 | msgstr "只显示不在第一个分支上的提交" |
ef317cd5 | 21710 | |
a6cd2cc4 | 21711 | #: builtin/show-branch.c:669 |
ef317cd5 | 21712 | msgid "show merges reachable from only one tip" |
07432cef | 21713 | msgstr "显示仅一个分支可访问的合并提交" |
ef317cd5 | 21714 | |
a6cd2cc4 | 21715 | #: builtin/show-branch.c:671 |
2e8451e8 JX |
21716 | msgid "topologically sort, maintaining date order where possible" |
21717 | msgstr "拓扑方式排序,并尽可能地保持日期顺序" | |
ef317cd5 | 21718 | |
a6cd2cc4 | 21719 | #: builtin/show-branch.c:674 |
ef317cd5 | 21720 | msgid "<n>[,<base>]" |
07432cef | 21721 | msgstr "<n>[,<base>]" |
ef317cd5 | 21722 | |
a6cd2cc4 | 21723 | #: builtin/show-branch.c:675 |
ef317cd5 | 21724 | msgid "show <n> most recent ref-log entries starting at base" |
58b6f078 | 21725 | msgstr "显示从起始点开始的 <n> 条最近的引用日志记录" |
ef317cd5 | 21726 | |
a6cd2cc4 | 21727 | #: builtin/show-branch.c:711 |
a0b6b246 JX |
21728 | msgid "" |
21729 | "--reflog is incompatible with --all, --remotes, --independent or --merge-base" | |
21730 | msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容" | |
21731 | ||
a6cd2cc4 | 21732 | #: builtin/show-branch.c:735 |
a0b6b246 JX |
21733 | msgid "no branches given, and HEAD is not valid" |
21734 | msgstr "未提供分支,且 HEAD 无效" | |
21735 | ||
a6cd2cc4 | 21736 | #: builtin/show-branch.c:738 |
a0b6b246 JX |
21737 | msgid "--reflog option needs one branch name" |
21738 | msgstr "选项 --reflog 需要一个分支名" | |
21739 | ||
a6cd2cc4 | 21740 | #: builtin/show-branch.c:741 |
a0b6b246 JX |
21741 | #, c-format |
21742 | msgid "only %d entry can be shown at one time." | |
21743 | msgid_plural "only %d entries can be shown at one time." | |
21744 | msgstr[0] "一次只能显示 %d 个条目。" | |
21745 | msgstr[1] "一次只能显示 %d 个条目。" | |
21746 | ||
a6cd2cc4 | 21747 | #: builtin/show-branch.c:745 |
a0b6b246 JX |
21748 | #, c-format |
21749 | msgid "no such ref %s" | |
21750 | msgstr "无此引用 %s" | |
21751 | ||
a6cd2cc4 | 21752 | #: builtin/show-branch.c:831 |
a0b6b246 JX |
21753 | #, c-format |
21754 | msgid "cannot handle more than %d rev." | |
21755 | msgid_plural "cannot handle more than %d revs." | |
21756 | msgstr[0] "不能处理 %d 个以上的版本。" | |
21757 | msgstr[1] "不能处理 %d 个以上的版本。" | |
21758 | ||
a6cd2cc4 | 21759 | #: builtin/show-branch.c:835 |
a0b6b246 JX |
21760 | #, c-format |
21761 | msgid "'%s' is not a valid ref." | |
21762 | msgstr "'%s' 不是一个有效的引用。" | |
21763 | ||
a6cd2cc4 | 21764 | #: builtin/show-branch.c:838 |
a0b6b246 JX |
21765 | #, c-format |
21766 | msgid "cannot find commit %s (%s)" | |
29004bbb | 21767 | msgstr "不能找到提交 %s(%s)" |
a0b6b246 | 21768 | |
7157c2b5 JX |
21769 | #: builtin/show-index.c:21 |
21770 | msgid "hash-algorithm" | |
21771 | msgstr "哈希算法" | |
21772 | ||
21773 | #: builtin/show-index.c:31 | |
21774 | msgid "Unknown hash algorithm" | |
21775 | msgstr "未知的哈希算法" | |
21776 | ||
d46c5519 | 21777 | #: builtin/show-ref.c:12 |
ef317cd5 | 21778 | msgid "" |
814ff314 JX |
21779 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
21780 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" | |
ef317cd5 | 21781 | msgstr "" |
814ff314 JX |
21782 | "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" |
21783 | "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" | |
ef317cd5 | 21784 | |
d46c5519 | 21785 | #: builtin/show-ref.c:13 |
94550ed3 JX |
21786 | msgid "git show-ref --exclude-existing[=<pattern>]" |
21787 | msgstr "git show-ref --exclude-existing[=<模式>]" | |
ef317cd5 | 21788 | |
d46c5519 | 21789 | #: builtin/show-ref.c:162 |
ef317cd5 | 21790 | msgid "only show tags (can be combined with heads)" |
55a16ee4 | 21791 | msgstr "只显示标签(可以和头共用)" |
ef317cd5 | 21792 | |
d46c5519 | 21793 | #: builtin/show-ref.c:163 |
ef317cd5 | 21794 | msgid "only show heads (can be combined with tags)" |
55a16ee4 | 21795 | msgstr "只显示头(可以和标签共用)" |
ef317cd5 | 21796 | |
d46c5519 | 21797 | #: builtin/show-ref.c:164 |
ef317cd5 | 21798 | msgid "stricter reference checking, requires exact ref path" |
07432cef | 21799 | msgstr "更严格的引用检测,需要精确的引用路径" |
ef317cd5 | 21800 | |
d46c5519 | 21801 | #: builtin/show-ref.c:167 builtin/show-ref.c:169 |
2e8451e8 JX |
21802 | msgid "show the HEAD reference, even if it would be filtered out" |
21803 | msgstr "显示 HEAD 引用,即使被过滤掉" | |
ef317cd5 | 21804 | |
d46c5519 | 21805 | #: builtin/show-ref.c:171 |
ef317cd5 | 21806 | msgid "dereference tags into object IDs" |
4375c10e | 21807 | msgstr "转换标签到对象 ID" |
ef317cd5 | 21808 | |
d46c5519 JX |
21809 | #: builtin/show-ref.c:173 |
21810 | msgid "only show SHA1 hash using <n> digits" | |
21811 | msgstr "只显示使用 <n> 个数字的 SHA1 哈希" | |
21812 | ||
21813 | #: builtin/show-ref.c:177 | |
21814 | msgid "do not print results to stdout (useful with --verify)" | |
21815 | msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" | |
21816 | ||
21817 | #: builtin/show-ref.c:179 | |
21818 | msgid "show refs from stdin that aren't in local repository" | |
21819 | msgstr "显示从标准输入中读入的不在本地仓库中的引用" | |
21820 | ||
33b62fba | 21821 | #: builtin/sparse-checkout.c:22 |
349ede6a JX |
21822 | msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" |
21823 | msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>" | |
ddc12c42 | 21824 | |
33b62fba | 21825 | #: builtin/sparse-checkout.c:46 |
d9488fea JX |
21826 | msgid "git sparse-checkout list" |
21827 | msgstr "git sparse-checkout list" | |
21828 | ||
33b62fba | 21829 | #: builtin/sparse-checkout.c:72 |
ddc12c42 JX |
21830 | msgid "this worktree is not sparse (sparse-checkout file may not exist)" |
21831 | msgstr "本工作区不是稀疏模式(稀疏检出文件可能不存在)" | |
21832 | ||
33b62fba | 21833 | #: builtin/sparse-checkout.c:227 |
2b472aae JX |
21834 | msgid "failed to create directory for sparse-checkout file" |
21835 | msgstr "无法为稀疏检出文件创建目录" | |
21836 | ||
33b62fba | 21837 | #: builtin/sparse-checkout.c:268 |
7157c2b5 JX |
21838 | msgid "unable to upgrade repository format to enable worktreeConfig" |
21839 | msgstr "无法升级仓库格式以启用 worktreeConfig" | |
21840 | ||
33b62fba | 21841 | #: builtin/sparse-checkout.c:270 |
ddc12c42 JX |
21842 | msgid "failed to set extensions.worktreeConfig setting" |
21843 | msgstr "无法设置 extensions.worktreeConfig" | |
21844 | ||
33b62fba JX |
21845 | #: builtin/sparse-checkout.c:290 |
21846 | msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" | |
21847 | msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" | |
ddc12c42 | 21848 | |
33b62fba | 21849 | #: builtin/sparse-checkout.c:310 |
ddc12c42 JX |
21850 | msgid "initialize the sparse-checkout in cone mode" |
21851 | msgstr "初始化稀疏检出为 cone 模式" | |
21852 | ||
33b62fba JX |
21853 | #: builtin/sparse-checkout.c:312 |
21854 | msgid "toggle the use of a sparse index" | |
21855 | msgstr "切换稀疏索引的使用" | |
21856 | ||
21857 | #: builtin/sparse-checkout.c:340 | |
21858 | msgid "failed to modify sparse-index config" | |
21859 | msgstr "无法修改 sparse-index 配置" | |
21860 | ||
21861 | #: builtin/sparse-checkout.c:361 | |
ddc12c42 JX |
21862 | #, c-format |
21863 | msgid "failed to open '%s'" | |
21864 | msgstr "无法打开 '%s'" | |
21865 | ||
ec3d4607 | 21866 | #: builtin/sparse-checkout.c:413 |
2b472aae JX |
21867 | #, c-format |
21868 | msgid "could not normalize path %s" | |
21869 | msgstr "无法规范化路径 %s" | |
21870 | ||
ec3d4607 | 21871 | #: builtin/sparse-checkout.c:425 |
2b472aae JX |
21872 | msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" |
21873 | msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" | |
21874 | ||
ec3d4607 | 21875 | #: builtin/sparse-checkout.c:450 |
2b472aae JX |
21876 | #, c-format |
21877 | msgid "unable to unquote C-style string '%s'" | |
440e7442 | 21878 | msgstr "无法为 C 语言风格的字符串 '%s' 去引号" |
2b472aae | 21879 | |
ec3d4607 | 21880 | #: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528 |
2b472aae JX |
21881 | msgid "unable to load existing sparse-checkout patterns" |
21882 | msgstr "无法加载现存的稀疏检出模式" | |
ddc12c42 | 21883 | |
ec3d4607 | 21884 | #: builtin/sparse-checkout.c:573 |
ddc12c42 JX |
21885 | msgid "read patterns from standard in" |
21886 | msgstr "从标准输入读取模式" | |
21887 | ||
ec3d4607 | 21888 | #: builtin/sparse-checkout.c:588 |
d9488fea JX |
21889 | msgid "git sparse-checkout reapply" |
21890 | msgstr "git sparse-checkout reapply" | |
21891 | ||
ec3d4607 | 21892 | #: builtin/sparse-checkout.c:607 |
d9488fea JX |
21893 | msgid "git sparse-checkout disable" |
21894 | msgstr "git sparse-checkout disable" | |
21895 | ||
ec3d4607 | 21896 | #: builtin/sparse-checkout.c:638 |
ddc12c42 JX |
21897 | msgid "error while refreshing working directory" |
21898 | msgstr "刷新工作目录时出错" | |
21899 | ||
33b62fba | 21900 | #: builtin/stash.c:24 builtin/stash.c:40 |
d46c5519 JX |
21901 | msgid "git stash list [<options>]" |
21902 | msgstr "git stash list [<选项>]" | |
21903 | ||
33b62fba | 21904 | #: builtin/stash.c:25 builtin/stash.c:45 |
d46c5519 JX |
21905 | msgid "git stash show [<options>] [<stash>]" |
21906 | msgstr "git stash show [<选项>] [<stash>]" | |
21907 | ||
33b62fba | 21908 | #: builtin/stash.c:26 builtin/stash.c:50 |
d46c5519 JX |
21909 | msgid "git stash drop [-q|--quiet] [<stash>]" |
21910 | msgstr "git stash drop [-q|--quiet] [<stash>]" | |
21911 | ||
33b62fba | 21912 | #: builtin/stash.c:27 |
d46c5519 JX |
21913 | msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" |
21914 | msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" | |
21915 | ||
33b62fba | 21916 | #: builtin/stash.c:28 builtin/stash.c:65 |
d46c5519 JX |
21917 | msgid "git stash branch <branchname> [<stash>]" |
21918 | msgstr "git stash branch <分支名> [<stash>]" | |
21919 | ||
33b62fba | 21920 | #: builtin/stash.c:30 |
d46c5519 JX |
21921 | msgid "" |
21922 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21923 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
2b472aae | 21924 | " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" |
d46c5519 JX |
21925 | " [--] [<pathspec>...]]" |
21926 | msgstr "" | |
21927 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21928 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
2b472aae | 21929 | " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" |
d46c5519 JX |
21930 | " [--] [<路径规格>...]]" |
21931 | ||
33b62fba | 21932 | #: builtin/stash.c:34 builtin/stash.c:87 |
d46c5519 JX |
21933 | msgid "" |
21934 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21935 | " [-u|--include-untracked] [-a|--all] [<message>]" | |
21936 | msgstr "" | |
21937 | "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21938 | " [-u|--include-untracked] [-a|--all] [<消息>]" | |
21939 | ||
33b62fba | 21940 | #: builtin/stash.c:55 |
d46c5519 JX |
21941 | msgid "git stash pop [--index] [-q|--quiet] [<stash>]" |
21942 | msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" | |
21943 | ||
33b62fba | 21944 | #: builtin/stash.c:60 |
d46c5519 JX |
21945 | msgid "git stash apply [--index] [-q|--quiet] [<stash>]" |
21946 | msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" | |
21947 | ||
33b62fba | 21948 | #: builtin/stash.c:75 |
d46c5519 JX |
21949 | msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" |
21950 | msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" | |
21951 | ||
33b62fba | 21952 | #: builtin/stash.c:80 |
2b472aae JX |
21953 | msgid "" |
21954 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21955 | " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" | |
21956 | " [--] [<pathspec>...]]" | |
21957 | msgstr "" | |
21958 | "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" | |
21959 | " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" | |
21960 | " [--] [<路径规格>...]]" | |
21961 | ||
33b62fba | 21962 | #: builtin/stash.c:130 |
d46c5519 JX |
21963 | #, c-format |
21964 | msgid "'%s' is not a stash-like commit" | |
21965 | msgstr "'%s' 不像是一个贮藏提交" | |
21966 | ||
33b62fba | 21967 | #: builtin/stash.c:150 |
d46c5519 JX |
21968 | #, c-format |
21969 | msgid "Too many revisions specified:%s" | |
21970 | msgstr "指定了太多的版本:%s" | |
21971 | ||
33b62fba | 21972 | #: builtin/stash.c:164 |
d46c5519 JX |
21973 | msgid "No stash entries found." |
21974 | msgstr "未发现贮藏条目。" | |
21975 | ||
33b62fba | 21976 | #: builtin/stash.c:178 |
d46c5519 JX |
21977 | #, c-format |
21978 | msgid "%s is not a valid reference" | |
21979 | msgstr "%s 不是一个有效的引用名" | |
21980 | ||
33b62fba | 21981 | #: builtin/stash.c:227 |
473eb541 | 21982 | msgid "git stash clear with arguments is unimplemented" |
d46c5519 JX |
21983 | msgstr "git stash clear 不支持参数" |
21984 | ||
33b62fba | 21985 | #: builtin/stash.c:431 |
473eb541 JX |
21986 | #, c-format |
21987 | msgid "" | |
21988 | "WARNING: Untracked file in way of tracked file! Renaming\n" | |
21989 | " %s -> %s\n" | |
21990 | " to make room.\n" | |
21991 | msgstr "" | |
21992 | "警告:未跟踪文件出现在跟踪文件的路径上!重命名\n" | |
21993 | " %s -> %s\n" | |
21994 | " 以腾出空间。\n" | |
21995 | ||
33b62fba | 21996 | #: builtin/stash.c:492 |
d46c5519 | 21997 | msgid "cannot apply a stash in the middle of a merge" |
349ede6a | 21998 | msgstr "无法在合并过程中应用贮藏" |
d46c5519 | 21999 | |
33b62fba | 22000 | #: builtin/stash.c:503 |
d46c5519 JX |
22001 | #, c-format |
22002 | msgid "could not generate diff %s^!." | |
22003 | msgstr "无法生成差异 %s^!." | |
22004 | ||
33b62fba | 22005 | #: builtin/stash.c:510 |
d13389bf | 22006 | msgid "conflicts in index. Try without --index." |
d46c5519 JX |
22007 | msgstr "索引中有冲突。尝试不用 --index。" |
22008 | ||
33b62fba | 22009 | #: builtin/stash.c:516 |
d46c5519 JX |
22010 | msgid "could not save index tree" |
22011 | msgstr "不能保存索引树" | |
22012 | ||
33b62fba | 22013 | #: builtin/stash.c:525 |
d46c5519 JX |
22014 | msgid "could not restore untracked files from stash" |
22015 | msgstr "无法从贮藏条目中恢复未跟踪文件" | |
22016 | ||
33b62fba | 22017 | #: builtin/stash.c:539 |
d46c5519 JX |
22018 | #, c-format |
22019 | msgid "Merging %s with %s" | |
22020 | msgstr "正在合并 %s 和 %s" | |
22021 | ||
33b62fba | 22022 | #: builtin/stash.c:549 |
d46c5519 JX |
22023 | msgid "Index was not unstashed." |
22024 | msgstr "索引未从贮藏中恢复。" | |
22025 | ||
33b62fba | 22026 | #: builtin/stash.c:591 builtin/stash.c:689 |
d46c5519 JX |
22027 | msgid "attempt to recreate the index" |
22028 | msgstr "尝试重建索引" | |
22029 | ||
33b62fba | 22030 | #: builtin/stash.c:635 |
d46c5519 JX |
22031 | #, c-format |
22032 | msgid "Dropped %s (%s)" | |
22033 | msgstr "丢弃了 %s(%s)" | |
22034 | ||
33b62fba | 22035 | #: builtin/stash.c:638 |
d46c5519 JX |
22036 | #, c-format |
22037 | msgid "%s: Could not drop stash entry" | |
22038 | msgstr "%s:无法丢弃贮藏条目" | |
22039 | ||
33b62fba | 22040 | #: builtin/stash.c:651 |
d46c5519 JX |
22041 | #, c-format |
22042 | msgid "'%s' is not a stash reference" | |
22043 | msgstr "'%s' 不是一个贮藏引用" | |
22044 | ||
33b62fba | 22045 | #: builtin/stash.c:701 |
d46c5519 JX |
22046 | msgid "The stash entry is kept in case you need it again." |
22047 | msgstr "贮藏条目被保留以备您再次需要。" | |
22048 | ||
33b62fba | 22049 | #: builtin/stash.c:724 |
d46c5519 JX |
22050 | msgid "No branch name specified" |
22051 | msgstr "未指定分支名" | |
22052 | ||
33b62fba JX |
22053 | #: builtin/stash.c:808 |
22054 | msgid "failed to parse tree" | |
22055 | msgstr "无法解析树" | |
22056 | ||
22057 | #: builtin/stash.c:819 | |
22058 | msgid "failed to unpack trees" | |
22059 | msgstr "无法解包目录树" | |
22060 | ||
22061 | #: builtin/stash.c:839 | |
22062 | msgid "include untracked files in the stash" | |
22063 | msgstr "在贮藏中包含未跟踪文件" | |
22064 | ||
22065 | #: builtin/stash.c:842 | |
22066 | msgid "only show untracked files in the stash" | |
22067 | msgstr "仅显示贮藏中的未跟踪文件" | |
22068 | ||
ec3d4607 | 22069 | #: builtin/stash.c:929 builtin/stash.c:966 |
d46c5519 JX |
22070 | #, c-format |
22071 | msgid "Cannot update %s with %s" | |
22072 | msgstr "无法用 %2$s 更新 %1$s" | |
22073 | ||
ec3d4607 | 22074 | #: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667 |
d46c5519 JX |
22075 | msgid "stash message" |
22076 | msgstr "贮藏说明" | |
22077 | ||
ec3d4607 | 22078 | #: builtin/stash.c:957 |
d46c5519 JX |
22079 | msgid "\"git stash store\" requires one <commit> argument" |
22080 | msgstr "\"git stash store\" 需要一个 <提交> 参数" | |
22081 | ||
ec3d4607 | 22082 | #: builtin/stash.c:1171 |
d46c5519 JX |
22083 | msgid "No changes selected" |
22084 | msgstr "没有选择变更" | |
22085 | ||
ec3d4607 | 22086 | #: builtin/stash.c:1271 |
d46c5519 JX |
22087 | msgid "You do not have the initial commit yet" |
22088 | msgstr "您尚未建立初始提交" | |
22089 | ||
ec3d4607 | 22090 | #: builtin/stash.c:1298 |
d46c5519 JX |
22091 | msgid "Cannot save the current index state" |
22092 | msgstr "无法保存当前索引状态" | |
22093 | ||
ec3d4607 | 22094 | #: builtin/stash.c:1307 |
d46c5519 JX |
22095 | msgid "Cannot save the untracked files" |
22096 | msgstr "无法保存未跟踪文件" | |
22097 | ||
ec3d4607 | 22098 | #: builtin/stash.c:1318 builtin/stash.c:1327 |
d46c5519 JX |
22099 | msgid "Cannot save the current worktree state" |
22100 | msgstr "无法保存当前工作区状态" | |
22101 | ||
ec3d4607 | 22102 | #: builtin/stash.c:1355 |
d46c5519 JX |
22103 | msgid "Cannot record working tree state" |
22104 | msgstr "不能记录工作区状态" | |
22105 | ||
ec3d4607 | 22106 | #: builtin/stash.c:1404 |
d46c5519 JX |
22107 | msgid "Can't use --patch and --include-untracked or --all at the same time" |
22108 | msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" | |
22109 | ||
ec3d4607 | 22110 | #: builtin/stash.c:1422 |
d46c5519 JX |
22111 | msgid "Did you forget to 'git add'?" |
22112 | msgstr "您是否忘了执行 'git add'?" | |
22113 | ||
ec3d4607 | 22114 | #: builtin/stash.c:1437 |
d46c5519 JX |
22115 | msgid "No local changes to save" |
22116 | msgstr "没有要保存的本地修改" | |
22117 | ||
ec3d4607 | 22118 | #: builtin/stash.c:1444 |
d46c5519 JX |
22119 | msgid "Cannot initialize stash" |
22120 | msgstr "无法初始化贮藏" | |
22121 | ||
ec3d4607 | 22122 | #: builtin/stash.c:1459 |
d46c5519 JX |
22123 | msgid "Cannot save the current status" |
22124 | msgstr "无法保存当前状态" | |
22125 | ||
ec3d4607 | 22126 | #: builtin/stash.c:1464 |
d46c5519 JX |
22127 | #, c-format |
22128 | msgid "Saved working directory and index state %s" | |
22129 | msgstr "保存工作目录和索引状态 %s" | |
22130 | ||
ec3d4607 | 22131 | #: builtin/stash.c:1554 |
d46c5519 JX |
22132 | msgid "Cannot remove worktree changes" |
22133 | msgstr "无法删除工作区变更" | |
22134 | ||
ec3d4607 | 22135 | #: builtin/stash.c:1593 builtin/stash.c:1658 |
d46c5519 JX |
22136 | msgid "keep index" |
22137 | msgstr "保持索引" | |
22138 | ||
ec3d4607 | 22139 | #: builtin/stash.c:1595 builtin/stash.c:1660 |
d46c5519 JX |
22140 | msgid "stash in patch mode" |
22141 | msgstr "以补丁模式贮藏" | |
22142 | ||
ec3d4607 | 22143 | #: builtin/stash.c:1596 builtin/stash.c:1661 |
d46c5519 JX |
22144 | msgid "quiet mode" |
22145 | msgstr "静默模式" | |
22146 | ||
ec3d4607 | 22147 | #: builtin/stash.c:1598 builtin/stash.c:1663 |
d46c5519 JX |
22148 | msgid "include untracked files in stash" |
22149 | msgstr "贮藏中包含未跟踪文件" | |
ef317cd5 | 22150 | |
ec3d4607 | 22151 | #: builtin/stash.c:1600 builtin/stash.c:1665 |
d46c5519 JX |
22152 | msgid "include ignore files" |
22153 | msgstr "包含忽略的文件" | |
ef317cd5 | 22154 | |
ec3d4607 | 22155 | #: builtin/stash.c:1700 |
349ede6a JX |
22156 | msgid "" |
22157 | "the stash.useBuiltin support has been removed!\n" | |
22158 | "See its entry in 'git help config' for details." | |
22159 | msgstr "" | |
22160 | "对 stash.useBuiltin 的支持已被删除!\n" | |
22161 | "详见 'git help config' 中的条目。" | |
ef317cd5 | 22162 | |
a4f16749 | 22163 | #: builtin/stripspace.c:18 |
94550ed3 JX |
22164 | msgid "git stripspace [-s | --strip-comments]" |
22165 | msgstr "git stripspace [-s | --strip-comments]" | |
22166 | ||
a4f16749 | 22167 | #: builtin/stripspace.c:19 |
94550ed3 JX |
22168 | msgid "git stripspace [-c | --comment-lines]" |
22169 | msgstr "git stripspace [-c | --comment-lines]" | |
22170 | ||
06991777 | 22171 | #: builtin/stripspace.c:37 |
94550ed3 JX |
22172 | msgid "skip and remove all lines starting with comment character" |
22173 | msgstr "跳过和移除所有的注释行" | |
22174 | ||
06991777 | 22175 | #: builtin/stripspace.c:40 |
276ceeaa | 22176 | msgid "prepend comment character and space to each line" |
94550ed3 JX |
22177 | msgstr "为每一行的行首添加注释符和空格" |
22178 | ||
ec3d4607 | 22179 | #: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440 |
5b04ee3b JX |
22180 | #, c-format |
22181 | msgid "Expecting a full ref name, got %s" | |
22182 | msgstr "期望一个完整的引用名称,却得到 %s" | |
22183 | ||
ec3d4607 | 22184 | #: builtin/submodule--helper.c:63 |
31e5e17b JX |
22185 | msgid "submodule--helper print-default-remote takes no arguments" |
22186 | msgstr "submodule--helper print-default-remote 不带参数" | |
22187 | ||
ec3d4607 | 22188 | #: builtin/submodule--helper.c:101 |
5b04ee3b JX |
22189 | #, c-format |
22190 | msgid "cannot strip one component off url '%s'" | |
22191 | msgstr "无法从 url '%s' 剥离一个组件" | |
22192 | ||
ec3d4607 JX |
22193 | #: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887 |
22194 | #: builtin/submodule--helper.c:2891 | |
94550ed3 JX |
22195 | msgid "alternative anchor for relative paths" |
22196 | msgstr "相对路径的替代锚记(anchor)" | |
22197 | ||
ec3d4607 | 22198 | #: builtin/submodule--helper.c:416 |
94550ed3 JX |
22199 | msgid "git submodule--helper list [--prefix=<path>] [<path>...]" |
22200 | msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" | |
22201 | ||
ec3d4607 JX |
22202 | #: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631 |
22203 | #: builtin/submodule--helper.c:654 | |
5b04ee3b JX |
22204 | #, c-format |
22205 | msgid "No url found for submodule path '%s' in .gitmodules" | |
22206 | msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" | |
22207 | ||
ec3d4607 | 22208 | #: builtin/submodule--helper.c:526 |
c1ac5258 JX |
22209 | #, c-format |
22210 | msgid "Entering '%s'\n" | |
22211 | msgstr "进入 '%s'\n" | |
22212 | ||
ec3d4607 | 22213 | #: builtin/submodule--helper.c:529 |
c1ac5258 JX |
22214 | #, c-format |
22215 | msgid "" | |
22216 | "run_command returned non-zero status for %s\n" | |
22217 | "." | |
4c27fcb5 JX |
22218 | msgstr "" |
22219 | "对 %s 执行 run_command 返回非零值。\n" | |
22220 | "." | |
c1ac5258 | 22221 | |
ec3d4607 | 22222 | #: builtin/submodule--helper.c:551 |
c1ac5258 JX |
22223 | #, c-format |
22224 | msgid "" | |
22225 | "run_command returned non-zero status while recursing in the nested " | |
22226 | "submodules of %s\n" | |
22227 | "." | |
4c27fcb5 JX |
22228 | msgstr "" |
22229 | "在递归 %s 的子模组执行 run_command 时返回非零值。\n" | |
22230 | "." | |
c1ac5258 | 22231 | |
ec3d4607 | 22232 | #: builtin/submodule--helper.c:567 |
473eb541 JX |
22233 | msgid "suppress output of entering each submodule command" |
22234 | msgstr "抑制进入每一个子模组命令的输出" | |
c1ac5258 | 22235 | |
ec3d4607 JX |
22236 | #: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890 |
22237 | #: builtin/submodule--helper.c:1489 | |
473eb541 | 22238 | msgid "recurse into nested submodules" |
c1ac5258 JX |
22239 | msgstr "递归进入嵌套子模组中" |
22240 | ||
ec3d4607 | 22241 | #: builtin/submodule--helper.c:574 |
d46c5519 JX |
22242 | msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" |
22243 | msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" | |
c1ac5258 | 22244 | |
ec3d4607 | 22245 | #: builtin/submodule--helper.c:601 |
87cb7997 JX |
22246 | #, c-format |
22247 | msgid "" | |
4c27fcb5 | 22248 | "could not look up configuration '%s'. Assuming this repository is its own " |
87cb7997 JX |
22249 | "authoritative upstream." |
22250 | msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" | |
22251 | ||
ec3d4607 | 22252 | #: builtin/submodule--helper.c:668 |
5b04ee3b JX |
22253 | #, c-format |
22254 | msgid "Failed to register url for submodule path '%s'" | |
22255 | msgstr "无法为子模组 '%s' 注册 url" | |
22256 | ||
ec3d4607 | 22257 | #: builtin/submodule--helper.c:672 |
5b04ee3b JX |
22258 | #, c-format |
22259 | msgid "Submodule '%s' (%s) registered for path '%s'\n" | |
25c75902 | 22260 | msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" |
5b04ee3b | 22261 | |
ec3d4607 | 22262 | #: builtin/submodule--helper.c:682 |
aef18cc6 | 22263 | #, c-format |
5b04ee3b | 22264 | msgid "warning: command update mode suggested for submodule '%s'\n" |
aef18cc6 | 22265 | msgstr "警告:建议子模组 '%s' 使用命令更新模式\n" |
5b04ee3b | 22266 | |
ec3d4607 | 22267 | #: builtin/submodule--helper.c:689 |
5b04ee3b JX |
22268 | #, c-format |
22269 | msgid "Failed to register update mode for submodule path '%s'" | |
22270 | msgstr "无法为子模组 '%s' 注册更新模式" | |
22271 | ||
ec3d4607 | 22272 | #: builtin/submodule--helper.c:711 |
473eb541 JX |
22273 | msgid "suppress output for initializing a submodule" |
22274 | msgstr "抑制子模组初始化的输出" | |
5b04ee3b | 22275 | |
ec3d4607 | 22276 | #: builtin/submodule--helper.c:716 |
d46c5519 JX |
22277 | msgid "git submodule--helper init [<options>] [<path>]" |
22278 | msgstr "git submodule--helper init [<选项>] [<路径>]" | |
5b04ee3b | 22279 | |
ec3d4607 | 22280 | #: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 |
94550ed3 JX |
22281 | #, c-format |
22282 | msgid "no submodule mapping found in .gitmodules for path '%s'" | |
22283 | msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" | |
22284 | ||
ec3d4607 | 22285 | #: builtin/submodule--helper.c:837 |
5809aa05 JX |
22286 | #, c-format |
22287 | msgid "could not resolve HEAD ref inside the submodule '%s'" | |
22288 | msgstr "无法解析子模组 '%s' 的 HEAD 引用" | |
22289 | ||
ec3d4607 | 22290 | #: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459 |
5809aa05 JX |
22291 | #, c-format |
22292 | msgid "failed to recurse into submodule '%s'" | |
c1ac5258 | 22293 | msgstr "递归子模组 '%s' 失败" |
5809aa05 | 22294 | |
ec3d4607 | 22295 | #: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625 |
473eb541 JX |
22296 | msgid "suppress submodule status output" |
22297 | msgstr "抑制子模组状态输出" | |
5809aa05 | 22298 | |
ec3d4607 | 22299 | #: builtin/submodule--helper.c:889 |
5809aa05 | 22300 | msgid "" |
473eb541 | 22301 | "use commit stored in the index instead of the one stored in the submodule " |
5809aa05 JX |
22302 | "HEAD" |
22303 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
22304 | ||
ec3d4607 | 22305 | #: builtin/submodule--helper.c:895 |
5809aa05 JX |
22306 | msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" |
22307 | msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" | |
22308 | ||
ec3d4607 | 22309 | #: builtin/submodule--helper.c:919 |
5809aa05 JX |
22310 | msgid "git submodule--helper name <path>" |
22311 | msgstr "git submodule--helper name <路径>" | |
22312 | ||
ec3d4607 | 22313 | #: builtin/submodule--helper.c:991 |
d9488fea JX |
22314 | #, c-format |
22315 | msgid "* %s %s(blob)->%s(submodule)" | |
22316 | msgstr "* %s %s(数据对象)->%s(子模组)" | |
22317 | ||
ec3d4607 | 22318 | #: builtin/submodule--helper.c:994 |
d9488fea JX |
22319 | #, c-format |
22320 | msgid "* %s %s(submodule)->%s(blob)" | |
22321 | msgstr "* %s %s(子模组)->%s(数据对象)" | |
22322 | ||
ec3d4607 | 22323 | #: builtin/submodule--helper.c:1007 |
d9488fea JX |
22324 | #, c-format |
22325 | msgid "%s" | |
22326 | msgstr "%s" | |
22327 | ||
ec3d4607 | 22328 | #: builtin/submodule--helper.c:1057 |
d9488fea JX |
22329 | #, c-format |
22330 | msgid "couldn't hash object from '%s'" | |
22331 | msgstr "不能从 '%s' 创建哈希对象" | |
22332 | ||
ec3d4607 | 22333 | #: builtin/submodule--helper.c:1061 |
d9488fea JX |
22334 | #, c-format |
22335 | msgid "unexpected mode %o\n" | |
22336 | msgstr "意外的模式 %o\n" | |
22337 | ||
ec3d4607 | 22338 | #: builtin/submodule--helper.c:1302 |
d9488fea JX |
22339 | msgid "use the commit stored in the index instead of the submodule HEAD" |
22340 | msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交" | |
22341 | ||
ec3d4607 JX |
22342 | #: builtin/submodule--helper.c:1304 |
22343 | msgid "compare the commit in the index with that in the submodule HEAD" | |
d9488fea JX |
22344 | msgstr "比较存储在索引和子模组 HEAD 中的提交" |
22345 | ||
ec3d4607 | 22346 | #: builtin/submodule--helper.c:1306 |
d9488fea JX |
22347 | msgid "skip submodules with 'ignore_config' value set to 'all'" |
22348 | msgstr "跳过设置了 'ignore_config' 为 'all' 的子模组" | |
22349 | ||
ec3d4607 | 22350 | #: builtin/submodule--helper.c:1308 |
d9488fea JX |
22351 | msgid "limit the summary size" |
22352 | msgstr "限制总结的大小" | |
22353 | ||
ec3d4607 | 22354 | #: builtin/submodule--helper.c:1313 |
d9488fea JX |
22355 | msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" |
22356 | msgstr "git submodule--helper summary [<选项>] [<提交>] [--] [<路径>]" | |
22357 | ||
ec3d4607 | 22358 | #: builtin/submodule--helper.c:1337 |
d9488fea JX |
22359 | msgid "could not fetch a revision for HEAD" |
22360 | msgstr "不能为 HEAD 获取一个版本" | |
22361 | ||
ec3d4607 | 22362 | #: builtin/submodule--helper.c:1342 |
d9488fea JX |
22363 | msgid "--cached and --files are mutually exclusive" |
22364 | msgstr "--cached 和 --files 是互斥的" | |
22365 | ||
ec3d4607 | 22366 | #: builtin/submodule--helper.c:1409 |
31e5e17b JX |
22367 | #, c-format |
22368 | msgid "Synchronizing submodule url for '%s'\n" | |
22369 | msgstr "为 '%s' 同步子模组 url\n" | |
22370 | ||
ec3d4607 | 22371 | #: builtin/submodule--helper.c:1415 |
31e5e17b JX |
22372 | #, c-format |
22373 | msgid "failed to register url for submodule path '%s'" | |
22374 | msgstr "无法为子模组路径 '%s' 注册 url" | |
22375 | ||
ec3d4607 | 22376 | #: builtin/submodule--helper.c:1429 |
31e5e17b JX |
22377 | #, c-format |
22378 | msgid "failed to get the default remote for submodule '%s'" | |
22379 | msgstr "无法得到子模组 '%s' 的默认远程关联" | |
22380 | ||
ec3d4607 | 22381 | #: builtin/submodule--helper.c:1440 |
31e5e17b JX |
22382 | #, c-format |
22383 | msgid "failed to update remote for submodule '%s'" | |
22384 | msgstr "无法为子模组 '%s' 更新远程关联" | |
22385 | ||
ec3d4607 | 22386 | #: builtin/submodule--helper.c:1487 |
473eb541 JX |
22387 | msgid "suppress output of synchronizing submodule url" |
22388 | msgstr "抑制子模组 URL 同步的输出" | |
31e5e17b | 22389 | |
ec3d4607 | 22390 | #: builtin/submodule--helper.c:1494 |
31e5e17b JX |
22391 | msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" |
22392 | msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" | |
22393 | ||
ec3d4607 | 22394 | #: builtin/submodule--helper.c:1548 |
31e5e17b JX |
22395 | #, c-format |
22396 | msgid "" | |
22397 | "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " | |
22398 | "really want to remove it including all of its history)" | |
22399 | msgstr "" | |
fd8cb379 JX |
22400 | "子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm " |
22401 | "-rf' 命令)" | |
31e5e17b | 22402 | |
ec3d4607 | 22403 | #: builtin/submodule--helper.c:1560 |
31e5e17b JX |
22404 | #, c-format |
22405 | msgid "" | |
22406 | "Submodule work tree '%s' contains local modifications; use '-f' to discard " | |
22407 | "them" | |
22408 | msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们" | |
22409 | ||
ec3d4607 | 22410 | #: builtin/submodule--helper.c:1568 |
31e5e17b JX |
22411 | #, c-format |
22412 | msgid "Cleared directory '%s'\n" | |
22413 | msgstr "已清除目录 '%s'\n" | |
22414 | ||
ec3d4607 | 22415 | #: builtin/submodule--helper.c:1570 |
31e5e17b JX |
22416 | #, c-format |
22417 | msgid "Could not remove submodule work tree '%s'\n" | |
22418 | msgstr "无法移除子模组工作区 '%s'\n" | |
22419 | ||
ec3d4607 | 22420 | #: builtin/submodule--helper.c:1581 |
31e5e17b JX |
22421 | #, c-format |
22422 | msgid "could not create empty submodule directory %s" | |
22423 | msgstr "不能创建空的子模组目录 %s" | |
22424 | ||
ec3d4607 | 22425 | #: builtin/submodule--helper.c:1597 |
31e5e17b JX |
22426 | #, c-format |
22427 | msgid "Submodule '%s' (%s) unregistered for path '%s'\n" | |
22428 | msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n" | |
22429 | ||
ec3d4607 | 22430 | #: builtin/submodule--helper.c:1626 |
473eb541 | 22431 | msgid "remove submodule working trees even if they contain local changes" |
31e5e17b JX |
22432 | msgstr "删除子模组工作区,即使包含本地修改" |
22433 | ||
ec3d4607 | 22434 | #: builtin/submodule--helper.c:1627 |
473eb541 | 22435 | msgid "unregister all submodules" |
31e5e17b JX |
22436 | msgstr "将所有子模组取消注册" |
22437 | ||
ec3d4607 | 22438 | #: builtin/submodule--helper.c:1632 |
31e5e17b JX |
22439 | msgid "" |
22440 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" | |
22441 | msgstr "" | |
22442 | "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" | |
22443 | ||
ec3d4607 | 22444 | #: builtin/submodule--helper.c:1646 |
31e5e17b JX |
22445 | msgid "Use '--all' if you really want to deinitialize all submodules" |
22446 | msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'" | |
22447 | ||
ec3d4607 | 22448 | #: builtin/submodule--helper.c:1690 |
ddc12c42 JX |
22449 | msgid "" |
22450 | "An alternate computed from a superproject's alternate is invalid.\n" | |
22451 | "To allow Git to clone without an alternate in such a case, set\n" | |
22452 | "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" | |
22453 | "'--reference-if-able' instead of '--reference'." | |
22454 | msgstr "" | |
22455 | "从一个父项目的备用仓库中计算出的备用仓库无效。\n" | |
22456 | "此场景下,设置 submodule.alternateErrorStrategy 为 'info',以允许\n" | |
22457 | "Git 不使用备用仓库克隆,或者等效地使用 '--reference-if-able' 而非\n" | |
22458 | "'--reference' 来克隆。" | |
22459 | ||
ec3d4607 | 22460 | #: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 |
a0b6b246 JX |
22461 | #, c-format |
22462 | msgid "submodule '%s' cannot add alternate: %s" | |
22463 | msgstr "子模组 '%s' 不能添加仓库备选:%s" | |
22464 | ||
ec3d4607 | 22465 | #: builtin/submodule--helper.c:1768 |
a0b6b246 JX |
22466 | #, c-format |
22467 | msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" | |
22468 | msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" | |
22469 | ||
ec3d4607 | 22470 | #: builtin/submodule--helper.c:1775 |
a0b6b246 JX |
22471 | #, c-format |
22472 | msgid "Value '%s' for submodule.alternateLocation is not recognized" | |
ae4e099e | 22473 | msgstr "不能识别 submodule.alternateLocation 的取值 '%s'" |
a0b6b246 | 22474 | |
ec3d4607 JX |
22475 | #: builtin/submodule--helper.c:1800 |
22476 | #, c-format | |
22477 | msgid "refusing to create/use '%s' in another submodule's git dir" | |
22478 | msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'" | |
22479 | ||
22480 | #: builtin/submodule--helper.c:1841 | |
22481 | #, c-format | |
22482 | msgid "clone of '%s' into submodule path '%s' failed" | |
22483 | msgstr "无法克隆 '%s' 到子模组路径 '%s'" | |
22484 | ||
22485 | #: builtin/submodule--helper.c:1846 | |
22486 | #, c-format | |
22487 | msgid "directory not empty: '%s'" | |
22488 | msgstr "目录非空:'%s'" | |
22489 | ||
22490 | #: builtin/submodule--helper.c:1858 | |
22491 | #, c-format | |
22492 | msgid "could not get submodule directory for '%s'" | |
22493 | msgstr "无法得到 '%s' 的子模组目录" | |
22494 | ||
22495 | #: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894 | |
94550ed3 JX |
22496 | msgid "where the new submodule will be cloned to" |
22497 | msgstr "新的子模组将要克隆的路径" | |
22498 | ||
ec3d4607 | 22499 | #: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897 |
94550ed3 JX |
22500 | msgid "name of the new submodule" |
22501 | msgstr "新子模组的名称" | |
22502 | ||
ec3d4607 | 22503 | #: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900 |
94550ed3 JX |
22504 | msgid "url where to clone the submodule from" |
22505 | msgstr "克隆子模组的 url 地址" | |
22506 | ||
ec3d4607 | 22507 | #: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907 |
94550ed3 JX |
22508 | msgid "depth for shallow clones" |
22509 | msgstr "浅克隆的深度" | |
22510 | ||
ec3d4607 JX |
22511 | #: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365 |
22512 | #: builtin/submodule--helper.c:2909 | |
a0b6b246 | 22513 | msgid "force cloning progress" |
29004bbb | 22514 | msgstr "强制显示克隆进度" |
a0b6b246 | 22515 | |
ec3d4607 | 22516 | #: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367 |
ddc12c42 JX |
22517 | msgid "disallow cloning into non-empty directory" |
22518 | msgstr "不允许克隆到一个非空目录" | |
22519 | ||
ec3d4607 | 22520 | #: builtin/submodule--helper.c:1916 |
94550ed3 JX |
22521 | msgid "" |
22522 | "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " | |
2b472aae JX |
22523 | "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " |
22524 | "<url> --path <path>" | |
5c57d762 JX |
22525 | msgstr "" |
22526 | "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " | |
2b472aae | 22527 | "[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" |
94550ed3 | 22528 | |
ec3d4607 | 22529 | #: builtin/submodule--helper.c:1953 |
4c27fcb5 JX |
22530 | #, c-format |
22531 | msgid "Invalid update mode '%s' for submodule path '%s'" | |
22532 | msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" | |
22533 | ||
ec3d4607 | 22534 | #: builtin/submodule--helper.c:1957 |
4c27fcb5 JX |
22535 | #, c-format |
22536 | msgid "Invalid update mode '%s' configured for submodule path '%s'" | |
22537 | msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" | |
22538 | ||
ec3d4607 | 22539 | #: builtin/submodule--helper.c:2058 |
5b04ee3b JX |
22540 | #, c-format |
22541 | msgid "Submodule path '%s' not initialized" | |
22542 | msgstr "子模组 '%s' 尚未初始化" | |
22543 | ||
ec3d4607 | 22544 | #: builtin/submodule--helper.c:2062 |
5b04ee3b JX |
22545 | msgid "Maybe you want to use 'update --init'?" |
22546 | msgstr "也许您想要执行 'update --init'?" | |
22547 | ||
ec3d4607 | 22548 | #: builtin/submodule--helper.c:2092 |
5b04ee3b JX |
22549 | #, c-format |
22550 | msgid "Skipping unmerged submodule %s" | |
22551 | msgstr "略过未合并的子模组 %s" | |
22552 | ||
ec3d4607 | 22553 | #: builtin/submodule--helper.c:2121 |
5b04ee3b JX |
22554 | #, c-format |
22555 | msgid "Skipping submodule '%s'" | |
22556 | msgstr "略过子模组 '%s'" | |
22557 | ||
ec3d4607 | 22558 | #: builtin/submodule--helper.c:2271 |
5c57d762 JX |
22559 | #, c-format |
22560 | msgid "Failed to clone '%s'. Retry scheduled" | |
22561 | msgstr "克隆 '%s' 失败。按计划重试" | |
22562 | ||
ec3d4607 | 22563 | #: builtin/submodule--helper.c:2282 |
5c57d762 JX |
22564 | #, c-format |
22565 | msgid "Failed to clone '%s' a second time, aborting" | |
22566 | msgstr "第二次尝试克隆 '%s' 失败,退出" | |
22567 | ||
ec3d4607 | 22568 | #: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590 |
5b04ee3b JX |
22569 | msgid "path into the working tree" |
22570 | msgstr "到工作区的路径" | |
22571 | ||
ec3d4607 | 22572 | #: builtin/submodule--helper.c:2347 |
5b04ee3b JX |
22573 | msgid "path into the working tree, across nested submodule boundaries" |
22574 | msgstr "工作区中的路径,递归嵌套子模组" | |
22575 | ||
ec3d4607 | 22576 | #: builtin/submodule--helper.c:2351 |
5b04ee3b JX |
22577 | msgid "rebase, merge, checkout or none" |
22578 | msgstr "rebase、merge、checkout 或 none" | |
22579 | ||
ec3d4607 | 22580 | #: builtin/submodule--helper.c:2357 |
473eb541 | 22581 | msgid "create a shallow clone truncated to the specified number of revisions" |
5b04ee3b JX |
22582 | msgstr "创建一个指定深度的浅克隆" |
22583 | ||
ec3d4607 | 22584 | #: builtin/submodule--helper.c:2360 |
5b04ee3b JX |
22585 | msgid "parallel jobs" |
22586 | msgstr "并发任务" | |
22587 | ||
ec3d4607 | 22588 | #: builtin/submodule--helper.c:2362 |
5c57d762 | 22589 | msgid "whether the initial clone should follow the shallow recommendation" |
9a4b694c | 22590 | msgstr "初始克隆是否应该遵守推荐的浅克隆选项" |
5c57d762 | 22591 | |
ec3d4607 | 22592 | #: builtin/submodule--helper.c:2363 |
5b04ee3b JX |
22593 | msgid "don't print cloning progress" |
22594 | msgstr "不要输出克隆进度" | |
94550ed3 | 22595 | |
ec3d4607 | 22596 | #: builtin/submodule--helper.c:2374 |
a5cd71ca JX |
22597 | msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" |
22598 | msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" | |
5b04ee3b | 22599 | |
ec3d4607 | 22600 | #: builtin/submodule--helper.c:2387 |
5b04ee3b JX |
22601 | msgid "bad value for update parameter" |
22602 | msgstr "update 参数取值错误" | |
22603 | ||
ec3d4607 | 22604 | #: builtin/submodule--helper.c:2435 |
5c57d762 JX |
22605 | #, c-format |
22606 | msgid "" | |
22607 | "Submodule (%s) branch configured to inherit branch from superproject, but " | |
22608 | "the superproject is not on any branch" | |
22609 | msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上" | |
22610 | ||
ec3d4607 | 22611 | #: builtin/submodule--helper.c:2558 |
4c27fcb5 JX |
22612 | #, c-format |
22613 | msgid "could not get a repository handle for submodule '%s'" | |
22614 | msgstr "无法获得子模组 '%s' 的仓库句柄" | |
22615 | ||
ec3d4607 | 22616 | #: builtin/submodule--helper.c:2591 |
1a79b2f1 JX |
22617 | msgid "recurse into submodules" |
22618 | msgstr "在子模组中递归" | |
22619 | ||
ec3d4607 | 22620 | #: builtin/submodule--helper.c:2597 |
d46c5519 JX |
22621 | msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" |
22622 | msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" | |
1a79b2f1 | 22623 | |
ec3d4607 | 22624 | #: builtin/submodule--helper.c:2653 |
4c27fcb5 JX |
22625 | msgid "check if it is safe to write to the .gitmodules file" |
22626 | msgstr "检查写入 .gitmodules 文件是否安全" | |
22627 | ||
ec3d4607 | 22628 | #: builtin/submodule--helper.c:2656 |
d46c5519 JX |
22629 | msgid "unset the config in the .gitmodules file" |
22630 | msgstr "取消 .gitmodules 文件中的设置" | |
22631 | ||
ec3d4607 | 22632 | #: builtin/submodule--helper.c:2661 |
d46c5519 JX |
22633 | msgid "git submodule--helper config <name> [<value>]" |
22634 | msgstr "git submodule--helper config <名称> [<值>]" | |
4c27fcb5 | 22635 | |
ec3d4607 | 22636 | #: builtin/submodule--helper.c:2662 |
d46c5519 JX |
22637 | msgid "git submodule--helper config --unset <name>" |
22638 | msgstr "git submodule--helper config --unset <名称>" | |
22639 | ||
ec3d4607 | 22640 | #: builtin/submodule--helper.c:2663 |
4c27fcb5 JX |
22641 | msgid "git submodule--helper config --check-writeable" |
22642 | msgstr "git submodule--helper config --check-writeable" | |
22643 | ||
ec3d4607 | 22644 | #: builtin/submodule--helper.c:2682 git-submodule.sh:150 |
4c27fcb5 JX |
22645 | #, sh-format |
22646 | msgid "please make sure that the .gitmodules file is in the working tree" | |
22647 | msgstr "请确认 .gitmodules 文件在工作区里" | |
22648 | ||
ec3d4607 | 22649 | #: builtin/submodule--helper.c:2698 |
473eb541 JX |
22650 | msgid "suppress output for setting url of a submodule" |
22651 | msgstr "抑制设置子模组 URL 的输出" | |
349ede6a | 22652 | |
ec3d4607 | 22653 | #: builtin/submodule--helper.c:2702 |
349ede6a JX |
22654 | msgid "git submodule--helper set-url [--quiet] <path> <newurl>" |
22655 | msgstr "git submodule--helper set-url [--quiet] <路径> <新地址>" | |
22656 | ||
ec3d4607 | 22657 | #: builtin/submodule--helper.c:2735 |
7157c2b5 JX |
22658 | msgid "set the default tracking branch to master" |
22659 | msgstr "设置默认跟踪分支为 master" | |
22660 | ||
ec3d4607 | 22661 | #: builtin/submodule--helper.c:2737 |
7157c2b5 JX |
22662 | msgid "set the default tracking branch" |
22663 | msgstr "设置默认跟踪分支" | |
22664 | ||
ec3d4607 | 22665 | #: builtin/submodule--helper.c:2741 |
7157c2b5 JX |
22666 | msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" |
22667 | msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>" | |
22668 | ||
ec3d4607 | 22669 | #: builtin/submodule--helper.c:2742 |
7157c2b5 JX |
22670 | msgid "" |
22671 | "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" | |
d9488fea JX |
22672 | msgstr "" |
22673 | "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>" | |
7157c2b5 | 22674 | |
ec3d4607 | 22675 | #: builtin/submodule--helper.c:2749 |
7157c2b5 JX |
22676 | msgid "--branch or --default required" |
22677 | msgstr "需要 --branch 或 --default" | |
22678 | ||
ec3d4607 | 22679 | #: builtin/submodule--helper.c:2752 |
7157c2b5 JX |
22680 | msgid "--branch and --default are mutually exclusive" |
22681 | msgstr "--branch 和 --default 是互斥的" | |
22682 | ||
ec3d4607 JX |
22683 | #: builtin/submodule--helper.c:2815 |
22684 | #, c-format | |
22685 | msgid "Adding existing repo at '%s' to the index\n" | |
22686 | msgstr "向索引中添加位于 '%s' 的已存在的仓库\n" | |
22687 | ||
22688 | #: builtin/submodule--helper.c:2818 | |
22689 | #, c-format | |
22690 | msgid "'%s' already exists and is not a valid git repo" | |
22691 | msgstr "'%s' 已存在并且不是一个有效的 git 仓库" | |
22692 | ||
22693 | #: builtin/submodule--helper.c:2828 | |
22694 | #, c-format | |
22695 | msgid "A git directory for '%s' is found locally with remote(s):" | |
22696 | msgstr "发现一个本地 git 目录 '%s' 及其远程仓库:" | |
22697 | ||
22698 | #: builtin/submodule--helper.c:2833 | |
22699 | #, c-format | |
22700 | msgid "" | |
22701 | "If you want to reuse this local git directory instead of cloning again from\n" | |
22702 | " %s\n" | |
22703 | "use the '--force' option. If the local git directory is not the correct " | |
22704 | "repo\n" | |
22705 | "or if you are unsure what this means, choose another name with the '--name' " | |
22706 | "option.\n" | |
22707 | msgstr "" | |
22708 | "如果您想要重用这个本地 git 目录而非重新克隆自\n" | |
22709 | " %s\n" | |
22710 | "使用 '--force' 选项。如果本地 git 目录不是正确的仓库,或者如果您不确定这里\n" | |
22711 | "的含义,使用 '--name' 选项指定另外的名称。\n" | |
22712 | ||
22713 | #: builtin/submodule--helper.c:2842 | |
22714 | #, c-format | |
22715 | msgid "Reactivating local git directory for submodule '%s'\n" | |
22716 | msgstr "为子模组 '%s' 重新激活本地 git 目录\n" | |
22717 | ||
22718 | #: builtin/submodule--helper.c:2875 | |
22719 | #, c-format | |
22720 | msgid "unable to checkout submodule '%s'" | |
22721 | msgstr "无法检出子模组 '%s'" | |
22722 | ||
22723 | #: builtin/submodule--helper.c:2888 | |
22724 | msgid "branch of repository to checkout on cloning" | |
22725 | msgstr "克隆仓库时要检出的分支" | |
22726 | ||
22727 | #: builtin/submodule--helper.c:2910 | |
22728 | msgid "allow adding an otherwise ignored submodule path" | |
22729 | msgstr "允许添加一个被忽略的子模组路径" | |
22730 | ||
22731 | #: builtin/submodule--helper.c:2917 | |
22732 | msgid "" | |
22733 | "git submodule--helper add-clone [<options>...] --url <url> --path <path> --" | |
22734 | "name <name>" | |
22735 | msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <名称>" | |
22736 | ||
22737 | #: builtin/submodule--helper.c:2985 git.c:449 git.c:724 | |
1a79b2f1 JX |
22738 | #, c-format |
22739 | msgid "%s doesn't support --super-prefix" | |
22740 | msgstr "%s 不支持 --super-prefix" | |
22741 | ||
ec3d4607 | 22742 | #: builtin/submodule--helper.c:2991 |
94550ed3 | 22743 | #, c-format |
5b04ee3b JX |
22744 | msgid "'%s' is not a valid submodule--helper subcommand" |
22745 | msgstr "'%s' 不是一个有效的 submodule--helper 子命令" | |
94550ed3 | 22746 | |
a4f16749 | 22747 | #: builtin/symbolic-ref.c:8 |
814ff314 JX |
22748 | msgid "git symbolic-ref [<options>] <name> [<ref>]" |
22749 | msgstr "git symbolic-ref [<选项>] <名称> [<引用>]" | |
07432cef | 22750 | |
a4f16749 | 22751 | #: builtin/symbolic-ref.c:9 |
814ff314 JX |
22752 | msgid "git symbolic-ref -d [-q] <name>" |
22753 | msgstr "git symbolic-ref -d [-q] <名称>" | |
ef317cd5 | 22754 | |
33b62fba | 22755 | #: builtin/symbolic-ref.c:42 |
ef317cd5 | 22756 | msgid "suppress error message for non-symbolic (detached) refs" |
07432cef WS |
22757 | msgstr "不显示非符号(分离的)引用的错误信息" |
22758 | ||
33b62fba | 22759 | #: builtin/symbolic-ref.c:43 |
07432cef WS |
22760 | msgid "delete symbolic ref" |
22761 | msgstr "删除符号引用" | |
ef317cd5 | 22762 | |
33b62fba | 22763 | #: builtin/symbolic-ref.c:44 |
ef317cd5 | 22764 | msgid "shorten ref output" |
6937cb4e | 22765 | msgstr "缩短引用输出" |
ef317cd5 | 22766 | |
33b62fba | 22767 | #: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 |
ef317cd5 | 22768 | msgid "reason" |
07432cef | 22769 | msgstr "原因" |
ef317cd5 | 22770 | |
33b62fba | 22771 | #: builtin/symbolic-ref.c:45 builtin/update-ref.c:499 |
ef317cd5 | 22772 | msgid "reason of the update" |
07432cef | 22773 | msgstr "更新的原因" |
ef317cd5 | 22774 | |
c1ac5258 | 22775 | #: builtin/tag.c:25 |
ef317cd5 | 22776 | msgid "" |
d46c5519 JX |
22777 | "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" |
22778 | "\t\t<tagname> [<head>]" | |
814ff314 | 22779 | msgstr "" |
d46c5519 JX |
22780 | "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" |
22781 | "\t\t<标签名> [<头>]" | |
ef317cd5 | 22782 | |
d46c5519 | 22783 | #: builtin/tag.c:27 |
ef317cd5 | 22784 | msgid "git tag -d <tagname>..." |
07432cef | 22785 | msgstr "git tag -d <标签名>..." |
ef317cd5 | 22786 | |
d46c5519 | 22787 | #: builtin/tag.c:28 |
ef317cd5 | 22788 | msgid "" |
87cb7997 JX |
22789 | "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" |
22790 | "points-at <object>]\n" | |
d9488fea JX |
22791 | "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " |
22792 | "[<pattern>...]" | |
ef317cd5 | 22793 | msgstr "" |
87cb7997 JX |
22794 | "git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-" |
22795 | "at <对象>]\n" | |
d9488fea | 22796 | "\t\t[--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" |
ef317cd5 | 22797 | |
d46c5519 | 22798 | #: builtin/tag.c:30 |
1a79b2f1 JX |
22799 | msgid "git tag -v [--format=<format>] <tagname>..." |
22800 | msgstr "git tag -v [--format=<格式>] <标签名>..." | |
ef317cd5 | 22801 | |
33b62fba | 22802 | #: builtin/tag.c:100 |
c04f5ac3 JX |
22803 | #, c-format |
22804 | msgid "tag '%s' not found." | |
55a16ee4 | 22805 | msgstr "未发现标签 '%s'。" |
c04f5ac3 | 22806 | |
33b62fba | 22807 | #: builtin/tag.c:135 |
c04f5ac3 JX |
22808 | #, c-format |
22809 | msgid "Deleted tag '%s' (was %s)\n" | |
55a16ee4 | 22810 | msgstr "已删除标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 22811 | |
33b62fba | 22812 | #: builtin/tag.c:170 |
a77c07d9 | 22813 | #, c-format |
c04f5ac3 JX |
22814 | msgid "" |
22815 | "\n" | |
6acbf033 JX |
22816 | "Write a message for tag:\n" |
22817 | " %s\n" | |
a77c07d9 | 22818 | "Lines starting with '%c' will be ignored.\n" |
c04f5ac3 JX |
22819 | msgstr "" |
22820 | "\n" | |
55a16ee4 | 22821 | "输入一个标签说明:\n" |
6acbf033 | 22822 | " %s\n" |
a77c07d9 | 22823 | "以 '%c' 开头的行将被忽略。\n" |
c04f5ac3 | 22824 | |
33b62fba | 22825 | #: builtin/tag.c:174 |
a77c07d9 | 22826 | #, c-format |
c04f5ac3 JX |
22827 | msgid "" |
22828 | "\n" | |
6acbf033 JX |
22829 | "Write a message for tag:\n" |
22830 | " %s\n" | |
a77c07d9 | 22831 | "Lines starting with '%c' will be kept; you may remove them yourself if you " |
c04f5ac3 | 22832 | "want to.\n" |
c04f5ac3 JX |
22833 | msgstr "" |
22834 | "\n" | |
55a16ee4 | 22835 | "输入一个标签说明:\n" |
6acbf033 | 22836 | " %s\n" |
a77c07d9 | 22837 | "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" |
c04f5ac3 | 22838 | |
33b62fba | 22839 | #: builtin/tag.c:241 |
c04f5ac3 | 22840 | msgid "unable to sign the tag" |
55a16ee4 | 22841 | msgstr "无法签署标签" |
c04f5ac3 | 22842 | |
33b62fba | 22843 | #: builtin/tag.c:259 |
d46c5519 JX |
22844 | #, c-format |
22845 | msgid "" | |
22846 | "You have created a nested tag. The object referred to by your new tag is\n" | |
22847 | "already a tag. If you meant to tag the object that it points to, use:\n" | |
22848 | "\n" | |
22849 | "\tgit tag -f %s %s^{}" | |
22850 | msgstr "" | |
22851 | "您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" | |
22852 | "对其指向的目标创建标签,使用:\n" | |
22853 | "\n" | |
22854 | "\tgit tag -f %s %s^{}" | |
22855 | ||
33b62fba | 22856 | #: builtin/tag.c:275 |
c04f5ac3 | 22857 | msgid "bad object type." |
90e6ef53 | 22858 | msgstr "坏的对象类型。" |
c04f5ac3 | 22859 | |
33b62fba | 22860 | #: builtin/tag.c:328 |
c04f5ac3 | 22861 | msgid "no tag message?" |
55a16ee4 | 22862 | msgstr "无标签说明?" |
c04f5ac3 | 22863 | |
33b62fba | 22864 | #: builtin/tag.c:335 |
c04f5ac3 JX |
22865 | #, c-format |
22866 | msgid "The tag message has been left in %s\n" | |
55a16ee4 | 22867 | msgstr "标签说明被保留在 %s\n" |
c04f5ac3 | 22868 | |
33b62fba | 22869 | #: builtin/tag.c:446 |
ef317cd5 | 22870 | msgid "list tag names" |
55a16ee4 | 22871 | msgstr "列出标签名称" |
ef317cd5 | 22872 | |
33b62fba | 22873 | #: builtin/tag.c:448 |
ef317cd5 | 22874 | msgid "print <n> lines of each tag message" |
55a16ee4 | 22875 | msgstr "每个标签信息打印 <n> 行" |
ef317cd5 | 22876 | |
33b62fba | 22877 | #: builtin/tag.c:450 |
ef317cd5 | 22878 | msgid "delete tags" |
55a16ee4 | 22879 | msgstr "删除标签" |
ef317cd5 | 22880 | |
33b62fba | 22881 | #: builtin/tag.c:451 |
ef317cd5 | 22882 | msgid "verify tags" |
55a16ee4 | 22883 | msgstr "验证标签" |
ef317cd5 | 22884 | |
33b62fba | 22885 | #: builtin/tag.c:453 |
ef317cd5 | 22886 | msgid "Tag creation options" |
55a16ee4 | 22887 | msgstr "标签创建选项" |
ef317cd5 | 22888 | |
33b62fba | 22889 | #: builtin/tag.c:455 |
ef317cd5 | 22890 | msgid "annotated tag, needs a message" |
55a16ee4 | 22891 | msgstr "附注标签,需要一个说明" |
ef317cd5 | 22892 | |
33b62fba | 22893 | #: builtin/tag.c:457 |
ef317cd5 | 22894 | msgid "tag message" |
55a16ee4 | 22895 | msgstr "标签说明" |
ef317cd5 | 22896 | |
33b62fba | 22897 | #: builtin/tag.c:459 |
31e5e17b JX |
22898 | msgid "force edit of tag message" |
22899 | msgstr "强制编辑标签说明" | |
22900 | ||
33b62fba | 22901 | #: builtin/tag.c:460 |
ef317cd5 | 22902 | msgid "annotated and GPG-signed tag" |
55a16ee4 | 22903 | msgstr "附注并附加 GPG 签名的标签" |
ef317cd5 | 22904 | |
33b62fba | 22905 | #: builtin/tag.c:463 |
ef317cd5 | 22906 | msgid "use another key to sign the tag" |
55a16ee4 | 22907 | msgstr "使用另外的私钥签名该标签" |
ef317cd5 | 22908 | |
33b62fba | 22909 | #: builtin/tag.c:464 |
ef317cd5 | 22910 | msgid "replace the tag if exists" |
55a16ee4 | 22911 | msgstr "如果存在,替换现有的标签" |
ef317cd5 | 22912 | |
33b62fba | 22913 | #: builtin/tag.c:465 builtin/update-ref.c:505 |
03ea3327 | 22914 | msgid "create a reflog" |
1b7f4a34 JX |
22915 | msgstr "创建引用日志" |
22916 | ||
33b62fba | 22917 | #: builtin/tag.c:467 |
814ff314 | 22918 | msgid "Tag listing options" |
55a16ee4 | 22919 | msgstr "标签列表选项" |
814ff314 | 22920 | |
33b62fba | 22921 | #: builtin/tag.c:468 |
ef317cd5 | 22922 | msgid "show tag list in columns" |
55a16ee4 | 22923 | msgstr "以列的方式显示标签列表" |
ef317cd5 | 22924 | |
33b62fba | 22925 | #: builtin/tag.c:469 builtin/tag.c:471 |
ef317cd5 | 22926 | msgid "print only tags that contain the commit" |
87cb7997 | 22927 | msgstr "只打印包含该提交的标签" |
ef317cd5 | 22928 | |
33b62fba | 22929 | #: builtin/tag.c:470 builtin/tag.c:472 |
87cb7997 JX |
22930 | msgid "print only tags that don't contain the commit" |
22931 | msgstr "只打印不包含该提交的标签" | |
22932 | ||
33b62fba | 22933 | #: builtin/tag.c:473 |
94550ed3 JX |
22934 | msgid "print only tags that are merged" |
22935 | msgstr "只打印已经合并的标签" | |
22936 | ||
33b62fba | 22937 | #: builtin/tag.c:474 |
94550ed3 JX |
22938 | msgid "print only tags that are not merged" |
22939 | msgstr "只打印尚未合并的标签" | |
22940 | ||
33b62fba | 22941 | #: builtin/tag.c:478 |
ef317cd5 | 22942 | msgid "print only tags of the object" |
87cb7997 | 22943 | msgstr "只打印指向该对象的标签" |
ef317cd5 | 22944 | |
33b62fba | 22945 | #: builtin/tag.c:526 |
8ada9598 | 22946 | msgid "--column and -n are incompatible" |
81809b99 | 22947 | msgstr "--column 和 -n 不兼容" |
8ada9598 | 22948 | |
33b62fba | 22949 | #: builtin/tag.c:548 |
87cb7997 JX |
22950 | msgid "-n option is only allowed in list mode" |
22951 | msgstr "-n 选项只允许用在列表显示模式" | |
c04f5ac3 | 22952 | |
33b62fba | 22953 | #: builtin/tag.c:550 |
87cb7997 JX |
22954 | msgid "--contains option is only allowed in list mode" |
22955 | msgstr "--contains 选项只允许用在列表显示模式" | |
c04f5ac3 | 22956 | |
33b62fba | 22957 | #: builtin/tag.c:552 |
87cb7997 JX |
22958 | msgid "--no-contains option is only allowed in list mode" |
22959 | msgstr "--no-contains 选项只允许用在列表显示模式" | |
7ac1c0ad | 22960 | |
33b62fba | 22961 | #: builtin/tag.c:554 |
87cb7997 JX |
22962 | msgid "--points-at option is only allowed in list mode" |
22963 | msgstr "--points-at 选项只允许用在列表显示模式" | |
94550ed3 | 22964 | |
33b62fba | 22965 | #: builtin/tag.c:556 |
87cb7997 JX |
22966 | msgid "--merged and --no-merged options are only allowed in list mode" |
22967 | msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" | |
22968 | ||
33b62fba | 22969 | #: builtin/tag.c:567 |
c04f5ac3 JX |
22970 | msgid "only one -F or -m option is allowed." |
22971 | msgstr "只允许一个 -F 或 -m 选项。" | |
22972 | ||
33b62fba | 22973 | #: builtin/tag.c:592 |
c04f5ac3 JX |
22974 | #, c-format |
22975 | msgid "'%s' is not a valid tag name." | |
55a16ee4 | 22976 | msgstr "'%s' 不是一个有效的标签名称。" |
c04f5ac3 | 22977 | |
33b62fba | 22978 | #: builtin/tag.c:597 |
c04f5ac3 JX |
22979 | #, c-format |
22980 | msgid "tag '%s' already exists" | |
55a16ee4 | 22981 | msgstr "标签 '%s' 已存在" |
c04f5ac3 | 22982 | |
33b62fba | 22983 | #: builtin/tag.c:628 |
c04f5ac3 JX |
22984 | #, c-format |
22985 | msgid "Updated tag '%s' (was %s)\n" | |
55a16ee4 | 22986 | msgstr "已更新标签 '%s'(曾为 %s)\n" |
c04f5ac3 | 22987 | |
33b62fba | 22988 | #: builtin/unpack-objects.c:504 |
6c94aba5 JX |
22989 | msgid "Unpacking objects" |
22990 | msgstr "展开对象中" | |
22991 | ||
ddc12c42 | 22992 | #: builtin/update-index.c:84 |
7aea43ff JX |
22993 | #, c-format |
22994 | msgid "failed to create directory %s" | |
c1ac5258 | 22995 | msgstr "创建目录 %s 失败" |
7aea43ff | 22996 | |
ddc12c42 | 22997 | #: builtin/update-index.c:100 |
7aea43ff JX |
22998 | #, c-format |
22999 | msgid "failed to create file %s" | |
c1ac5258 | 23000 | msgstr "创建文件 %s 失败" |
7aea43ff | 23001 | |
ddc12c42 | 23002 | #: builtin/update-index.c:108 |
7aea43ff JX |
23003 | #, c-format |
23004 | msgid "failed to delete file %s" | |
c1ac5258 | 23005 | msgstr "删除文件 %s 失败" |
7aea43ff | 23006 | |
ddc12c42 | 23007 | #: builtin/update-index.c:115 builtin/update-index.c:221 |
7aea43ff JX |
23008 | #, c-format |
23009 | msgid "failed to delete directory %s" | |
c1ac5258 | 23010 | msgstr "删除目录 %s 失败" |
7aea43ff | 23011 | |
ddc12c42 | 23012 | #: builtin/update-index.c:140 |
7aea43ff | 23013 | #, c-format |
276ceeaa JX |
23014 | msgid "Testing mtime in '%s' " |
23015 | msgstr "在 '%s' 中测试 mtime " | |
7aea43ff | 23016 | |
ddc12c42 | 23017 | #: builtin/update-index.c:154 |
7aea43ff JX |
23018 | msgid "directory stat info does not change after adding a new file" |
23019 | msgstr "添加一个新文件后,目录的状态信息未改变" | |
23020 | ||
ddc12c42 | 23021 | #: builtin/update-index.c:167 |
7aea43ff JX |
23022 | msgid "directory stat info does not change after adding a new directory" |
23023 | msgstr "添加一个新目录后,目录的状态信息未改变" | |
23024 | ||
ddc12c42 | 23025 | #: builtin/update-index.c:180 |
7aea43ff JX |
23026 | msgid "directory stat info changes after updating a file" |
23027 | msgstr "更新一个文件后,目录的状态信息被修改" | |
23028 | ||
ddc12c42 | 23029 | #: builtin/update-index.c:191 |
7aea43ff JX |
23030 | msgid "directory stat info changes after adding a file inside subdirectory" |
23031 | msgstr "在子目录中添加文件后,目录的状态信息被修改" | |
23032 | ||
ddc12c42 | 23033 | #: builtin/update-index.c:202 |
7aea43ff JX |
23034 | msgid "directory stat info does not change after deleting a file" |
23035 | msgstr "删除一个文件后,目录的状态信息未改变" | |
23036 | ||
ddc12c42 | 23037 | #: builtin/update-index.c:215 |
7aea43ff JX |
23038 | msgid "directory stat info does not change after deleting a directory" |
23039 | msgstr "删除一个目录后,目录的状态信息未改变" | |
23040 | ||
ddc12c42 | 23041 | #: builtin/update-index.c:222 |
7aea43ff JX |
23042 | msgid " OK" |
23043 | msgstr " OK" | |
23044 | ||
ddc12c42 | 23045 | #: builtin/update-index.c:591 |
814ff314 JX |
23046 | msgid "git update-index [<options>] [--] [<file>...]" |
23047 | msgstr "git update-index [<选项>] [--] [<文件>...]" | |
8ada9598 | 23048 | |
33b62fba | 23049 | #: builtin/update-index.c:976 |
ef317cd5 | 23050 | msgid "continue refresh even when index needs update" |
07432cef | 23051 | msgstr "当索引需要更新时继续刷新" |
8ada9598 | 23052 | |
33b62fba | 23053 | #: builtin/update-index.c:979 |
ef317cd5 | 23054 | msgid "refresh: ignore submodules" |
07432cef | 23055 | msgstr "刷新:忽略子模组" |
8ada9598 | 23056 | |
33b62fba | 23057 | #: builtin/update-index.c:982 |
ef317cd5 | 23058 | msgid "do not ignore new files" |
07432cef | 23059 | msgstr "不忽略新的文件" |
8ada9598 | 23060 | |
33b62fba | 23061 | #: builtin/update-index.c:984 |
ef317cd5 | 23062 | msgid "let files replace directories and vice-versa" |
07432cef | 23063 | msgstr "让文件替换目录(反之亦然)" |
ef317cd5 | 23064 | |
33b62fba | 23065 | #: builtin/update-index.c:986 |
ef317cd5 | 23066 | msgid "notice files missing from worktree" |
07432cef | 23067 | msgstr "通知文件从工作区丢失" |
ef317cd5 | 23068 | |
33b62fba | 23069 | #: builtin/update-index.c:988 |
ef317cd5 | 23070 | msgid "refresh even if index contains unmerged entries" |
07432cef | 23071 | msgstr "即使索引区包含未合并的条目也执行刷新" |
ef317cd5 | 23072 | |
33b62fba | 23073 | #: builtin/update-index.c:991 |
ef317cd5 | 23074 | msgid "refresh stat information" |
07432cef | 23075 | msgstr "刷新统计信息" |
ef317cd5 | 23076 | |
33b62fba | 23077 | #: builtin/update-index.c:995 |
ef317cd5 | 23078 | msgid "like --refresh, but ignore assume-unchanged setting" |
07432cef | 23079 | msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" |
ef317cd5 | 23080 | |
33b62fba | 23081 | #: builtin/update-index.c:999 |
6c94aba5 | 23082 | msgid "<mode>,<object>,<path>" |
d9d56b23 | 23083 | msgstr "<存取模式>,<对象>,<路径>" |
ef317cd5 | 23084 | |
33b62fba | 23085 | #: builtin/update-index.c:1000 |
ef317cd5 | 23086 | msgid "add the specified entry to the index" |
07432cef | 23087 | msgstr "添加指定的条目到索引区" |
ef317cd5 | 23088 | |
33b62fba | 23089 | #: builtin/update-index.c:1010 |
ef317cd5 | 23090 | msgid "mark files as \"not changing\"" |
07432cef | 23091 | msgstr "把文件标记为 \"没有变更\"" |
ef317cd5 | 23092 | |
33b62fba | 23093 | #: builtin/update-index.c:1013 |
ef317cd5 | 23094 | msgid "clear assumed-unchanged bit" |
07432cef | 23095 | msgstr "清除 assumed-unchanged 位" |
ef317cd5 | 23096 | |
33b62fba | 23097 | #: builtin/update-index.c:1016 |
ef317cd5 | 23098 | msgid "mark files as \"index-only\"" |
07432cef | 23099 | msgstr "把文件标记为 \"仅索引\"" |
ef317cd5 | 23100 | |
33b62fba | 23101 | #: builtin/update-index.c:1019 |
ef317cd5 | 23102 | msgid "clear skip-worktree bit" |
07432cef | 23103 | msgstr "清除 skip-worktree 位" |
ef317cd5 | 23104 | |
33b62fba | 23105 | #: builtin/update-index.c:1022 |
ddc12c42 JX |
23106 | msgid "do not touch index-only entries" |
23107 | msgstr "不要触碰仅索引条目" | |
23108 | ||
33b62fba | 23109 | #: builtin/update-index.c:1024 |
ef317cd5 | 23110 | msgid "add to index only; do not add content to object database" |
07432cef | 23111 | msgstr "只添加到索引区;不添加对象到对象库" |
ef317cd5 | 23112 | |
33b62fba | 23113 | #: builtin/update-index.c:1026 |
ef317cd5 | 23114 | msgid "remove named paths even if present in worktree" |
07432cef | 23115 | msgstr "即使存在工作区里,也删除路径" |
ef317cd5 | 23116 | |
33b62fba | 23117 | #: builtin/update-index.c:1028 |
ef317cd5 | 23118 | msgid "with --stdin: input lines are terminated by null bytes" |
07432cef | 23119 | msgstr "携带 --stdin:输入的行以 null 字符终止" |
ef317cd5 | 23120 | |
33b62fba | 23121 | #: builtin/update-index.c:1030 |
ef317cd5 | 23122 | msgid "read list of paths to be updated from standard input" |
07432cef | 23123 | msgstr "从标准输入中读取需要更新的路径列表" |
ef317cd5 | 23124 | |
33b62fba | 23125 | #: builtin/update-index.c:1034 |
ef317cd5 | 23126 | msgid "add entries from standard input to the index" |
07432cef | 23127 | msgstr "从标准输入添加条目到索引区" |
ef317cd5 | 23128 | |
33b62fba | 23129 | #: builtin/update-index.c:1038 |
ef317cd5 | 23130 | msgid "repopulate stages #2 and #3 for the listed paths" |
07432cef | 23131 | msgstr "为指定文件重新生成第2和第3暂存区" |
ef317cd5 | 23132 | |
33b62fba | 23133 | #: builtin/update-index.c:1042 |
ef317cd5 | 23134 | msgid "only update entries that differ from HEAD" |
07432cef | 23135 | msgstr "只更新与 HEAD 不同的条目" |
ef317cd5 | 23136 | |
33b62fba | 23137 | #: builtin/update-index.c:1046 |
ef317cd5 | 23138 | msgid "ignore files missing from worktree" |
07432cef | 23139 | msgstr "忽略工作区丢失的文件" |
ef317cd5 | 23140 | |
33b62fba | 23141 | #: builtin/update-index.c:1049 |
ef317cd5 | 23142 | msgid "report actions to standard output" |
07432cef | 23143 | msgstr "在标准输出显示操作" |
ef317cd5 | 23144 | |
33b62fba | 23145 | #: builtin/update-index.c:1051 |
ef317cd5 | 23146 | msgid "(for porcelains) forget saved unresolved conflicts" |
07432cef | 23147 | msgstr "(for porcelains) 忘记保存的未解决的冲突" |
ef317cd5 | 23148 | |
33b62fba | 23149 | #: builtin/update-index.c:1055 |
ef317cd5 | 23150 | msgid "write index in this format" |
07432cef | 23151 | msgstr "以这种格式写入索引区" |
ef317cd5 | 23152 | |
33b62fba | 23153 | #: builtin/update-index.c:1057 |
6acbf033 JX |
23154 | msgid "enable or disable split index" |
23155 | msgstr "启用或禁用索引拆分" | |
23156 | ||
33b62fba | 23157 | #: builtin/update-index.c:1059 |
7aea43ff JX |
23158 | msgid "enable/disable untracked cache" |
23159 | msgstr "启用/禁用对未跟踪文件的缓存" | |
23160 | ||
33b62fba | 23161 | #: builtin/update-index.c:1061 |
276ceeaa JX |
23162 | msgid "test if the filesystem supports untracked cache" |
23163 | msgstr "测试文件系统是否支持未跟踪文件缓存" | |
23164 | ||
33b62fba | 23165 | #: builtin/update-index.c:1063 |
7aea43ff JX |
23166 | msgid "enable untracked cache without testing the filesystem" |
23167 | msgstr "无需检测文件系统,启用对未跟踪文件的缓存" | |
23168 | ||
33b62fba | 23169 | #: builtin/update-index.c:1065 |
5809aa05 JX |
23170 | msgid "write out the index even if is not flagged as changed" |
23171 | msgstr "即使没有被标记为已更改,也要写出索引" | |
23172 | ||
33b62fba | 23173 | #: builtin/update-index.c:1067 |
5809aa05 JX |
23174 | msgid "enable or disable file system monitor" |
23175 | msgstr "启用或禁用文件系统监控" | |
23176 | ||
33b62fba | 23177 | #: builtin/update-index.c:1069 |
5809aa05 JX |
23178 | msgid "mark files as fsmonitor valid" |
23179 | msgstr "标记文件为 fsmonitor 有效" | |
23180 | ||
33b62fba | 23181 | #: builtin/update-index.c:1072 |
5809aa05 JX |
23182 | msgid "clear fsmonitor valid bit" |
23183 | msgstr "清除 fsmonitor 有效位" | |
23184 | ||
33b62fba | 23185 | #: builtin/update-index.c:1175 |
87cb7997 JX |
23186 | msgid "" |
23187 | "core.splitIndex is set to false; remove or change it, if you really want to " | |
23188 | "enable split index" | |
23189 | msgstr "" | |
23190 | "core.splitIndex 被设置为 false。如果您确实要启用索引拆分,请删除或修改它。" | |
23191 | ||
33b62fba | 23192 | #: builtin/update-index.c:1184 |
87cb7997 JX |
23193 | msgid "" |
23194 | "core.splitIndex is set to true; remove or change it, if you really want to " | |
23195 | "disable split index" | |
23196 | msgstr "" | |
23197 | "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分,请删除或修改它。" | |
23198 | ||
33b62fba | 23199 | #: builtin/update-index.c:1196 |
a0b6b246 JX |
23200 | msgid "" |
23201 | "core.untrackedCache is set to true; remove or change it, if you really want " | |
23202 | "to disable the untracked cache" | |
275588f9 JX |
23203 | msgstr "" |
23204 | "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" | |
23205 | "改它。" | |
a0b6b246 | 23206 | |
33b62fba | 23207 | #: builtin/update-index.c:1200 |
276ceeaa JX |
23208 | msgid "Untracked cache disabled" |
23209 | msgstr "缓存未跟踪文件被禁用" | |
23210 | ||
33b62fba | 23211 | #: builtin/update-index.c:1208 |
a0b6b246 JX |
23212 | msgid "" |
23213 | "core.untrackedCache is set to false; remove or change it, if you really want " | |
23214 | "to enable the untracked cache" | |
275588f9 JX |
23215 | msgstr "" |
23216 | "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" | |
23217 | "修改它。" | |
a0b6b246 | 23218 | |
33b62fba | 23219 | #: builtin/update-index.c:1212 |
276ceeaa JX |
23220 | #, c-format |
23221 | msgid "Untracked cache enabled for '%s'" | |
23222 | msgstr "缓存未跟踪文件在 '%s' 启用" | |
23223 | ||
33b62fba | 23224 | #: builtin/update-index.c:1220 |
5809aa05 | 23225 | msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" |
31e5e17b | 23226 | msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" |
5809aa05 | 23227 | |
33b62fba | 23228 | #: builtin/update-index.c:1224 |
5809aa05 JX |
23229 | msgid "fsmonitor enabled" |
23230 | msgstr "fsmonitor 被启用" | |
23231 | ||
33b62fba | 23232 | #: builtin/update-index.c:1227 |
5809aa05 JX |
23233 | msgid "" |
23234 | "core.fsmonitor is set; remove it if you really want to disable fsmonitor" | |
31e5e17b | 23235 | msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" |
5809aa05 | 23236 | |
33b62fba | 23237 | #: builtin/update-index.c:1231 |
5809aa05 JX |
23238 | msgid "fsmonitor disabled" |
23239 | msgstr "fsmonitor 被禁用" | |
23240 | ||
a4f16749 | 23241 | #: builtin/update-ref.c:10 |
814ff314 JX |
23242 | msgid "git update-ref [<options>] -d <refname> [<old-val>]" |
23243 | msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]" | |
ef317cd5 | 23244 | |
a4f16749 | 23245 | #: builtin/update-ref.c:11 |
814ff314 JX |
23246 | msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" |
23247 | msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]" | |
90314792 | 23248 | |
a4f16749 | 23249 | #: builtin/update-ref.c:12 |
814ff314 JX |
23250 | msgid "git update-ref [<options>] --stdin [-z]" |
23251 | msgstr "git update-ref [<选项>] --stdin [-z]" | |
ef317cd5 | 23252 | |
d13389bf | 23253 | #: builtin/update-ref.c:500 |
ef317cd5 | 23254 | msgid "delete the reference" |
07432cef | 23255 | msgstr "删除引用" |
ef317cd5 | 23256 | |
d13389bf | 23257 | #: builtin/update-ref.c:502 |
ef317cd5 | 23258 | msgid "update <refname> not the one it points to" |
07432cef | 23259 | msgstr "更新 <引用名> 本身而不是它指向的引用" |
ef317cd5 | 23260 | |
d13389bf | 23261 | #: builtin/update-ref.c:503 |
90314792 JX |
23262 | msgid "stdin has NUL-terminated arguments" |
23263 | msgstr "标准输入有以 NUL 字符终止的参数" | |
23264 | ||
d13389bf | 23265 | #: builtin/update-ref.c:504 |
90314792 JX |
23266 | msgid "read updates from stdin" |
23267 | msgstr "从标准输入读取更新" | |
23268 | ||
a4f16749 | 23269 | #: builtin/update-server-info.c:7 |
ef317cd5 | 23270 | msgid "git update-server-info [--force]" |
07432cef | 23271 | msgstr "git update-server-info [--force]" |
ef317cd5 | 23272 | |
a4f16749 | 23273 | #: builtin/update-server-info.c:15 |
ef317cd5 | 23274 | msgid "update the info files from scratch" |
07432cef | 23275 | msgstr "从头开始更新文件信息" |
ef317cd5 | 23276 | |
fd8cb379 JX |
23277 | #: builtin/upload-pack.c:11 |
23278 | msgid "git upload-pack [<options>] <dir>" | |
23279 | msgstr "git upload-pack [<选项>] <目录>" | |
23280 | ||
d46c5519 JX |
23281 | #: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 |
23282 | msgid "quit after a single request/response exchange" | |
23283 | msgstr "在一次单独的请求/响应之后退出" | |
23284 | ||
fd8cb379 JX |
23285 | #: builtin/upload-pack.c:25 |
23286 | msgid "exit immediately after initial ref advertisement" | |
23287 | msgstr "在初始的引用广告后立即退出" | |
23288 | ||
23289 | #: builtin/upload-pack.c:27 | |
23290 | msgid "do not try <directory>/.git/ if <directory> is no Git directory" | |
23291 | msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/" | |
23292 | ||
23293 | #: builtin/upload-pack.c:29 | |
23294 | msgid "interrupt transfer after <n> seconds of inactivity" | |
23295 | msgstr "不活动 <n> 秒钟后终止传输" | |
23296 | ||
a6cd2cc4 | 23297 | #: builtin/verify-commit.c:19 |
814ff314 JX |
23298 | msgid "git verify-commit [-v | --verbose] <commit>..." |
23299 | msgstr "git verify-commit [-v | --verbose] <提交>..." | |
6acbf033 | 23300 | |
a6cd2cc4 | 23301 | #: builtin/verify-commit.c:68 |
6acbf033 JX |
23302 | msgid "print commit contents" |
23303 | msgstr "打印提交内容" | |
23304 | ||
a6cd2cc4 | 23305 | #: builtin/verify-commit.c:69 builtin/verify-tag.c:37 |
1b7f4a34 JX |
23306 | msgid "print raw gpg status output" |
23307 | msgstr "打印原始 gpg 状态输出" | |
23308 | ||
d9488fea | 23309 | #: builtin/verify-pack.c:59 |
814ff314 JX |
23310 | msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." |
23311 | msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." | |
ef317cd5 | 23312 | |
d9488fea | 23313 | #: builtin/verify-pack.c:70 |
ef317cd5 JX |
23314 | msgid "verbose" |
23315 | msgstr "冗长输出" | |
23316 | ||
d9488fea | 23317 | #: builtin/verify-pack.c:72 |
ef317cd5 | 23318 | msgid "show statistics only" |
07432cef | 23319 | msgstr "只显示统计" |
ef317cd5 | 23320 | |
a6cd2cc4 | 23321 | #: builtin/verify-tag.c:18 |
1a79b2f1 JX |
23322 | msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." |
23323 | msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." | |
ef317cd5 | 23324 | |
a6cd2cc4 | 23325 | #: builtin/verify-tag.c:36 |
ef317cd5 | 23326 | msgid "print tag contents" |
55a16ee4 | 23327 | msgstr "打印标签内容" |
ef317cd5 | 23328 | |
473eb541 | 23329 | #: builtin/worktree.c:18 |
31e5e17b JX |
23330 | msgid "git worktree add [<options>] <path> [<commit-ish>]" |
23331 | msgstr "git worktree add [<选项>] <路径> [<提交>]" | |
5bb01d4f | 23332 | |
473eb541 | 23333 | #: builtin/worktree.c:19 |
5c57d762 JX |
23334 | msgid "git worktree list [<options>]" |
23335 | msgstr "git worktree list [<选项>]" | |
23336 | ||
473eb541 | 23337 | #: builtin/worktree.c:20 |
5c57d762 JX |
23338 | msgid "git worktree lock [<options>] <path>" |
23339 | msgstr "git worktree lock [<选项>] <路径>" | |
23340 | ||
473eb541 | 23341 | #: builtin/worktree.c:21 |
31e5e17b JX |
23342 | msgid "git worktree move <worktree> <new-path>" |
23343 | msgstr "git worktree move <工作区> <新路径>" | |
23344 | ||
473eb541 | 23345 | #: builtin/worktree.c:22 |
5bb01d4f JX |
23346 | msgid "git worktree prune [<options>]" |
23347 | msgstr "git worktree prune [<选项>]" | |
23348 | ||
473eb541 | 23349 | #: builtin/worktree.c:23 |
31e5e17b JX |
23350 | msgid "git worktree remove [<options>] <worktree>" |
23351 | msgstr "git worktree remove [<选项>] <工作区>" | |
23352 | ||
473eb541 | 23353 | #: builtin/worktree.c:24 |
5c57d762 JX |
23354 | msgid "git worktree unlock <path>" |
23355 | msgstr "git worktree unlock <路径>" | |
94550ed3 | 23356 | |
ec3d4607 | 23357 | #: builtin/worktree.c:61 builtin/worktree.c:944 |
4c27fcb5 JX |
23358 | #, c-format |
23359 | msgid "failed to delete '%s'" | |
23360 | msgstr "删除 '%s' 失败" | |
23361 | ||
473eb541 | 23362 | #: builtin/worktree.c:74 |
5bb01d4f | 23363 | #, c-format |
7157c2b5 JX |
23364 | msgid "Removing %s/%s: %s" |
23365 | msgstr "删除 %s/%s: %s" | |
5bb01d4f | 23366 | |
ec3d4607 | 23367 | #: builtin/worktree.c:147 |
1a79b2f1 JX |
23368 | msgid "report pruned working trees" |
23369 | msgstr "报告清除的工作区" | |
23370 | ||
ec3d4607 | 23371 | #: builtin/worktree.c:149 |
1a79b2f1 | 23372 | msgid "expire working trees older than <time>" |
58b6f078 | 23373 | msgstr "将早于 <时间> 的工作区过期" |
1a79b2f1 | 23374 | |
ec3d4607 | 23375 | #: builtin/worktree.c:219 |
5bb01d4f JX |
23376 | #, c-format |
23377 | msgid "'%s' already exists" | |
23378 | msgstr "'%s' 已经存在" | |
23379 | ||
ec3d4607 | 23380 | #: builtin/worktree.c:228 |
4c27fcb5 | 23381 | #, c-format |
7157c2b5 JX |
23382 | msgid "unusable worktree destination '%s'" |
23383 | msgstr "无法使用的工作区目标 '%s'" | |
4c27fcb5 | 23384 | |
ec3d4607 | 23385 | #: builtin/worktree.c:233 |
4c27fcb5 JX |
23386 | #, c-format |
23387 | msgid "" | |
23388 | "'%s' is a missing but locked worktree;\n" | |
7157c2b5 | 23389 | "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" |
4c27fcb5 | 23390 | msgstr "" |
7157c2b5 JX |
23391 | "'%s' 是一个丢失但锁定的工作区,\n" |
23392 | "使用 '%s -f -f' 覆盖,或用 'unlock' 和 'prune' 或 'remove' 清除" | |
4c27fcb5 | 23393 | |
ec3d4607 | 23394 | #: builtin/worktree.c:235 |
4c27fcb5 JX |
23395 | #, c-format |
23396 | msgid "" | |
23397 | "'%s' is a missing but already registered worktree;\n" | |
7157c2b5 | 23398 | "use '%s -f' to override, or 'prune' or 'remove' to clear" |
4c27fcb5 | 23399 | msgstr "" |
7157c2b5 JX |
23400 | "'%s' 是一个丢失但已经注册的工作区,\n" |
23401 | "使用 '%s -f' 覆盖,或用 'prune' 或 'remove' 清除" | |
4c27fcb5 | 23402 | |
ec3d4607 | 23403 | #: builtin/worktree.c:286 |
5bb01d4f JX |
23404 | #, c-format |
23405 | msgid "could not create directory of '%s'" | |
23406 | msgstr "不能创建目录 '%s'" | |
23407 | ||
ec3d4607 JX |
23408 | #: builtin/worktree.c:308 |
23409 | msgid "initializing" | |
23410 | msgstr "初始化" | |
23411 | ||
23412 | #: builtin/worktree.c:420 builtin/worktree.c:426 | |
fd8cb379 JX |
23413 | #, c-format |
23414 | msgid "Preparing worktree (new branch '%s')" | |
23415 | msgstr "准备工作区(新分支 '%s')" | |
23416 | ||
ec3d4607 | 23417 | #: builtin/worktree.c:422 |
fd8cb379 JX |
23418 | #, c-format |
23419 | msgid "Preparing worktree (resetting branch '%s'; was at %s)" | |
23420 | msgstr "准备工作区(重置分支 '%s',之前为 %s)" | |
23421 | ||
ec3d4607 | 23422 | #: builtin/worktree.c:431 |
fd8cb379 JX |
23423 | #, c-format |
23424 | msgid "Preparing worktree (checking out '%s')" | |
23425 | msgstr "准备工作区(检出 '%s')" | |
23426 | ||
ec3d4607 | 23427 | #: builtin/worktree.c:437 |
5bb01d4f | 23428 | #, c-format |
fd8cb379 JX |
23429 | msgid "Preparing worktree (detached HEAD %s)" |
23430 | msgstr "准备工作区(分离头指针 %s)" | |
5bb01d4f | 23431 | |
33b62fba | 23432 | #: builtin/worktree.c:482 |
5bb01d4f | 23433 | msgid "checkout <branch> even if already checked out in other worktree" |
58b6f078 | 23434 | msgstr "检出 <分支>,即使已经被检出到其它工作区" |
5bb01d4f | 23435 | |
33b62fba | 23436 | #: builtin/worktree.c:485 |
5bb01d4f JX |
23437 | msgid "create a new branch" |
23438 | msgstr "创建一个新分支" | |
23439 | ||
33b62fba | 23440 | #: builtin/worktree.c:487 |
5bb01d4f JX |
23441 | msgid "create or reset a branch" |
23442 | msgstr "创建或重置一个分支" | |
23443 | ||
33b62fba | 23444 | #: builtin/worktree.c:489 |
5b04ee3b JX |
23445 | msgid "populate the new working tree" |
23446 | msgstr "生成新的工作区" | |
23447 | ||
33b62fba | 23448 | #: builtin/worktree.c:490 |
60638e98 JX |
23449 | msgid "keep the new working tree locked" |
23450 | msgstr "锁定新工作区" | |
23451 | ||
ec3d4607 JX |
23452 | #: builtin/worktree.c:492 builtin/worktree.c:729 |
23453 | msgid "reason for locking" | |
23454 | msgstr "锁定原因" | |
23455 | ||
23456 | #: builtin/worktree.c:495 | |
5809aa05 JX |
23457 | msgid "set up tracking mode (see git-branch(1))" |
23458 | msgstr "设置跟踪模式(参见 git-branch(1))" | |
23459 | ||
ec3d4607 | 23460 | #: builtin/worktree.c:498 |
5809aa05 JX |
23461 | msgid "try to match the new branch name with a remote-tracking branch" |
23462 | msgstr "尝试为新分支名匹配一个远程跟踪分支" | |
23463 | ||
ec3d4607 | 23464 | #: builtin/worktree.c:506 |
1b7f4a34 JX |
23465 | msgid "-b, -B, and --detach are mutually exclusive" |
23466 | msgstr "-b、-B 和 --detach 是互斥的" | |
5bb01d4f | 23467 | |
ec3d4607 JX |
23468 | #: builtin/worktree.c:508 |
23469 | msgid "--reason requires --lock" | |
23470 | msgstr "--reason 需要 --lock" | |
23471 | ||
23472 | #: builtin/worktree.c:512 | |
23473 | msgid "added with --lock" | |
23474 | msgstr "由 --lock 添加" | |
23475 | ||
23476 | #: builtin/worktree.c:574 | |
5809aa05 JX |
23477 | msgid "--[no-]track can only be used if a new branch is created" |
23478 | msgstr "只能在创建新分支时使用选项 --[no-]track " | |
23479 | ||
ec3d4607 | 23480 | #: builtin/worktree.c:691 |
473eb541 JX |
23481 | msgid "show extended annotations and reasons, if available" |
23482 | msgstr "显示扩展的注释和原因(如果有)" | |
23483 | ||
ec3d4607 | 23484 | #: builtin/worktree.c:693 |
473eb541 JX |
23485 | msgid "add 'prunable' annotation to worktrees older than <time>" |
23486 | msgstr "向早于 <时间> 的工作区添添加“可修剪”注释" | |
23487 | ||
ec3d4607 | 23488 | #: builtin/worktree.c:702 |
473eb541 JX |
23489 | msgid "--verbose and --porcelain are mutually exclusive" |
23490 | msgstr "--verbose 和 --porcelain 互斥" | |
23491 | ||
ec3d4607 JX |
23492 | #: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 |
23493 | #: builtin/worktree.c:972 | |
5c57d762 JX |
23494 | #, c-format |
23495 | msgid "'%s' is not a working tree" | |
23496 | msgstr "'%s' 不是一个工作区" | |
23497 | ||
ec3d4607 | 23498 | #: builtin/worktree.c:743 builtin/worktree.c:776 |
5c57d762 JX |
23499 | msgid "The main working tree cannot be locked or unlocked" |
23500 | msgstr "主工作区无法被加锁或解锁" | |
23501 | ||
ec3d4607 | 23502 | #: builtin/worktree.c:748 |
5c57d762 JX |
23503 | #, c-format |
23504 | msgid "'%s' is already locked, reason: %s" | |
23505 | msgstr "'%s' 已被锁定,原因:%s" | |
23506 | ||
ec3d4607 | 23507 | #: builtin/worktree.c:750 |
5c57d762 JX |
23508 | #, c-format |
23509 | msgid "'%s' is already locked" | |
23510 | msgstr "'%s' 已被锁定" | |
23511 | ||
ec3d4607 | 23512 | #: builtin/worktree.c:778 |
5c57d762 JX |
23513 | #, c-format |
23514 | msgid "'%s' is not locked" | |
23515 | msgstr "'%s' 未被锁定" | |
23516 | ||
ec3d4607 | 23517 | #: builtin/worktree.c:819 |
31e5e17b | 23518 | msgid "working trees containing submodules cannot be moved or removed" |
610f8099 | 23519 | msgstr "不能移动或删除包含子模组的工作区" |
31e5e17b | 23520 | |
ec3d4607 | 23521 | #: builtin/worktree.c:827 |
4c27fcb5 JX |
23522 | msgid "force move even if worktree is dirty or locked" |
23523 | msgstr "强制移动,即使工作区是脏的或已锁定" | |
23524 | ||
ec3d4607 | 23525 | #: builtin/worktree.c:850 builtin/worktree.c:974 |
31e5e17b JX |
23526 | #, c-format |
23527 | msgid "'%s' is a main working tree" | |
23528 | msgstr "'%s' 是一个主工作区" | |
23529 | ||
ec3d4607 | 23530 | #: builtin/worktree.c:855 |
31e5e17b JX |
23531 | #, c-format |
23532 | msgid "could not figure out destination name from '%s'" | |
23533 | msgstr "无法从 '%s' 算出目标名称" | |
23534 | ||
ec3d4607 | 23535 | #: builtin/worktree.c:868 |
31e5e17b | 23536 | #, c-format |
4c27fcb5 JX |
23537 | msgid "" |
23538 | "cannot move a locked working tree, lock reason: %s\n" | |
23539 | "use 'move -f -f' to override or unlock first" | |
23540 | msgstr "" | |
23541 | "无法移动一个锁定的工作区,锁定原因:%s\n" | |
23542 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 23543 | |
ec3d4607 | 23544 | #: builtin/worktree.c:870 |
4c27fcb5 JX |
23545 | msgid "" |
23546 | "cannot move a locked working tree;\n" | |
23547 | "use 'move -f -f' to override or unlock first" | |
23548 | msgstr "" | |
23549 | "无法移动一个锁定的工作区,\n" | |
23550 | "使用 'move -f -f' 覆盖或先解锁" | |
31e5e17b | 23551 | |
ec3d4607 | 23552 | #: builtin/worktree.c:873 |
31e5e17b JX |
23553 | #, c-format |
23554 | msgid "validation failed, cannot move working tree: %s" | |
23555 | msgstr "验证失败,无法移动工作区:%s" | |
23556 | ||
ec3d4607 | 23557 | #: builtin/worktree.c:878 |
31e5e17b JX |
23558 | #, c-format |
23559 | msgid "failed to move '%s' to '%s'" | |
c1ac5258 | 23560 | msgstr "移动 '%s' 到 '%s' 失败" |
31e5e17b | 23561 | |
ec3d4607 | 23562 | #: builtin/worktree.c:924 |
31e5e17b JX |
23563 | #, c-format |
23564 | msgid "failed to run 'git status' on '%s'" | |
c1ac5258 | 23565 | msgstr "在 '%s' 中执行 'git status' 失败" |
31e5e17b | 23566 | |
ec3d4607 | 23567 | #: builtin/worktree.c:928 |
31e5e17b | 23568 | #, c-format |
a5cd71ca JX |
23569 | msgid "'%s' contains modified or untracked files, use --force to delete it" |
23570 | msgstr "'%s' 包含修改或未跟踪的文件,使用 --force 删除" | |
31e5e17b | 23571 | |
ec3d4607 | 23572 | #: builtin/worktree.c:933 |
31e5e17b JX |
23573 | #, c-format |
23574 | msgid "failed to run 'git status' on '%s', code %d" | |
c1ac5258 | 23575 | msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" |
31e5e17b | 23576 | |
ec3d4607 | 23577 | #: builtin/worktree.c:956 |
4c27fcb5 JX |
23578 | msgid "force removal even if worktree is dirty or locked" |
23579 | msgstr "强制删除,即使工作区是脏的或已锁定" | |
31e5e17b | 23580 | |
ec3d4607 | 23581 | #: builtin/worktree.c:979 |
31e5e17b | 23582 | #, c-format |
4c27fcb5 JX |
23583 | msgid "" |
23584 | "cannot remove a locked working tree, lock reason: %s\n" | |
23585 | "use 'remove -f -f' to override or unlock first" | |
23586 | msgstr "" | |
23587 | "无法删除一个锁定的工作区,锁定原因:%s\n" | |
23588 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 23589 | |
ec3d4607 | 23590 | #: builtin/worktree.c:981 |
4c27fcb5 JX |
23591 | msgid "" |
23592 | "cannot remove a locked working tree;\n" | |
23593 | "use 'remove -f -f' to override or unlock first" | |
23594 | msgstr "" | |
23595 | "无法删除一个锁定的工作区,\n" | |
23596 | "使用 'remove -f -f' 覆盖或先解锁" | |
31e5e17b | 23597 | |
ec3d4607 | 23598 | #: builtin/worktree.c:984 |
31e5e17b JX |
23599 | #, c-format |
23600 | msgid "validation failed, cannot remove working tree: %s" | |
23601 | msgstr "验证失败,无法删除工作区:%s" | |
23602 | ||
ec3d4607 | 23603 | #: builtin/worktree.c:1008 |
d9488fea JX |
23604 | #, c-format |
23605 | msgid "repair: %s: %s" | |
23606 | msgstr "修理:%s:%s" | |
23607 | ||
ec3d4607 | 23608 | #: builtin/worktree.c:1011 |
d9488fea JX |
23609 | #, c-format |
23610 | msgid "error: %s: %s" | |
23611 | msgstr "错误:%s:%s" | |
23612 | ||
06991777 | 23613 | #: builtin/write-tree.c:15 |
ef317cd5 | 23614 | msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" |
07432cef | 23615 | msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" |
ef317cd5 | 23616 | |
06991777 | 23617 | #: builtin/write-tree.c:28 |
ef317cd5 | 23618 | msgid "<prefix>/" |
07432cef | 23619 | msgstr "<前缀>/" |
ef317cd5 | 23620 | |
06991777 | 23621 | #: builtin/write-tree.c:29 |
ef317cd5 | 23622 | msgid "write tree object for a subdirectory <prefix>" |
07432cef | 23623 | msgstr "将 <前缀> 子目录内容写到一个树对象" |
ef317cd5 | 23624 | |
06991777 | 23625 | #: builtin/write-tree.c:31 |
ef317cd5 | 23626 | msgid "only useful for debugging" |
07432cef | 23627 | msgstr "只对调试有用" |
ef317cd5 | 23628 | |
349ede6a | 23629 | #: git.c:28 |
31e5e17b JX |
23630 | msgid "" |
23631 | "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" | |
23632 | " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" | |
fd8cb379 JX |
23633 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
23634 | "bare]\n" | |
31e5e17b | 23635 | " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" |
473eb541 | 23636 | " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" |
31e5e17b JX |
23637 | " <command> [<args>]" |
23638 | msgstr "" | |
fd8cb379 | 23639 | "git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n" |
31e5e17b | 23640 | " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" |
33b62fba JX |
23641 | " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" |
23642 | "bare]\n" | |
31e5e17b | 23643 | " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n" |
473eb541 | 23644 | " [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n" |
31e5e17b JX |
23645 | " <命令> [<参数>]" |
23646 | ||
473eb541 | 23647 | #: git.c:36 |
4dcdc3d8 | 23648 | msgid "" |
220c313c | 23649 | "'git help -a' and 'git help -g' list available subcommands and some\n" |
4dcdc3d8 | 23650 | "concept guides. See 'git help <command>' or 'git help <concept>'\n" |
a6cd2cc4 JX |
23651 | "to read about a specific subcommand or concept.\n" |
23652 | "See 'git help git' for an overview of the system." | |
4dcdc3d8 | 23653 | msgstr "" |
220c313c JX |
23654 | "命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n" |
23655 | "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" | |
a6cd2cc4 JX |
23656 | "帮助。\n" |
23657 | "有关系统的概述,查看 'git help git'。" | |
8ada9598 | 23658 | |
473eb541 | 23659 | #: git.c:188 |
31e5e17b JX |
23660 | #, c-format |
23661 | msgid "no directory given for --git-dir\n" | |
23662 | msgstr "没有为 --git-dir 提供目录\n" | |
23663 | ||
473eb541 | 23664 | #: git.c:202 |
31e5e17b JX |
23665 | #, c-format |
23666 | msgid "no namespace given for --namespace\n" | |
23667 | msgstr "没有为 --namespace 提供命名空间\n" | |
23668 | ||
473eb541 | 23669 | #: git.c:216 |
31e5e17b JX |
23670 | #, c-format |
23671 | msgid "no directory given for --work-tree\n" | |
23672 | msgstr "没有为 --work-tree 提供目录\n" | |
23673 | ||
473eb541 | 23674 | #: git.c:230 |
31e5e17b JX |
23675 | #, c-format |
23676 | msgid "no prefix given for --super-prefix\n" | |
23677 | msgstr "没有为 --super-prefix 提供前缀\n" | |
23678 | ||
473eb541 | 23679 | #: git.c:252 |
31e5e17b JX |
23680 | #, c-format |
23681 | msgid "-c expects a configuration string\n" | |
23682 | msgstr "应为 -c 提供一个配置字符串\n" | |
23683 | ||
33b62fba JX |
23684 | #: git.c:260 |
23685 | #, c-format | |
23686 | msgid "no config key given for --config-env\n" | |
23687 | msgstr "没有为 --config-env 提供配置名称\n" | |
23688 | ||
23689 | #: git.c:300 | |
31e5e17b JX |
23690 | #, c-format |
23691 | msgid "no directory given for -C\n" | |
23692 | msgstr "没有为 -C 提供目录\n" | |
23693 | ||
33b62fba | 23694 | #: git.c:326 |
31e5e17b JX |
23695 | #, c-format |
23696 | msgid "unknown option: %s\n" | |
23697 | msgstr "未知选项:%s\n" | |
23698 | ||
33b62fba | 23699 | #: git.c:375 |
06991777 JX |
23700 | #, c-format |
23701 | msgid "while expanding alias '%s': '%s'" | |
5b533632 | 23702 | msgstr "在扩展别名 '%s' 时:'%s'" |
06991777 | 23703 | |
33b62fba | 23704 | #: git.c:384 |
06991777 JX |
23705 | #, c-format |
23706 | msgid "" | |
23707 | "alias '%s' changes environment variables.\n" | |
23708 | "You can use '!git' in the alias to do this" | |
23709 | msgstr "" | |
23710 | "别名 '%s' 修改环境变量。您可以使用在别名中\n" | |
23711 | "使用 '!git'" | |
23712 | ||
33b62fba | 23713 | #: git.c:391 |
06991777 JX |
23714 | #, c-format |
23715 | msgid "empty alias for %s" | |
23716 | msgstr "%s 的空别名" | |
23717 | ||
33b62fba | 23718 | #: git.c:394 |
06991777 JX |
23719 | #, c-format |
23720 | msgid "recursive alias: %s" | |
5b533632 | 23721 | msgstr "递归的别名:%s" |
06991777 | 23722 | |
33b62fba | 23723 | #: git.c:476 |
06991777 JX |
23724 | msgid "write failure on standard output" |
23725 | msgstr "在标准输出写入失败" | |
23726 | ||
33b62fba | 23727 | #: git.c:478 |
06991777 JX |
23728 | msgid "unknown write failure on standard output" |
23729 | msgstr "到标准输出的未知写入错误" | |
23730 | ||
33b62fba | 23731 | #: git.c:480 |
06991777 JX |
23732 | msgid "close failed on standard output" |
23733 | msgstr "标准输出关闭失败" | |
23734 | ||
33b62fba | 23735 | #: git.c:833 |
4c27fcb5 JX |
23736 | #, c-format |
23737 | msgid "alias loop detected: expansion of '%s' does not terminate:%s" | |
23738 | msgstr "检测到别名循环:'%s'的扩展未终止:%s" | |
23739 | ||
33b62fba | 23740 | #: git.c:883 |
06991777 JX |
23741 | #, c-format |
23742 | msgid "cannot handle %s as a builtin" | |
23743 | msgstr "不能作为内置命令处理 %s" | |
23744 | ||
33b62fba | 23745 | #: git.c:896 |
06991777 JX |
23746 | #, c-format |
23747 | msgid "" | |
23748 | "usage: %s\n" | |
23749 | "\n" | |
23750 | msgstr "" | |
23751 | "用法:%s\n" | |
23752 | "\n" | |
23753 | ||
33b62fba | 23754 | #: git.c:916 |
31e5e17b JX |
23755 | #, c-format |
23756 | msgid "expansion of alias '%s' failed; '%s' is not a git command\n" | |
23757 | msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" | |
23758 | ||
33b62fba | 23759 | #: git.c:928 |
31e5e17b JX |
23760 | #, c-format |
23761 | msgid "failed to run command '%s': %s\n" | |
c1ac5258 | 23762 | msgstr "运行命令 '%s' 失败:%s\n" |
31e5e17b | 23763 | |
33b62fba JX |
23764 | #: http-fetch.c:118 |
23765 | #, c-format | |
23766 | msgid "argument to --packfile must be a valid hash (got '%s')" | |
23767 | msgstr "--packfile 的参数必须是有效的哈希值(得到 '%s')" | |
23768 | ||
23769 | #: http-fetch.c:128 | |
23770 | msgid "not a git repository" | |
23771 | msgstr "不是 git 仓库" | |
23772 | ||
23773 | #: http-fetch.c:134 | |
23774 | msgid "--packfile requires --index-pack-args" | |
23775 | msgstr "--packfile 需要 --index-pack-args" | |
23776 | ||
23777 | #: http-fetch.c:143 | |
23778 | msgid "--index-pack-args can only be used with --packfile" | |
23779 | msgstr "--index-pack-args 只能和 --packfile 一起使用" | |
23780 | ||
23781 | #: t/helper/test-fast-rebase.c:141 | |
23782 | msgid "unhandled options" | |
23783 | msgstr "未处理的选项" | |
23784 | ||
23785 | #: t/helper/test-fast-rebase.c:146 | |
23786 | msgid "error preparing revisions" | |
23787 | msgstr "准备版本时错误" | |
23788 | ||
23789 | #: t/helper/test-reach.c:154 | |
23790 | #, c-format | |
23791 | msgid "commit %s is not marked reachable" | |
23792 | msgstr "提交 %s 没有标记为可达" | |
23793 | ||
23794 | #: t/helper/test-reach.c:164 | |
23795 | msgid "too many commits marked reachable" | |
23796 | msgstr "太多提交标记为可达" | |
23797 | ||
23798 | #: t/helper/test-serve-v2.c:7 | |
23799 | msgid "test-tool serve-v2 [<options>]" | |
23800 | msgstr "test-tool serve-v2 [<选项>]" | |
23801 | ||
23802 | #: t/helper/test-serve-v2.c:19 | |
23803 | msgid "exit immediately after advertising capabilities" | |
7b4d4954 | 23804 | msgstr "通告能力之后立即退出" |
33b62fba JX |
23805 | |
23806 | #: t/helper/test-simple-ipc.c:262 | |
23807 | #, c-format | |
23808 | msgid "socket/pipe already in use: '%s'" | |
23809 | msgstr "套接字/管道已在使用:'%s'" | |
23810 | ||
23811 | #: t/helper/test-simple-ipc.c:264 | |
23812 | #, c-format | |
23813 | msgid "could not start server on: '%s'" | |
23814 | msgstr "不能启动服务于:'%s'" | |
23815 | ||
23816 | #: t/helper/test-simple-ipc.c:295 t/helper/test-simple-ipc.c:331 | |
23817 | msgid "could not spawn daemon in the background" | |
23818 | msgstr "无法在后台生成守护进程" | |
23819 | ||
23820 | #: t/helper/test-simple-ipc.c:356 | |
23821 | msgid "waitpid failed" | |
23822 | msgstr "waitpid 失败" | |
23823 | ||
23824 | #: t/helper/test-simple-ipc.c:376 | |
23825 | msgid "daemon not online yet" | |
23826 | msgstr "守护进程尚未上线" | |
23827 | ||
23828 | #: t/helper/test-simple-ipc.c:406 | |
23829 | msgid "daemon failed to start" | |
23830 | msgstr "守护进程无法启动" | |
23831 | ||
23832 | #: t/helper/test-simple-ipc.c:410 | |
23833 | msgid "waitpid is confused" | |
23834 | msgstr "waitpid 迷惑了" | |
23835 | ||
23836 | #: t/helper/test-simple-ipc.c:541 | |
23837 | msgid "daemon has not shutdown yet" | |
23838 | msgstr "守护进程尚未关闭" | |
23839 | ||
23840 | #: t/helper/test-simple-ipc.c:682 | |
23841 | msgid "test-helper simple-ipc is-active [<name>] [<options>]" | |
23842 | msgstr "test-helper simple-ipc is-active [<名字>] [<选项>]" | |
23843 | ||
23844 | #: t/helper/test-simple-ipc.c:683 | |
23845 | msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" | |
23846 | msgstr "test-helper simple-ipc run-daemon [<名字>] [<线程>]" | |
23847 | ||
23848 | #: t/helper/test-simple-ipc.c:684 | |
23849 | msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" | |
23850 | msgstr "test-helper simple-ipc start-daemon [<名字>] [<线程>] [<最大等待>]" | |
23851 | ||
23852 | #: t/helper/test-simple-ipc.c:685 | |
23853 | msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" | |
23854 | msgstr "test-helper simple-ipc stop-daemon [<名字>] [<最大等待>]" | |
23855 | ||
23856 | #: t/helper/test-simple-ipc.c:686 | |
23857 | msgid "test-helper simple-ipc send [<name>] [<token>]" | |
23858 | msgstr "test-helper simple-ipc send [<名字>] [<令牌>]" | |
23859 | ||
23860 | #: t/helper/test-simple-ipc.c:687 | |
23861 | msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" | |
23862 | msgstr "test-helper simple-ipc sendbytes [<名字>] [<字节数>] [<字节>]" | |
23863 | ||
23864 | #: t/helper/test-simple-ipc.c:688 | |
23865 | msgid "" | |
23866 | "test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " | |
23867 | "[<batchsize>]" | |
ec3d4607 JX |
23868 | msgstr "" |
23869 | "test-helper simple-ipc multiple [<名字>] [<线程>] [<字节计数>] [<批处理大" | |
23870 | "小>]" | |
33b62fba JX |
23871 | |
23872 | #: t/helper/test-simple-ipc.c:696 | |
23873 | msgid "name or pathname of unix domain socket" | |
23874 | msgstr "unix 域套接字的名称或路径名" | |
23875 | ||
23876 | #: t/helper/test-simple-ipc.c:698 | |
23877 | msgid "named-pipe name" | |
23878 | msgstr "命名管道的名字" | |
23879 | ||
23880 | #: t/helper/test-simple-ipc.c:700 | |
23881 | msgid "number of threads in server thread pool" | |
23882 | msgstr "服务器线程池中的线程数" | |
23883 | ||
23884 | #: t/helper/test-simple-ipc.c:701 | |
23885 | msgid "seconds to wait for daemon to start or stop" | |
23886 | msgstr "等待守护进程启动或停止的秒数" | |
23887 | ||
23888 | #: t/helper/test-simple-ipc.c:703 | |
23889 | msgid "number of bytes" | |
23890 | msgstr "字节数目" | |
23891 | ||
23892 | #: t/helper/test-simple-ipc.c:704 | |
23893 | msgid "number of requests per thread" | |
23894 | msgstr "每个线程的请求数" | |
23895 | ||
23896 | #: t/helper/test-simple-ipc.c:706 | |
23897 | msgid "byte" | |
23898 | msgstr "字节" | |
23899 | ||
23900 | #: t/helper/test-simple-ipc.c:706 | |
23901 | msgid "ballast character" | |
23902 | msgstr "ballast character" | |
23903 | ||
23904 | #: t/helper/test-simple-ipc.c:707 | |
23905 | msgid "token" | |
23906 | msgstr "令牌" | |
23907 | ||
23908 | #: t/helper/test-simple-ipc.c:707 | |
23909 | msgid "command token to send to the server" | |
23910 | msgstr "发送到服务器的命令令牌" | |
23911 | ||
349ede6a | 23912 | #: http.c:399 |
60638e98 JX |
23913 | #, c-format |
23914 | msgid "negative value for http.postbuffer; defaulting to %d" | |
23915 | msgstr "http.postbuffer 为负值,默认为 %d" | |
23916 | ||
349ede6a | 23917 | #: http.c:420 |
a0b6b246 | 23918 | msgid "Delegation control is not supported with cURL < 7.22.0" |
4c27fcb5 | 23919 | msgstr "不支持委托控制,因为 cURL < 7.22.0" |
a0b6b246 | 23920 | |
349ede6a | 23921 | #: http.c:429 |
276ceeaa JX |
23922 | msgid "Public key pinning not supported with cURL < 7.44.0" |
23923 | msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0" | |
23924 | ||
7157c2b5 | 23925 | #: http.c:910 |
4c27fcb5 JX |
23926 | msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" |
23927 | msgstr "不支持 CURLSSLOPT_NO_REVOKE,因为 cURL < 7.44.0" | |
23928 | ||
7157c2b5 | 23929 | #: http.c:989 |
4c27fcb5 JX |
23930 | msgid "Protocol restrictions not supported with cURL < 7.19.4" |
23931 | msgstr "不支持协议限制,因为 cURL < 7.19.4" | |
23932 | ||
7157c2b5 | 23933 | #: http.c:1132 |
4c27fcb5 JX |
23934 | #, c-format |
23935 | msgid "Unsupported SSL backend '%s'. Supported SSL backends:" | |
23936 | msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:" | |
23937 | ||
7157c2b5 | 23938 | #: http.c:1139 |
4c27fcb5 JX |
23939 | #, c-format |
23940 | msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" | |
23941 | msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构建" | |
23942 | ||
7157c2b5 | 23943 | #: http.c:1143 |
4c27fcb5 JX |
23944 | #, c-format |
23945 | msgid "Could not set SSL backend to '%s': already set" | |
23946 | msgstr "无法将 SSL 后端设置为 '%s':已经设置" | |
23947 | ||
ec3d4607 | 23948 | #: http.c:2034 |
1a79b2f1 JX |
23949 | #, c-format |
23950 | msgid "" | |
23951 | "unable to update url base from redirection:\n" | |
23952 | " asked for: %s\n" | |
23953 | " redirect: %s" | |
23954 | msgstr "" | |
23955 | "不能更新重定向的 url base:\n" | |
23956 | " 请求:%s\n" | |
23957 | " 重定向:%s" | |
23958 | ||
d13389bf | 23959 | #: remote-curl.c:183 |
d46c5519 JX |
23960 | #, c-format |
23961 | msgid "invalid quoting in push-option value: '%s'" | |
5b533632 | 23962 | msgstr "在 push-option 取值中无效的引号:'%s'" |
d46c5519 | 23963 | |
d13389bf | 23964 | #: remote-curl.c:307 |
d46c5519 JX |
23965 | #, c-format |
23966 | msgid "%sinfo/refs not valid: is this a git repository?" | |
d9488fea | 23967 | msgstr "%sinfo/refs 无效:这是 git 仓库么?" |
d46c5519 | 23968 | |
d13389bf | 23969 | #: remote-curl.c:408 |
d46c5519 JX |
23970 | msgid "invalid server response; expected service, got flush packet" |
23971 | msgstr "无效的服务端响应。预期服务,得到 flush 包" | |
23972 | ||
d13389bf | 23973 | #: remote-curl.c:439 |
d46c5519 JX |
23974 | #, c-format |
23975 | msgid "invalid server response; got '%s'" | |
23976 | msgstr "无效的服务端响应,得到 '%s'" | |
23977 | ||
d13389bf | 23978 | #: remote-curl.c:499 |
d46c5519 JX |
23979 | #, c-format |
23980 | msgid "repository '%s' not found" | |
23981 | msgstr "仓库 '%s' 未找到" | |
23982 | ||
d13389bf | 23983 | #: remote-curl.c:503 |
d46c5519 JX |
23984 | #, c-format |
23985 | msgid "Authentication failed for '%s'" | |
23986 | msgstr "'%s' 鉴权失败" | |
23987 | ||
d13389bf | 23988 | #: remote-curl.c:507 |
d46c5519 JX |
23989 | #, c-format |
23990 | msgid "unable to access '%s': %s" | |
23991 | msgstr "无法访问 '%s':%s" | |
23992 | ||
d13389bf | 23993 | #: remote-curl.c:513 |
1a79b2f1 JX |
23994 | #, c-format |
23995 | msgid "redirecting to %s" | |
23996 | msgstr "重定向到 %s" | |
23997 | ||
ec3d4607 | 23998 | #: remote-curl.c:644 |
d46c5519 | 23999 | msgid "shouldn't have EOF when not gentle on EOF" |
5b533632 | 24000 | msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符" |
d46c5519 | 24001 | |
ec3d4607 JX |
24002 | #: remote-curl.c:656 |
24003 | msgid "remote server sent unexpected response end packet" | |
24004 | msgstr "远程服务器发送意外的响应结束数据包" | |
7157c2b5 | 24005 | |
ec3d4607 | 24006 | #: remote-curl.c:726 |
d46c5519 JX |
24007 | msgid "unable to rewind rpc post data - try increasing http.postBuffer" |
24008 | msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" | |
24009 | ||
ec3d4607 | 24010 | #: remote-curl.c:756 |
7157c2b5 JX |
24011 | #, c-format |
24012 | msgid "remote-curl: bad line length character: %.4s" | |
24013 | msgstr "remote-curl:错误的行宽字符:%.4s" | |
24014 | ||
ec3d4607 | 24015 | #: remote-curl.c:758 |
7157c2b5 JX |
24016 | msgid "remote-curl: unexpected response end packet" |
24017 | msgstr "remote-curl:意外响应结束包" | |
24018 | ||
ec3d4607 | 24019 | #: remote-curl.c:834 |
d46c5519 JX |
24020 | #, c-format |
24021 | msgid "RPC failed; %s" | |
24022 | msgstr "RPC 失败。%s" | |
24023 | ||
ec3d4607 | 24024 | #: remote-curl.c:874 |
d46c5519 JX |
24025 | msgid "cannot handle pushes this big" |
24026 | msgstr "不能处理这么大的推送" | |
24027 | ||
ec3d4607 | 24028 | #: remote-curl.c:989 |
d46c5519 JX |
24029 | #, c-format |
24030 | msgid "cannot deflate request; zlib deflate error %d" | |
24031 | msgstr "不能压缩请求,zlib 压缩错误 %d" | |
24032 | ||
ec3d4607 | 24033 | #: remote-curl.c:993 |
d46c5519 JX |
24034 | #, c-format |
24035 | msgid "cannot deflate request; zlib end error %d" | |
24036 | msgstr "不能压缩请求,zlib 结束错误 %d" | |
24037 | ||
ec3d4607 | 24038 | #: remote-curl.c:1043 |
7157c2b5 JX |
24039 | #, c-format |
24040 | msgid "%d bytes of length header were received" | |
24041 | msgstr "收到了 %d 字节长度的头信息" | |
24042 | ||
ec3d4607 | 24043 | #: remote-curl.c:1045 |
7157c2b5 JX |
24044 | #, c-format |
24045 | msgid "%d bytes of body are still expected" | |
24046 | msgstr "预期仍然需要 %d 个字节的正文" | |
24047 | ||
ec3d4607 | 24048 | #: remote-curl.c:1134 |
d46c5519 | 24049 | msgid "dumb http transport does not support shallow capabilities" |
9146ef75 | 24050 | msgstr "哑 http 传输不支持浅克隆能力" |
d46c5519 | 24051 | |
ec3d4607 | 24052 | #: remote-curl.c:1149 |
d46c5519 JX |
24053 | msgid "fetch failed." |
24054 | msgstr "获取失败。" | |
24055 | ||
ec3d4607 | 24056 | #: remote-curl.c:1195 |
d46c5519 JX |
24057 | msgid "cannot fetch by sha1 over smart http" |
24058 | msgstr "无法通过智能 HTTP 获取 sha1" | |
24059 | ||
ec3d4607 | 24060 | #: remote-curl.c:1239 remote-curl.c:1245 |
d46c5519 JX |
24061 | #, c-format |
24062 | msgid "protocol error: expected sha/ref, got '%s'" | |
24063 | msgstr "协议错误:期望 sha/ref,却得到 '%s'" | |
24064 | ||
ec3d4607 | 24065 | #: remote-curl.c:1257 remote-curl.c:1375 |
d46c5519 JX |
24066 | #, c-format |
24067 | msgid "http transport does not support %s" | |
24068 | msgstr "http 传输协议不支持 %s" | |
24069 | ||
ec3d4607 | 24070 | #: remote-curl.c:1293 |
d46c5519 JX |
24071 | msgid "git-http-push failed" |
24072 | msgstr "git-http-push 失败" | |
24073 | ||
ec3d4607 | 24074 | #: remote-curl.c:1481 |
d46c5519 JX |
24075 | msgid "remote-curl: usage: git remote-curl <remote> [<url>]" |
24076 | msgstr "remote-curl:用法:git remote-curl <远程> [<url>]" | |
24077 | ||
ec3d4607 | 24078 | #: remote-curl.c:1513 |
d46c5519 JX |
24079 | msgid "remote-curl: error reading command stream from git" |
24080 | msgstr "remote-curl:错误读取来自 git 的命令流" | |
24081 | ||
ec3d4607 | 24082 | #: remote-curl.c:1520 |
d46c5519 JX |
24083 | msgid "remote-curl: fetch attempted without a local repo" |
24084 | msgstr "remote-curl:尝试没有本地仓库下获取" | |
24085 | ||
ec3d4607 | 24086 | #: remote-curl.c:1561 |
d46c5519 JX |
24087 | #, c-format |
24088 | msgid "remote-curl: unknown command '%s' from git" | |
24089 | msgstr "remote-curl:未知的来自 git 的命令 '%s'" | |
24090 | ||
349ede6a JX |
24091 | #: compat/compiler.h:26 |
24092 | msgid "no compiler information available\n" | |
24093 | msgstr "编译器信息不可用\n" | |
24094 | ||
24095 | #: compat/compiler.h:38 | |
24096 | msgid "no libc information available\n" | |
24097 | msgstr "libc 信息不可用\n" | |
24098 | ||
33b62fba | 24099 | #: list-objects-filter-options.h:94 |
d46c5519 JX |
24100 | msgid "args" |
24101 | msgstr "参数" | |
24102 | ||
33b62fba | 24103 | #: list-objects-filter-options.h:95 |
d46c5519 JX |
24104 | msgid "object filtering" |
24105 | msgstr "对象过滤" | |
24106 | ||
33b62fba | 24107 | #: parse-options.h:184 |
fd8cb379 JX |
24108 | msgid "expiry-date" |
24109 | msgstr "到期时间" | |
7aea43ff | 24110 | |
33b62fba | 24111 | #: parse-options.h:198 |
fd8cb379 JX |
24112 | msgid "no-op (backward compatibility)" |
24113 | msgstr "空操作(向后兼容)" | |
7aea43ff | 24114 | |
33b62fba | 24115 | #: parse-options.h:310 |
fd8cb379 JX |
24116 | msgid "be more verbose" |
24117 | msgstr "更加详细" | |
7aea43ff | 24118 | |
33b62fba | 24119 | #: parse-options.h:312 |
fd8cb379 JX |
24120 | msgid "be more quiet" |
24121 | msgstr "更加安静" | |
7aea43ff | 24122 | |
33b62fba | 24123 | #: parse-options.h:318 |
d9488fea JX |
24124 | msgid "use <n> digits to display object names" |
24125 | msgstr "用 <n> 位数字显示对象名" | |
7aea43ff | 24126 | |
33b62fba | 24127 | #: parse-options.h:337 |
d46c5519 JX |
24128 | msgid "how to strip spaces and #comments from message" |
24129 | msgstr "设置如何删除提交说明里的空格和#注释" | |
24130 | ||
33b62fba | 24131 | #: parse-options.h:338 |
ddc12c42 JX |
24132 | msgid "read pathspec from file" |
24133 | msgstr "从文件读取路径表达式" | |
24134 | ||
33b62fba | 24135 | #: parse-options.h:339 |
ddc12c42 JX |
24136 | msgid "" |
24137 | "with --pathspec-from-file, pathspec elements are separated with NUL character" | |
24138 | msgstr "使用 --pathspec-from-file,路径表达式用空字符分隔" | |
24139 | ||
473eb541 | 24140 | #: ref-filter.h:99 |
d46c5519 JX |
24141 | msgid "key" |
24142 | msgstr "key" | |
24143 | ||
473eb541 | 24144 | #: ref-filter.h:99 |
d46c5519 JX |
24145 | msgid "field name to sort on" |
24146 | msgstr "排序的字段名" | |
24147 | ||
24148 | #: rerere.h:44 | |
24149 | msgid "update the index with reused conflict resolution if possible" | |
24150 | msgstr "如果可能,重用冲突解决更新索引" | |
24151 | ||
fd8cb379 | 24152 | #: command-list.h:50 |
8ada9598 | 24153 | msgid "Add file contents to the index" |
81809b99 | 24154 | msgstr "添加文件内容至索引" |
8ada9598 | 24155 | |
fd8cb379 JX |
24156 | #: command-list.h:51 |
24157 | msgid "Apply a series of patches from a mailbox" | |
24158 | msgstr "应用邮箱格式的系列补丁" | |
24159 | ||
24160 | #: command-list.h:52 | |
24161 | msgid "Annotate file lines with commit information" | |
24162 | msgstr "使用提交信息注释文件行" | |
24163 | ||
24164 | #: command-list.h:53 | |
24165 | msgid "Apply a patch to files and/or to the index" | |
24166 | msgstr "应用一个补丁到文件和/或索引区" | |
24167 | ||
24168 | #: command-list.h:54 | |
4c27fcb5 JX |
24169 | msgid "Import a GNU Arch repository into Git" |
24170 | msgstr "将一个 GNU Arch 仓库导入到 Git" | |
fd8cb379 JX |
24171 | |
24172 | #: command-list.h:55 | |
24173 | msgid "Create an archive of files from a named tree" | |
24174 | msgstr "基于一个指定的树创建文件存档" | |
24175 | ||
24176 | #: command-list.h:56 | |
1b7f4a34 JX |
24177 | msgid "Use binary search to find the commit that introduced a bug" |
24178 | msgstr "通过二分查找定位引入 bug 的提交" | |
8ada9598 | 24179 | |
fd8cb379 JX |
24180 | #: command-list.h:57 |
24181 | msgid "Show what revision and author last modified each line of a file" | |
24182 | msgstr "显示文件每一行最后修改的版本和修改者" | |
24183 | ||
24184 | #: command-list.h:58 | |
8ada9598 | 24185 | msgid "List, create, or delete branches" |
81809b99 | 24186 | msgstr "列出、创建或删除分支" |
8ada9598 | 24187 | |
fd8cb379 | 24188 | #: command-list.h:59 |
349ede6a JX |
24189 | msgid "Collect information for user to file a bug report" |
24190 | msgstr "收集信息以供用户提交错误报告" | |
24191 | ||
24192 | #: command-list.h:60 | |
fd8cb379 JX |
24193 | msgid "Move objects and refs by archive" |
24194 | msgstr "通过归档移动对象和引用" | |
24195 | ||
349ede6a | 24196 | #: command-list.h:61 |
fd8cb379 JX |
24197 | msgid "Provide content or type and size information for repository objects" |
24198 | msgstr "提供仓库对象的内容、类型或大小" | |
24199 | ||
349ede6a | 24200 | #: command-list.h:62 |
fd8cb379 JX |
24201 | msgid "Display gitattributes information" |
24202 | msgstr "显示 gitattributes 信息" | |
24203 | ||
349ede6a | 24204 | #: command-list.h:63 |
fd8cb379 JX |
24205 | msgid "Debug gitignore / exclude files" |
24206 | msgstr "调试 gitignore / exclude 文件" | |
24207 | ||
349ede6a | 24208 | #: command-list.h:64 |
fd8cb379 JX |
24209 | msgid "Show canonical names and email addresses of contacts" |
24210 | msgstr "显示联系人的规范名称和电子邮件" | |
24211 | ||
349ede6a | 24212 | #: command-list.h:65 |
5bb01d4f JX |
24213 | msgid "Switch branches or restore working tree files" |
24214 | msgstr "切换分支或恢复工作区文件" | |
8ada9598 | 24215 | |
349ede6a | 24216 | #: command-list.h:66 |
fd8cb379 JX |
24217 | msgid "Copy files from the index to the working tree" |
24218 | msgstr "从索引拷贝文件到工作区" | |
24219 | ||
349ede6a | 24220 | #: command-list.h:67 |
fd8cb379 JX |
24221 | msgid "Ensures that a reference name is well formed" |
24222 | msgstr "确保引用名称格式正确" | |
24223 | ||
349ede6a | 24224 | #: command-list.h:68 |
fd8cb379 JX |
24225 | msgid "Find commits yet to be applied to upstream" |
24226 | msgstr "查找尚未应用到上游的提交" | |
24227 | ||
349ede6a | 24228 | #: command-list.h:69 |
fd8cb379 JX |
24229 | msgid "Apply the changes introduced by some existing commits" |
24230 | msgstr "应用一些现存提交引入的修改" | |
24231 | ||
349ede6a | 24232 | #: command-list.h:70 |
fd8cb379 JX |
24233 | msgid "Graphical alternative to git-commit" |
24234 | msgstr "git-commit 的图形替代界面" | |
24235 | ||
349ede6a | 24236 | #: command-list.h:71 |
fd8cb379 JX |
24237 | msgid "Remove untracked files from the working tree" |
24238 | msgstr "从工作区中删除未跟踪文件" | |
24239 | ||
349ede6a | 24240 | #: command-list.h:72 |
8ada9598 | 24241 | msgid "Clone a repository into a new directory" |
06991777 | 24242 | msgstr "克隆仓库到一个新目录" |
8ada9598 | 24243 | |
349ede6a | 24244 | #: command-list.h:73 |
fd8cb379 JX |
24245 | msgid "Display data in columns" |
24246 | msgstr "以列的方式显示数据" | |
24247 | ||
349ede6a | 24248 | #: command-list.h:74 |
8ada9598 | 24249 | msgid "Record changes to the repository" |
160fb2b2 | 24250 | msgstr "记录变更到仓库" |
8ada9598 | 24251 | |
349ede6a | 24252 | #: command-list.h:75 |
4c27fcb5 JX |
24253 | msgid "Write and verify Git commit-graph files" |
24254 | msgstr "写入和校验 Git 提交图文件" | |
fd8cb379 | 24255 | |
349ede6a | 24256 | #: command-list.h:76 |
fd8cb379 JX |
24257 | msgid "Create a new commit object" |
24258 | msgstr "创建一个新的提交对象" | |
24259 | ||
349ede6a | 24260 | #: command-list.h:77 |
fd8cb379 JX |
24261 | msgid "Get and set repository or global options" |
24262 | msgstr "获取和设置仓库或者全局选项" | |
24263 | ||
349ede6a | 24264 | #: command-list.h:78 |
fd8cb379 JX |
24265 | msgid "Count unpacked number of objects and their disk consumption" |
24266 | msgstr "计算未打包对象的数量和磁盘空间占用" | |
24267 | ||
349ede6a | 24268 | #: command-list.h:79 |
fd8cb379 JX |
24269 | msgid "Retrieve and store user credentials" |
24270 | msgstr "检索和存储用户密码" | |
24271 | ||
349ede6a | 24272 | #: command-list.h:80 |
fd8cb379 JX |
24273 | msgid "Helper to temporarily store passwords in memory" |
24274 | msgstr "在内存中临时存储密码的助手" | |
24275 | ||
349ede6a | 24276 | #: command-list.h:81 |
fd8cb379 JX |
24277 | msgid "Helper to store credentials on disk" |
24278 | msgstr "在磁盘存储密码的助手" | |
24279 | ||
349ede6a | 24280 | #: command-list.h:82 |
fd8cb379 JX |
24281 | msgid "Export a single commit to a CVS checkout" |
24282 | msgstr "将一个提交导出到 CVS 检出中" | |
24283 | ||
349ede6a | 24284 | #: command-list.h:83 |
fd8cb379 JX |
24285 | msgid "Salvage your data out of another SCM people love to hate" |
24286 | msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据" | |
24287 | ||
349ede6a | 24288 | #: command-list.h:84 |
fd8cb379 JX |
24289 | msgid "A CVS server emulator for Git" |
24290 | msgstr "Git 的一个 CVS 服务模拟器" | |
24291 | ||
349ede6a | 24292 | #: command-list.h:85 |
fd8cb379 JX |
24293 | msgid "A really simple server for Git repositories" |
24294 | msgstr "一个非常简单的 Git 仓库服务器" | |
24295 | ||
349ede6a | 24296 | #: command-list.h:86 |
fd8cb379 JX |
24297 | msgid "Give an object a human readable name based on an available ref" |
24298 | msgstr "基于一个现存的引用为一个对象起一个可读的名称" | |
24299 | ||
349ede6a | 24300 | #: command-list.h:87 |
8ada9598 | 24301 | msgid "Show changes between commits, commit and working tree, etc" |
81809b99 | 24302 | msgstr "显示提交之间、提交和工作区之间等的差异" |
8ada9598 | 24303 | |
349ede6a | 24304 | #: command-list.h:88 |
fd8cb379 JX |
24305 | msgid "Compares files in the working tree and the index" |
24306 | msgstr "比较工作区和索引区中的文件" | |
24307 | ||
349ede6a | 24308 | #: command-list.h:89 |
fd8cb379 JX |
24309 | msgid "Compare a tree to the working tree or index" |
24310 | msgstr "将一个树和工作区或索引做比较" | |
24311 | ||
349ede6a | 24312 | #: command-list.h:90 |
fd8cb379 JX |
24313 | msgid "Compares the content and mode of blobs found via two tree objects" |
24314 | msgstr "比较两个树对象的文件内容和模式" | |
24315 | ||
349ede6a | 24316 | #: command-list.h:91 |
fd8cb379 JX |
24317 | msgid "Show changes using common diff tools" |
24318 | msgstr "使用常见的差异工具显示更改" | |
24319 | ||
349ede6a | 24320 | #: command-list.h:92 |
fd8cb379 JX |
24321 | msgid "Git data exporter" |
24322 | msgstr "Git 数据导出器" | |
24323 | ||
349ede6a | 24324 | #: command-list.h:93 |
fd8cb379 JX |
24325 | msgid "Backend for fast Git data importers" |
24326 | msgstr "Git 快速数据导入器后端" | |
24327 | ||
349ede6a | 24328 | #: command-list.h:94 |
8ada9598 | 24329 | msgid "Download objects and refs from another repository" |
160fb2b2 | 24330 | msgstr "从另外一个仓库下载对象和引用" |
8ada9598 | 24331 | |
349ede6a | 24332 | #: command-list.h:95 |
fd8cb379 JX |
24333 | msgid "Receive missing objects from another repository" |
24334 | msgstr "从另一个仓库获取缺失的对象" | |
24335 | ||
349ede6a | 24336 | #: command-list.h:96 |
fd8cb379 JX |
24337 | msgid "Rewrite branches" |
24338 | msgstr "重写分支" | |
24339 | ||
349ede6a | 24340 | #: command-list.h:97 |
fd8cb379 JX |
24341 | msgid "Produce a merge commit message" |
24342 | msgstr "生成一个合并提交信息" | |
24343 | ||
349ede6a | 24344 | #: command-list.h:98 |
fd8cb379 JX |
24345 | msgid "Output information on each ref" |
24346 | msgstr "对每一个引用输出信息 " | |
24347 | ||
349ede6a | 24348 | #: command-list.h:99 |
d13389bf JX |
24349 | msgid "Run a Git command on a list of repositories" |
24350 | msgstr "在一个仓库列表上运行 Git 命令" | |
24351 | ||
24352 | #: command-list.h:100 | |
fd8cb379 JX |
24353 | msgid "Prepare patches for e-mail submission" |
24354 | msgstr "准备电子邮件提交的补丁" | |
24355 | ||
d13389bf | 24356 | #: command-list.h:101 |
fd8cb379 JX |
24357 | msgid "Verifies the connectivity and validity of the objects in the database" |
24358 | msgstr "验证仓库中对象的连通性和有效性" | |
24359 | ||
d13389bf | 24360 | #: command-list.h:102 |
fd8cb379 JX |
24361 | msgid "Cleanup unnecessary files and optimize the local repository" |
24362 | msgstr "清除不必要的文件和优化本地仓库" | |
24363 | ||
d13389bf | 24364 | #: command-list.h:103 |
fd8cb379 | 24365 | msgid "Extract commit ID from an archive created using git-archive" |
5b533632 | 24366 | msgstr "从 git-archive 创建的归档文件中提取提交 ID" |
fd8cb379 | 24367 | |
d13389bf | 24368 | #: command-list.h:104 |
8ada9598 | 24369 | msgid "Print lines matching a pattern" |
81809b99 | 24370 | msgstr "输出和模式匹配的行" |
8ada9598 | 24371 | |
d13389bf | 24372 | #: command-list.h:105 |
fd8cb379 JX |
24373 | msgid "A portable graphical interface to Git" |
24374 | msgstr "一个便携的 Git 图形客户端" | |
24375 | ||
d13389bf | 24376 | #: command-list.h:106 |
fd8cb379 | 24377 | msgid "Compute object ID and optionally creates a blob from a file" |
5b533632 | 24378 | msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象" |
fd8cb379 | 24379 | |
d13389bf | 24380 | #: command-list.h:107 |
fd8cb379 JX |
24381 | msgid "Display help information about Git" |
24382 | msgstr "显示 Git 的帮助信息" | |
24383 | ||
d13389bf | 24384 | #: command-list.h:108 |
fd8cb379 JX |
24385 | msgid "Server side implementation of Git over HTTP" |
24386 | msgstr "Git HTTP 协议的服务端实现" | |
24387 | ||
d13389bf | 24388 | #: command-list.h:109 |
fd8cb379 JX |
24389 | msgid "Download from a remote Git repository via HTTP" |
24390 | msgstr "通过 HTTP 从远程 Git 仓库下载" | |
24391 | ||
d13389bf | 24392 | #: command-list.h:110 |
fd8cb379 JX |
24393 | msgid "Push objects over HTTP/DAV to another repository" |
24394 | msgstr "通过 HTTP/DAV 推送对象另一个仓库" | |
24395 | ||
d13389bf | 24396 | #: command-list.h:111 |
fd8cb379 JX |
24397 | msgid "Send a collection of patches from stdin to an IMAP folder" |
24398 | msgstr "从标准输入将一组补丁发送到IMAP文件夹" | |
24399 | ||
d13389bf | 24400 | #: command-list.h:112 |
fd8cb379 JX |
24401 | msgid "Build pack index file for an existing packed archive" |
24402 | msgstr "从一个现存的包存档文件创建包索引" | |
24403 | ||
d13389bf | 24404 | #: command-list.h:113 |
a77c07d9 | 24405 | msgid "Create an empty Git repository or reinitialize an existing one" |
160fb2b2 | 24406 | msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库" |
8ada9598 | 24407 | |
d13389bf | 24408 | #: command-list.h:114 |
fd8cb379 JX |
24409 | msgid "Instantly browse your working repository in gitweb" |
24410 | msgstr "在 gitweb 中即时浏览您的工作仓库" | |
24411 | ||
d13389bf | 24412 | #: command-list.h:115 |
d46c5519 | 24413 | msgid "Add or parse structured information in commit messages" |
fd8cb379 JX |
24414 | msgstr "添加或解析提交说明中的结构化信息" |
24415 | ||
d13389bf | 24416 | #: command-list.h:116 |
fd8cb379 JX |
24417 | msgid "The Git repository browser" |
24418 | msgstr "Git 仓库浏览器" | |
24419 | ||
d13389bf | 24420 | #: command-list.h:117 |
8ada9598 | 24421 | msgid "Show commit logs" |
81809b99 | 24422 | msgstr "显示提交日志" |
8ada9598 | 24423 | |
d13389bf | 24424 | #: command-list.h:118 |
fd8cb379 JX |
24425 | msgid "Show information about files in the index and the working tree" |
24426 | msgstr "显示索引和工作区中文件的信息" | |
24427 | ||
d13389bf | 24428 | #: command-list.h:119 |
fd8cb379 JX |
24429 | msgid "List references in a remote repository" |
24430 | msgstr "显示一个远程仓库的引用" | |
24431 | ||
d13389bf | 24432 | #: command-list.h:120 |
fd8cb379 JX |
24433 | msgid "List the contents of a tree object" |
24434 | msgstr "显示一个树对象的内容" | |
24435 | ||
d13389bf | 24436 | #: command-list.h:121 |
fd8cb379 JX |
24437 | msgid "Extracts patch and authorship from a single e-mail message" |
24438 | msgstr "从单个电子邮件中提取补丁和作者身份" | |
24439 | ||
d13389bf | 24440 | #: command-list.h:122 |
fd8cb379 JX |
24441 | msgid "Simple UNIX mbox splitter program" |
24442 | msgstr "简单的 UNIX mbox 邮箱切分程序" | |
24443 | ||
d13389bf | 24444 | #: command-list.h:123 |
d9488fea JX |
24445 | msgid "Run tasks to optimize Git repository data" |
24446 | msgstr "运行任务以优化仓库数据" | |
24447 | ||
d13389bf | 24448 | #: command-list.h:124 |
8ada9598 | 24449 | msgid "Join two or more development histories together" |
81809b99 | 24450 | msgstr "合并两个或更多开发历史" |
8ada9598 | 24451 | |
d13389bf | 24452 | #: command-list.h:125 |
fd8cb379 JX |
24453 | msgid "Find as good common ancestors as possible for a merge" |
24454 | msgstr "为了合并查找尽可能好的公共祖先提交" | |
24455 | ||
d13389bf | 24456 | #: command-list.h:126 |
fd8cb379 JX |
24457 | msgid "Run a three-way file merge" |
24458 | msgstr "运行一个三路文件合并" | |
24459 | ||
d13389bf | 24460 | #: command-list.h:127 |
fd8cb379 JX |
24461 | msgid "Run a merge for files needing merging" |
24462 | msgstr "对于需要合并的文件执行合并" | |
24463 | ||
d13389bf | 24464 | #: command-list.h:128 |
fd8cb379 JX |
24465 | msgid "The standard helper program to use with git-merge-index" |
24466 | msgstr "与 git-merge-index 一起使用的标准向导程序" | |
24467 | ||
d13389bf | 24468 | #: command-list.h:129 |
fd8cb379 JX |
24469 | msgid "Run merge conflict resolution tools to resolve merge conflicts" |
24470 | msgstr "运行合并冲突解决工具以解决合并冲突" | |
24471 | ||
d13389bf | 24472 | #: command-list.h:130 |
fd8cb379 JX |
24473 | msgid "Show three-way merge without touching index" |
24474 | msgstr "显示三路合并而不动索引" | |
24475 | ||
d13389bf | 24476 | #: command-list.h:131 |
4c27fcb5 JX |
24477 | msgid "Write and verify multi-pack-indexes" |
24478 | msgstr "写入和校验多包索引" | |
24479 | ||
d13389bf | 24480 | #: command-list.h:132 |
473eb541 JX |
24481 | msgid "Creates a tag object with extra validation" |
24482 | msgstr "创建一个有额外验证的标签对象" | |
fd8cb379 | 24483 | |
d13389bf | 24484 | #: command-list.h:133 |
fd8cb379 JX |
24485 | msgid "Build a tree-object from ls-tree formatted text" |
24486 | msgstr "基于 ls-tree 的格式化文本创建一个树对象" | |
24487 | ||
d13389bf | 24488 | #: command-list.h:134 |
8ada9598 | 24489 | msgid "Move or rename a file, a directory, or a symlink" |
81809b99 | 24490 | msgstr "移动或重命名一个文件、目录或符号链接" |
8ada9598 | 24491 | |
fd8cb379 | 24492 | # 查找给定版本的符号名称 |
d13389bf | 24493 | #: command-list.h:135 |
fd8cb379 JX |
24494 | msgid "Find symbolic names for given revs" |
24495 | msgstr "查找给定版本的符号名称" | |
24496 | ||
d13389bf | 24497 | #: command-list.h:136 |
fd8cb379 JX |
24498 | msgid "Add or inspect object notes" |
24499 | msgstr "添加或检查对象注释" | |
24500 | ||
d13389bf | 24501 | #: command-list.h:137 |
fd8cb379 JX |
24502 | msgid "Import from and submit to Perforce repositories" |
24503 | msgstr "导入和提交到 Perforce 仓库中" | |
24504 | ||
d13389bf | 24505 | #: command-list.h:138 |
fd8cb379 JX |
24506 | msgid "Create a packed archive of objects" |
24507 | msgstr "创建对象的存档包" | |
24508 | ||
d13389bf | 24509 | #: command-list.h:139 |
fd8cb379 JX |
24510 | msgid "Find redundant pack files" |
24511 | msgstr "查找冗余的包文件" | |
24512 | ||
d13389bf | 24513 | #: command-list.h:140 |
fd8cb379 JX |
24514 | msgid "Pack heads and tags for efficient repository access" |
24515 | msgstr "打包头和标签以实现高效的仓库访问" | |
24516 | ||
d9488fea | 24517 | #: command-list.h:141 |
fd8cb379 | 24518 | msgid "Compute unique ID for a patch" |
5b533632 | 24519 | msgstr "计算一个补丁的唯一 ID" |
fd8cb379 | 24520 | |
d9488fea | 24521 | #: command-list.h:142 |
fd8cb379 JX |
24522 | msgid "Prune all unreachable objects from the object database" |
24523 | msgstr "删除对象库中所有不可达对象" | |
24524 | ||
d9488fea | 24525 | #: command-list.h:143 |
fd8cb379 JX |
24526 | msgid "Remove extra objects that are already in pack files" |
24527 | msgstr "删除已经在包文件中的多余对象" | |
24528 | ||
d9488fea | 24529 | #: command-list.h:144 |
2e8451e8 | 24530 | msgid "Fetch from and integrate with another repository or a local branch" |
160fb2b2 | 24531 | msgstr "获取并整合另外的仓库或一个本地分支" |
8ada9598 | 24532 | |
d9488fea | 24533 | #: command-list.h:145 |
8ada9598 | 24534 | msgid "Update remote refs along with associated objects" |
81809b99 | 24535 | msgstr "更新远程引用和相关的对象" |
8ada9598 | 24536 | |
d9488fea | 24537 | #: command-list.h:146 |
fd8cb379 JX |
24538 | msgid "Applies a quilt patchset onto the current branch" |
24539 | msgstr "将一个 quilt 补丁集应用到当前分支。" | |
24540 | ||
d9488fea | 24541 | #: command-list.h:147 |
c1ac5258 JX |
24542 | msgid "Compare two commit ranges (e.g. two versions of a branch)" |
24543 | msgstr "比较两个提交范围(如一个分支的两个版本)" | |
24544 | ||
d9488fea | 24545 | #: command-list.h:148 |
fd8cb379 JX |
24546 | msgid "Reads tree information into the index" |
24547 | msgstr "将树信息读取到索引" | |
24548 | ||
d9488fea | 24549 | #: command-list.h:149 |
3495628d JX |
24550 | msgid "Reapply commits on top of another base tip" |
24551 | msgstr "在另一个分支上重新应用提交" | |
8ada9598 | 24552 | |
d9488fea | 24553 | #: command-list.h:150 |
fd8cb379 JX |
24554 | msgid "Receive what is pushed into the repository" |
24555 | msgstr "接收推送到仓库中的对象" | |
24556 | ||
d9488fea | 24557 | #: command-list.h:151 |
fd8cb379 JX |
24558 | msgid "Manage reflog information" |
24559 | msgstr "管理 reflog 信息" | |
24560 | ||
d9488fea | 24561 | #: command-list.h:152 |
fd8cb379 JX |
24562 | msgid "Manage set of tracked repositories" |
24563 | msgstr "管理已跟踪仓库" | |
24564 | ||
d9488fea | 24565 | #: command-list.h:153 |
fd8cb379 JX |
24566 | msgid "Pack unpacked objects in a repository" |
24567 | msgstr "打包仓库中未打包对象" | |
24568 | ||
d9488fea | 24569 | #: command-list.h:154 |
fd8cb379 JX |
24570 | msgid "Create, list, delete refs to replace objects" |
24571 | msgstr "创建、列出、删除对象替换引用" | |
24572 | ||
d9488fea | 24573 | #: command-list.h:155 |
fd8cb379 JX |
24574 | msgid "Generates a summary of pending changes" |
24575 | msgstr "生成待定更改的摘要" | |
24576 | ||
d9488fea | 24577 | #: command-list.h:156 |
fd8cb379 JX |
24578 | msgid "Reuse recorded resolution of conflicted merges" |
24579 | msgstr "重用冲突合并的解决方案记录" | |
24580 | ||
d9488fea | 24581 | #: command-list.h:157 |
8ada9598 | 24582 | msgid "Reset current HEAD to the specified state" |
4375c10e | 24583 | msgstr "重置当前 HEAD 到指定状态" |
8ada9598 | 24584 | |
d9488fea | 24585 | #: command-list.h:158 |
a6cd2cc4 JX |
24586 | msgid "Restore working tree files" |
24587 | msgstr "恢复工作区文件" | |
24588 | ||
d9488fea | 24589 | #: command-list.h:159 |
fd8cb379 JX |
24590 | msgid "Revert some existing commits" |
24591 | msgstr "回退一些现存提交" | |
24592 | ||
d9488fea | 24593 | #: command-list.h:160 |
fd8cb379 JX |
24594 | msgid "Lists commit objects in reverse chronological order" |
24595 | msgstr "按时间顺序列出提交对象" | |
24596 | ||
d9488fea | 24597 | #: command-list.h:161 |
fd8cb379 JX |
24598 | msgid "Pick out and massage parameters" |
24599 | msgstr "选出并处理参数" | |
24600 | ||
d9488fea | 24601 | #: command-list.h:162 |
8ada9598 | 24602 | msgid "Remove files from the working tree and from the index" |
81809b99 | 24603 | msgstr "从工作区和索引中删除文件" |
8ada9598 | 24604 | |
d9488fea | 24605 | #: command-list.h:163 |
fd8cb379 JX |
24606 | msgid "Send a collection of patches as emails" |
24607 | msgstr "通过电子邮件发送一组补丁" | |
24608 | ||
d9488fea | 24609 | #: command-list.h:164 |
fd8cb379 JX |
24610 | msgid "Push objects over Git protocol to another repository" |
24611 | msgstr "使用 Git 协议推送对象到另一个仓库" | |
24612 | ||
d9488fea | 24613 | #: command-list.h:165 |
fd8cb379 JX |
24614 | msgid "Restricted login shell for Git-only SSH access" |
24615 | msgstr "只允许 Git SSH 访问的受限登录shell" | |
24616 | ||
d9488fea | 24617 | #: command-list.h:166 |
fd8cb379 JX |
24618 | msgid "Summarize 'git log' output" |
24619 | msgstr "'git log' 输出摘要" | |
24620 | ||
d9488fea | 24621 | #: command-list.h:167 |
8ada9598 | 24622 | msgid "Show various types of objects" |
81809b99 | 24623 | msgstr "显示各种类型的对象" |
8ada9598 | 24624 | |
d9488fea | 24625 | #: command-list.h:168 |
fd8cb379 JX |
24626 | msgid "Show branches and their commits" |
24627 | msgstr "显示分支和提交" | |
24628 | ||
d9488fea | 24629 | #: command-list.h:169 |
fd8cb379 JX |
24630 | msgid "Show packed archive index" |
24631 | msgstr "显示打包归档索引" | |
24632 | ||
d9488fea | 24633 | #: command-list.h:170 |
fd8cb379 JX |
24634 | msgid "List references in a local repository" |
24635 | msgstr "显示本地仓库中的引用" | |
24636 | ||
d9488fea | 24637 | #: command-list.h:171 |
fd8cb379 JX |
24638 | msgid "Git's i18n setup code for shell scripts" |
24639 | msgstr "为 shell 脚本准备的 Git 国际化设置代码" | |
24640 | ||
d9488fea | 24641 | #: command-list.h:172 |
fd8cb379 JX |
24642 | msgid "Common Git shell script setup code" |
24643 | msgstr "常用的 Git shell 脚本设置代码" | |
24644 | ||
d9488fea | 24645 | #: command-list.h:173 |
ddc12c42 JX |
24646 | msgid "Initialize and modify the sparse-checkout" |
24647 | msgstr "初始化及修改稀疏检出" | |
24648 | ||
d9488fea | 24649 | #: command-list.h:174 |
fd8cb379 JX |
24650 | msgid "Stash the changes in a dirty working directory away" |
24651 | msgstr "贮藏脏工作区中的修改" | |
24652 | ||
d9488fea | 24653 | #: command-list.h:175 |
fd8cb379 JX |
24654 | msgid "Add file contents to the staging area" |
24655 | msgstr "将文件内容添加到索引" | |
24656 | ||
d9488fea | 24657 | #: command-list.h:176 |
8ada9598 | 24658 | msgid "Show the working tree status" |
81809b99 | 24659 | msgstr "显示工作区状态" |
8ada9598 | 24660 | |
d9488fea | 24661 | #: command-list.h:177 |
fd8cb379 JX |
24662 | msgid "Remove unnecessary whitespace" |
24663 | msgstr "删除不必要的空白字符" | |
24664 | ||
d9488fea | 24665 | #: command-list.h:178 |
fd8cb379 JX |
24666 | msgid "Initialize, update or inspect submodules" |
24667 | msgstr "初始化、更新或检查子模组" | |
24668 | ||
d9488fea | 24669 | #: command-list.h:179 |
fd8cb379 JX |
24670 | msgid "Bidirectional operation between a Subversion repository and Git" |
24671 | msgstr "Subersion 仓库和 Git 之间的双向操作" | |
24672 | ||
d9488fea | 24673 | #: command-list.h:180 |
a6cd2cc4 JX |
24674 | msgid "Switch branches" |
24675 | msgstr "切换分支" | |
24676 | ||
d9488fea | 24677 | #: command-list.h:181 |
fd8cb379 JX |
24678 | msgid "Read, modify and delete symbolic refs" |
24679 | msgstr "读取、修改和删除符号引用" | |
24680 | ||
d9488fea | 24681 | #: command-list.h:182 |
8ada9598 | 24682 | msgid "Create, list, delete or verify a tag object signed with GPG" |
4375c10e | 24683 | msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" |
8ada9598 | 24684 | |
d9488fea | 24685 | #: command-list.h:183 |
fd8cb379 JX |
24686 | msgid "Creates a temporary file with a blob's contents" |
24687 | msgstr "用 blob 数据对象的内容创建一个临时文件" | |
220c313c | 24688 | |
d9488fea | 24689 | #: command-list.h:184 |
fd8cb379 JX |
24690 | msgid "Unpack objects from a packed archive" |
24691 | msgstr "从打包文件中解压缩对象" | |
220c313c | 24692 | |
d9488fea | 24693 | #: command-list.h:185 |
fd8cb379 JX |
24694 | msgid "Register file contents in the working tree to the index" |
24695 | msgstr "将工作区的文件内容注册到索引" | |
220c313c | 24696 | |
d9488fea | 24697 | #: command-list.h:186 |
fd8cb379 JX |
24698 | msgid "Update the object name stored in a ref safely" |
24699 | msgstr "安全地更新存储于引用中的对象名称" | |
220c313c | 24700 | |
d9488fea | 24701 | #: command-list.h:187 |
fd8cb379 JX |
24702 | msgid "Update auxiliary info file to help dumb servers" |
24703 | msgstr "更新辅助信息文件以帮助哑协议服务" | |
24704 | ||
d9488fea | 24705 | #: command-list.h:188 |
fd8cb379 JX |
24706 | msgid "Send archive back to git-archive" |
24707 | msgstr "将存档发送回 git-archive" | |
24708 | ||
d9488fea | 24709 | #: command-list.h:189 |
fd8cb379 JX |
24710 | msgid "Send objects packed back to git-fetch-pack" |
24711 | msgstr "将对象压缩包发送回 git-fetch-pack" | |
24712 | ||
d9488fea | 24713 | #: command-list.h:190 |
fd8cb379 JX |
24714 | msgid "Show a Git logical variable" |
24715 | msgstr "显示一个Git逻辑变量" | |
24716 | ||
d9488fea | 24717 | #: command-list.h:191 |
fd8cb379 JX |
24718 | msgid "Check the GPG signature of commits" |
24719 | msgstr "检查 GPG 提交签名" | |
24720 | ||
d9488fea | 24721 | #: command-list.h:192 |
fd8cb379 JX |
24722 | msgid "Validate packed Git archive files" |
24723 | msgstr "校验打包的Git存仓文件" | |
24724 | ||
d9488fea | 24725 | #: command-list.h:193 |
fd8cb379 JX |
24726 | msgid "Check the GPG signature of tags" |
24727 | msgstr "检查标签的 GPG 签名" | |
24728 | ||
d9488fea | 24729 | #: command-list.h:194 |
fd8cb379 JX |
24730 | msgid "Git web interface (web frontend to Git repositories)" |
24731 | msgstr "Git web 界面(Git 仓库的 web 前端)" | |
24732 | ||
d9488fea | 24733 | #: command-list.h:195 |
fd8cb379 JX |
24734 | msgid "Show logs with difference each commit introduces" |
24735 | msgstr "显示每一个提交引入的差异日志" | |
24736 | ||
d9488fea | 24737 | #: command-list.h:196 |
fd8cb379 JX |
24738 | msgid "Manage multiple working trees" |
24739 | msgstr "管理多个工作区" | |
24740 | ||
d9488fea | 24741 | #: command-list.h:197 |
fd8cb379 JX |
24742 | msgid "Create a tree object from the current index" |
24743 | msgstr "从当前索引创建一个树对象" | |
24744 | ||
d9488fea | 24745 | #: command-list.h:198 |
fd8cb379 JX |
24746 | msgid "Defining attributes per path" |
24747 | msgstr "定义路径的属性" | |
24748 | ||
d9488fea | 24749 | #: command-list.h:199 |
fd8cb379 JX |
24750 | msgid "Git command-line interface and conventions" |
24751 | msgstr "Git 命令行界面和约定" | |
24752 | ||
d9488fea | 24753 | #: command-list.h:200 |
fd8cb379 JX |
24754 | msgid "A Git core tutorial for developers" |
24755 | msgstr "面向开发人员的 Git 核心教程" | |
24756 | ||
d9488fea JX |
24757 | #: command-list.h:201 |
24758 | msgid "Providing usernames and passwords to Git" | |
24759 | msgstr "为 Git 提供用户名和口令" | |
24760 | ||
24761 | #: command-list.h:202 | |
fd8cb379 JX |
24762 | msgid "Git for CVS users" |
24763 | msgstr "适合 CVS 用户的 Git 帮助" | |
24764 | ||
d9488fea | 24765 | #: command-list.h:203 |
fd8cb379 JX |
24766 | msgid "Tweaking diff output" |
24767 | msgstr "调整差异输出" | |
24768 | ||
d9488fea | 24769 | #: command-list.h:204 |
fd8cb379 JX |
24770 | msgid "A useful minimum set of commands for Everyday Git" |
24771 | msgstr "每一天 Git 的一组有用的最小命令集合" | |
24772 | ||
d9488fea | 24773 | #: command-list.h:205 |
349ede6a JX |
24774 | msgid "Frequently asked questions about using Git" |
24775 | msgstr "关于使用 Git 的常见问题" | |
24776 | ||
d9488fea | 24777 | #: command-list.h:206 |
fd8cb379 JX |
24778 | msgid "A Git Glossary" |
24779 | msgstr "Git 词汇表" | |
24780 | ||
d9488fea | 24781 | #: command-list.h:207 |
fd8cb379 JX |
24782 | msgid "Hooks used by Git" |
24783 | msgstr "Git 使用的钩子" | |
24784 | ||
d9488fea | 24785 | #: command-list.h:208 |
fd8cb379 JX |
24786 | msgid "Specifies intentionally untracked files to ignore" |
24787 | msgstr "忽略指定的未跟踪文件" | |
24788 | ||
d9488fea | 24789 | #: command-list.h:209 |
473eb541 JX |
24790 | msgid "Map author/committer names and/or E-Mail addresses" |
24791 | msgstr "映射作者/提交者的名称和/或邮件地址" | |
24792 | ||
24793 | #: command-list.h:210 | |
fd8cb379 JX |
24794 | msgid "Defining submodule properties" |
24795 | msgstr "定义子模组属性" | |
24796 | ||
473eb541 | 24797 | #: command-list.h:211 |
fd8cb379 JX |
24798 | msgid "Git namespaces" |
24799 | msgstr "Git 名字空间" | |
24800 | ||
473eb541 | 24801 | #: command-list.h:212 |
d9488fea JX |
24802 | msgid "Helper programs to interact with remote repositories" |
24803 | msgstr "与远程仓库交互的助手程序" | |
24804 | ||
473eb541 | 24805 | #: command-list.h:213 |
fd8cb379 JX |
24806 | msgid "Git Repository Layout" |
24807 | msgstr "Git 仓库布局" | |
24808 | ||
473eb541 | 24809 | #: command-list.h:214 |
fd8cb379 JX |
24810 | msgid "Specifying revisions and ranges for Git" |
24811 | msgstr "指定 Git 的版本和版本范围" | |
24812 | ||
473eb541 | 24813 | #: command-list.h:215 |
ddc12c42 JX |
24814 | msgid "Mounting one repository inside another" |
24815 | msgstr "将一个仓库安装到另外一个仓库中" | |
24816 | ||
473eb541 | 24817 | #: command-list.h:216 |
fd8cb379 JX |
24818 | msgid "A tutorial introduction to Git: part two" |
24819 | msgstr "一个 Git 教程:第二部分" | |
24820 | ||
473eb541 | 24821 | #: command-list.h:217 |
fd8cb379 JX |
24822 | msgid "A tutorial introduction to Git" |
24823 | msgstr "一个 Git 教程" | |
24824 | ||
473eb541 | 24825 | #: command-list.h:218 |
fd8cb379 JX |
24826 | msgid "An overview of recommended workflows with Git" |
24827 | msgstr "Git 推荐的工作流概览" | |
220c313c | 24828 | |
473eb541 | 24829 | #: git-bisect.sh:68 |
5809aa05 JX |
24830 | msgid "bisect run failed: no command provided." |
24831 | msgstr "二分查找运行失败:没有提供命令。" | |
24832 | ||
473eb541 | 24833 | #: git-bisect.sh:73 |
b694fbb1 JX |
24834 | #, sh-format |
24835 | msgid "running $command" | |
24836 | msgstr "运行 $command" | |
24837 | ||
473eb541 | 24838 | #: git-bisect.sh:80 |
b694fbb1 JX |
24839 | #, sh-format |
24840 | msgid "" | |
24841 | "bisect run failed:\n" | |
24842 | "exit code $res from '$command' is < 0 or >= 128" | |
24843 | msgstr "" | |
24844 | "二分查找运行失败:\n" | |
07432cef | 24845 | "命令 '$command' 的退出码 $res 小于 0 或大于等于 128" |
b694fbb1 | 24846 | |
473eb541 | 24847 | #: git-bisect.sh:105 |
b694fbb1 JX |
24848 | msgid "bisect run cannot continue any more" |
24849 | msgstr "二分查找不能继续运行" | |
24850 | ||
473eb541 | 24851 | #: git-bisect.sh:111 |
b694fbb1 JX |
24852 | #, sh-format |
24853 | msgid "" | |
24854 | "bisect run failed:\n" | |
d13389bf | 24855 | "'bisect-state $state' exited with error code $res" |
b694fbb1 JX |
24856 | msgstr "" |
24857 | "二分查找运行失败:\n" | |
d13389bf | 24858 | "'bisect-state $state' 退出码为 $res" |
b694fbb1 | 24859 | |
473eb541 | 24860 | #: git-bisect.sh:118 |
b694fbb1 JX |
24861 | msgid "bisect run success" |
24862 | msgstr "二分查找运行成功" | |
c04f5ac3 | 24863 | |
5c57d762 JX |
24864 | #: git-merge-octopus.sh:46 |
24865 | msgid "" | |
24866 | "Error: Your local changes to the following files would be overwritten by " | |
24867 | "merge" | |
24868 | msgstr "错误:您对下列文件的本地修改将被合并操作覆盖" | |
24869 | ||
24870 | #: git-merge-octopus.sh:61 | |
24871 | msgid "Automated merge did not work." | |
9a4b694c | 24872 | msgstr "自动合并未生效。" |
5c57d762 JX |
24873 | |
24874 | #: git-merge-octopus.sh:62 | |
a0b6b246 | 24875 | msgid "Should not be doing an octopus." |
5c57d762 JX |
24876 | msgstr "不应该执行章鱼式合并。" |
24877 | ||
24878 | #: git-merge-octopus.sh:73 | |
24879 | #, sh-format | |
24880 | msgid "Unable to find common commit with $pretty_name" | |
24881 | msgstr "无法找到和 $pretty_name 的基线提交" | |
24882 | ||
24883 | #: git-merge-octopus.sh:77 | |
24884 | #, sh-format | |
6937cb4e | 24885 | msgid "Already up to date with $pretty_name" |
5c57d762 JX |
24886 | msgstr "已经和 $pretty_name 保持一致" |
24887 | ||
24888 | #: git-merge-octopus.sh:89 | |
24889 | #, sh-format | |
24890 | msgid "Fast-forwarding to: $pretty_name" | |
24891 | msgstr "快进至:$pretty_name" | |
24892 | ||
24893 | #: git-merge-octopus.sh:97 | |
24894 | #, sh-format | |
24895 | msgid "Trying simple merge with $pretty_name" | |
24896 | msgstr "尝试和 $pretty_name 的简单合并" | |
24897 | ||
24898 | #: git-merge-octopus.sh:102 | |
24899 | msgid "Simple merge did not work, trying automatic merge." | |
9a4b694c | 24900 | msgstr "简单合并未生效,尝试自动合并。" |
5c57d762 | 24901 | |
d13389bf | 24902 | #: git-submodule.sh:179 |
2e8451e8 JX |
24903 | msgid "Relative path can only be used from the toplevel of the working tree" |
24904 | msgstr "只能在工作区的顶级目录中使用相对路径" | |
24905 | ||
d13389bf | 24906 | #: git-submodule.sh:189 |
c04f5ac3 JX |
24907 | #, sh-format |
24908 | msgid "repo URL: '$repo' must be absolute or begin with ./|../" | |
4375c10e | 24909 | msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" |
c04f5ac3 | 24910 | |
d13389bf | 24911 | #: git-submodule.sh:208 |
c04f5ac3 | 24912 | #, sh-format |
170e9899 JX |
24913 | msgid "'$sm_path' already exists in the index" |
24914 | msgstr "'$sm_path' 已经存在于索引中" | |
c04f5ac3 | 24915 | |
d13389bf | 24916 | #: git-submodule.sh:211 |
1a79b2f1 JX |
24917 | #, sh-format |
24918 | msgid "'$sm_path' already exists in the index and is not a submodule" | |
24919 | msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" | |
24920 | ||
d13389bf | 24921 | #: git-submodule.sh:218 |
d46c5519 JX |
24922 | #, sh-format |
24923 | msgid "'$sm_path' does not have a commit checked out" | |
5b533632 | 24924 | msgstr "'$sm_path' 没有检出的提交" |
d46c5519 | 24925 | |
ec3d4607 | 24926 | #: git-submodule.sh:248 |
c04f5ac3 | 24927 | #, sh-format |
170e9899 JX |
24928 | msgid "Failed to add submodule '$sm_path'" |
24929 | msgstr "无法添加子模组 '$sm_path'" | |
c04f5ac3 | 24930 | |
ec3d4607 | 24931 | #: git-submodule.sh:257 |
c04f5ac3 | 24932 | #, sh-format |
170e9899 JX |
24933 | msgid "Failed to register submodule '$sm_path'" |
24934 | msgstr "无法注册子模组 '$sm_path'" | |
c04f5ac3 | 24935 | |
ec3d4607 | 24936 | #: git-submodule.sh:532 |
c04f5ac3 | 24937 | #, sh-format |
2e8451e8 JX |
24938 | msgid "Unable to find current revision in submodule path '$displaypath'" |
24939 | msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" | |
c04f5ac3 | 24940 | |
ec3d4607 | 24941 | #: git-submodule.sh:542 |
c04f5ac3 | 24942 | #, sh-format |
170e9899 JX |
24943 | msgid "Unable to fetch in submodule path '$sm_path'" |
24944 | msgstr "无法在子模组路径 '$sm_path' 中获取" | |
c04f5ac3 | 24945 | |
ec3d4607 | 24946 | #: git-submodule.sh:547 |
5c57d762 JX |
24947 | #, sh-format |
24948 | msgid "" | |
24949 | "Unable to find current ${remote_name}/${branch} revision in submodule path " | |
24950 | "'$sm_path'" | |
9a4b694c | 24951 | msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" |
5c57d762 | 24952 | |
ec3d4607 | 24953 | #: git-submodule.sh:565 |
2e8451e8 | 24954 | #, sh-format |
d46c5519 JX |
24955 | msgid "" |
24956 | "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " | |
24957 | "$sha1:" | |
24958 | msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:" | |
2e8451e8 | 24959 | |
ec3d4607 | 24960 | #: git-submodule.sh:571 |
5c57d762 JX |
24961 | #, sh-format |
24962 | msgid "" | |
24963 | "Fetched in submodule path '$displaypath', but it did not contain $sha1. " | |
24964 | "Direct fetching of that commit failed." | |
a0b6b246 JX |
24965 | msgstr "" |
24966 | "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" | |
5c57d762 | 24967 | |
ec3d4607 | 24968 | #: git-submodule.sh:578 |
6c94aba5 JX |
24969 | #, sh-format |
24970 | msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" | |
24971 | msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" | |
24972 | ||
ec3d4607 | 24973 | #: git-submodule.sh:579 |
c04f5ac3 | 24974 | #, sh-format |
6c94aba5 JX |
24975 | msgid "Submodule path '$displaypath': checked out '$sha1'" |
24976 | msgstr "子模组路径 '$displaypath':检出 '$sha1'" | |
24977 | ||
ec3d4607 | 24978 | #: git-submodule.sh:583 |
6c94aba5 | 24979 | #, sh-format |
2e8451e8 JX |
24980 | msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" |
24981 | msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" | |
c04f5ac3 | 24982 | |
ec3d4607 | 24983 | #: git-submodule.sh:584 |
c04f5ac3 | 24984 | #, sh-format |
2e8451e8 JX |
24985 | msgid "Submodule path '$displaypath': rebased into '$sha1'" |
24986 | msgstr "子模组路径 '$displaypath':变基至 '$sha1'" | |
c04f5ac3 | 24987 | |
ec3d4607 | 24988 | #: git-submodule.sh:589 |
c04f5ac3 | 24989 | #, sh-format |
2e8451e8 JX |
24990 | msgid "Unable to merge '$sha1' in submodule path '$displaypath'" |
24991 | msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" | |
c04f5ac3 | 24992 | |
ec3d4607 | 24993 | #: git-submodule.sh:590 |
c04f5ac3 | 24994 | #, sh-format |
2e8451e8 JX |
24995 | msgid "Submodule path '$displaypath': merged in '$sha1'" |
24996 | msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" | |
c04f5ac3 | 24997 | |
ec3d4607 | 24998 | #: git-submodule.sh:595 |
c04f5ac3 | 24999 | #, sh-format |
5b04ee3b JX |
25000 | msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" |
25001 | msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" | |
c04f5ac3 | 25002 | |
ec3d4607 | 25003 | #: git-submodule.sh:596 |
c04f5ac3 | 25004 | #, sh-format |
5b04ee3b | 25005 | msgid "Submodule path '$displaypath': '$command $sha1'" |
aef18cc6 | 25006 | msgstr "子模组 '$displaypath':'$command $sha1'" |
c04f5ac3 | 25007 | |
ec3d4607 | 25008 | #: git-submodule.sh:627 |
2e8451e8 JX |
25009 | #, sh-format |
25010 | msgid "Failed to recurse into submodule path '$displaypath'" | |
25011 | msgstr "无法递归进子模组路径 '$displaypath'" | |
25012 | ||
a6cd2cc4 JX |
25013 | #: git-rebase--preserve-merges.sh:109 |
25014 | msgid "Applied autostash." | |
25015 | msgstr "已应用 autostash。" | |
25016 | ||
25017 | #: git-rebase--preserve-merges.sh:112 | |
25018 | #, sh-format | |
25019 | msgid "Cannot store $stash_sha1" | |
25020 | msgstr "不能存储 $stash_sha1" | |
25021 | ||
349ede6a JX |
25022 | #: git-rebase--preserve-merges.sh:113 |
25023 | msgid "" | |
25024 | "Applying autostash resulted in conflicts.\n" | |
25025 | "Your changes are safe in the stash.\n" | |
25026 | "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" | |
25027 | msgstr "" | |
25028 | "应用 autostash 导致了冲突。\n" | |
25029 | "您的修改安全地保存在贮藏区中。\n" | |
25030 | "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" | |
25031 | ||
a6cd2cc4 | 25032 | #: git-rebase--preserve-merges.sh:191 |
c1ac5258 JX |
25033 | #, sh-format |
25034 | msgid "Rebasing ($new_count/$total)" | |
25035 | msgstr "变基中($new_count/$total)" | |
25036 | ||
d9488fea | 25037 | #: git-rebase--preserve-merges.sh:197 |
c1ac5258 JX |
25038 | msgid "" |
25039 | "\n" | |
25040 | "Commands:\n" | |
25041 | "p, pick <commit> = use commit\n" | |
25042 | "r, reword <commit> = use commit, but edit the commit message\n" | |
25043 | "e, edit <commit> = use commit, but stop for amending\n" | |
25044 | "s, squash <commit> = use commit, but meld into previous commit\n" | |
25045 | "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" | |
25046 | "x, exec <commit> = run command (the rest of the line) using shell\n" | |
25047 | "d, drop <commit> = remove commit\n" | |
25048 | "l, label <label> = label current HEAD with a name\n" | |
25049 | "t, reset <label> = reset HEAD to a label\n" | |
25050 | "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" | |
25051 | ". create a merge commit using the original merge commit's\n" | |
25052 | ". message (or the oneline, if no original merge commit was\n" | |
25053 | ". specified). Use -c <commit> to reword the commit message.\n" | |
25054 | "\n" | |
25055 | "These lines can be re-ordered; they are executed from top to bottom.\n" | |
25056 | msgstr "" | |
25057 | "\n" | |
25058 | "命令:\n" | |
25059 | "p, pick <提交> = 使用提交\n" | |
25060 | "r, reword <提交> = 使用提交,但修改提交说明\n" | |
25061 | "e, edit <提交> = 使用提交,但停下来修补\n" | |
33b62fba | 25062 | "s, squash <提交> = 使用提交,但挤压到前一个提交\n" |
c1ac5258 JX |
25063 | "f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n" |
25064 | "x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n" | |
25065 | "d, drop <提交> = 删除提交\n" | |
25066 | "l, label <标签> = 为当前 HEAD 打上标签\n" | |
25067 | "t, reset <标签> = 重置 HEAD 到该标签\n" | |
25068 | "m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n" | |
25069 | ". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n" | |
25070 | ". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n" | |
25071 | ". -c <提交> 可以编辑提交说明。\n" | |
25072 | "\n" | |
25073 | "可以对这些行重新排序,将从上至下执行。\n" | |
25074 | ||
d9488fea | 25075 | #: git-rebase--preserve-merges.sh:260 |
5c57d762 JX |
25076 | #, sh-format |
25077 | msgid "" | |
25078 | "You can amend the commit now, with\n" | |
25079 | "\n" | |
25080 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
25081 | "\n" | |
25082 | "Once you are satisfied with your changes, run\n" | |
25083 | "\n" | |
25084 | "\tgit rebase --continue" | |
25085 | msgstr "" | |
25086 | "您现在可以修补这个提交,使用\n" | |
25087 | "\n" | |
25088 | "\tgit commit --amend $gpg_sign_opt_quoted\n" | |
25089 | "\n" | |
9a4b694c | 25090 | "当您对变更感到满意,执行\n" |
5c57d762 JX |
25091 | "\n" |
25092 | "\tgit rebase --continue" | |
25093 | ||
d9488fea | 25094 | #: git-rebase--preserve-merges.sh:285 |
5c57d762 JX |
25095 | #, sh-format |
25096 | msgid "$sha1: not a commit that can be picked" | |
25097 | msgstr "$sha1:不是一个可以被拣选的提交" | |
25098 | ||
d9488fea | 25099 | #: git-rebase--preserve-merges.sh:324 |
5c57d762 JX |
25100 | #, sh-format |
25101 | msgid "Invalid commit name: $sha1" | |
25102 | msgstr "无效的提交名:$sha1" | |
25103 | ||
d9488fea | 25104 | #: git-rebase--preserve-merges.sh:354 |
5c57d762 JX |
25105 | msgid "Cannot write current commit's replacement sha1" |
25106 | msgstr "不能写入当前提交的替代 sha1" | |
25107 | ||
d9488fea | 25108 | #: git-rebase--preserve-merges.sh:405 |
5c57d762 JX |
25109 | #, sh-format |
25110 | msgid "Fast-forward to $sha1" | |
25111 | msgstr "快进到 $sha1" | |
25112 | ||
d9488fea | 25113 | #: git-rebase--preserve-merges.sh:407 |
5c57d762 JX |
25114 | #, sh-format |
25115 | msgid "Cannot fast-forward to $sha1" | |
25116 | msgstr "不能快进到 $sha1" | |
25117 | ||
d9488fea | 25118 | #: git-rebase--preserve-merges.sh:416 |
5c57d762 JX |
25119 | #, sh-format |
25120 | msgid "Cannot move HEAD to $first_parent" | |
25121 | msgstr "不能移动 HEAD 到 $first_parent" | |
25122 | ||
d9488fea | 25123 | #: git-rebase--preserve-merges.sh:421 |
5c57d762 JX |
25124 | #, sh-format |
25125 | msgid "Refusing to squash a merge: $sha1" | |
33b62fba | 25126 | msgstr "拒绝挤压一个合并:$sha1" |
5c57d762 | 25127 | |
d9488fea | 25128 | #: git-rebase--preserve-merges.sh:439 |
5c57d762 JX |
25129 | #, sh-format |
25130 | msgid "Error redoing merge $sha1" | |
25131 | msgstr "无法重做合并 $sha1" | |
25132 | ||
d9488fea | 25133 | #: git-rebase--preserve-merges.sh:448 |
5c57d762 JX |
25134 | #, sh-format |
25135 | msgid "Could not pick $sha1" | |
25136 | msgstr "不能拣选 $sha1" | |
25137 | ||
d9488fea | 25138 | #: git-rebase--preserve-merges.sh:457 |
5c57d762 JX |
25139 | #, sh-format |
25140 | msgid "This is the commit message #${n}:" | |
9a4b694c | 25141 | msgstr "这是提交说明 #${n}:" |
5c57d762 | 25142 | |
d9488fea | 25143 | #: git-rebase--preserve-merges.sh:462 |
5c57d762 JX |
25144 | #, sh-format |
25145 | msgid "The commit message #${n} will be skipped:" | |
9a4b694c | 25146 | msgstr "提交说明 #${n} 将被跳过:" |
5c57d762 | 25147 | |
d9488fea | 25148 | #: git-rebase--preserve-merges.sh:473 |
5c57d762 JX |
25149 | #, sh-format |
25150 | msgid "This is a combination of $count commit." | |
25151 | msgid_plural "This is a combination of $count commits." | |
25152 | msgstr[0] "这是一个 $count 个提交的组合。" | |
25153 | msgstr[1] "这是一个 $count 个提交的组合。" | |
25154 | ||
d9488fea | 25155 | #: git-rebase--preserve-merges.sh:482 |
5c57d762 JX |
25156 | #, sh-format |
25157 | msgid "Cannot write $fixup_msg" | |
25158 | msgstr "不能写入 $fixup_msg" | |
25159 | ||
d9488fea | 25160 | #: git-rebase--preserve-merges.sh:485 |
5c57d762 JX |
25161 | msgid "This is a combination of 2 commits." |
25162 | msgstr "这是一个 2 个提交的组合。" | |
25163 | ||
d9488fea JX |
25164 | #: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 |
25165 | #: git-rebase--preserve-merges.sh:572 | |
5c57d762 JX |
25166 | #, sh-format |
25167 | msgid "Could not apply $sha1... $rest" | |
25168 | msgstr "不能应用 $sha1... $rest" | |
25169 | ||
d9488fea | 25170 | #: git-rebase--preserve-merges.sh:601 |
5c57d762 JX |
25171 | #, sh-format |
25172 | msgid "" | |
25173 | "Could not amend commit after successfully picking $sha1... $rest\n" | |
25174 | "This is most likely due to an empty commit message, or the pre-commit hook\n" | |
25175 | "failed. If the pre-commit hook failed, you may need to resolve the issue " | |
25176 | "before\n" | |
25177 | "you are able to reword the commit." | |
25178 | msgstr "" | |
25179 | "不能在成功拣选 $sha1... $rest 之后修补提交\n" | |
25180 | "这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n" | |
25181 | "钩子执行失败,你可能需要在重写提交说明前解决这个问题。" | |
25182 | ||
d9488fea | 25183 | #: git-rebase--preserve-merges.sh:616 |
5c57d762 JX |
25184 | #, sh-format |
25185 | msgid "Stopped at $sha1_abbrev... $rest" | |
25186 | msgstr "停止在 $sha1_abbrev... $rest" | |
25187 | ||
d9488fea | 25188 | #: git-rebase--preserve-merges.sh:631 |
5c57d762 JX |
25189 | #, sh-format |
25190 | msgid "Cannot '$squash_style' without a previous commit" | |
9a4b694c | 25191 | msgstr "没有父提交的情况下不能 '$squash_style'" |
5c57d762 | 25192 | |
d9488fea | 25193 | #: git-rebase--preserve-merges.sh:673 |
5c57d762 JX |
25194 | #, sh-format |
25195 | msgid "Executing: $rest" | |
25196 | msgstr "执行:$rest" | |
25197 | ||
d9488fea | 25198 | #: git-rebase--preserve-merges.sh:681 |
5c57d762 JX |
25199 | #, sh-format |
25200 | msgid "Execution failed: $rest" | |
25201 | msgstr "执行失败:$rest" | |
25202 | ||
d9488fea | 25203 | #: git-rebase--preserve-merges.sh:683 |
5c57d762 JX |
25204 | msgid "and made changes to the index and/or the working tree" |
25205 | msgstr "并且修改索引和/或工作区" | |
25206 | ||
d9488fea | 25207 | #: git-rebase--preserve-merges.sh:685 |
5c57d762 JX |
25208 | msgid "" |
25209 | "You can fix the problem, and then run\n" | |
25210 | "\n" | |
25211 | "\tgit rebase --continue" | |
25212 | msgstr "" | |
25213 | "您可以解决这个问题,然后运行\n" | |
25214 | "\n" | |
25215 | "\tgit rebase --continue" | |
25216 | ||
25217 | #. TRANSLATORS: after these lines is a command to be issued by the user | |
d9488fea | 25218 | #: git-rebase--preserve-merges.sh:698 |
5c57d762 JX |
25219 | #, sh-format |
25220 | msgid "" | |
25221 | "Execution succeeded: $rest\n" | |
25222 | "but left changes to the index and/or the working tree\n" | |
25223 | "Commit or stash your changes, and then run\n" | |
25224 | "\n" | |
25225 | "\tgit rebase --continue" | |
25226 | msgstr "" | |
25227 | "执行成功:$rest\n" | |
a4f16749 | 25228 | "但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n" |
5c57d762 JX |
25229 | "\n" |
25230 | "\tgit rebase --continue" | |
25231 | ||
d9488fea | 25232 | #: git-rebase--preserve-merges.sh:709 |
5c57d762 JX |
25233 | #, sh-format |
25234 | msgid "Unknown command: $command $sha1 $rest" | |
25235 | msgstr "未知命令:$command $sha1 $rest" | |
25236 | ||
d9488fea | 25237 | #: git-rebase--preserve-merges.sh:710 |
5c57d762 JX |
25238 | msgid "Please fix this using 'git rebase --edit-todo'." |
25239 | msgstr "要修改请使用命令 'git rebase --edit-todo'。" | |
25240 | ||
d9488fea | 25241 | #: git-rebase--preserve-merges.sh:745 |
5c57d762 JX |
25242 | #, sh-format |
25243 | msgid "Successfully rebased and updated $head_name." | |
9a4b694c | 25244 | msgstr "成功变基并更新 $head_name。" |
5c57d762 | 25245 | |
d9488fea | 25246 | #: git-rebase--preserve-merges.sh:802 |
5c57d762 JX |
25247 | msgid "Could not remove CHERRY_PICK_HEAD" |
25248 | msgstr "不能删除 CHERRY_PICK_HEAD" | |
25249 | ||
d9488fea | 25250 | #: git-rebase--preserve-merges.sh:807 |
5c57d762 JX |
25251 | #, sh-format |
25252 | msgid "" | |
25253 | "You have staged changes in your working tree.\n" | |
25254 | "If these changes are meant to be\n" | |
25255 | "squashed into the previous commit, run:\n" | |
25256 | "\n" | |
25257 | " git commit --amend $gpg_sign_opt_quoted\n" | |
25258 | "\n" | |
25259 | "If they are meant to go into a new commit, run:\n" | |
25260 | "\n" | |
25261 | " git commit $gpg_sign_opt_quoted\n" | |
25262 | "\n" | |
a0b6b246 | 25263 | "In both cases, once you're done, continue with:\n" |
5c57d762 JX |
25264 | "\n" |
25265 | " git rebase --continue\n" | |
25266 | msgstr "" | |
33b62fba | 25267 | "您已暂存了工作区的修改。如果这些修改要挤压到前一个提交,执行:\n" |
5c57d762 JX |
25268 | "\n" |
25269 | " git commit --amend $gpg_sign_opt_quoted\n" | |
25270 | "\n" | |
25271 | "如果这些变更要形成一个新提交,执行:\n" | |
25272 | "\n" | |
25273 | " git commit $gpg_sign_opt_quoted\n" | |
25274 | "\n" | |
9a4b694c | 25275 | "无论哪种情况,当您完成提交,继续执行:\n" |
5c57d762 JX |
25276 | "\n" |
25277 | " git rebase --continue\n" | |
25278 | ||
d9488fea | 25279 | #: git-rebase--preserve-merges.sh:824 |
5c57d762 | 25280 | msgid "Error trying to find the author identity to amend commit" |
9a4b694c | 25281 | msgstr "在修补提交中查找作者信息时遇到错误" |
5c57d762 | 25282 | |
d9488fea | 25283 | #: git-rebase--preserve-merges.sh:829 |
5c57d762 JX |
25284 | msgid "" |
25285 | "You have uncommitted changes in your working tree. Please commit them\n" | |
25286 | "first and then run 'git rebase --continue' again." | |
a0b6b246 JX |
25287 | msgstr "" |
25288 | "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" | |
5c57d762 | 25289 | |
d9488fea | 25290 | #: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 |
5c57d762 JX |
25291 | msgid "Could not commit staged changes." |
25292 | msgstr "不能提交暂存的修改。" | |
25293 | ||
d9488fea | 25294 | #: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 |
4c27fcb5 JX |
25295 | msgid "Could not execute editor" |
25296 | msgstr "无法运行编辑器" | |
25297 | ||
d9488fea | 25298 | #: git-rebase--preserve-merges.sh:890 |
4c27fcb5 JX |
25299 | #, sh-format |
25300 | msgid "Could not checkout $switch_to" | |
25301 | msgstr "不能检出 $switch_to" | |
25302 | ||
d9488fea | 25303 | #: git-rebase--preserve-merges.sh:897 |
4c27fcb5 JX |
25304 | msgid "No HEAD?" |
25305 | msgstr "没有 HEAD?" | |
25306 | ||
d9488fea | 25307 | #: git-rebase--preserve-merges.sh:898 |
4c27fcb5 JX |
25308 | #, sh-format |
25309 | msgid "Could not create temporary $state_dir" | |
25310 | msgstr "不能创建临时 $state_dir" | |
25311 | ||
d9488fea | 25312 | #: git-rebase--preserve-merges.sh:901 |
4c27fcb5 JX |
25313 | msgid "Could not mark as interactive" |
25314 | msgstr "不能标记为交互式" | |
25315 | ||
d9488fea | 25316 | #: git-rebase--preserve-merges.sh:933 |
4c27fcb5 JX |
25317 | #, sh-format |
25318 | msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" | |
25319 | msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" | |
25320 | msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
25321 | msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)" | |
5c57d762 | 25322 | |
d9488fea | 25323 | #: git-rebase--preserve-merges.sh:945 |
2b472aae JX |
25324 | msgid "Note that empty commits are commented out" |
25325 | msgstr "注意空提交已被注释掉" | |
25326 | ||
d9488fea | 25327 | #: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 |
fd8cb379 JX |
25328 | msgid "Could not init rewritten commits" |
25329 | msgstr "不能对重写提交进行初始化" | |
25330 | ||
5c57d762 JX |
25331 | #: git-sh-setup.sh:89 git-sh-setup.sh:94 |
25332 | #, sh-format | |
25333 | msgid "usage: $dashless $USAGE" | |
25334 | msgstr "用法:$dashless $USAGE" | |
25335 | ||
d46c5519 | 25336 | #: git-sh-setup.sh:191 |
5c57d762 JX |
25337 | #, sh-format |
25338 | msgid "Cannot chdir to $cdup, the toplevel of the working tree" | |
9a4b694c | 25339 | msgstr "不能切换目录到 $cdup,工作区的顶级目录" |
5c57d762 | 25340 | |
d46c5519 | 25341 | #: git-sh-setup.sh:200 git-sh-setup.sh:207 |
5c57d762 JX |
25342 | #, sh-format |
25343 | msgid "fatal: $program_name cannot be used without a working tree." | |
06991777 | 25344 | msgstr "致命错误:$program_name 不能在没有工作区的情况下使用" |
5c57d762 | 25345 | |
d46c5519 | 25346 | #: git-sh-setup.sh:221 |
5c57d762 JX |
25347 | msgid "Cannot rebase: You have unstaged changes." |
25348 | msgstr "不能变基:您有未暂存的变更。" | |
25349 | ||
d46c5519 | 25350 | #: git-sh-setup.sh:224 |
5c57d762 JX |
25351 | msgid "Cannot rewrite branches: You have unstaged changes." |
25352 | msgstr "不能重写分支:您有未暂存的变更。" | |
25353 | ||
d46c5519 | 25354 | #: git-sh-setup.sh:227 |
a0b6b246 JX |
25355 | msgid "Cannot pull with rebase: You have unstaged changes." |
25356 | msgstr "无法通过变基方式拉取:您有未暂存的变更。" | |
25357 | ||
d46c5519 | 25358 | #: git-sh-setup.sh:230 |
5c57d762 JX |
25359 | #, sh-format |
25360 | msgid "Cannot $action: You have unstaged changes." | |
25361 | msgstr "不能 $action:您有未暂存的变更。" | |
25362 | ||
d46c5519 | 25363 | #: git-sh-setup.sh:243 |
5c57d762 JX |
25364 | msgid "Cannot rebase: Your index contains uncommitted changes." |
25365 | msgstr "不能变基:您的索引中包含未提交的变更。" | |
25366 | ||
d46c5519 | 25367 | #: git-sh-setup.sh:246 |
a0b6b246 JX |
25368 | msgid "Cannot pull with rebase: Your index contains uncommitted changes." |
25369 | msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" | |
25370 | ||
d46c5519 | 25371 | #: git-sh-setup.sh:249 |
5c57d762 JX |
25372 | #, sh-format |
25373 | msgid "Cannot $action: Your index contains uncommitted changes." | |
25374 | msgstr "不能 $action:您的索引中包含未提交的变更。" | |
25375 | ||
d46c5519 | 25376 | #: git-sh-setup.sh:253 |
a0b6b246 JX |
25377 | msgid "Additionally, your index contains uncommitted changes." |
25378 | msgstr "而且您的索引中包含未提交的变更。" | |
25379 | ||
d46c5519 | 25380 | #: git-sh-setup.sh:373 |
5c57d762 JX |
25381 | msgid "You need to run this command from the toplevel of the working tree." |
25382 | msgstr "您需要在工作区的顶级目录中运行这个命令。" | |
25383 | ||
d46c5519 | 25384 | #: git-sh-setup.sh:378 |
5c57d762 JX |
25385 | msgid "Unable to determine absolute path of git directory" |
25386 | msgstr "不能确定 git 目录的绝对路径" | |
a0b6b246 | 25387 | |
1a79b2f1 | 25388 | #. TRANSLATORS: you can adjust this to align "git add -i" status menu |
ddc12c42 | 25389 | #: git-add--interactive.perl:212 |
1a79b2f1 JX |
25390 | #, perl-format |
25391 | msgid "%12s %12s %s" | |
25392 | msgstr "%12s %12s %s" | |
25393 | ||
d13389bf | 25394 | #: git-add--interactive.perl:632 |
1a79b2f1 JX |
25395 | #, perl-format |
25396 | msgid "touched %d path\n" | |
25397 | msgid_plural "touched %d paths\n" | |
25398 | msgstr[0] "触碰了 %d 个路径\n" | |
25399 | msgstr[1] "触碰了 %d 个路径\n" | |
25400 | ||
d13389bf | 25401 | #: git-add--interactive.perl:1056 |
1a79b2f1 JX |
25402 | msgid "" |
25403 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
25404 | "marked for staging." | |
25405 | msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。" | |
25406 | ||
d13389bf | 25407 | #: git-add--interactive.perl:1059 |
1a79b2f1 JX |
25408 | msgid "" |
25409 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
25410 | "marked for stashing." | |
a4f16749 | 25411 | msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。" |
1a79b2f1 | 25412 | |
d13389bf | 25413 | #: git-add--interactive.perl:1062 |
1a79b2f1 JX |
25414 | msgid "" |
25415 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
25416 | "marked for unstaging." | |
25417 | msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。" | |
25418 | ||
d13389bf JX |
25419 | #: git-add--interactive.perl:1065 git-add--interactive.perl:1074 |
25420 | #: git-add--interactive.perl:1080 | |
1a79b2f1 JX |
25421 | msgid "" |
25422 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
25423 | "marked for applying." | |
25424 | msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。" | |
25425 | ||
d13389bf JX |
25426 | #: git-add--interactive.perl:1068 git-add--interactive.perl:1071 |
25427 | #: git-add--interactive.perl:1077 | |
1a79b2f1 JX |
25428 | msgid "" |
25429 | "If the patch applies cleanly, the edited hunk will immediately be\n" | |
25430 | "marked for discarding." | |
25431 | msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。" | |
25432 | ||
d13389bf | 25433 | #: git-add--interactive.perl:1114 |
1a79b2f1 JX |
25434 | #, perl-format |
25435 | msgid "failed to open hunk edit file for writing: %s" | |
c1ac5258 | 25436 | msgstr "为写入打开块编辑文件失败:%s" |
1a79b2f1 | 25437 | |
d13389bf | 25438 | #: git-add--interactive.perl:1121 |
1a79b2f1 JX |
25439 | #, perl-format |
25440 | msgid "" | |
25441 | "---\n" | |
25442 | "To remove '%s' lines, make them ' ' lines (context).\n" | |
25443 | "To remove '%s' lines, delete them.\n" | |
25444 | "Lines starting with %s will be removed.\n" | |
25445 | msgstr "" | |
25446 | "---\n" | |
25447 | "要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" | |
25448 | "要删除 '%s' 开始的行,删除它们。\n" | |
25449 | "以 %s 开始的行将被删除。\n" | |
25450 | ||
d13389bf | 25451 | #: git-add--interactive.perl:1143 |
1a79b2f1 JX |
25452 | #, perl-format |
25453 | msgid "failed to open hunk edit file for reading: %s" | |
25454 | msgstr "无法读取块编辑文件:%s" | |
25455 | ||
d13389bf | 25456 | #: git-add--interactive.perl:1251 |
1a79b2f1 JX |
25457 | msgid "" |
25458 | "y - stage this hunk\n" | |
25459 | "n - do not stage this hunk\n" | |
25460 | "q - quit; do not stage this hunk or any of the remaining ones\n" | |
25461 | "a - stage this hunk and all later hunks in the file\n" | |
25462 | "d - do not stage this hunk or any of the later hunks in the file" | |
25463 | msgstr "" | |
25464 | "y - 暂存该块\n" | |
25465 | "n - 不要暂存该块\n" | |
25466 | "q - 退出。不暂存该块及后面的全部块\n" | |
25467 | "a - 暂存该块和本文件中后面的全部块\n" | |
25468 | "d - 不暂存该块和本文件中后面的全部块" | |
25469 | ||
d13389bf | 25470 | #: git-add--interactive.perl:1257 |
1a79b2f1 JX |
25471 | msgid "" |
25472 | "y - stash this hunk\n" | |
25473 | "n - do not stash this hunk\n" | |
25474 | "q - quit; do not stash this hunk or any of the remaining ones\n" | |
25475 | "a - stash this hunk and all later hunks in the file\n" | |
25476 | "d - do not stash this hunk or any of the later hunks in the file" | |
25477 | msgstr "" | |
25478 | "y - 贮藏该块\n" | |
25479 | "n - 不要贮藏该块\n" | |
25480 | "q - 退出。不贮藏该块及后面的全部块\n" | |
25481 | "a - 贮藏该块和本文件中后面的全部块\n" | |
25482 | "d - 不贮藏该块和本文件中后面的全部块" | |
25483 | ||
d13389bf | 25484 | #: git-add--interactive.perl:1263 |
1a79b2f1 JX |
25485 | msgid "" |
25486 | "y - unstage this hunk\n" | |
25487 | "n - do not unstage this hunk\n" | |
25488 | "q - quit; do not unstage this hunk or any of the remaining ones\n" | |
25489 | "a - unstage this hunk and all later hunks in the file\n" | |
25490 | "d - do not unstage this hunk or any of the later hunks in the file" | |
25491 | msgstr "" | |
25492 | "y - 不暂存该块\n" | |
25493 | "n - 不要不暂存该块\n" | |
25494 | "q - 退出。不要不暂存该块及后面的全部块\n" | |
25495 | "a - 不暂存该块和本文件中后面的全部块\n" | |
25496 | "d - 不要不暂存该块和本文件中后面的全部块" | |
25497 | ||
d13389bf | 25498 | #: git-add--interactive.perl:1269 |
1a79b2f1 JX |
25499 | msgid "" |
25500 | "y - apply this hunk to index\n" | |
25501 | "n - do not apply this hunk to index\n" | |
25502 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
25503 | "a - apply this hunk and all later hunks in the file\n" | |
25504 | "d - do not apply this hunk or any of the later hunks in the file" | |
25505 | msgstr "" | |
25506 | "y - 在索引中应用该块\n" | |
25507 | "n - 不要在索引中应用该块\n" | |
25508 | "q - 退出。不要应用该块及后面的全部块\n" | |
25509 | "a - 应用该块和本文件中后面的全部块\n" | |
25510 | "d - 不要应用该块和本文件中后面的全部块" | |
25511 | ||
d13389bf | 25512 | #: git-add--interactive.perl:1275 git-add--interactive.perl:1293 |
1a79b2f1 JX |
25513 | msgid "" |
25514 | "y - discard this hunk from worktree\n" | |
25515 | "n - do not discard this hunk from worktree\n" | |
25516 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
25517 | "a - discard this hunk and all later hunks in the file\n" | |
25518 | "d - do not discard this hunk or any of the later hunks in the file" | |
25519 | msgstr "" | |
25520 | "y - 在工作区中丢弃该块\n" | |
25521 | "n - 不要在工作区中丢弃该块\n" | |
25522 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
25523 | "a - 丢弃该块和本文件中后面的全部块\n" | |
25524 | "d - 不要丢弃该块和本文件中后面的全部块" | |
25525 | ||
d13389bf | 25526 | #: git-add--interactive.perl:1281 |
1a79b2f1 JX |
25527 | msgid "" |
25528 | "y - discard this hunk from index and worktree\n" | |
25529 | "n - do not discard this hunk from index and worktree\n" | |
25530 | "q - quit; do not discard this hunk or any of the remaining ones\n" | |
25531 | "a - discard this hunk and all later hunks in the file\n" | |
25532 | "d - do not discard this hunk or any of the later hunks in the file" | |
25533 | msgstr "" | |
25534 | "y - 在索引和工作区中丢弃该块\n" | |
25535 | "n - 不要在索引和工作区中丢弃该块\n" | |
25536 | "q - 退出。不要丢弃该块及后面的全部块\n" | |
25537 | "a - 丢弃该块和本文件中后面的全部块\n" | |
25538 | "d - 不要丢弃该块和本文件中后面的全部块" | |
25539 | ||
d13389bf | 25540 | #: git-add--interactive.perl:1287 |
1a79b2f1 JX |
25541 | msgid "" |
25542 | "y - apply this hunk to index and worktree\n" | |
25543 | "n - do not apply this hunk to index and worktree\n" | |
25544 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
25545 | "a - apply this hunk and all later hunks in the file\n" | |
25546 | "d - do not apply this hunk or any of the later hunks in the file" | |
25547 | msgstr "" | |
25548 | "y - 在索引和工作区中应用该块\n" | |
25549 | "n - 不要在索引和工作区中应用该块\n" | |
25550 | "q - 退出。不要应用该块及后面的全部块\n" | |
25551 | "a - 应用该块和本文件中后面的全部块\n" | |
25552 | "d - 不要应用该块和本文件中后面的全部块" | |
25553 | ||
d13389bf | 25554 | #: git-add--interactive.perl:1299 |
a6cd2cc4 JX |
25555 | msgid "" |
25556 | "y - apply this hunk to worktree\n" | |
25557 | "n - do not apply this hunk to worktree\n" | |
25558 | "q - quit; do not apply this hunk or any of the remaining ones\n" | |
25559 | "a - apply this hunk and all later hunks in the file\n" | |
25560 | "d - do not apply this hunk or any of the later hunks in the file" | |
25561 | msgstr "" | |
25562 | "y - 在工作区中应用该块\n" | |
25563 | "n - 不要在工作区中应用该块\n" | |
25564 | "q - 退出。不要应用该块及后面的全部块\n" | |
25565 | "a - 应用该块和本文件中后面的全部块\n" | |
25566 | "d - 不要应用该块和本文件中后面的全部块" | |
25567 | ||
d13389bf | 25568 | #: git-add--interactive.perl:1314 |
1a79b2f1 JX |
25569 | msgid "" |
25570 | "g - select a hunk to go to\n" | |
25571 | "/ - search for a hunk matching the given regex\n" | |
25572 | "j - leave this hunk undecided, see next undecided hunk\n" | |
25573 | "J - leave this hunk undecided, see next hunk\n" | |
25574 | "k - leave this hunk undecided, see previous undecided hunk\n" | |
25575 | "K - leave this hunk undecided, see previous hunk\n" | |
25576 | "s - split the current hunk into smaller hunks\n" | |
25577 | "e - manually edit the current hunk\n" | |
25578 | "? - print help\n" | |
25579 | msgstr "" | |
25580 | "g - 选择跳转到一个块\n" | |
25581 | "/ - 查找和给定正则表达式匹配的块\n" | |
25582 | "j - 维持该块未决状态,查看下一个未决块\n" | |
25583 | "J - 维持该块未决状态,查看下一个块\n" | |
25584 | "k - 维持该块未决状态,查看上一个未决块\n" | |
25585 | "K - 维持该块未决状态,查看上一个块\n" | |
25586 | "s - 拆分当前块为更小的块\n" | |
25587 | "e - 手动编辑当前块\n" | |
25588 | "? - 显示帮助\n" | |
25589 | ||
d13389bf | 25590 | #: git-add--interactive.perl:1345 |
1a79b2f1 JX |
25591 | msgid "The selected hunks do not apply to the index!\n" |
25592 | msgstr "选中的块不能应用到索引!\n" | |
25593 | ||
d13389bf | 25594 | #: git-add--interactive.perl:1360 |
1a79b2f1 JX |
25595 | #, perl-format |
25596 | msgid "ignoring unmerged: %s\n" | |
25597 | msgstr "忽略未合入的:%s\n" | |
25598 | ||
d13389bf | 25599 | #: git-add--interactive.perl:1479 |
a6cd2cc4 JX |
25600 | #, perl-format |
25601 | msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " | |
25602 | msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " | |
25603 | ||
d13389bf | 25604 | #: git-add--interactive.perl:1480 |
a6cd2cc4 JX |
25605 | #, perl-format |
25606 | msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " | |
25607 | msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " | |
25608 | ||
d13389bf | 25609 | #: git-add--interactive.perl:1481 |
7157c2b5 JX |
25610 | #, perl-format |
25611 | msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " | |
25612 | msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " | |
25613 | ||
d13389bf | 25614 | #: git-add--interactive.perl:1482 |
a6cd2cc4 JX |
25615 | #, perl-format |
25616 | msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " | |
25617 | msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " | |
25618 | ||
d13389bf | 25619 | #: git-add--interactive.perl:1599 |
31e5e17b JX |
25620 | msgid "No other hunks to goto\n" |
25621 | msgstr "没有其它可供跳转的块\n" | |
1a79b2f1 | 25622 | |
d13389bf | 25623 | #: git-add--interactive.perl:1617 |
1a79b2f1 JX |
25624 | #, perl-format |
25625 | msgid "Invalid number: '%s'\n" | |
25626 | msgstr "无效数字:'%s'\n" | |
25627 | ||
d13389bf | 25628 | #: git-add--interactive.perl:1622 |
1a79b2f1 JX |
25629 | #, perl-format |
25630 | msgid "Sorry, only %d hunk available.\n" | |
25631 | msgid_plural "Sorry, only %d hunks available.\n" | |
25632 | msgstr[0] "对不起,只有 %d 个可用块。\n" | |
25633 | msgstr[1] "对不起,只有 %d 个可用块。\n" | |
25634 | ||
d13389bf | 25635 | #: git-add--interactive.perl:1657 |
31e5e17b JX |
25636 | msgid "No other hunks to search\n" |
25637 | msgstr "没有其它可供查找的块\n" | |
25638 | ||
d13389bf | 25639 | #: git-add--interactive.perl:1674 |
1a79b2f1 JX |
25640 | #, perl-format |
25641 | msgid "Malformed search regexp %s: %s\n" | |
25642 | msgstr "错误的正则表达式 %s:%s\n" | |
25643 | ||
d13389bf | 25644 | #: git-add--interactive.perl:1684 |
1a79b2f1 | 25645 | msgid "No hunk matches the given pattern\n" |
ddc12c42 | 25646 | msgstr "没有和给定模式相匹配的块\n" |
1a79b2f1 | 25647 | |
d13389bf | 25648 | #: git-add--interactive.perl:1696 git-add--interactive.perl:1718 |
1a79b2f1 JX |
25649 | msgid "No previous hunk\n" |
25650 | msgstr "没有前一个块\n" | |
25651 | ||
d13389bf | 25652 | #: git-add--interactive.perl:1705 git-add--interactive.perl:1724 |
1a79b2f1 JX |
25653 | msgid "No next hunk\n" |
25654 | msgstr "没有下一个块\n" | |
25655 | ||
d13389bf | 25656 | #: git-add--interactive.perl:1730 |
31e5e17b JX |
25657 | msgid "Sorry, cannot split this hunk\n" |
25658 | msgstr "对不起,不能拆分这个块\n" | |
25659 | ||
d13389bf | 25660 | #: git-add--interactive.perl:1736 |
1a79b2f1 JX |
25661 | #, perl-format |
25662 | msgid "Split into %d hunk.\n" | |
25663 | msgid_plural "Split into %d hunks.\n" | |
25664 | msgstr[0] "拆分为 %d 块。\n" | |
25665 | msgstr[1] "拆分为 %d 块。\n" | |
25666 | ||
d13389bf | 25667 | #: git-add--interactive.perl:1746 |
31e5e17b JX |
25668 | msgid "Sorry, cannot edit this hunk\n" |
25669 | msgstr "对不起,不能编辑这个块\n" | |
25670 | ||
1a79b2f1 JX |
25671 | #. TRANSLATORS: please do not translate the command names |
25672 | #. 'status', 'update', 'revert', etc. | |
d13389bf | 25673 | #: git-add--interactive.perl:1811 |
1a79b2f1 JX |
25674 | msgid "" |
25675 | "status - show paths with changes\n" | |
25676 | "update - add working tree state to the staged set of changes\n" | |
25677 | "revert - revert staged set of changes back to the HEAD version\n" | |
25678 | "patch - pick hunks and update selectively\n" | |
87cb7997 | 25679 | "diff - view diff between HEAD and index\n" |
1a79b2f1 JX |
25680 | "add untracked - add contents of untracked files to the staged set of " |
25681 | "changes\n" | |
25682 | msgstr "" | |
25683 | "status - 显示含变更的路径\n" | |
25684 | "update - 添加工作区状态至暂存列表\n" | |
25685 | "revert - 还原修改的暂存集至 HEAD 版本\n" | |
25686 | "patch - 挑选块并且有选择地更新\n" | |
25687 | "diff - 显示 HEAD 和索引间差异\n" | |
25688 | "add untracked - 添加未跟踪文件的内容至暂存列表\n" | |
25689 | ||
d13389bf JX |
25690 | #: git-add--interactive.perl:1828 git-add--interactive.perl:1840 |
25691 | #: git-add--interactive.perl:1843 git-add--interactive.perl:1850 | |
25692 | #: git-add--interactive.perl:1853 git-add--interactive.perl:1860 | |
25693 | #: git-add--interactive.perl:1864 git-add--interactive.perl:1870 | |
1a79b2f1 JX |
25694 | msgid "missing --" |
25695 | msgstr "缺失 --" | |
25696 | ||
d13389bf | 25697 | #: git-add--interactive.perl:1866 |
1a79b2f1 JX |
25698 | #, perl-format |
25699 | msgid "unknown --patch mode: %s" | |
25700 | msgstr "未知的 --patch 模式:%s" | |
25701 | ||
d13389bf | 25702 | #: git-add--interactive.perl:1872 git-add--interactive.perl:1878 |
1a79b2f1 JX |
25703 | #, perl-format |
25704 | msgid "invalid argument %s, expecting --" | |
25705 | msgstr "无效的参数 %s,期望是 --" | |
25706 | ||
ec3d4607 | 25707 | #: git-send-email.perl:129 |
1a79b2f1 JX |
25708 | msgid "local zone differs from GMT by a non-minute interval\n" |
25709 | msgstr "本地时间和 GMT 有不到一分钟间隔\n" | |
25710 | ||
ec3d4607 | 25711 | #: git-send-email.perl:136 git-send-email.perl:142 |
1a79b2f1 JX |
25712 | msgid "local time offset greater than or equal to 24 hours\n" |
25713 | msgstr "本地时间偏移量大于等于 24 小时\n" | |
25714 | ||
ec3d4607 | 25715 | #: git-send-email.perl:214 |
33b62fba JX |
25716 | #, perl-format |
25717 | msgid "fatal: command '%s' died with exit code %d" | |
25718 | msgstr "致命错误:命令 '%s' 已终止,退出代码为 %d" | |
25719 | ||
ec3d4607 | 25720 | #: git-send-email.perl:227 |
1a79b2f1 JX |
25721 | msgid "the editor exited uncleanly, aborting everything" |
25722 | msgstr "编辑器非正常退出,终止所有操作" | |
25723 | ||
ec3d4607 | 25724 | #: git-send-email.perl:316 |
1a79b2f1 JX |
25725 | #, perl-format |
25726 | msgid "" | |
25727 | "'%s' contains an intermediate version of the email you were composing.\n" | |
25728 | msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n" | |
25729 | ||
ec3d4607 | 25730 | #: git-send-email.perl:321 |
1a79b2f1 JX |
25731 | #, perl-format |
25732 | msgid "'%s.final' contains the composed email.\n" | |
25733 | msgstr "'%s.final' 包含编辑的邮件。\n" | |
25734 | ||
ec3d4607 | 25735 | #: git-send-email.perl:450 |
1a79b2f1 JX |
25736 | msgid "--dump-aliases incompatible with other options\n" |
25737 | msgstr "--dump-aliases 和其它选项不兼容\n" | |
25738 | ||
ec3d4607 | 25739 | #: git-send-email.perl:525 |
d9488fea JX |
25740 | msgid "" |
25741 | "fatal: found configuration options for 'sendmail'\n" | |
25742 | "git-send-email is configured with the sendemail.* options - note the 'e'.\n" | |
25743 | "Set sendemail.forbidSendmailVariables to false to disable this check.\n" | |
25744 | msgstr "" | |
25745 | "致命错误:发现 'sendmail' 配置选项\n" | |
25746 | "git-send-email 通过 sendemail.* 选项进行设置,注意字母 'e'。\n" | |
25747 | "设置 sendemail.forbidSendmailVariables 为 false 来禁用这项检查。\n" | |
25748 | ||
ec3d4607 | 25749 | #: git-send-email.perl:530 git-send-email.perl:746 |
1a79b2f1 JX |
25750 | msgid "Cannot run git format-patch from outside a repository\n" |
25751 | msgstr "不能在仓库之外运行 git format-patch\n" | |
25752 | ||
ec3d4607 | 25753 | #: git-send-email.perl:533 |
31e5e17b JX |
25754 | msgid "" |
25755 | "`batch-size` and `relogin` must be specified together (via command-line or " | |
25756 | "configuration option)\n" | |
25757 | msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" | |
25758 | ||
ec3d4607 | 25759 | #: git-send-email.perl:546 |
1a79b2f1 JX |
25760 | #, perl-format |
25761 | msgid "Unknown --suppress-cc field: '%s'\n" | |
25762 | msgstr "未知的 --suppress-cc 字段:'%s'\n" | |
25763 | ||
ec3d4607 | 25764 | #: git-send-email.perl:577 |
1a79b2f1 JX |
25765 | #, perl-format |
25766 | msgid "Unknown --confirm setting: '%s'\n" | |
25767 | msgstr "未知的 --confirm 设置:'%s'\n" | |
25768 | ||
ec3d4607 | 25769 | #: git-send-email.perl:617 |
1a79b2f1 JX |
25770 | #, perl-format |
25771 | msgid "warning: sendmail alias with quotes is not supported: %s\n" | |
25772 | msgstr "警告:不支持带引号的 sendmail 别名:%s\n" | |
25773 | ||
ec3d4607 | 25774 | #: git-send-email.perl:619 |
1a79b2f1 JX |
25775 | #, perl-format |
25776 | msgid "warning: `:include:` not supported: %s\n" | |
25777 | msgstr "警告:不支持 `:include:`:%s\n" | |
25778 | ||
ec3d4607 | 25779 | #: git-send-email.perl:621 |
1a79b2f1 JX |
25780 | #, perl-format |
25781 | msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" | |
25782 | msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" | |
25783 | ||
ec3d4607 | 25784 | #: git-send-email.perl:626 |
1a79b2f1 JX |
25785 | #, perl-format |
25786 | msgid "warning: sendmail line is not recognized: %s\n" | |
25787 | msgstr "警告:不能识别的 sendmail 行:%s\n" | |
25788 | ||
ec3d4607 | 25789 | #: git-send-email.perl:711 |
1a79b2f1 JX |
25790 | #, perl-format |
25791 | msgid "" | |
25792 | "File '%s' exists but it could also be the range of commits\n" | |
25793 | "to produce patches for. Please disambiguate by...\n" | |
25794 | "\n" | |
25795 | " * Saying \"./%s\" if you mean a file; or\n" | |
25796 | " * Giving --format-patch option if you mean a range.\n" | |
25797 | msgstr "" | |
87cb7997 JX |
25798 | "存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除" |
25799 | "歧义:\n" | |
1a79b2f1 JX |
25800 | "\n" |
25801 | " * 如果含义为一个文件,使用 \"./%s\",或者\n" | |
25802 | " * 如果含义为一个范围,使用 --format-patch 选项。\n" | |
25803 | ||
ec3d4607 | 25804 | #: git-send-email.perl:732 |
1a79b2f1 JX |
25805 | #, perl-format |
25806 | msgid "Failed to opendir %s: %s" | |
25807 | msgstr "无法打开目录 %s: %s" | |
25808 | ||
ec3d4607 | 25809 | #: git-send-email.perl:767 |
1a79b2f1 JX |
25810 | msgid "" |
25811 | "\n" | |
25812 | "No patch files specified!\n" | |
25813 | "\n" | |
87cb7997 JX |
25814 | msgstr "" |
25815 | "\n" | |
25816 | "未指定补丁文件!\n" | |
25817 | "\n" | |
1a79b2f1 | 25818 | |
ec3d4607 | 25819 | #: git-send-email.perl:780 |
1a79b2f1 JX |
25820 | #, perl-format |
25821 | msgid "No subject line in %s?" | |
25822 | msgstr "在 %s 中没有标题行?" | |
25823 | ||
ec3d4607 | 25824 | #: git-send-email.perl:791 |
1a79b2f1 JX |
25825 | #, perl-format |
25826 | msgid "Failed to open for writing %s: %s" | |
c1ac5258 | 25827 | msgstr "为写入打开 %s 失败: %s" |
1a79b2f1 | 25828 | |
ec3d4607 | 25829 | #: git-send-email.perl:802 |
1a79b2f1 JX |
25830 | msgid "" |
25831 | "Lines beginning in \"GIT:\" will be removed.\n" | |
25832 | "Consider including an overall diffstat or table of contents\n" | |
25833 | "for the patch you are writing.\n" | |
25834 | "\n" | |
25835 | "Clear the body content if you don't wish to send a summary.\n" | |
25836 | msgstr "" | |
25837 | "以 \"GIT:\" 开头的行将被删除。\n" | |
5b533632 | 25838 | "考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" |
1a79b2f1 JX |
25839 | "\n" |
25840 | "如果您不想发送摘要,清除内容。\n" | |
25841 | ||
ec3d4607 | 25842 | #: git-send-email.perl:826 |
1a79b2f1 JX |
25843 | #, perl-format |
25844 | msgid "Failed to open %s: %s" | |
25845 | msgstr "无法打开 %s: %s" | |
25846 | ||
ec3d4607 | 25847 | #: git-send-email.perl:843 |
31e5e17b JX |
25848 | #, perl-format |
25849 | msgid "Failed to open %s.final: %s" | |
25850 | msgstr "无法打开 %s.final: %s" | |
1a79b2f1 | 25851 | |
ec3d4607 | 25852 | #: git-send-email.perl:886 |
1a79b2f1 JX |
25853 | msgid "Summary email is empty, skipping it\n" |
25854 | msgstr "摘要邮件为空,跳过\n" | |
25855 | ||
25856 | #. TRANSLATORS: please keep [y/N] as is. | |
ec3d4607 | 25857 | #: git-send-email.perl:935 |
1a79b2f1 JX |
25858 | #, perl-format |
25859 | msgid "Are you sure you want to use <%s> [y/N]? " | |
25860 | msgstr "您确认要使用 <%s> [y/N]?" | |
25861 | ||
ec3d4607 | 25862 | #: git-send-email.perl:990 |
1a79b2f1 JX |
25863 | msgid "" |
25864 | "The following files are 8bit, but do not declare a Content-Transfer-" | |
25865 | "Encoding.\n" | |
25866 | msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" | |
25867 | ||
ec3d4607 | 25868 | #: git-send-email.perl:995 |
1a79b2f1 JX |
25869 | msgid "Which 8bit encoding should I declare [UTF-8]? " |
25870 | msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" | |
25871 | ||
ec3d4607 | 25872 | #: git-send-email.perl:1003 |
1a79b2f1 JX |
25873 | #, perl-format |
25874 | msgid "" | |
25875 | "Refusing to send because the patch\n" | |
25876 | "\t%s\n" | |
25877 | "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " | |
25878 | "want to send.\n" | |
25879 | msgstr "" | |
25880 | "拒绝发送,因为补丁\n" | |
25881 | "\t%s\n" | |
25882 | "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" | |
25883 | ||
ec3d4607 | 25884 | #: git-send-email.perl:1022 |
1a79b2f1 JX |
25885 | msgid "To whom should the emails be sent (if anyone)?" |
25886 | msgstr "邮件将要发送给谁?" | |
25887 | ||
ec3d4607 | 25888 | #: git-send-email.perl:1040 |
1a79b2f1 JX |
25889 | #, perl-format |
25890 | msgid "fatal: alias '%s' expands to itself\n" | |
06991777 | 25891 | msgstr "致命错误:别名 '%s' 扩展为它自己\n" |
1a79b2f1 | 25892 | |
ec3d4607 | 25893 | #: git-send-email.perl:1052 |
1a79b2f1 JX |
25894 | msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " |
25895 | msgstr "Message-ID 被用作第一封邮件的 In-Reply-To ?" | |
25896 | ||
ec3d4607 | 25897 | #: git-send-email.perl:1114 git-send-email.perl:1122 |
1a79b2f1 JX |
25898 | #, perl-format |
25899 | msgid "error: unable to extract a valid address from: %s\n" | |
25900 | msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" | |
25901 | ||
25902 | #. TRANSLATORS: Make sure to include [q] [d] [e] in your | |
25903 | #. translation. The program will only accept English input | |
25904 | #. at this point. | |
ec3d4607 | 25905 | #: git-send-email.perl:1126 |
1a79b2f1 JX |
25906 | msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " |
25907 | msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" | |
25908 | ||
ec3d4607 | 25909 | #: git-send-email.perl:1446 |
1a79b2f1 JX |
25910 | #, perl-format |
25911 | msgid "CA path \"%s\" does not exist" | |
25912 | msgstr "CA 路径 \"%s\" 不存在" | |
25913 | ||
ec3d4607 | 25914 | #: git-send-email.perl:1529 |
1a79b2f1 JX |
25915 | msgid "" |
25916 | " The Cc list above has been expanded by additional\n" | |
25917 | " addresses found in the patch commit message. By default\n" | |
25918 | " send-email prompts before sending whenever this occurs.\n" | |
25919 | " This behavior is controlled by the sendemail.confirm\n" | |
25920 | " configuration setting.\n" | |
25921 | "\n" | |
25922 | " For additional information, run 'git send-email --help'.\n" | |
25923 | " To retain the current behavior, but squelch this message,\n" | |
25924 | " run 'git config --global sendemail.confirm auto'.\n" | |
25925 | "\n" | |
25926 | msgstr "" | |
25927 | " 以上的抄送列表(Cc)已经用补丁提交信息中发现的地址进行\n" | |
25928 | " 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n" | |
25929 | " sendemail.confirm 配置设置。\n" | |
25930 | "\n" | |
25931 | " 更多信息,执行 'git send-email --help'。\n" | |
25932 | " 要保持当前行为,但不显示此信息,运行 'git config --global\n" | |
25933 | " sendemail.confirm auto'。\n" | |
25934 | "\n" | |
25935 | ||
fd8cb379 | 25936 | #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your |
1a79b2f1 JX |
25937 | #. translation. The program will only accept English input |
25938 | #. at this point. | |
ec3d4607 | 25939 | #: git-send-email.perl:1544 |
fd8cb379 JX |
25940 | msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " |
25941 | msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " | |
1a79b2f1 | 25942 | |
ec3d4607 | 25943 | #: git-send-email.perl:1547 |
1a79b2f1 JX |
25944 | msgid "Send this email reply required" |
25945 | msgstr "发送要求的邮件回复" | |
25946 | ||
ec3d4607 | 25947 | #: git-send-email.perl:1581 |
1a79b2f1 JX |
25948 | msgid "The required SMTP server is not properly defined." |
25949 | msgstr "要求的 SMTP 服务器未被正确定义。" | |
25950 | ||
ec3d4607 | 25951 | #: git-send-email.perl:1628 |
1a79b2f1 JX |
25952 | #, perl-format |
25953 | msgid "Server does not support STARTTLS! %s" | |
25954 | msgstr "服务器不支持 STARTTLS!%s" | |
25955 | ||
ec3d4607 | 25956 | #: git-send-email.perl:1633 git-send-email.perl:1637 |
a4f16749 JX |
25957 | #, perl-format |
25958 | msgid "STARTTLS failed! %s" | |
25959 | msgstr "STARTTLS 失败!%s" | |
25960 | ||
ec3d4607 | 25961 | #: git-send-email.perl:1646 |
1a79b2f1 JX |
25962 | msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." |
25963 | msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" | |
25964 | ||
ec3d4607 | 25965 | #: git-send-email.perl:1664 |
1a79b2f1 JX |
25966 | #, perl-format |
25967 | msgid "Failed to send %s\n" | |
25968 | msgstr "无法发送 %s\n" | |
25969 | ||
ec3d4607 | 25970 | #: git-send-email.perl:1667 |
1a79b2f1 JX |
25971 | #, perl-format |
25972 | msgid "Dry-Sent %s\n" | |
25973 | msgstr "演习发送 %s\n" | |
25974 | ||
ec3d4607 | 25975 | #: git-send-email.perl:1667 |
1a79b2f1 JX |
25976 | #, perl-format |
25977 | msgid "Sent %s\n" | |
25978 | msgstr "正发送 %s\n" | |
25979 | ||
ec3d4607 | 25980 | #: git-send-email.perl:1669 |
1a79b2f1 JX |
25981 | msgid "Dry-OK. Log says:\n" |
25982 | msgstr "演习成功。日志说:\n" | |
25983 | ||
ec3d4607 | 25984 | #: git-send-email.perl:1669 |
1a79b2f1 JX |
25985 | msgid "OK. Log says:\n" |
25986 | msgstr "OK。日志说:\n" | |
25987 | ||
ec3d4607 | 25988 | #: git-send-email.perl:1688 |
1a79b2f1 JX |
25989 | msgid "Result: " |
25990 | msgstr "结果:" | |
25991 | ||
ec3d4607 | 25992 | #: git-send-email.perl:1691 |
1a79b2f1 JX |
25993 | msgid "Result: OK\n" |
25994 | msgstr "结果:OK\n" | |
25995 | ||
ec3d4607 | 25996 | #: git-send-email.perl:1709 |
1a79b2f1 JX |
25997 | #, perl-format |
25998 | msgid "can't open file %s" | |
25999 | msgstr "无法打开文件 %s" | |
26000 | ||
ec3d4607 | 26001 | #: git-send-email.perl:1756 git-send-email.perl:1776 |
1a79b2f1 JX |
26002 | #, perl-format |
26003 | msgid "(mbox) Adding cc: %s from line '%s'\n" | |
26004 | msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" | |
26005 | ||
ec3d4607 | 26006 | #: git-send-email.perl:1762 |
1a79b2f1 JX |
26007 | #, perl-format |
26008 | msgid "(mbox) Adding to: %s from line '%s'\n" | |
26009 | msgstr "(mbox) 添加 to:%s 自行 '%s'\n" | |
26010 | ||
ec3d4607 | 26011 | #: git-send-email.perl:1819 |
1a79b2f1 JX |
26012 | #, perl-format |
26013 | msgid "(non-mbox) Adding cc: %s from line '%s'\n" | |
26014 | msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" | |
26015 | ||
ec3d4607 | 26016 | #: git-send-email.perl:1854 |
1a79b2f1 JX |
26017 | #, perl-format |
26018 | msgid "(body) Adding cc: %s from line '%s'\n" | |
26019 | msgstr "(body) 添加 cc: %s 自行 '%s'\n" | |
26020 | ||
ec3d4607 | 26021 | #: git-send-email.perl:1965 |
1a79b2f1 JX |
26022 | #, perl-format |
26023 | msgid "(%s) Could not execute '%s'" | |
26024 | msgstr "(%s) 不能执行 '%s'" | |
26025 | ||
ec3d4607 | 26026 | #: git-send-email.perl:1972 |
1a79b2f1 JX |
26027 | #, perl-format |
26028 | msgid "(%s) Adding %s: %s from: '%s'\n" | |
26029 | msgstr "(%s) 添加 %s: %s 自:'%s'\n" | |
26030 | ||
ec3d4607 | 26031 | #: git-send-email.perl:1976 |
1a79b2f1 JX |
26032 | #, perl-format |
26033 | msgid "(%s) failed to close pipe to '%s'" | |
26034 | msgstr "(%s) 无法关闭管道至 '%s'" | |
26035 | ||
ec3d4607 | 26036 | #: git-send-email.perl:2006 |
1a79b2f1 JX |
26037 | msgid "cannot send message as 7bit" |
26038 | msgstr "不能以 7bit 形式发送信息" | |
26039 | ||
ec3d4607 | 26040 | #: git-send-email.perl:2014 |
1a79b2f1 JX |
26041 | msgid "invalid transfer encoding" |
26042 | msgstr "无效的传送编码" | |
26043 | ||
ec3d4607 | 26044 | #: git-send-email.perl:2051 |
33b62fba JX |
26045 | #, perl-format |
26046 | msgid "" | |
26047 | "fatal: %s: rejected by sendemail-validate hook\n" | |
26048 | "%s\n" | |
26049 | "warning: no patches were sent\n" | |
26050 | msgstr "" | |
26051 | "致命错误:%s:被 sendemail-validate 挂钩拒绝\n" | |
26052 | "%s\n" | |
26053 | "警告:补丁未能发送\n" | |
26054 | ||
ec3d4607 | 26055 | #: git-send-email.perl:2061 git-send-email.perl:2114 git-send-email.perl:2124 |
1a79b2f1 JX |
26056 | #, perl-format |
26057 | msgid "unable to open %s: %s\n" | |
26058 | msgstr "不能打开 %s:%s\n" | |
26059 | ||
ec3d4607 | 26060 | #: git-send-email.perl:2064 |
1a79b2f1 | 26061 | #, perl-format |
33b62fba JX |
26062 | msgid "" |
26063 | "fatal: %s:%d is longer than 998 characters\n" | |
26064 | "warning: no patches were sent\n" | |
26065 | msgstr "" | |
7b4d4954 | 26066 | "致命错误:%s:%d 超过 998 字符\n" |
33b62fba | 26067 | "警告:补丁未能发送\n" |
1a79b2f1 | 26068 | |
ec3d4607 | 26069 | #: git-send-email.perl:2082 |
1a79b2f1 JX |
26070 | #, perl-format |
26071 | msgid "Skipping %s with backup suffix '%s'.\n" | |
26072 | msgstr "略过 %s 含备份后缀 '%s'。\n" | |
26073 | ||
26074 | #. TRANSLATORS: please keep "[y|N]" as is. | |
ec3d4607 | 26075 | #: git-send-email.perl:2086 |
1a79b2f1 JX |
26076 | #, perl-format |
26077 | msgid "Do you really want to send %s? [y|N]: " | |
26078 | msgstr "您真的要发送 %s?[y|N]:" |