15b02a3d4b · matheusbsbs/matheus-bagliano

@@ -21,14 +21,17 @@

21 #

22 # Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022, 2023, 2024.

23 # Kaiyang Wu <self@origincode.me>, 2022.

24 -# lumynou5 <lumynou5.tw@gmail.com>, 2023, 2024.

24 +# Lumynous <lumynou5.tw@gmail.com>, 2023, 2024.

25 # Kisaragi Hiu <mail@kisaragi-hiu.com>, 2024.

26 +# Ngoo Ka-iu <willy04wu69@gmail.com>, 2024.

27 +# Nightfeather Chen <slat@nightfeather.me>, 2024.

28 +# hms5232 <hms5232@hhming.moe>, 2024.

29 msgid ""

30 msgstr ""

31 "Project-Id-Version: Git\n"

32 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

30 -"POT-Creation-Date: 2024-04-28 18:52+0800\n"

31 -"PO-Revision-Date: 2024-04-28 18:44+0800\n"

33 +"POT-Creation-Date: 2024-07-19 15:00+0800\n"

34 +"PO-Revision-Date: 2024-07-24 08:21+0000\n"

35 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

36 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"

37 "po/git-cli/zh_Hant/>\n"

@@ -37,7 +40,7 @@ msgstr ""

40 "Content-Type: text/plain; charset=UTF-8\n"

41 "Content-Transfer-Encoding: 8bit\n"

42 "Plural-Forms: nplurals=1; plural=0;\n"

40 -"X-Generator: Poedit 3.4.2\n"

43 +"X-Generator: Weblate 5.6.2\n"

44 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

45 "zhconvert.org\n"

46

@@ -69,7 +72,7 @@ msgstr "更新"

72 #: add-interactive.c

73 #, c-format

74 msgid "could not stage '%s'"

72 -msgstr "無法暫存 “%s”"

75 +msgstr "無法暫存「%s」"

76

77 #: add-interactive.c builtin/stash.c reset.c sequencer.c

78 msgid "could not write index"

@@ -89,7 +92,7 @@ msgstr "註：現已不再追蹤 %s。\n"

92 #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c

93 #, c-format

94 msgid "make_cache_entry failed for path '%s'"

92 -msgstr "對 “%s” 路徑執行 make_cache_entry 失敗"

95 +msgstr "對「%s」路徑執行 make_cache_entry 失敗"

96

97 #: add-interactive.c

98 msgid "Revert"

@@ -125,12 +128,12 @@ msgstr[0] "已加入 %d 個路徑\n"

128 msgid "ignoring unmerged: %s"

129 msgstr "忽略未合併項目：%s"

130

128 -#: add-interactive.c add-patch.c

131 +#: add-interactive.c

132 #, c-format

133 msgid "Only binary files changed.\n"

134 msgstr "只有二進位檔案更動了。\n"

135

133 -#: add-interactive.c add-patch.c

136 +#: add-interactive.c

137 #, c-format

138 msgid "No changes.\n"

139 msgstr "沒有更動。\n"

@@ -543,7 +546,7 @@ msgstr ""

546 #: add-patch.c

547 #, c-format

548 msgid "could not parse hunk header '%.*s'"

546 -msgstr "無法解析區塊標頭 “%.*s”"

549 +msgstr "無法解析區塊標頭「%.*s」"

550

551 #: add-patch.c

552 msgid "could not parse diff"

@@ -556,7 +559,7 @@ msgstr "無法解析上色過的差異"

559 #: add-patch.c

560 #, c-format

561 msgid "failed to run '%s'"

559 -msgstr "無法執行 “%s”"

562 +msgstr "無法執行「%s」"

563

564 #: add-patch.c

565 msgid "mismatched output from interactive.diffFilter"

@@ -625,7 +628,7 @@ msgstr "無法解析區塊標頭"

628

629 #: add-patch.c

630 msgid "'git apply --cached' failed"

628 -msgstr "“git apply --cached” 失敗"

631 +msgstr "「git apply --cached」失敗"

632

633 #. TRANSLATORS: do not translate [y/n]

634 #. The program will only accept that input at this point.

@@ -636,7 +639,7 @@ msgstr "“git apply --cached” 失敗"

639 #: add-patch.c

640 msgid ""

641 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

639 -msgstr "未套用您編輯的區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "

642 +msgstr "未套用您編輯的區塊。是否重新編輯（輸入「no」捨棄！） [y/n]? "

643

644 #: add-patch.c

645 msgid "The selected hunks do not apply to the index!"

@@ -674,6 +677,11 @@ msgstr ""

677 "p - 輸出目前區塊\n"

678 "? - 顯示說明\n"

679

680 +#: add-patch.c

681 +#, c-format

682 +msgid "Only one letter is expected, got '%s'"

683 +msgstr "預期收到一個字母，卻收到「%s」"

684 +

685 #: add-patch.c

686 msgid "No previous hunk"

687 msgstr "沒有上一個區塊"

@@ -697,7 +705,7 @@ msgstr "跳轉到哪個區塊? "

705 #: add-patch.c

706 #, c-format

707 msgid "Invalid number: '%s'"

700 -msgstr "無效數字：“%s”"

708 +msgstr "無效數字：「%s」"

709

710 #: add-patch.c

711 #, c-format

@@ -735,9 +743,22 @@ msgstr "分割為 %d 個區塊。"

743 msgid "Sorry, cannot edit this hunk"

744 msgstr "對不起，無法編輯這個區塊"

745

746 +#: add-patch.c

747 +#, c-format

748 +msgid "Unknown command '%s' (use '?' for help)"

749 +msgstr "未知命令「%s」（使用「?」獲取幫助）"

750 +

751 #: add-patch.c

752 msgid "'git apply' failed"

740 -msgstr "“git apply” 失敗"

753 +msgstr "「git apply」失敗"

754 +

755 +#: add-patch.c

756 +msgid "No changes."

757 +msgstr "沒有更動。"

758 +

759 +#: add-patch.c

760 +msgid "Only binary files changed."

761 +msgstr "只有二進位檔案更動了。"

762

763 #: advice.c

764 #, c-format

@@ -746,7 +767,7 @@ msgid ""

767 "Disable this message with \"git config advice.%s false\""

768 msgstr ""

769 "\n"

749 -"請使用 “git config advice.%s false” 停用此訊息"

770 +"請使用「git config advice.%s false」停用此訊息"

771

772 #: advice.c

773 #, c-format

@@ -782,7 +803,7 @@ msgid ""

803 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

804 "as appropriate to mark resolution and make a commit."

805 msgstr ""

785 -"請在工作區修正檔案，然後視情況使用 “git add/rm <file>”\n"

806 +"請在工作區修正檔案，然後視情況使用「git add/rm <file>」\n"

807 "命令標記解決方案並提交。"

808

809 #: advice.c

@@ -866,7 +887,7 @@ msgid ""

887 "false\n"

888 "\n"

889 msgstr ""

869 -"註：切換至 “%s”。\n"

890 +"註：切換至「%s」。\n"

891 "\n"

892 "您正處於「分離 HEAD」狀態。您可以檢視、進行實驗性修改並提交，\n"

893 "而且您可以在切回分支時，捨棄在此狀態下所做的提交\n"

@@ -901,8 +922,8 @@ msgid ""

922 "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"

923 msgstr ""

924 "若要更正這些路徑的稀疏狀態，請：\n"

904 -"* 使用 “git add --sparse <路徑” 更新索引\n"

905 -"* 使用 “git sparse-checkout reapply” 套用稀疏規則"

925 +"* 使用「git add --sparse <路徑>」更新索引\n"

926 +"* 使用「git sparse-checkout reapply」套用稀疏規則"

927

928 #: alias.c

929 msgid "cmdline ends with \\"

@@ -913,19 +934,19 @@ msgid "unclosed quote"

934 msgstr "未閉合的引號"

935

936 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c

916 -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c

937 +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c

938 msgid "too many arguments"

939 msgstr "引數過多"

940

941 #: apply.c

942 #, c-format

943 msgid "unrecognized whitespace option '%s'"

923 -msgstr "空白字元選項 “%s” 無法識別"

944 +msgstr "空白字元選項「%s」無法識別"

945

946 #: apply.c

947 #, c-format

948 msgid "unrecognized whitespace ignore option '%s'"

928 -msgstr "空白字元忽略選項 “%s” 無法識別"

949 +msgstr "空白字元忽略選項「%s」無法識別"

950

951 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c

952 #: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c

@@ -939,12 +960,12 @@ msgstr "空白字元忽略選項 “%s” 無法識別"

960 #: range-diff.c revision.c

961 #, c-format

962 msgid "options '%s' and '%s' cannot be used together"

942 -msgstr "無法同時使用 “%s” 和 “%s” 選項"

963 +msgstr "無法同時使用「%s」和「%s」選項"

964

965 #: apply.c

966 #, c-format

967 msgid "'%s' outside a repository"

947 -msgstr "“%s” 在版本庫之外"

968 +msgstr "「%s」在版本庫之外"

969

970 #: apply.c

971 msgid "failed to read patch"

@@ -1080,7 +1101,7 @@ msgstr "無法開啟或讀取 %s"

1101 #: apply.c

1102 #, c-format

1103 msgid "invalid start of line: '%c'"

1083 -msgstr "無效的列首字元：“%c”"

1104 +msgstr "無效的列首字元：「%c」"

1105

1106 #: apply.c

1107 #, c-format

@@ -1105,43 +1126,43 @@ msgstr ""

1126 #: apply.c

1127 #, c-format

1128 msgid "missing binary patch data for '%s'"

1108 -msgstr "缺少 “%s” 的二進位修補檔資料"

1129 +msgstr "缺少「%s」的二進位修補檔資料"

1130

1131 #: apply.c

1132 #, c-format

1133 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1113 -msgstr "無法反向套用一個缺少至 “%s” 的反向資料區塊的二進位修補檔"

1134 +msgstr "無法反向套用一個缺少至「%s」的反向資料區塊的二進位修補檔"

1135

1136 #: apply.c

1137 #, c-format

1138 msgid "cannot apply binary patch to '%s' without full index line"

1118 -msgstr "無法在 “%s” 上套用沒有完整索引列的二進位修補檔"

1139 +msgstr "無法在「%s」上套用沒有完整索引列的二進位修補檔"

1140

1141 #: apply.c

1142 #, c-format

1143 msgid ""

1144 "the patch applies to '%s' (%s), which does not match the current contents."

1124 -msgstr "修補檔要套用到 “%s”（%s），但與目前內容不符。"

1145 +msgstr "修補檔要套用到「%s」（%s），但與目前內容不符。"

1146

1147 #: apply.c

1148 #, c-format

1149 msgid "the patch applies to an empty '%s' but it is not empty"

1129 -msgstr "修補檔要套用至空檔案 “%s”，但其非空檔案"

1150 +msgstr "修補檔要套用至空檔案「%s」，但其非空檔案"

1151

1152 #: apply.c

1153 #, c-format

1154 msgid "the necessary postimage %s for '%s' cannot be read"

1134 -msgstr "無法讀取 “%2$s” 必須的目標檔案 %1$s"

1155 +msgstr "無法讀取「%2$s」必須的目標檔案 %1$s"

1156

1157 #: apply.c

1158 #, c-format

1159 msgid "binary patch does not apply to '%s'"

1139 -msgstr "二進位修補檔未套用到 “%s”"

1160 +msgstr "二進位修補檔未套用到「%s」"

1161

1162 #: apply.c

1163 #, c-format

1164 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1144 -msgstr "修補 “%s” 的二進位修補檔，產生了不正確的結果（預期 %s，卻為 %s）"

1165 +msgstr "修補「%s」的二進位修補檔，產生了不正確的結果（預期 %s，卻為 %s）"

1166

1167 #: apply.c

1168 #, c-format

@@ -1161,7 +1182,7 @@ msgstr "無法讀取 %s"

1182 #: apply.c

1183 #, c-format

1184 msgid "reading from '%s' beyond a symbolic link"

1164 -msgstr "讀取符號連結背後的 “%s”"

1185 +msgstr "讀取符號連結背後的「%s」"

1186

1187 #: apply.c

1188 #, c-format

@@ -1190,7 +1211,7 @@ msgstr "正在進行三方合併……\n"

1211 #: apply.c

1212 #, c-format

1213 msgid "cannot read the current contents of '%s'"

1193 -msgstr "無法讀取 “%s” 目前的內容"

1214 +msgstr "無法讀取「%s」目前的內容"

1215

1216 #: apply.c

1217 #, c-format

@@ -1200,12 +1221,12 @@ msgstr "無法進行三方合併……\n"

1221 #: apply.c

1222 #, c-format

1223 msgid "Applied patch to '%s' with conflicts.\n"

1203 -msgstr "已套用對 “%s” 的修補檔，但有衝突。\n"

1224 +msgstr "已套用對「%s」的修補檔，但有衝突。\n"

1225

1226 #: apply.c

1227 #, c-format

1228 msgid "Applied patch to '%s' cleanly.\n"

1208 -msgstr "已完全套用對 “%s” 的修補檔。\n"

1229 +msgstr "已完全套用對「%s」的修補檔。\n"

1230

1231 #: apply.c

1232 #, c-format

@@ -1229,7 +1250,7 @@ msgstr "%s 的類型是 %o，預期是 %o"

1250 #: apply.c read-cache.c

1251 #, c-format

1252 msgid "invalid path '%s'"

1232 -msgstr "路徑 “%s” 無效"

1253 +msgstr "路徑「%s」無效"

1254

1255 #: apply.c

1256 #, c-format

@@ -1254,7 +1275,7 @@ msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符"

1275 #: apply.c

1276 #, c-format

1277 msgid "affected file '%s' is beyond a symbolic link"

1257 -msgstr "受影響的檔案 “%s” 在符號連結後"

1278 +msgstr "受影響的檔案「%s」在符號連結後"

1279

1280 #: apply.c

1281 #, c-format

@@ -1304,7 +1325,7 @@ msgstr "修補 %s 子模組的修補檔損壞"

1325 #: apply.c

1326 #, c-format

1327 msgid "unable to stat newly created file '%s'"

1307 -msgstr "無法對剛建立的檔案 “%s” 執行 stat"

1328 +msgstr "無法對剛建立的檔案「%s」執行 stat"

1329

1330 #: apply.c

1331 #, c-format

@@ -1319,17 +1340,17 @@ msgstr "無法為 %s 加入快取項目"

1340 #: apply.c builtin/bisect.c builtin/gc.c

1341 #, c-format

1342 msgid "failed to write to '%s'"

1322 -msgstr "無法寫入 “%s”"

1343 +msgstr "無法寫入「%s」"

1344

1345 #: apply.c

1346 #, c-format

1347 msgid "closing file '%s'"

1327 -msgstr "關閉檔案 “%s”"

1348 +msgstr "關閉檔案「%s」"

1349

1350 #: apply.c

1351 #, c-format

1352 msgid "unable to write file '%s' mode %o"

1332 -msgstr "無法以模式 %2$o 寫入 “%1$s” 檔案"

1353 +msgstr "無法以模式 %2$o 寫入「%1$s」檔案"

1354

1355 #: apply.c

1356 #, c-format

@@ -1354,7 +1375,7 @@ msgstr "無法開啟 %s"

1375 #: apply.c rerere.c

1376 #, c-format

1377 msgid "cannot unlink '%s'"

1357 -msgstr "無法刪除 “%s”"

1378 +msgstr "無法刪除「%s」"

1379

1380 #: apply.c

1381 #, c-format

@@ -1369,11 +1390,11 @@ msgstr "拒絕第 #%d 個區塊。"

1390 #: apply.c

1391 #, c-format

1392 msgid "Skipped patch '%s'."

1372 -msgstr "略過修補檔 “%s”。"

1393 +msgstr "略過修補檔「%s」。"

1394

1395 #: apply.c

1396 msgid "No valid patches in input (allow with \"--allow-empty\")"

1376 -msgstr "輸入沒有有效的修補檔內容（傳入 “--allow-empty” 允許此行為）"

1397 +msgstr "輸入沒有有效的修補檔內容（傳入「--allow-empty」允許此行為）"

1398

1399 #: apply.c t/helper/test-cache-tree.c

1400 msgid "unable to read index file"

@@ -1382,7 +1403,7 @@ msgstr "無法讀取索引檔案"

1403 #: apply.c

1404 #, c-format

1405 msgid "can't open patch '%s': %s"

1385 -msgstr "無法開啟修補檔 “%s”：%s"

1406 +msgstr "無法開啟修補檔「%s」：%s"

1407

1408 #: apply.c

1409 #, c-format

@@ -1545,7 +1566,7 @@ msgstr "壓縮錯誤 (%d)"

1566 #: archive-tar.c

1567 #, c-format

1568 msgid "unable to start '%s' filter"

1548 -msgstr "無法啟動 “%s” 過濾器"

1569 +msgstr "無法啟動「%s」過濾器"

1570

1571 #: archive-tar.c

1572 msgid "unable to redirect descriptor"

@@ -1554,7 +1575,7 @@ msgstr "無法重新導向描述元"

1575 #: archive-tar.c

1576 #, c-format

1577 msgid "'%s' filter reported error"

1557 -msgstr "“%s” 過濾器回報錯誤"

1578 +msgstr "「%s」過濾器回報錯誤"

1579

1580 #: archive-zip.c

1581 #, c-format

@@ -1588,17 +1609,17 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1609 #: archive.c builtin/gc.c builtin/notes.c builtin/tag.c

1610 #, c-format

1611 msgid "cannot read '%s'"

1591 -msgstr "無法讀取 “%s”"

1612 +msgstr "無法讀取「%s」"

1613

1614 #: archive.c

1615 #, c-format

1616 msgid "pathspec '%s' matches files outside the current directory"

1596 -msgstr "符合路徑規格 “%s” 的檔案在目前目錄之外"

1617 +msgstr "符合路徑規格「%s」的檔案在目前目錄之外"

1618

1619 #: archive.c builtin/add.c builtin/rm.c

1620 #, c-format

1621 msgid "pathspec '%s' did not match any files"

1601 -msgstr "路徑規格 “%s” 未符合任何檔案"

1622 +msgstr "路徑規格「%s」未符合任何檔案"

1623

1624 #: archive.c

1625 #, c-format

@@ -1628,17 +1649,17 @@ msgstr "不是一般檔案：%s"

1649 #: archive.c

1650 #, c-format

1651 msgid "unclosed quote: '%s'"

1631 -msgstr "未閉合的引號：“%s”"

1652 +msgstr "未閉合的引號：「%s」"

1653

1654 #: archive.c

1655 #, c-format

1656 msgid "missing colon: '%s'"

1636 -msgstr "缺少冒號：“%s”"

1657 +msgstr "缺少冒號：「%s」"

1658

1659 #: archive.c

1660 #, c-format

1661 msgid "empty file name: '%s'"

1641 -msgstr "檔案名稱空白：“%s”"

1662 +msgstr "檔案名稱空白：「%s」"

1663

1664 #: archive.c

1665 msgid "fmt"

@@ -1725,7 +1746,7 @@ msgstr "非預期選項 --remote"

1746 #: revision.c

1747 #, c-format

1748 msgid "the option '%s' requires '%s'"

1728 -msgstr "“%s” 選項需要 “%s”"

1749 +msgstr "「%s」選項需要「%s」"

1750

1751 #: archive.c

1752 msgid "Unexpected option --output"

@@ -1734,17 +1755,17 @@ msgstr "非預期選項 --output"

1755 #: archive.c

1756 #, c-format

1757 msgid "extra command line parameter '%s'"

1737 -msgstr "多出命令列參數 “%s”"

1758 +msgstr "多出命令列參數「%s」"

1759

1760 #: archive.c

1761 #, c-format

1762 msgid "Unknown archive format '%s'"

1742 -msgstr "封存格式 “%s” 未知"

1763 +msgstr "封存格式「%s」未知"

1764

1765 #: archive.c

1766 #, c-format

1767 msgid "Argument not supported for format '%s': -%d"

1747 -msgstr "引數不支援 “%s” 格式：-%d"

1768 +msgstr "引數不支援「%s」格式：-%d"

1769

1770 #: attr.c

1771 #, c-format

@@ -1771,22 +1792,26 @@ msgid ""

1792 "Use '\\!' for literal leading exclamation."

1793 msgstr ""

1794 "git attributes 會忽略反向模式\n"

1774 -"當字串確定要以驚嘆號開始時，請使用 “\\!”。"

1795 +"當字串確定要以驚嘆號開始時，請使用「\\!」。"

1796

1797 #: attr.c

1798 #, c-format

1799 msgid "cannot fstat gitattributes file '%s'"

1779 -msgstr "無法 fstat gitattributes 檔案 “%s”"

1800 +msgstr "無法 fstat gitattributes 檔案「%s」"

1801

1802 #: attr.c

1803 #, c-format

1804 msgid "ignoring overly large gitattributes file '%s'"

1784 -msgstr "忽略過大的 gitattributes 檔案 “%s”"

1805 +msgstr "忽略過大的 gitattributes 檔案「%s」"

1806

1807 #: attr.c

1808 #, c-format

1809 msgid "ignoring overly large gitattributes blob '%s'"

1789 -msgstr "忽略過大的 gitattributes 資料物件 “%s”"

1810 +msgstr "忽略過大的 gitattributes 資料物件「%s」"

1811 +

1812 +#: attr.c

1813 +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"

1814 +msgstr "沒有版本庫無法使用 --attr-source 或 GIT_ATTR_SOURCE"

1815

1816 #: attr.c

1817 msgid "bad --attr-source or GIT_ATTR_SOURCE"

@@ -1795,18 +1820,18 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE"

1820 #: attr.c read-cache.c

1821 #, c-format

1822 msgid "unable to stat '%s'"

1798 -msgstr "無法對 %s 執行 stat"

1823 +msgstr "無法統計「%s」"

1824

1825 #: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c

1826 #: builtin/pack-objects.c combine-diff.c rerere.c

1827 #, c-format

1828 msgid "unable to read %s"

1804 -msgstr "不能讀 %s"

1829 +msgstr "無法讀取 %s"

1830

1831 #: bisect.c

1832 #, c-format

1833 msgid "Badly quoted content in file '%s': %s"

1809 -msgstr "檔案 “%s” 包含無效的引用內容：%s"

1834 +msgstr "檔案「%s」包含無效的引用內容：%s"

1835

1836 #: bisect.c

1837 #, c-format

@@ -1843,7 +1868,7 @@ msgid ""

1868 "This means the first '%s' commit is between %s and [%s].\n"

1869 msgstr ""

1870 "合併基礎 %s 是 %s。\n"

1846 -"這意味著第一個 “%s” 提交位於 %s 和 [%s] 之間。\n"

1871 +"這意味著第一個「%s」提交位於 %s 和 [%s] 之間。\n"

1872

1873 #: bisect.c

1874 #, c-format

@@ -1880,17 +1905,17 @@ msgstr "需要一個 %s 修訂版"

1905 #: bisect.c

1906 #, c-format

1907 msgid "could not create file '%s'"

1883 -msgstr "無法建立 “%s” 檔案"

1908 +msgstr "無法建立「%s」檔案"

1909

1910 #: bisect.c builtin/notes.c

1911 #, c-format

1912 msgid "unable to start 'show' for object '%s'"

1888 -msgstr "不能為物件 '%s' 開始 'show'"

1913 +msgstr "無法為物件「%s」開始「show」"

1914

1915 #: bisect.c builtin/merge.c

1916 #, c-format

1917 msgid "could not read file '%s'"

1893 -msgstr "無法讀取 “%s” 檔案"

1918 +msgstr "無法讀取「%s」檔案"

1919

1920 #: bisect.c

1921 msgid "reading bisect refs failed"

@@ -1963,22 +1988,22 @@ msgstr "請求重定基底時，無法繼承多個引用的上游追蹤設定"

1988 #: branch.c

1989 #, c-format

1990 msgid "not setting branch '%s' as its own upstream"

1966 -msgstr "未將 “%s” 分支設為其自己的上游"

1991 +msgstr "未將「%s」分支設為其自己的上游"

1992

1993 #: branch.c

1994 #, c-format

1995 msgid "branch '%s' set up to track '%s' by rebasing."

1971 -msgstr "已藉由重訂基底，將 “%s” 分支設定為追蹤 “%s”。"

