freshlybakedca.ke / git
Git fork
fork atom

Merge tag 'l10n-2.50.0-v2' of https://github.com/git-l10n/git-po

l10n-2.50.0-v2

* tag 'l10n-2.50.0-v2' of https://github.com/git-l10n/git-po:
l10n: zh_TW: update translation for Git 2.50

Junio C Hamano b2bfd317 9edff09a

+643 -516
unified split
+643 -516
po/zh_TW.po
··· 30 30 msgstr "" 31 31 "Project-Id-Version: Git\n" 32 32 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" 33 - "POT-Creation-Date: 2025-03-09 10:39+0800\n" 34 - "PO-Revision-Date: 2025-03-09 10:52+0800\n" 33 + "POT-Creation-Date: 2025-06-12 22:09+0800\n" 34 + "PO-Revision-Date: 2025-06-12 22:25+0800\n" 35 35 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" 36 36 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" 37 37 "po/git-cli/zh_Hant/>\n" ··· 40 40 "Content-Type: text/plain; charset=UTF-8\n" 41 41 "Content-Transfer-Encoding: 8bit\n" 42 42 "Plural-Forms: nplurals=1; plural=0;\n" 43 - "X-Generator: Poedit 3.5\n" 43 + "X-Generator: Poedit 3.6\n" 44 44 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" 45 45 "zhconvert.org\n" 46 46 ··· 954 954 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c 955 955 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c 956 956 #: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c 957 - #: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c 958 - #: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c 959 - #: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c 960 - #: range-diff.c revision.c 957 + #: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c 958 + #: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c 959 + #: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c 961 960 #, c-format 962 961 msgid "options '%s' and '%s' cannot be used together" 963 962 msgstr "無法同時使用「%s」和「%s」選項" ··· 1838 1837 msgid "bad --attr-source or GIT_ATTR_SOURCE" 1839 1838 msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" 1840 1839 1841 - #: attr.c read-cache.c 1840 + #: attr.c read-cache.c refs/packed-backend.c 1842 1841 #, c-format 1843 1842 msgid "unable to stat '%s'" 1844 1843 msgstr "無法統計「%s」" ··· 2655 2654 msgid "bypass pre-applypatch and applypatch-msg hooks" 2656 2655 msgstr "繞過 pre-applypatch 和 applypatch-msg 掛鉤" 2657 2656 2658 - #: builtin/am.c 2657 + #: builtin/am.c builtin/cat-file.c 2659 2658 msgid "historical option -- no-op" 2660 2659 msgstr "歷史遺留選項——無作用" 2661 2660 ··· 3237 3236 3238 3237 #: builtin/blame.c 3239 3238 msgid "show output score for blame entries" 3240 - msgstr "顯示溯源項目的輸出得分" 3239 + msgstr "顯示溯源項目的輸出分數" 3241 3240 3242 3241 #: builtin/blame.c 3243 3242 msgid "show original filename (Default: auto)" ··· 3702 3701 3703 3702 #: builtin/branch.c 3704 3703 msgid "" 3705 - "branch with --recurse-submodules can only be used if submodule." 3706 - "propagateBranches is enabled" 3704 + "branch with --recurse-submodules can only be used if " 3705 + "submodule.propagateBranches is enabled" 3707 3706 msgstr "" 3708 3707 "有 --recurse-submodules 的分支，只能在啟用 submodule.propagateBranches 時使用" 3709 3708 ··· 3967 3966 msgid "Unbundling objects" 3968 3967 msgstr "正在拆分物件" 3969 3968 3970 - #: builtin/cat-file.c merge-recursive.c 3969 + #: builtin/cat-file.c 3971 3970 #, c-format 3972 3971 msgid "cannot read object %s '%s'" 3973 3972 msgstr "無法讀取物件 %s「%s」" ··· 4004 4003 msgstr "git cat-file <type> <object>" 4005 4004 4006 4005 #: builtin/cat-file.c 4007 - msgid "git cat-file (-e | -p) <object>" 4008 - msgstr "git cat-file (-e | -p) <object>" 4009 - 4010 - #: builtin/cat-file.c 4011 - msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" 4012 - msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>" 4006 + #| msgid "git cat-file (-e | -p) <object>" 4007 + msgid "git cat-file (-e | -p | -t | -s) <object>" 4008 + msgstr "git cat-file (-e | -p | -t | -s) <object>" 4013 4009 4014 4010 #: builtin/cat-file.c 4015 4011 msgid "" ··· 4056 4052 msgid "show object size" 4057 4053 msgstr "顯示物件大小" 4058 4054 4059 - #: builtin/cat-file.c 4060 - msgid "allow -s and -t to work with broken/corrupt objects" 4061 - msgstr "允許 -s 和 -t 對損壞的物件生效" 4062 - 4063 4055 #: builtin/cat-file.c builtin/log.c 4064 4056 msgid "use mail map file" 4065 4057 msgstr "使用信件映射檔案" ··· 4129 4121 #: builtin/cat-file.c 4130 4122 msgid "use a <path> for (--textconv | --filters); Not with 'batch'" 4131 4123 msgstr "請在 (--textconv | --filters) 使用 <path>，而非「batch」" 4124 + 4125 + #: builtin/cat-file.c 4126 + msgid "objects filter only supported in batch mode" 4127 + msgstr "物件過濾器僅支援批次模式" 4128 + 4129 + #: builtin/cat-file.c 4130 + #, c-format 4131 + msgid "objects filter not supported: '%s'" 4132 + msgstr "不支援的物件過濾器：「%s」" 4132 4133 4133 4134 #: builtin/cat-file.c 4134 4135 #, c-format ··· 5642 5643 msgstr "git commit-tree：讀取失敗" 5643 5644 5644 5645 #: builtin/commit.c 5645 - #| msgid "" 5646 - #| "git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" 5647 - #| " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" 5648 - #| "reword):]<commit>]\n" 5649 - #| " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" 5650 - #| " [--allow-empty-message] [--no-verify] [-e] [--" 5651 - #| "author=<author>]\n" 5652 - #| " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" 5653 - #| " [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" 5654 - #| " [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" 5655 - #| " [--] [<pathspec>...]" 5656 5646 msgid "" 5657 5647 "git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]\n" 5658 5648 " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|" ··· 6933 6923 msgid "specify the content of the diagnostic archive" 6934 6924 msgstr "指定診斷封存檔的內容" 6935 6925 6926 + #: builtin/diff-pairs.c 6927 + #, c-format 6928 + msgid "unable to parse mode: %s" 6929 + msgstr "無法解析模式：%s" 6930 + 6931 + #: builtin/diff-pairs.c 6932 + #, c-format 6933 + msgid "unable to parse object id: %s" 6934 + msgstr "無法解析物件 ID：%s" 6935 + 6936 + #: builtin/diff-pairs.c 6937 + #| msgid "git repack [<options>]" 6938 + msgid "git diff-pairs -z [<diff-options>]" 6939 + msgstr "git diff-pairs -z [<diff-options>]" 6940 + 6941 + #: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c 6942 + #: bundle.c 6943 + #, c-format 6944 + msgid "unrecognized argument: %s" 6945 + msgstr "不認識的引數：%s" 6946 + 6947 + #: builtin/diff-pairs.c 6948 + msgid "working without -z is not supported" 6949 + msgstr "不支援在無 -z 的情況下運作" 6950 + 6951 + #: builtin/diff-pairs.c 6952 + msgid "pathspec arguments not supported" 6953 + msgstr "不支援路徑規格引數" 6954 + 6955 + #: builtin/diff-pairs.c 6956 + msgid "revision arguments not allowed" 6957 + msgstr "不允許有修訂版本引數" 6958 + 6959 + #: builtin/diff-pairs.c 6960 + msgid "invalid raw diff input" 6961 + msgstr "無效的原始 diff 輸入" 6962 + 6963 + #: builtin/diff-pairs.c 6964 + msgid "tree objects not supported" 6965 + msgstr "不支援樹狀物件" 6966 + 6967 + #: builtin/diff-pairs.c 6968 + msgid "got EOF while reading path" 6969 + msgstr "讀取路徑時遇到 EOF" 6970 + 6971 + #: builtin/diff-pairs.c 6972 + msgid "got EOF while reading destination path" 6973 + msgstr "讀取目的地路徑時遇到 EOF" 6974 + 6975 + #: builtin/diff-pairs.c 6976 + #, c-format 6977 + msgid "unable to parse rename/copy score: %s" 6978 + msgstr "無法解析重新命名/複製分數：%s" 6979 + 6980 + #: builtin/diff-pairs.c 6981 + #, c-format 6982 + msgid "unknown diff status: %c" 6983 + msgstr "非預期的 diff 狀態：%c" 6984 + 6936 6985 #: builtin/diff-tree.c 6937 6986 msgid "--merge-base only works with two commits" 6938 6987 msgstr "--merge-base 只對 2 個以上的提交有用" ··· 7110 7159 msgstr "選擇如何處理簽名標籤" 7111 7160 7112 7161 #: builtin/fast-export.c 7162 + msgid "select handling of signed commits" 7163 + msgstr "選擇如何處理簽名提交" 7164 + 7165 + #: builtin/fast-export.c 7113 7166 msgid "select handling of tags that tag filtered objects" 7114 7167 msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" 7115 7168 ··· 7369 7422 msgid "option \"%s\" is ignored for %s" 7370 7423 msgstr "選項「%s」被 %s 忽略" 7371 7424 7372 - #: builtin/fetch.c object-file.c 7425 + #: builtin/fetch.c object-store.c 7373 7426 #, c-format 7374 7427 msgid "%s is not a valid object" 7375 7428 msgstr "%s 不是一個有效的物件" ··· 7636 7689 7637 7690 #: builtin/fetch.c 7638 7691 msgid "" 7639 - "--filter can only be used with the remote configured in extensions." 7640 - "partialclone" 7692 + "--filter can only be used with the remote configured in " 7693 + "extensions.partialclone" 7641 7694 msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" 7642 7695 7643 7696 #: builtin/fetch.c ··· 7912 7965 7913 7966 #: builtin/fsck.c 7914 7967 #, c-format 7915 - msgid "%s: object is of unknown type '%s': %s" 7916 - msgstr "%s：物件屬於「%s」未知類型：%s" 7917 - 7918 - #: builtin/fsck.c 7919 - #, c-format 7920 7968 msgid "%s: object could not be parsed: %s" 7921 7969 msgstr "%s：不能解析物件：%s" 7922 7970 ··· 7988 8036 msgstr "「%s」封裝的修訂版索引 (rev-index) 無效" 7989 8037 7990 8038 #: builtin/fsck.c 8039 + msgid "Checking ref database" 8040 + msgstr "正在檢查引用資料庫" 8041 + 8042 + #: builtin/fsck.c 8043 + #| msgid "" 8044 + #| "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" 8045 + #| " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" 8046 + #| " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" 8047 + #| " [--[no-]name-objects] [<object>...]" 7991 8048 msgid "" 7992 8049 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" 7993 8050 " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" 7994 8051 " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" 7995 - " [--[no-]name-objects] [<object>...]" 8052 + " [--[no-]name-objects] [--[no-]references] [<object>...]" 7996 8053 msgstr "" 7997 8054 "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" 7998 8055 " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" 7999 8056 " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" 8000 - " [--[no-]name-objects] [<object>...]" 8057 + " [--[no-]name-objects] [--[no-]references] [<object>...]" 8001 8058 8002 8059 #: builtin/fsck.c 8003 8060 msgid "show unreachable objects" ··· 8047 8104 msgid "show verbose names for reachable objects" 8048 8105 msgstr "顯示可以取得物件的詳細名稱" 8049 8106 8107 + #: builtin/fsck.c 8108 + msgid "check reference database consistency" 8109 + msgstr "正在檢查資料庫一致性" 8110 + 8050 8111 #: builtin/fsck.c builtin/index-pack.c 8051 8112 msgid "Checking objects" 8052 8113 msgstr "正在檢查物件" ··· 8221 8282 8222 8283 #: builtin/gc.c builtin/repack.c 8223 8284 msgid "with --cruft, limit the size of new cruft packs" 8224 - msgstr "搭配 --cruft，限制新廢棄封裝的大小" 8285 + msgstr "搭配 --cruft，限制新無用包的大小" 8225 8286 8226 8287 #: builtin/gc.c 8227 8288 msgid "be more thorough (increased runtime)" ··· 8732 8793 8733 8794 #: builtin/grep.c 8734 8795 msgid "indicate hit with exit status without output" 8735 - msgstr "不輸出，而用離開碼標記命中狀態" 8796 + msgstr "不輸出，而用結束狀態碼標記命中狀態" 8736 8797 8737 8798 #: builtin/grep.c 8738 8799 msgid "show only matches from files that match all patterns" ··· 9473 9534 "<file>" 9474 9535 msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" 9475 9536 9476 - #: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c 9477 - #, c-format 9478 - msgid "unrecognized argument: %s" 9479 - msgstr "不認識的引數：%s" 9480 - 9481 9537 #: builtin/log.c 9482 9538 msgid "-L<range>:<file> cannot be used with pathspec" 9483 9539 msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" ··· 10310 10366 msgstr "亦顯示資訊性或衝突訊息" 10311 10367 10312 10368 #: builtin/merge-tree.c 10369 + msgid "suppress all output; only exit status wanted" 10370 + msgstr "隱藏所有輸出，只需要結束狀態碼" 10371 + 10372 + #: builtin/merge-tree.c 10313 10373 msgid "list filenames without modes/oids/stages" 10314 10374 msgstr "列出檔名，但不附加 modes/oids/stages" 10315 10375 ··· 10471 10531 msgid "Already up to date. (nothing to squash)" 10472 10532 msgstr "已經是最新的。（無需壓縮 (squash)）" 10473 10533 10474 - #: builtin/merge.c merge-ort-wrappers.c merge-recursive.c 10534 + #: builtin/merge.c merge-ort-wrappers.c 10475 10535 msgid "Already up to date." 10476 10536 msgstr "已經是最新的。" 10477 10537 ··· 10495 10555 msgid "Bad branch.%s.mergeoptions string: %s" 10496 10556 msgstr "壞的 branch.%s.mergeoptions 字串：%s" 10497 10557 10498 - #: builtin/merge.c merge-recursive.c 10558 + #: builtin/merge.c merge-ort-wrappers.c 10499 10559 msgid "Unable to write index." 10500 10560 msgstr "不能寫入索引。" 10501 10561 ··· 10651 10711 msgid "Updating %s..%s\n" 10652 10712 msgstr "更新 %s..%s\n" 10653 10713 10654 - #: builtin/merge.c merge-ort-wrappers.c merge-recursive.c 10714 + #: builtin/merge.c merge-ort-wrappers.c 10655 10715 #, c-format 10656 10716 msgid "" 10657 10717 "Your local changes to the following files would be overwritten by merge:\n" ··· 10813 10873 msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" 10814 10874 10815 10875 #: builtin/mv.c 10816 - msgid "git mv [<options>] <source>... <destination>" 10817 - msgstr "git mv [<選項>] <來源>... <目的地>" 10876 + #| msgid "git mv [<options>] <source>... <destination>" 10877 + msgid "git mv [-v] [-f] [-n] [-k] <source> <destination>" 10878 + msgstr "git mv [-v] [-f] [-n] [-k] <source> <destination>" 10879 + 10880 + #: builtin/mv.c 10881 + #| msgid "git mv [<options>] <source>... <destination>" 10882 + msgid "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>" 10883 + msgstr "git mv [-v] [-f] [-n] [-k] <source>... <destination-directory>" 10818 10884 10819 10885 #: builtin/mv.c 10820 10886 #, c-format ··· 10904 10970 10905 10971 #: builtin/mv.c 10906 10972 #, c-format 10973 + msgid "cannot move both '%s' and its parent directory '%s'" 10974 + msgstr "無法同時移動「%s」和其上層目錄「%s」" 10975 + 10976 + #: builtin/mv.c 10977 + #, c-format 10907 10978 msgid "Renaming %s to %s\n" 10908 10979 msgstr "重新命名 %s 至 %s\n" 10909 10980 ··· 11534 11605 11535 11606 #: builtin/pack-objects.c 11536 11607 msgid "Enumerating cruft objects" 11537 - msgstr "正在枚舉廢棄物件" 11608 + msgstr "正在枚舉無用物件" 11538 11609 11539 11610 #: builtin/pack-objects.c 11540 11611 msgid "unable to add cruft objects" 11541 - msgstr "無法加入廢棄物件" 11612 + msgstr "無法加入無用物件" 11542 11613 11543 11614 #: builtin/pack-objects.c 11544 11615 msgid "Traversing cruft objects" 11545 - msgstr "正在遍歷廢棄物件" 11616 + msgstr "正在遍歷無用物件" 11546 11617 11547 11618 #: builtin/pack-objects.c 11548 11619 #, c-format ··· 11564 11635 11565 11636 #: builtin/pack-objects.c reachable.c 11566 11637 msgid "could not load cruft pack .mtimes" 11567 - msgstr "無法載入廢棄封包 .mtimes" 11638 + msgstr "無法載入無用包 .mtimes" 11568 11639 11569 11640 #: builtin/pack-objects.c 11570 11641 msgid "cannot open pack index" ··· 11709 11780 11710 11781 #: builtin/pack-objects.c 11711 11782 msgid "create a cruft pack" 11712 - msgstr "建立廢棄封包" 11783 + msgstr "建立無用包" 11713 11784 11714 11785 #: builtin/pack-objects.c 11715 11786 msgid "expire cruft objects older than <time>" 11716 - msgstr "將早於 <time> 的廢棄物件設為過期" 11787 + msgstr "將早於 <time> 的無用物件設為過期" 11717 11788 11718 11789 #: builtin/pack-objects.c 11719 11790 msgid "use the sparse reachability algorithm" ··· 12042 12113 #, c-format 12043 12114 msgid "unable to access commit %s" 12044 12115 msgstr "無法存取提交 %s" 12116 + 12117 + #: builtin/pull.c refspec.c 12118 + #, c-format 12119 + msgid "invalid refspec '%s'" 12120 + msgstr "無效的引用規格：「%s」" 12045 12121 12046 12122 #: builtin/pull.c 12047 12123 msgid "ignoring --verify-signatures for rebase" ··· 13150 13226 msgstr "git reflog exists <引用>" 13151 13227 13152 13228 #: builtin/reflog.c 13229 + msgid "git reflog drop [--all [--single-worktree] | <refs>...]" 13230 + msgstr "git reflog drop [--all [--single-worktree] | <refs>...]" 13231 + 13232 + #: builtin/reflog.c 13153 13233 #, c-format 13154 13234 msgid "invalid timestamp '%s' given to '--%s'" 13155 13235 msgstr "傳入「--%s」的時間戳「%s」無效" ··· 13209 13289 13210 13290 #: builtin/reflog.c 13211 13291 #, c-format 13212 - msgid "%s points nowhere!" 13213 - msgstr "%s 指向不存在！" 13292 + msgid "reflog could not be found: '%s'" 13293 + msgstr "找不到引用日誌：「%s」" 13214 13294 13215 13295 #: builtin/reflog.c 13216 13296 msgid "no reflog specified to delete" ··· 13221 13301 msgid "invalid ref format: %s" 13222 13302 msgstr "無效的引用格式：%s" 13223 13303 13304 + #: builtin/reflog.c 13305 + msgid "drop the reflogs of all references" 13306 + msgstr "捨棄所有引用的引用日誌" 13307 + 13308 + #: builtin/reflog.c 13309 + msgid "drop reflogs from the current worktree only" 13310 + msgstr "只捨棄目前工作目錄的引用日誌" 13311 + 13312 + #: builtin/reflog.c 13313 + msgid "references specified along with --all" 13314 + msgstr "同時指定參照和 --all 引數" 13315 + 13224 13316 #: builtin/refs.c 13225 - #| msgid "git refs migrate --ref-format=<format> [--dry-run]" 13226 13317 msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" 13227 13318 msgstr "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]" 13228 13319 ··· 13890 13981 13891 13982 #: builtin/repack.c 13892 13983 msgid "same as -a, pack unreachable cruft objects separately" 13893 - msgstr "和 -a 相同，會獨立封裝無法存取的廢棄物件" 13984 + msgstr "和 -a 相同，會獨立封裝無法存取的無用物件" 13894 13985 13895 13986 #: builtin/repack.c 13896 13987 msgid "approxidate" ··· 13898 13989 13899 13990 #: builtin/repack.c 13900 13991 msgid "with --cruft, expire objects older than this" 13901 - msgstr "搭配 --cruft 會將早於此的物件標為過期" 13992 + msgstr "搭配 --cruft，會將早於此的物件標為過期" 13993 + 13994 + #: builtin/repack.c 13995 + msgid "with --cruft, only repack cruft packs smaller than this" 13996 + msgstr "搭配 --cruft，僅重新打包小於此大小的無用包" 13902 13997 13903 13998 #: builtin/repack.c 13904 13999 msgid "remove redundant packs, and run git-prune-packed" ··· 14492 14587 #, c-format 14493 14588 msgid "invalid value for '%s': '%s', the only allowed format is '%s'" 14494 14589 msgstr "「%s」的數值無效：「%s」，唯一允許的格式是「%s」" 14590 + 14591 + #: builtin/rev-list.c 14592 + msgid "-z option used with unsupported option" 14593 + msgstr "-z 選項與不支援的選項一起使用" 14495 14594 14496 14595 #: builtin/rev-list.c 14497 14596 msgid "rev-list does not support display of notes" ··· 16757 16856 msgstr "git update-ref [<options>] <refname> <new-oid> [<old-oid>]" 16758 16857 16759 16858 #: builtin/update-ref.c 16760 - msgid "git update-ref [<options>] --stdin [-z]" 16761 - msgstr "git update-ref [<選項>] --stdin [-z]" 16859 + #| msgid "git update-ref [<options>] --stdin [-z]" 16860 + msgid "git update-ref [<options>] --stdin [-z] [--batch-updates]" 16861 + msgstr "git update-ref [<options>] --stdin [-z] [--batch-updates]" 16762 16862 16763 16863 #: builtin/update-ref.c 16764 16864 msgid "delete the reference" ··· 16775 16875 #: builtin/update-ref.c 16776 16876 msgid "read updates from stdin" 16777 16877 msgstr "從標準輸入讀取更新" 16878 + 16879 + #: builtin/update-ref.c 16880 + msgid "batch reference updates" 16881 + msgstr "批次引用更新" 16778 16882 16779 16883 #: builtin/update-server-info.c 16780 16884 msgid "update the info files from scratch" ··· 17620 17724 msgstr "將一個樹和工作區或索引做比較" 17621 17725 17622 17726 #: command-list.h 17727 + msgid "Compare the content and mode of provided blob pairs" 17728 + msgstr "比較指定的兩個資料物件的內容和模式" 17729 + 17730 + #: command-list.h 17623 17731 msgid "Compares the content and mode of blobs found via two tree objects" 17624 17732 msgstr "比較兩個樹狀物件的檔案內容和模式" 17625 17733 ··· 18858 18966 "remote URLs cannot be configured in file directly or indirectly included by " 18859 18967 "includeIf.hasconfig:remote.*.url" 18860 18968 msgstr "" 18861 - "無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*." 18862 - "url 引入" 18969 + "無法在檔案設定遠端 URL，無論是直接或間接透過 " 18970 + "includeIf.hasconfig:remote.*.url 引入" 18863 18971 18864 18972 #: config.c 18865 18973 #, c-format ··· 19738 19846 msgid "Unknown value for 'diff.submodule' config variable: '%s'" 19739 19847 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" 19740 19848 19741 - #: diff.c merge-recursive.c transport.c 19849 + #: diff.c merge-ort.c transport.c 19742 19850 #, c-format 19743 19851 msgid "unknown value for config '%s': %s" 19744 19852 msgstr "設定 '%s' 的取值未知：%s" ··· 21163 21271 msgid "Unknown value for http.proactiveauth" 21164 21272 msgstr "http.proactiveauth 的值未知" 21165 21273 21274 + #: http.c parse.c 21275 + #, c-format 21276 + msgid "failed to parse %s" 21277 + msgstr "解析 %s 失敗" 21278 + 21166 21279 #: http.c 21167 21280 #, c-format 21168 21281 msgid "Unsupported SSL backend '%s'. Supported SSL backends:" ··· 21388 21501 msgid "invalid marker-size '%s', expecting an integer" 21389 21502 msgstr "無效的 marker-size「%s」，應為整數" 21390 21503 21391 - #: merge-ort.c merge-recursive.c 21504 + #: merge-ort-wrappers.c 21505 + #, c-format 21506 + msgid "Could not parse object '%s'" 21507 + msgstr "無法解析物件「%s」" 21508 + 21509 + #: merge-ort.c 21392 21510 #, c-format 21393 21511 msgid "Failed to merge submodule %s (not checked out)" 21394 21512 msgstr "無法合併子模組 %s （沒有簽出）" ··· 21398 21516 msgid "Failed to merge submodule %s (no merge base)" 21399 21517 msgstr "無法合併 %s 子模組（沒有合併基底）" 21400 21518 21401 - #: merge-ort.c merge-recursive.c 21519 + #: merge-ort.c 21402 21520 #, c-format 21403 21521 msgid "Failed to merge submodule %s (commits not present)" 21404 21522 msgstr "無法合併子模組 %s（提交不存在）" ··· 21408 21526 msgid "error: failed to merge submodule %s (repository corrupt)" 21409 21527 msgstr "錯誤：無法合併子模組 %s （版本庫損壞）" 21410 21528 21411 - #: merge-ort.c merge-recursive.c 21529 + #: merge-ort.c 21412 21530 #, c-format 21413 21531 msgid "Failed to merge submodule %s (commits don't follow merge-base)" 21414 21532 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" ··· 21448 21566 msgid "error: unable to add %s to database" 21449 21567 msgstr "錯誤：無法將 %s 加進資料庫" 21450 21568 21451 - #: merge-ort.c merge-recursive.c 21569 + #: merge-ort.c 21452 21570 #, c-format 21453 21571 msgid "Auto-merging %s" 21454 21572 msgstr "自動合併 %s" 21455 21573 21456 - #: merge-ort.c merge-recursive.c 21574 + #: merge-ort.c 21457 21575 #, c-format 21458 21576 msgid "" 21459 21577 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " ··· 21462 21580 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" 21463 21581 "放在：%s。" 21464 21582 21465 - #: merge-ort.c merge-recursive.c 21583 + #: merge-ort.c 21466 21584 #, c-format 21467 21585 msgid "" 21468 21586 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " ··· 21481 21599 "衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" 21482 21600 "錄，但沒有目的地取得過半檔案。" 21483 21601 21484 - #: merge-ort.c merge-recursive.c 21602 + #: merge-ort.c 21485 21603 #, c-format 21486 21604 msgid "" 21487 21605 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " 21488 21606 "renamed." 21489 21607 msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" 21490 21608 21491 - #: merge-ort.c merge-recursive.c 21609 + #: merge-ort.c 21492 21610 #, c-format 21493 21611 msgid "" 21494 21612 "Path updated: %s added in %s inside a directory that was renamed in %s; " ··· 21496 21614 msgstr "" 21497 21615 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" 21498 21616 21499 - #: merge-ort.c merge-recursive.c 21617 + #: merge-ort.c 21500 21618 #, c-format 21501 21619 msgid "" 21502 21620 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " ··· 21505 21623 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" 21506 21624 "其移動到 %5$s。" 21507 21625 21508 - #: merge-ort.c merge-recursive.c 21626 + #: merge-ort.c 21509 21627 #, c-format 21510 21628 msgid "" 21511 21629 "CONFLICT (file location): %s added in %s inside a directory that was renamed " ··· 21514 21632 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" 21515 21633 "動到 %s。" 21516 21634 21517 - #: merge-ort.c merge-recursive.c 21635 + #: merge-ort.c 21518 21636 #, c-format 21519 21637 msgid "" 21520 21638 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " ··· 21581 21699 "衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" 21582 21700 "分別記錄這兩方檔案。" 21583 21701 21584 - #: merge-ort.c merge-recursive.c 21702 + #: merge-ort.c 21585 21703 msgid "content" 21586 21704 msgstr "內容" 21587 21705 21588 - #: merge-ort.c merge-recursive.c 21706 + #: merge-ort.c 21589 21707 msgid "add/add" 21590 21708 msgstr "新增/新增" 21591 21709 21592 - #: merge-ort.c merge-recursive.c 21710 + #: merge-ort.c 21593 21711 msgid "submodule" 21594 21712 msgstr "子模組" 21595 21713 21596 - #: merge-ort.c merge-recursive.c 21714 + #: merge-ort.c 21597 21715 #, c-format 21598 21716 msgid "CONFLICT (%s): Merge conflict in %s" 21599 21717 msgstr "衝突（%s）：合併衝突於 %s" ··· 21655 21773 msgid "collecting merge info failed for trees %s, %s, %s" 21656 21774 msgstr "%s, %s, %s 樹的合併資訊收集失敗" 21657 21775 21658 - #: merge-recursive.c 21659 - msgid "(bad commit)\n" 21660 - msgstr "（壞提交）\n" 21661 - 21662 - #: merge-recursive.c 21663 - #, c-format 21664 - msgid "add_cacheinfo failed for path '%s'; merge aborting." 21665 - msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" 21666 - 21667 - #: merge-recursive.c 21668 - #, c-format 21669 - msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." 21670 - msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" 21671 - 21672 - #: merge-recursive.c 21673 - #, c-format 21674 - msgid "failed to create path '%s'%s" 21675 - msgstr "建立路徑 '%s'%s 失敗" 21676 - 21677 - #: merge-recursive.c 21678 - #, c-format 21679 - msgid "Removing %s to make room for subdirectory\n" 21680 - msgstr "刪除 %s 以便為子目錄留出空間\n" 21681 - 21682 - #: merge-recursive.c 21683 - msgid ": perhaps a D/F conflict?" 21684 - msgstr "：可能是一個目錄/檔案衝突？" 21685 - 21686 - #: merge-recursive.c 21687 - #, c-format 21688 - msgid "refusing to lose untracked file at '%s'" 21689 - msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" 21690 - 21691 - #: merge-recursive.c 21692 - #, c-format 21693 - msgid "blob expected for %s '%s'" 21694 - msgstr "%s '%s' 應為資料物件" 21695 - 21696 - #: merge-recursive.c 21697 - #, c-format 21698 - msgid "failed to open '%s': %s" 21699 - msgstr "開啟 '%s' 失敗：%s" 21700 - 21701 - #: merge-recursive.c 21702 - #, c-format 21703 - msgid "failed to symlink '%s': %s" 21704 - msgstr "建立符號連結 '%s' 失敗：%s" 21705 - 21706 - #: merge-recursive.c 21707 - #, c-format 21708 - msgid "do not know what to do with %06o %s '%s'" 21709 - msgstr "不知道如何處理 %06o %s '%s'" 21710 - 21711 - #: merge-recursive.c 21712 - #, c-format 21713 - msgid "Failed to merge submodule %s (repository corrupt)" 21714 - msgstr "無法合併子模組 %s （版本庫損壞）" 21715 - 21716 - #: merge-recursive.c 21717 - #, c-format 21718 - msgid "Fast-forwarding submodule %s to the following commit:" 21719 - msgstr "子模組 %s 快轉到如下提交：" 21720 - 21721 - #: merge-recursive.c 21722 - #, c-format 21723 - msgid "Fast-forwarding submodule %s" 21724 - msgstr "快轉子模組 %s" 21725 - 21726 - #: merge-recursive.c 21727 - #, c-format 21728 - msgid "Failed to merge submodule %s (merge following commits not found)" 21729 - msgstr "無法合併子模組 %s （找不到合併跟隨的提交）" 21730 - 21731 - #: merge-recursive.c 21732 - #, c-format 21733 - msgid "Failed to merge submodule %s (not fast-forward)" 21734 - msgstr "無法合併子模組 %s（非快轉）" 21735 - 21736 - #: merge-recursive.c 21737 - msgid "Found a possible merge resolution for the submodule:\n" 21738 - msgstr "找到子模組的一個可能的合併方案：\n" 21739 - 21740 - #: merge-recursive.c 21741 - #, c-format 21742 - msgid "" 21743 - "If this is correct simply add it to the index for example\n" 21744 - "by using:\n" 21745 - "\n" 21746 - " git update-index --cacheinfo 160000 %s \"%s\"\n" 21747 - "\n" 21748 - "which will accept this suggestion.\n" 21749 - msgstr "" 21750 - "正確的話，就能直接加進索引，例如執行下述命令：\n" 21751 - "\n" 21752 - " git update-index --cacheinfo 160000 %s \"%s\"\n" 21753 - "\n" 21754 - "接受本建議。\n" 21755 - 21756 - #: merge-recursive.c 21757 - #, c-format 21758 - msgid "Failed to merge submodule %s (multiple merges found)" 21759 - msgstr "無法合併子模組 %s （發現多個合併）" 21760 - 21761 - #: merge-recursive.c 21762 - msgid "failed to execute internal merge" 21763 - msgstr "無法執行內部合併" 21764 - 21765 - #: merge-recursive.c 21766 - #, c-format 21767 - msgid "unable to add %s to database" 21768 - msgstr "無法將 %s 加進資料庫" 21769 - 21770 - #: merge-recursive.c 21771 - #, c-format 21772 - msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." 21773 - msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" 21774 - 21775 - #: merge-recursive.c 21776 - #, c-format 21777 - msgid "" 21778 - "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " 21779 - "in tree." 21780 - msgstr "" 21781 - "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" 21782 - "本被保留。" 21783 - 21784 - #: merge-recursive.c 21785 - #, c-format 21786 - msgid "" 21787 - "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " 21788 - "left in tree." 21789 - msgstr "" 21790 - "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " 21791 - "%7$s 版本被保留。" 21792 - 21793 - #: merge-recursive.c 21794 - #, c-format 21795 - msgid "" 21796 - "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " 21797 - "in tree at %s." 21798 - msgstr "" 21799 - "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" 21800 - "本保留在 %8$s 中。" 21801 - 21802 - #: merge-recursive.c 21803 - #, c-format 21804 - msgid "" 21805 - "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " 21806 - "left in tree at %s." 21807 - msgstr "" 21808 - "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " 21809 - "%7$s 版本保留在 %9$s 中。" 21810 - 21811 - #: merge-recursive.c 21812 - msgid "rename" 21813 - msgstr "重新命名" 21814 - 21815 - #: merge-recursive.c 21816 - msgid "renamed" 21817 - msgstr "已重新命名" 21818 - 21819 - #: merge-recursive.c 21820 - #, c-format 21821 - msgid "Refusing to lose dirty file at %s" 21822 - msgstr "拒絕遺失髒檔案 '%s'" 21823 - 21824 - #: merge-recursive.c 21825 - #, c-format 21826 - msgid "Refusing to lose untracked file at %s, even though it's in the way." 21827 - msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" 21828 - 21829 - #: merge-recursive.c 21830 - #, c-format 21831 - msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" 21832 - msgstr "" 21833 - "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" 21834 - 21835 - #: merge-recursive.c 21836 - #, c-format 21837 - msgid "%s is a directory in %s adding as %s instead" 21838 - msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" 21839 - 21840 - #: merge-recursive.c 21841 - #, c-format 21842 - msgid "Refusing to lose untracked file at %s; adding as %s instead" 21843 - msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" 21844 - 21845 - #: merge-recursive.c 21846 - #, c-format 21847 - msgid "" 21848 - "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " 21849 - "\"%s\"->\"%s\" in \"%s\"%s" 21850 - msgstr "" 21851 - "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" 21852 - "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" 21853 - 21854 - #: merge-recursive.c 21855 - msgid " (left unresolved)" 21856 - msgstr " （留下未解決）" 21857 - 21858 - #: merge-recursive.c 21859 - #, c-format 21860 - msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" 21861 - msgstr "" 21862 - "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " 21863 - "%4$s->%5$s" 21864 - 21865 - #: merge-recursive.c 21866 - #, c-format 21867 - msgid "" 21868 - "CONFLICT (directory rename split): Unclear where to place %s because " 21869 - "directory %s was renamed to multiple other directories, with no destination " 21870 - "getting a majority of the files." 21871 - msgstr "" 21872 - "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" 21873 - "多個其它目錄，沒有目錄包含大部分檔案。" 21874 - 21875 - #: merge-recursive.c 21876 - #, c-format 21877 - msgid "" 21878 - "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" 21879 - ">%s in %s" 21880 - msgstr "" 21881 - "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" 21882 - "命名目錄 %4$s->%5$s" 21883 - 21884 - #: merge-recursive.c 21885 - #, c-format 21886 - msgid "cannot read object %s" 21887 - msgstr "不能讀取物件 %s" 21888 - 21889 - #: merge-recursive.c 21890 - #, c-format 21891 - msgid "object %s is not a blob" 21892 - msgstr "物件 %s 不是一個資料物件" 21893 - 21894 - #: merge-recursive.c 21895 - msgid "modify" 21896 - msgstr "修改" 21897 - 21898 - #: merge-recursive.c 21899 - msgid "modified" 21900 - msgstr "修改" 21901 - 21902 - #: merge-recursive.c 21903 - #, c-format 21904 - msgid "Skipped %s (merged same as existing)" 21905 - msgstr "略過 %s（已經做過相同合併）" 21906 - 21907 - #: merge-recursive.c 21908 - #, c-format 21909 - msgid "Adding as %s instead" 21910 - msgstr "而是以 %s 為名新增" 21911 - 21912 - #: merge-recursive.c 21913 - #, c-format 21914 - msgid "Removing %s" 21915 - msgstr "刪除 %s" 21916 - 21917 - #: merge-recursive.c 21918 - msgid "file/directory" 21919 - msgstr "檔案/目錄" 21920 - 21921 - #: merge-recursive.c 21922 - msgid "directory/file" 21923 - msgstr "目錄/檔案" 21924 - 21925 - #: merge-recursive.c 21926 - #, c-format 21927 - msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" 21928 - msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" 21929 - 21930 - #: merge-recursive.c 21931 - #, c-format 21932 - msgid "Adding %s" 21933 - msgstr "新增 %s" 21934 - 21935 - #: merge-recursive.c 21936 - #, c-format 21937 - msgid "CONFLICT (add/add): Merge conflict in %s" 21938 - msgstr "衝突（add/add）：合併衝突於 %s" 21939 - 21940 - #: merge-recursive.c 21941 - #, c-format 21942 - msgid "merging of trees %s and %s failed" 21943 - msgstr "無法合併樹 %s 和 %s" 21944 - 21945 - #: merge-recursive.c 21946 - msgid "Merging:" 21947 - msgstr "合併：" 21948 - 21949 - #: merge-recursive.c 21950 - #, c-format 21951 - msgid "found %u common ancestor:" 21952 - msgid_plural "found %u common ancestors:" 21953 - msgstr[0] "發現 %u 個共同祖先：" 21954 - 21955 - #: merge-recursive.c 21956 - msgid "merge returned no commit" 21957 - msgstr "合併未返回提交" 21958 - 21959 - #: merge-recursive.c 21960 - #, c-format 21961 - msgid "Could not parse object '%s'" 21962 - msgstr "無法解析物件「%s」" 21963 - 21964 21776 #: merge.c 21965 21777 msgid "failed to read the cache" 21966 21778 msgstr "讀取快取失敗" ··· 22014 21826 msgstr "清理位於 %s 的多包索引失敗" 22015 21827 22016 21828 #: midx-write.c 22017 - msgid "cannot write incremental MIDX with bitmap" 22018 - msgstr "無法寫入有位圖的增量 MIDX" 21829 + msgid "ignoring existing multi-pack-index; checksum mismatch" 21830 + msgstr "忽略現有的多包索引：總和檢查碼不符" 22019 21831 22020 21832 #: midx-write.c 22021 - msgid "ignoring existing multi-pack-index; checksum mismatch" 22022 - msgstr "忽略現有的多包索引：總和檢查碼不符" 21833 + #, c-format 21834 + msgid "could not load reverse index for MIDX %s" 21835 + msgstr "無法載入 MIDX %s 的反向索引" 22023 21836 22024 21837 #: midx-write.c 22025 21838 msgid "Adding packfiles to multi-pack-index" ··· 22337 22150 22338 22151 #: object-file.c 22339 22152 #, c-format 22340 - msgid "object directory %s does not exist; check .git/objects/info/alternates" 22341 - msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" 22342 - 22343 - #: object-file.c 22344 - #, c-format 22345 - msgid "unable to normalize alternate object path: %s" 22346 - msgstr "無法規範化備用物件路徑：%s" 22347 - 22348 - #: object-file.c 22349 - #, c-format 22350 - msgid "%s: ignoring alternate object stores, nesting too deep" 22351 - msgstr "%s：忽略備用物件庫，嵌套太深" 22352 - 22353 - #: object-file.c 22354 - msgid "unable to fdopen alternates lockfile" 22355 - msgstr "無法 fdopen 取代鎖檔案" 22356 - 22357 - #: object-file.c 22358 - msgid "unable to read alternates file" 22359 - msgstr "無法讀取替代檔案" 22360 - 22361 - #: object-file.c 22362 - msgid "unable to move new alternates file into place" 22363 - msgstr "無法將新的替代檔案移動到位" 22364 - 22365 - #: object-file.c 22366 - #, c-format 22367 - msgid "path '%s' does not exist" 22368 - msgstr "路徑 '%s' 不存在" 22369 - 22370 - #: object-file.c 22371 - #, c-format 22372 - msgid "reference repository '%s' as a linked checkout is not supported yet." 22373 - msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" 22374 - 22375 - #: object-file.c 22376 - #, c-format 22377 - msgid "reference repository '%s' is not a local repository." 22378 - msgstr "引用版本庫 '%s' 不是一個本機版本庫。" 22379 - 22380 - #: object-file.c 22381 - #, c-format 22382 - msgid "reference repository '%s' is shallow" 22383 - msgstr "引用版本庫 '%s' 是一個淺複製" 22384 - 22385 - #: object-file.c 22386 - #, c-format 22387 - msgid "reference repository '%s' is grafted" 22388 - msgstr "引用版本庫 '%s' 已被移植" 22389 - 22390 - #: object-file.c 22391 - #, c-format 22392 - msgid "could not find object directory matching %s" 22393 - msgstr "找不到符合 %s 的物件目錄" 22394 - 22395 - #: object-file.c 22396 - #, c-format 22397 - msgid "invalid line while parsing alternate refs: %s" 22398 - msgstr "解析備用引用時無效的行：%s" 22399 - 22400 - #: object-file.c 22401 - #, c-format 22402 - msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" 22403 - msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" 22404 - 22405 - #: object-file.c 22406 - #, c-format 22407 - msgid "mmap failed%s" 22408 - msgstr "mmap 失敗%s" 22409 - 22410 - #: object-file.c 22411 - #, c-format 22412 22153 msgid "object file %s is empty" 22413 22154 msgstr "物件檔案 %s 為空" 22414 22155 ··· 22453 22194 22454 22195 #: object-file.c 22455 22196 #, c-format 22456 - msgid "replacement %s not found for %s" 22457 - msgstr "找不到 %2$s 的替代 %1$s" 22458 - 22459 - #: object-file.c 22460 - #, c-format 22461 - msgid "packed object %s (stored in %s) is corrupt" 22462 - msgstr "打包物件 %s（儲存在 %s）已損壞" 22463 - 22464 - #: object-file.c 22465 - #, c-format 22466 - msgid "missing mapping of %s to %s" 22467 - msgstr "缺少 %s 到 %s 的映射" 22468 - 22469 - #: object-file.c 22470 - #, c-format 22471 22197 msgid "unable to open %s" 22472 22198 msgstr "不能開啟 %s" 22473 22199 ··· 22584 22310 22585 22311 #: object-file.c 22586 22312 #, c-format 22587 - msgid "%s is not a valid '%s' object" 22588 - msgstr "%s 不是一個有效的 '%s' 物件" 22589 - 22590 - #: object-file.c 22591 - #, c-format 22592 22313 msgid "hash mismatch for %s (expected %s)" 22593 22314 msgstr "%s 的雜湊值不符合（預期 %s）" 22594 22315 ··· 22606 22327 #, c-format 22607 22328 msgid "unable to parse header of %s" 22608 22329 msgstr "無法解析 %s 的頭部" 22330 + 22331 + #: object-file.c 22332 + #, c-format 22333 + msgid "unable to parse type from header '%s' of %s" 22334 + msgstr "無法從 %2$s 的標頭「%1$s」解析類型" 22609 22335 22610 22336 #: object-file.c 22611 22337 #, c-format ··· 22785 22511 msgid "invalid object name '%.*s'." 22786 22512 msgstr "'%.*s' 物件名稱無效。" 22787 22513 22514 + #: object-store.c 22515 + #, c-format 22516 + msgid "object directory %s does not exist; check .git/objects/info/alternates" 22517 + msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" 22518 + 22519 + #: object-store.c 22520 + #, c-format 22521 + msgid "unable to normalize alternate object path: %s" 22522 + msgstr "無法規範化備用物件路徑：%s" 22523 + 22524 + #: object-store.c 22525 + #, c-format 22526 + msgid "%s: ignoring alternate object stores, nesting too deep" 22527 + msgstr "%s：忽略備用物件庫，嵌套太深" 22528 + 22529 + #: object-store.c 22530 + msgid "unable to fdopen alternates lockfile" 22531 + msgstr "無法 fdopen 取代鎖檔案" 22532 + 22533 + #: object-store.c 22534 + msgid "unable to read alternates file" 22535 + msgstr "無法讀取替代檔案" 22536 + 22537 + #: object-store.c 22538 + msgid "unable to move new alternates file into place" 22539 + msgstr "無法將新的替代檔案移動到位" 22540 + 22541 + #: object-store.c 22542 + #, c-format 22543 + msgid "path '%s' does not exist" 22544 + msgstr "路徑 '%s' 不存在" 22545 + 22546 + #: object-store.c 22547 + #, c-format 22548 + msgid "reference repository '%s' as a linked checkout is not supported yet." 22549 + msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" 22550 + 22551 + #: object-store.c 22552 + #, c-format 22553 + msgid "reference repository '%s' is not a local repository." 22554 + msgstr "引用版本庫 '%s' 不是一個本機版本庫。" 22555 + 22556 + #: object-store.c 22557 + #, c-format 22558 + msgid "reference repository '%s' is shallow" 22559 + msgstr "引用版本庫 '%s' 是一個淺複製" 22560 + 22561 + #: object-store.c 22562 + #, c-format 22563 + msgid "reference repository '%s' is grafted" 22564 + msgstr "引用版本庫 '%s' 已被移植" 22565 + 22566 + #: object-store.c 22567 + #, c-format 22568 + msgid "could not find object directory matching %s" 22569 + msgstr "找不到符合 %s 的物件目錄" 22570 + 22571 + #: object-store.c 22572 + #, c-format 22573 + msgid "invalid line while parsing alternate refs: %s" 22574 + msgstr "解析備用引用時無效的行：%s" 22575 + 22576 + #: object-store.c 22577 + #, c-format 22578 + msgid "replacement %s not found for %s" 22579 + msgstr "找不到 %2$s 的替代 %1$s" 22580 + 22581 + #: object-store.c 22582 + #, c-format 22583 + msgid "packed object %s (stored in %s) is corrupt" 22584 + msgstr "打包物件 %s（儲存在 %s）已損壞" 22585 + 22586 + #: object-store.c 22587 + #, c-format 22588 + msgid "missing mapping of %s to %s" 22589 + msgstr "缺少 %s 到 %s 的映射" 22590 + 22591 + #: object-store.c 22592 + #, c-format 22593 + msgid "%s is not a valid '%s' object" 22594 + msgstr "%s 不是一個有效的 '%s' 物件" 22595 + 22788 22596 #: object.c 22789 22597 #, c-format 22790 22598 msgid "invalid object type \"%s\"" ··· 23132 22940 23133 22941 #: parse-options.c 23134 22942 #, c-format 22943 + msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]" 22944 + msgstr "%2$s 的數值 %1$s 不在 [%3$<PRIdMAX>,%4$<PRIdMAX>] 範圍內" 22945 + 22946 + #: parse-options.c 22947 + #, c-format 22948 + msgid "%s expects an integer value with an optional k/m/g suffix" 22949 + msgstr "%s 期望為一個選擇性帶有 k/m/g 後綴的整數值" 22950 + 22951 + #: parse-options.c 22952 + #, c-format 23135 22953 msgid "%s expects a non-negative integer value with an optional k/m/g suffix" 23136 22954 msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" 23137 22955 ··· 23316 23134 msgid "bad boolean environment value '%s' for '%s'" 23317 23135 msgstr "「%2$s」的「%1$s」布林環境值無效" 23318 23136 23319 - #: parse.c 23320 - #, c-format 23321 - msgid "failed to parse %s" 23322 - msgstr "解析 %s 失敗" 23323 - 23324 23137 #: path-walk.c 23325 23138 #, c-format 23326 23139 msgid "failed to walk children of tree %s: not found" ··· 23523 23336 23524 23337 #: promisor-remote.c 23525 23338 #, c-format 23526 - msgid "known remote named '%s' but with url '%s' instead of '%s'" 23339 + msgid "no or empty URL advertised for remote '%s'" 23340 + msgstr "遠端「%s」未公佈 URL 或 URL 空白" 23341 + 23342 + #: promisor-remote.c 23343 + #, c-format 23344 + msgid "known remote named '%s' but with URL '%s' instead of '%s'" 23527 23345 msgstr "已知有遠端名為「%s」，但其 URL 為「%s」而非「%s」" 23528 23346 23529 23347 #: promisor-remote.c ··· 23652 23470 #: reachable.c 23653 23471 #, c-format 23654 23472 msgid "invalid extra cruft tip: '%s'" 23655 - msgstr "無效的額外廢棄提交修訂版：「%s」" 23473 + msgstr "無效的額外無用提交修訂版：「%s」" 23656 23474 23657 23475 #: reachable.c 23658 23476 msgid "unable to enumerate additional recent objects" ··· 24425 24243 msgid "Checking references consistency" 24426 24244 msgstr "正在檢查引用一致性" 24427 24245 24246 + #: refs/packed-backend.c 24247 + #, c-format 24248 + msgid "unable to open '%s'" 24249 + msgstr "無法開啟「%s」" 24250 + 24428 24251 #: refs/reftable-backend.c 24429 24252 #, c-format 24430 24253 msgid "refname is dangerous: %s" ··· 24505 24328 24506 24329 #: refspec.c 24507 24330 #, c-format 24508 - msgid "invalid refspec '%s'" 24509 - msgstr "無效的引用規格：「%s」" 24510 - 24511 - #: refspec.c 24512 - #, c-format 24513 24331 msgid "pattern '%s' has no '*'" 24514 24332 msgstr "符合模式「%s」中沒有「*」" 24515 24333 ··· 25164 24982 msgstr "無法設定建議組態" 25165 24983 25166 24984 #: scalar.c 25167 - msgid "could not turn on maintenance" 25168 - msgstr "無法開啟維護模式" 24985 + msgid "could not toggle maintenance" 24986 + msgstr "無法切換維護模式" 25169 24987 25170 24988 #: scalar.c 25171 24989 msgid "could not start the FSMonitor daemon" ··· 25225 25043 msgstr "指定是否要在複製階段抓取標籤" 25226 25044 25227 25045 #: scalar.c 25046 + msgid "specify if background maintenance should be enabled" 25047 + msgstr "指定是否要啟用背景維護模式" 25048 + 25049 + #: scalar.c 25050 + #| msgid "" 25051 + #| "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" 25052 + #| "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" 25228 25053 msgid "" 25229 25054 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" 25230 - "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" 25055 + "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]" 25231 25056 msgstr "" 25232 25057 "scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n" 25233 - "\t[--[no-]src] [--[no-]tags] <url> [<enlistment>]" 25058 + "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] <url> [<enlistment>]" 25234 25059 25235 25060 #: scalar.c 25236 25061 #, c-format ··· 25279 25104 msgstr "`scalar list` 未取引數" 25280 25105 25281 25106 #: scalar.c 25282 - msgid "scalar register [<enlistment>]" 25283 - msgstr "scalar register [<enlistment>]" 25107 + #| msgid "scalar register [<enlistment>]" 25108 + msgid "scalar register [--[no-]maintenance] [<enlistment>]" 25109 + msgstr "scalar register [--[no-]maintenance] [<enlistment>]" 25284 25110 25285 25111 #: scalar.c 25286 25112 msgid "reconfigure all registered enlistments" 25287 25113 msgstr "重新設定所有註冊的編列名單" 25288 25114 25289 25115 #: scalar.c 25290 - msgid "scalar reconfigure [--all | <enlistment>]" 25291 - msgstr "scalar reconfigure [--all | <enlistment>]" 25116 + #| msgid "enable/disable untracked cache" 25117 + msgid "(enable|disable|keep)" 25118 + msgstr "(enable|disable|keep)" 25119 + 25120 + #: scalar.c 25121 + msgid "signal how to adjust background maintenance" 25122 + msgstr "指示調整背景維護模式的方式" 25123 + 25124 + #: scalar.c 25125 + #| msgid "scalar reconfigure [--all | <enlistment>]" 25126 + msgid "" 25127 + "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | " 25128 + "<enlistment>]" 25129 + msgstr "" 25130 + "scalar reconfigure [--maintenance=(enable|disable|keep)] [--all | " 25131 + "<enlistment>]" 25292 25132 25293 25133 #: scalar.c 25294 25134 msgid "--all or <enlistment>, but not both" 25295 25135 msgstr "--all 或 <enlistment> 但不能傳入兩者" 25136 + 25137 + #: scalar.c 25138 + #, c-format 25139 + msgid "unknown mode for --maintenance option: %s" 25140 + msgstr "--maintenance 選項的值無效：%s" 25296 25141 25297 25142 #: scalar.c 25298 25143 #, c-format ··· 27003 26848 msgid "number of entries in the cache tree to invalidate (default 0)" 27004 26849 msgstr "在快取樹狀物件中，要使失效的項目數量（預設值為 0）" 27005 26850 26851 + #: t/helper/test-pack-deltas.c 26852 + msgid "the number of objects to write" 26853 + msgstr "要寫入的物件數量" 26854 + 27006 26855 #: t/helper/test-path-walk.c 27007 26856 msgid "test-tool path-walk <options> -- <revision-options>" 27008 26857 msgstr "test-tool path-walk <options> -- <revision-options>" ··· 27931 27780 msgid "unable to get random bytes" 27932 27781 msgstr "無法取得隨機位元組" 27933 27782 27783 + #: wrapper.c 27784 + #, c-format 27785 + msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" 27786 + msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" 27787 + 27788 + #: wrapper.c 27789 + #, c-format 27790 + msgid "mmap failed%s" 27791 + msgstr "mmap 失敗%s" 27792 + 27934 27793 #: wt-status.c 27935 27794 msgid "Unmerged paths:" 27936 27795 msgstr "未合併的路徑：" ··· 28851 28710 28852 28711 #: git-send-email.perl 28853 28712 #, perl-format 28713 + msgid "Outlook reassigned Message-ID to: %s\n" 28714 + msgstr "Outlook 將 Message-ID 重新指派為：%s\n" 28715 + 28716 + #: git-send-email.perl 28717 + msgid "Warning: Could not retrieve Message-ID from server response.\n" 28718 + msgstr "警告：無法從伺服器回應中取得 Message-ID。\n" 28719 + 28720 + #: git-send-email.perl 28721 + #, perl-format 28854 28722 msgid "Failed to send %s\n" 28855 28723 msgstr "無法傳送 %s\n" 28856 28724 ··· 28969 28837 msgid "Do you really want to send %s? [y|N]: " 28970 28838 msgstr "您真的要傳送 %s？[y|N]： " 28971 28839 28840 + #~ msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" 28841 + #~ msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>" 28842 + 28843 + #~ msgid "allow -s and -t to work with broken/corrupt objects" 28844 + #~ msgstr "允許 -s 和 -t 對損壞的物件生效" 28845 + 28846 + #, c-format 28847 + #~ msgid "%s: object is of unknown type '%s': %s" 28848 + #~ msgstr "%s：物件屬於「%s」未知類型：%s" 28849 + 28850 + #, c-format 28851 + #~ msgid "%s points nowhere!" 28852 + #~ msgstr "%s 指向不存在！" 28853 + 28854 + #~ msgid "(bad commit)\n" 28855 + #~ msgstr "（壞提交）\n" 28856 + 28857 + #, c-format 28858 + #~ msgid "add_cacheinfo failed for path '%s'; merge aborting." 28859 + #~ msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" 28860 + 28861 + #, c-format 28862 + #~ msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." 28863 + #~ msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" 28864 + 28865 + #, c-format 28866 + #~ msgid "failed to create path '%s'%s" 28867 + #~ msgstr "建立路徑 '%s'%s 失敗" 28868 + 28869 + #, c-format 28870 + #~ msgid "Removing %s to make room for subdirectory\n" 28871 + #~ msgstr "刪除 %s 以便為子目錄留出空間\n" 28872 + 28873 + #~ msgid ": perhaps a D/F conflict?" 28874 + #~ msgstr "：可能是一個目錄/檔案衝突？" 28875 + 28876 + #, c-format 28877 + #~ msgid "refusing to lose untracked file at '%s'" 28878 + #~ msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" 28879 + 28880 + #, c-format 28881 + #~ msgid "blob expected for %s '%s'" 28882 + #~ msgstr "%s '%s' 應為資料物件" 28883 + 28884 + #, c-format 28885 + #~ msgid "failed to open '%s': %s" 28886 + #~ msgstr "開啟 '%s' 失敗：%s" 28887 + 28888 + #, c-format 28889 + #~ msgid "failed to symlink '%s': %s" 28890 + #~ msgstr "建立符號連結 '%s' 失敗：%s" 28891 + 28892 + #, c-format 28893 + #~ msgid "do not know what to do with %06o %s '%s'" 28894 + #~ msgstr "不知道如何處理 %06o %s '%s'" 28895 + 28896 + #, c-format 28897 + #~ msgid "Failed to merge submodule %s (repository corrupt)" 28898 + #~ msgstr "無法合併子模組 %s （版本庫損壞）" 28899 + 28900 + #, c-format 28901 + #~ msgid "Fast-forwarding submodule %s to the following commit:" 28902 + #~ msgstr "子模組 %s 快轉到如下提交：" 28903 + 28904 + #, c-format 28905 + #~ msgid "Fast-forwarding submodule %s" 28906 + #~ msgstr "快轉子模組 %s" 28907 + 28908 + #, c-format 28909 + #~ msgid "Failed to merge submodule %s (merge following commits not found)" 28910 + #~ msgstr "無法合併子模組 %s （找不到合併跟隨的提交）" 28911 + 28912 + #, c-format 28913 + #~ msgid "Failed to merge submodule %s (not fast-forward)" 28914 + #~ msgstr "無法合併子模組 %s（非快轉）" 28915 + 28916 + #~ msgid "Found a possible merge resolution for the submodule:\n" 28917 + #~ msgstr "找到子模組的一個可能的合併方案：\n" 28918 + 28919 + #, c-format 28920 + #~ msgid "" 28921 + #~ "If this is correct simply add it to the index for example\n" 28922 + #~ "by using:\n" 28923 + #~ "\n" 28924 + #~ " git update-index --cacheinfo 160000 %s \"%s\"\n" 28925 + #~ "\n" 28926 + #~ "which will accept this suggestion.\n" 28927 + #~ msgstr "" 28928 + #~ "正確的話，就能直接加進索引，例如執行下述命令：\n" 28929 + #~ "\n" 28930 + #~ " git update-index --cacheinfo 160000 %s \"%s\"\n" 28931 + #~ "\n" 28932 + #~ "接受本建議。\n" 28933 + 28934 + #, c-format 28935 + #~ msgid "Failed to merge submodule %s (multiple merges found)" 28936 + #~ msgstr "無法合併子模組 %s （發現多個合併）" 28937 + 28938 + #~ msgid "failed to execute internal merge" 28939 + #~ msgstr "無法執行內部合併" 28940 + 28941 + #, c-format 28942 + #~ msgid "unable to add %s to database" 28943 + #~ msgstr "無法將 %s 加進資料庫" 28944 + 28945 + #, c-format 28946 + #~ msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." 28947 + #~ msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" 28948 + 28949 + #, c-format 28950 + #~ msgid "" 28951 + #~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s " 28952 + #~ "left in tree." 28953 + #~ msgstr "" 28954 + #~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s " 28955 + #~ "版本被保留。" 28956 + 28957 + #, c-format 28958 + #~ msgid "" 28959 + #~ "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of " 28960 + #~ "%s left in tree." 28961 + #~ msgstr "" 28962 + #~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s " 28963 + #~ "的 %7$s 版本被保留。" 28964 + 28965 + #, c-format 28966 + #~ msgid "" 28967 + #~ "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s " 28968 + #~ "left in tree at %s." 28969 + #~ msgstr "" 28970 + #~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s " 28971 + #~ "版本保留在 %8$s 中。" 28972 + 28973 + #, c-format 28974 + #~ msgid "" 28975 + #~ "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of " 28976 + #~ "%s left in tree at %s." 28977 + #~ msgstr "" 28978 + #~ "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s " 28979 + #~ "的 %7$s 版本保留在 %9$s 中。" 28980 + 28981 + #~ msgid "rename" 28982 + #~ msgstr "重新命名" 28983 + 28984 + #~ msgid "renamed" 28985 + #~ msgstr "已重新命名" 28986 + 28987 + #, c-format 28988 + #~ msgid "Refusing to lose dirty file at %s" 28989 + #~ msgstr "拒絕遺失髒檔案 '%s'" 28990 + 28991 + #, c-format 28992 + #~ msgid "Refusing to lose untracked file at %s, even though it's in the way." 28993 + #~ msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" 28994 + 28995 + #, c-format 28996 + #~ msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" 28997 + #~ msgstr "" 28998 + #~ "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" 28999 + 29000 + #, c-format 29001 + #~ msgid "%s is a directory in %s adding as %s instead" 29002 + #~ msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" 29003 + 29004 + #, c-format 29005 + #~ msgid "Refusing to lose untracked file at %s; adding as %s instead" 29006 + #~ msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" 29007 + 29008 + #, c-format 29009 + #~ msgid "" 29010 + #~ "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " 29011 + #~ "\"%s\"->\"%s\" in \"%s\"%s" 29012 + #~ msgstr "" 29013 + #~ "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，" 29014 + #~ "在分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" 29015 + 29016 + #~ msgid " (left unresolved)" 29017 + #~ msgstr " （留下未解決）" 29018 + 29019 + #, c-format 29020 + #~ msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" 29021 + #~ msgstr "" 29022 + #~ "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命" 29023 + #~ "名 %4$s->%5$s" 29024 + 29025 + #, c-format 29026 + #~ msgid "" 29027 + #~ "CONFLICT (directory rename split): Unclear where to place %s because " 29028 + #~ "directory %s was renamed to multiple other directories, with no " 29029 + #~ "destination getting a majority of the files." 29030 + #~ msgstr "" 29031 + #~ "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名" 29032 + #~ "到多個其它目錄，沒有目錄包含大部分檔案。" 29033 + 29034 + #, c-format 29035 + #~ msgid "" 29036 + #~ "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory " 29037 + #~ "%s->%s in %s" 29038 + #~ msgstr "" 29039 + #~ "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重" 29040 + #~ "新命名目錄 %4$s->%5$s" 29041 + 29042 + #, c-format 29043 + #~ msgid "cannot read object %s" 29044 + #~ msgstr "不能讀取物件 %s" 29045 + 29046 + #, c-format 29047 + #~ msgid "object %s is not a blob" 29048 + #~ msgstr "物件 %s 不是一個資料物件" 29049 + 29050 + #~ msgid "modify" 29051 + #~ msgstr "修改" 29052 + 29053 + #~ msgid "modified" 29054 + #~ msgstr "修改" 29055 + 29056 + #, c-format 29057 + #~ msgid "Skipped %s (merged same as existing)" 29058 + #~ msgstr "略過 %s（已經做過相同合併）" 29059 + 29060 + #, c-format 29061 + #~ msgid "Adding as %s instead" 29062 + #~ msgstr "而是以 %s 為名新增" 29063 + 29064 + #, c-format 29065 + #~ msgid "Removing %s" 29066 + #~ msgstr "刪除 %s" 29067 + 29068 + #~ msgid "file/directory" 29069 + #~ msgstr "檔案/目錄" 29070 + 29071 + #~ msgid "directory/file" 29072 + #~ msgstr "目錄/檔案" 29073 + 29074 + #, c-format 29075 + #~ msgid "" 29076 + #~ "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" 29077 + #~ msgstr "" 29078 + #~ "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" 29079 + 29080 + #, c-format 29081 + #~ msgid "Adding %s" 29082 + #~ msgstr "新增 %s" 29083 + 29084 + #, c-format 29085 + #~ msgid "CONFLICT (add/add): Merge conflict in %s" 29086 + #~ msgstr "衝突（add/add）：合併衝突於 %s" 29087 + 29088 + #, c-format 29089 + #~ msgid "merging of trees %s and %s failed" 29090 + #~ msgstr "無法合併樹 %s 和 %s" 29091 + 29092 + #~ msgid "Merging:" 29093 + #~ msgstr "合併：" 29094 + 29095 + #, c-format 29096 + #~ msgid "found %u common ancestor:" 29097 + #~ msgid_plural "found %u common ancestors:" 29098 + #~ msgstr[0] "發現 %u 個共同祖先：" 29099 + 29100 + #~ msgid "merge returned no commit" 29101 + #~ msgstr "合併未返回提交" 29102 + 29103 + #~ msgid "cannot write incremental MIDX with bitmap" 29104 + #~ msgstr "無法寫入有位圖的增量 MIDX" 29105 + 28972 29106 #, c-format 28973 29107 #~ msgid "Could not find remote branch %s to clone." 28974 29108 #~ msgstr "找不到要複製的遠端分支 %s。" ··· 28976 29110 #, c-format 28977 29111 #~ msgid "merging cannot continue; got unclean result of %d" 28978 29112 #~ msgstr "無法繼續合併：從 %d 收到的結果不乾淨" 28979 - 28980 - #~ msgid "git repack [<options>]" 28981 - #~ msgstr "git repack [<選項>]" 28982 29113 28983 29114 #~ msgid "--onto and --advance are incompatible" 28984 29115 #~ msgstr "--onto 和 --advance 不相容" ··· 29027 29158 29028 29159 #~ msgid "use [RFC PATCH] instead of [PATCH]" 29029 29160 #~ msgstr "使用 [RFC PATCH] 代替 [PATCH]" 29030 - 29031 - #, c-format 29032 - #~ msgid "no URLs configured for remote '%s'" 29033 - #~ msgstr "沒有給遠端版本庫 '%s' 設定 URL" 29034 29161 29035 29162 #, c-format 29036 29163 #~ msgid "remote '%s' has no configured URL"