Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(worktree): 精简分支刷新提示文案
fmfsaisaif5322e66c80f
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex fd17bb8541..27c89e25e1 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -11367,20 +11367,20 @@}},"branchSync": {- "multiple-checkouts": "{{branch}} is checked out in multiple directories and cannot be updated safely",+ "multiple-checkouts": "{{branch}} is open in multiple directories. Cannot update","changed": "The branch state changed. Please retry.",- "action": "Fetch the latest commits for {{remoteBranch}} from {{remote}} and update local {{branch}}",- "remoteAction": "Fetch the latest commits for {{remoteBranch}} from {{remote}}",- "checkedOut": "{{branch}} is checked out in “{{directory}}”. Its files will also update; your uncommitted changes will be preserved.",- "fetching": "Fetching from {{remote}}…",+ "action": "Pull the latest commits from {{remote}}/{{remoteBranch}}",+ "remoteAction": "Pull the latest commits from {{remote}}/{{remoteBranch}}",+ "checkedOut": "Also updates files in {{directory}}",+ "fetching": "Pulling…","updated": "Updated by {{count}} commits","current": "Already up to date",- "keptAhead": "Keeping the local version with {{count}} unpushed commits",- "failed": "Last fetch failed: {{reason}}. Click to retry.",- "diverged": "Local {{branch}} and {{remote}}/{{remoteBranch}} have diverged and cannot update automatically. The new worktree will use local {{branch}}.",- "conflict": "Your uncommitted changes overlap the remote updates. Commit them or use git stash before updating.",+ "keptAhead": "{{count}} unpushed local commits. No update needed",+ "failed": "Pull failed: {{reason}}",+ "diverged": "Local and {{remote}} have diverged.\nCannot update automatically",+ "conflict": "Local changes conflict with remote updates.\nCommit or stash first","missing-remote": "{{remoteBranch}} does not exist on {{remote}}",- "no-remote": "This project has no remote repository",+ "no-remote": "No remote repository configured","not-local": "Select a local branch or the remote default branch","ahead": "{{count}} commits ahead of {{remote}}","behind": "{{count}} commits behind {{remote}}",@@ -11393,7 +11393,7 @@"auth": "Git authentication failed. Check remote credentials.","network": "Could not connect to the remote repository. Check the connection.","missing": "The remote branch no longer exists.",- "busy": "The repository changed or is busy. Retry after the other Git operation finishes.",+ "busy": "Repository is busy. Try again later","changed": "The checked-out branch changed. Retry."}}diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex ad22c3bd58..c58ead8b06 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -11332,20 +11332,20 @@}},"branchSync": {- "multiple-checkouts": "{{branch}} は複数のディレクトリで開かれているため、安全に更新できません",+ "multiple-checkouts": "{{branch}} が複数のディレクトリで開かれているため、更新できません","changed": "ブランチの状態が変わりました。再試行してください",- "action": "{{remote}} から {{remoteBranch}} の最新コミットを取得し、ローカルの {{branch}} を更新",- "remoteAction": "{{remote}} から {{remoteBranch}} の最新コミットを取得",- "checkedOut": "{{branch}} は「{{directory}}」で使用中です。そのファイルも更新されます。未コミットの変更は保持されます。",- "fetching": "{{remote}} から取得中…",+ "action": "{{remote}}/{{remoteBranch}} の最新コミットを取得",+ "remoteAction": "{{remote}}/{{remoteBranch}} の最新コミットを取得",+ "checkedOut": "{{directory}} 内のファイルも更新します",+ "fetching": "取得中…","updated": "{{count}} コミット更新しました","current": "すでに最新です",- "keptAhead": "未プッシュの {{count}} コミットを含むローカル版を保持します",- "failed": "前回の取得に失敗:{{reason}}。クリックして再試行。",- "diverged": "ローカルの {{branch}} と {{remote}}/{{remoteBranch}} は分岐しており、自動更新できません。新しい worktree はローカルの {{branch}} を使用します。",- "conflict": "未コミットの変更とリモートの更新が同じファイルにあります。先にコミットするか、git stash で変更を退避してください。",+ "keptAhead": "未プッシュのコミットが {{count}} 件あります。更新は不要です",+ "failed": "取得失敗:{{reason}}",+ "diverged": "ローカルと {{remote}} の両方に新しいコミットがあり、自動更新できません",+ "conflict": "未コミットの変更がリモートの更新と競合しています。先にコミットまたは stash してください","missing-remote": "{{remote}} に {{remoteBranch}} がありません",- "no-remote": "このプロジェクトにリモートリポジトリはありません",+ "no-remote": "リモートリポジトリが未設定です","not-local": "ローカルブランチまたはリモートの既定ブランチを選択してください","ahead": "{{remote}} より {{count}} コミット先行","behind": "{{remote}} より {{count}} コミット遅れ",@@ -11358,7 +11358,7 @@"auth": "Git の認証に失敗しました。リモートの認証情報を確認してください。","network": "リモートリポジトリに接続できません。接続を確認してください。","missing": "リモートブランチは存在しません。",- "busy": "リポジトリが変更されたか使用中です。他の Git 操作の完了後に再試行してください。",+ "busy": "リポジトリは使用中です。後で再試行してください","changed": "チェックアウト中のブランチが変更されました。再試行してください。"}}diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 90e8a6a942..80f0b41bae 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -11332,20 +11332,20 @@}},"branchSync": {- "multiple-checkouts": "{{branch}} 브랜치가 여러 디렉터리에 열려 있어 안전하게 업데이트할 수 없습니다",+ "multiple-checkouts": "{{branch}}이(가) 여러 디렉터리에 열려 있어 업데이트할 수 없습니다","changed": "브랜치 상태가 변경되었습니다. 다시 시도해 주세요",- "action": "{{remote}}에서 {{remoteBranch}}의 최신 커밋을 가져와 로컬 {{branch}} 업데이트",- "remoteAction": "{{remote}}에서 {{remoteBranch}}의 최신 커밋 가져오기",- "checkedOut": "{{branch}}은(는) “{{directory}}”에서 사용 중입니다. 해당 파일도 업데이트되며 커밋하지 않은 변경 사항은 유지됩니다.",- "fetching": "{{remote}}에서 가져오는 중…",+ "action": "{{remote}}/{{remoteBranch}}의 최신 커밋 가져오기",+ "remoteAction": "{{remote}}/{{remoteBranch}}의 최신 커밋 가져오기",+ "checkedOut": "{{directory}}의 파일도 업데이트됩니다",+ "fetching": "가져오는 중…","updated": "커밋 {{count}}개 업데이트됨","current": "이미 최신 상태입니다",- "keptAhead": "푸시하지 않은 커밋 {{count}}개가 있는 로컬 버전을 유지합니다",- "failed": "마지막 가져오기 실패: {{reason}}. 클릭하여 다시 시도하세요.",- "diverged": "로컬 {{branch}}와 {{remote}}/{{remoteBranch}} 양쪽에 새 커밋이 있어 자동 업데이트할 수 없습니다. 새 worktree는 로컬 {{branch}}을(를) 사용합니다.",- "conflict": "커밋하지 않은 변경 사항과 원격 업데이트가 같은 파일에 있습니다. 먼저 커밋하거나 git stash로 변경 사항을 보관하세요.",+ "keptAhead": "푸시하지 않은 로컬 커밋 {{count}}개. 업데이트가 필요 없습니다",+ "failed": "가져오기 실패: {{reason}}",+ "diverged": "로컬과 {{remote}} 양쪽에 새 커밋이 있어 자동 업데이트할 수 없습니다",+ "conflict": "커밋하지 않은 변경 사항이 원격 업데이트와 충돌합니다. 먼저 커밋하거나 stash 하세요","missing-remote": "{{remote}}에 {{remoteBranch}}이(가) 없습니다",- "no-remote": "이 프로젝트에 원격 저장소가 설정되지 않았습니다",+ "no-remote": "원격 저장소가 설정되지 않았습니다","not-local": "로컬 브랜치 또는 원격 기본 브랜치를 선택하세요","ahead": "{{remote}}보다 커밋 {{count}}개 앞섬","behind": "{{remote}}보다 커밋 {{count}}개 뒤처짐",@@ -11358,7 +11358,7 @@"auth": "Git 인증에 실패했습니다. 원격 인증 정보를 확인하세요.","network": "원격 저장소에 연결할 수 없습니다. 연결을 확인하세요.","missing": "원격 브랜치가 더 이상 존재하지 않습니다.",- "busy": "저장소가 변경되었거나 사용 중입니다. 다른 Git 작업이 끝난 후 다시 시도하세요.",+ "busy": "저장소가 사용 중입니다. 잠시 후 다시 시도하세요","changed": "체크아웃된 브랜치가 변경되었습니다. 다시 시도하세요."}}diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex a7f3677ffb..0798846feb 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -11332,20 +11332,20 @@}},"branchSync": {- "multiple-checkouts": "{{branch}} 同时在多个目录里打开,没法安全更新",+ "multiple-checkouts": "{{branch}} 在多个目录中打开,无法更新","changed": "分支状态已变化,请重试",- "action": "从 {{remote}} 拉取 {{remoteBranch}} 的最新提交,并更新本地 {{branch}}",- "remoteAction": "从 {{remote}} 拉取 {{remoteBranch}} 的最新提交",- "checkedOut": "{{branch}} 正在「{{directory}}」里使用,那里的文件会一起更新,你没提交的改动不受影响",- "fetching": "正在从 {{remote}} 拉取…",+ "action": "拉取 {{remote}}/{{remoteBranch}} 的最新提交",+ "remoteAction": "拉取 {{remote}}/{{remoteBranch}} 的最新提交",+ "checkedOut": "会同步更新 {{directory}} 中的文件",+ "fetching": "正在拉取…","updated": "已更新 {{count}} 个提交","current": "已是最新",- "keptAhead": "本地有 {{count}} 个提交还没推送,保留本地版本",- "failed": "上次拉取失败:{{reason}},点击重试",- "diverged": "本地 {{branch}} 和 {{remote}} 上的 {{remoteBranch}} 各有新提交,没法自动更新。新 worktree 会用本地 {{branch}}",- "conflict": "你还没提交的改动和远程的更新涉及同一批文件,没法更新。可以先提交,或者用 git stash 把改动收起来",+ "keptAhead": "本地有 {{count}} 个未推送的提交,无需更新",+ "failed": "拉取失败:{{reason}}",+ "diverged": "本地与 {{remote}} 各有新提交,无法自动更新",+ "conflict": "未提交的改动与远程更新冲突,请先提交或 stash","missing-remote": "{{remote}} 上没有 {{remoteBranch}}",- "no-remote": "这个项目没有设置远程仓库",+ "no-remote": "未设置远程仓库","not-local": "请先选择本地分支或远程主分支","ahead": "领先 {{remote}} {{count}} 个提交","behind": "落后 {{remote}} {{count}} 个提交",@@ -11358,7 +11358,7 @@"auth": "Git 认证失败,请检查远程仓库凭证","network": "无法连接远程仓库,请检查网络连接","missing": "远程分支已不存在",- "busy": "仓库正在更新或已发生变化,请等其它 Git 操作完成后重试",+ "busy": "仓库正忙,请稍后重试","changed": "检出的分支已变化,请重试"}}diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex e7ac8939d4..733b53136d 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -11332,20 +11332,20 @@}},"branchSync": {- "multiple-checkouts": "{{branch}} 同時在多個目錄中開啟,無法安全更新",+ "multiple-checkouts": "{{branch}} 在多個目錄中開啟,無法更新","changed": "分支狀態已變更,請重試",- "action": "從 {{remote}} 取得 {{remoteBranch}} 的最新提交,並更新本機 {{branch}}",- "remoteAction": "從 {{remote}} 取得 {{remoteBranch}} 的最新提交",- "checkedOut": "{{branch}} 正在「{{directory}}」中使用,那裡的檔案會一起更新,你尚未提交的變更不受影響",- "fetching": "正在從 {{remote}} 取得更新…",+ "action": "取得 {{remote}}/{{remoteBranch}} 的最新提交",+ "remoteAction": "取得 {{remote}}/{{remoteBranch}} 的最新提交",+ "checkedOut": "會同步更新 {{directory}} 中的檔案",+ "fetching": "正在取得更新…","updated": "已更新 {{count}} 個提交","current": "已是最新",- "keptAhead": "本機有 {{count}} 個提交尚未推送,保留本機版本",- "failed": "上次取得更新失敗:{{reason}},點擊重試",- "diverged": "本機 {{branch}} 和 {{remote}} 上的 {{remoteBranch}} 各有新提交,無法自動更新。新 worktree 會使用本機 {{branch}}",- "conflict": "尚未提交的變更與遠端更新涉及相同檔案,無法更新。請先提交,或使用 git stash 收起變更",+ "keptAhead": "本機有 {{count}} 個尚未推送的提交,無需更新",+ "failed": "取得更新失敗:{{reason}}",+ "diverged": "本機與 {{remote}} 各有新提交,無法自動更新",+ "conflict": "尚未提交的變更與遠端更新衝突,請先提交或 stash","missing-remote": "{{remote}} 上沒有 {{remoteBranch}}",- "no-remote": "這個專案沒有設定遠端儲存庫",+ "no-remote": "未設定遠端儲存庫","not-local": "請先選擇本機分支或遠端主分支","ahead": "領先 {{remote}} {{count}} 個提交","behind": "落後 {{remote}} {{count}} 個提交",@@ -11358,7 +11358,7 @@"auth": "Git 認證失敗,請檢查遠端儲存庫憑證","network": "無法連線至遠端儲存庫,請檢查網路連線","missing": "遠端分支已不存在",- "busy": "儲存庫正在更新或已變更,請等其他 Git 操作完成後重試",+ "busy": "儲存庫忙碌中,請稍後重試","changed": "檢出的分支已變更,請重試"}}