1996 +msgstr "已藉由重訂基底，將「%s」分支設定為追蹤「%s」。"

1997

1998 #: branch.c

1999 #, c-format

2000 msgid "branch '%s' set up to track '%s'."

1976 -msgstr "已將 “%s” 分支設定為追蹤 “%s”。"

2001 +msgstr "已將「%s」分支設定為追蹤「%s」。"

2002

2003 #: branch.c

2004 #, c-format

2005 msgid "branch '%s' set up to track:"

1981 -msgstr "“%s” 分支已設定追蹤："

2006 +msgstr "「%s」分支已設定追蹤："

2007

2008 #: branch.c

2009 msgid "unable to write upstream branch configuration"

@@ -1997,17 +2022,17 @@ msgstr ""

2022 #: branch.c

2023 #, c-format

2024 msgid "asked to inherit tracking from '%s', but no remote is set"

2000 -msgstr "請求繼承 “%s” 的追蹤設定，但未設定遠端"

2025 +msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"

2026

2027 #: branch.c

2028 #, c-format

2029 msgid "asked to inherit tracking from '%s', but no merge configuration is set"

2005 -msgstr "請求繼承 “%s” 的追蹤設定，但未設定合併設定"

2030 +msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"

2031

2032 #: branch.c

2033 #, c-format

2034 msgid "not tracking: ambiguous information for ref '%s'"

2010 -msgstr "未追蹤：“%s” 引用有歧義"

2035 +msgstr "未追蹤：「%s」引用有歧義"

2036

2037 # 譯者：為保證在輸出中對齊，注意調整句中空格！

2038 #. #-#-#-#-# branch.c.po #-#-#-#-#

@@ -2042,7 +2067,7 @@ msgid ""

2067 "tracking namespaces."

2068 msgstr ""

2069 "有多個遠端的抓取引用規格，映射到\n"

2045 -"遠端追蹤引用 “%s” 的規格：\n"

2070 +"遠端追蹤引用「%s」的規格：\n"

2071 "%s\n"

2072 "這通常是設定錯誤。\n"

2073 "\n"

@@ -2052,7 +2077,7 @@ msgstr ""

2077 #: branch.c

2078 #, c-format

2079 msgid "'%s' is not a valid branch name"

2055 -msgstr "“%s” 不是有效的分支名稱"

2080 +msgstr "「%s」不是有效的分支名稱"

2081

2082 #: branch.c builtin/branch.c

2083 msgid "See `man git check-ref-format`"

@@ -2061,22 +2086,22 @@ msgstr "請參閱「man git check-ref-format」"

2086 #: branch.c

2087 #, c-format

2088 msgid "a branch named '%s' already exists"

2064 -msgstr "已有同名 “%s” 分支"

2089 +msgstr "已有同名「%s」分支"

2090

2091 #: branch.c

2092 #, c-format

2093 msgid "cannot force update the branch '%s' used by worktree at '%s'"

2069 -msgstr "無法強制更新被位於 “%2$s” 的工作區使用的 “%1$s” 分支"

2094 +msgstr "無法強制更新被位於「%2$s」的工作區使用的分支「%1$s」"

2095

2096 #: branch.c

2097 #, c-format

2098 msgid "cannot set up tracking information; starting point '%s' is not a branch"

2074 -msgstr "無法設定追蹤資訊：起始點 “%s” 不是分支"

2099 +msgstr "無法設定追蹤資訊：起始點「%s」不是分支"

2100

2101 #: branch.c

2102 #, c-format

2103 msgid "the requested upstream branch '%s' does not exist"

2079 -msgstr "請求的上游分支 “%s” 不存在"

2104 +msgstr "請求的上游分支「%s」不存在"

2105

2106 #: branch.c

2107 msgid ""

@@ -2100,22 +2125,22 @@ msgstr ""

2125 #: branch.c builtin/replace.c

2126 #, c-format

2127 msgid "not a valid object name: '%s'"

2103 -msgstr "物件名稱無效：“%s”"

2128 +msgstr "物件名稱無效：「%s」"

2129

2130 #: branch.c

2131 #, c-format

2132 msgid "ambiguous object name: '%s'"

2108 -msgstr "物件名稱有歧義：“%s”"

2133 +msgstr "物件名稱有歧義：「%s」"

2134

2135 #: branch.c

2136 #, c-format

2137 msgid "not a valid branch point: '%s'"

2113 -msgstr "分支點無效：“%s”"

2138 +msgstr "分支點無效：「%s」"

2139

2140 #: branch.c

2141 #, c-format

2142 msgid "submodule '%s': unable to find submodule"

2118 -msgstr "“%s” 子模組：找不到子模組"

2143 +msgstr "「%s」子模組：找不到子模組"

2144

2145 #: branch.c

2146 #, c-format

@@ -2123,18 +2148,18 @@ msgid ""

2148 "You may try updating the submodules using 'git checkout --no-recurse-"

2149 "submodules %s && git submodule update --init'"

2150 msgstr ""

2126 -"您可以使用 “git checkout --no-recurse-submodules %s && git submodule update "

2127 -"--init” 命令嘗試更新子模組"

2151 +"您可以使用「git checkout --no-recurse-submodules %s && git submodule update "

2152 +"--init」命令嘗試更新子模組"

2153

2154 #: branch.c

2155 #, c-format

2156 msgid "submodule '%s': cannot create branch '%s'"

2132 -msgstr "“%s” 子模組：無法建立 “%s” 分支"

2157 +msgstr "「%s」子模組：無法建立「%s」分支"

2158

2159 #: branch.c

2160 #, c-format

2161 msgid "'%s' is already used by worktree at '%s'"

2137 -msgstr "“%s” 已被位於 “%s” 的工作區使用"

2162 +msgstr "「%s」已被位於「%s」的工作區使用"

2163

2164 #: builtin/add.c

2165 msgid "git add [<options>] [--] <pathspec>..."

@@ -2149,14 +2174,6 @@ msgstr "無法 chmod %cx '%s'"

2174 msgid "Unstaged changes after refreshing the index:"

2175 msgstr "重新整理索引之後，尚未被暫存的更動："

2176

2152 -#: builtin/add.c

2153 -msgid ""

2154 -"the add.interactive.useBuiltin setting has been removed!\n"

2155 -"See its entry in 'git help config' for details."

2156 -msgstr ""

2157 -"add.interactive.useBuiltin 設定已被移除！\n"

2158 -"深入了解請參閱 “git help config” 中的對應條目。"

2159 -

2177 #: builtin/add.c

2178 msgid "could not read the index"

2179 msgstr "無法讀取索引"

@@ -2168,7 +2185,7 @@ msgstr "編輯修補檔失敗"

2185 #: builtin/add.c read-cache.c

2186 #, c-format

2187 msgid "could not stat '%s'"

2171 -msgstr "不能對 '%s' 呼叫 stat"

2188 +msgstr "無法統計「%s」"

2189

2190 #: builtin/add.c

2191 msgid "empty patch. aborted"

@@ -2177,7 +2194,7 @@ msgstr "修補檔空白。中止"

2194 #: builtin/add.c

2195 #, c-format

2196 msgid "could not apply '%s'"

2180 -msgstr "無法套用 “%s”"

2197 +msgstr "無法套用「%s」"

2198

2199 #: builtin/add.c

2200 msgid "The following paths are ignored by one of your .gitignore files:\n"

@@ -2284,7 +2301,7 @@ msgstr ""

2301 "\n"

2302 "\tgit rm --cached %s\n"

2303 "\n"

2287 -"參見 “git help submodule” 深入了解。"

2304 +"參見「git help submodule」深入了解。"

2305

2306 #: builtin/add.c

2307 #, c-format

@@ -2293,7 +2310,7 @@ msgstr "正在加入嵌入式 git 版本庫：%s"

2310

2311 #: builtin/add.c

2312 msgid "Use -f if you really want to add them."

2296 -msgstr "如果您確定想要加入他們，請使用「-f」。"

2313 +msgstr "如果您確定想要加入它們，請使用 -f。"

2314

2315 #: builtin/add.c

2316 msgid "adding files failed"

@@ -2302,13 +2319,13 @@ msgstr "加入檔案失敗"

2319 #: builtin/add.c

2320 #, c-format

2321 msgid "--chmod param '%s' must be either -x or +x"

2305 -msgstr "--chmod 的參數 “%s” 必須是 -x 或 +x"

2322 +msgstr "--chmod 的參數「%s」必須是 -x 或 +x"

2323

2324 #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c

2325 #: builtin/rm.c builtin/stash.c

2326 #, c-format

2327 msgid "'%s' and pathspec arguments cannot be used together"

2311 -msgstr "“%s” 和路徑規格引數不得同時使用"

2328 +msgstr "「%s」和路徑規格引數不得同時使用"

2329

2330 #: builtin/add.c

2331 #, c-format

@@ -2334,19 +2351,19 @@ msgstr "無法寫入新的索引檔案"

2351 #: builtin/am.c builtin/mailinfo.c mailinfo.c

2352 #, c-format

2353 msgid "bad action '%s' for '%s'"

2337 -msgstr "“%s” 動作對 “%s” 無效"

2354 +msgstr "「%s」動作對「%s」無效"

2355

2356 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2357 #: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c

2358 #: ls-refs.c parallel-checkout.c sequencer.c setup.c

2359 #, c-format

2360 msgid "invalid value for '%s': '%s'"

2344 -msgstr "“%s” 的值無效：“%s”"

2361 +msgstr "「%s」的值無效：「%s」"

2362

2363 #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2364 #, c-format

2365 msgid "could not read '%s'"

2349 -msgstr "無法讀取 “%s”"

2366 +msgstr "無法讀取「%s」"

2367

2368 #: builtin/am.c

2369 msgid "could not parse author script"

@@ -2360,17 +2377,17 @@ msgstr "無法解析 %s"

2377 #: builtin/am.c

2378 #, c-format

2379 msgid "'%s' was deleted by the applypatch-msg hook"

2363 -msgstr "“%s” 被 applypatch-msg 掛鉤刪除"

2380 +msgstr "「%s」被 applypatch-msg 掛鉤刪除"

2381

2382 #: builtin/am.c

2383 #, c-format

2384 msgid "Malformed input line: '%s'."

2368 -msgstr "格式錯誤的輸入列：“%s”。"

2385 +msgstr "格式錯誤的輸入列：「%s」。"

2386

2387 #: builtin/am.c

2388 #, c-format

2389 msgid "Failed to copy notes from '%s' to '%s'"

2373 -msgstr "從 “%s” 拷貝註解到 “%s” 失敗"

2390 +msgstr "從「%s」拷貝註解到「%s」失敗"

2391

2392 #: builtin/am.c

2393 msgid "fseek failed"

@@ -2379,17 +2396,17 @@ msgstr "fseek 失敗"

2396 #: builtin/am.c builtin/rebase.c sequencer.c wrapper.c

2397 #, c-format

2398 msgid "could not open '%s' for reading"

2382 -msgstr "無法開啟 “%s” 進行讀取"

2399 +msgstr "無法開啟「%s」進行讀取"

2400

2401 #: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c

2402 #, c-format

2403 msgid "could not open '%s' for writing"

2387 -msgstr "無法開啟 “%s” 進行寫入"

2404 +msgstr "無法開啟「%s」進行寫入"

2405

2406 #: builtin/am.c

2407 #, c-format

2408 msgid "could not parse patch '%s'"

2392 -msgstr "無法解析修補檔 “%s”"

2409 +msgstr "無法解析修補檔「%s」"

2410

2411 #: builtin/am.c

2412 msgid "Only one StGIT patch series can be applied at once"

@@ -2414,7 +2431,7 @@ msgstr "修補檔格式偵測失敗。"

2431 #: builtin/am.c builtin/clone.c

2432 #, c-format

2433 msgid "failed to create directory '%s'"

2417 -msgstr "無法建立目錄 “%s”"

2434 +msgstr "無法建立目錄「%s」"

2435

2436 #: builtin/am.c

2437 msgid "Failed to split patches."

@@ -2439,7 +2456,7 @@ msgstr "若要將空白修補檔錄入為空白提交，請執行「%s --allow-e

2456 #: builtin/am.c

2457 #, c-format

2458 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2442 -msgstr "若要還原至原始分支，並停止修補動作，請執行 “%s --abort”。"

2459 +msgstr "若要還原至原始分支，並停止修補動作，請執行「%s --abort」。"

2460

2461 #: builtin/am.c

2462 msgid "Patch sent with format=flowed; space at the end of lines might be lost."

@@ -2554,7 +2571,7 @@ msgstr "在 %s %.*s 處修補失敗"

2571

2572 #: builtin/am.c

2573 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"

2557 -msgstr "使用 “git am --show-current-patch=diff” 命令檢視失敗的修補檔"

2574 +msgstr "使用「git am --show-current-patch=diff」命令檢視失敗的修補檔"

2575

2576 #: builtin/am.c

2577 msgid "No changes - recorded it as an empty commit."

@@ -2566,7 +2583,7 @@ msgid ""

2583 "If there is nothing left to stage, chances are that something else\n"

2584 "already introduced the same changes; you might want to skip this patch."

2585 msgstr ""

2569 -"沒有變更：是否忘記執行 “git add”？\n"

2586 +"沒有變更：是否忘記執行「git add」？\n"

2587 "如果沒有其他要新增到暫存區的，則很可能是其它提交\n"

2588 "已經引入了相同的變更。您也許想要略過這個修補檔。"

2589

@@ -2584,7 +2601,7 @@ msgstr ""

2601 #: builtin/am.c builtin/reset.c

2602 #, c-format

2603 msgid "Could not parse object '%s'."

2587 -msgstr "無法解析 “%s” 物件。"

2604 +msgstr "無法解析「%s」物件。"

2605

2606 #: builtin/am.c

2607 msgid "failed to clean index"

@@ -2595,13 +2612,13 @@ msgid ""

2612 "You seem to have moved HEAD since the last 'am' failure.\n"

2613 "Not rewinding to ORIG_HEAD"

2614 msgstr ""

2598 -"您似乎在上一次 “am” 失敗後移動了 HEAD。\n"

2615 +"您似乎在上一次「am」失敗後移動了 HEAD。\n"

2616 "未倒轉回 ORIG_HEAD"

2617

2601 -#: builtin/am.c builtin/bisect.c worktree.c

2618 +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c

2619 #, c-format

2620 msgid "failed to read '%s'"

2604 -msgstr "無法讀取 “%s”"

2621 +msgstr "無法讀取「%s」"

2622

2623 #: builtin/am.c

2624 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

@@ -2676,8 +2693,8 @@ msgstr "n"

2693

2694 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c

2695 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c

2679 -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c

2680 -#: builtin/verify-tag.c

2696 +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c

2697 +#: builtin/tag.c builtin/verify-tag.c

2698 msgid "format"

2699 msgstr "format"

2700

@@ -2713,6 +2730,10 @@ msgstr "中止修補動作但保持 HEAD 不變"

2730 msgid "show the patch being applied"

2731 msgstr "顯示正在套用的修補檔"

2732

2733 +#: builtin/am.c

2734 +msgid "try to apply current patch again"

2735 +msgstr "再次嘗試套用目前修補檔"

2736 +

2737 #: builtin/am.c

2738 msgid "record the empty patch as an empty commit"

2739 msgstr "將空白修補檔錄入為空白提交"

@@ -2766,7 +2787,7 @@ msgid ""

2787 "Use \"git am --abort\" to remove it."

2788 msgstr ""

2789 "發現失散的 %s 目錄。\n"

2769 -"使用 “git am --abort” 移除。"

2790 +"使用「git am --abort」移除。"

2791

2792 #: builtin/am.c

2793 msgid "Resolve operation not in progress, we are not resuming."

@@ -2784,10 +2805,6 @@ msgstr "git apply [<options>] [<patch>...]"

2805 msgid "could not redirect output"

2806 msgstr "無法重新導向輸出"

2807

2787 -#: builtin/archive.c

2788 -msgid "git archive: Remote with no URL"

2789 -msgstr "git archive: 未提供遠端 URL"

2790 -

2808 #: builtin/archive.c

2809 msgid "git archive: expected ACK/NAK, got a flush packet"

2810 msgstr "git archive：預期是 ACK/NAK，卻收到 flush 封包"

@@ -2836,32 +2853,32 @@ msgstr "git bisect run <cmd> [<arg>...]"

2853 #: builtin/bisect.c

2854 #, c-format

2855 msgid "cannot open file '%s' in mode '%s'"

2839 -msgstr "無法以 “%2$s” 模式開啟 “%1$s” 檔案"

2856 +msgstr "無法以「%2$s」模式開啟「%1$s」檔案"

2857

2858 #: builtin/bisect.c

2859 #, c-format

2860 msgid "could not write to file '%s'"

2844 -msgstr "無法寫入 “%s” 檔案"

2861 +msgstr "無法寫入「%s」檔案"

2862

2863 #: builtin/bisect.c

2864 #, c-format

2865 msgid "cannot open file '%s' for reading"

2849 -msgstr "無法開啟 “%s” 檔案進行讀取"

2866 +msgstr "無法開啟「%s」檔案進行讀取"

2867

2868 #: builtin/bisect.c

2869 #, c-format

2870 msgid "'%s' is not a valid term"

2854 -msgstr "“%s” 不是有效術語"

2871 +msgstr "「%s」不是有效術語"

2872

2873 #: builtin/bisect.c

2874 #, c-format

2875 msgid "can't use the builtin command '%s' as a term"

2859 -msgstr "不能將內建命令 “%s” 當作術語使用"

2876 +msgstr "不能將內建命令「%s」當作術語使用"

2877

2878 #: builtin/bisect.c

2879 #, c-format

2880 msgid "can't change the meaning of the term '%s'"

2864 -msgstr "不能變更術語 “%s” 的含義"

2881 +msgstr "不能變更術語「%s」的含義"

2882

2883 #: builtin/bisect.c

2884 msgid "please use two different terms"

@@ -2875,13 +2892,13 @@ msgstr "我們沒有在二分搜尋。\n"

2892 #: builtin/bisect.c

2893 #, c-format

2894 msgid "'%s' is not a valid commit"

2878 -msgstr "“%s” 不是有效的提交"

2895 +msgstr "「%s」不是有效的提交"

2896

2897 #: builtin/bisect.c

2898 #, c-format

2899 msgid ""

2900 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."

2884 -msgstr "不能簽出原始 HEAD “%s”。請嘗試 “git bisect reset <commit>”。"

2901 +msgstr "不能簽出原始 HEAD「%s」。請嘗試「git bisect reset <commit>」。"

2902

2903 #: builtin/bisect.c

2904 #, c-format

@@ -2891,12 +2908,12 @@ msgstr "bisect_write 引數無效：%s"

2908 #: builtin/bisect.c

2909 #, c-format

2910 msgid "couldn't get the oid of the rev '%s'"

2894 -msgstr "無法取得修訂版 “%s” 的物件 ID"

2911 +msgstr "無法取得修訂版「%s」的物件 ID"

2912

2913 #: builtin/bisect.c

2914 #, c-format

2915 msgid "couldn't open the file '%s'"

2899 -msgstr "無法開啟檔案 “%s”"

2916 +msgstr "無法開啟檔案「%s」"

2917

2918 #: builtin/bisect.c

2919 #, c-format

@@ -2910,7 +2927,7 @@ msgid ""

2927 "You can use \"git bisect %s\" and \"git bisect %s\" for that."

2928 msgstr ""

2929 "需指定至少一個 %s 和一個 %s 修訂版。\n"

2913 -"為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2930 +"為此您可以用「git bisect %s」和「git bisect %s」。"

2931

2932 #: builtin/bisect.c

2933 #, c-format

@@ -2919,9 +2936,9 @@ msgid ""

2936 "You then need to give me at least one %s and %s revision.\n"

2937 "You can use \"git bisect %s\" and \"git bisect %s\" for that."

2938 msgstr ""

2922 -"要開始，請執行 “git bisect start”。\n"

2939 +"要開始，請執行「git bisect start」。\n"

2940 "接著提供至少一個 %s 和一個 %s 修訂版。\n"

2924 -"為此您可以用 “git bisect %s” 和 “git bisect %s”。"

2941 +"為此您可以用「git bisect %s」和「git bisect %s」。"

2942

2943 #: builtin/bisect.c

2944 #, c-format

@@ -2970,7 +2987,7 @@ msgid ""

2987 "invalid argument %s for 'git bisect terms'.\n"

2988 "Supported options are: --term-good|--term-old and --term-bad|--term-new."

2989 msgstr ""

2973 -"傳入 “git bisect terms” 的 %s 引數無效。\n"

2990 +"傳入「git bisect terms」的 %s 引數無效。\n"

2991 "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"

2992

2993 #: builtin/bisect.c

@@ -2980,21 +2997,21 @@ msgstr "修訂版遍歷設定失敗\n"

2997 #: builtin/bisect.c

2998 #, c-format

2999 msgid "could not open '%s' for appending"

2983 -msgstr "無法開啟 “%s” 進行附加"

3000 +msgstr "無法開啟「%s」進行附加"

3001

3002 #: builtin/bisect.c

3003 msgid "'' is not a valid term"

2987 -msgstr "“ ” 不是有效術語"

3004 +msgstr "「」不是有效術語"

3005

3006 #: builtin/bisect.c

3007 #, c-format

3008 msgid "unrecognized option: '%s'"

2992 -msgstr "無法識別選項：“%s”"

3009 +msgstr "無法識別選項：「%s」"

3010

3011 #: builtin/bisect.c

3012 #, c-format

3013 msgid "'%s' does not appear to be a valid revision"

2997 -msgstr "“%s” 似乎不是有效修訂版"

3014 +msgstr "「%s」似乎不是有效修訂版"

3015

3016 #: builtin/bisect.c

3017 msgid "bad HEAD - I need a HEAD"

@@ -3003,7 +3020,7 @@ msgstr "HEAD 無效 — 需要一個 HEAD"

3020 #: builtin/bisect.c

3021 #, c-format

3022 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."

3006 -msgstr "簽出 “%s” 失敗。請嘗試 “git bisect start <valid-branch>”。"

3023 +msgstr "簽出「%s」失敗。請嘗試「git bisect start <valid-branch>」。"

3024

3025 #: builtin/bisect.c

3026 msgid "bad HEAD - strange symbolic ref"

@@ -3012,11 +3029,11 @@ msgstr "HEAD 無效 — 異常符號引用"

3029 #: builtin/bisect.c

3030 #, c-format

3031 msgid "invalid ref: '%s'"

3015 -msgstr "引用無效：“%s”"

3032 +msgstr "引用無效：「%s」"

3033

3034 #: builtin/bisect.c

3035 msgid "You need to start by \"git bisect start\"\n"

3019 -msgstr "要開始，請執行 “git bisect start”\n"

3036 +msgstr "要開始，請執行「git bisect start」\n"

3037

3038 # 譯者：請維持句尾空格

3039 #. TRANSLATORS: Make sure to include [Y] and [n] in your

@@ -3034,7 +3051,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數"

3051 #: builtin/bisect.c

3052 #, c-format

3053 msgid "'git bisect %s' can take only one argument."

3037 -msgstr "“git bisect %s” 只取一個引數。"

3054 +msgstr "「git bisect %s」只取一個引數。"

3055

3056 #: builtin/bisect.c

3057 #, c-format

@@ -3087,7 +3104,7 @@ msgstr "二分搜尋執行失敗：%2$s 回傳的結束代碼 %1$d 小於 0 或

3104 #: builtin/bisect.c

3105 #, c-format

3106 msgid "cannot open file '%s' for writing"

3090 -msgstr "無法開啟 “%s” 檔案進行寫入"

3107 +msgstr "無法開啟「%s」檔案進行寫入"

3108

3109 #: builtin/bisect.c

3110 msgid "bisect run cannot continue any more"

@@ -3104,22 +3121,22 @@ msgstr "二分搜尋發現到第一個有問題的提交"

3121 #: builtin/bisect.c

3122 #, c-format

3123 msgid "bisect run failed: 'git bisect %s' exited with error code %d"

3107 -msgstr "二分搜尋執行失敗：“git bisect %s” 以錯誤碼 %d 離開"

3124 +msgstr "二分搜尋執行失敗：「git bisect %s」以錯誤碼 %d 離開"

