enhance: simpfy the way to lock a worktree

This commit is contained in:
leo 2024-06-27 19:19:21 +08:00
parent 8a8aabede3
commit fa2c7c0e18
No known key found for this signature in database
10 changed files with 25 additions and 125 deletions

View file

@ -9,6 +9,7 @@
<x:String x:Key="Text.About.SubTitle" xml:space="preserve">Opensource &amp; Free Git GUI Client</x:String>
<x:String x:Key="Text.AddWorktree" xml:space="preserve">Add Worktree</x:String>
<x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">Location:</x:String>
<x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">Path for this worktree. Relative path is supported.</x:String>
<x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">Branch Name:</x:String>
<x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">Optional. Default is the destination folder name.</x:String>
<x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">Track Branch:</x:String>
@ -311,10 +312,6 @@
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
<x:String x:Key="Text.Launcher.Menu" xml:space="preserve">Open Main Menu</x:String>
<x:String x:Key="Text.LockWorktree" xml:space="preserve">Lock Worktree</x:String>
<x:String x:Key="Text.LockWorktree.Reason" xml:space="preserve">Reason:</x:String>
<x:String x:Key="Text.LockWorktree.Reason.Placeholder" xml:space="preserve">Optional, specify a reason for the lock.</x:String>
<x:String x:Key="Text.LockWorktree.Target" xml:space="preserve">Target:</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>

View file

@ -12,6 +12,7 @@
<x:String x:Key="Text.About.SubTitle" xml:space="preserve">开源免费的Git客户端</x:String>
<x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作树</x:String>
<x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">工作树路径 </x:String>
<x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">填写该工作树的路径。支持相对路径。</x:String>
<x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">自定义分支名 </x:String>
<x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">选填。默认使用目标文件夹名称。</x:String>
<x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">跟踪分支</x:String>
@ -314,10 +315,6 @@
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
<x:String x:Key="Text.Launcher.Menu" xml:space="preserve">主菜单</x:String>
<x:String x:Key="Text.LockWorktree" xml:space="preserve">锁定工作树</x:String>
<x:String x:Key="Text.LockWorktree.Reason" xml:space="preserve">原因 </x:String>
<x:String x:Key="Text.LockWorktree.Reason.Placeholder" xml:space="preserve">选填,为此锁定操作描述原因。</x:String>
<x:String x:Key="Text.LockWorktree.Target" xml:space="preserve">目标工作树 </x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 </x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 </x:String>

View file

@ -12,6 +12,7 @@
<x:String x:Key="Text.About.SubTitle" xml:space="preserve">開源免費的Git客戶端</x:String>
<x:String x:Key="Text.AddWorktree" xml:space="preserve">新增工作樹</x:String>
<x:String x:Key="Text.AddWorktree.Location" xml:space="preserve">工作樹路徑 </x:String>
<x:String x:Key="Text.AddWorktree.Location.Placeholder" xml:space="preserve">填寫該工作樹的路徑。支援相對路徑。</x:String>
<x:String x:Key="Text.AddWorktree.Name" xml:space="preserve">自定义分支名 </x:String>
<x:String x:Key="Text.AddWorktree.Name.Placeholder" xml:space="preserve">選填。 預設使用目標資料夾名稱。</x:String>
<x:String x:Key="Text.AddWorktree.Tracking" xml:space="preserve">跟蹤分支</x:String>
@ -314,10 +315,6 @@
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">出錯了</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
<x:String x:Key="Text.Launcher.Menu" xml:space="preserve">主選單</x:String>
<x:String x:Key="Text.LockWorktree" xml:space="preserve">鎖定工作樹</x:String>
<x:String x:Key="Text.LockWorktree.Reason" xml:space="preserve">原因 </x:String>
<x:String x:Key="Text.LockWorktree.Reason.Placeholder" xml:space="preserve">選填,為此鎖定操作描述原因。</x:String>
<x:String x:Key="Text.LockWorktree.Target" xml:space="preserve">目標工作樹 </x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支 </x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式 </x:String>