refactor: replace "delete" with "remove" for worktree removal

- Update UI text and labels to use "Remove" instead of "Delete" for worktree operations
- Rename configuration options and related code to reflect the new terminology
- Update multiple language translations to use the new "Remove" terminology

Author: jackiotyu

CHANGELOG.md

@@ -77,7 +77,7 @@
 
 ### Change
 
-- add force delete option for worktree removal
+- add Force remove option for worktree removal
 
 ## [1.1.5] 2025-03-05
 

README.zh-CN.md

@@ -134,7 +134,7 @@
 - [x] 访问 git 历史
 - [x] 展示 git 分支状态
 - [x] 拉取/推送分支
-- [x] 在工作区内添加/删除指定 worktree 目录
+- [x] 在工作区内添加/移除指定 worktree 目录
 - [x] 切换分支或者创建 worktree 时支持新建分支 (#14)
 - [x] 创建 worktree 时支持复制主仓库中 git 未跟踪的文件 (#16)
 - [x] git 仓库快照 (备份)

l10n/bundle.l10n.ja.json

@@ -6,7 +6,7 @@
     "Add folder to workspace": "ワークスペースにフォルダを追加",
     "Remove folder from workspace": "ワークスペースからフォルダを削除",
     "Open Settings": "設定を開く",
-    "Delete worktree": "ワークツリーを削除",
+    "Remove worktree": "ワークツリーを削除",
     "Prune worktree": "ワークツリーを整理",
     "Find Worktree": "ワークツリーを検索",
     "Add Worktree": "ワークツリーを追加",
@@ -30,7 +30,7 @@
     "Select the folder": "フォルダを選択",
     "Select the folder where you want to create the worktree": "ワークツリーを作成するフォルダを選択してください",
     "Select the new location to move the Worktree's folder from {0}": "{0} からワークツリーのフォルダを移動する新しい場所を選択してください",
-    "The worktree for the {0} folder will be deleted": "{0} フォルダのワークツリーを削除します",
+    "The worktree for the {0} folder will be removed": "{0} フォルダのワークツリーを削除します",
     "The following worktree folders will be pruned": "以下のワークツリーフォルダを整理します",
     "Add a git repository folder path": "Gitリポジトリのフォルダパスを追加",
     "Please select the git repository folder path": "Gitリポジトリのフォルダパスを選択してください",
@@ -43,7 +43,7 @@
     "Select the command you need to execute in the terminal": "ターミナルで実行するコマンドを選択してください",
     "Sort by branch name": "ブランチ名でソート",
     "Sort by repository": "リポジトリでソート",
-    "Successfully deleted the worktree for the {0} folder": "{0} フォルダのワークツリーを削除しました",
+    "Successfully removed the worktree for the {0} folder": "{0} フォルダのワークツリーを削除しました",
     "Worktree removal failed\n\n {0}": "ワークツリーの削除に失敗しました\n\n {0}",
     "Worktree {0} successfully": "ワークツリー {0} が成功しました",
     "Worktree {0} failed {1}": "ワークツリー {0} が失敗しました {1}",
@@ -126,8 +126,8 @@
     "Deleting branch {branch}": "ブランチ {branch} を削除中",
     "Creating worktree {path}": "ワークツリー {path} を作成中",
     "Copying files to worktree {path}": "ファイルをワークツリー {path} にコピー中",
-    "Deleting worktree {path}": "ワークツリー {path} を削除中",
-    "Force delete": "強制削除",
+    "Removing worktree {path}": "ワークツリー {path} を削除中",
+    "Force remove": "強制削除",
     "Searching folders": "フォルダを検索中",
     "Loading...": "ロード中...",
     "Bundling repo..., {path}": "リポジトリをバンドル中..., {path}",

l10n/bundle.l10n.zh-cn.json

@@ -6,7 +6,7 @@
     "Add folder to workspace": "添加到工作区",
     "Remove folder from workspace": "从工作区中移除",
     "Open Settings": "打开设置",
-    "Delete worktree": "删除 worktree",
+    "Remove worktree": "移除 worktree",
     "Prune worktree": "清理 worktree",
     "Find Worktree": "查找 worktree",
     "Add Worktree": "添加 worktree",
@@ -30,7 +30,7 @@
     "Select the folder": "选择文件夹",
     "Select the folder where you want to create the worktree": "选择需要创建worktree的文件夹",
     "Select the new location to move the Worktree's folder from {0}": "请选择将 worktree 的文件夹从 {0} 移动到的新位置",
-    "The worktree for the {0} folder will be deleted": "将删除 {0} 文件夹的worktree",
+    "The worktree for the {0} folder will be removed": "将移除 {0} 文件夹的worktree",
     "The following worktree folders will be pruned": "将清理以下 worktree 文件夹",
     "Add a git repository folder path": "添加git仓库路径",
     "Please select the git repository folder path": "请选择git仓库文件夹",
@@ -43,7 +43,7 @@
     "Select the command you need to execute in the terminal": "选择在终端中需要执行的命令",
     "Sort by branch name": "根据分支名称排序",
     "Sort by repository": "根据仓库排序",
-    "Successfully deleted the worktree for the {0} folder": "成功删除 {0} 文件夹的 worktree",
+    "Successfully removed the worktree for the {0} folder": "成功移除 {0} 文件夹的 worktree",
     "Worktree removal failed\n\n {0}": "worktree 移除失败\n\n {0}",
     "Worktree {0} successfully": "worktree {0}成功",
     "Worktree {0} failed {1}": "worktree {0}失败 {1}",
@@ -126,8 +126,8 @@
     "Deleting branch {branch}": "正在删除分支 {branch}",
     "Creating worktree {path}": "正在创建 worktree {path}",
     "Copying files to worktree {path}": "正在复制文件到 worktree {path}",
-    "Deleting worktree {path}": "正在删除 worktree {path}",
-    "Force delete": "强制删除",
+    "Removing worktree {path}": "正在移除 worktree {path}",
+    "Force remove": "强制移除",
     "Searching folders": "正在搜索文件夹",
     "Loading...": "正在加载...",
     "Bundling repo..., {path}": "打包仓库中..., {path}",

l10n/bundle.l10n.zh-tw.json

@@ -6,7 +6,7 @@
     "Add folder to workspace": "新增至工作區",
     "Remove folder from workspace": "從工作區中移除",
     "Open Settings": "開啟設定",
-    "Delete worktree": "刪除 worktree",
+    "Remove worktree": "移除 worktree",
     "Prune worktree": "清理 worktree",
     "Find Worktree": "尋找 worktree",
     "Add Worktree": "新增 worktree",
@@ -30,7 +30,7 @@
     "Select the folder": "選擇資料夾",
     "Select the folder where you want to create the worktree": "選擇要建立 worktree 的資料夾",
     "Select the new location to move the Worktree's folder from {0}": "請選擇要將 worktree 的資料夾從 {0} 移動到的新位置",
-    "The worktree for the {0} folder will be deleted": "將刪除 {0} 資料夾的 worktree",
+    "The worktree for the {0} folder will be removed": "將移除 {0} 資料夾的 worktree",
     "The following worktree folders will be pruned": "將清理以下 worktree 資料夾",
     "Add a git repository folder path": "新增 git 儲存庫路徑",
     "Please select the git repository folder path": "請選擇 git 儲存庫資料夾",
@@ -43,7 +43,7 @@
     "Select the command you need to execute in the terminal": "選擇在終端機中需要執行的命令",
     "Sort by branch name": "根據分支名稱排序",
     "Sort by repository": "根據儲存庫排序",
-    "Successfully deleted the worktree for the {0} folder": "成功刪除 {0} 資料夾的 worktree",
+    "Successfully removed the worktree for the {0} folder": "成功移除 {0} 資料夾的 worktree",
     "Worktree removal failed\n\n {0}": "worktree 移除失敗\n\n {0}",
     "Worktree {0} successfully": "worktree {0} 成功",
     "Worktree {0} failed {1}": "worktree {0} 失敗 {1}",
@@ -126,8 +126,8 @@
     "Deleting branch {branch}": "正在刪除分支 {branch}",
     "Creating worktree {path}": "正在建立 worktree {path}",
     "Copying files to worktree {path}": "正在複製檔案到 worktree {path}",
-    "Deleting worktree {path}": "正在刪除 worktree {path}",
-    "Force delete": "強制刪除",
+    "Removing worktree {path}": "正在移除 worktree {path}",
+    "Force remove": "強制移除",
     "Searching folders": "正在搜尋資料夾",
     "Loading...": "載入中...",
     "Bundling repo..., {path}": "組合儲存庫..., {path}",

package.json

@@ -1029,12 +1029,12 @@
             "default": true,
             "markdownDescription": "%config.worktreePick.showOpenRepository.description%"
           },
-          "git-worktree-manager.worktreePick.showDeleteWorktree": {
+          "git-worktree-manager.worktreePick.showRemoveWorktree": {
             "order": 12,
             "scope": "application",
             "type": "boolean",
             "default": true,
-            "markdownDescription": "%config.worktreePick.showDeleteWorktree.description%"
+            "markdownDescription": "%config.worktreePick.showRemoveWorktree.description%"
           }
         }
       },