3125

3126 #: builtin/bisect.c

3127 #, c-format

3128 msgid "'%s' requires either no argument or a commit"

3112 -msgstr "“%s” 不需要引數，或者得傳入一個提交"

3129 +msgstr "「%s」不需要引數，或者得傳入一個提交"

3130

3131 #: builtin/bisect.c

3132 #, c-format

3133 msgid "'%s' requires 0 or 1 argument"

3117 -msgstr "“%s” 需要 0 或 1 個引數"

3134 +msgstr "「%s」需要 0 或 1 個引數"

3135

3136 #: builtin/bisect.c

3137 #, c-format

3138 msgid "'%s' requires 0 arguments"

3122 -msgstr "“%s” 不需引數"

3139 +msgstr "「%s」不需引數"

3140

3141 #: builtin/bisect.c

3142 msgid "no logfile given"

@@ -3128,7 +3145,7 @@ msgstr "未提供日誌檔案"

3145 #: builtin/bisect.c

3146 #, c-format

3147 msgid "'%s' failed: no command provided."

3131 -msgstr "“%s” 失敗：沒有提供命令。"

3148 +msgstr "「%s」失敗：沒有提供命令。"

3149

3150 #: builtin/bisect.c

3151 msgid "need a command"

@@ -3137,7 +3154,7 @@ msgstr "需要提供命令"

3154 #: builtin/bisect.c builtin/cat-file.c

3155 #, c-format

3156 msgid "unknown command: '%s'"

3140 -msgstr "未知命令：“%s”"

3157 +msgstr "未知命令：「%s」"

3158

3159 #: builtin/blame.c

3160 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

@@ -3352,8 +3369,8 @@ msgid ""

3369 "deleting branch '%s' that has been merged to\n"

3370 " '%s', but not yet merged to HEAD"

3371 msgstr ""

3355 -"將要刪除的 “%s” 分支已經被合併到\n"

3356 -" “%s”，但尚未合併到 HEAD"

3372 +"將要刪除的分支「%s」已經被合併到\n"

3373 +" 「%s」，但尚未合併到 HEAD"

3374

3375 # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長

3376 #: builtin/branch.c

@@ -3362,23 +3379,23 @@ msgid ""

3379 "not deleting branch '%s' that is not yet merged to\n"

3380 " '%s', even though it is merged to HEAD"

3381 msgstr ""

3365 -"並未刪除分支 “%s”，雖然已經合併到 HEAD，\n"

3366 -" 卻尚未被合併至 “%s” 分支"

3382 +"並未刪除分支「%s」，雖然已經合併到 HEAD，\n"

3383 +" 卻尚未被合併至「%s」分支"

3384

3385 #: builtin/branch.c

3386 #, c-format

3387 msgid "couldn't look up commit object for '%s'"

3371 -msgstr "無法查詢 “%s” 指向的提交物件"

3388 +msgstr "無法查詢「%s」指向的提交物件"

3389

3390 #: builtin/branch.c

3391 #, c-format

3392 msgid "the branch '%s' is not fully merged"

3376 -msgstr "分支 “%s” 沒有完全合併"

3393 +msgstr "分支「%s」沒有完全合併"

3394

3395 #: builtin/branch.c

3396 #, c-format

3397 msgid "If you are sure you want to delete it, run 'git branch -D %s'"

3381 -msgstr "如果確定要刪除它，請執行 “git branch -D %s”"

3398 +msgstr "如果確定要刪除它，請執行「git branch -D %s」"

3399

3400 #: builtin/branch.c

3401 msgid "update of config-file failed"

@@ -3391,12 +3408,12 @@ msgstr "不能將 -a 和 -d 同時使用"

3408 #: builtin/branch.c

3409 #, c-format

3410 msgid "cannot delete branch '%s' used by worktree at '%s'"

3394 -msgstr "無法刪除被位於 “%2$s” 的工作區使用的 “%1$s” 分支"

3411 +msgstr "無法刪除被位於「%2$s」的工作區使用的分支「%1$s」"

3412

3413 #: builtin/branch.c

3414 #, c-format

3415 msgid "remote-tracking branch '%s' not found"

3399 -msgstr "找不到 “%s” 遠端追蹤分支"

3416 +msgstr "找不到遠端追蹤分支「%s」"

3417

3418 #: builtin/branch.c

3419 #, c-format

@@ -3404,13 +3421,13 @@ msgid ""

3421 "branch '%s' not found.\n"

3422 "Did you forget --remote?"

3423 msgstr ""

3407 -"找不到 “%s” 分支。\n"

3408 -"您可能要加上 --remote？"

3424 +"找不到分支「%s」。\n"

3425 +"您可能想加上 --remote？"

3426

3427 #: builtin/branch.c

3428 #, c-format

3429 msgid "branch '%s' not found"

3413 -msgstr "找不到 “%s” 分支"

3430 +msgstr "找不到分支「%s」"

3431

3432 #: builtin/branch.c

3433 #, c-format

@@ -3428,42 +3445,42 @@ msgstr "無法解析格式化字串"

3445

3446 #: builtin/branch.c

3447 msgid "could not resolve HEAD"

3431 -msgstr "無法解析 HEAD 指針"

3448 +msgstr "無法解析 HEAD 指標"

3449

3450 #: builtin/branch.c

3451 #, c-format

3452 msgid "HEAD (%s) points outside of refs/heads/"

3436 -msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外"

3453 +msgstr "HEAD 指標 (%s) 指向 refs/heads/ 之外"

3454

3455 #: builtin/branch.c

3456 #, c-format

3457 msgid "branch %s is being rebased at %s"

3441 -msgstr "%s 分支正在重定基底至 %s"

3458 +msgstr "分支 %s 正在重定基底至 %s"

3459

3460 #: builtin/branch.c

3461 #, c-format

3462 msgid "branch %s is being bisected at %s"

3446 -msgstr "%s 分支正於 %s 進行二分搜尋"

3463 +msgstr "分支 %s 正於 %s 進行二分搜尋"

3464

3465 #: builtin/branch.c

3466 #, c-format

3467 msgid "HEAD of working tree %s is not updated"

3451 -msgstr "%s 工作區的 HEAD 指針未被更新"

3468 +msgstr "%s 工作區的 HEAD 指標未被更新"

3469

3470 #: builtin/branch.c

3471 #, c-format

3472 msgid "invalid branch name: '%s'"

3456 -msgstr "分支名稱無效：“%s”"

3473 +msgstr "分支名稱無效：「%s」"

3474

3475 #: builtin/branch.c

3476 #, c-format

3477 msgid "no commit on branch '%s' yet"

3461 -msgstr "分支 “%s” 尚無提交"

3478 +msgstr "分支「%s」尚無提交"

3479

3480 #: builtin/branch.c

3481 #, c-format

3482 msgid "no branch named '%s'"

3466 -msgstr "沒有名為 “%s” 的分支"

3483 +msgstr "沒有名為「%s」的分支"

3484

3485 #: builtin/branch.c

3486 msgid "branch rename failed"

@@ -3476,17 +3493,17 @@ msgstr "分支拷貝失敗"

3493 #: builtin/branch.c

3494 #, c-format

3495 msgid "created a copy of a misnamed branch '%s'"

3479 -msgstr "已為誤命名的 “%s” 分支建立拷貝"

3496 +msgstr "已為誤命名的分支「%s」建立拷貝"

3497

3498 #: builtin/branch.c

3499 #, c-format

3500 msgid "renamed a misnamed branch '%s' away"

3484 -msgstr "已更改誤命名的 “%s” 分支的名稱"

3501 +msgstr "已更改誤命名的分支「%s」的名稱"

3502

3503 #: builtin/branch.c

3504 #, c-format

3505 msgid "branch renamed to %s, but HEAD is not updated"

3489 -msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新"

3506 +msgstr "分支已重新命名為 %s，但 HEAD 指標尚未更新"

3507

3508 #: builtin/branch.c

3509 msgid "branch is renamed, but update of config-file failed"

@@ -3581,7 +3598,7 @@ msgstr "即使目標已存在，仍移動或重新命名分支"

3598

3599 #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c

3600 msgid "do not output a newline after empty formatted refs"

3584 -msgstr "在格式化引用結果為空之後，不要輸出換列符號"

3601 +msgstr "在格式化結果為空的引用之後，不要輸出換列符號"

3602

3603 #: builtin/branch.c

3604 msgid "copy a branch and its reflog"

@@ -3650,7 +3667,7 @@ msgstr "無法將 HEAD 解析為有效引用"

3667

3668 #: builtin/branch.c builtin/clone.c

3669 msgid "HEAD not found below refs/heads!"

3653 -msgstr "HEAD 指針不在 /refs/heads 中！"

3670 +msgstr "HEAD 指標不在 /refs/heads 中！"

3671

3672 #: builtin/branch.c

3673 msgid ""

@@ -3669,7 +3686,7 @@ msgstr "必須提供分支名稱"

3686

3687 #: builtin/branch.c

3688 msgid "cannot give description to detached HEAD"

3672 -msgstr "無法向分離 HEAD 指針提供描述"

3689 +msgstr "無法向分離 HEAD 指標提供描述"

3690

3691 #: builtin/branch.c

3692 msgid "cannot edit description of more than one branch"

@@ -3704,12 +3721,12 @@ msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支"

3721 #: builtin/branch.c

3722 #, c-format

3723 msgid "no such branch '%s'"

3707 -msgstr "無 “%s” 分支"

3724 +msgstr "無「%s」分支"

3725

3726 #: builtin/branch.c

3727 #, c-format

3728 msgid "branch '%s' does not exist"

3712 -msgstr "沒有 “%s” 分支"

3729 +msgstr "沒有「%s」分支"

3730

3731 #: builtin/branch.c

3732 msgid "too many arguments to unset upstream"

@@ -3722,21 +3739,22 @@ msgstr "無法取消設定 HEAD 的上游：其未指向任何分支"

3739 #: builtin/branch.c

3740 #, c-format

3741 msgid "branch '%s' has no upstream information"

3725 -msgstr "分支 “%s” 沒有上游資訊"

3742 +msgstr "分支「%s」沒有上游資訊"

3743

3744 #: builtin/branch.c

3745 msgid ""

3746 "the -a, and -r, options to 'git branch' do not take a branch name.\n"

3747 "Did you mean to use: -a|-r --list <pattern>?"

3748 msgstr ""

3732 -"“git branch” 的 -a 和 -r 選項不取分支名稱。\n"

3749 +"「git branch」的 -a 和 -r 選項不取分支名稱。\n"

3750 "您是想使用：-a|-r --list <pattern> 嗎？"

3751

3752 #: builtin/branch.c

3753 msgid ""

3754 "the '--set-upstream' option is no longer supported. Please use '--track' or "

3755 "'--set-upstream-to' instead"

3739 -msgstr "不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”"

3756 +msgstr ""

3757 +"不再支援選項「--set-upstream」。請改用「--track」或「--set-upstream-to」"

3758

3759 #: builtin/bugreport.c

3760 msgid "git version:\n"

@@ -3745,7 +3763,7 @@ msgstr "git 版本：\n"

3763 #: builtin/bugreport.c

3764 #, c-format

3765 msgid "uname() failed with error '%s' (%d)\n"

3748 -msgstr "uname() 失敗，錯誤：“%s” (%d)\n"

3766 +msgstr "uname() 失敗，錯誤：「%s」(%d)\n"

3767

3768 #: builtin/bugreport.c

3769 msgid "compiler info: "

@@ -3811,7 +3829,7 @@ msgstr "mode"

3829 #: builtin/bugreport.c

3830 msgid ""

3831 "create an additional zip archive of detailed diagnostics (default 'stats')"

3814 -msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值 “stats”）"

3832 +msgstr "另外建立有詳細診斷資訊的 ZIP 封存檔（預設值「stats」）"

3833

3834 #: builtin/bugreport.c

3835 msgid "specify a destination for the bugreport file(s)"

@@ -3824,12 +3842,12 @@ msgstr "指定用於檔名的 strftime 格式後綴"

3842 #: builtin/bugreport.c

3843 #, c-format

3844 msgid "unknown argument `%s'"

3827 -msgstr "未知引數 “%s”"

3845 +msgstr "未知引數「%s」"

3846

3847 #: builtin/bugreport.c builtin/diagnose.c

3848 #, c-format

3849 msgid "could not create leading directories for '%s'"

3832 -msgstr "無法建立 “%s” 的前置目錄"

3850 +msgstr "無法建立「%s」的前置目錄"

3851

3852 #: builtin/bugreport.c builtin/diagnose.c

3853 #, c-format

@@ -3852,7 +3870,7 @@ msgstr "無法寫入 %s"

3870 #: builtin/bugreport.c

3871 #, c-format

3872 msgid "Created new report at '%s'.\n"

3855 -msgstr "已在 “%s” 建立新報告。\n"

3873 +msgstr "已在「%s」建立新報告。\n"

3874

3875 #: builtin/bundle.c

3876 msgid ""

@@ -3906,6 +3924,10 @@ msgstr "需要版本庫來建立套件包。"

3924 msgid "do not show bundle details"

3925 msgstr "不顯示套件包的詳細資訊"

3926

3927 +#: builtin/bundle.c bundle.c

3928 +msgid "need a repository to verify a bundle"

3929 +msgstr "需要版本庫驗證套件包"

3930 +

3931 #: builtin/bundle.c

3932 #, c-format

3933 msgid "%s is okay\n"

@@ -3922,7 +3944,7 @@ msgstr "正在拆分物件"

3944 #: builtin/cat-file.c merge-recursive.c

3945 #, c-format

3946 msgid "cannot read object %s '%s'"

3925 -msgstr "無法讀取物件 %s “%s”"

3947 +msgstr "無法讀取物件 %s「%s」"

3948

3949 #: builtin/cat-file.c

3950 msgid "flush is only for --buffer mode"

@@ -3935,7 +3957,7 @@ msgstr "輸入中沒有命令"

3957 #: builtin/cat-file.c

3958 #, c-format

3959 msgid "whitespace before command: '%s'"

3938 -msgstr "命令前有空格：“%s”"

3960 +msgstr "命令前有空格：「%s」"

3961

3962 #: builtin/cat-file.c

3963 #, c-format

@@ -4001,7 +4023,8 @@ msgstr "輸出 [損壞的] ([broken]) 物件屬性"

4023

4024 #: builtin/cat-file.c

4025 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"

4004 -msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）"

4026 +msgstr ""

4027 +"顯示物件類型（可以是「blob」、「tree」、「commit」、「tag」等其中一個）"

4028

4029 #: builtin/cat-file.c

4030 msgid "show object size"

@@ -4079,12 +4102,12 @@ msgstr "blob|tree"

4102

4103 #: builtin/cat-file.c

4104 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"

4082 -msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”"

4105 +msgstr "請在 (--textconv | --filters) 使用 <path>，而非「batch」"

4106

4107 #: builtin/cat-file.c

4108 #, c-format

4109 msgid "'%s=<%s>' needs '%s' or '%s'"

4087 -msgstr "“%s=<%s>” 需要 “%s” 或 “%s”"

4110 +msgstr "「%s=<%s>」需要「%s」或「%s」"

4111

4112 #: builtin/cat-file.c

4113 msgid "path|tree-ish"

@@ -4093,12 +4116,12 @@ msgstr "path|tree-ish"

4116 #: builtin/cat-file.c

4117 #, c-format

4118 msgid "'%s' requires a batch mode"

4096 -msgstr "“%s” 需要批次處理模式"

4119 +msgstr "「%s」需要批次處理模式"

4120

4121 #: builtin/cat-file.c

4122 #, c-format

4123 msgid "'-%c' is incompatible with batch mode"

4101 -msgstr "“-%c” 與批次處理模式不相容"

4124 +msgstr "「-%c」與批次處理模式不相容"

4125

4126 #: builtin/cat-file.c

4127 msgid "batch modes take no arguments"

@@ -4107,12 +4130,12 @@ msgstr "批次處理模式不取引數"

4130 #: builtin/cat-file.c

4131 #, c-format

4132 msgid "<rev> required with '%s'"

4110 -msgstr "“%s” 需要 <rev>"

4133 +msgstr "「%s」需要 <rev>"

4134

4135 #: builtin/cat-file.c

4136 #, c-format

4137 msgid "<object> required with '-%c'"

4115 -msgstr "“-%c” 需要 <object>"

4138 +msgstr "「-%c」需要 <object>"

4139

4140 #: builtin/cat-file.c

4141 #, c-format

@@ -4286,32 +4309,32 @@ msgstr "git restore [<options>] [--source=<branch>] <file>..."

4309 #: builtin/checkout.c

4310 #, c-format

4311 msgid "path '%s' does not have our version"

4289 -msgstr "“%s” 路徑沒有我們的版本"

4312 +msgstr "「%s」路徑沒有我們的版本"

4313

4314 #: builtin/checkout.c

4315 #, c-format

4316 msgid "path '%s' does not have their version"

4294 -msgstr "“%s” 路徑沒有他們的版本"

4317 +msgstr "「%s」路徑沒有他們的版本"

4318

4319 #: builtin/checkout.c

4320 #, c-format

4321 msgid "path '%s' does not have all necessary versions"

4299 -msgstr "“%s” 路徑沒有所有必須的版本"

4322 +msgstr "「%s」路徑沒有所有必須的版本"

4323

4324 #: builtin/checkout.c

4325 #, c-format

4326 msgid "path '%s' does not have necessary versions"

4304 -msgstr "“%s” 路徑沒有必須的版本"

4327 +msgstr "「%s」路徑沒有必須的版本"

4328

4329 #: builtin/checkout.c

4330 #, c-format

4331 msgid "path '%s': cannot merge"

4309 -msgstr "path “%s”：無法合併"

4332 +msgstr "path「%s」：無法合併"

4333

4334 #: builtin/checkout.c

4335 #, c-format

4336 msgid "Unable to add merge result for '%s'"

4314 -msgstr "無法為 “%s” 加上合併結果"

4337 +msgstr "無法為「%s」加上合併結果"

4338

4339 #: builtin/checkout.c

4340 #, c-format

@@ -4334,37 +4357,37 @@ msgstr[0] "已從索引區更新 %d 個路徑"

4357 #: builtin/checkout.c

4358 #, c-format

4359 msgid "'%s' cannot be used with updating paths"

4337 -msgstr "無法在更新路徑時使用 “%s”"

4360 +msgstr "無法在更新路徑時使用「%s」"

4361

4362 #: builtin/checkout.c

4363 #, c-format

4364 msgid "Cannot update paths and switch to branch '%s' at the same time."

4342 -msgstr "無法同時更新路徑和切換至 “%s” 分支。"

4365 +msgstr "無法同時更新路徑和切換至「%s」分支。"

4366

4367 #: builtin/checkout.c

4368 #, c-format

4369 msgid "neither '%s' or '%s' is specified"

4347 -msgstr "“%s” 或 “%s” 皆未指定"

4370 +msgstr "「%s」或「%s」皆未指定"

4371

4372 #: builtin/checkout.c

4373 #, c-format

4374 msgid "'%s' must be used when '%s' is not specified"

4352 -msgstr "未指定 “%2$s” 時，必須使用 “%1$s”"

4375 +msgstr "未指定「%2$s」時，必須使用「%1$s」"

4376

4377 #: builtin/checkout.c

4378 #, c-format

4379 msgid "'%s' or '%s' cannot be used with %s"

4357 -msgstr "“%s” 或 “%s” 無法與 %s 一起使用"

4380 +msgstr "「%s」或「%s」無法與 %s 一起使用"

4381

4382 #: builtin/checkout.c

4383 #, c-format

4384 msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"

4362 -msgstr "“%s”、“%s” 或 “%s” 無法在簽出樹狀物件時使用"

4385 +msgstr "「%s」、「%s」或「%s」無法在簽出樹狀物件時使用"

4386

4387 #: builtin/checkout.c

4388 #, c-format

4389 msgid "path '%s' is unmerged"

4367 -msgstr "路徑 “%s” 未合併"

4390 +msgstr "路徑「%s」未合併"

4391

4392 #: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c

4393 #: merge-ort.c reset.c sequencer.c tree-walk.c

@@ -4388,7 +4411,7 @@ msgstr ""

4411 #: builtin/checkout.c

4412 #, c-format

4413 msgid "Can not do reflog for '%s': %s\n"

4391 -msgstr "無法對 “%s” 執行 reflog 動作：%s\n"

4414 +msgstr "無法對「%s」執行 reflog 動作：%s\n"

4415

4416 #: builtin/checkout.c

4417 msgid "HEAD is now at"

@@ -4401,27 +4424,27 @@ msgstr "無法更新 HEAD"

4424 #: builtin/checkout.c

4425 #, c-format

4426 msgid "Reset branch '%s'\n"

4404 -msgstr "重設分支 “%s”\n"

4427 +msgstr "重設分支「%s」\n"

4428

4429 #: builtin/checkout.c

4430 #, c-format

4431 msgid "Already on '%s'\n"

4409 -msgstr "已經位於 “%s”\n"

4432 +msgstr "已經位於「%s」\n"

4433

4434 #: builtin/checkout.c

4435 #, c-format

4436 msgid "Switched to and reset branch '%s'\n"

4414 -msgstr "已切換並重設分支 “%s”\n"

4437 +msgstr "已切換並重設分支「%s」\n"

4438

4439 #: builtin/checkout.c

4440 #, c-format

4441 msgid "Switched to a new branch '%s'\n"

4419 -msgstr "已切換至新分支 “%s”\n"

4442 +msgstr "已切換至新分支「%s」\n"

4443

4444 #: builtin/checkout.c

4445 #, c-format

4446 msgid "Switched to branch '%s'\n"

4424 -msgstr "已切換至分支 “%s”\n"

4447 +msgstr "已切換至分支「%s」\n"

4448

4449 # 譯者：請維持前導空格

4450 #: builtin/checkout.c

@@ -4474,7 +4497,7 @@ msgstr "在修訂版遍歷時遇到內部錯誤"

4497

4498 #: builtin/checkout.c

4499 msgid "Previous HEAD position was"

4477 -msgstr "之前的 HEAD 指針位置在"

4500 +msgstr "之前的 HEAD 指標位置在"

4501

4502 #: builtin/checkout.c

4503 msgid "You are on a branch yet to be born"

@@ -4486,7 +4509,7 @@ msgid ""

4509 "'%s' could be both a local file and a tracking branch.\n"

4510 "Please use -- (and optionally --no-guess) to disambiguate"

4511 msgstr ""

4489 -"“%s” 既可以是本機檔案，也可以是追蹤分支。\n"

4512 +"「%s」既可以是本機檔案，也可以是追蹤分支。\n"

4513 "請使用 --（和可選的 --no-guess）來消除歧義"

4514

4515 #: builtin/checkout.c

@@ -4500,19 +4523,19 @@ msgid ""

4523 "one remote, e.g. the 'origin' remote, consider setting\n"

4524 "checkout.defaultRemote=origin in your config."

4525 msgstr ""

4503 -"如果您想要簽出遠端追蹤分支，例如 “origin”，\n"

4526 +"如果您想要簽出遠端追蹤分支，例如「origin」，\n"

4527 "您可以使用 --track 選項寫出全名：\n"

4528 "\n"

4529 " git checkout --track origin/<name>\n"

4530 "\n"

4531 "如果您平時比較想要使用模糊的簡短分支名稱 <name>，\n"

4509 -"而不太想寫如 “origin” 的遠端版本庫名稱，\n"

4532 +"而不太想寫如「origin」的遠端版本庫名稱，\n"

4533 "可以在組態中設定 checkout.defaultRemote=origin。"

4534

4535 #: builtin/checkout.c

4536 #, c-format

4537 msgid "'%s' matched multiple (%d) remote tracking branches"

4515 -msgstr "“%s” 符合多個 (%d) 遠端追蹤分支"

4538 +msgstr "「%s」符合多個 (%d) 遠端追蹤分支"

4539

4540 #: builtin/checkout.c

4541 msgid "only one reference expected"

@@ -4536,27 +4559,27 @@ msgstr "引用不是樹狀物件：%s"

4559 #: builtin/checkout.c

4560 #, c-format

4561 msgid "a branch is expected, got tag '%s'"

4539 -msgstr "預期收到分支，卻收到標籤 “%s”"

