From 14b3e0574cc8701d9b4174d91f0fa9c3f8b53f02 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Mon, 18 Mar 2024 18:12:45 +0100 Subject: [PATCH] Improve translations for zh_TW Authored-by: Oliver Tzeng --- docs/keybindings/Keybindings_zh-TW.md | 148 +++++------ pkg/i18n/traditional_chinese.go | 355 +++++++++++++++----------- 2 files changed, 274 insertions(+), 229 deletions(-) diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md index 42da8c2e2..118ebec7e 100644 --- a/docs/keybindings/Keybindings_zh-TW.md +++ b/docs/keybindings/Keybindings_zh-TW.md @@ -2,9 +2,9 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct # Lazygit 鍵盤快捷鍵 -_說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ +_說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B_ -## 全局快捷鍵 +## 全域快捷鍵 | Key | Action | Info | |-----|--------|-------------| @@ -29,10 +29,10 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` q `` | 結束 | | | `` `` | 取消 | | | `` `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view. | -| `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改；只考慮提交。 | -| `` `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改；只考慮提交。 | +| `` z `` | 復原 | 將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。 | +| `` `` | 取消復原 | 將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。 | -## 列表面板導航 +## 移動 | Key | Action | Info | |-----|--------|-------------| @@ -43,47 +43,35 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` v `` | 切換拖曳選擇 | | | `` `` | Range select down | | | `` `` | Range select up | | -| `` / `` | 開始搜尋 | | +| `` / `` | 搜尋 | | | `` H `` | 向左捲動 | | | `` L `` | 向右捲動 | | | `` ] `` | 下一個索引標籤 | | | `` [ `` | 上一個索引標籤 | | -## Reflog +## 主面板 (補丁生成) | Key | Action | Info | |-----|--------|-------------| -| `` `` | 複製提交 SHA 到剪貼簿 | | -| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | -| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | -| `` o `` | 在瀏覽器中開啟提交 | | -| `` n `` | 從提交建立新分支 | | -| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | -| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `` to cancel the selection. | -| `` `` | 重設選定的揀選 (複製) 提交 | | -| `` `` | Open external diff tool (git difftool) | | -| `` `` | 檢視提交 | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` `` | 選擇上一段 | | +| `` `` | 選擇下一段 | | +| `` v `` | 切換拖曳選擇 | | +| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. | +| `` `` | 複製所選文本至剪貼簿 | | +| `` o `` | 開啟檔案 | Open file in default application. | +| `` e `` | 編輯檔案 | Open file in external editor. | +| `` `` | 向 (或從) 補丁中添加/刪除行 | | +| `` `` | 退出自訂補丁建立器 | | +| `` / `` | 搜尋 | | -## Worktrees - -| Key | Action | Info | -|-----|--------|-------------| -| `` n `` | New worktree | | -| `` `` | Switch | Switch to the selected worktree. | -| `` o `` | Open in editor | | -| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | -| `` / `` | Filter the current view by text | | - -## 主視窗 (一般) +## 主面板（一般） | Key | Action | Info | |-----|--------|-------------| | `` mouse wheel down (fn+up) `` | 向下捲動 | | | `` mouse wheel up (fn+down) `` | 向上捲動 | | -## 主視窗 (合併中) +## 主面板（合併） | Key | Action | Info | |-----|--------|-------------| @@ -99,7 +87,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. | | `` `` | 返回檔案面板 | | -## 主視窗 (預存中) +## 主面板（預存） | Key | Action | Info | |-----|--------|-------------| @@ -119,22 +107,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` w `` | 沒有預提交 hook 就提交更改 | | | `` C `` | 使用 git 編輯器提交變更 | | | `` `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: | -| `` / `` | 開始搜尋 | | - -## 主面板 (補丁生成) - -| Key | Action | Info | -|-----|--------|-------------| -| `` `` | 選擇上一段 | | -| `` `` | 選擇下一段 | | -| `` v `` | 切換拖曳選擇 | | -| `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. | -| `` `` | 複製所選文本至剪貼簿 | | -| `` o `` | 開啟檔案 | Open file in default application. | -| `` e `` | 編輯檔案 | Open file in external editor. | -| `` `` | 向 (或從) 補丁中添加/刪除行 | | -| `` `` | 退出自訂補丁建立器 | | -| `` / `` | 開始搜尋 | | +| `` / `` | 搜尋 | | ## 功能表 @@ -142,7 +115,7 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ |-----|--------|-------------| | `` `` | 執行 | | | `` `` | 關閉 | | -| `` / `` | Filter the current view by text | | +| `` / `` | 搜尋 | | ## 子提交 @@ -158,8 +131,8 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` `` | 重設選定的揀選 (複製) 提交 | | | `` `` | Open external diff tool (git difftool) | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | View worktree options | | -| `` / `` | 開始搜尋 | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | ## 子模組 @@ -173,7 +146,17 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ | `` e `` | 更新子模組 URL | | | `` i `` | Initialize | 初始化子模組 | | `` b `` | 查看批量子模組選項 | | -| `` / `` | Filter the current view by text | | +| `` / `` | 搜尋 | | + +## 工作目錄 + +| Key | Action | Info | +|-----|--------|-------------| +| `` n `` | New worktree | | +| `` `` | Switch | Switch to the selected worktree. | +| `` o `` | Open in editor | | +| `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. | +| `` / `` | 搜尋 | | ## 提交 @@ -192,13 +175,13 @@ _說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B_ If you would instead like to start an interactive rebase from the selected commit, press `e`. | | `` p `` | Pick | 挑選提交 (於變基過程中) | | `` F `` | Create fixup commit | 為此提交建立修復提交 | -| `` S `` | Apply fixup commits | 壓縮上方所有的“fixup!”提交 (自動壓縮) | +| `` S `` | 壓縮上方所有「fixup」提交（自動壓縮） | 是否壓縮上方 {{.commit}} 所有「fixup」提交？ | | `` `` | 向下移動提交 | | | `` `` | 向上移動提交 | | | `` V `` | 貼上提交 (揀選) | | -| `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. | +| `` B `` | 為了變基已標注提交為基準提交 | 請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。 | | `` A `` | Amend | 使用已預存的更改修正提交 | -| `` a `` | 設置/重設提交作者 | Set/Reset commit author or set co-author. | +| `` a `` | 設定/重設提交作者 | Set/Reset commit author or set co-author. | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. | | `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. | | `` `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. | @@ -210,8 +193,8 @@ If you would instead like to start an interactive rebase from the selected commi | `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `` to cancel the selection. | | `` `` | Open external diff tool (git difftool) | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | View worktree options | | -| `` / `` | 開始搜尋 | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | ## 提交摘要 @@ -226,15 +209,15 @@ If you would instead like to start an interactive rebase from the selected commi |-----|--------|-------------| | `` `` | 複製檔案名稱到剪貼簿 | | | `` c `` | 檢出 | 檢出檔案 | -| `` d `` | Remove | 捨棄此提交對此檔案的更改 | +| `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. | | `` o `` | 開啟檔案 | Open file in default application. | | `` e `` | Edit | Open file in external editor. | | `` `` | Open external diff tool (git difftool) | | | `` `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. | | `` `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. | -| `` ` `` | 切換檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. | -| `` / `` | 開始搜尋 | | +| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. | +| `` / `` | 搜尋 | | ## 收藏 (Stash) @@ -246,8 +229,25 @@ If you would instead like to start an interactive rebase from the selected commi | `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | 重新命名收藏 | | | `` `` | 檢視所選項目的檔案 | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | + +## 日誌 + +| Key | Action | Info | +|-----|--------|-------------| +| `` `` | 複製提交 SHA 到剪貼簿 | | +| `` `` | 檢出 | Checkout the selected commit as a detached HEAD. | +| `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). | +| `` o `` | 在瀏覽器中開啟提交 | | +| `` n `` | 從提交建立新分支 | | +| `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | +| `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `` to cancel the selection. | +| `` `` | 重設選定的揀選 (複製) 提交 | | +| `` `` | Open external diff tool (git difftool) | | +| `` `` | 檢視提交 | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | ## 本地分支 @@ -270,10 +270,10 @@ If you would instead like to start an interactive rebase from the selected commi | `` s `` | Sort order | | | `` g `` | 檢視重設選項 | | | `` R `` | 重新命名分支 | | -| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | +| `` u `` | 檢視上游設定 | 檢視有關上游分支的設定（例如重設至上游） | | `` `` | 檢視提交 | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | ## 標籤 @@ -285,8 +285,8 @@ If you would instead like to start an interactive rebase from the selected commi | `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | 檢視提交 | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | ## 檔案 @@ -298,7 +298,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` y `` | Copy to clipboard | | | `` c `` | 提交變更 | Commit staged changes. | | `` w `` | 沒有預提交 hook 就提交更改 | | -| `` A `` | 修正上次提交 | | +| `` A `` | 修改上次提交 | | | `` C `` | 使用 git 編輯器提交變更 | | | `` `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: | | `` e `` | Edit | Open file in external editor. | @@ -309,14 +309,14 @@ If you would instead like to start an interactive rebase from the selected commi | `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). | | `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. | | `` `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. | -| `` d `` | 檢視“捨棄更改”的選項 | View options for discarding changes to the selected file. | +| `` d `` | Discard | View options for discarding changes to the selected file. | | `` g `` | 檢視上游重設選項 | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). | -| `` ` `` | 切換檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. | +| `` ` `` | 顯示檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. | | `` `` | Open external diff tool (git difftool) | | | `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. | | `` f `` | 擷取 | Fetch changes from remote. | -| `` / `` | 開始搜尋 | | +| `` / `` | 搜尋 | | ## 狀態 @@ -344,7 +344,7 @@ If you would instead like to start an interactive rebase from the selected commi | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. | | `` e `` | Edit | 編輯遠端 | | `` f `` | 擷取 | 擷取遠端 | -| `` / `` | Filter the current view by text | | +| `` / `` | 搜尋 | | ## 遠端分支 @@ -360,5 +360,5 @@ If you would instead like to start an interactive rebase from the selected commi | `` s `` | Sort order | | | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | 檢視提交 | | -| `` w `` | View worktree options | | -| `` / `` | Filter the current view by text | | +| `` w `` | 檢視工作目錄選項 | | +| `` / `` | 搜尋 | | diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index 62de82008..f0a996a65 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -3,54 +3,53 @@ The selection of Traditional Chinese translation vocabulary is mainly based on the following sources: - 1. GitLab: 其介面有相當完整的繁體中文翻譯，但缺少一些本地端功能的對照，例如 stash。 +1. GitLab: 其介面有相當完整的繁體中文翻譯，但缺少一些本地端功能的對照，例如 stash。 - 2. Pro Git: Git 的權威參考用書，可惜繁中部分翻譯僅約一半。 - https://git-scm.com/book/zh-tw/v2 +2. Pro Git: Git 的權威參考用書，可惜繁中部分翻譯僅約一半。 +https://git-scm.com/book/zh-tw/v2 - 3. Microsoft 語言入口網站 (Visual Studio) - https://www.microsoft.com/zh-tw/language/ +3. Microsoft 語言入口網站 (Visual Studio) +https://www.microsoft.com/zh-tw/language/ ### Glossary ### - 譯文中括號內文字會依語境添加或省略。 +譯文中括號內文字會依語境添加或省略。 - Repository 版本庫 - Amend 修正 - Checkout 檢出 - Cherry-pick 揀選 - Diff 差異 - Discard 捨棄 - Drop [stash] 捨棄 - Fast-forward 快進式 (Fast-forward) - Fetch 擷取 - Fixup 修復 (Fixup) - Patch 補丁 - Pop [stash] 還原 - Rebase 變基 (Rebase) - Reset 重設 - Revert 還原 - Reword 改寫 - Squash 壓縮 (Squash) - Stage 預存 (Stage) - Stash 收藏 (Stash) +Repository 版本庫 +Amend 修改 +Checkout 檢出 +Cherry-pick 揀選 +Diff 差異 +Discard 捨棄 +Drop [stash] 捨棄 +Fast-forward 快轉 (Fast-forward) +Fetch 擷取 +Fixup 修復 (Fixup) +Patch 補丁 +Pop [stash] 還原 +Rebase 變基 (Rebase) +Reset 重設 +Revert 還原 +Reword 改寫 +Squash 壓縮 (Squash) +Stage 預存 (Stage) +Stash 收藏 (Stash) */ package i18n const traditionalChineseIntroPopupMessage = ` -感謝你使用 lazygit，你真的很厲害。有三件事要與你分享： +感謝使用 lazygit！這裡有一些資源可供參考： - 1) 如果你想了解 lazygit 的功能，請看這個影片： - https://youtu.be/CPLdltN7wgE +1) 📺lazygit 教學📺： + https://youtu.be/CPLdltN7wgE - 2) 請務必閱讀最新的發布說明： - https://github.com/jesseduffield/lazygit/releases +2) 📣釋出說明📣： + https://github.com/jesseduffield/lazygit/releases - 3) 如果你正在使用 git，那麼就是一個程式設計師！在你的幫助下， - 我們可以使 lazygit 變得更好，請考慮成為貢獻者並一起同樂： - https://github.com/jesseduffield/lazygit - 你也可以贊助我，並告訴我有什麼要改進的，點擊右下方的捐贈按鈕即可。 - 就算是只在版本庫中點個星星分享愛也很棒！ +3) 💖如果你想要貢獻一份心力你可以💖： + 改進 lazygit 原始碼：https://github.com/jesseduffield/lazygit + 按右下角的捐款斗內我們 + 或單存添加 lazygit 到你的 star 清單內以增加曝光度都能大力的幫助我們！ ` const traditionalChineseDeprecatedEditConfigWarning = ` @@ -59,16 +58,16 @@ const traditionalChineseDeprecatedEditConfigWarning = ` 以下設定已被取代並將於未來版本中刪除： {{configs}} -請參考以下連結獲取關於如何設定編輯器的最新資訊： +編輯器設定教學： - https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#configuring-file-editing +https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#configuring-file-editing ` // exporting this so we can use it in tests func traditionalChineseTranslationSet() TranslationSet { return TranslationSet{ - NotEnoughSpace: "沒有足夠空間可以繪製面板", + NotEnoughSpace: "無足夠空間顯示面板", DiffTitle: "差異", FilesTitle: "檔案", BranchesTitle: "分支", @@ -78,30 +77,30 @@ func traditionalChineseTranslationSet() TranslationSet { EasterEgg: "彩蛋", UnstagedChanges: "未預存變更", StagedChanges: "已預存變更", - MainTitle: "主視窗", + MainTitle: "主要", MergeConfirmTitle: "合併", - StagingTitle: "主視窗 (預存中)", - MergingTitle: "主視窗 (合併中)", - NormalTitle: "主視窗 (一般)", + StagingTitle: "主面板（預存）", + MergingTitle: "主面板（合併）", + NormalTitle: "主面板（一般）", LogTitle: "版本記錄", CommitSummary: "提交摘要", CredentialsUsername: "使用者名稱", CredentialsPassword: "密碼", - CredentialsPassphrase: "輸入 SSH 金鑰的密碼", - CredentialsPIN: "輸入 SSH 金鑰的 PIN 碼", + CredentialsPassphrase: "SSH 金鑰密語", + CredentialsPIN: "SSH 金鑰 PIN 碼", PassUnameWrong: "密碼、密語或使用者名稱錯誤", Commit: "提交變更", - AmendLastCommit: "修正上次提交", - AmendLastCommitTitle: "修正上次提交", - SureToAmend: "是否確定要修正上次提交？之後你可以從提交面板中再次更改此次提交的訊息。", - NoCommitToAmend: "沒有可以修正的提交。", + AmendLastCommit: "修改上次提交", + AmendLastCommitTitle: "修改上次提交", + SureToAmend: "是否確定要修改上次提交？之後你可以從提交面板中再次更改此次提交的訊息。", + NoCommitToAmend: "沒有可以修改的提交。", CommitChangesWithEditor: "使用 git 編輯器提交變更", StatusTitle: "狀態", - Menu: "功能表", + Menu: "選單", Execute: "執行", Stage: "切換預存", ToggleStagedAll: "全部預存/取消預存", - ToggleTreeView: "切換檔案樹狀視圖", + ToggleTreeView: "顯示檔案樹狀視圖", OpenMergeTool: "開啟外部合併工具 (git mergetool)", Refresh: "重新整理", Push: "推送", @@ -116,15 +115,15 @@ func traditionalChineseTranslationSet() TranslationSet { NoChangedFiles: "沒有變更的檔案", SoftReset: "軟重設", AlreadyCheckedOutBranch: "你已經檢出這個分支了", - SureForceCheckout: "你確定要強制檢出嗎？這將會使你失去本地的所有更改", + SureForceCheckout: "是否強制檢出？這將會使你失去本地的所有更改", ForceCheckoutBranch: "強制檢出分支", BranchName: "分支名稱", NewBranchNameBranchOff: "新的分支名稱 (根據 '{{.branchName}}' 分支創建)", - CantDeleteCheckOutBranch: "你不能刪除已檢出的分支！", - ForceDeleteBranchMessage: "'{{.selectedBranchName}}' 分支尚未完全合併。你確定要刪除嗎？", + CantDeleteCheckOutBranch: "無法刪除已檢出的分支！", + ForceDeleteBranchMessage: "'{{.selectedBranchName}}' 分支尚未完全合併。是否刪除？", RebaseBranch: "將已檢出的分支變基至此分支", - CantRebaseOntoSelf: "你不能將分支變基至自己", - CantMergeBranchIntoItself: "你不能將一個分支合併至自己", + CantRebaseOntoSelf: "無法將分支變基至自己", + CantMergeBranchIntoItself: "無法將一個分支合併至自己", ForceCheckout: "強制檢出", CheckoutByName: "根據名稱檢出", NewBranch: "新分支", @@ -138,8 +137,8 @@ func traditionalChineseTranslationSet() TranslationSet { UpdateRefHere: "在這裡更新 '{{.ref}}' 分支", CannotSquashOrFixupFirstCommit: "沒有可以壓縮的提交", Fixup: "修復 (Fixup)", - SureFixupThisCommit: "你確定要對這個提交進行 '修復' 嗎？ 它將被合併到下面的提交中", - SureSquashThisCommit: "你確定要把這個提交壓縮到下面的提交中嗎？", + SureFixupThisCommit: "是否對此提交進行 '修復' ？ 其將被合併於以下之提交中", + SureSquashThisCommit: "是否要把這個提交壓縮到下面的提交中？", Squash: "壓縮 (Squash)", PickCommitTooltip: "挑選提交 (於變基過程中)", RevertCommit: "還原提交", @@ -150,10 +149,10 @@ func traditionalChineseTranslationSet() TranslationSet { EditCommitTooltip: "編輯提交", AmendCommitTooltip: "使用已預存的更改修正提交", ResetAuthor: "重設作者", - SetAuthor: "設置作者", - AmendCommitAttribute: "設置/重設提交作者", - SetAuthorPromptTitle: "設置作者 (格式如 '姓名 <電子郵件>')", - SureResetCommitAuthor: "此提交的作者欄位將被更新以符合已配置的使用者。它也會更新作者的時間戳。繼續嗎？", + SetAuthor: "設定作者", + AmendCommitAttribute: "設定/重設提交作者", + SetAuthorPromptTitle: "設定作者（格式：「姓名 <電子郵件>」）", + SureResetCommitAuthor: "為了符合已配置的使用者，此作者的提交欄位以及時間戳將被更新。是否繼續？", RewordCommitEditor: "使用編輯器改寫提交", Error: "錯誤", PickHunk: "挑選程式碼片段", @@ -161,20 +160,20 @@ func traditionalChineseTranslationSet() TranslationSet { Undo: "復原", UndoReflog: "復原", RedoReflog: "取消復原", - UndoTooltip: "將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改；只考慮提交。", - RedoTooltip: "將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改；只考慮提交。", - DiscardAllTooltip: "捨棄 '{{.path}}' 中的預存和未預存的更改。", - DiscardUnstagedTooltip: "捨棄 '{{.path}}' 中的未預存的更改。", + UndoTooltip: "將使用 reflog 確任 git 指令以復原。這不包括工作區更改；只考慮提交。", + RedoTooltip: "將使用 reflog 確任 git 指令以重作。這不包括工作區更改；只考慮提交。", + DiscardAllTooltip: "捨棄 '{{.path}}' 預存/未預存更改。", + DiscardUnstagedTooltip: "捨棄 '{{.path}}' 未預存更改。", Pop: "還原", Drop: "捨棄", Apply: "套用", NoStashEntries: "沒有收藏記錄", StashDrop: "放棄收藏記錄", - SureDropStashEntry: "你確定要捨棄這條收藏記錄嗎？", + SureDropStashEntry: "是否捨棄這條收藏記錄？", StashPop: "還原收藏記錄", - SurePopStashEntry: "你確定要從收藏中還原這個記錄嗎？", + SurePopStashEntry: "是否從收藏中還原這個記錄？", StashApply: "套用收藏記錄", - SureApplyStashEntry: "你確定要套用這個收藏記錄嗎？", + SureApplyStashEntry: "是否套用這個收藏記錄？", NoTrackedStagedFilesStash: "你沒有被追蹤的、預存的檔案可進行收藏", NoFilesToStash: "沒有檔案可以進行收藏", StashChanges: "安置現有變更到收藏中", @@ -192,15 +191,15 @@ func traditionalChineseTranslationSet() TranslationSet { UpdateInProgressWaitingStatus: "更新中", UpdateCompletedTitle: "更新已完成！", UpdateCompleted: "更新已成功安裝。為了使其生效，請重新啟動 lazygit。", - FailedToRetrieveLatestVersionErr: "無法獲取版本資訊", - OnLatestVersionErr: "你已經有最新版本", - MajorVersionErr: "新版本（{{.newVersion}}）與當前版本（{{.currentVersion}}）存在不向後兼容的更改", - CouldNotFindBinaryErr: "找不到 {{.url}} 路徑下的任何二進位檔", + FailedToRetrieveLatestVersionErr: "無法取得版本資訊", + OnLatestVersionErr: "已更新至最新版本", + MajorVersionErr: "新版本（{{.newVersion}}）不支援當前版本（{{.currentVersion}}）更改", + CouldNotFindBinaryErr: "找不到 {{.url}} 執行檔", UpdateFailedErr: "更新失敗：{{.errMessage}}", ConfirmQuitDuringUpdateTitle: "正在更新中", - ConfirmQuitDuringUpdate: "正在進行更新，你確定要結束？", + ConfirmQuitDuringUpdate: "正在進行更新，是否結束？", MergeToolTitle: "合併工具", - MergeToolPrompt: "你要開啟 'git mergetool' 嗎？", + MergeToolPrompt: "是否開啟 'git mergetool'？", IntroPopupMessage: traditionalChineseIntroPopupMessage, DeprecatedEditConfigWarning: traditionalChineseDeprecatedEditConfigWarning, GitconfigParseErr: `Gogit 無法解析你的 gitconfig 檔案，因為存在未引用的 '\' 字符，刪除它們應該可以解決這個問題。`, @@ -210,15 +209,15 @@ func traditionalChineseTranslationSet() TranslationSet { ExcludeFile: `添加到 .git/info/exclude`, RefreshFiles: `重新整理檔案`, Merge: `合併到當前檢出的分支`, - ConfirmQuit: `你確定要結束嗎？`, + ConfirmQuit: `是否結束？`, SwitchRepo: `切換到最近使用的版本庫`, AllBranchesLogGraph: `顯示所有分支日誌`, - UnsupportedGitService: `不支持的 Git 服務`, + UnsupportedGitService: `不支援的 git 服務`, CreatePullRequest: `建立拉取請求`, CopyPullRequestURL: `複製拉取請求的 URL 到剪貼板`, NoBranchOnRemote: `這個分支在遠端不存在。需要先將其推送至遠端。`, Fetch: `擷取`, - NoAutomaticGitFetchTitle: `不自動 git 擷取`, + NoAutomaticGitFetchTitle: `手動 git 擷取`, NoAutomaticGitFetchBody: `lazygit 無法在私有庫使用 "git 擷取"；在檔案面板中使用 'f' 手動執行 "git 擷取"`, FileEnter: `選擇檔案中的單個程式碼塊/行，或展開/折疊目錄`, FileStagingRequirements: `只能選擇跟踪檔案中的單個行`, @@ -241,7 +240,7 @@ func traditionalChineseTranslationSet() TranslationSet { RebaseOptionsTitle: "變基選項", CommitSummaryTitle: "提交摘要", CommitDescriptionTitle: "提交描述", - CommitDescriptionSubTitle: "按 tab 切換焦點", + CommitDescriptionSubTitle: "按 tab 鍵聚焦", LocalBranchesTitle: "本地分支", SearchTitle: "搜尋", TagsTitle: "標籤", @@ -251,31 +250,31 @@ func traditionalChineseTranslationSet() TranslationSet { PatchBuildingTitle: "主面板 (補丁生成)", InformationTitle: "資訊", SecondaryTitle: "次要", - ReflogCommitsTitle: "Reflog", - GlobalTitle: "全局快捷鍵", - ConflictsResolved: "所有合併衝突都已解決。繼續嗎？", - Continue: "繼續", + ReflogCommitsTitle: "日誌", + GlobalTitle: "全域快捷鍵", + ConflictsResolved: "所有合併衝突都已解決。是否繼續？", + Continue: "確認", Keybindings: "鍵盤快捷鍵", RebasingTitle: "將 '{{.checkedOutBranch}}' 變基至 '{{.ref}}'", SimpleRebase: "簡單變基", InteractiveRebase: "互動變基", InteractiveRebaseTooltip: "開始一個互動變基，以中斷開始，這樣你可以在繼續之前更新TODO提交", - ConfirmMerge: "確定要將 '{{.selectedBranch}}' 合併至 '{{.checkedOutBranch}}' 嗎？", + ConfirmMerge: "是否將 '{{.selectedBranch}}' 合併至 '{{.checkedOutBranch}}' ？", FwdNoUpstream: "無法快進無上游分支", FwdNoLocalUpstream: "無法快進尚未在本地註冊的遠端分支", FwdCommitsToPush: "無法快進帶有尚未推送的提交的分支", - ErrorOccurred: "發生錯誤！請在以下建立議題：", - NoRoom: "沒有足夠的空間", - YouAreHere: "你在這裡", - YouDied: "你已經死了！", - RewordNotSupported: "在互動變基期間改寫提交目前不支持", + ErrorOccurred: "發生錯誤！請在此詢問錯誤：", + NoRoom: "無足夠的空間", + YouAreHere: "你在這", + YouDied: "你死了！", + RewordNotSupported: "在互動變基期間改寫提交目前不支援", ChangingThisActionIsNotAllowed: "不允許更改此類變基待辦事項", CherryPickCopy: "複製提交 (揀選)", PasteCommits: "貼上提交 (揀選)", - SureCherryPick: "你確定要將複製的提交揀選到此分支嗎？", + SureCherryPick: "是否將複製的提交揀選到此分支？", CherryPick: "揀選 (Cherry-pick)", Donate: "贊助", - AskQuestion: "問問題", + AskQuestion: "諮詢", PrevLine: "選擇上一行", NextLine: "選擇下一行", PrevHunk: "選擇上一段", @@ -288,10 +287,10 @@ func traditionalChineseTranslationSet() TranslationSet { ScrollUp: "向上捲動", ScrollUpMainWindow: "向上捲動主面板", ScrollDownMainWindow: "向下捲動主面板", - AmendCommitTitle: "修正提交", - AmendCommitPrompt: "你確定要使用預存的檔案修正此提交嗎？", + AmendCommitTitle: "修改提交", + AmendCommitPrompt: "是否使用預存檔案修改提交？", DropCommitTitle: "刪除提交", - DropCommitPrompt: "你確定要刪除此提交嗎？", + DropCommitPrompt: "是否刪除此提交？", PullingStatus: "拉取", PushingStatus: "推送", FetchingStatus: "擷取", @@ -303,12 +302,13 @@ func traditionalChineseTranslationSet() TranslationSet { MergingStatus: "合併中", LowercaseRebasingStatus: "變基", // lowercase because it shows up in parentheses LowercaseMergingStatus: "合併", // lowercase because it shows up in parentheses - AmendingStatus: "修正中", + AmendingStatus: "修改中", CherryPickingStatus: "揀選中", UndoingStatus: "復原中", - RedoingStatus: "取消復原中", + RedoingStatus: "重做中", CheckingOutStatus: "檢出中", CommittingStatus: "提交中", + RevertingStatus: "還原中", CommitFiles: "提交檔案", SubCommitsDynamicTitle: "提交 (共 %s項)", CommitFilesDynamicTitle: "差異檔案 (共 %s項)", @@ -316,32 +316,31 @@ func traditionalChineseTranslationSet() TranslationSet { ViewItemFiles: "檢視所選項目的檔案", CommitFilesTitle: "提交檔案", CheckoutCommitFileTooltip: "檢出檔案", - DiscardOldFileChangeTooltip: "捨棄此提交對此檔案的更改", DiscardFileChangesTitle: "捨棄檔案更改", - DiscardFileChangesPrompt: "你確定要捨棄此提交對此檔案的更改嗎？如果這個檔案是在此提交中創建的，它將被刪除", - DisabledForGPG: "此功能不適用於使用GPG的使用者", - CreateRepo: "未在git版本庫中. 建立一個新的git版本庫? (y/n): ", - BareRepo: "你嘗試在裸版本庫中開啟Lazygit，但Lazygit尚未支持裸版本庫。是否開啟最近的版本庫? (y/n) ", - InitialBranch: "分支名稱？（留空使用git的默認值）：", - NoRecentRepositories: "必須在git版本庫中開啟lazygit。沒有有效的最近版本庫。退出。", - IncorrectNotARepository: "“notARepository”的值不正確。它應該是“prompt”、“create”、“skip”或“quit”中的一個。", - AutoStashTitle: "自動儲存?", - AutoStashPrompt: "你必須儲存和彈出你的更改才能帶它們到其他地方。是否自動執行此操作？（enter/esc）", - StashPrefix: "正在自動儲存更改：", - Discard: "檢視“捨棄更改”的選項", + DiscardFileChangesPrompt: "是否捨棄此提交？如果這個檔案是在此提交中創建的，它將被刪除", + DisabledForGPG: "此功能不適用於 GPG 加密", + CreateRepo: "未在 git 版本庫中。是否建立新版本庫？ (y/n): ", + BareRepo: "你嘗試在裸版本庫中開啟 Lazygit，但 Lazygit 尚未支援裸版本庫。是否開啟最新版本庫？ (y/n) ", + InitialBranch: "分支名稱？（留空使用 git 的預設值）：", + NoRecentRepositories: "必須在 git 版本庫中開啟 lazygit。沒有有效的最近版本庫。退出。", + IncorrectNotARepository: "無效 `notARepository` 輸入。輸入應為「prompt」、「create」、「skip」、或「quit」。", + AutoStashTitle: "是否自動收藏？", + AutoStashPrompt: "必須收藏並拾起變更才得以繼續操作。是否自動執行？（Enter/Esc）", + StashPrefix: "自動收藏 ", Cancel: "取消", - DiscardAllChanges: "捨棄所有更改", - DiscardUnstagedChanges: "捨棄未預存的更改", - DiscardAllChangesToAllFiles: "清空工作區", - DiscardAnyUnstagedChanges: "捨棄未預存的更改", - DiscardUntrackedFiles: "捨棄未追蹤的檔案", - DiscardStagedChanges: "捨棄已預存的更改", - HardReset: "硬重設", + DiscardAllChanges: "刪除所有變更", + DiscardUnstagedChanges: "刪除未預存變更", + DiscardAllChangesToAllFiles: "刪除工作目錄", + DiscardAnyUnstagedChanges: "刪除未預存變更", + DiscardUntrackedFiles: "刪除未追蹤檔案", + DiscardStagedChanges: "刪除已預存變更", + HardReset: "強制重設", ViewResetOptions: "檢視重設選項", CreateFixupCommitTooltip: "為此提交建立修復提交", - SquashAboveCommitsTooltip: "壓縮上方所有的“fixup!”提交 (自動壓縮)", + SquashAboveCommits: "壓縮上方所有「fixup」提交（自動壓縮）", + SquashAboveCommitsTooltip: "是否壓縮上方 {{.commit}} 所有「fixup」提交？", CreateFixupCommit: "建立修復提交", - SureCreateFixupCommit: "你確定要為提交{{.commit}}建立fixup!提交嗎？", + SureCreateFixupCommit: "你確定要為提交{{.commit}}建立fixup!提交？", ExecuteCustomCommand: "執行自訂命令", CustomCommand: "自訂命令：", CommitChangesWithoutHook: "沒有預提交 hook 就提交更改", @@ -380,14 +379,14 @@ func traditionalChineseTranslationSet() TranslationSet { EditRemoteName: `輸入更新 {{.remoteName}} 遠端名稱：`, EditRemoteUrl: `輸入更新 {{.remoteName}} 遠端 URL：`, RemoveRemote: `移除遠端`, - RemoveRemotePrompt: "你確定要移除遠端嗎？", + RemoveRemotePrompt: "你確定要移除遠端？", DeleteRemoteBranch: "刪除遠端分支", - DeleteRemoteBranchMessage: "你確定要刪除遠端分支嗎？", + DeleteRemoteBranchMessage: "你確定要刪除遠端分支？", SetAsUpstreamTooltip: "將此分支設為當前分支之上游", SetUpstream: "設定所選分支之上游", UnsetUpstream: "取消設定選定分支之上游", SetUpstreamTitle: "設定上游分支", - SetUpstreamMessage: "你確定要將 '{{. selected}}' 設為 '{{.checkedOut}}' 的上游分支嗎？", + SetUpstreamMessage: "你確定要將 '{{. selected}}' 設為 '{{.checkedOut}}' 的上游分支？", EditRemoteTooltip: "編輯遠端", TagCommit: "打標籤到提交", TagMenuTitle: "建立標籤", @@ -401,21 +400,25 @@ func traditionalChineseTranslationSet() TranslationSet { FetchRemoteTooltip: "擷取遠端", FetchingRemoteStatus: "正在擷取遠端", CheckoutCommit: "檢出提交", - SureCheckoutThisCommit: "你確定要檢出這個提交嗎？", + SureCheckoutThisCommit: "你確定要檢出這個提交？", GitFlowOptions: "顯示 git-flow 選項", NotAGitFlowBranch: "這似乎不是一個 git flow 分支", NewGitFlowBranchPrompt: "{{.branchType}} 名稱：", IgnoreTracked: "忽略已追蹤檔案", - IgnoreTrackedPrompt: "你確定要忽略一個已追蹤的檔案嗎？", + IgnoreTrackedPrompt: "你確定要忽略一個已追蹤的檔案？", ExcludeTracked: "排除已追蹤檔案", - ExcludeTrackedPrompt: "你確定要排除一個已追蹤的檔案嗎？", ViewResetToUpstreamOptions: "檢視上游重設選項", NextScreenMode: "下一個螢幕模式（常規/半螢幕/全螢幕）", PrevScreenMode: "上一個螢幕模式", - StartSearch: "開始搜尋", + StartSearch: "搜尋", + StartFilter: "搜尋", Panel: "面板", - KeybindingsLegend: "說明：`` 表示 Ctrl+B、`` 表示 Alt+B，`B`表示 Shift+B", + KeybindingsLegend: "說明：`` 表示 Ctrl＋B、`` 表示 Alt＋B，`B`表示 Shift＋B", RenameBranch: "重新命名分支", + BranchUpstreamOptionsTitle: "上游分支設定", + ViewBranchUpstreamOptionsTooltip: "檢視有關上游分支的設定（例如重設至上游）", + UpstreamNotSetError: "目標分支沒有上游分支（或其上游分支未儲存於本地）", + ViewBranchUpstreamOptions: "檢視上游設定", NewBranchNamePrompt: "為分支輸入新名稱", RenameBranchWarning: "此分支正在追蹤遠端分支。此操作僅會重新命名本地分支名稱，而不是遠端分支的名稱。是否繼續？", OpenKeybindingsMenu: "開啟選單", @@ -442,7 +445,7 @@ func traditionalChineseTranslationSet() TranslationSet { MustExitFilterModeTitle: "命令不可用", MustExitFilterModePrompt: "在按路徑篩選的模式下，該命令不可用。是否退出按路徑篩選的模式？", Diff: "差異", - EnterRefToDiff: "輸入要比較的 Ref", + EnterRefToDiff: "輸入欲比較之 Ref", EnterRefName: "輸入 Ref：", ExitDiffMode: "退出差異模式", DiffingMenuTitle: "差異比較", @@ -464,16 +467,16 @@ func traditionalChineseTranslationSet() TranslationSet { CopySelectedTextToClipboard: "複製所選文本至剪貼簿", CommitPrefixPatternError: "commitPrefix 模式錯誤", NoFilesStagedTitle: "沒有檔案預存", - NoFilesStagedPrompt: "你沒有預存任何檔案。提交所有檔案嗎？", + NoFilesStagedPrompt: "你沒有預存任何檔案。提交所有檔案？", BranchNotFoundTitle: "找不到分支", - BranchNotFoundPrompt: "找不到分支。是否創建一個名為", + BranchNotFoundPrompt: "找不到分支。新分支名稱", BranchUnknown: "分支未知", DiscardChangeTitle: "取消預存行", - DiscardChangePrompt: "你確定要刪除所選行嗎（git reset）？此操作是不可逆的。\n要禁用此對話框，請將“gui.skipDiscardChangeWarning”設置為true。", + DiscardChangePrompt: "是否刪除所選行（git reset）？此操作不可逆。\n將「gui.skipDiscardChangeWarning」設為 true 可禁用此警告。", CreateNewBranchFromCommit: "從提交建立新分支", BuildingPatch: "正在建立補丁", ViewCommits: "檢視提交", - MinGitVersionError: "Git 版本至少為 2.20（即從 2018 年開始）。請升級你的 Git 版本。或者在 https://github.com/jesseduffield/lazygit/issues 上提出問題，讓 lazygit 更加向後兼容。", + MinGitVersionError: "請升級 git 至新於 2.20（即從 2018 年起）之版本。或於 https://github.com/jesseduffield/lazygit/issues 上回報問題使 lazygit 能支援更舊的 git 版本。", RunningCustomCommandStatus: "正在執行自訂命令", SubmoduleStashAndReset: "收藏未提交的子模組變更並更新", AndResetSubmodules: "以及重設子模組", @@ -482,7 +485,7 @@ func traditionalChineseTranslationSet() TranslationSet { RemoveSubmodule: "移除子模組", RemoveSubmodulePrompt: "是否確定要刪除子模組 '%s' 以及它相應的目錄？此操作是不可逆的。", ResettingSubmoduleStatus: "重設子模型中", - NewSubmoduleName: "新子模組名稱：", + NewSubmoduleName: "子模組名稱：", NewSubmoduleUrl: "新子模組 URL：", NewSubmodulePath: "新子模組路徑：", NewSubmodule: "新增子模組", @@ -502,7 +505,7 @@ func traditionalChineseTranslationSet() TranslationSet { RunningCommand: "正在執行命令", SubCommitsTitle: "子提交", SubmodulesTitle: "子模組", - NavigationTitle: "列表面板導航", + NavigationTitle: "移動", SuggestionsCheatsheetTitle: "提示", SuggestionsTitle: "提示（按 %s 進入焦點）", ExtrasTitle: "命令記錄", @@ -517,16 +520,16 @@ func traditionalChineseTranslationSet() TranslationSet { CopiedToClipboard: "已複製至剪貼簿", ErrCannotEditDirectory: "無法編輯目錄：你只能編輯單獨的檔案", ErrStageDirWithInlineMergeConflicts: "不能預存/取消預存包含具備內嵌合併衝突的檔案的目錄。請先解決合併衝突", - ErrRepositoryMovedOrDeleted: "找不到版本庫。它可能已被移動或刪除 ¯\\_(ツ)_/¯", + ErrRepositoryMovedOrDeleted: "找不到版本庫。可能已被移動或刪除", CommandLog: "命令記錄", ToggleShowCommandLog: "切換顯示/隱藏命令記錄", FocusCommandLog: "聚焦命令記錄", - CommandLogHeader: "你可以按 '%s' 隱藏/聚焦此面板\n", + CommandLogHeader: " '%s' 隱藏/聚焦此面板\n", RandomTip: "隨機提示", SelectParentCommitForMerge: "選擇合併的父提交", ToggleWhitespaceInDiffView: "切換是否在差異檢視中顯示空格變更", IgnoreWhitespaceDiffViewSubTitle: "（忽略空格）", - IgnoreWhitespaceNotSupportedHere: "在此檢視中不支持忽略空格", + IgnoreWhitespaceNotSupportedHere: "在此檢視中不支援忽略空格", IncreaseContextInDiffView: "增加差異檢視中顯示變更周圍上下文的大小", DecreaseContextInDiffView: "減小差異檢視中顯示變更周圍上下文的大小", CreatePullRequestOptions: "建立拉取請求選項", @@ -537,23 +540,23 @@ func traditionalChineseTranslationSet() TranslationSet { LoadingFileSuggestions: "正在加載檔案建議", LoadingCommits: "正在加載提交", MustSpecifyOriginError: "如果指定分支，必須指定遠端", - GitOutput: "Git 輸出：", - GitCommandFailed: "Git 命令失敗。請查看命令記錄以獲取詳細資訊（按 %s 開啟）", + GitOutput: "git 輸出：", + GitCommandFailed: "git 命令失敗。請查看命令記錄以獲取詳細資訊（按 %s 開啟）", AbortTitle: "中止%s", AbortPrompt: "是否確定要中止當前的%s？", OpenLogMenu: "開啟記錄選單", LogMenuTitle: "提交記錄選項", - ToggleShowGitGraphAll: "切換顯示整個 Git 圖表（將 `--all` 標誌傳遞給 `git log`）", - ShowGitGraph: "顯示 Git 圖表", + ToggleShowGitGraphAll: "切換顯示整個 git 圖表（將 `--all` 標誌傳遞給 `git log`）", + ShowGitGraph: "顯示 git 圖表", SortCommits: "提交排序順序", CantChangeContextSizeError: "在製作補丁期間無法更改上下文大小，因為當發布功能時我們太懒了以至於沒有支援它。如果你真的需要它，請告訴我們！", OpenCommitInBrowser: "在瀏覽器中開啟提交", ViewBisectOptions: "查看二分選項", - ConfirmRevertCommit: "確定要還原 {{.selectedCommit}} 嗎？", + ConfirmRevertCommit: "是否還原 {{.selectedCommit}} ？", RewordInEditorTitle: "在編輯器中改寫", - RewordInEditorPrompt: "你確定要在編輯器中改寫此提交嗎？", - HardResetAutostashPrompt: "你確定要硬重設為 '%s' 嗎？如果必要會進行自動存儲。", - CheckoutPrompt: "你確定要檢出 '%s' 嗎？", + RewordInEditorPrompt: "是否在編輯器中改寫此提交？", + HardResetAutostashPrompt: "是否強制重設為 '%s' ？如果需要會進行自動存儲。", + CheckoutPrompt: "是否檢出 '%s' ？", UpstreamGone: "(上游已經不存在)", NukeDescription: "如果你想讓所有工作樹上的變更消失，這就是要做的方式。如果有未提交的子模組變更，它將把這些變更藏在子模組中。", DiscardStagedChangesDescription: "這將創建一個新的存儲條目，其中只包含預存檔案，然後如果存儲條目不需要，將其刪除，因此工作樹僅保留未預存的變更。", @@ -574,7 +577,49 @@ func traditionalChineseTranslationSet() TranslationSet { ExitSearchMode: "%s：退出搜尋模式", MatchesFor: "符合 '%s' 的結果（%d/%d）%s", // lowercase because it's after other text SearchKeybindings: "%s：下一個結果，%s：上一個結果，%s：退出搜尋模式", - SearchPrefix: "搜尋: ", + SearchPrefix: "搜尋：", + FilterPrefix: "篩選：", + WorktreesTitle: "工作目錄", + WorktreeTitle: "工作目錄", + SwitchToWorktree: "切換至工作目錄面板", + AlreadyCheckedOutByWorktree: "此分支已被檢出到 {{.worktreeName}} 是否切換到此工作目錄？", + BranchCheckedOutByWorktree: "分支 {{.branchName}} 已被 {{.worktreeName}} 檢出", + DetachWorktreeTooltip: "此將在工作目錄中執行 `git checkout --detach` 以解開分支與它的連結，但工作目錄本身將不被更動", + Switching: "切換中", + RemoveWorktree: "刪除工作目錄", + RemoveWorktreeTitle: "刪除工作目錄", + RemoveWorktreePrompt: "是否刪除 {{.worktreeName}} 工作目錄？", + ForceRemoveWorktreePrompt: "'{{.worktreeName}}' 包括已更動或未追蹤的檔案。是否繼續刪除工作目錄？", + RemovingWorktree: "正在刪除工作目錄", + DetachWorktree: "解開工作目錄連結", + DetachingWorktree: "正在解除工作目錄連結", + AddingWorktree: "正在建立工作目錄", + CantDeleteCurrentWorktree: "無法刪除當前工作目錄！", + AlreadyInWorktree: "已經在目標工作目錄內", + CantDeleteMainWorktree: "無法刪除主要工作目錄！", + NoWorktreesThisRepo: "無工作目錄", + MissingWorktree: "（失蹤）", + MainWorktree: "（主要）", + NewWorktreePath: "工作目錄路徑", + NewWorktreeBase: "工作目錄來源", + BranchNameCannotBeBlank: "分支名稱不能為空", + NewBranchName: "分支名稱", + NewBranchNameLeaveBlank: "分支名稱（留空將檢出 {{.default}}）", + ViewWorktreeOptions: "檢視工作目錄選項", + CreateWorktreeFrom: "從 {{.ref}} 建立工作目錄", + CreateWorktreeFromDetached: "從 {{.ref}} 建立工作目錄（未連結）", + LcWorktree: "工作目錄", + ChangingDirectoryTo: "切換至 {{.path}}", + Name: "名稱", + Branch: "分支", + Path: "路徑", + MarkedBaseCommitStatus: "為了變基已標注基準提交", + MarkAsBaseCommit: "為了變基已標注提交為基準提交", + MarkAsBaseCommitTooltip: "請為了下一次變基選擇一項基準提交；此將執行 `git rebase --onto`。", + MarkedCommitMarker: "↑↑↑ 將由此變基 ↑↑↑", + PleaseGoToURL: "請開啟 URL：{{.url}}", + DisabledMenuItemPrefix: "已停用：", + NoCopiedCommits: "未複製提交", Actions: Actions{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "檢出提交", @@ -586,7 +631,7 @@ func traditionalChineseTranslationSet() TranslationSet { RebaseBranch: "變基分支", RenameBranch: "重新命名分支", CreateBranch: "建立分支", - CherryPick: "（Cherry-pick）粘貼提交", + CherryPick: "（Cherry-pick）複製提交", CheckoutFile: "檢出檔案", DiscardOldFileChange: "放棄舊檔案更改", SquashCommitDown: "下列次方執行 Squash", @@ -594,12 +639,12 @@ func traditionalChineseTranslationSet() TranslationSet { RewordCommit: "改寫提交", DropCommit: "捨棄提交", EditCommit: "編輯提交", - AmendCommit: "修正提交", + AmendCommit: "修改提交", ResetCommitAuthor: "重設提交作者", SetCommitAuthor: "設置提交作者", RevertCommit: "還原提交", - CreateFixupCommit: "建立修正提交", - SquashAllAboveFixupCommits: "Squash 所有上面的修正提交", + CreateFixupCommit: "建立修改提交", + SquashAllAboveFixupCommits: "Squash 所有上面的修改提交", CreateLightweightTag: "建立輕量標籤", CreateAnnotatedTag: "建立附註標籤", CopyCommitMessageToClipboard: "將提交訊息複製到剪貼簿", @@ -636,8 +681,8 @@ func traditionalChineseTranslationSet() TranslationSet { StashStagedChanges: "收藏已預存的更改", StashUnstagedChanges: "收藏未預存的更改", StashIncludeUntrackedChanges: "收藏所有更改，包括未追蹤的檔案", - GitFlowFinish: "git flow 完成", - GitFlowStart: "git flow 開始", + GitFlowFinish: "`git flow` 完成", + GitFlowStart: "`git flow` 開始", CopyToClipboard: "複製到剪貼簿", CopySelectedTextToClipboard: "複製所選文本到剪貼簿", RemovePatchFromCommit: "從提交中刪除補丁", @@ -668,9 +713,9 @@ func traditionalChineseTranslationSet() TranslationSet { RemoveStagedFiles: "移除已預存的檔案", SoftReset: "軟重設", MixedReset: "混合重設", - HardReset: "硬重設", + HardReset: "強制重設", FastForwardBranch: "快進分支", - Undo: "撤銷", + Undo: "復原", Redo: "重做", CopyPullRequestURL: "複製拉取請求的 URL", OpenMergeTool: "開啟合併工具", @@ -685,13 +730,13 @@ func traditionalChineseTranslationSet() TranslationSet { Mark: "將 %s 標記為 %s", MarkStart: "將 %s 標記為 %s（開始二分查找）", SkipCurrent: "跳過 %s", - ResetTitle: "重設 'git bisect'", - ResetPrompt: "你確定要重設 'git bisect' 嗎？", + ResetTitle: "重設 `git bisect`", + ResetPrompt: "是否重設 `git bisect`？", ResetOption: "重設二分查找", BisectMenuTitle: "二分查找", CompleteTitle: "二分查找完成", - CompletePrompt: "二分查找完成！以下提交引入了更改：\n\n%s\n\n你現在要重設 'git bisect' 嗎？", - CompletePromptIndeterminate: "二分查找完成！有一些提交被跳過，因此以下任何提交都可能引入了更改：\n\n%s\n\n你現在要重設 'git bisect' 嗎？", + CompletePrompt: "二分查找完成！以下提交引入了更改：\n\n%s\n\n是否重設 `git bisect` ？", + CompletePromptIndeterminate: "二分查找完成！有一些提交被跳過，因此以下任何提交皆可能引進更改：\n\n%s\n\n是否重設 `git bisect`？", Bisecting: "二分查找中", }, }