l10n: zh_TW.po: localized
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Yi-Jyun Pan committed
May 23, 2021 at 15:29 UTC
beded618b23f4fe2aa5385ae6322a5cec0344aa7
1 file changed
+82
-82
po/zh_TW.po
+82
-82
@@ -293,7 +293,7 @@ msgstr ""
293
"Project-Id-Version: Git\n"
294
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
295
"POT-Creation-Date: 2021-05-17 16:02+0800\n"
296
-"PO-Revision-Date: 2021-05-20 15:14+0800\n"
296
+"PO-Revision-Date: 2021-05-23 15:30+0800\n"
297
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
298
"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
299
"Language: zh_TW\n"
@@ -877,8 +877,8 @@ msgid ""
877
"edit again. If all lines of the hunk are removed, then the edit is\n"
878
"aborted and the hunk is left unchanged.\n"
879
msgstr ""
880
-"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
881
-"此次編輯被終止，此區塊不會被修改。\n"
880
+"如果未乾淨套用，您就有機會重新編輯。若刪掉此區塊的全部內容，則會中止\n"
881
+"本次編輯，區塊則不會被修改。\n"
882
883
#: add-patch.c:1132
884
msgid "could not parse hunk header"
@@ -903,7 +903,7 @@ msgstr "「git apply --cached」失敗"
903
#: add-patch.c:1246 git-add--interactive.perl:1242
904
msgid ""
905
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
906
-msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
906
+msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
907
908
#: add-patch.c:1289
909
msgid "The selected hunks do not apply to the index!"
@@ -953,7 +953,7 @@ msgstr "沒有其它可供跳轉的區塊"
953
954
#: add-patch.c:1548 git-add--interactive.perl:1606
955
msgid "go to which hunk (<ret> to see more)? "
956
-msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
956
+msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
957
958
#: add-patch.c:1549 git-add--interactive.perl:1608
959
msgid "go to which hunk? "
@@ -994,7 +994,7 @@ msgstr "對不起，不能分割這個區塊"
994
#: add-patch.c:1623
995
#, c-format
996
msgid "Split into %d hunks."
997
-msgstr "分割為 %d 塊。"
997
+msgstr "分割為 %d 個區塊。"
998
999
#: add-patch.c:1627
1000
msgid "Sorry, cannot edit this hunk"
@@ -1222,7 +1222,7 @@ msgstr "recount：意外的行：%.*s"
1222
#: apply.c:1549
1223
#, c-format
1224
msgid "patch fragment without header at line %d: %.*s"
1225
-msgstr "第 %d 行的修補檔片段沒有標頭訊息：%.*s"
1225
+msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
1226
1227
#: apply.c:1752
1228
msgid "new file depends on old contents"
@@ -1291,7 +1291,7 @@ msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
1291
#: apply.c:3068
1292
#, c-format
1293
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1294
-msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段"
1294
+msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
1295
1296
#: apply.c:3074
1297
#, c-format
@@ -1561,12 +1561,12 @@ msgstr "不能開啟 %s"
1561
#: apply.c:4592
1562
#, c-format
1563
msgid "Hunk #%d applied cleanly."
1564
-msgstr "第 #%d 個片段成功應用。"
1564
+msgstr "成功套用第 #%d 個區塊。"
1565
1566
#: apply.c:4596
1567
#, c-format
1568
msgid "Rejected hunk #%d."
1569
-msgstr "拒絕第 #%d 個片段。"
1569
+msgstr "拒絕第 #%d 個區塊。"
1570
1571
#: apply.c:4725
1572
#, c-format
@@ -1602,7 +1602,7 @@ msgstr[0] "%d 行新增了空白字元誤用。"
1602
#, c-format
1603
msgid "%d line applied after fixing whitespace errors."
1604
msgid_plural "%d lines applied after fixing whitespace errors."
1605
-msgstr[0] "修復空白錯誤後，應用了 %d 行。"
1605
+msgstr[0] "修復空白錯誤後，套用了 %d 行。"
1606
1607
#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
1608
msgid "Unable to write new index file"
@@ -1610,11 +1610,11 @@ msgstr "無法寫入新索引檔案"
1610
1611
#: apply.c:4995
1612
msgid "don't apply changes matching the given path"
1613
-msgstr "不要應用與給出路徑向符合的變更"
1613
+msgstr "不要套用符合提供路徑的變更"
1614
1615
#: apply.c:4998
1616
msgid "apply changes matching the given path"
1617
-msgstr "應用與給出路徑向符合的變更"
1617
+msgstr "套用符合提供路徑的變更"
1618
1619
#: apply.c:5000 builtin/am.c:2317
1620
msgid "num"
@@ -1642,7 +1642,7 @@ msgstr "不套用修補檔，而是顯示輸入的概要"
1642
1643
#: apply.c:5014
1644
msgid "instead of applying the patch, see if the patch is applicable"
1645
-msgstr "不套用修補檔，而是檢視修補檔是否可應用"
1645
+msgstr "不套用修補檔，而是檢視修補檔是否可套用"
1646
1647
#: apply.c:5016
1648
msgid "make sure the patch is applicable to the current index"
@@ -1705,11 +1705,11 @@ msgstr "無需至少一行上下文"
1705
1706
#: apply.c:5049
1707
msgid "leave the rejected hunks in corresponding *.rej files"
1708
-msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"
1708
+msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
1709
1710
#: apply.c:5051
1711
msgid "allow overlapping hunks"
1712
-msgstr "允許重疊的修補檔片段"
1712
+msgstr "允許重疊的修補檔區塊"
1713
1714
#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
1715
#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
@@ -1723,7 +1723,7 @@ msgstr "允許不正確的檔案末尾換行符號"
1723
1724
#: apply.c:5057
1725
msgid "do not trust the line counts in the hunk headers"
1726
-msgstr "不信任修補檔片段的標頭訊息中的行號"
1726
+msgstr "不信任修補檔區塊的標頭訊息中的行號"
1727
1728
#: apply.c:5059 builtin/am.c:2305
1729
msgid "root"
@@ -3322,7 +3322,7 @@ msgstr "%s：smudge 過濾器 %s 失敗"
3322
#: credential.c:96
3323
#, c-format
3324
msgid "skipping credential lookup for key: credential.%s"
3325
-msgstr "跳過鍵的憑證查詢：credential.%s"
3325
+msgstr "略過鍵的憑證查詢：credential.%s"
3326
3327
#: credential.c:112
3328
msgid "refusing to work with credential missing host field"
@@ -3724,7 +3724,7 @@ msgstr "生成差異統計的簡潔摘要"
3724
3725
#: diff.c:5444
3726
msgid "output a binary diff that can be applied"
3727
-msgstr "輸出一個可以應用的二進位差異"
3727
+msgstr "輸出一個可以套用的二進位差異"
3728
3729
#: diff.c:5447
3730
msgid "show full pre- and post-image object names on the \"index\" lines"
@@ -4882,7 +4882,7 @@ msgstr ""
4882
msgid ""
4883
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4884
"renamed."
4885
-msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
4885
+msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
4886
4887
#: merge-ort.c:1932 merge-recursive.c:3244
4888
#, c-format
@@ -5343,19 +5343,19 @@ msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
5343
5344
#: midx.c:148
5345
msgid "multi-pack-index missing required pack-name chunk"
5346
-msgstr "多包索引缺少必需的包名塊"
5346
+msgstr "多包索引缺少必需的包名區塊"
5347
5348
#: midx.c:150
5349
msgid "multi-pack-index missing required OID fanout chunk"
5350
-msgstr "多包索引缺少必需的物件 ID 扇出塊"
5350
+msgstr "多包索引缺少必需的物件 ID fanout 區塊"
5351
5352
#: midx.c:152
5353
msgid "multi-pack-index missing required OID lookup chunk"
5354
-msgstr "多包索引缺少必需的物件 ID 查詢塊"
5354
+msgstr "多包索引缺少必需的物件 ID 查詢區塊"
5355
5356
#: midx.c:154
5357
msgid "multi-pack-index missing required object offsets chunk"
5358
-msgstr "多包索引缺少必需的物件位移塊"
5358
+msgstr "多包索引缺少必需的物件位移區塊"
5359
5360
#: midx.c:170
5361
#, c-format
@@ -7328,7 +7328,7 @@ msgstr "重新整理 '%s' 失敗"
7328
#: rerere.c:487 rerere.c:1023
7329
#, c-format
7330
msgid "could not parse conflict hunks in '%s'"
7331
-msgstr "不能解析 '%s' 中的衝突塊"
7331
+msgstr "不能解析 '%s' 中的衝突區塊"
7332
7333
#: rerere.c:668
7334
#, c-format
@@ -7495,7 +7495,7 @@ msgstr "接收端不支援推送選項"
7495
#: sequencer.c:196
7496
#, c-format
7497
msgid "invalid commit message cleanup mode '%s'"
7498
-msgstr "無效的提交訊息清理模式 '%s'"
7498
+msgstr "無效的提交說明清理模式 '%s'"
7499
7500
#: sequencer.c:324
7501
#, c-format
@@ -7892,7 +7892,7 @@ msgstr "不能還原 %s... %s"
7892
#: sequencer.c:2266
7893
#, c-format
7894
msgid "could not apply %s... %s"
7895
-msgstr "不能應用 %s... %s"
7895
+msgstr "不能套用 %s... %s"
7896
7897
#: sequencer.c:2287
7898
#, c-format
@@ -8053,11 +8053,11 @@ msgstr "沒有正在進行的揀選"
8053
8054
#: sequencer.c:3239
8055
msgid "failed to skip the commit"
8056
-msgstr "無法跳過這個提交"
8056
+msgstr "無法略過這個提交"
8057
8058
#: sequencer.c:3246
8059
msgid "there is nothing to skip"
8060
-msgstr "沒有要跳過的"
8060
+msgstr "沒有要略過的"
8061
8062
#: sequencer.c:3249
8063
#, c-format
@@ -8099,7 +8099,7 @@ msgstr ""
8099
#: sequencer.c:3446
8100
#, c-format
8101
msgid "Could not apply %s... %.*s"
8102
-msgstr "不能應用 %s... %.*s"
8102
+msgstr "不能套用 %s... %.*s"
8103
8104
#: sequencer.c:3453
8105
#, c-format
@@ -8229,7 +8229,7 @@ msgstr "無法 reset --hard"
8229
#: sequencer.c:4120
8230
#, c-format
8231
msgid "Applied autostash.\n"
8232
-msgstr "已應用 autostash。\n"
8232
+msgstr "已套用 autostash。\n"
8233
8234
#: sequencer.c:4132
8235
#, c-format
@@ -8390,7 +8390,7 @@ msgstr "無事可做"
8390
8391
#: sequencer.c:5651
8392
msgid "could not skip unnecessary pick commands"
8393
-msgstr "無法跳過不必要的揀選"
8393
+msgstr "無法略過不必要的揀選"
8394
8395
#: sequencer.c:5751
8396
msgid "the script was already rearranged."
@@ -8693,7 +8693,7 @@ msgstr "無效 --ignore-submodules 參數：%s"
8693
msgid ""
8694
"Submodule in commit %s at path: '%s' collides with a submodule named the "
8695
"same. Skipping it."
8696
-msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。"
8696
+msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。"
8697
8698
#: submodule.c:921
8699
#, c-format
@@ -9475,7 +9475,7 @@ msgstr "無效的埠號"
9475
9476
#: urlmatch.c:371
9477
msgid "invalid '..' path segment"
9478
-msgstr "無效的 '..' 路徑片段"
9478
+msgstr "無效的 '..' 路徑區塊"
9479
9480
#: walker.c:170
9481
msgid "Fetching objects"
@@ -9808,7 +9808,7 @@ msgstr " （解決衝突，然後執行 \"git am --continue\"）"
9808
# 譯者：請維持前導空格
9809
#: wt-status.c:1175
9810
msgid " (use \"git am --skip\" to skip this patch)"
9811
-msgstr " （使用 \"git am --skip\" 跳過此修補檔）"
9811
+msgstr " （使用 \"git am --skip\" 略過此修補檔）"
9812
9813
# 譯者：請維持前導空格
9814
#: wt-status.c:1177
@@ -9866,7 +9866,7 @@ msgstr " （解決衝突，然後執行 \"git rebase --continue\"）"
9866
# 譯者：請維持前導空格
9867
#: wt-status.c:1374
9868
msgid " (use \"git rebase --skip\" to skip this patch)"
9869
-msgstr " （使用 \"git rebase --skip\" 跳過此修補檔）"
9869
+msgstr " （使用 \"git rebase --skip\" 略過此修補檔）"
9870
9871
# 譯者：請維持前導空格
9872
#: wt-status.c:1376
@@ -9940,7 +9940,7 @@ msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）"
9940
# 譯者：請維持前導空格
9941
#: wt-status.c:1438
9942
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
9943
-msgstr " （使用 \"git cherry-pick --skip\" 跳過此修補檔）"
9943
+msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）"
9944
9945
# 譯者：請維持前導空格
9946
#: wt-status.c:1440
@@ -9974,7 +9974,7 @@ msgstr " （所有衝突已解決：執行 \"git revert --continue\"）"
9974
# 譯者：請維持前導空格
9975
#: wt-status.c:1467
9976
msgid " (use \"git revert --skip\" to skip this patch)"
9977
-msgstr " （使用 \"git revert --skip\" 跳過此修補檔）"
9977
+msgstr " （使用 \"git revert --skip\" 略過此修補檔）"
9978
9979
# 譯者：請維持前導空格
9980
#: wt-status.c:1469
@@ -10224,7 +10224,7 @@ msgstr "空修補檔。異常終止。"
10224
#: builtin/add.c:335
10225
#, c-format
10226
msgid "Could not apply '%s'"
10227
-msgstr "不能應用 '%s'"
10227
+msgstr "不能套用 '%s'"
10228
10229
#: builtin/add.c:343
10230
msgid "The following paths are ignored by one of your .gitignore files:\n"
@@ -10246,7 +10246,7 @@ msgstr "互動式挑選資料區塊"
10246
10247
#: builtin/add.c:368
10248
msgid "edit current diff and apply"
10249
-msgstr "編輯目前差異並應用"
10249
+msgstr "編輯目前差異並套用"
10250
10251
#: builtin/add.c:369
10252
msgid "allow adding otherwise ignored files"
@@ -10278,7 +10278,7 @@ msgstr "不新增，只重新整理索引"
10278
10279
#: builtin/add.c:379
10280
msgid "just skip files which cannot be added because of errors"
10281
-msgstr "跳過因發生錯誤不能新增的檔案"
10281
+msgstr "略過因發生錯誤不能新增的檔案"
10282
10283
#: builtin/add.c:380
10284
msgid "check if - even missing - files are ignored in dry run"
@@ -10424,7 +10424,7 @@ msgstr "無法解析修補檔 '%s'"
10424
10425
#: builtin/am.c:813
10426
msgid "Only one StGIT patch series can be applied at once"
10427
-msgstr "一次只能有一個 StGIT 修補檔佇列被應用"
10427
+msgstr "一次只能有一個 StGIT 修補檔佇列被套用"
10428
10429
#: builtin/am.c:861
10430
msgid "invalid timestamp"
@@ -10459,7 +10459,7 @@ msgstr "當您解決這一問題，執行 \"%s --continue\"。"
10459
#: builtin/am.c:1126
10460
#, c-format
10461
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
10462
-msgstr "如果您想要跳過這一修補檔，則執行 \"%s --skip\"。"
10462
+msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。"
10463
10464
#: builtin/am.c:1127
10465
#, c-format
@@ -10543,11 +10543,11 @@ msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
10543
#: builtin/am.c:1796 builtin/am.c:1864
10544
#, c-format
10545
msgid "Applying: %.*s"
10546
-msgstr "應用：%.*s"
10546
+msgstr "套用：%.*s"
10547
10548
#: builtin/am.c:1813
10549
msgid "No changes -- Patch already applied."
10550
-msgstr "沒有變更 —— 修補檔已經應用過。"
10550
+msgstr "沒有變更——修補檔已經套用過。"
10551
10552
#: builtin/am.c:1819
10553
#, c-format
@@ -10566,7 +10566,7 @@ msgid ""
10566
msgstr ""
10567
"沒有變更 —— 您是不是忘了執行 'git add'？\n"
10568
"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
10569
-"您也許想要跳過這個修補檔。"
10569
+"您也許想要略過這個修補檔。"
10570
10571
#: builtin/am.c:1874
10572
msgid ""
@@ -10637,7 +10637,7 @@ msgstr "靜默模式"
10637
10638
#: builtin/am.c:2275
10639
msgid "add a Signed-off-by trailer to the commit message"
10640
-msgstr "在提交訊息結尾加入 Signed-off-by"
10640
+msgstr "在提交說明結尾加入 Signed-off-by"
10641
10642
#: builtin/am.c:2278
10643
msgid "recode into utf8 (default)"
@@ -10711,7 +10711,7 @@ msgstr "和 --continue 同義"
10711
10712
#: builtin/am.c:2335
10713
msgid "skip the current patch"
10714
-msgstr "跳過目前修補檔"
10714
+msgstr "略過目前修補檔"
10715
10716
#: builtin/am.c:2338
10717
msgid "restore the original branch and abort the patching operation"
@@ -11104,7 +11104,7 @@ msgstr "從指定檔案重放二分搜尋過程"
11104
11105
#: builtin/bisect--helper.c:1070
11106
msgid "skip some commits for checkout"
11107
-msgstr "跳過要檢出的部分提交"
11107
+msgstr "略過要檢出的部分提交"
11108
11109
#: builtin/bisect--helper.c:1072
11110
msgid "no log for BISECT_WRITE"
@@ -11206,7 +11206,7 @@ msgstr "顯示成適合機器讀取的格式"
11206
11207
#: builtin/blame.c:876
11208
msgid "show porcelain format with per-line commit information"
11209
-msgstr "顯示每一列適合機器的提交訊息"
11209
+msgstr "顯示每一列適合機器的提交說明"
11210
11211
#: builtin/blame.c:877
11212
msgid "use the same output mode as git-annotate (Default: off)"
@@ -13316,7 +13316,7 @@ msgstr "訊息"
13316
13317
#: builtin/commit-tree.c:115 builtin/commit.c:1614
13318
msgid "commit message"
13319
-msgstr "提交訊息"
13319
+msgstr "提交說明"
13320
13321
#: builtin/commit-tree.c:118
13322
msgid "read commit log message from file"
@@ -13390,7 +13390,7 @@ msgstr ""
13390
"\n"
13391
" git cherry-pick --continue\n"
13392
"\n"
13393
-"來繼續揀選剩餘提交。如果您想跳過此提交，使用：\n"
13393
+"來繼續揀選剩餘提交。如果您想略過此提交，使用：\n"
13394
"\n"
13395
" git cherry-pick --skip\n"
13396
"\n"
@@ -14694,7 +14694,7 @@ msgstr "使用 done 功能終止串流"
14694
14695
#: builtin/fast-export.c:1221
14696
msgid "skip output of blob data"
14697
-msgstr "跳過資料物件資料的輸出"
14697
+msgstr "略過資料物件資料的輸出"
14698
14699
#: builtin/fast-export.c:1222 builtin/log.c:1823
14700
msgid "refspec"
@@ -16319,7 +16319,7 @@ msgstr "%s 的所有子物件並非都可以取得"
16319
16320
#: builtin/index-pack.c:932 builtin/index-pack.c:979
16321
msgid "failed to apply delta"
16322
-msgstr "應用 delta 失敗"
16322
+msgstr "套用 delta 失敗"
16323
16324
#: builtin/index-pack.c:1162
16325
msgid "Receiving objects"
@@ -16655,7 +16655,7 @@ msgstr "只輸出尾部署名"
16655
16656
#: builtin/interpret-trailers.c:106
16657
msgid "do not apply config rules"
16658
-msgstr "不要應用設定規則"
16658
+msgstr "不要套用組態設定規則"
16659
16660
#: builtin/interpret-trailers.c:107
16661
msgid "join whitespace-continued values"
@@ -17305,7 +17305,7 @@ msgstr "保留主旨中不是 PATCH 的方括號"
17305
17306
#: builtin/mailinfo.c:62
17307
msgid "copy Message-ID to the end of commit message"
17308
-msgstr "複製 Message-ID 至提交訊息末尾"
17308
+msgstr "複製 Message-ID 至提交說明末尾"
17309
17310
#: builtin/mailinfo.c:64
17311
msgid "re-code metadata to i18n.commitEncoding"
@@ -17506,7 +17506,7 @@ msgstr "（和 --stat 同義）"
17506
17507
#: builtin/merge.c:262 builtin/pull.c:142
17508
msgid "add (at most <n>) entries from shortlog to merge commit message"
17509
-msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄"
17509
+msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄"
17510
17511
#: builtin/merge.c:265 builtin/pull.c:148
17512
msgid "create a single commit instead of doing a merge"
@@ -17646,7 +17646,7 @@ msgid ""
17646
"especially if it merges an updated upstream into a topic branch.\n"
17647
"\n"
17648
msgstr ""
17649
-"請輸入一個提交訊息以解釋此合併的必要性，尤其是將一個更新後的上游分支\n"
17649
+"請輸入一個提交說明以解釋此合併的必要性，尤其是將一個更新後的上游分支\n"
17650
"合併到主題分支。\n"
17651
"\n"
17652
@@ -17663,7 +17663,7 @@ msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交
17663
17664
#: builtin/merge.c:888
17665
msgid "Empty commit message."
17666
-msgstr "空提交訊息。"
17666
+msgstr "空提交說明。"
17667
17668
#: builtin/merge.c:903
17669
#, c-format
@@ -17956,7 +17956,7 @@ msgstr "強制移動/重指令，即使目標存在"
17956
17957
#: builtin/mv.c:127
17958
msgid "skip move/rename errors"
17959
-msgstr "跳過移動/重新命名錯誤"
17959
+msgstr "略過移動/重新命名錯誤"
17960
17961
#: builtin/mv.c:170
17962
#, c-format
@@ -19544,7 +19544,7 @@ msgstr "不更新索引區和工作區"
19544
19545
#: builtin/read-tree.c:151
19546
msgid "skip applying sparse checkout filter"
19547
-msgstr "跳過應用稀疏檢出過濾器"
19547
+msgstr "略過套用稀疏檢出過濾器"
19548
19549
#: builtin/read-tree.c:153
19550
msgid "debug unpack-trees"
@@ -19636,7 +19636,7 @@ msgstr "繼續重定基底"
19636
19637
#: builtin/rebase.c:511
19638
msgid "skip commit"
19639
-msgstr "跳過提交"
19639
+msgstr "略過提交"
19640
19641
#: builtin/rebase.c:512
19642
msgid "edit the todo list"
@@ -19772,7 +19772,7 @@ msgid ""
19772
msgstr ""
19773
"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n"
19774
"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n"
19775
-"\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n"
19775
+"\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n"
19776
"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
19777
19778
#: builtin/rebase.c:896
@@ -19892,7 +19892,7 @@ msgstr "繼續"
19892
19893
#: builtin/rebase.c:1357
19894
msgid "skip current patch and continue"
19895
-msgstr "跳過目前修補檔並繼續"
19895
+msgstr "略過目前修補檔並繼續"
19896
19897
# 譯者：請維持前導空格
19898
#: builtin/rebase.c:1359
@@ -21436,7 +21436,7 @@ msgstr "取消反轉或揀選動作"
21436
21437
#: builtin/revert.c:105
21438
msgid "skip current commit and continue"
21439
-msgstr "跳過目前提交並繼續"
21439
+msgstr "略過目前提交並繼續"
21440
21441
#: builtin/revert.c:107
21442
msgid "don't automatically commit"
@@ -22183,7 +22183,7 @@ msgstr "git stripspace [-c | --comment-lines]"
22183
22184
#: builtin/stripspace.c:37
22185
msgid "skip and remove all lines starting with comment character"
22186
-msgstr "跳過和移除所有的備註行"
22186
+msgstr "略過和移除所有的備註行"
22187
22188
#: builtin/stripspace.c:40
22189
msgid "prepend comment character and space to each line"
@@ -24104,7 +24104,7 @@ msgstr "套用信箱格式的系列修補檔"
24104
24105
#: command-list.h:52
24106
msgid "Annotate file lines with commit information"
24107
-msgstr "使用提交訊息備註檔案行"
24107
+msgstr "使用提交說明備註檔案行"
24108
24109
#: command-list.h:53
24110
msgid "Apply a patch to files and/or to the index"
@@ -24172,7 +24172,7 @@ msgstr "尋找尚未套用到上游的提交"
24172
24173
#: command-list.h:69
24174
msgid "Apply the changes introduced by some existing commits"
24175
-msgstr "應用一些現存提交引入的修改"
24175
+msgstr "套用一些現存提交引入的修改"
24176
24177
#: command-list.h:70
24178
msgid "Graphical alternative to git-commit"
@@ -24284,7 +24284,7 @@ msgstr "重寫分支"
24284
24285
#: command-list.h:97
24286
msgid "Produce a merge commit message"
24287
-msgstr "生成一個合併提交訊息"
24287
+msgstr "生成一個合併提交說明"
24288
24289
#: command-list.h:98
24290
msgid "Output information on each ref"
@@ -24493,7 +24493,7 @@ msgstr "將樹訊息讀取到索引"
24493
24494
#: command-list.h:149
24495
msgid "Reapply commits on top of another base tip"
24496
-msgstr "在另一個分支上重新應用提交"
24496
+msgstr "在另一個分支上重新套用提交"
24497
24498
#: command-list.h:150
24499
msgid "Receive what is pushed into the repository"
@@ -24997,7 +24997,7 @@ msgstr "無法遞迴進子模組路徑 '$displaypath'"
24997
24998
#: git-rebase--preserve-merges.sh:109
24999
msgid "Applied autostash."
25000
-msgstr "已應用 autostash。"
25000
+msgstr "已套用 autostash。"
25001
25002
#: git-rebase--preserve-merges.sh:112
25003
#, sh-format
@@ -25010,7 +25010,7 @@ msgid ""
25010
"Your changes are safe in the stash.\n"
25011
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
25012
msgstr ""
25013
-"應用 autostash 導致衝突。\n"
25013
+"套用 autostash 導致衝突。\n"
25014
"您的修改安全地儲存在儲藏區中。\n"
25015
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
25016
@@ -25128,7 +25128,7 @@ msgstr "這是提交說明 #${n}："
25128
#: git-rebase--preserve-merges.sh:462
25129
#, sh-format
25130
msgid "The commit message #${n} will be skipped:"
25131
-msgstr "提交說明 #${n} 將被跳過："
25131
+msgstr "提交說明 #${n} 將被略過："
25132
25133
#: git-rebase--preserve-merges.sh:473
25134
#, sh-format
@@ -25149,7 +25149,7 @@ msgstr "這是一個 2 個提交的組合。"
25149
#: git-rebase--preserve-merges.sh:572
25150
#, sh-format
25151
msgid "Could not apply $sha1... $rest"
25152
-msgstr "不能應用 $sha1... $rest"
25152
+msgstr "不能套用 $sha1... $rest"
25153
25154
#: git-rebase--preserve-merges.sh:601
25155
#, sh-format
@@ -25385,26 +25385,26 @@ msgstr[0] "建立了 %d 個路徑\n"
25385
msgid ""
25386
"If the patch applies cleanly, the edited hunk will immediately be\n"
25387
"marked for staging."
25388
-msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。"
25388
+msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
25389
25390
#: git-add--interactive.perl:1059
25391
msgid ""
25392
"If the patch applies cleanly, the edited hunk will immediately be\n"
25393
"marked for stashing."
25394
-msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。"
25394
+msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
25395
25396
#: git-add--interactive.perl:1062
25397
msgid ""
25398
"If the patch applies cleanly, the edited hunk will immediately be\n"
25399
"marked for unstaging."
25400
-msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。"
25400
+msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
25401
25402
#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
25403
#: git-add--interactive.perl:1080
25404
msgid ""
25405
"If the patch applies cleanly, the edited hunk will immediately be\n"
25406
"marked for applying."
25407
-msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。"
25407
+msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。"
25408
25409
#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
25410
#: git-add--interactive.perl:1077
@@ -25572,7 +25572,7 @@ msgstr ""
25572
25573
#: git-add--interactive.perl:1345
25574
msgid "The selected hunks do not apply to the index!\n"
25575
-msgstr "選中的區塊不能套用到索引！\n"
25575
+msgstr "選取區塊不能套用到索引！\n"
25576
25577
#: git-add--interactive.perl:1360
25578
#, perl-format
@@ -25629,7 +25629,7 @@ msgstr "沒有和提供模式相符合的區塊\n"
25629
25630
#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
25631
msgid "No previous hunk\n"
25632
-msgstr "沒有前一個區塊\n"
25632
+msgstr "沒有上一個區塊\n"
25633
25634
#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
25635
msgid "No next hunk\n"
@@ -25832,7 +25832,7 @@ msgstr "無法開啟 %s.final: %s"
25832
25833
#: git-send-email.perl:838
25834
msgid "Summary email is empty, skipping it\n"
25835
-msgstr "摘要信件為空，跳過\n"
25835
+msgstr "摘要信件為空，略過\n"
25836
25837
#. TRANSLATORS: please keep [y/N] as is.
25838
#: git-send-email.perl:873
@@ -25905,7 +25905,7 @@ msgid ""
25905
" run 'git config --global sendemail.confirm auto'.\n"
25906
"\n"
25907
msgstr ""
25908
-" 以上的抄送列表（Cc）已經用修補檔提交訊息中發現的位址進行\n"
25908
+" 以上的抄送列表（Cc）已經用修補檔提交說明中發現的位址進行\n"
25909
" 了擴展。預設 send-email 會給出提示。這個行為可以透過\n"
25910
" sendemail.confirm 設定設定。\n"
25911
"\n"