4562 +msgstr "預期收到分支，卻收到標籤「%s」"

4563

4564 #: builtin/checkout.c

4565 #, c-format

4566 msgid "a branch is expected, got remote branch '%s'"

4544 -msgstr "預期收到分支，卻收到遠端分支 “%s”"

4567 +msgstr "預期收到分支，卻收到遠端分支「%s」"

4568

4569 #: builtin/checkout.c

4570 #, c-format

4571 msgid "a branch is expected, got '%s'"

4549 -msgstr "預期收到分支，卻收到 “%s”"

4572 +msgstr "預期收到分支，卻收到「%s」"

4573

4574 #: builtin/checkout.c

4575 #, c-format

4576 msgid "a branch is expected, got commit '%s'"

4554 -msgstr "預期收到分支，卻收到提交 “%s”"

4577 +msgstr "預期收到分支，卻收到提交「%s」"

4578

4579 #: builtin/checkout.c

4580 msgid ""

4581 "If you want to detach HEAD at the commit, try again with the --detach option."

4559 -msgstr "若您想要在此提交分離 HEAD 指針，請傳入 --detach 選項重試。"

4582 +msgstr "若您想要在此提交分離 HEAD 指標，請傳入 --detach 選項重試。"

4583

4584 #: builtin/checkout.c

4585 msgid ""

@@ -4564,7 +4587,7 @@ msgid ""

4587 "Consider \"git merge --quit\" or \"git worktree add\"."

4588 msgstr ""

4589 "無法在合併時切換分支\n"

4567 -"請試試 “git merge --quit” 或 “git worktree add”。"

4590 +"請試試「git merge --quit」或「git worktree add」。"

4591

4592 #: builtin/checkout.c

4593 msgid ""

@@ -4572,7 +4595,7 @@ msgid ""

4595 "Consider \"git am --quit\" or \"git worktree add\"."

4596 msgstr ""

4597 "無法在 am 工作階段期間時切換分支\n"

4575 -"請試試 “git am --quit” 或 “git worktree add”。"

4598 +"請試試「git am --quit」或「git worktree add」。"

4599

4600 #: builtin/checkout.c

4601 msgid ""

@@ -4580,7 +4603,7 @@ msgid ""

4603 "Consider \"git rebase --quit\" or \"git worktree add\"."

4604 msgstr ""

4605 "無法在重定基底時切換分支\n"

4583 -"請試試 “git rebase --quit” 或 “git worktree add”。"

4606 +"請試試「git rebase --quit」或「git worktree add」。"

4607

4608 #: builtin/checkout.c

4609 msgid ""

@@ -4588,7 +4611,7 @@ msgid ""

4611 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

4612 msgstr ""

4613 "無法在揀選時切換分支\n"

4591 -"請試試 “git cherry-pick --quit” 或 “git worktree add”。"

4614 +"請試試「git cherry-pick --quit」或「git worktree add」。"

4615

4616 #: builtin/checkout.c

4617 msgid ""

@@ -4596,7 +4619,7 @@ msgid ""

4619 "Consider \"git revert --quit\" or \"git worktree add\"."

4620 msgstr ""

4621 "無法在還原時切換分支\n"

4599 -"請試試 “git revert --quit” 或 “git worktree add”。"

4622 +"請試試「git revert --quit」或「git worktree add」。"

4623

4624 #: builtin/checkout.c

4625 msgid "you are switching branch while bisecting"

@@ -4609,22 +4632,22 @@ msgstr "路徑不能與切換分支同時使用"

4632 #: builtin/checkout.c

4633 #, c-format

4634 msgid "'%s' cannot be used with switching branches"

4612 -msgstr "“%s” 不能與切換分支同時使用"

4635 +msgstr "「%s」不能與切換分支同時使用"

4636

4637 #: builtin/checkout.c

4638 #, c-format

4639 msgid "'%s' cannot be used with '%s'"

4617 -msgstr "“%s” 不能與 “%s” 同時使用"

4640 +msgstr "「%s」不能與「%s」同時使用"

4641

4642 #: builtin/checkout.c

4643 #, c-format

4644 msgid "'%s' cannot take <start-point>"

4622 -msgstr "“%s” 不取 <start-point>"

4645 +msgstr "「%s」不取 <start-point>"

4646

4647 #: builtin/checkout.c

4648 #, c-format

4649 msgid "Cannot switch branch to a non-commit '%s'"

4627 -msgstr "無法將分支切換至非提交項目 “%s”"

4650 +msgstr "無法將分支切換至非提交項目「%s」"

4651

4652 #: builtin/checkout.c

4653 msgid "missing branch or commit argument"

@@ -4649,7 +4672,7 @@ msgstr "衝突輸出風格（merge、diff3 或 zdiff3）"

4672

4673 #: builtin/checkout.c builtin/worktree.c

4674 msgid "detach HEAD at named commit"

4652 -msgstr "自指定提交分離 HEAD 指針"

4675 +msgstr "自指定提交分離 HEAD 指標"

4676

4677 #: builtin/checkout.c

4678 msgid "force checkout (throw away local modifications)"

@@ -4686,7 +4709,7 @@ msgstr "對路徑規格不做稀疏簽出的限制"

4709 #: builtin/checkout.c

4710 #, c-format

4711 msgid "options '-%c', '-%c', and '%s' cannot be used together"

4689 -msgstr "“-%c”、“-%c” 和 “%s” 選項不得同時使用"

4712 +msgstr "「-%c」、「-%c」和「%s」選項不得同時使用"

4713

4714 #: builtin/checkout.c

4715 msgid "--track needs a branch name"

@@ -4709,12 +4732,12 @@ msgstr "無效的路徑規格"

4732 #: builtin/checkout.c

4733 #, c-format

4734 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

4712 -msgstr "“%s” 不是提交，因此不能以這為基礎建立 “%s” 分支"

4735 +msgstr "「%s」不是提交，因此不能以這為基礎建立「%s」分支"

4736

4737 #: builtin/checkout.c

4738 #, c-format

4739 msgid "git checkout: --detach does not take a path argument '%s'"

4717 -msgstr "git checkout：--detach 不取路徑引數 “%s”"

4740 +msgstr "git checkout：--detach 不取路徑引數「%s」"

4741

4742 #: builtin/checkout.c

4743 msgid ""

@@ -4747,7 +4770,7 @@ msgstr "為新分支建立引用日誌"

4770

4771 #: builtin/checkout.c

4772 msgid "second guess 'git checkout <no-such-branch>' (default)"

4750 -msgstr "二次猜測 “git checkout <無此分支>”（預設值）"

4773 +msgstr "二次猜測「git checkout <無此分支>」（預設值）"

4774

4775 #: builtin/checkout.c

4776 msgid "use overlay mode (default)"

@@ -4763,7 +4786,7 @@ msgstr "建立/重設並切換至指定分支"

4786

4787 #: builtin/checkout.c

4788 msgid "second guess 'git switch <no-such-branch>'"

4766 -msgstr "二次猜測 “git switch <無此分支>”"

4789 +msgstr "二次猜測「git switch <無此分支>」"

4790

4791 #: builtin/checkout.c

4792 msgid "throw away local modifications"

@@ -4907,7 +4930,7 @@ msgstr ""

4930 "clean - 開始清理\n"

4931 "filter by pattern - 透過範本排除要刪除的條目\n"

4932 "select by numbers - 透過數字選擇要刪除的條目\n"

4910 -"ask each - 針對刪除逐一詢問（就像 “rm -i”）\n"

4933 +"ask each - 針對刪除逐一詢問（就像「rm -i」）\n"

4934 "quit - 停止刪除並離開\n"

4935 "help - 顯示本輔助說明\n"

4936 "? - 顯示如何在提示下選擇的協助"

@@ -4937,9 +4960,9 @@ msgstr "互動式清除"

4960 msgid "remove whole directories"

4961 msgstr "移除整個目錄"

4962

4940 -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c

4941 -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c

4942 -#: ref-filter.h

4963 +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c

4964 +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c

4965 +#: builtin/show-ref.c ref-filter.h

4966 msgid "pattern"

4967 msgstr "pattern"

4968

@@ -5027,7 +5050,7 @@ msgstr "name"

5050

5051 #: builtin/clone.c

5052 msgid "use <name> instead of 'origin' to track upstream"

5030 -msgstr "使用 <name> 而不是 “origin” 追蹤上游"

5053 +msgstr "使用 <name> 而不是「origin」追蹤上游"

5054

5055 #: builtin/clone.c

5056 msgid "checkout <branch> instead of the remote's HEAD"

@@ -5138,7 +5161,7 @@ msgstr "%s 存在且不是一個目錄"

5161 #: builtin/clone.c

5162 #, c-format

5163 msgid "'%s' is a symlink, refusing to clone with --local"

5141 -msgstr "“%s” 是個符號連結，故不能使用 --local 複製"

5164 +msgstr "「%s」是個符號連結，故不能使用 --local 複製"

5165

5166 #: builtin/clone.c

5167 #, c-format

@@ -5153,7 +5176,17 @@ msgstr "「%s」符號連結已存在，拒絕使用 --local 複製"

5176 #: builtin/clone.c compat/precompose_utf8.c

5177 #, c-format

5178 msgid "failed to unlink '%s'"

5156 -msgstr "無法刪除 “%s”"

5179 +msgstr "無法刪除「%s」"

5180 +

5181 +#: builtin/clone.c

5182 +#, c-format

5183 +msgid "hardlink cannot be checked at '%s'"

5184 +msgstr "無法檢查位於「%s」的硬連結"

5185 +

5186 +#: builtin/clone.c

5187 +#, c-format

5188 +msgid "hardlink different from source at '%s'"

5189 +msgstr "硬連結與位於 '%s' 的來源不同"

5190

5191 #: builtin/clone.c

5192 #, c-format

@@ -5231,10 +5264,10 @@ msgstr "太多參數。"

5264 msgid "You must specify a repository to clone."

5265 msgstr "您必須指定要複製的版本庫。"

5266

5234 -#: builtin/clone.c builtin/init-db.c setup.c

5267 +#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c

5268 #, c-format

5269 msgid "unknown ref storage format '%s'"

5237 -msgstr "未知的引用儲存格式 “%s”"

5270 +msgstr "未知的引用儲存格式「%s」"

5271

5272 #: builtin/clone.c

5273 #, c-format

@@ -5331,7 +5364,7 @@ msgstr "無法初始化版本庫，略過套件包 URI"

5364 #: builtin/clone.c

5365 #, c-format

5366 msgid "failed to fetch objects from bundle URI '%s'"

5334 -msgstr "無法從套件包 URL “%s” 抓取物件"

5367 +msgstr "無法從套件包 URL「%s」抓取物件"

5368

5369 #: builtin/clone.c

5370 msgid "failed to fetch advertised bundles"

@@ -5391,7 +5424,7 @@ msgstr "--command 必須是第一個參數"

5424 msgid ""

5425 "git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"

5426 msgstr ""

5394 -"git commit-graph verify [--object-dir <目錄>] [--shallow] [--[no-]progress]"

5427 +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"

5428

5429 #: builtin/commit-graph.c

5430 msgid ""

@@ -5415,21 +5448,21 @@ msgstr "目錄"

5448

5449 #: builtin/commit-graph.c

5450 msgid "the object directory to store the graph"

5418 -msgstr "儲存圖形的物件目錄"

5451 +msgstr "儲存圖的物件目錄"

5452

5453 #: builtin/commit-graph.c

5454 msgid "if the commit-graph is split, only verify the tip file"

5422 -msgstr "如果提交圖形被分割，只驗證頭一個檔案"

5455 +msgstr "如果提交圖被分割，只驗證頭一個檔案"

5456

5457 #: builtin/commit-graph.c

5458 #, c-format

5459 msgid "Could not open commit-graph '%s'"

5427 -msgstr "無法開啟提交圖形 '%s'"

5460 +msgstr "無法開啟提交圖「%s」"

5461

5462 #: builtin/commit-graph.c

5463 #, c-format

5464 msgid "could not open commit-graph chain '%s'"

5432 -msgstr "無法開啟提交圖鏈 “%s”"

5465 +msgstr "無法開啟提交圖鏈「%s」"

5466

5467 #: builtin/commit-graph.c

5468 #, c-format

@@ -5465,7 +5498,7 @@ msgstr "從標準輸入中的提交開始掃描"

5498

5499 #: builtin/commit-graph.c

5500 msgid "include all commits already in the commit-graph file"

5468 -msgstr "包含 commit-graph 檔案中已有所有提交"

5501 +msgstr "包含提交圖檔案中所有已有的提交"

5502

5503 #: builtin/commit-graph.c

5504 msgid "enable computation for changed paths"

@@ -5473,15 +5506,15 @@ msgstr "啟用已變更路徑的計算"

5506

5507 #: builtin/commit-graph.c

5508 msgid "allow writing an incremental commit-graph file"

5476 -msgstr "允許寫一個增量提交圖形檔案"

5509 +msgstr "允許寫一個增量提交圖檔案"

5510

5511 #: builtin/commit-graph.c

5512 msgid "maximum number of commits in a non-base split commit-graph"

5480 -msgstr "在非基本分割提交圖形中的最大提交數"

5513 +msgstr "在非基礎分割提交圖中的最大提交數"

5514

5515 #: builtin/commit-graph.c

5516 msgid "maximum ratio between two levels of a split commit-graph"

5484 -msgstr "一個分割提交圖形的兩個級別之間的最大比率"

5517 +msgstr "一個分割提交圖的兩個級別之間的最大比率"

5518

5519 #: builtin/commit-graph.c

5520 msgid "only expire files older than a given date-time"

@@ -5719,7 +5752,7 @@ msgstr "無法選擇一個未被目前提交說明使用的備註字元"

5752 #: builtin/commit.c

5753 #, c-format

5754 msgid "could not lookup commit '%s'"

5722 -msgstr "無法查詢提交 “%s”"

5755 +msgstr "無法查詢提交「%s」"

5756

5757 #: builtin/commit.c builtin/shortlog.c

5758 #, c-format

@@ -5845,7 +5878,7 @@ msgstr "%s提交者：%.*s <%.*s>"

5878 msgid "Cannot read index"

5879 msgstr "無法讀取索引"

5880

5848 -#: builtin/commit.c

5881 +#: builtin/commit.c builtin/tag.c

5882 msgid "unable to pass trailers to --trailers"

5883 msgstr "無法將尾部署名傳遞至 --trailers"

5884

@@ -6056,11 +6089,11 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"

6089 msgid "the commit is authored by me now (used with -C/-c/--amend)"

6090 msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"

6091

6059 -#: builtin/commit.c builtin/interpret-trailers.c

6092 +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c

6093 msgid "trailer"

6094 msgstr "尾部署名"

6095

6063 -#: builtin/commit.c

6096 +#: builtin/commit.c builtin/tag.c

6097 msgid "add custom trailer(s)"

6098 msgstr "加入自訂尾部署名"

6099

@@ -6169,20 +6202,60 @@ msgid ""

6202 "not exceeded, and then \"git restore --staged :/\" to recover."

6203 msgstr ""

6204 "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n"

6172 -"已滿或磁碟配額已耗盡，然後執行 “git restore --staged :/” 復原。"

6205 +"已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。"

6206

6207 #: builtin/config.c

6175 -msgid "git config [<options>]"

6176 -msgstr "git config [<選項>]"

6208 +msgid "git config list [<file-option>] [<display-option>] [--includes]"

6209 +msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]"

6210

6211 #: builtin/config.c

6179 -#, c-format

6180 -msgid "unrecognized --type argument, %s"

6181 -msgstr "無法識別的 --type 參數，%s"

6212 +msgid ""

6213 +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"

6214 +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "

6215 +"<name>"

6216 +msgstr ""

6217 +"git config get [<檔案選項>] [<顯示選項>] [--includes] [--all] [--regexp=<常規"

6218 +"表示式>] [--value=<值>] [--fixed-value] [--default=<預設值>] <名稱>"

6219

6220 #: builtin/config.c

6184 -msgid "only one type at a time"

6185 -msgstr "一次只能一個類型"

6221 +msgid ""

6222 +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"

6223 +"fixed-value] <name> <value>"

6224 +msgstr ""

6225 +"git config set [<檔案選項>] [--type=<類型>] [--all] [--value=<值>] [--fixed-"

6226 +"value] <名稱> <值>"

6227 +

6228 +#: builtin/config.c

6229 +msgid ""

6230 +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "

6231 +"<name> <value>"

6232 +msgstr ""

6233 +"git config unset [<檔案選項>] [--all] [--value=<值>] [--fixed-value] <名稱> <"

6234 +"值>"

6235 +

6236 +#: builtin/config.c

6237 +msgid "git config rename-section [<file-option>] <old-name> <new-name>"

6238 +msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>"

6239 +

6240 +#: builtin/config.c

6241 +msgid "git config remove-section [<file-option>] <name>"

6242 +msgstr "git config remove-section [<檔案選項>] <名稱>"

6243 +

6244 +#: builtin/config.c

6245 +msgid "git config edit [<file-option>]"

6246 +msgstr "git config edit [<檔案選項>]"

6247 +

6248 +#: builtin/config.c

6249 +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"

6250 +msgstr "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"

6251 +

6252 +#: builtin/config.c

6253 +msgid ""

6254 +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "

6255 +"[--value=<value>] [--fixed-value] <name> <value>"

6256 +msgstr ""

6257 +"git config set [<檔案選項>] [--type=<類型>] [--comment=<備註>] [--all] [--"

6258 +"value=<值>] [--fixed-value] <名稱> <值>"

6259

6260 #: builtin/config.c

6261 msgid "Config file location"

@@ -6216,70 +6289,6 @@ msgstr "資料物件 ID"

6289 msgid "read config from given blob object"

6290 msgstr "從提供的資料物件讀取設定"

6291

6219 -#: builtin/config.c

6220 -msgid "Action"

6221 -msgstr "動作"

6222 -

6223 -#: builtin/config.c

6224 -msgid "get value: name [value-pattern]"

6225 -msgstr "取得值：name [value-pattern]"

6226 -

6227 -#: builtin/config.c

6228 -msgid "get all values: key [value-pattern]"

6229 -msgstr "取得所有值：key [value-pattern]"

6230 -

6231 -#: builtin/config.c

6232 -msgid "get values for regexp: name-regex [value-pattern]"

6233 -msgstr "根據常規表示式取得值：name-regex [value-pattern]"

6234 -

6235 -#: builtin/config.c

6236 -msgid "get value specific for the URL: section[.var] URL"

6237 -msgstr "獲得 URL 取值：section[.var] URL"

6238 -

6239 -#: builtin/config.c

6240 -msgid "replace all matching variables: name value [value-pattern]"

6241 -msgstr "取代所有符合的變數：name value [value-pattern]"

6242 -

6243 -#: builtin/config.c

6244 -msgid "add a new variable: name value"

6245 -msgstr "新增一個新的變數：name value"

6246 -

6247 -#: builtin/config.c

6248 -msgid "remove a variable: name [value-pattern]"

6249 -msgstr "移除一個變數：name [value-pattern]"

6250 -

6251 -#: builtin/config.c

6252 -msgid "remove all matches: name [value-pattern]"

6253 -msgstr "移除所有符合項目：name [value-pattern]"

6254 -

6255 -#: builtin/config.c

6256 -msgid "rename section: old-name new-name"

6257 -msgstr "重新命名小節：old-name new-name"

6258 -

6259 -#: builtin/config.c

6260 -msgid "remove a section: name"

6261 -msgstr "刪除一個小節：name"

6262 -

6263 -#: builtin/config.c

6264 -msgid "list all"

6265 -msgstr "全部列出"

6266 -

6267 -#: builtin/config.c

6268 -msgid "use string equality when comparing values to 'value-pattern'"

6269 -msgstr "比較「value-pattern」的值時，使用字串相等比較"

6270 -

6271 -#: builtin/config.c

6272 -msgid "open an editor"

6273 -msgstr "開啟一個編輯器"

6274 -

6275 -#: builtin/config.c

6276 -msgid "find the color configured: slot [default]"

6277 -msgstr "獲得設定的顏色：設定 [預設值]"

6278 -

6279 -#: builtin/config.c

6280 -msgid "find the color setting: slot [stdout-is-tty]"

6281 -msgstr "獲得顏色設定：設定 [stdout-is-tty]"

6282 -

6292 #: builtin/config.c

6293 msgid "Type"

6294 msgstr "類型"

@@ -6317,8 +6326,8 @@ msgid "value is an expiry date"

6326 msgstr "值是一個到期日期"

6327

6328 #: builtin/config.c

6320 -msgid "Other"

6321 -msgstr "其它"

6329 +msgid "Display options"

6330 +msgstr "顯示選項"

6331

6332 #: builtin/config.c

6333 msgid "terminate values with NUL byte"

@@ -6328,10 +6337,6 @@ msgstr "終止值是 NUL 位元組"

6337 msgid "show variable names only"

6338 msgstr "只顯示變數名"

6339

6331 -#: builtin/config.c

6332 -msgid "respect include directives on lookup"

6333 -msgstr "查詢時引用 include 指令遞迴尋找"

6334 -

6340 #: builtin/config.c

6341 msgid "show origin of config (file, standard input, blob, command line)"

6342 msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或命令列）"

@@ -6343,16 +6348,17 @@ msgstr ""

6348 "令 command)"

6349

6350 #: builtin/config.c

6346 -msgid "value"

6347 -msgstr "取值"

6351 +msgid "show config keys in addition to their values"

6352 +msgstr "除了顯示組態值，額外顯示其鍵名"

6353

6354 #: builtin/config.c

6350 -msgid "with --get, use default value when missing entry"

6351 -msgstr "使用 --get 但未指定參數時所使用的預設值"

6355 +#, c-format

6356 +msgid "unrecognized --type argument, %s"

6357 +msgstr "無法識別的 --type 參數，%s"

6358

6359 #: builtin/config.c

6354 -msgid "human-readable comment string (# will be prepended as needed)"

6355 -msgstr "人類可讀的備註字串（將按需插入 # 至前方）"

6360 +msgid "only one type at a time"

6361 +msgstr "一次只能一個類型"

6362

6363 #: builtin/config.c

6364 #, c-format

@@ -6445,43 +6451,107 @@ msgstr ""

6451 "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"

6452

6453 #: builtin/config.c

6448 -msgid "--get-color and variable type are incoherent"

6449 -msgstr "--get-color 和變數類型不相容"

6454 +msgid "Other"

6455 +msgstr "其它"

6456

6457 #: builtin/config.c

6452 -msgid "only one action at a time"

6453 -msgstr "一次只能有一個動作"

6458 +msgid "respect include directives on lookup"

6459 +msgstr "查詢時引用 include 指令遞迴尋找"

6460

6461 #: builtin/config.c

6456 -msgid "--name-only is only applicable to --list or --get-regexp"

6457 -msgstr "--name-only 僅適用於 --list 或 --get-regexp"

6462 +#, c-format

6463 +msgid "unable to read config file '%s'"

6464 +msgstr "無法讀取設定檔案 '%s'"

6465

6466 #: builtin/config.c

6460 -msgid ""

6461 -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"

6462 -"list"

6463 -msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list"

6467 +msgid "error processing config file(s)"

6468 +msgstr "處理設定檔案發生錯誤"

6469

6470 #: builtin/config.c

6466 -msgid "--default is only applicable to --get"

6467 -msgstr "--default 僅適用於 --get"

6471 +msgid "Filter options"

6472 +msgstr "過濾選項"

6473

6474 #: builtin/config.c

6470 -msgid "--comment is only applicable to add/set/replace operations"

6471 -msgstr "--comment 只能用於加入、設定和取代動作"

6475 +msgid "return all values for multi-valued config options"

6476 +msgstr "回傳有多項值之組態選項的所有值"

6477 +

6478 +#: builtin/config.c

6479 +msgid "interpret the name as a regular expression"

6480 +msgstr "將名稱當作常規表示式解讀"

6481 +

6482 +#: builtin/config.c

6483 +msgid "show config with values matching the pattern"

6484 +msgstr "顯示值符合模式的組態"

6485 +

6486 +#: builtin/config.c

6487 +msgid "use string equality when comparing values to value pattern"

6488 +msgstr "使用字串相等比較值和模式"

6489 +

6490 +#: builtin/config.c

