summaryrefslogtreecommitdiff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po7104
1 files changed, 3794 insertions, 3310 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a0a23a955b..77a5d57ed8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -292,8 +292,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-03-04 22:41+0800\n"
-"PO-Revision-Date: 2021-03-06 02:21+0800\n"
+"POT-Creation-Date: 2021-05-17 16:02+0800\n"
+"PO-Revision-Date: 2021-05-23 15:30+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
"Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"
"Language: zh_TW\n"
@@ -301,7 +301,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 2.4.3\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
@@ -310,9 +310,9 @@ msgstr ""
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
-#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
-#: builtin/rebase.c:1963
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
+#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528
+#: builtin/rebase.c:1953
msgid "could not read index"
msgstr "無法讀取索引"
@@ -340,7 +340,7 @@ msgstr "更新"
msgid "could not stage '%s'"
msgstr "無法暫存「%s」"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687
msgid "could not write index"
msgstr "無法寫入索引"
@@ -355,7 +355,7 @@ msgstr[0] "已更新 %d 個路徑\n"
msgid "note: %s is untracked now.\n"
msgstr "注意：%s 現已不再追蹤。\n"
-#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298
#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
@@ -493,12 +493,12 @@ msgstr "快取"
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
-#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
-#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308
+#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128
+#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
+#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327
+#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573
#: git-add--interactive.perl:213
msgid "path"
msgstr "路徑"
@@ -877,8 +877,8 @@ msgid ""
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
-"此次編輯被終止，此區塊不會被修改。\n"
+"如果未乾淨套用，您就有機會重新編輯。若刪掉此區塊的全部內容，則會中止\n"
+"本次編輯，區塊則不會被修改。\n"
#: add-patch.c:1132
msgid "could not parse hunk header"
@@ -903,7 +903,7 @@ msgstr "「git apply --cached」失敗"
#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
+msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
@@ -953,7 +953,7 @@ msgstr "沒有其它可供跳轉的區塊"
#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
-msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
+msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
@@ -994,7 +994,7 @@ msgstr "對不起，不能分割這個區塊"
#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
-msgstr "分割為 %d 塊。"
+msgstr "分割為 %d 個區塊。"
#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
@@ -1004,7 +1004,7 @@ msgstr "對不起，不能編輯這個區塊"
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:143
+#: advice.c:145
#, c-format
msgid ""
"\n"
@@ -1013,37 +1013,37 @@ msgstr ""
"\n"
"請使用「git config advice.%s false」來停用此訊息"
-#: advice.c:159
+#: advice.c:161
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:250
+#: advice.c:252
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選，因為您有未合併的檔案。"
-#: advice.c:252
+#: advice.c:254
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交，因為您有未合併的檔案。"
-#: advice.c:254
+#: advice.c:256
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併，因為您有未合併的檔案。"
-#: advice.c:256
+#: advice.c:258
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取，因為您有未合併的檔案。"
-#: advice.c:258
+#: advice.c:260
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交，因為您有未合併的檔案。"
-#: advice.c:260
+#: advice.c:262
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s，因為您有未合併的檔案。"
-#: advice.c:268
+#: advice.c:270
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -1051,23 +1051,36 @@ msgstr ""
"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:276
+#: advice.c:278
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:281 builtin/merge.c:1370
+#: advice.c:283 builtin/merge.c:1374
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
-#: advice.c:283
+#: advice.c:285
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:284
+#: advice.c:286
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:290
+#: advice.c:296
+#, fuzzy, c-format
+msgid ""
+"The following pathspecs didn't match any eligible path, but they do match "
+"index\n"
+"entries outside the current sparse checkout:\n"
+msgstr "沒有符合下列路徑規格的合規路徑，但有符合目前稀疏簽出之外的索引項目：\n"
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr "若有意更新這些項目，請停用或修改稀疏規則。"
+
+#: advice.c:310
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1115,82 +1128,78 @@ msgstr "指令列以 \\ 結尾"
msgid "unclosed quote"
msgstr "未閉合的引號"
-#: apply.c:69
+#: apply.c:70
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "無法識別的空白字元選項 '%s'"
-#: apply.c:85
+#: apply.c:86
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "無法識別的空白字元忽略選項 '%s'"
-#: apply.c:135
+#: apply.c:136
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同時使用。"
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached 和 --3way 不能同時使用。"
-
-#: apply.c:140
+#: apply.c:139
msgid "--3way outside a repository"
msgstr "--3way 在版本庫之外"
-#: apply.c:151
+#: apply.c:150
msgid "--index outside a repository"
msgstr "--index 在版本庫之外"
-#: apply.c:154
+#: apply.c:153
msgid "--cached outside a repository"
msgstr "--cached 在版本庫之外"
-#: apply.c:801
+#: apply.c:800
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "無法準備時間戳正規表示式 %s"
-#: apply.c:810
+#: apply.c:809
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，輸入為：%s"
-#: apply.c:884
+#: apply.c:883
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在修補檔的第 %d 行找到檔案名"
-#: apply.c:922
+#: apply.c:921
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
-#: apply.c:928
+#: apply.c:927
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"
-#: apply.c:929
+#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
-#: apply.c:934
+#: apply.c:933
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
-#: apply.c:963
+#: apply.c:962
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含無效檔案模式：%s"
-#: apply.c:1282
+#: apply.c:1281
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的檔案頭，%d 行和 %d 行"
-#: apply.c:1372
+#: apply.c:1371
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -1200,91 +1209,91 @@ msgid_plural ""
"components (line %d)"
msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
-#: apply.c:1385
+#: apply.c:1384
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"
-#: apply.c:1481
+#: apply.c:1480
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1550
+#: apply.c:1549
#, c-format
msgid "patch fragment without header at line %d: %.*s"
-msgstr "第 %d 行的修補檔片段沒有標頭訊息：%.*s"
+msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
-#: apply.c:1753
+#: apply.c:1752
msgid "new file depends on old contents"
msgstr "新檔案依賴舊內容"
-#: apply.c:1755
+#: apply.c:1754
msgid "deleted file still has contents"
msgstr "刪除的檔案仍有內容"
-#: apply.c:1789
+#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "修補檔在第 %d 行發現損壞"
-#: apply.c:1826
+#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "新檔案 %s 依賴舊內容"
-#: apply.c:1828
+#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "刪除的檔案 %s 仍有內容"
-#: apply.c:1831
+#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
-#: apply.c:1978
+#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二進位修補檔在第 %d 行損壞：%.*s"
-#: apply.c:2015
+#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "無法識別的二進位修補檔位於第 %d 行"
-#: apply.c:2177
+#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "修補檔案的第 %d 行只有垃圾資料"
-#: apply.c:2263
+#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "無法讀取符號連結 %s"
-#: apply.c:2267
+#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "不能開啟或讀取 %s"
-#: apply.c:2936
+#: apply.c:2935
#, c-format
msgid "invalid start of line: '%c'"
msgstr "無效的行首字元：'%c'"
-#: apply.c:3057
+#: apply.c:3056
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
-#: apply.c:3069
+#: apply.c:3068
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段"
+msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
-#: apply.c:3075
+#: apply.c:3074
#, c-format
msgid ""
"while searching for:\n"
@@ -1293,428 +1302,434 @@ msgstr ""
"當查詢：\n"
"%.*s"
-#: apply.c:3097
+#: apply.c:3096
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺少 '%s' 的二進位修補檔資料"
-#: apply.c:3105
+#: apply.c:3104
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
-#: apply.c:3152
+#: apply.c:3151
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
-#: apply.c:3163
+#: apply.c:3162
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
-#: apply.c:3171
+#: apply.c:3170
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
-#: apply.c:3189
+#: apply.c:3188
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
-#: apply.c:3202
+#: apply.c:3201
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二進位修補檔未套用到 '%s'"
-#: apply.c:3209
+#: apply.c:3208
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
-#: apply.c:3230
+#: apply.c:3229
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打修補檔失敗：%s:%ld"
-#: apply.c:3353
+#: apply.c:3352
#, c-format
msgid "cannot checkout %s"
msgstr "不能檢出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214
#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
-#: apply.c:3413
+#: apply.c:3412
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "讀取位於符號連結中的 '%s'"
-#: apply.c:3442 apply.c:3685
+#: apply.c:3441 apply.c:3687
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路徑 %s 已經被重新命名/刪除"
-#: apply.c:3528 apply.c:3700
+#: apply.c:3527 apply.c:3702
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在於索引中"
-#: apply.c:3537 apply.c:3708 apply.c:3952
+#: apply.c:3536 apply.c:3710 apply.c:3954
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不符合"
-#: apply.c:3572
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
-#: apply.c:3575
+#: apply.c:3574
#, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "回落到三方合併...\n"
+msgid "Performing three-way merge...\n"
+msgstr "正在進行三方合併⋯⋯\n"
-#: apply.c:3591 apply.c:3595
+#: apply.c:3590 apply.c:3594
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "無法讀取 '%s' 的目前內容"
-#: apply.c:3607
+#: apply.c:3606
#, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "無法回落到三方合併...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "無法進行三方合併⋯⋯\n"
-#: apply.c:3621
+#: apply.c:3620
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "套用修補檔到 '%s' 存在衝突。\n"
-#: apply.c:3626
+#: apply.c:3625
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功套用修補檔到 '%s'。\n"
-#: apply.c:3652
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr ""
+
+#: apply.c:3654
msgid "removal patch leaves file contents"
msgstr "移除修補檔仍留下了檔案內容"
-#: apply.c:3725
+#: apply.c:3727
#, c-format
msgid "%s: wrong type"
msgstr "%s：錯誤類型"
-#: apply.c:3727
+#: apply.c:3729
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的類型是 %o，應為 %o"
-#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
-#: read-cache.c:1313
+#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
+#: read-cache.c:1351
#, c-format
msgid "invalid path '%s'"
msgstr "無效路徑 '%s'"
-#: apply.c:3950
+#: apply.c:3952
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已經存在於索引中"
-#: apply.c:3954
+#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已經存在於工作區中"
-#: apply.c:3974
+#: apply.c:3976
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
-#: apply.c:3979
+#: apply.c:3981
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
-#: apply.c:3999
+#: apply.c:4001
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影響的檔案 '%s' 位於符號連結中"
-#: apply.c:4003
+#: apply.c:4005
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：修補檔未套用"
-#: apply.c:4018
+#: apply.c:4020
#, c-format
msgid "Checking patch %s..."
msgstr "正在檢查修補檔 %s..."
-#: apply.c:4110
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模組 %s 的 sha1 訊息缺少或無效"
-#: apply.c:4117
+#: apply.c:4119
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式變更，但它不在目前 HEAD 中"
-#: apply.c:4120
+#: apply.c:4122
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 訊息缺少或無效（%s）。"
-#: apply.c:4129
+#: apply.c:4131
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在暫時索引中新增 %s"
-#: apply.c:4139
+#: apply.c:4141
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把暫時索引寫入到 %s"
-#: apply.c:4277
+#: apply.c:4279
#, c-format
msgid "unable to remove %s from index"
msgstr "不能從索引中移除 %s"
-#: apply.c:4311
+#: apply.c:4313
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模組 %s 損壞的修補檔"
-#: apply.c:4317
+#: apply.c:4319
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能對建立檔案 '%s' 呼叫 stat"
-#: apply.c:4325
+#: apply.c:4327
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能為建立檔案 %s 建立後端儲存"
-#: apply.c:4331 apply.c:4476
+#: apply.c:4333 apply.c:4478
#, c-format
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 新增快取條目"
-#: apply.c:4374 builtin/bisect--helper.c:523
+#: apply.c:4376 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "寫入 '%s' 失敗"
-#: apply.c:4378
+#: apply.c:4380
#, c-format
msgid "closing file '%s'"
msgstr "關閉檔案 '%s'"
-#: apply.c:4448
+#: apply.c:4450
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能寫入檔案 '%s' 權限 %o"
-#: apply.c:4546
+#: apply.c:4548
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功套用修補檔 %s。"
-#: apply.c:4554
+#: apply.c:4556
msgid "internal error"
msgstr "內部錯誤"
-#: apply.c:4557
+#: apply.c:4559
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
-#: apply.c:4568
+#: apply.c:4570
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
-#: apply.c:4590
+#: apply.c:4592
#, c-format
msgid "Hunk #%d applied cleanly."
-msgstr "第 #%d 個片段成功應用。"
+msgstr "成功套用第 #%d 個區塊。"
-#: apply.c:4594
+#: apply.c:4596
#, c-format
msgid "Rejected hunk #%d."
-msgstr "拒絕第 #%d 個片段。"
+msgstr "拒絕第 #%d 個區塊。"
-#: apply.c:4718
+#: apply.c:4725
#, c-format
msgid "Skipped patch '%s'."
msgstr "略過修補檔 '%s'。"
-#: apply.c:4726
+#: apply.c:4733
msgid "unrecognized input"
msgstr "無法識別的輸入"
-#: apply.c:4746
+#: apply.c:4753
msgid "unable to read index file"
msgstr "無法讀取索引檔案"
-#: apply.c:4903
+#: apply.c:4910
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能開啟修補檔 '%s'：%s"
-#: apply.c:4930
+#: apply.c:4937
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 個空白字元誤用"
-#: apply.c:4936 apply.c:4951
+#: apply.c:4943 apply.c:4958
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字元誤用。"
-#: apply.c:4944
+#: apply.c:4951
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
-msgstr[0] "修復空白錯誤後，應用了 %d 行。"
+msgstr[0] "修復空白錯誤後，套用了 %d 行。"
-#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
msgid "Unable to write new index file"
msgstr "無法寫入新索引檔案"
-#: apply.c:4988
+#: apply.c:4995
msgid "don't apply changes matching the given path"
-msgstr "不要應用與給出路徑向符合的變更"
+msgstr "不要套用符合提供路徑的變更"
-#: apply.c:4991
+#: apply.c:4998
msgid "apply changes matching the given path"
-msgstr "應用與給出路徑向符合的變更"
+msgstr "套用符合提供路徑的變更"
-#: apply.c:4993 builtin/am.c:2266
+#: apply.c:5000 builtin/am.c:2317
msgid "num"
msgstr "數字"
-#: apply.c:4994
+#: apply.c:5001
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
-#: apply.c:4997
+#: apply.c:5004
msgid "ignore additions made by the patch"
msgstr "忽略修補檔中的新增的檔案"
-#: apply.c:4999
+#: apply.c:5006
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
-#: apply.c:5003
+#: apply.c:5010
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十進位數顯示新增和刪除的行數"
-#: apply.c:5005
+#: apply.c:5012
msgid "instead of applying the patch, output a summary for the input"
msgstr "不套用修補檔，而是顯示輸入的概要"
-#: apply.c:5007
+#: apply.c:5014
msgid "instead of applying the patch, see if the patch is applicable"
-msgstr "不套用修補檔，而是檢視修補檔是否可應用"
+msgstr "不套用修補檔，而是檢視修補檔是否可套用"
-#: apply.c:5009
+#: apply.c:5016
msgid "make sure the patch is applicable to the current index"
msgstr "確認修補檔可以套用到目前索引"
-#: apply.c:5011
+#: apply.c:5018
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
-#: apply.c:5013
+#: apply.c:5020
msgid "apply a patch without touching the working tree"
msgstr "套用修補檔而不修改工作區"
-#: apply.c:5015
+#: apply.c:5022
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作區之外檔案的修補檔"
-#: apply.c:5018
+#: apply.c:5025
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
-#: apply.c:5020
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "如果一個修補檔不能應用則嘗試三方合併"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
-#: apply.c:5022
+#: apply.c:5029
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
-#: apply.c:5027
+#: apply.c:5034
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296
+#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831
+#: builtin/rebase.c:1347
msgid "action"
msgstr "動作"
-#: apply.c:5029
+#: apply.c:5036
msgid "detect new or modified lines that have whitespace errors"
msgstr "檢查新增和修改的行中間的空白字元濫用"
-#: apply.c:5032 apply.c:5035
+#: apply.c:5039 apply.c:5042
msgid "ignore changes in whitespace when finding context"
msgstr "尋找上下文時忽略空白字元的變更"
-#: apply.c:5038
+#: apply.c:5045
msgid "apply the patch in reverse"
msgstr "反向套用修補檔"
-#: apply.c:5040
+#: apply.c:5047
msgid "don't expect at least one line of context"
msgstr "無需至少一行上下文"
-#: apply.c:5042
+#: apply.c:5049
msgid "leave the rejected hunks in corresponding *.rej files"
-msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"
+msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
-#: apply.c:5044
+#: apply.c:5051
msgid "allow overlapping hunks"
-msgstr "允許重疊的修補檔片段"
+msgstr "允許重疊的修補檔區塊"
-#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
-#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
-#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22
+#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755
+#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "詳細輸出"
-#: apply.c:5047
+#: apply.c:5054
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允許不正確的檔案末尾換行符號"
-#: apply.c:5050
+#: apply.c:5057
msgid "do not trust the line counts in the hunk headers"
-msgstr "不信任修補檔片段的標頭訊息中的行號"
+msgstr "不信任修補檔區塊的標頭訊息中的行號"
-#: apply.c:5052 builtin/am.c:2254
+#: apply.c:5059 builtin/am.c:2305
msgid "root"
msgstr "根目錄"
-#: apply.c:5053
+#: apply.c:5060
msgid "prepend <root> to all filenames"
msgstr "為所有檔案名前新增 <根目錄>"
@@ -1780,141 +1795,141 @@ msgstr ""
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
-#: archive.c:192
+#: archive.c:188
#, c-format
msgid "cannot read %s"
msgstr "不能讀取 %s"
-#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
-#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
-#: builtin/merge.c:1139
+#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
+#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833
+#: builtin/merge.c:1143
#, c-format
msgid "could not read '%s'"
msgstr "不能讀取 '%s'"
-#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路徑規格 '%s' 未符合任何檔案"
-#: archive.c:454
+#: archive.c:451
#, c-format
msgid "no such ref: %.*s"
msgstr "無此引用：%.*s"
-#: archive.c:460
+#: archive.c:457
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一個有效的物件名：%s"
-#: archive.c:473
+#: archive.c:470
#, c-format
msgid "not a tree object: %s"
msgstr "不是一個樹狀物件：%s"
-#: archive.c:485
+#: archive.c:482
msgid "current working directory is untracked"
msgstr "目前工作目錄未被追蹤"
-#: archive.c:526
+#: archive.c:523
#, c-format
msgid "File not found: %s"
msgstr "找不到檔案：%s"
-#: archive.c:528
+#: archive.c:525
#, c-format
msgid "Not a regular file: %s"
msgstr "不是一般檔案：%s"
-#: archive.c:555
+#: archive.c:552
msgid "fmt"
msgstr "格式"
-#: archive.c:555
+#: archive.c:552
msgid "archive format"
msgstr "歸檔格式"
-#: archive.c:556 builtin/log.c:1764
+#: archive.c:553 builtin/log.c:1772
msgid "prefix"
msgstr "前綴"
-#: archive.c:557
+#: archive.c:554
msgid "prepend prefix to each pathname in the archive"
msgstr "為歸檔中每個路徑名加上前綴"
-#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888
#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
-#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
-#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105
+#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191
msgid "file"
msgstr "檔案"
-#: archive.c:559
+#: archive.c:556
msgid "add untracked file to archive"
msgstr "將未追蹤檔案加入歸檔"
-#: archive.c:562 builtin/archive.c:90
+#: archive.c:559 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "歸檔寫入此檔案"
-#: archive.c:564
+#: archive.c:561
msgid "read .gitattributes in working directory"
msgstr "讀取工作區中的 .gitattributes"
-#: archive.c:565
+#: archive.c:562
msgid "report archived files on stderr"
msgstr "在標準錯誤上報告歸檔檔案"
-#: archive.c:567
+#: archive.c:564
msgid "set compression level"
msgstr "設定壓縮級別"
-#: archive.c:570
+#: archive.c:567
msgid "list supported archive formats"
msgstr "列出支援的歸檔格式"
-#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336
msgid "repo"
msgstr "版本庫"
-#: archive.c:573 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
-#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
#: builtin/notes.c:498
msgid "command"
msgstr "指令"
-#: archive.c:575 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "遠端 git-upload-archive 指令的路徑"
-#: archive.c:582
+#: archive.c:579
msgid "Unexpected option --remote"
msgstr "未知參數 --remote"
-#: archive.c:584
+#: archive.c:581
msgid "Option --exec can only be used together with --remote"
msgstr "選項 --exec 只能和 --remote 同時使用"
-#: archive.c:586
+#: archive.c:583
msgid "Unexpected option --output"
msgstr "未知參數 --output"
-#: archive.c:588
+#: archive.c:585
msgid "Options --add-file and --remote cannot be used together"
msgstr "--add-file 和 --remote 選項不能同時使用"
-#: archive.c:610
+#: archive.c:607
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知歸檔格式 '%s'"
-#: archive.c:619
+#: archive.c:616
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "參數不支援此格式 '%s'：-%d"
@@ -1924,12 +1939,12 @@ msgstr "參數不支援此格式 '%s'：-%d"
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一個有效的屬性名"
-#: attr.c:359
+#: attr.c:363
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允許 %s：%s:%d"
-#: attr.c:399
+#: attr.c:403
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -2011,7 +2026,7 @@ msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"