package.nls.ja.json

@@ -84,7 +84,7 @@
     "config.defaultDisplayList.enum.all": "すべてのワークツリーリストを表示",
     "config.gitHistoryExtension.enum.vscode.git": "VSCode Git ⇄ 内蔵Git履歴ビュー",
     "config.workspacePathFormat.description": "ワークスペースパスの表示テンプレートをカスタマイゼ。テンプレートで使用できる変数：\n\n- `$FULL_PATH`：リポジトリの完全パス\n- `$BASE_NAME`：リポジトリのフォルダ名\n\n例：\n`$BASE_NAME - $FULL_PATH` は `my-project - /Users/username/projects/my-project` として表示されます",
-    "config.worktreePick.showDeleteWorktree.description": "「ワークツリーを検索」の結果に「ワークツリーを削除」ボタンを表示",
+    "config.worktreePick.showRemoveWorktree.description": "「ワークツリーを検索」の結果に「ワークツリーを削除」ボタンを表示",
     "config.branchPick.showDeleteBranch.description": "「ブランチを選択」の結果に「ブランチを削除」ボタンを表示",
     "config.promptDeleteBranchAfterWorktreeDeletion.description": "ワークツリー削除後、以前関連付けられていたブランチの削除を促す",
     "config.worktreeCopyPatterns.description": "新しいワークツリーを作成する際にコピーするファイルのGlobパターン。[globパターンの説明](https://code.visualstudio.com/docs/editor/glob-patterns)を参照",