6491 +msgid "URL"

6492 +msgstr "URL"

6493 +

6494 +#: builtin/config.c

6495 +msgid "show config matching the given URL"

6496 +msgstr "顯示符合提供 URL 的組態"

6497 +

6498 +#: builtin/config.c

6499 +msgid "value"

6500 +msgstr "取值"

6501 +

6502 +#: builtin/config.c

6503 +msgid "use default value when missing entry"

6504 +msgstr "未指定參數時所使用的預設值"

6505

6506 #: builtin/config.c

6507 msgid "--fixed-value only applies with 'value-pattern'"

6508 msgstr "--fixed-value 僅套用至 'value-pattern'"

6509

6510 +#: builtin/config.c

6511 +msgid "--default= cannot be used with --all or --url="

6512 +msgstr "--default= 無法和 --all 或 --url= 一起使用"

6513 +

6514 +#: builtin/config.c

6515 +msgid "--url= cannot be used with --all, --regexp or --value"

6516 +msgstr "--url= 無法和 --all、--regexp、--value 一起使用"

6517 +

6518 +#: builtin/config.c

6519 +msgid "Filter"

6520 +msgstr "過濾器"

6521 +

6522 +#: builtin/config.c

6523 +msgid "replace multi-valued config option with new value"

6524 +msgstr "以新值取代有多項值的組態選項"

6525 +

6526 +#: builtin/config.c

6527 +msgid "human-readable comment string (# will be prepended as needed)"

6528 +msgstr "人類可讀的備註字串（將按需插入 # 至前方）"

6529 +

6530 +#: builtin/config.c

6531 +msgid "add a new line without altering any existing values"

6532 +msgstr "在不更動任何現有值的情況下新增一行"

6533 +

6534 +#: builtin/config.c

6535 +msgid "--fixed-value only applies with --value=<pattern>"

6536 +msgstr "--fixed-value 僅套用至 --value=<模式>"

6537 +

6538 +#: builtin/config.c

6539 +msgid "--append cannot be used with --value=<pattern>"

6540 +msgstr "--append 無法和 --value=<模式> 一起使用"

6541 +

6542 #: builtin/config.c

6543 #, c-format

6479 -msgid "unable to read config file '%s'"

6480 -msgstr "無法讀取設定檔案 '%s'"

6544 +msgid ""

6545 +"cannot overwrite multiple values with a single value\n"

6546 +" Use a regexp, --add or --replace-all to change %s."

6547 +msgstr ""

6548 +"無法用一個值覆蓋多個值\n"

6549 +" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"

6550

6551 #: builtin/config.c

6483 -msgid "error processing config file(s)"

6484 -msgstr "處理設定檔案發生錯誤"

6552 +#, c-format

6553 +msgid "no such section: %s"

6554 +msgstr "無此小節：%s"

6555

6556 #: builtin/config.c

6557 msgid "editing stdin is not supported"

@@ -6497,18 +6567,94 @@ msgid "cannot create configuration file %s"

6567 msgstr "不能建立設定檔案 %s"

6568

6569 #: builtin/config.c

6500 -#, c-format

6570 +msgid "Action"

6571 +msgstr "動作"

6572 +

6573 +#: builtin/config.c

6574 +msgid "get value: name [<value-pattern>]"

6575 +msgstr "取得值：name [<value-pattern>]"

6576 +

6577 +#: builtin/config.c

6578 +msgid "get all values: key [<value-pattern>]"

6579 +msgstr "取得所有值：key [<value-pattern>]"

6580 +

6581 +#: builtin/config.c

6582 +msgid "get values for regexp: name-regex [<value-pattern>]"

6583 +msgstr "根據常規表示式取得值：name-regex [<value-pattern>]"

6584 +

6585 +#: builtin/config.c

6586 +msgid "get value specific for the URL: section[.var] URL"

6587 +msgstr "獲得 URL 取值：section[.var] URL"

6588 +

6589 +#: builtin/config.c

6590 +msgid "replace all matching variables: name value [<value-pattern>]"

6591 +msgstr "取代所有符合的變數：name value [<value-pattern>]"

6592 +

6593 +#: builtin/config.c

6594 +msgid "add a new variable: name value"

6595 +msgstr "新增一個新的變數：name value"

6596 +

6597 +#: builtin/config.c

6598 +msgid "remove a variable: name [<value-pattern>]"

6599 +msgstr "移除一個變數：name [<value-pattern>]"

6600 +

6601 +#: builtin/config.c

6602 +msgid "remove all matches: name [<value-pattern>]"

6603 +msgstr "移除所有符合項目：name [<value-pattern>]"

6604 +

6605 +#: builtin/config.c

6606 +msgid "rename section: old-name new-name"

6607 +msgstr "重新命名小節：old-name new-name"

6608 +

6609 +#: builtin/config.c

6610 +msgid "remove a section: name"

6611 +msgstr "刪除一個小節：name"

6612 +

6613 +#: builtin/config.c

6614 +msgid "list all"

6615 +msgstr "全部列出"

6616 +

6617 +#: builtin/config.c

6618 +msgid "open an editor"

6619 +msgstr "開啟一個編輯器"

6620 +

6621 +#: builtin/config.c

6622 +msgid "find the color configured: slot [<default>]"

6623 +msgstr "獲得設定的顏色：設定 [<預設值>]"

6624 +

6625 +#: builtin/config.c

6626 +msgid "find the color setting: slot [<stdout-is-tty>]"

6627 +msgstr "獲得顏色設定：設定 [<stdout-is-tty>]"

6628 +

6629 +#: builtin/config.c

6630 +msgid "with --get, use default value when missing entry"

6631 +msgstr "使用 --get 但未指定參數時所使用的預設值"

6632 +

6633 +#: builtin/config.c

6634 +msgid "--get-color and variable type are incoherent"

6635 +msgstr "--get-color 和變數類型不相容"

6636 +

6637 +#: builtin/config.c

6638 +msgid "no action specified"

6639 +msgstr "未指定動作"

6640 +

6641 +#: builtin/config.c

6642 +msgid "--name-only is only applicable to --list or --get-regexp"

6643 +msgstr "--name-only 僅適用於 --list 或 --get-regexp"

6644 +

6645 +#: builtin/config.c

6646 msgid ""

6502 -"cannot overwrite multiple values with a single value\n"

6503 -" Use a regexp, --add or --replace-all to change %s."

6504 -msgstr ""

6505 -"無法用一個值覆蓋多個值\n"

6506 -" 使用一個常規表示式、--add 或 --replace-all 來修改 %s。"

6647 +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"

6648 +"list"

6649 +msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list"

6650

6651 #: builtin/config.c

6509 -#, c-format

6510 -msgid "no such section: %s"

6511 -msgstr "無此小節：%s"

6652 +msgid "--default is only applicable to --get"

6653 +msgstr "--default 僅適用於 --get"

6654 +

6655 +#: builtin/config.c

6656 +msgid "--comment is only applicable to add/set/replace operations"

6657 +msgstr "--comment 只能用於加入、設定和取代動作"

6658

6659 #: builtin/count-objects.c

6660 msgid "print sizes in human readable format"

@@ -6694,11 +6840,11 @@ msgstr "標記"

6840

6841 #: builtin/describe.c

6842 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

6697 -msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）"

6843 +msgstr "對於髒工作區，追加 <標記>（預設值：」-dirty\"）"

6844

6845 #: builtin/describe.c

6846 msgid "append <mark> on broken working tree (default: \"-broken\")"

6701 -msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）"

6847 +msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"）"

6848

6849 #: builtin/describe.c

6850 msgid "No names found, cannot describe anything."

@@ -7363,7 +7509,7 @@ msgstr "在所有更新分支上檢查強制更新"

7509

7510 #: builtin/fetch.c

7511 msgid "write the commit-graph after fetching"

7366 -msgstr "抓取後寫入分支圖"

7512 +msgstr "抓取後寫入提交圖"

7513

7514 #: builtin/fetch.c

7515 msgid "accept refspecs from stdin"

@@ -7538,6 +7684,10 @@ msgstr "config"

7684 msgid "config key storing a list of repository paths"

7685 msgstr "儲存版本庫路徑清單的設定鍵"

7686

7687 +#: builtin/for-each-repo.c

7688 +msgid "keep going even if command fails in a repository"

7689 +msgstr "命令在版本庫中失敗時仍繼續執行"

7690 +

7691 #: builtin/for-each-repo.c

7692 msgid "missing --config=<config>"

7693 msgstr "缺少 --config=<設定>"

@@ -7753,12 +7903,12 @@ msgstr "%s：%s 的 resolve-undo 中的 sha1 指標無效"

7903 #: builtin/fsck.c

7904 #, c-format

7905 msgid "unable to load rev-index for pack '%s'"

7756 -msgstr "無法讀取 “%s” 封裝的修訂版索引 (rev-index)"

7906 +msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)"

7907

7908 #: builtin/fsck.c

7909 #, c-format

7910 msgid "invalid rev-index for pack '%s'"

7761 -msgstr "“%s” 封裝的修訂版索引 (rev-index) 無效"

7911 +msgstr "「%s」封裝的修訂版索引 (rev-index) 無效"

7912

7913 #: builtin/fsck.c

7914 msgid ""

@@ -8065,7 +8215,7 @@ msgstr "無法識別的 --schedule 引數 '%s'"

8215

8216 #: builtin/gc.c

8217 msgid "failed to write commit-graph"

8068 -msgstr "無法寫入提交圖形"

8218 +msgstr "無法寫入提交圖"

8219

8220 #: builtin/gc.c

8221 msgid "failed to prefetch remotes"

@@ -8192,7 +8342,7 @@ msgstr "無法啟動 schtasks"

8342

8343 #: builtin/gc.c

8344 msgid "failed to run 'crontab -l'; your system might not support 'cron'"

8195 -msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"

8345 +msgstr "無法執行「crontab -l」；您的系統可能不支援「cron」"

8346

8347 #: builtin/gc.c

8348 msgid "failed to create crontab temporary file"

@@ -8204,11 +8354,11 @@ msgstr "無法開啟暫存檔"

8354

8355 #: builtin/gc.c

8356 msgid "failed to run 'crontab'; your system might not support 'cron'"

8207 -msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"

8357 +msgstr "無法執行「crontab」；您的系統可能不支援「cron」"

8358

8359 #: builtin/gc.c

8360 msgid "'crontab' died"

8211 -msgstr "“crontab” 結束運作"

8361 +msgstr "「crontab」結束運作"

8362

8363 #: builtin/gc.c builtin/worktree.c

8364 #, c-format

@@ -9135,7 +9285,7 @@ msgstr "--only-trailers --only-input --unfold 的別名"

9285

9286 #: builtin/interpret-trailers.c

9287 msgid "do not treat \"---\" as the end of input"

9138 -msgstr "不要把 “---” 當作輸入結尾"

9288 +msgstr "不要把「---」當作輸入結尾"

9289

9290 #: builtin/interpret-trailers.c

9291 msgid "trailer(s) to add"

@@ -9250,7 +9400,7 @@ msgstr "不是一個範圍"

9400 #: builtin/log.c

9401 #, c-format

9402 msgid "unable to read branch description file '%s'"

9253 -msgstr "無法讀取分支描述檔 “%s”"

9403 +msgstr "無法讀取分支描述檔「%s」"

9404

9405 #: builtin/log.c

9406 msgid "cover letter needs email format"

@@ -9367,8 +9517,12 @@ msgid "max length of output filename"

9517 msgstr "輸出檔名的最大長度"

9518

9519 #: builtin/log.c

9370 -msgid "use [RFC PATCH] instead of [PATCH]"

9371 -msgstr "使用 [RFC PATCH] 代替 [PATCH]"

9520 +msgid "rfc"

9521 +msgstr "rfc"

9522 +

9523 +#: builtin/log.c

9524 +msgid "add <rfc> (default 'RFC') before 'PATCH'"

9525 +msgstr "在「PATCH」前冠上 <rfc>（預設為「RFC」）"

9526

9527 #: builtin/log.c

9528 msgid "cover-from-description-mode"

@@ -9711,11 +9865,11 @@ msgstr ""

9865

9866 #: builtin/ls-remote.c

9867 msgid ""

9714 -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9868 +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"

9869 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9870 " [--symref] [<repository> [<patterns>...]]"

9871 msgstr ""

9718 -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"

9872 +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"

9873 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"

9874 " [--symref] [<repository> [<patterns>...]]"

9875

@@ -9736,9 +9890,13 @@ msgid "limit to tags"

9890 msgstr "僅限於標籤"

9891

9892 #: builtin/ls-remote.c

9739 -msgid "limit to heads"

9893 +msgid "limit to branches"

9894 msgstr "僅限於分支"

9895

9896 +#: builtin/ls-remote.c builtin/show-ref.c

9897 +msgid "deprecated synonym for --branches"

9898 +msgstr "--branches 已棄用的同義詞"

9899 +

9900 #: builtin/ls-remote.c

9901 msgid "do not show peeled tags"

9902 msgstr "不顯示已解析的標籤"

@@ -9963,7 +10121,7 @@ msgstr "為檔案1/初始檔案/檔案2 設定標籤"

10121 #: builtin/merge-file.c

10122 #, c-format

10123 msgid "object '%s' does not exist"

9966 -msgstr "物件 “%s” 不存在"

10124 +msgstr "物件「%s」不存在"

10125

10126 #: builtin/merge-file.c

10127 msgid "Could not write object file"

@@ -11215,7 +11373,7 @@ msgstr "不一致的差異計數"

11373 #: builtin/pack-objects.c

11374 #, c-format

11375 msgid "invalid pack.allowPackReuse value: '%s'"

11218 -msgstr "無效的 pack.allowPackReuse 值：“%s”"

11376 +msgstr "無效的 pack.allowPackReuse 值：「%s」"

11377

11378 #: builtin/pack-objects.c

11379 #, c-format

@@ -11223,8 +11381,8 @@ msgid ""

11381 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"

11382 "hash> <uri>' (got '%s')"

11383 msgstr ""

11226 -"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> <uri>' "

11227 -"(收到 '%s')"

11384 +"uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> "

11385 +"<uri>' (收到 '%s')"

11386

11387 #: builtin/pack-objects.c

11388 #, c-format

@@ -11860,7 +12018,7 @@ msgid ""

12018 "To choose either option permanently, see push.default in 'git help config'.\n"

12019 msgstr ""

12020 "\n"

11863 -"若要永久選擇某個選項，請參閱 “git help config” 中的 push.default。\n"

12021 +"若要永久選擇某個選項，請參閱「git help config」中的 push.default。\n"

12022

12023 #: builtin/push.c

12024 msgid ""

@@ -11871,8 +12029,8 @@ msgid ""

12029 msgstr ""

12030 "\n"

12031 "若要避免在名稱與本機分支不同時自動設定上游分支，\n"

11874 -"請參閱 “git help config” 中 branch.autoSetupMerge 的\n"

11875 -"“simple” 選項。\n"

12032 +"請參閱「git help config」中 branch.autoSetupMerge 的\n"

12033 +"「simple」選項。\n"

12034

12035 #: builtin/push.c

12036 #, c-format

@@ -11919,8 +12077,8 @@ msgid ""

12077 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"

12078 msgstr ""

12079 "\n"

11922 -"若要使沒有追蹤上游的分支自動配置，請參閱 “git help config” 中的\n"

11923 -"“push.autoSetupRemote”。\n"

12080 +"若要使沒有追蹤上游的分支自動配置，請參閱「git help config」中的\n"

12081 +"「push.autoSetupRemote」。\n"

12082

12083 #: builtin/push.c

12084 #, c-format

@@ -11965,8 +12123,8 @@ msgid ""

12123 "See the 'Note about fast-forwards' in 'git push --help' for details."

12124 msgstr ""

12125 "更新被拒絕，因為您目前分支的最新提交落後於其對應的遠端分支。\n"

11968 -"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"

11969 -"“git push --help” 中的〈Note about fast-forwards〉小節。"

12126 +"如果您想要整合遠端更動，請在再次推送前使用「git pull」。詳見\n"

12127 +"「git push --help」中的〈Note about fast-forwards〉小節。"

12128

12129 #: builtin/push.c

12130 msgid ""

@@ -11976,8 +12134,8 @@ msgid ""

12134 "See the 'Note about fast-forwards' in 'git push --help' for details."

12135 msgstr ""

12136 "更新被拒絕，因為推送的某分支的最新提交落後於其對應的遠端分支。\n"

11979 -"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。詳見\n"

11980 -"“git push --help” 中的〈Note about fast-forwards〉小節。"

12137 +"如果您想要整合遠端更動，請在再次推送前使用「git pull」。詳見\n"

12138 +"「git push --help」中的〈Note about fast-forwards〉小節。"

12139

12140 #: builtin/push.c

12141 msgid ""

@@ -11989,7 +12147,7 @@ msgid ""

12147 msgstr ""

12148 "更新被拒絕，因為遠端包含您本機沒有的提交。這通常是因為\n"

12149 "另一個版本庫有推送更動到同個引用。如果您想要整合遠端更動，\n"

11992 -"請在再次推送前使用 “git pull”。詳見 “git push --help” 中的\n"

12150 +"請在再次推送前使用「git pull」。詳見「git push --help」中的\n"

12151 "〈Note about fast-forwards〉小節。"

12152

12153 #: builtin/push.c

@@ -12013,8 +12171,8 @@ msgid ""

12171 "See the 'Note about fast-forwards' in 'git push --help' for details."

12172 msgstr ""

12173 "更新被拒絕，因為遠端追蹤分支的最新提交自上次簽出後有改變。\n"

12016 -"如果您想要整合遠端更動，請在再次推送前使用 “git pull”。\n"

12017 -"詳見 “git push --help” 中的〈Note about fast-forwards〉小節。"

12174 +"如果您想要整合遠端更動，請在再次推送前使用「git pull」。\n"

12175 +"詳見「git push --help」中的〈Note about fast-forwards〉小節。"

12176

12177 #: builtin/push.c

12178 #, c-format

@@ -12607,8 +12765,8 @@ msgid ""

12765 "which is no longer supported; use 'merges' instead"

12766 msgstr ""

12767 "--preserve-merges 已被 --rebase-merges 取代\n"

12610 -"註：您的 `pull.rebase` 設定可能也被設定為不受支援的 “preserve”；\n"

12611 -"請改用 “merges”"

12768 +"註：您的 `pull.rebase` 設定可能也被設定為不受支援的「preserve」；\n"

12769 +"請改用「merges」"

12770

12771 #: builtin/rebase.c

12772 msgid "no rebase in progress"

@@ -12928,6 +13086,27 @@ msgstr "未指定要刪除的引用日誌"

13086 msgid "invalid ref format: %s"

13087 msgstr "無效的引用格式：%s"

13088

13089 +#: builtin/refs.c

13090 +msgid "git refs migrate --ref-format=<format> [--dry-run]"

13091 +msgstr "git refs migrate --ref-format=<格式> [--dry-run]"

13092 +

13093 +#: builtin/refs.c

13094 +msgid "specify the reference format to convert to"

13095 +msgstr "指定要轉換成的引用格式"

13096 +

13097 +#: builtin/refs.c

13098 +msgid "perform a non-destructive dry-run"

13099 +msgstr "進行非破壞性的試執行"

13100 +

13101 +#: builtin/refs.c

13102 +msgid "missing --ref-format=<format>"

13103 +msgstr "缺少 --ref-format=<格式>"

13104 +

13105 +#: builtin/refs.c

13106 +#, c-format

13107 +msgid "repository already uses '%s' format"

13108 +msgstr "版本庫已經使用 '%s' 格式"

13109 +

13110 #: builtin/remote.c

13111 msgid ""

13112 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"

@@ -13273,10 +13452,6 @@ msgstr "* 遠端 %s"

13452 msgid " Fetch URL: %s"

13453 msgstr " 取得位址：%s"

13454

13276 -#: builtin/remote.c

13277 -msgid "(no URL)"

13278 -msgstr "(無 URL)"

13279 -

13455 #. TRANSLATORS: the colon ':' should align

13456 #. with the one in " Fetch URL: %s"

13457 #. translation.

@@ -13286,6 +13461,10 @@ msgstr "(無 URL)"

13461 msgid " Push URL: %s"

13462 msgstr " 推送位址：%s"

13463

13464 +#: builtin/remote.c

13465 +msgid "(no URL)"

13466 +msgstr "(無 URL)"

13467 +

13468 #: builtin/remote.c

13469 #, c-format

13470 msgid " HEAD branch: %s"

@@ -13420,11 +13599,6 @@ msgstr "查詢推送 URL 位址，而非取得 URL 位址"

13599 msgid "return all URLs"

13600 msgstr "返回所有 URL 位址"

13601

13423 -#: builtin/remote.c

13424 -#, c-format

13425 -msgid "no URLs configured for remote '%s'"

13426 -msgstr "沒有給遠端版本庫 '%s' 設定 URL"

13427 -

13602 #: builtin/remote.c

13603 msgid "manipulate push URLs"

13604 msgstr "動作推送 URLS"

@@ -13632,7 +13806,7 @@ msgstr "不能刪除珍品版本庫中的封包"

13806 #: builtin/repack.c

13807 #, c-format

13808 msgid "option '%s' can only be used along with '%s'"

13635 -msgstr "“%s” 選項只能與 “%s” 一起使用"

13809 +msgstr "「%s」選項只能與「%s」一起使用"

13810

13811 #: builtin/repack.c

13812 msgid "Nothing new to pack."

@@ -13646,7 +13820,7 @@ msgstr "無法將包重新命名為「%s」"

13820 #: builtin/repack.c

13821 #, c-format

13822 msgid "pack-objects did not write a '%s' file for pack %s-%s"

13649 -msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入 “%1$s” 檔案"

13823 +msgstr "pack-objects 沒有為 %2$s-%3$s 套件包寫入「%1$s」檔案"

13824

13825 #: builtin/repack.c sequencer.c

13826 #, c-format

@@ -13955,7 +14129,7 @@ msgstr "必須傳入 --onto 或 --advance 選項"

14129 msgid ""

14130 "some rev walking options will be overridden as '%s' bit in 'struct rev_info' "

14131 "will be forced"

13958 -msgstr "將覆寫部分修訂版遍歷選項，強制使用 “struct rev_info” 的 “%s” 位元"

14132 +msgstr "將覆寫部分修訂版遍歷選項，強制使用「struct rev_info」的「%s」位元"

14133

14134 #: builtin/replay.c

14135 msgid "error preparing revisions"

@@ -14345,7 +14519,7 @@ msgstr "已棄用：請改用 --empty=keep"

14519

14520 #: builtin/revert.c

14521 msgid "use the 'reference' format to refer to commits"

14348 -msgstr "請使用 “reference” 格式參考提交"

14522 +msgstr "請使用「reference」格式參考提交"

14523

14524 #: builtin/revert.c

14525 msgid "revert failed"

@@ -14669,12 +14843,12 @@ msgstr "未知的雜湊算法"

14843 #: builtin/show-ref.c

14844 msgid ""

14845 "git show-ref [--head] [-d | --dereference]\n"

14672 -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14673 -" [--heads] [--] [<pattern>...]"

14846 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"

14847 +" [--] [<pattern>...]"

14848 msgstr ""

14849 "git show-ref [--head] [-d | --dereference]\n"

14676 -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14677 -" [--heads] [--] [<pattern>...]"

14850 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"

14851 +" [--] [<pattern>...]"

14852

14853 #: builtin/show-ref.c

14854 msgid ""

@@ -14703,12 +14877,12 @@ msgid "failed to look up reference"

14877 msgstr "無法查詢引用"

14878

14879 #: builtin/show-ref.c

14706 -msgid "only show tags (can be combined with heads)"

14707 -msgstr "只顯示標籤（可以和頭共用）"

14880 +msgid "only show tags (can be combined with branches)"

14881 +msgstr "只顯示標籤（可以和分支共用）"

14882

14883 #: builtin/show-ref.c

14710 -msgid "only show heads (can be combined with tags)"

14711 -msgstr "只顯示頭（可以和標籤共用）"

14884 +msgid "only show branches (can be combined with tags)"

14885 +msgstr "只顯示分支（可以和標籤共用）"

14886

14887 #: builtin/show-ref.c

14888 msgid "check for reference existence without resolving"

