@matheusbsbs / matheus-bagliano / commits / c73cfd5c79
Fork 0

l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)

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

Yi-Jyun committed Mar 10, 2020 at 01:33 UTC c73cfd5c79352b380417ad83edbb6f2742b55db9
1 file changed +2826 -2607
po/zh_TW.po
+2826 -2607
@@ -1,7 +1,7 @@
1 # Chinese (traditional) translations for Git package
2 -# Git 套裝軟體的繁體中文翻譯.
2 +# Git 套裝軟體的繁體中文翻譯。
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 -# Copyright (C) 2019,2019 Yi-Jyun Pan <pan93412@gmail.com>
4 +# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com>
5 # This file is distributed under the same license as the Git package.
6 # Contributors (CN):
7 # - Fangyi Zhou <me AT fangyi.io>
@@ -15,7 +15,6 @@
15 # - 依云 <lilydjwg AT gmail.com>
16 # - Yichao Yu <yyc1992 AT gmail.com>
17 # - Zhuang Ya <zhuangya AT me.com>
18 -# Contributors (TW):
18 #
19 # Git glossary for Chinese translators
20 #
@@ -137,292 +136,516 @@
136 # upstream branch | 上游分支
137 # working tree | 工作區
138 #
140 -# pan93412 <pan93412@gmail.com>, 2019.
139 msgid ""
140 msgstr ""
141 "Project-Id-Version: Git\n"
142 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
145 -"POT-Creation-Date: 2019-12-30 08:48+0800\n"
146 -"PO-Revision-Date: 2019-12-31 21:06+0800\n"
147 -"Last-Translator: pan93412 <pan93412@gmail.com>\n"
148 -"Language-Team: Chinese <chinese-l10n@googlegroups.com>\n"
149 -"Language: zh_CN\n"
143 +"POT-Creation-Date: 2020-03-06 14:25+0800\n"
144 +"PO-Revision-Date: 2020-03-10 01:16+0800\n"
145 +"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
146 +"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
147 +"Language: zh_TW\n"
148 "MIME-Version: 1.0\n"
149 "Content-Type: text/plain; charset=UTF-8\n"
150 "Content-Transfer-Encoding: 8bit\n"
153 -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 |"
154 -" https://zhconvert.org\n"
155 -"Plural-Forms: nplurals=2; plural=(n != 1);\n"
156 -"X-Generator: Lokalize 19.12.0\n"
151 +"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
152 +"zhconvert.org\n"
153 +"Plural-Forms: nplurals=1; plural=0;\n"
154 +"X-Generator: Poedit 2.3\n"
155
158 -#: add-interactive.c:347
156 +#: add-interactive.c:368
157 #, c-format
160 -#| msgid "Huh (%s)?\n"
158 msgid "Huh (%s)?"
159 msgstr "嗯（%s）？"
160
164 -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
165 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
166 -#: builtin/rebase.c:2019 builtin/rebase.c:2063
161 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
162 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
163 +#: builtin/rebase.c:2086 builtin/rebase.c:2130
164 msgid "could not read index"
165 msgstr "不能讀取索引"
166
170 -#: add-interactive.c:555 git-add--interactive.perl:269
167 +#: add-interactive.c:576 git-add--interactive.perl:269
168 #: git-add--interactive.perl:294
169 msgid "binary"
170 msgstr "二進位"
171
175 -#: add-interactive.c:613 git-add--interactive.perl:278
172 +#: add-interactive.c:634 git-add--interactive.perl:278
173 #: git-add--interactive.perl:332
174 msgid "nothing"
175 msgstr "無"
176
180 -#: add-interactive.c:614 git-add--interactive.perl:314
177 +#: add-interactive.c:635 git-add--interactive.perl:314
178 #: git-add--interactive.perl:329
179 msgid "unchanged"
180 msgstr "沒有修改"
181
185 -#: add-interactive.c:651 git-add--interactive.perl:643
182 +#: add-interactive.c:672 git-add--interactive.perl:643
183 msgid "Update"
184 msgstr "更新"
185
189 -#: add-interactive.c:668 add-interactive.c:856
186 +#: add-interactive.c:689 add-interactive.c:877
187 #, c-format
191 -#| msgid "could not stat '%s'"
188 msgid "could not stage '%s'"
189 msgstr "不能暫存 '%s'"
190
195 -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
196 -#: builtin/rebase.c:895
191 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
192 +#: builtin/rebase.c:899
193 msgid "could not write index"
194 msgstr "不能寫入索引"
195
200 -#: add-interactive.c:677 git-add--interactive.perl:628
196 +#: add-interactive.c:698 git-add--interactive.perl:628
197 #, c-format, perl-format
198 msgid "updated %d path\n"
199 msgid_plural "updated %d paths\n"
200 msgstr[0] "更新了 %d 個路徑\n"
205 -msgstr[1] "更新了 %d 個路徑\n"
201
207 -#: add-interactive.c:695 git-add--interactive.perl:678
202 +#: add-interactive.c:716 git-add--interactive.perl:678
203 #, c-format, perl-format
204 msgid "note: %s is untracked now.\n"
205 msgstr "說明：%s 現已成為未追蹤的。\n"
206
212 -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
207 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
208 #: builtin/reset.c:144
209 #, c-format
210 msgid "make_cache_entry failed for path '%s'"
211 msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"
212
218 -#: add-interactive.c:730 git-add--interactive.perl:655
213 +#: add-interactive.c:751 git-add--interactive.perl:655
214 msgid "Revert"
215 msgstr "還原"
216
222 -#: add-interactive.c:746
223 -#| msgid "could not parse HEAD"
217 +#: add-interactive.c:767
218 msgid "Could not parse HEAD^{tree}"
219 msgstr "不能解析 HEAD^{樹}"
220
227 -#: add-interactive.c:784 git-add--interactive.perl:631
221 +#: add-interactive.c:805 git-add--interactive.perl:631
222 #, c-format, perl-format
223 msgid "reverted %d path\n"
224 msgid_plural "reverted %d paths\n"
225 msgstr[0] "還原了 %d 個路徑\n"
232 -msgstr[1] "還原了 %d 個路徑\n"
226
234 -#: add-interactive.c:835 git-add--interactive.perl:695
227 +#: add-interactive.c:856 git-add--interactive.perl:695
228 #, c-format
229 msgid "No untracked files.\n"
230 msgstr "沒有未追蹤的檔案。\n"
231
239 -#: add-interactive.c:839 git-add--interactive.perl:689
232 +#: add-interactive.c:860 git-add--interactive.perl:689
233 msgid "Add untracked"
234 msgstr "新增未追蹤的"
235
243 -#: add-interactive.c:866 git-add--interactive.perl:625
236 +#: add-interactive.c:887 git-add--interactive.perl:625
237 #, c-format, perl-format
238 msgid "added %d path\n"
239 msgid_plural "added %d paths\n"
240 msgstr[0] "增加了 %d 個路徑\n"
248 -msgstr[1] "增加了 %d 個路徑\n"
241
250 -#: add-interactive.c:896
242 +#: add-interactive.c:917
243 #, c-format
252 -#| msgid "ignoring unmerged: %s\n"
244 msgid "ignoring unmerged: %s"
245 msgstr "忽略未合併：%s"
246
256 -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
247 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
248 #, c-format
249 msgid "Only binary files changed.\n"
250 msgstr "只有二進位檔案被修改。\n"
251
261 -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
252 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
253 #, c-format
254 msgid "No changes.\n"
255 msgstr "沒有修改。\n"
256
266 -#: add-interactive.c:914 git-add--interactive.perl:1376
257 +#: add-interactive.c:935 git-add--interactive.perl:1376
258 msgid "Patch update"
259 msgstr "修補檔更新"
260
270 -#: add-interactive.c:953 git-add--interactive.perl:1754
261 +#: add-interactive.c:974 git-add--interactive.perl:1754
262 msgid "Review diff"
263 msgstr "檢視 diff"
264
274 -#: add-interactive.c:981
275 -#| msgid "show matching files in the pager"
265 +#: add-interactive.c:1002
266 msgid "show paths with changes"
267 msgstr "顯示有變更的路徑"
268
279 -#: add-interactive.c:983
269 +#: add-interactive.c:1004
270 msgid "add working tree state to the staged set of changes"
271 msgstr "加入工作區狀態至暫存列表"
272
283 -#: add-interactive.c:985
273 +#: add-interactive.c:1006
274 msgid "revert staged set of changes back to the HEAD version"
275 msgstr "還原修改的暫存集至 HEAD 版本"
276
287 -#: add-interactive.c:987
288 -#| msgid "select hunks interactively"
277 +#: add-interactive.c:1008
278 msgid "pick hunks and update selectively"
279 msgstr "挑選區塊並選擇性更新"
280
292 -#: add-interactive.c:989
293 -#| msgid "reset HEAD and index"
281 +#: add-interactive.c:1010
282 msgid "view diff between HEAD and index"
283 msgstr "檢視 HEAD 及索引之間的差異"
284
297 -#: add-interactive.c:991
285 +#: add-interactive.c:1012
286 msgid "add contents of untracked files to the staged set of changes"
287 msgstr "加入未追蹤檔案的內容至暫存列表"
288
301 -#: add-interactive.c:999 add-interactive.c:1048
289 +#: add-interactive.c:1020 add-interactive.c:1069
290 msgid "Prompt help:"
291 msgstr "提示說明："
292
305 -#: add-interactive.c:1001
306 -#| msgid "select mainline parent"
293 +#: add-interactive.c:1022
294 msgid "select a single item"
295 msgstr "選擇單一項目"
296
310 -#: add-interactive.c:1003
311 -#| msgid "select handling of signed tags"
297 +#: add-interactive.c:1024
298 msgid "select a range of items"
299 msgstr "選擇項目範圍"
300
315 -#: add-interactive.c:1005
316 -#| msgid "%s has multiple values"
301 +#: add-interactive.c:1026
302 msgid "select multiple ranges"
303 msgstr "選擇多個範圍"
304
320 -#: add-interactive.c:1007 add-interactive.c:1052
305 +#: add-interactive.c:1028 add-interactive.c:1073
306 msgid "select item based on unique prefix"
307 msgstr "基於唯一前綴選擇項目"
308
324 -#: add-interactive.c:1009
325 -#| msgid "use specified template file"
309 +#: add-interactive.c:1030
310 msgid "unselect specified items"
311 msgstr "取消選擇指定項目"
312
329 -#: add-interactive.c:1011
330 -#| msgid "choose a diff algorithm"
313 +#: add-interactive.c:1032
314 msgid "choose all items"
315 msgstr "選擇所有項目"
316
334 -#: add-interactive.c:1013
317 +#: add-interactive.c:1034
318 msgid "(empty) finish selecting"
319 msgstr "（空）完成選取"
320
338 -#: add-interactive.c:1050
339 -#| msgid "%s expects a numerical value"
321 +#: add-interactive.c:1071
322 msgid "select a numbered item"
323 msgstr "選擇編號過的項目"
324
343 -#: add-interactive.c:1054
344 -#| msgid "empty exec command"
325 +#: add-interactive.c:1075
326 msgid "(empty) select nothing"
327 msgstr "（空）全不選取"
328
348 -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
329 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
330 msgid "*** Commands ***"
331 msgstr "*** 指令 ***"
332
352 -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
333 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
334 msgid "What now"
335 msgstr "請選擇"
336
356 -#: add-interactive.c:1115 git-add--interactive.perl:213
337 +#: add-interactive.c:1136 git-add--interactive.perl:213
338 msgid "staged"
339 msgstr "快取"
340
360 -#: add-interactive.c:1115 git-add--interactive.perl:213
341 +#: add-interactive.c:1136 git-add--interactive.perl:213
342 msgid "unstaged"
343 msgstr "未快取"
344
364 -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
345 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
346 #: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
366 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
367 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
368 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
369 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
347 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
348 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
349 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
350 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
351 msgid "path"
352 msgstr "路徑"
353
373 -#: add-interactive.c:1122
374 -#| msgid "could not read index"
354 +#: add-interactive.c:1143
355 msgid "could not refresh index"
356 msgstr "無法重新整理索引"
357
378 -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
358 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
359 #, c-format
360 msgid "Bye.\n"
361 msgstr "再見。\n"
362
383 -#: add-patch.c:15
384 -#, c-format
385 -#| msgid "Stage mode change [y,n,q,a,d%s,?]? "
386 -msgid "Stage mode change [y,n,a,q,d%s,?]? "
387 -msgstr "暫存模式變更 [y,n,a,q,d%s,?]？"
363 +#: add-patch.c:33 git-add--interactive.perl:1428
364 +#, c-format, perl-format
365 +msgid "Stage mode change [y,n,q,a,d%s,?]? "
366 +msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
367
389 -#: add-patch.c:16
390 -#, c-format
391 -#| msgid "Stage deletion [y,n,q,a,d%s,?]? "
392 -msgid "Stage deletion [y,n,a,q,d%s,?]? "
393 -msgstr "暫存刪除動作 [y,n,a,q,d%s,?]？"
368 +#: add-patch.c:34 git-add--interactive.perl:1429
369 +#, c-format, perl-format
370 +msgid "Stage deletion [y,n,q,a,d%s,?]? "
371 +msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
372
395 -#: add-patch.c:17
396 -#, c-format
397 -#| msgid "Stage this hunk [y,n,q,a,d%s,?]? "
398 -msgid "Stage this hunk [y,n,a,q,d%s,?]? "
399 -msgstr "暫存此區塊 [y,n,a,q,d%s,?]？"
373 +#: add-patch.c:35 git-add--interactive.perl:1430
374 +#, c-format, perl-format
375 +msgid "Stage this hunk [y,n,q,a,d%s,?]? "
376 +msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
377 +
378 +#: add-patch.c:37
379 +msgid ""
380 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
381 +"staging."
382 +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
383 +
384 +#: add-patch.c:40
385 +msgid ""
386 +"y - stage this hunk\n"
387 +"n - do not stage this hunk\n"
388 +"q - quit; do not stage this hunk or any of the remaining ones\n"
389 +"a - stage this hunk and all later hunks in the file\n"
390 +"d - do not stage this hunk or any of the later hunks in the file\n"
391 +msgstr ""
392 +"y - 暫存此區塊\n"
393 +"n - 不要暫存此區塊\n"
394 +"q - 離開。不暫存此區塊及後面的全部區塊\n"
395 +"a - 暫存此區塊和本檔案中後面的全部區塊\n"
396 +"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
397 +
398 +#: add-patch.c:54 git-add--interactive.perl:1433
399 +#, c-format, perl-format
400 +msgid "Stash mode change [y,n,q,a,d%s,?]? "
401 +msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
402 +
403 +#: add-patch.c:55 git-add--interactive.perl:1434
404 +#, c-format, perl-format
405 +msgid "Stash deletion [y,n,q,a,d%s,?]? "
406 +msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "
407 +
408 +#: add-patch.c:56 git-add--interactive.perl:1435
409 +#, c-format, perl-format
410 +msgid "Stash this hunk [y,n,q,a,d%s,?]? "
411 +msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
412 +
413 +#: add-patch.c:58
414 +msgid ""
415 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
416 +"stashing."
417 +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
418 +
419 +#: add-patch.c:61
420 +msgid ""
421 +"y - stash this hunk\n"
422 +"n - do not stash this hunk\n"
423 +"q - quit; do not stash this hunk or any of the remaining ones\n"
424 +"a - stash this hunk and all later hunks in the file\n"
425 +"d - do not stash this hunk or any of the later hunks in the file\n"
426 +msgstr ""
427 +"y - 儲藏此區塊\n"
428 +"n - 不要儲藏此區塊\n"
429 +"q - 離開。不儲藏此區塊及後面的全部區塊\n"
430 +"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
431 +"d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
432 +
433 +#: add-patch.c:77 git-add--interactive.perl:1438
434 +#, c-format, perl-format
435 +msgid "Unstage mode change [y,n,q,a,d%s,?]? "
436 +msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
437 +
438 +#: add-patch.c:78 git-add--interactive.perl:1439
439 +#, c-format, perl-format
440 +msgid "Unstage deletion [y,n,q,a,d%s,?]? "
441 +msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
442 +
443 +#: add-patch.c:79 git-add--interactive.perl:1440
444 +#, c-format, perl-format
445 +msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
446 +msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
447 +
448 +#: add-patch.c:81
449 +msgid ""
450 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
451 +"unstaging."
452 +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
453 +
454 +#: add-patch.c:84
455 +msgid ""
456 +"y - unstage this hunk\n"
457 +"n - do not unstage this hunk\n"
458 +"q - quit; do not unstage this hunk or any of the remaining ones\n"
459 +"a - unstage this hunk and all later hunks in the file\n"
460 +"d - do not unstage this hunk or any of the later hunks in the file\n"
461 +msgstr ""
462 +"y - 不暫存此區塊\n"
463 +"n - 不要不暫存此區塊\n"
464 +"q - 離開。不要不暫存此區塊及後面的全部區塊\n"
465 +"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
466 +"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
467 +"\v\n"
468 +
469 +#: add-patch.c:99 git-add--interactive.perl:1443
470 +#, c-format, perl-format
471 +msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
472 +msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
473 +
474 +#: add-patch.c:100 git-add--interactive.perl:1444
475 +#, c-format, perl-format
476 +msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
477 +msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "
478 +
479 +#: add-patch.c:101 git-add--interactive.perl:1445
480 +#, c-format, perl-format
481 +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
482 +msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
483 +
484 +#: add-patch.c:103 add-patch.c:168 add-patch.c:211
485 +msgid ""
486 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
487 +"applying."
488 +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
489 +
490 +#: add-patch.c:106
491 +msgid ""
492 +"y - apply this hunk to index\n"
493 +"n - do not apply this hunk to index\n"
494 +"q - quit; do not apply this hunk or any of the remaining ones\n"
495 +"a - apply this hunk and all later hunks in the file\n"
496 +"d - do not apply this hunk or any of the later hunks in the file\n"
497 +msgstr ""
498 +"y - 在索引中套用此區塊\n"
499 +"n - 不要在索引中套用此區塊\n"
500 +"q - 離開。不要套用此區塊及後面的全部區塊\n"
501 +"a - 套用此區塊和本檔案中後面的全部區塊\n"
502 +"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
503 +
504 +#: add-patch.c:121 git-add--interactive.perl:1448
505 +#: git-add--interactive.perl:1463
506 +#, c-format, perl-format
507 +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
508 +msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
509 +
510 +#: add-patch.c:122 git-add--interactive.perl:1449
511 +#: git-add--interactive.perl:1464
512 +#, c-format, perl-format
513 +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
514 +msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "
515 +
516 +#: add-patch.c:123 git-add--interactive.perl:1450
517 +#: git-add--interactive.perl:1465
518 +#, c-format, perl-format
519 +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
520 +msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
521 +
522 +#: add-patch.c:125 add-patch.c:147 add-patch.c:190
523 +msgid ""
524 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
525 +"discarding."
526 +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。"
527 +
528 +#: add-patch.c:128 add-patch.c:193
529 +msgid ""
530 +"y - discard this hunk from worktree\n"
531 +"n - do not discard this hunk from worktree\n"
532 +"q - quit; do not discard this hunk or any of the remaining ones\n"
533 +"a - discard this hunk and all later hunks in the file\n"
534 +"d - do not discard this hunk or any of the later hunks in the file\n"
535 +msgstr ""
536 +"y - 在工作區中捨棄此區塊\n"
537 +"n - 不要在工作區中捨棄此區塊\n"
538 +"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
539 +"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
540 +"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
541 +
542 +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
543 +#, c-format, perl-format
544 +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
545 +msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
546 +
547 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
548 +#, c-format, perl-format
549 +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
550 +msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
551 +
552 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
553 +#, c-format, perl-format
554 +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
555 +msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
556 +
557 +#: add-patch.c:150
558 +msgid ""
559 +"y - discard this hunk from index and worktree\n"
560 +"n - do not discard this hunk from index and worktree\n"
561 +"q - quit; do not discard this hunk or any of the remaining ones\n"
562 +"a - discard this hunk and all later hunks in the file\n"
563 +"d - do not discard this hunk or any of the later hunks in the file\n"
564 +msgstr ""
565 +"y - 在索引和工作區中捨棄此區塊\n"
566 +"n - 不要在索引和工作區中捨棄此區塊\n"
567 +"q - 離開。不要捨棄此區塊及後面的全部區塊\n"
568 +"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
569 +"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
570 +
571 +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
572 +#, c-format, perl-format
573 +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
574 +msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
575 +
576 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
577 +#, c-format, perl-format
578 +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
579 +msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
580 +
581 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
582 +#, c-format, perl-format
583 +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
584 +msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
585 +
586 +#: add-patch.c:171
587 +msgid ""
588 +"y - apply this hunk to index and worktree\n"
589 +"n - do not apply this hunk to index and worktree\n"
590 +"q - quit; do not apply this hunk or any of the remaining ones\n"
591 +"a - apply this hunk and all later hunks in the file\n"
592 +"d - do not apply this hunk or any of the later hunks in the file\n"
593 +msgstr ""
594 +"y - 在索引和工作區中套用此區塊\n"
595 +"n - 不要在索引和工作區中套用此區塊\n"
596 +"q - 離開。不要套用此區塊及後面的全部區塊\n"
597 +"a - 套用此區塊和本檔案中後面的全部區塊\n"
598 +"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
599
401 -#: add-patch.c:111
600 +#: add-patch.c:214
601 +msgid ""
602 +"y - apply this hunk to worktree\n"
603 +"n - do not apply this hunk to worktree\n"
604 +"q - quit; do not apply this hunk or any of the remaining ones\n"
605 +"a - apply this hunk and all later hunks in the file\n"
606 +"d - do not apply this hunk or any of the later hunks in the file\n"
607 +msgstr ""
608 +"y - 在工作區中套用此區塊\n"
609 +"n - 不要在工作區中套用此區塊\n"
610 +"q - 離開。不要套用此區塊及後面的全部區塊\n"
611 +"a - 套用此區塊和本檔案中後面的全部區塊\n"
612 +"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
613 +
614 +#: add-patch.c:318
615 #, c-format
403 -#| msgid "could not parse git header '%.*s'"
616 msgid "could not parse hunk header '%.*s'"
617 msgstr "無法解析區塊標頭 '%.*s'"
618
407 -#: add-patch.c:130 add-patch.c:134
619 +#: add-patch.c:337 add-patch.c:341
620 #, c-format
409 -#| msgid "could not parse git header '%.*s'"
621 msgid "could not parse colored hunk header '%.*s'"
622 msgstr "無法解析上色過的區塊標頭 '%.*s'"
623
413 -#: add-patch.c:176
414 -#| msgid "could not parse %s"
624 +#: add-patch.c:395
625 msgid "could not parse diff"
626 msgstr "無法解析差異 (diff)"
627
418 -#: add-patch.c:194
419 -#| msgid "could not parse commit %s"
628 +#: add-patch.c:414
629 msgid "could not parse colored diff"
630 msgstr "無法解析上色過的差異 (diff)"
631
423 -#: add-patch.c:508
632 +#: add-patch.c:428
633 +#, c-format
634 +msgid "failed to run '%s'"
635 +msgstr "無法執行 '%s'"
636 +
637 +#: add-patch.c:587
638 +msgid "mismatched output from interactive.diffFilter"
639 +msgstr "interactive.diffFilter 的輸出不符"
640 +
641 +#: add-patch.c:588
642 +msgid ""
643 +"Your filter must maintain a one-to-one correspondence\n"
644 +"between its input and output lines."
645 +msgstr ""
646 +
647 +#: add-patch.c:761
648 #, c-format
425 -#| msgid "bad config line %d in %s"
649 msgid ""
650 "expected context line #%d in\n"
651 "%.*s"
@@ -430,7 +653,7 @@ msgstr ""
653 "應有上下文行 #%d 於\n"
654 "%.*s"
655
433 -#: add-patch.c:523
656 +#: add-patch.c:776
657 #, c-format
658 msgid ""
659 "hunks do not overlap:\n"
@@ -443,17 +666,12 @@ msgstr ""
666 "\t不以下述結尾：\n"
667 "%.*s"
668
446 -#: add-patch.c:799 git-add--interactive.perl:1112
669 +#: add-patch.c:1052 git-add--interactive.perl:1112
670 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
671 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
672
450 -#: add-patch.c:803
673 +#: add-patch.c:1056
674 #, c-format
452 -#| msgid ""
453 -#| "---\n"
454 -#| "To remove '%s' lines, make them ' ' lines (context).\n"
455 -#| "To remove '%s' lines, delete them.\n"
456 -#| "Lines starting with %s will be removed.\n"
675 msgid ""
676 "---\n"
677 "To remove '%c' lines, make them ' ' lines (context).\n"
@@ -465,17 +683,8 @@ msgstr ""
683 "要刪除 '%c' 開始的行，刪除它們。\n"
684 "以 %c 開始的行將被刪除。\n"
685
468 -#: add-patch.c:810
469 -#| msgid ""
470 -#| "If the patch applies cleanly, the edited hunk will immediately be\n"
471 -#| "marked for staging."
472 -msgid ""
473 -"If the patch applies cleanly, the edited hunk will immediately be\n"
474 -"marked for staging.\n"
475 -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。\n"
476 -
686 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
478 -#: add-patch.c:818 git-add--interactive.perl:1126
687 +#: add-patch.c:1070 git-add--interactive.perl:1126
688 msgid ""
689 "If it does not apply cleanly, you will be given an opportunity to\n"
690 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -484,12 +693,11 @@ msgstr ""
693 "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
694 "此次編輯被終止，此區塊不會被修改。\n"
695
487 -#: add-patch.c:851
488 -#| msgid "could not parse git header '%.*s'"
696 +#: add-patch.c:1103
697 msgid "could not parse hunk header"
698 msgstr "無法解析區塊標頭"
699
492 -#: add-patch.c:895 add-patch.c:1294
700 +#: add-patch.c:1148
701 msgid "'git apply --cached' failed"
702 msgstr "「git apply --cached」失敗"
703
@@ -505,42 +713,24 @@ msgstr "「git apply --cached」失敗"
713 #. Consider translating (saying "no" discards!) as
714 #. (saying "n" for "no" discards!) if the translation
715 #. of the word "no" does not start with n.
508 -#: add-patch.c:952 git-add--interactive.perl:1239
716 +#: add-patch.c:1218 git-add--interactive.perl:1239
717 msgid ""
718 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
719 msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
720
513 -#: add-patch.c:1009
514 -#| msgid ""
515 -#| "y - stage this hunk\n"
516 -#| "n - do not stage this hunk\n"
517 -#| "q - quit; do not stage this hunk or any of the remaining ones\n"
518 -#| "a - stage this hunk and all later hunks in the file\n"
519 -#| "d - do not stage this hunk or any of the later hunks in the file"
520 -msgid ""
521 -"y - stage this hunk\n"
522 -"n - do not stage this hunk\n"
523 -"q - quit; do not stage this hunk or any of the remaining ones\n"
524 -"a - stage this and all the remaining hunks\n"
525 -"d - do not stage this hunk nor any of the remaining hunks\n"
526 -msgstr ""
527 -"y - 暫存此區塊\n"
528 -"n - 不要暫存此區塊\n"
529 -"q - 離開。不暫存此區塊及後面的全部區塊\n"
530 -"a - 暫存這個區塊及所有剩餘區塊\n"
531 -"d - 不暫存這個區塊及任何剩餘區塊\n"
532 -
533 -#: add-patch.c:1016
534 -#| msgid ""
535 -#| "g - select a hunk to go to\n"
536 -#| "/ - search for a hunk matching the given regex\n"
537 -#| "j - leave this hunk undecided, see next undecided hunk\n"
538 -#| "J - leave this hunk undecided, see next hunk\n"
539 -#| "k - leave this hunk undecided, see previous undecided hunk\n"
540 -#| "K - leave this hunk undecided, see previous hunk\n"
541 -#| "s - split the current hunk into smaller hunks\n"
542 -#| "e - manually edit the current hunk\n"
543 -#| "? - print help\n"
721 +#: add-patch.c:1261
722 +msgid "The selected hunks do not apply to the index!"
723 +msgstr "選取的區塊不會套用進索引！"
724 +
725 +#: add-patch.c:1262 git-add--interactive.perl:1343
726 +msgid "Apply them to the worktree anyway? "
727 +msgstr "無論如何都要套用到工作區嗎？"
728 +
729 +#: add-patch.c:1269 git-add--interactive.perl:1346
730 +msgid "Nothing was applied.\n"
731 +msgstr "未套用。\n"
732 +
733 +#: add-patch.c:1326
734 msgid ""
735 "j - leave this hunk undecided, see next undecided hunk\n"
736 "J - leave this hunk undecided, see next hunk\n"
@@ -562,112 +752,102 @@ msgstr ""
752 "e - 手動編輯目前區塊\n"
753 "? - 顯示說明\n"
754
565 -#: add-patch.c:1137 add-patch.c:1147
566 -#| msgid "No previous hunk\n"
755 +#: add-patch.c:1447 add-patch.c:1457
756 msgid "No previous hunk"
757 msgstr "沒有上一個區塊"
758
570 -#: add-patch.c:1142 add-patch.c:1152
571 -#| msgid "No next hunk\n"
759 +#: add-patch.c:1452 add-patch.c:1462
760 msgid "No next hunk"
761 msgstr "沒有下一個區塊"
762
575 -#: add-patch.c:1158
576 -#| msgid "No other hunks to goto\n"
763 +#: add-patch.c:1468
764 msgid "No other hunks to goto"
765 msgstr "沒有其它可供跳轉的區塊"
766
580 -#: add-patch.c:1169 git-add--interactive.perl:1577
767 +#: add-patch.c:1479 git-add--interactive.perl:1577
768 msgid "go to which hunk (<ret> to see more)? "
769 msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
770
584 -#: add-patch.c:1170 git-add--interactive.perl:1579
771 +#: add-patch.c:1480 git-add--interactive.perl:1579
772 msgid "go to which hunk? "
773 msgstr "跳轉到哪個區塊？"
774
588 -#: add-patch.c:1181
775 +#: add-patch.c:1491
776 #, c-format
590 -#| msgid "Invalid number: '%s'\n"
777 msgid "Invalid number: '%s'"
778 msgstr "無效數字：'%s'"
779
594 -#: add-patch.c:1186
780 +#: add-patch.c:1496
781 #, c-format
596 -#| msgid "Sorry, only %d hunk available.\n"
597 -#| msgid_plural "Sorry, only %d hunks available.\n"
782 msgid "Sorry, only %d hunk available."
783 msgid_plural "Sorry, only %d hunks available."
784 msgstr[0] "對不起，只有 %d 個可用區塊。"
601 -msgstr[1] "對不起，只有 %d 個可用區塊。"
785
603 -#: add-patch.c:1195
604 -#| msgid "No other hunks to search\n"
786 +#: add-patch.c:1505
787 msgid "No other hunks to search"
788 msgstr "沒有其它可供尋找的區塊"
789
608 -#: add-patch.c:1201 git-add--interactive.perl:1623
790 +#: add-patch.c:1511 git-add--interactive.perl:1623
791 msgid "search for regex? "
792 msgstr "使用正規表示式搜尋？"
793
612 -#: add-patch.c:1216
794 +#: add-patch.c:1526
795 #, c-format
614 -#| msgid "Malformed search regexp %s: %s\n"
796 msgid "Malformed search regexp %s: %s"
797 msgstr "錯誤的正規表示式 %s：%s"
798
618 -#: add-patch.c:1233
619 -#| msgid "No hunk matches the given pattern\n"
799 +#: add-patch.c:1543
800 msgid "No hunk matches the given pattern"
801 msgstr "沒有和提供模式相符合的區塊"
802
623 -#: add-patch.c:1240
624 -#| msgid "Sorry, cannot split this hunk\n"
803 +#: add-patch.c:1550
804 msgid "Sorry, cannot split this hunk"
805 msgstr "對不起，不能分割這個區塊"
806
628 -#: add-patch.c:1244
807 +#: add-patch.c:1554
808 #, c-format
630 -#| msgid "Split into %d hunk.\n"
631 -#| msgid_plural "Split into %d hunks.\n"
809 msgid "Split into %d hunks."
810 msgstr "分割為 %d 塊。"
811
635 -#: add-patch.c:1248
636 -#| msgid "Sorry, cannot edit this hunk\n"
812 +#: add-patch.c:1558
813 msgid "Sorry, cannot edit this hunk"
814 msgstr "對不起，不能編輯這個區塊"
815
640 -#: advice.c:111
816 +#: add-patch.c:1609
817 +msgid "'git apply' failed"
818 +msgstr "'git apply' 失敗"
819 +
820 +#: advice.c:115
821 #, c-format
822 msgid "%shint: %.*s%s\n"
823 msgstr "%s提示：%.*s%s\n"
824
645 -#: advice.c:164
825 +#: advice.c:168
826 msgid "Cherry-picking is not possible because you have unmerged files."
827 msgstr "無法揀選，因為您有未合併的檔案。"
828
649 -#: advice.c:166
829 +#: advice.c:170
830 msgid "Committing is not possible because you have unmerged files."
831 msgstr "無法提交，因為您有未合併的檔案。"
832
653 -#: advice.c:168
833 +#: advice.c:172
834 msgid "Merging is not possible because you have unmerged files."
835 msgstr "無法合併，因為您有未合併的檔案。"
836
657 -#: advice.c:170
837 +#: advice.c:174
838 msgid "Pulling is not possible because you have unmerged files."
839 msgstr "無法拉取，因為您有未合併的檔案。"
840
661 -#: advice.c:172
841 +#: advice.c:176
842 msgid "Reverting is not possible because you have unmerged files."
843 msgstr "無法還原提交，因為您有未合併的檔案。"
844
665 -#: advice.c:174
845 +#: advice.c:178
846 #, c-format
847 msgid "It is not possible to %s because you have unmerged files."
848 msgstr "無法 %s，因為您有未合併的檔案。"
849
670 -#: advice.c:182
850 +#: advice.c:186
851 msgid ""
852 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
853 "as appropriate to mark resolution and make a commit."
@@ -675,23 +855,23 @@ msgstr ""
855 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
856 "解決方案並提交。"
857
678 -#: advice.c:190
858 +#: advice.c:194
859 msgid "Exiting because of an unresolved conflict."
860 msgstr "因為存在未解決的衝突而離開。"
861
682 -#: advice.c:195 builtin/merge.c:1332
862 +#: advice.c:199 builtin/merge.c:1335
863 msgid "You have not concluded your merge (MERGE_HEAD exists)."
864 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
865
686 -#: advice.c:197
866 +#: advice.c:201
867 msgid "Please, commit your changes before merging."
868 msgstr "請在合併前先提交您的修改。"
869
690 -#: advice.c:198
870 +#: advice.c:202
871 msgid "Exiting because of unfinished merge."
872 msgstr "因為存在未完成的合併而離開。"
873
694 -#: advice.c:204
874 +#: advice.c:208
875 #, c-format
876 msgid ""
877 "Note: switching to '%s'.\n"
@@ -823,7 +1003,6 @@ msgid_plural ""
1003 "git diff header lacks filename information when removing %d leading pathname "
1004 "components (line %d)"
1005 msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
826 -msgstr[1] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
1006
1007 #: apply.c:1385
1008 #, c-format
@@ -903,7 +1082,6 @@ msgstr "無效的行首字元：'%c'"
1082 msgid "Hunk #%d succeeded at %d (offset %d line)."
1083 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1084 msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）"
906 -msgstr[1] "區塊 #%d 成功套用於 %d（位移 %d 行）"
1085
1086 #: apply.c:3069
1087 #, c-format
@@ -934,416 +1112,412 @@ msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位
1112 msgid "cannot apply binary patch to '%s' without full index line"
1113 msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
1114
937 -#: apply.c:3162
1115 +#: apply.c:3163
1116 #, c-format
1117 msgid ""
1118 "the patch applies to '%s' (%s), which does not match the current contents."
1119 msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
1120
943 -#: apply.c:3170
1121 +#: apply.c:3171
1122 #, c-format
1123 msgid "the patch applies to an empty '%s' but it is not empty"
1124 msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
1125
948 -#: apply.c:3188
1126 +#: apply.c:3189
1127 #, c-format
1128 msgid "the necessary postimage %s for '%s' cannot be read"
1129 msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
1130
953 -#: apply.c:3201
1131 +#: apply.c:3202
1132 #, c-format
1133 msgid "binary patch does not apply to '%s'"
1134 msgstr "二進位修補檔未套用到 '%s'"
1135
958 -#: apply.c:3207
1136 +#: apply.c:3209
1137 #, c-format
1138 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1139 msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
1140
963 -#: apply.c:3228
1141 +#: apply.c:3230
1142 #, c-format
1143 msgid "patch failed: %s:%ld"
1144 msgstr "打修補檔失敗：%s:%ld"
1145
968 -#: apply.c:3351
1146 +#: apply.c:3353
1147 #, c-format
1148 msgid "cannot checkout %s"
1149 msgstr "不能簽出 %s"
1150
973 -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
1151 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
1152 #, c-format
1153 msgid "failed to read %s"
1154 msgstr "無法讀取 %s"
1155
978 -#: apply.c:3411
1156 +#: apply.c:3413
1157 #, c-format
1158 msgid "reading from '%s' beyond a symbolic link"
1159 msgstr "讀取位於符號連結中的 '%s'"
1160
983 -#: apply.c:3440 apply.c:3683
1161 +#: apply.c:3442 apply.c:3685
1162 #, c-format
1163 msgid "path %s has been renamed/deleted"
1164 msgstr "路徑 %s 已經被重新命名/刪除"
1165
988 -#: apply.c:3526 apply.c:3698
1166 +#: apply.c:3528 apply.c:3700
1167 #, c-format
1168 msgid "%s: does not exist in index"
1169 msgstr "%s：不存在於索引中"
1170
993 -#: apply.c:3535 apply.c:3706
1171 +#: apply.c:3537 apply.c:3708
1172 #, c-format
1173 msgid "%s: does not match index"
1174 msgstr "%s：和索引不符合"
1175
998 -#: apply.c:3570
1176 +#: apply.c:3572
1177 msgid "repository lacks the necessary blob to fall back on 3-way merge."
1178 msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
1179
1002 -#: apply.c:3573
1180 +#: apply.c:3575
1181 #, c-format
1182 msgid "Falling back to three-way merge...\n"
1183 msgstr "回落到三方合併...\n"
1184
1007 -#: apply.c:3589 apply.c:3593
1185 +#: apply.c:3591 apply.c:3595
1186 #, c-format
1187 msgid "cannot read the current contents of '%s'"
1188 msgstr "無法讀取 '%s' 的目前內容"
1189
1012 -#: apply.c:3605
1190 +#: apply.c:3607
1191 #, c-format
1192 msgid "Failed to fall back on three-way merge...\n"
1193 msgstr "無法回落到三方合併...\n"
1194
1017 -#: apply.c:3619
1195 +#: apply.c:3621
1196 #, c-format
1197 msgid "Applied patch to '%s' with conflicts.\n"
1198 msgstr "套用修補檔到 '%s' 存在衝突。\n"
1199
1022 -#: apply.c:3624
1200 +#: apply.c:3626
1201 #, c-format
1202 msgid "Applied patch to '%s' cleanly.\n"
1203 msgstr "成功套用修補檔到 '%s'。\n"
1204
1027 -#: apply.c:3650
1205 +#: apply.c:3652
1206 msgid "removal patch leaves file contents"
1207 msgstr "移除修補檔仍留下了檔案內容"
1208
1031 -#: apply.c:3723
1209 +#: apply.c:3725
1210 #, c-format
1211 msgid "%s: wrong type"
1212 msgstr "%s：錯誤類型"
1213
1036 -#: apply.c:3725
1214 +#: apply.c:3727
1215 #, c-format
1216 msgid "%s has type %o, expected %o"
1217 msgstr "%s 的類型是 %o，應為 %o"
1218
1041 -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
1042 -#: read-cache.c:1320
1219 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1220 +#: read-cache.c:1325
1221 #, c-format
1222 msgid "invalid path '%s'"
1223 msgstr "無效路徑 '%s'"
1224
1047 -#: apply.c:3934
1225 +#: apply.c:3936
1226 #, c-format
1227 msgid "%s: already exists in index"
1228 msgstr "%s：已經存在於索引中"
1229
1052 -#: apply.c:3937
1230 +#: apply.c:3939
1231 #, c-format
1232 msgid "%s: already exists in working directory"
1233 msgstr "%s：已經存在於工作區中"
1234
1057 -#: apply.c:3957
1235 +#: apply.c:3959
1236 #, c-format
1237 msgid "new mode (%o) of %s does not match old mode (%o)"
1238 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
1239
1062 -#: apply.c:3962
1240 +#: apply.c:3964
1241 #, c-format
1242 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1243 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
1244
1067 -#: apply.c:3982
1245 +#: apply.c:3984
1246 #, c-format
1247 msgid "affected file '%s' is beyond a symbolic link"
1248 msgstr "受影響的檔案 '%s' 位於符號連結中"
1249
1072 -#: apply.c:3986
1250 +#: apply.c:3988
1251 #, c-format
1252 msgid "%s: patch does not apply"
1253 msgstr "%s：修補檔未套用"
1254
1077 -#: apply.c:4001
1255 +#: apply.c:4003
1256 #, c-format
1257 msgid "Checking patch %s..."
1258 msgstr "正在檢查修補檔 %s..."
1259
1082 -#: apply.c:4093
1260 +#: apply.c:4095
1261 #, c-format
1262 msgid "sha1 information is lacking or useless for submodule %s"
1263 msgstr "子模組 %s 的 sha1 訊息缺少或無效"
1264
1087 -#: apply.c:4100
1265 +#: apply.c:4102
1266 #, c-format
1267 msgid "mode change for %s, which is not in current HEAD"
1268 msgstr "%s 的模式變更，但它不在目前 HEAD 中"
1269
1092 -#: apply.c:4103
1270 +#: apply.c:4105
1271 #, c-format
1272 msgid "sha1 information is lacking or useless (%s)."
1273 msgstr "sha1 訊息缺少或無效（%s）。"
1274
1097 -#: apply.c:4112
1275 +#: apply.c:4114
1276 #, c-format
1277 msgid "could not add %s to temporary index"
1278 msgstr "不能在暫時索引中新增 %s"
1279
1102 -#: apply.c:4122
1280 +#: apply.c:4124
1281 #, c-format
1282 msgid "could not write temporary index to %s"
1283 msgstr "不能把暫時索引寫入到 %s"
1284
1107 -#: apply.c:4260
1285 +#: apply.c:4262
1286 #, c-format
1287 msgid "unable to remove %s from index"
1288 msgstr "不能從索引中移除 %s"
1289
1112 -#: apply.c:4294
1290 +#: apply.c:4296
1291 #, c-format
1292 msgid "corrupt patch for submodule %s"
1293 msgstr "子模組 %s 損壞的修補檔"
1294
1117 -#: apply.c:4300
1295 +#: apply.c:4302
1296 #, c-format
1297 msgid "unable to stat newly created file '%s'"
1298 msgstr "不能對建立檔案 '%s' 呼叫 stat"
1299
1122 -#: apply.c:4308
1300 +#: apply.c:4310
1301 #, c-format
1302 msgid "unable to create backing store for newly created file %s"
1303 msgstr "不能為建立檔案 %s 建立後端儲存"
1304
1127 -#: apply.c:4314 apply.c:4459
1305 +#: apply.c:4316 apply.c:4461
1306 #, c-format
1307 msgid "unable to add cache entry for %s"
1308 msgstr "無法為 %s 新增快取條目"
1309
1132 -#: apply.c:4357
1310 +#: apply.c:4359
1311 #, c-format
1312 msgid "failed to write to '%s'"
1313 msgstr "寫入 '%s' 失敗"
1314
1137 -#: apply.c:4361
1315 +#: apply.c:4363
1316 #, c-format
1317 msgid "closing file '%s'"
1318 msgstr "關閉檔案 '%s'"
1319
1142 -#: apply.c:4431
1320 +#: apply.c:4433
1321 #, c-format
1322 msgid "unable to write file '%s' mode %o"
1323 msgstr "不能寫入檔案 '%s' 權限 %o"
1324
1147 -#: apply.c:4529
1325 +#: apply.c:4531
1326 #, c-format
1327 msgid "Applied patch %s cleanly."
1328 msgstr "成功套用修補檔 %s。"
1329
1152 -#: apply.c:4537
1330 +#: apply.c:4539
1331 msgid "internal error"
1332 msgstr "內部錯誤"
1333
1156 -#: apply.c:4540
1334 +#: apply.c:4542
1335 #, c-format
1336 msgid "Applying patch %%s with %d reject..."
1337 msgid_plural "Applying patch %%s with %d rejects..."
1338 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
1161 -msgstr[1] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
1339
1163 -#: apply.c:4551
1340 +#: apply.c:4553
1341 #, c-format
1342 msgid "truncating .rej filename to %.*s.rej"
1343 msgstr "截短 .rej 檔案名為 %.*s.rej"
1344
1168 -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
1345 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
1346 #, c-format
1347 msgid "cannot open %s"
1348 msgstr "不能開啟 %s"
1349
1173 -#: apply.c:4573
1350 +#: apply.c:4575
1351 #, c-format
1352 msgid "Hunk #%d applied cleanly."
1353 msgstr "第 #%d 個片段成功應用。"
1354
1178 -#: apply.c:4577
1355 +#: apply.c:4579
1356 #, c-format
1357 msgid "Rejected hunk #%d."
1358 msgstr "拒絕第 #%d 個片段。"
1359
1183 -#: apply.c:4696
1360 +#: apply.c:4698
1361 #, c-format
1362 msgid "Skipped patch '%s'."
1363 msgstr "略過修補檔 '%s'。"
1364
1188 -#: apply.c:4704
1365 +#: apply.c:4706
1366 msgid "unrecognized input"
1367 msgstr "未能識別的輸入"
1368
1192 -#: apply.c:4724
1369 +#: apply.c:4726
1370 msgid "unable to read index file"
1371 msgstr "無法讀取索引檔案"
1372
1196 -#: apply.c:4881
1373 +#: apply.c:4883
1374 #, c-format
1375 msgid "can't open patch '%s': %s"
1376 msgstr "不能開啟修補檔 '%s'：%s"
1377
1201 -#: apply.c:4908
1378 +#: apply.c:4910
1379 #, c-format
1380 msgid "squelched %d whitespace error"
1381 msgid_plural "squelched %d whitespace errors"
1382 msgstr[0] "抑制下仍有 %d 個空白字元誤用"
1206 -msgstr[1] "抑制下仍有 %d 個空白字元誤用"
1383
1208 -#: apply.c:4914 apply.c:4929
1384 +#: apply.c:4916 apply.c:4931
1385 #, c-format
1386 msgid "%d line adds whitespace errors."
1387 msgid_plural "%d lines add whitespace errors."
1388 msgstr[0] "%d 行新增了空白字元誤用。"
1213 -msgstr[1] "%d 行新增了空白字元誤用。"
1389
1215 -#: apply.c:4922
1390 +#: apply.c:4924
1391 #, c-format
1392 msgid "%d line applied after fixing whitespace errors."
1393 msgid_plural "%d lines applied after fixing whitespace errors."
1394 msgstr[0] "修復空白錯誤後，應用了 %d 行。"
1220 -msgstr[1] "修復空白錯誤後，應用了 %d 行。"
1395
1222 -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
1396 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
1397 msgid "Unable to write new index file"
1398 msgstr "無法寫入新索引檔案"
1399
1226 -#: apply.c:4966
1400 +#: apply.c:4968
1401 msgid "don't apply changes matching the given path"
1402 msgstr "不要應用與給出路徑向符合的變更"
1403
1230 -#: apply.c:4969
1404 +#: apply.c:4971
1405 msgid "apply changes matching the given path"
1406 msgstr "應用與給出路徑向符合的變更"
1407
1234 -#: apply.c:4971 builtin/am.c:2206
1408 +#: apply.c:4973 builtin/am.c:2206
1409 msgid "num"
1410 msgstr "數字"
1411
1238 -#: apply.c:4972
1412 +#: apply.c:4974
1413 msgid "remove <num> leading slashes from traditional diff paths"
1414 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
1415
1242 -#: apply.c:4975
1416 +#: apply.c:4977
1417 msgid "ignore additions made by the patch"
1418 msgstr "忽略修補檔中的新增的檔案"
1419
1246 -#: apply.c:4977
1420 +#: apply.c:4979
1421 msgid "instead of applying the patch, output diffstat for the input"
1422 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
1423
1250 -#: apply.c:4981
1424 +#: apply.c:4983
1425 msgid "show number of added and deleted lines in decimal notation"
1426 msgstr "以十進位數顯示新增和刪除的行數"
1427
1254 -#: apply.c:4983
1428 +#: apply.c:4985
1429 msgid "instead of applying the patch, output a summary for the input"
1430 msgstr "不套用修補檔，而是顯示輸入的概要"
1431
1258 -#: apply.c:4985
1432 +#: apply.c:4987
1433 msgid "instead of applying the patch, see if the patch is applicable"
1434 msgstr "不套用修補檔，而是檢視修補檔是否可應用"
1435
1262 -#: apply.c:4987
1436 +#: apply.c:4989
1437 msgid "make sure the patch is applicable to the current index"
1438 msgstr "確認修補檔可以套用到目前索引"
1439
1266 -#: apply.c:4989
1440 +#: apply.c:4991
1441 msgid "mark new files with `git add --intent-to-add`"
1442 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
1443
1270 -#: apply.c:4991
1444 +#: apply.c:4993
1445 msgid "apply a patch without touching the working tree"
1446 msgstr "套用修補檔而不修改工作區"
1447
1274 -#: apply.c:4993
1448 +#: apply.c:4995
1449 msgid "accept a patch that touches outside the working area"
1450 msgstr "接受修改工作區之外檔案的修補檔"
1451
1278 -#: apply.c:4996
1452 +#: apply.c:4998
1453 msgid "also apply the patch (use with --stat/--summary/--check)"
1454 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
1455
1282 -#: apply.c:4998
1456 +#: apply.c:5000
1457 msgid "attempt three-way merge if a patch does not apply"
1458 msgstr "如果一個修補檔不能應用則嘗試三方合併"
1459
1286 -#: apply.c:5000
1460 +#: apply.c:5002
1461 msgid "build a temporary index based on embedded index information"
1462 msgstr "建立一個暫時索引基於嵌入的索引訊息"
1463
1290 -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
1464 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
1465 msgid "paths are separated with NUL character"
1466 msgstr "路徑以 NUL 字元分隔"
1467
1294 -#: apply.c:5005
1468 +#: apply.c:5007
1469 msgid "ensure at least <n> lines of context match"
1470 msgstr "確保至少符合 <n> 行上下文"
1471
1298 -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
1472 +#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
1473 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1300 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
1474 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1475 msgid "action"
1476 msgstr "動作"
1477
1304 -#: apply.c:5007
1478 +#: apply.c:5009
1479 msgid "detect new or modified lines that have whitespace errors"
1480 msgstr "檢查新增和修改的行中間的空白字元濫用"
1481
1308 -#: apply.c:5010 apply.c:5013
1482 +#: apply.c:5012 apply.c:5015
1483 msgid "ignore changes in whitespace when finding context"
1484 msgstr "尋找上下文時忽略空白字元的變更"
1485
1312 -#: apply.c:5016
1486 +#: apply.c:5018
1487 msgid "apply the patch in reverse"
1488 msgstr "反向套用修補檔"
1489
1316 -#: apply.c:5018
1490 +#: apply.c:5020
1491 msgid "don't expect at least one line of context"
1492 msgstr "無需至少一行上下文"
1493
1320 -#: apply.c:5020
1494 +#: apply.c:5022
1495 msgid "leave the rejected hunks in corresponding *.rej files"
1496 msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"
1497
1324 -#: apply.c:5022
1498 +#: apply.c:5024
1499 msgid "allow overlapping hunks"
1500 msgstr "允許重疊的修補檔片段"
1501
1328 -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
1329 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
1502 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1503 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
1504 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1505 msgid "be verbose"
1506 msgstr "詳細輸出"
1507
1334 -#: apply.c:5025
1508 +#: apply.c:5027
1509 msgid "tolerate incorrectly detected missing new-line at the end of file"
1510 msgstr "允許不正確的檔案末尾換行符號"
1511
1338 -#: apply.c:5028
1512 +#: apply.c:5030
1513 msgid "do not trust the line counts in the hunk headers"
1514 msgstr "不信任修補檔片段的標頭訊息中的行號"
1515
1342 -#: apply.c:5030 builtin/am.c:2194
1516 +#: apply.c:5032 builtin/am.c:2194
1517 msgid "root"
1518 msgstr "根目錄"
1519
1346 -#: apply.c:5031
1520 +#: apply.c:5033
1521 msgid "prepend <root> to all filenames"
1522 msgstr "為所有檔案名前新增 <根目錄>"
1523
@@ -1358,13 +1532,14 @@ msgstr "git archive --list"
1532 #: archive.c:16
1533 msgid ""
1534 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
1361 -msgstr "git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]"
1535 +msgstr ""
1536 +"git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]"
1537
1538 #: archive.c:17
1539 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1540 msgstr "git archive --remote <版本庫> [--exec <指令>] --list"
1541
1367 -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
1542 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
1543 #, c-format
1544 msgid "pathspec '%s' did not match any files"
1545 msgstr "路徑規格 '%s' 未符合任何檔案"
@@ -1405,8 +1580,8 @@ msgid "prepend prefix to each pathname in the archive"
1580 msgstr "為歸檔中每個路徑名加上前綴"
1581
1582 #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1408 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
1409 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
1583 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1584 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
1585 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1586 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1587 #: parse-options.h:190
@@ -1442,7 +1617,7 @@ msgid "list supported archive formats"
1617 msgstr "列出支援的歸檔格式"
1618
1619 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1445 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
1620 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1621 msgid "repo"
1622 msgstr "版本庫"
1623
@@ -1481,17 +1656,17 @@ msgstr "未知歸檔格式 '%s'"
1656 msgid "Argument not supported for format '%s': -%d"
1657 msgstr "參數不支援此格式 '%s'：-%d"
1658
1484 -#: archive-tar.c:125 archive-zip.c:350
1659 +#: archive-tar.c:125 archive-zip.c:351
1660 #, c-format
1661 msgid "cannot stream blob %s"
1662 msgstr "不能開啟資料物件 %s"
1663
1489 -#: archive-tar.c:266 archive-zip.c:368
1664 +#: archive-tar.c:266 archive-zip.c:369
1665 #, c-format
1666 msgid "unsupported file mode: 0%o (SHA1: %s)"
1667 msgstr "不支援的檔案模式：0%o (SHA1: %s)"
1668
1494 -#: archive-tar.c:293 archive-zip.c:358
1669 +#: archive-tar.c:293 archive-zip.c:359
1670 #, c-format
1671 msgid "cannot read %s"
1672 msgstr "不能讀取 %s"
@@ -1520,12 +1695,12 @@ msgstr "路徑不是有效的 UTF-8：%s"
1695 msgid "path too long (%d chars, SHA1: %s): %s"
1696 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1697
1523 -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1698 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
1699 #, c-format
1700 msgid "deflate error (%d)"
1701 msgstr "壓縮錯誤 (%d)"
1702
1528 -#: archive-zip.c:614
1703 +#: archive-zip.c:615
1704 #, c-format
1705 msgid "timestamp too large for this system: %<PRIuMAX>"
1706 msgstr "對於本系統時間戳太大：%<PRIuMAX>"
@@ -1558,12 +1733,12 @@ msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
1733 msgid "We cannot bisect more!\n"
1734 msgstr "我們無法進行更多的二分尋找！\n"
1735
1561 -#: bisect.c:733
1736 +#: bisect.c:745
1737 #, c-format
1738 msgid "Not a valid commit name %s"
1739 msgstr "不是一個有效的提交名 %s"
1740
1566 -#: bisect.c:758
1741 +#: bisect.c:770
1742 #, c-format
1743 msgid ""
1744 "The merge base %s is bad.\n"
@@ -1572,7 +1747,7 @@ msgstr ""
1747 "合併基礎 %s 是壞的。\n"
1748 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
1749
1575 -#: bisect.c:763
1750 +#: bisect.c:775
1751 #, c-format
1752 msgid ""
1753 "The merge base %s is new.\n"
@@ -1581,7 +1756,7 @@ msgstr ""
1756 "合併基礎 %s 是新的。\n"
1757 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"
1758
1584 -#: bisect.c:768
1759 +#: bisect.c:780
1760 #, c-format
1761 msgid ""
1762 "The merge base %s is %s.\n"
@@ -1590,7 +1765,7 @@ msgstr ""
1765 "合併基礎 %s 是 %s。\n"
1766 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
1767
1593 -#: bisect.c:776
1768 +#: bisect.c:788
1769 #, c-format
1770 msgid ""
1771 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1601,7 +1776,7 @@ msgstr ""
1776 "這種情況下 git 二分尋找無法正常工作。\n"
1777 "您可能弄錯了 %s 和 %s 版本？\n"
1778
1604 -#: bisect.c:789
1779 +#: bisect.c:801
1780 #, c-format
1781 msgid ""
1782 "the merge base between %s and [%s] must be skipped.\n"
@@ -1612,36 +1787,36 @@ msgstr ""
1787 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
1788 "我們仍舊繼續。"
1789
1615 -#: bisect.c:822
1790 +#: bisect.c:840
1791 #, c-format
1792 msgid "Bisecting: a merge base must be tested\n"
1793 msgstr "二分尋找中：合併基礎必須是經過測試的\n"
1794
1620 -#: bisect.c:865
1795 +#: bisect.c:890
1796 #, c-format
1797 msgid "a %s revision is needed"
1798 msgstr "需要一個 %s 版本"
1799
1625 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
1800 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
1801 #, c-format
1802 msgid "could not create file '%s'"
1803 msgstr "不能建立檔案 '%s'"
1804
1630 -#: bisect.c:928 builtin/merge.c:148
1805 +#: bisect.c:966 builtin/merge.c:149
1806 #, c-format
1807 msgid "could not read file '%s'"
1808 msgstr "不能讀取檔案 '%s'"
1809
1635 -#: bisect.c:958
1810 +#: bisect.c:997
1811 msgid "reading bisect refs failed"
1812 msgstr "讀取二分尋找引用失敗"
1813
1639 -#: bisect.c:977
1814 +#: bisect.c:1019
1815 #, c-format
1816 msgid "%s was both %s and %s\n"
1817 msgstr "%s 同時為 %s 和 %s\n"
1818
1644 -#: bisect.c:985
1819 +#: bisect.c:1028
1820 #, c-format
1821 msgid ""
1822 "No testable commit found.\n"
@@ -1650,22 +1825,20 @@ msgstr ""
1825 "沒有發現可測試的提交。\n"
1826 "可能您在執行時使用了錯誤的路徑參數？\n"
1827
1653 -#: bisect.c:1004
1828 +#: bisect.c:1057
1829 #, c-format
1830 msgid "(roughly %d step)"
1831 msgid_plural "(roughly %d steps)"
1832 msgstr[0] "（大概 %d 步）"
1658 -msgstr[1] "（大概 %d 步）"
1833
1834 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1835 #. steps)" translation.
1836 #.
1663 -#: bisect.c:1010
1837 +#: bisect.c:1063
1838 #, c-format
1839 msgid "Bisecting: %d revision left to test after this %s\n"
1840 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1841 msgstr[0] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n"
1668 -msgstr[1] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n"
1842
1843 #: blame.c:2700
1844 msgid "--contents and --reverse do not blend well."
@@ -1679,10 +1852,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用"
1852 msgid "--reverse and --first-parent together require specified latest commit"
1853 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1854
1682 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
1683 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
1684 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
1685 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
1855 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
1856 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
1857 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
1858 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
1859 #: builtin/shortlog.c:192
1860 msgid "revision walk setup failed"
1861 msgstr "版本遍歷設定失敗"
@@ -1845,8 +2018,8 @@ msgstr "'%s' 不像是一個 v2 版本的包檔案"
2018 msgid "unrecognized header: %s%s (%d)"
2019 msgstr "未能識別的包頭：%s%s (%d)"
2020
1848 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
1849 -#: builtin/commit.c:811
2021 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
2022 +#: builtin/commit.c:815
2023 #, c-format
2024 msgid "could not open '%s'"
2025 msgstr "不能開啟 '%s'"
@@ -1863,8 +2036,7 @@ msgstr "需要版本庫驗證一個包"
2036 #, c-format
2037 msgid "The bundle contains this ref:"
2038 msgid_plural "The bundle contains these %d refs:"
1866 -msgstr[0] "這個包中含有這個引用："
1867 -msgstr[1] "這個包中含有 %d 個引用："
2039 +msgstr[0] "這個包中含有這 %d 個引用："
2040
2041 #: bundle.c:204
2042 msgid "The bundle records a complete history."
@@ -1874,8 +2046,7 @@ msgstr "這個包記錄一個完整歷史。"
2046 #, c-format
2047 msgid "The bundle requires this ref:"
2048 msgid_plural "The bundle requires these %d refs:"
1877 -msgstr[0] "這個包需要這個引用："
1878 -msgstr[1] "這個包需要 %d 個引用："
2049 +msgstr[0] "這個包需要這 %d 個引用："
2050
2051 #: bundle.c:273
2052 msgid "unable to dup bundle descriptor"
@@ -1916,13 +2087,13 @@ msgstr "不能建立 '%s'"
2087 msgid "index-pack died"
2088 msgstr "index-pack 終止"
2089
1919 -#: color.c:296
2090 +#: color.c:329
2091 #, c-format
2092 msgid "invalid color value: %.*s"
2093 msgstr "無效的顏色值：%.*s"
2094
1924 -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
1925 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
2095 +#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
2096 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
2097 #, c-format
2098 msgid "could not parse %s"
2099 msgstr "不能解析 %s"
@@ -1952,27 +2123,27 @@ msgstr ""
2123 "設定 \"git config advice.graftFileDeprecated false\"\n"
2124 "可關閉本消息"
2125
1955 -#: commit.c:1152
2126 +#: commit.c:1153
2127 #, c-format
2128 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2129 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
2130
1960 -#: commit.c:1155
2131 +#: commit.c:1157
2132 #, c-format
2133 msgid "Commit %s has a bad GPG signature allegedly by %s."
2134 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
2135
1965 -#: commit.c:1158
2136 +#: commit.c:1160
2137 #, c-format
2138 msgid "Commit %s does not have a GPG signature."
2139 msgstr "提交 %s 沒有 GPG 簽名。"
2140
1970 -#: commit.c:1161
2141 +#: commit.c:1163
2142 #, c-format
2143 msgid "Commit %s has a good GPG signature by %s\n"
2144 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
2145
1975 -#: commit.c:1415
2146 +#: commit.c:1417
2147 msgid ""
2148 "Warning: commit message did not conform to UTF-8.\n"
2149 "You may want to amend it after fixing the message, or set the config\n"
@@ -1982,253 +2153,250 @@ msgstr ""
2153 "您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
2154 "設定為您項目所用的字元編碼。\n"
2155
1985 -#: commit-graph.c:130
2156 +#: commit-graph.c:122
2157 msgid "commit-graph file is too small"
2158 msgstr "提交圖形檔案太小"
2159
1989 -#: commit-graph.c:195
2160 +#: commit-graph.c:189
2161 #, c-format
2162 msgid "commit-graph signature %X does not match signature %X"
2163 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
2164
1994 -#: commit-graph.c:202
2165 +#: commit-graph.c:196
2166 #, c-format
2167 msgid "commit-graph version %X does not match version %X"
2168 msgstr "提交圖形版本 %X 和版本 %X 不符合"
2169
1999 -#: commit-graph.c:209
2170 +#: commit-graph.c:203
2171 #, c-format
2172 msgid "commit-graph hash version %X does not match version %X"
2173 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
2174
2004 -#: commit-graph.c:232
2175 +#: commit-graph.c:226
2176 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2177 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"
2178
2008 -#: commit-graph.c:243
2179 +#: commit-graph.c:237
2180 #, c-format
2181 msgid "commit-graph improper chunk offset %08x%08x"
2182 msgstr "提交圖形不正確的區塊位移 %08x%08x"
2183
2013 -#: commit-graph.c:286
2184 +#: commit-graph.c:280
2185 #, c-format
2186 msgid "commit-graph chunk id %08x appears multiple times"
2187 msgstr "提交圖形區塊 id %08x 出現了多次"
2188
2018 -#: commit-graph.c:350
2189 +#: commit-graph.c:343
2190 msgid "commit-graph has no base graphs chunk"
2191 msgstr "提交圖形沒有基礎圖形區塊"
2192
2022 -#: commit-graph.c:360
2193 +#: commit-graph.c:353
2194 msgid "commit-graph chain does not match"
2195 msgstr "提交圖形鏈不符合"
2196
2026 -#: commit-graph.c:407
2197 +#: commit-graph.c:401
2198 #, c-format
2199 msgid "invalid commit-graph chain: line '%s' not a hash"
2200 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
2201
2031 -#: commit-graph.c:433
2202 +#: commit-graph.c:425
2203 msgid "unable to find all commit-graph files"
2204 msgstr "無法找到所有提交圖形檔案"
2205
2035 -#: commit-graph.c:564 commit-graph.c:624
2206 +#: commit-graph.c:558 commit-graph.c:618
2207 msgid "invalid commit position. commit-graph is likely corrupt"
2208 msgstr "無效的提交位置。提交圖形可能已損壞"
2209
2039 -#: commit-graph.c:585
2210 +#: commit-graph.c:579
2211 #, c-format
2212 msgid "could not find commit %s"
2213 msgstr "無法找到提交 %s"
2214
2044 -#: commit-graph.c:858 builtin/am.c:1287
2215 +#: commit-graph.c:852 builtin/am.c:1287
2216 #, c-format
2217 msgid "unable to parse commit %s"
2218 msgstr "不能解析提交 %s"
2219
2049 -#: commit-graph.c:1017 builtin/pack-objects.c:2641
2220 +#: commit-graph.c:1011 builtin/pack-objects.c:2782
2221 #, c-format
2222 msgid "unable to get type of object %s"
2223 msgstr "無法獲得物件 %s 類型"
2224
2054 -#: commit-graph.c:1049
2225 +#: commit-graph.c:1043
2226 msgid "Loading known commits in commit graph"
2227 msgstr "正在載入提交圖中的已知提交"
2228
2058 -#: commit-graph.c:1066
2229 +#: commit-graph.c:1060
2230 msgid "Expanding reachable commits in commit graph"
2231 msgstr "正在擴展提交圖中的可以取得提交"
2232
2062 -#: commit-graph.c:1085
2233 +#: commit-graph.c:1079
2234 msgid "Clearing commit marks in commit graph"
2235 msgstr "正在清除提交圖中的提交標記"
2236
2066 -#: commit-graph.c:1104
2237 +#: commit-graph.c:1098
2238 msgid "Computing commit graph generation numbers"
2239 msgstr "正在計算提交圖世代數字"
2240
2070 -#: commit-graph.c:1179
2241 +#: commit-graph.c:1173
2242 #, c-format
2243 msgid "Finding commits for commit graph in %d pack"
2244 msgid_plural "Finding commits for commit graph in %d packs"
2245 msgstr[0] "正在 %d 個包中尋找提交圖的提交"
2075 -msgstr[1] "正在 %d 個包中尋找提交圖的提交"
2246
2077 -#: commit-graph.c:1192
2247 +#: commit-graph.c:1186
2248 #, c-format
2249 msgid "error adding pack %s"
2250 msgstr "新增包 %s 發生錯誤"
2251
2082 -#: commit-graph.c:1196
2252 +#: commit-graph.c:1190
2253 #, c-format
2254 msgid "error opening index for %s"
2255 msgstr "為 %s 開啟索引發生錯誤"
2256
2087 -#: commit-graph.c:1220
2257 +#: commit-graph.c:1214
2258 #, c-format
2259 msgid "Finding commits for commit graph from %d ref"
2260 msgid_plural "Finding commits for commit graph from %d refs"
2261 msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
2092 -msgstr[1] "正在從 %d 個引用中尋找提交圖的提交"
2262
2094 -#: commit-graph.c:1240
2263 +#: commit-graph.c:1234
2264 #, c-format
2265 msgid "invalid commit object id: %s"
2266 msgstr "無效的提交物件 ID：%s"
2267
2099 -#: commit-graph.c:1255
2268 +#: commit-graph.c:1249
2269 msgid "Finding commits for commit graph among packed objects"
2270 msgstr "正在打包物件中尋找提交圖的提交"
2271
2103 -#: commit-graph.c:1270
2272 +#: commit-graph.c:1264
2273 msgid "Counting distinct commits in commit graph"
2274 msgstr "正在計算提交圖中不同的提交"
2275
2107 -#: commit-graph.c:1300
2276 +#: commit-graph.c:1294
2277 msgid "Finding extra edges in commit graph"
2278 msgstr "正在尋找提交圖中額外的邊"
2279
2111 -#: commit-graph.c:1346
2280 +#: commit-graph.c:1340
2281 msgid "failed to write correct number of base graph ids"
2282 msgstr "無法寫入正確數量的基礎圖形 ID"
2283
2115 -#: commit-graph.c:1379 midx.c:814
2284 +#: commit-graph.c:1373 midx.c:814
2285 #, c-format
2286 msgid "unable to create leading directories of %s"
2287 msgstr "不能為 %s 建立先導目錄"
2288
2120 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
2289 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
2290 #, c-format
2291 msgid "unable to create '%s'"
2292 msgstr "不能建立 '%s'"
2293
2125 -#: commit-graph.c:1451
2294 +#: commit-graph.c:1445
2295 #, c-format
2296 msgid "Writing out commit graph in %d pass"
2297 msgid_plural "Writing out commit graph in %d passes"
2298 msgstr[0] "正在用 %d 步寫出提交圖"
2130 -msgstr[1] "正在用 %d 步寫出提交圖"
2299
2132 -#: commit-graph.c:1492
2300 +#: commit-graph.c:1486
2301 msgid "unable to open commit-graph chain file"
2302 msgstr "無法開啟提交圖形鏈檔案"
2303
2136 -#: commit-graph.c:1504
2304 +#: commit-graph.c:1498
2305 msgid "failed to rename base commit-graph file"
2306 msgstr "無法重新命名基礎提交圖形檔案"
2307
2140 -#: commit-graph.c:1524
2308 +#: commit-graph.c:1518
2309 msgid "failed to rename temporary commit-graph file"
2310 msgstr "無法重新命名暫時提交圖形檔案"
2311
2144 -#: commit-graph.c:1635
2312 +#: commit-graph.c:1631
2313 msgid "Scanning merged commits"
2314 msgstr "正在掃描合併提交"
2315
2148 -#: commit-graph.c:1646
2316 +#: commit-graph.c:1642
2317 #, c-format
2318 msgid "unexpected duplicate commit id %s"
2319 msgstr "意外的重複提交 ID %s"
2320
2153 -#: commit-graph.c:1670
2321 +#: commit-graph.c:1665
2322 msgid "Merging commit-graph"
2323 msgstr "正在合併提交圖形"
2324
2157 -#: commit-graph.c:1860
2325 +#: commit-graph.c:1844
2326 #, c-format
2327 msgid "the commit graph format cannot write %d commits"
2328 msgstr "提交圖格式不能寫入 %d 個提交"
2329
2162 -#: commit-graph.c:1871
2330 +#: commit-graph.c:1855
2331 msgid "too many commits to write graph"
2332 msgstr "提交太多不能畫圖"
2333
2166 -#: commit-graph.c:1961
2334 +#: commit-graph.c:1944
2335 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2336 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
2337
2170 -#: commit-graph.c:1971
2338 +#: commit-graph.c:1954
2339 #, c-format
2340 msgid "commit-graph has incorrect OID order: %s then %s"
2341 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
2342
2175 -#: commit-graph.c:1981 commit-graph.c:1996
2343 +#: commit-graph.c:1964 commit-graph.c:1979
2344 #, c-format
2345 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2346 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
2347
2180 -#: commit-graph.c:1988
2348 +#: commit-graph.c:1971
2349 #, c-format
2350 msgid "failed to parse commit %s from commit-graph"
2351 msgstr "無法從提交圖形中解析提交 %s"
2352
2185 -#: commit-graph.c:2006
2353 +#: commit-graph.c:1989
2354 msgid "Verifying commits in commit graph"
2355 msgstr "正在驗證提交圖中的提交"
2356
2189 -#: commit-graph.c:2020
2357 +#: commit-graph.c:2003
2358 #, c-format
2359 msgid "failed to parse commit %s from object database for commit-graph"
2360 msgstr "無法從提交圖形的物件庫中解析提交 %s"
2361
2194 -#: commit-graph.c:2027
2362 +#: commit-graph.c:2010
2363 #, c-format
2364 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2365 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
2366
2199 -#: commit-graph.c:2037
2367 +#: commit-graph.c:2020
2368 #, c-format
2369 msgid "commit-graph parent list for commit %s is too long"
2370 msgstr "提交 %s 的提交圖形父提交列表太長了"
2371
2204 -#: commit-graph.c:2046
2372 +#: commit-graph.c:2029
2373 #, c-format
2374 msgid "commit-graph parent for %s is %s != %s"
2375 msgstr "%s 的提交圖形父提交是 %s != %s"
2376
2209 -#: commit-graph.c:2059
2377 +#: commit-graph.c:2042
2378 #, c-format
2379 msgid "commit-graph parent list for commit %s terminates early"
2380 msgstr "提交 %s 的提交圖形父提交列表過早終止"
2381
2214 -#: commit-graph.c:2064
2382 +#: commit-graph.c:2047
2383 #, c-format
2384 msgid ""
2385 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2386 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
2387
2220 -#: commit-graph.c:2068
2388 +#: commit-graph.c:2051
2389 #, c-format
2390 msgid ""
2391 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2392 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
2393
2226 -#: commit-graph.c:2083
2394 +#: commit-graph.c:2066
2395 #, c-format
2396 msgid "commit-graph generation for commit %s is %u != %u"
2397 msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
2398
2231 -#: commit-graph.c:2089
2399 +#: commit-graph.c:2072
2400 #, c-format
2401 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2402 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
@@ -2275,7 +2443,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s"
2443 msgid "key does not contain variable name: %s"
2444 msgstr "鍵名沒有包含變數名：%s"
2445
2278 -#: config.c:406 sequencer.c:2530
2446 +#: config.c:406 sequencer.c:2444
2447 #, c-format
2448 msgid "invalid key: %s"
2449 msgstr "無效鍵名：%s"
@@ -2411,7 +2579,7 @@ msgstr "%s 的取值格式錯誤：%s"
2579 msgid "must be one of nothing, matching, simple, upstream or current"
2580 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
2581
2414 -#: config.c:1518 builtin/pack-objects.c:3394
2582 +#: config.c:1518 builtin/pack-objects.c:3541
2583 #, c-format
2584 msgid "bad pack compression level %d"
2585 msgstr "錯誤的打包壓縮級別 %d"
@@ -2436,105 +2604,105 @@ msgstr "不能解析設定物件 '%s'"
2604 msgid "failed to parse %s"
2605 msgstr "解析 %s 失敗"
2606
2439 -#: config.c:1745
2607 +#: config.c:1743
2608 msgid "unable to parse command-line config"
2609 msgstr "無法解析指令列中的設定"
2610
2443 -#: config.c:2096
2611 +#: config.c:2097
2612 msgid "unknown error occurred while reading the configuration files"
2613 msgstr "在讀取設定檔案時遇到未知錯誤"
2614
2447 -#: config.c:2266
2615 +#: config.c:2267
2616 #, c-format
2617 msgid "Invalid %s: '%s'"
2618 msgstr "無效 %s：'%s'"
2619
2452 -#: config.c:2311
2620 +#: config.c:2312
2621 #, c-format
2622 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2623 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
2624
2457 -#: config.c:2357
2625 +#: config.c:2358
2626 #, c-format
2627 msgid "unable to parse '%s' from command-line config"
2628 msgstr "無法解析指令列設定中的 '%s'"
2629
2462 -#: config.c:2359
2630 +#: config.c:2360
2631 #, c-format
2632 msgid "bad config variable '%s' in file '%s' at line %d"
2633 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
2634
2467 -#: config.c:2440
2635 +#: config.c:2441
2636 #, c-format
2637 msgid "invalid section name '%s'"
2638 msgstr "無效的小節名稱 '%s'"
2639
2472 -#: config.c:2472
2640 +#: config.c:2473
2641 #, c-format
2642 msgid "%s has multiple values"
2643 msgstr "%s 有多個取值"
2644
2477 -#: config.c:2501
2645 +#: config.c:2502
2646 #, c-format
2647 msgid "failed to write new configuration file %s"
2648 msgstr "寫入新的設定檔案 %s 失敗"
2649
2482 -#: config.c:2753 config.c:3077
2650 +#: config.c:2754 config.c:3078
2651 #, c-format
2652 msgid "could not lock config file %s"
2653 msgstr "不能鎖定設定檔案 %s"
2654
2487 -#: config.c:2764
2655 +#: config.c:2765
2656 #, c-format
2657 msgid "opening %s"
2658 msgstr "開啟 %s"
2659
2492 -#: config.c:2799 builtin/config.c:328
2660 +#: config.c:2800 builtin/config.c:344
2661 #, c-format
2662 msgid "invalid pattern: %s"
2663 msgstr "無效模式：%s"
2664
2497 -#: config.c:2824
2665 +#: config.c:2825
2666 #, c-format
2667 msgid "invalid config file %s"
2668 msgstr "無效的設定檔案 %s"
2669
2502 -#: config.c:2837 config.c:3090
2670 +#: config.c:2838 config.c:3091
2671 #, c-format
2672 msgid "fstat on %s failed"
2673 msgstr "對 %s 呼叫 fstat 失敗"
2674
2507 -#: config.c:2848
2675 +#: config.c:2849
2676 #, c-format
2677 msgid "unable to mmap '%s'"
2678 msgstr "不能 mmap '%s'"
2679
2512 -#: config.c:2857 config.c:3095
2680 +#: config.c:2858 config.c:3096
2681 #, c-format
2682 msgid "chmod on %s failed"
2683 msgstr "對 %s 呼叫 chmod 失敗"
2684
2517 -#: config.c:2942 config.c:3192
2685 +#: config.c:2943 config.c:3193
2686 #, c-format
2687 msgid "could not write config file %s"
2688 msgstr "不能寫入設定檔案 %s"
2689
2522 -#: config.c:2976
2690 +#: config.c:2977
2691 #, c-format
2692 msgid "could not set '%s' to '%s'"
2693 msgstr "不能設定 '%s' 為 '%s'"
2694
2527 -#: config.c:2978 builtin/remote.c:781
2695 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2696 #, c-format
2697 msgid "could not unset '%s'"
2698 msgstr "不能取消設定 '%s'"
2699
2532 -#: config.c:3068
2700 +#: config.c:3069
2701 #, c-format
2702 msgid "invalid section name: %s"
2703 msgstr "無效的小節名稱：%s"
2704
2537 -#: config.c:3235
2705 +#: config.c:3236
2706 #, c-format
2707 msgid "missing value for '%s'"
2708 msgstr "%s 的取值缺少"
@@ -2697,19 +2865,19 @@ msgstr "已阻止奇怪的路徑名 '%s'"
2865 msgid "unable to fork"
2866 msgstr "無法 fork"
2867
2700 -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
2868 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
2869 msgid "Checking connectivity"
2870 msgstr "正在檢查連通性"
2871
2704 -#: connected.c:101
2872 +#: connected.c:110
2873 msgid "Could not run 'git rev-list'"
2874 msgstr "不能執行 'git rev-list'"
2875
2708 -#: connected.c:121
2876 +#: connected.c:130
2877 msgid "failed write to rev-list"
2878 msgstr "寫入 rev-list 失敗"
2879
2712 -#: connected.c:128
2880 +#: connected.c:137
2881 msgid "failed to close rev-list's stdin"
2882 msgstr "關閉 rev-list 的標準輸入失敗"
2883
@@ -2753,9 +2921,6 @@ msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM"
2921
2922 #: convert.c:291
2923 #, c-format
2756 -#| msgid ""
2757 -#| "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "
2758 -#| "working-tree-encoding."
2924 msgid ""
2925 "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
2926 "working-tree-encoding."
@@ -2848,49 +3013,42 @@ msgstr "在將來"
3013 msgid "%<PRIuMAX> second ago"
3014 msgid_plural "%<PRIuMAX> seconds ago"
3015 msgstr[0] "%<PRIuMAX> 秒鐘前"
2851 -msgstr[1] "%<PRIuMAX> 秒鐘前"
3016
3017 #: date.c:151
3018 #, c-format
3019 msgid "%<PRIuMAX> minute ago"
3020 msgid_plural "%<PRIuMAX> minutes ago"
3021 msgstr[0] "%<PRIuMAX> 分鐘前"
2858 -msgstr[1] "%<PRIuMAX> 分鐘前"
3022
3023 #: date.c:158
3024 #, c-format
3025 msgid "%<PRIuMAX> hour ago"
3026 msgid_plural "%<PRIuMAX> hours ago"
3027 msgstr[0] "%<PRIuMAX> 小時前"
2865 -msgstr[1] "%<PRIuMAX> 小時前"
3028
3029 #: date.c:165
3030 #, c-format
3031 msgid "%<PRIuMAX> day ago"
3032 msgid_plural "%<PRIuMAX> days ago"
3033 msgstr[0] "%<PRIuMAX> 天前"
2872 -msgstr[1] "%<PRIuMAX> 天前"
3034
3035 #: date.c:171
3036 #, c-format
3037 msgid "%<PRIuMAX> week ago"
3038 msgid_plural "%<PRIuMAX> weeks ago"
3039 msgstr[0] "%<PRIuMAX> 周前"
2879 -msgstr[1] "%<PRIuMAX> 周前"
3040
3041 #: date.c:178
3042 #, c-format
3043 msgid "%<PRIuMAX> month ago"
3044 msgid_plural "%<PRIuMAX> months ago"
3045 msgstr[0] "%<PRIuMAX> 個月前"
2886 -msgstr[1] "%<PRIuMAX> 個月前"
3046
3047 #: date.c:189
3048 #, c-format
3049 msgid "%<PRIuMAX> year"
3050 msgid_plural "%<PRIuMAX> years"
3051 msgstr[0] "%<PRIuMAX> 年"
2893 -msgstr[1] "%<PRIuMAX> 年"
3052
3053 #. TRANSLATORS: "%s" is "<n> years"
3054 #: date.c:192
@@ -2898,14 +3056,12 @@ msgstr[1] "%<PRIuMAX> 年"
3056 msgid "%s, %<PRIuMAX> month ago"
3057 msgid_plural "%s, %<PRIuMAX> months ago"
3058 msgstr[0] "%s %<PRIuMAX> 個月前"
2901 -msgstr[1] "%s %<PRIuMAX> 個月前"
3059
3060 #: date.c:197 date.c:202
3061 #, c-format
3062 msgid "%<PRIuMAX> year ago"
3063 msgid_plural "%<PRIuMAX> years ago"
3064 msgstr[0] "%<PRIuMAX> 年前"
2908 -msgstr[1] "%<PRIuMAX> 年前"
3065
3066 #: delta-islands.c:272
3067 msgid "Propagating island marks"
@@ -3075,7 +3231,8 @@ msgstr "--color-moved-ws 中的無效模式 '%s' "
3231 msgid ""
3232 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3233 "\"histogram\""
3078 -msgstr "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3234 +msgstr ""
3235 +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3236
3237 #: diff.c:5020 diff.c:5040
3238 #, c-format
@@ -3525,61 +3682,59 @@ msgid ""
3682 "you may want to set your %s variable to at least %d and retry the command."
3683 msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
3684
3528 -#: dir.c:554
3685 +#: dir.c:555
3686 #, c-format
3687 msgid "pathspec '%s' did not match any file(s) known to git"
3688 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
3689
3533 -#: dir.c:664
3690 +#: dir.c:695 dir.c:724 dir.c:737
3691 #, c-format
3535 -#| msgid "unrecognized option: '%s'"
3692 msgid "unrecognized pattern: '%s'"
3693 msgstr "無法識別樣式：「%s」"
3694
3539 -#: dir.c:682 dir.c:696
3695 +#: dir.c:754 dir.c:768
3696 #, c-format
3541 -#| msgid "unrecognized option: '%s'"
3697 msgid "unrecognized negative pattern: '%s'"
3698 msgstr "無法識別反向模式：「%s」"
3699
3545 -#: dir.c:714
3700 +#: dir.c:786
3701 #, c-format
3702 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3703 msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
3704
3550 -#: dir.c:724
3705 +#: dir.c:796
3706 msgid "disabling cone pattern matching"
3707 msgstr "停用 cone 樣式符合模式"
3708
3554 -#: dir.c:1101
3709 +#: dir.c:1173
3710 #, c-format
3711 msgid "cannot use %s as an exclude file"
3712 msgstr "不能將 %s 用作排除檔案"
3713
3559 -#: dir.c:2078
3714 +#: dir.c:2144
3715 #, c-format
3716 msgid "could not open directory '%s'"
3717 msgstr "不能開啟目錄 '%s'"
3718
3564 -#: dir.c:2415
3719 +#: dir.c:2479
3720 msgid "failed to get kernel name and information"
3721 msgstr "無法獲得核心名稱和訊息"
3722
3568 -#: dir.c:2539
3723 +#: dir.c:2603
3724 msgid "untracked cache is disabled on this system or location"
3725 msgstr "快取未追蹤檔案在本系統或位置中被禁用"
3726
3572 -#: dir.c:3343
3727 +#: dir.c:3407
3728 #, c-format
3729 msgid "index file corrupt in repo %s"
3730 msgstr "版本庫 %s 中的索引檔案損壞"
3731
3577 -#: dir.c:3388 dir.c:3393
3732 +#: dir.c:3452 dir.c:3457
3733 #, c-format
3734 msgid "could not create directories for %s"
3735 msgstr "不能為 %s 建立目錄"
3736
3582 -#: dir.c:3422
3737 +#: dir.c:3486
3738 #, c-format
3739 msgid "could not migrate git directory from '%s' to '%s'"
3740 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
@@ -3824,7 +3979,7 @@ msgstr "處理要取得的引用發生錯誤：%d"
3979 msgid "no matching remote head"
3980 msgstr "沒有符合的遠端分支"
3981
3827 -#: fetch-pack.c:1785 builtin/clone.c:688
3982 +#: fetch-pack.c:1785 builtin/clone.c:689
3983 msgid "remote did not send all necessary objects"
3984 msgstr "遠端沒有傳送所有必需的物件"
3985
@@ -3838,19 +3993,19 @@ msgstr "沒有這樣的遠端引用 %s"
3993 msgid "Server does not allow request for unadvertised object %s"
3994 msgstr "伺服器不允許請求未公開的物件 %s"
3995
3841 -#: gpg-interface.c:223
3996 +#: gpg-interface.c:408
3997 +msgid "gpg failed to sign the data"
3998 +msgstr "gpg 無法為資料簽名"
3999 +
4000 +#: gpg-interface.c:434
4001 msgid "could not create temporary file"
4002 msgstr "不能建立暫存檔"
4003
3845 -#: gpg-interface.c:226
4004 +#: gpg-interface.c:437
4005 #, c-format
4006 msgid "failed writing detached signature to '%s'"
4007 msgstr "無法將分離式簽名寫入 '%s'"
4008
3850 -#: gpg-interface.c:390
3851 -msgid "gpg failed to sign the data"
3852 -msgstr "gpg 無法為資料簽名"
3853 -
4009 #: graph.c:98
4010 #, c-format
4011 msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -3864,18 +4019,18 @@ msgstr ""
4019 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
4020 "功能"
4021
3867 -#: grep.c:2124
4022 +#: grep.c:2128
4023 #, c-format
4024 msgid "'%s': unable to read %s"
4025 msgstr "'%s'：無法讀取 %s"
4026
3872 -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
4027 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
4028 #: builtin/rm.c:135
4029 #, c-format
4030 msgid "failed to stat '%s'"
4031 msgstr "對 '%s' 呼叫 stat 失敗"
4032
3878 -#: grep.c:2152
4033 +#: grep.c:2156
4034 #, c-format
4035 msgid "'%s': short read"
4036 msgstr "'%s'：讀取不完整"
@@ -3925,7 +4080,6 @@ msgid "Low-level Commands / Interrogators"
4080 msgstr "低級指令/詢問者"
4081
4082 #: help.c:37
3928 -#| msgid "Low-level Commands / Synching Repositories"
4083 msgid "Low-level Commands / Syncing Repositories"
4084 msgstr "低級指令 / 同步版本庫"
4085
@@ -4010,9 +4164,6 @@ msgid_plural ""
4164 msgstr[0] ""
4165 "\n"
4166 "最類似的指令有"
4013 -msgstr[1] ""
4014 -"\n"
4015 -"最類似的指令有"
4167
4168 #: help.c:714
4169 msgid "git version [<options>]"
@@ -4033,9 +4184,6 @@ msgid_plural ""
4184 msgstr[0] ""
4185 "\n"
4186 "您指的是這個嗎？"
4036 -msgstr[1] ""
4037 -"\n"
4038 -"您指的是這其中的某一個嗎？"
4187
4188 #: ident.c:349
4189 msgid ""
@@ -4090,7 +4238,7 @@ msgstr "不允許空的姓名（對於 <%s>）"
4238 msgid "name consists only of disallowed characters: %s"
4239 msgstr "姓名中僅包含禁用字元：%s"
4240
4093 -#: ident.c:436 builtin/commit.c:631
4241 +#: ident.c:436 builtin/commit.c:635
4242 #, c-format
4243 msgid "invalid date format: %s"
4244 msgstr "無效的日期格式：%s"
@@ -4174,109 +4322,109 @@ msgid "failed to read the cache"
4322 msgstr "讀取快取失敗"
4323
4324 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
4177 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
4325 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4326 #: builtin/stash.c:264
4327 msgid "unable to write new index file"
4328 msgstr "無法寫新的索引檔案"
4329
4182 -#: merge-recursive.c:367
4330 +#: merge-recursive.c:356
4331 msgid "(bad commit)\n"
4332 msgstr "（壞提交）\n"
4333
4186 -#: merge-recursive.c:390
4334 +#: merge-recursive.c:379
4335 #, c-format
4336 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4337 msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"
4338
4191 -#: merge-recursive.c:399
4339 +#: merge-recursive.c:388
4340 #, c-format
4341 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4342 msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"
4343
4196 -#: merge-recursive.c:885
4344 +#: merge-recursive.c:874
4345 #, c-format
4346 msgid "failed to create path '%s'%s"
4347 msgstr "建立路徑 '%s'%s 失敗"
4348
4201 -#: merge-recursive.c:896
4349 +#: merge-recursive.c:885
4350 #, c-format
4351 msgid "Removing %s to make room for subdirectory\n"
4352 msgstr "刪除 %s 以便為子目錄留出空間\n"
4353
4206 -#: merge-recursive.c:910 merge-recursive.c:929
4354 +#: merge-recursive.c:899 merge-recursive.c:918
4355 msgid ": perhaps a D/F conflict?"
4356 msgstr "：可能是一個目錄/檔案衝突？"
4357
4210 -#: merge-recursive.c:919
4358 +#: merge-recursive.c:908
4359 #, c-format
4360 msgid "refusing to lose untracked file at '%s'"
4361 msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
4362
4215 -#: merge-recursive.c:960 builtin/cat-file.c:41
4363 +#: merge-recursive.c:949 builtin/cat-file.c:41
4364 #, c-format
4365 msgid "cannot read object %s '%s'"
4366 msgstr "不能讀取物件 %s '%s'"
4367
4220 -#: merge-recursive.c:965
4368 +#: merge-recursive.c:954
4369 #, c-format
4370 msgid "blob expected for %s '%s'"
4371 msgstr "%s '%s' 應為資料物件"
4372
4225 -#: merge-recursive.c:990
4373 +#: merge-recursive.c:979
4374 #, c-format
4375 msgid "failed to open '%s': %s"
4376 msgstr "開啟 '%s' 失敗：%s"
4377
4230 -#: merge-recursive.c:1001
4378 +#: merge-recursive.c:990
4379 #, c-format
4380 msgid "failed to symlink '%s': %s"
4381 msgstr "建立符號連結 '%s' 失敗：%s"
4382
4235 -#: merge-recursive.c:1006
4383 +#: merge-recursive.c:995
4384 #, c-format
4385 msgid "do not know what to do with %06o %s '%s'"
4386 msgstr "不知道如何處理 %06o %s '%s'"
4387
4240 -#: merge-recursive.c:1199
4388 +#: merge-recursive.c:1191
4389 #, c-format
4390 msgid "Failed to merge submodule %s (not checked out)"
4391 msgstr "無法合併子模組 %s （沒有簽出）"
4392
4245 -#: merge-recursive.c:1206
4393 +#: merge-recursive.c:1198
4394 #, c-format
4395 msgid "Failed to merge submodule %s (commits not present)"
4396 msgstr "無法合併子模組 %s（提交不存在）"
4397
4250 -#: merge-recursive.c:1213
4398 +#: merge-recursive.c:1205
4399 #, c-format
4400 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4401 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
4402
4255 -#: merge-recursive.c:1221 merge-recursive.c:1233
4403 +#: merge-recursive.c:1213 merge-recursive.c:1225
4404 #, c-format
4405 msgid "Fast-forwarding submodule %s to the following commit:"
4406 msgstr "子模組 %s 快轉到如下提交："
4407
4260 -#: merge-recursive.c:1224 merge-recursive.c:1236
4408 +#: merge-recursive.c:1216 merge-recursive.c:1228
4409 #, c-format
4410 msgid "Fast-forwarding submodule %s"
4411 msgstr "快轉子模組 %s"
4412
4265 -#: merge-recursive.c:1259
4413 +#: merge-recursive.c:1251
4414 #, c-format
4415 msgid "Failed to merge submodule %s (merge following commits not found)"
4416 msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
4417
4270 -#: merge-recursive.c:1263
4418 +#: merge-recursive.c:1255
4419 #, c-format
4420 msgid "Failed to merge submodule %s (not fast-forward)"
4421 msgstr "無法合併子模組 %s（非快轉）"
4422
4275 -#: merge-recursive.c:1264
4423 +#: merge-recursive.c:1256
4424 msgid "Found a possible merge resolution for the submodule:\n"
4425 msgstr "找到子模組的一個可能的合併方案：\n"
4426
4279 -#: merge-recursive.c:1267
4427 +#: merge-recursive.c:1259
4428 #, c-format
4429 msgid ""
4430 "If this is correct simply add it to the index for example\n"
@@ -4292,31 +4440,31 @@ msgstr ""
4440 "\n"
4441 "以接受此建議。\n"
4442
4295 -#: merge-recursive.c:1276
4443 +#: merge-recursive.c:1268
4444 #, c-format
4445 msgid "Failed to merge submodule %s (multiple merges found)"
4446 msgstr "無法合併子模組 %s （發現多個合併）"
4447
4300 -#: merge-recursive.c:1349
4448 +#: merge-recursive.c:1341
4449 msgid "Failed to execute internal merge"
4450 msgstr "無法執行內部合併"
4451
4304 -#: merge-recursive.c:1354
4452 +#: merge-recursive.c:1346
4453 #, c-format
4454 msgid "Unable to add %s to database"
4455 msgstr "不能新增 %s 至物件庫"
4456
4309 -#: merge-recursive.c:1386
4457 +#: merge-recursive.c:1378
4458 #, c-format
4459 msgid "Auto-merging %s"
4460 msgstr "自動合併 %s"
4461
4314 -#: merge-recursive.c:1410
4462 +#: merge-recursive.c:1402
4463 #, c-format
4464 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4465 msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
4466
4319 -#: merge-recursive.c:1482
4467 +#: merge-recursive.c:1474
4468 #, c-format
4469 msgid ""
4470 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4325,7 +4473,7 @@ msgstr ""
4473 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4474 "本被保留。"
4475
4328 -#: merge-recursive.c:1487
4476 +#: merge-recursive.c:1479
4477 #, c-format
4478 msgid ""
4479 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4334,7 +4482,7 @@ msgstr ""
4482 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4483 "%7$s 版本被保留。"
4484
4337 -#: merge-recursive.c:1494
4485 +#: merge-recursive.c:1486
4486 #, c-format
4487 msgid ""
4488 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4343,7 +4491,7 @@ msgstr ""
4491 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
4492 "本保留在 %8$s 中。"
4493
4346 -#: merge-recursive.c:1499
4494 +#: merge-recursive.c:1491
4495 #, c-format
4496 msgid ""
4497 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4352,35 +4500,36 @@ msgstr ""
4500 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
4501 "%7$s 版本保留在 %9$s 中。"
4502
4355 -#: merge-recursive.c:1534
4503 +#: merge-recursive.c:1526
4504 msgid "rename"
4505 msgstr "重新命名"
4506
4359 -#: merge-recursive.c:1534
4507 +#: merge-recursive.c:1526
4508 msgid "renamed"
4509 msgstr "重新命名"
4510
4363 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
4511 +#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
4512 #, c-format
4513 msgid "Refusing to lose dirty file at %s"
4514 msgstr "拒絕遺失髒檔案 '%s'"
4515
4368 -#: merge-recursive.c:1624
4516 +#: merge-recursive.c:1616
4517 #, c-format
4518 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4519 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
4520
4373 -#: merge-recursive.c:1682
4521 +#: merge-recursive.c:1674
4522 #, c-format
4523 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4376 -msgstr "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
4524 +msgstr ""
4525 +"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
4526
4378 -#: merge-recursive.c:1713
4527 +#: merge-recursive.c:1705
4528 #, c-format
4529 msgid "%s is a directory in %s adding as %s instead"
4530 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
4531
4383 -#: merge-recursive.c:1718
4532 +#: merge-recursive.c:1710
4533 #, c-format
4534 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4535 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
@@ -4480,7 +4629,7 @@ msgstr "新增/新增"
4629 msgid "Skipped %s (merged same as existing)"
4630 msgstr "略過 %s（已經做過相同合併）"
4631
4483 -#: merge-recursive.c:3147 git-submodule.sh:993
4632 +#: merge-recursive.c:3147 git-submodule.sh:1003
4633 msgid "submodule"
4634 msgstr "子模組"
4635
@@ -4499,7 +4648,8 @@ msgstr "而是以 %s 為名新增"
4648 msgid ""
4649 "Path updated: %s added in %s inside a directory that was renamed in %s; "
4650 "moving it to %s."
4502 -msgstr "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
4651 +msgstr ""
4652 +"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
4653
4654 #: merge-recursive.c:3264
4655 #, c-format
@@ -4574,7 +4724,6 @@ msgstr "合併："
4724 msgid "found %u common ancestor:"
4725 msgid_plural "found %u common ancestors:"
4726 msgstr[0] "發現 %u 個共同祖先："
4577 -msgstr[1] "發現 %u 個共同祖先："
4727
4728 #: merge-recursive.c:3658
4729 msgid "merge returned no commit"
@@ -4594,7 +4743,7 @@ msgstr ""
4743 msgid "Could not parse object '%s'"
4744 msgstr "不能解析物件 '%s'"
4745
4597 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
4746 +#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
4747 msgid "Unable to write index."
4748 msgstr "不能寫入索引。"
4749
@@ -4676,7 +4825,6 @@ msgid "failed to locate object %d in packfile"
4825 msgstr "在 packfile 中定位物件 %d 失敗"
4826
4827 #: midx.c:842
4679 -#| msgid "error preparing packfile from multi-pack-index"
4828 msgid "Adding packfiles to multi-pack-index"
4829 msgstr "正在新增 packfile 至多包索引"
4830
@@ -4686,7 +4834,6 @@ msgid "did not see pack-file %s to drop"
4834 msgstr "沒有看到要捨棄的包檔案 %s"
4835
4836 #: midx.c:973
4689 -#| msgid "Write and verify multi-pack-indexes"
4837 msgid "Writing chunks to multi-pack-index"
4838 msgstr "寫入區塊至多包索引"
4839
@@ -4706,7 +4853,6 @@ msgid ""
4853 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
4854
4855 #: midx.c:1128
4709 -#| msgid "Verifying OID order in MIDX"
4856 msgid "Verifying OID order in multi-pack-index"
4857 msgstr "正在驗證多包索引中的物件 ID 順序"
4858
@@ -4739,12 +4885,10 @@ msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
4885 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
4886
4887 #: midx.c:1220
4742 -#| msgid "prune unreferenced objects"
4888 msgid "Counting referenced objects"
4889 msgstr "正在計算引用物件"
4890
4891 #: midx.c:1230
4747 -#| msgid "Looking for referenced packfiles"
4892 msgid "Finding and deleting unreferenced packfiles"
4893 msgstr "正在尋找並刪除沒有參考的 packfile"
4894
@@ -4830,25 +4974,30 @@ msgstr "物件 %s 有未知的類型 id %d"
4974 msgid "unable to parse object: %s"
4975 msgstr "不能解析物件：%s"
4976
4833 -#: object.c:266 object.c:277
4977 +#: object.c:266 object.c:278
4978 #, c-format
4979 msgid "hash mismatch %s"
4980 msgstr "雜湊值與 %s 不符合"
4981
4838 -#: packfile.c:641
4982 +#: packfile.c:629
4983 msgid "offset before end of packfile (broken .idx?)"
4984 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
4985
4842 -#: packfile.c:1888
4986 +#: packfile.c:1899
4987 #, c-format
4988 msgid "offset before start of pack index for %s (corrupt index?)"
4989 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
4990
4847 -#: packfile.c:1892
4991 +#: packfile.c:1903
4992 #, c-format
4993 msgid "offset beyond end of pack index for %s (truncated index?)"
4994 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
4995
4996 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
4997 +#, c-format
4998 +msgid "unable to get size of %s"
4999 +msgstr "不能得到 %s 的大小"
5000 +
5001 #: parse-options.c:38
5002 #, c-format
5003 msgid "%s requires a value"
@@ -4879,36 +5028,36 @@ msgstr "%s 不可用"
5028 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5029 msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"
5030
4882 -#: parse-options.c:389
5031 +#: parse-options.c:388
5032 #, c-format
5033 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5034 msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
5035
4887 -#: parse-options.c:423 parse-options.c:431
5036 +#: parse-options.c:422 parse-options.c:430
5037 #, c-format
4889 -msgid "did you mean `--%s` (with two dashes ?)"
4890 -msgstr "你的意思是 `--%s`（有兩個短線？）"
5038 +msgid "did you mean `--%s` (with two dashes)?"
5039 +msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
5040
4892 -#: parse-options.c:860
5041 +#: parse-options.c:859
5042 #, c-format
5043 msgid "unknown option `%s'"
5044 msgstr "未知選項 `%s'"
5045
4897 -#: parse-options.c:862
5046 +#: parse-options.c:861
5047 #, c-format
5048 msgid "unknown switch `%c'"
5049 msgstr "未知開關 `%c'"
5050
4902 -#: parse-options.c:864
5051 +#: parse-options.c:863
5052 #, c-format
5053 msgid "unknown non-ascii option in string: `%s'"
5054 msgstr "字串中未知的非 ascii 字元選項：`%s'"
5055
4907 -#: parse-options.c:888
5056 +#: parse-options.c:887
5057 msgid "..."
5058 msgstr "..."
5059
4911 -#: parse-options.c:907
5060 +#: parse-options.c:906
5061 #, c-format
5062 msgid "usage: %s"
5063 msgstr "用法：%s"
@@ -4916,22 +5065,22 @@ msgstr "用法：%s"
5065 #. TRANSLATORS: the colon here should align with the
5066 #. one in "usage: %s" translation.
5067 #.
4919 -#: parse-options.c:913
5068 +#: parse-options.c:912
5069 #, c-format
5070 msgid " or: %s"
5071 msgstr " 或：%s"
5072
5073 # 譯者：為保證在輸出中對齊，注意調整句中空格！
4925 -#: parse-options.c:916
5074 +#: parse-options.c:915
5075 #, c-format
5076 msgid " %s"
5077 msgstr " %s"
5078
4930 -#: parse-options.c:955
5079 +#: parse-options.c:954
5080 msgid "-NUM"
5081 msgstr "-數字"
5082
4934 -#: parse-options.c:969
5083 +#: parse-options.c:968
5084 #, c-format
5085 msgid "alias of --%s"
5086 msgstr "--%s 的別名"
@@ -5013,26 +5162,26 @@ msgid "%s: 'literal' and 'glob' are incompatible"
5162 msgstr "%s：'literal' 和 'glob' 不相容"
5163
5164 #: pathspec.c:442
5016 -#, c-format
5017 -msgid "%s: '%s' is outside repository"
5018 -msgstr "%s：'%s' 在版本庫之外"
5165 +#, fuzzy, c-format
5166 +msgid "%s: '%s' is outside repository at '%s'"
5167 +msgstr "%s：'%s' 在 '%s' 版本庫之外"
5168
5020 -#: pathspec.c:516
5169 +#: pathspec.c:517
5170 #, c-format
5171 msgid "'%s' (mnemonic: '%c')"
5172 msgstr "'%s'（助記符：'%c'）"
5173
5025 -#: pathspec.c:526
5174 +#: pathspec.c:527
5175 #, c-format
5176 msgid "%s: pathspec magic not supported by this command: %s"
5177 msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
5178
5030 -#: pathspec.c:593
5179 +#: pathspec.c:594
5180 #, c-format
5181 msgid "pathspec '%s' is beyond a symbolic link"
5182 msgstr "路徑規格 '%s' 位於符號連結中"
5183
5035 -#: pathspec.c:638
5184 +#: pathspec.c:639
5185 #, c-format
5186 msgid "line is badly quoted: %s"
5187 msgstr "某行不應該被括號括住：%s"
@@ -5118,7 +5267,7 @@ msgstr "不能啟動 `log`"
5267 msgid "could not read `log` output"
5268 msgstr "不能讀取 `log` 的輸出"
5269
5121 -#: range-diff.c:96 sequencer.c:5163
5270 +#: range-diff.c:96 sequencer.c:5020
5271 #, c-format
5272 msgid "could not parse commit '%s'"
5273 msgstr "不能解析提交 '%s'"
@@ -5171,16 +5320,16 @@ msgstr "無法在索引中新增 '%s'"
5320 msgid "unable to stat '%s'"
5321 msgstr "無法對 %s 執行 stat"
5322
5174 -#: read-cache.c:1325
5323 +#: read-cache.c:1330
5324 #, c-format
5325 msgid "'%s' appears as both a file and as a directory"
5326 msgstr "'%s' 看起來既是檔案又是目錄"
5327
5179 -#: read-cache.c:1531
5328 +#: read-cache.c:1536
5329 msgid "Refresh index"
5330 msgstr "重新整理索引"
5331
5183 -#: read-cache.c:1646
5332 +#: read-cache.c:1651
5333 #, c-format
5334 msgid ""
5335 "index.version set, but the value is invalid.\n"
@@ -5189,7 +5338,7 @@ msgstr ""
5338 "設定了 index.version，但是取值無效。\n"
5339 "使用版本 %i"
5340
5192 -#: read-cache.c:1656
5341 +#: read-cache.c:1661
5342 #, c-format
5343 msgid ""
5344 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5198,150 +5347,160 @@ msgstr ""
5347 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"
5348 "使用版本 %i"
5349
5201 -#: read-cache.c:1712
5350 +#: read-cache.c:1717
5351 #, c-format
5352 msgid "bad signature 0x%08x"
5353 msgstr "壞的簽名 0x%08x"
5354
5206 -#: read-cache.c:1715
5355 +#: read-cache.c:1720
5356 #, c-format
5357 msgid "bad index version %d"
5358 msgstr "壞的索引版本 %d"
5359
5211 -#: read-cache.c:1724
5360 +#: read-cache.c:1729
5361 msgid "bad index file sha1 signature"
5362 msgstr "壞的索引檔案 sha1 簽名"
5363
5215 -#: read-cache.c:1754
5364 +#: read-cache.c:1759
5365 #, c-format
5366 msgid "index uses %.4s extension, which we do not understand"
5367 msgstr "索引使用不被支援的 %.4s 擴展"
5368
5369 #
5221 -#: read-cache.c:1756
5370 +#: read-cache.c:1761
5371 #, c-format
5372 msgid "ignoring %.4s extension"
5373 msgstr "忽略 %.4s 擴展"
5374
5226 -#: read-cache.c:1793
5375 +#: read-cache.c:1798
5376 #, c-format
5377 msgid "unknown index entry format 0x%08x"
5378 msgstr "未知的索引條目格式 0x%08x"
5379
5231 -#: read-cache.c:1809
5380 +#: read-cache.c:1814
5381 #, c-format
5382 msgid "malformed name field in the index, near path '%s'"
5383 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
5384
5236 -#: read-cache.c:1866
5385 +#: read-cache.c:1871
5386 msgid "unordered stage entries in index"
5387 msgstr "索引中有未排序的暫存條目"
5388
5240 -#: read-cache.c:1869
5389 +#: read-cache.c:1874
5390 #, c-format
5391 msgid "multiple stage entries for merged file '%s'"
5392 msgstr "合併檔案 '%s' 有多個暫存條目"
5393
5245 -#: read-cache.c:1872
5394 +#: read-cache.c:1877
5395 #, c-format
5396 msgid "unordered stage entries for '%s'"
5397 msgstr "'%s' 的未排序暫存條目"
5398
5250 -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
5251 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
5252 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
5253 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
5254 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
5399 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5400 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5401 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5402 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5403 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
5404 +#: builtin/submodule--helper.c:332
5405 msgid "index file corrupt"
5406 msgstr "索引檔案損壞"
5407
5258 -#: read-cache.c:2119
5408 +#: read-cache.c:2124
5409 #, c-format
5410 msgid "unable to create load_cache_entries thread: %s"
5411 msgstr "無法建立 load_cache_entries 執行緒：%s"
5412
5263 -#: read-cache.c:2132
5413 +#: read-cache.c:2137
5414 #, c-format
5415 msgid "unable to join load_cache_entries thread: %s"
5416 msgstr "無法加入 load_cache_entries 執行緒：%s"
5417
5268 -#: read-cache.c:2165
5418 +#: read-cache.c:2170
5419 #, c-format
5420 msgid "%s: index file open failed"
5421 msgstr "%s：開啟索引檔案失敗"
5422
5273 -#: read-cache.c:2169
5423 +#: read-cache.c:2174
5424 #, c-format
5425 msgid "%s: cannot stat the open index"
5426 msgstr "%s：不能對開啟的索引執行 stat 動作"
5427
5278 -#: read-cache.c:2173
5428 +#: read-cache.c:2178
5429 #, c-format
5430 msgid "%s: index file smaller than expected"
5431 msgstr "%s：索引檔案比預期的小"
5432
5283 -#: read-cache.c:2177
5433 +#: read-cache.c:2182
5434 #, c-format
5435 msgid "%s: unable to map index file"
5436 msgstr "%s：無法對索引檔案執行 map 動作"
5437
5288 -#: read-cache.c:2219
5438 +#: read-cache.c:2224
5439 #, c-format
5440 msgid "unable to create load_index_extensions thread: %s"
5441 msgstr "無法建立 load_index_extensions 執行緒：%s"
5442
5293 -#: read-cache.c:2246
5443 +#: read-cache.c:2251
5444 #, c-format
5445 msgid "unable to join load_index_extensions thread: %s"
5446 msgstr "無法加入 load_index_extensions 執行緒：%s"
5447
5298 -#: read-cache.c:2278
5448 +#: read-cache.c:2283
5449 #, c-format
5450 msgid "could not freshen shared index '%s'"
5451 msgstr "無法重新整理共享索引 '%s'"
5452
5303 -#: read-cache.c:2325
5453 +#: read-cache.c:2330
5454 #, c-format
5455 msgid "broken index, expect %s in %s, got %s"
5456 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
5457
5308 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
5458 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
5459 #, c-format
5460 msgid "could not close '%s'"
5461 msgstr "不能關閉 '%s'"
5462
5313 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
5463 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
5464 #, c-format
5465 msgid "could not stat '%s'"
5466 msgstr "不能對 '%s' 呼叫 stat"
5467
5318 -#: read-cache.c:3137
5468 +#: read-cache.c:3142
5469 #, c-format
5470 msgid "unable to open git dir: %s"
5471 msgstr "不能開啟 git 目錄：%s"
5472
5323 -#: read-cache.c:3149
5473 +#: read-cache.c:3154
5474 #, c-format
5475 msgid "unable to unlink: %s"
5476 msgstr "無法刪除：%s"
5477
5328 -#: read-cache.c:3174
5478 +#: read-cache.c:3179
5479 #, c-format
5480 msgid "cannot fix permission bits on '%s'"
5481 msgstr "不能修復 '%s' 的權限位"
5482
5333 -#: read-cache.c:3323
5483 +#: read-cache.c:3328
5484 #, c-format
5485 msgid "%s: cannot drop to stage #0"
5486 msgstr "%s：不能落到暫存區 #0"
5487
5338 -#: rebase-interactive.c:26
5488 +#: rebase-interactive.c:11
5489 +msgid ""
5490 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5491 +"continue'.\n"
5492 +"Or you can abort the rebase with 'git rebase --abort'.\n"
5493 +msgstr ""
5494 +"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"
5495 +"或者您可以用 'git rebase --abort' 終止重定基底。\n"
5496 +
5497 +#: rebase-interactive.c:33
5498 #, c-format
5499 msgid ""
5500 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5501 msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"
5502
5344 -#: rebase-interactive.c:35
5503 +#: rebase-interactive.c:42
5504 msgid ""
5505 "\n"
5506 "Commands:\n"
@@ -5381,14 +5540,13 @@ msgstr ""
5540 "\n"
5541 "可以對這些行重新排序，將從上至下執行。\n"
5542
5384 -#: rebase-interactive.c:56
5543 +#: rebase-interactive.c:63
5544 #, c-format
5545 msgid "Rebase %s onto %s (%d command)"
5546 msgid_plural "Rebase %s onto %s (%d commands)"
5547 msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
5389 -msgstr[1] "重定基底 %s 到 %s（%d 個提交）"
5548
5391 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
5549 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
5550 msgid ""
5551 "\n"
5552 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5396,7 +5554,7 @@ msgstr ""
5554 "\n"
5555 "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
5556
5399 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
5557 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
5558 msgid ""
5559 "\n"
5560 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5404,7 +5562,7 @@ msgstr ""
5562 "\n"
5563 "如果您在這裡刪除一行，對應的提交將會遺失。\n"
5564
5407 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
5565 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
5566 msgid ""
5567 "\n"
5568 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5418,7 +5576,7 @@ msgstr ""
5576 " git rebase --continue\n"
5577 "\n"
5578
5421 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
5579 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
5580 msgid ""
5581 "\n"
5582 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5428,22 +5586,19 @@ msgstr ""
5586 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"
5587 "\n"
5588
5431 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
5432 -msgid "Note that empty commits are commented out"
5433 -msgstr "注意空提交已被備註掉"
5434 -
5435 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
5436 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
5589 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
5590 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
5591 #, c-format
5592 msgid "could not write '%s'"
5593 msgstr "不能寫入 '%s'"
5594
5441 -#: rebase-interactive.c:108
5595 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
5596 +#: builtin/rebase.c:234
5597 #, c-format
5443 -msgid "could not copy '%s' to '%s'."
5444 -msgstr "不能複製 '%s' 至 '%s'。"
5598 +msgid "could not write '%s'."
5599 +msgstr "不能寫入 '%s'。"
5600
5446 -#: rebase-interactive.c:173
5601 +#: rebase-interactive.c:193
5602 #, c-format
5603 msgid ""
5604 "Warning: some commits may have been dropped accidentally.\n"
@@ -5452,7 +5607,7 @@ msgstr ""
5607 "警告：一些提交可能被意外捨棄。\n"
5608 "捨棄的提交（從新到舊）：\n"
5609
5455 -#: rebase-interactive.c:180
5610 +#: rebase-interactive.c:200
5611 #, c-format
5612 msgid ""
5613 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5468,6 +5623,13 @@ msgstr ""
5623 "可選值有：ignore、warn、error。\n"
5624 "\n"
5625
5626 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
5627 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
5628 +#: builtin/rebase.c:246
5629 +#, c-format
5630 +msgid "could not read '%s'."
5631 +msgstr "不能讀取 '%s'。"
5632 +
5633 #: refs.c:262
5634 #, c-format
5635 msgid "%s does not point to a valid object!"
@@ -5503,15 +5665,15 @@ msgstr "引用 '%s' 已經存在"
5665 msgid "unexpected object ID when writing '%s'"
5666 msgstr "寫入 '%s' 時意外的物件 ID"
5667
5506 -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
5507 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
5668 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
5669 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
5670 #: wrapper.c:620
5671 #, c-format
5672 msgid "could not write to '%s'"
5673 msgstr "不能寫入 '%s'"
5674
5513 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5514 -#: builtin/rebase.c:1031
5675 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5676 +#: builtin/rebase.c:1029
5677 #, c-format
5678 msgid "could not open '%s' for writing"
5679 msgstr "無法開啟 '%s' 進行寫入"
@@ -5565,18 +5727,18 @@ msgstr "'%s' 已存在，無法建立 '%s'"
5727 msgid "cannot process '%s' and '%s' at the same time"
5728 msgstr "無法同時處理 '%s' 和 '%s'"
5729
5568 -#: refs/files-backend.c:1234
5730 +#: refs/files-backend.c:1233
5731 #, c-format
5732 msgid "could not remove reference %s"
5733 msgstr "無法刪除引用 %s"
5734
5573 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541
5735 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541
5736 #: refs/packed-backend.c:1551
5737 #, c-format
5738 msgid "could not delete reference %s: %s"
5739 msgstr "無法刪除引用 %s：%s"
5740
5579 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554
5741 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554
5742 #, c-format
5743 msgid "could not delete references: %s"
5744 msgstr "無法刪除引用：%s"
@@ -5840,45 +6002,45 @@ msgstr "選項 `%s' 必須指向一個提交"
6002 msgid "config remote shorthand cannot begin with '/': %s"
6003 msgstr "設定的遠端短名稱不能以 '/' 開始：%s"
6004
5843 -#: remote.c:413
6005 +#: remote.c:414
6006 msgid "more than one receivepack given, using the first"
6007 msgstr "提供了一個以上的 receivepack，使用第一個"
6008
5847 -#: remote.c:421
6009 +#: remote.c:422
6010 msgid "more than one uploadpack given, using the first"
6011 msgstr "提供了一個以上的 uploadpack，使用第一個"
6012
5851 -#: remote.c:611
6013 +#: remote.c:612
6014 #, c-format
6015 msgid "Cannot fetch both %s and %s to %s"
6016 msgstr "不能同時取得 %s 和 %s 至 %s"
6017
5856 -#: remote.c:615
6018 +#: remote.c:616
6019 #, c-format
6020 msgid "%s usually tracks %s, not %s"
6021 msgstr "%s 通常追蹤 %s，而非 %s"
6022
5861 -#: remote.c:619
6023 +#: remote.c:620
6024 #, c-format
6025 msgid "%s tracks both %s and %s"
6026 msgstr "%s 同時追蹤 %s 和 %s"
6027
5866 -#: remote.c:687
6028 +#: remote.c:688
6029 #, c-format
6030 msgid "key '%s' of pattern had no '*'"
6031 msgstr "模式的鍵 '%s' 沒有 '*'"
6032
5871 -#: remote.c:697
6033 +#: remote.c:698
6034 #, c-format
6035 msgid "value '%s' of pattern has no '*'"
6036 msgstr "模式的值 '%s' 沒有 '*'"
6037
5876 -#: remote.c:1003
6038 +#: remote.c:1004
6039 #, c-format
6040 msgid "src refspec %s does not match any"
6041 msgstr "源引用表達式 %s 沒有符合"
6042
5881 -#: remote.c:1008
6043 +#: remote.c:1009
6044 #, c-format
6045 msgid "src refspec %s matches more than one"
6046 msgstr "源引用表達式 %s 符合超過一個"
@@ -5887,7 +6049,7 @@ msgstr "源引用表達式 %s 符合超過一個"
6049 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6050 #. the <src>.
6051 #.
5890 -#: remote.c:1023
6052 +#: remote.c:1024
6053 #, c-format
6054 msgid ""
6055 "The destination you provided is not a full refname (i.e.,\n"
@@ -5909,7 +6071,7 @@ msgstr ""
6071 "\n"
6072 "都不行，所以我們已放棄。您必須給出完整的引用。"
6073
5912 -#: remote.c:1043
6074 +#: remote.c:1044
6075 #, c-format
6076 msgid ""
6077 "The <src> part of the refspec is a commit object.\n"
@@ -5919,7 +6081,7 @@ msgstr ""
6081 "引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
6082 "'%s:refs/heads/%s' 推送嗎？"
6083
5922 -#: remote.c:1048
6084 +#: remote.c:1049
6085 #, c-format
6086 msgid ""
6087 "The <src> part of the refspec is a tag object.\n"
@@ -5929,7 +6091,7 @@ msgstr ""
6091 "引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
6092 "'%s:refs/tags/%s' 推送嗎？"
6093
5932 -#: remote.c:1053
6094 +#: remote.c:1054
6095 #, c-format
6096 msgid ""
6097 "The <src> part of the refspec is a tree object.\n"
@@ -5939,7 +6101,7 @@ msgstr ""
6101 "引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
6102 "'%s:refs/tags/%s' 推送嗎？"
6103
5942 -#: remote.c:1058
6104 +#: remote.c:1059
6105 #, c-format
6106 msgid ""
6107 "The <src> part of the refspec is a blob object.\n"
@@ -5949,127 +6111,125 @@ msgstr ""
6111 "引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
6112 "'%s:refs/tags/%s' 推送嗎？"
6113
5952 -#: remote.c:1094
6114 +#: remote.c:1095
6115 #, c-format
6116 msgid "%s cannot be resolved to branch"
6117 msgstr "%s 無法被解析為分支"
6118
5957 -#: remote.c:1105
6119 +#: remote.c:1106
6120 #, c-format
6121 msgid "unable to delete '%s': remote ref does not exist"
6122 msgstr "無法刪除 '%s'：遠端引用不存在"
6123
5962 -#: remote.c:1117
6124 +#: remote.c:1118
6125 #, c-format
6126 msgid "dst refspec %s matches more than one"
6127 msgstr "目標引用表達式 %s 符合超過一個"
6128
5967 -#: remote.c:1124
6129 +#: remote.c:1125
6130 #, c-format
6131 msgid "dst ref %s receives from more than one src"
6132 msgstr "目標引用 %s 接收超過一個源"
6133
5972 -#: remote.c:1627 remote.c:1728
6134 +#: remote.c:1628 remote.c:1729
6135 msgid "HEAD does not point to a branch"
6136 msgstr "HEAD 沒有指向一個分支"
6137
5976 -#: remote.c:1636
6138 +#: remote.c:1637
6139 #, c-format
6140 msgid "no such branch: '%s'"
6141 msgstr "沒有此分支：'%s'"
6142
5981 -#: remote.c:1639
6143 +#: remote.c:1640
6144 #, c-format
6145 msgid "no upstream configured for branch '%s'"
6146 msgstr "尚未給分支 '%s' 設定上游"
6147
5986 -#: remote.c:1645
6148 +#: remote.c:1646
6149 #, c-format
6150 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6151 msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
6152
5991 -#: remote.c:1660
6153 +#: remote.c:1661
6154 #, c-format
6155 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6156 msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
6157
5996 -#: remote.c:1672
6158 +#: remote.c:1673
6159 #, c-format
6160 msgid "branch '%s' has no remote for pushing"
6161 msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
6162
6001 -#: remote.c:1682
6163 +#: remote.c:1683
6164 #, c-format
6165 msgid "push refspecs for '%s' do not include '%s'"
6166 msgstr "向 '%s' 推送引用規格未包含 '%s'"
6167
6006 -#: remote.c:1695
6168 +#: remote.c:1696
6169 msgid "push has no destination (push.default is 'nothing')"
6170 msgstr "推送無目標（push.default 是 'nothing'）"
6171
6010 -#: remote.c:1717
6172 +#: remote.c:1718
6173 msgid "cannot resolve 'simple' push to a single destination"
6174 msgstr "無法解析 'simple' 推送至一個單獨的目標"
6175
6014 -#: remote.c:1843
6176 +#: remote.c:1844
6177 #, c-format
6178 msgid "couldn't find remote ref %s"
6179 msgstr "無法找到遠端引用 %s"
6180
6019 -#: remote.c:1856
6181 +#: remote.c:1857
6182 #, c-format
6183 msgid "* Ignoring funny ref '%s' locally"
6184 msgstr "* 在本機忽略可笑的引用 '%s'"
6185
6024 -#: remote.c:2019
6186 +#: remote.c:2020
6187 #, c-format
6188 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6189 msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
6190
6029 -#: remote.c:2023
6191 +#: remote.c:2024
6192 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6193 msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"
6194
6033 -#: remote.c:2026
6195 +#: remote.c:2027
6196 #, c-format
6197 msgid "Your branch is up to date with '%s'.\n"
6198 msgstr "您的分支與上游分支 '%s' 一致。\n"
6199
6038 -#: remote.c:2030
6200 +#: remote.c:2031
6201 #, c-format
6202 msgid "Your branch and '%s' refer to different commits.\n"
6203 msgstr "您的分支和 '%s' 指向不同的提交。\n"
6204
6043 -#: remote.c:2033
6205 +#: remote.c:2034
6206 #, c-format
6207 msgid " (use \"%s\" for details)\n"
6208 msgstr " （使用 \"%s\" 檢視詳情）\n"
6209
6048 -#: remote.c:2037
6210 +#: remote.c:2038
6211 #, c-format
6212 msgid "Your branch is ahead of '%s' by %d commit.\n"
6213 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6214 msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
6053 -msgstr[1] "您的分支領先 '%s' 共 %d 個提交。\n"
6215
6055 -#: remote.c:2043
6216 +#: remote.c:2044
6217 msgid " (use \"git push\" to publish your local commits)\n"
6218 msgstr " （使用 \"git push\" 來發布您的本機提交）\n"
6219
6059 -#: remote.c:2046
6220 +#: remote.c:2047
6221 #, c-format
6222 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6223 msgid_plural ""
6224 "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
6225 msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
6065 -msgstr[1] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
6226
6227 # 譯者：請維持前導空格
6068 -#: remote.c:2054
6228 +#: remote.c:2055
6229 msgid " (use \"git pull\" to update your local branch)\n"
6230 msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"
6231
6072 -#: remote.c:2057
6232 +#: remote.c:2058
6233 #, c-format
6234 msgid ""
6235 "Your branch and '%s' have diverged,\n"
@@ -6080,16 +6240,13 @@ msgid_plural ""
6240 msgstr[0] ""
6241 "您的分支和 '%s' 出現了偏離，\n"
6242 "並且分別有 %d 和 %d 處不同的提交。\n"
6083 -msgstr[1] ""
6084 -"您的分支和 '%s' 出現了偏離，\n"
6085 -"並且分別有 %d 和 %d 處不同的提交。\n"
6243
6244 # 譯者：請維持前導空格
6088 -#: remote.c:2067
6245 +#: remote.c:2068
6246 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6247 msgstr " （使用 \"git pull\" 來合併遠端分支）\n"
6248
6092 -#: remote.c:2250
6249 +#: remote.c:2251
6250 #, c-format
6251 msgid "cannot parse expected object name '%s'"
6252 msgstr "無法解析期望的物件名 '%s'"
@@ -6104,7 +6261,7 @@ msgstr "錯誤的取代引用名稱：%s"
6261 msgid "duplicate replace ref: %s"
6262 msgstr "重複的取代引用：%s"
6263
6107 -#: replace-object.c:73
6264 +#: replace-object.c:82
6265 #, c-format
6266 msgid "replace depth too high for object %s"
6267 msgstr "物件 %s 的取代層級太深"
@@ -6167,8 +6324,8 @@ msgstr "不能刪除 stray '%s'"
6324 msgid "Recorded preimage for '%s'"
6325 msgstr "為 '%s' 記錄 preimage"
6326
6170 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
6171 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
6327 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
6328 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
6329 #, c-format
6330 msgid "could not create directory '%s'"
6331 msgstr "不能建立目錄 '%s'"
@@ -6219,16 +6376,16 @@ msgstr "--first-parent 與 --bisect 不相容"
6376 msgid "-L does not yet support diff formats besides -p and -s"
6377 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
6378
6222 -#: run-command.c:762
6379 +#: run-command.c:763
6380 msgid "open /dev/null failed"
6381 msgstr "不能開啟 /dev/null"
6382
6226 -#: run-command.c:1268
6383 +#: run-command.c:1269
6384 #, c-format
6385 msgid "cannot create async thread: %s"
6386 msgstr "不能建立 async 執行緒：%s"
6387
6231 -#: run-command.c:1332
6388 +#: run-command.c:1333
6389 #, c-format
6390 msgid ""
6391 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -6273,39 +6430,39 @@ msgstr "接收端不支援原子推送"
6430 msgid "the receiving end does not support push options"
6431 msgstr "接收端不支援推送選項"
6432
6276 -#: sequencer.c:189
6433 +#: sequencer.c:191
6434 #, c-format
6435 msgid "invalid commit message cleanup mode '%s'"
6436 msgstr "無效的提交訊息清理模式 '%s'"
6437
6281 -#: sequencer.c:294
6438 +#: sequencer.c:296
6439 #, c-format
6440 msgid "could not delete '%s'"
6441 msgstr "無法刪除 '%s'"
6442
6286 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
6443 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
6444 #, c-format
6445 msgid "could not remove '%s'"
6446 msgstr "無法刪除 '%s'"
6447
6291 -#: sequencer.c:323
6448 +#: sequencer.c:325
6449 msgid "revert"
6450 msgstr "還原"
6451
6295 -#: sequencer.c:325
6452 +#: sequencer.c:327
6453 msgid "cherry-pick"
6454 msgstr "揀選"
6455
6299 -#: sequencer.c:327
6300 -msgid "rebase -i"
6301 -msgstr "rebase -i"
6302 -
6456 #: sequencer.c:329
6457 +msgid "rebase"
6458 +msgstr "rebase"
6459 +
6460 +#: sequencer.c:331
6461 #, c-format
6462 msgid "unknown action: %d"
6463 msgstr "未知動作：%d"
6464
6308 -#: sequencer.c:387
6465 +#: sequencer.c:389
6466 msgid ""
6467 "after resolving the conflicts, mark the corrected paths\n"
6468 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6313,7 +6470,7 @@ msgstr ""
6470 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
6471 "指令標記修正後的檔案"
6472
6316 -#: sequencer.c:390
6473 +#: sequencer.c:392
6474 msgid ""
6475 "after resolving the conflicts, mark the corrected paths\n"
6476 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6322,115 +6479,110 @@ msgstr ""
6479 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
6480 "對修正後的檔案做標記，然後用 'git commit' 提交"
6481
6325 -#: sequencer.c:403 sequencer.c:2993
6482 +#: sequencer.c:405 sequencer.c:2901
6483 #, c-format
6484 msgid "could not lock '%s'"
6485 msgstr "不能鎖定 '%s'"
6486
6330 -#: sequencer.c:410
6487 +#: sequencer.c:412
6488 #, c-format
6489 msgid "could not write eol to '%s'"
6490 msgstr "不能將換行符號寫入 '%s'"
6491
6335 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
6336 -#: sequencer.c:3277
6492 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
6493 +#: sequencer.c:3185
6494 #, c-format
6495 msgid "failed to finalize '%s'"
6496 msgstr "無法完成 '%s'"
6497
6341 -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
6342 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
6343 -#: builtin/rebase.c:589
6498 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6499 +#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
6500 +#: builtin/rebase.c:593
6501 #, c-format
6502 msgid "could not read '%s'"
6503 msgstr "不能讀取 '%s'"
6504
6348 -#: sequencer.c:464
6505 +#: sequencer.c:466
6506 #, c-format
6507 msgid "your local changes would be overwritten by %s."
6508 msgstr "您的本機修改將被%s覆蓋。"
6509
6353 -#: sequencer.c:468
6510 +#: sequencer.c:470
6511 msgid "commit your changes or stash them to proceed."
6512 msgstr "提交您的修改或儲藏後再繼續。"
6513
6357 -#: sequencer.c:500
6514 +#: sequencer.c:502
6515 #, c-format
6516 msgid "%s: fast-forward"
6517 msgstr "%s：快轉"
6518
6362 -#: sequencer.c:539 builtin/tag.c:565
6519 +#: sequencer.c:541 builtin/tag.c:565
6520 #, c-format
6521 msgid "Invalid cleanup mode %s"
6522 msgstr "無效的清理模式 %s"
6523
6524 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
6368 -#. "rebase -i".
6525 +#. "rebase".
6526 #.
6370 -#: sequencer.c:633
6527 +#: sequencer.c:635
6528 #, c-format
6529 msgid "%s: Unable to write new index file"
6530 msgstr "%s：無法寫入新索引檔案"
6531
6375 -#: sequencer.c:650
6532 +#: sequencer.c:652
6533 msgid "unable to update cache tree"
6534 msgstr "不能更新快取樹"
6535
6379 -#: sequencer.c:664
6536 +#: sequencer.c:666
6537 msgid "could not resolve HEAD commit"
6538 msgstr "不能解析 HEAD 提交"
6539
6383 -#: sequencer.c:744
6540 +#: sequencer.c:746
6541 #, c-format
6542 msgid "no key present in '%.*s'"
6543 msgstr "在 '%.*s' 中沒有 key"
6544
6388 -#: sequencer.c:755
6545 +#: sequencer.c:757
6546 #, c-format
6547 msgid "unable to dequote value of '%s'"
6548 msgstr "無法為 '%s' 的值去引號"
6549
6393 -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6394 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
6550 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6551 +#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
6552 #, c-format
6553 msgid "could not open '%s' for reading"
6554 msgstr "無法開啟 '%s' 進行讀取"
6555
6399 -#: sequencer.c:802
6556 +#: sequencer.c:804
6557 msgid "'GIT_AUTHOR_NAME' already given"
6558 msgstr "已經給出 'GIT_AUTHOR_NAME'"
6559
6403 -#: sequencer.c:807
6560 +#: sequencer.c:809
6561 msgid "'GIT_AUTHOR_EMAIL' already given"
6562 msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
6563
6407 -#: sequencer.c:812
6564 +#: sequencer.c:814
6565 msgid "'GIT_AUTHOR_DATE' already given"
6566 msgstr "已經給出 'GIT_AUTHOR_DATE'"
6567
6411 -#: sequencer.c:816
6568 +#: sequencer.c:818
6569 #, c-format
6570 msgid "unknown variable '%s'"
6571 msgstr "未知變數 '%s'"
6572
6416 -#: sequencer.c:821
6573 +#: sequencer.c:823
6574 msgid "missing 'GIT_AUTHOR_NAME'"
6575 msgstr "缺少 'GIT_AUTHOR_NAME'"
6576
6420 -#: sequencer.c:823
6577 +#: sequencer.c:825
6578 msgid "missing 'GIT_AUTHOR_EMAIL'"
6579 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
6580
6424 -#: sequencer.c:825
6581 +#: sequencer.c:827
6582 msgid "missing 'GIT_AUTHOR_DATE'"
6583 msgstr "缺少 'GIT_AUTHOR_DATE'"
6584
6428 -#: sequencer.c:902 sequencer.c:1427
6429 -#| msgid "malformed input line: '%s'."
6430 -msgid "malformed ident line"
6431 -msgstr "識別行的格式錯誤"
6432 -
6433 -#: sequencer.c:925
6585 +#: sequencer.c:876
6586 #, c-format
6587 msgid ""
6588 "you have staged changes in your working tree\n"
@@ -6459,11 +6611,11 @@ msgstr ""
6611 "\n"
6612 " git rebase --continue\n"
6613
6462 -#: sequencer.c:1218
6614 +#: sequencer.c:1148
6615 msgid "'prepare-commit-msg' hook failed"
6616 msgstr "'prepare-commit-msg' 掛鉤失敗"
6617
6466 -#: sequencer.c:1224
6618 +#: sequencer.c:1154
6619 msgid ""
6620 "Your name and email address were configured automatically based\n"
6621 "on your username and hostname. Please check that they are accurate.\n"
@@ -6487,7 +6639,7 @@ msgstr ""
6639 "\n"
6640 " git commit --amend --reset-author\n"
6641
6490 -#: sequencer.c:1237
6642 +#: sequencer.c:1167
6643 msgid ""
6644 "Your name and email address were configured automatically based\n"
6645 "on your username and hostname. Please check that they are accurate.\n"
@@ -6510,331 +6662,325 @@ msgstr ""
6662 "\n"
6663 " git commit --amend --reset-author\n"
6664
6513 -#: sequencer.c:1279
6665 +#: sequencer.c:1209
6666 msgid "couldn't look up newly created commit"
6667 msgstr "無法找到新建立的提交"
6668
6517 -#: sequencer.c:1281
6669 +#: sequencer.c:1211
6670 msgid "could not parse newly created commit"
6671 msgstr "不能解析新建立的提交"
6672
6521 -#: sequencer.c:1327
6673 +#: sequencer.c:1257
6674 msgid "unable to resolve HEAD after creating commit"
6675 msgstr "建立提交後，不能解析 HEAD"
6676
6525 -#: sequencer.c:1329
6677 +#: sequencer.c:1259
6678 msgid "detached HEAD"
6679 msgstr "分離開頭指標"
6680
6681 # 譯者：中文字串拼接，可刪除前導空格
6530 -#: sequencer.c:1333
6682 +#: sequencer.c:1263
6683 msgid " (root-commit)"
6684 msgstr " (根提交)"
6685
6534 -#: sequencer.c:1354
6686 +#: sequencer.c:1284
6687 msgid "could not parse HEAD"
6688 msgstr "不能解析 HEAD"
6689
6538 -#: sequencer.c:1356
6690 +#: sequencer.c:1286
6691 #, c-format
6692 msgid "HEAD %s is not a commit!"
6693 msgstr "HEAD %s 不是一個提交！"
6694
6543 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
6695 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
6696 msgid "could not parse HEAD commit"
6697 msgstr "不能解析 HEAD 提交"
6698
6547 -#: sequencer.c:1411 sequencer.c:2055
6699 +#: sequencer.c:1342 sequencer.c:1968
6700 msgid "unable to parse commit author"
6701 msgstr "不能解析提交作者"
6702
6551 -#: sequencer.c:1431
6552 -#| msgid "refresh stat information"
6553 -msgid "corrupted author without date information"
6554 -msgstr ""
6555 -
6556 -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
6703 +#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
6704 msgid "git write-tree failed to write a tree"
6705 msgstr "git write-tree 無法寫入樹狀物件"
6706
6560 -#: sequencer.c:1480 sequencer.c:1550
6707 +#: sequencer.c:1386 sequencer.c:1447
6708 #, c-format
6709 msgid "unable to read commit message from '%s'"
6710 msgstr "不能從 '%s' 讀取提交說明"
6711
6565 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
6566 -#: builtin/merge.c:908
6712 +#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
6713 +#: builtin/merge.c:911
6714 msgid "failed to write commit object"
6715 msgstr "寫提交物件失敗"
6716
6570 -#: sequencer.c:1577
6717 +#: sequencer.c:1474
6718 #, c-format
6719 msgid "could not parse commit %s"
6720 msgstr "不能解析提交 %s"
6721
6575 -#: sequencer.c:1582
6722 +#: sequencer.c:1479
6723 #, c-format
6724 msgid "could not parse parent commit %s"
6725 msgstr "不能解析父提交 %s"
6726
6580 -#: sequencer.c:1656 sequencer.c:1767
6727 +#: sequencer.c:1562 sequencer.c:1673
6728 #, c-format
6729 msgid "unknown command: %d"
6730 msgstr "未知指令：%d"
6731
6585 -#: sequencer.c:1714 sequencer.c:1739
6732 +#: sequencer.c:1620 sequencer.c:1645
6733 #, c-format
6734 msgid "This is a combination of %d commits."
6735 msgstr "這是一個 %d 個提交的組合。"
6736
6590 -#: sequencer.c:1724
6737 +#: sequencer.c:1630
6738 msgid "need a HEAD to fixup"
6739 msgstr "需要一個 HEAD 來修復"
6740
6594 -#: sequencer.c:1726 sequencer.c:3304
6741 +#: sequencer.c:1632 sequencer.c:3212
6742 msgid "could not read HEAD"
6743 msgstr "不能讀取 HEAD"
6744
6598 -#: sequencer.c:1728
6745 +#: sequencer.c:1634
6746 msgid "could not read HEAD's commit message"
6747 msgstr "不能讀取 HEAD 的提交說明"
6748
6602 -#: sequencer.c:1734
6749 +#: sequencer.c:1640
6750 #, c-format
6751 msgid "cannot write '%s'"
6752 msgstr "不能寫 '%s'"
6753
6607 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
6754 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
6755 msgid "This is the 1st commit message:"
6756 msgstr "這是第一個提交說明："
6757
6611 -#: sequencer.c:1749
6758 +#: sequencer.c:1655
6759 #, c-format
6760 msgid "could not read commit message of %s"
6761 msgstr "不能讀取 %s 的提交說明"
6762
6616 -#: sequencer.c:1756
6763 +#: sequencer.c:1662
6764 #, c-format
6765 msgid "This is the commit message #%d:"
6766 msgstr "這是提交說明 #%d："
6767
6621 -#: sequencer.c:1762
6768 +#: sequencer.c:1668
6769 #, c-format
6770 msgid "The commit message #%d will be skipped:"
6771 msgstr "提交說明 #%d 將被跳過："
6772
6626 -#: sequencer.c:1850
6773 +#: sequencer.c:1756
6774 msgid "your index file is unmerged."
6775 msgstr "您的索引檔案未完成合併。"
6776
6630 -#: sequencer.c:1857
6777 +#: sequencer.c:1763
6778 msgid "cannot fixup root commit"
6779 msgstr "不能修復根提交"
6780
6634 -#: sequencer.c:1876
6781 +#: sequencer.c:1782
6782 #, c-format
6783 msgid "commit %s is a merge but no -m option was given."
6784 msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
6785
6639 -#: sequencer.c:1884 sequencer.c:1892
6786 +#: sequencer.c:1790 sequencer.c:1798
6787 #, c-format
6788 msgid "commit %s does not have parent %d"
6789 msgstr "提交 %s 沒有第 %d 個父提交"
6790
6644 -#: sequencer.c:1898
6791 +#: sequencer.c:1804
6792 #, c-format
6793 msgid "cannot get commit message for %s"
6794 msgstr "不能得到 %s 的提交說明"
6795
6796 #. TRANSLATORS: The first %s will be a "todo" command like
6797 #. "revert" or "pick", the second %s a SHA1.
6651 -#: sequencer.c:1917
6798 +#: sequencer.c:1823
6799 #, c-format
6800 msgid "%s: cannot parse parent commit %s"
6801 msgstr "%s：不能解析父提交 %s"
6802
6656 -#: sequencer.c:1982
6803 +#: sequencer.c:1888
6804 #, c-format
6805 msgid "could not rename '%s' to '%s'"
6806 msgstr "不能將 '%s' 重新命名為 '%s'"
6807
6661 -#: sequencer.c:2037
6808 +#: sequencer.c:1943
6809 #, c-format
6810 msgid "could not revert %s... %s"
6811 msgstr "不能還原 %s... %s"
6812
6666 -#: sequencer.c:2038
6813 +#: sequencer.c:1944
6814 #, c-format
6815 msgid "could not apply %s... %s"
6816 msgstr "不能應用 %s... %s"
6817
6671 -#: sequencer.c:2105
6818 +#: sequencer.c:1961
6819 +#, c-format
6820 +msgid "dropping %s %s -- patch contents already upstream\n"
6821 +msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
6822 +
6823 +#: sequencer.c:2018
6824 #, c-format
6825 msgid "git %s: failed to read the index"
6826 msgstr "git %s：無法讀取索引"
6827
6676 -#: sequencer.c:2112
6828 +#: sequencer.c:2025
6829 #, c-format
6830 msgid "git %s: failed to refresh the index"
6831 msgstr "git %s：無法重新整理索引"
6832
6681 -#: sequencer.c:2189
6833 +#: sequencer.c:2102
6834 #, c-format
6835 msgid "%s does not accept arguments: '%s'"
6836 msgstr "%s 不接受參數：'%s'"
6837
6686 -#: sequencer.c:2198
6838 +#: sequencer.c:2111
6839 #, c-format
6840 msgid "missing arguments for %s"
6841 msgstr "缺少 %s 的參數"
6842
6691 -#: sequencer.c:2235
6843 +#: sequencer.c:2142
6844 #, c-format
6693 -msgid "could not parse '%.*s'"
6694 -msgstr "無法解析 '%.*s'"
6845 +msgid "could not parse '%s'"
6846 +msgstr "無法解析 '%s'"
6847
6696 -#: sequencer.c:2289
6848 +#: sequencer.c:2203
6849 #, c-format
6850 msgid "invalid line %d: %.*s"
6851 msgstr "無效行 %d：%.*s"
6852
6701 -#: sequencer.c:2300
6853 +#: sequencer.c:2214
6854 #, c-format
6855 msgid "cannot '%s' without a previous commit"
6856 msgstr "沒有父提交的情況下不能 '%s'"
6857
6706 -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
6707 -#: builtin/rebase.c:223 builtin/rebase.c:248
6708 -#, c-format
6709 -msgid "could not read '%s'."
6710 -msgstr "不能讀取 '%s'。"
6711 -
6712 -#: sequencer.c:2384
6858 +#: sequencer.c:2298
6859 msgid "cancelling a cherry picking in progress"
6860 msgstr "正在取消一個進行中的揀選"
6861
6716 -#: sequencer.c:2391
6862 +#: sequencer.c:2305
6863 msgid "cancelling a revert in progress"
6864 msgstr "正在取消一個進行中的還原"
6865
6720 -#: sequencer.c:2435
6866 +#: sequencer.c:2349
6867 msgid "please fix this using 'git rebase --edit-todo'."
6868 msgstr "請用 'git rebase --edit-todo' 來修改。"
6869
6724 -#: sequencer.c:2437
6870 +#: sequencer.c:2351
6871 #, c-format
6872 msgid "unusable instruction sheet: '%s'"
6873 msgstr "不可用的指令清單：'%s'"
6874
6729 -#: sequencer.c:2442
6875 +#: sequencer.c:2356
6876 msgid "no commits parsed."
6877 msgstr "沒有解析提交。"
6878
6733 -#: sequencer.c:2453
6879 +#: sequencer.c:2367
6880 msgid "cannot cherry-pick during a revert."
6881 msgstr "不能在還原提交中執行揀選。"
6882
6737 -#: sequencer.c:2455
6883 +#: sequencer.c:2369
6884 msgid "cannot revert during a cherry-pick."
6885 msgstr "不能在揀選中執行還原提交。"
6886
6741 -#: sequencer.c:2533
6887 +#: sequencer.c:2447
6888 #, c-format
6889 msgid "invalid value for %s: %s"
6890 msgstr "%s 的值無效：%s"
6891
6746 -#: sequencer.c:2630
6892 +#: sequencer.c:2540
6893 msgid "unusable squash-onto"
6894 msgstr "不可用的 squash-onto"
6895
6750 -#: sequencer.c:2646
6896 +#: sequencer.c:2556
6897 #, c-format
6898 msgid "malformed options sheet: '%s'"
6899 msgstr "格式錯誤的選項清單：'%s'"
6900
6755 -#: sequencer.c:2736 sequencer.c:4463
6901 +#: sequencer.c:2644 sequencer.c:4361
6902 msgid "empty commit set passed"
6903 msgstr "提供了空的提交集"
6904
6759 -#: sequencer.c:2752
6905 +#: sequencer.c:2660
6906 msgid "revert is already in progress"
6907 msgstr "一個還原動作已在進行"
6908
6763 -#: sequencer.c:2754
6909 +#: sequencer.c:2662
6910 #, c-format
6911 msgid "try \"git revert (--continue | %s--abort | --quit)\""
6912 msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
6913
6768 -#: sequencer.c:2757
6914 +#: sequencer.c:2665
6915 msgid "cherry-pick is already in progress"
6916 msgstr "揀選動作已在進行"
6917
6772 -#: sequencer.c:2759
6918 +#: sequencer.c:2667
6919 #, c-format
6920 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6921 msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
6922
6777 -#: sequencer.c:2773
6923 +#: sequencer.c:2681
6924 #, c-format
6925 msgid "could not create sequencer directory '%s'"
6926 msgstr "不能建立序列目錄 '%s'"
6927
6782 -#: sequencer.c:2788
6928 +#: sequencer.c:2696
6929 msgid "could not lock HEAD"
6930 msgstr "不能鎖定 HEAD"
6931
6786 -#: sequencer.c:2848 sequencer.c:4209
6932 +#: sequencer.c:2756 sequencer.c:4099
6933 msgid "no cherry-pick or revert in progress"
6934 msgstr "揀選或還原動作並未進行"
6935
6790 -#: sequencer.c:2850 sequencer.c:2861
6936 +#: sequencer.c:2758 sequencer.c:2769
6937 msgid "cannot resolve HEAD"
6938 msgstr "不能解析 HEAD"
6939
6794 -#: sequencer.c:2852 sequencer.c:2896
6940 +#: sequencer.c:2760 sequencer.c:2804
6941 msgid "cannot abort from a branch yet to be born"
6942 msgstr "不能從尚未建立的分支終止"
6943
6798 -#: sequencer.c:2882 builtin/grep.c:736
6944 +#: sequencer.c:2790 builtin/grep.c:724
6945 #, c-format
6946 msgid "cannot open '%s'"
6947 msgstr "不能開啟 '%s'"
6948
6803 -#: sequencer.c:2884
6949 +#: sequencer.c:2792
6950 #, c-format
6951 msgid "cannot read '%s': %s"
6952 msgstr "不能讀取 '%s'：%s"
6953
6808 -#: sequencer.c:2885
6954 +#: sequencer.c:2793
6955 msgid "unexpected end of file"
6956 msgstr "意外的檔案結束"
6957
6812 -#: sequencer.c:2891
6958 +#: sequencer.c:2799
6959 #, c-format
6960 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
6961 msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
6962
6817 -#: sequencer.c:2902
6963 +#: sequencer.c:2810
6964 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
6965 msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
6966
6821 -#: sequencer.c:2943
6967 +#: sequencer.c:2851
6968 msgid "no revert in progress"
6969 msgstr "沒有正在進行的還原"
6970
6825 -#: sequencer.c:2951
6971 +#: sequencer.c:2859
6972 msgid "no cherry-pick in progress"
6973 msgstr "沒有正在進行的揀選"
6974
6829 -#: sequencer.c:2961
6975 +#: sequencer.c:2869
6976 msgid "failed to skip the commit"
6977 msgstr "無法跳過這個提交"
6978
6833 -#: sequencer.c:2968
6979 +#: sequencer.c:2876
6980 msgid "there is nothing to skip"
6981 msgstr "沒有要跳過的"
6982
6837 -#: sequencer.c:2971
6983 +#: sequencer.c:2879
6984 #, c-format
6985 msgid ""
6986 "have you committed already?\n"
@@ -6843,21 +6989,21 @@ msgstr ""
6989 "您已經提交了嗎？\n"
6990 "試試 \"git %s --continue\""
6991
6846 -#: sequencer.c:3095 sequencer.c:4121
6992 +#: sequencer.c:3003 sequencer.c:4011
6993 #, c-format
6994 msgid "could not update %s"
6995 msgstr "不能更新 %s"
6996
6851 -#: sequencer.c:3134 sequencer.c:4101
6997 +#: sequencer.c:3042 sequencer.c:3991
6998 msgid "cannot read HEAD"
6999 msgstr "不能讀取 HEAD"
7000
6855 -#: sequencer.c:3151
7001 +#: sequencer.c:3059
7002 #, c-format
7003 msgid "unable to copy '%s' to '%s'"
7004 msgstr "無法複製 '%s' 至 '%s'"
7005
6860 -#: sequencer.c:3159
7006 +#: sequencer.c:3067
7007 #, c-format
7008 msgid ""
7009 "You can amend the commit now, with\n"
@@ -6876,23 +7022,23 @@ msgstr ""
7022 "\n"
7023 " git rebase --continue\n"
7024
6879 -#: sequencer.c:3169
7025 +#: sequencer.c:3077
7026 #, c-format
7027 msgid "Could not apply %s... %.*s"
7028 msgstr "不能應用 %s... %.*s"
7029
6884 -#: sequencer.c:3176
7030 +#: sequencer.c:3084
7031 #, c-format
7032 msgid "Could not merge %.*s"
7033 msgstr "不能合併 %.*s"
7034
6889 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
7035 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
7036 #, c-format
7037 msgid "could not copy '%s' to '%s'"
7038 msgstr "不能複製 '%s' 至 '%s'"
7039
7040 # 譯者：請維持前導空格
6895 -#: sequencer.c:3221
7041 +#: sequencer.c:3129
7042 #, c-format
7043 msgid ""
7044 "execution failed: %s\n"
@@ -6907,11 +7053,11 @@ msgstr ""
7053 " git rebase --continue\n"
7054 "\n"
7055
6910 -#: sequencer.c:3227
7056 +#: sequencer.c:3135
7057 msgid "and made changes to the index and/or the working tree\n"
7058 msgstr "並且修改索引和/或工作區\n"
7059
6914 -#: sequencer.c:3233
7060 +#: sequencer.c:3141
7061 #, c-format
7062 msgid ""
7063 "execution succeeded: %s\n"
@@ -6928,72 +7074,72 @@ msgstr ""
7074 " git rebase --continue\n"
7075 "\n"
7076
6931 -#: sequencer.c:3294
7077 +#: sequencer.c:3202
7078 #, c-format
7079 msgid "illegal label name: '%.*s'"
7080 msgstr "非法的標籤名稱：'%.*s'"
7081
6936 -#: sequencer.c:3348
7082 +#: sequencer.c:3256
7083 msgid "writing fake root commit"
7084 msgstr "寫偽根提交"
7085
6940 -#: sequencer.c:3353
7086 +#: sequencer.c:3261
7087 msgid "writing squash-onto"
7088 msgstr "寫入 squash-onto"
7089
6944 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
7090 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
7091 #, c-format
7092 msgid "failed to find tree of %s"
7093 msgstr "無法找到 %s 指向的樹。"
7094
6949 -#: sequencer.c:3436
7095 +#: sequencer.c:3344
7096 #, c-format
7097 msgid "could not resolve '%s'"
7098 msgstr "無法解析 '%s'"
7099
6954 -#: sequencer.c:3467
7100 +#: sequencer.c:3375
7101 msgid "cannot merge without a current revision"
7102 msgstr "沒有目前版本不能合併"
7103
6958 -#: sequencer.c:3489
7104 +#: sequencer.c:3397
7105 #, c-format
7106 msgid "unable to parse '%.*s'"
7107 msgstr "無法解析 '%.*s'"
7108
6963 -#: sequencer.c:3498
7109 +#: sequencer.c:3406
7110 #, c-format
7111 msgid "nothing to merge: '%.*s'"
7112 msgstr "無可用合併：'%.*s'"
7113
6968 -#: sequencer.c:3510
7114 +#: sequencer.c:3418
7115 msgid "octopus merge cannot be executed on top of a [new root]"
7116 msgstr "章魚合並不能在一個新的根提交上執行"
7117
6972 -#: sequencer.c:3526
7118 +#: sequencer.c:3434
7119 #, c-format
7120 msgid "could not get commit message of '%s'"
7121 msgstr "不能取得 '%s' 的提交說明"
7122
6977 -#: sequencer.c:3688
7123 +#: sequencer.c:3594
7124 #, c-format
7125 msgid "could not even attempt to merge '%.*s'"
7126 msgstr "甚至不能嘗試合併 '%.*s'"
7127
6982 -#: sequencer.c:3704
7128 +#: sequencer.c:3610
7129 msgid "merge: Unable to write new index file"
7130 msgstr "合併：無法寫入新索引檔案"
7131
6986 -#: sequencer.c:3773 builtin/rebase.c:733
7132 +#: sequencer.c:3679 builtin/rebase.c:737
7133 #, c-format
7134 msgid "Applied autostash.\n"
7135 msgstr "已應用 autostash。\n"
7136
6991 -#: sequencer.c:3785
7137 +#: sequencer.c:3691
7138 #, c-format
7139 msgid "cannot store %s"
7140 msgstr "不能儲存 %s"
7141
6996 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
7142 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
7143 #, c-format
7144 msgid ""
7145 "Applying autostash resulted in conflicts.\n"
@@ -7004,31 +7150,26 @@ msgstr ""
7150 "您的修改安全地儲存在儲藏區中。\n"
7151 "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
7152
7007 -#: sequencer.c:3849
7008 -#, c-format
7009 -msgid "could not checkout %s"
7010 -msgstr "不能簽出 %s"
7011 -
7012 -#: sequencer.c:3863
7153 +#: sequencer.c:3755
7154 #, c-format
7155 msgid "%s: not a valid OID"
7156 msgstr "%s：不是一個有效的物件 ID"
7157
7017 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
7158 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
7159 msgid "could not detach HEAD"
7160 msgstr "不能分離開頭指標"
7161
7021 -#: sequencer.c:3883
7162 +#: sequencer.c:3775
7163 #, c-format
7164 msgid "Stopped at HEAD\n"
7165 msgstr "停止在 HEAD\n"
7166
7026 -#: sequencer.c:3885
7167 +#: sequencer.c:3777
7168 #, c-format
7169 msgid "Stopped at %s\n"
7170 msgstr "停止在 %s\n"
7171
7031 -#: sequencer.c:3893
7172 +#: sequencer.c:3785
7173 #, c-format
7174 msgid ""
7175 "Could not execute the todo command\n"
@@ -7048,48 +7189,48 @@ msgstr ""
7189 " git rebase --edit-todo\n"
7190 " git rebase --continue\n"
7191
7051 -#: sequencer.c:3979
7192 +#: sequencer.c:3869
7193 #, c-format
7194 msgid "Stopped at %s... %.*s\n"
7195 msgstr "停止在 %s... %.*s\n"
7196
7056 -#: sequencer.c:4050
7197 +#: sequencer.c:3940
7198 #, c-format
7199 msgid "unknown command %d"
7200 msgstr "未知指令 %d"
7201
7061 -#: sequencer.c:4109
7202 +#: sequencer.c:3999
7203 msgid "could not read orig-head"
7204 msgstr "不能讀取 orig-head"
7205
7065 -#: sequencer.c:4114
7206 +#: sequencer.c:4004
7207 msgid "could not read 'onto'"
7208 msgstr "不能讀取 'onto'"
7209
7069 -#: sequencer.c:4128
7210 +#: sequencer.c:4018
7211 #, c-format
7212 msgid "could not update HEAD to %s"
7213 msgstr "不能更新 HEAD 為 %s"
7214
7074 -#: sequencer.c:4221
7215 +#: sequencer.c:4111
7216 msgid "cannot rebase: You have unstaged changes."
7217 msgstr "不能重定基底：您有未暫存的變更。"
7218
7078 -#: sequencer.c:4230
7219 +#: sequencer.c:4120
7220 msgid "cannot amend non-existing commit"
7221 msgstr "不能修補不存在的提交"
7222
7082 -#: sequencer.c:4232
7223 +#: sequencer.c:4122
7224 #, c-format
7225 msgid "invalid file: '%s'"
7226 msgstr "無效檔案：'%s'"
7227
7087 -#: sequencer.c:4234
7228 +#: sequencer.c:4124
7229 #, c-format
7230 msgid "invalid contents: '%s'"
7231 msgstr "無效內容：'%s'"
7232
7092 -#: sequencer.c:4237
7233 +#: sequencer.c:4127
7234 msgid ""
7235 "\n"
7236 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7098,68 +7239,59 @@ msgstr ""
7239 "\n"
7240 "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
7241
7101 -#: sequencer.c:4273 sequencer.c:4312
7242 +#: sequencer.c:4163 sequencer.c:4202
7243 #, c-format
7244 msgid "could not write file: '%s'"
7245 msgstr "不能寫入檔案：'%s'"
7246
7106 -#: sequencer.c:4327
7247 +#: sequencer.c:4217
7248 msgid "could not remove CHERRY_PICK_HEAD"
7249 msgstr "不能刪除 CHERRY_PICK_HEAD"
7250
7110 -#: sequencer.c:4334
7251 +#: sequencer.c:4224
7252 msgid "could not commit staged changes."
7253 msgstr "不能提交暫存的修改。"
7254
7114 -#: sequencer.c:4440
7255 +#: sequencer.c:4338
7256 #, c-format
7257 msgid "%s: can't cherry-pick a %s"
7258 msgstr "%s：不能揀選一個%s"
7259
7119 -#: sequencer.c:4444
7260 +#: sequencer.c:4342
7261 #, c-format
7262 msgid "%s: bad revision"
7263 msgstr "%s：錯誤的版本"
7264
7124 -#: sequencer.c:4479
7265 +#: sequencer.c:4377
7266 msgid "can't revert as initial commit"
7267 msgstr "不能作為初始提交還原提交"
7268
7128 -#: sequencer.c:4952
7269 +#: sequencer.c:4846
7270 msgid "make_script: unhandled options"
7271 msgstr "make_script：有未能處理的選項"
7272
7132 -#: sequencer.c:4955
7273 +#: sequencer.c:4849
7274 msgid "make_script: error preparing revisions"
7275 msgstr "make_script：準備版本時錯誤"
7276
7136 -#: sequencer.c:5113
7137 -msgid ""
7138 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
7139 -"continue'.\n"
7140 -"Or you can abort the rebase with 'git rebase --abort'.\n"
7141 -msgstr ""
7142 -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"
7143 -"或者您可以用 'git rebase --abort' 終止重定基底。\n"
7144 -
7145 -#: sequencer.c:5226 sequencer.c:5243
7277 +#: sequencer.c:5083 sequencer.c:5100
7278 msgid "nothing to do"
7279 msgstr "無事可做"
7280
7149 -#: sequencer.c:5257
7281 +#: sequencer.c:5119
7282 msgid "could not skip unnecessary pick commands"
7283 msgstr "無法跳過不必要的揀選"
7284
7153 -#: sequencer.c:5351
7285 +#: sequencer.c:5213
7286 msgid "the script was already rearranged."
7287 msgstr "腳本已經重新編排。"
7288
7289 #: setup.c:124
7158 -#, c-format
7159 -msgid "'%s' is outside repository"
7160 -msgstr "'%s' 在版本庫之外"
7290 +#, fuzzy, c-format
7291 +msgid "'%s' is outside repository at '%s'"
7292 +msgstr "'%s' 在 '%s' 版本庫之外"
7293
7162 -#: setup.c:174
7294 +#: setup.c:175
7295 #, c-format
7296 msgid ""
7297 "%s: no such path in the working tree.\n"
@@ -7168,7 +7300,7 @@ msgstr ""
7300 "%s：工作區中無此路徑。\n"
7301 "使用指令 'git <指令> -- <路徑>...' 來指定本機不存在的路徑。"
7302
7171 -#: setup.c:187
7303 +#: setup.c:188
7304 #, c-format
7305 msgid ""
7306 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7179,12 +7311,12 @@ msgstr ""
7311 "使用 '--' 來分隔版本和路徑，例如：\n"
7312 "'git <指令> [<版本>...] -- [<檔案>...]'"
7313
7182 -#: setup.c:236
7314 +#: setup.c:254
7315 #, c-format
7316 msgid "option '%s' must come before non-option arguments"
7317 msgstr "選項 '%s' 必須在其他非選項參數之前"
7318
7187 -#: setup.c:255
7319 +#: setup.c:273
7320 #, c-format
7321 msgid ""
7322 "ambiguous argument '%s': both revision and filename\n"
@@ -7195,92 +7327,92 @@ msgstr ""
7327 "使用 '--' 來分隔版本和路徑，例如：\n"
7328 "'git <指令> [<版本>...] -- [<檔案>...]'"
7329
7198 -#: setup.c:391
7330 +#: setup.c:409
7331 msgid "unable to set up work tree using invalid config"
7332 msgstr "無法使用無效設定來建立工作區"
7333
7202 -#: setup.c:395
7334 +#: setup.c:413
7335 msgid "this operation must be run in a work tree"
7336 msgstr "該動作必須在一個工作區中執行"
7337
7206 -#: setup.c:541
7338 +#: setup.c:559
7339 #, c-format
7340 msgid "Expected git repo version <= %d, found %d"
7341 msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
7342
7211 -#: setup.c:549
7343 +#: setup.c:567
7344 msgid "unknown repository extensions found:"
7345 msgstr "發現未知的版本庫擴展："
7346
7215 -#: setup.c:568
7347 +#: setup.c:586
7348 #, c-format
7349 msgid "error opening '%s'"
7350 msgstr "開啟 '%s' 發生錯誤"
7351
7220 -#: setup.c:570
7352 +#: setup.c:588
7353 #, c-format
7354 msgid "too large to be a .git file: '%s'"
7355 msgstr "檔案太大，無法作為 .git 檔案：'%s'"
7356
7225 -#: setup.c:572
7357 +#: setup.c:590
7358 #, c-format
7359 msgid "error reading %s"
7360 msgstr "讀取 %s 發生錯誤"
7361
7230 -#: setup.c:574
7362 +#: setup.c:592
7363 #, c-format
7364 msgid "invalid gitfile format: %s"
7365 msgstr "無效的 gitfile 格式：%s"
7366
7235 -#: setup.c:576
7367 +#: setup.c:594
7368 #, c-format
7369 msgid "no path in gitfile: %s"
7370 msgstr "在 gitfile 中沒有路徑：%s"
7371
7240 -#: setup.c:578
7372 +#: setup.c:596
7373 #, c-format
7374 msgid "not a git repository: %s"
7375 msgstr "不是一個 git 版本庫：%s"
7376
7245 -#: setup.c:677
7377 +#: setup.c:695
7378 #, c-format
7379 msgid "'$%s' too big"
7380 msgstr "'$%s' 太大"
7381
7250 -#: setup.c:691
7382 +#: setup.c:709
7383 #, c-format
7384 msgid "not a git repository: '%s'"
7385 msgstr "不是一個 git 版本庫：'%s'"
7386
7255 -#: setup.c:720 setup.c:722 setup.c:753
7387 +#: setup.c:738 setup.c:740 setup.c:771
7388 #, c-format
7389 msgid "cannot chdir to '%s'"
7390 msgstr "不能切換目錄到 '%s'"
7391
7260 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
7392 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
7393 msgid "cannot come back to cwd"
7394 msgstr "無法返回目前工作目錄"
7395
7264 -#: setup.c:852
7396 +#: setup.c:870
7397 #, c-format
7398 msgid "failed to stat '%*s%s%s'"
7399 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
7400
7269 -#: setup.c:1090
7401 +#: setup.c:1108
7402 msgid "Unable to read current working directory"
7403 msgstr "不能讀取目前工作目錄"
7404
7273 -#: setup.c:1099 setup.c:1105
7405 +#: setup.c:1117 setup.c:1123
7406 #, c-format
7407 msgid "cannot change to '%s'"
7408 msgstr "不能切換到 '%s'"
7409
7278 -#: setup.c:1110
7410 +#: setup.c:1128
7411 #, c-format
7412 msgid "not a git repository (or any of the parent directories): %s"
7413 msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
7414
7283 -#: setup.c:1116
7415 +#: setup.c:1134
7416 #, c-format
7417 msgid ""
7418 "not a git repository (or any parent up to mount point %s)\n"
@@ -7289,7 +7421,7 @@ msgstr ""
7421 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
7422 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
7423
7292 -#: setup.c:1227
7424 +#: setup.c:1245
7425 #, c-format
7426 msgid ""
7427 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7298,15 +7430,15 @@ msgstr ""
7430 "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
7431 "檔案所有者必須始終擁有讀寫權限。"
7432
7301 -#: setup.c:1271
7433 +#: setup.c:1289
7434 msgid "open /dev/null or dup failed"
7435 msgstr "不能開啟或者複製 /dev/null"
7436
7305 -#: setup.c:1286
7437 +#: setup.c:1304
7438 msgid "fork failed"
7439 msgstr "fork 失敗"
7440
7309 -#: setup.c:1291
7441 +#: setup.c:1309
7442 msgid "setsid failed"
7443 msgstr "setsid 失敗"
7444
@@ -7386,194 +7518,194 @@ msgstr "mmap 失敗"
7518 msgid "object file %s is empty"
7519 msgstr "物件檔案 %s 為空"
7520
7389 -#: sha1-file.c:1252 sha1-file.c:2392
7521 +#: sha1-file.c:1263 sha1-file.c:2443
7522 #, c-format
7523 msgid "corrupt loose object '%s'"
7524 msgstr "損壞的鬆散物件 '%s'"
7525
7394 -#: sha1-file.c:1254 sha1-file.c:2396
7526 +#: sha1-file.c:1265 sha1-file.c:2447
7527 #, c-format
7528 msgid "garbage at end of loose object '%s'"
7529 msgstr "鬆散物件 '%s' 後面有垃圾資料"
7530
7399 -#: sha1-file.c:1296
7531 +#: sha1-file.c:1307
7532 msgid "invalid object type"
7533 msgstr "無效的物件類型"
7534
7403 -#: sha1-file.c:1380
7535 +#: sha1-file.c:1391
7536 #, c-format
7537 msgid "unable to unpack %s header with --allow-unknown-type"
7538 msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
7539
7408 -#: sha1-file.c:1383
7540 +#: sha1-file.c:1394
7541 #, c-format
7542 msgid "unable to unpack %s header"
7543 msgstr "無法解開 %s 頭部"
7544
7413 -#: sha1-file.c:1389
7545 +#: sha1-file.c:1400
7546 #, c-format
7547 msgid "unable to parse %s header with --allow-unknown-type"
7548 msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
7549
7418 -#: sha1-file.c:1392
7550 +#: sha1-file.c:1403
7551 #, c-format
7552 msgid "unable to parse %s header"
7553 msgstr "無法解析 %s 頭部"
7554
7423 -#: sha1-file.c:1584
7555 +#: sha1-file.c:1629
7556 #, c-format
7557 msgid "failed to read object %s"
7558 msgstr "讀取物件 %s 失敗"
7559
7428 -#: sha1-file.c:1588
7560 +#: sha1-file.c:1633
7561 #, c-format
7562 msgid "replacement %s not found for %s"
7563 msgstr "找不到 %2$s 的替代 %1$s"
7564
7433 -#: sha1-file.c:1592
7565 +#: sha1-file.c:1637
7566 #, c-format
7567 msgid "loose object %s (stored in %s) is corrupt"
7568 msgstr "鬆散物件 %s（儲存在 %s）已損壞"
7569
7438 -#: sha1-file.c:1596
7570 +#: sha1-file.c:1641
7571 #, c-format
7572 msgid "packed object %s (stored in %s) is corrupt"
7573 msgstr "打包物件 %s（儲存在 %s）已損壞"
7574
7443 -#: sha1-file.c:1699
7575 +#: sha1-file.c:1746
7576 #, c-format
7577 msgid "unable to write file %s"
7578 msgstr "無法寫檔案 %s"
7579
7448 -#: sha1-file.c:1706
7580 +#: sha1-file.c:1753
7581 #, c-format
7582 msgid "unable to set permission to '%s'"
7583 msgstr "無法為 '%s' 設定權限"
7584
7453 -#: sha1-file.c:1713
7585 +#: sha1-file.c:1760
7586 msgid "file write error"
7587 msgstr "檔案寫錯誤"
7588
7457 -#: sha1-file.c:1732
7589 +#: sha1-file.c:1780
7590 msgid "error when closing loose object file"
7591 msgstr "關閉鬆散物件檔案時發生錯誤"
7592
7461 -#: sha1-file.c:1797
7593 +#: sha1-file.c:1845
7594 #, c-format
7595 msgid "insufficient permission for adding an object to repository database %s"
7596 msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
7597
7466 -#: sha1-file.c:1799
7598 +#: sha1-file.c:1847
7599 msgid "unable to create temporary file"
7600 msgstr "無法建立暫存檔"
7601
7470 -#: sha1-file.c:1823
7602 +#: sha1-file.c:1871
7603 msgid "unable to write loose object file"
7604 msgstr "不能寫鬆散物件檔案"
7605
7474 -#: sha1-file.c:1829
7606 +#: sha1-file.c:1877
7607 #, c-format
7608 msgid "unable to deflate new object %s (%d)"
7609 msgstr "不能壓縮新物件 %s（%d）"
7610
7479 -#: sha1-file.c:1833
7611 +#: sha1-file.c:1881
7612 #, c-format
7613 msgid "deflateEnd on object %s failed (%d)"
7614 msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
7615
7484 -#: sha1-file.c:1837
7616 +#: sha1-file.c:1885
7617 #, c-format
7618 msgid "confused by unstable object source data for %s"
7619 msgstr "被 %s 的不穩定物件源資料搞糊塗了"
7620
7489 -#: sha1-file.c:1847 builtin/pack-objects.c:925
7621 +#: sha1-file.c:1895 builtin/pack-objects.c:1054
7622 #, c-format
7623 msgid "failed utime() on %s"
7624 msgstr "在 %s 上呼叫 utime() 失敗"
7625
7494 -#: sha1-file.c:1922
7626 +#: sha1-file.c:1972
7627 #, c-format
7628 msgid "cannot read object for %s"
7629 msgstr "不能讀取物件 %s"
7630
7499 -#: sha1-file.c:1962
7631 +#: sha1-file.c:2011
7632 msgid "corrupt commit"
7633 msgstr "損壞的提交"
7634
7503 -#: sha1-file.c:1970
7635 +#: sha1-file.c:2019
7636 msgid "corrupt tag"
7637 msgstr "損壞的標籤"
7638
7507 -#: sha1-file.c:2069
7639 +#: sha1-file.c:2119
7640 #, c-format
7641 msgid "read error while indexing %s"
7642 msgstr "索引 %s 時讀取錯誤"
7643
7512 -#: sha1-file.c:2072
7644 +#: sha1-file.c:2122
7645 #, c-format
7646 msgid "short read while indexing %s"
7647 msgstr "索引 %s 時讀入不完整"
7648
7517 -#: sha1-file.c:2145 sha1-file.c:2154
7649 +#: sha1-file.c:2195 sha1-file.c:2205
7650 #, c-format
7651 msgid "%s: failed to insert into database"
7652 msgstr "%s：插入資料庫失敗"
7653
7522 -#: sha1-file.c:2160
7654 +#: sha1-file.c:2211
7655 #, c-format
7656 msgid "%s: unsupported file type"
7657 msgstr "%s：不支援的檔案類型"
7658
7527 -#: sha1-file.c:2184
7659 +#: sha1-file.c:2235
7660 #, c-format
7661 msgid "%s is not a valid object"
7662 msgstr "%s 不是一個有效的物件"
7663
7532 -#: sha1-file.c:2186
7664 +#: sha1-file.c:2237
7665 #, c-format
7666 msgid "%s is not a valid '%s' object"
7667 msgstr "%s 不是一個有效的 '%s' 物件"
7668
7537 -#: sha1-file.c:2213 builtin/index-pack.c:155
7669 +#: sha1-file.c:2264 builtin/index-pack.c:155
7670 #, c-format
7671 msgid "unable to open %s"
7672 msgstr "不能開啟 %s"
7673
7542 -#: sha1-file.c:2403 sha1-file.c:2455
7674 +#: sha1-file.c:2454 sha1-file.c:2507
7675 #, c-format
7676 msgid "hash mismatch for %s (expected %s)"
7677 msgstr "%s 的雜湊值不符合（預期 %s）"
7678
7547 -#: sha1-file.c:2427
7679 +#: sha1-file.c:2478
7680 #, c-format
7681 msgid "unable to mmap %s"
7682 msgstr "不能 mmap %s"
7683
7552 -#: sha1-file.c:2432
7684 +#: sha1-file.c:2483
7685 #, c-format
7686 msgid "unable to unpack header of %s"
7687 msgstr "無法解壓縮 %s 的頭部"
7688
7557 -#: sha1-file.c:2438
7689 +#: sha1-file.c:2489
7690 #, c-format
7691 msgid "unable to parse header of %s"
7692 msgstr "無法解析 %s 的頭部"
7693
7562 -#: sha1-file.c:2449
7694 +#: sha1-file.c:2500
7695 #, c-format
7696 msgid "unable to unpack contents of %s"
7697 msgstr "無法解壓縮 %s 的內容"
7698
7567 -#: sha1-name.c:487
7699 +#: sha1-name.c:486
7700 #, c-format
7701 msgid "short SHA1 %s is ambiguous"
7702 msgstr "短 SHA1 %s 存在歧義"
7703
7572 -#: sha1-name.c:498
7704 +#: sha1-name.c:497
7705 msgid "The candidates are:"
7706 msgstr "候選者有："
7707
7576 -#: sha1-name.c:797
7708 +#: sha1-name.c:796
7709 msgid ""
7710 "Git normally never creates a ref that ends with 40 hex characters\n"
7711 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7594,61 +7726,124 @@ msgstr ""
7726 "引用，可能需要刪除它們。執行 \"git config advice.objectNameWarning\n"
7727 "false\" 指令關閉本消息通知。"
7728
7729 +#: sha1-name.c:916
7730 +#, c-format
7731 +msgid "log for '%.*s' only goes back to %s"
7732 +msgstr ""
7733 +
7734 +#: sha1-name.c:924
7735 +#, c-format
7736 +msgid "log for '%.*s' only has %d entries"
7737 +msgstr ""
7738 +
7739 +#: sha1-name.c:1689
7740 +#, c-format
7741 +msgid "path '%s' exists on disk, but not in '%.*s'"
7742 +msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
7743 +
7744 +#: sha1-name.c:1695
7745 +#, c-format

This file is too large to show in full.