diff options
author | Yi-Jyun Pan <pan93412@gmail.com> | 2021-11-11 01:43:41 +0300 |
---|---|---|
committer | Yi-Jyun Pan <pan93412@gmail.com> | 2021-11-11 01:43:41 +0300 |
commit | 569a03f24b98d1850bd18ec95d5e57ffc31477d3 (patch) | |
tree | 51974cd3c26d2e89bb09cc6ab9a848f69dd04d3f /po | |
parent | bc9adb42cbc906188ffe7286dd75b7926c3607af (diff) |
l10n: zh_TW.po: v2.34.0 round 3 (0 untranslated)
Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>
Diffstat (limited to 'po')
-rw-r--r-- | po/zh_TW.po | 190 |
1 files changed, 97 insertions, 93 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 636602bf44..f1df8b60a9 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-11-04 08:34+0800\n" -"PO-Revision-Date: 2021-11-05 12:41+0800\n" +"POT-Creation-Date: 2021-11-10 08:55+0800\n" +"PO-Revision-Date: 2021-11-11 06:38+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -226,7 +226,7 @@ msgstr "未快取" #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 #: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 @@ -10225,7 +10225,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略:\n" #: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "測試執行" @@ -10677,11 +10677,11 @@ msgstr "傳遞給 git-apply" #: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 #: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 #: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 #: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: parse-options.h:315 msgid "n" msgstr "n" @@ -10732,7 +10732,7 @@ msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" #: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 #: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "key-id" @@ -11232,7 +11232,7 @@ msgstr "顯示工作量統計" #: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 #: builtin/merge.c:298 builtin/multi-pack-index.c:103 #: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 #: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "強制顯示進度報告" @@ -12479,7 +12479,7 @@ msgstr "缺少分支或提交參數" msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 msgid "style" msgstr "風格" @@ -12900,7 +12900,7 @@ msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" #: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 -#: builtin/pull.c:208 +#: builtin/pull.c:212 msgid "depth" msgstr "深度" @@ -12909,7 +12909,7 @@ msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" #: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 -#: builtin/pull.c:211 +#: builtin/pull.c:215 msgid "time" msgstr "時間" @@ -12918,11 +12918,11 @@ msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺複製" #: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "修訂版" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "取得更多淺複製的過去歷史記錄,除了特定版本" @@ -12956,21 +12956,21 @@ msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "server-specific" #: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" @@ -13358,7 +13358,7 @@ msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" #: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 -#: builtin/pull.c:176 builtin/revert.c:118 +#: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -13763,7 +13763,7 @@ msgstr "條目以 NUL 字元結尾" #: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 msgid "mode" msgstr "模式" @@ -13839,7 +13839,7 @@ msgid "override date for commit" msgstr "提交時覆蓋日期" #: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:328 ref-filter.h:92 +#: parse-options.h:327 ref-filter.h:92 msgid "commit" msgstr "提交" @@ -13880,7 +13880,7 @@ msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" #: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 -#: builtin/pull.c:145 builtin/revert.c:110 +#: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" @@ -14843,15 +14843,15 @@ msgstr "git fetch --all [<選項>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:145 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:147 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:149 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" @@ -14859,7 +14859,7 @@ msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" msgid "use atomic transaction to update references" msgstr "使用 atomic 事務更新引用" -#: builtin/fetch.c:153 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" @@ -14871,7 +14871,7 @@ msgstr "強制覆蓋本機引用" msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:158 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" @@ -14887,7 +14887,7 @@ msgstr "並行取得的子模組數量" msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中" -#: builtin/fetch.c:166 builtin/pull.c:198 +#: builtin/fetch.c:166 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" @@ -14896,7 +14896,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤,並且取代變更標籤" # 譯者:可選值,不能翻譯 -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 msgid "on-demand" msgstr "on-demand" @@ -14908,7 +14908,7 @@ msgstr "控制子模組的遞迴抓取" msgid "write fetched references to the FETCH_HEAD file" msgstr "將取得的引用寫入 FETCH_HEAD 檔案" -#: builtin/fetch.c:176 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "保持下載包" @@ -14916,16 +14916,16 @@ msgstr "保持下載包" msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209 -#: builtin/pull.c:218 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "取得淺複製的更多過去歷史記錄" -#: builtin/fetch.c:183 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:189 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" @@ -14939,19 +14939,19 @@ msgid "" "files)" msgstr "遞迴取得子模組的預設值(比設定檔案優先度低)" -#: builtin/fetch.c:199 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:200 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:230 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:201 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:208 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" @@ -14963,7 +14963,7 @@ msgstr "不取得包檔案,而是輸出交涉的祖先提交" msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c:217 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" @@ -17599,31 +17599,31 @@ msgstr "可用的策略有:" msgid "Available custom strategies are:" msgstr "可用的自訂策略有:" -#: builtin/merge.c:257 builtin/pull.c:133 +#: builtin/merge.c:257 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c:260 builtin/pull.c:136 +#: builtin/merge.c:260 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c:261 builtin/pull.c:139 +#: builtin/merge.c:261 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(和 --stat 同義)" -#: builtin/merge.c:263 builtin/pull.c:142 +#: builtin/merge.c:263 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合併提交說明中新增(最多 <n> 條)精簡提交記錄" -#: builtin/merge.c:266 builtin/pull.c:148 +#: builtin/merge.c:266 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c:268 builtin/pull.c:151 +#: builtin/merge.c:268 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功,執行一次提交(預設)" -#: builtin/merge.c:270 builtin/pull.c:154 +#: builtin/merge.c:270 builtin/pull.c:155 msgid "edit message before committing" msgstr "在提交前編輯提交說明" @@ -17631,28 +17631,28 @@ msgstr "在提交前編輯提交說明" msgid "allow fast-forward (default)" msgstr "允許快轉(預設)" -#: builtin/merge.c:274 builtin/pull.c:161 +#: builtin/merge.c:274 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c:278 builtin/pull.c:164 +#: builtin/merge.c:278 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:168 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 #: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:280 builtin/pull.c:169 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c:281 builtin/pull.c:172 +#: builtin/merge.c:281 builtin/pull.c:176 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:282 builtin/pull.c:173 +#: builtin/merge.c:282 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" @@ -17673,7 +17673,7 @@ msgstr "--abort,但是保留索引和工作區" msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c:297 builtin/pull.c:180 +#: builtin/merge.c:297 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" @@ -19055,61 +19055,65 @@ msgstr "%s 的值無效:%s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/pull.c:123 +#: builtin/pull.c:124 msgid "control for recursive fetching of submodules" msgstr "控制子模組的遞迴取得" -#: builtin/pull.c:127 +#: builtin/pull.c:128 msgid "Options related to merging" msgstr "和合併相關的選項" -#: builtin/pull.c:130 +#: builtin/pull.c:131 msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:158 builtin/revert.c:126 +#: builtin/pull.c:159 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允許快轉式" -#: builtin/pull.c:167 parse-options.h:339 +#: builtin/pull.c:165 +msgid "control use of pre-merge-commit and commit-msg hooks" +msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用" + +#: builtin/pull.c:171 parse-options.h:338 msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" -#: builtin/pull.c:183 +#: builtin/pull.c:187 msgid "Options related to fetching" msgstr "和取得相關的參數" -#: builtin/pull.c:193 +#: builtin/pull.c:197 msgid "force overwrite of local branch" msgstr "強制覆蓋本機分支" -#: builtin/pull.c:201 +#: builtin/pull.c:205 msgid "number of submodules pulled in parallel" msgstr "並行拉取的子模組數量" -#: builtin/pull.c:317 +#: builtin/pull.c:321 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值無效:%s" -#: builtin/pull.c:445 +#: builtin/pull.c:449 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。" -#: builtin/pull.c:447 +#: builtin/pull.c:451 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您剛剛取得到的引用中沒有合併動作的候選。" -#: builtin/pull.c:448 +#: builtin/pull.c:452 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "這通常表示您有提供萬用字元引用規格,但遠端沒有符合項目。" -#: builtin/pull.c:451 +#: builtin/pull.c:455 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -19119,41 +19123,41 @@ msgstr "" "您要求從遠端 '%s' 拉取,但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫,您必須在指令列中指定一個分支名。" -#: builtin/pull.c:456 builtin/rebase.c:951 +#: builtin/pull.c:460 builtin/rebase.c:951 msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:462 builtin/pull.c:477 msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c:460 builtin/pull.c:475 +#: builtin/pull.c:464 builtin/pull.c:479 msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c:461 builtin/pull.c:476 +#: builtin/pull.c:465 builtin/pull.c:480 msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482 #: builtin/rebase.c:957 msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 +#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:471 builtin/rebase.c:949 +#: builtin/pull.c:475 builtin/rebase.c:949 msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" -#: builtin/pull.c:480 +#: builtin/pull.c:484 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要為此分支建立追蹤訊息,您可以執行:" -#: builtin/pull.c:485 +#: builtin/pull.c:489 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -19162,16 +19166,16 @@ msgstr "" "您的設定中指定要合併遠端的引用 '%s',\n" "但是沒有取得到這個引用。" -#: builtin/pull.c:596 +#: builtin/pull.c:600 #, c-format msgid "unable to access commit %s" msgstr "無法存取提交 %s" -#: builtin/pull.c:902 +#: builtin/pull.c:908 msgid "ignoring --verify-signatures for rebase" msgstr "為重定基底動作忽略 --verify-signatures" -#: builtin/pull.c:936 +#: builtin/pull.c:942 msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" @@ -19200,19 +19204,19 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:1010 +#: builtin/pull.c:1016 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支,變更新增至索引。" -#: builtin/pull.c:1014 +#: builtin/pull.c:1020 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:1015 +#: builtin/pull.c:1021 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:1040 +#: builtin/pull.c:1046 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19222,7 +19226,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:1046 +#: builtin/pull.c:1052 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19239,23 +19243,23 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1061 +#: builtin/pull.c:1067 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1066 +#: builtin/pull.c:1072 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1068 +#: builtin/pull.c:1074 msgid "Cannot fast-forward to multiple branches." msgstr "無法快轉至多個分支。" -#: builtin/pull.c:1082 +#: builtin/pull.c:1088 msgid "Need to specify how to reconcile divergent branches." msgstr "需要指定如何調和偏離的分支。" -#: builtin/pull.c:1096 +#: builtin/pull.c:1102 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改,無法重定基底" @@ -24289,27 +24293,27 @@ msgstr "到期時間" msgid "no-op (backward compatibility)" msgstr "空動作(向後相容)" -#: parse-options.h:309 +#: parse-options.h:308 msgid "be more verbose" msgstr "更加詳細" -#: parse-options.h:311 +#: parse-options.h:310 msgid "be more quiet" msgstr "更加安靜" -#: parse-options.h:317 +#: parse-options.h:316 msgid "use <n> digits to display object names" msgstr "用 <n> 位數字顯示物件名稱" -#: parse-options.h:336 +#: parse-options.h:335 msgid "how to strip spaces and #comments from message" msgstr "設定如何刪除提交說明裡的空格和 #備註" -#: parse-options.h:337 +#: parse-options.h:336 msgid "read pathspec from file" msgstr "從檔案讀取 <路徑規格>" -#: parse-options.h:338 +#: parse-options.h:337 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "如使用 --pathspec-from-file,則 <路徑規格> 元件會使用 NUL 字元分隔" |