@@ -15440,7 +15614,7 @@ msgstr ""

15614 #: builtin/submodule--helper.c

15615 #, c-format

15616 msgid "could not get a repository handle for gitdir '%s'"

15443 -msgstr "無法取得 gitdir “%s” 的版本庫控點"

15617 +msgstr "無法取得 gitdir「%s」的版本庫控點"

15618

15619 #: builtin/submodule--helper.c

15620 #, c-format

@@ -15457,20 +15631,20 @@ msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"

15631 msgid "Value '%s' for submodule.alternateLocation is not recognized"

15632 msgstr "不能識別 submodule.alternateLocation 的取值 '%s'"

15633

15460 -#: builtin/submodule--helper.c

15634 +#: builtin/submodule--helper.c submodule.c

15635 #, c-format

15636 msgid "refusing to create/use '%s' in another submodule's git dir"

15637 msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」"

15638

15639 #: builtin/submodule--helper.c

15640 #, c-format

15467 -msgid "clone of '%s' into submodule path '%s' failed"

15468 -msgstr "無法複製 '%s' 到子模組路徑 '%s'"

15641 +msgid "directory not empty: '%s'"

15642 +msgstr "目錄不是空的：「%s」"

15643

15644 #: builtin/submodule--helper.c

15645 #, c-format

15472 -msgid "directory not empty: '%s'"

15473 -msgstr "目錄不是空的：「%s」"

15646 +msgid "clone of '%s' into submodule path '%s' failed"

15647 +msgstr "無法複製 '%s' 到子模組路徑 '%s'"

15648

15649 #: builtin/submodule--helper.c

15650 #, c-format

@@ -15542,7 +15716,7 @@ msgstr "略過子模組 '%s'"

15716 #: builtin/submodule--helper.c

15717 #, c-format

15718 msgid "cannot clone submodule '%s' without a URL"

15545 -msgstr "無法在沒有網址的情況下複製 “%s” 子模組"

15719 +msgstr "無法在沒有網址的情況下複製「%s」子模組"

15720

15721 #: builtin/submodule--helper.c

15722 #, c-format

@@ -15660,15 +15834,15 @@ msgstr "不從遠端站台取得新物件"

15834

15835 #: builtin/submodule--helper.c

15836 msgid "use the 'checkout' update strategy (default)"

15663 -msgstr "使用 “checkout” 更新策略（預設值）"

15837 +msgstr "使用「checkout」更新策略（預設值）"

15838

15839 #: builtin/submodule--helper.c

15840 msgid "use the 'merge' update strategy"

15667 -msgstr "使用 “merge” 更新策略"

15841 +msgstr "使用「merge」更新策略"

15842

15843 #: builtin/submodule--helper.c

15844 msgid "use the 'rebase' update strategy"

15671 -msgstr "使用 “rebase” 更新策略"

15845 +msgstr "使用「rebase」更新策略"

15846

15847 #: builtin/submodule--helper.c

15848 msgid "create a shallow clone truncated to the specified number of revisions"

@@ -15911,9 +16085,11 @@ msgstr "更新的原因"

16085 #: builtin/tag.c

16086 msgid ""

16087 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"

16088 +" [(--trailer <token>[(=|:)<value>])...]\n"

16089 " <tagname> [<commit> | <object>]"

16090 msgstr ""

16091 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"

16092 +" [(--trailer <token>[(=|:)<value>])...]\n"

16093 " <tagname> [<commit> | <object>]"

16094

16095 #: builtin/tag.c

@@ -16081,7 +16257,7 @@ msgstr "只列印指向該物件的標籤"

16257

16258 #: builtin/tag.c

16259 msgid "could not start 'git column'"

16084 -msgstr "無法啟動 “git column”"

16260 +msgstr "無法啟動「git column」"

16261

16262 #: builtin/tag.c

16263 #, c-format

@@ -16511,7 +16687,7 @@ msgstr "git worktree unlock <worktree>"

16687

16688 #: builtin/worktree.c

16689 msgid "No possible source branch, inferring '--orphan'"

16514 -msgstr "沒有可能的來源分支，推測為 “--orphan”"

16690 +msgstr "沒有可能的來源分支，推測為「--orphan」"

16691

16692 #: builtin/worktree.c

16693 #, c-format

@@ -16646,8 +16822,8 @@ msgid ""

16822 "HEAD contents: '%s'"

16823 msgstr ""

16824 "HEAD 指向無效（或孤立）引用。\n"

16649 -"HEAD 路徑：“%s”\n"

16650 -"HEAD 內容：“%s”"

16825 +"HEAD 路徑：「%s」\n"

16826 +"HEAD 內容：「%s」"

16827

16828 #: builtin/worktree.c

16829 msgid ""

@@ -16655,7 +16831,7 @@ msgid ""

16831 "present, stopping; use 'add -f' to override or fetch a remote first"

16832 msgstr ""

16833 "即使有提供一個遠端，卻不存在本機或遠端引用，\n"

16658 -"故停止。使用 “add -f” 先覆蓋或抓取遠端"

16834 +"故停止。使用「add -f」先覆蓋或抓取遠端"

16835

16836 #: builtin/worktree.c

16837 msgid "checkout <branch> even if already checked out in other worktree"

@@ -16866,12 +17042,12 @@ msgstr "core.fsyncMethod = batch 不支援本平台"

17042 #: bundle-uri.c

17043 #, c-format

17044 msgid "could not parse bundle list key %s with value '%s'"

16869 -msgstr "無法解析套件包清單鍵 %s 的值 “%s”"

17045 +msgstr "無法解析套件包清單鍵 %s 的值「%s」"

17046

17047 #: bundle-uri.c

17048 #, c-format

17049 msgid "bundle list at '%s' has no mode"

16874 -msgstr "位於 “%s” 的套件包清單沒有模式"

17050 +msgstr "位於「%s」的套件包清單沒有模式"

17051

17052 #: bundle-uri.c

17053 msgid "failed to create temporary file"

@@ -16884,7 +17060,7 @@ msgstr "功能不足"

17060 #: bundle-uri.c

17061 #, c-format

17062 msgid "file downloaded from '%s' is not a bundle"

16887 -msgstr "從 “%s” 下載的檔案不是套件包"

17063 +msgstr "從「%s」下載的檔案不是套件包"

17064

17065 #: bundle-uri.c

17066 msgid "failed to store maximum creation token"

@@ -16893,7 +17069,7 @@ msgstr "無法儲存最大的建立權杖"

17069 #: bundle-uri.c

17070 #, c-format

17071 msgid "unrecognized bundle mode from URI '%s'"

16896 -msgstr "無法識別從 URI “%s” 取回的套件包模式"

17072 +msgstr "無法識別從 URI「%s」取回的套件包模式"

17073

17074 #: bundle-uri.c

17075 #, c-format

@@ -16903,17 +17079,17 @@ msgstr "超出套件包 URI 遞迴限制 (%d)"

17079 #: bundle-uri.c

17080 #, c-format

17081 msgid "failed to download bundle from URI '%s'"

16906 -msgstr "無法從 “%s” URI 下載套件包"

17082 +msgstr "無法從「%s」URI 下載套件包"

17083

17084 #: bundle-uri.c

17085 #, c-format

17086 msgid "file at URI '%s' is not a bundle or bundle list"

16911 -msgstr "位於 URI “%s” 的檔案不是套件包或套件包清單"

17087 +msgstr "位於 URI「%s」的檔案不是套件包或套件包清單"

17088

17089 #: bundle-uri.c

17090 #, c-format

17091 msgid "bundle-uri: unexpected argument: '%s'"

16916 -msgstr "bundle-uri: 非預期的引數：“%s”"

17092 +msgstr "bundle-uri: 非預期的引數：「%s」"

17093

17094 #: bundle-uri.c

17095 msgid "bundle-uri: expected flush after arguments"

@@ -16925,7 +17101,7 @@ msgstr "bundle-uri: 收到空白列"

17101

17102 #: bundle-uri.c

17103 msgid "bundle-uri: line is not of the form 'key=value'"

16928 -msgstr "bundle-uri: 列的格式不是 “key=value”"

17104 +msgstr "bundle-uri: 列的格式不是「key=value」"

17105

17106 #: bundle-uri.c

17107 msgid "bundle-uri: line has empty key or value"

@@ -16944,7 +17120,7 @@ msgstr "未知功能「%s」"

17120 #: bundle.c

17121 #, c-format

17122 msgid "'%s' does not look like a v2 or v3 bundle file"

16947 -msgstr "“%s” 不像是一個 v2 或 v3 版本的套件包檔案"

17123 +msgstr "「%s」不像是一個 v2 或 v3 版本的套件包檔案"

17124

17125 #: bundle.c

17126 #, c-format

@@ -16955,10 +17131,6 @@ msgstr "無法識別的標頭：%s%s (%d)"

17131 msgid "Repository lacks these prerequisite commits:"

17132 msgstr "版本庫中缺少這些必備的提交："

17133

16958 -#: bundle.c

16959 -msgid "need a repository to verify a bundle"

16960 -msgstr "需要版本庫驗證套件包"

16961 -

17134 #: bundle.c

17135 msgid ""

17136 "some prerequisite commits exist in the object store, but are not connected "

@@ -17477,6 +17649,10 @@ msgstr "接收推送到版本庫中的物件"

17649 msgid "Manage reflog information"

17650 msgstr "管理 reflog 訊息"

17651

17652 +#: command-list.h

17653 +msgid "Low-level access to refs"

17654 +msgstr "對引用的低階存取"

17655 +

17656 #: command-list.h

17657 msgid "Manage set of tracked repositories"

17658 msgstr "管理已追蹤版本庫"

@@ -17572,7 +17748,7 @@ msgstr "將工作區限縮至只包含追蹤檔案的子集"

17748

17749 #: command-list.h

17750 msgid "Add file contents to the staging area"

17575 -msgstr "將檔案內容新增到索引"

17751 +msgstr "將檔案內容新增到暫存區"

17752

17753 #: command-list.h

17754 msgid "Stash the changes in a dirty working directory away"

@@ -17720,7 +17896,7 @@ msgstr "Git 封包格式"

17896

17897 #: command-list.h

17898 msgid "Git cryptographic signature formats"

17723 -msgstr "Git 密碼編譯簽章格式"

17899 +msgstr "Git 數位簽章格式"

17900

17901 #: command-list.h

17902 msgid "A Git Glossary"

@@ -17808,104 +17984,111 @@ msgstr "用來管理大型 Git 版本庫的工具"

17984

17985 #: commit-graph.c

17986 msgid "commit-graph file is too small"

17811 -msgstr "提交圖形檔案太小"

17987 +msgstr "提交圖檔案太小"

17988

17989 #: commit-graph.c

17990 msgid "commit-graph oid fanout chunk is wrong size"

17815 -msgstr "提交圖形 OID 扇出區塊大小有誤"

17991 +msgstr "提交圖 OID 扇出區塊大小有誤"

17992

17993 #: commit-graph.c

17994 msgid "commit-graph fanout values out of order"

17819 -msgstr "提交圖形扇出的數值失序"

17995 +msgstr "提交圖扇出的數值失序"

17996

17997 #: commit-graph.c

17998 msgid "commit-graph OID lookup chunk is the wrong size"

17823 -msgstr "提交圖形 OID 查詢區塊的大小有誤"

17999 +msgstr "提交圖 OID 查詢區塊的大小有誤"

18000

18001 #: commit-graph.c

18002 msgid "commit-graph commit data chunk is wrong size"

17827 -msgstr "提交圖形的提交資料區塊大小有誤"

18003 +msgstr "提交圖的提交資料區塊大小有誤"

18004

18005 #: commit-graph.c

18006 msgid "commit-graph generations chunk is wrong size"

17831 -msgstr "提交圖形的世代區塊大小有誤"

18007 +msgstr "提交圖的世代區塊大小有誤"

18008

18009 #: commit-graph.c

18010 msgid "commit-graph changed-path index chunk is too small"

17835 -msgstr "提交圖形的更動路徑索引區塊過小"

18011 +msgstr "提交圖的更動路徑索引區塊過小"

18012

18013 #: commit-graph.c

18014 #, c-format

18015 msgid ""

18016 "ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"

18017 "graph file"

17842 -msgstr "忽略提交圖形檔案中過小的更動路徑區塊 (%<PRIuMAX> < %<PRIuMAX>)"

18018 +msgstr "忽略提交圖檔案中過小的更動路徑區塊（%<PRIuMAX> < %<PRIuMAX>）"

18019

18020 #: commit-graph.c

18021 #, c-format

18022 msgid "commit-graph signature %X does not match signature %X"

17847 -msgstr "提交圖形簽名 %X 和簽名 %X 不符合"

18023 +msgstr "提交圖簽章 %X 和簽章 %X 不符"

18024

18025 #: commit-graph.c

18026 #, c-format

18027 msgid "commit-graph version %X does not match version %X"

17852 -msgstr "提交圖形版本 %X 和版本 %X 不符合"

18028 +msgstr "提交圖版本 %X 和版本 %X 不符"

18029

18030 #: commit-graph.c

18031 #, c-format

18032 msgid "commit-graph hash version %X does not match version %X"

17857 -msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"

18033 +msgstr "提交圖雜湊版本 %X 和版本 %X 不符"

18034

18035 #: commit-graph.c

18036 #, c-format

18037 msgid "commit-graph file is too small to hold %u chunks"

17862 -msgstr "提交圖形檔案不夠放置 %u 個區塊"

18038 +msgstr "提交圖檔案不夠放置 %u 個區塊"

18039

18040 #: commit-graph.c

18041 msgid "commit-graph required OID fanout chunk missing or corrupted"

17866 -msgstr "提交圖形需要的 OID 扇出區塊遺失或損壞"

18042 +msgstr "提交圖需要的 OID 扇出區塊遺失或損壞"

18043

18044 #: commit-graph.c

18045 msgid "commit-graph required OID lookup chunk missing or corrupted"

17870 -msgstr "提交圖形需要的 OID 查詢區塊遺失或損壞"

18046 +msgstr "提交圖需要的 OID 查詢區塊遺失或損壞"

18047

18048 #: commit-graph.c

18049 msgid "commit-graph required commit data chunk missing or corrupted"

17874 -msgstr "提交圖形需要的提交資料區塊遺失或損壞"

18050 +msgstr "提交圖需要的提交資料區塊遺失或損壞"

18051 +

18052 +#: commit-graph.c

18053 +#, c-format

18054 +msgid ""

18055 +"disabling Bloom filters for commit-graph layer '%s' due to incompatible "

18056 +"settings"

18057 +msgstr "由於不相容的設定，停用提交圖層 '%s' 的布隆過濾器"

18058

18059 #: commit-graph.c

18060 msgid "commit-graph has no base graphs chunk"

17878 -msgstr "提交圖形沒有基礎圖形區塊"

18061 +msgstr "提交圖沒有基礎圖區塊"

18062

18063 #: commit-graph.c

18064 msgid "commit-graph base graphs chunk is too small"

17882 -msgstr "提交圖形的基礎圖形區塊過小"

18065 +msgstr "提交圖的基礎圖區塊過小"

18066

18067 #: commit-graph.c

18068 msgid "commit-graph chain does not match"

17886 -msgstr "提交圖形鏈不符合"

18069 +msgstr "提交圖鏈不符"

18070

18071 #: commit-graph.c

18072 #, c-format

18073 msgid "commit count in base graph too high: %<PRIuMAX>"

17891 -msgstr "基礎圖 (base graph) 中的提交數過多：%<PRIuMAX>"

18074 +msgstr "基礎圖中的提交數過多：%<PRIuMAX>"

18075

18076 #: commit-graph.c

18077 msgid "commit-graph chain file too small"

17895 -msgstr "提交圖形鏈檔案過小"

18078 +msgstr "提交圖鏈檔案過小"

18079

18080 #: commit-graph.c

18081 #, c-format

18082 msgid "invalid commit-graph chain: line '%s' not a hash"

17900 -msgstr "無效的提交圖形鏈：「%s」列不是雜湊值"

18083 +msgstr "無效的提交圖鏈：「%s」列不是雜湊值"

18084

18085 #: commit-graph.c

18086 msgid "unable to find all commit-graph files"

17904 -msgstr "無法找到所有提交圖形檔案"

18087 +msgstr "無法找到所有提交圖檔案"

18088

18089 #: commit-graph.c

18090 msgid "invalid commit position. commit-graph is likely corrupt"

17908 -msgstr "無效的提交位置。提交圖形可能已損壞"

18091 +msgstr "無效的提交位置。提交圖可能已損壞"

18092

18093 #: commit-graph.c

18094 #, c-format

@@ -17914,15 +18097,15 @@ msgstr "無法找到提交 %s"

18097

18098 #: commit-graph.c

18099 msgid "commit-graph requires overflow generation data but has none"

17917 -msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"

18100 +msgstr "缺少提交圖需要的溢位世代資料"

18101

18102 #: commit-graph.c

18103 msgid "commit-graph overflow generation data is too small"

17921 -msgstr "提交圖形的溢出世代資料過小"

18104 +msgstr "提交圖的溢位世代資料過小"

18105

18106 #: commit-graph.c

18107 msgid "commit-graph extra-edges pointer out of bounds"

17925 -msgstr "提交圖形的延伸邊界指針超出範圍"

18108 +msgstr "提交圖額外的邊指標超出範圍"

18109

18110 #: commit-graph.c

18111 msgid "Loading known commits in commit graph"

@@ -17930,7 +18113,7 @@ msgstr "正在載入提交圖中的已知提交"

18113

18114 #: commit-graph.c

18115 msgid "Expanding reachable commits in commit graph"

17933 -msgstr "正在展開提交圖中的可以取得的提交"

18116 +msgstr "正在展開提交圖中的可觸及提交"

18117

18118 #: commit-graph.c

18119 msgid "Clearing commit marks in commit graph"

@@ -17938,11 +18121,11 @@ msgstr "正在清除提交圖中的提交標記"

18121

18122 #: commit-graph.c

18123 msgid "Computing commit graph topological levels"

17941 -msgstr "正在計算提交圖拓樸級別"

18124 +msgstr "正在計算提交圖的拓樸層級"

18125

18126 #: commit-graph.c

18127 msgid "Computing commit graph generation numbers"

17945 -msgstr "正在計算提交圖世代數字"

18128 +msgstr "正在計算提交圖的世代數"

18129

18130 #: commit-graph.c

18131 msgid "Computing commit changed paths Bloom filters"

@@ -17970,7 +18153,7 @@ msgstr "為 %s 開啟索引發生錯誤"

18153

18154 #: commit-graph.c

18155 msgid "Finding commits for commit graph among packed objects"

17973 -msgstr "正在打包物件中尋找提交圖的提交"

18156 +msgstr "正在從打包物件中尋找提交圖的提交"

18157

18158 #: commit-graph.c

18159 msgid "Finding extra edges in commit graph"

@@ -17978,11 +18161,11 @@ msgstr "正在尋找提交圖中額外的邊"

18161

18162 #: commit-graph.c

18163 msgid "failed to write correct number of base graph ids"

17981 -msgstr "無法寫入正確數量的基礎圖形 ID"

18164 +msgstr "無法寫入正確數量的基礎圖 ID"

18165

18166 #: commit-graph.c

18167 msgid "unable to create temporary graph layer"

17985 -msgstr "無法建立暫時的圖形層"

18168 +msgstr "無法建立暫時性圖層"

18169

18170 #: commit-graph.c

18171 #, c-format

@@ -17997,25 +18180,25 @@ msgstr[0] "正在用 %d 步寫出提交圖"

18180

18181 #: commit-graph.c

18182 msgid "unable to open commit-graph chain file"

18000 -msgstr "無法開啟提交圖形鏈檔案"

18183 +msgstr "無法開啟提交圖鏈檔案"

18184

18185 #: commit-graph.c

18186 msgid "failed to rename base commit-graph file"

18004 -msgstr "無法重新命名基礎提交圖形檔案"

18187 +msgstr "無法重新命名基礎提交圖檔案"

18188

18189 #: commit-graph.c

18190 msgid "failed to rename temporary commit-graph file"

18008 -msgstr "無法重新命名暫時提交圖形檔案"

18191 +msgstr "無法重新命名暫時性提交圖檔案"

18192

18193 #: commit-graph.c

18194 #, c-format

18195 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"

18013 -msgstr "無法將圖與 %<PRIuMAX>, %<PRIuMAX> 個提交進行合併"

18196 +msgstr "無法合併圖，兩者分別有 %<PRIuMAX>、%<PRIuMAX> 個提交"

18197

18198 #: commit-graph.c

18199 #, c-format

18200 msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"

18018 -msgstr "無法合併 %s 圖，太多提交：%<PRIuMAX>"

18201 +msgstr "無法合併圖 %s，太多提交：%<PRIuMAX>"

18202

18203 #: commit-graph.c

18204 msgid "Scanning merged commits"

@@ -18023,15 +18206,22 @@ msgstr "正在掃描合併提交"

18206

18207 #: commit-graph.c

18208 msgid "Merging commit-graph"

18026 -msgstr "正在合併提交圖形"

18209 +msgstr "正在合併提交圖"

18210

18211 #: commit-graph.c

18212 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

18030 -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"

18213 +msgstr "嘗試寫入提交圖，但「core.commitGraph」已停用"

18214 +

18215 +#: commit-graph.c

18216 +#, c-format

18217 +msgid ""

18218 +"attempting to write a commit-graph, but 'commitGraph."

18219 +"changedPathsVersion' (%d) is not supported"

18220 +msgstr "嘗試寫入提交圖，但不支援「commitGraph.changedPathsVersion」（%d）"

18221

18222 #: commit-graph.c

18223 msgid "too many commits to write graph"

18034 -msgstr "提交太多不能畫圖"

18224 +msgstr "提交過多無法畫圖"

18225

18226 #: commit-graph.c

18227 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

@@ -18040,59 +18230,59 @@ msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

18230 #: commit-graph.c

18231 #, c-format

18232 msgid "commit-graph has incorrect OID order: %s then %s"

18043 -msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"

18233 +msgstr "提交圖的物件 ID 順序不正確：%s 然後 %s"

18234

18235 #: commit-graph.c

18236 #, c-format

18237 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

18048 -msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

18238 +msgstr "提交圖有不正確的扇出值：fanout[%d] = %u != %u"

18239

18240 #: commit-graph.c

18241 #, c-format

18242 msgid "failed to parse commit %s from commit-graph"

18053 -msgstr "無法從提交圖形中解析提交 %s"

18243 +msgstr "無法從提交圖中解析提交 %s"

18244

18245 #: commit-graph.c

18246 #, c-format

18247 msgid "failed to parse commit %s from object database for commit-graph"

18058 -msgstr "無法從提交圖形的物件庫中解析提交 %s"

18248 +msgstr "無法從提交圖的物件資料庫中解析提交 %s"

18249

18250 #: commit-graph.c

18251 #, c-format

18252 msgid "root tree OID for commit %s in commit-graph is %s != %s"

18063 -msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"

18253 +msgstr "提交圖中的提交 %s 的根樹狀物件 ID 是 %s != %s"

18254

18255 #: commit-graph.c

18256 #, c-format

18257 msgid "commit-graph parent list for commit %s is too long"

18068 -msgstr "提交 %s 的提交圖形父提交列表太長了"

18258 +msgstr "提交 %s 的提交圖上級清單過長"

18259

18260 #: commit-graph.c

18261 #, c-format

18262 msgid "commit-graph parent for %s is %s != %s"

18073 -msgstr "%s 的提交圖形父提交是 %s != %s"

18263 +msgstr "%s 的提交圖上級是 %s != %s"

18264

18265 #: commit-graph.c

18266 #, c-format

18267 msgid "commit-graph parent list for commit %s terminates early"

18078 -msgstr "提交 %s 的提交圖形父提交列表過早終止"

18268 +msgstr "提交 %s 的提交圖上級清單過早終止"

18269

18270 #: commit-graph.c

18271 #, c-format

18272 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

18083 -msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

18273 +msgstr "提交 %s 位於 %<PRIuMAX> < %<PRIuMAX> 提交圖世代"

18274

18275 #: commit-graph.c

18276 #, c-format

18277 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

18088 -msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

