From 99d1d69d4d68c452fb02bd4b9275929dbc4c6fde Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Oct 2025 16:25:35 +0800
Subject: [PATCH 01/72] ux: main tab bar style

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Themes.axaml        |  2 +-
 src/Views/LauncherTabBar.axaml    | 11 ++++++-----
 src/Views/LauncherTabBar.axaml.cs | 15 +++++++++++++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 3b4637331..b5a0d61fa 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -32,7 +32,7 @@
       <Color x:Key="Color.Window">#FF252525</Color>
       <Color x:Key="Color.WindowBorder">#FF444444</Color>
       <Color x:Key="Color.TitleBar">#FF1F1F1F</Color>
-      <Color x:Key="Color.ToolBar">#FF2C2C2C</Color>
+      <Color x:Key="Color.ToolBar">#FF2F2F2F</Color>
       <Color x:Key="Color.Popup">#FF2B2B2B</Color>
       <Color x:Key="Color.Contents">#FF1C1C1C</Color>
       <Color x:Key="Color.Badge">#FF8F8F8F</Color>
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 7ea6bd400..74cda1daf 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -42,7 +42,8 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:LauncherPage">
-              <Border Height="30"
+              <Border Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30"
+                      Padding="0,2,0,0"
                       Background="Transparent"
                       PointerPressed="OnPointerPressedTab"
                       PointerMoved="OnPointerMovedOverTab"
@@ -61,7 +62,7 @@
                   </Grid>
                 </ToolTip.Tip>
 
-                <Grid Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
+                <Grid ColumnDefinitions="Auto,*,Auto">
                   <Path Grid.Column="0"
                         Width="12" Height="12" Margin="12,0"
                         Fill="{Binding Node.Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
@@ -84,7 +85,7 @@
                              Width="8" Height="8"
                              Margin="0,0,6,0"
                              VerticalAlignment="Center"
-                             IsVisible="{Binding DirtyState, Converter={x:Static ObjectConverters.IsNotNull}, ConverterParameter={x:Static m:DirtyState.None}}"
+                             IsVisible="{Binding DirtyState, Converter={x:Static ObjectConverters.NotEqual}, ConverterParameter={x:Static m:DirtyState.None}}"
                              Fill="{Binding DirtyState, Converter={x:Static c:DirtyStateConverters.ToBrush}}"/>
 
                     <TextBlock Grid.Column="1"
@@ -107,7 +108,7 @@
 
                   <Button Grid.Column="2"
                           Classes="icon_button"
-                          Width="16" Height="16" Margin="12,0"
+                          Width="12" Height="12" Margin="12,0"
                           Click="OnCloseTab">
                     <ToolTip.Tip>
                       <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
@@ -129,7 +130,7 @@
 
         <Button Classes="icon_button"
                 Width="16" Height="16"
-                Margin="8,0"
+                Margin="8,2,8,0"
                 Command="{Binding AddNewTab}"
                 IsVisible="{Binding !#ThisControl.IsScrollerVisible}">
           <ToolTip.Tip>
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
index be91f7296..99ba3474e 100644
--- a/src/Views/LauncherTabBar.axaml.cs
+++ b/src/Views/LauncherTabBar.axaml.cs
@@ -38,7 +38,18 @@ public override void Render(DrawingContext context)
             var selectedIdx = LauncherTabsList.SelectedIndex;
             var count = LauncherTabsList.ItemCount;
             var separatorPen = new Pen(this.FindResource("Brush.FG2") as IBrush, 0.5);
-            var separatorY = (height - 20) * 0.5;
+            var separatorY = (height - 18) * 0.5 + 1;
+
+            if (!IsScrollerVisible && selectedIdx > 0)
+            {
+                var container = LauncherTabsList.ContainerFromIndex(0);
+                if (container != null)
+                {
+                    var x = container.Bounds.Left - startX + LauncherTabsScroller.Bounds.X;
+                    context.DrawLine(separatorPen, new Point(x, separatorY), new Point(x, separatorY + 18));
+                }
+            }
+
             for (var i = 0; i < count; i++)
             {
                 if (i == selectedIdx || i == selectedIdx - 1)
@@ -56,7 +67,7 @@ public override void Render(DrawingContext context)
                     break;
 
                 var separatorX = containerEndX - startX + LauncherTabsScroller.Bounds.X;
-                context.DrawLine(separatorPen, new Point(separatorX, separatorY), new Point(separatorX, separatorY + 20));
+                context.DrawLine(separatorPen, new Point(separatorX, separatorY), new Point(separatorX, separatorY + 18));
             }
 
             var selected = LauncherTabsList.ContainerFromIndex(selectedIdx);

From 90a049d7412a25e6e020b023792ad05f9cba82a6 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 13 Oct 2025 21:07:54 +0800
Subject: [PATCH 02/72] performance: do not load diff content if `CHANGES` tab
 is not actived

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/CommitDetail.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 211305635..1501f6b4d 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -37,7 +37,12 @@ public int ActiveTabIndex
             set
             {
                 if (value != _sharedData.ActiveTabIndex)
+                {
                     _sharedData.ActiveTabIndex = value;
+
+                    if (value == 1 && DiffContext == null && _selectedChanges is { Count: 1 })
+                        DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_commit, _selectedChanges[0]));
+                }
             }
         }
 
@@ -94,7 +99,7 @@ public List<Models.Change> SelectedChanges
             {
                 if (SetProperty(ref _selectedChanges, value))
                 {
-                    if (value is not { Count: 1 })
+                    if (ActiveTabIndex != 1 || value is not { Count: 1 })
                         DiffContext = null;
                     else
                         DiffContext = new DiffContext(_repo.FullPath, new Models.DiffOption(_commit, value[0]), _diffContext);

From c5be29a7c051f9a0f8c19f1ee67d1070ceafe79f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Oct 2025 11:19:01 +0800
Subject: [PATCH 03/72] feature: supports output changes file names (without
 folders in path) in commit message template (#1851)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/TemplateEngine.cs        | 34 ++++++++++++++++++++++-------
 src/Resources/Locales/de_DE.axaml   |  1 -
 src/Resources/Locales/en_US.axaml   |  9 +++++++-
 src/Resources/Locales/es_ES.axaml   |  1 -
 src/Resources/Locales/id_ID.axaml   |  1 -
 src/Resources/Locales/it_IT.axaml   |  1 -
 src/Resources/Locales/ru_RU.axaml   |  1 -
 src/Resources/Locales/zh_CN.axaml   |  9 +++++++-
 src/Resources/Locales/zh_TW.axaml   |  9 +++++++-
 src/Views/RepositoryConfigure.axaml | 14 +++++++-----
 10 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/Models/TemplateEngine.cs b/src/Models/TemplateEngine.cs
index fc462918b..12280006e 100644
--- a/src/Models/TemplateEngine.cs
+++ b/src/Models/TemplateEngine.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -349,14 +350,10 @@ private static string EvalVariable(Context context, RegexVariable variable)
         private delegate string VariableGetter(Context context);
 
         private static readonly IReadOnlyDictionary<string, VariableGetter> s_variables = new Dictionary<string, VariableGetter>() {
-            // legacy variables
             {"branch_name", GetBranchName},
             {"files_num", GetFilesCount},
             {"files", GetFiles},
-            //
-            {"BRANCH", GetBranchName},
-            {"FILES_COUNT", GetFilesCount},
-            {"FILES", GetFiles},
+            {"pure_files", GetPureFiles},
         };
 
         private static string GetBranchName(Context context)
@@ -377,13 +374,19 @@ private static string GetFiles(Context context)
             return string.Join(", ", paths);
         }
 
+        private static string GetPureFiles(Context context)
+        {
+            var names = new List<string>();
+            foreach (var c in context.changes)
+                names.Add(Path.GetFileName(c.Path));
+            return string.Join(", ", names);
+        }
+
         private delegate string VariableSliceGetter(Context context, int count);
 
         private static readonly IReadOnlyDictionary<string, VariableSliceGetter> s_slicedVariables = new Dictionary<string, VariableSliceGetter>() {
-            // legacy variables
             {"files", GetFilesSliced},
-            //
-            {"FILES", GetFilesSliced},
+            {"pure_files", GetPureFilesSliced}
         };
 
         private static string GetFilesSliced(Context context, int count)
@@ -400,5 +403,20 @@ private static string GetFilesSliced(Context context, int count)
 
             return sb.ToString();
         }
+
+        private static string GetPureFilesSliced(Context context, int count)
+        {
+            var sb = new StringBuilder();
+            var names = new List<string>();
+            var max = Math.Min(count, context.changes.Count);
+            for (int i = 0; i < max; i++)
+                names.Add(Path.GetFileName(context.changes[i].Path));
+
+            sb.AppendJoin(", ", names);
+            if (max < context.changes.Count)
+                sb.Append($" and {context.changes.Count - max} other files");
+
+            return sb.ToString();
+        }
     }
 }
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index a19b4bef0..e0cbedda2 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -186,7 +186,6 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository Einstellungen</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Du kannst ${files_num}, ${branch_name}, ${files} und ${files:N} verwenden, wobei N die maximale Anzahl an auszugebenden Dateipfaden ist.</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Inhalt:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">BENUTZERDEFINIERTE AKTION</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 7884a14d2..3f8e7425a 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -182,7 +182,14 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Enter commit subject</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">You can use ${files_num}, ${branch_name}, ${files} and ${files:N} where N is the max number of file paths to output.</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Built-in parameters: 
+  
+  ${branch_name} Current local branch name.
+  ${files_num} Number of changed files
+  ${files} Paths of changed files
+  ${files:N} Max N number of paths of changed files
+  ${pure_files} Likes ${files}, but only pure file names
+  ${pure_files:N} Likes ${files:N}, but without folders</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Content:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">CUSTOM ACTION</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 30e793376..e194ba292 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -186,7 +186,6 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Introducir asunto del commit</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Configurar Repositorio</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">PLANTILLA DE COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Puedes usar ${files_num}, ${branch_name}, ${files} y ${files:N} donde N es el número máximo de rutas de archivo a la salida.</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Contenido de la Plantilla:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nombre de la Plantilla:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ACCIÓN PERSONALIZADA</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 46d879283..5c5775fa2 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -184,7 +184,6 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Masukkan subjek commit</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Konfigurasi Repositori</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">TEMPLATE COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Anda dapat menggunakan ${files_num}, ${branch_name}, ${files} dan ${files:N} dimana N adalah jumlah maksimal jalur berkas yang ditampilkan.</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Konten Template:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nama Template:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AKSI KUSTOM</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 7d05b8c9f..0d7948147 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -174,7 +174,6 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Inserisci l'oggetto del commit</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Configura Repository</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">TEMPLATE DI COMMIT</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Puoi usare ${files_num}, ${branch_name}, ${files} e ${files:N} dove N è il numero massimo di percorsi di file da mostrare.</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Contenuto Template:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Nome Template:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">AZIONE PERSONALIZZATA</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 776bb7816..c1db3097d 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -186,7 +186,6 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Введите тему ревизии</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Настройка репозитория</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">ШАБЛОН РЕВИЗИИ</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Вы можете использовать ${files_num}, ${branch_name}, ${files} и ${files:N}, где N — максимальное количество путей к файлам для вывода.</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Cодержание:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Название:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index cc3b04549..b373f2040 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -186,7 +186,14 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填写提交信息主题</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交信息模板</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">您可使用 ${files_num}, ${branch_name}, ${files} 或 ${files:N}（N表示最大显示的文件数）</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">内置变量：
+  
+  ${branch_name} 当前分支名
+  ${files_num} 变更文件数量
+  ${files} 变更文件路径列表
+  ${files:N} 变更文件路径列表（仅输出指定 N 条）
+  ${pure_files} 与 ${files} 类似，但仅输出文件名
+  ${pure_files:N} 与 ${files:N} 类似，但仅输出文件名</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">模板内容 ：</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">模板名 ：</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自定义操作</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 14c7509cd..d55cbfbbd 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -186,7 +186,14 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填寫提交訊息標題</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">存放庫設定</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交訊息範本</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">您可以使用 ${files_num}、${branch_name}、${files} 或 ${files:N}，其中 N 是要輸出的檔案路徑的最大數目。</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">內建參數: 
+  
+  ${branch_name} 目前分支名稱
+  ${files_num} 已變更檔案數
+  ${files} 已變更檔案路徑清單
+  ${files:N} 已變更檔案路徑清單（僅列出前 N 個）
+  ${pure_files} 類似 ${files}, 不含資料夾的純檔案名稱
+  ${pure_files:N} 類似 ${files:N}, 不含資料夾的純檔案名稱</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">範本內容:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">範本名稱:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自訂動作</x:String>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index ef682ec51..4014a25eb 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -257,12 +257,14 @@
                   <TextBlock Text="{DynamicResource Text.Configure.CommitMessageTemplate.Name}"/>
                   <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/>
 
-                  <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Configure.CommitMessageTemplate.Content}"/>
-                  <v:CommitMessageTextBox Margin="0,4,0,0" Height="150" Text="{Binding Content, Mode=TwoWay}"/>
-                  <TextBlock Margin="0,2,0,0"
-                             Text="{DynamicResource Text.Configure.CommitMessageTemplate.BuiltinVars}"
-                             Foreground="{DynamicResource Brush.FG2}"
-                             TextWrapping="Wrap"/>
+                  <Grid ColumnDefinitions="*,Auto" Margin="0,12,0,0">
+                    <TextBlock Grid.Column="0" Text="{DynamicResource Text.Configure.CommitMessageTemplate.Content}"/>
+                    <Border Grid.Column="1" Width="14" Height="14" Background="Transparent" ToolTip.Tip="{DynamicResource Text.Configure.CommitMessageTemplate.BuiltinVars}">
+                      <Path Data="{StaticResource Icons.Info}"/>
+                    </Border>
+                  </Grid>
+
+                  <v:CommitMessageTextBox Margin="0,4,0,0" Height="200" Text="{Binding Content, Mode=TwoWay}"/>
                 </StackPanel>
               </DataTemplate>
             </ContentControl.DataTemplates>

From 04a1d92b5ebce9e153fbd5f6da294419d73b1df1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 03:19:28 +0000
Subject: [PATCH 04/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 50d4cbc22..654dbd993 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,9 +6,23 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.89%25-yellow)
 
-### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
+<details>
+<summary>Missing keys in de_DE.axaml</summary>
+
+- Text.Configure.CommitMessageTemplate.BuiltinVars
+
+</details>
+
+### ![es__ES](https://img.shields.io/badge/es__ES-99.89%25-yellow)
+
+<details>
+<summary>Missing keys in es_ES.axaml</summary>
+
+- Text.Configure.CommitMessageTemplate.BuiltinVars
+
+</details>
 
 ### ![fr__FR](https://img.shields.io/badge/fr__FR-77.72%25-yellow)
 
@@ -217,20 +231,21 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.44%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
 - Text.About.ReleaseNotes
 - Text.CommitCM.Drop
+- Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.64%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-96.53%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -247,6 +262,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitDetail.Info.CopyName
 - Text.CommitDetail.Info.CopyNameAndEmail
 - Text.CommitMessageTextBox.PasteAndReplaceAll
+- Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Diff.Image.Difference
 - Text.DirtyState.HasLocalChanges
 - Text.DirtyState.HasPendingPullOrPush
@@ -739,7 +755,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.Configure.CommitMessageTemplate.BuiltinVars
+
+</details>
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-77.83%25-yellow)
 

From 47962340bcd7d663aa9129da93c41f7ba64b2a2f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Oct 2025 13:15:45 +0800
Subject: [PATCH 05/72] fix: scaning reposities does not work when both global
 and workspace default clone dir are not configured (#1848)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/ScanRepositories.cs | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index 538fe244a..6802897aa 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -25,7 +24,6 @@ public List<Models.ScanDir> ScanDirs
             get;
         }
 
-        [Required(ErrorMessage = "Scan directory is required!!!")]
         public Models.ScanDir Selected
         {
             get => _selected;
@@ -53,11 +51,26 @@ public ScanRepositories()
 
         public override async Task<bool> Sure()
         {
-            var selectedDir = _useCustomDir ? _customDir : _selected?.Path;
-            if (string.IsNullOrEmpty(selectedDir))
+            string selectedDir;
+            if (_useCustomDir)
             {
-                App.RaiseException(null, "Missing root directory to scan!");
-                return false;
+                if (string.IsNullOrEmpty(_customDir))
+                {
+                    App.RaiseException(null, "Missing root directory to scan!");
+                    return false;
+                }
+
+                selectedDir = _customDir;
+            }
+            else
+            {
+                if (_selected == null || string.IsNullOrEmpty(_selected.Path))
+                {
+                    App.RaiseException(null, "Missing root directory to scan!");
+                    return false;
+                }
+
+                selectedDir = _selected.Path;
             }
 
             if (!Directory.Exists(selectedDir))

From ac6347ed4bf5cc99c4aa2db6eb73ee7211bb54f0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Oct 2025 18:02:10 +0800
Subject: [PATCH 06/72] feature: supports to use `Zed` as external editor on
 Windows  (#1852)

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md             |  2 +-
 src/Native/Windows.cs | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index bf7d77b5a..95c6691dc 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ This app supports open repository in external tools listed in the table below.
 | Cursor                        | YES     | YES   | YES   |
 | Fleet                         | YES     | YES   | YES   |
 | Sublime Text                  | YES     | YES   | YES   |
-| Zed                           | NO      | YES   | YES   |
+| Zed                           | YES     | YES   | YES   |
 | Visual Studio                 | YES     | NO    | NO    |
 
 > [!NOTE]
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index e63dbbb08..bbdc44370 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -187,10 +187,11 @@ public string FindTerminal(Models.ShellOrTerminal shell)
             finder.VSCode(FindVSCode);
             finder.VSCodeInsiders(FindVSCodeInsiders);
             finder.VSCodium(FindVSCodium);
-            finder.Cursor(FindCursor);
+            finder.Cursor(() => Path.Combine(localAppDataDir, @"Programs\Cursor\Cursor.exe"));
             finder.Fleet(() => Path.Combine(localAppDataDir, @"Programs\Fleet\Fleet.exe"));
             finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, @"JetBrains\Toolbox"));
             finder.SublimeText(FindSublimeText);
+            finder.Zed(() => FindZed(localAppDataDir));
             FindVisualStudio(finder);
             return finder.Tools;
         }
@@ -415,16 +416,20 @@ private void FindVisualStudio(Models.ExternalToolsFinder finder)
             }
         }
 
-        private string FindCursor()
+        private string FindZed(string localAppDataDir)
         {
-            var cursorPath = Path.Combine(
-                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                "Programs",
-                "Cursor",
-                "Cursor.exe");
-
-            if (File.Exists(cursorPath))
-                return cursorPath;
+            var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey(
+                    Microsoft.Win32.RegistryHive.CurrentUser,
+                    Microsoft.Win32.RegistryView.Registry64);
+
+            // NOTE: this is the official Zed Preview reg data.
+            var preview = currentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F70E4811-D0E2-4D88-AC99-D63752799F95}_is1");
+            if (preview != null)
+                return preview.GetValue("DisplayIcon") as string;
+
+            var findInPath = new StringBuilder("zed.exe", 512);
+            if (PathFindOnPath(findInPath, null))
+                return findInPath.ToString();
 
             return string.Empty;
         }

From dcfaae0ea7de5daf59bc57a58c4baef3f048b002 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Oct 2025 18:14:32 +0800
Subject: [PATCH 07/72] code_style: remove unused parameter

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/Windows.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index bbdc44370..aa1b42c86 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -191,7 +191,7 @@ public string FindTerminal(Models.ShellOrTerminal shell)
             finder.Fleet(() => Path.Combine(localAppDataDir, @"Programs\Fleet\Fleet.exe"));
             finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, @"JetBrains\Toolbox"));
             finder.SublimeText(FindSublimeText);
-            finder.Zed(() => FindZed(localAppDataDir));
+            finder.Zed(FindZed);
             FindVisualStudio(finder);
             return finder.Tools;
         }
@@ -416,7 +416,7 @@ private void FindVisualStudio(Models.ExternalToolsFinder finder)
             }
         }
 
-        private string FindZed(string localAppDataDir)
+        private string FindZed()
         {
             var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey(
                     Microsoft.Win32.RegistryHive.CurrentUser,

From 3b9ac376f0b4bb0968fedbc5a27d85dcbe214216 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 14 Oct 2025 20:11:18 +0800
Subject: [PATCH 08/72] optimize: only navigate to new commit if it is
 necessary

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Fetch.cs      | 12 ++++++++----
 src/ViewModels/FetchInto.cs  |  8 ++++++--
 src/ViewModels/Merge.cs      |  8 ++++++--
 src/ViewModels/Pull.cs       |  8 ++++++--
 src/ViewModels/Repository.cs |  4 ++--
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs
index de010da82..43bc5a18a 100644
--- a/src/ViewModels/Fetch.cs
+++ b/src/ViewModels/Fetch.cs
@@ -68,6 +68,7 @@ public override async Task<bool> Sure()
         {
             using var lockWatcher = _repo.LockWatcher();
 
+            var navigateToUpstreamHEAD = _repo.SelectedView is Histories { AutoSelectedCommit: { IsCurrentHead: true } };
             var notags = _repo.Settings.FetchWithoutTags;
             var force = _repo.Settings.EnableForceOnFetch;
             var log = _repo.CreateLog("Fetch");
@@ -89,11 +90,14 @@ public override async Task<bool> Sure()
 
             log.Complete();
 
-            var upstream = _repo.CurrentBranch?.Upstream;
-            if (!string.IsNullOrEmpty(upstream))
+            if (navigateToUpstreamHEAD)
             {
-                var upstreamHead = await new Commands.QueryRevisionByRefName(_repo.FullPath, upstream.Substring(13)).GetResultAsync();
-                _repo.NavigateToCommit(upstreamHead, true);
+                var upstream = _repo.CurrentBranch?.Upstream;
+                if (!string.IsNullOrEmpty(upstream))
+                {
+                    var upstreamHead = await new Commands.QueryRevisionByRefName(_repo.FullPath, upstream.Substring(13)).GetResultAsync();
+                    _repo.NavigateToCommit(upstreamHead, true);
+                }
             }
 
             _repo.MarkFetched();
diff --git a/src/ViewModels/FetchInto.cs b/src/ViewModels/FetchInto.cs
index 6e435a305..bcf461203 100644
--- a/src/ViewModels/FetchInto.cs
+++ b/src/ViewModels/FetchInto.cs
@@ -35,8 +35,12 @@ public override async Task<bool> Sure()
 
             log.Complete();
 
-            var newHead = await new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).GetResultAsync();
-            _repo.NavigateToCommit(newHead, true);
+            if (_repo.SelectedViewIndex == 0)
+            {
+                var newHead = await new Commands.QueryRevisionByRefName(_repo.FullPath, Local.Name).GetResultAsync();
+                _repo.NavigateToCommit(newHead, true);
+            }
+
             return true;
         }
 
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
index 4cf71c364..5228c790a 100644
--- a/src/ViewModels/Merge.cs
+++ b/src/ViewModels/Merge.cs
@@ -71,8 +71,12 @@ public override async Task<bool> Sure()
 
             log.Complete();
 
-            var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
-            _repo.NavigateToCommit(head, true);
+            if (_repo.SelectedViewIndex == 0)
+            {
+                var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
+                _repo.NavigateToCommit(head, true);
+            }
+
             return true;
         }
 
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index f5776561e..2a976a060 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -160,8 +160,12 @@ public override async Task<bool> Sure()
 
             log.Complete();
 
-            var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
-            _repo.NavigateToCommit(head, true);
+            if (_repo.SelectedViewIndex == 0)
+            {
+                var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
+                _repo.NavigateToCommit(head, true);
+            }
+
             return rs;
         }
 
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index a01415087..a0ffb347b 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -985,10 +985,10 @@ public void NavigateToCommit(string sha, bool isDelayMode = false)
             {
                 _navigateToCommitDelayed = sha;
             }
-            else if (_histories != null)
+            else
             {
                 SelectedViewIndex = 0;
-                _histories.NavigateTo(sha);
+                _histories?.NavigateTo(sha);
             }
         }
 

From cd659f9537e4e831a13b93209a80eebb42f61912 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 15 Oct 2025 16:28:00 +0800
Subject: [PATCH 09/72] optimize: only reload revision file tree when `FILES`
 tab is actived

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/RevisionFileTreeView.axaml.cs | 76 ++++++++++++++++---------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
index be8b8f572..626a02b33 100644
--- a/src/Views/RevisionFileTreeView.axaml.cs
+++ b/src/Views/RevisionFileTreeView.axaml.cs
@@ -8,6 +8,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
@@ -301,34 +302,19 @@ protected override async void OnPropertyChanged(AvaloniaPropertyChangedEventArgs
                 _tree.Clear();
                 _searchResult.Clear();
 
-                var vm = DataContext as ViewModels.CommitDetail;
-                if (vm?.Commit == null)
-                {
-                    Rows.Clear();
-                    GC.Collect();
-                    return;
-                }
-
-                var objects = await vm.GetRevisionFilesUnderFolderAsync(null);
-                if (objects == null || objects.Count == 0)
-                {
+                if (DataContext is ViewModels.CommitDetail { ActiveTabIndex: 2 } vm)
+                    await ReloadTreeData(vm);
+                else
                     Rows.Clear();
-                    GC.Collect();
-                    return;
-                }
-
-                foreach (var obj in objects)
-                    _tree.Add(new ViewModels.RevisionFileTreeNode { Backend = obj });
-
-                SortNodes(_tree);
+            }
+        }
 
-                var topTree = new List<ViewModels.RevisionFileTreeNode>();
-                MakeRows(topTree, _tree, 0);
+        protected override async void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
 
-                Rows.Clear();
-                Rows.AddRange(topTree);
-                GC.Collect();
-            }
+            if (DataContext is ViewModels.CommitDetail vm && _tree.Count == 0)
+                await ReloadTreeData(vm);
         }
 
         private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs e)
@@ -416,7 +402,42 @@ private void SortNodes(List<ViewModels.RevisionFileTreeNode> nodes)
             });
         }
 
-        public ContextMenu CreateRevisionFileContextMenuByFolder(ViewModels.Repository repo, ViewModels.CommitDetail vm, Models.Commit commit, string path)
+        private async Task ReloadTreeData(ViewModels.CommitDetail vm)
+        {
+            if (_isReloadingTreeData)
+                return;
+
+            _isReloadingTreeData = true;
+
+            if (vm?.Commit == null)
+            {
+                Rows.Clear();
+                _isReloadingTreeData = false;
+                return;
+            }
+
+            var objects = await vm.GetRevisionFilesUnderFolderAsync(null);
+            if (objects == null || objects.Count == 0)
+            {
+                Rows.Clear();
+                _isReloadingTreeData = false;
+                return;
+            }
+
+            foreach (var obj in objects)
+                _tree.Add(new ViewModels.RevisionFileTreeNode { Backend = obj });
+
+            SortNodes(_tree);
+
+            var topTree = new List<ViewModels.RevisionFileTreeNode>();
+            MakeRows(topTree, _tree, 0);
+
+            Rows.Clear();
+            Rows.AddRange(topTree);
+            _isReloadingTreeData = false;
+        }
+
+        private ContextMenu CreateRevisionFileContextMenuByFolder(ViewModels.Repository repo, ViewModels.CommitDetail vm, Models.Commit commit, string path)
         {
             var fullPath = Native.OS.GetAbsPath(repo.FullPath, path);
             var explore = new MenuItem();
@@ -468,7 +489,7 @@ public ContextMenu CreateRevisionFileContextMenuByFolder(ViewModels.Repository r
             return menu;
         }
 
-        public ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, ViewModels.CommitDetail vm, Models.Commit commit, Models.Object file)
+        private ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, ViewModels.CommitDetail vm, Models.Commit commit, Models.Object file)
         {
             var fullPath = Native.OS.GetAbsPath(repo.FullPath, file.Path);
             var menu = new ContextMenu();
@@ -674,5 +695,6 @@ public ContextMenu CreateRevisionFileContextMenu(ViewModels.Repository repo, Vie
         private List<ViewModels.RevisionFileTreeNode> _tree = [];
         private bool _disableSelectionChangingEvent = false;
         private List<ViewModels.RevisionFileTreeNode> _searchResult = [];
+        private bool _isReloadingTreeData = false;
     }
 }

From 28344a7fb542ed89cef0e2e658686243d120ab8e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 15 Oct 2025 17:39:48 +0800
Subject: [PATCH 10/72] ux: remove `Use monospace font only in text editor`
 option in `Preferences` and make it default (also the only)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs                          | 17 +-----
 src/Resources/Locales/en_US.axaml         |  1 -
 src/Resources/Styles.axaml                |  5 +-
 src/Resources/Themes.axaml                |  1 -
 src/ViewModels/Preferences.cs             | 15 +----
 src/Views/About.axaml                     |  2 +-
 src/Views/AddToIgnore.axaml               |  2 +-
 src/Views/ApplyStash.axaml                |  2 +-
 src/Views/Archive.axaml                   |  2 +-
 src/Views/BranchCompare.axaml             | 20 +++----
 src/Views/BranchTree.axaml                |  5 +-
 src/Views/ChangeCollectionView.axaml      | 13 ++---
 src/Views/CheckoutCommit.axaml            |  2 +-
 src/Views/CommitBaseInfo.axaml            | 31 ++++-------
 src/Views/CommitDetail.axaml              |  2 +-
 src/Views/CommitMessageTextBox.axaml      |  8 +--
 src/Views/CommitRelationTracking.axaml    |  2 +-
 src/Views/Conflict.axaml                  | 15 +++--
 src/Views/CreateBranch.axaml              |  2 +-
 src/Views/CreateTag.axaml                 |  2 +-
 src/Views/DeleteMultipleBranches.axaml    |  2 +-
 src/Views/DeleteMultipleTags.axaml        |  2 +-
 src/Views/DiffView.axaml                  | 26 ++++-----
 src/Views/DirHistories.axaml              |  7 +--
 src/Views/DropHead.axaml                  |  4 +-
 src/Views/DropStash.axaml                 |  2 +-
 src/Views/ExecuteCustomAction.axaml       |  2 +-
 src/Views/FileHistories.axaml             | 18 +++---
 src/Views/Histories.axaml                 | 12 ++--
 src/Views/Hotkeys.axaml                   | 52 ++++++++---------
 src/Views/ImageDiffView.axaml             | 68 +++++++++++------------
 src/Views/InteractiveRebase.axaml         | 15 ++---
 src/Views/LauncherPageSwitcher.axaml      |  2 -
 src/Views/LauncherTabBar.axaml            |  2 -
 src/Views/Merge.axaml                     |  2 +-
 src/Views/MoveRepositoryNode.axaml        |  1 -
 src/Views/Preferences.axaml               | 12 ++--
 src/Views/PushRevision.axaml              |  1 -
 src/Views/Rebase.axaml                    |  2 +-
 src/Views/RemoveWorktree.axaml            |  2 +-
 src/Views/Repository.axaml                | 17 +++---
 src/Views/RepositoryConfigure.axaml       |  2 +-
 src/Views/RepositoryToolbar.axaml         |  4 +-
 src/Views/Reset.axaml                     |  2 +-
 src/Views/ResetWithoutCheckout.axaml      |  2 +-
 src/Views/Revert.axaml                    |  2 +-
 src/Views/RevisionCompare.axaml           | 12 ++--
 src/Views/RevisionFileContentViewer.axaml | 10 ++--
 src/Views/RevisionFileTreeView.axaml      |  2 +-
 src/Views/RevisionFiles.axaml             |  5 +-
 src/Views/Reword.axaml                    |  2 +-
 src/Views/ScanRepositories.axaml          |  2 +-
 src/Views/SelfUpdate.axaml                |  2 +-
 src/Views/Squash.axaml                    |  1 -
 src/Views/StashesPage.axaml               |  4 +-
 src/Views/Statistics.axaml                |  8 +--
 src/Views/SubmodulesView.axaml            |  3 +-
 src/Views/TagsView.axaml                  |  7 +--
 src/Views/ViewLogs.axaml                  |  2 -
 src/Views/Welcome.axaml                   |  5 +-
 src/Views/WorkspaceSwitcher.axaml         |  1 -
 61 files changed, 202 insertions(+), 276 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 242a5f13c..11219cec0 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -262,7 +262,7 @@ public static void SetTheme(string theme, string themeOverridesFile)
             }
         }
 
-        public static void SetFonts(string defaultFont, string monospaceFont, bool onlyUseMonospaceFontInEditor)
+        public static void SetFonts(string defaultFont, string monospaceFont)
         {
             if (Current is not App app)
                 return;
@@ -296,19 +296,6 @@ public static void SetFonts(string defaultFont, string monospaceFont, bool onlyU
                 resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont));
             }
 
-            if (onlyUseMonospaceFontInEditor)
-            {
-                if (string.IsNullOrEmpty(defaultFont))
-                    resDic.Add("Fonts.Primary", new FontFamily("fonts:Inter#Inter"));
-                else
-                    resDic.Add("Fonts.Primary", new FontFamily(defaultFont));
-            }
-            else
-            {
-                if (!string.IsNullOrEmpty(monospaceFont))
-                    resDic.Add("Fonts.Primary", new FontFamily(monospaceFont));
-            }
-
             if (resDic.Count > 0)
             {
                 app.Resources.MergedDictionaries.Add(resDic);
@@ -383,7 +370,7 @@ public override void Initialize()
 
             SetLocale(pref.Locale);
             SetTheme(pref.Theme, pref.ThemeOverrides);
-            SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor);
+            SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily);
         }
 
         public override void OnFrameworkInitializationCompleted()
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 3f8e7425a..45b827973 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -565,7 +565,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Monospace Font</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Use monospace font only in text editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Theme</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Use auto-hide scrollbars</x:String>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index a86c03714..be43a313b 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -301,9 +301,6 @@
   <Style Selector="TextBlock.italic">
     <Setter Property="FontStyle" Value="Italic"/>
   </Style>
-  <Style Selector="TextBlock.primary, SelectableTextBlock.primary">
-    <Setter Property="FontFamily" Value="{DynamicResource Fonts.Primary}"/>
-  </Style>
   <Style Selector="TextBlock.group_header_label">
     <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
     <Setter Property="FontWeight" Value="Bold"/>
@@ -853,7 +850,7 @@
                     <StackPanel Orientation="Horizontal">
                       <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
                       <Border Margin="4,0,0,0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" IsVisible="{Binding IsGlobal}">
-                        <TextBlock Classes="primary" Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/>
+                        <TextBlock Text="GLOBAL" Margin="8,0" FontSize="10" Foreground="White"/>
                       </Border>
                     </StackPanel>
                   </DataTemplate>
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index b5a0d61fa..b8f4d43a9 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -85,5 +85,4 @@
 
   <FontFamily x:Key="Fonts.Default">fonts:Inter#Inter</FontFamily>
   <FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono</FontFamily>
-  <FontFamily x:Key="Fonts.Primary">fonts:SourceGit#JetBrains Mono</FontFamily>
 </ResourceDictionary>
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index e416952c1..5b5bc31f5 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -65,7 +65,7 @@ public string DefaultFontFamily
             set
             {
                 if (SetProperty(ref _defaultFontFamily, value) && !_isLoading)
-                    App.SetFonts(value, _monospaceFontFamily, _onlyUseMonoFontInEditor);
+                    App.SetFonts(value, _monospaceFontFamily);
             }
         }
 
@@ -75,17 +75,7 @@ public string MonospaceFontFamily
             set
             {
                 if (SetProperty(ref _monospaceFontFamily, value) && !_isLoading)
-                    App.SetFonts(_defaultFontFamily, value, _onlyUseMonoFontInEditor);
-            }
-        }
-
-        public bool OnlyUseMonoFontInEditor
-        {
-            get => _onlyUseMonoFontInEditor;
-            set
-            {
-                if (SetProperty(ref _onlyUseMonoFontInEditor, value) && !_isLoading)
-                    App.SetFonts(_defaultFontFamily, _monospaceFontFamily, _onlyUseMonoFontInEditor);
+                    App.SetFonts(_defaultFontFamily, value);
             }
         }
 
@@ -721,7 +711,6 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private string _themeOverrides = string.Empty;
         private string _defaultFontFamily = string.Empty;
         private string _monospaceFontFamily = string.Empty;
-        private bool _onlyUseMonoFontInEditor = true;
         private double _defaultFontSize = 13;
         private double _editorFontSize = 13;
         private int _editorTabWidth = 4;
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index 92053fe52..8de188c94 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -52,7 +52,7 @@
                   Cursor="Hand"
                   PointerPressed="OnVisitReleaseNotes"
                   ToolTip.Tip="{DynamicResource Text.About.ReleaseNotes}">
-            <TextBlock x:Name="TxtVersion" Classes="primary" Margin="8,0" FontSize="12" Foreground="White"/>
+            <TextBlock x:Name="TxtVersion" Margin="8,0" FontSize="12" Foreground="White"/>
           </Border>
         </StackPanel>
 
diff --git a/src/Views/AddToIgnore.axaml b/src/Views/AddToIgnore.axaml
index c9129dd6d..d0f697e7d 100644
--- a/src/Views/AddToIgnore.axaml
+++ b/src/Views/AddToIgnore.axaml
@@ -47,7 +47,7 @@
               <TextBlock Grid.Column="1" Text="{Binding File, Mode=OneWay}" VerticalAlignment="Center"/>
 
               <Border Grid.Column="2" Height="16" Background="{Binding Brush}" CornerRadius="8" VerticalAlignment="Center">
-                <TextBlock Classes="primary" Text="{Binding Desc}" Margin="8,0" FontSize="10" Foreground="White"/>
+                <TextBlock Text="{Binding Desc}" Margin="8,0" FontSize="10" Foreground="White"/>
               </Border>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/ApplyStash.axaml b/src/Views/ApplyStash.axaml
index ded0e9f22..9ebf15720 100644
--- a/src/Views/ApplyStash.axaml
+++ b/src/Views/ApplyStash.axaml
@@ -22,7 +22,7 @@
               HorizontalAlignment="Left" VerticalAlignment="Center"
               Data="{StaticResource Icons.Stashes}"/>
 
-        <TextBlock Grid.Column="1" VerticalAlignment="Center" Classes="primary" Text="{Binding Stash.Name}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Stash.Name}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Stash.Subject}" TextTrimming="CharacterEllipsis" Margin="4,0,0,0"/>
       </Grid>
 
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index e9d0ad02f..c0fe82b01 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -30,7 +30,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml
index a407527aa..64f8b8163 100644
--- a/src/Views/BranchCompare.axaml
+++ b/src/Views/BranchCompare.axaml
@@ -46,15 +46,15 @@
                         VerticalAlignment="Center"
                         IsHitTestVisible="False"
                         User="{Binding BaseHead.Author}"/>
-              <TextBlock Grid.Column="1" Classes="primary" Text="{Binding BaseHead.Author.Name}" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" Text="{Binding BaseHead.Author.Name}" Margin="8,0,0,0"/>
               <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-                <TextBlock Text="{Binding Base.FriendlyName}" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
+                <TextBlock Text="{Binding Base.FriendlyName}" Margin="4,0" Foreground="#FFDDDDDD"/>
               </Border>
-              <TextBlock Grid.Column="3" Classes="primary" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
-              <TextBlock Grid.Column="4" Classes="primary" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="3" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
+              <TextBlock Grid.Column="4" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
             </Grid>
 
-            <TextBlock Grid.Row="1" Classes="primary" Text="{Binding BaseHead.Subject}" VerticalAlignment="Bottom"/>
+            <TextBlock Grid.Row="1" Text="{Binding BaseHead.Subject}" VerticalAlignment="Bottom"/>
           </Grid>
         </Border>
 
@@ -70,15 +70,15 @@
                         VerticalAlignment="Center"
                         IsHitTestVisible="False"
                         User="{Binding ToHead.Author}"/>
-              <TextBlock Grid.Column="1" Classes="primary" Text="{Binding ToHead.Author.Name}" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" Text="{Binding ToHead.Author.Name}" Margin="8,0,0,0"/>
               <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-                <TextBlock Text="{Binding To.FriendlyName}" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
+                <TextBlock Text="{Binding To.FriendlyName}" Margin="4,0" Foreground="#FFDDDDDD"/>
               </Border>
-              <TextBlock Grid.Column="3" Classes="primary" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
-              <TextBlock Grid.Column="4" Classes="primary" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="3" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA"/>
+              <TextBlock Grid.Column="4" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
             </Grid>
 
-            <TextBlock Grid.Row="1" Classes="primary" Text="{Binding ToHead.Subject}" VerticalAlignment="Bottom"/>
+            <TextBlock Grid.Row="1" Text="{Binding ToHead.Subject}" VerticalAlignment="Bottom"/>
           </Grid>
         </Border>
       </Grid>
diff --git a/src/Views/BranchTree.axaml b/src/Views/BranchTree.axaml
index a48bc6c8b..2451398a6 100644
--- a/src/Views/BranchTree.axaml
+++ b/src/Views/BranchTree.axaml
@@ -45,7 +45,7 @@
                   <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
                   <TextBlock FontWeight="Bold" VerticalAlignment="Center" Margin="4,0,0,0" Text="{Binding FriendlyName}"/>
                   <Border Background="Green" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding !IsLocal}">
-                    <TextBlock Text="{DynamicResource Text.BranchTree.Remote}" FontSize="12" Classes="primary" Margin="4,0" Foreground="White" VerticalAlignment="Center"/>
+                    <TextBlock Text="{DynamicResource Text.BranchTree.Remote}" FontSize="12" Margin="4,0" Foreground="White" VerticalAlignment="Center"/>
                   </Border>
                 </StackPanel>
 
@@ -65,7 +65,7 @@
                     </TextBlock>
 
                     <Border Background="OrangeRed" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding IsUpstreamGone}">
-                      <TextBlock Text="{DynamicResource Text.BranchTree.InvalidUpstream}" FontSize="12" Classes="primary" Margin="4,1" Foreground="White" VerticalAlignment="Center"/>
+                      <TextBlock Text="{DynamicResource Text.BranchTree.InvalidUpstream}" FontSize="12" Margin="4,1" Foreground="White" VerticalAlignment="Center"/>
                     </Border>
                   </StackPanel>
 
@@ -133,7 +133,6 @@
 
               <!-- Name -->
               <TextBlock Grid.Column="1"
-                         Classes="primary"
                          FontWeight="{Binding IsCurrent, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                          TextTrimming="CharacterEllipsis">
                 <Run Text="{Binding Name}"/>
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index 66a3ece5c..e7cf63882 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -65,8 +65,8 @@
                                   IsVisible="{Binding !IsFolder}"/>
 
               <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="4,0,0,0">
-                <TextBlock Classes="primary" Text="{Binding ConflictMarker, Mode=OneWay}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
-                <TextBlock Classes="primary" Text="{Binding DisplayName, Mode=OneWay}"/>
+                <TextBlock Text="{Binding ConflictMarker, Mode=OneWay}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
+                <TextBlock Text="{Binding DisplayName, Mode=OneWay}"/>
               </StackPanel>
             </Grid>
           </DataTemplate>
@@ -93,12 +93,11 @@
                                   Change="{Binding}" />
 
               <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
-                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
-                <TextBlock Classes="primary" Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"/>
+                <TextBlock Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
+                <TextBlock Text="{Binding Path, Converter={x:Static c:PathConverters.PureFileName}}"/>
               </StackPanel>
 
               <TextBlock Grid.Column="2"
-                         Classes="primary"
                          Text="{Binding Path, Converter={x:Static c:PathConverters.PureDirectoryName}}"
                          Foreground="{DynamicResource Brush.FG2}"/>
             </Grid>
@@ -126,8 +125,8 @@
                                   Change="{Binding}" />
 
               <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="4,0">
-                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
-                <TextBlock Classes="primary" Text="{Binding Path}"/>
+                <TextBlock Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding IsConflicted}"/>
+                <TextBlock Text="{Binding Path}"/>
               </StackPanel>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/CheckoutCommit.axaml b/src/Views/CheckoutCommit.axaml
index e3bcf04a3..d765dbf73 100644
--- a/src/Views/CheckoutCommit.axaml
+++ b/src/Views/CheckoutCommit.axaml
@@ -26,7 +26,7 @@
                  Text="{DynamicResource Text.Checkout.Commit.Target}" />
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
         <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}" />
-        <TextBlock Grid.Column="1" Classes="primary" Foreground="DarkOrange" VerticalAlignment="Center" Margin="8,0" Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" />
+        <TextBlock Grid.Column="1" Foreground="DarkOrange" VerticalAlignment="Center" Margin="8,0" Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" />
         <TextBlock Grid.Column="2" Text="{Binding Commit.Subject}" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index b0c801d20..ab1520ed7 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -59,10 +59,7 @@
           <!-- SHA -->
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
           <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24">
-            <TextBlock Classes="primary"
-                       Text="{Binding SHA}"
-                       Margin="12,0,4,0"
-                       VerticalAlignment="Center"/>
+            <TextBlock Text="{Binding SHA}" Margin="12,0,4,0" VerticalAlignment="Center"/>
 
             <Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnCopyCommitSHA" ToolTip.Tip="{DynamicResource Text.Copy}">
               <Path Width="12" Height="12" Data="{StaticResource Icons.Copy}"/>
@@ -109,8 +106,7 @@
 
             <ItemsControl.ItemTemplate>
               <DataTemplate>
-                <TextBlock Classes="primary"
-                           Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
+                <TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
                            Foreground="DarkOrange"
                            TextDecorations="Underline"
                            Cursor="Hand"
@@ -130,11 +126,11 @@
                       <StackPanel MinWidth="400" Orientation="Vertical">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                         </Grid>
 
-                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
                       </StackPanel>
                     </DataTemplate>
                   </TextBlock.DataTemplates>
@@ -154,8 +150,7 @@
 
             <ItemsControl.ItemTemplate>
               <DataTemplate>
-                <TextBlock Classes="primary"
-                           Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
+                <TextBlock Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
                            Foreground="DarkOrange"
                            TextDecorations="Underline"
                            Cursor="Hand"
@@ -175,11 +170,11 @@
                       <StackPanel MinWidth="400" Orientation="Vertical">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                         </Grid>
 
-                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
                       </StackPanel>
                     </DataTemplate>
                   </TextBlock.DataTemplates>
@@ -192,7 +187,6 @@
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
           <Border Grid.Row="3" Grid.Column="1" Margin="12,0,0,0" MinHeight="24" IsVisible="{Binding HasDecorators}">
             <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
-                                   FontFamily="{DynamicResource Fonts.Primary}"
                                    FontSize="12"
                                    AllowWrap="True"
                                    Margin="0,4,0,0"
@@ -203,7 +197,6 @@
           <TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
           <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
                                     Margin="12,4,8,0"
-                                    Classes="primary"
                                     FullMessage="{Binding #ThisControl.FullMessage}"
                                     HorizontalAlignment="Stretch"
                                     TextWrapping="Wrap">
@@ -219,11 +212,11 @@
                 <StackPanel MinWidth="400" Orientation="Vertical">
                   <Grid ColumnDefinitions="Auto,*,Auto">
                     <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                    <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                    <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                    <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                    <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                   </Grid>
 
-                  <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                  <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
                 </StackPanel>
               </DataTemplate>
             </v:CommitMessagePresenter.DataTemplates>
diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml
index ab97c70aa..7e3551cec 100644
--- a/src/Views/CommitDetail.axaml
+++ b/src/Views/CommitDetail.axaml
@@ -65,7 +65,7 @@
                                       HorizontalAlignment="Left"
                                       Margin="16,0,0,0"
                                       Change="{Binding}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Path}" Margin="8,0" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Path}" Margin="8,0" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/>
                 </Grid>
               </DataTemplate>
             </ListBox.ItemTemplate>
diff --git a/src/Views/CommitMessageTextBox.axaml b/src/Views/CommitMessageTextBox.axaml
index 8d99bf663..22a9c0300 100644
--- a/src/Views/CommitMessageTextBox.axaml
+++ b/src/Views/CommitMessageTextBox.axaml
@@ -120,10 +120,10 @@
                       VerticalAlignment="Center"
                       Orientation="Horizontal">
             <TextBlock Classes="info_label" FontSize="13" HorizontalAlignment="Left" Text="{DynamicResource Text.CommitMessageTextBox.SubjectCount}"/>
-            <TextBlock Classes="primary" Margin="8,0,0,0" FontSize="11" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthGood}}" VerticalAlignment="Center"/>
-            <TextBlock Classes="primary" Margin="8,0,0,0" FontSize="11" Foreground="DarkGoldenrod" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}" VerticalAlignment="Center"/>
-            <TextBlock Classes="primary" FontSize="11" Text="/" VerticalAlignment="Center"/>
-            <TextBlock Classes="primary" FontSize="11" Text="{Binding Source={x:Static vm:Preferences.Instance}, Path=SubjectGuideLength}" VerticalAlignment="Center"/>
+            <TextBlock Margin="8,0,0,0" FontSize="11" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthGood}}" VerticalAlignment="Center"/>
+            <TextBlock Margin="8,0,0,0" FontSize="11" Foreground="DarkGoldenrod" Text="{Binding #ThisControl.Subject.Length}" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}" VerticalAlignment="Center"/>
+            <TextBlock FontSize="11" Text="/" VerticalAlignment="Center"/>
+            <TextBlock FontSize="11" Text="{Binding Source={x:Static vm:Preferences.Instance}, Path=SubjectGuideLength}" VerticalAlignment="Center"/>
             <Path Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Error}" Fill="DarkGoldenrod" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}"/>
           </StackPanel>
         </Grid>
diff --git a/src/Views/CommitRelationTracking.axaml b/src/Views/CommitRelationTracking.axaml
index 9d036e10b..53906bfe3 100644
--- a/src/Views/CommitRelationTracking.axaml
+++ b/src/Views/CommitRelationTracking.axaml
@@ -23,7 +23,7 @@
               <StackPanel Orientation="Horizontal" Margin="8,0" VerticalAlignment="Center">
                 <Path Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding !IsTag}"/>
                 <Path Width="10" Height="10" Data="{StaticResource Icons.Tag}" IsVisible="{Binding IsTag}"/>
-                <TextBlock Classes="primary" Text="{Binding Name}" Margin="2,0,0,0"/>
+                <TextBlock Text="{Binding Name}" Margin="2,0,0,0"/>
               </StackPanel>
             </Border>
           </DataTemplate>
diff --git a/src/Views/Conflict.axaml b/src/Views/Conflict.axaml
index 0093ea5e9..65298e428 100644
--- a/src/Views/Conflict.axaml
+++ b/src/Views/Conflict.axaml
@@ -17,7 +17,7 @@
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,8">
           <Border Height="16" VerticalAlignment="Center" Background="Red" CornerRadius="8">
-            <TextBlock Classes="primary" Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/>
+            <TextBlock Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/>
           </Border>
 
           <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding Description}"/>
@@ -42,11 +42,11 @@
                       <StackPanel MinWidth="400" Orientation="Vertical">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                         </Grid>
 
-                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
                       </StackPanel>
                     </DataTemplate>
                   </TextBlock.DataTemplates>
@@ -59,7 +59,6 @@
                 <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
                 <v:CommitRefsPresenter Margin="8,0,0,0"
                                        Foreground="{DynamicResource Brush.FG1}"
-                                       FontFamily="{DynamicResource Fonts.Primary}"
                                        FontSize="12"
                                        VerticalAlignment="Center"
                                        UseGraphColor="False"/>
@@ -76,11 +75,11 @@
                       <StackPanel MinWidth="400" Orientation="Vertical">
                         <Grid ColumnDefinitions="Auto,*,Auto">
                           <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                         </Grid>
 
-                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
                       </StackPanel>
                     </DataTemplate>
                   </TextBlock.DataTemplates>
diff --git a/src/Views/CreateBranch.axaml b/src/Views/CreateBranch.axaml
index 91df0014f..7d69a50be 100644
--- a/src/Views/CreateBranch.axaml
+++ b/src/Views/CreateBranch.axaml
@@ -30,7 +30,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/CreateTag.axaml b/src/Views/CreateTag.axaml
index a57a4e464..6740a820f 100644
--- a/src/Views/CreateTag.axaml
+++ b/src/Views/CreateTag.axaml
@@ -30,7 +30,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/DeleteMultipleBranches.axaml b/src/Views/DeleteMultipleBranches.axaml
index 46b992b0c..c6bf2e712 100644
--- a/src/Views/DeleteMultipleBranches.axaml
+++ b/src/Views/DeleteMultipleBranches.axaml
@@ -44,7 +44,7 @@
           <DataTemplate DataType="m:Branch">
             <Grid Height="26" ColumnDefinitions="22,*,Auto">
               <Path Grid.Column="0" Width="10" Height="10" Margin="4,0,8,0" Data="{StaticResource Icons.Branch}" />
-              <TextBlock Grid.Column="1" Text="{Binding FriendlyName}" Classes="primary" />
+              <TextBlock Grid.Column="1" Text="{Binding FriendlyName}" />
               <Border Grid.Column="2"
                       Height="18"
                       Margin="8,0"
diff --git a/src/Views/DeleteMultipleTags.axaml b/src/Views/DeleteMultipleTags.axaml
index 56ee70e7e..54c27d1e2 100644
--- a/src/Views/DeleteMultipleTags.axaml
+++ b/src/Views/DeleteMultipleTags.axaml
@@ -44,7 +44,7 @@
           <DataTemplate DataType="m:Tag">
             <Grid Height="26" ColumnDefinitions="22,*">
               <Path Grid.Column="0" Width="10" Height="10" Margin="4,0,8,0" Data="{StaticResource Icons.Tag}" />
-              <TextBlock Grid.Column="1" Text="{Binding Name}" Classes="primary" />
+              <TextBlock Grid.Column="1" Text="{Binding Name}" />
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index b9c377feb..912ea97f0 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -26,11 +26,11 @@
                   Background="{DynamicResource Brush.Badge}"
                   IsVisible="{Binding FileModeChange, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                   ToolTip.Tip="{DynamicResource Text.Diff.FileModeChanged}">
-            <TextBlock Classes="primary" FontSize="10" HorizontalAlignment="Center" Margin="4,0" Text="{Binding FileModeChange}" Foreground="{DynamicResource Brush.BadgeFG}"/>
+            <TextBlock FontSize="10" HorizontalAlignment="Center" Margin="4,0" Text="{Binding FileModeChange}" Foreground="{DynamicResource Brush.BadgeFG}"/>
           </Border>
 
           <!-- Title -->
-          <TextBlock Grid.Column="2" Classes="primary" Margin="4,0,0,0" Text="{Binding Title}" ToolTip.Tip="{Binding Title}" FontSize="11" TextTrimming="CharacterEllipsis"/>
+          <TextBlock Grid.Column="2" Margin="4,0,0,0" Text="{Binding Title}" ToolTip.Tip="{Binding Title}" FontSize="11" TextTrimming="CharacterEllipsis"/>
 
           <!-- Toolbar Buttons -->
           <StackPanel Grid.Column="3" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
@@ -67,7 +67,7 @@
             <ContentControl Content="{Binding Content, Mode=OneWay}" IsVisible="{Binding IsTextDiff}">
               <ContentControl.DataTemplates>
                 <DataTemplate DataType="vm:TextDiffContext">
-                  <TextBlock Classes="primary" Margin="0,0,0,0" FontSize="11" Text="{Binding BlockNavigation.Indicator}"/>
+                  <TextBlock Margin="0,0,0,0" FontSize="11" Text="{Binding BlockNavigation.Indicator}"/>
                 </DataTemplate>
               </ContentControl.DataTemplates>
             </ContentControl>
@@ -210,16 +210,16 @@
               <Path Width="64" Height="64" Data="{StaticResource Icons.Binary}" Fill="{DynamicResource Brush.FG2}"/>
               <Grid Margin="0,16,0,0" HorizontalAlignment="Center" RowDefinitions="32,32" ColumnDefinitions="Auto,Auto">
                 <Border Grid.Row="0" Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+                  <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
                 </Border>
 
-                <TextBlock Grid.Row="0" Grid.Column="1" Classes="primary" Text="{Binding OldSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
+                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding OldSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
 
                 <Border Grid.Row="1" Grid.Column="0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+                  <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
                 </Border>
 
-                <TextBlock Grid.Row="1" Grid.Column="1" Classes="primary" Text="{Binding NewSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
+                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding NewSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
               </Grid>
             </StackPanel>
           </DataTemplate>
@@ -235,16 +235,16 @@
               <Path Width="64" Height="64" Data="{StaticResource Icons.LFS}" Fill="{DynamicResource Brush.FG2}"/>
               <Grid Margin="0,16,0,0" HorizontalAlignment="Center" RowDefinitions="32,32" ColumnDefinitions="Auto,Auto">
                 <Border Grid.Row="0" Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+                  <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
                 </Border>
 
-                <TextBlock Grid.Row="0" Grid.Column="1" Classes="primary" Text="{Binding Old.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
+                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Old.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
 
                 <Border Grid.Row="1" Grid.Column="0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+                  <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
                 </Border>
 
-                <TextBlock Grid.Row="1" Grid.Column="1" Classes="primary" Text="{Binding New.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
+                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding New.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
               </Grid>
             </StackPanel>
           </DataTemplate>
@@ -262,7 +262,7 @@
               <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <StackPanel Orientation="Vertical" Margin="8,0">
                   <Border Height="16" HorizontalAlignment="Center" Background="Red" CornerRadius="8" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNull}}">
-                    <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Submodule.Deleted}" Margin="8,0" FontSize="10" Foreground="White"/>
+                    <TextBlock Text="{DynamicResource Text.Diff.Submodule.Deleted}" Margin="8,0" FontSize="10" Foreground="White"/>
                   </Border>
 
                   <Border Margin="0,8,0,0" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}">
@@ -287,7 +287,7 @@
                   </Path>
 
                   <Border Height="16" HorizontalAlignment="Center" Background="Green" CornerRadius="8" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNull}}">
-                    <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Submodule.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+                    <TextBlock Text="{DynamicResource Text.Diff.Submodule.New}" Margin="8,0" FontSize="10" Foreground="White"/>
                   </Border>
 
                   <Border Margin="0,8,0,0" BorderThickness="1" BorderBrush="Green" Background="{DynamicResource Brush.Window}" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
diff --git a/src/Views/DirHistories.axaml b/src/Views/DirHistories.axaml
index b06fa07d2..5cd841caf 100644
--- a/src/Views/DirHistories.axaml
+++ b/src/Views/DirHistories.axaml
@@ -85,9 +85,8 @@
               <Grid RowDefinitions="Auto,*">
                 <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,96">
                   <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
                   <TextBlock Grid.Column="2"
-                             Classes="primary"
                              Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                              Cursor="Hand"
                              Background="Transparent"
@@ -95,11 +94,11 @@
                              TextDecorations="Underline"
                              Margin="8,0,0,0"
                              PointerPressed="OnPressCommitSHA"/>
-                  <TextBlock Grid.Column="3" Classes="primary" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                  <TextBlock Grid.Column="3" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
                 </Grid>
 
                 <Border Grid.Row="1" Background="Transparent" DataContextChanged="OnCommitSubjectDataContextChanged" PointerMoved="OnCommitSubjectPointerMoved">
-                  <TextBlock Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+                  <TextBlock Text="{Binding Subject}" VerticalAlignment="Bottom"/>
                 </Border>
               </Grid>
             </Border>
diff --git a/src/Views/DropHead.axaml b/src/Views/DropHead.axaml
index a7f9fd144..18c212105 100644
--- a/src/Views/DropHead.axaml
+++ b/src/Views/DropHead.axaml
@@ -19,7 +19,7 @@
                  Text="{DynamicResource Text.DropHead.Commit}"/>
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding Target.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
@@ -29,7 +29,7 @@
                  Text="{DynamicResource Text.DropHead.NewHead}"/>
       <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding NewHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Text="{Binding NewHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding NewHead.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
     </Grid>
diff --git a/src/Views/DropStash.axaml b/src/Views/DropStash.axaml
index aa5de85aa..ac78fc5de 100644
--- a/src/Views/DropStash.axaml
+++ b/src/Views/DropStash.axaml
@@ -22,7 +22,7 @@
               HorizontalAlignment="Left" VerticalAlignment="Center"
               Data="{StaticResource Icons.Stashes}"/>
 
-        <TextBlock Grid.Column="1" VerticalAlignment="Center" Classes="primary" Text="{Binding Stash.Name}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Stash.Name}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Stash.Subject}" TextTrimming="CharacterEllipsis" Margin="4,0,0,0"/>
       </Grid>
     </Grid>
diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml
index 5329794f3..f655c0ca2 100644
--- a/src/Views/ExecuteCustomAction.axaml
+++ b/src/Views/ExecuteCustomAction.axaml
@@ -39,7 +39,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index b7914c3d2..ba296bfad 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -84,9 +84,8 @@
               <Grid RowDefinitions="Auto,*">
                 <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,96">
                   <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
                   <TextBlock Grid.Column="2"
-                             Classes="primary"
                              Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                              Cursor="Hand"
                              Background="Transparent"
@@ -94,11 +93,11 @@
                              TextDecorations="Underline"
                              Margin="8,0,0,0"
                              PointerPressed="OnPressCommitSHA"/>
-                  <TextBlock Grid.Column="3" Classes="primary" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
+                  <TextBlock Grid.Column="3" Text="{Binding AuthorTimeShortStr}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right"/>
                 </Grid>
 
                 <Border Grid.Row="1" Background="Transparent" DataContextChanged="OnCommitSubjectDataContextChanged" PointerMoved="OnCommitSubjectPointerMoved">
-                  <TextBlock Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+                  <TextBlock Text="{Binding Subject}" VerticalAlignment="Bottom"/>
                 </Border>
               </Grid>
             </Border>
@@ -146,7 +145,6 @@
                           <Grid ColumnDefinitions="Auto,*,Auto,Auto">
                             <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
                             <TextBlock Grid.Column="1"
-                                       Classes="primary"
                                        Margin="4,0,0,0"
                                        Text="{Binding Path}"
                                        FontSize="11"
@@ -201,15 +199,15 @@
                     <Grid RowDefinitions="Auto,*">
                       <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
                         <v:Avatar Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
                         <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
-                          <TextBlock Text="HEAD" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
+                          <TextBlock Text="HEAD" Margin="4,0" Foreground="#FFDDDDDD"/>
                         </Border>
-                        <TextBlock Grid.Column="3" Classes="primary" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressCommitSHA" />
-                        <TextBlock Grid.Column="4" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="3" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressCommitSHA" />
+                        <TextBlock Grid.Column="4" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                       </Grid>
 
-                      <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
+                      <TextBlock Grid.Row="1" Text="{Binding Subject}" VerticalAlignment="Bottom"/>
                     </Grid>
                   </DataTemplate>
                 </Grid.DataTemplates>
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index db51a84dd..c07f88d14 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -120,7 +120,6 @@
                     <v:CommitRefsPresenter Grid.Column="2"
                                            Background="{DynamicResource Brush.Contents}"
                                            Foreground="{DynamicResource Brush.FG1}"
-                                           FontFamily="{DynamicResource Fonts.Primary}"
                                            ShowTags="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowTagsInGraph}"
                                            FontSize="12"
                                            VerticalAlignment="Center">
@@ -133,7 +132,7 @@
                     </v:CommitRefsPresenter>
 
                     <v:CommitSubjectPresenter Grid.Column="3"
-                                              FontFamily="{DynamicResource Fonts.Primary}"
+                                              FontFamily="{DynamicResource Fonts.Default}"
                                               CodeFontFamily="{DynamicResource Fonts.Monospace}"
                                               InlineCodeBackground="{DynamicResource Brush.InlineCode}"
                                               Foreground="{DynamicResource Brush.FG1}"
@@ -171,8 +170,7 @@
                             IsHitTestVisible="False"/>
 
                   <Border Grid.Column="1" Padding="8,0,4,0" ClipToBounds="True">
-                    <TextBlock Classes="primary"
-                               Text="{Binding Author.Name}"
+                    <TextBlock Text="{Binding Author.Name}"
                                FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                                Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"
                                HorizontalAlignment="Left"/>
@@ -190,8 +188,7 @@
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate DataType="m:Commit">
                 <Border Padding="8,0,0,0" Background="Transparent" ClipToBounds="True">
-                  <TextBlock Classes="primary"
-                             Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                  <TextBlock Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                              FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                              Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"/>
                 </Border>
@@ -216,8 +213,7 @@
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate DataType="m:Commit">
                 <Border Padding="8,0" Background="Transparent" ClipToBounds="True">
-                  <v:CommitTimeTextBlock Classes="primary"
-                                         FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
+                  <v:CommitTimeTextBlock FontWeight="{Binding IsCurrentHead, Converter={x:Static c:BoolConverters.IsBoldToFontWeight}}"
                                          Opacity="{Binding IsMerged, Converter={x:Static c:BoolConverters.IsMergedToOpacity}}"
                                          UseAuthorTime="{Binding Source={x:Static vm:Preferences.Instance}, Path=ShowAuthorTimeInGraph, Mode=OneWay}"
                                          ShowAsDateTime="{Binding Source={x:Static vm:Preferences.Instance}, Path=!DisplayTimeAsPeriodInHistories}"
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index d020ff8b5..d11c77f52 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -46,31 +46,31 @@
                    Margin="0,0,0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+\,, macOS=⌘+\,}"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+\,, macOS=⌘+\,}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/>
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Tab, macOS=⌘+⌥+←}"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+Tab, macOS=⌘+⌥+←}"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoPrevTab}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
-          <TextBlock Grid.Row="5" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+N, macOS=⌘+N}"/>
+          <TextBlock Grid.Row="5" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+N, macOS=⌘+N}"/>
           <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.Clone}" />
 
-          <TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
+          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" />
 
-          <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/>
+          <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/>
           <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchWorkspace}" />
 
-          <TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/>
+          <TextBlock Grid.Row="8" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/>
           <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchTab}" />
         </Grid>
 
@@ -81,40 +81,40 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+H, macOS=⌘+⇧+H}"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+H, macOS=⌘+⇧+H}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.GoHome}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.OpenSearchCommits}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+2, macOS=⌘+2}"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+2, macOS=⌘+2}"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewChanges}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+3, macOS=⌘+3}"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+3, macOS=⌘+3}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
 
-          <TextBlock Grid.Row="5" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"/>
+          <TextBlock Grid.Row="5" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"/>
           <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Commit}" />
 
-          <TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}"/>
+          <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitWithAutoStage}" />
 
-          <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Alt+Enter, macOS=⌘+⌥+Enter}"/>
+          <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Alt+Enter, macOS=⌘+⌥+Enter}"/>
           <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitAndPush}" />
 
-          <TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/>
+          <TextBlock Grid.Row="8" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/>
           <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Fetch}" />
 
-          <TextBlock Grid.Row="9" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Down, macOS=⌘+⇧+Down}"/>
+          <TextBlock Grid.Row="9" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+Down, macOS=⌘+⇧+Down}"/>
           <TextBlock Grid.Row="9" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Pull}" />
 
-          <TextBlock Grid.Row="10" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Up, macOS=⌘+⇧+Up}"/>
+          <TextBlock Grid.Row="10" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+Up, macOS=⌘+⇧+Up}"/>
           <TextBlock Grid.Row="10" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Push}" />
 
-          <TextBlock Grid.Row="11" Grid.Column="0" Classes="primary bold" Text="F5"/>
+          <TextBlock Grid.Row="11" Grid.Column="0" Classes="bold" Text="F5"/>
           <TextBlock Grid.Row="11" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Refresh}" />
         </Grid>
 
@@ -125,19 +125,19 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="150,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Shift+F3/Shift+Enter, macOS=⇧+F3/⇧+Enter}"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="bold" Text="{OnPlatform Shift+F3/Shift+Enter, macOS=⇧+F3/⇧+Enter}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="primary bold" Text="F3/Enter"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="bold" Text="F3/Enter"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoNextMatch}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="primary bold" Text="ESC"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="bold" Text="ESC"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+D, macOS=⌘+⇧+D}"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+D, macOS=⌘+⇧+D}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.OpenExternalMergeTool}" />
         </Grid>
       </StackPanel>
diff --git a/src/Views/ImageDiffView.axaml b/src/Views/ImageDiffView.axaml
index cf9af3877..ca954a7e1 100644
--- a/src/Views/ImageDiffView.axaml
+++ b/src/Views/ImageDiffView.axaml
@@ -25,11 +25,11 @@
         <Grid RowDefinitions="Auto,*" Margin="16,0" IsVisible="{Binding Old, Converter={x:Static ObjectConverters.IsNotNull}}">
           <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
             <Border Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-              <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+              <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
             </Border>
 
-            <TextBlock Classes="primary" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
-            <TextBlock Classes="primary" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+            <TextBlock Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
+            <TextBlock Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
           </StackPanel>
 
           <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
@@ -44,11 +44,11 @@
         <Grid RowDefinitions="Auto,*" Margin="16,0" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
           <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
             <Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
-              <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+              <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
             </Border>
 
-            <TextBlock Classes="primary" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
-            <TextBlock Classes="primary" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+            <TextBlock Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
+            <TextBlock Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
           </StackPanel>
 
           <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
@@ -70,18 +70,18 @@
       <Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center">
           <Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+            <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
           </Border>
 
-          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="1" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="2" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
 
           <Border Grid.Column="3" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" Margin="32,0,0,0">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+            <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
           </Border>
 
-          <TextBlock Grid.Column="4" Classes="primary" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="5" Classes="primary" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="4" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="5" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
         </Grid>
 
         <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
@@ -104,18 +104,18 @@
       <Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center">
           <Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+            <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
           </Border>
 
-          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="1" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="2" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
 
           <Border Grid.Column="3" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" Margin="32,0,0,0">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+            <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
           </Border>
 
-          <TextBlock Grid.Column="4" Classes="primary" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="5" Classes="primary" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="4" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="5" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
         </Grid>
 
         <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
@@ -130,11 +130,10 @@
 
         <Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center">
           <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0">
-            <TextBlock Classes="primary"
-                       Margin="0,0,8,0"
+            <TextBlock Margin="0,0,8,0"
                        Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"
                        Foreground="{DynamicResource Brush.FG2}"/>
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}"/>
+            <TextBlock Text="{DynamicResource Text.Diff.Old}"/>
           </StackPanel>
 
           <Slider Grid.Column="1"
@@ -149,9 +148,8 @@
                   Value="0.5"/>
 
           <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" Margin="8,0,0,0">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}"/>
-            <TextBlock Classes="primary"
-                       Margin="8,0,0,0"
+            <TextBlock Text="{DynamicResource Text.Diff.New}"/>
+            <TextBlock Margin="8,0,0,0"
                        Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.ToPercentage}}"
                        Foreground="{DynamicResource Brush.FG2}"/>
           </StackPanel>
@@ -167,18 +165,18 @@
       <Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center">
           <Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+            <TextBlock Text="{DynamicResource Text.Diff.Old}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
           </Border>
 
-          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="1" Text="{Binding OldImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="2" Text="{Binding OldFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
 
           <Border Grid.Column="3" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center" Margin="32,0,0,0">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
+            <TextBlock Text="{DynamicResource Text.Diff.New}" Margin="8,0" FontSize="10" Foreground="White"/>
           </Border>
 
-          <TextBlock Grid.Column="4" Classes="primary" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Grid.Column="5" Classes="primary" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
+          <TextBlock Grid.Column="4" Text="{Binding NewImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="5" Text="{Binding NewFileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
         </Grid>
 
         <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
@@ -193,11 +191,10 @@
 
         <Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center">
           <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0">
-            <TextBlock Classes="primary"
-                       Margin="0,0,8,0"
+            <TextBlock Margin="0,0,8,0"
                        Text="{Binding #ImageDifferenceSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"
                        Foreground="{DynamicResource Brush.FG2}"/>
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.Old}"/>
+            <TextBlock Text="{DynamicResource Text.Diff.Old}"/>
           </StackPanel>
 
           <Slider Grid.Column="1"
@@ -212,9 +209,8 @@
                   Value="0.5"/>
 
           <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" Margin="8,0,0,0">
-            <TextBlock Classes="primary" Text="{DynamicResource Text.Diff.New}"/>
-            <TextBlock Classes="primary"
-                       Margin="8,0,0,0"
+            <TextBlock Text="{DynamicResource Text.Diff.New}"/>
+            <TextBlock Margin="8,0,0,0"
                        Text="{Binding #ImageDifferenceSlider.Value, Converter={x:Static c:DoubleConverters.ToPercentage}}"
                        Foreground="{DynamicResource Brush.FG2}"/>
           </StackPanel>
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index eba78b502..1c9ed42e5 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -45,7 +45,7 @@
 
       <TextBlock Grid.Column="3" Margin="48,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
       <Path Grid.Column="4" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Commit}"/>
-      <TextBlock Grid.Column="5" Classes="primary" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+      <TextBlock Grid.Column="5" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
       <TextBlock Grid.Column="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
     </Grid>
 
@@ -115,7 +115,7 @@
                 <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
                   <StackPanel Orientation="Horizontal">
                     <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
-                    <TextBlock Classes="primary" Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
+                    <TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
                   </StackPanel>
                 </Button>
 
@@ -131,7 +131,7 @@
 
                   <v:CommitSubjectPresenter Grid.Column="1"
                                             Margin="0,0,4,0"
-                                            FontFamily="{DynamicResource Fonts.Primary}"
+                                            FontFamily="{DynamicResource Fonts.Default}"
                                             CodeFontFamily="{DynamicResource Fonts.Monospace}"
                                             InlineCodeBackground="{DynamicResource Brush.InlineCode}"
                                             Foreground="{DynamicResource Brush.FG1}"
@@ -150,20 +150,17 @@
 
                 <!-- Author Name -->
                 <Border Grid.Column="4" ClipToBounds="True">
-                  <TextBlock Classes="primary" Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
+                  <TextBlock Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
                 </Border>
 
                 <!-- Commit SHA -->
                 <Border Grid.Column="5" ClipToBounds="True">
-                  <TextBlock Classes="primary"
-                             Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
+                  <TextBlock Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
                 </Border>
 
                 <!-- Commit Time -->
                 <Border Grid.Column="6">
-                  <TextBlock Classes="primary"
-                             Margin="16,0,8,0"
-                             Text="{Binding Commit.CommitterTimeStr}"/>
+                  <TextBlock Margin="16,0,8,0" Text="{Binding Commit.CommitterTimeStr}"/>
                 </Border>
               </Grid>
             </DataTemplate>
diff --git a/src/Views/LauncherPageSwitcher.axaml b/src/Views/LauncherPageSwitcher.axaml
index 3f3eab242..8886a1f7b 100644
--- a/src/Views/LauncherPageSwitcher.axaml
+++ b/src/Views/LauncherPageSwitcher.axaml
@@ -97,13 +97,11 @@
                   IsVisible="{Binding !Node.IsRepository}"
                   IsHitTestVisible="False"/>
             <TextBlock Grid.Column="2"
-                       Classes="primary"
                        VerticalAlignment="Center"
                        Text="{Binding Node.Name}"
                        IsVisible="{Binding Node.IsRepository}"
                        IsHitTestVisible="False"/>
             <TextBlock Grid.Column="2"
-                       Classes="primary"
                        VerticalAlignment="Center"
                        Text="{DynamicResource Text.PageTabBar.Welcome.Title}"
                        IsVisible="{Binding !Node.IsRepository}"
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 74cda1daf..4dafba4d5 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -89,7 +89,6 @@
                              Fill="{Binding DirtyState, Converter={x:Static c:DirtyStateConverters.ToBrush}}"/>
 
                     <TextBlock Grid.Column="1"
-                               Classes="primary"
                                VerticalAlignment="Center"
                                FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                                TextAlignment="Center"
@@ -98,7 +97,6 @@
                   </Grid>
 
                   <TextBlock Grid.Column="1"
-                             Classes="primary"
                              HorizontalAlignment="Stretch" VerticalAlignment="Center"
                              FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
                              TextAlignment="Center"
diff --git a/src/Views/Merge.axaml b/src/Views/Merge.axaml
index d4ba5d701..2fa000157 100644
--- a/src/Views/Merge.axaml
+++ b/src/Views/Merge.axaml
@@ -29,7 +29,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/MoveRepositoryNode.axaml b/src/Views/MoveRepositoryNode.axaml
index fb11cf3e4..a9d391889 100644
--- a/src/Views/MoveRepositoryNode.axaml
+++ b/src/Views/MoveRepositoryNode.axaml
@@ -77,7 +77,6 @@
                           IsChecked="True"/>
 
             <TextBlock Grid.Column="2"
-                       Classes="primary"
                        VerticalAlignment="Center"
                        Text="{Binding Name}"/>
           </Grid>
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index f91034402..f484d2cd6 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -179,7 +179,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
@@ -277,20 +277,16 @@
             </TextBox>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
-                      Content="{DynamicResource Text.Preferences.Appearance.OnlyUseMonoFontInEditor}"
-                      IsChecked="{Binding OnlyUseMonoFontInEditor, Mode=TwoWay}"/>
-
-            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
                       IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="8" Grid.Column="1"
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseAutoHideScrollBars}"
                       IsChecked="{Binding UseAutoHideScrollBars, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="9" Grid.Column="1"
+            <CheckBox Grid.Row="8" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
                       IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"
@@ -685,7 +681,7 @@
                         <Path Width="14" Height="14" Data="{StaticResource Icons.Edit}" Fill="{DynamicResource Brush.FG1}"/>
                         <TextBlock Margin="4,0" Text="{DynamicResource Text.Configure.CustomAction.InputControls.Edit}"/>
                         <Border Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-                          <TextBlock Classes="primary" Text="{Binding Controls.Count}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+                          <TextBlock Text="{Binding Controls.Count}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
                         </Border>
                       </StackPanel>
                     </Button>
diff --git a/src/Views/PushRevision.axaml b/src/Views/PushRevision.axaml
index 092212c15..c52148ae1 100644
--- a/src/Views/PushRevision.axaml
+++ b/src/Views/PushRevision.axaml
@@ -20,7 +20,6 @@
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
         <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
         <TextBlock Grid.Column="1"
-                   Classes="primary"
                    VerticalAlignment="Center"
                    Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                    Foreground="DarkOrange"
diff --git a/src/Views/Rebase.axaml b/src/Views/Rebase.axaml
index 91c1fab27..d30939b6d 100644
--- a/src/Views/Rebase.axaml
+++ b/src/Views/Rebase.axaml
@@ -38,7 +38,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/RemoveWorktree.axaml b/src/Views/RemoveWorktree.axaml
index 736e6e409..97f01fd27 100644
--- a/src/Views/RemoveWorktree.axaml
+++ b/src/Views/RemoveWorktree.axaml
@@ -17,7 +17,7 @@
                  Text="{DynamicResource Text.RemoveWorktree.Target}"/>
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,*">
         <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.Worktree}"/>
-        <TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" TextTrimming="CharacterEllipsis">
+        <TextBlock Grid.Column="1" Margin="8,0,0,0" TextTrimming="CharacterEllipsis">
           <Run Text="{Binding Target.Name}"/>
           <Run Text="{Binding Target.RelativePath}" Foreground="{DynamicResource Brush.FG2}"/>
         </TextBlock>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index b7c92623c..18c5c06a3 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -414,7 +414,7 @@
               <DataTemplate DataType="m:Worktree">
                 <Grid ColumnDefinitions="Auto,*,22" Background="Transparent">
                   <Path Grid.Column="0" Width="10" Height="10" Margin="8,0,0,0" Data="{StaticResource Icons.Worktree}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Margin="8,0,0,0" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
+                  <TextBlock Grid.Column="1" Margin="8,0,0,0" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis">
                     <Run Text="{Binding Name}" Foreground="{DynamicResource Brush.FG1}"/>
                     <Run Text="{Binding RelativePath}"/>
                   </TextBlock>
@@ -508,9 +508,9 @@
                       <StackPanel Background="Transparent" Orientation="Vertical" Margin="8,4" DoubleTapped="OnSearchSuggestionDoubleTapped">
                         <StackPanel Orientation="Horizontal">
                           <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
-                          <TextBlock Classes="primary" Margin="6,0,0,0" Text="{Binding Converter={x:Static c:PathConverters.PureFileName}}"/>
+                          <TextBlock Margin="6,0,0,0" Text="{Binding Converter={x:Static c:PathConverters.PureFileName}}"/>
                         </StackPanel>
-                        <TextBlock Classes="primary" FontSize="12" Margin="18,2,0,0" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Converter={x:Static c:PathConverters.PureDirectoryName}}"/>
+                        <TextBlock FontSize="12" Margin="18,2,0,0" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Converter={x:Static c:PathConverters.PureDirectoryName}}"/>
                       </StackPanel>
                     </DataTemplate>
                   </ListBox.ItemTemplate>
@@ -583,10 +583,9 @@
                 <v:Avatar Grid.Column="0" Width="16" Height="16" HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
                 <Grid Grid.Column="1" ColumnDefinitions="Auto,*">
                   <Path Grid.Column="0" Width="14" Height="14" Margin="0,2,2,0" Data="{StaticResource Icons.Check}" Fill="Green" IsVisible="{Binding IsMerged, Mode=OneWay}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Subject}" Margin="2,0,0,0" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Subject}" Margin="2,0,0,0" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
                 </Grid>
                 <TextBlock Grid.Column="2"
-                           Classes="primary"
                            Margin="4,0"
                            Foreground="{DynamicResource Brush.FG2}"
                            Text="{Binding CommitterTimeShortStr}"
@@ -634,11 +633,11 @@
               <StackPanel MinWidth="400" Orientation="Vertical">
                 <Grid ColumnDefinitions="Auto,*,Auto">
                   <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                  <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                  <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+                  <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                 </Grid>
 
-                <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
+                <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
               </StackPanel>
             </DataTemplate>
 
@@ -812,7 +811,7 @@
                   <StackPanel Orientation="Horizontal" Margin="8,0">
                     <Path Width="10" Height="10" Data="{StaticResource Icons.Branch}" IsVisible="{Binding IsBranch}"/>
                     <Path Width="10" Height="10" Data="{StaticResource Icons.Tag}" IsVisible="{Binding !IsBranch}"/>
-                    <TextBlock Classes="primary" Text="{Binding Pattern, Converter={x:Static c:StringConverters.TrimRefsPrefix}}" Margin="4,0,8,0"/>
+                    <TextBlock Text="{Binding Pattern, Converter={x:Static c:StringConverters.TrimRefsPrefix}}" Margin="4,0,8,0"/>
 
                     <Button Classes="icon_button" VerticalAlignment="Center" Margin="0" Padding="0" Click="OnRemoveSelectedHistoriesFilter">
                       <Path Width="8" Height="8" Data="{StaticResource Icons.Close}"/>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 4014a25eb..6aea73adf 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -490,7 +490,7 @@
                       <Path Width="14" Height="14" Data="{StaticResource Icons.Edit}" Fill="{DynamicResource Brush.FG1}"/>
                       <TextBlock Margin="4,0" Text="{DynamicResource Text.Configure.CustomAction.InputControls.Edit}"/>
                       <Border Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
-                        <TextBlock Classes="primary" Text="{Binding Controls.Count}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
+                        <TextBlock Text="{Binding Controls.Count}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
                       </Border>
                     </StackPanel>
                   </Button>
diff --git a/src/Views/RepositoryToolbar.axaml b/src/Views/RepositoryToolbar.axaml
index 844eef8d2..604bcba66 100644
--- a/src/Views/RepositoryToolbar.axaml
+++ b/src/Views/RepositoryToolbar.axaml
@@ -115,7 +115,7 @@
         <ContentControl.Content>
           <Binding Path="CurrentBranch">
             <Binding.TargetNullValue>
-              <TextBlock Classes="primary" Text="--"/>
+              <TextBlock Text="--"/>
             </Binding.TargetNullValue>
           </Binding>
         </ContentControl.Content>
@@ -123,7 +123,7 @@
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
             <Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}">
-              <TextBlock Classes="primary" Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
+              <TextBlock Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
             </Border>
           </DataTemplate>
         </ContentControl.DataTemplates>
diff --git a/src/Views/Reset.axaml b/src/Views/Reset.axaml
index bce9d747c..9dc0bd7ba 100644
--- a/src/Views/Reset.axaml
+++ b/src/Views/Reset.axaml
@@ -28,7 +28,7 @@
                  Text="{DynamicResource Text.Reset.MoveTo}"/>
       <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="Auto,Auto,*" Height="20" VerticalAlignment="Center">
         <Path Grid.Column="0" Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Classes="primary" Text="{Binding To.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+        <TextBlock Grid.Column="1" Text="{Binding To.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
         <TextBlock Grid.Column="2" Text="{Binding To.Subject}" Margin="8,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
diff --git a/src/Views/ResetWithoutCheckout.axaml b/src/Views/ResetWithoutCheckout.axaml
index 3808a8dd0..16d2a5c24 100644
--- a/src/Views/ResetWithoutCheckout.axaml
+++ b/src/Views/ResetWithoutCheckout.axaml
@@ -38,7 +38,7 @@
           <DataTemplate DataType="m:Commit">
             <Grid ColumnDefinitions="Auto,Auto,*">
               <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-              <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+              <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/Revert.axaml b/src/Views/Revert.axaml
index cafe1725b..a6aea6fb9 100644
--- a/src/Views/Revert.axaml
+++ b/src/Views/Revert.axaml
@@ -19,7 +19,7 @@
 
       <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
         <Path Grid.Column="0" Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
-        <TextBlock Grid.Column="1" Classes="primary" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+        <TextBlock Grid.Column="1" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
         <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
       </Grid>
 
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index dd8237b5e..87424f0ab 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -12,7 +12,7 @@
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:Null">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
-        <TextBlock Text="{DynamicResource Text.Worktree}" Classes="primary" Margin="4,2" Foreground="#FFDDDDDD"/>
+        <TextBlock Text="{DynamicResource Text.Worktree}" Margin="4,2" Foreground="#FFDDDDDD"/>
       </Border>
     </DataTemplate>
 
@@ -20,15 +20,15 @@
       <Grid RowDefinitions="Auto,*">
         <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
           <v:Avatar Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
           <Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4" IsVisible="{Binding IsCurrentHead}">
-            <TextBlock Text="HEAD" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
+            <TextBlock Text="HEAD" Margin="4,0" Foreground="#FFDDDDDD"/>
           </Border>
-          <TextBlock Grid.Column="3" Classes="primary" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA" />
-          <TextBlock Grid.Column="4" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+          <TextBlock Grid.Column="3" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" Cursor="Hand" PointerPressed="OnPressedSHA" />
+          <TextBlock Grid.Column="4" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
         </Grid>
 
-        <TextBlock Grid.Row="1" Classes="primary" Text="{Binding Subject}" Margin="0,6,0,0"/>
+        <TextBlock Grid.Row="1" Text="{Binding Subject}" Margin="0,6,0,0"/>
       </Grid>
     </DataTemplate>
   </UserControl.DataTemplates>
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index 99e84d48e..67c67bed2 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -14,7 +14,7 @@
         <Path Width="64" Height="64" Data="{StaticResource Icons.Error}" Fill="{DynamicResource Brush.FG2}"/>
         <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.BinaryNotSupported}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
         <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
-          <TextBlock Classes="primary" Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
+          <TextBlock Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
         </StackPanel>
       </StackPanel>
     </DataTemplate>
@@ -39,11 +39,11 @@
 
         <StackPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
           <Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
-            <TextBlock Classes="primary" Text="{Binding ImageType}" Margin="8,0" FontSize="10" Foreground="White"/>
+            <TextBlock Text="{Binding ImageType}" Margin="8,0" FontSize="10" Foreground="White"/>
           </Border>
 
-          <TextBlock Classes="primary" Text="{Binding ImageSize}" Margin="8,0,0,0"/>
-          <TextBlock Classes="primary" Text="{Binding FileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+          <TextBlock Text="{Binding ImageSize}" Margin="8,0,0,0"/>
+          <TextBlock Text="{Binding FileSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
         </StackPanel>
       </Grid>
     </DataTemplate>
@@ -54,7 +54,7 @@
         <Path Width="64" Height="64" Margin="0,24,0,0" Data="{StaticResource Icons.LFS}" Fill="{DynamicResource Brush.FG2}"/>
         <SelectableTextBlock Margin="0,16,0,0" Text="{Binding Object.Oid}" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
         <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
-          <TextBlock Classes="primary" Text="{Binding Object.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
+          <TextBlock Text="{Binding Object.Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
         </StackPanel>
       </StackPanel>
     </DataTemplate>
diff --git a/src/Views/RevisionFileTreeView.axaml b/src/Views/RevisionFileTreeView.axaml
index 7266c4295..025ba4d79 100644
--- a/src/Views/RevisionFileTreeView.axaml
+++ b/src/Views/RevisionFileTreeView.axaml
@@ -42,7 +42,7 @@
                                               IsChecked="{Binding IsExpanded, Mode=OneWay}"
                                               IsVisible="{Binding IsFolder}"/>
           <v:RevisionTreeNodeIcon Grid.Column="1" Width="14" Height="14" Node="{Binding}" IsExpanded="{Binding IsExpanded, Mode=OneWay}"/>
-          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding Name}" Margin="6,0,0,0"/>
+          <TextBlock Grid.Column="2" Text="{Binding Name}" Margin="6,0,0,0"/>
         </Grid>
       </DataTemplate>
     </ListBox.ItemTemplate>
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 0583c35a8..4144f3ed1 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -88,9 +88,9 @@
                     <StackPanel Background="Transparent" Orientation="Vertical" Margin="8,4" DoubleTapped="OnSearchSuggestionDoubleTapped">
                       <StackPanel Orientation="Horizontal">
                         <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
-                        <TextBlock Classes="primary" Margin="6,0,0,0" Text="{Binding Converter={x:Static c:PathConverters.PureFileName}}"/>
+                        <TextBlock Margin="6,0,0,0" Text="{Binding Converter={x:Static c:PathConverters.PureFileName}}"/>
                       </StackPanel>
-                      <TextBlock Classes="primary" FontSize="12" Margin="18,2,0,0" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Converter={x:Static c:PathConverters.PureDirectoryName}}"/>
+                      <TextBlock FontSize="12" Margin="18,2,0,0" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Converter={x:Static c:PathConverters.PureDirectoryName}}"/>
                     </StackPanel>
                   </DataTemplate>
                 </ListBox.ItemTemplate>
@@ -122,7 +122,6 @@
             <Grid ColumnDefinitions="Auto,*,Auto,Auto">
               <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
               <TextBlock Grid.Column="1"
-                         Classes="primary"
                          Margin="4,0,0,0"
                          Text="{Binding ViewRevisionFilePath}"
                          FontSize="11"
diff --git a/src/Views/Reword.axaml b/src/Views/Reword.axaml
index 5811eb774..909a3e174 100644
--- a/src/Views/Reword.axaml
+++ b/src/Views/Reword.axaml
@@ -15,7 +15,7 @@
 
     <StackPanel Margin="8,16,8,0" Orientation="Horizontal" HorizontalAlignment="Right">
       <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
-      <TextBlock Classes="primary" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
+      <TextBlock Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
     </StackPanel>
 
     <v:CommitMessageTextBox Height="120" Margin="8,5,8,0" Text="{Binding Message, Mode=TwoWay}"/>
diff --git a/src/Views/ScanRepositories.axaml b/src/Views/ScanRepositories.axaml
index 9ca7bbd7d..83264bf19 100644
--- a/src/Views/ScanRepositories.axaml
+++ b/src/Views/ScanRepositories.axaml
@@ -33,7 +33,7 @@
               <TextBlock Grid.Column="1" Margin="4,0" Text="{Binding Path}" VerticalAlignment="Center"/>
 
               <Border Grid.Column="2" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
-                <TextBlock Classes="primary" Text="{Binding Desc}" Margin="8,0" FontSize="10" Foreground="White"/>
+                <TextBlock Text="{Binding Desc}" Margin="8,0" FontSize="10" Foreground="White"/>
               </Border>
             </Grid>
           </DataTemplate>
diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml
index 2d5990e70..a65812339 100644
--- a/src/Views/SelfUpdate.axaml
+++ b/src/Views/SelfUpdate.axaml
@@ -47,7 +47,7 @@
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
                 <TextBlock Margin="8,0,0,0" FontWeight="Bold" FontSize="14" Text="{DynamicResource Text.SelfUpdate.Available}"/>
                 <Border Margin="4,0,0,0" Height="20" CornerRadius="10" Background="{DynamicResource Brush.Accent}" Effect="drop-shadow(0 0 6 #40000000)">
-                  <TextBlock Classes="primary" Margin="8,0" Text="{Binding TagName}" FontSize="12" Foreground="White"/>
+                  <TextBlock Margin="8,0" Text="{Binding TagName}" FontSize="12" Foreground="White"/>
                 </Border>
               </StackPanel>
 
diff --git a/src/Views/Squash.axaml b/src/Views/Squash.axaml
index 3786b29b1..939591b96 100644
--- a/src/Views/Squash.axaml
+++ b/src/Views/Squash.axaml
@@ -22,7 +22,6 @@
             Fill="{DynamicResource Brush.FG1}"
             Data="{StaticResource Icons.Commit}"/>
       <TextBlock Grid.Column="2"
-                 Classes="primary"
                  Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                  Foreground="DarkOrange"/>
       <TextBlock Grid.Column="3" Margin="8,0,0,0" Text="{Binding Target.Subject}" TextTrimming="CharacterEllipsis"/>
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index b6742a17c..f755dbf1b 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -92,8 +92,8 @@
                     ToolTip.Tip="{Binding Message}">
               <Grid RowDefinitions="Auto,*" >
                 <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
-                  <TextBlock Grid.Column="0" Classes="primary" Text="{Binding Name}" Foreground="DarkOrange"/>
-                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding TimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
+                  <TextBlock Grid.Column="0" Text="{Binding Name}" Foreground="DarkOrange"/>
+                  <TextBlock Grid.Column="1" Text="{Binding TimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                 </Grid>
 
                 <v:StashSubjectPresenter Grid.Row="1"
diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml
index 83c46e738..bc2259976 100644
--- a/src/Views/Statistics.axaml
+++ b/src/Views/Statistics.axaml
@@ -186,14 +186,14 @@
               <Grid Grid.Row="1" ColumnDefinitions="*,*">
                 <!-- Total Authors -->
                 <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Bottom">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Statistics.TotalAuthors}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-                  <TextBlock Classes="primary" Text="{Binding Authors.Count}" FontSize="11" Margin="4,0,0,0"/>
+                  <TextBlock Text="{DynamicResource Text.Statistics.TotalAuthors}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                  <TextBlock Text="{Binding Authors.Count}" FontSize="11" Margin="4,0,0,0"/>
                 </StackPanel>
 
                 <!-- Total Commits -->
                 <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-                  <TextBlock Classes="primary" Text="{DynamicResource Text.Statistics.TotalCommits}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
-                  <TextBlock Classes="primary" Text="{Binding Total}" FontSize="11" Margin="4,0,0,0"/>
+                  <TextBlock Text="{DynamicResource Text.Statistics.TotalCommits}" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
+                  <TextBlock Text="{Binding Total}" FontSize="11" Margin="4,0,0,0"/>
                 </StackPanel>
               </Grid>
             </Grid>
diff --git a/src/Views/SubmodulesView.axaml b/src/Views/SubmodulesView.axaml
index 4e21088fd..963ae1b65 100644
--- a/src/Views/SubmodulesView.axaml
+++ b/src/Views/SubmodulesView.axaml
@@ -119,7 +119,6 @@
                                          IsExpanded="{Binding IsExpanded, Mode=OneWay}"/>
 
                 <TextBlock Grid.Column="2"
-                           Classes="primary"
                            Margin="8,0,0,0"
                            TextTrimming="CharacterEllipsis">
                   <Run Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}, Mode=OneWay}"/>
@@ -233,7 +232,7 @@
               </ToolTip.Tip>
               <Grid ColumnDefinitions="16,*,Auto" Margin="8,0,0,0" VerticalAlignment="Center">
                 <Path Grid.Column="0" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Submodule}"/>
-                <TextBlock Grid.Column="1" Text="{Binding Path}" ClipToBounds="True" Classes="primary" TextTrimming="CharacterEllipsis"/>
+                <TextBlock Grid.Column="1" Text="{Binding Path}" ClipToBounds="True" TextTrimming="CharacterEllipsis"/>
                 <Path Grid.Column="2"
                       Width="8" Height="8"
                       Margin="8,0,12,0"
diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml
index bc1aee4e4..5ec914e65 100644
--- a/src/Views/TagsView.axaml
+++ b/src/Views/TagsView.axaml
@@ -47,9 +47,7 @@
 
                 <v:TagTreeNodeIcon Grid.Column="1" IsExpanded="{Binding IsExpanded, Mode=OneWay}"/>
 
-                <TextBlock Grid.Column="2"
-                           Classes="primary"
-                           Margin="8,0,0,0">
+                <TextBlock Grid.Column="2" Margin="8,0,0,0">
                   <Run Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}, Mode=OneWay}"/>
                   <Run Text="{Binding TagsCount}" Foreground="{DynamicResource Brush.FG2}"/>
                 </TextBlock>
@@ -92,7 +90,6 @@
                       Data="{StaticResource Icons.Tag}"/>
 
                 <TextBlock Grid.Column="1"
-                           Classes="primary"
                            Text="{Binding Tag.Name}"
                            Margin="8,0,0,0"
                            TextTrimming="CharacterEllipsis"/>
@@ -111,7 +108,7 @@
           <Path Width="10" Height="10" Data="{StaticResource Icons.Tag}"/>
           <TextBlock FontWeight="Bold" Margin="4,0,0,0" Text="{Binding Name}"/>
           <Border Background="Green" Margin="4,0,0,0" CornerRadius="4" IsVisible="{Binding IsAnnotated}">
-            <TextBlock Text="{DynamicResource Text.CreateTag.Type.Annotated}" Classes="primary" Margin="4,0" Foreground="White"/>
+            <TextBlock Text="{DynamicResource Text.CreateTag.Type.Annotated}" Margin="4,0" Foreground="White"/>
           </Border>
         </StackPanel>
 
diff --git a/src/Views/ViewLogs.axaml b/src/Views/ViewLogs.axaml
index bba5da8eb..53dbe6e8b 100644
--- a/src/Views/ViewLogs.axaml
+++ b/src/Views/ViewLogs.axaml
@@ -88,7 +88,6 @@
                              IsVisible="{Binding !IsComplete}"/>
 
               <TextBlock Grid.Column="1"
-                         Classes="primary"
                          Margin="4,0,0,0"
                          Text="{Binding Name}"
                          VerticalAlignment="Center"
@@ -100,7 +99,6 @@
                          Text="{Binding StartTime, StringFormat=HH:mm:ss}"/>
 
               <v:CommandLogTime Grid.Column="3"
-                                Classes="primary"
                                 Margin="4,0"
                                 Foreground="{DynamicResource Brush.FG2}"
                                 HorizontalAlignment="Right" VerticalAlignment="Center"/>
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 771073bd0..0f625e7af 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -141,7 +141,7 @@
                             IsVisible="{Binding !IsRepository}"/>
 
               <StackPanel Grid.Column="2" Orientation="Horizontal">
-                <TextBlock Classes="primary" VerticalAlignment="Center" Text="{Binding Name}"/>
+                <TextBlock VerticalAlignment="Center" Text="{Binding Name}"/>
                 <Path Margin="2,0,0,0"
                       Width="12" Height="12"
                       Data="{StaticResource Icons.Error}"
@@ -150,8 +150,7 @@
               </StackPanel>
 
               <Border Grid.Column="3" Margin="8,0" VerticalAlignment="Center" ClipToBounds="True">
-                <TextBlock Classes="primary"
-                           HorizontalAlignment="Right"
+                <TextBlock HorizontalAlignment="Right"
                            Foreground="{DynamicResource Brush.FG2}"
                            Text="{Binding Id, Converter={x:Static c:PathConverters.RelativeToHome}}"
                            IsVisible="{Binding IsRepository}"/>
diff --git a/src/Views/WorkspaceSwitcher.axaml b/src/Views/WorkspaceSwitcher.axaml
index 16af02c2f..7585edb3a 100644
--- a/src/Views/WorkspaceSwitcher.axaml
+++ b/src/Views/WorkspaceSwitcher.axaml
@@ -97,7 +97,6 @@
                   IsHitTestVisible="False"/>
             <TextBlock Grid.Column="1"
                        Margin="8,0,0,0"
-                       Classes="primary"
                        VerticalAlignment="Center"
                        Text="{Binding Name}"
                        IsHitTestVisible="False"

From 97948e11b88ddb3ae2d237a6391cbe630926c450 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:40:06 +0000
Subject: [PATCH 11/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 12 ++++++------
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/id_ID.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/ja_JP.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/ta_IN.axaml |  1 -
 src/Resources/Locales/uk_UA.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 13 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 654dbd993..3a123ce20 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -24,7 +24,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.72%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.69%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -245,7 +245,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.53%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-96.52%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -284,7 +284,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.72%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.69%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -491,7 +491,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-71.33%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-71.30%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -764,7 +764,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.83%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.80%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -970,7 +970,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.95%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.92%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index e0cbedda2..2f5eb8f9c 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -562,7 +562,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Design</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Design-Anpassungen</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Scrollbars automatisch ausblenden</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index e194ba292..558ed7692 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -561,7 +561,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Por defecto</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Fuente Monospace</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar solo fuente monospace en el editor de texto</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Sobreescritura de temas</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Usar barras de desplazamiento que se oculten automáticamente</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 32ae0e9f9..42bb27af1 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -436,7 +436,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Défaut</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Éditeur</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Police monospace</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">N'utiliser que des polices monospace pour l'éditeur de texte</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Thème</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Dérogations de thème</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Utiliser des onglets de taille fixe dans la barre de titre</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 5c5775fa2..358a3367a 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -556,7 +556,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Font Monospace</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Gunakan font monospace hanya di text editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Override Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Gunakan scrollbar auto-hide</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 0d7948147..813047eef 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -541,7 +541,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Dimensione Font Predefinita</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Dimensione Font Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Font Monospaziato</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usa solo font monospaziato nell'editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Sostituzioni Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usa larghezza fissa per i tab nella barra del titolo</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 4698a5508..95e5fc62b 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -435,7 +435,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">デフォルト</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">エディタ</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">等幅フォント</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">テキストエディタでは等幅フォントのみを使用する</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">テーマ</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">テーマの上書き</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">タイトルバーの固定タブ幅を使用</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index bc1f92ebe..e3a11bc03 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -399,7 +399,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Padrão</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Fonte Monoespaçada</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Usar fonte monoespaçada apenas no editor de texto</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Substituições de Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usar largura fixa de aba na barra de título</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index c1db3097d..88dca5939 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -561,7 +561,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">По умолчанию</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Редактор</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Моноширный шрифт</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">В текстовом редакторе используется только моноширный шрифт</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Тема</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Переопределение темы</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Автоматически скрывать прокрутку</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index a29ccef34..ec09a4f8c 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -435,7 +435,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">இயல்புநிலை</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">திருத்தி</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">ஒற்றைவெளி எழுத்துரு</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">ஒற்றைவெளி எழுத்துருவை உரை திருத்தியில் மட்டும் பயன்படுத்து</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">கருப்பொருள்</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">கருப்பொருள் மேலெழுதப்படுகிறது</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">தலைப்புப்பட்டியில் நிலையான தாவல் அகலத்தைப் பயன்படுத்து</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index 82e2a0c6f..eeb0bfe52 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -440,7 +440,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">За замовчуванням</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Редактор</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Моноширинний шрифт</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Використовувати моноширинний шрифт лише в текстовому редакторі</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Тема</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Перевизначення теми</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Використовувати фіксовану ширину вкладки в заголовку</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index b373f2040..6b9adc801 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -569,7 +569,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">默认</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">代码编辑器</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">等宽字体</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">仅在文本编辑器中使用等宽字体</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">主题</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">主题自定义</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允许滚动条自动隐藏</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index d55cbfbbd..cd3266573 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -569,7 +569,6 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">預設</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">程式碼</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">等寬字型</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">僅在文字編輯器中使用等寬字型</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">佈景主題</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">自訂主題</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允許滾動條自動隱藏</x:String>

From ef0569442e03de6efbabc6c553e7158c05f6c23d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 11:01:44 +0800
Subject: [PATCH 12/72] feature: supports to create pull request with selected
 branch (or its upstream) (#1854)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/CommitLink.cs          |  3 --
 src/Models/Remote.cs              | 53 ++++++++++++++++++++++++++++++-
 src/Resources/Icons.axaml         |  1 +
 src/Resources/Locales/en_US.axaml |  2 ++
 src/Resources/Locales/zh_CN.axaml |  2 ++
 src/Resources/Locales/zh_TW.axaml |  2 ++
 src/Views/BranchTree.axaml.cs     | 47 +++++++++++++++++++++++----
 7 files changed, 100 insertions(+), 10 deletions(-)

diff --git a/src/Models/CommitLink.cs b/src/Models/CommitLink.cs
index d9f1bb057..e7c3f697a 100644
--- a/src/Models/CommitLink.cs
+++ b/src/Models/CommitLink.cs
@@ -22,9 +22,6 @@ public static List<CommitLink> Get(List<Remote> remotes)
             {
                 if (remote.TryGetVisitURL(out var link))
                 {
-                    if (link.EndsWith(".git"))
-                        link = link.Substring(0, link.Length - 4);
-
                     var uri = new Uri(link, UriKind.Absolute);
                     var host = uri.Host;
                     var route = uri.AbsolutePath.TrimStart('/');
diff --git a/src/Models/Remote.cs b/src/Models/Remote.cs
index b8632223c..3550a4e56 100644
--- a/src/Models/Remote.cs
+++ b/src/Models/Remote.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Web;
 
 namespace SourceGit.Models
 {
@@ -65,7 +66,6 @@ public bool TryGetVisitURL(out string url)
 
             if (URL.StartsWith("http", StringComparison.Ordinal))
             {
-                // Try to remove the user before host and `.git` extension.
                 var uri = new Uri(URL.EndsWith(".git", StringComparison.Ordinal) ? URL.Substring(0, URL.Length - 4) : URL);
                 if (uri.Port != 80 && uri.Port != 443)
                     url = $"{uri.Scheme}://{uri.Host}:{uri.Port}{uri.LocalPath}";
@@ -84,5 +84,56 @@ public bool TryGetVisitURL(out string url)
 
             return false;
         }
+
+        public bool TryGetCreatePullRequestURL(out string url, string mergeBranch)
+        {
+            url = null;
+
+            if (!TryGetVisitURL(out var baseURL))
+                return false;
+
+            var uri = new Uri(baseURL);
+            var host = uri.Host;
+            var route = uri.AbsolutePath.TrimStart('/');
+            var encodedBranch = HttpUtility.UrlEncode(mergeBranch);
+
+            if (host.Contains("github.com", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/compare/{encodedBranch}?expand=1";
+                return true;
+            }
+
+            if (host.Contains("gitlab", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/-/merge_requests/new?merge_request%5Bsource_branch%5D={encodedBranch}";
+                return true;
+            }
+
+            if (host.Equals("gitee.com", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/pulls/new?source={encodedBranch}";
+                return true;
+            }
+
+            if (host.Equals("bitbucket.org", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/pull-requests/new?source={encodedBranch}";
+                return true;
+            }
+
+            if (host.Equals("gitea.org", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/compare/{encodedBranch}";
+                return true;
+            }
+
+            if (host.Contains("azure.com", StringComparison.Ordinal))
+            {
+                url = $"{baseURL}/pullrequestcreate?sourceRef={encodedBranch}";
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 4c54dce60..3103e68f7 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -26,6 +26,7 @@
   <StreamGeometry x:Key="Icons.Compare">M645 448l64 64 220-221L704 64l-64 64 115 115H128v90h628zM375 576l-64-64-220 224L314 960l64-64-116-115H896v-90H262z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Conflict">M608 0q48 0 88 23t63 63 23 87v70h55q35 0 67 14t57 38 38 57 14 67V831q0 34-14 66t-38 57-57 38-67 13H426q-34 0-66-13t-57-38-38-57-14-66v-70h-56q-34 0-66-14t-57-38-38-57-13-67V174q0-47 23-87T109 23 196 0h412m175 244H426q-46 0-86 22T278 328t-26 85v348H608q47 0 86-22t63-62 25-85l1-348m-269 318q18 0 31 13t13 31-13 31-31 13-31-13-13-31 13-31 31-13m0-212q13 0 22 9t11 22v125q0 14-9 23t-22 10-23-7-11-22l-1-126q0-13 10-23t23-10z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Copy">M896 811l-128 0c-23 0-43-19-43-43 0-23 19-43 43-43l107 0c13 0 21-9 21-21L896 107c0-13-9-21-21-21L448 85c-13 0-21 9-21 21l0 21c0 23-19 43-43 43-23 0-43-19-43-43L341 85c0-47 38-85 85-85l469 0c47 0 85 38 85 85l0 640C981 772 943 811 896 811zM683 299l0 640c0 47-38 85-85 85L128 1024c-47 0-85-38-85-85L43 299c0-47 38-85 85-85l469 0C644 213 683 252 683 299zM576 299 149 299c-13 0-21 9-21 21l0 597c0 13 9 21 21 21l427 0c13 0 21-9 21-21L597 320C597 307 589 299 576 299z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.CreatePR">M339 297c17-23 25-51 25-83 2-42-12-79-43-108S255 62 215 65c-32 0-60 8-84 25s-42 39-54 67-15 56-10 86 19 55 40 76c21 21 47 35 76 41v303c-30 6-55 20-76 41-21 21-35 47-40 76-5 30-2 58 10 86s30 50 54 67 52 25 83 25 59-8 84-25c25-17 45-39 57-67 6-19 10-39 10-61 0-30-8-57-25-83-21-34-52-55-92-64v-299l25-6c28-13 50-32 67-57zm-45 471c8 15 12 30 11 46-1 16-6 31-16 46-10 15-23 25-40 32s-34 8-51 5-32-11-46-24-22-28-24-45c-6-28-1-53 18-75s41-33 68-33c17 0 32 4 46 13 14 8 25 20 33 35zM167 288c-15-11-26-24-33-41-7-17-10-34-6-51 3-17 11-32 24-45s28-21 46-25 36-3 53 5c17 7 30 18 40 32 10 14 15 29 16 46 1 17-3 33-11 48-8 15-20 27-33 35-14 8-29 13-46 13s-33-5-48-16zm615 45c2-19-1-38-10-57-11-28-29-50-54-67s-53-25-83-25h-111l76-76-45-41-127 127v41l127 127 45-41-76-76h111c23 0 44 8 62 25 18 17 27 38 27 64v89h57V332zm0 449H960v-61H782V542h-61v178H543v61h178v178h61V781z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Cut">M280 145l243 341 0-0 45 63-0 0 79 110a143 143 0 11-36 75l-88-123-92 126c1 4 1 9 1 13l0 5a143 143 0 11-36-95l82-113L221 188l60-43zm473 541a70 70 0 100 140 70 70 0 000-140zm-463 0a70 70 0 100 140 70 70 0 000-140zM772 145l59 43-232 319-45-63L772 145z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Detached">M128 183C128 154 154 128 183 128h521c30 0 55 26 55 55v38c0 17-17 34-34 34s-34-17-34-34v-26H196v495h26c17 0 34 17 34 34s-17 34-34 34h-38c-30 0-55-26-55-55V183zM380 896h-34c-26 0-47-21-47-47v-90h68V828h64V896H380c4 0 0 0 0 0zM759 828V896h90c26 0 47-21 47-47v-90h-68V828h-68zM828 435H896V346c0-26-21-47-47-47h-90v68H828v68zM435 299v68H367V439H299V346C299 320 320 299 346 299h90zM367 649H299v-107h68v107zM546 367V299h107v68h-107zM828 546H896v107h-68v-107zM649 828V896h-107v-68h107zM730 508v188c0 17-17 34-34 34h-188c-17 0-34-17-34-34s17-34 34-34h102l-124-124c-13-13-13-34 0-47 13-13 34-13 47 0l124 124V512c0-17 17-34 34-34 21-4 38 9 38 30z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Detail">M889 0H135c-32 0-59 26-59 59v906c0 32 26 59 59 59h753c32 0 59-26 59-59v-906c1-33-26-59-58-59zm-165 177c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm-212 0c31 0 56 25 56 56S543 288 512 288s-56-25-56-56S481 177 512 177zm-212 0c31 0 56 25 56 56s-25 56-56 56-56-25-56-56 25-56 56-56zm209 606H285c-25 0-44-20-44-44 0-25 20-44 44-44h224c25 0 44 20 44 44 0 24-20 44-44 44zm230-212H285c-25 0-44-20-44-44 0-25 20-44 44-44h453c25 0 44 20 44 44 1 24-20 44-44 44z</StreamGeometry>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 45b827973..163e2a7df 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -57,6 +57,8 @@
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Compare with ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copy Branch Name</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">Create PR...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">Create PR for upstream ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Custom Action</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Delete selected {0} branches</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 6b9adc801..5488bbe8a 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -61,6 +61,8 @@
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">与当前 ${0}$ 比较</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">复制分支名</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">创建合并请求 ...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">为上游分支 ${0}$ 创建合并请求 ...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">自定义操作</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">删除 ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">删除选中的 {0} 个分支</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index cd3266573..4bdda3b14 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -61,6 +61,8 @@
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">與目前 ${0}$ 比較</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">複製分支名稱</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">建立拉取請求...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">為上游分支 ${0}$ 建立拉取請求...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">自訂動作</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">刪除 ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">刪除所選的 {0} 個分支</x:String>
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
index ffa21c17e..7d65e3c0a 100644
--- a/src/Views/BranchTree.axaml.cs
+++ b/src/Views/BranchTree.axaml.cs
@@ -842,6 +842,24 @@ private ContextMenu CreateContextMenuForLocalBranch(ViewModels.Repository repo,
             menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(createBranch);
             menu.Items.Add(createTag);
+
+            if (upstream != null)
+            {
+                var remote = repo.Remotes.Find(x => x.Name.Equals(upstream.Remote, StringComparison.Ordinal));
+                if (remote != null && remote.TryGetCreatePullRequestURL(out var prURL, upstream.Name))
+                {
+                    var createPR = new MenuItem();
+                    createPR.Header = App.Text("BranchCM.CreatePRForUpstream", upstream.FriendlyName);
+                    createPR.Icon = App.CreateMenuIcon("Icons.CreatePR");
+                    createPR.Click += (_, e) =>
+                    {
+                        Native.OS.OpenBrowser(prURL);
+                        e.Handled = true;
+                    };
+
+                    menu.Items.Add(createPR);
+                }
+            }
             menu.Items.Add(new MenuItem() { Header = "-" });
             TryToAddCustomActionsToBranchContextMenu(repo, menu, branch);
 
@@ -1060,6 +1078,9 @@ public ContextMenu CreateContextMenuForRemoteBranch(ViewModels.Repository repo,
                 e.Handled = true;
             };
 
+            menu.Items.Add(delete);
+            menu.Items.Add(new MenuItem() { Header = "-" });
+
             var createBranch = new MenuItem();
             createBranch.Icon = App.CreateMenuIcon("Icons.Branch.Add");
             createBranch.Header = App.Text("CreateBranch");
@@ -1080,6 +1101,26 @@ public ContextMenu CreateContextMenuForRemoteBranch(ViewModels.Repository repo,
                 e.Handled = true;
             };
 
+            menu.Items.Add(createBranch);
+            menu.Items.Add(createTag);
+
+            var remote = repo.Remotes.Find(x => x.Name.Equals(branch.Remote, StringComparison.Ordinal));
+            if (remote != null && remote.TryGetCreatePullRequestURL(out var prURL, branch.Name))
+            {
+                var createPR = new MenuItem();
+                createPR.Header = App.Text("BranchCM.CreatePR");
+                createPR.Icon = App.CreateMenuIcon("Icons.CreatePR");
+                createPR.Click += (_, e) =>
+                {
+                    Native.OS.OpenBrowser(prURL);
+                    e.Handled = true;
+                };
+
+                menu.Items.Add(createPR);
+            }
+
+            menu.Items.Add(new MenuItem() { Header = "-" });
+
             var archive = new MenuItem();
             archive.Icon = App.CreateMenuIcon("Icons.Archive");
             archive.Header = App.Text("Archive");
@@ -1099,16 +1140,10 @@ public ContextMenu CreateContextMenuForRemoteBranch(ViewModels.Repository repo,
                 e.Handled = true;
             };
 
-            menu.Items.Add(delete);
-            menu.Items.Add(new MenuItem() { Header = "-" });
-            menu.Items.Add(createBranch);
-            menu.Items.Add(createTag);
-            menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(archive);
             menu.Items.Add(new MenuItem() { Header = "-" });
             TryToAddCustomActionsToBranchContextMenu(repo, menu, branch);
             menu.Items.Add(copy);
-
             return menu;
         }
 

From b53ca8890827251a8673ec05a49147342e1254f0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 03:02:09 +0000
Subject: [PATCH 13/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 3a123ce20..d5ea02939 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,25 +6,29 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.89%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.66%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.89%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.66%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.69%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.52%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -44,6 +48,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -231,12 +237,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.33%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.11%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
 - Text.About.ReleaseNotes
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.CommitCM.Drop
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.DropHead
@@ -245,12 +253,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.52%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-96.31%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.About.ReleaseNotes
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
 - Text.BranchTree.AheadBehind
@@ -284,7 +294,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.69%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.52%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -305,6 +315,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
 - Text.BranchCM.CompareWithCurrent
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -491,7 +503,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-71.30%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-71.14%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -517,6 +529,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.CustomAction
 - Text.BranchCM.MergeMultiBranches
 - Text.BranchCM.ResetToSelectedCommit
@@ -755,16 +769,18 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.66%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.80%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.63%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -785,6 +801,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
 - Text.BranchCM.CompareWithCurrent
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -970,7 +988,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.92%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.75%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -990,6 +1008,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead

From 2f3b82548b13c04a44d56cf8954a8d8978231f24 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 11:04:42 +0800
Subject: [PATCH 14/72] doc: update README

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 95c6691dc..5f0c037bd 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@
 * Issue Link
 * Workspace
 * Custom Action
+* Create PR on GitHub/Gitlab/Gitea/Gitee/Bitbucket...
 * Using AI to generate commit message (C# port of [anjerodev/commitollama](https://github.com/anjerodev/commitollama))
 
 > [!WARNING]

From ed7e6d4012bda3e85d16badcec35a327c754796c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 15:26:35 +0800
Subject: [PATCH 15/72] ux: remove `Use fixed tab width in titlebar` option
 from `Preferences` and makes it the only and default

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Converters/BoolConverters.cs  | 3 ---
 src/Resources/Locales/en_US.axaml | 1 -
 src/ViewModels/Preferences.cs     | 7 -------
 src/Views/LauncherTabBar.axaml    | 2 +-
 src/Views/Preferences.axaml       | 9 ++-------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index d101c6411..8a2f31416 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -5,9 +5,6 @@ namespace SourceGit.Converters
 {
     public static class BoolConverters
     {
-        public static readonly FuncValueConverter<bool, double> ToPageTabWidth =
-            new FuncValueConverter<bool, double>(x => x ? 200 : double.NaN);
-
         public static readonly FuncValueConverter<bool, FontWeight> IsBoldToFontWeight =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
 
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 163e2a7df..6a1428428 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -570,7 +570,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Theme</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Use auto-hide scrollbars</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Use native window frame</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Install Path</x:String>
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 5b5bc31f5..f7beb968b 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -148,12 +148,6 @@ public int DateTimeFormat
             }
         }
 
-        public bool UseFixedTabWidth
-        {
-            get => _useFixedTabWidth;
-            set => SetProperty(ref _useFixedTabWidth, value);
-        }
-
         public bool UseAutoHideScrollBars
         {
             get => _useAutoHideScrollBars;
@@ -718,7 +712,6 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
 
         private int _maxHistoryCommits = 20000;
         private int _subjectGuideLength = 50;
-        private bool _useFixedTabWidth = true;
         private bool _useAutoHideScrollBars = true;
         private bool _useGitHubStyleAvatar = true;
         private bool _showAuthorTimeInGraph = false;
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 4dafba4d5..b14254e65 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -42,7 +42,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:LauncherPage">
-              <Border Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30"
+              <Border Width="200" Height="30"
                       Padding="0,2,0,0"
                       Background="Transparent"
                       PointerPressed="OnPointerPressedTab"
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index f484d2cd6..8d37bed23 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -179,7 +179,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
@@ -277,16 +277,11 @@
             </TextBox>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
-                      Height="32"
-                      Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
-                      IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
-
-            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseAutoHideScrollBars}"
                       IsChecked="{Binding UseAutoHideScrollBars, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="8" Grid.Column="1"
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
                       IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"

From 74a9489ee3bda8b2b789d2f145bc157a9ba9ceff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 07:26:59 +0000
Subject: [PATCH 16/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 14 +++++++-------
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/id_ID.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/ja_JP.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/ta_IN.axaml |  1 -
 src/Resources/Locales/uk_UA.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 13 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index d5ea02939..c6b04a581 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -28,7 +28,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.52%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.49%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -237,7 +237,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.11%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.10%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -253,7 +253,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.31%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-96.30%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -294,7 +294,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.52%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.49%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -503,7 +503,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-71.14%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-71.11%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -780,7 +780,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.63%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.60%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -988,7 +988,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.75%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.72%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 2f5eb8f9c..a5f25ec49 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -565,7 +565,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Design</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Design-Anpassungen</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Scrollbars automatisch ausblenden</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Fixe Tab-Breite in Titelleiste</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Verwende nativen Fensterrahmen</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Installationspfad</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 558ed7692..5a47584bb 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -564,7 +564,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Sobreescritura de temas</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Usar barras de desplazamiento que se oculten automáticamente</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usar ancho de pestaña fijo en la barra de título</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Usar marco de ventana nativo</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">HERRAMIENTA DIFF/MERGE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Ruta de instalación</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 42bb27af1..2052f93ac 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -438,7 +438,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Police monospace</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Thème</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Dérogations de thème</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Utiliser des onglets de taille fixe dans la barre de titre</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Utiliser un cadre de fenêtre natif</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">OUTIL DIFF/MERGE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Chemin d'installation</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 358a3367a..4a784d948 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -559,7 +559,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Override Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Gunakan scrollbar auto-hide</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Gunakan lebar tab tetap di titlebar</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Gunakan frame window native</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Jalur Instalasi</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 813047eef..b95b3d33d 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -543,7 +543,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Font Monospaziato</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Sostituzioni Tema</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usa larghezza fissa per i tab nella barra del titolo</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Usa cornice finestra nativa</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">STRUMENTO DI DIFFERENZA/UNIONE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Percorso Installazione</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 95e5fc62b..958ceb9f9 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -437,7 +437,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">等幅フォント</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">テーマ</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">テーマの上書き</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">タイトルバーの固定タブ幅を使用</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">ネイティブウィンドウフレームを使用</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">差分/マージ ツール</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">インストール パス</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index e3a11bc03..24569a93f 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -401,7 +401,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Fonte Monoespaçada</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Tema</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Substituições de Tema</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Usar largura fixa de aba na barra de título</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Usar moldura de janela nativa</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">FERRAMENTA DE DIFF/MERGE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Caminho de Instalação</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 88dca5939..3a0d458a8 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -564,7 +564,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Тема</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Переопределение темы</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Автоматически скрывать прокрутку</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Использовать фиксированную ширину табуляции в строке заголовка.</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Использовать системное окно</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">ИНСТРУМЕНТ СРАВНЕНИЙ/СЛИЯНИЯ</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Путь установки</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index ec09a4f8c..e98dfc058 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -437,7 +437,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">ஒற்றைவெளி எழுத்துரு</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">கருப்பொருள்</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">கருப்பொருள் மேலெழுதப்படுகிறது</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">தலைப்புப்பட்டியில் நிலையான தாவல் அகலத்தைப் பயன்படுத்து</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">சொந்த சாளர சட்டத்தைப் பயன்படுத்து</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">வேறு/ஒன்றிணை கருவி</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">நிறுவல் பாதை</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index eeb0bfe52..6b91933e1 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -442,7 +442,6 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">Моноширинний шрифт</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Тема</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Перевизначення теми</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Використовувати фіксовану ширину вкладки в заголовку</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Використовувати системну рамку вікна</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">ІНСТРУМЕНТ DIFF/MERGE</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Шлях встановлення</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 5488bbe8a..61aea74f3 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -574,7 +574,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">主题</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">主题自定义</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允许滚动条自动隐藏</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">主标签使用固定宽度</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系统默认窗体样式</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">对比/合并工具</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">安装路径</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 4bdda3b14..bb4eeb866 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -574,7 +574,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">佈景主題</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">自訂主題</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允許滾動條自動隱藏</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">使用固定寬度的分頁標籤</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系統原生預設視窗樣式</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">對比/合併工具</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">安裝路徑</x:String>

From 8075d0b3d244b6512b8e7d3e81ff1d241be870e4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 17:15:58 +0800
Subject: [PATCH 17/72] feature: supports to push to a custom (new) remote
 branch

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml  |  2 +
 src/Resources/Locales/zh_CN.axaml  |  2 +
 src/Resources/Locales/zh_TW.axaml  |  2 +
 src/ViewModels/Push.cs             | 41 ++++++++++++++++---
 src/Views/Pull.axaml               |  2 +-
 src/Views/Pull.axaml.cs            |  3 --
 src/Views/Push.axaml               | 60 ++++++++++++++++-----------
 src/Views/Push.axaml.cs            | 23 +++++++++--
 src/Views/PushToNewBranch.axaml    | 66 ++++++++++++++++++++++++++++++
 src/Views/PushToNewBranch.axaml.cs | 28 +++++++++++++
 src/Views/SetUpstream.axaml        |  2 +-
 src/Views/SetUpstream.axaml.cs     |  3 --
 12 files changed, 191 insertions(+), 43 deletions(-)
 create mode 100644 src/Views/PushToNewBranch.axaml
 create mode 100644 src/Views/PushToNewBranch.axaml.cs

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 6a1428428..6fbb2289c 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -644,6 +644,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Push to all remotes</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">Tag:</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">Push to a NEW branch</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">Input name of the new remote branch:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Quit</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">Rebase Current Branch</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Stash &amp; reapply local changes</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 61aea74f3..f511682f4 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -648,6 +648,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">推送到所有远程仓库</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">远程仓库 ：</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">标签 ：</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">推送到新的分支</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">输入新的远端分支名</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">退出</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">变基(rebase)操作</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">自动贮藏并恢复本地变更</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index bb4eeb866..46d2ee76e 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -648,6 +648,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">推送到所有遠端存放庫</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">標籤:</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">推送到新的分支</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">输入新的遠端分支名</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">結束</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">重定基底 (rebase) 操作</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">自動擱置變更並復原本機變更</x:String>
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
index 6b6857163..10999f259 100644
--- a/src/ViewModels/Push.cs
+++ b/src/ViewModels/Push.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 
@@ -69,9 +70,9 @@ public bool IsSetTrackOptionVisible
 
         public bool Tracking
         {
-            get;
-            set;
-        } = true;
+            get => _tracking;
+            set => SetProperty(ref _tracking, value);
+        }
 
         public bool IsCheckSubmodulesVisible
         {
@@ -127,8 +128,10 @@ public Push(Repository repo, Models.Branch localBranch)
             }
 
             // Find preferred remote if selected local branch has upstream.
-            if (!string.IsNullOrEmpty(_selectedLocalBranch?.Upstream))
+            if (!string.IsNullOrEmpty(_selectedLocalBranch?.Upstream) && !_selectedLocalBranch.IsUpstreamGone)
             {
+                _tracking = false;
+
                 foreach (var branch in repo.Branches)
                 {
                     if (!branch.IsLocal && _selectedLocalBranch.Upstream == branch.FullName)
@@ -138,6 +141,10 @@ public Push(Repository repo, Models.Branch localBranch)
                     }
                 }
             }
+            else
+            {
+                _tracking = true;
+            }
 
             // Set default remote to the first if it has not been set.
             if (_selectedRemote == null)
@@ -153,6 +160,27 @@ public Push(Repository repo, Models.Branch localBranch)
             AutoSelectBranchByRemote();
         }
 
+        public void PushToNewBranch(string name)
+        {
+            var exist = _remoteBranches.Find(x => x.Name.Equals(name, StringComparison.Ordinal));
+            if (exist != null)
+            {
+                SelectedRemoteBranch = exist;
+                return;
+            }
+
+            var fake = new Models.Branch()
+            {
+                Name = name,
+                Remote = _selectedRemote.Name,
+            };
+            var collection = new List<Models.Branch>();
+            collection.AddRange(_remoteBranches);
+            collection.Add(fake);
+            RemoteBranches = collection;
+            SelectedRemoteBranch = fake;
+        }
+
         public override bool CanStartDirectly()
         {
             return !string.IsNullOrEmpty(_selectedRemoteBranch?.Head);
@@ -175,7 +203,7 @@ public override async Task<bool> Sure()
                 remoteBranchName,
                 PushAllTags,
                 _repo.Submodules.Count > 0 && CheckSubmodules,
-                _isSetTrackOptionVisible && Tracking,
+                _isSetTrackOptionVisible && _tracking,
                 ForcePush).Use(log).RunAsync();
 
             log.Complete();
@@ -234,5 +262,6 @@ private void AutoSelectBranchByRemote()
         private List<Models.Branch> _remoteBranches = [];
         private Models.Branch _selectedRemoteBranch = null;
         private bool _isSetTrackOptionVisible = false;
+        private bool _tracking = true;
     }
 }
diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml
index df1fe4d6e..08098f372 100644
--- a/src/Views/Pull.axaml
+++ b/src/Views/Pull.axaml
@@ -46,12 +46,12 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Pull.Branch}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
-                x:Name="RemoteBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
                 SelectedItem="{Binding SelectedBranch, Mode=TwoWay}"
                 IsTextSearchEnabled="True"
+                TextSearch.TextBinding="{Binding Name, DataType=m:Branch}"
                 IsEnabled="{Binding !HasSpecifiedRemoteBranch}">
         <ComboBox.ItemTemplate>
           <DataTemplate x:DataType="{x:Type m:Branch}">
diff --git a/src/Views/Pull.axaml.cs b/src/Views/Pull.axaml.cs
index c9b92c245..c6b4923ea 100644
--- a/src/Views/Pull.axaml.cs
+++ b/src/Views/Pull.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 
 namespace SourceGit.Views
 {
@@ -9,7 +7,6 @@ public partial class Pull : UserControl
         public Pull()
         {
             InitializeComponent();
-            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
         }
     }
 }
diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml
index ae015c888..2b79bab8d 100644
--- a/src/Views/Push.axaml
+++ b/src/Views/Push.axaml
@@ -18,12 +18,12 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.Local}"/>
       <ComboBox Grid.Row="0" Grid.Column="1"
-                x:Name="LocalBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding LocalBranches}"
                 SelectedItem="{Binding SelectedLocalBranch, Mode=TwoWay}"
                 IsTextSearchEnabled="True"
+                TextSearch.TextBinding="{Binding Name, DataType=m:Branch}"
                 IsEnabled="{Binding !HasSpecifiedLocalBranch}">
         <ComboBox.ItemTemplate>
           <DataTemplate x:DataType="{x:Type m:Branch}">
@@ -58,30 +58,40 @@
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Push.To}"/>
-      <ComboBox Grid.Row="2" Grid.Column="1"
-                x:Name="RemoteBranchesComboBox"
-                Height="28" Padding="8,0"
-                VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding RemoteBranches}"
-                IsTextSearchEnabled="True"
-                SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}">
-        <ComboBox.ItemTemplate>
-          <DataTemplate x:DataType="{x:Type m:Branch}">
-            <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
-              <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
-              <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
-              <Border Height="14"
-                      CornerRadius="7"
-                      Margin="4,0,0,0" Padding="6,0"
-                      VerticalAlignment="Center"
-                      Background="Green"
-                      IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
-                <TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
-              </Border>
-            </StackPanel>
-          </DataTemplate>
-        </ComboBox.ItemTemplate>
-      </ComboBox>
+      <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,Auto">
+        <ComboBox Grid.Column="0"
+                  Height="28" Padding="8,0"
+                  VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                  ItemsSource="{Binding RemoteBranches}"
+                  IsTextSearchEnabled="True"
+                  TextSearch.TextBinding="{Binding Name, DataType=m:Branch}"
+                  SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}">
+          <ComboBox.ItemTemplate>
+            <DataTemplate x:DataType="{x:Type m:Branch}">
+              <StackPanel Orientation="Horizontal" Height="20" VerticalAlignment="Center">
+                <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
+                <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
+                <Border Height="14"
+                        CornerRadius="7"
+                        Margin="4,0,0,0" Padding="6,0"
+                        VerticalAlignment="Center"
+                        Background="Green"
+                        IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
+                  <TextBlock Text="{DynamicResource Text.Push.New}" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>
+                </Border>
+              </StackPanel>
+            </DataTemplate>
+          </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <Button Grid.Column="1"
+                Classes="icon_button"
+                Width="26" Height="32"
+                Click="OnPushToNewBranch"
+                ToolTip.Tip="{DynamicResource Text.PushToNewBranch}">
+          <Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/>
+        </Button>
+      </Grid>
 
       <CheckBox Grid.Row="3" Grid.Column="1"
                 Height="32"
diff --git a/src/Views/Push.axaml.cs b/src/Views/Push.axaml.cs
index 98c620f70..fd7f6747f 100644
--- a/src/Views/Push.axaml.cs
+++ b/src/Views/Push.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
@@ -9,8 +9,23 @@ public partial class Push : UserControl
         public Push()
         {
             InitializeComponent();
-            TextSearch.SetTextBinding(LocalBranchesComboBox, new Binding("Name"));
-            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
+        }
+
+        private async void OnPushToNewBranch(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not ViewModels.Push push)
+                return;
+
+            var launcher = this.FindAncestorOfType<Launcher>();
+            if (launcher == null)
+                return;
+
+            var dialog = new PushToNewBranch();
+            dialog.SetRemote(push.SelectedRemote.Name);
+
+            var name = await dialog.ShowDialog<string>(launcher);
+            if (!string.IsNullOrEmpty(name))
+                push.PushToNewBranch(name);
         }
     }
 }
diff --git a/src/Views/PushToNewBranch.axaml b/src/Views/PushToNewBranch.axaml
new file mode 100644
index 000000000..c9ab3cdaf
--- /dev/null
+++ b/src/Views/PushToNewBranch.axaml
@@ -0,0 +1,66 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:v="using:SourceGit.Views"
+                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+                    x:Class="SourceGit.Views.PushToNewBranch"
+                    x:Name="ThisControl"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.PushToNewBranch}"
+                    SizeToContent="WidthAndHeight"
+                    CanResize="False"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,*">
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <Border Background="{DynamicResource Brush.TitleBar}"
+              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
+              PointerPressed="BeginMoveWindow"/>
+
+      <Path Width="14" Height="14"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Edit}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.PushToNewBranch}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <v:CaptionButtons HorizontalAlignment="Right"
+                        IsCloseButtonOnly="True"
+                        IsVisible="{OnPlatform True, macOS=False}"/>
+    </Grid>
+
+    <StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
+      <Border Margin="16,0">
+        <TextBlock Text="{DynamicResource Text.PushToNewBranch.Title}"/>
+      </Border>
+
+      <Grid ColumnDefinitions="Auto,*" Margin="16,8,16,0">
+        <TextBlock Grid.Column="0" x:Name="TxtPrefix" Text="REMOTE/" Margin="0,0,6,0"/>
+        <TextBox Grid.Column="1"
+                 x:Name="TxtName"
+                 MinWidth="300" Height="32"
+                 CornerRadius="3"
+                 Focusable="True"
+                 v:AutoFocusBehaviour.IsEnabled="True"/>
+      </Grid>
+
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
+        <Button Classes="flat primary"
+                Width="80"
+                Content="{DynamicResource Text.Sure}"
+                Click="OnSure"
+                HotKey="Enter"/>
+        <Button Classes="flat"
+                Width="80"
+                Margin="16,0,0,0"
+                Content="{DynamicResource Text.Cancel}"
+                Click="OnCancel"/>
+      </StackPanel>
+    </StackPanel>
+  </Grid>
+</v:ChromelessWindow>
diff --git a/src/Views/PushToNewBranch.axaml.cs b/src/Views/PushToNewBranch.axaml.cs
new file mode 100644
index 000000000..f292c6af2
--- /dev/null
+++ b/src/Views/PushToNewBranch.axaml.cs
@@ -0,0 +1,28 @@
+using Avalonia.Interactivity;
+
+namespace SourceGit.Views
+{
+    public partial class PushToNewBranch : ChromelessWindow
+    {
+        public PushToNewBranch()
+        {
+            CloseOnESC = true;
+            InitializeComponent();
+        }
+
+        public void SetRemote(string remote)
+        {
+            TxtPrefix.Text = remote + "/";
+        }
+
+        private void OnSure(object _1, RoutedEventArgs _2)
+        {
+            Close(TxtName.Text);
+        }
+
+        private void OnCancel(object _1, RoutedEventArgs _2)
+        {
+            Close(string.Empty);
+        }
+    }
+}
diff --git a/src/Views/SetUpstream.axaml b/src/Views/SetUpstream.axaml
index a2318d0bd..a7d9c4099 100644
--- a/src/Views/SetUpstream.axaml
+++ b/src/Views/SetUpstream.axaml
@@ -26,12 +26,12 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.SetUpstream.Upstream}"/>
       <ComboBox Grid.Row="1" Grid.Column="1"
-                x:Name="RemoteBranchesComboBox"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
                 ItemsSource="{Binding RemoteBranches}"
                 SelectedItem="{Binding SelectedRemoteBranch, Mode=TwoWay}"
                 IsTextSearchEnabled="True"
+                TextSearch.TextBinding="{Binding Name, DataType=m:Branch}"
                 IsEnabled="{Binding !Unset, Mode=OneWay}">
         <ComboBox.ItemTemplate>
           <DataTemplate x:DataType="{x:Type m:Branch}">
diff --git a/src/Views/SetUpstream.axaml.cs b/src/Views/SetUpstream.axaml.cs
index 2c766a7ce..e7b7f3568 100644
--- a/src/Views/SetUpstream.axaml.cs
+++ b/src/Views/SetUpstream.axaml.cs
@@ -1,6 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 
 namespace SourceGit.Views
 {
@@ -9,7 +7,6 @@ public partial class SetUpstream : UserControl
         public SetUpstream()
         {
             InitializeComponent();
-            TextSearch.SetTextBinding(RemoteBranchesComboBox, new Binding("Name"));
         }
     }
 }

From 6d13ba66d1532ec3ea56b512d33b6cdc1e107605 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:16:19 +0000
Subject: [PATCH 18/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index c6b04a581..d38bb5ce1 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.66%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.44%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -14,10 +14,12 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.66%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.44%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -25,10 +27,12 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.49%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.32%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -164,6 +168,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.RemoteCM.CustomAction
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
@@ -237,7 +243,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.10%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-98.88%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -250,10 +256,12 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.30%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-96.09%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -286,6 +294,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Preferences.General.ShowChangesPageByDefault
 - Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
 - Text.Preferences.General.UseGitHubStyleAvatar
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.ScanRepositories.UseCustomDir
 - Text.WorkingCopy.ClearCommitHistories
 - Text.WorkingCopy.ClearCommitHistories.Confirm
@@ -294,7 +304,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.49%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.32%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -431,6 +441,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.RemoteCM.CustomAction
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
@@ -503,7 +515,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-71.11%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.95%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -680,6 +692,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.RemoteCM.CustomAction
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
@@ -769,7 +783,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.66%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.44%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
@@ -777,10 +791,12 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.60%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.43%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -917,6 +933,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.RemoteCM.CustomAction
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
@@ -988,7 +1006,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.72%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.55%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1120,6 +1138,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Push.New
 - Text.Push.Revision
 - Text.Push.Revision.Title
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
 - Text.RemoteCM.CustomAction
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate

From 8a4a8be2a2ef115e45fb24d8853a52a65e7f515a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 17:49:59 +0800
Subject: [PATCH 19/72] ux: remove workspace switcher popup and its hotkey
 binding (#1855)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml    |   1 -
 src/ViewModels/Launcher.cs           |   5 --
 src/ViewModels/WorkspaceSwitcher.cs  |  80 --------------------
 src/Views/Hotkeys.axaml              |   5 +-
 src/Views/Launcher.axaml             |   6 +-
 src/Views/Launcher.axaml.cs          |   8 --
 src/Views/WorkspaceSwitcher.axaml    | 109 ---------------------------
 src/Views/WorkspaceSwitcher.axaml.cs |  62 ---------------
 8 files changed, 2 insertions(+), 274 deletions(-)
 delete mode 100644 src/ViewModels/WorkspaceSwitcher.cs
 delete mode 100644 src/Views/WorkspaceSwitcher.axaml
 delete mode 100644 src/Views/WorkspaceSwitcher.axaml.cs

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 6fbb2289c..c0c465aeb 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -467,7 +467,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Go to previous tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Create new tab</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Open Preferences dialog</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Switch active workspace</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Switch active tab</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit staged changes</x:String>
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 8b1352d0e..c1155e408 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -127,11 +127,6 @@ public void Quit()
             _ignoreIndexChange = false;
         }
 
-        public void OpenWorkspaceSwitcher()
-        {
-            Switcher = new WorkspaceSwitcher(this);
-        }
-
         public void OpenTabSwitcher()
         {
             Switcher = new LauncherPageSwitcher(this);
diff --git a/src/ViewModels/WorkspaceSwitcher.cs b/src/ViewModels/WorkspaceSwitcher.cs
deleted file mode 100644
index 7a2da9bee..000000000
--- a/src/ViewModels/WorkspaceSwitcher.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace SourceGit.ViewModels
-{
-    public class WorkspaceSwitcher : ObservableObject, IDisposable
-    {
-        public List<Workspace> VisibleWorkspaces
-        {
-            get => _visibleWorkspaces;
-            private set => SetProperty(ref _visibleWorkspaces, value);
-        }
-
-        public string SearchFilter
-        {
-            get => _searchFilter;
-            set
-            {
-                if (SetProperty(ref _searchFilter, value))
-                    UpdateVisibleWorkspaces();
-            }
-        }
-
-        public Workspace SelectedWorkspace
-        {
-            get => _selectedWorkspace;
-            set => SetProperty(ref _selectedWorkspace, value);
-        }
-
-        public WorkspaceSwitcher(Launcher launcher)
-        {
-            _launcher = launcher;
-            UpdateVisibleWorkspaces();
-        }
-
-        public void ClearFilter()
-        {
-            SearchFilter = string.Empty;
-        }
-
-        public void Switch()
-        {
-            _launcher.SwitchWorkspace(_selectedWorkspace);
-            _launcher.CancelSwitcher();
-        }
-
-        public void Dispose()
-        {
-            _visibleWorkspaces.Clear();
-            _selectedWorkspace = null;
-            _searchFilter = string.Empty;
-        }
-
-        private void UpdateVisibleWorkspaces()
-        {
-            var visible = new List<Workspace>();
-            if (string.IsNullOrEmpty(_searchFilter))
-            {
-                visible.AddRange(Preferences.Instance.Workspaces);
-            }
-            else
-            {
-                foreach (var workspace in Preferences.Instance.Workspaces)
-                {
-                    if (workspace.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase))
-                        visible.Add(workspace);
-                }
-            }
-
-            VisibleWorkspaces = visible;
-            SelectedWorkspace = visible.Count == 0 ? null : visible[0];
-        }
-
-        private Launcher _launcher = null;
-        private List<Workspace> _visibleWorkspaces = null;
-        private string _searchFilter = string.Empty;
-        private Workspace _selectedWorkspace = null;
-    }
-}
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index d11c77f52..cffb8adf1 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -45,7 +45,7 @@
                    FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
                    Margin="0,0,0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
+        <Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+\,, macOS=⌘+\,}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/>
 
@@ -67,9 +67,6 @@
           <TextBlock Grid.Row="6" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
           <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" />
 
-          <TextBlock Grid.Row="7" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/>
-          <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchWorkspace}" />
-
           <TextBlock Grid.Row="8" Grid.Column="0" Classes="bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/>
           <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchTab}" />
         </Grid>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 76f3073d9..cecf34a4d 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -118,7 +118,7 @@
       </ContentControl.DataTemplates>
     </ContentControl>
 
-    <!-- Workspace/Pages Switcher -->
+    <!-- Pages Switcher -->
     <Border Grid.Row="0" Grid.RowSpan="2"
             Background="Transparent"
             IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}"
@@ -127,10 +127,6 @@
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
           <ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">
             <ContentControl.DataTemplates>
-              <DataTemplate DataType="vm:WorkspaceSwitcher">
-                <v:WorkspaceSwitcher/>
-              </DataTemplate>
-
               <DataTemplate DataType="vm:LauncherPageSwitcher">
                 <v:LauncherPageSwitcher/>
               </DataTemplate>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 6240cc580..a712c24b0 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -174,13 +174,6 @@ protected override async void OnKeyDown(KeyEventArgs e)
 
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.P)
-                {
-                    vm.OpenWorkspaceSwitcher();
-                    e.Handled = true;
-                    return;
-                }
-
                 if (e.Key == Key.P)
                 {
                     vm.OpenTabSwitcher();
@@ -329,7 +322,6 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
 
                 var workspaces = new MenuItem();
                 workspaces.Header = groupHeader;
-                workspaces.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+P" : "Ctrl+Shift+P";
                 workspaces.IsEnabled = false;
                 menu.Items.Add(workspaces);
 
diff --git a/src/Views/WorkspaceSwitcher.axaml b/src/Views/WorkspaceSwitcher.axaml
deleted file mode 100644
index 7585edb3a..000000000
--- a/src/Views/WorkspaceSwitcher.axaml
+++ /dev/null
@@ -1,109 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.WorkspaceSwitcher"
-             x:DataType="vm:WorkspaceSwitcher">
-  <Grid RowDefinitions="Auto,Auto,Auto">
-    <TextBlock Grid.Row="0"
-               Text="{DynamicResource Text.Launcher.Workspaces}"
-               FontWeight="Bold"
-               HorizontalAlignment="Center"/>
-
-    <TextBox Grid.Row="1"
-             Height="24"
-             Margin="4,8,4,0"
-             BorderThickness="1"
-             CornerRadius="12"
-             Text="{Binding SearchFilter, Mode=TwoWay}"
-             KeyDown="OnSearchBoxKeyDown"
-             BorderBrush="{DynamicResource Brush.Border2}"
-             VerticalContentAlignment="Center"
-             v:AutoFocusBehaviour.IsEnabled="True">
-      <TextBox.InnerLeftContent>
-        <Path Width="14" Height="14"
-              Margin="6,0,0,0"
-              Fill="{DynamicResource Brush.FG2}"
-              Data="{StaticResource Icons.Search}"/>
-      </TextBox.InnerLeftContent>
-
-      <TextBox.InnerRightContent>
-        <Button Classes="icon_button"
-                Width="16"
-                Margin="0,0,6,0"
-                Command="{Binding ClearFilter}"
-                IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                HorizontalAlignment="Right">
-          <Path Width="14" Height="14"
-                Margin="0,1,0,0"
-                Fill="{DynamicResource Brush.FG1}"
-                Data="{StaticResource Icons.Clear}"/>
-        </Button>
-      </TextBox.InnerRightContent>
-    </TextBox>
-
-    <ListBox Grid.Row="2"
-             x:Name="WorkspaceListBox"
-             Width="300"
-             MaxHeight="400"
-             Margin="4,8,4,0"
-             BorderThickness="0"
-             SelectionMode="Single"
-             Background="Transparent"
-             Focusable="True"
-             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-             ScrollViewer.VerticalScrollBarVisibility="Auto"
-             ItemsSource="{Binding VisibleWorkspaces, Mode=OneWay}"
-             SelectedItem="{Binding SelectedWorkspace, Mode=TwoWay}">
-      <ListBox.Styles>
-        <Style Selector="ListBoxItem">
-          <Setter Property="Padding" Value="8,0"/>
-          <Setter Property="MinHeight" Value="26"/>
-          <Setter Property="CornerRadius" Value="4"/>
-        </Style>
-
-        <Style Selector="ListBox">
-          <Setter Property="FocusAdorner">
-            <FocusAdornerTemplate>
-              <Grid/>
-            </FocusAdornerTemplate>
-          </Setter>
-        </Style>
-      </ListBox.Styles>
-
-      <ListBox.ItemsPanel>
-        <ItemsPanelTemplate>
-          <StackPanel Orientation="Vertical"/>
-        </ItemsPanelTemplate>
-      </ListBox.ItemsPanel>
-
-      <ListBox.ItemTemplate>
-        <DataTemplate DataType="vm:Workspace">
-          <Grid ColumnDefinitions="Auto,*" Background="Transparent" Tapped="OnItemTapped">
-            <Path Grid.Column="0"
-                  Width="12" Height="12"
-                  Fill="{Binding Brush}"
-                  Data="{StaticResource Icons.Workspace}"
-                  IsVisible="{Binding !IsActive}"
-                  IsHitTestVisible="False"/>
-            <Path Grid.Column="0"
-                  Width="12" Height="12"
-                  Fill="{Binding Brush}"
-                  Data="{StaticResource Icons.Check}"
-                  IsVisible="{Binding IsActive}"
-                  IsHitTestVisible="False"/>
-            <TextBlock Grid.Column="1"
-                       Margin="8,0,0,0"
-                       VerticalAlignment="Center"
-                       Text="{Binding Name}"
-                       IsHitTestVisible="False"
-                       TextTrimming="CharacterEllipsis"/>
-          </Grid>
-        </DataTemplate>
-      </ListBox.ItemTemplate>
-    </ListBox>
-  </Grid>
-</UserControl>
diff --git a/src/Views/WorkspaceSwitcher.axaml.cs b/src/Views/WorkspaceSwitcher.axaml.cs
deleted file mode 100644
index 7b708dd91..000000000
--- a/src/Views/WorkspaceSwitcher.axaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace SourceGit.Views
-{
-    public partial class WorkspaceSwitcher : UserControl
-    {
-        public WorkspaceSwitcher()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-
-            if (e.Key == Key.Enter && DataContext is ViewModels.WorkspaceSwitcher switcher)
-            {
-                switcher.Switch();
-                e.Handled = true;
-            }
-        }
-
-        private void OnItemTapped(object sender, TappedEventArgs e)
-        {
-            if (DataContext is ViewModels.WorkspaceSwitcher switcher)
-            {
-                switcher.Switch();
-                e.Handled = true;
-            }
-        }
-
-        private void OnSearchBoxKeyDown(object sender, KeyEventArgs e)
-        {
-            if (WorkspaceListBox.ItemCount == 0)
-                return;
-
-            if (e.Key == Key.Down)
-            {
-                WorkspaceListBox.Focus(NavigationMethod.Directional);
-
-                if (WorkspaceListBox.SelectedIndex < WorkspaceListBox.ItemCount - 1)
-                    WorkspaceListBox.SelectedIndex++;
-                else
-                    WorkspaceListBox.SelectedIndex = 0;
-
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Up)
-            {
-                WorkspaceListBox.Focus(NavigationMethod.Directional);
-
-                if (WorkspaceListBox.SelectedIndex > 0)
-                    WorkspaceListBox.SelectedIndex--;
-                else
-                    WorkspaceListBox.SelectedIndex = WorkspaceListBox.ItemCount - 1;
-
-                e.Handled = true;
-            }
-        }
-    }
-}

From 91d769cfe2a1768aa528c5cc22ed911ff55828c5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 09:50:30 +0000
Subject: [PATCH 20/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 15 +++++----------
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/id_ID.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 8 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index d38bb5ce1..596b406a9 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -32,7 +32,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.32%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.40%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -146,7 +146,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.GitFlow.FinishWithPush
 - Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
@@ -304,7 +303,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.32%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.40%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -419,7 +418,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.GitFlow.FinishWithPush
 - Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
@@ -515,7 +513,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-70.95%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-71.03%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -655,7 +653,6 @@ This document shows the translation status of each locale file in the repository
 - Text.GitFlow.FinishWithPush
 - Text.GitFlow.FinishWithSquash
 - Text.Hotkeys.Global.Clone
-- Text.Hotkeys.Global.SwitchWorkspace
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InProgress.CherryPick.Head
@@ -796,7 +793,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.43%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.52%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -911,7 +908,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.GitFlow.FinishWithPush
 - Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
@@ -1006,7 +1002,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.55%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.64%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1116,7 +1112,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.GitFlow.FinishWithPush
 - Text.GitFlow.FinishWithSquash
-- Text.Hotkeys.Global.SwitchWorkspace
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index a5f25ec49..c770bdcf5 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -462,7 +462,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Zum vorherigen Tab wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Neuen Tab erstellen</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Einstellungen öffnen</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Aktiven Arbeitsplatz wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Aktiven Tab wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Gestagte Änderungen committen</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 5a47584bb..76c6748ea 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -461,7 +461,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ir a la página anterior</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Crear nueva página</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Abrir diálogo de preferencias</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Cambiar espacio de trabajo activo</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Cambiar página activa</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORIO</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit cambios staged</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 4a784d948..19601f7c7 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -456,7 +456,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Ke tab sebelumnya</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Buat tab baru</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Buka dialog Preferensi</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Ganti workspace aktif</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Ganti tab aktif</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORI</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Commit perubahan yang di-stage</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index b95b3d33d..f726f5984 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -442,7 +442,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Vai alla pagina precedente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Crea una nuova pagina</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Apri la finestra delle preferenze</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Cambia workspace attivo</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Cambia scheda attiva</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Committa le modifiche in tsage</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 3a0d458a8..d73d336dc 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -461,7 +461,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Перейти на предыдущую вкладку</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Создать новую вкладку</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Открыть диалоговое окно настроек</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">Переключиться на рабочее место</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Переключиться на вкладку</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">РЕПОЗИТОРИЙ</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Зафиксировать сформированные изменения</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index f511682f4..94a2d5da8 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -471,7 +471,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">切换到上一个页面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">新建页面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">打开偏好设置面板</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">切换工作区</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">切换显示页面</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">仓库页面快捷键</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">提交暂存区更改</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 46d2ee76e..9aa98f5c5 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -471,7 +471,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">切換到上一個頁面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">新增頁面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">開啟偏好設定面板</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">切換工作區</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">切換目前頁面</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">存放庫頁面快速鍵</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">提交暫存區變更</x:String>

From 9193e17ed6f9c4087140b28fa25dfb34950b23cd Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 18:02:05 +0800
Subject: [PATCH 21/72] refactor: use `git-bash.exe` instead of `bin/bash.exe`
 to make sure bash-profiles work (#1856)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/Windows.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index aa1b42c86..8439d702a 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -144,7 +144,7 @@ public string FindTerminal(Models.ShellOrTerminal shell)
                         break;
 
                     var binDir = Path.GetDirectoryName(OS.GitExecutable)!;
-                    var bash = Path.Combine(binDir, "bash.exe");
+                    var bash = Path.GetFullPath(Path.Combine(binDir, "..", "git-bash.exe"));
                     if (!File.Exists(bash))
                         break;
 

From 8846bfe4a7fe4b08b62b1f6be7f027dc44e652f9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 18:08:58 +0800
Subject: [PATCH 22/72] enhance: temp ignore `Ctrl+Shift+P`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index a712c24b0..b1a3a8b00 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -174,6 +174,12 @@ protected override async void OnKeyDown(KeyEventArgs e)
 
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
+                if (e.Key == Key.P && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
+                {
+                    // TODO: Command Palette
+                    return;
+                }
+
                 if (e.Key == Key.P)
                 {
                     vm.OpenTabSwitcher();

From 0b4be6e22630df98d56674a774ec17bea76203f1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 17 Oct 2025 10:42:23 +0800
Subject: [PATCH 23/72] refactor: global hotkeys

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml       |  9 +++++--
 src/Views/Launcher.axaml.cs    | 47 ++++++++++------------------------
 src/Views/LauncherTabBar.axaml |  2 +-
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index cecf34a4d..c45947b80 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -72,11 +72,16 @@
       </Button>
 
       <!-- Workspace Dropdown Menu -->
-      <Button Grid.Column="1" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Click="OnOpenWorkspaceMenu">
+      <Button Grid.Column="1" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Click="OnOpenWorkspaceMenu" HotKey="{OnPlatform Ctrl+Alt+P, macOS=⌘+Alt+P}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal">
             <TextBlock Text="{DynamicResource Text.Workspace}" FontWeight="Bold" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
             <TextBlock Text="{Binding ActiveWorkspace.Name}"/>
+            <TextBlock Margin="16,0,0,0"
+                       Text="{OnPlatform Ctrl+Alt+P, macOS=⌘+Alt+P}"
+                       FontSize="11"
+                       Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
+                       VerticalAlignment="Center"/>
           </StackPanel>
         </ToolTip.Tip>
         <Path Width="14" Height="14"
@@ -85,7 +90,7 @@
       </Button>
 
       <!-- Pages Switcher Toggle Button -->
-      <Button Grid.Column="2" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Command="{Binding OpenTabSwitcher}">
+      <Button Grid.Column="2" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Command="{Binding OpenTabSwitcher}" HotKey="{OnPlatform Ctrl+P, macOS=⌘+P}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal">
             <TextBlock Text="{DynamicResource Text.Launcher.Pages}"
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index b1a3a8b00..a8329dd01 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -150,53 +150,34 @@ protected override async void OnKeyDown(KeyEventArgs e)
                 return;
             }
 
-            // Ctrl+, opens preference dialog (macOS use hotkeys in system menu bar)
-            if (!OperatingSystem.IsMacOS() && e is { KeyModifiers: KeyModifiers.Control, Key: Key.OemComma })
+            // Register hotkeys for Windows/Linux (macOS has registered these keys in system menu bar)
+            if (!OperatingSystem.IsMacOS())
             {
-                await App.ShowDialog(new Preferences());
-                e.Handled = true;
-                return;
-            }
-
-            // F1 opens preference dialog (macOS use hotkeys in system menu bar)
-            if (!OperatingSystem.IsMacOS() && e.Key == Key.F1)
-            {
-                await App.ShowDialog(new Hotkeys());
-                return;
-            }
-
-            // Ctrl+Q quits the application (macOS use hotkeys in system menu bar)
-            if (!OperatingSystem.IsMacOS() && e is { KeyModifiers: KeyModifiers.Control, Key: Key.Q })
-            {
-                App.Quit(0);
-                return;
-            }
-
-            if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
-            {
-                if (e.Key == Key.P && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
+                if (e is { KeyModifiers: KeyModifiers.Control, Key: Key.OemComma })
                 {
-                    // TODO: Command Palette
+                    await App.ShowDialog(new Preferences());
+                    e.Handled = true;
                     return;
                 }
 
-                if (e.Key == Key.P)
+                if (e is { KeyModifiers: KeyModifiers.None, Key: Key.F1 })
                 {
-                    vm.OpenTabSwitcher();
-                    e.Handled = true;
+                    await App.ShowDialog(new Hotkeys());
                     return;
                 }
 
-                if (e.Key == Key.W)
+                if (e is { KeyModifiers: KeyModifiers.Control, Key: Key.Q })
                 {
-                    vm.CloseTab(null);
-                    e.Handled = true;
+                    App.Quit(0);
                     return;
                 }
+            }
 
-                if (e.Key == Key.T && !e.KeyModifiers.HasFlag(KeyModifiers.Shift))
+            if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
+            {
+                if (e.Key == Key.W)
                 {
-                    vm.AddNewTab();
+                    vm.CloseTab(null);
                     e.Handled = true;
                     return;
                 }
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index b14254e65..680381a65 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -152,7 +152,7 @@
         <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
       </RepeatButton>
 
-      <Button Classes="icon_button" Width="16" Height="16" Margin="4,0,0,0" Command="{Binding AddNewTab}">
+      <Button Classes="icon_button" Width="16" Height="16" Margin="4,0,0,0" Command="{Binding AddNewTab}" HotKey="{OnPlatform Ctrl+T, macOS=⌘+T}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
             <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>

From 85ca6b0178680309b62d60a32975af5378b6d2db Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 17 Oct 2025 10:48:53 +0800
Subject: [PATCH 24/72] ux: main tab bar button alignment

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/LauncherTabBar.axaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 680381a65..c82656edc 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -13,7 +13,8 @@
   <Grid ColumnDefinitions="Auto,*,Auto">
     <RepeatButton Grid.Column="0"
                   Classes="icon_button"
-                  Width="18" Height="30"
+                  Width="18" Height="28"
+                  Margin="0,2,0,0"
                   Click="ScrollTabsLeft"
                   IsVisible="{Binding #ThisControl.IsScrollerVisible}">
       <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleLeft}"/>
@@ -148,11 +149,11 @@
     </ScrollViewer>
 
     <StackPanel Grid.Column="2" Orientation="Horizontal" IsVisible="{Binding #ThisControl.IsScrollerVisible}">
-      <RepeatButton Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
+      <RepeatButton Classes="icon_button" Width="18" Height="28" Margin="0,2,0,0" Click="ScrollTabsRight">
         <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
       </RepeatButton>
 
-      <Button Classes="icon_button" Width="16" Height="16" Margin="4,0,0,0" Command="{Binding AddNewTab}" HotKey="{OnPlatform Ctrl+T, macOS=⌘+T}">
+      <Button Classes="icon_button" Width="16" Height="28" Margin="4,2,0,0" Command="{Binding AddNewTab}" HotKey="{OnPlatform Ctrl+T, macOS=⌘+T}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
             <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>

From 38552a187c11d236e1bfc218a511c79f266c7cf3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 17 Oct 2025 11:10:27 +0800
Subject: [PATCH 25/72] feature: supports to copy multiple commits message
 (#1857)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Histories.cs  |  7 ++++---
 src/Views/Histories.axaml.cs | 21 ++++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 3ad355966..e60d4881a 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -358,10 +358,11 @@ public async Task InteractiveRebaseAsync(Models.Commit commit, Models.Interactiv
                 await App.ShowDialog(new InteractiveRebase(_repo, on, prefill));
         }
 
-        public async Task CopyCommitFullMessageAsync(Models.Commit commit)
+        public async Task<string> GetCommitFullMessageAsync(Models.Commit commit)
         {
-            var message = await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA).GetResultAsync();
-            await App.CopyTextAsync(message);
+            return await new Commands.QueryCommitFullMessage(_repo.FullPath, commit.SHA)
+                .GetResultAsync()
+                .ConfigureAwait(false);
         }
 
         public async Task<Models.Commit> CompareWithHeadAsync(Models.Commit commit)
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index b0cef55d7..dbd45bad4 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -438,11 +438,29 @@ private ContextMenu CreateContextMenuForMultipleCommits(ViewModels.Repository re
                 e.Handled = true;
             };
 
+            var copyMessage = new MenuItem();
+            copyMessage.Header = App.Text("CommitCM.CopyCommitMessage");
+            copyMessage.Icon = App.CreateMenuIcon("Icons.Info");
+            copyMessage.Click += async (_, e) =>
+            {
+                var vm = DataContext as ViewModels.Histories;
+                var messages = new List<string>();
+                foreach (var c in selected)
+                {
+                    var message = await vm.GetCommitFullMessageAsync(c);
+                    messages.Add(message);
+                }
+
+                await App.CopyTextAsync(string.Join("\n-----\n", messages));
+                e.Handled = true;
+            };
+
             var copy = new MenuItem();
             copy.Header = App.Text("Copy");
             copy.Icon = App.CreateMenuIcon("Icons.Copy");
             copy.Items.Add(copyShas);
             copy.Items.Add(copyInfos);
+            copy.Items.Add(copyMessage);
             menu.Items.Add(copy);
             return menu;
         }
@@ -871,7 +889,8 @@ private ContextMenu CreateContextMenuForSingleCommit(ViewModels.Repository repo,
             copyMessage.Icon = App.CreateMenuIcon("Icons.Info");
             copyMessage.Click += async (_, e) =>
             {
-                await vm.CopyCommitFullMessageAsync(commit);
+                var message = await vm.GetCommitFullMessageAsync(commit);
+                await App.CopyTextAsync(message);
                 e.Handled = true;
             };
 

From e51824b387c69cc6fcdda0f9776d324127bfdf3c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 17 Oct 2025 11:55:14 +0800
Subject: [PATCH 26/72] refactor: use `--json` while querying LFS locks instead
 of parse line-by-line with regex (#1858)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.JsonCodeGen.cs     |  1 +
 src/Commands/LFS.cs        | 35 ++++++++++++-----------------------
 src/Models/LFSLock.cs      | 21 +++++++++++++++++----
 src/ViewModels/LFSLocks.cs |  4 ++--
 src/Views/LFSLocks.axaml   |  4 ++--
 5 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
index d60b76515..8535f980d 100644
--- a/src/App.JsonCodeGen.cs
+++ b/src/App.JsonCodeGen.cs
@@ -65,6 +65,7 @@ public override void Write(Utf8JsonWriter writer, DataGridLength value, JsonSeri
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
     [JsonSerializable(typeof(Models.RepositorySettings))]
+    [JsonSerializable(typeof(List<Models.LFSLock>))]
     [JsonSerializable(typeof(List<Models.VisualStudioInstance>))]
     [JsonSerializable(typeof(ViewModels.Preferences))]
     internal partial class JsonCodeGen : JsonSerializerContext { }
diff --git a/src/Commands/LFS.cs b/src/Commands/LFS.cs
index 001002d1d..8c0fd5051 100644
--- a/src/Commands/LFS.cs
+++ b/src/Commands/LFS.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
+using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
-    public partial class LFS : Command
+    public class LFS : Command
     {
-        [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
-        private static partial Regex REG_LOCK();
-
         public LFS(string repo)
         {
             WorkingDirectory = repo;
@@ -60,30 +56,23 @@ public async Task PruneAsync()
 
         public async Task<List<Models.LFSLock>> GetLocksAsync(string remote)
         {
-            Args = $"lfs locks --remote={remote}";
+            Args = $"lfs locks --json --remote={remote}";
 
             var rs = await ReadToEndAsync().ConfigureAwait(false);
-            var locks = new List<Models.LFSLock>();
-
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-                foreach (var line in lines)
+                try
+                {
+                    var locks = JsonSerializer.Deserialize(rs.StdOut, JsonCodeGen.Default.ListLFSLock);
+                    return locks;
+                }
+                catch
                 {
-                    var match = REG_LOCK().Match(line);
-                    if (match.Success)
-                    {
-                        locks.Add(new Models.LFSLock()
-                        {
-                            File = match.Groups[1].Value,
-                            User = match.Groups[2].Value,
-                            ID = long.Parse(match.Groups[3].Value),
-                        });
-                    }
+                    // Ignore exceptions.
                 }
             }
 
-            return locks;
+            return [];
         }
 
         public async Task<bool> LockAsync(string remote, string file)
diff --git a/src/Models/LFSLock.cs b/src/Models/LFSLock.cs
index 0a328cfb2..8d9a4acff 100644
--- a/src/Models/LFSLock.cs
+++ b/src/Models/LFSLock.cs
@@ -1,9 +1,22 @@
-namespace SourceGit.Models
+using System.Text.Json.Serialization;
+
+namespace SourceGit.Models
 {
+    public class LFSLockOwner
+    {
+        [JsonPropertyName("name")]
+        public string Name { get; set; } = string.Empty;
+    }
+
     public class LFSLock
     {
-        public string File { get; set; } = string.Empty;
-        public string User { get; set; } = string.Empty;
-        public long ID { get; set; } = 0;
+        [JsonPropertyName("id")]
+        public string ID { get; set; } = string.Empty;
+
+        [JsonPropertyName("path")]
+        public string Path { get; set; } = string.Empty;
+
+        [JsonPropertyName("owner")]
+        public LFSLockOwner Owner { get; set; } = null;
     }
 }
diff --git a/src/ViewModels/LFSLocks.cs b/src/ViewModels/LFSLocks.cs
index 33fcd939f..9e937086c 100644
--- a/src/ViewModels/LFSLocks.cs
+++ b/src/ViewModels/LFSLocks.cs
@@ -62,7 +62,7 @@ public async Task UnlockAsync(Models.LFSLock lfsLock, bool force)
 
             IsLoading = true;
 
-            var succ = await _repo.UnlockLFSFileAsync(_remote, lfsLock.File, force, false);
+            var succ = await _repo.UnlockLFSFileAsync(_remote, lfsLock.Path, force, false);
             if (succ)
             {
                 _cachedLocks.Remove(lfsLock);
@@ -84,7 +84,7 @@ private void UpdateVisibleLocks()
             {
                 foreach (var lfsLock in _cachedLocks)
                 {
-                    if (lfsLock.User.Equals(_userName, StringComparison.Ordinal))
+                    if (lfsLock.Owner.Name.Equals(_userName, StringComparison.Ordinal))
                         visible.Add(lfsLock);
                 }
             }
diff --git a/src/Views/LFSLocks.axaml b/src/Views/LFSLocks.axaml
index 0b455be0e..e05572f76 100644
--- a/src/Views/LFSLocks.axaml
+++ b/src/Views/LFSLocks.axaml
@@ -80,10 +80,10 @@
             <Grid ColumnDefinitions="26,*,100,32,32">
               <Path Grid.Column="0" Width="14" Height="14" Margin="8,0,4,0" Data="{StaticResource Icons.File}"/>
               <Border Grid.Column="1" Margin="4,0" ClipToBounds="True">
-                <TextBlock Text="{Binding File}" HorizontalAlignment="Left"/>
+                <TextBlock Text="{Binding Path}" HorizontalAlignment="Left"/>
               </Border>
               <Border Grid.Column="2" Margin="8,0" ClipToBounds="True">
-                <TextBlock Text="{Binding User}" HorizontalAlignment="Left"/>
+                <TextBlock Text="{Binding Owner.Name}" HorizontalAlignment="Left"/>
               </Border>
               <Button Grid.Column="3" Classes="icon_button" Click="OnUnlockButtonClicked" ToolTip.Tip="{DynamicResource Text.GitLFS.Locks.Unlock}">
                 <Path Width="14" Height="14" Data="{StaticResource Icons.Unlock}"/>

From 3ed6e5507daf9415638befd4af3bdbe8f2a0f301 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 17 Oct 2025 17:53:02 +0800
Subject: [PATCH 27/72] enhance: ignore invalid font family names

Signed-off-by: leo <longshuang@msn.cn>
---
 src/App.axaml.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 11219cec0..089d8da8b 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -285,7 +285,7 @@ public static void SetFonts(string defaultFont, string monospaceFont)
                 if (!string.IsNullOrEmpty(defaultFont))
                 {
                     monospaceFont = $"fonts:SourceGit#JetBrains Mono,{defaultFont}";
-                    resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont));
+                    resDic.Add("Fonts.Monospace", FontFamily.Parse(monospaceFont));
                 }
             }
             else
@@ -293,7 +293,7 @@ public static void SetFonts(string defaultFont, string monospaceFont)
                 if (!string.IsNullOrEmpty(defaultFont) && !monospaceFont.Contains(defaultFont, StringComparison.Ordinal))
                     monospaceFont = $"{monospaceFont},{defaultFont}";
 
-                resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont));
+                resDic.Add("Fonts.Monospace", FontFamily.Parse(monospaceFont));
             }
 
             if (resDic.Count > 0)
@@ -663,9 +663,8 @@ private string FixFontFamilyName(string input)
                 if (string.IsNullOrEmpty(t))
                     continue;
 
-                // Collapse multiple spaces into single space
-                var prevChar = '\0';
                 var sb = new StringBuilder();
+                var prevChar = '\0';
 
                 foreach (var c in t)
                 {
@@ -676,14 +675,16 @@ private string FixFontFamilyName(string input)
                 }
 
                 var name = sb.ToString();
-                if (name.Contains('#'))
+                try
                 {
-                    if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
-                        !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))
-                        continue;
+                    var fontFamily = FontFamily.Parse(name);
+                    if (fontFamily.FamilyTypefaces.Count > 0)
+                        trimmed.Add(name);
+                }
+                catch
+                {
+                    // Ignore exceptions.
                 }
-
-                trimmed.Add(name);
             }
 
             return trimmed.Count > 0 ? string.Join(',', trimmed) : string.Empty;

From b6ca639b296b7454feb1efca795011a1a46cefde Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Mon, 20 Oct 2025 05:41:48 +0300
Subject: [PATCH 28/72] localization: update Russian translation (#1862)

---
 src/Resources/Locales/ru_RU.axaml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index d73d336dc..9d0eb5b1b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -61,6 +61,8 @@
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Сравнить с ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Сравнить с рабочим каталогом</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Копировать имя ветки</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">Создать PR...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">Создать PR для основной ветки ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Изменить действие</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Удалить ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Удалить выбранные {0} ветки</x:String>
@@ -186,11 +188,19 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Введите тему ревизии</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Настройка репозитория</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">ШАБЛОН РЕВИЗИИ</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Параметры сборки: 
+  
+  ${branch_name} Имя текущей локальной ветки
+  ${files_num} Количество изменённых файлов
+  ${files} Пути изменённых файлов
+  ${files:N} Максимальное количество N путей изменённых файлов
+  ${pure_files} Похожие ${files}, но только чистые имена файлов
+  ${pure_files:N} Похожие ${files:N}, но без каталогов</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Cодержание:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Название:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Аргументы:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Built-in parameters: 
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Параметры сборки: 
   
   ${REPO} Путь репозитория
   ${REMOTE} Выбранная удаённая ветка
@@ -637,6 +647,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Выложить на все внешние репозитории</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">Метка:</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">Отправить к НОВОЙ ветке</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">Введитте имя для новой удалённой ветки:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Выйти</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">Перемещение текущей ветки</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Отложить и применить повторно локальные изменения</x:String>

From c40e23d191558c80d49d55bbf58f315a77892e21 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 02:42:09 +0000
Subject: [PATCH 29/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 596b406a9..dff27b046 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -780,18 +780,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.44%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.BranchCM.CreatePR
-- Text.BranchCM.CreatePRForUpstream
-- Text.Configure.CommitMessageTemplate.BuiltinVars
-- Text.PushToNewBranch
-- Text.PushToNewBranch.Title
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-77.52%25-yellow)
 

From 56a332f64ae3f5913e3ad8b7c1773ee9af65967a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 20 Oct 2025 11:56:51 +0800
Subject: [PATCH 30/72] feature: supports to goto previous revision (not in
 undo/redo history, but the file itself) in `Blame` view (#1686)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml         |  1 +
 src/Resources/Locales/de_DE.axaml |  2 +-
 src/Resources/Locales/en_US.axaml |  3 +-
 src/Resources/Locales/es_ES.axaml |  2 +-
 src/Resources/Locales/fr_FR.axaml |  2 +-
 src/Resources/Locales/id_ID.axaml |  2 +-
 src/Resources/Locales/it_IT.axaml |  2 +-
 src/Resources/Locales/ja_JP.axaml |  2 +-
 src/Resources/Locales/pt_BR.axaml |  2 +-
 src/Resources/Locales/ru_RU.axaml |  2 +-
 src/Resources/Locales/ta_IN.axaml |  2 +-
 src/Resources/Locales/uk_UA.axaml |  2 +-
 src/Resources/Locales/zh_CN.axaml |  3 +-
 src/Resources/Locales/zh_TW.axaml |  3 +-
 src/ViewModels/Blame.cs           | 57 +++++++++++++++++++------------
 src/Views/Blame.axaml             | 13 +++++--
 16 files changed, 64 insertions(+), 36 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 3103e68f7..ea1530a5a 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -59,6 +59,7 @@
   <StreamGeometry x:Key="Icons.GitFlow.Release">M884 159l-18-18a43 43 0 00-38-12l-235 43a166 166 0 00-101 60L400 349a128 128 0 00-148 47l-120 171a21 21 0 005 29l17 12a128 128 0 00178-32l27-38 124 124-38 27a128 128 0 00-32 178l12 17a21 21 0 0029 5l171-120a128 128 0 0047-148l117-92A166 166 0 00853 431l43-235a43 43 0 00-12-38zm-177 249a64 64 0 110-90 64 64 0 010 90zm-373 312a21 21 0 010 30l-139 139a21 21 0 01-30 0l-30-30a21 21 0 010-30l139-139a21 21 0 0130 0z</StreamGeometry>
   <StreamGeometry x:Key="Icons.GitHub">M525 0C235 0 0 235 0 525c0 232 150 429 359 498 26 5 36-11 36-25 0-12-1-54-1-97-146 31-176-63-176-63-23-61-58-76-58-76-48-32 3-32 3-32 53 3 81 54 81 54 47 80 123 57 153 43 4-34 18-57 33-70-116-12-239-57-239-259 0-57 21-104 54-141-5-13-23-67 5-139 0 0 44-14 144 54 42-11 87-17 131-17s90 6 131 17C756 203 801 217 801 217c29 72 10 126 5 139 34 37 54 83 54 141 0 202-123 246-240 259 19 17 36 48 36 97 0 70-1 127-1 144 0 14 10 30 36 25 209-70 359-266 359-498C1050 235 814 0 525 0z</StreamGeometry>
   <StreamGeometry x:Key="Icons.GitIgnore">M590 74 859 342V876c0 38-31 68-68 68H233c-38 0-68-31-68-68V142c0-38 31-68 68-68h357zm-12 28H233a40 40 0 00-40 38L193 142v734a40 40 0 0038 40L233 916h558a40 40 0 0040-38L831 876V354L578 102zM855 371h-215c-46 0-83-36-84-82l0-2V74h28v213c0 30 24 54 54 55l2 0h215v28zM57 489m28 0 853 0q28 0 28 28l0 284q0 28-28 28l-853 0q-28 0-28-28l0-284q0-28 28-28ZM157 717c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C184 610 172 603 156 603c-29 0-54 21-54 57 0 37 24 56 54 56zM245 711v-108h-34v108h34zm69 0v-86H341V603H262v22h28V711h24zM393 711v-108h-34v108h34zm66 6c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C485 610 474 603 458 603c-29 0-54 21-54 57 0 37 24 56 54 56zm88-6v-36c0-13-2-28-3-40h1l10 24 25 52H603v-108h-23v36c0 13 2 28 3 40h-1l-10-24L548 603H523v108h23zM677 717c30 0 51-22 51-57 0-36-21-56-51-56-30 0-51 20-51 56 0 36 21 57 51 57zm3-23c-16 0-26-12-26-32 0-19 10-31 26-31 16 0 26 11 26 31S696 694 680 694zm93 17v-38h13l21 38H836l-25-43c12-5 19-15 19-31 0-26-20-34-44-34H745v108h27zm16-51H774v-34h15c16 0 25 4 25 16s-9 18-25 18zM922 711v-22h-43v-23h35v-22h-35V625h41V603H853v108h68z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.GotoParent">M727 641c-78 0-142 55-157 128H256V320h251c16 108 108 192 221 192 124 0 224-100 224-224S851 64 727 64c-113 0-205 84-221 192H96c-18 0-32 14-32 32s14 32 32 32h96v482c0 18 14 32 32 32h347c15 73 79 128 157 128 88 0 160-72 160-160s-72-160-160-160zm0 256c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Grid">M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Hash">M566 585l37-146-145 0-37 146 145 0zM1005 297l-32 128q-4 14-18 14l-187 0-37 146 178 0q9 0 14 7 6 8 3 16l-32 128q-3 14-18 14l-187 0-46 187q-4 14-18 14l-128 0q-9 0-15-7-5-7-3-16l45-178-145 0-46 187q-4 14-18 14l-129 0q-9 0-14-7-5-7-3-16l45-178-178 0q-9 0-14-7-5-7-3-16l32-128q4-14 18-14l187 0 37-146-178 0q-9 0-14-7-6-8-3-16l32-128q3-14 18-14l187 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 145 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 178 0q9 0 14 7 5 7 3 16z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Head">M0 512M1024 512M512 0M512 1024M955 323q0 23-16 39l-414 414-78 78q-16 16-39 16t-39-16l-78-78-207-207q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 169 375-375q16-16 39-16t39 16l78 78q16 16 16 39z</StreamGeometry>
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index c770bdcf5..0eb6a90fc 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -56,7 +56,7 @@
   <x:String x:Key="Text.Bisect.Skip">Überspringen</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Bisecting. Aktuellen Commit als gut oder schlecht markieren und einen anderen auschecken.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Auschecken von ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Mit ${0}$ vergleichen</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Mit Worktree vergleichen</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index c0c465aeb..1b978bc56 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -52,7 +52,8 @@
   <x:String x:Key="Text.Bisect.Skip">Skip</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Bisecting. Mark current commit as good or bad and checkout another one.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME ON THIS FILE IS NOT SUPPORTED!!!</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">Blame on Previous Revision</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAME ON THIS FILE IS NOT SUPPORTED!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Compare with ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Compare with Worktree</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 76c6748ea..16131682a 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -56,7 +56,7 @@
   <x:String x:Key="Text.Bisect.Skip">Saltar</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Bisecting. Marcar el commit actual como bueno o malo y revisar otro.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">¡BLAME EN ESTE ARCHIVO NO SOPORTADO!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">¡BLAME EN ESTE ARCHIVO NO SOPORTADO!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparar con ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 2052f93ac..ceebf7363 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -41,7 +41,7 @@
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Rafraîchir</x:String>
   <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">FICHIER BINAIRE NON SUPPORTÉ !!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blâme</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">LE BLÂME SUR CE FICHIER N'EST PAS SUPPORTÉ!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">LE BLÂME SUR CE FICHIER N'EST PAS SUPPORTÉ!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Récupérer ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparer avec ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparer avec le worktree</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 19601f7c7..1e8a6c697 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -55,7 +55,7 @@
   <x:String x:Key="Text.Bisect.Skip">Lewati</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Bisect berjalan. Tandai commit saat ini sebagai baik atau buruk dan checkout yang lain.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME PADA BERKAS INI TIDAK DIDUKUNG!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAME PADA BERKAS INI TIDAK DIDUKUNG!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Bandingkan dengan ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Bandingkan dengan Worktree</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index f726f5984..3ddab9feb 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -55,7 +55,7 @@
   <x:String x:Key="Text.Bisect.Skip" xml:space="preserve">Salta</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange" xml:space="preserve">Bisecando. Marca il commit corrente come buono o cattivo e fai checkout di un altro.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Attribuisci</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">L'ATTRIBUZIONE SU QUESTO FILE NON È SUPPORTATA!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">L'ATTRIBUZIONE SU QUESTO FILE NON È SUPPORTATA!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Confronta con ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Confronta con Worktree</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 958ceb9f9..6d7723083 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -41,7 +41,7 @@
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">更新</x:String>
   <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">バイナリファイルはサポートされていません!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAMEではこのファイルはサポートされていません!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAMEではこのファイルはサポートされていません!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ をチェックアウトする...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">ワークツリーと比較</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">ブランチ名をコピー</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 24569a93f..04ececee5 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -35,7 +35,7 @@
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Atualizar</x:String>
   <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">ARQUIVO BINÁRIO NÃO SUPORTADO!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">BLAME NESTE ARQUIVO NÃO É SUPORTADO!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAME NESTE ARQUIVO NÃO É SUPORTADO!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Checkout ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparar com ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar com Worktree</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 9d0eb5b1b..56db54577 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -56,7 +56,7 @@
   <x:String x:Key="Text.Bisect.Skip">Пропустить</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Раздвоение. Сделать текущую ревизию хорошей или плохой и переключиться на другой.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Расследование</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Переключиться на ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Сравнить с ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Сравнить с рабочим каталогом</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index e98dfc058..8c1029345 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -41,7 +41,7 @@
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">புதுப்பி</x:String>
   <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">இருமம் கோப்பு ஆதரிக்கப்படவில்லை!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">குற்றச்சாட்டு</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">இந்த கோப்பில் குற்றம் சாட்ட ஆதரிக்கப்படவில்லை!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">இந்த கோப்பில் குற்றம் சாட்ட ஆதரிக்கப்படவில்லை!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ சரிபார்...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">பணிமரத்துடன் ஒப்பிடுக</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">கிளை பெயரை நகலெடு</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index 6b91933e1..7c5814ebe 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -41,7 +41,7 @@
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Оновити</x:String>
   <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">БІНАРНИЙ ФАЙЛ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Автор рядка</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">ПОШУК АВТОРА РЯДКА ДЛЯ ЦЬОГО ФАЙЛУ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">ПОШУК АВТОРА РЯДКА ДЛЯ ЦЬОГО ФАЙЛУ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Перейти на ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Порівняти з ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Порівняти з робочим деревом</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 94a2d5da8..8700104d8 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -56,7 +56,8 @@
   <x:String x:Key="Text.Bisect.Skip">无法判定</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">二分定位进行中。请标记当前的提交是 '正确' 还是 '错误'，然后检出另一个提交。</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">逐行追溯(blame)</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">选中文件不支持该操作!!!</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">对当前版本的前一版本执行逐行追溯操作</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">选中文件不支持该操作!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">检出(checkout) ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">与当前 ${0}$ 比较</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">与本地工作树比较</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 9aa98f5c5..29cd3807c 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -56,7 +56,8 @@
   <x:String x:Key="Text.Bisect.Skip">無法確認</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">二分搜尋進行中。請標記目前的提交為「良好」或「錯誤」，然後簽出另一個提交。</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">逐行溯源 (blame)</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">所選擇的檔案不支援該操作!</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">對當前版本的先前版本執行逐行溯源操作。</x:String>
+  <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">所選擇的檔案不支援該操作!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">簽出 (checkout) ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">與目前 ${0}$ 比較</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">與本機工作區比較</x:String>
diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs
index e8b01e412..fda29964c 100644
--- a/src/ViewModels/Blame.cs
+++ b/src/ViewModels/Blame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
@@ -20,6 +21,12 @@ public Models.Commit Revision
             private set => SetProperty(ref _revision, value);
         }
 
+        public Models.Commit PrevRevision
+        {
+            get => _prevRevision;
+            private set => SetProperty(ref _prevRevision, value);
+        }
+
         public Models.BlameData Data
         {
             get => _data;
@@ -51,10 +58,10 @@ public Blame(string repo, string file, Models.Commit commit)
 
             FilePath = file;
             Revision = commit;
+            PrevRevision = null;
 
             _repo = repo;
             _navigationHistory.Add(sha);
-            _commits.Add(sha, commit);
             SetBlameData(sha);
         }
 
@@ -90,6 +97,14 @@ public void Forward()
             NavigateToCommit(_navigationHistory[_navigationActiveIndex], true);
         }
 
+        public void GotoPrevRevision()
+        {
+            if (_prevRevision == null)
+                return;
+
+            NavigateToCommit(_prevRevision.SHA, false);
+        }
+
         public void NavigateToCommit(string commitSHA, bool isBackOrForward)
         {
             if (Revision.SHA.StartsWith(commitSHA, StringComparison.Ordinal))
@@ -130,28 +145,28 @@ private void SetBlameData(string commitSHA)
             _cancellationSource = new CancellationTokenSource();
             var token = _cancellationSource.Token;
 
-            if (_commits.TryGetValue(commitSHA, out var c))
-            {
-                Revision = c;
-            }
-            else
+            Task.Run(async () =>
             {
-                Task.Run(async () =>
-                {
-                    var result = await new Commands.QuerySingleCommit(_repo, commitSHA)
-                        .GetResultAsync()
-                        .ConfigureAwait(false);
+                var argsBuilder = new StringBuilder();
+                argsBuilder
+                    .Append("--date-order -n 2 ")
+                    .Append(commitSHA ?? string.Empty)
+                    .Append(" -- ")
+                    .Append(FilePath.Quoted());
+
+                var commits = await new Commands.QueryCommits(_repo, argsBuilder.ToString(), false)
+                    .GetResultAsync()
+                    .ConfigureAwait(false);
 
-                    Dispatcher.UIThread.Post(() =>
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (!token.IsCancellationRequested)
                     {
-                        if (!token.IsCancellationRequested)
-                        {
-                            _commits.Add(commitSHA, result);
-                            Revision = result ?? new Models.Commit() { SHA = commitSHA };
-                        }
-                    });
-                }, token);
-            }
+                        Revision = commits.Count > 0 ? commits[0] : null;
+                        PrevRevision = commits.Count == 2 ? commits[1] : null;
+                    }
+                });
+            });
 
             Task.Run(async () =>
             {
@@ -169,11 +184,11 @@ private void SetBlameData(string commitSHA)
 
         private string _repo;
         private Models.Commit _revision;
+        private Models.Commit _prevRevision;
         private CancellationTokenSource _cancellationSource = null;
         private int _navigationActiveIndex = 0;
         private List<string> _navigationHistory = [];
         private Models.BlameData _data = null;
-        private Dictionary<string, Models.Commit> _commits = new();
         private Dictionary<string, string> _commitMessages = new();
     }
 }
diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml
index bd8a2f811..af27d3563 100644
--- a/src/Views/Blame.axaml
+++ b/src/Views/Blame.axaml
@@ -38,7 +38,7 @@
 
     <!-- File -->
     <Border Grid.Row="1" Padding="8,0" >
-      <Grid ColumnDefinitions="Auto,*,Auto,Auto,400">
+      <Grid ColumnDefinitions="Auto,*,Auto,Auto,400,Auto">
         <Path Grid.Column="0"
               Width="14" Height="14"
               Data="{StaticResource Icons.File}"/>
@@ -76,6 +76,15 @@
                        TextTrimming="CharacterEllipsis"/>
           </Grid>
         </Border>
+
+        <Button Grid.Column="5"
+                Classes="icon_button"
+                IsEnabled="{Binding PrevRevision, Converter={x:Static ObjectConverters.IsNotNull}}"
+                Width="18" Margin="4,0,0,0"
+                Command="{Binding GotoPrevRevision}"
+                ToolTip.Tip="{DynamicResource Text.Blame.BlameOnPreviousRevision}">
+          <Path Width="12" Height="12" Data="{StaticResource Icons.GotoParent}"/>
+        </Button>
       </Grid>
     </Border>
 
@@ -107,7 +116,7 @@
                   HorizontalAlignment="Center" VerticalAlignment="Center"
                   IsVisible="{Binding IsBinary}">
         <Path Width="64" Height="64" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Error}"/>
-        <TextBlock Margin="0,16,0,0" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{DynamicResource Text.BlameTypeNotSupported}"/>
+        <TextBlock Margin="0,16,0,0" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{DynamicResource Text.Blame.TypeNotSupported}"/>
       </StackPanel>
 
       <!-- Loading -->

From 6e70b7421277ef87707eca31c493a812be63e595 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 03:57:13 +0000
Subject: [PATCH 31/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index dff27b046..ca9c88be8 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,11 +6,12 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.44%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
@@ -19,11 +20,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.44%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.33%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
@@ -32,7 +34,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.40%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.32%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -52,6 +54,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit
@@ -242,12 +245,13 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-98.88%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-98.77%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
 - Text.About.ReleaseNotes
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.CommitCM.Drop
@@ -260,12 +264,13 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-96.09%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-95.98%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.About.ReleaseNotes
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.SwitchToWorktree
@@ -303,7 +308,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.40%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.32%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -323,6 +328,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
@@ -513,7 +519,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-71.03%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.95%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -539,6 +545,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.CustomAction
@@ -780,9 +787,16 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.52%25-yellow)
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.Blame.BlameOnPreviousRevision
+
+</details>
+
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.43%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -802,6 +816,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
@@ -991,7 +1006,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.64%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.55%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1011,6 +1026,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.ResetToSelectedCommit

From 0c34c54e5c563342ba4d8de942a2475b8922f9b8 Mon Sep 17 00:00:00 2001
From: Junhyung Choi <junhyung9571@naver.com>
Date: Mon, 20 Oct 2025 14:55:16 +0900
Subject: [PATCH 32/72] localization: add Korean(ko_KR) support (#1864)

* localization: add Korean(ko_KR) support

* [FIX] typo
---
 src/App.axaml                     |   1 +
 src/Models/Locales.cs             |   1 +
 src/Resources/Locales/ko_KR.axaml | 903 ++++++++++++++++++++++++++++++
 3 files changed, 905 insertions(+)
 create mode 100644 src/Resources/Locales/ko_KR.axaml

diff --git a/src/App.axaml b/src/App.axaml
index 36c17decd..a7a0c17f2 100644
--- a/src/App.axaml
+++ b/src/App.axaml
@@ -24,6 +24,7 @@
       <ResourceInclude x:Key="es_ES" Source="/Resources/Locales/es_ES.axaml"/>
       <ResourceInclude x:Key="ja_JP" Source="/Resources/Locales/ja_JP.axaml"/>
       <ResourceInclude x:Key="ta_IN" Source="/Resources/Locales/ta_IN.axaml"/>
+      <ResourceInclude x:Key="ko_KR" Source="/Resources/Locales/ko_KR.axaml"/>
     </ResourceDictionary>
   </Application.Resources>
 
diff --git a/src/Models/Locales.cs b/src/Models/Locales.cs
index 42b878208..027433336 100644
--- a/src/Models/Locales.cs
+++ b/src/Models/Locales.cs
@@ -21,6 +21,7 @@ public class Locale
             new Locale("繁體中文", "zh_TW"),
             new Locale("日本語", "ja_JP"),
             new Locale("தமிழ் (Tamil)", "ta_IN"),
+            new Locale("한국어", "ko_KR"),
         };
 
         public Locale(string name, string key)
diff --git a/src/Resources/Locales/ko_KR.axaml b/src/Resources/Locales/ko_KR.axaml
new file mode 100644
index 000000000..ea262f0b0
--- /dev/null
+++ b/src/Resources/Locales/ko_KR.axaml
@@ -0,0 +1,903 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<x:String x:Key="Text.About" xml:space="preserve">정보</x:String>
+  <x:String x:Key="Text.About.Menu" xml:space="preserve">SourceGit 정보</x:String>
+  <x:String x:Key="Text.About.ReleaseNotes" xml:space="preserve">릴리스 노트</x:String>
+  <x:String x:Key="Text.About.SubTitle" xml:space="preserve">오픈소스 &amp; 무료 Git GUI 클라이언트</x:String>
+  <x:String x:Key="Text.AddToIgnore" xml:space="preserve">무시할 파일 추가</x:String>
+  <x:String x:Key="Text.AddToIgnore.Pattern" xml:space="preserve">패턴:</x:String>
+  <x:String x:Key="Text.AddToIgnore.Storage" xml:space="preserve">저장 파일:</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>
+  <x:String x:Key="Text.AddWorktree.Tracking.Toggle" xml:space="preserve">원격 브랜치 추적</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout" xml:space="preserve">체크아웃할 대상:</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.CreateNew" xml:space="preserve">새 브랜치 생성</x:String>
+  <x:String x:Key="Text.AddWorktree.WhatToCheckout.Existing" xml:space="preserve">기존 브랜치</x:String>
+  <x:String x:Key="Text.AIAssistant" xml:space="preserve">AI 어시스턴트</x:String>
+  <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">재생성</x:String>
+  <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">AI를 사용하여 커밋 메시지 생성</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">커밋 메시지로 적용</x:String>
+  <x:String x:Key="Text.App.Hide" xml:space="preserve">SourceGit 숨기기</x:String>
+  <x:String x:Key="Text.App.ShowAll" xml:space="preserve">모두 보기</x:String>
+  <x:String x:Key="Text.Apply" xml:space="preserve">패치</x:String>
+  <x:String x:Key="Text.Apply.File" xml:space="preserve">패치 파일:</x:String>
+  <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">적용할 .patch 파일을 선택하세요</x:String>
+  <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">공백 변경 사항 무시</x:String>
+  <x:String x:Key="Text.Apply.Title" xml:space="preserve">패치 적용</x:String>
+  <x:String x:Key="Text.Apply.WS" xml:space="preserve">공백:</x:String>
+  <x:String x:Key="Text.ApplyStash" xml:space="preserve">스태시 적용</x:String>
+  <x:String x:Key="Text.ApplyStash.DropAfterApply" xml:space="preserve">적용 후 삭제</x:String>
+  <x:String x:Key="Text.ApplyStash.RestoreIndex" xml:space="preserve">인덱스의 변경 사항 복원</x:String>
+  <x:String x:Key="Text.ApplyStash.Stash" xml:space="preserve">스태시:</x:String>
+  <x:String x:Key="Text.Archive" xml:space="preserve">아카이브...</x:String>
+  <x:String x:Key="Text.Archive.File" xml:space="preserve">아카이브 저장 위치:</x:String>
+  <x:String x:Key="Text.Archive.File.Placeholder" xml:space="preserve">아카이브 파일 경로 선택</x:String>
+  <x:String x:Key="Text.Archive.Revision" xml:space="preserve">리비전:</x:String>
+  <x:String x:Key="Text.Archive.Title" xml:space="preserve">아카이브</x:String>
+  <x:String x:Key="Text.Askpass" xml:space="preserve">SourceGit Askpass</x:String>
+  <x:String x:Key="Text.Askpass.Passphrase" xml:space="preserve">암호 입력:</x:String>
+  <x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">변경되지 않음으로 간주된 파일</x:String>
+  <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">변경되지 않음으로 간주된 파일 없음</x:String>
+  <x:String x:Key="Text.Avatar.Load" xml:space="preserve">이미지 불러오기...</x:String>
+  <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">새로 고침</x:String>
+  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">바이너리 파일은 지원되지 않습니다!!!</x:String>
+  <x:String x:Key="Text.Bisect">이진 탐색</x:String>
+  <x:String x:Key="Text.Bisect.Abort">중단</x:String>
+  <x:String x:Key="Text.Bisect.Bad">나쁨</x:String>
+  <x:String x:Key="Text.Bisect.Detecting">이진 탐색 중. 현재 HEAD가 '좋음' 상태입니까, '나쁨' 상태입니까?</x:String>
+  <x:String x:Key="Text.Bisect.Good">좋음</x:String>
+  <x:String x:Key="Text.Bisect.Skip">건너뛰기</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForRange">이진 탐색 중. 현재 커밋을 '좋음' 또는 '나쁨'으로 표시하고 다른 커밋을 체크아웃하세요.</x:String>
+  <x:String x:Key="Text.Blame" xml:space="preserve">블레임</x:String>
+  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">이 파일은 블레임을 지원하지 않습니다!!!</x:String>
+  <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ 체크아웃...</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">${0}$와(과) 비교</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">워크트리와 비교</x:String>
+  <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">브랜치 이름 복사</x:String>
+  <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">${0}$ 삭제...</x:String>
+  <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">선택한 {0}개의 브랜치 삭제</x:String>
+  <x:String x:Key="Text.BranchCM.FastForward" xml:space="preserve">${0}$(으)로 Fast-Forward</x:String>
+  <x:String x:Key="Text.BranchCM.FetchInto" xml:space="preserve">${0}$에서 ${1}$(으)로 Fetch...</x:String>
+  <x:String x:Key="Text.BranchCM.Finish" xml:space="preserve">Git Flow - ${0}$ 완료</x:String>
+  <x:String x:Key="Text.BranchCM.Merge" xml:space="preserve">${0}$을(를) ${1}$(으)로 병합...</x:String>
+  <x:String x:Key="Text.BranchCM.MergeMultiBranches" xml:space="preserve">선택한 {0}개의 브랜치를 현재 브랜치로 병합</x:String>
+  <x:String x:Key="Text.BranchCM.Pull" xml:space="preserve">${0}$ Pull</x:String>
+  <x:String x:Key="Text.BranchCM.PullInto" xml:space="preserve">${0}$에서 ${1}$(으)로 Pull...</x:String>
+  <x:String x:Key="Text.BranchCM.Push" xml:space="preserve">${0}$ Push</x:String>
+  <x:String x:Key="Text.BranchCM.Rebase" xml:space="preserve">${1}$을(를) 기반으로 ${0}$ 리베이스...</x:String>
+  <x:String x:Key="Text.BranchCM.Rename" xml:space="preserve">${0}$ 이름 바꾸기...</x:String>
+  <x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">${0}$을(를) ${1}$(으)로 리셋...</x:String>
+  <x:String x:Key="Text.BranchCM.SwitchToWorktree" xml:space="preserve">${0}$(워크트리)로 전환</x:String>
+  <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">추적 브랜치 설정...</x:String>
+  <x:String x:Key="Text.BranchCompare" xml:space="preserve">브랜치 비교</x:String>
+  <x:String x:Key="Text.BranchTree.Ahead" xml:space="preserve">{0}개 커밋 앞섬</x:String>
+  <x:String x:Key="Text.BranchTree.AheadBehind" xml:space="preserve">{0}개 커밋 앞섬, {1}개 커밋 뒤처짐</x:String>
+  <x:String x:Key="Text.BranchTree.Behind" xml:space="preserve">{0}개 커밋 뒤처짐</x:String>
+  <x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">유효하지 않음</x:String>
+  <x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">원격</x:String>
+  <x:String x:Key="Text.BranchTree.Status" xml:space="preserve">상태</x:String>
+  <x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">추적 중</x:String>
+  <x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL</x:String>
+  <x:String x:Key="Text.BranchTree.Worktree" xml:space="preserve">워크트리</x:String>
+  <x:String x:Key="Text.Cancel" xml:space="preserve">취소</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">부모 리비전으로 리셋</x:String>
+  <x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">이 리비전으로 리셋</x:String>
+  <x:String x:Key="Text.ChangeCM.GenerateCommitMessage" xml:space="preserve">커밋 메시지 생성</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode" xml:space="preserve">표시 모드 변경</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Grid" xml:space="preserve">파일 및 디렉터리 목록으로 보기</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">경로 목록으로 보기</x:String>
+  <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">파일 시스템 트리로 보기</x:String>
+  <x:String x:Key="Text.ChangeSubmoduleUrl" xml:space="preserve">서브모듈 URL 변경</x:String>
+  <x:String x:Key="Text.ChangeSubmoduleUrl.Submodule" xml:space="preserve">서브모듈:</x:String>
+  <x:String x:Key="Text.ChangeSubmoduleUrl.URL" xml:space="preserve">URL:</x:String>
+  <x:String x:Key="Text.Checkout" xml:space="preserve">브랜치 체크아웃</x:String>
+  <x:String x:Key="Text.Checkout.Commit" xml:space="preserve">커밋 체크아웃</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Target" xml:space="preserve">커밋:</x:String>
+  <x:String x:Key="Text.Checkout.Commit.Warning" xml:space="preserve">경고: 커밋 체크아웃을 하면, HEAD가 분리됩니다(detached)</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">로컬 변경 사항:</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">폐기</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">스태시 &amp; 재적용</x:String>
+  <x:String x:Key="Text.Checkout.RecurseSubmodules" xml:space="preserve">모든 서브모듈 업데이트</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">브랜치:</x:String>
+  <x:String x:Key="Text.Checkout.WarnLostCommits" xml:space="preserve">현재 HEAD에 브랜치/태그에 연결되지 않은 커밋이 있습니다! 계속하시겠습니까?</x:String>
+  <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">체크아웃 &amp; Fast-Forward</x:String>
+  <x:String x:Key="Text.Checkout.WithFastForward.Upstream" xml:space="preserve">Fast-Forward 대상:</x:String>
+  <x:String x:Key="Text.CherryPick" xml:space="preserve">체리픽</x:String>
+  <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">커밋 메시지에 원본 추가</x:String>
+  <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">커밋:</x:String>
+  <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">모든 변경 사항 커밋</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline" xml:space="preserve">메인라인:</x:String>
+  <x:String x:Key="Text.CherryPick.Mainline.Tips" xml:space="preserve">어느 쪽을 메인라인으로 간주해야 할지 알 수 없기 때문에 일반적으로 병합(merge)을 체리픽할 수 없습니다. 이 옵션을 사용하면 지정된 부모를 기준으로 변경 사항을 다시 적용할 수 있습니다.</x:String>
+  <x:String x:Key="Text.ClearStashes" xml:space="preserve">모든 스태시 지우기</x:String>
+  <x:String x:Key="Text.ClearStashes.Message" xml:space="preserve">모든 스태시를 지우려고 합니다. 계속하시겠습니까?</x:String>
+  <x:String x:Key="Text.Clone" xml:space="preserve">원격 저장소 복제</x:String>
+  <x:String x:Key="Text.Clone.AdditionalParam" xml:space="preserve">추가 파라미터:</x:String>
+  <x:String x:Key="Text.Clone.AdditionalParam.Placeholder" xml:space="preserve">저장소 복제 시 추가 인수. 선택 사항.</x:String>
+  <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">로컬 이름:</x:String>
+  <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">저장소 이름. 선택 사항.</x:String>
+  <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">상위 폴더:</x:String>
+  <x:String x:Key="Text.Clone.RecurseSubmodules" xml:space="preserve">서브모듈 초기화 &amp; 업데이트</x:String>
+  <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">저장소 URL:</x:String>
+  <x:String x:Key="Text.Close" xml:space="preserve">닫기</x:String>
+  <x:String x:Key="Text.CodeEditor" xml:space="preserve">에디터</x:String>
+  <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">커밋 체크아웃</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">커밋 체리픽</x:String>
+  <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">체리픽...</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">HEAD와 비교</x:String>
+  <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">워크트리와 비교</x:String>
+  <x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">작성자</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">메시지</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">커밋터</x:String>
+  <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">제목</x:String>
+  <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.CommitCM.Drop" xml:space="preserve">커밋 삭제</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase" xml:space="preserve">대화형 리베이스</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Drop" xml:space="preserve">삭제(Drop)...</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Edit" xml:space="preserve">수정(Edit)...</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Fixup" xml:space="preserve">부모에 합치기(Fixup)...</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Manually" xml:space="preserve">${1}$을(를) 기반으로 ${0}$ 대화형 리베이스</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Reword" xml:space="preserve">메시지 수정(Reword)...</x:String>
+  <x:String x:Key="Text.CommitCM.InteractiveRebase.Squash" xml:space="preserve">부모에 합치기(Squash)...</x:String>
+  <x:String x:Key="Text.CommitCM.Merge" xml:space="preserve">${0}$(으)로 병합</x:String>
+  <x:String x:Key="Text.CommitCM.MergeMultiple" xml:space="preserve">병합...</x:String>
+  <x:String x:Key="Text.CommitCM.PushRevision" xml:space="preserve">${0}$을(를) ${1}$(으)로 푸시</x:String>
+  <x:String x:Key="Text.CommitCM.Rebase" xml:space="preserve">${1}$을(를) 기반으로 ${0}$ 리베이스</x:String>
+  <x:String x:Key="Text.CommitCM.Reset" xml:space="preserve">${0}$을(를) ${1}$(으)로 리셋</x:String>
+  <x:String x:Key="Text.CommitCM.Revert" xml:space="preserve">커밋 되돌리기</x:String>
+  <x:String x:Key="Text.CommitCM.Reword" xml:space="preserve">메시지 수정</x:String>
+  <x:String x:Key="Text.CommitCM.SaveAsPatch" xml:space="preserve">패치로 저장...</x:String>
+  <x:String x:Key="Text.CommitCM.Squash" xml:space="preserve">부모에 합치기</x:String>
+  <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">변경 사항</x:String>
+  <x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">변경된 파일</x:String>
+  <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">변경 사항 검색...</x:String>
+  <x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">파일</x:String>
+  <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS 파일</x:String>
+  <x:String x:Key="Text.CommitDetail.Files.Search" xml:space="preserve">파일 검색...</x:String>
+  <x:String x:Key="Text.CommitDetail.Files.Submodule" xml:space="preserve">서브모듈</x:String>
+  <x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">정보</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">작성자</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">자식</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">커밋터</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">이 커밋을 포함하는 ref 확인</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">커밋 포함 REF</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.CopyEmail" xml:space="preserve">이메일 복사</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.CopyName" xml:space="preserve">이름 복사</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.CopyNameAndEmail" xml:space="preserve">이름 &amp; 이메일 복사</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.GotoChangesPage" xml:space="preserve">처음 100개의 변경 사항만 표시합니다. 모든 변경 사항은 '변경 사항' 탭에서 확인하세요.</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Key" xml:space="preserve">키:</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Message" xml:space="preserve">메시지</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">부모</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">REFS</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">서명자:</x:String>
+  <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">브라우저에서 열기</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">설명</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.PasteAndReplaceAll" xml:space="preserve">붙여넣기 (모두 바꾸기)</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">제목</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">커밋 제목 입력</x:String>
+  <x:String x:Key="Text.Configure" xml:space="preserve">저장소 설정</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">커밋 템플릿</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">${files_num}, ${branch_name}, ${files} 및 ${files:N} (N은 출력할 최대 파일 경로 수)을(를) 사용할 수 있습니다.</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">템플릿 내용:</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">템플릿 이름:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">인수:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">내장 파라미터: 
+  
+  ${REPO} 저장소 경로
+  ${REMOTE} 선택한 원격 또는 선택한 브랜치의 원격
+  ${BRANCH} 선택한 브랜치 (원격 브랜치의 경우 ${REMOTE} 부분 제외)
+  ${BRANCH_FRIENDLY_NAME} 선택한 브랜치의 식별하기 쉬운 이름 (원격 브랜치의 경우 ${REMOTE} 부분 포함)
+  ${SHA} 선택한 커밋의 해시
+  ${TAG} 선택한 태그
+  $1, $2 ... 입력 컨트롤 값</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Executable" xml:space="preserve">실행 파일:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.InputControls" xml:space="preserve">입력 컨트롤:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.InputControls.Edit" xml:space="preserve">편집</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Name" xml:space="preserve">이름:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope" xml:space="preserve">범위:</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Branch" xml:space="preserve">브랜치</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Commit" xml:space="preserve">커밋</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Remote" xml:space="preserve">원격</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Repository" xml:space="preserve">저장소</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.Scope.Tag" xml:space="preserve">태그</x:String>
+  <x:String x:Key="Text.Configure.CustomAction.WaitForExit" xml:space="preserve">작업이 끝날 때까지 대기</x:String>
+  <x:String x:Key="Text.Configure.Email" xml:space="preserve">이메일 주소</x:String>
+  <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">이메일 주소</x:String>
+  <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
+  <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">원격 자동 Fetch</x:String>
+  <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">분</x:String>
+  <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">기본 원격</x:String>
+  <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">선호하는 병합 모드</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">이슈 트래커</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Azure DevOps 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit" xml:space="preserve">Gerrit Change-Id 커밋 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteeIssue" xml:space="preserve">Gitee 이슈 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGiteePullRequest" xml:space="preserve">Gitee Pull Request 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitHub" xml:space="preserve">GitHub 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabIssue" xml:space="preserve">GitLab 이슈 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleGitLabMergeRequest" xml:space="preserve">GitLab Merge Request 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Jira 규칙 추가</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">새 규칙</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">이슈 정규식:</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">규칙 이름:</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.Share" xml:space="preserve">.issuetracker 파일에 이 규칙 공유</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">결과 URL:</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">정규식 그룹 값에 접근하려면 $1, $2를 사용하세요.</x:String>
+  <x:String x:Key="Text.Configure.OpenAI" xml:space="preserve">AI</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Preferred" xml:space="preserve">선호하는 서비스:</x:String>
+  <x:String x:Key="Text.Configure.OpenAI.Preferred.Tip" xml:space="preserve">'선호하는 서비스'가 설정되면, SourceGit은 이 저장소에서 해당 서비스만 사용합니다. 그렇지 않고 사용 가능한 서비스가 두 개 이상인 경우, 하나를 선택할 수 있는 컨텍스트 메뉴가 표시됩니다.</x:String>
+  <x:String x:Key="Text.Configure.Proxy" xml:space="preserve">HTTP 프록시</x:String>
+  <x:String x:Key="Text.Configure.Proxy.Placeholder" xml:space="preserve">이 저장소에서 사용하는 HTTP 프록시</x:String>
+  <x:String x:Key="Text.Configure.User" xml:space="preserve">사용자 이름</x:String>
+  <x:String x:Key="Text.Configure.User.Placeholder" xml:space="preserve">이 저장소의 사용자 이름</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls" xml:space="preserve">사용자 지정 작업 컨트롤 편집</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.CheckedValue" xml:space="preserve">선택 시 값:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.CheckedValue.Tip" xml:space="preserve">선택 시, 이 값이 명령줄 인수로 사용됩니다</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.Description" xml:space="preserve">설명:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.DefaultValue" xml:space="preserve">기본값:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.IsFolder" xml:space="preserve">폴더 여부:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">레이블:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">옵션:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">옵션 구분자로 '|'를 사용하세요</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">유형:</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">작업 공간</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">색상</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Name" xml:space="preserve">이름</x:String>
+  <x:String x:Key="Text.ConfigureWorkspace.Restore" xml:space="preserve">시작 시 탭 복원</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">계속</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">빈 커밋이 감지되었습니다! 계속하시겠습니까 (--allow-empty)?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">모두 스테이징 &amp; 커밋</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">빈 커밋이 감지되었습니다! 계속하시겠습니까 (--allow-empty) 아니면 모두 스테이징 후 커밋하시겠습니까?</x:String>
+  <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">재시작 필요</x:String>
+  <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">변경 사항을 적용하려면 앱을 다시 시작해야 합니다.</x:String>
+  <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Conventional Commit 도우미</x:String>
+  <x:String x:Key="Text.ConventionalCommit.BreakingChanges" xml:space="preserve">주요 변경 사항(Breaking Change):</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ClosedIssue" xml:space="preserve">종료된 이슈:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Detail" xml:space="preserve">상세 변경 내역:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Scope" xml:space="preserve">범위:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.ShortDescription" xml:space="preserve">간단한 설명:</x:String>
+  <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">변경 유형:</x:String>
+  <x:String x:Key="Text.Copy" xml:space="preserve">복사</x:String>
+  <x:String x:Key="Text.CopyAllText" xml:space="preserve">전체 텍스트 복사</x:String>
+  <x:String x:Key="Text.CopyFullPath" xml:space="preserve">전체 경로 복사</x:String>
+  <x:String x:Key="Text.CopyPath" xml:space="preserve">경로 복사</x:String>
+  <x:String x:Key="Text.CreateBranch" xml:space="preserve">브랜치 생성...</x:String>
+  <x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">기준:</x:String>
+  <x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">생성된 브랜치로 체크아웃</x:String>
+  <x:String x:Key="Text.CreateBranch.LocalChanges" xml:space="preserve">로컬 변경 사항:</x:String>
+  <x:String x:Key="Text.CreateBranch.LocalChanges.Discard" xml:space="preserve">폐기</x:String>
+  <x:String x:Key="Text.CreateBranch.LocalChanges.StashAndReply" xml:space="preserve">스태시 &amp; 재적용</x:String>
+  <x:String x:Key="Text.CreateBranch.Name" xml:space="preserve">새 브랜치 이름:</x:String>
+  <x:String x:Key="Text.CreateBranch.Name.Placeholder" xml:space="preserve">브랜치 이름을 입력하세요.</x:String>
+  <x:String x:Key="Text.CreateBranch.Title" xml:space="preserve">로컬 브랜치 생성</x:String>
+  <x:String x:Key="Text.CreateBranch.OverwriteExisting" xml:space="preserve">기존 브랜치 덮어쓰기</x:String>
+  <x:String x:Key="Text.CreateTag" xml:space="preserve">태그 생성...</x:String>
+  <x:String x:Key="Text.CreateTag.BasedOn" xml:space="preserve">태그 생성 위치:</x:String>
+  <x:String x:Key="Text.CreateTag.GPGSign" xml:space="preserve">GPG 서명</x:String>
+  <x:String x:Key="Text.CreateTag.Message" xml:space="preserve">태그 메시지:</x:String>
+  <x:String x:Key="Text.CreateTag.Message.Placeholder" xml:space="preserve">선택 사항.</x:String>
+  <x:String x:Key="Text.CreateTag.Name" xml:space="preserve">태그 이름:</x:String>
+  <x:String x:Key="Text.CreateTag.Name.Placeholder" xml:space="preserve">권장 형식: v1.0.0-alpha</x:String>
+  <x:String x:Key="Text.CreateTag.PushToAllRemotes" xml:space="preserve">생성 후 모든 원격에 푸시</x:String>
+  <x:String x:Key="Text.CreateTag.Title" xml:space="preserve">새 태그 생성</x:String>
+  <x:String x:Key="Text.CreateTag.Type" xml:space="preserve">종류:</x:String>
+  <x:String x:Key="Text.CreateTag.Type.Annotated" xml:space="preserve">주석 태그</x:String>
+  <x:String x:Key="Text.CreateTag.Type.Lightweight" xml:space="preserve">경량 태그</x:String>
+  <x:String x:Key="Text.CtrlClickTip" xml:space="preserve">Ctrl을 누른 채 클릭하면 바로 시작합니다</x:String>
+  <x:String x:Key="Text.Cut" xml:space="preserve">잘라내기</x:String>
+  <x:String x:Key="Text.DeinitSubmodule" xml:space="preserve">서브모듈 초기화 해제</x:String>
+  <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">로컬 변경 사항이 있어도 강제로 초기화 해제합니다.</x:String>
+  <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">서브모듈:</x:String>
+  <x:String x:Key="Text.DeleteBranch" xml:space="preserve">브랜치 삭제</x:String>
+  <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">브랜치:</x:String>
+  <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">원격 브랜치를 삭제하려고 합니다!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">원격 브랜치 ${0}$도 함께 삭제</x:String>
+  <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">여러 브랜치 삭제</x:String>
+  <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">한 번에 여러 브랜치를 삭제하려고 합니다. 실행하기 전에 다시 한번 확인하세요!</x:String>
+  <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">여러 태그 삭제</x:String>
+  <x:String x:Key="Text.DeleteMultiTags.DeleteFromRemotes" xml:space="preserve">원격 저장소에서도 삭제</x:String>
+  <x:String x:Key="Text.DeleteMultiTags.Tip" xml:space="preserve">한 번에 여러 태그를 삭제하려고 합니다. 실행하기 전에 다시 한번 확인하세요!</x:String>
+  <x:String x:Key="Text.DeleteRemote" xml:space="preserve">원격 삭제</x:String>
+  <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Path" xml:space="preserve">경로:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForGroup" xml:space="preserve">모든 하위 항목이 목록에서 제거됩니다.</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TipForRepository" xml:space="preserve">목록에서만 제거되며, 디스크에서 삭제되지 않습니다!</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TitleForGroup" xml:space="preserve">그룹 삭제 확인</x:String>
+  <x:String x:Key="Text.DeleteRepositoryNode.TitleForRepository" xml:space="preserve">저장소 삭제 확인</x:String>
+  <x:String x:Key="Text.DeleteSubmodule" xml:space="preserve">서브모듈 삭제</x:String>
+  <x:String x:Key="Text.DeleteSubmodule.Path" xml:space="preserve">서브모듈 경로:</x:String>
+  <x:String x:Key="Text.DeleteTag" xml:space="preserve">태그 삭제</x:String>
+  <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">태그:</x:String>
+  <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">원격 저장소에서도 삭제</x:String>
+  <x:String x:Key="Text.Diff.Binary" xml:space="preserve">바이너리 비교</x:String>
+  <x:String x:Key="Text.Diff.FileModeChanged" xml:space="preserve">파일 모드 변경됨</x:String>
+  <x:String x:Key="Text.Diff.First" xml:space="preserve">첫 번째 차이점</x:String>
+  <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">모든 공백 변경 사항 무시</x:String>
+  <x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">혼합</x:String>
+  <x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">차이점</x:String>
+  <x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">나란히 보기</x:String>
+  <x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">스와이프</x:String>
+  <x:String x:Key="Text.Diff.Last" xml:space="preserve">마지막 차이점</x:String>
+  <x:String x:Key="Text.Diff.LFS" xml:space="preserve">LFS 객체 변경</x:String>
+  <x:String x:Key="Text.Diff.New" xml:space="preserve">신규</x:String>
+  <x:String x:Key="Text.Diff.Next" xml:space="preserve">다음 차이점</x:String>
+  <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">변경 사항 없음 또는 줄바꿈(EOL) 변경만 있음</x:String>
+  <x:String x:Key="Text.Diff.Old" xml:space="preserve">기존</x:String>
+  <x:String x:Key="Text.Diff.Prev" xml:space="preserve">이전 차이점</x:String>
+  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">패치로 저장</x:String>
+  <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">숨겨진 기호 표시</x:String>
+  <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">나란히 비교</x:String>
+  <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">서브모듈</x:String>
+  <x:String x:Key="Text.Diff.Submodule.Deleted" xml:space="preserve">삭제됨</x:String>
+  <x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">신규</x:String>
+  <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">전환</x:String>
+  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">구문 강조</x:String>
+  <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">줄 바꿈</x:String>
+  <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">병합 도구에서 열기</x:String>
+  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">모든 줄 표시</x:String>
+  <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">표시 줄 수 줄이기</x:String>
+  <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">표시 줄 수 늘리기</x:String>
+  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">파일을 선택하여 변경 사항 보기</x:String>
+  <x:String x:Key="Text.DirHistories" xml:space="preserve">디렉터리 히스토리</x:String>
+  <x:String x:Key="Text.DirtyState.HasLocalChanges" xml:space="preserve">로컬 변경 사항 있음</x:String>
+  <x:String x:Key="Text.DirtyState.HasPendingPullOrPush" xml:space="preserve">업스트림과 불일치</x:String>
+  <x:String x:Key="Text.DirtyState.UpToDate" xml:space="preserve">이미 최신 상태</x:String>
+  <x:String x:Key="Text.Discard" xml:space="preserve">변경 사항 폐기</x:String>
+  <x:String x:Key="Text.Discard.All" xml:space="preserve">작업 사본의 모든 로컬 변경 사항.</x:String>
+  <x:String x:Key="Text.Discard.Changes" xml:space="preserve">변경 사항:</x:String>
+  <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">무시된 파일 포함</x:String>
+  <x:String x:Key="Text.Discard.IncludeUntracked" xml:space="preserve">추적하지 않는 파일 포함</x:String>
+  <x:String x:Key="Text.Discard.Total" xml:space="preserve">{0}개의 변경 사항이 폐기됩니다</x:String>
+  <x:String x:Key="Text.Discard.Warning" xml:space="preserve">이 작업은 되돌릴 수 없습니다!!!</x:String>
+  <x:String x:Key="Text.DropHead" xml:space="preserve">커밋 삭제</x:String>
+  <x:String x:Key="Text.DropHead.Commit" xml:space="preserve">커밋:</x:String>
+  <x:String x:Key="Text.DropHead.NewHead" xml:space="preserve">새 HEAD:</x:String>
+  <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">북마크:</x:String>
+  <x:String x:Key="Text.EditRepositoryNode.Name" xml:space="preserve">새 이름:</x:String>
+  <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.EditRepositoryNode.TitleForGroup" xml:space="preserve">선택한 그룹 편집</x:String>
+  <x:String x:Key="Text.EditRepositoryNode.TitleForRepository" xml:space="preserve">선택한 저장소 편집</x:String>
+  <x:String x:Key="Text.ExecuteCustomAction.Target" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.ExecuteCustomAction.Repository" xml:space="preserve">이 저장소</x:String>
+  <x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
+  <x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">모든 원격 Fetch</x:String>
+  <x:String x:Key="Text.Fetch.Force" xml:space="preserve">로컬 ref 강제 덮어쓰기</x:String>
+  <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">태그 없이 Fetch</x:String>
+  <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.Fetch.Title" xml:space="preserve">원격 변경 사항 Fetch</x:String>
+  <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">변경되지 않음으로 간주</x:String>
+  <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">폐기...</x:String>
+  <x:String x:Key="Text.FileCM.DiscardMulti" xml:space="preserve">{0}개 파일 폐기...</x:String>
+  <x:String x:Key="Text.FileCM.ResolveUsing" xml:space="preserve">${0}$을(를) 사용하여 해결</x:String>
+  <x:String x:Key="Text.FileCM.SaveAsPatch" xml:space="preserve">패치로 저장...</x:String>
+  <x:String x:Key="Text.FileCM.Stage" xml:space="preserve">스테이지</x:String>
+  <x:String x:Key="Text.FileCM.StageMulti" xml:space="preserve">{0}개 파일 스테이지</x:String>
+  <x:String x:Key="Text.FileCM.Stash" xml:space="preserve">스태시...</x:String>
+  <x:String x:Key="Text.FileCM.StashMulti" xml:space="preserve">{0}개 파일 스태시...</x:String>
+  <x:String x:Key="Text.FileCM.Unstage" xml:space="preserve">언스테이지</x:String>
+  <x:String x:Key="Text.FileCM.UnstageMulti" xml:space="preserve">{0}개 파일 언스테이지</x:String>
+  <x:String x:Key="Text.FileCM.UseMine" xml:space="preserve">내 것 사용 (checkout --ours)</x:String>
+  <x:String x:Key="Text.FileCM.UseTheirs" xml:space="preserve">상대방 것 사용 (checkout --theirs)</x:String>
+  <x:String x:Key="Text.FileHistory" xml:space="preserve">파일 히스토리</x:String>
+  <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">변경 사항</x:String>
+  <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">내용</x:String>
+  <x:String x:Key="Text.GitFlow" xml:space="preserve">Git-Flow</x:String>
+  <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">개발 브랜치:</x:String>
+  <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
+  <x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">Feature 접두사:</x:String>
+  <x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">FLOW - Feature 완료</x:String>
+  <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW - Hotfix 완료</x:String>
+  <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW - Release 완료</x:String>
+  <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.GitFlow.FinishWithPush" xml:space="preserve">완료 후 원격(들)에 푸시</x:String>
+  <x:String x:Key="Text.GitFlow.FinishWithSquash" xml:space="preserve">병합 시 스쿼시</x:String>
+  <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">핫픽스:</x:String>
+  <x:String x:Key="Text.GitFlow.HotfixPrefix" xml:space="preserve">Hotfix 접두사:</x:String>
+  <x:String x:Key="Text.GitFlow.Init" xml:space="preserve">Git-Flow 초기화</x:String>
+  <x:String x:Key="Text.GitFlow.KeepBranchAfterFinish" xml:space="preserve">브랜치 유지</x:String>
+  <x:String x:Key="Text.GitFlow.ProductionBranch" xml:space="preserve">운영 브랜치:</x:String>
+  <x:String x:Key="Text.GitFlow.Release" xml:space="preserve">릴리스:</x:String>
+  <x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Release 접두사:</x:String>
+  <x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">Feature 시작...</x:String>
+  <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW - Feature 시작</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Hotfix 시작...</x:String>
+  <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW - Hotfix 시작</x:String>
+  <x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">이름 입력</x:String>
+  <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Release 시작...</x:String>
+  <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW - Release 시작</x:String>
+  <x:String x:Key="Text.GitFlow.TagPrefix" xml:space="preserve">버전 태그 접두사:</x:String>
+  <x:String x:Key="Text.GitLFS" xml:space="preserve">Git LFS</x:String>
+  <x:String x:Key="Text.GitLFS.AddTrackPattern" xml:space="preserve">추적 패턴 추가...</x:String>
+  <x:String x:Key="Text.GitLFS.AddTrackPattern.IsFilename" xml:space="preserve">패턴이 파일 이름임</x:String>
+  <x:String x:Key="Text.GitLFS.AddTrackPattern.Pattern" xml:space="preserve">사용자 정의 패턴:</x:String>
+  <x:String x:Key="Text.GitLFS.AddTrackPattern.Title" xml:space="preserve">Git LFS에 추적 패턴 추가</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch" xml:space="preserve">Fetch</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Tips" xml:space="preserve">Git LFS 객체를 다운로드하려면 `git lfs fetch`를 실행하세요. 이 작업은 작업 사본을 업데이트하지 않습니다.</x:String>
+  <x:String x:Key="Text.GitLFS.Fetch.Title" xml:space="preserve">LFS 객체 Fetch</x:String>
+  <x:String x:Key="Text.GitLFS.Install" xml:space="preserve">Git LFS 훅(hook) 설치</x:String>
+  <x:String x:Key="Text.GitLFS.Locks" xml:space="preserve">잠금 보기</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.Empty" xml:space="preserve">잠긴 파일 없음</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.Lock" xml:space="preserve">잠금</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.OnlyMine" xml:space="preserve">내 잠금만 보기</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.Title" xml:space="preserve">LFS 잠금</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.Unlock" xml:space="preserve">잠금 해제</x:String>
+  <x:String x:Key="Text.GitLFS.Locks.UnlockForce" xml:space="preserve">강제 잠금 해제</x:String>
+  <x:String x:Key="Text.GitLFS.Prune" xml:space="preserve">정리</x:String>
+  <x:String x:Key="Text.GitLFS.Prune.Tips" xml:space="preserve">로컬 저장소에서 오래된 LFS 파일을 삭제하려면 `git lfs prune`을 실행하세요</x:String>
+  <x:String x:Key="Text.GitLFS.Pull" xml:space="preserve">Pull</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Tips" xml:space="preserve">현재 ref 및 체크아웃에 대한 모든 Git LFS 파일을 다운로드하려면 `git lfs pull`을 실행하세요</x:String>
+  <x:String x:Key="Text.GitLFS.Pull.Title" xml:space="preserve">LFS 객체 Pull</x:String>
+  <x:String x:Key="Text.GitLFS.Push" xml:space="preserve">푸시</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Tips" xml:space="preserve">대기 중인 대용량 파일을 Git LFS 엔드포인트로 푸시합니다</x:String>
+  <x:String x:Key="Text.GitLFS.Push.Title" xml:space="preserve">LFS 객체 푸시</x:String>
+  <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">'{0}' 이름의 파일 추적</x:String>
+  <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">모든 *{0} 파일 추적</x:String>
+  <x:String x:Key="Text.Histories" xml:space="preserve">히스토리</x:String>
+  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">작성자</x:String>
+  <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">작성 시간</x:String>
+  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">그래프 &amp; 제목</x:String>
+  <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">커밋 시간</x:String>
+  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0}개 커밋 선택됨</x:String>
+  <x:String x:Key="Text.Histories.Tips" xml:space="preserve">'Ctrl' 또는 'Shift' 키를 누른 채로 여러 커밋을 선택하세요.</x:String>
+  <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">⌘ 또는 ⇧ 키를 누른 채로 여러 커밋을 선택하세요.</x:String>
+  <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">팁:</x:String>
+  <x:String x:Key="Text.Hotkeys" xml:space="preserve">키보드 단축키 참조</x:String>
+  <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">전역</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">새 저장소 복제</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">현재 탭 닫기</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">다음 탭으로 이동</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">이전 탭으로 이동</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">새 탭 만들기</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">환경설정 대화상자 열기</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">활성 작업 공간 전환</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">활성 탭 전환</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">저장소</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">스테이징된 변경 사항 커밋</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">스테이징된 변경 사항 커밋 및 푸시</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">모든 변경 사항 스테이징 후 커밋</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch (바로 시작)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">대시보드 모드 (기본)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">커밋 검색 모드 열기</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull (바로 시작)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">푸시 (바로 시작)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">이 저장소 강제 새로고침</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">'변경 사항'으로 전환</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">'히스토리'로 전환</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">'스태시'로 전환</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor" xml:space="preserve">텍스트 에디터</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor.CloseSearch" xml:space="preserve">검색 패널 닫기</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">다음 일치 항목 찾기</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">이전 일치 항목 찾기</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor.OpenExternalMergeTool" xml:space="preserve">외부 diff/merge 도구로 열기</x:String>
+  <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">검색 패널 열기</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">폐기</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">스테이지</x:String>
+  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">언스테이지</x:String>
+  <x:String x:Key="Text.Init" xml:space="preserve">저장소 초기화</x:String>
+  <x:String x:Key="Text.Init.Path" xml:space="preserve">경로:</x:String>
+  <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">체리픽 진행 중.</x:String>
+  <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">커밋 처리 중</x:String>
+  <x:String x:Key="Text.InProgress.Merge" xml:space="preserve">병합 진행 중.</x:String>
+  <x:String x:Key="Text.InProgress.Merge.Operating" xml:space="preserve">병합 중</x:String>
+  <x:String x:Key="Text.InProgress.Rebase" xml:space="preserve">리베이스 진행 중.</x:String>
+  <x:String x:Key="Text.InProgress.Rebase.StoppedAt" xml:space="preserve">중단 지점</x:String>
+  <x:String x:Key="Text.InProgress.Revert" xml:space="preserve">되돌리기 진행 중.</x:String>
+  <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">커밋 되돌리는 중</x:String>
+  <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">대화형 리베이스</x:String>
+  <x:String x:Key="Text.InteractiveRebase.AutoStash" xml:space="preserve">로컬 변경 사항 스태시 &amp; 재적용</x:String>
+  <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">기준:</x:String>
+  <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">드래그 앤 드롭으로 커밋 순서 변경</x:String>
+  <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">대상 브랜치:</x:String>
+  <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">링크 복사</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">브라우저에서 열기</x:String>
+  <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.Pages" xml:space="preserve">탭</x:String>
+  <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">작업 공간</x:String>
+  <x:String x:Key="Text.Merge" xml:space="preserve">브랜치 병합</x:String>
+  <x:String x:Key="Text.Merge.Edit" 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>
+  <x:String x:Key="Text.Merge.Source" xml:space="preserve">소스:</x:String>
+  <x:String x:Key="Text.MergeMultiple" xml:space="preserve">병합 (다중)</x:String>
+  <x:String x:Key="Text.MergeMultiple.CommitChanges" xml:space="preserve">모든 변경 사항 커밋</x:String>
+  <x:String x:Key="Text.MergeMultiple.Strategy" xml:space="preserve">전략:</x:String>
+  <x:String x:Key="Text.MergeMultiple.Targets" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.MoveSubmodule" xml:space="preserve">서브모듈 이동</x:String>
+  <x:String x:Key="Text.MoveSubmodule.MoveTo" xml:space="preserve">이동 위치:</x:String>
+  <x:String x:Key="Text.MoveSubmodule.Submodule" xml:space="preserve">서브모듈:</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">저장소 노드 이동</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">상위 노드 선택:</x:String>
+  <x:String x:Key="Text.Name" xml:space="preserve">이름:</x:String>
+  <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git이 구성되지 않았습니다. [환경설정]으로 이동하여 먼저 구성하세요.</x:String>
+  <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">데이터 저장 디렉터리 열기</x:String>
+  <x:String x:Key="Text.OpenInExternalMergeTool" xml:space="preserve">병합 도구에서 열기</x:String>
+  <x:String x:Key="Text.OpenWith" xml:space="preserve">다음으로 열기...</x:String>
+  <x:String x:Key="Text.Optional" xml:space="preserve">선택 사항.</x:String>
+  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">새 탭 만들기</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.Bookmark" xml:space="preserve">북마크</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">탭 닫기</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">다른 탭 닫기</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">오른쪽 탭 닫기</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">저장소 경로 복사</x:String>
+  <x:String x:Key="Text.PageTabBar.Welcome.Title" xml:space="preserve">저장소</x:String>
+  <x:String x:Key="Text.Paste" xml:space="preserve">붙여넣기</x:String>
+  <x:String x:Key="Text.Period.DaysAgo" xml:space="preserve">{0}일 전</x:String>
+  <x:String x:Key="Text.Period.HourAgo" xml:space="preserve">1시간 전</x:String>
+  <x:String x:Key="Text.Period.HoursAgo" xml:space="preserve">{0}시간 전</x:String>
+  <x:String x:Key="Text.Period.JustNow" xml:space="preserve">방금 전</x:String>
+  <x:String x:Key="Text.Period.LastMonth" xml:space="preserve">지난 달</x:String>
+  <x:String x:Key="Text.Period.LastYear" xml:space="preserve">작년</x:String>
+  <x:String x:Key="Text.Period.MinutesAgo" xml:space="preserve">{0}분 전</x:String>
+  <x:String x:Key="Text.Period.MonthsAgo" xml:space="preserve">{0}개월 전</x:String>
+  <x:String x:Key="Text.Period.YearsAgo" xml:space="preserve">{0}년 전</x:String>
+  <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">어제</x:String>
+  <x:String x:Key="Text.Preferences" xml:space="preserve">환경설정</x:String>
+  <x:String x:Key="Text.Preferences.AI" xml:space="preserve">AI</x:String>
+  <x:String x:Key="Text.Preferences.AI.AnalyzeDiffPrompt" xml:space="preserve">Diff 분석 프롬프트</x:String>
+  <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API 키</x:String>
+  <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">제목 생성 프롬프트</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">모델</x:String>
+  <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">이름</x:String>
+  <x:String x:Key="Text.Preferences.AI.ReadApiKeyFromEnv" xml:space="preserve">입력된 값은 환경변수(ENV)에서 API 키를 불러올 이름입니다</x:String>
+  <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">서버</x:String>
+  <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">스트리밍 활성화</x:String>
+  <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">모양</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">기본 글꼴</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">에디터 탭 너비</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">글꼴 크기</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">기본</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">에디터</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">고정폭 글꼴</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">텍스트 에디터에서만 고정폭 글꼴 사용</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">테마</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">테마 재정의</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">스크롤바 자동 숨기기 사용</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">제목 표시줄에 고정폭 탭 사용</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">네이티브 윈도우 프레임 사용</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE 도구</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">설치 경로</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Path.Placeholder" xml:space="preserve">diff/merge 도구 경로 입력</x:String>
+  <x:String x:Key="Text.Preferences.DiffMerge.Type" xml:space="preserve">도구</x:String>
+  <x:String x:Key="Text.Preferences.General" xml:space="preserve">일반</x:String>
+  <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">시작 시 업데이트 확인</x:String>
+  <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">날짜 형식</x:String>
+  <x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">변경 사항 트리에서 폴더 압축 활성화</x:String>
+  <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">언어</x:String>
+  <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">히스토리 커밋 수</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">그래프에 커밋 시간 대신 작성자 시간 표시</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">기본으로 `로컬 변경 사항` 페이지 표시</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">커밋 세부 정보에서 기본으로 `변경 사항` 탭 표시</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">커밋 세부 정보에 자식 커밋 표시</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">커밋 그래프에 태그 표시</x:String>
+  <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">제목 가이드 길이</x:String>
+  <x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">GitHub 스타일 기본 아바타 생성</x:String>
+  <x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
+  <x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">자동 CRLF 활성화</x:String>
+  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">기본 복제 디렉터리</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">사용자 이메일</x:String>
+  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">전역 git 사용자 이메일</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Fetch 시 --prune 활성화</x:String>
+  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">diff 시 --ignore-cr-at-eol 활성화</x:String>
+  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">이 앱은 Git (&gt;= 2.25.1)을(를) 필요로 합니다</x:String>
+  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">설치 경로</x:String>
+  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">HTTP SSL 검증 활성화</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">git-credential-manager 대신 git-credential-libsecret 사용</x:String>
+  <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">사용자 이름</x:String>
+  <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">전역 git 사용자 이름</x:String>
+  <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git 버전</x:String>
+  <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG 서명</x:String>
+  <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">커밋 GPG 서명</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Format" xml:space="preserve">GPG 형식</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path" xml:space="preserve">프로그램 설치 경로</x:String>
+  <x:String x:Key="Text.Preferences.GPG.Path.Placeholder" xml:space="preserve">설치된 gpg 프로그램 경로 입력</x:String>
+  <x:String x:Key="Text.Preferences.GPG.TagEnabled" xml:space="preserve">태그 GPG 서명</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey" xml:space="preserve">사용자 서명 키</x:String>
+  <x:String x:Key="Text.Preferences.GPG.UserKey.Placeholder" xml:space="preserve">사용자의 gpg 서명 키</x:String>
+  <x:String x:Key="Text.Preferences.Integration" xml:space="preserve">연동</x:String>
+  <x:String x:Key="Text.Preferences.Shell" xml:space="preserve">셸/터미널</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Path" xml:space="preserve">경로</x:String>
+  <x:String x:Key="Text.Preferences.Shell.Type" xml:space="preserve">셸/터미널</x:String>
+  <x:String x:Key="Text.PruneRemote" xml:space="preserve">원격 정리</x:String>
+  <x:String x:Key="Text.PruneRemote.Target" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.PruneWorktrees" xml:space="preserve">워크트리 정리</x:String>
+  <x:String x:Key="Text.PruneWorktrees.Tip" xml:space="preserve">`$GIT_COMMON_DIR/worktrees`의 워크트리 정보 정리</x:String>
+  <x:String x:Key="Text.Pull" xml:space="preserve">Pull</x:String>
+  <x:String x:Key="Text.Pull.Branch" xml:space="preserve">원격 브랜치:</x:String>
+  <x:String x:Key="Text.Pull.Into" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.Pull.LocalChanges" xml:space="preserve">로컬 변경 사항:</x:String>
+  <x:String x:Key="Text.Pull.LocalChanges.Discard" xml:space="preserve">폐기</x:String>
+  <x:String x:Key="Text.Pull.LocalChanges.StashAndReply" xml:space="preserve">스태시 &amp; 재적용</x:String>
+  <x:String x:Key="Text.Pull.RecurseSubmodules" xml:space="preserve">모든 서브모듈 업데이트</x:String>
+  <x:String x:Key="Text.Pull.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.Pull.Title" xml:space="preserve">Pull (Fetch &amp; 병합)</x:String>
+  <x:String x:Key="Text.Pull.UseRebase" xml:space="preserve">병합 대신 리베이스 사용</x:String>
+  <x:String x:Key="Text.Push" xml:space="preserve">푸시</x:String>
+  <x:String x:Key="Text.Push.CheckSubmodules" xml:space="preserve">서브모듈이 푸시되었는지 확인</x:String>
+  <x:String x:Key="Text.Push.Force" xml:space="preserve">강제 푸시</x:String>
+  <x:String x:Key="Text.Push.Local" xml:space="preserve">로컬 브랜치:</x:String>
+  <x:String x:Key="Text.Push.New" xml:space="preserve">신규</x:String>
+  <x:String x:Key="Text.Push.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.Push.Revision" xml:space="preserve">리비전:</x:String>
+  <x:String x:Key="Text.Push.Revision.Title" xml:space="preserve">리비전을 원격에 푸시</x:String>
+  <x:String x:Key="Text.Push.Title" xml:space="preserve">변경 사항을 원격에 푸시</x:String>
+  <x:String x:Key="Text.Push.To" xml:space="preserve">원격 브랜치:</x:String>
+  <x:String x:Key="Text.Push.Tracking" xml:space="preserve">추적 브랜치로 설정</x:String>
+  <x:String x:Key="Text.Push.WithAllTags" xml:space="preserve">모든 태그 푸시</x:String>
+  <x:String x:Key="Text.PushTag" xml:space="preserve">태그를 원격에 푸시</x:String>
+  <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">모든 원격에 푸시</x:String>
+  <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">원격:</x:String>
+  <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">태그:</x:String>
+  <x:String x:Key="Text.Quit" xml:space="preserve">종료</x:String>
+  <x:String x:Key="Text.Rebase" xml:space="preserve">현재 브랜치 리베이스</x:String>
+  <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">로컬 변경 사항 스태시 &amp; 재적용</x:String>
+  <x:String x:Key="Text.Rebase.On" xml:space="preserve">기준:</x:String>
+  <x:String x:Key="Text.Remote.AddTitle" xml:space="preserve">원격 추가</x:String>
+  <x:String x:Key="Text.Remote.EditTitle" xml:space="preserve">원격 편집</x:String>
+  <x:String x:Key="Text.Remote.Name" xml:space="preserve">이름:</x:String>
+  <x:String x:Key="Text.Remote.Name.Placeholder" xml:space="preserve">원격 이름</x:String>
+  <x:String x:Key="Text.Remote.URL" xml:space="preserve">저장소 URL:</x:String>
+  <x:String x:Key="Text.Remote.URL.Placeholder" xml:space="preserve">원격 git 저장소 URL</x:String>
+  <x:String x:Key="Text.RemoteCM.CopyURL" xml:space="preserve">URL 복사</x:String>
+  <x:String x:Key="Text.RemoteCM.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.RemoteCM.Delete" xml:space="preserve">삭제...</x:String>
+  <x:String x:Key="Text.RemoteCM.Edit" xml:space="preserve">편집...</x:String>
+  <x:String x:Key="Text.RemoteCM.Fetch" xml:space="preserve">Fetch</x:String>
+  <x:String x:Key="Text.RemoteCM.OpenInBrowser" xml:space="preserve">브라우저에서 열기</x:String>
+  <x:String x:Key="Text.RemoteCM.Prune" xml:space="preserve">정리</x:String>
+  <x:String x:Key="Text.RemoveWorktree" xml:space="preserve">워크트리 제거 확인</x:String>
+  <x:String x:Key="Text.RemoveWorktree.Force" xml:space="preserve">`--force` 옵션 활성화</x:String>
+  <x:String x:Key="Text.RemoveWorktree.Target" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.RenameBranch" xml:space="preserve">브랜치 이름 변경</x:String>
+  <x:String x:Key="Text.RenameBranch.Name" xml:space="preserve">새 이름:</x:String>
+  <x:String x:Key="Text.RenameBranch.Name.Placeholder" xml:space="preserve">이 브랜치의 고유한 이름</x:String>
+  <x:String x:Key="Text.RenameBranch.Target" xml:space="preserve">브랜치:</x:String>
+  <x:String x:Key="Text.Repository.Abort" xml:space="preserve">중단</x:String>
+  <x:String x:Key="Text.Repository.AutoFetching" xml:space="preserve">원격에서 변경 사항 자동 Fetch 중...</x:String>
+  <x:String x:Key="Text.Repository.BranchSort" xml:space="preserve">정렬</x:String>
+  <x:String x:Key="Text.Repository.BranchSort.ByCommitterDate" xml:space="preserve">커밋 날짜 순</x:String>
+  <x:String x:Key="Text.Repository.BranchSort.ByName" xml:space="preserve">이름 순</x:String>
+  <x:String x:Key="Text.Repository.Clean" xml:space="preserve">정리 (GC &amp; Prune)</x:String>
+  <x:String x:Key="Text.Repository.CleanTips" xml:space="preserve">이 저장소에 대해 `git gc` 명령을 실행합니다.</x:String>
+  <x:String x:Key="Text.Repository.ClearAllCommitsFilter" xml:space="preserve">모두 지우기</x:String>
+  <x:String x:Key="Text.Repository.ClearStashes" xml:space="preserve">지우기</x:String>
+  <x:String x:Key="Text.Repository.Configure" xml:space="preserve">이 저장소 설정</x:String>
+  <x:String x:Key="Text.Repository.Continue" xml:space="preserve">계속</x:String>
+  <x:String x:Key="Text.Repository.CustomActions" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.Repository.CustomActions.Empty" xml:space="preserve">사용자 지정 작업 없음</x:String>
+  <x:String x:Key="Text.Repository.Dashboard" xml:space="preserve">대시보드</x:String>
+  <x:String x:Key="Text.Repository.DiscardAll" xml:space="preserve">모든 변경 사항 폐기</x:String>
+  <x:String x:Key="Text.Repository.Explore" xml:space="preserve">파일 탐색기에서 열기</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">브랜치/태그/서브모듈 검색</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">그래프에 표시 여부</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">설정 안 함</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">커밋 그래프에서 숨기기</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">커밋 그래프에서 필터링</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">레이아웃</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">수평</x:String>
+  <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">수직</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder" xml:space="preserve">커밋 순서</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.ByDate" xml:space="preserve">커밋 날짜</x:String>
+  <x:String x:Key="Text.Repository.HistoriesOrder.Topo" xml:space="preserve">위상 정렬</x:String>
+  <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">로컬 브랜치</x:String>
+  <x:String x:Key="Text.Repository.MoreOptions" xml:space="preserve">추가 옵션...</x:String>
+  <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">HEAD로 이동</x:String>
+  <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">브랜치 생성</x:String>
+  <x:String x:Key="Text.Repository.Notifications.Clear" xml:space="preserve">알림 지우기</x:String>
+  <x:String x:Key="Text.Repository.OnlyHighlightCurrentBranchInGraph" xml:space="preserve">현재 브랜치만 강조</x:String>
+  <x:String x:Key="Text.Repository.OpenIn" xml:space="preserve">{0}에서 열기</x:String>
+  <x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">외부 도구에서 열기</x:String>
+  <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">원격</x:String>
+  <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">원격 추가</x:String>
+  <x:String x:Key="Text.Repository.Search" xml:space="preserve">커밋 검색</x:String>
+  <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">작성자</x:String>
+  <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">커밋터</x:String>
+  <x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">내용</x:String>
+  <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">메시지</x:String>
+  <x:String x:Key="Text.Repository.Search.ByPath" xml:space="preserve">경로</x:String>
+  <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.Repository.Search.InCurrentBranch" xml:space="preserve">현재 브랜치</x:String>
+  <x:String x:Key="Text.Repository.ShowDecoratedCommitsOnly" xml:space="preserve">장식된(Decorated) 커밋만</x:String>
+  <x:String x:Key="Text.Repository.ShowFirstParentOnly" xml:space="preserve">첫 번째 부모만</x:String>
+  <x:String x:Key="Text.Repository.ShowFlags" xml:space="preserve">플래그 표시</x:String>
+  <x:String x:Key="Text.Repository.ShowLostCommits" xml:space="preserve">유실된(Lost) 커밋 표시</x:String>
+  <x:String x:Key="Text.Repository.ShowSubmodulesAsTree" xml:space="preserve">서브모듈을 트리로 표시</x:String>
+  <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">태그를 트리로 표시</x:String>
+  <x:String x:Key="Text.Repository.Skip" xml:space="preserve">건너뛰기</x:String>
+  <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">통계</x:String>
+  <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">서브모듈</x:String>
+  <x:String x:Key="Text.Repository.Submodules.Add" xml:space="preserve">서브모듈 추가</x:String>
+  <x:String x:Key="Text.Repository.Submodules.Update" xml:space="preserve">서브모듈 업데이트</x:String>
+  <x:String x:Key="Text.Repository.Tags" xml:space="preserve">태그</x:String>
+  <x:String x:Key="Text.Repository.Tags.Add" xml:space="preserve">새 태그</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByCreatorDate" xml:space="preserve">생성 날짜 순</x:String>
+  <x:String x:Key="Text.Repository.Tags.OrderByName" xml:space="preserve">이름 순</x:String>
+  <x:String x:Key="Text.Repository.Tags.Sort" xml:space="preserve">정렬</x:String>
+  <x:String x:Key="Text.Repository.Terminal" xml:space="preserve">터미널에서 열기</x:String>
+  <x:String x:Key="Text.Repository.UseRelativeTimeInGraph" xml:space="preserve">상대 시간 사용</x:String>
+  <x:String x:Key="Text.Repository.ViewLogs" xml:space="preserve">로그 보기</x:String>
+  <x:String x:Key="Text.Repository.Visit" xml:space="preserve">브라우저에서 '{0}' 방문</x:String>
+  <x:String x:Key="Text.Repository.Worktrees" xml:space="preserve">워크트리</x:String>
+  <x:String x:Key="Text.Repository.Worktrees.Add" xml:space="preserve">워크트리 추가</x:String>
+  <x:String x:Key="Text.Repository.Worktrees.Prune" xml:space="preserve">정리</x:String>
+  <x:String x:Key="Text.RepositoryURL" xml:space="preserve">Git 저장소 URL</x:String>
+  <x:String x:Key="Text.Reset" xml:space="preserve">현재 브랜치를 리비전으로 리셋</x:String>
+  <x:String x:Key="Text.Reset.Mode" xml:space="preserve">리셋 모드:</x:String>
+  <x:String x:Key="Text.Reset.MoveTo" xml:space="preserve">이동 대상:</x:String>
+  <x:String x:Key="Text.Reset.Target" xml:space="preserve">현재 브랜치:</x:String>
+  <x:String x:Key="Text.ResetWithoutCheckout" xml:space="preserve">브랜치 리셋 (체크아웃 없음)</x:String>
+  <x:String x:Key="Text.ResetWithoutCheckout.MoveTo" xml:space="preserve">이동 대상:</x:String>
+  <x:String x:Key="Text.ResetWithoutCheckout.Target" xml:space="preserve">브랜치:</x:String>
+  <x:String x:Key="Text.RevealFile" xml:space="preserve">파일 탐색기에서 보기</x:String>
+  <x:String x:Key="Text.Revert" xml:space="preserve">커밋 되돌리기</x:String>
+  <x:String x:Key="Text.Revert.Commit" xml:space="preserve">커밋:</x:String>
+  <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">되돌린 변경 사항 커밋</x:String>
+  <x:String x:Key="Text.Reword" xml:space="preserve">커밋 메시지 수정</x:String>
+  <x:String x:Key="Text.Running" xml:space="preserve">실행 중. 잠시만 기다려주세요...</x:String>
+  <x:String x:Key="Text.Save" xml:space="preserve">저장</x:String>
+  <x:String x:Key="Text.SaveAs" xml:space="preserve">다른 이름으로 저장...</x:String>
+  <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">패치가 성공적으로 저장되었습니다!</x:String>
+  <x:String x:Key="Text.ScanRepositories" xml:space="preserve">저장소 스캔</x:String>
+  <x:String x:Key="Text.ScanRepositories.RootDir" xml:space="preserve">루트 디렉터리:</x:String>
+  <x:String x:Key="Text.ScanRepositories.UseCustomDir" xml:space="preserve">다른 사용자 정의 디렉터리 스캔</x:String>
+  <x:String x:Key="Text.SelfUpdate" xml:space="preserve">업데이트 확인...</x:String>
+  <x:String x:Key="Text.SelfUpdate.Available" xml:space="preserve">이 소프트웨어의 새 버전을 사용할 수 있습니다: </x:String>
+  <x:String x:Key="Text.SelfUpdate.Error" xml:space="preserve">업데이트 확인 실패!</x:String>
+  <x:String x:Key="Text.SelfUpdate.GotoDownload" xml:space="preserve">다운로드</x:String>
+  <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">이 버전 건너뛰기</x:String>
+  <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">소프트웨어 업데이트</x:String>
+  <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">현재 사용 가능한 업데이트가 없습니다.</x:String>
+  <x:String x:Key="Text.SetSubmoduleBranch" xml:space="preserve">서브모듈 브랜치 설정</x:String>
+  <x:String x:Key="Text.SetSubmoduleBranch.Submodule" xml:space="preserve">서브모듈:</x:String>
+  <x:String x:Key="Text.SetSubmoduleBranch.Current" xml:space="preserve">현재:</x:String>
+  <x:String x:Key="Text.SetSubmoduleBranch.New" xml:space="preserve">변경:</x:String>
+  <x:String x:Key="Text.SetSubmoduleBranch.New.Tip" xml:space="preserve">선택 사항. 비어 있으면 기본값으로 설정됩니다.</x:String>
+  <x:String x:Key="Text.SetUpstream" xml:space="preserve">추적 브랜치 설정</x:String>
+  <x:String x:Key="Text.SetUpstream.Local" xml:space="preserve">브랜치:</x:String>
+  <x:String x:Key="Text.SetUpstream.Unset" xml:space="preserve">업스트림 설정 해제</x:String>
+  <x:String x:Key="Text.SetUpstream.Upstream" xml:space="preserve">업스트림:</x:String>
+  <x:String x:Key="Text.SHALinkCM.CopySHA" xml:space="preserve">SHA 복사</x:String>
+  <x:String x:Key="Text.SHALinkCM.NavigateTo" xml:space="preserve">이동</x:String>
+  <x:String x:Key="Text.Squash" xml:space="preserve">커밋 스쿼시</x:String>
+  <x:String x:Key="Text.Squash.Into" xml:space="preserve">대상:</x:String>
+  <x:String x:Key="Text.SSHKey" xml:space="preserve">SSH 개인 키:</x:String>
+  <x:String x:Key="Text.SSHKey.Placeholder" xml:space="preserve">개인 SSH 키 저장 경로</x:String>
+  <x:String x:Key="Text.Start" xml:space="preserve">시작</x:String>
+  <x:String x:Key="Text.Stash" xml:space="preserve">스태시</x:String>
+  <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">추적하지 않는 파일 포함</x:String>
+  <x:String x:Key="Text.Stash.Message" xml:space="preserve">메시지:</x:String>
+  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">선택 사항. 이 스태시의 메시지</x:String>
+  <x:String x:Key="Text.Stash.Mode" xml:space="preserve">모드:</x:String>
+  <x:String x:Key="Text.Stash.OnlyStagedChanges" xml:space="preserve">스테이징된 변경 사항만</x:String>
+  <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">선택한 파일의 스테이징된 변경 사항과 스테이징되지 않은 변경 사항이 모두 스태시됩니다!!!</x:String>
+  <x:String x:Key="Text.Stash.Title" xml:space="preserve">로컬 변경 사항 스태시</x:String>
+  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">적용</x:String>
+  <x:String x:Key="Text.StashCM.CopyMessage" xml:space="preserve">메시지 복사</x:String>
+  <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">삭제</x:String>
+  <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">패치로 저장...</x:String>
+  <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">스태시 삭제</x:String>
+  <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">삭제:</x:String>
+  <x:String x:Key="Text.Stashes" xml:space="preserve">스태시</x:String>
+  <x:String x:Key="Text.Stashes.Changes" xml:space="preserve">변경 사항</x:String>
+  <x:String x:Key="Text.Stashes.Stashes" xml:space="preserve">스태시</x:String>
+  <x:String x:Key="Text.Statistics" xml:space="preserve">통계</x:String>
+  <x:String x:Key="Text.Statistics.Overview" xml:space="preserve">개요</x:String>
+  <x:String x:Key="Text.Statistics.ThisMonth" xml:space="preserve">이번 달</x:String>
+  <x:String x:Key="Text.Statistics.ThisWeek" xml:space="preserve">이번 주</x:String>
+  <x:String x:Key="Text.Statistics.TotalAuthors" xml:space="preserve">작성자: </x:String>
+  <x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">커밋: </x:String>
+  <x:String x:Key="Text.Submodule" xml:space="preserve">서브모듈</x:String>
+  <x:String x:Key="Text.Submodule.Add" xml:space="preserve">서브모듈 추가</x:String>
+  <x:String x:Key="Text.Submodule.Branch" xml:space="preserve">브랜치</x:String>
+  <x:String x:Key="Text.Submodule.CopyBranch" xml:space="preserve">브랜치</x:String>
+  <x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">상대 경로</x:String>
+  <x:String x:Key="Text.Submodule.Deinit" xml:space="preserve">초기화 해제</x:String>
+  <x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">중첩된 서브모듈 Fetch</x:String>
+  <x:String x:Key="Text.Submodule.Histories" xml:space="preserve">히스토리</x:String>
+  <x:String x:Key="Text.Submodule.Move" xml:space="preserve">이동</x:String>
+  <x:String x:Key="Text.Submodule.Open" xml:space="preserve">저장소 열기</x:String>
+  <x:String x:Key="Text.Submodule.RelativePath" xml:space="preserve">상대 경로:</x:String>
+  <x:String x:Key="Text.Submodule.RelativePath.Placeholder" xml:space="preserve">이 모듈을 저장할 상대 폴더입니다.</x:String>
+  <x:String x:Key="Text.Submodule.Remove" xml:space="preserve">삭제</x:String>
+  <x:String x:Key="Text.Submodule.SetBranch" xml:space="preserve">브랜치 설정</x:String>
+  <x:String x:Key="Text.Submodule.SetURL" xml:space="preserve">URL 변경</x:String>
+  <x:String x:Key="Text.Submodule.Status" xml:space="preserve">상태</x:String>
+  <x:String x:Key="Text.Submodule.Status.Modified" xml:space="preserve">수정됨</x:String>
+  <x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">초기화 안 됨</x:String>
+  <x:String x:Key="Text.Submodule.Status.RevisionChanged" xml:space="preserve">리비전 변경됨</x:String>
+  <x:String x:Key="Text.Submodule.Status.Unmexrged" xml:space="preserve">병합 안 됨</x:String>
+  <x:String x:Key="Text.Submodule.Update" xml:space="preserve">업데이트</x:String>
+  <x:String x:Key="Text.Submodule.URL" xml:space="preserve">URL</x:String>
+  <x:String x:Key="Text.Sure" xml:space="preserve">확인</x:String>
+  <x:String x:Key="Text.Tag.Tagger" xml:space="preserve">태그 생성자</x:String>
+  <x:String x:Key="Text.Tag.Time" xml:space="preserve">시간</x:String>
+  <x:String x:Key="Text.TagCM.Copy.Message" xml:space="preserve">메시지</x:String>
+  <x:String x:Key="Text.TagCM.Copy.Name" xml:space="preserve">이름</x:String>
+  <x:String x:Key="Text.TagCM.Copy.Tagger" xml:space="preserve">태그 생성자</x:String>
+  <x:String x:Key="Text.TagCM.CopyName" xml:space="preserve">태그 이름 복사</x:String>
+  <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">사용자 지정 작업</x:String>
+  <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">${0}$ 삭제...</x:String>
+  <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">선택한 {0}개의 태그 삭제...</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">${0}$을(를) ${1}$(으)로 병합...</x:String>
+  <x:String x:Key="Text.TagCM.Push" xml:space="preserve">${0}$ 푸시...</x:String>
+  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">서브모듈 업데이트</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">모든 서브모듈</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">필요시 초기화</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">서브모듈 재귀적으로 탐색</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">서브모듈:</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.UpdateToRemoteTrackingBranch" xml:space="preserve">서브모듈의 원격 추적 브랜치로 업데이트</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
+  <x:String x:Key="Text.ViewLogs" xml:space="preserve">로그</x:String>
+  <x:String x:Key="Text.ViewLogs.Clear" xml:space="preserve">모두 지우기</x:String>
+  <x:String x:Key="Text.ViewLogs.CopyLog" xml:space="preserve">복사</x:String>
+  <x:String x:Key="Text.ViewLogs.Delete" xml:space="preserve">삭제</x:String>
+  <x:String x:Key="Text.Warn" xml:space="preserve">경고</x:String>
+  <x:String x:Key="Text.Welcome" xml:space="preserve">시작 페이지</x:String>
+  <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">그룹 생성</x:String>
+  <x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">하위 그룹 생성</x:String>
+  <x:String x:Key="Text.Welcome.Clone" xml:space="preserve">저장소 복제</x:String>
+  <x:String x:Key="Text.Welcome.Delete" xml:space="preserve">삭제</x:String>
+  <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">폴더 끌어다 놓기 지원. 사용자 정의 그룹화 지원.</x:String>
+  <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">편집</x:String>
+  <x:String x:Key="Text.Welcome.Move" xml:space="preserve">다른 그룹으로 이동</x:String>
+  <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">모든 저장소 열기</x:String>
+  <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">저장소 열기</x:String>
+  <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">터미널 열기</x:String>
+  <x:String x:Key="Text.Welcome.ScanDefaultCloneDir" xml:space="preserve">기본 복제 디렉터리의 저장소 다시 스캔</x:String>
+  <x:String x:Key="Text.Welcome.Search" xml:space="preserve">저장소 검색...</x:String>
+  <x:String x:Key="Text.WorkingCopy" xml:space="preserve">로컬 변경 사항</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git 무시</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">모든 *{0} 파일 무시</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">같은 폴더의 *{0} 파일 무시</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">이 폴더의 추적하지 않는 파일 무시</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">이 파일만 무시</x:String>
+  <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">수정</x:String>
+  <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">이제 이 파일을 스테이징할 수 있습니다.</x:String>
+  <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">히스토리 지우기</x:String>
+  <x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">모든 커밋 메시지 히스토리를 지우시겠습니까? 이 작업은 되돌릴 수 없습니다.</x:String>
+  <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">커밋</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">커밋 &amp; 푸시</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">템플릿/히스토리</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">클릭 이벤트 트리거</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">커밋 (수정)</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">모든 변경 사항 스테이징 후 커밋</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithDetachedHead">분리된(detached) HEAD에 커밋을 생성하고 있습니다. 계속하시겠습니까?</x:String>
+  <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithFilter">{0}개의 파일을 스테이징했지만 {1}개의 파일만 표시됩니다 ({2}개의 파일은 필터링됨). 계속하시겠습니까?</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">충돌 감지됨</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeTool" xml:space="preserve">외부 병합 도구 열기</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts" xml:space="preserve">모든 충돌을 외부 병합 도구에서 열기</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">파일 충돌 해결됨</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseMine" xml:space="preserve">내 것 사용</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">상대방 것 사용</x:String>
+  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">추적하지 않는 파일 포함</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">최근 입력한 메시지 없음</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">커밋 템플릿 없음</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoVerify" xml:space="preserve">검증 안 함</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">작성자 리셋</x:String>
+  <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">서명(SignOff)</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">스테이징됨</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">언스테이지</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">모두 언스테이지</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">스테이징 안 됨</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">스테이지</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">모두 스테이지</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchanged" xml:space="preserve">변경되지 않음으로 간주된 파일 보기</x:String>
+  <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">템플릿: ${0}$</x:String>
+  <x:String x:Key="Text.Workspace" xml:space="preserve">작업 공간: </x:String>
+  <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">작업 공간 설정...</x:String>
+  <x:String x:Key="Text.Worktree" xml:space="preserve">워크트리</x:String>
+  <x:String x:Key="Text.Worktree.CopyPath" xml:space="preserve">경로 복사</x:String>
+  <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">잠금</x:String>
+  <x:String x:Key="Text.Worktree.Open" xml:space="preserve">열기</x:String>
+  <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">제거</x:String>
+  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">잠금 해제</x:String>
+</ResourceDictionary>

From c963473219a0de60f62fcaececc985aa9f422171 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 05:55:36 +0000
Subject: [PATCH 33/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 15 +++++++++++++++
 src/Resources/Locales/ko_KR.axaml |  8 ++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index ca9c88be8..b91e2c84d 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -519,6 +519,21 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
+### ![ko__KR](https://img.shields.io/badge/ko__KR-99.22%25-yellow)
+
+<details>
+<summary>Missing keys in ko_KR.axaml</summary>
+
+- Text.Blame.BlameOnPreviousRevision
+- Text.Blame.TypeNotSupported
+- Text.BranchCM.CreatePR
+- Text.BranchCM.CreatePRForUpstream
+- Text.PushToNewBranch
+- Text.PushToNewBranch.Title
+- Text.Submodule.Status.Unmerged
+
+</details>
+
 ### ![pt__BR](https://img.shields.io/badge/pt__BR-70.95%25-red)
 
 <details>
diff --git a/src/Resources/Locales/ko_KR.axaml b/src/Resources/Locales/ko_KR.axaml
index ea262f0b0..35769b8bf 100644
--- a/src/Resources/Locales/ko_KR.axaml
+++ b/src/Resources/Locales/ko_KR.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-<x:String x:Key="Text.About" xml:space="preserve">정보</x:String>
+
+  <x:String x:Key="Text.About" xml:space="preserve">정보</x:String>
   <x:String x:Key="Text.About.Menu" xml:space="preserve">SourceGit 정보</x:String>
   <x:String x:Key="Text.About.ReleaseNotes" xml:space="preserve">릴리스 노트</x:String>
   <x:String x:Key="Text.About.SubTitle" xml:space="preserve">오픈소스 &amp; 무료 Git GUI 클라이언트</x:String>
@@ -52,7 +53,6 @@
   <x:String x:Key="Text.Bisect.Skip">건너뛰기</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">이진 탐색 중. 현재 커밋을 '좋음' 또는 '나쁨'으로 표시하고 다른 커밋을 체크아웃하세요.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">블레임</x:String>
-  <x:String x:Key="Text.BlameTypeNotSupported" xml:space="preserve">이 파일은 블레임을 지원하지 않습니다!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ 체크아웃...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">${0}$와(과) 비교</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">워크트리와 비교</x:String>
@@ -458,7 +458,6 @@
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">이전 탭으로 이동</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">새 탭 만들기</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">환경설정 대화상자 열기</x:String>
-  <x:String x:Key="Text.Hotkeys.Global.SwitchWorkspace" xml:space="preserve">활성 작업 공간 전환</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">활성 탭 전환</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">저장소</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">스테이징된 변경 사항 커밋</x:String>
@@ -558,11 +557,9 @@
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">기본</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">에디터</x:String>
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">고정폭 글꼴</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">텍스트 에디터에서만 고정폭 글꼴 사용</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">테마</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">테마 재정의</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">스크롤바 자동 숨기기 사용</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">제목 표시줄에 고정폭 탭 사용</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">네이티브 윈도우 프레임 사용</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE 도구</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">설치 경로</x:String>
@@ -814,7 +811,6 @@
   <x:String x:Key="Text.Submodule.Status.Modified" xml:space="preserve">수정됨</x:String>
   <x:String x:Key="Text.Submodule.Status.NotInited" xml:space="preserve">초기화 안 됨</x:String>
   <x:String x:Key="Text.Submodule.Status.RevisionChanged" xml:space="preserve">리비전 변경됨</x:String>
-  <x:String x:Key="Text.Submodule.Status.Unmexrged" xml:space="preserve">병합 안 됨</x:String>
   <x:String x:Key="Text.Submodule.Update" xml:space="preserve">업데이트</x:String>
   <x:String x:Key="Text.Submodule.URL" xml:space="preserve">URL</x:String>
   <x:String x:Key="Text.Sure" xml:space="preserve">확인</x:String>

From 6907e2220cc4c225120b78572e35dfdd9fbe540a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 20 Oct 2025 13:58:11 +0800
Subject: [PATCH 34/72] =?UTF-8?q?doc:=20add=20`=ED=95=9C=EA=B5=AD=EC=96=B4?=
 =?UTF-8?q?`=20translations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f0c037bd..25de6dd87 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* Deutsch/English/Español/Bahasa Indonesia/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)
+* Deutsch/English/Español/Bahasa Indonesia/Français/Italiano/Português/Русский/Українська/简体中文/繁體中文/日本語/தமிழ் (Tamil)/한국어
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph

From 11d66c67118b84b541c74931b999e8444f2bdbca Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 20 Oct 2025 15:06:09 +0800
Subject: [PATCH 35/72] ux: main tab close icon style

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/LauncherTabBar.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index c82656edc..d3f23b91b 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -107,7 +107,7 @@
 
                   <Button Grid.Column="2"
                           Classes="icon_button"
-                          Width="12" Height="12" Margin="12,0"
+                          Width="14" Height="12" Margin="12,0"
                           Click="OnCloseTab">
                     <ToolTip.Tip>
                       <StackPanel Orientation="Horizontal" VerticalAlignment="Center">

From aed9ddedfd59754712b258a0d65e5cf26363a374 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 20 Oct 2025 21:24:15 +0800
Subject: [PATCH 36/72] feature: allows to customize conventional commit types
 (#1861)

Signed-off-by: leo <longshuang@msn.cn>
---
 README.md                                     | 22 +++++++++
 src/App.JsonCodeGen.cs                        |  1 +
 src/Models/ConventionalCommitType.cs          | 45 ++++++++++++-------
 src/Models/RepositorySettings.cs              |  6 +++
 src/Resources/Locales/en_US.axaml             |  1 +
 src/Resources/Locales/zh_CN.axaml             |  1 +
 src/Resources/Locales/zh_TW.axaml             |  1 +
 .../ConventionalCommitMessageBuilder.cs       | 21 ++++++---
 src/ViewModels/InteractiveRebase.cs           |  5 +++
 src/ViewModels/RepositoryConfigure.cs         | 13 ++++++
 src/Views/CommitMessageEditor.axaml.cs        | 31 ++++++++++++-
 src/Views/CommitMessageTextBox.axaml.cs       | 20 ++++++---
 .../ConventionalCommitMessageBuilder.axaml    |  4 +-
 src/Views/InteractiveRebase.axaml.cs          |  5 ++-
 src/Views/RepositoryConfigure.axaml           | 25 ++++++++---
 src/Views/RepositoryConfigure.axaml.cs        | 15 +++++++
 16 files changed, 179 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 25de6dd87..016642907 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@
 * Custom Action
 * Create PR on GitHub/Gitlab/Gitea/Gitee/Bitbucket...
 * Using AI to generate commit message (C# port of [anjerodev/commitollama](https://github.com/anjerodev/commitollama))
+* Built-in conventional commit message helper.
 
 > [!WARNING]
 > **Linux** only tested on **Debian 12** on both **X11** & **Wayland**.
@@ -173,6 +174,27 @@ This app supports open repository in external tools listed in the table below.
 > [!NOTE]
 > This app also supports a lot of `JetBrains` IDEs, installing `JetBrains Toolbox` will help this app to find them.
 
+## Conventional Commit Helper
+
+You can define your own conventional commit types (per-repository) by following steps:
+
+1. Create a json file with your own conventional commit type definitions. For example:
+```json
+[
+  {
+    "Name": "New Feature",
+    "Type": "Feature",
+    "Description": "Adding a new feature"
+  },
+  {
+    "Name": "Bug Fixes",
+    "Type": "Fix",
+    "Description": "Fixing a bug"
+  }
+]
+```
+2. Configure the `Conventional Commit Types` in repository configuration window.  
+
 ## Screenshots
 
 * Dark Theme
diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
index 8535f980d..9ef93d231 100644
--- a/src/App.JsonCodeGen.cs
+++ b/src/App.JsonCodeGen.cs
@@ -65,6 +65,7 @@ public override void Write(Utf8JsonWriter writer, DataGridLength value, JsonSeri
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
     [JsonSerializable(typeof(Models.RepositorySettings))]
+    [JsonSerializable(typeof(List<Models.ConventionalCommitType>))]
     [JsonSerializable(typeof(List<Models.LFSLock>))]
     [JsonSerializable(typeof(List<Models.VisualStudioInstance>))]
     [JsonSerializable(typeof(ViewModels.Preferences))]
diff --git a/src/Models/ConventionalCommitType.cs b/src/Models/ConventionalCommitType.cs
index 531a16c07..9275ff116 100644
--- a/src/Models/ConventionalCommitType.cs
+++ b/src/Models/ConventionalCommitType.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
 
 namespace SourceGit.Models
 {
@@ -8,26 +10,39 @@ public class ConventionalCommitType
         public string Type { get; set; }
         public string Description { get; set; }
 
-        public static readonly List<ConventionalCommitType> Supported = [
-            new("Features", "feat", "Adding a new feature"),
-            new("Bug Fixes", "fix", "Fixing a bug"),
-            new("Work In Progress", "wip", "Still being developed and not yet complete"),
-            new("Reverts", "revert", "Undoing a previous commit"),
-            new("Code Refactoring", "refactor", "Restructuring code without changing its external behavior"),
-            new("Performance Improvements", "perf", "Improves performance"),
-            new("Builds", "build", "Changes that affect the build system or external dependencies"),
-            new("Continuous Integrations", "ci", "Changes to CI configuration files and scripts"),
-            new("Documentations", "docs", "Updating documentation"),
-            new("Styles", "style", "Elements or code styles without changing the code logic"),
-            new("Tests", "test", "Adding or updating tests"),
-            new("Chores", "chore", "Other changes that don't modify src or test files"),
-        ];
-
         public ConventionalCommitType(string name, string type, string description)
         {
             Name = name;
             Type = type;
             Description = description;
         }
+
+        public static List<ConventionalCommitType> Load(string storageFile)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(storageFile) && File.Exists(storageFile))
+                    return JsonSerializer.Deserialize(File.ReadAllText(storageFile), JsonCodeGen.Default.ListConventionalCommitType) ?? [];
+            }
+            catch
+            {
+                // Ignore errors.
+            }
+
+            return new List<ConventionalCommitType> {
+                new("Features", "feat", "Adding a new feature"),
+                new("Bug Fixes", "fix", "Fixing a bug"),
+                new("Work In Progress", "wip", "Still being developed and not yet complete"),
+                new("Reverts", "revert", "Undoing a previous commit"),
+                new("Code Refactoring", "refactor", "Restructuring code without changing its external behavior"),
+                new("Performance Improvements", "perf", "Improves performance"),
+                new("Builds", "build", "Changes that affect the build system or external dependencies"),
+                new("Continuous Integrations", "ci", "Changes to CI configuration files and scripts"),
+                new("Documentations", "docs", "Updating documentation"),
+                new("Styles", "style", "Elements or code styles without changing the code logic"),
+                new("Tests", "test", "Adding or updating tests"),
+                new("Chores", "chore", "Other changes that don't modify src or test files"),
+            };
+        }
     }
 }
diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs
index 0ca4eda27..3c310432e 100644
--- a/src/Models/RepositorySettings.cs
+++ b/src/Models/RepositorySettings.cs
@@ -236,6 +236,12 @@ public string LastCommitMessage
             set;
         } = string.Empty;
 
+        public string ConventionalTypesOverride
+        {
+            get;
+            set;
+        } = string.Empty;
+
         public Dictionary<string, FilterMode> CollectHistoriesFilters()
         {
             var map = new Dictionary<string, FilterMode>();
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 1b978bc56..0e4e87330 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -222,6 +222,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Fetch remotes automatically</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(s)</x:String>
+  <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">Conventional Commit Types</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Default Remote</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">Preferred Merge Mode</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE TRACKER</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 8700104d8..8a31a35a6 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -226,6 +226,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT配置</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">启用定时自动拉取远程更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分钟</x:String>
+  <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">自定义规范化提交类型</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">默认远程</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">默认合并方式</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ISSUE追踪</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 29cd3807c..9944c41d0 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -226,6 +226,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">Git 設定</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">啟用定時自動提取 (fetch) 遠端更新</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">分鐘</x:String>
+  <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">自訂約定式提交類型</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">預設遠端存放庫</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">預設合併模式</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">Issue 追蹤</x:String>
diff --git a/src/ViewModels/ConventionalCommitMessageBuilder.cs b/src/ViewModels/ConventionalCommitMessageBuilder.cs
index d002a77d9..31d7f438e 100644
--- a/src/ViewModels/ConventionalCommitMessageBuilder.cs
+++ b/src/ViewModels/ConventionalCommitMessageBuilder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
@@ -9,11 +10,17 @@ namespace SourceGit.ViewModels
 {
     public class ConventionalCommitMessageBuilder : ObservableValidator
     {
+        public List<Models.ConventionalCommitType> Types
+        {
+            get;
+            private set;
+        } = [];
+
         [Required(ErrorMessage = "Type of changes can not be null")]
-        public Models.ConventionalCommitType Type
+        public Models.ConventionalCommitType SelectedType
         {
-            get => _type;
-            set => SetProperty(ref _type, value, true);
+            get => _selectedType;
+            set => SetProperty(ref _selectedType, value, true);
         }
 
         public string Scope
@@ -47,8 +54,10 @@ public string ClosedIssue
             set => SetProperty(ref _closedIssue, value);
         }
 
-        public ConventionalCommitMessageBuilder(Action<string> onApply)
+        public ConventionalCommitMessageBuilder(string conventionalTypesOverride, Action<string> onApply)
         {
+            Types = Models.ConventionalCommitType.Load(conventionalTypesOverride);
+            SelectedType = Types.Count > 0 ? Types[0] : null;
             _onApply = onApply;
         }
 
@@ -63,7 +72,7 @@ public bool Apply()
                 return false;
 
             var builder = new StringBuilder();
-            builder.Append(_type.Type);
+            builder.Append(_selectedType.Type);
 
             if (!string.IsNullOrEmpty(_scope))
             {
@@ -103,7 +112,7 @@ public bool Apply()
         }
 
         private Action<string> _onApply = null;
-        private Models.ConventionalCommitType _type = Models.ConventionalCommitType.Supported[0];
+        private Models.ConventionalCommitType _selectedType = null;
         private string _scope = string.Empty;
         private string _description = string.Empty;
         private string _detail = string.Empty;
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 721d5b4fd..719b8354b 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -96,6 +96,11 @@ public AvaloniaList<Models.IssueTracker> IssueTrackers
             get => _repo.IssueTrackers;
         }
 
+        public string ConventionalTypesOverride
+        {
+            get => _repo.Settings.ConventionalTypesOverride;
+        }
+
         public bool IsLoading
         {
             get => _isLoading;
diff --git a/src/ViewModels/RepositoryConfigure.cs b/src/ViewModels/RepositoryConfigure.cs
index 0074a19f6..bc1e59b36 100644
--- a/src/ViewModels/RepositoryConfigure.cs
+++ b/src/ViewModels/RepositoryConfigure.cs
@@ -76,6 +76,19 @@ public string HttpProxy
             set => SetProperty(ref _httpProxy, value);
         }
 
+        public string ConventionalTypesOverride
+        {
+            get => _repo.Settings.ConventionalTypesOverride;
+            set
+            {
+                if (_repo.Settings.ConventionalTypesOverride != value)
+                {
+                    _repo.Settings.ConventionalTypesOverride = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public bool EnablePruneOnFetch
         {
             get;
diff --git a/src/Views/CommitMessageEditor.axaml.cs b/src/Views/CommitMessageEditor.axaml.cs
index 868f95b5b..338c23177 100644
--- a/src/Views/CommitMessageEditor.axaml.cs
+++ b/src/Views/CommitMessageEditor.axaml.cs
@@ -1,12 +1,18 @@
 using System;
 using System.IO;
-
+using System.Text.Json;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
     public partial class CommitMessageEditor : ChromelessWindow
     {
+        public string ConventionalTypesOverride
+        {
+            get;
+            private set;
+        } = string.Empty;
+
         public CommitMessageEditor()
         {
             CloseOnESC = true;
@@ -15,6 +21,25 @@ public CommitMessageEditor()
 
         public void AsStandalone(string file)
         {
+            var gitDir = new Commands.QueryGitDir(Path.GetDirectoryName(file)).GetResult();
+            if (!string.IsNullOrEmpty(gitDir))
+            {
+                var settingsFile = Path.Combine(gitDir, "sourcegit.settings");
+                if (File.Exists(settingsFile))
+                {
+                    try
+                    {
+                        using var stream = File.OpenRead(settingsFile);
+                        var settings = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.RepositorySettings);
+                        ConventionalTypesOverride = settings.ConventionalTypesOverride;
+                    }
+                    catch
+                    {
+                        // Ignore errors
+                    }
+                }
+            }
+
             _onSave = msg => File.WriteAllText(file, msg);
             _shouldExitApp = true;
 
@@ -25,8 +50,10 @@ public void AsStandalone(string file)
                 Editor.DescriptionEditor.Text = parts[1].Trim();
         }
 
-        public void AsBuiltin(string msg, Action<string> onSave)
+        public void AsBuiltin(string conventionalTypesOverride, string msg, Action<string> onSave)
         {
+            ConventionalTypesOverride = conventionalTypesOverride;
+
             _onSave = onSave;
             _shouldExitApp = false;
 
diff --git a/src/Views/CommitMessageTextBox.axaml.cs b/src/Views/CommitMessageTextBox.axaml.cs
index 0fd0b487b..955190147 100644
--- a/src/Views/CommitMessageTextBox.axaml.cs
+++ b/src/Views/CommitMessageTextBox.axaml.cs
@@ -339,13 +339,21 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
 
         private async void OnOpenConventionalCommitHelper(object _, RoutedEventArgs e)
         {
-            var toplevel = TopLevel.GetTopLevel(this);
-            if (toplevel is Window owner)
+            var owner = TopLevel.GetTopLevel(this) as Window;
+            if (owner == null)
+                return;
+
+            var conventionalTypesOverride = owner switch
             {
-                var vm = new ViewModels.ConventionalCommitMessageBuilder(text => Text = text);
-                var builder = new ConventionalCommitMessageBuilder() { DataContext = vm };
-                await builder.ShowDialog(owner);
-            }
+                Launcher { DataContext: ViewModels.Launcher { ActivePage: { Data: ViewModels.Repository repo } } } => repo.Settings.ConventionalTypesOverride,
+                RepositoryConfigure { DataContext: ViewModels.RepositoryConfigure config } => config.ConventionalTypesOverride,
+                CommitMessageEditor editor => editor.ConventionalTypesOverride,
+                _ => string.Empty
+            };
+
+            var vm = new ViewModels.ConventionalCommitMessageBuilder(conventionalTypesOverride, text => Text = text);
+            var builder = new ConventionalCommitMessageBuilder() { DataContext = vm };
+            await builder.ShowDialog(owner);
 
             e.Handled = true;
         }
diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml
index a64037f82..f0e1a44d1 100644
--- a/src/Views/ConventionalCommitMessageBuilder.axaml
+++ b/src/Views/ConventionalCommitMessageBuilder.axaml
@@ -47,8 +47,8 @@
       <ComboBox Grid.Row="0" Grid.Column="1"
                 Height="28" Padding="8,0"
                 VerticalAlignment="Center" HorizontalAlignment="Stretch"
-                ItemsSource="{Binding Source={x:Static m:ConventionalCommitType.Supported}}"
-                SelectedItem="{Binding Type, Mode=TwoWay}"
+                ItemsSource="{Binding Types, Mode=OneWay}"
+                SelectedItem="{Binding SelectedType, Mode=TwoWay}"
                 Grid.IsSharedSizeScope="True">
         <ComboBox.SelectionBoxItemTemplate>
           <DataTemplate DataType="m:ConventionalCommitType">
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
index b2f5fd9c3..4f8f035b4 100644
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@@ -103,8 +103,11 @@ public InteractiveRebase()
 
         public void OpenCommitMessageEditor(ViewModels.InteractiveRebaseItem item)
         {
+            if (DataContext is not ViewModels.InteractiveRebase vm)
+                return;
+
             var dialog = new CommitMessageEditor();
-            dialog.AsBuiltin(item.FullMessage, msg => item.FullMessage = msg);
+            dialog.AsBuiltin(vm.ConventionalTypesOverride, item.FullMessage, msg => item.FullMessage = msg);
             dialog.ShowDialog(this);
         }
 
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 6aea73adf..91af9c447 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -44,7 +44,7 @@
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.Git}"/>
         </TabItem.Header>
 
-        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+        <Grid Margin="16,4,16,8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      HorizontalAlignment="Right" VerticalAlignment="Center"
                      Margin="0,0,8,0"
@@ -147,19 +147,34 @@
                    Watermark="{DynamicResource Text.Preferences.GPG.UserKey.Placeholder}"
                    Text="{Binding GPGUserSigningKey, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="6" Grid.Column="1"
+          <TextBlock Grid.Row="6" Grid.Column="0"
+                     Text="{DynamicResource Text.Configure.Git.ConventionalTypesOverride}"
+                     HorizontalAlignment="Right"
+                     Margin="0,0,8,0"/>
+          <TextBox Grid.Row="6" Grid.Column="1"
+                   Height="28"
+                   CornerRadius="3"
+                   Text="{Binding ConventionalTypesOverride, Mode=TwoWay}">
+            <TextBox.InnerRightContent>
+              <Button Classes="icon_button" Width="30" Height="30" Click="SelectConventionalTypesFile">
+                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </TextBox.InnerRightContent>
+          </TextBox>
+
+          <CheckBox Grid.Row="7" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
                     IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="7" Grid.Column="1"
+          <CheckBox Grid.Row="8" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
                     IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
 
-          <CheckBox Grid.Row="8" Grid.Column="1"
+          <CheckBox Grid.Row="9" Grid.Column="1"
                     Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
                     IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
 
-          <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal">
+          <StackPanel Grid.Row="10" Grid.Column="1" Orientation="Horizontal">
             <CheckBox x:Name="AutoFetchCheckBox"
                       Content="{DynamicResource Text.Configure.Git.AutoFetch}"
                       IsChecked="{Binding EnableAutoFetch, Mode=TwoWay}"/>
diff --git a/src/Views/RepositoryConfigure.axaml.cs b/src/Views/RepositoryConfigure.axaml.cs
index 3ce581d76..2c5622df1 100644
--- a/src/Views/RepositoryConfigure.axaml.cs
+++ b/src/Views/RepositoryConfigure.axaml.cs
@@ -21,6 +21,21 @@ protected override async void OnClosing(WindowClosingEventArgs e)
                 await configure.SaveAsync();
         }
 
+        private async void SelectConventionalTypesFile(object sender, RoutedEventArgs e)
+        {
+            var options = new FilePickerOpenOptions()
+            {
+                FileTypeFilter = [new FilePickerFileType("Conventional Commit Types") { Patterns = ["*.json"] }],
+                AllowMultiple = false,
+            };
+
+            var selected = await StorageProvider.OpenFilePickerAsync(options);
+            if (selected.Count == 1 && DataContext is ViewModels.RepositoryConfigure vm)
+                vm.ConventionalTypesOverride = selected[0].Path.LocalPath;
+
+            e.Handled = true;
+        }
+
         private async void SelectExecutableForCustomAction(object sender, RoutedEventArgs e)
         {
             var options = new FilePickerOpenOptions()

From 33c6d9d0ef29b21635f276da0d0dccd3fc4f06d1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 13:24:57 +0000
Subject: [PATCH 37/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index b91e2c84d..ca6bac8d0 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.33%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.22%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -15,12 +15,13 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.33%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.22%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -29,12 +30,13 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.32%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.23%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -104,6 +106,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.InputControls.Edit
 - Text.Configure.CustomAction.Scope.Remote
 - Text.Configure.CustomAction.Scope.Tag
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
 - Text.Configure.IssueTracker.Share
@@ -245,7 +248,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-98.77%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-98.66%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -256,6 +259,7 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePRForUpstream
 - Text.CommitCM.Drop
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
@@ -264,7 +268,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-95.98%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-95.87%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -285,6 +289,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitDetail.Info.CopyNameAndEmail
 - Text.CommitMessageTextBox.PasteAndReplaceAll
 - Text.Configure.CommitMessageTemplate.BuiltinVars
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Diff.Image.Difference
 - Text.DirtyState.HasLocalChanges
 - Text.DirtyState.HasPendingPullOrPush
@@ -308,7 +313,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.32%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.23%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -379,6 +384,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.InputControls.Edit
 - Text.Configure.CustomAction.Scope.Remote
 - Text.Configure.CustomAction.Scope.Tag
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
 - Text.Configure.IssueTracker.Share
@@ -519,7 +525,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-99.22%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-99.11%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -528,13 +534,14 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.TypeNotSupported
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 - Text.Submodule.Status.Unmerged
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-70.95%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.87%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -619,6 +626,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.Scope.Remote
 - Text.Configure.CustomAction.Scope.Tag
 - Text.Configure.CustomAction.WaitForExit
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
 - Text.Configure.IssueTracker.AddSampleGiteeIssue
@@ -802,16 +810,17 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.78%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.Blame.BlameOnPreviousRevision
+- Text.Configure.Git.ConventionalTypesOverride
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.43%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.34%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -882,6 +891,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.InputControls.Edit
 - Text.Configure.CustomAction.Scope.Remote
 - Text.Configure.CustomAction.Scope.Tag
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Configure.Git.PreferredMergeMode
 - Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
 - Text.Configure.IssueTracker.Share
@@ -1021,7 +1031,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.55%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.46%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1091,6 +1101,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CustomAction.InputControls.Edit
 - Text.Configure.CustomAction.Scope.Remote
 - Text.Configure.CustomAction.Scope.Tag
+- Text.Configure.Git.ConventionalTypesOverride
 - Text.Configure.IssueTracker.AddSampleGerritChangeIdCommit
 - Text.Configure.IssueTracker.Share
 - Text.ConfigureCustomActionControls

From d9b2b45922ef53ba09e357ec7db08b45d6f192a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20J=2E=20Mart=C3=ADnez=20M=2E?=
 <56406225+jjesus-dev@users.noreply.github.com>
Date: Mon, 20 Oct 2025 20:31:25 -0600
Subject: [PATCH 38/72] localization: update Spanish translation (#1863)

Add missing strings.
---
 src/Resources/Locales/es_ES.axaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index 16131682a..44634488a 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -61,6 +61,8 @@
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Comparar con ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Comparar con Worktree</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Copiar Nombre de la Rama</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">Crear PR...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">Crear PR para upstream ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Acción personalizada</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Eliminar ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Eliminar {0} ramas seleccionadas</x:String>
@@ -637,6 +639,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Push a todos los remotos</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">Remoto:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">Etiqueta:</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">Push a una NUEVA rama</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">Nombre de entrada de la nueva rama remota:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Salir</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">Rebase Rama Actual</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Stash &amp; reaplicar cambios locales</x:String>

From 2925ae06066545f6cc98c81ebdeb515e3188d5bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:31:49 +0000
Subject: [PATCH 39/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index ca6bac8d0..b0bd02cf1 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -21,18 +21,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.22%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.67%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
 - Text.Blame.BlameOnPreviousRevision
-- Text.BranchCM.CreatePR
-- Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
-- Text.PushToNewBranch
-- Text.PushToNewBranch.Title
 
 </details>
 

From 27e3a97d7e93f0631efbae17d1c9b9969f3ec8db Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 21 Oct 2025 10:49:48 +0800
Subject: [PATCH 40/72] ux: use another label for string values in custom input
 control because $1, $2... is not available here

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml             | 1 +
 src/Resources/Locales/zh_CN.axaml             | 1 +
 src/Resources/Locales/zh_TW.axaml             | 1 +
 src/Views/ConfigureCustomActionControls.axaml | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 0e4e87330..011f26c7f 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -256,6 +256,7 @@
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">Label:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">Options:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">Use '|' as delimiter for options</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">The built-in variables ${REPO}, ${REMOTE}, ${BRANCH}, ${BRANCH_FRIENDLY_NAME}, ${SHA}, and ${TAG} remain available here</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">Type:</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Workspaces</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Color</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 8a31a35a6..88f020e4a 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -260,6 +260,7 @@
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">名称 ：</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">选项列表 ：</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">选项之间请使用英文 '|' 作为分隔符</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">内置变量 ${REPO}, ${REMOTE}, ${BRANCH}, ${BRANCH_FRIENDLY_NAME}, ${SHA} 与 ${TAG} 在这里仍然可用</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">类型 ：</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">工作区</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">颜色</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 9944c41d0..e329f3525 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -260,6 +260,7 @@
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">名稱:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">選項列表:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">請使用英文「|」符號分隔選項</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">內建變數 ${REPO}、${REMOTE}、${BRANCH}、${BRANCH_FRIENDLY_NAME}、${SHA} 及 ${TAG} 在此處仍可使用</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">類型:</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">工作區</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">顏色</x:String>
diff --git a/src/Views/ConfigureCustomActionControls.axaml b/src/Views/ConfigureCustomActionControls.axaml
index 1e7c9fa83..e24bc0101 100644
--- a/src/Views/ConfigureCustomActionControls.axaml
+++ b/src/Views/ConfigureCustomActionControls.axaml
@@ -177,7 +177,7 @@
               <TextBlock Margin="0,2,0,0"
                          Classes="small"
                          TextWrapping="Wrap"
-                         Text="{DynamicResource Text.Configure.CustomAction.Arguments.Tip}"
+                         Text="{DynamicResource Text.ConfigureCustomActionControls.StringValue.Tip}"
                          Foreground="{DynamicResource Brush.FG2}">
                 <TextBlock.IsVisible>
                   <MultiBinding Converter="{x:Static BoolConverters.Or}">

From a70182e7b7d59a0d6e3dbbaefdd50aee1737ca2f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:50:11 +0000
Subject: [PATCH 41/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index b0bd02cf1..c02202014 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.22%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.11%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -16,12 +16,13 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.67%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.55%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -29,10 +30,11 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.BlameOnPreviousRevision
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.23%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.15%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -115,6 +117,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.Label
 - Text.ConfigureCustomActionControls.Options
 - Text.ConfigureCustomActionControls.Options.Tip
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.ConfigureCustomActionControls.Type
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
@@ -244,7 +247,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-98.66%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-98.55%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -256,6 +259,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitCM.Drop
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
@@ -264,7 +268,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-95.87%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-95.76%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -286,6 +290,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitMessageTextBox.PasteAndReplaceAll
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.Diff.Image.Difference
 - Text.DirtyState.HasLocalChanges
 - Text.DirtyState.HasPendingPullOrPush
@@ -309,7 +314,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.23%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.15%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -393,6 +398,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.Label
 - Text.ConfigureCustomActionControls.Options
 - Text.ConfigureCustomActionControls.Options.Tip
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.ConfigureCustomActionControls.Type
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
@@ -521,7 +527,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-99.11%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-99.00%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -531,13 +537,14 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 - Text.Submodule.Status.Unmerged
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-70.87%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.79%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -637,6 +644,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.Label
 - Text.ConfigureCustomActionControls.Options
 - Text.ConfigureCustomActionControls.Options.Tip
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.ConfigureCustomActionControls.Type
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
@@ -806,17 +814,18 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.78%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.67%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.Blame.BlameOnPreviousRevision
 - Text.Configure.Git.ConventionalTypesOverride
+- Text.ConfigureCustomActionControls.StringValue.Tip
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.34%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.26%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -900,6 +909,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.Label
 - Text.ConfigureCustomActionControls.Options
 - Text.ConfigureCustomActionControls.Options.Tip
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.ConfigureCustomActionControls.Type
 - Text.ConfirmEmptyCommit.Continue
 - Text.ConfirmEmptyCommit.NoLocalChanges
@@ -1027,7 +1037,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.46%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.37%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1109,6 +1119,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.Label
 - Text.ConfigureCustomActionControls.Options
 - Text.ConfigureCustomActionControls.Options.Tip
+- Text.ConfigureCustomActionControls.StringValue.Tip
 - Text.ConfigureCustomActionControls.Type
 - Text.ConfigureWorkspace.Name
 - Text.ConfirmRestart.Title

From fe471ac89d5cb2efea6851e2850a86c96b749731 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 21 Oct 2025 16:05:11 +0800
Subject: [PATCH 42/72] feature: enable multiple-selection for changes
 collection view in `Changes Detail`/`Stash Changes`/`Branch
 Compare`/`Revision Compare` (#1826)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/Checkout.cs                |  15 ++
 src/ViewModels/BranchCompare.cs         |   7 +
 src/ViewModels/CommitDetail.cs          |  37 ++++-
 src/ViewModels/RevisionCompare.cs       |  11 +-
 src/ViewModels/StashesPage.cs           |  38 ++++-
 src/Views/BranchCompare.axaml.cs        | 169 +++++++++++++++-------
 src/Views/ChangeCollectionView.axaml    |   6 +-
 src/Views/ChangeCollectionView.axaml.cs |   9 --
 src/Views/CommitChanges.axaml           |   3 +-
 src/Views/CommitChanges.axaml.cs        |  42 +++---
 src/Views/CommitDetail.axaml.cs         |  93 ++++++++++++
 src/Views/RevisionCompare.axaml.cs      | 175 ++++++++++++++++-------
 src/Views/StashesPage.axaml.cs          | 179 ++++++++++++++++--------
 src/Views/WorkingCopy.axaml             |   2 -
 14 files changed, 585 insertions(+), 201 deletions(-)

diff --git a/src/Commands/Checkout.cs b/src/Commands/Checkout.cs
index 23cbd413b..024636bf9 100644
--- a/src/Commands/Checkout.cs
+++ b/src/Commands/Checkout.cs
@@ -72,5 +72,20 @@ public async Task<bool> FileWithRevisionAsync(string file, string revision)
             Args = $"checkout --no-overlay {revision} -- {file.Quoted()}";
             return await ExecAsync().ConfigureAwait(false);
         }
+
+        public async Task<bool> MultipleFilesWithRevisionAsync(List<string> files, string revision)
+        {
+            var builder = new StringBuilder();
+            builder
+                .Append("checkout --no-overlay ")
+                .Append(revision)
+                .Append(" --");
+
+            foreach (var f in files)
+                builder.Append(' ').Append(f.Quoted());
+
+            Args = builder.ToString();
+            return await ExecAsync().ConfigureAwait(false);
+        }
     }
 }
diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs
index bbe26390e..e7f17e490 100644
--- a/src/ViewModels/BranchCompare.cs
+++ b/src/ViewModels/BranchCompare.cs
@@ -128,6 +128,13 @@ public string GetAbsPath(string path)
             return Native.OS.GetAbsPath(_repo, path);
         }
 
+        public async Task SaveChangesAsPatchAsync(List<Models.Change> changes, string saveTo)
+        {
+            var succ = await Commands.SaveChangesAsPatch.ProcessRevisionCompareChangesAsync(_repo, changes, _based.Head, _to.Head, saveTo);
+            if (succ)
+                App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"));
+        }
+
         private void Refresh()
         {
             IsLoading = true;
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 1501f6b4d..c272689dc 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -239,7 +239,7 @@ public async Task SaveChangesAsPatchAsync(List<Models.Change> changes, string sa
         public async Task ResetToThisRevisionAsync(string path)
         {
             var log = _repo.CreateLog($"Reset File to '{_commit.SHA}'");
-            await new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevisionAsync(path, $"{_commit.SHA}");
+            await new Commands.Checkout(_repo.FullPath).Use(log).FileWithRevisionAsync(path, _commit.SHA);
             log.Complete();
         }
 
@@ -254,6 +254,41 @@ public async Task ResetToParentRevisionAsync(Models.Change change)
             log.Complete();
         }
 
+        public async Task ResetMultipleToThisRevisionAsync(List<Models.Change> changes)
+        {
+            var files = new List<string>();
+            foreach (var c in changes)
+                files.Add(c.Path);
+
+            var log = _repo.CreateLog($"Reset Files to '{_commit.SHA}'");
+            await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(files, _commit.SHA);
+            log.Complete();
+        }
+
+        public async Task ResetMultipleToParentRevisionAsync(List<Models.Change> changes)
+        {
+            var renamed = new List<string>();
+            var modified = new List<string>();
+
+            foreach (var c in changes)
+            {
+                if (c.Index == Models.ChangeState.Renamed)
+                    renamed.Add(c.OriginalPath);
+                else
+                    modified.Add(c.Path);
+            }
+
+            var log = _repo.CreateLog($"Reset Files to '{_commit.SHA}~1'");
+
+            if (modified.Count > 0)
+                await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(modified, $"{_commit.SHA}~1");
+
+            if (renamed.Count > 0)
+                await new Commands.Checkout(_repo.FullPath).Use(log).MultipleFilesWithRevisionAsync(renamed, $"{_commit.SHA}~1");
+
+            log.Complete();
+        }
+
         public async Task<List<Models.Object>> GetRevisionFilesUnderFolderAsync(string parentFolder)
         {
             return await new Commands.QueryRevisionObjects(_repo.FullPath, _commit.SHA, parentFolder)
diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs
index ca81a0dc7..4de7b16d6 100644
--- a/src/ViewModels/RevisionCompare.cs
+++ b/src/ViewModels/RevisionCompare.cs
@@ -127,14 +127,11 @@ public string GetAbsPath(string path)
             return Native.OS.GetAbsPath(_repo, path);
         }
 
-        public void SaveAsPatch(string saveTo)
+        public async Task SaveChangesAsPatchAsync(List<Models.Change> changes, string saveTo)
         {
-            Task.Run(async () =>
-            {
-                var succ = await Commands.SaveChangesAsPatch.ProcessRevisionCompareChangesAsync(_repo, _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
-                if (succ)
-                    App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"));
-            });
+            var succ = await Commands.SaveChangesAsPatch.ProcessRevisionCompareChangesAsync(_repo, changes ?? _changes, GetSHA(_startPoint), GetSHA(_endPoint), saveTo);
+            if (succ)
+                App.SendNotification(_repo, App.Text("SaveAsPatchSuccess"));
         }
 
         public void ClearSearchFilter()
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index de34ecab0..96f01c7a0 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -158,7 +158,7 @@ public void Drop(Models.Stash stash)
                 _repo.ShowPopup(new DropStash(_repo, stash));
         }
 
-        public async Task SaveStashAsPathAsync(Models.Stash stash, string saveTo)
+        public async Task SaveStashAsPatchAsync(Models.Stash stash, string saveTo)
         {
             var opts = new List<Models.DiffOption>();
             var changes = await new Commands.CompareRevisions(_repo.FullPath, $"{stash.SHA}^", stash.SHA)
@@ -211,6 +211,42 @@ public async Task CheckoutSingleFileAsync(Models.Change change)
             log.Complete();
         }
 
+        public async Task CheckoutMultipleFileAsync(List<Models.Change> changes)
+        {
+            var untracked = new List<string>();
+            var added = new List<string>();
+            var modified = new List<string>();
+
+            foreach (var c in changes)
+            {
+                if (_untracked.Contains(c) && _selectedStash.Parents.Count == 3)
+                    untracked.Add(c.Path);
+                else if (c.Index == Models.ChangeState.Added && _selectedStash.Parents.Count > 1)
+                    added.Add(c.Path);
+                else
+                    modified.Add(c.Path);
+            }
+
+            var log = _repo.CreateLog($"Reset File to '{_selectedStash.Name}'");
+
+            if (untracked.Count > 0)
+                await new Commands.Checkout(_repo.FullPath)
+                    .Use(log)
+                    .MultipleFilesWithRevisionAsync(untracked, _selectedStash.Parents[2]);
+
+            if (added.Count > 0)
+                await new Commands.Checkout(_repo.FullPath)
+                    .Use(log)
+                    .MultipleFilesWithRevisionAsync(added, _selectedStash.Parents[1]);
+
+            if (modified.Count > 0)
+                await new Commands.Checkout(_repo.FullPath)
+                    .Use(log)
+                    .MultipleFilesWithRevisionAsync(modified, _selectedStash.SHA);
+
+            log.Complete();
+        }
+
         private void RefreshVisible()
         {
             if (string.IsNullOrEmpty(_searchFilter))
diff --git a/src/Views/BranchCompare.axaml.cs b/src/Views/BranchCompare.axaml.cs
index 886825b14..08083ccca 100644
--- a/src/Views/BranchCompare.axaml.cs
+++ b/src/Views/BranchCompare.axaml.cs
@@ -1,8 +1,10 @@
 using System;
 using System.IO;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Input;
+using Avalonia.Platform.Storage;
 
 namespace SourceGit.Views
 {
@@ -15,61 +17,127 @@ public BranchCompare()
 
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.BranchCompare { SelectedChanges: { Count: 1 } selected } vm &&
+            if (DataContext is ViewModels.BranchCompare { SelectedChanges: { Count: > 0 } selected } vm &&
                 sender is ChangeCollectionView view)
             {
-                var repo = vm.RepositoryPath;
-                var change = selected[0];
                 var menu = new ContextMenu();
+                var repo = vm.RepositoryPath;
 
-                var openWithMerger = new MenuItem();
-                openWithMerger.Header = App.Text("OpenInExternalMergeTool");
-                openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
-                openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
-                openWithMerger.Click += (_, ev) =>
+                var patch = new MenuItem();
+                patch.Header = App.Text("FileCM.SaveAsPatch");
+                patch.Icon = App.CreateMenuIcon("Icons.Diff");
+                patch.Click += async (_, e) =>
                 {
-                    new Commands.DiffTool(repo, new Models.DiffOption(vm.Base.Head, vm.To.Head, change)).Open();
-                    ev.Handled = true;
+                    var storageProvider = this.StorageProvider;
+                    if (storageProvider == null)
+                        return;
+
+                    var options = new FilePickerSaveOptions();
+                    options.Title = App.Text("FileCM.SaveAsPatch");
+                    options.DefaultExtension = ".patch";
+                    options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
+
+                    var storageFile = await storageProvider.SaveFilePickerAsync(options);
+                    if (storageFile != null)
+                    {
+                        var saveTo = storageFile.Path.LocalPath;
+                        await vm.SaveChangesAsPatchAsync(selected, saveTo);
+                    }
+
+                    e.Handled = true;
                 };
-                menu.Items.Add(openWithMerger);
 
-                if (change.Index != Models.ChangeState.Deleted)
+                if (selected.Count == 1)
                 {
-                    var full = Path.GetFullPath(Path.Combine(repo, change.Path));
-                    var explore = new MenuItem();
-                    explore.Header = App.Text("RevealFile");
-                    explore.Icon = App.CreateMenuIcon("Icons.Explore");
-                    explore.IsEnabled = File.Exists(full);
-                    explore.Click += (_, ev) =>
+                    var change = selected[0];
+                    var openWithMerger = new MenuItem();
+                    openWithMerger.Header = App.Text("OpenInExternalMergeTool");
+                    openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
+                    openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
+                    openWithMerger.Click += (_, ev) =>
                     {
-                        Native.OS.OpenInFileManager(full, true);
+                        new Commands.DiffTool(repo, new Models.DiffOption(vm.Base.Head, vm.To.Head, change)).Open();
                         ev.Handled = true;
                     };
-                    menu.Items.Add(explore);
-                }
+                    menu.Items.Add(openWithMerger);
 
-                var copyPath = new MenuItem();
-                copyPath.Header = App.Text("CopyPath");
-                copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
-                copyPath.Click += async (_, ev) =>
-                {
-                    await App.CopyTextAsync(change.Path);
-                    ev.Handled = true;
-                };
-                menu.Items.Add(new MenuItem() { Header = "-" });
-                menu.Items.Add(copyPath);
-
-                var copyFullPath = new MenuItem();
-                copyFullPath.Header = App.Text("CopyFullPath");
-                copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
-                copyFullPath.Click += async (_, ev) =>
+                    if (change.Index != Models.ChangeState.Deleted)
+                    {
+                        var full = Path.GetFullPath(Path.Combine(repo, change.Path));
+                        var explore = new MenuItem();
+                        explore.Header = App.Text("RevealFile");
+                        explore.Icon = App.CreateMenuIcon("Icons.Explore");
+                        explore.IsEnabled = File.Exists(full);
+                        explore.Click += (_, ev) =>
+                        {
+                            Native.OS.OpenInFileManager(full, true);
+                            ev.Handled = true;
+                        };
+                        menu.Items.Add(explore);
+                    }
+
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(change.Path);
+                        ev.Handled = true;
+                    };
+
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(Native.OS.GetAbsPath(repo, change.Path));
+                        ev.Handled = true;
+                    };
+
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(patch);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                }
+                else
                 {
-                    await App.CopyTextAsync(Native.OS.GetAbsPath(repo, change.Path));
-                    ev.Handled = true;
-                };
-                menu.Items.Add(copyFullPath);
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(c.Path);
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(Native.OS.GetAbsPath(repo, c.Path));
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    menu.Items.Add(patch);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                }
+
                 menu.Open(view);
             }
 
@@ -89,17 +157,24 @@ private async void OnChangeCollectionViewKeyDown(object sender, KeyEventArgs e)
             if (DataContext is not ViewModels.BranchCompare vm)
                 return;
 
-            if (sender is not ChangeCollectionView { SelectedChanges: { Count: 1 } selectedChanges })
+            if (sender is not ChangeCollectionView { SelectedChanges: { Count: > 0 } selectedChanges })
                 return;
 
-            var change = selectedChanges[0];
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control) && e.Key == Key.C)
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-                    await App.CopyTextAsync(vm.GetAbsPath(change.Path));
+                var builder = new StringBuilder();
+                var copyAbsPath = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+                if (selectedChanges.Count == 1)
+                {
+                    builder.Append(copyAbsPath ? vm.GetAbsPath(selectedChanges[0].Path) : selectedChanges[0].Path);
+                }
                 else
-                    await App.CopyTextAsync(change.Path);
+                {
+                    foreach (var c in selectedChanges)
+                        builder.AppendLine(copyAbsPath ? vm.GetAbsPath(c.Path) : c.Path);
+                }
 
+                await App.CopyTextAsync(builder.ToString());
                 e.Handled = true;
             }
         }
diff --git a/src/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml
index e7cf63882..a00570f50 100644
--- a/src/Views/ChangeCollectionView.axaml
+++ b/src/Views/ChangeCollectionView.axaml
@@ -33,7 +33,7 @@
       <v:ChangeCollectionContainer Focusable="True"
                                    ItemsSource="{Binding Rows}"
                                    SelectedItems="{Binding SelectedRows, Mode=TwoWay}"
-                                   SelectionMode="{Binding #ThisControl.SelectionMode}"
+                                   SelectionMode="Multiple"
                                    SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="vm:ChangeTreeNode">
@@ -78,7 +78,7 @@
       <v:ChangeCollectionContainer Focusable="True"
                                    ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
-                                   SelectionMode="{Binding #ThisControl.SelectionMode}"
+                                   SelectionMode="Multiple"
                                    SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Change">
@@ -110,7 +110,7 @@
       <v:ChangeCollectionContainer Focusable="True"
                                    ItemsSource="{Binding Changes}"
                                    SelectedItems="{Binding SelectedChanges, Mode=TwoWay}"
-                                   SelectionMode="{Binding #ThisControl.SelectionMode}"
+                                   SelectionMode="Multiple"
                                    SelectionChanged="OnRowSelectionChanged">
         <ListBox.ItemTemplate>
           <DataTemplate DataType="m:Change">
diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs
index 4e3092fa8..237a69da4 100644
--- a/src/Views/ChangeCollectionView.axaml.cs
+++ b/src/Views/ChangeCollectionView.axaml.cs
@@ -61,15 +61,6 @@ public bool IsUnstagedChange
             set => SetValue(IsUnstagedChangeProperty, value);
         }
 
-        public static readonly StyledProperty<SelectionMode> SelectionModeProperty =
-            AvaloniaProperty.Register<ChangeCollectionView, SelectionMode>(nameof(SelectionMode));
-
-        public SelectionMode SelectionMode
-        {
-            get => GetValue(SelectionModeProperty);
-            set => SetValue(SelectionModeProperty, value);
-        }
-
         public static readonly StyledProperty<Models.ChangeViewMode> ViewModeProperty =
             AvaloniaProperty.Register<ChangeCollectionView, Models.ChangeViewMode>(nameof(ViewMode), Models.ChangeViewMode.Tree);
 
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 4656b6b48..e03a50ad2 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -45,8 +45,7 @@
 
       <!-- Changes -->
       <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
-        <v:ChangeCollectionView SelectionMode="Single"
-                                ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+        <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
diff --git a/src/Views/CommitChanges.axaml.cs b/src/Views/CommitChanges.axaml.cs
index 9364be16d..4ecc4310c 100644
--- a/src/Views/CommitChanges.axaml.cs
+++ b/src/Views/CommitChanges.axaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -17,27 +18,20 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
         {
             e.Handled = true;
 
-            if (sender is not ChangeCollectionView view)
+            if (sender is not ChangeCollectionView { SelectedChanges: { Count: > 0 } changes } view)
                 return;
 
             var detailView = this.FindAncestorOfType<CommitDetail>();
             if (detailView == null)
                 return;
 
-            var changes = view.SelectedChanges ?? [];
             var container = view.FindDescendantOfType<ChangeCollectionContainer>();
             if (container is { SelectedItems.Count: 1, SelectedItem: ViewModels.ChangeTreeNode { IsFolder: true } node })
-            {
-                var menu = detailView.CreateChangeContextMenuByFolder(node, changes);
-                menu.Open(view);
-                return;
-            }
-
-            if (changes.Count == 1)
-            {
-                var menu = detailView.CreateChangeContextMenu(changes[0]);
-                menu.Open(view);
-            }
+                detailView.CreateChangeContextMenuByFolder(node, changes)?.Open(view);
+            else if (changes.Count > 1)
+                detailView.CreateMultipleChangesContextMenu(changes)?.Open(view);
+            else
+                detailView.CreateChangeContextMenu(changes[0])?.Open(view);
         }
 
         private async void OnChangeCollectionViewKeyDown(object sender, KeyEventArgs e)
@@ -45,18 +39,30 @@ private async void OnChangeCollectionViewKeyDown(object sender, KeyEventArgs e)
             if (DataContext is not ViewModels.CommitDetail vm)
                 return;
 
-            if (sender is not ChangeCollectionView { SelectedChanges: { Count: 1 } selectedChanges })
+            if (sender is not ChangeCollectionView { SelectedChanges: { Count: > 0 } selectedChanges } view)
                 return;
 
-            var change = selectedChanges[0];
             if (e.Key == Key.C &&
                 e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-                    await App.CopyTextAsync(vm.GetAbsPath(change.Path));
+                var builder = new StringBuilder();
+                var copyAbsPath = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+                var container = view.FindDescendantOfType<ChangeCollectionContainer>();
+                if (container is { SelectedItems.Count: 1, SelectedItem: ViewModels.ChangeTreeNode { IsFolder: true } node })
+                {
+                    builder.Append(copyAbsPath ? vm.GetAbsPath(node.FullPath) : node.FullPath);
+                }
+                else if (selectedChanges.Count == 1)
+                {
+                    builder.Append(copyAbsPath ? vm.GetAbsPath(selectedChanges[0].Path) : selectedChanges[0].Path);
+                }
                 else
-                    await App.CopyTextAsync(change.Path);
+                {
+                    foreach (var c in selectedChanges)
+                        builder.AppendLine(copyAbsPath ? vm.GetAbsPath(c.Path) : c.Path);
+                }
 
+                await App.CopyTextAsync(builder.ToString());
                 e.Handled = true;
             }
         }
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
index 1d028ca8b..ee570e64f 100644
--- a/src/Views/CommitDetail.axaml.cs
+++ b/src/Views/CommitDetail.axaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -97,6 +98,98 @@ public ContextMenu CreateChangeContextMenuByFolder(ViewModels.ChangeTreeNode nod
             return menu;
         }
 
+        public ContextMenu CreateMultipleChangesContextMenu(List<Models.Change> changes)
+        {
+            if (DataContext is not ViewModels.CommitDetail { Repository: { } repo, Commit: { } commit } vm)
+                return null;
+
+            var patch = new MenuItem();
+            patch.Header = App.Text("FileCM.SaveAsPatch");
+            patch.Icon = App.CreateMenuIcon("Icons.Diff");
+            patch.Click += async (_, e) =>
+            {
+                var storageProvider = TopLevel.GetTopLevel(this)?.StorageProvider;
+                if (storageProvider == null)
+                    return;
+
+                var options = new FilePickerSaveOptions();
+                options.Title = App.Text("FileCM.SaveAsPatch");
+                options.DefaultExtension = ".patch";
+                options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
+
+                var storageFile = await storageProvider.SaveFilePickerAsync(options);
+                if (storageFile != null)
+                {
+                    var saveTo = storageFile.Path.LocalPath;
+                    await vm.SaveChangesAsPatchAsync(changes, saveTo);
+                }
+
+                e.Handled = true;
+            };
+
+            var menu = new ContextMenu();
+            menu.Items.Add(patch);
+            menu.Items.Add(new MenuItem() { Header = "-" });
+
+            if (!repo.IsBare)
+            {
+                var resetToThisRevision = new MenuItem();
+                resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
+                resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+                resetToThisRevision.Click += async (_, ev) =>
+                {
+                    await vm.ResetMultipleToThisRevisionAsync(changes);
+                    ev.Handled = true;
+                };
+
+                var resetToFirstParent = new MenuItem();
+                resetToFirstParent.Header = App.Text("ChangeCM.CheckoutFirstParentRevision");
+                resetToFirstParent.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+                resetToFirstParent.IsEnabled = commit.Parents.Count > 0;
+                resetToFirstParent.Click += async (_, ev) =>
+                {
+                    await vm.ResetMultipleToParentRevisionAsync(changes);
+                    ev.Handled = true;
+                };
+
+                menu.Items.Add(resetToThisRevision);
+                menu.Items.Add(resetToFirstParent);
+                menu.Items.Add(new MenuItem { Header = "-" });
+            }
+
+            var copyPath = new MenuItem();
+            copyPath.Header = App.Text("CopyPath");
+            copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+            copyPath.Click += async (_, ev) =>
+            {
+                var builder = new StringBuilder();
+                foreach (var c in changes)
+                    builder.AppendLine(c.Path);
+
+                await App.CopyTextAsync(builder.ToString());
+                ev.Handled = true;
+            };
+
+            var copyFullPath = new MenuItem();
+            copyFullPath.Header = App.Text("CopyFullPath");
+            copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+            copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+            copyFullPath.Click += async (_, e) =>
+            {
+                var builder = new StringBuilder();
+                foreach (var c in changes)
+                    builder.AppendLine(Native.OS.GetAbsPath(repo.FullPath, c.Path));
+
+                await App.CopyTextAsync(builder.ToString());
+                e.Handled = true;
+            };
+
+            menu.Items.Add(copyPath);
+            menu.Items.Add(copyFullPath);
+            return menu;
+        }
+
         public ContextMenu CreateChangeContextMenu(Models.Change change)
         {
             if (DataContext is not ViewModels.CommitDetail { Repository: { } repo, Commit: { } commit } vm)
diff --git a/src/Views/RevisionCompare.axaml.cs b/src/Views/RevisionCompare.axaml.cs
index bb27e7095..3a84baca1 100644
--- a/src/Views/RevisionCompare.axaml.cs
+++ b/src/Views/RevisionCompare.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -17,59 +18,126 @@ public RevisionCompare()
 
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.RevisionCompare { SelectedChanges: { Count: 1 } selected } vm &&
+            if (DataContext is ViewModels.RevisionCompare { SelectedChanges: { Count: > 0 } selected } vm &&
                 sender is ChangeCollectionView view)
             {
-                var change = selected[0];
-                var changeFullPath = vm.GetAbsPath(change.Path);
-                var menu = new ContextMenu();
-
-                var openWithMerger = new MenuItem();
-                openWithMerger.Header = App.Text("OpenInExternalMergeTool");
-                openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
-                openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
-                openWithMerger.Click += (_, ev) =>
+                var patch = new MenuItem();
+                patch.Header = App.Text("FileCM.SaveAsPatch");
+                patch.Icon = App.CreateMenuIcon("Icons.Diff");
+                patch.Click += async (_, e) =>
                 {
-                    vm.OpenChangeWithExternalDiffTool(change);
-                    ev.Handled = true;
+                    var storageProvider = TopLevel.GetTopLevel(this)?.StorageProvider;
+                    if (storageProvider == null)
+                        return;
+
+                    var options = new FilePickerSaveOptions();
+                    options.Title = App.Text("FileCM.SaveAsPatch");
+                    options.DefaultExtension = ".patch";
+                    options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
+
+                    var storageFile = await storageProvider.SaveFilePickerAsync(options);
+                    if (storageFile != null)
+                    {
+                        var saveTo = storageFile.Path.LocalPath;
+                        await vm.SaveChangesAsPatchAsync(selected, saveTo);
+                    }
+
+                    e.Handled = true;
                 };
-                menu.Items.Add(openWithMerger);
 
-                if (change.Index != Models.ChangeState.Deleted)
+                var menu = new ContextMenu();
+                if (selected.Count == 1)
                 {
-                    var explore = new MenuItem();
-                    explore.Header = App.Text("RevealFile");
-                    explore.Icon = App.CreateMenuIcon("Icons.Explore");
-                    explore.IsEnabled = File.Exists(changeFullPath);
-                    explore.Click += (_, ev) =>
+                    var change = selected[0];
+                    var changeFullPath = vm.GetAbsPath(change.Path);
+
+                    var openWithMerger = new MenuItem();
+                    openWithMerger.Header = App.Text("OpenInExternalMergeTool");
+                    openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
+                    openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
+                    openWithMerger.Click += (_, ev) =>
                     {
-                        Native.OS.OpenInFileManager(changeFullPath, true);
+                        vm.OpenChangeWithExternalDiffTool(change);
                         ev.Handled = true;
                     };
-                    menu.Items.Add(explore);
-                }
+                    menu.Items.Add(openWithMerger);
 
-                var copyPath = new MenuItem();
-                copyPath.Header = App.Text("CopyPath");
-                copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
-                copyPath.Click += async (_, ev) =>
-                {
-                    await App.CopyTextAsync(change.Path);
-                    ev.Handled = true;
-                };
-                menu.Items.Add(copyPath);
+                    if (change.Index != Models.ChangeState.Deleted)
+                    {
+                        var explore = new MenuItem();
+                        explore.Header = App.Text("RevealFile");
+                        explore.Icon = App.CreateMenuIcon("Icons.Explore");
+                        explore.IsEnabled = File.Exists(changeFullPath);
+                        explore.Click += (_, ev) =>
+                        {
+                            Native.OS.OpenInFileManager(changeFullPath, true);
+                            ev.Handled = true;
+                        };
+                        menu.Items.Add(explore);
+                    }
+
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(change.Path);
+                        ev.Handled = true;
+                    };
 
-                var copyFullPath = new MenuItem();
-                copyFullPath.Header = App.Text("CopyFullPath");
-                copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
-                copyFullPath.Click += async (_, ev) =>
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(changeFullPath);
+                        ev.Handled = true;
+                    };
+
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(patch);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                }
+                else
                 {
-                    await App.CopyTextAsync(changeFullPath);
-                    ev.Handled = true;
-                };
-                menu.Items.Add(copyFullPath);
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(c.Path);
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(vm.GetAbsPath(c.Path));
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    menu.Items.Add(patch);
+                    menu.Items.Add(new MenuItem() { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                }
+
                 menu.Open(view);
             }
 
@@ -86,8 +154,8 @@ private void OnPressedSHA(object sender, PointerPressedEventArgs e)
 
         private async void OnSaveAsPatch(object sender, RoutedEventArgs e)
         {
-            var topLevel = TopLevel.GetTopLevel(this);
-            if (topLevel == null)
+            var storage = TopLevel.GetTopLevel(this)?.StorageProvider;
+            if (storage == null)
                 return;
 
             if (DataContext is not ViewModels.RevisionCompare vm)
@@ -98,9 +166,9 @@ private async void OnSaveAsPatch(object sender, RoutedEventArgs e)
             options.DefaultExtension = ".patch";
             options.FileTypeChoices = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }];
 
-            var storageFile = await topLevel.StorageProvider.SaveFilePickerAsync(options);
+            var storageFile = await storage.SaveFilePickerAsync(options);
             if (storageFile != null)
-                vm.SaveAsPatch(storageFile.Path.LocalPath);
+                await vm.SaveChangesAsPatchAsync(null, storageFile.Path.LocalPath);
 
             e.Handled = true;
         }
@@ -110,17 +178,24 @@ private async void OnChangeCollectionViewKeyDown(object sender, KeyEventArgs e)
             if (DataContext is not ViewModels.RevisionCompare vm)
                 return;
 
-            if (sender is not ChangeCollectionView { SelectedChanges: { Count: 1 } selectedChanges })
+            if (sender is not ChangeCollectionView { SelectedChanges: { Count: > 0 } selectedChanges })
                 return;
 
-            var change = selectedChanges[0];
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control) && e.Key == Key.C)
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-                    await App.CopyTextAsync(vm.GetAbsPath(change.Path));
+                var builder = new StringBuilder();
+                var copyAbsPath = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+                if (selectedChanges.Count == 1)
+                {
+                    builder.Append(copyAbsPath ? vm.GetAbsPath(selectedChanges[0].Path) : selectedChanges[0].Path);
+                }
                 else
-                    await App.CopyTextAsync(change.Path);
+                {
+                    foreach (var c in selectedChanges)
+                        builder.AppendLine(copyAbsPath ? vm.GetAbsPath(c.Path) : c.Path);
+                }
 
+                await App.CopyTextAsync(builder.ToString());
                 e.Handled = true;
             }
         }
diff --git a/src/Views/StashesPage.axaml.cs b/src/Views/StashesPage.axaml.cs
index 6dc74f174..ec19e27ae 100644
--- a/src/Views/StashesPage.axaml.cs
+++ b/src/Views/StashesPage.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -84,7 +85,7 @@ private void OnStashContextRequested(object sender, ContextRequestedEventArgs e)
 
                     var storageFile = await storageProvider.SaveFilePickerAsync(options);
                     if (storageFile != null)
-                        await vm.SaveStashAsPathAsync(stash, storageFile.Path.LocalPath);
+                        await vm.SaveStashAsPatchAsync(stash, storageFile.Path.LocalPath);
 
                     ev.Handled = true;
                 };
@@ -123,70 +124,119 @@ private void OnStashDoubleTapped(object sender, TappedEventArgs e)
 
         private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.StashesPage { SelectedChanges: { Count: 1 } selected } vm &&
+            if (DataContext is ViewModels.StashesPage { SelectedChanges: { Count: > 0 } selected } vm &&
                 sender is ChangeCollectionView view)
             {
-                var change = selected[0];
-                var fullPath = vm.GetAbsPath(change.Path);
-
-                var openWithMerger = new MenuItem();
-                openWithMerger.Header = App.Text("OpenInExternalMergeTool");
-                openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
-                openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
-                openWithMerger.Click += (_, ev) =>
+                if (selected.Count == 1)
                 {
-                    vm.OpenChangeWithExternalDiffTool(change);
-                    ev.Handled = true;
-                };
+                    var change = selected[0];
+                    var fullPath = vm.GetAbsPath(change.Path);
 
-                var explore = new MenuItem();
-                explore.Header = App.Text("RevealFile");
-                explore.Icon = App.CreateMenuIcon("Icons.Explore");
-                explore.IsEnabled = File.Exists(fullPath);
-                explore.Click += (_, ev) =>
-                {
-                    Native.OS.OpenInFileManager(fullPath, true);
-                    ev.Handled = true;
-                };
+                    var openWithMerger = new MenuItem();
+                    openWithMerger.Header = App.Text("OpenInExternalMergeTool");
+                    openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
+                    openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
+                    openWithMerger.Click += (_, ev) =>
+                    {
+                        vm.OpenChangeWithExternalDiffTool(change);
+                        ev.Handled = true;
+                    };
 
-                var resetToThisRevision = new MenuItem();
-                resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
-                resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
-                resetToThisRevision.Click += async (_, ev) =>
-                {
-                    await vm.CheckoutSingleFileAsync(change);
-                    ev.Handled = true;
-                };
+                    var explore = new MenuItem();
+                    explore.Header = App.Text("RevealFile");
+                    explore.Icon = App.CreateMenuIcon("Icons.Explore");
+                    explore.IsEnabled = File.Exists(fullPath);
+                    explore.Click += (_, ev) =>
+                    {
+                        Native.OS.OpenInFileManager(fullPath, true);
+                        ev.Handled = true;
+                    };
 
-                var copyPath = new MenuItem();
-                copyPath.Header = App.Text("CopyPath");
-                copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
-                copyPath.Click += async (_, ev) =>
-                {
-                    await App.CopyTextAsync(change.Path);
-                    ev.Handled = true;
-                };
+                    var resetToThisRevision = new MenuItem();
+                    resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
+                    resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+                    resetToThisRevision.Click += async (_, ev) =>
+                    {
+                        await vm.CheckoutSingleFileAsync(change);
+                        ev.Handled = true;
+                    };
+
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(change.Path);
+                        ev.Handled = true;
+                    };
 
-                var copyFullPath = new MenuItem();
-                copyFullPath.Header = App.Text("CopyFullPath");
-                copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
-                copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
-                copyFullPath.Click += async (_, ev) =>
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        await App.CopyTextAsync(fullPath);
+                        ev.Handled = true;
+                    };
+
+                    var menu = new ContextMenu();
+                    menu.Items.Add(openWithMerger);
+                    menu.Items.Add(explore);
+                    menu.Items.Add(new MenuItem { Header = "-" });
+                    menu.Items.Add(resetToThisRevision);
+                    menu.Items.Add(new MenuItem { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                    menu.Open(view);
+                }
+                else
                 {
-                    await App.CopyTextAsync(fullPath);
-                    ev.Handled = true;
-                };
+                    var resetToThisRevision = new MenuItem();
+                    resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
+                    resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
+                    resetToThisRevision.Click += async (_, ev) =>
+                    {
+                        await vm.CheckoutMultipleFileAsync(selected);
+                        ev.Handled = true;
+                    };
 
-                var menu = new ContextMenu();
-                menu.Items.Add(openWithMerger);
-                menu.Items.Add(explore);
-                menu.Items.Add(new MenuItem { Header = "-" });
-                menu.Items.Add(resetToThisRevision);
-                menu.Items.Add(new MenuItem { Header = "-" });
-                menu.Items.Add(copyPath);
-                menu.Items.Add(copyFullPath);
-                menu.Open(view);
+                    var copyPath = new MenuItem();
+                    copyPath.Header = App.Text("CopyPath");
+                    copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyPath.Tag = OperatingSystem.IsMacOS() ? "⌘+C" : "Ctrl+C";
+                    copyPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(c.Path);
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    var copyFullPath = new MenuItem();
+                    copyFullPath.Header = App.Text("CopyFullPath");
+                    copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                    copyFullPath.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+C" : "Ctrl+Shift+C";
+                    copyFullPath.Click += async (_, ev) =>
+                    {
+                        var builder = new StringBuilder();
+                        foreach (var c in selected)
+                            builder.AppendLine(vm.GetAbsPath(c.Path));
+
+                        await App.CopyTextAsync(builder.ToString());
+                        ev.Handled = true;
+                    };
+
+                    var menu = new ContextMenu();
+                    menu.Items.Add(resetToThisRevision);
+                    menu.Items.Add(new MenuItem { Header = "-" });
+                    menu.Items.Add(copyPath);
+                    menu.Items.Add(copyFullPath);
+                    menu.Open(view);
+                }
             }
 
             e.Handled = true;
@@ -197,17 +247,24 @@ private async void OnChangeCollectionViewKeyDown(object sender, KeyEventArgs e)
             if (DataContext is not ViewModels.StashesPage vm)
                 return;
 
-            if (sender is not ChangeCollectionView { SelectedChanges: { Count: 1 } selectedChanges })
+            if (sender is not ChangeCollectionView { SelectedChanges: { Count: > 0 } selectedChanges })
                 return;
 
-            var change = selectedChanges[0];
             if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control) && e.Key == Key.C)
             {
-                if (e.KeyModifiers.HasFlag(KeyModifiers.Shift))
-                    await App.CopyTextAsync(vm.GetAbsPath(change.Path));
+                var builder = new StringBuilder();
+                var copyAbsPath = e.KeyModifiers.HasFlag(KeyModifiers.Shift);
+                if (selectedChanges.Count == 1)
+                {
+                    builder.Append(copyAbsPath ? vm.GetAbsPath(selectedChanges[0].Path) : selectedChanges[0].Path);
+                }
                 else
-                    await App.CopyTextAsync(change.Path);
+                {
+                    foreach (var c in selectedChanges)
+                        builder.AppendLine(copyAbsPath ? vm.GetAbsPath(c.Path) : c.Path);
+                }
 
+                await App.CopyTextAsync(builder.ToString());
                 e.Handled = true;
             }
         }
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index e5eed5e71..ce940299f 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -126,7 +126,6 @@
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="UnstagedChangesView"
                                 IsUnstagedChange="True"
-                                SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=UnstagedChangeViewMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
@@ -181,7 +180,6 @@
         <v:ChangeCollectionView Grid.Row="1"
                                 x:Name="StagedChangesView"
                                 IsUnstagedChange="False"
-                                SelectionMode="Multiple"
                                 Background="{DynamicResource Brush.Contents}"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode}"
                                 EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"

From 20ff55fc03f4844de3e5c0af360513f85983f6fb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 15:45:42 +0800
Subject: [PATCH 43/72] feature: show repo status in `Welcome` page (#1867)

Signed-off-by: leo <longshuang@msn.cn>
---
 ...thoutUntracked.cs => CountLocalChanges.cs} |  7 ++-
 src/ViewModels/Checkout.cs                    |  2 +-
 src/ViewModels/CheckoutAndFastForward.cs      |  2 +-
 src/ViewModels/CheckoutCommit.cs              |  2 +-
 src/ViewModels/CreateBranch.cs                |  2 +-
 src/ViewModels/Pull.cs                        |  2 +-
 src/ViewModels/RepositoryNode.cs              | 49 ++++++++++++++-
 src/ViewModels/Welcome.cs                     |  6 ++
 src/Views/Welcome.axaml                       | 59 ++++++++++++++++---
 src/Views/Welcome.axaml.cs                    |  6 ++
 10 files changed, 121 insertions(+), 16 deletions(-)
 rename src/Commands/{CountLocalChangesWithoutUntracked.cs => CountLocalChanges.cs} (66%)

diff --git a/src/Commands/CountLocalChangesWithoutUntracked.cs b/src/Commands/CountLocalChanges.cs
similarity index 66%
rename from src/Commands/CountLocalChangesWithoutUntracked.cs
rename to src/Commands/CountLocalChanges.cs
index 769d732e9..17916926d 100644
--- a/src/Commands/CountLocalChangesWithoutUntracked.cs
+++ b/src/Commands/CountLocalChanges.cs
@@ -3,13 +3,14 @@
 
 namespace SourceGit.Commands
 {
-    public class CountLocalChangesWithoutUntracked : Command
+    public class CountLocalChanges : Command
     {
-        public CountLocalChangesWithoutUntracked(string repo)
+        public CountLocalChanges(string repo, bool includeUntracked)
         {
+            var option = includeUntracked ? "-uall" : "-uno";
             WorkingDirectory = repo;
             Context = repo;
-            Args = "--no-optional-locks status -uno --ignore-submodules=all --porcelain";
+            Args = $"--no-optional-locks status {option} --ignore-submodules=all --porcelain";
         }
 
         public async Task<int> GetResultAsync()
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index 98b2a21ff..25f3e05db 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -58,7 +58,7 @@ public override async Task<bool> Sure()
 
             if (!DiscardLocalChanges)
             {
-                var changes = await new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).GetResultAsync();
+                var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
                 if (changes > 0)
                 {
                     succ = await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/CheckoutAndFastForward.cs b/src/ViewModels/CheckoutAndFastForward.cs
index 550245fe7..32ce28798 100644
--- a/src/ViewModels/CheckoutAndFastForward.cs
+++ b/src/ViewModels/CheckoutAndFastForward.cs
@@ -63,7 +63,7 @@ public override async Task<bool> Sure()
 
             if (!DiscardLocalChanges)
             {
-                var changes = await new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).GetResultAsync();
+                var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
                 if (changes > 0)
                 {
                     succ = await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs
index 459fba4dd..b4d4438c7 100644
--- a/src/ViewModels/CheckoutCommit.cs
+++ b/src/ViewModels/CheckoutCommit.cs
@@ -58,7 +58,7 @@ public override async Task<bool> Sure()
 
             if (!DiscardLocalChanges)
             {
-                var changes = await new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).GetResultAsync();
+                var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
                 if (changes > 0)
                 {
                     succ = await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
index d213f1ecb..3958e0d56 100644
--- a/src/ViewModels/CreateBranch.cs
+++ b/src/ViewModels/CreateBranch.cs
@@ -142,7 +142,7 @@ public override async Task<bool> Sure()
                 var needPopStash = false;
                 if (!DiscardLocalChanges)
                 {
-                    var changes = await new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).GetResultAsync();
+                    var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
                     if (changes > 0)
                     {
                         succ = await new Commands.Stash(_repo.FullPath)
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
index 2a976a060..378d63f40 100644
--- a/src/ViewModels/Pull.cs
+++ b/src/ViewModels/Pull.cs
@@ -119,7 +119,7 @@ public override async Task<bool> Sure()
             Use(log);
 
             var updateSubmodules = IsRecurseSubmoduleVisible && RecurseSubmodules;
-            var changes = await new Commands.CountLocalChangesWithoutUntracked(_repo.FullPath).GetResultAsync();
+            var changes = await new Commands.CountLocalChanges(_repo.FullPath, false).GetResultAsync();
             var needPopStash = false;
             if (changes > 0)
             {
diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index d69f9d9dc..ea9c3fbe3 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json.Serialization;
-
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -62,6 +62,20 @@ public int Depth
             set;
         } = 0;
 
+        [JsonIgnore]
+        public Models.Branch CurrentBranch
+        {
+            get => _currentBranch;
+            private set => SetProperty(ref _currentBranch, value);
+        }
+
+        [JsonIgnore]
+        public int LocalChanges
+        {
+            get => _localChanges;
+            private set => SetProperty(ref _localChanges, value);
+        }
+
         public List<RepositoryNode> SubNodes
         {
             get;
@@ -122,11 +136,44 @@ public void Delete()
                 activePage.Popup = new DeleteRepositoryNode(this);
         }
 
+        public async Task UpdateStatusAsync()
+        {
+            if (!_isRepository || !Directory.Exists(_id))
+            {
+                CurrentBranch = null;
+                LocalChanges = 0;
+
+                if (SubNodes.Count > 0)
+                {
+                    foreach (var subNode in SubNodes)
+                        await subNode.UpdateStatusAsync();
+                }
+
+                return;
+            }
+
+            LocalChanges = await new Commands.CountLocalChanges(_id, true) { RaiseError = false }.GetResultAsync();
+
+            var branches = await new Commands.QueryBranches(_id) { RaiseError = false }.GetResultAsync();
+            foreach (var branch in branches)
+            {
+                if (branch.IsCurrent)
+                {
+                    CurrentBranch = branch;
+                    return;
+                }
+            }
+
+            CurrentBranch = null;
+        }
+
         private string _id = string.Empty;
         private string _name = string.Empty;
         private bool _isRepository = false;
         private int _bookmark = 0;
         private bool _isExpanded = false;
         private bool _isVisible = true;
+        private Models.Branch _currentBranch = null;
+        private int _localChanges = 0;
     }
 }
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 2e6b3a6a3..c020cdda5 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -52,6 +52,12 @@ public void Refresh()
             Rows.AddRange(rows);
         }
 
+        public async Task UpdateStatusAsync()
+        {
+            foreach (var node in Preferences.Instance.RepositoryNodes)
+                await node.UpdateStatusAsync();
+        }
+
         public void ToggleNodeIsExpanded(RepositoryNode node)
         {
             node.IsExpanded = !node.IsExpanded;
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 0f625e7af..d31bdb55e 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:c="using:SourceGit.Converters"
+             xmlns:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
              xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -106,7 +107,7 @@
           <DataTemplate DataType="vm:RepositoryNode">
             <Grid Background="Transparent"
                   Height="30"
-                  ColumnDefinitions="16,18,Auto,*"
+                  ColumnDefinitions="16,18,*,Auto,16"
                   Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
                   ClipToBounds="True"
                   ContextRequested="OnTreeNodeContextRequested"
@@ -142,6 +143,14 @@
 
               <StackPanel Grid.Column="2" Orientation="Horizontal">
                 <TextBlock VerticalAlignment="Center" Text="{Binding Name}"/>
+                <TextBlock Margin="4,0,0,0" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Id, StringFormat=({0})}">
+                  <TextBlock.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                      <Binding Path="IsRepository"/>
+                      <Binding Path="IsInvalid" Converter="{x:Static BoolConverters.Not}"/>
+                    </MultiBinding>
+                  </TextBlock.IsVisible>
+                </TextBlock>
                 <Path Margin="2,0,0,0"
                       Width="12" Height="12"
                       Data="{StaticResource Icons.Error}"
@@ -149,12 +158,48 @@
                       IsVisible="{Binding IsInvalid}"/>
               </StackPanel>
 
-              <Border Grid.Column="3" Margin="8,0" VerticalAlignment="Center" ClipToBounds="True">
-                <TextBlock HorizontalAlignment="Right"
-                           Foreground="{DynamicResource Brush.FG2}"
-                           Text="{Binding Id, Converter={x:Static c:PathConverters.RelativeToHome}}"
-                           IsVisible="{Binding IsRepository}"/>
-              </Border>
+              <StackPanel Grid.Column="3" Orientation="Horizontal" IsVisible="{Binding IsRepository}">
+                <Border Margin="3,0,0,0"
+                        Height="18"
+                        CornerRadius="9"
+                        Padding="6,0"
+                        Background="{DynamicResource Brush.FG1}"
+                        VerticalAlignment="Center"
+                        IsVisible="{Binding LocalChanges, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+                  <TextBlock Text="{Binding LocalChanges}"
+                             FontFamily="{DynamicResource Fonts.Monospace}"
+                             FontSize="11"
+                             Foreground="{DynamicResource Brush.Window}"/>
+                </Border>
+
+                <ContentControl Margin="3,0,0,0"
+                                Content="{Binding CurrentBranch}"
+                                IsVisible="{Binding CurrentBranch, Converter={x:Static ObjectConverters.IsNotNull}}">
+                  <ContentControl.DataTemplates>
+                    <DataTemplate DataType="m:Branch">
+                      <StackPanel Orientation="Horizontal">
+                        <TextBlock Margin="3,0"
+                                   Text="{Binding TrackStatusDescription}"
+                                   FontFamily="{DynamicResource Fonts.Monospace}"
+                                   FontSize="12"
+                                   IsVisible="{Binding IsTrackStatusVisible}"/>
+
+                        <Border Margin="3,0,0,0"
+                                BorderThickness="1"
+                                BorderBrush="{DynamicResource Brush.FG2}"
+                                Height="20"
+                                CornerRadius="4"
+                                Padding="4,0">
+                          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                            <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
+                            <TextBlock Margin="2,0,0,0" Text="{Binding Name}" FontSize="12"/>
+                          </StackPanel>
+                        </Border>
+                      </StackPanel>
+                    </DataTemplate>
+                  </ContentControl.DataTemplates>
+                </ContentControl>
+              </StackPanel>
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 365a7cbee..b9010bfe2 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -61,6 +61,12 @@ public Welcome()
             InitializeComponent();
         }
 
+        protected override async void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+            await ViewModels.Welcome.Instance.UpdateStatusAsync();
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);

From f88f920f57f62916e3cbe2a37348d342fd586744 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 16:11:05 +0800
Subject: [PATCH 44/72] enhance: limit the rate to call `UpdateStatusAsync` and
 add hotkey `F5` to call it forcely

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Welcome.cs   | 11 ++++++++++-
 src/Views/Launcher.axaml.cs |  6 ++++++
 src/Views/Welcome.axaml.cs  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index c020cdda5..3cb83b6ba 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -52,8 +52,16 @@ public void Refresh()
             Rows.AddRange(rows);
         }
 
-        public async Task UpdateStatusAsync()
+        public async Task UpdateStatusAsync(bool force)
         {
+            if (!force)
+            {
+                var passed = DateTime.Now - _lastUpdateStatus;
+                if (passed.TotalSeconds < 10.0)
+                    return;
+            }
+
+            _lastUpdateStatus = DateTime.Now;
             foreach (var node in Preferences.Instance.RepositoryNodes)
                 await node.UpdateStatusAsync();
         }
@@ -275,6 +283,7 @@ private void MakeTreeRows(List<RepositoryNode> rows, List<RepositoryNode> nodes,
             }
         }
 
+        private DateTime _lastUpdateStatus = DateTime.UnixEpoch.ToLocalTime();
         private string _searchFilter = string.Empty;
     }
 }
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index a8329dd01..008b98f72 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -266,6 +266,12 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     e.Handled = true;
                     return;
                 }
+                else if (vm.ActivePage.Data is ViewModels.Welcome welcome)
+                {
+                    e.Handled = true;
+                    await welcome.UpdateStatusAsync(true);
+                    return;
+                }
             }
 
             base.OnKeyDown(e);
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index b9010bfe2..fd00a8995 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -64,7 +64,7 @@ public Welcome()
         protected override async void OnLoaded(RoutedEventArgs e)
         {
             base.OnLoaded(e);
-            await ViewModels.Welcome.Instance.UpdateStatusAsync();
+            await ViewModels.Welcome.Instance.UpdateStatusAsync(false);
         }
 
         protected override void OnKeyDown(KeyEventArgs e)

From c651e71229347d8c926f855cbee439c69aa2a8e5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 16:34:32 +0800
Subject: [PATCH 45/72] refactor: move rate limitation from `Welcome` to
 `RepositoryNode`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RepositoryNode.cs | 16 +++++++++++++---
 src/ViewModels/Welcome.cs        | 11 +----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index ea9c3fbe3..eb813d830 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
@@ -136,7 +137,7 @@ public void Delete()
                 activePage.Popup = new DeleteRepositoryNode(this);
         }
 
-        public async Task UpdateStatusAsync()
+        public async Task UpdateStatusAsync(bool force)
         {
             if (!_isRepository || !Directory.Exists(_id))
             {
@@ -146,12 +147,20 @@ public async Task UpdateStatusAsync()
                 if (SubNodes.Count > 0)
                 {
                     foreach (var subNode in SubNodes)
-                        await subNode.UpdateStatusAsync();
+                        await subNode.UpdateStatusAsync(force);
                 }
 
                 return;
             }
 
+            if (!force)
+            {
+                var passed = DateTime.Now - _lastUpdateStatus;
+                if (passed.TotalSeconds < 10.0)
+                    return;
+            }
+
+            _lastUpdateStatus = DateTime.Now;
             LocalChanges = await new Commands.CountLocalChanges(_id, true) { RaiseError = false }.GetResultAsync();
 
             var branches = await new Commands.QueryBranches(_id) { RaiseError = false }.GetResultAsync();
@@ -175,5 +184,6 @@ public async Task UpdateStatusAsync()
         private bool _isVisible = true;
         private Models.Branch _currentBranch = null;
         private int _localChanges = 0;
+        private DateTime _lastUpdateStatus = DateTime.UnixEpoch.ToLocalTime();
     }
 }
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 3cb83b6ba..014f748fb 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -54,16 +54,8 @@ public void Refresh()
 
         public async Task UpdateStatusAsync(bool force)
         {
-            if (!force)
-            {
-                var passed = DateTime.Now - _lastUpdateStatus;
-                if (passed.TotalSeconds < 10.0)
-                    return;
-            }
-
-            _lastUpdateStatus = DateTime.Now;
             foreach (var node in Preferences.Instance.RepositoryNodes)
-                await node.UpdateStatusAsync();
+                await node.UpdateStatusAsync(force);
         }
 
         public void ToggleNodeIsExpanded(RepositoryNode node)
@@ -283,7 +275,6 @@ private void MakeTreeRows(List<RepositoryNode> rows, List<RepositoryNode> nodes,
             }
         }
 
-        private DateTime _lastUpdateStatus = DateTime.UnixEpoch.ToLocalTime();
         private string _searchFilter = string.Empty;
     }
 }

From 02ecd581c75485b75b6ac36518edd82a849ec5a0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 17:42:51 +0800
Subject: [PATCH 46/72] refactor: use new command `QueryRepositoryStatus` to
 update repository status in `Welcome` page

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryRepositoryStatus.cs | 59 ++++++++++++++++++++
 src/Models/Branch.cs                  |  2 +-
 src/Models/RepositoryStatus.cs        | 29 ++++++++++
 src/ViewModels/RepositoryNode.cs      | 33 +++---------
 src/Views/Welcome.axaml               | 78 +++++++++++++--------------
 5 files changed, 133 insertions(+), 68 deletions(-)
 create mode 100644 src/Commands/QueryRepositoryStatus.cs
 create mode 100644 src/Models/RepositoryStatus.cs

diff --git a/src/Commands/QueryRepositoryStatus.cs b/src/Commands/QueryRepositoryStatus.cs
new file mode 100644
index 000000000..32c2489a6
--- /dev/null
+++ b/src/Commands/QueryRepositoryStatus.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace SourceGit.Commands
+{
+    public partial class QueryRepositoryStatus : Command
+    {
+        [GeneratedRegex(@"ahead\s(\d+)")]
+        private static partial Regex REG_AHEAD();
+
+        [GeneratedRegex(@"behind\s(\d+)")]
+        private static partial Regex REG_BEHIND();
+
+        public QueryRepositoryStatus(string repo)
+        {
+            WorkingDirectory = repo;
+            RaiseError = false;
+        }
+
+        public async Task<Models.RepositoryStatus> GetResultAsync()
+        {
+            Args = "branch -l -v --format=\"%(refname:short)%00%(HEAD)%00%(upstream:track,nobracket)\"";
+            var rs = await ReadToEndAsync().ConfigureAwait(false);
+            if (!rs.IsSuccess)
+                return null;
+
+            var status = new Models.RepositoryStatus();
+            var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+            foreach (var line in lines)
+            {
+                var parts = line.Split('\0');
+                if (parts.Length != 3 || !parts[1].Equals("*", StringComparison.Ordinal))
+                    continue;
+
+                status.CurrentBranch = parts[0];
+                if (!string.IsNullOrEmpty(parts[2]))
+                    ParseTrackStatus(status, parts[2]);
+            }
+
+            status.LocalChanges = await new CountLocalChanges(WorkingDirectory, true) { RaiseError = false }
+                .GetResultAsync()
+                .ConfigureAwait(false);
+
+            return status;
+        }
+
+        private void ParseTrackStatus(Models.RepositoryStatus status, string input)
+        {
+            var aheadMatch = REG_AHEAD().Match(input);
+            if (aheadMatch.Success)
+                status.Ahead = int.Parse(aheadMatch.Groups[1].Value);
+
+            var behindMatch = REG_BEHIND().Match(input);
+            if (behindMatch.Success)
+                status.Behind = int.Parse(behindMatch.Groups[1].Value);
+        }
+    }
+}
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
index f2c593d31..47aa2153a 100644
--- a/src/Models/Branch.cs
+++ b/src/Models/Branch.cs
@@ -26,7 +26,7 @@ public class Branch
 
         public bool HasWorktree => !IsCurrent && !string.IsNullOrEmpty(WorktreePath);
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
-        public bool IsTrackStatusVisible => Ahead.Count + Behind.Count > 0;
+        public bool IsTrackStatusVisible => Ahead.Count > 0 || Behind.Count > 0;
 
         public string TrackStatusDescription
         {
diff --git a/src/Models/RepositoryStatus.cs b/src/Models/RepositoryStatus.cs
new file mode 100644
index 000000000..c7c498ae5
--- /dev/null
+++ b/src/Models/RepositoryStatus.cs
@@ -0,0 +1,29 @@
+namespace SourceGit.Models
+{
+    public class RepositoryStatus
+    {
+        public string CurrentBranch { get; set; } = string.Empty;
+        public int Ahead { get; set; } = 0;
+        public int Behind { get; set; } = 0;
+        public int LocalChanges { get; set; } = 0;
+
+        public bool IsTrackingStatusVisible
+        {
+            get
+            {
+                return Ahead > 0 || Behind > 0;
+            }
+        }
+
+        public string TrackingDescription
+        {
+            get
+            {
+                if (Ahead > 0)
+                    return Behind > 0 ? $"{Ahead}↑ {Behind}↓" : $"{Ahead}↑";
+
+                return Behind > 0 ? $"{Behind}↓" : string.Empty;
+            }
+        }
+    }
+}
diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index eb813d830..5dc23ed3f 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -64,17 +64,10 @@ public int Depth
         } = 0;
 
         [JsonIgnore]
-        public Models.Branch CurrentBranch
+        public Models.RepositoryStatus Status
         {
-            get => _currentBranch;
-            private set => SetProperty(ref _currentBranch, value);
-        }
-
-        [JsonIgnore]
-        public int LocalChanges
-        {
-            get => _localChanges;
-            private set => SetProperty(ref _localChanges, value);
+            get => _status;
+            private set => SetProperty(ref _status, value);
         }
 
         public List<RepositoryNode> SubNodes
@@ -141,8 +134,7 @@ public async Task UpdateStatusAsync(bool force)
         {
             if (!_isRepository || !Directory.Exists(_id))
             {
-                CurrentBranch = null;
-                LocalChanges = 0;
+                Status = null;
 
                 if (SubNodes.Count > 0)
                 {
@@ -161,19 +153,7 @@ public async Task UpdateStatusAsync(bool force)
             }
 
             _lastUpdateStatus = DateTime.Now;
-            LocalChanges = await new Commands.CountLocalChanges(_id, true) { RaiseError = false }.GetResultAsync();
-
-            var branches = await new Commands.QueryBranches(_id) { RaiseError = false }.GetResultAsync();
-            foreach (var branch in branches)
-            {
-                if (branch.IsCurrent)
-                {
-                    CurrentBranch = branch;
-                    return;
-                }
-            }
-
-            CurrentBranch = null;
+            Status = await new Commands.QueryRepositoryStatus(_id).GetResultAsync();
         }
 
         private string _id = string.Empty;
@@ -182,8 +162,7 @@ public async Task UpdateStatusAsync(bool force)
         private int _bookmark = 0;
         private bool _isExpanded = false;
         private bool _isVisible = true;
-        private Models.Branch _currentBranch = null;
-        private int _localChanges = 0;
+        private Models.RepositoryStatus _status = null;
         private DateTime _lastUpdateStatus = DateTime.UnixEpoch.ToLocalTime();
     }
 }
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index d31bdb55e..8bff914eb 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -158,48 +158,46 @@
                       IsVisible="{Binding IsInvalid}"/>
               </StackPanel>
 
-              <StackPanel Grid.Column="3" Orientation="Horizontal" IsVisible="{Binding IsRepository}">
-                <Border Margin="3,0,0,0"
-                        Height="18"
-                        CornerRadius="9"
-                        Padding="6,0"
-                        Background="{DynamicResource Brush.FG1}"
-                        VerticalAlignment="Center"
-                        IsVisible="{Binding LocalChanges, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
-                  <TextBlock Text="{Binding LocalChanges}"
-                             FontFamily="{DynamicResource Fonts.Monospace}"
-                             FontSize="11"
-                             Foreground="{DynamicResource Brush.Window}"/>
-                </Border>
-
-                <ContentControl Margin="3,0,0,0"
-                                Content="{Binding CurrentBranch}"
-                                IsVisible="{Binding CurrentBranch, Converter={x:Static ObjectConverters.IsNotNull}}">
-                  <ContentControl.DataTemplates>
-                    <DataTemplate DataType="m:Branch">
-                      <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="3,0"
-                                   Text="{Binding TrackStatusDescription}"
+              <ContentControl Grid.Column="3"
+                              Content="{Binding Status, Mode=OneWay}"
+                              IsVisible="{Binding Status, Converter={x:Static ObjectConverters.NotEqual}}">
+                <ContentControl.DataTemplates>
+                  <DataTemplate DataType="m:RepositoryStatus">
+                    <StackPanel Orientation="Horizontal">
+                      <Border Margin="3,0"
+                              Height="18"
+                              CornerRadius="9"
+                              Padding="6,0"
+                              Background="{DynamicResource Brush.FG1}"
+                              VerticalAlignment="Center"
+                              IsVisible="{Binding LocalChanges, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+                        <TextBlock Text="{Binding LocalChanges}"
                                    FontFamily="{DynamicResource Fonts.Monospace}"
-                                   FontSize="12"
-                                   IsVisible="{Binding IsTrackStatusVisible}"/>
+                                   FontSize="11"
+                                   Foreground="{DynamicResource Brush.Window}"/>
+                      </Border>
 
-                        <Border Margin="3,0,0,0"
-                                BorderThickness="1"
-                                BorderBrush="{DynamicResource Brush.FG2}"
-                                Height="20"
-                                CornerRadius="4"
-                                Padding="4,0">
-                          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                            <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
-                            <TextBlock Margin="2,0,0,0" Text="{Binding Name}" FontSize="12"/>
-                          </StackPanel>
-                        </Border>
-                      </StackPanel>
-                    </DataTemplate>
-                  </ContentControl.DataTemplates>
-                </ContentControl>
-              </StackPanel>
+                      <TextBlock Margin="3,0"
+                                 Text="{Binding TrackingDescription}"
+                                 FontFamily="{DynamicResource Fonts.Monospace}"
+                                 FontSize="12"
+                                 IsVisible="{Binding IsTrackingStatusVisible}"/>
+
+                      <Border Margin="3,0,0,0"
+                                      BorderThickness="1"
+                                      BorderBrush="{DynamicResource Brush.FG2}"
+                                      Height="20"
+                                      CornerRadius="4"
+                                      Padding="4,0">
+                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                          <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
+                          <TextBlock Margin="2,0,0,0" Text="{Binding CurrentBranch}" FontSize="12"/>
+                        </StackPanel>
+                      </Border>
+                    </StackPanel>
+                  </DataTemplate>
+                </ContentControl.DataTemplates>
+              </ContentControl>
             </Grid>
           </DataTemplate>
         </ListBox.ItemTemplate>

From b412c9a13f0996515a003e8188dcd61feb07d0a3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 17:53:22 +0800
Subject: [PATCH 47/72] enhance: cancel updating repository status when
 `Welcome` page is unloaded

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RepositoryNode.cs |  8 ++++++--
 src/ViewModels/Welcome.cs        |  5 +++--
 src/Views/Launcher.axaml.cs      |  2 +-
 src/Views/Welcome.axaml.cs       | 10 +++++++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index 5dc23ed3f..24f5f66e2 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -130,8 +131,11 @@ public void Delete()
                 activePage.Popup = new DeleteRepositoryNode(this);
         }
 
-        public async Task UpdateStatusAsync(bool force)
+        public async Task UpdateStatusAsync(bool force, CancellationToken? token)
         {
+            if (token is { IsCancellationRequested: true })
+                return;
+
             if (!_isRepository || !Directory.Exists(_id))
             {
                 Status = null;
@@ -139,7 +143,7 @@ public async Task UpdateStatusAsync(bool force)
                 if (SubNodes.Count > 0)
                 {
                     foreach (var subNode in SubNodes)
-                        await subNode.UpdateStatusAsync(force);
+                        await subNode.UpdateStatusAsync(force, token);
                 }
 
                 return;
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 014f748fb..d3416788e 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 using Avalonia.Collections;
@@ -52,10 +53,10 @@ public void Refresh()
             Rows.AddRange(rows);
         }
 
-        public async Task UpdateStatusAsync(bool force)
+        public async Task UpdateStatusAsync(bool force, CancellationToken? token)
         {
             foreach (var node in Preferences.Instance.RepositoryNodes)
-                await node.UpdateStatusAsync(force);
+                await node.UpdateStatusAsync(force, token);
         }
 
         public void ToggleNodeIsExpanded(RepositoryNode node)
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 008b98f72..6998fb8ae 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -269,7 +269,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
                 else if (vm.ActivePage.Data is ViewModels.Welcome welcome)
                 {
                     e.Handled = true;
-                    await welcome.UpdateStatusAsync(true);
+                    await welcome.UpdateStatusAsync(true, null);
                     return;
                 }
             }
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index fd00a8995..6a5ea2df1 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -64,7 +65,13 @@ public Welcome()
         protected override async void OnLoaded(RoutedEventArgs e)
         {
             base.OnLoaded(e);
-            await ViewModels.Welcome.Instance.UpdateStatusAsync(false);
+            await ViewModels.Welcome.Instance.UpdateStatusAsync(false, _cancellation.Token);
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            _cancellation.Cancel();
+            base.OnUnloaded(e);
         }
 
         protected override void OnKeyDown(KeyEventArgs e)
@@ -361,5 +368,6 @@ private void OnDoubleTappedTreeNode(object sender, TappedEventArgs e)
         private Point _pressedTreeNodePosition = new Point();
         private bool _startDragTreeNode = false;
         private readonly DataFormat<string> _dndRepoNode = DataFormat.CreateStringApplicationFormat("sourcegit-dnd-repo-node");
+        private CancellationTokenSource _cancellation = new CancellationTokenSource();
     }
 }

From fb046d551f52837544d1d5ece77c64c0e99267ae Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 17:59:21 +0800
Subject: [PATCH 48/72] enhance: cache last status of repository for better
 experience

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/RepositoryNode.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index 24f5f66e2..770e1b86e 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -64,11 +64,10 @@ public int Depth
             set;
         } = 0;
 
-        [JsonIgnore]
         public Models.RepositoryStatus Status
         {
             get => _status;
-            private set => SetProperty(ref _status, value);
+            set => SetProperty(ref _status, value);
         }
 
         public List<RepositoryNode> SubNodes

From b15d714b849e679121e7d7de2299f7fc20ce36d9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 18:15:50 +0800
Subject: [PATCH 49/72] enhance: update repository status immediately on the
 first time that it is added

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Clone.cs            |  2 ++
 src/ViewModels/Init.cs             |  4 +++-
 src/ViewModels/RepositoryNode.cs   | 17 ++++++++++++++---
 src/ViewModels/ScanRepositories.cs |  6 ++++--
 src/ViewModels/Welcome.cs          | 18 ++++++++++++++++--
 src/Views/Welcome.axaml.cs         |  4 ++--
 src/Views/WelcomeToolbar.axaml.cs  |  2 +-
 7 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index cfcf51bf2..73033682e 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -150,6 +150,8 @@ public override async Task<bool> Sure()
             log.Complete();
 
             var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
+            await node.UpdateStatusAsync(false, null);
+
             var launcher = App.GetLauncher();
             LauncherPage page = null;
             foreach (var one in launcher.Pages)
diff --git a/src/ViewModels/Init.cs b/src/ViewModels/Init.cs
index 7f349917f..f6740d0f6 100644
--- a/src/ViewModels/Init.cs
+++ b/src/ViewModels/Init.cs
@@ -39,7 +39,9 @@ public override async Task<bool> Sure()
 
             if (succ)
             {
-                Preferences.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
+                var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
+                await node.UpdateStatusAsync(false, null);
+
                 Welcome.Instance.Refresh();
             }
             return succ;
diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs
index 770e1b86e..1f5515b9d 100644
--- a/src/ViewModels/RepositoryNode.cs
+++ b/src/ViewModels/RepositoryNode.cs
@@ -135,19 +135,30 @@ public async Task UpdateStatusAsync(bool force, CancellationToken? token)
             if (token is { IsCancellationRequested: true })
                 return;
 
-            if (!_isRepository || !Directory.Exists(_id))
+            if (!_isRepository)
             {
                 Status = null;
 
                 if (SubNodes.Count > 0)
                 {
-                    foreach (var subNode in SubNodes)
-                        await subNode.UpdateStatusAsync(force, token);
+                    // avoid collection was modified while enumerating.
+                    var nodes = new List<RepositoryNode>();
+                    nodes.AddRange(SubNodes);
+
+                    foreach (var node in nodes)
+                        await node.UpdateStatusAsync(force, token);
                 }
 
                 return;
             }
 
+            if (!Directory.Exists(_id))
+            {
+                _lastUpdateStatus = DateTime.Now;
+                Status = null;
+                return;
+            }
+
             if (!force)
             {
                 var passed = DateTime.Now - _lastUpdateStatus;
diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index 6802897aa..e7316dba5 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -97,13 +97,15 @@ public override async Task<bool> Sure()
                 var parent = new DirectoryInfo(f).Parent!.FullName.Replace('\\', '/').TrimEnd('/');
                 if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
                 {
-                    Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false, false);
+                    var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false, false);
+                    await node.UpdateStatusAsync(false, null);
                 }
                 else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal))
                 {
                     var relative = parent.Substring(normalizedRoot.Length).TrimStart('/');
                     var group = FindOrCreateGroupRecursive(Preferences.Instance.RepositoryNodes, relative);
-                    Preferences.Instance.FindOrAddNodeByRepositoryPath(f, group, false, false);
+                    var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(f, group, false, false);
+                    await node.UpdateStatusAsync(false, null);
                 }
             }
 
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index d3416788e..1fa1797a8 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -55,8 +55,19 @@ public void Refresh()
 
         public async Task UpdateStatusAsync(bool force, CancellationToken? token)
         {
-            foreach (var node in Preferences.Instance.RepositoryNodes)
+            if (_isUpdatingStatus)
+                return;
+
+            _isUpdatingStatus = true;
+
+            // avoid collection was modified while enumerating.
+            var nodes = new List<RepositoryNode>();
+            nodes.AddRange(Preferences.Instance.RepositoryNodes);
+
+            foreach (var node in nodes)
                 await node.UpdateStatusAsync(force, token);
+
+            _isUpdatingStatus = false;
         }
 
         public void ToggleNodeIsExpanded(RepositoryNode node)
@@ -130,9 +141,11 @@ public void InitRepository(string path, RepositoryNode parent, string reason)
                 activePage.Popup = new Init(activePage.Node.Id, path, parent, reason);
         }
 
-        public void AddRepository(string path, RepositoryNode parent, bool moveNode, bool open)
+        public async Task AddRepositoryAsync(string path, RepositoryNode parent, bool moveNode, bool open)
         {
             var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, parent, moveNode);
+            await node.UpdateStatusAsync(false, null);
+
             if (open)
                 node.Open();
         }
@@ -277,5 +290,6 @@ private void MakeTreeRows(List<RepositoryNode> rows, List<RepositoryNode> nodes,
         }
 
         private string _searchFilter = string.Empty;
+        private bool _isUpdatingStatus = false;
     }
 }
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 6a5ea2df1..7a3565c02 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -279,7 +279,7 @@ private async void DropOnTreeView(object sender, DragEventArgs e)
                     var path = await ViewModels.Welcome.Instance.GetRepositoryRootAsync(item.Path.LocalPath);
                     if (!string.IsNullOrEmpty(path))
                     {
-                        ViewModels.Welcome.Instance.AddRepository(path, null, true, false);
+                        await ViewModels.Welcome.Instance.AddRepositoryAsync(path, null, true, false);
                         refresh = true;
                     }
                 }
@@ -338,7 +338,7 @@ private async void DropOnTreeNode(object sender, DragEventArgs e)
                     var path = await ViewModels.Welcome.Instance.GetRepositoryRootAsync(item.Path.LocalPath);
                     if (!string.IsNullOrEmpty(path))
                     {
-                        ViewModels.Welcome.Instance.AddRepository(path, to, true, false);
+                        await ViewModels.Welcome.Instance.AddRepositoryAsync(path, to, true, false);
                         refresh = true;
                     }
                 }
diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs
index 65b4ca129..7d901e35c 100644
--- a/src/Views/WelcomeToolbar.axaml.cs
+++ b/src/Views/WelcomeToolbar.axaml.cs
@@ -47,7 +47,7 @@ private async void OpenLocalRepository(object _1, RoutedEventArgs e)
                     var repoPath = await ViewModels.Welcome.Instance.GetRepositoryRootAsync(folderPath);
                     if (!string.IsNullOrEmpty(repoPath))
                     {
-                        ViewModels.Welcome.Instance.AddRepository(repoPath, null, false, true);
+                        await ViewModels.Welcome.Instance.AddRepositoryAsync(repoPath, null, false, true);
                         ViewModels.Welcome.Instance.Refresh();
                     }
                     else if (Directory.Exists(folderPath))

From c4929dddc86ea24213f46cf91ca748c855db12b7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 19:46:48 +0800
Subject: [PATCH 50/72] refactor: remove unused `ConterPresenter`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Repository.axaml    | 42 ++++++++++------
 src/Views/Repository.axaml.cs | 93 -----------------------------------
 2 files changed, 26 insertions(+), 109 deletions(-)

diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 18c5c06a3..59512aba2 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -131,14 +131,19 @@
                 <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Changes}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.WorkingCopy}"/>
-                  <v:CounterPresenter Grid.Column="2"
-                                      Margin="6,0"
-                                      VerticalAlignment="Center"
-                                      Count="{Binding LocalChangesCount}"
-                                      FontFamily="{DynamicResource Fonts.Monospace}"
-                                      FontSize="10"
-                                      Foreground="{DynamicResource Brush.BadgeFG}"
-                                      Background="{DynamicResource Brush.Badge}"/>
+                  <Border Grid.Column="2"
+                          Height="18"
+                          CornerRadius="9"
+                          Padding="9,0"
+                          Margin="6,0"
+                          VerticalAlignment="Center"
+                          Background="{DynamicResource Brush.Badge}"
+                          IsVisible="{Binding LocalChangesCount, Mode=OneWay, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+                    <TextBlock Text="{Binding LocalChangesCount, Mode=OneWay}"
+                               Foreground="{DynamicResource Brush.BadgeFG}"
+                               FontFamily="{DynamicResource Fonts.Monospace}"
+                               FontSize="10"/>
+                  </Border>
                   <Path Grid.Column="3"
                         Width="12" Height="12"
                         Margin="0,0,6,0"
@@ -159,14 +164,19 @@
                 <Grid Classes="view_mode" ColumnDefinitions="Auto,*,Auto,Auto">
                   <Path Grid.Column="0" Classes="icon" Data="{StaticResource Icons.Stashes}"/>
                   <TextBlock Grid.Column="1" Classes="header" Text="{DynamicResource Text.Stashes}"/>
-                  <v:CounterPresenter Grid.Column="2"
-                                      Margin="6,0"
-                                      VerticalAlignment="Center"
-                                      Count="{Binding StashesCount}"
-                                      FontFamily="{DynamicResource Fonts.Monospace}"
-                                      FontSize="10"
-                                      Foreground="{DynamicResource Brush.BadgeFG}"
-                                      Background="{DynamicResource Brush.Badge}"/>
+                  <Border Grid.Column="2"
+                          Height="18"
+                          CornerRadius="9"
+                          Padding="6,0"
+                          Margin="6,0"
+                          VerticalAlignment="Center"
+                          Background="{DynamicResource Brush.Badge}"
+                          IsVisible="{Binding StashesCount, Mode=OneWay, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
+                    <TextBlock Text="{Binding StashesCount, Mode=OneWay}"
+                               Foreground="{DynamicResource Brush.BadgeFG}"
+                               FontFamily="{DynamicResource Fonts.Monospace}"
+                               FontSize="10"/>
+                  </Border>
                   <Button Grid.Column="3"
                           Classes="icon_button"
                           Width="26" Height="26"
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index b172cb424..f69363fd5 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -1,105 +1,12 @@
 using System;
-using System.Globalization;
 
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 
 namespace SourceGit.Views
 {
-    public class CounterPresenter : Control
-    {
-        public static readonly StyledProperty<int> CountProperty =
-            AvaloniaProperty.Register<CounterPresenter, int>(nameof(Count));
-
-        public int Count
-        {
-            get => GetValue(CountProperty);
-            set => SetValue(CountProperty, value);
-        }
-
-        public static readonly StyledProperty<FontFamily> FontFamilyProperty =
-            TextBlock.FontFamilyProperty.AddOwner<CounterPresenter>();
-
-        public FontFamily FontFamily
-        {
-            get => GetValue(FontFamilyProperty);
-            set => SetValue(FontFamilyProperty, value);
-        }
-
-        public static readonly StyledProperty<double> FontSizeProperty =
-           TextBlock.FontSizeProperty.AddOwner<CounterPresenter>();
-
-        public double FontSize
-        {
-            get => GetValue(FontSizeProperty);
-            set => SetValue(FontSizeProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> ForegroundProperty =
-            AvaloniaProperty.Register<CounterPresenter, IBrush>(nameof(Foreground), Brushes.White);
-
-        public IBrush Foreground
-        {
-            get => GetValue(ForegroundProperty);
-            set => SetValue(ForegroundProperty, value);
-        }
-
-        public static readonly StyledProperty<IBrush> BackgroundProperty =
-            AvaloniaProperty.Register<CounterPresenter, IBrush>(nameof(Background), Brushes.White);
-
-        public IBrush Background
-        {
-            get => GetValue(BackgroundProperty);
-            set => SetValue(BackgroundProperty, value);
-        }
-
-        static CounterPresenter()
-        {
-            AffectsMeasure<CounterPresenter>(
-                FontSizeProperty,
-                FontFamilyProperty,
-                ForegroundProperty,
-                CountProperty);
-        }
-
-        public override void Render(DrawingContext context)
-        {
-            base.Render(context);
-
-            if (_label != null)
-            {
-                context.DrawRectangle(Background, null, new RoundedRect(new Rect(0, 0, _label.Width + 18, 18), new CornerRadius(9)));
-                context.DrawText(_label, new Point(9, 9 - _label.Height * 0.5));
-            }
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            if (Count > 0)
-            {
-                _label = new FormattedText(
-                    Count.ToString(),
-                    CultureInfo.CurrentCulture,
-                    FlowDirection.LeftToRight,
-                    new Typeface(FontFamily),
-                    FontSize,
-                    Foreground);
-            }
-            else
-            {
-                _label = null;
-            }
-
-            InvalidateVisual();
-            return _label != null ? new Size(_label.Width + 18, 18) : new Size(0, 0);
-        }
-
-        private FormattedText _label = null;
-    }
-
     public partial class Repository : UserControl
     {
         public Repository()

From de7716cb5a80da8d7c49bae78280677e33e942fe Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 20:07:54 +0800
Subject: [PATCH 51/72] ux: unify list configuration style

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Preferences.axaml         | 4 ----
 src/Views/RepositoryConfigure.axaml | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index 8d37bed23..0294c730e 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -757,13 +757,9 @@
                     <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}"/>
                   </Button>
 
-                  <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
-
                   <Button Classes="icon_button" Click="OnRemoveSelectedOpenAIService">
                     <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}"/>
                   </Button>
-
-                  <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
                 </StackPanel>
               </Grid>
             </Border>
diff --git a/src/Views/RepositoryConfigure.axaml b/src/Views/RepositoryConfigure.axaml
index 91af9c447..b56925617 100644
--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -242,13 +242,9 @@
                   <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}"/>
                 </Button>
 
-                <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
-
                 <Button Classes="icon_button" Command="{Binding RemoveSelectedCommitTemplate}">
                   <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}"/>
                 </Button>
-
-                <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
               </StackPanel>
             </Grid>
           </Border>
@@ -347,13 +343,10 @@
                   <Path Width="14" Height="14" Data="{StaticResource Icons.Plus}"/>
                 </Button>
 
-                <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
-
                 <Button Classes="icon_button" Click="OnRemoveIssueTracker">
                   <Path Width="14" Height="14" Data="{StaticResource Icons.Minus}"/>
                 </Button>
 
-                <Rectangle Width="1" Fill="{DynamicResource Brush.Border2}" HorizontalAlignment="Left" VerticalAlignment="Stretch"/>
               </StackPanel>
             </Grid>
           </Border>

From a14ef05641f57c853cb0088e44bf75f8f2c46f58 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 20:15:34 +0800
Subject: [PATCH 52/72] enhance: supports to find `zed` or `zeditor` from
 `PATH` and `~/.local/bin/zed` (#1869)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/Linux.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index f6eb4ebf3..38d3da8b2 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -57,7 +57,18 @@ public string FindTerminal(Models.ShellOrTerminal shell)
             finder.Fleet(() => FindJetBrainsFleet(localAppDataDir));
             finder.FindJetBrainsFromToolbox(() => Path.Combine(localAppDataDir, "JetBrains/Toolbox"));
             finder.SublimeText(() => FindExecutable("subl"));
-            finder.Zed(() => FindExecutable("zeditor"));
+            finder.Zed(() =>
+            {
+                var exec = FindExecutable("zeditor");
+                if (string.IsNullOrEmpty(exec))
+                {
+                    exec = FindExecutable("zed");
+                    if (string.IsNullOrEmpty(exec))
+                        exec = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", "zed");
+                }
+
+                return exec;
+            });
             return finder.Tools;
         }
 

From ba06f83f1dca3a483f50b7adc73d486dcd90b954 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 22 Oct 2025 20:29:28 +0800
Subject: [PATCH 53/72] refactor: `FindExecutable` on Linux will always try to
 find file under `~/.local/bin`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Native/Linux.cs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 38d3da8b2..9cae29f46 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -60,14 +60,7 @@ public string FindTerminal(Models.ShellOrTerminal shell)
             finder.Zed(() =>
             {
                 var exec = FindExecutable("zeditor");
-                if (string.IsNullOrEmpty(exec))
-                {
-                    exec = FindExecutable("zed");
-                    if (string.IsNullOrEmpty(exec))
-                        exec = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", "zed");
-                }
-
-                return exec;
+                return string.IsNullOrEmpty(exec) ? FindExecutable("zed") : exec;
             });
             return finder.Tools;
         }
@@ -141,7 +134,8 @@ private string FindExecutable(string filename)
                     return test;
             }
 
-            return string.Empty;
+            var local = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", filename);
+            return File.Exists(local) ? local : string.Empty;
         }
 
         private string FindJetBrainsFleet(string localAppDataDir)

From adf48be160de8755fdf61a57eeaf1a3316bbbf6c Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:30:56 +0300
Subject: [PATCH 54/72] localization: update Russian translation (#1870)

---
 src/Resources/Locales/ru_RU.axaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 56db54577..3373ec63b 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -56,6 +56,7 @@
   <x:String x:Key="Text.Bisect.Skip">Пропустить</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Раздвоение. Сделать текущую ревизию хорошей или плохой и переключиться на другой.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Расследование</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">Расследование на предыдущей редакции</x:String>
   <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">РАССЛЕДОВАНИЕ В ЭТОМ ФАЙЛЕ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Переключиться на ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Сравнить с ${0}$</x:String>
@@ -188,19 +189,19 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Введите тему ревизии</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Настройка репозитория</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">ШАБЛОН РЕВИЗИИ</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Параметры сборки: 
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Встроенные параметры: 
   
   ${branch_name} Имя текущей локальной ветки
   ${files_num} Количество изменённых файлов
   ${files} Пути изменённых файлов
-  ${files:N} Максимальное количество N путей изменённых файлов
-  ${pure_files} Похожие ${files}, но только чистые имена файлов
-  ${pure_files:N} Похожие ${files:N}, но без каталогов</x:String>
+  ${files:N} Пути изменённых файлов, не более N
+  ${pure_files} То же, что и ${files}, но только имена файлов
+  ${pure_files:N} То же, что и ${files:N}, но только имена файлов</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Cодержание:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Название:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">ПОЛЬЗОВАТЕЛЬСКОЕ ДЕЙСТВИЕ</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">Аргументы:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Параметры сборки: 
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">Встроенные параметры: 
   
   ${REPO} Путь репозитория
   ${REMOTE} Выбранная удаённая ветка
@@ -225,6 +226,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Автозагрузка изменений</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Минут(а/ы)</x:String>
+  <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">Общепринятые типы ревизии</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Внешний репозиторий по умолчанию</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">Предпочтительный режим слияния</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">ОТСЛЕЖИВАНИЕ ПРОБЛЕМ</x:String>
@@ -258,6 +260,7 @@
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">Метка:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">Опции:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">Используйте разделитель «|» для опций</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">Встроенные переменные ${REPO}, ${REMOTE}, ${BRANCH}, ${BRANCH_FRIENDLY_NAME}, ${SHA}, и ${TAG} останутся здесь доступными</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">Тип:</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Рабочие пространства</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Цвет</x:String>
@@ -266,7 +269,7 @@
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">ПРОДОЛЖИТЬ</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">Сформировать всё и зафиксировать ревизию</x:String>
-  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty) или отложить всё, затем зафиксировать ревизию?</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Обнаружена пустая ревизия! Вы хотите продолжить (--allow-empty) или отложить всё, а затем зафиксировать ревизию?</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">Требуется перезапуск</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">Вы должны перезапустить приложение после применения изменений.</x:String>
   <x:String x:Key="Text.ConventionalCommit" xml:space="preserve">Общепринятый помощник по ревизии</x:String>
@@ -767,7 +770,7 @@
   <x:String x:Key="Text.SelfUpdate.GotoDownload" xml:space="preserve">Загрузка</x:String>
   <x:String x:Key="Text.SelfUpdate.IgnoreThisVersion" xml:space="preserve">Пропустить эту версию</x:String>
   <x:String x:Key="Text.SelfUpdate.Title" xml:space="preserve">Обновление ПО</x:String>
-  <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">В настоящее время обновления недоступны.</x:String>
+  <x:String x:Key="Text.SelfUpdate.UpToDate" xml:space="preserve">Сейчас нет обновлений.</x:String>
   <x:String x:Key="Text.SetSubmoduleBranch" xml:space="preserve">Установить ветку подмодуля</x:String>
   <x:String x:Key="Text.SetSubmoduleBranch.Submodule" xml:space="preserve">Подмодуль:</x:String>
   <x:String x:Key="Text.SetSubmoduleBranch.Current" xml:space="preserve">Текущий:</x:String>

From 1a5c63da22e7a4ce485e0b89aadc95e4cd59f63b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 02:31:16 +0000
Subject: [PATCH 55/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index c02202014..ff6dba740 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -814,16 +814,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.67%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.Blame.BlameOnPreviousRevision
-- Text.Configure.Git.ConventionalTypesOverride
-- Text.ConfigureCustomActionControls.StringValue.Tip
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-77.26%25-yellow)
 

From 99389dba899656f3635945c64308967c4548500c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 23 Oct 2025 10:59:23 +0800
Subject: [PATCH 56/72] refactor: always load commit message from
 `.git/MERGE_MSG` or `.git/rebase-merge/message` when there is some operation
 in progress (#1795)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/WorkingCopy.cs | 65 ++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 1acda60c1..586a13dd0 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -769,43 +769,54 @@ private void UpdateDetail()
 
         private void UpdateInProgressState()
         {
-            if (string.IsNullOrEmpty(_commitMessage))
-            {
-                var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
-                if (File.Exists(mergeMsgFile))
-                    CommitMessage = File.ReadAllText(mergeMsgFile);
-            }
+            var oldType = _inProgressContext != null ? _inProgressContext.GetType() : null;
 
             if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
-            {
                 InProgressContext = new CherryPickInProgress(_repo);
-            }
             else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
-            {
-                var rebasing = new RebaseInProgress(_repo);
-                InProgressContext = rebasing;
-
-                if (string.IsNullOrEmpty(_commitMessage))
-                {
-                    var rebaseMsgFile = Path.Combine(_repo.GitDir, "rebase-merge", "message");
-                    if (File.Exists(rebaseMsgFile))
-                        CommitMessage = File.ReadAllText(rebaseMsgFile);
-                    else if (rebasing.StoppedAt != null)
-                        CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, rebasing.StoppedAt.SHA).GetResult();
-                }
-            }
+                InProgressContext = new RebaseInProgress(_repo);
             else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
-            {
                 InProgressContext = new RevertInProgress(_repo);
-            }
             else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
-            {
                 InProgressContext = new MergeInProgress(_repo);
-            }
             else
-            {
                 InProgressContext = null;
-            }
+
+            if (_inProgressContext == null)
+                return;
+
+            if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
+                return;
+
+            do
+            {
+                if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG")))
+                    break;
+
+                if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "rebase-merge", "message")))
+                    break;
+
+                var rebaseProcessingFile = Path.Combine(_repo.GitDir, "rebase-apply", "final-commit");
+                if (File.Exists(rebaseProcessingFile))
+                {
+                    var sha = File.ReadAllText(rebaseProcessingFile);
+                    if (!string.IsNullOrEmpty(sha))
+                        CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).GetResult();
+                }
+            } while (false);
+        }
+
+        private bool LoadCommitMessageFromFile(string file)
+        {
+            if (!File.Exists(file))
+                return false;
+
+            var msg = File.ReadAllText(file).Trim();
+            if (string.IsNullOrEmpty(msg))
+                return false;
+
+            CommitMessage = msg;
+            return true;
         }
 
         private void SetDetail(Models.Change change, bool isUnstaged)

From 89bc8a7e06db5f54766a46466151cdee846f78ee Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 23 Oct 2025 14:49:48 +0800
Subject: [PATCH 57/72] feature: add original pick-order for commits in
 `Interactive Rebase` window (#1676)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/InteractiveRebase.cs | 10 ++++++++--
 src/Views/InteractiveRebase.axaml   | 20 ++++++++++++++------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 719b8354b..5e88ce519 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -15,6 +15,11 @@ public record InteractiveRebasePrefill(string SHA, Models.InteractiveRebaseActio
 
     public class InteractiveRebaseItem : ObservableObject
     {
+        public int OriginalOrder
+        {
+            get;
+        }
+
         public Models.Commit Commit
         {
             get;
@@ -59,8 +64,9 @@ public string FullMessage
             }
         }
 
-        public InteractiveRebaseItem(Models.Commit c, string message, bool canSquashOrFixup)
+        public InteractiveRebaseItem(int order, Models.Commit c, string message, bool canSquashOrFixup)
         {
+            OriginalOrder = order;
             Commit = c;
             FullMessage = message;
             CanSquashOrFixup = canSquashOrFixup;
@@ -142,7 +148,7 @@ public InteractiveRebase(Repository repo, Models.Commit on, InteractiveRebasePre
                 for (var i = 0; i < commits.Count; i++)
                 {
                     var c = commits[i];
-                    list.Add(new InteractiveRebaseItem(c.Commit, c.Message, i < commits.Count - 1));
+                    list.Add(new InteractiveRebaseItem(commits.Count - i, c.Commit, c.Message, i < commits.Count - 1));
                 }
 
                 var selected = list.Count > 0 ? list[0] : null;
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 1c9ed42e5..86561d81c 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -84,6 +84,7 @@
               <Grid Height="26" Margin="8,0" ClipToBounds="True">
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="16"/>
+                  <ColumnDefinition Width="Auto" SharedSizeGroup="CommitOrderColumn"/>
                   <ColumnDefinition Width="110"/>
                   <ColumnDefinition Width="*"/>
                   <ColumnDefinition Width="32"/>
@@ -111,8 +112,15 @@
                         VerticalAlignment="Center"/>
                 </Border>
 
+                <!-- Original Order -->
+                <TextBlock Grid.Column="1"
+                           Margin="4,0,0,0"
+                           FontFamily="{DynamicResource Fonts.Monospace}"
+                           Text="{Binding OriginalOrder, StringFormat='#{0}'}"
+                           HorizontalAlignment="Center"/>
+                
                 <!-- Action -->
-                <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
+                <Button Grid.Column="2" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
                   <StackPanel Orientation="Horizontal">
                     <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
                     <TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
@@ -120,7 +128,7 @@
                 </Button>
 
                 <!-- Subject -->
-                <Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                <Grid Grid.Column="3" ColumnDefinitions="Auto,*" ClipToBounds="True">
                   <Button Grid.Column="0"
                           Classes="icon_button"
                           Margin="0,0,6,0" Padding="0"
@@ -142,24 +150,24 @@
                 </Grid>
 
                 <!-- Author Avatar -->
-                <v:Avatar Grid.Column="3"
+                <v:Avatar Grid.Column="4"
                           Width="16" Height="16"
                           Margin="8,0,0,0"
                           VerticalAlignment="Center"
                           User="{Binding Commit.Author}"/>
 
                 <!-- Author Name -->
-                <Border Grid.Column="4" ClipToBounds="True">
+                <Border Grid.Column="5" ClipToBounds="True">
                   <TextBlock Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
                 </Border>
 
                 <!-- Commit SHA -->
-                <Border Grid.Column="5" ClipToBounds="True">
+                <Border Grid.Column="6" ClipToBounds="True">
                   <TextBlock Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
                 </Border>
 
                 <!-- Commit Time -->
-                <Border Grid.Column="6">
+                <Border Grid.Column="7">
                   <TextBlock Margin="16,0,8,0" Text="{Binding Commit.CommitterTimeStr}"/>
                 </Border>
               </Grid>

From 5c75bb86bba0a79b1856b79fc414f6031bae7850 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 23 Oct 2025 20:52:48 +0800
Subject: [PATCH 58/72] feature: allows to re-order multiple commits in
 `Interactive Rebase` window (#1675)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml            |   1 -
 src/ViewModels/InteractiveRebase.cs  |  73 +++++++++-----
 src/Views/InteractiveRebase.axaml    |  90 ++++++++++-------
 src/Views/InteractiveRebase.axaml.cs | 142 ++++++++++++++++++++-------
 4 files changed, 207 insertions(+), 99 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index ea1530a5a..288313b49 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -89,7 +89,6 @@
   <StreamGeometry x:Key="Icons.Minus">M0 512M1024 512M512 0M512 1024M64 576h896V448H64z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Modified">M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z</StreamGeometry>
   <StreamGeometry x:Key="Icons.More">M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM211 448C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.Move">M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z</StreamGeometry>
   <StreamGeometry x:Key="Icons.MoveTo">M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z</StreamGeometry>
   <StreamGeometry x:Key="Icons.OpenWith">M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z</StreamGeometry>
   <StreamGeometry x:Key="Icons.OrderByName">M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171 32-85h26l32 85h-90z</StreamGeometry>
diff --git a/src/ViewModels/InteractiveRebase.cs b/src/ViewModels/InteractiveRebase.cs
index 5e88ce519..26032f400 100644
--- a/src/ViewModels/InteractiveRebase.cs
+++ b/src/ViewModels/InteractiveRebase.cs
@@ -64,6 +64,18 @@ public string FullMessage
             }
         }
 
+        public bool IsDropBeforeVisible
+        {
+            get => _isDropBeforeVisible;
+            set => SetProperty(ref _isDropBeforeVisible, value);
+        }
+
+        public bool IsDropAfterVisible
+        {
+            get => _isDropAfterVisible;
+            set => SetProperty(ref _isDropAfterVisible, value);
+        }
+
         public InteractiveRebaseItem(int order, Models.Commit c, string message, bool canSquashOrFixup)
         {
             OriginalOrder = order;
@@ -76,6 +88,8 @@ public InteractiveRebaseItem(int order, Models.Commit c, string message, bool ca
         private string _subject;
         private string _fullMessage;
         private bool _canSquashOrFixup = true;
+        private bool _isDropBeforeVisible = false;
+        private bool _isDropAfterVisible = false;
     }
 
     public class InteractiveRebase : ObservableObject
@@ -188,30 +202,6 @@ public void SelectCommits(List<InteractiveRebaseItem> items)
             }
         }
 
-        public void MoveItemUp(InteractiveRebaseItem item)
-        {
-            var idx = Items.IndexOf(item);
-            if (idx > 0)
-            {
-                var prev = Items[idx - 1];
-                Items.RemoveAt(idx - 1);
-                Items.Insert(idx, prev);
-                UpdateItems();
-            }
-        }
-
-        public void MoveItemDown(InteractiveRebaseItem item)
-        {
-            var idx = Items.IndexOf(item);
-            if (idx < Items.Count - 1)
-            {
-                var next = Items[idx + 1];
-                Items.RemoveAt(idx + 1);
-                Items.Insert(idx, next);
-                UpdateItems();
-            }
-        }
-
         public void ChangeAction(List<InteractiveRebaseItem> selected, Models.InteractiveRebaseAction action)
         {
             if (action == Models.InteractiveRebaseAction.Squash || action == Models.InteractiveRebaseAction.Fixup)
@@ -231,6 +221,41 @@ public void ChangeAction(List<InteractiveRebaseItem> selected, Models.Interactiv
             UpdateItems();
         }
 
+        public void Move(List<InteractiveRebaseItem> commits, int index)
+        {
+            var hashes = new HashSet<string>();
+            foreach (var c in commits)
+                hashes.Add(c.Commit.SHA);
+
+            var before = new List<InteractiveRebaseItem>();
+            var ordered = new List<InteractiveRebaseItem>();
+            var after = new List<InteractiveRebaseItem>();
+
+            for (int i = 0; i < index; i++)
+            {
+                var item = Items[i];
+                if (!hashes.Contains(item.Commit.SHA))
+                    before.Add(item);
+                else
+                    ordered.Add(item);
+            }
+
+            for (int i = index; i < Items.Count; i++)
+            {
+                var item = Items[i];
+                if (!hashes.Contains(item.Commit.SHA))
+                    after.Add(item);
+                else
+                    ordered.Add(item);
+            }
+
+            Items.Clear();
+            Items.AddRange(before);
+            Items.AddRange(ordered);
+            Items.AddRange(after);
+            UpdateItems();
+        }
+
         public async Task<bool> Start()
         {
             using var lockWatcher = _repo.LockWatcher();
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 86561d81c..e498f0aed 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -38,15 +38,29 @@
     </Grid>
 
     <!-- Operation Information -->
-    <Grid Grid.Row="1" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*" Margin="8">
-      <TextBlock Grid.Column="0" Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-      <Path Grid.Column="1" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Current.FriendlyName}" Margin="8,0,0,0"/>
-
-      <TextBlock Grid.Column="3" Margin="48,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
-      <Path Grid.Column="4" Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Commit}"/>
-      <TextBlock Grid.Column="5" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
-      <TextBlock Grid.Column="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
+    <Grid Grid.Row="1" Margin="8" ColumnDefinitions="*,Auto">
+      <StackPanel Grid.Column="0" Orientation="Horizontal" ClipToBounds="True">
+        <TextBlock Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
+        <Path Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding Current.FriendlyName}" Margin="8,0,0,0"/>
+
+        <TextBlock Margin="16,0,0,0" Text="{DynamicResource Text.InteractiveRebase.On}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
+        <Path Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Commit}"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
+        <TextBlock VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0"/>
+      </StackPanel>
+
+      <Border Grid.Column="1" Background="Transparent" Width="20" Height="20">
+        <ToolTip.Tip>
+          <TextBlock>
+            <Run Text="{DynamicResource Text.InteractiveRebase.ReorderTip}"/>
+            <Run Text=" "/>
+            <Run Text="{OnPlatform 'Ctrl+Up/Ctrl+Down', macOS='⌘+Up/⌘+Down'}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
+          </TextBlock>
+        </ToolTip.Tip>
+
+        <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
+      </Border>
     </Grid>
 
     <!-- Body -->
@@ -81,9 +95,16 @@
 
           <v:InteractiveRebaseListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid Height="26" Margin="8,0" ClipToBounds="True">
+              <Grid Height="26"
+                    Margin="8,0"
+                    Background="Transparent"
+                    ClipToBounds="True"
+                    PointerPressed="OnRowPointerPressed"
+                    DragDrop.AllowDrop="True"
+                    DragDrop.DragOver="OnRowDragOver"
+                    DragDrop.DragLeave="OnRowDragLeave"
+                    DragDrop.Drop="OnRowDrop">
                 <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="16"/>
                   <ColumnDefinition Width="Auto" SharedSizeGroup="CommitOrderColumn"/>
                   <ColumnDefinition Width="110"/>
                   <ColumnDefinition Width="*"/>
@@ -93,34 +114,15 @@
                   <ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
                 </Grid.ColumnDefinitions>
 
-                <!-- Drag & Drop Anchor -->
-                <Border Grid.Column="0" Background="Transparent"
-                        PointerPressed="OnRowHeaderPointerPressed"
-                        DragDrop.AllowDrop="True"
-                        DragDrop.DragOver="OnRowHeaderDragOver">
-                  <ToolTip.Tip>
-                    <TextBlock>
-                      <Run Text="{DynamicResource Text.InteractiveRebase.ReorderTip}"/>
-                      <Run Text=" "/>
-                      <Run Text="{OnPlatform 'Ctrl+Up/Ctrl+Down', macOS='⌘+Up/⌘+Down'}" FontSize="11" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"/>
-                    </TextBlock>
-                  </ToolTip.Tip>
-                  <Path Width="14" Height="14"
-                        Data="{StaticResource Icons.Move}"
-                        Fill="{DynamicResource Brush.FG2}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"/>
-                </Border>
-
                 <!-- Original Order -->
-                <TextBlock Grid.Column="1"
+                <TextBlock Grid.Column="0"
                            Margin="4,0,0,0"
                            FontFamily="{DynamicResource Fonts.Monospace}"
                            Text="{Binding OriginalOrder, StringFormat='#{0}'}"
                            HorizontalAlignment="Center"/>
                 
                 <!-- Action -->
-                <Button Grid.Column="2" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
+                <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
                   <StackPanel Orientation="Horizontal">
                     <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
                     <TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
@@ -128,7 +130,7 @@
                 </Button>
 
                 <!-- Subject -->
-                <Grid Grid.Column="3" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                <Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
                   <Button Grid.Column="0"
                           Classes="icon_button"
                           Margin="0,0,6,0" Padding="0"
@@ -150,26 +152,40 @@
                 </Grid>
 
                 <!-- Author Avatar -->
-                <v:Avatar Grid.Column="4"
+                <v:Avatar Grid.Column="3"
                           Width="16" Height="16"
                           Margin="8,0,0,0"
                           VerticalAlignment="Center"
                           User="{Binding Commit.Author}"/>
 
                 <!-- Author Name -->
-                <Border Grid.Column="5" ClipToBounds="True">
+                <Border Grid.Column="4" ClipToBounds="True">
                   <TextBlock Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
                 </Border>
 
                 <!-- Commit SHA -->
-                <Border Grid.Column="6" ClipToBounds="True">
+                <Border Grid.Column="5" ClipToBounds="True">
                   <TextBlock Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
                 </Border>
 
                 <!-- Commit Time -->
-                <Border Grid.Column="7">
+                <Border Grid.Column="6">
                   <TextBlock Margin="16,0,8,0" Text="{Binding Commit.CommitterTimeStr}"/>
                 </Border>
+
+                <!-- Drop Indicator -->
+                <Rectangle Grid.Column="0" Grid.ColumnSpan="7"
+                           Height="2"
+                           VerticalAlignment="Top"
+                           Fill="{DynamicResource Brush.Accent}"
+                           IsVisible="{Binding IsDropBeforeVisible, Mode=OneWay}"
+                           IsHitTestVisible="False"/>
+                <Rectangle Grid.Column="0" Grid.ColumnSpan="7"
+                           Height="2"
+                           VerticalAlignment="Bottom"
+                           Fill="{DynamicResource Brush.Accent}"
+                           IsVisible="{Binding IsDropAfterVisible, Mode=OneWay}"
+                           IsHitTestVisible="False"/>
               </Grid>
             </DataTemplate>
           </v:InteractiveRebaseListBox.ItemTemplate>
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
index 4f8f035b4..b876e209b 100644
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 
 using Avalonia;
 using Avalonia.Controls;
@@ -73,16 +74,40 @@ protected override void OnKeyDown(KeyEventArgs e)
                 MoveSelection(NavigationDirection.Next);
                 e.Handled = true;
             }
-            else if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control) && items.Count == 1)
+            else if (e.KeyModifiers.HasFlag(KeyModifiers.Control))
             {
                 if (e.Key == Key.Up)
                 {
-                    vm.MoveItemUp(items[0]);
+                    var idx = 0;
+                    for (int i = 0; i < vm.Items.Count; i++)
+                    {
+                        if (items.Contains(vm.Items[i]))
+                        {
+                            idx = Math.Max(0, i - 1);
+                            break;
+                        }
+                    }
+
+                    vm.Move(items, idx);
+                    SelectedItems = items;
+                    Focus();
                     e.Handled = true;
                 }
                 else if (e.Key == Key.Down)
                 {
-                    vm.MoveItemDown(items[0]);
+                    var idx = 0;
+                    for (int i = vm.Items.Count - 1; i >= 0; i--)
+                    {
+                        if (items.Contains(vm.Items[i]))
+                        {
+                            idx = Math.Min(vm.Items.Count, i + 2);
+                            break;
+                        }
+                    }
+
+                    vm.Move(items, idx);
+                    SelectedItems = items;
+                    Focus();
                     e.Handled = true;
                 }
             }
@@ -139,61 +164,104 @@ private void OnRowsSelectionChanged(object _, SelectionChangedEventArgs e)
                 OpenCommitMessageEditor(items[0]);
         }
 
-        private async void OnRowHeaderPointerPressed(object sender, PointerPressedEventArgs e)
+        private async void OnRowPointerPressed(object sender, PointerPressedEventArgs e)
         {
-            if (sender is Border { DataContext: ViewModels.InteractiveRebaseItem item })
+            if (sender is not Control { DataContext: ViewModels.InteractiveRebaseItem item })
+                return;
+
+            var cmdKeyModifier = OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
+            if (e.KeyModifiers.HasFlag(KeyModifiers.Shift) || e.KeyModifiers.HasFlag(cmdKeyModifier))
+                return;
+
+            var builder = new StringBuilder();
+            var selected = IRItemListBox.SelectedItems ?? new List<object>();
+            if (selected.Count > 0 && !selected.Contains(item))
             {
-                var data = new DataTransfer();
-                data.Add(DataTransferItem.Create(_dndItemFormat, item.Commit.SHA));
-                await DragDrop.DoDragDropAsync(e, data, DragDropEffects.Move);
+                IRItemListBox.SelectedItem = item;
+                builder.Append(item.Commit.SHA).Append(';');
             }
+            else
+            {
+                foreach (var one in selected)
+                {
+                    if (one is ViewModels.InteractiveRebaseItem rebaseItem)
+                        builder.Append(rebaseItem.Commit.SHA).Append(';');
+                }
+            }
+
+            var data = new DataTransfer();
+            data.Add(DataTransferItem.Create(_dndItemFormat, builder.ToString()));
+            await DragDrop.DoDragDropAsync(e, data, DragDropEffects.Move);
         }
 
-        private void OnRowHeaderDragOver(object sender, DragEventArgs e)
+        private void OnRowDragOver(object sender, DragEventArgs e)
         {
             if (DataContext is not ViewModels.InteractiveRebase vm)
                 return;
 
-            if (e.DataTransfer.TryGetValue(_dndItemFormat) is not { Length: > 6 } sha)
+            if (e.DataTransfer.TryGetValue(_dndItemFormat) is not { Length: > 0 } hashes)
                 return;
 
-            ViewModels.InteractiveRebaseItem src = null;
-            foreach (var item in vm.Items)
-            {
-                if (item.Commit.SHA.Equals(sha, StringComparison.Ordinal))
-                {
-                    src = item;
-                    break;
-                }
-            }
+            if (sender is not Control { DataContext: ViewModels.InteractiveRebaseItem dst } control)
+                return;
+
+            if (hashes.IndexOf(dst.Commit.SHA, StringComparison.Ordinal) >= 0)
+                return;
+
+            var p = e.GetPosition(control);
+            var before = p.Y < control.Bounds.Height * 0.5;
+
+            dst.IsDropBeforeVisible = before;
+            dst.IsDropAfterVisible = !before;
+            e.DragEffects = DragDropEffects.Move;
+            e.Handled = true;
+        }
+
+        private void OnRowDragLeave(object sender, DragEventArgs e)
+        {
+            if (sender is not Control { DataContext: ViewModels.InteractiveRebaseItem dst })
+                return;
+
+            dst.IsDropBeforeVisible = false;
+            dst.IsDropAfterVisible = false;
+            e.Handled = true;
+        }
+
+        private void OnRowDrop(object sender, DragEventArgs e)
+        {
+            if (DataContext is not ViewModels.InteractiveRebase vm)
+                return;
 
-            if (src == null)
+            if (e.DataTransfer.TryGetValue(_dndItemFormat) is not { Length: > 0 } hashes)
                 return;
 
-            if (sender is not Border { DataContext: ViewModels.InteractiveRebaseItem dst } border)
+            if (sender is not Control { DataContext: ViewModels.InteractiveRebaseItem dst } control)
                 return;
 
-            if (src == dst)
+            if (hashes.IndexOf(dst.Commit.SHA, StringComparison.Ordinal) >= 0)
                 return;
 
-            var p = e.GetPosition(border);
-            if (p.Y > border.Bounds.Height * 0.33 && p.Y < border.Bounds.Height * 0.67)
+            var selected = IRItemListBox.SelectedItems ?? new List<object>();
+            if (selected.Count == 0)
+                return;
+
+            var p = e.GetPosition(control);
+            var before = p.Y < control.Bounds.Height * 0.5;
+            var idx = vm.Items.IndexOf(dst);
+
+            var commits = new List<ViewModels.InteractiveRebaseItem>();
+            foreach (var item in selected)
             {
-                var srcIdx = vm.Items.IndexOf(src);
-                var dstIdx = vm.Items.IndexOf(dst);
-                if (srcIdx < dstIdx)
-                {
-                    for (var i = srcIdx; i < dstIdx; i++)
-                        vm.MoveItemDown(src);
-                }
-                else
-                {
-                    for (var i = srcIdx; i > dstIdx; i--)
-                        vm.MoveItemUp(src);
-                }
+                if (item is ViewModels.InteractiveRebaseItem irItem)
+                    commits.Add(irItem);
             }
 
-            e.DragEffects = DragDropEffects.Move;
+            vm.Move(commits, before ? idx : idx + 1);
+            IRItemListBox.SelectedItems = commits;
+
+            dst.IsDropBeforeVisible = false;
+            dst.IsDropAfterVisible = false;
+            e.DragEffects = DragDropEffects.None;
             e.Handled = true;
         }
 

From 81f622b4b1652a135b9a26a27c5fa974d4ae3d78 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Oct 2025 10:23:36 +0800
Subject: [PATCH 59/72] enhance: save commit message to `.git/MERGE_MSG` while
 closing repo with in-progress state (#1795)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/Repository.cs  | 6 +++++-
 src/ViewModels/WorkingCopy.cs | 9 ++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index a0ffb347b..6b520595d 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -567,7 +567,11 @@ public void Close()
 
             if (!_isWorktree)
             {
-                _settings.LastCommitMessage = _workingCopy.CommitMessage;
+                if (_workingCopy.InProgressContext != null && !string.IsNullOrEmpty(_workingCopy.CommitMessage))
+                    File.WriteAllText(Path.Combine(GitDir, "MERGE_MSG"), _workingCopy.CommitMessage);
+                else
+                    _settings.LastCommitMessage = _workingCopy.CommitMessage;
+
                 using var stream = File.Create(Path.Combine(_gitCommonDir, "sourcegit.settings"));
                 JsonSerializer.Serialize(stream, _settings, JsonCodeGen.Default.RepositorySettings);
             }
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 586a13dd0..1cc244295 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -796,13 +796,8 @@ private void UpdateInProgressState()
                 if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "rebase-merge", "message")))
                     break;
 
-                var rebaseProcessingFile = Path.Combine(_repo.GitDir, "rebase-apply", "final-commit");
-                if (File.Exists(rebaseProcessingFile))
-                {
-                    var sha = File.ReadAllText(rebaseProcessingFile);
-                    if (!string.IsNullOrEmpty(sha))
-                        CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).GetResult();
-                }
+                if (_inProgressContext is RebaseInProgress { StoppedAt: { } stopAt })
+                    CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, stopAt.SHA).GetResult();
             } while (false);
         }
 

From 82ac122f2c79004d268cc6ba5740d5cd366a38d9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Oct 2025 10:53:51 +0800
Subject: [PATCH 60/72] refactor: use hotkey instead of custom `OnKeyDown` to
 re-order commits in `Interactive Rebase` window

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/InteractiveRebase.axaml    |   7 +-
 src/Views/InteractiveRebase.axaml.cs | 106 ++++++++++++++++++---------
 2 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index e498f0aed..9d872f10d 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -38,7 +38,7 @@
     </Grid>
 
     <!-- Operation Information -->
-    <Grid Grid.Row="1" Margin="8" ColumnDefinitions="*,Auto">
+    <Grid Grid.Row="1" Margin="8" ColumnDefinitions="*,Auto,0,0">
       <StackPanel Grid.Column="0" Orientation="Horizontal" ClipToBounds="True">
         <TextBlock Text="{DynamicResource Text.InteractiveRebase.Target}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
         <Path Width="14" Height="14" Margin="8,0,0,0" Data="{StaticResource Icons.Branch}"/>
@@ -61,6 +61,9 @@
 
         <Path Width="14" Height="14" Data="{StaticResource Icons.Info}"/>
       </Border>
+      
+      <Button Grid.Column="2" Width="0" Height="0" Click="OnMoveSelectedUp" HotKey="{OnPlatform Ctrl+Up, macOS=⌘+Up}"/>
+      <Button Grid.Column="3" Width="0" Height="0" Click="OnMoveSelectedDown" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}"/>
     </Grid>
 
     <!-- Body -->
@@ -122,7 +125,7 @@
                            HorizontalAlignment="Center"/>
                 
                 <!-- Action -->
-                <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnButtonActionClicked">
+                <Button Grid.Column="1" Opacity="1" Margin="4,0,0,0" Padding="8,2" Background="Transparent" Click="OnShowActionsDropdownMenu">
                   <StackPanel Orientation="Horizontal">
                     <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
                     <TextBlock Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
index b876e209b..1005bfe45 100644
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@@ -76,40 +76,8 @@ protected override void OnKeyDown(KeyEventArgs e)
             }
             else if (e.KeyModifiers.HasFlag(KeyModifiers.Control))
             {
-                if (e.Key == Key.Up)
-                {
-                    var idx = 0;
-                    for (int i = 0; i < vm.Items.Count; i++)
-                    {
-                        if (items.Contains(vm.Items[i]))
-                        {
-                            idx = Math.Max(0, i - 1);
-                            break;
-                        }
-                    }
-
-                    vm.Move(items, idx);
-                    SelectedItems = items;
-                    Focus();
-                    e.Handled = true;
-                }
-                else if (e.Key == Key.Down)
-                {
-                    var idx = 0;
-                    for (int i = vm.Items.Count - 1; i >= 0; i--)
-                    {
-                        if (items.Contains(vm.Items[i]))
-                        {
-                            idx = Math.Min(vm.Items.Count, i + 2);
-                            break;
-                        }
-                    }
-
-                    vm.Move(items, idx);
-                    SelectedItems = items;
-                    Focus();
-                    e.Handled = true;
-                }
+                if (e.Key == Key.Up || e.Key == Key.Down)
+                    return;
             }
 
             if (!e.Handled)
@@ -265,7 +233,75 @@ private void OnRowDrop(object sender, DragEventArgs e)
             e.Handled = true;
         }
 
-        private void OnButtonActionClicked(object sender, RoutedEventArgs e)
+        private void OnMoveSelectedUp(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not ViewModels.InteractiveRebase vm)
+                return;
+
+            if (IRItemListBox.SelectedItems is not { Count: > 0 } selected)
+                return;
+
+            var hashes = new HashSet<string>();
+            var items = new List<ViewModels.InteractiveRebaseItem>();
+            foreach (var item in selected)
+            {
+                if (item is ViewModels.InteractiveRebaseItem irItem)
+                {
+                    hashes.Add(irItem.Commit.SHA);
+                    items.Add(irItem);
+                }
+            }
+
+            var idx = 0;
+            for (int i = 0; i < vm.Items.Count; i++)
+            {
+                if (hashes.Contains(vm.Items[i].Commit.SHA))
+                {
+                    idx = Math.Max(0, i - 1);
+                    break;
+                }
+            }
+
+            vm.Move(items, idx);
+            IRItemListBox.SelectedItems = items;
+            e.Handled = true;
+        }
+
+        private void OnMoveSelectedDown(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not ViewModels.InteractiveRebase vm)
+                return;
+
+            if (IRItemListBox.SelectedItems is not { Count: > 0 } selected)
+                return;
+
+            var hashes = new HashSet<string>();
+            var items = new List<ViewModels.InteractiveRebaseItem>();
+            foreach (var item in selected)
+            {
+                if (item is ViewModels.InteractiveRebaseItem irItem)
+                {
+                    hashes.Add(irItem.Commit.SHA);
+                    items.Add(irItem);
+                }
+            }
+
+            var idx = 0;
+            for (int i = vm.Items.Count - 1; i >= 0; i--)
+            {
+                if (hashes.Contains(vm.Items[i].Commit.SHA))
+                {
+                    idx = Math.Min(vm.Items.Count, i + 2);
+                    break;
+                }
+            }
+
+            vm.Move(items, idx);
+            IRItemListBox.SelectedItems = items;
+            e.Handled = true;
+        }
+
+        private void OnShowActionsDropdownMenu(object sender, RoutedEventArgs e)
         {
             if (sender is not Button { DataContext: ViewModels.InteractiveRebaseItem item } button)
                 return;

From 6c61a300b282d899e0043659bf68223ec548571d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Oct 2025 11:07:50 +0800
Subject: [PATCH 61/72] project: upgrade `AvaloniaUI` to `11.3.8`

Signed-off-by: leo <longshuang@msn.cn>
---
 THIRD-PARTY-LICENSES.md |  2 +-
 src/SourceGit.csproj    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index 4734482e6..706edfdb8 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -7,7 +7,7 @@ The project uses the following third-party libraries or assets
 ### AvaloniaUI
 
 - **Source**: https://github.com/AvaloniaUI/Avalonia
-- **Version**: 11.3.7
+- **Version**: 11.3.8
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
 
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index a2e15c7c9..109f66e81 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -39,12 +39,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.7" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.7" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Avalonia" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.8" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
     <PackageReference Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />

From 3b9e578acb3ec3d9c21d6f4e5b371d11a0232afb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Oct 2025 16:43:37 +0800
Subject: [PATCH 62/72] =?UTF-8?q?refactor:=20rewrite=20`Ctrl+P/=E2=8C=98+P?=
 =?UTF-8?q?`=20feature?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml             |   1 +
 src/Resources/Locales/zh_CN.axaml             |   1 +
 src/Resources/Locales/zh_TW.axaml             |   1 +
 src/ViewModels/Launcher.cs                    |  19 +--
 src/ViewModels/LauncherPageSwitcher.cs        |  84 ------------
 src/ViewModels/QuickLauncher.cs               | 125 ++++++++++++++++++
 src/Views/Launcher.axaml                      |  14 +-
 src/Views/Launcher.axaml.cs                   |  17 ++-
 src/Views/LauncherPageSwitcher.axaml.cs       |  62 ---------
 ...PageSwitcher.axaml => QuickLauncher.axaml} |  88 ++++++++++--
 src/Views/QuickLauncher.axaml.cs              |  92 +++++++++++++
 11 files changed, 318 insertions(+), 186 deletions(-)
 delete mode 100644 src/ViewModels/LauncherPageSwitcher.cs
 create mode 100644 src/ViewModels/QuickLauncher.cs
 delete mode 100644 src/Views/LauncherPageSwitcher.axaml.cs
 rename src/Views/{LauncherPageSwitcher.axaml => QuickLauncher.axaml} (61%)
 create mode 100644 src/Views/QuickLauncher.axaml.cs

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 011f26c7f..fdb1acb85 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -512,6 +512,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
   <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.OpenRepository" xml:space="preserve">Open Repositories</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Tabs</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 88f020e4a..76a334b16 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -516,6 +516,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在浏览器中访问</x:String>
   <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.OpenRepository" xml:space="preserve">打开其他仓库</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">页面列表</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作区列表</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index e329f3525..185ac79bf 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -516,6 +516,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟連結</x:String>
   <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.OpenRepository" xml:space="preserve">開啟存放庫</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">頁面列表</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作區列表</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index c1155e408..964fa1120 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -43,10 +43,10 @@ public LauncherPage ActivePage
             }
         }
 
-        public IDisposable Switcher
+        public QuickLauncher QuickLauncher
         {
-            get => _switcher;
-            private set => SetProperty(ref _switcher, value);
+            get => _quickLauncher;
+            set => SetProperty(ref _quickLauncher, value);
         }
 
         public Launcher(string startupRepo)
@@ -127,17 +127,6 @@ public void Quit()
             _ignoreIndexChange = false;
         }
 
-        public void OpenTabSwitcher()
-        {
-            Switcher = new LauncherPageSwitcher(this);
-        }
-
-        public void CancelSwitcher()
-        {
-            Switcher?.Dispose();
-            Switcher = null;
-        }
-
         public void SwitchWorkspace(Workspace to)
         {
             if (to == null || to.IsActive)
@@ -492,6 +481,6 @@ private void UpdateTitle()
         private LauncherPage _activePage = null;
         private bool _ignoreIndexChange = false;
         private string _title = string.Empty;
-        private IDisposable _switcher = null;
+        private QuickLauncher _quickLauncher = null;
     }
 }
diff --git a/src/ViewModels/LauncherPageSwitcher.cs b/src/ViewModels/LauncherPageSwitcher.cs
deleted file mode 100644
index b732ca0eb..000000000
--- a/src/ViewModels/LauncherPageSwitcher.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace SourceGit.ViewModels
-{
-    public class LauncherPageSwitcher : ObservableObject, IDisposable
-    {
-        public List<LauncherPage> VisiblePages
-        {
-            get => _visiblePages;
-            private set => SetProperty(ref _visiblePages, value);
-        }
-
-        public string SearchFilter
-        {
-            get => _searchFilter;
-            set
-            {
-                if (SetProperty(ref _searchFilter, value))
-                    UpdateVisiblePages();
-            }
-        }
-
-        public LauncherPage SelectedPage
-        {
-            get => _selectedPage;
-            set => SetProperty(ref _selectedPage, value);
-        }
-
-        public LauncherPageSwitcher(Launcher launcher)
-        {
-            _launcher = launcher;
-            UpdateVisiblePages();
-            SelectedPage = launcher.ActivePage;
-        }
-
-        public void ClearFilter()
-        {
-            SearchFilter = string.Empty;
-        }
-
-        public void Switch()
-        {
-            _launcher.ActivePage = _selectedPage ?? _launcher.ActivePage;
-            _launcher.CancelSwitcher();
-        }
-
-        public void Dispose()
-        {
-            _visiblePages.Clear();
-            _selectedPage = null;
-            _searchFilter = string.Empty;
-        }
-
-        private void UpdateVisiblePages()
-        {
-            var visible = new List<LauncherPage>();
-            if (string.IsNullOrEmpty(_searchFilter))
-            {
-                visible.AddRange(_launcher.Pages);
-            }
-            else
-            {
-                foreach (var page in _launcher.Pages)
-                {
-                    if (page.Node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase) ||
-                        (page.Node.IsRepository && page.Node.Id.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)))
-                    {
-                        visible.Add(page);
-                    }
-                }
-            }
-
-            VisiblePages = visible;
-            SelectedPage = visible.Count > 0 ? visible[0] : null;
-        }
-
-        private Launcher _launcher = null;
-        private List<LauncherPage> _visiblePages = [];
-        private string _searchFilter = string.Empty;
-        private LauncherPage _selectedPage = null;
-    }
-}
diff --git a/src/ViewModels/QuickLauncher.cs b/src/ViewModels/QuickLauncher.cs
new file mode 100644
index 000000000..a665a7558
--- /dev/null
+++ b/src/ViewModels/QuickLauncher.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class QuickLauncher : ObservableObject
+    {
+        public List<LauncherPage> VisiblePages
+        {
+            get => _visiblePages;
+            private set => SetProperty(ref _visiblePages, value);
+        }
+
+        public List<RepositoryNode> VisibleRepos
+        {
+            get => _visibleRepos;
+            private set => SetProperty(ref _visibleRepos, value);
+        }
+
+        public string SearchFilter
+        {
+            get => _searchFilter;
+            set
+            {
+                if (SetProperty(ref _searchFilter, value))
+                    UpdateVisible();
+            }
+        }
+
+        public LauncherPage SelectedPage
+        {
+            get => _selectedPage;
+            set
+            {
+                if (SetProperty(ref _selectedPage, value) && value != null)
+                    SelectedRepo = null;
+            }
+        }
+
+        public RepositoryNode SelectedRepo
+        {
+            get => _selectedRepo;
+            set
+            {
+                if (SetProperty(ref _selectedRepo, value) && value != null)
+                    SelectedPage = null;
+            }
+        }
+
+        public QuickLauncher(Launcher launcher)
+        {
+            _launcher = launcher;
+
+            foreach (var page in _launcher.Pages)
+            {
+                if (page.Node.IsRepository)
+                    _opened.Add(page.Node.Id);
+            }
+
+            UpdateVisible();
+        }
+
+        public void ClearFilter()
+        {
+            SearchFilter = string.Empty;
+        }
+
+        public void OpenOrSwitchTo()
+        {
+            if (_selectedPage != null)
+                _launcher.ActivePage = _selectedPage;
+            else if (_selectedRepo != null)
+                _launcher.OpenRepositoryInTab(_selectedRepo, null);
+
+            _launcher.QuickLauncher = null;
+        }
+
+        private void UpdateVisible()
+        {
+            var pages = new List<LauncherPage>();
+            foreach (var page in _launcher.Pages)
+            {
+                if (string.IsNullOrEmpty(_searchFilter) ||
+                    page.Node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase) ||
+                    (page.Node.IsRepository && page.Node.Id.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase)))
+                    pages.Add(page);
+            }
+
+            var repos = new List<RepositoryNode>();
+            CollectVisibleRepository(repos, Preferences.Instance.RepositoryNodes);
+
+            VisiblePages = pages;
+            VisibleRepos = repos;
+        }
+
+        private void CollectVisibleRepository(List<RepositoryNode> outs, List<RepositoryNode> nodes)
+        {
+            foreach (var node in nodes)
+            {
+                if (!node.IsRepository)
+                {
+                    CollectVisibleRepository(outs, node.SubNodes);
+                    continue;
+                }
+
+                if (_opened.Contains(node.Id))
+                    continue;
+
+                if (string.IsNullOrEmpty(_searchFilter) ||
+                    node.Id.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase) ||
+                    node.Name.Contains(_searchFilter, StringComparison.OrdinalIgnoreCase))
+                    outs.Add(node);
+            }
+        }
+
+        private Launcher _launcher = null;
+        private HashSet<string> _opened = new HashSet<string>();
+        private List<LauncherPage> _visiblePages = [];
+        private List<RepositoryNode> _visibleRepos = [];
+        private string _searchFilter = string.Empty;
+        private LauncherPage _selectedPage = null;
+        private RepositoryNode _selectedRepo = null;
+    }
+}
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index c45947b80..85c1b781d 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -90,7 +90,7 @@
       </Button>
 
       <!-- Pages Switcher Toggle Button -->
-      <Button Grid.Column="2" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Command="{Binding OpenTabSwitcher}" HotKey="{OnPlatform Ctrl+P, macOS=⌘+P}">
+      <Button Grid.Column="2" Classes="icon_button" VerticalAlignment="Bottom" Margin="0,0,0,1" Click="OnOpenQuickLauncher" HotKey="{OnPlatform Ctrl+P, macOS=⌘+P}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal">
             <TextBlock Text="{DynamicResource Text.Launcher.Pages}"
@@ -123,17 +123,17 @@
       </ContentControl.DataTemplates>
     </ContentControl>
 
-    <!-- Pages Switcher -->
+    <!-- Quick Launcher Popup -->
     <Border Grid.Row="0" Grid.RowSpan="2"
             Background="Transparent"
-            IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}"
-            PointerPressed="OnCancelSwitcher">
+            IsVisible="{Binding QuickLauncher, Converter={x:Static ObjectConverters.IsNotNull}}"
+            PointerPressed="OnCloseQuickLauncher">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
-          <ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">
+          <ContentControl Margin="16,10,16,12" Content="{Binding QuickLauncher}">
             <ContentControl.DataTemplates>
-              <DataTemplate DataType="vm:LauncherPageSwitcher">
-                <v:LauncherPageSwitcher/>
+              <DataTemplate DataType="vm:QuickLauncher">
+                <v:QuickLauncher/>
               </DataTemplate>
             </ContentControl.DataTemplates>
           </ContentControl>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 6998fb8ae..46c71d603 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -250,8 +250,8 @@ protected override async void OnKeyDown(KeyEventArgs e)
             }
             else if (e.Key == Key.Escape)
             {
-                if (vm.Switcher != null)
-                    vm.CancelSwitcher();
+                if (vm.QuickLauncher != null)
+                    vm.QuickLauncher = null;
                 else
                     vm.ActivePage.CancelPopup();
 
@@ -355,10 +355,17 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
             e.Handled = true;
         }
 
-        private void OnCancelSwitcher(object sender, PointerPressedEventArgs e)
+        private void OnOpenQuickLauncher(object sender, RoutedEventArgs e)
         {
-            if (e.Source == sender)
-                (DataContext as ViewModels.Launcher)?.CancelSwitcher();
+            if (DataContext is ViewModels.Launcher launcher)
+                launcher.QuickLauncher = new ViewModels.QuickLauncher(launcher);
+            e.Handled = true;
+        }
+
+        private void OnCloseQuickLauncher(object sender, PointerPressedEventArgs e)
+        {
+            if (e.Source == sender && DataContext is ViewModels.Launcher launcher)
+                launcher.QuickLauncher = null;
             e.Handled = true;
         }
 
diff --git a/src/Views/LauncherPageSwitcher.axaml.cs b/src/Views/LauncherPageSwitcher.axaml.cs
deleted file mode 100644
index 8595af22b..000000000
--- a/src/Views/LauncherPageSwitcher.axaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-
-namespace SourceGit.Views
-{
-    public partial class LauncherPageSwitcher : UserControl
-    {
-        public LauncherPageSwitcher()
-        {
-            InitializeComponent();
-        }
-
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-
-            if (e.Key == Key.Enter && DataContext is ViewModels.LauncherPageSwitcher switcher)
-            {
-                switcher.Switch();
-                e.Handled = true;
-            }
-        }
-
-        private void OnItemTapped(object sender, TappedEventArgs e)
-        {
-            if (DataContext is ViewModels.LauncherPageSwitcher switcher)
-            {
-                switcher.Switch();
-                e.Handled = true;
-            }
-        }
-
-        private void OnSearchBoxKeyDown(object sender, KeyEventArgs e)
-        {
-            if (PagesListBox.ItemCount == 0)
-                return;
-
-            if (e.Key == Key.Down)
-            {
-                PagesListBox.Focus(NavigationMethod.Directional);
-
-                if (PagesListBox.SelectedIndex < PagesListBox.ItemCount - 1)
-                    PagesListBox.SelectedIndex++;
-                else
-                    PagesListBox.SelectedIndex = 0;
-
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Up)
-            {
-                PagesListBox.Focus(NavigationMethod.Directional);
-
-                if (PagesListBox.SelectedIndex > 0)
-                    PagesListBox.SelectedIndex--;
-                else
-                    PagesListBox.SelectedIndex = PagesListBox.ItemCount - 1;
-
-                e.Handled = true;
-            }
-        }
-    }
-}
diff --git a/src/Views/LauncherPageSwitcher.axaml b/src/Views/QuickLauncher.axaml
similarity index 61%
rename from src/Views/LauncherPageSwitcher.axaml
rename to src/Views/QuickLauncher.axaml
index 8886a1f7b..220471052 100644
--- a/src/Views/LauncherPageSwitcher.axaml
+++ b/src/Views/QuickLauncher.axaml
@@ -6,21 +6,16 @@
              xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.LauncherPageSwitcher"
-             x:DataType="vm:LauncherPageSwitcher">
-  <Grid RowDefinitions="Auto,Auto,Auto">
-    <TextBlock Grid.Row="0"
-               Text="{DynamicResource Text.Launcher.Pages}"
-               FontWeight="Bold"
-               HorizontalAlignment="Center"/>
-
-    <TextBox Grid.Row="1"
+             x:Class="SourceGit.Views.QuickLauncher"
+             x:DataType="vm:QuickLauncher">
+  <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto">
+    <TextBox Grid.Row="0"
+             x:Name="FilterTextBox"
              Height="24"
              Margin="4,8,4,0"
              BorderThickness="1"
              CornerRadius="12"
              Text="{Binding SearchFilter, Mode=TwoWay}"
-             KeyDown="OnSearchBoxKeyDown"
              BorderBrush="{DynamicResource Brush.Border2}"
              VerticalContentAlignment="Center"
              v:AutoFocusBehaviour.IsEnabled="True">
@@ -46,11 +41,17 @@
       </TextBox.InnerRightContent>
     </TextBox>
 
+    <TextBlock Grid.Row="1"
+               Margin="6,8,0,4"
+               Text="{DynamicResource Text.Launcher.Pages}"
+               FontWeight="Bold"
+               Foreground="{DynamicResource Brush.FG2}"/>
+
     <ListBox Grid.Row="2"
-             x:Name="PagesListBox"
+             x:Name="PageListBox"
              Width="300"
-             MaxHeight="400"
-             Margin="4,8,4,0"
+             MaxHeight="250"
+             Margin="4,0"
              BorderThickness="0"
              SelectionMode="Single"
              Background="Transparent"
@@ -110,5 +111,66 @@
         </DataTemplate>
       </ListBox.ItemTemplate>
     </ListBox>
+
+    <TextBlock Grid.Row="3"
+               Margin="6,8,0,4"
+               Text="{DynamicResource Text.Launcher.OpenRepository}"
+               FontWeight="Bold"
+               Foreground="{DynamicResource Brush.FG2}"/>
+
+    <ListBox Grid.Row="4"
+             x:Name="RepoListBox"
+             Width="300"
+             MaxHeight="300"
+             Margin="4,0"
+             BorderThickness="0"
+             SelectionMode="Single"
+             Background="Transparent"
+             Focusable="True"
+             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+             ScrollViewer.VerticalScrollBarVisibility="Auto"
+             ItemsSource="{Binding VisibleRepos, Mode=OneWay}"
+             SelectedItem="{Binding SelectedRepo, Mode=TwoWay}">
+      <ListBox.Styles>
+        <Style Selector="ListBoxItem">
+          <Setter Property="Padding" Value="8,0"/>
+          <Setter Property="MinHeight" Value="26"/>
+          <Setter Property="CornerRadius" Value="4"/>
+        </Style>
+
+        <Style Selector="ListBox">
+          <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+              <Grid/>
+            </FocusAdornerTemplate>
+          </Setter>
+        </Style>
+      </ListBox.Styles>
+
+      <ListBox.ItemsPanel>
+        <ItemsPanelTemplate>
+          <StackPanel Orientation="Vertical"/>
+        </ItemsPanelTemplate>
+      </ListBox.ItemsPanel>
+
+      <ListBox.ItemTemplate>
+        <DataTemplate DataType="vm:RepositoryNode">
+          <Grid ColumnDefinitions="Auto,*" Background="Transparent" Tapped="OnItemTapped">
+            <Path Grid.Column="0"
+                  Width="12" Height="12"
+                  Fill="{Binding Bookmark, Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
+                  Data="{StaticResource Icons.Bookmark}"
+                  IsHitTestVisible="False"/>
+            <TextBlock Grid.Column="1"
+                       Margin="6,0,0,0"
+                       VerticalAlignment="Center"
+                       IsHitTestVisible="False">
+              <Run Text="{Binding Name, Mode=OneWay}"/>
+              <Run Text="{Binding Id, Mode=OneWay, StringFormat=({0})}" Foreground="{DynamicResource Brush.FG2}"/>
+            </TextBlock>
+          </Grid>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
   </Grid>
 </UserControl>
diff --git a/src/Views/QuickLauncher.axaml.cs b/src/Views/QuickLauncher.axaml.cs
new file mode 100644
index 000000000..f13029347
--- /dev/null
+++ b/src/Views/QuickLauncher.axaml.cs
@@ -0,0 +1,92 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+
+namespace SourceGit.Views
+{
+    public partial class QuickLauncher : UserControl
+    {
+        public QuickLauncher()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (DataContext is not ViewModels.QuickLauncher switcher)
+                return;
+
+            if (e.Key == Key.Enter)
+            {
+                switcher.OpenOrSwitchTo();
+                e.Handled = true;
+            }
+            else if (e.Key == Key.Up)
+            {
+                if (RepoListBox.IsKeyboardFocusWithin)
+                {
+                    if (switcher.VisiblePages.Count > 0)
+                    {
+                        PageListBox.Focus(NavigationMethod.Directional);
+                        switcher.SelectedPage = switcher.VisiblePages[^1];
+                    }
+                    else
+                    {
+                        FilterTextBox.Focus(NavigationMethod.Directional);
+                    }
+
+                    e.Handled = true;
+                    return;
+                }
+
+                if (PageListBox.IsKeyboardFocusWithin)
+                {
+                    FilterTextBox.Focus(NavigationMethod.Directional);
+                    e.Handled = true;
+                    return;
+                }
+            }
+            else if (e.Key == Key.Down)
+            {
+                if (FilterTextBox.IsKeyboardFocusWithin)
+                {
+                    if (switcher.VisiblePages.Count > 0)
+                    {
+                        PageListBox.Focus(NavigationMethod.Directional);
+                        switcher.SelectedPage = switcher.VisiblePages[0];
+                    }
+                    else if (switcher.VisibleRepos.Count > 0)
+                    {
+                        RepoListBox.Focus(NavigationMethod.Directional);
+                        switcher.SelectedRepo = switcher.VisibleRepos[0];
+                    }
+
+                    e.Handled = true;
+                    return;
+                }
+
+                if (PageListBox.IsKeyboardFocusWithin)
+                {
+                    if (switcher.VisibleRepos.Count > 0)
+                    {
+                        RepoListBox.Focus(NavigationMethod.Directional);
+                        switcher.SelectedRepo = switcher.VisibleRepos[0];
+                    }
+
+                    e.Handled = true;
+                    return;
+                }
+            }
+        }
+
+        private void OnItemTapped(object sender, TappedEventArgs e)
+        {
+            if (DataContext is ViewModels.QuickLauncher switcher)
+            {
+                switcher.OpenOrSwitchTo();
+                e.Handled = true;
+            }
+        }
+    }
+}

From df80480af770e9c48a42364564860eefd25291d6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Oct 2025 08:46:30 +0000
Subject: [PATCH 63/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index ff6dba740..721e8f8f9 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.11%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.00%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -17,12 +17,13 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
 - Text.ConfigureCustomActionControls.StringValue.Tip
+- Text.Launcher.OpenRepository
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.55%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.44%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
@@ -31,10 +32,11 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.CommitMessageTemplate.BuiltinVars
 - Text.Configure.Git.ConventionalTypesOverride
 - Text.ConfigureCustomActionControls.StringValue.Tip
+- Text.Launcher.OpenRepository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-77.15%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-77.06%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -154,6 +156,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
+- Text.Launcher.OpenRepository
 - Text.Launcher.Pages
 - Text.Launcher.Workspaces
 - Text.Merge.Edit
@@ -247,7 +250,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-98.55%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-98.44%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -263,12 +266,13 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.Launcher.OpenRepository
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-95.76%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-95.66%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -298,6 +302,7 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.Launcher.OpenRepository
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.Appearance.UseAutoHideScrollBars
 - Text.Preferences.General.EnableCompactFolders
@@ -314,7 +319,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-77.15%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-77.06%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -435,6 +440,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
+- Text.Launcher.OpenRepository
 - Text.Launcher.Pages
 - Text.Launcher.Workspaces
 - Text.Merge.Edit
@@ -527,7 +533,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-99.00%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-98.89%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -538,13 +544,14 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePRForUpstream
 - Text.Configure.Git.ConventionalTypesOverride
 - Text.ConfigureCustomActionControls.StringValue.Tip
+- Text.Launcher.OpenRepository
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 - Text.Submodule.Status.Unmerged
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-70.79%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-70.71%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -694,6 +701,7 @@ This document shows the translation status of each locale file in the repository
 - Text.InProgress.Rebase.StoppedAt
 - Text.InProgress.Revert.Head
 - Text.InteractiveRebase.ReorderTip
+- Text.Launcher.OpenRepository
 - Text.Launcher.Pages
 - Text.Launcher.Workspaces
 - Text.Merge.Edit
@@ -814,9 +822,16 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-77.26%25-yellow)
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.Launcher.OpenRepository
+
+</details>
+
+### ![ta__IN](https://img.shields.io/badge/ta__IN-77.17%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -937,6 +952,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
+- Text.Launcher.OpenRepository
 - Text.Launcher.Pages
 - Text.Launcher.Workspaces
 - Text.Merge.Edit
@@ -1028,7 +1044,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-78.37%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-78.29%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1144,6 +1160,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Hotkeys.Global.SwitchTab
 - Text.Hotkeys.TextEditor.OpenExternalMergeTool
 - Text.InteractiveRebase.ReorderTip
+- Text.Launcher.OpenRepository
 - Text.Launcher.Pages
 - Text.Launcher.Workspaces
 - Text.Merge.Edit

From 29db0af25c0640553285c4716667d2cf9827aa20 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Oct 2025 16:50:09 +0800
Subject: [PATCH 64/72] ux: width of quick launcher popup

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml      | 2 +-
 src/Views/QuickLauncher.axaml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 85c1b781d..0d0668933 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -128,7 +128,7 @@
             Background="Transparent"
             IsVisible="{Binding QuickLauncher, Converter={x:Static ObjectConverters.IsNotNull}}"
             PointerPressed="OnCloseQuickLauncher">
-      <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
+      <Border Width="400" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
           <ContentControl Margin="16,10,16,12" Content="{Binding QuickLauncher}">
             <ContentControl.DataTemplates>
diff --git a/src/Views/QuickLauncher.axaml b/src/Views/QuickLauncher.axaml
index 220471052..360368c08 100644
--- a/src/Views/QuickLauncher.axaml
+++ b/src/Views/QuickLauncher.axaml
@@ -49,7 +49,6 @@
 
     <ListBox Grid.Row="2"
              x:Name="PageListBox"
-             Width="300"
              MaxHeight="250"
              Margin="4,0"
              BorderThickness="0"
@@ -120,7 +119,6 @@
 
     <ListBox Grid.Row="4"
              x:Name="RepoListBox"
-             Width="300"
              MaxHeight="300"
              Margin="4,0"
              BorderThickness="0"

From 56c9b8e1abea2a055cda5a3bb8bcce427216d555 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 25 Oct 2025 16:17:09 +0800
Subject: [PATCH 65/72] ux: try to convert repo path to relative path to user's
 home

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Welcome.axaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index 8bff914eb..7d23c60a9 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -141,9 +141,9 @@
                             IsChecked="{Binding IsExpanded}"
                             IsVisible="{Binding !IsRepository}"/>
 
-              <StackPanel Grid.Column="2" Orientation="Horizontal">
+              <StackPanel Grid.Column="2" Orientation="Horizontal" ClipToBounds="True">
                 <TextBlock VerticalAlignment="Center" Text="{Binding Name}"/>
-                <TextBlock Margin="4,0,0,0" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Id, StringFormat=({0})}">
+                <TextBlock Margin="4,0,0,0" VerticalAlignment="Center" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Id, StringFormat=({0}), Converter={x:Static c:PathConverters.RelativeToHome}}">
                   <TextBlock.IsVisible>
                     <MultiBinding Converter="{x:Static BoolConverters.And}">
                       <Binding Path="IsRepository"/>
@@ -159,6 +159,7 @@
               </StackPanel>
 
               <ContentControl Grid.Column="3"
+                              Margin="6,0,0,0"
                               Content="{Binding Status, Mode=OneWay}"
                               IsVisible="{Binding Status, Converter={x:Static ObjectConverters.NotEqual}}">
                 <ContentControl.DataTemplates>

From c1889eed52713333f1641cd4a90d25c2b52509c0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 25 Oct 2025 16:22:56 +0800
Subject: [PATCH 66/72] ux: try to convert repo's path to relative path to
 user's home

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/QuickLauncher.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/QuickLauncher.axaml b/src/Views/QuickLauncher.axaml
index 360368c08..a9a801619 100644
--- a/src/Views/QuickLauncher.axaml
+++ b/src/Views/QuickLauncher.axaml
@@ -164,7 +164,7 @@
                        VerticalAlignment="Center"
                        IsHitTestVisible="False">
               <Run Text="{Binding Name, Mode=OneWay}"/>
-              <Run Text="{Binding Id, Mode=OneWay, StringFormat=({0})}" Foreground="{DynamicResource Brush.FG2}"/>
+              <Run Text="{Binding Id, Mode=OneWay, StringFormat=({0}), Converter={x:Static c:PathConverters.RelativeToHome}}" Foreground="{DynamicResource Brush.FG2}"/>
             </TextBlock>
           </Grid>
         </DataTemplate>

From bc02195b6ab277c3c5634ff55d827883e9e7b796 Mon Sep 17 00:00:00 2001
From: Chiahong <36815907+ChiahongHong@users.noreply.github.com>
Date: Sun, 26 Oct 2025 11:05:40 +0800
Subject: [PATCH 67/72] localization: update zh_TW.axaml (#1874)

---
 src/Resources/Locales/zh_TW.axaml | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 185ac79bf..58079e5e2 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -56,7 +56,7 @@
   <x:String x:Key="Text.Bisect.Skip">無法確認</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">二分搜尋進行中。請標記目前的提交為「良好」或「錯誤」，然後簽出另一個提交。</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">逐行溯源 (blame)</x:String>
-  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">對當前版本的先前版本執行逐行溯源操作。</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">對上一個版本執行逐行溯源</x:String>
   <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">所選擇的檔案不支援該操作!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">簽出 (checkout) ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">與目前 ${0}$ 比較</x:String>
@@ -82,7 +82,7 @@
   <x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切換上游分支...</x:String>
   <x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比較</x:String>
   <x:String x:Key="Text.BranchTree.Ahead" xml:space="preserve">領先 {0} 次提交</x:String>
-  <x:String x:Key="Text.BranchTree.AheadBehind" xml:space="preserve">領先 {0} 次提交, 落後 {0} 次提交</x:String>
+  <x:String x:Key="Text.BranchTree.AheadBehind" xml:space="preserve">領先 {0} 次提交，落後 {0} 次提交</x:String>
   <x:String x:Key="Text.BranchTree.Behind" xml:space="preserve">落後 {0} 次提交</x:String>
   <x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">無效</x:String>
   <x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">遠端</x:String>
@@ -184,25 +184,25 @@
   <x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">簽署人:</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">在瀏覽器中檢視</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.MessagePlaceholder" xml:space="preserve">詳細描述</x:String>
-  <x:String x:Key="Text.CommitMessageTextBox.PasteAndReplaceAll" xml:space="preserve">粘貼（替換所有內容）</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.PasteAndReplaceAll" xml:space="preserve">貼上 (全部取代)</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">標題</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">填寫提交訊息標題</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">存放庫設定</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">提交訊息範本</x:String>
-  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">內建參數: 
-  
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">內建參數:
+
   ${branch_name} 目前分支名稱
   ${files_num} 已變更檔案數
   ${files} 已變更檔案路徑清單
-  ${files:N} 已變更檔案路徑清單（僅列出前 N 個）
-  ${pure_files} 類似 ${files}, 不含資料夾的純檔案名稱
-  ${pure_files:N} 類似 ${files:N}, 不含資料夾的純檔案名稱</x:String>
+  ${files:N} 已變更檔案路徑清單 (僅列出前 N 個)
+  ${pure_files} 類似 ${files}，不含資料夾的純檔案名稱
+  ${pure_files:N} 類似 ${files:N}，不含資料夾的純檔案名稱</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">範本內容:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">範本名稱:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">自訂動作</x:String>
   <x:String x:Key="Text.Configure.CustomAction.Arguments" xml:space="preserve">指令參數:</x:String>
-  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">內建參數: 
-  
+  <x:String x:Key="Text.Configure.CustomAction.Arguments.Tip" xml:space="preserve">內建參數:
+
   ${REPO} 存放庫路徑
   ${REMOTE} 所選的遠端存放庫或所選分支的遠端
   ${BRANCH} 所選的分支。對於遠端分支，不包含遠端名稱
@@ -337,7 +337,7 @@
   <x:String x:Key="Text.Diff.First" xml:space="preserve">第一個差異</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符號變化</x:String>
   <x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">混合對比</x:String>
-  <x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">差異比較</x:String>
+  <x:String x:Key="Text.Diff.Image.Difference" xml:space="preserve">差異對比</x:String>
   <x:String x:Key="Text.Diff.Image.SideBySide" xml:space="preserve">並排對比</x:String>
   <x:String x:Key="Text.Diff.Image.Swipe" xml:space="preserve">滑桿對比</x:String>
   <x:String x:Key="Text.Diff.Last" xml:space="preserve">最後一個差異</x:String>
@@ -362,8 +362,8 @@
   <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">增加可見的行數</x:String>
   <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">請選擇需要對比的檔案</x:String>
   <x:String x:Key="Text.DirHistories" xml:space="preserve">目錄内容變更歷史</x:String>
-  <x:String x:Key="Text.DirtyState.HasLocalChanges" xml:space="preserve">未提交的本地變更</x:String>
-  <x:String x:Key="Text.DirtyState.HasPendingPullOrPush" xml:space="preserve">當前分支的 HEAD 與上游不匹配</x:String>
+  <x:String x:Key="Text.DirtyState.HasLocalChanges" xml:space="preserve">未提交的本機變更</x:String>
+  <x:String x:Key="Text.DirtyState.HasPendingPullOrPush" xml:space="preserve">目前分支 HEAD 與上游不相符</x:String>
   <x:String x:Key="Text.DirtyState.UpToDate" xml:space="preserve">已更新至最新</x:String>
   <x:String x:Key="Text.Discard" xml:space="preserve">捨棄變更</x:String>
   <x:String x:Key="Text.Discard.All" xml:space="preserve">所有本機未提交的變更。</x:String>
@@ -373,8 +373,8 @@
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">將捨棄總計 {0} 項已選取的變更</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">您無法復原此操作，請確認後再繼續!</x:String>
   <x:String x:Key="Text.DropHead" xml:space="preserve">捨棄提交</x:String>
-  <x:String x:Key="Text.DropHead.Commit" xml:space="preserve">提交 ：</x:String>
-  <x:String x:Key="Text.DropHead.NewHead" xml:space="preserve">捨棄後新的 HEAD ：</x:String>
+  <x:String x:Key="Text.DropHead.Commit" xml:space="preserve">提交:</x:String>
+  <x:String x:Key="Text.DropHead.NewHead" xml:space="preserve">捨棄後新的 HEAD:</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Bookmark" xml:space="preserve">書籤:</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Name" xml:space="preserve">名稱:</x:String>
   <x:String x:Key="Text.EditRepositoryNode.Target" xml:space="preserve">目標:</x:String>
@@ -564,7 +564,7 @@
   <x:String x:Key="Text.Preferences.AI.GenerateSubjectPrompt" xml:space="preserve">產生提交訊息提示詞</x:String>
   <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">模型</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">名稱</x:String>
-  <x:String x:Key="Text.Preferences.AI.ReadApiKeyFromEnv" xml:space="preserve">從環境變數中（輸入為環境變數名稱）載入金鑰</x:String>
+  <x:String x:Key="Text.Preferences.AI.ReadApiKeyFromEnv" xml:space="preserve">從環境變數中 (輸入環境變數名稱) 讀取 API 金鑰</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">伺服器</x:String>
   <x:String x:Key="Text.Preferences.AI.Streaming" xml:space="preserve">啟用串流輸出</x:String>
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">外觀設定</x:String>
@@ -576,7 +576,7 @@
   <x:String x:Key="Text.Preferences.Appearance.MonospaceFont" xml:space="preserve">等寬字型</x:String>
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">佈景主題</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">自訂主題</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允許滾動條自動隱藏</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允許自動隱藏捲軸</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系統原生預設視窗樣式</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">對比/合併工具</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">安裝路徑</x:String>
@@ -585,16 +585,16 @@
   <x:String x:Key="Text.Preferences.General" xml:space="preserve">一般設定</x:String>
   <x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">啟動時檢查軟體更新</x:String>
   <x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">日期時間格式</x:String>
-  <x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在變更樹中啟用精簡文件夾顯示模式</x:String>
+  <x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在樹狀變更目錄中啟用密集資料夾模式</x:String>
   <x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">顯示語言</x:String>
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">最大歷史提交數</x:String>
   <x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">在提交路線圖中顯示修改時間而非提交時間</x:String>
-  <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">預設顯示「本機變更」頁面</x:String>
-  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">在提交詳細資訊頁面預設顯示【變更對比】</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">預設顯示 [本機變更] 頁面</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">在提交詳細資訊頁面預設顯示 [變更對比]</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">在提交詳細資訊中顯示後續提交</x:String>
   <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">在路線圖中顯示標籤</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">提交標題字數偵測</x:String>
-  <x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">生成 GitHub 風格的預設頭像</x:String>
+  <x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">產生 GitHub 風格的預設頭貼</x:String>
   <x:String x:Key="Text.Preferences.Git" xml:space="preserve">Git 設定</x:String>
   <x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">自動換行轉換</x:String>
   <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">預設複製 (clone) 路徑</x:String>
@@ -652,7 +652,7 @@
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">標籤:</x:String>
   <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">推送到新的分支</x:String>
-  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">输入新的遠端分支名</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">輸入新的遠端分支名稱:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">結束</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">重定基底 (rebase) 操作</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">自動擱置變更並復原本機變更</x:String>
@@ -750,7 +750,7 @@
   <x:String x:Key="Text.Reset.Mode" xml:space="preserve">重設模式:</x:String>
   <x:String x:Key="Text.Reset.MoveTo" xml:space="preserve">移至提交:</x:String>
   <x:String x:Key="Text.Reset.Target" xml:space="preserve">目前分支:</x:String>
-  <x:String x:Key="Text.ResetWithoutCheckout" xml:space="preserve">重設選取的分支（非目前分支）</x:String>
+  <x:String x:Key="Text.ResetWithoutCheckout" xml:space="preserve">重設選取的分支 (非目前分支)</x:String>
   <x:String x:Key="Text.ResetWithoutCheckout.MoveTo" xml:space="preserve">重設位置: </x:String>
   <x:String x:Key="Text.ResetWithoutCheckout.Target" xml:space="preserve">選取分支: </x:String>
   <x:String x:Key="Text.RevealFile" xml:space="preserve">在檔案瀏覽器中檢視</x:String>
@@ -879,7 +879,7 @@
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">修補</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">現在您已可將其加入暫存區中</x:String>
   <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">清除提交訊息歷史</x:String>
-  <x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">您確定要清除所有提交訊息記錄嗎 (動作無法撤銷) ?</x:String>
+  <x:String x:Key="Text.WorkingCopy.ClearCommitHistories.Confirm" xml:space="preserve">您確定要清除所有提交訊息記錄嗎 (執行後無法復原)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提  交</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">歷史輸入/範本</x:String>
@@ -897,7 +897,7 @@
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">顯示未追蹤檔案</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">沒有提交訊息記錄</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">沒有可套用的提交訊息範本</x:String>
-  <x:String x:Key="Text.WorkingCopy.NoVerify" xml:space="preserve">繞過 HOOKS 檢查</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoVerify" xml:space="preserve">繞過 Hooks 檢查</x:String>
   <x:String x:Key="Text.WorkingCopy.ResetAuthor" xml:space="preserve">重設作者</x:String>
   <x:String x:Key="Text.WorkingCopy.SignOff" xml:space="preserve">署名</x:String>
   <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">已暫存</x:String>

From d11585d041c8a3063e5e44fb14cb5ab0541d750f Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Mon, 27 Oct 2025 05:22:27 +0300
Subject: [PATCH 68/72] localization: update Russian translation (#1876)

---
 src/Resources/Locales/ru_RU.axaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 3373ec63b..b928a006a 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -516,6 +516,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Открыть в браузере</x:String>
   <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.OpenRepository" xml:space="preserve">Открыть репозитории</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Вкладки</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Рабочие места</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Влить ветку</x:String>

From 3507e5e5fe01439697796469e2b80db79144312f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 02:22:44 +0000
Subject: [PATCH 69/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 721e8f8f9..bee6d96bf 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -822,14 +822,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.89%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.Launcher.OpenRepository
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-77.17%25-yellow)
 

From 78b35afb49e9ab3833d850f8bdbdaaa96e4d06a5 Mon Sep 17 00:00:00 2001
From: Sina Hinderks <sina@hinderks.net>
Date: Mon, 27 Oct 2025 03:22:50 +0100
Subject: [PATCH 70/72] localization: update German translations (#1877)

---
 src/Resources/Locales/de_DE.axaml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 0eb6a90fc..a2f7ca9b2 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -56,11 +56,14 @@
   <x:String x:Key="Text.Bisect.Skip">Überspringen</x:String>
   <x:String x:Key="Text.Bisect.WaitingForRange">Bisecting. Aktuellen Commit als gut oder schlecht markieren und einen anderen auschecken.</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
+  <x:String x:Key="Text.Blame.BlameOnPreviousRevision" xml:space="preserve">Blame auf vorheriger Revision</x:String>
   <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">BLAME WIRD BEI DIESER DATEI NICHT UNTERSTÜTZT!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Auschecken von ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithCurrent" xml:space="preserve">Mit ${0}$ vergleichen</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithWorktree" xml:space="preserve">Mit Worktree vergleichen</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Branch-Namen kopieren</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">PR erstellen...</x:String>
+  <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">PR für Upstream ${0}$ erstellen...</x:String>
   <x:String x:Key="Text.BranchCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
   <x:String x:Key="Text.BranchCM.Delete" xml:space="preserve">Lösche ${0}$...</x:String>
   <x:String x:Key="Text.BranchCM.DeleteMultiBranches" xml:space="preserve">Lösche alle ausgewählten {0} Branches</x:String>
@@ -186,6 +189,14 @@
   <x:String x:Key="Text.CommitMessageTextBox.SubjectPlaceholder" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository Einstellungen</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT TEMPLATE</x:String>
+  <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Vordefinierte Parameter:
+  
+  ${branch_name} Name des aktuellen lokalen Branches.
+  ${files_num} Anzahl der geänderten Dateien
+  ${files} Pfade der geänderten Dateien
+  ${files:N} Maximale Anzahl N an Pfaden geänderter Dateien
+  ${pure_files} Wie ${files}, aber nur die reinen Dateinamen
+  ${pure_files:N} Wie ${files:N}, aber ohne Ordner</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Content" xml:space="preserve">Template Inhalt:</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.Name" xml:space="preserve">Template Name:</x:String>
   <x:String x:Key="Text.Configure.CustomAction" xml:space="preserve">BENUTZERDEFINIERTE AKTION</x:String>
@@ -216,6 +227,7 @@
   <x:String x:Key="Text.Configure.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetch" xml:space="preserve">Remotes automatisch fetchen</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(n)</x:String>
+  <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">Typen für konventionellen Commit</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Standard Remote</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">Bevorzugter Merge Modus</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>
@@ -249,6 +261,7 @@
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">Bezeichnung:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">Einträge:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">Nutze '|', um Einträge zu trennen</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">Die vordefinierten Parameter ${REPO}, ${REMOTE}, ${BRANCH}, ${BRANCH_FRIENDLY_NAME}, ${SHA}, and ${TAG} bleiben hier verwendbar</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">Typ:</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Arbeitsplätze</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Farbe</x:String>
@@ -504,6 +517,7 @@
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">In Browser öffnen</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">FEHLER</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">INFO</x:String>
+  <x:String x:Key="Text.Launcher.OpenRepository" xml:space="preserve">Repositorys öffnen</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Tabs</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Arbeitsplätze</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Branch mergen</x:String>
@@ -638,6 +652,8 @@
   <x:String x:Key="Text.PushTag.PushAllRemotes" xml:space="preserve">Zu allen Remotes pushen</x:String>
   <x:String x:Key="Text.PushTag.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.PushTag.Tag" xml:space="preserve">Tag:</x:String>
+  <x:String x:Key="Text.PushToNewBranch" xml:space="preserve">Push zu NEUEM Branch</x:String>
+  <x:String x:Key="Text.PushToNewBranch.Title" xml:space="preserve">Eingabe des Namens des neuen Remote-Branch:</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Schließen</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">Aktuellen Branch rebasen</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Lokale Änderungen stashen &amp; wieder anwenden</x:String>

From f24cb16a915da447a14b2d323e18e27e40fee305 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 02:23:10 +0000
Subject: [PATCH 71/72] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index bee6d96bf..f781e64f6 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,22 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.00%25-yellow)
-
-<details>
-<summary>Missing keys in de_DE.axaml</summary>
-
-- Text.Blame.BlameOnPreviousRevision
-- Text.BranchCM.CreatePR
-- Text.BranchCM.CreatePRForUpstream
-- Text.Configure.CommitMessageTemplate.BuiltinVars
-- Text.Configure.Git.ConventionalTypesOverride
-- Text.ConfigureCustomActionControls.StringValue.Tip
-- Text.Launcher.OpenRepository
-- Text.PushToNewBranch
-- Text.PushToNewBranch.Title
-
-</details>
+### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
 
 ### ![es__ES](https://img.shields.io/badge/es__ES-99.44%25-yellow)
 

From 84f9de0a783b6669306f48d9dd6e9bf99146507d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 27 Oct 2025 10:24:32 +0800
Subject: [PATCH 72/72] version: Release 2025.37

Signed-off-by: leo <longshuang@msn.cn>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 25abceaab..31514320c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2025.36
\ No newline at end of file
+2025.37
\ No newline at end of file