@matheusbsbs / matheus-bagliano / commits / c9d5deafe2

l10n: zh_TW: v2.37.0 round 1

Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun Pan committed Jun 23, 2022 at 21:08 UTC c9d5deafe2447e240d995ca1dd904b8b2124c507
1 file changed +19014 -19973
po/zh_TW.po
+19014 -19973
@@ -22,8 +22,8 @@ msgid ""
22 msgstr ""
23 "Project-Id-Version: Git\n"
24 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
25 -"POT-Creation-Date: 2022-04-13 14:52+0800\n"
26 -"PO-Revision-Date: 2022-04-14 08:04+0800\n"
25 +"POT-Creation-Date: 2022-06-23 21:13+0800\n"
26 +"PO-Revision-Date: 2022-06-23 23:02+0800\n"
27 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
28 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
29 "po/git-cli/zh_Hant/>\n"
@@ -32,244 +32,234 @@ msgstr ""
32 "Content-Type: text/plain; charset=UTF-8\n"
33 "Content-Transfer-Encoding: 8bit\n"
34 "Plural-Forms: nplurals=1; plural=0;\n"
35 -"X-Generator: Poedit 3.0.1\n"
35 +"X-Generator: Poedit 3.1\n"
36 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
37 "zhconvert.org\n"
38
39 -#: add-interactive.c:382
39 +#: add-interactive.c
40 #, c-format
41 msgid "Huh (%s)?"
42 msgstr "嗯（%s）？"
43
44 -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
45 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
46 -#: builtin/rebase.c:1671
44 +#: add-interactive.c builtin/rebase.c reset.c sequencer.c
45 msgid "could not read index"
46 msgstr "無法讀取索引"
47
50 -#: add-interactive.c:590 git-add--interactive.perl:269
51 -#: git-add--interactive.perl:294
48 +#: add-interactive.c git-add--interactive.perl
49 msgid "binary"
50 msgstr "二進位"
51
55 -#: add-interactive.c:648 git-add--interactive.perl:278
56 -#: git-add--interactive.perl:332
52 +#: add-interactive.c git-add--interactive.perl
53 msgid "nothing"
54 msgstr "無"
55
60 -#: add-interactive.c:649 git-add--interactive.perl:314
61 -#: git-add--interactive.perl:329
56 +#: add-interactive.c git-add--interactive.perl
57 msgid "unchanged"
58 msgstr "未變更"
59
65 -#: add-interactive.c:686 git-add--interactive.perl:641
60 +#: add-interactive.c git-add--interactive.perl
61 msgid "Update"
62 msgstr "更新"
63
69 -#: add-interactive.c:703 add-interactive.c:891
64 +#: add-interactive.c
65 #, c-format
66 msgid "could not stage '%s'"
67 msgstr "無法暫存「%s」"
68
74 -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
69 +#: add-interactive.c builtin/stash.c reset.c sequencer.c
70 msgid "could not write index"
71 msgstr "無法寫入索引"
72
78 -#: add-interactive.c:712 git-add--interactive.perl:626
73 +#: add-interactive.c git-add--interactive.perl
74 #, c-format, perl-format
75 msgid "updated %d path\n"
76 msgid_plural "updated %d paths\n"
77 msgstr[0] "已更新 %d 個路徑\n"
78
84 -#: add-interactive.c:730 git-add--interactive.perl:676
79 +#: add-interactive.c git-add--interactive.perl
80 #, c-format, perl-format
81 msgid "note: %s is untracked now.\n"
82 msgstr "注意：%s 現已不再追蹤。\n"
83
89 -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
90 -#: builtin/reset.c:167
84 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c
85 #, c-format
86 msgid "make_cache_entry failed for path '%s'"
87 msgstr "「%s」路徑執行 make_cache_entry 失敗"
88
95 -#: add-interactive.c:765 git-add--interactive.perl:653
89 +#: add-interactive.c git-add--interactive.perl
90 msgid "Revert"
91 msgstr "還原"
92
99 -#: add-interactive.c:781
93 +#: add-interactive.c
94 msgid "Could not parse HEAD^{tree}"
95 msgstr "不能解析 HEAD^{樹}"
96
103 -#: add-interactive.c:819 git-add--interactive.perl:629
97 +#: add-interactive.c git-add--interactive.perl
98 #, c-format, perl-format
99 msgid "reverted %d path\n"
100 msgid_plural "reverted %d paths\n"
101 msgstr[0] "還原了 %d 個路徑\n"
102
109 -#: add-interactive.c:870 git-add--interactive.perl:693
103 +#: add-interactive.c git-add--interactive.perl
104 #, c-format
105 msgid "No untracked files.\n"
106 msgstr "沒有未追蹤的檔案。\n"
107
114 -#: add-interactive.c:874 git-add--interactive.perl:687
108 +#: add-interactive.c git-add--interactive.perl
109 msgid "Add untracked"
110 msgstr "新增未追蹤的"
111
118 -#: add-interactive.c:901 git-add--interactive.perl:623
112 +#: add-interactive.c git-add--interactive.perl
113 #, c-format, perl-format
114 msgid "added %d path\n"
115 msgid_plural "added %d paths\n"
116 msgstr[0] "增加了 %d 個路徑\n"
117
124 -#: add-interactive.c:931
118 +#: add-interactive.c
119 #, c-format
120 msgid "ignoring unmerged: %s"
121 msgstr "忽略未合併：%s"
122
129 -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
123 +#: add-interactive.c add-patch.c git-add--interactive.perl
124 #, c-format
125 msgid "Only binary files changed.\n"
126 msgstr "只有二進位檔案被修改。\n"
127
134 -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
128 +#: add-interactive.c add-patch.c git-add--interactive.perl
129 #, c-format
130 msgid "No changes.\n"
131 msgstr "沒有修改。\n"
132
139 -#: add-interactive.c:949 git-add--interactive.perl:1381
133 +#: add-interactive.c git-add--interactive.perl
134 msgid "Patch update"
135 msgstr "修補檔更新"
136
143 -#: add-interactive.c:988 git-add--interactive.perl:1794
137 +#: add-interactive.c git-add--interactive.perl
138 msgid "Review diff"
139 msgstr "檢視 diff"
140
147 -#: add-interactive.c:1016
141 +#: add-interactive.c
142 msgid "show paths with changes"
143 msgstr "顯示有變更的路徑"
144
151 -#: add-interactive.c:1018
145 +#: add-interactive.c
146 msgid "add working tree state to the staged set of changes"
147 msgstr "加入工作區狀態至暫存列表"
148
155 -#: add-interactive.c:1020
149 +#: add-interactive.c
150 msgid "revert staged set of changes back to the HEAD version"
151 msgstr "還原修改的暫存集至 HEAD 版本"
152
159 -#: add-interactive.c:1022
153 +#: add-interactive.c
154 msgid "pick hunks and update selectively"
155 msgstr "挑選區塊並選擇性更新"
156
163 -#: add-interactive.c:1024
157 +#: add-interactive.c
158 msgid "view diff between HEAD and index"
159 msgstr "檢視 HEAD 及索引之間的差異"
160
167 -#: add-interactive.c:1026
161 +#: add-interactive.c
162 msgid "add contents of untracked files to the staged set of changes"
163 msgstr "加入未追蹤檔案的內容至暫存列表"
164
171 -#: add-interactive.c:1034 add-interactive.c:1083
165 +#: add-interactive.c
166 msgid "Prompt help:"
167 msgstr "提示說明："
168
175 -#: add-interactive.c:1036
169 +#: add-interactive.c
170 msgid "select a single item"
171 msgstr "選擇單一項目"
172
179 -#: add-interactive.c:1038
173 +#: add-interactive.c
174 msgid "select a range of items"
175 msgstr "選擇項目範圍"
176
183 -#: add-interactive.c:1040
177 +#: add-interactive.c
178 msgid "select multiple ranges"
179 msgstr "選擇多個範圍"
180
187 -#: add-interactive.c:1042 add-interactive.c:1087
181 +#: add-interactive.c
182 msgid "select item based on unique prefix"
183 msgstr "基於唯一前綴選擇項目"
184
191 -#: add-interactive.c:1044
185 +#: add-interactive.c
186 msgid "unselect specified items"
187 msgstr "取消選擇指定項目"
188
195 -#: add-interactive.c:1046
189 +#: add-interactive.c
190 msgid "choose all items"
191 msgstr "選擇所有項目"
192
199 -#: add-interactive.c:1048
193 +#: add-interactive.c
194 msgid "(empty) finish selecting"
195 msgstr "（空）完成選取"
196
203 -#: add-interactive.c:1085
197 +#: add-interactive.c
198 msgid "select a numbered item"
199 msgstr "選擇編號過的項目"
200
207 -#: add-interactive.c:1089
201 +#: add-interactive.c
202 msgid "(empty) select nothing"
203 msgstr "（空）全不選取"
204
211 -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
205 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
206 msgid "*** Commands ***"
207 msgstr "*** 指令 ***"
208
215 -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
209 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
210 msgid "What now"
211 msgstr "請選擇"
212
219 -#: add-interactive.c:1150 git-add--interactive.perl:213
213 +#: add-interactive.c git-add--interactive.perl
214 msgid "staged"
215 msgstr "快取"
216
223 -#: add-interactive.c:1150 git-add--interactive.perl:213
217 +#: add-interactive.c git-add--interactive.perl
218 msgid "unstaged"
219 msgstr "未快取"
220
227 -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
228 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
229 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
230 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
231 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
232 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
233 -#: git-add--interactive.perl:213
221 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
222 +#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c
223 +#: git-add--interactive.perl
224 msgid "path"
225 msgstr "路徑"
226
237 -#: add-interactive.c:1157
227 +#: add-interactive.c
228 msgid "could not refresh index"
229 msgstr "無法重新整理索引"
230
241 -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
231 +#: add-interactive.c builtin/clean.c git-add--interactive.perl
232 #, c-format
233 msgid "Bye.\n"
234 msgstr "再見。\n"
235
246 -#: add-patch.c:34 git-add--interactive.perl:1433
236 +#: add-patch.c git-add--interactive.perl
237 #, c-format, perl-format
238 msgid "Stage mode change [y,n,q,a,d%s,?]? "
239 msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
240
251 -#: add-patch.c:35 git-add--interactive.perl:1434
241 +#: add-patch.c git-add--interactive.perl
242 #, c-format, perl-format
243 msgid "Stage deletion [y,n,q,a,d%s,?]? "
244 msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "
245
256 -#: add-patch.c:36 git-add--interactive.perl:1435
246 +#: add-patch.c git-add--interactive.perl
247 #, c-format, perl-format
248 msgid "Stage addition [y,n,q,a,d%s,?]? "
249 msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "
250
261 -#: add-patch.c:37 git-add--interactive.perl:1436
251 +#: add-patch.c git-add--interactive.perl
252 #, c-format, perl-format
253 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
254 msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
255
266 -#: add-patch.c:39
256 +#: add-patch.c
257 msgid ""
258 "If the patch applies cleanly, the edited hunk will immediately be marked for "
259 "staging."
260 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
261
272 -#: add-patch.c:42
262 +#: add-patch.c
263 msgid ""
264 "y - stage this hunk\n"
265 "n - do not stage this hunk\n"
@@ -283,33 +273,33 @@ msgstr ""
273 "a - 暫存此區塊和本檔案中後面的全部區塊\n"
274 "d - 不暫存此區塊和本檔案中後面的全部區塊\n"
275
286 -#: add-patch.c:56 git-add--interactive.perl:1439
276 +#: add-patch.c git-add--interactive.perl
277 #, c-format, perl-format
278 msgid "Stash mode change [y,n,q,a,d%s,?]? "
279 msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
280
291 -#: add-patch.c:57 git-add--interactive.perl:1440
281 +#: add-patch.c git-add--interactive.perl
282 #, c-format, perl-format
283 msgid "Stash deletion [y,n,q,a,d%s,?]? "
284 msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "
285
296 -#: add-patch.c:58 git-add--interactive.perl:1441
286 +#: add-patch.c git-add--interactive.perl
287 #, c-format, perl-format
288 msgid "Stash addition [y,n,q,a,d%s,?]? "
289 msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? "
290
301 -#: add-patch.c:59 git-add--interactive.perl:1442
291 +#: add-patch.c git-add--interactive.perl
292 #, c-format, perl-format
293 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
294 msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
295
306 -#: add-patch.c:61
296 +#: add-patch.c
297 msgid ""
298 "If the patch applies cleanly, the edited hunk will immediately be marked for "
299 "stashing."
300 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
301
312 -#: add-patch.c:64
302 +#: add-patch.c
303 msgid ""
304 "y - stash this hunk\n"
305 "n - do not stash this hunk\n"
@@ -323,33 +313,33 @@ msgstr ""
313 "a - 儲藏此區塊和本檔案中後面的全部區塊\n"
314 "d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
315
326 -#: add-patch.c:80 git-add--interactive.perl:1445
316 +#: add-patch.c git-add--interactive.perl
317 #, c-format, perl-format
318 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
319 msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
320
331 -#: add-patch.c:81 git-add--interactive.perl:1446
321 +#: add-patch.c git-add--interactive.perl
322 #, c-format, perl-format
323 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
324 msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "
325
336 -#: add-patch.c:82 git-add--interactive.perl:1447
326 +#: add-patch.c git-add--interactive.perl
327 #, c-format, perl-format
328 msgid "Unstage addition [y,n,q,a,d%s,?]? "
329 msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? "
330
341 -#: add-patch.c:83 git-add--interactive.perl:1448
331 +#: add-patch.c git-add--interactive.perl
332 #, c-format, perl-format
333 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
334 msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
335
346 -#: add-patch.c:85
336 +#: add-patch.c
337 msgid ""
338 "If the patch applies cleanly, the edited hunk will immediately be marked for "
339 "unstaging."
340 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
341
352 -#: add-patch.c:88
342 +#: add-patch.c
343 msgid ""
344 "y - unstage this hunk\n"
345 "n - do not unstage this hunk\n"
@@ -363,33 +353,33 @@ msgstr ""
353 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
354 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
355
366 -#: add-patch.c:103 git-add--interactive.perl:1451
356 +#: add-patch.c git-add--interactive.perl
357 #, c-format, perl-format
358 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
359 msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
360
371 -#: add-patch.c:104 git-add--interactive.perl:1452
361 +#: add-patch.c git-add--interactive.perl
362 #, c-format, perl-format
363 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
364 msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "
365
376 -#: add-patch.c:105 git-add--interactive.perl:1453
366 +#: add-patch.c git-add--interactive.perl
367 #, c-format, perl-format
368 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
369 msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "
370
381 -#: add-patch.c:106 git-add--interactive.perl:1454
371 +#: add-patch.c git-add--interactive.perl
372 #, c-format, perl-format
373 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
374 msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
375
386 -#: add-patch.c:108 add-patch.c:176 add-patch.c:221
376 +#: add-patch.c
377 msgid ""
378 "If the patch applies cleanly, the edited hunk will immediately be marked for "
379 "applying."
380 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
381
392 -#: add-patch.c:111
382 +#: add-patch.c
383 msgid ""
384 "y - apply this hunk to index\n"
385 "n - do not apply this hunk to index\n"
@@ -403,37 +393,33 @@ msgstr ""
393 "a - 套用此區塊和本檔案中後面的全部區塊\n"
394 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
395
406 -#: add-patch.c:126 git-add--interactive.perl:1457
407 -#: git-add--interactive.perl:1475
396 +#: add-patch.c git-add--interactive.perl
397 #, c-format, perl-format
398 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
399 msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
400
412 -#: add-patch.c:127 git-add--interactive.perl:1458
413 -#: git-add--interactive.perl:1476
401 +#: add-patch.c git-add--interactive.perl
402 #, c-format, perl-format
403 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
404 msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "
405
418 -#: add-patch.c:128 git-add--interactive.perl:1459
419 -#: git-add--interactive.perl:1477
406 +#: add-patch.c git-add--interactive.perl
407 #, c-format, perl-format
408 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
409 msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "
410
424 -#: add-patch.c:129 git-add--interactive.perl:1460
425 -#: git-add--interactive.perl:1478
411 +#: add-patch.c git-add--interactive.perl
412 #, c-format, perl-format
413 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
414 msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
415
430 -#: add-patch.c:131 add-patch.c:154 add-patch.c:199
416 +#: add-patch.c
417 msgid ""
418 "If the patch applies cleanly, the edited hunk will immediately be marked for "
419 "discarding."
420 msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
421
436 -#: add-patch.c:134 add-patch.c:202
422 +#: add-patch.c
423 msgid ""
424 "y - discard this hunk from worktree\n"
425 "n - do not discard this hunk from worktree\n"
@@ -447,27 +433,27 @@ msgstr ""
433 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
434 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
435
450 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
436 +#: add-patch.c git-add--interactive.perl
437 #, c-format, perl-format
438 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
439 msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
440
455 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
441 +#: add-patch.c git-add--interactive.perl
442 #, c-format, perl-format
443 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
444 msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
445
460 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
446 +#: add-patch.c git-add--interactive.perl
447 #, c-format, perl-format
448 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
449 msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
450
465 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
451 +#: add-patch.c git-add--interactive.perl
452 #, c-format, perl-format
453 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
454 msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
455
470 -#: add-patch.c:157
456 +#: add-patch.c
457 msgid ""
458 "y - discard this hunk from index and worktree\n"
459 "n - do not discard this hunk from index and worktree\n"
@@ -481,27 +467,27 @@ msgstr ""
467 "a - 捨棄此區塊和本檔案中後面的全部區塊\n"
468 "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
469
484 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
470 +#: add-patch.c git-add--interactive.perl
471 #, c-format, perl-format
472 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
473 msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
474
489 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
475 +#: add-patch.c git-add--interactive.perl
476 #, c-format, perl-format
477 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
478 msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
479
494 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
480 +#: add-patch.c git-add--interactive.perl
481 #, c-format, perl-format
482 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
483 msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? "
484
499 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
485 +#: add-patch.c git-add--interactive.perl
486 #, c-format, perl-format
487 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
488 msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
489
504 -#: add-patch.c:179
490 +#: add-patch.c
491 msgid ""
492 "y - apply this hunk to index and worktree\n"
493 "n - do not apply this hunk to index and worktree\n"
@@ -515,7 +501,7 @@ msgstr ""
501 "a - 套用此區塊和本檔案中後面的全部區塊\n"
502 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
503
518 -#: add-patch.c:224
504 +#: add-patch.c
505 msgid ""
506 "y - apply this hunk to worktree\n"
507 "n - do not apply this hunk to worktree\n"
@@ -529,34 +515,34 @@ msgstr ""
515 "a - 套用此區塊和本檔案中後面的全部區塊\n"
516 "d - 不要套用此區塊和本檔案中後面的全部區塊\n"
517
532 -#: add-patch.c:343
518 +#: add-patch.c
519 #, c-format
520 msgid "could not parse hunk header '%.*s'"
521 msgstr "無法解析區塊標頭 '%.*s'"
522
537 -#: add-patch.c:362 add-patch.c:366
523 +#: add-patch.c
524 #, c-format
525 msgid "could not parse colored hunk header '%.*s'"
526 msgstr "無法解析上色過的區塊標頭 '%.*s'"
527
542 -#: add-patch.c:431
528 +#: add-patch.c
529 msgid "could not parse diff"
530 msgstr "無法解析差異 (diff)"
531
546 -#: add-patch.c:450
532 +#: add-patch.c
533 msgid "could not parse colored diff"
534 msgstr "無法解析上色過的差異 (diff)"
535
550 -#: add-patch.c:464
536 +#: add-patch.c
537 #, c-format
538 msgid "failed to run '%s'"
539 msgstr "無法執行 '%s'"
540
555 -#: add-patch.c:618
541 +#: add-patch.c
542 msgid "mismatched output from interactive.diffFilter"
543 msgstr "interactive.diffFilter 的輸出不符"
544
559 -#: add-patch.c:619
545 +#: add-patch.c
546 msgid ""
547 "Your filter must maintain a one-to-one correspondence\n"
548 "between its input and output lines."
@@ -564,7 +550,7 @@ msgstr ""
550 "您的過濾器必須在其輸入及輸出行\n"
551 "維持一對一的對應關係。"
552
567 -#: add-patch.c:797
553 +#: add-patch.c
554 #, c-format
555 msgid ""
556 "expected context line #%d in\n"
@@ -573,7 +559,7 @@ msgstr ""
559 "應有上下文行 #%d 於\n"
560 "%.*s"
561
576 -#: add-patch.c:812
562 +#: add-patch.c
563 #, c-format
564 msgid ""
565 "hunks do not overlap:\n"
@@ -586,11 +572,11 @@ msgstr ""
572 "\t不以下述結尾：\n"
573 "%.*s"
574
589 -#: add-patch.c:1088 git-add--interactive.perl:1115
575 +#: add-patch.c git-add--interactive.perl
576 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
577 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
578
593 -#: add-patch.c:1092
579 +#: add-patch.c
580 #, c-format
581 msgid ""
582 "---\n"
@@ -604,7 +590,7 @@ msgstr ""
590 "以 %c 開始的行將被刪除。\n"
591
592 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
607 -#: add-patch.c:1106 git-add--interactive.perl:1129
593 +#: add-patch.c git-add--interactive.perl
594 msgid ""
595 "If it does not apply cleanly, you will be given an opportunity to\n"
596 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -614,11 +600,11 @@ msgstr ""
600 "若刪掉此區塊的全部內容，則會中止\n"
601 "本次編輯，區塊則不會被修改。\n"
602
617 -#: add-patch.c:1139
603 +#: add-patch.c
604 msgid "could not parse hunk header"
605 msgstr "無法解析區塊標頭"
606
621 -#: add-patch.c:1184
607 +#: add-patch.c
608 msgid "'git apply --cached' failed"
609 msgstr "「git apply --cached」失敗"
610
@@ -634,24 +620,24 @@ msgstr "「git apply --cached」失敗"
620 #. Consider translating (saying "no" discards!) as
621 #. (saying "n" for "no" discards!) if the translation
622 #. of the word "no" does not start with n.
637 -#: add-patch.c:1253 git-add--interactive.perl:1244
623 +#: add-patch.c git-add--interactive.perl
624 msgid ""
625 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
626 msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
627
642 -#: add-patch.c:1296
628 +#: add-patch.c
629 msgid "The selected hunks do not apply to the index!"
630 msgstr "選取的區塊不會套用進索引！"
631
646 -#: add-patch.c:1297 git-add--interactive.perl:1348
632 +#: add-patch.c git-add--interactive.perl
633 msgid "Apply them to the worktree anyway? "
634 msgstr "無論如何都要套用到工作區嗎？ "
635
650 -#: add-patch.c:1304 git-add--interactive.perl:1351
636 +#: add-patch.c git-add--interactive.perl
637 msgid "Nothing was applied.\n"
638 msgstr "未套用。\n"
639
654 -#: add-patch.c:1361
640 +#: add-patch.c
641 msgid ""
642 "j - leave this hunk undecided, see next undecided hunk\n"
643 "J - leave this hunk undecided, see next hunk\n"
@@ -673,72 +659,72 @@ msgstr ""
659 "e - 手動編輯目前區塊\n"
660 "? - 顯示說明\n"
661
676 -#: add-patch.c:1523 add-patch.c:1533
662 +#: add-patch.c
663 msgid "No previous hunk"
664 msgstr "沒有上一個區塊"
665
680 -#: add-patch.c:1528 add-patch.c:1538
666 +#: add-patch.c
667 msgid "No next hunk"
668 msgstr "沒有下一個區塊"
669
684 -#: add-patch.c:1544
670 +#: add-patch.c
671 msgid "No other hunks to goto"
672 msgstr "沒有其它可供跳轉的區塊"
673
688 -#: add-patch.c:1555 git-add--interactive.perl:1608
674 +#: add-patch.c git-add--interactive.perl
675 msgid "go to which hunk (<ret> to see more)? "
676 msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
677
692 -#: add-patch.c:1556 git-add--interactive.perl:1610
678 +#: add-patch.c git-add--interactive.perl
679 msgid "go to which hunk? "
680 msgstr "跳轉到哪個區塊？ "
681
696 -#: add-patch.c:1567
682 +#: add-patch.c
683 #, c-format
684 msgid "Invalid number: '%s'"
685 msgstr "無效數字：'%s'"
686
701 -#: add-patch.c:1572
687 +#: add-patch.c
688 #, c-format
689 msgid "Sorry, only %d hunk available."
690 msgid_plural "Sorry, only %d hunks available."
691 msgstr[0] "對不起，只有 %d 個可用區塊。"
692
707 -#: add-patch.c:1581
693 +#: add-patch.c
694 msgid "No other hunks to search"
695 msgstr "沒有其它可供尋找的區塊"
696
711 -#: add-patch.c:1587 git-add--interactive.perl:1663
697 +#: add-patch.c git-add--interactive.perl
698 msgid "search for regex? "
699 msgstr "使用常規表示式搜尋？ "
700
715 -#: add-patch.c:1602
701 +#: add-patch.c
702 #, c-format
703 msgid "Malformed search regexp %s: %s"
704 msgstr "錯誤的常規表示式 %s：%s"
705
720 -#: add-patch.c:1619
706 +#: add-patch.c
707 msgid "No hunk matches the given pattern"
708 msgstr "沒有和提供模式相符合的區塊"
709
724 -#: add-patch.c:1626
710 +#: add-patch.c
711 msgid "Sorry, cannot split this hunk"
712 msgstr "對不起，不能分割這個區塊"
713
728 -#: add-patch.c:1630
714 +#: add-patch.c
715 #, c-format
716 msgid "Split into %d hunks."
717 msgstr "分割為 %d 個區塊。"
718
733 -#: add-patch.c:1634
719 +#: add-patch.c
720 msgid "Sorry, cannot edit this hunk"
721 msgstr "對不起，不能編輯這個區塊"
722
737 -#: add-patch.c:1686
723 +#: add-patch.c
724 msgid "'git apply' failed"
725 msgstr "'git apply' 失敗"
726
741 -#: advice.c:81
727 +#: advice.c
728 #, c-format
729 msgid ""
730 "\n"
@@ -747,37 +733,37 @@ msgstr ""
733 "\n"
734 "請使用「git config advice.%s false」來停用此訊息"
735
750 -#: advice.c:97
736 +#: advice.c
737 #, c-format
738 msgid "%shint: %.*s%s\n"
739 msgstr "%s提示：%.*s%s\n"
740
755 -#: advice.c:181
741 +#: advice.c
742 msgid "Cherry-picking is not possible because you have unmerged files."
743 msgstr "無法揀選，因為您有未合併的檔案。"
744
759 -#: advice.c:183
745 +#: advice.c
746 msgid "Committing is not possible because you have unmerged files."
747 msgstr "無法提交，因為您有未合併的檔案。"
748
763 -#: advice.c:185
749 +#: advice.c
750 msgid "Merging is not possible because you have unmerged files."
751 msgstr "無法合併，因為您有未合併的檔案。"
752
767 -#: advice.c:187
753 +#: advice.c
754 msgid "Pulling is not possible because you have unmerged files."
755 msgstr "無法拉取，因為您有未合併的檔案。"
756
771 -#: advice.c:189
757 +#: advice.c
758 msgid "Reverting is not possible because you have unmerged files."
759 msgstr "無法還原提交，因為您有未合併的檔案。"
760
775 -#: advice.c:191
761 +#: advice.c
762 #, c-format
763 msgid "It is not possible to %s because you have unmerged files."
764 msgstr "無法 %s，因為您有未合併的檔案。"
765
780 -#: advice.c:199
766 +#: advice.c
767 msgid ""
768 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
769 "as appropriate to mark resolution and make a commit."
@@ -785,27 +771,27 @@ msgstr ""
771 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
772 "解決方案並提交。"
773
788 -#: advice.c:207
774 +#: advice.c
775 msgid "Exiting because of an unresolved conflict."
776 msgstr "因為存在未解決的衝突而離開。"
777
792 -#: advice.c:212 builtin/merge.c:1388
778 +#: advice.c builtin/merge.c
779 msgid "You have not concluded your merge (MERGE_HEAD exists)."
780 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
781
796 -#: advice.c:214
782 +#: advice.c
783 msgid "Please, commit your changes before merging."
784 msgstr "請在合併前先提交您的修改。"
785
800 -#: advice.c:215
786 +#: advice.c
787 msgid "Exiting because of unfinished merge."
788 msgstr "因為存在未完成的合併而離開。"
789
804 -#: advice.c:220
790 +#: advice.c
791 msgid "Not possible to fast-forward, aborting."
792 msgstr "無法快轉，終止。"
793
808 -#: advice.c:230
794 +#: advice.c
795 #, c-format
796 msgid ""
797 "The following paths and/or pathspecs matched paths that exist\n"
@@ -816,7 +802,7 @@ msgstr ""
802 "符合稀疏簽出定義外且存在的路徑，\n"
803 "所以不會在索引中更新：\n"
804
819 -#: advice.c:237
805 +#: advice.c
806 msgid ""
807 "If you intend to update such entries, try one of the following:\n"
808 "* Use the --sparse option.\n"
@@ -826,7 +812,7 @@ msgstr ""
812 "* 使用 --sparse 選項。\n"
813 "* 停用或修改稀疏規則。"
814
829 -#: advice.c:245
815 +#: advice.c
816 #, c-format
817 msgid ""
818 "Note: switching to '%s'.\n"
@@ -866,101 +852,87 @@ msgstr ""
852 "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"
853 "\n"
854
869 -#: alias.c:50
855 +#: alias.c
856 msgid "cmdline ends with \\"
857 msgstr "指令列以 \\ 結尾"
858
873 -#: alias.c:51
859 +#: alias.c
860 msgid "unclosed quote"
861 msgstr "未閉合的引號"
862
877 -#: apply.c:70
863 +#: apply.c
864 #, c-format
865 msgid "unrecognized whitespace option '%s'"
866 msgstr "無法識別的空白字元選項 '%s'"
867
882 -#: apply.c:86
868 +#: apply.c
869 #, c-format
870 msgid "unrecognized whitespace ignore option '%s'"
871 msgstr "無法識別的空白字元忽略選項 '%s'"
872
887 -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
888 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
889 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
890 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
891 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
892 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
893 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
894 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
895 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
896 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
897 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
898 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
899 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
900 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
901 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
902 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
903 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
904 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
905 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
906 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
907 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
908 -#: builtin/worktree.c:779
873 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
874 +#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
875 +#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
876 +#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
877 +#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
878 +#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
879 +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
880 +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
881 #, c-format
882 msgid "options '%s' and '%s' cannot be used together"
883 msgstr "不能同時使用 '%s' 和 '%s' 選項"
884
913 -#: apply.c:141 apply.c:152 apply.c:155
885 +#: apply.c
886 #, c-format
887 msgid "'%s' outside a repository"
888 msgstr "'%s' 在版本庫之外"
889
918 -#: apply.c:807
890 +#: apply.c
891 #, c-format
892 msgid "Cannot prepare timestamp regexp %s"
893 msgstr "無法準備時間戳常規表示式 %s"
894
923 -#: apply.c:816
895 +#: apply.c
896 #, c-format
897 msgid "regexec returned %d for input: %s"
898 msgstr "regexec 返回 %d，輸入為：%s"
899
928 -#: apply.c:890
900 +#: apply.c
901 #, c-format
902 msgid "unable to find filename in patch at line %d"
903 msgstr "不能在修補檔的第 %d 行找到檔案名"
904
933 -#: apply.c:928
905 +#: apply.c
906 #, c-format
907 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
908 msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
909
938 -#: apply.c:934
910 +#: apply.c
911 #, c-format
912 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
913 msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"
914
943 -#: apply.c:935
915 +#: apply.c
916 #, c-format
917 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
918 msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
919
948 -#: apply.c:940
920 +#: apply.c
921 #, c-format
922 msgid "git apply: bad git-diff - expected /dev/null on line %d"
923 msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
924
953 -#: apply.c:969
925 +#: apply.c
926 #, c-format
927 msgid "invalid mode on line %d: %s"
928 msgstr "第 %d 行包含無效檔案模式：%s"
929
958 -#: apply.c:1288
930 +#: apply.c
931 #, c-format
932 msgid "inconsistent header lines %d and %d"
933 msgstr "不一致的檔案頭，%d 行和 %d 行"
934
963 -#: apply.c:1378
935 +#: apply.c
936 #, c-format
937 msgid ""
938 "git diff header lacks filename information when removing %d leading pathname "
@@ -970,91 +942,91 @@ msgid_plural ""
942 "components (line %d)"
943 msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
944
973 -#: apply.c:1391
945 +#: apply.c
946 #, c-format
947 msgid "git diff header lacks filename information (line %d)"
948 msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"
949
978 -#: apply.c:1487
950 +#: apply.c
951 #, c-format
952 msgid "recount: unexpected line: %.*s"
953 msgstr "recount：意外的行：%.*s"
954
983 -#: apply.c:1556
955 +#: apply.c
956 #, c-format
957 msgid "patch fragment without header at line %d: %.*s"
958 msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
959
988 -#: apply.c:1759
960 +#: apply.c
961 msgid "new file depends on old contents"
962 msgstr "新檔案依賴舊內容"
963
992 -#: apply.c:1761
964 +#: apply.c
965 msgid "deleted file still has contents"
966 msgstr "刪除的檔案仍有內容"
967
996 -#: apply.c:1795
968 +#: apply.c
969 #, c-format
970 msgid "corrupt patch at line %d"
971 msgstr "修補檔在第 %d 行發現損壞"
972
1001 -#: apply.c:1832
973 +#: apply.c
974 #, c-format
975 msgid "new file %s depends on old contents"
976 msgstr "新檔案 %s 依賴舊內容"
977
1006 -#: apply.c:1834
978 +#: apply.c
979 #, c-format
980 msgid "deleted file %s still has contents"
981 msgstr "刪除的檔案 %s 仍有內容"
982
1011 -#: apply.c:1837
983 +#: apply.c
984 #, c-format
985 msgid "** warning: file %s becomes empty but is not deleted"
986 msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
987
1016 -#: apply.c:1985
988 +#: apply.c
989 #, c-format
990 msgid "corrupt binary patch at line %d: %.*s"
991 msgstr "二進位修補檔在第 %d 行損壞：%.*s"
992
1021 -#: apply.c:2022
993 +#: apply.c
994 #, c-format
995 msgid "unrecognized binary patch at line %d"
996 msgstr "無法識別的二進位修補檔位於第 %d 行"
997
1026 -#: apply.c:2184
998 +#: apply.c
999 #, c-format
1000 msgid "patch with only garbage at line %d"
1001 msgstr "修補檔案的第 %d 行只有垃圾資料"
1002
1031 -#: apply.c:2270
1003 +#: apply.c
1004 #, c-format
1005 msgid "unable to read symlink %s"
1006 msgstr "無法讀取符號連結 %s"
1007
1036 -#: apply.c:2274
1008 +#: apply.c
1009 #, c-format
1010 msgid "unable to open or read %s"
1011 msgstr "不能開啟或讀取 %s"
1012
1041 -#: apply.c:2943
1013 +#: apply.c
1014 #, c-format
1015 msgid "invalid start of line: '%c'"
1016 msgstr "無效的行首字元：'%c'"
1017
1046 -#: apply.c:3064
1018 +#: apply.c
1019 #, c-format
1020 msgid "Hunk #%d succeeded at %d (offset %d line)."
1021 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1022 msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
1023
1052 -#: apply.c:3076
1024 +#: apply.c
1025 #, c-format
1026 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1027 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
1028
1057 -#: apply.c:3082
1029 +#: apply.c
1030 #, c-format
1031 msgid ""
1032 "while searching for:\n"
@@ -1063,641 +1035,646 @@ msgstr ""
1035 "當查詢：\n"
1036 "%.*s"
1037
1066 -#: apply.c:3104
1038 +#: apply.c
1039 #, c-format
1040 msgid "missing binary patch data for '%s'"
1041 msgstr "缺少 '%s' 的二進位修補檔資料"
1042
1071 -#: apply.c:3112
1043 +#: apply.c
1044 #, c-format
1045 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1046 msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
1047
1076 -#: apply.c:3159
1048 +#: apply.c
1049 #, c-format
1050 msgid "cannot apply binary patch to '%s' without full index line"
1051 msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
1052
1081 -#: apply.c:3170
1053 +#: apply.c
1054 #, c-format
1055 msgid ""
1056 "the patch applies to '%s' (%s), which does not match the current contents."
1057 msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
1058
1087 -#: apply.c:3178
1059 +#: apply.c
1060 #, c-format
1061 msgid "the patch applies to an empty '%s' but it is not empty"
1062 msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
1063
1092 -#: apply.c:3196
1064 +#: apply.c
1065 #, c-format
1066 msgid "the necessary postimage %s for '%s' cannot be read"
1067 msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
1068
1097 -#: apply.c:3209
1069 +#: apply.c
1070 #, c-format
1071 msgid "binary patch does not apply to '%s'"
1072 msgstr "二進位修補檔未套用到 '%s'"
1073
1102 -#: apply.c:3216
1074 +#: apply.c
1075 #, c-format
1076 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1077 msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
1078
1107 -#: apply.c:3237
1079 +#: apply.c
1080 #, c-format
1081 msgid "patch failed: %s:%ld"
1082 msgstr "打修補檔失敗：%s:%ld"
1083
1112 -#: apply.c:3360
1084 +#: apply.c
1085 #, c-format
1086 msgid "cannot checkout %s"
1087 msgstr "不能簽出 %s"
1088
1117 -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1118 -#: setup.c:310
1089 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c
1090 #, c-format
1091 msgid "failed to read %s"
1092 msgstr "無法讀取 %s"
1093
1123 -#: apply.c:3420
1094 +#: apply.c
1095 #, c-format
1096 msgid "reading from '%s' beyond a symbolic link"
1097 msgstr "讀取位於符號連結中的 '%s'"
1098
1128 -#: apply.c:3449 apply.c:3721
1099 +#: apply.c
1100 #, c-format
1101 msgid "path %s has been renamed/deleted"
1102 msgstr "路徑 %s 已經被重新命名/刪除"
1103
1133 -#: apply.c:3559 apply.c:3736
1104 +#: apply.c
1105 #, c-format
1106 msgid "%s: does not exist in index"
1107 msgstr "%s：不存在於索引中"
1108
1138 -#: apply.c:3568 apply.c:3744 apply.c:3960
1109 +#: apply.c
1110 #, c-format
1111 msgid "%s: does not match index"
1112 msgstr "%s：和索引不符合"
1113
1143 -#: apply.c:3605
1114 +#: apply.c
1115 msgid "repository lacks the necessary blob to perform 3-way merge."
1116 msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
1117
1147 -#: apply.c:3608
1118 +#: apply.c
1119 #, c-format
1120 msgid "Performing three-way merge...\n"
1121 msgstr "正在進行三方合併⋯⋯\n"
1122
1152 -#: apply.c:3624 apply.c:3628
1123 +#: apply.c
1124 #, c-format
1125 msgid "cannot read the current contents of '%s'"
1126 msgstr "無法讀取 '%s' 的目前內容"
1127
1157 -#: apply.c:3640
1128 +#: apply.c
1129 #, c-format
1130 msgid "Failed to perform three-way merge...\n"
1131 msgstr "無法進行三方合併⋯⋯\n"
1132
1162 -#: apply.c:3654
1133 +#: apply.c
1134 #, c-format
1135 msgid "Applied patch to '%s' with conflicts.\n"
1136 msgstr "套用修補檔到 '%s' 存在衝突。\n"
1137
1167 -#: apply.c:3659
1138 +#: apply.c
1139 #, c-format
1140 msgid "Applied patch to '%s' cleanly.\n"
1141 msgstr "成功套用修補檔到 '%s'。\n"
1142
1172 -#: apply.c:3676
1143 +#: apply.c
1144 #, c-format
1145 msgid "Falling back to direct application...\n"
1146 msgstr "回復至直接套用模式⋯⋯\n"
1147
1177 -#: apply.c:3688
1148 +#: apply.c
1149 msgid "removal patch leaves file contents"
1150 msgstr "移除修補檔仍留下了檔案內容"
1151
1181 -#: apply.c:3761
1152 +#: apply.c
1153 #, c-format
1154 msgid "%s: wrong type"
1155 msgstr "%s：錯誤類型"
1156
1186 -#: apply.c:3763
1157 +#: apply.c
1158 #, c-format
1159 msgid "%s has type %o, expected %o"
1160 msgstr "%s 的類型是 %o，應為 %o"
1161
1191 -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1192 -#: read-cache.c:1399
1162 +#: apply.c read-cache.c
1163 #, c-format
1164 msgid "invalid path '%s'"
1165 msgstr "無效路徑 '%s'"
1166
1197 -#: apply.c:3958
1167 +#: apply.c
1168 #, c-format
1169 msgid "%s: already exists in index"
1170 msgstr "%s：已經存在於索引中"
1171
1202 -#: apply.c:3962
1172 +#: apply.c
1173 #, c-format
1174 msgid "%s: already exists in working directory"
1175 msgstr "%s：已經存在於工作區中"
1176
1207 -#: apply.c:3982
1177 +#: apply.c
1178 #, c-format
1179 msgid "new mode (%o) of %s does not match old mode (%o)"
1180 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
1181
1212 -#: apply.c:3987
1182 +#: apply.c
1183 #, c-format
1184 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1185 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
1186
1217 -#: apply.c:4007
1187 +#: apply.c
1188 #, c-format
1189 msgid "affected file '%s' is beyond a symbolic link"
1190 msgstr "受影響的檔案 '%s' 位於符號連結中"
1191
1222 -#: apply.c:4011
1192 +#: apply.c
1193 #, c-format
1194 msgid "%s: patch does not apply"
1195 msgstr "%s：修補檔未套用"
1196
1227 -#: apply.c:4026
1197 +#: apply.c
1198 #, c-format
1199 msgid "Checking patch %s..."
1200 msgstr "正在檢查修補檔 %s..."
1201
1232 -#: apply.c:4118
1202 +#: apply.c
1203 #, c-format
1204 msgid "sha1 information is lacking or useless for submodule %s"
1205 msgstr "子模組 %s 的 sha1 訊息缺少或無效"
1206
1237 -#: apply.c:4125
1207 +#: apply.c
1208 #, c-format
1209 msgid "mode change for %s, which is not in current HEAD"
1210 msgstr "%s 的模式變更，但它不在目前 HEAD 中"
1211
1242 -#: apply.c:4128
1212 +#: apply.c
1213 #, c-format
1214 msgid "sha1 information is lacking or useless (%s)."
1215 msgstr "sha1 訊息缺少或無效（%s）。"
1216
1247 -#: apply.c:4137
1217 +#: apply.c
1218 #, c-format
1219 msgid "could not add %s to temporary index"
1220 msgstr "不能在暫時索引中新增 %s"
1221
1252 -#: apply.c:4147
1222 +#: apply.c
1223 #, c-format
1224 msgid "could not write temporary index to %s"
1225 msgstr "不能把暫時索引寫入到 %s"
1226
1257 -#: apply.c:4285
1227 +#: apply.c
1228 #, c-format
1229 msgid "unable to remove %s from index"
1230 msgstr "不能從索引中移除 %s"
1231
1262 -#: apply.c:4319
1232 +#: apply.c
1233 #, c-format
1234 msgid "corrupt patch for submodule %s"
1235 msgstr "子模組 %s 損壞的修補檔"
1236
1267 -#: apply.c:4325
1237 +#: apply.c
1238 #, c-format
1239 msgid "unable to stat newly created file '%s'"
1240 msgstr "不能對建立檔案 '%s' 呼叫 stat"
1241
1272 -#: apply.c:4333
1242 +#: apply.c
1243 #, c-format
1244 msgid "unable to create backing store for newly created file %s"
1245 msgstr "不能為建立檔案 %s 建立後端儲存"
1246
1277 -#: apply.c:4339 apply.c:4484
1247 +#: apply.c
1248 #, c-format
1249 msgid "unable to add cache entry for %s"
1250 msgstr "無法為 %s 新增快取條目"
1251
1282 -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1283 -#: builtin/gc.c:2293
1252 +#: apply.c builtin/bisect--helper.c builtin/gc.c
1253 #, c-format
1254 msgid "failed to write to '%s'"
1255 msgstr "寫入 '%s' 失敗"
1256
1288 -#: apply.c:4386
1257 +#: apply.c
1258 #, c-format
1259 msgid "closing file '%s'"
1260 msgstr "關閉檔案 '%s'"
1261
1293 -#: apply.c:4456
1262 +#: apply.c
1263 #, c-format
1264 msgid "unable to write file '%s' mode %o"
1265 msgstr "不能寫入檔案 '%s' 權限 %o"
1266
1298 -#: apply.c:4554
1267 +#: apply.c
1268 #, c-format
1269 msgid "Applied patch %s cleanly."
1270 msgstr "成功套用修補檔 %s。"
1271
1303 -#: apply.c:4562
1272 +#: apply.c
1273 msgid "internal error"
1274 msgstr "內部錯誤"
1275
1307 -#: apply.c:4565
1276 +#: apply.c
1277 #, c-format
1278 msgid "Applying patch %%s with %d reject..."
1279 msgid_plural "Applying patch %%s with %d rejects..."
1280 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
1281
1313 -#: apply.c:4576
1282 +#: apply.c
1283 #, c-format
1284 msgid "truncating .rej filename to %.*s.rej"
1285 msgstr "截短 .rej 檔案名為 %.*s.rej"
1286
1318 -#: apply.c:4584
1287 +#: apply.c
1288 #, c-format
1289 msgid "cannot open %s"
1290 msgstr "不能開啟 %s"
1291
1323 -#: apply.c:4598
1292 +#: apply.c
1293 #, c-format
1294 msgid "Hunk #%d applied cleanly."
1295 msgstr "成功套用第 #%d 個區塊。"
1296
1328 -#: apply.c:4602
1297 +#: apply.c
1298 #, c-format
1299 msgid "Rejected hunk #%d."
1300 msgstr "拒絕第 #%d 個區塊。"
1301
1333 -#: apply.c:4731
1302 +#: apply.c
1303 #, c-format
1304 msgid "Skipped patch '%s'."
1305 msgstr "略過修補檔 '%s'。"
1306
1338 -#: apply.c:4740
1307 +#: apply.c
1308 msgid "No valid patches in input (allow with \"--allow-empty\")"
1309 msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）"
1310
1342 -#: apply.c:4761
1311 +#: apply.c
1312 msgid "unable to read index file"
1313 msgstr "無法讀取索引檔案"
1314
1346 -#: apply.c:4918
1315 +#: apply.c
1316 #, c-format
1317 msgid "can't open patch '%s': %s"
1318 msgstr "不能開啟修補檔 '%s'：%s"
1319
1351 -#: apply.c:4945
1320 +#: apply.c
1321 #, c-format
1322 msgid "squelched %d whitespace error"
1323 msgid_plural "squelched %d whitespace errors"
1324 msgstr[0] "抑制下仍有 %d 個空白字元誤用"
1325
1357 -#: apply.c:4951 apply.c:4966
1326 +#: apply.c
1327 #, c-format
1328 msgid "%d line adds whitespace errors."
1329 msgid_plural "%d lines add whitespace errors."
1330 msgstr[0] "%d 行新增了空白字元誤用。"
1331
1363 -#: apply.c:4959
1332 +#: apply.c
1333 #, c-format
1334 msgid "%d line applied after fixing whitespace errors."
1335 msgid_plural "%d lines applied after fixing whitespace errors."
1336 msgstr[0] "修復空白錯誤後，套用了 %d 行。"
1337
1369 -#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1338 +#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
1339 msgid "Unable to write new index file"
1340 msgstr "無法寫入新索引檔案"
1341
1373 -#: apply.c:5003
1342 +#: apply.c
1343 msgid "don't apply changes matching the given path"
1344 msgstr "不要套用符合提供路徑的變更"
1345
1377 -#: apply.c:5006
1346 +#: apply.c
1347 msgid "apply changes matching the given path"
1348 msgstr "套用符合提供路徑的變更"
1349
1381 -#: apply.c:5008 builtin/am.c:2379
1350 +#: apply.c builtin/am.c
1351 msgid "num"
1352 msgstr "數字"
1353
1385 -#: apply.c:5009
1354 +#: apply.c
1355 msgid "remove <num> leading slashes from traditional diff paths"
1356 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
1357
1389 -#: apply.c:5012
1358 +#: apply.c
1359 msgid "ignore additions made by the patch"
1360 msgstr "忽略修補檔中的新增的檔案"
1361
1393 -#: apply.c:5014
1362 +#: apply.c
1363 msgid "instead of applying the patch, output diffstat for the input"
1364 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
1365
1397 -#: apply.c:5018
1366 +#: apply.c
1367 msgid "show number of added and deleted lines in decimal notation"
1368 msgstr "以十進位數顯示新增和刪除的行數"
1369
1401 -#: apply.c:5020
1370 +#: apply.c
1371 msgid "instead of applying the patch, output a summary for the input"
1372 msgstr "不套用修補檔，而是顯示輸入的概要"
1373
1405 -#: apply.c:5022
1374 +#: apply.c
1375 msgid "instead of applying the patch, see if the patch is applicable"
1376 msgstr "不套用修補檔，而是檢視修補檔是否可套用"
1377
1409 -#: apply.c:5024
1378 +#: apply.c
1379 msgid "make sure the patch is applicable to the current index"
1380 msgstr "確認修補檔可以套用到目前索引"
1381
1413 -#: apply.c:5026
1382 +#: apply.c
1383 msgid "mark new files with `git add --intent-to-add`"
1384 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
1385
1417 -#: apply.c:5028
1386 +#: apply.c
1387 msgid "apply a patch without touching the working tree"
1388 msgstr "套用修補檔而不修改工作區"
1389
1421 -#: apply.c:5030
1390 +#: apply.c
1391 msgid "accept a patch that touches outside the working area"
1392 msgstr "接受修改工作區之外檔案的修補檔"
1393
1425 -#: apply.c:5033
1394 +#: apply.c
1395 msgid "also apply the patch (use with --stat/--summary/--check)"
1396 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
1397
1429 -#: apply.c:5035
1398 +#: apply.c
1399 msgid "attempt three-way merge, fall back on normal patch if that fails"
1400 msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
1401
1433 -#: apply.c:5037
1402 +#: apply.c
1403 msgid "build a temporary index based on embedded index information"
1404 msgstr "建立一個暫時索引基於嵌入的索引訊息"
1405
1437 -#: apply.c:5040 builtin/checkout-index.c:230
1406 +#: apply.c builtin/checkout-index.c
1407 msgid "paths are separated with NUL character"
1408 msgstr "路徑以 NUL 字元分隔"
1409
1441 -#: apply.c:5042
1410 +#: apply.c
1411 msgid "ensure at least <n> lines of context match"
1412 msgstr "確保至少符合 <n> 行上下文"
1413
1445 -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1446 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1447 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1448 -#: builtin/rebase.c:1079
1414 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c
1415 +#: builtin/rebase.c
1416 msgid "action"
1417 msgstr "動作"
1418
1452 -#: apply.c:5044
1419 +#: apply.c
1420 msgid "detect new or modified lines that have whitespace errors"
1421 msgstr "檢查新增和修改的行中間的空白字元濫用"
1422
1456 -#: apply.c:5047 apply.c:5050
1423 +#: apply.c
1424 msgid "ignore changes in whitespace when finding context"
1425 msgstr "尋找上下文時忽略空白字元的變更"
1426
1460 -#: apply.c:5053
1427 +#: apply.c
1428 msgid "apply the patch in reverse"
1429 msgstr "反向套用修補檔"
1430
1464 -#: apply.c:5055
1431 +#: apply.c
1432 msgid "don't expect at least one line of context"
1433 msgstr "無需至少一行上下文"
1434
1468 -#: apply.c:5057
1435 +#: apply.c
1436 msgid "leave the rejected hunks in corresponding *.rej files"
1437 msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
1438
1472 -#: apply.c:5059
1439 +#: apply.c
1440 msgid "allow overlapping hunks"
1441 msgstr "允許重疊的修補檔區塊"
1442
1476 -#: apply.c:5062
1443 +#: apply.c
1444 msgid "tolerate incorrectly detected missing new-line at the end of file"
1445 msgstr "允許不正確的檔案末尾換行符號"
1446
1480 -#: apply.c:5065
1447 +#: apply.c
1448 msgid "do not trust the line counts in the hunk headers"
1449 msgstr "不信任修補檔區塊的標頭訊息中的行號"
1450
1484 -#: apply.c:5067 builtin/am.c:2367
1451 +#: apply.c builtin/am.c
1452 msgid "root"
1453 msgstr "根目錄"
1454
1488 -#: apply.c:5068
1455 +#: apply.c
1456 msgid "prepend <root> to all filenames"
1457 msgstr "為所有檔案名前新增 <根目錄>"
1458
1492 -#: apply.c:5071
1459 +#: apply.c
1460 msgid "don't return error for empty patches"
1461 msgstr "遇到空白修補檔時不回傳錯誤"
1462
1496 -#: archive-tar.c:125 archive-zip.c:346
1463 +#: archive-tar.c archive-zip.c
1464 #, c-format
1465 msgid "cannot stream blob %s"
1466 msgstr "不能開啟資料物件 %s"
1467
1501 -#: archive-tar.c:265 archive-zip.c:359
1468 +#: archive-tar.c archive-zip.c
1469 #, c-format
1470 msgid "unsupported file mode: 0%o (SHA1: %s)"
1471 msgstr "不支援的檔案模式：0%o (SHA1: %s)"
1472
1506 -#: archive-tar.c:447
1473 +#: archive-tar.c
1474 #, c-format
1475 msgid "unable to start '%s' filter"
1476 msgstr "無法啟動 '%s' 過濾器"
1477
1511 -#: archive-tar.c:450
1478 +#: archive-tar.c
1479 msgid "unable to redirect descriptor"
1480 msgstr "無法重定向描述符"
1481
1515 -#: archive-tar.c:457
1482 +#: archive-tar.c
1483 #, c-format
1484 msgid "'%s' filter reported error"
1485 msgstr "'%s' 過濾器報告了錯誤"
1486
1520 -#: archive-zip.c:319
1487 +#: archive-zip.c
1488 #, c-format
1489 msgid "path is not valid UTF-8: %s"
1490 msgstr "路徑不是有效的 UTF-8：%s"
1491
1525 -#: archive-zip.c:323
1492 +#: archive-zip.c
1493 #, c-format
1494 msgid "path too long (%d chars, SHA1: %s): %s"
1495 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1496
1530 -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1497 +#: archive-zip.c builtin/pack-objects.c
1498 #, c-format
1499 msgid "deflate error (%d)"
1500 msgstr "壓縮錯誤 (%d)"
1501
1535 -#: archive-zip.c:604
1502 +#: archive-zip.c
1503 #, c-format
1504 msgid "timestamp too large for this system: %<PRIuMAX>"
1505 msgstr "對於本系統時間戳太大：%<PRIuMAX>"
1506
1540 -#: archive.c:14
1507 +#: archive.c
1508 msgid "git archive [<options>] <tree-ish> [<path>...]"
1509 msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
1510
1544 -#: archive.c:16
1511 +#: archive.c
1512 msgid ""
1513 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1514 msgstr ""
1515 "git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]"
1516
1550 -#: archive.c:17
1517 +#: archive.c
1518 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1519 msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
1520
1554 -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1555 -#: builtin/tag.c:579
1521 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
1522 #, c-format
1523 msgid "cannot read '%s'"
1524 msgstr "不能讀取 '%s'"
1525
1560 -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1526 +#: archive.c builtin/add.c builtin/rm.c
1527 #, c-format
1528 msgid "pathspec '%s' did not match any files"
1529 msgstr "路徑規格 '%s' 未符合任何檔案"
1530
1565 -#: archive.c:450
1531 +#: archive.c
1532 #, c-format
1533 msgid "no such ref: %.*s"
1534 msgstr "無此引用：%.*s"
1535
1570 -#: archive.c:456
1536 +#: archive.c
1537 #, c-format
1538 msgid "not a valid object name: %s"
1539 msgstr "不是一個有效的物件名：%s"
1540
1575 -#: archive.c:469
1541 +#: archive.c
1542 #, c-format
1543 msgid "not a tree object: %s"
1544 msgstr "不是一個樹狀物件：%s"
1545
1580 -#: archive.c:481
1546 +#: archive.c
1547 msgid "current working directory is untracked"
1548 msgstr "目前工作目錄未被追蹤"
1549
1584 -#: archive.c:522
1550 +#: archive.c
1551 #, c-format
1552 msgid "File not found: %s"
1553 msgstr "找不到檔案：%s"
1554
1589 -#: archive.c:524
1555 +#: archive.c
1556 #, c-format
1557 msgid "Not a regular file: %s"
1558 msgstr "不是一般檔案：%s"
1559
1594 -#: archive.c:551
1560 +#: archive.c
1561 +#, c-format
1562 +msgid "unclosed quote: '%s'"
1563 +msgstr "未閉合的引號：「%s」"
1564 +
1565 +#: archive.c
1566 +#, c-format
1567 +msgid "missing colon: '%s'"
1568 +msgstr "缺少冒號：「%s」"
1569 +
1570 +#: archive.c
1571 +#, c-format
1572 +msgid "empty file name: '%s'"
1573 +msgstr "檔案名稱空白：「%s」"
1574 +
1575 +#: archive.c
1576 msgid "fmt"
1577 msgstr "格式"
1578
1598 -#: archive.c:551
1579 +#: archive.c
1580 msgid "archive format"
1581 msgstr "歸檔格式"
1582
1602 -#: archive.c:552 builtin/log.c:1809
1583 +#: archive.c builtin/log.c
1584 msgid "prefix"
1585 msgstr "前綴"
1586
1606 -#: archive.c:553
1587 +#: archive.c
1588 msgid "prepend prefix to each pathname in the archive"
1589 msgstr "為歸檔中每個路徑名加上前綴"
1590
1610 -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1611 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1612 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1613 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1614 -#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1615 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1591 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
1592 +#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
1593 +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
1594 msgid "file"
1595 msgstr "檔案"
1596
1619 -#: archive.c:555
1597 +#: archive.c
1598 msgid "add untracked file to archive"
1599 msgstr "將未追蹤檔案加入歸檔"
1600
1623 -#: archive.c:558 builtin/archive.c:88
1601 +#: archive.c
1602 +msgid "path:content"
1603 +msgstr "路徑:內容"
1604 +
1605 +#: archive.c builtin/archive.c
1606 msgid "write the archive to this file"
1607 msgstr "歸檔寫入此檔案"
1608
1627 -#: archive.c:560
1609 +#: archive.c
1610 msgid "read .gitattributes in working directory"
1611 msgstr "讀取工作區中的 .gitattributes"
1612
1631 -#: archive.c:561
1613 +#: archive.c
1614 msgid "report archived files on stderr"
1615 msgstr "在標準錯誤上報告歸檔檔案"
1616
1635 -#: archive.c:563
1617 +#: archive.c
1618 msgid "set compression level"
1619 msgstr "設定壓縮級別"
1620
1639 -#: archive.c:566
1621 +#: archive.c
1622 msgid "list supported archive formats"
1623 msgstr "列出支援的歸檔格式"
1624
1643 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1644 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1625 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c
1626 msgid "repo"
1627 msgstr "版本庫"
1628
1648 -#: archive.c:569 builtin/archive.c:90
1629 +#: archive.c builtin/archive.c
1630 msgid "retrieve the archive from remote repository <repo>"
1631 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
1632
1652 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
1653 -#: builtin/notes.c:496
1633 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c
1634 msgid "command"
1635 msgstr "指令"
1636
1657 -#: archive.c:571 builtin/archive.c:92
1637 +#: archive.c builtin/archive.c
1638 msgid "path to the remote git-upload-archive command"
1639 msgstr "遠端 git-upload-archive 指令的路徑"
1640
1661 -#: archive.c:578
1641 +#: archive.c
1642 msgid "Unexpected option --remote"
1643 msgstr "未知參數 --remote"
1644
1665 -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1666 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1667 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1668 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1669 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1670 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1671 -#: http-fetch.c:153
1645 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c
1646 +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c
1647 +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c
1648 +#: revision.c
1649 #, c-format
1650 msgid "the option '%s' requires '%s'"
1651 msgstr "「%s」選項需要「%s」"
1652
1676 -#: archive.c:582
1653 +#: archive.c
1654 msgid "Unexpected option --output"
1655 msgstr "未知參數 --output"
1656
1680 -#: archive.c:606
1657 +#: archive.c
1658 #, c-format
1659 msgid "Unknown archive format '%s'"
1660 msgstr "未知歸檔格式 '%s'"
1661
1685 -#: archive.c:615
1662 +#: archive.c
1663 #, c-format
1664 msgid "Argument not supported for format '%s': -%d"
1665 msgstr "參數不支援此格式 '%s'：-%d"
1666
1690 -#: attr.c:202
1667 +#: attr.c
1668 #, c-format
1669 msgid "%.*s is not a valid attribute name"
1670 msgstr "%.*s 不是一個有效的屬性名"
1671
1695 -#: attr.c:363
1672 +#: attr.c
1673 #, c-format
1674 msgid "%s not allowed: %s:%d"
1675 msgstr "不允許 %s：%s:%d"
1676
1700 -#: attr.c:403
1677 +#: attr.c
1678 msgid ""
1679 "Negative patterns are ignored in git attributes\n"
1680 "Use '\\!' for literal leading exclamation."
@@ -1705,22 +1682,22 @@ msgstr ""
1682 "反向模式在 git attributes 中被忽略\n"
1683 "當字串確定要以驚嘆號開始時，使用 '\\!'。"
1684
1708 -#: bisect.c:488
1685 +#: bisect.c
1686 #, c-format
1687 msgid "Badly quoted content in file '%s': %s"
1688 msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
1689
1713 -#: bisect.c:698
1690 +#: bisect.c
1691 #, c-format
1692 msgid "We cannot bisect more!\n"
1693 msgstr "我們無法進行更多的二分搜尋！\n"
1694
1718 -#: bisect.c:765
1695 +#: bisect.c
1696 #, c-format
1697 msgid "Not a valid commit name %s"
1698 msgstr "不是一個有效的提交名 %s"
1699
1723 -#: bisect.c:790
1700 +#: bisect.c
1701 #, c-format
1702 msgid ""
1703 "The merge base %s is bad.\n"
@@ -1729,7 +1706,7 @@ msgstr ""
1706 "合併基礎 %s 是壞的。\n"
1707 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
1708
1732 -#: bisect.c:795
1709 +#: bisect.c
1710 #, c-format
1711 msgid ""
1712 "The merge base %s is new.\n"
@@ -1738,7 +1715,7 @@ msgstr ""
1715 "合併基礎 %s 是新的。\n"
1716 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"
1717
1741 -#: bisect.c:800
1718 +#: bisect.c
1719 #, c-format
1720 msgid ""
1721 "The merge base %s is %s.\n"
@@ -1747,7 +1724,7 @@ msgstr ""
1724 "合併基礎 %s 是 %s。\n"
1725 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
1726
1750 -#: bisect.c:808
1727 +#: bisect.c
1728 #, c-format
1729 msgid ""
1730 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1758,7 +1735,7 @@ msgstr ""
1735 "這種情況下 git 二分搜尋無法正常工作。\n"
1736 "您可能弄錯了 %s 和 %s 版本？\n"
1737
1761 -#: bisect.c:821
1738 +#: bisect.c
1739 #, c-format
1740 msgid ""
1741 "the merge base between %s and [%s] must be skipped.\n"
@@ -1769,36 +1746,36 @@ msgstr ""
1746 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
1747 "我們仍舊繼續。"
1748
1772 -#: bisect.c:860
1749 +#: bisect.c
1750 #, c-format
1751 msgid "Bisecting: a merge base must be tested\n"
1752 msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
1753
1777 -#: bisect.c:910
1754 +#: bisect.c
1755 #, c-format
1756 msgid "a %s revision is needed"
1757 msgstr "需要一個 %s 版本"
1758
1782 -#: bisect.c:940
1759 +#: bisect.c
1760 #, c-format
1761 msgid "could not create file '%s'"
1762 msgstr "不能建立檔案 '%s'"
1763
1787 -#: bisect.c:986 builtin/merge.c:155
1764 +#: bisect.c builtin/merge.c
1765 #, c-format
1766 msgid "could not read file '%s'"
1767 msgstr "不能讀取檔案 '%s'"
1768
1792 -#: bisect.c:1026
1769 +#: bisect.c
1770 msgid "reading bisect refs failed"
1771 msgstr "讀取二分搜尋引用失敗"
1772
1796 -#: bisect.c:1056
1773 +#: bisect.c
1774 #, c-format
1775 msgid "%s was both %s and %s\n"
1776 msgstr "%s 同時為 %s 和 %s\n"
1777
1801 -#: bisect.c:1065
1778 +#: bisect.c
1779 #, c-format
1780 msgid ""
1781 "No testable commit found.\n"
@@ -1807,7 +1784,7 @@ msgstr ""
1784 "沒找到能夠測試的提交。\n"
1785 "可能是執行傳入的路徑引數是錯誤的？\n"
1786
1810 -#: bisect.c:1094
1787 +#: bisect.c
1788 #, c-format
1789 msgid "(roughly %d step)"
1790 msgid_plural "(roughly %d steps)"
@@ -1816,79 +1793,76 @@ msgstr[0] "（大概 %d 步）"
1793 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1794 #. steps)" translation.
1795 #.
1819 -#: bisect.c:1100
1796 +#: bisect.c
1797 #, c-format
1798 msgid "Bisecting: %d revision left to test after this %s\n"
1799 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1800 msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"
1801
1825 -#: blame.c:2773
1802 +#: blame.c
1803 msgid "--contents and --reverse do not blend well."
1804 msgstr "--contents 和 --reverse 不能混用。"
1805
1829 -#: blame.c:2787
1806 +#: blame.c
1807 msgid "cannot use --contents with final commit object name"
1808 msgstr "不能將 --contents 和最終的提交物件名共用"
1809
1833 -#: blame.c:2808
1810 +#: blame.c
1811 msgid "--reverse and --first-parent together require specified latest commit"
1812 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1813
1837 -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1838 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1839 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1840 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1841 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1842 -#: builtin/shortlog.c:255
1814 +#: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1815 +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c
1816 +#: remote.c sequencer.c submodule.c
1817 msgid "revision walk setup failed"
1818 msgstr "版本遍歷設定失敗"
1819
1846 -#: blame.c:2835
1820 +#: blame.c
1821 msgid ""
1822 "--reverse --first-parent together require range along first-parent chain"
1823 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
1824
1851 -#: blame.c:2846
1825 +#: blame.c
1826 #, c-format
1827 msgid "no such path %s in %s"
1828 msgstr "在 %2$s 中無此路徑 %1$s"
1829
1856 -#: blame.c:2857
1830 +#: blame.c
1831 #, c-format
1832 msgid "cannot read blob %s for path %s"
1833 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
1834
1861 -#: branch.c:93
1835 +#: branch.c
1836 msgid ""
1837 "cannot inherit upstream tracking configuration of multiple refs when "
1838 "rebasing is requested"
1839 msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"
1840
1867 -#: branch.c:104
1841 +#: branch.c
1842 #, c-format
1843 msgid "not setting branch '%s' as its own upstream"
1844 msgstr "未將「%s」分支設定為其自己的上游"
1845
1872 -#: branch.c:160
1846 +#: branch.c
1847 #, c-format
1848 msgid "branch '%s' set up to track '%s' by rebasing."
1849 msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"
1850
1877 -#: branch.c:161
1851 +#: branch.c
1852 #, c-format
1853 msgid "branch '%s' set up to track '%s'."
1854 msgstr "已將「%s」分支設定為追蹤「%s」。"
1855
1882 -#: branch.c:164
1856 +#: branch.c
1857 #, c-format
1858 msgid "branch '%s' set up to track:"
1859 msgstr "「%s」分支已設定追蹤："
1860
1887 -#: branch.c:176
1861 +#: branch.c
1862 msgid "unable to write upstream branch configuration"
1863 msgstr "無法寫入上游分支設定"
1864
1891 -#: branch.c:178
1865 +#: branch.c
1866 msgid ""
1867 "\n"
1868 "After fixing the error cause you may try to fix up\n"
@@ -1898,17 +1872,17 @@ msgstr ""
1872 "修正錯誤後，您可以執行下述命令\n"
1873 "命令修正遠端追蹤資訊："
1874
1901 -#: branch.c:219
1875 +#: branch.c
1876 #, c-format
1877 msgid "asked to inherit tracking from '%s', but no remote is set"
1878 msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"
1879
1906 -#: branch.c:225
1880 +#: branch.c
1881 #, c-format
1882 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1883 msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"
1884
1911 -#: branch.c:277
1885 +#: branch.c
1886 #, c-format
1887 msgid "not tracking: ambiguous information for ref '%s'"
1888 msgstr "未追蹤：「%s」引用有歧義"
@@ -1923,7 +1897,7 @@ msgstr "未追蹤：「%s」引用有歧義"
1897 #. you'll probably want to swap the "%s" and leading " " space
1898 #. around.
1899 #.
1926 -#: branch.c:289 object-name.c:464
1900 +#: branch.c object-name.c
1901 #, c-format
1902 msgid " %s\n"
1903 msgstr " %s\n"
@@ -1931,7 +1905,7 @@ msgstr " %s\n"
1905 #. TRANSLATORS: The second argument is a \n-delimited list of
1906 #. duplicate refspecs, composed above.
1907 #.
1934 -#: branch.c:295
1908 +#: branch.c
1909 #, c-format
1910 msgid ""
1911 "There are multiple remotes whose fetch refspecs map to the remote\n"
@@ -1950,32 +1924,32 @@ msgstr ""
1924 "若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n"
1925 "映射到不同的追蹤命名空間。"
1926
1953 -#: branch.c:344
1927 +#: branch.c
1928 #, c-format
1929 msgid "'%s' is not a valid branch name"
1930 msgstr "「%s」不是一個有效的分支名稱"
1931
1958 -#: branch.c:364
1932 +#: branch.c
1933 #, c-format
1934 msgid "a branch named '%s' already exists"
1935 msgstr "已有同名「%s」分支"
1936
1963 -#: branch.c:370
1937 +#: branch.c
1938 #, c-format
1939 msgid "cannot force update the branch '%s' checked out at '%s'"
1940 msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"
1941
1968 -#: branch.c:393
1942 +#: branch.c
1943 #, c-format
1944 msgid "cannot set up tracking information; starting point '%s' is not a branch"
1945 msgstr "無法設定追蹤資訊：起始點「%s」不是分支"
1946
1973 -#: branch.c:395
1947 +#: branch.c
1948 #, c-format
1949 msgid "the requested upstream branch '%s' does not exist"
1950 msgstr "請求的上游分支 '%s' 不存在"
1951
1978 -#: branch.c:397
1952 +#: branch.c
1953 msgid ""
1954 "\n"
1955 "If you are planning on basing your work on an upstream\n"
@@ -1994,28 +1968,27 @@ msgstr ""
1968 "且建立兩個分支間的追蹤關係，\n"
1969 "您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
1970
1997 -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
1998 -#: builtin/replace.c:423 builtin/replace.c:453
1971 +#: branch.c builtin/replace.c
1972 #, c-format
1973 msgid "not a valid object name: '%s'"
1974 msgstr "不是一個有效的物件名：'%s'"
1975
2003 -#: branch.c:465
1976 +#: branch.c
1977 #, c-format
1978 msgid "ambiguous object name: '%s'"
1979 msgstr "物件名稱有歧義：「%s」"
1980
2008 -#: branch.c:470
1981 +#: branch.c
1982 #, c-format
1983 msgid "not a valid branch point: '%s'"
1984 msgstr "無效的分支點：「%s」"
1985
2013 -#: branch.c:658
1986 +#: branch.c
1987 #, c-format
1988 msgid "submodule '%s': unable to find submodule"
1989 msgstr "「%s」子模組：找不到子模組"
1990
2018 -#: branch.c:661
1991 +#: branch.c
1992 #, c-format
1993 msgid ""
1994 "You may try updating the submodules using 'git checkout %s && git submodule "
@@ -2024,25518 +1997,24586 @@ msgstr ""
1997 "您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"
1998 "組"
1999
2027 -#: branch.c:672 branch.c:698
2000 +#: branch.c
2001 #, c-format
2002 msgid "submodule '%s': cannot create branch '%s'"
2003 msgstr "「%s」子模組：無法建立「%s」分支"
2004
2032 -#: branch.c:730
2005 +#: branch.c
2006 #, c-format
2007 msgid "'%s' is already checked out at '%s'"
2008 msgstr "'%s' 已經簽出到 '%s'"
2009
2037 -#: branch.c:755
2010 +#: branch.c
2011 #, c-format
2012 msgid "HEAD of working tree %s is not updated"
2013 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
2014
2042 -#: bundle.c:45
2043 -#, c-format
2044 -msgid "unrecognized bundle hash algorithm: %s"
2045 -msgstr "無法識別的套件雜湊演算法：%s"
2015 +#: builtin/add.c
2016 +msgid "git add [<options>] [--] <pathspec>..."
2017 +msgstr "git add [<選項>] [--] <路徑規格>..."
2018
2047 -#: bundle.c:53
2019 +#: builtin/add.c
2020 #, c-format
2049 -msgid "unknown capability '%s'"
2050 -msgstr "未知功能 '%s'"
2021 +msgid "cannot chmod %cx '%s'"
2022 +msgstr "無法 chmod %cx ‘%s’"
2023
2052 -#: bundle.c:79
2024 +#: builtin/add.c
2025 #, c-format
2054 -msgid "'%s' does not look like a v2 or v3 bundle file"
2055 -msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"
2026 +msgid "unexpected diff status %c"
2027 +msgstr "意外的差異狀態 %c"
2028
2057 -#: bundle.c:118
2058 -#, c-format
2059 -msgid "unrecognized header: %s%s (%d)"
2060 -msgstr "無法識別的包頭：%s%s (%d)"
2029 +#: builtin/add.c builtin/commit.c
2030 +msgid "updating files failed"
2031 +msgstr "更新檔案失敗"
2032
2062 -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
2063 -#: builtin/commit.c:865
2033 +#: builtin/add.c
2034 #, c-format
2065 -msgid "could not open '%s'"
2066 -msgstr "不能開啟 '%s'"
2035 +msgid "remove '%s'\n"
2036 +msgstr "刪除 '%s'\n"
2037
2068 -#: bundle.c:203
2069 -msgid "Repository lacks these prerequisite commits:"
2070 -msgstr "版本庫中缺少這些必備的提交："
2038 +#: builtin/add.c
2039 +msgid "Unstaged changes after refreshing the index:"
2040 +msgstr "重新整理索引之後尚未被暫存的變更："
2041
2072 -#: bundle.c:206
2073 -msgid "need a repository to verify a bundle"
2074 -msgstr "需要版本庫驗證套件"
2042 +#: builtin/add.c builtin/rev-parse.c
2043 +msgid "Could not read the index"
2044 +msgstr "不能讀取索引"
2045 +
2046 +#: builtin/add.c
2047 +msgid "Could not write patch"
2048 +msgstr "不能生成修補檔"
2049
2076 -#: bundle.c:264
2050 +#: builtin/add.c
2051 +msgid "editing patch failed"
2052 +msgstr "編輯修補檔失敗"
2053 +
2054 +#: builtin/add.c
2055 #, c-format
2078 -msgid "The bundle contains this ref:"
2079 -msgid_plural "The bundle contains these %<PRIuMAX> refs:"
2080 -msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："
2056 +msgid "Could not stat '%s'"
2057 +msgstr "不能對 '%s' 呼叫 stat"
2058
2082 -#: bundle.c:272
2083 -msgid "The bundle records a complete history."
2084 -msgstr "這個套件記錄完整歷史紀錄。"
2059 +#: builtin/add.c
2060 +msgid "Empty patch. Aborted."
2061 +msgstr "空修補檔。異常終止。"
2062
2086 -#: bundle.c:274
2063 +#: builtin/add.c
2064 #, c-format
2088 -msgid "The bundle requires this ref:"
2089 -msgid_plural "The bundle requires these %<PRIuMAX> refs:"
2090 -msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用："
2065 +msgid "Could not apply '%s'"
2066 +msgstr "不能套用 '%s'"
2067
2092 -#: bundle.c:350
2093 -msgid "unable to dup bundle descriptor"
2094 -msgstr "無法複製套件描述符"
2068 +#: builtin/add.c
2069 +msgid "The following paths are ignored by one of your .gitignore files:\n"
2070 +msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
2071
2096 -#: bundle.c:357
2097 -msgid "Could not spawn pack-objects"
2098 -msgstr "不能生成 pack-objects 進程"
2072 +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
2073 +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
2074 +#: builtin/rm.c builtin/send-pack.c
2075 +msgid "dry run"
2076 +msgstr "測試執行"
2077
2100 -#: bundle.c:368
2101 -msgid "pack-objects died"
2102 -msgstr "pack-objects 終止"
2078 +#: builtin/add.c builtin/check-ignore.c builtin/commit.c
2079 +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c
2080 +#: builtin/read-tree.c
2081 +msgid "be verbose"
2082 +msgstr "詳細輸出"
2083
2104 -#: bundle.c:417
2105 -#, c-format
2106 -msgid "ref '%s' is excluded by the rev-list options"
2107 -msgstr "引用 '%s' 被 rev-list 選項排除"
2084 +#: builtin/add.c
2085 +msgid "interactive picking"
2086 +msgstr "互動式揀選"
2087
2109 -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
2110 -#, c-format
2111 -msgid "unrecognized argument: %s"
2112 -msgstr "無法識別的參數：%s"
2088 +#: builtin/add.c builtin/checkout.c builtin/reset.c
2089 +msgid "select hunks interactively"
2090 +msgstr "互動式挑選資料區塊"
2091
2114 -#: bundle.c:548
2115 -#, c-format
2116 -msgid "unsupported bundle version %d"
2117 -msgstr "不支援的套件版本 %d"
2092 +#: builtin/add.c
2093 +msgid "edit current diff and apply"
2094 +msgstr "編輯目前差異並套用"
2095
2119 -#: bundle.c:550
2120 -#, c-format
2121 -msgid "cannot write bundle version %d with algorithm %s"
2122 -msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
2096 +#: builtin/add.c
2097 +msgid "allow adding otherwise ignored files"
2098 +msgstr "允許新增忽略的檔案"
2099
2124 -#: bundle.c:600
2125 -msgid "Refusing to create empty bundle."
2126 -msgstr "不能建立空套件。"
2100 +#: builtin/add.c
2101 +msgid "update tracked files"
2102 +msgstr "更新已追蹤的檔案"
2103
2128 -#: bundle.c:610
2129 -#, c-format
2130 -msgid "cannot create '%s'"
2131 -msgstr "不能建立 '%s'"
2104 +#: builtin/add.c
2105 +msgid "renormalize EOL of tracked files (implies -u)"
2106 +msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"
2107
2133 -#: bundle.c:639
2134 -msgid "index-pack died"
2135 -msgstr "index-pack 終止"
2108 +#: builtin/add.c
2109 +msgid "record only the fact that the path will be added later"
2110 +msgstr "只記錄，該路徑稍後再新增"
2111
2137 -#: chunk-format.c:117
2138 -msgid "terminating chunk id appears earlier than expected"
2139 -msgstr "終止區塊 id 出現的時間早於預期"
2112 +#: builtin/add.c
2113 +msgid "add changes from all tracked and untracked files"
2114 +msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
2115
2141 -#: chunk-format.c:126
2142 -#, c-format
2143 -msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
2144 -msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"
2116 +#: builtin/add.c
2117 +msgid "ignore paths removed in the working tree (same as --no-all)"
2118 +msgstr "忽略工作區中移除的路徑（和 --no-all 相同）"
2119
2146 -#: chunk-format.c:133
2147 -#, c-format
2148 -msgid "duplicate chunk ID %<PRIx32> found"
2149 -msgstr "找到重複的區塊 ID %<PRIx32>"
2120 +#: builtin/add.c
2121 +msgid "don't add, only refresh the index"
2122 +msgstr "不新增，只重新整理索引"
2123 +
2124 +#: builtin/add.c
2125 +msgid "just skip files which cannot be added because of errors"
2126 +msgstr "略過因發生錯誤不能新增的檔案"
2127 +
2128 +#: builtin/add.c
2129 +msgid "check if - even missing - files are ignored in dry run"
2130 +msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"
2131 +
2132 +#: builtin/add.c builtin/mv.c builtin/rm.c
2133 +msgid "allow updating entries outside of the sparse-checkout cone"
2134 +msgstr "允許更新稀疏簽出 cone 外的項目"
2135 +
2136 +#: builtin/add.c builtin/update-index.c
2137 +msgid "override the executable bit of the listed files"
2138 +msgstr "覆蓋列表裡檔案的可執行位"
2139
2151 -#: chunk-format.c:147
2140 +#: builtin/add.c
2141 +msgid "warn when adding an embedded repository"
2142 +msgstr "建立一個嵌入式版本庫時給予警告"
2143 +
2144 +#: builtin/add.c
2145 #, c-format
2153 -msgid "final chunk has non-zero id %<PRIx32>"
2154 -msgstr "最終區塊有非零 ID %<PRIx32>"
2146 +msgid ""
2147 +"You've added another git repository inside your current repository.\n"
2148 +"Clones of the outer repository will not contain the contents of\n"
2149 +"the embedded repository and will not know how to obtain it.\n"
2150 +"If you meant to add a submodule, use:\n"
2151 +"\n"
2152 +"\tgit submodule add <url> %s\n"
2153 +"\n"
2154 +"If you added this path by mistake, you can remove it from the\n"
2155 +"index with:\n"
2156 +"\n"
2157 +"\tgit rm --cached %s\n"
2158 +"\n"
2159 +"See \"git help submodule\" for more information."
2160 +msgstr ""
2161 +"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫"
2162 +"的內容，並且不知道該如何取得它。\n"
2163 +"如果您要新增一個子模組，使用：\n"
2164 +"\n"
2165 +"\tgit submodule add <url> %s\n"
2166 +"\n"
2167 +"如果您不小心新增了這個路徑，可以用下面的指令將其從索引中刪除：\n"
2168 +"\n"
2169 +"\tgit rm --cached %s\n"
2170 +"\n"
2171 +"參見 \"git help submodule\" 取得更多訊息。"
2172
2156 -#: color.c:354
2173 +#: builtin/add.c
2174 #, c-format
2158 -msgid "invalid color value: %.*s"
2159 -msgstr "無效的顏色值：%.*s"
2175 +msgid "adding embedded git repository: %s"
2176 +msgstr "正在新增嵌入式 git 版本庫：%s"
2177
2161 -#: commit-graph.c:204 midx.c:52
2162 -msgid "invalid hash version"
2163 -msgstr "無效的雜湊版本"
2178 +#: builtin/add.c
2179 +msgid ""
2180 +"Use -f if you really want to add them.\n"
2181 +"Turn this message off by running\n"
2182 +"\"git config advice.addIgnoredFile false\""
2183 +msgstr ""
2184 +"如果您真的想加入，請使用 -f。\n"
2185 +"如要關閉此訊息，請執行\n"
2186 +"\"git config advice.addIgnoredFile false\""
2187
2165 -#: commit-graph.c:262
2166 -msgid "commit-graph file is too small"
2167 -msgstr "提交圖形檔案太小"
2188 +#: builtin/add.c
2189 +msgid "adding files failed"
2190 +msgstr "新增檔案失敗"
2191
2169 -#: commit-graph.c:355
2192 +#: builtin/add.c
2193 #, c-format
2171 -msgid "commit-graph signature %X does not match signature %X"
2172 -msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
2194 +msgid "--chmod param '%s' must be either -x or +x"
2195 +msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
2196
2174 -#: commit-graph.c:362
2197 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
2198 +#: builtin/rm.c builtin/stash.c
2199 #, c-format
2176 -msgid "commit-graph version %X does not match version %X"
2177 -msgstr "提交圖形版本 %X 和版本 %X 不符合"
2200 +msgid "'%s' and pathspec arguments cannot be used together"
2201 +msgstr "「%s」和路徑規格引數不得同時使用"
2202
2179 -#: commit-graph.c:369
2203 +#: builtin/add.c
2204 #, c-format
2181 -msgid "commit-graph hash version %X does not match version %X"
2182 -msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
2205 +msgid "Nothing specified, nothing added.\n"
2206 +msgstr "沒有指定檔案，也沒有檔案被新增。\n"
2207
2184 -#: commit-graph.c:386
2185 -#, c-format
2186 -msgid "commit-graph file is too small to hold %u chunks"
2187 -msgstr "commit-graph 檔案不夠放置 %u 個區塊"
2208 +#: builtin/add.c
2209 +msgid ""
2210 +"Maybe you wanted to say 'git add .'?\n"
2211 +"Turn this message off by running\n"
2212 +"\"git config advice.addEmptyPathspec false\""
2213 +msgstr ""
2214 +"可能你要做的是 'git add .'？\n"
2215 +"如要關閉此訊息，請執行\n"
2216 +"\"git config advice.addEmptyPathspec false\""
2217
2189 -#: commit-graph.c:485
2190 -msgid "commit-graph has no base graphs chunk"
2191 -msgstr "提交圖形沒有基礎圖形區塊"
2218 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c
2219 +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c
2220 +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c
2221 +#: rerere.c submodule.c
2222 +msgid "index file corrupt"
2223 +msgstr "索引檔案損壞"
2224
2193 -#: commit-graph.c:495
2194 -msgid "commit-graph chain does not match"
2195 -msgstr "提交圖形鏈不符合"
2225 +#: builtin/am.c builtin/mailinfo.c mailinfo.c
2226 +#, c-format
2227 +msgid "bad action '%s' for '%s'"
2228 +msgstr "「%s」動作對「%s」無效"
2229
2197 -#: commit-graph.c:543
2230 +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2231 +#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
2232 +#: sequencer.c setup.c
2233 #, c-format
2199 -msgid "invalid commit-graph chain: line '%s' not a hash"
2200 -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
2234 +msgid "invalid value for '%s': '%s'"
2235 +msgstr "「%s」的值無效：「%s」"
2236
2202 -#: commit-graph.c:567
2203 -msgid "unable to find all commit-graph files"
2204 -msgstr "無法找到所有提交圖形檔案"
2237 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2238 +#, c-format
2239 +msgid "could not read '%s'"
2240 +msgstr "不能讀取 '%s'"
2241
2206 -#: commit-graph.c:752 commit-graph.c:789
2207 -msgid "invalid commit position. commit-graph is likely corrupt"
2208 -msgstr "無效的提交位置。提交圖形可能已損壞"
2242 +#: builtin/am.c
2243 +msgid "could not parse author script"
2244 +msgstr "不能解析作者腳本"
2245
2210 -#: commit-graph.c:773
2246 +#: builtin/am.c builtin/replace.c commit.c sequencer.c
2247 #, c-format
2212 -msgid "could not find commit %s"
2213 -msgstr "無法找到提交 %s"
2214 -
2215 -#: commit-graph.c:806
2216 -msgid "commit-graph requires overflow generation data but has none"
2217 -msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
2248 +msgid "could not parse %s"
2249 +msgstr "不能解析 %s"
2250
2219 -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2220 -#: builtin/clone.c:705
2251 +#: builtin/am.c
2252 #, c-format
2222 -msgid "unable to parse commit %s"
2223 -msgstr "不能解析提交 %s"
2253 +msgid "'%s' was deleted by the applypatch-msg hook"
2254 +msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
2255
2225 -#: commit-graph.c:1373 builtin/pack-objects.c:3078
2256 +#: builtin/am.c
2257 #, c-format
2227 -msgid "unable to get type of object %s"
2228 -msgstr "無法獲得物件 %s 類型"
2258 +msgid "Malformed input line: '%s'."
2259 +msgstr "非法的輸入行：'%s'。"
2260
2230 -#: commit-graph.c:1404
2231 -msgid "Loading known commits in commit graph"
2232 -msgstr "正在載入提交圖中的已知提交"
2261 +#: builtin/am.c
2262 +#, c-format
2263 +msgid "Failed to copy notes from '%s' to '%s'"
2264 +msgstr "從 '%s' 複製註解到 '%s' 時失敗"
2265
2234 -#: commit-graph.c:1421
2235 -msgid "Expanding reachable commits in commit graph"
2236 -msgstr "正在展開提交圖中的可以取得的提交"
2266 +#: builtin/am.c
2267 +msgid "fseek failed"
2268 +msgstr "fseek 失敗"
2269
2238 -#: commit-graph.c:1441
2239 -msgid "Clearing commit marks in commit graph"
2240 -msgstr "正在清除提交圖中的提交標記"
2270 +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c
2271 +#, c-format
2272 +msgid "could not open '%s' for reading"
2273 +msgstr "無法開啟 '%s' 進行讀取"
2274
2242 -#: commit-graph.c:1460
2243 -msgid "Computing commit graph topological levels"
2244 -msgstr "正在計算提交圖拓樸級別"
2275 +#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c
2276 +#, c-format
2277 +msgid "could not open '%s' for writing"
2278 +msgstr "無法開啟 '%s' 進行寫入"
2279
2246 -#: commit-graph.c:1513
2247 -msgid "Computing commit graph generation numbers"
2248 -msgstr "正在計算提交圖世代數字"
2280 +#: builtin/am.c
2281 +#, c-format
2282 +msgid "could not parse patch '%s'"
2283 +msgstr "無法解析修補檔 '%s'"
2284
2250 -#: commit-graph.c:1598
2251 -msgid "Computing commit changed paths Bloom filters"
2252 -msgstr "正在計算提交變更路徑的布隆過濾器"
2285 +#: builtin/am.c
2286 +msgid "Only one StGIT patch series can be applied at once"
2287 +msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
2288
2254 -#: commit-graph.c:1675
2255 -msgid "Collecting referenced commits"
2256 -msgstr "正在收集引用提交"
2289 +#: builtin/am.c
2290 +msgid "invalid timestamp"
2291 +msgstr "無效的時間戳"
2292 +
2293 +#: builtin/am.c
2294 +msgid "invalid Date line"
2295 +msgstr "無效的日期行"
2296
2258 -#: commit-graph.c:1701
2297 +#: builtin/am.c
2298 +msgid "invalid timezone offset"
2299 +msgstr "無效的時區位移值"
2300 +
2301 +#: builtin/am.c
2302 +msgid "Patch format detection failed."
2303 +msgstr "修補檔格式偵測失敗。"
2304 +
2305 +#: builtin/am.c builtin/clone.c
2306 #, c-format
2260 -msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2261 -msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2262 -msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
2307 +msgid "failed to create directory '%s'"
2308 +msgstr "建立目錄 '%s' 失敗"
2309 +
2310 +#: builtin/am.c
2311 +msgid "Failed to split patches."
2312 +msgstr "分割修補檔失敗。"
2313
2264 -#: commit-graph.c:1714
2314 +#: builtin/am.c
2315 #, c-format
2266 -msgid "error adding pack %s"
2267 -msgstr "新增包 %s 發生錯誤"
2316 +msgid "When you have resolved this problem, run \"%s --continue\"."
2317 +msgstr "當您解決這一問題，執行 \"%s --continue\"。"
2318
2269 -#: commit-graph.c:1718
2319 +#: builtin/am.c
2320 #, c-format
2271 -msgid "error opening index for %s"
2272 -msgstr "為 %s 開啟索引發生錯誤"
2321 +msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
2322 +msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"
2323
2274 -#: commit-graph.c:1756
2275 -msgid "Finding commits for commit graph among packed objects"
2276 -msgstr "正在打包物件中尋找提交圖的提交"
2324 +#: builtin/am.c
2325 +#, c-format
2326 +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
2327 +msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。"
2328
2278 -#: commit-graph.c:1774
2279 -msgid "Finding extra edges in commit graph"
2280 -msgstr "正在尋找提交圖中額外的邊"
2329 +#: builtin/am.c
2330 +#, c-format
2331 +msgid "To restore the original branch and stop patching, run \"%s --abort\"."
2332 +msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"
2333
2282 -#: commit-graph.c:1823
2283 -msgid "failed to write correct number of base graph ids"
2284 -msgstr "無法寫入正確數量的基礎圖形 ID"
2334 +#: builtin/am.c
2335 +msgid "Patch sent with format=flowed; space at the end of lines might be lost."
2336 +msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"
2337
2286 -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2338 +#: builtin/am.c
2339 #, c-format
2288 -msgid "unable to create leading directories of %s"
2289 -msgstr "不能為 %s 建立先導目錄"
2290 -
2291 -#: commit-graph.c:1868
2292 -msgid "unable to create temporary graph layer"
2293 -msgstr "無法建立暫時的圖形層"
2340 +msgid "missing author line in commit %s"
2341 +msgstr "在提交 %s 中缺少作者行"
2342
2295 -#: commit-graph.c:1873
2343 +#: builtin/am.c
2344 #, c-format
2297 -msgid "unable to adjust shared permissions for '%s'"
2298 -msgstr "無法調整「%s」的共用權限"
2345 +msgid "invalid ident line: %.*s"
2346 +msgstr "無效的身份標記：%.*s"
2347
2300 -#: commit-graph.c:1930
2348 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c
2349 #, c-format
2302 -msgid "Writing out commit graph in %d pass"
2303 -msgid_plural "Writing out commit graph in %d passes"
2304 -msgstr[0] "正在用 %d 步寫出提交圖"
2350 +msgid "unable to parse commit %s"
2351 +msgstr "不能解析提交 %s"
2352
2306 -#: commit-graph.c:1967
2307 -msgid "unable to open commit-graph chain file"
2308 -msgstr "無法開啟提交圖形鏈檔案"
2353 +#: builtin/am.c
2354 +msgid "Repository lacks necessary blobs to fall back on 3-way merge."
2355 +msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
2356
2310 -#: commit-graph.c:1983
2311 -msgid "failed to rename base commit-graph file"
2312 -msgstr "無法重新命名基礎提交圖形檔案"
2357 +#: builtin/am.c
2358 +msgid "Using index info to reconstruct a base tree..."
2359 +msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."
2360
2314 -#: commit-graph.c:2004
2315 -msgid "failed to rename temporary commit-graph file"
2316 -msgstr "無法重新命名暫時提交圖形檔案"
2361 +#: builtin/am.c
2362 +msgid ""
2363 +"Did you hand edit your patch?\n"
2364 +"It does not apply to blobs recorded in its index."
2365 +msgstr ""
2366 +"您是否曾手動編輯過您的修補檔？\n"
2367 +"無法套用修補檔到索引中的資料物件上。"
2368
2318 -#: commit-graph.c:2137
2319 -msgid "Scanning merged commits"
2320 -msgstr "正在掃描合併提交"
2369 +#: builtin/am.c
2370 +msgid "Falling back to patching base and 3-way merge..."
2371 +msgstr "回落到基礎版本上修補及進行三方合併..."
2372
2322 -#: commit-graph.c:2181
2323 -msgid "Merging commit-graph"
2324 -msgstr "正在合併提交圖形"
2373 +#: builtin/am.c
2374 +msgid "Failed to merge in the changes."
2375 +msgstr "無法合併變更。"
2376
2326 -#: commit-graph.c:2289
2327 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2328 -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
2377 +#: builtin/am.c builtin/merge.c sequencer.c
2378 +msgid "git write-tree failed to write a tree"
2379 +msgstr "git write-tree 無法寫入樹狀物件"
2380
2330 -#: commit-graph.c:2396
2331 -msgid "too many commits to write graph"
2332 -msgstr "提交太多不能畫圖"
2381 +#: builtin/am.c
2382 +msgid "applying to an empty history"
2383 +msgstr "正套用到一個空歷史上"
2384
2334 -#: commit-graph.c:2494
2335 -msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2336 -msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
2385 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2386 +#: t/helper/test-fast-rebase.c
2387 +msgid "failed to write commit object"
2388 +msgstr "寫提交物件失敗"
2389
2338 -#: commit-graph.c:2504
2390 +#: builtin/am.c
2391 #, c-format
2340 -msgid "commit-graph has incorrect OID order: %s then %s"
2341 -msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
2392 +msgid "cannot resume: %s does not exist."
2393 +msgstr "無法繼續：%s 不存在。"
2394
2343 -#: commit-graph.c:2514 commit-graph.c:2529
2344 -#, c-format
2345 -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2346 -msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
2395 +#: builtin/am.c
2396 +msgid "Commit Body is:"
2397 +msgstr "提交內容為："
2398
2348 -#: commit-graph.c:2521
2399 +# 譯者：請維持句尾空格
2400 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
2401 +#. in your translation. The program will only accept English
2402 +#. input at this point.
2403 +#.
2404 +#: builtin/am.c
2405 #, c-format
2350 -msgid "failed to parse commit %s from commit-graph"
2351 -msgstr "無法從提交圖形中解析提交 %s"
2406 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
2407 +msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： "
2408
2353 -#: commit-graph.c:2539
2354 -msgid "Verifying commits in commit graph"
2355 -msgstr "正在驗證提交圖中的提交"
2409 +#: builtin/am.c builtin/commit.c
2410 +msgid "unable to write index file"
2411 +msgstr "無法寫入索引檔案"
2412
2357 -#: commit-graph.c:2554
2413 +#: builtin/am.c
2414 #, c-format
2359 -msgid "failed to parse commit %s from object database for commit-graph"
2360 -msgstr "無法從提交圖形的物件庫中解析提交 %s"
2415 +msgid "Dirty index: cannot apply patches (dirty: %s)"
2416 +msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
2417
2362 -#: commit-graph.c:2561
2418 +#: builtin/am.c
2419 #, c-format
2364 -msgid "root tree OID for commit %s in commit-graph is %s != %s"
2365 -msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
2420 +msgid "Skipping: %.*s"
2421 +msgstr "略過：%.*s"
2422
2367 -#: commit-graph.c:2571
2423 +#: builtin/am.c
2424 #, c-format
2369 -msgid "commit-graph parent list for commit %s is too long"
2370 -msgstr "提交 %s 的提交圖形父提交列表太長了"
2425 +msgid "Creating an empty commit: %.*s"
2426 +msgstr "建立空白提交：%.*s"
2427
2372 -#: commit-graph.c:2580
2373 -#, c-format
2374 -msgid "commit-graph parent for %s is %s != %s"
2375 -msgstr "%s 的提交圖形父提交是 %s != %s"
2428 +#: builtin/am.c
2429 +msgid "Patch is empty."
2430 +msgstr "修補檔為空。"
2431
2377 -#: commit-graph.c:2594
2432 +#: builtin/am.c
2433 #, c-format
2379 -msgid "commit-graph parent list for commit %s terminates early"
2380 -msgstr "提交 %s 的提交圖形父提交列表過早終止"
2434 +msgid "Applying: %.*s"
2435 +msgstr "套用：%.*s"
2436
2382 -#: commit-graph.c:2599
2383 -#, c-format
2384 -msgid ""
2385 -"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2386 -msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
2437 +#: builtin/am.c
2438 +msgid "No changes -- Patch already applied."
2439 +msgstr "沒有變更——修補檔已經套用過。"
2440
2388 -#: commit-graph.c:2603
2441 +#: builtin/am.c
2442 #, c-format
2443 +msgid "Patch failed at %s %.*s"
2444 +msgstr "打修補檔失敗於 %s %.*s"
2445 +
2446 +#: builtin/am.c
2447 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
2448 +msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
2449 +
2450 +#: builtin/am.c
2451 +msgid "No changes - recorded it as an empty commit."
2452 +msgstr "沒有變更 － 將其錄製為空白提交。"
2453 +
2454 +#: builtin/am.c
2455 msgid ""
2391 -"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2392 -msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
2456 +"No changes - did you forget to use 'git add'?\n"
2457 +"If there is nothing left to stage, chances are that something else\n"
2458 +"already introduced the same changes; you might want to skip this patch."
2459 +msgstr ""
2460 +"沒有變更 —— 您是不是忘了執行 'git add'？\n"
2461 +"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
2462 +"您也許想要略過這個修補檔。"
2463
2394 -#: commit-graph.c:2620
2395 -#, c-format
2396 -msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2397 -msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
2464 +#: builtin/am.c
2465 +msgid ""
2466 +"You still have unmerged paths in your index.\n"
2467 +"You should 'git add' each file with resolved conflicts to mark them as "
2468 +"such.\n"
2469 +"You might run `git rm` on a file to accept \"deleted by them\" for it."
2470 +msgstr ""
2471 +"在您的索引中仍存在未合併的路徑。\n"
2472 +"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
2473 +"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
2474
2399 -#: commit-graph.c:2626
2400 -#, c-format
2401 -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2402 -msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2475 +#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
2476 +#: rerere.c
2477 +msgid "unable to write new index file"
2478 +msgstr "無法寫新的索引檔案"
2479
2404 -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2405 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2480 +#: builtin/am.c builtin/reset.c
2481 #, c-format
2407 -msgid "could not parse %s"
2408 -msgstr "不能解析 %s"
2482 +msgid "Could not parse object '%s'."
2483 +msgstr "不能解析物件 '%s'。"
2484
2410 -#: commit.c:56
2411 -#, c-format
2412 -msgid "%s %s is not a commit!"
2413 -msgstr "%s %s 不是一個提交！"
2485 +#: builtin/am.c
2486 +msgid "failed to clean index"
2487 +msgstr "清空索引失敗"
2488
2415 -#: commit.c:197
2489 +#: builtin/am.c
2490 msgid ""
2417 -"Support for <GIT_DIR>/info/grafts is deprecated\n"
2418 -"and will be removed in a future Git version.\n"
2419 -"\n"
2420 -"Please use \"git replace --convert-graft-file\"\n"
2421 -"to convert the grafts into replace refs.\n"
2422 -"\n"
2423 -"Turn this message off by running\n"
2424 -"\"git config advice.graftFileDeprecated false\""
2425 -msgstr ""
2426 -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n"
2427 -"未來的Git版本中被移除。\n"
2428 -"\n"
2429 -"請使用 \"git replace --convert-graft-file\" 將\n"
2430 -"grafts 轉換為取代引用。\n"
2431 -"\n"
2432 -"設定 \"git config advice.graftFileDeprecated false\"\n"
2433 -"可關閉本消息"
2491 +"You seem to have moved HEAD since the last 'am' failure.\n"
2492 +"Not rewinding to ORIG_HEAD"
2493 +msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
2494
2435 -#: commit.c:1252
2495 +#: builtin/am.c builtin/bisect--helper.c worktree.c
2496 #, c-format
2437 -msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2438 -msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
2497 +msgid "failed to read '%s'"
2498 +msgstr "讀取 '%s' 失敗"
2499
2440 -#: commit.c:1256
2500 +#: builtin/am.c
2501 #, c-format
2442 -msgid "Commit %s has a bad GPG signature allegedly by %s."
2443 -msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
2502 +msgid "options '%s=%s' and '%s=%s' cannot be used together"
2503 +msgstr "「%s=%s」和「%s=%s」選項不得同時使用"
2504
2445 -#: commit.c:1259
2446 -#, c-format
2447 -msgid "Commit %s does not have a GPG signature."
2448 -msgstr "提交 %s 沒有 GPG 簽名。"
2505 +#: builtin/am.c
2506 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
2507 +msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
2508
2450 -#: commit.c:1262
2451 -#, c-format
2452 -msgid "Commit %s has a good GPG signature by %s\n"
2453 -msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
2509 +#: builtin/am.c
2510 +msgid "git am [<options>] (--continue | --skip | --abort)"
2511 +msgstr "git am [<選項>] (--continue | --skip | --abort)"
2512
2455 -#: commit.c:1516
2456 -msgid ""
2457 -"Warning: commit message did not conform to UTF-8.\n"
2458 -"You may want to amend it after fixing the message, or set the config\n"
2459 -"variable i18n.commitencoding to the encoding your project uses.\n"
2460 -msgstr ""
2461 -"警告：提交說明不符合 UTF-8 字元編碼。\n"
2462 -"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
2463 -"設定為您項目所用的字元編碼。\n"
2513 +#: builtin/am.c
2514 +msgid "run interactively"
2515 +msgstr "以互動式方式執行"
2516
2465 -#: compat/obstack.c:406 compat/obstack.c:408
2466 -msgid "memory exhausted"
2467 -msgstr "記憶體耗盡"
2517 +#: builtin/am.c
2518 +msgid "historical option -- no-op"
2519 +msgstr "老的參數 —— 無作用"
2520
2469 -#: compat/terminal.c:167
2470 -msgid "cannot resume in the background, please use 'fg' to resume"
2471 -msgstr "無法在背景繼續；請使用 “fg” 繼續"
2521 +#: builtin/am.c
2522 +msgid "allow fall back on 3way merging if needed"
2523 +msgstr "如果必要，允許使用三方合併"
2524
2473 -#: compat/terminal.c:168
2474 -msgid "cannot restore terminal settings"
2475 -msgstr "無法復原終端機設定"
2525 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c
2526 +#: builtin/stash.c
2527 +msgid "be quiet"
2528 +msgstr "靜默模式"
2529
2477 -#: config.c:143
2478 -#, c-format
2479 -msgid ""
2480 -"exceeded maximum include depth (%d) while including\n"
2481 -"\t%s\n"
2482 -"from\n"
2483 -"\t%s\n"
2484 -"This might be due to circular includes."
2485 -msgstr ""
2486 -"超過了最大包含深度（%1$d），當從\n"
2487 -"\t%3$s\n"
2488 -"包含\n"
2489 -"\t%2$s\n"
2490 -"這可能是因為循環包含。"
2491 -
2492 -#: config.c:159
2493 -#, c-format
2494 -msgid "could not expand include path '%s'"
2495 -msgstr "無法展開包含路徑 '%s'"
2530 +#: builtin/am.c
2531 +msgid "add a Signed-off-by trailer to the commit message"
2532 +msgstr "在提交說明結尾加入 Signed-off-by"
2533
2497 -#: config.c:170
2498 -msgid "relative config includes must come from files"
2499 -msgstr "相對路徑的設定檔案引用必須來自於檔案"
2534 +#: builtin/am.c
2535 +msgid "recode into utf8 (default)"
2536 +msgstr "使用 utf8 字元集（預設）"
2537
2501 -#: config.c:219
2502 -msgid "relative config include conditionals must come from files"
2503 -msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
2538 +#: builtin/am.c
2539 +msgid "pass -k flag to git-mailinfo"
2540 +msgstr "向 git-mailinfo 傳遞 -k 參數"
2541
2505 -#: config.c:364
2506 -msgid ""
2507 -"remote URLs cannot be configured in file directly or indirectly included by "
2508 -"includeIf.hasconfig:remote.*.url"
2509 -msgstr ""
2510 -"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*."
2511 -"url 引入"
2542 +#: builtin/am.c
2543 +msgid "pass -b flag to git-mailinfo"
2544 +msgstr "向 git-mailinfo 傳遞 -b 參數"
2545
2513 -#: config.c:508
2514 -#, c-format
2515 -msgid "invalid config format: %s"
2516 -msgstr "無效的設定檔格式：%s"
2546 +#: builtin/am.c
2547 +msgid "pass -m flag to git-mailinfo"
2548 +msgstr "向 git-mailinfo 傳遞 -m 參數"
2549
2518 -#: config.c:512
2519 -#, c-format
2520 -msgid "missing environment variable name for configuration '%.*s'"
2521 -msgstr "缺少「%.*s」組態設定的環境變數名稱"
2550 +#: builtin/am.c
2551 +msgid "pass --keep-cr flag to git-mailsplit for mbox format"
2552 +msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
2553
2523 -#: config.c:517
2524 -#, c-format
2525 -msgid "missing environment variable '%s' for configuration '%.*s'"
2526 -msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
2554 +#: builtin/am.c
2555 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
2556 +msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
2557
2528 -#: config.c:553
2529 -#, c-format
2530 -msgid "key does not contain a section: %s"
2531 -msgstr "鍵名沒有包含一個小節名稱：%s"
2558 +#: builtin/am.c
2559 +msgid "strip everything before a scissors line"
2560 +msgstr "捨棄裁切線前的所有內容"
2561
2533 -#: config.c:558
2534 -#, c-format
2535 -msgid "key does not contain variable name: %s"
2536 -msgstr "鍵名沒有包含變數名：%s"
2562 +#: builtin/am.c
2563 +msgid "pass it through git-mailinfo"
2564 +msgstr "透過 git-mailinfo 傳遞"
2565
2538 -#: config.c:580 sequencer.c:2802
2539 -#, c-format
2540 -msgid "invalid key: %s"
2541 -msgstr "無效鍵名：%s"
2566 +#: builtin/am.c
2567 +msgid "pass it through git-apply"
2568 +msgstr "傳遞給 git-apply"
2569
2543 -#: config.c:585
2544 -#, c-format
2545 -msgid "invalid key (newline): %s"
2546 -msgstr "無效鍵名（有換行符號）：%s"
2570 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c
2571 +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c
2572 +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h
2573 +msgid "n"
2574 +msgstr "n"
2575
2548 -#: config.c:605
2549 -msgid "empty config key"
2550 -msgstr "空白設定鍵"
2576 +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2577 +#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2578 +#: builtin/verify-tag.c
2579 +msgid "format"
2580 +msgstr "格式"
2581
2552 -#: config.c:623 config.c:635
2553 -#, c-format
2554 -msgid "bogus config parameter: %s"
2555 -msgstr "偽設定參數：%s"
2582 +#: builtin/am.c
2583 +msgid "format the patch(es) are in"
2584 +msgstr "修補檔的格式"
2585
2557 -#: config.c:649 config.c:666 config.c:673 config.c:682
2558 -#, c-format
2559 -msgid "bogus format in %s"
2560 -msgstr "%s 中格式錯誤"
2586 +#: builtin/am.c
2587 +msgid "override error message when patch failure occurs"
2588 +msgstr "打修補檔失敗時顯示的錯誤訊息"
2589
2562 -#: config.c:716
2563 -#, c-format
2564 -msgid "bogus count in %s"
2565 -msgstr "%s 中有偽計數"
2590 +#: builtin/am.c
2591 +msgid "continue applying patches after resolving a conflict"
2592 +msgstr "衝突解決後繼續套用修補檔"
2593
2567 -#: config.c:720
2568 -#, c-format
2569 -msgid "too many entries in %s"
2570 -msgstr "%s 中的項目過多"
2594 +#: builtin/am.c
2595 +msgid "synonyms for --continue"
2596 +msgstr "和 --continue 同義"
2597
2572 -#: config.c:730
2573 -#, c-format
2574 -msgid "missing config key %s"
2575 -msgstr "缺少 %s 設定鍵"
2598 +#: builtin/am.c
2599 +msgid "skip the current patch"
2600 +msgstr "略過目前修補檔"
2601
2577 -#: config.c:738
2578 -#, c-format
2579 -msgid "missing config value %s"
2580 -msgstr "缺少 %s 設定值"
2602 +#: builtin/am.c
2603 +msgid "restore the original branch and abort the patching operation"
2604 +msgstr "還原原始分支並中止修補動作"
2605
2582 -#: config.c:1089
2583 -#, c-format
2584 -msgid "bad config line %d in blob %s"
2585 -msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
2606 +#: builtin/am.c
2607 +msgid "abort the patching operation but keep HEAD where it is"
2608 +msgstr "終止修補動作但保持 HEAD 不變"
2609
2587 -#: config.c:1093
2588 -#, c-format
2589 -msgid "bad config line %d in file %s"
2590 -msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
2610 +#: builtin/am.c
2611 +msgid "show the patch being applied"
2612 +msgstr "顯示正在套用的修補檔"
2613
2592 -#: config.c:1097
2593 -#, c-format
2594 -msgid "bad config line %d in standard input"
2595 -msgstr "標準輸入中錯誤的設定行 %d"
2614 +#: builtin/am.c
2615 +msgid "record the empty patch as an empty commit"
2616 +msgstr "將空白修補檔錄製為空白提交"
2617
2597 -#: config.c:1101
2598 -#, c-format
2599 -msgid "bad config line %d in submodule-blob %s"
2600 -msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
2618 +#: builtin/am.c
2619 +msgid "lie about committer date"
2620 +msgstr "將作者日期作為提交日期"
2621
2602 -#: config.c:1105
2603 -#, c-format
2604 -msgid "bad config line %d in command line %s"
2605 -msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
2622 +#: builtin/am.c
2623 +msgid "use current timestamp for author date"
2624 +msgstr "用目前時間作為作者日期"
2625
2607 -#: config.c:1109
2608 -#, c-format
2609 -msgid "bad config line %d in %s"
2610 -msgstr "在 %2$s 中錯誤的設定行 %1$d"
2626 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c
2627 +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c
2628 +msgid "key-id"
2629 +msgstr "key-id"
2630
2612 -#: config.c:1246
2613 -msgid "out of range"
2614 -msgstr "超出範圍"
2631 +#: builtin/am.c builtin/rebase.c
2632 +msgid "GPG-sign commits"
2633 +msgstr "使用 GPG 簽名提交"
2634
2616 -#: config.c:1246
2617 -msgid "invalid unit"
2618 -msgstr "無效的單位"
2635 +#: builtin/am.c
2636 +msgid "how to handle empty patches"
2637 +msgstr "空白修補檔的處理方式"
2638
2620 -#: config.c:1247
2621 -#, c-format
2622 -msgid "bad numeric config value '%s' for '%s': %s"
2623 -msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
2639 +#: builtin/am.c
2640 +msgid "(internal use for git-rebase)"
2641 +msgstr "（內部使用，用於 git-rebase）"
2642
2625 -#: config.c:1257
2626 -#, c-format
2627 -msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2628 -msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2643 +#: builtin/am.c
2644 +msgid ""
2645 +"The -b/--binary option has been a no-op for long time, and\n"
2646 +"it will be removed. Please do not use it anymore."
2647 +msgstr ""
2648 +"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
2649 +"請不要再使用它了。"
2650
2630 -#: config.c:1260
2631 -#, c-format
2632 -msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2633 -msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2651 +#: builtin/am.c
2652 +msgid "failed to read the index"
2653 +msgstr "讀取索引失敗"
2654
2635 -#: config.c:1263
2655 +#: builtin/am.c
2656 #, c-format
2637 -msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2638 -msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
2657 +msgid "previous rebase directory %s still exists but mbox given."
2658 +msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
2659
2640 -#: config.c:1266
2660 +#: builtin/am.c
2661 #, c-format
2642 -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2643 -msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2662 +msgid ""
2663 +"Stray %s directory found.\n"
2664 +"Use \"git am --abort\" to remove it."
2665 +msgstr ""
2666 +"發現了錯誤的 %s 目錄。\n"
2667 +"使用 \"git am --abort\" 刪除它。"
2668
2645 -#: config.c:1269
2646 -#, c-format
2647 -msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2648 -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2669 +#: builtin/am.c
2670 +msgid "Resolve operation not in progress, we are not resuming."
2671 +msgstr "解決動作未進行，我們不會繼續。"
2672
2650 -#: config.c:1272
2651 -#, c-format
2652 -msgid "bad numeric config value '%s' for '%s' in %s: %s"
2653 -msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2673 +#: builtin/am.c
2674 +msgid "interactive mode requires patches on the command line"
2675 +msgstr "互動式模式需要指令列上提供修補檔"
2676
2655 -#: config.c:1368
2656 -#, c-format
2657 -msgid "invalid value for variable %s"
2658 -msgstr "%s 變數的值無效"
2677 +#: builtin/apply.c
2678 +msgid "git apply [<options>] [<patch>...]"
2679 +msgstr "git apply [<選項>] [<修補檔>...]"
2680
2660 -#: config.c:1389
2661 -#, c-format
2662 -msgid "ignoring unknown core.fsync component '%s'"
2663 -msgstr "忽略未知的 core.fsync 組件「%s」"
2681 +#: builtin/archive.c contrib/scalar/scalar.c
2682 +msgid "could not redirect output"
2683 +msgstr "不能重定向輸出"
2684
2665 -#: config.c:1425
2666 -#, c-format
2667 -msgid "bad boolean config value '%s' for '%s'"
2668 -msgstr "「%2$s」的「%1$s」布林設定值無效"
2685 +#: builtin/archive.c
2686 +msgid "git archive: Remote with no URL"
2687 +msgstr "git archive：未提供遠端 URL"
2688
2670 -#: config.c:1443
2671 -#, c-format
2672 -msgid "failed to expand user dir in: '%s'"
2673 -msgstr "無法展開使用者目錄於：’%s’"
2689 +#: builtin/archive.c
2690 +msgid "git archive: expected ACK/NAK, got a flush packet"
2691 +msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包"
2692
2675 -#: config.c:1452
2693 +#: builtin/archive.c
2694 #, c-format
2677 -msgid "'%s' for '%s' is not a valid timestamp"
2678 -msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
2695 +msgid "git archive: NACK %s"
2696 +msgstr "git archive：NACK %s"
2697
2680 -#: config.c:1545
2681 -#, c-format
2682 -msgid "abbrev length out of range: %d"
2683 -msgstr "縮寫長度超出範圍：%d"
2698 +#: builtin/archive.c
2699 +msgid "git archive: protocol error"
2700 +msgstr "git archive：協定錯誤"
2701
2685 -#: config.c:1559 config.c:1570
2686 -#, c-format
2687 -msgid "bad zlib compression level %d"
2688 -msgstr "錯誤的 zlib 壓縮級別 %d"
2702 +#: builtin/archive.c
2703 +msgid "git archive: expected a flush"
2704 +msgstr "git archive：應有一個 flush 包"
2705
2690 -#: config.c:1660
2691 -msgid "core.commentChar should only be one character"
2692 -msgstr "core.commentChar 應該是一個字元"
2706 +#: builtin/bisect--helper.c
2707 +msgid "git bisect--helper --bisect-reset [<commit>]"
2708 +msgstr "git bisect--helper --bisect-reset [<提交>]"
2709
2694 -#: config.c:1692
2695 -#, c-format
2696 -msgid "ignoring unknown core.fsyncMethod value '%s'"
2697 -msgstr "忽略未知的 core.fsyncMethod 值「%s」"
2710 +#: builtin/bisect--helper.c
2711 +msgid ""
2712 +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
2713 +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2714 +"[<paths>...]"
2715 +msgstr ""
2716 +"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"
2717 +"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"
2718
2699 -#: config.c:1698
2700 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2701 -msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
2719 +#: builtin/bisect--helper.c
2720 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
2721 +msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"
2722
2703 -#: config.c:1714
2704 -#, c-format
2705 -msgid "invalid mode for object creation: %s"
2706 -msgstr "無效的物件建立模式：%s"
2723 +#: builtin/bisect--helper.c
2724 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
2725 +msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]"
2726
2708 -#: config.c:1800
2709 -#, c-format
2710 -msgid "malformed value for %s"
2711 -msgstr "%s 的取值格式錯誤"
2727 +#: builtin/bisect--helper.c
2728 +msgid "git bisect--helper --bisect-replay <filename>"
2729 +msgstr "git bisect--helper --bisect-replay <檔名>"
2730
2713 -#: config.c:1826
2714 -#, c-format
2715 -msgid "malformed value for %s: %s"
2716 -msgstr "%s 的取值格式錯誤：%s"
2731 +#: builtin/bisect--helper.c
2732 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
2733 +msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
2734
2718 -#: config.c:1827
2719 -msgid "must be one of nothing, matching, simple, upstream or current"
2720 -msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
2735 +#: builtin/bisect--helper.c
2736 +msgid "git bisect--helper --bisect-run <cmd>..."
2737 +msgstr "git bisect--helper --bisect-run <cmd>..."
2738
2722 -#: config.c:1888 builtin/pack-objects.c:4078
2739 +#: builtin/bisect--helper.c
2740 #, c-format
2724 -msgid "bad pack compression level %d"
2725 -msgstr "錯誤的打包壓縮級別 %d"
2741 +msgid "cannot open file '%s' in mode '%s'"
2742 +msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"
2743
2727 -#: config.c:2014
2744 +#: builtin/bisect--helper.c
2745 #, c-format
2729 -msgid "unable to load config blob object '%s'"
2730 -msgstr "無法從資料物件 '%s' 載入設定"
2746 +msgid "could not write to file '%s'"
2747 +msgstr "無法寫入 '%s' 檔案"
2748
2732 -#: config.c:2017
2749 +#: builtin/bisect--helper.c
2750 #, c-format
2734 -msgid "reference '%s' does not point to a blob"
2735 -msgstr "引用 '%s' 沒有指向一個資料物件"
2751 +msgid "cannot open file '%s' for reading"
2752 +msgstr "無法開啟「%s」檔案進行讀取"
2753
2737 -#: config.c:2035
2754 +#: builtin/bisect--helper.c
2755 #, c-format
2739 -msgid "unable to resolve config blob '%s'"
2740 -msgstr "不能解析設定物件 '%s'"
2756 +msgid "'%s' is not a valid term"
2757 +msgstr "'%s' 不是一個有效的術語"
2758
2742 -#: config.c:2080
2759 +#: builtin/bisect--helper.c
2760 #, c-format
2744 -msgid "failed to parse %s"
2745 -msgstr "解析 %s 失敗"
2761 +msgid "can't use the builtin command '%s' as a term"
2762 +msgstr "不能使用內建指令 '%s' 作為術語"
2763
2747 -#: config.c:2136
2748 -msgid "unable to parse command-line config"
2749 -msgstr "無法解析指令列中的設定"
2764 +#: builtin/bisect--helper.c
2765 +#, c-format
2766 +msgid "can't change the meaning of the term '%s'"
2767 +msgstr "不能修改術語 '%s' 的含義"
2768
2751 -#: config.c:2512
2752 -msgid "unknown error occurred while reading the configuration files"
2753 -msgstr "在讀取設定檔案時遇到未知錯誤"
2769 +#: builtin/bisect--helper.c
2770 +msgid "please use two different terms"
2771 +msgstr "請使用兩個不同的術語"
2772
2755 -#: config.c:2686
2773 +#: builtin/bisect--helper.c
2774 #, c-format
2757 -msgid "Invalid %s: '%s'"
2758 -msgstr "無效 %s：'%s'"
2775 +msgid "We are not bisecting.\n"
2776 +msgstr "我們沒有在二分搜尋。\n"
2777
2760 -#: config.c:2731
2778 +#: builtin/bisect--helper.c
2779 #, c-format
2762 -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2763 -msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
2780 +msgid "'%s' is not a valid commit"
2781 +msgstr "'%s' 不是一個有效的提交"
2782
2765 -#: config.c:2763
2783 +#: builtin/bisect--helper.c
2784 #, c-format
2767 -msgid "unable to parse '%s' from command-line config"
2768 -msgstr "無法解析指令列設定中的 '%s'"
2785 +msgid ""
2786 +"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
2787 +msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
2788
2770 -#: config.c:2765
2789 +#: builtin/bisect--helper.c
2790 #, c-format
2772 -msgid "bad config variable '%s' in file '%s' at line %d"
2773 -msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
2791 +msgid "Bad bisect_write argument: %s"
2792 +msgstr "壞的 bisect_write 參數：%s"
2793
2775 -#: config.c:2850
2794 +#: builtin/bisect--helper.c
2795 #, c-format
2777 -msgid "invalid section name '%s'"
2778 -msgstr "無效的小節名稱 '%s'"
2796 +msgid "couldn't get the oid of the rev '%s'"
2797 +msgstr "無法取得版本 '%s' 的物件 ID"
2798
2780 -#: config.c:2882
2799 +#: builtin/bisect--helper.c
2800 #, c-format
2782 -msgid "%s has multiple values"
2783 -msgstr "%s 有多個取值"
2801 +msgid "couldn't open the file '%s'"
2802 +msgstr "無法開啟檔案 '%s'"
2803
2785 -#: config.c:2911
2804 +#: builtin/bisect--helper.c
2805 #, c-format
2787 -msgid "failed to write new configuration file %s"
2788 -msgstr "寫入新的設定檔案 %s 失敗"
2806 +msgid "Invalid command: you're currently in a %s/%s bisect"
2807 +msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"
2808
2790 -#: config.c:3177 config.c:3518
2809 +#: builtin/bisect--helper.c
2810 #, c-format
2792 -msgid "could not lock config file %s"
2793 -msgstr "不能鎖定設定檔案 %s"
2811 +msgid ""
2812 +"You need to give me at least one %s and %s revision.\n"
2813 +"You can use \"git bisect %s\" and \"git bisect %s\" for that."
2814 +msgstr ""
2815 +"您需要給我至少一個 %s 和一個 %s 版本。\n"
2816 +"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
2817
2795 -#: config.c:3188
2818 +#: builtin/bisect--helper.c
2819 #, c-format
2797 -msgid "opening %s"
2798 -msgstr "開啟 %s"
2820 +msgid ""
2821 +"You need to start by \"git bisect start\".\n"
2822 +"You then need to give me at least one %s and %s revision.\n"
2823 +"You can use \"git bisect %s\" and \"git bisect %s\" for that."
2824 +msgstr ""
2825 +"您需要執行 \"git bisect start\" 來開始。\n"
2826 +"然後需要提供我至少一個 %s 和一個 %s 版本。\n"
2827 +"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
2828
2800 -#: config.c:3225 builtin/config.c:361
2829 +#: builtin/bisect--helper.c
2830 #, c-format
2802 -msgid "invalid pattern: %s"
2803 -msgstr "無效模式：%s"
2831 +msgid "bisecting only with a %s commit"
2832 +msgstr "在只有一個 %s 提交的情況下二分搜尋"
2833
2805 -#: config.c:3250
2806 -#, c-format
2807 -msgid "invalid config file %s"
2808 -msgstr "無效的設定檔案 %s"
2834 +# 譯者：請維持句尾空格
2835 +#. TRANSLATORS: Make sure to include [Y] and [n] in your
2836 +#. translation. The program will only accept English input
2837 +#. at this point.
2838 +#.
2839 +#: builtin/bisect--helper.c
2840 +msgid "Are you sure [Y/n]? "
2841 +msgstr "您確認嗎[Y/n]？ "
2842
2810 -#: config.c:3263 config.c:3531
2811 -#, c-format
2812 -msgid "fstat on %s failed"
2813 -msgstr "對 %s 呼叫 fstat 失敗"
2843 +#: builtin/bisect--helper.c
2844 +msgid "status: waiting for both good and bad commits\n"
2845 +msgstr "狀態：正在等待好和壞的提交\n"
2846
2815 -#: config.c:3274
2847 +#: builtin/bisect--helper.c
2848 #, c-format
2817 -msgid "unable to mmap '%s'%s"
2818 -msgstr "無法 mmap '%s'%s"
2849 +msgid "status: waiting for bad commit, %d good commit known\n"
2850 +msgid_plural "status: waiting for bad commit, %d good commits known\n"
2851 +msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n"
2852
2820 -#: config.c:3284 config.c:3536
2821 -#, c-format
2822 -msgid "chmod on %s failed"
2823 -msgstr "對 %s 呼叫 chmod 失敗"
2853 +#: builtin/bisect--helper.c
2854 +msgid "status: waiting for good commit(s), bad commit known\n"
2855 +msgstr "狀態：正在等待好的提交，已知有壞的提交\n"
2856
2825 -#: config.c:3369 config.c:3633
2826 -#, c-format
2827 -msgid "could not write config file %s"
2828 -msgstr "不能寫入設定檔案 %s"
2857 +#: builtin/bisect--helper.c
2858 +msgid "no terms defined"
2859 +msgstr "未定義術語"
2860
2830 -#: config.c:3403
2861 +#: builtin/bisect--helper.c
2862 #, c-format
2832 -msgid "could not set '%s' to '%s'"
2833 -msgstr "不能設定 '%s' 為 '%s'"
2863 +msgid ""
2864 +"Your current terms are %s for the old state\n"
2865 +"and %s for the new state.\n"
2866 +msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n"
2867
2835 -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2868 +#: builtin/bisect--helper.c
2869 #, c-format
2837 -msgid "could not unset '%s'"
2838 -msgstr "不能取消設定 '%s'"
2870 +msgid ""
2871 +"invalid argument %s for 'git bisect terms'.\n"
2872 +"Supported options are: --term-good|--term-old and --term-bad|--term-new."
2873 +msgstr ""
2874 +"指令 'git bisect terms' 的參數 %s 無效。\n"
2875 +"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
2876
2840 -#: config.c:3509
2841 -#, c-format
2842 -msgid "invalid section name: %s"
2843 -msgstr "無效的小節名稱：%s"
2877 +#: builtin/bisect--helper.c
2878 +msgid "revision walk setup failed\n"
2879 +msgstr "版本遍歷設定失敗\n"
2880
2845 -#: config.c:3676
2881 +#: builtin/bisect--helper.c
2882 #, c-format
2847 -msgid "missing value for '%s'"
2848 -msgstr "%s 的取值缺少"
2849 -
2850 -#: connect.c:61
2851 -msgid "the remote end hung up upon initial contact"
2852 -msgstr "遠端在初始連線時即掛斷"
2883 +msgid "could not open '%s' for appending"
2884 +msgstr "無法開啟 '%s' 進行附加"
2885
2854 -#: connect.c:63
2855 -msgid ""
2856 -"Could not read from remote repository.\n"
2857 -"\n"
2858 -"Please make sure you have the correct access rights\n"
2859 -"and the repository exists."
2860 -msgstr ""
2861 -"無法讀取遠端版本庫。\n"
2862 -"\n"
2863 -"請確認您有正確的存取權限並且版本庫存在。"
2886 +#: builtin/bisect--helper.c
2887 +msgid "'' is not a valid term"
2888 +msgstr "'' 不是一個有效的術語"
2889
2865 -#: connect.c:81
2890 +#: builtin/bisect--helper.c
2891 #, c-format
2867 -msgid "server doesn't support '%s'"
2868 -msgstr "伺服器不支援 '%s'"
2892 +msgid "unrecognized option: '%s'"
2893 +msgstr "未識別的選項：'%s'"
2894
2870 -#: connect.c:118
2895 +#: builtin/bisect--helper.c
2896 #, c-format
2872 -msgid "server doesn't support feature '%s'"
2873 -msgstr "伺服器不支援特性 '%s'"
2897 +msgid "'%s' does not appear to be a valid revision"
2898 +msgstr "'%s' 看起來不是一個有效的版本"
2899
2875 -#: connect.c:129
2876 -msgid "expected flush after capabilities"
2877 -msgstr "在能力之後應為一個 flush 包"
2900 +#: builtin/bisect--helper.c
2901 +msgid "bad HEAD - I need a HEAD"
2902 +msgstr "壞的 HEAD - 我需要一個 HEAD"
2903
2879 -#: connect.c:265
2904 +#: builtin/bisect--helper.c
2905 #, c-format
2881 -msgid "ignoring capabilities after first line '%s'"
2882 -msgstr "忽略第一行 '%s' 之後的能力欄位"
2906 +msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
2907 +msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
2908
2884 -#: connect.c:286
2885 -msgid "protocol error: unexpected capabilities^{}"
2886 -msgstr "協定錯誤：意外的 capabilities^{}"
2909 +#: builtin/bisect--helper.c
2910 +msgid "won't bisect on cg-seek'ed tree"
2911 +msgstr "不會在做了 cg-seek 的樹上做二分搜尋"
2912 +
2913 +#: builtin/bisect--helper.c
2914 +msgid "bad HEAD - strange symbolic ref"
2915 +msgstr "壞的 HEAD - 奇怪的符號引用"
2916
2888 -#: connect.c:308
2917 +#: builtin/bisect--helper.c
2918 #, c-format
2890 -msgid "protocol error: expected shallow sha-1, got '%s'"
2891 -msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"
2919 +msgid "invalid ref: '%s'"
2920 +msgstr "無效的引用：'%s'"
2921
2893 -#: connect.c:310
2894 -msgid "repository on the other end cannot be shallow"
2895 -msgstr "另一端的版本庫不能是淺複製版本庫"
2922 +#: builtin/bisect--helper.c
2923 +msgid "You need to start by \"git bisect start\"\n"
2924 +msgstr "您需要執行 \"git bisect start\" 來開始\n"
2925
2897 -#: connect.c:349
2898 -msgid "invalid packet"
2899 -msgstr "無效封包"
2926 +# 譯者：請維持句尾空格
2927 +#. TRANSLATORS: Make sure to include [Y] and [n] in your
2928 +#. translation. The program will only accept English input
2929 +#. at this point.
2930 +#.
2931 +#: builtin/bisect--helper.c
2932 +msgid "Do you want me to do it for you [Y/n]? "
2933 +msgstr "您想讓我為您這樣做嗎[Y/n]？ "
2934
2901 -#: connect.c:369
2902 -#, c-format
2903 -msgid "protocol error: unexpected '%s'"
2904 -msgstr "協定錯誤：意外的 '%s'"
2935 +#: builtin/bisect--helper.c
2936 +msgid "Please call `--bisect-state` with at least one argument"
2937 +msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"
2938
2906 -#: connect.c:499
2939 +#: builtin/bisect--helper.c
2940 #, c-format
2908 -msgid "unknown object format '%s' specified by server"
2909 -msgstr "伺服器指定的「%s」物件格式無效"
2941 +msgid "'git bisect %s' can take only one argument."
2942 +msgstr "'git bisect %s' 只能有一個參數。"
2943
2911 -#: connect.c:528
2944 +#: builtin/bisect--helper.c
2945 #, c-format
2913 -msgid "invalid ls-refs response: %s"
2914 -msgstr "無效的 ls-refs 回應：%s"
2915 -
2916 -#: connect.c:532
2917 -msgid "expected flush after ref listing"
2918 -msgstr "在引用列表之後應該有一個 flush 包"
2919 -
2920 -#: connect.c:535
2921 -msgid "expected response end packet after ref listing"
2922 -msgstr "在引用列表後預期要有回應結束封包"
2946 +msgid "Bad rev input: %s"
2947 +msgstr "<修訂版> 輸入格式錯誤：%s"
2948
2924 -#: connect.c:670
2949 +#: builtin/bisect--helper.c
2950 #, c-format
2926 -msgid "protocol '%s' is not supported"
2927 -msgstr "不支援 '%s' 協定"
2951 +msgid "Bad rev input (not a commit): %s"
2952 +msgstr "修訂版輸入有誤（不是提交）：%s"
2953
2929 -#: connect.c:721
2930 -msgid "unable to set SO_KEEPALIVE on socket"
2931 -msgstr "無法為 socket 設定 SO_KEEPALIVE"
2954 +#: builtin/bisect--helper.c
2955 +msgid "We are not bisecting."
2956 +msgstr "我們沒有在二分搜尋。"
2957
2933 -#: connect.c:761 connect.c:824
2958 +#: builtin/bisect--helper.c
2959 #, c-format
2935 -msgid "Looking up %s ... "
2936 -msgstr "尋找 %s ... "
2960 +msgid "'%s'?? what are you talking about?"
2961 +msgstr "「%s」？？您在說什麼？"
2962
2938 -#: connect.c:765
2963 +#: builtin/bisect--helper.c
2964 #, c-format
2940 -msgid "unable to look up %s (port %s) (%s)"
2941 -msgstr "無法尋找 %s（埠 %s）（%s）"
2965 +msgid "cannot read file '%s' for replaying"
2966 +msgstr "無法讀取「%s」檔案來重放"
2967
2943 -#. TRANSLATORS: this is the end of "Looking up %s ... "
2944 -#: connect.c:769 connect.c:840
2968 +#: builtin/bisect--helper.c
2969 #, c-format
2946 -msgid ""
2947 -"done.\n"
2948 -"Connecting to %s (port %s) ... "
2949 -msgstr ""
2950 -"完成。\n"
2951 -"連線到 %s（埠 %s）... "
2970 +msgid "running %s\n"
2971 +msgstr "正在執行 %s\n"
2972 +
2973 +#: builtin/bisect--helper.c
2974 +msgid "bisect run failed: no command provided."
2975 +msgstr "二分搜尋執行失敗：沒有提供指令。"
2976
2953 -#: connect.c:791 connect.c:868
2977 +#: builtin/bisect--helper.c
2978 #, c-format
2955 -msgid ""
2956 -"unable to connect to %s:\n"
2957 -"%s"
2958 -msgstr ""
2959 -"無法連線到 %s：\n"
2960 -"%s"
2979 +msgid "unable to verify '%s' on good revision"
2980 +msgstr "無法在正確修訂版上驗證「%s」"
2981
2962 -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
2963 -#: connect.c:797 connect.c:874
2964 -msgid "done."
2965 -msgstr "完成。"
2982 +#: builtin/bisect--helper.c
2983 +#, c-format
2984 +msgid "bogus exit code %d for good revision"
2985 +msgstr "正確修訂版回傳偽造的錯誤代碼 %d"
2986
2967 -#: connect.c:828
2987 +#: builtin/bisect--helper.c
2988 #, c-format
2969 -msgid "unable to look up %s (%s)"
2970 -msgstr "無法尋找 %s（%s）"
2989 +msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
2990 +msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128"
2991
2972 -#: connect.c:834
2992 +#: builtin/bisect--helper.c
2993 #, c-format
2974 -msgid "unknown port %s"
2975 -msgstr "未知埠 %s"
2994 +msgid "cannot open file '%s' for writing"
2995 +msgstr "無法開啟「%s」檔案進行寫入"
2996
2977 -#: connect.c:971 connect.c:1303
2997 +#: builtin/bisect--helper.c
2998 +msgid "bisect run cannot continue any more"
2999 +msgstr "二分搜尋不能繼續執行"
3000 +
3001 +#: builtin/bisect--helper.c
3002 #, c-format
2979 -msgid "strange hostname '%s' blocked"
2980 -msgstr "已阻止奇怪的主機名稱 '%s'"
3003 +msgid "bisect run success"
3004 +msgstr "二分搜尋執行成功"
3005
2982 -#: connect.c:973
3006 +#: builtin/bisect--helper.c
3007 #, c-format
2984 -msgid "strange port '%s' blocked"
2985 -msgstr "已阻止奇怪的埠號 '%s'"
3008 +msgid "bisect found first bad commit"
3009 +msgstr "二分搜尋發現到第一個有問題的提交"
3010
2987 -#: connect.c:983
3011 +#: builtin/bisect--helper.c
3012 #, c-format
2989 -msgid "cannot start proxy %s"
2990 -msgstr "不能啟動代理 %s"
3013 +msgid ""
3014 +"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
3015 +"code %d"
3016 +msgstr ""
3017 +"二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開"
3018
2992 -#: connect.c:1054
2993 -msgid "no path specified; see 'git help pull' for valid url syntax"
2994 -msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
3019 +#: builtin/bisect--helper.c
3020 +msgid "reset the bisection state"
3021 +msgstr "清除二分搜尋狀態"
3022
2996 -#: connect.c:1194
2997 -msgid "newline is forbidden in git:// hosts and repo paths"
2998 -msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
3023 +#: builtin/bisect--helper.c
3024 +msgid "check whether bad or good terms exist"
3025 +msgstr "檢查壞的或好的術語是否存在"
3026
3000 -#: connect.c:1251
3001 -msgid "ssh variant 'simple' does not support -4"
3002 -msgstr "ssh 變體 'simple' 不支援 -4"
3027 +#: builtin/bisect--helper.c
3028 +msgid "print out the bisect terms"
3029 +msgstr "列印二分搜尋術語"
3030
3004 -#: connect.c:1263
3005 -msgid "ssh variant 'simple' does not support -6"
3006 -msgstr "ssh 變體 'simple' 不支援 -6"
3031 +#: builtin/bisect--helper.c
3032 +msgid "start the bisect session"
3033 +msgstr "啟動二分搜尋過程"
3034
3008 -#: connect.c:1280
3009 -msgid "ssh variant 'simple' does not support setting port"
3010 -msgstr "ssh 變體 'simple' 不支援設定埠"
3035 +#: builtin/bisect--helper.c
3036 +msgid "find the next bisection commit"
3037 +msgstr "尋找下一個二分搜尋提交"
3038
3012 -#: connect.c:1392
3013 -#, c-format
3014 -msgid "strange pathname '%s' blocked"
3015 -msgstr "已阻止奇怪的路徑名 '%s'"
3039 +#: builtin/bisect--helper.c
3040 +msgid "mark the state of ref (or refs)"
3041 +msgstr "標記 ref (或 refs) 的狀態"
3042
3017 -#: connect.c:1440
3018 -msgid "unable to fork"
3019 -msgstr "無法 fork"
3043 +#: builtin/bisect--helper.c
3044 +msgid "list the bisection steps so far"
3045 +msgstr "列出迄今的二分搜尋步驟"
3046
3021 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
3022 -msgid "Checking connectivity"
3023 -msgstr "正在檢查連通性"
3047 +#: builtin/bisect--helper.c
3048 +msgid "replay the bisection process from the given file"
3049 +msgstr "從指定檔案重放二分搜尋過程"
3050
3025 -#: connected.c:122
3026 -msgid "Could not run 'git rev-list'"
3027 -msgstr "不能執行 'git rev-list'"
3051 +#: builtin/bisect--helper.c
3052 +msgid "skip some commits for checkout"
3053 +msgstr "略過要簽出的部分提交"
3054
3029 -#: connected.c:146
3030 -msgid "failed write to rev-list"
3031 -msgstr "寫入 rev-list 失敗"
3055 +#: builtin/bisect--helper.c
3056 +msgid "visualize the bisection"
3057 +msgstr "視覺化二分搜尋過程"
3058
3033 -#: connected.c:151
3034 -msgid "failed to close rev-list's stdin"
3035 -msgstr "關閉 rev-list 的標準輸入失敗"
3059 +#: builtin/bisect--helper.c
3060 +msgid "use <cmd>... to automatically bisect"
3061 +msgstr "使用 <cmd>... 自動進行二分搜尋"
3062
3037 -#: convert.c:183
3038 -#, c-format
3039 -msgid "illegal crlf_action %d"
3040 -msgstr "非法的 crlf_action %d"
3063 +#: builtin/bisect--helper.c
3064 +msgid "no log for BISECT_WRITE"
3065 +msgstr "BISECT_WRITE 無日誌"
3066
3042 -#: convert.c:196
3043 -#, c-format
3044 -msgid "CRLF would be replaced by LF in %s"
3045 -msgstr "%s 中的 CRLF 將被 LF 取代"
3067 +#: builtin/bisect--helper.c
3068 +msgid "--bisect-reset requires either no argument or a commit"
3069 +msgstr "--bisect-reset 無需參數或者需要一個提交"
3070
3047 -#: convert.c:198
3048 -#, c-format
3049 -msgid ""
3050 -"CRLF will be replaced by LF in %s.\n"
3051 -"The file will have its original line endings in your working directory"
3052 -msgstr ""
3053 -"%s 中的 CRLF 將被 LF 取代。\n"
3054 -"在工作區中該檔案仍保持原有的換行符號"
3071 +#: builtin/bisect--helper.c
3072 +msgid "--bisect-terms requires 0 or 1 argument"
3073 +msgstr "--bisect-terms 需要 0 或 1 個參數"
3074
3056 -#: convert.c:206
3057 -#, c-format
3058 -msgid "LF would be replaced by CRLF in %s"
3059 -msgstr "檔案 %s 中的 LF 將被 CRLF 取代"
3075 +#: builtin/bisect--helper.c
3076 +msgid "--bisect-next requires 0 arguments"
3077 +msgstr "--bisect-next 需要 0 個引數"
3078
3061 -#: convert.c:208
3062 -#, c-format
3063 -msgid ""
3064 -"LF will be replaced by CRLF in %s.\n"
3065 -"The file will have its original line endings in your working directory"
3066 -msgstr ""
3067 -"%s 中的 LF 將被 CRLF 取代。\n"
3068 -"在工作區中該檔案仍保持原有的換行符號"
3079 +#: builtin/bisect--helper.c
3080 +msgid "--bisect-log requires 0 arguments"
3081 +msgstr "--bisect-log 需要 0 個引數"
3082
3070 -#: convert.c:273
3071 -#, c-format
3072 -msgid "BOM is prohibited in '%s' if encoded as %s"
3073 -msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM"
3083 +#: builtin/bisect--helper.c
3084 +msgid "no logfile given"
3085 +msgstr "未提供日誌檔案"
3086
3075 -#: convert.c:280
3076 -#, c-format
3077 -msgid ""
3078 -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
3079 -"working-tree-encoding."
3080 -msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。"
3087 +#: builtin/blame.c
3088 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3089 +msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
3090
3082 -#: convert.c:293
3083 -#, c-format
3084 -msgid "BOM is required in '%s' if encoded as %s"
3085 -msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM"
3091 +#: builtin/blame.c
3092 +msgid "<rev-opts> are documented in git-rev-list(1)"
3093 +msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
3094
3087 -#: convert.c:295
3095 +#: builtin/blame.c
3096 #, c-format
3089 -msgid ""
3090 -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
3091 -"%sLE (depending on the byte order) as working-tree-encoding."
3092 -msgstr ""
3093 -"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"
3094 -"字節序）作為工作區編碼。"
3097 +msgid "expecting a color: %s"
3098 +msgstr "期望一個顏色：%s"
3099
3096 -#: convert.c:408 convert.c:479
3097 -#, c-format
3098 -msgid "failed to encode '%s' from %s to %s"
3099 -msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"
3100 +#: builtin/blame.c
3101 +msgid "must end with a color"
3102 +msgstr "必須以一個顏色結尾"
3103
3101 -#: convert.c:451
3104 +#: builtin/blame.c
3105 #, c-format
3103 -msgid "encoding '%s' from %s to %s and back is not the same"
3104 -msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"
3106 +msgid "cannot find revision %s to ignore"
3107 +msgstr "不能找到要忽略的版本 %s"
3108
3106 -#: convert.c:654
3107 -#, c-format
3108 -msgid "cannot fork to run external filter '%s'"
3109 -msgstr "不能 fork 以執行外部過濾器 '%s'"
3109 +#: builtin/blame.c
3110 +msgid "show blame entries as we find them, incrementally"
3111 +msgstr "增量式顯示發現的 blame 條目"
3112
3111 -#: convert.c:674
3112 -#, c-format
3113 -msgid "cannot feed the input to external filter '%s'"
3114 -msgstr "不能將輸入傳遞給外部過濾器 '%s'"
3113 +#: builtin/blame.c
3114 +msgid "do not show object names of boundary commits (Default: off)"
3115 +msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
3116
3116 -#: convert.c:681
3117 -#, c-format
3118 -msgid "external filter '%s' failed %d"
3119 -msgstr "外部過濾器 '%s' 失敗碼 %d"
3117 +#: builtin/blame.c
3118 +msgid "do not treat root commits as boundaries (Default: off)"
3119 +msgstr "不將根提交看作邊界（預設值：off）"
3120
3121 -#: convert.c:716 convert.c:719
3122 -#, c-format
3123 -msgid "read from external filter '%s' failed"
3124 -msgstr "從外部過濾器 '%s' 讀取失敗"
3121 +#: builtin/blame.c
3122 +msgid "show work cost statistics"
3123 +msgstr "顯示工作量統計"
3124
3126 -#: convert.c:722 convert.c:777
3127 -#, c-format
3128 -msgid "external filter '%s' failed"
3129 -msgstr "外部過濾器 '%s' 失敗"
3125 +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c
3126 +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c
3127 +#: builtin/push.c builtin/remote.c builtin/send-pack.c
3128 +msgid "force progress reporting"
3129 +msgstr "強制顯示進度報告"
3130
3131 -#: convert.c:826
3132 -msgid "unexpected filter type"
3133 -msgstr "意外的過濾類型"
3131 +#: builtin/blame.c
3132 +msgid "show output score for blame entries"
3133 +msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
3134
3135 -#: convert.c:837
3136 -msgid "path name too long for external filter"
3137 -msgstr "外部過濾器的路徑名太長"
3135 +#: builtin/blame.c
3136 +msgid "show original filename (Default: auto)"
3137 +msgstr "顯示原始檔案名稱（預設值：auto）"
3138
3139 -#: convert.c:935
3140 -#, c-format
3141 -msgid ""
3142 -"external filter '%s' is not available anymore although not all paths have "
3143 -"been filtered"
3144 -msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"
3139 +#: builtin/blame.c
3140 +msgid "show original linenumber (Default: off)"
3141 +msgstr "顯示原始檔案名稱（預設值：off）"
3142
3146 -#: convert.c:1236
3147 -msgid "true/false are no valid working-tree-encodings"
3148 -msgstr "true/false 不是有效的工作區編碼"
3143 +#: builtin/blame.c
3144 +msgid "show in a format designed for machine consumption"
3145 +msgstr "顯示成適合機器讀取的格式"
3146
3150 -#: convert.c:1416 convert.c:1449
3151 -#, c-format
3152 -msgid "%s: clean filter '%s' failed"
3153 -msgstr "%s：clean 過濾器 '%s' 失敗"
3147 +#: builtin/blame.c
3148 +msgid "show porcelain format with per-line commit information"
3149 +msgstr "顯示每一列適合機器的提交說明"
3150
3155 -#: convert.c:1492
3156 -#, c-format
3157 -msgid "%s: smudge filter %s failed"
3158 -msgstr "%s：smudge 過濾器 %s 失敗"
3151 +#: builtin/blame.c
3152 +msgid "use the same output mode as git-annotate (Default: off)"
3153 +msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）"
3154
3160 -#: credential.c:96
3161 -#, c-format
3162 -msgid "skipping credential lookup for key: credential.%s"
3163 -msgstr "略過鍵的憑證查詢：credential.%s"
3155 +#: builtin/blame.c
3156 +msgid "show raw timestamp (Default: off)"
3157 +msgstr "顯示原始時間戳（預設值：off）"
3158
3165 -#: credential.c:112
3166 -msgid "refusing to work with credential missing host field"
3167 -msgstr "拒絕使用缺少主機欄位的憑證"
3159 +#: builtin/blame.c
3160 +msgid "show long commit SHA1 (Default: off)"
3161 +msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
3162
3169 -#: credential.c:114
3170 -msgid "refusing to work with credential missing protocol field"
3171 -msgstr "拒絕使用缺少通訊協定欄位的憑證"
3163 +#: builtin/blame.c
3164 +msgid "suppress author name and timestamp (Default: off)"
3165 +msgstr "隱藏作者名字及時間戳（預設值：off）"
3166
3173 -#: credential.c:396
3174 -#, c-format
3175 -msgid "url contains a newline in its %s component: %s"
3176 -msgstr "URL 的 %s 部分有換行：%s"
3167 +#: builtin/blame.c
3168 +msgid "show author email instead of name (Default: off)"
3169 +msgstr "顯示作者信箱而非名稱（預設值：off）"
3170
3178 -#: credential.c:440
3179 -#, c-format
3180 -msgid "url has no scheme: %s"
3181 -msgstr "URL 沒有 Scheme：%s"
3171 +#: builtin/blame.c
3172 +msgid "ignore whitespace differences"
3173 +msgstr "忽略空白差異"
3174
3183 -#: credential.c:513
3184 -#, c-format
3185 -msgid "credential url cannot be parsed: %s"
3186 -msgstr "無法解析憑證 URL：%s"
3175 +#: builtin/blame.c builtin/log.c
3176 +msgid "rev"
3177 +msgstr "版本"
3178
3188 -#: date.c:139
3189 -msgid "in the future"
3190 -msgstr "在將來"
3179 +#: builtin/blame.c
3180 +msgid "ignore <rev> when blaming"
3181 +msgstr "在執行 blame 動作時忽略 <修訂版>"
3182
3192 -#: date.c:145
3193 -#, c-format
3194 -msgid "%<PRIuMAX> second ago"
3195 -msgid_plural "%<PRIuMAX> seconds ago"
3196 -msgstr[0] "%<PRIuMAX> 秒鐘前"
3183 +#: builtin/blame.c
3184 +msgid "ignore revisions from <file>"
3185 +msgstr "忽略 <檔案> 中的修訂版"
3186
3198 -#: date.c:152
3199 -#, c-format
3200 -msgid "%<PRIuMAX> minute ago"
3201 -msgid_plural "%<PRIuMAX> minutes ago"
3202 -msgstr[0] "%<PRIuMAX> 分鐘前"
3187 +#: builtin/blame.c
3188 +msgid "color redundant metadata from previous line differently"
3189 +msgstr "使用顏色間隔輸出與前一行不同的重複中介資料"
3190
3204 -#: date.c:159
3205 -#, c-format
3206 -msgid "%<PRIuMAX> hour ago"
3207 -msgid_plural "%<PRIuMAX> hours ago"
3208 -msgstr[0] "%<PRIuMAX> 小時前"
3191 +#: builtin/blame.c
3192 +msgid "color lines by age"
3193 +msgstr "依據時間著色"
3194
3210 -#: date.c:166
3211 -#, c-format
3212 -msgid "%<PRIuMAX> day ago"
3213 -msgid_plural "%<PRIuMAX> days ago"
3214 -msgstr[0] "%<PRIuMAX> 天前"
3195 +#: builtin/blame.c
3196 +msgid "spend extra cycles to find better match"
3197 +msgstr "循環更多次以找到更佳符合"
3198
3216 -#: date.c:172
3217 -#, c-format
3218 -msgid "%<PRIuMAX> week ago"
3219 -msgid_plural "%<PRIuMAX> weeks ago"
3220 -msgstr[0] "%<PRIuMAX> 周前"
3199 +#: builtin/blame.c
3200 +msgid "use revisions from <file> instead of calling git-rev-list"
3201 +msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
3202
3222 -#: date.c:179
3223 -#, c-format
3224 -msgid "%<PRIuMAX> month ago"
3225 -msgid_plural "%<PRIuMAX> months ago"
3226 -msgstr[0] "%<PRIuMAX> 個月前"
3203 +#: builtin/blame.c
3204 +msgid "use <file>'s contents as the final image"
3205 +msgstr "將 <檔案> 的內容當成是最終 image"
3206
3228 -#: date.c:190
3229 -#, c-format
3230 -msgid "%<PRIuMAX> year"
3231 -msgid_plural "%<PRIuMAX> years"
3232 -msgstr[0] "%<PRIuMAX> 年"
3207 +#: builtin/blame.c
3208 +msgid "score"
3209 +msgstr "得分"
3210
3234 -#. TRANSLATORS: "%s" is "<n> years"
3235 -#: date.c:193
3236 -#, c-format
3237 -msgid "%s, %<PRIuMAX> month ago"
3238 -msgid_plural "%s, %<PRIuMAX> months ago"
3239 -msgstr[0] "%s %<PRIuMAX> 個月前"
3211 +#: builtin/blame.c
3212 +msgid "find line copies within and across files"
3213 +msgstr "找到檔案內及跨檔案的複製列"
3214
3241 -#: date.c:198 date.c:203
3242 -#, c-format
3243 -msgid "%<PRIuMAX> year ago"
3244 -msgid_plural "%<PRIuMAX> years ago"
3245 -msgstr[0] "%<PRIuMAX> 年前"
3215 +#: builtin/blame.c
3216 +msgid "find line movements within and across files"
3217 +msgstr "找到檔案內及跨檔案的移動列"
3218
3247 -#: delta-islands.c:272
3248 -msgid "Propagating island marks"
3249 -msgstr "正在傳播資料島標記"
3219 +#: builtin/blame.c
3220 +msgid "range"
3221 +msgstr "range"
3222
3251 -#: delta-islands.c:290
3252 -#, c-format
3253 -msgid "bad tree object %s"
3254 -msgstr "壞的樹狀物件 %s"
3223 +#: builtin/blame.c
3224 +msgid "process only line range <start>,<end> or function :<funcname>"
3225 +msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
3226
3256 -#: delta-islands.c:334
3257 -#, c-format
3258 -msgid "failed to load island regex for '%s': %s"
3259 -msgstr "未能載入 '%s' 的資料島常規表示式：%s"
3227 +#: builtin/blame.c
3228 +msgid "--progress can't be used with --incremental or porcelain formats"
3229 +msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用"
3230
3261 -#: delta-islands.c:390
3262 -#, c-format
3263 -msgid "island regex from config has too many capture groups (max=%d)"
3264 -msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）"
3231 +#. TRANSLATORS: This string is used to tell us the
3232 +#. maximum display width for a relative timestamp in
3233 +#. "git blame" output. For C locale, "4 years, 11
3234 +#. months ago", which takes 22 places, is the longest
3235 +#. among various forms of relative timestamps, but
3236 +#. your language may need more or fewer display
3237 +#. columns.
3238 +#.
3239 +#: builtin/blame.c
3240 +msgid "4 years, 11 months ago"
3241 +msgstr "4 年 11 個月前"
3242
3266 -#: delta-islands.c:467
3243 +#: builtin/blame.c
3244 #, c-format
3268 -msgid "Marked %d islands, done.\n"
3269 -msgstr "已標記 %d 個資料島，結束。\n"
3245 +msgid "file %s has only %lu line"
3246 +msgid_plural "file %s has only %lu lines"
3247 +msgstr[0] "檔案 %s 只有 %lu 行"
3248
3271 -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3272 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
3273 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3274 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3275 -#: builtin/pull.c:47 builtin/pull.c:321
3276 -#, c-format
3277 -msgid "invalid value for '%s': '%s'"
3278 -msgstr "「%s」的值無效：「%s」"
3249 +#: builtin/blame.c
3250 +msgid "Blaming lines"
3251 +msgstr "追蹤程式碼行"
3252
3280 -#: diff-lib.c:561
3281 -msgid "--merge-base does not work with ranges"
3282 -msgstr "--merge-base 跟範圍無法搭配運作"
3253 +#: builtin/branch.c
3254 +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
3255 +msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]"
3256
3284 -#: diff-lib.c:563
3285 -msgid "--merge-base only works with commits"
3286 -msgstr "--merge-base 只能跟提交搭配才能運作"
3257 +#: builtin/branch.c
3258 +msgid ""
3259 +"git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-"
3260 +"point>]"
3261 +msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]"
3262
3288 -#: diff-lib.c:580
3289 -msgid "unable to get HEAD"
3290 -msgstr "不能取得 HEAD"
3263 +#: builtin/branch.c
3264 +msgid "git branch [<options>] [-l] [<pattern>...]"
3265 +msgstr "git branch [<選項>] [-l] [<模式>...]"
3266
3292 -#: diff-lib.c:587
3293 -msgid "no merge base found"
3294 -msgstr "找不到合併基底"
3267 +#: builtin/branch.c
3268 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
3269 +msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..."
3270
3296 -#: diff-lib.c:589
3297 -msgid "multiple merge bases found"
3298 -msgstr "找到多個合併基底"
3271 +#: builtin/branch.c
3272 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
3273 +msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>"
3274
3300 -#: diff-no-index.c:237
3301 -msgid "git diff --no-index [<options>] <path> <path>"
3302 -msgstr "git diff --no-index [<選項>] <路徑> <路徑>"
3275 +#: builtin/branch.c
3276 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
3277 +msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>"
3278
3304 -#: diff-no-index.c:262
3305 -msgid ""
3306 -"Not a git repository. Use --no-index to compare two paths outside a working "
3307 -"tree"
3308 -msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
3279 +#: builtin/branch.c
3280 +msgid "git branch [<options>] [-r | -a] [--points-at]"
3281 +msgstr "git branch [<選項>] [-r | -a] [--points-at]"
3282
3310 -# 譯者：請維持前導空格
3311 -#: diff.c:159
3312 -#, c-format
3313 -msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3314 -msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
3283 +#: builtin/branch.c
3284 +msgid "git branch [<options>] [-r | -a] [--format]"
3285 +msgstr "git branch [<選項>] [-r | -a] [--format]"
3286
3316 -# 譯者：請維持前導空格
3317 -#: diff.c:164
3287 +# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
3288 +#: builtin/branch.c
3289 #, c-format
3319 -msgid " Unknown dirstat parameter '%s'\n"
3320 -msgstr " 未知的 dirstat 參數 '%s'\n"
3321 -
3322 -#: diff.c:300
3290 msgid ""
3324 -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3325 -"'dimmed-zebra', 'plain'"
3291 +"deleting branch '%s' that has been merged to\n"
3292 +" '%s', but not yet merged to HEAD."
3293 msgstr ""
3327 -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
3328 -"zebra'、'plain'"
3294 +"將要刪除的分支 '%s' 已經被合併到\n"
3295 +" '%s'，但未合併到 HEAD。"
3296
3330 -#: diff.c:328
3297 +# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長
3298 +#: builtin/branch.c
3299 #, c-format
3300 msgid ""
3333 -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
3334 -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
3301 +"not deleting branch '%s' that is not yet merged to\n"
3302 +" '%s', even though it is merged to HEAD."
3303 msgstr ""
3336 -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
3337 -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3338 -
3339 -#: diff.c:336
3340 -msgid ""
3341 -"color-moved-ws: allow-indentation-change cannot be combined with other "
3342 -"whitespace modes"
3343 -msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
3304 +"並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n"
3305 +" 然而卻尚未被合併到分支 '%s' 。"
3306
3345 -#: diff.c:413
3307 +#: builtin/branch.c
3308 #, c-format
3347 -msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3348 -msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
3309 +msgid "Couldn't look up commit object for '%s'"
3310 +msgstr "無法查詢 '%s' 指向的提交物件"
3311
3350 -#: diff.c:473
3312 +#: builtin/branch.c
3313 #, c-format
3314 msgid ""
3353 -"Found errors in 'diff.dirstat' config variable:\n"
3354 -"%s"
3315 +"The branch '%s' is not fully merged.\n"
3316 +"If you are sure you want to delete it, run 'git branch -D %s'."
3317 msgstr ""
3356 -"發現設定變數 'diff.dirstat' 中的錯誤：\n"
3357 -"%s"
3318 +"分支 '%s' 沒有完全合併。\n"
3319 +"如果您確認要刪除它，執行 'git branch -D %s'。"
3320
3359 -#: diff.c:4282
3360 -#, c-format
3361 -msgid "external diff died, stopping at %s"
3362 -msgstr "外部 diff 離開，停止在 %s"
3321 +#: builtin/branch.c
3322 +msgid "Update of config-file failed"
3323 +msgstr "更新設定檔案失敗"
3324
3364 -#: diff.c:4677 parse-options.c:1114
3365 -#, c-format
3366 -msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3367 -msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
3325 +#: builtin/branch.c
3326 +msgid "cannot use -a with -d"
3327 +msgstr "不能將 -a 和 -d 同時使用"
3328
3369 -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3370 -#, c-format
3371 -msgid "options '%s', '%s', and '%s' cannot be used together"
3372 -msgstr "「%s」、「%s」和「%s」選項不得同時使用"
3329 +#: builtin/branch.c
3330 +msgid "Couldn't look up commit object for HEAD"
3331 +msgstr "無法查詢 HEAD 指向的提交物件"
3332
3374 -#: diff.c:4685
3333 +#: builtin/branch.c
3334 #, c-format
3376 -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3377 -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
3335 +msgid "Cannot delete branch '%s' checked out at '%s'"
3336 +msgstr "無法刪除在「%2$s」簽出的「%1$s」分支"
3337
3379 -#: diff.c:4689
3338 +#: builtin/branch.c
3339 #, c-format
3381 -msgid ""
3382 -"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3383 -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
3384 -
3385 -#: diff.c:4769
3386 -msgid "--follow requires exactly one pathspec"
3387 -msgstr "--follow 明確要求只跟一個路徑規格"
3340 +msgid "remote-tracking branch '%s' not found."
3341 +msgstr "未能找到遠端追蹤分支 '%s'。"
3342
3389 -#: diff.c:4823
3343 +#: builtin/branch.c
3344 #, c-format
3391 -msgid "invalid --stat value: %s"
3392 -msgstr "無效的 --stat 值：%s"
3345 +msgid "branch '%s' not found."
3346 +msgstr "分支 '%s' 未發現。"
3347
3394 -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3395 -#: parse-options.c:217 parse-options.c:221
3348 +#: builtin/branch.c
3349 #, c-format
3397 -msgid "%s expects a numerical value"
3398 -msgstr "%s 期望一個數字值"
3350 +msgid "Deleted remote-tracking branch %s (was %s).\n"
3351 +msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n"
3352
3400 -#: diff.c:4860
3353 +#: builtin/branch.c
3354 #, c-format
3402 -msgid ""
3403 -"Failed to parse --dirstat/-X option parameter:\n"
3404 -"%s"
3405 -msgstr ""
3406 -"無法解析 --dirstat/-X 選項的參數：\n"
3407 -"%s"
3355 +msgid "Deleted branch %s (was %s).\n"
3356 +msgstr "已刪除分支 %s（曾為 %s）。\n"
3357
3409 -#: diff.c:4893
3410 -#, c-format
3411 -msgid "unknown change class '%c' in --diff-filter=%s"
3412 -msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
3358 +#: builtin/branch.c builtin/tag.c
3359 +msgid "unable to parse format string"
3360 +msgstr "不能解析格式化字串"
3361
3414 -#: diff.c:4917
3415 -#, c-format
3416 -msgid "unknown value after ws-error-highlight=%.*s"
3417 -msgstr "ws-error-highlight=%.*s 之後未知的值"
3362 +#: builtin/branch.c
3363 +msgid "could not resolve HEAD"
3364 +msgstr "不能解析 HEAD 提交"
3365
3419 -#: diff.c:4931
3366 +#: builtin/branch.c
3367 #, c-format
3421 -msgid "unable to resolve '%s'"
3422 -msgstr "不能解析 '%s'"
3368 +msgid "HEAD (%s) points outside of refs/heads/"
3369 +msgstr "HEAD (%s) 指向 refs/heads/ 之外"
3370
3424 -#: diff.c:4981 diff.c:4987
3371 +#: builtin/branch.c
3372 #, c-format
3426 -msgid "%s expects <n>/<m> form"
3427 -msgstr "%s 期望 <n>/<m> 格式"
3373 +msgid "Branch %s is being rebased at %s"
3374 +msgstr "分支 %s 正被重定基底到 %s"
3375
3429 -#: diff.c:4999
3376 +#: builtin/branch.c
3377 #, c-format
3431 -msgid "%s expects a character, got '%s'"
3432 -msgstr "%s 期望一個字元，得到 '%s'"
3378 +msgid "Branch %s is being bisected at %s"
3379 +msgstr "分支 %s 正被二分搜尋於 %s"
3380
3434 -#: diff.c:5020
3435 -#, c-format
3436 -msgid "bad --color-moved argument: %s"
3437 -msgstr "壞的 --color-moved 參數：%s"
3381 +#: builtin/branch.c
3382 +msgid "cannot copy the current branch while not on any."
3383 +msgstr "無法複製目前分支因為不處於任何分支上。"
3384 +
3385 +#: builtin/branch.c
3386 +msgid "cannot rename the current branch while not on any."
3387 +msgstr "無法重新命名目前分支因為不處於任何分支上。"
3388
3439 -#: diff.c:5039
3389 +#: builtin/branch.c
3390 #, c-format
3441 -msgid "invalid mode '%s' in --color-moved-ws"
3442 -msgstr "--color-moved-ws 中的無效模式 '%s'"
3391 +msgid "Invalid branch name: '%s'"
3392 +msgstr "無效的分支名：'%s'"
3393
3444 -#: diff.c:5079
3445 -msgid ""
3446 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3447 -"\"histogram\""
3448 -msgstr ""
3449 -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3394 +#: builtin/branch.c
3395 +msgid "Branch rename failed"
3396 +msgstr "分支重新命名失敗"
3397
3451 -#: diff.c:5115 diff.c:5135
3452 -#, c-format
3453 -msgid "invalid argument to %s"
3454 -msgstr "%s 的參數無效"
3398 +#: builtin/branch.c
3399 +msgid "Branch copy failed"
3400 +msgstr "分支複製失敗"
3401
3456 -#: diff.c:5239
3402 +#: builtin/branch.c
3403 #, c-format
3458 -msgid "invalid regex given to -I: '%s'"
3459 -msgstr "傳入 -I 的常規表示式無效：「%s」"
3404 +msgid "Created a copy of a misnamed branch '%s'"
3405 +msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
3406
3461 -#: diff.c:5288
3407 +#: builtin/branch.c
3408 #, c-format
3463 -msgid "failed to parse --submodule option parameter: '%s'"
3464 -msgstr "無法解析 --submodule 選項的參數：'%s'"
3409 +msgid "Renamed a misnamed branch '%s' away"
3410 +msgstr "已將錯誤命名的分支 '%s' 重新命名"
3411
3466 -#: diff.c:5344
3412 +#: builtin/branch.c
3413 #, c-format
3468 -msgid "bad --word-diff argument: %s"
3469 -msgstr "壞的 --word-diff 參數：%s"
3470 -
3471 -#: diff.c:5380
3472 -msgid "Diff output format options"
3473 -msgstr "差異輸出格式化選項"
3414 +msgid "Branch renamed to %s, but HEAD is not updated!"
3415 +msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
3416
3475 -#: diff.c:5382 diff.c:5388
3476 -msgid "generate patch"
3477 -msgstr "生成修補檔"
3417 +#: builtin/branch.c
3418 +msgid "Branch is renamed, but update of config-file failed"
3419 +msgstr "分支被重新命名，但更新設定檔案失敗"
3420
3479 -#: diff.c:5385 builtin/log.c:180
3480 -msgid "suppress diff output"
3481 -msgstr "不顯示差異輸出"
3421 +#: builtin/branch.c
3422 +msgid "Branch is copied, but update of config-file failed"
3423 +msgstr "分支已複製，但更新設定檔案失敗"
3424
3483 -#: diff.c:5390 diff.c:5504 diff.c:5511
3484 -msgid "<n>"
3485 -msgstr "<n>"
3425 +#: builtin/branch.c
3426 +#, c-format
3427 +msgid ""
3428 +"Please edit the description for the branch\n"
3429 +" %s\n"
3430 +"Lines starting with '%c' will be stripped.\n"
3431 +msgstr ""
3432 +"請編輯分支的描述\n"
3433 +" %s\n"
3434 +"以 '%c' 開頭的行將被過濾。\n"
3435
3487 -#: diff.c:5391 diff.c:5394
3488 -msgid "generate diffs with <n> lines context"
3489 -msgstr "生成含 <n> 行上下文的差異"
3436 +#: builtin/branch.c
3437 +msgid "Generic options"
3438 +msgstr "通用選項"
3439
3491 -#: diff.c:5396
3492 -msgid "generate the diff in raw format"
3493 -msgstr "生成原始格式的差異"
3440 +#: builtin/branch.c
3441 +msgid "show hash and subject, give twice for upstream branch"
3442 +msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
3443
3495 -#: diff.c:5399
3496 -msgid "synonym for '-p --raw'"
3497 -msgstr "和 '-p --raw' 同義"
3444 +#: builtin/branch.c
3445 +msgid "suppress informational messages"
3446 +msgstr "不顯示訊息"
3447
3499 -#: diff.c:5403
3500 -msgid "synonym for '-p --stat'"
3501 -msgstr "和 '-p --stat' 同義"
3448 +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c
3449 +msgid "set branch tracking configuration"
3450 +msgstr "設定分支追蹤設定"
3451
3503 -#: diff.c:5407
3504 -msgid "machine friendly --stat"
3505 -msgstr "機器友好的 --stat"
3452 +#: builtin/branch.c
3453 +msgid "do not use"
3454 +msgstr "不要使用"
3455
3507 -#: diff.c:5410
3508 -msgid "output only the last line of --stat"
3509 -msgstr "只輸出 --stat 的最後一行"
3456 +#: builtin/branch.c
3457 +msgid "upstream"
3458 +msgstr "上游"
3459
3511 -#: diff.c:5412 diff.c:5420
3512 -msgid "<param1,param2>..."
3513 -msgstr "<參數1,參數2>..."
3514 -
3515 -#: diff.c:5413
3516 -msgid ""
3517 -"output the distribution of relative amount of changes for each sub-directory"
3518 -msgstr "輸出每個子目錄相對變更的分布"
3519 -
3520 -#: diff.c:5417
3521 -msgid "synonym for --dirstat=cumulative"
3522 -msgstr "和 --dirstat=cumulative 同義"
3523 -
3524 -#: diff.c:5421
3525 -msgid "synonym for --dirstat=files,param1,param2..."
3526 -msgstr "是 --dirstat=files,param1,param2... 的同義詞"
3527 -
3528 -#: diff.c:5425
3529 -msgid "warn if changes introduce conflict markers or whitespace errors"
3530 -msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
3460 +#: builtin/branch.c
3461 +msgid "change the upstream info"
3462 +msgstr "改變上游訊息"
3463
3532 -#: diff.c:5428
3533 -msgid "condensed summary such as creations, renames and mode changes"
3534 -msgstr "精簡摘要，例如建立、重新命名和模式變更"
3464 +#: builtin/branch.c
3465 +msgid "unset the upstream info"
3466 +msgstr "取消上游資訊設定"
3467
3536 -#: diff.c:5431
3537 -msgid "show only names of changed files"
3538 -msgstr "只顯示變更檔案的檔案名"
3468 +#: builtin/branch.c
3469 +msgid "use colored output"
3470 +msgstr "使用彩色輸出"
3471
3540 -#: diff.c:5434
3541 -msgid "show only names and status of changed files"
3542 -msgstr "只顯示變更檔案的檔案名和狀態"
3472 +#: builtin/branch.c
3473 +msgid "act on remote-tracking branches"
3474 +msgstr "作用於遠端追蹤分支"
3475
3544 -#: diff.c:5436
3545 -msgid "<width>[,<name-width>[,<count>]]"
3546 -msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
3476 +#: builtin/branch.c
3477 +msgid "print only branches that contain the commit"
3478 +msgstr "只列印包含該提交的分支"
3479
3548 -#: diff.c:5437
3549 -msgid "generate diffstat"
3550 -msgstr "生成差異統計（diffstat）"
3480 +#: builtin/branch.c
3481 +msgid "print only branches that don't contain the commit"
3482 +msgstr "只列印不包含該提交的分支"
3483
3552 -#: diff.c:5439 diff.c:5442 diff.c:5445
3553 -msgid "<width>"
3554 -msgstr "<寬度>"
3484 +#: builtin/branch.c
3485 +msgid "Specific git-branch actions:"
3486 +msgstr "具體的 git-branch 動作："
3487
3556 -#: diff.c:5440
3557 -msgid "generate diffstat with a given width"
3558 -msgstr "使用提供的長度生成差異統計"
3488 +#: builtin/branch.c
3489 +msgid "list both remote-tracking and local branches"
3490 +msgstr "列出遠端追蹤及本機分支"
3491
3560 -#: diff.c:5443
3561 -msgid "generate diffstat with a given name width"
3562 -msgstr "使用提供的檔案名長度生成差異統計"
3492 +#: builtin/branch.c
3493 +msgid "delete fully merged branch"
3494 +msgstr "刪除完全合併的分支"
3495
3564 -#: diff.c:5446
3565 -msgid "generate diffstat with a given graph width"
3566 -msgstr "使用提供的圖形長度生成差異統計"
3496 +#: builtin/branch.c
3497 +msgid "delete branch (even if not merged)"
3498 +msgstr "刪除分支（即使沒有合併）"
3499
3568 -#: diff.c:5448
3569 -msgid "<count>"
3570 -msgstr "<次數>"
3500 +#: builtin/branch.c
3501 +msgid "move/rename a branch and its reflog"
3502 +msgstr "移動/重新命名一個分支，以及它的引用日誌"
3503
3572 -#: diff.c:5449
3573 -msgid "generate diffstat with limited lines"
3574 -msgstr "生成有限行數的差異統計"
3504 +#: builtin/branch.c
3505 +msgid "move/rename a branch, even if target exists"
3506 +msgstr "移動/重新命名一個分支，即使目標已存在"
3507
3576 -#: diff.c:5452
3577 -msgid "generate compact summary in diffstat"
3578 -msgstr "生成差異統計的簡潔摘要"
3508 +#: builtin/branch.c
3509 +msgid "copy a branch and its reflog"
3510 +msgstr "複製分支及其引用日誌"
3511
3580 -#: diff.c:5455
3581 -msgid "output a binary diff that can be applied"
3582 -msgstr "輸出一個可以套用的二進位差異"
3512 +#: builtin/branch.c
3513 +msgid "copy a branch, even if target exists"
3514 +msgstr "複製一個分支，即使目標已存在"
3515
3584 -#: diff.c:5458
3585 -msgid "show full pre- and post-image object names on the \"index\" lines"
3586 -msgstr "在 \"index\" 行顯示完整的前後物件名稱"
3516 +#: builtin/branch.c
3517 +msgid "list branch names"
3518 +msgstr "列出分支名"
3519
3588 -#: diff.c:5460
3589 -msgid "show colored diff"
3590 -msgstr "顯示帶顏色的差異"
3520 +#: builtin/branch.c
3521 +msgid "show current branch name"
3522 +msgstr "顯示目前分支名"
3523
3592 -#: diff.c:5461
3593 -msgid "<kind>"
3594 -msgstr "<類型>"
3524 +#: builtin/branch.c builtin/submodule--helper.c
3525 +msgid "create the branch's reflog"
3526 +msgstr "建立分支的引用日誌"
3527
3596 -#: diff.c:5462
3597 -msgid ""
3598 -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3599 -"diff"
3600 -msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
3528 +#: builtin/branch.c
3529 +msgid "edit the description for the branch"
3530 +msgstr "標記分支的描述"
3531
3602 -#: diff.c:5465
3603 -msgid ""
3604 -"do not munge pathnames and use NULs as output field terminators in --raw or "
3605 -"--numstat"
3606 -msgstr ""
3607 -"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
3608 -"符"
3532 +#: builtin/branch.c
3533 +msgid "force creation, move/rename, deletion"
3534 +msgstr "強制建立、移動/重新命名、刪除"
3535
3610 -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3611 -msgid "<prefix>"
3612 -msgstr "<前綴>"
3536 +#: builtin/branch.c
3537 +msgid "print only branches that are merged"
3538 +msgstr "只列印已經合併的分支"
3539
3614 -#: diff.c:5469
3615 -msgid "show the given source prefix instead of \"a/\""
3616 -msgstr "顯示提供的來源前綴，而非 \"a/\""
3540 +#: builtin/branch.c
3541 +msgid "print only branches that are not merged"
3542 +msgstr "只列印尚未合併的分支"
3543
3618 -#: diff.c:5472
3619 -msgid "show the given destination prefix instead of \"b/\""
3620 -msgstr "顯示提供的目的地前綴取代 \"b/\""
3544 +#: builtin/branch.c
3545 +msgid "list branches in columns"
3546 +msgstr "以列的方式顯示分支"
3547
3622 -#: diff.c:5475
3623 -msgid "prepend an additional prefix to every line of output"
3624 -msgstr "輸出的每一行附加前綴"
3548 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c
3549 +msgid "object"
3550 +msgstr "物件"
3551
3626 -#: diff.c:5478
3627 -msgid "do not show any source or destination prefix"
3628 -msgstr "不顯示任何來源和目的地前綴"
3552 +#: builtin/branch.c
3553 +msgid "print only branches of the object"
3554 +msgstr "只列印指向該物件的分支"
3555
3630 -#: diff.c:5481
3631 -msgid "show context between diff hunks up to the specified number of lines"
3632 -msgstr "顯示指定行數的差異區塊間的上下文"
3556 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c
3557 +msgid "sorting and filtering are case insensitive"
3558 +msgstr "排序和過濾屬於大小寫不敏感"
3559
3634 -#: diff.c:5485 diff.c:5490 diff.c:5495
3635 -msgid "<char>"
3636 -msgstr "<字元>"
3560 +#: builtin/branch.c builtin/ls-files.c
3561 +msgid "recurse through submodules"
3562 +msgstr "在子模組中遞迴"
3563
3638 -#: diff.c:5486
3639 -msgid "specify the character to indicate a new line instead of '+'"
3640 -msgstr "指定一個字元取代 '+' 來表示新的一行"
3564 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c
3565 +#: builtin/verify-tag.c
3566 +msgid "format to use for the output"
3567 +msgstr "輸出格式"
3568
3642 -#: diff.c:5491
3643 -msgid "specify the character to indicate an old line instead of '-'"

This file is too large to show in full.