18278 +msgstr "提交圖中的提交 %s 提交日期是 %<PRIuMAX> != %<PRIuMAX>"

18279

18280 #: commit-graph.c

18281 #, c-format

18282 msgid ""

18283 "commit-graph has both zero and non-zero generations (e.g., commits '%s' and "

18284 "'%s')"

18095 -msgstr "提交圖形中包含 0 和非 0 兩個世代號（例如 “%s” 和 “%s” 提交）"

18285 +msgstr "提交圖中包含 0 和非 0 兩個世代數（例如提交「%s」和「%s」）"

18286

18287 #: commit-graph.c

18288 msgid "Verifying commits in commit graph"

@@ -18131,7 +18321,7 @@ msgstr ""

18321 #: commit.c

18322 #, c-format

18323 msgid "commit %s exists in commit-graph but not in the object database"

18134 -msgstr "%s 提交在提交圖形中，但不在物件資料庫中"

18324 +msgstr "%s 提交在提交圖中，但不在物件資料庫中"

18325

18326 #: commit.c

18327 #, c-format

@@ -18174,37 +18364,37 @@ msgstr "沒有可用的 libc 資訊\n"

18364 #: compat/disk.h

18365 #, c-format

18366 msgid "could not determine free disk size for '%s'"

18177 -msgstr "無法判斷 “%s” 的剩餘磁碟大小"

18367 +msgstr "無法判斷「%s」的剩餘磁碟大小"

18368

18369 #: compat/disk.h

18370 #, c-format

18371 msgid "could not get info for '%s'"

18182 -msgstr "無法取得 “%s” 的資訊"

18372 +msgstr "無法取得「%s」的資訊"

18373

18374 #: compat/fsmonitor/fsm-health-win32.c

18375 #, c-format

18376 msgid "[GLE %ld] health thread could not open '%ls'"

18187 -msgstr "[GLE %ld] 健康監聽執行緒無法開啟 “%ls”"

18377 +msgstr "[GLE %ld] 健康監聽執行緒無法開啟「%ls」"

18378

18379 #: compat/fsmonitor/fsm-health-win32.c

18380 #, c-format

18381 msgid "[GLE %ld] health thread getting BHFI for '%ls'"

18192 -msgstr "[GLE %ld] 健康監聽執行緒取得 “%ls” 的 BHFI"

18382 +msgstr "[GLE %ld] 健康監聽執行緒取得「%ls」的 BHFI"

18383

18384 #: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c

18385 #, c-format

18386 msgid "could not convert to wide characters: '%s'"

18197 -msgstr "無法轉換至較寬字元：“%s”"

18387 +msgstr "無法轉換至較寬字元：「%s」"

18388

18389 #: compat/fsmonitor/fsm-health-win32.c

18390 #, c-format

18391 msgid "BHFI changed '%ls'"

18202 -msgstr "BHFI 更改了 “%ls”"

18392 +msgstr "BHFI 更改了「%ls」"

18393

18394 #: compat/fsmonitor/fsm-health-win32.c

18395 #, c-format

18396 msgid "unhandled case in 'has_worktree_moved': %d"

18207 -msgstr "“has_worktree_moved” 中有未處置的情況：%d"

18397 +msgstr "「has_worktree_moved」中有未處置的情況：%d"

18398

18399 #: compat/fsmonitor/fsm-health-win32.c

18400 #, c-format

@@ -18232,22 +18422,22 @@ msgstr "[GLE %ld] 無法將路徑轉換為 UTF-8：「%.*ls」"

18422 #: compat/fsmonitor/fsm-listen-win32.c

18423 #, c-format

18424 msgid "[GLE %ld] could not watch '%s'"

18235 -msgstr "[GLE %ld] 無法監聽 “%s”"

18425 +msgstr "[GLE %ld] 無法監聽「%s」"

18426

18427 #: compat/fsmonitor/fsm-listen-win32.c

18428 #, c-format

18429 msgid "[GLE %ld] could not get longname of '%s'"

18240 -msgstr "[GLE %ld] 無法取得 “%s” 的 longname"

18430 +msgstr "[GLE %ld] 無法取得「%s」的 longname"

18431

18432 #: compat/fsmonitor/fsm-listen-win32.c

18433 #, c-format

18434 msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]"

18245 -msgstr "在 “%s” 上呼叫 ReadDirectoryChangedW 失敗 [GLE %ld]"

18435 +msgstr "在「%s」上呼叫 ReadDirectoryChangedW 失敗 [GLE %ld]"

18436

18437 #: compat/fsmonitor/fsm-listen-win32.c

18438 #, c-format

18439 msgid "GetOverlappedResult failed on '%s' [GLE %ld]"

18250 -msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]"

18440 +msgstr "在「%s」上呼叫 GetOverlappedResult 失敗 [GLE %ld]"

18441

18442 #: compat/fsmonitor/fsm-listen-win32.c

18443 #, c-format

@@ -18292,7 +18482,7 @@ msgstr "無法複製 SID (%ld)"

18482 #: compat/mingw.c

18483 #, c-format

18484 msgid "failed to get owner for '%s' (%ld)"

18295 -msgstr "無法取得 “%s” 的所有者 (%ld)"

18485 +msgstr "無法取得「%s」的所有者 (%ld)"

18486

18487 #: compat/obstack.c

18488 msgid "memory exhausted"

@@ -18381,7 +18571,7 @@ msgstr "無法讀取 IPC 回應"

18571 #: compat/simple-ipc/ipc-unix-socket.c

18572 #, c-format

18573 msgid "could not start accept_thread '%s'"

18384 -msgstr "無法啟動 accept_thread “%s”"

18574 +msgstr "無法啟動 accept_thread「%s」"

18575

18576 #: compat/simple-ipc/ipc-unix-socket.c

18577 #, c-format

@@ -18391,26 +18581,26 @@ msgstr "無法啟動「%s」的 worker[0]"

18581 #: compat/simple-ipc/ipc-win32.c

18582 #, c-format

18583 msgid "ConnectNamedPipe failed for '%s' (%lu)"

18394 -msgstr "對 “%s” 進行 ConnectNamedPipe 失敗 (%lu)"

18584 +msgstr "對「%s」進行 ConnectNamedPipe 失敗 (%lu)"

18585

18586 #: compat/simple-ipc/ipc-win32.c

18587 #, c-format

18588 msgid "could not create fd from pipe for '%s'"

18399 -msgstr "無法為 “%s” 從管道建立 fd"

18589 +msgstr "無法為「%s」從管道建立 fd"

18590

18591 #: compat/simple-ipc/ipc-win32.c

18592 #, c-format

18593 msgid "could not start thread[0] for '%s'"

18404 -msgstr "無法為 “%s” 啟動 thread[0]"

18594 +msgstr "無法為「%s」啟動 thread[0]"

18595

18596 #: compat/simple-ipc/ipc-win32.c

18597 #, c-format

18598 msgid "wait for hEvent failed for '%s'"

18409 -msgstr "等待 “%s” 的 hEvent 失敗"

18599 +msgstr "等待「%s」的 hEvent 失敗"

18600

18601 #: compat/terminal.c

18602 msgid "cannot resume in the background, please use 'fg' to resume"

18413 -msgstr "無法在背景繼續；請使用 “fg” 繼續"

18603 +msgstr "無法在背景繼續；請使用「fg」繼續"

18604

18605 #: compat/terminal.c

18606 msgid "cannot restore terminal settings"

@@ -18602,7 +18792,7 @@ msgstr "%s 變數的值無效"

18792 #: config.c

18793 #, c-format

18794 msgid "ignoring unknown core.fsync component '%s'"

18605 -msgstr "忽略未知的 core.fsync 組件「%s」"

18795 +msgstr "忽略未知的 core.fsync 元件「%s」"

18796

18797 #: config.c

18798 #, c-format

@@ -18778,7 +18968,7 @@ msgstr "無效的小節名稱：%s"

18968 #: config.c

18969 #, c-format

18970 msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"

18781 -msgstr "因為第 %2$<PRIuMAX> 列中 “%1$s” 的文字列太長，故拒絕運作"

18971 +msgstr "因為第 %2$<PRIuMAX> 列中「%1$s」的文字列太長，故拒絕運作"

18972

18973 #: config.c

18974 #, c-format

@@ -18992,7 +19182,7 @@ msgstr "%s 中的 CRLF 將被 LF 取代"

19182 msgid ""

19183 "in the working copy of '%s', CRLF will be replaced by LF the next time Git "

19184 "touches it"

18995 -msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"

19185 +msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF"

19186

19187 #: convert.c

19188 #, c-format

@@ -19004,7 +19194,7 @@ msgstr "檔案 %s 中的 LF 將被 CRLF 取代"

19194 msgid ""

19195 "in the working copy of '%s', LF will be replaced by CRLF the next time Git "

19196 "touches it"

19007 -msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"

19197 +msgstr "在「%s」的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF"

19198

19199 #: convert.c

19200 #, c-format

@@ -19225,7 +19415,7 @@ msgstr "不能開啟目錄 '%s'"

19415 #: diagnose.c

19416 #, c-format

19417 msgid "skipping '%s', which is neither file nor directory"

19228 -msgstr "略過 “%s”，其非檔案或目錄"

19418 +msgstr "略過「%s」，其非檔案或目錄"

19419

19420 #: diagnose.c

19421 msgid "could not duplicate stdout"

@@ -19523,7 +19713,7 @@ msgstr "使用提供的檔案名長度生成差異統計"

19713

19714 #: diff.c

19715 msgid "generate diffstat with a given graph width"

19526 -msgstr "使用提供的圖形長度生成差異統計"

19716 +msgstr "產出限制為提供的寬度的差異統計圖形"

19717

19718 #: diff.c

19719 msgid "<count>"

@@ -20159,7 +20349,7 @@ msgstr "預期 '%s'，得到 '%s'"

20349 #: fetch-pack.c

20350 #, c-format

20351 msgid "expected '%s'"

20162 -msgstr "預期 “%s”"

20352 +msgstr "預期「%s」"

20353

20354 #: fetch-pack.c

20355 #, c-format

@@ -20251,45 +20441,49 @@ msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"

20441 #: fsmonitor-settings.c

20442 #, c-format

20443 msgid "bare repository '%s' is incompatible with fsmonitor"

20254 -msgstr "純版本庫 “%s” 與 fsmonitor 不相容"

20444 +msgstr "純版本庫「%s」與 fsmonitor 不相容"

20445

20446 #: fsmonitor-settings.c

20447 #, c-format

20448 msgid "repository '%s' is incompatible with fsmonitor due to errors"

20259 -msgstr "版本庫 “%s” 因錯誤而與 fsmonitor 不相容"

20449 +msgstr "版本庫「%s」因錯誤而與 fsmonitor 不相容"

20450

20451 #: fsmonitor-settings.c

20452 #, c-format

20453 msgid "remote repository '%s' is incompatible with fsmonitor"

20264 -msgstr "遠端版本庫 “%s” 與 fsmonitor 不相容"

20454 +msgstr "遠端版本庫「%s」與 fsmonitor 不相容"

20455

20456 #: fsmonitor-settings.c

20457 #, c-format

20458 msgid "virtual repository '%s' is incompatible with fsmonitor"

20269 -msgstr "虛擬版本庫 “%s” 與 fsmonitor 不相容"

20459 +msgstr "虛擬版本庫「%s」與 fsmonitor 不相容"

20460

20461 #: fsmonitor-settings.c

20462 #, c-format

20463 msgid ""

20464 "socket directory '%s' is incompatible with fsmonitor due to lack of Unix "

20465 "sockets support"

20276 -msgstr "通訊端 “%s” 因缺少 Unix 通訊端支援，而與 fsmonitor 不相容"

20466 +msgstr "通訊端「%s」因缺少 Unix 通訊端支援，而與 fsmonitor 不相容"

20467

20468 #: git.c

20469 msgid ""

20470 "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"

20471 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

20282 -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"

20283 -"bare]\n"

20284 -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"

20285 -" [--config-env=<name>=<envvar>] <command> [<args>]"

20472 +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"

20473 +"lazy-fetch]\n"

20474 +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"

20475 +" [--work-tree=<path>] [--namespace=<name>] [--config-"

20476 +"env=<name>=<envvar>]\n"

20477 +" <command> [<args>]"

20478 msgstr ""

20479 "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"

20480 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"

20289 -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"

20290 -"bare]\n"

20291 -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"

20292 -" [--config-env=<name>=<envvar>] <command> [<args>]"

20481 +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"

20482 +"lazy-fetch]\n"

20483 +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"

20484 +" [--work-tree=<path>] [--namespace=<name>] [--config-"

20485 +"env=<name>=<envvar>]\n"

20486 +" <command> [<args>]"

20487

20488 #: git.c

20489 msgid ""

@@ -20493,7 +20687,7 @@ msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"

20687 #: graph.c

20688 #, c-format

20689 msgid "ignored invalid color '%.*s' in log.graphColors"

20496 -msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"

20690 +msgstr "已忽略 log.graphColors 中無效的「%.*s」色彩"

20691

20692 #: grep.c

20693 msgid ""

@@ -20688,15 +20882,15 @@ msgstr ""

20882 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"

20883 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"

20884

20885 +#: http-fetch.c

20886 +msgid "not a git repository"

20887 +msgstr "不是一個 git 版本庫"

20888 +

20889 #: http-fetch.c

20890 #, c-format

20891 msgid "argument to --packfile must be a valid hash (got '%s')"

20892 msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"

20893

20696 -#: http-fetch.c

20697 -msgid "not a git repository"

20698 -msgstr "不是一個 git 版本庫"

20699 -

20894 #: http.c

20895 #, c-format

20896 msgid "negative value for http.postBuffer; defaulting to %d"

@@ -20710,6 +20904,10 @@ msgstr "不支援委託控制，因為 cURL < 7.22.0"

20904 msgid "Public key pinning not supported with cURL < 7.39.0"

20905 msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0"

20906

20907 +#: http.c

20908 +msgid "Unknown value for http.proactiveauth"

20909 +msgstr "http.proactiveauth 的值未知"

20910 +

20911 #: http.c

20912 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"

20913 msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0"

@@ -20729,6 +20927,14 @@ msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端

20927 msgid "Could not set SSL backend to '%s': already set"

20928 msgstr "無法將 SSL 後端設定為 '%s'：已經設定"

20929

20930 +#: http.c

20931 +msgid "refusing to read cookies from http.cookiefile '-'"

20932 +msgstr "不允許從 http.cookiefile 的設定值「-」處讀取 cookie"

20933 +

20934 +#: http.c

20935 +msgid "ignoring http.savecookies for empty http.cookiefile"

20936 +msgstr "http.cookiefile 空白，忽略 http.savecookies"

20937 +

20938 #: http.c

20939 #, c-format

20940 msgid ""

@@ -20813,7 +21019,7 @@ msgstr "sparse:path 過濾器支援已被刪除"

21019 #: list-objects-filter-options.c

21020 #, c-format

21021 msgid "'%s' for 'object:type=<type>' is not a valid object type"

20816 -msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"

21022 +msgstr "「object:type=<type>」的「%s」不是有效的物件格式"

21023

21024 #: list-objects-filter-options.c

21025 #, c-format

@@ -20937,10 +21143,10 @@ msgstr "無法合併 %s 子模組（沒有合併基底）"

21143 msgid "Failed to merge submodule %s (commits not present)"

21144 msgstr "無法合併子模組 %s（提交不存在）"

21145

20940 -#: merge-ort.c merge-recursive.c

21146 +#: merge-ort.c

21147 #, c-format

20942 -msgid "Failed to merge submodule %s (repository corrupt)"

20943 -msgstr "無法合併子模組 %s （版本庫損壞）"

21148 +msgid "error: failed to merge submodule %s (repository corrupt)"

21149 +msgstr "錯誤：無法合併子模組 %s （版本庫損壞）"

21150

21151 #: merge-ort.c merge-recursive.c

21152 #, c-format

@@ -20972,14 +21178,15 @@ msgstr ""

21178 "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"

21179 "%s"

21180

20975 -#: merge-ort.c merge-recursive.c

20976 -msgid "failed to execute internal merge"

20977 -msgstr "無法執行內部合併"

21181 +#: merge-ort.c

21182 +#, c-format

21183 +msgid "error: failed to execute internal merge for %s"

21184 +msgstr "錯誤：無法對 %s 執行內部合併"

21185

20979 -#: merge-ort.c merge-recursive.c

21186 +#: merge-ort.c

21187 #, c-format

20981 -msgid "unable to add %s to database"

20982 -msgstr "無法將 %s 加進資料庫"

21188 +msgid "error: unable to add %s to database"

21189 +msgstr "錯誤：無法將 %s 加進資料庫"

21190

21191 #: merge-ort.c merge-recursive.c

21192 #, c-format

@@ -21079,15 +21286,15 @@ msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

21286 msgstr ""

21287 "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"

21288

21082 -#: merge-ort.c merge-recursive.c

21289 +#: merge-ort.c

21290 #, c-format

21084 -msgid "cannot read object %s"

21085 -msgstr "不能讀取物件 %s"

21291 +msgid "error: cannot read object %s"

21292 +msgstr "錯誤：無法讀取物件 %s"

21293

21087 -#: merge-ort.c merge-recursive.c

21294 +#: merge-ort.c

21295 #, c-format

21089 -msgid "object %s is not a blob"

21090 -msgstr "物件 %s 不是一個資料物件"

21296 +msgid "error: object %s is not a blob"

21297 +msgstr "錯誤：物件 %s 不是一個資料物件"

21298

21299 #: merge-ort.c

21300 #, c-format

@@ -21241,6 +21448,11 @@ msgstr "建立符號連結 '%s' 失敗：%s"

21448 msgid "do not know what to do with %06o %s '%s'"

21449 msgstr "不知道如何處理 %06o %s '%s'"

21450

21451 +#: merge-recursive.c

21452 +#, c-format

21453 +msgid "Failed to merge submodule %s (repository corrupt)"

21454 +msgstr "無法合併子模組 %s （版本庫損壞）"

21455 +

21456 #: merge-recursive.c

21457 #, c-format

21458 msgid "Fast-forwarding submodule %s to the following commit:"

@@ -21286,6 +21498,15 @@ msgstr ""

21498 msgid "Failed to merge submodule %s (multiple merges found)"

21499 msgstr "無法合併子模組 %s （發現多個合併）"

21500

21501 +#: merge-recursive.c

21502 +msgid "failed to execute internal merge"

21503 +msgstr "無法執行內部合併"

21504 +

21505 +#: merge-recursive.c

21506 +#, c-format

21507 +msgid "unable to add %s to database"

21508 +msgstr "無法將 %s 加進資料庫"

21509 +

21510 #: merge-recursive.c

21511 #, c-format

21512 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

@@ -21400,6 +21621,16 @@ msgstr ""

21621 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

21622 "命名目錄 %4$s->%5$s"

21623

21624 +#: merge-recursive.c

21625 +#, c-format

21626 +msgid "cannot read object %s"

21627 +msgstr "不能讀取物件 %s"

21628 +

21629 +#: merge-recursive.c

21630 +#, c-format

21631 +msgid "object %s is not a blob"

21632 +msgstr "物件 %s 不是一個資料物件"

21633 +

21634 #: merge-recursive.c

21635 msgid "modify"

21636 msgstr "修改"

@@ -21503,10 +21734,6 @@ msgstr "無法解析橫列：%s"

21734 msgid "malformed line: %s"

21735 msgstr "橫列格式錯誤：%s"

21736

21506 -#: midx-write.c

21507 -msgid "ignoring existing multi-pack-index; checksum mismatch"

21508 -msgstr "忽略現有的多包索引：總和檢查碼不符"

21509 -

21737 #: midx-write.c

21738 msgid "could not load pack"

21739 msgstr "無法載入包"

@@ -21516,6 +21743,10 @@ msgstr "無法載入包"

21743 msgid "could not open index for %s"

21744 msgstr "無法開啟 %s 的索引"

21745

21746 +#: midx-write.c

21747 +msgid "ignoring existing multi-pack-index; checksum mismatch"

21748 +msgstr "忽略現有的多包索引：總和檢查碼不符"

21749 +

21750 #: midx-write.c

21751 msgid "Adding packfiles to multi-pack-index"

21752 msgstr "正在新增 packfile 至多包索引"

@@ -22253,6 +22484,20 @@ msgstr "不能解析物件：%s"

22484 msgid "hash mismatch %s"

22485 msgstr "雜湊值與 %s 不符合"

22486

22487 +#: pack-bitmap-write.c

22488 +#, c-format

22489 +msgid "duplicate entry when writing bitmap index: %s"

22490 +msgstr "寫入位圖索引中時發現重複項目：%s"

22491 +

22492 +#: pack-bitmap-write.c

22493 +#, c-format

22494 +msgid "attempted to store non-selected commit: '%s'"

22495 +msgstr "嘗試儲存未選取的提交：「%s」"

22496 +

22497 +#: pack-bitmap-write.c

22498 +msgid "too many pseudo-merges"

22499 +msgstr "偽合併過多"

22500 +

22501 #: pack-bitmap-write.c

22502 msgid "trying to write commit not in index"

22503 msgstr "嘗試寫入不在索引的提交"

@@ -22272,7 +22517,7 @@ msgstr "位圖索引檔案損壞（標頭錯誤）"

22517 #: pack-bitmap.c

22518 #, c-format

22519 msgid "unsupported version '%d' for bitmap index file"

22275 -msgstr "位圖索引檔案的版本 “%d” 不支援"

22520 +msgstr "位圖索引檔案的版本「%d」不支援"

22521

22522 #: pack-bitmap.c

22523 msgid "corrupted bitmap index file (too short to fit hash cache)"

@@ -22282,6 +22527,19 @@ msgstr "位圖索引檔案損壞（不夠長，無法置入雜湊快取）"

22527 msgid "corrupted bitmap index file (too short to fit lookup table)"

22528 msgstr "位圖索引檔案損壞（不夠長，無法置入查詢表）"

22529

22530 +#: pack-bitmap.c

22531 +msgid ""

22532 +"corrupted bitmap index file (too short to fit pseudo-merge table header)"

22533 +msgstr "位圖索引檔案損壞（不夠長，無法置入偽合併表標頭）"

22534 +

22535 +#: pack-bitmap.c

22536 +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)"

22537 +msgstr "位圖索引檔案損壞（不夠長，無法置入偽合併表）"

22538 +

22539 +#: pack-bitmap.c

22540 +msgid "corrupted bitmap index file, pseudo-merge table too short"

22541 +msgstr "位圖索引檔案損壞，偽合併表太短"

22542 +

22543 #: pack-bitmap.c

22544 #, c-format

22545 msgid "duplicate entry in bitmap index: '%s'"

@@ -22347,7 +22605,7 @@ msgstr "位圖查詢表損壞：提交索引 %u 超出範圍"

22605 #: pack-bitmap.c

22606 #, c-format

22607 msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""

22350 -msgstr "ewah 位圖損壞：提交 “%s” 之位圖的標頭遭截斷"

22608 +msgstr "ewah 位圖損壞：提交「%s」之位圖的標頭遭截斷"

22609

22610 #: pack-bitmap.c

22611 #, c-format

@@ -22395,6 +22653,11 @@ msgstr "提交「%s」無索引過的位圖"

22653 msgid "mismatch in bitmap results"

22654 msgstr "位圖結果中有不符項目"

22655

22656 +#: pack-bitmap.c

22657 +#, c-format

22658 +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)"

22659 +msgstr "偽合併索引超出範圍（%<PRIu32> >= %<PRIuMAX>）"

22660 +

22661 #: pack-bitmap.c

22662 #, c-format

22663 msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"

@@ -22408,7 +22671,7 @@ msgstr "無法取得「%s」的磁碟用量"

22671 #: pack-bitmap.c

22672 #, c-format

22673 msgid "bitmap file '%s' has invalid checksum"

22411 -msgstr "“%s” 位圖檔案的總和檢查碼無效"

22674 +msgstr "「%s」位圖檔案的總和檢查碼無效"

22675

22676 #: pack-mtimes.c

22677 #, c-format

@@ -22751,7 +23014,7 @@ msgstr "%s：'literal' 和 'glob' 不相容"

23014 #: pathspec.c

23015 #, c-format

23016 msgid "'%s' is outside the directory tree"

