freshlybakedca.ke
Git fork
l10n: zh_TW.po: Git 2.41.0
Co-authored-by: Peter Dave Hello <hsu@peterdavehello.org>
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
+1511
-1190
+1511
-1190
po/zh_TW.po
+1511
-1190
po/zh_TW.po
···
19
19
# - Yichao Yu <yyc1992 AT gmail.com>
20
20
# - Zhuang Ya <zhuangya AT me.com>
21
21
#
22
-
# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022.
22
+
# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023.
23
23
# Kaiyang Wu <self@origincode.me>, 2022.
24
24
msgid ""
25
25
msgstr ""
26
26
"Project-Id-Version: Git\n"
27
27
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
28
-
"POT-Creation-Date: 2022-12-11 00:28+0800\n"
29
-
"PO-Revision-Date: 2022-12-10 17:12+0000\n"
28
+
"POT-Creation-Date: 2023-05-19 19:57+0000\n"
29
+
"PO-Revision-Date: 2023-05-31 23:41+0800\n"
30
30
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
31
31
"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
32
32
"po/git-cli/zh_Hant/>\n"
···
35
35
"Content-Type: text/plain; charset=UTF-8\n"
36
36
"Content-Transfer-Encoding: 8bit\n"
37
37
"Plural-Forms: nplurals=1; plural=0;\n"
38
-
"X-Generator: Weblate 4.14.2\n"
38
+
"X-Generator: Poedit 3.3.1\n"
39
39
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
40
40
"zhconvert.org\n"
41
41
···
48
48
msgid "could not read index"
49
49
msgstr "無法讀取索引"
50
50
51
-
#: add-interactive.c git-add--interactive.perl
51
+
#: add-interactive.c
52
52
msgid "binary"
53
53
msgstr "二進位"
54
54
55
-
#: add-interactive.c git-add--interactive.perl
55
+
#: add-interactive.c
56
56
msgid "nothing"
57
57
msgstr "無"
58
58
59
-
#: add-interactive.c git-add--interactive.perl
59
+
#: add-interactive.c
60
60
msgid "unchanged"
61
61
msgstr "未變更"
62
62
63
-
#: add-interactive.c git-add--interactive.perl
63
+
#: add-interactive.c
64
64
msgid "Update"
65
65
msgstr "更新"
66
66
···
73
73
msgid "could not write index"
74
74
msgstr "無法寫入索引"
75
75
76
-
#: add-interactive.c git-add--interactive.perl
77
-
#, c-format, perl-format
76
+
#: add-interactive.c
77
+
#, c-format
78
78
msgid "updated %d path\n"
79
79
msgid_plural "updated %d paths\n"
80
80
msgstr[0] "已更新 %d 個路徑\n"
81
81
82
-
#: add-interactive.c git-add--interactive.perl
83
-
#, c-format, perl-format
82
+
#: add-interactive.c
83
+
#, c-format
84
84
msgid "note: %s is untracked now.\n"
85
85
msgstr "註：現已不再追蹤 %s。\n"
86
86
···
89
89
msgid "make_cache_entry failed for path '%s'"
90
90
msgstr "對 “%s” 路徑執行 make_cache_entry 失敗"
91
91
92
-
#: add-interactive.c git-add--interactive.perl
92
+
#: add-interactive.c
93
93
msgid "Revert"
94
94
msgstr "還原"
95
95
···
97
97
msgid "Could not parse HEAD^{tree}"
98
98
msgstr "無法解析 HEAD^{tree}"
99
99
100
-
#: add-interactive.c git-add--interactive.perl
101
-
#, c-format, perl-format
100
+
#: add-interactive.c
101
+
#, c-format
102
102
msgid "reverted %d path\n"
103
103
msgid_plural "reverted %d paths\n"
104
104
msgstr[0] "已還原 %d 個路徑\n"
105
105
106
-
#: add-interactive.c git-add--interactive.perl
106
+
#: add-interactive.c
107
107
#, c-format
108
108
msgid "No untracked files.\n"
109
109
msgstr "沒有未追蹤的檔案。\n"
110
110
111
-
#: add-interactive.c git-add--interactive.perl
111
+
#: add-interactive.c
112
112
msgid "Add untracked"
113
113
msgstr "加入未追蹤項目"
114
114
115
-
#: add-interactive.c git-add--interactive.perl
116
-
#, c-format, perl-format
115
+
#: add-interactive.c
116
+
#, c-format
117
117
msgid "added %d path\n"
118
118
msgid_plural "added %d paths\n"
119
119
msgstr[0] "已加入 %d 個路徑\n"
···
123
123
msgid "ignoring unmerged: %s"
124
124
msgstr "忽略未合併項目：%s"
125
125
126
-
#: add-interactive.c add-patch.c git-add--interactive.perl
126
+
#: add-interactive.c add-patch.c
127
127
#, c-format
128
128
msgid "Only binary files changed.\n"
129
129
msgstr "只變更二進位檔案。\n"
130
130
131
-
#: add-interactive.c add-patch.c git-add--interactive.perl
131
+
#: add-interactive.c add-patch.c
132
132
#, c-format
133
133
msgid "No changes.\n"
134
134
msgstr "沒有更動。\n"
135
135
136
-
#: add-interactive.c git-add--interactive.perl
136
+
#: add-interactive.c
137
137
msgid "Patch update"
138
138
msgstr "修補檔更新"
139
139
140
-
#: add-interactive.c git-add--interactive.perl
140
+
#: add-interactive.c
141
141
msgid "Review diff"
142
142
msgstr "檢閱差異"
143
143
···
205
205
msgid "(empty) select nothing"
206
206
msgstr "（空）全部不選取"
207
207
208
-
#: add-interactive.c builtin/clean.c git-add--interactive.perl
208
+
#: add-interactive.c builtin/clean.c
209
209
msgid "*** Commands ***"
210
210
msgstr "*** 命令 ***"
211
211
212
-
#: add-interactive.c builtin/clean.c git-add--interactive.perl
212
+
#: add-interactive.c builtin/clean.c
213
213
msgid "What now"
214
214
msgstr "請選擇"
215
215
216
-
#: add-interactive.c git-add--interactive.perl
216
+
#: add-interactive.c
217
217
msgid "staged"
218
218
msgstr "已暫存"
219
219
220
-
#: add-interactive.c git-add--interactive.perl
220
+
#: add-interactive.c
221
221
msgid "unstaged"
222
222
msgstr "未暫存"
223
223
224
224
#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
225
-
#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
226
-
#: builtin/submodule--helper.c git-add--interactive.perl
225
+
#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c
226
+
#: builtin/pull.c builtin/submodule--helper.c
227
227
msgid "path"
228
228
msgstr "路徑"
229
229
···
231
231
msgid "could not refresh index"
232
232
msgstr "無法重新整理索引"
233
233
234
-
#: add-interactive.c builtin/clean.c git-add--interactive.perl
234
+
#: add-interactive.c builtin/clean.c
235
235
#, c-format
236
236
msgid "Bye.\n"
237
237
msgstr "再見。\n"
238
238
239
-
#: add-patch.c git-add--interactive.perl
240
-
#, c-format, perl-format
239
+
#: add-patch.c
240
+
#, c-format
241
241
msgid "Stage mode change [y,n,q,a,d%s,?]? "
242
242
msgstr "暫存模式更動 [y,n,q,a,d%s,?]? "
243
243
244
-
#: add-patch.c git-add--interactive.perl
245
-
#, c-format, perl-format
244
+
#: add-patch.c
245
+
#, c-format
246
246
msgid "Stage deletion [y,n,q,a,d%s,?]? "
247
247
msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
248
248
249
-
#: add-patch.c git-add--interactive.perl
250
-
#, c-format, perl-format
249
+
#: add-patch.c
250
+
#, c-format
251
251
msgid "Stage addition [y,n,q,a,d%s,?]? "
252
252
msgstr "暫存加入動作 [y,n,q,a,d%s,?]? "
253
253
254
-
#: add-patch.c git-add--interactive.perl
255
-
#, c-format, perl-format
254
+
#: add-patch.c
255
+
#, c-format
256
256
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
257
257
msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
258
258
···
276
276
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
277
277
"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
278
278
279
-
#: add-patch.c git-add--interactive.perl
280
-
#, c-format, perl-format
279
+
#: add-patch.c
280
+
#, c-format
281
281
msgid "Stash mode change [y,n,q,a,d%s,?]? "
282
282
msgstr "貯存模式更動 [y,n,q,a,d%s,?]? "
283
283
284
-
#: add-patch.c git-add--interactive.perl
285
-
#, c-format, perl-format
284
+
#: add-patch.c
285
+
#, c-format
286
286
msgid "Stash deletion [y,n,q,a,d%s,?]? "
287
287
msgstr "貯存刪除動作 [y,n,q,a,d%s,?]? "
288
288
289
-
#: add-patch.c git-add--interactive.perl
290
-
#, c-format, perl-format
289
+
#: add-patch.c
290
+
#, c-format
291
291
msgid "Stash addition [y,n,q,a,d%s,?]? "
292
292
msgstr "貯存加入動作 [y,n,q,a,d%s,?]? "
293
293
294
-
#: add-patch.c git-add--interactive.perl
295
-
#, c-format, perl-format
294
+
#: add-patch.c
295
+
#, c-format
296
296
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
297
297
msgstr "貯存此區塊 [y,n,q,a,d%s,?]? "
298
298
···
316
316
"a - 貯存此區塊和本檔案中後面的全部區塊\n"
317
317
"d - 不貯存此區塊和本檔案中後面的全部區塊\n"
318
318
319
-
#: add-patch.c git-add--interactive.perl
320
-
#, c-format, perl-format
319
+
#: add-patch.c
320
+
#, c-format
321
321
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
322
322
msgstr "取消暫存模式更動 [y,n,q,a,d%s,?]? "
323
323
324
-
#: add-patch.c git-add--interactive.perl
325
-
#, c-format, perl-format
324
+
#: add-patch.c
325
+
#, c-format
326
326
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
327
327
msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
328
328
329
-
#: add-patch.c git-add--interactive.perl
330
-
#, c-format, perl-format
329
+
#: add-patch.c
330
+
#, c-format
331
331
msgid "Unstage addition [y,n,q,a,d%s,?]? "
332
332
msgstr "取消暫存加入動作 [y,n,q,a,d%s,?]? "
333
333
334
-
#: add-patch.c git-add--interactive.perl
335
-
#, c-format, perl-format
334
+
#: add-patch.c
335
+
#, c-format
336
336
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
337
337
msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
338
338
···
356
356
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
357
357
"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
358
358
359
-
#: add-patch.c git-add--interactive.perl
360
-
#, c-format, perl-format
359
+
#: add-patch.c
360
+
#, c-format
361
361
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
362
362
msgstr "將模式更動套用到索引 [y,n,q,a,d%s,?]? "
363
363
364
-
#: add-patch.c git-add--interactive.perl
365
-
#, c-format, perl-format
364
+
#: add-patch.c
365
+
#, c-format
366
366
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
367
367
msgstr "將刪除動作套用至索引 [y,n,q,a,d%s,?]? "
368
368
369
-
#: add-patch.c git-add--interactive.perl
370
-
#, c-format, perl-format
369
+
#: add-patch.c
370
+
#, c-format
371
371
msgid "Apply addition to index [y,n,q,a,d%s,?]? "
372
372
msgstr "將加入動作套用至索引 [y,n,q,a,d%s,?]? "
373
373
374
-
#: add-patch.c git-add--interactive.perl
375
-
#, c-format, perl-format
374
+
#: add-patch.c
375
+
#, c-format
376
376
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
377
377
msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
378
378
···
396
396
"a - 套用此區塊和本檔案中後面的全部區塊\n"
397
397
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
398
398
399
-
#: add-patch.c git-add--interactive.perl
400
-
#, c-format, perl-format
399
+
#: add-patch.c
400
+
#, c-format
401
401
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
402
402
msgstr "從工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
403
403
404
-
#: add-patch.c git-add--interactive.perl
405
-
#, c-format, perl-format
404
+
#: add-patch.c
405
+
#, c-format
406
406
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
407
407
msgstr "從工作區捨棄刪除動作 [y,n,q,a,d%s,?]? "
408
408
409
-
#: add-patch.c git-add--interactive.perl
410
-
#, c-format, perl-format
409
+
#: add-patch.c
410
+
#, c-format
411
411
msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
412
412
msgstr "從工作區捨棄加入動作 [y,n,q,a,d%s,?]? "
413
413
414
-
#: add-patch.c git-add--interactive.perl
415
-
#, c-format, perl-format
414
+
#: add-patch.c
415
+
#, c-format
416
416
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
417
417
msgstr "從工作區捨棄此區塊 [y,n,q,a,d%s,?]? "
418
418
···
436
436
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
437
437
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
438
438
439
-
#: add-patch.c git-add--interactive.perl
440
-
#, c-format, perl-format
439
+
#: add-patch.c
440
+
#, c-format
441
441
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
442
442
msgstr "從索引和工作區捨棄模式更動 [y,n,q,a,d%s,?]? "
443
443
444
-
#: add-patch.c git-add--interactive.perl
445
-
#, c-format, perl-format
444
+
#: add-patch.c
445
+
#, c-format
446
446
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
447
447
msgstr "從索引和工作區捨棄刪除 [y,n,q,a,d%s,?]? "
448
448
449
-
#: add-patch.c git-add--interactive.perl
450
-
#, c-format, perl-format
449
+
#: add-patch.c
450
+
#, c-format
451
451
msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
452
452
msgstr "從索引和工作區捨棄加入動作 [y,n,q,a,d%s,?]? "
453
453
454
-
#: add-patch.c git-add--interactive.perl
455
-
#, c-format, perl-format
454
+
#: add-patch.c
455
+
#, c-format
456
456
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
457
457
msgstr "從索引和工作區捨棄此區塊 [y,n,q,a,d%s,?]? "
458
458
···
470
470
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
471
471
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
472
472
473
-
#: add-patch.c git-add--interactive.perl
474
-
#, c-format, perl-format
473
+
#: add-patch.c
474
+
#, c-format
475
475
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
476
476
msgstr "將模式更動套用到索引和工作區 [y,n,q,a,d%s,?]? "
477
477
478
-
#: add-patch.c git-add--interactive.perl
479
-
#, c-format, perl-format
478
+
#: add-patch.c
479
+
#, c-format
480
480
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
481
481
msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
482
482
483
-
#: add-patch.c git-add--interactive.perl
484
-
#, c-format, perl-format
483
+
#: add-patch.c
484
+
#, c-format
485
485
msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
486
486
msgstr "將加入動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
487
487
488
-
#: add-patch.c git-add--interactive.perl
489
-
#, c-format, perl-format
488
+
#: add-patch.c
489
+
#, c-format
490
490
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
491
491
msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
492
492
···
504
504
"a - 套用此區塊和本檔案中後面的全部區塊\n"
505
505
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
506
506
507
-
#: add-patch.c git-add--interactive.perl
508
-
#, c-format, perl-format
507
+
#: add-patch.c
508
+
#, c-format
509
509
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
510
510
msgstr "將模式更動套用到工作區 [y,n,q,a,d%s,?]? "
511
511
512
-
#: add-patch.c git-add--interactive.perl
513
-
#, c-format, perl-format
512
+
#: add-patch.c
513
+
#, c-format
514
514
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
515
515
msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? "
516
516
517
-
#: add-patch.c git-add--interactive.perl
518
-
#, c-format, perl-format
517
+
#: add-patch.c
518
+
#, c-format
519
519
msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
520
520
msgstr "將加入動作套用到工作區 [y,n,q,a,d%s,?]? "
521
521
522
-
#: add-patch.c git-add--interactive.perl
523
-
#, c-format, perl-format
522
+
#: add-patch.c
523
+
#, c-format
524
524
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
525
525
msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
526
526
···
590
590
"\t結尾不是：\n"
591
591
"%.*s"
592
592
593
-
#: add-patch.c git-add--interactive.perl
593
+
#: add-patch.c
594
594
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
595
595
msgstr "手動區塊編輯模式——檢視底部的快速指引。\n"
596
596
···
607
607
"要刪除 “%c” 開頭的列，請直接刪除。\n"
608
608
"開頭是 %c 的列將會被移除。\n"
609
609
610
-
#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
611
-
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
612
-
#: add-patch.c git-add--interactive.perl
610
+
#: add-patch.c
613
611
msgid ""
614
612
"If it does not apply cleanly, you will be given an opportunity to\n"
615
613
"edit again. If all lines of the hunk are removed, then the edit is\n"
···
627
625
msgid "'git apply --cached' failed"
628
626
msgstr "“git apply --cached” 失敗"
629
627
630
-
#. #-#-#-#-# add-patch.c.po #-#-#-#-#
631
628
#. TRANSLATORS: do not translate [y/n]
632
629
#. The program will only accept that input at this point.
633
630
#. Consider translating (saying "no" discards!) as
634
631
#. (saying "n" for "no" discards!) if the translation
635
632
#. of the word "no" does not start with n.
636
633
#.
637
-
#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
638
-
#. TRANSLATORS: do not translate [y/n]
639
-
#. The program will only accept that input
640
-
#. at this point.
641
-
#. Consider translating (saying "no" discards!) as
642
-
#. (saying "n" for "no" discards!) if the translation
643
-
#. of the word "no" does not start with n.
644
-
#: add-patch.c git-add--interactive.perl
634
+
#: add-patch.c
645
635
msgid ""
646
636
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
647
637
msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
···
650
640
msgid "The selected hunks do not apply to the index!"
651
641
msgstr "選取的區塊無法套用至索引！"
652
642
653
-
#: add-patch.c git-add--interactive.perl
643
+
#: add-patch.c
654
644
msgid "Apply them to the worktree anyway? "
655
645
msgstr "無論如何都要套用到工作區嗎? "
656
646
657
-
#: add-patch.c git-add--interactive.perl
647
+
#: add-patch.c
658
648
msgid "Nothing was applied.\n"
659
649
msgstr "未套用。\n"
660
650
···
692
682
msgid "No other hunks to goto"
693
683
msgstr "沒有其它可以跳轉的區塊"
694
684
695
-
#: add-patch.c git-add--interactive.perl
685
+
#: add-patch.c
696
686
msgid "go to which hunk (<ret> to see more)? "
697
687
msgstr "要跳轉到哪個區塊（<ret> 檢視更多）? "
698
688
699
-
#: add-patch.c git-add--interactive.perl
689
+
#: add-patch.c
700
690
msgid "go to which hunk? "
701
691
msgstr "跳轉到哪個區塊? "
702
692
···
715
705
msgid "No other hunks to search"
716
706
msgstr "沒有其它可以尋找的區塊"
717
707
718
-
#: add-patch.c git-add--interactive.perl
708
+
#: add-patch.c
719
709
msgid "search for regex? "
720
710
msgstr "使用常規表示式搜尋? "
721
711
···
807
797
#: advice.c
808
798
msgid "Exiting because of unfinished merge."
809
799
msgstr "存在未完成的合併，離開。"
800
+
801
+
#: advice.c
802
+
msgid ""
803
+
"Diverging branches can't be fast-forwarded, you need to either:\n"
804
+
"\n"
805
+
"\tgit merge --no-ff\n"
806
+
"\n"
807
+
"or:\n"
808
+
"\n"
809
+
"\tgit rebase\n"
810
+
msgstr ""
811
+
"岔開的分支不能快轉，您得執行：\n"
812
+
"\n"
813
+
"\tgit merge --no-ff\n"
814
+
"\n"
815
+
"或者：\n"
816
+
"\n"
817
+
"\tgit rebase\n"
810
818
811
819
#: advice.c
812
820
msgid "Not possible to fast-forward, aborting."
···
1295
1303
msgid "unable to add cache entry for %s"
1296
1304
msgstr "無法為 %s 加入快取項目"
1297
1305
1298
-
#: apply.c builtin/bisect--helper.c builtin/gc.c
1306
+
#: apply.c builtin/bisect.c builtin/gc.c
1299
1307
#, c-format
1300
1308
msgid "failed to write to '%s'"
1301
1309
msgstr "無法寫入 “%s”"
···
1334
1342
#, c-format
1335
1343
msgid "cannot open %s"
1336
1344
msgstr "無法開啟 %s"
1345
+
1346
+
#: apply.c rerere.c
1347
+
#, c-format
1348
+
msgid "cannot unlink '%s'"
1349
+
msgstr "無法刪除 “%s”"
1337
1350
1338
1351
#: apply.c
1339
1352
#, c-format
···
1569
1582
msgid "cannot read '%s'"
1570
1583
msgstr "無法讀取 “%s”"
1571
1584
1585
+
#: archive.c
1586
+
#, c-format
1587
+
msgid "pathspec '%s' matches files outside the current directory"
1588
+
msgstr "符合路徑規格「%s」的檔案在目前目錄之外"
1589
+
1572
1590
#: archive.c builtin/add.c builtin/rm.c
1573
1591
#, c-format
1574
1592
msgid "pathspec '%s' did not match any files"
···
1590
1608
msgstr "非樹狀物件：%s"
1591
1609
1592
1610
#: archive.c
1593
-
msgid "current working directory is untracked"
1594
-
msgstr "尚未追蹤目前的工作目錄"
1595
-
1596
-
#: archive.c
1597
1611
#, c-format
1598
1612
msgid "File not found: %s"
1599
1613
msgstr "找不到檔案：%s"
···
1626
1640
msgid "archive format"
1627
1641
msgstr "封存格式"
1628
1642
1629
-
#: archive.c builtin/log.c
1643
+
#: archive.c builtin/log.c parse-options.h
1630
1644
msgid "prefix"
1631
1645
msgstr "前綴"
1632
1646
···
1660
1674
msgid "report archived files on stderr"
1661
1675
msgstr "在 stderr 上回報封存的檔案"
1662
1676
1677
+
#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c
1678
+
#: builtin/pull.c
1679
+
msgid "time"
1680
+
msgstr "time"
1681
+
1682
+
#: archive.c
1683
+
msgid "set modification time of archive entries"
1684
+
msgstr "設定封存項目的修改時間"
1685
+
1663
1686
#: archive.c
1664
1687
msgid "set compression level"
1665
1688
msgstr "設定壓縮級別"
···
1716
1739
msgstr "%.*s 不是有效的屬性名稱"
1717
1740
1718
1741
#: attr.c
1742
+
msgid "unable to add additional attribute"
1743
+
msgstr "無法加入其他屬性"
1744
+
1745
+
#: attr.c
1746
+
#, c-format
1747
+
msgid "ignoring overly long attributes line %d"
1748
+
msgstr "忽略過長的屬性列 (第 %d 列)"
1749
+
1750
+
#: attr.c
1719
1751
#, c-format
1720
1752
msgid "%s not allowed: %s:%d"
1721
1753
msgstr "不允許 %s：%s:%d"
···
1728
1760
"git attributes 會忽略反向模式\n"
1729
1761
"當字串確定要以驚嘆號開始時，請使用 “\\!”。"
1730
1762
1763
+
#: attr.c
1764
+
#, c-format
1765
+
msgid "cannot fstat gitattributes file '%s'"
1766
+
msgstr "無法 fstat gitattributes 檔案 “%s”"
1767
+
1768
+
#: attr.c
1769
+
#, c-format
1770
+
msgid "ignoring overly large gitattributes file '%s'"
1771
+
msgstr "忽略過大的 gitattributes 檔案 “%s”"
1772
+
1773
+
#: attr.c
1774
+
#, c-format
1775
+
msgid "ignoring overly large gitattributes blob '%s'"
1776
+
msgstr "忽略過大的 gitattributes 資料物件 “%s”"
1777
+
1778
+
#: attr.c
1779
+
msgid "bad --attr-source or GIT_ATTR_SOURCE"
1780
+
msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"
1781
+
1731
1782
#: bisect.c
1732
1783
#, c-format
1733
1784
msgid "Badly quoted content in file '%s': %s"
···
1850
1901
msgstr "--contents 和 --reverse 不能混用。"
1851
1902
1852
1903
#: blame.c
1853
-
msgid "cannot use --contents with final commit object name"
1854
-
msgstr "無法將 --contents 與最終的提交物件名稱共用"
1855
-
1856
-
#: blame.c
1857
1904
msgid "--reverse and --first-parent together require specified latest commit"
1858
1905
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1859
1906
1860
1907
#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1861
-
#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
1862
-
#: ref-filter.c remote.c sequencer.c submodule.c
1908
+
#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c remote.c
1909
+
#: sequencer.c submodule.c
1863
1910
msgid "revision walk setup failed"
1864
1911
msgstr "修訂版遍歷設定失敗"
1865
1912
···
1934
1981
msgstr "未追蹤：“%s” 引用有歧義"
1935
1982
1936
1983
# 譯者：為保證在輸出中對齊，注意調整句中空格！
1937
-
#. #-#-#-#-# branch.c.po #-#-#-#-#
1938
1984
#. TRANSLATORS: This is a line listing a remote with duplicate
1939
1985
#. refspecs in the advice message below. For RTL languages you'll
1940
1986
#. probably want to swap the "%s" and leading " " space around.
1941
1987
#.
1942
-
#. #-#-#-#-# object-name.c.po #-#-#-#-#
1943
1988
#. TRANSLATORS: This is line item of ambiguous object output
1944
1989
#. from describe_ambiguous_object() above. For RTL languages
1945
1990
#. you'll probably want to swap the "%s" and leading " " space
···
2040
2085
#: branch.c
2041
2086
#, c-format
2042
2087
msgid ""
2043
-
"You may try updating the submodules using 'git checkout %s && git submodule "
2044
-
"update --init'"
2088
+
"You may try updating the submodules using 'git checkout --no-recurse-"
2089
+
"submodules %s && git submodule update --init'"
2045
2090
msgstr ""
2046
-
"您可以嘗試使用 “git checkout %s && git submodule update --init” 命令，更新子"
2047
-
"模組"
2091
+
"您可以使用 “git checkout --no-recurse-submodules %s && git submodule update "
2092
+
"--init” 命令嘗試更新子模組"
2048
2093
2049
2094
#: branch.c
2050
2095
#, c-format
···
2055
2100
#, c-format
2056
2101
msgid "'%s' is already checked out at '%s'"
2057
2102
msgstr "“%s” 已在 “%s” 點簽出"
2058
-
2059
-
#: branch.c
2060
-
#, c-format
2061
-
msgid "HEAD of working tree %s is not updated"
2062
-
msgstr "%s 工作區的 HEAD 指針未被更新"
2063
2103
2064
2104
#: builtin/add.c
2065
2105
msgid "git add [<options>] [--] <pathspec>..."
···
2088
2128
msgid "Unstaged changes after refreshing the index:"
2089
2129
msgstr "重新整理索引之後，尚未被暫存的更動："
2090
2130
2131
+
#: builtin/add.c
2132
+
msgid ""
2133
+
"the add.interactive.useBuiltin setting has been removed!\n"
2134
+
"See its entry in 'git help config' for details."
2135
+
msgstr ""
2136
+
"add.interactive.useBuiltin 設定已被移除！\n"
2137
+
"深入了解請參閱 “git help config” 中的對應條目。"
2138
+
2091
2139
#: builtin/add.c builtin/rev-parse.c
2092
2140
msgid "Could not read the index"
2093
2141
msgstr "無法讀取索引"
···
2323
2371
msgid "could not open '%s' for reading"
2324
2372
msgstr "無法開啟 “%s” 進行讀取"
2325
2373
2326
-
#: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c
2374
+
#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c
2327
2375
#, c-format
2328
2376
msgid "could not open '%s' for writing"
2329
2377
msgstr "無法開啟 “%s” 進行寫入"
···
2545
2593
"您似乎在上一次 “am” 失敗後移動了 HEAD。\n"
2546
2594
"未倒轉回 ORIG_HEAD"
2547
2595
2548
-
#: builtin/am.c builtin/bisect--helper.c worktree.c
2596
+
#: builtin/am.c builtin/bisect.c worktree.c
2549
2597
#, c-format
2550
2598
msgid "failed to read '%s'"
2551
2599
msgstr "無法讀取 “%s”"
···
2568
2616
msgstr "互動式執行"
2569
2617
2570
2618
#: builtin/am.c
2619
+
msgid "bypass pre-applypatch and applypatch-msg hooks"
2620
+
msgstr "繞過 pre-applypatch 和 applypatch-msg 掛鉤"
2621
+
2622
+
#: builtin/am.c
2571
2623
msgid "historical option -- no-op"
2572
2624
msgstr "歷史遺留選項——無作用"
2573
2625
···
2586
2638
2587
2639
#: builtin/am.c
2588
2640
msgid "recode into utf8 (default)"
2589
-
msgstr "使用 utf8 字元集（預設）"
2641
+
msgstr "使用 utf8 字元集（預設值）"
2590
2642
2591
2643
#: builtin/am.c
2592
2644
msgid "pass -k flag to git-mailinfo"
···
2756
2808
msgid "git archive: expected a flush"
2757
2809
msgstr "git archive：預期收到 flush 封包"
2758
2810
2759
-
#: builtin/bisect--helper.c
2760
-
msgid "git bisect--helper --bisect-reset [<commit>]"
2761
-
msgstr "git bisect--helper --bisect-reset [<commit>]"
2762
-
2763
-
#: builtin/bisect--helper.c
2811
+
#: builtin/bisect.c
2764
2812
msgid ""
2765
-
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
2766
-
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2767
-
"[<paths>...]"
2813
+
"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
2814
+
"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2768
2815
msgstr ""
2769
-
"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
2770
-
"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2771
-
"[<paths>...]"
2816
+
"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
2817
+
"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2772
2818
2773
-
#: builtin/bisect--helper.c
2774
-
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
2775
-
msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
2819
+
#: builtin/bisect.c
2820
+
msgid "git bisect (good|bad) [<rev>...]"
2821
+
msgstr "git bisect (good|bad) [<rev>...]"
2776
2822
2777
-
#: builtin/bisect--helper.c
2778
-
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
2779
-
msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
2823
+
#: builtin/bisect.c
2824
+
msgid "git bisect skip [(<rev>|<range>)...]"
2825
+
msgstr "git bisect skip [(<rev>|<range>)...]"
2780
2826
2781
-
#: builtin/bisect--helper.c
2782
-
msgid "git bisect--helper --bisect-replay <filename>"
2783
-
msgstr "git bisect--helper --bisect-replay <filename>"
2827
+
#: builtin/bisect.c
2828
+
msgid "git bisect reset [<commit>]"
2829
+
msgstr "git bisect reset [<commit>]"
2784
2830
2785
-
#: builtin/bisect--helper.c
2786
-
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
2787
-
msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
2831
+
#: builtin/bisect.c
2832
+
msgid "git bisect replay <logfile>"
2833
+
msgstr "git bisect replay <logfile>"
2788
2834
2789
-
#: builtin/bisect--helper.c
2790
-
msgid "git bisect--helper --bisect-run <cmd>..."
2791
-
msgstr "git bisect--helper --bisect-run <cmd>..."
2835
+
#: builtin/bisect.c
2836
+
msgid "git bisect run <cmd>..."
2837
+
msgstr "git bisect run <cmd>..."
2792
2838
2793
-
#: builtin/bisect--helper.c
2839
+
#: builtin/bisect.c
2794
2840
#, c-format
2795
2841
msgid "cannot open file '%s' in mode '%s'"
2796
2842
msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"
2797
2843
2798
-
#: builtin/bisect--helper.c
2844
+
#: builtin/bisect.c
2799
2845
#, c-format
2800
2846
msgid "could not write to file '%s'"
2801
2847
msgstr "無法寫入 “%s” 檔案"
2802
2848
2803
-
#: builtin/bisect--helper.c
2849
+
#: builtin/bisect.c
2804
2850
#, c-format
2805
2851
msgid "cannot open file '%s' for reading"
2806
2852
msgstr "無法開啟 “%s” 檔案進行讀取"
2807
2853
2808
-
#: builtin/bisect--helper.c
2854
+
#: builtin/bisect.c
2809
2855
#, c-format
2810
2856
msgid "'%s' is not a valid term"
2811
2857
msgstr "“%s” 不是有效術語"
2812
2858
2813
-
#: builtin/bisect--helper.c
2859
+
#: builtin/bisect.c
2814
2860
#, c-format
2815
2861
msgid "can't use the builtin command '%s' as a term"
2816
2862
msgstr "不能將內建命令 “%s” 當作術語使用"
2817
2863
2818
-
#: builtin/bisect--helper.c
2864
+
#: builtin/bisect.c
2819
2865
#, c-format
2820
2866
msgid "can't change the meaning of the term '%s'"
2821
2867
msgstr "不能變更術語 “%s” 的含義"
2822
2868
2823
-
#: builtin/bisect--helper.c
2869
+
#: builtin/bisect.c
2824
2870
msgid "please use two different terms"
2825
2871
msgstr "請使用兩個不同的術語"
2826
2872
2827
-
#: builtin/bisect--helper.c
2873
+
#: builtin/bisect.c
2828
2874
#, c-format
2829
2875
msgid "We are not bisecting.\n"
2830
2876
msgstr "我們沒有在二分搜尋。\n"
2831
2877
2832
-
#: builtin/bisect--helper.c
2878
+
#: builtin/bisect.c
2833
2879
#, c-format
2834
2880
msgid "'%s' is not a valid commit"
2835
2881
msgstr "“%s” 不是有效的提交"
2836
2882
2837
-
#: builtin/bisect--helper.c
2883
+
#: builtin/bisect.c
2838
2884
#, c-format
2839
2885
msgid ""
2840
2886
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
2841
2887
msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。"
2842
2888
2843
-
#: builtin/bisect--helper.c
2889
+
#: builtin/bisect.c
2844
2890
#, c-format
2845
2891
msgid "Bad bisect_write argument: %s"
2846
2892
msgstr "bisect_write 引數無效：%s"
2847
2893
2848
-
#: builtin/bisect--helper.c
2894
+
#: builtin/bisect.c
2849
2895
#, c-format
2850
2896
msgid "couldn't get the oid of the rev '%s'"
2851
2897
msgstr "無法取得修訂版 “%s” 的物件 ID"
2852
2898
2853
-
#: builtin/bisect--helper.c
2899
+
#: builtin/bisect.c
2854
2900
#, c-format
2855
2901
msgid "couldn't open the file '%s'"
2856
2902
msgstr "無法開啟檔案 “%s”"
2857
2903
2858
-
#: builtin/bisect--helper.c
2904
+
#: builtin/bisect.c
2859
2905
#, c-format
2860
2906
msgid "Invalid command: you're currently in a %s/%s bisect"
2861
2907
msgstr "命令無效：您目前正處於二分搜尋 %s/%s 的狀態"
2862
2908
2863
-
#: builtin/bisect--helper.c
2909
+
#: builtin/bisect.c
2864
2910
#, c-format
2865
2911
msgid ""
2866
2912
"You need to give me at least one %s and %s revision.\n"
···
2869
2915
"需指定至少一個 %s 和一個 %s 修訂版。\n"
2870
2916
"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
2871
2917
2872
-
#: builtin/bisect--helper.c
2918
+
#: builtin/bisect.c
2873
2919
#, c-format
2874
2920
msgid ""
2875
2921
"You need to start by \"git bisect start\".\n"
···
2880
2926
"接著提供至少一個 %s 和一個 %s 修訂版。\n"
2881
2927
"為此您可以用 “git bisect %s” 和 “git bisect %s”。"
2882
2928
2883
-
#: builtin/bisect--helper.c
2929
+
#: builtin/bisect.c
2884
2930
#, c-format
2885
2931
msgid "bisecting only with a %s commit"
2886
2932
msgstr "在只有一個 %s 提交的情況下二分搜尋"
···
2890
2936
#. translation. The program will only accept English input
2891
2937
#. at this point.
2892
2938
#.
2893
-
#: builtin/bisect--helper.c
2939
+
#: builtin/bisect.c
2894
2940
msgid "Are you sure [Y/n]? "
2895
2941
msgstr "是否確定 [Y/n]? "
2896
2942
2897
-
#: builtin/bisect--helper.c
2943
+
#: builtin/bisect.c
2898
2944
msgid "status: waiting for both good and bad commits\n"
2899
2945
msgstr "狀態：正在等待好和壞的提交\n"
2900
2946
2901
-
#: builtin/bisect--helper.c
2947
+
#: builtin/bisect.c
2902
2948
#, c-format
2903
2949
msgid "status: waiting for bad commit, %d good commit known\n"
2904
2950
msgid_plural "status: waiting for bad commit, %d good commits known\n"
2905
2951
msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n"
2906
2952
2907
-
#: builtin/bisect--helper.c
2953
+
#: builtin/bisect.c
2908
2954
msgid "status: waiting for good commit(s), bad commit known\n"
2909
2955
msgstr "狀態：正在等待好的提交，已知有壞的提交\n"
2910
2956
2911
-
#: builtin/bisect--helper.c
2957
+
#: builtin/bisect.c
2912
2958
msgid "no terms defined"
2913
2959
msgstr "未定義術語"
2914
2960
2915
-
#: builtin/bisect--helper.c
2961
+
#: builtin/bisect.c
2916
2962
#, c-format
2917
2963
msgid ""
2918
2964
"Your current terms are %s for the old state\n"
···
2921
2967
"您目前針對舊狀態的術語是 %s；\n"
2922
2968
"對新狀態的術語是 %s。\n"
2923
2969
2924
-
#: builtin/bisect--helper.c
2970
+
#: builtin/bisect.c
2925
2971
#, c-format
2926
2972
msgid ""
2927
2973
"invalid argument %s for 'git bisect terms'.\n"
···
2930
2976
"傳入 “git bisect terms” 的 %s 引數無效。\n"
2931
2977
"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
2932
2978
2933
-
#: builtin/bisect--helper.c
2979
+
#: builtin/bisect.c
2934
2980
msgid "revision walk setup failed\n"
2935
2981
msgstr "修訂版遍歷設定失敗\n"
2936
2982
2937
-
#: builtin/bisect--helper.c
2983
+
#: builtin/bisect.c
2938
2984
#, c-format
2939
2985
msgid "could not open '%s' for appending"
2940
2986
msgstr "無法開啟 “%s” 進行附加"
2941
2987
2942
-
#: builtin/bisect--helper.c
2988
+
#: builtin/bisect.c
2943
2989
msgid "'' is not a valid term"
2944
2990
msgstr "“ ” 不是有效術語"
2945
2991
2946
-
#: builtin/bisect--helper.c
2992
+
#: builtin/bisect.c
2947
2993
#, c-format
2948
2994
msgid "unrecognized option: '%s'"
2949
2995
msgstr "無法識別選項：“%s”"
2950
2996
2951
-
#: builtin/bisect--helper.c
2997
+
#: builtin/bisect.c
2952
2998
#, c-format
2953
2999
msgid "'%s' does not appear to be a valid revision"
2954
3000
msgstr "“%s” 似乎不是有效修訂版"
2955
3001
2956
-
#: builtin/bisect--helper.c
3002
+
#: builtin/bisect.c
2957
3003
msgid "bad HEAD - I need a HEAD"
2958
3004
msgstr "HEAD 無效 — 需要一個 HEAD"
2959
3005
2960
-
#: builtin/bisect--helper.c
3006
+
#: builtin/bisect.c
2961
3007
#, c-format
2962
3008
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
2963
3009
msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。"
2964
3010
2965
-
#: builtin/bisect--helper.c
2966
-
msgid "won't bisect on cg-seek'ed tree"
2967
-
msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"
2968
-
2969
-
#: builtin/bisect--helper.c
3011
+
#: builtin/bisect.c
2970
3012
msgid "bad HEAD - strange symbolic ref"
2971
3013
msgstr "HEAD 無效 — 異常符號引用"
2972
3014
2973
-
#: builtin/bisect--helper.c
3015
+
#: builtin/bisect.c
2974
3016
#, c-format
2975
3017
msgid "invalid ref: '%s'"
2976
3018
msgstr "引用無效：“%s”"
2977
3019
2978
-
#: builtin/bisect--helper.c
3020
+
#: builtin/bisect.c
2979
3021
msgid "You need to start by \"git bisect start\"\n"
2980
3022
msgstr "要開始，請執行 “git bisect start”\n"
2981
3023
···
2984
3026
#. translation. The program will only accept English input
2985
3027
#. at this point.
2986
3028
#.
2987
-
#: builtin/bisect--helper.c
3029
+
#: builtin/bisect.c
2988
3030
msgid "Do you want me to do it for you [Y/n]? "
2989
3031
msgstr "是否要這麼做 [Y/n]? "
2990
3032
2991
-
#: builtin/bisect--helper.c
3033
+
#: builtin/bisect.c
2992
3034
msgid "Please call `--bisect-state` with at least one argument"
2993
3035
msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"
2994
3036
2995
-
#: builtin/bisect--helper.c
3037
+
#: builtin/bisect.c
2996
3038
#, c-format
2997
3039
msgid "'git bisect %s' can take only one argument."
2998
3040
msgstr "“git bisect %s” 只取一個引數。"
2999
3041
3000
-
#: builtin/bisect--helper.c
3042
+
#: builtin/bisect.c
3001
3043
#, c-format
3002
3044
msgid "Bad rev input: %s"
3003
3045
msgstr "rev 輸入格式錯誤：%s"
3004
3046
3005
-
#: builtin/bisect--helper.c
3047
+
#: builtin/bisect.c
3006
3048
#, c-format
3007
3049
msgid "Bad rev input (not a commit): %s"
3008
3050
msgstr "rev 輸入有誤（不是提交）：%s"
3009
3051
3010
-
#: builtin/bisect--helper.c
3052
+
#: builtin/bisect.c
3011
3053
msgid "We are not bisecting."
3012
3054
msgstr "我們沒有在二分搜尋。"
3013
3055
3014
-
#: builtin/bisect--helper.c
3056
+
#: builtin/bisect.c
3015
3057
#, c-format
3016
3058
msgid "'%s'?? what are you talking about?"
3017
3059
msgstr "「%s」？？您在說什麼？"
3018
3060
3019
-
#: builtin/bisect--helper.c
3061
+
#: builtin/bisect.c
3020
3062
#, c-format
3021
3063
msgid "cannot read file '%s' for replaying"
3022
3064
msgstr "無法讀取「%s」檔案進行重放"
3023
3065
3024
-
#: builtin/bisect--helper.c
3066
+
#: builtin/bisect.c
3025
3067
#, c-format
3026
3068
msgid "running %s\n"
3027
3069
msgstr "正在執行 %s\n"
3028
3070
3029
-
#: builtin/bisect--helper.c
3071
+
#: builtin/bisect.c
3030
3072
msgid "bisect run failed: no command provided."
3031
3073
msgstr "二分搜尋執行失敗：沒有提供命令。"
3032
3074
3033
-
#: builtin/bisect--helper.c
3075
+
#: builtin/bisect.c
3034
3076
#, c-format
3035
-
msgid "unable to verify '%s' on good revision"
3036
-
msgstr "無法在好的修訂版上驗證 “%s”"
3077
+
msgid "unable to verify %s on good revision"
3078
+
msgstr "無法在好的修訂版上驗證 %s"
3037
3079
3038
-
#: builtin/bisect--helper.c
3080
+
#: builtin/bisect.c
3039
3081
#, c-format
3040
3082
msgid "bogus exit code %d for good revision"
3041
3083
msgstr "好的修訂版回傳偽造的錯誤碼 %d"
3042
3084
3043
-
#: builtin/bisect--helper.c
3085
+
#: builtin/bisect.c
3044
3086
#, c-format
3045
-
msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
3046
-
msgstr "二分搜尋執行失敗：“%2$s” 回傳的離開碼 %1$d 小於 0 或 >= 128"
3087
+
msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
3088
+
msgstr "二分搜尋執行失敗：%2$s 回傳的離開碼 %1$d 小於 0 或大於 128"
3047
3089
3048
-
#: builtin/bisect--helper.c
3090
+
#: builtin/bisect.c
3049
3091
#, c-format
3050
3092
msgid "cannot open file '%s' for writing"
3051
3093
msgstr "無法開啟 “%s” 檔案進行寫入"
3052
3094
3053
-
#: builtin/bisect--helper.c
3095
+
#: builtin/bisect.c
3054
3096
msgid "bisect run cannot continue any more"
3055
3097
msgstr "二分搜尋不能繼續執行"
3056
3098
3057
-
#: builtin/bisect--helper.c
3058
-
#, c-format
3099
+
#: builtin/bisect.c
3059
3100
msgid "bisect run success"
3060
3101
msgstr "二分搜尋執行成功"
3061
3102
3062
-
#: builtin/bisect--helper.c
3063
-
#, c-format
3103
+
#: builtin/bisect.c
3064
3104
msgid "bisect found first bad commit"
3065
3105
msgstr "二分搜尋發現到第一個有問題的提交"
3066
3106
3067
-
#: builtin/bisect--helper.c
3107
+
#: builtin/bisect.c
3068
3108
#, c-format
3069
-
msgid ""
3070
-
"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
3071
-
"code %d"
3072
-
msgstr ""
3073
-
"二分搜尋執行失敗：“git bisect--helper --bisect-state %s” 以錯誤碼 %d 離開"
3109
+
msgid "bisect run failed: 'git bisect %s' exited with error code %d"
3110
+
msgstr "二分搜尋執行失敗：“git bisect %s” 以錯誤碼 %d 離開"
3074
3111
3075
-
#: builtin/bisect--helper.c
3076
-
msgid "--bisect-reset requires either no argument or a commit"
3077
-
msgstr "--bisect-reset 可以不需要引數，或者得傳入一個提交"
3078
-
3079
-
#: builtin/bisect--helper.c
3080
-
msgid "--bisect-terms requires 0 or 1 argument"
3081
-
msgstr "--bisect-terms 需要 0 或 1 個引數"
3112
+
#: builtin/bisect.c
3113
+
#, c-format
3114
+
msgid "'%s' requires either no argument or a commit"
3115
+
msgstr "“%s” 不需要引數，或者得傳入一個提交"
3082
3116
3083
-
#: builtin/bisect--helper.c
3084
-
msgid "--bisect-next requires 0 arguments"
3085
-
msgstr "--bisect-next 需要 0 個引數"
3117
+
#: builtin/bisect.c
3118
+
#, c-format
3119
+
msgid "'%s' requires 0 or 1 argument"
3120
+
msgstr "“%s” 需要 0 或 1 個引數"
3086
3121
3087
-
#: builtin/bisect--helper.c
3088
-
msgid "--bisect-log requires 0 arguments"
3089
-
msgstr "--bisect-log 需要 0 個引數"
3122
+
#: builtin/bisect.c
3123
+
#, c-format
3124
+
msgid "'%s' requires 0 arguments"
3125
+
msgstr "“%s” 不需引數"
3090
3126
3091
-
#: builtin/bisect--helper.c
3127
+
#: builtin/bisect.c
3092
3128
msgid "no logfile given"
3093
3129
msgstr "未提供日誌檔案"
3094
3130
3131
+
#: builtin/bisect.c
3132
+
#, c-format
3133
+
msgid "'%s' failed: no command provided."
3134
+
msgstr "“%s” 失敗：沒有提供命令。"
3135
+
3136
+
#: builtin/bisect.c
3137
+
msgid "need a command"
3138
+
msgstr "需要提供命令"
3139
+
3140
+
#: builtin/bisect.c builtin/cat-file.c
3141
+
#, c-format
3142
+
msgid "unknown command: '%s'"
3143
+
msgstr "未知命令：“%s”"
3144
+
3095
3145
#: builtin/blame.c
3096
3146
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3097
-
msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
3147
+
msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3098
3148
3099
3149
#: builtin/blame.c
3100
3150
msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
3101
-
msgstr "git annotate [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
3151
+
msgstr "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
3102
3152
3103
3153
#: builtin/blame.c
3104
3154
msgid "<rev-opts> are documented in git-rev-list(1)"
3105
-
msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
3155
+
msgstr "<rev-opts> 的文件在 git-rev-list(1)"
3106
3156
3107
3157
#: builtin/blame.c
3108
3158
#, c-format
3109
3159
msgid "expecting a color: %s"
3110
-
msgstr "期望一個顏色：%s"
3160
+
msgstr "預期是個顏色：%s"
3111
3161
3112
3162
#: builtin/blame.c
3113
3163
msgid "must end with a color"
3114
-
msgstr "必須以一個顏色結尾"
3164
+
msgstr "結尾必須是一個顏色"
3115
3165
3116
3166
#: builtin/blame.c
3117
3167
#, c-format
3118
3168
msgid "cannot find revision %s to ignore"
3119
-
msgstr "不能找到要忽略的版本 %s"
3169
+
msgstr "不能找到要忽略的 %s 修訂版"
3120
3170
3121
3171
#: builtin/blame.c
3122
3172
msgid "show blame entries as we find them, incrementally"
3123
-
msgstr "增量式顯示發現的 blame 條目"
3173
+
msgstr "漸進式顯示發現的溯源項目"
3124
3174
3125
3175
#: builtin/blame.c
3126
3176
msgid "do not show object names of boundary commits (Default: off)"
3127
-
msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
3177
+
msgstr "不要顯示邊界提交的物件名稱（預設值：off）"
3128
3178
3129
3179
#: builtin/blame.c
3130
3180
msgid "do not treat root commits as boundaries (Default: off)"
3131
-
msgstr "不將根提交看作邊界（預設值：off）"
3181
+
msgstr "不把根提交當作邊界（預設值：off）"
3132
3182
3133
3183
#: builtin/blame.c
3134
3184
msgid "show work cost statistics"
···
3142
3192
3143
3193
#: builtin/blame.c
3144
3194
msgid "show output score for blame entries"
3145
-
msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
3195
+
msgstr "顯示溯源項目的輸出得分"
3146
3196
3147
3197
#: builtin/blame.c
3148
3198
msgid "show original filename (Default: auto)"
···
3150
3200
3151
3201
#: builtin/blame.c
3152
3202
msgid "show original linenumber (Default: off)"
3153
-
msgstr "顯示原始檔案名稱（預設值：off）"
3203
+
msgstr "顯示原始列碼（預設值：off）"
3154
3204
3155
3205
#: builtin/blame.c
3156
3206
msgid "show in a format designed for machine consumption"
···
3158
3208
3159
3209
#: builtin/blame.c
3160
3210
msgid "show porcelain format with per-line commit information"
3161
-
msgstr "顯示每一列適合機器的提交說明"
3211
+
msgstr "顯示包含每一列提交資訊，適合機器讀取的格式"
3162
3212
3163
3213
#: builtin/blame.c
3164
3214
msgid "use the same output mode as git-annotate (Default: off)"
···
3186
3236
3187
3237
#: builtin/blame.c builtin/log.c
3188
3238
msgid "rev"
3189
-
msgstr "版本"
3239
+
msgstr "rev"
3190
3240
3191
3241
#: builtin/blame.c
3192
3242
msgid "ignore <rev> when blaming"
3193
-
msgstr "在執行 blame 動作時忽略 <修訂版>"
3243
+
msgstr "在執行溯源動作時忽略 <rev>"
3194
3244
3195
3245
#: builtin/blame.c
3196
3246
msgid "ignore revisions from <file>"
3197
-
msgstr "忽略 <檔案> 中的修訂版"
3247
+
msgstr "忽略 <file> 中的修訂版"
3198
3248
3199
3249
#: builtin/blame.c
3200
3250
msgid "color redundant metadata from previous line differently"
···
3202
3252
3203
3253
#: builtin/blame.c
3204
3254
msgid "color lines by age"
3205
-
msgstr "依據時間著色"
3255
+
msgstr "根據時間著色"
3206
3256
3207
3257
#: builtin/blame.c
3208
3258
msgid "spend extra cycles to find better match"
3209
-
msgstr "循環更多次以找到更佳符合"
3259
+
msgstr "循環更多次來找到更佳符合項目"
3210
3260
3211
3261
#: builtin/blame.c
3212
3262
msgid "use revisions from <file> instead of calling git-rev-list"
3213
-
msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
3263
+
msgstr "使用來自 <file> 的修訂集而不是呼叫 git-rev-list"
3214
3264
3215
3265
#: builtin/blame.c
3216
3266
msgid "use <file>'s contents as the final image"
3217
-
msgstr "將 <檔案> 的內容當成是最終 image"
3267
+
msgstr "將 <file> 的內容當成是最終印象"
3218
3268
3219
3269
#: builtin/blame.c
3220
3270
msgid "score"
3221
-
msgstr "得分"
3271
+
msgstr "score"
3222
3272
3223
3273
#: builtin/blame.c
3224
3274
msgid "find line copies within and across files"
3225
-
msgstr "找到檔案內及跨檔案的複製列"
3275
+
msgstr "找到檔案內及跨檔案的列拷貝動作"
3226
3276
3227
3277
#: builtin/blame.c
3228
3278
msgid "find line movements within and across files"
3229
-
msgstr "找到檔案內及跨檔案的移動列"
3279
+
msgstr "找到檔案內及跨檔案的列移動動作"
3230
3280
3231
3281
#: builtin/blame.c
3232
3282
msgid "range"
···
3256
3306
#, c-format
3257
3307
msgid "file %s has only %lu line"
3258
3308
msgid_plural "file %s has only %lu lines"
3259
-
msgstr[0] "檔案 %s 只有 %lu 行"
3309
+
msgstr[0] "檔案 %s 只有 %lu 列"
3260
3310
3261
3311
#: builtin/blame.c
3262
3312
msgid "Blaming lines"
3263
-
msgstr "追蹤程式碼行"
3313
+
msgstr "溯源文字列"
3264
3314
3265
3315
#: builtin/branch.c
3266
3316
msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
3267
-
msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
3317
+
msgstr "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
3268
3318
3269
3319
#: builtin/branch.c
3270
3320
msgid ""
3271
3321
"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
3272
3322
"point>]"
3273
-
msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
3323
+
msgstr ""
3324
+
"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
3325
+
"point>]"
3274
3326
3275
3327
#: builtin/branch.c
3276
3328
msgid "git branch [<options>] [-l] [<pattern>...]"
3277
-
msgstr "git branch [<選項>] [-l] [<模式>...]"
3329
+
msgstr "git branch [<options>] [-l] [<pattern>...]"
3278
3330
3279
3331
#: builtin/branch.c
3280
3332
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3281
-
msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
3333
+
msgstr "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3282
3334
3283
3335
#: builtin/branch.c
3284
3336
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3285
-
msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
3337
+
msgstr "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3286
3338
3287
3339
#: builtin/branch.c
3288
3340
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
3289
-
msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
3341
+
msgstr "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
3290
3342
3291
3343
#: builtin/branch.c
3292
3344
msgid "git branch [<options>] [-r | -a] [--points-at]"
3293
-
msgstr "git branch [<選項>] [-r | -a] [--points-at]"
3345
+
msgstr "git branch [<options>] [-r | -a] [--points-at]"
3294
3346
3295
3347
#: builtin/branch.c
3296
3348
msgid "git branch [<options>] [-r | -a] [--format]"
3297
-
msgstr "git branch [<選項>] [-r | -a] [--format]"
3349
+
msgstr "git branch [<options>] [-r | -a] [--format]"
3298
3350
3299
3351
# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
3300
3352
#: builtin/branch.c
···
3303
3355
"deleting branch '%s' that has been merged to\n"
3304
3356
" '%s', but not yet merged to HEAD."
3305
3357
msgstr ""
3306
-
"將要刪除的分支 '%s' 已經被合併到\n"
3307
-
" '%s'，但未合併到 HEAD。"
3358
+
"將要刪除的 “%s” 分支已經被合併到\n"
3359
+
" “%s”，但尚未合併到 HEAD。"
3308
3360
3309
3361
# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
3310
3362
#: builtin/branch.c
···
3313
3365
"not deleting branch '%s' that is not yet merged to\n"
3314
3366
" '%s', even though it is merged to HEAD."
3315
3367
msgstr ""
3316
-
"並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n"
3317
-
" 然而卻尚未被合併到分支 '%s' 。"
3368
+
"並未刪除分支 “%s”， 雖然已經合併到 HEAD，\n"
3369
+
" 卻尚未被合併至 “%s” 分支。"
3318
3370
3319
3371
#: builtin/branch.c
3320
3372
#, c-format
3321
3373
msgid "Couldn't look up commit object for '%s'"
3322
-
msgstr "無法查詢 '%s' 指向的提交物件"
3374
+
msgstr "無法查詢 “%s” 指向的提交物件"
3323
3375
3324
3376
#: builtin/branch.c
3325
3377
#, c-format
···
3327
3379
"The branch '%s' is not fully merged.\n"
3328
3380
"If you are sure you want to delete it, run 'git branch -D %s'."
3329
3381
msgstr ""
3330
-
"分支 '%s' 沒有完全合併。\n"
3331
-
"如果您確認要刪除它，執行 'git branch -D %s'。"
3382
+
"分支 “%s” 沒有完全合併。\n"
3383
+
"如果確定要刪除它，請執行 “git branch -D %s”。"
3332
3384
3333
3385
#: builtin/branch.c
3334
3386
msgid "Update of config-file failed"
3335
-
msgstr "更新設定檔案失敗"
3387
+
msgstr "更新組態檔案失敗"
3336
3388
3337
3389
#: builtin/branch.c
3338
3390
msgid "cannot use -a with -d"
···
3341
3393
#: builtin/branch.c
3342
3394
#, c-format
3343
3395
msgid "Cannot delete branch '%s' checked out at '%s'"
3344
-
msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
3396
+
msgstr "無法刪除在 “%2$s” 簽出的 “%1$s” 分支"
3345
3397
3346
3398
#: builtin/branch.c
3347
3399
#, c-format
3348
3400
msgid "remote-tracking branch '%s' not found."
3349
-
msgstr "未能找到遠端追蹤分支 '%s'。"
3401
+
msgstr "找不到 “%s” 遠端追蹤分支。"
3402
+
3403
+
#: builtin/branch.c
3404
+
#, c-format
3405
+
msgid ""
3406
+
"branch '%s' not found.\n"
3407
+
"Did you forget --remote?"
3408
+
msgstr ""
3409
+
"找不到 “%s” 分支。\n"
3410
+
"您可能要加上 --remote？"
3350
3411
3351
3412
#: builtin/branch.c
3352
3413
#, c-format
3353
3414
msgid "branch '%s' not found."
3354
-
msgstr "分支 '%s' 未發現。"
3415
+
msgstr "找不到 “%s” 分支。"
3355
3416
3356
3417
#: builtin/branch.c
3357
3418
#, c-format
···
3365
3426
3366
3427
#: builtin/branch.c builtin/tag.c
3367
3428
msgid "unable to parse format string"
3368
-
msgstr "不能解析格式化字串"
3429
+
msgstr "無法解析格式化字串"
3369
3430
3370
3431
#: builtin/branch.c
3371
3432
msgid "could not resolve HEAD"
3372
-
msgstr "不能解析 HEAD 提交"
3433
+
msgstr "無法解析 HEAD 指針"
3373
3434
3374
3435
#: builtin/branch.c
3375
3436
#, c-format
3376
3437
msgid "HEAD (%s) points outside of refs/heads/"
3377
-
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
3438
+
msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外"
3378
3439
3379
3440
#: builtin/branch.c
3380
3441
#, c-format
3381
3442
msgid "Branch %s is being rebased at %s"
3382
-
msgstr "分支 %s 正被重定基底到 %s"
3443
+
msgstr "%s 分支正在重定基底至 %s"
3383
3444
3384
3445
#: builtin/branch.c
3385
3446
#, c-format
3386
3447
msgid "Branch %s is being bisected at %s"
3387
-
msgstr "分支 %s 正被二分搜尋於 %s"
3448
+
msgstr "%s 分支正於 %s 進行二分搜尋"
3449
+
3450
+
#: builtin/branch.c
3451
+
#, c-format
3452
+
msgid "HEAD of working tree %s is not updated"
3453
+
msgstr "%s 工作區的 HEAD 指針未被更新"
3388
3454
3389
3455
#: builtin/branch.c
3390
3456
#, c-format
3391
3457
msgid "Invalid branch name: '%s'"
3392
-
msgstr "無效的分支名：'%s'"
3458
+
msgstr "分支名稱無效：“%s”"
3393
3459
3394
3460
#: builtin/branch.c
3395
3461
#, c-format
3396
3462
msgid "No commit on branch '%s' yet."
3397
-
msgstr "分支 '%s' 尚無提交。"
3463
+
msgstr "分支 “%s” 尚無提交。"
3398
3464
3399
3465
#: builtin/branch.c
3400
3466
#, c-format
3401
3467
msgid "No branch named '%s'."
3402
-
msgstr "沒有分支 '%s'。"
3468
+
msgstr "沒有名為 “%s” 的分支。"
3403
3469
3404
3470
#: builtin/branch.c
3405
3471
msgid "Branch rename failed"
···
3407
3473
3408
3474
#: builtin/branch.c
3409
3475
msgid "Branch copy failed"
3410
-
msgstr "分支複製失敗"
3476
+
msgstr "分支拷貝失敗"
3411
3477
3412
3478
#: builtin/branch.c
3413
3479
#, c-format
3414
3480
msgid "Created a copy of a misnamed branch '%s'"
3415
-
msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
3481
+
msgstr "已為誤命名的 “%s” 分支建立拷貝"
3416
3482
3417
3483
#: builtin/branch.c
3418
3484
#, c-format
3419
3485
msgid "Renamed a misnamed branch '%s' away"
3420
-
msgstr "已將錯誤命名的分支 '%s' 重新命名"
3486
+
msgstr "已更改誤命名的 “%s” 分支的名稱"
3421
3487
3422
3488
#: builtin/branch.c
3423
3489
#, c-format
3424
3490
msgid "Branch renamed to %s, but HEAD is not updated!"
3425
-
msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
3491
+
msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新！"
3426
3492
3427
3493
#: builtin/branch.c
3428
3494
msgid "Branch is renamed, but update of config-file failed"
3429
-
msgstr "分支被重新命名，但更新設定檔案失敗"
3495
+
msgstr "分支已重新命名，但無法更新組態檔案"
3430
3496
3431
3497
#: builtin/branch.c
3432
3498
msgid "Branch is copied, but update of config-file failed"
3433
-
msgstr "分支已複製，但更新設定檔案失敗"
3499
+
msgstr "分支已拷貝，但無法更新組態檔案"
3434
3500
3435
3501
#: builtin/branch.c
3436
3502
#, c-format
···
3439
3505
" %s\n"
3440
3506
"Lines starting with '%c' will be stripped.\n"
3441
3507
msgstr ""
3442
-
"請編輯分支的描述\n"
3508
+
"請編輯下述分支的描述\n"
3443
3509
" %s\n"
3444
-
"以 '%c' 開頭的行將被過濾。\n"
3510
+
"開頭是 “%c” 的列將被刪除。\n"
3445
3511
3446
3512
#: builtin/branch.c
3447
3513
msgid "Generic options"
3448
-
msgstr "通用選項"
3514
+
msgstr "一般性選項"
3449
3515
3450
3516
#: builtin/branch.c
3451
3517
msgid "show hash and subject, give twice for upstream branch"
3452
-
msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
3518
+
msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支"
3453
3519
3454
3520
#: builtin/branch.c
3455
3521
msgid "suppress informational messages"
3456
-
msgstr "不顯示訊息"
3522
+
msgstr "不顯示資訊訊息"
3457
3523
3458
3524
#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
3459
3525
msgid "set branch tracking configuration"
3460
-
msgstr "設定分支追蹤設定"
3526
+
msgstr "設定分支追蹤組態"
3461
3527
3462
3528
#: builtin/branch.c
3463
3529
msgid "do not use"
3464
-
msgstr "不要使用"
3530
+
msgstr "請勿使用"
3465
3531
3466
3532
#: builtin/branch.c
3467
3533
msgid "upstream"
3468
-
msgstr "上游"
3534
+
msgstr "upstream"
3469
3535
3470
3536
#: builtin/branch.c
3471
3537
msgid "change the upstream info"
3472
-
msgstr "改變上游訊息"
3538
+
msgstr "變更上游資訊"
3473
3539
3474
3540
#: builtin/branch.c
3475
3541
msgid "unset the upstream info"
3476
-
msgstr "取消上游資訊設定"
3542
+
msgstr "取消設定上游資訊"
3477
3543
3478
3544
#: builtin/branch.c
3479
3545
msgid "use colored output"
···
3485
3551
3486
3552
#: builtin/branch.c
3487
3553
msgid "print only branches that contain the commit"
3488
-
msgstr "只列印包含該提交的分支"
3554
+
msgstr "只輸出包含此提交的分支"
3489
3555
3490
3556
#: builtin/branch.c
3491
3557
msgid "print only branches that don't contain the commit"
3492
-
msgstr "只列印不包含該提交的分支"
3558
+
msgstr "只輸出不包含此提交的分支"
3493
3559
3494
3560
#: builtin/branch.c
3495
3561
msgid "Specific git-branch actions:"
3496
-
msgstr "具體的 git-branch 動作："
3562
+
msgstr "特定的 git-branch 動作："
3497
3563
3498
3564
#: builtin/branch.c
3499
3565
msgid "list both remote-tracking and local branches"
3500
-
msgstr "列出遠端追蹤及本機分支"
3566
+
msgstr "列出遠端追蹤和本機分支"
3501
3567
3502
3568
#: builtin/branch.c
3503
3569
msgid "delete fully merged branch"
···
3505
3571
3506
3572
#: builtin/branch.c
3507
3573
msgid "delete branch (even if not merged)"
3508
-
msgstr "刪除分支（即使沒有合併）"
3574
+
msgstr "刪除分支（即使尚未合併）"
3509
3575
3510
3576
#: builtin/branch.c
3511
3577
msgid "move/rename a branch and its reflog"
3512
-
msgstr "移動/重新命名一個分支，以及它的引用日誌"
3578
+
msgstr "移動或重新命名分支及其引用日誌"
3513
3579
3514
3580
#: builtin/branch.c
3515
3581
msgid "move/rename a branch, even if target exists"
3516
-
msgstr "移動/重新命名一個分支，即使目標已存在"
3582
+
msgstr "即使目標已存在，仍移動或重新命名分支"
3583
+
3584
+
#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
3585
+
msgid "do not output a newline after empty formatted refs"
3586
+
msgstr "在格式化引用結果為空之後，不要輸出換列符號"
3517
3587
3518
3588
#: builtin/branch.c
3519
3589
msgid "copy a branch and its reflog"
3520
-
msgstr "複製分支及其引用日誌"
3590
+
msgstr "拷貝分支及其引用日誌"
3521
3591
3522
3592
#: builtin/branch.c
3523
3593
msgid "copy a branch, even if target exists"
3524
-
msgstr "複製一個分支，即使目標已存在"
3594
+
msgstr "即使目標已存在仍拷貝分支"
3525
3595
3526
3596
#: builtin/branch.c
3527
3597
msgid "list branch names"
3528
-
msgstr "列出分支名"
3598
+
msgstr "列出分支名稱"
3529
3599
3530
3600
#: builtin/branch.c
3531
3601
msgid "show current branch name"
3532
-
msgstr "顯示目前分支名"
3602
+
msgstr "顯示目前分支名稱"
3533
3603
3534
3604
#: builtin/branch.c builtin/submodule--helper.c
3535
3605
msgid "create the branch's reflog"
···
3537
3607
3538
3608
#: builtin/branch.c
3539
3609
msgid "edit the description for the branch"
3540
-
msgstr "標記分支的描述"
3610
+
msgstr "編輯分支的描述"
3541
3611
3542
3612
#: builtin/branch.c
3543
3613
msgid "force creation, move/rename, deletion"
···
3545
3615
3546
3616
#: builtin/branch.c
3547
3617
msgid "print only branches that are merged"
3548
-
msgstr "只列印已經合併的分支"
3618
+
msgstr "只輸出已經合併的分支"
3549
3619
3550
3620
#: builtin/branch.c
3551
3621
msgid "print only branches that are not merged"
3552
-
msgstr "只列印尚未合併的分支"
3622
+
msgstr "只輸出尚未合併的分支"
3553
3623
3554
3624
#: builtin/branch.c
3555
3625
msgid "list branches in columns"
3556
-
msgstr "以列的方式顯示分支"
3626
+
msgstr "以行的形式列出分支"
3557
3627
3558
3628
#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
3559
3629
msgid "object"
3560
-
msgstr "物件"
3630
+
msgstr "object"
3561
3631
3562
3632
#: builtin/branch.c
3563
3633
msgid "print only branches of the object"
3564
-
msgstr "只列印指向該物件的分支"
3634
+
msgstr "只輸出指向此物件的分支"
3565
3635
3566
3636
#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
3567
3637
msgid "sorting and filtering are case insensitive"
3568
-
msgstr "排序和過濾屬於大小寫不敏感"
3638
+
msgstr "排序和過濾不區分大小寫"
3569
3639
3570
3640
#: builtin/branch.c builtin/ls-files.c
3571
3641
msgid "recurse through submodules"
···
3582
3652
3583
3653
#: builtin/branch.c builtin/clone.c
3584
3654
msgid "HEAD not found below refs/heads!"
3585
-
msgstr "HEAD 沒有位於 /refs/heads 之下！"
3655
+
msgstr "HEAD 指針不在 /refs/heads 中！"
3586
3656
3587
3657
#: builtin/branch.c
3588
3658
msgid ""
3589
3659
"branch with --recurse-submodules can only be used if submodule."
3590
3660
"propagateBranches is enabled"
3591
3661
msgstr ""
3592
-
"有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用"
3662
+
"有 --recurse-submodules 的分支，只能在啟用 submodule.propagateBranches 時使用"
3593
3663
3594
3664
#: builtin/branch.c
3595
3665
msgid "--recurse-submodules can only be used to create branches"
···
3597
3667
3598
3668
#: builtin/branch.c
3599
3669
msgid "branch name required"
3600
-
msgstr "必須提供分支名"
3670
+
msgstr "必須提供分支名稱"
3601
3671
3602
3672
#: builtin/branch.c
3603
3673
msgid "Cannot give description to detached HEAD"
3604
-
msgstr "不能向分離開頭指標提供描述"
3674
+
msgstr "無法向分離 HEAD 指針提供描述"
3605
3675
3606
3676
#: builtin/branch.c
3607
3677
msgid "cannot edit description of more than one branch"
3608
-
msgstr "不能為一個以上的分支編輯描述"
3678
+
msgstr "無法編輯超過一個分支的描述"
3609
3679
3610
3680
#: builtin/branch.c
3611
3681
msgid "cannot copy the current branch while not on any."
3612
-
msgstr "無法複製目前分支因為不處於任何分支上。"
3682
+
msgstr "不在任何分支上，無法拷貝目前分支。"
3613
3683
3614
3684
#: builtin/branch.c
3615
3685
msgid "cannot rename the current branch while not on any."
3616
-
msgstr "無法重新命名目前分支因為不處於任何分支上。"
3686
+
msgstr "不在任何分支上，無法重新命名目前分支。"
3617
3687
3618
3688
#: builtin/branch.c
3619
3689
msgid "too many branches for a copy operation"
3620
-
msgstr "為複製動作提供了太多的分支名"
3690
+
msgstr "要進行拷貝動作的分支太多"
3621
3691
3622
3692
#: builtin/branch.c
3623
3693
msgid "too many arguments for a rename operation"
3624
-
msgstr "為重新命名動作提供了太多的參數"
3694
+
msgstr "傳入重新命名動作的引數太多"
3625
3695
3626
3696
#: builtin/branch.c
3627
3697
msgid "too many arguments to set new upstream"
3628
-
msgstr "為設定新上游提供了太多的參數"
3698
+
msgstr "要設定新上游的引數太多"
3629
3699
3630
3700
#: builtin/branch.c
3631
3701
#, c-format
3632
3702
msgid ""
3633
3703
"could not set upstream of HEAD to %s when it does not point to any branch."
3634
-
msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。"
3704
+
msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支。"
3635
3705
3636
3706
#: builtin/branch.c
3637
3707
#, c-format
3638
3708
msgid "no such branch '%s'"
3639
-
msgstr "沒有此分支 '%s'"
3709
+
msgstr "無 “%s” 分支"
3640
3710
3641
3711
#: builtin/branch.c
3642
3712
#, c-format
3643
3713
msgid "branch '%s' does not exist"
3644
-
msgstr "分支 '%s' 不存在"
3714
+
msgstr "沒有 “%s” 分支"
3645
3715
3646
3716
#: builtin/branch.c
3647
3717
msgid "too many arguments to unset upstream"
3648
-
msgstr "為取消上游設定動作提供了太多的參數"
3718
+
msgstr "要取消設定上游的引數太多"
3649
3719
3650
3720
#: builtin/branch.c
3651
3721
msgid "could not unset upstream of HEAD when it does not point to any branch."
3652
-
msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
3722
+
msgstr "無法取消設定 HEAD 的上游：其未指向任何分支。"
3653
3723
3654
3724
#: builtin/branch.c
3655
3725
#, c-format
3656
3726
msgid "Branch '%s' has no upstream information"
3657
-
msgstr "分支 '%s' 沒有上游訊息"
3727
+
msgstr "分支 “%s” 沒有上游資訊"
3658
3728
3659
3729
#: builtin/branch.c
3660
3730
msgid ""
3661
3731
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
3662
3732
"Did you mean to use: -a|-r --list <pattern>?"
3663
3733
msgstr ""
3664
-
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
3665
-
"您是否想要使用：-a|-r --list <模式>？"
3734
+
"“git branch” 的 -a 和 -r 選項不取分支名稱。\n"
3735
+
"您是想使用：-a|-r --list <pattern> 嗎？"
3666
3736
3667
3737
#: builtin/branch.c
3668
3738
msgid ""
3669
3739
"the '--set-upstream' option is no longer supported. Please use '--track' or "
3670
3740
"'--set-upstream-to' instead."
3671
3741
msgstr ""
3672
-
"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。"
3742
+
"不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”。"
3673
3743
3674
3744
#: builtin/bugreport.c
3675
3745
msgid "git version:\n"
···
3678
3748
#: builtin/bugreport.c
3679
3749
#, c-format
3680
3750
msgid "uname() failed with error '%s' (%d)\n"
3681
-
msgstr "uname() 失敗，錯誤：「%s」(%d)\n"
3751
+
msgstr "uname() 失敗，錯誤：“%s” (%d)\n"
3682
3752
3683
3753
#: builtin/bugreport.c
3684
3754
msgid "compiler info: "
···
3690
3760
3691
3761
#: builtin/bugreport.c
3692
3762
msgid "not run from a git repository - no hooks to show\n"
3693
-
msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n"
3763
+
msgstr "不是在 git 版本庫執行 — 沒有可顯示的掛鉤\n"
3694
3764
3695
3765
#: builtin/bugreport.c
3696
3766
msgid ""
···
3719
3789
"You can delete any lines you don't wish to share.\n"
3720
3790
msgstr ""
3721
3791
"感謝您填寫 Git 臭蟲報告！\n"
3722
-
"請回答下列問題，以讓我們能夠了解您的問題。\n"
3792
+
"請回答下列詢問，協助我們了解您的問題。\n"
3723
3793
"\n"
3724
3794
"臭蟲發生前，您做了什麼？（重現問題的步驟）\n"
3725
3795
"\n"
3726
-
"你原本期望發生什麼？（期望行為）\n"
3796
+
"原本您預期發生什麼？（預期行為）\n"
3727
3797
"\n"
3728
3798
"那實際上發生了什麼？（實際行為）\n"
3729
3799
"\n"
3730
-
"期望行為跟實際發生的行為有什麼不同？\n"
3800
+
"預期發生的行為，跟實際發生的行為有什麼不同？\n"
3731
3801
"\n"
3732
3802
"其他您想加入的：\n"
3733
3803
"\n"
···
3737
3807
#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
3738
3808
#: parse-options.h
3739
3809
msgid "mode"
3740
-
msgstr "模式"
3810
+
msgstr "mode"
3741
3811
3742
3812
#: builtin/bugreport.c
3743
3813
msgid ""
3744
3814
"create an additional zip archive of detailed diagnostics (default 'stats')"
3745
-
msgstr "建立詳細診斷資訊的額外 zip 封存檔案（預設值是 “stats”）"
3815
+
msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值 “stats”）"
3746
3816
3747
3817
#: builtin/bugreport.c
3748
3818
msgid "specify a destination for the bugreport file(s)"
3749
-
msgstr "請指定臭蟲報告檔案的目的地"
3819
+
msgstr "指定臭蟲報告檔案的目的地"
3750
3820
3751
3821
#: builtin/bugreport.c
3752
3822
msgid "specify a strftime format suffix for the filename(s)"
3753
-
msgstr "指定檔名，strftime 格式的後綴"
3823
+
msgstr "指定用於檔名的 strftime 格式後綴"
3754
3824
3755
3825
#: builtin/bugreport.c builtin/diagnose.c
3756
3826
#, c-format
3757
3827
msgid "could not create leading directories for '%s'"
3758
-
msgstr "無法建立 '%s' 的前置目錄"
3828
+
msgstr "無法建立 “%s” 的前置目錄"
3759
3829
3760
3830
#: builtin/bugreport.c builtin/diagnose.c
3761
3831
#, c-format
···
3778
3848
#: builtin/bugreport.c
3779
3849
#, c-format
3780
3850
msgid "Created new report at '%s'.\n"
3781
-
msgstr "已在「%s」建立新報告。\n"
3851
+
msgstr "已在 “%s” 建立新報告。\n"
3782
3852
3783
3853
#: builtin/bundle.c
3784
3854
msgid ""
3785
-
"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
3786
-
"progress-implied]\n"
3855
+
"git bundle create [-q | --quiet | --progress]\n"
3787
3856
" [--version=<version>] <file> <git-rev-list-args>"
3788
3857
msgstr ""
3789
-
"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
3790
-
"progress-implied]\n"
3858
+
"git bundle create [-q | --quiet | --progress]\n"
3791
3859
" [--version=<version>] <file> <git-rev-list-args>"
3792
3860
3793
3861
#: builtin/bundle.c
···
3796
3864
3797
3865
#: builtin/bundle.c
3798
3866
msgid "git bundle list-heads <file> [<refname>...]"
3799
-
msgstr "git bundle list-heads <檔案> [<引用名稱>...]"
3867
+
msgstr "git bundle list-heads <file> [<refname>...]"
3800
3868
3801
3869
#: builtin/bundle.c
3802
3870
msgid "git bundle unbundle [--progress] <file> [<refname>...]"
3803
3871
msgstr "git bundle unbundle [--progress] <file> [<refname>...]"
3804
3872
3873
+
#: builtin/bundle.c
3874
+
msgid "need a <file> argument"
3875
+
msgstr "需要提供 <file> 引數"
3876
+
3805
3877
#: builtin/bundle.c builtin/pack-objects.c
3806
3878
msgid "do not show progress meter"
3807
-
msgstr "不顯示進度表"
3879
+
msgstr "不顯示進度列"
3808
3880
3809
3881
#: builtin/bundle.c builtin/pack-objects.c
3810
3882
msgid "show progress meter"
3811
-
msgstr "顯示進度表"
3883
+
msgstr "顯示進度列"
3812
3884
3813
-
#: builtin/bundle.c builtin/pack-objects.c
3814
-
msgid "show progress meter during object writing phase"
3815
-
msgstr "在物件寫入階段顯示進度表"
3885
+
#: builtin/bundle.c
3886
+
msgid "historical; same as --progress"
3887
+
msgstr "歷史遺留選項；和 --progress 相同"
3816
3888
3817
-
#: builtin/bundle.c builtin/pack-objects.c
3818
-
msgid "similar to --all-progress when progress meter is shown"
3819
-
msgstr "當進度表顯示時類似於 --all-progress"
3889
+
#: builtin/bundle.c
3890
+
msgid "historical; does nothing"
3891
+
msgstr "歷史遺留選項；沒有作用"
3820
3892
3821
3893
#: builtin/bundle.c
3822
3894
msgid "specify bundle format version"
···
3841
3913
3842
3914
#: builtin/bundle.c
3843
3915
msgid "Unbundling objects"
3844
-
msgstr "正在解包物件"
3916
+
msgstr "正在拆分物件"
3845
3917
3846
3918
#: builtin/cat-file.c merge-recursive.c
3847
3919
#, c-format
3848
3920
msgid "cannot read object %s '%s'"
3849
-
msgstr "不能讀取物件 %s '%s'"
3921
+
msgstr "無法讀取物件 %s “%s”"
3850
3922
3851
3923
#: builtin/cat-file.c
3852
3924
msgid "flush is only for --buffer mode"
···
3859
3931
#: builtin/cat-file.c
3860
3932
#, c-format
3861
3933
msgid "whitespace before command: '%s'"
3862
-
msgstr "命令前空格：「%s」"
3934
+
msgstr "命令前有空格：“%s”"
3863
3935
3864
3936
#: builtin/cat-file.c
3865
3937
#, c-format
···
3872
3944
msgstr "%s 不取引數"
3873
3945
3874
3946
#: builtin/cat-file.c
3875
-
#, c-format
3876
-
msgid "unknown command: '%s'"
3877
-
msgstr "未知命令：「%s」"
3878
-
3879
-
#: builtin/cat-file.c
3880
3947
msgid "only one batch option may be specified"
3881
3948
msgstr "只能指定一個批次處理選項"
3882
3949
···
3926
3993
3927
3994
#: builtin/cat-file.c
3928
3995
msgid "Emit [broken] object attributes"
3929
-
msgstr "輸出 [損壞的] 物件屬性"
3996
+
msgstr "輸出 [損壞的] ([broken]) 物件屬性"
3930
3997
3931
3998
#: builtin/cat-file.c
3932
3999
msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"
···
3958
4025
3959
4026
#: builtin/cat-file.c
3960
4027
msgid "stdin is NUL-terminated"
3961
-
msgstr "標準輸入以 NUL 字元終止"
4028
+
msgstr "stdin 以 NUL 字元終止"
3962
4029
3963
4030
#: builtin/cat-file.c
3964
4031
msgid "read commands from stdin"
3965
-
msgstr "從標準輸入讀取命令"
4032
+
msgstr "從 stdin 讀取命令"
3966
4033
3967
4034
#: builtin/cat-file.c
3968
4035
msgid "with --batch[-check]: ignores stdin, batches all known objects"
3969
-
msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件"
4036
+
msgstr "傳入 --batch[-check]：忽略 stdin，批次處理所有已知物件"
3970
4037
3971
4038
#: builtin/cat-file.c
3972
4039
msgid "Change or optimize batch output"
···
3978
4045
3979
4046
#: builtin/cat-file.c
3980
4047
msgid "follow in-tree symlinks"
3981
-
msgstr "追蹤樹中的符號連結"
4048
+
msgstr "追蹤樹狀物件中的符號連結"
3982
4049
3983
4050
#: builtin/cat-file.c
3984
4051
msgid "do not order objects before emitting them"
3985
-
msgstr "不要在輸出物件前排序"
4052
+
msgstr "不要在輸出前排序物件"
3986
4053
3987
4054
#: builtin/cat-file.c
3988
4055
msgid ""
3989
4056
"Emit object (blob or tree) with conversion or filter (stand-alone, or with "
3990
4057
"batch)"
3991
-
msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）"
4058
+
msgstr "轉換或過濾後輸出物件 (blob 或 tree)（單獨或批次處理）"
3992
4059
3993
4060
#: builtin/cat-file.c
3994
4061
msgid "run textconv on object's content"
3995
-
msgstr "在物件內容執行 textconv"
4062
+
msgstr "對物件內容進行文字轉換 (textconv)"
3996
4063
3997
4064
#: builtin/cat-file.c
3998
4065
msgid "run filters on object's content"
···
4009
4076
#: builtin/cat-file.c
4010
4077
#, c-format
4011
4078
msgid "'%s=<%s>' needs '%s' or '%s'"
4012
-
msgstr "「%s=<%s>」需要「%s」或「%s」"
4079
+
msgstr "“%s=<%s>” 需要 “%s” 或 “%s”"
4013
4080
4014
4081
#: builtin/cat-file.c
4015
4082
msgid "path|tree-ish"
···
4018
4085
#: builtin/cat-file.c
4019
4086
#, c-format
4020
4087
msgid "'%s' requires a batch mode"
4021
-
msgstr "「%s」需要批次處理模式"
4088
+
msgstr "“%s” 需要批次處理模式"
4022
4089
4023
4090
#: builtin/cat-file.c
4024
4091
#, c-format
4025
4092
msgid "'-%c' is incompatible with batch mode"
4026
-
msgstr "「-%c」與批次處理模式不相容"
4093
+
msgstr "“-%c” 與批次處理模式不相容"
4027
4094
4028
4095
#: builtin/cat-file.c
4029
4096
msgid "batch modes take no arguments"
···
4032
4099
#: builtin/cat-file.c
4033
4100
#, c-format
4034
4101
msgid "<rev> required with '%s'"
4035
-
msgstr "<rev> 需要搭配「%s」"
4102
+
msgstr "“%s” 需要 <rev>"
4036
4103
4037
4104
#: builtin/cat-file.c
4038
4105
#, c-format
4039
4106
msgid "<object> required with '-%c'"
4040
-
msgstr "<object> 需要搭配「-%c」"
4107
+
msgstr "“-%c” 需要 <object>"
4041
4108
4042
4109
#: builtin/cat-file.c
4043
4110
#, c-format
···
4045
4112
msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個"
4046
4113
4047
4114
#: builtin/check-attr.c
4048
-
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4049
-
msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..."
4115
+
msgid ""
4116
+
"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
4117
+
"<pathname>..."
4118
+
msgstr ""
4119
+
"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
4120
+
"<pathname>..."
4050
4121
4051
4122
#: builtin/check-attr.c
4052
-
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4053
-
msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
4123
+
msgid ""
4124
+
"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
4125
+
msgstr ""
4126
+
"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
4054
4127
4055
4128
#: builtin/check-attr.c
4056
4129
msgid "report all attributes set on file"
4057
-
msgstr "報告設定在檔案上的所有屬性"
4130
+
msgstr "回報設定在檔案上的所有屬性"
4058
4131
4059
4132
#: builtin/check-attr.c
4060
4133
msgid "use .gitattributes only from the index"
···
4062
4135
4063
4136
#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c
4064
4137
msgid "read file names from stdin"
4065
-
msgstr "從標準輸入讀出檔案名"
4138
+
msgstr "從 stdin 讀出檔案名稱"
4066
4139
4067
4140
#: builtin/check-attr.c builtin/check-ignore.c
4068
4141
msgid "terminate input and output records by a NUL character"
4069
-
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
4142
+
msgstr "輸入和輸出的紀錄使用 NUL 字元終止"
4143
+
4144
+
#: builtin/check-attr.c
4145
+
msgid "<tree-ish>"
4146
+
msgstr "<tree-ish>"
4147
+
4148
+
#: builtin/check-attr.c
4149
+
msgid "which tree-ish to check attributes at"
4150
+
msgstr "要用哪一個樹狀物件檢查屬性"
4070
4151
4071
4152
#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
4072
4153
msgid "suppress progress reporting"
···
4074
4155
4075
4156
#: builtin/check-ignore.c
4076
4157
msgid "show non-matching input paths"
4077
-
msgstr "顯示未符合的輸入路徑"
4158
+
msgstr "顯示不符合的輸入路徑"
4078
4159
4079
4160
#: builtin/check-ignore.c
4080
4161
msgid "ignore index when checking"
···
4082
4163
4083
4164
#: builtin/check-ignore.c
4084
4165
msgid "cannot specify pathnames with --stdin"
4085
-
msgstr "不能同時指定路徑及 --stdin 參數"
4166
+
msgstr "無法同時指定路徑名稱及 --stdin"
4086
4167
4087
4168
#: builtin/check-ignore.c
4088
4169
msgid "-z only makes sense with --stdin"
4089
-
msgstr "-z 需要和 --stdin 參數共用才有意義"
4170
+
msgstr "-z 需要和 --stdin 同時使用才有意義"
4090
4171
4091
4172
#: builtin/check-ignore.c
4092
4173
msgid "no path specified"
···
4094
4175
4095
4176
#: builtin/check-ignore.c
4096
4177
msgid "--quiet is only valid with a single pathname"
4097
-
msgstr "參數 --quiet 只在提供一個路徑名時有效"
4178
+
msgstr "引數 --quiet 只在提供一個路徑名稱時有效"
4098
4179
4099
4180
#: builtin/check-ignore.c
4100
4181
msgid "cannot have both --quiet and --verbose"
4101
-
msgstr "不能同時提供 --quiet 和 --verbose 參數"
4182
+
msgstr "無法同時傳入 --quiet 和 --verbose"
4102
4183
4103
4184
#: builtin/check-ignore.c
4104
4185
msgid "--non-matching is only valid with --verbose"
···
4106
4187
4107
4188
#: builtin/check-mailmap.c
4108
4189
msgid "git check-mailmap [<options>] <contact>..."
4109
-
msgstr "git check-mailmap [<選項>] <聯繫位址>..."
4190
+
msgstr "git check-mailmap [<options>] <contact>..."
4110
4191
4111
4192
#: builtin/check-mailmap.c
4112
4193
msgid "also read contacts from stdin"
4113
-
msgstr "還從標準輸入讀取聯繫位址"
4194
+
msgstr "亦從 stdin 讀取聯絡地址"
4114
4195
4115
4196
#: builtin/check-mailmap.c
4116
4197
#, c-format
4117
4198
msgid "unable to parse contact: %s"
4118
-
msgstr "不能解析聯繫位址：%s"
4199
+
msgstr "無法解析聯絡地址：%s"
4119
4200
4120
4201
#: builtin/check-mailmap.c
4121
4202
msgid "no contacts specified"
4122
-
msgstr "未指定聯繫位址"
4203
+
msgstr "未指定聯絡地址"
4123
4204
4124
4205
#: builtin/checkout--worker.c
4125
4206
msgid "git checkout--worker [<options>]"
4126
-
msgstr "git checkout--worker [<選項>]"
4207
+
msgstr "git checkout--worker [<options>]"
4127
4208
4128
4209
#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c
4129
4210
#: builtin/submodule--helper.c builtin/worktree.c
4130
4211
msgid "string"
4131
-
msgstr "字串"
4212
+
msgstr "string"
4132
4213
4133
4214
#: builtin/checkout--worker.c builtin/checkout-index.c
4134
4215
msgid "when creating files, prepend <string>"
4135
-
msgstr "在建立檔案時，在前面加上 <字串>"
4216
+
msgstr "建立檔案時，在前面加上 <string>"
4136
4217
4137
4218
#: builtin/checkout-index.c
4138
4219
msgid "git checkout-index [<options>] [--] [<file>...]"
4139
-
msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
4220
+
msgstr "git checkout-index [<options>] [--] [<file>...]"
4140
4221
4141
4222
#: builtin/checkout-index.c
4142
4223
msgid "stage should be between 1 and 3 or all"
4143
-
msgstr "索引值應該取值 1 到 3 或者 all"
4224
+
msgstr "stage 應該是 1 到 3 的值，或者是 all"
4144
4225
4145
4226
#: builtin/checkout-index.c
4146
4227
msgid "check out all files in the index"
···
4164
4245
4165
4246
#: builtin/checkout-index.c
4166
4247
msgid "update stat information in the index file"
4167
-
msgstr "更新索引中檔案的狀態訊息"
4248
+
msgstr "更新索引檔案的狀態訊息"
4168
4249
4169
4250
#: builtin/checkout-index.c
4170
4251
msgid "read list of paths from the standard input"
4171
-
msgstr "從標準輸入讀取路徑列表"
4252
+
msgstr "從標準輸入讀取路徑清單"
4172
4253
4173
4254
#: builtin/checkout-index.c
4174
4255
msgid "write the content to temporary files"
···
4180
4261
4181
4262
#: builtin/checkout.c
4182
4263
msgid "git checkout [<options>] <branch>"
4183
-
msgstr "git checkout [<選項>] <分支>"
4264
+
msgstr "git checkout [<options>] <branch>"
4184
4265
4185
4266
#: builtin/checkout.c
4186
4267
msgid "git checkout [<options>] [<branch>] -- <file>..."
4187
-
msgstr "git checkout [<選項>] [<分支>] -- <檔案>..."
4268
+
msgstr "git checkout [<options>] [<branch>] -- <file>..."
4188
4269
4189
4270
#: builtin/checkout.c
4190
4271
msgid "git switch [<options>] [<branch>]"
4191
-
msgstr "git switch [<選項>] [<分支>]"
4272
+
msgstr "git switch [<options>] [<branch>]"
4192
4273
4193
4274
#: builtin/checkout.c
4194
4275
msgid "git restore [<options>] [--source=<branch>] <file>..."
4195
-
msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
4276
+
msgstr "git restore [<options>] [--source=<branch>] <file>..."
4196
4277
4197
4278
#: builtin/checkout.c
4198
4279
#, c-format
4199
4280
msgid "path '%s' does not have our version"
4200
-
msgstr "路徑 '%s' 沒有我們的版本"
4281
+
msgstr "“%s” 路徑沒有我們的版本"
4201
4282
4202
4283
#: builtin/checkout.c
4203
4284
#, c-format
4204
4285
msgid "path '%s' does not have their version"
4205
-
msgstr "路徑 '%s' 沒有他們的版本"
4286
+
msgstr "“%s” 路徑沒有他們的版本"
4206
4287
4207
4288
#: builtin/checkout.c
4208
4289
#, c-format
4209
4290
msgid "path '%s' does not have all necessary versions"
4210
-
msgstr "路徑 '%s' 沒有全部必需的版本"
4291
+
msgstr "“%s” 路徑沒有所有必須的版本"
4211
4292
4212
4293
#: builtin/checkout.c
4213
4294
#, c-format
4214
4295
msgid "path '%s' does not have necessary versions"
4215
-
msgstr "路徑 '%s' 沒有必需的版本"
4296
+
msgstr "“%s” 路徑沒有必須的版本"
4216
4297
4217
4298
#: builtin/checkout.c
4218
4299
#, c-format
4219
4300
msgid "path '%s': cannot merge"
4220
-
msgstr "path '%s'：無法合併"
4301
+
msgstr "path “%s”：無法合併"
4221
4302
4222
4303
#: builtin/checkout.c
4223
4304
#, c-format
4224
4305
msgid "Unable to add merge result for '%s'"
4225
-
msgstr "無法為 '%s' 新增合併結果"
4306
+
msgstr "無法為 “%s” 加上合併結果"
4226
4307
4227
4308
#: builtin/checkout.c
4228
4309
#, c-format
···
4240
4321
#, c-format
4241
4322
msgid "Updated %d path from the index"
4242
4323
msgid_plural "Updated %d paths from the index"
4243
-
msgstr[0] "從索引區更新了 %d 個路徑"
4324
+
msgstr[0] "已從索引區更新 %d 個路徑"
4244
4325
4245
4326
#: builtin/checkout.c
4246
4327
#, c-format
4247
4328
msgid "'%s' cannot be used with updating paths"
4248
-
msgstr "'%s' 不能在更新路徑時使用"
4329
+
msgstr "無法在更新路徑時使用 “%s”"
4249
4330
4250
4331
#: builtin/checkout.c
4251
4332
#, c-format
4252
4333
msgid "Cannot update paths and switch to branch '%s' at the same time."
4253
-
msgstr "不能同時更新路徑並切換到分支'%s'。"
4334
+
msgstr "無法同時更新路徑和切換至 “%s” 分支。"
4254
4335
4255
4336
#: builtin/checkout.c
4256
4337
#, c-format
4257
4338
msgid "neither '%s' or '%s' is specified"
4258
-
msgstr "'%s' 或 '%s' 都沒有指定"
4339
+
msgstr "“%s” 或 “%s” 皆未指定"
4259
4340
4260
4341
#: builtin/checkout.c
4261
4342
#, c-format
4262
4343
msgid "'%s' must be used when '%s' is not specified"
4263
-
msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
4344
+
msgstr "未指定 “%2$s” 時，必須使用 “%1$s”"
4264
4345
4265
4346
#: builtin/checkout.c
4266
4347
#, c-format
4267
4348
msgid "'%s' or '%s' cannot be used with %s"
4268
-
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
4349
+
msgstr "“%s” 或 “%s” 無法與 %s 一起使用"
4269
4350
4270
4351
#: builtin/checkout.c
4271
4352
#, c-format
4272
4353
msgid "path '%s' is unmerged"
4273
-
msgstr "路徑 '%s' 未合併"
4354
+
msgstr "路徑 “%s” 未合併"
4274
4355
4275
4356
#: builtin/checkout.c
4276
4357
msgid "you need to resolve your current index first"
4277
-
msgstr "您需要先解決目前索引的衝突"
4358
+
msgstr "您需要先解決目前索引區的衝突"
4278
4359
4279
4360
#: builtin/checkout.c
4280
4361
#, c-format
···
4282
4363
"cannot continue with staged changes in the following files:\n"
4283
4364
"%s"
4284
4365
msgstr ""
4285
-
"不能繼續，下列檔案有暫存的修改：\n"
4366
+
"無法繼續，下列檔案有暫存的更動：\n"
4286
4367
"%s"
4287
4368
4288
4369
#: builtin/checkout.c
4289
4370
#, c-format
4290
4371
msgid "Can not do reflog for '%s': %s\n"
4291
-
msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
4372
+
msgstr "無法對 “%s” 執行 reflog 動作：%s\n"
4292
4373
4293
4374
#: builtin/checkout.c
4294
4375
msgid "HEAD is now at"
···
4296
4377
4297
4378
#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
4298
4379
msgid "unable to update HEAD"
4299
-
msgstr "不能更新 HEAD"
4380
+
msgstr "無法更新 HEAD"
4300
4381
4301
4382
#: builtin/checkout.c
4302
4383
#, c-format
4303
4384
msgid "Reset branch '%s'\n"
4304
-
msgstr "重設分支 '%s'\n"
4385
+
msgstr "重設分支 “%s”\n"
4305
4386
4306
4387
#: builtin/checkout.c
4307
4388
#, c-format
4308
4389
msgid "Already on '%s'\n"
4309
-
msgstr "已經位於 '%s'\n"
4390
+
msgstr "已經位於 “%s”\n"
4310
4391
4311
4392
#: builtin/checkout.c
4312
4393
#, c-format
4313
4394
msgid "Switched to and reset branch '%s'\n"
4314
-
msgstr "切換並重設分支 '%s'\n"
4395
+
msgstr "已切換並重設分支 “%s”\n"
4315
4396
4316
4397
#: builtin/checkout.c
4317
4398
#, c-format
4318
4399
msgid "Switched to a new branch '%s'\n"
4319
-
msgstr "切換到一個新分支 '%s'\n"
4400
+
msgstr "已切換至新分支 “%s”\n"
4320
4401
4321
4402
#: builtin/checkout.c
4322
4403
#, c-format
4323
4404
msgid "Switched to branch '%s'\n"
4324
-
msgstr "切換到分支 '%s'\n"
4405
+
msgstr "已切換至分支 “%s”\n"
4325
4406
4326
4407
# 譯者：請維持前導空格
4327
4408
#: builtin/checkout.c
4328
4409
#, c-format
4329
4410
msgid " ... and %d more.\n"
4330
-
msgstr " ... 及其它 %d 個。\n"
4411
+
msgstr " …… 及其它 %d 個。\n"
4331
4412
4332
4413
#: builtin/checkout.c
4333
4414
#, c-format
···
4342
4423
"\n"
4343
4424
"%s\n"
4344
4425
msgstr[0] ""
4345
-
"警告：您正丟下 %d 個提交，未和任何分支關聯：\n"
4426
+
"警告：您正丟下 %d 個\n"
4427
+
"未和任何分支關聯的提交：\n"
4346
4428
"\n"
4347
4429
"%s\n"
4348
4430
···
4361
4443
" git branch <new-branch-name> %s\n"
4362
4444
"\n"
4363
4445
msgstr[0] ""
4364
-
"如果您想要透過建立新分支儲存它，這可能是一個好時候。\n"
4365
-
"如下動作：\n"
4446
+
"如果您想要透過建立新分支留下這些提交，\n"
4447
+
"現在很適合執行：\n"
4366
4448
"\n"
4367
-
" git branch <新分支名> %s\n"
4449
+
" git branch <新分支名稱> %s\n"
4368
4450
"\n"
4369
4451
4370
4452
#: builtin/checkout.c
4371
4453
msgid "internal error in revision walk"
4372
-
msgstr "在版本遍歷時遇到內部錯誤"
4454
+
msgstr "在修訂版遍歷時遇到內部錯誤"
4373
4455
4374
4456
#: builtin/checkout.c
4375
4457
msgid "Previous HEAD position was"
4376
-
msgstr "之前的 HEAD 位置是"
4458
+
msgstr "之前的 HEAD 指針位置在"
4377
4459
4378
4460
#: builtin/checkout.c
4379
4461
msgid "You are on a branch yet to be born"
4380
-
msgstr "您位於一個尚未初始化的分支"
4462
+
msgstr "您正位於一個尚未初始化的分支"
4381
4463
4382
4464
#: builtin/checkout.c
4383
4465
#, c-format
···
4385
4467
"'%s' could be both a local file and a tracking branch.\n"
4386
4468
"Please use -- (and optionally --no-guess) to disambiguate"
4387
4469
msgstr ""
4388
-
"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
4470
+
"“%s” 既可以是本機檔案，也可以是追蹤分支。\n"
4389
4471
"請使用 --（和可選的 --no-guess）來消除歧義"
4390
4472
4391
4473
#: builtin/checkout.c
···
4399
4481
"one remote, e.g. the 'origin' remote, consider setting\n"
4400
4482
"checkout.defaultRemote=origin in your config."
4401
4483
msgstr ""
4402
-
"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n"
4403
-
"使用 --track 選項寫出全名：\n"
4484
+
"如果您想要簽出遠端追蹤分支，例如 “origin”，\n"
4485
+
"您可以使用 --track 選項寫出全名：\n"
4404
4486
"\n"
4405
4487
" git checkout --track origin/<name>\n"
4406
4488
"\n"
4407
-
"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
4408
-
"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
4489
+
"如果您平時比較想要使用模糊的簡短分支名稱 <name>，\n"
4490
+
"而不太想寫如 “origin” 的遠端版本庫名稱，\n"
4491
+
"可以在組態中設定 checkout.defaultRemote=origin。"
4409
4492
4410
4493
#: builtin/checkout.c
4411
4494
#, c-format
4412
4495
msgid "'%s' matched multiple (%d) remote tracking branches"
4413
-
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
4496
+
msgstr "“%s” 符合多個 (%d) 遠端追蹤分支"
4414
4497
4415
4498
#: builtin/checkout.c
4416
4499
msgid "only one reference expected"
···
4419
4502
#: builtin/checkout.c
4420
4503
#, c-format
4421
4504
msgid "only one reference expected, %d given."
4422
-
msgstr "應只有一個引用，卻提供了 %d 個。"
4505
+
msgstr "預期只有一個引用，卻提供了 %d 個。"
4423
4506
4424
4507
#: builtin/checkout.c builtin/worktree.c
4425
4508
#, c-format
···
4429
4512
#: builtin/checkout.c
4430
4513
#, c-format
4431
4514
msgid "reference is not a tree: %s"
4432
-
msgstr "引用不是一個樹：%s"
4515
+
msgstr "引用不是樹狀物件：%s"
4433
4516
4434
4517
#: builtin/checkout.c
4435
4518
#, c-format
4436
4519
msgid "a branch is expected, got tag '%s'"
4437
-
msgstr "期望一個分支，得到標籤 '%s'"
4520
+
msgstr "預期收到分支，卻收到標籤 “%s”"
4438
4521
4439
4522
#: builtin/checkout.c
4440
4523
#, c-format
4441
4524
msgid "a branch is expected, got remote branch '%s'"
4442
-
msgstr "期望一個分支，得到遠端分支 '%s'"
4525
+
msgstr "預期收到分支，卻收到遠端分支 “%s”"
4443
4526
4444
4527
#: builtin/checkout.c
4445
4528
#, c-format
4446
4529
msgid "a branch is expected, got '%s'"
4447
-
msgstr "期望一個分支，得到 '%s'"
4530
+
msgstr "預期收到分支，卻收到 “%s”"
4448
4531
4449
4532
#: builtin/checkout.c
4450
4533
#, c-format
4451
4534
msgid "a branch is expected, got commit '%s'"
4452
-
msgstr "期望一個分支，得到提交 '%s'"
4535
+
msgstr "預期收到分支，卻收到提交 “%s”"
4453
4536
4454
4537
#: builtin/checkout.c
4455
4538
msgid ""
4456
4539
"If you want to detach HEAD at the commit, try again with the --detach option."
4457
-
msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。"
4540
+
msgstr "若您想要在此提交分離 HEAD 指針，請傳入 --detach 選項重試。"
4458
4541
4459
4542
#: builtin/checkout.c
4460
4543
msgid ""
4461
4544
"cannot switch branch while merging\n"
4462
4545
"Consider \"git merge --quit\" or \"git worktree add\"."
4463
4546
msgstr ""
4464
-
"不能在合併時切換分支\n"
4465
-
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
4547
+
"無法在合併時切換分支\n"
4548
+
"請試試 “git merge --quit” 或 “git worktree add”。"
4466
4549
4467
4550
#: builtin/checkout.c
4468
4551
msgid ""
4469
4552
"cannot switch branch in the middle of an am session\n"
4470
4553
"Consider \"git am --quit\" or \"git worktree add\"."
4471
4554
msgstr ""
4472
-
"不能在 am 工作階段期間切換分支\n"
4473
-
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
4555
+
"無法在 am 工作階段期間時切換分支\n"
4556
+
"請試試 “git am --quit” 或 “git worktree add”。"
4474
4557
4475
4558
#: builtin/checkout.c
4476
4559
msgid ""
4477
4560
"cannot switch branch while rebasing\n"
4478
4561
"Consider \"git rebase --quit\" or \"git worktree add\"."
4479
4562
msgstr ""
4480
-
"不能在重定基底時切換分支\n"
4481
-
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
4563
+
"無法在重定基底時切換分支\n"
4564
+
"請試試 “git rebase --quit” 或 “git worktree add”。"
4482
4565
4483
4566
#: builtin/checkout.c
4484
4567
msgid ""
4485
4568
"cannot switch branch while cherry-picking\n"
4486
4569
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
4487
4570
msgstr ""
4488
-
"不能在揀選時切換分支\n"
4489
-
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
4571
+
"無法在揀選時切換分支\n"
4572
+
"請試試 “git cherry-pick --quit” 或 “git worktree add”。"
4490
4573
4491
4574
#: builtin/checkout.c
4492
4575
msgid ""
4493
4576
"cannot switch branch while reverting\n"
4494
4577
"Consider \"git revert --quit\" or \"git worktree add\"."
4495
4578
msgstr ""
4496
-
"不能在還原時切換分支\n"
4497
-
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
4579
+
"無法在還原時切換分支\n"
4580
+
"請試試 “git revert --quit” 或 “git worktree add”。"
4498
4581
4499
4582
#: builtin/checkout.c
4500
4583
msgid "you are switching branch while bisecting"
4501
-
msgstr "您在執行二分搜尋時切換分支"
4584
+
msgstr "您在進行二分搜尋時切換分支"
4502
4585
4503
4586
#: builtin/checkout.c
4504
4587
msgid "paths cannot be used with switching branches"
4505
-
msgstr "路徑不能和切換分支同時使用"
4588
+
msgstr "路徑不能與切換分支同時使用"
4506
4589
4507
4590
#: builtin/checkout.c
4508
4591
#, c-format
4509
4592
msgid "'%s' cannot be used with switching branches"
4510
-
msgstr "'%s' 不能和切換分支同時使用"
4593
+
msgstr "“%s” 不能與切換分支同時使用"
4511
4594
4512
4595
#: builtin/checkout.c
4513
4596
#, c-format
4514
4597
msgid "'%s' cannot be used with '%s'"
4515
-
msgstr "'%s' 不能和 '%s' 同時使用"
4598
+
msgstr "“%s” 不能與 “%s” 同時使用"
4516
4599
4517
4600
#: builtin/checkout.c
4518
4601
#, c-format
4519
4602
msgid "'%s' cannot take <start-point>"
4520
-
msgstr "'%s' 不帶 <起始點>"
4603
+
msgstr "“%s” 不取 <start-point>"
4521
4604
4522
4605
#: builtin/checkout.c
4523
4606
#, c-format
4524
4607
msgid "Cannot switch branch to a non-commit '%s'"
4525
-
msgstr "不能切換分支到一個非提交 '%s'"
4608
+
msgstr "無法將分支切換至非提交項目 “%s”"
4526
4609
4527
4610
#: builtin/checkout.c
4528
4611
msgid "missing branch or commit argument"
4529
-
msgstr "缺少分支或提交參數"
4612
+
msgstr "缺少分支或提交引數"
4530
4613
4531
4614
#: builtin/checkout.c
4532
4615
msgid "perform a 3-way merge with the new branch"
4533
-
msgstr "和新的分支執行三方合併"
4616
+
msgstr "和新分支進行三方合併"
4534
4617
4535
4618
#: builtin/checkout.c builtin/log.c parse-options.h
4536
4619
msgid "style"
4537
-
msgstr "風格"
4620
+
msgstr "style"
4538
4621
4539
4622
#: builtin/checkout.c
4540
4623
msgid "conflict style (merge, diff3, or zdiff3)"
···
4542
4625
4543
4626
#: builtin/checkout.c builtin/worktree.c
4544
4627
msgid "detach HEAD at named commit"
4545
-
msgstr "HEAD 從指定的提交分離"
4628
+
msgstr "自指定提交分離 HEAD 指針"
4546
4629
4547
4630
#: builtin/checkout.c
4548
4631
msgid "force checkout (throw away local modifications)"
···
4550
4633
4551
4634
#: builtin/checkout.c
4552
4635
msgid "new-branch"
4553
-
msgstr "新分支"
4636
+
msgstr "new-branch"
4554
4637
4555
4638
#: builtin/checkout.c
4556
4639
msgid "new unparented branch"
4557
-
msgstr "新的沒有父提交的分支"
4640
+
msgstr "新的，沒有父提交的分支"
4558
4641
4559
4642
#: builtin/checkout.c builtin/merge.c
4560
4643
msgid "update ignored files (default)"
4561
-
msgstr "更新忽略的檔案（預設）"
4644
+
msgstr "更新忽略的檔案（預設值）"
4562
4645
4563
4646
#: builtin/checkout.c
4564
4647
msgid "do not check if another worktree is holding the given ref"
4565
-
msgstr "不檢查指定的引用是否被其他工作區所占用"
4648
+
msgstr "不檢查其他工作區是否正在佔用指定的引用"
4566
4649
4567
4650
#: builtin/checkout.c
4568
4651
msgid "checkout our version for unmerged files"
···
4574
4657
4575
4658
#: builtin/checkout.c
4576
4659
msgid "do not limit pathspecs to sparse entries only"
4577
-
msgstr "對路徑不做稀疏簽出的限制"
4660
+
msgstr "對路徑規格不做稀疏簽出的限制"
4578
4661
4579
4662
#: builtin/checkout.c
4580
4663
#, c-format
4581
4664
msgid "options '-%c', '-%c', and '%s' cannot be used together"
4582
-
msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"
4665
+
msgstr "“-%c”、“-%c” 和 “%s” 選項不得同時使用"
4583
4666
4584
4667
#: builtin/checkout.c
4585
4668
msgid "--track needs a branch name"
4586
-
msgstr "--track 需要一個分支名"
4669
+
msgstr "--track 需要分支名稱"
4587
4670
4588
4671
#: builtin/checkout.c
4589
4672
#, c-format
···
4602
4685
#: builtin/checkout.c
4603
4686
#, c-format
4604
4687
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
4605
-
msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
4688
+
msgstr "“%s” 不是提交，因此不能以這為基礎建立 “%s” 分支"
4606
4689
4607
4690
#: builtin/checkout.c
4608
4691
#, c-format
4609
4692
msgid "git checkout: --detach does not take a path argument '%s'"
4610
-
msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
4693
+
msgstr "git checkout：--detach 不取路徑引數 “%s”"
4611
4694
4612
4695
#: builtin/checkout.c
4613
4696
msgid ""
4614
4697
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
4615
4698
"checking out of the index."
4616
4699
msgstr ""
4617
-
"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
4700
+
"git checkout：在從索引簽出時，--ours/--theirs、--force\n"
4701
+
"和 --merge 不相容。"
4618
4702
4619
4703
#: builtin/checkout.c
4620
4704
msgid "you must specify path(s) to restore"
4621
-
msgstr "您必須指定一個要復原的路徑"
4705
+
msgstr "您必須指定要還原的路徑"
4622
4706
4623
4707
#: builtin/checkout.c builtin/clone.c builtin/remote.c
4624
4708
#: builtin/submodule--helper.c builtin/worktree.c
4625
4709
msgid "branch"
4626
-
msgstr "分支"
4710
+
msgstr "branch"
4627
4711
4628
4712
#: builtin/checkout.c
4629
4713
msgid "create and checkout a new branch"
4630
-
msgstr "建立並簽出一個新的分支"
4714
+
msgstr "建立並簽出新分支"
4631
4715
4632
4716
#: builtin/checkout.c
4633
4717
msgid "create/reset and checkout a branch"
4634
-
msgstr "建立/重設並簽出一個分支"
4718
+
msgstr "建立/重設並簽出分支"
4635
4719
4636
4720
#: builtin/checkout.c
4637
4721
msgid "create reflog for new branch"
4638
-
msgstr "為新的分支建立引用日誌"
4722
+
msgstr "為新分支建立引用日誌"
4639
4723
4640
4724
#: builtin/checkout.c
4641
4725
msgid "second guess 'git checkout <no-such-branch>' (default)"
4642
-
msgstr "二次猜測 'git checkout <無此分支>'（預設）"
4726
+
msgstr "二次猜測 “git checkout <無此分支>”（預設值）"
4643
4727
4644
4728
#: builtin/checkout.c
4645
4729
msgid "use overlay mode (default)"
4646
-
msgstr "使用疊加模式（預設）"
4730
+
msgstr "使用疊加模式（預設值）"
4647
4731
4648
4732
#: builtin/checkout.c
4649
4733
msgid "create and switch to a new branch"
4650
-
msgstr "建立並切換一個新分支"
4734
+
msgstr "建立並切換至新分支"
4651
4735
4652
4736
#: builtin/checkout.c
4653
4737
msgid "create/reset and switch to a branch"
4654
-
msgstr "建立/重設並切換一個分支"
4738
+
msgstr "建立/重設並切換至指定分支"
4655
4739
4656
4740
#: builtin/checkout.c
4657
4741
msgid "second guess 'git switch <no-such-branch>'"
4658
-
msgstr "二次猜測 'git switch <無此分支>'"
4742
+
msgstr "二次猜測 “git switch <無此分支>”"
4659
4743
4660
4744
#: builtin/checkout.c
4661
4745
msgid "throw away local modifications"
···
4663
4747
4664
4748
#: builtin/checkout.c
4665
4749
msgid "which tree-ish to checkout from"
4666
-
msgstr "要簽出哪一個樹"
4750
+
msgstr "要自哪一個樹狀物件指示元簽出"
4667
4751
4668
4752
#: builtin/checkout.c
4669
4753
msgid "restore the index"
4670
-
msgstr "復原索引"
4754
+
msgstr "還原索引"
4671
4755
4672
4756
#: builtin/checkout.c
4673
4757
msgid "restore the working tree (default)"
4674
-
msgstr "復原工作區（預設）"
4758
+
msgstr "還原工作區（預設值）"
4675
4759
4676
4760
#: builtin/checkout.c
4677
4761
msgid "ignore unmerged entries"
4678
-
msgstr "忽略未合併條目"
4762
+
msgstr "忽略未合併項目"
4679
4763
4680
4764
#: builtin/checkout.c
4681
4765
msgid "use overlay mode"
···
4686
4770
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
4687
4771
"[<pathspec>...]"
4688
4772
msgstr ""
4689
-
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路徑規格>...]"
4773
+
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
4774
+
"[<pathspec>...]"
4690
4775
4691
4776
#: builtin/clean.c
4692
4777
#, c-format
4693
4778
msgid "Removing %s\n"
4694
-
msgstr "正刪除 %s\n"
4779
+
msgstr "正在刪除 %s\n"
4695
4780
4696
4781
#: builtin/clean.c
4697
4782
#, c-format
4698
4783
msgid "Would remove %s\n"
4699
-
msgstr "將刪除 %s\n"
4784
+
msgstr "將會刪除 %s\n"
4700
4785
4701
4786
#: builtin/clean.c
4702
4787
#, c-format
···
4711
4796
#: builtin/clean.c midx.c
4712
4797
#, c-format
4713
4798
msgid "failed to remove %s"
4714
-
msgstr "刪除 %s 失敗"
4799
+
msgstr "無法移除 %s"
4715
4800
4716
4801
#: builtin/clean.c
4717
4802
#, c-format
4718
4803
msgid "could not lstat %s\n"
4719
-
msgstr "不能對 %s 呼叫 lstat\n"
4804
+
msgstr "不能對 %s 進行 lstat\n"
4720
4805
4721
4806
#: builtin/clean.c
4722
4807
msgid "Refusing to remove current working directory\n"
···
4726
4811
msgid "Would refuse to remove current working directory\n"
4727
4812
msgstr "會拒絕移除目前的工作目錄\n"
4728
4813
4729
-
#: builtin/clean.c git-add--interactive.perl
4814
+
#: builtin/clean.c
4730
4815
#, c-format
4731
4816
msgid ""
4732
4817
"Prompt help:\n"
···
4734
4819
"foo - select item based on unique prefix\n"
4735
4820
" - (empty) select nothing\n"
4736
4821
msgstr ""
4737
-
"協助：\n"
4738
-
"1 - 透過編號選擇一個選項\n"
4739
-
"foo - 透過唯一前綴選擇一個選項\n"
4822
+
"提示說明：\n"
4823
+
"1 - 透過編號選擇項目\n"
4824
+
"foo - 根據獨特前綴選擇項目\n"
4740
4825
" - （空）什麼也不選擇\n"
4741
4826
4742
-
#: builtin/clean.c git-add--interactive.perl
4827
+
#: builtin/clean.c
4743
4828
#, c-format
4744
4829
msgid ""
4745
4830
"Prompt help:\n"
···
4751
4836
"* - choose all items\n"
4752
4837
" - (empty) finish selecting\n"
4753
4838
msgstr ""
4754
-
"協助：\n"
4755
-
"1 - 選擇一個選項\n"
4756
-
"3-5 - 選擇一個範圍內的所有選項\n"
4757
-
"2-3,6-9 - 選擇多個範圍內的所有選項\n"
4758
-
"foo - 透過唯一前綴選擇一個選項\n"
4759
-
"-... - 反選特定的選項\n"
4760
-
"* - 選擇所有選項\n"
4761
-
" - （空）結束選擇\n"
4839
+
"提示說明：\n"
4840
+
"1 - 選擇一個項目\n"
4841
+
"3-5 - 選擇一個項目範圍\n"
4842
+
"2-3,6-9 - 選擇多個項目範圍\n"
4843
+
"foo - 根據獨特前綴選擇項目\n"
4844
+
"-... - 取消選取指定項目\n"
4845
+
"* - 選擇所有項目\n"
4846
+
" - （空）完成選擇\n"
4762
4847
4763
-
#: builtin/clean.c git-add--interactive.perl
4764
-
#, c-format, perl-format
4848
+
#: builtin/clean.c
4849
+
#, c-format
4765
4850
msgid "Huh (%s)?\n"
4766
-
msgstr "嗯（%s）？\n"
4851
+
msgstr "嗯（%s）?\n"
4767
4852
4768
4853
#: builtin/clean.c
4769
4854
#, c-format
4770
4855
msgid "Input ignore patterns>> "
4771
-
msgstr "輸入範本以排除條目>> "
4856
+
msgstr "輸入要忽略的模式項目>> "
4772
4857
4773
4858
#: builtin/clean.c
4774
4859
#, c-format
4775
4860
msgid "WARNING: Cannot find items matched by: %s"
4776
-
msgstr "警告：無法找到和 %s 符合的條目"
4861
+
msgstr "警告：無法找到和 %s 符合的項目"
4777
4862
4778
4863
#: builtin/clean.c
4779
4864
msgid "Select items to delete"
4780
-
msgstr "選擇要刪除的條目"
4865
+
msgstr "選擇要刪除的項目"
4781
4866
4782
4867
#. TRANSLATORS: Make sure to keep [y/N] as is
4783
4868
#: builtin/clean.c
4784
4869
#, c-format
4785
4870
msgid "Remove %s [y/N]? "
4786
-
msgstr "移除 %s [y/N]？ "
4871
+
msgstr "移除 %s [y/N]? "
4787
4872
4788
4873
#: builtin/clean.c
4789
4874
msgid ""
···
4798
4883
"clean - 開始清理\n"
4799
4884
"filter by pattern - 透過範本排除要刪除的條目\n"
4800
4885
"select by numbers - 透過數字選擇要刪除的條目\n"
4801
-
"ask each - 針對刪除逐一詢問（就像 \"rm -i\"）\n"
4886
+
"ask each - 針對刪除逐一詢問（就像 “rm -i”）\n"
4802
4887
"quit - 停止刪除並離開\n"
4803
-
"help - 顯示本協助\n"
4804
-
"? - 顯示如何在提示符下選擇的協助"
4888
+
"help - 顯示本輔助說明\n"
4889
+
"? - 顯示如何在提示下選擇的協助"
4805
4890
4806
4891
#: builtin/clean.c
4807
4892
msgid "Would remove the following item:"
4808
4893
msgid_plural "Would remove the following items:"
4809
-
msgstr[0] "將刪除如下條目："
4894
+
msgstr[0] "將移除以下項目："
4810
4895
4811
4896
#: builtin/clean.c
4812
4897
msgid "No more files to clean, exiting."
···
4814
4899
4815
4900
#: builtin/clean.c
4816
4901
msgid "do not print names of files removed"
4817
-
msgstr "不列印刪除檔案的名稱"
4902
+
msgstr "不輸出移除的檔案的名稱"
4818
4903
4819
4904
#: builtin/clean.c
4820
4905
msgid "force"
4821
-
msgstr "強制"
4906
+
msgstr "force"
4822
4907
4823
4908
#: builtin/clean.c
4824
4909
msgid "interactive cleaning"
···
4826
4911
4827
4912
#: builtin/clean.c
4828
4913
msgid "remove whole directories"
4829
-
msgstr "刪除整個目錄"
4914
+
msgstr "移除整個目錄"
4830
4915
4831
4916
#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
4832
4917
#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
4833
4918
msgid "pattern"
4834
-
msgstr "模式"
4919
+
msgstr "pattern"
4835
4920
4836
4921
#: builtin/clean.c
4837
4922
msgid "add <pattern> to ignore rules"
4838
-
msgstr "新增 <模式> 到忽略規則"
4923
+
msgstr "將 <pattern> 加到忽略規則"
4839
4924
4840
4925
#: builtin/clean.c
4841
4926
msgid "remove ignored files, too"
4842
-
msgstr "也刪除忽略的檔案"
4927
+
msgstr "亦移除忽略的檔案"
4843
4928
4844
4929
#: builtin/clean.c
4845
4930
msgid "remove only ignored files"
4846
-
msgstr "只刪除忽略的檔案"
4931
+
msgstr "只移除忽略的檔案"
4847
4932
4848
4933
#: builtin/clean.c
4849
4934
msgid ""
···
4865
4950
4866
4951
#: builtin/clone.c
4867
4952
msgid "git clone [<options>] [--] <repo> [<dir>]"
4868
-
msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]"
4953
+
msgstr "git clone [<options>] [--] <repo> [<dir>]"
4869
4954
4870
4955
#: builtin/clone.c
4871
4956
msgid "don't clone shallow repository"
4872
-
msgstr "不要複製淺版本庫"
4957
+
msgstr "不要複製淺層版本庫"
4873
4958
4874
4959
#: builtin/clone.c
4875
4960
msgid "don't create a checkout"
4876
-
msgstr "不建立一個簽出"
4961
+
msgstr "不要建立簽出"
4877
4962
4878
4963
#: builtin/clone.c builtin/init-db.c
4879
4964
msgid "create a bare repository"
4880
-
msgstr "建立一個純版本庫"
4965
+
msgstr "建立裸版本庫"
4881
4966
4882
4967
#: builtin/clone.c
4883
4968
msgid "create a mirror repository (implies bare)"
4884
-
msgstr "建立一個鏡像版本庫（也是純版本庫）"
4969
+
msgstr "建立鏡像版本庫（亦即裸版本庫）"
4885
4970
4886
4971
#: builtin/clone.c
4887
4972
msgid "to clone from a local repository"
···
4889
4974
4890
4975
#: builtin/clone.c
4891
4976
msgid "don't use local hardlinks, always copy"
4892
-
msgstr "不使用本機硬連結，始終複製"
4977
+
msgstr "不使用本機硬連結，始終拷貝"
4893
4978
4894
4979
#: builtin/clone.c
4895
4980
msgid "setup as shared repository"
···
4905
4990
4906
4991
#: builtin/clone.c
4907
4992
msgid "number of submodules cloned in parallel"
4908
-
msgstr "並行複製的子模組數"
4993
+
msgstr "平行複製的子模組數量"
4909
4994
4910
4995
#: builtin/clone.c builtin/init-db.c
4911
4996
msgid "template-directory"
4912
-
msgstr "範本目錄"
4997
+
msgstr "模板目錄"
4913
4998
4914
4999
#: builtin/clone.c builtin/init-db.c
4915
5000
msgid "directory from which templates will be used"
4916
-
msgstr "範本目錄將被使用"
5001
+
msgstr "將被使用的模板目錄"
4917
5002
4918
5003
#: builtin/clone.c builtin/submodule--helper.c
4919
5004
msgid "reference repository"
···
4921
5006
4922
5007
#: builtin/clone.c builtin/submodule--helper.c
4923
5008
msgid "use --reference only while cloning"
4924
-
msgstr "僅在複製時參考 --reference 指向的本機版本庫"
5009
+
msgstr "僅在複製時使用 --reference"
4925
5010
4926
5011
#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c
4927
5012
#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c
4928
5013
#: builtin/submodule--helper.c t/helper/test-simple-ipc.c
4929
5014
msgid "name"
4930
-
msgstr "名稱"
5015
+
msgstr "name"
4931
5016
4932
5017
#: builtin/clone.c
4933
5018
msgid "use <name> instead of 'origin' to track upstream"
4934
-
msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
5019
+
msgstr "使用 <name> 而不是 “origin” 追蹤上游"
4935
5020
4936
5021
#: builtin/clone.c
4937
5022
msgid "checkout <branch> instead of the remote's HEAD"
4938
-
msgstr "簽出 <分支> 而不是遠端 HEAD"
5023
+
msgstr "簽出 <branch> 而不是遠端 HEAD"
4939
5024
4940
5025
#: builtin/clone.c
4941
5026
msgid "path to git-upload-pack on the remote"
···
4943
5028
4944
5029
#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
4945
5030
msgid "depth"
4946
-
msgstr "深度"
5031
+
msgstr "depth"
4947
5032
4948
5033
#: builtin/clone.c
4949
5034
msgid "create a shallow clone of that depth"
4950
-
msgstr "建立一個指定深度的淺複製"
4951
-
4952
-
#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
4953
-
msgid "time"
4954
-
msgstr "時間"
5035
+
msgstr "建立指定深度的淺層複製"
4955
5036
4956
5037
#: builtin/clone.c
4957
5038
msgid "create a shallow clone since a specific time"
4958
-
msgstr "建立從指定時間到現在的淺複製"
5039
+
msgstr "建立從指定時間到現在的淺層複製"
4959
5040
4960
5041
#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
4961
5042
msgid "revision"
4962
-
msgstr "修訂版"
5043
+
msgstr "revision"
4963
5044
4964
5045
#: builtin/clone.c builtin/fetch.c builtin/pull.c
4965
5046
msgid "deepen history of shallow clone, excluding rev"
4966
-
msgstr "取得更多淺複製的過去歷史記錄，除了特定版本"
5047
+
msgstr "取得更多淺層複製的過去歷史記錄，除了特定修訂版"
4967
5048
4968
5049
#: builtin/clone.c builtin/submodule--helper.c
4969
5050
msgid "clone only one branch, HEAD or --branch"
···
4979
5060
4980
5061
#: builtin/clone.c builtin/init-db.c
4981
5062
msgid "gitdir"
4982
-
msgstr "git目錄"
5063
+
msgstr "gitdir"
4983
5064
4984
5065
#: builtin/clone.c builtin/init-db.c
4985
5066
msgid "separate git dir from working tree"
4986
-
msgstr "git目錄和工作區分離"
5067
+
msgstr "git 目錄和工作區分離"
4987
5068
4988
5069
#: builtin/clone.c
4989
5070
msgid "key=value"
···
5048
5129
5049
5130
#: builtin/clone.c
5050
5131
#, c-format
5132
+
msgid "'%s' is a symlink, refusing to clone with --local"
5133
+
msgstr "“%s” 是個符號連結，故不能使用 --local 複製"
5134
+
5135
+
#: builtin/clone.c
5136
+
#, c-format
5051
5137
msgid "failed to start iterator over '%s'"
5052
5138
msgstr "無法在 '%s' 上啟動疊代器"
5053
5139
···
5059
5145
#: builtin/clone.c compat/precompose_utf8.c
5060
5146
#, c-format
5061
5147
msgid "failed to unlink '%s'"
5062
-
msgstr "刪除 '%s' 失敗"
5148
+
msgstr "無法刪除 “%s”"
5063
5149
5064
5150
#: builtin/clone.c
5065
5151
#, c-format
···
5127
5213
5128
5214
#: builtin/clone.c
5129
5215
msgid "cannot unlink temporary alternates file"
5130
-
msgstr "無法刪除暫時的 alternates 檔案"
5216
+
msgstr "無法刪除暫存 alternates 檔案"
5131
5217
5132
5218
#: builtin/clone.c
5133
5219
msgid "Too many arguments."
···
5239
5325
#, c-format
5240
5326
msgid "failed to fetch objects from bundle URI '%s'"
5241
5327
msgstr "無法從套件包 URL “%s” 抓取物件"
5328
+
5329
+
#: builtin/clone.c
5330
+
msgid "failed to fetch advertised bundles"
5331
+
msgstr "無法抓取公佈的套件包"
5242
5332
5243
5333
#: builtin/clone.c
5244
5334
msgid "remote transport reported error"
···
5609
5699
"in the current commit message"
5610
5700
msgstr "無法選擇一個未被目前提交說明使用的備註字元"
5611
5701
5612
-
#: builtin/commit.c
5702
+
#: builtin/commit.c builtin/merge-tree.c
5613
5703
#, c-format
5614
5704
msgid "could not lookup commit %s"
5615
5705
msgstr "不能查詢提交 %s"
···
5834
5924
msgid "version"
5835
5925
msgstr "版本"
5836
5926
5837
-
#: builtin/commit.c builtin/push.c builtin/worktree.c
5927
+
#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c
5838
5928
msgid "machine-readable output"
5839
5929
msgstr "機器可讀的輸出"
5840
5930
5841
5931
#: builtin/commit.c
5842
5932
msgid "show status in long format (default)"
5843
-
msgstr "以長格式顯示狀態（預設）"
5933
+
msgstr "以長格式顯示狀態（預設值）"
5844
5934
5845
5935
#: builtin/commit.c
5846
5936
msgid "terminate entries with NUL"
···
5917
6007
msgid "override date for commit"
5918
6008
msgstr "提交時覆蓋日期"
5919
6009
5920
-
#: builtin/commit.c parse-options.h ref-filter.h
6010
+
#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h
5921
6011
msgid "commit"
5922
6012
msgstr "提交"
5923
6013
···
6068
6158
msgid "git config [<options>]"
6069
6159
msgstr "git config [<選項>]"
6070
6160
6071
-
#: builtin/config.c builtin/env--helper.c
6161
+
#: builtin/config.c
6072
6162
#, c-format
6073
6163
msgid "unrecognized --type argument, %s"
6074
6164
msgstr "無法識別的 --type 參數，%s"
···
6167
6257
6168
6258
#: builtin/config.c
6169
6259
msgid "find the color configured: slot [default]"
6170
-
msgstr "獲得設定的顏色：設定 [預設]"
6260
+
msgstr "獲得設定的顏色：設定 [預設值]"
6171
6261
6172
6262
#: builtin/config.c
6173
6263
msgid "find the color setting: slot [stdout-is-tty]"
···
6177
6267
msgid "Type"
6178
6268
msgstr "類型"
6179
6269
6180
-
#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
6270
+
#: builtin/config.c builtin/hash-object.c
6181
6271
msgid "type"
6182
6272
msgstr "類型"
6183
6273
6184
-
#: builtin/config.c builtin/env--helper.c
6274
+
#: builtin/config.c
6185
6275
msgid "value is given this type"
6186
6276
msgstr "取值為該類型"
6187
6277
···
6235
6325
"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"
6236
6326
"令 command)"
6237
6327
6238
-
#: builtin/config.c builtin/env--helper.c
6328
+
#: builtin/config.c
6239
6329
msgid "value"
6240
6330
msgstr "取值"
6241
6331
···
6770
6860
msgid "no <cmd> given for --extcmd=<cmd>"
6771
6861
msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
6772
6862
6773
-
#: builtin/env--helper.c
6774
-
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
6775
-
msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
6776
-
6777
-
#: builtin/env--helper.c
6778
-
msgid "default for git_env_*(...) to fall back on"
6779
-
msgstr "git_env_*(...) 的預設值"
6780
-
6781
-
#: builtin/env--helper.c
6782
-
msgid "be quiet only use git_env_*() value as exit code"
6783
-
msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼"
6784
-
6785
-
#: builtin/env--helper.c
6786
-
#, c-format
6787
-
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
6788
-
msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」"
6789
-
6790
-
#: builtin/env--helper.c
6791
-
#, c-format
6792
-
msgid ""
6793
-
"option `--default' expects an unsigned long value with `--type=ulong`, not "
6794
-
"`%s`"
6795
-
msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"
6796
-
6797
6863
#: builtin/fast-export.c
6798
6864
msgid "git fast-export [<rev-list-opts>]"
6799
6865
msgstr "git fast-export [<rev-list-opts>]"
···
6936
7002
msgid "fetch.parallel cannot be negative"
6937
7003
msgstr "fetch.parallel 不能為負數"
6938
7004
6939
-
#: builtin/fetch.c builtin/pull.c
6940
-
msgid "fetch from all remotes"
6941
-
msgstr "從所有的遠端抓取"
6942
-
6943
-
#: builtin/fetch.c builtin/pull.c
6944
-
msgid "set upstream for git pull/fetch"
6945
-
msgstr "為 git pull/fetch 設定上游"
6946
-
6947
-
#: builtin/fetch.c builtin/pull.c
6948
-
msgid "append to .git/FETCH_HEAD instead of overwriting"
6949
-
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
6950
-
6951
-
#: builtin/fetch.c
6952
-
msgid "use atomic transaction to update references"
6953
-
msgstr "使用 atomic 事務更新引用"
6954
-
6955
-
#: builtin/fetch.c builtin/pull.c
6956
-
msgid "path to upload pack on remote end"
6957
-
msgstr "上傳包到遠端的路徑"
6958
-
6959
7005
#: builtin/fetch.c
6960
-
msgid "force overwrite of local reference"
6961
-
msgstr "強制覆蓋本機引用"
6962
-
6963
-
#: builtin/fetch.c
6964
-
msgid "fetch from multiple remotes"
6965
-
msgstr "從多個遠端抓取"
6966
-
6967
-
#: builtin/fetch.c builtin/pull.c
6968
-
msgid "fetch all tags and associated objects"
6969
-
msgstr "抓取所有的標籤和關聯物件"
7006
+
msgid "couldn't find remote ref HEAD"
7007
+
msgstr "找不到遠端 HEAD 引用"
6970
7008
6971
7009
#: builtin/fetch.c
6972
-
msgid "do not fetch all tags (--no-tags)"
6973
-
msgstr "不抓取任何標籤(--no-tags)"
6974
-
6975
-
#: builtin/fetch.c
6976
-
msgid "number of submodules fetched in parallel"
6977
-
msgstr "並行取得的子模組數量"
6978
-
6979
-
#: builtin/fetch.c
6980
-
msgid "modify the refspec to place all refs within refs/prefetch/"
6981
-
msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
6982
-
6983
-
#: builtin/fetch.c builtin/pull.c
6984
-
msgid "prune remote-tracking branches no longer on remote"
6985
-
msgstr "清除遠端已經不存在的分支的追蹤分支"
6986
-
6987
-
#: builtin/fetch.c
6988
-
msgid "prune local tags no longer on remote and clobber changed tags"
6989
-
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
6990
-
6991
-
# 譯者：可選值，不能翻譯
6992
-
#: builtin/fetch.c builtin/pull.c
6993
-
msgid "on-demand"
6994
-
msgstr "on-demand"
6995
-
6996
-
#: builtin/fetch.c
6997
-
msgid "control recursive fetching of submodules"
6998
-
msgstr "控制子模組的遞迴抓取"
6999
-
7000
-
#: builtin/fetch.c
7001
-
msgid "write fetched references to the FETCH_HEAD file"
7002
-
msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
7003
-
7004
-
#: builtin/fetch.c builtin/pull.c
7005
-
msgid "keep downloaded pack"
7006
-
msgstr "保持下載包"
7007
-
7008
-
#: builtin/fetch.c
7009
-
msgid "allow updating of HEAD ref"
7010
-
msgstr "允許更新 HEAD 引用"
7011
-
7012
-
#: builtin/fetch.c builtin/pull.c
7013
-
msgid "deepen history of shallow clone"
7014
-
msgstr "取得淺複製的更多過去歷史記錄"
7015
-
7016
-
#: builtin/fetch.c builtin/pull.c
7017
-
msgid "deepen history of shallow repository based on time"
7018
-
msgstr "基於時間來深化淺複製的歷史"
7019
-
7020
-
#: builtin/fetch.c builtin/pull.c
7021
-
msgid "convert to a complete repository"
7022
-
msgstr "轉換為一個完整的版本庫"
7023
-
7024
-
#: builtin/fetch.c
7025
-
msgid "re-fetch without negotiating common commits"
7026
-
msgstr "重新抓取而不協商共同提交"
7027
-
7028
-
#: builtin/fetch.c
7029
-
msgid "prepend this to submodule path output"
7030
-
msgstr "在子模組路徑輸出的前面加上此目錄"
7031
-
7032
-
#: builtin/fetch.c
7033
-
msgid ""
7034
-
"default for recursive fetching of submodules (lower priority than config "
7035
-
"files)"
7036
-
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
7037
-
7038
-
#: builtin/fetch.c builtin/pull.c
7039
-
msgid "accept refs that update .git/shallow"
7040
-
msgstr "接受更新 .git/shallow 的引用"
7041
-
7042
-
#: builtin/fetch.c builtin/pull.c
7043
-
msgid "refmap"
7044
-
msgstr "引用映射"
7045
-
7046
-
#: builtin/fetch.c builtin/pull.c
7047
-
msgid "specify fetch refmap"
7048
-
msgstr "指定取得動作的引用映射"
7049
-
7050
-
#: builtin/fetch.c builtin/pull.c
7051
-
msgid "report that we have only objects reachable from this object"
7052
-
msgstr "報告我們只擁有從該物件開始可以取得的物件"
7053
-
7054
-
#: builtin/fetch.c
7055
-
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
7056
-
msgstr "不取得 packfile，而是輸出協商的祖先提交"
7057
-
7058
-
#: builtin/fetch.c
7059
-
msgid "run 'maintenance --auto' after fetching"
7060
-
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
7061
-
7062
-
#: builtin/fetch.c builtin/pull.c
7063
-
msgid "check for forced-updates on all updated branches"
7064
-
msgstr "在所有更新分支上檢查強制更新"
7065
-
7066
-
#: builtin/fetch.c
7067
-
msgid "write the commit-graph after fetching"
7068
-
msgstr "抓取後寫入分支圖"
7069
-
7070
-
#: builtin/fetch.c
7071
-
msgid "accept refspecs from stdin"
7072
-
msgstr "從標準輸入中接受引用規格"
7073
-
7074
-
#: builtin/fetch.c
7075
-
msgid "couldn't find remote ref HEAD"
7076
-
msgstr "找不到遠端 HEAD 引用"
7010
+
#, c-format
7011
+
msgid "From %.*s\n"
7012
+
msgstr "來自 %.*s\n"
7077
7013
7078
7014
#: builtin/fetch.c
7079
7015
#, c-format
···
7159
7095
#, c-format
7160
7096
msgid "rejected %s because shallow roots are not allowed to be updated"
7161
7097
msgstr "已拒絕 %s，不允許更新淺複製"
7162
-
7163
-
#: builtin/fetch.c
7164
-
#, c-format
7165
-
msgid "From %.*s\n"
7166
-
msgstr "來自 %.*s\n"
7167
7098
7168
7099
#: builtin/fetch.c
7169
7100
#, c-format
···
7278
7209
msgid "you need to specify a tag name"
7279
7210
msgstr "您需要指定標籤名稱"
7280
7211
7212
+
#: builtin/fetch.c builtin/pull.c
7213
+
msgid "fetch from all remotes"
7214
+
msgstr "從所有的遠端抓取"
7215
+
7216
+
#: builtin/fetch.c builtin/pull.c
7217
+
msgid "set upstream for git pull/fetch"
7218
+
msgstr "為 git pull/fetch 設定上游"
7219
+
7220
+
#: builtin/fetch.c builtin/pull.c
7221
+
msgid "append to .git/FETCH_HEAD instead of overwriting"
7222
+
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
7223
+
7224
+
#: builtin/fetch.c
7225
+
msgid "use atomic transaction to update references"
7226
+
msgstr "使用 atomic 事務更新引用"
7227
+
7228
+
#: builtin/fetch.c builtin/pull.c
7229
+
msgid "path to upload pack on remote end"
7230
+
msgstr "上傳包到遠端的路徑"
7231
+
7232
+
#: builtin/fetch.c
7233
+
msgid "force overwrite of local reference"
7234
+
msgstr "強制覆蓋本機引用"
7235
+
7236
+
#: builtin/fetch.c
7237
+
msgid "fetch from multiple remotes"
7238
+
msgstr "從多個遠端抓取"
7239
+
7240
+
#: builtin/fetch.c builtin/pull.c
7241
+
msgid "fetch all tags and associated objects"
7242
+
msgstr "抓取所有的標籤和關聯物件"
7243
+
7244
+
#: builtin/fetch.c
7245
+
msgid "do not fetch all tags (--no-tags)"
7246
+
msgstr "不抓取任何標籤(--no-tags)"
7247
+
7248
+
#: builtin/fetch.c
7249
+
msgid "number of submodules fetched in parallel"
7250
+
msgstr "並行取得的子模組數量"
7251
+
7252
+
#: builtin/fetch.c
7253
+
msgid "modify the refspec to place all refs within refs/prefetch/"
7254
+
msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
7255
+
7256
+
#: builtin/fetch.c builtin/pull.c
7257
+
msgid "prune remote-tracking branches no longer on remote"
7258
+
msgstr "清除遠端已經不存在的分支的追蹤分支"
7259
+
7260
+
#: builtin/fetch.c
7261
+
msgid "prune local tags no longer on remote and clobber changed tags"
7262
+
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
7263
+
7264
+
# 譯者：可選值，不能翻譯
7265
+
#: builtin/fetch.c builtin/pull.c
7266
+
msgid "on-demand"
7267
+
msgstr "on-demand"
7268
+
7269
+
#: builtin/fetch.c
7270
+
msgid "control recursive fetching of submodules"
7271
+
msgstr "控制子模組的遞迴抓取"
7272
+
7273
+
#: builtin/fetch.c
7274
+
msgid "write fetched references to the FETCH_HEAD file"
7275
+
msgstr "將取得的引用寫入 FETCH_HEAD 檔案"
7276
+
7277
+
#: builtin/fetch.c builtin/pull.c
7278
+
msgid "keep downloaded pack"
7279
+
msgstr "保持下載包"
7280
+
7281
+
#: builtin/fetch.c
7282
+
msgid "allow updating of HEAD ref"
7283
+
msgstr "允許更新 HEAD 引用"
7284
+
7285
+
#: builtin/fetch.c builtin/pull.c
7286
+
msgid "deepen history of shallow clone"
7287
+
msgstr "取得淺複製的更多過去歷史記錄"
7288
+
7289
+
#: builtin/fetch.c builtin/pull.c
7290
+
msgid "deepen history of shallow repository based on time"
7291
+
msgstr "基於時間來深化淺複製的歷史"
7292
+
7293
+
#: builtin/fetch.c builtin/pull.c
7294
+
msgid "convert to a complete repository"
7295
+
msgstr "轉換為一個完整的版本庫"
7296
+
7297
+
#: builtin/fetch.c
7298
+
msgid "re-fetch without negotiating common commits"
7299
+
msgstr "重新抓取而不協商共同提交"
7300
+
7301
+
#: builtin/fetch.c
7302
+
msgid "prepend this to submodule path output"
7303
+
msgstr "在子模組路徑輸出的前面加上此目錄"
7304
+
7305
+
#: builtin/fetch.c
7306
+
msgid ""
7307
+
"default for recursive fetching of submodules (lower priority than config "
7308
+
"files)"
7309
+
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
7310
+
7311
+
#: builtin/fetch.c builtin/pull.c
7312
+
msgid "accept refs that update .git/shallow"
7313
+
msgstr "接受更新 .git/shallow 的引用"
7314
+
7315
+
#: builtin/fetch.c builtin/pull.c
7316
+
msgid "refmap"
7317
+
msgstr "引用映射"
7318
+
7319
+
#: builtin/fetch.c builtin/pull.c
7320
+
msgid "specify fetch refmap"
7321
+
msgstr "指定取得動作的引用映射"
7322
+
7323
+
#: builtin/fetch.c builtin/pull.c
7324
+
msgid "report that we have only objects reachable from this object"
7325
+
msgstr "報告我們只擁有從該物件開始可以取得的物件"
7326
+
7327
+
#: builtin/fetch.c
7328
+
msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
7329
+
msgstr "不取得 packfile，而是輸出協商的祖先提交"
7330
+
7331
+
#: builtin/fetch.c
7332
+
msgid "run 'maintenance --auto' after fetching"
7333
+
msgstr "取得 (fetch) 後執行 'maintenance --auto'"
7334
+
7335
+
#: builtin/fetch.c builtin/pull.c
7336
+
msgid "check for forced-updates on all updated branches"
7337
+
msgstr "在所有更新分支上檢查強制更新"
7338
+
7339
+
#: builtin/fetch.c
7340
+
msgid "write the commit-graph after fetching"
7341
+
msgstr "抓取後寫入分支圖"
7342
+
7343
+
#: builtin/fetch.c
7344
+
msgid "accept refspecs from stdin"
7345
+
msgstr "從標準輸入中接受引用規格"
7346
+
7281
7347
#: builtin/fetch.c
7282
7348
msgid "--negotiate-only needs one or more --negotiation-tip=*"
7283
7349
msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*"
···
7289
7355
#: builtin/fetch.c
7290
7356
msgid "--unshallow on a complete repository does not make sense"
7291
7357
msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
7358
+
7359
+
#: builtin/fetch.c
7360
+
#, c-format
7361
+
msgid "failed to fetch bundles from '%s'"
7362
+
msgstr "無法自「%s」抓取套件包"
7292
7363
7293
7364
#: builtin/fetch.c
7294
7365
msgid "fetch --all does not take a repository argument"
···
7418
7489
msgid "print only refs which don't contain the commit"
7419
7490
msgstr "只列印不包含該提交的引用"
7420
7491
7492
+
#: builtin/for-each-ref.c
7493
+
msgid "read reference patterns from stdin"
7494
+
msgstr "從 stdin 讀取引用模式"
7495
+
7496
+
#: builtin/for-each-ref.c
7497
+
msgid "unknown arguments supplied with --stdin"
7498
+
msgstr "為 --stdin 提供的引數未知"
7499
+
7421
7500
#: builtin/for-each-repo.c
7422
7501
msgid "git for-each-repo --config=<config> [--] <arguments>"
7423
7502
msgstr "git for-each-repo --config=<config> [--] <arguments>"
···
7433
7512
#: builtin/for-each-repo.c
7434
7513
msgid "missing --config=<config>"
7435
7514
msgstr "缺少 --config=<設定>"
7515
+
7516
+
#: builtin/for-each-repo.c
7517
+
#, c-format
7518
+
msgid "got bad config --config=%s"
7519
+
msgstr "收到無效的組態 --config=%s"
7436
7520
7437
7521
#: builtin/fsck.c
7438
7522
msgid "unknown"
···
7619
7703
msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
7620
7704
7621
7705
#: builtin/fsck.c
7622
-
msgid "Checking cache tree"
7623
-
msgstr "正在檢查快取樹"
7706
+
#, c-format
7707
+
msgid "Checking cache tree of %s"
7708
+
msgstr "正在檢查 %s 的快取樹"
7624
7709
7625
7710
#: builtin/fsck.c
7626
7711
#, c-format
7627
-
msgid "%s: invalid sha1 pointer in cache-tree"
7628
-
msgstr "%s：cache-tree 中無效的 sha1 指標"
7712
+
msgid "%s: invalid sha1 pointer in cache-tree of %s"
7713
+
msgstr "%s：%s 的 cache-tree 中的 sha1 指標無效"
7629
7714
7630
7715
#: builtin/fsck.c
7631
7716
msgid "non-tree in cache-tree"
···
7633
7718
7634
7719
#: builtin/fsck.c
7635
7720
#, c-format
7636
-
msgid "%s: invalid sha1 pointer in resolve-undo"
7637
-
msgstr "%s：resolve-undo 的 sha1 指針無效"
7721
+
msgid "%s: invalid sha1 pointer in resolve-undo of %s"
7722
+
msgstr "%s：%s 的 resolve-undo 中的 sha1 指標無效"
7723
+
7724
+
#: builtin/fsck.c
7725
+
#, c-format
7726
+
msgid "unable to load rev-index for pack '%s'"
7727
+
msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)"
7728
+
7729
+
#: builtin/fsck.c
7730
+
#, c-format
7731
+
msgid "invalid rev-index for pack '%s'"
7732
+
msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效"
7638
7733
7639
7734
#: builtin/fsck.c
7640
7735
msgid ""
···
7670
7765
7671
7766
#: builtin/fsck.c
7672
7767
msgid "make reflogs head nodes (default)"
7673
-
msgstr "將引用日誌作為檢查的 HEAD 節點（預設）"
7768
+
msgstr "將引用日誌作為檢查的 HEAD 節點（預設值）"
7674
7769
7675
7770
#: builtin/fsck.c
7676
7771
msgid "also consider packs and alternate objects"
···
8152
8247
msgid "invalid number of threads specified (%d) for %s"
8153
8248
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
8154
8249
8155
-
#. #-#-#-#-# grep.c.po #-#-#-#-#
8156
8250
#. TRANSLATORS: %s is the configuration
8157
8251
#. variable for tweaking threads, currently
8158
8252
#. grep.threads
···
8224
8318
8225
8319
#: builtin/grep.c
8226
8320
msgid "search in subdirectories (default)"
8227
-
msgstr "在子目錄中尋找（預設）"
8321
+
msgstr "在子目錄中尋找（預設值）"
8228
8322
8229
8323
#: builtin/grep.c
8230
8324
msgid "descend at most <depth> levels"
···
8236
8330
8237
8331
#: builtin/grep.c
8238
8332
msgid "use basic POSIX regular expressions (default)"
8239
-
msgstr "使用基本的 POSIX 常規表示式（預設）"
8333
+
msgstr "使用基本的 POSIX 常規表示式（預設值）"
8240
8334
8241
8335
#: builtin/grep.c
8242
8336
msgid "interpret patterns as fixed strings"
···
8581
8675
msgstr "'git help config' 取得更多訊息"
8582
8676
8583
8677
#: builtin/hook.c
8584
-
msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
8585
-
msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
8678
+
msgid ""
8679
+
"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
8680
+
"args>]"
8681
+
msgstr ""
8682
+
"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
8683
+
"args>]"
8586
8684
8587
8685
#: builtin/hook.c
8588
8686
msgid "silently ignore missing requested <hook-name>"
8589
8687
msgstr "靜默忽略不存在而請求的 <hook-name>"
8688
+
8689
+
#: builtin/hook.c
8690
+
msgid "file to read into hooks' stdin"
8691
+
msgstr "要讀進掛鉤 stdin 的檔案"
8590
8692
8591
8693
#: builtin/index-pack.c
8592
8694
#, c-format
···
9314
9416
9315
9417
#: builtin/log.c
9316
9418
msgid "show patch format instead of default (patch + stat)"
9317
-
msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）"
9419
+
msgstr "顯示純修補檔格式而非預設值（修補檔+狀態）"
9318
9420
9319
9421
#: builtin/log.c
9320
9422
msgid "Messaging"
···
9330
9432
9331
9433
#: builtin/log.c
9332
9434
msgid "email"
9333
-
msgstr "信件位址"
9435
+
msgstr "信箱"
9334
9436
9335
9437
#: builtin/log.c
9336
9438
msgid "add To: header"
···
9528
9630
9529
9631
#: builtin/ls-files.c
9530
9632
msgid "show cached files in the output (default)"
9531
-
msgstr "顯示快取的檔案（預設）"
9633
+
msgstr "顯示快取的檔案（預設值）"
9532
9634
9533
9635
#: builtin/ls-files.c
9534
9636
msgid "show deleted files in the output"
···
9629
9731
msgid ""
9630
9732
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9631
9733
" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
9632
-
" [--symref] [<repository> [<refs>...]]"
9734
+
" [--symref] [<repository> [<patterns>...]]"
9633
9735
msgstr ""
9634
9736
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9635
9737
" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
9636
-
" [--symref] [<repository> [<refs>...]]"
9738
+
" [--symref] [<repository> [<patterns>...]]"
9637
9739
9638
9740
#: builtin/ls-remote.c
9639
9741
msgid "do not print remote URL"
···
9950
10052
#: builtin/merge-tree.c
9951
10053
msgid "perform multiple merges, one per line of input"
9952
10054
msgstr "執行多次合併，一次執行輸入一列"
10055
+
10056
+
#: builtin/merge-tree.c
10057
+
msgid "specify a merge-base for the merge"
10058
+
msgstr "指定用來合併的合併基底"
9953
10059
9954
10060
#: builtin/merge-tree.c
9955
10061
msgid "--trivial-merge is incompatible with all other options"
9956
10062
msgstr "--trivial-merge 和其他所有選項都不相容"
9957
10063
10064
+
#: builtin/merge-tree.c
10065
+
msgid "--merge-base is incompatible with --stdin"
10066
+
msgstr "--merge-base 與 --stdin 不相容"
10067
+
9958
10068
#: builtin/merge-tree.c builtin/notes.c
9959
10069
#, c-format
9960
10070
msgid "malformed input line: '%s'."
···
10015
10125
10016
10126
#: builtin/merge.c builtin/pull.c
10017
10127
msgid "perform a commit if the merge succeeds (default)"
10018
-
msgstr "如果合併成功，執行一次提交（預設）"
10128
+
msgstr "如果合併成功，執行一次提交（預設值）"
10019
10129
10020
10130
#: builtin/merge.c builtin/pull.c
10021
10131
msgid "edit message before committing"
···
10023
10133
10024
10134
#: builtin/merge.c
10025
10135
msgid "allow fast-forward (default)"
10026
-
msgstr "允許快轉（預設）"
10136
+
msgstr "允許快轉（預設值）"
10027
10137
10028
10138
#: builtin/merge.c builtin/pull.c
10029
10139
msgid "abort if fast-forward is not possible"
···
10206
10316
msgid "Bad value '%s' in environment '%s'"
10207
10317
msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
10208
10318
10209
-
#: builtin/merge.c read-cache.c strbuf.c wrapper.c
10319
+
#: builtin/merge.c editor.c read-cache.c wrapper.c
10210
10320
#, c-format
10211
10321
msgid "could not close '%s'"
10212
10322
msgstr "不能關閉 '%s'"
···
10585
10695
10586
10696
#: builtin/name-rev.c
10587
10697
msgid "allow to print `undefined` names (default)"
10588
-
msgstr "允許列印 `未定義` 的名稱（預設）"
10698
+
msgstr "允許列印 `未定義` 的名稱（預設值）"
10589
10699
10590
10700
#: builtin/name-rev.c
10591
10701
msgid "dereference tags in the input (internal use)"
···
11039
11149
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
11040
11150
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
11041
11151
11042
-
#: builtin/pack-objects.c
11152
+
#: builtin/pack-objects.c builtin/repack.c
11043
11153
msgid "disabling bitmap writing, as some objects are not being packed"
11044
11154
msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
11045
11155
···
11206
11316
msgstr "壞的索引版本 '%s'"
11207
11317
11208
11318
#: builtin/pack-objects.c
11319
+
msgid "show progress meter during object writing phase"
11320
+
msgstr "在物件寫入階段顯示進度列"
11321
+
11322
+
#: builtin/pack-objects.c
11323
+
msgid "similar to --all-progress when progress meter is shown"
11324
+
msgstr "顯示進度列時類似 --all-progress"
11325
+
11326
+
#: builtin/pack-objects.c
11209
11327
msgid "<version>[,<offset>]"
11210
11328
msgstr "<版本>[,<位移>]"
11211
11329
···
11447
11565
"<git@vger.kernel.org> 讓我們知道您還在使用。\n"
11448
11566
"感謝。\n"
11449
11567
11568
+
#: builtin/pack-redundant.c
11569
+
msgid "refusing to run without --i-still-use-this"
11570
+
msgstr "傳入 --i-still-use-this 前拒絕執行"
11571
+
11450
11572
#: builtin/pack-refs.c
11451
11573
msgid "git pack-refs [--all] [--no-prune]"
11452
11574
msgstr "git pack-refs [--all] [--no-prune]"
···
11457
11579
11458
11580
#: builtin/pack-refs.c
11459
11581
msgid "prune loose refs (default)"
11460
-
msgstr "剪除鬆散引用（預設）"
11582
+
msgstr "剪除鬆散引用（預設值）"
11461
11583
11462
11584
#: builtin/patch-id.c
11463
11585
msgid "git patch-id [--stable | --unstable | --verbatim]"
···
11650
11772
msgid "pull with rebase"
11651
11773
msgstr "重定基底式拉取"
11652
11774
11653
-
#: builtin/pull.c
11654
-
msgid "please commit or stash them."
11655
-
msgstr "請提交或貯存它們。"
11775
+
#: builtin/pull.c builtin/rebase.c
11776
+
msgid "Please commit or stash them."
11777
+
msgstr "請提交或貯存修改。"
11656
11778
11657
11779
#: builtin/pull.c
11658
11780
#, c-format
···
11900
12022
msgid "repository"
11901
12023
msgstr "版本庫"
11902
12024
11903
-
#: builtin/push.c builtin/send-pack.c
11904
-
msgid "push all refs"
11905
-
msgstr "推送所有引用"
12025
+
#: builtin/push.c
12026
+
msgid "push all branches"
12027
+
msgstr "推送所有分支"
11906
12028
11907
12029
#: builtin/push.c builtin/send-pack.c
11908
12030
msgid "mirror all refs"
···
11913
12035
msgstr "刪除引用"
11914
12036
11915
12037
#: builtin/push.c
11916
-
msgid "push tags (can't be used with --all or --mirror)"
11917
-
msgstr "推送標籤（不能使用 --all or --mirror）"
12038
+
msgid "push tags (can't be used with --all or --branches or --mirror)"
12039
+
msgstr "推送標籤（不能和 --all、--branches 或 --mirror 一起使用）"
11918
12040
11919
12041
#: builtin/push.c builtin/send-pack.c
11920
12042
msgid "force updates"
···
11972
12094
msgid "--delete doesn't make sense without any refs"
11973
12095
msgstr "--delete 未接任何引用沒有意義"
11974
12096
11975
-
#: builtin/push.c
12097
+
#: builtin/push.c t/helper/test-bundle-uri.c
11976
12098
#, c-format
11977
12099
msgid "bad repository '%s'"
11978
12100
msgstr "壞的版本庫 '%s'"
···
12239
12361
12240
12362
#: builtin/rebase.c
12241
12363
#, c-format
12364
+
msgid "Unknown rebase-merges mode: %s"
12365
+
msgstr "未知的 rebase-merges 模式：%s"
12366
+
12367
+
#: builtin/rebase.c
12368
+
#, c-format
12242
12369
msgid "could not switch to %s"
12243
12370
msgstr "無法切換到 %s"
12371
+
12372
+
#: builtin/rebase.c
12373
+
msgid "apply options and merge options cannot be used together"
12374
+
msgstr "套用選項與合併選項不得同時使用"
12244
12375
12245
12376
#: builtin/rebase.c
12246
12377
#, c-format
···
12250
12381
msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
12251
12382
12252
12383
#: builtin/rebase.c
12384
+
msgid ""
12385
+
"--rebase-merges with an empty string argument is deprecated and will stop "
12386
+
"working in a future version of Git. Use --rebase-merges without an argument "
12387
+
"instead, which does the same thing."
12388
+
msgstr ""
12389
+
"有字串引數的 --rebase-merges 已被棄用，而且會在未來的 Git 版本停止運作。請改"
12390
+
"用無引數的 --rebase-merges，功能相同。"
12391
+
12392
+
#: builtin/rebase.c
12253
12393
#, c-format
12254
12394
msgid ""
12255
12395
"%s\n"
···
12513
12653
msgstr "開關 `C' 期望一個數字值"
12514
12654
12515
12655
#: builtin/rebase.c
12516
-
#, c-format
12517
-
msgid "Unknown mode: %s"
12518
-
msgstr "未知模式：%s"
12656
+
msgid "--strategy requires --merge or --interactive"
12657
+
msgstr "--strategy 需要 --merge 或 --interactive"
12658
+
12659
+
#: builtin/rebase.c
12660
+
msgid ""
12661
+
"apply options are incompatible with rebase.autoSquash. Consider adding --no-"
12662
+
"autosquash"
12663
+
msgstr "apply 選項與 rebase.autoSquash 不相容。請考慮加上 --no-autosquash"
12519
12664
12520
12665
#: builtin/rebase.c
12521
-
msgid "--strategy requires --merge or --interactive"
12522
-
msgstr "--strategy 需要 --merge 或 --interactive"
12666
+
msgid ""
12667
+
"apply options are incompatible with rebase.rebaseMerges. Consider adding --"
12668
+
"no-rebase-merges"
12669
+
msgstr "apply 選項與 rebase.rebaseMerges 不相容。請考慮加上 --no-rebase-merges"
12523
12670
12524
12671
#: builtin/rebase.c
12525
-
msgid "apply options and merge options cannot be used together"
12526
-
msgstr "套用選項與合併選項不得同時使用"
12672
+
msgid ""
12673
+
"apply options are incompatible with rebase.updateRefs. Consider adding --no-"
12674
+
"update-refs"
12675
+
msgstr "apply 選項與 rebase.updateRefs 不相容。請考慮加上 --no-update-refs"
12527
12676
12528
12677
#: builtin/rebase.c
12529
12678
#, c-format
···
12571
12720
#, c-format
12572
12721
msgid "Does not point to a valid commit '%s'"
12573
12722
msgstr "沒有指向一個有效的提交 '%s'"
12574
-
12575
-
#: builtin/rebase.c
12576
-
msgid "Please commit or stash them."
12577
-
msgstr "請提交或貯存修改。"
12578
12723
12579
12724
#: builtin/rebase.c
12580
12725
msgid "HEAD is up to date."
···
13375
13520
msgstr "近似日期"
13376
13521
13377
13522
#: builtin/repack.c
13378
-
msgid "with -C, expire objects older than this"
13379
-
msgstr "搭配 -C 會將早於此的物件設為過期"
13523
+
msgid "with --cruft, expire objects older than this"
13524
+
msgstr "搭配 --cruft 會將早於此的物件標為過期"
13380
13525
13381
13526
#: builtin/repack.c
13382
13527
msgid "remove redundant packs, and run git-prune-packed"
···
13484
13629
#: builtin/repack.c sequencer.c
13485
13630
#, c-format
13486
13631
msgid "could not unlink: %s"
13487
-
msgstr "無法取消連結：%s"
13632
+
msgstr "無法刪除：%s"
13488
13633
13489
13634
#: builtin/replace.c
13490
13635
msgid "git replace [-f] <object> <replacement>"
···
14209
14354
msgstr "遠端名稱"
14210
14355
14211
14356
#: builtin/send-pack.c
14357
+
msgid "push all refs"
14358
+
msgstr "推送所有引用"
14359
+
14360
+
#: builtin/send-pack.c
14212
14361
msgid "use stateless RPC protocol"
14213
14362
msgstr "使用無狀態的 RPC 協定"
14214
14363
···
14462
14611
14463
14612
#: builtin/sparse-checkout.c
14464
14613
msgid ""
14465
-
"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]"
14614
+
"git sparse-checkout (init | list | set | add | reapply | disable | check-"
14615
+
"rules) [<options>]"
14466
14616
msgstr ""
14467
-
"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]"
14617
+
"git sparse-checkout (init | list | set | add | reapply | disable | check-"
14618
+
"rules) [<options>]"
14468
14619
14469
14620
#: builtin/sparse-checkout.c
14470
14621
msgid "this worktree is not sparse"
···
14605
14756
msgid "error while refreshing working directory"
14606
14757
msgstr "重新整理工作目錄時發生錯誤"
14607
14758
14759
+
#: builtin/sparse-checkout.c
14760
+
msgid ""
14761
+
"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
14762
+
"file <file>]"
14763
+
msgstr ""
14764
+
"git sparse-checkout check-rules [-z] [--skip-checks][--[no-]cone] [--rules-"
14765
+
"file <file>]"
14766
+
14767
+
#: builtin/sparse-checkout.c
14768
+
msgid "terminate input and output files by a NUL character"
14769
+
msgstr "使用 NUL 字元終止輸入和輸出檔案"
14770
+
14771
+
#: builtin/sparse-checkout.c
14772
+
msgid "when used with --rules-file interpret patterns as cone mode patterns"
14773
+
msgstr ""
14774
+
"與 --rules-file 搭配使用時，將 patterns (模式) 解釋為 cone 模式的 patterns"
14775
+
14776
+
#: builtin/sparse-checkout.c
14777
+
msgid "use patterns in <file> instead of the current ones."
14778
+
msgstr "使用 <file> 中的（而非目前使用的）模式。"
14779
+
14608
14780
#: builtin/stash.c
14609
14781
msgid "git stash list [<log-options>]"
14610
14782
msgstr "git stash list [<log-options>]"
···
15562
15734
msgid "git submodule--helper <command>"
15563
15735
msgstr "git submodule--helper <command>"
15564
15736
15565
-
#: builtin/submodule--helper.c git.c
15566
-
#, c-format
15567
-
msgid "%s doesn't support --super-prefix"
15568
-
msgstr "%s 不支援 --super-prefix"
15569
-
15570
15737
#: builtin/symbolic-ref.c
15571
15738
msgid "git symbolic-ref [-m <reason>] <name> <ref>"
15572
15739
msgstr "git symbolic-ref [-m <reason>] <name> <ref>"
···
16470
16637
16471
16638
#: bundle-uri.c
16472
16639
#, c-format
16640
+
msgid "could not parse bundle list key %s with value '%s'"
16641
+
msgstr "無法解析套件包清單鍵 %s 的值 “%s”"
16642
+
16643
+
#: bundle-uri.c
16644
+
#, c-format
16473
16645
msgid "bundle list at '%s' has no mode"
16474
16646
msgstr "位於 “%s” 的套件包清單沒有模式"
16475
16647
···
16483
16655
16484
16656
#: bundle-uri.c
16485
16657
#, c-format
16658
+
msgid "file downloaded from '%s' is not a bundle"
16659
+
msgstr "從 “%s” 下載的檔案不是套件包"
16660
+
16661
+
#: bundle-uri.c
16662
+
msgid "failed to store maximum creation token"
16663
+
msgstr "無法儲存最大的建立權杖"
16664
+
16665
+
#: bundle-uri.c
16666
+
#, c-format
16486
16667
msgid "unrecognized bundle mode from URI '%s'"
16487
16668
msgstr "無法識別從 URI “%s” 取回的套件包模式"
16488
16669
···
16502
16683
msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"
16503
16684
16504
16685
#: bundle-uri.c
16686
+
#, c-format
16687
+
msgid "bundle-uri: unexpected argument: '%s'"
16688
+
msgstr "bundle-uri: 非預期的引數：“%s”"
16689
+
16690
+
#: bundle-uri.c
16691
+
msgid "bundle-uri: expected flush after arguments"
16692
+
msgstr "bundle-uri: 引數後應該有一個 flush 包"
16693
+
16694
+
#: bundle-uri.c
16505
16695
msgid "bundle-uri: got an empty line"
16506
16696
msgstr "bundle-uri: 收到空白列"
16507
16697
···
16540
16730
#: bundle.c
16541
16731
msgid "need a repository to verify a bundle"
16542
16732
msgstr "需要版本庫驗證套件包"
16733
+
16734
+
#: bundle.c
16735
+
msgid ""
16736
+
"some prerequisite commits exist in the object store, but are not connected "
16737
+
"to the repository's history"
16738
+
msgstr "一些前提提交存在於物件儲存區，但未連接到版本庫的歷史記錄"
16543
16739
16544
16740
#: bundle.c
16545
16741
#, c-format
···
16739
16935
16740
16936
#: command-list.h
16741
16937
msgid "Count unpacked number of objects and their disk consumption"
16742
-
msgstr "計算未打包物件的數量和磁碟空間占用"
16938
+
msgstr "計算未打包物件的數量和磁碟空間佔用"
16743
16939
16744
16940
#: command-list.h
16745
16941
msgid "Retrieve and store user credentials"
···
18108
18304
msgstr "錯誤的 zlib 壓縮級別 %d"
18109
18305
18110
18306
#: config.c
18111
-
msgid "core.commentChar should only be one character"
18112
-
msgstr "core.commentChar 應該是一個字元"
18307
+
msgid "core.commentChar should only be one ASCII character"
18308
+
msgstr "core.commentChar 應該是一個 ASCII 字元"
18113
18309
18114
18310
#: config.c
18115
18311
#, c-format
···
18249
18445
18250
18446
#: config.c
18251
18447
#, c-format
18448
+
msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"
18449
+
msgstr "因為第 %2$<PRIuMAX> 列中 “%1$s” 的文字列太長，故拒絕運作"
18450
+
18451
+
#: config.c
18452
+
#, c-format
18252
18453
msgid "missing value for '%s'"
18253
18454
msgstr "%s 的取值缺少"
18254
18455
···
18315
18516
18316
18517
#: connect.c
18317
18518
#, c-format
18519
+
msgid "error on bundle-uri response line %d: %s"
18520
+
msgstr "在 bundle-uri 回應的第 %d 列發現錯誤：%s"
18521
+
18522
+
#: connect.c
18523
+
msgid "expected flush after bundle-uri listing"
18524
+
msgstr "在 bundle-uri 清單後應該有一個 flush 包"
18525
+
18526
+
#: connect.c
18527
+
msgid "expected response end packet after ref listing"
18528
+
msgstr "在引用列表後預期要有回應結束封包"
18529
+
18530
+
#: connect.c
18531
+
#, c-format
18318
18532
msgid "invalid ls-refs response: %s"
18319
18533
msgstr "無效的 ls-refs 回應：%s"
18320
18534
18321
18535
#: connect.c
18322
18536
msgid "expected flush after ref listing"
18323
18537
msgstr "在引用列表之後應該有一個 flush 包"
18324
-
18325
-
#: connect.c
18326
-
msgid "expected response end packet after ref listing"
18327
-
msgstr "在引用列表後預期要有回應結束封包"
18328
18538
18329
18539
#: connect.c
18330
18540
#, c-format
···
18926
19136
#: diff.c
18927
19137
msgid ""
18928
19138
"output the distribution of relative amount of changes for each sub-directory"
18929
-
msgstr "輸出每個子目錄相對變更的分布"
19139
+
msgstr "輸出每個子目錄相對變更的分佈"
18930
19140
18931
19141
#: diff.c
18932
19142
msgid "synonym for --dirstat=cumulative"
···
19037
19247
#: diff.c
19038
19248
msgid "do not show any source or destination prefix"
19039
19249
msgstr "不顯示任何來源和目的地前綴"
19250
+
19251
+
#: diff.c
19252
+
msgid "use default prefixes a/ and b/"
19253
+
msgstr "使用預設的前置名稱 a/ 和 b/"
19040
19254
19041
19255
#: diff.c
19042
19256
msgid "show context between diff hunks up to the specified number of lines"
···
19407
19621
msgid "hint: Waiting for your editor to close the file...%c"
19408
19622
msgstr "提示：等待您的編輯器關閉檔案...%c"
19409
19623
19624
+
#: editor.c sequencer.c wrapper.c
19625
+
#, c-format
19626
+
msgid "could not write to '%s'"
19627
+
msgstr "不能寫入 '%s'"
19628
+
19629
+
#: editor.c
19630
+
#, c-format
19631
+
msgid "could not edit '%s'"
19632
+
msgstr "無法編輯 '%s'"
19633
+
19410
19634
#: entry.c
19411
19635
msgid "Filtering content"
19412
19636
msgstr "過濾內容"
···
19727
19951
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19728
19952
"bare]\n"
19729
19953
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
19730
-
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
19731
-
" <command> [<args>]"
19954
+
" [--config-env=<name>=<envvar>] <command> [<args>]"
19732
19955
msgstr ""
19733
19956
"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
19734
19957
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
19735
19958
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19736
19959
"bare]\n"
19737
19960
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
19738
-
" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
19739
-
" <command> [<args>]"
19961
+
" [--config-env=<name>=<envvar>] <command> [<args>]"
19740
19962
19741
19963
#: git.c
19742
19964
msgid ""
···
19767
19989
19768
19990
#: git.c
19769
19991
#, c-format
19770
-
msgid "no prefix given for --super-prefix\n"
19771
-
msgstr "沒有為 --super-prefix 提供前綴\n"
19772
-
19773
-
#: git.c
19774
-
#, c-format
19775
19992
msgid "-c expects a configuration string\n"
19776
19993
msgstr "應為 -c 提供一個設定字串\n"
19777
19994
···
19779
19996
#, c-format
19780
19997
msgid "no config key given for --config-env\n"
19781
19998
msgstr "未傳入設定鍵至 --config-env\n"
19999
+
20000
+
#: git.c
20001
+
#, c-format
20002
+
msgid "no attribute source given for --attr-source\n"
20003
+
msgstr "沒有為 --attr-source 提供屬性來源\n"
19782
20004
19783
20005
#: git.c
19784
20006
#, c-format
···
19904
20126
msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
19905
20127
19906
20128
#: gpg-interface.c
19907
-
msgid "gpg failed to sign the data"
19908
-
msgstr "gpg 無法為資料簽名"
20129
+
#, c-format
20130
+
msgid ""
20131
+
"gpg failed to sign the data:\n"
20132
+
"%s"
20133
+
msgstr ""
20134
+
"gpg 無法簽名資料：\n"
20135
+
"%s"
19909
20136
19910
20137
#: gpg-interface.c
19911
20138
msgid "user.signingKey needs to be set for ssh signing"
···
20566
20793
#. conflict in a submodule. The first argument is the submodule
20567
20794
#. name, and the second argument is the abbreviated id of the
20568
20795
#. commit that needs to be merged. For example:
20569
-
#. - go to submodule (mysubmodule), and either merge commit abc1234"
20796
+
#. - go to submodule (mysubmodule), and either merge commit abc1234"
20570
20797
#.
20571
20798
#: merge-ort.c
20572
20799
#, c-format
···
20755
20982
20756
20983
#: merge-recursive.c
20757
20984
msgid "renamed"
20758
-
msgstr "重新命名"
20985
+
msgstr "已重新命名"
20759
20986
20760
20987
#: merge-recursive.c
20761
20988
#, c-format
···
21250
21477
21251
21478
#: object-file.c
21252
21479
#, c-format
21480
+
msgid "unable to open loose object %s"
21481
+
msgstr "無法打開鬆散物件 %s"
21482
+
21483
+
#: object-file.c
21484
+
#, c-format
21253
21485
msgid "unable to parse %s header"
21254
21486
msgstr "無法解析 %s 頭部"
21255
21487
···
21269
21501
21270
21502
#: object-file.c
21271
21503
#, c-format
21272
-
msgid "failed to read object %s"
21273
-
msgstr "讀取物件 %s 失敗"
21504
+
msgid "loose object %s (stored in %s) is corrupt"
21505
+
msgstr "鬆散物件 %s（儲存在 %s）已損壞"
21274
21506
21275
21507
#: object-file.c
21276
21508
#, c-format
···
21279
21511
21280
21512
#: object-file.c
21281
21513
#, c-format
21282
-
msgid "loose object %s (stored in %s) is corrupt"
21283
-
msgstr "鬆散物件 %s（儲存在 %s）已損壞"
21284
-
21285
-
#: object-file.c
21286
-
#, c-format
21287
21514
msgid "packed object %s (stored in %s) is corrupt"
21288
21515
msgstr "打包物件 %s（儲存在 %s）已損壞"
21289
21516
···
21296
21523
#, c-format
21297
21524
msgid "unable to set permission to '%s'"
21298
21525
msgstr "無法為 '%s' 設定權限"
21299
-
21300
-
#: object-file.c
21301
-
msgid "file write error"
21302
-
msgstr "檔案寫錯誤"
21303
21526
21304
21527
#: object-file.c
21305
21528
msgid "error when closing loose object file"
···
21359
21582
msgstr "不能讀取物件 %s"
21360
21583
21361
21584
#: object-file.c
21362
-
msgid "corrupt commit"
21363
-
msgstr "損壞的提交"
21585
+
#, c-format
21586
+
msgid "object fails fsck: %s"
21587
+
msgstr "物件 fsck 失敗：%s"
21364
21588
21365
21589
#: object-file.c
21366
-
msgid "corrupt tag"
21367
-
msgstr "損壞的標籤"
21590
+
msgid "refusing to create malformed object"
21591
+
msgstr "拒絕建立格式錯誤的物件"
21368
21592
21369
21593
#: object-file.c
21370
21594
#, c-format
···
21433
21657
#. TRANSLATORS: This is a line of ambiguous commit
21434
21658
#. object output. E.g.:
21435
21659
#. *
21436
-
#. "deadbeef commit 2021-01-01 - Some Commit Message"
21660
+
#. "deadbeef commit 2021-01-01 - Some Commit Message"
21437
21661
#.
21438
21662
#: object-name.c
21439
21663
#, c-format
···
21443
21667
#. TRANSLATORS: This is a line of ambiguous
21444
21668
#. tag object output. E.g.:
21445
21669
#. *
21446
-
#. "deadbeef tag 2022-01-01 - Some Tag Message"
21670
+
#. "deadbeef tag 2022-01-01 - Some Tag Message"
21447
21671
#. *
21448
21672
#. The second argument is the YYYY-MM-DD found
21449
21673
#. in the tag.
···
21460
21684
#. tag object output where we couldn't parse
21461
21685
#. the tag itself. E.g.:
21462
21686
#. *
21463
-
#. "deadbeef [bad tag, could not parse it]"
21687
+
#. "deadbeef [bad tag, could not parse it]"
21464
21688
#.
21465
21689
#: object-name.c
21466
21690
#, c-format
···
21676
21900
msgstr "無法 fstat 位圖檔案"
21677
21901
21678
21902
#: pack-bitmap.c
21679
-
#, c-format
21680
-
msgid "ignoring extra bitmap file: '%s'"
21681
-
msgstr "忽略多出來的位圖檔案：「%s」"
21682
-
21683
-
#: pack-bitmap.c
21684
21903
msgid "checksum doesn't match in MIDX and bitmap"
21685
21904
msgstr "總和檢查碼在 MIDX 和位圖中無符合項目"
21686
21905
···
21763
21982
msgid "unable to get disk usage of '%s'"
21764
21983
msgstr "無法取得「%s」的磁碟用量"
21765
21984
21985
+
#: pack-bitmap.c
21986
+
#, c-format
21987
+
msgid "bitmap file '%s' has invalid checksum"
21988
+
msgstr "“%s” 位圖檔案的總和檢查碼無效"
21989
+
21766
21990
#: pack-mtimes.c
21767
21991
#, c-format
21768
21992
msgid "mtimes file %s is too small"
···
21812
22036
#, c-format
21813
22037
msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
21814
22038
msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
22039
+
22040
+
#: pack-revindex.c
22041
+
msgid "invalid checksum"
22042
+
msgstr "無效的總和檢查碼"
22043
+
22044
+
#: pack-revindex.c
22045
+
#, c-format
22046
+
msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
22047
+
msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<PRIu32> != %<PRIu32>"
21815
22048
21816
22049
#: pack-write.c
21817
22050
msgid "cannot both write and verify reverse index"
···
22005
22238
#: parse-options.h
22006
22239
msgid "use <n> digits to display object names"
22007
22240
msgstr "用 <n> 位數字顯示物件名稱"
22241
+
22242
+
#: parse-options.h
22243
+
msgid "prefixed path to initial superproject"
22244
+
msgstr "初始父專案的前綴路徑"
22008
22245
22009
22246
#: parse-options.h
22010
22247
msgid "how to strip spaces and #comments from message"
···
22589
22826
22590
22827
#: ref-filter.c
22591
22828
#, c-format
22829
+
msgid "%%(%.*s) does not take arguments"
22830
+
msgstr "%%(%.*s) 不取引數"
22831
+
22832
+
#: ref-filter.c
22833
+
#, c-format
22834
+
msgid "unrecognized %%(%.*s) argument: %s"
22835
+
msgstr "無法識別的 %%(%.*s) 引數：%s"
22836
+
22837
+
#: ref-filter.c
22838
+
#, c-format
22592
22839
msgid "expected format: %%(color:<color>)"
22593
22840
msgstr "期望的格式：%%(color:<顏色>)"
22594
22841
···
22609
22856
22610
22857
#: ref-filter.c
22611
22858
#, c-format
22612
-
msgid "unrecognized %%(%s) argument: %s"
22613
-
msgstr "無法識別的 %%(%s) 參數：%s"
22614
-
22615
-
#: ref-filter.c
22616
-
#, c-format
22617
-
msgid "%%(objecttype) does not take arguments"
22618
-
msgstr "%%(objecttype) 不帶參數"
22619
-
22620
-
#: ref-filter.c
22621
-
#, c-format
22622
-
msgid "%%(deltabase) does not take arguments"
22623
-
msgstr "%%(deltabase) 不帶參數"
22624
-
22625
-
#: ref-filter.c
22626
-
#, c-format
22627
-
msgid "%%(body) does not take arguments"
22628
-
msgstr "%%(body) 不帶參數"
22629
-
22630
-
#: ref-filter.c
22631
-
#, c-format
22632
22859
msgid "expected %%(trailers:key=<value>)"
22633
22860
msgstr "預期是 %%(trailers:key=<value>)"
22634
22861
···
22646
22873
#, c-format
22647
22874
msgid "positive value expected '%s' in %%(%s)"
22648
22875
msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
22649
-
22650
-
#: ref-filter.c
22651
-
#, c-format
22652
-
msgid "unrecognized email option: %s"
22653
-
msgstr "無法識別的 email 選項：%s"
22654
22876
22655
22877
#: ref-filter.c
22656
22878
#, c-format
···
22669
22891
22670
22892
#: ref-filter.c
22671
22893
#, c-format
22894
+
msgid "unrecognized %%(%s) argument: %s"
22895
+
msgstr "無法識別的 %%(%s) 參數：%s"
22896
+
22897
+
#: ref-filter.c
22898
+
#, c-format
22672
22899
msgid "positive width expected with the %%(align) atom"
22673
22900
msgstr "元素 %%(align) 需要一個正數的寬度"
22674
22901
22675
22902
#: ref-filter.c
22676
22903
#, c-format
22677
-
msgid "%%(rest) does not take arguments"
22678
-
msgstr "%%(rest) 未取引數"
22904
+
msgid "expected format: %%(ahead-behind:<committish>)"
22905
+
msgstr "預期格式：%%(ahead-behind:<committish>)"
22679
22906
22680
22907
#: ref-filter.c
22681
22908
#, c-format
···
23413
23640
#: rerere.c
23414
23641
#, c-format
23415
23642
msgid "cannot unlink stray '%s'"
23416
-
msgstr "不能刪除 stray '%s'"
23643
+
msgstr "無法刪除失散檔案 “%s”"
23417
23644
23418
23645
#: rerere.c
23419
23646
#, c-format
···
23432
23659
23433
23660
#: rerere.c
23434
23661
#, c-format
23435
-
msgid "cannot unlink '%s'"
23436
-
msgstr "不能刪除 '%s'"
23437
-
23438
-
#: rerere.c
23439
-
#, c-format
23440
23662
msgid "Updated preimage for '%s'"
23441
23663
msgstr "已為 '%s' 更新 preimage"
23442
23664
···
23851
24073
msgid "could not lock '%s'"
23852
24074
msgstr "不能鎖定 '%s'"
23853
24075
23854
-
#: sequencer.c strbuf.c wrapper.c
23855
-
#, c-format
23856
-
msgid "could not write to '%s'"
23857
-
msgstr "不能寫入 '%s'"
23858
-
23859
24076
#: sequencer.c
23860
24077
#, c-format
23861
24078
msgid "could not write eol to '%s'"
···
24185
24402
24186
24403
#: sequencer.c
24187
24404
#, c-format
24405
+
msgid "'%s' is not a valid label"
24406
+
msgstr "“%s” 不是有效的標籤"
24407
+
24408
+
#: sequencer.c
24409
+
#, c-format
24410
+
msgid "'%s' is not a valid refname"
24411
+
msgstr "“%s” 不是有效的引用名稱"
24412
+
24413
+
#: sequencer.c
24414
+
#, c-format
24415
+
msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
24416
+
msgstr "update-ref 需要完全限定的引用名稱，比如：refs/heads/%s"
24417
+
24418
+
#: sequencer.c
24419
+
#, c-format
24420
+
msgid "invalid command '%.*s'"
24421
+
msgstr "無效的命令 “%.*s”"
24422
+
24423
+
#: sequencer.c
24424
+
#, c-format
24188
24425
msgid "%s does not accept arguments: '%s'"
24189
24426
msgstr "%s 不接受參數：'%s'"
24190
24427
···
24272
24509
#, c-format
24273
24510
msgid "could not create sequencer directory '%s'"
24274
24511
msgstr "不能建立序列目錄 '%s'"
24275
-
24276
-
#: sequencer.c
24277
-
msgid "could not lock HEAD"
24278
-
msgstr "不能鎖定 HEAD"
24279
24512
24280
24513
#: sequencer.c
24281
24514
msgid "no cherry-pick or revert in progress"
···
24392
24625
"\n"
24393
24626
24394
24627
#: sequencer.c
24395
-
msgid "and made changes to the index and/or the working tree\n"
24396
-
msgstr "並且修改索引和/或工作區\n"
24628
+
msgid "and made changes to the index and/or the working tree.\n"
24629
+
msgstr "並且更改索引和（或）工作區。\n"
24397
24630
24398
24631
#: sequencer.c
24399
24632
#, c-format
24400
24633
msgid ""
24401
24634
"execution succeeded: %s\n"
24402
-
"but left changes to the index and/or the working tree\n"
24635
+
"but left changes to the index and/or the working tree.\n"
24403
24636
"Commit or stash your changes, and then run\n"
24404
24637
"\n"
24405
24638
" git rebase --continue\n"
24406
24639
"\n"
24407
24640
msgstr ""
24408
24641
"執行成功：%s\n"
24409
-
"但是在索引和/或工作區中存在變更\n"
24410
-
"提交或貯存修改，然後執行\n"
24642
+
"但是在索引和（或）工作區中存在變更。\n"
24643
+
"請提交或貯存修改，然後執行\n"
24411
24644
"\n"
24412
24645
" git rebase --continue\n"
24413
24646
"\n"
···
24924
25157
msgid_plural "%u bytes/s"
24925
25158
msgstr[0] "%u 位元組/秒"
24926
25159
24927
-
#: strbuf.c
24928
-
#, c-format
24929
-
msgid "could not edit '%s'"
24930
-
msgstr "無法編輯 '%s'"
24931
-
24932
25160
#: submodule-config.c
24933
25161
#, c-format
24934
25162
msgid "ignoring suspicious submodule name: %s"
···
25139
25367
msgid "failed to lstat '%s'"
25140
25368
msgstr "無法 lstat “%s”"
25141
25369
25370
+
#: t/helper/test-bundle-uri.c
25371
+
msgid "no remote configured to get bundle URIs from"
25372
+
msgstr "沒有設定可以用來取得套件包 URIs 的遠端"
25373
+
25374
+
#: t/helper/test-bundle-uri.c
25375
+
#, c-format
25376
+
msgid "remote '%s' has no configured URL"
25377
+
msgstr "“%s” 遠端未設定 URL"
25378
+
25379
+
#: t/helper/test-bundle-uri.c
25380
+
msgid "could not get the bundle-uri list"
25381
+
msgstr "無法取得 bundle-uri 清單"
25382
+
25142
25383
#: t/helper/test-cache-tree.c
25143
25384
msgid "test-tool cache-tree <options> (control|prime|update)"
25144
25385
msgstr "test-tool cache-tree <options> (control|prime|update)"
···
25575
25816
msgid "failed to push all needed submodules"
25576
25817
msgstr "不能推送全部需要的子模組"
25577
25818
25819
+
#: transport.c
25820
+
msgid "bundle-uri operation not supported by protocol"
25821
+
msgstr "通訊協定不支援 bundle-uri 動作"
25822
+
25823
+
#: transport.c
25824
+
msgid "could not retrieve server-advertised bundle-uri list"
25825
+
msgstr "無法取得伺服器公佈的 bundle-uri 清單"
25826
+
25578
25827
#: tree-walk.c
25579
25828
msgid "too-short tree object"
25580
25829
msgstr "太短的樹狀物件"
···
26489
26738
#: wt-status.c
26490
26739
#, c-format
26491
26740
msgid ""
26492
-
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
26493
-
"may speed it up, but you have to be careful not to forget to add\n"
26494
-
"new files yourself (see 'git help status')."
26741
+
"It took %.2f seconds to enumerate untracked files,\n"
26742
+
"but the results were cached, and subsequent runs may be faster."
26495
26743
msgstr ""
26496
-
"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
26497
-
"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
26744
+
"列舉未追蹤檔案花費 %.2f 秒，\n"
26745
+
"不過已經快取結果，之後執行的速度或許能比較快。"
26746
+
26747
+
#: wt-status.c
26748
+
#, c-format
26749
+
msgid "It took %.2f seconds to enumerate untracked files."
26750
+
msgstr "列舉未追蹤檔案花費 %.2f 秒。"
26751
+
26752
+
#: wt-status.c
26753
+
msgid "See 'git help status' for information on how to improve this."
26754
+
msgstr "請參閱 “git help status” 深入了解如何改善。"
26498
26755
26499
26756
#: wt-status.c
26500
26757
#, c-format
···
26670
26927
msgid "Unable to determine absolute path of git directory"
26671
26928
msgstr "不能確定 git 目錄的絕對路徑"
26672
26929
26673
-
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
26674
-
#: git-add--interactive.perl
26675
-
#, perl-format
26676
-
msgid "%12s %12s %s"
26677
-
msgstr "%12s %12s %s"
26678
-
26679
-
#: git-add--interactive.perl
26680
-
#, perl-format
26681
-
msgid "touched %d path\n"
26682
-
msgid_plural "touched %d paths\n"
26683
-
msgstr[0] "建立了 %d 個路徑\n"
26684
-
26685
-
#: git-add--interactive.perl
26686
-
msgid ""
26687
-
"If the patch applies cleanly, the edited hunk will immediately be\n"
26688
-
"marked for staging."
26689
-
msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。"
26690
-
26691
-
#: git-add--interactive.perl
26692
-
msgid ""
26693
-
"If the patch applies cleanly, the edited hunk will immediately be\n"
26694
-
"marked for stashing."
26695
-
msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。"
26696
-
26697
-
#: git-add--interactive.perl
26698
-
msgid ""
26699
-
"If the patch applies cleanly, the edited hunk will immediately be\n"
26700
-
"marked for unstaging."
26701
-
msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。"
26702
-
26703
-
#: git-add--interactive.perl
26704
-
msgid ""
26705
-
"If the patch applies cleanly, the edited hunk will immediately be\n"
26706
-
"marked for applying."
26707
-
msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。"
26708
-
26709
-
#: git-add--interactive.perl
26710
-
msgid ""
26711
-
"If the patch applies cleanly, the edited hunk will immediately be\n"
26712
-
"marked for discarding."
26713
-
msgstr "如果修補檔能完全套用，編輯塊將立即標記為捨棄。"
26714
-
26715
-
#: git-add--interactive.perl
26716
-
#, perl-format
26717
-
msgid "failed to open hunk edit file for writing: %s"
26718
-
msgstr "為寫入開啟區塊編輯檔案失敗：%s"
26719
-
26720
-
#: git-add--interactive.perl
26721
-
#, perl-format
26722
-
msgid ""
26723
-
"---\n"
26724
-
"To remove '%s' lines, make them ' ' lines (context).\n"
26725
-
"To remove '%s' lines, delete them.\n"
26726
-
"Lines starting with %s will be removed.\n"
26727
-
msgstr ""
26728
-
"---\n"
26729
-
"要刪除 '%s' 開始的行，使其成為 ' ' 開始的行（上下文）。\n"
26730
-
"要刪除 '%s' 開始的行，刪除它們。\n"
26731
-
"以 %s 開始的行將被刪除。\n"
26732
-
26733
-
#: git-add--interactive.perl
26734
-
#, perl-format
26735
-
msgid "failed to open hunk edit file for reading: %s"
26736
-
msgstr "無法讀取區塊編輯檔案：%s"
26737
-
26738
-
#: git-add--interactive.perl
26739
-
msgid ""
26740
-
"y - stage this hunk\n"
26741
-
"n - do not stage this hunk\n"
26742
-
"q - quit; do not stage this hunk or any of the remaining ones\n"
26743
-
"a - stage this hunk and all later hunks in the file\n"
26744
-
"d - do not stage this hunk or any of the later hunks in the file"
26745
-
msgstr ""
26746
-
"y - 暫存此區塊\n"
26747
-
"n - 不要暫存此區塊\n"
26748
-
"q - 離開。不暫存此區塊及後面的全部區塊\n"
26749
-
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
26750
-
"d - 不暫存此區塊和本檔案中後面的全部區塊"
26751
-
26752
-
#: git-add--interactive.perl
26753
-
msgid ""
26754
-
"y - stash this hunk\n"
26755
-
"n - do not stash this hunk\n"
26756
-
"q - quit; do not stash this hunk or any of the remaining ones\n"
26757
-
"a - stash this hunk and all later hunks in the file\n"
26758
-
"d - do not stash this hunk or any of the later hunks in the file"
26759
-
msgstr ""
26760
-
"y - 貯存此區塊\n"
26761
-
"n - 不要貯存此區塊\n"
26762
-
"q - 離開。不貯存此區塊及後面的全部區塊\n"
26763
-
"a - 貯存此區塊和本檔案中後面的全部區塊\n"
26764
-
"d - 不貯存此區塊和本檔案中後面的全部區塊"
26765
-
26766
-
#: git-add--interactive.perl
26767
-
msgid ""
26768
-
"y - unstage this hunk\n"
26769
-
"n - do not unstage this hunk\n"
26770
-
"q - quit; do not unstage this hunk or any of the remaining ones\n"
26771
-
"a - unstage this hunk and all later hunks in the file\n"
26772
-
"d - do not unstage this hunk or any of the later hunks in the file"
26773
-
msgstr ""
26774
-
"y - 不暫存此區塊\n"
26775
-
"n - 不要不暫存此區塊\n"
26776
-
"q - 離開。不要不暫存此區塊及後面的全部區塊\n"
26777
-
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
26778
-
"d - 不要不暫存此區塊和本檔案中後面的全部區塊"
26779
-
26780
-
#: git-add--interactive.perl
26781
-
msgid ""
26782
-
"y - apply this hunk to index\n"
26783
-
"n - do not apply this hunk to index\n"
26784
-
"q - quit; do not apply this hunk or any of the remaining ones\n"
26785
-
"a - apply this hunk and all later hunks in the file\n"
26786
-
"d - do not apply this hunk or any of the later hunks in the file"
26787
-
msgstr ""
26788
-
"y - 在索引中套用此區塊\n"
26789
-
"n - 不要在索引中套用此區塊\n"
26790
-
"q - 離開。不要套用此區塊及後面的全部區塊\n"
26791
-
"a - 套用此區塊和本檔案中後面的全部區塊\n"
26792
-
"d - 不要套用此區塊和本檔案中後面的全部區塊"
26793
-
26794
-
#: git-add--interactive.perl
26795
-
msgid ""
26796
-
"y - discard this hunk from worktree\n"
26797
-
"n - do not discard this hunk from worktree\n"
26798
-
"q - quit; do not discard this hunk or any of the remaining ones\n"
26799
-
"a - discard this hunk and all later hunks in the file\n"
26800
-
"d - do not discard this hunk or any of the later hunks in the file"
26801
-
msgstr ""
26802
-
"y - 在工作區中捨棄此區塊\n"
26803
-
"n - 不要在工作區中捨棄此區塊\n"
26804
-
"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
26805
-
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
26806
-
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
26807
-
26808
-
#: git-add--interactive.perl
26809
-
msgid ""
26810
-
"y - discard this hunk from index and worktree\n"
26811
-
"n - do not discard this hunk from index and worktree\n"
26812
-
"q - quit; do not discard this hunk or any of the remaining ones\n"
26813
-
"a - discard this hunk and all later hunks in the file\n"
26814
-
"d - do not discard this hunk or any of the later hunks in the file"
26815
-
msgstr ""
26816
-
"y - 在索引和工作區中捨棄此區塊\n"
26817
-
"n - 不要在索引和工作區中捨棄此區塊\n"
26818
-
"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
26819
-
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
26820
-
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
26821
-
26822
-
#: git-add--interactive.perl
26823
-
msgid ""
26824
-
"y - apply this hunk to index and worktree\n"
26825
-
"n - do not apply this hunk to index and worktree\n"
26826
-
"q - quit; do not apply this hunk or any of the remaining ones\n"
26827
-
"a - apply this hunk and all later hunks in the file\n"
26828
-
"d - do not apply this hunk or any of the later hunks in the file"
26829
-
msgstr ""
26830
-
"y - 在索引和工作區中套用此區塊\n"
26831
-
"n - 不要在索引和工作區中套用此區塊\n"
26832
-
"q - 離開。不要套用此區塊及後面的全部區塊\n"
26833
-
"a - 套用此區塊和本檔案中後面的全部區塊\n"
26834
-
"d - 不要套用此區塊和本檔案中後面的全部區塊"
26835
-
26836
-
#: git-add--interactive.perl
26837
-
msgid ""
26838
-
"y - apply this hunk to worktree\n"
26839
-
"n - do not apply this hunk to worktree\n"
26840
-
"q - quit; do not apply this hunk or any of the remaining ones\n"
26841
-
"a - apply this hunk and all later hunks in the file\n"
26842
-
"d - do not apply this hunk or any of the later hunks in the file"
26843
-
msgstr ""
26844
-
"y - 在工作區中套用此區塊\n"
26845
-
"n - 不要在工作區中套用此區塊\n"
26846
-
"q - 離開。不要套用此區塊及後面的全部區塊\n"
26847
-
"a - 套用此區塊和本檔案中後面的全部區塊\n"
26848
-
"d - 不要套用此區塊和本檔案中後面的全部區塊"
26849
-
26850
-
#: git-add--interactive.perl
26851
-
msgid ""
26852
-
"g - select a hunk to go to\n"
26853
-
"/ - search for a hunk matching the given regex\n"
26854
-
"j - leave this hunk undecided, see next undecided hunk\n"
26855
-
"J - leave this hunk undecided, see next hunk\n"
26856
-
"k - leave this hunk undecided, see previous undecided hunk\n"
26857
-
"K - leave this hunk undecided, see previous hunk\n"
26858
-
"s - split the current hunk into smaller hunks\n"
26859
-
"e - manually edit the current hunk\n"
26860
-
"? - print help\n"
26861
-
msgstr ""
26862
-
"g - 選擇跳轉到一個區塊\n"
26863
-
"/ - 尋找和提供常規表示式符合的區塊\n"
26864
-
"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"
26865
-
"J - 維持此區塊未決狀態，檢視下一個區塊\n"
26866
-
"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
26867
-
"K - 維持此區塊未決狀態，檢視上一個區塊\n"
26868
-
"s - 分割目前區塊為更小的區塊\n"
26869
-
"e - 手動編輯目前區塊\n"
26870
-
"? - 顯示說明\n"
26871
-
26872
-
#: git-add--interactive.perl
26873
-
msgid "The selected hunks do not apply to the index!\n"
26874
-
msgstr "選取區塊不能套用到索引！\n"
26875
-
26876
-
#: git-add--interactive.perl
26877
-
#, perl-format
26878
-
msgid "ignoring unmerged: %s\n"
26879
-
msgstr "忽略未套用的：%s\n"
26880
-
26881
-
#: git-add--interactive.perl
26882
-
msgid "No other hunks to goto\n"
26883
-
msgstr "沒有其它可供跳轉的區塊\n"
26884
-
26885
-
#: git-add--interactive.perl
26886
-
#, perl-format
26887
-
msgid "Invalid number: '%s'\n"
26888
-
msgstr "無效數字：'%s'\n"
26889
-
26890
-
#: git-add--interactive.perl
26891
-
#, perl-format
26892
-
msgid "Sorry, only %d hunk available.\n"
26893
-
msgid_plural "Sorry, only %d hunks available.\n"
26894
-
msgstr[0] "對不起，只有 %d 個可用區塊。\n"
26895
-
26896
-
#: git-add--interactive.perl
26897
-
msgid "No other hunks to search\n"
26898
-
msgstr "沒有其它可供尋找的區塊\n"
26899
-
26900
-
#: git-add--interactive.perl
26901
-
#, perl-format
26902
-
msgid "Malformed search regexp %s: %s\n"
26903
-
msgstr "錯誤的常規表示式 %s：%s\n"
26904
-
26905
-
#: git-add--interactive.perl
26906
-
msgid "No hunk matches the given pattern\n"
26907
-
msgstr "沒有和提供模式相符合的區塊\n"
26908
-
26909
-
#: git-add--interactive.perl
26910
-
msgid "No previous hunk\n"
26911
-
msgstr "沒有上一個區塊\n"
26912
-
26913
-
#: git-add--interactive.perl
26914
-
msgid "No next hunk\n"
26915
-
msgstr "沒有下一個區塊\n"
26916
-
26917
-
#: git-add--interactive.perl
26918
-
msgid "Sorry, cannot split this hunk\n"
26919
-
msgstr "對不起，不能分割這個區塊\n"
26920
-
26921
-
#: git-add--interactive.perl
26922
-
#, perl-format
26923
-
msgid "Split into %d hunk.\n"
26924
-
msgid_plural "Split into %d hunks.\n"
26925
-
msgstr[0] "分割為 %d 塊。\n"
26926
-
26927
-
#: git-add--interactive.perl
26928
-
msgid "Sorry, cannot edit this hunk\n"
26929
-
msgstr "對不起，不能編輯這個區塊\n"
26930
-
26931
-
#. TRANSLATORS: please do not translate the command names
26932
-
#. 'status', 'update', 'revert', etc.
26933
-
#: git-add--interactive.perl
26934
-
msgid ""
26935
-
"status - show paths with changes\n"
26936
-
"update - add working tree state to the staged set of changes\n"
26937
-
"revert - revert staged set of changes back to the HEAD version\n"
26938
-
"patch - pick hunks and update selectively\n"
26939
-
"diff - view diff between HEAD and index\n"
26940
-
"add untracked - add contents of untracked files to the staged set of "
26941
-
"changes\n"
26942
-
msgstr ""
26943
-
"status - 顯示含變更的路徑\n"
26944
-
"update - 新增工作區狀態至暫存列表\n"
26945
-
"revert - 還原修改的暫存集至 HEAD 版本\n"
26946
-
"patch - 挑選區塊並且有選擇地更新\n"
26947
-
"diff - 顯示 HEAD 和索引間差異\n"
26948
-
"add untracked - 新增未追蹤檔案的內容至暫存列表\n"
26949
-
26950
-
#: git-add--interactive.perl
26951
-
msgid "missing --"
26952
-
msgstr "缺少 --"
26953
-
26954
-
#: git-add--interactive.perl
26955
-
#, perl-format
26956
-
msgid "unknown --patch mode: %s"
26957
-
msgstr "未知的 --patch 模式：%s"
26958
-
26959
-
#: git-add--interactive.perl
26960
-
#, perl-format
26961
-
msgid "invalid argument %s, expecting --"
26962
-
msgstr "無效的參數 %s，期望是 --"
26963
-
26964
26930
#: git-send-email.perl
26965
26931
msgid "local zone differs from GMT by a non-minute interval\n"
26966
26932
msgstr "本機時間和 GMT 有不到一分鐘間隔\n"
···
27282
27248
27283
27249
#: git-send-email.perl
27284
27250
#, perl-format
27285
-
msgid "(%s) Adding %s: %s from: '%s'\n"
27286
-
msgstr "(%s) 新增 %s: %s 自：'%s'\n"
27251
+
msgid "(%s) Malformed output from '%s'"
27252
+
msgstr "(%s) 從 “%s” 讀到格式錯誤的輸出"
27287
27253
27288
27254
#: git-send-email.perl
27289
27255
#, perl-format
27290
27256
msgid "(%s) failed to close pipe to '%s'"
27291
27257
msgstr "(%s) 無法關閉管道至 '%s'"
27258
+
27259
+
#: git-send-email.perl
27260
+
#, perl-format
27261
+
msgid "(%s) Adding %s: %s from: '%s'\n"
27262
+
msgstr "(%s) 新增 %s: %s 自：'%s'\n"
27292
27263
27293
27264
#: git-send-email.perl
27294
27265
msgid "cannot send message as 7bit"
···
27333
27304
#, perl-format
27334
27305
msgid "Do you really want to send %s? [y|N]: "
27335
27306
msgstr "您真的要傳送 %s？[y|N]： "
27307
+
27308
+
#~ msgid "current working directory is untracked"
27309
+
#~ msgstr "尚未追蹤目前的工作目錄"
27310
+
27311
+
#~ msgid "cannot use --contents with final commit object name"
27312
+
#~ msgstr "無法將 --contents 與最終的提交物件名稱共用"
27313
+
27314
+
#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
27315
+
#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
27316
+
27317
+
#~ msgid "won't bisect on cg-seek'ed tree"
27318
+
#~ msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"
27319
+
27320
+
#~ msgid "--bisect-terms requires 0 or 1 argument"
27321
+
#~ msgstr "--bisect-terms 需要 0 或 1 個引數"
27322
+
27323
+
#~ msgid "--bisect-next requires 0 arguments"
27324
+
#~ msgstr "--bisect-next 需要 0 個引數"
27325
+
27326
+
#~ msgid "--bisect-log requires 0 arguments"
27327
+
#~ msgstr "--bisect-log 需要 0 個引數"
27328
+
27329
+
#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
27330
+
#~ msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
27331
+
27332
+
#~ msgid "default for git_env_*(...) to fall back on"
27333
+
#~ msgstr "git_env_*(...) 的預設值"
27334
+
27335
+
#~ msgid "be quiet only use git_env_*() value as exit code"
27336
+
#~ msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼"
27337
+
27338
+
#, c-format
27339
+
#~ msgid ""
27340
+
#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`"
27341
+
#~ msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」"
27342
+
27343
+
#, c-format
27344
+
#~ msgid ""
27345
+
#~ "option `--default' expects an unsigned long value with `--type=ulong`, "
27346
+
#~ "not `%s`"
27347
+
#~ msgstr ""
27348
+
#~ "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"
27349
+
27350
+
#~ msgid "please commit or stash them."
27351
+
#~ msgstr "請提交或貯存它們。"
27352
+
27353
+
#, c-format
27354
+
#~ msgid "Unknown mode: %s"
27355
+
#~ msgstr "未知模式：%s"
27356
+
27357
+
#, c-format
27358
+
#~ msgid "%s doesn't support --super-prefix"
27359
+
#~ msgstr "%s 不支援 --super-prefix"
27360
+
27361
+
#, c-format
27362
+
#~ msgid "no prefix given for --super-prefix\n"
27363
+
#~ msgstr "沒有為 --super-prefix 提供前綴\n"
27364
+
27365
+
#, c-format
27366
+
#~ msgid "failed to read object %s"
27367
+
#~ msgstr "讀取物件 %s 失敗"
27368
+
27369
+
#~ msgid "file write error"
27370
+
#~ msgstr "檔案寫錯誤"
27371
+
27372
+
#~ msgid "corrupt commit"
27373
+
#~ msgstr "損壞的提交"
27374
+
27375
+
#~ msgid "corrupt tag"
27376
+
#~ msgstr "損壞的標籤"
27377
+
27378
+
#, c-format
27379
+
#~ msgid "%%(objecttype) does not take arguments"
27380
+
#~ msgstr "%%(objecttype) 不帶參數"
27381
+
27382
+
#, c-format
27383
+
#~ msgid "%%(deltabase) does not take arguments"
27384
+
#~ msgstr "%%(deltabase) 不帶參數"
27385
+
27386
+
#, c-format
27387
+
#~ msgid "%%(body) does not take arguments"
27388
+
#~ msgstr "%%(body) 不帶參數"
27389
+
27390
+
#, c-format
27391
+
#~ msgid "unrecognized email option: %s"
27392
+
#~ msgstr "無法識別的 email 選項：%s"
27393
+
27394
+
#~ msgid "could not lock HEAD"
27395
+
#~ msgstr "不能鎖定 HEAD"
27396
+
27397
+
#, c-format
27398
+
#~ msgid ""
27399
+
#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
27400
+
#~ "may speed it up, but you have to be careful not to forget to add\n"
27401
+
#~ "new files yourself (see 'git help status')."
27402
+
#~ msgstr ""
27403
+
#~ "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
27404
+
#~ "但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
27405
+
27406
+
#, perl-format
27407
+
#~ msgid "%12s %12s %s"
27408
+
#~ msgstr "%12s %12s %s"
27409
+
27410
+
#, perl-format
27411
+
#~ msgid "touched %d path\n"
27412
+
#~ msgid_plural "touched %d paths\n"
27413
+
#~ msgstr[0] "建立了 %d 個路徑\n"
27414
+
27415
+
#~ msgid ""
27416
+
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
27417
+
#~ "marked for staging."
27418
+
#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。"
27419
+
27420
+
#~ msgid ""
27421
+
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
27422
+
#~ "marked for stashing."
27423
+
#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。"
27424
+
27425
+
#~ msgid ""
27426
+
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
27427
+
#~ "marked for unstaging."
27428
+
#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。"
27429
+
27430
+
#~ msgid ""
27431
+
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
27432
+
#~ "marked for applying."
27433
+
#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。"
27434
+
27435
+
#~ msgid ""
27436
+
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
27437
+
#~ "marked for discarding."
27438
+
#~ msgstr "如果修補檔能完全套用，編輯塊將立即標記為捨棄。"
27439
+
27440
+
#, perl-format
27441
+
#~ msgid "failed to open hunk edit file for writing: %s"
27442
+
#~ msgstr "為寫入開啟區塊編輯檔案失敗：%s"
27443
+
27444
+
#, perl-format
27445
+
#~ msgid ""
27446
+
#~ "---\n"
27447
+
#~ "To remove '%s' lines, make them ' ' lines (context).\n"
27448
+
#~ "To remove '%s' lines, delete them.\n"
27449
+
#~ "Lines starting with %s will be removed.\n"
27450
+
#~ msgstr ""
27451
+
#~ "---\n"
27452
+
#~ "要刪除 '%s' 開始的行，使其成為 ' ' 開始的行（上下文）。\n"
27453
+
#~ "要刪除 '%s' 開始的行，刪除它們。\n"
27454
+
#~ "以 %s 開始的行將被刪除。\n"
27455
+
27456
+
#, perl-format
27457
+
#~ msgid "failed to open hunk edit file for reading: %s"
27458
+
#~ msgstr "無法讀取區塊編輯檔案：%s"
27459
+
27460
+
#~ msgid ""
27461
+
#~ "y - stage this hunk\n"
27462
+
#~ "n - do not stage this hunk\n"
27463
+
#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
27464
+
#~ "a - stage this hunk and all later hunks in the file\n"
27465
+
#~ "d - do not stage this hunk or any of the later hunks in the file"
27466
+
#~ msgstr ""
27467
+
#~ "y - 暫存此區塊\n"
27468
+
#~ "n - 不要暫存此區塊\n"
27469
+
#~ "q - 離開。不暫存此區塊及後面的全部區塊\n"
27470
+
#~ "a - 暫存此區塊和本檔案中後面的全部區塊\n"
27471
+
#~ "d - 不暫存此區塊和本檔案中後面的全部區塊"
27472
+
27473
+
#~ msgid ""
27474
+
#~ "y - stash this hunk\n"
27475
+
#~ "n - do not stash this hunk\n"
27476
+
#~ "q - quit; do not stash this hunk or any of the remaining ones\n"
27477
+
#~ "a - stash this hunk and all later hunks in the file\n"
27478
+
#~ "d - do not stash this hunk or any of the later hunks in the file"
27479
+
#~ msgstr ""
27480
+
#~ "y - 貯存此區塊\n"
27481
+
#~ "n - 不要貯存此區塊\n"
27482
+
#~ "q - 離開。不貯存此區塊及後面的全部區塊\n"
27483
+
#~ "a - 貯存此區塊和本檔案中後面的全部區塊\n"
27484
+
#~ "d - 不貯存此區塊和本檔案中後面的全部區塊"
27485
+
27486
+
#~ msgid ""
27487
+
#~ "y - unstage this hunk\n"
27488
+
#~ "n - do not unstage this hunk\n"
27489
+
#~ "q - quit; do not unstage this hunk or any of the remaining ones\n"
27490
+
#~ "a - unstage this hunk and all later hunks in the file\n"
27491
+
#~ "d - do not unstage this hunk or any of the later hunks in the file"
27492
+
#~ msgstr ""
27493
+
#~ "y - 不暫存此區塊\n"
27494
+
#~ "n - 不要不暫存此區塊\n"
27495
+
#~ "q - 離開。不要不暫存此區塊及後面的全部區塊\n"
27496
+
#~ "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
27497
+
#~ "d - 不要不暫存此區塊和本檔案中後面的全部區塊"
27498
+
27499
+
#~ msgid ""
27500
+
#~ "y - apply this hunk to index\n"
27501
+
#~ "n - do not apply this hunk to index\n"
27502
+
#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
27503
+
#~ "a - apply this hunk and all later hunks in the file\n"
27504
+
#~ "d - do not apply this hunk or any of the later hunks in the file"
27505
+
#~ msgstr ""
27506
+
#~ "y - 在索引中套用此區塊\n"
27507
+
#~ "n - 不要在索引中套用此區塊\n"
27508
+
#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
27509
+
#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
27510
+
#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
27511
+
27512
+
#~ msgid ""
27513
+
#~ "y - discard this hunk from worktree\n"
27514
+
#~ "n - do not discard this hunk from worktree\n"
27515
+
#~ "q - quit; do not discard this hunk or any of the remaining ones\n"
27516
+
#~ "a - discard this hunk and all later hunks in the file\n"
27517
+
#~ "d - do not discard this hunk or any of the later hunks in the file"
27518
+
#~ msgstr ""
27519
+
#~ "y - 在工作區中捨棄此區塊\n"
27520
+
#~ "n - 不要在工作區中捨棄此區塊\n"
27521
+
#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"
27522
+
#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
27523
+
#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
27524
+
27525
+
#~ msgid ""
27526
+
#~ "y - discard this hunk from index and worktree\n"
27527
+
#~ "n - do not discard this hunk from index and worktree\n"
27528
+
#~ "q - quit; do not discard this hunk or any of the remaining ones\n"
27529
+
#~ "a - discard this hunk and all later hunks in the file\n"
27530
+
#~ "d - do not discard this hunk or any of the later hunks in the file"
27531
+
#~ msgstr ""
27532
+
#~ "y - 在索引和工作區中捨棄此區塊\n"
27533
+
#~ "n - 不要在索引和工作區中捨棄此區塊\n"
27534
+
#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"
27535
+
#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
27536
+
#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"
27537
+
27538
+
#~ msgid ""
27539
+
#~ "y - apply this hunk to index and worktree\n"
27540
+
#~ "n - do not apply this hunk to index and worktree\n"
27541
+
#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
27542
+
#~ "a - apply this hunk and all later hunks in the file\n"
27543
+
#~ "d - do not apply this hunk or any of the later hunks in the file"
27544
+
#~ msgstr ""
27545
+
#~ "y - 在索引和工作區中套用此區塊\n"
27546
+
#~ "n - 不要在索引和工作區中套用此區塊\n"
27547
+
#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
27548
+
#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
27549
+
#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
27550
+
27551
+
#~ msgid ""
27552
+
#~ "y - apply this hunk to worktree\n"
27553
+
#~ "n - do not apply this hunk to worktree\n"
27554
+
#~ "q - quit; do not apply this hunk or any of the remaining ones\n"
27555
+
#~ "a - apply this hunk and all later hunks in the file\n"
27556
+
#~ "d - do not apply this hunk or any of the later hunks in the file"
27557
+
#~ msgstr ""
27558
+
#~ "y - 在工作區中套用此區塊\n"
27559
+
#~ "n - 不要在工作區中套用此區塊\n"
27560
+
#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"
27561
+
#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"
27562
+
#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"
27563
+
27564
+
#~ msgid ""
27565
+
#~ "g - select a hunk to go to\n"
27566
+
#~ "/ - search for a hunk matching the given regex\n"
27567
+
#~ "j - leave this hunk undecided, see next undecided hunk\n"
27568
+
#~ "J - leave this hunk undecided, see next hunk\n"
27569
+
#~ "k - leave this hunk undecided, see previous undecided hunk\n"
27570
+
#~ "K - leave this hunk undecided, see previous hunk\n"
27571
+
#~ "s - split the current hunk into smaller hunks\n"
27572
+
#~ "e - manually edit the current hunk\n"
27573
+
#~ "? - print help\n"
27574
+
#~ msgstr ""
27575
+
#~ "g - 選擇跳轉到一個區塊\n"
27576
+
#~ "/ - 尋找和提供常規表示式符合的區塊\n"
27577
+
#~ "j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"
27578
+
#~ "J - 維持此區塊未決狀態，檢視下一個區塊\n"
27579
+
#~ "k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"
27580
+
#~ "K - 維持此區塊未決狀態，檢視上一個區塊\n"
27581
+
#~ "s - 分割目前區塊為更小的區塊\n"
27582
+
#~ "e - 手動編輯目前區塊\n"
27583
+
#~ "? - 顯示說明\n"
27584
+
27585
+
#~ msgid "The selected hunks do not apply to the index!\n"
27586
+
#~ msgstr "選取區塊不能套用到索引！\n"
27587
+
27588
+
#, perl-format
27589
+
#~ msgid "ignoring unmerged: %s\n"
27590
+
#~ msgstr "忽略未套用的：%s\n"
27591
+
27592
+
#~ msgid "No other hunks to goto\n"
27593
+
#~ msgstr "沒有其它可供跳轉的區塊\n"
27594
+
27595
+
#, perl-format
27596
+
#~ msgid "Invalid number: '%s'\n"
27597
+
#~ msgstr "無效數字：'%s'\n"
27598
+
27599
+
#, perl-format
27600
+
#~ msgid "Sorry, only %d hunk available.\n"
27601
+
#~ msgid_plural "Sorry, only %d hunks available.\n"
27602
+
#~ msgstr[0] "對不起，只有 %d 個可用區塊。\n"
27603
+
27604
+
#~ msgid "No other hunks to search\n"
27605
+
#~ msgstr "沒有其它可供尋找的區塊\n"
27606
+
27607
+
#, perl-format
27608
+
#~ msgid "Malformed search regexp %s: %s\n"
27609
+
#~ msgstr "錯誤的常規表示式 %s：%s\n"
27610
+
27611
+
#~ msgid "No hunk matches the given pattern\n"
27612
+
#~ msgstr "沒有和提供模式相符合的區塊\n"
27613
+
27614
+
#~ msgid "No previous hunk\n"
27615
+
#~ msgstr "沒有上一個區塊\n"
27616
+
27617
+
#~ msgid "No next hunk\n"
27618
+
#~ msgstr "沒有下一個區塊\n"
27619
+
27620
+
#~ msgid "Sorry, cannot split this hunk\n"
27621
+
#~ msgstr "對不起，不能分割這個區塊\n"
27622
+
27623
+
#, perl-format
27624
+
#~ msgid "Split into %d hunk.\n"
27625
+
#~ msgid_plural "Split into %d hunks.\n"
27626
+
#~ msgstr[0] "分割為 %d 塊。\n"
27627
+
27628
+
#~ msgid "Sorry, cannot edit this hunk\n"
27629
+
#~ msgstr "對不起，不能編輯這個區塊\n"
27630
+
27631
+
#~ msgid ""
27632
+
#~ "status - show paths with changes\n"
27633
+
#~ "update - add working tree state to the staged set of changes\n"
27634
+
#~ "revert - revert staged set of changes back to the HEAD version\n"
27635
+
#~ "patch - pick hunks and update selectively\n"
27636
+
#~ "diff - view diff between HEAD and index\n"
27637
+
#~ "add untracked - add contents of untracked files to the staged set of "
27638
+
#~ "changes\n"
27639
+
#~ msgstr ""
27640
+
#~ "status - 顯示含變更的路徑\n"
27641
+
#~ "update - 新增工作區狀態至暫存列表\n"
27642
+
#~ "revert - 還原修改的暫存集至 HEAD 版本\n"
27643
+
#~ "patch - 挑選區塊並且有選擇地更新\n"
27644
+
#~ "diff - 顯示 HEAD 和索引間差異\n"
27645
+
#~ "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
27646
+
27647
+
#~ msgid "missing --"
27648
+
#~ msgstr "缺少 --"
27649
+
27650
+
#, perl-format
27651
+
#~ msgid "unknown --patch mode: %s"
27652
+
#~ msgstr "未知的 --patch 模式：%s"
27653
+
27654
+
#, perl-format
27655
+
#~ msgid "invalid argument %s, expecting --"
27656
+
#~ msgstr "無效的參數 %s，期望是 --"
27336
27657
27337
27658
#, c-format
27338
27659
#~ msgid "unable to normalize object directory: %s"