package.nls.json

@@ -9,7 +9,7 @@
     "cmd.renameGitFolder": "Rename this Git repository",
     "cmd.removeGitFolder": "Remove this Git repository",
     "cmd.removeMultiGitFolder": "Batch Remove Git Repositories",
-    "cmd.removeWorktree": "Delete worktree",
+    "cmd.removeWorktree": "Remove worktree",
     "cmd.addWorktreeFromBranch": "Create a worktree from the current branch",
     "cmd.revealInSystemExplorer": "Reveal in the system explorer",
     "cmd.repairWorktree": "Repair worktree",
@@ -84,7 +84,7 @@
     "config.defaultDisplayList.enum.all": "Display all worktree list",
     "config.gitHistoryExtension.enum.vscode.git": "VSCode Git ⇄ Built-in Git graph",
     "config.workspacePathFormat.description": "Custom template for displaying the workspace path. You can use the following variables in the template:\n\n- `$FULL_PATH`: The full path of the repository.\n- `$BASE_NAME`: The folder name of the repository.\n\nExample:\n`$BASE_NAME - $FULL_PATH` will be displayed as `my-project - /Users/username/projects/my-project`.",
-    "config.worktreePick.showDeleteWorktree.description": "Show the \"Delete Worktree\" button on the results of \"Find Worktree\"",
+    "config.worktreePick.showRemoveWorktree.description": "Show the \"Remove Worktree\" button on the results of \"Find Worktree\"",
     "config.branchPick.showDeleteBranch.description": "Show the \"Delete Branch\" button on the results of \"Pick Branch\"",
     "config.promptDeleteBranchAfterWorktreeDeletion.description": "Prompt to delete the branch previously associated with the worktree after its deletion",
     "config.worktreeCopyPatterns.description": "Glob patterns for files to be copied when creating a new worktree, referring to [glob patterns](https://code.visualstudio.com/docs/editor/glob-patterns).",