22754 -msgstr "“%s” 在目錄樹之外"

23017 +msgstr "「%s」在目錄樹之外"

23018

23019 #: pathspec.c

23020 #, c-format

@@ -22847,6 +23110,10 @@ msgstr "無法建立執行緒 lstat：%s"

23110 msgid "unable to parse --pretty format"

23111 msgstr "不能解析 --pretty 格式"

23112

23113 +#: promisor-remote.c

23114 +msgid "lazy fetching disabled; some objects may not be available"

23115 +msgstr "延後抓取已被停用；某些物件可能無法使用"

23116 +

23117 #: promisor-remote.c

23118 msgid "promisor-remote: unable to fork off fetch subprocess"

23119 msgstr "promisor-remote: 無法 fork fetch 子處理程序"

@@ -22877,6 +23144,72 @@ msgstr "object-info：引數後預期要有 flush"

23144 msgid "Removing duplicate objects"

23145 msgstr "正在刪除重複物件"

23146

23147 +#: pseudo-merge.c

23148 +#, c-format

23149 +msgid "failed to load pseudo-merge regex for %s: '%s'"

23150 +msgstr "未能載入 %s 的偽合併常規表示式：%s"

23151 +

23152 +#: pseudo-merge.c

23153 +#, c-format

23154 +msgid "%s must be non-negative, using default"

23155 +msgstr "%s 須為非負數，將採用預設值"

23156 +

23157 +#: pseudo-merge.c

23158 +#, c-format

23159 +msgid "%s must be between 0 and 1, using default"

23160 +msgstr "%s 須介於 0 到 1 之間，將採用預設值"

23161 +

23162 +#: pseudo-merge.c

23163 +#, c-format

23164 +msgid "%s must be positive, using default"

23165 +msgstr "%s 須為正數，將採用預設值"

23166 +

23167 +#: pseudo-merge.c

23168 +#, c-format

23169 +msgid "pseudo-merge group '%s' missing required pattern"

23170 +msgstr "偽合併群組「%s」缺少必須的模式"

23171 +

23172 +#: pseudo-merge.c

23173 +#, c-format

23174 +msgid "pseudo-merge group '%s' has unstable threshold before stable one"

23175 +msgstr "偽合併群組「%s」的非穩定閾值位於穩定者之前"

23176 +

23177 +#: pseudo-merge.c

23178 +#, c-format

23179 +msgid ""

23180 +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"

23181 +msgstr "來自組態的偽合併常規表示式包含太多的擷取群組（最多 %<PRIuMAX> 個）"

23182 +

23183 +#: pseudo-merge.c

23184 +#, c-format

23185 +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)"

23186 +msgstr "延伸偽合併讀取超出範圍（%<PRIuMAX> >= %<PRIuMAX>）"

23187 +

23188 +#: pseudo-merge.c

23189 +#, c-format

23190 +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)"

23191 +msgstr "延伸偽合併項目過短（%<PRIuMAX> >= %<PRIuMAX>）"

23192 +

23193 +#: pseudo-merge.c

23194 +#, c-format

23195 +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>"

23196 +msgstr "無法在偏移 %2$<PRIuMAX> 處找到提交 %1$s 的偽合併"

23197 +

23198 +#: pseudo-merge.c

23199 +#, c-format

23200 +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)"

23201 +msgstr "延伸偽合併查詢超出範圍（%<PRIu32> >= %<PRIu32>）"

23202 +

23203 +#: pseudo-merge.c

23204 +#, c-format

23205 +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)"

23206 +msgstr "讀取超出範圍：（%<PRIuMAX> >= %<PRIuMAX>）"

23207 +

23208 +#: pseudo-merge.c

23209 +#, c-format

23210 +msgid "could not read extended pseudo-merge table for commit %s"

23211 +msgstr "無法讀取提交 %s 的延伸偽合併表"

23212 +

23213 #: range-diff.c

23214 msgid "could not start `log`"

23215 msgstr "不能啟動 `log`"

@@ -22914,7 +23247,7 @@ msgstr "不能解析 '%s' 的日誌"

23247 #: reachable.c

23248 #, c-format

23249 msgid "invalid extra cruft tip: '%s'"

22917 -msgstr "無效的額外廢棄提交修訂版：“%s”"

23250 +msgstr "無效的額外廢棄提交修訂版：「%s」"

23251

23252 #: reachable.c

23253 msgid "unable to enumerate additional recent objects"

@@ -23106,7 +23439,7 @@ msgstr "非預期的 diff 狀態 %c"

23439 #: read-cache.c

23440 #, c-format

23441 msgid "remove '%s'\n"

23109 -msgstr "移除 “%s”\n"

23442 +msgstr "移除「%s」\n"

23443

23444 #: rebase-interactive.c

23445 msgid ""

@@ -23156,11 +23489,11 @@ msgstr ""

23489 "r, reword <提交> = 使用提交，但編輯提交說明\n"

23490 "e, edit <提交> = 使用提交，但不直接修補 (amend) \n"

23491 "s, squash <提交> = 使用提交，但融合至上個提交\n"

23159 -"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入 -C，\n"

23492 +"f, fixup [-C | -c] <提交> = 跟「squash」相似，但除非傳入 -C，\n"

23493 " 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"

23494 " 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"

23495 "x, exec <命令> = 使用 shell 執行命令（這一列的剩餘部分）\n"

23163 -"b, break = 在此停止（使用 “git rebase --continue” 繼續重定基底）\n"

23496 +"b, break = 在此停止（使用「git rebase --continue」繼續重定基底）\n"

23497 "d, drop <提交> = 移除提交\n"

23498 "l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"

23499 "t, reset <標籤> = 重設 HEAD 到指定標籤\n"

@@ -23432,7 +23765,7 @@ msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用"

23765

23766 #: ref-filter.c

23767 msgid "failed to run 'describe'"

23435 -msgstr "無法執行 “describe”"

23768 +msgstr "無法執行「describe」"

23769

23770 #: ref-filter.c

23771 #, c-format

@@ -23550,8 +23883,8 @@ msgstr ""

23883 "\n"

23884 "\tgit config --global init.defaultBranch <name>\n"

23885 "\n"

23553 -"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"

23554 -"“development”。剛建立的分支可以用這個命令重新命名：\n"

23886 +"除了「master」外，常用的分支名稱有「main」,「trunk」以及\n"

23887 +"「development」。剛建立的分支可以用這個命令重新命名：\n"

23888 "\n"

23889 "\tgit branch -m <name>\n"

23890

@@ -23585,11 +23918,20 @@ msgstr "引用 %s 的日誌意外終止於 %s"

23918 msgid "log for %s is empty"

23919 msgstr "%s 的日誌為空"

23920

23921 +#: refs.c

23922 +msgid "refusing to force and skip creation of reflog"

23923 +msgstr "拒絕強制並略過建立引用日誌"

23924 +

23925 #: refs.c

23926 #, c-format

23927 msgid "refusing to update ref with bad name '%s'"

23928 msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

23929

23930 +#: refs.c

23931 +#, c-format

23932 +msgid "refusing to update pseudoref '%s'"

23933 +msgstr "拒絕更新偽引用「%s」"

23934 +

23935 #: refs.c

23936 #, c-format

23937 msgid "update_ref failed for ref '%s': %s"

@@ -23628,6 +23970,27 @@ msgstr "無法刪除引用 %s：%s"

23970 msgid "could not delete references: %s"

23971 msgstr "無法刪除引用：%s"

23972

23973 +#: refs.c

23974 +#, c-format

23975 +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n"

23976 +msgstr "完成引用移轉的測試執行，可以在「%s」找到結果\n"

23977 +

23978 +#: refs.c

23979 +#, c-format

23980 +msgid "could not remove temporary migration directory '%s'"

23981 +msgstr "無法移除暫時性遷移目錄「%s」"

23982 +

23983 +#: refs.c

23984 +#, c-format

23985 +msgid "migrated refs can be found at '%s'"

23986 +msgstr "可以在「%s」找到已遷移的引用"

23987 +

23988 +#: refs/files-backend.c refs/reftable-backend.c

23989 +#, c-format

23990 +msgid ""

23991 +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref"

23992 +msgstr "無法鎖定引用「%s」：預期是指向「%s」的符號引用，但這個是一般引用"

23993 +

23994 #: refs/reftable-backend.c

23995 #, c-format

23996 msgid "refname is dangerous: %s"

@@ -23839,7 +24202,7 @@ msgstr "協定錯誤：預期是「<URL> <路徑>」，但缺少空白"

24202 #: remote-curl.c

24203 #, c-format

24204 msgid "failed to download file at URL '%s'"

23842 -msgstr "無法下載位於 URL “%s” 的檔案"

24205 +msgstr "無法下載位於 URL「%s」的檔案"

24206

24207 #: remote-curl.c

24208 msgid "git-http-push failed"

@@ -23878,12 +24241,12 @@ msgstr "提供了一個以上的 uploadpack，使用第一個"

24241 #: remote.c

24242 #, c-format

24243 msgid "unrecognized value transfer.credentialsInUrl: '%s'"

23881 -msgstr "數值 transfer.credentialsInUrl 無法識別：“%s”"

24244 +msgstr "數值 transfer.credentialsInUrl 無法識別：「%s」"

24245

24246 #: remote.c

24247 #, c-format

24248 msgid "URL '%s' uses plaintext credentials"

23886 -msgstr "URL “%s” 使用明文憑證"

24249 +msgstr "URL「%s」使用明文憑證"

24250

24251 #: remote.c

24252 #, c-format

@@ -24124,7 +24487,7 @@ msgstr[0] ""

24487 #: remote.c

24488 msgid ""

24489 " (use \"git pull\" if you want to integrate the remote branch with yours)\n"

24127 -msgstr " （使用 “git pull” 來將遠端分支整合進您的分支）\n"

24490 +msgstr " （使用「git pull」來將遠端分支整合進您的分支）\n"

24491

24492 #: remote.c

24493 #, c-format

@@ -24197,7 +24560,7 @@ msgstr "使用之前的解決方案解決 '%s'。"

24560 #: rerere.c

24561 #, c-format

24562 msgid "cannot unlink stray '%s'"

24200 -msgstr "無法刪除失散檔案 “%s”"

24563 +msgstr "無法刪除失散檔案「%s」"

24564

24565 #: rerere.c

24566 #, c-format

@@ -24280,7 +24643,7 @@ msgstr "--unpacked=<packfile> 已不受支援"

24643 #: revision.c

24644 #, c-format

24645 msgid "invalid option '%s' in --stdin mode"

24283 -msgstr "在 --stdin 模式下，“%s” 選項無效"

24646 +msgstr "在 --stdin 模式下，「%s」選項無效"

24647

24648 #: revision.c

24649 msgid "your current branch appears to be broken"

@@ -24394,7 +24757,7 @@ msgstr "只下載會簽出的分支中介資料"

24757

24758 #: scalar.c

24759 msgid "create repository within 'src' directory"

24397 -msgstr "在 “src” 目錄建立版本庫"

24760 +msgstr "在「src」目錄建立版本庫"

24761

24762 #: scalar.c

24763 msgid ""

@@ -24464,27 +24827,27 @@ msgstr "--all 或 <enlistment> 但不能傳入兩者"

24827 #: scalar.c

24828 #, c-format

24829 msgid "could not remove stale scalar.repo '%s'"

24467 -msgstr "無法移除過時的 scalar.repo “%s”"

24830 +msgstr "無法移除過時的 scalar.repo「%s」"

24831

24832 #: scalar.c

24833 #, c-format

24834 msgid "removed stale scalar.repo '%s'"

24472 -msgstr "已移除過時的 scalar.repo “%s”"

24835 +msgstr "已移除過時的 scalar.repo「%s」"

24836

24837 #: scalar.c

24838 #, c-format

24839 msgid "repository at '%s' has different owner"

24477 -msgstr "位於 “%s” 的版本庫有不同的擁有者"

24840 +msgstr "位於「%s」的版本庫有不同的擁有者"

24841

24842 #: scalar.c

24843 #, c-format

24844 msgid "repository at '%s' has a format issue"

24482 -msgstr "位於 “%s” 的版本庫有格式問題"

24845 +msgstr "位於「%s」的版本庫有格式問題"

24846

24847 #: scalar.c

24848 #, c-format

24849 msgid "repository not found in '%s'"

24487 -msgstr "版本庫不在 “%s”"

24850 +msgstr "版本庫不在「%s」"

24851

24852 #: scalar.c

24853 #, c-format

@@ -25008,22 +25371,70 @@ msgstr "git %s：無法重新整理索引"

25371 #: sequencer.c

25372 #, c-format

25373 msgid "'%s' is not a valid label"

25011 -msgstr "“%s” 不是有效的標籤"

25374 +msgstr "「%s」不是有效的標籤"

25375

25376 #: sequencer.c

25377 #, c-format

25378 msgid "'%s' is not a valid refname"

25016 -msgstr "“%s” 不是有效的引用名稱"

25379 +msgstr "「%s」不是有效的引用名稱"

25380

25381 #: sequencer.c

25382 #, c-format

25383 msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"

25384 msgstr "update-ref 需要完全限定的引用名稱，比如：refs/heads/%s"

25385

25386 +#: sequencer.c

25387 +#, c-format

25388 +msgid "'%s' does not accept merge commits"

25389 +msgstr "「%s」不接受合併提交"

25390 +

25391 +#. TRANSLATORS: 'pick' and 'merge -C' should not be

25392 +#. translated.

25393 +#.

25394 +#: sequencer.c

25395 +msgid ""

25396 +"'pick' does not take a merge commit. If you wanted to\n"

25397 +"replay the merge, use 'merge -C' on the commit."

25398 +msgstr ""

25399 +"不能使用「pick」選擇一個合併提交。\n"

25400 +"如果你想要重放這個合併，請對這個提交使用「merge -C」。"

25401 +

25402 +#. TRANSLATORS: 'reword' and 'merge -c' should not be

25403 +#. translated.

25404 +#.

25405 +#: sequencer.c

25406 +msgid ""

25407 +"'reword' does not take a merge commit. If you wanted to\n"

25408 +"replay the merge and reword the commit message, use\n"

25409 +"'merge -c' on the commit"

25410 +msgstr ""

25411 +"「reword」並無法使用合併提交作為參數。\n"

25412 +"如果你希望合併並改寫提交訊息，\n"

25413 +"請對這個提交使用「merge -c」"

25414 +

25415 +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should

25416 +#. not be translated.

25417 +#.

25418 +#: sequencer.c

25419 +msgid ""

25420 +"'edit' does not take a merge commit. If you wanted to\n"

25421 +"replay the merge, use 'merge -C' on the commit, and then\n"

25422 +"'break' to give the control back to you so that you can\n"

25423 +"do 'git commit --amend && git rebase --continue'."

25424 +msgstr ""

25425 +"「edit」並無法使用合併提交作為參數。\n"

25426 +"如果你希望重放這個合併，請對這個提交使用「merge -C」，\n"

25427 +"並使用「break」取回控制權，\n"

25428 +"這樣才能執行「git commit --amend && git rebase --continue」。"

25429 +

25430 +#: sequencer.c

25431 +msgid "cannot squash merge commit into another commit"

25432 +msgstr "無法將一個合併提交壓扁進其他提交"

25433 +

25434 #: sequencer.c

25435 #, c-format

25436 msgid "invalid command '%.*s'"

25026 -msgstr "無效的命令 “%.*s”"

25437 +msgstr "無效的命令「%.*s」"

25438

25439 #: sequencer.c

25440 #, c-format

@@ -25170,9 +25581,8 @@ msgid "cannot read HEAD"

25581 msgstr "不能讀取 HEAD"

25582

25583 #: sequencer.c

25173 -#, c-format

25174 -msgid "unable to copy '%s' to '%s'"

25175 -msgstr "無法複製 '%s' 至 '%s'"

25584 +msgid "could not write commit message file"

25585 +msgstr "無法寫入提交訊息檔案"

25586

25587 #: sequencer.c

25588 #, c-format

@@ -25299,7 +25709,7 @@ msgstr "合併：無法寫入新索引檔案"

25709 #, c-format

25710 msgid ""

25711 "another 'rebase' process appears to be running; '%s.lock' already exists"

25302 -msgstr "似乎有另一個 “rebase” 程序正在進行；“%s.lock” 已經存在"

25712 +msgstr "似乎有另一個「rebase」程序正在進行；「%s.lock」已經存在"

25713

25714 #: sequencer.c

25715 #, c-format

@@ -25649,6 +26059,19 @@ msgstr "無法返回目前工作目錄"

26059 msgid "failed to stat '%*s%s%s'"

26060 msgstr "取得 '%*s%s%s' 狀態（stat）失敗"

26061

26062 +#: setup.c

26063 +#, c-format

26064 +msgid ""

26065 +"detected dubious ownership in repository at '%s'\n"

26066 +"%sTo add an exception for this directory, call:\n"

26067 +"\n"

26068 +"\tgit config --global --add safe.directory %s"

26069 +msgstr ""

26070 +"在位於「%s」的版本庫偵測到可疑所有權\n"

26071 +"%s若要放行本目錄，請呼叫：\n"

26072 +"\n"

26073 +"\tgit config --global --add safe.directory %s"

26074 +

26075 #: setup.c

26076 msgid "Unable to read current working directory"

26077 msgstr "不能讀取目前工作目錄"

@@ -25672,23 +26095,10 @@ msgstr ""

26095 "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"

26096 "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"

26097

25675 -#: setup.c

25676 -#, c-format

25677 -msgid ""

25678 -"detected dubious ownership in repository at '%s'\n"

25679 -"%sTo add an exception for this directory, call:\n"

25680 -"\n"

25681 -"\tgit config --global --add safe.directory %s"

25682 -msgstr ""

25683 -"在位於「%s」的版本庫偵測到可疑所有權\n"

25684 -"%s若要放行本目錄，請呼叫：\n"

25685 -"\n"

25686 -"\tgit config --global --add safe.directory %s"

25687 -

26098 #: setup.c

26099 #, c-format

26100 msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"

25691 -msgstr "無法使用 “%s” 純版本庫（safe.bareRepository 是 “%s”）"

26101 +msgstr "無法使用「%s」純版本庫（safe.bareRepository 是「%s」）"

26102

26103 #: setup.c

26104 #, c-format

@@ -26047,6 +26457,16 @@ msgstr "子模組 '%s' 無法被更新。"

26457 msgid "submodule git dir '%s' is inside git dir '%.*s'"

26458 msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"

26459

26460 +#: submodule.c

26461 +#, c-format

26462 +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"

26463 +msgstr "預期「%.*s」（位於子模組路徑「%s」）不是象徵式連結"

26464 +

26465 +#: submodule.c

26466 +#, c-format

26467 +msgid "expected submodule path '%s' not to be a symbolic link"

26468 +msgstr "預期子模組路徑「%s」不是象徵式連結"

26469 +

26470 #: submodule.c

26471 #, c-format

26472 msgid ""

@@ -26086,17 +26506,12 @@ msgstr "ls-tree 返回未知返回值 %d"

26506 #: symlinks.c

26507 #, c-format

26508 msgid "failed to lstat '%s'"

26089 -msgstr "無法 lstat “%s”"

26509 +msgstr "無法 lstat「%s」"

26510

26511 #: t/helper/test-bundle-uri.c

26512 msgid "no remote configured to get bundle URIs from"

26513 msgstr "沒有設定可以用來取得套件包 URIs 的遠端"

26514

26095 -#: t/helper/test-bundle-uri.c

26096 -#, c-format

26097 -msgid "remote '%s' has no configured URL"

26098 -msgstr "“%s” 遠端未設定 URL"

26099 -

26515 #: t/helper/test-bundle-uri.c

26516 msgid "could not get the bundle-uri list"

26517 msgstr "無法取得 bundle-uri 清單"

@@ -27439,7 +27854,7 @@ msgstr "列舉未追蹤檔案花費 %.2f 秒。"

27854

27855 #: wt-status.c

27856 msgid "See 'git help status' for information on how to improve this."

27442 -msgstr "請參閱 “git help status” 深入了解如何改善。"

27857 +msgstr "請參閱「git help status」深入了解如何改善。"

27858

27859 #: wt-status.c

27860 #, c-format

@@ -27885,29 +28300,29 @@ msgstr "無法傳送 %s\n"

28300

28301 #: git-send-email.perl

28302 #, perl-format

27888 -msgid "Dry-Sent %s\n"

27889 -msgstr "測試執行傳送 %s\n"

28303 +msgid "Dry-Sent %s"

28304 +msgstr "試執行傳送 %s"

28305

28306 #: git-send-email.perl

28307 #, perl-format

27893 -msgid "Sent %s\n"

27894 -msgstr "正傳送 %s\n"

28308 +msgid "Sent %s"

28309 +msgstr "正傳送 %s"

28310

28311 #: git-send-email.perl

27897 -msgid "Dry-OK. Log says:\n"

27898 -msgstr "測試執行成功。日誌說：\n"

28312 +msgid "Dry-OK. Log says:"

28313 +msgstr "試執行成功。日誌說："

28314

28315 #: git-send-email.perl

27901 -msgid "OK. Log says:\n"

27902 -msgstr "OK。日誌說：\n"

28316 +msgid "OK. Log says:"

28317 +msgstr "OK。日誌說："

28318

28319 #: git-send-email.perl

28320 msgid "Result: "

28321 msgstr "結果： "

28322

28323 #: git-send-email.perl

27909 -msgid "Result: OK\n"

27910 -msgstr "結果：OK\n"

28324 +msgid "Result: OK"

28325 +msgstr "結果：OK"

28326

28327 #: git-send-email.perl

28328 #, perl-format

@@ -27942,7 +28357,7 @@ msgstr "(%s) 不能執行 '%s'"

28357 #: git-send-email.perl

28358 #, perl-format

28359 msgid "(%s) Malformed output from '%s'"

27945 -msgstr "(%s) 從 “%s” 讀到格式錯誤的輸出"

28360 +msgstr "(%s) 從「%s」讀到格式錯誤的輸出"

28361

28362 #: git-send-email.perl

28363 #, perl-format

@@ -27998,6 +28413,34 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"

28413 msgid "Do you really want to send %s? [y|N]: "

28414 msgstr "您真的要傳送 %s？[y|N]： "

28415

28416 +#~ msgid ""

28417 +#~ "the add.interactive.useBuiltin setting has been removed!\n"

28418 +#~ "See its entry in 'git help config' for details."

28419 +#~ msgstr ""

28420 +#~ "add.interactive.useBuiltin 設定已被移除！\n"

28421 +#~ "深入了解請參閱 “git help config” 中的對應條目。"

28422 +

28423 +#~ msgid "git archive: Remote with no URL"

28424 +#~ msgstr "git archive: 未提供遠端 URL"

28425 +

28426 +#~ msgid "only one action at a time"

28427 +#~ msgstr "一次只能有一個動作"

28428 +

28429 +#~ msgid "use [RFC PATCH] instead of [PATCH]"

28430 +#~ msgstr "使用 [RFC PATCH] 代替 [PATCH]"

28431 +

28432 +#, c-format

28433 +#~ msgid "no URLs configured for remote '%s'"

28434 +#~ msgstr "沒有給遠端版本庫 '%s' 設定 URL"

28435 +

28436 +#, c-format

28437 +#~ msgid "unable to copy '%s' to '%s'"

28438 +#~ msgstr "無法複製 '%s' 至 '%s'"

28439 +

28440 +#, c-format

28441 +#~ msgid "remote '%s' has no configured URL"

28442 +#~ msgstr "“%s” 遠端未設定 URL"

28443 +

28444 #, c-format

28445 #~ msgid "truncating .rej filename to %.*s.rej"

28446 #~ msgstr "正在將 .rej 檔案名稱截短為 %.*s.rej"

@@ -28045,9 +28488,6 @@ msgstr "您真的要傳送 %s？[y|N]： "

28488 #~ msgid "core.commentChar should only be one ASCII character"

28489 #~ msgstr "core.commentChar 應該是一個 ASCII 字元"

28490

28048 -#~ msgid "-x and -X cannot be used together"

28049 -#~ msgstr "-x 和 -X 不能同時使用"

28050 -

28491 #~ msgid ""

28492 #~ "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"

28493 #~ "exclude"

l10n: zh_TW: Git 2.46