l10n: zh_CN: for git v2.30.0 l10n round 1 and 2
Translate 71 new messages (5037t0f0u) for git 2.30.0. Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Jiang Xin committed
Dec 7, 2020 at 08:10 UTC
d13389bf27f1618525ab4c29c53aca1334fdfa74
1 file changed
+2588
-2475
po/zh_CN.po
+2588
-2475
@@ -124,7 +124,7 @@
124
# tagger | 打标签者
125
# topic branch | 主题分支
126
# track | 跟踪
127
-# trailer | 尾部署名
127
+# trailer | 尾注
128
# tree | 树（工作区或树对象）
129
# tree object | 树对象
130
# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
@@ -140,8 +140,8 @@ msgid ""
140
msgstr ""
141
"Project-Id-Version: Git\n"
142
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
143
-"POT-Creation-Date: 2020-10-10 09:32+0800\n"
144
-"PO-Revision-Date: 2020-10-10 09:43+0800\n"
143
+"POT-Creation-Date: 2020-12-21 07:10+0800\n"
144
+"PO-Revision-Date: 2020-12-26 21:43+0800\n"
145
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
146
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
147
"Language: zh_CN\n"
@@ -150,200 +150,200 @@ msgstr ""
150
"Content-Transfer-Encoding: 8bit\n"
151
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
152
153
-#: add-interactive.c:368
153
+#: add-interactive.c:376
154
#, c-format
155
msgid "Huh (%s)?"
156
msgstr "嗯（%s）？"
157
158
-#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250
159
-#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526
160
-#: builtin/rebase.c:1944
158
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
159
+#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
160
+#: builtin/rebase.c:1955
161
msgid "could not read index"
162
msgstr "不能读取索引"
163
164
-#: add-interactive.c:576 git-add--interactive.perl:269
164
+#: add-interactive.c:584 git-add--interactive.perl:269
165
#: git-add--interactive.perl:294
166
msgid "binary"
167
msgstr "二进制"
168
169
-#: add-interactive.c:634 git-add--interactive.perl:278
169
+#: add-interactive.c:642 git-add--interactive.perl:278
170
#: git-add--interactive.perl:332
171
msgid "nothing"
172
msgstr "无"
173
174
-#: add-interactive.c:635 git-add--interactive.perl:314
174
+#: add-interactive.c:643 git-add--interactive.perl:314
175
#: git-add--interactive.perl:329
176
msgid "unchanged"
177
msgstr "没有修改"
178
179
-#: add-interactive.c:672 git-add--interactive.perl:643
179
+#: add-interactive.c:680 git-add--interactive.perl:641
180
msgid "Update"
181
msgstr "更新"
182
183
-#: add-interactive.c:689 add-interactive.c:877
183
+#: add-interactive.c:697 add-interactive.c:885
184
#, c-format
185
msgid "could not stage '%s'"
186
msgstr "不能暂存 '%s'"
187
188
-#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
188
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
189
msgid "could not write index"
190
msgstr "不能写入索引"
191
192
-#: add-interactive.c:698 git-add--interactive.perl:628
192
+#: add-interactive.c:706 git-add--interactive.perl:626
193
#, c-format, perl-format
194
msgid "updated %d path\n"
195
msgid_plural "updated %d paths\n"
196
msgstr[0] "更新了 %d 个路径\n"
197
msgstr[1] "更新了 %d 个路径\n"
198
199
-#: add-interactive.c:716 git-add--interactive.perl:678
199
+#: add-interactive.c:724 git-add--interactive.perl:676
200
#, c-format, perl-format
201
msgid "note: %s is untracked now.\n"
202
msgstr "说明：%s 现已成为未跟踪的。\n"
203
204
-#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295
204
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
205
#: builtin/reset.c:145
206
#, c-format
207
msgid "make_cache_entry failed for path '%s'"
208
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
210
-#: add-interactive.c:751 git-add--interactive.perl:655
210
+#: add-interactive.c:759 git-add--interactive.perl:653
211
msgid "Revert"
212
msgstr "还原"
213
214
-#: add-interactive.c:767
214
+#: add-interactive.c:775
215
msgid "Could not parse HEAD^{tree}"
216
msgstr "不能解析 HEAD^{tree}"
217
218
-#: add-interactive.c:805 git-add--interactive.perl:631
218
+#: add-interactive.c:813 git-add--interactive.perl:629
219
#, c-format, perl-format
220
msgid "reverted %d path\n"
221
msgid_plural "reverted %d paths\n"
222
msgstr[0] "还原了 %d 个路径\n"
223
msgstr[1] "还原了 %d 个路径\n"
224
225
-#: add-interactive.c:856 git-add--interactive.perl:695
225
+#: add-interactive.c:864 git-add--interactive.perl:693
226
#, c-format
227
msgid "No untracked files.\n"
228
msgstr "没有未跟踪的文件。\n"
229
230
-#: add-interactive.c:860 git-add--interactive.perl:689
230
+#: add-interactive.c:868 git-add--interactive.perl:687
231
msgid "Add untracked"
232
msgstr "添加未跟踪的"
233
234
-#: add-interactive.c:887 git-add--interactive.perl:625
234
+#: add-interactive.c:895 git-add--interactive.perl:623
235
#, c-format, perl-format
236
msgid "added %d path\n"
237
msgid_plural "added %d paths\n"
238
msgstr[0] "增加了 %d 个路径\n"
239
msgstr[1] "增加了 %d 个路径\n"
240
241
-#: add-interactive.c:917
241
+#: add-interactive.c:925
242
#, c-format
243
msgid "ignoring unmerged: %s"
244
msgstr "忽略未合入的：%s"
245
246
-#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
246
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
247
#, c-format
248
msgid "Only binary files changed.\n"
249
msgstr "只有二进制文件被修改。\n"
250
251
-#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
251
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
252
#, c-format
253
msgid "No changes.\n"
254
msgstr "没有修改。\n"
255
256
-#: add-interactive.c:935 git-add--interactive.perl:1381
256
+#: add-interactive.c:943 git-add--interactive.perl:1379
257
msgid "Patch update"
258
msgstr "补丁更新"
259
260
-#: add-interactive.c:974 git-add--interactive.perl:1794
260
+#: add-interactive.c:982 git-add--interactive.perl:1792
261
msgid "Review diff"
262
msgstr "检视 diff"
263
264
-#: add-interactive.c:1002
264
+#: add-interactive.c:1010
265
msgid "show paths with changes"
266
msgstr "显示含变更的路径"
267
268
-#: add-interactive.c:1004
268
+#: add-interactive.c:1012
269
msgid "add working tree state to the staged set of changes"
270
msgstr "将工作区状态添加到暂存区修改集中"
271
272
-#: add-interactive.c:1006
272
+#: add-interactive.c:1014
273
msgid "revert staged set of changes back to the HEAD version"
274
msgstr "将暂存的修改集恢复为 HEAD 版本"
275
276
-#: add-interactive.c:1008
276
+#: add-interactive.c:1016
277
msgid "pick hunks and update selectively"
278
msgstr "挑选数据块并有选择地更新"
279
280
-#: add-interactive.c:1010
280
+#: add-interactive.c:1018
281
msgid "view diff between HEAD and index"
282
msgstr "显示 HEAD 和索引的差异"
283
284
-#: add-interactive.c:1012
284
+#: add-interactive.c:1020
285
msgid "add contents of untracked files to the staged set of changes"
286
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
287
288
-#: add-interactive.c:1020 add-interactive.c:1069
288
+#: add-interactive.c:1028 add-interactive.c:1077
289
msgid "Prompt help:"
290
msgstr "帮助："
291
292
-#: add-interactive.c:1022
292
+#: add-interactive.c:1030
293
msgid "select a single item"
294
msgstr "选择一个条目"
295
296
-#: add-interactive.c:1024
296
+#: add-interactive.c:1032
297
msgid "select a range of items"
298
msgstr "选择一系列条目"
299
300
-#: add-interactive.c:1026
300
+#: add-interactive.c:1034
301
msgid "select multiple ranges"
302
msgstr "选择多个范围"
303
304
-#: add-interactive.c:1028 add-interactive.c:1073
304
+#: add-interactive.c:1036 add-interactive.c:1081
305
msgid "select item based on unique prefix"
306
msgstr "基于唯一前缀选择条目"
307
308
-#: add-interactive.c:1030
308
+#: add-interactive.c:1038
309
msgid "unselect specified items"
310
msgstr "反选指定的条目"
311
312
-#: add-interactive.c:1032
312
+#: add-interactive.c:1040
313
msgid "choose all items"
314
msgstr "选择所有条目"
315
316
-#: add-interactive.c:1034
316
+#: add-interactive.c:1042
317
msgid "(empty) finish selecting"
318
msgstr "（空）结束选择"
319
320
-#: add-interactive.c:1071
320
+#: add-interactive.c:1079
321
msgid "select a numbered item"
322
msgstr "选择一个编号条目"
323
324
-#: add-interactive.c:1075
324
+#: add-interactive.c:1083
325
msgid "(empty) select nothing"
326
msgstr "（空）不选择任何内容"
327
328
-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
328
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
329
msgid "*** Commands ***"
330
msgstr "*** 命令 ***"
331
332
-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
332
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
333
msgid "What now"
334
msgstr "请选择"
335
336
-#: add-interactive.c:1136 git-add--interactive.perl:213
336
+#: add-interactive.c:1144 git-add--interactive.perl:213
337
msgid "staged"
338
msgstr "缓存"
339
340
-#: add-interactive.c:1136 git-add--interactive.perl:213
340
+#: add-interactive.c:1144 git-add--interactive.perl:213
341
msgid "unstaged"
342
msgstr "未缓存"
343
344
-#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270
345
-#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123
346
-#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190
344
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
345
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
346
+#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190
347
#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
348
#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
349
#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
@@ -351,31 +351,31 @@ msgstr "未缓存"
351
msgid "path"
352
msgstr "路径"
353
354
-#: add-interactive.c:1143
354
+#: add-interactive.c:1151
355
msgid "could not refresh index"
356
msgstr "不能刷新索引"
357
358
-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
358
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
359
#, c-format
360
msgid "Bye.\n"
361
msgstr "再见。\n"
362
363
-#: add-patch.c:34 git-add--interactive.perl:1433
363
+#: add-patch.c:34 git-add--interactive.perl:1431
364
#, c-format, perl-format
365
msgid "Stage mode change [y,n,q,a,d%s,?]? "
366
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
367
368
-#: add-patch.c:35 git-add--interactive.perl:1434
368
+#: add-patch.c:35 git-add--interactive.perl:1432
369
#, c-format, perl-format
370
msgid "Stage deletion [y,n,q,a,d%s,?]? "
371
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
372
373
-#: add-patch.c:36 git-add--interactive.perl:1435
373
+#: add-patch.c:36 git-add--interactive.perl:1433
374
#, c-format, perl-format
375
msgid "Stage addition [y,n,q,a,d%s,?]? "
376
msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
377
378
-#: add-patch.c:37 git-add--interactive.perl:1436
378
+#: add-patch.c:37 git-add--interactive.perl:1434
379
#, c-format, perl-format
380
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
381
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
@@ -400,22 +400,22 @@ msgstr ""
400
"a - 暂存该块和本文件中后面的全部块\n"
401
"d - 不暂存该块和本文件中后面的全部块\n"
402
403
-#: add-patch.c:56 git-add--interactive.perl:1439
403
+#: add-patch.c:56 git-add--interactive.perl:1437
404
#, c-format, perl-format
405
msgid "Stash mode change [y,n,q,a,d%s,?]? "
406
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
407
408
-#: add-patch.c:57 git-add--interactive.perl:1440
408
+#: add-patch.c:57 git-add--interactive.perl:1438
409
#, c-format, perl-format
410
msgid "Stash deletion [y,n,q,a,d%s,?]? "
411
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
412
413
-#: add-patch.c:58 git-add--interactive.perl:1441
413
+#: add-patch.c:58 git-add--interactive.perl:1439
414
#, c-format, perl-format
415
msgid "Stash addition [y,n,q,a,d%s,?]? "
416
msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
417
418
-#: add-patch.c:59 git-add--interactive.perl:1442
418
+#: add-patch.c:59 git-add--interactive.perl:1440
419
#, c-format, perl-format
420
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
421
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
@@ -440,22 +440,22 @@ msgstr ""
440
"a - 贮藏该块和本文件中后面的全部块\n"
441
"d - 不贮藏该块和本文件中后面的全部块\n"
442
443
-#: add-patch.c:80 git-add--interactive.perl:1445
443
+#: add-patch.c:80 git-add--interactive.perl:1443
444
#, c-format, perl-format
445
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
446
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
447
448
-#: add-patch.c:81 git-add--interactive.perl:1446
448
+#: add-patch.c:81 git-add--interactive.perl:1444
449
#, c-format, perl-format
450
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
451
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
452
453
-#: add-patch.c:82 git-add--interactive.perl:1447
453
+#: add-patch.c:82 git-add--interactive.perl:1445
454
#, c-format, perl-format
455
msgid "Unstage addition [y,n,q,a,d%s,?]? "
456
msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
457
458
-#: add-patch.c:83 git-add--interactive.perl:1448
458
+#: add-patch.c:83 git-add--interactive.perl:1446
459
#, c-format, perl-format
460
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
461
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
@@ -480,22 +480,22 @@ msgstr ""
480
"a - 取消暂存该块和本文件中后面的全部块\n"
481
"d - 不要取消暂存该块和本文件中后面的全部块\n"
482
483
-#: add-patch.c:103 git-add--interactive.perl:1451
483
+#: add-patch.c:103 git-add--interactive.perl:1449
484
#, c-format, perl-format
485
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
486
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
487
488
-#: add-patch.c:104 git-add--interactive.perl:1452
488
+#: add-patch.c:104 git-add--interactive.perl:1450
489
#, c-format, perl-format
490
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
491
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
492
493
-#: add-patch.c:105 git-add--interactive.perl:1453
493
+#: add-patch.c:105 git-add--interactive.perl:1451
494
#, c-format, perl-format
495
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
496
msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
497
498
-#: add-patch.c:106 git-add--interactive.perl:1454
498
+#: add-patch.c:106 git-add--interactive.perl:1452
499
#, c-format, perl-format
500
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
501
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
@@ -520,26 +520,26 @@ msgstr ""
520
"a - 应用该块和本文件中后面的全部块\n"
521
"d - 不要应用该块和本文件中后面的全部块\n"
522
523
-#: add-patch.c:126 git-add--interactive.perl:1457
524
-#: git-add--interactive.perl:1475
523
+#: add-patch.c:126 git-add--interactive.perl:1455
524
+#: git-add--interactive.perl:1473
525
#, c-format, perl-format
526
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
527
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
528
529
-#: add-patch.c:127 git-add--interactive.perl:1458
530
-#: git-add--interactive.perl:1476
529
+#: add-patch.c:127 git-add--interactive.perl:1456
530
+#: git-add--interactive.perl:1474
531
#, c-format, perl-format
532
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
533
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
534
535
-#: add-patch.c:128 git-add--interactive.perl:1459
536
-#: git-add--interactive.perl:1477
535
+#: add-patch.c:128 git-add--interactive.perl:1457
536
+#: git-add--interactive.perl:1475
537
#, c-format, perl-format
538
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
539
msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
540
541
-#: add-patch.c:129 git-add--interactive.perl:1460
542
-#: git-add--interactive.perl:1478
541
+#: add-patch.c:129 git-add--interactive.perl:1458
542
+#: git-add--interactive.perl:1476
543
#, c-format, perl-format
544
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
545
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
@@ -564,22 +564,22 @@ msgstr ""
564
"a - 丢弃该块和本文件中后面的全部块\n"
565
"d - 不要丢弃该块和本文件中后面的全部块\n"
566
567
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
567
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
568
#, c-format, perl-format
569
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
570
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
571
572
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
572
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
573
#, c-format, perl-format
574
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
575
msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
576
577
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
577
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
578
#, c-format, perl-format
579
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
580
msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
581
582
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
582
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
583
#, c-format, perl-format
584
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
585
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
@@ -598,22 +598,22 @@ msgstr ""
598
"a - 丢弃该块和本文件中后面的全部块\n"
599
"d - 不要丢弃该块和本文件中后面的全部块\n"
600
601
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
601
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
602
#, c-format, perl-format
603
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
604
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
605
606
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
606
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
607
#, c-format, perl-format
608
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
609
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
610
611
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
611
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
612
#, c-format, perl-format
613
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
614
msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
615
616
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
616
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
617
#, c-format, perl-format
618
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
619
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
@@ -679,7 +679,7 @@ msgid ""
679
"between its input and output lines."
680
msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
681
682
-#: add-patch.c:785
682
+#: add-patch.c:790
683
#, c-format
684
msgid ""
685
"expected context line #%d in\n"
@@ -688,7 +688,7 @@ msgstr ""
688
"预期上下文行 #%d 于\n"
689
"%.*s"
690
691
-#: add-patch.c:800
691
+#: add-patch.c:805
692
#, c-format
693
msgid ""
694
"hunks do not overlap:\n"
@@ -701,11 +701,11 @@ msgstr ""
701
"\t不是结尾于：\n"
702
"%.*s"
703
704
-#: add-patch.c:1076 git-add--interactive.perl:1117
704
+#: add-patch.c:1081 git-add--interactive.perl:1115
705
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
706
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
707
708
-#: add-patch.c:1080
708
+#: add-patch.c:1085
709
#, c-format
710
msgid ""
711
"---\n"
@@ -719,7 +719,7 @@ msgstr ""
719
"以 %c 开始的行将被删除。\n"
720
721
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
722
-#: add-patch.c:1094 git-add--interactive.perl:1131
722
+#: add-patch.c:1099 git-add--interactive.perl:1129
723
msgid ""
724
"If it does not apply cleanly, you will be given an opportunity to\n"
725
"edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -728,11 +728,11 @@ msgstr ""
728
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
729
"此次编辑被终止，该块不会被修改。\n"
730
731
-#: add-patch.c:1127
731
+#: add-patch.c:1132
732
msgid "could not parse hunk header"
733
msgstr "无法解析数据块头信息"
734
735
-#: add-patch.c:1172
735
+#: add-patch.c:1177
736
msgid "'git apply --cached' failed"
737
msgstr "'git apply --cached' 失败"
738
@@ -748,24 +748,24 @@ msgstr "'git apply --cached' 失败"
748
#. Consider translating (saying "no" discards!) as
749
#. (saying "n" for "no" discards!) if the translation
750
#. of the word "no" does not start with n.
751
-#: add-patch.c:1241 git-add--interactive.perl:1244
751
+#: add-patch.c:1246 git-add--interactive.perl:1242
752
msgid ""
753
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
754
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
755
756
-#: add-patch.c:1284
756
+#: add-patch.c:1289
757
msgid "The selected hunks do not apply to the index!"
758
msgstr "选中的块不能应用到索引！"
759
760
-#: add-patch.c:1285 git-add--interactive.perl:1348
760
+#: add-patch.c:1290 git-add--interactive.perl:1346
761
msgid "Apply them to the worktree anyway? "
762
msgstr "无论如何都要应用到工作区么？"
763
764
-#: add-patch.c:1292 git-add--interactive.perl:1351
764
+#: add-patch.c:1297 git-add--interactive.perl:1349
765
msgid "Nothing was applied.\n"
766
msgstr "未应用。\n"
767
768
-#: add-patch.c:1349
768
+#: add-patch.c:1354
769
msgid ""
770
"j - leave this hunk undecided, see next undecided hunk\n"
771
"J - leave this hunk undecided, see next hunk\n"
@@ -787,73 +787,73 @@ msgstr ""
787
"e - 手动编辑当前块\n"
788
"? - 显示帮助\n"
789
790
-#: add-patch.c:1511 add-patch.c:1521
790
+#: add-patch.c:1516 add-patch.c:1526
791
msgid "No previous hunk"
792
msgstr "没有前一个块"
793
794
-#: add-patch.c:1516 add-patch.c:1526
794
+#: add-patch.c:1521 add-patch.c:1531
795
msgid "No next hunk"
796
msgstr "没有下一个块"
797
798
-#: add-patch.c:1532
798
+#: add-patch.c:1537
799
msgid "No other hunks to goto"
800
msgstr "没有其它可供跳转的块"
801
802
-#: add-patch.c:1543 git-add--interactive.perl:1608
802
+#: add-patch.c:1548 git-add--interactive.perl:1606
803
msgid "go to which hunk (<ret> to see more)? "
804
msgstr "跳转到哪个块（<回车> 查看更多）？ "
805
806
-#: add-patch.c:1544 git-add--interactive.perl:1610
806
+#: add-patch.c:1549 git-add--interactive.perl:1608
807
msgid "go to which hunk? "
808
msgstr "跳转到哪个块？"
809
810
-#: add-patch.c:1555
810
+#: add-patch.c:1560
811
#, c-format
812
msgid "Invalid number: '%s'"
813
msgstr "无效数字：'%s'"
814
815
-#: add-patch.c:1560
815
+#: add-patch.c:1565
816
#, c-format
817
msgid "Sorry, only %d hunk available."
818
msgid_plural "Sorry, only %d hunks available."
819
msgstr[0] "对不起，只有 %d 个可用块。"
820
msgstr[1] "对不起，只有 %d 个可用块。"
821
822
-#: add-patch.c:1569
822
+#: add-patch.c:1574
823
msgid "No other hunks to search"
824
msgstr "没有其它可供查找的块"
825
826
-#: add-patch.c:1575 git-add--interactive.perl:1663
826
+#: add-patch.c:1580 git-add--interactive.perl:1661
827
msgid "search for regex? "
828
msgstr "使用正则表达式搜索？"
829
830
-#: add-patch.c:1590
830
+#: add-patch.c:1595
831
#, c-format
832
msgid "Malformed search regexp %s: %s"
833
msgstr "错误的正则表达式 %s：%s"
834
835
-#: add-patch.c:1607
835
+#: add-patch.c:1612
836
msgid "No hunk matches the given pattern"
837
msgstr "没有和给定模式相匹配的块"
838
839
-#: add-patch.c:1614
839
+#: add-patch.c:1619
840
msgid "Sorry, cannot split this hunk"
841
msgstr "对不起，不能拆分这个块"
842
843
-#: add-patch.c:1618
843
+#: add-patch.c:1623
844
#, c-format
845
msgid "Split into %d hunks."
846
msgstr "拆分为 %d 块。"
847
848
-#: add-patch.c:1622
848
+#: add-patch.c:1627
849
msgid "Sorry, cannot edit this hunk"
850
msgstr "对不起，不能编辑这个块"
851
852
-#: add-patch.c:1674
852
+#: add-patch.c:1679
853
msgid "'git apply' failed"
854
msgstr "'git apply' 失败"
855
856
-#: advice.c:140
856
+#: advice.c:143
857
#, c-format
858
msgid ""
859
"\n"
@@ -862,37 +862,37 @@ msgstr ""
862
"\n"
863
"使用 \"git config advice.%s false\" 来关闭此消息"
864
865
-#: advice.c:156
865
+#: advice.c:159
866
#, c-format
867
msgid "%shint: %.*s%s\n"
868
msgstr "%s提示：%.*s%s\n"
869
870
-#: advice.c:247
870
+#: advice.c:250
871
msgid "Cherry-picking is not possible because you have unmerged files."
872
msgstr "无法拣选，因为您有未合并的文件。"
873
874
-#: advice.c:249
874
+#: advice.c:252
875
msgid "Committing is not possible because you have unmerged files."
876
msgstr "无法提交，因为您有未合并的文件。"
877
878
-#: advice.c:251
878
+#: advice.c:254
879
msgid "Merging is not possible because you have unmerged files."
880
msgstr "无法合并，因为您有未合并的文件。"
881
882
-#: advice.c:253
882
+#: advice.c:256
883
msgid "Pulling is not possible because you have unmerged files."
884
msgstr "无法拉取，因为您有未合并的文件。"
885
886
-#: advice.c:255
886
+#: advice.c:258
887
msgid "Reverting is not possible because you have unmerged files."
888
msgstr "无法回退，因为您有未合并的文件。"
889
890
-#: advice.c:257
890
+#: advice.c:260
891
#, c-format
892
msgid "It is not possible to %s because you have unmerged files."
893
msgstr "无法 %s，因为您有未合并的文件。"
894
895
-#: advice.c:265
895
+#: advice.c:268
896
msgid ""
897
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
898
"as appropriate to mark resolution and make a commit."
@@ -900,23 +900,23 @@ msgstr ""
900
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
901
"解决方案并提交。"
902
903
-#: advice.c:273
903
+#: advice.c:276
904
msgid "Exiting because of an unresolved conflict."
905
msgstr "因为存在未解决的冲突而退出。"
906
907
-#: advice.c:278 builtin/merge.c:1349
907
+#: advice.c:281 builtin/merge.c:1369
908
msgid "You have not concluded your merge (MERGE_HEAD exists)."
909
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
910
911
-#: advice.c:280
911
+#: advice.c:283
912
msgid "Please, commit your changes before merging."
913
msgstr "请在合并前先提交您的修改。"
914
915
-#: advice.c:281
915
+#: advice.c:284
916
msgid "Exiting because of unfinished merge."
917
msgstr "因为存在未完成的合并而退出。"
918
919
-#: advice.c:287
919
+#: advice.c:290
920
#, c-format
921
msgid ""
922
"Note: switching to '%s'.\n"
@@ -1194,7 +1194,7 @@ msgstr "打补丁失败：%s:%ld"
1194
msgid "cannot checkout %s"
1195
msgstr "不能检出 %s"
1196
1197
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
1197
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
1198
#, c-format
1199
msgid "failed to read %s"
1200
msgstr "无法读取 %s"
@@ -1214,7 +1214,7 @@ msgstr "路径 %s 已经被重命名/删除"
1214
msgid "%s: does not exist in index"
1215
msgstr "%s：不存在于索引中"
1216
1217
-#: apply.c:3537 apply.c:3708 apply.c:3953
1217
+#: apply.c:3537 apply.c:3708 apply.c:3952
1218
#, c-format
1219
msgid "%s: does not match index"
1220
msgstr "%s：和索引不匹配"
@@ -1273,301 +1273,301 @@ msgstr "无效路径 '%s'"
1273
msgid "%s: already exists in index"
1274
msgstr "%s：已经存在于索引中"
1275
1276
-#: apply.c:3956
1276
+#: apply.c:3954
1277
#, c-format
1278
msgid "%s: already exists in working directory"
1279
msgstr "%s：已经存在于工作区中"
1280
1281
-#: apply.c:3976
1281
+#: apply.c:3974
1282
#, c-format
1283
msgid "new mode (%o) of %s does not match old mode (%o)"
1284
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1285
1286
-#: apply.c:3981
1286
+#: apply.c:3979
1287
#, c-format
1288
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1289
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1290
1291
-#: apply.c:4001
1291
+#: apply.c:3999
1292
#, c-format
1293
msgid "affected file '%s' is beyond a symbolic link"
1294
msgstr "受影响的文件 '%s' 位于符号链接中"
1295
1296
-#: apply.c:4005
1296
+#: apply.c:4003
1297
#, c-format
1298
msgid "%s: patch does not apply"
1299
msgstr "%s：补丁未应用"
1300
1301
-#: apply.c:4020
1301
+#: apply.c:4018
1302
#, c-format
1303
msgid "Checking patch %s..."
1304
msgstr "正在检查补丁 %s..."
1305
1306
-#: apply.c:4112
1306
+#: apply.c:4110
1307
#, c-format
1308
msgid "sha1 information is lacking or useless for submodule %s"
1309
msgstr "子模组 %s 的 sha1 信息缺失或无效"
1310
1311
-#: apply.c:4119
1311
+#: apply.c:4117
1312
#, c-format
1313
msgid "mode change for %s, which is not in current HEAD"
1314
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
1315
1316
-#: apply.c:4122
1316
+#: apply.c:4120
1317
#, c-format
1318
msgid "sha1 information is lacking or useless (%s)."
1319
msgstr "sha1 信息缺失或无效（%s）。"
1320
1321
-#: apply.c:4131
1321
+#: apply.c:4129
1322
#, c-format
1323
msgid "could not add %s to temporary index"
1324
msgstr "不能在临时索引中添加 %s"
1325
1326
-#: apply.c:4141
1326
+#: apply.c:4139
1327
#, c-format
1328
msgid "could not write temporary index to %s"
1329
msgstr "不能把临时索引写入到 %s"
1330
1331
-#: apply.c:4279
1331
+#: apply.c:4277
1332
#, c-format
1333
msgid "unable to remove %s from index"
1334
msgstr "不能从索引中移除 %s"
1335
1336
-#: apply.c:4313
1336
+#: apply.c:4311
1337
#, c-format
1338
msgid "corrupt patch for submodule %s"
1339
msgstr "子模组 %s 损坏的补丁"
1340
1341
-#: apply.c:4319
1341
+#: apply.c:4317
1342
#, c-format
1343
msgid "unable to stat newly created file '%s'"
1344
msgstr "不能对新建文件 '%s' 调用 stat"
1345
1346
-#: apply.c:4327
1346
+#: apply.c:4325
1347
#, c-format
1348
msgid "unable to create backing store for newly created file %s"
1349
msgstr "不能为新建文件 %s 创建后端存储"
1350
1351
-#: apply.c:4333 apply.c:4478
1351
+#: apply.c:4331 apply.c:4476
1352
#, c-format
1353
msgid "unable to add cache entry for %s"
1354
msgstr "无法为 %s 添加缓存条目"
1355
1356
-#: apply.c:4376 builtin/bisect--helper.c:537
1356
+#: apply.c:4374 builtin/bisect--helper.c:524
1357
#, c-format
1358
msgid "failed to write to '%s'"
1359
msgstr "写入 '%s' 失败"
1360
1361
-#: apply.c:4380
1361
+#: apply.c:4378
1362
#, c-format
1363
msgid "closing file '%s'"
1364
msgstr "关闭文件 '%s'"
1365
1366
-#: apply.c:4450
1366
+#: apply.c:4448
1367
#, c-format
1368
msgid "unable to write file '%s' mode %o"
1369
msgstr "不能写文件 '%s' 权限 %o"
1370
1371
-#: apply.c:4548
1371
+#: apply.c:4546
1372
#, c-format
1373
msgid "Applied patch %s cleanly."
1374
msgstr "成功应用补丁 %s。"
1375
1376
-#: apply.c:4556
1376
+#: apply.c:4554
1377
msgid "internal error"
1378
msgstr "内部错误"
1379
1380
-#: apply.c:4559
1380
+#: apply.c:4557
1381
#, c-format
1382
msgid "Applying patch %%s with %d reject..."
1383
msgid_plural "Applying patch %%s with %d rejects..."
1384
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1385
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
1386
1387
-#: apply.c:4570
1387
+#: apply.c:4568
1388
#, c-format
1389
msgid "truncating .rej filename to %.*s.rej"
1390
msgstr "截短 .rej 文件名为 %.*s.rej"
1391
1392
-#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
1392
+#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
1393
#, c-format
1394
msgid "cannot open %s"
1395
msgstr "不能打开 %s"
1396
1397
-#: apply.c:4592
1397
+#: apply.c:4590
1398
#, c-format
1399
msgid "Hunk #%d applied cleanly."
1400
msgstr "第 #%d 个片段成功应用。"
1401
1402
-#: apply.c:4596
1402
+#: apply.c:4594
1403
#, c-format
1404
msgid "Rejected hunk #%d."
1405
msgstr "拒绝第 #%d 个片段。"
1406
1407
-#: apply.c:4715
1407
+#: apply.c:4718
1408
#, c-format
1409
msgid "Skipped patch '%s'."
1410
msgstr "略过补丁 '%s'。"
1411
1412
-#: apply.c:4723
1412
+#: apply.c:4726
1413
msgid "unrecognized input"
1414
msgstr "未能识别的输入"
1415
1416
-#: apply.c:4743
1416
+#: apply.c:4746
1417
msgid "unable to read index file"
1418
msgstr "无法读取索引文件"
1419
1420
-#: apply.c:4900
1420
+#: apply.c:4903
1421
#, c-format
1422
msgid "can't open patch '%s': %s"
1423
msgstr "不能打开补丁 '%s'：%s"
1424
1425
-#: apply.c:4927
1425
+#: apply.c:4930
1426
#, c-format
1427
msgid "squelched %d whitespace error"
1428
msgid_plural "squelched %d whitespace errors"
1429
msgstr[0] "抑制下仍有 %d 个空白字符误用"
1430
msgstr[1] "抑制下仍有 %d 个空白字符误用"
1431
1432
-#: apply.c:4933 apply.c:4948
1432
+#: apply.c:4936 apply.c:4951
1433
#, c-format
1434
msgid "%d line adds whitespace errors."
1435
msgid_plural "%d lines add whitespace errors."
1436
msgstr[0] "%d 行新增了空白字符误用。"
1437
msgstr[1] "%d 行新增了空白字符误用。"
1438
1439
-#: apply.c:4941
1439
+#: apply.c:4944
1440
#, c-format
1441
msgid "%d line applied after fixing whitespace errors."
1442
msgid_plural "%d lines applied after fixing whitespace errors."
1443
msgstr[0] "修复空白错误后，应用了 %d 行。"
1444
msgstr[1] "修复空白错误后，应用了 %d 行。"
1445
1446
-#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
1446
+#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
1447
msgid "Unable to write new index file"
1448
msgstr "无法写入新索引文件"
1449
1450
-#: apply.c:4985
1450
+#: apply.c:4988
1451
msgid "don't apply changes matching the given path"
1452
msgstr "不要应用与给出路径向匹配的变更"
1453
1454
-#: apply.c:4988
1454
+#: apply.c:4991
1455
msgid "apply changes matching the given path"
1456
msgstr "应用与给出路径向匹配的变更"
1457
1458
-#: apply.c:4990 builtin/am.c:2279
1458
+#: apply.c:4993 builtin/am.c:2266
1459
msgid "num"
1460
msgstr "数字"
1461
1462
-#: apply.c:4991
1462
+#: apply.c:4994
1463
msgid "remove <num> leading slashes from traditional diff paths"
1464
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
1465
1466
-#: apply.c:4994
1466
+#: apply.c:4997
1467
msgid "ignore additions made by the patch"
1468
msgstr "忽略补丁中的添加的文件"
1469
1470
-#: apply.c:4996
1470
+#: apply.c:4999
1471
msgid "instead of applying the patch, output diffstat for the input"
1472
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1473
1474
-#: apply.c:5000
1474
+#: apply.c:5003
1475
msgid "show number of added and deleted lines in decimal notation"
1476
msgstr "以十进制数显示添加和删除的行数"
1477
1478
-#: apply.c:5002
1478
+#: apply.c:5005
1479
msgid "instead of applying the patch, output a summary for the input"
1480
msgstr "不应用补丁，而是显示输入的概要"
1481
1482
-#: apply.c:5004
1482
+#: apply.c:5007
1483
msgid "instead of applying the patch, see if the patch is applicable"
1484
msgstr "不应用补丁，而是查看补丁是否可应用"
1485
1486
-#: apply.c:5006
1486
+#: apply.c:5009
1487
msgid "make sure the patch is applicable to the current index"
1488
msgstr "确认补丁可以应用到当前索引"
1489
1490
-#: apply.c:5008
1490
+#: apply.c:5011
1491
msgid "mark new files with `git add --intent-to-add`"
1492
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
1493
1494
-#: apply.c:5010
1494
+#: apply.c:5013
1495
msgid "apply a patch without touching the working tree"
1496
msgstr "应用补丁而不修改工作区"
1497
1498
-#: apply.c:5012
1498
+#: apply.c:5015
1499
msgid "accept a patch that touches outside the working area"
1500
msgstr "接受修改工作区之外文件的补丁"
1501
1502
-#: apply.c:5015
1502
+#: apply.c:5018
1503
msgid "also apply the patch (use with --stat/--summary/--check)"
1504
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1505
1506
-#: apply.c:5017
1506
+#: apply.c:5020
1507
msgid "attempt three-way merge if a patch does not apply"
1508
msgstr "如果一个补丁不能应用则尝试三方合并"
1509
1510
-#: apply.c:5019
1510
+#: apply.c:5022
1511
msgid "build a temporary index based on embedded index information"
1512
msgstr "创建一个临时索引基于嵌入的索引信息"
1513
1514
-#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
1514
+#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
1515
msgid "paths are separated with NUL character"
1516
msgstr "路径以 NUL 字符分隔"
1517
1518
-#: apply.c:5024
1518
+#: apply.c:5027
1519
msgid "ensure at least <n> lines of context match"
1520
msgstr "确保至少匹配 <n> 行上下文"
1521
1522
-#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
1522
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
1523
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1524
-#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
1524
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
1525
msgid "action"
1526
msgstr "动作"
1527
1528
-#: apply.c:5026
1528
+#: apply.c:5029
1529
msgid "detect new or modified lines that have whitespace errors"
1530
msgstr "检查新增和修改的行中间的空白字符滥用"
1531
1532
-#: apply.c:5029 apply.c:5032
1532
+#: apply.c:5032 apply.c:5035
1533
msgid "ignore changes in whitespace when finding context"
1534
msgstr "查找上下文时忽略空白字符的变更"
1535
1536
-#: apply.c:5035
1536
+#: apply.c:5038
1537
msgid "apply the patch in reverse"
1538
msgstr "反向应用补丁"
1539
1540
-#: apply.c:5037
1540
+#: apply.c:5040
1541
msgid "don't expect at least one line of context"
1542
msgstr "无需至少一行上下文"
1543
1544
-#: apply.c:5039
1544
+#: apply.c:5042
1545
msgid "leave the rejected hunks in corresponding *.rej files"
1546
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1547
1548
-#: apply.c:5041
1548
+#: apply.c:5044
1549
msgid "allow overlapping hunks"
1550
msgstr "允许重叠的补丁片段"
1551
1552
-#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22
1552
+#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22
1553
#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775
1554
-#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128
1554
+#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128
1555
msgid "be verbose"
1556
msgstr "冗长输出"
1557
1558
-#: apply.c:5044
1558
+#: apply.c:5047
1559
msgid "tolerate incorrectly detected missing new-line at the end of file"
1560
msgstr "允许不正确的文件末尾换行符"
1561
1562
-#: apply.c:5047
1562
+#: apply.c:5050
1563
msgid "do not trust the line counts in the hunk headers"
1564
msgstr "不信任补丁片段的头信息中的行号"
1565
1566
-#: apply.c:5049 builtin/am.c:2267
1566
+#: apply.c:5052 builtin/am.c:2254
1567
msgid "root"
1568
msgstr "根目录"
1569
1570
-#: apply.c:5050
1570
+#: apply.c:5053
1571
msgid "prepend <root> to all filenames"
1572
msgstr "为所有文件名前添加 <根目录>"
1573
@@ -1581,16 +1581,16 @@ msgstr "不能打开数据对象 %s"
1581
msgid "unsupported file mode: 0%o (SHA1: %s)"
1582
msgstr "不支持的文件模式：0%o (SHA1: %s)"
1583
1584
-#: archive-tar.c:449
1584
+#: archive-tar.c:450
1585
#, c-format
1586
msgid "unable to start '%s' filter"
1587
msgstr "无法启动 '%s' 过滤器"
1588
1589
-#: archive-tar.c:452
1589
+#: archive-tar.c:453
1590
msgid "unable to redirect descriptor"
1591
msgstr "无法重定向描述符"
1592
1593
-#: archive-tar.c:459
1593
+#: archive-tar.c:460
1594
#, c-format
1595
msgid "'%s' filter reported error"
1596
msgstr "'%s' 过滤器报告了错误"
@@ -1638,9 +1638,9 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1638
msgid "cannot read %s"
1639
msgstr "不能读取 %s"
1640
1641
-#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852
1642
-#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786
1643
-#: builtin/merge.c:1124
1641
+#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
1642
+#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
1643
+#: builtin/merge.c:1138
1644
#, c-format
1645
msgid "could not read '%s'"
1646
msgstr "不能读取 '%s'"
@@ -1679,118 +1679,110 @@ msgstr "文件未找到：%s"
1679
msgid "Not a regular file: %s"
1680
msgstr "不是一个常规文件：%s"
1681
1682
-#: archive.c:553
1682
+#: archive.c:555
1683
msgid "fmt"
1684
msgstr "格式"
1685
1686
-#: archive.c:553
1686
+#: archive.c:555
1687
msgid "archive format"
1688
msgstr "归档格式"
1689
1690
-#: archive.c:554 builtin/log.c:1760
1690
+#: archive.c:556 builtin/log.c:1765
1691
msgid "prefix"
1692
msgstr "前缀"
1693
1694
-#: archive.c:555
1694
+#: archive.c:557
1695
msgid "prepend prefix to each pathname in the archive"
1696
msgstr "为归档中每个路径名加上前缀"
1697
1698
-#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888
1699
-#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133
1700
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
1701
-#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105
1698
+#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
1699
+#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
1700
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
1701
+#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105
1702
#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412
1703
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
1704
msgid "file"
1705
msgstr "文件"
1706
1707
-#: archive.c:557
1707
+#: archive.c:559
1708
msgid "add untracked file to archive"
1709
msgstr "将未跟踪文件添加到归档"
1710
1711
-#: archive.c:560 builtin/archive.c:90
1711
+#: archive.c:562 builtin/archive.c:90
1712
msgid "write the archive to this file"
1713
msgstr "归档写入此文件"
1714
1715
-#: archive.c:562
1715
+#: archive.c:564
1716
msgid "read .gitattributes in working directory"
1717
msgstr "读取工作区中的 .gitattributes"
1718
1719
-#: archive.c:563
1719
+#: archive.c:565
1720
msgid "report archived files on stderr"
1721
msgstr "在标准错误上报告归档文件"
1722
1723
-#: archive.c:564
1724
-msgid "store only"
1725
-msgstr "只存储"
1726
-
1727
-#: archive.c:565
1728
-msgid "compress faster"
1729
-msgstr "压缩速度更快"
1730
-
1731
-#: archive.c:573
1732
-msgid "compress better"
1733
-msgstr "压缩效果更好"
1723
+#: archive.c:567
1724
+msgid "set compression level"
1725
+msgstr "设置压缩级别"
1726
1735
-#: archive.c:576
1727
+#: archive.c:570
1728
msgid "list supported archive formats"
1729
msgstr "列出支持的归档格式"
1730
1739
-#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1731
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
1732
#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
1733
msgid "repo"
1734
msgstr "仓库"
1735
1744
-#: archive.c:579 builtin/archive.c:92
1736
+#: archive.c:573 builtin/archive.c:92
1737
msgid "retrieve the archive from remote repository <repo>"
1738
msgstr "从远程仓库（<仓库>）提取归档文件"
1739
1748
-#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
1740
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
1741
#: builtin/notes.c:498
1742
msgid "command"
1743
msgstr "命令"
1744
1753
-#: archive.c:581 builtin/archive.c:94
1745
+#: archive.c:575 builtin/archive.c:94
1746
msgid "path to the remote git-upload-archive command"
1747
msgstr "远程 git-upload-archive 命令的路径"
1748
1757
-#: archive.c:588
1749
+#: archive.c:582
1750
msgid "Unexpected option --remote"
1751
msgstr "未知参数 --remote"
1752
1761
-#: archive.c:590
1753
+#: archive.c:584
1754
msgid "Option --exec can only be used together with --remote"
1755
msgstr "选项 --exec 只能和 --remote 同时使用"
1756
1765
-#: archive.c:592
1757
+#: archive.c:586
1758
msgid "Unexpected option --output"
1759
msgstr "未知参数 --output"
1760
1769
-#: archive.c:594
1761
+#: archive.c:588
1762
msgid "Options --add-file and --remote cannot be used together"
1763
msgstr "选项 --add-file 和 --remote 不能同时使用"
1764
1773
-#: archive.c:616
1765
+#: archive.c:610
1766
#, c-format
1767
msgid "Unknown archive format '%s'"
1768
msgstr "未知归档格式 '%s'"
1769
1778
-#: archive.c:623
1770
+#: archive.c:619
1771
#, c-format
1772
msgid "Argument not supported for format '%s': -%d"
1773
msgstr "参数不支持此格式 '%s'：-%d"
1774
1783
-#: attr.c:212
1775
+#: attr.c:202
1776
#, c-format
1777
msgid "%.*s is not a valid attribute name"
1778
msgstr "%.*s 不是一个有效的属性名"
1779
1788
-#: attr.c:369
1780
+#: attr.c:359
1781
#, c-format
1782
msgid "%s not allowed: %s:%d"
1783
msgstr "不允许 %s：%s:%d"
1784
1793
-#: attr.c:409
1785
+#: attr.c:399
1786
msgid ""
1787
"Negative patterns are ignored in git attributes\n"
1788
"Use '\\!' for literal leading exclamation."
@@ -1798,22 +1790,22 @@ msgstr ""
1790
"负值模版在 git attributes 中被忽略\n"
1791
"当字符串确实要以感叹号开始时，使用 '\\!'。"
1792
1801
-#: bisect.c:476
1793
+#: bisect.c:489
1794
#, c-format
1795
msgid "Badly quoted content in file '%s': %s"
1796
msgstr "文件 '%s' 包含错误的引用格式：%s"
1797
1806
-#: bisect.c:686
1798
+#: bisect.c:699
1799
#, c-format
1800
msgid "We cannot bisect more!\n"
1801
msgstr "我们无法进行更多的二分查找！\n"
1802
1811
-#: bisect.c:753
1803
+#: bisect.c:766
1804
#, c-format
1805
msgid "Not a valid commit name %s"
1806
msgstr "不是一个有效的提交名 %s"
1807
1816
-#: bisect.c:778
1808
+#: bisect.c:791
1809
#, c-format
1810
msgid ""
1811
"The merge base %s is bad.\n"
@@ -1822,7 +1814,7 @@ msgstr ""
1814
"合并基线 %s 是坏的。\n"
1815
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
1816
1825
-#: bisect.c:783
1817
+#: bisect.c:796
1818
#, c-format
1819
msgid ""
1820
"The merge base %s is new.\n"
@@ -1831,7 +1823,7 @@ msgstr ""
1823
"合并基线 %s 是新的。\n"
1824
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
1825
1834
-#: bisect.c:788
1826
+#: bisect.c:801
1827
#, c-format
1828
msgid ""
1829
"The merge base %s is %s.\n"
@@ -1840,7 +1832,7 @@ msgstr ""
1832
"合并基线 %s 是 %s。\n"
1833
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
1834
1843
-#: bisect.c:796
1835
+#: bisect.c:809
1836
#, c-format
1837
msgid ""
1838
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1851,7 +1843,7 @@ msgstr ""
1843
"这种情况下 git 二分查找无法正常工作。\n"
1844
"您可能弄错了 %s 和 %s 版本？\n"
1845
1854
-#: bisect.c:809
1846
+#: bisect.c:822
1847
#, c-format
1848
msgid ""
1849
"the merge base between %s and [%s] must be skipped.\n"
@@ -1862,36 +1854,36 @@ msgstr ""
1854
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
1855
"我们仍旧继续。"
1856
1865
-#: bisect.c:848
1857
+#: bisect.c:861
1858
#, c-format
1859
msgid "Bisecting: a merge base must be tested\n"
1860
msgstr "二分查找中：合并基线必须是经过测试的\n"
1861
1870
-#: bisect.c:898
1862
+#: bisect.c:911
1863
#, c-format
1864
msgid "a %s revision is needed"
1865
msgstr "需要一个 %s 版本"
1866
1875
-#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
1867
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
1868
#, c-format
1869
msgid "could not create file '%s'"
1870
msgstr "不能创建文件 '%s'"
1871
1880
-#: bisect.c:974 builtin/merge.c:150
1872
+#: bisect.c:987 builtin/merge.c:152
1873
#, c-format
1874
msgid "could not read file '%s'"
1875
msgstr "不能读取文件 '%s'"
1876
1885
-#: bisect.c:1014
1877
+#: bisect.c:1027
1878
msgid "reading bisect refs failed"
1879
msgstr "读取二分查找引用失败"
1880
1889
-#: bisect.c:1044
1881
+#: bisect.c:1057
1882
#, c-format
1883
msgid "%s was both %s and %s\n"
1884
msgstr "%s 同时为 %s 和 %s\n"
1885
1894
-#: bisect.c:1053
1886
+#: bisect.c:1066
1887
#, c-format
1888
msgid ""
1889
"No testable commit found.\n"
@@ -1900,7 +1892,7 @@ msgstr ""
1892
"没有发现可测试的提交。\n"
1893
"可能您在运行时使用了错误的路径参数？\n"
1894
1903
-#: bisect.c:1082
1895
+#: bisect.c:1095
1896
#, c-format
1897
msgid "(roughly %d step)"
1898
msgid_plural "(roughly %d steps)"
@@ -1910,44 +1902,44 @@ msgstr[1] "（大概 %d 步）"
1902
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
1903
#. steps)" translation.
1904
#.
1913
-#: bisect.c:1088
1905
+#: bisect.c:1101
1906
#, c-format
1907
msgid "Bisecting: %d revision left to test after this %s\n"
1908
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1909
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1910
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
1911
1920
-#: blame.c:2778
1912
+#: blame.c:2777
1913
msgid "--contents and --reverse do not blend well."
1914
msgstr "--contents 和 --reverse 不能混用。"
1915
1924
-#: blame.c:2792
1916
+#: blame.c:2791
1917
msgid "cannot use --contents with final commit object name"
1918
msgstr "不能将 --contents 和最终的提交对象名共用"
1919
1928
-#: blame.c:2813
1920
+#: blame.c:2812
1921
msgid "--reverse and --first-parent together require specified latest commit"
1922
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1923
1932
-#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105
1933
-#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404
1934
-#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319
1935
-#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
1936
-#: builtin/shortlog.c:320
1924
+#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
1925
+#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
1926
+#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
1927
+#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
1928
+#: builtin/shortlog.c:267
1929
msgid "revision walk setup failed"
1930
msgstr "版本遍历设置失败"
1931
1940
-#: blame.c:2840
1932
+#: blame.c:2839
1933
msgid ""
1934
"--reverse --first-parent together require range along first-parent chain"
1935
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
1936
1945
-#: blame.c:2851
1937
+#: blame.c:2850
1938
#, c-format
1939
msgid "no such path %s in %s"
1940
msgstr "在 %2$s 中无此路径 %1$s"
1941
1950
-#: blame.c:2862
1942
+#: blame.c:2861
1943
#, c-format
1944
msgid "cannot read blob %s for path %s"
1945
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
@@ -2105,7 +2097,7 @@ msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"
2097
msgid "unrecognized header: %s%s (%d)"
2098
msgstr "未能识别的包头：%s%s (%d)"
2099
2108
-#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
2100
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
2101
#: builtin/commit.c:814
2102
#, c-format
2103
msgid "could not open '%s'"
@@ -2168,7 +2160,7 @@ msgstr "不支持的归档包版本 %d"
2160
msgid "cannot write bundle version %d with algorithm %s"
2161
msgstr "不能写入，归档包版本 %d 不支持算法 %s"
2162
2171
-#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
2163
+#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
2164
#, c-format
2165
msgid "unrecognized argument: %s"
2166
msgstr "未能识别的参数：%s"
@@ -2191,7 +2183,7 @@ msgstr "index-pack 终止"
2183
msgid "invalid color value: %.*s"
2184
msgstr "无效的颜色值：%.*s"
2185
2194
-#: commit-graph.c:188 midx.c:46
2186
+#: commit-graph.c:188 midx.c:47
2187
msgid "invalid hash version"
2188
msgstr "无效的哈希版本"
2189
@@ -2255,200 +2247,190 @@ msgstr "无效的提交位置。提交图形可能已损坏"
2247
msgid "could not find commit %s"
2248
msgstr "无法找到提交 %s"
2249
2258
-#: commit-graph.c:1042 builtin/am.c:1306
2250
+#: commit-graph.c:1036 builtin/am.c:1292
2251
#, c-format
2252
msgid "unable to parse commit %s"
2253
msgstr "不能解析提交 %s"
2254
2263
-#: commit-graph.c:1265 builtin/pack-objects.c:2864
2255
+#: commit-graph.c:1252 builtin/pack-objects.c:2864
2256
#, c-format
2257
msgid "unable to get type of object %s"
2258
msgstr "无法获得对象 %s 类型"
2259
2268
-#: commit-graph.c:1301
2260
+#: commit-graph.c:1283
2261
msgid "Loading known commits in commit graph"
2262
msgstr "正在加载提交图中的已知提交"
2263
2272
-#: commit-graph.c:1318
2264
+#: commit-graph.c:1300
2265
msgid "Expanding reachable commits in commit graph"
2266
msgstr "正在扩展提交图中的可达提交"
2267
2276
-#: commit-graph.c:1338
2268
+#: commit-graph.c:1320
2269
msgid "Clearing commit marks in commit graph"
2270
msgstr "正在清除提交图中的提交标记"
2271
2280
-#: commit-graph.c:1357
2272
+#: commit-graph.c:1339
2273
msgid "Computing commit graph generation numbers"
2274
msgstr "正在计算提交图世代数字"
2275
2284
-#: commit-graph.c:1424
2276
+#: commit-graph.c:1406
2277
msgid "Computing commit changed paths Bloom filters"
2278
msgstr "计算提交变更路径的布隆过滤器"
2279
2288
-#: commit-graph.c:1501
2280
+#: commit-graph.c:1483
2281
msgid "Collecting referenced commits"
2282
msgstr "正在收集引用的提交"
2283
2292
-#: commit-graph.c:1526
2284
+#: commit-graph.c:1508
2285
#, c-format
2286
msgid "Finding commits for commit graph in %d pack"
2287
msgid_plural "Finding commits for commit graph in %d packs"
2288
msgstr[0] "正在 %d 个包中查找提交图的提交"
2289
msgstr[1] "正在 %d 个包中查找提交图的提交"
2290
2299
-#: commit-graph.c:1539
2291
+#: commit-graph.c:1521
2292
#, c-format
2293
msgid "error adding pack %s"
2294
msgstr "添加包 %s 出错"
2295
2304
-#: commit-graph.c:1543
2296
+#: commit-graph.c:1525
2297
#, c-format
2298
msgid "error opening index for %s"
2299
msgstr "为 %s 打开索引出错"
2300
2309
-#: commit-graph.c:1582
2301
+#: commit-graph.c:1562
2302
msgid "Finding commits for commit graph among packed objects"
2303
msgstr "正在打包对象中查找提交图的提交"
2304
2313
-#: commit-graph.c:1597
2314
-msgid "Counting distinct commits in commit graph"
2315
-msgstr "正在计算提交图中不同的提交"
2316
-
2317
-#: commit-graph.c:1629
2305
+#: commit-graph.c:1580
2306
msgid "Finding extra edges in commit graph"
2307
msgstr "正在查找提交图中额外的边"
2308
2321
-#: commit-graph.c:1678
2309
+#: commit-graph.c:1628
2310
msgid "failed to write correct number of base graph ids"
2311
msgstr "无法写入正确数量的基础图形 ID"
2312
2325
-#: commit-graph.c:1720 midx.c:826
2313
+#: commit-graph.c:1670 midx.c:819
2314
#, c-format
2315
msgid "unable to create leading directories of %s"
2316
msgstr "不能为 %s 创建先导目录"
2317
2330
-#: commit-graph.c:1733
2318
+#: commit-graph.c:1683
2319
msgid "unable to create temporary graph layer"
2320
msgstr "无法创建临时图层"
2321
2334
-#: commit-graph.c:1738
2322
+#: commit-graph.c:1688
2323
#, c-format
2324
msgid "unable to adjust shared permissions for '%s'"
2325
msgstr "无法为 '%s' 调整共享权限"
2326
2339
-#: commit-graph.c:1808
2327
+#: commit-graph.c:1758
2328
#, c-format
2329
msgid "Writing out commit graph in %d pass"
2330
msgid_plural "Writing out commit graph in %d passes"
2331
msgstr[0] "正在用 %d 步写出提交图"
2332
msgstr[1] "正在用 %d 步写出提交图"
2333
2346
-#: commit-graph.c:1853
2334
+#: commit-graph.c:1803
2335
msgid "unable to open commit-graph chain file"
2336
msgstr "无法打开提交图形链文件"
2337
2350
-#: commit-graph.c:1869
2338
+#: commit-graph.c:1819
2339
msgid "failed to rename base commit-graph file"
2340
msgstr "无法重命名基础提交图形文件"
2341
2354
-#: commit-graph.c:1889
2342
+#: commit-graph.c:1839
2343
msgid "failed to rename temporary commit-graph file"
2344
msgstr "无法重命名临时提交图形文件"
2345
2358
-#: commit-graph.c:2015
2346
+#: commit-graph.c:1965
2347
msgid "Scanning merged commits"
2348
msgstr "正在扫描合并提交"
2349
2362
-#: commit-graph.c:2026
2363
-#, c-format
2364
-msgid "unexpected duplicate commit id %s"
2365
-msgstr "意外的重复提交 ID %s"
2366
-
2367
-#: commit-graph.c:2049
2350
+#: commit-graph.c:2009
2351
msgid "Merging commit-graph"
2352
msgstr "正在合并提交图形"
2353
2371
-#: commit-graph.c:2259
2372
-#, c-format
2373
-msgid "the commit graph format cannot write %d commits"
2374
-msgstr "提交图格式不能写入 %d 个提交"
2354
+#: commit-graph.c:2115
2355
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2356
+msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
2357
2376
-#: commit-graph.c:2270
2358
+#: commit-graph.c:2214
2359
msgid "too many commits to write graph"
2360
msgstr "提交太多不能画图"
2361
2380
-#: commit-graph.c:2363
2362
+#: commit-graph.c:2307
2363
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2364
msgstr "提交图文件的校验码错误，可能已经损坏"
2365
2384
-#: commit-graph.c:2373
2366
+#: commit-graph.c:2317
2367
#, c-format
2368
msgid "commit-graph has incorrect OID order: %s then %s"
2369
msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
2370
2389
-#: commit-graph.c:2383 commit-graph.c:2398
2371
+#: commit-graph.c:2327 commit-graph.c:2342
2372
#, c-format
2373
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2374
msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
2375
2394
-#: commit-graph.c:2390
2376
+#: commit-graph.c:2334
2377
#, c-format
2378
msgid "failed to parse commit %s from commit-graph"
2379
msgstr "无法从提交图形中解析提交 %s"
2380
2399
-#: commit-graph.c:2408
2381
+#: commit-graph.c:2352
2382
msgid "Verifying commits in commit graph"
2383
msgstr "正在校验提交图中的提交"
2384
2403
-#: commit-graph.c:2423
2385
+#: commit-graph.c:2367
2386
#, c-format
2387
msgid "failed to parse commit %s from object database for commit-graph"
2388
msgstr "无法从提交图形的对象库中解析提交 %s"
2389
2408
-#: commit-graph.c:2430
2390
+#: commit-graph.c:2374
2391
#, c-format
2392
msgid "root tree OID for commit %s in commit-graph is %s != %s"
2393
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
2394
2413
-#: commit-graph.c:2440
2395
+#: commit-graph.c:2384
2396
#, c-format
2397
msgid "commit-graph parent list for commit %s is too long"
2398
msgstr "提交 %s 的提交图形父提交列表太长了"
2399
2418
-#: commit-graph.c:2449
2400
+#: commit-graph.c:2393
2401
#, c-format
2402
msgid "commit-graph parent for %s is %s != %s"
2403
msgstr "%s 的提交图形父提交是 %s != %s"
2404
2423
-#: commit-graph.c:2463
2405
+#: commit-graph.c:2407
2406
#, c-format
2407
msgid "commit-graph parent list for commit %s terminates early"
2408
msgstr "提交 %s 的提交图形父提交列表过早终止"
2409
2428
-#: commit-graph.c:2468
2410
+#: commit-graph.c:2412
2411
#, c-format
2412
msgid ""
2413
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2414
msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
2415
2434
-#: commit-graph.c:2472
2416
+#: commit-graph.c:2416
2417
#, c-format
2418
msgid ""
2419
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2420
msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
2421
2440
-#: commit-graph.c:2488
2422
+#: commit-graph.c:2432
2423
#, c-format
2424
msgid "commit-graph generation for commit %s is %u != %u"
2425
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
2426
2445
-#: commit-graph.c:2494
2427
+#: commit-graph.c:2438
2428
#, c-format
2429
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2430
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2431
2450
-#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417
2451
-#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457
2432
+#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
2433
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
2434
#, c-format
2435
msgid "could not parse %s"
2436
msgstr "不能解析 %s"
@@ -2550,7 +2532,7 @@ msgstr "键名没有包含一个小节名称：%s"
2532
msgid "key does not contain variable name: %s"
2533
msgstr "键名没有包含变量名：%s"
2534
2553
-#: config.c:408 sequencer.c:2547
2535
+#: config.c:408 sequencer.c:2580
2536
#, c-format
2537
msgid "invalid key: %s"
2538
msgstr "无效键名：%s"
@@ -2739,77 +2721,77 @@ msgstr "无法解析命令行配置中的 '%s'"
2721
msgid "bad config variable '%s' in file '%s' at line %d"
2722
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
2723
2742
-#: config.c:2470
2724
+#: config.c:2473
2725
#, c-format
2726
msgid "invalid section name '%s'"
2727
msgstr "无效的小节名称 '%s'"
2728
2747
-#: config.c:2502
2729
+#: config.c:2505
2730
#, c-format
2731
msgid "%s has multiple values"
2732
msgstr "%s 有多个取值"
2733
2752
-#: config.c:2531
2734
+#: config.c:2534
2735
#, c-format
2736
msgid "failed to write new configuration file %s"
2737
msgstr "写入新的配置文件 %s 失败"
2738
2757
-#: config.c:2783 config.c:3107
2739
+#: config.c:2786 config.c:3112
2740
#, c-format
2741
msgid "could not lock config file %s"
2742
msgstr "不能锁定配置文件 %s"
2743
2762
-#: config.c:2794
2744
+#: config.c:2797
2745
#, c-format
2746
msgid "opening %s"
2747
msgstr "打开 %s"
2748
2767
-#: config.c:2829 builtin/config.c:354
2749
+#: config.c:2834 builtin/config.c:361
2750
#, c-format
2751
msgid "invalid pattern: %s"
2752
msgstr "无效模式：%s"
2753
2772
-#: config.c:2854
2754
+#: config.c:2859
2755
#, c-format
2756
msgid "invalid config file %s"
2757
msgstr "无效的配置文件 %s"
2758
2777
-#: config.c:2867 config.c:3120
2759
+#: config.c:2872 config.c:3125
2760
#, c-format
2761
msgid "fstat on %s failed"
2762
msgstr "对 %s 调用 fstat 失败"
2763
2782
-#: config.c:2878
2764
+#: config.c:2883
2765
#, c-format
2766
msgid "unable to mmap '%s'"
2767
msgstr "不能 mmap '%s'"
2768
2787
-#: config.c:2887 config.c:3125
2769
+#: config.c:2892 config.c:3130
2770
#, c-format
2771
msgid "chmod on %s failed"
2772
msgstr "对 %s 调用 chmod 失败"
2773
2792
-#: config.c:2972 config.c:3222
2774
+#: config.c:2977 config.c:3227
2775
#, c-format
2776
msgid "could not write config file %s"
2777
msgstr "不能写入配置文件 %s"
2778
2797
-#: config.c:3006
2779
+#: config.c:3011
2780
#, c-format
2781
msgid "could not set '%s' to '%s'"
2782
msgstr "不能设置 '%s' 为 '%s'"
2783
2802
-#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
2784
+#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
2785
#, c-format
2786
msgid "could not unset '%s'"
2787
msgstr "不能取消设置 '%s'"
2788
2807
-#: config.c:3098
2789
+#: config.c:3103
2790
#, c-format
2791
msgid "invalid section name: %s"
2792
msgstr "无效的小节名称：%s"
2793
2812
-#: config.c:3265
2794
+#: config.c:3270
2795
#, c-format
2796
msgid "missing value for '%s'"
2797
msgstr "%s 的取值缺失"
@@ -3241,6 +3223,26 @@ msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多
3223
msgid "Marked %d islands, done.\n"
3224
msgstr "已标记 %d 个数据岛，结束。\n"
3225
3226
+#: diff-lib.c:534
3227
+msgid "--merge-base does not work with ranges"
3228
+msgstr "--merge-base 不适用于范围"
3229
+
3230
+#: diff-lib.c:536
3231
+msgid "--merge-base only works with commits"
3232
+msgstr "--merge-base 仅适用于提交"
3233
+
3234
+#: diff-lib.c:553
3235
+msgid "unable to get HEAD"
3236
+msgstr "不能解析 HEAD"
3237
+
3238
+#: diff-lib.c:560
3239
+msgid "no merge base found"
3240
+msgstr "未找到合并基线"
3241
+
3242
+#: diff-lib.c:562
3243
+msgid "multiple merge bases found"
3244
+msgstr "找到了多条合并基线"
3245
+
3246
#: diff-no-index.c:238
3247
msgid "git diff --no-index [<options>] <path> <path>"
3248
msgstr "git diff --no-index [<选项>] <路径> <路径>"
@@ -3300,35 +3302,35 @@ msgstr ""
3302
"发现配置变量 'diff.dirstat' 中的错误：\n"
3303
"%s"
3304
3303
-#: diff.c:4269
3305
+#: diff.c:4276
3306
#, c-format
3307
msgid "external diff died, stopping at %s"
3308
msgstr "外部 diff 退出，停止在 %s"
3309
3308
-#: diff.c:4618
3310
+#: diff.c:4625
3311
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
3312
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
3313
3312
-#: diff.c:4621
3314
+#: diff.c:4628
3315
msgid "-G, -S and --find-object are mutually exclusive"
3316
msgstr "-G、-S 和 --find-object 是互斥的"
3317
3316
-#: diff.c:4699
3318
+#: diff.c:4707
3319
msgid "--follow requires exactly one pathspec"
3320
msgstr "--follow 明确要求只跟一个路径规格"
3321
3320
-#: diff.c:4747
3322
+#: diff.c:4755
3323
#, c-format
3324
msgid "invalid --stat value: %s"
3325
msgstr "无效的 --stat 值：%s"
3326
3325
-#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279
3327
+#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
3328
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
3329
#, c-format
3330
msgid "%s expects a numerical value"
3331
msgstr "%s 期望一个数字值"
3332
3331
-#: diff.c:4784
3333
+#: diff.c:4792
3334
#, c-format
3335
msgid ""
3336
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3337,195 +3339,200 @@ msgstr ""
3339
"无法解析 --dirstat/-X 选项的参数：\n"
3340
"%s"
3341
3340
-#: diff.c:4869
3342
+#: diff.c:4877
3343
#, c-format
3344
msgid "unknown change class '%c' in --diff-filter=%s"
3345
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
3346
3345
-#: diff.c:4893
3347
+#: diff.c:4901
3348
#, c-format
3349
msgid "unknown value after ws-error-highlight=%.*s"
3350
msgstr "ws-error-highlight=%.*s 之后未知的值"
3351
3350
-#: diff.c:4907
3352
+#: diff.c:4915
3353
#, c-format
3354
msgid "unable to resolve '%s'"
3355
msgstr "不能解析 '%s'"
3356
3355
-#: diff.c:4957 diff.c:4963
3357
+#: diff.c:4965 diff.c:4971
3358
#, c-format
3359
msgid "%s expects <n>/<m> form"
3360
msgstr "%s 期望 <n>/<m> 格式"
3361
3360
-#: diff.c:4975
3362
+#: diff.c:4983
3363
#, c-format
3364
msgid "%s expects a character, got '%s'"
3365
msgstr "%s 期望一个字符，得到 '%s'"
3366
3365
-#: diff.c:4996
3367
+#: diff.c:5004
3368
#, c-format
3369
msgid "bad --color-moved argument: %s"
3370
msgstr "坏的 --color-moved 参数：%s"
3371
3370
-#: diff.c:5015
3372
+#: diff.c:5023
3373
#, c-format
3374
msgid "invalid mode '%s' in --color-moved-ws"
3375
msgstr "--color-moved-ws 中的无效模式 '%s' "
3376
3375
-#: diff.c:5055
3377
+#: diff.c:5063
3378
msgid ""
3379
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3380
"\"histogram\""
3381
msgstr ""
3382
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3383
3382
-#: diff.c:5091 diff.c:5111
3384
+#: diff.c:5099 diff.c:5119
3385
#, c-format
3386
msgid "invalid argument to %s"
3387
msgstr "%s 的参数无效"
3388
3387
-#: diff.c:5248
3389
+#: diff.c:5223
3390
+#, c-format
3391
+msgid "invalid regex given to -I: '%s'"
3392
+msgstr "选项 -I 的正则表达式无效：'%s'"
3393
+
3394
+#: diff.c:5272
3395
#, c-format
3396
msgid "failed to parse --submodule option parameter: '%s'"
3397
msgstr "无法解析 --submodule 选项的参数：'%s'"
3398
3392
-#: diff.c:5304
3399
+#: diff.c:5328
3400
#, c-format
3401
msgid "bad --word-diff argument: %s"
3402
msgstr "坏的 --word-diff 参数：%s"
3403
3397
-#: diff.c:5327
3404
+#: diff.c:5351
3405
msgid "Diff output format options"
3406
msgstr "差异输出格式化选项"
3407
3401
-#: diff.c:5329 diff.c:5335
3408
+#: diff.c:5353 diff.c:5359
3409
msgid "generate patch"
3410
msgstr "生成补丁"
3411
3405
-#: diff.c:5332 builtin/log.c:176
3412
+#: diff.c:5356 builtin/log.c:178
3413
msgid "suppress diff output"
3414
msgstr "不显示差异输出"
3415
3409
-#: diff.c:5337 diff.c:5451 diff.c:5458
3416
+#: diff.c:5361 diff.c:5475 diff.c:5482
3417
msgid "<n>"
3418
msgstr "<n>"
3419
3413
-#: diff.c:5338 diff.c:5341
3420
+#: diff.c:5362 diff.c:5365
3421
msgid "generate diffs with <n> lines context"
3422
msgstr "生成含 <n> 行上下文的差异"
3423
3417
-#: diff.c:5343
3424
+#: diff.c:5367
3425
msgid "generate the diff in raw format"
3426
msgstr "生成原始格式的差异"
3427
3421
-#: diff.c:5346
3428
+#: diff.c:5370
3429
msgid "synonym for '-p --raw'"
3430
msgstr "和 '-p --raw' 同义"
3431
3425
-#: diff.c:5350
3432
+#: diff.c:5374
3433
msgid "synonym for '-p --stat'"
3434
msgstr "和 '-p --stat' 同义"
3435
3429
-#: diff.c:5354
3436
+#: diff.c:5378
3437
msgid "machine friendly --stat"
3438
msgstr "机器友好的 --stat"
3439
3433
-#: diff.c:5357
3440
+#: diff.c:5381
3441
msgid "output only the last line of --stat"
3442
msgstr "只输出 --stat 的最后一行"
3443
3437
-#: diff.c:5359 diff.c:5367
3444
+#: diff.c:5383 diff.c:5391
3445
msgid "<param1,param2>..."
3446
msgstr "<参数1,参数2>..."
3447
3441
-#: diff.c:5360
3448
+#: diff.c:5384
3449
msgid ""
3450
"output the distribution of relative amount of changes for each sub-directory"
3451
msgstr "输出每个子目录相对变更的分布"
3452
3446
-#: diff.c:5364
3453
+#: diff.c:5388
3454
msgid "synonym for --dirstat=cumulative"
3455
msgstr "和 --dirstat=cumulative 同义"
3456
3450
-#: diff.c:5368
3457
+#: diff.c:5392
3458
msgid "synonym for --dirstat=files,param1,param2..."
3459
msgstr "是 --dirstat=files,param1,param2... 的同义词"
3460
3454
-#: diff.c:5372
3461
+#: diff.c:5396
3462
msgid "warn if changes introduce conflict markers or whitespace errors"
3463
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
3464
3458
-#: diff.c:5375
3465
+#: diff.c:5399
3466
msgid "condensed summary such as creations, renames and mode changes"
3467
msgstr "精简摘要，例如创建、重命名和模式变更"
3468
3462
-#: diff.c:5378
3469
+#: diff.c:5402
3470
msgid "show only names of changed files"
3471
msgstr "只显示变更文件的文件名"
3472
3466
-#: diff.c:5381
3473
+#: diff.c:5405
3474
msgid "show only names and status of changed files"
3475
msgstr "只显示变更文件的文件名和状态"
3476
3470
-#: diff.c:5383
3477
+#: diff.c:5407
3478
msgid "<width>[,<name-width>[,<count>]]"
3479
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
3480
3474
-#: diff.c:5384
3481
+#: diff.c:5408
3482
msgid "generate diffstat"
3483
msgstr "生成差异统计（diffstat）"
3484
3478
-#: diff.c:5386 diff.c:5389 diff.c:5392
3485
+#: diff.c:5410 diff.c:5413 diff.c:5416
3486
msgid "<width>"
3487
msgstr "<宽度>"
3488
3482
-#: diff.c:5387
3489
+#: diff.c:5411
3490
msgid "generate diffstat with a given width"
3491
msgstr "使用给定的长度生成差异统计"
3492
3486
-#: diff.c:5390
3493
+#: diff.c:5414
3494
msgid "generate diffstat with a given name width"
3495
msgstr "使用给定的文件名长度生成差异统计"
3496
3490
-#: diff.c:5393
3497
+#: diff.c:5417
3498
msgid "generate diffstat with a given graph width"
3499
msgstr "使用给定的图形长度生成差异统计"
3500
3494
-#: diff.c:5395
3501
+#: diff.c:5419
3502
msgid "<count>"
3503
msgstr "<次数>"
3504
3498
-#: diff.c:5396
3505
+#: diff.c:5420
3506
msgid "generate diffstat with limited lines"
3507
msgstr "生成有限行数的差异统计"
3508
3502
-#: diff.c:5399
3509
+#: diff.c:5423
3510
msgid "generate compact summary in diffstat"
3511
msgstr "生成差异统计的简洁摘要"
3512
3506
-#: diff.c:5402
3513
+#: diff.c:5426
3514
msgid "output a binary diff that can be applied"
3515
msgstr "输出一个可以应用的二进制差异"
3516
3510
-#: diff.c:5405
3517
+#: diff.c:5429
3518
msgid "show full pre- and post-image object names on the \"index\" lines"
3519
msgstr "在 \"index\" 行显示完整的前后对象名称"
3520
3514
-#: diff.c:5407
3521
+#: diff.c:5431
3522
msgid "show colored diff"
3523
msgstr "显示带颜色的差异"
3524
3518
-#: diff.c:5408
3525
+#: diff.c:5432
3526
msgid "<kind>"
3527
msgstr "<类型>"
3528
3522
-#: diff.c:5409
3529
+#: diff.c:5433
3530
msgid ""
3531
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3532
"diff"
3533
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
3534
3528
-#: diff.c:5412
3535
+#: diff.c:5436
3536
msgid ""
3537
"do not munge pathnames and use NULs as output field terminators in --raw or "
3538
"--numstat"
@@ -3533,295 +3540,299 @@ msgstr ""
3540
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
3541
"符"
3542
3536
-#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
3543
+#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
3544
msgid "<prefix>"
3545
msgstr "<前缀>"
3546
3540
-#: diff.c:5416
3547
+#: diff.c:5440
3548
msgid "show the given source prefix instead of \"a/\""
3549
msgstr "显示给定的源前缀取代 \"a/\""
3550
3544
-#: diff.c:5419
3551
+#: diff.c:5443
3552
msgid "show the given destination prefix instead of \"b/\""
3553
msgstr "显示给定的目标前缀取代 \"b/\""
3554
3548
-#: diff.c:5422
3555
+#: diff.c:5446
3556
msgid "prepend an additional prefix to every line of output"
3557
msgstr "输出的每一行附加前缀"
3558
3552
-#: diff.c:5425
3559
+#: diff.c:5449
3560
msgid "do not show any source or destination prefix"
3561
msgstr "不显示任何源和目标前缀"
3562
3556
-#: diff.c:5428
3563
+#: diff.c:5452
3564
msgid "show context between diff hunks up to the specified number of lines"
3565
msgstr "显示指定行数的差异块间的上下文"
3566
3560
-#: diff.c:5432 diff.c:5437 diff.c:5442
3567
+#: diff.c:5456 diff.c:5461 diff.c:5466
3568
msgid "<char>"
3569
msgstr "<字符>"
3570
3564
-#: diff.c:5433
3571
+#: diff.c:5457
3572
msgid "specify the character to indicate a new line instead of '+'"
3573
msgstr "指定一个字符取代 '+' 来表示新的一行"
3574
3568
-#: diff.c:5438
3575
+#: diff.c:5462
3576
msgid "specify the character to indicate an old line instead of '-'"
3577
msgstr "指定一个字符取代 '-' 来表示旧的一行"
3578
3572
-#: diff.c:5443
3579
+#: diff.c:5467
3580
msgid "specify the character to indicate a context instead of ' '"
3581
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
3582
3576
-#: diff.c:5446
3583
+#: diff.c:5470
3584
msgid "Diff rename options"
3585
msgstr "差异重命名选项"
3586
3580
-#: diff.c:5447
3587
+#: diff.c:5471
3588
msgid "<n>[/<m>]"
3589
msgstr "<n>[/<m>]"
3590
3584
-#: diff.c:5448
3591
+#: diff.c:5472
3592
msgid "break complete rewrite changes into pairs of delete and create"
3593
msgstr "将完全重写的变更打破为成对的删除和创建"
3594
3588
-#: diff.c:5452
3595
+#: diff.c:5476
3596
msgid "detect renames"
3597
msgstr "检测重命名"
3598
3592
-#: diff.c:5456
3599
+#: diff.c:5480
3600
msgid "omit the preimage for deletes"
3601
msgstr "省略删除操作的差异输出"
3602
3596
-#: diff.c:5459
3603
+#: diff.c:5483
3604
msgid "detect copies"
3605
msgstr "检测拷贝"
3606
3600
-#: diff.c:5463
3607
+#: diff.c:5487
3608
msgid "use unmodified files as source to find copies"
3609
msgstr "使用未修改的文件做为发现拷贝的源"
3610
3604
-#: diff.c:5465
3611
+#: diff.c:5489
3612
msgid "disable rename detection"
3613
msgstr "禁用重命名探测"
3614
3608
-#: diff.c:5468
3615
+#: diff.c:5492
3616
msgid "use empty blobs as rename source"
3617
msgstr "使用空的数据对象做为重命名的源"
3618
3612
-#: diff.c:5470
3619
+#: diff.c:5494
3620
msgid "continue listing the history of a file beyond renames"
3621
msgstr "继续列出文件重命名以外的历史记录"
3622
3616
-#: diff.c:5473
3623
+#: diff.c:5497
3624
msgid ""
3625
"prevent rename/copy detection if the number of rename/copy targets exceeds "
3626
"given limit"
3627
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
3628
3622
-#: diff.c:5475
3629
+#: diff.c:5499
3630
msgid "Diff algorithm options"
3631
msgstr "差异算法选项"
3632
3626
-#: diff.c:5477
3633
+#: diff.c:5501
3634
msgid "produce the smallest possible diff"
3635
msgstr "生成尽可能小的差异"
3636
3630
-#: diff.c:5480
3637
+#: diff.c:5504
3638
msgid "ignore whitespace when comparing lines"
3639
msgstr "行比较时忽略空白字符"
3640
3634
-#: diff.c:5483
3641
+#: diff.c:5507
3642
msgid "ignore changes in amount of whitespace"
3643
msgstr "忽略空白字符的变更"
3644
3638
-#: diff.c:5486
3645
+#: diff.c:5510
3646
msgid "ignore changes in whitespace at EOL"
3647
msgstr "忽略行尾的空白字符变更"
3648
3642
-#: diff.c:5489
3649
+#: diff.c:5513
3650
msgid "ignore carrier-return at the end of line"
3651
msgstr "忽略行尾的回车符（CR）"
3652
3646
-#: diff.c:5492
3653
+#: diff.c:5516
3654
msgid "ignore changes whose lines are all blank"
3655
msgstr "忽略整行都是空白的变更"
3656
3650
-#: diff.c:5495
3657
+#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
3658
+msgid "<regex>"
3659
+msgstr "<正则>"
3660
+
3661
+#: diff.c:5519
3662
+msgid "ignore changes whose all lines match <regex>"
3663
+msgstr "忽略所有行都和正则表达式匹配的变更"
3664
+
3665
+#: diff.c:5522
3666
msgid "heuristic to shift diff hunk boundaries for easy reading"
3667
msgstr "启发式转换差异边界以便阅读"
3668
3654
-#: diff.c:5498
3669
+#: diff.c:5525
3670
msgid "generate diff using the \"patience diff\" algorithm"
3671
msgstr "使用 \"patience diff\" 算法生成差异"
3672
3658
-#: diff.c:5502
3673
+#: diff.c:5529
3674
msgid "generate diff using the \"histogram diff\" algorithm"
3675
msgstr "使用 \"histogram diff\" 算法生成差异"
3676
3662
-#: diff.c:5504
3677
+#: diff.c:5531
3678
msgid "<algorithm>"
3679
msgstr "<算法>"
3680
3666
-#: diff.c:5505
3681
+#: diff.c:5532
3682
msgid "choose a diff algorithm"
3683
msgstr "选择一个差异算法"
3684
3670
-#: diff.c:5507
3685
+#: diff.c:5534
3686
msgid "<text>"
3687
msgstr "<文本>"
3688
3674
-#: diff.c:5508
3689
+#: diff.c:5535
3690
msgid "generate diff using the \"anchored diff\" algorithm"
3691
msgstr "使用 \"anchored diff\" 算法生成差异"
3692
3678
-#: diff.c:5510 diff.c:5519 diff.c:5522
3693
+#: diff.c:5537 diff.c:5546 diff.c:5549
3694
msgid "<mode>"
3695
msgstr "<模式>"
3696
3682
-#: diff.c:5511
3697
+#: diff.c:5538
3698
msgid "show word diff, using <mode> to delimit changed words"
3699
msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
3700
3686
-#: diff.c:5513 diff.c:5516 diff.c:5561
3687
-msgid "<regex>"
3688
-msgstr "<正则>"
3689
-
3690
-#: diff.c:5514
3701
+#: diff.c:5541
3702
msgid "use <regex> to decide what a word is"
3703
msgstr "使用 <正则表达式> 确定何为一个词"
3704
3694
-#: diff.c:5517
3705
+#: diff.c:5544
3706
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3707
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
3708
3698
-#: diff.c:5520
3709
+#: diff.c:5547
3710
msgid "moved lines of code are colored differently"
3711
msgstr "移动的代码行用不同方式着色"
3712
3702
-#: diff.c:5523
3713
+#: diff.c:5550
3714
msgid "how white spaces are ignored in --color-moved"
3715
msgstr "在 --color-moved 下如何忽略空白字符"
3716
3706
-#: diff.c:5526
3717
+#: diff.c:5553
3718
msgid "Other diff options"
3719
msgstr "其它差异选项"
3720
3710
-#: diff.c:5528
3721
+#: diff.c:5555
3722
msgid "when run from subdir, exclude changes outside and show relative paths"
3723
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
3724
3714
-#: diff.c:5532
3725
+#: diff.c:5559
3726
msgid "treat all files as text"
3727
msgstr "把所有文件当做文本处理"
3728
3718
-#: diff.c:5534
3729
+#: diff.c:5561
3730
msgid "swap two inputs, reverse the diff"
3731
msgstr "交换两个输入，反转差异"
3732
3722
-#: diff.c:5536
3733
+#: diff.c:5563
3734
msgid "exit with 1 if there were differences, 0 otherwise"
3735
msgstr "有差异时退出码为 1，否则为 0"
3736
3726
-#: diff.c:5538
3737
+#: diff.c:5565
3738
msgid "disable all output of the program"
3739
msgstr "禁用本程序的所有输出"
3740
3730
-#: diff.c:5540
3741
+#: diff.c:5567
3742
msgid "allow an external diff helper to be executed"
3743
msgstr "允许执行一个外置的差异助手"
3744
3734
-#: diff.c:5542
3745
+#: diff.c:5569
3746
msgid "run external text conversion filters when comparing binary files"
3747
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
3748
3738
-#: diff.c:5544
3749
+#: diff.c:5571
3750
msgid "<when>"
3751
msgstr "<何时>"
3752
3742
-#: diff.c:5545
3753
+#: diff.c:5572
3754
msgid "ignore changes to submodules in the diff generation"
3755
msgstr "在生成差异时，忽略子模组的更改"
3756
3746
-#: diff.c:5548
3757
+#: diff.c:5575
3758
msgid "<format>"
3759
msgstr "<格式>"
3760
3750
-#: diff.c:5549
3761
+#: diff.c:5576
3762
msgid "specify how differences in submodules are shown"
3763
msgstr "指定子模组的差异如何显示"
3764
3754
-#: diff.c:5553
3765
+#: diff.c:5580
3766
msgid "hide 'git add -N' entries from the index"
3767
msgstr "隐藏索引中 'git add -N' 条目"
3768
3758
-#: diff.c:5556
3769
+#: diff.c:5583
3770
msgid "treat 'git add -N' entries as real in the index"
3771
msgstr "将索引中 'git add -N' 条目当做真实的"
3772
3762
-#: diff.c:5558
3773
+#: diff.c:5585
3774
msgid "<string>"
3775
msgstr "<字符串>"
3776
3766
-#: diff.c:5559
3777
+#: diff.c:5586
3778
msgid ""
3779
"look for differences that change the number of occurrences of the specified "
3780
"string"
3781
msgstr "查找改变了指定字符串出现次数的差异"
3782
3772
-#: diff.c:5562
3783
+#: diff.c:5589
3784
msgid ""
3785
"look for differences that change the number of occurrences of the specified "
3786
"regex"
3787
msgstr "查找改变指定正则匹配出现次数的差异"
3788
3778
-#: diff.c:5565
3789
+#: diff.c:5592
3790
msgid "show all changes in the changeset with -S or -G"
3791
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
3792
3782
-#: diff.c:5568
3793
+#: diff.c:5595
3794
msgid "treat <string> in -S as extended POSIX regular expression"
3795
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
3796
3786
-#: diff.c:5571
3797
+#: diff.c:5598
3798
msgid "control the order in which files appear in the output"
3799
msgstr "控制输出中的文件显示顺序"
3800
3790
-#: diff.c:5572
3801
+#: diff.c:5599
3802
msgid "<object-id>"
3803
msgstr "<对象 ID>"
3804
3794
-#: diff.c:5573
3805
+#: diff.c:5600
3806
msgid ""
3807
"look for differences that change the number of occurrences of the specified "
3808
"object"
3809
msgstr "查找改变指定对象出现次数的差异"
3810
3800
-#: diff.c:5575
3811
+#: diff.c:5602
3812
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3813
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3814
3804
-#: diff.c:5576
3815
+#: diff.c:5603
3816
msgid "select files by diff type"
3817
msgstr "通过差异类型选择文件"
3818
3808
-#: diff.c:5578
3819
+#: diff.c:5605
3820
msgid "<file>"
3821
msgstr "<文件>"
3822
3812
-#: diff.c:5579
3823
+#: diff.c:5606
3824
msgid "Output to a specific file"
3825
msgstr "输出到一个指定的文件"
3826
3816
-#: diff.c:6236
3827
+#: diff.c:6263
3828
msgid "inexact rename detection was skipped due to too many files."
3829
msgstr "因为文件太多，略过不严格的重命名检查。"
3830
3820
-#: diff.c:6239
3831
+#: diff.c:6266
3832
msgid "only found copies from modified paths due to too many files."
3833
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
3834
3824
-#: diff.c:6242
3835
+#: diff.c:6269
3836
#, c-format
3837
msgid ""
3838
"you may want to set your %s variable to at least %d and retry the command."
@@ -3922,245 +3933,245 @@ msgstr "不能设置 GIT_DIR 为 '%s'"
3933
msgid "too many args to run %s"
3934
msgstr "执行 %s 的参数太多"
3935
3925
-#: fetch-pack.c:176
3936
+#: fetch-pack.c:177
3937
msgid "git fetch-pack: expected shallow list"
3938
msgstr "git fetch-pack：应为 shallow 列表"
3939
3929
-#: fetch-pack.c:179
3940
+#: fetch-pack.c:180
3941
msgid "git fetch-pack: expected a flush packet after shallow list"
3942
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
3943
3933
-#: fetch-pack.c:190
3944
+#: fetch-pack.c:191
3945
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
3946
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
3947
3937
-#: fetch-pack.c:210
3948
+#: fetch-pack.c:211
3949
#, c-format
3950
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
3951
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
3952
3942
-#: fetch-pack.c:221
3953
+#: fetch-pack.c:222
3954
msgid "unable to write to remote"
3955
msgstr "无法写到远程"
3956
3946
-#: fetch-pack.c:282
3957
+#: fetch-pack.c:283
3958
msgid "--stateless-rpc requires multi_ack_detailed"
3959
msgstr "--stateless-rpc 需要 multi_ack_detailed"
3960
3950
-#: fetch-pack.c:375 fetch-pack.c:1397
3961
+#: fetch-pack.c:378 fetch-pack.c:1406
3962
#, c-format
3963
msgid "invalid shallow line: %s"
3964
msgstr "无效的 shallow 信息：%s"
3965
3955
-#: fetch-pack.c:381 fetch-pack.c:1403
3966
+#: fetch-pack.c:384 fetch-pack.c:1412
3967
#, c-format
3968
msgid "invalid unshallow line: %s"
3969
msgstr "无效的 unshallow 信息：%s"
3970
3960
-#: fetch-pack.c:383 fetch-pack.c:1405
3971
+#: fetch-pack.c:386 fetch-pack.c:1414
3972
#, c-format
3973
msgid "object not found: %s"
3974
msgstr "对象未找到：%s"
3975
3965
-#: fetch-pack.c:386 fetch-pack.c:1408
3976
+#: fetch-pack.c:389 fetch-pack.c:1417
3977
#, c-format
3978
msgid "error in object: %s"
3979
msgstr "对象中出错：%s"
3980
3970
-#: fetch-pack.c:388 fetch-pack.c:1410
3981
+#: fetch-pack.c:391 fetch-pack.c:1419
3982
#, c-format
3983
msgid "no shallow found: %s"
3984
msgstr "未发现 shallow：%s"
3985
3975
-#: fetch-pack.c:391 fetch-pack.c:1414
3986
+#: fetch-pack.c:394 fetch-pack.c:1423
3987
#, c-format
3988
msgid "expected shallow/unshallow, got %s"
3989
msgstr "应为 shallow/unshallow，却得到 %s"
3990
3980
-#: fetch-pack.c:431
3991
+#: fetch-pack.c:434
3992
#, c-format
3993
msgid "got %s %d %s"
3994
msgstr "得到 %s %d %s"
3995
3985
-#: fetch-pack.c:448
3996
+#: fetch-pack.c:451
3997
#, c-format
3998
msgid "invalid commit %s"
3999
msgstr "无效提交 %s"
4000
3990
-#: fetch-pack.c:479
4001
+#: fetch-pack.c:482
4002
msgid "giving up"
4003
msgstr "放弃"
4004
3994
-#: fetch-pack.c:492 progress.c:339
4005
+#: fetch-pack.c:495 progress.c:339
4006
msgid "done"
4007
msgstr "完成"
4008
3998
-#: fetch-pack.c:504
4009
+#: fetch-pack.c:507
4010
#, c-format
4011
msgid "got %s (%d) %s"
4012
msgstr "得到 %s (%d) %s"
4013
4003
-#: fetch-pack.c:540
4014
+#: fetch-pack.c:543
4015
#, c-format
4016
msgid "Marking %s as complete"
4017
msgstr "标记 %s 为完成"
4018
4008
-#: fetch-pack.c:755
4019
+#: fetch-pack.c:758
4020
#, c-format
4021
msgid "already have %s (%s)"
4022
msgstr "已经有 %s（%s）"
4023
4013
-#: fetch-pack.c:824
4024
+#: fetch-pack.c:827
4025
msgid "fetch-pack: unable to fork off sideband demultiplexer"
4026
msgstr "fetch-pack：无法派生 sideband 多路输出"
4027
4017
-#: fetch-pack.c:832
4028
+#: fetch-pack.c:835
4029
msgid "protocol error: bad pack header"
4030
msgstr "协议错误：坏的包头"
4031
4021
-#: fetch-pack.c:916
4032
+#: fetch-pack.c:919
4033
#, c-format
4034
msgid "fetch-pack: unable to fork off %s"
4035
msgstr "fetch-pack：无法派生进程 %s"
4036
4026
-#: fetch-pack.c:933
4037
+#: fetch-pack.c:937
4038
#, c-format
4039
msgid "%s failed"
4040
msgstr "%s 失败"
4041
4031
-#: fetch-pack.c:935
4042
+#: fetch-pack.c:939
4043
msgid "error in sideband demultiplexer"
4044
msgstr "sideband 多路输出出错"
4045
4035
-#: fetch-pack.c:978
4046
+#: fetch-pack.c:982
4047
#, c-format
4048
msgid "Server version is %.*s"
4049
msgstr "服务器版本 %.*s"
4050
4040
-#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998
4041
-#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014
4042
-#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030
4043
-#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052
4051
+#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
4052
+#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
4053
+#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
4054
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
4055
#, c-format
4056
msgid "Server supports %s"
4057
msgstr "服务器支持 %s"
4058
4048
-#: fetch-pack.c:985
4059
+#: fetch-pack.c:992
4060
msgid "Server does not support shallow clients"
4061
msgstr "服务器不支持 shalllow 客户端"
4062
4052
-#: fetch-pack.c:1045
4063
+#: fetch-pack.c:1052
4064
msgid "Server does not support --shallow-since"
4065
msgstr "服务器不支持 --shallow-since"
4066
4056
-#: fetch-pack.c:1050
4067
+#: fetch-pack.c:1057
4068
msgid "Server does not support --shallow-exclude"
4069
msgstr "服务器不支持 --shallow-exclude"
4070
4060
-#: fetch-pack.c:1054
4071
+#: fetch-pack.c:1061
4072
msgid "Server does not support --deepen"
4073
msgstr "服务器不支持 --deepen"
4074
4064
-#: fetch-pack.c:1056
4075
+#: fetch-pack.c:1063
4076
msgid "Server does not support this repository's object format"
4077
msgstr "服务器不支持这个仓库的对象格式"
4078
4068
-#: fetch-pack.c:1069
4079
+#: fetch-pack.c:1076
4080
msgid "no common commits"
4081
msgstr "没有共同的提交"
4082
4072
-#: fetch-pack.c:1081 fetch-pack.c:1619
4083
+#: fetch-pack.c:1088 fetch-pack.c:1628
4084
msgid "git fetch-pack: fetch failed."
4085
msgstr "git fetch-pack：获取失败。"
4086
4076
-#: fetch-pack.c:1205
4087
+#: fetch-pack.c:1214
4088
#, c-format
4089
msgid "mismatched algorithms: client %s; server %s"
4090
msgstr "不匹配的算法：客户端 %s，服务端 %s"
4091
4081
-#: fetch-pack.c:1209
4092
+#: fetch-pack.c:1218
4093
#, c-format
4094
msgid "the server does not support algorithm '%s'"
4095
msgstr "服务器不支持算法 '%s'"
4096
4086
-#: fetch-pack.c:1229
4097
+#: fetch-pack.c:1238
4098
msgid "Server does not support shallow requests"
4099
msgstr "服务器不支持 shalllow 请求"
4100
4090
-#: fetch-pack.c:1236
4101
+#: fetch-pack.c:1245
4102
msgid "Server supports filter"
4103
msgstr "服务器支持 filter"
4104
4094
-#: fetch-pack.c:1275
4105
+#: fetch-pack.c:1284
4106
msgid "unable to write request to remote"
4107
msgstr "无法将请求写到远程"
4108
4098
-#: fetch-pack.c:1293
4109
+#: fetch-pack.c:1302
4110
#, c-format
4111
msgid "error reading section header '%s'"
4112
msgstr "读取节标题 '%s' 出错"
4113
4103
-#: fetch-pack.c:1299
4114
+#: fetch-pack.c:1308
4115
#, c-format
4116
msgid "expected '%s', received '%s'"
4117
msgstr "预期 '%s'，得到 '%s'"
4118
4108
-#: fetch-pack.c:1360
4119
+#: fetch-pack.c:1369
4120
#, c-format
4121
msgid "unexpected acknowledgment line: '%s'"
4122
msgstr "意外的确认行：'%s'"
4123
4113
-#: fetch-pack.c:1365
4124
+#: fetch-pack.c:1374
4125
#, c-format
4126
msgid "error processing acks: %d"
4127
msgstr "处理 ack 出错：%d"
4128
4118
-#: fetch-pack.c:1375
4129
+#: fetch-pack.c:1384
4130
msgid "expected packfile to be sent after 'ready'"
4131
msgstr "预期在 'ready' 之后发送 packfile"
4132
4122
-#: fetch-pack.c:1377
4133
+#: fetch-pack.c:1386
4134
msgid "expected no other sections to be sent after no 'ready'"
4135
msgstr "在没有 'ready' 不应该发送其它小节"
4136
4126
-#: fetch-pack.c:1419
4137
+#: fetch-pack.c:1428
4138
#, c-format
4139
msgid "error processing shallow info: %d"
4140
msgstr "处理浅克隆信息出错：%d"
4141
4131
-#: fetch-pack.c:1466
4142
+#: fetch-pack.c:1475
4143
#, c-format
4144
msgid "expected wanted-ref, got '%s'"
4145
msgstr "预期 wanted-ref，得到 '%s'"
4146
4136
-#: fetch-pack.c:1471
4147
+#: fetch-pack.c:1480
4148
#, c-format
4149
msgid "unexpected wanted-ref: '%s'"
4150
msgstr "意外的 wanted-ref：'%s'"
4151
4141
-#: fetch-pack.c:1476
4152
+#: fetch-pack.c:1485
4153
#, c-format
4154
msgid "error processing wanted refs: %d"
4155
msgstr "处理要获取的引用出错：%d"
4156
4146
-#: fetch-pack.c:1506
4157
+#: fetch-pack.c:1515
4158
msgid "git fetch-pack: expected response end packet"
4159
msgstr "git fetch-pack：预期响应结束包"
4160
4150
-#: fetch-pack.c:1887
4161
+#: fetch-pack.c:1897
4162
msgid "no matching remote head"
4163
msgstr "没有匹配的远程分支"
4164
4154
-#: fetch-pack.c:1910 builtin/clone.c:692
4165
+#: fetch-pack.c:1920 builtin/clone.c:693
4166
msgid "remote did not send all necessary objects"
4167
msgstr "远程没有发送所有必需的对象"
4168
4158
-#: fetch-pack.c:1937
4169
+#: fetch-pack.c:1947
4170
#, c-format
4171
msgid "no such remote ref %s"
4172
msgstr "没有这样的远程引用 %s"
4173
4163
-#: fetch-pack.c:1940
4174
+#: fetch-pack.c:1950
4175
#, c-format
4176
msgid "Server does not allow request for unadvertised object %s"
4177
msgstr "服务器不允许请求未公开的对象 %s"
@@ -4183,7 +4194,7 @@ msgstr "gpg 数据签名失败"
4194
msgid "ignore invalid color '%.*s' in log.graphColors"
4195
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
4196
4186
-#: grep.c:668
4197
+#: grep.c:640
4198
msgid ""
4199
"given pattern contains NULL byte (via -f <file>). This is only supported "
4200
"with -P under PCRE v2"
@@ -4191,18 +4202,18 @@ msgstr ""
4202
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
4203
"功能"
4204
4194
-#: grep.c:2128
4205
+#: grep.c:2100
4206
#, c-format
4207
msgid "'%s': unable to read %s"
4208
msgstr "'%s'：无法读取 %s"
4209
4199
-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
4210
+#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
4211
#: builtin/rm.c:135
4212
#, c-format
4213
msgid "failed to stat '%s'"
4214
msgstr "对 '%s' 调用 stat 失败"
4215
4205
-#: grep.c:2156
4216
+#: grep.c:2128
4217
#, c-format
4218
msgid "'%s': short read"
4219
msgstr "'%s'：读取不完整"
@@ -4293,7 +4304,7 @@ msgstr "外部命令"
4304
msgid "Command aliases"
4305
msgstr "命令别名"
4306
4296
-#: help.c:513
4307
+#: help.c:527
4308
#, c-format
4309
msgid ""
4310
"'%s' appears to be a git command, but we were not\n"
@@ -4302,31 +4313,31 @@ msgstr ""
4313
"'%s' 像是一个 git 命令，但却无法运行。\n"
4314
"可能是 git-%s 受损？"
4315
4305
-#: help.c:572
4316
+#: help.c:543 help.c:631
4317
+#, c-format
4318
+msgid "git: '%s' is not a git command. See 'git --help'."
4319
+msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
4320
+
4321
+#: help.c:591
4322
msgid "Uh oh. Your system reports no Git commands at all."
4323
msgstr "唉呀，您的系统中未发现 Git 命令。"
4324
4309
-#: help.c:594
4325
+#: help.c:613
4326
#, c-format
4327
msgid "WARNING: You called a Git command named '%s', which does not exist."
4328
msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
4329
4314
-#: help.c:599
4330
+#: help.c:618
4331
#, c-format
4332
msgid "Continuing under the assumption that you meant '%s'."
4333
msgstr "假定你想要的是 '%s' 并继续。"
4334
4319
-#: help.c:604
4335
+#: help.c:623
4336
#, c-format
4337
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4338
msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
4339
4324
-#: help.c:612
4325
-#, c-format
4326
-msgid "git: '%s' is not a git command. See 'git --help'."
4327
-msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
4328
-
4329
-#: help.c:616
4340
+#: help.c:635
4341
msgid ""
4342
"\n"
4343
"The most similar command is"
@@ -4340,16 +4351,16 @@ msgstr[1] ""
4351
"\n"
4352
"最相似的命令是"
4353
4343
-#: help.c:656
4354
+#: help.c:675
4355
msgid "git version [<options>]"
4356
msgstr "git version [<选项>]"
4357
4347
-#: help.c:711
4358
+#: help.c:730
4359
#, c-format
4360
msgid "%s: %s - %s"
4361
msgstr "%s：%s - %s"
4362
4352
-#: help.c:715
4363
+#: help.c:734
4364
msgid ""
4365
"\n"
4366
"Did you mean this?"
@@ -4511,6 +4522,20 @@ msgstr "不能创建 '%s.lock'：%s"
4522
msgid "expected flush after ls-refs arguments"
4523
msgstr "在 ls-refs 参数后应该有一个 flush 包"
4524
4525
+#: merge-ort-wrappers.c:13 merge-recursive.c:3672
4526
+#, c-format
4527
+msgid ""
4528
+"Your local changes to the following files would be overwritten by merge:\n"
4529
+" %s"
4530
+msgstr ""
4531
+"您对下列文件的本地修改将被合并操作覆盖：\n"
4532
+" %s"
4533
+
4534
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
4535
+#, c-format
4536
+msgid "Already up to date!"
4537
+msgstr "已经是最新的！"
4538
+
4539
#: merge-recursive.c:356
4540
msgid "(bad commit)\n"
4541
msgstr "（坏提交）\n"
@@ -4889,10 +4914,6 @@ msgstr "添加 %s"
4914
msgid "CONFLICT (add/add): Merge conflict in %s"
4915
msgstr "冲突（add/add）：合并冲突于 %s"
4916
4892
-#: merge-recursive.c:3436
4893
-msgid "Already up to date!"
4894
-msgstr "已经是最新的！"
4895
-
4917
#: merge-recursive.c:3445
4918
#, c-format
4919
msgid "merging of trees %s and %s failed"
@@ -4913,21 +4934,12 @@ msgstr[1] "发现 %u 个共同祖先："
4934
msgid "merge returned no commit"
4935
msgstr "合并未返回提交"
4936
4916
-#: merge-recursive.c:3672
4917
-#, c-format
4918
-msgid ""
4919
-"Your local changes to the following files would be overwritten by merge:\n"
4920
-" %s"
4921
-msgstr ""
4922
-"您对下列文件的本地修改将被合并操作覆盖：\n"
4923
-" %s"
4924
-
4937
#: merge-recursive.c:3769
4938
#, c-format
4939
msgid "Could not parse object '%s'"
4940
msgstr "不能解析对象 '%s'"
4941
4930
-#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
4942
+#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
4943
msgid "Unable to write index."
4944
msgstr "不能写入索引。"
4945
@@ -4935,174 +4947,170 @@ msgstr "不能写入索引。"
4947
msgid "failed to read the cache"
4948
msgstr "读取缓存失败"
4949
4938
-#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930
4939
-#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816
4950
+#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
4951
+#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
4952
#: builtin/stash.c:265
4953
msgid "unable to write new index file"
4954
msgstr "无法写新的索引文件"
4955
4944
-#: midx.c:79
4956
+#: midx.c:80
4957
#, c-format
4958
msgid "multi-pack-index file %s is too small"
4959
msgstr "多包索引文件 %s 太小"
4960
4949
-#: midx.c:95
4961
+#: midx.c:96
4962
#, c-format
4963
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
4964
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
4965
4954
-#: midx.c:100
4966
+#: midx.c:101
4967
#, c-format
4968
msgid "multi-pack-index version %d not recognized"
4969
msgstr "multi-pack-index 版本 %d 不能被识别"
4970
4959
-#: midx.c:105
4971
+#: midx.c:106
4972
#, c-format
4973
msgid "multi-pack-index hash version %u does not match version %u"
4974
msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
4975
4964
-#: midx.c:122
4976
+#: midx.c:123
4977
msgid "invalid chunk offset (too large)"
4978
msgstr "无效的块偏移（太大）"
4979
4968
-#: midx.c:146
4980
+#: midx.c:147
4981
msgid "terminating multi-pack-index chunk id appears earlier than expected"
4982
msgstr "终止多包索引块 id 出现时间早于预期"
4983
4972
-#: midx.c:159
4984
+#: midx.c:160
4985
msgid "multi-pack-index missing required pack-name chunk"
4986
msgstr "多包索引缺少必需的包名块"
4987
4976
-#: midx.c:161
4988
+#: midx.c:162
4989
msgid "multi-pack-index missing required OID fanout chunk"
4990
msgstr "多包索引缺少必需的对象 ID 扇出块"
4991
4980
-#: midx.c:163
4992
+#: midx.c:164
4993
msgid "multi-pack-index missing required OID lookup chunk"
4994
msgstr "多包索引缺少必需的对象 ID 查询块"
4995
4984
-#: midx.c:165
4996
+#: midx.c:166
4997
msgid "multi-pack-index missing required object offsets chunk"
4998
msgstr "多包索引缺少必需的对象偏移块"
4999
4988
-#: midx.c:179
5000
+#: midx.c:180
5001
#, c-format
5002
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
5003
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
5004
4993
-#: midx.c:222
5005
+#: midx.c:223
5006
#, c-format
5007
msgid "bad pack-int-id: %u (%u total packs)"
5008
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
5009
4998
-#: midx.c:272
5010
+#: midx.c:273
5011
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
5012
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
5013
5002
-#: midx.c:300
5003
-msgid "error preparing packfile from multi-pack-index"
5004
-msgstr "从多包索引准备 packfile 出错"
5005
-
5006
-#: midx.c:485
5014
+#: midx.c:480
5015
#, c-format
5016
msgid "failed to add packfile '%s'"
5017
msgstr "添加包文件 '%s' 失败"
5018
5011
-#: midx.c:491
5019
+#: midx.c:486
5020
#, c-format
5021
msgid "failed to open pack-index '%s'"
5022
msgstr "打开包索引 '%s' 失败"
5023
5016
-#: midx.c:551
5024
+#: midx.c:546
5025
#, c-format
5026
msgid "failed to locate object %d in packfile"
5027
msgstr "在包文件中定位对象 %d 失败"
5028
5021
-#: midx.c:853
5029
+#: midx.c:846
5030
msgid "Adding packfiles to multi-pack-index"
5031
msgstr "添加包文件到多包索引"
5032
5025
-#: midx.c:886
5033
+#: midx.c:879
5034
#, c-format
5035
msgid "did not see pack-file %s to drop"
5036
msgstr "没有看到要丢弃的包文件 %s"
5037
5030
-#: midx.c:938
5038
+#: midx.c:931
5039
msgid "no pack files to index."
5040
msgstr "没有要索引的包文件。"
5041
5034
-#: midx.c:990
5042
+#: midx.c:982
5043
msgid "Writing chunks to multi-pack-index"
5044
msgstr "写入块到多包索引"
5045
5038
-#: midx.c:1068
5046
+#: midx.c:1060
5047
#, c-format
5048
msgid "failed to clear multi-pack-index at %s"
5049
msgstr "清理位于 %s 的多包索引失败"
5050
5043
-#: midx.c:1124
5051
+#: midx.c:1116
5052
msgid "multi-pack-index file exists, but failed to parse"
5053
msgstr "多包索引文件存在，但无法解析"
5054
5047
-#: midx.c:1132
5055
+#: midx.c:1124
5056
msgid "Looking for referenced packfiles"
5057
msgstr "正在查找引用的包文件"
5058
5051
-#: midx.c:1147
5059
+#: midx.c:1139
5060
#, c-format
5061
msgid ""
5062
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5063
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
5064
5057
-#: midx.c:1152
5065
+#: midx.c:1144
5066
msgid "the midx contains no oid"
5067
msgstr "midx 不包含 oid"
5068
5061
-#: midx.c:1161
5069
+#: midx.c:1153
5070
msgid "Verifying OID order in multi-pack-index"
5071
msgstr "校验多包索引中的 OID 顺序"
5072
5065
-#: midx.c:1170
5073
+#: midx.c:1162
5074
#, c-format
5075
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
5076
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
5077
5070
-#: midx.c:1190
5078
+#: midx.c:1182
5079
msgid "Sorting objects by packfile"
5080
msgstr "通过包文件为对象排序"
5081
5074
-#: midx.c:1197
5082
+#: midx.c:1189
5083
msgid "Verifying object offsets"
5084
msgstr "校验对象偏移"
5085
5078
-#: midx.c:1213
5086
+#: midx.c:1205
5087
#, c-format
5088
msgid "failed to load pack entry for oid[%d] = %s"
5089
msgstr "为 oid[%d] = %s 加载包条目失败"
5090
5083
-#: midx.c:1219
5091
+#: midx.c:1211
5092
#, c-format
5093
msgid "failed to load pack-index for packfile %s"
5094
msgstr "为包文件 %s 加载包索引失败"
5095
5088
-#: midx.c:1228
5096
+#: midx.c:1220
5097
#, c-format
5098
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
5099
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
5100
5093
-#: midx.c:1253
5101
+#: midx.c:1245
5102
msgid "Counting referenced objects"
5103
msgstr "正在对引用对象计数"
5104
5097
-#: midx.c:1263
5105
+#: midx.c:1255
5106
msgid "Finding and deleting unreferenced packfiles"
5107
msgstr "正在查找和删除未引用的包文件"
5108
5101
-#: midx.c:1454
5109
+#: midx.c:1446
5110
msgid "could not start pack-objects"
5111
msgstr "不能开始 pack-objects"
5112
5105
-#: midx.c:1474
5113
+#: midx.c:1466
5114
msgid "could not finish pack-objects"
5115
msgstr "不能结束 pack-objects"
5116
@@ -5190,16 +5198,16 @@ msgstr "哈希值与 %s 不匹配"
5198
msgid "unable to get size of %s"
5199
msgstr "无法得到 %s 的大小"
5200
5193
-#: packfile.c:630
5201
+#: packfile.c:615
5202
msgid "offset before end of packfile (broken .idx?)"
5203
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
5204
5197
-#: packfile.c:1922
5205
+#: packfile.c:1907
5206
#, c-format
5207
msgid "offset before start of pack index for %s (corrupt index?)"
5208
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
5209
5202
-#: packfile.c:1926
5210
+#: packfile.c:1911
5211
#, c-format
5212
msgid "offset beyond end of pack index for %s (truncated index?)"
5213
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
@@ -5442,7 +5450,7 @@ msgstr "协议错误：错误的行长度字符串：%.4s"
5450
msgid "protocol error: bad line length %d"
5451
msgstr "协议错误：错误的行长度 %d"
5452
5445
-#: pkt-line.c:373 sideband.c:150
5453
+#: pkt-line.c:373 sideband.c:165
5454
#, c-format
5455
msgid "remote error: %s"
5456
msgstr "远程错误：%s"
@@ -5489,7 +5497,7 @@ msgstr "不能启动 `log`"
5497
msgid "could not read `log` output"
5498
msgstr "不能读取 `log` 的输出"
5499
5492
-#: range-diff.c:98 sequencer.c:5283
5500
+#: range-diff.c:98 sequencer.c:5310
5501
#, c-format
5502
msgid "could not parse commit '%s'"
5503
msgstr "不能解析提交 '%s'"
@@ -5506,11 +5514,11 @@ msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
5514
msgid "could not parse git header '%.*s'"
5515
msgstr "无法解析 git 头 '%.*s'"
5516
5509
-#: range-diff.c:301
5517
+#: range-diff.c:299
5518
msgid "failed to generate diff"
5519
msgstr "生成 diff 失败"
5520
5513
-#: range-diff.c:534 range-diff.c:536
5521
+#: range-diff.c:532 range-diff.c:534
5522
#, c-format
5523
msgid "could not parse log for '%s'"
5524
msgstr "不能解析 '%s' 的日志"
@@ -5627,8 +5635,8 @@ msgstr "'%s' 的未排序暂存条目"
5635
5636
#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111
5637
#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181
5630
-#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991
5631
-#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
5638
+#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991
5639
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507
5640
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
5641
#: builtin/submodule--helper.c:332
5642
msgid "index file corrupt"
@@ -5684,12 +5692,12 @@ msgstr "无法刷新共享索引 '%s'"
5692
msgid "broken index, expect %s in %s, got %s"
5693
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
5694
5687
-#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
5695
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
5696
#, c-format
5697
msgid "could not close '%s'"
5698
msgstr "不能关闭 '%s'"
5699
5692
-#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
5700
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
5701
#, c-format
5702
msgid "could not stat '%s'"
5703
msgstr "不能对 '%s' 调用 stat"
@@ -5816,14 +5824,14 @@ msgstr ""
5824
"然而，如果您删除全部内容，变基操作将会终止。\n"
5825
"\n"
5826
5819
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571
5820
-#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264
5827
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
5828
+#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
5829
#, c-format
5830
msgid "could not write '%s'"
5831
msgstr "不能写入 '%s'"
5832
5825
-#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
5826
-#: builtin/rebase.c:246
5833
+#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
5834
+#: builtin/rebase.c:252
5835
#, c-format
5836
msgid "could not write '%s'."
5837
msgstr "不能写入 '%s'。"
@@ -5853,9 +5861,9 @@ msgstr ""
5861
"可选值有：ignore、warn、error。\n"
5862
"\n"
5863
5856
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361
5857
-#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233
5858
-#: builtin/rebase.c:258
5864
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
5865
+#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
5866
+#: builtin/rebase.c:264
5867
#, c-format
5868
msgid "could not read '%s'."
5869
msgstr "不能读取 '%s'。"
@@ -6050,61 +6058,61 @@ msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
6058
msgid "malformed format string %s"
6059
msgstr "错误的格式化字符串 %s"
6060
6053
-#: ref-filter.c:1541
6061
+#: ref-filter.c:1549
6062
#, c-format
6063
msgid "no branch, rebasing %s"
6064
msgstr "非分支，正变基 %s"
6065
6058
-#: ref-filter.c:1544
6066
+#: ref-filter.c:1552
6067
#, c-format
6068
msgid "no branch, rebasing detached HEAD %s"
6069
msgstr "非分支，正变基分离头指针 %s"
6070
6063
-#: ref-filter.c:1547
6071
+#: ref-filter.c:1555
6072
#, c-format
6073
msgid "no branch, bisect started on %s"
6074
msgstr "非分支，二分查找开始于 %s"
6075
6068
-#: ref-filter.c:1557
6076
+#: ref-filter.c:1565
6077
msgid "no branch"
6078
msgstr "非分支"
6079
6072
-#: ref-filter.c:1591 ref-filter.c:1800
6080
+#: ref-filter.c:1599 ref-filter.c:1808
6081
#, c-format
6082
msgid "missing object %s for %s"
6083
msgstr "缺失 %2$s 的对象 %1$s"
6084
6077
-#: ref-filter.c:1601
6085
+#: ref-filter.c:1609
6086
#, c-format
6087
msgid "parse_object_buffer failed on %s for %s"
6088
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
6089
6082
-#: ref-filter.c:2054
6090
+#: ref-filter.c:2062
6091
#, c-format
6092
msgid "malformed object at '%s'"
6093
msgstr "格式错误的对象 '%s'"
6094
6087
-#: ref-filter.c:2143
6095
+#: ref-filter.c:2151
6096
#, c-format
6097
msgid "ignoring ref with broken name %s"
6098
msgstr "忽略带有错误名称 %s 的引用"
6099
6092
-#: ref-filter.c:2148 refs.c:657
6100
+#: ref-filter.c:2156 refs.c:676
6101
#, c-format
6102
msgid "ignoring broken ref %s"
6103
msgstr "忽略损坏的引用 %s"
6104
6097
-#: ref-filter.c:2464
6105
+#: ref-filter.c:2472
6106
#, c-format
6107
msgid "format: %%(end) atom missing"
6108
msgstr "格式：缺少 %%(end) 元素"
6109
6102
-#: ref-filter.c:2563
6110
+#: ref-filter.c:2571
6111
#, c-format
6112
msgid "malformed object name %s"
6113
msgstr "格式错误的对象名 %s"
6114
6107
-#: ref-filter.c:2568
6115
+#: ref-filter.c:2576
6116
#, c-format
6117
msgid "option `%s' must point to a commit"
6118
msgstr "选项 `%s' 必须指向一个提交"
@@ -6114,65 +6122,89 @@ msgstr "选项 `%s' 必须指向一个提交"
6122
msgid "%s does not point to a valid object!"
6123
msgstr "%s 没有指向一个有效的对象！"
6124
6117
-#: refs.c:572
6125
+#: refs.c:566
6126
+#, c-format
6127
+msgid ""
6128
+"Using '%s' as the name for the initial branch. This default branch name\n"
6129
+"is subject to change. To configure the initial branch name to use in all\n"
6130
+"of your new repositories, which will suppress this warning, call:\n"
6131
+"\n"
6132
+"\tgit config --global init.defaultBranch <name>\n"
6133
+"\n"
6134
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
6135
+"'development'. The just-created branch can be renamed via this command:\n"
6136
+"\n"
6137
+"\tgit branch -m <name>\n"
6138
+msgstr ""
6139
+"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
6140
+"配置使用初始分支名，并消除这条警告，请执行：\n"
6141
+"\n"
6142
+"\tgit config --global init.defaultBranch <名称>\n"
6143
+"\n"
6144
+"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
6145
+"可以通过以下命令重命名刚创建的分支：\n"
6146
+"\n"
6147
+"\tgit branch -m <name>\n"
6148
+
6149
+#: refs.c:588
6150
#, c-format
6151
msgid "could not retrieve `%s`"
6152
msgstr "无法获取 `%s`"
6153
6122
-#: refs.c:579
6154
+#: refs.c:598
6155
#, c-format
6156
msgid "invalid branch name: %s = %s"
6157
msgstr "无效的分支名：%s = %s"
6158
6127
-#: refs.c:655
6159
+#: refs.c:674
6160
#, c-format
6161
msgid "ignoring dangling symref %s"
6162
msgstr "忽略悬空符号引用 %s"
6163
6132
-#: refs.c:892
6164
+#: refs.c:911
6165
#, c-format
6166
msgid "log for ref %s has gap after %s"
6167
msgstr "引用 %s 的日志在 %s 之后有缺口"
6168
6137
-#: refs.c:898
6169
+#: refs.c:917
6170
#, c-format
6171
msgid "log for ref %s unexpectedly ended on %s"
6172
msgstr "引用 %s 的日志意外终止于 %s "
6173
6142
-#: refs.c:957
6174
+#: refs.c:976
6175
#, c-format
6176
msgid "log for %s is empty"
6177
msgstr "%s 的日志为空"
6178
6147
-#: refs.c:1049
6179
+#: refs.c:1068
6180
#, c-format
6181
msgid "refusing to update ref with bad name '%s'"
6182
msgstr "拒绝更新有错误名称 '%s' 的引用"
6183
6152
-#: refs.c:1120
6184
+#: refs.c:1139
6185
#, c-format
6186
msgid "update_ref failed for ref '%s': %s"
6187
msgstr "对引用 '%s' 执行 update_ref 失败：%s"
6188
6157
-#: refs.c:1944
6189
+#: refs.c:1963
6190
#, c-format
6191
msgid "multiple updates for ref '%s' not allowed"
6192
msgstr "不允许对引用 '%s' 多次更新"
6193
6162
-#: refs.c:2024
6194
+#: refs.c:2043
6195
msgid "ref updates forbidden inside quarantine environment"
6196
msgstr "在隔离环境中禁止更新引用"
6197
6166
-#: refs.c:2035
6198
+#: refs.c:2054
6199
msgid "ref updates aborted by hook"
6200
msgstr "引用更新被钩子中止"
6201
6170
-#: refs.c:2135 refs.c:2165
6202
+#: refs.c:2154 refs.c:2184
6203
#, c-format
6204
msgid "'%s' exists; cannot create '%s'"
6205
msgstr "'%s' 已存在，无法创建 '%s'"
6206
6175
-#: refs.c:2141 refs.c:2176
6207
+#: refs.c:2160 refs.c:2195
6208
#, c-format
6209
msgid "cannot process '%s' and '%s' at the same time"
6210
msgstr "无法同时处理 '%s' 和 '%s'"
@@ -6193,7 +6225,7 @@ msgstr "无法删除引用 %s：%s"
6225
msgid "could not delete references: %s"
6226
msgstr "无法删除引用：%s"
6227
6196
-#: refspec.c:167
6228
+#: refspec.c:170
6229
#, c-format
6230
msgid "invalid refspec '%s'"
6231
msgstr "无效的引用表达式：'%s'"
@@ -6332,94 +6364,94 @@ msgstr "目标引用表达式 %s 匹配超过一个"
6364
msgid "dst ref %s receives from more than one src"
6365
msgstr "目标引用 %s 接收超过一个源"
6366
6335
-#: remote.c:1703 remote.c:1804
6367
+#: remote.c:1714 remote.c:1815
6368
msgid "HEAD does not point to a branch"
6369
msgstr "HEAD 没有指向一个分支"
6370
6339
-#: remote.c:1712
6371
+#: remote.c:1723
6372
#, c-format
6373
msgid "no such branch: '%s'"
6374
msgstr "没有此分支：'%s'"
6375
6344
-#: remote.c:1715
6376
+#: remote.c:1726
6377
#, c-format
6378
msgid "no upstream configured for branch '%s'"
6379
msgstr "尚未给分支 '%s' 设置上游"
6380
6349
-#: remote.c:1721
6381
+#: remote.c:1732
6382
#, c-format
6383
msgid "upstream branch '%s' not stored as a remote-tracking branch"
6384
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
6385
6354
-#: remote.c:1736
6386
+#: remote.c:1747
6387
#, c-format
6388
msgid "push destination '%s' on remote '%s' has no local tracking branch"
6389
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
6390
6359
-#: remote.c:1748
6391
+#: remote.c:1759
6392
#, c-format
6393
msgid "branch '%s' has no remote for pushing"
6394
msgstr "分支 '%s' 没有设置要推送的远程服务器"
6395
6364
-#: remote.c:1758
6396
+#: remote.c:1769
6397
#, c-format
6398
msgid "push refspecs for '%s' do not include '%s'"
6399
msgstr "向 '%s' 推送引用规格未包含 '%s'"
6400
6369
-#: remote.c:1771
6401
+#: remote.c:1782
6402
msgid "push has no destination (push.default is 'nothing')"
6403
msgstr "推送无目标（push.default 是 'nothing'）"
6404
6373
-#: remote.c:1793
6405
+#: remote.c:1804
6406
msgid "cannot resolve 'simple' push to a single destination"
6407
msgstr "无法解析 'simple' 推送至一个单独的目标"
6408
6377
-#: remote.c:1922
6409
+#: remote.c:1933
6410
#, c-format
6411
msgid "couldn't find remote ref %s"
6412
msgstr "无法找到远程引用 %s"
6413
6382
-#: remote.c:1935
6414
+#: remote.c:1946
6415
#, c-format
6416
msgid "* Ignoring funny ref '%s' locally"
6417
msgstr "* 在本地忽略可笑的引用 '%s'"
6418
6387
-#: remote.c:2098
6419
+#: remote.c:2109
6420
#, c-format
6421
msgid "Your branch is based on '%s', but the upstream is gone.\n"
6422
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
6423
6392
-#: remote.c:2102
6424
+#: remote.c:2113
6425
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6426
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
6427
6396
-#: remote.c:2105
6428
+#: remote.c:2116
6429
#, c-format
6430
msgid "Your branch is up to date with '%s'.\n"
6431
msgstr "您的分支与上游分支 '%s' 一致。\n"
6432
6401
-#: remote.c:2109
6433
+#: remote.c:2120
6434
#, c-format
6435
msgid "Your branch and '%s' refer to different commits.\n"
6436
msgstr "您的分支和 '%s' 指向不同的提交。\n"
6437
6406
-#: remote.c:2112
6438
+#: remote.c:2123
6439
#, c-format
6440
msgid " (use \"%s\" for details)\n"
6441
msgstr " （使用 \"%s\" 查看详情）\n"
6442
6411
-#: remote.c:2116
6443
+#: remote.c:2127
6444
#, c-format
6445
msgid "Your branch is ahead of '%s' by %d commit.\n"
6446
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6447
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
6448
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
6449
6418
-#: remote.c:2122
6450
+#: remote.c:2133
6451
msgid " (use \"git push\" to publish your local commits)\n"
6452
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
6453
6422
-#: remote.c:2125
6454
+#: remote.c:2136
6455
#, c-format
6456
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6457
msgid_plural ""
@@ -6428,11 +6460,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
6460
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
6461
6462
# 译者：注意保持前导空格
6431
-#: remote.c:2133
6463
+#: remote.c:2144
6464
msgid " (use \"git pull\" to update your local branch)\n"
6465
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
6466
6435
-#: remote.c:2136
6467
+#: remote.c:2147
6468
#, c-format
6469
msgid ""
6470
"Your branch and '%s' have diverged,\n"
@@ -6448,11 +6480,11 @@ msgstr[1] ""
6480
"并且分别有 %d 和 %d 处不同的提交。\n"
6481
6482
# 译者：注意保持前导空格
6451
-#: remote.c:2146
6483
+#: remote.c:2157
6484
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6485
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
6486
6455
-#: remote.c:2337
6487
+#: remote.c:2349
6488
#, c-format
6489
msgid "cannot parse expected object name '%s'"
6490
msgstr "无法解析期望的对象名 '%s'"
@@ -6530,7 +6562,7 @@ msgstr "不能删除 stray '%s'"
6562
msgid "Recorded preimage for '%s'"
6563
msgstr "为 '%s' 记录 preimage"
6564
6533
-#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
6565
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
6566
#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
6567
#, c-format
6568
msgid "could not create directory '%s'"
@@ -6569,43 +6601,43 @@ msgstr "不能打开 rr-cache 目录"
6601
msgid "could not determine HEAD revision"
6602
msgstr "不能确定 HEAD 版本"
6603
6572
-#: reset.c:70 reset.c:76 sequencer.c:3426
6604
+#: reset.c:70 reset.c:76 sequencer.c:3460
6605
#, c-format
6606
msgid "failed to find tree of %s"
6607
msgstr "无法找到 %s 指向的树。"
6608
6577
-#: revision.c:2344
6609
+#: revision.c:2336
6610
msgid "--unpacked=<packfile> no longer supported"
6611
msgstr "不再支持 --unpacked=<packfile>"
6612
6581
-#: revision.c:2364
6613
+#: revision.c:2356
6614
#, c-format
6615
msgid "unknown value for --diff-merges: %s"
6616
msgstr "未知的 --diff-merges 取值：%s"
6617
6586
-#: revision.c:2702
6618
+#: revision.c:2694
6619
msgid "your current branch appears to be broken"
6620
msgstr "您的当前分支好像被损坏"
6621
6590
-#: revision.c:2705
6622
+#: revision.c:2697
6623
#, c-format
6624
msgid "your current branch '%s' does not have any commits yet"
6625
msgstr "您的当前分支 '%s' 尚无任何提交"
6626
6595
-#: revision.c:2915
6627
+#: revision.c:2907
6628
msgid "-L does not yet support diff formats besides -p and -s"
6629
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
6630
6599
-#: run-command.c:763
6631
+#: run-command.c:764
6632
msgid "open /dev/null failed"
6633
msgstr "不能打开 /dev/null"
6634
6603
-#: run-command.c:1270
6635
+#: run-command.c:1271
6636
#, c-format
6637
msgid "cannot create async thread: %s"
6638
msgstr "不能创建 async 线程：%s"
6639
6608
-#: run-command.c:1334
6640
+#: run-command.c:1335
6641
#, c-format
6642
msgid ""
6643
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6614,79 +6646,79 @@ msgstr ""
6646
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
6647
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
6648
6617
-#: send-pack.c:145
6649
+#: send-pack.c:146
6650
msgid "unexpected flush packet while reading remote unpack status"
6651
msgstr "读取远程解包状态时收到意外的 flush 包"
6652
6621
-#: send-pack.c:147
6653
+#: send-pack.c:148
6654
#, c-format
6655
msgid "unable to parse remote unpack status: %s"
6656
msgstr "不能解析远程解包状态：%s"
6657
6626
-#: send-pack.c:149
6658
+#: send-pack.c:150
6659
#, c-format
6660
msgid "remote unpack failed: %s"
6661
msgstr "远程解包失败：%s"
6662
6631
-#: send-pack.c:372
6663
+#: send-pack.c:374
6664
msgid "failed to sign the push certificate"
6665
msgstr "为推送证书签名失败"
6666
6635
-#: send-pack.c:460
6667
+#: send-pack.c:467
6668
msgid "the receiving end does not support this repository's hash algorithm"
6669
msgstr "接收端不支持这个仓库的哈希算法"
6670
6639
-#: send-pack.c:469
6671
+#: send-pack.c:476
6672
msgid "the receiving end does not support --signed push"
6673
msgstr "接收端不支持签名推送"
6674
6643
-#: send-pack.c:471
6675
+#: send-pack.c:478
6676
msgid ""
6677
"not sending a push certificate since the receiving end does not support --"
6678
"signed push"
6679
msgstr "未发送推送证书，因为接收端不支持签名推送"
6680
6649
-#: send-pack.c:483
6681
+#: send-pack.c:490
6682
msgid "the receiving end does not support --atomic push"
6683
msgstr "接收端不支持原子推送"
6684
6653
-#: send-pack.c:488
6685
+#: send-pack.c:495
6686
msgid "the receiving end does not support push options"
6687
msgstr "接收端不支持推送选项"
6688
6657
-#: sequencer.c:194
6689
+#: sequencer.c:195
6690
#, c-format
6691
msgid "invalid commit message cleanup mode '%s'"
6692
msgstr "无效的提交信息清理模式 '%s'"
6693
6662
-#: sequencer.c:308
6694
+#: sequencer.c:323
6695
#, c-format
6696
msgid "could not delete '%s'"
6697
msgstr "无法删除 '%s'"
6698
6667
-#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
6699
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
6700
#, c-format
6701
msgid "could not remove '%s'"
6702
msgstr "无法删除 '%s'"
6703
6672
-#: sequencer.c:339
6704
+#: sequencer.c:353
6705
msgid "revert"
6706
msgstr "还原"
6707
6676
-#: sequencer.c:341
6708
+#: sequencer.c:355
6709
msgid "cherry-pick"
6710
msgstr "拣选"
6711
6680
-#: sequencer.c:343
6712
+#: sequencer.c:357
6713
msgid "rebase"
6714
msgstr "变基"
6715
6684
-#: sequencer.c:345
6716
+#: sequencer.c:359
6717
#, c-format
6718
msgid "unknown action: %d"
6719
msgstr "未知动作：%d"
6720
6689
-#: sequencer.c:404
6721
+#: sequencer.c:418
6722
msgid ""
6723
"after resolving the conflicts, mark the corrected paths\n"
6724
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6694,7 +6726,7 @@ msgstr ""
6726
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
6727
"命令标记修正后的文件"
6728
6697
-#: sequencer.c:407
6729
+#: sequencer.c:421
6730
msgid ""
6731
"after resolving the conflicts, mark the corrected paths\n"
6732
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6703,43 +6735,43 @@ msgstr ""
6735
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
6736
"对修正后的文件做标记，然后用 'git commit' 提交"
6737
6706
-#: sequencer.c:420 sequencer.c:3028
6738
+#: sequencer.c:434 sequencer.c:3062
6739
#, c-format
6740
msgid "could not lock '%s'"
6741
msgstr "不能锁定 '%s'"
6742
6711
-#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
6712
-#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
6743
+#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
6744
+#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
6745
#, c-format
6746
msgid "could not write to '%s'"
6747
msgstr "不能写入 '%s'"
6748
6717
-#: sequencer.c:427
6749
+#: sequencer.c:441
6750
#, c-format
6751
msgid "could not write eol to '%s'"
6752
msgstr "不能将换行符写入 '%s'"
6753
6722
-#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
6723
-#: sequencer.c:3311
6754
+#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
6755
+#: sequencer.c:3345
6756
#, c-format
6757
msgid "failed to finalize '%s'"
6758
msgstr "无法完成 '%s'"
6759
6728
-#: sequencer.c:471
6760
+#: sequencer.c:485
6761
#, c-format
6762
msgid "your local changes would be overwritten by %s."
6763
msgstr "您的本地修改将被%s覆盖。"
6764
6733
-#: sequencer.c:475
6765
+#: sequencer.c:489
6766
msgid "commit your changes or stash them to proceed."
6767
msgstr "提交您的修改或贮藏后再继续。"
6768
6737
-#: sequencer.c:507
6769
+#: sequencer.c:521
6770
#, c-format
6771
msgid "%s: fast-forward"
6772
msgstr "%s：快进"
6773
6742
-#: sequencer.c:546 builtin/tag.c:566
6774
+#: sequencer.c:560 builtin/tag.c:566
6775
#, c-format
6776
msgid "Invalid cleanup mode %s"
6777
msgstr "无效的清理模式 %s"
@@ -6747,65 +6779,65 @@ msgstr "无效的清理模式 %s"
6779
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
6780
#. "rebase".
6781
#.
6750
-#: sequencer.c:640
6782
+#: sequencer.c:670
6783
#, c-format
6784
msgid "%s: Unable to write new index file"
6785
msgstr "%s：无法写入新索引文件"
6786
6755
-#: sequencer.c:657
6787
+#: sequencer.c:687
6788
msgid "unable to update cache tree"
6789
msgstr "不能更新缓存树"
6790
6759
-#: sequencer.c:671
6791
+#: sequencer.c:701
6792
msgid "could not resolve HEAD commit"
6793
msgstr "不能解析 HEAD 提交"
6794
6763
-#: sequencer.c:751
6795
+#: sequencer.c:781
6796
#, c-format
6797
msgid "no key present in '%.*s'"
6798
msgstr "在 '%.*s' 中没有 key"
6799
6768
-#: sequencer.c:762
6800
+#: sequencer.c:792
6801
#, c-format
6802
msgid "unable to dequote value of '%s'"
6803
msgstr "无法为 '%s' 的值去引号"
6804
6773
-#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724
6774
-#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902
6805
+#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
6806
+#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
6807
#, c-format
6808
msgid "could not open '%s' for reading"
6809
msgstr "无法打开 '%s' 进行读取"
6810
6779
-#: sequencer.c:809
6811
+#: sequencer.c:839
6812
msgid "'GIT_AUTHOR_NAME' already given"
6813
msgstr "已经给出 'GIT_AUTHOR_NAME'"
6814
6783
-#: sequencer.c:814
6815
+#: sequencer.c:844
6816
msgid "'GIT_AUTHOR_EMAIL' already given"
6817
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
6818
6787
-#: sequencer.c:819
6819
+#: sequencer.c:849
6820
msgid "'GIT_AUTHOR_DATE' already given"
6821
msgstr "已经给出 'GIT_AUTHOR_DATE'"
6822
6791
-#: sequencer.c:823
6823
+#: sequencer.c:853
6824
#, c-format
6825
msgid "unknown variable '%s'"
6826
msgstr "未知变量 '%s'"
6827
6796
-#: sequencer.c:828
6828
+#: sequencer.c:858
6829
msgid "missing 'GIT_AUTHOR_NAME'"
6830
msgstr "缺少 'GIT_AUTHOR_NAME'"
6831
6800
-#: sequencer.c:830
6832
+#: sequencer.c:860
6833
msgid "missing 'GIT_AUTHOR_EMAIL'"
6834
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6835
6804
-#: sequencer.c:832
6836
+#: sequencer.c:862
6837
msgid "missing 'GIT_AUTHOR_DATE'"
6838
msgstr "缺少 'GIT_AUTHOR_DATE'"
6839
6808
-#: sequencer.c:897
6840
+#: sequencer.c:927
6841
#, c-format
6842
msgid ""
6843
"you have staged changes in your working tree\n"
@@ -6834,11 +6866,11 @@ msgstr ""
6866
"\n"
6867
" git rebase --continue\n"
6868
6837
-#: sequencer.c:1178
6869
+#: sequencer.c:1208
6870
msgid "'prepare-commit-msg' hook failed"
6871
msgstr "'prepare-commit-msg' 钩子失败"
6872
6841
-#: sequencer.c:1184
6873
+#: sequencer.c:1214
6874
msgid ""
6875
"Your name and email address were configured automatically based\n"
6876
"on your username and hostname. Please check that they are accurate.\n"
@@ -6862,7 +6894,7 @@ msgstr ""
6894
"\n"
6895
" git commit --amend --reset-author\n"
6896
6865
-#: sequencer.c:1197
6897
+#: sequencer.c:1227
6898
msgid ""
6899
"Your name and email address were configured automatically based\n"
6900
"on your username and hostname. Please check that they are accurate.\n"
@@ -6885,339 +6917,339 @@ msgstr ""
6917
"\n"
6918
" git commit --amend --reset-author\n"
6919
6888
-#: sequencer.c:1239
6920
+#: sequencer.c:1269
6921
msgid "couldn't look up newly created commit"
6922
msgstr "无法找到新创建的提交"
6923
6892
-#: sequencer.c:1241
6924
+#: sequencer.c:1271
6925
msgid "could not parse newly created commit"
6926
msgstr "不能解析新创建的提交"
6927
6896
-#: sequencer.c:1287
6928
+#: sequencer.c:1317
6929
msgid "unable to resolve HEAD after creating commit"
6930
msgstr "创建提交后，不能解析 HEAD"
6931
6900
-#: sequencer.c:1289
6932
+#: sequencer.c:1319
6933
msgid "detached HEAD"
6934
msgstr "分离头指针"
6935
6936
# 译者：中文字符串拼接，可删除前导空格
6905
-#: sequencer.c:1293
6937
+#: sequencer.c:1323
6938
msgid " (root-commit)"
6939
msgstr "（根提交）"
6940
6909
-#: sequencer.c:1314
6941
+#: sequencer.c:1344
6942
msgid "could not parse HEAD"
6943
msgstr "不能解析 HEAD"
6944
6913
-#: sequencer.c:1316
6945
+#: sequencer.c:1346
6946
#, c-format
6947
msgid "HEAD %s is not a commit!"
6948
msgstr "HEAD %s 不是一个提交！"
6949
6918
-#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
6950
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
6951
msgid "could not parse HEAD commit"
6952
msgstr "不能解析 HEAD 提交"
6953
6922
-#: sequencer.c:1373 sequencer.c:2067
6954
+#: sequencer.c:1403 sequencer.c:2100
6955
msgid "unable to parse commit author"
6956
msgstr "不能解析提交作者"
6957
6926
-#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
6958
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
6959
msgid "git write-tree failed to write a tree"
6960
msgstr "git write-tree 无法写入树对象"
6961
6930
-#: sequencer.c:1417 sequencer.c:1535
6962
+#: sequencer.c:1447 sequencer.c:1565
6963
#, c-format
6964
msgid "unable to read commit message from '%s'"
6965
msgstr "不能从 '%s' 读取提交说明"
6966
6935
-#: sequencer.c:1446 sequencer.c:1478
6967
+#: sequencer.c:1476 sequencer.c:1508
6968
#, c-format
6969
msgid "invalid author identity '%s'"
6970
msgstr "无效的作者身份 '%s'"
6971
6940
-#: sequencer.c:1452
6972
+#: sequencer.c:1482
6973
msgid "corrupt author: missing date information"
6974
msgstr "损坏的作者：缺失日期信息"
6975
6944
-#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
6945
-#: builtin/merge.c:915
6976
+#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
6977
+#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
6978
msgid "failed to write commit object"
6979
msgstr "写提交对象失败"
6980
6949
-#: sequencer.c:1518 sequencer.c:4237
6981
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
6982
#, c-format
6983
msgid "could not update %s"
6984
msgstr "不能更新 %s"
6985
6954
-#: sequencer.c:1567
6986
+#: sequencer.c:1597
6987
#, c-format
6988
msgid "could not parse commit %s"
6989
msgstr "不能解析提交 %s"
6990
6959
-#: sequencer.c:1572
6991
+#: sequencer.c:1602
6992
#, c-format
6993
msgid "could not parse parent commit %s"
6994
msgstr "不能解析父提交 %s"
6995
6964
-#: sequencer.c:1655 sequencer.c:1766
6996
+#: sequencer.c:1685 sequencer.c:1796
6997
#, c-format
6998
msgid "unknown command: %d"
6999
msgstr "未知命令：%d"
7000
6969
-#: sequencer.c:1713 sequencer.c:1738
7001
+#: sequencer.c:1743 sequencer.c:1768
7002
#, c-format
7003
msgid "This is a combination of %d commits."
7004
msgstr "这是一个 %d 个提交的组合。"
7005
6974
-#: sequencer.c:1723
7006
+#: sequencer.c:1753
7007
msgid "need a HEAD to fixup"
7008
msgstr "需要一个 HEAD 来修复"
7009
6978
-#: sequencer.c:1725 sequencer.c:3338
7010
+#: sequencer.c:1755 sequencer.c:3372
7011
msgid "could not read HEAD"
7012
msgstr "不能读取 HEAD"
7013
6982
-#: sequencer.c:1727
7014
+#: sequencer.c:1757
7015
msgid "could not read HEAD's commit message"
7016
msgstr "不能读取 HEAD 的提交说明"
7017
6986
-#: sequencer.c:1733
7018
+#: sequencer.c:1763
7019
#, c-format
7020
msgid "cannot write '%s'"
7021
msgstr "不能写 '%s'"
7022
6991
-#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
7023
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
7024
msgid "This is the 1st commit message:"
7025
msgstr "这是第一个提交说明："
7026
6995
-#: sequencer.c:1748
7027
+#: sequencer.c:1778
7028
#, c-format
7029
msgid "could not read commit message of %s"
7030
msgstr "不能读取 %s 的提交说明"
7031
7000
-#: sequencer.c:1755
7032
+#: sequencer.c:1785
7033
#, c-format
7034
msgid "This is the commit message #%d:"
7035
msgstr "这是提交说明 #%d："
7036
7005
-#: sequencer.c:1761
7037
+#: sequencer.c:1791
7038
#, c-format
7039
msgid "The commit message #%d will be skipped:"
7040
msgstr "提交说明 #%d 将被跳过："
7041
7010
-#: sequencer.c:1849
7042
+#: sequencer.c:1879
7043
msgid "your index file is unmerged."
7044
msgstr "您的索引文件未完成合并。"
7045
7014
-#: sequencer.c:1856
7046
+#: sequencer.c:1886
7047
msgid "cannot fixup root commit"
7048
msgstr "不能修复根提交"
7049
7018
-#: sequencer.c:1875
7050
+#: sequencer.c:1905
7051
#, c-format
7052
msgid "commit %s is a merge but no -m option was given."
7053
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
7054
7023
-#: sequencer.c:1883 sequencer.c:1891
7055
+#: sequencer.c:1913 sequencer.c:1921
7056
#, c-format
7057
msgid "commit %s does not have parent %d"
7058
msgstr "提交 %s 没有第 %d 个父提交"
7059
7028
-#: sequencer.c:1897
7060
+#: sequencer.c:1927
7061
#, c-format
7062
msgid "cannot get commit message for %s"
7063
msgstr "不能得到 %s 的提交说明"
7064
7065
#. TRANSLATORS: The first %s will be a "todo" command like
7066
#. "revert" or "pick", the second %s a SHA1.
7035
-#: sequencer.c:1916
7067
+#: sequencer.c:1946
7068
#, c-format
7069
msgid "%s: cannot parse parent commit %s"
7070
msgstr "%s：不能解析父提交 %s"
7071
7040
-#: sequencer.c:1981
7072
+#: sequencer.c:2011
7073
#, c-format
7074
msgid "could not rename '%s' to '%s'"
7075
msgstr "不能将 '%s' 重命名为 '%s'"
7076
7045
-#: sequencer.c:2038
7077
+#: sequencer.c:2071
7078
#, c-format
7079
msgid "could not revert %s... %s"
7080
msgstr "不能还原 %s... %s"
7081
7050
-#: sequencer.c:2039
7082
+#: sequencer.c:2072
7083
#, c-format
7084
msgid "could not apply %s... %s"
7085
msgstr "不能应用 %s... %s"
7086
7055
-#: sequencer.c:2059
7087
+#: sequencer.c:2092
7088
#, c-format
7089
msgid "dropping %s %s -- patch contents already upstream\n"
7090
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
7091
7060
-#: sequencer.c:2117
7092
+#: sequencer.c:2150
7093
#, c-format
7094
msgid "git %s: failed to read the index"
7095
msgstr "git %s：无法读取索引"
7096
7065
-#: sequencer.c:2124
7097
+#: sequencer.c:2157
7098
#, c-format
7099
msgid "git %s: failed to refresh the index"
7100
msgstr "git %s：无法刷新索引"
7101
7070
-#: sequencer.c:2201
7102
+#: sequencer.c:2234
7103
#, c-format
7104
msgid "%s does not accept arguments: '%s'"
7105
msgstr "%s 不接受参数：'%s'"
7106
7075
-#: sequencer.c:2210
7107
+#: sequencer.c:2243
7108
#, c-format
7109
msgid "missing arguments for %s"
7110
msgstr "缺少 %s 的参数"
7111
7080
-#: sequencer.c:2241
7112
+#: sequencer.c:2274
7113
#, c-format
7114
msgid "could not parse '%s'"
7115
msgstr "无法解析 '%s'"
7116
7085
-#: sequencer.c:2302
7117
+#: sequencer.c:2335
7118
#, c-format
7119
msgid "invalid line %d: %.*s"
7120
msgstr "无效行 %d：%.*s"
7121
7090
-#: sequencer.c:2313
7122
+#: sequencer.c:2346
7123
#, c-format
7124
msgid "cannot '%s' without a previous commit"
7125
msgstr "没有父提交的情况下不能 '%s'"
7126
7095
-#: sequencer.c:2399
7127
+#: sequencer.c:2432
7128
msgid "cancelling a cherry picking in progress"
7129
msgstr "正在取消一个进行中的拣选"
7130
7099
-#: sequencer.c:2408
7131
+#: sequencer.c:2441
7132
msgid "cancelling a revert in progress"
7133
msgstr "正在取消一个进行中的还原"
7134
7103
-#: sequencer.c:2452
7135
+#: sequencer.c:2485
7136
msgid "please fix this using 'git rebase --edit-todo'."
7137
msgstr "请用 'git rebase --edit-todo' 来修改。"
7138
7107
-#: sequencer.c:2454
7139
+#: sequencer.c:2487
7140
#, c-format
7141
msgid "unusable instruction sheet: '%s'"
7142
msgstr "不可用的指令清单：'%s'"
7143
7112
-#: sequencer.c:2459
7144
+#: sequencer.c:2492
7145
msgid "no commits parsed."
7146
msgstr "没有解析提交。"
7147
7116
-#: sequencer.c:2470
7148
+#: sequencer.c:2503
7149
msgid "cannot cherry-pick during a revert."
7150
msgstr "不能在回退中执行拣选。"
7151
7120
-#: sequencer.c:2472
7152
+#: sequencer.c:2505
7153
msgid "cannot revert during a cherry-pick."
7154
msgstr "不能在拣选中执行回退。"
7155
7124
-#: sequencer.c:2550
7156
+#: sequencer.c:2583
7157
#, c-format
7158
msgid "invalid value for %s: %s"
7159
msgstr "%s 的值无效：%s"
7160
7129
-#: sequencer.c:2657
7161
+#: sequencer.c:2690
7162
msgid "unusable squash-onto"
7163
msgstr "不可用的 squash-onto"
7164
7133
-#: sequencer.c:2677
7165
+#: sequencer.c:2710
7166
#, c-format
7167
msgid "malformed options sheet: '%s'"
7168
msgstr "格式错误的选项清单：'%s'"
7169
7138
-#: sequencer.c:2769 sequencer.c:4609
7170
+#: sequencer.c:2803 sequencer.c:4636
7171
msgid "empty commit set passed"
7172
msgstr "提供了空的提交集"
7173
7142
-#: sequencer.c:2786
7174
+#: sequencer.c:2820
7175
msgid "revert is already in progress"
7176
msgstr "一个还原操作已在进行"
7177
7146
-#: sequencer.c:2788
7178
+#: sequencer.c:2822
7179
#, c-format
7180
msgid "try \"git revert (--continue | %s--abort | --quit)\""
7181
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
7182
7151
-#: sequencer.c:2791
7183
+#: sequencer.c:2825
7184
msgid "cherry-pick is already in progress"
7185
msgstr "拣选操作已在进行"
7186
7155
-#: sequencer.c:2793
7187
+#: sequencer.c:2827
7188
#, c-format
7189
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
7190
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
7191
7160
-#: sequencer.c:2807
7192
+#: sequencer.c:2841
7193
#, c-format
7194
msgid "could not create sequencer directory '%s'"
7195
msgstr "不能创建序列目录 '%s'"
7196
7165
-#: sequencer.c:2822
7197
+#: sequencer.c:2856
7198
msgid "could not lock HEAD"
7199
msgstr "不能锁定 HEAD"
7200
7169
-#: sequencer.c:2882 sequencer.c:4325
7201
+#: sequencer.c:2916 sequencer.c:4371
7202
msgid "no cherry-pick or revert in progress"
7203
msgstr "拣选或还原操作并未进行"
7204
7173
-#: sequencer.c:2884 sequencer.c:2895
7205
+#: sequencer.c:2918 sequencer.c:2929
7206
msgid "cannot resolve HEAD"
7207
msgstr "不能解析 HEAD"
7208
7177
-#: sequencer.c:2886 sequencer.c:2930
7209
+#: sequencer.c:2920 sequencer.c:2964
7210
msgid "cannot abort from a branch yet to be born"
7211
msgstr "不能从尚未建立的分支终止"
7212
7181
-#: sequencer.c:2916 builtin/grep.c:745
7213
+#: sequencer.c:2950 builtin/grep.c:756
7214
#, c-format
7215
msgid "cannot open '%s'"
7216
msgstr "不能打开 '%s'"
7217
7186
-#: sequencer.c:2918
7218
+#: sequencer.c:2952
7219
#, c-format
7220
msgid "cannot read '%s': %s"
7221
msgstr "不能读取 '%s'：%s"
7222
7191
-#: sequencer.c:2919
7223
+#: sequencer.c:2953
7224
msgid "unexpected end of file"
7225
msgstr "意外的文件结束"
7226
7195
-#: sequencer.c:2925
7227
+#: sequencer.c:2959
7228
#, c-format
7229
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
7230
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
7231
7200
-#: sequencer.c:2936
7232
+#: sequencer.c:2970
7233
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
7234
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
7235
7204
-#: sequencer.c:2977
7236
+#: sequencer.c:3011
7237
msgid "no revert in progress"
7238
msgstr "没有正在进行的还原"
7239
7208
-#: sequencer.c:2986
7240
+#: sequencer.c:3020
7241
msgid "no cherry-pick in progress"
7242
msgstr "没有正在进行的拣选"
7243
7212
-#: sequencer.c:2996
7244
+#: sequencer.c:3030
7245
msgid "failed to skip the commit"
7246
msgstr "无法跳过这个提交"
7247
7216
-#: sequencer.c:3003
7248
+#: sequencer.c:3037
7249
msgid "there is nothing to skip"
7250
msgstr "没有要跳过的"
7251
7220
-#: sequencer.c:3006
7252
+#: sequencer.c:3040
7253
#, c-format
7254
msgid ""
7255
"have you committed already?\n"
@@ -7226,16 +7258,16 @@ msgstr ""
7258
"您已经提交了么？\n"
7259
"试试 \"git %s --continue\""
7260
7229
-#: sequencer.c:3168 sequencer.c:4217
7261
+#: sequencer.c:3202 sequencer.c:4263
7262
msgid "cannot read HEAD"
7263
msgstr "不能读取 HEAD"
7264
7233
-#: sequencer.c:3185
7265
+#: sequencer.c:3219
7266
#, c-format
7267
msgid "unable to copy '%s' to '%s'"
7268
msgstr "无法拷贝 '%s' 至 '%s'"
7269
7238
-#: sequencer.c:3193
7270
+#: sequencer.c:3227
7271
#, c-format
7272
msgid ""
7273
"You can amend the commit now, with\n"
@@ -7254,28 +7286,28 @@ msgstr ""
7286
"\n"
7287
" git rebase --continue\n"
7288
7257
-#: sequencer.c:3203
7289
+#: sequencer.c:3237
7290
#, c-format
7291
msgid "Could not apply %s... %.*s"
7292
msgstr "不能应用 %s... %.*s"
7293
7262
-#: sequencer.c:3210
7294
+#: sequencer.c:3244
7295
#, c-format
7296
msgid "Could not merge %.*s"
7297
msgstr "不能合并 %.*s"
7298
7267
-#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
7299
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
7300
#, c-format
7301
msgid "could not copy '%s' to '%s'"
7302
msgstr "不能拷贝 '%s' 至 '%s'"
7303
7272
-#: sequencer.c:3240
7304
+#: sequencer.c:3274
7305
#, c-format
7306
msgid "Executing: %s\n"
7307
msgstr "正在执行：%s\n"
7308
7309
# 译者：注意保持前导空格
7278
-#: sequencer.c:3255
7310
+#: sequencer.c:3289
7311
#, c-format
7312
msgid ""
7313
"execution failed: %s\n"
@@ -7290,11 +7322,11 @@ msgstr ""
7322
" git rebase --continue\n"
7323
"\n"
7324
7293
-#: sequencer.c:3261
7325
+#: sequencer.c:3295
7326
msgid "and made changes to the index and/or the working tree\n"
7327
msgstr "并且修改索引和/或工作区\n"
7328
7297
-#: sequencer.c:3267
7329
+#: sequencer.c:3301
7330
#, c-format
7331
msgid ""
7332
"execution succeeded: %s\n"
@@ -7311,90 +7343,90 @@ msgstr ""
7343
" git rebase --continue\n"
7344
"\n"
7345
7314
-#: sequencer.c:3328
7346
+#: sequencer.c:3362
7347
#, c-format
7348
msgid "illegal label name: '%.*s'"
7349
msgstr "非法的标签名称：'%.*s'"
7350
7319
-#: sequencer.c:3382
7351
+#: sequencer.c:3416
7352
msgid "writing fake root commit"
7353
msgstr "写伪根提交"
7354
7323
-#: sequencer.c:3387
7355
+#: sequencer.c:3421
7356
msgid "writing squash-onto"
7357
msgstr "写入 squash-onto"
7358
7327
-#: sequencer.c:3471
7359
+#: sequencer.c:3505
7360
#, c-format
7361
msgid "could not resolve '%s'"
7362
msgstr "无法解析 '%s'"
7363
7332
-#: sequencer.c:3502
7364
+#: sequencer.c:3538
7365
msgid "cannot merge without a current revision"
7366
msgstr "没有当前版本不能合并"
7367
7336
-#: sequencer.c:3524
7368
+#: sequencer.c:3560
7369
#, c-format
7370
msgid "unable to parse '%.*s'"
7371
msgstr "无法解析 '%.*s'"
7372
7341
-#: sequencer.c:3533
7373
+#: sequencer.c:3569
7374
#, c-format
7375
msgid "nothing to merge: '%.*s'"
7376
msgstr "无可用合并：'%.*s'"
7377
7346
-#: sequencer.c:3545
7378
+#: sequencer.c:3581
7379
msgid "octopus merge cannot be executed on top of a [new root]"
7380
msgstr "章鱼合并不能在一个新的根提交上执行"
7381
7350
-#: sequencer.c:3561
7382
+#: sequencer.c:3597
7383
#, c-format
7384
msgid "could not get commit message of '%s'"
7385
msgstr "不能获取 '%s' 的提交说明"
7386
7355
-#: sequencer.c:3730
7387
+#: sequencer.c:3780
7388
#, c-format
7389
msgid "could not even attempt to merge '%.*s'"
7390
msgstr "甚至不能尝试合并 '%.*s'"
7391
7360
-#: sequencer.c:3746
7392
+#: sequencer.c:3796
7393
msgid "merge: Unable to write new index file"
7394
msgstr "合并：无法写入新索引文件"
7395
7364
-#: sequencer.c:3820
7396
+#: sequencer.c:3870
7397
msgid "Cannot autostash"
7398
msgstr "无法 autostash"
7399
7368
-#: sequencer.c:3823
7400
+#: sequencer.c:3873
7401
#, c-format
7402
msgid "Unexpected stash response: '%s'"
7403
msgstr "意外的 stash 响应：'%s'"
7404
7373
-#: sequencer.c:3829
7405
+#: sequencer.c:3879
7406
#, c-format
7407
msgid "Could not create directory for '%s'"
7408
msgstr "不能为 '%s' 创建目录"
7409
7378
-#: sequencer.c:3832
7410
+#: sequencer.c:3882
7411
#, c-format
7412
msgid "Created autostash: %s\n"
7413
msgstr "创建了 autostash：%s\n"
7414
7383
-#: sequencer.c:3836
7415
+#: sequencer.c:3886
7416
msgid "could not reset --hard"
7417
msgstr "无法 reset --hard"
7418
7387
-#: sequencer.c:3861
7419
+#: sequencer.c:3911
7420
#, c-format
7421
msgid "Applied autostash.\n"
7422
msgstr "已应用 autostash。\n"
7423
7392
-#: sequencer.c:3873
7424
+#: sequencer.c:3923
7425
#, c-format
7426
msgid "cannot store %s"
7427
msgstr "不能存储 %s"
7428
7397
-#: sequencer.c:3876
7429
+#: sequencer.c:3926
7430
#, c-format
7431
msgid ""
7432
"%s\n"
@@ -7405,34 +7437,29 @@ msgstr ""
7437
"您的修改在贮藏区中很安全。\n"
7438
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
7439
7408
-#: sequencer.c:3881
7440
+#: sequencer.c:3931
7441
msgid "Applying autostash resulted in conflicts."
7442
msgstr "应用自动贮藏导致冲突。"
7443
7412
-#: sequencer.c:3882
7444
+#: sequencer.c:3932
7445
msgid "Autostash exists; creating a new stash entry."
7446
msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
7447
7416
-#: sequencer.c:3974
7417
-#, c-format
7418
-msgid "%s: not a valid OID"
7419
-msgstr "%s：不是一个有效的对象 ID"
7420
-
7421
-#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
7448
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
7449
msgid "could not detach HEAD"
7450
msgstr "不能分离头指针"
7451
7425
-#: sequencer.c:3994
7452
+#: sequencer.c:4040
7453
#, c-format
7454
msgid "Stopped at HEAD\n"
7455
msgstr "停止在 HEAD\n"
7456
7430
-#: sequencer.c:3996
7457
+#: sequencer.c:4042
7458
#, c-format
7459
msgid "Stopped at %s\n"
7460
msgstr "停止在 %s\n"
7461
7435
-#: sequencer.c:4004
7462
+#: sequencer.c:4050
7463
#, c-format
7464
msgid ""
7465
"Could not execute the todo command\n"
@@ -7452,58 +7479,58 @@ msgstr ""
7479
" git rebase --edit-todo\n"
7480
" git rebase --continue\n"
7481
7455
-#: sequencer.c:4050
7482
+#: sequencer.c:4096
7483
#, c-format
7484
msgid "Rebasing (%d/%d)%s"
7485
msgstr "正在变基（%d/%d）%s"
7486
7460
-#: sequencer.c:4095
7487
+#: sequencer.c:4141
7488
#, c-format
7489
msgid "Stopped at %s... %.*s\n"
7490
msgstr "停止在 %s... %.*s\n"
7491
7465
-#: sequencer.c:4166
7492
+#: sequencer.c:4212
7493
#, c-format
7494
msgid "unknown command %d"
7495
msgstr "未知命令 %d"
7496
7470
-#: sequencer.c:4225
7497
+#: sequencer.c:4271
7498
msgid "could not read orig-head"
7499
msgstr "不能读取 orig-head"
7500
7474
-#: sequencer.c:4230
7501
+#: sequencer.c:4276
7502
msgid "could not read 'onto'"
7503
msgstr "不能读取 'onto'"
7504
7478
-#: sequencer.c:4244
7505
+#: sequencer.c:4290
7506
#, c-format
7507
msgid "could not update HEAD to %s"
7508
msgstr "不能更新 HEAD 为 %s"
7509
7483
-#: sequencer.c:4304
7510
+#: sequencer.c:4350
7511
#, c-format
7512
msgid "Successfully rebased and updated %s.\n"
7513
msgstr "成功变基并更新 %s。\n"
7514
7488
-#: sequencer.c:4337
7515
+#: sequencer.c:4383
7516
msgid "cannot rebase: You have unstaged changes."
7517
msgstr "不能变基：您有未暂存的变更。"
7518
7492
-#: sequencer.c:4346
7519
+#: sequencer.c:4392
7520
msgid "cannot amend non-existing commit"
7521
msgstr "不能修补不存在的提交"
7522
7496
-#: sequencer.c:4348
7523
+#: sequencer.c:4394
7524
#, c-format
7525
msgid "invalid file: '%s'"
7526
msgstr "无效文件：'%s'"
7527
7501
-#: sequencer.c:4350
7528
+#: sequencer.c:4396
7529
#, c-format
7530
msgid "invalid contents: '%s'"
7531
msgstr "无效内容：'%s'"
7532
7506
-#: sequencer.c:4353
7533
+#: sequencer.c:4399
7534
msgid ""
7535
"\n"
7536
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7512,55 +7539,50 @@ msgstr ""
7539
"\n"
7540
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
7541
7515
-#: sequencer.c:4389 sequencer.c:4428
7542
+#: sequencer.c:4435 sequencer.c:4474
7543
#, c-format
7544
msgid "could not write file: '%s'"
7545
msgstr "不能写入文件：'%s'"
7546
7520
-#: sequencer.c:4444
7547
+#: sequencer.c:4490
7548
msgid "could not remove CHERRY_PICK_HEAD"
7549
msgstr "不能删除 CHERRY_PICK_HEAD"
7550
7524
-#: sequencer.c:4451
7551
+#: sequencer.c:4497
7552
msgid "could not commit staged changes."
7553
msgstr "不能提交暂存的修改。"
7554
7528
-#: sequencer.c:4477
7529
-#, c-format
7530
-msgid "invalid committer '%s'"
7531
-msgstr "无效的提交者 '%s'"
7532
-
7533
-#: sequencer.c:4586
7555
+#: sequencer.c:4613
7556
#, c-format
7557
msgid "%s: can't cherry-pick a %s"
7558
msgstr "%s：不能拣选一个%s"
7559
7538
-#: sequencer.c:4590
7560
+#: sequencer.c:4617
7561
#, c-format
7562
msgid "%s: bad revision"
7563
msgstr "%s：错误的版本"
7564
7543
-#: sequencer.c:4625
7565
+#: sequencer.c:4652
7566
msgid "can't revert as initial commit"
7567
msgstr "不能作为初始提交回退"
7568
7547
-#: sequencer.c:5102
7569
+#: sequencer.c:5129
7570
msgid "make_script: unhandled options"
7571
msgstr "make_script：有未能处理的选项"
7572
7551
-#: sequencer.c:5105
7573
+#: sequencer.c:5132
7574
msgid "make_script: error preparing revisions"
7575
msgstr "make_script：准备版本时错误"
7576
7555
-#: sequencer.c:5347 sequencer.c:5364
7577
+#: sequencer.c:5374 sequencer.c:5391
7578
msgid "nothing to do"
7579
msgstr "无事可做"
7580
7559
-#: sequencer.c:5383
7581
+#: sequencer.c:5410
7582
msgid "could not skip unnecessary pick commands"
7583
msgstr "无法跳过不必要的拣选"
7584
7563
-#: sequencer.c:5480
7585
+#: sequencer.c:5504
7586
msgid "the script was already rearranged."
7587
msgstr "脚本已经重新编排。"
7588
@@ -7724,256 +7746,256 @@ msgstr "fork 失败"
7746
msgid "setsid failed"
7747
msgstr "setsid 失败"
7748
7727
-#: sha1-file.c:470
7749
+#: sha1-file.c:480
7750
#, c-format
7751
msgid "object directory %s does not exist; check .git/objects/info/alternates"
7752
msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
7753
7732
-#: sha1-file.c:521
7754
+#: sha1-file.c:531
7755
#, c-format
7756
msgid "unable to normalize alternate object path: %s"
7757
msgstr "无法规范化备用对象路径：%s"
7758
7737
-#: sha1-file.c:593
7759
+#: sha1-file.c:603
7760
#, c-format
7761
msgid "%s: ignoring alternate object stores, nesting too deep"
7762
msgstr "%s：忽略备用对象库，嵌套太深"
7763
7742
-#: sha1-file.c:600
7764
+#: sha1-file.c:610
7765
#, c-format
7766
msgid "unable to normalize object directory: %s"
7767
msgstr "无法规范化对象目录: %s"
7768
7747
-#: sha1-file.c:643
7769
+#: sha1-file.c:653
7770
msgid "unable to fdopen alternates lockfile"
7771
msgstr "无法 fdopen 替换锁文件"
7772
7751
-#: sha1-file.c:661
7773
+#: sha1-file.c:671
7774
msgid "unable to read alternates file"
7775
msgstr "无法读取替代文件"
7776
7755
-#: sha1-file.c:668
7777
+#: sha1-file.c:678
7778
msgid "unable to move new alternates file into place"
7779
msgstr "无法将新的替代文件移动到位"
7780
7759
-#: sha1-file.c:703
7781
+#: sha1-file.c:713
7782
#, c-format
7783
msgid "path '%s' does not exist"
7784
msgstr "路径 '%s' 不存在"
7785
7764
-#: sha1-file.c:724
7786
+#: sha1-file.c:734
7787
#, c-format
7788
msgid "reference repository '%s' as a linked checkout is not supported yet."
7789
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
7790
7769
-#: sha1-file.c:730
7791
+#: sha1-file.c:740
7792
#, c-format
7793
msgid "reference repository '%s' is not a local repository."
7794
msgstr "参考仓库 '%s' 不是一个本地仓库。"
7795
7774
-#: sha1-file.c:736
7796
+#: sha1-file.c:746
7797
#, c-format
7798
msgid "reference repository '%s' is shallow"
7799
msgstr "参考仓库 '%s' 是一个浅克隆"
7800
7779
-#: sha1-file.c:744
7801
+#: sha1-file.c:754
7802
#, c-format
7803
msgid "reference repository '%s' is grafted"
7804
msgstr "参考仓库 '%s' 已被移植"
7805
7784
-#: sha1-file.c:804
7806
+#: sha1-file.c:814
7807
#, c-format
7808
msgid "invalid line while parsing alternate refs: %s"
7809
msgstr "解析备用引用时无效的行：%s"
7810
7789
-#: sha1-file.c:954
7811
+#: sha1-file.c:964
7812
#, c-format
7813
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
7814
msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
7815
7794
-#: sha1-file.c:975
7816
+#: sha1-file.c:985
7817
msgid "mmap failed"
7818
msgstr "mmap 失败"
7819
7798
-#: sha1-file.c:1139
7820
+#: sha1-file.c:1149
7821
#, c-format
7822
msgid "object file %s is empty"
7823
msgstr "对象文件 %s 为空"
7824
7803
-#: sha1-file.c:1274 sha1-file.c:2467
7825
+#: sha1-file.c:1284 sha1-file.c:2477
7826
#, c-format
7827
msgid "corrupt loose object '%s'"
7828
msgstr "损坏的松散对象 '%s'"
7829
7808
-#: sha1-file.c:1276 sha1-file.c:2471
7830
+#: sha1-file.c:1286 sha1-file.c:2481
7831
#, c-format
7832
msgid "garbage at end of loose object '%s'"
7833
msgstr "松散对象 '%s' 后面有垃圾数据"
7834
7813
-#: sha1-file.c:1318
7835
+#: sha1-file.c:1328
7836
msgid "invalid object type"
7837
msgstr "无效的对象类型"
7838
7817
-#: sha1-file.c:1402
7839
+#: sha1-file.c:1412
7840
#, c-format
7841
msgid "unable to unpack %s header with --allow-unknown-type"
7842
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
7843
7822
-#: sha1-file.c:1405
7844
+#: sha1-file.c:1415
7845
#, c-format
7846
msgid "unable to unpack %s header"
7847
msgstr "无法解开 %s 头部"
7848
7827
-#: sha1-file.c:1411
7849
+#: sha1-file.c:1421
7850
#, c-format
7851
msgid "unable to parse %s header with --allow-unknown-type"
7852
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
7853
7832
-#: sha1-file.c:1414
7854
+#: sha1-file.c:1424
7855
#, c-format
7856
msgid "unable to parse %s header"
7857
msgstr "无法解析 %s 头部"
7858
7837
-#: sha1-file.c:1641
7859
+#: sha1-file.c:1651
7860
#, c-format
7861
msgid "failed to read object %s"
7862
msgstr "读取对象 %s 失败"
7863
7842
-#: sha1-file.c:1645
7864
+#: sha1-file.c:1655
7865
#, c-format
7866
msgid "replacement %s not found for %s"
7867
msgstr "找不到 %2$s 的替代 %1$s"
7868
7847
-#: sha1-file.c:1649
7869
+#: sha1-file.c:1659
7870
#, c-format
7871
msgid "loose object %s (stored in %s) is corrupt"
7872
msgstr "松散对象 %s（保存在 %s）已损坏"
7873
7852
-#: sha1-file.c:1653
7874
+#: sha1-file.c:1663
7875
#, c-format
7876
msgid "packed object %s (stored in %s) is corrupt"
7877
msgstr "打包对象 %s（保存在 %s）已损坏"
7878
7857
-#: sha1-file.c:1758
7879
+#: sha1-file.c:1768
7880
#, c-format
7881
msgid "unable to write file %s"
7882
msgstr "无法写文件 %s"
7883
7862
-#: sha1-file.c:1765
7884
+#: sha1-file.c:1775
7885
#, c-format
7886
msgid "unable to set permission to '%s'"
7887
msgstr "无法为 '%s' 设置权限"
7888
7867
-#: sha1-file.c:1772
7889
+#: sha1-file.c:1782
7890
msgid "file write error"
7891
msgstr "文件写错误"
7892
7871
-#: sha1-file.c:1792
7893
+#: sha1-file.c:1802
7894
msgid "error when closing loose object file"
7895
msgstr "关闭松散对象文件时出错"
7896
7875
-#: sha1-file.c:1857
7897
+#: sha1-file.c:1867
7898
#, c-format
7899
msgid "insufficient permission for adding an object to repository database %s"
7900
msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
7901
7880
-#: sha1-file.c:1859
7902
+#: sha1-file.c:1869
7903
msgid "unable to create temporary file"
7904
msgstr "无法创建临时文件"
7905
7884
-#: sha1-file.c:1883
7906
+#: sha1-file.c:1893
7907
msgid "unable to write loose object file"
7908
msgstr "不能写松散对象文件"
7909
7888
-#: sha1-file.c:1889
7910
+#: sha1-file.c:1899
7911
#, c-format
7912
msgid "unable to deflate new object %s (%d)"
7913
msgstr "不能压缩新对象 %s（%d）"
7914
7893
-#: sha1-file.c:1893
7915
+#: sha1-file.c:1903
7916
#, c-format
7917
msgid "deflateEnd on object %s failed (%d)"
7918
msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
7919
7898
-#: sha1-file.c:1897
7920
+#: sha1-file.c:1907
7921
#, c-format
7922
msgid "confused by unstable object source data for %s"
7923
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
7924
7903
-#: sha1-file.c:1907 builtin/pack-objects.c:1086
7925
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
7926
#, c-format
7927
msgid "failed utime() on %s"
7928
msgstr "在 %s 上调用 utime() 失败"
7929
7908
-#: sha1-file.c:1984
7930
+#: sha1-file.c:1994
7931
#, c-format
7932
msgid "cannot read object for %s"
7933
msgstr "不能读取对象 %s"
7934
7913
-#: sha1-file.c:2035
7935
+#: sha1-file.c:2045
7936
msgid "corrupt commit"
7937
msgstr "损坏的提交"
7938
7917
-#: sha1-file.c:2043
7939
+#: sha1-file.c:2053
7940
msgid "corrupt tag"
7941
msgstr "损坏的标签"
7942
7921
-#: sha1-file.c:2143
7943
+#: sha1-file.c:2153
7944
#, c-format
7945
msgid "read error while indexing %s"
7946
msgstr "索引 %s 时读取错误"
7947
7926
-#: sha1-file.c:2146
7948
+#: sha1-file.c:2156
7949
#, c-format
7950
msgid "short read while indexing %s"
7951
msgstr "索引 %s 时读入不完整"
7952
7931
-#: sha1-file.c:2219 sha1-file.c:2229
7953
+#: sha1-file.c:2229 sha1-file.c:2239
7954
#, c-format
7955
msgid "%s: failed to insert into database"
7956
msgstr "%s：插入数据库失败"
7957
7936
-#: sha1-file.c:2235
7958
+#: sha1-file.c:2245
7959
#, c-format
7960
msgid "%s: unsupported file type"
7961
msgstr "%s：不支持的文件类型"
7962
7941
-#: sha1-file.c:2259
This file is too large to show in full.