package.nls.zh-cn.json

@@ -9,7 +9,7 @@
     "cmd.renameGitFolder": "重命名选中的 Git 仓库",
     "cmd.removeGitFolder": "移除选中的 Git 仓库",
     "cmd.removeMultiGitFolder": "批量移除 Git 仓库",
-    "cmd.removeWorktree": "删除 worktree",
+    "cmd.removeWorktree": "移除 worktree",
     "cmd.addWorktreeFromBranch": "从当前分支创建 worktree",
     "cmd.revealInSystemExplorer": "在系统文件管理器中展示",
     "cmd.repairWorktree": "修复 worktree",
@@ -84,9 +84,9 @@
     "config.defaultDisplayList.enum.all": "展示所有的 worktree 列表",
     "config.gitHistoryExtension.enum.vscode.git": "VSCode Git ⇄ 内置的 Git 历史视图",
     "config.workspacePathFormat.description": "自定义工作区路径的显示模板。你可以在模板中使用以下变量：\n\n- `$FULL_PATH`：仓库的完整路径。\n- `$BASE_NAME`：仓库的文件夹名称。\n\n示例：\n`$BASE_NAME - $FULL_PATH` 将会显示为 `my-project - /Users/username/projects/my-project。`",
-    "config.worktreePick.showDeleteWorktree.description": "在 \"查找 Worktree\" 列表中展示 \"删除 worktree\" 按钮",
+    "config.worktreePick.showRemoveWorktree.description": "在 \"查找 Worktree\" 列表中展示 \"移除 worktree\" 按钮",
     "config.branchPick.showDeleteBranch.description": "在 \"挑选分支\" 列表中展示 \"删除分支\" 按钮",
-    "config.promptDeleteBranchAfterWorktreeDeletion.description": "在删除 worktree 之后，是否提示删除之前关联的分支",
+    "config.promptDeleteBranchAfterWorktreeDeletion.description": "在移除 worktree 之后，是否提示删除之前关联的分支",
     "config.worktreeCopyPatterns.description": "创建新 worktree 时需要复制的文件匹配模式，参考[glob patterns介绍](https://juejin.cn/post/7474119575574855717)",
     "config.worktreeCopyIgnores.description": "创建新 worktree 时需要排除的文件匹配模式，参考[glob patterns介绍](https://juejin.cn/post/7474119575574855717)",
     "submenus.worktree-action": "worktree 操作",

package.nls.zh-tw.json

@@ -84,7 +84,7 @@
     "config.defaultDisplayList.enum.all": "顯示所有的 worktree 清單",
     "config.gitHistoryExtension.enum.vscode.git": "vscode Git ⇄ 內建的 Git 歷史檢視",
     "config.workspacePathFormat.description": "自訂工作區路徑的顯示範本。你可以在範本中使用以下變數：\n\n- `$FULL_PATH`：儲存庫的完整路徑。\n- `$BASE_NAME`：儲存庫的資料夾名稱。\n\n範例：\n`$BASE_NAME - $FULL_PATH` 將會顯示為 `my-project - /Users/username/projects/my-project`",
-    "config.worktreePick.showDeleteWorktree.description": "在「尋找 Worktree」清單中顯示「刪除 worktree」按鈕",
+    "config.worktreePick.showRemoveWorktree.description": "在「尋找 Worktree」清單中顯示「移除 worktree」按鈕",
     "config.branchPick.showDeleteBranch.description": "在「挑選分支」清單中顯示「刪除分支」按鈕",
     "config.promptDeleteBranchAfterWorktreeDeletion.description": "在刪除 worktree 之後，是否提示刪除之前關聯的分支",
     "config.worktreeCopyPatterns.description": "建立新 worktree 時需要複製的檔案匹配模式，參考[glob patterns介紹](https://code.visualstudio.com/docs/editor/glob-patterns)",